diff -Nru radare2-2.3.0+dfsg/.appveyor.yml radare2-2.8.0+dfsg/.appveyor.yml
--- radare2-2.3.0+dfsg/.appveyor.yml	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/.appveyor.yml	2018-08-07 14:12:36.000000000 +0000
@@ -64,16 +64,16 @@
   - ps: $env:ARTIFACT_ZIP = "$env:DIST_FOLDER.zip"
   # Download required packages
   - cmd: if defined BUILD_DIR ( %PYTHON%\python.exe -m pip install meson )
-  - cmd: if defined NINJA_URL ( powershell -Command wget %NINJA_URL% -OutFile ninja.zip && unzip ninja.zip )
+  - cmd: if defined NINJA_URL ( powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip" && unzip ninja.zip )
 
 # Build scripts
 build_script:
   - appveyor AddMessage "Compiling radare2 %R2_VERSION% (%builder%)"
   - if %builder% == msvc_cccl_64 ( sys\msvc.bat && make windist WINBITS=%builder% )
 
-  - cmd: if %builder% == vs2015_64 ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && python sys\meson.py --backend vs2015 --release --xp --install="%DIST_FOLDER%" && zip -r %ARTIFACT_ZIP% %DIST_FOLDER% )
+  - cmd: if %builder% == vs2015_64 ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && python sys\meson.py --backend vs2015 --release --xp --install="%DIST_FOLDER%" --options static_runtime=true && zip -r %ARTIFACT_ZIP% %DIST_FOLDER% )
 
-  - cmd: if %builder% == vs2015_32 ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 && python sys\meson.py --backend vs2015 --release --xp --install="%DIST_FOLDER%" && zip -r %ARTIFACT_ZIP% %DIST_FOLDER% )
+  - cmd: if %builder% == vs2015_32 ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 && python sys\meson.py --backend vs2015 --release --xp --install="%DIST_FOLDER%" --options static_runtime=true && zip -r %ARTIFACT_ZIP% %DIST_FOLDER% )
 
   - cmd: if %builder% == vs2015_64_dyn ( set "PATH=C:\mingw\bin;C:\mingw\msys\1.0\bin;%PYTHON%;%PATH%" && call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && python sys\meson.py --release --shared --install="%DIST_FOLDER%" && zip -r %ARTIFACT_ZIP% %DIST_FOLDER% )
 
diff -Nru radare2-2.3.0+dfsg/binr/blob/Makefile radare2-2.8.0+dfsg/binr/blob/Makefile
--- radare2-2.3.0+dfsg/binr/blob/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/blob/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -3,15 +3,14 @@
 
 BINS=rabin2 rarun2 rasm2 ragg2 rahash2 rax2 rafind2 radiff2
 BINS2=radare2 ${BINS}
+
+SOURCES= main.c rabin2.c radare2.c radiff2.c rafind2.c
+SOURCES+=rahash2.c rarun2.c rasm2.c rax2.c ragg2.c
+
 include ../../config-user.mk
 
-ifneq ($(OSTYPE),windows)
-CFLAGS+=-pie -fPIC -fPIE
-LDFLAGS+=-pie
-endif
 SHLR=../../shlr
 
-
 ifneq (${ANDROID},1)
 ifneq (${OSTYPE},linux)
 LDFLAGS+=-lpthread
@@ -22,41 +21,6 @@
 CFLAGS+=-I../../libr/include/
 CFLAGS+=-I$(SHLR)/spp
 
-#ifeq ($(STATIC_BUILD),1)
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=../../libr/config/libr_config.a
-LDFLAGS+=../../libr/io/libr_io.a
-LDFLAGS+=../../libr/asm/libr_asm.a
-LDFLAGS+=../../libr/egg/libr_egg.a
-LDFLAGS+=../../libr/core/libr_core.a
-LDFLAGS+=../../libr/crypto/libr_crypto.a
-LDFLAGS+=../../libr/parse/libr_parse.a
-LDFLAGS+=../../libr/anal/libr_anal.a
-LDFLAGS+=../../libr/fs/libr_fs.a
-LDFLAGS+=../../libr/magic/libr_magic.a
-LDFLAGS+=../../libr/cons/libr_cons.a
-LDFLAGS+=../../libr/syscall/libr_syscall.a
-LDFLAGS+=../../libr/flag/libr_flag.a
-LDFLAGS+=../../libr/reg/libr_reg.a
-LDFLAGS+=../../libr/debug/libr_debug.a
-LDFLAGS+=../../libr/search/libr_search.a
-LDFLAGS+=../../libr/lang/libr_lang.a
-LDFLAGS+=../../libr/bp/libr_bp.a
-LDFLAGS+=../../libr/hash/libr_hash.a
-LDFLAGS+=../../libr/bin/libr_bin.a
-LDFLAGS+=../../libr/util/libr_util.a
-# extra libs #
-ifeq (1,$(WITH_GPL))
-LDFLAGS+=../../shlr/grub/libgrubfs.a
-endif
-LDFLAGS+=../../shlr/capstone/libcapstone.a
-LDFLAGS+=../../shlr/sdb/src/libsdb.a
-LDFLAGS+=../../shlr/gdb/lib/libgdbr.a
-LDFLAGS+=../../shlr/windbg/libr_windbg.a
-LDFLAGS+=../../shlr/java/libr_java.a
-LDFLAGS+=-lm
-LDFLAGS+=../../libr/socket/libr_socket.a
-else
 LDFLAGS+=-L../../libr/io -lr_io
 LDFLAGS+=-L../../libr/bp -lr_bp
 LDFLAGS+=-L../../libr/socket -lr_socket
@@ -78,7 +42,6 @@
 LDFLAGS+=-L../../libr/debug -lr_debug
 LDFLAGS+=-L../../libr/search -lr_search
 LDFLAGS+=-L../../libr/config -lr_config
-endif
 LDFLAGS+=${LINK}
 
 include ../../libr/config.mk
@@ -102,9 +65,6 @@
 	mv version.k version.c
 	rm -f ${BINS2} r2
 
-SOURCES= main.c rabin2.c radare2.c radiff2.c rafind2.c
-SOURCES+=rahash2.c rarun2.c rasm2.c rax2.c ragg2.c
-
 build:
 	mv main.c main.k
 	mv version.c version.k
@@ -130,6 +90,6 @@
 	mkdir -p "${DESTDIR}${BINDIR}"
 	for FILE in r2 ${BINS2} ; do \
 		rm -f "${DESTDIR}${BINDIR}/$$FILE" ; \
-		cp -af "$$FILE" "${DESTDIR}${BINDIR}/$$FILE" ; \
+		cp -PRpf "$$FILE" "${DESTDIR}${BINDIR}/$$FILE" ; \
 	done
 
diff -Nru radare2-2.3.0+dfsg/binr/Makefile radare2-2.8.0+dfsg/binr/Makefile
--- radare2-2.3.0+dfsg/binr/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -28,11 +28,9 @@
 		${INSTALL_PROGRAM} "$$BINARY/$$BINARY" "${DESTDIR}${BINDIR}/$$BINARY" ; \
 	done
 	${INSTALL_SCRIPT} "$(BTOP)/r2pm/r2pm" "${DESTDIR}${BINDIR}/r2pm"
-	rm -f "${DESTDIR}${BINDIR}/ragg2-cc"
 	rm -rf "${DESTDIR}${DATADIR}/radare2/${VERSION}/r2pm"
 	#mkdir -p "${DESTDIR}${DATADIR}/radare2/${VERSION}/r2pm"
 	#cp -rf r2pm/d/* "${DESTDIR}${DATADIR}/radare2/${VERSION}/r2pm"
-	${INSTALL_SCRIPT} ragg2/ragg2-cc "${DESTDIR}${BINDIR}/ragg2-cc"
 	-cd "${DESTDIR}${BINDIR}" && rm -f r2 ; ln -fs radare2 r2
 ifeq ($(WITHPIC),1)
 	${INSTALL_LIB} "preload/libr2.$(EXT_SO)" "${DESTDIR}${LIBDIR}"
@@ -42,13 +40,14 @@
 endif
 
 ios_sign ios-sign ios-sdk-sign:
-	for a in $(BINS) ; do xcrun --sdk iphoneos codesign -s- --entitlements radare2/radare2.xml $$a ; done
+	-for a in $(BINS) ; do xcrun --sdk iphoneos codesign -s- --entitlements radare2/radare2.xml $$a ; done
+	-for a in ../libr/*/*.${EXT_SO} ; do xcrun --sdk iphoneos codesign -s- --entitlements radare2/radare2.xml $$a ; done
+	-for a in ../libr/*/p/*.${EXT_SO} ; do xcrun --sdk iphoneos codesign -s- --entitlements radare2/radare2.xml $$a ; done
 
 symstall install-symlink:
 	cd .. && \
 	mkdir -p "${DESTDIR}${BINDIR}" && \
 	for BINARY in ${BINS} ; do ln -fs "${BTOP}/$$BINARY/$$BINARY" "${DESTDIR}${BINDIR}/$$BINARY" ; done
-	cd .. && ln -fs "${BTOP}/ragg2/ragg2-cc" "${DESTDIR}${BINDIR}/ragg2-cc"
 	cd .. && ln -fs "${BTOP}/r2pm/r2pm" "${DESTDIR}${BINDIR}/r2pm"
 	cd .. && rm -rf "${DESTDIR}${DATADIR}/radare2/${VERSION}/r2pm"
 	cd .. && mkdir -p "${DESTDIR}${DATADIR}/radare2/${VERSION}/"
@@ -62,7 +61,6 @@
 deinstall uninstall:
 	-cd .. ; \
 	for BINARY in ${BINS} ; do rm -f "${DESTDIR}${BINDIR}/$$BINARY" ; done ; \
-	rm -f "${DESTDIR}${BINDIR}/ragg2-cc" ; \
 	rm -f "${DESTDIR}${BINDIR}/r2pm" ; \
 	rm -f "${DESTDIR}${BINDIR}/r2"
 
diff -Nru radare2-2.3.0+dfsg/binr/r2agent/Makefile radare2-2.8.0+dfsg/binr/r2agent/Makefile
--- radare2-2.3.0+dfsg/binr/r2agent/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/r2agent/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,9 @@
+include ../../config-user.mk
 BIN=r2agent
 BINDEPS=r_socket r_cons r_util
 
+ifeq ($(OSTYPE),android)
+LDFLAGS+=${DL_LIBS} -lm
+endif
+
 include ../rules.mk
diff -Nru radare2-2.3.0+dfsg/binr/r2agent/meson.build radare2-2.8.0+dfsg/binr/r2agent/meson.build
--- radare2-2.3.0+dfsg/binr/r2agent/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/r2agent/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,10 @@
 executable('r2agent', 'r2agent.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_socket, r_cons],
-  install: true
+  dependencies: [
+    r_util_dep,
+    r_socket_dep,
+    r_cons_dep
+  ],
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/r2agent/r2agent.c radare2-2.8.0+dfsg/binr/r2agent/r2agent.c
--- radare2-2.3.0+dfsg/binr/r2agent/r2agent.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/r2agent/r2agent.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2013-2016 - pancake */
+/* radare2 - LGPL - Copyright 2013-2018 - pancake */
 
 #include <getopt.c>
 #include <r_core.h>
@@ -78,13 +78,11 @@
 	if (dodaemon) {
 #if LIBC_HAVE_FORK
 		int pid = fork ();
-#else
-		int pid = -1;
-#endif
 		if (pid > 0) {
 			printf ("%d\n", pid);
 			return 0;
 		}
+#endif
 	}
 	s = r_socket_new (false);
 	s->local = listenlocal;
@@ -93,17 +91,17 @@
 		r_socket_free (s);
 		return 1;
 	}
-	
+
 	eprintf ("http://localhost:%d/\n", s->port);
 	if (dosandbox && !r_sandbox_enable (true)) {
 		eprintf ("sandbox: Cannot be enabled.\n");
 		return 1;
 	}
-	while (!r_cons_singleton ()->breaked) {
+	while (!r_cons_singleton ()->context->breaked) {
 		char *result_heap = NULL;
 		const char *result = page_index;
 
-		rs = r_socket_http_accept (s, timeout);
+		rs = r_socket_http_accept (s, 0, timeout);
 		if (!rs) continue;
 		if (!strcmp (rs->method, "GET")) {
 			if (!strncmp (rs->path, "/proc/kill/", 11)) {
@@ -116,21 +114,23 @@
 				int pid;
 				int session_port = 3000 + r_num_rand (1024);
 				char *filename = rs->path + 11;
-				int filename_len = strlen (filename);
+				char *escaped_filename = r_str_escape (filename);
+				int escaped_len = strlen (escaped_filename);
 				char *cmd;
 
-				if (!(cmd = malloc (filename_len + 40))) {
+				if (!(cmd = malloc (escaped_len + 40))) {
 					perror ("malloc");
 					return 1;
 				}
 				sprintf (cmd, "r2 -q %s-e http.port=%d -c=h \"%s\"",
 					listenlocal? "": "-e http.bind=public ",
-					session_port, filename);
+					session_port, escaped_filename);
 
 				// TODO: use r_sys api to get pid when running in bg
 				pid = r_sys_cmdbg (cmd);
 				free (cmd);
-				result = result_heap = malloc (1024 + filename_len);
+				free (escaped_filename);
+				result = result_heap = malloc (1024 + escaped_len);
 				if (!result) {
 					perror ("malloc");
 					return 1;
diff -Nru radare2-2.3.0+dfsg/binr/r2pm/meson.build radare2-2.8.0+dfsg/binr/r2pm/meson.build
--- radare2-2.3.0+dfsg/binr/r2pm/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/r2pm/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1 @@
+install_data('r2pm', install_dir: get_option('bindir'))
diff -Nru radare2-2.3.0+dfsg/binr/r2pm/r2pm radare2-2.8.0+dfsg/binr/r2pm/r2pm
--- radare2-2.3.0+dfsg/binr/r2pm/r2pm	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/r2pm/r2pm	2018-08-07 14:12:36.000000000 +0000
@@ -20,19 +20,35 @@
 export GLOBAL=0
 export R2PM_JOBS=4
 export R2VERSION="`r2 -qv`"
+export R2PMCACHE="$HOME/.r2pm.cache"
 
 R2PM=$0
-PREFIX="`r2 -H PREFIX`"
+R2PMCACHE_LOADED=0
+if [ -f ~/.r2pm.cache ]; then
+	. ~/.r2pm.cache
+	export LIBEXT="$LIBEXT"
+	export R2CONFIGHOME="$R2CONFIGHOME"
+	export R2DATAHOME="$R2DATAHOME"
+	PREFIX="$PREFIX"
+	if [ -z "${LIBEXT}" -o -z "${R2CONFIGHOME}" -o -z "${R2DATAHOME}" -o -z "${PREFIX}" ]; then
+		echo "[r2pm] corrupted cache, please run r2pm cache"
+	else
+		R2PMCACHE_LOADED=1
+	fi
+fi
+if [ "${R2PMCACHE_LOADED}" != 1 ]; then
+	export LIBEXT="`r2 -H LIBEXT`"
+	export R2CONFIGHOME="`r2 -H RCONFIGHOME`"
+	export R2DATAHOME="`r2 -H RDATAHOME`"
+	PREFIX="`r2 -H PREFIX`"
+fi
 BINDIR="${PREFIX}/bin/"
 LIBDIR="${PREFIX}/lib/"
 WRKDIR="$PWD"
 
-export LIBEXT="`r2 -H LIBEXT`"
-export R2HOMEDIR="`r2 -H RHOMEDIR`"
-
 # prefix
 export R2PM_SYSPREFIX="${PREFIX}"
-export R2PM_HOMEPREFIX="${R2HOMEDIR}/prefix"
+export R2PM_HOMEPREFIX="${R2DATAHOME}/prefix"
 export R2PM_PREFIX="${R2PM_HOMEPREFIX}"
 
 # bindir
@@ -43,12 +59,12 @@
 export R2PM_BINDIR
 
 # plugdir
-[ -z "${R2PM_PLUGDIR}" ] && R2PM_PLUGDIR="${R2HOMEDIR}/plugins"
+[ -z "${R2PM_PLUGDIR}" ] && R2PM_PLUGDIR="${R2DATAHOME}/plugins"
 export R2PM_PLUGDIR
 
 # www
 export R2PM_SYSWWWROOT="`r2 -qc 'e http.root' --`"
-export R2PM_HOMEWWWROOT="${R2HOMEDIR}/www/"
+export R2PM_HOMEWWWROOT="${R2DATAHOME}/www/"
 export R2PM_WWWROOT="${R2PM_HOMEWWWROOT}"
 
 # pkgconfig
@@ -59,6 +75,8 @@
 export R2PM_PYPATH="${R2PM_PREFIX}/python"
 export R2PM_OLDPWD="${PWD}"
 
+export RHOMEDIR="`r2 -H RHOMEDIR`"
+
 if [ "`uname`" = Darwin ]; then
 	export LD_LIBRARY_PATH="${R2PM_HOMEPREFIX}/lib"
 else
@@ -69,16 +87,16 @@
 TRAVIS_TYPE=XX
 TRAVIS_JOB=86948888
 IS_SYSPKG=0
-[ -z "$R2PM_USRDIR" ] && R2PM_USRDIR="${HOME}/.config/radare2/r2pm"
-R2PM_ETCD="${R2HOMEDIR}/radare2rc.d"
+[ -z "$R2PM_USRDIR" ] && R2PM_USRDIR="${R2DATAHOME}/r2pm"
+R2PM_ETCD="${R2CONFIGHOME}/radare2rc.d"
 
 # TODO. support system plugin installs R2PM_PLUGDIR="${R2PM_PREFIX}/lib/radare2/last"
 if [ -z "${R2PM_GITDIR}" ]; then
 	R2PM_GITDIR="${R2PM_USRDIR}/git/"
 fi
 if [ -z "${R2PM_DBDIR}" ]; then
-	if [ -d "${HOME}/.config/radare2/r2pm/db" ]; then
-		R2PM_DBDIR="${HOME}/.config/radare2/r2pm/db"
+	if [ -d "${R2DATAHOME}/r2pm/db" ]; then
+		R2PM_DBDIR="${R2DATAHOME}/r2pm/db"
 	fi
 fi
 if [ -z "${R2PM_DBDIR}" ]; then
@@ -123,16 +141,17 @@
 }
 
 commitSuicide() {
-	confirm "Do you wanna purge r2 completely from your system and home? (y/N)?"
+	confirm "Do you wanna purge r2 completely from your system and home?"
 	if [ $? != 0 ]; then
 		echo "Aborted." > /dev/stderr
 		exit 1
 	fi
 	countDown "Self destroying in" 3
-	confirm "> Delete ~/config.radare2" && (
-		rm -rf ~/.config/radare2
+	confirm "> Delete $RHOMEDIR" && (
+		rm -rf "$RHOMEDIR"
 	)
-	R2PATHS="${PREFIX} /usr /usr/local /opt/radare2 ~/config/radare2/prefix /"
+	R2PATHS="${PREFIX}:/usr:/usr/local:/opt/radare2:${RHOMEDIR}/prefix:/"
+	IFS=:
 	for a in $R2PATHS ; do
 		if [ -x "${a}/bin/radare2" ]; then
 			confirm "> Delete r2 from ${a}" && (
@@ -140,12 +159,14 @@
 			)
 		fi
 	done
+	unset IFS
 }
 
 case "$1" in
 init|up|update)
 	[ -z "$R2PM_DBDIR" ] && R2PM_DBDIR="${R2PM_USRDIR}/db"
 	mkdir -p "${R2PM_GITDIR}"
+	mkdir -p "${HOME}/.config"
 	cd "${R2PM_GITDIR}"
 	if [ -d radare2-pm ]; then
 		cd radare2-pm
@@ -490,6 +511,11 @@
 	#TODO set R2PM_ETCD= to a "global" radare2rc.d
 	r2pm_uninstall "$@"
 	;;
+-cp)
+	if [ -n "${R2PM_PLUGDIR}" ]; then
+		rm -f "${R2PM_PLUGDIR}/*"
+	fi
+	;;
 -ci)
 	shift
 	${R2PM} clean $*
@@ -547,6 +573,13 @@
 		exit 1
 	fi
 	;;
+cache)
+	echo "export LIBEXT=\"${LIBEXT}\"" > "${R2PMCACHE}"
+	echo "export R2CONFIGHOME=\"${R2CONFIGHOME}\"" >> "${R2PMCACHE}"
+	echo "export R2DATAHOME=\"${R2DATAHOME}\"" >> "${R2PMCACHE}"
+	echo "export PREFIX=\"${PREFIX}\"" >> "${R2PMCACHE}"
+	echo "[r2pm] r2 environment cached in ${R2PMCACHE}"
+	;;
 -a|add)
 	if [ "$2" = "help" ]; then
 		printf '%s\n' \
@@ -627,19 +660,21 @@
  -H variable                 show value of given variable
  -c,clean ([git/dir])        clear source cache (GITDIR)
  -ci (pkgname)               clean install of given package
+ -cp                         clean the user's home plugin directory
  -d,doc [pkgname]            show documentation for given package
  -w <pkgname>                what/where is installed
  init | update ..            initialize/update database
  cd [git/dir]                cd into given git (see 'r2pm ls')
  ls                          ls all cloned git repos in GITDIR
  suicide                     self remove all (home + system) installations of r2
+ cache                       cache contents of r2 -H to make r2pm r2-independent
 Environment:
  SUDO=sudo                    use this tool as sudo
- R2PM_PLUGDIR=~/.config/radare2/plugins   # default value, home-install for plugins
- R2PM_BINDIR=~/.config/radare2/prefix/bin # bindir in r2's PATH
- R2PM_PLUGDIR=/usr/lib/radare2/last/      # for system-wide plugin installs
- R2PM_DBDIR=~/.config/radare2/r2pm/db     # location of the db
- R2PM_GITDIR=~/.config/radare2/r2pm/git   # cloned git repositories
+ R2PM_PLUGDIR=~/.local/share/radare2/plugins   # default value, home-install for plugins
+ R2PM_BINDIR=~/.local/share/radare2/prefix/bin # bindir in r2's PATH
+ R2PM_PLUGDIR=/usr/lib/radare2/last/           # for system-wide plugin installs
+ R2PM_DBDIR=~/.local/share/radare2/r2pm/db     # location of the db
+ R2PM_GITDIR=~/.local/share/radare2/r2pm/git   # cloned git repositories
 HELP
 	;;
 esac
diff -Nru radare2-2.3.0+dfsg/binr/rabin2/Makefile radare2-2.8.0+dfsg/binr/rabin2/Makefile
--- radare2-2.3.0+dfsg/binr/rabin2/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rabin2/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -6,7 +6,6 @@
 
 include ../rules.mk
 
-ifeq ($(WITHNONPIC),1)
 include ../../libr/socket/deps.mk
 include ../../shlr/zip/deps.mk
 include ../../shlr/gdb/deps.mk
@@ -14,4 +13,3 @@
 include ../../shlr/bochs/deps.mk
 include ../../shlr/qnx/deps.mk
 include ../../shlr/ar/deps.mk
-endif
diff -Nru radare2-2.3.0+dfsg/binr/rabin2/meson.build radare2-2.8.0+dfsg/binr/rabin2/meson.build
--- radare2-2.3.0+dfsg/binr/rabin2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rabin2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,17 @@
-
 executable('rabin2', 'rabin2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_cons, r_config, r_hash, r_io, r_crypto, r_core, r_magic, libr2java],
-  objects: [
-    libr2sdb.extract_all_objects(),
-	r_bin.extract_all_objects()
+  dependencies: [
+    r_util_dep,
+    r_cons_dep,
+    r_config_dep,
+    r_hash_dep,
+    r_io_dep,
+    r_crypto_dep,
+    r_core_dep,
+    r_magic_dep,
+    r_bin_dep,
+    sdb_dep
   ],
-  install: true
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/rabin2/rabin2.c radare2-2.8.0+dfsg/binr/rabin2/rabin2.c
--- radare2-2.3.0+dfsg/binr/rabin2/rabin2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rabin2/rabin2.c	2018-08-07 14:12:36.000000000 +0000
@@ -27,7 +27,7 @@
 static int rabin_show_help(int v) {
 	printf ("Usage: rabin2 [-AcdeEghHiIjlLMqrRsSUvVxzZ] [-@ at] [-a arch] [-b bits] [-B addr]\n"
 		"              [-C F:C:D] [-f str] [-m addr] [-n str] [-N m:M] [-P[-P] pdb]\n"
-		"              [-o str] [-O str] [-k query] [-D lang symname] | file\n");
+		"              [-o str] [-O str] [-k query] [-D lang symname] file\n");
 	if (v) {
 		printf (
 		" -@ [addr]       show section, symbol or import at addr\n"
@@ -45,7 +45,7 @@
 		" -E              globally exportable symbols\n"
 		" -f [str]        select sub-bin named str\n"
 		" -F [binfmt]     force to use that bin plugin (ignore header check)\n"
-		" -g              same as -SMZIHVResizcld (show all info)\n"
+		" -g              same as -SMZIHVResizcld -SS -ee (show all info)\n"
 		" -G [addr]       load address . offset to header\n"
 		" -h              this help message\n"
 		" -H              header fields\n"
@@ -72,6 +72,7 @@
 		" -R              relocations\n"
 		" -s              symbols\n"
 		" -S              sections\n"
+		" -SS             segments\n"
 		" -u              unfiltered (no rename duplicated symbols/sections)\n"
 		" -U              resoUrces\n"
 		" -v              display version and quit\n"
@@ -95,6 +96,7 @@
 		" RABIN2_DEBASE64:  e bin.debase64     # try to debase64 all strings\n"
 		" RABIN2_DMNGLRCMD: e bin.demanglercmd # try to purge false positives\n"
 		" RABIN2_PDBSERVER: e pdb.server       # use alternative PDB server\n"
+		" RABIN2_SYMSTORE:  e pdb.symstore     # path to downstream symbol store\n"
 		" RABIN2_PREFIX:    e bin.prefix       # prefix symbols/sections/relocs with a specific string\n");
 	}
 	return 1;
@@ -145,12 +147,12 @@
 static bool extract_binobj(const RBinFile *bf, RBinXtrData *data, int idx) {
 	ut64 bin_size = data ? data->size : 0;
 	ut8 *bytes;
+	const char *xtr_type = "";
 	char *arch = "unknown";
 	int bits = 0;
 	char *libname = NULL;
 	const char *filename = bf ? bf->file : NULL;
-	char *path = NULL, *outpath = NULL, *outfile = NULL, *ptr = NULL;
-	ut32 outfile_sz = 0, outpath_sz = 0;
+	char *path = NULL, *ptr = NULL;
 	bool res = false;
 
 	if (!bf || !data || !filename) {
@@ -160,8 +162,9 @@
 		arch = data->metadata->arch;
 		bits = data->metadata->bits;
 		libname = data->metadata->libname;
+		xtr_type = data->metadata->xtr_type;
 	}
-	if (bin_size == bf->size && bin_size) {
+	if (!strcmp (xtr_type, "fat") && bin_size == bf->size && bin_size) {
 		eprintf ("This is not a fat bin\n");
 		return false;
 	}
@@ -184,14 +187,7 @@
 	} else {
 		ptr = path;
 	}
-	outpath_sz = strlen (path) + 20;
-	if (outpath_sz > 0) {
-		outpath = malloc (outpath_sz);
-	}
-
-	if (outpath) {
-		snprintf (outpath, outpath_sz, "%s.fat", ptr);
-	}
+	char *outpath = r_str_newf ("%s.fat", ptr);
 	if (!outpath || !r_sys_mkdirp (outpath)) {
 		free (path);
 		free (outpath);
@@ -199,20 +195,9 @@
 		return false;
 	}
 
-	outfile_sz = outpath_sz + strlen (ptr) + strlen (arch) + 23;
-	if (outfile_sz) {
-		outfile = malloc (outfile_sz);
-	}
-
-	if (outfile) {
-		if (libname) {
-			snprintf (outfile, outfile_sz, "%s/%s.%s.%s_%i.%d",
-					  outpath, ptr, arch, libname, bits, idx);
-		} else {
-			snprintf (outfile, outfile_sz, "%s/%s.%s_%i.%d",
-					  outpath, ptr, arch, bits, idx);
-		}
-	}
+	char *outfile = libname
+		? r_str_newf ("%s/%s.%s.%s_%i.%d", outpath, ptr, arch, libname, bits, idx)
+		: r_str_newf ("%s/%s.%s_%i.%d", outpath, ptr, arch, bits, idx);
 
 	if (!outfile || !r_file_dump (outfile, bytes, bin_size, 0)) {
 		eprintf ("Error extracting %s\n", outfile);
@@ -573,7 +558,10 @@
 	bin = core.bin;
 
 	if (!(tmp = r_sys_getenv ("RABIN2_NOPLUGINS"))) {
-		char *homeplugindir = r_str_home (R2_HOMEDIR "/plugins");
+		char *homeplugindir = r_str_home (R2_HOME_PLUGINS);
+		char *plugindir = r_str_r2_prefix (R2_PLUGINS);
+		char *extrasdir = r_str_r2_prefix (R2_EXTRAS);
+		char *bindingsdir = r_str_r2_prefix (R2_BINDINGS);
 		l = r_lib_new ("radare_plugin");
 		r_lib_add_handler (l, R_LIB_TYPE_BIN, "bin plugins",
 			&__lib_bin_cb, &__lib_bin_dt, NULL);
@@ -588,10 +576,13 @@
 			r_lib_opendir (l, path);
 		}
 		r_lib_opendir (l, homeplugindir);
+		r_lib_opendir (l, plugindir);
+		r_lib_opendir (l, extrasdir);
+		r_lib_opendir (l, bindingsdir);
 		free (homeplugindir);
-		r_lib_opendir (l, R2_LIBDIR "/radare2/" R2_VERSION);
-		r_lib_opendir (l, R2_LIBDIR "/radare2-extras/" R2_VERSION);
-		r_lib_opendir (l, R2_LIBDIR "/radare2-bindings/" R2_VERSION);
+		free (plugindir);
+		free (extrasdir);
+		free (bindingsdir);
 	}
 	free (tmp);
 
@@ -638,12 +629,14 @@
 			set_action (R_BIN_REQ_IMPORTS);
 			set_action (R_BIN_REQ_SYMBOLS);
 			set_action (R_BIN_REQ_SECTIONS);
+			set_action (R_BIN_REQ_SEGMENTS);
 			set_action (R_BIN_REQ_STRINGS);
 			set_action (R_BIN_REQ_SIZE);
 			set_action (R_BIN_REQ_INFO);
 			set_action (R_BIN_REQ_FIELDS);
 			set_action (R_BIN_REQ_DWARF);
 			set_action (R_BIN_REQ_ENTRIES);
+			set_action (R_BIN_REQ_INITFINI);
 			set_action (R_BIN_REQ_MAIN);
 			set_action (R_BIN_REQ_LIBS);
 			set_action (R_BIN_REQ_RELOCS);
@@ -664,11 +657,11 @@
 		case 'u': bin->filter = 0; break;
 		case 'k': query = optarg; break;
 		case 'K': chksum = optarg; break;
-		case 'c': 
+		case 'c':
 			if (is_active (R_BIN_REQ_CLASSES)) {
 				rad = R_CORE_BIN_CLASSDUMP;
 			} else {
-			  	set_action (R_BIN_REQ_CLASSES); 
+			  	set_action (R_BIN_REQ_CLASSES);
 			}
 			break;
 		case 'f': arch_name = strdup (optarg); break;
@@ -680,7 +673,14 @@
 			break;
 		case 'i': set_action (R_BIN_REQ_IMPORTS); break;
 		case 's': set_action (R_BIN_REQ_SYMBOLS); break;
-		case 'S': set_action (R_BIN_REQ_SECTIONS); break;
+		case 'S':
+			if (is_active (R_BIN_REQ_SECTIONS)) {
+				action &= ~R_BIN_REQ_SECTIONS;
+				action |= R_BIN_REQ_SEGMENTS;
+			} else {
+				set_action (R_BIN_REQ_SECTIONS);
+			}
+			break;
 		case 'z':
 			if (is_active (R_BIN_REQ_STRINGS)) {
 				if (rawstr) {
@@ -738,15 +738,15 @@
 			op = optarg;
 			set_action (R_BIN_REQ_OPERATION);
 			if (isBinopHelp (op)) {
-				printf ("Operation string:\n"
-					"  Change Entrypoint: e/0x8048000\n"
-					"  Dump Symbols: d/s/1024\n"
-					"  Dump Section: d/S/.text\n"
-					"  Resize Section: r/.data/1024\n"
-					"  Remove RPATH: R\n"
-					"  Add Library: a/l/libfoo.dylib\n"
-					"  Change Permissions: p/.data/rwx\n"
-					"  Show LDID entitlements: C\n");
+				printf ("Usage: iO [expression]:\n"
+					" e/0x8048000       change entrypoint\n"
+					" d/s/1024          dump symbols\n"
+					" d/S/.text         dump section\n"
+					" r/.data/1024      resize section\n"
+					" R                 remove RPATH\n"
+					" a/l/libfoo.dylib  add library\n"
+					" p/.data/rwx       change section permissions\n"
+					" C                 show LDID entitlements\n");
 				r_core_fini (&core);
 				return 0;
 			}
@@ -922,6 +922,15 @@
 	}
 
 	if (file && *file && action & R_BIN_REQ_DLOPEN) {
+#if __UNIX__
+		int child = r_sys_fork ();
+		if (child == -1) {
+			return 1;
+		}
+		if (child == 0) {
+			return waitpid (child, NULL, 0);
+		}
+#endif
 		void *addr = r_lib_dl_open (file);
 		if (addr) {
 			eprintf ("%s is loaded at 0x%"PFMT64x"\n", file, (ut64)(size_t)(addr));
@@ -929,7 +938,7 @@
 			return 0;
 		}
 		eprintf ("Cannot open the '%s' library\n", file);
-		return 1;
+		return 0;
 	}
 	if (action & R_BIN_REQ_PACKAGE) {
 		RList *files = r_list_newf (NULL);
@@ -975,11 +984,24 @@
 
 	r_bin_force_plugin (bin, forcebin);
 	r_bin_load_filter (bin, action);
-	if (!r_bin_load (bin, file, baddr, laddr, xtr_idx, fd, rawstr)) {
+
+	RBinOptions *bo = r_bin_options_new (0LL, baddr, rawstr);
+	if (!bo) {
+		eprintf ("Could not create RBinOptions\n");
+		r_core_fini (&core);
+		return 1;
+	}
+
+	bo->loadaddr = laddr;
+	bo->xtr_idx = xtr_idx;
+	bo->iofd = fd;
+
+	if (!r_bin_open (bin, file, bo)) {
 		//if this return null means that we did not return a valid bin object
 		//but we have yet the chance that this file is a fat binary
 		if (!bin->cur || !bin->cur->xtr_data) {
 			eprintf ("r_bin: Cannot open file\n");
+			r_bin_options_free (bo);
 			r_core_fini (&core);
 			return 1;
 		}
@@ -995,7 +1017,7 @@
 		RBinFile *bf = r_core_bin_cur (&core);
 		if (bf) {
 			bf->strmode = rad;
-			r_bin_dump_strings (bf, bin->minstrlen);
+			r_bin_dump_strings (bf, bin->minstrlen, bf->rawstr);
 		}
 	}
 	if (query) {
@@ -1009,6 +1031,7 @@
 				sdb_query (bin->cur->sdb, query);
 			}
 		}
+		r_bin_options_free (bo);
 		r_core_fini (&core);
 		return 0;
 	}
@@ -1047,7 +1070,14 @@
 		pdbopts.user_agent = (char*) r_config_get (core.config, "pdb.useragent");
 		pdbopts.symbol_server = (char*) r_config_get (core.config, "pdb.server");
 		pdbopts.extract = r_config_get_i (core.config, "pdb.extract");
+
+		if ((tmp = r_sys_getenv ("RABIN2_SYMSTORE"))) {
+			r_config_set (core.config, "pdb.symstore", tmp);
+			R_FREE (tmp);
+		}
+		pdbopts.symbol_store_path = (char*) r_config_get (core.config, "pdb.symstore");
 		int r = r_bin_pdb_download (&core, isradjson, &actions_done, &pdbopts);
+		r_bin_options_free (bo);
 		r_core_fini (&core);
 		return r;
 	}
@@ -1058,8 +1088,9 @@
 	}
 
 	run_action ("sections", R_BIN_REQ_SECTIONS, R_CORE_BIN_ACC_SECTIONS);
+	run_action ("segments", R_BIN_REQ_SEGMENTS, R_CORE_BIN_ACC_SEGMENTS);
 	run_action ("entries", R_BIN_REQ_ENTRIES, R_CORE_BIN_ACC_ENTRIES);
-	run_action ("entries", R_BIN_REQ_INITFINI, R_CORE_BIN_ACC_INITFINI);
+	run_action ("initfini", R_BIN_REQ_INITFINI, R_CORE_BIN_ACC_INITFINI);
 	run_action ("main", R_BIN_REQ_MAIN, R_CORE_BIN_ACC_MAIN);
 	run_action ("imports", R_BIN_REQ_IMPORTS, R_CORE_BIN_ACC_IMPORTS);
 	run_action ("classes", R_BIN_REQ_CLASSES, R_CORE_BIN_ACC_CLASSES);
@@ -1094,9 +1125,10 @@
 		rabin_do_operation (op);
 	}
 	if (isradjson) {
-		printf ("}");
+		r_cons_print ("}");
 	}
 	r_cons_flush ();
+	r_bin_options_free (bo);
 	r_core_fini (&core);
 	free (stdin_buf);
 
diff -Nru radare2-2.3.0+dfsg/binr/radare2/Makefile radare2-2.8.0+dfsg/binr/radare2/Makefile
--- radare2-2.3.0+dfsg/binr/radare2/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/radare2/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -73,6 +73,7 @@
 endif
 
 include ../../libr/socket/deps.mk
+include ../../libr/magic/deps.mk
 include ../../shlr/zip/deps.mk
 include ../../shlr/gdb/deps.mk
 include ../../shlr/java/deps.mk
diff -Nru radare2-2.3.0+dfsg/binr/radare2/meson.build radare2-2.8.0+dfsg/binr/radare2/meson.build
--- radare2-2.3.0+dfsg/binr/radare2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/radare2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,28 @@
 executable('radare2', 'radare2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_socket, r_core, r_io, r_magic, r_fs, r_bin, r_flag, r_cons, r_asm, r_debug, r_config, r_bp, r_reg, r_syscall, r_anal, r_parse, r_egg, r_search, r_hash, r_crypto,],
-  install: true
-)
\ No newline at end of file
+  dependencies: [
+    r_util_dep,
+    r_socket_dep,
+    r_core_dep,
+    r_io_dep,
+    r_fs_dep,
+    r_bin_dep,
+    r_flag_dep,
+    r_cons_dep,
+    r_asm_dep,
+    r_debug_dep,
+    r_config_dep,
+    r_bp_dep,
+    r_reg_dep,
+    r_syscall_dep,
+    r_anal_dep,
+    r_parse_dep,
+    r_egg_dep,
+    r_search_dep,
+    r_hash_dep,
+    r_crypto_dep,
+    r_magic_dep
+  ],
+  install: true,
+  implicit_include_directories: false
+)
diff -Nru radare2-2.3.0+dfsg/binr/radare2/radare2.c radare2-2.8.0+dfsg/binr/radare2/radare2.c
--- radare2-2.3.0+dfsg/binr/radare2/radare2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/radare2/radare2.c	2018-08-07 14:12:36.000000000 +0000
@@ -8,15 +8,15 @@
 #endif
 #endif
 #include <sdb.h>
-#include <r_core.h>
+#include <r_th.h>
 #include <r_io.h>
 #include <stdio.h>
 #include <getopt.c>
+#include <r_core.h>
 #include "../blob/version.c"
 
 
 #if USE_THREADS
-#include <r_th.h>
 static char *rabin_cmd = NULL;
 #endif
 static bool threaded = false;
@@ -38,6 +38,32 @@
 	return NULL;
 }
 
+static RThread *thread = NULL;
+
+static int loading_thread(RThread *th) {
+	const char *tok = "\\|/-";
+	int i = 0;
+	if (th) {
+		while (!th->breaked) {
+			eprintf ("%c] Loading..%c     \r[", tok[i%4], "."[i%2]);
+			r_sys_usleep (100000);
+			i++;
+		}
+	}
+	return 0;
+}
+
+static void loading_start() {
+	thread = r_th_new (loading_thread, NULL, 1);
+	r_th_start (thread, true);
+}
+
+static void loading_stop() {
+	r_th_kill (thread, true);
+	r_th_free (thread);
+	thread = NULL;
+}
+
 static int verify_version(int show) {
 	int i, ret;
 	typedef const char* (*vc)();
@@ -60,7 +86,9 @@
 		{ "r_hash", &r_hash_version },
 		{ "r_fs", &r_fs_version },
 		{ "r_io", &r_io_version },
+#if !USE_LIB_MAGIC
 		{ "r_magic", &r_magic_version },
+#endif
 		{ "r_parse", &r_parse_version },
 		{ "r_reg", &r_reg_version },
 		{ "r_sign", &r_sign_version },
@@ -97,7 +125,7 @@
 static int main_help(int line) {
 	if (line < 2) {
 		printf ("Usage: r2 [-ACdfLMnNqStuvwzX] [-P patch] [-p prj] [-a arch] [-b bits] [-i file]\n"
-			"          [-s addr] [-B baddr] [-M maddr] [-c cmd] [-e k=v] file|pid|-|--|=\n");
+			"          [-s addr] [-B baddr] [-m maddr] [-c cmd] [-e k=v] file|pid|-|--|=\n");
 	}
 	if (line != 1) {
 		printf (
@@ -148,22 +176,22 @@
 		" -z, -zz      do not load strings or load them even in raw\n");
 	}
 	if (line == 2) {
-		char *homedir = r_str_home (R2_HOMEDIR);
+		char *datahome = r_str_home (R2_HOME_DATADIR);
+		const char *dirPrefix = r_sys_prefix (NULL);
 		printf (
 		"Scripts:\n"
 		" system       ${R2_PREFIX}/share/radare2/radare2rc\n"
-		" user         ~/.radare2rc ${RHOMEDIR}/radare2/radare2rc (and radare2rc.d/)\n"
+		" user         ~/.radare2rc " R_JOIN_2_PATHS ("~", R2_HOME_RC) " (and " R_JOIN_3_PATHS ("~", R2_HOME_RC_DIR,"") ")\n"
 		" file         ${filename}.r2\n"
 		"Plugins:\n"
-		" binrc        ~/.config/radare2/rc.d/bin-<format>/ (elf, elf64, mach0, ..)\n"
-		" plugins      "R2_PREFIX"/lib/radare2/last\n"
-		" USER_PLUGINS ~/.config/radare2/plugins\n"
-		" LIBR_PLUGINS "R2_PREFIX"/lib/radare2/"R2_VERSION"\n"
-		" USER_ZIGNS   ~/.config/radare2/zigns\n"
+		" binrc        " R_JOIN_4_PATHS ("~", R2_HOME_BINRC, "bin-<format>",  "") " (elf, elf64, mach0, ..)\n"
+		" USER_PLUGINS " R_JOIN_2_PATHS ("~", R2_HOME_PLUGINS) "\n"
+		" LIBR_PLUGINS " R_JOIN_2_PATHS ("%s", R2_PLUGINS) "\n"
+		" USER_ZIGNS   " R_JOIN_2_PATHS ("~", R2_HOME_ZIGNS) "\n"
 		"Environment:\n"
-		" RHOMEDIR     %s\n" // TODO: rename to RHOME R2HOME?
+		" RDATAHOME    %s\n" // TODO: rename to RHOME R2HOME?
 		" RCFILE       ~/.radare2rc (user preferences, batch script)\n" // TOO GENERIC
-		" MAGICPATH    "R_MAGIC_PATH"\n"
+		" MAGICPATH    " R_JOIN_2_PATHS ("%s", R2_SDB_MAGIC) "\n"
 		" R_DEBUG      if defined, show error messages and crash signal\n"
 		" VAPIDIR      path to extra vapi directory\n"
 		" R2_NOPLUGINS do not load r2 shared plugins\n"
@@ -172,30 +200,36 @@
 		" R2_INCDIR    "R2_INCDIR"\n"
 		" R2_LIBDIR    "R2_LIBDIR"\n"
 		" R2_LIBEXT    "R_LIB_EXT"\n"
-		, homedir);
-		free (homedir);
+		, dirPrefix, datahome, dirPrefix);
+		free (datahome);
 	}
 	return 0;
 }
 
 static int main_print_var(const char *var_name) {
 	int i = 0;
-	char *homedir = r_str_home (R2_HOMEDIR);
-	char *homeplugs = r_str_newf ("%s" R_SYS_DIR "plugins", homedir);
-	char *homezigns = r_str_newf ("%s" R_SYS_DIR "zigns", homedir);
+	char *confighome = r_str_home (R2_HOME_CONFIGDIR);
+	char *datahome = r_str_home (R2_HOME_DATADIR);
+	char *cachehome = r_str_home (R2_HOME_CACHEDIR);
+	char *homeplugins = r_str_home (R2_HOME_PLUGINS);
+	char *homezigns = r_str_home (R2_HOME_ZIGNS);
+	char *plugins = r_str_r2_prefix (R2_PLUGINS);
+	char *magicpath = r_str_r2_prefix (R2_SDB_MAGIC);
 	struct radare2_var_t {
 		const char *name;
 		const char *value;
 	} r2_vars[] = {
 		{ "R2_PREFIX", R2_PREFIX },
-		{ "MAGICPATH", R_MAGIC_PATH },
+		{ "MAGICPATH", magicpath },
 		{ "PREFIX", R2_PREFIX },
 		{ "INCDIR", R2_INCDIR },
 		{ "LIBDIR", R2_LIBDIR },
 		{ "LIBEXT", R_LIB_EXT },
-		{ "RHOMEDIR", homedir },
-		{ "LIBR_PLUGINS", R2_PREFIX"/lib/radare2/"R2_VERSION },
-		{ "USER_PLUGINS", homeplugs },
+		{ "RCONFIGHOME", confighome },
+		{ "RDATAHOME", datahome },
+		{ "RCACHEHOME", cachehome },
+		{ "LIBR_PLUGINS", plugins },
+		{ "USER_PLUGINS", homeplugins },
 		{ "USER_ZIGNS", homezigns },
 		{ NULL, NULL }
 	};
@@ -213,9 +247,13 @@
 			i++;
 		}
 	}
-	free (homedir);
-	free (homeplugs);
+	free (confighome);
+	free (datahome);
+	free (cachehome);
+	free (homeplugins);
 	free (homezigns);
+	free (plugins);
+	free (magicpath);
 	return 0;
 }
 
@@ -271,7 +309,7 @@
 		r_core_cmd_file (r, homerc);
 	}
 	free (homerc);
-	homerc = r_str_home (".config/radare2/radare2rc");
+	homerc = r_str_home (R2_HOME_RC);
 	if (homerc && r_file_is_regular (homerc)) {
 		if (has_debug) {
 			eprintf ("USER CONFIG loaded from %s\n", homerc);
@@ -279,7 +317,7 @@
 		r_core_cmd_file (r, homerc);
 	}
 	free (homerc);
-	homerc = r_str_home (".config/radare2/radare2rc.d");
+	homerc = r_str_home (R2_HOME_RC_DIR);
 	if (homerc) {
 		if (r_file_is_directory (homerc)) {
 			char *file;
@@ -325,7 +363,8 @@
 	}
 	/* -c */
 	r_list_foreach (cmds, iter, cmdn) {
-		r_core_cmd0 (&r, cmdn);
+		//r_core_cmd0 (&r, cmdn);
+		r_core_cmd (&r, cmdn, false);
 		r_cons_flush ();
 	}
 	if (quiet) {
@@ -445,7 +484,6 @@
 			r_list_free (prefiles); \
 		}
 
-	int va = 1; // set va = 0 to load physical offsets from rbin
 	bool noStderr = false;
 
 	r_sys_set_environ (envp);
@@ -459,6 +497,7 @@
 		return main_help (1);
 	}
 	r_core_init (&r);
+	r_core_task_sync_begin (&r);
 	if (argc == 2 && !strcmp (argv[1], "-p")) {
 		r_core_project_list (&r, 0);
 		r_cons_flush ();
@@ -466,7 +505,7 @@
 		return 0;
 	}
 	// HACK TO PERMIT '#!/usr/bin/r2 - -i' hashbangs
-	if (argc > 1 && !strcmp (argv[1], "-")) {
+	if (argc > 2 && !strcmp (argv[1], "-") && !strcmp (argv[2], "-i")) {
 		argv[1] = argv[0];
 		prefile = 1;
 		argc--;
@@ -496,11 +535,10 @@
 			break;
 		case '0':
 			zerosep = true;
-			//r_config_set (r.config, "scr.color", "false");
 			/* implicit -q */
 			r_config_set (r.config, "scr.interactive", "false");
 			r_config_set (r.config, "scr.prompt", "false");
-			r_config_set (r.config, "scr.color", "false");
+			r_config_set_i (r.config, "scr.color", COLOR_MODE_DISABLED);
 			quiet = true;
 			break;
 		case 'u':
@@ -515,10 +553,11 @@
 		case 'A':
 			do_analysis += do_analysis ? 1: 2;
 			break;
-		case 'b': asmbits = optarg; break;
+		case 'b':
+			asmbits = optarg;
+			break;
 		case 'B':
 			baddr = r_num_math (r.num, optarg);
-			va = 2;
 			break;
 		case 'X':
 			r_config_set (r.config, "bin.usextr", "false");
@@ -666,11 +705,7 @@
 			eprintf ("Failed to close stderr");
 			return 1;
 		}
-#if __WINDOWS__ && !__CYGWIN__
-		const char nul[] = "nul";
-#else
-		const char nul[] = "/dev/null";
-#endif
+		const char nul[] = R_SYS_DEVNULL;
 		int new_stderr = open (nul, O_RDWR);
 		if (-1 == new_stderr) {
 			eprintf ("Failed to open %s", nul);
@@ -779,12 +814,15 @@
 	ret = run_commands (NULL, prefiles, false);
 	r_list_free (prefiles);
 
+#if 0
+	// if "- -i" is used we will open malloc:// instead
 	// HACK TO PERMIT '#!/usr/bin/r2 - -i' hashbangs
 	if (prefile) {
 		optind = 1;
 		argc = 2;
 		argv[1] = "-";
 	}
+#endif
 	r_bin_force_plugin (r.bin, forcebin);
 
 	//cverify_version (0);
@@ -870,6 +908,9 @@
 			return 1;
 		}
 	} else if (strcmp (argv[optind - 1], "--") && !(r_config_get (r.config, "prj.name") && r_config_get (r.config, "prj.name")[0]) ) {
+		if (threaded) {
+			loading_start ();
+		}
 		if (debug) {
 			if (asmbits) {
 				r_config_set (r.config, "asm.bits", asmbits);
@@ -1070,6 +1111,15 @@
 					}
 				}
 			}
+			if (mapaddr) {
+				eprintf ("WARNING: using oba to load the syminfo from different mapaddress.\n");
+				eprintf ("TODO: Must use the API instead of running commands to speedup loading times.\n");
+				if (r_config_get_i (r.config, "file.info")) {
+					// load symbols when using r2 -m 0x1000 /bin/ls
+					r_core_cmdf (&r, "oba 0x%"PFMT64x, mapaddr);
+					r_core_cmd0 (&r, ".ies*");
+				}
+			}
 		} else {
 			RCoreFile *f = r_core_file_open (&r, pfile, perms, mapaddr);
 			if (f) {
@@ -1083,7 +1133,6 @@
 			baddr = r_debug_get_baddr (r.dbg, pfile);
 			if (baddr != UT64_MAX && baddr != 0) {
 				eprintf ("bin.baddr 0x%08" PFMT64x "\n", baddr);
-				va = 2;
 			}
 			if (run_anal > 0) {
 				if (baddr && baddr != UT64_MAX) {
@@ -1197,10 +1246,10 @@
 			}
 			nsha1 = r_config_get (r.config, "file.sha1");
 			npath = r_config_get (r.config, "file.path");
-			if (!quiet && sha1 && *sha1 && strcmp (sha1, nsha1)) {
+			if (!quiet && sha1 && *sha1 && nsha1 && strcmp (sha1, nsha1)) {
 				eprintf ("WARNING: file.sha1 change: %s => %s\n", sha1, nsha1);
 			}
-			if (!quiet && path && *path && strcmp (path, npath)) {
+			if (!quiet && path && *path && npath && strcmp (path, npath)) {
 				eprintf ("WARNING: file.path change: %s => %s\n", path, npath);
 			}
 			free (sha1);
@@ -1256,7 +1305,7 @@
 #if UNCOLORIZE_NONTTY
 #if __UNIX__
 	if (!r_cons_isatty ()) {
-		r_config_set_i (r.config, "scr.color", 0);
+		r_config_set_i (r.config, "scr.color", COLOR_MODE_DISABLED);
 	}
 #endif
 #endif
@@ -1314,6 +1363,7 @@
 				r_core_cmd0 (&r, "aeip");
 			}
 		}
+		loading_stop ();
 		for (;;) {
 #if USE_THREADS
 			do {
@@ -1352,13 +1402,13 @@
 				if (debug) {
 					if (no_question_debug) {
 						if (r_config_get_i (r.config, "dbg.exitkills") && y_kill_debug){
-							r_debug_kill (r.dbg, 0, false, 9); // KILL
+							r_debug_kill (r.dbg, r.dbg->pid, r.dbg->tid, 9); // KILL
 						}
 					} else {
 						if (r_cons_yesno ('y', "Do you want to quit? (Y/n)")) {
 							if (r_config_get_i (r.config, "dbg.exitkills") &&
 									r_cons_yesno ('y', "Do you want to kill the process? (Y/n)")) {
-								r_debug_kill (r.dbg, 0, false, 9); // KILL
+								r_debug_kill (r.dbg, r.dbg->pid, r.dbg->tid, 9); // KILL
 							} else {
 								r_debug_detach (r.dbg, r.dbg->pid);
 							}
@@ -1389,8 +1439,8 @@
 		}
 	}
 
-	if (mustSaveHistory(r.config)) {
-		r_line_hist_save (R2_HOMEDIR"/history");
+	if (mustSaveHistory (r.config)) {
+		r_line_hist_save (R2_HOME_HISTORY);
 	}
 	// TODO: kill thread
 
@@ -1401,9 +1451,12 @@
 		exit (ret);
 		return ret;
 	}
+
+	r_core_task_sync_end (&r);
+
 	// not really needed, cause r_core_fini will close the file
 	// and this fh may be come stale during the command
-	// exectution.
+	// execution.
 	//r_core_file_close (&r, fh);
 	r_core_fini (&r);
 	r_cons_set_raw (0);
diff -Nru radare2-2.3.0+dfsg/binr/radare2/radare2.xml radare2-2.8.0+dfsg/binr/radare2/radare2.xml
--- radare2-2.3.0+dfsg/binr/radare2/radare2.xml	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/radare2/radare2.xml	2018-08-07 14:12:36.000000000 +0000
@@ -4,6 +4,12 @@
   <key>com.apple.springboard.debugapplications</key>
   <true/>
 
+  <key>platform-application</key>
+  <true/>
+
+  <key>com.apple.private.skip-library-validation</key>
+  <true/>
+
   <key>app-identifier</key>
   <true/>
 
diff -Nru radare2-2.3.0+dfsg/binr/radiff2/meson.build radare2-2.8.0+dfsg/binr/radiff2/meson.build
--- radare2-2.3.0+dfsg/binr/radiff2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/radiff2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,17 @@
 executable('radiff2', 'radiff2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_io, r_search, r_cons, r_core, r_bin, r_anal, r_asm, r_hash, r_config],
-  install: true
+  dependencies: [
+    r_util_dep,
+    r_io_dep,
+    r_search_dep,
+    r_cons_dep,
+    r_core_dep,
+    r_bin_dep,
+    r_anal_dep,
+    r_asm_dep,
+    r_hash_dep,
+    r_config_dep
+  ],
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/radiff2/radiff2.c radare2-2.8.0+dfsg/binr/radiff2/radiff2.c
--- radare2-2.3.0+dfsg/binr/radiff2/radiff2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/radiff2/radiff2.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_diff.h>
 #include <r_core.h>
@@ -113,16 +113,14 @@
 				if (!quiet) {
 					printf (Color_RED);
 				}
-				if (r_mem_is_printable ((const ut8 *) s, R_MIN (strlen (s), 5))) {
-					printf ("- %s\n", s);
-				} else {
-					printf ("-:");
-					int len = op->a_len; // R_MIN (op->a_len, strlen (op->a_buf));
-					for (i = 0; i < len; i++) {
-						printf ("%02x", op->a_buf[i]);
-					}
-					printf (" \"%s\"\n", op->a_buf);
-				}
+				printf ("-0x%08"PFMT64x":", op->a_off);
+				int len = op->a_len; // R_MIN (op->a_len, strlen (op->a_buf));
+				for (i = 0; i < len; i++) {
+					printf ("%02x", op->a_buf[i]);
+				}
+				char *p = r_str_escape ((const char*)op->a_buf);
+				printf (" \"%s\"\n", p);
+				free (p);
 				if (!quiet) {
 					printf (Color_RESET);
 				}
@@ -134,17 +132,17 @@
 				if (!quiet) {
 					printf (Color_GREEN);
 				}
-				if (r_mem_is_printable ((const ut8 *) s, R_MIN (strlen (s), 5))) {
-					printf ("+ %s\n", s);
-				} else {
-					printf ("+:");
-					for (i = 0; i < op->b_len; i++) {
-						printf ("%02x", op->b_buf[i]);
-					}
-					printf (" \"%s\"\n", op->b_buf);
+				printf ("+0x%08"PFMT64x":", op->b_off);
+				for (i = 0; i < op->b_len; i++) {
+					printf ("%02x", op->b_buf[i]);
 				}
 				if (!quiet) {
+					char *p = r_str_escape((const char*)op->b_buf);
+					printf (" \"%s\"\n", p);
+					free (p);
 					printf (Color_RESET);
+				} else {
+					printf ("\n");
 				}
 			}
 		}
@@ -287,7 +285,7 @@
 	unsigned char UCLen = 0;
 	unsigned short USLen = 0;
 	int ILen = 0;
-	
+
 	// we copy from gdiff_start to a_off
 	if (offset_diff > 0) {
 
@@ -334,7 +332,7 @@
 		} else {
 			print_bytes (&gdiff_start, sizeof (gdiff_start), true);
 		}
-		
+
 		// print length for COPY
 		switch (opcode) {
 		case 249:
@@ -352,7 +350,7 @@
 			break;
 		}
 	}
-	
+
 	// we append data
 	if (op->b_len <= 246) {
 		ut8 data = op->b_len;
@@ -431,6 +429,10 @@
 	ut32 sz = R_MIN (as, bs);
 	ut32 i, j;
 	int ctx = DUMP_CONTEXT;
+	int pad = 0;
+	if (!a || !b || as < 0 || bs < 0) {
+		return;
+	}
 	switch (w) {
 	case 8:
 		r_cons_printf ("  offset     0 1 2 3 4 5 6 7 01234567    0 1 2 3 4 5 6 7 01234567\n");
@@ -445,6 +447,10 @@
 		return;
 	}
 	for (i = 0; i < sz; i += w) {
+		if (i + w >= sz) {
+			pad = w - sz + i;
+			w = sz - i;
+		}
 		bool eq = !memcmp (a + i, b + i, w);
 		if (eq) {
 			ctx--;
@@ -472,6 +478,9 @@
 				r_cons_printf (Color_RESET);
 			}
 		}
+		for (j = 0; j < pad; j++) {
+			r_cons_printf ("  ");
+		}
 		r_cons_printf (" ");
 		for (j = 0; j < w; j++) {
 			bool eq2 = a[i + j] == b[i + j];
@@ -483,6 +492,9 @@
 				r_cons_printf (Color_RESET);
 			}
 		}
+		for (j = 0; j < pad; j++) {
+			r_cons_printf (" ");
+		}
 		r_cons_printf ("   ");
 		for (j = 0; j < w; j++) {
 			bool eq2 = a[i + j] == b[i + j];
@@ -494,6 +506,9 @@
 				r_cons_printf (Color_RESET);
 			}
 		}
+		for (j = 0; j < pad; j++) {
+			r_cons_printf ("  ");
+		}
 		r_cons_printf (" ");
 		for (j = 0; j < w; j++) {
 			bool eq2 = a[i + j] == b[i + j];
@@ -661,7 +676,7 @@
 	const char *addr = NULL;
 	RCore *c = NULL, *c2 = NULL;
 	RDiff *d;
-	ut8 *bufa, *bufb;
+	ut8 *bufa = NULL, *bufb = NULL;
 	int o, sza, szb, /*diffmode = 0,*/ delta = 0;
 	int mode = MODE_DIFF;
 	int diffops = 0;
@@ -793,7 +808,9 @@
 		if (!c || !c2) {
 			eprintf ("Cannot open '%s'\n", r_str_get (file2));
 			return 1;
-		}	
+		}
+		c->c2 = c2;
+		c2->c2 = c;
 		if (arch) {
 			r_config_set (c->config, "asm.arch", arch);
 			r_config_set (c2->config, "asm.arch", arch);
@@ -816,8 +833,8 @@
 				addr = "main";
 			}
 			/* should be in mode not in bool pdc */
-			r_config_set (c->config, "scr.color", "false");
-			r_config_set (c2->config, "scr.color", "false");
+			r_config_set_i (c->config, "scr.color", COLOR_MODE_DISABLED);
+			r_config_set_i (c2->config, "scr.color", COLOR_MODE_DISABLED);
 
 			ut64 addra = r_num_math (c->num, addr);
 			bufa = (ut8 *) r_core_cmd_strf (c, "af;pdc @ 0x%08"PFMT64x, addra);
@@ -828,22 +845,26 @@
 			szb = strlen ((const char *) bufb);
 			mode = MODE_DIFF;
 		} else if (mode == MODE_GRAPH) {
+			int depth = r_config_get_i (c->config, "anal.depth");
+			if (depth < 1) {
+				depth = 64;
+			}
 			char *words = strdup (addr? addr: "0");
 			char *second = strstr (words, ",");
 			if (second) {
 				*second++ = 0;
 				ut64 off = r_num_math (c->num, words);
 				// define the same function at each offset
-				r_core_anal_fcn (c, off, UT64_MAX, R_ANAL_REF_TYPE_NULL, 0);
+				r_core_anal_fcn (c, off, UT64_MAX, R_ANAL_REF_TYPE_NULL, depth);
 				r_core_anal_fcn (c2, r_num_math (c2->num, second),
-					UT64_MAX, R_ANAL_REF_TYPE_NULL, 0);
+					UT64_MAX, R_ANAL_REF_TYPE_NULL, depth);
 				r_core_gdiff (c, c2);
 				r_core_anal_graph (c, off, R_CORE_ANAL_GRAPHBODY | R_CORE_ANAL_GRAPHDIFF);
 			} else {
 				r_core_anal_fcn (c, r_num_math (c->num, words),
-					UT64_MAX, R_ANAL_REF_TYPE_NULL, 0);
+					UT64_MAX, R_ANAL_REF_TYPE_NULL, depth);
 				r_core_anal_fcn (c2, r_num_math (c2->num, words),
-					UT64_MAX, R_ANAL_REF_TYPE_NULL, 0);
+					UT64_MAX, R_ANAL_REF_TYPE_NULL, depth);
 				r_core_gdiff (c, c2);
 				r_core_anal_graph (c, r_num_math (c->num, addr),
 					R_CORE_ANAL_GRAPHBODY | R_CORE_ANAL_GRAPHDIFF);
@@ -912,7 +933,9 @@
 			write (1, "\x04", 1);
 		}
 		if (diffmode == 'U') {
-			r_diff_buffers_unified (d, bufa, sza, bufb, szb);
+			char * res = r_diff_buffers_unified (d, bufa, sza, bufb, szb);
+			printf ("%s", res);
+			free (res);
 		} else if (diffmode == 'B') {
 			r_diff_set_callback (d, &bcb, 0);
 			r_diff_buffers (d, bufa, sza, bufb, szb);
diff -Nru radare2-2.3.0+dfsg/binr/rafind2/meson.build radare2-2.8.0+dfsg/binr/rafind2/meson.build
--- radare2-2.3.0+dfsg/binr/rafind2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rafind2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,11 @@
 executable('rafind2', 'rafind2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_search, r_io, r_cons],
-  install: true
+  dependencies: [
+    r_util_dep,
+    r_search_dep,
+    r_io_dep,
+    r_cons_dep
+  ],
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/rafind2/rafind2.c radare2-2.8.0+dfsg/binr/rafind2/rafind2.c
--- radare2-2.3.0+dfsg/binr/rafind2/rafind2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rafind2/rafind2.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,6 +22,7 @@
 static char *mask = NULL;
 static int nonstop = 0;
 static bool identify = false;
+static bool quiet = false;
 static int mode = R_SEARCH_STRING;
 static ut64 cur = 0;
 static ut8 *buf = NULL;
@@ -34,6 +35,10 @@
 
 static int hit(RSearchKeyword *kw, void *user, ut64 addr) {
 	int delta = addr - cur;
+	if (cur > addr && (cur - addr == kw->keyword_length - 1)) {
+		// This case occurs when there is hit in search left over
+		delta = cur - addr;
+	}
 	if (delta < 0 || delta >= bsize) {
 		eprintf ("Invalid delta\n");
 		return 0;
@@ -77,7 +82,7 @@
 }
 
 static int show_help(char *argv0, int line) {
-	printf ("Usage: %s [-mXnzZhv] [-a align] [-b sz] [-f/t from/to] [-[e|s|S] str] [-x hex] file ..\n", argv0);
+	printf ("Usage: %s [-mXnzZhqv] [-a align] [-b sz] [-f/t from/to] [-[e|s|S] str] [-x hex] file|dir ..\n", argv0);
 	if (line) return 0;
 	printf (
 	" -a [align] only accept aligned hits\n"
@@ -93,6 +98,7 @@
 	" -s [str]   search for a specific string (can be used multiple times)\n"
 	" -S [str]   search for a specific wide string (can be used multiple times)\n"
 	" -t [to]    stop search at address 'to'\n"
+	" -q         quiet - do not show headings (filenames) above matching contents (default for searching a single file)\n"
 	" -v         print version and exit\n"
 	" -x [hex]   search for hexpair string (909090) (can be used multiple times)\n"
 	" -X         show hexdump of search results\n"
@@ -102,12 +108,18 @@
 	return 0;
 }
 
-static int rafind_open(char *file) {
+static int rafind_open(char *file);
+
+static int rafind_open_file(char *file) {
 	const char *kw;
 	RListIter *iter;
 	bool last = false;
 	int ret;
 
+	if (!quiet) {
+		printf ("File: %s\n", file);
+	}
+
 	if (identify) {
 		char *cmd = r_str_newf ("r2 -e search.show=false -e search.maxhits=1 -nqcpm '%s'", file);
 		r_sandbox_system (cmd, 1);
@@ -154,6 +166,15 @@
 		free (tostr);
 		return 0;
 	}
+	if (mode == R_SEARCH_ESIL) {
+		char *cmd;
+		r_list_foreach (keywords, iter, kw) {
+			cmd = r_str_newf ("r2 -qc \"/E %s\" %s", kw, file);
+			r_sandbox_system (cmd, 1);
+			free (cmd);
+		}
+		return 0;
+	}
 	if (mode == R_SEARCH_KEYWORD) {
 		r_list_foreach (keywords, iter, kw) {
 			if (hexstr) {
@@ -199,11 +220,44 @@
 	return 0;
 }
 
+static int rafind_open_dir(char *dir) {
+	RList *files;
+	RListIter *iter;
+	char *fullpath;
+	char *fname = NULL;
+
+	files = r_sys_dir (dir);
+
+	if (files) {
+		r_list_foreach (files, iter, fname) {
+			/* Filter-out unwanted entries */
+			if (*fname == '.') {
+				continue;
+			}
+
+			fullpath = r_str_newf ("%s"R_SYS_DIR"%s", dir, fname);
+			rafind_open (fullpath);
+			free (fullpath);
+		}
+		r_list_free (files);
+	}
+
+	return 0;
+}
+
+static int rafind_open(char *file) {
+	if (r_file_is_directory (file)) {
+		return rafind_open_dir (file);
+	}
+
+	return rafind_open_file (file);
+}
+
 int main(int argc, char **argv) {
 	int c;
 
 	keywords = r_list_new ();
-	while ((c = getopt (argc, argv, "a:ie:b:mM:s:S:x:Xzf:t:rnhvZ")) != -1) {
+	while ((c = getopt (argc, argv, "a:ie:b:mM:s:S:x:Xzf:t:E:rqnhvZ")) != -1) {
 		switch (c) {
 		case 'a':
 			align = r_num_math (NULL, optarg);
@@ -225,6 +279,10 @@
 			hexstr = 0;
 			r_list_append (keywords, optarg);
 			break;
+		case 'E':
+			mode = R_SEARCH_ESIL;
+			r_list_append (keywords, optarg);
+			break;
 		case 's':
 			mode = R_SEARCH_KEYWORD;
 			hexstr = 0;
@@ -259,6 +317,9 @@
 		case 'X':
 			pr = r_print_new ();
 			break;
+		case 'q':
+			quiet = true;
+			break;
 		case 'v':
 			printf ("rafind2 v"R2_VERSION"\n");
 			return 0;
@@ -277,6 +338,10 @@
 	if (optind == argc) {
 		return show_help (argv[0], 1);
 	}
+	/* Enable quiet mode if searching just a single file */
+	if (optind + 1 == argc && !r_file_is_directory (argv[optind])) {
+		quiet = true;
+	}
 	for (; optind < argc; optind++) {
 		rafind_open (argv[optind]);
 	}
diff -Nru radare2-2.3.0+dfsg/binr/ragg2/meson.build radare2-2.8.0+dfsg/binr/ragg2/meson.build
--- radare2-2.3.0+dfsg/binr/ragg2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/ragg2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,17 @@
-
 executable('ragg2', 'ragg2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_egg, r_bin, r_core, r_hash, r_debug, r_fs, r_config, r_bp, r_crypto],
-  install: true
+  dependencies: [
+    r_util_dep,
+    r_egg_dep,
+    r_bin_dep,
+    r_core_dep,
+    r_hash_dep,
+    r_debug_dep,
+    r_fs_dep,
+    r_config_dep,
+    r_bp_dep,
+    r_crypto_dep
+  ],
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/ragg2/ragg2.c radare2-2.8.0+dfsg/binr/ragg2/ragg2.c
--- radare2-2.3.0+dfsg/binr/ragg2/ragg2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/ragg2/ragg2.c	2018-08-07 14:12:36.000000000 +0000
@@ -11,7 +11,7 @@
 #include <string.h>
 
 
-static int usage (int v) {
+static int usage(int v) {
 	printf ("Usage: ragg2 [-FOLsrxhvz] [-a arch] [-b bits] [-k os] [-o file] [-I path]\n"
 		"             [-i sc] [-e enc] [-B hex] [-c k=v] [-C file] [-p pad] [-q off]\n"
 		"             [-q off] [-dDw off:hex] file|f.asm|-\n");
@@ -50,7 +50,8 @@
 	return 1;
 }
 
-static void list (REgg *egg) {
+
+static void list(REgg *egg) {
 	RListIter *iter;
 	REggPlugin *p;
 	printf ("shellcodes:\n");
@@ -67,7 +68,7 @@
 	}
 }
 
-static int create (const char *format, const char *arch, int bits, const ut8 *code, int codelen) {
+static int create(const char *format, const char *arch, int bits, const ut8 *code, int codelen) {
 	RBin *bin = r_bin_new ();
 	RBuffer *b;
 	if (!r_bin_use_arch (bin, arch, bits, format)) {
@@ -86,7 +87,7 @@
 	return 0;
 }
 
-static int openfile (const char *f, int x) {
+static int openfile(const char *f, int x) {
 	int fd = open (f, O_RDWR | O_CREAT, 0644);
 	if (fd == -1) {
 		fd = open (f, O_RDWR);
@@ -179,19 +180,19 @@
 			free (arg);
 			}
 			break;
-		case 'n': 
+		case 'n':
 			{
 			ut32 n = r_num_math (NULL, optarg);
 			append = 1;
 			r_egg_patch (egg, -1, (const ut8*)&n, 4);
 			}
 			break;
-		case 'N': 
+		case 'N':
 			{
 			ut64 n = r_num_math (NULL, optarg);
 			r_egg_patch (egg, -1, (const ut8*)&n, 8);
 			append = 1;
-			} 
+			}
 			break;
 		case 'd':
 			{
@@ -315,6 +316,12 @@
 
 	// catch this first
 	if (get_offset) {
+		if (strncmp (sequence, "0x", 2)) {
+			eprintf ("Need hex value with `0x' prefix e.g. 0x41414142\n");
+			free (sequence);
+			return 1;
+		}
+
 		get_offset = r_num_math (0, sequence);
 		printf ("Little endian: %d\n", r_debruijn_offset (get_offset, false));
 		printf ("Big endian: %d\n", r_debruijn_offset (get_offset, true));
@@ -334,6 +341,28 @@
 				}
 				r_egg_load (egg, buf, 0);
 			}
+		} else if (strstr (file, ".c")) {
+			char *fileSanitized = strdup (file);
+			r_str_sanitize (fileSanitized);
+			char *textFile = r_egg_Cfile_parser (fileSanitized, arch, os, bits);
+
+			if (!textFile) {
+				eprintf ("Failure while parsing '%s'\n", fileSanitized);
+				goto fail;
+			}
+
+			int l;
+			char *buf = r_file_slurp (textFile, &l);
+			if (buf && l > 0) {
+				r_egg_raw (egg, (const ut8*)buf, l);
+			} else {
+				eprintf ("Error loading '%s'\n", textFile);
+			}
+
+			r_file_rm (textFile);
+			free (fileSanitized);
+			free (textFile);
+			free (buf);
 		} else {
 			if (strstr (file, ".s") || strstr (file, ".asm")) {
 				fmt = 'a';
@@ -436,7 +465,7 @@
 
 	// add padding
 	if (padding) {
-		r_egg_padding (egg, padding); 
+		r_egg_padding (egg, padding);
 	}
 
 	// add pattern
@@ -455,7 +484,7 @@
 	r_egg_finalize (egg);
 
 	if (show_asm) {
-		printf ("%s\n", r_egg_get_assembly (egg));	
+		printf ("%s\n", r_egg_get_assembly (egg));
 	}
 
 	if (show_raw || show_hex || show_execute) {
diff -Nru radare2-2.3.0+dfsg/binr/ragg2/ragg2-cc radare2-2.8.0+dfsg/binr/ragg2/ragg2-cc
--- radare2-2.3.0+dfsg/binr/ragg2/ragg2-cc	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/ragg2/ragg2-cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,320 +0,0 @@
-#!/bin/sh
-# ragg2-cc : a shellcode compiler -- pancake - 2011-2016
-#
-# Supported operating systems:
-#  - GNU/Linux
-#  - OSX
-#  - BSD
-# Supported compilers
-#  - gcc
-#  - clang
-# TODO
-#  add support for arm
-#  add support for nested shellcodes
-
-# Find which compiler is installed
-if [ -z "${CC}" ]; then
-	for a in llvm-gcc clang gcc ; do
-		$a --version >/dev/null 2>&1
-		if [ $? = 0 ]; then
-			CC="$a"
-			break
-		fi
-	done
-	if [ -z "${CC}" ]; then
-		echo "Cannot find CC" >&2
-		exit 1
-	fi
-fi
-
-# Get path for sflib
-if [ -z "${SFLIBPATH}" ]; then
-	SFLIBPATH="$(r2 -hh | grep INCDIR | awk '{print $2}')"/sflib
-fi
-if [ ! -d "${SFLIBPATH}" ]; then
-	echo "Cannot find ${SFLIBPATH}"
-	echo "Define SFLIBPATH env var or fix the r2 installation"
-	exit 1
-fi
-
-# Get local architecture
-case "$(uname -m)" in
-arm64|aarch64|x86_64)
-	B=64
-	;;
-*)
-	B=32
-	;;
-esac
-
-dohelp() {
-	cat<<EOF
-Usage: ragg2-cc [-cdsvx] [-a arch] [-b bits] [-k kernel] [-o output] [file.c]
-  -a x86   set arch (x86, arm)
-  -b 32    bits (32, 64)
-  -c       generate compiled shellcode
-  -d       enable debug mode
-  -k linux set kernel (darwin, linux)
-  -o file  set output file
-  -s       generate assembly
-  -v       show version
-  -x       show hexpair bytes
-EOF
-}
-
-case "`uname`" in
-Darwin)
-	K=darwin
-	;;
-*)
-	K=linux
-	;;
-esac
-
-X=0
-C=""
-D=""
-O=""
-F=""
-ASM=0
-A=x86
-while : ; do
-	[ -z "$1" ] && break
-	F=$1
-	case "$F" in
-	-a) # architecture (x86, mips, arm)
-		shift
-		A=$1
-		[ -z "$A" ] && { echo "Missing argument for -a" ; exit 1; }
-		;;
-	-b)  # register size (32, 64, ...)
-		shift
-		B=$1
-		[ -z "$B" ] && { echo "Missing argument for -b" ; exit 1; }
-		;;
-	-k)  # kernel
-		shift
-		K=$1
-		[ -z "$K" ] && { echo "Missing argument for -k" ; exit 1; }
-		;;
-	-x)  # execute
-		X=1
-		;;
-	-c)  # set configuration option
-		C=1
-		;;
-	-d)  # patch dword (4 bytes) at given offset
-		D=1
-		;;
-	-s)  # show assembler
-		ASM=1
-		;;
-	-o)  # output file
-		shift
-		O=$1
-		if [ -z "$O" ]; then
-			echo "Missing argument for -o"
-			exit 1
-		fi
-		;;
-	-h)  # help
-		dohelp
-		exit 0
-		;;
-	-v)  # version
-		ragg2 -v | sed -e 's,2,2-cc,'
-		exit 0
-		;;
-	esac
-	shift
-done
-
-if [ -z "$F" ]; then
-	dohelp
-	exit 1
-fi
-
-JMP=jmp
-case "$A" in
-arm|aarch64|arm64|thumb|arm32)
-	JMP=b
-	;;
-mips|mips32|mips64)
-	JMP=b
-	;;
-esac
-
-FMT=elf
-if [ "$K" = darwin ]; then
-	OBJCOPY=gobjcopy
-	FMT=mach0
-	ARCH="$A"
-	if [ "$ARCH" = x86 ]; then
-		if [ "${B}" = 32 ]; then
-			ARCH=i386
-			TRIPLET=darwin-x86-32
-		else
-			ARCH=x86_64
-			TRIPLET=darwin-x86-64
-		fi
-		case "$B" in
-		32)
-			CFLAGS="-arch $ARCH "
-			LDFLAGS="-arch $ARCH -shared -c"
-			;;
-		64)
-			CFLAGS="-arch $ARCH"
-			LDFLAGS="-arch $ARCH -shared -c"
-			;;
-		esac
-	else
-		LDFLAGS="-shared -c"
-	fi
-	SHDR="
-.text
-${JMP} _main"
-else
-	OBJCOPY=objcopy
-	SHDR="
-.section .text
-.globl  main
-// .type   main, @function
-${JMP} main
-"
-	if [ "$A" = x86 ]; then
-		case "$B" in
-		64)
-			CFLAGS="-fPIC -fPIE -pie -fpic -m64"
-			LDFLAGS="-fPIC -fPIE -pie -fpic -m64"
-			TRIPLET=linux-x86-64
-			;;
-		*) 
-			CFLAGS="-fPIC -fPIE -pie -fpic -m32"
-			LDFLAGS="-fPIC -fPIE -pie -fpic -m32"
-			TRIPLET=linux-x86-32
-			;;
-		esac
-	else
-		CFLAGS="-fPIC -fPIE -pie -fpic -nostartfiles"
-		LDFLAGS="-fPIC -fPIE -pie -fpic -nostartfiles"
-	fi
-fi
-
-[ "$A$K" ] && TRIPLET="$K-$A-$B"
-
-case "$K" in
-windows)
-	#TEXT="__TEXT.__text"
-	TEXT=".text"
-	FMT=pe
-	;;
-darwin)
-	#TEXT="__TEXT.__text"
-	#TEXT="0.__text"
-	TEXT=0.__TEXT.__text
-	FMT=mach0
-	;;
-*|linux)
-	TEXT=".text"
-	FMT=elf
-	;;
-esac
-
-USE_CLANG=0
-case "$K-$A-$B" in
-darwin-arm-64)
-	CC="xcrun --sdk iphoneos gcc -arch arm64 -miphoneos-version-min=0.0"
-	USE_CLANG=1
-	TEXT=0.__TEXT.__text
-	;;
-darwin-arm-32)
-	USE_CLANG=1
-	CC="xcrun --sdk iphoneos gcc -arch armv7 -miphoneos-version-min=0.0"
-	TEXT=0.__TEXT.__text
-	;;
-esac
-
-OPT=-Os
-CFLAGS="${CFLAGS} -nostdinc -include ${SFLIBPATH}/${TRIPLET}/sflib.h"
-if [ 1 = "${USE_CLANG}" ]; then
-	CFLAGS="${CFLAGS} -fomit-frame-pointer -fno-zero-initialized-in-bss"
-else
-	CFLAGS="${CFLAGS} -z execstack -fomit-frame-pointer -finline-functions -fno-zero-initialized-in-bss"
-fi
-LDFLAGS="${LDFLAGS} -nostdlib"
-
-
-rmtemps() {
-	[ -z "$D" ] && rm -f $F.tmp $F.text $F.s $F.o
-}
-
-fail() {
-	echo "ERROR: $@"
-	rmtemps
-	exit 1
-}
-
-if [ "$D" ]; then
-	echo "==> Compile"
-	echo "${CC} ${CFLAGS} -o $F.tmp -S ${OPT} $F"
-fi
-rm -f "$F.bin"
-echo ${CC} ${CFLAGS} -o "$F.tmp" -S ${OPT} "$F"
-${CC} ${CFLAGS} -o "$F.tmp" -S ${OPT} "$F" || fail
-echo "${SHDR}" > $F.s
-cat "$F.tmp" \
-	| sed -e s,rdata,text, -e s,rodata,text, -e 's,get_pc_thunk.bx,__getesp__,g' \
-	| grep -v .cstring | grep -v size | grep -v ___main | grep -v section \
-	| grep -v __alloca | grep -v zero | grep -v cfi >> $F.s
-rm -f "$F.tmp"
-if [ $ASM = 1 ]; then
-	echo "$F.s"
-	exit 0
-fi
-
-echo ==============================
-
-if [ "$D" ]; then
-	echo "==> Assemble"
-	echo "${CC} ${LDFLAGS} ${OPT} -o $F.o $F.s"
-fi
-echo "${CC} ${LDFLAGS} ${OPT} -o $F.o $F.s"
-${CC} ${LDFLAGS} ${OPT} -o "$F.o" "$F.s" || fail 'compile object'
-
-if [ "$D" ]; then
-	echo "==> Link"
-	#echo "${OBJCOPY} -j .text -O binary $F.o $.text"
-	echo "rabin2 -o '$F.text' -O d/S/${TEXT} $F.o"
-fi
-rabin2 -o "$F.text" -O d/S/${TEXT} $F.o
-if [ ! -f "$F.o" ]; then
-	echo "Cannot find $F.o"
-	exit 1
-fi
-if [ "`du $F.text|awk '{print $1}'`" = 0 ]; then
-	# use objcopy as falback for rabin2
-	echo "FALLBACK: Using objcopy instead of rabin2"
-	${OBJCOPY} -j .text -O binary $F.o $F.text || fail
-fi
-if [ "$C" = 1 ]; then
-	if [ "$O" ]; then
-		mv "$F.text" "$O"
-	else
-		O="$F.text"
-	fi
-	echo "$O"
-	exit 0
-fi
-
-[ "$X" = 1 ] && exec rax2 -S < "$F.text"
-
-if [ "$D" ]; then
-#	hexdump -C $F.text
-	rax2 -S - < $F.text
-	ls -l $F.text
-fi
-[ -z "$O" ] && O="$F.bin"
-ragg2 -b "$B" -C "$F.text" -f ${FMT} -a $A -o "$O" || fail "ragg2 cannot generate executable. Use -x"
-echo "$O"
-rmtemps
-exit 0
diff -Nru radare2-2.3.0+dfsg/binr/rahash2/meson.build radare2-2.8.0+dfsg/binr/rahash2/meson.build
--- radare2-2.3.0+dfsg/binr/rahash2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rahash2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,12 @@
 executable('rahash2', 'rahash2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_hash, r_io, r_crypto, r_socket],
-  install: true
+  dependencies: [
+    r_util_dep,
+    r_hash_dep,
+    r_io_dep,
+    r_crypto_dep,
+    r_socket_dep
+  ],
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/rahash2/rahash2.c radare2-2.8.0+dfsg/binr/rahash2/rahash2.c
--- radare2-2.3.0+dfsg/binr/rahash2/rahash2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rahash2/rahash2.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <stdio.h>
 #include <string.h>
@@ -96,7 +96,11 @@
 			printf ("0x%08"PFMT64x "-0x%08"PFMT64x " %s: ",
 				from, to > 0? to - 1: 0, hname);
 		}
-		do_hash_hexprint (c, dlen, ule, rad);
+		if (dlen == R_HASH_SIZE_ENTROPY) {
+			printf("%.8f\n", ctx->entropy);
+		} else {
+			do_hash_hexprint (c, dlen, ule, rad);
+		}
 		break;
 	case 1:
 		printf ("e file.%s=", hname);
@@ -124,28 +128,13 @@
 		return 0;
 	}
 	dlen = r_hash_calculate (ctx, hash, buf, len);
-	if (!dlen) {
-		return 0;
-	}
 	if (!print) {
 		return 1;
 	}
-	if (hash == R_HASH_ENTROPY) {
-		double e = r_hash_entropy (buf, len);
-		if (rad) {
-			eprintf ("entropy: %10f\n", e);
-		} else {
-			printf ("0x%08"PFMT64x "-0x%08"PFMT64x " %10f: ",
-				from, to > 0? to - 1: 0, e);
-			r_print_progressbar (NULL, 12.5 * e, 60);
-			printf ("\n");
-		}
-	} else {
-		if (iterations > 0) {
-			r_hash_do_spice (ctx, hash, iterations, _s);
-		}
-		do_hash_print (ctx, hash, dlen, rad, le);
+	if (iterations > 0) {
+		r_hash_do_spice (ctx, hash, iterations, _s);
 	}
+	do_hash_print (ctx, hash, dlen, rad, le);
 	return 1;
 }
 
@@ -313,14 +302,14 @@
 		bits = 1ULL << i;
 		const char *name = r_hash_name (bits);
 		if (name && *name) {
-			printf ("  %s\n", name);
+			printf ("h  %s\n", name);
 		}
 	}
 	eprintf ("\nAvailable Encoders/Decoders: \n");
 	// TODO: do not hardcode
-	printf ("  base64\n");
-	printf ("  base91\n");
-	printf ("  punycode\n");
+	printf ("e  base64\n");
+	printf ("e  base91\n");
+	printf ("e  punycode\n");
 	eprintf ("\nAvailable Crypto Algos: \n");
 	for (i = 0;; i++) {
 		bits = ((ut64) 1) << i;
@@ -328,7 +317,7 @@
 		if (!name || !*name) {
 			break;
 		}
-		printf ("  %s\n", name);
+		printf ("c  %s\n", name);
 	}
 }
 
@@ -440,6 +429,7 @@
 	int ivlen = -1;
 	char *ivseed = NULL;
 	const char *compareStr = NULL;
+	const char *ptype = NULL;
 	ut8 *compareBin = NULL;
 	int hashstr_len = -1;
 	int hashstr_hex = 0;
@@ -448,7 +438,7 @@
 	RHash *ctx;
 	RIO *io;
 
-	while ((c = getopt (argc, argv, "jD:rveE:a:i:I:S:s:x:b:nBhf:t:kLqc:")) != -1) {
+	while ((c = getopt (argc, argv, "p:jD:rveE:a:i:I:S:s:x:b:nBhf:t:kLqc:")) != -1) {
 		switch (c) {
 		case 'q': quiet++; break;
 		case 'i':
@@ -468,6 +458,7 @@
 		case 'e': ule = 1; break;
 		case 'r': rad = 1; break;
 		case 'k': rad = 2; break;
+		case 'p': ptype = optarg; break;
 		case 'a': algo = optarg; break;
 		case 'B': incremental = 0; break;
 		case 'b': bsize = (int) r_num_math (NULL, optarg); break;
@@ -534,6 +525,16 @@
 			return 1;
 		}
 	}
+	if (ptype) {
+		// TODO: support p=%s (horizontal bars)
+		// TODO: list supported statistical metrics
+		// TODO: support -f and -t
+		for (i = optind; i < argc; i++) {
+			printf ("%s:\n", argv[i]);
+			r_sys_cmdf ("r2 -qfnc \"p==%s 100\" \"%s\"", ptype, argv[i]);
+		}
+		return 0;
+	}
 	// convert iv to hex or string.
 	if (ivseed) {
 		iv = (ut8 *) malloc (strlen (ivseed) + 128);
diff -Nru radare2-2.3.0+dfsg/binr/rarun2/meson.build radare2-2.8.0+dfsg/binr/rarun2/meson.build
--- radare2-2.3.0+dfsg/binr/rarun2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rarun2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,9 @@
 executable('rarun2', 'rarun2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_socket],
-  install: true
+  dependencies: [
+    r_util_dep,
+    r_socket_dep
+  ],
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/rasm2/meson.build radare2-2.8.0+dfsg/binr/rasm2/meson.build
--- radare2-2.3.0+dfsg/binr/rasm2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rasm2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,12 @@
-
 executable('rasm2', 'rasm2.c',
   include_directories: [platform_inc],
-  link_with: [r_util, r_asm, r_anal, r_syscall],
-  objects: [
-    libr2sdb.extract_all_objects(),
+  dependencies: [
+    r_util_dep,
+    r_asm_dep,
+    r_anal_dep,
+    r_syscall_dep,
+    sdb_dep
   ],
-  install: true
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/rasm2/rasm2.c radare2-2.8.0+dfsg/binr/rasm2/rasm2.c
--- radare2-2.3.0+dfsg/binr/rasm2/rasm2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rasm2/rasm2.c	2018-08-07 14:12:36.000000000 +0000
@@ -30,7 +30,7 @@
 	}
 	for (ret = 0; ret < len;) {
 		aop.size = 0;
-		if (r_anal_op (anal, &aop, offset, buf + ret, len - ret) > 0) {
+		if (r_anal_op (anal, &aop, offset, buf + ret, len - ret, R_ANAL_OP_MASK_BASIC) > 0) {
 			//printf ("%s\n", R_STRBUF_SAFEGET (&aop.esil));
 		}
 		if (aop.size < 1) {
@@ -148,7 +148,7 @@
 	char *bytes, *stackop = NULL;
 	int ret;
 
-	ret = r_anal_op (anal, op, offset, buf, len);
+	ret = r_anal_op (anal, op, offset, buf, len, R_ANAL_OP_MASK_ESIL);
 	if (ret) {
 		stackop = stackop2str (op->stackop);
 		optype = r_anal_optype_to_string (op->type);
@@ -273,7 +273,7 @@
 		RAnalOp aop = { 0 };
 		while (ret < len) {
 			aop.size = 0;
-			if (r_anal_op (anal, &aop, offset, data + ret, len - ret) > 0) {
+			if (r_anal_op (anal, &aop, offset, data + ret, len - ret, R_ANAL_OP_MASK_ESIL) > 0) {
 				printf ("%s\n", R_STRBUF_SAFEGET (&aop.esil));
 			}
 			if (aop.size < 1) {
@@ -446,15 +446,21 @@
 			r_lib_opendir (l, path);
 
 		if (1) {
-			char *homeplugindir = r_str_home (R2_HOMEDIR "/plugins");
+			char *homeplugindir = r_str_home (R2_HOME_PLUGINS);
 			// eprintf ("OPENDIR (%s)\n", homeplugindir);
 			r_lib_opendir (l, homeplugindir);
 			free (homeplugindir);
 		}
 		if (1) { //where & R_CORE_LOADLIBS_SYSTEM) {
-			r_lib_opendir (l, R2_LIBDIR "/radare2/" R2_VERSION);
-			r_lib_opendir (l, R2_LIBDIR "/radare2-extras/" R2_VERSION);
-			r_lib_opendir (l, R2_LIBDIR "/radare2-bindings/" R2_VERSION);
+			char *plugindir = r_str_r2_prefix (R2_PLUGINS);
+			char *extrasdir = r_str_r2_prefix (R2_EXTRAS);
+			char *bindingsdir = r_str_r2_prefix (R2_BINDINGS);
+			r_lib_opendir (l, plugindir);
+			r_lib_opendir (l, extrasdir);
+			r_lib_opendir (l, bindingsdir);
+			free (plugindir);
+			free (extrasdir);
+			free (bindingsdir);
 		}
 		free (tmp);
 	}
diff -Nru radare2-2.3.0+dfsg/binr/rax2/meson.build radare2-2.8.0+dfsg/binr/rax2/meson.build
--- radare2-2.3.0+dfsg/binr/rax2/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rax2/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,6 @@
-
 executable('rax2', 'rax2.c',
   include_directories: [platform_inc],
-  link_with: [r_util],
-  install: true
+  dependencies: [r_util_dep],
+  install: true,
+  implicit_include_directories: false
 )
diff -Nru radare2-2.3.0+dfsg/binr/rax2/rax2.c radare2-2.8.0+dfsg/binr/rax2/rax2.c
--- radare2-2.3.0+dfsg/binr/rax2/rax2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rax2/rax2.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,7 +1,8 @@
-/* radare - LGPL - Copyright 2007-2017 - pancake */
+/* radare - LGPL - Copyright 2007-2018 - pancake */
 
 #include "../blob/version.c"
 #include <r_print.h>
+#include <r_util.h>
 
 #define STDIN_BUFFER_SIZE 354096
 #define R_STATIC_ASSERT(x)\
@@ -32,22 +33,20 @@
 	case 'I':
 		printf ("%" PFMT64d "\n", n);
 		break;
-	case '0': {
-		int len = strlen (s);
-		if (len > 0 && s[len - 1] == 'f') {
-			R_STATIC_ASSERT (sizeof (float) == 4)
-			float f = (float) num->fvalue;
-			ut8 *p = (ut8 *) &f;
-			printf ("Fx%02x%02x%02x%02x\n", p[3], p[2], p[1], p[0]);
-		} else {
-			printf ("0x%" PFMT64x "\n", n);
-		}
-	} break;
+	case '0':
+		printf ("0x%" PFMT64x "\n", n);
+		break;
 	case 'F': {
 		float *f = (float *) &n;
 		printf ("%ff\n", *f);
 	} break;
 	case 'f': printf ("%.01lf\n", num->fvalue); break;
+	case 'l':
+		R_STATIC_ASSERT (sizeof (float) == 4);
+		float f = (float) num->fvalue;
+		ut8 *p = (ut8 *) &f;
+		printf ("Fx%02x%02x%02x%02x\n", p[3], p[2], p[1], p[0]);
+		break;
 	case 'O': printf ("0%" PFMT64o "\n", n); break;
 	case 'B':
 		if (n) {
@@ -72,6 +71,10 @@
 	return true;
 }
 
+static void print_ascii_table() {
+	printf("%s", ret_ascii_table());
+}
+
 static int help() {
 	printf (
 		"  =[base]                      ;  rax2 =10 0x46 -> output in base 10\n"
@@ -94,6 +97,7 @@
 		"  raw     ->  hex              ;  rax2 -S < /binfile\n"
 		"  hex     ->  raw              ;  rax2 -s 414141\n"
 		"  -l                           ;  append newline to output (for -E/-D/-r/..\n"
+		"  -a      show ascii table     ;  rax2 -a\n"
 		"  -b      bin -> str           ;  rax2 -b 01000101 01110110\n"
 		"  -B      str -> bin           ;  rax2 -B hello\n"
 		"  -d      force integer        ;  rax2 -d 3 -> 3 instead of 0x3\n"
@@ -101,8 +105,9 @@
 		"  -D      base64 decode        ;\n"
 		"  -E      base64 encode        ;\n"
 		"  -f      floating point       ;  rax2 -f 6.3+2.1\n"
-		"  -F      stdin slurp code hex ;  rax2 -F < shellcode.c\n"
+		"  -F      stdin slurp code hex ;  rax2 -F < shellcode.[c/py/js]\n"
 		"  -h      help                 ;  rax2 -h\n"
+		"  -i      dump as C byte array ;  rax2 -i < bytes\n"
 		"  -k      keep base            ;  rax2 -k 33+3 -> 36\n"
 		"  -K      randomart            ;  rax2 -K 0x34 1020304050\n"
 		"  -L      bin -> hex(bignum)   ;  rax2 -L 111111111 # 0x1ff\n"
@@ -120,7 +125,6 @@
 }
 
 static int rax(char *str, int len, int last) {
-	float f;
 	ut8 *buf;
 	char *p, out_mode = (flags & 128)? 'I': '0';
 	int i;
@@ -145,6 +149,7 @@
 		while (str[1] && str[1] != ' ') {
 			switch (str[1]) {
 			case 'l': nl = "\n"; break;
+			case 'a': print_ascii_table (); return 0;
 			case 's': flags ^= 1; break;
 			case 'e': flags ^= 1 << 1; break;
 			case 'S': flags ^= 1 << 2; break;
@@ -165,13 +170,17 @@
 			case 'w': flags ^= 1 << 16; break;
 			case 'r': flags ^= 1 << 18; break;
 			case 'L': flags ^= 1 << 19; break;
+			case 'i': flags ^= 1 << 21; break;
 			case 'v': blob_version ("rax2"); return 0;
 			case '\0': return !use_stdin ();
 			default:
+				/* not as complete as for positive numbers */
 				out_mode = (flags ^ 32)? '0': 'I';
 				if (str[1] >= '0' && str[1] <= '9') {
 					if (str[2] == 'x') {
 						out_mode = 'I';
+					} else if (r_str_endswith (str, "f")) {
+						out_mode = 'l';
 					}
 					return format_output (out_mode, str);
 				}
@@ -361,7 +370,7 @@
 		char *out = calloc (sizeof (char), (len + 2) / 3 * 4 + 1); // ceil(len/3)*4 plus 1 for NUL
 		if (out) {
 			r_base64_encode (out, (const ut8 *) str, len);
-			printf ("%s\n", out);
+			printf ("%s%s", out, nl);
 			fflush (stdout);
 			free (out);
 		}
@@ -411,6 +420,7 @@
 		s = n >> 16 << 12;
 		a = n & 0x0fff;
 		r_num_units (unit, n);
+#if 0
 		eprintf ("%" PFMT64d " 0x%" PFMT64x " 0%" PFMT64o
 			" %s %04x:%04x ",
 			n, n, n, unit, s, a);
@@ -428,25 +438,56 @@
 		r_str_bits (out, (const ut8 *) &n, sizeof (n), NULL);
 		eprintf ("%s %.01lf %ff %lf\n",
 			out, num->fvalue, f, d);
+#endif
+				printf ("hex     0x%"PFMT64x"\n", n);
+				printf ("octal   0%"PFMT64o"\n", n);
+				printf ("unit    %s\n", unit);
+				printf ("segment %04x:%04x\n", s, a);
+				if (n >> 32) {
+					printf ("int64   %"PFMT64d"\n", (st64)n);
+				} else {
+					printf ("int32   %d\n", (st32)n);
+				}
+				if (asnum) {
+					printf ("string  \"%s\"\n", asnum);
+					free (asnum);
+				}
+				/* binary and floating point */
+				r_str_bits64 (out, n);
+				memcpy (&f, &n, sizeof (f));
+				memcpy (&d, &n, sizeof (d));
+				printf ("binary  0b%s\n", out);
+				printf ("float:  %ff\n", f);
+				printf ("double: %lf\n", d);
+
+				/* ternary */
+				r_num_to_trits (out, n);
+				printf ("trits   0t%s\n", out);
 
 		return true;
 	} else if (flags & (1 << 19)) { // -L
 		r_print_hex_from_bin (NULL, str);
 		return true;
-	} else if (flags & (1 << 20)) { // -P
-		char *str = r_stdin_slurp (NULL);
-		if (str) {
-			char *res = r_hex_from_py (str);
-			if (res) {
-				printf ("%s\n", res);
-				fflush (stdout);
-				free (res);
-			} else {
-				eprintf ("Invalid input.\n");
-			}
-			free (str);
-		}
-		return false;
+	} else if (flags & (1 << 21)) { // -i
+		static const char start[] = "unsigned char buf[] = {";
+		printf (start);
+		/* resonable amount of bytes per line */
+		const int byte_per_col = 12;
+		for (i = 0; i < len-1; i++) {
+			/* wrapping every N bytes */
+			if (i % byte_per_col == 0) {
+				printf ("\n  ");
+			}
+			printf ("0x%02x, ", (ut8) str[i]);
+		}
+		/* some care for the last element */
+		if (i % byte_per_col == 0) {
+			printf("\n  ");
+		}
+		printf ("0x%02x\n", (ut8) str[len-1]);
+		printf ("};\n");
+		printf ("unsigned int buf_len = %d;\n", len);
+		return true;
 	}
 
 	if (r_str_startswith (str, "0x")) {
@@ -474,10 +515,7 @@
 		str[strlen (str) - 1] = 'b';
 		// TODO: Move print into format_output
 	} else if (r_str_endswith (str, "f")) {
-		ut8 *p = (ut8 *) &f;
-		sscanf (str, "%f", &f);
-		printf ("Fx%02x%02x%02x%02x\n", p[3], p[2], p[1], p[0]);
-		return true;
+		out_mode = 'l';
 	} else if (r_str_endswith (str, "dt")) {
 		out_mode = 'I';
 		str[strlen (str) - 2] = 't';
@@ -500,7 +538,7 @@
 	if (!buf) {
 		return 0;
 	}
-	if (!(flags & 16384)) {
+	if (!(flags & (1<<14))) {
 		for (l = 0; l >= 0 && l < STDIN_BUFFER_SIZE; l++) {
 			// make sure we don't read beyond boundaries
 			int n = read (0, buf + l, STDIN_BUFFER_SIZE - l);
@@ -514,7 +552,7 @@
 			}
 			buf[n] = 0;
 			// if (sflag && strlen (buf) < STDIN_BUFFER_SIZE) // -S
-			buf[STDIN_BUFFER_SIZE] = '\0'; 
+			buf[STDIN_BUFFER_SIZE] = '\0';
 			if (!rax (buf, l, 0)) {
 				break;
 			}
diff -Nru radare2-2.3.0+dfsg/binr/rules.mk radare2-2.8.0+dfsg/binr/rules.mk
--- radare2-2.3.0+dfsg/binr/rules.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/binr/rules.mk	2018-08-07 14:12:36.000000000 +0000
@@ -2,12 +2,9 @@
 include ../../libr/config.mk
 include ../../shlr/zip/deps.mk
 
-ifneq ($(OSTYPE),windows)
-# tcc doesn't recognize the -pie option
 ifeq (,$(findstring tcc,${CC}))
 CFLAGS+=-pie
 endif
-endif
 CFLAGS+=-I$(LTOP)/include
 
 ifeq (${COMPILER},emscripten)
@@ -21,25 +18,26 @@
 OBJ+=${BIN}.o
 BEXE=${BIN}${EXT_EXE}
 
-ifeq ($(WITHNONPIC),1)
-## LDFLAGS+=$(addsuffix /lib${BINDEPS}.a,$(addprefix ../../libr/,$(subst r_,,$(BINDEPS))))
-LDFLAGS+=$(shell for a in ${BINDEPS} ; do b=`echo $$a |sed -e s,r_,,g`; echo ../../libr/$$b/lib$$a.${EXT_AR} ; done )
-LDFLAGS+=../../shlr/sdb/src/libsdb.a
-ifeq (1,$(WITH_GPL))
-LDFLAGS+=../../shlr/grub/libgrubfs.a
-endif
-LDFLAGS+=../../shlr/gdb/lib/libgdbr.a
-LDFLAGS+=../../shlr/windbg/libr_windbg.a
-LDFLAGS+=../../shlr/capstone/libcapstone.a
-LDFLAGS+=../../shlr/java/libr_java.a
-LDFLAGS+=../../libr/socket/libr_socket.a
-LDFLAGS+=../../libr/util/libr_util.a
-ifneq (${OSTYPE},haiku)
-ifneq ($(CC),cccl)
-LDFLAGS+=-lm
-endif
-endif
-endif
+# ifeq ($(WITHNONPIC),1)
+# ## LDFLAGS+=$(addsuffix /lib${BINDEPS}.a,$(addprefix ../../libr/,$(subst r_,,$(BINDEPS))))
+# LDFLAGS+=$(shell for a in ${BINDEPS} ; do b=`echo $$a |sed -e s,r_,,g`; echo ../../libr/$$b/lib$$a.${EXT_AR} ; done )
+# LDFLAGS+=../../shlr/sdb/src/libsdb.a
+# ifeq (1,$(WITH_GPL))
+# LDFLAGS+=../../shlr/grub/libgrubfs.a
+# endif
+# LDFLAGS+=../../shlr/gdb/lib/libgdbr.a
+# LDFLAGS+=../../shlr/windbg/libr_windbg.a
+# LDFLAGS+=../../shlr/capstone/libcapstone.a
+# LDFLAGS+=../../shlr/java/libr_java.a
+# LDFLAGS+=../../libr/socket/libr_socket.a
+# LDFLAGS+=../../libr/util/libr_util.a
+# ifneq (${OSTYPE},haiku)
+# ifneq ($(CC),cccl)
+# LDFLAGS+=-lm
+# endif
+# endif
+# endif
+
 LDFLAGS+=${DL_LIBS}
 LDFLAGS+=${LINK}
 ifneq (${ANDROID},1)
@@ -76,15 +74,11 @@
 
 # -static fails because -ldl -lpthread static-gcc ...
 ${BEXE}: ${OBJ} ${SHARED_OBJ}
-ifeq ($(WITHNONPIC),1)
-	${CC} -pie ${CFLAGS} $+ -L.. -o $@ $(REAL_LDFLAGS)
-else
 ifneq ($(SILENT),)
 	@echo LD $@
 endif
 	${CC} ${CFLAGS} $+ -L.. -o $@ $(REAL_LDFLAGS)
 endif
-endif
 
 # Dummy myclean rule that can be overriden by the t/ Makefile
 # TODO: move to config.mk ? it must be a precondition
diff -Nru radare2-2.3.0+dfsg/configure radare2-2.8.0+dfsg/configure
--- radare2-2.3.0+dfsg/configure	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/configure	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,10 @@
 #!/bin/sh
-# This script was automatically generated by ACR v1.4
+# This script was automatically generated by ACR v1.6.2
 # @author: pancake <nopcode.org>
 # @url:    http://www.nopcode.org
 # @repo:   git clone https://github.com/radare/acr
 
+[ -z "${AWK}" ] && AWK=awk
 do_remove() {
 if [ "${ACR_RMFILES}" ]; then
   printf "cleaning temporally files... "
@@ -21,15 +22,15 @@
 USE_MAGIC=0
 LOADLIBS=1
 HAVE_FORK=1
+WITH_LIBR=0
 WITH_CAPSTONE=0
 USE_ZIP=0
+USE_XXHASH=0
 WITH_GPL=1
 WANT_OPENSSL=0
 USE_RPATH=0
 [ -z "${USERCC}" ] && USERCC="gcc"
 [ -z "${USEROSTYPE}" ] && USEROSTYPE="auto"
-WITHPIC=1
-WITHNONPIC=0
 [ -z "${LIBVERSION}" ] && LIBVERSION="xxx"
 HAVE_JEMALLOC=1
 split_host() {
@@ -38,7 +39,7 @@
 ENVWORDS="${ENVWORDS} $1_CPU $1_OS"
 STR=`eval "echo ${S}$1"`
 SPLIT_CPU="`echo "$STR" | cut -d - -f 1`"
-SPLIT_OS="`echo "$STR" | awk -F - '{
+SPLIT_OS="`echo "$STR" | $AWK -F - '{
 	if ($2=="unknown"){
 		if (NF<3) { print $2; } else { print $3; }
 	} else {
@@ -116,12 +117,12 @@
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='radare2' ; VERSION='2.3.0' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
+ PKGNAME='radare2' ; VERSION='2.8.0' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
 }
 
 show_usage() {
 cat <<EOF2
-'configure' configures radare2-2.3.0 to adapt to many kinds of systems.
+'configure' configures radare2-2.8.0 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -167,15 +168,15 @@
   --with-sysmagic        force to use system's magic
   --disable-loadlibs     disable loading plugins
   --without-fork         disable fork
+  --with-libr            build libr.a and libr.dylib
   --with-syscapstone     force to use system-wide capstone
   --with-syszip          force to use system's libzip and zlib
+  --with-sysxxhash       force to use system's xxhash
   --without-gpl          do not build GPL code (grub, cxx, ... )
   --with-openssl         build with openssl if possible
   --with-rpath           use rpath to build
   --with-compiler        Define compiler to use (see mk/) (USERCC=gcc)
   --with-ostype          Choose OS type ( gnulinux windows darwin haiku ) (USEROSTYPE=auto)
-  --without-pic          do not build libr as a program independent location
-  --with-nonpic          build the library archives .a
   --with-libversion      specify different libversion (LIBVERSION=xxx)
   --without-jemalloc     build without jemalloc
 "
@@ -204,7 +205,7 @@
 }
 
 show_version() {
-echo "radare2-2.3.0 configuration script done with acr v1.4.
+echo "radare2-2.8.0 configuration script done with acr v1.6.2.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -212,7 +213,7 @@
 
 parse_options() {
 flag=`echo $1| cut -d = -f 1`
-value=`echo $1| awk 'BEGIN{FS="=";}{print $2}'`
+value=`echo $1| $AWK 'BEGIN{FS="=";}{print $2}'`
 flag2=`echo $flag|cut -f2- -d -| sed -e 's,-,_,g' -e 's,^_,,g'|tr '[a-z]' '[A-Z]'`
 
 if [ "${TARGET_OS}" = "darwin" ]; then
@@ -228,12 +229,12 @@
 	show_version ; ;;
 -r|--r|--report)
 echo "PKGNAME:   radare2"
-echo "VERSION:   2.3.0"
+echo "VERSION:   2.8.0"
 echo "LANGS:     c"
 echo "REQUIRED:  libdl"
-echo "OPTIONAL:  libmagic"
+echo "OPTIONAL:  libmagic libz libzip libxxhash libssl"
 echo "PKG-CONFIG:  capstone openssl"
-echo "FLAGS:     --disable-debugger --with-sysmagic --disable-loadlibs --without-fork --with-syscapstone --with-syszip --without-gpl --with-openssl --with-rpath --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx --without-jemalloc"
+echo "FLAGS:     --disable-debugger --with-sysmagic --disable-loadlibs --without-fork --with-libr --with-syscapstone --with-syszip --with-sysxxhash --without-gpl --with-openssl --with-rpath --with-compiler=gcc --with-ostype=auto --with-libversion=xxx --without-jemalloc"
 	exit 0
 	;;
 --cache-file)
@@ -283,15 +284,15 @@
 "--with-sysmagic") USE_MAGIC="1"; ;;
 "--disable-loadlibs") LOADLIBS="0"; ;;
 "--without-fork") HAVE_FORK="0"; ;;
+"--with-libr") WITH_LIBR="1"; ;;
 "--with-syscapstone") WITH_CAPSTONE="1"; ;;
 "--with-syszip") USE_ZIP="1"; ;;
+"--with-sysxxhash") USE_XXHASH="1"; ;;
 "--without-gpl") WITH_GPL="0"; ;;
 "--with-openssl") WANT_OPENSSL="1"; ;;
 "--with-rpath") USE_RPATH="1"; ;;
 --with-compiler) if [ -z "${value}" ]; then USERCC="gcc"; else USERCC="${value}" ; fi ;;
 --with-ostype) if [ -z "${value}" ]; then USEROSTYPE="auto"; else USEROSTYPE="${value}" ; fi ;;
-"--without-pic") WITHPIC="0"; ;;
-"--with-nonpic") WITHNONPIC="1"; ;;
 --with-libversion) if [ -z "${value}" ]; then LIBVERSION="xxx"; else LIBVERSION="${value}" ; fi ;;
 "--without-jemalloc") HAVE_JEMALLOC="0"; ;;
 *) if [ "$value" ]; then eval "`echo $flag2=$value`" ;
@@ -311,7 +312,7 @@
 shift
 done
 
-ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP WITH_GPL HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION HAVE_JEMALLOC"
+ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK WITH_LIBR WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP HAVE_LIB_XXHASH USE_XXHASH USE_LIB_XXHASH LIBXXHASH WITH_GPL HAVE_DECL_ADDR_NO_RANDOMIZE HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH USERCC USEROSTYPE LIBVERSION HAVE_JEMALLOC"
 
 create_environ
 
@@ -416,7 +417,15 @@
 	echo yes
 else
 	eval ${VAR}=0
-	echo no  ; fi }
+	echo no
+	if [ "${_REQUIRED}" = 1 ]; then
+	  echo "this library is required."
+	  do_remove
+	  exit 1
+	fi
+fi
+}
+
 check_library HAVE_LIB_MAGIC magic 0
 if [ 11 = "$HAVE_LIB_MAGIC$USE_MAGIC" ]; then
 
@@ -455,6 +464,36 @@
 else
 USE_LIB_ZIP="0"
 LIBZIP=""; fi
+check_library HAVE_LIB_XXHASH xxhash 0
+if [ 11 = "$HAVE_LIB_XXHASH$USE_XXHASH" ]; then
+
+USE_LIB_XXHASH="1"
+LIBXXHASH="-lxxhash"
+else
+USE_LIB_XXHASH="0"
+LIBXXHASH=""; fi
+printf "checking declaration of ADDR_NO_RANDOMIZE in sys/personality.h... "
+echo "#include <sys/personality.h>" > test.c
+echo "int main(int ac, char **av){ void *a = ADDR_NO_RANDOMIZE; return 0; }" >> test.c
+${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c >/dev/null 2>&1
+if [ $? = 0 ]; then
+	echo yes ; HAVE_DECL_ADDR_NO_RANDOMIZE=1
+else
+	HAVE_DECL_ADDR_NO_RANDOMIZE=0 ; echo no ; fi
+printf "checking function arc4random_uniform() in c... "
+echo "int main(int ac, char **av){ arc4random_uniform(0); return 0; }" > test.c
+${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -lc test.c >/dev/null 2>&1
+if [ $? = 0 ]; then
+	echo yes ; HAVE_ARC4RANDOM_UNIFORM=1
+else
+	HAVE_ARC4RANDOM_UNIFORM=0 ; echo no ; fi
+printf "checking function explicit_bzero() in c... "
+echo "int main(int ac, char **av){ explicit_bzero(0); return 0; }" > test.c
+${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -lc test.c >/dev/null 2>&1
+if [ $? = 0 ]; then
+	echo yes ; HAVE_EXPLICIT_BZERO=1
+else
+	HAVE_EXPLICIT_BZERO=0 ; echo no ; fi
 HAVE_LIB_GMP="0"
 check_library HAVE_LIB_SSL ssl 0
 [ -z "${PKGCONFIG}" ] && PKGCONFIG=pkg-config
@@ -548,7 +587,7 @@
  MARK="##${A}##"
 if [ -n "`grep \"${MARK}\" ${SD_TARGET}.tmp`" ]; then
  mv ${SD_TARGET}.tmp ${SD_TARGET}.tmp2
- cat ${SD_TARGET}.tmp2 | MARK=$MARK awk 'BEGIN{a=0;}{if($1==ENVIRON["MARK"]){if(a)a=0;else a=1}else{if(!a)print;}}' > ${SD_TARGET}.tmp
+ cat ${SD_TARGET}.tmp2 | MARK=$MARK $AWK 'BEGIN{a=0;}{if($1==ENVIRON["MARK"]){if(a)a=0;else a=1}else{if(!a)print;}}' > ${SD_TARGET}.tmp
  fi
 fi
 done
@@ -559,7 +598,7 @@
 do_remove
 echo
 echo "Final report:"
-for A in  PREFIX HAVE_LIB_GMP HAVE_OPENSSL USE_CAPSTONE HAVE_FORK VERSION USE_LIB_ZIP USE_LIB_MAGIC DEBUGGER CC USERCC USEROSTYPE LIBVERSION BUILD HOST TARGET ; do # REPORT
+for A in  PREFIX HAVE_LIB_GMP HAVE_OPENSSL USE_CAPSTONE HAVE_FORK VERSION USE_LIB_ZIP USE_LIB_MAGIC USE_LIB_XXHASH DEBUGGER CC USERCC HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO USEROSTYPE LIBVERSION BUILD HOST TARGET ; do # REPORT
 eval VAL="\$${A}"
 [ -z "${VAL}" ] && VAL="(null)"
 echo " - ${A} = ${VAL}"
diff -Nru radare2-2.3.0+dfsg/configure.acr radare2-2.8.0+dfsg/configure.acr
--- radare2-2.3.0+dfsg/configure.acr	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/configure.acr	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,5 @@
 PKGNAME radare2
-VERSION 2.3.0
+VERSION 2.8.0
 CONTACT pancake ; pancake@nopcode.org
 
 LANG_C!
@@ -26,6 +26,8 @@
 
 ARG_WITHOUT HAVE_FORK fork disable fork ;
 
+ARG_WITH WITH_LIBR libr build libr.a and libr.dylib ;
+
 ARG_WITH WITH_CAPSTONE syscapstone force to use system-wide capstone ;
 PKGCFG CAPSTONE_CFLAGS CAPSTONE_LDFLAGS capstone
 IFAND WITH_CAPSTONE HAVE_PKGCFG_CAPSTONE {
@@ -50,8 +52,22 @@
 	LIBZIP = '' ; (( static linking to shlr/zip ))
 }
 
+CHKLIB xxhash
+ARG_WITH USE_XXHASH sysxxhash force to use system's xxhash ;
+IFAND HAVE_LIB_XXHASH USE_XXHASH {
+	USE_LIB_XXHASH = 1 ;
+	LIBXXHASH = -lxxhash ;
+}{
+	USE_LIB_XXHASH = 0 ;
+	LIBXXHASH = '' ;
+}
+
 ARG_WITHOUT WITH_GPL gpl do not build GPL code (grub, cxx, ... ) ;
 
+CHKDECL sys/personality.h ADDR_NO_RANDOMIZE
+CHKFNC c arc4random_uniform
+CHKFNC c explicit_bzero
+
 (( TODO must deprecate
 CHKLIB gmp
 ARG_WITHOUT HAVE_GMP gmp disable GMP dependency ;
@@ -124,8 +140,6 @@
 	} } } } } } } } } }
 }
 
-ARG_WITHOUT WITHPIC pic do not build libr as a program independent location ;
-ARG_WITH WITHNONPIC nonpic build the library archives .a ;
 (( this hack is required for openbsd ports ))
 ARG_WITH LIBVERSION=xxx libversion specify different libversion ;
 ARG_WITHOUT HAVE_JEMALLOC jemalloc build without jemalloc ;
@@ -135,8 +149,8 @@
 }
 
 REPORT PREFIX HAVE_LIB_GMP HAVE_OPENSSL USE_CAPSTONE HAVE_FORK
-	VERSION USE_LIB_ZIP USE_LIB_MAGIC DEBUGGER CC USERCC
-	USEROSTYPE LIBVERSION BUILD HOST TARGET ;
+	VERSION USE_LIB_ZIP USE_LIB_MAGIC USE_LIB_XXHASH DEBUGGER CC USERCC HAVE_ARC4RANDOM_UNIFORM
+	HAVE_EXPLICIT_BZERO USEROSTYPE LIBVERSION BUILD HOST TARGET ;
 
 (( TODO: Add the rest of .pc files here.. add a rule for acr? ))
 SUBDIRS ./config-user.mk
diff -Nru radare2-2.3.0+dfsg/config-user.mk.acr radare2-2.8.0+dfsg/config-user.mk.acr
--- radare2-2.3.0+dfsg/config-user.mk.acr	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/config-user.mk.acr	2018-08-07 14:12:36.000000000 +0000
@@ -16,6 +16,7 @@
 USE_RPATH=@USE_RPATH@
 HAVE_JEMALLOC=@HAVE_JEMALLOC@
 HAVE_FORK=@HAVE_FORK@
+WITH_LIBR=@WITH_LIBR@
 
 MKPLUGINS=mk/stat.mk mk/sloc.mk
 
@@ -45,8 +46,6 @@
 ifeq ($(OSTYPE),qnx)
 DL_LIBS=
 endif
-WITHPIC=@WITHPIC@
-WITHNONPIC=@WITHNONPIC@
 
 # capstone
 USE_CAPSTONE=@USE_CAPSTONE@
@@ -62,9 +61,12 @@
 HAVE_LIB_SSL=@HAVE_OPENSSL@
 HAVE_LIB_MAGIC=@HAVE_LIB_MAGIC@
 USE_LIB_MAGIC=@USE_LIB_MAGIC@
+HAVE_LIB_XXHASH=@HAVE_LIB_XXHASH@
+USE_LIB_XXHASH=@USE_LIB_XXHASH@
 USE_LIB_ZIP=@USE_LIB_ZIP@
 LIBMAGIC=@LIBMAGIC@
 LIBZIP=@LIBZIP@
+LIBXXHASH=@LIBXXHASH@
 
 SSL_CFLAGS=@SSL_CFLAGS@
 SSL_LDFLAGS=@SSL_LDFLAGS@
diff -Nru radare2-2.3.0+dfsg/CONTRIBUTING.md radare2-2.8.0+dfsg/CONTRIBUTING.md
--- radare2-2.3.0+dfsg/CONTRIBUTING.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/CONTRIBUTING.md	2018-08-07 14:12:36.000000000 +0000
@@ -23,235 +23,13 @@
 * Make commits of logical units.
 * Check for unnecessary whitespace with ```git diff --check``` and be sure to follow the CODINGSTYLE (more on this in the next section).
 * Submit the Pull Request(PR) on Github.
-* When relevant, write a test for [radare2-regressions](https://github.com/radare/radare2-regressions) and submit a PR also there.
-
-## Coding Style guidelines
-
-* Tabs are used for indentation. In a switch statement, the
-  cases are indentend at the switch level.
-
-```c
-switch(n) {
-case 1:
-case 2:
-default:
-}
-```
-
-* Lines should be at most 78 chars. A tab is considered as 8 chars.
-
-* Braces open on the same line as the for/while/if/else/function/etc. Closing
-  braces are put on a line of their own, except in the else of an if statement
-  or in a while of a do-while statement. Always use braces for if and while,
-  except when the expressions are very simple and they can fit in a one-line.
-
-```c
-if (a == b) {
-	...
-}
-
-if (a == b) {
-	...
-} else if (a > b) {
-	...
-}
-
-if (a == b) do_something ();
-
-if (a == b) do_something ();
-else do_something_else ();
-
-if (!ok) return false;
-
-if (!buf) goto err_buf;
-
-if (a == b) {
-	...
-} else {
-	do_something_else ();
-}
-
-do {
-	do_something ();
-} while (cond);
-
-if (a == b) {
-	b = 3;
-}
-
-```
-
-* In general, don't use goto. The goto statement only comes in handy when a
-  function exits from multiple locations and some common work such as cleanup
-  has to be done.  If there is no cleanup needed then just return directly.
-
-  Choose label names which say what the goto does or why the goto exists.  An
-  example of a good name could be "out_buffer:" if the goto frees "buffer".
-  Avoid using GW-BASIC names like "err1:" and "err2:".
-
-* Use early returns instead of if-else when you need to filter out some bad
-  value at the start of a function.
-
-```c
-int check(RCore *c, int a, int b) {
-	if (!c) return false;
-	if (a < 0 || b < 1) return false;
-
-	... /* do something else */
-}
-```
-
-* Use a space after most of the keyword and around operators.
-
-```c
-a = b + 3;
-a = (b << 3) * 5;
-```
-
-* Multiline ternary operator conditionals must be indented a-la JS way:
-
-```c
-- ret = over ?
--         r_debug_step_over (dbg, 1) :
--         r_debug_step (dbg, 1);
-+ ret = over
-+         ? r_debug_step_over (dbg, 1)
-+         : r_debug_step (dbg, 1);
-```
-
-* Split long conditional expressions into small `static inline` functions to make them more readable:
-
-```c
-+static inline bool inRange(RBreakpointItem *b, ut64 addr) {
-+       return (addr >= b->addr && addr < (b->addr + b->size));
-+}
-+
-+static inline bool matchProt(RBreakpointItem *b, int rwx) {
-+       return (!rwx || (rwx && b->rwx));
-+}
-+
- R_API RBreakpointItem *r_bp_get_in(RBreakpoint *bp, ut64 addr, int rwx) {
-        RBreakpointItem *b;
-        RListIter *iter;
-        r_list_foreach (bp->bps, iter, b) {
--               if (addr >= b->addr && addr < (b->addr+b->size) && \
--                       (!rwx || rwx&b->rwx))
-+               if (inRange (b, addr) && matchProt (b, rwx)) {
-                        return b;
-+               }
-        }
-        return NULL;
- }
-```
-
-* Why return int vs enum
-
-The reason why many places in r2land functions return int instead of an enum type is because enums cant be OR'ed because it breaks the usage within a switch statement and also because swig cant handle that stuff.
-
-```
-r_core_wrap.cxx:28612:60: error: assigning to 'RRegisterType' from incompatible type 'long'
-  arg2 = static_cast< long >(val2); if (arg1) (arg1)->type = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail:
-                                                           ^ ~~~~
-r_core_wrap.cxx:32103:61: error: assigning to 'RDebugReasonType' from incompatible type 'int'
-    arg2 = static_cast< int >(val2); if (arg1) (arg1)->type = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail:
-                                                            ^ ~~~~
-3 warnings and 2 errors generated.
-````
-
-* Do not leave trailing whitespaces at the end of line
-
-* Do not use C99 variable declaration
-  - This way we reduce the number of local variables per function
-    and it's easier to find which variables are used, where and so on.
-
-* Always put a space before every parenthesis (function calls, conditionals,
-  fors, etc, ...) except when defining the function signature. This is
-  useful for grepping.
-
-* Comments should be smart. Function names should be explicit enough
-  to not require a comment to explain what it does. If this is not
-  possible at all, we can still use a comment. But it is a bad idea
-  to rely on comments to make the code readable.
-
-* Use 'R_API' define to mark exportable (public) methods only for module APIs
-
-* The rest of functions must be static, to avoid polluting the global space.
-
-* Avoid using global variables, they are evil. Only use them for singletons
-  and wip code, placing a comment explaining the reason for them to stay there.
-
-* If you *really* need to comment out some code, use #if 0 (...) #endif. In
-  general, don't comment out code because it makes the code less readable.
-
-* Do not write ultra-large functions, split them into multiple or simplify
-  the algorithm, only external-copy-pasted-not-going-to-be-maintained code
-  can be accepted in this way (gnu code, external disassemblers, etc..)
-
-* See doc/vim for vimrc
-
-* See doc/clang-format for work-in-progress support for automated indentation
-
-* Use the r2 types instead of the ones in stdint, which are known to cause some
-  portability issues. So, instead of uint8_t, use ut8, etc..
-
-* Never ever use %lld or %llx. This is not portable. Always use the PFMT64x
-  macros. Those are similar to the ones in GLIB.
-
-# Manage Endianness
-
-As hackers, we need to be aware of endianness.
-
-Endianness can become a problem when you try to process buffers or streams
-of bytes and store intermediate values as integers with width larger than
-a single byte.
-
-It can seem very easy to write the following code:
-
-  	ut8 opcode[4] = {0x10, 0x20, 0x30, 0x40};
-  	ut32 value = *(ut32*)opcode;
-
-... and then continue to use "value" in the code to represent the opcode.
-
-This needs to be avoided!
-
-Why? What is actually happening?
-
-When you cast the opcode stream to a unsigned int, the compiler uses the endianness
-of the host to interpret the bytes and stores it in host endianness.  This leads to
-very unportable code, because if you compile on a different endian machine, the
-value stored in "value" might be 0x40302010 instead of 0x10203040.
-
-## Solution
-
-Use bitshifts and OR instructions to interpret bytes in a known endian.
-Instead of casting streams of bytes to larger width integers, do the following:
-
-ut8 opcode[4] = {0x10, 0x20, 0x30, 0x40};
-ut32 value = opcode[0] | opcode[1] << 8 | opcode[2] << 16 | opcode[3] << 24;
-
-or if you prefer the other endian:
-
-ut32 value = opcode[3] | opcode[2] << 8 | opcode[1] << 16 | opcode[0] << 24;
-
-This is much better because you actually know which endian your bytes are stored in
-within the integer value, REGARDLESS of the host endian of the machine.
-
-## Endian helper functions
-
-Radare2 now uses helper functions to interpret all byte streams in a known endian.
-
-Please use these at all times, eg:
-
-  	val32 = r_read_be32(buffer)		// reads 4 bytes from a stream in BE
-  	val32 = r_read_le32(buffer)		// reads 4 bytes from a stream in LE
-  	val32 = r_read_ble32(buffer, isbig)	// reads 4 bytes from a stream:
-  						//   if isbig is true, reads in BE
-  						//   otherwise reads in LE
-
-There are a number of helper functions for 64, 32, 16, and 8 bit reads and writes.
-
-(Note that 8 bit reads are equivalent to casting a single byte of the buffer
-to a ut8 value, ie endian is irrelevant).
+* When relevant, write a test for
+  [radare2-regressions](https://github.com/radare/radare2-regressions) and
+  submit a PR also there. Use the same branch name in both repositories, so
+  Travis will be able to use your new tests together with new changes.
+  AppVeyor (for now) still uses radare/radare2-regressions repo with branch
+  master. NOTE: when merging PRs, *always* merge the radare2-regressions PR
+  first.
 
 # Additional resources
 
diff -Nru radare2-2.3.0+dfsg/debian/changelog radare2-2.8.0+dfsg/debian/changelog
--- radare2-2.3.0+dfsg/debian/changelog	2018-10-19 11:16:06.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/changelog	2018-10-19 11:27:29.000000000 +0000
@@ -1,8 +1,35 @@
-radare2 (2.3.0+dfsg-2~ubuntu16.04.1~ppa1) xenial; urgency=medium
+radare2 (2.8.0+dfsg-1~ubuntu16.04.1~ppa1) xenial; urgency=medium
 
-  * No-change backport to xenial
+  * Downgrade build-depends to debhelper (>= 10) to allow backporting
 
- -- Raffaele Forte <raffaele@backbox.org>  Fri, 19 Oct 2018 13:16:06 +0200
+ -- Raffaele Forte <raffaele@backbox.org>  Fri, 19 Oct 2018 13:26:03 +0200
+
+radare2 (2.8.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update Debian Standards Version to 4.1.5
+
+ -- Sebastian Reichel <sre@debian.org>  Wed, 08 Aug 2018 22:37:49 +0200
+
+radare2 (2.7.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sebastian Reichel <sre@debian.org>  Tue, 10 Jul 2018 00:04:16 +0200
+
+radare2 (2.6.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+  * Switch to compat level 11
+  * Backport a few patches to fix build with system libraries
+
+ -- Sebastian Reichel <sre@debian.org>  Tue, 10 Apr 2018 16:29:24 +0200
+
+radare2 (2.4.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sebastian Reichel <sre@debian.org>  Mon, 05 Mar 2018 21:32:57 +0100
 
 radare2 (2.3.0+dfsg-2) unstable; urgency=medium
 
diff -Nru radare2-2.3.0+dfsg/debian/control radare2-2.8.0+dfsg/debian/control
--- radare2-2.3.0+dfsg/debian/control	2018-02-23 10:38:59.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/control	2018-10-19 11:27:08.000000000 +0000
@@ -1,9 +1,9 @@
 Source: radare2
 Section: devel
 Priority: optional
-Maintainer: Debian Security Tools Packaging Team <pkg-security-team@lists.alioth.debian.org>
+Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
 Uploaders: Sebastian Reichel <sre@debian.org>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper (>= 10),
                flex,
                gobject-introspection,
                libcapstone-dev,
@@ -18,7 +18,7 @@
                python-dev,
                liblua5.2-dev,
                zlib1g-dev
-Standards-Version: 4.1.3
+Standards-Version: 4.1.5
 Homepage: https://www.radare.org
 Vcs-Browser: https://salsa.debian.org/pkg-security-team/radare2
 Vcs-Git: https://salsa.debian.org/pkg-security-team/radare2.git
@@ -40,7 +40,7 @@
  supporting PE, mach0, ELF, class, etc. named rabin, and a block-based
  hash utility called rahash.
 
-Package: libradare2-2.3
+Package: libradare2-2.8
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -64,7 +64,7 @@
 Package: libradare2-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libradare2-2.3 (= ${binary:Version}),
+Depends: ${misc:Depends}, libradare2-2.8 (= ${binary:Version}),
          libcapstone-dev, libmagic-dev
 Description: devel files from the radare2 suite
  The project aims to create a complete, portable, multi-architecture,
diff -Nru radare2-2.3.0+dfsg/debian/copyright radare2-2.8.0+dfsg/debian/copyright
--- radare2-2.3.0+dfsg/debian/copyright	2018-02-23 10:38:59.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/copyright	2018-08-08 20:37:49.000000000 +0000
@@ -131,10 +131,6 @@
            2007-2015 pancake
 License: Apache-2.0
 
-Files: shlr/udis86/*
-Copyright: 2002-2013 Vivek Thampi
-License: BSD-2-clause
-
 Files: shlr/zip/zip/*
 Copyright: 1999-2013 Dieter Baron and Thomas Klausner
 License: BSD-2-clause
diff -Nru radare2-2.3.0+dfsg/debian/libradare2-2.3.install radare2-2.8.0+dfsg/debian/libradare2-2.3.install
--- radare2-2.3.0+dfsg/debian/libradare2-2.3.install	2018-02-23 10:38:59.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/libradare2-2.3.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.2.*
-usr/lib/*/radare2/2.*
diff -Nru radare2-2.3.0+dfsg/debian/libradare2-2.3.lintian-overrides radare2-2.8.0+dfsg/debian/libradare2-2.3.lintian-overrides
--- radare2-2.3.0+dfsg/debian/libradare2-2.3.lintian-overrides	2018-02-23 10:38:59.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/libradare2-2.3.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-# One package is enough for all those libs
-libradare2-2.3: package-name-doesnt-match-sonames
-# Every r2 release increases API, so no need to track symbols
-libradare2-2.3: no-symbols-control-file
diff -Nru radare2-2.3.0+dfsg/debian/libradare2-2.8.install radare2-2.8.0+dfsg/debian/libradare2-2.8.install
--- radare2-2.3.0+dfsg/debian/libradare2-2.8.install	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/libradare2-2.8.install	2018-08-08 20:37:49.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.2.*
+usr/lib/*/radare2/2.*
diff -Nru radare2-2.3.0+dfsg/debian/libradare2-2.8.lintian-overrides radare2-2.8.0+dfsg/debian/libradare2-2.8.lintian-overrides
--- radare2-2.3.0+dfsg/debian/libradare2-2.8.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/libradare2-2.8.lintian-overrides	2018-08-08 20:37:49.000000000 +0000
@@ -0,0 +1,4 @@
+# One package is enough for all those libs
+libradare2-2.8: package-name-doesnt-match-sonames
+# Every r2 release increases API, so no need to track symbols
+libradare2-2.8: no-symbols-control-file
diff -Nru radare2-2.3.0+dfsg/debian/libradare2-dev.install radare2-2.8.0+dfsg/debian/libradare2-dev.install
--- radare2-2.3.0+dfsg/debian/libradare2-dev.install	2018-02-23 10:38:59.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/libradare2-dev.install	2018-08-08 20:37:49.000000000 +0000
@@ -1,3 +1,4 @@
 usr/include
 usr/lib/*/pkgconfig
 usr/lib/*/*.so
+usr/lib/*/*.a
diff -Nru radare2-2.3.0+dfsg/debian/rules radare2-2.8.0+dfsg/debian/rules
--- radare2-2.3.0+dfsg/debian/rules	2018-02-23 10:38:59.000000000 +0000
+++ radare2-2.8.0+dfsg/debian/rules	2018-08-08 20:37:49.000000000 +0000
@@ -3,7 +3,7 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEBUG_SUPPORT=0
-EXTRA_FLAGS=--with-sysmagic --with-syszip --with-syscapstone --with-libversion=2.3
+EXTRA_FLAGS=--with-sysmagic --with-syszip --with-syscapstone --with-libversion=2.8
 
 DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -62,14 +62,12 @@
 	dh_makeshlibs --exclude=/usr/lib/$(DEB_HOST_MULTIARCH)/radare2/
 
 override_dh_auto_install:
-	dh_auto_install
-	# No need to install Makefile
-	rm debian/tmp/usr/share/radare2/last/cons/Makefile
+	make install DESTDIR=`pwd`/debian/tmp
 	# remove "last" symlink
 	rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/radare2/last
 	rm debian/tmp/usr/share/radare2/last
 	# remove useless license file
-	rm debian/tmp/usr/share/doc/radare2/license
+	rm debian/tmp/usr/share/doc/radare2/license.md
 	# install zsh completion files
 	mkdir -p debian/tmp/usr/share/zsh/vendor-completions
 	install -m 644 doc/zsh/_* debian/tmp/usr/share/zsh/vendor-completions
diff -Nru radare2-2.3.0+dfsg/DEVELOPERS.md radare2-2.8.0+dfsg/DEVELOPERS.md
--- radare2-2.3.0+dfsg/DEVELOPERS.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/DEVELOPERS.md	2018-08-07 14:12:36.000000000 +0000
@@ -1,19 +1,296 @@
-DEVELOPERS
-==========
+# DEVELOPERS
 
 This file aims to describe an introduction for developers to work
 on the code base of radare2 project.
 
-CODE STYLE
-----------
+## Documentation
+There is support for Doxygen document generation in this repo.
+By running `doxygen` in the root of this repository it will autodetect the
+Doxyfile and generate HTML documentation into
+[doc/doxygen/html/index.html](./doc/doxygen/html/index.html)
+
+If you're contributing code or willing to update existing code you can use the
+doxygen C style comments to improve documentation and comments in code.
+See the [Doxygen Manual](https://www.stack.nl/~dimitri/doxygen/manual/index.html)
+for more info. Example usage can be found [here](https://www.stack.nl/~dimitri/doxygen/manual/docblocks.html)
+```c
+/**
+ * \brief Find the min and max addresses in an RList of maps.
+ * \param maps RList of maps that will be searched through
+ * \param min Pointer to a ut64 that the min will be stored in
+ * \param max Pointer to a ut64 that the max will be stored in
+ * \param skip How many maps to skip at the start of iteration
+ * \param width Divisor for the return value
+ * \return (max-min)/width
+ *
+ * Used to determine the min & max addresses of maps and
+ * scale the ascii bar to the width of the terminal
+ */
+static int findMinMax(RList *maps, ut64 *min, ut64 *max, int skip, int width);
+```
+
+## Code style
+
 In order to contribute with patches or plugins we encourage you to
 use the same coding style as the rest of the code base.
 
-You may find some notes on this topic [here](https://github.com/radare/radare2/blob/master/CONTRIBUTING.md#coding-style-guidelines)
-and doc/vim.
+You may find some additional notes on this topic in doc/vim.
+
+* Tabs are used for indentation. In a switch statement, the
+  cases are indentend at the switch level.
+
+```c
+switch(n) {
+case 1:
+	break;
+case 2:
+	break;
+default:
+}
+```
+
+* Lines should be at most 78 chars. A tab is considered as 4 chars.
+
+* Braces open on the same line as the for/while/if/else/function/etc. Closing
+  braces are put on a line of their own, except in the else of an if statement
+  or in a while of a do-while statement. Always use braces for if and while.
+
+```c
+if (a == b) {
+	...
+}
+
+if (a == b) {
+	...
+} else if (a > b) {
+	...
+}
+
+if (a == b) {
+	...
+} else {
+	do_something_else ();
+}
+
+do {
+	do_something ();
+} while (cond);
+
+if (a == b) {
+	b = 3;
+}
+
+```
+
+* In general, don't use goto. The goto statement only comes in handy when a
+  function exits from multiple locations and some common work such as cleanup
+  has to be done.  If there is no cleanup needed then just return directly.
+
+  Choose label names which say what the goto does or why the goto exists.  An
+  example of a good name could be "out_buffer:" if the goto frees "buffer".
+  Avoid using GW-BASIC names like "err1:" and "err2:".
+
+* Use early returns instead of if-else when you need to filter out some bad
+  value at the start of a function.
+
+```c
+int check(RCore *c, int a, int b) {
+	if (!c) return false;
+	if (a < 0 || b < 1) return false;
+
+	... /* do something else */
+}
+```
+
+* Use a space after most of the keyword and around operators.
+
+```c
+a = b + 3;
+a = (b << 3) * 5;
+```
+
+* Multiline ternary operator conditionals must be indented a-la JS way:
+
+```c
+- ret = over ?
+-         r_debug_step_over (dbg, 1) :
+-         r_debug_step (dbg, 1);
++ ret = over
++         ? r_debug_step_over (dbg, 1)
++         : r_debug_step (dbg, 1);
+```
+
+* Split long conditional expressions into small `static inline` functions to make them more readable:
+
+```c
++static inline bool inRange(RBreakpointItem *b, ut64 addr) {
++       return (addr >= b->addr && addr < (b->addr + b->size));
++}
++
++static inline bool matchProt(RBreakpointItem *b, int rwx) {
++       return (!rwx || (rwx && b->rwx));
++}
++
+ R_API RBreakpointItem *r_bp_get_in(RBreakpoint *bp, ut64 addr, int rwx) {
+        RBreakpointItem *b;
+        RListIter *iter;
+        r_list_foreach (bp->bps, iter, b) {
+-               if (addr >= b->addr && addr < (b->addr+b->size) && \
+-                       (!rwx || rwx&b->rwx))
++               if (inRange (b, addr) && matchProt (b, rwx)) {
+                        return b;
++               }
+        }
+        return NULL;
+ }
+```
+
+* Why return int vs enum
+
+The reason why many places in r2land functions return int instead of an enum type is because enums cant be OR'ed because it breaks the usage within a switch statement and also because swig cant handle that stuff.
+
+```
+r_core_wrap.cxx:28612:60: error: assigning to 'RRegisterType' from incompatible type 'long'
+  arg2 = static_cast< long >(val2); if (arg1) (arg1)->type = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail:
+                                                           ^ ~~~~
+r_core_wrap.cxx:32103:61: error: assigning to 'RDebugReasonType' from incompatible type 'int'
+    arg2 = static_cast< int >(val2); if (arg1) (arg1)->type = arg2; resultobj = SWIG_Py_Void(); return resultobj; fail:
+                                                            ^ ~~~~
+3 warnings and 2 errors generated.
+````
+
+* Do not leave trailing whitespaces at the end of line
+
+* Do not use asserts
+
+* Do not use C99 variable declaration
+    - This way we reduce the number of local variables per function
+    and it's easier to find which variables are used, where and so on.
+
+* Always put a space before every parenthesis (function calls, conditionals,
+  fors, etc, ...) except when defining the function signature. This is
+  useful for grepping.
+
+* Function names should be explicit enough to not require a comment
+  explaining what it does when seen elsewhere in code.
+
+* Use 'R_API' define to mark exportable (public) methods only for module APIs
+
+* The rest of functions must be static, to avoid polluting the global space.
+
+* Avoid using global variables, they are evil. Only use them for singletons
+  and WIP code, placing a comment explaining the reason for them to stay there.
+
+* If you *really* need to comment out some code, use #if 0 (...) #endif. In
+  general, don't comment out code because it makes the code less readable.
+
+* Do not write ultra-large functions, split them into multiple or simplify
+  the algorithm, only external-copy-pasted-not-going-to-be-maintained code
+  can be accepted in this way (gnu code, external disassemblers, etc..)
+
+* See doc/vim for vimrc
+
+* See doc/clang-format for work-in-progress support for automated indentation
+
+* Use the r2 types instead of the ones in stdint, which are known to cause some
+  portability issues. So, instead of uint8_t, use ut8, etc..
+
+* Never ever use %lld or %llx. This is not portable. Always use the PFMT64x
+  macros. Those are similar to the ones in GLIB.
+
+# Manage Endianness
+
+As hackers, we need to be aware of endianness.
+
+Endianness can become a problem when you try to process buffers or streams
+of bytes and store intermediate values as integers with width larger than
+a single byte.
+
+It can seem very easy to write the following code:
+
+  	ut8 opcode[4] = {0x10, 0x20, 0x30, 0x40};
+  	ut32 value = *(ut32*)opcode;
+
+... and then continue to use "value" in the code to represent the opcode.
+
+This needs to be avoided!
+
+Why? What is actually happening?
+
+When you cast the opcode stream to a unsigned int, the compiler uses the endianness
+of the host to interpret the bytes and stores it in host endianness.  This leads to
+very unportable code, because if you compile on a different endian machine, the
+value stored in "value" might be 0x40302010 instead of 0x10203040.
+
+## Solution
+
+Use bitshifts and OR instructions to interpret bytes in a known endian.
+Instead of casting streams of bytes to larger width integers, do the following:
+
+ut8 opcode[4] = {0x10, 0x20, 0x30, 0x40};
+ut32 value = opcode[0] | opcode[1] << 8 | opcode[2] << 16 | opcode[3] << 24;
+
+or if you prefer the other endian:
+
+ut32 value = opcode[3] | opcode[2] << 8 | opcode[1] << 16 | opcode[0] << 24;
+
+This is much better because you actually know which endian your bytes are stored in
+within the integer value, REGARDLESS of the host endian of the machine.
+
+## Endian helper functions
+
+Radare2 now uses helper functions to interpret all byte streams in a known endian.
+
+Please use these at all times, eg:
+
+  	val32 = r_read_be32(buffer)		// reads 4 bytes from a stream in BE
+  	val32 = r_read_le32(buffer)		// reads 4 bytes from a stream in LE
+  	val32 = r_read_ble32(buffer, isbig)	// reads 4 bytes from a stream:
+  						//   if isbig is true, reads in BE
+  						//   otherwise reads in LE
+
+There are a number of helper functions for 64, 32, 16, and 8 bit reads and writes.
+
+(Note that 8 bit reads are equivalent to casting a single byte of the buffer
+to a ut8 value, ie endian is irrelevant).
+
+### Editor configuration
+
+Vim/Neovim:
+
+```vim
+setl cindent
+setl tabstop=4
+setl noexpandtab
+setl cino=:0,+0,(2,J0,{1,}0,>4,)1,m2
+```
+
+Emacs:
+
+```elisp
+(c-add-style "radare2"
+             '((c-basic-offset . 4)
+               (tab-width . 4)
+               (indent-tabs-mode . t)
+               ;;;; You would need (put 'c-auto-align-backslashes 'safe-local-variable 'booleanp) to enable this
+               ;; (c-auto-align-backslashes . nil)
+               (c-offsets-alist
+                (arglist-intro . ++)
+                (arglist-cont . ++)
+                (arglist-cont-nonempty . ++)
+                (statement-cont . ++)
+                )))
+```
+
+You may use directory-local variables by putting
+```elisp
+((c-mode .  ((c-file-style . "radare2"))))
+```
+
+into `.dir-locals.el`.
+
+## Modules
 
-MODULES
--------
 The radare2 code base is modularized into different libraries that are
 found in libr/ directory. The binr/ directory contains the programs
 that use the libraries.
@@ -27,8 +304,8 @@
 
    http://radare.org/get/lacon-radare-2009/
 
-API
----
+## API
+
 As mentioned in README.md, the API itself is maintained in a different
 repository. The API function definitions in C header files are derived
 from and documented in the radare2-bindings repository, found at:
@@ -45,13 +322,13 @@
 the bindings with the header files, such a contribution would be
 very welcome.
 
-DEPENDENCIES
-------------
+## Dependencies
+
 radare2 can be built without any special dependency. It just requires
 a C compiler, a GNU make and a unix-like system.
 
-CROSSCOMPILATION
-----------------
+## Cross compilation
+
 The instructions to crosscompile r2 to Windows are in doc/windows.
 
 You may find other documents in doc/ explaining how to build it on iOS,
@@ -63,8 +340,8 @@
  - type `make`
  - install in `DESTDIR`
 
-SOURCE REPOSITORY
------------------
+## Source repository
+
 The source of radare2 can be found in the following github repository.
 ```sh
    git clone git://github.com/radare/radare2
@@ -85,8 +362,9 @@
    git clean -xdf
    git reset --hard
 ```
-COMPILATION
------------
+
+## Compilation
+
 Inter-module rebuild dependencies are not handled automatically and
 require human interaction to recompile the affected modules.
 
@@ -102,14 +380,14 @@
   export CC="ccache gcc"
 ```
 
-INSTALLATION
-------------
+## Installation
+
 Developers use to modify the code, type make and then try.
 
 radare2 have a specific makefile target that allows you to install
 system wide but using symlinks instead of hard copies.
 ```sh
-   sudo make symstall
+sudo make symstall
 ```
 This kind of installation is really helpful if you do lot of changes
 in the code for various reasons.
@@ -117,8 +395,7 @@
   - only one install is required across multiple builds
   - installation time is much faster
 
-REGRESSION TESTING
-------------------
+## Regression testing
 
 The source of the radare2 regression test suite can be found in the
 following github repository.
@@ -126,13 +403,13 @@
    git clone git://github.com/radare/radare2-regressions
 ```
 
-See the README.md file in that repository for further information.
+See the `README.md` file in that repository for further information.
 
 The existing test coverage can always do with improvement, so if you can
 contribute additions tests that would be gratefully accepted.
 
-REPORTING BUGS
---------------
+## Reporting bugs
+
 If you notice any misfeature, issue, error, problem or you just
 don't know how to do something which is supposed to be covered
 by this framework.
@@ -152,8 +429,8 @@
 milestone, etc. it is a good place to start if you are looking
 to contribute.
 
-CONTRIBUTING WITH PATCHES
--------------------------
+## Contributing with patches
+
 All the development happens in the git repository. It is
 good that all patches can be applied against the `git HEAD`.
 
@@ -162,8 +439,7 @@
    git diff > p
 ```
 
-HOW TO RELEASE 
---------------
+## HOW TO RELEASE
 
  - Set `RELEASE=1` in global.mk and r2-bindings/config.mk.acr.
  - Use `bsdtar` from libarchive package. GNU tar is broken.
@@ -180,4 +456,6 @@
    - `make`
    - `make dist`
 
+  - Update the i[paths on the website](https://github.com/radareorg/radareorg/blob/master/source/download_paths.rst)
+
 --pancake
diff -Nru radare2-2.3.0+dfsg/doc/all68k.r2 radare2-2.8.0+dfsg/doc/all68k.r2
--- radare2-2.3.0+dfsg/doc/all68k.r2	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/all68k.r2	2018-08-07 14:12:36.000000000 +0000
@@ -3,7 +3,7 @@
 #   r2 -qi all68k - > all68k.txt
 #
 
-e scr.color=false
+e scr.color=0
 e asm.arch=m68k
 e asm.nbytes=16
 
diff -Nru radare2-2.3.0+dfsg/doc/android radare2-2.8.0+dfsg/doc/android
--- radare2-2.3.0+dfsg/doc/android	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/android	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-r2 on android
-=============
-Install NDK in archlinux x86-64
- - Enable multilib repo in pacman.conf
- - pacman -S lib32-glibc lib32-zlib
-
-To build r2 for android you need to install the NDK:
-
-  http://developer.android.com/tools/sdk/ndk/index.html
-
-Edit ~/.r2androidrc to setup the paths to your ndk
-
-  sys/android-shell.sh
-  ./configure --with-compiler=android --with-ostype=android --prefix=/data/radare2 --without-pic --with-nonpic
-  make -j 4
-
-To compile for android-x86
-
-  export NDK_ARCH=x86
-
-To package:
-
-  mkdir 
-  make install DESTDIR=/usr
-
-Build farm
-
-  See sys/android-shell.sh and sys/android-build.sh
-
-  sys/android-shell.sh sys/android-build.sh arm-static
-
-Environment:
-
-   NDK_ARCH=arm|x86
-   STATIC_BUILD=0|1
diff -Nru radare2-2.3.0+dfsg/doc/android.md radare2-2.8.0+dfsg/doc/android.md
--- radare2-2.3.0+dfsg/doc/android.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/android.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,34 @@
+r2 on android
+=============
+
+Install NDK in archlinux x86-64
+ - Enable multilib repo in pacman.conf
+ - pacman -S lib32-glibc lib32-zlib
+
+To build r2 for android you need to install the NDK:
+
+    http://developer.android.com/tools/sdk/ndk/index.html
+
+Edit `~/.r2androidrc` to setup the paths to your ndk
+
+    sys/android-shell.sh
+    ./configure --with-compiler=android --with-ostype=android --prefix=/data/radare2 --without-pic --with-nonpic
+    make -j 4
+
+To compile for android-x86
+
+    export NDK_ARCH=x86
+
+To package:
+
+    mkdir 
+    make install DESTDIR=/usr
+
+Build farm, see `sys/android-shell.sh` and `sys/android-build.sh`
+    
+    sys/android-shell.sh sys/android-build.sh arm-static
+
+Environment:
+
+    NDK_ARCH=arm|x86
+    STATIC_BUILD=0|1
diff -Nru radare2-2.3.0+dfsg/doc/avr radare2-2.8.0+dfsg/doc/avr
--- radare2-2.3.0+dfsg/doc/avr	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/avr	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-AVR (arduino, atmega128, ..)
-============================
-
-Install JTAG serial driver:
-
-	http://www.wch.cn/download/CH341SER_MAC_ZIP.html 
-
-Install SDK from Arduino:
-
-	https://www.arduino.cc/en/Main/Software
-	echo 'PATH="/Applications/Arduino.app//Contents/Java/hardware/tools/avr/bin/:$PATH"' >> ~/.profile
-
-Install avarice, the gdbserver <-> jtag:
-
-	r2pm -i avarice
-
-Run the proxy:
-
-	r2pm -r avarice --jtag /dev/tty.wch* --mkI :4242
-
-Using GDB:
-
-	(avr-gdb) target remote :4242
-
-In another terminal now run:
-
-	r2 -a avr -d gdb://localhost:4242
-
-NOTE: Right now the avr debugger is pretty broken, the memory and register reads result in in correct data.
-
diff -Nru radare2-2.3.0+dfsg/doc/avr.md radare2-2.8.0+dfsg/doc/avr.md
--- radare2-2.3.0+dfsg/doc/avr.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/avr.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,30 @@
+AVR (arduino, atmega128, ..)
+============================
+
+Install JTAG serial driver:
+
+	http://www.wch.cn/download/CH341SER_MAC_ZIP.html 
+
+Install SDK from Arduino:
+
+	https://www.arduino.cc/en/Main/Software
+	echo 'PATH="/Applications/Arduino.app//Contents/Java/hardware/tools/avr/bin/:$PATH"' >> ~/.profile
+
+Install avarice, the gdbserver <-> jtag:
+
+	r2pm -i avarice
+
+Run the proxy:
+
+	r2pm -r avarice --jtag /dev/tty.wch* --mkI :4242
+
+Using GDB:
+
+	(avr-gdb) target remote :4242
+
+In another terminal now run:
+
+	r2 -a avr -d gdb://localhost:4242
+
+NOTE: Right now the avr debugger is pretty broken, the memory and register reads result in in correct data.
+
diff -Nru radare2-2.3.0+dfsg/doc/brainfuck radare2-2.8.0+dfsg/doc/brainfuck
--- radare2-2.3.0+dfsg/doc/brainfuck	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/brainfuck	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-Brainfuck support for r2
-========================
-
-Plugins for brainfuck:
-  - asm.bf - brainfuck assembler and disassembler
-  - debug.bf - debugger using bfvm
-  - anal.bf - code analysis for brainfuck
-  - bp.bf - breakpoints support (experimental)
-
-To debug a brainfuck program:
-
-$ r2 -D bf bfdbg:///tmp/bf
-
-> dc    # continue
-> x@scr # show screen buffer contents
-
-The debugger creates virtual sections for code, data, screen and input.
-
-TODO 
-----
-- add support for comments, ignore invalid instructions as nops
-- enhance io and debugger plugins to generate sections and set arch opts
-
-Hello World
-===========
->+++++++++[<++++++++>-]<.>+++++++[<++++>-]<+.+++++++..+++.[-]
->++++++++[<++++>-] <.>+++++++++++[<++++++++>-]<-.--------.+++
-.------.--------.[-]>++++++++[<++++>- ]<+.[-]++++++++++.
-
-$ cat << EOF
->+++++++++[<++++++++>-]<.>+++++++[<++++>-]<+.+++++++..+++.[-]>++++++++[<++++>-] <.>+++++++++++[<++++++++>-]<-.--------.+++.------.--------.[-]>++++++++[<++++>- ]<+.[-]++++++++++.
-EOF
diff -Nru radare2-2.3.0+dfsg/doc/brainfuck.md radare2-2.8.0+dfsg/doc/brainfuck.md
--- radare2-2.3.0+dfsg/doc/brainfuck.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/brainfuck.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,37 @@
+Brainfuck support for r2
+========================
+
+Plugins for brainfuck:
+  - `asm.bf` - brainfuck assembler and disassembler
+  - `debug.bf` - debugger using bfvm
+  - `anal.bf` - code analysis for brainfuck
+  - `bp.bf` - breakpoints support (experimental)
+
+To debug a brainfuck program:
+
+    r2 -D bf bfdbg:///tmp/bf
+
+    > dc    # continue
+    > x@scr # show screen buffer contents
+
+The debugger creates virtual sections for code, data, screen and input.
+
+TODO 
+----
+- add support for comments, ignore invalid instructions as nops
+- enhance io and debugger plugins to generate sections and set arch opts
+
+Hello World
+===========
+
+```
+>+++++++++[<++++++++>-]<.>+++++++[<++++>-]<+.+++++++..+++.[-]
+>++++++++[<++++>-] <.>+++++++++++[<++++++++>-]<-.--------.+++
+.------.--------.[-]>++++++++[<++++>- ]<+.[-]++++++++++.
+```
+
+```
+$ cat << EOF
+>+++++++++[<++++++++>-]<.>+++++++[<++++>-]<+.+++++++..+++.[-]>++++++++[<++++>-] <.>+++++++++++[<++++++++>-]<-.--------.+++.------.--------.[-]>++++++++[<++++>- ]<+.[-]++++++++++.
+EOF
+```
diff -Nru radare2-2.3.0+dfsg/doc/capstone.md radare2-2.8.0+dfsg/doc/capstone.md
--- radare2-2.3.0+dfsg/doc/capstone.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/capstone.md	2018-08-07 14:12:36.000000000 +0000
@@ -4,7 +4,7 @@
 Capstone Engine is the disassembler engine used by radare2 by default for 
 some architectures.
 
-Radare2 ships its own version of capstone based on the -next branch with
+Radare2 ships its own version of capstone based on the -master branch with
 some minor patches. The problem is that latest release have some compile
 time dependencies that make compilation with older releases a bit harder.
 
diff -Nru radare2-2.3.0+dfsg/doc/debug radare2-2.8.0+dfsg/doc/debug
--- radare2-2.3.0+dfsg/doc/debug	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/debug	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
- Conditional breakpoints
-=========================
-conditional breakpoints are implemented in the following way:
-- when a breakpoint is hit, the condition is run as a normal command
-- if the command returns a value different from zero, execution continue,
-- otherwise, execution is stopped at the breakpoint
-
- Examples of conditional breakpoints
-======================================
-1.) ignore breakpoint at address 0x4000ce for five times:
-	f times=5
-	(dec_times,f times=`?vi times-1`,?= times)
-	db 0x4000ce
-	dbC 0x4000ce .(dec_times)
-	dc
-2.) execute until rax==0x31c0 at address 0x4000ce
-	e cmd.hitinfo=0
-	(break_rax,f reg_rax=`dr rax`,f test=`?vi reg_rax-0x31c0`,?= test)
-	db 0x4000ce
-	dbC 0x4000ce .(break_rax)
-	dc
-3.) perform a register tracing dump at address 0x4000ce
-	e cmd.hitinfo=0
-	(trace_rax,dr rax,?= 1)
-	db 0x4000ce
-	dbC 0x4000ce .(trace_rax)
-	dc > trace.txt
diff -Nru radare2-2.3.0+dfsg/doc/debug-internals.md radare2-2.8.0+dfsg/doc/debug-internals.md
--- radare2-2.3.0+dfsg/doc/debug-internals.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/debug-internals.md	2018-08-07 14:12:36.000000000 +0000
@@ -29,15 +29,15 @@
 The functionality lives in the following files:
 (?? why so many files? can this be simplified??)
 
-libr/reg/arena.c        // ?? used by anal and debugger
-libr/reg/cond.c         // condition registers
-libr/reg/double.c       // support for double-precision floating point numbers
-libr/reg/profile.c      // ?? used by anal and debugger
-libr/reg/reg.c          // top-level register specific code (all of r2)
-libr/reg/value.c        // dealing with register values
-libr/reg/t/p.c          // test code for printing general-purpose registers
-libr/reg/t/regdiff.c    // ?? test code for?
-libr/reg/t/test.c       // test code for register handling
+    libr/reg/arena.c        // ?? used by anal and debugger
+    libr/reg/cond.c         // condition registers
+    libr/reg/double.c       // support for double-precision floating point numbers
+    libr/reg/profile.c      // ?? used by anal and debugger
+    libr/reg/reg.c          // top-level register specific code (all of r2)
+    libr/reg/value.c        // dealing with register values
+    libr/reg/t/p.c          // test code for printing general-purpose registers
+    libr/reg/t/regdiff.c    // ?? test code for?
+    libr/reg/t/test.c       // test code for register handling
 
 
 ## libr/bp
@@ -47,27 +47,27 @@
 breakpoints and more.
 
 Radare supports a multitude of different types of breakpoints.
-(?? is there a list? sw, hw, and trace? anything else??)
+(`??` is there a list? sw, hw, and trace? anything else??)
 
-libr/bp/bp.c            // main breakpoint management code
-libr/bp/io.c            // setting and reseting(??) breakpoints
-libr/bp/parser.h        // header for breakpoint parser (??)
-libr/bp/parser.c        // code for breakpoint parser (??)
-libr/bp/plugin.c        // breakpoint plugin management
-libr/bp/traptrace.c     // traptrace (??)
-libr/bp/watch.c         // watch points (mostly not implemented)
+    libr/bp/bp.c            // main breakpoint management code
+    libr/bp/io.c            // setting and reseting(??) breakpoints
+    libr/bp/parser.h        // header for breakpoint parser (??)
+    libr/bp/parser.c        // code for breakpoint parser (??)
+    libr/bp/plugin.c        // breakpoint plugin management
+    libr/bp/traptrace.c     // traptrace (??)
+    libr/bp/watch.c         // watch points (mostly not implemented)
 
 For architecture specific-handling, "bp" delegates various functionality to
 plugins. The interface for these plugins is much simpler than other plugins
 used in the radare debugger -- they only define which byte sequences represent
 valid breakpoints for a given architecture.
 
-libr/bp/p/bp_arm.c      // ARM64, ARM, Thumb, Thumb-2 (big/little endians)
-libr/bp/p/bp_bf.c       // Brainfuck!
-libr/bp/p/bp_mips.c     // MIPS, big/little endian
-libr/bp/p/bp_ppc.c      // PowerPC, big/little endian
-libr/bp/p/bp_sh.c       // SuperH
-libr/bp/p/bp_x86.c      // int3...
+    libr/bp/p/bp_arm.c      // ARM64, ARM, Thumb, Thumb-2 (big/little endians)
+    libr/bp/p/bp_bf.c       // Brainfuck!
+    libr/bp/p/bp_mips.c     // MIPS, big/little endian
+    libr/bp/p/bp_ppc.c      // PowerPC, big/little endian
+    libr/bp/p/bp_sh.c       // SuperH
+    libr/bp/p/bp_x86.c      // int3...
 
 
 ## libr/debug/debug.c
@@ -76,17 +76,17 @@
 the common code flow and integration into radare while delegating more nuanced
 system interactions to plug-ins.
 
-libr/debug/arg.c        // used by the anal engine (??)
-libr/debug/desc.c       // code for handling file descriptors inside an inferior
-libr/debug/esil.c       // ESIL related debugging code (??)
-libr/debug/map.c        // top-level API for dealing with memory maps
-libr/debug/pid.c        // top-level API for dealing with processes
-libr/debug/plugin.c     // top-level debugger plugin API handling
-libr/debug/reg.c        // top-level code for register r/w and display
-libr/debug/signal.c     // top-level functions for signals
-libr/debug/snap.c       // code for saving, restoring, showing memory snapshots
-libr/debug/trace.c      // top-level tracing API (counting insn hits, etc)
-libr/debug/t/main.c     // test code for the debugger API
+    libr/debug/arg.c        // used by the anal engine (??)
+    libr/debug/desc.c       // code for handling file descriptors inside an inferior
+    libr/debug/esil.c       // ESIL related debugging code (??)
+    libr/debug/map.c        // top-level API for dealing with memory maps
+    libr/debug/pid.c        // top-level API for dealing with processes
+    libr/debug/plugin.c     // top-level debugger plugin API handling
+    libr/debug/reg.c        // top-level code for register r/w and display
+    libr/debug/signal.c     // top-level functions for signals
+    libr/debug/snap.c       // code for saving, restoring, showing memory snapshots
+    libr/debug/trace.c      // top-level tracing API (counting insn hits, etc)
+    libr/debug/t/main.c     // test code for the debugger API
 
 ## libr/core/cmd_debug.c
 
@@ -109,8 +109,8 @@
 
 A debugger plug-in capable of debugging brainfuck code!
 
-libr/debug/p/bfvm.c     // Brainfuck VM implementation
-libr/debug/p/bfvm.h
+    libr/debug/p/bfvm.c     // Brainfuck VM implementation
+    libr/debug/p/bfvm.h
 
 
 ### libr/debug/p/debug_bochs.c
@@ -137,61 +137,61 @@
 shared are implemented by platform-specific functions that are provided in the
 following files:
 
-// architecture-specific debugger code
-libr/debug/p/native/arm.c                       // unused?
-
-// code for handling backtracing
-libr/debug/p/native/bt.c
-libr/debug/p/native/bt/fuzzy-all.c
-libr/debug/p/native/bt/generic-x64.c
-libr/debug/p/native/bt/generic-x86.c
-
-// architecture-specific register handling
-libr/debug/p/native/drx.c                       // x86-specific debug registers
-libr/debug/p/native/reg.c                       // cute include of the files below
-libr/debug/p/native/reg/kfbsd-x64.h
-libr/debug/p/native/reg/kfbsd-x86.h
-libr/debug/p/native/reg/netbsd-x64.h
-libr/debug/p/native/reg/netbsd-x86.h
-libr/debug/p/native/reg/windows-x64.h
-libr/debug/p/native/reg/windows-x86.h
-
-// platform-specific debugger code on Linux
-libr/debug/p/native/linux/linux_debug.c         // main linux-specific debugging code
-libr/debug/p/native/linux/linux_debug.h         // including cute penguin ascii art
-
-// architecture-specific register handling on Linux (?? what is this format??)
-libr/debug/p/native/linux/reg/linux-arm.h
-libr/debug/p/native/linux/reg/linux-arm64.h
-libr/debug/p/native/linux/reg/linux-mips.h
-libr/debug/p/native/linux/reg/linux-ppc.h
-libr/debug/p/native/linux/reg/linux-x64.h
-libr/debug/p/native/linux/reg/linux-x64-32.h
-libr/debug/p/native/linux/reg/linux-x86.h
-
-// platform-specific debugger code on Windows
-libr/debug/p/native/w32.c                       // main code for win32 debugger plugin
-libr/debug/p/native/maps/windows.c              // platform-specific memory map handling
-libr/debug/p/native/windows/windows_debug.c     // !! nothing in here
-libr/debug/p/native/windows/windows_debug.h     // !! nothing in here
-
-// platform-specific debugger code on XNU (OSX/iOS/etc)
-libr/debug/p/native/darwin.c                    // !! not used by anything else
-libr/debug/p/native/maps/darwin.c               // platform-specific memory map handling
-libr/debug/p/native/xnu/xnu_debug.c             // main XNU-specific debugging code
-libr/debug/p/native/xnu/xnu_debug.h             // including cute apple ascii art
-libr/debug/p/native/xnu/trap_arm.c              // ARM family hardware bps (??)
-libr/debug/p/native/xnu/trap_x86.c              // x86 family hardware bps (??)
-libr/debug/p/native/xnu/xnu_excthreads.c        // additional XNU thread handling
-libr/debug/p/native/xnu/xnu_threads.c           // XNU thread and register handling
-libr/debug/p/native/xnu/xnu_threads.h
-
-// architecture-specific register handling on XNU (?? what is this format??)
-libr/debug/p/native/xnu/reg/darwin-x86.h
-libr/debug/p/native/xnu/reg/darwin-arm.h
-libr/debug/p/native/xnu/reg/darwin-ppc.h
-libr/debug/p/native/xnu/reg/darwin-arm64.h
-libr/debug/p/native/xnu/reg/darwin-x64.h
+    // architecture-specific debugger code
+    libr/debug/p/native/arm.c                       // unused?
+    
+    // code for handling backtracing
+    libr/debug/p/native/bt.c
+    libr/debug/p/native/bt/fuzzy-all.c
+    libr/debug/p/native/bt/generic-x64.c
+    libr/debug/p/native/bt/generic-x86.c
+    
+    // architecture-specific register handling
+    libr/debug/p/native/drx.c                       // x86-specific debug registers
+    libr/debug/p/native/reg.c                       // cute include of the files below
+    libr/debug/p/native/reg/kfbsd-x64.h
+    libr/debug/p/native/reg/kfbsd-x86.h
+    libr/debug/p/native/reg/netbsd-x64.h
+    libr/debug/p/native/reg/netbsd-x86.h
+    libr/debug/p/native/reg/windows-x64.h
+    libr/debug/p/native/reg/windows-x86.h
+    
+    // platform-specific debugger code on Linux
+    libr/debug/p/native/linux/linux_debug.c         // main linux-specific debugging code
+    libr/debug/p/native/linux/linux_debug.h         // including cute penguin ascii art
+    
+    // architecture-specific register handling on Linux (?? what is this format??)
+    libr/debug/p/native/linux/reg/linux-arm.h
+    libr/debug/p/native/linux/reg/linux-arm64.h
+    libr/debug/p/native/linux/reg/linux-mips.h
+    libr/debug/p/native/linux/reg/linux-ppc.h
+    libr/debug/p/native/linux/reg/linux-x64.h
+    libr/debug/p/native/linux/reg/linux-x64-32.h
+    libr/debug/p/native/linux/reg/linux-x86.h
+    
+    // platform-specific debugger code on Windows
+    libr/debug/p/native/w32.c                       // main code for win32 debugger plugin
+    libr/debug/p/native/maps/windows.c              // platform-specific memory map handling
+    libr/debug/p/native/windows/windows_debug.c     // !! nothing in here
+    libr/debug/p/native/windows/windows_debug.h     // !! nothing in here
+    
+    // platform-specific debugger code on XNU (OSX/iOS/etc)
+    libr/debug/p/native/darwin.c                    // !! not used by anything else
+    libr/debug/p/native/maps/darwin.c               // platform-specific memory map handling
+    libr/debug/p/native/xnu/xnu_debug.c             // main XNU-specific debugging code
+    libr/debug/p/native/xnu/xnu_debug.h             // including cute apple ascii art
+    libr/debug/p/native/xnu/trap_arm.c              // ARM family hardware bps (??)
+    libr/debug/p/native/xnu/trap_x86.c              // x86 family hardware bps (??)
+    libr/debug/p/native/xnu/xnu_excthreads.c        // additional XNU thread handling
+    libr/debug/p/native/xnu/xnu_threads.c           // XNU thread and register handling
+    libr/debug/p/native/xnu/xnu_threads.h
+    
+    // architecture-specific register handling on XNU (?? what is this format??)
+    libr/debug/p/native/xnu/reg/darwin-x86.h
+    libr/debug/p/native/xnu/reg/darwin-arm.h
+    libr/debug/p/native/xnu/reg/darwin-ppc.h
+    libr/debug/p/native/xnu/reg/darwin-arm64.h
+    libr/debug/p/native/xnu/reg/darwin-x64.h
 
 
 ### libr/debug/p/debug_qnx.c
diff -Nru radare2-2.3.0+dfsg/doc/debug.md radare2-2.8.0+dfsg/doc/debug.md
--- radare2-2.3.0+dfsg/doc/debug.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/debug.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,34 @@
+ Conditional breakpoints
+=========================
+conditional breakpoints are implemented in the following way:
+
+- when a breakpoint is hit, the condition is run as a normal command
+- if the command returns a value different from zero, execution continue,
+- otherwise, execution is stopped at the breakpoint
+
+ Examples of conditional breakpoints
+======================================
+
+1. ignore breakpoint at address `0x4000ce` for five times:
+
+       f times=5
+       (dec_times,f times=`?vi times-1`,?= times)
+       db 0x4000ce
+       dbC 0x4000ce .(dec_times)
+       dc
+
+2. execute until rax==0x31c0 at address `0x4000ce`
+
+       e cmd.hitinfo=0
+       (break_rax,f reg_rax=`dr rax`,f test=`?vi reg_rax-0x31c0`,?= test)
+       db 0x4000ce
+       dbC 0x4000ce .(break_rax)
+       dc
+
+3. perform a register tracing dump at address `0x4000ce`
+
+       e cmd.hitinfo=0
+       (trace_rax,dr rax,?= 1)
+       db 0x4000ce
+       dbC 0x4000ce .(trace_rax)
+       dc > trace.txt
diff -Nru radare2-2.3.0+dfsg/doc/emscripten radare2-2.8.0+dfsg/doc/emscripten
--- radare2-2.3.0+dfsg/doc/emscripten	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/emscripten	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-Building for the browser
-========================
-
-# Install emscripten:
-
-git clone git://github.com/kripken/emscripten.git
-export PATH=/path/to/emscripten:$PATH
-make clean
-
-
-# Build radare
-
-sys/emscripten.sh
-
-
-
---- random notes ---
-
-export CC="emcc --ignore-dynamic-linking"
-./configure --prefix=/usr --disable-shared --enable-static --disable-debugger --with-compiler=emscripten --without-pic --with-nonpic
-emmake make -j4 
-
-cd binr/radare2
- emcc ../../libr/*/*.o radare2.c -I ../../libr/include/ -DR2_BIRTH=\"pop\" -DR2_GITTIP=\"123\" ../../libr/db/sdb/src/*.o
-
-binr/rax2/rax2.js:
-
-emcc -O2 rax2.o ../../libr/util/libr_util.a -o rax2.js
-
-binr/rasm2/rasm2.js:
-
-emcc -O2  -L.. -o rasm2.js   ../../shlr/sdb/src/libsdb.a ../../libr/fs/p/grub/libgrubfs.a -lm $A/util/libr_util.a $A/asm/libr_asm.a rasm2.o ../../libr/util/libr_util.a  ../../libr/parse/libr_parse.a  ../../libr/db/libr_db.a ../../libr/syscall/libr_syscall.a  ../../libr/asm/libr_asm.a  ../../libr/lib/libr_lib.a ../../libr/db/libr_db.a ../../shlr/sdb/src/libsdb.a ../../libr/util/libr_util.a
diff -Nru radare2-2.3.0+dfsg/doc/emscripten.md radare2-2.8.0+dfsg/doc/emscripten.md
--- radare2-2.3.0+dfsg/doc/emscripten.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/emscripten.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,35 @@
+Building for the browser
+========================
+
+# Install emscripten:
+
+    git clone git://github.com/kripken/emscripten.git
+    export PATH=/path/to/emscripten:$PATH
+    make clean
+
+
+# Build radare
+
+    sys/emscripten.sh
+
+
+<!--
+
+--- random notes ---
+
+export CC="emcc --ignore-dynamic-linking"
+./configure --prefix=/usr --disable-shared --enable-static --disable-debugger --with-compiler=emscripten --without-pic --with-nonpic
+emmake make -j4 
+
+cd binr/radare2
+ emcc ../../libr/*/*.o radare2.c -I ../../libr/include/ -DR2_BIRTH=\"pop\" -DR2_GITTIP=\"123\" ../../libr/db/sdb/src/*.o
+
+binr/rax2/rax2.js:
+
+emcc -O2 rax2.o ../../libr/util/libr_util.a -o rax2.js
+
+binr/rasm2/rasm2.js:
+
+emcc -O2  -L.. -o rasm2.js   ../../shlr/sdb/src/libsdb.a ../../libr/fs/p/grub/libgrubfs.a -lm $A/util/libr_util.a $A/asm/libr_asm.a rasm2.o ../../libr/util/libr_util.a  ../../libr/parse/libr_parse.a  ../../libr/db/libr_db.a ../../libr/syscall/libr_syscall.a  ../../libr/asm/libr_asm.a  ../../libr/lib/libr_lib.a ../../libr/db/libr_db.a ../../shlr/sdb/src/libsdb.a ../../libr/util/libr_util.a
+
+-->
diff -Nru radare2-2.3.0+dfsg/doc/esil radare2-2.8.0+dfsg/doc/esil
--- radare2-2.3.0+dfsg/doc/esil	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/esil	1970-01-01 00:00:00.000000000 +0000
@@ -1,287 +0,0 @@
-ESIL
-====
-
-# source https://github.com/radare/radare2/wiki/ESIL
-
-ESIL stands for 'Evaluable Strings Intermedate Language'. It aims to describe a Forth-like representation for every opcode. Those representations can be evaluated in order to emulate code. Each element of an esil expression is separated by a comma. The VM can be described as this:
-```
-   while ((word=haveCommand())) {
-     if (word.isKeyword()) {
-       esilCommands[word](esil);
-     } else {
-       esil.push (evaluateToNumber(word));
-     }
-     nextCommand();
-   }
-```
-The esil commands are operations that pop values from the stack, performs some calculations and pushes the result in the stack (if any). They aim to cover all common operations done by CPUs, permitting to do binary operations, memory peeks and pokes, spawning a syscall, etc.
-
-#### Use ESIL
-```
-[0x00000000]> e asm.esil = true
-```
-
-Syntax
-======
-An opcode is translated into a comma separated list of ESIL expressions.
-```
-xor eax, eax    ->    0,eax,=,1,zf,=
-```
-Memory access is defined by brackets.
-```
-mov eax, [0x80480]   ->   0x80480,[],eax,=
-```
-Default size is the destination of the operation. In this case 8bits, aka 1 byte.
-```
-movb $0, 0x80480     ->   0,0x80480,=[1]
-```
-Conditionals are expressed with the '?' char at the beginning of the expression. This checks if the rest of the expression is 0 or not and skips the next expression if doesn't matches. % is the prefix for internal vars.
-```
-cmp eax, 123  ->   123,eax,==,%z,zf,=
-jz eax        ->   zf,?{,eax,eip,=,}
-```
-So.. if you want to run more than one expression under a conditional, you'll have to write it 
-```
-zf,?{,eip,esp,=[],eax,eip,=,%r,esp,-=,}
-```
-
-The whitespace, newlines and other chars are ignored in esil, so the first thing to do is:
-```
-esil = r_str_replace (esil, " ", "", true);
-```
-Syscalls are specially handled by '$' at the beginning of the expression. After that char you have an optional numeric value that specifies the number of syscall. The emulator must handle those expressions and 'simulate' the syscalls. (r_esil_syscall)
-
-Order of arguments
-==================
-As discussed on irc, current implementation works like this:
-
-```
-a,b,-      b - a
-a,b,/=     b /= a
-```
-This approach is more readable, but it's less stack-friendly
-
-Special instructions
-====================
-NOPs are represented as empty strings. Unknown or invalid instructions
-
-Syscalls are implemented with the '0x80,$' command. It delegates the execution of the esil vm into a callback that implements the syscall for a specific kernel.
-
-Traps are implemented with the `<trap>,<code>,$$` command. They are used to throw exceptions like invalid instructions, division by zero, memory read error, etc.
-
-Quick analysis
-==============
-Here's a list of some quick checks to retrieve information from an esil string. Relevant information will be probably found in the first expression of the list.
-```
-indexOf('[')       ->    have memory references
-indexOf("=[")      ->    write in memory
-indexOf("pc,=")    ->    modifies program counter (branch, jump, call)
-indexOf("sp,=")    ->    modifies the stack (what if we found sp+= or sp-=?)
-indexOf("=")       ->    retrieve src and dst
-indexOf(":")       ->    unknown esil, raw opcode ahead
-indexOf("%")       ->    accesses internal esil vm flags
-indexOf("$")       ->    syscall
-indexOf("$$")      ->    can trap
-indexOf('++')      ->    has iterator
-indexOf('--')      ->    count to zero
-indexOf("?{")      ->    conditional
-indexOf("LOOP")    ->    is a loop (rep?)
-equalsTo("")       ->    empty string, means: nop (wrong, if we append pc+=x)
-```
-
-Common operations:
- * Check dstreg
- * Check srcreg
- * Get destinaion
- * Is jump
- * Is conditional
- * Evulate
- * Is syscall
-
-CPU Flags
-=========
-CPU flags are usually defined as 1 bit registers in the RReg profile. and sometimes under the 'flg' register type.
-
-ESIL Flags
-==========
-ESIL VM have an internal state flags that can are read only and can be used to export those values to the underlaying CPU flags. This is because the ESIL vm defines all the flag changes, while the CPUs only update the flags under certain conditions or specific instructions.
-
-Those internal flags are prefixed by the '%' character.
-
-```
-z - zero flag, only set if the result of an operation is 0
-b - borrow, this requires to specify from which bit (example: %b4 - checks if borrow from bit 4)
-c - carry, same like above (example: %c7 - checks if carry from bit 7)
-p - parity
-r - regsize ( asm.bits/8 )
-```
-
-Variables
-=========
-1. No predefined bitness (should be easy to extend them to 128,256 and 512bits, e.g. for MMX, SSE, AVX, Neon)
-2. Infinite number (for SSA-form compatibility)
-3. Register names have no specific syntax. They are just strings
-4. Numbers can be specified in any base supported by RNum (dec, hex, oct, binary ...)
-5. Each ESIL backend should have an associated RReg profile to describe the esil register specs
-
-Bitarrays
-=========
-What to do with them? What about bit arithmetics if use variables instead of registers?
-
-Arithmetics
-===========
-1. ADD ("+")
-2. MUL ("*")
-3. SUB ("-")
-4. DIV ("/")
-5. MOD ("%")
-
-
-Bit arithmetics
-===============
-1. AND  "&"
-2. OR   "|"
-3. XOR  "^"
-4. SHL  "<<"
-5. SHR  ">>"
-6. ROL  "<<<"
-7. ROR  ">>>"
-8. NEG  "!"
-
-Floating point
-==============
-
-_TODO_
-
-The x86 REP prefix in ESIL
-==========================
-ESIL specifies that the parsing control-flow commands are in uppercase. Bear in mind that some archs have uppercase register names. The register profile should take care to not reuse any of the following:
-```
-3,SKIP   - skip N instructions. used to make relative forward GOTOs
-3,GOTO   - goto instruction 3
-LOOP     - alias for 0,GOTO
-BREAK    - stop evaluating the expression
-STACK    - dump stack contents to screen
-CLEAR    - clear stack
-```
-
-
-Usage example:
-
-rep cmpsb
----------
-cx,!,?{,BREAK,},esi,[1],edi,[1],==,?{,BREAK,},esi,++,edi,++,cx,--,LOOP
-
-
-Unimplemented/unhandled instructions
-====================================
-Those are expressed with the 'TODO' command. which acts as a 'BREAK', but displaying a warning message describing which instruction is not implemented and will not be emulated.
-
-For example:
-```
-fmulp ST(1), ST(0)      =>      TODO,fmulp ST(1),ST(0)
-```
-
-Disassembly example:
-====================
-```
-[0x1000010f8]> e asm.esil=true
-[0x1000010f8]> pd $r @ entry0
-   ;      [0] va=0x1000010f8 pa=0x000010f8 sz=13299 vsz=13299 rwx=-r-x 0.__text
-            ;-- section.0.__text:
-            0x1000010f8    55           8,rsp,-=,rbp,rsp,=[8]
-            0x1000010f9    4889e5       rsp,rbp,=
-            0x1000010fc    4883c768     104,rdi,+=
-            0x100001100    4883c668     104,rsi,+=
-            0x100001104    5d           rsp,[8],rbp,=,8,rsp,+=                                          ┌─< 0x100001105    e950350000   0x465a,rip,= ;[1]
-        │   0x10000110a    55           8,rsp,-=,rbp,rsp,=[8]
-        │   0x10000110b    4889e5       rsp,rbp,=                                                       │   0x10000110e    488d4668     rsi,104,+,rax,=
-        │   0x100001112    488d7768     rdi,104,+,rsi,=
-        │   0x100001116    4889c7       rax,rdi,=
-        │   0x100001119    5d           rsp,[8],rbp,=,8,rsp,+=                                         ┌──< 0x10000111a    e93b350000   0x465a,rip,= ;[1]
-       ││   0x10000111f    55           8,rsp,-=,rbp,rsp,=[8]
-       ││   0x100001120    4889e5       rsp,rbp,=
-       ││   0x100001123    488b4f60     rdi,96,+,[8],rcx,=
-       ││   0x100001127    4c8b4130     rcx,48,+,[8],r8,=                                              ││   0x10000112b    488b5660     rsi,96,+,[8],rdx,=
-       ││   0x10000112f    b801000000   1,eax,= ;  0x00000001
-       ││   0x100001134    4c394230     rdx,48,+,[8],r8,==,cz,?=
-      ┌───< 0x100001138    7f1a         sf,of,!,^,zf,!,&,?{,0x1154,rip,=,} ;[2]
-     ┌────< 0x10000113a    7d07         of,!,sf,^,?{,0x1143,rip,} ;[3]
-     ││││   0x10000113c    b8ffffffff   0xffffffff,eax,= ;  0xffffffff                              ┌─────< 0x100001141    eb11         0x1154,rip,= ;[2]
-    │└────> 0x100001143    488b4938     rcx,56,+,[8],rcx,=
-    │ │││   0x100001147    48394a38     rdx,56,+,[8],rcx,==,cz,?=
-```
-
-Radare anal ESIL code example
-==============================
-
-As an example implementation of ESIL analysis for the AVR family of microcontrollers there is
-a `avr_op` function in `/libr/anal/p/anal_avr.c` which contains information on how the 
-instructions are expressed in ESIL and other opcode information such as cycle counts per instruction:
-
-static int avr_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
-	  short ofst;
-		  int d, r, k;
-			(...)
-
-Variables d, r and k refer to "destination", "register" and "(k)onstant", respectively. They
-are used later on by ESIL string formatting function like for instance:
-
-    r_strbuf_setf (&op->esil, "0x%x,r%d,=", k, d);
-
-Which in this case corresponds to the LDI (LoaD with immediate) instruction in AVR. As an example,
-the above ESIL string template will translate into the following when reversing in radare:
-
-│           0x00000080      30e0           0x0,r19,=                   ; LDI Rd,K. load immediate
-
-Or in non-ESIL format:
-
-│           0x00000080      30e0           ldi r19, 0x00               ; LDI Rd,K. load immediate
-
-
-Looking at other architectures which already have mature ESIL support such as x86 can help 
-in understanding the syntax and conventions of radare's ESIL.
-
-
-Introspection
-=============
-To ease esil parsing we should have a way to express introspection expressions to extract the data we want. For example. We want to get the target address of a jmp.
-
-The parser for the esil expressions should be implemented in an API to make it possible to extract information by analyzing the expressions easily.
-
-```
->  ao~esil,opcode
-opcode: jmp 0x10000465a
-esil: 0x10000465a,rip,=
-```
-We need a way to retrieve the numeric value of 'rip'. This is a very simple example, but there will be more complex, like conditional ones and we need expressions to get:
-
-- opcode type
-- destination of jump
-- condition depends on
-- all regs modified (write)
-- all regs accessed (read)
-
-API HOOKS
-=========
-
-It is important for emulation to be able to setup hooks in the parser, so we can extend the parser to implement the analysis without having to write the parser again and again. This is, every time an operation is going to be executed we call a user hook which can be used to determine if rip is changing or if the instruction updates the stack.
-Later, at this level we can split that callback into several ones to have an event based analysis api that may be extended in js like this:
-esil.on('regset', function(){..
-esil.on('syscall', function(){esil.regset('rip'
-
-we have already them. see hook_flag_read() hook_execute() hook_mem_read() ...
-
-return true if you want to override the action taken for a callback. for example. avoid mem reads in a region or mem writes to make all memory read only.
-
-return false or 0 if you want to trace esil expression parsing. aka emulation
-..
-
-Other operations that require bindings to external functionalities to work. In this case r_ref and r_io. This must be defined when initializing the esil vm.
-
-* Io Get/Set
-    Out ax, 44
-    44,ax,:ou
-* Selectors (cs,ds,gs...)
-   Mov eax, ds:[ebp+8]
-   Ebp,8,+,:ds,eax,=
diff -Nru radare2-2.3.0+dfsg/doc/esil.md radare2-2.8.0+dfsg/doc/esil.md
--- radare2-2.3.0+dfsg/doc/esil.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/esil.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,331 @@
+ESIL
+====
+
+# source https://github.com/radare/radare2/wiki/ESIL
+
+ESIL stands for 'Evaluable Strings Intermedate Language'. It aims to describe a
+Forth-like representation for every opcode. Those representations can be
+evaluated in order to emulate code. Each element of an esil expression is
+separated by a comma. The VM can be described as this:
+
+    while ((word=haveCommand())) {
+      if (word.isKeyword()) {
+        esilCommands[word](esil);
+      } else {
+        esil.push (evaluateToNumber(word));
+      }
+      nextCommand();
+    }
+
+The esil commands are operations that pop values from the stack, performs some
+calculations and pushes the result in the stack (if any). They aim to cover all
+common operations done by CPUs, permitting to do binary operations, memory
+peeks and pokes, spawning a syscall, etc.
+
+#### Use ESIL
+
+    [0x00000000]> e asm.esil = true
+
+Syntax
+======
+An opcode is translated into a comma separated list of ESIL expressions.
+
+    xor eax, eax    ->    0,eax,=,1,zf,=
+
+Memory access is defined by brackets.
+
+    mov eax, [0x80480]   ->   0x80480,[],eax,=
+
+Default size is the destination of the operation. In this case 8bits, aka 1 byte.
+
+    movb $0, 0x80480     ->   0,0x80480,=[1]
+
+Conditionals are expressed with the '?' char at the beginning of the expression. This checks if the rest of the expression is 0 or not and skips the next expression if doesn't matches. `$` is the prefix for internal vars.
+
+    cmp eax, 123  ->   123,eax,==,$z,zf,=
+    jz eax        ->   zf,?{,eax,eip,=,}
+
+So.. if you want to run more than one expression under a conditional, you'll have to write it 
+
+    zf,?{,eip,esp,=[],eax,eip,=,$r,esp,-=,}
+
+
+The whitespace, newlines and other chars are ignored in esil, so the first thing to do is:
+
+    esil = r_str_replace (esil, " ", "", true);
+
+Syscalls are specially handled by '$' at the beginning of the expression. After that char you have an optional numeric value that specifies the number of syscall. The emulator must handle those expressions and 'simulate' the syscalls. (`r_esil_syscall`)
+
+Order of arguments
+==================
+As discussed on irc, current implementation works like this:
+
+    a,b,-      b - a
+    a,b,/=     b /= a
+
+This approach is more readable, but it's less stack-friendly
+
+Special instructions
+====================
+
+NOPs are represented as empty strings. Unknown or invalid instructions
+
+Syscalls are implemented with the '0x80,$' command. It delegates the execution
+of the esil vm into a callback that implements the syscall for a specific
+kernel.
+
+Traps are implemented with the `<trap>,<code>,$$` command. They are used to
+throw exceptions like invalid instructions, division by zero, memory read
+error, etc.
+
+Quick analysis
+==============
+
+Here's a list of some quick checks to retrieve information from an esil string.
+Relevant information will be probably found in the first expression of the
+list.
+
+    indexOf('[')       ->    have memory references
+    indexOf("=[")      ->    write in memory
+    indexOf("pc,=")    ->    modifies program counter (branch, jump, call)
+    indexOf("sp,=")    ->    modifies the stack (what if we found sp+= or sp-=?)
+    indexOf("=")       ->    retrieve src and dst
+    indexOf(":")       ->    unknown esil, raw opcode ahead
+    indexOf("$")       ->    accesses internal esil vm flags
+    indexOf("$")       ->    syscall
+    indexOf("$$")      ->    can trap
+    indexOf('++')      ->    has iterator
+    indexOf('--')      ->    count to zero
+    indexOf("?{")      ->    conditional
+    indexOf("LOOP")    ->    is a loop (rep?)
+    equalsTo("")       ->    empty string, means: nop (wrong, if we append pc+=x)
+
+Common operations:
+
+ * Check dstreg
+ * Check srcreg
+ * Get destinaion
+ * Is jump
+ * Is conditional
+ * Evulate
+ * Is syscall
+
+CPU Flags
+=========
+
+CPU flags are usually defined as 1 bit registers in the RReg profile. and sometimes under the 'flg' register type.
+
+ESIL Flags
+==========
+
+ESIL VM have an internal state flags that can are read only and can be used to
+export those values to the underlaying CPU flags. This is because the ESIL vm
+defines all the flag changes, while the CPUs only update the flags under
+certain conditions or specific instructions.
+
+Those internal flags are prefixed by the '$' character.
+
+```
+z - zero flag, only set if the result of an operation is 0
+b - borrow, this requires to specify from which bit (example: $b4 - checks if borrow from bit 4)
+c - carry, same like above (example: $c7 - checks if carry from bit 7)
+p - parity
+r - regsize ( asm.bits/8 )
+```
+
+Variables
+=========
+
+1. No predefined bitness (should be easy to extend them to 128,256 and 512bits, e.g. for MMX, SSE, AVX, Neon)
+2. Infinite number (for SSA-form compatibility)
+3. Register names have no specific syntax. They are just strings
+4. Numbers can be specified in any base supported by RNum (dec, hex, oct, binary ...)
+5. Each ESIL backend should have an associated RReg profile to describe the esil register specs
+
+Bitarrays
+=========
+What to do with them? What about bit arithmetics if use variables instead of registers?
+
+Arithmetics
+===========
+1. ADD ("+")
+2. MUL ("*")
+3. SUB ("-")
+4. DIV ("/")
+5. MOD ("%")
+
+
+Bit arithmetics
+===============
+1. AND  "&"
+2. OR   "|"
+3. XOR  "^"
+4. SHL  "<<"
+5. SHR  ">>"
+6. ROL  "<<<"
+7. ROR  ">>>"
+8. NEG  "!"
+
+Floating point
+==============
+
+_TODO_
+
+The x86 REP prefix in ESIL
+==========================
+
+ESIL specifies that the parsing control-flow commands are in uppercase. Bear in
+mind that some archs have uppercase register names. The register profile should
+take care to not reuse any of the following:
+
+	3,SKIP   - skip N instructions. used to make relative forward GOTOs
+	3,GOTO   - goto instruction 3
+	LOOP     - alias for 0,GOTO
+	BREAK    - stop evaluating the expression
+	STACK    - dump stack contents to screen
+	CLEAR    - clear stack
+
+
+Usage example:
+
+rep cmpsb
+---------
+
+	cx,!,?{,BREAK,},esi,[1],edi,[1],==,?{,BREAK,},esi,++,edi,++,cx,--,LOOP
+
+
+Unimplemented/unhandled instructions
+====================================
+
+Those are expressed with the 'TODO' command. which acts as a 'BREAK', but
+displaying a warning message describing which instruction is not implemented
+and will not be emulated.
+
+For example:
+
+	fmulp ST(1), ST(0)      =>      TODO,fmulp ST(1),ST(0)
+
+Disassembly example:
+====================
+
+```
+[0x1000010f8]> e asm.esil=true
+[0x1000010f8]> pd $r @ entry0
+   ;      [0] va=0x1000010f8 pa=0x000010f8 sz=13299 vsz=13299 rwx=-r-x 0.__text
+            ;-- section.0.__text:
+            0x1000010f8    55           8,rsp,-=,rbp,rsp,=[8]
+            0x1000010f9    4889e5       rsp,rbp,=
+            0x1000010fc    4883c768     104,rdi,+=
+            0x100001100    4883c668     104,rsi,+=
+            0x100001104    5d           rsp,[8],rbp,=,8,rsp,+=                                          ┌─< 0x100001105    e950350000   0x465a,rip,= ;[1]
+        │   0x10000110a    55           8,rsp,-=,rbp,rsp,=[8]
+        │   0x10000110b    4889e5       rsp,rbp,=                                                       │   0x10000110e    488d4668     rsi,104,+,rax,=
+        │   0x100001112    488d7768     rdi,104,+,rsi,=
+        │   0x100001116    4889c7       rax,rdi,=
+        │   0x100001119    5d           rsp,[8],rbp,=,8,rsp,+=                                         ┌──< 0x10000111a    e93b350000   0x465a,rip,= ;[1]
+       ││   0x10000111f    55           8,rsp,-=,rbp,rsp,=[8]
+       ││   0x100001120    4889e5       rsp,rbp,=
+       ││   0x100001123    488b4f60     rdi,96,+,[8],rcx,=
+       ││   0x100001127    4c8b4130     rcx,48,+,[8],r8,=                                              ││   0x10000112b    488b5660     rsi,96,+,[8],rdx,=
+       ││   0x10000112f    b801000000   1,eax,= ;  0x00000001
+       ││   0x100001134    4c394230     rdx,48,+,[8],r8,==,cz,?=
+      ┌───< 0x100001138    7f1a         sf,of,!,^,zf,!,&,?{,0x1154,rip,=,} ;[2]
+     ┌────< 0x10000113a    7d07         of,!,sf,^,?{,0x1143,rip,} ;[3]
+     ││││   0x10000113c    b8ffffffff   0xffffffff,eax,= ;  0xffffffff                              ┌─────< 0x100001141    eb11         0x1154,rip,= ;[2]
+    │└────> 0x100001143    488b4938     rcx,56,+,[8],rcx,=
+    │ │││   0x100001147    48394a38     rdx,56,+,[8],rcx,==,cz,?=
+```
+
+Radare anal ESIL code example
+==============================
+
+As an example implementation of ESIL analysis for the AVR family of
+microcontrollers there is a `avr_op` function in `/libr/anal/p/anal_avr.c`
+which contains information on how the instructions are expressed in ESIL and
+other opcode information such as cycle counts per instruction:
+
+````
+static int avr_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
+  short ofst;
+    int d, r, k;
+    (...)
+````
+
+Variables d, r and k refer to "destination", "register" and "(k)onstant", respectively. They
+are used later on by ESIL string formatting function like for instance:
+
+    r_strbuf_setf (&op->esil, "0x%x,r%d,=", k, d);
+
+Which in this case corresponds to the LDI (LoaD with immediate) instruction in
+AVR. As an example, the above ESIL string template will translate into the
+following when reversing in radare:
+
+    0x00000080      30e0           0x0,r19,=                   ; LDI Rd,K. load immediate
+
+Or in non-ESIL format:
+
+    0x00000080      30e0           ldi r19, 0x00               ; LDI Rd,K. load immediate
+
+
+Looking at other architectures which already have mature ESIL support such as
+x86 can help in understanding the syntax and conventions of radare's ESIL.
+
+
+Introspection
+=============
+
+To ease esil parsing we should have a way to express introspection expressions
+to extract the data we want. For example. We want to get the target address of
+a jmp.
+
+The parser for the esil expressions should be implemented in an API to make it
+possible to extract information by analyzing the expressions easily.
+
+  >  ao~esil,opcode
+  opcode: jmp 0x10000465a
+  esil: 0x10000465a,rip,=
+
+We need a way to retrieve the numeric value of 'rip'. This is a very simple
+example, but there will be more complex, like conditional ones and we need
+expressions to get:
+
+- opcode type
+- destination of jump
+- condition depends on
+- all regs modified (write)
+- all regs accessed (read)
+
+API HOOKS
+=========
+
+It is important for emulation to be able to setup hooks in the parser, so we
+can extend the parser to implement the analysis without having to write the
+parser again and again. This is, every time an operation is going to be
+executed we call a user hook which can be used to determine if rip is changing
+or if the instruction updates the stack.
+
+Later, at this level we can split that callback into several ones to have an
+event based analysis api that may be extended in js like this:
+
+	esil.on('regset', function(){..
+	esil.on('syscall', function(){esil.regset('rip'
+
+we have already them. see `hook_flag_read()` `hook_execute()` `hook_mem_read()` ...
+
+* return true if you want to override the action taken for a callback. for
+  example. avoid mem reads in a region or mem writes to make all memory read
+  only.
+* return false or 0 if you want to trace esil expression parsing. aka emulation ..
+
+Other operations that require bindings to external functionalities to work. In
+this case `r_ref` and `r_io`. This must be defined when initializing the esil vm.
+
+* Io Get/Set
+
+      Out ax, 44
+      44,ax,:ou
+
+* Selectors (cs,ds,gs...)
+
+      Mov eax, ds:[ebp+8]
+      Ebp,8,+,:ds,eax,=
diff -Nru radare2-2.3.0+dfsg/doc/flirt radare2-2.8.0+dfsg/doc/flirt
--- radare2-2.3.0+dfsg/doc/flirt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/flirt	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-FLIRT
-=====
-At the  moment of  writing r2  supports  loading  and finding  FLIRT
-patterns, those files can be generated with the FLIRT tools from IDA.
-R2 doesn't  yet supports creating  those files.  But it supports its
-own signature format  which can be used  to generate signatures  and
-find them.
-
-This document will focus on FLIRT, not the native r2 'Zignatures'.
-
-You need the flair tools/ida utilities. Those tools are closed source
-and privative, so you should not distribute them. It is probable that
-it is  not possible  to redistribute the  .pat or the .sig files.  It
-doesn't  seems to  have watermarks.  However it's  a bit unclear  what
-licence the file generated should have.  Mentioning the files should
-be free of copyrighted material  (the original libs bytes). That said,
-there's a paragraph in the flirt paper:
-
-	https://www.hex-rays.com/products/ida/tech/flirt/in_depth.shtml
-
-
-Create the .pat file
---------------------
-
-	cd flair/bin/linux
-	./pelf -p64 /usr/lib/x86_64-linux-gnu/libc.a libc.pat
-
-Create the .sig file (possible collisions):
---------------------
-
-	./sigmake -n <libname> libc.pat libc.sig
-
-There's little chance libc.sig will  be compatible across systems and
-libc versions. If libc.exc exists, you need to resolve some functions
-conflicts.  Prepend a '+' on the lines  you're sure you  want to keep
-(see end of flair/sigmake.txt).  Then redo the  sigmake command.  The
-.sig is now ready to be used with r2.
-
-Using it with r2:
------------------
-
-    $ r2 -c 'zF libc.sig' staticbin
-
-PROFIT.
-
-refs:
-    flair/sigmake.txt
-    flair/pat.txt
-
diff -Nru radare2-2.3.0+dfsg/doc/flirt.md radare2-2.8.0+dfsg/doc/flirt.md
--- radare2-2.3.0+dfsg/doc/flirt.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/flirt.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,47 @@
+FLIRT
+=====
+
+At the  moment of  writing r2  supports  loading  and finding  FLIRT
+patterns, those files can be generated with the FLIRT tools from IDA.
+R2 doesn't  yet supports creating  those files.  But it supports its
+own signature format  which can be used  to generate signatures  and
+find them.
+
+This document will focus on FLIRT, not the native r2 'Zignatures'.
+
+You need the flair tools/ida utilities. Those tools are closed source
+and privative, so you should not distribute them. It is probable that
+it is  not possible  to redistribute the  .pat or the .sig files.  It
+doesn't  seems to  have watermarks.  However it's  a bit unclear  what
+licence the file generated should have.  Mentioning the files should
+be free of copyrighted material  (the original libs bytes). That said,
+there's a paragraph in [IDA F.L.I.R.T. Technology: In-Depth](https://www.hex-rays.com/products/ida/tech/flirt/in_depth.shtml)
+
+
+Create the .pat file
+--------------------
+
+	cd flair/bin/linux
+	./pelf -p64 /usr/lib/x86_64-linux-gnu/libc.a libc.pat
+
+Create the .sig file (possible collisions):
+--------------------
+
+	./sigmake -n <libname> libc.pat libc.sig
+
+There's little chance libc.sig will  be compatible across systems and
+libc versions. If libc.exc exists, you need to resolve some functions
+conflicts.  Prepend a '+' on the lines  you're sure you  want to keep
+(see end of flair/sigmake.txt).  Then redo the  sigmake command.  The
+.sig is now ready to be used with r2.
+
+Using it with r2:
+-----------------
+
+    r2 -c 'zF libc.sig' staticbin
+
+refs:
+
+* flair/sigmake.txt
+* flair/pat.txt
+
diff -Nru radare2-2.3.0+dfsg/doc/fortunes.creepy radare2-2.8.0+dfsg/doc/fortunes.creepy
--- radare2-2.3.0+dfsg/doc/fortunes.creepy	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/fortunes.creepy	2018-08-07 14:12:36.000000000 +0000
@@ -36,3 +36,4 @@
 This is what I hate most about guys like you. You didn't even try.
 Touch your monitor. It is warm like flesh. But it is not flesh. Yet.
 Look at you, hacker, a pathetic creature of meat and bone.
+Nobody can hear your calls for help
diff -Nru radare2-2.3.0+dfsg/doc/fortunes.fun radare2-2.8.0+dfsg/doc/fortunes.fun
--- radare2-2.3.0+dfsg/doc/fortunes.fun	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/fortunes.fun	2018-08-07 14:12:36.000000000 +0000
@@ -233,3 +233,21 @@
 Coffee time!
 Can you you challenge a perfect immortal machine?
 Add more blockchains to your life.
+Congratulations! You got the segfault 1.000.000! Click [here] to win a prize!
+Well, it looks like it's working.
+There's more than one way to skin a cat
+git pull now
+git checkout hamster
+Noot noot
+This is an unregistered copy.
+10 reasons you want to bt on all threads - you will be shocked by number 3!
+Place a cat on your keyboard while running r2, you'll not believe what will happen next
+This binary may contain traces of human
+Help subcommand will be eventually removed.
+Carpe noctum.
+Your mouse has moved. Radare2 NT must be restarted for the change to take effect. Reboot now? [ OK ]
+There is only one binary, and we are all just reversing pieces of it.
+Radare2 is like violence. If it doesn't solve your problem, you aren't using enough.
+Order pizza for $12.48? [Y/n]
+r2OS r2pad 0.1 SMP GENERIC r2_64 GNU/r2OS
+AHHHHH!!!! ASSEMBLY CODE!!!!!! HOLD ME I'M SCARED!!!!!!!!!!
diff -Nru radare2-2.3.0+dfsg/doc/fortunes.tips radare2-2.8.0+dfsg/doc/fortunes.tips
--- radare2-2.3.0+dfsg/doc/fortunes.tips	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/fortunes.tips	2018-08-07 14:12:36.000000000 +0000
@@ -28,7 +28,7 @@
 Assemble opcodes with the 'a' and 'A' keys in visual mode, which are bindings to the 'wa' and 'wA' commands
 Find expanded AES keys in memory with '/Ca'
 Find wide-char strings with the '/w <string>' command
-Enable ascii-art jump lines in disassembly by setting 'e asm.lines=true'. asm.linesout and asm.linestyle may interest you as well
+Enable ascii-art jump lines in disassembly by setting 'e asm.lines=true'. asm.lines.out and asm.linestyle may interest you as well
 Control the signal handlers of the child process with the 'dk' command
 Get a free shell with 'ragg2 -i exec -x'
 Interpret radare2 scripts with '. <path-to-script>'. Similar to the bash source alias command.
@@ -38,9 +38,9 @@
 Use hasher to calculate hashes of portion blocks of a file
 Use zoom.byte=entropy and press 'z' in visual mode to zoom out to see the entropy of the whole file
 Use 'zoom.byte=printable' in zoom mode ('z' in Visual mode) to find strings
-Set color to your screen with 'e scr.color=true'
+Add colors to your screen with 'e scr.color=X' where 1 is 16 colors, 2 is 256 colors and 3 is 16M colors
 Trace register changes while debugging with 'e trace.cmtregs=true'
-Move the comments to the right changing their margin with asm.cmtmargin
+Move the comments to the right changing their margin with asm.cmt.margin
 Execute a command on the visual prompt with cmd.vprompt
 Reduce the delta where flag resolving by address is used with cfg.delta
 Disable these messages with 'e cfg.fortunes = false' in your ~/.radare2rc
@@ -86,3 +86,4 @@
 The more 'a' you add after 'aa' the more analysis steps are executed.
 Review all the subcommands of aa to see better ways to analyze your targets.
 Use /m to carve for known magic headers. speedup with search.
+You can use registers in math expressions. For example: 'wx 1234 @ esp - 2'
diff -Nru radare2-2.3.0+dfsg/doc/freebsd.md radare2-2.8.0+dfsg/doc/freebsd.md
--- radare2-2.3.0+dfsg/doc/freebsd.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/freebsd.md	2018-08-07 14:12:36.000000000 +0000
@@ -1,42 +1,42 @@
 FreeBSD build instructions
 ==========================
 
-FreeBSD, as well as other BSD systems have some differences in the way commands are named and packages installed. This document aims to explain the steps needed to build r2 and r2b-python on FreeBSD.
+This document aims to explain the steps needed to build r2 and r2b-python on FreeBSD.
 
 * Note that `make` (from GNU) is named `gmake`
 * Stuff is installed in /usr/local
-* gcc is named cc and g++ is c++
+* clang (or gcc) is named cc and clang++ (or g++) is c++
 * valabind is not packaged in the ports
 
 Radare2 Dependencies:
 ---------------------
 
-	# pkg install git gcc gmake patch pkgconf
+	sudo pkg install git gcc gmake patch pkgconf
 
-	$ git clone https://github.com/radare/radare2
-	$ cd radare2
-	$ sys/install.sh /usr/local
+	git clone https://github.com/radare/radare2
+	cd radare2
+	sys/install.sh /usr/local
 
 Python Swig Bindings Dependencies:
 ----------------------------------
 
-	# pkg install swig30 pkgconf vala
+	sudo pkg install swig30 pkgconf vala
 
-	$ git clone https://github.com/radare/valabind
-	$ cd valabind
-	$ gmake
-	$ sudo gmake install PREFIX=/usr/local
+	git clone https://github.com/radare/valabind
+	cd valabind
+	gmake
+	sudo gmake install PREFIX=/usr/local
 
 Building Python Swig Bindings:
 ------------------------------
 
-	$ git clone https://github.com/radare/radare2-bindings
-	$ cd radare2-bindings
-	$ export CC=cc
-	$ export CXX=c++
-	$ export SWIG=swig3.0
-	$ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-	$ ./configure --prefix=/usr/local
-	$ cd python
-	$ gmake CC=$CC CXX=$CXX
-	$ sudo gmake install
+	git clone https://github.com/radare/radare2-bindings
+	cd radare2-bindings
+	export CC=cc
+	export CXX=c++
+	export SWIG=swig3.0
+	export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+	./configure --prefix=/usr/local
+	cd python
+	gmake CC=$CC CXX=$CXX
+	sudo gmake install
diff -Nru radare2-2.3.0+dfsg/doc/gdb radare2-2.8.0+dfsg/doc/gdb
--- radare2-2.3.0+dfsg/doc/gdb	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/gdb	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-Connecting r2 with gdb
-======================
-
-Running gdbserver
------------------
-        $ gdbserver :2345 /bin/ls
-        (gdb) target remote localhost:2345
-
-Connecting from r2
-------------------
-        $ r2 -D gdb gdb://127.0.0.1:2345
-
-
-Supported implementations
-=========================
-r2 have support for connecting to remote GDB instances:
-
-                x86-32   x86-64   arm    arm64   sh
-    winedbg       x        x       -      -      -
-    qemu          x        x       ?      x      -
-    gdbserver     x        x       ?      ?      ?
-
-    x = supported
-    ? = untested
-    - = not supported
-
-Supported Commands
-------------------
-- read/write memory
-
-Writing or reading memory is implemented through the m/M packet.
-
-- read registers
-
-Reading registers is currently implemented through the <g> packet of the gdb protocol.
-It returns the whole register profile at once. 
-
-- write registers
-
-There are two ways of writing registers. The first one is through the P packet.
-It works like this: `P<register_index>=<register_value>`
-The second one is the G packet, that writes the whole register Profile at once.
-The implementation first tries to use the newer P packet and if it receives a $00# packet (that says not implemented), it tries to write through the G packet.
-
-- stepping (but this is still the softstep mode and for an unknown reason it sill does not call th gdb_write_register function)
-
-Supported Packets:
-- g : Reads the whole register Profile at once
-- G : Writes the whole register Profile at once
-- m : Reads memory 
-- M : Writes memory
-- vCont,v : continues execution of the binary
-- P : Write one register
-
-TODO
-----
-- Implement GDBserver to allow other apps use r2 debugger 
-- Fix that usese the gdb internal stepping version
-- Fix softstep, that it finally recoils correct (it just have to reset the eip/rip)
-- Add Breakpoints (should be an easy add of the function, because its already implemented in the gdb lib)
-
diff -Nru radare2-2.3.0+dfsg/doc/gdb.md radare2-2.8.0+dfsg/doc/gdb.md
--- radare2-2.3.0+dfsg/doc/gdb.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/gdb.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,66 @@
+Connecting r2 with gdb
+======================
+
+Running gdbserver
+-----------------
+
+    $ gdbserver :2345 /bin/ls
+    (gdb) target remote localhost:2345
+
+Connecting from r2
+------------------
+
+    $ r2 -D gdb gdb://127.0.0.1:2345
+
+
+Supported implementations
+=========================
+r2 have support for connecting to remote GDB instances:
+
+                x86-32   x86-64   arm    arm64   sh
+    winedbg       x        x       -      -      -
+    qemu          x        x       ?      x      -
+    gdbserver     x        x       ?      ?      ?
+
+    x = supported
+    ? = untested
+    - = not supported
+
+Supported Commands
+------------------
+
+- read/write memory
+
+  Writing or reading memory is implemented through the m/M packet.
+
+- read registers
+
+  Reading registers is currently implemented through the <g> packet of the gdb protocol.
+  It returns the whole register profile at once. 
+
+- write registers
+
+  There are two ways of writing registers. The first one is through the P packet.
+  It works like this: `P<register_index>=<register_value>`
+  The second one is the G packet, that writes the whole register Profile at once.
+  The implementation first tries to use the newer P packet and if it receives a $00# packet (that says not implemented), it tries to write through the G packet.
+
+- stepping (but this is still the softstep mode and for an unknown reason it sill does not call th gdb_write_register function)
+
+Supported Packets:
+
+- `g` : Reads the whole register Profile at once
+- `G` : Writes the whole register Profile at once
+- `m` : Reads memory 
+- `M` : Writes memory
+- `vCont,v` : continues execution of the binary
+- `P` : Write one register
+
+TODO
+----
+
+- Implement GDBserver to allow other apps use r2 debugger 
+- Fix that usese the gdb internal stepping version
+- Fix softstep, that it finally recoils correct (it just have to reset the eip/rip)
+- Add Breakpoints (should be an easy add of the function, because its already implemented in the gdb lib)
+
diff -Nru radare2-2.3.0+dfsg/doc/gprobe.md radare2-2.8.0+dfsg/doc/gprobe.md
--- radare2-2.3.0+dfsg/doc/gprobe.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/gprobe.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,60 @@
+What is GProbe?
+===============
+GProbe is a protocol to communicate with various parts from
+Genesis/STMicro/MegaChips that are mostly used in video chipsets.
+
+These chips have an integrated Turbo186 core. With GProbe you can read and write
+RAM, reset the CPU, execute code in RAM, ...
+There is a proprietary Windows tool to do this, but radare2 offers much more
+functionality.
+
+Gprobe got some public attention with the
+[MonitorDarkly exploit](https://github.com/RedBalloonShenanigans/MonitorDarkly).
+
+What is implemented?
+--------------------
+- Serial1 protocol wrapper
+- DDC2Bi3 protocol wrapper (Linux only)
+- RAM read-/write-access
+- Reset
+- DebugOn/DebugOff
+- RunCode
+- GetDeviceId
+- GetInformation
+
+TODOs
+-----
+- DisplayPort AUX Channel protocol wrapper
+- Flash commands
+
+What is tested?
+---------------
+- building with sys/user.sh and sys/mingw32.sh on linux
+- running radare2 on Linux and Windows
+- communication via FTDI USB serial adaptor
+- communication via DDC2Bi3
+- controlling a MegaChips RD1-4320 DisplayPort 1.2a splitter reference board
+- controlling a DELL U2410 connected via DVI
+
+How to use for dummies?
+-----------------------
+radare2 -n -w gprobe:///dev/ttyUSB0
+- "/dev/ttyUSB0" is the serial connection, use something like "COM3" on Windows
+- "-n" is important to avoid an initial 32k read to identify the binary type
+- "-w" if you want to allow writing to RAM
+
+radare2 -n -w gprobe://i2c-4
+- i2c-4 is the i2c bus where the GProbe device is connected
+- find the appropriate bus with "ddcutil detect"
+- make sure the i2c-dev kernel module is loaded
+
+Setup for Turbo186 processor core:
+- e asm.bits=16
+- e asm.seggrn=8
+
+Now enjoy all the great stuff that r2 offers, like:
+- run grobe commands with =!?
+- dump memory with px
+- Visual mode with V, including cursor mode and insert hexpairs
+- dumping segments to file
+- disassembly and analysis
diff -Nru radare2-2.3.0+dfsg/doc/haiku radare2-2.8.0+dfsg/doc/haiku
--- radare2-2.3.0+dfsg/doc/haiku	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/haiku	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-r2 for Haiku
-============
-
-To compile for Haiku run configure in this way:
-
-	> HOST_CC=gcc-x86 CC=gcc-x86 ./configure --with-ostype=haiku --prefix=/boot/home/Apps/radare2
-
-And then..
-
-	> HOST_CC=gcc-x86 make
-	> make install
-	> mv /boot/home/Apps/radare2/bin/* /boot/home/Apps/radare2/
-	> rmdir /boot/home/Apps/radare2/bin/
-
-To install r2-bindings you will need to install r2, valac, valabind and swig
-and copy/link libs to radare2/lib
-
-
-TODO
-====
-
-* Add debugging support
diff -Nru radare2-2.3.0+dfsg/doc/haiku.md radare2-2.8.0+dfsg/doc/haiku.md
--- radare2-2.3.0+dfsg/doc/haiku.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/haiku.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,22 @@
+r2 for Haiku
+============
+
+To compile for Haiku run configure in this way:
+
+	HOST_CC=gcc-x86 CC=gcc-x86 ./configure --with-ostype=haiku --prefix=/boot/home/Apps/radare2
+
+And then..
+
+	HOST_CC=gcc-x86 make
+	make install
+	mv /boot/home/Apps/radare2/bin/* /boot/home/Apps/radare2/
+	rmdir /boot/home/Apps/radare2/bin/
+
+To install r2-bindings you will need to install r2, valac, valabind and swig
+and copy/link libs to radare2/lib
+
+
+TODO
+====
+
+* Add debugging support
diff -Nru radare2-2.3.0+dfsg/doc/hud radare2-2.8.0+dfsg/doc/hud
--- radare2-2.3.0+dfsg/doc/hud	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/hud	2018-08-07 14:12:36.000000000 +0000
@@ -6,7 +6,9 @@
 analyze preludes	ap
 continue process execution	dc;?i
 disable colors	e scr.color=0
-enable colors	e scr.color=1
+enable colors (ANSI 16)	e scr.color=1
+enable colors (256)	e scr.color=2
+enable colors (16M)	e scr.color=3
 randomize colors	ecr
 hide bytes in disassembly	e asm.bytes=false
 show bytes in disassembly	e asm.bytes=true
diff -Nru radare2-2.3.0+dfsg/doc/ida radare2-2.8.0+dfsg/doc/ida
--- radare2-2.3.0+dfsg/doc/ida	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/ida	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-IDA
-======
-
-You can find conversion scripts to work between radare2 and IDA files (IDC, IDB...) in the repo:
-
-* https://github.com/radare/radare2ida
-
diff -Nru radare2-2.3.0+dfsg/doc/ida.md radare2-2.8.0+dfsg/doc/ida.md
--- radare2-2.3.0+dfsg/doc/ida.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/ida.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,7 @@
+IDA
+======
+
+You can find conversion scripts to work between radare2 and IDA files (IDC, IDB...) in the repo:
+
+* https://github.com/radare/radare2ida
+
diff -Nru radare2-2.3.0+dfsg/doc/images/morelogos.svg radare2-2.8.0+dfsg/doc/images/morelogos.svg
--- radare2-2.3.0+dfsg/doc/images/morelogos.svg	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/images/morelogos.svg	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:docname="morelogos.svg">
+  <defs
+     id="defs4">
+    <clipPath
+       id="clipPath3018"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3020"
+         d="m 0,841.89 1190.55,0 L 1190.55,0 0,0 0,841.89 z" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="74.213031"
+     inkscape:cy="605.39318"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:window-width="1601"
+     inkscape:window-height="946"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4202" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3492-8"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33072916"
+       d="m 93.599888,76.283181 0,31.502289 3.929393,0 0,1.77899 -27.426708,0 0,-1.77899 5.262562,0 0,-17.048101 c 0,-3.03874 0.222581,-5.707724 -0.814586,-8.598297 -0.222581,-0.741164 -2.445411,-4.965899 -3.557984,-3.113154 0.296995,1.112242 0.445161,2.37199 0.445161,3.484563 0,4.965237 -3.410148,8.152474 -8.301963,8.152474 -5.114396,0 -8.67205,-3.557654 -8.67205,-8.67205 0,-5.336646 4.669896,-8.226888 9.561711,-8.226888 5.26157,0 9.486305,2.815828 11.934362,7.337557 l 0.146844,0 0,-7.486716 c 7.114977,0.222581 14.305359,0.889662 21.422651,0.889662 l 0,1.778661 -3.929393,0 z" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.12683868;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 78.174041,58.007038 c -0.659234,0.005 -1.319159,0.03098 -1.978381,0.07875 C 56.494605,58.809033 41.444044,80.165554 47.371787,98.960987 52.080508,118.03926 75.923424,128.45132 93.116106,118.93544 110.71577,110.597 116.31258,85.480405 103.86563,70.485731 97.831753,62.613106 88.062573,57.931634 78.174041,58.007038 Z m -1.122683,3.700343 c 0.317207,-1.3e-5 0.6356,0.0064 0.955579,0.01921 5.455174,-0.084 10.903688,1.492533 15.531736,4.366846 15.604747,8.740747 17.493427,32.12811 5.130829,44.401233 -12.412566,13.53326 -36.888665,9.4802 -45.359688,-6.42302 C 42.733834,86.883129 57.06733,61.708116 77.051358,61.707384 Z"
+       id="path4165"
+       inkscape:connector-curvature="0" />
+    <g
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#d77e00;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       aria-label="radare"
+       id="text4192"
+       transform="matrix(2.1597005,0,0,2.1597005,-99.953524,-250.18698)">
+      <path
+         d="m 68.962372,215.46106 -0.165365,0 q -0.118856,-0.0413 -0.382405,-0.062 -0.26355,-0.0207 -0.43925,-0.0207 -0.397909,0 -0.7028,0.0517 -0.304891,0.0517 -0.65629,0.1757 l 0,3.88607 -1.860352,0 0,-5.80326 1.860352,0 0,0.85266 q 0.614949,-0.5271 1.069702,-0.69763 0.454752,-0.1757 0.837158,-0.1757 0.09819,0 0.222209,0.005 0.124023,0.005 0.217041,0.0155 l 0,1.7725 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:Verdana;-inkscape-font-specification:'Verdana, Bold';font-variant-ligatures:none;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#d77e00;fill-opacity:1"
+         id="path4342"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 73.540904,217.9777 0,-1.20923 q -0.377238,0.031 -0.816488,0.0879 -0.43925,0.0517 -0.666626,0.12403 -0.279053,0.0879 -0.428914,0.25838 -0.144694,0.16536 -0.144694,0.43925 0,0.18087 0.03101,0.29455 0.03101,0.11369 0.155029,0.21705 0.118856,0.10335 0.28422,0.15502 0.165365,0.0465 0.516764,0.0465 0.279053,0 0.563274,-0.11368 0.289388,-0.11369 0.506429,-0.29973 z m 0,0.89917 q -0.149862,0.11369 -0.372071,0.27389 -0.222208,0.16019 -0.418579,0.25321 -0.273885,0.12402 -0.568441,0.18087 -0.294555,0.062 -0.645955,0.062 -0.826823,0 -1.384928,-0.5116 -0.558106,-0.51159 -0.558106,-1.30741 0,-0.63562 0.284221,-1.0387 0.28422,-0.40307 0.806152,-0.63562 0.516764,-0.23254 1.281575,-0.33073 0.764812,-0.0982 1.586467,-0.14469 l 0,-0.031 q 0,-0.48059 -0.392741,-0.66145 -0.392741,-0.18604 -1.157552,-0.18604 -0.45992,0 -0.981852,0.16537 -0.521932,0.16019 -0.749308,0.24804 l -0.170533,0 0,-1.40043 q 0.294556,-0.0775 0.956014,-0.18087 0.666626,-0.10852 1.333252,-0.10852 1.586467,0 2.289266,0.49093 0.707967,0.48576 0.707967,1.52962 l 0,3.94808 -1.844848,0 0,-0.61495 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:Verdana;-inkscape-font-specification:'Verdana, Bold';font-variant-ligatures:none;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#d77e00;fill-opacity:1"
+         id="path4344"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 82.739308,219.49182 -1.860351,0 0,-0.60461 q -0.480591,0.39274 -0.89917,0.57877 -0.418579,0.18604 -0.966349,0.18604 -1.059367,0 -1.694987,-0.81649 -0.63562,-0.81649 -0.63562,-2.20142 0,-0.73897 0.211873,-1.30741 0.217041,-0.57361 0.589111,-0.98185 0.3514,-0.38757 0.852662,-0.59945 0.501261,-0.21704 1.002522,-0.21704 0.521932,0 0.852661,0.11369 0.335897,0.10852 0.687297,0.27905 l 0,-2.47013 1.860351,0 0,8.04085 z m -1.860351,-1.60197 0,-2.84737 q -0.19637,-0.0827 -0.413411,-0.11886 -0.217041,-0.0362 -0.397909,-0.0362 -0.733805,0 -1.100708,0.45992 -0.366903,0.45475 -0.366903,1.26607 0,0.85267 0.294556,1.24024 0.294556,0.3824 0.945679,0.3824 0.253214,0 0.537435,-0.093 0.28422,-0.0982 0.501261,-0.25322 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:Verdana;-inkscape-font-specification:'Verdana, Bold';font-variant-ligatures:none;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#d77e00;fill-opacity:1"
+         id="path4346"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 88.010304,217.9777 0,-1.20923 q -0.377238,0.031 -0.816488,0.0879 -0.439249,0.0517 -0.666626,0.12403 -0.279052,0.0879 -0.428914,0.25838 -0.144694,0.16536 -0.144694,0.43925 0,0.18087 0.03101,0.29455 0.03101,0.11369 0.155029,0.21705 0.118856,0.10335 0.284221,0.15502 0.165364,0.0465 0.516764,0.0465 0.279053,0 0.563273,-0.11368 0.289388,-0.11369 0.506429,-0.29973 z m 0,0.89917 q -0.149862,0.11369 -0.37207,0.27389 -0.222209,0.16019 -0.418579,0.25321 -0.273885,0.12402 -0.568441,0.18087 -0.294556,0.062 -0.645956,0.062 -0.826822,0 -1.384928,-0.5116 -0.558105,-0.51159 -0.558105,-1.30741 0,-0.63562 0.28422,-1.0387 0.28422,-0.40307 0.806152,-0.63562 0.516765,-0.23254 1.281576,-0.33073 0.764811,-0.0982 1.586466,-0.14469 l 0,-0.031 q 0,-0.48059 -0.392741,-0.66145 -0.39274,-0.18604 -1.157552,-0.18604 -0.45992,0 -0.981852,0.16537 -0.521932,0.16019 -0.749308,0.24804 l -0.170532,0 0,-1.40043 q 0.294555,-0.0775 0.956014,-0.18087 0.666626,-0.10852 1.333252,-0.10852 1.586466,0 2.289265,0.49093 0.707968,0.48576 0.707968,1.52962 l 0,3.94808 -1.844849,0 0,-0.61495 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:Verdana;-inkscape-font-specification:'Verdana, Bold';font-variant-ligatures:none;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#d77e00;fill-opacity:1"
+         id="path4348"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 95.772104,215.46106 -0.165364,0 q -0.118856,-0.0413 -0.382406,-0.062 -0.26355,-0.0207 -0.43925,-0.0207 -0.397908,0 -0.702799,0.0517 -0.304891,0.0517 -0.656291,0.1757 l 0,3.88607 -1.860351,0 0,-5.80326 1.860351,0 0,0.85266 q 0.61495,-0.5271 1.069702,-0.69763 0.454753,-0.1757 0.837158,-0.1757 0.09819,0 0.222209,0.005 0.124024,0.005 0.217041,0.0155 l 0,1.7725 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:Verdana;-inkscape-font-specification:'Verdana, Bold';font-variant-ligatures:none;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#d77e00;fill-opacity:1"
+         id="path4350"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 102.55205,216.93384 -4.258134,0 q 0.04134,0.68213 0.516764,1.04386 0.480591,0.36174 1.41077,0.36174 0.58911,0 1.14205,-0.21188 0.55293,-0.21187 0.87333,-0.45475 l 0.2067,0 0,1.49345 q -0.63045,0.25321 -1.18855,0.3669 -0.55811,0.11369 -1.23507,0.11369 -1.746665,0 -2.67684,-0.78548 -0.930176,-0.78548 -0.930176,-2.23759 0,-1.43661 0.878499,-2.27376 0.883667,-0.84233 2.418457,-0.84233 1.41593,0 2.12907,0.7183 0.71313,0.71314 0.71313,2.05672 l 0,0.65113 z m -1.85001,-1.09037 q -0.0155,-0.58395 -0.28939,-0.8785 -0.27389,-0.29456 -0.852661,-0.29456 -0.537435,0 -0.883667,0.27905 -0.346233,0.27906 -0.387574,0.89401 l 2.413292,0 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.58333302px;line-height:125%;font-family:Verdana;-inkscape-font-specification:'Verdana, Bold';font-variant-ligatures:none;font-variant-caps:normal;font-variant-numeric:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332px;fill:#d77e00;fill-opacity:1"
+         id="path4352"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4330"
+       transform="matrix(0.48780491,0,0,0.48780491,60.789631,80.918068)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4212"
+         d="m -39.687499,109.14583 0,108.47918 79.374999,-39.6875 79.375,39.6875 0,-108.47918 -79.375,39.68751 z"
+         style="fill:#c50000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <g
+         id="g4301">
+        <path
+           sodipodi:type="inkscape:offset"
+           inkscape:radius="2.0788691"
+           inkscape:original="M -6.9101562 144.04883 L -6.9101562 151.53516 L -7.0566406 151.53516 C -9.5046975 147.01343 -13.728664 144.19727 -18.990234 144.19727 C -23.882049 144.19727 -28.552734 147.08719 -28.552734 152.42383 C -28.552734 157.53823 -24.995256 161.0957 -19.880859 161.0957 C -14.989044 161.0957 -11.578125 157.90859 -11.578125 152.94336 C -11.578125 151.83078 -11.726442 150.57123 -12.023438 149.45898 C -10.910865 147.60624 -8.6893779 151.8311 -8.4667969 152.57227 C -7.42963 155.46284 -7.6523438 158.13118 -7.6523438 161.16992 L -7.6523438 178.21875 L -12.914062 178.21875 L -12.914062 179.99805 L 14.513672 179.99805 L 14.513672 178.21875 L 10.583984 178.21875 L 10.583984 146.7168 L 14.513672 146.7168 L 14.513672 144.9375 C 7.3963802 144.9375 0.20481978 144.27142 -6.9101562 144.04883 z "
+           xlink:href="#path3492-8-1-5"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33072916"
+           id="path4299"
+           inkscape:href="#path3492-8-1-5"
+           d="m -8.4101562,142.60938 c -0.4845479,3.94638 -0.9583174,2.85837 -3.9088128,1.12892 -5.899747,-3.15317 -14.929134,-1.56688 -17.551513,5.11107 -2.311209,5.76338 1.443718,13.28057 7.824661,13.966 5.002531,1.28831 11.054442,-1.77175 12.0673054,-7.03607 0.5530499,6.7456 0.1003009,13.58053 0.2480468,20.36132 -2.3966762,-0.40949 -5.9697602,0.15311 -5.2617192,3.38752 0.200795,3.76141 4.802732,2.25799 7.3157036,2.54803 7.51639107,-0.12 15.1359992,0.23979 22.5880094,-0.17948 3.12967,-0.93598 1.787299,-6.83119 -1.707248,-5.75607 -1.290112,-1.36391 -0.163039,-5.145 -0.542168,-7.4199 0,-6.64193 0,-13.28386 0,-19.9258 2.642052,0.73643 4.859082,-1.74806 3.750205,-4.25527 -1.115929,-2.89573 -5.054228,-1.3443 -7.4818724,-1.91348 -5.3754068,-0.0987 -10.8363345,-0.69509 -16.159701,-0.4909 -0.3936323,0.15804 -0.7872646,0.31607 -1.1808968,0.47411 z"
+           transform="translate(0,0.52916667)" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3492-8-1-5"
+           style="fill:#470000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33072916"
+           d="m 10.583333,146.71667 0,31.50229 3.929394,0 0,1.77899 -27.426708,0 0,-1.77899 5.2625618,0 0,-17.0481 c 0,-3.03874 0.222581,-5.70773 -0.8145859,-8.5983 -0.222581,-0.74117 -2.4454109,-4.9659 -3.5579839,-3.11316 0.296995,1.11225 0.445161,2.37199 0.445161,3.48457 0,4.96523 -3.410148,8.15247 -8.301963,8.15247 -5.114397,0 -8.67205,-3.55765 -8.67205,-8.67205 0,-5.33664 4.669896,-8.22689 9.561711,-8.22689 5.26157,0 9.4863049,2.81583 11.9343618,7.33756 l 0.146844,0 0,-7.48672 c 7.11497603,0.22259 14.3053595,0.88967 21.4226512,0.88967 l 0,1.77866 -3.929394,0 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3492-8-1"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33072916"
+           d="m 10.701072,147.41352 0,31.50229 3.929394,0 0,1.77899 -27.426708,0 0,-1.77899 5.2625626,0 0,-17.0481 c 0,-3.03874 0.222581,-5.70773 -0.8145862,-8.5983 -0.222581,-0.74117 -2.4454114,-4.9659 -3.5579844,-3.11316 0.296995,1.11225 0.445161,2.37199 0.445161,3.48457 0,4.96523 -3.410148,8.15247 -8.301963,8.15247 -5.114396,0 -8.67205,-3.55765 -8.67205,-8.67205 0,-5.33664 4.669896,-8.22689 9.561711,-8.22689 5.26157,0 9.4863054,2.81583 11.9343626,7.33756 l 0.146844,0 0,-7.48672 c 7.11497606,0.22259 14.305359,0.88967 21.4226504,0.88967 l 0,1.77866 -3.929394,0 z" />
+      </g>
+      <g
+         id="g4301-8"
+         transform="translate(90.525391,0.75011333)">
+        <path
+           sodipodi:type="inkscape:offset"
+           inkscape:radius="2.0788691"
+           inkscape:original="M -6.9101562 144.04883 L -6.9101562 151.53516 L -7.0566406 151.53516 C -9.5046975 147.01343 -13.728664 144.19727 -18.990234 144.19727 C -23.882049 144.19727 -28.552734 147.08719 -28.552734 152.42383 C -28.552734 157.53823 -24.995256 161.0957 -19.880859 161.0957 C -14.989044 161.0957 -11.578125 157.90859 -11.578125 152.94336 C -11.578125 151.83078 -11.726442 150.57123 -12.023438 149.45898 C -10.910865 147.60624 -8.6893779 151.8311 -8.4667969 152.57227 C -7.42963 155.46284 -7.6523438 158.13118 -7.6523438 161.16992 L -7.6523438 178.21875 L -12.914062 178.21875 L -12.914062 179.99805 L 14.513672 179.99805 L 14.513672 178.21875 L 10.583984 178.21875 L 10.583984 146.7168 L 14.513672 146.7168 L 14.513672 144.9375 C 7.3963802 144.9375 0.20481978 144.27142 -6.9101562 144.04883 z "
+           xlink:href="#path3492-8-1-5-9"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33072916"
+           id="path4299-8"
+           inkscape:href="#path3492-8-1-5-9"
+           d="m -8.4101562,142.60938 c -0.4845479,3.94638 -0.9583174,2.85837 -3.9088128,1.12892 -5.899747,-3.15317 -14.929134,-1.56688 -17.551513,5.11107 -2.311209,5.76338 1.443718,13.28057 7.824661,13.966 5.002531,1.28831 11.054442,-1.77175 12.0673054,-7.03607 0.5530499,6.7456 0.1003009,13.58053 0.2480468,20.36132 -2.3966762,-0.40949 -5.9697602,0.15311 -5.2617192,3.38752 0.200795,3.76141 4.802732,2.25799 7.3157036,2.54803 7.51639107,-0.12 15.1359992,0.23979 22.5880094,-0.17948 3.12967,-0.93598 1.787299,-6.83119 -1.707248,-5.75607 -1.290112,-1.36391 -0.163039,-5.145 -0.542168,-7.4199 0,-6.64193 0,-13.28386 0,-19.9258 2.642052,0.73643 4.859082,-1.74806 3.750205,-4.25527 -1.115929,-2.89573 -5.054228,-1.3443 -7.4818724,-1.91348 -5.3754068,-0.0987 -10.8363345,-0.69509 -16.159701,-0.4909 -0.3936323,0.15804 -0.7872646,0.31607 -1.1808968,0.47411 z"
+           transform="translate(0,0.52916667)" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3492-8-1-5-9"
+           style="fill:#470000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33072916"
+           d="m 10.583333,146.71667 0,31.50229 3.929394,0 0,1.77899 -27.426708,0 0,-1.77899 5.2625618,0 0,-17.0481 c 0,-3.03874 0.222581,-5.70773 -0.8145859,-8.5983 -0.222581,-0.74117 -2.4454109,-4.9659 -3.5579839,-3.11316 0.296995,1.11225 0.445161,2.37199 0.445161,3.48457 0,4.96523 -3.410148,8.15247 -8.301963,8.15247 -5.114397,0 -8.67205,-3.55765 -8.67205,-8.67205 0,-5.33664 4.669896,-8.22689 9.561711,-8.22689 5.26157,0 9.4863049,2.81583 11.9343618,7.33756 l 0.146844,0 0,-7.48672 c 7.11497603,0.22259 14.3053595,0.88967 21.4226512,0.88967 l 0,1.77866 -3.929394,0 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3492-8-1-0"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.33072916"
+           d="m 10.701072,147.41352 0,31.50229 3.929394,0 0,1.77899 -27.426708,0 0,-1.77899 5.2625626,0 0,-17.0481 c 0,-3.03874 0.222581,-5.70773 -0.8145862,-8.5983 -0.222581,-0.74117 -2.4454114,-4.9659 -3.5579844,-3.11316 0.296995,1.11225 0.445161,2.37199 0.445161,3.48457 0,4.96523 -3.410148,8.15247 -8.301963,8.15247 -5.114396,0 -8.67205,-3.55765 -8.67205,-8.67205 0,-5.33664 4.669896,-8.22689 9.561711,-8.22689 5.26157,0 9.4863054,2.81583 11.9343626,7.33756 l 0.146844,0 0,-7.48672 c 7.11497606,0.22259 14.305359,0.88967 21.4226504,0.88967 l 0,1.77866 -3.929394,0 z" />
+      </g>
+    </g>
+  </g>
+</svg>
diff -Nru radare2-2.3.0+dfsg/doc/images/r2w.svg radare2-2.8.0+dfsg/doc/images/r2w.svg
--- radare2-2.3.0+dfsg/doc/images/r2w.svg	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/images/r2w.svg	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="577.00684"
+   height="186.00784"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="Radare2_white.svg"
+   inkscape:export-filename="/home/msancho/bitmap2.png"
+   inkscape:export-xdpi="600"
+   inkscape:export-ydpi="600">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="296.46842"
+     inkscape:cy="9.9110278"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1912"
+     inkscape:window-height="1043"
+     inkscape:window-x="0"
+     inkscape:window-y="18"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-84.742798,-728.74085)">
+    <path
+       style="fill:#000000"
+       d="m 306.49965,906.74869 -20,0 0,-164 10,0 10,0 0,-3.84123 0,-3.84124 -25.25,-0.66707 c -13.8875,-0.36689 -35.6,-1.32573 -48.25,-2.13076 -12.65,-0.80502 -26.0375,-1.47628 -29.75,-1.49169 l -6.75,-0.028 -0.76637,38 c -0.4215,0 -2.25213,-2.48403 -4.06806,-5.52007 -4.51661,-7.55126 -15.36103,-18.1989 -23.18268,-22.76201 -15.9463,-9.30299 -37.6226,-11.56618 -54.93134,-5.73529 -20.001803,6.73812 -31.424583,24.98116 -28.296333,45.19138 2.38828,15.4296 12.54802,29.07772 25.155393,33.79256 17.91799,6.70088 37.7951,3.51356 49.13714,-7.8792 11.21018,-11.26031 13.00051,-19.15222 10.65232,-46.95637 -0.30172,-3.57261 2.61758,-5.0022 6.03921,-2.95744 4.10037,2.45037 10.9097,12.95015 13.19334,20.34371 3.54575,11.4798 4.06738,21.3172 4.06738,76.7065 l 0,53.77623 -28,0 c 0,2.66667 0,5.33333 0,8 l 141,0 z m 167.50143,-178 c 10e-4,-0.99184 -185.50101,92.50802 -185.48542,92.99748 0.0266,0.83328 185.23275,93.18116 185.23399,92.27062 z m 187.54234,0.1667 c -2.92931,1.02113 -185.03629,92.3869 -184.99916,92.81682 0.0715,0.82727 184.37682,92.62058 185.20539,92.24156 z"
+       id="path3023"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccsssccsssssssssscccccscsscccc" />
+    <path
+       style="fill:#ffffff;stroke-width:0.71428573"
+       d="m 117.59341,1.0694516 c -2.65159,0.1161295 -7.82989,-0.29353093 -7.13588,3.8351005 -0.46466,10.5578939 -0.065,21.1698679 -0.52037,31.6964289 C 100.2516,22.698338 87.532723,9.8364443 70.846216,4.9465243 59.708489,1.0662455 47.598423,1.8707041 36.05044,2.8830676 20.271994,5.7094549 5.5317173,16.709307 0.87605434,32.443614 -5.5136895,51.720813 4.2667163,74.384031 21.658411,84.275503 c 17.248623,8.295471 40.001134,7.057457 54.122776,-6.770507 7.71565,-7.028934 12.168907,-17.369988 11.374079,-27.841599 0.28105,-7.273101 -0.511486,-14.623606 0.171678,-21.854269 4.527322,-0.769814 7.31495,4.477813 9.768793,7.454153 8.605533,11.977182 9.645703,26.984102 9.817543,41.177415 0.68573,33.398154 0.29743,66.881494 0.42064,100.312354 -9.182226,0.25894 -18.598818,-0.50784 -27.638111,0.37667 0.431193,3.17575 -2.582365,11.0964 2.924107,10.19531 46.428574,0 92.857144,0 139.285714,0 1.38109,-2.12032 2.35769,-9.62426 -0.71429,-10.57198 -6.09514,0 -12.19029,0 -18.28543,0 0,-53.85696 0,-107.713919 0,-161.570875 6.56566,-0.248065 13.35793,0.495592 19.78097,-0.376674 -0.34972,-3.011124 2.41341,-10.2128285 -2.86175,-9.4726219 -31.11704,-1.455909 -62.26504,-2.2624623 -93.36314,-4.1434498 -2.9549,-0.099836 -5.91185,-0.1767794 -8.86858,-0.1199777 z"
+       id="path68"
+       inkscape:connector-curvature="0"
+       transform="translate(84.742798,728.74085)" />
+    <path
+       style="fill:#ffffff;stroke-width:0.50507629"
+       d="M 388.32474,-0.75406957 C 357.55884,13.875555 327.25481,29.486093 296.75737,44.675218 c -31.08234,15.768633 -62.36617,31.16451 -93.17019,47.46726 -1.4532,2.308805 2.68433,2.726872 3.92949,3.865026 55.34668,28.247046 110.89436,56.103586 166.67146,83.490006 4.76229,2.2051 9.43274,4.66768 14.33095,6.54871 2.37728,-0.56254 1.0347,-4.02146 1.52219,-5.78734 0.53767,-52.29439 0.26152,-104.595656 0.21619,-156.892548 -0.26273,-7.832014 0.34778,-15.7833115 -0.66707,-23.54725838 -0.22379,-0.46808642 -0.75953,-0.7117366 -1.26565,-0.57314319 z"
+       id="path70"
+       inkscape:connector-curvature="0"
+       transform="translate(84.742798,728.74085)" />
+    <path
+       inkscape:export-filename="/home/msancho/path72.png"
+       inkscape:export-xdpi="600"
+       inkscape:export-ydpi="600"
+       style="fill:#ffffff;stroke-width:0.50507629"
+       d="M 576.02667,-0.81819059 C 514.42864,30.061841 452.76639,60.8144 391.2536,91.863308 c -1.51054,2.336548 2.8016,3.278 4.25728,4.344449 56.11306,28.350383 112.30408,56.555813 168.77412,84.189343 4.21565,1.73499 8.21672,4.4868 12.59953,5.58135 1.86152,-1.49679 0.61932,-4.68556 1.10356,-6.80087 0.34952,-53.66255 0.0518,-107.329758 -0.31696,-160.99195 -0.29424,-6.265078 0.31676,-12.7370865 -0.54848,-18.87163265 -0.36435,0.0218381 -0.73548,-0.41525555 -1.09598,-0.13218794 z"
+       id="path72"
+       inkscape:connector-curvature="0"
+       transform="translate(84.742798,728.74085)" />
+  </g>
+</svg>
diff -Nru radare2-2.3.0+dfsg/doc/intro.md radare2-2.8.0+dfsg/doc/intro.md
--- radare2-2.3.0+dfsg/doc/intro.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/intro.md	2018-08-07 14:12:36.000000000 +0000
@@ -30,7 +30,7 @@
 
 ```
 # Show comments at right of disassembly if they fit in screen
-e asm.cmtright=true
+e asm.cmt.right=true
 
 # Shows pseudocode in disassembly. Eg mov eax, str.ok = > eax = str.ok
 e asm.pseudo = true
diff -Nru radare2-2.3.0+dfsg/doc/io radare2-2.8.0+dfsg/doc/io
--- radare2-2.3.0+dfsg/doc/io	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/io	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-How IO should work
-==================
-
-* Maps
-
- Used to select fd. Mapaddr..size
-
-* Sections
-
- Used to specify vaddr<->paddr
-
-Manually selecting fd is still valid and it should override maps fdselection. This is.. We need a way to tell r2 to view one fd or all of them. In case of having two files mapped on the same address space we will select the last opened.
-
-The base address is used to reallocate all vaddr offsets.
-
-Reading/writing ops should be done in a loop checking for the section boundaries.
-
-The sections must be asociated to a file, but we should be able to display/use them all in case of having non forced fd. This is, when not having overlapped files in memory.
-
-The write ops should only obey to the global io configuration and ignore the section permissions (maybe just throw a warning?)
-
-Atm sections are dupped in io and bin. We should merge them. Maybe using sdb, so we just reuse it
diff -Nru radare2-2.3.0+dfsg/doc/io-fixing radare2-2.8.0+dfsg/doc/io-fixing
--- radare2-2.3.0+dfsg/doc/io-fixing	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/io-fixing	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-r_io/r_core-file fixing
-=======================
-
-Conceptual things:
-------------------
--in general only code from r_io should be used for io related stuff, io is NOT a core-task
-	-wrappers are ok, but no re-implementations (there might be exceptions but those must be reasonable argued)
-		-linkage is not argument -> use RIOBind
-	-esil-custom reads and writes should use RIOBind too
--if a file gets opened a RIODesc MUST be created
--if a file gets opened in usual cases a RIOMap MUST be created
--if a file gets opened in unsusual cases it's not necessary to create a RIOMap
-	-if no RIOMap was created for a fd reading and writing from and to this fd is only possible via r_io_pread and r_io_pwrite
-	-this is only an option if only 1 file can be opened for a task or if the fd will never see the user-land
-		-Rahash2 for example won't need creating a RIOMap
--if a file gets closed all RIOMaps for that belong to the fd MUST get destroyed
--if a file gets closed the RIODesc MUST get destroyed
--the cores primary task is to delegate the different parts of r2
-	-creating a new RIOMap or RIODesc on file-opening is NOT a core-task
-	-the same goes for destroying RIOMaps and RIODesc on closing a file
-    	-there is no need for a map-list in the core directly. core->io->maps is the only list to store maps (for the long run, functions that return a list with maps are ok)
-
-Documentation:
---------------
-There is no need for a huge documentation!!! But code with fundamental importance often needs a few lines on what it should do, its concept
-and sometimes a few lines of the code itself need some kind of 'justification' or explanation. libr/io/vio.c is a hardcore example for this
-RIO-code has fundamental importance, because everything will fail if io does not work correctly.
-This is needed to make bug-fixing easier, faster and better.
-
-Need review:
-------------
-    libr/io/io.c
-    libr/core/file.c
-
-Tasks:
-------
--we should fix all the tests before doing this.
-	-talk about ioneg
--remove re-implemtations of r_io (middle)
--implement r_io_open_at (easy) ; this should open a file, add a RIODesc and a RIOMap that maps the file to an offset that is passed as an arg
--make r_io_open creating a new map (easy) ; this should open a file, add a RIODesc and a RIOMap that maps the file to 0
-	-this means cleaning up r_core_file_open too (hard?)
--implement r_io_open_no_map (easy) ; this should open a file and add a RIODesc. the file can only be accessed via r_io_pread and r_io_pwrite
--make r_io_close destroy all maps that belong to the file that should be closed (easy)
-	-this means cleaning up r_core_file_close too (hard?)
--implement r_io_mwrite (hard); this should find all maps in a certain range, resolve their fds, RIODescs and paddr and then call pwrite
--implement r_io_vwrite (hard); this should find all sections in a certain range, resolve the maddr that belongs to a vaddr and call mwrite, unsectioned area should be passed directly to mwrite
--implement r_io_reopen (easy); keep the maps for a fd and reopen it, possibly with different permissions
-	-this means cleaning up r_core_file_reopen too (hard?)
diff -Nru radare2-2.3.0+dfsg/doc/io-fixing.md radare2-2.8.0+dfsg/doc/io-fixing.md
--- radare2-2.3.0+dfsg/doc/io-fixing.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/io-fixing.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,55 @@
+`r_io/r_core-file` fixing
+=======================
+
+Conceptual things:
+------------------
+
+- in general only code from `r_io` should be used for io related stuff, io is NOT a core-task
+	- wrappers are ok, but no re-implementations (there might be exceptions but those must be reasonable argued)
+		- linkage is not argument -> use RIOBind
+	- esil-custom reads and writes should use RIOBind too
+- if a file gets opened a RIODesc MUST be created
+- if a file gets opened in usual cases a RIOMap MUST be created
+- if a file gets opened in unsusual cases it's not necessary to create a RIOMap
+	- if no RIOMap was created for a fd reading and writing from and to this fd is only possible via `r_io_pread` and `r_io_pwrite`
+	- this is only an option if only 1 file can be opened for a task or if the fd will never see the user-land
+		- Rahash2 for example won't need creating a RIOMap
+- if a file gets closed all RIOMaps for that belong to the fd MUST get destroyed
+- if a file gets closed the RIODesc MUST get destroyed
+- the cores primary task is to delegate the different parts of r2
+	- creating a new RIOMap or RIODesc on file-opening is NOT a core-task
+	- the same goes for destroying RIOMaps and RIODesc on closing a file
+    	- there is no need for a map-list in the core directly. core->io->maps is the only list to store maps (for the long run, functions that return a list with maps are ok)
+
+Documentation:
+--------------
+
+There is no need for a huge documentation!!! But code with fundamental
+importance often needs a few lines on what it should do, its concept and
+sometimes a few lines of the code itself need some kind of 'justification' or
+explanation. libr/io/vio.c is a hardcore example for this RIO-code has
+fundamental importance, because everything will fail if io does not work
+correctly.  This is needed to make bug-fixing easier, faster and better.
+
+Need review:
+------------
+
+	libr/io/io.c
+	libr/core/file.c
+
+Tasks:
+------
+
+- we should fix all the tests before doing this.
+	- talk about ioneg
+- remove re-implemtations of `r_io` (middle)
+- implement `r_io_open_at` (easy) ; this should open a file, add a RIODesc and a RIOMap that maps the file to an offset that is passed as an arg
+- make `r_io_open` creating a new map (easy) ; this should open a file, add a RIODesc and a RIOMap that maps the file to 0
+  - this means cleaning up `r_core_file_open` too (hard?)
+- implement `r_io_open_no_map` (easy) ; this should open a file and add a RIODesc. the file can only be accessed via `r_io_pread` and `r_io_pwrite`
+- make `r_io_close` destroy all maps that belong to the file that should be closed (easy)
+  - this means cleaning up `r_core_file_close` too (hard?)
+- implement (hard); this should find all maps in a certain range, resolve their fds, RIODescs and paddr and then call pwrite
+- implement (hard); this should find all sections in a certain range, resolve the maddr that belongs to a vaddr and call mwrite, unsectioned area should be passed directly to mwrite
+- implement `r_io_reopen` (easy); keep the maps for a fd and reopen it, possibly with different permissions
+	- this means cleaning up `r_core_file_reopen` too (hard?)
diff -Nru radare2-2.3.0+dfsg/doc/io.md radare2-2.8.0+dfsg/doc/io.md
--- radare2-2.3.0+dfsg/doc/io.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/io.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,22 @@
+How IO should work
+==================
+
+* Maps
+
+    Used to select fd. Mapaddr..size
+
+* Sections
+
+    Used to specify vaddr<->paddr
+
+Manually selecting fd is still valid and it should override maps fdselection. This is.. We need a way to tell r2 to view one fd or all of them. In case of having two files mapped on the same address space we will select the last opened.
+
+The base address is used to reallocate all vaddr offsets.
+
+Reading/writing ops should be done in a loop checking for the section boundaries.
+
+The sections must be asociated to a file, but we should be able to display/use them all in case of having non forced fd. This is, when not having overlapped files in memory.
+
+The write ops should only obey to the global io configuration and ignore the section permissions (maybe just throw a warning?)
+
+Atm sections are dupped in io and bin. We should merge them. Maybe using sdb, so we just reuse it
diff -Nru radare2-2.3.0+dfsg/doc/ios.md radare2-2.8.0+dfsg/doc/ios.md
--- radare2-2.3.0+dfsg/doc/ios.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/ios.md	2018-08-07 14:12:36.000000000 +0000
@@ -8,9 +8,9 @@
 
 There are different ways to build r2 for iOS, use the sys/ script you need:
 
-	* sys/ios-cydia.sh
-	* sys/ios-static.sh
-	* sys/ios-simulator.sh
+* `sys/ios-cydia.sh`
+* `sys/ios-static.sh`
+* `sys/ios-simulator.sh`
 
 It is also possible to build r2 natively on your iDevice by following the standard `./configure ; make ; make install` steps. But if you own a Mac is better to use the XCode toolchain to get better build times.
 
diff -Nru radare2-2.3.0+dfsg/doc/iphone.md radare2-2.8.0+dfsg/doc/iphone.md
--- radare2-2.3.0+dfsg/doc/iphone.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/iphone.md	2018-08-07 14:12:36.000000000 +0000
@@ -1,15 +1,15 @@
 Crosscompiling from OSX:
 ========================
 
-export PATH=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH
-export CC=`pwd`/sys/ios-sdk-gcc
-# set only for arm64, otherwise it is armv7
-export CPU=arm64
-# select ios sdk version
-export IOSVER=7.1
-./configure --prefix=/usr --with-ostype=darwin --with-compiler=ios-sdk --target=arm-unknown-darwin
-make -j4
-make install DESTDIR=/tmp/r2ios
+  export PATH=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH
+  export CC=`pwd`/sys/ios-sdk-gcc
+  # set only for arm64, otherwise it is armv7
+  export CPU=arm64
+  # select ios sdk version
+  export IOSVER=7.1
+  ./configure --prefix=/usr --with-ostype=darwin --with-compiler=ios-sdk --target=arm-unknown-darwin
+  make -j4
+  make install DESTDIR=/tmp/r2ios
 
 
 Natively compiling on iOS
@@ -19,31 +19,32 @@
 
 Setup SDK for ARMv6
 -------------------
+
 1) Install 'APT 0.7 Strict' and OpenSSH packages from cydia.
 
-	apt-get coreutils install wget inetutils rsync git expat curl
+      apt-get coreutils install wget inetutils rsync git expat curl
 
 2) Download missing packages from lolcathost:
 
-	wget http://lolcathost.org/b/libgcc_4.2-20080410-1-6_iphoneos-arm.deb
-	wget http://lolcathost.org/b/libSystem.dylib
+      wget http://lolcathost.org/b/libgcc_4.2-20080410-1-6_iphoneos-arm.deb
+      wget http://lolcathost.org/b/libSystem.dylib
 
 3) Install them
 
-	dpkg -i libgcc_4.2-20080410-1-6_iphoneos-arm.deb
-	apt-get install com.bigboss.20toolchain
-	cp libSystem.dylib /usr/lib
-	cd /usr/lib ; ln -sf  libSystem.dylib libm.dylib
-	apt-get install make vim gawk git
+      dpkg -i libgcc_4.2-20080410-1-6_iphoneos-arm.deb
+      apt-get install com.bigboss.20toolchain
+      cp libSystem.dylib /usr/lib
+      cd /usr/lib ; ln -sf  libSystem.dylib libm.dylib
+      apt-get install make vim gawk git
 
 4) /var/include/sys/stat.h is broken.
 
-	Solution: add 'int foo[3];' after 'st_rdev' at line 178
+      Solution: add 'int foo[3];' after 'st_rdev' at line 178
 
 5) Get the varinclude tarball
 
-	wget lolcathost.org/b/varinclude.tar.gz 
-	tar xzvf varinclude.tar.gz -C /
+      wget lolcathost.org/b/varinclude.tar.gz 
+      tar xzvf varinclude.tar.gz -C /
 
 Compilation
 -----------
diff -Nru radare2-2.3.0+dfsg/doc/kvast radare2-2.8.0+dfsg/doc/kvast
--- radare2-2.3.0+dfsg/doc/kvast	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/kvast	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-kvast
-=====
-
-KeyValue storage for AST
-
-To optimize serialized storage use a concatenated
-string array and use the sdb array string api
-
-eax=33
-------
-
-	0.op=set     []0=set,eax,33
-	0.a=eax
-	0.b=33
-
-
-ebx=(8*(eax+4))
----------------
-	0.op=set     []0=set,ebx,$1
-	0.a=ebx
-	0.b=$1
-
-	1.op=mul     []1=mul,8,$2
-	1.a=8
-	1.b=$2
-
-	2.op=add     []2=add,eax,4
-	2.a=eax
-	2.b=4
-
-ebx=8*(eax+4)+3
----------------
-	0.op=set     []0=set,ebx,$3
-	0.a=ebx
-	0.b=$3
-
-	1.op=mul     []1=mul,8,$2
-	1.a=8
-	1.b=$2
-
-	2.op=add     []2=add,eax,4
-	2.a=eax
-	2.b=4
-
-	3.op=add     []3=add,$1,3
-	3.a=$1
-	3.b=3
-
-ebx=8*(eax+4+ecx+2)+1
----------------------
-	0.op=set
-	0.a=ebx
-	0.b=$5
-
-	1.op=mul
-	1.a=8
-	1.b=$4
-
-(
-	2.op=add
-	2.a=eax
-	2.b=4
-
-// update toplevel b reference
-	3.op=add
-	3.a=$2
-	3.b=ecx
-
-// update toplevel b reference
-	4.op=add
-	4.a=$3
-	4.b=2
-}
-
-// update toplevel b reference
-	5.op=add
-	5.a=$1
-	5.b=1
-
-Parsing
-=======
-Parsing is done by a state machine which reads the expression string and creates a keyvalue string that represents the ESIL instruction.
-
-This is an example
-	switch (ch) {
-	case '+':
-	case '-':
-	case '*':
-	case '/':
-		if (expect_arg) {
-			
-			expect_arg = ch;
-		}
-		break;
-	}
diff -Nru radare2-2.3.0+dfsg/doc/kvast.md radare2-2.8.0+dfsg/doc/kvast.md
--- radare2-2.3.0+dfsg/doc/kvast.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/kvast.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,97 @@
+kvast
+=====
+
+KeyValue storage for AST
+
+To optimize serialized storage use a concatenated
+string array and use the sdb array string api
+
+eax=33
+------
+
+	0.op=set     []0=set,eax,33
+	0.a=eax
+	0.b=33
+
+
+ebx=(8*(eax+4))
+---------------
+	0.op=set     []0=set,ebx,$1
+	0.a=ebx
+	0.b=$1
+
+	1.op=mul     []1=mul,8,$2
+	1.a=8
+	1.b=$2
+
+	2.op=add     []2=add,eax,4
+	2.a=eax
+	2.b=4
+
+ebx=8*(eax+4)+3
+---------------
+	0.op=set     []0=set,ebx,$3
+	0.a=ebx
+	0.b=$3
+
+	1.op=mul     []1=mul,8,$2
+	1.a=8
+	1.b=$2
+
+	2.op=add     []2=add,eax,4
+	2.a=eax
+	2.b=4
+
+	3.op=add     []3=add,$1,3
+	3.a=$1
+	3.b=3
+
+ebx=8*(eax+4+ecx+2)+1
+---------------------
+	0.op=set
+	0.a=ebx
+	0.b=$5
+
+	1.op=mul
+	1.a=8
+	1.b=$4
+
+(
+	2.op=add
+	2.a=eax
+	2.b=4
+
+// update toplevel b reference
+	3.op=add
+	3.a=$2
+	3.b=ecx
+
+// update toplevel b reference
+	4.op=add
+	4.a=$3
+	4.b=2
+}
+
+// update toplevel b reference
+	5.op=add
+	5.a=$1
+	5.b=1
+
+Parsing
+=======
+Parsing is done by a state machine which reads the expression string and creates a keyvalue string that represents the ESIL instruction.
+
+This is an example
+```
+	switch (ch) {
+	case '+':
+	case '-':
+	case '*':
+	case '/':
+		if (expect_arg) {
+			
+			expect_arg = ch;
+		}
+		break;
+	}
+```
diff -Nru radare2-2.3.0+dfsg/doc/license radare2-2.8.0+dfsg/doc/license
--- radare2-2.3.0+dfsg/doc/license	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/license	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-Licensing
-=========
-
-Before you try to statically link r2, you should know about the licenses that go along with it, 
-
-http://stackoverflow.com/questions/10130143/gpl-lgpl-and-static-linking
-
-Also this stackoverflow page explains the legal case of using it via r2pipe,
-
-http://stackoverflow.com/questions/1394623/can-i-dynamically-call-a-lgpl-gpl-software-in-my-closed-source-application
-
-LGPLv3 keeps the freedom to the user to switch to a different version of the r2 libraries, so static linking is not permitted unless the privative software is distributed with the object files needed to do the full static link, so the users will be able to upgrade or modify r2 libraries even if 
-
-r2 is licensed under the LGPL license, which permits statically linking, but forces you to liberate the object files and a way to allow users to link them.
-
-r2pipe or scripting/plugins can be used from r2 without any kind of legal issue, only if you modify r2 to make it work with your tools, you should make those changes public, this way we ensure the users always have the freedom to change or upgrade the r2 libraries that come along with r2.
-
-Some parts of r2 are under the GPL license, here's a list of them:
-
-* C++ demangler (libr/bin)
-* Some exotic disassemblers
-* GNU binutils disassemblers (libr/asm)
-* GRUB filesystems (libr/fs)
-
-If you are going to use r2 in your propietary product bear in mind to build it without those parts, which may infect your program. Please refer to the FSF or GNU sites to understand how licenses work.
-
-As long as r2pipe, or webui access is done via a textual interface which requires no reverse engineering or linking for integration other programs will not be affected by the license rules.
-
-If you have any other question about how to use, build, link and distribute r2 with your own tools drop me an email (pancake@nopcode.org) or just talk to the Free Software Foundation in order to clarify that.
-
---pancake
diff -Nru radare2-2.3.0+dfsg/doc/license.md radare2-2.8.0+dfsg/doc/license.md
--- radare2-2.3.0+dfsg/doc/license.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/license.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,31 @@
+Licensing
+=========
+
+Before you try to statically link r2, you should know about the licenses that go along with it, 
+
+http://stackoverflow.com/questions/10130143/gpl-lgpl-and-static-linking
+
+Also this stackoverflow page explains the legal case of using it via r2pipe,
+
+http://stackoverflow.com/questions/1394623/can-i-dynamically-call-a-lgpl-gpl-software-in-my-closed-source-application
+
+LGPLv3 keeps the freedom to the user to switch to a different version of the r2 libraries, so static linking is not permitted unless the privative software is distributed with the object files needed to do the full static link, so the users will be able to upgrade or modify r2 libraries even if 
+
+r2 is licensed under the LGPL license, which permits statically linking, but forces you to liberate the object files and a way to allow users to link them.
+
+r2pipe or scripting/plugins can be used from r2 without any kind of legal issue, only if you modify r2 to make it work with your tools, you should make those changes public, this way we ensure the users always have the freedom to change or upgrade the r2 libraries that come along with r2.
+
+Some parts of r2 are under the GPL license, here's a list of them:
+
+* C++ demangler (libr/bin)
+* Some exotic disassemblers
+* GNU binutils disassemblers (libr/asm)
+* GRUB filesystems (libr/fs)
+
+If you are going to use r2 in your propietary product bear in mind to build it without those parts, which may infect your program. Please refer to the FSF or GNU sites to understand how licenses work.
+
+As long as r2pipe, or webui access is done via a textual interface which requires no reverse engineering or linking for integration other programs will not be affected by the license rules.
+
+If you have any other question about how to use, build, link and distribute r2 with your own tools drop me an email (pancake@nopcode.org) or just talk to the Free Software Foundation in order to clarify that.
+
+--pancake
diff -Nru radare2-2.3.0+dfsg/doc/macos.md radare2-2.8.0+dfsg/doc/macos.md
--- radare2-2.3.0+dfsg/doc/macos.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/macos.md	2018-08-07 14:12:36.000000000 +0000
@@ -25,29 +25,29 @@
 
 (Based on https://llvm.org/svn/llvm-project/lldb/trunk/docs/code-signing.txt)
 
-	- Launch /Applications/Utilities/Keychain Access.app
-	- In Keychain Access select the "login" keychain in the "Keychains" list in the upper left hand corner of the window.
-	- Select the following menu item:
-		Keychain Access->Certificate Assistant->Create a Certificate...
-	- Set the following settings
-		Name = org.radare.radare2
-		Identity Type = Self Signed Root
-		Certificate Type = Code Signing
-	- Click Create
-	- Click Continue
-	- Click Done
-	- Click on the "My Certificates"
-	- Double click on your new org.radare.radare2 certificate
-	- Turn down the "Trust" disclosure triangle, scroll to the "Code Signing" trust pulldown menu and select "Always Trust" and authenticate as needed using your username and password.
-	- Drag the new "org.radare.radare2" code signing certificate (not the public or private keys of the same name) from the "login" keychain to the "System" keychain in the Keychains pane on the left hand side of the main Keychain Access window. This will move this certificate to the "System" keychain. You'll have to authorize a few more times, set it to be "Always trusted" when asked.
-	- In the Keychain Access GUI, click and drag "org.radare.radare2" in the "System" keychain onto the desktop. The drag will create a "~/Desktop/org.radare.radare2.cer" file used in the next step.
-	- Switch to Terminal, and run the following:
-		$ sudo security add-trust -d -r trustRoot -p basic -p codeSign -k /Library/Keychains/System.keychain ~/Desktop/org.radare.radare2.cer
-		$ rm -f ~/Desktop/org.radare.radare2.cer
-	- Drag the "org.radare.radare2" certificate from the "System" keychain back into the "login" keychain
-	- Quit Keychain Access
-	- Reboot
-	- Run sys/install.sh (or follow the next steps if you want to install and sign radare2 manually)
+1. Launch /Applications/Utilities/Keychain Access.app
+1. In Keychain Access select the "login" keychain in the "Keychains" list in the upper left hand corner of the window.
+1. Select the following menu item:
+1. Keychain Access->Certificate Assistant->Create a Certificate...
+1. Set the following settings
+1. Name = org.radare.radare2
+1. Identity Type = Self Signed Root
+1. Certificate Type = Code Signing
+1. Click Create
+1. Click Continue
+1. Click Done
+1. Click on the "My Certificates"
+1. Double click on your new org.radare.radare2 certificate
+1. Turn down the "Trust" disclosure triangle, scroll to the "Code Signing" trust pulldown menu and select "Always Trust" and authenticate as needed using your username and password.
+1. Drag the new "org.radare.radare2" code signing certificate (not the public or private keys of the same name) from the "login" keychain to the "System" keychain in the Keychains pane on the left hand side of the main Keychain Access window. This will move this certificate to the "System" keychain. You'll have to authorize a few more times, set it to be "Always trusted" when asked.
+1. In the Keychain Access GUI, click and drag "org.radare.radare2" in the "System" keychain onto the desktop. The drag will create a "~/Desktop/org.radare.radare2.cer" file used in the next step.
+1. Switch to Terminal, and run the following:
+1. $ sudo security add-trust -d -r trustRoot -p basic -p codeSign -k /Library/Keychains/System.keychain ~/Desktop/org.radare.radare2.cer
+1. $ rm -f ~/Desktop/org.radare.radare2.cer
+1. Drag the "org.radare.radare2" certificate from the "System" keychain back into the "login" keychain
+1. Quit Keychain Access
+1. Reboot
+1. Run sys/install.sh (or follow the next steps if you want to install and sign radare2 manually)
 
 As said before, the signing process can also be done manually following the next process. First, you will need to sign the radare2 binary:
 
diff -Nru radare2-2.3.0+dfsg/doc/maemo radare2-2.8.0+dfsg/doc/maemo
--- radare2-2.3.0+dfsg/doc/maemo	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/maemo	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-  Build for maemo6 (Harmattan) N9 - N950
-========================================
-
-* Install QtSDK 
-
-  - http://qt.nokia.com/downloads/
-
-* Configure mad (maemo development environment)
-
-  cd /usr/bin ; sudo ln -fs $HOME/QtSDK/Madde/bin/mad
-  mad set harmattan-nokia-meego-api
-  mad sh
-
-* Compile
-
-  ./configure --prefix=/usr --with-little-endian \
-      --with-compiler=mad --with-ostype=gnulinux
-  make
-
-* Create the package
-
-  cd maemo
-  make
-
-* Install the package
-
-   dpkg -i radare2-*.deb
diff -Nru radare2-2.3.0+dfsg/doc/maemo.md radare2-2.8.0+dfsg/doc/maemo.md
--- radare2-2.3.0+dfsg/doc/maemo.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/maemo.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,27 @@
+Build for maemo6 (Harmattan) N9 - N950
+======================================
+
+1. Install QtSDK 
+
+       http://qt.nokia.com/downloads/
+
+2. Configure mad (maemo development environment)
+
+       cd /usr/bin ; sudo ln -fs $HOME/QtSDK/Madde/bin/mad
+       mad set harmattan-nokia-meego-api
+       mad sh
+
+3. Compile
+
+       ./configure --prefix=/usr --with-little-endian \
+           --with-compiler=mad --with-ostype=gnulinux
+       make
+
+4. Create the package
+
+       cd maemo
+       make
+
+5. Install the package
+
+       dpkg -i radare2-*.deb
diff -Nru radare2-2.3.0+dfsg/doc/node.js/index.js radare2-2.8.0+dfsg/doc/node.js/index.js
--- radare2-2.3.0+dfsg/doc/node.js/index.js	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/node.js/index.js	2018-08-07 14:12:36.000000000 +0000
@@ -24,7 +24,7 @@
 		wwwroot = wwwroot.trim ();
 		r.cmd ("e http.port", function(port) {
 			port = +port.trim ();
-			r.cmd ("e scr.color=false", function() {});
+			r.cmd ("e scr.color=0", function() {});
 			r.cmd ("e scr.interactive=false", function() {});
 			r.cmd ("e scr.html=true", function(){});
 			var app = express();
diff -Nru radare2-2.3.0+dfsg/doc/oo radare2-2.8.0+dfsg/doc/oo
--- radare2-2.3.0+dfsg/doc/oo	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/oo	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-Radare OO
-=========
-
-I do realize that Object Orientation sucks, so I tried to do libr API
-following some sane and basic OO concepts.
-
-  - No inheritance
-  - Instances are used to keep states
-  - Enforces instance recycling
-  - Reduce creation/destruction of objects
-  - Easily interfaced with Vala thru the VAPIs
-
-Global picture
---------------
-[Class]
-   |
-   |-- [Plugins]  // shared among instances
-   |        \
-   |         \
-   `------> [Instance] ----> [Liberation]
-
-* We need a construction/destruction API for plugins among instances
-  - simplify code
-
-A library implements a set of functionalities, those ones are mainly
-the lifecycle of the class containing the state of 
-
-Plugins are singletons. Or we will have to create factories for every class.
-
-Lifecycle of the class
-----------------------
-  Class
-   - new
-   - as_new
-   - init
-   - free
-
-Library plugins
----------------
-  They are stored in the p/ directory of each library under the libr directory.
-
diff -Nru radare2-2.3.0+dfsg/doc/oo.md radare2-2.8.0+dfsg/doc/oo.md
--- radare2-2.3.0+dfsg/doc/oo.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/oo.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,45 @@
+Radare OO
+=========
+
+I do realize that Object Orientation sucks, so I tried to do libr API
+following some sane and basic OO concepts.
+
+  - No inheritance
+  - Instances are used to keep states
+  - Enforces instance recycling
+  - Reduce creation/destruction of objects
+  - Easily interfaced with Vala thru the VAPIs
+
+Global picture
+--------------
+
+```
+[Class]
+   |
+   |-- [Plugins]  // shared among instances
+   |        \
+   |         \
+   `------> [Instance] ----> [Liberation]
+```
+
+* We need a construction/destruction API for plugins among instances
+  - simplify code
+
+A library implements a set of functionalities, those ones are mainly
+the lifecycle of the class containing the state of 
+
+Plugins are singletons. Or we will have to create factories for every class.
+
+Lifecycle of the class
+----------------------
+
+Class
+   - new
+   - as_new
+   - init
+   - free
+
+Library plugins
+---------------
+  They are stored in the p/ directory of each library under the libr directory.
+
diff -Nru radare2-2.3.0+dfsg/doc/openbsd.md radare2-2.8.0+dfsg/doc/openbsd.md
--- radare2-2.3.0+dfsg/doc/openbsd.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/openbsd.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,41 @@
+OpenBSD build instructions
+==========================
+
+This document aims to explain the steps needed to build r2 and r2b-python on OpenBSD.
+
+* Note that `make` (from GNU) is named `gmake`
+* Stuff is installed in /usr/local
+* clang (or gcc) is named cc and clang++ (or g++) is c++
+* valabind is not packaged in the ports
+
+Radare2 Dependencies:
+---------------------
+
+	doas pkg_add git gcc gmake pkgconf
+
+	git clone https://github.com/radare/radare2
+	cd radare2
+	sys/install.sh /usr/local
+
+Python Swig Bindings Dependencies:
+----------------------------------
+
+	doas pkg_add pkgconf vala
+
+	git clone https://github.com/radare/valabind
+	cd valabind
+	gmake
+	doas gmake install PREFIX=/usr/local
+
+Building Python Swig Bindings:
+------------------------------
+
+	git clone https://github.com/radare/radare2-bindings
+	cd radare2-bindings
+	export CC=cc
+	export CXX=c++
+	export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+	./configure --prefix=/usr/local
+	cd python
+	gmake CC=$CC CXX=$CXX
+	doas gmake install
diff -Nru radare2-2.3.0+dfsg/doc/pdb/pdb_usage radare2-2.8.0+dfsg/doc/pdb/pdb_usage
--- radare2-2.3.0+dfsg/doc/pdb/pdb_usage	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/pdb/pdb_usage	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-PDB usage
-=========
-
-- To get information about functions, structures, unions, enumerates etc:
-````
-rabin2 -P some_pdb_file
-For example:
-rabin2 -P Project1.pdb
-...
-TEST_STRUCT: size 0x8
-	0x0: a type:(member) long
-	0x4: b type:(member) long
-TEST_ENUM: size 0x0
-	0x10: eENUM1 type:enumerate eENUM1
-	0x20: eENUM2 type:enumerate eENUM2
-	0x21: eENUM_MAX type:enumerate eENUM_MAX
-TEST_UNION: size 0x4
-	0x0: union_var_1 type:(member) long
-	0x0: union_var_2 type:(member) long
-TEST_STRUCT: size 0x8
-	0x0: struct_var_1 type:(member) long
-	0x4: struct_var_2 type:(member) long
-{"gvars":[0x00001000  0  .textbss  __enc$textbss$begin
-0x00011000  0  .textbss  __enc$textbss$end
-0x000192c8  0  .idata  __imp__printf
-0x000192c0  0  .idata  __imp__system
-0x000113e0  2  .text  ?test_func@@YAHHH@Z
-...
-````
-
-- To display all mentioned above information in json format:
-````
-rabin2 -Pj some_pdb_file
-````
-
-- To export information about types, functions:
-````
-rabin2 -Pr some_pdb_file
-For example:
-rabin2 -P Project1.pdb
-...
-pf TEST_STRUCT ii a b
-"td enum TEST_ENUM eENUM1=00000010,eENUM2=00000020,eENUM_MAX=00000021 };"
-pf TEST_UNION ii union_var_1 union_var_2
-pf TEST_STRUCT ii struct_var_1 struct_var_2
-f pdb.__enc_textbss_begin = 0x1000 # 0 .textbss
-f pdb.__enc_textbss_end = 0x11000 # 0 .textbss
-f pdb.__imp__printf = 0x192c8 # 0 .idata
-f pdb.__imp__system = 0x192c0 # 0 .idata
-f pdb._test_func__YAHHH_Z = 0x113e0 # 2 .text
-...
-Check out this post for more information about pf: http://radare.today/types/
-````
-
-- To download PDB file for some binary (.exe, .dll):
-````
-rabin2 -PP path_to_binary
-For example:
-rabin2 -PP ~/Downloads/libs/user32.dll
-% Total    % Received % Xferd  Average Speed   Time    Time     Time  Current Dload  Upload   Total   Spent    Left  Speed
-100  336k  100  336k    0     0  34388      0  0:00:10  0:00:10 --:--:-- 38385
-Extracting cabinet: /home/inisider/Downloads/libs/user32.pd_
-extracting /home/inisider/Downloads/libs/user32.pdb
-All done, no errors.
-````
-The following dependencies are required for PDB downloader:
-* curl
-* cabextract (non-Windows only, optional)
diff -Nru radare2-2.3.0+dfsg/doc/pdb/pdb_usage.md radare2-2.8.0+dfsg/doc/pdb/pdb_usage.md
--- radare2-2.3.0+dfsg/doc/pdb/pdb_usage.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/pdb/pdb_usage.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,68 @@
+PDB usage
+=========
+
+- To get information about functions, structures, unions, enumerates etc:
+````
+rabin2 -P some_pdb_file
+For example:
+rabin2 -P Project1.pdb
+...
+TEST_STRUCT: size 0x8
+	0x0: a type:(member) long
+	0x4: b type:(member) long
+TEST_ENUM: size 0x0
+	0x10: eENUM1 type:enumerate eENUM1
+	0x20: eENUM2 type:enumerate eENUM2
+	0x21: eENUM_MAX type:enumerate eENUM_MAX
+TEST_UNION: size 0x4
+	0x0: union_var_1 type:(member) long
+	0x0: union_var_2 type:(member) long
+TEST_STRUCT: size 0x8
+	0x0: struct_var_1 type:(member) long
+	0x4: struct_var_2 type:(member) long
+{"gvars":[0x00001000  0  .textbss  __enc$textbss$begin
+0x00011000  0  .textbss  __enc$textbss$end
+0x000192c8  0  .idata  __imp__printf
+0x000192c0  0  .idata  __imp__system
+0x000113e0  2  .text  ?test_func@@YAHHH@Z
+...
+````
+
+- To display all mentioned above information in json format:
+````
+rabin2 -Pj some_pdb_file
+````
+
+- To export information about types, functions:
+````
+rabin2 -Pr some_pdb_file
+For example:
+rabin2 -P Project1.pdb
+...
+pf TEST_STRUCT ii a b
+"td enum TEST_ENUM eENUM1=00000010,eENUM2=00000020,eENUM_MAX=00000021 };"
+pf TEST_UNION ii union_var_1 union_var_2
+pf TEST_STRUCT ii struct_var_1 struct_var_2
+f pdb.__enc_textbss_begin = 0x1000 # 0 .textbss
+f pdb.__enc_textbss_end = 0x11000 # 0 .textbss
+f pdb.__imp__printf = 0x192c8 # 0 .idata
+f pdb.__imp__system = 0x192c0 # 0 .idata
+f pdb._test_func__YAHHH_Z = 0x113e0 # 2 .text
+...
+Check out this post for more information about pf: http://radare.today/types/
+````
+
+- To download PDB file for some binary (.exe, .dll):
+````
+rabin2 -PP path_to_binary
+For example:
+rabin2 -PP ~/Downloads/libs/user32.dll
+% Total    % Received % Xferd  Average Speed   Time    Time     Time  Current Dload  Upload   Total   Spent    Left  Speed
+100  336k  100  336k    0     0  34388      0  0:00:10  0:00:10 --:--:-- 38385
+Extracting cabinet: /home/inisider/Downloads/libs/user32.pd_
+extracting /home/inisider/Downloads/libs/user32.pdb
+All done, no errors.
+````
+The following dependencies are required for PDB downloader:
+* curl
+* cabextract (non-Windows only, optional)
diff -Nru radare2-2.3.0+dfsg/doc/plugins radare2-2.8.0+dfsg/doc/plugins
--- radare2-2.3.0+dfsg/doc/plugins	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/plugins	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-LIBR PLUGINS
-============
-
-Plugins must be configured using the root ./configure-plugins script.
-
-Libraries can be compiled:
-  - as shared libraries (so, dylib, dll)    (DEFAULT)
-  - as static libraries (a, lib, ..)
-
-  ./configure-plugins --enable-shared --enable-dynamic
-
-LIBR_PLUGINS environment variable is honored as another search path for plugins
-
-Plugins can be:
-  - not compiled
-  - compiled as shared
-  - compiled as static (inside the related library)
-
-libr/plugins/shared
-libr/plugins/static
-
-the configure-plugins script will regenerate the required Makefiles
-to build this stuff as defined.
-
-PD: This is not implemented :)
-
---pancake
diff -Nru radare2-2.3.0+dfsg/doc/plugins.md radare2-2.8.0+dfsg/doc/plugins.md
--- radare2-2.3.0+dfsg/doc/plugins.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/plugins.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,27 @@
+LIBR PLUGINS
+============
+
+Plugins must be configured using the root ./configure-plugins script.
+
+Libraries can be compiled:
+  - as shared libraries (so, dylib, dll)    (DEFAULT)
+  - as static libraries (a, lib, ..)
+
+        ./configure-plugins --enable-shared --enable-dynamic
+
+LIBR_PLUGINS environment variable is honored as another search path for plugins
+
+Plugins can be:
+  - not compiled
+  - compiled as shared
+  - compiled as static (inside the related library)
+
+        libr/plugins/shared
+        libr/plugins/static
+
+the configure-plugins script will regenerate the required Makefiles
+to build this stuff as defined.
+
+PD: This is not implemented :)
+
+--pancake
diff -Nru radare2-2.3.0+dfsg/doc/qnx radare2-2.8.0+dfsg/doc/qnx
--- radare2-2.3.0+dfsg/doc/qnx	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/qnx	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-r2 on android
-=============
-
-  . ./bbndk-env.sh
-  cd ~/radare2
-  rm -f plugins.cfg
-  ./configure --with-compiler=qnx --with-ostype=qnx --prefix=/accounts/devuser/radare2 --without-pic --with-nonpic
-  make -j 4
-
diff -Nru radare2-2.3.0+dfsg/doc/qnx.md radare2-2.8.0+dfsg/doc/qnx.md
--- radare2-2.3.0+dfsg/doc/qnx.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/qnx.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,11 @@
+r2 on android
+=============
+
+```
+. ./bbndk-env.sh
+cd ~/radare2
+rm -f plugins.cfg
+./configure --with-compiler=qnx --with-ostype=qnx --prefix=/accounts/devuser/radare2 --without-pic --with-nonpic
+make -j 4
+```
+
diff -Nru radare2-2.3.0+dfsg/doc/rap radare2-2.8.0+dfsg/doc/rap
--- radare2-2.3.0+dfsg/doc/rap	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/rap	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-RAP protocol
-============
-
-RAP stands for the Remote Access Protocol of Radare2, it is compatible with radare1
-and it simply defines a communication between a client and a server to simulate IO
-operations.
-
-There are two different implementations, one in C and another in Python.
-
-Usage example
--------------
-
-Start in one terminal the following command to wait for incoming connections:
-
-	r2 rap://:9999
-
-In another machine or terminal connect it:
-
-	r2 rap://localhost:9999//bin/ls
-
-As you see, the path of the remote file to load must be specified, and this handled
-by the open() packet.
-
-Known Bugs
-----------
-
-* Read/Write operations ignore the filedescriptor completely because it is supposed to be handled by the IO layer and it is redundant, but it introduces a bug that breaks support for multiple files.
-* This can be fixed with a new packet type RAP_SETFD.
-* Read lengths should be only 2 bytes, there's no sense in read > 64K of memory in a shot.
-* Seek does not returns anything
-* System vs Cmd - the first should have a return value as well as string result
-* Filedescriptors are assumed to be 32bit
-
-
-Operations
-----------
-
-The protocol is designed to be bidirectional, but right now, only one way is supported.
-The client sends a byte specifying the operation and the server will reply the same byte
-masked with the RMT_REPLY value (0x80 | op)
-
-	RAP_OPEN   = 1
-	RAP_READ   = 2
-	RAP_WRITE  = 3
-	RAP_SEEK   = 4
-	RAP_CLOSE  = 5
-	RAP_SYSTEM = 6
-	RAP_CMD    = 7
-	RAP_REPLY  = 0x80
-
-This is how are constructed the packets:
-
-	RAP_OPEN
-		struct packed RapOpen {
-			ut8 op = 1;
-			ut8 rw = 0; // 0 = read-only, 1 = read-write
-			ut8 len = 15; // length of filename
-		}
-		>> 01 RW LN [....]
-		<< 81 FD=(.. .. .. ..)
-
-	RAP_READ
-		>> 02 LN=(.. .. .. ..)
-		<< 82 LN=(.. .. .. ..) [..LN..]
-
-	RAP_WRITE
-		>> 03 LN=(.. .. .. ..) [..LN..]
-		<< 83 LN=(.. .. .. ..)
-
-	RAP_SEEK
-		>> 04 FLAG=(..) OFFSET=(.. 8 bytes ..)
-		<< 84
-
-	RAP_CLOSE
-		>> 05 FD=(4 bytes) 
-		<< 85 RET=(4 bytes)
-
-	RAP_SYSTEM
-		>> 06 LEN=(4 bytes) STR[LEN bytes]
-		<< 86 LN=(.. .. .. ..) STR[ LEN bytes]
-
-	RAP_CMD_
-		>> 07 LEN=(4 bytes) STR[LEN bytes]
-		<< 87 LN=(.. .. .. ..) STR[ LEN bytes]
-
-
-Examples
---------
-
-Python:
-
-	See radare2-bindings/python/remote.py and test-rap-*.py
-
-C:
-
-	Server: libr/socket/rap_server.c
-	Client: libr/io/p/io_rap.c
diff -Nru radare2-2.3.0+dfsg/doc/rapatch.md radare2-2.8.0+dfsg/doc/rapatch.md
--- radare2-2.3.0+dfsg/doc/rapatch.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/rapatch.md	2018-08-07 14:12:36.000000000 +0000
@@ -3,12 +3,12 @@
 
 Human friendly text format to apply patches to binary files.
 
-
 Patch format
 ------------
 
 Those patches must be written in files and the syntax looks like the following:
 
+```
 ^# -> comments
 . -> execute command
 ! -> execute command
@@ -17,14 +17,16 @@
 OFFSET 01020304
 OFFSET : assembly
 + {code}|"str"|0210|: asm
+```
 
 Example scripts
 ---------------
-This script will run the '?e ..' command in r2 and then write the string 'Hello' at 0x200 offset
-
-	# rapatch example
-	:?e hello world
-	0x200 "Hello"
+This script will run the `?e ..` command in r2 and then write the string 'Hello' at 0x200 offset
+```
+# rapatch example
+:?e hello world
+0x200 "Hello"
+```
 
 Running rapatches
 -----------------
diff -Nru radare2-2.3.0+dfsg/doc/rap.md radare2-2.8.0+dfsg/doc/rap.md
--- radare2-2.3.0+dfsg/doc/rap.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/rap.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,97 @@
+RAP protocol
+============
+
+RAP stands for the Remote Access Protocol of Radare2, it is compatible with radare1
+and it simply defines a communication between a client and a server to simulate IO
+operations.
+
+There are two different implementations, one in C and another in Python.
+
+Usage example
+-------------
+
+Start in one terminal the following command to wait for incoming connections:
+
+	r2 rap://:9999
+
+In another machine or terminal connect it:
+
+	r2 rap://localhost:9999//bin/ls
+
+As you see, the path of the remote file to load must be specified, and this handled
+by the open() packet.
+
+Known Bugs
+----------
+
+* Read/Write operations ignore the filedescriptor completely because it is supposed to be handled by the IO layer and it is redundant, but it introduces a bug that breaks support for multiple files.
+* This can be fixed with a new packet type RAP_SETFD.
+* Read lengths should be only 2 bytes, there's no sense in read > 64K of memory in a shot.
+* Seek does not returns anything
+* System vs Cmd - the first should have a return value as well as string result
+* Filedescriptors are assumed to be 32bit
+
+
+Operations
+----------
+
+The protocol is designed to be bidirectional, but right now, only one way is supported.
+The client sends a byte specifying the operation and the server will reply the same byte
+masked with the RMT_REPLY value (0x80 | op)
+
+	RAP_OPEN   = 1
+	RAP_READ   = 2
+	RAP_WRITE  = 3
+	RAP_SEEK   = 4
+	RAP_CLOSE  = 5
+	RAP_SYSTEM = 6
+	RAP_CMD    = 7
+	RAP_REPLY  = 0x80
+
+This is how are constructed the packets:
+
+	RAP_OPEN
+		struct packed RapOpen {
+			ut8 op = 1;
+			ut8 rw = 0; // 0 = read-only, 1 = read-write
+			ut8 len = 15; // length of filename
+		}
+		>> 01 RW LN [....]
+		<< 81 FD=(.. .. .. ..)
+
+	RAP_READ
+		>> 02 LN=(.. .. .. ..)
+		<< 82 LN=(.. .. .. ..) [..LN..]
+
+	RAP_WRITE
+		>> 03 LN=(.. .. .. ..) [..LN..]
+		<< 83 LN=(.. .. .. ..)
+
+	RAP_SEEK
+		>> 04 FLAG=(..) OFFSET=(.. 8 bytes ..)
+		<< 84
+
+	RAP_CLOSE
+		>> 05 FD=(4 bytes) 
+		<< 85 RET=(4 bytes)
+
+	RAP_SYSTEM
+		>> 06 LEN=(4 bytes) STR[LEN bytes]
+		<< 86 LN=(.. .. .. ..) STR[ LEN bytes]
+
+	RAP_CMD_
+		>> 07 LEN=(4 bytes) STR[LEN bytes]
+		<< 87 LN=(.. .. .. ..) STR[ LEN bytes]
+
+
+Examples
+--------
+
+Python:
+
+	See radare2-bindings/python/remote.py and test-rap-*.py
+
+C:
+
+	Server: libr/socket/rap_server.c
+	Client: libr/io/p/io_rap.c
diff -Nru radare2-2.3.0+dfsg/doc/releases radare2-2.8.0+dfsg/doc/releases
--- radare2-2.3.0+dfsg/doc/releases	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/releases	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-radare2 releasing rules
-=======================
-
-The objective of this paper is to determine a set of rules to be done before
-each release and define the instructions for generating the distribution
-tarball together with a scheduler.
-
-* We try to release every 1/2 months
-* Version numbering (actually we dont follow any rules for this)
-* Codenames for releases MUST be funny (until we didnt get a name that can make
-  me laugh, we should not release anything!)
-
-Before any release we have to:
-
- - Remove warnings
-
-   We dont want to fall in the warning nightmare of r1. Releases should contain
-   no warnings with gcc -Wall or at least no dangerous ones.
-
- - Sync Vala APIs
-
-   Keeping the VAPI files the last ones to be developed between release cycles
-   we ensure that we do not have to maintain synced the code with the vapis
-   and it is possible to easily draw the LIBR API evolution by just diffing
-   the vapi directory.
-
- - Unit test programs
-
-   If available, it would be good to have some unit tests to check nothing is
-   broken. Maybe Vala is the way to go when writing tests, because this way
-   we ensure that pkg-config, libr and vapis works in a shot.
-
- - Test build on different platforms
-
-   The same codebase should be compilable on *nix and w32 systems without
-   modifications. It should be also possible to build it with make threads,
-   so using quadcore boxes with -j8 should be a good place for finding
-   race conditions in the build system.
-
- - Remove commented code and review TODO/BUG/XXX comments
-
-   While developing a new release, it's pretty common to keep old versions of
-   the code for testing parts of libraries and be able to go back or find bugs
-   while refactoring code or re-doing-it from scratch. This code, should be
-   reviewed and removed if necessary.
-
-   $ grep -r -e TODO -e XXX -e FIX libr
-
- - Graph per symbol-module dependency graph to identify unused/dupped/-
-   simplificable use cases of the API for every module.
-
-FUTURE
-------
-
- - Commands should be handled in a structural way, not by a bunch of switch/cases
diff -Nru radare2-2.3.0+dfsg/doc/releases.md radare2-2.8.0+dfsg/doc/releases.md
--- radare2-2.3.0+dfsg/doc/releases.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/releases.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,55 @@
+Releasing rules
+=======================
+
+The objective of this paper is to determine a set of rules to be done before
+each release and define the instructions for generating the distribution
+tarball together with a scheduler.
+
+* We try to release every 1/2 months
+* Version numbering (actually we dont follow any rules for this)
+* Codenames for releases MUST be funny (until we didnt get a name that can make
+  me laugh, we should not release anything!)
+
+Before any release we have to:
+
+ - Remove warnings
+
+   We dont want to fall in the warning nightmare of r1. Releases should contain
+   no warnings with `gcc -Wall` or at least no dangerous ones.
+
+ - Sync Vala APIs
+
+   Keeping the VAPI files the last ones to be developed between release cycles
+   we ensure that we do not have to maintain synced the code with the vapis
+   and it is possible to easily draw the LIBR API evolution by just diffing
+   the vapi directory.
+
+ - Unit test programs
+
+   If available, it would be good to have some unit tests to check nothing is
+   broken. Maybe Vala is the way to go when writing tests, because this way
+   we ensure that pkg-config, libr and vapis works in a shot.
+
+ - Test build on different platforms
+
+   The same codebase should be compilable on *nix and w32 systems without
+   modifications. It should be also possible to build it with make threads,
+   so using quadcore boxes with `-j8` should be a good place for finding
+   race conditions in the build system.
+
+ - Remove commented code and review TODO/BUG/XXX comments
+
+   While developing a new release, it's pretty common to keep old versions of
+   the code for testing parts of libraries and be able to go back or find bugs
+   while refactoring code or re-doing-it from scratch. This code, should be
+   reviewed and removed if necessary.
+
+       $ grep -r -e TODO -e XXX -e FIX libr
+
+ - Graph per symbol-module dependency graph to identify unused/dupped/-
+   simplificable use cases of the API for every module.
+
+FUTURE
+------
+
+ - Commands should be handled in a structural way, not by a bunch of switch/cases
diff -Nru radare2-2.3.0+dfsg/doc/repo radare2-2.8.0+dfsg/doc/repo
--- radare2-2.3.0+dfsg/doc/repo	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/repo	2018-08-07 14:12:36.000000000 +0000
@@ -5,4 +5,5 @@
 CAPSTONE=https://github.com/radare/radare2-capstone
 BINDINGS=https://github.com/radare/radare2-bindings
 REGRESSIONS=https://github.com/radare/radare2-regressions
+PR_REGRESSIONS=https://github.com/__USER__/radare2-regressions
 [ -z "$1" ] && grep -h $0 | grep -v grep || eval echo \$$1
diff -Nru radare2-2.3.0+dfsg/doc/rgraph radare2-2.8.0+dfsg/doc/rgraph
--- radare2-2.3.0+dfsg/doc/rgraph	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/rgraph	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Not-much-updated graph of relationships between the libr APIs
-=============================================================
-
-             +--------+
-           .-| config |
-          /  +--------+
-   +------+  +------+ +------+ +------+
-   | core |--| cons | | asm  | | diff |
-   +------+  | line | | bin  | | sign |
-     |    \  +------+ | anal | | hash |    ,_____.
-   +----+  \          +---.--+ +--.---+   +._____.+
-   | io |   +-------------'------/        |       |
-   +----+   | cmd, search, print |<------>| flags |
-     |      +------.-------------\        | meta  |
-  [ lib ]     +----'----------+ +-`-----+ +._____.+
-     |   .----| debug, bp, vm | | lang  |
-     |   |    | reg, syscall  | | macro |
-  +------'--+ |  var, trace   | +-------+
-  | plugins | +---------------+     |
-  +-----.---+                       |
-        `---------------------------'
diff -Nru radare2-2.3.0+dfsg/doc/rgraph.md radare2-2.8.0+dfsg/doc/rgraph.md
--- radare2-2.3.0+dfsg/doc/rgraph.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/rgraph.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,23 @@
+Not-much-updated graph of relationships between the libr APIs
+=============================================================
+
+```
+             +--------+
+           .-| config |
+          /  +--------+
+   +------+  +------+ +------+ +------+
+   | core |--| cons | | asm  | | diff |
+   +------+  | line | | bin  | | sign |
+     |    \  +------+ | anal | | hash |    ,_____.
+   +----+  \          +---.--+ +--.---+   +._____.+
+   | io |   +-------------'------/        |       |
+   +----+   | cmd, search, print |<------>| flags |
+     |      +------.-------------\        | meta  |
+  [ lib ]     +----'----------+ +-`-----+ +._____.+
+     |   .----| debug, bp, vm | | lang  |
+     |   |    | reg, syscall  | | macro |
+  +------'--+ |  var, trace   | +-------+
+  | plugins | +---------------+     |
+  +-----.---+                       |
+        `---------------------------'
+```
diff -Nru radare2-2.3.0+dfsg/doc/sandbox/README.md radare2-2.8.0+dfsg/doc/sandbox/README.md
--- radare2-2.3.0+dfsg/doc/sandbox/README.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/sandbox/README.md	2018-08-07 14:12:36.000000000 +0000
@@ -19,8 +19,8 @@
 **NOTE**: r2 -S is an alias for -e cfg.sandbox=true
 
 
-OpenBSD (starting to 5.9)
--------------------------
+OpenBSD (from 5.9)
+------------------
 
 OpenBSD comes with support for sandboxing using the pledge(2) syscall.
 
@@ -45,6 +45,14 @@
 
 	$ systrace -a r2 -S /bin/ls
 
+FreeBSD (from 10.0)
+-------------------
+
+FreeBSD comes with the Capsicum framework support,
+ using cap_enter(2).
+
+Operations limited on what basic capability mode support.
+
 Other
 -----
 
diff -Nru radare2-2.3.0+dfsg/doc/solaris radare2-2.8.0+dfsg/doc/solaris
--- radare2-2.3.0+dfsg/doc/solaris	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/solaris	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-ORACLE SOLARIS NOTES
-====================
-
-Packages you need:
-------------------
-pkg install gcc-3 gmake
-
-To compile it:
---------------
-./configure --without-debugger --without-gmp
-gmake
-gmake install
diff -Nru radare2-2.3.0+dfsg/doc/solaris.md radare2-2.8.0+dfsg/doc/solaris.md
--- radare2-2.3.0+dfsg/doc/solaris.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/solaris.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,16 @@
+ORACLE SOLARIS NOTES
+====================
+
+Packages you need:
+------------------
+```
+pkg install gcc-3 gmake
+```
+
+To compile it:
+--------------
+```
+./configure --without-debugger --without-gmp
+gmake
+gmake install
+```
diff -Nru radare2-2.3.0+dfsg/doc/static radare2-2.8.0+dfsg/doc/static
--- radare2-2.3.0+dfsg/doc/static	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/static	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Statically Linking r2
-=====================
-
-Before you try to statically link r2, you should know about the licenses that go along with it, see doc/license for more information.
-
-Instructions
-------------
-
-In order to create a static library, configure with:
-
-	./configure --prefix=/usr --with-nonpic --without-pic
-
-or just run
-
-	sys/static.sh
-
-Android
--------
-
-Bear in mind that the Android build is done statically to simplify distribution and speedup loading times (no need to dynamically resolve external symbols or load libraries). You can achieve this running the following script (for example):
-
-	sys/android-arm.sh
-
-The build environment for the NDK can be setup by using the:
-
-	sys/android-shell.sh arm
diff -Nru radare2-2.3.0+dfsg/doc/statis.md radare2-2.8.0+dfsg/doc/statis.md
--- radare2-2.3.0+dfsg/doc/statis.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/statis.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,26 @@
+Statically Linking r2
+=====================
+
+Before you try to statically link r2, you should know about the licenses that go along with it, see doc/license for more information.
+
+Instructions
+------------
+
+In order to create a static library, configure with:
+
+	./configure --prefix=/usr --with-nonpic --without-pic
+
+or just run
+
+	sys/static.sh
+
+Android
+-------
+
+Bear in mind that the Android build is done statically to simplify distribution and speedup loading times (no need to dynamically resolve external symbols or load libraries). You can achieve this running the following script (for example):
+
+	sys/android-arm.sh
+
+The build environment for the NDK can be setup by using the:
+
+	sys/android-shell.sh arm
diff -Nru radare2-2.3.0+dfsg/doc/strings radare2-2.8.0+dfsg/doc/strings
--- radare2-2.3.0+dfsg/doc/strings	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/strings	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-Loading strings from binaries
-=============================
-
-TODO: explain bin.minstr
-
-Config vars
------------
-bin.strings  =  [true]  - load strings from file
-bin.rawstr   =  [false] - load strings from unknown rbin
-
-Program args
-------------
-rabin2 -z   # list strings
-rabin2 -zz  # list strings from raw binary (unknown rbin type)
-
-Examples
---------
-
-r2 -e bin.rawstr=true
-r2 -z   # do not load strings (same as bin.strings=false)
-r2 -zz  # load strings even if unknown bin (same as bin.rawstr=true)
-r2 -n   # do not load symbols or anything
-r2 -e bin.strings=false # load symbols but not strings
-if (bin.strings) {
-  if RBin.format(isKnown) {
-    loadStrings()
-  } else {
-    if (bin.rawstr)
-      loadStrings()
-  }
-}
-
diff -Nru radare2-2.3.0+dfsg/doc/strings.md radare2-2.8.0+dfsg/doc/strings.md
--- radare2-2.3.0+dfsg/doc/strings.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/strings.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,37 @@
+Loading strings from binaries
+=============================
+
+TODO: explain bin.minstr
+
+Config vars
+-----------
+```
+bin.strings  =  [true]  - load strings from file
+bin.rawstr   =  [false] - load strings from unknown rbin
+```
+
+Program args
+------------
+```
+rabin2 -z   # list strings
+rabin2 -zz  # list strings from raw binary (unknown rbin type)
+```
+
+Examples
+--------
+```
+r2 -e bin.rawstr=true
+r2 -z   # do not load strings (same as bin.strings=false)
+r2 -zz  # load strings even if unknown bin (same as bin.rawstr=true)
+r2 -n   # do not load symbols or anything
+r2 -e bin.strings=false # load symbols but not strings
+if (bin.strings) {
+  if RBin.format(isKnown) {
+    loadStrings()
+  } else {
+    if (bin.rawstr)
+      loadStrings()
+  }
+}
+```
+
diff -Nru radare2-2.3.0+dfsg/doc/termux.md radare2-2.8.0+dfsg/doc/termux.md
--- radare2-2.3.0+dfsg/doc/termux.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/termux.md	2018-08-07 14:12:36.000000000 +0000
@@ -13,37 +13,37 @@
 it is ok to just install the package from Termux unless you really want to track git master or
 develop for this platform.
 
-	$ apt install radare2
+	sudo apt install radare2
 
 Building from git
 -----------------
 
 The packages required to build are:
 
-	$ apt install git make patch clang
+	sudo apt install git make patch clang
 
 Now you can clone the repo and build:
 
-	$ git clone --depth 1 https://github.com/radare/radare2
-	$ cd radare2
-	$ sys/termux.sh
+	git clone --depth 1 https://github.com/radare/radare2
+	cd radare2
+	sys/termux.sh
 
 Building with meson
 -------------------
 
 If you want to build with meson:
 
-	$ apt install python
-	$ pip install meson
-	$ r2pm -i ninja
+	sudo apt install python
+	sudo pip install meson
+	sudo r2pm -i ninja
 
 And then you can run the build:
 
-	$ make meson
+	make meson
 
 To install:
 
-	$ make meson-symstall PREFIX=/data/data/com.termux/files/usr
+	make meson-symstall PREFIX=/data/data/com.termux/files/usr
 
 Updating
 --------
@@ -52,7 +52,7 @@
 or opt for typing `make` or `make meson` and it will just build what has changed, is something
 fails please do a clean build like this:
 
-	$ git reset --hard
-	$ git clean -xdf
-	$ sys/termux.sh
+	git reset --hard
+	git clean -xdf
+	sys/termux.sh
 
diff -Nru radare2-2.3.0+dfsg/doc/types.md radare2-2.8.0+dfsg/doc/types.md
--- radare2-2.3.0+dfsg/doc/types.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/types.md	2018-08-07 14:12:36.000000000 +0000
@@ -24,6 +24,7 @@
 |         c          |  char (signed byte)                      |
 |         d          |  0x%%08x hexadecimal value (4 bytes)     |
 |         f          |  float value (4 bytes)                   |
+|         F          |  double value (8 bytes)                  |
 |         i          |  %%i integer value (4 bytes)             |
 |         o          |  0x%%08o octal value (4 byte)            |
 |         p          |  pointer reference (2, 4 or 8 bytes)     |
diff -Nru radare2-2.3.0+dfsg/doc/windbg radare2-2.8.0+dfsg/doc/windbg
--- radare2-2.3.0+dfsg/doc/windbg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/windbg	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-WinDBG
-======
-
-The WinDBG support for r2 allows you to attach to VM running Windows
-using a named socket file (will support more IOs in the future) to
-debug a windows box using the KD interface over serial port.
-
-Bear in mind that WinDBG support is still work-in-progress, and this is
-just an initial implementation which will get better in time.
-
-It is also possible to use the remote GDB interface to connect and
-debug Windows kernels without depending on Windows capabilities.
-
-------8<--------------8<------------------8<------------------------
-
-Enable WinDBG support on Windows Vista and higher like this:
-
-    bcdedit /debug on
-    bcdedit /dbgsettings serial debugport:1 baudrate:115200
-
-Or like this for Windows XP:
-    Open boot.ini and add /debug /debugport=COM1 /baudrate=115200:
-
-    [boot loader]
-    timeout=30
-    default=multi(0)disk(0)rdisk(0)partition(1)\WINDOWS
-    [operating systems]
-    multi(0)disk(0)rdisk(0)partition(1)\WINDOWS="Debugging with Cable" /fastdetect /debug /debugport=COM1 /baudrate=57600
-
-
-Configure the VirtualBox Machine like this:
-
-    Preferences -> Serial Ports -> Port 1
-
-    [V] Enable Serial Port
-    Port Number: [_COM1_______[v]]
-    Port Mode:   [_Host_Pipe__[v]]
-                 [v] Create Pipe
-    Port/File Path: [_/tmp/windbg.pipe____]
-
-Or just spawn the VM with qemu like this:
-
-    $ qemu-system-x86_64 -chardev socket,id=serial0,\
-           path=/tmp/windbg.pipe,nowait,server \
-           -serial chardev:serial0 -hda Windows7-VM.vdi
-
-
-Radare2 will use the 'windbg' io plugin to connect to a socket file
-created by virtualbox or qemu. Also, the 'windbg' debugger plugin and
-we should specify the x86-32 too. (32 and 64 bit debugging is supported)
-
-    $ r2 -a x86 -b 32 -D windbg windbg:///tmp/windbg.pipe
-
-On Windows you should run the following line:
-
-    $ radare2 -D windbg windbg://\\.\pipe\com_1
-
-At this point, we will get stuck here:
-
-    [0x828997b8]> pd 20
-           ;-- eip:
-           0x828997b8    cc           int3
-           0x828997b9    c20400       ret 4
-           0x828997bc    cc           int3
-           0x828997bd    90           nop
-           0x828997be    c3           ret
-           0x828997bf    90           nop
-
-In order to skip that trap we will need to change eip and run 'dc' twice:
-
-    dr eip=eip+1
-    dc
-    dr eip=eip+1
-    dc
-
-Now the Windows VM will be interactive again. We will need to kill r2 and
-attach again to get back to control the kernel.
-
-In addition, the `dp` command can be used to list all processes, and
-`dpa` or `dp=` to attach to the process. This will display the base
-address of the process in the physical memory layout.
diff -Nru radare2-2.3.0+dfsg/doc/windbg.md radare2-2.8.0+dfsg/doc/windbg.md
--- radare2-2.3.0+dfsg/doc/windbg.md	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/windbg.md	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,79 @@
+WinDBG
+======
+
+The WinDBG support for r2 allows you to attach to VM running Windows
+using a named socket file (will support more IOs in the future) to
+debug a windows box using the KD interface over serial port.
+
+Bear in mind that WinDBG support is still work-in-progress, and this is
+just an initial implementation which will get better in time.
+
+It is also possible to use the remote GDB interface to connect and
+debug Windows kernels without depending on Windows capabilities.
+
+Enable WinDBG support on Windows Vista and higher like this:
+
+    bcdedit /debug on
+    bcdedit /dbgsettings serial debugport:1 baudrate:115200
+
+Or like this for Windows XP:
+    Open boot.ini and add /debug /debugport=COM1 /baudrate=115200:
+
+    [boot loader]
+    timeout=30
+    default=multi(0)disk(0)rdisk(0)partition(1)\WINDOWS
+    [operating systems]
+    multi(0)disk(0)rdisk(0)partition(1)\WINDOWS="Debugging with Cable" /fastdetect /debug /debugport=COM1 /baudrate=57600
+
+
+Configure the VirtualBox Machine like this:
+
+    Preferences -> Serial Ports -> Port 1
+
+    [V] Enable Serial Port
+    Port Number: [_COM1_______[v]]
+    Port Mode:   [_Host_Pipe__[v]]
+                 [v] Create Pipe
+    Port/File Path: [_/tmp/windbg.pipe____]
+
+Or just spawn the VM with qemu like this:
+
+    $ qemu-system-x86_64 -chardev socket,id=serial0,\
+           path=/tmp/windbg.pipe,nowait,server \
+           -serial chardev:serial0 -hda Windows7-VM.vdi
+
+
+Radare2 will use the 'windbg' io plugin to connect to a socket file
+created by virtualbox or qemu. Also, the 'windbg' debugger plugin and
+we should specify the x86-32 too. (32 and 64 bit debugging is supported)
+
+    $ r2 -a x86 -b 32 -D windbg windbg:///tmp/windbg.pipe
+
+On Windows you should run the following line:
+
+    $ radare2 -D windbg windbg://\\.\pipe\com_1
+
+At this point, we will get stuck here:
+
+    [0x828997b8]> pd 20
+           ;-- eip:
+           0x828997b8    cc           int3
+           0x828997b9    c20400       ret 4
+           0x828997bc    cc           int3
+           0x828997bd    90           nop
+           0x828997be    c3           ret
+           0x828997bf    90           nop
+
+In order to skip that trap we will need to change eip and run 'dc' twice:
+
+    dr eip=eip+1
+    dc
+    dr eip=eip+1
+    dc
+
+Now the Windows VM will be interactive again. We will need to kill r2 and
+attach again to get back to control the kernel.
+
+In addition, the `dp` command can be used to list all processes, and
+`dpa` or `dp=` to attach to the process. This will display the base
+address of the process in the physical memory layout.
diff -Nru radare2-2.3.0+dfsg/doc/yara.md radare2-2.8.0+dfsg/doc/yara.md
--- radare2-2.3.0+dfsg/doc/yara.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/yara.md	2018-08-07 14:12:36.000000000 +0000
@@ -4,13 +4,12 @@
 Preliminary documentation on yara can be found here:
 [Yara User's Manual](https://b161268c3bf5a87bc67309e7c870820f5f39f672.googledrive.com/host/0BznOMqZ9f3VUek8yN3VvSGdhRFU/YARA-Manual.pdf)
 
-The following is 'YARA in a nutshell' from this document:
+The following is [YARA in a nutshell](https://virustotal.github.io/yara/) from this document:
 
 > YARA is a tool aimed at helping malware researchers to identify and classify malware
 families. With YARA you can create descriptions of malware families based on textual or
 binary information contained on samples of those families. These descriptions, a.k.a rules,
-consist patterns and a boolean expression which determines its
-logic. Rules can be
+consist patterns and a boolean expression which determines its logic. Rules can be
 applied to files or running processes in order to determine if it belongs to the described
 malware family.
 
diff -Nru radare2-2.3.0+dfsg/doc/zsh/_r2 radare2-2.8.0+dfsg/doc/zsh/_r2
--- radare2-2.3.0+dfsg/doc/zsh/_r2	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/zsh/_r2	2018-08-07 14:12:36.000000000 +0000
@@ -10,6 +10,7 @@
   local -a options=(
   '-\=[perform !=! command to run all commands remotely]'
   '-0[print \x00 after init and every command]'
+  '-2[close stderr (silent warnings)]'
   '-a+[set asm.arch]: :->arch'
   "-A[run 'aaa' command to analyze all referenced code]"
   '-b+[set asm.bits]:bits:(8 16 32 64)'
@@ -47,6 +48,7 @@
   '(-v -V)-v[show radare2 version]'
   '(-v -V)-V[show radare2 and lib versions)]'
   '-w[open file in write mode]'
+  '-x[open without exec-flag, see io.exec]'
   '(-z -zz)-z[do not load strings]'
   '(-z -zz)-zz[load strings from raw binary (even if unknown)]'
   )
@@ -55,7 +57,7 @@
 
   case $state in
     arch)
-      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?~[2,4-99]' | sed -E 's/ (.*)/[\1]/')"})
+      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?')"})
       _values 'arch' $sub && ret=0
       ;;
     asm.os)
@@ -69,7 +71,7 @@
       _values 'dbg.backend' $(r2 '-D?') && ret=0
       ;;
     project)
-      _values 'project' $(r2 -p) && ret=0
+      _values 'project' "${(f)"$(r2 -p)"}" && ret=0
       ;;
   esac
   return ret
diff -Nru radare2-2.3.0+dfsg/doc/zsh/_rabin2 radare2-2.8.0+dfsg/doc/zsh/_rabin2
--- radare2-2.3.0+dfsg/doc/zsh/_rabin2	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/zsh/_rabin2	2018-08-07 14:12:36.000000000 +0000
@@ -64,7 +64,7 @@
 
   case $state in
     arch)
-      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?~[2,4-99]' | sed -E 's/ (.*)/[\1]/')"})
+      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?')"})
       _values 'arch' $sub && ret=0
       ;;
     checksum)
diff -Nru radare2-2.3.0+dfsg/doc/zsh/_radiff2 radare2-2.8.0+dfsg/doc/zsh/_radiff2
--- radare2-2.3.0+dfsg/doc/zsh/_radiff2	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/zsh/_radiff2	2018-08-07 14:12:36.000000000 +0000
@@ -42,7 +42,7 @@
 
   case $state in
     arch)
-      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?~[2,4-99]' | sed -E 's/ (.*)/[\1]/')"})
+      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?')"})
       _values 'arch' $sub && ret=0
       ;;
   esac
diff -Nru radare2-2.3.0+dfsg/doc/zsh/_rafind2 radare2-2.8.0+dfsg/doc/zsh/_rafind2
--- radare2-2.3.0+dfsg/doc/zsh/_rafind2	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/zsh/_rafind2	2018-08-07 14:12:36.000000000 +0000
@@ -12,6 +12,7 @@
   '-m[magic search, file-type carver]'
   '-M+[set a binary mask to be applied on keywords]:str'
   '-n[do not stop on read errors]'
+  '-q[quiet]'
   '-r[print using radare commands]'
   '*-s+[search for a specific string (can be used multiple times)]:str'
   '*-S+[search for a specific wide string (can be used multiple times)]:str'
diff -Nru radare2-2.3.0+dfsg/doc/zsh/_ragg2 radare2-2.8.0+dfsg/doc/zsh/_ragg2
--- radare2-2.3.0+dfsg/doc/zsh/_ragg2	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/zsh/_ragg2	2018-08-07 14:12:36.000000000 +0000
@@ -42,7 +42,7 @@
 
   case $state in
     arch)
-      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?~[2,4-99]' | sed -E 's/ (.*)/[\1]/')"})
+      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?')"})
       _values 'arch' $sub && ret=0
       ;;
     asm.os)
diff -Nru radare2-2.3.0+dfsg/doc/zsh/_ragg2-cc radare2-2.8.0+dfsg/doc/zsh/_ragg2-cc
--- radare2-2.3.0+dfsg/doc/zsh/_ragg2-cc	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/zsh/_ragg2-cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#compdef ragg2-cc
-local context state state_descr line
-local -i ret=1
-
-r2_qc() {
-  r2 -qc $1 --
-}
-
-_ragg2-cc() {
-  local -a options=(
-  '-a+[select architecture (x86, mips, arm)]: :->arch'
-  '-b+[register size (32, 64, ..)]:bits:(32 64)'
-  '-c[generate compiled shellcode]'
-  '-d[enable debug mode]'
-  "-k+[set kernel]: :->asm.os"
-  '-o+[set output file]: :_files'
-  '-s[generate assembly]'
-  '-v[show version]'
-  '-x[show hexpair bytes]'
-  )
-
-  _arguments -S -s : $options '1:file:_files' && ret=0
-
-  case $state in
-    arch)
-      local -a sub=(${(f)"$(r2_qc 'e asm.arch=?~[2,4-99]' | sed -E 's/ (.*)/[\1]/')"})
-      _values 'arch' $sub && ret=0
-      ;;
-    asm.os)
-      _values 'asm.os' $(r2_qc 'e asm.os=?') && ret=0
-      ;;
-  esac
-  return ret
-}
-
-_ragg2-cc "$@"
-
-# Local Variables:
-# mode: shell-script
-# coding: utf-8-unix
-# indent-tabs-mode: nil
-# sh-indentation: 2
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 sts=2 et
diff -Nru radare2-2.3.0+dfsg/doc/zsh/_rax2 radare2-2.8.0+dfsg/doc/zsh/_rax2
--- radare2-2.3.0+dfsg/doc/zsh/_rax2	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/doc/zsh/_rax2	2018-08-07 14:12:36.000000000 +0000
@@ -12,8 +12,10 @@
   '-f[floating point    ;  rax2 -f 6.3+2.1]'
   '-F[stdin slurp C hex ;  rax2 -F < shellcode.c]'
   '-h[help              ;  rax2 -h]'
+  '-i[dump as C array   ;  rax2 -i < bytes]'
   '-k[keep base         ;  rax2 -k 33+3 -> 36]'
   '-K[randomart         ;  rax2 -K 0x34 1020304050]'
+  '-L[bin -> hex        ;  rax2 -L 1111111]'
   '-n[binary number     ;  rax2 -n 0x1234 # 34120000]'
   '-N[binary number     ;  rax2 -N 0x1234 # \x34\x12\x00\x00]'
   '-r[r2 style output   ;  rax2 -r 0x1234]'
diff -Nru radare2-2.3.0+dfsg/Dockerfile radare2-2.8.0+dfsg/Dockerfile
--- radare2-2.3.0+dfsg/Dockerfile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/Dockerfile	2018-08-07 14:12:36.000000000 +0000
@@ -28,8 +28,8 @@
 # $ r2 -d /bin/true
 #
 
-# Using debian 8 as base image.
-FROM debian:8
+# Using debian 9 as base image.
+FROM debian:9
 
 # Label base
 LABEL r2docker latest
@@ -62,6 +62,7 @@
   libc6:i386 \
   libncurses5:i386 \
   libstdc++6:i386 \
+  gnupg2 \
   sudo && \
   curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
   apt-get install -y nodejs python-pip && \
diff -Nru radare2-2.3.0+dfsg/Dockerfile.travis radare2-2.8.0+dfsg/Dockerfile.travis
--- radare2-2.3.0+dfsg/Dockerfile.travis	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/Dockerfile.travis	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,44 @@
+FROM fedora:28
+
+MAINTAINER tbd
+
+WORKDIR /src
+
+RUN dnf install -y \
+	gcc \
+	gcc-c++ \
+	clang \
+	llvm \
+	make \
+	patch \
+	findutils \
+	which \
+	bison \
+	curl \
+	git \
+	binutils \
+	cabextract \
+	libasan \
+	libcurl-devel \
+	elfutils-libelf-devel \
+	elfutils-libelf-devel-static \
+	libdwarf-devel \
+	libdwarf-static \
+	jq \
+	pkgconf-pkg-config \
+	glib2 \
+	glib2-devel \
+	ncurses-devel \
+	capstone-devel \
+	libzip-devel \
+	file-devel \
+	lz4-devel \
+	gnupg2 \
+	python2-pip \
+	meson \
+	ninja-build \
+	xz
+
+RUN rm -rf /src/.nvm && git clone https://github.com/creationix/nvm.git /src/.nvm && (cd /src/.nvm && git checkout `git describe --abbrev=0 --tags`) && . /src/.nvm/nvm.sh && nvm install 8.11.3
+
+CMD []
diff -Nru radare2-2.3.0+dfsg/Doxyfile radare2-2.8.0+dfsg/Doxyfile
--- radare2-2.3.0+dfsg/Doxyfile	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/Doxyfile	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2482 @@
+# Doxyfile 1.8.14
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = Radare2
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "unix-like reverse engineering framework and cli tools"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+#PROJECT_LOGO           = doc/images/r2.svg
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = YES
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 1
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT =
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f \
+                         *.for \
+                         *.tcl \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = doc/images
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = ./README.md
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: https://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff -Nru radare2-2.3.0+dfsg/env.sh radare2-2.8.0+dfsg/env.sh
--- radare2-2.3.0+dfsg/env.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/env.sh	2018-08-07 14:12:36.000000000 +0000
@@ -23,6 +23,7 @@
 fi
 
 new_env='
+R2_ENV_IS_SET=1
 LIBR_PLUGINS=${pfx}/lib/radare2
 PATH=$pfx/bin:${PATH}
 LD_LIBRARY_PATH=$pfx/lib:$LD_LIBRARY_PATH
@@ -31,6 +32,11 @@
 '
 
 shift
+if [ "$R2_ENV_IS_SET" = 1 ]; then
+	echo "Nested call"
+	exec $*
+	exit $?
+fi
 
 if [ -z "$*" ]; then
 	echo
diff -Nru radare2-2.3.0+dfsg/.github/ISSUE_TEMPLATE.md radare2-2.8.0+dfsg/.github/ISSUE_TEMPLATE.md
--- radare2-2.3.0+dfsg/.github/ISSUE_TEMPLATE.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/.github/ISSUE_TEMPLATE.md	2018-08-07 14:12:36.000000000 +0000
@@ -11,8 +11,7 @@
 | OS/arch/bits (mandatory)                             | Debian arm 64, Ubuntu x86 32
 | File format of the file you reverse (mandatory)      | PE, ELF etc.
 | Architecture/bits of the file (mandatory)            | PPC, x86/32, x86/64 etc.
-| r2 -v full output, **not truncated** (mandatory)         | radare2 2.2.0 16809 @....
-| r2 -V full output in a pastebin document (mandatory) | https://gist.github.com/
+| r2 -v full output, **not truncated** (mandatory)     | radare2 2.4.0-git 17284 @ darwin-x86-64 git.2.2.0-476-gf8cf84e06 commit: f8cf84e0653642d9ad34e760e0e56dd81860e799 build: 2018-02-17__11:08:27
 
 ### Expected behavior
 
@@ -21,7 +20,7 @@
 ### Steps to reproduce the behavior 
 - Please share the binary if it is shareable by drag and dropping it here in a zip archive (mandatory)
 - Use asciinema to describe the issue and share the link here (mandatory if u can't share the binary) 
-- Use code markdown `CODE` to make your code lisible
+- Use code markdown `CODE` to make your code visible
 - Or even better, create a Pull-Request for the https://github.com/radare/radare2-regressions containing the test case examples can be found in the t/ folder see for example https://github.com/radare/radare2-regressions/blob/master/t/cmd_search#L7
 
 ### Additional Logs, screenshots, source-code,  configuration dump, ...
diff -Nru radare2-2.3.0+dfsg/.gitignore radare2-2.8.0+dfsg/.gitignore
--- radare2-2.3.0+dfsg/.gitignore	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/.gitignore	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,8 @@
 clang-log/
 .clang-format
+.clang_complete
 .tmp-format
+.#*
 *._d
 *._o
 *.[ado]
@@ -98,3 +100,17 @@
 binr/rasign2/rasign2
 binr/rasign2/rasign2.exe
 compile_commands.json
+libr/flag/d/tags.r2
+# CLion
+.idea/
+CMakeLists.txt
+*.cmake
+cmake-build-*
+# Snap packaging
+/parts
+/prime
+/stage
+/snap
+/*.snap
+# doxygen autogen
+doc/doxygen/html
diff -Nru radare2-2.3.0+dfsg/libr/anal/anal.c radare2-2.8.0+dfsg/libr/anal/anal.c
--- radare2-2.3.0+dfsg/libr/anal/anal.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/anal.c	2018-08-07 14:12:36.000000000 +0000
@@ -70,27 +70,24 @@
 	anal->decode = true; // slow slow if not used
 	anal->gp = 0LL;
 	anal->sdb = sdb_new0 ();
+	anal->cpp_abi = R_ANAL_CPP_ABI_ITANIUM;
+	anal->opt.depth = 32;
 	anal->opt.noncode = false; // do not analyze data by default
 	r_space_new (&anal->meta_spaces, "CS", meta_unset_for, meta_count_for, NULL, anal);
 	r_space_new (&anal->zign_spaces, "zs", zign_unset_for, zign_count_for, zign_rename_for, anal);
 	anal->sdb_fcns = sdb_ns (anal->sdb, "fcns", 1);
 	anal->sdb_meta = sdb_ns (anal->sdb, "meta", 1);
 	anal->sdb_hints = sdb_ns (anal->sdb, "hints", 1);
-	anal->sdb_xrefs = sdb_ns (anal->sdb, "xrefs", 1);
 	anal->sdb_types = sdb_ns (anal->sdb, "types", 1);
+	anal->sdb_fmts = sdb_ns (anal->sdb, "spec", 1);
 	anal->sdb_cc = sdb_ns (anal->sdb, "cc", 1);
 	anal->sdb_zigns = sdb_ns (anal->sdb, "zigns", 1);
-#if USE_DICT
-	anal->dict_refs = dict_new (100, dict_free);
-	anal->dict_xrefs = dict_new (100, dict_free);
-#endif
 	anal->zign_path = strdup ("");
 	anal->cb_printf = (PrintfCallback) printf;
 	(void)r_anal_pin_init (anal);
 	(void)r_anal_xrefs_init (anal);
 	anal->diff_thbb = R_ANAL_THRESHOLDBB;
 	anal->diff_thfcn = R_ANAL_THRESHOLDFCN;
-	anal->split = true; // used from core
 	anal->syscall = r_syscall_new ();
 	r_io_bind_init (anal->iob);
 	r_flag_bind_init (anal->flb);
@@ -101,11 +98,7 @@
 	anal->lineswidth = 0;
 	anal->fcns = r_anal_fcn_list_new ();
 	anal->fcn_tree = NULL;
-#if USE_NEW_FCN_STORE
-	anal->fcnstore = r_listrange_new ();
-#endif
 	anal->refs = r_anal_ref_list_new ();
-	anal->types = r_anal_type_list_new ();
 	r_anal_set_bits (anal, 32);
 	anal->plugins = r_list_newf ((RListFree) r_anal_plugin_free);
 	if (anal->plugins) {
@@ -137,10 +130,12 @@
 	r_space_free (&a->zign_spaces);
 	r_anal_pin_fini (a);
 	r_list_free (a->refs);
-	r_list_free (a->types);
+	r_syscall_free (a->syscall);
 	r_reg_free (a->reg);
 	r_anal_op_free (a->queued);
 	r_list_free (a->bits_ranges);
+	ht_free (a->dict_refs);
+	ht_free (a->dict_xrefs);
 	a->sdb = NULL;
 	sdb_ns_free (a->sdb);
 	if (a->esil) {
@@ -229,14 +224,13 @@
 }
 
 R_API bool r_anal_set_fcnsign(RAnal *anal, const char *name) {
-#define FCNSIGNPATH "share/radare2/" R2_VERSION "/fcnsign"
 	const char *dirPrefix = r_sys_prefix (NULL);
 	char *file = NULL;
 	const char *arch = (anal->cur && anal->cur->arch) ? anal->cur->arch : R_SYS_ARCH;
 	if (name && *name) {
-		file = sdb_fmt (0, "%s/%s/%s.sdb", dirPrefix, FCNSIGNPATH, name);
+		file = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "%s.sdb"), dirPrefix, name);
 	} else {
-		file = sdb_fmt (0, "%s/%s/%s-%s-%d.sdb", dirPrefix, FCNSIGNPATH,
+		file = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "%s-%s-%d.sdb"), dirPrefix,
 			anal->os, arch, anal->bits);
 	}
 	if (r_file_exists (file)) {
@@ -293,6 +287,10 @@
 R_API void r_anal_set_cpu(RAnal *anal, const char *cpu) {
 	free (anal->cpu);
 	anal->cpu = cpu ? strdup (cpu) : NULL;
+	int v = r_anal_archinfo (anal, R_ANAL_ARCHINFO_ALIGN);
+	if (v != -1) {
+		anal->pcalign = v;
+	}
 }
 
 R_API int r_anal_set_big_endian(RAnal *anal, int bigend) {
@@ -326,7 +324,7 @@
 	memset (ret, 0xff, size);
 
 	while (idx < size) {
-		if ((oplen = r_anal_op (anal, op, at, data + idx, size - idx)) < 1) {
+		if ((oplen = r_anal_op (anal, op, at, data + idx, size - idx, R_ANAL_OP_MASK_BASIC)) < 1) {
 			break;
 		}
 		if ((op->ptr != UT64_MAX || op->jump != UT64_MAX) && op->nopcode != 0) {
@@ -335,7 +333,7 @@
 		idx += oplen;
 	}
 
-	free (op);
+	r_anal_op_free (op);
 
 	return ret;
 }
@@ -361,13 +359,6 @@
 	return anal->fcns;
 }
 
-R_API bool r_anal_project_save(RAnal *anal, const char *prjfile) {
-	if (prjfile && *prjfile) {
-		return r_anal_xrefs_save (anal, prjfile);
-	}
-	return false;
-}
-
 R_API RAnalOp *r_anal_op_hexstr(RAnal *anal, ut64 addr, const char *str) {
 	int len;
 	ut8 *buf;
@@ -381,7 +372,7 @@
 		return NULL;
 	}
 	len = r_hex_str2bin (str, buf);
-	r_anal_op (anal, op, addr, buf, len);
+	r_anal_op (anal, op, addr, buf, len, R_ANAL_OP_MASK_BASIC);
 	free (buf);
 	return op;
 }
@@ -409,20 +400,13 @@
 	sdb_reset (anal->sdb_fcns);
 	sdb_reset (anal->sdb_meta);
 	sdb_reset (anal->sdb_hints);
-	sdb_reset (anal->sdb_xrefs);
 	sdb_reset (anal->sdb_types);
 	sdb_reset (anal->sdb_zigns);
 	r_list_free (anal->fcns);
 	anal->fcns = r_anal_fcn_list_new ();
 	anal->fcn_tree = NULL;
-#if USE_NEW_FCN_STORE
-	r_listrange_free (anal->fcnstore);
-	anal->fcnstore = r_listrange_new ();
-#endif
 	r_list_free (anal->refs);
 	anal->refs = r_anal_ref_list_new ();
-	r_list_free (anal->types);
-	anal->types = r_anal_type_list_new ();
 	return 0;
 }
 
@@ -442,7 +426,7 @@
 static int nonreturn_print_commands(void *p, const char *k, const char *v) {
 	RAnal *anal = (RAnal *)p;
 	if (!strncmp (v, "func", strlen ("func") + 1)) {
-		char *query = sdb_fmt (-1, "func.%s.noreturn", k);
+		char *query = sdb_fmt ("func.%s.noreturn", k);
 		if (sdb_bool_get (anal->sdb_types, query, NULL)) {
 			anal->cb_printf ("tnn %s\n", k);
 		}
@@ -456,7 +440,7 @@
 static int nonreturn_print(void *p, const char *k, const char *v) {
 	RAnal *anal = (RAnal *)p;
 	if (!strncmp (v, "func", strlen ("func") + 1)) {
-		const char *query = sdb_fmt (-1, "func.%s.noreturn", k);
+		const char *query = sdb_fmt ("func.%s.noreturn", k);
 		if (sdb_bool_get (anal->sdb_types, query, NULL)) {
 			anal->cb_printf ("%s\n", k);
 		}
@@ -489,13 +473,14 @@
 	}
 }
 
-#define K_NORET_ADDR(x) sdb_fmt (-1, "addr.%"PFMT64x".noreturn", x)
-#define K_NORET_FUNC(x) sdb_fmt (-1, "func.%s.noreturn", x)
+#define K_NORET_ADDR(x) sdb_fmt ("addr.%"PFMT64x".noreturn", x)
+#define K_NORET_FUNC(x) sdb_fmt ("func.%s.noreturn", x)
 
 R_API bool r_anal_noreturn_add(RAnal *anal, const char *name, ut64 addr) {
 	const char *tmp_name = NULL;
+	Sdb *TDB = anal->sdb_types;
 	char *fnl_name = NULL;
-	if (sdb_bool_set (anal->sdb_types, K_NORET_ADDR (addr), true, 0)) {
+	if (sdb_bool_set (TDB, K_NORET_ADDR (addr), true, 0)) {
 		return true;
 	}
 	if (name && *name) {
@@ -509,13 +494,13 @@
 		}
 		tmp_name = fcn ? fcn->name: fi->name;
 	}
-	if (r_anal_type_func_exist (anal, tmp_name)) {
+	if (r_type_func_exist (TDB, tmp_name)) {
 		fnl_name = strdup (tmp_name);
-	} else if (!(fnl_name = r_anal_type_func_guess (anal, (char *)tmp_name))) {
+	} else if (!(fnl_name = r_type_func_guess (TDB, (char *)tmp_name))) {
 		eprintf ("Cant find prototype for %s in types databse\n", tmp_name);
 		return false;
 	}
-	sdb_bool_set (anal->sdb_types, K_NORET_FUNC(fnl_name), true, 0);
+	sdb_bool_set (TDB, K_NORET_FUNC(fnl_name), true, 0);
 	free (fnl_name);
 	return true;
 }
@@ -529,8 +514,9 @@
 }
 
 R_API int r_anal_noreturn_drop(RAnal *anal, const char *expr) {
+	Sdb *TDB = anal->sdb_types;
 	if (!strcmp (expr, "*")) {
-		sdb_foreach (anal->sdb_types, noreturn_dropall, anal);
+		sdb_foreach (TDB, noreturn_dropall, anal);
 		return true;
 	} else {
 		const char *fcnname = NULL;
@@ -546,11 +532,11 @@
 		} else {
 			fcnname = expr;
 		}
-		if (r_anal_type_func_exist (anal, fcnname)) {
-			sdb_unset (anal->sdb_types, K_NORET_FUNC (fcnname), 0);
+		if (r_type_func_exist (TDB, fcnname)) {
+			sdb_unset (TDB, K_NORET_FUNC (fcnname), 0);
 			return true;
-		} else if ((tmp = r_anal_type_func_guess (anal, (char *)fcnname))) {
-			sdb_unset (anal->sdb_types, K_NORET_FUNC (fcnname), 0);
+		} else if ((tmp = r_type_func_guess (TDB, (char *)fcnname))) {
+			sdb_unset (TDB, K_NORET_FUNC (fcnname), 0);
 			free (tmp);
 			return true;
 		} else {
@@ -564,7 +550,7 @@
 	if (sdb_bool_get (anal->sdb_types, K_NORET_FUNC(name), NULL)) {
 		return true;
 	}
-	char *tmp = r_anal_type_func_guess (anal, (char *)name);
+	char *tmp = r_type_func_guess (anal->sdb_types, (char *)name);
 	if (tmp) {
 		if (sdb_bool_get (anal->sdb_types, K_NORET_FUNC (tmp), NULL)) {
 			free (tmp);
@@ -588,7 +574,7 @@
 		return false;
 	}
 	// TODO: check return value
-	(void)r_anal_op (anal, &op, addr, bbuf, sizeof (bbuf));
+	(void)r_anal_op (anal, &op, addr, bbuf, sizeof (bbuf), R_ANAL_OP_MASK_BASIC);
 	switch (op.type & R_ANAL_OP_TYPE_MASK) {
 	case R_ANAL_OP_TYPE_JMP:
 		if (op.jump == UT64_MAX) {
diff -Nru radare2-2.3.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.c radare2-2.8.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.c
--- radare2-2.3.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,1809 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <r_types.h>
+#include <r_util.h>
+#include <r_asm.h>
+#include <r_anal.h>
+#include "hexagon.h"
+#include "hexagon_insn.h"
+
+int hexagon_anal_instruction(HexInsn *hi, RAnalOp *op) {
+	switch (hi->instruction) {
+	case HEX_INS_CALL__R22_2: {
+		// call #r22:2
+		op->type = R_ANAL_OP_TYPE_CALL;
+		break;
+	}
+	case HEX_INS_IF__PU__CALL__R15_2: {
+		// if (Pu) call #r15:2
+		op->type = R_ANAL_OP_TYPE_CALL;
+		break;
+	}
+	case HEX_INS_IF__NOT_PU_CALL__R15_2: {
+		// if !Pu call #r15:2
+		op->type = R_ANAL_OP_TYPE_CALL;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS____1____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.eq (Rs, #-1) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS____1____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gt (Rs, #-1) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___TSTBIT__RS___0____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = tstbit (Rs, #0) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS____1____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.eq (Rs, #-1) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS____1____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gt (Rs, #-1) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___TSTBIT__RS___0____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = tstbit (Rs, #0) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS____1____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.eq (Rs, #-1) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS____1____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gt (Rs, #-1) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___TSTBIT__RS___0____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = tstbit (Rs, #0) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS____1____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.eq (Rs, #-1) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS____1____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gt (Rs, #-1) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___TSTBIT__RS___0____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = tstbit (Rs, #0) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.eq (Rs, #U5) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.eq (Rs, #U5) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.eq (Rs, #U5) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.eq (Rs, #U5) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS___U5____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gt (Rs, #U5) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS___U5____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gt (Rs, #U5) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gt (Rs, #U5) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gt (Rs, #U5) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gtu (Rs, #U5) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gtu (Rs, #U5) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gtu (Rs, #U5) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gtu (Rs, #U5) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS____1____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.eq (Rs, #-1) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS____1____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gt (Rs, #-1) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___TSTBIT__RS___0____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = tstbit (Rs, #0) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS____1____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.eq (Rs, #-1) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS____1____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gt (Rs, #-1) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___TSTBIT__RS___0____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = tstbit (Rs, #0) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS____1____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.eq (Rs, #-1) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS____1____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gt (Rs, #-1) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___TSTBIT__RS___0____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = tstbit (Rs, #0) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS____1____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.eq (Rs, #-1) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS____1____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gt (Rs, #-1) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___TSTBIT__RS___0____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = tstbit (Rs, #0) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.eq (Rs, #U5) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.eq (Rs, #U5) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.eq (Rs, #U5) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.eq (Rs, #U5) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS___U5____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gt (Rs, #U5) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS___U5____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gt (Rs, #U5) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gt (Rs, #U5) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gt (Rs, #U5) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gtu (Rs, #U5) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gtu (Rs, #U5) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gtu (Rs, #U5) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gtu (Rs, #U5) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.eq (Rs, Rt) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.eq (Rs, Rt) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.eq (Rs, Rt) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.eq (Rs, Rt) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.eq (Rs, Rt) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.eq (Rs, Rt) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.eq (Rs, Rt) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.eq (Rs, Rt) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS__RT____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gt (Rs, Rt) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS__RT____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gt (Rs, Rt) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS__RT____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gt (Rs, Rt) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS__RT____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gt (Rs, Rt) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gt (Rs, Rt) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gt (Rs, Rt) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GT__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gt (Rs, Rt) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GT__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gt (Rs, Rt) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF__P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gtu (Rs, Rt) ; if (p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF__P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gtu (Rs, Rt) ; if (p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF__P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gtu (Rs, Rt) ; if (p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF__P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gtu (Rs, Rt) ; if (p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2: {
+		// p0 = cmp.gtu (Rs, Rt) ; if (!p0.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2: {
+		// p1 = cmp.gtu (Rs, Rt) ; if (!p1.new) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2: {
+		// p0 = cmp.gtu (Rs, Rt) ; if (!p0.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2: {
+		// p1 = cmp.gtu (Rs, Rt) ; if (!p1.new) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_JUMP__R22_2: {
+		// jump #r22:2
+		op->type = R_ANAL_OP_TYPE_JMP;
+		op->jump = hi->ops[0].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__PU__JUMP_NT__R15_2: {
+		// if (Pu) jump:nt #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__PU__JUMP_T__R15_2: {
+		// if (Pu) jump:t #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__NOT_PU_JUMP_NT__R15_2: {
+		// if !Pu jump:nt #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__NOT_PU_JUMP_T__R15_2: {
+		// if !Pu jump:t #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__PU_NEW__JUMP_NT__R15_2: {
+		// if (Pu.new) jump:nt #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__PU_NEW__JUMP_T__R15_2: {
+		// if (Pu.new) jump:t #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__NOT_PU_NEW_JUMP_NT__R15_2: {
+		// if !Pu.new jump:nt #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__NOT_PU_NEW_JUMP_T__R15_2: {
+		// if !Pu.new jump:t #r15:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS__NOT____0__JUMP_NT__R13_2: {
+		// if (Rs != #0) jump:nt #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS__NOT____0__JUMP_T__R13_2: {
+		// if (Rs != #0) jump:t #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS_GT_EQ___0__JUMP_NT__R13_2: {
+		// if (Rs> = #0) jump:nt #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS_GT_EQ___0__JUMP_T__R13_2: {
+		// if (Rs> = #0) jump:t #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS__EQ___0__JUMP_NT__R13_2: {
+		// if (Rs == #0) jump:nt #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS__EQ___0__JUMP_T__R13_2: {
+		// if (Rs == #0) jump:t #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS_LT_EQ___0__JUMP_NT__R13_2: {
+		// if (Rs< = #0) jump:nt #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__RS_LT_EQ___0__JUMP_T__R13_2: {
+		// if (Rs< = #0) jump:t #r13:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_RD____U6___JUMP__R9_2: {
+		// Rd = #U6 ; jump #r9:2
+		op->type = R_ANAL_OP_TYPE_JMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_MULT_RD___RS___JUMP__R9_2: {
+		// Rd = Rs ; jump #r9:2
+		op->type = R_ANAL_OP_TYPE_JMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_DEALLOC_RETURN: {
+		// dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_IF__PS_NEW__DEALLOC_RETURN_NT: {
+		// if (Ps.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_IF__PS__DEALLOC_RETURN: {
+		// if (Ps) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_IF__PS_NEW__DEALLOC_RETURN_T: {
+		// if (Ps.new) dealloc_return:t
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_IF__NOT_PS_NEW_DEALLOC_RETURN_NT: {
+		// if !Ps.new dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_IF__NOT_PS_DEALLOC_RETURN: {
+		// if !Ps dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_IF__NOT_PS_NEW_DEALLOC_RETURN_T: {
+		// if !Ps.new dealloc_return:t
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_IF__CMP_EQ__NS_NEW__RT___JUMP_NT__R9_2: {
+		// if (cmp.eq (Ns.new, Rt)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_EQ__NS_NEW__RT___JUMP_T__R9_2: {
+		// if (cmp.eq (Ns.new, Rt)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_EQ__NS_NEW__RT___JUMP_NT__R9_2: {
+		// if (!cmp.eq (Ns.new, Rt)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_EQ__NS_NEW__RT___JUMP_T__R9_2: {
+		// if (!cmp.eq (Ns.new, Rt)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__NS_NEW__RT___JUMP_NT__R9_2: {
+		// if (cmp.gt (Ns.new, Rt)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__NS_NEW__RT___JUMP_T__R9_2: {
+		// if (cmp.gt (Ns.new, Rt)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__NS_NEW__RT___JUMP_NT__R9_2: {
+		// if (!cmp.gt (Ns.new, Rt)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__NS_NEW__RT___JUMP_T__R9_2: {
+		// if (!cmp.gt (Ns.new, Rt)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GTU__NS_NEW__RT___JUMP_NT__R9_2: {
+		// if (cmp.gtu (Ns.new, Rt)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GTU__NS_NEW__RT___JUMP_T__R9_2: {
+		// if (cmp.gtu (Ns.new, Rt)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GTU__NS_NEW__RT___JUMP_NT__R9_2: {
+		// if (!cmp.gtu (Ns.new, Rt)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GTU__NS_NEW__RT___JUMP_T__R9_2: {
+		// if (!cmp.gtu (Ns.new, Rt)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__RT__NS_NEW___JUMP_NT__R9_2: {
+		// if (cmp.gt (Rt, Ns.new)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__RT__NS_NEW___JUMP_T__R9_2: {
+		// if (cmp.gt (Rt, Ns.new)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__RT__NS_NEW___JUMP_NT__R9_2: {
+		// if (!cmp.gt (Rt, Ns.new)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__RT__NS_NEW___JUMP_T__R9_2: {
+		// if (!cmp.gt (Rt, Ns.new)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GTU__RT__NS_NEW___JUMP_NT__R9_2: {
+		// if (cmp.gtu (Rt, Ns.new)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GTU__RT__NS_NEW___JUMP_T__R9_2: {
+		// if (cmp.gtu (Rt, Ns.new)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GTU__RT__NS_NEW___JUMP_NT__R9_2: {
+		// if (!cmp.gtu (Rt, Ns.new)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GTU__RT__NS_NEW___JUMP_T__R9_2: {
+		// if (!cmp.gtu (Rt, Ns.new)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_EQ__NS_NEW___U5___JUMP_NT__R9_2: {
+		// if (cmp.eq (Ns.new, #U5)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_EQ__NS_NEW___U5___JUMP_T__R9_2: {
+		// if (cmp.eq (Ns.new, #U5)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_EQ__NS_NEW___U5___JUMP_NT__R9_2: {
+		// if (!cmp.eq (Ns.new, #U5)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_EQ__NS_NEW___U5___JUMP_T__R9_2: {
+		// if (!cmp.eq (Ns.new, #U5)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__NS_NEW___U5___JUMP_NT__R9_2: {
+		// if (cmp.gt (Ns.new, #U5)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__NS_NEW___U5___JUMP_T__R9_2: {
+		// if (cmp.gt (Ns.new, #U5)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__NS_NEW___U5___JUMP_NT__R9_2: {
+		// if (!cmp.gt (Ns.new, #U5)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__NS_NEW___U5___JUMP_T__R9_2: {
+		// if (!cmp.gt (Ns.new, #U5)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GTU__NS_NEW___U5___JUMP_NT__R9_2: {
+		// if (cmp.gtu (Ns.new, #U5)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GTU__NS_NEW___U5___JUMP_T__R9_2: {
+		// if (cmp.gtu (Ns.new, #U5)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GTU__NS_NEW___U5___JUMP_NT__R9_2: {
+		// if (!cmp.gtu (Ns.new, #U5)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GTU__NS_NEW___U5___JUMP_T__R9_2: {
+		// if (!cmp.gtu (Ns.new, #U5)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[2].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__TSTBIT__NS_NEW___0___JUMP_NT__R9_2: {
+		// if (tstbit (Ns.new, #0)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__TSTBIT__NS_NEW___0___JUMP_T__R9_2: {
+		// if (tstbit (Ns.new, #0)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_TSTBIT__NS_NEW___0___JUMP_NT__R9_2: {
+		// if (!tstbit (Ns.new, #0)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_TSTBIT__NS_NEW___0___JUMP_T__R9_2: {
+		// if (!tstbit (Ns.new, #0)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_EQ__NS_NEW____1___JUMP_NT__R9_2: {
+		// if (cmp.eq (Ns.new, #-1)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_EQ__NS_NEW____1___JUMP_T__R9_2: {
+		// if (cmp.eq (Ns.new, #-1)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_EQ__NS_NEW____1___JUMP_NT__R9_2: {
+		// if (!cmp.eq (Ns.new, #-1)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_EQ__NS_NEW____1___JUMP_T__R9_2: {
+		// if (!cmp.eq (Ns.new, #-1)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__NS_NEW____1___JUMP_NT__R9_2: {
+		// if (cmp.gt (Ns.new, #-1)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF__CMP_GT__NS_NEW____1___JUMP_T__R9_2: {
+		// if (cmp.gt (Ns.new, #-1)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__NS_NEW____1___JUMP_NT__R9_2: {
+		// if (!cmp.gt (Ns.new, #-1)) jump:nt #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_IF___NOT_CMP_GT__NS_NEW____1___JUMP_T__R9_2: {
+		// if (!cmp.gt (Ns.new, #-1)) jump:t #r9:2
+		op->type = R_ANAL_OP_TYPE_CJMP;
+		op->jump = hi->ops[1].op.imm;
+		op->fail = op->addr + op->size;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD_____1___DEALLOC_RETURN: {
+		// Rd = #-1 ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD_____1___IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = #-1 ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD_____1___IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = #-1 ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD_____1___IF__P0__DEALLOC_RETURN: {
+		// Rd = #-1 ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD_____1___IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = #-1 ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD____U6___DEALLOC_RETURN: {
+		// Rd = #u6 ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD____U6___IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = #u6 ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD____U6___IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = #u6 ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD____U6___IF__P0__DEALLOC_RETURN: {
+		// Rd = #u6 ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD____U6___IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = #u6 ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___RS___DEALLOC_RETURN: {
+		// Rd = Rs ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___RS___IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = Rs ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___RS___IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = Rs ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___RS___IF__P0__DEALLOC_RETURN: {
+		// Rd = Rs ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___RS___IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = Rs ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS____1____DEALLOC_RETURN: {
+		// Rd = add (Rs, #-1) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = add (Rs, #-1) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = add (Rs, #-1) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0__DEALLOC_RETURN: {
+		// Rd = add (Rs, #-1) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = add (Rs, #-1) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS___1____DEALLOC_RETURN: {
+		// Rd = add (Rs, #1) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = add (Rs, #1) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = add (Rs, #1) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0__DEALLOC_RETURN: {
+		// Rd = add (Rs, #1) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = add (Rs, #1) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__SP___U6_2____DEALLOC_RETURN: {
+		// Rd = add (Sp, #u6:2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = add (Sp, #u6:2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = add (Sp, #u6:2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0__DEALLOC_RETURN: {
+		// Rd = add (Sp, #u6:2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = add (Sp, #u6:2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___1____DEALLOC_RETURN: {
+		// Rd = and (Rs, #1) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = and (Rs, #1) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = and (Rs, #1) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0__DEALLOC_RETURN: {
+		// Rd = and (Rs, #1) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = and (Rs, #1) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___255____DEALLOC_RETURN: {
+		// Rd = and (Rs, #255) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = and (Rs, #255) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = and (Rs, #255) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0__DEALLOC_RETURN: {
+		// Rd = and (Rs, #255) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = and (Rs, #255) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____DEALLOC_RETURN: {
+		// Rd = memb (Rs + #u3:0) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = memb (Rs + #u3:0) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memb (Rs + #u3:0) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0__DEALLOC_RETURN: {
+		// Rd = memb (Rs + #u3:0) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memb (Rs + #u3:0) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____DEALLOC_RETURN: {
+		// Rd = memh (Rs + #u3:1) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = memh (Rs + #u3:1) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memh (Rs + #u3:1) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0__DEALLOC_RETURN: {
+		// Rd = memh (Rs + #u3:1) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memh (Rs + #u3:1) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____DEALLOC_RETURN: {
+		// Rd = memub (Rs + #u4:0) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = memub (Rs + #u4:0) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memub (Rs + #u4:0) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0__DEALLOC_RETURN: {
+		// Rd = memub (Rs + #u4:0) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memub (Rs + #u4:0) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____DEALLOC_RETURN: {
+		// Rd = memuh (Rs + #u3:1) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = memuh (Rs + #u3:1) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memuh (Rs + #u3:1) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0__DEALLOC_RETURN: {
+		// Rd = memuh (Rs + #u3:1) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memuh (Rs + #u3:1) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____DEALLOC_RETURN: {
+		// Rd = memw (Rs + #u4:2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = memw (Rs + #u4:2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memw (Rs + #u4:2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0__DEALLOC_RETURN: {
+		// Rd = memw (Rs + #u4:2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memw (Rs + #u4:2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____DEALLOC_RETURN: {
+		// Rd = memw (Sp + #u5:2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = memw (Sp + #u5:2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memw (Sp + #u5:2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0__DEALLOC_RETURN: {
+		// Rd = memw (Sp + #u5:2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = memw (Sp + #u5:2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTB__RS____DEALLOC_RETURN: {
+		// Rd = sxtb (Rs) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = sxtb (Rs) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = sxtb (Rs) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0__DEALLOC_RETURN: {
+		// Rd = sxtb (Rs) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = sxtb (Rs) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTH__RS____DEALLOC_RETURN: {
+		// Rd = sxth (Rs) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = sxth (Rs) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = sxth (Rs) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0__DEALLOC_RETURN: {
+		// Rd = sxth (Rs) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = sxth (Rs) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ZXTH__RS____DEALLOC_RETURN: {
+		// Rd = zxth (Rs) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rd = zxth (Rs) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = zxth (Rs) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0__DEALLOC_RETURN: {
+		// Rd = zxth (Rs) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rd = zxth (Rs) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0___U2____DEALLOC_RETURN: {
+		// Rdd = combine (#0, #u2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#0, #u2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#0, #u2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#0, #u2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#0, #u2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0__RS____DEALLOC_RETURN: {
+		// Rdd = combine (#0, Rs) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#0, Rs) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#0, Rs) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#0, Rs) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#0, Rs) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___1___U2____DEALLOC_RETURN: {
+		// Rdd = combine (#1, #u2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#1, #u2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#1, #u2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#1, #u2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#1, #u2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___2___U2____DEALLOC_RETURN: {
+		// Rdd = combine (#2, #u2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#2, #u2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#2, #u2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#2, #u2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#2, #u2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___3___U2____DEALLOC_RETURN: {
+		// Rdd = combine (#3, #u2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#3, #u2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#3, #u2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0__DEALLOC_RETURN: {
+		// Rdd = combine (#3, #u2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (#3, #u2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE__RS___0____DEALLOC_RETURN: {
+		// Rdd = combine (Rs, #0) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rdd = combine (Rs, #0) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (Rs, #0) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0__DEALLOC_RETURN: {
+		// Rdd = combine (Rs, #0) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = combine (Rs, #0) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____DEALLOC_RETURN: {
+		// Rdd = memd (Sp + #u5:3) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rdd = memd (Sp + #u5:3) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = memd (Sp + #u5:3) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0__DEALLOC_RETURN: {
+		// Rdd = memd (Sp + #u5:3) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rdd = memd (Sp + #u5:3) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RS__RX____DEALLOC_RETURN: {
+		// Rx = add (Rs, Rx) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rx = add (Rs, Rx) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rx = add (Rs, Rx) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0__DEALLOC_RETURN: {
+		// Rx = add (Rs, Rx) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rx = add (Rs, Rx) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX___S7____DEALLOC_RETURN: {
+		// Rx = add (Rx, #s7) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rx = add (Rx, #s7) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rx = add (Rx, #s7) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0__DEALLOC_RETURN: {
+		// Rx = add (Rx, #s7) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rx = add (Rx, #s7) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX__RS____DEALLOC_RETURN: {
+		// Rx = add (Rx, Rs) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0__DEALLOC_RETURN: {
+		// Rx = add (Rx, Rs) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rx = add (Rx, Rs) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0__DEALLOC_RETURN: {
+		// Rx = add (Rx, Rs) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// Rx = add (Rx, Rs) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0__RD____0___DEALLOC_RETURN: {
+		// if (! p0) Rd = #0 ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0__DEALLOC_RETURN: {
+		// if (! p0) Rd = #0 ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (! p0) Rd = #0 ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0__DEALLOC_RETURN: {
+		// if (! p0) Rd = #0 ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (! p0) Rd = #0 ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___DEALLOC_RETURN: {
+		// if (! p0.new) Rd = #0 ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0__DEALLOC_RETURN: {
+		// if (! p0.new) Rd = #0 ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (! p0.new) Rd = #0 ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0__DEALLOC_RETURN: {
+		// if (! p0.new) Rd = #0 ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (! p0.new) Rd = #0 ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0__RD____0___DEALLOC_RETURN: {
+		// if (p0) Rd = #0 ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0__DEALLOC_RETURN: {
+		// if (p0) Rd = #0 ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (p0) Rd = #0 ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0__DEALLOC_RETURN: {
+		// if (p0) Rd = #0 ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (p0) Rd = #0 ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0_NEW__RD____0___DEALLOC_RETURN: {
+		// if (p0.new) Rd = #0 ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0__DEALLOC_RETURN: {
+		// if (p0.new) Rd = #0 ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (p0.new) Rd = #0 ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0__DEALLOC_RETURN: {
+		// if (p0.new) Rd = #0 ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// if (p0.new) Rd = #0 ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____DEALLOC_RETURN: {
+		// p0 = cmp.eq (Rs, #u2) ; dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0__DEALLOC_RETURN: {
+		// p0 = cmp.eq (Rs, #u2) ; if (! p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT: {
+		// p0 = cmp.eq (Rs, #u2) ; if (! p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0__DEALLOC_RETURN: {
+		// p0 = cmp.eq (Rs, #u2) ; if (p0) dealloc_return
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	case HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0_NEW__DEALLOC_RETURN_NT: {
+		// p0 = cmp.eq (Rs, #u2) ; if (p0.new) dealloc_return:nt
+		op->type = R_ANAL_OP_TYPE_RET;
+		break;
+	}
+	}
+	return op->size;
+}
diff -Nru radare2-2.3.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.h radare2-2.8.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.h
--- radare2-2.3.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/arch/hexagon/hexagon_anal.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2 @@
+int hexagon_anal_instruction(HexInsn *hi, RAnalOp *op);
+
diff -Nru radare2-2.3.0+dfsg/libr/anal/bb.c radare2-2.8.0+dfsg/libr/anal/bb.c
--- radare2-2.3.0+dfsg/libr/anal/bb.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/bb.c	2018-08-07 14:12:36.000000000 +0000
@@ -62,7 +62,11 @@
 		bb->failbb->prev = NULL;
 		bb->failbb = NULL;
 	}
-	R_FREE (bb);
+	if (bb->next) {
+		// avoid double free
+		bb->next->prev = NULL;
+	}
+	R_FREE (bb); // double free
 }
 
 R_API RList *r_anal_bb_list_new() {
@@ -87,7 +91,7 @@
 			eprintf ("Error: new (op)\n");
 			return R_ANAL_RET_ERROR;
 		}
-		if ((oplen = r_anal_op (anal, op, addr + idx, buf + idx, len - idx)) == 0) {
+		if ((oplen = r_anal_op (anal, op, addr + idx, buf + idx, len - idx, R_ANAL_OP_MASK_VAL)) == 0) {
 			r_anal_op_free (op);
 			op = NULL;
 			if (idx == 0) {
@@ -144,7 +148,7 @@
 					ut8 b[8];
 					ut64 ptr = idx+addr+src->delta;
 					anal->iob.read_at (anal->iob.io, ptr, b, memref);
-					r_anal_ref_add (anal, ptr, addr+idx-op->size, 'd');
+					r_anal_xrefs_set (anal, addr+idx-op->size, ptr, R_ANAL_REF_TYPE_DATA);
 				}
 			}
 		}
@@ -217,7 +221,9 @@
 /* return the offset of the i-th instruction in the basicblock bb.
  * If the index of the instruction is not valid, it returns UT16_MAX */
 R_API ut16 r_anal_bb_offset_inst(RAnalBlock *bb, int i) {
-	if (i < 0 || i >= bb->ninstr) return UT16_MAX;
+	if (i < 0 || i >= bb->ninstr) {
+		return UT16_MAX;
+	}
 	return (i > 0 && (i - 1) < bb->op_pos_size) ? bb->op_pos[i - 1] : 0;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/anal/cc.c radare2-2.8.0+dfsg/libr/anal/cc.c
--- radare2-2.3.0+dfsg/libr/anal/cc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/cc.c	2018-08-07 14:12:36.000000000 +0000
@@ -15,18 +15,34 @@
 	if (n < 1) {
 		return 0;
 	}
-	query = sdb_fmt (-1, "cc.%s.arg%d", convention, n);
+	query = sdb_fmt ("cc.%s.arg%d", convention, n);
 	ret = sdb_const_get (DB, query, 0);
 	if (!ret) {
-		query = sdb_fmt (-1, "cc.%s.argn", convention);
+		query = sdb_fmt ("cc.%s.argn", convention);
 		ret = sdb_const_get (DB, query, 0);
 	}
 	return ret;
 
 }
 
+R_API int r_anal_cc_max_arg(RAnal *anal, const char *cc) {
+	int ret = 0;
+	const char *query, *res;
+	if (!anal || !cc) {
+		return 0;
+	}
+	do {
+		query = sdb_fmt ("cc.%s.arg%d", cc, ret + 1);
+		res = sdb_const_get (DB, query, 0);
+		if (res) {
+			ret++;
+		}
+	} while (res && ret < 6);
+	return ret;
+}
+
 R_API const char *r_anal_cc_ret(RAnal *anal, const char *convention) {
-	char *query = sdb_fmt (-1, "cc.%s.ret", convention);
+	char *query = sdb_fmt ("cc.%s.ret", convention);
 	return sdb_const_get (DB, query, 0);
 }
 
@@ -34,7 +50,13 @@
 	return sdb_const_get (DB, "default.cc", 0);
 }
 
+R_API const char *r_anal_cc_func(RAnal *anal, const char *func_name) {
+	const char *query = sdb_fmt ("func.%s.cc", func_name);
+	const char *cc = sdb_const_get (anal->sdb_types, query, 0);
+	return cc ? cc : r_anal_cc_default (anal);
+}
+
 R_API const char *r_anal_cc_to_constant(RAnal *anal, char *convention) {
-	char *query = sdb_fmt (-1, "cc.%s.name", convention);
+	char *query = sdb_fmt ("cc.%s.name", convention);
 	return sdb_const_get (DB, query, 0);
 }
diff -Nru radare2-2.3.0+dfsg/libr/anal/d/Makefile radare2-2.8.0+dfsg/libr/anal/d/Makefile
--- radare2-2.3.0+dfsg/libr/anal/d/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/d/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -12,6 +12,7 @@
 F+= types-arm-ios-16
 F+= types-arm-ios-32
 F+= types-arm-ios-64
+F+= spec
 F+= cc-x86-64
 F+= cc-x86-32
 F+= cc-mips-32
@@ -76,7 +77,7 @@
 CWD=$(shell pwd)
 symstall install-symlink: ${F_SDB}
 	cd ../../.. && mkdir -p "${FCNSIGNPATH}" && \
-	for FILE in $(shell cd libr/anal/d ; ls *.sdb); do \
+	for FILE in $(shell cd $(TOP)/libr/anal/d ; ls *.sdb); do \
 		ln -fs "$(CWD)/$$FILE" "$(FCNSIGNPATH)/$$FILE" ; \
 	done
 
diff -Nru radare2-2.3.0+dfsg/libr/anal/d/meson.build radare2-2.8.0+dfsg/libr/anal/d/meson.build
--- radare2-2.3.0+dfsg/libr/anal/d/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/d/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,40 @@
+sdb_files = [
+  'types',
+  'types-16',
+  'types-32',
+  'types-64',
+  'types-windows',
+  'types-x86-windows-32',
+  'types-x86-windows-64',
+  'types-linux',
+  'types-x86-macos-64',
+  'types-arm-ios-16',
+  'types-arm-ios-32',
+  'types-arm-ios-64',
+  'spec',
+  'cc-x86-64',
+  'cc-x86-32',
+  'cc-mips-32',
+  'cc-m68k-32',
+  'cc-sparc-32',
+  'cc-arm-64',
+  'cc-arm-32',
+  'cc-avr-8',
+  'cc-powerpc-32',
+  'cc-powerpc-64',
+  'cc-xtensa-32',
+  'cc-riscv-64'
+]
+
+foreach file : sdb_files
+  outfile = '@0@.sdb'.format(file)
+  custom_target(outfile,
+    input: '@0@.sdb.txt'.format(file),
+    output: outfile,
+    command: sdb_gen_cmd,
+    depends: sdb_exe,
+    build_by_default: true,
+    install: true,
+    install_dir: join_paths(r2_sdb, 'fcnsign')
+  )
+endforeach
diff -Nru radare2-2.3.0+dfsg/libr/anal/d/spec.sdb.txt radare2-2.8.0+dfsg/libr/anal/d/spec.sdb.txt
--- radare2-2.3.0+dfsg/libr/anal/d/spec.sdb.txt	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/d/spec.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,15 @@
+gcc=spec
+spec.gcc.c=char
+spec.gcc.d=int
+spec.gcc.f=float
+spec.gcc.g=double
+spec.gcc.ld=long int
+spec.gcc.li=long int
+spec.gcc.lf=double
+spec.gcc.lu=unsigned long int
+spec.gcc.llu=unsigned long long int
+spec.gcc.lli=long long int
+spec.gcc.lld=long long int
+spec.gcc.p=void *
+spec.gcc.s=const char *
+spec.gcc.u=unsigned int
diff -Nru radare2-2.3.0+dfsg/libr/anal/d/types-linux.sdb.txt radare2-2.8.0+dfsg/libr/anal/d/types-linux.sdb.txt
--- radare2-2.3.0+dfsg/libr/anal/d/types-linux.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/d/types-linux.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -77,6 +77,35 @@
 func.access.arg.1=int,mode
 func.access.ret=int
 
+prctl=func
+func.prctl.args=5
+func.prctl.arg.0=int,option
+func.prctl.arg.1=unsigned long,v2
+func.prctl.arg.2=unsigned long,v3
+func.prctl.arg.3=unsigned long,v4
+func.prctl.arg.4=unsigned long,v5
+func.prctl.ret=int
+
+waitpid=func
+func.waitpid.args=3
+func.waitpid.arg.0=pid_t,pid
+func.waitpid.arg.1=int *,wstatus
+func.waitpid.arg.2=int,options
+func.waitpid.ret=pid_t
+
+wait=func
+func.wait.args=1
+func.wait.arg.0=int *,wstatus
+func.wait.ret=pid_t
+
+waitid=func
+func.waitid.args=4
+func.waitid.arg.0=idtype_t,idtype
+func.waitid.arg.1=id_t,id
+func.waitid.arg.2=siginfo_t *,infop
+func.waitid.arg.3=int,options
+func.waitid.ret=int
+
 __stack_chk_fail=func
 func.__stack_chk_fail.args=0
 func.__stack_chk_fail.noreturn=true
diff -Nru radare2-2.3.0+dfsg/libr/anal/d/types.sdb.txt radare2-2.8.0+dfsg/libr/anal/d/types.sdb.txt
--- radare2-2.3.0+dfsg/libr/anal/d/types.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/d/types.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -22,6 +22,14 @@
 type.long=x
 type.long.size=64
 
+float=type
+type.float=f
+type.float.size=32
+
+double=type
+type.double=f
+type.double.size=64
+
 long long=type
 type.long long=q
 type.long long.size=64
@@ -72,6 +80,10 @@
 type.uid_t=i
 type.uid_t.size=64
 
+arc4random=func
+func.arc4random.args=0
+func.arc4random.ret=uint32_t
+
 calloc=func
 func.calloc.args=2
 func.calloc.arg.0=size_t,nmeb
@@ -290,14 +302,14 @@
 strtoimax=func
 func.strtoimax.args=3
 func.strtoimax.arg.0=const char *,str
-func.strtoimax.arg.1=char*,*endptr
+func.strtoimax.arg.1=char *,*endptr
 func.strtoimax.arg.2=int,base
 func.strtoimax.ret=intmax_t
 
 strtoumax=func
 func.strtoumax.args=3
 func.strtoumax.arg.0=const char *,str
-func.strtoumax.arg.1=char*,*endptr
+func.strtoumax.arg.1=char *,*endptr
 func.strtoumax.arg.2=int,base
 func.strtoumax.ret=uintmax_t
 
@@ -1460,25 +1472,25 @@
 strtod=func
 func.strtod.args=2
 func.strtod.arg.0=const char *,str
-func.strtod.arg.1=char*,*endptr
+func.strtod.arg.1=char *,*endptr
 func.strtod.ret=double
 
 strtof=func
 func.strtof.args=2
 func.strtof.arg.0=const char *,str
-func.strtof.arg.1=char*,*endptr
+func.strtof.arg.1=char *,*endptr
 func.strtof.ret=float
 
 strtold=func
 func.strtold.args=2
 func.strtold.arg.0=const char *,str
-func.strtold.arg.1=char*,*endptr
-func.strtold.ret=long doubleouble
+func.strtold.arg.1=char *,*endptr
+func.strtold.ret=long double
 
 strtol=func
 func.strtol.args=3
 func.strtol.arg.0=const char *,str
-func.strtol.arg.1=char*,*endptr
+func.strtol.arg.1=char *,*endptr
 func.strtol.arg.2=int,base
 func.strtol.ret=long
 
@@ -1502,49 +1514,24 @@
 func.atoll.arg.0=const char *,str
 func.atoll.ret=long long
 
-strtod=func
-func.strtod.args=2
-func.strtod.arg.0=const char *,str
-func.strtod.arg.1=char*,*endptr
-func.strtod.ret=double
-
-strtof=func
-func.strtof.args=2
-func.strtof.arg.0=const char *,str
-func.strtof.arg.1=char*,*endptr
-func.strtof.ret=float
-
-strtold=func
-func.strtold.args=2
-func.strtold.arg.0=const char *,str
-func.strtold.arg.1=char*,*endptr
-func.strtold.ret=long double
-
-strtol=func
-func.strtol.args=3
-func.strtol.arg.0=const char *,str
-func.strtol.arg.1=char*,*endptr
-func.strtol.arg.2=int,base
-func.strtol.ret=long
-
 strtoll=func
 func.strtoll.args=3
 func.strtoll.arg.0=const char *,str
-func.strtoll.arg.1=char*,*endptr
+func.strtoll.arg.1=char *,*endptr
 func.strtoll.arg.2=int,base
 func.strtoll.ret=long long
 
 strtoul=func
 func.strtoul.args=3
 func.strtoul.arg.0=const char *,str
-func.strtoul.arg.1=char*,*endptr
+func.strtoul.arg.1=char *,*endptr
 func.strtoul.arg.2=int,base
 func.strtoul.ret=long
 
 strtoull=func
 func.strtoull.args=3
 func.strtoull.arg.0=const char *,str
-func.strtoull.arg.1=char*,*endptr
+func.strtoull.arg.1=char *,*endptr
 func.strtoull.arg.2=int,base
 func.strtoull.ret=long long
 
@@ -1582,16 +1569,6 @@
 func.abs.arg.0=int,j
 func.abs.ret=int
 
-abs=func
-func.abs.args=1
-func.abs.arg.0=long,j
-func.abs.ret=long
-
-abs=func
-func.abs.args=1
-func.abs.arg.0=long long,j
-func.abs.ret=long long
-
 labs=func
 func.labs.args=1
 func.labs.arg.0=long,j
@@ -1608,18 +1585,6 @@
 func.div.arg.1=int,denom
 func.div.ret=div_t
 
-div=func
-func.div.args=2
-func.div.arg.0=long,numer
-func.div.arg.1=long,denom
-func.div.ret=ldiv_t
-
-div=func
-func.div.args=2
-func.div.arg.0=long long,numer
-func.div.arg.1=long long,denom
-func.div.ret=lldiv_t
-
 ldiv=func
 func.ldiv.args=2
 func.ldiv.arg.0=long,numer
@@ -1698,14 +1663,14 @@
 func.strcat.args=2
 func.strcat.arg.0=char,*s1
 func.strcat.arg.1=const char *,s2
-func.strcat.ret=char*
+func.strcat.ret=char *
 
 strncat=func
 func.strncat.args=3
 func.strncat.arg.0=char,*s1
 func.strncat.arg.1=const char *,s2
 func.strncat.arg.2=size_t,n
-func.strncat.ret=char*
+func.strncat.ret=char *
 
 memcmp=func
 func.memcmp.args=3
@@ -1732,7 +1697,7 @@
 func.memchr.arg.0=const void,*s
 func.memchr.arg.1=int,c
 func.memchr.arg.2=size_t,n
-func.memchr.ret=const void *
+func.memchr.ret=void *
 
 memchr=func
 func.memchr.args=3
@@ -1745,13 +1710,7 @@
 func.strchr.args=2
 func.strchr.arg.0=const char *,s
 func.strchr.arg.1=int,c
-func.strchr.ret=const char*
-
-strchr=func
-func.strchr.args=2
-func.strchr.arg.0=char,*s
-func.strchr.arg.1=int,c
-func.strchr.ret=char*
+func.strchr.ret=char *
 
 strcspn=func
 func.strcspn.args=2
@@ -1763,25 +1722,13 @@
 func.strpbrk.args=2
 func.strpbrk.arg.0=const char *,s1
 func.strpbrk.arg.1=const char *,s2
-func.strpbrk.ret=const char*
-
-strpbrk=func
-func.strpbrk.args=2
-func.strpbrk.arg.0=char,*s1
-func.strpbrk.arg.1=const char *,s2
-func.strpbrk.ret=char*
+func.strpbrk.ret=char *
 
 strrchr=func
 func.strrchr.args=2
 func.strrchr.arg.0=const char *,s
 func.strrchr.arg.1=int,c
-func.strrchr.ret=const char*
-
-strrchr=func
-func.strrchr.args=2
-func.strrchr.arg.0=char,*s
-func.strrchr.arg.1=int,c
-func.strrchr.ret=char*
+func.strrchr.ret=char *
 
 strspn=func
 func.strspn.args=2
@@ -1793,19 +1740,13 @@
 func.strstr.args=2
 func.strstr.arg.0=const char *,s1
 func.strstr.arg.1=const char *,s2
-func.strstr.ret=const char*
-
-strstr=func
-func.strstr.args=2
-func.strstr.arg.0=char,*s1
-func.strstr.arg.1=const char *,s2
-func.strstr.ret=char*
+func.strstr.ret=char *
 
 strtok=func
 func.strtok.args=2
 func.strtok.arg.0=char,*s1
 func.strtok.arg.1=const char *,s2
-func.strtok.ret=char*
+func.strtok.ret=char *
 
 memset=func
 func.memset.args=3
@@ -1817,7 +1758,7 @@
 strerror=func
 func.strerror.args=1
 func.strerror.arg.0=int,errnum
-func.strerror.ret=char*
+func.strerror.ret=char *
 
 strlen=func
 func.strlen.args=1
@@ -1864,12 +1805,12 @@
 asctime=func
 func.asctime.args=1
 func.asctime.arg.0=const tm,*timeptr
-func.asctime.ret=char*
+func.asctime.ret=char *
 
 ctime=func
 func.ctime.args=1
 func.ctime.arg.0=const time_t,*timer
-func.ctime.ret=char*
+func.ctime.ret=char *
 
 gmtime=func
 func.gmtime.args=1
@@ -2281,7 +2222,7 @@
 mbsrtowcs=func
 func.mbsrtowcs.args=4
 func.mbsrtowcs.arg.0=wchar_t,*dst
-func.mbsrtowcs.arg.1=const char*,*src
+func.mbsrtowcs.arg.1=const char *,*src
 func.mbsrtowcs.arg.2=size_t,len
 func.mbsrtowcs.arg.3=mbstate_t,*ps
 func.mbsrtowcs.ret=size_t
@@ -2393,8 +2334,8 @@
 
 rename=func
 func.rename.args=2
-func.rename.arg.0=const char *,old
-func.rename.arg.1=,const char*
+func.rename.arg.0=const char *,oldpath
+func.rename.arg.1=const char *,newpath
 func.rename.ret=int
 
 tmpfile=func
@@ -2404,7 +2345,7 @@
 tmpnam=func
 func.tmpnam.args=1
 func.tmpnam.arg.0=char,*s
-func.tmpnam.ret=char*
+func.tmpnam.ret=char *
 
 fflush=func
 func.fflush.args=1
@@ -2414,26 +2355,26 @@
 fopen=func
 func.fopen.args=2
 func.fopen.arg.0=const char *,filename
-func.fopen.arg.1=,const char*
+func.fopen.arg.1=const char *,mode
 func.fopen.ret=file*
 
 freopen=func
 func.freopen.args=3
 func.freopen.arg.0=const char *,filename
-func.freopen.arg.1=,const char
-func.freopen.arg.2=FILE,*
+func.freopen.arg.1=const char *,mode
+func.freopen.arg.2=FILE,*stream
 func.freopen.ret=file*
 
 setbuf=func
 func.setbuf.args=2
 func.setbuf.arg.0=FILE,*stream
-func.setbuf.arg.1=,char*
+func.setbuf.arg.1=char *,buf
 func.setbuf.ret=void
 
 setvbuf=func
 func.setvbuf.args=4
 func.setvbuf.arg.0=FILE*,stream
-func.setvbuf.arg.1=char*,buf
+func.setvbuf.arg.1=char *,buf
 func.setvbuf.arg.2=int,mode
 func.setvbuf.arg.3=size_t,size
 func.setvbuf.ret=int
@@ -2448,7 +2389,7 @@
 fscanf=func
 func.fscanf.args=3
 func.fscanf.arg.0=FILE,*stream
-func.fscanf.arg.1=,const char
+func.fscanf.arg.1=const char *,format
 func.fscanf.arg.2=,...
 func.fscanf.ret=int
 
@@ -2476,15 +2417,15 @@
 snprintf=func
 func.snprintf.args=4
 func.snprintf.arg.0=char,*s
-func.snprintf.arg.1=,size_t
-func.snprintf.arg.2=,const char*
+func.snprintf.arg.1=size_t,size
+func.snprintf.arg.2=const char *,format
 func.snprintf.arg.3=,...
 func.snprintf.ret=int
 
 sprintf=func
 func.sprintf.args=3
 func.sprintf.arg.0=char,*s
-func.sprintf.arg.1=,const char*
+func.sprintf.arg.1=const char *,format
 func.sprintf.arg.2=,...
 func.sprintf.ret=int
 
@@ -2498,72 +2439,72 @@
 vfprintf=func
 func.vfprintf.args=3
 func.vfprintf.arg.0=FILE,*stream
-func.vfprintf.arg.1=,const char*
-func.vfprintf.arg.2=,va_list
+func.vfprintf.arg.1=const char *,format
+func.vfprintf.arg.2=va_list,ap
 func.vfprintf.ret=int
 
 vfscanf=func
 func.vfscanf.args=3
 func.vfscanf.arg.0=FILE,*stream
-func.vfscanf.arg.1=,const char*
-func.vfscanf.arg.2=,va_list
+func.vfscanf.arg.1=const char *,format
+func.vfscanf.arg.2=va_list,ap
 func.vfscanf.ret=int
 
 vprintf=func
 func.vprintf.args=2
 func.vprintf.arg.0=const char *,format
-func.vprintf.arg.1=,va_list
+func.vprintf.arg.1=va_list,ap
 func.vprintf.ret=int
 
 vscanf=func
 func.vscanf.args=2
 func.vscanf.arg.0=const char *,format
-func.vscanf.arg.1=,va_list
+func.vscanf.arg.1=va_list,ap
 func.vscanf.ret=int
 
 vsnprintf=func
 func.vsnprintf.args=4
 func.vsnprintf.arg.0=char,*s
-func.vsnprintf.arg.1=,size_t
-func.vsnprintf.arg.2=,const char*
+func.vsnprintf.arg.1=size_t,size
+func.vsnprintf.arg.2=const char *,format
 func.vsnprintf.arg.3=va_list,arg
 func.vsnprintf.ret=int
 
 vsprintf=func
 func.vsprintf.args=3
 func.vsprintf.arg.0=char,*s
-func.vsprintf.arg.1=,const char*
-func.vsprintf.arg.2=,va_list
+func.vsprintf.arg.1=const char *,format
+func.vsprintf.arg.2=va_list,arg
 func.vsprintf.ret=int
 
 vsscanf=func
 func.vsscanf.args=3
 func.vsscanf.arg.0=const char *,s
-func.vsscanf.arg.1=,const char*
-func.vsscanf.arg.2=,va_list
+func.vsscanf.arg.1=const char *,format
+func.vsscanf.arg.2=va_list,arg
 func.vsscanf.ret=int
 
 fputc=func
 func.fputc.args=2
 func.fputc.arg.0=int,c
-func.fputc.arg.1=,FILE*
+func.fputc.arg.1=FILE,*stream
 func.fputc.ret=int
 
 fputs=func
 func.fputs.args=2
 func.fputs.arg.0=const char *,s
-func.fputs.arg.1=,FILE*
+func.fputs.arg.1=FILE,*stream
 func.fputs.ret=int
 
 gets=func
 func.gets.args=1
 func.gets.arg.0=char,*s
-func.gets.ret=char*
+func.gets.ret=char *
 
 putc=func
 func.putc.args=2
 func.putc.arg.0=int,c
-func.putc.arg.1=,FILE*
+func.putc.arg.1=FILE,*stream
 func.putc.ret=int
 
 putchar=func
@@ -2579,28 +2520,28 @@
 fread=func
 func.fread.args=4
 func.fread.arg.0=void,*ptr
-func.fread.arg.1=,size_t
-func.fread.arg.2=,size_t
+func.fread.arg.1=size_t,size
+func.fread.arg.2=size_t,nmemb
 func.fread.arg.3=FILE,*stream
 func.fread.ret=size_t
 
 fgetpos=func
 func.fgetpos.args=2
 func.fgetpos.arg.0=FILE,*stream
-func.fgetpos.arg.1=,fpos_t*
+func.fgetpos.arg.1=fpos_t*,pos
 func.fgetpos.ret=int
 
 fseek=func
 func.fseek.args=3
 func.fseek.arg.0=FILE,*stream
-func.fseek.arg.1=,long
-func.fseek.arg.2=,int
+func.fseek.arg.1=long,offset
+func.fseek.arg.2=int,whence
 func.fseek.ret=int
 
 fsetpos=func
 func.fsetpos.args=2
 func.fsetpos.arg.0=FILE,*stream
-func.fsetpos.arg.1=,const fpos_t*
+func.fsetpos.arg.1=const fpos_t*,pos
 func.fsetpos.ret=int
 
 ftell=func
diff -Nru radare2-2.3.0+dfsg/libr/anal/d/types-windows.sdb.txt radare2-2.8.0+dfsg/libr/anal/d/types-windows.sdb.txt
--- radare2-2.3.0+dfsg/libr/anal/d/types-windows.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/d/types-windows.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1552,7 +1552,8 @@
 func.GetFileAttributesA.ret=fileflagsandattributes
 
 GetFileAttributesW=func
-func.GetFileAttributesW.args=0
+func.GetFileAttributesW.args=1
+func.GetFileAttributesW.arg.0=LPCWSTR,lpFileName
 func.GetFileAttributesW.ret=fileflagsandattributes
 
 GetFileAttributesExA=func
diff -Nru radare2-2.3.0+dfsg/libr/anal/data.c radare2-2.8.0+dfsg/libr/anal/data.c
--- radare2-2.3.0+dfsg/libr/anal/data.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/data.c	2018-08-07 14:12:36.000000000 +0000
@@ -89,7 +89,7 @@
 // TODO: add is_flag, is comment?
 
 // XXX: optimize by removing all strlens here
-R_API char *r_anal_data_to_string(RAnalData *d, RConsPalette *pal) {
+R_API char *r_anal_data_to_string(RAnalData *d, RConsPrintablePalette *pal) {
 	int i, len, idx, mallocsz = 1024;
 	ut32 n32;
 	char *line;
diff -Nru radare2-2.3.0+dfsg/libr/anal/diff.c radare2-2.8.0+dfsg/libr/anal/diff.c
--- radare2-2.3.0+dfsg/libr/anal/diff.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/diff.c	2018-08-07 14:12:36.000000000 +0000
@@ -70,7 +70,7 @@
 				return false;
 			}
 			while (idx < bb->size) {
-				if ((oplen = r_anal_op (anal, op, 0, buf+idx, bb->size-idx)) < 1) {
+				if ((oplen = r_anal_op (anal, op, 0, buf+idx, bb->size-idx, R_ANAL_OP_MASK_BASIC)) < 1) {
 					break;
 				}
 				if (op->nopcode != 0) {
@@ -239,10 +239,16 @@
 				maxsize = fcn2_size;
 				minsize = fcn_size;
 			}
-			if ((fcn2->type != R_ANAL_FCN_TYPE_FCN
-				&& fcn2->type != R_ANAL_FCN_TYPE_SYM) ||
-				fcn2->diff->type != R_ANAL_DIFF_TYPE_NULL ||
-				(maxsize * anal->diff_thfcn > minsize)) {
+			if (maxsize * anal->diff_thfcn > minsize) {
+				eprintf ("Exceeded anal threshold while diffing %s and %s\n", fcn->name, fcn2->name);
+				continue;
+			}
+			if (fcn2->diff->type != R_ANAL_DIFF_TYPE_NULL) {
+				eprintf ("Function %s already diffed\n", fcn2->name);
+				continue;
+			}
+			if ((fcn2->type != R_ANAL_FCN_TYPE_FCN && fcn2->type != R_ANAL_FCN_TYPE_SYM)) {
+				eprintf ("Function %s type not supported\n", fcn2->name);
 				continue;
 			}
 			r_diff_buffers_distance (NULL, fcn->fingerprint, fcn_size, fcn2->fingerprint, fcn2_size, NULL, &t);
diff -Nru radare2-2.3.0+dfsg/libr/anal/esil.c radare2-2.8.0+dfsg/libr/anal/esil.c
--- radare2-2.3.0+dfsg/libr/anal/esil.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/esil.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2014-2017 - pancake, condret */
+/* radare - LGPL - Copyright 2014-2018 - pancake, condret */
 
 #include <r_anal.h>
 #include <r_types.h>
@@ -27,8 +27,11 @@
 
 /* Returns the number that has bits + 1 least significant bits set. */
 static inline ut64 genmask(int bits) {
-	ut64 m = (ut64)(((ut64)(2) << bits) - 1);
-	if (!m) m = UT64_MAX;
+	ut64 m = UT64_MAX;
+	if (bits < 64) {
+		m = (ut64)(((ut64)(2) << bits) - 1);
+		if (!m) m = UT64_MAX;
+	}
 	return m;
 }
 
@@ -75,7 +78,7 @@
 
 /* R_ANAL_ESIL API */
 
-R_API RAnalEsil *r_anal_esil_new(int stacksize, int iotrap) {
+R_API RAnalEsil *r_anal_esil_new(int stacksize, int iotrap, unsigned int addrsize) {
 	RAnalEsil *esil = R_NEW0 (RAnalEsil);
 	if (!esil) {
 		return NULL;
@@ -95,16 +98,16 @@
 	esil->iotrap = iotrap;
 	esil->interrupts = sdb_new0 ();
 	esil->sessions = r_list_newf (r_anal_esil_session_free);
+	esil->addrmask = genmask (addrsize - 1);
 	return esil;
 }
 
 R_API int r_anal_esil_set_op(RAnalEsil *esil, const char *op, RAnalEsilOp code) {
 	char t[128];
-	char *h;
 	if (!code || !op || !strlen (op) || !esil || !esil->ops) {
 		return false;
 	}
-	h = sdb_itoa (sdb_hash (op), t, 16);
+	char *h = sdb_itoa (sdb_hash (op), t, 16);
 	sdb_num_set (esil->ops, h, (ut64)(size_t)code, 0);
 	if (!sdb_num_exists (esil->ops, h)) {
 		eprintf ("can't set esil-op %s\n", op);
@@ -229,10 +232,8 @@
 
 static bool alignCheck(RAnalEsil *esil, ut64 addr) {
 	int dataAlign = r_anal_archinfo (esil->anal, R_ANAL_ARCHINFO_DATA_ALIGN);
-	if (dataAlign > 0) {
-		if (addr % dataAlign) {
-			return false;
-		}
+	if (dataAlign > 0 && addr % dataAlign) {
+		return false;
 	}
 	return true;
 }
@@ -241,6 +242,7 @@
 	if (!esil || !esil->anal || !esil->anal->iob.io) {
 		return 0;
 	}
+	addr &= esil->addrmask;
 	if (!alignCheck (esil, addr)) {
 		esil->trap = R_ANAL_TRAP_READ_ERR;
 		esil->trap_code = addr;
@@ -273,6 +275,7 @@
 	if (!esil || !esil->anal || !esil->anal->iob.io || !addr) {
 		return 0;
 	}
+	addr &= esil->addrmask;
 	if (!alignCheck (esil, addr)) {
 		esil->trap = R_ANAL_TRAP_READ_ERR;
 		esil->trap_code = addr;
@@ -296,6 +299,7 @@
 	if (!buf || !esil) {
 		return 0;
 	}
+	addr &= esil->addrmask;
 	if (esil->cb.hook_mem_read) {
 		ret = esil->cb.hook_mem_read (esil, addr, buf, len);
 	}
@@ -328,6 +332,7 @@
 	if (!esil || !esil->anal || !esil->anal->iob.io || esil->nowrite) {
 		return 0;
 	}
+	addr &= esil->addrmask;
 	if (!alignCheck (esil, addr)) {
 		esil->trap = R_ANAL_TRAP_READ_ERR;
 		esil->trap_code = addr;
@@ -365,6 +370,7 @@
 	if (esil->nowrite) {
 		return 0;
 	}
+	addr &= esil->addrmask;
 	if (esil->anal->iob.write_at (esil->anal->iob.io, addr, buf, len)) {
 		ret = len;
 	}
@@ -384,6 +390,7 @@
 	if (!buf || !esil) {
 		return 0;
 	}
+	addr &= esil->addrmask;
 	IFDBG {
 		eprintf ("0x%08" PFMT64x " <W ", addr);
 		for (i = 0; i < len; i++) {
@@ -2886,6 +2893,7 @@
 	if (!esil || !str || !*str) {
 		return 0;
 	}
+	const char *hashbang = strstr (str, "#!");
 	esil->trap = 0;
 	if (esil->cmd && esil->cmd_todo) {
 		if (!strncmp (str, "TODO", 4)) {
@@ -2897,15 +2905,17 @@
 	esil->skip = 0;
 	esil->parse_goto = -1;
 	esil->parse_stop = 0;
-	if (esil->anal) {
-		esil->parse_goto_count = esil->anal->esil_goto_limit;
-	} else {
-		esil->parse_goto_count = R_ANAL_ESIL_GOTO_LIMIT;
-	}
+	esil->parse_goto_count = esil->anal? esil->anal->esil_goto_limit: R_ANAL_ESIL_GOTO_LIMIT;
 	str = ostr;
 repeat:
 	wordi = 0;
 	while (*str) {
+		if (str == hashbang) {
+			if (esil->anal && esil->anal->coreb.setab) {
+				esil->anal->coreb.cmd (esil->anal->coreb.core, str + 2);
+			}
+			break;
+		}
 		if (wordi > 62) {
 			ERR ("Invalid esil string");
 			return -1;
diff -Nru radare2-2.3.0+dfsg/libr/anal/esil_trace.c radare2-2.8.0+dfsg/libr/anal/esil_trace.c
--- radare2-2.3.0+dfsg/libr/anal/esil_trace.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/esil_trace.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,11 +1,11 @@
-/* radare - LGPL - Copyright 2015 - pancake */
+/* radare - LGPL - Copyright 2015-2018 - pancake */
 
 #include <r_anal.h>
 
 #define DB esil->db_trace
-#define KEY(x) sdb_fmt (0, "%d."x, esil->trace_idx)
-#define KEYAT(x,y) sdb_fmt (0, "%d."x".0x%"PFMT64x, esil->trace_idx, y)
-#define KEYREG(x,y) sdb_fmt (0, "%d."x".%s", esil->trace_idx, y)
+#define KEY(x) sdb_fmt ("%d."x, esil->trace_idx)
+#define KEYAT(x,y) sdb_fmt ("%d."x".0x%"PFMT64x, esil->trace_idx, y)
+#define KEYREG(x,y) sdb_fmt ("%d."x".%s", esil->trace_idx, y)
 
 static int ocbs_set = false;
 static RAnalEsilCallbacks ocbs = {0};
diff -Nru radare2-2.3.0+dfsg/libr/anal/fcn.c radare2-2.8.0+dfsg/libr/anal/fcn.c
--- radare2-2.3.0+dfsg/libr/anal/fcn.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/fcn.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2017 - nibble, alvaro, pancake */
+/* radare - LGPL - Copyright 2010-2018 - nibble, alvaro, pancake */
 
 #include <r_anal.h>
 #include <r_util.h>
@@ -11,6 +11,9 @@
 #define SDB_KEY_BB "bb.0x%"PFMT64x ".0x%"PFMT64x
 // XXX must be configurable by the user
 #define FCN_DEPTH 512
+#define JMPTBLSZ 512
+#define JMPTBL_LEA_SEARCH_SZ 64
+#define JMPTBL_MAXFCNSIZE 4096
 
 /* speedup analysis by removing some function overlapping checks */
 #define JAYRO_04 0
@@ -28,9 +31,6 @@
 // 256KB max function size
 #define MAX_FCN_SIZE (1024 * 256)
 
-#define MAX_JMPTBL_SIZE 1000
-#define MAX_JMPTBL_JMP 10000
-
 #define DB a->sdb_fcns
 #define EXISTS(x, ...) snprintf (key, sizeof (key) - 1, x, ## __VA_ARGS__), sdb_exists (DB, key)
 #define SETKEY(x, ...) snprintf (key, sizeof (key) - 1, x, ## __VA_ARGS__);
@@ -151,6 +151,57 @@
 	r_rbtree_aug_insert (root, fcn, &(fcn->rb), _fcn_tree_cmp_addr, _fcn_tree_calc_max_addr);
 }
 
+static void _fcn_tree_update_size(RBNode *root, RAnalFunction *fcn) {
+	r_rbtree_aug_update_sum (root, fcn, &(fcn->rb), _fcn_tree_cmp_addr, _fcn_tree_calc_max_addr);
+}
+
+#if 0
+static void _fcn_tree_print_dot_node(RBNode *n) {
+	int i;
+	RAnalFunction *fcn = FCN_CONTAINER (n);
+
+	ut64 max_addr = fcn->addr + (fcn->_size == 0 ? 0 : fcn->_size - 1);
+	for (i = 0; i < 2; i++) {
+		if (n->child[i]) {
+			RAnalFunction *fcn1 = FCN_CONTAINER (n->child[i]);
+			if (fcn1->rb_max_addr > max_addr) {
+				max_addr = fcn1->rb_max_addr;
+			}
+		}
+	}
+
+	bool valid = max_addr == fcn->rb_max_addr;
+
+	r_cons_printf ("  \"%p\" [label=\"%p\\naddr: 0x%08"PFMT64x"\\nmax_addr: 0x%08"PFMT64x"\"%s];\n",
+				   n, fcn, fcn->addr, fcn->rb_max_addr, valid ? "" : ", color=\"red\", fillcolor=\"white\"");
+
+	for (i=0; i<2; i++) {
+		if (n->child[i]) {
+			_fcn_tree_print_dot_node (n->child[i]);
+			bool valid = true;
+			if (n->child[i]) {
+				RAnalFunction *childfcn = FCN_CONTAINER (n->child[i]);
+				if ((i == 0 && childfcn->addr >= fcn->addr) || (i == 1 && childfcn->addr <= fcn->addr)) {
+					valid = false;
+				}
+			}
+			r_cons_printf ("  \"%p\" -> \"%p\" [label=\"%d\"%s];\n", n, n->child[i], i, valid ? "" : ", style=\"bold\", color=\"red\"");
+		} else {
+			r_cons_printf ("  \"null_%p_%d\" [shape=point];\n", n, i);
+			r_cons_printf ("  \"%p\" -> \"null_%p_%d\" [label=\"%d\"];\n", n, n, i, i);
+		}
+	}
+}
+
+static void _fcn_tree_print_dot(RBNode *n) {
+	r_cons_print ("digraph fcn_tree {\n");
+	if (n) {
+		_fcn_tree_print_dot_node (n);
+	}
+	r_cons_print ("}\n");
+}
+#endif
+
 // Find RAnalFunction whose addr is equal to addr
 static RAnalFunction *_fcn_tree_find_addr(RBNode *x_, ut64 addr) {
 	while (x_) {
@@ -200,14 +251,14 @@
 	}
 }
 
-R_API int r_anal_fcn_resize(RAnalFunction *fcn, int newsize) {
+R_API int r_anal_fcn_resize(const RAnal *anal, RAnalFunction *fcn, int newsize) {
 	ut64 eof; /* end of function */
 	RAnalBlock *bb;
 	RListIter *iter, *iter2;
 	if (!fcn || newsize < 1) {
 		return false;
 	}
-	r_anal_fcn_set_size (fcn, newsize);
+	r_anal_fcn_set_size (anal, fcn, newsize);
 	eof = fcn->addr + r_anal_fcn_size (fcn);
 	r_list_foreach_safe (fcn->bbs, iter, iter2, bb) {
 		if (bb->addr >= eof) {
@@ -243,10 +294,6 @@
 	fcn->cc = NULL;
 	/* Function attributes: weak/noreturn/format/etc */
 	fcn->addr = UT64_MAX;
-#if FCN_OLD
-	fcn->refs = r_anal_ref_list_new ();
-	fcn->xrefs = r_anal_ref_list_new ();
-#endif
 	fcn->fcn_locs = NULL;
 	fcn->bbs = r_anal_bb_list_new ();
 	fcn->fingerprint = NULL;
@@ -273,10 +320,6 @@
 	free (fcn->name);
 	free (fcn->attr);
 	r_tinyrange_fini (&fcn->bbr);
-#if FCN_OLD
-	r_list_free (fcn->refs);
-	r_list_free (fcn->xrefs);
-#endif
 	// all functions are freed in anal->fcns
 	fcn->fcn_locs = NULL;
 	if (fcn->bbs) {
@@ -290,6 +333,7 @@
 	free (fcn);
 }
 
+#if 0
 static bool refExists(RList *refs, RAnalRef *ref) {
 	RAnalRef *r;
 	RListIter *iter;
@@ -301,64 +345,7 @@
 	}
 	return false;
 }
-
-R_API int r_anal_fcn_xref_add(RAnal *a, RAnalFunction *fcn, ut64 at, ut64 addr, int type) {
-	RAnalRef *ref;
-	if (!fcn || !a) {
-		return false;
-	}
-	if (!a->iob.is_valid_offset (a->iob.io, addr, 0)) {
-		return false;
-	}
-	ref = r_anal_ref_new ();
-	if (!ref) {
-		return false;
-	}
-	// set global reference
-// r_cons_printf ("C 0x%llx  0x%llx\n", at, addr);
-	r_anal_xrefs_set (a, type, at, addr);
-	// set per-function reference
-#if FCN_OLD
-// TOO OLD we shouldnt be storing this.. or we do?
-	ref->at = at; // from
-	ref->addr = addr; // to
-	ref->type = type;
-	// TODO: ensure we are not dupping xrefs
-	if (refExists (fcn->refs, ref)) {
-		r_anal_ref_free (ref);
-	} else {
-		r_list_append (fcn->refs, ref);
-	}
-#endif
-#if FCN_SDB
-	sdb_add (DB, sdb_fmt (0, "fcn.0x%08"PFMT64x ".name", fcn->addr), fcn->name, 0);
-	// encode the name in base64 ?
-	sdb_num_add (DB, sdb_fmt (0, "fcn.name.%s", fcn->name), fcn->addr, 0);
-	sdb_array_add_num (DB, sdb_fmt (0, "fcn.0x%08"PFMT64x ".xrefs", fcn->addr), at, 0);
-#endif
-	return true;
-}
-
-R_API int r_anal_fcn_xref_del(RAnal *a, RAnalFunction *fcn, ut64 at, ut64 addr, int type) {
-#if FCN_OLD
-	RAnalRef *ref;
-	RListIter *iter;
-	/* No need for _safe loop coz we return immediately after the delete. */
-	r_list_foreach (fcn->xrefs, iter, ref) {
-		if ((type != -1 || type == ref->type) &&
-		(at == 0LL || at == ref->at) &&
-		(addr == 0LL || addr == ref->addr)) {
-			r_list_delete (fcn->xrefs, iter);
-			return true;
-		}
-	}
 #endif
-#if FCN_SDB
-	// TODO
-	// sdb_array_delete_num (DB, key, at, 0);
-#endif
-	return false;
-}
 
 static RAnalBlock *bbget(RAnalFunction *fcn, ut64 addr) {
 	RListIter *iter;
@@ -394,57 +381,56 @@
 
 #define FITFCNSZ() {\
 		st64 n = bb->addr + bb->size - fcn->addr;\
-		if (n >= 0 && r_anal_fcn_size (fcn) < n) { r_anal_fcn_set_size (fcn, n); } }\
+		if (n >= 0 && r_anal_fcn_size (fcn) < n) { r_anal_fcn_set_size (NULL, fcn, n); } }\
 	if (r_anal_fcn_size (fcn) > MAX_FCN_SIZE) {\
 		/* eprintf ("Function too big at 0x%"PFMT64x" + %d\n", bb->addr, fcn->size); */\
-		r_anal_fcn_set_size (fcn, 0);\
+		r_anal_fcn_set_size (NULL, fcn, 0);\
 		return R_ANAL_RET_ERROR; }
 
-// ETOOSLOW
-static char *get_varname(RAnal *a, RAnalFunction *fcn, char type, const char *pfx, int idx) {
-	char *varname = r_str_newf ("%s_%xh", pfx, idx);
-	int i = 2;
-	while (1) {
-		RAnalVar *v = r_anal_var_get_byname (a, fcn, varname);
-		if (!v) {
-			v = r_anal_var_get_byname (a, fcn, varname);
-		}
-		if (!v) {
-			v = r_anal_var_get_byname (a, fcn, varname);
-		}
-		if (!v) {
-			break;
-		}
-		if (v->kind == type && R_ABS (v->delta) == idx) {
-			r_anal_var_free (v);
-			break;
-		}
-		r_anal_var_free (v);
-		free (varname);
-		varname = r_str_newf ("%s_%xh_%d", pfx, idx, i);
-		i++;
-	}
-	return varname;
-}
-
 static int fcn_recurse(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut8 *buf, ut64 len, int depth);
 #define recurseAt(x) {\
 		ut8 *bbuf = malloc (MAXBBSIZE);\
-		anal->iob.read_at (anal->iob.io, x, bbuf, MAXBBSIZE);\
-		ret = fcn_recurse (anal, fcn, x, bbuf, MAXBBSIZE, depth - 1);\
-		r_anal_fcn_update_tinyrange_bbs (fcn);\
-		free (bbuf);\
+		if (bbuf) {\
+			anal->iob.read_at (anal->iob.io, x, bbuf, MAXBBSIZE);\
+			ret = fcn_recurse (anal, fcn, x, bbuf, MAXBBSIZE, depth - 1);\
+			r_anal_fcn_update_tinyrange_bbs (fcn);\
+			free (bbuf);\
+		}\
+}
+
+static void queue_case(RAnal *anal, ut64 switch_addr, ut64 case_addr, ut64 id, ut64 case_addr_loc) {
+	// eprintf("\tqueue_case: 0x%"PFMT64x " from 0x%"PFMT64x "\n", case_addr, case_addr_loc);
+	anal->cmdtail = r_str_appendf (anal->cmdtail,
+		"axc 0x%"PFMT64x " 0x%"PFMT64x "\n",
+		case_addr, switch_addr);
+	anal->cmdtail = r_str_appendf (anal->cmdtail,
+		"afbe 0x%"PFMT64x " 0x%"PFMT64x "\n",
+		switch_addr, case_addr);
+	// anal->cmdtail = r_str_appendf (anal->cmdtail,
+	// 	"aho case %d: from 0x%"PFMT64x " @ 0x%"PFMT64x "\n",
+	// 	id, switch_addr, case_addr_loc);
+	// anal->cmdtail = r_str_appendf (anal->cmdtail,
+	// 	"CCu case %d: @ 0x%"PFMT64x "\n",
+	// 	id, case_addr);
+	anal->cmdtail = r_str_appendf (anal->cmdtail,
+		"f case.0x%"PFMT64x ".%d 1 @ 0x%08"PFMT64x "\n",
+		switch_addr, id, case_addr);
 }
 
-static int try_walkthrough_jmptbl(RAnal *anal, RAnalFunction *fcn, int depth, ut64 ip, ut64 ptr, int ret0) {
+static int try_walkthrough_jmptbl(RAnal *anal, RAnalFunction *fcn, int depth, ut64 ip, ut64 jmptbl_loc, ut64 jmptbl_off, ut64 sz, ut64 jmptbl_size, ut64 default_case, int ret0) {
 	int ret = ret0;
-	ut8 *jmptbl = malloc (MAX_JMPTBL_SIZE);
-	ut64 jmpptr, offs, sz = anal->bits >> 3;
+	// jmptbl_size can not always be determined
+	if (jmptbl_size == 0) {
+		jmptbl_size = JMPTBLSZ;
+	}
+	ut64 jmpptr, offs;
+	ut8 *jmptbl = malloc (jmptbl_size * sz);
 	if (!jmptbl) {
 		return 0;
 	}
-	anal->iob.read_at (anal->iob.io, ptr, jmptbl, MAX_JMPTBL_SIZE);
-	for (offs = 0; offs + sz - 1 < MAX_JMPTBL_SIZE; offs += sz) {
+	// eprintf ("JMPTBL AT 0x%"PFMT64x"\n", jmptbl_loc);
+	anal->iob.read_at (anal->iob.io, jmptbl_loc, jmptbl, jmptbl_size * sz);
+	for (offs = 0; offs + sz - 1 < jmptbl_size * sz; offs += sz) {
 		switch (sz) {
 		case 1:
 			jmpptr = r_read_le8 (jmptbl + offs);
@@ -462,8 +448,17 @@
 			jmpptr = r_read_le64 (jmptbl + offs);
 			break;
 		}
+		// eprintf ("WALKING %llx\n", jmpptr);
+		// if we don't check for 0 here, the next check with ptr+jmpptr
+		// will obviously be a good offset since it will be the start
+		// of the table, which is not what we want
+		if (jmpptr == 0) {
+			break;
+		}
+
 		if (!anal->iob.is_valid_offset (anal->iob.io, jmpptr, 0)) {
-			jmpptr = ptr + (st32) jmpptr;
+			// jump tables where sign extended movs are used
+			jmpptr = jmptbl_off + (st32) jmpptr;
 			if (!anal->iob.is_valid_offset (anal->iob.io, jmpptr, 0)) {
 				break;
 			}
@@ -473,13 +468,29 @@
 				break;
 			}
 		}
-		// if (jmpptr < ip - MAX_JMPTBL_JMP || jmpptr > ip + MAX_JMPTBL_JMP) { break; }
+		queue_case (anal, ip, jmpptr, offs/sz, jmptbl_loc + offs);
 		recurseAt (jmpptr);
 	}
+
+	if (offs > 0) {
+		// eprintf("\n\nSwitch statement at 0x%llx:\n", ip);
+		anal->cmdtail = r_str_appendf (anal->cmdtail,
+			"CCu switch table (%d cases) at 0x%"PFMT64x " @ 0x%"PFMT64x "\n",
+			offs/sz, jmptbl_loc, ip);
+		anal->cmdtail = r_str_appendf (anal->cmdtail,
+			"f switch.0x%08"PFMT64x" 1 @ 0x%08"PFMT64x"\n",
+			ip, ip);
+
+		anal->cmdtail = r_str_appendf (anal->cmdtail,
+			"f case.default.0x%"PFMT64x " 1 @ 0x%08"PFMT64x "\n",
+			default_case, default_case);
+	}
+
 	free (jmptbl);
 	return ret;
 }
 
+#if 0
 static ut64 search_reg_val(RAnal *anal, ut8 *buf, ut64 len, ut64 addr, char *regsz) {
 	ut64 offs, oplen;
 	RAnalOp op = {
@@ -489,7 +500,7 @@
 	const int addrbytes = anal->iob.io ? anal->iob.io->addrbytes : 1;
 	for (offs = 0; offs < len; offs += addrbytes * oplen) {
 		r_anal_op_fini (&op);
-		if ((oplen = r_anal_op (anal, &op, addr + offs, buf + offs, len - offs)) < 1) {
+		if ((oplen = r_anal_op (anal, &op, addr + offs, buf + offs, len - offs, R_ANAL_OP_MASK_ALL)) < 1) {
 			break;
 		}
 		if (op.dst && op.dst->reg && op.dst->reg->name && !strcmp (op.dst->reg->name, regsz)) {
@@ -500,120 +511,252 @@
 	}
 	return ret;
 }
+#endif
 
 #define gotoBeach(x) ret = x; goto beach;
 #define gotoBeachRet() goto beach;
 
-static void extract_arg(RAnal *anal, RAnalFunction *fcn, RAnalOp *op, const char *reg, const char *sign, char type) {
-	char sigstr[16] = {0};
-	st64 ptr;
-	char *addr;
-	if (!anal || !fcn || !op) {
-		return;
-	}
-	// snprintf (sigstr, sizeof (sigstr), ",%s,%s", reg, sign);
-	snprintf (sigstr, sizeof (sigstr), ",%s,%s", reg, sign);
-	const char *op_esil = r_strbuf_get (&op->esil);
-	if (!op_esil) {
-		return;
-	}
-	char *esil_buf = strdup (op_esil);
-	if (!esil_buf) {
-		return;
-	}
-	char *ptr_end = strstr (esil_buf, sigstr);
-	if (!ptr_end) {
-		free (esil_buf);
-		return;
-	}
-#if 1
-	*ptr_end = 0;
-	addr = ptr_end;
-	while ((addr[0] != '0' || addr[1] != 'x') && addr >= esil_buf + 1 && *addr != ',') {
-		addr--;
-	}
-	if (strncmp (addr, "0x", 2)) {
-		free (esil_buf);
-		return;
-	}
-	ptr = (st64) r_num_get (NULL, addr);
-#else
-	ptr = -op->ptr;
-	if (ptr%4) {
-		free (esil_buf);
-		return;
-	}
-#endif
-	if (*sign == '+') {
-		const char *pfx = (ptr < fcn->maxstack && type == 's')? VARPREFIX: ARGPREFIX;
-		char *varname = get_varname (anal, fcn, type, pfx, R_ABS (ptr));
-		r_anal_var_add (anal, fcn->addr, 1, ptr, type, NULL, anal->bits / 8, varname);
-		r_anal_var_access (anal, fcn->addr, type, 1, ptr, 0, op->addr);
-		free (varname);
-	} else {
-		char *varname = get_varname (anal, fcn, type, VARPREFIX, R_ABS (ptr));
-		r_anal_var_add (anal, fcn->addr, 1, -ptr, type, NULL, anal->bits / 8, varname);
-		r_anal_var_access (anal, fcn->addr, type, 1, -ptr, 1, op->addr);
-		free (varname);
-	}
-	free (esil_buf);
-}
-
-R_API void r_anal_fcn_fill_args(RAnal *anal, RAnalFunction *fcn, RAnalOp *op) {
-	if (!anal || !fcn || !op) {
-		return;
-	}
-	const char *BP = anal->reg->name[R_REG_NAME_BP];
-	const char *SP =  anal->reg->name[R_REG_NAME_SP];
-	extract_arg (anal, fcn, op, BP, "+", 'b');
-	extract_arg (anal, fcn, op, BP, "-", 'b');
-	extract_arg (anal, fcn, op, SP, "+", 's');
-}
-
 static bool isInvalidMemory(const ut8 *buf, int len) {
 	// can be wrong
 	return !memcmp (buf, "\xff\xff\xff\xff", R_MIN (len, 4));
 	// return buf[0]==buf[1] && buf[0]==0xff && buf[2]==0xff && buf[3] == 0xff;
 }
 
-static bool is_delta_pointer_table(RAnal *anal, ut64 addr, ut64 ptr) {
+static bool isSymbolNextInstruction(RAnal *anal, RAnalOp *op) {
+	if (!anal || !op || !anal->flb.get_at) {
+ 		return false;
+	}
+	RFlagItem *fi = anal->flb.get_at (anal->flb.f, op->addr + op->size, false);
+	return (fi && fi->name && (strstr (fi->name, "imp.") || strstr (fi->name, "sym.")
+			|| strstr (fi->name, "entry") || strstr (fi->name, "main")));
+}
+
+static bool is_delta_pointer_table (RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 lea_ptr, ut64 *jmptbl_addr, RAnalOp *jmp_aop) {
 	int i;
 	ut64 dst;
-	st32 jmptbl[64] = {
-		0
-	};
+	st32 jmptbl[64] = {0};
 	/* check if current instruction is followed by an ujmp */
-	ut8 buf[64];
-	anal->iob.read_at (anal->iob.io, addr, (ut8 *) buf, 64);
-	RAnalOp aop = {0};
+	ut8 buf[JMPTBL_LEA_SEARCH_SZ];
+	RAnalOp *aop = jmp_aop;
+	RAnalOp mov_aop = {0};
+	RAnalOp add_aop = {0};
+	anal->iob.read_at (anal->iob.io, addr, (ut8 *)buf, JMPTBL_LEA_SEARCH_SZ);
 	bool isValid = false;
-	for (i = 0; i + 8 < 64; i++) {
-		int len = r_anal_op (anal, &aop, addr + i, buf + i, 64 - i);
+	for (i = 0; i + 8 < JMPTBL_LEA_SEARCH_SZ; i++) {
+		int len = r_anal_op (anal, aop, addr + i, buf + i, JMPTBL_LEA_SEARCH_SZ - i, R_ANAL_OP_MASK_BASIC);
 		if (len < 1) {
 			len = 1;
 		}
-		if (aop.type == R_ANAL_OP_TYPE_UJMP || aop.type == R_ANAL_OP_TYPE_RJMP) {
+		if (aop->type == R_ANAL_OP_TYPE_UJMP || aop->type == R_ANAL_OP_TYPE_RJMP) {
 			isValid = true;
 			break;
 		}
+		if (aop->type == R_ANAL_OP_TYPE_MOV) {
+			mov_aop = *aop;
+		}
+		if (aop->type == R_ANAL_OP_TYPE_ADD) {
+			add_aop = *aop;
+		}
 		i += len - 1;
 	}
 	if (!isValid) {
 		return false;
 	}
-	
+
+	// check if we have a msvc 19xx style jump table using rva table entries
+	// lea reg1, [base_addr]
+	// mov reg2, sword [reg1 + tbl_off*4 + tbl_loc_off]
+	// add reg2, reg1
+	// jmp reg2
+	if (mov_aop.type && add_aop.type && mov_aop.addr < add_aop.addr && add_aop.addr < jmp_aop->addr && mov_aop.ptr) {
+		// ptr in this case should be tbl_loc_off
+		// eprintf ("JMPTBL ADDR %llx\n", mov_aop.ptr);
+		*jmptbl_addr += mov_aop.ptr;
+	}
+#if 0 
+	// required for the last jmptbl.. but seems to work without it and breaks other tests
+	if (mov_aop.type && mov_aop.ptr) {
+		*jmptbl_addr += mov_aop.ptr;
+		// absjmptbl
+		lea_ptr = mov_aop.ptr;
+	}
+#endif
+
 	/* check if jump table contains valid deltas */
-	anal->iob.read_at (anal->iob.io, ptr, (ut8 *) &jmptbl, 64);
+	anal->iob.read_at (anal->iob.io, *jmptbl_addr, (ut8 *)&jmptbl, 64);
 	// XXX this is not endian safe
-	for (i = 0; i < 4; i++) {
-		dst = ptr + jmptbl[0];
+	for (i = 0; i < 3; i++) {
+		dst = lea_ptr + jmptbl[0];
 		if (!anal->iob.is_valid_offset (anal->iob.io, dst, 0)) {
 			return false;
 		}
+		if (dst > fcn->addr + JMPTBL_MAXFCNSIZE) {
+			return false;
+		}
+		if (anal->opt.jmpabove && dst < (fcn->addr < JMPTBL_MAXFCNSIZE ? 0 : fcn->addr - JMPTBL_MAXFCNSIZE)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+static bool try_get_delta_jmptbl_info (RAnal *anal, RAnalFunction *fcn, ut64 jmp_addr, ut64 lea_addr, ut64 *table_size, ut64 *default_case) {
+	bool isValid = false, foundCmp = false;
+	int i;
+
+	RAnalOp tmp_aop = {0};
+	int search_sz = jmp_addr - lea_addr;
+	if (search_sz < 0) {
+		return false;
+	}
+	ut8 *buf = malloc (search_sz);
+	if (!buf) {
+		return false;
+	}
+	// search for a cmp register with a resonable size
+	anal->iob.read_at (anal->iob.io, lea_addr, (ut8 *)buf, search_sz);
+
+	for (i = 0; i + 8 < search_sz; i++) {
+		int len = r_anal_op (anal, &tmp_aop, lea_addr + i, buf + i, JMPTBL_LEA_SEARCH_SZ - i, R_ANAL_OP_MASK_BASIC);
+		if (len < 1) {
+			len = 1;
+		}
+
+		if (foundCmp) {
+			if (tmp_aop.type != R_ANAL_OP_TYPE_CJMP) {
+				continue;
+			}
+
+			*default_case = tmp_aop.jump == tmp_aop.jump + len ? tmp_aop.fail : tmp_aop.jump;
+			break;
+		}
+
+		ut32 type = tmp_aop.type & R_ANAL_OP_TYPE_MASK;
+		if (type != R_ANAL_OP_TYPE_CMP) {
+			continue;
+		}
+		// get the value of the cmp
+		// for operands in op, check if type is immediate and val is sane
+		// TODO: How? opex?
+
+		// for the time being, this seems to work
+		// might not actually have a value, let the next step figure out the size then
+		if (tmp_aop.val == UT64_MAX && tmp_aop.refptr == 0) {
+			isValid = true;
+			*table_size = 0;
+		} else if (tmp_aop.refptr == 0) {
+			isValid = tmp_aop.val < 0x200;
+			*table_size = tmp_aop.val + 1;
+		} else {
+			isValid = tmp_aop.refptr < 0x200;
+			*table_size = tmp_aop.refptr + 1;
+		}
+
+		// TODO: check the jmp for whether val is included in valid range or not (ja vs jae)
+		foundCmp = true;
 	}
+	free (buf);
+	if (!isValid) {
+		return false;
+	}
+
+	// eprintf ("switch at 0x%" PFMT64x "\n\tdefault case 0x%" PFMT64x "\n\t#cases: %d\n",
+	// 		addr,
+	// 		*default_case,
+	// 		*table_size);
+
 	return true;
 }
 
+static bool try_get_jmptbl_info(RAnal *anal, RAnalFunction *fcn, ut64 addr, RAnalBlock *my_bb, ut64 *table_size, ut64 *default_case) {
+	bool isValid = false;
+	int i;
+	RListIter *iter;
+	RAnalBlock *tmp_bb, *prev_bb;
+	prev_bb = 0;
+	if (!fcn->bbs) {
+		return false;
+	}
+
+	/* if UJMP is in .plt section just skip it */
+	RBinSection *s = anal->binb.get_vsect_at (anal->binb.bin, addr);
+	if (s && s->name[0]) {
+		bool in_plt = strstr (s->name, ".plt") != NULL;
+		if (!in_plt && strstr (s->name, "_stubs") != NULL) {
+			/* for mach0 */
+			in_plt = true;
+		}
+		if (in_plt) {
+			return false;
+		}
+	}
+
+	// search for the predecessor bb
+	r_list_foreach (fcn->bbs, iter, tmp_bb) {
+		if (tmp_bb->jump == my_bb->addr || tmp_bb->fail == my_bb->addr) {
+			prev_bb = tmp_bb;
+			break;
+		}
+	}
+	// predecessor must be a conditional jump
+	if (!prev_bb || !prev_bb->jump || !prev_bb->fail) {
+		eprintf ("[anal.jmptbl] Missing cjmp bb in predecessor at 0x%08"PFMT64x"\n", addr);
+		return false;
+	}
+
+	// default case is the jump target of the unconditional jump
+	*default_case = prev_bb->jump == my_bb->addr ? prev_bb->fail : prev_bb->jump;
+
+	RAnalOp tmp_aop = {0};
+	ut8 *bb_buf = malloc (prev_bb->size);
+	if (!bb_buf) {
+		return false;
+	}
+	// search for a cmp register with a resonable size
+	anal->iob.read_at (anal->iob.io, prev_bb->addr, (ut8 *) bb_buf, prev_bb->size);
+	isValid = false;
+
+	for (i = 0; i < prev_bb->op_pos_size; i++) {
+		ut64 op_addr = prev_bb->addr + prev_bb->op_pos[i];
+		int len = r_anal_op (anal, &tmp_aop, op_addr, bb_buf + prev_bb->op_pos[i], prev_bb->size - prev_bb->op_pos[i], R_ANAL_OP_MASK_BASIC);
+
+		ut32 type = tmp_aop.type & R_ANAL_OP_TYPE_MASK;
+		if (len < 1 || type != R_ANAL_OP_TYPE_CMP) {
+			continue;
+		}
+		// get the value of the cmp
+		// for operands in op, check if type is immediate and val is sane
+		// TODO: How? opex?
+
+		// for the time being, this seems to work
+		// might not actually have a value, let the next step figure out the size then
+		if (tmp_aop.val == UT64_MAX && tmp_aop.refptr == 0) {
+			isValid = true;
+			*table_size = 0;
+		} else if (tmp_aop.refptr == 0) {
+			isValid = tmp_aop.val < 0x200;
+			*table_size = tmp_aop.val + 1;
+		} else {
+			isValid = tmp_aop.refptr < 0x200;
+			*table_size = tmp_aop.refptr + 1;
+		}
+
+		// TODO: check the jmp for whether val is included in valid range or not (ja vs jae)
+		break;
+	}
+	free (bb_buf);
+	if (!isValid) {
+		return false;
+	}
+
+	// eprintf ("switch at 0x%" PFMT64x "\n\tdefault case 0x%" PFMT64x "\n\t#cases: %d\n",
+	// 		addr,
+	// 		*default_case,
+	// 		*table_size);
+
+ 	return true;
+}
+
 static bool regs_exist(RAnalValue *src, RAnalValue *dst) {
 	return src && dst && src->reg && dst->reg && src->reg->name && dst->reg->name;
 }
@@ -647,7 +790,7 @@
 			break;
 		}
 		r_anal_op_fini (&op);
-		if ((oplen = r_anal_op (anal, &op, addr + idx, buf + idx, len - idx)) < 1) {
+		if ((oplen = r_anal_op (anal, &op, addr + idx, buf + idx, len - idx, R_ANAL_OP_MASK_BASIC)) < 1) {
 			return 0;
 		}
 		switch (op.type) {
@@ -666,12 +809,14 @@
 	return idx;
 }
 
+#if 0
 static int walk_switch(RAnal *anal, RAnalFunction *fcn, ut64 from, ut64 at) {
 	ut8 buf[1024];
 	int i;
 	eprintf ("WALK SWITCH TABLE INTO (0x%"PFMT64x ") %"PFMT64x "\n", from, at);
 	for (i = 0; i < 10; i++) {
-		anal->iob.read_at (anal->iob.io, at, buf, sizeof (buf));
+		(void) anal->iob.read_at (anal->iob.io, at, buf, sizeof (buf));
+		// TODO check for return value
 		int sz = r_anal_case (anal, fcn, from, at, buf, sizeof (buf), 0);
 		if (sz < 1) {
 			break;
@@ -680,6 +825,7 @@
 	}
 	return 0;
 }
+#endif
 
 static int fcn_recurse(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut8 *buf, ut64 len, int depth) {
 	const int continue_after_jump = anal->opt.afterjmp;
@@ -689,11 +835,9 @@
 	RAnalBlock *bbg = NULL;
 	int ret = R_ANAL_RET_END, skip_ret = 0;
 	int overlapped = 0;
-	char *varname;
-	RAnalOp op = {
-		0
-	};
+	RAnalOp op = {0};
 	int oplen, idx = 0;
+	bool varset = false;
 	struct {
 		int cnt;
 		int idx;
@@ -706,6 +850,9 @@
 	};
 	char tmp_buf[MAX_FLG_NAME_SIZE + 5] = "skip";
 
+	if (r_cons_is_breaked ()) {
+		return R_ANAL_RET_END;
+	}
 	if (anal->sleep) {
 		r_sys_usleep (anal->sleep);
 	}
@@ -747,11 +894,24 @@
 	if (anal->limit && addr + idx < anal->limit->from) {
 		return R_ANAL_RET_END;
 	}
+	RAnalFunction *tmp_fcn = r_anal_get_fcn_in (anal, addr, 0);
+	if (tmp_fcn) {
+		// Checks if var is already analyzed at given addr
+		RList *list = r_anal_var_all_list (anal, tmp_fcn);
+		if (!r_list_empty (list)) {
+			varset = true;
+		}
+		r_list_free (list);
+	}
+	ut64 movptr = UT64_MAX; // used by jmptbl when coded as "mov reg,[R*4+B]"
 	while (addrbytes * idx < len) {
 		if (anal->limit && anal->limit->to <= addr + idx) {
 			break;
 		}
 repeat:
+		if (r_cons_is_breaked ()) {
+			break;
+		}
 		if ((len - addrbytes * idx) < 5) {
 			eprintf (" WARNING : block size exceeding max block size at 0x%08"PFMT64x"\n", addr);
 			eprintf ("[+] Try changing it with e anal.bb.maxsize\n");
@@ -765,7 +925,7 @@
 		}
 		// check if opcode is in another basic block
 		// in that case we break
-		if ((oplen = r_anal_op (anal, &op, addr + idx, buf + addrbytes * idx, len - addrbytes * idx)) < 1) {
+		if ((oplen = r_anal_op (anal, &op, addr + idx, buf + addrbytes * idx, len - addrbytes * idx, R_ANAL_OP_MASK_ALL)) < 1) {
 			VERBOSE_ANAL eprintf ("Unknown opcode at 0x%08"PFMT64x "\n", addr + idx);
 			if (!idx) {
 				gotoBeach (R_ANAL_RET_END);
@@ -773,6 +933,9 @@
 				break; // unspecified behaviour
 			}
 		}
+		if (op.hint.new_bits) {
+			r_anal_hint_set_bits (anal, op.jump, op.hint.new_bits);
+		}
 		if (idx > 0 && !overlapped) {
 			bbg = bbget (fcn, addr + idx);
 			if (bbg && bbg != bb) {
@@ -838,7 +1001,6 @@
 		}
 		// Note: if we got two branch delay instructions in a row due to an
 		// compiler bug or junk or something it wont get treated as a delay
-		/* TODO: Parse fastargs (R_ANAL_VAR_ARGREG) */
 		switch (op.stackop) {
 		case R_ANAL_STACK_INC:
 			if (R_ABS (op.stackptr) < 8096) {
@@ -852,38 +1014,24 @@
 		case R_ANAL_STACK_RESET:
 			bb->stackptr = 0;
 			break;
-		// TODO: use fcn->maxstack to know our stackframe
-		case R_ANAL_STACK_SET:
-			if ((int) op.ptr > 0) {
-				varname = get_varname (anal, fcn, 'b', ARGPREFIX, R_ABS (op.ptr));
-			} else {
-				varname = get_varname (anal, fcn, 'b', VARPREFIX, R_ABS (op.ptr));
-			}
-			r_anal_var_add (anal, fcn->addr, 1, op.ptr, 'b', NULL, anal->bits / 8, varname);
-			r_anal_var_access (anal, fcn->addr, 'b', 1, op.ptr, 1, op.addr);
-			free (varname);
-			break;
-		// TODO: use fcn->maxstack to know our stackframe
-		case R_ANAL_STACK_GET:
-			if (((int) op.ptr) > 0) {
-				varname = get_varname (anal, fcn, 'b', ARGPREFIX, R_ABS (op.ptr));
-			} else {
-				varname = get_varname (anal, fcn, 'b', VARPREFIX, R_ABS (op.ptr));
-			}
-			r_anal_var_add (anal, fcn->addr, 1, op.ptr, 'b', NULL, anal->bits / 8, varname);
-			r_anal_var_access (anal, fcn->addr, 'b', 1, op.ptr, 0, op.addr);
-			free (varname);
-			break;
 		}
-
+		if (anal->opt.vars && !varset) {
+			extract_vars(anal, fcn, &op);
+		}
 		if (op.ptr && op.ptr != UT64_MAX && op.ptr != UT32_MAX) {
 			// swapped parameters wtf
-			r_anal_fcn_xref_add (anal, fcn, op.addr, op.ptr, R_ANAL_REF_TYPE_DATA);
+			r_anal_xrefs_set (anal, op.addr, op.ptr, R_ANAL_REF_TYPE_DATA);
 		}
 
 		switch (op.type & R_ANAL_OP_TYPE_MASK) {
+		case R_ANAL_OP_TYPE_CMOV:
 		case R_ANAL_OP_TYPE_MOV:
 			// skip mov reg,reg
+			if (anal->opt.jmptbl) {
+				if (op.scale && op.ireg) {
+					movptr = op.ptr;
+				}
+			}
 			if (anal->opt.hpskip && regs_exist (op.src[0], op.dst)
 			&& !strcmp (op.src[0]->reg->name, op.dst->reg->name)) {
 				skip_ret = skip_hp (anal, fcn, &op, bb, addr, tmp_buf, oplen, delay.un_idx, &idx);
@@ -908,21 +1056,36 @@
 				}
 			}
 			if (anal->opt.jmptbl) {
-				if (is_delta_pointer_table (anal, op.addr, op.ptr)) {
-					char *str = r_str_newf ("pxt. 0x%08" PFMT64x" @ 0x%08"PFMT64x "\n", op.addr, op.ptr);
-					if (!anal->cmdtail) {
-						anal->cmdtail = r_str_appendf (anal->cmdtail, str);
+				RAnalOp jmp_aop = {0};
+				ut64 jmptbl_addr = op.ptr;
+				if (is_delta_pointer_table (anal, fcn, op.addr, op.ptr, &jmptbl_addr, &jmp_aop)) {
+					ut64 table_size, default_case;
+					// we require both checks here since try_get_jmptbl_info uses
+					// BB info of the final jmptbl jump, which is no present with
+					// is_delta_pointer_table just scanning ahead
+					// try_get_delta_jmptbl_info doesn't work at times where the
+					// lea comes after the cmp/default case cjmp, which can be
+					// handled with try_get_jmptbl_info
+					if (try_get_jmptbl_info (anal, fcn, jmp_aop.addr, bb, &table_size, &default_case)
+						|| try_get_delta_jmptbl_info (anal, fcn, jmp_aop.addr, op.addr, &table_size, &default_case)) {
+						ret = try_walkthrough_jmptbl (anal, fcn, depth, jmp_aop.addr, jmptbl_addr, op.ptr, 4, table_size, default_case, 4);
 					}
-					if (anal->cmdtail && !strstr (anal->cmdtail, str)) {
-						anal->cmdtail = r_str_appendf (anal->cmdtail, str);
-					} 
-					free (str);
-					// jmptbl_addr = op.ptr;
-					// jmptbl_size = -1;
-					// ret = try_walkthrough_jmptbl (anal, fcn, depth, op.addr, op.ptr, 4);
 				}
+				r_anal_op_fini (&jmp_aop);
 			}
 			break;
+		// Case of valid but unused "add [rax], al"
+		case R_ANAL_OP_TYPE_ADD:
+			if (anal->opt.ijmp) {
+				if (((op.size + 4) <= len) && !memcmp (buf + op.size, "\x00\x00\x00\x00", 4)) {
+					bb->size -= oplen;
+					op.type = R_ANAL_OP_TYPE_RET;
+					FITFCNSZ ();
+					r_anal_op_fini (&op);
+					gotoBeach (R_ANAL_RET_END);
+				}
+      }
+			break;
 		case R_ANAL_OP_TYPE_ILL:
 			if (anal->opt.nopskip && len > 3 && !memcmp (buf, "\x00\x00\x00\x00", 4)) {
 				if ((addr + delay.un_idx - oplen) == fcn->addr) {
@@ -985,6 +1148,11 @@
 			}
 			break;
 		case R_ANAL_OP_TYPE_JMP:
+			if (op.jump == UT64_MAX) {
+				FITFCNSZ ();
+				r_anal_op_fini (&op);
+				return R_ANAL_RET_END;
+			}
 			{
 				RFlagItem *fi = anal->flb.get_at (anal->flb.f, op.jump, false);
 				if (fi && strstr (fi->name, "imp.")) {
@@ -993,13 +1161,11 @@
 					return R_ANAL_RET_END;
 				}
 			}
-			if (op.jump == UT64_MAX) {
-				FITFCNSZ ();
-				r_anal_op_fini (&op);
+			if (r_cons_is_breaked ()) {
 				return R_ANAL_RET_END;
 			}
 			if (anal->opt.jmpref) {
-				(void) r_anal_fcn_xref_add (anal, fcn, op.addr, op.jump, R_ANAL_REF_TYPE_CODE);
+				(void) r_anal_xrefs_set (anal, op.addr, op.jump, R_ANAL_REF_TYPE_CODE);
 			}
 			if (!anal->opt.jmpabove && (op.jump < fcn->addr)) {
 				FITFCNSZ ();
@@ -1028,71 +1194,24 @@
 					return R_ANAL_RET_END;
 				}
 			}
-			if (anal->opt.bbsplit) {
 #if FIX_JMP_FWD
+			bb->jump = op.jump;
+			bb->fail = UT64_MAX;
+			FITFCNSZ ();
+			return R_ANAL_RET_END;
+#else
+			if (!overlapped) {
 				bb->jump = op.jump;
 				bb->fail = UT64_MAX;
-				FITFCNSZ ();
-				return R_ANAL_RET_END;
-#else
-				if (!overlapped) {
-					bb->jump = op.jump;
-					bb->fail = UT64_MAX;
-				}
-				recurseAt (op.jump);
-				FITFCNSZ ();
-				gotoBeachRet ();
-#endif
-			} else {
-				if (continue_after_jump) {
-					recurseAt (op.jump);
-					recurseAt (op.fail);
-				} else {
-					// This code seems to break #1519
-					if (anal->opt.eobjmp) {
-#if JMP_IS_EOB
-						if (!overlapped) {
-							bb->jump = op.jump;
-							bb->fail = UT64_MAX;
-						}
-						FITFCNSZ ();
-						return R_ANAL_RET_END;
-#else
-						// hardcoded jmp size // must be checked at the end wtf?
-						// always fitfcnsz and retend
-						if (r_anal_fcn_is_in_offset (fcn, op.jump)) {
-							/* jump inside the same function */
-							FITFCNSZ ();
-							return R_ANAL_RET_END;
-#if JMP_IS_EOB_RANGE > 0
-						} else {
-							if (op.jump < addr - JMP_IS_EOB_RANGE && op.jump < addr) {
-								gotoBeach (R_ANAL_RET_END);
-							}
-							if (op.jump > addr + JMP_IS_EOB_RANGE) {
-								gotoBeach (R_ANAL_RET_END);
-							}
-#endif
-						}
-#endif
-					} else {
-						/* if not eobjmp. a jump will break the function if jumps before the beginning of the function */
-						if (op.jump < fcn->addr) {
-							if (!overlapped) {
-								bb->jump = op.jump;
-								bb->fail = UT64_MAX;
-							}
-							FITFCNSZ ();
-							return R_ANAL_RET_END;
-						}
-					}
-				}
 			}
+			recurseAt (op.jump);
+			FITFCNSZ ();
+			gotoBeachRet ();
+#endif
 			break;
 		case R_ANAL_OP_TYPE_CJMP:
 			if (anal->opt.cjmpref) {
-				(void) r_anal_fcn_xref_add (anal, fcn,
-					op.addr, op.jump, R_ANAL_REF_TYPE_CODE);
+				(void) r_anal_xrefs_set (anal, op.addr, op.jump, R_ANAL_REF_TYPE_CODE);
 			}
 			if (!overlapped) {
 				bb->jump = op.jump;
@@ -1162,23 +1281,25 @@
 		case R_ANAL_OP_TYPE_ICALL:
 		case R_ANAL_OP_TYPE_IRCALL:
 			/* call [dst] */
+			// XXX: this is TYPE_MCALL or indirect-call
+			(void) r_anal_xrefs_set (anal, op.addr, op.ptr, R_ANAL_REF_TYPE_CALL);
+
 			if (op.ptr != UT64_MAX && r_anal_noreturn_at (anal, op.ptr)) {
 				FITFCNSZ ();
 				r_anal_op_fini (&op);
 				return R_ANAL_RET_END;
 			}
-			// XXX: this is TYPE_MCALL or indirect-call
-			(void) r_anal_fcn_xref_add (anal, fcn, op.addr, op.ptr, R_ANAL_REF_TYPE_CALL);
 			break;
 		case R_ANAL_OP_TYPE_CCALL:
 		case R_ANAL_OP_TYPE_CALL:
 			/* call dst */
+			(void) r_anal_xrefs_set (anal, op.addr, op.jump, R_ANAL_REF_TYPE_CALL);
+
 			if (r_anal_noreturn_at (anal, op.jump)) {
 				FITFCNSZ ();
 				r_anal_op_fini (&op);
 				return R_ANAL_RET_END;
 			}
-			(void) r_anal_fcn_xref_add (anal, fcn, op.addr, op.jump, R_ANAL_REF_TYPE_CALL);
 #if CALL_IS_EOB
 			recurseAt (op.jump);
 			recurseAt (op.fail);
@@ -1190,26 +1311,38 @@
 		case R_ANAL_OP_TYPE_RJMP:
 		case R_ANAL_OP_TYPE_IJMP:
 		case R_ANAL_OP_TYPE_IRJMP:
+			// if the next instruction is a symbol
+			if (anal->opt.ijmp && isSymbolNextInstruction (anal, &op)) {
+				FITFCNSZ ();
+				r_anal_op_fini (&op);
+				return R_ANAL_RET_END;
+			}
 			// switch statement
 			if (anal->opt.jmptbl) {
-				if (fcn->refs->tail) {
-					RAnalRef *last_ref = fcn->refs->tail->data;
-					last_ref->type = R_ANAL_REF_TYPE_NULL;
-				}
-				if (op.ptr != UT64_MAX) {       // direct jump
-					ret = try_walkthrough_jmptbl (anal, fcn, depth, addr + idx, op.ptr, ret);
-
-				} else {        // indirect jump: table pointer is unknown
-					if (op.src[0] && op.src[0]->reg) {
-						ut64 ptr = search_reg_val (anal, buf, idx, addr, op.src[0]->reg->name);
-						if (ptr && ptr != UT64_MAX) {
-							ret = try_walkthrough_jmptbl (anal, fcn, depth, addr + idx, ptr, ret);
-						}
+				// op.ireg since rip relative addressing produces way too many false positives otherwise
+				// op.ireg is 0 for rip relative, "rax", etc otherwise
+				if (op.ptr != UT64_MAX && op.ireg) { // direct jump
+					ut64 table_size, default_case;
+					if (try_get_jmptbl_info (anal, fcn, op.addr, bb, &table_size, &default_case)) {
+						ret = try_walkthrough_jmptbl (anal, fcn, depth, op.addr, op.ptr, op.ptr, anal->bits >> 3, table_size, default_case, ret);
+					}
+				} else if (op.ptr != UT64_MAX && op.reg) { // direct jump
+					ut64 table_size, default_case;
+					if (try_get_jmptbl_info (anal, fcn, op.addr, bb, &table_size, &default_case)) {
+						ret = try_walkthrough_jmptbl (anal, fcn, depth, op.addr, op.ptr, op.ptr, anal->bits >> 3, table_size, default_case, ret);
+					}
+				} else if (movptr != UT64_MAX) {
+					ut64 table_size, default_case;
+
+					if (try_get_jmptbl_info (anal, fcn, op.addr, bb, &table_size, &default_case)) {
+						op.ptr = movptr;
+						ret = try_walkthrough_jmptbl (anal, fcn, depth, op.addr, op.ptr, op.ptr, anal->bits >> 3, table_size, default_case, ret);
 					}
+					movptr = UT64_MAX;
 				}
-				walk_switch (anal, fcn, op.addr, op.addr + op.size);
 			}
 #if 0
+	// xxx i think we can remove this
 			if (anal->cur) {
 				/* if UJMP is in .plt section just skip it */
 				RBinSection *s = anal->binb.get_vsect_at (anal->binb.bin, addr);
@@ -1233,17 +1366,30 @@
 				}
 			}
 #endif
-			FITFCNSZ ();
-			r_anal_op_fini (&op);
-			return R_ANAL_RET_END;
-river:
+			if (anal->opt.ijmp) {
+				if (continue_after_jump) {
+					recurseAt (op.jump);
+					recurseAt (op.fail);
+					if (overlapped) {
+						goto analopfinish;
+					}
+				}
+				if (r_anal_noreturn_at (anal, op.jump) || op.eob) {
+					goto analopfinish;
+				}
+			} else {
+analopfinish:
+				FITFCNSZ ();
+				r_anal_op_fini (&op);
+				return R_ANAL_RET_END;
+			}
 			break;
 		/* fallthru */
 		case R_ANAL_OP_TYPE_PUSH:
 			last_is_push = true;
 			last_push_addr = op.val;
 			if (anal->iob.is_valid_offset (anal->iob.io, op.val, 1)) {
-				(void) r_anal_fcn_xref_add (anal, fcn, op.addr, op.val, R_ANAL_REF_TYPE_DATA);
+				(void) r_anal_xrefs_set (anal, op.addr, op.val, R_ANAL_REF_TYPE_DATA);
 			}
 			break;
 		case R_ANAL_OP_TYPE_RET:
@@ -1306,7 +1452,7 @@
 	}
 	for (i = 0; i < bufsz && opcnt < 10; i += oplen, opcnt++) {
 		r_anal_op_fini (&op);
-		if ((oplen = r_anal_op (anal, &op, addr + i, buf + i, bufsz - i)) < 1) {
+		if ((oplen = r_anal_op (anal, &op, addr + i, buf + i, bufsz - i, R_ANAL_OP_MASK_BASIC)) < 1) {
 			return false;
 		}
 		switch (op.type) {
@@ -1338,7 +1484,7 @@
 	RAnalFunction *next = r_anal_fcn_next (a, f->addr);
 	if (next) {
 		if ((f->addr + r_anal_fcn_size (f)) > next->addr) {
-			r_anal_fcn_resize (f, (next->addr - f->addr));
+			r_anal_fcn_resize (a, f, (next->addr - f->addr));
 		}
 	}
 }
@@ -1355,20 +1501,22 @@
 	}
 }
 
-R_API void r_anal_trim_jmprefs(RAnalFunction *fcn) {
+R_API void r_anal_trim_jmprefs(RAnal *anal, RAnalFunction *fcn) {
 	RAnalRef *ref;
+	RList *refs = r_anal_fcn_get_refs (anal, fcn);
 	RListIter *iter;
-	RListIter *tmp;
-	r_list_foreach_safe (fcn->refs, iter, tmp, ref) {
+
+	r_list_foreach (refs, iter, ref) {
 		if (ref->type == R_ANAL_REF_TYPE_CODE && r_anal_fcn_is_in_offset (fcn, ref->addr)) {
-			r_list_delete (fcn->refs, iter);
+			r_anal_xrefs_deln (anal, ref->at, ref->addr, ref->type);
 		}
 	}
+	r_list_free (refs);
 }
 
 R_API int r_anal_fcn(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut8 *buf, ut64 len, int reftype) {
 	int ret;
-	r_anal_fcn_set_size (fcn, 0);
+	r_anal_fcn_set_size (NULL, fcn, 0); // fcn is not yet in anal => pass NULL
 	/* defines fcn. or loc. prefix */
 	fcn->type = (reftype == R_ANAL_REF_TYPE_CODE)
 	? R_ANAL_FCN_TYPE_LOC
@@ -1383,48 +1531,32 @@
 		}
 	}
 	fcn->maxstack = 0;
-	ret = fcn_recurse (anal, fcn, addr, buf, len, FCN_DEPTH);
+	ret = fcn_recurse (anal, fcn, addr, buf, len, anal->opt.depth);
 	// update tinyrange for the function
 	r_anal_fcn_update_tinyrange_bbs (fcn);
 
-	if (ret == R_ANAL_RET_END && r_anal_fcn_size (fcn)) {   // cfg analysis completed
+	if (anal->opt.endsize && ret == R_ANAL_RET_END && r_anal_fcn_size (fcn)) {   // cfg analysis completed
 		RListIter *iter;
 		RAnalBlock *bb;
 		ut64 endaddr = fcn->addr;
-		ut64 overlapped = -1;
-		RAnalFunction *fcn1 = NULL;
 
 		// set function size as length of continuous sequence of bbs
 		r_list_sort (fcn->bbs, &cmpaddr);
 		r_list_foreach (fcn->bbs, iter, bb) {
 			if (endaddr == bb->addr) {
 				endaddr += bb->size;
-			} else if (endaddr < bb->addr &&
-			bb->addr - endaddr <
-			anal->opt.bbs_alignment &&
-			!(bb->addr &
-			(anal->opt.bbs_alignment - 1))) {
+			} else if (endaddr < bb->addr && bb->addr - endaddr < anal->opt.bbs_alignment && !(bb->addr & (anal->opt.bbs_alignment - 1))) {
 				endaddr = bb->addr + bb->size;
 			} else {
 				break;
 			}
 		}
 #if !JAYRO_04
-		r_anal_fcn_resize (fcn, endaddr - fcn->addr);
-
-		// resize function if overlaps
-		r_list_foreach (anal->fcns, iter, fcn1) {
-			if (fcn1->addr >= (fcn->addr) && fcn1->addr < (fcn->addr + r_anal_fcn_size (fcn))) {
-				if (overlapped > fcn1->addr) {
-					overlapped = fcn1->addr;
-				}
-			}
-		}
-		if (overlapped != -1) {
-			r_anal_fcn_resize (fcn, overlapped - fcn->addr);
-		}
+		// fcn is not yet in anal => pass NULL
+		r_anal_fcn_resize (NULL, fcn, endaddr - fcn->addr);
 #endif
-		r_anal_trim_jmprefs (fcn);
+		// TODO: unnecessary? add an option?
+		r_anal_trim_jmprefs (anal, fcn);
 	}
 	return ret;
 }
@@ -1436,10 +1568,6 @@
 	if (f) {
 		return false;
 	}
-#if USE_NEW_FCN_STORE
-	r_listrange_add (anal->fcnstore, fcn);
-	// HUH? store it here .. for backweird compatibility
-#endif
 	/* TODO: sdbization */
 	r_list_append (anal->fcns, fcn);
 	r_anal_fcn_tree_insert (&anal->fcn_tree, fcn);
@@ -1461,7 +1589,7 @@
 	fcn->addr = addr;
 	fcn->cc = r_str_const (r_anal_cc_default (a));
 	fcn->bits = a->bits;
-	r_anal_fcn_set_size (fcn, size);
+	r_anal_fcn_set_size (append ? NULL : a, fcn, size);
 	free (fcn->name);
 	if (!name) {
 		fcn->name = r_str_newf ("fcn.%08"PFMT64x, fcn->addr);
@@ -1478,7 +1606,7 @@
 		}
 	}
 #if FCN_SDB
-	sdb_set (DB, sdb_fmt (0, "fcn.0x%08"PFMT64x, addr), "TODO", 0); // TODO: add more info here
+	sdb_set (DB, sdb_fmt ("fcn.0x%08"PFMT64x, addr), "TODO", 0); // TODO: add more info here
 #endif
 	return append? r_anal_fcn_insert (a, fcn): true;
 }
@@ -1487,9 +1615,6 @@
 	RListIter *iter, *iter2;
 	RAnalFunction *fcn, *f = r_anal_get_fcn_in (anal, addr,
 		R_ANAL_FCN_TYPE_ROOT);
-#if USE_NEW_FCN_STORE
-#warning TODO: r_anal_fcn_del_locs not implemented for newstore
-#endif
 	if (!f) {
 		return false;
 	}
@@ -1508,24 +1633,12 @@
 
 R_API int r_anal_fcn_del(RAnal *a, ut64 addr) {
 	if (addr == UT64_MAX) {
-#if USE_NEW_FCN_STORE
-		r_listrange_free (a->fcnstore);
-		a->fcnstore = r_listrange_new ();
-#else
 		r_list_free (a->fcns);
 		a->fcn_tree = NULL;
 		if (!(a->fcns = r_anal_fcn_list_new ())) {
 			return false;
 		}
-#endif
 	} else {
-#if USE_NEW_FCN_STORE
-		// XXX: must only get the function if starting at 0?
-		RAnalFunction *f = r_listrange_find_in_range (a->fcnstore, addr);
-		if (f) {
-			r_listrange_del (a->fcnstore, f);
-		}
-#else
 		RAnalFunction *fcni;
 		RListIter *iter, *iter_tmp;
 		r_list_foreach_safe (a->fcns, iter, iter_tmp, fcni) {
@@ -1535,21 +1648,16 @@
 				}
 				r_anal_fcn_tree_delete (&a->fcn_tree, fcni);
 				r_list_delete (a->fcns, iter);
+			} else if (fcni->addr == addr) {
+				r_list_delete (a->fcns, iter);
 			}
 		}
-#endif
 	}
 	return true;
 }
 
 R_API RAnalFunction *r_anal_get_fcn_in(RAnal *anal, ut64 addr, int type) {
-#if USE_NEW_FCN_STORE
-	// TODO: type is ignored here? wtf.. we need more work on fcnstore
-	// if (root) return r_listrange_find_root (anal->fcnstore, addr);
-	return r_listrange_find_in_range (anal->fcnstore, addr);
-#else
-
-# if 0
+#if 0
   // Linear scan
 	RAnalFunction *fcn, *ret = NULL;
 	RListIter *iter;
@@ -1571,7 +1679,7 @@
 	}
 	return ret;
 
-# else
+#else
 	// Interval tree query
 	RAnalFunction *fcn;
 	FcnTreeIter it;
@@ -1586,8 +1694,7 @@
 		}
 	}
 	return NULL;
-# endif
-#endif // USE_NEW_FCN_STORE
+#endif
 }
 
 R_API bool r_anal_fcn_in(RAnalFunction *fcn, ut64 addr) {
@@ -1595,12 +1702,6 @@
 }
 
 R_API RAnalFunction *r_anal_get_fcn_in_bounds(RAnal *anal, ut64 addr, int type) {
-#if USE_NEW_FCN_STORE
-#warning TODO: r_anal_get_fcn_in_bounds
-	// TODO: type is ignored here? wtf.. we need more work on fcnstore
-	// if (root) return r_listrange_find_root (anal->fcnstore, addr);
-	return r_listrange_find_in_range (anal->fcnstore, addr);
-#else
 	RAnalFunction *fcn, *ret = NULL;
 	RListIter *iter;
 	if (type == R_ANAL_FCN_TYPE_ROOT) {
@@ -1619,7 +1720,6 @@
 		}
 	}
 	return ret;
-#endif
 }
 
 R_API RAnalFunction *r_anal_fcn_find_name(RAnal *anal, const char *name) {
@@ -1686,10 +1786,7 @@
 	n = bb->addr + bb->size - fcn->addr;
 	if (n >= 0 && r_anal_fcn_size (fcn) < n) {
 		// If fcn is in anal->fcn_tree (which reflects anal->fcns), update fcn_tree because fcn->_size has changed.
-		if (r_anal_fcn_tree_delete (&anal->fcn_tree, fcn)) {
-			r_anal_fcn_set_size (fcn, n);
-			r_anal_fcn_tree_insert (&anal->fcn_tree, fcn);
-		}
+		r_anal_fcn_set_size (anal, fcn, n);
 	}
 	return true;
 }
@@ -1843,11 +1940,8 @@
 }
 
 R_API RAnalFunction *r_anal_get_fcn_at(RAnal *anal, ut64 addr, int type) {
-#if USE_NEW_FCN_STORE
-	// TODO: type is ignored here? wtf.. we need more work on fcnstore
-	// if (root) return r_listrange_find_root (anal->fcnstore, addr);
-	return r_listrange_find_root (anal->fcnstore, addr);
-#else
+#if 0
+	// Linear scan
 	RAnalFunction *fcn, *ret = NULL;
 	RListIter *iter;
 	if (type == R_ANAL_FCN_TYPE_ROOT) {
@@ -1866,6 +1960,21 @@
 		}
 	}
 	return ret;
+#else
+	// Interval tree query
+	RAnalFunction *fcn;
+	FcnTreeIter it;
+	if (type == R_ANAL_FCN_TYPE_ROOT) {
+		return _fcn_tree_find_addr (anal->fcn_tree, addr);
+	}
+	fcn_tree_foreach_intersect (anal->fcn_tree, it, fcn, addr, addr + 1) {
+		if (!type || (fcn && fcn->type & type)) {
+			if (addr == fcn->addr) {
+				return fcn;
+			}
+		}
+	}
+	return NULL;
 #endif
 }
 
@@ -1914,17 +2023,31 @@
 
 /* return the basic block in fcn found at the given address.
  * NULL is returned if such basic block doesn't exist. */
-R_API RAnalBlock *r_anal_fcn_bbget(RAnalFunction *fcn, ut64 addr) {
+R_API RAnalBlock *r_anal_fcn_bbget_in(RAnalFunction *fcn, ut64 addr) {
+	if (!fcn || addr == UT64_MAX) {
+		return NULL;
+	}
+	RListIter *iter;
+	RAnalBlock *bb;
+	r_list_foreach (fcn->bbs, iter, bb) {
+		if (addr >= bb->addr && addr < (bb->addr + bb->size)) {
+			return bb;
+		}
+	}
+	return NULL;
+}
+
+R_API RAnalBlock *r_anal_fcn_bbget_at(RAnalFunction *fcn, ut64 addr) {
 	if (!fcn || addr == UT64_MAX) {
 		return NULL;
 	}
 #if USE_SDB_CACHE
-	return sdb_ptr_get (HB, sdb_fmt (0, SDB_KEY_BB, fcn->addr, addr), NULL);
+	return sdb_ptr_get (HB, sdb_fmt (SDB_KEY_BB, fcn->addr, addr), NULL);
 #else
 	RListIter *iter;
 	RAnalBlock *bb;
 	r_list_foreach (fcn->bbs, iter, bb) {
-		if (bb->addr == addr) {
+		if (addr == bb->addr) {
 			return bb;
 		}
 	}
@@ -1932,18 +2055,28 @@
 #endif
 }
 
+
 R_API bool r_anal_fcn_bbadd(RAnalFunction *fcn, RAnalBlock *bb) {
 #if USE_SDB_CACHE
-	return sdb_ptr_set (HB, sdb_fmt (0, SDB_KEY_BB, fcn->addr, bb->addr), bb, NULL);
+	return sdb_ptr_set (HB, sdb_fmt (SDB_KEY_BB, fcn->addr, bb->addr), bb, NULL);
 #endif
 	r_list_append (fcn->bbs, bb);
 	return true;
 }
 
-/* directly set the size of the function */
-R_API void r_anal_fcn_set_size(RAnalFunction *fcn, ut32 size) {
-	if (fcn) {
-		fcn->_size = size;
+
+/* directly set the size of the function
+ * if fcn is in ana RAnal's fcn_tree, the anal MUST be passed,
+ * otherwise it can be NULL */
+R_API void r_anal_fcn_set_size(const RAnal *anal, RAnalFunction *fcn, ut32 size) {
+	if (!fcn) {
+		return;
+	}
+
+	fcn->_size = size;
+
+	if (anal) {
+		_fcn_tree_update_size (anal->fcn_tree, fcn);
 	}
 }
 
@@ -2001,11 +2134,11 @@
 		RAnalOp op;
 		ut64 at, end = bb->addr + bb->size;
 		ut8 *buf = malloc (bb->size);
-		anal->iob.read_at (anal->iob.io, bb->addr, (ut8 *) buf, bb->size);
+		(void)anal->iob.read_at (anal->iob.io, bb->addr, (ut8 *) buf, bb->size);
 		int idx = 0;
 		for (at = bb->addr; at < end;) {
 			memset (&op, 0, sizeof (op));
-			(void) r_anal_op (anal, &op, at, buf + idx, bb->size - idx);
+			(void) r_anal_op (anal, &op, at, buf + idx, bb->size - idx, R_ANAL_OP_MASK_BASIC);
 			if (op.size < 1) {
 				op.size = 1;
 			}
@@ -2039,13 +2172,3 @@
 	}
 	return edges;
 }
-
-R_API RList *r_anal_fcn_get_refs(RAnal *anal, RAnalFunction *fcn) {
-	RList *ret = r_list_clone (fcn->refs);
-	return ret;
-}
-
-R_API RList *r_anal_fcn_get_xrefs(RAnal *anal, RAnalFunction *fcn) {
-	RList *ret = r_list_clone (fcn->xrefs);
-	return ret;
-}
diff -Nru radare2-2.3.0+dfsg/libr/anal/fcnstore.c radare2-2.8.0+dfsg/libr/anal/fcnstore.c
--- radare2-2.3.0+dfsg/libr/anal/fcnstore.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/fcnstore.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/* radare - LGPL - Copyright 2011 -- pancake<nopcode.org> */
-/* this file contains a test implementation of the ~O(1) function search */
-
-// TODO: REFACTOR: This must be a generic data structure named RListRange
-// TODO: We need a standard struct named Surface1D {.addr, .size}, so we can
-// simplify all this by just passing the offset of the field of the given ptr
-// TODO: RListComparator does not supports *user
-// TODO: RRef - reference counting
-
-#define RANGEBITS 10
-// 1024
-#define RANGE (1<<RANGEBITS)
-#include <r_anal.h>
-#if USE_NEW_FCN_STORE
-
-#define STROFF(x) sdb_fmt (4, "flg.%"PFMT64x, x)
-
-static int cmpfun(void *a, void *b) {
-	RAnalFunction *fa = (RAnalFunction*)a;
-	RAnalFunction *fb = (RAnalFunction*)b;
-	// TODO: swap sort order here or wtf?
-	return (fb->addr - fa->addr);
-}
-
-static void listrange_free_kv(HtKv *kv) {
-	free (kv->key);
-	r_list_free (kv->value);
-	free (kv);
-}
-
-R_API RListRange* r_listrange_new () {
-	RListRange *s = R_NEW (RListRange);
-	s->h = ht_new (NULL, listrange_free_kv, NULL);
-	//s->l shouldn't free is a helper structure to get data in order
-	//s->h will free the list that contains RAnalFunction
-	s->l = r_list_new ();
-	return s;
-}
-
-static inline ut64 r_listrange_next(ut64 addr) {
-	return (addr + RANGE);
-}
-
-R_API void r_listrange_free(RListRange *s) {
-	if (!s) {
-		return;
-	}
-	ht_free (s->h);
-	r_list_free (s->l);
-	free (s);
-}
-
-R_API void r_listrange_add(RListRange *s, RAnalFunction *f) {
-	ut64 addr;
-	RList *list;
-	ut64 from = f->addr;
-	ut64 to = f->addr + f->size;
-	for (addr = from; addr < to; addr = r_listrange_next (addr)) {
-		char *key = STROFF (addr);
-		list = ht_find (s->h, key, NULL);
-		if (list) {
-			if (!r_list_contains (list, f)) {
-				r_list_append (list, f);
-			}
-		} else {
-			list = r_list_new ((RListFree)r_anal_fcn_free);
-			r_list_append (list, f);
-			ht_insert (s->h, key, list);
-		}
-	}
-	r_list_add_sorted (s->l, f, cmpfun);
-}
-
-R_API void r_listrange_del(RListRange *s, RAnalFunction *f) {
-	RList *list;
-	ut64 addr, from, to;
-	if (!f) return;
-	from = f->addr;
-	to = f->addr + f->size;
-	for (addr = from; addr < to; addr = r_listrange_next (addr)) {
-		list = ht_find (s->h, STROFF (addr), NULL);
-		if (list) {
-			r_list_delete_data (list, f);
-		}
-	}
-	r_list_delete_data (s->l, f);
-}
-
-R_API void r_listrange_resize(RListRange *s, RAnalFunction *f, int newsize) {
-	if (!f) {
-		return;
-	}
-	r_listrange_del (s, f);
-	f->size = newsize;
-	r_listrange_add (s, f);
-}
-
-R_API RAnalFunction *r_listrange_find_in_range(RListRange* s, ut64 addr) {
-	RAnalFunction *f;
-	RListIter *iter;
-	RList *list = ht_find (s->h, STROFF (addr), NULL);
-	if (list) {
-		r_list_foreach (list, iter, f) {
-			if (R_BETWEEN (f->addr, addr, f->addr + f->_size))
-				return f;
-		}
-	}
-	return NULL;
-}
-
-R_API RAnalFunction *r_listrange_find_root(RListRange* s, ut64 addr) {
-	RAnalFunction *f;
-	RListIter *iter;
-	RList *list = ht_find (s->h, STROFF (addr), NULL);
-	if (list) {
-		r_list_foreach (list, iter, f) {
-			if (addr == f->addr) {
-				return f;
-			}
-		}
-	}
-	return NULL;
-}
-
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/anal/flirt.c radare2-2.8.0+dfsg/libr/anal/flirt.c
--- radare2-2.3.0+dfsg/libr/anal/flirt.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/flirt.c	2018-08-07 14:12:36.000000000 +0000
@@ -591,9 +591,9 @@
 						r_anal_fcn_del ((RAnal *) anal, fcn->addr);
 					}
 				}
-				r_anal_fcn_resize (next_module_function, flirt_fcn_size);
+				r_anal_fcn_resize (anal, next_module_function, flirt_fcn_size);
 				next_module_function_size = r_anal_fcn_size (next_module_function);
-				r_anal_trim_jmprefs (next_module_function);
+				r_anal_trim_jmprefs ((RAnal *)anal, next_module_function);
 			}
 
 
@@ -1471,12 +1471,12 @@
 	r_buf_free (flirt_buf);
 	if (node) {
 		if (!node_match_functions (anal, node)) {
-			eprintf ("Error while scanning the file\n");
+			eprintf ("Error while scanning the file %s\n", flirt_file);
 		}
 		node_free (node);
 		return;
 	} else {
-		eprintf ("We encountered an error while parsing the file. Sorry.\n");
+		eprintf ("We encountered an error while parsing the file %s. Sorry.\n", flirt_file);
 		return;
 	}
 }
diff -Nru radare2-2.3.0+dfsg/libr/anal/hint.c radare2-2.8.0+dfsg/libr/anal/hint.c
--- radare2-2.3.0+dfsg/libr/anal/hint.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/hint.c	2018-08-07 14:12:36.000000000 +0000
@@ -63,6 +63,13 @@
 	setHint (a, "jump:", addr, NULL, ptr);
 }
 
+R_API void r_anal_hint_set_newbits(RAnal *a, ut64 addr, int bits) {
+	a->bits_hints_changed = true;
+	setHint (a, "Bits:", addr, NULL, bits);
+}
+
+// TOOD: add helpers for newendian and newbank
+
 R_API void r_anal_hint_set_fail(RAnal *a, ut64 addr, ut64 ptr) {
 	setHint (a, "fail:", addr, NULL, ptr);
 }
@@ -83,6 +90,10 @@
 	setHint (a, "ptr:", addr, NULL, ptr);
 }
 
+R_API void r_anal_hint_set_ret(RAnal *a, ut64 addr, ut64 val) {
+	setHint (a, "ret:", addr, NULL, val);
+}
+
 R_API void r_anal_hint_set_arch(RAnal *a, ut64 addr, const char *arch) {
 	setHint (a, "arch:", addr, r_str_trim_ro (arch), 0);
 }
@@ -141,6 +152,10 @@
 	unsetHint(a, "ptr:", addr);
 }
 
+R_API void r_anal_hint_unset_ret(RAnal *a, ut64 addr) {
+	unsetHint(a, "ret:", addr);
+}
+
 R_API void r_anal_hint_unset_offset(RAnal *a, ut64 addr) {
 	unsetHint (a, "Offset:", addr);
 }
@@ -173,6 +188,7 @@
 	}
 	hint->jump = UT64_MAX;
 	hint->fail = UT64_MAX;
+	hint->ret = UT64_MAX;
 	char *s = strdup (str);
 	if (!s) {
 		free (hint);
@@ -192,7 +208,9 @@
 			case 'j': hint->jump = sdb_atoi (nxt); break;
 			case 'f': hint->fail = sdb_atoi (nxt); break;
 			case 'p': hint->ptr  = sdb_atoi (nxt); break;
+			case 'r': hint->ret  = sdb_atoi (nxt); break;
 			case 'b': hint->bits = sdb_atoi (nxt); break;
+			case 'B': hint->new_bits = sdb_atoi (nxt); break;
 			case 's': hint->size = sdb_atoi (nxt); break;
 			case 'S': hint->syntax = (char*)sdb_decode (nxt, 0); break;
 			case 'o': hint->opcode = (char*)sdb_decode (nxt, 0); break;
diff -Nru radare2-2.3.0+dfsg/libr/anal/labels.c radare2-2.8.0+dfsg/libr/anal/labels.c
--- radare2-2.3.0+dfsg/libr/anal/labels.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/labels.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,40 +1,37 @@
-/* radare - LGPL - Copyright 2014 - pancake */
+/* radare - LGPL - Copyright 2014-2018 - pancake */
 
 #include <r_anal.h>
 
 #define DB anal->sdb_fcns
 
 // list of all the labels for a specific function
-#define LABELS sdb_fmt (0, "fcn.%"PFMT64x".labels", fcn->addr)
+#define LABELS sdb_fmt ("fcn.%"PFMT64x".labels", fcn->addr)
 // value of each element in the labels list
-#define ADDRLABEL(x,y) sdb_fmt (1, "0x%"PFMT64x"/%s", x,y)
+#define ADDRLABEL(x,y) sdb_fmt ("0x%"PFMT64x"/%s", x,y)
 // resolve by name
-#define LABEL(x) sdb_fmt (2, "fcn.%"PFMT64x".label.%s", fcn->addr, x)
+#define LABEL(x) sdb_fmt ("fcn.%"PFMT64x".label.%s", fcn->addr, x)
 // resolve by addr
-#define ADDR(x) sdb_fmt (3, "fcn.%"PFMT64x".label.0x%"PFMT64x, fcn->addr,x)
+#define ADDR(x) sdb_fmt ("fcn.%"PFMT64x".label.0x%"PFMT64x, fcn->addr,x)
 // SDB looks like fcn.0x80480408.labels=0x8048480/patata,0x0405850/potro
 
 R_API ut64 r_anal_fcn_label_get (RAnal *anal, RAnalFunction *fcn, const char *name) {
-	if (!anal || !fcn)
-		return UT64_MAX;
-	return sdb_num_get (DB, LABEL(name), NULL);
+	return (anal && fcn)? sdb_num_get (DB, LABEL (name), NULL): UT64_MAX;
 }
 
 R_API const char *r_anal_fcn_label_at (RAnal *anal, RAnalFunction *fcn, ut64 addr) {
-	if (!anal || !fcn)
-		return NULL;
-	return sdb_const_get (DB, ADDR(addr), NULL);
+	return (anal && fcn)? sdb_const_get (DB, ADDR (addr), NULL): NULL;
 }
 
 R_API int r_anal_fcn_label_set (RAnal *anal, RAnalFunction *fcn, const char *name, ut64 addr) {
-	if (!anal || !fcn)
+	if (!anal || !fcn) {
 		return false;
-	if (sdb_add (DB, ADDR(addr), name, 0)) {
-		if (sdb_num_add (DB, LABEL(name), addr, 0)) {
+	}
+	if (sdb_add (DB, ADDR (addr), name, 0)) {
+		if (sdb_num_add (DB, LABEL (name), addr, 0)) {
 			sdb_array_add (DB, LABELS, ADDRLABEL (addr, name), 0);
 			return true;
 		} else {
-			sdb_unset (DB, ADDR(addr), 0);
+			sdb_unset (DB, ADDR (addr), 0);
 		}
 	} else {
 		eprintf ("Cannot add\n");
@@ -46,15 +43,15 @@
 	if (!anal || !fcn || !name)
 		return false;
 	sdb_array_remove (DB, LABELS, ADDRLABEL (addr, name), 0);
-	sdb_unset (DB, LABEL(name), 0);
-	sdb_unset (DB, ADDR(addr), 0);
+	sdb_unset (DB, LABEL (name), 0);
+	sdb_unset (DB, ADDR (addr), 0);
 	return true;
 }
 
 R_API int r_anal_fcn_labels(RAnal *anal, RAnalFunction *fcn, int rad) {
-	if (!anal)
+	if (!anal) {
 		return 0;
-
+	}
 	if (fcn) {
 		char *cur, *token;
 		char *str = sdb_get (DB, LABELS, 0);
diff -Nru radare2-2.3.0+dfsg/libr/anal/Makefile radare2-2.8.0+dfsg/libr/anal/Makefile
--- radare2-2.3.0+dfsg/libr/anal/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -27,12 +27,13 @@
 include ${STATIC_ANAL_PLUGINS}
 
 STATIC_OBJS=$(addprefix $(LTOP)/anal/p/,$(STATIC_OBJ))
-OBJLIBS=meta.o reflines.o ref.o op.o fcn.o bb.o var.o
-OBJLIBS+=cond.o value.o cc.o diff.o types.o fcnstore.o
+OBJLIBS=meta.o reflines.o op.o fcn.o bb.o var.o
+OBJLIBS+=cond.o value.o cc.o diff.o
 OBJLIBS+=hint.o anal.o data.o xrefs.o esil.o sign.o
 OBJLIBS+=anal_ex.o switch.o state.o cycles.o
 OBJLIBS+=esil_stats.o esil_trace.o flirt.o labels.o
-OBJLIBS+=esil2reil.o pin.o session.o
+OBJLIBS+=esil2reil.o pin.o session.o vtable.o rtti.o
+OBJLIBS+=rtti_msvc.o rtti_itanium.o
 ASMOBJS+=$(LTOP)/asm/arch/xtensa/gnu/xtensa-modules.o
 ASMOBJS+=$(LTOP)/asm/arch/xtensa/gnu/xtensa-isa.o
 ASMOBJS+=$(LTOP)/asm/arch/xtensa/gnu/elf32-xtensa.o
diff -Nru radare2-2.3.0+dfsg/libr/anal/meson.build radare2-2.8.0+dfsg/libr/anal/meson.build
--- radare2-2.3.0+dfsg/libr/anal/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,108 +1,158 @@
-files=[
-'anal.c',
-'anal_ex.c',
-#'arch/gb/meta_gb_cmt.c',
-'bb.c',
-'cc.c',
-'cond.c',
-'cycles.c',
-'data.c',
-'diff.c',
-'esil.c',
-'esil2reil.c',
-'esil_stats.c',
-'esil_trace.c',
-'fcn.c',
-'fcnstore.c',
-'flirt.c',
-'hint.c',
-'labels.c',
-'meta.c',
-'op.c',
-'p/anal_6502.c',
-'p/anal_8051.c',
-'p/anal_arc.c',
-'p/anal_arm_cs.c',
-# 'p/anal_arm_gnu.c',
-'p/anal_avr.c',
-'p/anal_bf.c',
-'p/anal_cr16.c',
-'p/anal_cris.c',
-'p/anal_dalvik.c',
-'p/anal_ebc.c',
-'p/anal_gb.c',
-'p/anal_h8300.c',
-'p/anal_i4004.c',
-'p/anal_i8080.c',
-#'p/anal_java.c',
-'p/anal_m68k_cs.c',
-'p/anal_malbolge.c',
-'p/anal_mips_cs.c',
-'p/anal_mips_gnu.c',
-'p/anal_msp430.c',
-'p/anal_nios2.c',
-'p/anal_null.c',
-'p/anal_pic.c',
-'p/anal_ppc_cs.c',
-'p/anal_ppc_gnu.c',
-#'p/anal_propeller.c',
-'p/anal_riscv.c',
-#'p/anal_rsp.c',
-'p/anal_sh.c',
-'p/anal_snes.c',
-'p/anal_sparc_cs.c',
-'p/anal_sparc_gnu.c',
-'p/anal_sysz.c',
-'p/anal_tms320.c',
-'p/anal_tms320_c55x_plus.c',
-'p/anal_tms320c64x.c',
-'p/anal_v810.c',
-'p/anal_v850.c',
-'p/anal_vax.c',
-'p/anal_ws.c',
-'p/anal_x86_cs.c',
-'p/anal_x86_udis.c',
-'p/anal_xap.c',
-'p/anal_xcore_cs.c',
-#'p/anal_xtensa.c',
-'p/anal_z80.c',
-'p/esil_x86_udis.c',
-'pin.c',
-'ref.c',
-'reflines.c',
-'session.c',
-'sign.c',
-'state.c',
-'switch.c',
-# 'test.c',
-'types.c',
-'value.c',
-'var.c',
-'xrefs.c',
+files = [
+  'anal.c',
+  'anal_ex.c',
+  'bb.c',
+  'cc.c',
+  'cond.c',
+  'cycles.c',
+  'data.c',
+  'diff.c',
+  'esil.c',
+  'esil2reil.c',
+  'esil_stats.c',
+  'esil_trace.c',
+  'fcn.c',
+  'flirt.c',
+  'hint.c',
+  'labels.c',
+  'meta.c',
+  'op.c',
+  'pin.c',
+  'reflines.c',
+  'rtti.c',
+  'rtti_msvc.c',
+  'rtti_itanium.c',
+  'session.c',
+  'sign.c',
+  'state.c',
+  'switch.c',
+  'value.c',
+  'var.c',
+  'vtable.c',
+  'xrefs.c',
+  'p/anal_6502.c',
+  'p/anal_8051.c',
+  'p/anal_arc.c',
+  'p/anal_arm_cs.c',
+  'p/anal_arm_gnu.c',
+  'p/anal_avr.c',
+  'p/anal_bf.c',
+  'p/anal_chip8.c',
+  'p/anal_cr16.c',
+  'p/anal_cris.c',
+  'p/anal_dalvik.c',
+  'p/anal_ebc.c',
+  'p/anal_gb.c',
+  'p/anal_h8300.c',
+  'p/anal_hexagon.c',
+  'p/anal_i4004.c',
+  'p/anal_i8080.c',
+  'p/anal_java.c',
+  'p/anal_m68k_cs.c',
+  'p/anal_malbolge.c',
+  'p/anal_mips_cs.c',
+  'p/anal_mips_gnu.c',
+  'p/anal_msp430.c',
+  'p/anal_nios2.c',
+  'p/anal_null.c',
+  'p/anal_pic.c',
+  'p/anal_ppc_cs.c',
+  'p/anal_ppc_gnu.c',
+  'p/anal_propeller.c',
+  'p/anal_riscv.c',
+  'p/anal_rsp.c',
+  'p/anal_sh.c',
+  'p/anal_snes.c',
+  'p/anal_sparc_cs.c',
+  'p/anal_sparc_gnu.c',
+  'p/anal_sysz.c',
+  'p/anal_tms320.c',
+  'p/anal_tms320_c55x_plus.c',
+  #'p/anal_tms320c64x.c',
+  'p/anal_v810.c',
+  'p/anal_v850.c',
+  'p/anal_vax.c',
+  'p/anal_wasm.c',
+  'p/anal_ws.c',
+  'p/anal_x86_cs.c',
+  'p/anal_xap.c',
+  'p/anal_xcore_cs.c',
+  'p/anal_xtensa.c',
+  'p/anal_z80.c',
+  #'arch/gb/meta_gb_cmt.c',
+  'arch/hexagon/hexagon_anal.c',
+  '../asm/arch/arm/winedbg/be_arm.c',
+  '../asm/arch/cr16/cr16_disas.c',
+  '../asm/arch/ebc/ebc_disas.c',
+  '../asm/arch/h8300/h8300_disas.c',
+  '../asm/arch/hexagon/hexagon.c',
+  '../asm/arch/hexagon/hexagon_disas.c',
+  '../asm/arch/msp430/msp430_disas.c',
+  '../asm/arch/pic/pic_midrange.c',
+  '../asm/arch/ppc/libvle/vle.c',
+  '../asm/arch/propeller/propeller_disas.c',
+  '../asm/arch/rsp/rsp_idec.c',
+  '../asm/arch/tms320/tms320_dasm.c',
+  '../asm/arch/tms320/c55x_plus/ins.c',
+  '../asm/arch/tms320/c55x_plus/c55plus.c',
+  '../asm/arch/tms320/c55x_plus/c55plus_decode.c',
+  '../asm/arch/tms320/c55x_plus/decode_funcs.c',
+  '../asm/arch/tms320/c55x_plus/hashtable.c',
+  '../asm/arch/tms320/c55x_plus/utils.c',
+  '../asm/arch/v810/v810_disas.c',
+  '../asm/arch/v850/v850_disas.c',
+  '../asm/arch/wasm/wasm.c',
+  '../asm/arch/xtensa/gnu/xtensa-dis.c',
+  '../asm/arch/xtensa/gnu/elf32-xtensa.c',
+  '../asm/arch/xtensa/gnu/xtensa-isa.c',
+  '../asm/arch/xtensa/gnu/xtensa-modules.c'
 ]
+
+r_anal_inc = [
+  platform_inc,
+  include_directories(
+    'arch/gb',
+    'arch/hexagon',
+  )
+]
+
 r_anal = library('r_anal', files,
-  include_directories: [platform_inc, include_directories([
-	'arch/gb',
-	'../asm/arch/8051',
-	'../asm/arch/cr16',
-	'../asm/arch/ebc',
-	'../asm/arch/h8300',
-	'../asm/arch/msp430',
-	#'../asm/arch/propeller',
-	'../asm/arch/tms320',
-	'../asm/arch/v810',
-	'../asm/arch/v850',
-	'../asm/arch/include/',
-	'../../shlr/capstone/include',
-	'../../shlr',
+  include_directories: r_anal_inc,
+  c_args: ['-DCORELIB=1'],
+  dependencies: [
+    r_util_dep,
+    r_reg_dep,
+    r_asm_dep,
+    r_search_dep,
+    r_cons_dep,
+    r_syscall_dep,
+    r_flag_dep,
+    sdb_dep,
+    java_dep,
+    capstone_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_anal_dep = declare_dependency(link_with: r_anal,
+                                include_directories: r_anal_inc)
 
-  ])],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_reg, r_asm, r_syscall, r_search, r_cons, r_flag, libr2udis86],
-  objects: [
-	libr2capstone.extract_all_objects(),
-	libr2sdb.extract_all_objects(),
-	libr2spp.extract_all_objects(),
+pkgconfig_mod.generate(
+  libraries: [r_anal],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_anal',
+  filebase: 'r_anal',
+  requires: [
+    'r_util',
+    'r_reg',
+    'r_asm',
+    'r_syscall',
+    'r_search',
+    'r_cons',
+    'r_flag'
   ],
-  install: true
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/anal/meta.c radare2-2.8.0+dfsg/libr/anal/meta.c
--- radare2-2.3.0+dfsg/libr/anal/meta.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/meta.c	2018-08-07 14:12:36.000000000 +0000
@@ -31,46 +31,52 @@
 #undef DB
 #define DB a->sdb_meta
 
-#if 0
-// Defined but not used. Shall we remove it?
 static char *meta_inrange_get (RAnal *a, ut64 addr, int size) {
-	char key[64];
-	ut64 base, base2;
-	base = META_RANGE_BASE (addr);
-	base2 = META_RANGE_BASE (addr+size);
+	ut64 base = META_RANGE_BASE (addr);
+	ut64 base2 = META_RANGE_BASE (addr + size) + 1;
+	char *res = NULL;
 	// return string array of all the offsets where there are stuff
-	for (; base<base2; base += META_RANGE_SIZE) {
-		snprintf (key, sizeof (key)-1, "range.0x%"PFMT64x, base);
-		sdb_array_get (DB, key, 0, 0);
+	for (; base < base2; base += META_RANGE_SIZE) {
+		const char *key = sdb_fmt ("range.0x%"PFMT64x, base);
+		// char *r = sdb_array_get (DB, key, 0, 0);
+		char *r = sdb_get (DB, key, 0);
+		if (r) {
+			if (res) {
+				res = r_str_append (res, ",");
+			}
+			res = r_str_append (res, r);
+			free (r);
+		}
 	}
-	return NULL;
+	return res;
 }
-#endif
 
-static int meta_inrange_add (RAnal *a, ut64 addr, int size) {
-	int set = 0;
+static bool meta_inrange_add (RAnal *a, ut64 addr, int size) {
+	bool set = false;
 	char key[64];
 	ut64 base, base2;
 	base = META_RANGE_BASE (addr);
-	base2 = META_RANGE_BASE (addr+size);
-	for (; base<base2; base += META_RANGE_SIZE) {
+	base2 = META_RANGE_BASE (addr + size) + 1;
+	for (; base < base2; base += META_RANGE_SIZE) {
 		snprintf (key, sizeof (key)-1, "range.0x%"PFMT64x, base);
-		if (sdb_array_add_num (DB, key, addr, 0))
-			set = 1;
+		if (sdb_array_add_num (DB, key, addr, 0)) {
+			set = true;
+		}
 	}
 	return set;
 }
 
-static int meta_inrange_del (RAnal *a, ut64 addr, int size) {
-	int set = 0;
+static bool meta_inrange_del (RAnal *a, ut64 addr, int size) {
+	bool set = false;
 	char key[64];
 	ut64 base = META_RANGE_BASE (addr);
-	ut64 base2 = META_RANGE_BASE (addr+size);
+	ut64 base2 = META_RANGE_BASE (addr + size) + 1;
 // TODO: optimize this thing?
-	for (; base<base2; base += META_RANGE_SIZE) {
+	for (; base < base2; base += META_RANGE_SIZE) {
 		snprintf (key, sizeof (key)-1, "range.0x%"PFMT64x, base);
-		if (sdb_array_remove_num (DB, key, addr, 0))
-			set = 1;
+		if (sdb_array_remove_num (DB, key, addr, 0)) {
+			set = true;
+		}
 	}
 	//sdb_array_del (DB);
 	return set;
@@ -215,7 +221,6 @@
 					snprintf (key, sizeof (key)-1,
 						"meta.%c.0x%"PFMT64x,
 						type, sdb_atoi (s));
-					eprintf ("--> %s\n", key);
 					sdb_unset (DB, key, 0);
 					if (!next) break;
 				}
@@ -227,10 +232,14 @@
 	if (type == R_META_TYPE_ANY) {
 		/* special case */
 		r_meta_del (a, R_META_TYPE_COMMENT, addr, size);
+		r_meta_del (a, R_META_TYPE_VARTYPE, addr, size);
+	}
+	if (type == R_META_TYPE_COMMENT || type == R_META_TYPE_VARTYPE) {
+		snprintf (key, sizeof (key)-1, "meta.%c.0x%"PFMT64x, type, addr);
+	} else {
+		snprintf (key, sizeof (key)-1, "meta.0x%"PFMT64x, addr);
 	}
 	meta_inrange_del (a, addr, size);
-	snprintf (key, sizeof (key)-1, type == R_META_TYPE_COMMENT ?
-		"meta.C.0x%"PFMT64x : "meta.0x%"PFMT64x, addr);
 	val = sdb_const_get (DB, key, 0);
 	if (val) {
 		if (type == R_META_TYPE_ANY) {
@@ -266,6 +275,7 @@
 	sdb_unset (DB, key, 0);
 	return false;
 }
+
 R_API int r_meta_var_comment_del(RAnal *a, int type, ut64 idx, ut64 addr) {
 	char *key;
 	key = r_str_newf ("meta.%c.0x%"PFMT64x"0x%"PFMT64x, type, addr, idx);
@@ -369,7 +379,7 @@
 	}
 	snprintf (val, sizeof (val)-1, "%c", type);
 	sdb_array_add (DB, key, val, 0);
-
+	meta_inrange_add (a, from, to - from);
 	return true;
 }
 
@@ -416,6 +426,27 @@
 	return NULL;
 }
 
+R_API RAnalMetaItem *r_meta_find_in(RAnal *a, ut64 at, int type, int where) {
+	char *res = meta_inrange_get (a, at, 1);
+	if (!res) {
+		return NULL;
+	}
+	RList *list = r_str_split_list (res, ",");
+	RListIter *iter;
+	const char *meta;
+	r_list_foreach (list, iter, meta) {
+		ut64 mia = r_num_math (NULL, meta);
+		RAnalMetaItem *mi = r_meta_find (a, mia, type, where);
+		if (mi && (at >= mi->from && at < mi->to)) {
+			free (res);
+			return mi;
+		}
+	}
+	r_list_free (list);
+	free (res);
+	return NULL;
+}
+
 R_API const char *r_meta_type_to_string(int type) {
 	// XXX: use type as '%c'
 	switch (type) {
@@ -448,7 +479,7 @@
 			if (!d->subtype) {  /* temporary legacy workaround */
 				esc_bslash = false;
 			}
-			str = r_str_escape_latin1 (d->str, false, esc_bslash);
+			str = r_str_escape_latin1 (d->str, false, esc_bslash, false);
 		}
 	} else {
 		str = r_str_escape (d->str);
diff -Nru radare2-2.3.0+dfsg/libr/anal/op.c radare2-2.8.0+dfsg/libr/anal/op.c
--- radare2-2.3.0+dfsg/libr/anal/op.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/op.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2017 - pancake, nibble */
+/* radare - LGPL - Copyright 2010-2018 - pancake, nibble */
 
 #include <r_anal.h>
 #include <r_util.h>
@@ -50,6 +50,7 @@
 	r_strbuf_fini (&op->opex);
 	r_strbuf_fini (&op->esil);
 	r_anal_switch_op_free (op->switch_op);
+	op->switch_op = NULL;
 	R_FREE (op->mnemonic);
 	return true;
 }
@@ -63,24 +64,51 @@
 	free (_op);
 }
 
-static RAnalVar *get_used_var(RAnal *anal, RAnalOp *op) {
-	char *inst_key = sdb_fmt (0, "inst.0x%"PFMT64x".vars", op->addr);
-	const char *var_def = sdb_const_get (anal->sdb_fcns, inst_key, 0);
-	struct VarUsedType vut;
+R_API RAnalVar *get_link_var(RAnal *anal, ut64 faddr, RAnalVar *var) {
+	const char *var_local = sdb_fmt ("var.0x%"PFMT64x".%d.%d.%s",
+			faddr, 1, var->delta, "reads");
+	const char *xss = sdb_const_get (anal->sdb_fcns, var_local, 0);
+	ut64 addr = r_num_math (NULL, xss);
+	char *inst_key = r_str_newf ("inst.0x%"PFMT64x".lvar", addr);
+	char *var_def = sdb_get (anal->sdb_fcns, inst_key, 0);
 
-	if (sdb_fmt_tobin (var_def, SDB_VARUSED_FMT, &vut) != 4) {
+	if (!var_def) {
+		free (inst_key);
 		return NULL;
 	}
-	RAnalVar *res = r_anal_var_get (anal, vut.fcn_addr, vut.type[0], vut.scope, vut.delta);
-	sdb_fmt_free (&vut, SDB_VARUSED_FMT);
+	struct VarUsedType vut;
+	RAnalVar *res = NULL;
+	if (sdb_fmt_tobin (var_def, SDB_VARUSED_FMT, &vut) == 4) {
+		res = r_anal_var_get (anal, vut.fcn_addr, vut.type[0], vut.scope, vut.delta);
+		sdb_fmt_free (&vut, SDB_VARUSED_FMT);
+	}
+	free (inst_key);
+	free (var_def);
+	return res;
+}
+
+static RAnalVar *get_used_var(RAnal *anal, RAnalOp *op) {
+	char *inst_key = r_str_newf ("inst.0x%"PFMT64x".vars", op->addr);
+	char *var_def = sdb_get (anal->sdb_fcns, inst_key, 0);
+	struct VarUsedType vut;
+	RAnalVar *res = NULL;
+	if (sdb_fmt_tobin (var_def, SDB_VARUSED_FMT, &vut) == 4) {
+		res = r_anal_var_get (anal, vut.fcn_addr, vut.type[0], vut.scope, vut.delta);
+		sdb_fmt_free (&vut, SDB_VARUSED_FMT);
+	}
+	free (inst_key);
+	free (var_def);
 	return res;
 }
 
-R_API int r_anal_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
+R_API int r_anal_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len, int mask) {
 	//len will end up in memcmp so check for negative
 	if (!anal || len < 0) {
 		return -1;
 	}
+
+	anal->decode = mask & R_ANAL_OP_MASK_ESIL ? true : false;
+	anal->fillval = mask & R_ANAL_OP_MASK_VAL ? true : false;
 	if (anal->pcalign) {
 		if (addr % anal->pcalign) {
 			memset (op, 0, sizeof (RAnalOp));
@@ -213,6 +241,50 @@
 	return true;
 }
 
+R_API bool r_anal_op_nonlinear(int t) {
+	t &= R_ANAL_OP_TYPE_MASK;
+	switch (t) {
+	//call
+	case R_ANAL_OP_TYPE_CALL:
+	case R_ANAL_OP_TYPE_RCALL:
+	case R_ANAL_OP_TYPE_ICALL:
+	case R_ANAL_OP_TYPE_UCALL:
+	case R_ANAL_OP_TYPE_IRCALL:
+	case R_ANAL_OP_TYPE_UCCALL:
+	// jmp
+	case R_ANAL_OP_TYPE_JMP:
+	case R_ANAL_OP_TYPE_MJMP:
+	case R_ANAL_OP_TYPE_UJMP:
+	case R_ANAL_OP_TYPE_CJMP:
+	case R_ANAL_OP_TYPE_UCJMP:
+	case R_ANAL_OP_TYPE_RJMP:
+	case R_ANAL_OP_TYPE_IJMP:
+	case R_ANAL_OP_TYPE_IRJMP:
+	// trap| ill| unk
+	case R_ANAL_OP_TYPE_TRAP:
+	case R_ANAL_OP_TYPE_ILL:
+	case R_ANAL_OP_TYPE_UNK:
+	case R_ANAL_OP_TYPE_SWI:
+		return true;
+	default:
+		return false;
+	}
+}
+
+R_API bool r_anal_op_ismemref(int t) {
+	t &= R_ANAL_OP_TYPE_MASK;
+	switch (t) {
+	case R_ANAL_OP_TYPE_LOAD:
+	case R_ANAL_OP_TYPE_MOV:
+	case R_ANAL_OP_TYPE_STORE:
+	case R_ANAL_OP_TYPE_LEA:
+	case R_ANAL_OP_TYPE_CMP:
+		return true;
+	default:
+		return false;
+	}
+}
+
 R_API const char *r_anal_optype_to_string(int t) {
 	t &= R_ANAL_OP_TYPE_MASK; // ignore the modifier bits... we dont want this!
 	switch (t) {
@@ -476,6 +548,9 @@
 	case R_ANAL_OP_FAMILY_MMX: return "mmx";
 	case R_ANAL_OP_FAMILY_SSE: return "sse";
 	case R_ANAL_OP_FAMILY_PRIV: return "priv";
+	case R_ANAL_OP_FAMILY_THREAD: return "thrd";
+	case R_ANAL_OP_FAMILY_CRYPTO: return "crpt";
+	case R_ANAL_OP_FAMILY_IO: return "io";
 	case R_ANAL_OP_FAMILY_VIRT: return "virt";
 	default:
 		snprintf (num, sizeof (num), "%d", n);
@@ -492,6 +567,9 @@
 	if (!strcmp (f, "sse")) return R_ANAL_OP_FAMILY_SSE;
 	if (!strcmp (f, "priv")) return R_ANAL_OP_FAMILY_PRIV;
 	if (!strcmp (f, "virt")) return R_ANAL_OP_FAMILY_VIRT;
+	if (!strcmp (f, "crpt")) return R_ANAL_OP_FAMILY_CRYPTO;
+	if (!strcmp (f, "io")) return R_ANAL_OP_FAMILY_IO;
+	if (!strcmp (f, "thrd")) return R_ANAL_OP_FAMILY_THREAD;
 	return R_ANAL_OP_FAMILY_UNKNOWN;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_6502.c radare2-2.8.0+dfsg/libr/anal/p/anal_6502.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_6502.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_6502.c	2018-08-07 14:12:36.000000000 +0000
@@ -35,54 +35,60 @@
 }
 
 /* ORA, AND, EOR, ADC, STA, LDA, CMP and SBC share this pattern */
-static void _6502_anal_esil_get_addr_pattern1(RAnalOp *op, const ut8* data, char* addrbuf, int addrsize) {
+static void _6502_anal_esil_get_addr_pattern1(RAnalOp *op, const ut8* data, int len, char* addrbuf, int addrsize) {
+	if (len < 1) {
+		return;
+	}
 	// turn off bits 5, 6 and 7
-	switch(data[0] & 0x1f) { // 0x1f = b00111111
+	switch (data[0] & 0x1f) { // 0x1f = b00111111
 	case 0x09: // op #$ff
 		op->cycles = 2;
-		snprintf (addrbuf, addrsize,"0x%02x", data[1]);
+		snprintf (addrbuf, addrsize,"0x%02x", (len > 1)? data[1]: 0);
 		break;
 	case 0x05: // op $ff
 		op->cycles = 3;
-		snprintf (addrbuf, addrsize,"0x%02x", data[1]);
+		snprintf (addrbuf, addrsize,"0x%02x", (len > 1)? data[1]: 0);
 		break;
 	case 0x15: // op $ff,x
 		op->cycles = 4;
-		snprintf (addrbuf, addrsize,"x,0x%02x,+", data[1]);
+		snprintf (addrbuf, addrsize,"x,0x%02x,+", (len > 1)? data[1]: 0);
 		break;
 	case 0x0d: // op $ffff
 		op->cycles = 4;
-		snprintf (addrbuf, addrsize,"0x%04x", data[1] | data[2] << 8);
+		snprintf (addrbuf, addrsize,"0x%04x", (len > 2) ? (data[1] | data[2] << 8): 0);
 		break;
 	case 0x1d: // op $ffff,x
 		// FIXME: Add 1 if page boundary is crossed.
 		op->cycles = 4;
-		snprintf (addrbuf, addrsize,"x,0x%04x,+", data[1] | data[2] << 8);
+		snprintf (addrbuf, addrsize,"x,0x%04x,+", (len > 2) ? data[1] | data[2] << 8: 0);
 		break;
 	case 0x19: // op $ffff,y
 		// FIXME: Add 1 if page boundary is crossed.
 		op->cycles = 4;
-		snprintf (addrbuf, addrsize,"y,0x%04x,+", data[1] | data[2] << 8);
+		snprintf (addrbuf, addrsize,"y,0x%04x,+", (len > 2)? data[1] | data[2] << 8: 0);
 		break;
 	case 0x01: // op ($ff,x)
 		op->cycles = 6;
-		snprintf (addrbuf, addrsize,"x,0x%02x,+,[2]", data[1]);
+		snprintf (addrbuf, addrsize,"x,0x%02x,+,[2]", (len > 1)? data[1]: 0);
 		break;
 	case 0x11: // op ($ff),y
 		// FIXME: Add 1 if page boundary is crossed.
 		op->cycles = 5;
-		snprintf (addrbuf, addrsize,"y,0x%02x,[2],+", data[1]);
+		snprintf (addrbuf, addrsize,"y,0x%02x,[2],+", (len > 1) ? data[1]: 0);
 		break;
 	}
 }
 
 /* ASL, ROL, LSR, ROR, STX, LDX, DEC and INC share this pattern */
-static void _6502_anal_esil_get_addr_pattern2(RAnalOp *op, const ut8* data, char* addrbuf, int addrsize, char reg) {
+static void _6502_anal_esil_get_addr_pattern2(RAnalOp *op, const ut8* data, int len, char* addrbuf, int addrsize, char reg) {
 	// turn off bits 5, 6 and 7
-	switch(data[0] & 0x1f) { // 0x1f = b00111111
+	if (len < 1) {
+		return;
+	}
+	switch (data[0] & 0x1f) { // 0x1f = b00111111
 	case 0x02: // op #$ff
 		op->cycles = 2;
-		snprintf (addrbuf, addrsize, "0x%02x", data[1]);
+		snprintf (addrbuf, addrsize, "0x%02x", (len>1)? data[1]: 0);
 		break;
 	case 0x0a: //op a
 		op->cycles = 2;
@@ -90,30 +96,33 @@
 		break;
 	case 0x06: // op $ff
 		op->cycles = 5;
-		snprintf (addrbuf, addrsize, "0x%02x", data[1]);
+		snprintf (addrbuf, addrsize, "0x%02x", (len>1)?data[1]:0);
 		break;
 	case 0x16: // op $ff,x
 		op->cycles = 6;
-		snprintf (addrbuf, addrsize, "%c,0x%02x,+", reg, data[1]);
+		snprintf (addrbuf, addrsize, "%c,0x%02x,+", reg, (len >1)? data[1]:0);
 		break;
 	case 0x0e: // op $ffff
 		op->cycles = 6;
-		snprintf (addrbuf, addrsize, "0x%04x", data[1] | data[2] << 8);
+		snprintf (addrbuf, addrsize, "0x%04x", (len>2)? data[1] | data[2] << 8: 0);
 		break;
 	case 0x1e: // op $ffff,x
 		op->cycles = 7;
-		snprintf (addrbuf, addrsize, "%c,0x%04x,+", reg, data[1] | data[2] << 8);
+		snprintf (addrbuf, addrsize, "%c,0x%04x,+", reg, (len>2)? data[1] | data[2] << 8: 0);
 		break;
 	}
 }
 
 /* BIT, JMP, JMP(), STY, LDY, CPY, and CPX share this pattern */
-static void _6502_anal_esil_get_addr_pattern3(RAnalOp *op, const ut8* data, char* addrbuf, int addrsize, char reg) {
+static void _6502_anal_esil_get_addr_pattern3(RAnalOp *op, const ut8* data, int len, char* addrbuf, int addrsize, char reg) {
 	// turn off bits 5, 6 and 7
+	if (len < 1) {
+		return;
+	}
 	switch (data[0] & 0x1f) { // 0x1f = b00111111
 	case 0x00: // op #$ff
 		op->cycles = 2;
-		snprintf (addrbuf, addrsize, "0x%02x", data[1]);
+		snprintf (addrbuf, addrsize, "0x%02x", (len > 1) ? data[1]: 0);
 		break;
 	case 0x08: //op a
 		op->cycles = 2;
@@ -121,27 +130,26 @@
 		break;
 	case 0x04: // op $ff
 		op->cycles = 5;
-		snprintf (addrbuf, addrsize, "0x%02x", data[1]);
+		snprintf (addrbuf, addrsize, "0x%02x", (len > 1)? data[1]: 0);
 		break;
 	case 0x14: // op $ff,x
 		op->cycles = 6;
-		snprintf (addrbuf, addrsize, "%c,0x%02x,+", reg, data[1]);
+		snprintf (addrbuf, addrsize, "%c,0x%02x,+", reg, (len>1)? data[1]:0);
 		break;
 	case 0x0c: // op $ffff
 		op->cycles = 6;
-		snprintf (addrbuf, addrsize, "0x%04x", data[1] | data[2] << 8);
+		snprintf (addrbuf, addrsize, "0x%04x", (len>2)? data[1] | data[2] << 8: 0);
 		break;
 	case 0x1c: // op $ffff,x
 		op->cycles = 7;
-		snprintf (addrbuf, addrsize, "%c,0x%04x,+", reg, data[1] | data[2] << 8);
+		snprintf (addrbuf, addrsize, "%c,0x%04x,+", reg, (len>2)? data[1] | data[2] << 8: 0);
 		break;
 	}
 }
 
-static void _6502_anal_esil_ccall(RAnalOp *op, ut8 data0)
-{
+static void _6502_anal_esil_ccall(RAnalOp *op, ut8 data0) {
 	char *flag;
-	switch(data0) {
+	switch (data0) {
 	case 0x10: // bpl $ffff
 		flag = "N,!";
 		break;
@@ -175,8 +183,7 @@
 }
 
 // inc register
-static void _6502_anal_esil_inc_reg(RAnalOp *op, ut8 data0, char* sign)
-{
+static void _6502_anal_esil_inc_reg(RAnalOp *op, ut8 data0, char* sign) {
 	char* reg = NULL;
 
 	switch(data0) {
@@ -289,6 +296,9 @@
 static int _6502_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
 	char addrbuf[64];
 	const int buffsize = sizeof (addrbuf) - 1;
+	if (len < 1) {
+		return -1;
+	}
 
 	memset (op, '\0', sizeof (RAnalOp));
 	op->size = snes_op_get_size (1, 1, &snes_op[data[0]]);	//snes-arch is similiar to nes/6502
@@ -437,7 +447,7 @@
 	case 0x24: // bit $ff
 	case 0x2c: // bit $ffff
 		op->type = R_ANAL_OP_TYPE_MOV;
-		_6502_anal_esil_get_addr_pattern3 (op, data, addrbuf, buffsize, 0);
+		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 0);
 		r_strbuf_setf (&op->esil, "a,%s,[1],&,0x80,&,!,!,N,=,a,%s,[1],&,0x40,&,!,!,V,=,a,%s,[1],&,0xff,&,!,Z,=",addrbuf, addrbuf, addrbuf);
 		break;
 	// ADC
@@ -452,7 +462,7 @@
 		// FIXME: update V
 		// FIXME: support BCD mode
 		op->type = R_ANAL_OP_TYPE_ADD;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		if (data[0] == 0x69) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,+=,C,NUM,$c7,C,=,a,+=,$c7,C,|=", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],a,+=,C,NUM,$c7,C,=,a,+=,$c7,C,|=", addrbuf);
@@ -472,7 +482,7 @@
 		// FIXME: update V
 		// FIXME: support BCD mode
 		op->type = R_ANAL_OP_TYPE_SUB;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		if (data[0] == 0xe9) // immediate mode
 			r_strbuf_setf (&op->esil, "C,!,%s,+,a,-=", addrbuf);
 		else	r_strbuf_setf (&op->esil, "C,!,%s,[1],+,a,-=", addrbuf);
@@ -490,7 +500,7 @@
 	case 0x01: // ora ($ff,x)
 	case 0x11: // ora ($ff),y
 		op->type = R_ANAL_OP_TYPE_OR;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		if (data[0] == 0x09) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,|=", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],a,|=", addrbuf);
@@ -506,7 +516,7 @@
 	case 0x21: // and ($ff,x)
 	case 0x31: // and ($ff),y
 		op->type = R_ANAL_OP_TYPE_AND;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		if (data[0] == 0x29) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,&=", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],a,&=", addrbuf);
@@ -522,7 +532,7 @@
 	case 0x41: // eor ($ff,x)
 	case 0x51: // eor ($ff),y
 		op->type = R_ANAL_OP_TYPE_XOR;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		if (data[0] == 0x49) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,^=", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],a,^=", addrbuf);
@@ -538,7 +548,7 @@
 		if (data[0] == 0x0a) {
 			r_strbuf_set (&op->esil, "1,a,<<=,$c7,C,=,a,a,=");
 		} else  {
-			_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'x');
+			_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'x');
 			r_strbuf_setf (&op->esil, "1,%s,[1],<<,%s,=[1],$c7,C,=", addrbuf, addrbuf);
 		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
@@ -553,7 +563,7 @@
 		if (data[0] == 0x4a) {
 			r_strbuf_set (&op->esil, "1,a,&,C,=,1,a,>>=");
 		} else {
-			_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'x');
+			_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'x');
 			r_strbuf_setf (&op->esil, "1,%s,[1],&,C,=,1,%s,[1],>>,%s,=[1]", addrbuf, addrbuf, addrbuf);
 		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
@@ -568,7 +578,7 @@
 		if (data[0] == 0x2a) {
 			r_strbuf_set (&op->esil, "1,a,<<,C,|,a,=,$c7,C,=,a,a,=");
 		} else {
-			_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'x');
+			_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'x');
 			r_strbuf_setf (&op->esil, "1,%s,[1],<<,C,|,%s,=[1],$c7,C,=", addrbuf, addrbuf);
 		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
@@ -585,7 +595,7 @@
 		if (data[0] == 0x6a) {
 			r_strbuf_set (&op->esil, "C,N,=,1,a,&,C,=,1,a,>>,7,N,<<,|,a,=");
 		} else {
-			_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'x');
+			_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'x');
 			r_strbuf_setf (&op->esil, "C,N,=,1,%s,[1],&,C,=,1,%s,[1],>>,7,N,<<,|,%s,=[1]", addrbuf, addrbuf, addrbuf);
 		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
@@ -596,7 +606,7 @@
 	case 0xee: // inc $ffff
 	case 0xfe: // inc $ffff,x
 		op->type = R_ANAL_OP_TYPE_STORE;
-		_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'x');
+		_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'x');
 		r_strbuf_setf (&op->esil, "%s,++=[1]", addrbuf);
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
@@ -606,7 +616,7 @@
 	case 0xce: // dec $ffff
 	case 0xde: // dec $ffff,x
 		op->type = R_ANAL_OP_TYPE_STORE;
-		_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'x');
+		_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'x');
 		r_strbuf_setf (&op->esil, "%s,--=[1]", addrbuf);
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
@@ -634,7 +644,7 @@
 	case 0xc1: // cmp ($ff,x)
 	case 0xd1: // cmp ($ff),y
 		op->type = R_ANAL_OP_TYPE_CMP;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		if (data[0] == 0xc9) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,==", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],a,==", addrbuf);
@@ -647,7 +657,7 @@
 	case 0xe4: // cpx $ff
 	case 0xec: // cpx $ffff
 		op->type = R_ANAL_OP_TYPE_CMP;
-		_6502_anal_esil_get_addr_pattern3 (op, data, addrbuf, buffsize, 0);
+		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 0);
 		if (data[0] == 0xe0) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,x,==", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],x,==", addrbuf);
@@ -660,7 +670,7 @@
 	case 0xc4: // cpy $ff
 	case 0xcc: // cpy $ffff
 		op->type = R_ANAL_OP_TYPE_CMP;
-		_6502_anal_esil_get_addr_pattern3 (op, data, addrbuf, buffsize, 0);
+		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 0);
 		if (data[0] == 0xc0) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,y,==", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],y,==", addrbuf);
@@ -682,9 +692,15 @@
 		op->cycles = 2;
 		op->failcycles = 3;
 		op->type = R_ANAL_OP_TYPE_CJMP;
-		if (data[1] <= 127)
-			op->jump = addr + data[1] + op->size;
-		else	op->jump = addr - (256 - data[1]) + op->size;
+		if (len > 1) {
+			if (data[1] <= 127) {
+				op->jump = addr + data[1] + op->size;
+			} else {
+				op->jump = addr - (256 - data[1]) + op->size;
+			}
+		} else {
+			op->jump = addr;
+		}
 		op->fail = addr + op->size;
 		// FIXME: add a type of conditional
 		// op->cond = R_ANAL_COND_LE;
@@ -694,7 +710,7 @@
 	case 0x20: // jsr $ffff
 		op->cycles = 6;
 		op->type = R_ANAL_OP_TYPE_CALL;
-		op->jump = data[1] | data[2] << 8;
+		op->jump = (len > 2)? data[1] | data[2] << 8: 0;
 		op->stackop = R_ANAL_STACK_INC;
 		op->stackptr = 2;
 		// JSR pushes the address-1 of the next operation on to the stack before transferring program
@@ -706,7 +722,7 @@
 	case 0x4c: // jmp $ffff
 		op->cycles = 3;
 		op->type = R_ANAL_OP_TYPE_JMP;
-		op->jump = data[1] | data[2] << 8;
+		op->jump = (len > 2)? data[1] | data[2] << 8: 0;
 		r_strbuf_setf (&op->esil, "0x%04x,pc,=", op->jump);
 		break;
 	case 0x6c: // jmp ($ffff)
@@ -753,7 +769,7 @@
 	case 0xa1: // lda ($ff,x)
 	case 0xb1: // lda ($ff),y
 		op->type = R_ANAL_OP_TYPE_LOAD;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		if (data[0] == 0xa9) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,a,=", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],a,=", addrbuf);
@@ -766,10 +782,12 @@
 	case 0xae: // ldx $ffff
 	case 0xbe: // ldx $ffff,y
 		op->type = R_ANAL_OP_TYPE_LOAD;
-		_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'y');
-		if (data[0] == 0xa2) // immediate mode
+		_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'y');
+		if (data[0] == 0xa2) { // immediate mode
 			r_strbuf_setf (&op->esil, "%s,x,=", addrbuf);
-		else	r_strbuf_setf (&op->esil, "%s,[1],x,=", addrbuf);
+		} else {
+			r_strbuf_setf (&op->esil, "%s,[1],x,=", addrbuf);
+		}
 		_6502_anal_update_flags (op, _6502_FLAGS_NZ);
 		break;
 	// LDY
@@ -779,7 +797,7 @@
 	case 0xac: // ldy $ffff
 	case 0xbc: // ldy $ffff,x
 		op->type = R_ANAL_OP_TYPE_LOAD;
-		_6502_anal_esil_get_addr_pattern3 (op, data, addrbuf, buffsize, 'x');
+		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 'x');
 		if (data[0] == 0xa0) // immediate mode
 			r_strbuf_setf (&op->esil, "%s,y,=", addrbuf);
 		else	r_strbuf_setf (&op->esil, "%s,[1],y,=", addrbuf);
@@ -794,7 +812,7 @@
 	case 0x81: // sta ($ff,x)
 	case 0x91: // sta ($ff),y
 		op->type = R_ANAL_OP_TYPE_STORE;
-		_6502_anal_esil_get_addr_pattern1 (op, data, addrbuf, buffsize);
+		_6502_anal_esil_get_addr_pattern1 (op, data, len, addrbuf, buffsize);
 		r_strbuf_setf (&op->esil, "a,%s,=[1]", addrbuf);
 		break;
 	// STX
@@ -802,7 +820,7 @@
 	case 0x96: // stx $ff,y
 	case 0x8e: // stx $ffff
 		op->type = R_ANAL_OP_TYPE_STORE;
-		_6502_anal_esil_get_addr_pattern2 (op, data, addrbuf, buffsize, 'y');
+		_6502_anal_esil_get_addr_pattern2 (op, data, len, addrbuf, buffsize, 'y');
 		r_strbuf_setf (&op->esil, "x,%s,=[1]", addrbuf);
 		break;
 	// STY
@@ -810,7 +828,7 @@
 	case 0x94: // sty $ff,x
 	case 0x8c: // sty $ffff
 		op->type = R_ANAL_OP_TYPE_STORE;
-		_6502_anal_esil_get_addr_pattern3 (op, data, addrbuf, buffsize, 'x');
+		_6502_anal_esil_get_addr_pattern3 (op, data, len, addrbuf, buffsize, 'x');
 		r_strbuf_setf (&op->esil, "y,%s,=[1]", addrbuf);
 		break;
 	// PHP/PHA
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_8051.c radare2-2.8.0+dfsg/libr/anal/p/anal_8051.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_8051.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_8051.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2013-2017 - pancake, dkreuter, astuder  */
+/* radare - LGPL - Copyright 2013-2018 - pancake, dkreuter, astuder  */
 
 #include <string.h>
 #include <r_types.h>
@@ -8,14 +8,153 @@
 
 #include <8051_ops.h>
 
-#define IRAM 0x10000
-#define XRAM 0x10100
-#define IRAM_BASE  "0x10000"
-#define XRAM_BASE  "0x10100"
+typedef struct {
+	const char *name;
+	ut32 map_code;
+	ut32 map_idata;
+	ut32 map_sfr;
+	ut32 map_xdata;
+	ut32 map_pdata;
+} i8051_cpu_model;
+
+static i8051_cpu_model cpu_models[] = {
+	{
+		.name = "8051-generic",
+		.map_code	= 0,
+		.map_idata	= 0x10000000,
+		.map_sfr	= 0x10000180,
+		.map_xdata	= 0x20000000,
+		.map_pdata	= 0x00000000
+	},
+	{
+		.name = "8051-shared-code-xdata",
+		.map_code	= 0,
+		.map_idata	= 0x10000000,
+		.map_sfr	= 0x10000180,
+		.map_xdata	= 0x00000000,
+		.map_pdata	= 0x00000000
+	},
+	{
+		.name = NULL	// last entry
+	}
+};
 
 static bool i8051_is_init = false;
-// doesnt needs to be global, but anyway :D
-static RAnalEsilCallbacks ocbs = {0};
+static const i8051_cpu_model *cpu_curr_model = NULL;
+
+static bool i8051_reg_write (RReg *reg, const char *regname, ut32 num) {
+	if (reg) {
+		RRegItem *item = r_reg_get (reg, regname, R_REG_TYPE_GPR);
+		if (item) {
+			r_reg_set_value (reg, item, num);
+			return true;
+		}
+	}
+	return false;
+}
+
+static ut32 i8051_reg_read (RReg *reg, const char *regname) {
+	if (reg) {
+		RRegItem *item = r_reg_get (reg, regname, R_REG_TYPE_GPR);
+		if (item) {
+			return r_reg_get_value (reg, item);
+		}
+	}
+	return 0;
+}
+
+typedef struct {
+	RIODesc *desc;
+	ut32 addr;
+	const char *name;
+} i8051_map_entry;
+
+static const int I8051_IDATA = 0;
+static const int I8051_SFR = 1;
+static const int I8051_XDATA = 2;
+
+static i8051_map_entry mem_map[3] = {
+	{ NULL, UT32_MAX, "idata" },
+	{ NULL, UT32_MAX, "sfr" },
+	{ NULL, UT32_MAX, "xdata" }
+};
+
+static void map_cpu_memory (RAnal *anal, int entry, ut32 addr, ut32 size, bool force) {
+	RIODesc *desc = mem_map[entry].desc;
+	if (desc && anal->iob.fd_get_name (anal->iob.io, desc->fd)) {
+		if (force || addr != mem_map[entry].addr) {
+			// reallocate mapped memory if address changed
+			anal->iob.fd_remap (anal->iob.io, desc->fd, addr);
+		}
+	} else {
+		// allocate memory for address space
+		char *mstr = r_str_newf ("malloc://%d", size);		
+		desc = anal->iob.open_at (anal->iob.io, mstr, R_IO_READ | R_IO_WRITE, 0, addr);		
+		r_str_free (mstr);
+		// set 8051 address space as name of mapped memory
+		if (desc && anal->iob.fd_get_name (anal->iob.io, desc->fd)) {
+			RList *maps = anal->iob.fd_get_map (anal->iob.io, desc->fd);
+			RIOMap *current_map;
+			RListIter *iter;
+			r_list_foreach (maps, iter, current_map) {
+				char *cmdstr = r_str_newf ("omni %d %s", current_map->id, mem_map[entry].name);
+				anal->coreb.cmd (anal->coreb.core, cmdstr);
+				r_str_free (cmdstr);
+			}
+			r_list_free (maps);
+		}
+	}
+	mem_map[entry].desc = desc;
+	mem_map[entry].addr = addr;
+}
+
+static void set_cpu_model(RAnal *anal, bool force) {
+	ut32 addr_idata, addr_sfr, addr_xdata;
+
+	if (!anal->reg) {
+		return;
+	}
+
+	const char *cpu = anal->cpu;
+	if (!cpu || !cpu[0]) {
+		cpu = cpu_models[0].name;
+	}
+
+	// if cpu model changed, reinitalize emulation
+	if (force || !cpu_curr_model || r_str_casecmp (cpu, cpu_curr_model->name)) {
+		// find model by name
+		int i = 0;
+		while (cpu_models[i].name && r_str_casecmp (cpu, cpu_models[i].name)) {
+			i++;
+		}
+		if (!cpu_models[i].name) {
+			i = 0;	// if not found, default to generic 8051
+		}
+		cpu_curr_model = &cpu_models[i];
+
+		// TODO: Add flags as needed - seek using pseudo registers works w/o flags
+
+		// set memory map registers
+		addr_idata = cpu_models[i].map_idata;
+		addr_sfr = cpu_models[i].map_sfr;
+		addr_xdata = cpu_models[i].map_xdata;
+		i8051_reg_write (anal->reg, "_code", cpu_models[i].map_code);
+		i8051_reg_write (anal->reg, "_idata", addr_idata);
+		i8051_reg_write (anal->reg, "_sfr", addr_sfr - 0x80);
+		i8051_reg_write (anal->reg, "_xdata", addr_xdata);
+		i8051_reg_write (anal->reg, "_pdata", cpu_models[i].map_pdata);
+	} else {
+		addr_idata = i8051_reg_read (anal->reg, "_idata");
+		addr_sfr = i8051_reg_read (anal->reg, "_sfr") + 0x80;
+		addr_xdata = i8051_reg_read (anal->reg, "_xdata");
+	}
+
+	// (Re)allocate memory as needed.
+	// We assume that code is allocated with firmware image
+	map_cpu_memory (anal, I8051_IDATA, addr_idata, 0x100, force);
+	map_cpu_memory (anal, I8051_SFR, addr_sfr, 0x80, force);
+	map_cpu_memory (anal, I8051_XDATA, addr_xdata, 0x10000, force);
+}
 
 static ut8 bitindex[] = {
 	// bit 'i' can be found in (ram[bitindex[i>>3]] >> (i&7)) & 1
@@ -25,6 +164,7 @@
 	0xC0, 0xC8, 0xD0, 0xD8, 0xE0, 0xE8, 0xF0, 0xF8  // 0xC0
 };
 
+#if 0
 typedef struct {
 	const char *name;
 	ut8 offset; // offset into memory, where the value is held
@@ -34,6 +174,7 @@
 	ut8 isdptr : 1;
 } RI8051Reg;
 
+// custom reg read/write temporarily disabled - see r2 issue #9242
 static RI8051Reg registers[] = {
 	// keep these sorted
 	{"a",     0xE0, 0x00, 1, 0},
@@ -67,119 +208,227 @@
 	{"tl1",   0x8B, 0x00, 1, 0},
 	{"tmod",  0x89, 0x00, 1, 0}
 };
+#endif
+
+#define e(frag) r_strbuf_append(&op->esil, frag)
+#define ef(frag, ...) r_strbuf_appendf(&op->esil, frag, __VA_ARGS__)
+
+#define flag_c "$c7,c,=,"
+#define flag_b "$b8,c,=,"
+#define flag_ac "$c3,ac,=,"
+#define flag_ab "$b3,ac,=,"
+#define flag_ov "$c6,ov,=,"
+#define flag_ob "$b7,$b6,^,ov,=,"
+#define flag_p "0xff,a,&=,$p,!,p,=,"
+
+#define ev_a 0
+#define ev_bit bitindex[buf[1]>>3]
+#define ev_c 0
+#define ev_dir1 buf[1]
+#define ev_dir2 buf[2]
+#define ev_dp 0
+#define ev_dpx 0
+#define ev_imm1 buf[1]
+#define ev_imm2 buf[2]
+#define ev_imm16 op->val
+#define ev_ri 1 & buf[0]
+#define ev_rix 1 & buf[0]
+#define ev_rn 7 & buf[0]
+#define ev_sp2 0
+#define ev_sp1 0
+
+static void exr_a(RAnalOp *op, ut8 dummy) {
+	e ("a,");
+}
+
+static void exr_dir1(RAnalOp *op, ut8 addr) {
+	if (addr < 0x80) {
+		ef ("_idata,%d,+,[1],", addr);
+	} else {
+		ef ("_sfr,%d,+,[1],", addr);
+	}
+}
+
+static void exr_bit(RAnalOp *op, ut8 addr) {
+	exr_dir1 (op, addr);
+}
+
+static void exr_dpx (RAnalOp *op, ut8 dummy) {
+	e ("_xdata,dptr,+,[1],");
+}
+
+static void exr_imm1(RAnalOp *op, ut8 val) {
+	ef ("%d,", val);
+}
+
+static void exr_imm2(RAnalOp *op, ut8 val) {
+	ef ("%d,", val);
+}
+
+static void exr_imm16(RAnalOp *op, ut16 val) {
+	ef ("%d,", val);
+}
 
-#define emit(frag) r_strbuf_appendf(&op->esil, frag)
-#define emitf(...) r_strbuf_appendf(&op->esil, __VA_ARGS__)
+static void exr_ri(RAnalOp *op, ut8 reg) {
+	ef ("_idata,r%d,+,[1],", reg);
+}
 
-#define j(frag) emitf(frag, 1 & buf[0], buf[1], buf[2], op->jump, op->fail, op->val)
-#define h(frag) emitf(frag, 7 & buf[0], buf[1], buf[2], op->jump, op->fail, op->val)
-#define k(frag) emitf(frag, bitindex[buf[1]>>3], buf[1] & 7, buf[2], op->jump, op->fail, op->val)
-
-#define FLAG_C "$c7,c,=,"
-#define FLAG_B "$b8,c,=,"
-#define FLAG_AC "$c3,ac,=,"
-#define FLAG_AB "$b3,ac,=,"
-#define FLAG_OV "$c6,ov,=,"
-#define FLAG_OB "$b7,$b6,^,ov,=,"
-#define FLAG_P "0xff,a,&=,$p,!,p,=,"
-
-#define ES_IB1 IRAM_BASE ",%2$d,+,"
-#define ES_IB2 IRAM_BASE ",%3$d,+,"
-#define ES_BIT IRAM_BASE ",%1$d,+,"
-#define ES_RI  IRAM_BASE ",r%1$d,+,"
-#define ES_SP  IRAM_BASE ",sp,+,"
-#define ES_SP2 IRAM_BASE ",sp,+,"
-#define ES_DPI IRAM_BASE ",dptr,+,"
-#define ES_R0X XRAM_BASE ",r%1$d,+,"
-#define ES_DPX XRAM_BASE ",dptr,+,"
-#define ES_RN  "r%1$d,"
-#define ES_A   "a,"
-#define ES_L1  "%2$d,"
-#define ES_L2  "%3$d,"
-#define ES_L16 "%6$d,"
-#define ES_C   "c,"
-#define ES_DP  "dptr,"
-
-#define ER_IB1 "[1],"
-#define ER_IB2 "[1],"
-#define ER_BIT "[1],"
-#define ER_RI  "[1],"
-#define ER_DPI "[1],"
-#define ER_SP  "[1],"
-#define ER_SP2 "[2],"
-#define ER_R0X "[1],"
-#define ER_DPX "[1],"
-#define ER_RN  ""
-#define ER_A   ""
-#define ER_L1  ""
-#define ER_L2  ""
-#define ER_L16 ""
-#define ER_C   ""
-#define ER_DP  ""
-
-#define EW_IB1 "[1],"
-#define EW_IB2 "[1],"
-#define EW_BIT "[1],"
-#define EW_RI  "[1],"
-#define EW_DPI "[1],"
-#define EW_SP  "[1],"
-#define EW_SP2 "[2],"
-#define EW_R0X "[1],"
-#define EW_DPX "[1],"
-#define EW_RN  ","
-#define EW_A   ","
-#define EW_L1  ","
-#define EW_L2  ","
-#define EW_L16 ","
-#define EW_C   ","
-#define EW_DP  ","
-
-#define XR(subject)            ES_##subject               ER_##subject
-#define XW(subject)            ES_##subject "="           EW_##subject
-#define XI(subject, operation) ES_##subject operation "=" EW_##subject
-
-#define BIT_SET "%2$d,1,<<,"
-#define BIT_MASK BIT_SET "255,^,"
-#define BIT_R "%2$d," XR(BIT) ">>,1,&,"
-#define BIT_C "%2$d,c,<<,"
-
-// on 8051 the stack grows upward and lsb is pushed first meaning
-// that on little-endian esil vms =[2] works as indended
-#define PUSH1 "1,sp,+=," XW(SP)
-#define POP1  XR(SP) "1,sp,-=,"
-#define PUSH2 "1,sp,+=," XW(SP2) "1,sp,+=,"
-#define POP2  "1,sp,-=," XR(SP2) "1,sp,-=,"
-
-#define CALL "%5$d," PUSH2
-#define JMP "%4$d,pc,="
-#define CJMP "?{," JMP ",}"
+static void exr_rix(RAnalOp *op, ut8 reg) {
+	ef ("8,0xff,_pdata,&,<<,_xdata,+,r%d,+,[1],", reg);
+}
+
+static void exr_rn(RAnalOp *op, ut8 reg) {
+	ef ("r%d,", reg);
+}
+
+static void exr_sp1(RAnalOp *op, ut8 dummy) {
+	e ("_idata,sp,+,[1],");
+	e ("1,sp,-=,");
+}
+
+static void exr_sp2(RAnalOp *op, ut8 dummy) {
+	e ("1,sp,-=,");
+	e ("_idata,sp,+,[2],");
+	e ("1,sp,-=,");
+}
 
-#define TEMPLATE_ALU_C(base, op, flags) \
+static void exw_a(RAnalOp *op, ut8 dummy) {
+	e ("a,=,");
+}
+
+static void exw_c(RAnalOp *op, ut8 dummy) {
+	e ("c,=,");
+}
+
+static void exw_dir1(RAnalOp *op, ut8 addr) {
+	if (addr < 0x80) {
+		ef ("_idata,%d,+,=[1],", addr);
+	} else {
+		ef ("_sfr,%d,+,=[1],", addr);
+	}
+}
+
+static void exw_dir2(RAnalOp *op, ut8 addr) {
+	exw_dir1 (op, addr);
+}
+
+static void exw_bit(RAnalOp *op, ut8 addr) {
+	exw_dir1 (op, addr);
+}
+
+static void exw_dp (RAnalOp *op, ut8 dummy) {
+	e ("dptr,=,");
+}
+
+static void exw_dpx (RAnalOp *op, ut8 dummy) {
+	e ("_xdata,dptr,+,=[1],");
+}
+
+static void exw_ri(RAnalOp *op, ut8 reg) {
+	ef ("_idata,r%d,+,=[1],", reg);
+}
+
+static void exw_rix(RAnalOp *op, ut8 reg) {
+	ef ("8,0xff,_pdata,&,<<,_xdata,+,r%d,+,=[1],", reg);
+}
+
+static void exw_rn(RAnalOp *op, ut8 reg) {
+	ef ("r%d,=,", reg);
+}
+
+static void exw_sp1(RAnalOp *op, ut8 dummy) {
+	e ("1,sp,+=,");
+	e ("_idata,sp,+,=[1],");
+}
+
+static void exw_sp2(RAnalOp *op, ut8 dummy) {
+	e ("1,sp,+=,");
+	e ("_idata,sp,+,=[2],");
+	e ("1,sp,+=,");
+}
+
+static void exi_a(RAnalOp *op, ut8 dummy, const char* operation) {
+	ef ("a,%s=,", operation);
+}
+
+static void exi_c(RAnalOp *op, ut8 dummy, const char* operation) {
+	ef ("c,%s=,", operation);
+}
+
+static void exi_dp (RAnalOp *op, ut8 dummy, const char *operation) {
+	ef ("dptr,%s=,", operation);
+}
+
+static void exi_dir1 (RAnalOp *op, ut8 addr, const char *operation) {
+	if (addr < 0x80) {
+		ef ("_idata,%d,+,%s=[1],", addr, operation);
+	} else {
+		ef ("_sfr,%d,+,%s=[1],", addr, operation);
+	}
+}
+
+static void exi_bit (RAnalOp *op, ut8 addr, const char *operation) {
+	exi_dir1 (op, addr, operation);
+}
+
+static void exi_ri(RAnalOp *op, ut8 reg, const char *operation) {
+	ef ("_idata,r%d,+,%s=[1],", reg, operation);
+}
+
+static void exi_rn(RAnalOp *op, ut8 reg, const char *operation) {
+	ef ("r%d,%s=,", reg, operation);
+}
+
+#define xr(subject) exr_##subject (op, ev_##subject)
+#define xw(subject) exw_##subject (op, ev_##subject)
+#define xi(subject, operation) exi_##subject (op, ev_##subject, operation)
+
+#define bit_set ef ("%d,1,<<,", buf[1] & 7)
+#define bit_mask bit_set; e ("255,^,")
+#define bit_r ef ("%d,", buf[1] & 7); xr (bit); e (">>,1,&,")
+#define bit_c ef ("%d,c,<<,", buf[1] & 7);
+
+#define jmp ef ("%d,pc,=", op->jump)
+#define cjmp e ("?{,"); jmp; e (",}")
+#define call ef ("%d,", op->fail); xw (sp2); jmp
+
+#define alu_op(val, aluop, flags) xr (val); e ("a," aluop "=," flags)
+#define alu_op_c(val, aluop, flags) e ("c,"); xr (val); e ("+,a," aluop "=," flags)
+#define alu_op_d(val, aluop) xr (val); xi (dir1, aluop)
+
+#define template_alu4_c(base, aluop, flags) \
 	case base + 0x4: \
-		h ("c," XR(L1) "+," XI(A, op) flags); break; \
+		alu_op_c (imm1, aluop, flags); break; \
 	case base + 0x5: \
-		h ("c," XR(IB1) "+," XI(A, op) flags); break; \
+		alu_op_c (dir1, aluop, flags); break; \
 	case base + 0x6: \
 	case base + 0x7: \
-		j ("c," XR(RI) "+," XI(A, op) flags); break; \
+		alu_op_c (ri, aluop, flags); break; \
 	case base + 0x8: case base + 0x9: \
 	case base + 0xA: case base + 0xB: \
 	case base + 0xC: case base + 0xD: \
 	case base + 0xE: case base + 0xF: \
-		h ("c," XR(RN) "+," XI(A, op) flags); break;
-#define TEMPLATE_ALU(base, op, flags) \
+		alu_op_c (rn, aluop, flags); break;
+
+#define template_alu2(base, aluop) \
+	case base + 0x2: \
+		alu_op_d (a, aluop); break; \
+	case base + 0x3: \
+		alu_op_d (imm2, aluop); break; \
+
+#define template_alu4(base, aluop, flags) \
 	case base + 0x4: \
-		h (XR(L1) XI(A, op) flags); break; \
+		alu_op (imm1, aluop, flags); break; \
 	case base + 0x5: \
-		h (XR(IB1) XI(A, op) flags); break; \
+		alu_op (dir1, aluop, flags); break; \
 	case base + 0x6: \
 	case base + 0x7: \
-		j (XR(RI) XI(A, op) flags); break; \
+		alu_op (ri, aluop, flags); break; \
 	case base + 0x8: case base + 0x9: \
 	case base + 0xA: case base + 0xB: \
 	case base + 0xC: case base + 0xD: \
 	case base + 0xE: case base + 0xF: \
-		h (XR(RN) XI(A, op) flags); break;
+		alu_op (rn, aluop, flags); break;
 
 static void analop_esil(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf) {
 	r_strbuf_init (&op->esil);
@@ -188,293 +437,285 @@
 	switch (buf[0]) {
 	// Irregulars sorted by lower nibble
 	case 0x00: /* nop */
-		emit (",");
+		e (",");
 		break;
 
 	case 0x10: /* jbc bit, offset */
-		k (BIT_R "?{," BIT_MASK XI(BIT, "&") JMP ",}");
+		bit_r; e ("?{,"); bit_mask; xi (bit, "&"); jmp; e (",}");
 		break;
 	case 0x20: /* jb bit, offset */
-		k (BIT_R CJMP);
+		bit_r; cjmp;
 		break;
 	case 0x30: /* jnb bit, offset */
-		k (BIT_R "!," CJMP);
+		bit_r; e ("!,"); cjmp;
 		break;
 	case 0x40: /* jc offset */
-		h ("c,1,&," CJMP);
+		e ("c,1,&,"); cjmp;
 		break;
 	case 0x50: /* jnc offset */
-		h ("c,1,&,!," CJMP );
+		e ("c,1,&,!,"); cjmp;
 		break;
 	case 0x60: /* jz offset */
-		h ("a,0,==," CJMP);
+		e ("a,0,==,"); cjmp;
 		break;
 	case 0x70: /* jnz offset */
-		h ("a,0,==,!," CJMP);
+		e ("a,0,==,!,"); cjmp;
 		break;
 
 	case 0x11: case 0x31: case 0x51: case 0x71:
 	case 0x91: case 0xB1: case 0xD1: case 0xF1: /* acall addr11 */
 	case 0x12: /* lcall addr16 */
-		j (CALL);
-		/* fall through */
+		call;
+		break;
 	case 0x01: case 0x21: case 0x41: case 0x61:
 	case 0x81: case 0xA1: case 0xC1: case 0xE1: /* ajmp addr11 */	
 	case 0x02: /* ljmp addr16 */
 	case 0x80: /* sjmp offset */
-		j (JMP);
+		jmp;
 		break;
 
 	case 0x22: /* ret */
 	case 0x32: /* reti */
-		emitf (POP2 "pc,=");
+		xr (sp2); e ("pc,=");
 		break;
 
 	case 0x03: /* rr a */
-		emit ("1,a,0x101,*,>>,a,=," FLAG_P);
+		e ("1,a,0x101,*,>>,a,=," flag_p);
 		break;
 	case 0x04: /* inc a */
-		h (XI(A, "++") FLAG_P);
+		xi (a, "++"); e (flag_p);
 		break;
 	case 0x05: /* inc direct */
-		h (XI(IB1, "++"));
+		xi (dir1, "++");
 		break;
 	case 0x06: case 0x07: /* inc @Ri */
-		j (XI(RI, "++"));
+		xi (ri, "++");
 		break;
 	case 0x08: case 0x09: case 0x0A: case 0x0B:
-	case 0x0C: case 0x0D: case 0x0E: case 0x0F: /* dec @Rn */
-		h (XI(RN, "++"));
+	case 0x0C: case 0x0D: case 0x0E: case 0x0F: /* inc @Rn */
+		xi (rn, "++");
 		break;
 	case 0x13: /* rrc a */
-		emit ("7,c,<<,1,a,&,c,=,0x7f,1,a,>>,&,+,a,=," FLAG_P);
+		e ("7,c,<<,1,a,&,c,=,0x7f,1,a,>>,&,+,a,=," flag_p);
 		break;
 	case 0x14: /* dec a */
-		h (XI(A, "--") FLAG_P);
+		xi (a, "--"); e (flag_p);
 		break;
 	case 0x15: /* dec direct */
-		h (XI(IB1, "--"));
+		xi (dir1, "--"); e (flag_p);
 		break;
 	case 0x16: case 0x17: /* dec @Ri */
-		j (XI(RI, "--"));
+		xi (ri, "--");
 		break;
 	case 0x18: case 0x19: case 0x1A: case 0x1B:
 	case 0x1C: case 0x1D: case 0x1E: case 0x1F: /* dec @Rn */
-		h (XI(RN, "--"));
+		xi (rn, "--");
 		break;
 	case 0x23: /* rl a */
-		h ("7,a,0x101,*,>>,a,=," FLAG_P);
+		e ("7,a,0x101,*,>>,a,=," flag_p);
 		break;
-	TEMPLATE_ALU (0x20, "+", FLAG_C FLAG_AC FLAG_OV FLAG_P) /* 0x24..0x2f add a,.. */
+	template_alu4 (0x20, "+", flag_c flag_ac flag_ov flag_p) /* 0x24..0x2f add a,.. */
 	case 0x33: /* rlc a */
-		h ("c,1,&,a,a,+=,$c7,c,=,a,+=," FLAG_P);
-		break;
-	TEMPLATE_ALU_C (0x30, "+", FLAG_C FLAG_AC FLAG_OV FLAG_P) /* 0x34..0x2f addc a,.. */
-	case 0x42: /* orl direct, a */
-		h (XR(A) XI(IB1, "|"));
+		e ("c,1,&,a,a,+=,$c7,c,=,a,+=," flag_p);
 		break;
-	case 0x43: /* orl direct, imm */
-		h (XR(L2) XI(IB1, "|"));
-		break;
-	TEMPLATE_ALU (0x40, "|", FLAG_P) /* 0x44..0x4f orl a,.. */
-	case 0x52: /* anl direct, a */
-		h (XR(A) XI(IB1, "&"));
-		break;
-	case 0x53: /* anl direct, imm */
-		h (XR(L2) XI(IB1, "&"));
-		break;
-	TEMPLATE_ALU (0x50, "&", FLAG_P) /* 0x54..0x5f anl a,.. */
-	case 0x62: /* xrl direct, a */
-		h (XR(A) XI(IB1, "^"));
-		break;
-	case 0x63: /* xrl direct, imm */
-		h (XR(L2) XI(IB1, "^"));
-		break;
-	TEMPLATE_ALU (0x60, "^", FLAG_P) /* 0x64..0x6f xrl a,.. */
+	template_alu4_c (0x30, "+", flag_c flag_ac flag_ov flag_p) /* 0x34..0x3f addc a,.. */
+	template_alu2 (0x40, "|") /* 0x42..0x43 orl direct,.. */
+	template_alu4 (0x40, "|", flag_p) /* 0x44..0x4f orl a,.. */
+	template_alu2 (0x50, "&") /* 0x52..0x53 anl direct,.. */
+	template_alu4 (0x50, "&", flag_p) /* 0x54..0x5f anl a,.. */
+	template_alu2 (0x60, "^") /* 0x62..0x63 xrl direct,.. */
+	template_alu4 (0x60, "^", flag_p) /* 0x64..0x6f xrl a,.. */
 	case 0x72: /* orl C, bit */
-		k (BIT_R XI(C, "|"));
+		bit_r; xi (c, "|");
 		break;
 	case 0x73: /* jmp @a+dptr */
-		emit ("dptr,a,+,pc,="); break;
+		e ("dptr,a,+,pc,=");
+		break;
 	case 0x74: /* mov a, imm */
-		h (XR(L1) XW(A) FLAG_P);
+		xr (imm1); xw (a); e (flag_p);
 		break;
 	case 0x75: /* mov direct, imm */
-		h (XR(L2) XW(IB1));
+		xr (imm2); xw (dir1);
 		break;
 	case 0x76: case 0x77: /* mov @Ri, imm */
-		j (XR(L1) XW(RI));
+		xr (imm1); xw (ri);
 		break;
 	case 0x78: case 0x79: case 0x7A: case 0x7B:
 	case 0x7C: case 0x7D: case 0x7E: case 0x7F: /* mov Rn, imm */
-		h (XR(L1) XW(RN));
+		xr (imm1); xw (rn);
 		break;
 	case 0x82: /* anl C, bit */
-		k (BIT_R XI(C, "&"));
+		bit_r; xi (c, "&");
 		break;
 	case 0x83: /* movc a, @a+pc */
-		emit ("a,pc,--,+,[1]," XW(A) FLAG_P);
+		e ("a,pc,--,+,[1],a,=," flag_p);
 		break;
 	case 0x84: /* div ab */
 		// note: escape % if this becomes a format string
-		emit ("b,0,==,ov,=,b,a,%,b,a,/=,b,=,0,c,=," FLAG_P);
+		e ("b,0,==,ov,=,b,a,%,b,a,/=,b,=,0,c,=," flag_p);
 		break;
 	case 0x85: /* mov direct, direct */
-		h (XR(IB1) XW(IB2));
+		xr (dir1); xw (dir2);
 		break;
 	case 0x86: case 0x87: /* mov direct, @Ri */
-		j (XR(RI) XW(IB1));
+		xr (ri); xw (dir1);
 		break;
 	case 0x88: case 0x89: case 0x8A: case 0x8B:
 	case 0x8C: case 0x8D: case 0x8E: case 0x8F: /* mov direct, Rn */
-		h (XR(RN) XW(IB1));
+		xr (rn); xw (dir1);
 		break;
 	case 0x90: /* mov dptr, imm */
-		h (XR(L16) XW(DP));
+		xr (imm16); xw (dp);
 		break;
 	case 0x92: /* mov bit, C */
-		k (BIT_C BIT_MASK XR(BIT) "&,|," XW(BIT));
+		bit_c; bit_mask; xr (bit); e ("&,|,"); xw(bit);
 		break;
 	case 0x93: /* movc a, @a+dptr */
-		h ("a,dptr,+,[1]," XW(A) FLAG_P);
+		e ("a,dptr,+,[1],a,=," flag_p);
 		break;
-	TEMPLATE_ALU_C (0x90, "-", FLAG_B FLAG_AB FLAG_OB FLAG_P) /* 0x94..0x9f subb a,.. */
+	template_alu4_c (0x90, "-", flag_b flag_ab flag_ob flag_p) /* 0x94..0x9f subb a,.. */
 	case 0xA0: /* orl C, /bit */
-		k (BIT_R "!," XI(C, "|"));
+		bit_r; e ("!,"); xi (c, "|");
 		break;
 	case 0xA2: /* mov C, bit */
-		k (BIT_R XW(C));
+		bit_r; xw (c);
 		break;
 	case 0xA3: /* inc dptr */
-		h (XI(DP, "++"));
+		xi (dp, "++");
 		break;
 	case 0xA4: /* mul ab */
-		emit ("8,a,b,*,DUP,a,=,>>,DUP,b,=,0,==,!,ov,=,0,c,=," FLAG_P);
+		e ("8,a,b,*,DUP,a,=,>>,DUP,b,=,0,==,!,ov,=,0,c,=," flag_p);
 		break;
 	case 0xA5: /* "reserved" */
-		emit ("0,trap");
+		e ("0,trap");
 		break;
 	case 0xA6: case 0xA7: /* mov @Ri, direct */
-		j (XR(IB1) XW(RI));
+		xr (dir1); xw (ri);
 		break;
 	case 0xA8: case 0xA9: case 0xAA: case 0xAB:
 	case 0xAC: case 0xAD: case 0xAE: case 0xAF: /* mov Rn, direct */
-		h (XR(IB1) XW(RN));
+		xr (dir1); xw (rn);
 		break;
 	case 0xB0: /* anl C, /bit */
-		k (BIT_R "!," XI(C, "&"));
+		bit_r; e ("!,"); xi (c, "&");
 		break;
 	case 0xB2: /* cpl bit */
-		k (BIT_SET XI(BIT, "^"));
+		bit_set; xi (bit, "^");
 		break;
 	case 0xB3: /* cpl C */
-		h ("1," XI(C, "^"));
+		e ("1,"); xi (c, "^");
 		break;
 	case 0xB4: /* cjne a, imm, offset */
-		h (XR(L1) XR(A) "-," FLAG_B CJMP);
+		xr (imm1); xr (a); e ("-," flag_b); cjmp;
 		break;
 	case 0xB5: /* cjne a, direct, offset */
-		h (XR(IB1) XR(A) "-," FLAG_B CJMP);
+		xr (dir1); xr (a); e ("-," flag_b); cjmp;
 		break;
 	case 0xB6: case 0xB7: /* cjne @ri, imm, offset */
-		j (XR(L1) XR(RI) "-," FLAG_B CJMP);
+		xr (imm1); xr (ri); e ("-," flag_b); cjmp;
 		break;
 	case 0xB8: case 0xB9: case 0xBA: case 0xBB:
 	case 0xBC: case 0xBD: case 0xBE: case 0xBF: /* cjne Rn, imm, offset */
-		h (XR(L1) XR(RN) "-," FLAG_B CJMP);
+		xr (imm1); xr (rn); e ("-," flag_b); cjmp;
 		break;
 	case 0xC0: /* push direct */
-		h (XR(IB1) PUSH1);
+		xr (dir1); xw (sp1);
 		break;
 	case 0xC2: /* clr bit */
-		k (BIT_MASK XI(BIT, "&"));
+		bit_mask; xi (bit, "&");
 		break;
 	case 0xC3: /* clr C */
-		h ("0," XW(C));
+		e ("0,"); xw (c);
 		break;
 	case 0xC4: /* swap a */
-		h ("0xff,4,a,0x101,*,>>,&," XW(A) FLAG_P);
+		e ("0xff,4,a,0x101,*,>>,&,a,=," flag_p);
 		break;
 	case 0xC5: /* xch a, direct */
-		h (XR(A) "0,+," XR(IB1) XW(A) XW(IB1) FLAG_P);
+		xr (a); e ("0,+,"); xr (dir1); xw (a); xw (dir1); e (flag_p);
 		break;
 	case 0xC6: case 0xC7: /* xch a, @Ri */ 
-		j (XR(A) "0,+," XR(RI) XW(A) XW(RI) FLAG_P);
+		xr (a); e ("0,+,"); xr (ri); xw (a); xw (ri); e (flag_p);
 		break;
 	case 0xC8: case 0xC9: case 0xCA: case 0xCB:
 	case 0xCC: case 0xCD: case 0xCE: case 0xCF: /* xch a, Rn */
-		h (XR(A) "0,+," XR(RN) XW(A) XW(RN) FLAG_P);
+		xr (a); e ("0,+,"); xr (rn); xw (a); xw (rn); e (flag_p);
 		break;
 	case 0xD0: /* pop direct */
-		h (POP1 XW(IB1));
+		xr (sp1); xw (dir1);
 		break;
 	case 0xD2: /* setb bit */
-		k (BIT_SET XI(BIT, "|"));
+		bit_set; xi (bit, "|");
 		break;
 	case 0xD3: /* setb C */
-		h ("1," XW(C));
+		e ("1,"); xw (c);
 		break;
 	case 0xD4: /* da a */
 		// BCD adjust after add:
 		// if (lower nibble > 9) or (AC == 1) add 6
 		// if (higher nibble > 9) or (C == 1) add 0x60
 		// carry |= carry caused by this operation
-		emit ("a,0x0f,&,9,<,ac,|,?{,6,a,+=,$c7,c,|=,},a,0xf0,&,0x90,<,c,|,?{,0x60,a,+=,$c7,c,|=,}," FLAG_P);
+		e ("a,0x0f,&,9,<,ac,|,?{,6,a,+=,$c7,c,|=,},a,0xf0,&,0x90,<,c,|,?{,0x60,a,+=,$c7,c,|=,}," flag_p);
 		break;
 	case 0xD5: /* djnz direct, offset */
-		h (XI(IB1, "--") XR(IB1) "0,==,!," CJMP);
+		xi (dir1, "--"); xr (dir1); e ("0,==,!,"); cjmp;
 		break;
 	case 0xD6:
 	case 0xD7: /* xchd a, @Ri*/
-		j (XR(A) "0xf0,&," XR(RI) "0x0f,&,|," XR(RI) "0xf0,&," XR(A) "0x0f,&,|," XW(RI) XW(A) FLAG_P);
+		xr (a); e ("0xf0,&,"); xr (ri); e ("0x0f,&,|,");
+		xr (ri); e ("0xf0,&,"); xr (a); e ("0x0f,&,|,");
+		xw (ri); xw (a); e (flag_p);
 		break;
 	case 0xD8: case 0xD9: case 0xDA: case 0xDB:
 	case 0xDC: case 0xDD: case 0xDE: case 0xDF: /* djnz Rn, offset */
-		h (XI(RN, "--") XR(RN) "0,==,!," CJMP);
+		xi (rn, "--"); xr (rn); e ("0,==,!,"); cjmp;
 		break;
 	case 0xE0: /* movx a, @dptr */
-		h (XR(DPX) XW(A) FLAG_P);
+		xr (dpx); xw (a); e (flag_p);
 		break;
 	case 0xE2: case 0xE3: /* movx a, @Ri */
-		j (XR(R0X) XW(A) FLAG_P);
+		xr (rix); xw (a); e (flag_p);
 		break;
 	case 0xE4: /* clr a */
-		emit ("0," XW(A) FLAG_P);
+		e ("0,"); xw (a); e (flag_p);
 		break;
 	case 0xE5: /* mov a, direct */
-		h (XR(IB1) XW(A) FLAG_P);
+		xr (dir1); xw (a); e (flag_p);
 		break;
 	case 0xE6: case 0xE7: /* mov a, @Ri */
-		j (XR(RI) XW(A) FLAG_P);
+		xr (ri); xw (a); e (flag_p);
 		break;
 	case 0xE8: case 0xE9: case 0xEA: case 0xEB:
 	case 0xEC: case 0xED: case 0xEE: case 0xEF: /* mov a, Rn */
-		h (XR(RN) XW(A) FLAG_P);
+		xr (rn); xw (a); e (flag_p);
 		break;
 	case 0xF0: /* movx @dptr, a */
-		h (XR(A) XW(DPX));
+		xr (a); xw (dpx);
 		break;
 	case 0xF2: case 0xF3: /* movx @Ri, a */
-		j (XR(A) XW(R0X));
+		xr (a); xw (rix);
 		break;
 	case 0xF4: /* cpl a */
-		h ("255," XI(A, "^") FLAG_P);
+		e ("255,"); xi (a, "^"); e (flag_p);
 		break;
 	case 0xF5: /* mov direct, a */
-		h (XR(A) XW(IB1));
+		xr (a); xw (dir1);
 		break;
 	case 0xF6: case 0xF7: /* mov  @Ri, a */
-		j (XR(A) XW(RI));
+		xr (a); xw (ri);
 		break;
 	case 0xF8: case 0xF9: case 0xFA: case 0xFB:
 	case 0xFC: case 0xFD: case 0xFE: case 0xFF: /* mov Rn, a */
-		h (XR(A) XW(RN));
+		xr (a); xw (rn);
 		break;
 	default:
 		break;
 	}
 }
 
+static RAnalEsilCallbacks ocbs = {0};
+
+#if 0
+// custom reg read/write temporarily disabled - see r2 issue #9242
 static int i8051_hook_reg_read(RAnalEsil *, const char *, ut64 *, int *);
 
 static int i8051_reg_compare(const void *name, const void *reg) {
@@ -512,7 +753,7 @@
 
 	if ((ri = i8051_reg_find (name))) {
 		ut8 offset = i8051_reg_get_offset(esil, ri);
-		ret = r_anal_esil_mem_read (esil, IRAM + offset, (ut8*)res, ri->num_bytes);
+		ret = r_anal_esil_mem_read (esil, IRAM_BASE + offset, (ut8*)res, ri->num_bytes);
 	}
 	esil->cb = ocbs;
 	if (!ret && ocbs.hook_reg_read) {
@@ -532,7 +773,7 @@
 	RAnalEsilCallbacks cbs = esil->cb;
 	if ((ri = i8051_reg_find (name))) {
 		ut8 offset = i8051_reg_get_offset(esil, ri);
-		ret = r_anal_esil_mem_write (esil, IRAM + offset, (ut8*)val, ri->num_bytes);
+		ret = r_anal_esil_mem_write (esil, IRAM_BASE + offset, (ut8*)val, ri->num_bytes);
 	}
 	esil->cb = ocbs;
 	if (!ret && ocbs.hook_reg_write) {
@@ -541,6 +782,7 @@
 	esil->cb = cbs;
 	return ret;
 }
+#endif
 
 static int esil_i8051_init (RAnalEsil *esil) {
 	if (esil->cb.user) {
@@ -566,7 +808,7 @@
 	return true;
 }
 
-static char *get_reg_profile(RAnal *anal) {
+static int set_reg_profile(RAnal *anal) {
 	const char *p =
 		"=PC	pc\n"
 		"=SP	sp\n"
@@ -589,11 +831,53 @@
 		"gpr	ac	.1	.102	0\n"
 		"gpr	c	.1	.103	0\n"
 		"gpr	sp	.8	13	0\n"
-		"gpr	pc	.16	15	0\n";
-		return strdup (p);
+		"gpr	pc	.16	15	0\n"
+// ---------------------------------------------------
+// 8051 memory emulation control registers
+// These registers map 8051 memory classes to r2's
+// linear address space. Registers contain base addr
+// in r2 memory space representing the memory class.
+// Offsets are initialized based on asm.cpu, but can
+// be updated with ar command.
+//
+// _code
+//		program memory (CODE)
+// _idata
+//		internal data memory (IDATA, IRAM)
+// _sfr
+//		special function registers (SFR)
+// _xdata
+//		external data memory (XDATA, XRAM)
+// _pdata
+//		page accessed by movx @ri op (PDATA, XREG)
+//		r2 addr = (_pdata & 0xff) << 8 + x_data
+//		if 0xffffffnn, addr = ([SFRnn] << 8) + _xdata (TODO)
+		"gpr	_code	.32	20 0\n"
+		"gpr	_idata	.32 24 0\n"
+		"gpr	_sfr	.32	28 0\n"
+		"gpr	_xdata	.32 32 0\n"
+		"gpr	_pdata	.32	36 0\n";
+
+	int retval = r_reg_set_profile_string (anal->reg, p);
+	if (retval) {
+		// reset emulation control registers based on cpu
+		set_cpu_model (anal, true);
+	}
+
+	return retval;
+}
+
+static ut32 map_direct_addr(RAnal *anal, ut8 addr) {
+	if (addr < 0x80) {
+		return addr + i8051_reg_read (anal->reg, "_idata");
+	} else {
+		return addr + i8051_reg_read (anal->reg, "_sfr");
+	}
 }
 
 static int i8051_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
+	set_cpu_model (anal, false);
+
 	op->delay = 0;
 
 	int i = 0;
@@ -610,17 +894,17 @@
 
 	switch (arg1) {
 	case A_DIRECT:
-		op->ptr = buf[1] + IRAM;
+		op->ptr = map_direct_addr (anal, buf[1]);
 		break;
 	case A_BIT:
-		op->ptr = arg_bit (buf[1]) + IRAM;
+		op->ptr = map_direct_addr (anal, arg_bit (buf[1]));
 		break;
 	case A_IMMEDIATE:
 		op->val = buf[1];
 		break;
 	case A_IMM16:
 		op->val = buf[1] * 256 + buf[2];
-		op->ptr = XRAM + op->val;	// best guess, it's a XRAM pointer
+		op->ptr = op->val + i8051_reg_read (anal->reg, "_xdata"); // best guess, it's a XRAM pointer
 		break;
 	default:
 		break;
@@ -629,14 +913,14 @@
 	switch (arg2) {
 	case A_DIRECT:
 		if (arg1 == A_RI || arg1 == A_RN) {
-			op->ptr = IRAM + buf[1];
+			op->ptr = map_direct_addr (anal, buf[1]);
 		} else if (arg1 != A_DIRECT) {
-			op->ptr = IRAM + buf[2];
+			op->ptr = map_direct_addr (anal, buf[2]);
 		}
 		break;
 	case A_BIT:
 		op->ptr = arg_bit ((arg1 == A_RI || arg1 == A_RN) ? buf[1] : buf[2]);
-		op->ptr += IRAM;
+		op->ptr = map_direct_addr (anal, op->ptr);
 		break;
 	case A_IMMEDIATE:
 		op->val = (arg1 == A_RI || arg1 == A_RN) ? buf[1] : buf[2];
@@ -648,13 +932,11 @@
 	switch(_8051_ops[i].instr) {
 	case OP_PUSH:
 		op->type = R_ANAL_OP_TYPE_PUSH;
-		op->ptr = 0;
 		op->stackop = R_ANAL_STACK_INC;
 		op->stackptr = 1;
 		break;
 	case OP_POP:
 		op->type = R_ANAL_OP_TYPE_POP;
-		op->ptr = 0;
 		op->stackop = R_ANAL_STACK_INC;
 		op->stackptr = -1;
 		break;
@@ -701,6 +983,8 @@
 		break;
 	case OP_CALL:
 		op->type = R_ANAL_OP_TYPE_CALL;
+		op->stackop = R_ANAL_STACK_INC;
+		op->stackptr = 2;
 		if (arg1 == A_ADDR11) {
 			op->jump = arg_addr11 (addr + op->size, buf);
 			op->fail = addr + op->size;
@@ -768,7 +1052,7 @@
 	.desc = "8051 CPU code analysis plugin",
 	.license = "LGPL3",
 	.op = &i8051_op,
-	.get_reg_profile = &get_reg_profile,
+	.set_reg_profile = &set_reg_profile,
 	.esil_init = esil_i8051_init,
 	.esil_fini = esil_i8051_fini
 };
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_arm_cs.c radare2-2.8.0+dfsg/libr/anal/p/anal_arm_cs.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_arm_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_arm_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,12 +1,15 @@
-/* radare2 - LGPL - Copyright 2013-2017 - pancake */
+/* radare2 - LGPL - Copyright 2013-2018 - pancake */
 
 #include <r_anal.h>
 #include <r_lib.h>
 #include <capstone/capstone.h>
 #include <capstone/arm.h>
-#include "esil.h"
+
+#define esilprintf(op, fmt, ...) r_strbuf_setf (&op->esil, fmt, ##__VA_ARGS__)
+
 /* arm64 */
 #define IMM64(x) (ut64)(insn->detail->arm64.operands[x].imm)
+#define INSOP64(x) insn->detail->arm64.operands[x]
 
 /* arm32 */
 #define REG(x) r_str_get (cs_reg_name (*handle, insn->detail->arm.operands[x].reg))
@@ -14,6 +17,7 @@
 #define REGID64(x) insn->detail->arm64.operands[x].reg
 #define REGID(x) insn->detail->arm.operands[x].reg
 #define IMM(x) (ut32)(insn->detail->arm.operands[x].imm)
+#define INSOP(x) insn->detail->arm.operands[x]
 #define MEMBASE(x) r_str_get (cs_reg_name(*handle, insn->detail->arm.operands[x].mem.base))
 #define MEMBASE64(x) r_str_get (cs_reg_name(*handle, insn->detail->arm64.operands[x].mem.base))
 #define REGBASE(x) insn->detail->arm.operands[x].mem.base
@@ -883,16 +887,67 @@
 	postfix = arm_prefix_cond (op, insn->detail->arm64.cc);
 
 	switch (insn->id) {
-	case ARM64_INS_REV: {
+	case ARM64_INS_REV:
+	{
 		const char *r0 = REG64(0);
 		const char *r1 = REG64(1);
+		int size = REGSIZE64(1);
+#if 0
 		r_strbuf_setf (&op->esil,
-			"24,0xff,%s,&,<<,%s,=,"
-			"16,0xff,8,%s,>>,&,<<,%s,|=,"
-			"8,0xff,16,%s,>>,&,<<,%s,|=,"
-			"0xff,24,%s,>>,&,%s,|=,",
+			"0,%s,=,"                        // dst = 0
+			"%d,"                            // initial counter = size
+			"DUP,"                           // counter: size -> 0 (repeat here)
+				"DUP,1,SWAP,-,8,*,"          // counter to bits in source
+					"DUP,0xff,<<,%s,&,>>,"   // src byte moved to LSB
+				"SWAP,%d,-,8,*,"             // invert counter, calc dst bit
+				"SWAP,<<,%s,|=,"             // shift left to there and insert
+			"4,REPEAT",                      // goto 5th instruction
+			r0, size, r1, size, r0);
+#endif
+		if (size == 8) {
+			r_strbuf_setf (&op->esil,
+				"56,0xff,%s,&,<<,%s,=,"
+				"48,0xff,8,%s,>>,&,<<,%s,|=,"
+				"40,0xff,16,%s,>>,&,<<,%s,|=,"
+				"32,0xff,24,%s,>>,&,<<,%s,|=,"
+				"24,0xff,32,%s,>>,&,<<,%s,|=,"
+				"16,0xff,40,%s,>>,&,<<,%s,|=,"
+				"8,0xff,48,%s,>>,&,<<,%s,|=,"
+				"0xff,56,%s,>>,&,%s,|=,",
+				r1, r0, r1, r0, r1, r0, r1, r0,
+				r1, r0, r1, r0, r1, r0, r1, r0);
+		} else {
+			r_strbuf_setf (&op->esil,
+				"24,0xff,%s,&,<<,%s,=,"
+				"16,0xff,8,%s,>>,&,<<,%s,|=,"
+				"8,0xff,16,%s,>>,&,<<,%s,|=,"
+				"0xff,24,%s,>>,&,%s,|=,",
+				r1, r0, r1, r0, r1, r0, r1, r0);
+		}
+		break;
+	}
+	case ARM64_INS_REV32:
+	{
+		const char *r0 = REG64(0);
+		const char *r1 = REG64(1);
+		r_strbuf_setf (&op->esil,
+			"24,0x000000ff000000ff,%s,&,<<,%s,=,"
+			"16,0x000000ff000000ff,8,%s,>>,&,<<,%s,|=,"
+			"8,0x000000ff000000ff,16,%s,>>,&,<<,%s,|=,"
+			"0x000000ff000000ff,24,%s,>>,&,%s,|=,",
 			r1, r0, r1, r0, r1, r0, r1, r0);
-		} break;
+		break;
+	}
+	case ARM64_INS_REV16:
+	{
+		const char *r0 = REG64(0);
+		const char *r1 = REG64(1);
+		r_strbuf_setf (&op->esil,
+			"8,0xff00ff00ff00ff00,%s,&,>>,%s,=,"
+			"8,0x00ff00ff00ff00ff,%s,&,<<,%s,|=,",
+			r1, r0, r1, r0);
+		break;
+	}
 	case ARM64_INS_ADR:
 		// TODO: must be 21bit signed
 		r_strbuf_setf (&op->esil,
@@ -915,6 +970,8 @@
 	case ARM64_INS_DMB:
 	case ARM64_INS_DSB:
 	case ARM64_INS_ISB:
+		op->family = R_ANAL_OP_FAMILY_THREAD;
+		// intentional fallthrough
 	case ARM64_INS_IC: // instruction cache invalidate
 	case ARM64_INS_DC: // data cache invalidate
 		op->type = R_ANAL_OP_TYPE_SYNC; // or cache
@@ -1022,52 +1079,50 @@
 		default:
 		    break;
 		}
-		if ((int)MEMDISP64(1) < 0) {
-			r_strbuf_setf (&op->esil, "%s,%s,%"PFMT64d",-,=[%d]",
-				REG64(0), MEMBASE64(1), -(int)MEMDISP64(1), size);
-		} else {
-			if (ISMEM64(1)) {
-				if (HASMEMINDEX64(1)) {
-					if (LSHIFT2_64(1)) {
-						r_strbuf_appendf (&op->esil, "%s,%d,%s,%s,+,[%d],%s,=",
-								MEMBASE64(1), LSHIFT2_64(1), MEMINDEX64(1), DECODE_SHIFT64(1), size, REG64(0));
-					} else {
-						r_strbuf_appendf (&op->esil, "%s,%s,+,[%d],%s,=",
-								MEMBASE64(1), MEMINDEX64(1), size, REG64(0));
-					}
+		if (ISMEM64(1)) {
+			if (HASMEMINDEX64(1)) {
+				if (LSHIFT2_64(1)) {
+					r_strbuf_appendf (&op->esil, "%s,%d,%s,%s,+,[%d],%s,=",
+							MEMBASE64(1), LSHIFT2_64(1), MEMINDEX64(1), DECODE_SHIFT64(1), size, REG64(0));
 				} else {
-					if (LSHIFT2_64(1)) {
-						r_strbuf_appendf (&op->esil, "%s,%d,%"PFMT64d",%s,+,[%d],%s,=",
-								MEMBASE64(1), LSHIFT2_64(1), MEMDISP64(1), DECODE_SHIFT64(1), size, REG64(0));
-					} else {
-						r_strbuf_appendf (&op->esil, "%s,%"PFMT64d",+,DUP,tmp,=,[%d],%s,=,",
-								MEMBASE64(1), MEMDISP64(1), size, REG64(0));
-					}
+					r_strbuf_appendf (&op->esil, "%s,%s,+,[%d],%s,=",
+							MEMBASE64(1), MEMINDEX64(1), size, REG64(0));
 				}
-				op->refptr = 4;
 			} else {
-				if (ISREG64(1)) {
-					if (OPCOUNT64() == 2) {
-						r_strbuf_setf (&op->esil, "%s,[%d],%s,=",
-							REG64(1), size, REG64(0));
-					} else if (OPCOUNT64() == 3) {
-						/*
-							This seems like a capstone bug:
-							instructions like
-								ldr x16, [x13, x9]
-								ldrb w2, [x19, x23]
-							are not detected as ARM64_OP_MEM type and
-							fall in this case instead.
-						*/
-						if (ISREG64(2)) {
-							r_strbuf_setf (&op->esil, "%s,%s,+,[%d],%s,=",
-								REG64(1), REG64(2), size, REG64(0));
-						}
-					}
+				if (LSHIFT2_64(1)) {
+					r_strbuf_appendf (&op->esil, "%s,%d,%"PFMT64d",%s,+,[%d],%s,=",
+							MEMBASE64(1), LSHIFT2_64(1), MEMDISP64(1), DECODE_SHIFT64(1), size, REG64(0));
+				} else if ((int)MEMDISP64(1) < 0){
+					r_strbuf_appendf (&op->esil, "%"PFMT64d",%s,-,DUP,tmp,=,[%d],%s,=,",
+							-(int)MEMDISP64(1), MEMBASE64(1), size, REG64(0));
 				} else {
-					r_strbuf_setf (&op->esil, "%"PFMT64d",[%d],%s,=",
-						IMM64(1), size, REG64(0));
+					r_strbuf_appendf (&op->esil, "%s,%"PFMT64d",+,DUP,tmp,=,[%d],%s,=,",
+							MEMBASE64(1), MEMDISP64(1), size, REG64(0));
+				}
+			}
+			op->refptr = 4;
+		} else {
+			if (ISREG64(1)) {
+				if (OPCOUNT64() == 2) {
+					r_strbuf_setf (&op->esil, "%s,[%d],%s,=",
+						REG64(1), size, REG64(0));
+				} else if (OPCOUNT64() == 3) {
+					/*
+						This seems like a capstone bug:
+						instructions like
+							ldr x16, [x13, x9]
+							ldrb w2, [x19, x23]
+						are not detected as ARM64_OP_MEM type and
+						fall in this case instead.
+					*/
+					if (ISREG64(2)) {
+						r_strbuf_setf (&op->esil, "%s,%s,+,[%d],%s,=",
+							REG64(1), REG64(2), size, REG64(0));
+					}
 				}
+			} else {
+				r_strbuf_setf (&op->esil, "%"PFMT64d",[%d],%s,=",
+					IMM64(1), size, REG64(0));
 			}
 		}
 		break;
@@ -1199,34 +1254,34 @@
 		// x2,x8,32,+,=[8],x3,x8,32,+,8,+,=[8]
 		if (ISPREINDEX64()) {
 			// "ldp x0, x1, [x8, -0x10]!"
-			// 16,x8,-=,x0,x8,[8],x1,x8,8,+,[8]
+			// 16,x8,-=,x8,[8],x0,=,x8,8,+,[8],x1,=
 			r_strbuf_setf (&op->esil,
 					"%"PFMT64d",%s,%c=,"
-					"%s,%s,[%d],"
-					"%s,%s,%d,+,[%d]",
+					"%s,[%d],%s,=,"
+					"%s,%d,+,[%d],%s,=",
 					abs, MEMBASE64(2), sign,
-					REG64(0), MEMBASE64(2), size,
-					REG64(1), MEMBASE64(2), size, size);
+					MEMBASE64(2), size, REG64(0),
+					MEMBASE64(2), size, size, REG64(1));
 		// Post-index case
 		} else if (ISPOSTINDEX64()) {
 			int val = IMM64(3);
 			sign = val>=0?'+':'-';
 			abs = val>=0? val: -val;
 			// ldp x4, x5, [x8], -0x10
-			// x4,x8,[8],x5,x8,8,+,[8],16,x8,+=
+			// x8,[8],x4,=,x8,8,+,[8],x5,=,16,x8,+=
 			r_strbuf_setf (&op->esil,
-					"%s,%s,[%d],"
-					"%s,%s,%d,+,[%d],"
+					"%s,[%d],%s,=,"
+					"%s,%d,+,[%d],%s,=,"
 					"%d,%s,%c=",
-					REG64(0), MEMBASE64(2), size,
-					REG64(1), MEMBASE64(2), size, size,
+					MEMBASE64(2), size, REG64(0),
+					MEMBASE64(2), size, size, REG64(1),
 					abs, MEMBASE64(2), sign);
 		} else {
 			r_strbuf_setf (&op->esil,
-					"%s,%s,%"PFMT64d",%c,[%d],"
-					"%s,%s,%"PFMT64d",%c,%d,+,[%d]",
-					REG64(0), MEMBASE64(2), abs, sign, size,
-					REG64(1), MEMBASE64(2), abs, sign, size, size);
+					"%s,%"PFMT64d",%c,[%d],%s,=,"
+					"%s,%"PFMT64d",%c,%d,%c,[%d],%s,=",
+					MEMBASE64(2), abs, sign, size, REG64(0),
+					MEMBASE64(2), abs, sign, size, sign, size, REG64(1));
 		}
 		}
 		break;
@@ -1891,6 +1946,11 @@
 		r_strbuf_appendf (&op->esil, "%s,%d,+,[1],%s,=",
 			MEMBASE(1), MEMDISP(1), REG(0));
 		break;
+	case ARM_INS_LDREXB:
+	case ARM_INS_LDREXD:
+	case ARM_INS_LDREXH:
+		op->family = R_ANAL_OP_FAMILY_THREAD;
+		// intentional fallthrough
 	case ARM_INS_LDRHT:
 	case ARM_INS_LDRH:
 	case ARM_INS_LDRT:
@@ -1899,9 +1959,6 @@
 	case ARM_INS_LDRSBT:
 	case ARM_INS_LDRSH:
 	case ARM_INS_LDRSHT:
-	case ARM_INS_LDREXB:
-	case ARM_INS_LDREXD:
-	case ARM_INS_LDREXH:
 	case ARM_INS_LDR:
 		addr &= ~3LL;
 		if (MEMDISP(1) < 0) {
@@ -2057,6 +2114,41 @@
 			notmask, REG (0), REG (0));
 		break;
 	}
+	case ARM_INS_REV:
+	{
+		const char *r0 = REG (0);
+		const char *r1 = REG (1);
+		r_strbuf_setf (&op->esil,
+			"24,0xff,%s,&,<<,%s,=,"
+			"16,0xff,8,%s,>>,&,<<,%s,|=,"
+			"8,0xff,16,%s,>>,&,<<,%s,|=,"
+			"0xff,24,%s,>>,&,%s,|=,",
+			r1, r0, r1, r0, r1, r0, r1, r0);
+		break;
+	}
+	case ARM_INS_REV16:
+	{
+		const char *r0 = REG (0);
+		const char *r1 = REG (1);
+		r_strbuf_setf (&op->esil,
+			"8,0xff00ff00,%s,&,>>,%s,=,"
+			"8,0x00ff00ff,%s,&,<<,%s,|=,",
+			r1, r0, r1, r0);
+		break;
+	}
+	case ARM_INS_REVSH:
+	{
+		const char *r0 = REG (0);
+		const char *r1 = REG (1);
+		r_strbuf_setf (&op->esil,
+			"8,0xff00,%s,&,>>,%s,=,"
+			"8,0x00ff,%s,&,<<,%s,|=,"
+			"0x8000,%s,&,?{,"
+				"0xffff0000,%s,|=,"
+			"}",
+			r1, r0, r1, r0, r0, r0);
+		break;
+	}
 	default:
 		break;
 	}
@@ -2089,6 +2181,17 @@
 		op->family = R_ANAL_OP_FAMILY_CPU;
 	}
 
+	switch (insn->detail->arm64.cc) {
+	case ARM64_CC_GE:
+	case ARM64_CC_GT:
+	case ARM64_CC_LE:
+	case ARM64_CC_LT:
+		op->sign = true;
+		break;
+	default:
+		break;
+	}
+
 	switch (insn->id) {
 	case ARM64_INS_SVC:
 		op->type = R_ANAL_OP_TYPE_SWI;
@@ -2221,6 +2324,8 @@
 	case ARM64_INS_LDUR:
 	case ARM64_INS_LDURB:
 	case ARM64_INS_LDRSW:
+	case ARM64_INS_LDRSB:
+	case ARM64_INS_LDRSH:
 	case ARM64_INS_LDR:
 	case ARM64_INS_LDP:
 	case ARM64_INS_LDNP:
@@ -2228,6 +2333,14 @@
 	case ARM64_INS_LDRH:
 	case ARM64_INS_LDRB:
 		op->type = R_ANAL_OP_TYPE_LOAD;
+		switch (insn->id) {
+		case ARM64_INS_LDPSW:
+		case ARM64_INS_LDRSW:
+		case ARM64_INS_LDRSH:
+		case ARM64_INS_LDRSB:
+			op->sign = true;
+			break;
+		}
 		if (REGBASE64(1) == ARM64_REG_X29) {
 			op->stackop = R_ANAL_STACK_GET;
 			op->stackptr = 0;
@@ -2320,7 +2433,18 @@
 	return cc;
 }
 
-static void anop32(RAnal *a, csh handle, RAnalOp *op, cs_insn *insn, bool thumb) {
+static ut64 lookahead(csh handle, const ut64 addr, const ut8 *buf, int len, int distance) {
+	cs_insn *insn = NULL;
+	int n = cs_disasm (handle, buf, len, addr, distance, &insn);
+	if (n < 1) {
+		return UT64_MAX;
+	}
+	ut64 result = insn[n - 1].address;
+	cs_free (insn, n);
+	return result;
+}
+
+static void anop32(RAnal *a, csh handle, RAnalOp *op, cs_insn *insn, bool thumb, const ut8 *buf, int len) {
 	const ut64 addr = op->addr;
 	int i;
 	op->cond = cond_cs2r2 (insn->detail->arm.cc);
@@ -2376,11 +2500,13 @@
 		}
 		break;
 	case ARM_INS_IT:
+	{
 		op->type = R_ANAL_OP_TYPE_CJMP;
 		op->jump = addr + insn->size;
-		op->fail = addr + insn->size + 4; // XXX must be next_insn->size;
-			// XXX what if instruction is 4
+		int distance = r_str_nlen (insn->mnemonic, 5);
+		op->fail = lookahead (handle, addr + insn->size, buf + insn->size, len - insn->size, distance);
 		break;
+	}
 	case ARM_INS_NOP:
 		op->type = R_ANAL_OP_TYPE_NOP;
 		op->cycles = 1;
@@ -2526,6 +2652,9 @@
 			op->stackop = R_ANAL_STACK_GET;
 			op->stackptr = 0;
 			op->ptr = -MEMDISP(1);
+		} else if (REGBASE(1) == ARM_REG_PC) {
+			op->refptr = 4;
+			op->ptr = (addr & ~3LL) + (thumb? 4: 8) + MEMDISP(1);
 		}
 		break;
 	case ARM_INS_BLX:
@@ -2535,8 +2664,9 @@
 			op->type = R_ANAL_OP_TYPE_CALL;
 			op->jump = IMM(0) & UT32_MAX;
 			op->fail = addr + op->size;
+			op->hint.new_bits = (a->bits == 32)? 16 : 32;
 			//switch instruction set always with blx label
-			r_anal_hint_set_bits (a, op->jump, a->bits == 32? 16 : 32);
+			// r_anal_hint_set_bits (a, op->jump, a->bits == 32? 16 : 32);
 		}
 		break;
 	case ARM_INS_BL:
@@ -2604,6 +2734,106 @@
 	}
 }
 
+#define ZERO_FILL(x) memset (&x, 0, sizeof (x))
+
+static int parse_reg_name(RRegItem *reg, csh handle, cs_insn *insn, int reg_num) {
+	if (!reg) {
+		return -1;
+	}
+	switch (INSOP (reg_num).type) {
+	case ARM_OP_REG:
+		reg->name = (char *)cs_reg_name (handle, INSOP (reg_num).reg);
+		break;
+	case ARM_OP_MEM:
+		if (INSOP (reg_num).mem.base != ARM_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (handle, INSOP (reg_num).mem.base);
+		}
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
+static int parse_reg64_name(RRegItem *reg, csh handle, cs_insn *insn, int reg_num) {
+	if (!reg) {
+		return -1;
+	}
+	switch (INSOP64 (reg_num).type) {
+	case ARM64_OP_REG:
+		reg->name = (char *)cs_reg_name (handle, INSOP64 (reg_num).reg);
+		break;
+	case ARM64_OP_MEM:
+		if (INSOP64 (reg_num).mem.base != ARM64_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (handle, INSOP64 (reg_num).mem.base);
+		}
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
+static void set_opdir(RAnalOp *op) {
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_LOAD:
+		op->direction = R_ANAL_OP_DIR_READ;
+		break;
+	case R_ANAL_OP_TYPE_STORE:
+		op->direction = R_ANAL_OP_DIR_WRITE;
+		break;
+	case R_ANAL_OP_TYPE_LEA:
+		op->direction = R_ANAL_OP_DIR_REF;
+		break;
+	case R_ANAL_OP_TYPE_CALL:
+	case R_ANAL_OP_TYPE_JMP:
+	case R_ANAL_OP_TYPE_UJMP:
+	case R_ANAL_OP_TYPE_UCALL:
+		op->direction = R_ANAL_OP_DIR_EXEC;
+		break;
+	default:
+		break;
+        }
+}
+
+static void op_fillval(RAnalOp *op , csh handle, cs_insn *insn, int bits) {
+	static RRegItem reg;
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_LOAD:
+		op->src[0] = r_anal_value_new ();
+		ZERO_FILL (reg);
+		op->src[0]->reg = &reg;
+		if (bits == 64) {
+			parse_reg64_name (op->src[0]->reg, handle, insn, 1);
+			op->src[0]->delta = MEMDISP64(1);
+		} else {
+			parse_reg_name (op->src[0]->reg, handle, insn, 1);
+			op->src[0]->delta = MEMDISP(1);
+		}
+		break;
+	case R_ANAL_OP_TYPE_STORE:
+		op->dst = r_anal_value_new ();
+		ZERO_FILL (reg);
+		op->dst->reg = &reg;
+		if (bits == 64) {
+			parse_reg64_name (op->dst->reg, handle, insn, 1);
+			op->dst->delta = MEMDISP64(1);
+		} else {
+			parse_reg_name (op->dst->reg, handle, insn, 1);
+			op->dst->delta = MEMDISP(1);
+		}
+		break;
+	default:
+		break;
+	}
+	if ((bits == 64) && HASMEMINDEX64 (1)) {
+		op->ireg = r_str_get (cs_reg_name(handle, INSOP64 (1).mem.index));
+	} else if (HASMEMINDEX (1)) {
+		op->ireg = r_str_get (cs_reg_name(handle, INSOP (1).mem.index));
+		op->scale = INSOP (1).mem.scale;
+	}
+}
+
 static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	static csh handle = 0;
 	static int omode = -1;
@@ -2655,11 +2885,15 @@
 				analop64_esil (a, op, addr, buf, len, &handle, insn);
 			}
 		} else {
-			anop32 (a, handle, op, insn, thumb);
+			anop32 (a, handle, op, insn, thumb, (ut8*)buf, len);
 			if (a->decode) {
 				analop_esil (a, op, addr, buf, len, &handle, insn, thumb);
 			}
 		}
+		set_opdir (op);
+		if (a->fillval) {
+			op_fillval (op, handle, insn, a->bits);
+		}
 		cs_free (insn, n);
 	}
 //		cs_close (&handle);
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_avr.c radare2-2.8.0+dfsg/libr/anal/p/anal_avr.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_avr.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_avr.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2011-2016 - pancake, Roc Valles, condret, killabyte */
+/* radare - LGPL - Copyright 2011-2018 - pancake, Roc Valles, condret, killabyte */
 
 #if 0
 http://www.atmel.com/images/atmel-0856-avr-instruction-set-manual.pdf
@@ -33,7 +33,7 @@
 	CPU_CONST *consts[10];
 } CPU_MODEL;
 
-typedef void (*inst_handler_t) (RAnal *anal, RAnalOp *op, const ut8 *buf, int *fail, CPU_MODEL *cpu);
+typedef void (*inst_handler_t) (RAnal *anal, RAnalOp *op, const ut8 *buf, int len, int *fail, CPU_MODEL *cpu);
 
 typedef struct _opcodes_tag_ {
 	const char *const name;
@@ -45,7 +45,7 @@
 	ut64 type;
 } OPCODE_DESC;
 
-static int avr_op_analyze(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, CPU_MODEL *cpu);
+static OPCODE_DESC* avr_op_analyze(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len, CPU_MODEL *cpu);
 
 #define CPU_MODEL_DECL(model, pc, consts)				\
 	{								\
@@ -57,17 +57,17 @@
 #define CPU_PC_MASK(cpu)		MASK((cpu)->pc)
 #define CPU_PC_SIZE(cpu)		((((cpu)->pc) >> 3) + ((((cpu)->pc) & 0x07) ? 1 : 0))
 
-#define INST_HANDLER(OPCODE_NAME)	static void _inst__ ## OPCODE_NAME (RAnal *anal, RAnalOp *op, const ut8 *buf, int *fail, CPU_MODEL *cpu)
+#define INST_HANDLER(OPCODE_NAME)	static void _inst__ ## OPCODE_NAME (RAnal *anal, RAnalOp *op, const ut8 *buf, int len, int *fail, CPU_MODEL *cpu)
 #define INST_DECL(OP, M, SL, C, SZ, T)	{ #OP, (M), (SL), _inst__ ## OP, (C), (SZ), R_ANAL_OP_TYPE_ ## T }
 #define INST_LAST			{ "unknown", 0, 0, (void *) 0, 2, 1, R_ANAL_OP_TYPE_UNK }
 
-#define INST_CALL(OPCODE_NAME)		_inst__ ## OPCODE_NAME (anal, op, buf, fail, cpu)
+#define INST_CALL(OPCODE_NAME)		_inst__ ## OPCODE_NAME (anal, op, buf, len, fail, cpu)
 #define INST_INVALID			{ *fail = 1; return; }
 #define INST_ASSERT(x)			{ if (!(x)) { INST_INVALID; } }
 
 #define ESIL_A(e, ...)			r_strbuf_appendf (&op->esil, e, ##__VA_ARGS__)
 
-#define STR_BEGINS(in, s)		strncasecmp (in, s, strlen (s))
+#define STR_BEGINS(in, s)		r_str_ncasecmp (in, s, strlen (s))
 
 // Following IO definitions are valid for:
 //	ATmega8
@@ -156,7 +156,7 @@
 	CPU_MODEL *cpu = NULL;
 
 	for (cpu = cpu_models; cpu < cpu_models + ((sizeof (cpu_models) / sizeof (CPU_MODEL))) - 1; cpu++) {
-		if (!strcasecmp (model, cpu->model)) {
+		if (!r_str_casecmp (model, cpu->model)) {
 			break;
 		}
 	}
@@ -174,14 +174,12 @@
 
 static CPU_MODEL *get_cpu_model(char *model) {
 	static CPU_MODEL *cpu = NULL;
-
 	// cached value?
-	if (cpu && !strcasecmp (model, cpu->model))
+	if (cpu && !r_str_casecmp (model, cpu->model)) {
 		return cpu;
-
+	}
 	// do the real search
 	cpu = __get_cpu_model_recursive (model);
-
 	return cpu;
 }
 
@@ -392,6 +390,9 @@
 
 INST_HANDLER (adc) {	// ADC Rd, Rr
 			// ROL Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	int r = (buf[0] & 0xf) | ((buf[1] & 2) << 3);
 	ESIL_A ("r%d,cf,+,r%d,+,", r, d);		// Rd + Rr + C
@@ -401,6 +402,9 @@
 
 INST_HANDLER (add) {	// ADD Rd, Rr
 			// LSL Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	int r = (buf[0] & 0xf) | ((buf[1] & 2) << 3);
 	ESIL_A ("r%d,r%d,+,", r, d);			// Rd + Rr
@@ -409,8 +413,12 @@
 }
 
 INST_HANDLER (adiw) {	// ADIW Rd+1:Rd, K
+	if (len < 1) {
+		return;
+	}
 	int d = ((buf[0] & 0x30) >> 3) + 24;
 	int k = (buf[0] & 0xf) | ((buf[0] >> 2) & 0x30);
+	op->val = k;
 	ESIL_A ("r%d:r%d,%d,+,", d + 1, d, k);			// Rd+1:Rd + Rr
 								// FLAGS:
 	ESIL_A ("r%d,0x80,&,!,"					// V
@@ -427,6 +435,9 @@
 
 INST_HANDLER (and) {	// AND Rd, Rr
 			// TST Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	int r = (buf[0] & 0xf) | ((buf[1] & 2) << 3);
 	ESIL_A ("r%d,r%d,&,", r, d);				// 0: Rd & Rr
@@ -436,14 +447,21 @@
 
 INST_HANDLER (andi) {	// ANDI Rd, K
 			// CBR Rd, K (= ANDI Rd, 1-K)
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) + 16;
-	int k = (buf[1] & 0xf0) | (buf[0] & 0x0f);
+	int k = ((buf[1] & 0x0f) << 4) | (buf[0] & 0x0f);
+	op->val = k;
 	ESIL_A ("%d,r%d,&,", k, d);				// 0: Rd & Rr
 	__generic_bitop_flags (op);				// up flags
 	ESIL_A ("r%d,=,", d);					// Rd = Result
 }
 
 INST_HANDLER (asr) {	// ASR Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	ESIL_A ("1,r%d,>>,r%d,0x80,&,|,", d, d);		// 0: R=(Rd >> 1) | Rd7
 	ESIL_A ("r%d,0x1,&,!,!,cf,=,", d);			// C = Rd0
@@ -464,11 +482,17 @@
 			// CLT
 			// CLV
 			// CLZ
+	if (len < 1) {
+		return;
+	}
 	int s = (buf[0] >> 4) & 0x7;
 	ESIL_A ("0xff,%d,1,<<,^,sreg,&=,", s);
 }
 
 INST_HANDLER (bld) {	// BLD Rd, b
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[1] & 0x01) << 4) | ((buf[0] >> 4) & 0xf);
 	int b = buf[0] & 0x7;
 	ESIL_A ("r%d,%d,1,<<,0xff,^,&,", d, b);			// Rd/b = 0
@@ -486,11 +510,15 @@
 			// BRBC/S 5:		BRHC		BRHS
 			// BRBC/S 6:		BRTC		BRTS
 			// BRBC/S 7:		BRID		BRIE
+	if (len < 2) {
+		return;
+	}
 	int s = buf[0] & 0x7;
 	op->jump = op->addr
 		+ ((((buf[1] & 0x03) << 6) | ((buf[0] & 0xf8) >> 2))
 			| (buf[1] & 0x2 ? ~((int) 0x7f) : 0))
 		+ 2;
+	op->fail = op->addr + op->size;
 	op->cycles = 1;	// XXX: This is a bug, because depends on eval state,
 			// so it cannot be really be known until this
 			// instruction is executed by the ESIL interpreter!!!
@@ -517,22 +545,32 @@
 			// SET
 			// SEV
 			// SEZ
+	if (len < 1) {
+		return;
+	}
 	int s = (buf[0] >> 4) & 0x7;
 	ESIL_A ("%d,1,<<,sreg,|=,", s);
 }
 
 INST_HANDLER (bst) {	// BST Rd, b
+	if (len < 2) {
+		return;
+	}
 	ESIL_A ("r%d,%d,1,<<,&,!,!,tf,=,",			// tf = Rd/b
 		((buf[1] & 1) << 4) | ((buf[0] >> 4) & 0xf),	// r
 		buf[0] & 0x7);					// b
 }
 
 INST_HANDLER (call) {	// CALL k
+	if (len < 4) {
+		return;
+	}
 	op->jump = (buf[2] << 1)
 		 | (buf[3] << 9)
 		 | (buf[1] & 0x01) << 23
 		 | (buf[0] & 0x01) << 17
 		 | (buf[0] & 0xf0) << 14;
+	op->fail = op->addr + op->size;
 	op->cycles = cpu->pc <= 16 ? 3 : 4;
 	if (!STR_BEGINS (cpu->model, "ATxmega")) {
 		op->cycles--;	// AT*mega optimizes one cycle
@@ -544,6 +582,9 @@
 }
 
 INST_HANDLER (cbi) {	// CBI A, b
+	if (len < 1) {
+		return;
+	}
 	int a = (buf[0] >> 3) & 0x1f;
 	int b = buf[0] & 0x07;
 	RStrBuf *io_port;
@@ -564,15 +605,21 @@
 }
 
 INST_HANDLER (com) {	// COM Rd
-	int r = ((buf[0] >> 4) & 0x0f) | ((buf[0] & 1) << 4);
+	if (len < 2) {
+		return;
+	}
+	int r = ((buf[0] >> 4) & 0x0f) | ((buf[1] & 1) << 4);
 
-	ESIL_A ("r%d,0xff,^,1,+,0xff,&,r%d,=,", r, r);		// Rd = 0-Rd
+	ESIL_A ("r%d,0xff,-,0xff,&,r%d,=,", r, r);		// Rd = 0xFF-Rd
 								// FLAGS:
 	ESIL_A ("0,cf,=,");					// C
 	__generic_bitop_flags (op);				// ...rest...
 }
 
 INST_HANDLER (cp) {	// CP Rd, Rr
+	if (len < 2) {
+		return;
+	}
 	int r = (buf[0]        & 0x0f) | ((buf[1] << 3) & 0x10);
 	int d = ((buf[0] >> 4) & 0x0f) | ((buf[1] << 4) & 0x10);
 	ESIL_A ("r%d,r%d,-,", r, d);			// do Rd - Rr
@@ -580,14 +627,20 @@
 }
 
 INST_HANDLER (cpc) {	// CPC Rd, Rr
+	if (len < 2) {
+		return;
+	}
 	int r = (buf[0]        & 0x0f) | ((buf[1] << 3) & 0x10);
 	int d = ((buf[0] >> 4) & 0x0f) | ((buf[1] << 4) & 0x10);
 
-	ESIL_A ("cf,r%d,-,r%d,-,", r, d);		// Rd - Rr - C
+	ESIL_A ("cf,r%d,+,r%d,-,", r, d);		// Rd - Rr - C
 	__generic_sub_update_flags_rr (op, d, r, 1);	// FLAGS (carry)
 }
 
 INST_HANDLER (cpi) { // CPI Rd, K
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) + 16;
 	int k = (buf[0] & 0xf) | ((buf[1] & 0xf) << 4);
 	ESIL_A ("%d,r%d,-,", k, d);			// Rd - k
@@ -595,15 +648,18 @@
 }
 
 INST_HANDLER (cpse) {	// CPSE Rd, Rr
+	if (len < 2) {
+		return;
+	}
 	int r = (buf[0] & 0xf) | ((buf[1] & 0x2) << 3);
-	int d = ((buf[0] & 0xf) >> 4) | ((buf[1] & 0x1) << 4);
-	RAnalOp next_op;
+	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
+	RAnalOp next_op = {0};
 
 	// calculate next instruction size (call recursively avr_op_analyze)
 	// and free next_op's esil string (we dont need it now)
 	avr_op_analyze (anal,
 			&next_op,
-			op->addr + op->size, buf + op->size,
+			op->addr + op->size, buf + op->size, len - op->size,
 			cpu);
 	r_strbuf_fini (&next_op.esil);
 	op->jump = op->addr + next_op.size + 2;
@@ -619,6 +675,9 @@
 }
 
 INST_HANDLER (dec) {	// DEC Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
 	ESIL_A ("-1,r%d,+,", d);				// --Rd
 								// FLAGS:
@@ -665,6 +724,9 @@
 INST_HANDLER (elpm) {	// ELPM
 			// ELPM Rd
 			// ELPM Rd, Z+
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[1] & 0xfe) == 0x90)
 			? ((buf[1] & 1) << 4) | ((buf[0] >> 4) & 0xf)	// Rd
 			: 0;						// R0
@@ -677,6 +739,9 @@
 
 INST_HANDLER (eor) {	// EOR Rd, Rr
 			// CLR Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	int r = (buf[0] & 0xf) | ((buf[1] & 2) << 3);
 	ESIL_A ("r%d,r%d,^,", r, d);			// 0: Rd ^ Rr
@@ -685,6 +750,9 @@
 }
 
 INST_HANDLER (fmul) {	// FMUL Rd, Rr
+	if (len < 1) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0x7) + 16;
 	int r = (buf[0] & 0x7) + 16;
 
@@ -697,6 +765,9 @@
 }
 
 INST_HANDLER (fmuls) {	// FMULS Rd, Rr
+	if (len < 1) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0x7) + 16;
 	int r = (buf[0] & 0x7) + 16;
 
@@ -713,6 +784,9 @@
 }
 
 INST_HANDLER (fmulsu) {	// FMULSU Rd, Rr
+	if (len < 1) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0x7) + 16;
 	int r = (buf[0] & 0x7) + 16;
 
@@ -754,6 +828,9 @@
 }
 
 INST_HANDLER (in) {	// IN Rd, A
+	if (len < 2) {
+		return;
+	}
 	int r = ((buf[0] >> 4) & 0x0f) | ((buf[1] & 0x01) << 4);
 	int a = (buf[0] & 0x0f) | ((buf[1] & 0x6) << 3);
 	RStrBuf *io_src = __generic_io_dest (a, 0, cpu);
@@ -765,6 +842,9 @@
 }
 
 INST_HANDLER (inc) {	// INC Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
 	ESIL_A ("1,r%d,+,", d);					// ++Rd
 								// FLAGS:
@@ -776,6 +856,9 @@
 }
 
 INST_HANDLER (jmp) {	// JMP k
+	if (len < 4) {
+		return;
+	}
 	op->jump = (buf[2] << 1)
 		 | (buf[3] << 9)
 		 | (buf[1] & 0x01) << 23
@@ -786,6 +869,9 @@
 }
 
 INST_HANDLER (lac) {	// LAC Z, Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
 
 	// read memory from RAMPZ:Z
@@ -796,6 +882,9 @@
 }
 
 INST_HANDLER (las) {	// LAS Z, Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
 
 	// read memory from RAMPZ:Z
@@ -806,6 +895,9 @@
 }
 
 INST_HANDLER (lat) {	// LAT Z, Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
 
 	// read memory from RAMPZ:Z
@@ -818,6 +910,9 @@
 INST_HANDLER (ld) {	// LD Rd, X
 			// LD Rd, X+
 			// LD Rd, -X
+	if (len < 2) {
+		return;
+	}
 	// read memory
 	__generic_ld_st (
 		op, "ram",
@@ -848,6 +943,9 @@
 			// LD Rd, Y+	LD Rd, Z+
 			// LD Rd, -Y	LD Rd, -Z
 			// LD Rd, Y+q	LD Rd, Z+q
+	if (len < 2) {
+		return;
+	}
 	// calculate offset (this value only has sense in some opcodes,
 	// but we are optimistic and we calculate it always)
 	int offset = (buf[1] & 0x20)
@@ -883,35 +981,63 @@
 }
 
 INST_HANDLER (ldi) {	// LDI Rd, K
+	if (len < 2) {
+		return;
+	}
 	int k = (buf[0] & 0xf) + ((buf[1] & 0xf) << 4);
 	int d = ((buf[0] >> 4) & 0xf) + 16;
+	op->val = k;
 	ESIL_A ("0x%x,r%d,=,", k, d);
 }
 
 INST_HANDLER (lds) {	// LDS Rd, k
+	if (len < 4) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
 	int k = (buf[3] << 8) | buf[2];
+	op->ptr = k;
 
 	// load value from RAMPD:k
 	__generic_ld_st (op, "ram", 0, 1, 0, k, 0);
 	ESIL_A ("r%d,=,", d);
 }
 
+INST_HANDLER (sts) {	// STS k, Rr
+	if (len < 4) {
+		return;
+	}
+	int r = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
+	int k = (buf[3] << 8) | buf[2];
+	op->ptr = k;
+
+	ESIL_A ("r%d,", r);
+	__generic_ld_st (op, "ram", 0, 1, 0, k, 1);
+
+	op->cycles = 2;
+}
+
+#if 0
 INST_HANDLER (lds16) {	// LDS Rd, k
 	int d = ((buf[0] >> 4) & 0xf) + 16;
 	int k = (buf[0] & 0x0f)
 		| ((buf[1] << 3) & 0x30)
 		| ((buf[1] << 4) & 0x40)
 		| (~(buf[1] << 4) & 0x80);
+	op->ptr = k;
 
 	// load value from @k
 	__generic_ld_st (op, "ram", 0, 0, 0, k, 0);
 	ESIL_A ("r%d,=,", d);
 }
+#endif
 
 INST_HANDLER (lpm) {	// LPM
 			// LPM Rd, Z
 			// LPM Rd, Z+
+	if (len < 2) {
+		return;
+	}
 	ut16 ins = (((ut16) buf[1]) << 8) | ((ut16) buf[0]);
 	// read program memory
 	__generic_ld_st (
@@ -932,6 +1058,9 @@
 }
 
 INST_HANDLER (lsr) {	// LSR Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	ESIL_A ("1,r%d,>>,", d);				// 0: R=(Rd >> 1)
 	ESIL_A ("r%d,0x1,&,!,!,cf,=,", d);			// C = Rd0
@@ -943,18 +1072,27 @@
 }
 
 INST_HANDLER (mov) {	// MOV Rd, Rr
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[1] << 4) & 0x10) | ((buf[0] >> 4) & 0x0f);
 	int r = ((buf[1] << 3) & 0x10) | (buf[0] & 0x0f);
 	ESIL_A ("r%d,r%d,=,", r, d);
 }
 
 INST_HANDLER (movw) {	// MOVW Rd+1:Rd, Rr+1:Rr
+	if (len < 1) {
+		return;
+	}
 	int d = (buf[0] & 0xf0) >> 3;
 	int r = (buf[0] & 0x0f) << 1;
 	ESIL_A ("r%d,r%d,=,r%d,r%d,=,", r, d, r + 1, d + 1);
 }
 
 INST_HANDLER (mul) {	// MUL Rd, Rr
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[1] << 4) & 0x10) | ((buf[0] >> 4) & 0x0f);
 	int r = ((buf[1] << 3) & 0x10) | (buf[0] & 0x0f);
 
@@ -966,6 +1104,9 @@
 }
 
 INST_HANDLER (muls) {	// MULS Rd, Rr
+	if (len < 1) {
+		return;
+	}
 	int d = (buf[0] >> 4 & 0x0f) + 16;
 	int r = (buf[0] & 0x0f) + 16;
 
@@ -979,6 +1120,9 @@
 }
 
 INST_HANDLER (mulsu) {	// MULSU Rd, Rr
+	if (len < 1) {
+		return;
+	}
 	int d = (buf[0] >> 4 & 0x07) + 16;
 	int r = (buf[0] & 0x07) + 16;
 
@@ -992,6 +1136,9 @@
 }
 
 INST_HANDLER (neg) {	// NEG Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	ESIL_A ("r%d,0x00,-,0xff,&,", d);			// 0: (0-Rd)
 	ESIL_A ("DUP,r%d,0xff,^,|,0x08,&,!,!,hf,=,", d);	// H
@@ -1008,6 +1155,9 @@
 }
 
 INST_HANDLER (or) {	// OR Rd, Rr
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	int r = (buf[0] & 0xf) | ((buf[1] & 2) << 3);
 	ESIL_A ("r%d,r%d,|,", r, d);				// 0: (Rd | Rr)
@@ -1020,8 +1170,12 @@
 
 INST_HANDLER (ori) {	// ORI Rd, K
 			// SBR Rd, K
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) + 16;
 	int k = (buf[0] & 0xf) | ((buf[1] & 0xf) << 4);
+	op->val = k;
 	ESIL_A ("r%d,%d,|,", d, k);				// 0: (Rd | k)
 	ESIL_A ("0,RPICK,!,zf,=,");				// Z
 	ESIL_A ("0,RPICK,0x80,&,!,!,nf,=,");			// N
@@ -1031,6 +1185,9 @@
 }
 
 INST_HANDLER (out) {	// OUT A, Rr
+	if (len < 2) {
+		return;
+	}
 	int r = ((buf[0] >> 4) & 0x0f) | ((buf[1] & 0x01) << 4);
 	int a = (buf[0] & 0x0f) | ((buf[1] & 0x6) << 3);
 	RStrBuf *io_dst = __generic_io_dest (a, 1, cpu);
@@ -1042,6 +1199,9 @@
 }
 
 INST_HANDLER (pop) {	// POP Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[1] & 0x1) << 4) | ((buf[0] >> 4) & 0xf);
 	__generic_pop (op, 1);
 	ESIL_A ("r%d,=,", d);	// store in Rd
@@ -1049,6 +1209,9 @@
 }
 
 INST_HANDLER (push) {	// PUSH Rr
+	if (len < 2) {
+		return;
+	}
 	int r = ((buf[1] & 0x1) << 4) | ((buf[0] >> 4) & 0xf);
 	ESIL_A ("r%d,", r);	// load Rr
 	__generic_push (op, 1);	// push it into stack
@@ -1059,18 +1222,22 @@
 }
 
 INST_HANDLER (rcall) {	// RCALL k
+	if (len < 2) {
+		return;
+	}
 	// target address
 	op->jump = (op->addr
 		+ (((((buf[1] & 0xf) << 8) | buf[0]) << 1)
 			| (((buf[1] & 0x8) ? ~((int) 0x1fff) : 0)))
 		+ 2) & CPU_PC_MASK (cpu);
+	op->fail = op->addr + op->size;
 	// esil
 	ESIL_A ("pc,");				// esil already points to next
 						// instruction (@ret)
 	__generic_push (op, CPU_PC_SIZE (cpu));	// push @ret addr
 	ESIL_A ("%"PFMT64d",pc,=,", op->jump);	// jump!
 	// cycles
-	if (!strncasecmp (cpu->model, "ATtiny", 6)) {
+	if (!r_str_ncasecmp (cpu->model, "ATtiny", 6)) {
 		op->cycles = 4;	// ATtiny is always slow
 	} else {
 		// PC size decides required runtime!
@@ -1121,8 +1288,8 @@
 
 INST_HANDLER (ror) {	// ROR Rd
 	int d = ((buf[0] >> 4) & 0x0f) | ((buf[1] << 4) & 0x10);
-	ESIL_A ("1,r%d,>>,8,cf,<<,|,", d);		// 0: (Rd>>1) | (cf<<8)
-	ESIL_A ("r%d,1,&,cf,=,");			// C
+	ESIL_A ("1,r%d,>>,7,cf,<<,|,", d);		// 0: (Rd>>1) | (cf<<7)
+	ESIL_A ("r%d,1,&,cf,=,", d);			// C
 	ESIL_A ("0,RPICK,!,zf,=,");			// Z
 	ESIL_A ("0,RPICK,0x80,&,!,!,nf,=,");		// N
 	ESIL_A ("nf,cf,^,vf,=,");			// V
@@ -1131,17 +1298,24 @@
 }
 
 INST_HANDLER (sbc) {	// SBC Rd, Rr
-	int r = (buf[1] & 0x0f) | ((buf[0] & 0x2) >> 1);
-	int d = ((buf[1] >> 4) & 0xf) | (buf[0] & 0x1);
+	if (len < 2) {
+		return;
+	}
+	int r = (buf[0] & 0x0f) | ((buf[1] & 0x2) << 3);
+	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x1) << 4);
 
-	ESIL_A ("cf,r%d,-,r%d,-,", r, d);		// 0: (Rd-Rr-C)
+	ESIL_A ("cf,r%d,+,r%d,-,", r, d);		// 0: (Rd-Rr-C)
 	__generic_sub_update_flags_rr (op, d, r, 1);	// FLAGS (carry)
 	ESIL_A ("r%d,=,", d);				// Rd = Result
 }
 
 INST_HANDLER (sbci) {	// SBCI Rd, k
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) + 16;
 	int k = ((buf[1] & 0xf) << 4) | (buf[0] & 0xf);
+	op->val = k;
 
 	ESIL_A ("cf,%d,+,r%d,-,", k, d);		// 0: (Rd-k-C)
 	__generic_sub_update_flags_rk (op, d, k, 1);	// FLAGS (carry)
@@ -1149,6 +1323,9 @@
 }
 
 INST_HANDLER (sub) {	// SUB Rd, Rr
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) | ((buf[1] & 1) << 4);
 	int r = (buf[0] & 0xf) | ((buf[1] & 2) << 3);
 
@@ -1158,8 +1335,12 @@
 }
 
 INST_HANDLER (subi) {	// SUBI Rd, k
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[0] >> 4) & 0xf) + 16;
 	int k = ((buf[1] & 0xf) << 4) | (buf[0] & 0xf);
+	op->val = k;
 
 	ESIL_A ("%d,r%d,-,", k, d);			// 0: (Rd-k)
 	__generic_sub_update_flags_rk (op, d, k, 1);	// FLAGS (no carry)
@@ -1167,6 +1348,9 @@
 }
 
 INST_HANDLER (sbi) {	// SBI A, b
+	if (len < 1) {
+		return;
+	}
 	int a = (buf[0] >> 3) & 0x1f;
 	int b = buf[0] & 0x07;
 	RStrBuf *io_port;
@@ -1188,6 +1372,9 @@
 
 INST_HANDLER (sbix) {	// SBIC A, b
 			// SBIS A, b
+	if (len < 1) {
+		return;
+	}
 	int a = (buf[0] >> 3) & 0x1f;
 	int b = buf[0] & 0x07;
 	RAnalOp next_op;
@@ -1202,6 +1389,7 @@
 	avr_op_analyze (anal,
 			&next_op,
 			op->addr + op->size, buf + op->size,
+			len - op->size,
 			cpu);
 	r_strbuf_fini (&next_op.esil);
 	op->jump = op->addr + next_op.size + 2;
@@ -1224,8 +1412,12 @@
 }
 
 INST_HANDLER (sbiw) {	// SBIW Rd+1:Rd, K
+	if (len < 1) {
+		return;
+	}
 	int d = ((buf[0] & 0x30) >> 3) + 24;
 	int k = (buf[0] & 0xf) | ((buf[0] >> 2) & 0x30);
+	op->val = k;
 	ESIL_A ("%d,r%d:r%d,-,", k, d + 1, d);		// 0(Rd+1:Rd - Rr)
 	ESIL_A ("r%d,0x80,&,!,!,"			// V
 		"0,RPICK,0x8000,&,!,"
@@ -1241,15 +1433,18 @@
 
 INST_HANDLER (sbrx) {	// SBRC Rr, b
 			// SBRS Rr, b
+	if (len < 2) {
+		return;
+	}
 	int b = buf[0] & 0x7;
 	int r = ((buf[0] >> 4) & 0xf) | ((buf[1] & 0x01) << 4);
-	RAnalOp next_op;
+	RAnalOp next_op = {0};
 
 	// calculate next instruction size (call recursively avr_op_analyze)
 	// and free next_op's esil string (we dont need it now)
 	avr_op_analyze (anal,
 			&next_op,
-			op->addr + op->size, buf + op->size,
+			op->addr + op->size, buf + op->size, len - op->size,
 			cpu);
 	r_strbuf_fini (&next_op.esil);
 	op->jump = op->addr + next_op.size + 2;
@@ -1282,27 +1477,27 @@
 
 	// decide action depending on the old value of SPMCSR
 	switch (spmcsr & 0x7f) {
-		case 0x03: // PAGE ERASE
-			// invoke SPM_CLEAR_PAGE (erases target page writing
-			// the 0xff value
-			ESIL_A ("16,rampz,<<,z,+,"); // push target address
-			ESIL_A ("SPM_PAGE_ERASE,");  // do magic
-			break;
-
-		case 0x01: // FILL TEMPORARY BUFFER
-			ESIL_A ("r1,r0,");           // push data
-			ESIL_A ("z,");               // push target address
-			ESIL_A ("SPM_PAGE_FILL,");   // do magic
-			break;
-
-		case 0x05: // WRITE PAGE
-			ESIL_A ("16,rampz,<<,z,+,"); // push target address
-			ESIL_A ("SPM_PAGE_WRITE,");  // do magic
-			break;
-
-		default:
-			eprintf ("SPM: I dont know what to do with SPMCSR %02x.\n",
-					(unsigned int) spmcsr);
+	case 0x03: // PAGE ERASE
+		// invoke SPM_CLEAR_PAGE (erases target page writing
+		// the 0xff value
+		ESIL_A ("16,rampz,<<,z,+,"); // push target address
+		ESIL_A ("SPM_PAGE_ERASE,");  // do magic
+		break;
+
+	case 0x01: // FILL TEMPORARY BUFFER
+		ESIL_A ("r1,r0,");           // push data
+		ESIL_A ("z,");               // push target address
+		ESIL_A ("SPM_PAGE_FILL,");   // do magic
+		break;
+
+	case 0x05: // WRITE PAGE
+		ESIL_A ("16,rampz,<<,z,+,"); // push target address
+		ESIL_A ("SPM_PAGE_WRITE,");  // do magic
+		break;
+
+	default:
+		eprintf ("SPM: I dont know what to do with SPMCSR %02x.\n",
+				(unsigned int) spmcsr);
 	}
 
 	op->cycles = 1;	// This is truly false. Datasheets do not publish how
@@ -1315,6 +1510,9 @@
 INST_HANDLER (st) {	// ST X, Rr
 			// ST X+, Rr
 			// ST -X, Rr
+	if (len < 2) {
+		return;
+	}
 	// load register
 	ESIL_A ("r%d,", ((buf[1] & 1) << 4) | ((buf[0] >> 4) & 0xf));
 	// write in memory
@@ -1345,6 +1543,9 @@
 			// ST Y+, Rr	ST Z+, Rr
 			// ST -Y, Rr	ST -Z, Rr
 			// ST Y+q, Rr	ST Z+q, Rr
+	if (len < 2) {
+		return;
+	}
 	// load register
 	ESIL_A ("r%d,", ((buf[1] & 1) << 4) | ((buf[0] >> 4) & 0xf));
 	// write in memory
@@ -1379,6 +1580,9 @@
 }
 
 INST_HANDLER (swap) {	// SWAP Rd
+	if (len < 2) {
+		return;
+	}
 	int d = ((buf[1] & 0x1) << 4) | ((buf[0] >> 4) & 0xf);
 	ESIL_A ("4,r%d,>>,0x0f,&,", d);		// (Rd >> 4) & 0xf
 	ESIL_A ("4,r%d,<<,0xf0,&,", d);		// (Rd >> 4) & 0xf
@@ -1425,13 +1629,14 @@
 	INST_DECL (ld,     0xfe0f, 0x900d, 0,      2,   LOAD   ), // LD Rd, X+
 	INST_DECL (ld,     0xfe0f, 0x900e, 0,      2,   LOAD   ), // LD Rd, -X
 	INST_DECL (lds,    0xfe0f, 0x9000, 0,      4,   LOAD   ), // LDS Rd, k
+	INST_DECL (sts,    0xfe0f, 0x9200, 2,      4,   STORE  ), // STS k, Rr
 	INST_DECL (lpm,    0xfe0f, 0x9004, 3,      2,   LOAD   ), // LPM Rd, Z
 	INST_DECL (lpm,    0xfe0f, 0x9005, 3,      2,   LOAD   ), // LPM Rd, Z+
 	INST_DECL (lsr,    0xfe0f, 0x9406, 1,      2,   SHR    ), // LSR Rd
 	INST_DECL (neg,    0xfe0f, 0x9401, 2,      2,   SUB    ), // NEG Rd
-	INST_DECL (pop,    0xfe0f, 0x900f, 2,      2,   POP    ), // PUSH Rr
+	INST_DECL (pop,    0xfe0f, 0x900f, 2,      2,   POP    ), // POP Rd
 	INST_DECL (push,   0xfe0f, 0x920f, 0,      2,   PUSH   ), // PUSH Rr
-	INST_DECL (ror,    0xfe0f, 0x9407, 1,      2,   SAR    ), // PUSH Rr
+	INST_DECL (ror,    0xfe0f, 0x9407, 1,      2,   SAR    ), // ROR Rd
 	INST_DECL (st,     0xfe0f, 0x920c, 2,      2,   STORE  ), // ST X, Rr
 	INST_DECL (st,     0xfe0f, 0x920d, 0,      2,   STORE  ), // ST X+, Rr
 	INST_DECL (st,     0xfe0f, 0x920e, 0,      2,   STORE  ), // ST -X, Rr
@@ -1446,8 +1651,8 @@
 	INST_DECL (sbrx,   0xfe08, 0xfe00, 2,      2,   CJMP   ), // SBRS Rr, b
 	INST_DECL (ldd,    0xfe07, 0x9001, 0,      2,   LOAD   ), // LD Rd, Y/Z+
 	INST_DECL (ldd,    0xfe07, 0x9002, 0,      2,   LOAD   ), // LD Rd, -Y/Z
-	INST_DECL (std,    0xfe07, 0x9201, 0,      2,   STORE  ), // LD Y/Z+, Rr
-	INST_DECL (std,    0xfe07, 0x9202, 0,      2,   STORE  ), // LD -Y/Z, Rr
+	INST_DECL (std,    0xfe07, 0x9201, 0,      2,   STORE  ), // ST Y/Z+, Rr
+	INST_DECL (std,    0xfe07, 0x9202, 0,      2,   STORE  ), // ST -Y/Z, Rr
 	INST_DECL (adc,    0xfc00, 0x1c00, 1,      2,   ADD    ), // ADC Rd, Rr
 	INST_DECL (add,    0xfc00, 0x0c00, 1,      2,   ADD    ), // ADD Rd, Rr
 	INST_DECL (and,    0xfc00, 0x2000, 1,      2,   AND    ), // AND Rd, Rr
@@ -1463,7 +1668,7 @@
 	INST_DECL (sbc,    0xfc00, 0x0800, 1,      2,   SUB    ), // SBC Rd, Rr
 	INST_DECL (sub,    0xfc00, 0x1800, 1,      2,   SUB    ), // SUB Rd, Rr
 	INST_DECL (in,     0xf800, 0xb000, 1,      2,   IO     ), // IN Rd, A
-	INST_DECL (lds16,  0xf800, 0xa000, 1,      2,   LOAD   ), // LDS Rd, k
+	//INST_DECL (lds16,  0xf800, 0xa000, 1,      2,   LOAD   ), // LDS Rd, k
 	INST_DECL (out,    0xf800, 0xb800, 1,      2,   IO     ), // OUT A, Rr
 	INST_DECL (andi,   0xf000, 0x7000, 1,      2,   AND    ), // ANDI Rd, K
 	INST_DECL (cpi,    0xf000, 0x3000, 1,      2,   CMP    ), // CPI Rd, K
@@ -1474,19 +1679,25 @@
 	INST_DECL (sbci,   0xf000, 0x4000, 1,      2,   SUB    ), // SBC Rd, Rr
 	INST_DECL (subi,   0xf000, 0x5000, 1,      2,   SUB    ), // SUBI Rd, Rr
 	INST_DECL (ldd,    0xd200, 0x8000, 0,      2,   LOAD   ), // LD Rd, Y/Z+q
-	INST_DECL (std,    0xd200, 0x8200, 0,      2,   STORE  ), // LD Y/Z+q, Rr
+	INST_DECL (std,    0xd200, 0x8200, 0,      2,   STORE  ), // ST Y/Z+q, Rr
 
 	INST_LAST
 };
 
-static int avr_op_analyze(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, CPU_MODEL *cpu) {
+static OPCODE_DESC* avr_op_analyze(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len, CPU_MODEL *cpu) {
 	OPCODE_DESC *opcode_desc;
+	if (len < 2) {
+		return NULL;
+	}
 	ut16 ins = (buf[1] << 8) | buf[0];
 	int fail;
 	char *t;
 
 	// initialize op struct
 	memset (op, 0, sizeof (RAnalOp));
+	op->ptr = UT64_MAX;
+	op->val = UT64_MAX;
+	op->jump = UT64_MAX;
 	r_strbuf_init (&op->esil);
 
 	// process opcode
@@ -1498,19 +1709,21 @@
 			op->cycles = opcode_desc->cycles;
 			op->size = opcode_desc->size;
 			op->type = opcode_desc->type;
-			op->fail = addr + op->size;
+			op->jump = UT64_MAX;
+			op->fail = UT64_MAX;
+			// op->fail = addr + op->size;
 			op->addr = addr;
 
 			// start void esil expression
 			r_strbuf_setf (&op->esil, "");
 
 			// handle opcode
-			opcode_desc->handler (anal, op, buf, &fail, cpu);
+			opcode_desc->handler (anal, op, buf, len, &fail, cpu);
 			if (fail) {
 				goto INVALID_OP;
 			}
 			if (op->cycles <= 0) {
-				eprintf ("opcode %s @%"PFMT64x" returned 0 cycles.\n", opcode_desc->name, op->addr);
+				// eprintf ("opcode %s @%"PFMT64x" returned 0 cycles.\n", opcode_desc->name, op->addr);
 				opcode_desc->cycles = 2;
 			}
 			op->nopcode = (op->type == R_ANAL_OP_TYPE_UNK);
@@ -1524,7 +1737,7 @@
 				}
 			}
 
-			return op->size;
+			return opcode_desc;
 		}
 	}
 
@@ -1550,7 +1763,7 @@
 	// and stinky situation
 	r_strbuf_set (&op->esil, "1,$");
 
-	return op->size;
+	return NULL;
 }
 
 static int avr_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
@@ -1583,7 +1796,7 @@
 		r_anal_esil_reg_write (anal->esil, "_page", offset);
 	}
 	// process opcode
-	avr_op_analyze (anal, op, addr, buf, cpu);
+	avr_op_analyze (anal, op, addr, buf, len, cpu);
 
 	return op->size;
 }
@@ -1847,10 +2060,14 @@
 		"gpr	r31	.8	31	0\n"
 
 // 16 bit overlapped registers for 16 bit math
-		"gpr	r25:r24	.16	24	0\n"
-		"gpr	r27:r26	.16	26	0\n"
-		"gpr	r29:r28	.16	28	0\n"
-		"gpr	r31:r30	.16	30	0\n"
+		"gpr	r17_r16	.16	16	0\n"
+		"gpr	r19_r18	.16	18	0\n"
+		"gpr	r21_r20	.16	20	0\n"
+		"gpr	r23_r22	.16	22	0\n"
+		"gpr	r25_r24	.16	24	0\n"
+		"gpr	r27_r26	.16	26	0\n"
+		"gpr	r29_r28	.16	28	0\n"
+		"gpr	r31_r30	.16	30	0\n"
 
 // 16 bit overlapped registers for memory addressing
 		"gpr	x	.16	26	0\n"
@@ -1923,6 +2140,53 @@
 	return 2; // XXX
 }
 
+static ut8 *anal_mask_avr(RAnal *anal, int size, const ut8 *data, ut64 at) {
+	RAnalOp *op = NULL;
+	ut8 *ret = NULL;
+	int idx;
+
+	if (!(op = r_anal_op_new ())) {
+		return NULL;
+	}
+
+	if (!(ret = malloc (size))) {
+		r_anal_op_free (op);
+		return NULL;
+	}
+
+	memset (ret, 0xff, size);
+
+	CPU_MODEL *cpu = get_cpu_model (anal->cpu);
+
+	for (idx = 0; idx + 1 < size; idx += op->size) {
+		OPCODE_DESC* opcode_desc = avr_op_analyze (anal, op, at + idx, data + idx, size - idx, cpu);
+
+		if (op->size < 1) {
+			break;
+		}
+
+		if (!opcode_desc) { // invalid instruction
+			continue;
+		}
+
+		// the additional data for "long" opcodes (4 bytes) is usually something we want to ignore for matching
+		// (things like memory offsets or jump addresses)
+		if (op->size == 4) {
+			ret[idx + 2] = 0;
+			ret[idx + 3] = 0;
+		}
+
+		if (op->ptr != UT64_MAX || op->jump != UT64_MAX) {
+			ret[idx] = opcode_desc->mask;
+			ret[idx + 1] = opcode_desc->mask >> 8;
+		}
+	}
+
+	r_anal_op_free (op);
+
+	return ret;
+}
+
 RAnalPlugin r_anal_plugin_avr = {
 	.name = "avr",
 	.desc = "AVR code analysis plugin",
@@ -1935,6 +2199,7 @@
 	.set_reg_profile = &set_reg_profile,
 	.esil_init = esil_avr_init,
 	.esil_fini = esil_avr_fini,
+	.anal_mask = anal_mask_avr,
 };
 
 #ifndef CORELIB
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_bf.c radare2-2.8.0+dfsg/libr/anal/p/anal_bf.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_bf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_bf.c	2018-08-07 14:12:36.000000000 +0000
@@ -21,6 +21,7 @@
 	return cidx? cidx - keys + 1: 0;
 }
 
+#define BUFSIZE_INC 32
 static int bf_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	ut64 dst = 0LL;
 	if (!op) {
@@ -35,6 +36,10 @@
 	case '[':
 		op->type = R_ANAL_OP_TYPE_CJMP;
 		op->fail = addr+1;
+		buf = r_mem_dup ((void *)buf, len);
+		if (!buf) {
+			break;
+		}
 		{
 			const ut8 *p = buf + 1;
 			int lev = 0, i = 1;
@@ -51,13 +56,30 @@
 						r_strbuf_setf (&op->esil,
 								"$$,brk,=[1],brk,++=,"
 								"ptr,[1],!,?{,0x%"PFMT64x",pc,=,brk,--=,}", dst);
-						break;
+						goto beach;
+					}
+				}
+				if (*p == 0x00 || *p == 0xff) {
+					op->type = R_ANAL_OP_TYPE_ILL;
+					goto beach;
+				}
+				if (i == len - 1 && anal->read_at) {
+					int new_buf_len = len + 1 + BUFSIZE_INC;
+					ut8 *new_buf = calloc (new_buf_len, 1);
+					if (new_buf) {
+						free ((ut8 *)buf);
+						(void)anal->read_at (anal, addr, new_buf, new_buf_len);
+						buf = new_buf;
+						p = buf + i;
+						len += BUFSIZE_INC;
 					}
 				}
 				p++;
 				i++;
 			}
 		}
+beach:
+		free ((ut8 *)buf);
 		break;
 	case ']': op->type = R_ANAL_OP_TYPE_UJMP;
 		// XXX This is wrong esil
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_cris.c radare2-2.8.0+dfsg/libr/anal/p/anal_cris.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_cris.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_cris.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,27 +19,34 @@
 		break;
 	case 0x7f:
 		op->type = R_ANAL_OP_TYPE_LEA;
-		op->ptr = buf[2];
-		op->ptr |= buf[3]<<8;
-		op->ptr |= buf[4]<<16;
-		op->ptr |= ((ut32)(0xff&buf[5]))<<24;
-		op->ptr += addr;
-		opsize = 6;
+		if (len > 5) {
+			op->ptr = buf[2];
+			op->ptr |= buf[3]<<8;
+			op->ptr |= buf[4]<<16;
+			op->ptr |= ((ut32)(0xff&buf[5]))<<24;
+			op->ptr += addr;
+			opsize = 6;
+		} else {
+			// error
+			op->ptr = UT64_MAX;
+		}
 		break;
 	case 0xbf: // bsr
 		op->type = R_ANAL_OP_TYPE_CALL;
-		 {
+		if (len > 5) {
 			st32 delta = buf[2];
 			delta |= buf[3]<<8;
 			delta |= buf[4]<<16;
 			delta |= buf[5]<<24;
 			op->jump = addr + delta; 
-		 }
+		} else {
+			op->jump = UT64_MAX;
+		}
 		op->fail = addr + 6;
 		opsize = 6;
 		break;
 	case 0x00:
-		if (buf[1]==0x00) {
+		if (buf[1] == 0x00) {
 			op->type = R_ANAL_OP_TYPE_TRAP;
 		} else {
 			op->type = R_ANAL_OP_TYPE_JMP;
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_dalvik.c radare2-2.8.0+dfsg/libr/anal/p/anal_dalvik.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_dalvik.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_dalvik.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,9 @@
-/* radare - LGPL - Copyright 2010-2016 - pancake */
+/* radare - LGPL - Copyright 2010-2018 - pancake */
 
 #include <r_types.h>
 #include <r_lib.h>
 #include <r_asm.h>
 #include <r_anal.h>
-#include "esil.h"
 
 #include "../../asm/arch/dalvik/opcode.h"
 #include "../../bin/format/dex/dex.h"
@@ -68,7 +67,7 @@
 	case 0x18: // const-wide
 	case 0x19: // const-wide
 		op->type = R_ANAL_OP_TYPE_MOV;
-		{
+		if (len > 2) {
 			int vA = (int) data[1];
 			ut32 vB = (data[3] << 8) | data[2];
 			esilprintf (op, "v%d,v%d,=", vA, vB);
@@ -88,7 +87,7 @@
 		break;
 	case 0x1a: // const-string
 		op->type = R_ANAL_OP_TYPE_MOV;
-		{
+		if (len > 2) {
 			ut32 vA = data[1];
 			ut32 vB = (data[3]<<8) | data[2];
 			ut64 offset = R_ANAL_GET_OFFSET (anal, 's', vB);
@@ -278,16 +277,20 @@
 		esilprintf (op, "0x%"PFMT64x",ip,=", op->jump);
 		break;
 	case 0x29: // goto/16
-		op->jump = addr + (short)(data[2]|data[3]<<8)*2;
-		op->type = R_ANAL_OP_TYPE_JMP;
-		op->eob = true;
-		esilprintf (op, "0x%"PFMT64x",ip,=", op->jump);
+		if (len > 3) {
+			op->jump = addr + (short)(data[2]|data[3]<<8)*2;
+			op->type = R_ANAL_OP_TYPE_JMP;
+			op->eob = true;
+			esilprintf (op, "0x%"PFMT64x",ip,=", op->jump);
+		}
 		break;
 	case 0x2a: // goto/32
-		op->jump = addr + (int)(data[2]|(data[3]<<8)|(data[4]<<16)|(data[5]<<24))*2;
-		op->type = R_ANAL_OP_TYPE_JMP;
-		op->eob = true;
-		esilprintf (op, "0x%"PFMT64x",ip,=", op->jump);
+		if (len > 5) {
+			op->jump = addr + (int)(data[2]|(data[3]<<8)|(data[4]<<16)|(data[5]<<24))*2;
+			op->type = R_ANAL_OP_TYPE_JMP;
+			op->eob = true;
+			esilprintf (op, "0x%"PFMT64x",ip,=", op->jump);
+		}
 		break;
 	case 0x2c:
 	case 0x2b:
@@ -316,9 +319,11 @@
 	case 0x3d: // if-lez
 		op->type = R_ANAL_OP_TYPE_CJMP;
 		//XXX fix this better the check is to avoid an oob
-		op->jump = addr + (len>3?(short)(data[2]|data[3]<<8)*2 : 0);
-		op->fail = addr + sz;
-		op->eob = true;
+		if (len > 2) {
+			op->jump = addr + (len>3?(short)(data[2]|data[3]<<8)*2 : 0);
+			op->fail = addr + sz;
+			op->eob = true;
+		}
 		break;
 	case 0xec: // breakpoint
 	case 0x1d: // monitor-enter
@@ -346,16 +351,15 @@
 	case 0xf0: // invoke-object-init-range
 	case 0xf9: // invoke-virtual-quick/range
 	case 0xfb: // invoke-super-quick/range
-		{
-		//XXX fix this better since the check avoid an oob
-		//but the jump will be incorrect
-		ut32 vB = len > 3?(data[3] << 8) | data[2] : 0;
-		op->jump = anal->binb.get_offset (anal->binb.bin, 'm', vB);
-		op->fail = addr + sz;
-		op->type = R_ANAL_OP_TYPE_CALL;
-		// TODO: handle /range instructions
-		esilprintf (op, "8,sp,-=,0x%"PFMT64x",sp,=[8],0x%"PFMT64x",ip,=", addr);
-
+		if (len > 2) {
+			//XXX fix this better since the check avoid an oob
+			//but the jump will be incorrect
+			ut32 vB = len > 3?(data[3] << 8) | data[2] : 0;
+			op->jump = anal->binb.get_offset (anal->binb.bin, 'm', vB);
+			op->fail = addr + sz;
+			op->type = R_ANAL_OP_TYPE_CALL;
+			// TODO: handle /range instructions
+			esilprintf (op, "8,sp,-=,0x%"PFMT64x",sp,=[8],0x%"PFMT64x",ip,=", addr);
 		}
 		break;
 	case 0x27: // throw
@@ -376,7 +380,7 @@
 	case 0x26: // filled-new-array-data
 		op->type = R_ANAL_OP_TYPE_NEW;
 		// 0x1c, 0x1f, 0x22
-		{
+		if (len > 2) {
 			//int vA = (int) data[1];
 			int vB = (data[3] << 8) | data[2];
 			// resolve class name for vB
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_hexagon.c radare2-2.8.0+dfsg/libr/anal/p/anal_hexagon.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_hexagon.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_hexagon.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,105 @@
+/* radare - LGPL - Copyright 2018 - xvilka */
+
+#include <r_types.h>
+#include <r_util.h>
+#include <r_asm.h>
+#include <r_anal.h>
+#include <r_lib.h>
+#include "hexagon.h"
+#include "hexagon_insn.h"
+#include "hexagon_anal.h"
+
+static int hexagon_v6_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
+	HexInsn hi = {0};;
+	ut32 data = 0;
+	memset (op, 0, sizeof (RAnalOp));
+	data = r_read_le32 (buf);
+	int size = hexagon_disasm_instruction (data, &hi);
+	op->size = size;
+	if (size <= 0) {
+		return size;
+	}
+
+	op->addr = addr;
+	op->jump = op->fail = -1;
+	op->ptr = op->val = -1;
+	return hexagon_anal_instruction (&hi, op);
+}
+
+static int set_reg_profile(RAnal *anal) {
+	// TODO: Add missing registers
+	const char *p =
+		"=PC	pc\n"
+		"=SP	r29\n"
+		"=BP	r30\n"
+		"=LR	r31\n"
+		"=ZF	z\n"
+		"=SF	s\n"
+		"=OF	ov\n"
+		"=CF	cy\n"
+
+		"gpr	r0	.32	0   0\n"
+		"gpr	r1	.32	4   0\n"
+		"gpr	r2	.32	8   0\n"
+		"gpr	r3	.32	12  0\n"
+		"gpr	r4	.32	16  0\n"
+		"gpr	r5	.32	20  0\n"
+		"gpr	r6	.32	24  0\n"
+		"gpr	r7	.32	28  0\n"
+		"gpr	r8	.32	32  0\n"
+		"gpr	r9	.32	36  0\n"
+		"gpr	r10	.32	40  0\n"
+		"gpr	r11	.32	44  0\n"
+		"gpr	r12	.32	48  0\n"
+		"gpr	r13	.32	52  0\n"
+		"gpr	r14	.32	56  0\n"
+		"gpr	r15	.32	60  0\n"
+		"gpr	r16	.32	64  0\n"
+		"gpr	r17	.32	68  0\n"
+		"gpr	r18	.32	72  0\n"
+		"gpr	r19	.32	76  0\n"
+		"gpr	r20	.32	80  0\n"
+		"gpr	r21	.32	84  0\n"
+		"gpr	r22	.32	88  0\n"
+		"gpr	r23	.32	92  0\n"
+		"gpr	r24	.32	96  0\n"
+		"gpr	r25	.32	100 0\n"
+		"gpr	r26	.32	104 0\n"
+		"gpr	r27	.32	108 0\n"
+		"gpr	r28	.32	112 0\n"
+		"gpr	r29	.32	116 0\n"
+		"gpr	r30	.32	120 0\n"
+		"gpr	r31	.32	124 0\n"
+		"gpr	pc	.32	128 0\n"
+
+		"gpr	psw .32 132 0\n"
+		"gpr	np  .1 132.16 0\n"
+		"gpr	ep  .1 132.17 0\n"
+		"gpr	ae  .1 132.18 0\n"
+		"gpr	id  .1 132.19 0\n"
+		"flg	cy  .1 132.28 0\n"
+		"flg	ov  .1 132.29 0\n"
+		"flg	s   .1 132.30 0\n"
+		"flg	z   .1 132.31 0\n";
+
+	return r_reg_set_profile_string (anal->reg, p);
+}
+
+RAnalPlugin r_anal_plugin_hexagon = {
+	.name = "hexagon",
+	.desc = "Qualcomm Hexagon (QDSP6) V6",
+	.license = "LGPL3",
+	.arch = "hexagon",
+	.bits = 32,
+	.op = hexagon_v6_op,
+	.esil = true,
+	.set_reg_profile = set_reg_profile,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_ANAL,
+	.data = &r_anal_plugin_hexagon_v6,
+	.version = R2_VERSION
+};
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_java.c radare2-2.8.0+dfsg/libr/anal/p/anal_java.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_java.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_java.c	2018-08-07 14:12:36.000000000 +0000
@@ -223,7 +223,7 @@
 	switch (control_type) {
 		case R_ANAL_OP_TYPE_CALL:
 			IFDBG eprintf (" - Handling a call @ 0x%04"PFMT64x".\n", addr);
-			r_anal_fcn_xref_add (anal, state->current_fcn, bb->addr, bb->jump, R_ANAL_REF_TYPE_CALL);
+			r_anal_xrefs_set (anal, bb->addr, bb->jump, R_ANAL_REF_TYPE_CALL);
 			result = R_ANAL_RET_ERROR;
 			break;
 		case R_ANAL_OP_TYPE_JMP:
@@ -406,7 +406,7 @@
 	switch (control_type) {
 		case R_ANAL_OP_TYPE_CALL:
 			IFDBG eprintf (" - Handling a call @ 0x%04"PFMT64x"\n", addr);
-			r_anal_fcn_xref_add (anal, state->current_fcn, bb->addr, bb->jump, R_ANAL_REF_TYPE_CALL);
+			r_anal_xrefs_set (anal, bb->addr, bb->jump, R_ANAL_REF_TYPE_CALL);
 			result = R_ANAL_RET_ERROR;
 			break;
 		case R_ANAL_OP_TYPE_JMP:
@@ -422,9 +422,11 @@
 			IFDBG eprintf (" - Handling a bb->jump @ 0x%04"PFMT64x", adding 0x%04"PFMT64x" for future visit\n", addr, *paddr64);
 			r_list_append (nodes->cfg_node_addrs, paddr64);
 			paddr64 = malloc (sizeof(ut64));
-			*paddr64 = bb->fail;
-			IFDBG eprintf (" - Handling a bb->fail @ 0x%04"PFMT64x", adding 0x%04"PFMT64x" for future visit\n", addr, *paddr64);
-			r_list_append (nodes->cfg_node_addrs, paddr64);
+			if (paddr64) {
+				*paddr64 = bb->fail;
+				IFDBG eprintf (" - Handling a bb->fail @ 0x%04"PFMT64x", adding 0x%04"PFMT64x" for future visit\n", addr, *paddr64);
+				r_list_append (nodes->cfg_node_addrs, paddr64);
+			}
 			result = R_ANAL_RET_END;
 			break;
 		case R_ANAL_OP_TYPE_SWITCH:
@@ -479,7 +481,7 @@
 
 	fcn->name = strdup (gen_name);
 	fcn->dsc = strdup ("unknown");
-	r_anal_fcn_set_size (fcn, code_length);
+	r_anal_fcn_set_size (NULL, fcn, code_length);
 	fcn->type = R_ANAL_FCN_TYPE_FCN;
 	fcn->addr = addr;
 	state = r_anal_state_new (addr, (ut8*) code_buf, code_length);
@@ -491,7 +493,7 @@
 	r_list_foreach (fcn->bbs, bb_iter, bb) {
 		actual_size += bb->size;
 	}
-	r_anal_fcn_set_size (fcn, state->bytes_consumed);
+	r_anal_fcn_set_size (NULL, fcn, state->bytes_consumed);
 	result = state->anal_ret_val;
 	r_list_free (nodes->cfg_node_addrs);
 	free (nodes);
@@ -518,7 +520,7 @@
 	if (!code_attr) {
 		fcn->name = strdup ("sym.UNKNOWN");
 		fcn->dsc = strdup ("unknown");
-		r_anal_fcn_set_size (fcn, code_length);
+		r_anal_fcn_set_size (NULL, fcn, code_length);
 		fcn->type = R_ANAL_FCN_TYPE_FCN;
 		fcn->addr = 0;
 		return R_ANAL_RET_ERROR;
@@ -532,8 +534,8 @@
 	result = analyze_from_code_buffer (anal, fcn, code_addr + loadaddr, code_buf, code_length);
 	free (code_buf);
 
-	{
-		char *name = strdup (method->name);
+	char *name = strdup (method->name);
+	if (name) {
 		r_name_filter (name, 80);
 		free (fcn->name);
 		if (method->class_name) {
@@ -567,7 +569,6 @@
 }
 
 static int java_analyze_fns_from_buffer( RAnal *anal, ut64 start, ut64 end, int reftype, int depth) {
-
 	int result = R_ANAL_RET_ERROR;
 	ut64 addr = start;
 	ut64 offset = 0;
@@ -612,7 +613,6 @@
 	return result;
 }
 
-
 static int java_analyze_fns( RAnal *anal, ut64 start, ut64 end, int reftype, int depth) {
 	//anal->iob.read_at (anal->iob.io, op.jump, bbuf, sizeof (bbuf));
 	RBinJavaObj *bin = NULL;// = get_java_bin_obj (anal);
@@ -679,11 +679,11 @@
 
 	if (op_byte == 0xaa) {
 		// handle a table switch condition
-		if (pos + 8 > len) {
+		if (pos + 8 + 8 > len) {
 			return op->size;
 		}
-		int min_val = (ut32)(UINT (data, pos + 4)),
-			max_val = (ut32)(UINT (data, pos + 8));
+		const int min_val = (ut32)(UINT (data, pos + 4));
+		const int max_val = (ut32)(UINT (data, pos + 8));
 
 		ut32 default_loc = (ut32) (UINT (data, pos)), cur_case = 0;
 		op->switch_op = r_anal_switch_op_new (addr, min_val, default_loc);
@@ -698,9 +698,12 @@
 					break;
 				}
 				int offset = (int)(ut32)(R_BIN_JAVA_UINT (data, pos));
-				caseop = r_anal_switch_op_add_case (op->switch_op, addr+pos, cur_case+min_val, addr+offset);
-				caseop->bb_ref_to = addr+offset;
-				caseop->bb_ref_from = addr; // TODO figure this one out
+				caseop = r_anal_switch_op_add_case (op->switch_op,
+					addr + pos, cur_case + min_val, addr + offset);
+				if (caseop) {
+					caseop->bb_ref_to = addr+offset;
+					caseop->bb_ref_from = addr; // TODO figure this one out
+				}
 			}
 		} else {
 			eprintf ("Invalid switch boundaries at 0x%"PFMT64x"\n", addr);
@@ -711,16 +714,14 @@
 }
 
 static int java_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
-	int sz = 1;
-
 	/* get opcode size */
 	//ut8 op_byte = data[0];
 	ut8 op_byte = data[0];
-	sz = JAVA_OPS[op_byte].size;
-	if (!op)	return sz;
-
+	int sz = JAVA_OPS[op_byte].size;
+	if (!op) {
+		return sz;
+	}
 	memset (op, '\0', sizeof (RAnalOp));
-
 	IFDBG {
 		//eprintf ("Extracting op from buffer (%d byte(s)) @ 0x%04x\n", len, addr);
 		//eprintf ("Parsing op: (0x%02x) %s.\n", op_byte, JAVA_OPS[op_byte].name);
@@ -870,24 +871,24 @@
 		return -1;
 	}
 	switch (*input) {
-		case 'c':
-			// reset bytes counter for case operations
-			r_java_new_method ();
-			break;
-		case 'u':
-			switch (*(input+1)) {
-				case 't': {java_update_anal_types (anal, obj); return true;}
-				default: break;
-			}
-			break;
-		case 's':
-			switch (*(input+1)) {
-				//case 'e': return java_resolve_cp_idx_b64 (anal, input+2);
-				default: break;
-			}
-			break;
+	case 'c':
+		// reset bytes counter for case operations
+		r_java_new_method ();
+		break;
+	case 'u':
+		switch (*(input+1)) {
+			case 't': {java_update_anal_types (anal, obj); return true;}
+			default: break;
+		}
+		break;
+	case 's':
+		switch (*(input+1)) {
+			//case 'e': return java_resolve_cp_idx_b64 (anal, input+2);
+			default: break;
+		}
+		break;
 
-		default: eprintf("Command not supported"); break;
+	default: eprintf("Command not supported"); break;
 	}
 	return 0;
 }
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_m68k_cs.c radare2-2.8.0+dfsg/libr/anal/p/anal_m68k_cs.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_m68k_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_m68k_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -76,12 +76,65 @@
 	r_strbuf_append (buf, "]}");
 }
 
+#define ZERO_FILL(x) memset (&x, 0, sizeof (x))
+
+static int parse_reg_name(RRegItem *reg, csh handle, cs_insn *insn, int reg_num) {
+	if (!reg) {
+		return -1;
+	}
+	switch (OPERAND (reg_num).type) {
+	case M68K_OP_REG:
+		reg->name = (char *)cs_reg_name (handle, OPERAND (reg_num).reg);
+		break;
+	case M68K_OP_MEM:
+		if (OPERAND (reg_num).mem.base_reg != M68K_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (handle, OPERAND (reg_num).mem.base_reg);
+		}
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
+static void op_fillval(RAnalOp *op, csh handle, cs_insn *insn) {
+	static RRegItem reg;
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_MOV:
+		ZERO_FILL (reg);
+		if (OPERAND(1).type == M68K_OP_MEM) {
+			op->src[0] = r_anal_value_new ();
+			op->src[0]->reg = &reg;
+			parse_reg_name (op->src[0]->reg, handle, insn, 1);
+			op->src[0]->delta = OPERAND(0).mem.disp;
+		} else if (OPERAND(0).type == M68K_OP_MEM) {
+			op->dst = r_anal_value_new ();
+			op->dst->reg = &reg;
+			parse_reg_name (op->dst->reg, handle, insn, 0);
+			op->dst->delta = OPERAND(1).mem.disp;
+		}
+		break;
+	case R_ANAL_OP_TYPE_LEA:
+		ZERO_FILL (reg);
+		if (OPERAND(1).type == M68K_OP_MEM) {
+			op->dst = r_anal_value_new ();
+			op->dst->reg = &reg;
+			parse_reg_name (op->dst->reg, handle, insn, 1);
+			op->dst->delta = OPERAND(1).mem.disp;
+		}
+		break;
+	}
+}
+
 static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	int n, ret, opsize = -1;
 	static csh handle = 0;
 	static int omode = -1;
 	static int obits = 32;
 	cs_insn* insn;
+	cs_m68k *m68k;
+	cs_detail *detail;
+
 	int mode = a->big_endian? CS_MODE_BIG_ENDIAN: CS_MODE_LITTLE_ENDIAN;
 
 	//mode |= (a->bits==64)? CS_MODE_64: CS_MODE_32;
@@ -119,12 +172,14 @@
 		opsize = -1;
 		goto beach;
 	}
-	if (!memcmp (buf, "\xff\xff", 2)) {
+	if (!memcmp (buf, "\xff\xff", R_MIN (len, 2))) {
 		op->type = R_ANAL_OP_TYPE_ILL;
 		op->size = 2;
 		opsize = -1;
 		goto beach;
 	}
+	detail = insn->detail;
+	m68k = &detail->m68k;
 	op->type = R_ANAL_OP_TYPE_NULL;
 	op->delay = 0;
 	op->id = insn->id;
@@ -169,9 +224,19 @@
 	case M68K_INS_BLT:
 	case M68K_INS_BGT:
 	case M68K_INS_BLE:
+#if CS_API_MAJOR >= 4
+		if (m68k->operands[0].type == M68K_OP_BR_DISP) {
+			op->type = R_ANAL_OP_TYPE_CJMP;
+			// TODO: disp_size is ignored
+			op->jump = addr + m68k->operands[0].br_disp.disp + 2;
+			op->fail = addr + insn->size;
+		}
+#else
 		op->type = R_ANAL_OP_TYPE_CJMP;
-		op->jump = ((addr >>32)<<32) | (UT32_MAX & IMM(0));
-		op->fail = addr + 2;
+		// TODO: disp_size is ignored
+		op->jump = addr + m68k->operands[0].br_disp.disp + 2;
+		op->fail = addr + insn->size;
+#endif
 		break;
 	case M68K_INS_BRA:
 		op->type = R_ANAL_OP_TYPE_JMP;
@@ -592,10 +657,13 @@
 		op->stackptr = 0;
 		break;
 	}
-	beach:
+	if (a->fillval) {
+		op_fillval (op, handle, insn);
+	}
+beach:
 	cs_free (insn, n);
 	//cs_close (&handle);
-	fin:
+fin:
 	return opsize;
 }
 
@@ -668,7 +736,7 @@
 };
 #else
 RAnalPlugin r_anal_plugin_m68k_cs = {
-	.name = "m68k.cs (unsupported)",
+	.name = "m68k (unsupported)",
 	.desc = "Capstone M68K analyzer (unsupported)",
 	.license = "BSD",
 	.arch = "m68k",
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_mips_cs.c radare2-2.8.0+dfsg/libr/anal/p/anal_mips_cs.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_mips_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_mips_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2013-2017 - pancake */
+/* radare2 - LGPL - Copyright 2013-2018 - pancake */
 
 #include <r_asm.h>
 #include <r_lib.h>
@@ -61,8 +61,6 @@
 // put the sign bit on the stack
 #define ES_IS_NEGATIVE(arg) "1,"arg",<<<,1,&"
 
-// jump to address
-#define ES_J(addr) addr",$jt,=,1,$ds,="
 
 // call with delay slot
 #define ES_CALL_DR(ra, addr) "pc,4,+,"ra",=,"ES_J(addr)
@@ -72,8 +70,16 @@
 #define ES_CALL_NDR(ra, addr) "pc,"ra",=,"ES_J(addr)
 #define ES_CALL_ND(addr) ES_CALL_NDR("ra", addr)
 
+#define USE_DS 0
+#if USE_DS
 // emit ERR trap if executed in a delay slot
-#define ES_TRAP_DS() "0,$ds,>,?{,$$,1,TRAP,BREAK,}"
+#define ES_TRAP_DS() "0,$ds,>,?{,$$,1,TRAP,BREAK,},"
+// jump to address
+#define ES_J(addr) addr",$jt,=,1,$ds,=,"
+#else
+#define ES_TRAP_DS() ""
+#define ES_J(addr) addr",pc,="
+#endif
 
 // sign extend 32 -> 64
 #define ES_SIGN_EXT64(arg) \
@@ -241,110 +247,110 @@
 		break;
 	case MIPS_INS_BAL:
 	case MIPS_INS_JAL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "," ES_CALL_D ("%s"), ARG (0));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_D ("%s"), ARG (0));
 		break;
 	case MIPS_INS_JALR:
 	case MIPS_INS_JALRS:
 		if (OPCOUNT () < 2) {
-			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "," ES_CALL_D ("%s"), ARG (0));
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_D ("%s"), ARG (0));
 		} else {
 			PROTECT_ZERO () {
-				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "," ES_CALL_DR ("%s","%s"), ARG (0), ARG (1));
+				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_DR ("%s","%s"), ARG (0), ARG (1));
 			}
 		}
 		break;
 	case MIPS_INS_JALRC: // no delay
 		if (OPCOUNT () < 2) {
-			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "," ES_CALL_ND ("%s"), ARG (0));
+			r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_ND ("%s"), ARG (0));
 		} else {
 			PROTECT_ZERO () {
-				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "," ES_CALL_NDR ("%s","%s"), ARG (0), ARG (1));
+				r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_CALL_NDR ("%s","%s"), ARG (0), ARG (1));
 			}
 		}
 		break;
 	case MIPS_INS_JRADDIUSP:
 		// increment stackpointer in X and jump to %ra
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",%d,sp,+=,"ES_J ("ra"), ARG (0));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%d,sp,+=,"ES_J ("ra"), ARG (0));
 		break;
 	case MIPS_INS_JR:
 	case MIPS_INS_JRC:
 	case MIPS_INS_J:
 	case MIPS_INS_B: // ???
 		// jump to address with conditional
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "," ES_J ("%s"), ARG (0));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "" ES_J ("%s"), ARG (0));
 		break;
 	case MIPS_INS_BNE:  // bne $s, $t, offset
 	case MIPS_INS_BNEL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",%s,%s,==,$z,!,?{,"ES_J ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,%s,==,$z,!,?{,"ES_J ("%s")",}",
 			ARG (0), ARG (1), ARG (2));
 		break;
 	case MIPS_INS_BEQ:
 	case MIPS_INS_BEQL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",%s,%s,==,$z,?{,"ES_J ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,%s,==,$z,?{,"ES_J ("%s")",}",
 			ARG (0), ARG (1), ARG (2));
 		break;
 	case MIPS_INS_BZ:
 	case MIPS_INS_BEQZ:
 	case MIPS_INS_BEQZC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",%s,0,==,$z,?{,"ES_J ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,?{,"ES_J ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BNEZ:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",%s,0,==,$z,!,?{,"ES_J ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,!,?{,"ES_J ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BEQZALC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",%s,0,==,$z,?{,"ES_CALL_ND ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "%s,0,==,$z,?{,"ES_CALL_ND ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BLEZ:
 	case MIPS_INS_BLEZC:
 	case MIPS_INS_BLEZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,%s,==,$z,?{,"ES_J ("%s")",BREAK,},",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,"ES_J ("%s")",BREAK,},",
 			ARG (0), ARG (1));
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BGEZ:
 	case MIPS_INS_BGEZC:
 	case MIPS_INS_BGEZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BGEZAL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_D ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_D ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BGEZALC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_ND ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_ND ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BGTZALC:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,%s,==,$z,?{,BREAK,},", ARG(0));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,BREAK,},", ARG(0));
 		r_strbuf_appendf (&op->esil, "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_ND ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BLTZAL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_D ("%s")",}", ARG(0), ARG(1));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_CALL_D ("%s")",}", ARG(0), ARG(1));
 		break;
 	case MIPS_INS_BLTZ:
 	case MIPS_INS_BLTZC:
 	case MIPS_INS_BLTZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "1,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J ("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BGTZ:
 	case MIPS_INS_BGTZC:
 	case MIPS_INS_BGTZL:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,%s,==,$z,?{,BREAK,},", ARG (0));
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J("%s")",}",
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,%s,==,$z,?{,BREAK,},", ARG (0));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,"ES_IS_NEGATIVE ("%s")",==,$z,?{,"ES_J("%s")",}",
 			ARG (0), ARG (1));
 		break;
 	case MIPS_INS_BTEQZ:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,t,==,$z,?{,"ES_J ("%s")",}", ARG (0));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,t,==,$z,?{,"ES_J ("%s")",}", ARG (0));
 		break;
 	case MIPS_INS_BTNEZ:
-		r_strbuf_appendf (&op->esil, ES_TRAP_DS () ",0,t,==,$z,!,?{,"ES_J ("%s")",}", ARG (0));
+		r_strbuf_appendf (&op->esil, ES_TRAP_DS () "0,t,==,$z,!,?{,"ES_J ("%s")",}", ARG (0));
 		break;
 	case MIPS_INS_MOV:
 	case MIPS_INS_MOVE:
@@ -430,6 +436,9 @@
 		r_strbuf_appendf (&op->esil, "0x%"PFMT64x"0000,%s,=", IMM(1), ARG(0));
 		break;
 	case MIPS_INS_LB:
+		op->sign = true;
+		ESIL_LOAD ("1");
+		break;
 	case MIPS_INS_LBU:
 		//one of these is wrong
 		ESIL_LOAD ("1");
@@ -578,10 +587,94 @@
 	return 0;
 }
 
+#define ZERO_FILL(x) memset (&x, 0, sizeof (x))
+
+static int parse_reg_name(RRegItem *reg, csh handle, cs_insn *insn, int reg_num) {
+	if (!reg) {
+		return -1;
+	}
+	switch (OPERAND (reg_num).type) {
+	case MIPS_OP_REG:
+		reg->name = (char *)cs_reg_name (handle, OPERAND (reg_num).reg);
+		break;
+	case MIPS_OP_MEM:
+		if (OPERAND (reg_num).mem.base != MIPS_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (handle, OPERAND (reg_num).mem.base);
+		}
+	default:
+		break;
+	}
+	return 0;
+}
+
+static void op_fillval(RAnal *anal, RAnalOp *op, csh *handle, cs_insn *insn) {
+	static RRegItem reg;
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_LOAD:
+		if (OPERAND(1).type == MIPS_OP_MEM) {
+			ZERO_FILL (reg);
+			op->src[0] = r_anal_value_new ();
+			op->src[0]->reg = &reg;
+			parse_reg_name (op->src[0]->reg, *handle, insn, 1);
+			op->src[0]->delta = OPERAND(1).mem.disp;
+		}
+		break;
+	case R_ANAL_OP_TYPE_STORE:
+		if (OPERAND(1).type == MIPS_OP_MEM) {
+			ZERO_FILL (reg);
+			op->dst = r_anal_value_new ();
+			op->dst->reg = &reg;
+			parse_reg_name (op->dst->reg, *handle, insn, 1);
+			op->dst->delta = OPERAND(1).mem.disp;
+		}
+		break;
+	case R_ANAL_OP_TYPE_SHL:
+	case R_ANAL_OP_TYPE_SHR:
+	case R_ANAL_OP_TYPE_SAR:
+	case R_ANAL_OP_TYPE_XOR:
+	case R_ANAL_OP_TYPE_SUB:
+	case R_ANAL_OP_TYPE_AND:
+	case R_ANAL_OP_TYPE_ADD:
+	case R_ANAL_OP_TYPE_OR:
+		SET_SRC_DST_3_REG_OR_IMM (op);
+		break;
+	case R_ANAL_OP_TYPE_MOV:
+		SET_SRC_DST_2_REGS (op);
+		break;
+	case R_ANAL_OP_TYPE_DIV:
+		SET_SRC_DST_3_REGS (op);
+		break;
+	}
+	if (insn && (insn->id == MIPS_INS_SLTI || insn->id == MIPS_INS_SLTIU)) {
+		SET_SRC_DST_3_IMM (op);
+	}
+}
+
+static void set_opdir(RAnalOp *op) {
+        switch (op->type & R_ANAL_OP_TYPE_MASK) {
+        case R_ANAL_OP_TYPE_LOAD:
+                op->direction = R_ANAL_OP_DIR_READ;
+                break;
+        case R_ANAL_OP_TYPE_STORE:
+                op->direction = R_ANAL_OP_DIR_WRITE;
+                break;
+        case R_ANAL_OP_TYPE_LEA:
+                op->direction = R_ANAL_OP_DIR_REF;
+                break;
+        case R_ANAL_OP_TYPE_CALL:
+        case R_ANAL_OP_TYPE_JMP:
+        case R_ANAL_OP_TYPE_UJMP:
+        case R_ANAL_OP_TYPE_UCALL:
+                op->direction = R_ANAL_OP_DIR_EXEC;
+                break;
+        default:
+                break;
+        }
+}
+
 static int analop(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	int n, ret, opsize = -1;
 	static csh hndl = 0;
-	static csh *handle = &hndl;
 	static int omode = -1;
 	static int obits = 32;
 	cs_insn* insn;
@@ -733,7 +826,6 @@
 		break;
 	case MIPS_INS_MOVE:
 		op->type = R_ANAL_OP_TYPE_MOV;
-		SET_SRC_DST_2_REGS (op);
 		break;
 	case MIPS_INS_ADD:
 	case MIPS_INS_ADDI:
@@ -743,7 +835,7 @@
 	case MIPS_INS_DADDI:
 	case MIPS_INS_DADDIU:
 		SET_VAL (op, 2);
-		SET_SRC_DST_3_REG_OR_IMM (op);
+		op->sign = (insn->id == MIPS_INS_ADDI || insn->id == MIPS_INS_ADD);
 		op->type = R_ANAL_OP_TYPE_ADD;
 		if (REGID(0) == MIPS_REG_SP) {
 			op->stackop = R_ANAL_STACK_INC;
@@ -763,7 +855,7 @@
 	case MIPS_INS_SUBUH:
 	case MIPS_INS_SUBUH_R:
 		SET_VAL (op,2);
-		SET_SRC_DST_3_REG_OR_IMM (op);
+		op->sign = insn->id == MIPS_INS_SUB;
 		op->type = R_ANAL_OP_TYPE_SUB;
 		break;
 	case MIPS_INS_MULV:
@@ -778,13 +870,11 @@
 	case MIPS_INS_XOR:
 	case MIPS_INS_XORI:
 		SET_VAL (op,2);
-		SET_SRC_DST_3_REG_OR_IMM (op);
 		op->type = R_ANAL_OP_TYPE_XOR;
 		break;
 	case MIPS_INS_AND:
 	case MIPS_INS_ANDI:
 		SET_VAL (op,2);
-		SET_SRC_DST_3_REG_OR_IMM (op);
 		op->type = R_ANAL_OP_TYPE_AND;
 		if (REGID(0) == MIPS_REG_SP) {
 			op->stackop = R_ANAL_STACK_ALIGN;
@@ -796,7 +886,6 @@
 	case MIPS_INS_OR:
 	case MIPS_INS_ORI:
 		SET_VAL (op,2);
-		SET_SRC_DST_3_REG_OR_IMM (op);
 		op->type = R_ANAL_OP_TYPE_OR;
 		break;
 	case MIPS_INS_DIV:
@@ -806,7 +895,6 @@
 	case MIPS_INS_FDIV:
 	case MIPS_INS_DIV_S:
 	case MIPS_INS_DIV_U:
-		SET_SRC_DST_3_REGS (op);
 		op->type = R_ANAL_OP_TYPE_DIV;
 		break;
 	case MIPS_INS_CMPGDU:
@@ -880,43 +968,46 @@
 			op->type = R_ANAL_OP_TYPE_RET;
 		}
 		break;
+	case MIPS_INS_SLT:
 	case MIPS_INS_SLTI:
+		op->sign = true;
+		SET_VAL (op, 2);
+		break;
 	case MIPS_INS_SLTIU:
-		SET_SRC_DST_3_IMM (op);
-		SET_VAL (op,2);
+		SET_VAL (op, 2);
 		break;
-
 	case MIPS_INS_SHRAV:
 	case MIPS_INS_SHRAV_R:
 	case MIPS_INS_SHRA:
 	case MIPS_INS_SHRA_R:
 	case MIPS_INS_SRA:
 		op->type = R_ANAL_OP_TYPE_SAR;
-		SET_SRC_DST_3_REG_OR_IMM (op);
 		SET_VAL (op,2);
 		break;
 	case MIPS_INS_SHRL:
 	case MIPS_INS_SRLV:
 	case MIPS_INS_SRL:
 		op->type = R_ANAL_OP_TYPE_SHR;
-		SET_SRC_DST_3_REG_OR_IMM (op);
 		SET_VAL (op,2);
 		break;
 	case MIPS_INS_SLLV:
 	case MIPS_INS_SLL:
 		op->type = R_ANAL_OP_TYPE_SHL;
-		SET_SRC_DST_3_REG_OR_IMM (op);
 		SET_VAL (op,2);
 		break;
 	}
-	beach:
+beach:
+	set_opdir (op);
 	if (anal->decode) {
 		if (analop_esil (anal, op, addr, buf, len, &hndl, insn) != 0)
 			r_strbuf_fini (&op->esil);
 	}
+	if (anal->fillval) {
+		op_fillval (anal, op, &hndl, insn);
+	}
 	cs_free (insn, n);
 	//cs_close (&handle);
-	fin:
+fin:
 	return opsize;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_msp430.c radare2-2.8.0+dfsg/libr/anal/p/anal_msp430.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_msp430.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_msp430.c	2018-08-07 14:12:36.000000000 +0000
@@ -14,7 +14,7 @@
 	memset (&cmd, 0, sizeof (cmd));
 	memset (op, 0, sizeof (RAnalOp));
 
-	ret = op->size = msp430_decode_command (buf, &cmd);
+	ret = op->size = msp430_decode_command (buf, len, &cmd);
 
 	if (ret < 0) {
 		return ret;
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_pic.c radare2-2.8.0+dfsg/libr/anal/p/anal_pic.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_pic.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_pic.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,725 @@
-/* radare2 - LGPL - Copyright 2015-2018 - oddcoder, thestr4ng3r */
+/* radare2 - LGPL - Copyright 2015-2018 - oddcoder, thestr4ng3r, courk */
 
 #include <r_types.h>
 #include <r_anal.h>
 #include <r_lib.h>
 
-void cond_branch (RAnalOp *op, ut64 addr, const ut8 *buf, char *flag) {
+#include "../../asm/arch/pic/pic_midrange.h"
+
+typedef struct _pic_midrange_op_args_val {
+	ut16 f;
+	ut16 k;
+	ut8 d;
+	ut8 m;
+	ut8 n;
+	ut8 b;
+} PicMidrangeOpArgsVal;
+
+typedef void (*pic_midrange_inst_handler_t) (RAnal *anal, RAnalOp *op,
+					     ut64 addr,
+					     PicMidrangeOpArgsVal *args);
+
+typedef struct _pic_midrange_op_anal_info {
+	PicMidrangeOpcode opcode;
+	PicMidrangeOpArgs args;
+	pic_midrange_inst_handler_t handler;
+} PicMidrangeOpAnalInfo;
+
+#define INST_HANDLER(OPCODE_NAME)                                            \
+	static void _inst__##OPCODE_NAME (RAnal *anal, RAnalOp *op,          \
+					  ut64 addr,                         \
+					  PicMidrangeOpArgsVal *args)
+#define INST_DECL(NAME, ARGS)                                                \
+	{                                                                    \
+		PIC_MIDRANGE_OPCODE_##NAME, PIC_MIDRANGE_OP_ARGS_##ARGS,     \
+			_inst__##NAME                                        \
+	}
+
+#define e(frag) r_strbuf_append (&op->esil, frag)
+#define ef(frag, ...) r_strbuf_appendf (&op->esil, frag, __VA_ARGS__)
+
+#define PIC_MIDRANGE_ESIL_SRAM_START (1 << 16)
+#define PIC_MIDRANGE_ESIL_CSTACK_TOP ((1 << 16) + (1 << 12))
+
+#define PIC_MIDRANGE_ESIL_BSR_ADDR "bsr,0x80,*,0x%x,+,_sram,+"
+
+#define PIC_MIDRANGE_ESIL_OPTION_ADDR "0x95,_sram,+"
+
+#define PIC_MIDRANGE_ESIL_UPDATE_FLAGS                                       \
+	"$z,z,=,"                                                            \
+	"$c7,c,=,"                                                           \
+	"$c4,dc,=,"
+
+#define PIC_MIDRANGE_ESIL_LW_OP(O)                                           \
+	"0x%x,wreg," #O "=," PIC_MIDRANGE_ESIL_UPDATE_FLAGS
+
+#define PIC_MIDRANGE_ESIL_FWF_OP(O)                                          \
+	"wreg," PIC_MIDRANGE_ESIL_BSR_ADDR "," #O                            \
+	"=[1]," PIC_MIDRANGE_ESIL_UPDATE_FLAGS
+
+#define PIC_MIDRANGE_ESIL_WWF_OP(O)                                          \
+	PIC_MIDRANGE_ESIL_BSR_ADDR                                           \
+	",[1],"                                                              \
+	"wreg," #O "=," PIC_MIDRANGE_ESIL_UPDATE_FLAGS
+
+#define PIC_MIDRANGE_ESIL_FWF_OP_C(O)                                        \
+	"c,wreg,"                                                            \
+	"+," PIC_MIDRANGE_ESIL_BSR_ADDR "," #O                               \
+	"=[1]," PIC_MIDRANGE_ESIL_UPDATE_FLAGS
+
+#define PIC_MIDRANGE_ESIL_WWF_OP_C(O)                                        \
+	"c," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1]," #O ","                       \
+	"wreg," #O "=," PIC_MIDRANGE_ESIL_UPDATE_FLAGS
+
+INST_HANDLER (NOP) {}
+
+INST_HANDLER (RETFIE) {
+	op->type = R_ANAL_OP_TYPE_RET;
+}
+
+INST_HANDLER (OPTION) {
+	op->type = R_ANAL_OP_TYPE_STORE;
+}
+
+INST_HANDLER (TRIS) {
+	op->type = R_ANAL_OP_TYPE_STORE;
+}
+
+INST_HANDLER (RETURN) {
+	op->type = R_ANAL_OP_TYPE_RET;
+	e ("0x1f,stkptr,==,?{,BREAK,},");
+	e ("_stack,stkptr,2,*,+,[2],2,*,pc,=,");
+	e ("0x01,stkptr,-=,");
+	e ("0xff,stkptr,==,?{,0x1f,stkptr,=,},");
+}
+
+INST_HANDLER (CALL) {
+	ut64 pclath;
+	op->type = R_ANAL_OP_TYPE_CALL;
+	r_anal_esil_reg_read (anal->esil, "pclath", &pclath, NULL);
+	op->jump = 2 * (((pclath & 0x78) << 8) + args->k);
+	ef ("8,pclath,0x78,&,<<,0x%x,+,2,*,pc,=,", args->k);
+	e ("0x1f,stkptr,==,?{,0xff,stkptr,=,},");
+	e ("0x0f,stkptr,==,?{,0xff,stkptr,=,},");
+	e ("0x01,stkptr,+=,");
+	ef ("0x%x,_stack,stkptr,2,*,+,=[2],", (addr + 2) / 2);
+}
+
+INST_HANDLER (GOTO) {
+	ut64 pclath;
+	op->type = R_ANAL_OP_TYPE_JMP;
+	r_anal_esil_reg_read (anal->esil, "pclath", &pclath, NULL);
+	op->jump = 2 * (((pclath & 0x78) << 8) + args->k);
+	ef ("8,pclath,0x78,&,<<,0x%x,+,2,*,pc,=,", args->k);
+}
+
+INST_HANDLER (BCF) {
+	ut8 mask = ~(1 << args->b);
+	ef (PIC_MIDRANGE_ESIL_BSR_ADDR
+	    ",[1],0x%x,&," PIC_MIDRANGE_ESIL_BSR_ADDR ",=[1],",
+	    args->f, mask, args->f);
+}
+
+INST_HANDLER (BSF) {
+	ut8 mask = (1 << args->b);
+	ef (PIC_MIDRANGE_ESIL_BSR_ADDR
+	    ",[1],0x%x,|," PIC_MIDRANGE_ESIL_BSR_ADDR ",=[1],",
+	    args->f, mask, args->f);
+}
+
+INST_HANDLER (BTFSC) {
+	ut8 mask = (1 << args->b);
+	op->type = R_ANAL_OP_TYPE_CJMP;
+	op->jump = addr + 4;
+	op->fail = addr + 2;
+	ef (PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],0x%x,&,!,?{,0x%x,pc,=,},",
+	    args->f, mask, op->jump);
+}
+
+INST_HANDLER (BTFSS) {
+	ut8 mask = (1 << args->b);
+	op->type = R_ANAL_OP_TYPE_CJMP;
+	op->jump = addr + 4;
+	op->fail = addr + 2;
+	ef (PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],0x%x,&,?{,0x%x,pc,=,},", args->f,
+	    mask, op->jump);
+}
+
+INST_HANDLER (BRA) {
+	st16 branch = args->k;
+	op->type = R_ANAL_OP_TYPE_JMP;
+	branch |= ((branch & 0x100) ? 0xfe00 : 0);
+	op->jump = addr + 2 * (branch + 1);
+	ef ("%s0x%x,1,+,2,*,pc,+=,", branch < 0 ? "-" : "",
+	    branch < 0 ? -branch : branch);
+}
+
+INST_HANDLER (BRW) {
+	ut64 wreg;
+	op->type = R_ANAL_OP_TYPE_UJMP;
+	r_anal_esil_reg_read (anal->esil, "wreg", &wreg, NULL);
+	op->jump = addr + 2 * (wreg + 1);
+	e ("wreg,1,+,2,*,pc,+=,");
+}
+
+INST_HANDLER (CLR) {
+	if (args->d) {
+		ef ("0x00," PIC_MIDRANGE_ESIL_BSR_ADDR ",=[1],", args->f);
+	} else {
+		e ("0x00,wreg,=,");
+	}
+	e ("1,z,=,");
+}
+
+INST_HANDLER (SUBWF) {
+	op->type = R_ANAL_OP_TYPE_SUB;
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_FWF_OP (-), args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_WWF_OP (-), args->f);
+		e ("wreg,0x00,-,wreg,=,c,!=,dc,!=,");
+	}
+}
+
+INST_HANDLER (DECFSZ) {
+	op->type = R_ANAL_OP_TYPE_CJMP;
+	op->jump = addr + 4;
+	op->fail = addr + 2;
+	if (args->d) {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",-=[1],", args->f);
+	} else {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],-,wreg,=,",
+		    args->f);
+	}
+	ef (PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],!,?{,0x%x,pc,=,},", args->f,
+	    op->jump);
+}
+
+INST_HANDLER (INCFSZ) {
+	op->type = R_ANAL_OP_TYPE_CJMP;
+	op->jump = addr + 4;
+	op->fail = addr + 2;
+	if (args->d) {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",+=[1],", args->f);
+	} else {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],+,wreg,=,",
+		    args->f);
+	}
+	ef (PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],!,?{,0x%x,pc,=,},", args->f,
+	    op->jump);
+}
+
+INST_HANDLER (INCF) {
+	op->type = R_ANAL_OP_TYPE_ADD;
+	if (args->d) {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",+=[1],", args->f);
+	} else {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],+,wreg,=,",
+		    args->f);
+	}
+	e ("$z,z,=,");
+}
+
+INST_HANDLER (DECF) {
+	op->type = R_ANAL_OP_TYPE_SUB;
+	if (args->d) {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",-=[1],", args->f);
+	} else {
+		ef ("0x01," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],-,wreg,=,",
+		    args->f);
+	}
+	e ("$z,z,=,");
+}
+
+INST_HANDLER (IORWF) {
+	op->type = R_ANAL_OP_TYPE_OR;
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_FWF_OP (|), args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_WWF_OP (|), args->f);
+	}
+}
+
+INST_HANDLER (ANDWF) {
+	op->type = R_ANAL_OP_TYPE_AND;
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_FWF_OP (&), args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_WWF_OP (&), args->f);
+	}
+}
+
+INST_HANDLER (XORWF) {
+	op->type = R_ANAL_OP_TYPE_XOR;
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_FWF_OP (^), args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_WWF_OP (^), args->f);
+	}
+}
+
+INST_HANDLER (ADDWF) {
+	op->type = R_ANAL_OP_TYPE_ADD;
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_FWF_OP (+), args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_WWF_OP (+), args->f);
+	}
+}
+
+INST_HANDLER (SUBLW) {
+	op->type = R_ANAL_OP_TYPE_SUB;
+	ef (PIC_MIDRANGE_ESIL_LW_OP (-), args->k);
+}
+
+INST_HANDLER (ADDLW) {
+	op->type = R_ANAL_OP_TYPE_ADD;
+	ef (PIC_MIDRANGE_ESIL_LW_OP (+), args->k);
+}
+
+INST_HANDLER (IORLW) {
+	op->type = R_ANAL_OP_TYPE_OR;
+	ef (PIC_MIDRANGE_ESIL_LW_OP (|), args->k);
+}
+
+INST_HANDLER (ANDLW) {
+	op->type = R_ANAL_OP_TYPE_AND;
+	ef (PIC_MIDRANGE_ESIL_LW_OP (&), args->k);
+}
+
+INST_HANDLER (XORLW) {
+	op->type = R_ANAL_OP_TYPE_XOR;
+	ef (PIC_MIDRANGE_ESIL_LW_OP (^), args->k);
+}
+
+INST_HANDLER (MOVLW) {
+	op->type = R_ANAL_OP_TYPE_LOAD;
+	ef ("0x%x,wreg,=,", args->k);
+}
+
+INST_HANDLER (RETLW) {
+	op->type = R_ANAL_OP_TYPE_RET;
+	ef ("0x%x,wreg,=,", args->k);
+	e ("0x1f,stkptr,==,?{,BREAK,},");
+	e ("_stack,stkptr,2,*,+,[2],2,*,pc,=,");
+	e ("0x01,stkptr,-=,");
+	e ("0xff,stkptr,==,?{,0x1f,stkptr,=,},");
+}
+
+INST_HANDLER (MOVLP) {
+	op->type = R_ANAL_OP_TYPE_LOAD;
+	ef ("0x%x,pclath,=,", args->f);
+}
+
+INST_HANDLER (MOVLB) {
+	op->type = R_ANAL_OP_TYPE_LOAD;
+	ef ("0x%x,bsr,=,", args->k);
+}
+
+INST_HANDLER (CALLW) {
+	op->type = R_ANAL_OP_TYPE_UCALL;
+	e ("8,pclath,<<,0x%x,+,wreg,2,*,pc,=,");
+	e ("0x1f,stkptr,==,?{,0xff,stkptr,=,},");
+	e ("0x0f,stkptr,==,?{,0xff,stkptr,=,},");
+	e ("0x01,stkptr,+=,");
+	ef ("0x%x,_stack,stkptr,2,*,+,=[2],", (addr + 2) / 2);
+}
+
+INST_HANDLER (MOVWF) {
+	op->type = R_ANAL_OP_TYPE_STORE;
+	ef ("wreg," PIC_MIDRANGE_ESIL_BSR_ADDR ",=[1],", args->f);
+}
+
+INST_HANDLER (MOVF) {
+	op->type = R_ANAL_OP_TYPE_LOAD;
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_BSR_ADDR
+		    ",[1]," PIC_MIDRANGE_ESIL_BSR_ADDR ",=[1],",
+		    args->f, args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_BSR_ADDR, ",[1],wreg,=,", args->f);
+	}
+	e ("$z,z,=,");
+}
+
+INST_HANDLER (SWAPF) {
+	ef ("4," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],>>,0x0f,&,", args->f);
+	ef ("4," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],<<,0xf0,&,", args->f);
+	e ("|,");
+	ef (PIC_MIDRANGE_ESIL_BSR_ADDR ",=[1],", args->f);
+}
+
+INST_HANDLER (LSLF) {
+	op->type = R_ANAL_OP_TYPE_SHL;
+	ef ("7," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],>>,c,=,", args->f);
+	if (args->d) {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",<<=[1],", args->f);
+	} else {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],<<,wreg,=,",
+		    args->f);
+	}
+	e ("$z,z,=,");
+}
+
+INST_HANDLER (LSRF) {
+	op->type = R_ANAL_OP_TYPE_SHR;
+	ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],&,c,=,", args->f);
+	if (args->d) {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",>>=[1],", args->f);
+	} else {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],>>,wreg,=,",
+		    args->f);
+	}
+	e ("$z,z,=,");
+}
+
+INST_HANDLER (ASRF) {
+	op->type = R_ANAL_OP_TYPE_SHR;
+	ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],&,c,=,", args->f);
+	ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],>>,", args->f);
+	ef ("0x80," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],&,", args->f);
+	if (args->d) {
+		ef ("|," PIC_MIDRANGE_ESIL_BSR_ADDR ",=[1],", args->f);
+	} else {
+		e ("|,wreg,=,");
+	}
+	e ("$z,z,=,");
+}
+
+INST_HANDLER (RRF) {
+	op->type = R_ANAL_OP_TYPE_ROR;
+	ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],&,", args->f);
+	if (args->d) {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",>>=[1],"
+		    "c," PIC_MIDRANGE_ESIL_BSR_ADDR ",|=[1],",
+		    args->f, args->f);
+	} else {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],>>,wreg,=,"
+		    "c,wreg,|=[1],",
+		    args->f);
+	}
+	e ("c,=,");
+}
+
+INST_HANDLER (RLF) {
+	op->type = R_ANAL_OP_TYPE_ROL;
+	ef ("7," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],>>,", args->f);
+	if (args->d) {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",<<=[1],"
+		    "c," PIC_MIDRANGE_ESIL_BSR_ADDR ",|=[1],",
+		    args->f, args->f);
+	} else {
+		ef ("1," PIC_MIDRANGE_ESIL_BSR_ADDR ",[1],<<,wreg,=,"
+		    "c,wreg,|=[1],",
+		    args->f);
+	}
+	e ("c,=,");
+}
+
+INST_HANDLER (COMF) {
+	if (args->d) {
+		ef ("0xff," PIC_MIDRANGE_ESIL_BSR_ADDR ",^=[1],", args->f);
+	} else {
+		ef ("0xff," PIC_MIDRANGE_ESIL_BSR_ADDR ",^,wreg,=,", args->f);
+	}
+	e ("$z,z,=,");
+}
+
+INST_HANDLER (RESET) {
+	op->type = R_ANAL_OP_TYPE_JMP;
+	op->jump = 0;
+	e ("0x0,pc,=,");
+	e ("0x1f,stkptr,=,");
+}
+
+INST_HANDLER (ADDFSR) {
+	op->type = R_ANAL_OP_TYPE_ADD;
+	if (args->n == 0) {
+		ef ("0x%x,fsr0l,+=,", args->k);
+		e ("$c7,?{,0x01,fsr0h,+=,},");
+	} else {
+		ef ("0x%x,fsr1l,+=,", args->k);
+		e ("$c7,?{,0x01,fsr1h,+=,},");
+	}
+}
+
+INST_HANDLER (CLRWDT) {
+	e ("1,to,=,");
+	e ("1,pd,=,");
+}
+
+INST_HANDLER (SLEEP) {
+	e ("1,to,=,");
+	e ("0,pd,=,");
+}
+
+INST_HANDLER (SUBWFB) {
+	op->type = R_ANAL_OP_TYPE_SUB;
+	e ("c,!=,");
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_FWF_OP_C (-), args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_WWF_OP_C (-), args->f);
+		e ("wreg,0x00,-,wreg,=,c,!=,dc,!=,");
+	}
+}
+
+INST_HANDLER (ADDWFC) {
+	op->type = R_ANAL_OP_TYPE_ADD;
+	if (args->d) {
+		ef (PIC_MIDRANGE_ESIL_FWF_OP_C (+), args->f);
+	} else {
+		ef (PIC_MIDRANGE_ESIL_WWF_OP_C (+), args->f);
+	}
+}
+
+INST_HANDLER (MOVIW_1) {
+	if (args->n == 0) {
+		if (!(args->m & 2)) {
+			ef ("1,fsr0l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7%s,fsr0h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+		e ("indf0,wreg,=,");
+		e ("$z,z,=,");
+		if (args->m & 2) {
+			ef ("1,fsr0l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7%s,fsr0h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+	} else {
+		if (!(args->m & 2)) {
+			ef ("1,fsr1l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7%s,fsr1h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+		e ("indf1,wreg,=,");
+		e ("$z,z,=,");
+		if (args->m & 2) {
+			ef ("1,fsr1l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7%s,fsr1h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+	}
+}
+
+INST_HANDLER (MOVWI_1) {
+	if (args->n == 0) {
+		if (!(args->m & 2)) {
+			ef ("1,fsr0l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7%s,fsr0h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+		e ("wreg,indf0=,");
+		e ("$z,z,=,");
+		if (args->m & 2) {
+			ef ("1,fsr0l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7%s,fsr0h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+	} else {
+		if (!(args->m & 2)) {
+			ef ("1,fsr1l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7,fsr1h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+		e ("wreg,indf1=,");
+		e ("$z,z,=,");
+		if (args->m & 2) {
+			ef ("1,fsr1l,%s=,", (args->m & 1) ? "-" : "+");
+			ef ("$c7%s,fsr1h,%s,", (args->m & 1) ? ",!" : "",
+			    (args->m & 1) ? "-" : "+");
+		}
+	}
+}
+
+INST_HANDLER (MOVIW_2) {
+	if (args->n == 0) {
+		e ("fsr0l,8,fsr0h,<<,+,");
+	} else {
+		e ("fsr1l,8,fsr1h,<<,+,");
+	}
+	ef ("0x%x,+,[1],wreg,=,", args->k);
+}
+
+INST_HANDLER (MOVWI_2) {
+	e ("wreg,");
+	if (args->n == 0) {
+		e ("fsr0l,8,fsr0h,<<,+,");
+	} else {
+		e ("fsr1l,8,fsr1h,<<,+,");
+	}
+	e ("=[1],");
+}
+
+#define PIC_MIDRANGE_OPINFO_LEN 52
+static const PicMidrangeOpAnalInfo pic_midrange_op_anal_info[PIC_MIDRANGE_OPINFO_LEN] = {
+	INST_DECL (NOP, NONE),      INST_DECL (RETURN, NONE),
+	INST_DECL (RETFIE, NONE),   INST_DECL (OPTION, NONE),
+	INST_DECL (SLEEP, NONE),    INST_DECL (CLRWDT, NONE),
+	INST_DECL (TRIS, 2F),       INST_DECL (MOVWF, 7F),
+	INST_DECL (CLR, 1D_7F),     INST_DECL (SUBWF, 1D_7F),
+	INST_DECL (DECF, 1D_7F),    INST_DECL (IORWF, 1D_7F),
+	INST_DECL (ANDWF, 1D_7F),   INST_DECL (XORWF, 1D_7F),
+	INST_DECL (ADDWF, 1D_7F),   INST_DECL (MOVF, 1D_7F),
+	INST_DECL (COMF, 1D_7F),    INST_DECL (INCF, 1D_7F),
+	INST_DECL (DECFSZ, 1D_7F),  INST_DECL (RRF, 1D_7F),
+	INST_DECL (RLF, 1D_7F),     INST_DECL (SWAPF, 1D_7F),
+	INST_DECL (INCFSZ, 1D_7F),  INST_DECL (BCF, 3B_7F),
+	INST_DECL (BSF, 3B_7F),     INST_DECL (BTFSC, 3B_7F),
+	INST_DECL (BTFSS, 3B_7F),   INST_DECL (CALL, 11K),
+	INST_DECL (GOTO, 11K),      INST_DECL (MOVLW, 8K),
+	INST_DECL (RETLW, 8K),      INST_DECL (IORLW, 8K),
+	INST_DECL (ANDLW, 8K),      INST_DECL (XORLW, 8K),
+	INST_DECL (SUBLW, 8K),      INST_DECL (ADDLW, 8K),
+	INST_DECL (RESET, NONE),    INST_DECL (CALLW, NONE),
+	INST_DECL (BRW, NONE),      INST_DECL (MOVIW_1, 1N_2M),
+	INST_DECL (MOVWI_1, 1N_2M), INST_DECL (MOVLB, 4K),
+	INST_DECL (LSLF, 1D_7F),    INST_DECL (LSRF, 1D_7F),
+	INST_DECL (ASRF, 1D_7F),    INST_DECL (SUBWFB, 1D_7F),
+	INST_DECL (ADDWFC, 1D_7F),  INST_DECL (ADDFSR, 1N_6K),
+	INST_DECL (MOVLP, 7F),      INST_DECL (BRA, 9K),
+	INST_DECL (MOVIW_2, 1N_6K), INST_DECL (MOVWI_2, 1N_6K)
+};
+
+static void anal_pic_midrange_extract_args (ut16 instr,
+					    PicMidrangeOpArgs args,
+					    PicMidrangeOpArgsVal *args_val) {
+
+	memset (args_val, 0, sizeof (PicMidrangeOpArgsVal));
+
+	switch (args) {
+	case PIC_MIDRANGE_OP_ARGS_NONE: return;
+	case PIC_MIDRANGE_OP_ARGS_2F:
+		args_val->f = instr & PIC_MIDRANGE_OP_ARGS_2F_MASK_F;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_7F:
+		args_val->f = instr & PIC_MIDRANGE_OP_ARGS_7F_MASK_F;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_1D_7F:
+		args_val->f = instr & PIC_MIDRANGE_OP_ARGS_1D_7F_MASK_F;
+		args_val->d =
+			(instr & PIC_MIDRANGE_OP_ARGS_1D_7F_MASK_D) >> 7;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_1N_6K:
+		args_val->n =
+			(instr & PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_N) >> 6;
+		args_val->k = instr & PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_K;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_3B_7F:
+		args_val->b =
+			(instr & PIC_MIDRANGE_OP_ARGS_3B_7F_MASK_B) >> 7;
+		args_val->f = instr & PIC_MIDRANGE_OP_ARGS_3B_7F_MASK_F;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_4K:
+		args_val->k = instr & PIC_MIDRANGE_OP_ARGS_4K_MASK_K;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_8K:
+		args_val->k = instr & PIC_MIDRANGE_OP_ARGS_8K_MASK_K;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_9K:
+		args_val->k = instr & PIC_MIDRANGE_OP_ARGS_9K_MASK_K;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_11K:
+		args_val->k = instr & PIC_MIDRANGE_OP_ARGS_11K_MASK_K;
+		return;
+	case PIC_MIDRANGE_OP_ARGS_1N_2M:
+		args_val->n =
+			(instr & PIC_MIDRANGE_OP_ARGS_1N_2M_MASK_N) >> 2;
+		args_val->m = instr & PIC_MIDRANGE_OP_ARGS_1N_2M_MASK_M;
+		return;
+	}
+}
+
+static RIODesc *mem_sram = 0;
+static RIODesc *mem_stack = 0;
+
+static RIODesc *cpu_memory_map (RIOBind *iob, RIODesc *desc, ut32 addr,
+				ut32 size) {
+	char *mstr = r_str_newf ("malloc://%d", size);
+	if (desc && iob->fd_get_name (iob->io, desc->fd)) {
+		iob->fd_remap (iob->io, desc->fd, addr);
+	} else {
+		desc = iob->open_at (iob->io, mstr, R_IO_READ | R_IO_WRITE, 0, addr);
+	}
+	free (mstr);
+	return desc;
+}
+
+static bool pic_midrange_reg_write (RReg *reg, const char *regname,
+				    ut32 num) {
+	if (reg) {
+		RRegItem *item = r_reg_get (reg, regname, R_REG_TYPE_GPR);
+		if (item) {
+			r_reg_set_value (reg, item, num);
+			return true;
+		}
+	}
+	return false;
+}
+
+static void anal_pic_midrange_malloc (RAnal *anal, bool force) {
+	static bool init_done = false;
+
+	if (!init_done || force) {
+		// Allocate memory as needed.
+		// We assume that code is already allocated with firmware
+		// image
+		mem_sram =
+			cpu_memory_map (&anal->iob, mem_sram,
+					PIC_MIDRANGE_ESIL_SRAM_START, 0x1000);
+		mem_stack =
+			cpu_memory_map (&anal->iob, mem_stack,
+					PIC_MIDRANGE_ESIL_CSTACK_TOP, 0x20);
+
+		pic_midrange_reg_write (anal->reg, "_sram",
+					PIC_MIDRANGE_ESIL_SRAM_START);
+		pic_midrange_reg_write (anal->reg, "_stack",
+					PIC_MIDRANGE_ESIL_CSTACK_TOP);
+		pic_midrange_reg_write (anal->reg, "stkptr", 0x1f);
+
+		init_done = true;
+	}
+}
+
+static int anal_pic_midrange_op (RAnal *anal, RAnalOp *op, ut64 addr,
+				 const ut8 *buf, int len) {
+
+	ut16 instr;
+	int i;
+
+	anal_pic_midrange_malloc (anal, false);
+
+	if (!buf || len < 2) {
+		op->type = R_ANAL_OP_TYPE_ILL;
+		return op->size;
+	}
+
+	instr = r_read_le16 (buf);
+
+	// Default op params
+	op->size = 2;
+	op->cycles = 1;
+	op->type = R_ANAL_OP_TYPE_NOP;
+
+	PicMidrangeOpcode opcode = pic_midrange_get_opcode (instr);
+	PicMidrangeOpArgsVal args_val;
+
+	for (i = 0; i < PIC_MIDRANGE_OPINFO_LEN; i++) {
+		if (pic_midrange_op_anal_info[i].opcode == opcode) {
+			anal_pic_midrange_extract_args (
+				instr, pic_midrange_op_anal_info[i].args,
+				&args_val);
+			pic_midrange_op_anal_info[i].handler (anal, op, addr,
+							      &args_val);
+			break;
+		}
+	}
+
+	return op->size;
+}
+
+static void pic18_cond_branch (RAnalOp *op, ut64 addr, const ut8 *buf, char *flag) {
 	op->type = R_ANAL_OP_TYPE_CJMP;
 	op->jump = addr + 2 + 2 * (*(ut16 *)buf & 0xff);
 	op->fail = addr + op->size;
@@ -69,28 +784,28 @@
 
 	switch (b >> 8) { //GOTO_T,N_T,K_T
 	case 0xe0:	//bz
-		cond_branch (op, addr, buf, "z");
+		pic18_cond_branch (op, addr, buf, "z");
 		return op->size;
 	case 0xe1: //bnz
-		cond_branch (op, addr, buf, "z,!");
+		pic18_cond_branch (op, addr, buf, "z,!");
 		return op->size;
 	case 0xe3: //bnc
-		cond_branch (op, addr, buf, "c,!");
+		pic18_cond_branch (op, addr, buf, "c,!");
 		return op->size;
 	case 0xe4: //bov
-		cond_branch (op, addr, buf, "ov");
+		pic18_cond_branch (op, addr, buf, "ov");
 		return op->size;
 	case 0xe5: //bnov
-		cond_branch (op, addr, buf, "ov,!");
+		pic18_cond_branch (op, addr, buf, "ov,!");
 		return op->size;
 	case 0xe6: //bn
-		cond_branch (op, addr, buf, "n");
+		pic18_cond_branch (op, addr, buf, "n");
 		return op->size;
 	case 0xe7: //bnn
-		cond_branch (op, addr, buf, "n,!");
+		pic18_cond_branch (op, addr, buf, "n,!");
 		return op->size;
 	case 0xe2: //bc
-		cond_branch (op, addr, buf, "c");
+		pic18_cond_branch (op, addr, buf, "c");
 		return op->size;
 	case 0xef: //goto
 		if (len < 4)
@@ -282,6 +997,35 @@
 	return op->size;
 }
 
+static int anal_pic_midrange_set_reg_profile (RAnal *esil) {
+	const char *p;
+	p = "=PC	pc\n"
+	    "=SP	stkptr\n"
+	    "gpr	indf0	.8	0	0\n"
+	    "gpr	indf1	.8	1	0\n"
+	    "gpr	pcl		.8	2	0\n"
+	    "gpr	status	.8	3	0\n"
+	    "flg	c		.1	3.0	0\n"
+	    "flg	dc		.1	3.1	0\n"
+	    "flg	z		.1	3.2	0\n"
+	    "flg	pd		.1	3.3	0\n"
+	    "flg	to		.1	3.4	0\n"
+	    "gpr	fsr0l	.8	4	0\n"
+	    "gpr	fsr0h	.8	5	0\n"
+	    "gpr	fsr1l	.8	6	0\n"
+	    "gpr	fsr1h	.8	7	0\n"
+	    "gpr	bsr		.8	8	0\n"
+	    "gpr	wreg	.8	9	0\n"
+	    "gpr	pclath	.8	10	0\n"
+	    "gpr	intcon	.8	11	0\n"
+	    "gpr	pc		.16	12	0\n"
+	    "gpr	stkptr	.8	14	0\n"
+	    "gpr	_sram	.32 15	0\n"
+	    "gpr	_stack	.32 19	0\n";
+
+	return r_reg_set_profile_string (esil->reg, p);
+}
+
 static int anal_pic_pic18_set_reg_profile(RAnal *esil) {
 	const char *p;
 	p =
@@ -406,6 +1150,9 @@
 		// TODO: implement
 		return -1;
 	}
+	if (anal->cpu && strcasecmp (anal->cpu, "midrange") == 0) {
+		return anal_pic_midrange_op (anal, op, addr, buf, len);
+	}
 	if (anal->cpu && strcasecmp (anal->cpu, "pic18") == 0) {
 		return anal_pic_pic18_op (anal, op, addr, buf, len);
 	}
@@ -417,6 +1164,9 @@
 		// TODO: implement
 		return r_reg_set_profile_string (anal->reg, "");
 	}
+	if (anal->cpu && strcasecmp (anal->cpu, "midrange") == 0) {
+		return anal_pic_midrange_set_reg_profile (anal);
+	}
 	if (anal->cpu && strcasecmp (anal->cpu, "pic18") == 0) {
 		return anal_pic_pic18_set_reg_profile (anal);
 	}
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_ppc_cs.c radare2-2.8.0+dfsg/libr/anal/p/anal_ppc_cs.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_ppc_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_ppc_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2013-2017 - pancake */
+/* radare2 - LGPL - Copyright 2013-2018 - pancake */
 
 #include <r_anal.h>
 #include <r_lib.h>
@@ -19,7 +19,6 @@
 	int bits;
 };
 
-#define esilprintf(op, fmt, ...) r_strbuf_appendf (&op->esil, fmt, ##__VA_ARGS__)
 #define INSOPS insn->detail->ppc.op_count
 #define INSOP(n) insn->detail->ppc.operands[n]
 #define IMM(x) (ut64)(insn->detail->ppc.operands[x].imm)
@@ -34,7 +33,6 @@
 	if (mb > 63 || me > 63) {
 		return mask;
 	}
-
 	if (mb < (me + 1)) {
 		for (i = mb; i <= me; i++) {
 			mask = mask | (ut64) (1LL << (63 - i));
@@ -543,6 +541,51 @@
 	return -1;
 }
 
+#define ZERO_FILL(x) memset (&x, 0, sizeof (x))
+
+static int parse_reg_name(RRegItem *reg, csh handle, cs_insn *insn, int reg_num) {
+	if (!reg) {
+		return -1;
+	}
+	switch (INSOP (reg_num).type) {
+	case PPC_OP_REG:
+		reg->name = (char *)cs_reg_name (handle, INSOP (reg_num).reg);
+		break;
+	case PPC_OP_MEM:
+		if (INSOP (reg_num).mem.base != PPC_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (handle, INSOP (reg_num).mem.base);
+		}
+		break;
+	default :
+		break;
+	}
+	return 0;
+}
+
+static void op_fillval(RAnalOp *op, csh handle, cs_insn *insn) {
+	static RRegItem reg;
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_LOAD:
+		if (INSOP(1).type == PPC_OP_MEM) {
+			ZERO_FILL (reg);
+			op->src[0] = r_anal_value_new ();
+			op->src[0]->reg = &reg;
+			parse_reg_name (op->src[0]->reg, handle, insn, 1);
+			op->src[0]->delta = INSOP(1).mem.disp;
+		}
+		break;
+	case R_ANAL_OP_TYPE_STORE:
+		if (INSOP(1).type == PPC_OP_MEM) {
+			ZERO_FILL (reg);
+			op->dst = r_anal_value_new ();
+			op->dst->reg = &reg;
+			parse_reg_name (op->dst->reg, handle, insn, 1);
+			op->dst->delta = INSOP(1).mem.disp;
+		}
+		break;
+	}
+}
+
 static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	static csh handle = 0;
 	static int omode = -1, obits = -1;
@@ -611,6 +654,7 @@
 		case PPC_INS_CMPW:
 		case PPC_INS_CMPWI:
 			op->type = R_ANAL_OP_TYPE_CMP;
+			op->sign = true;
 			if (ARG (2)[0] == '\0') esilprintf (op, "%s,%s,-,0xff,&,cr0,=", ARG (1), ARG (0));
 			else esilprintf (op, "%s,%s,-,0xff,&,%s,=", ARG (2), ARG (1), ARG (0));
 			break;
@@ -633,7 +677,7 @@
 			break;
 		case PPC_INS_CLRLWI:
 			op->type = R_ANAL_OP_TYPE_AND;
-			esilprintf (op, "%s,%s,&,%s,=", ARG (1), (ut64) cmask32 (ARG (2), "0x1F"), ARG (0));
+			esilprintf (op, "%s,%s,&,%s,=", ARG (1), cmask32 (ARG (2), "0x1F"), ARG (0));
 			break;
 		case PPC_INS_RLWINM:
 			op->type = R_ANAL_OP_TYPE_ROL;
@@ -644,15 +688,18 @@
 			esilprintf (op, "0,$");
 			break;
 		case PPC_INS_EXTSB:
+			op->sign = true;
 			op->type = R_ANAL_OP_TYPE_MOV;
 			if (a->bits == 64) esilprintf (op, "%s,0x80,&,?{,0xFFFFFFFFFFFFFF00,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
 			else esilprintf (op, "%s,0x80,&,?{,0xFFFFFF00,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
 			break;
 		case PPC_INS_EXTSH:
+			op->sign = true;
 			if (a->bits == 64) esilprintf (op, "%s,0x8000,&,?{,0xFFFFFFFFFFFF0000,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
 			else esilprintf (op, "%s,0x8000,&,?{,0xFFFF0000,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
 			break;
 		case PPC_INS_EXTSW:
+			op->sign = true;
 			esilprintf (op, "%s,0x80000000,&,?{,0xFFFFFFFF00000000,%s,|,%s,=,}", ARG (1), ARG (1), ARG (0));
 			break;
 		case PPC_INS_SYNC:
@@ -773,6 +820,7 @@
 			esilprintf (op, "%s,%s,>>,%s,=", ARG (2), ARG (1), ARG (0));
 			break;
 		case PPC_INS_MULLI:
+			op->sign = true;
 		case PPC_INS_MULLW:
 		case PPC_INS_MULLD:
 			op->type = R_ANAL_OP_TYPE_MUL;
@@ -788,6 +836,7 @@
 			break;
 		case PPC_INS_ADD:
 		case PPC_INS_ADDI:
+			op->sign = true;
 			op->type = R_ANAL_OP_TYPE_ADD;
 			esilprintf (op, "%s,%s,+,%s,=", ARG (2), ARG (1), ARG (0));
 			break;
@@ -1028,8 +1077,12 @@
 			esilprintf (op, "16,%s,<<,%s,^,%s,=", ARG (2), ARG (1), ARG (0));
 			break;
 		case PPC_INS_DIVD:
-		case PPC_INS_DIVDU:
 		case PPC_INS_DIVW:
+			op->sign = true;
+			op->type = R_ANAL_OP_TYPE_DIV;
+			esilprintf (op, "%s,%s,/,%s,=", ARG (2), ARG (1), ARG (0));
+			break;
+		case PPC_INS_DIVDU:
 		case PPC_INS_DIVWU:
 			op->type = R_ANAL_OP_TYPE_DIV;
 			esilprintf (op, "%s,%s,/,%s,=", ARG (2), ARG (1), ARG (0));
@@ -1042,6 +1095,7 @@
 			esilprintf (op, "pc,lr,=,%s,pc,=", ARG (0));
 			break;
 		case PPC_INS_TRAP:
+			op->sign = true;
 			op->type = R_ANAL_OP_TYPE_TRAP;
 			break;
 		case PPC_INS_AND:
@@ -1136,6 +1190,9 @@
 			esilprintf (op, "%s,%s,<<<,%s,&,%s,=", ARG (2), ARG (1), cmask64 (0, ARG (3)), ARG (0));
 			break;
 		}
+		if (a->fillval) {
+			op_fillval (op, handle, insn);
+		}
 		r_strbuf_fini (&op->esil);
 		cs_free (insn, n);
 		//cs_close (&handle);
@@ -1143,8 +1200,11 @@
 	return op->size;
 }
 
-static int archinfo(RAnal *anal, int q) {
-	return 2; /* :D */
+static int archinfo(RAnal *a, int q) {
+	if (a->cpu && !strncmp (a->cpu, "vle", 3)) {
+		return 2;
+	}
+	return 4;
 }
 
 RAnalPlugin r_anal_plugin_ppc_cs = {
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_riscv.c radare2-2.8.0+dfsg/libr/anal/p/anal_riscv.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_riscv.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_riscv.c	2018-08-07 14:12:36.000000000 +0000
@@ -58,7 +58,14 @@
 	op->addr = addr;
 	op->type = R_ANAL_OP_TYPE_UNK;
 
-	word = (len >= sizeof (ut64))? r_read_ble64 (data, anal->big_endian): r_read_ble16 (data, anal->big_endian);
+	if (len >= sizeof (ut64)) {
+		word = r_read_ble64 (data, anal->big_endian);
+	} else if (len >= sizeof (ut32)) {
+		word = r_read_ble16 (data, anal->big_endian);
+	} else {
+		op->type = R_ANAL_OP_TYPE_ILL;
+		return -1;
+	}
 
 	o = get_opcode (word);
 	if (word == UT64_MAX) {
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_sh.c radare2-2.8.0+dfsg/libr/anal/p/anal_sh.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_sh.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_sh.c	2018-08-07 14:12:36.000000000 +0000
@@ -12,166 +12,161 @@
 #define WORD_SIZE 2
 #define BYTE_SIZE 1
 
-/* missing opcodes :
- - FPU (opcodes 0xF___)
- - opcodes > SH2E
- - cmp*
- - "special" regs : PR, SR, VBR, GBR, MACL, MACH
- - T flag handling
- - 0x0___
- - 0x2___
- - 0x3___ ops : cmp*, div, dmul
- - 0x4___ ops : ld*, st*
- - 0x6___ implement (ext*, pop, swap, ...)
- - 0x8___ implement cmp/eq imm,Rn
- - 0xC___ implement {mova, T flag dest, (disp,GBR) src/dst}
- - 0xF___ FPU: everything
-
- *** complete :
- 0x1___
- 0x5___
- 0x7___
- 0x9___ (XXX verify if @(disp,PC) works)
- 0xA___
- 0xB___
- 0xD___
- 0xE___
+/*
+ * all processor instructions are implemented, but all FPU are missing
+ * DIV1,MAC.W,MAC.L,rte,rts should be checked
+ * also tests are written, but still could be some issues, if I misunderstand instructions.
+ * If you found some bugs, please open an issue
 */
 
+#define BIT_32(x)	x",0x80000000,&"
+#define S16_EXT(x)	x",DUP,0x8000,&,?{,0xFFFFFFFFFFFF0000,|,}"
+#define S32_EXT(x)	x",DUP,0x80000000,&,?{,0xFFFFFFFF00000000,|,}"
+#define IS_T	"sr,0x1,&,"
+#define SET_T	"0x1,sr,|="
+#define CLR_T	"0xFFFFFFFE,sr,&="
 //Macros for different instruction types
 
-#define IS_CLRT(x)			x == 0x0008
-#define IS_NOP(x)			x == 0x0009
-#define IS_RTS(x)			x == 0x000b
-#define IS_SETT(x)			x == 0x0018
-#define IS_DIV0U(x)			x == 0x0019
-#define IS_SLEEP(x)			x == 0x001b
-#define IS_CLRMAC(x)		x == 0x0028
-#define IS_RTE(x)			x == 0x002b
-//#define IS_CLRS(x)
-
-#define IS_STCSR1(x)		(((x) & 0xF0CF) == 0x0002)		//mask stc Rn,{SR,GBR,VBR,SSR}
-#define IS_BSRF(x)			(x & 0xf0ff) == 0x0003
-#define IS_BRAF(x)			(((x) & 0xf0ff) == 0x0023)
-#define IS_MOVB_REG_TO_R0REL(x)		(((x) & 0xF00F) == 0x0004)
-#define IS_MOVW_REG_TO_R0REL(x)		(((x) & 0xF00F) == 0x0005)
-#define IS_MOVL_REG_TO_R0REL(x)		(((x) & 0xF00F) == 0x0006)
-#define IS_MULL(x)			(((x) & 0xF00F) == 0x0007)
-#define IS_MOVB_R0REL_TO_REG(x)		(((x) & 0xF00F) == 0x000C)
-#define IS_MOVW_R0REL_TO_REG(x)		(((x) & 0xF00F) == 0x000D)
-#define IS_MOVL_R0REL_TO_REG(x)		(((x) & 0xF00F) == 0x000E)
-//#define IS_MACL(x)		(((x) & 0xF00F) == 0x000F) //complicated !
-#define IS_MOVT(x)			(((x) & 0xF0FF) == 0x0029)
-#define IS_STSMAC(x)		(((x) & 0xF0EF) == 0x000A)		//mask sts Rn, MAC*
-#define IS_STSPR(x)			(((x) & 0xF0FF) == 0x002A)
-//#define IS_STSFPUL(x)		(((x) & 0xF0FF) == 0x005A)		//FP*: todo maybe someday
-//#define IS_STSFPSCR(x)		(((x) & 0xF0FF) == 0x006A)
-
+#define IS_CLRT(x)	x == 0x0008
+#define IS_NOP(x)	x == 0x0009
+#define IS_RTS(x)	x == 0x000b
+#define IS_SETT(x)	x == 0x0018
+#define IS_DIV0U(x)	x == 0x0019
+#define IS_SLEEP(x)	x == 0x001b
+#define IS_CLRMAC(x)	x == 0x0028
+#define IS_RTE(x)	x == 0x002b
+
+#define IS_STCSR1(x)	(((x) & 0xF0CF) == 0x0002)	//mask stc Rn,{SR,gbr,VBR,SSR}
+#define IS_BSRF(x)	(x & 0xf0ff) == 0x0003
+#define IS_BRAF(x)	(((x) & 0xf0ff) == 0x0023)
+#define IS_MOVB_REG_TO_R0REL(x)	(((x) & 0xF00F) == 0x0004)
+#define IS_MOVW_REG_TO_R0REL(x)	(((x) & 0xF00F) == 0x0005)
+#define IS_MOVL_REG_TO_R0REL(x)	(((x) & 0xF00F) == 0x0006)
+#define IS_MULL(x)	(((x) & 0xF00F) == 0x0007)
+#define IS_MOVB_R0REL_TO_REG(x)	(((x) & 0xF00F) == 0x000C)
+#define IS_MOVW_R0REL_TO_REG(x)	(((x) & 0xF00F) == 0x000D)
+#define IS_MOVL_R0REL_TO_REG(x)	(((x) & 0xF00F) == 0x000E)
+#define IS_MACL(x)	(((x) & 0xF00F) == 0x000F)
+#define IS_MOVT(x)	(((x) & 0xF0FF) == 0x0029)
+#define IS_STSMACH(x)	(((x) & 0xF0FF) == 0x000A)
+#define IS_STSMACL(x)	(((x) & 0xF0FF) == 0x001A)
+#define IS_STSPR(x)	(((x) & 0xF0FF) == 0x002A)
+//#define IS_STSFPUL(x)	(((x) & 0xF0FF) == 0x005A)	//FP*: todo maybe someday
+//#define IS_STSFPSCR(x)	(((x) & 0xF0FF) == 0x006A)
 #define IS_MOVB_REG_TO_REGREF(x)	(((x) & 0xF00F) == 0x2000)
 #define IS_MOVW_REG_TO_REGREF(x)	(((x) & 0xF00F) == 0x2001)
 #define IS_MOVL_REG_TO_REGREF(x)	(((x) & 0xF00F) == 0x2002)
 //#define invalid?(x)	(((x) & 0xF00F) == 0x2003)	//illegal on sh2e
-#define IS_PUSHB(x)			(((x) & 0xF00F) == 0x2004)
-#define IS_PUSHW(x)			(((x) & 0xF00F) == 0x2005)
-#define IS_PUSHL(x)			(((x) & 0xF00F) == 0x2006)
-#define IS_DIV0S(x)		(((x) & 0xF00F) == 0x2007)
-#define IS_TSTRR(x)			(((x) & 0xF00F) == 0x2008)
-#define IS_AND_REGS(x)			(((x) & 0xF00F) == 0x2009)
-#define IS_XOR_REGS(x)			(((x) & 0xF00F) == 0x200A)
-#define IS_OR_REGS(x)			(((x) & 0xF00F) == 0x200B)
-#define IS_CMPSTR(x)			(((x) & 0xF00F) == 0x200C)
-#define IS_XTRCT(x)			(((x) & 0xF00F) == 0x200D)
-#define IS_MULUW(x)			(((x) & 0xF00F) == 0x200E)
-#define IS_MULSW(x)			(((x) & 0xF00F) == 0x200F)
-
-
-#define IS_CMPEQ(x)			(((x) & 0xF00F) == 0x3000)
-//#define invalid?(x)			(((x) & 0xF00F) == 0x3001)
-#define IS_CMPHS(x)			(((x) & 0xF00F) == 0x3002)
-#define IS_CMPGE(x)			(((x) & 0xF00F) == 0x3003)
-#define IS_CMPHI(x)			(((x) & 0xF00F) == 0x3006)
-#define IS_CMPGT(x)			(((x) & 0xF00F) == 0x3007)
-
-#define IS_DIV1(x)			(((x) & 0xF00F) == 0x3004)
-#define IS_DMULU(x)			(((x) & 0xF00F) == 0x3005)
-#define IS_DMULS(x)			(((x) & 0xF00F) == 0x300D)
-
-#define IS_SUB(x)			(((x) & 0xF00F) == 0x3008)
-//#define invalid?(x)			(((x) & 0xF00F) == 0x3009)
-#define IS_SUBC(x)			(((x) & 0xF00F) == 0x300A)
-#define IS_SUBV(x)			(((x) & 0xF00F) == 0x300B)
-#define IS_ADD(x)			(((x) & 0xF00F) == 0x300C)
-#define IS_ADDC(x)			(((x) & 0xF00F) == 0x300E)
-#define IS_ADDV(x)			(((x) & 0xF00F) == 0x300F)
-
-//#define IS_MACW(x)			(((x) & 0xF00F) == 0x400F)	//complex
-#define IS_JSR(x)			(((x) & 0xf0ff) == 0x400b)
-#define IS_JMP(x)			(((x) & 0xf0ff) == 0x402b)
-#define IS_CMPPL(x)			(((x) & 0xf0ff) == 0x4015)
-#define IS_CMPPZ(x)			(((x) & 0xf0ff) == 0x4011)
-
-#define IS_LDCSR1(x)		(((x) & 0xF0CF) == 0x400E)		//mask ldc Rn,{SR,GBR,VBR,SSR}
-#define IS_LDCLSR1(x)		(((x) & 0xF0CF) == 0x4007)		//mask ldc.l @Rn+,{SR,GBR,VBR,SSR}
-#define IS_LDSMAC(x)		(((x) & 0xF0EF) == 0x400A)		//mask lds Rn, MAC*
-#define IS_LDSLMAC(x)		(((x) & 0xF0EF) == 0x4006)		//mask lds.l @Rn+, MAC*
-#define IS_LDSPR(x)			(((x) & 0xF0FF) == 0x402A)
-#define IS_LDSLPR(x)		(((x) & 0xF0FF) == 0x4026)
-//#define IS_LDSFPUL(x)		(((x) & 0xF0FF) == 0x405A)		//FP*: todo maybe someday
-//#define IS_LDSFPSCR(x)		(((x) & 0xF0FF) == 0x406A)
-//#define IS_LDSLFPUL(x)		(((x) & 0xF0FF) == 0x4066)
-//#define IS_LDSLFPSCR(x)		(((x) & 0xF0FF) == 0x4056)
-#define IS_ROT(x)			(((x) & 0xF0DE) == 0x4004)		//mask rot{,c}{l,r}
+#define IS_PUSHB(x)	(((x) & 0xF00F) == 0x2004)
+#define IS_PUSHW(x)	(((x) & 0xF00F) == 0x2005)
+#define IS_PUSHL(x)	(((x) & 0xF00F) == 0x2006)
+#define IS_DIV0S(x)	(((x) & 0xF00F) == 0x2007)
+#define IS_TSTRR(x)	(((x) & 0xF00F) == 0x2008)
+#define IS_AND_REGS(x)	(((x) & 0xF00F) == 0x2009)
+#define IS_XOR_REGS(x)	(((x) & 0xF00F) == 0x200A)
+#define IS_OR_REGS(x)	(((x) & 0xF00F) == 0x200B)
+#define IS_CMPSTR(x)	(((x) & 0xF00F) == 0x200C)
+#define IS_XTRCT(x)	(((x) & 0xF00F) == 0x200D)
+#define IS_MULUW(x)	(((x) & 0xF00F) == 0x200E)
+#define IS_MULSW(x)	(((x) & 0xF00F) == 0x200F)
+#define IS_CMPEQ(x)	(((x) & 0xF00F) == 0x3000)
+//#define invalid?(x)	(((x) & 0xF00F) == 0x3001)
+#define IS_CMPHS(x)	(((x) & 0xF00F) == 0x3002)
+#define IS_CMPGE(x)	(((x) & 0xF00F) == 0x3003)
+#define IS_CMPHI(x)	(((x) & 0xF00F) == 0x3006)
+#define IS_CMPGT(x)	(((x) & 0xF00F) == 0x3007)
+#define IS_DIV1(x)	(((x) & 0xF00F) == 0x3004)
+#define IS_DMULU(x)	(((x) & 0xF00F) == 0x3005)
+#define IS_DMULS(x)	(((x) & 0xF00F) == 0x300D)
+#define IS_SUB(x)	(((x) & 0xF00F) == 0x3008)
+//#define invalid?(x)	(((x) & 0xF00F) == 0x3009)
+#define IS_SUBC(x)	(((x) & 0xF00F) == 0x300A)
+#define IS_SUBV(x)	(((x) & 0xF00F) == 0x300B)
+#define IS_ADD(x)	(((x) & 0xF00F) == 0x300C)
+#define IS_ADDC(x)	(((x) & 0xF00F) == 0x300E)
+#define IS_ADDV(x)	(((x) & 0xF00F) == 0x300F)
+#define IS_MACW(x)	(((x) & 0xF00F) == 0x400F)
+#define IS_JSR(x)	(((x) & 0xf0ff) == 0x400b)
+#define IS_JMP(x)	(((x) & 0xf0ff) == 0x402b)
+#define IS_CMPPL(x)	(((x) & 0xf0ff) == 0x4015)
+#define IS_CMPPZ(x)	(((x) & 0xf0ff) == 0x4011)
+#define IS_LDCSR(x) 	(((x) & 0xF0FF) == 0x400E)
+#define IS_LDCGBR(x)	 	(((x) & 0xF0FF) == 0x401E)
+#define IS_LDCVBR(x)	(((x) & 0xF0FF) == 0x402E)
+#define IS_LDCLSR(x)	(((x) & 0xF0FF) == 0x4007)
+#define IS_LDCLSRGBR(x)	(((x) & 0xF0FF) == 0x4017)
+#define IS_LDCLSRVBR(x)	(((x) & 0xF0FF) == 0x4027)
+#define IS_LDSMACH(x)	(((x) & 0xF0FF) == 0x400A)
+#define IS_LDSMACL(x)	(((x) & 0xF0FF) == 0x401A)
+#define IS_LDSLMACH(x)	(((x) & 0xF0FF) == 0x4006)
+#define IS_LDSLMACL(x)	(((x) & 0xF0FF) == 0x4016)
+#define IS_LDSPR(x)	(((x) & 0xF0FF) == 0x402A)
+#define IS_LDSLPR(x)	(((x) & 0xF0FF) == 0x4026)
+//#define IS_LDSFPUL(x)	(((x) & 0xF0FF) == 0x405A)	//FP*: todo maybe someday
+//#define IS_LDSFPSCR(x)	(((x) & 0xF0FF) == 0x406A)
+//#define IS_LDSLFPUL(x)	(((x) & 0xF0FF) == 0x4066)
+//#define IS_LDSLFPSCR(x)	(((x) & 0xF0FF) == 0x4056)
+#define IS_ROTCR(x)	(((x) & 0xF0FF) == 0x4025)
+#define IS_ROTCL(x)	(((x) & 0xF0FF) == 0x4024)
+#define IS_ROTL(x)	(((x) & 0xF0FF) == 0x4004)
+#define IS_ROTR(x)	(((x) & 0xF0FF) == 0x4005)
 //not on sh2e : shad, shld
 
-//#define IS_SHIFT1(x)		(((x) & 0xF0DE) == 0x4000)	//unused (treated as switch-case)
+//#define IS_SHIFT1(x)	(((x) & 0xF0DE) == 0x4000)	//unused (treated as switch-case)
 //other shl{l,r}{,2,8,16} in switch case also.
 
-#define IS_STSLMAC(x)		(((x) & 0xF0EF) == 0x4002)		//mask sts.l mac*, @-Rn
-#define IS_STCLSR1(x)		(((x) & 0xF0CF) == 0x4003)	//mask stc.l {SR,GBR,VBR,SSR},@-Rn
+#define IS_STSLMACL(x)	(((x) & 0xF0FF) == 0x4012)
+#define IS_STSLMACH(x)	(((x) & 0xF0FF) == 0x4002)
+#define IS_STCLSR(x)	(((x) & 0xF0FF) == 0x4003)
+#define IS_STCLGBR(x)	(((x) & 0xF0FF) == 0x4013)
+#define IS_STCLVBR(x)	(((x) & 0xF0FF) == 0x4023)
 //todo: other stc.l not on sh2e
-#define IS_STSLPR(x)		(((x) & 0xF0FF) == 0x4022)
-//#define IS_STSLFPUL(x)		(((x) & 0xF0FF) == 0x4052)
-//#define IS_STSLFPSCR(x)		(((x) & 0xF0FF) == 0x4062)
-#define IS_TASB(x)			(((x) & 0xF0FF) == 0x401B)
-#define IS_DT(x)			(((x) & 0xF0FF) == 0x4010)
+#define IS_STSLPR(x)	(((x) & 0xF0FF) == 0x4022)
+//#define IS_STSLFPUL(x)	(((x) & 0xF0FF) == 0x4052)
+//#define IS_STSLFPSCR(x)	(((x) & 0xF0FF) == 0x4062)
+#define IS_TASB(x)	(((x) & 0xF0FF) == 0x401B)
+#define IS_DT(x)	(((x) & 0xF0FF) == 0x4010)
 
 
 #define IS_MOVB_REGREF_TO_REG(x)	(((x) & 0xF00F) == 0x6000)
 #define IS_MOVW_REGREF_TO_REG(x)	(((x) & 0xF00F) == 0x6001)
 #define IS_MOVL_REGREF_TO_REG(x)	(((x) & 0xF00F) == 0x6002)
-#define IS_MOV_REGS(x)			(((x) & 0xf00f) == 0x6003)
-#define IS_MOVB_POP(x)			(((x) & 0xF00F) == 0x6004)
-#define IS_MOVW_POP(x)			(((x) & 0xF00F) == 0x6005)
-#define IS_MOVL_POP(x)			(((x) & 0xF00F) == 0x6006)
-#define IS_NOT(x)			(((x) & 0xF00F) == 0x6007)
-#define IS_SWAP(x)			(((x) & 0xF00E) == 0x6008)	//match swap.{b,w}
-#define IS_NEG(x)			(((x) & 0xF00E) == 0x600A)	//match neg{,c}
-#define IS_EXT(x)		(((x) & 0xF00C) == 0x600C)	//match ext{s,u}.{b,w}
+#define IS_MOV_REGS(x)	(((x) & 0xf00f) == 0x6003)
+#define IS_MOVB_POP(x)	(((x) & 0xF00F) == 0x6004)
+#define IS_MOVW_POP(x)	(((x) & 0xF00F) == 0x6005)
+#define IS_MOVL_POP(x)	(((x) & 0xF00F) == 0x6006)
+#define IS_NOT(x)	(((x) & 0xF00F) == 0x6007)
+#define IS_SWAPB(x)	(((x) & 0xF00F) == 0x6008)
+#define IS_SWAPW(x)	(((x) & 0xF00F) == 0x6009)
+#define IS_NEG(x)	(((x) & 0xF00F) == 0x600B)
+#define IS_NEGC(x)	(((x) & 0xF00F) == 0x600A)
+#define IS_EXT(x)	(((x) & 0xF00C) == 0x600C)	//match ext{s,u}.{b,w}
 
 
 #define IS_MOVB_R0_REGDISP(x)	(((x) & 0xFF00) == 0x8000)
 #define IS_MOVW_R0_REGDISP(x)	(((x) & 0xFF00) == 0x8100)
-//#define illegal?(x)		(((x) & 0xF900) == 0x8000)	//match 8{2,3,6,7}00
-#define IS_MOVB_REGDISP_R0(x)		(((x) & 0xFF00) == 0x8400)
-#define IS_MOVW_REGDISP_R0(x)		(((x) & 0xFF00) == 0x8500)
-#define IS_CMPIMM(x)		(((x) & 0xFF00) == 0x8800)
-//#define illegal?(x)		(((x) & 0xFB00) == 0x8A00)	//match 8{A,E}00
-#define IS_BT(x)			(((x) & 0xff00) == 0x8900)
-#define IS_BF(x)			(((x) & 0xff00) == 0x8B00)
-#define IS_BTS(x)			(((x) & 0xff00) == 0x8D00)
-#define IS_BFS(x)			(((x) & 0xff00) == 0x8F00)
-#define IS_BT_OR_BF(x)			IS_BT(x)||IS_BTS(x)||IS_BF(x)||IS_BFS(x)
+//#define illegal?(x)	(((x) & 0xF900) == 0x8000)	//match 8{2,3,6,7}00
+#define IS_MOVB_REGDISP_R0(x)	(((x) & 0xFF00) == 0x8400)
+#define IS_MOVW_REGDISP_R0(x)	(((x) & 0xFF00) == 0x8500)
+#define IS_CMPIMM(x)	(((x) & 0xFF00) == 0x8800)
+//#define illegal?(x)	(((x) & 0xFB00) == 0x8A00)	//match 8{A,E}00
+#define IS_BT(x)	(((x) & 0xff00) == 0x8900)
+#define IS_BF(x)	(((x) & 0xff00) == 0x8B00)
+#define IS_BTS(x)	(((x) & 0xff00) == 0x8D00)
+#define IS_BFS(x)	(((x) & 0xff00) == 0x8F00)
+#define IS_BT_OR_BF(x)	IS_BT(x)||IS_BTS(x)||IS_BF(x)||IS_BFS(x)
 
 #define IS_MOVB_R0_GBRREF(x)	(((x) & 0xFF00) == 0xC000)
 #define IS_MOVW_R0_GBRREF(x)	(((x) & 0xFF00) == 0xC100)
 #define IS_MOVL_R0_GBRREF(x)	(((x) & 0xFF00) == 0xC200)
-#define IS_TRAP(x)				(((x) & 0xFF00) == 0xC300)
+#define IS_TRAP(x)	(((x) & 0xFF00) == 0xC300)
 #define IS_MOVB_GBRREF_R0(x)	(((x) & 0xFF00) == 0xC400)
 #define IS_MOVW_GBRREF_R0(x)	(((x) & 0xFF00) == 0xC500)
 #define IS_MOVL_GBRREF_R0(x)	(((x) & 0xFF00) == 0xC600)
-#define IS_MOVA_PCREL_R0(x)		(((x) & 0xFF00) == 0xC700)
+#define IS_MOVA_PCREL_R0(x)	(((x) & 0xFF00) == 0xC700)
 #define IS_BINLOGIC_IMM_R0(x)	(((x) & 0xFC00) == 0xC800)	//match C{8,9,A,B}00
-#define IS_BINLOGIC_IMM_GBR(x)	(((x) & 0xFC00) == 0xCC00)	//match C{C,D,E,F}00 : *.b #imm, @(R0,GBR)
+#define IS_BINLOGIC_IMM_GBR(x)	(((x) & 0xFC00) == 0xCC00)	//match C{C,D,E,F}00 : *.b #imm, @(R0,gbr)
+
 
 /* Compute PC-relative displacement for branch instructions */
 #define GET_BRA_OFFSET(x)	((x) & 0x0fff)
@@ -184,7 +179,7 @@
 /* index of PC reg in regs[] array*/
 #define PC_IDX 16
 
-/* for {bra,bsr} only: (sign-extend 12bit offset)<<1  + PC +4 */
+/* for {bra,bsr} only: (sign-extend 12bit offset)<<1 + PC +4 */
 static ut64 disarm_12bit_offset (RAnalOp *op, unsigned int insoff) {
 	ut64 off = insoff;
 	/* sign extend if higher bit is 1 (0x0800) */
@@ -192,35 +187,34 @@
 	{
 		off |= ~0xFFF;
 	}
-	return (op->addr) + (off<<1) + 4;
+	return (op->addr) + (off << 1) + 4;
 }
 
-
 /* for bt,bf sign-extended offsets : return PC+4+ (exts.b offset)<<1 */
 static ut64 disarm_8bit_offset (ut64 pc, ut32 offs) {
-        /* pc (really, op->addr) is 64 bits, so we need to sign-extend
-         * to 64 bits instead of the 32 the actual CPU does */
-        ut64 off = offs;
+		/* pc (really, op->addr) is 64 bits, so we need to sign-extend
+		 * to 64 bits instead of the 32 the actual CPU does */
+		ut64 off = offs;
 	/* sign extend if higher bit is 1 (0x08) */
 	if ((off & 0x80) == 0x80)
 	{
 		off |= ~0xFF;
 	}
-	return (off<<1) + pc + 4;
+	return (off << 1) + pc + 4;
 }
 
 static char *regs[]={"r0","r1","r2","r3","r4","r5","r6","r7","r8","r9","r10","r11","r12","r13","r14","r15","pc"};
 
 static RAnalValue *anal_fill_ai_rg(RAnal *anal, int idx) {
-        RAnalValue *ret = r_anal_value_new ();
-        ret->reg = r_reg_get (anal->reg, regs[idx], R_REG_TYPE_GPR);
-        return ret;
+	RAnalValue *ret = r_anal_value_new ();
+	ret->reg = r_reg_get (anal->reg, regs[idx], R_REG_TYPE_GPR);
+	return ret;
 }
 
 static RAnalValue *anal_fill_im(RAnal *anal, st32 v) {
-        RAnalValue *ret = r_anal_value_new ();
-        ret->imm = v;
-        return ret;
+	RAnalValue *ret = r_anal_value_new ();
+	ret->imm = v;
+	return ret;
 }
 
 /* Implements @(disp,Rn) , size=1 for .b, 2 for .w, 4 for .l */
@@ -232,14 +226,14 @@
 }
 
 /* Rn */
-static RAnalValue *anal_fill_reg_ref(RAnal *anal, int reg, st64 size){
+static RAnalValue *anal_fill_reg_ref(RAnal *anal, int reg, st64 size) {
 	RAnalValue *ret = anal_fill_ai_rg (anal, reg);
 	ret->memref = size;
 	return ret;
 }
 
 /* @(R0,Rx) references for all sizes */
-static RAnalValue *anal_fill_r0_reg_ref(RAnal *anal, int reg, st64 size){
+static RAnalValue *anal_fill_r0_reg_ref(RAnal *anal, int reg, st64 size) {
 	RAnalValue *ret = anal_fill_ai_rg (anal, 0);
 	ret->regdelta = r_reg_get (anal->reg, regs[reg], R_REG_TYPE_GPR);
 	ret->memref = size;
@@ -247,490 +241,797 @@
 }
 
 // @(disp,PC) for size=2(.w), size=4(.l). disp is 0-extended
-static RAnalValue *anal_pcrel_disp_mov(RAnal* anal, RAnalOp* op, ut8 disp, int size){
+static RAnalValue *anal_pcrel_disp_mov(RAnal* anal, RAnalOp* op, ut8 disp, int size) {
 	RAnalValue *ret = r_anal_value_new ();
 	if (size==2) {
-		ret->base = op->addr+4;
-		ret->delta = disp<<1;
+		ret->base = op->addr + 4;
+		ret->delta = disp << 1;
 	} else {
-		ret->base = (op->addr+4) & ~0x03;
-		ret->delta = disp<<2;
+		ret->base = (op->addr + 4) & ~0x03;
+		ret->delta = disp << 2;
 	}
 
 	return ret;
 }
 
 //= PC+4+R<reg>
-static RAnalValue *anal_regrel_jump(RAnal* anal, RAnalOp* op, ut8 reg){
+static RAnalValue *anal_regrel_jump(RAnal* anal, RAnalOp* op, ut8 reg) {
 	RAnalValue *ret = r_anal_value_new ();
 	ret->reg = r_reg_get (anal->reg, regs[reg], R_REG_TYPE_GPR);
-	ret->base = op->addr+4;
+	ret->base = op->addr + 4;
 	return ret;
 }
 
 /* 16 decoder routines, based on 1st nibble value */
-static int first_nibble_is_0(RAnal* anal, RAnalOp* op, ut16 code){
-	if(IS_BSRF(code)) {
+static int first_nibble_is_0(RAnal* anal, RAnalOp* op, ut16 code) { //STOP
+	if (IS_BSRF (code)) {
 		/* Call 'far' subroutine Rn+PC+4 */
 		op->type = R_ANAL_OP_TYPE_UCALL;
 		op->delay = 1;
-		op->dst = anal_regrel_jump (anal, op, GET_TARGET_REG(code));
-	} else if (IS_BRAF(code)) {
-		/* Unconditional branch to Rn+PC+4, no delay slot */
+		op->dst = anal_regrel_jump (anal, op, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "1,$ds,=,pc,2,+,pr,=,r%d,2,+,pc,+=", GET_TARGET_REG (code));
+	} else if (IS_BRAF (code)) {
 		op->type = R_ANAL_OP_TYPE_UJMP;
-		op->dst = anal_regrel_jump (anal, op, GET_TARGET_REG(code));
+		op->dst = anal_regrel_jump (anal, op, GET_TARGET_REG (code));
 		op->eob = true;
-	} else if( IS_RTS(code) ) {
-		/* Ret from subroutine. Returns to pr */
-		//TODO Convert into jump pr?
+		op->delay = 1;
+		r_strbuf_setf (&op->esil, "1,$ds,=,r%d,2,+,pc,+=", GET_TARGET_REG (code));
+	} else if (IS_RTS (code)) {
 		op->type = R_ANAL_OP_TYPE_RET;
 		op->delay = 1;
 		op->eob = true;
-	} else if (IS_RTE(code)) {
-		//TODO Convert into jmp spc? Indicate ssr->sr as well?
+		r_strbuf_setf (&op->esil, "pr,pc,=");
+	} else if (IS_RTE (code)) {
 		op->type = R_ANAL_OP_TYPE_RET;
 		op->delay = 1;
 		op->eob = true;
-	} else if (IS_MOVB_REG_TO_R0REL(code)) {	//0000nnnnmmmm0100 mov.b <REG_M>,@(R0,<REG_N>)
+		//r_strbuf_setf (&op->esil, "1,$ds,=,r15,[4],4,+,pc,=,r15,4,+,[4],0xFFF0FFF,&,sr,=,8,r15,+=");
+		//not sure if should be added 4 to pc
+		r_strbuf_setf (&op->esil, "1,$ds,=,r15,[4],pc,=,r15,4,+,[4],0xFFF0FFF,&,sr,=,8,r15,+=");
+	} else if (IS_MOVB_REG_TO_R0REL (code)) {	//0000nnnnmmmm0100 mov.b <REG_M>,@(R0,<REG_N>)
+		op->type = R_ANAL_OP_TYPE_STORE;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_r0_reg_ref (anal, GET_TARGET_REG (code), BYTE_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,0xFF,&,r0,r%d,+,=[1]", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVW_REG_TO_R0REL (code)) {
 		op->type = R_ANAL_OP_TYPE_STORE;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_r0_reg_ref (anal, GET_TARGET_REG(code), BYTE_SIZE);
-	} else if (IS_MOVW_REG_TO_R0REL(code)) {
-		op->type = R_ANAL_OP_TYPE_STORE;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_r0_reg_ref (anal, GET_TARGET_REG(code), WORD_SIZE);
-	} else if (IS_MOVL_REG_TO_R0REL(code)) {
-		op->type = R_ANAL_OP_TYPE_STORE;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_r0_reg_ref(anal, GET_TARGET_REG(code), LONG_SIZE);
-	} else if (IS_MOVB_R0REL_TO_REG(code)) {
-		op->type = R_ANAL_OP_TYPE_LOAD;
-		op->src[0] = anal_fill_r0_reg_ref (anal, GET_SOURCE_REG(code), BYTE_SIZE);
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_MOVW_R0REL_TO_REG(code)) {
-		op->type = R_ANAL_OP_TYPE_LOAD;
-		op->src[0] = anal_fill_r0_reg_ref (anal, GET_SOURCE_REG(code), WORD_SIZE);
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_MOVL_R0REL_TO_REG(code)) {
-		op->type = R_ANAL_OP_TYPE_LOAD;
-		op->src[0] = anal_fill_r0_reg_ref (anal, GET_SOURCE_REG(code), LONG_SIZE);
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_NOP(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_r0_reg_ref (anal, GET_TARGET_REG (code), WORD_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,0xFFFF,&,r0,r%d,+,=[2]", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVL_REG_TO_R0REL (code)) {
+		op->type = R_ANAL_OP_TYPE_STORE;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_r0_reg_ref(anal, GET_TARGET_REG (code), LONG_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,r0,r%d,+,=[4]", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVB_R0REL_TO_REG (code)) {
+		op->type = R_ANAL_OP_TYPE_LOAD;
+		op->src[0] = anal_fill_r0_reg_ref (anal, GET_SOURCE_REG (code), BYTE_SIZE);
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r0,r%d,+,[1],r%d,=,0x000000FF,r%d,&=,r%d,0x80,&,?{,0xFFFFFF00,r%d,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVW_R0REL_TO_REG (code)) {
+		op->type = R_ANAL_OP_TYPE_LOAD;
+		op->src[0] = anal_fill_r0_reg_ref (anal, GET_SOURCE_REG (code), WORD_SIZE);
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r0,r%d,+,[2],r%d,=,0x0000FFFF,r%d,&=,r%d,0x8000,&,?{,0xFFFF0000,r%d,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVL_R0REL_TO_REG (code)) {
+		op->type = R_ANAL_OP_TYPE_LOAD;
+		op->src[0] = anal_fill_r0_reg_ref (anal, GET_SOURCE_REG (code), LONG_SIZE);
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r0,r%d,+,[4],r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_NOP (code)) {
 		op->type = R_ANAL_OP_TYPE_NOP;
-	} else if (IS_CLRT(code)) {
-		op->type = R_ANAL_OP_TYPE_UNK;	//TODO : implement flag
-	} else if (IS_SETT(code)) {
+		r_strbuf_setf (&op->esil, " ");
+	} else if (IS_CLRT (code)) {
+		op->type = R_ANAL_OP_TYPE_UNK;
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=");
+	} else if (IS_SETT (code)) {
+		op->type = R_ANAL_OP_TYPE_UNK;
+		r_strbuf_setf (&op->esil, "0x1,sr,|=");
+	} else if (IS_CLRMAC (code)) {
 		op->type = R_ANAL_OP_TYPE_UNK;
-	} else if (IS_CLRMAC(code)) {
-		op->type = R_ANAL_OP_TYPE_UNK;	//TODO : type_mov ?
-	} else if (IS_DIV0U(code)) {
+		r_strbuf_setf (&op->esil, "0,mach,=,0,macl,=");
+	} else if (IS_DIV0U (code)) {
 		op->type = R_ANAL_OP_TYPE_DIV;
-	} else if (IS_MOVT(code)) {
+		r_strbuf_setf (&op->esil, "0xFFFFFCFE,sr,&=");
+	} else if (IS_MOVT (code)) {
 		op->type = R_ANAL_OP_TYPE_MOV;
-		//op->src[0] = 		//TODO: figure out how to get T flag from sr reg
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_MULL(code)) {
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "0x1,sr,&,r%d,=", GET_TARGET_REG (code));
+	} else if (IS_MULL (code)) { //multiply long
 		op->type = R_ANAL_OP_TYPE_MUL;
-		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		//op->dst = //TODO: figure out how to set MACL + MACH
-	} else if (IS_SLEEP(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,r%d,*,macl,=", GET_TARGET_REG (code), GET_SOURCE_REG (code));
+	} else if (IS_SLEEP (code)) {
 		op->type = R_ANAL_OP_TYPE_UNK;
-	} else if (IS_STSMAC(code)) {	//0000nnnn0000101_ sts MAC*,<REG_N>
+		r_strbuf_setf (&op->esil, "sleep_called,TRAP", GET_TARGET_REG (code));
+	} else if (IS_STSMACH (code)) {	//0000nnnn0000101_ sts MAC*,<REG_N>
 		op->type = R_ANAL_OP_TYPE_MOV;
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_STCSR1(code)) {	//0000nnnn00010010 stc {sr,gbr,vbr,ssr},<REG_N>
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "mach,r%d,=", GET_TARGET_REG (code));
+	} else if (IS_STSMACL (code)) {	//0000nnnn0000101_ sts MAC*,<REG_N>
 		op->type = R_ANAL_OP_TYPE_MOV;
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		//todo: plug in src
-	} else if (IS_STSPR(code)) {	//0000nnnn00101010 sts PR,<REG_N>
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "macl,r%d,=", GET_TARGET_REG (code));
+	} else if (IS_STSLMACL (code)) {
+		op->type = R_ANAL_OP_TYPE_MOV;
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "macl,r%d,=", GET_TARGET_REG (code));
+	} else if (IS_STCSR1 (code)) {	//0000nnnn00010010 stc {sr,gbr,vbr,ssr},<REG_N>
 		op->type = R_ANAL_OP_TYPE_MOV;
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
 		//todo: plug in src
-	}
+		switch(GET_SOURCE_REG (code)) {
+		case 0:
+			r_strbuf_setf (&op->esil, "sr,r%d,=", GET_TARGET_REG (code));
+			break;
+		case 1:
+			r_strbuf_setf (&op->esil, "gbr,r%d,=", GET_TARGET_REG (code));
+			break;
+		case 2:
+			r_strbuf_setf (&op->esil, "vbr,r%d,=", GET_TARGET_REG (code));
+			break;
+		default:
+			r_strbuf_setf (&op->esil, "");
+			break;
 
-	//TODO Check missing insns, especially STC might be interesting
+		}
+	} else if (IS_STSPR (code)) {	//0000nnnn00101010 sts PR,<REG_N>
+		op->type = R_ANAL_OP_TYPE_MOV;
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "pr,r%d,=", GET_TARGET_REG (code));
+	} else if (IS_MACL (code)) {
+		r_strbuf_setf (&op->esil,
+			"mach,0x80000000,&,!," //mach_old sign (0)
+			S32_EXT("r%d,[4]")"," //@Rn sign extended
+			S32_EXT("r%d,[4]")"," //@Rm sign extended
+			"4,r%d,+=," //Rn+=4
+			"4,r%d,+=," //Rm+=4
+			"*,DUP," //(1)
+			"macl,32,mach,<<,|," //macl | (mach << 32)
+			"+," //MAC+@Rm*@Rn
+			"32,2,PICK,0xffffffff00000000,&,>>,mach,=," //MACH > mach
+			"0xffffffff,&,macl,=,"
+			"0x2,sr,&,!,?{,BREAK,}," //if S==0 BREAK
+			"0x00007fff,mach,>,"
+			"0x80000000,mach,&,!,&,"
+			"?{,0x00007fff,mach,=,0xffffffff,macl,=,}," //if (mach>0x00007fff&&mach>0) mac=0x00007fffffffffff
+			"0xffff8000,mach,<,"
+			"0x80000000,mach,&,!,!,&,"
+			"?{,0xffff8000,mach,=,0x0,macl,=,}," //if (mach>0xffff8000&&mach<0) mac=0xffff800000000000
+			, GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code));
+		op->type = R_ANAL_OP_TYPE_MUL;
+	}
 	return op->size;
 }
 
 //nibble=1; 0001nnnnmmmmi4*4 mov.l <REG_M>,@(<disp>,<REG_N>)
-static int movl_reg_rdisp(RAnal* anal, RAnalOp* op, ut16 code){
+static int movl_reg_rdisp(RAnal* anal, RAnalOp* op, ut16 code) {
 	op->type = R_ANAL_OP_TYPE_STORE;
-	op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-	op->dst = anal_fill_reg_disp_mem (anal, GET_TARGET_REG(code), code&0x0F, LONG_SIZE);
+	op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+	op->dst = anal_fill_reg_disp_mem (anal, GET_TARGET_REG (code), code & 0x0F, LONG_SIZE);
+	r_strbuf_setf (&op->esil, "r%d,r%d,0x%x,+,=[4]", GET_SOURCE_REG (code), GET_TARGET_REG (code), (code & 0xF) << 2);
 	return op->size;
 }
 
-static int first_nibble_is_2(RAnal* anal, RAnalOp* op, ut16 code){
-	if (IS_MOVB_REG_TO_REGREF(code)) {	// 0010nnnnmmmm0000 mov.b <REG_M>,@<REG_N>
+static int first_nibble_is_2(RAnal* anal, RAnalOp* op, ut16 code) {
+	if (IS_MOVB_REG_TO_REGREF (code)) {	// 0010nnnnmmmm0000 mov.b <REG_M>,@<REG_N>
 		op->type = R_ANAL_OP_TYPE_STORE;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_reg_ref (anal, GET_TARGET_REG(code), BYTE_SIZE);
-	} else if (IS_MOVW_REG_TO_REGREF(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_reg_ref (anal, GET_TARGET_REG (code), BYTE_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,r%d,=[1]", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVW_REG_TO_REGREF (code)) {
 		op->type = R_ANAL_OP_TYPE_STORE;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_reg_ref (anal, GET_TARGET_REG(code), WORD_SIZE);
-	} else if (IS_MOVL_REG_TO_REGREF(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_reg_ref (anal, GET_TARGET_REG (code), WORD_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,r%d,=[2]", GET_SOURCE_REG (code) & 0xFF, GET_TARGET_REG (code));
+	} else if (IS_MOVL_REG_TO_REGREF (code)) {
 		op->type = R_ANAL_OP_TYPE_STORE;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_reg_ref (anal, GET_TARGET_REG(code), LONG_SIZE);
-	} else if (IS_AND_REGS(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_reg_ref (anal, GET_TARGET_REG (code), LONG_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,r%d,=[4]", GET_SOURCE_REG (code) & 0xFF, GET_TARGET_REG (code));
+	} else if (IS_AND_REGS (code)) {
 		op->type = R_ANAL_OP_TYPE_AND;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_XOR_REGS(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,r%d,&=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_XOR_REGS (code)) {
 		op->type = R_ANAL_OP_TYPE_XOR;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_OR_REGS(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,r%d,^=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_OR_REGS (code)) {
 		op->type = R_ANAL_OP_TYPE_OR;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_PUSHB(code) || IS_PUSHW(code) || IS_PUSHL(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,r%d,|=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_PUSHB (code)) {
 		op->type = R_ANAL_OP_TYPE_PUSH;
-		//TODO Handle 'pushes' (mov Rm,@-Rn)
-	} else if (IS_TSTRR(code)) {
+		r_strbuf_setf (&op->esil, "1,r%d,-=,r%d,r%d,=[1]", GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_PUSHW (code)) {
+		op->type = R_ANAL_OP_TYPE_PUSH;
+		r_strbuf_setf (&op->esil, "2,r%d,-=,r%d,r%d,=[2]", GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_PUSHL (code)) {
+		op->type = R_ANAL_OP_TYPE_PUSH;
+		r_strbuf_setf (&op->esil, "4,r%d,-=,r%d,r%d,=[4]", GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_TSTRR (code)) {
 		op->type = R_ANAL_OP_TYPE_ACMP;
-		//TODO: handle tst reg,reg
-	} else if (IS_CMPSTR(code)) {	//0010nnnnmmmm1100 cmp/str <REG_M>,<REG_N>
+		r_strbuf_setf (&op->esil, "1,sr,|=,r%d,r%d,&,?{,0xFFFFFFFE,sr,&=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_CMPSTR (code)) {	//0010nnnnmmmm1100 cmp/str <REG_M>,<REG_N>
 		op->type = R_ANAL_OP_TYPE_ACMP;	//maybe not?
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->src[1] = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		//todo: handle cmp/str byte-per-byte cmp?
-	} else if (IS_XTRCT(code)) {	//0010nnnnmmmm1101 xtrct <REG_M>,<REG_N>
-		op->type = R_ANAL_OP_TYPE_MOV;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->src[1] = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		//todo: add details ?
-	} else if (IS_DIV0S(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,24,r%d,r%d,^,>>,0xFF,&,!,?{,1,sr,|=,},16,r%d,r%d,^,>>,0xFF,&,!,?{,1,sr,|=,},8,r%d,r%d,^,>>,0xFF,&,!,?{,1,sr,|=,},r%d,r%d,^,0xFF,&,!,?{,1,sr,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_XTRCT (code)) {	//0010nnnnmmmm1101 xtrct <REG_M>,<REG_N>
+		op->type = R_ANAL_OP_TYPE_MOV;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "16,r%d,0xFFFF,&,<<,16,r%d,0xFFFF0000,&,>>,|,r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_DIV0S (code)) {
 		op->type = R_ANAL_OP_TYPE_DIV;
-		//todo: add details?
-	} else if (IS_MULUW(code) || IS_MULSW(code)) {	//0010nnnnmmmm111_ mul{s,u}.w <REG_M>,<REG_N>
+		r_strbuf_setf (&op->esil, "0xFFFFFCFE,sr,&=,r%d,0x80000000,&,?{,0x200,sr,|=,},r%d,0x80000000,&,?{,0x100,sr,|=,},sr,1,sr,<<,^,0x200,&,?{,1,sr,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MULUW (code)) {
 		op->type = R_ANAL_OP_TYPE_MUL;
-		op->src[0] = anal_fill_ai_rg(anal,GET_SOURCE_REG(code));
-		op->src[1] = anal_fill_ai_rg(anal,GET_TARGET_REG(code));
-		//todo: dest=MACL
+		op->src[0] = anal_fill_ai_rg(anal, GET_SOURCE_REG (code));
+		op->src[1] = anal_fill_ai_rg(anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,0xFFFF,&,r%d,0xFFFF,&,*,macl,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MULSW (code)) {	//0010nnnnmmmm111_ mul{s,u}.w <REG_M>,<REG_N>
+		op->type = R_ANAL_OP_TYPE_MUL;
+		op->src[0] = anal_fill_ai_rg(anal, GET_SOURCE_REG (code));
+		op->src[1] = anal_fill_ai_rg(anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, S16_EXT("r%d") "," S16_EXT("r%d") ",*,macl,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
 	}
 
 	return op->size;
 }
 
 
-static int first_nibble_is_3(RAnal* anal, RAnalOp* op, ut16 code){
+static int first_nibble_is_3(RAnal* anal, RAnalOp* op, ut16 code) {
 	//TODO Handle carry/overflow , CMP/xx?
-	if( IS_ADD(code) || IS_ADDC(code) || IS_ADDV(code) ) {
+	if (IS_ADD (code)) {
+		op->type = R_ANAL_OP_TYPE_ADD;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,r%d,+=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_ADDC (code)) {
+		op->type = R_ANAL_OP_TYPE_ADD;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "sr,0x1,&,0xFFFFFFFE,sr,&=,r%d,+=,$c31,sr,|=,r%d,r%d,+=,$c31,sr,|=", GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_ADDV (code)) {
 		op->type = R_ANAL_OP_TYPE_ADD;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if ( IS_SUB(code) || IS_SUBC(code) || IS_SUBV(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,r%d,+=,$o,?{,0x1,sr,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_SUB (code)) {
+		op->type = R_ANAL_OP_TYPE_SUB;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,r%d,-=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_SUBC (code)) {
+		op->type = R_ANAL_OP_TYPE_SUB;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "sr,1,&," CLR_T ",r%d,-=,$b31,sr,|=,r%d,r%d,-=,$b31,sr,|=", GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_SUBV (code)) {
 		op->type = R_ANAL_OP_TYPE_SUB;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_CMPEQ(code) || IS_CMPGE(code) || IS_CMPGT(code) ||
-				IS_CMPHI(code) || IS_CMPHS(code)) {
-		//TODO : finish implementing
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, CLR_T ",r%d,r%d,-=,$o,sr,|=", GET_SOURCE_REG(code), GET_TARGET_REG (code));
+	} else if (IS_CMPEQ (code)) {
 		op->type = R_ANAL_OP_TYPE_CMP;
-		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-	} else if (IS_DIV1(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,r%d,==,sr,|=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_CMPGE (code)) {
+		op->type = R_ANAL_OP_TYPE_CMP;
+		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,r%d,>=,?{,0x1,sr,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_CMPGT (code)) {
+		op->type = R_ANAL_OP_TYPE_CMP;
+		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,r%d,>,?{,0x1,sr,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_CMPHI (code)) {
+		op->type = R_ANAL_OP_TYPE_CMP;
+		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,0x100000000,+,r%d,0x100000000,+,>,?{,0x1,sr,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_CMPHS (code)) {
+		op->type = R_ANAL_OP_TYPE_CMP;
+		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,0x100000000,+,r%d,0x100000000,+,>=,?{,0x1,sr,|=,}", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_DIV1 (code)) {
 		op->type = R_ANAL_OP_TYPE_DIV;
-		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		//todo: dest ?
-	} else if (IS_DMULU(code) || IS_DMULS(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		r_strbuf_setf (&op->esil,
+						 "1,sr,>>,sr,^,0x80,&," //old_Q^M
+						 "0xFFFFFF7F,sr,&=,"
+						 "1,r%d,DUP,0x80000000,&,?{,0x80,sr,|=,},<<,sr,0x1,&,|,r%d,=," //shift Q<-Rn<-T
+						 "r%d,NUM,"//Rn_old (before substract)
+						 "r%d,r%d,"
+						 "0,RPICK,?{,+=,r%d,<,}," //tmp0
+						 "0,RPICK,!,?{,-=,r%d,>,}," //tmp0
+						 "sr,0x80,&,!,!,^," //Q^tmp0
+						 "sr,0x100,&,?{,!,},"//if (M) !(Q^tmp0)
+						 "0xFFFFFF7F,sr,&=," //Q==0
+						 "?{,0x80,sr,|=,}," //Q=!(Q^tmp0)or(Q^tmp0)
+						 CLR_T","
+						 "1,sr,>>,sr,^,0x80,&,!,sr,|="// sr=!Q^M
+						 , GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG(code), GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_DMULU (code)) {
+		op->type = R_ANAL_OP_TYPE_MUL;
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "32,r%d,r%d,*,DUP,0xFFFFFFFF,&,macl,=,>>,mach,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_DMULS (code)) {
 		op->type = R_ANAL_OP_TYPE_MUL;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->src[1] = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		//todo: dest=MACL,MACH
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->src[1] = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "32,r%d,r%d,0x80000000,&,?{,0xFFFFFFFF00000000,+,},r%d,r%d,0x80000000,&,?{,0xFFFFFFFF00000000,+,},*,DUP,0xFFFFFFFF,&,macl,=,>>,mach,=", GET_SOURCE_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
 	}
 	return op->size;
 }
 
-static int first_nibble_is_4(RAnal* anal, RAnalOp* op, ut16 code){
-	switch (code & 0xF0FF) {
-		//todo: implement
+
+
+static int first_nibble_is_4(RAnal* anal, RAnalOp* op, ut16 code) {
+	switch(code & 0xF0FF) { //TODO: change to common } else if construction
 	case 0x4020:	//shal
 		op->type = R_ANAL_OP_TYPE_SAL;
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,0x80000000,&,?{,0x1,sr,|=,},1,r%d,<<=", GET_TARGET_REG (code), GET_TARGET_REG (code));
 		break;
 	case 0x4021:	//shar
 		op->type = R_ANAL_OP_TYPE_SAR;
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,0x1,&,?{,0x1,sr,|=,},0,r%d,0x80000000,&,?{,0x80000000,+,},1,r%d,>>=,r%d,|=", GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
 		break;
 	case 0x4000:	//shll
+		op->type = R_ANAL_OP_TYPE_SHL;
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,0x80000000,&,?{,0x1,sr,|=,},1,r%d,<<=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+		break;
 	case 0x4008:	//shll2
+		op->type = R_ANAL_OP_TYPE_SHL;
+		r_strbuf_setf (&op->esil, "2,r%d,<<=", GET_TARGET_REG (code));
+		break;
 	case 0x4018:	//shll8
+		op->type = R_ANAL_OP_TYPE_SHL;
+		r_strbuf_setf (&op->esil, "8,r%d,<<=", GET_TARGET_REG (code));
+		break;
 	case 0x4028:	//shll16
 		op->type = R_ANAL_OP_TYPE_SHL;
+		r_strbuf_setf (&op->esil, "16,r%d,<<=", GET_TARGET_REG (code));
 		break;
 	case 0x4001:	//shlr
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,0x1,&,?{,0x1,sr,|=,},1,r%d,>>=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_SHR;
+		break;
 	case 0x4009:	//shlr2
+		r_strbuf_setf (&op->esil, "2,r%d,>>=", GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_SHR;
+		break;
 	case 0x4019:	//shlr8
+		r_strbuf_setf (&op->esil, "8,r%d,>>=", GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_SHR;
+		break;
 	case 0x4029:	//shlr16
+		r_strbuf_setf (&op->esil, "16,r%d,>>=", GET_TARGET_REG (code));
 		op->type = R_ANAL_OP_TYPE_SHR;
 		break;
 	default:
 		break;
 	}
 
-	if (IS_JSR(code)) {
+	if (IS_JSR (code)) {
 		op->type = R_ANAL_OP_TYPE_UCALL; //call to reg
 		op->delay = 1;
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if ( IS_JMP(code) ) {
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "1,$ds,=,pc,2,+,pr,=,r%d,pc,=", GET_TARGET_REG (code));
+	} else if (IS_JMP (code)) {
 		op->type = R_ANAL_OP_TYPE_UJMP; //jmp to reg
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
 		op->delay = 1;
 		op->eob = true;
-	} else if (IS_CMPPL(code) || IS_CMPPZ(code)) {
+		r_strbuf_setf (&op->esil, "1,$ds,=,r%d,pc,=", GET_TARGET_REG (code));
+	} else if (IS_CMPPL (code)) {
+		op->type = R_ANAL_OP_TYPE_CMP;
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,0,r%d,>,?{,0x1,sr,|=,}", GET_TARGET_REG (code));
+	} else if (IS_CMPPZ (code)) {
 		op->type = R_ANAL_OP_TYPE_CMP;
-		//todo: implement
-	} else if (IS_LDCLSR1(code) || IS_LDSLMAC(code) || IS_LDSLPR(code)) {
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,0,r%d,>=,?{,0x1,sr,|=,}", GET_TARGET_REG (code));
+	} else if (IS_LDCLSR (code)) {
+		op->type = R_ANAL_OP_TYPE_POP;
+		r_strbuf_setf (&op->esil, "r%d,[4],0x0FFF0FFF,&,sr,=,4,r%d,+=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_LDCLSRGBR (code)) {
+		op->type = R_ANAL_OP_TYPE_POP;
+		r_strbuf_setf (&op->esil, "r%d,[4],gbr,=,4,r%d,+=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_LDCLSRVBR (code)) {
 		op->type = R_ANAL_OP_TYPE_POP;
-		//todo: implement
-	} else if (IS_LDCSR1(code) || IS_LDSMAC(code) || IS_LDSPR(code)) {
+		r_strbuf_setf (&op->esil, "r%d,[4],vbr,=,4,r%d,+=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+		//todo ssr?
+	} else if (IS_LDSLMACH (code)) {
+		op->type = R_ANAL_OP_TYPE_POP;
+		r_strbuf_setf (&op->esil, "r%d,[4],mach,=,4,r%d,+=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_LDSLMACL (code)) {
+		op->type = R_ANAL_OP_TYPE_POP;
+		r_strbuf_setf (&op->esil, "r%d,[4],macl,=,4,r%d,+=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_LDSLPR (code)) {
+		op->type = R_ANAL_OP_TYPE_POP;
+		r_strbuf_setf (&op->esil, "r%d,[4],pr,=,4,r%d,+=", GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_LDCSR (code)) {
+		r_strbuf_setf (&op->esil, "r%d,0x0FFF0FFF,&,sr,=", GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_MOV;
+	} else if (IS_LDCGBR (code)) {
+		r_strbuf_setf (&op->esil, "r%d,gbr,=", GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_MOV;
+	} else if (IS_LDCVBR (code)) {
+		r_strbuf_setf (&op->esil, "r%d,vbr,=", GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_MOV;
+	} else if (IS_LDSMACH (code)) {
+		r_strbuf_setf (&op->esil, "r%d,mach,=", GET_TARGET_REG (code));
 		op->type = R_ANAL_OP_TYPE_MOV;
-		//todo: implement
-	} else if (IS_ROT(code)) {
-		op->type = (code&1)? R_ANAL_OP_TYPE_ROR:R_ANAL_OP_TYPE_ROL;
-		//todo: implement rot* vs rotc*
-	} else if (IS_STCLSR1(code) || IS_STSLMAC(code) || IS_STSLPR(code)) {
+	} else if (IS_LDSMACL (code)) {
+		r_strbuf_setf (&op->esil, "r%d,macl,=", GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_MOV;
+	} else if (IS_LDSPR (code)) {
+		r_strbuf_setf (&op->esil, "r%d,pr,=", GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_MOV;
+	} else if (IS_ROTR (code)) {
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,0x1,&,sr,|=,0x1,r%d,>>>,r%d,=", GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = (code & 1)? R_ANAL_OP_TYPE_ROR:R_ANAL_OP_TYPE_ROL;
+	} else if (IS_ROTL (code)) {
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,0x1,r%d,<<<,r%d,=,r%d,0x1,&,sr,|=", GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = (code & 1)? R_ANAL_OP_TYPE_ROR:R_ANAL_OP_TYPE_ROL;
+	} else if (IS_ROTCR (code)) {
+		r_strbuf_setf (&op->esil, "0,sr,0x1,&,?{,0x80000000,},0xFFFFFFFE,sr,&=,r%d,1,&,sr,|=,1,r%d,>>=,r%d,|=", GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = (code & 1)? R_ANAL_OP_TYPE_ROR:R_ANAL_OP_TYPE_ROL;
+	} else if (IS_ROTCL (code)) {
+		r_strbuf_setf (&op->esil, "sr,0x1,&,0xFFFFFFFE,sr,&=,r%d,0x80000000,&,?{,1,sr,|=,},1,r%d,<<=,r%d,|=", GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = (code & 1)? R_ANAL_OP_TYPE_ROR:R_ANAL_OP_TYPE_ROL;
+	} else if (IS_STCLSR (code)) {
+		r_strbuf_setf (&op->esil, "4,r%d,-=,sr,r%d,=[4]", GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_PUSH;
+	} else if (IS_STCLGBR (code)) {
+		r_strbuf_setf (&op->esil, "4,r%d,-=,gbr,r%d,=[4]", GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_PUSH;
+	} else if (IS_STCLVBR (code)) {
+		r_strbuf_setf (&op->esil, "4,r%d,-=,vbr,r%d,=[4]", GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_PUSH;
+	} else if (IS_STSLMACL (code)) {
+		r_strbuf_setf (&op->esil, "4,r%d,-=,macl,r%d,=[4]", GET_TARGET_REG (code), GET_TARGET_REG (code));
 		op->type = R_ANAL_OP_TYPE_PUSH;
-		//todo: implement st*.l *,@-Rn
-	} else if (IS_TASB(code)) {
+	} else if (IS_STSLMACH (code)) {
+		r_strbuf_setf (&op->esil, "4,r%d,-=,mach,r%d,=[4]", GET_TARGET_REG (code), GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_PUSH;
+	} else if (IS_STSLPR (code)) {
+		op->type = R_ANAL_OP_TYPE_PUSH;
+		r_strbuf_setf (&op->esil, "4,r%d,-=,pr,r%d,=[4]", GET_TARGET_REG (code), GET_TARGET_REG (code));
+	} else if (IS_TASB (code)) {
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r%d,[1],!,?{,0x80,r%d,=[1],1,sr,|=,}", GET_TARGET_REG (code), GET_TARGET_REG (code));
 		op->type = R_ANAL_OP_TYPE_UNK;
-		//todo: implement
-	} else if (IS_DT(code)) {
+	} else if (IS_DT (code)) {
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,1,r%d,-=,$z,sr,|=", GET_TARGET_REG (code), GET_TARGET_REG (code));
 		op->type = R_ANAL_OP_TYPE_UNK;
-		//todo: implement
+	} else if (IS_MACW(code)){
+		r_strbuf_setf (&op->esil,
+			S16_EXT("r%d,[2]")"," //@Rn sign extended
+			S16_EXT("r%d,[2]")"," //@Rm sign extended
+			"2,r%d,+=," //Rn+=2
+			"2,r%d,+=," //Rm+=2
+			"*,"
+			"0x2,sr,&,!,?{," //if S==0
+				"macl,32,mach,<<,|," //macl | (mach << 32)
+				"+," //MAC+@Rm*@Rn
+				"32,2,PICK,0xffffffff00000000,&,>>,mach,=," //MACH > mach
+				"0xffffffff,&,macl,=,"
+			"},"
+			"0x2,sr,&,?{," //if S==1
+				"macl,+=," //macl+(@Rm+@Rm)
+				"$o,?{," //if overflow
+					"macl,NUM,DUP,"
+					"0x80000000,&,?{,0x7fffffff,macl,=,},"
+					"0x80000000,&,!,?{,0x80000000,macl,=,},"
+				"},"
+			"}"
+
+						 , GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code));
+		op->type = R_ANAL_OP_TYPE_MUL;
 	}
 	return op->size;
 }
 
-//nibble=5;  0101nnnnmmmmi4*4 mov.l @(<disp>,<REG_M>),<REG_N>
-static int movl_rdisp_reg(RAnal* anal, RAnalOp* op, ut16 code){
+//nibble=5; 0101nnnnmmmmi4*4 mov.l @(<disp>,<REG_M>),<REG_N>
+static int movl_rdisp_reg(RAnal* anal, RAnalOp* op, ut16 code) {
 	op->type = R_ANAL_OP_TYPE_LOAD;
-	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	op->src[0] = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG(code), code&0x0F, LONG_SIZE);
+	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+	op->src[0] = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG (code), code & 0x0F, LONG_SIZE);
+	r_strbuf_setf (&op->esil, "r%d,0x%x,+,[4],r%d,=", GET_SOURCE_REG (code), (code&0xF) * 4, GET_TARGET_REG (code));
 	return op->size;
 }
 
 
-static int first_nibble_is_6(RAnal* anal, RAnalOp* op, ut16 code){
-	if (IS_MOV_REGS(code)) {
+static int first_nibble_is_6(RAnal* anal, RAnalOp* op, ut16 code) {
+	if (IS_MOV_REGS (code)) {
 		op->type = R_ANAL_OP_TYPE_MOV;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_MOVB_REGREF_TO_REG(code)) {
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVB_REGREF_TO_REG (code)) {
 		op->type = R_ANAL_OP_TYPE_LOAD;
-		op->src[0] = anal_fill_reg_ref (anal, GET_SOURCE_REG(code), BYTE_SIZE);
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_MOVW_REGREF_TO_REG(code)) {
+		op->src[0] = anal_fill_reg_ref (anal, GET_SOURCE_REG (code), BYTE_SIZE);
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "0x000000FF,r%d,&=,r%d,[1],DUP,0x80,&,?{,0xFFFFFF00,|=,},r%d,=", GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVW_REGREF_TO_REG (code)) {
 		op->type = R_ANAL_OP_TYPE_LOAD;
-		op->src[0] = anal_fill_reg_ref (anal, GET_SOURCE_REG(code), WORD_SIZE);
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_MOVL_REGREF_TO_REG(code)) {
+		op->src[0] = anal_fill_reg_ref (anal, GET_SOURCE_REG (code), WORD_SIZE);
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "0x0000FFFF,r%d,&=,r%d,[2],DUP,0x8000,&,?{,0xFFFF0000,|=,},r%d,=", GET_TARGET_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_MOVL_REGREF_TO_REG (code)) {
 		op->type = R_ANAL_OP_TYPE_LOAD;
-		op->src[0] = anal_fill_reg_ref (anal, GET_SOURCE_REG(code), LONG_SIZE);
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_EXT(code)) {
+		op->src[0] = anal_fill_reg_ref (anal, GET_SOURCE_REG (code), LONG_SIZE);
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,[4],r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+	} else if (IS_EXT (code)) {
 		//ext{s,u}.{b,w} instructs. todo : more detail ?
 		op->type = R_ANAL_OP_TYPE_MOV;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_MOVB_POP(code) || IS_MOVW_POP(code) || IS_MOVL_POP(code)) {
-		/* 0110nnnnmmmm0100 mov.b @<REG_M>+,<REG_N>*/
-		/* 0110nnnnmmmm0101 mov.w @<REG_M>+,<REG_N>*/
-		/* 0110nnnnmmmm0110 mov.l @<REG_M>+,<REG_N>*/
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		switch(code & 0xF) {
+		case 0xC: //EXTU.B
+			r_strbuf_setf (&op->esil, "r%d,0xFF,&,r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+			break;
+		case 0xD: //EXTU.W
+			r_strbuf_setf (&op->esil, "r%d,0xFFFF,&,r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+			break;
+		case 0xE: //EXTS.B
+			r_strbuf_setf (&op->esil, "r%d,0xFF,&,DUP,0x80,&,?{,0xFFFFFF00,|,},r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+			break;
+		case 0xF: //EXTS.W
+			r_strbuf_setf (&op->esil, "r%d,0xFFFF,&,DUP,0x8000,&,?{,0xFFFF0000,|,},r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+			break;
+		default:
+			r_strbuf_setf (&op->esil, "TODO,NOT IMPLEMENTED");
+			break;
+		}
+	} else if (IS_MOVB_POP (code)) {
+		op->type = R_ANAL_OP_TYPE_POP;
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,[1],DUP,0x80,&,?{,0xFFFFFF00,|,},r%d,=,1,r%d,+=", GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code));
+	} else if (IS_MOVW_POP (code)) {
 		op->type = R_ANAL_OP_TYPE_POP;
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-		//todo : op->src for pop = ?
-	} else if (IS_NEG(code)) {
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,[2],DUP,0x8000,&,?{,0xFFFF0000,|,},r%d,=,2,r%d,+=", GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code));
+	} else if (IS_MOVL_POP (code)) {
+		op->type = R_ANAL_OP_TYPE_POP;
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+		r_strbuf_setf (&op->esil, "r%d,[4],r%d,=,4,r%d,+=", GET_SOURCE_REG (code), GET_TARGET_REG (code), GET_SOURCE_REG (code));
+	} else if (IS_NEG (code)) {
 		//todo: neg and negc details
 		op->type = R_ANAL_OP_TYPE_UNK;
-		/* 0110nnnnmmmm1010 negc*/
-		/* 0110nnnnmmmm1010 neg */
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_NOT(code)) {
+		r_strbuf_setf (&op->esil, "r%d,0,-,r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+	} else if (IS_NEGC (code)) {
+		op->type = R_ANAL_OP_TYPE_UNK;
+		r_strbuf_setf (&op->esil, "1,sr,&,0xFFFFFFFE,sr,&=,r%d,+,0,-,$b31,sr,|=,r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+	} else if (IS_NOT (code)) {
 		//todo : details?
+		r_strbuf_setf (&op->esil, "0xFFFFFFFF,r%d,^,r%d,=", GET_SOURCE_REG (code), GET_TARGET_REG (code));
 		op->type = R_ANAL_OP_TYPE_NOT;
-		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG(code));
-		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	} else if (IS_SWAP(code)) {
-		/* 0110nnnnmmmm1000 swap.b <REG_M>,<REG_N>*/
-		/* 0110nnnnmmmm1001 swap.w <REG_M>,<REG_N>*/
+		op->src[0] = anal_fill_ai_rg (anal, GET_SOURCE_REG (code));
+		op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+	} else if (IS_SWAPB (code)) {
+		r_strbuf_setf (&op->esil, "r%d,0xFFFF0000,&,8,r%d,0xFF,&,<<,|,8,r%d,0xFF00,&,>>,|,r%d,=", GET_SOURCE_REG (code), GET_SOURCE_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
 		op->type = R_ANAL_OP_TYPE_MOV;
 		//todo : details
+	} else if (IS_SWAPW (code)) {
+		r_strbuf_setf (&op->esil, "16,r%d,0xFFFF,&,<<,16,r%d,0xFFFF0000,&,>>,|,r%d,=", GET_SOURCE_REG (code), GET_SOURCE_REG (code), GET_TARGET_REG (code));
+		op->type = R_ANAL_OP_TYPE_MOV;
 	}
-
 	return op->size;
 }
 
 
 //nibble=7; 0111nnnni8*1.... add #<imm>,<REG_N>
-static int add_imm(RAnal* anal, RAnalOp* op, ut16 code){
+static int add_imm(RAnal* anal, RAnalOp* op, ut16 code) {
 	op->type = R_ANAL_OP_TYPE_ADD;
-	op->src[0] = anal_fill_im (anal, (st8)(code&0xFF)); //Casting to (st8) forces sign-extension.
-	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
+	op->src[0] = anal_fill_im (anal, (st8)(code & 0xFF)); //Casting to (st8) forces sign-extension.
+	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+	r_strbuf_setf (&op->esil, "0x%x,DUP,0x80,&,?{,0xFFFFFF00,|,},r%d,+=", code & 0xFF, GET_TARGET_REG (code));
 	return op->size;
 }
 
-static int first_nibble_is_8(RAnal* anal, RAnalOp* op, ut16 code){
-	if (IS_BT_OR_BF(code)) {
+static int first_nibble_is_8(RAnal* anal, RAnalOp* op, ut16 code) {
+	if (IS_BT_OR_BF (code)) {
 		op->type = R_ANAL_OP_TYPE_CJMP; //Jump if true or jump if false insns
-		op->jump = disarm_8bit_offset (op->addr, GET_BTF_OFFSET(code));
+		op->jump = disarm_8bit_offset (op->addr, GET_BTF_OFFSET (code));
 		op->fail = op->addr + 2 ;
-		op->eob  = true;
-		if (IS_BTS(code) || IS_BFS(code))
+		op->eob = true;
+		if (IS_BT (code)) {
+			r_strbuf_setf (&op->esil, "sr,1,&,?{,0x%x,pc,=,}", op->jump);
+		} else if (IS_BTS (code)) {
+			r_strbuf_setf (&op->esil, "1,$ds,=,sr,1,&,?{,0x%x,pc,=,}", op->jump);
+			op->delay = 1; //Only /S versions have a delay slot
+		} else if (IS_BFS (code)) {
+			r_strbuf_setf (&op->esil, "1,$ds,=,sr,1,&,!,?{,0x%x,pc,=,}",op->jump);
 			op->delay = 1; //Only /S versions have a delay slot
-	} else if (IS_MOVB_REGDISP_R0(code)) {
+		} else if (IS_BF (code)) {
+			r_strbuf_setf (&op->esil, "sr,1,&,!,?{,0x%x,pc,=,}", op->jump);
+		}
+	} else if (IS_MOVB_REGDISP_R0 (code)) {
 		// 10000100mmmmi4*1 mov.b @(<disp>,<REG_M>),R0
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		op->dst = anal_fill_ai_rg (anal, 0);
-		op->src[0] = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG(code), code&0x0F, BYTE_SIZE);
-	} else if (IS_MOVW_REGDISP_R0(code)) {
+		op->src[0] = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG (code), code & 0x0F, BYTE_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,0x%x,+,[1],DUP,0x80,&,?{,0xFFFFFF00,|,},r0,=", GET_SOURCE_REG (code), code & 0xF);
+	} else if (IS_MOVW_REGDISP_R0 (code)) {
 		// 10000101mmmmi4*2 mov.w @(<disp>,<REG_M>),R0
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		op->dst = anal_fill_ai_rg (anal, 0);
-		op->src[0] = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG(code), code&0x0F, WORD_SIZE);
-	} else if (IS_CMPIMM(code)) {
+		op->src[0] = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG (code), code & 0x0F, WORD_SIZE);
+		r_strbuf_setf (&op->esil, "r%d,0x%x,+,[2],DUP,0x8000,&,?{,0xFFFF0000,|,},r0,=", GET_SOURCE_REG (code), (code & 0xF) * 2);
+	} else if (IS_CMPIMM (code)) {
 		op->type = R_ANAL_OP_TYPE_CMP;
-		//todo : finish implementing
-	} else if (IS_MOVB_R0_REGDISP(code)) {
+		r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,0x%x,DUP,0x80,&,?{,0xFFFFFF00,|,},r0,==,sr,|=", code & 0xFF);
+	} else if (IS_MOVB_R0_REGDISP (code)) {
 		/* 10000000mmmmi4*1 mov.b R0,@(<disp>,<REG_M>)*/
 		op->type = R_ANAL_OP_TYPE_STORE;
 		op->src[0] = anal_fill_ai_rg (anal, 0);
-		op->dst = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG(code), code&0x0F, BYTE_SIZE);
-	} else if (IS_MOVW_R0_REGDISP(code)) {
+		op->dst = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG (code), code & 0x0F, BYTE_SIZE);
+		r_strbuf_setf (&op->esil, "r0,0xFF,&,0x%x,r%d,+,=[1]", code & 0xF, GET_SOURCE_REG (code));
+	} else if (IS_MOVW_R0_REGDISP (code)) {
 		// 10000001mmmmi4*2 mov.w R0,@(<disp>,<REG_M>))
 		op->type = R_ANAL_OP_TYPE_STORE;
 		op->src[0] = anal_fill_ai_rg (anal, 0);
-		op->dst = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG(code), code&0x0F, WORD_SIZE);
+		op->dst = anal_fill_reg_disp_mem (anal, GET_SOURCE_REG (code), code & 0x0F, WORD_SIZE);
+		r_strbuf_setf (&op->esil, "r0,0xFFFF,&,0x%x,r%d,+,=[2]", (code & 0xF) * 2, GET_SOURCE_REG (code));
 	}
 	return op->size;
 }
 
 //nibble=9; 1001nnnni8p2.... mov.w @(<disp>,PC),<REG_N>
-static int movw_pcdisp_reg(RAnal* anal, RAnalOp* op, ut16 code){
+static int movw_pcdisp_reg(RAnal* anal, RAnalOp* op, ut16 code) {
 	op->type = R_ANAL_OP_TYPE_LOAD;
-	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
-	//op->src[0] = anal_fill_reg_disp_mem(anal,PC_IDX,code&0xFF,WORD_SIZE);	//XXX trash in 2 commits
-	op->src[0] = anal_pcrel_disp_mov (anal, op, code&0xFF, WORD_SIZE);
+	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+	op->src[0] = r_anal_value_new ();
+	op->src[0]->base = (code & 0xFF) * 2+op->addr + 4;
+	op->src[0]->memref=1;
+	r_strbuf_setf (&op->esil, "0x%x,[2],r%d,=,r%d,0x8000,&,?{,0xFFFF0000,r%d,|=,}", op->src[0]->base, GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
 	return op->size;
 }
 
-//nibble=A;  1010i12......... bra <bdisp12>
-static int bra(RAnal* anal, RAnalOp* op, ut16 code){
+//nibble=A; 1010i12......... bra <bdisp12>
+static int bra(RAnal* anal, RAnalOp* op, ut16 code) {
 	/* Unconditional branch, relative to PC */
 	op->type = R_ANAL_OP_TYPE_JMP;
 	op->delay = 1;
-	op->jump = disarm_12bit_offset (op, GET_BRA_OFFSET(code));
-	op->eob  = true;
+	op->jump = disarm_12bit_offset (op, GET_BRA_OFFSET (code));
+	op->eob = true;
+	r_strbuf_setf (&op->esil, "1,$ds,=,0x%x,pc,=", op->jump);
 	return op->size;
 }
 
 //nibble=B; 1011i12......... bsr <bdisp12>
-static int bsr(RAnal* anal, RAnalOp* op, ut16 code){
+static int bsr(RAnal* anal, RAnalOp* op, ut16 code) {
 	/* Subroutine call, relative to PC */
 	op->type = R_ANAL_OP_TYPE_CALL;
-	op->jump = disarm_12bit_offset (op, GET_BRA_OFFSET(code));
+	op->jump = disarm_12bit_offset (op, GET_BRA_OFFSET (code));
 	op->delay = 1;
+	r_strbuf_setf (&op->esil, "1,$ds,=,pc,2,+,pr,=,0x%x,pc,=", op->jump);
 	return op->size;
 }
 
-static int first_nibble_is_c(RAnal* anal, RAnalOp* op, ut16 code){
-	if (IS_TRAP(code)) {
+static int first_nibble_is_c(RAnal* anal, RAnalOp* op, ut16 code) {
+	if (IS_TRAP (code)) {
 		op->type = R_ANAL_OP_TYPE_SWI;
-		op->val = (ut8)(code&0xFF);
-	} else if (IS_MOVA_PCREL_R0(code)) {
+		op->val = (ut8)(code & 0xFF);
+		r_strbuf_setf (&op->esil, "4,r15,-=,sr,r15,=[4],4,r15,-=,2,pc,-,r15,=[4],2,0x%x,<<,4,+,vbr,+,pc,=", code & 0xFF);
+	} else if (IS_MOVA_PCREL_R0 (code)) {
 		// 11000111i8p4.... mova @(<disp>,PC),R0
 		op->type = R_ANAL_OP_TYPE_LEA;
-		op->src[0] = anal_pcrel_disp_mov (anal, op, code&0xFF, LONG_SIZE);	//this is wrong !
+		op->src[0] = anal_pcrel_disp_mov (anal, op, code & 0xFF, LONG_SIZE);	//this is wrong !
 		op->dst = anal_fill_ai_rg (anal, 0); //Always R0
-	} else if (IS_BINLOGIC_IMM_R0(code)) {	// 110010__i8 (binop) #imm, R0
-		op->src[0] = anal_fill_im (anal, code&0xFF);
+		r_strbuf_setf (&op->esil, "0x%x,pc,+,r0,=", (code & 0xFF) * 4);
+	} else if (IS_BINLOGIC_IMM_R0 (code)) {	// 110010__i8 (binop) #imm, R0
+		op->src[0] = anal_fill_im (anal, code & 0xFF);
 		op->src[1] = anal_fill_ai_rg (anal, 0);	//Always R0
 		op->dst = anal_fill_ai_rg (anal, 0); //Always R0 except tst #imm, R0
-		switch (code & 0xFF00) {
+		switch(code & 0xFF00) {
 		case 0xC800:	//tst
 			//TODO : get correct op->dst ! (T flag)
 			op->type = R_ANAL_OP_TYPE_ACMP;
+			r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r0,0x%x,&,!,?{,1,sr,|=,}", code & 0xFF);
 			break;
 		case 0xC900:	//and
 			op->type = R_ANAL_OP_TYPE_AND;
+			r_strbuf_setf (&op->esil, "0x%x,r0,&=", code & 0xFF);
 			break;
 		case 0xCA00:	//xor
 			op->type = R_ANAL_OP_TYPE_XOR;
+			r_strbuf_setf (&op->esil, "0x%x,r0,^=", code & 0xFF);
 			break;
 		case 0xCB00:	//or
 			op->type = R_ANAL_OP_TYPE_OR;
+			r_strbuf_setf (&op->esil, "0x%x,r0,|=", code & 0xFF);
 			break;
 		}
-	} else if (IS_BINLOGIC_IMM_GBR(code)) {	//110011__i8 (binop).b #imm, @(R0,GBR)
-		op->src[0] = anal_fill_im (anal, code&0xFF);
-		switch (code & 0xFF00) {
+	} else if (IS_BINLOGIC_IMM_GBR (code)) {	//110011__i8 (binop).b #imm, @(R0,gbr)
+		op->src[0] = anal_fill_im (anal, code & 0xFF);
+		switch(code & 0xFF00) {
 		case 0xCC00:	//tst
 			//TODO : get correct op->dst ! (T flag)
 			op->type = R_ANAL_OP_TYPE_ACMP;
+			r_strbuf_setf (&op->esil, "0xFFFFFFFE,sr,&=,r0,gbr,+,[1],0x%x,&,!,?{,1,sr,|=,}", code & 0xFF);
 			break;
 		case 0xCD00:	//and
 			op->type = R_ANAL_OP_TYPE_AND;
+			r_strbuf_setf (&op->esil, "r0,gbr,+,[1],0x%x,&,r0,gbr,+,=[1]", code & 0xFF);
 			break;
 		case 0xCE00:	//xor
 			op->type = R_ANAL_OP_TYPE_XOR;
+			r_strbuf_setf (&op->esil, "r0,gbr,+,[1],0x%x,^,r0,gbr,+,=[1]", code & 0xFF);
 			break;
 		case 0xCF00:	//or
 			op->type = R_ANAL_OP_TYPE_OR;
+			r_strbuf_setf (&op->esil, "r0,gbr,+,[1],0x%x,|,r0,gbr,+,=[1]", code & 0xFF);
 			break;
 		}
-		//TODO : implement @(R0,GBR) dest and src[1]
-	} else if (IS_MOVB_R0_GBRREF(code)) {	//11000000i8*1.... mov.b R0,@(<disp>,GBR)
+		//TODO : implement @(R0,gbr) dest and src[1]
+	} else if (IS_MOVB_R0_GBRREF (code)) {
 		op->type = R_ANAL_OP_TYPE_STORE;
 		op->src[0] = anal_fill_ai_rg (anal, 0);
-		//todo: implement @(disp,GBR) dest
-	} else if (IS_MOVW_R0_GBRREF(code)) {	//11000001i8*2.... mov.w R0,@(<disp>,GBR)
+		r_strbuf_setf (&op->esil, "r0,gbr,0x%x,+,=[1]", code & 0xFF);
+	} else if (IS_MOVW_R0_GBRREF (code)) {	
 		op->type = R_ANAL_OP_TYPE_STORE;
 		op->src[0] = anal_fill_ai_rg (anal, 0);
-		//todo: implement @(disp,GBR) dest
-	} else if (IS_MOVL_R0_GBRREF(code)) {	//11000010i8*4.... mov.l R0,@(<disp>,GBR)
+		r_strbuf_setf (&op->esil, "r0,gbr,0x%x,+,=[2]", (code & 0xFF) * 2);
+	} else if (IS_MOVL_R0_GBRREF (code)) {
 		op->type = R_ANAL_OP_TYPE_STORE;
 		op->src[0] = anal_fill_ai_rg (anal, 0);
-		//todo: implement @(disp,GBR) dest
-	} else if (IS_MOVB_GBRREF_R0(code)) {	//11000100i8*1.... mov.b @(<disp>,GBR),R0
+		r_strbuf_setf (&op->esil, "r0,gbr,0x%x,+,=[4]", (code & 0xFF) * 4);
+	} else if (IS_MOVB_GBRREF_R0 (code)) {
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		op->dst = anal_fill_ai_rg (anal, 0);
-		//todo: implement @(disp,GBR) src
-	} else if (IS_MOVW_GBRREF_R0(code)) {	//11000101i8*2.... mov.w @(<disp>,GBR),R0
+		r_strbuf_setf (&op->esil, "gbr,0x%x,+,[1],DUP,0x80,&,?{,0xFFFFFF00,|,},r0,=", (code & 0xFF));
+	} else if (IS_MOVW_GBRREF_R0 (code)) {	
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		op->dst = anal_fill_ai_rg (anal, 0);
-		//todo: implement @(disp,GBR) src
-	} else if (IS_MOVL_GBRREF_R0(code)) {	//11000110i8*4.... mov.l @(<disp>,GBR),R0
+		r_strbuf_setf (&op->esil, "gbr,0x%x,+,[2],DUP,0x8000,&,?{,0xFFFF0000,|,},r0,=", (code & 0xFF)*2);
+	} else if (IS_MOVL_GBRREF_R0 (code)) {
 		op->type = R_ANAL_OP_TYPE_LOAD;
 		op->dst = anal_fill_ai_rg (anal, 0);
-		//todo: implement @(disp,GBR) src
+		r_strbuf_setf (&op->esil, "gbr,0x%x,+,[4],r0,=", (code & 0xFF) * 4);
 	}
 
 	return op->size;
 }
 
 //nibble=d; 1101nnnni8 : mov.l @(<disp>,PC), Rn
-static int movl_pcdisp_reg(RAnal* anal, RAnalOp* op, ut16 code){
+static int movl_pcdisp_reg(RAnal* anal, RAnalOp* op, ut16 code) {
 	op->type = R_ANAL_OP_TYPE_LOAD;
-	op->src[0] = anal_pcrel_disp_mov (anal, op, code&0xFF, LONG_SIZE);
-	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
+	op->src[0] = anal_pcrel_disp_mov (anal, op, code & 0xFF, LONG_SIZE);
+	//TODO: check it
+	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
+	r_strbuf_setf (&op->esil, "0x%x,[4],r%d,=", (code & 0xFF) * 4 + (op->addr & 0xfffffffc) + 4, GET_TARGET_REG (code));
 	return op->size;
 }
 
 //nibble=e; 1110nnnni8*1.... mov #<imm>,<REG_N>
-static int mov_imm_reg(RAnal* anal, RAnalOp* op, ut16 code){
+static int mov_imm_reg(RAnal* anal, RAnalOp* op, ut16 code) {
 	op->type = R_ANAL_OP_TYPE_MOV;
-	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG(code));
+	op->dst = anal_fill_ai_rg (anal, GET_TARGET_REG (code));
 	op->src[0] = anal_fill_im (anal, (st8)(code & 0xFF));
+	r_strbuf_setf (&op->esil, "0x%x,r%d,=,r%d,0x80,&,?{,0xFFFFFF00,r%d,|=,}", code & 0xFF, GET_TARGET_REG (code), GET_TARGET_REG (code), GET_TARGET_REG (code));
 	return op->size;
 }
 
 //nibble=f;
-static int fpu_insn(RAnal* anal, RAnalOp* op, ut16 code){
+static int fpu_insn(RAnal* anal, RAnalOp* op, ut16 code) {
 	//Not interested on FPU stuff for now
 	op->family = R_ANAL_OP_FAMILY_FPU;
 	return op->size;
@@ -761,10 +1062,11 @@
  * routines defined in first_nibble_decode table
  */
 static int sh_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
-	ut8 op_MSB,op_LSB;
+	ut8 op_MSB, op_LSB;
 	int ret;
-	if (!data)
+	if (!data || len < 2) {
 		return 0;
+	}
 	memset (op, '\0', sizeof (RAnalOp));
 	op->addr = addr;
 	op->type = R_ANAL_OP_TYPE_UNK;
@@ -775,17 +1077,18 @@
 
 	op_MSB = anal->big_endian? data[0]: data[1];
 	op_LSB = anal->big_endian? data[1]: data[0];
-	ret =  first_nibble_decode[(op_MSB>>4) & 0x0F](anal, op, (ut16)(op_MSB<<8 | op_LSB));
+	ret = first_nibble_decode[(op_MSB>>4) & 0x0F](anal, op, (ut16)(op_MSB<<8 | op_LSB));
+
 	return ret;
 }
 
 /* Set the profile register */
-static int sh_set_reg_profile(RAnal* anal){
+static int sh_set_reg_profile(RAnal* anal) {
 	//TODO Add system ( ssr, spc ) + fpu regs
 	const char *p =
-		"=PC    pc\n"
-		"=SP    r15\n"
-		"=BP    r14\n"
+		"=PC	pc\n"
+		"=SP	r15\n"
+		"=BP	r14\n"
 		"gpr	r0	.32	0	0\n"
 		"gpr	r1	.32	4	0\n"
 		"gpr	r2	.32	8	0\n"
@@ -806,8 +1109,9 @@
 		"gpr	pr	.32	68	0\n"
 		"gpr	sr	.32	72	0\n"
 		"gpr	gbr	.32	76	0\n"
-		"gpr	mach	.32	80	0\n"
-		"gpr	macl	.32	84	0\n";
+		"gpr	vbr	.32	80	0\n"
+		"gpr	mach	.32	84	0\n"
+		"gpr	macl	.32	88	0\n";
 	return r_reg_set_profile_string(anal->reg, p);
 }
 
@@ -815,6 +1119,7 @@
 	return 2; /* :) */
 }
 
+
 RAnalPlugin r_anal_plugin_sh = {
 	.name = "sh",
 	.desc = "SH-4 code analysis plugin",
@@ -824,6 +1129,7 @@
 	.bits = 32,
 	.op = &sh_op,
 	.set_reg_profile = &sh_set_reg_profile,
+	.esil = true
 };
 
 #ifndef CORELIB
@@ -833,3 +1139,4 @@
 	.version = R2_VERSION
 };
 #endif
+
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_sparc_cs.c radare2-2.8.0+dfsg/libr/anal/p/anal_sparc_cs.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_sparc_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_sparc_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -51,6 +51,51 @@
 	r_strbuf_append (buf, "}");
 }
 
+#define ZERO_FILL(x) memset (&x, 0, sizeof (x))
+
+static int parse_reg_name(RRegItem *reg, csh handle, cs_insn *insn, int reg_num) {
+	if (!reg) {
+		return -1;
+	}
+	switch (INSOP (reg_num).type) {
+	case SPARC_OP_REG:
+		reg->name = (char *)cs_reg_name (handle, INSOP (reg_num).reg);
+		break;
+	case SPARC_OP_MEM:
+		if (INSOP (reg_num).mem.base != SPARC_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (handle, INSOP (reg_num).mem.base);
+			break;
+		}
+	default:
+		break;
+	}
+	return 0;
+}
+
+static void op_fillval(RAnalOp *op, csh handle, cs_insn *insn) {
+	static RRegItem reg;
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_LOAD:
+		if (INSOP(0).type == SPARC_OP_MEM) {
+			ZERO_FILL (reg);
+			op->src[0] = r_anal_value_new ();
+			op->src[0]->reg = &reg;
+			parse_reg_name (op->src[0]->reg, handle, insn, 0);
+			op->src[0]->delta = INSOP(0).mem.disp;
+		}
+		break;
+	case R_ANAL_OP_TYPE_STORE:
+		if (INSOP(1).type == SPARC_OP_MEM) {
+			ZERO_FILL (reg);
+			op->dst = r_anal_value_new ();
+			op->dst->reg = &reg;
+			parse_reg_name (op->dst->reg, handle, insn, 1);
+			op->dst->delta = INSOP(1).mem.disp;
+		}
+		break;
+	}
+}
+
 static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	static csh handle = 0;
 	static int omode;
@@ -260,6 +305,9 @@
 			op->type = R_ANAL_OP_TYPE_DIV;
 			break;
 		}
+		if (a->fillval) {
+			op_fillval (op, handle, insn);
+		}
 		cs_free (insn, n);
 	}
 	return op->size;
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_tms320.c radare2-2.8.0+dfsg/libr/anal/p/anal_tms320.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_tms320.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_tms320.c	2018-08-07 14:12:36.000000000 +0000
@@ -80,18 +80,18 @@
 int tms320_op(RAnal * anal, RAnalOp * op, ut64 addr, const ut8 * buf, int len) {
 	TMS_ANAL_OP_FN aop = tms320_c55x_op;
 
-	if (anal->cpu && strcasecmp(anal->cpu, "c64x") == 0) {
+	if (anal->cpu && r_str_casecmp(anal->cpu, "c64x") == 0) {
 #ifdef CAPSTONE_TMS320C64X_H
 		return tms320c64x_analop (anal, op, addr, buf, len);
 #else
 		return -1;
 #endif
 	}
-	if (anal->cpu && strcasecmp(anal->cpu, "c54x") == 0) {
+	if (anal->cpu && r_str_casecmp(anal->cpu, "c54x") == 0) {
 		aop = tms320_c54x_op;
-	} else if (anal->cpu && strcasecmp(anal->cpu, "c55x") == 0) {
+	} else if (anal->cpu && r_str_casecmp(anal->cpu, "c55x") == 0) {
 		aop = tms320_c55x_op;
-	} else if (anal->cpu && strcasecmp(anal->cpu, "c55x+") == 0) {
+	} else if (anal->cpu && r_str_casecmp(anal->cpu, "c55x+") == 0) {
 		aop = tms320_c55x_plus_op;
 	}
 	return aop (anal, op, addr, buf, len);
@@ -109,7 +109,7 @@
 	.name = "tms320",
 	.arch = "tms320",
 	.bits = 32,
-	.desc = "TMS320 DSP family code analisys plugin",
+	.desc = "TMS320 DSP family code analysis plugin",
 	.init = tms320_init,
 	.fini = tms320_fini,
 	.license = "LGPLv3",
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_tms320c64x.c radare2-2.8.0+dfsg/libr/anal/p/anal_tms320c64x.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_tms320c64x.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_tms320c64x.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,7 +19,6 @@
 
 #if CAPSTONE_HAS_TMS320C64X
 
-#define esilprintf(op, fmt, ...) r_strbuf_setf (&op->esil, fmt, __VA_ARGS__)
 #define INSOP(n) insn->detail->tms320c64x.operands[n]
 #define INSCC insn->detail->tms320c64x.cc
 
@@ -187,12 +186,13 @@
 	}
 	return op->size;
 }
+#endif
+
+/*
 
 static int archinfo(RAnal *anal, int q) {
-	return 4; /* :D */
+	return 4; // :D
 }
-#endif
-/*
 
 RAnalPlugin r_anal_plugin_tms320c64x = {
 	.name = "tms320c64x",
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_v850.c radare2-2.8.0+dfsg/libr/anal/p/anal_v850.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_v850.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_v850.c	2018-08-07 14:12:36.000000000 +0000
@@ -25,12 +25,11 @@
 	if (flags & V850_FLAG_Z) r_strbuf_append (&op->esil, ",0,z,=");
 }
 
-static int v850_op(RAnal *anal, RAnalOp *op, ut64 addr,
-		const ut8 *buf, int len)
-{
+static int v850_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
 	int ret = 0;
 	ut8 opcode = 0;
-	char *reg1 = NULL, *reg2 = NULL;
+	const char *reg1 = NULL;
+	const char *reg2 = NULL;
 	ut32 bitmask = 0;
 	ut16 destaddr = 0;
 	st16 destaddrs = 0;
@@ -42,7 +41,7 @@
 	r_strbuf_init (&op->esil);
 	r_strbuf_set (&op->esil, "");
 
-	ret = op->size = v850_decode_command (buf, &cmd);
+	ret = op->size = v850_decode_command (buf, len, &cmd);
 
 	if (ret <= 0) {
 		return ret;
@@ -66,7 +65,7 @@
 		if (opcode != V850_MOV_IMM5) { // Format I
 			r_strbuf_appendf (&op->esil, "%s,%s,=", F1_RN1(word1), F1_RN2(word1));
 		} else { // Format II
-			r_strbuf_appendf (&op->esil, "%"PFMT64d",%s,=", F2_IMM(word1), F2_RN2(word1));
+			r_strbuf_appendf (&op->esil, "%"PFMT64d",%s,=", (st64)(F2_IMM(word1)), F2_RN2(word1));
 		}
 		break;
 	case V850_MOVEA:
@@ -216,13 +215,10 @@
 		op->type = R_ANAL_OP_TYPE_ADD;
 		if (F6_REG2(word1) == V850_SP) {
 			op->stackop = R_ANAL_STACK_INC;
-			// Not so sure about the fix but
-			// F6_IMM works only for 32 bit words.
-			// word1 is 16 bits long.
-			op->stackptr = F2_IMM (word1);
+			op->stackptr = (st64) word2;
 			op->val = op->stackptr;
 		}
-		r_strbuf_appendf (&op->esil, "%hd,%s,+,%s,=", word2, F6_RN1 (word1), F6_RN2 (word1));
+		r_strbuf_appendf (&op->esil, "%d,%s,+,%s,=", (st32) word2, F6_RN1 (word1), F6_RN2 (word1));
 		update_flags (op, -1);
 		break;
 	case V850_SHR_IMM5:
@@ -245,7 +241,6 @@
 		update_flags (op, V850_FLAG_CY | V850_FLAG_S | V850_FLAG_Z);
 		clear_flags (op, V850_FLAG_OV);
 		break;
-
 	case V850_BCOND:
 	case V850_BCOND2:
 	case V850_BCOND3:
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_x86_cs.c radare2-2.8.0+dfsg/libr/anal/p/anal_x86_cs.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_x86_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_x86_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2013-2017 - pancake */
+/* radare2 - LGPL - Copyright 2013-2018 - pancake */
 
 #include <r_anal.h>
 #include <r_lib.h>
@@ -204,24 +204,8 @@
 			snprintf (out, BUF_SZ, "%s,%s=",
 				cs_reg_name (handle, op.reg), setarg);
 			return out;
-		} else {
-			if (gop->bits == 64) {
-				switch (op.reg) {
-				case X86_REG_EAX: op.reg = X86_REG_RAX; break;
-				case X86_REG_EBX: op.reg = X86_REG_RBX; break;
-				case X86_REG_ECX: op.reg = X86_REG_RCX; break;
-				case X86_REG_EDX: op.reg = X86_REG_RDX; break;
-				case X86_REG_ESI: op.reg = X86_REG_RSI; break;
-				case X86_REG_EDI: op.reg = X86_REG_RDI; break;
-#if 0
-				case X86_REG_ESP: op.reg = X86_REG_RSP; break;
-				case X86_REG_EBP: op.reg = X86_REG_RBP; break;
-#endif
-				default: break;
-				}
-			}
-			return (char *)cs_reg_name (handle, op.reg);
 		}
+		return (char *)cs_reg_name (handle, op.reg);
 	case X86_OP_IMM:
 		if (set == 1) {
 			snprintf (out, BUF_SZ, "%"PFMT64d",%s=[%d]",
@@ -275,7 +259,8 @@
 		} else {
 			// Remove the trailing ',' from esil statement.
 			if (*out) {
-				out[strlen (out) - 1] = 0;
+				int out_len = strlen (out);
+				out[out_len> 0? out_len - 1: 0] = 0;
 			}
 		}
 
@@ -328,7 +313,13 @@
 	return 0;
 }
 
-static void anop_esil (RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh *handle, cs_insn *insn) {
+/* reg indices are based on Intel doc for 32-bit ModR/M byte */
+static const char *reg32_to_name(ut8 reg) {
+	const char * const names[] = {"eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"};
+	return reg < R_ARRAY_SIZE (names) ? names[reg] : "unk";
+}
+
+static void anop_esil(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh *handle, cs_insn *insn) {
 	int rs = a->bits/8;
 	const char *pc = (a->bits==16)?"ip":
 		(a->bits==32)?"eip":"rip";
@@ -435,11 +426,11 @@
 	case X86_INS_FXRSTOR:
 	case X86_INS_FXRSTOR64:
 		break;
-	case X86_INS_FDIV:
 	case X86_INS_FIDIV:
+	case X86_INS_FIDIVR:
+	case X86_INS_FDIV:
 	case X86_INS_FDIVP:
 	case X86_INS_FDIVR:
-	case X86_INS_FIDIVR:
 	case X86_INS_FDIVRP:
 		break;
 	case X86_INS_FSUBR:
@@ -731,13 +722,18 @@
 				dst = getarg (&gop, 0, 1, NULL, DST_AR);
 				esilprintf (op, "%s,%s", src, dst);
 			}
-			op->direction = 2; // write
 			break;
 		case X86_OP_REG:
 		default:
 			if (INSOP(0).type == X86_OP_MEM) {
 				op->direction = 1; // read
 			}
+			if (INSOP(1).type == X86_OP_MEM) {
+				// MOV REG, [PTR + IREG*SCALE]
+				op->ireg = cs_reg_name (*handle, INSOP (1).mem.index);
+				op->disp = INSOP(1).mem.disp;
+				op->scale = INSOP(1).mem.scale;
+			}
 			{
 				src = getarg (&gop, 1, 0, NULL, SRC_AR);
 				dst = getarg (&gop, 0, 0, NULL, DST_AR);
@@ -746,8 +742,8 @@
 				if (a->bits == 64 && dst64) {
 					r_strbuf_appendf (&op->esil, ",0xffffffff,%s,&=", dst64);
 				}
-				break;
 			}
+			break;
 		}
 		}
 		break;
@@ -787,6 +783,7 @@
 	case X86_INS_SAR:
 		// TODO: Set CF. See case X86_INS_SHL for more details.
 		{
+#if 0
 			ut64 val = 0;
 			switch (gop.insn->detail->x86.operands[0].size) {
 			case 1:
@@ -807,9 +804,11 @@
 			src = getarg (&gop, 1, 0, NULL, SRC_AR);
 			dst = getarg (&gop, 0, 0, NULL, DST_AR);
 			esilprintf (op, "%s,1,%s,>>,0x%"PFMT64x",%s,&,|,%s,=,1,%s,&,cf,=,1,REPEAT", src, dst, val, dst, dst, dst);
-			/*src = getarg (&gop, 1, 0, NULL, SRC_AR);
-			dst = getarg (&gop, 0, 1, ">>>>", DST_AR);
-			esilprintf (op, "%s,%s,$z,zf,=,$p,pf,=,$s,sf,=", src, dst);*/
+#endif
+			src = getarg (&gop, 1, 0, NULL, SRC_AR);
+			dst_r = getarg (&gop, 0, 0, NULL, DST_R_AR);
+			dst_w = getarg (&gop, 0, 1, NULL, DST_W_AR);
+			esilprintf (op, "0,cf,=,1,%s,-,1,<<,%s,&,?{,1,cf,=,},%s,%s,>>>>,%s,$z,zf,=,$p,pf,=,$s,sf,=", src, dst_r, src, dst_r, dst_w);
 		}
 		break;
 	case X86_INS_SARX:
@@ -839,7 +838,9 @@
 			src = getarg (&gop, 1, 0, NULL, SRC_AR);
 			dst_r = getarg (&gop, 0, 0, NULL, DST_R_AR);
 			dst_w = getarg (&gop, 0, 1, NULL, DST_W_AR);
-			esilprintf (op, "0,cf,=,1,%s,-,1,<<,%s,&,?{,1,cf,=,},%s,%s,>>,%s,$z,zf,=,$p,pf,=,$s,sf,=", src, dst_r, src, dst_r, dst_w);
+			arg0 = "$z,zf,=,$p,pf,=,$s,sf,=";
+			esilprintf (op, "0,cf,=,1,%s,-,1,<<,%s,&,?{,1,cf,=,},%s,%s,>>,%s,%s", 
+					src, dst_r, src, dst_r, dst_w, arg0);
 		}
 		break;
 	case X86_INS_CBW:
@@ -848,9 +849,26 @@
 	case X86_INS_CWDE:
 		esilprintf (op, "ax,eax,=,15,eax,>>,?{,0xffff0000,eax,|=,}");
 		break;
+	case X86_INS_CDQ:
+		esilprintf (op, "0,edx,=,31,eax,>>,?{,0xffffffff,edx,=,}");
+		break;
 	case X86_INS_CDQE:
 		esilprintf (op, "eax,rax,=,31,rax,>>,?{,0xffffffff00000000,rax,|=,}");
 		break;
+	case X86_INS_AAA:
+		esilprintf (op, "0,cf,=,0,af,=,9,al,>,?{,10,al,-=,1,ah,+=,1,cf,=,1,af,=,}");
+		break;
+	case X86_INS_AAD:
+		arg0 = "0,zf,=,0,sf,=,0,pf,=,10,ah,*,al,+,ax,=";
+		arg1 = "0,al,==,?{,1,zf,=,},2,al,%,0,==,?{,1,pf,=,},7,al,>>,?{,1,sf,=,}";
+		esilprintf (op, "%s,%s", arg0, arg1);
+		break;
+	case X86_INS_AAM:
+		arg0 = "0,zf,=,0,sf,=,0,pf,=,10,al,/,ah,=,10,al,%,al,=";
+		arg1 = "0,al,==,?{,1,zf,=,},2,al,%,0,==,?{,1,pf,=,},7,al,>>,?{,1,sf,=,}";
+		esilprintf (op, "%s,%s", arg0, arg1);
+		break;
+	// XXX: case X86_INS_AAS: too tough to implement. BCD is deprecated anyways
 	case X86_INS_CMP:
 	case X86_INS_CMPPD:
 	case X86_INS_CMPPS:
@@ -1109,13 +1127,29 @@
 		break;
 	case X86_INS_CALL:
 		{
+			if (a->read_at && a->bits != 16) {
+				ut8 thunk[4] = {0};
+				if (a->read_at (a, (ut64)INSOP (0).imm, thunk, sizeof (thunk))) {
+					/* 8b xx x4    mov <reg>, dword [esp]
+					   c3          ret
+					*/
+					if (thunk[0] == 0x8b && thunk[3] == 0xc3
+					    && (thunk[1] & 0xc7) == 4        /* 00rrr100 */
+					    && (thunk[2] & 0x3f) == 0x24) {  /* --100100: ignore scale in SIB byte */
+						ut8 reg = (thunk[1] & 0x38) >> 3;
+						esilprintf (op, "0x%"PFMT64x",%s,=", addr + op->size,
+						            reg32_to_name (reg));
+						break;
+					}
+				}
+			}
 			arg0 = getarg (&gop, 0, 0, NULL, ARG0_AR);
 			esilprintf (op,
-					"%s,"
+					"%s,%s,"
 					"%d,%s,-=,%s,"
 					"=[],"
-					"%s,%s,=",
-					pc, rs, sp, sp, arg0, pc);
+					"%s,=",
+					arg0, pc, rs, sp, sp, pc);
 		}
 		break;
 	case X86_INS_LCALL:
@@ -1340,9 +1374,9 @@
 	case X86_INS_ANDPS:
 	case X86_INS_ANDNPD:
 	case X86_INS_ANDNPS:
-		{
-			src = getarg (&gop, 1, 0, NULL, SRC_AR);
-			dst = getarg (&gop, 0, 1, "&", DST_AR);
+		src = getarg (&gop, 1, 0, NULL, SRC_AR);
+		dst = getarg (&gop, 0, 1, "&", DST_AR);
+		if (src && dst) {
 			char *p;
 			esilprintf (op, "%s,%s,$0,of,=,$0,cf,=,$z,zf,=,$s,sf,=,$o,pf,=", src, dst);
 			if ((a->bits == 64) && (p = strchr (dst, (int)','))) {
@@ -1359,12 +1393,29 @@
 			arg1 = getarg (&gop, 1, 0, NULL, ARG1_AR);
 			arg2 = getarg (&gop, 2, 0, NULL, ARG2_AR);
 			// TODO update flags & handle signedness
+			op->sign = true;
 			if (!arg2 && !arg1) {
 				// TODO: IDIV rbx not implemented. this is just a workaround
 // http://www.tptp.cc/mirrors/siyobik.info/instruction/IDIV.html
 // Divides (signed) the value in the AX, DX:AX, or EDX:EAX registers (dividend) by the source operand (divisor) and stores the result in the AX (AH:AL), DX:AX, or EDX:EAX registers. The source operand can be a general-purpose register or a memory location. The action of this instruction depends on the operand size (dividend/divisor), as shown in the following table:
 // IDIV RBX    ==   RDX:RAX /= RBX
-				esilprintf (op, "%s,%s,/=", arg0, "rax");
+				if (arg0) {
+					int width = INSOP(0).size;
+					const char *r_quot = (width==1)?"al": (width==2)?"ax": (width==4)?"eax":"rax";
+					const char *r_rema = (width==1)?"ah": (width==2)?"dx": (width==4)?"edx":"rdx";
+					const char *r_nume = (width==1)?"ax": r_quot;
+
+					if ( width == 1 ) {
+						esilprintf(op, "0xffffff00,eflags,&=,%s,%s,%%,eflags,|=,%s,%s,/,%s,=,0xff,eflags,&,%s,=,0xffffff00,eflags,&=,2,eflags,|=",
+							arg0, r_nume, arg0, r_nume, r_quot, r_rema);
+					} else {
+						esilprintf (op, "%s,%s,%%,%s,=,%s,%s,/,%s,=",
+								arg0, r_nume, r_rema, arg0, r_nume, r_quot);
+					}
+				}
+				else {
+					/* should never happen */
+				}
 			} else {
 				esilprintf (op, "%s,%s,/,%s,=", arg2, arg1, arg0);
 			}
@@ -1392,6 +1443,7 @@
 			arg0 = getarg (&gop, 0, 0, NULL, ARG0_AR);
 			arg1 = getarg (&gop, 1, 0, NULL, ARG1_AR);
 			arg2 = getarg (&gop, 2, 0, NULL, ARG2_AR);
+			op->sign = true;
 			if (arg2) {
 				// TODO update flags & handle signedness
 				esilprintf (op, "%s,%s,*,%s,=", arg2, arg1, arg0);
@@ -1399,7 +1451,23 @@
 				if (arg1) {
 					esilprintf (op, "%s,%s,*=", arg1, arg0);
 				} else {
-					esilprintf (op, "%s,%s,*=", arg0, "rax");
+					if (arg0) {
+						int width = INSOP(0).size;
+						const char *r_quot = (width==1)?"al": (width==2)?"ax": (width==4)?"eax":"rax";
+						const char *r_rema = (width==1)?"ah": (width==2)?"dx": (width==4)?"edx":"rdx";
+						const char *r_nume = (width==1)?"ax": r_quot;
+
+						if ( width == 1 ) {
+							esilprintf(op, "0xffffff00,eflags,&=,%s,%s,%%,eflags,|=,%s,%s,*,%s,=,0xff,eflags,&,%s,=,0xffffff00,eflags,&=,2,eflags,|=",
+								arg0, r_nume, arg0, r_nume, r_quot, r_rema);
+						} else {
+							esilprintf (op, "%d,%s,%s,*,>>,%s,=,%s,%s,*=",
+									width*8, arg0, r_nume, r_rema, arg0, r_nume);
+						}
+					}
+					else {
+						/* should never happen */
+					}
 				}
 			}
 		}
@@ -1408,16 +1476,17 @@
 		{
 			src = getarg (&gop, 0, 0, NULL, SRC_AR);
 			if (src) {
-				switch (src[0]) {
-				case 'r':
-					esilprintf (op, "%s,rax,*=", src);
-					break;
-				case 'e':
-					esilprintf (op, "%s,eax,*=", src);
-					break;
-				default:
-					esilprintf (op, "%s,al,*=", src);
-					break;
+				int width = INSOP(0).size;
+				const char *r_quot = (width==1)?"al": (width==2)?"ax": (width==4)?"eax":"rax";
+				const char *r_rema = (width==1)?"ah": (width==2)?"dx": (width==4)?"edx":"rdx";
+				const char *r_nume = (width==1)?"ax": r_quot;
+
+				if ( width == 1 ) {
+					esilprintf(op, "0xffffff00,eflags,&=,%s,%s,%%,eflags,|=,%s,%s,*,%s,=,0xff,eflags,&,%s,=,0xffffff00,eflags,&=,2,eflags,|=",
+						src, r_nume, src, r_nume, r_quot, r_rema);
+				} else {
+					esilprintf (op, "%d,%s,%s,*,>>,%s,=,%s,%s,*=",
+							width*8, src, r_nume, r_rema, src, r_nume);
 				}
 			} else {
 				/* should never happen */
@@ -1591,14 +1660,21 @@
 	}
 }
 
-static int parse_reg_name_mov(RRegItem *reg, csh *handle, cs_insn *insn, int reg_num) {
+static int parse_reg_name(RRegItem *reg, csh *handle, cs_insn *insn, int reg_num) {
 	if (!reg) {
 		return -1;
 	}
 
 	switch (INSOP (reg_num).type) {
 	case X86_OP_REG:
-		reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).reg);
+		reg->name = (char *)cs_reg_name (*handle, INSOP(reg_num).reg);
+		break;
+	case X86_OP_MEM:
+		if (INSOP (reg_num).mem.base != X86_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).mem.base);
+		} else if (INSOP (reg_num).mem.index != X86_REG_INVALID) {
+			reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).mem.index);
+		}
 		break;
 	default:
 		break;
@@ -1606,37 +1682,88 @@
 	return 0;
 }
 
-static int parse_reg_name_lea(RRegItem *reg, csh *handle, cs_insn *insn, int reg_num) {
-	if (!reg) {
-		return -1;
-	}
+#define CREATE_SRC_DST(op) \
+	(op)->src[0] = r_anal_value_new ();\
+	(op)->dst = r_anal_value_new ();\
+	ZERO_FILL (regs[0]);\
+	ZERO_FILL (regs[1]);\
+	(op)->src[0]->reg = &regs[1];\
+	(op)->dst->reg = &regs[0];\
+	parse_reg_name (op->src[0]->reg, &gop.handle, insn, 1);\
+	parse_reg_name (op->dst->reg, &gop.handle, insn, 0);
 
-	switch (INSOP (reg_num).type) {
-	case X86_OP_REG:
-		reg->name = (char *)cs_reg_name (*handle, INSOP(reg_num).reg);
+static void op_fillval (RAnal *a, RAnalOp *op, csh *handle, cs_insn *insn){
+	struct Getarg gop = {
+		.handle = *handle,
+		.insn = insn,
+		.bits = a->bits
+	};
+	static RRegItem regs[2];
+
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_MOV:
+	case R_ANAL_OP_TYPE_CMP:
+	case R_ANAL_OP_TYPE_LEA:
+		CREATE_SRC_DST (op);
+		switch (INSOP(0).type) {
+		case X86_OP_MEM:
+			op->dst->delta = INSOP(0).mem.disp;
+			break;
+		case X86_OP_REG:
+			if (INSOP(1).type == X86_OP_MEM) {
+				op->src[0]->delta = INSOP(1).mem.disp;
+			}
+		default:
+			break;
+		}
 		break;
-	case X86_OP_MEM:
-		if (INSOP (reg_num).mem.base != X86_REG_INVALID) {
-			reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).mem.base);
-		} else if (INSOP (reg_num).mem.index != X86_REG_INVALID) {
-			reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).mem.index);
+	case R_ANAL_OP_TYPE_SHL:
+		op->src[0] = r_anal_value_new ();
+		op->src[0]->imm = INSOP(1).imm;
+		parse_reg_name (op->src[0]->reg, &gop.handle, insn, 1);
+		break;
+	default:
+		break;
+	}
+}
+
+static void set_opdir(RAnalOp *op, cs_insn *insn) {
+	switch (op->type & R_ANAL_OP_TYPE_MASK) {
+	case R_ANAL_OP_TYPE_MOV:
+		switch (INSOP(0).type) {
+		case X86_OP_MEM:
+			op->direction = R_ANAL_OP_DIR_WRITE;
+			break;
+		case X86_OP_REG:
+			if (INSOP(1).type == X86_OP_MEM) {
+				op->direction = R_ANAL_OP_DIR_READ;
+			}
+			break;
+		default:
+			break;
 		}
 		break;
+	case R_ANAL_OP_TYPE_LEA:
+		op->direction = R_ANAL_OP_DIR_REF;
+		break;
+	case R_ANAL_OP_TYPE_CALL:
+	case R_ANAL_OP_TYPE_JMP:
+	case R_ANAL_OP_TYPE_UJMP:
+	case R_ANAL_OP_TYPE_UCALL:
+		op->direction = R_ANAL_OP_DIR_EXEC;
+		break;
 	default:
 		break;
 	}
-	return 0;
 }
 
 static void anop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh *handle, cs_insn *insn) {
-	char *dst;
 	struct Getarg gop = {
 		.handle = *handle,
 		.insn = insn,
 		.bits = a->bits
 	};
 	int regsz = 4;
-	static RRegItem regs[2];
 	switch (a->bits) {
 	case 64: regsz = 8; break;
 	case 16: regsz = 2; break;
@@ -1855,20 +1982,8 @@
 		{
 		op->type = R_ANAL_OP_TYPE_MOV;
 		op->ptr = UT64_MAX;
-
-		op->src[0] = r_anal_value_new ();
-		ZERO_FILL (regs[1]);
-		op->src[0]->reg = &regs[1];
-		op->dst = r_anal_value_new ();
-
-		parse_reg_name_mov (op->src[0]->reg, &gop.handle, insn, 1);
-
 		switch (INSOP(0).type) {
 		case X86_OP_MEM:
-			ZERO_FILL (regs[1]);
-			op->dst->reg = &regs[0];
-			parse_reg_name_mov (op->dst->reg, &gop.handle, insn, 0);
-
 			op->cycles = CYCLE_MEM;
 			op->ptr = INSOP(0).mem.disp;
 			op->refptr = INSOP(0).size;
@@ -1888,15 +2003,10 @@
 			}
 			break;
 		case X86_OP_REG:
-			{
-			dst = getarg (&gop, 0, 0, NULL, DST_AR);
-			//op->dst = r_anal_value_new ();
-			op->dst->reg = r_reg_get (a->reg, dst, R_REG_TYPE_GPR);
-			//op->src[0] = r_anal_value_new ();
-			if (INSOP(1).type == X86_OP_MEM) {
-				op->src[0]->delta = INSOP(1).mem.disp;
-			}
+			if (INSOP(1).type == X86_OP_IMM) {
+				op->val = INSOP(1).imm;
 			}
+			break;
 		default:
 			break;
 		}
@@ -1942,8 +2052,6 @@
 		// number of bits shifted is greater than the size of the
 		// destination.
 		op->type = R_ANAL_OP_TYPE_SHL;
-		op->src[0] = r_anal_value_new ();
-		op->src[0]->imm = INSOP(1).imm;
 		break;
 	case X86_INS_SAR:
 	case X86_INS_SARX:
@@ -1962,8 +2070,10 @@
 	case X86_INS_SHRX:
 		// TODO: Set CF: See case X86_INS_SAL for more details.
 		op->type = R_ANAL_OP_TYPE_SHR;
-		op->src[0] = r_anal_value_new ();
-		op->src[0]->imm = INSOP(1).imm;
+		op->val = INSOP(1).imm;
+		// XXX this should be op->imm
+		//op->src[0] = r_anal_value_new ();
+		//op->src[0]->imm = INSOP(1).imm;
 		break;
 	case X86_INS_CMP:
 	case X86_INS_CMPPD:
@@ -2016,16 +2126,6 @@
 		break;
 	case X86_INS_LEA:
 		op->type = R_ANAL_OP_TYPE_LEA;
-		op->src[0] = r_anal_value_new ();
-		ZERO_FILL (regs[1]);
-		op->src[0]->reg = &regs[1];
-		op->dst = r_anal_value_new ();
-		ZERO_FILL (regs[0]);
-		op->dst->reg = &regs[0];
-
-		parse_reg_name_lea (op->src[0]->reg, &gop.handle, insn, 1);
-		parse_reg_name_mov (op->dst->reg, &gop.handle, insn, 0);
-
 		switch (INSOP(1).type) {
 		case X86_OP_MEM:
 			// op->type = R_ANAL_OP_TYPE_ULEA;
@@ -2165,6 +2265,15 @@
 		op->jump = INSOP(0).imm;
 		op->fail = addr + op->size;
 		op->cycles = CYCLE_JMP;
+		switch (insn->id) {
+		case X86_INS_JL:
+		case X86_INS_JLE:
+		case X86_INS_JS:
+		case X86_INS_JG:
+		case X86_INS_JGE:
+			op->sign = true;
+			break;
+		}
 		break;
 	case X86_INS_CALL:
 	case X86_INS_LCALL:
@@ -2220,7 +2329,7 @@
 				ut64 seg = INSOP(0).imm;
 				ut64 off = INSOP(1).imm;
 				op->ptr = INSOP (0).mem.disp;
-				op->jump = (seg << 4) + off;
+				op->jump = (seg << a->seggrn) + off;
 			} else {
 				op->jump = INSOP(0).imm;
 			}
@@ -2394,8 +2503,11 @@
 	case X86_INS_DIV:
 		op->type = R_ANAL_OP_TYPE_DIV;
 		break;
-	case X86_INS_AAM:
 	case X86_INS_IMUL:
+		op->type = R_ANAL_OP_TYPE_MUL;
+		op->sign = true;
+		break;
+	case X86_INS_AAM:
 	case X86_INS_MUL:
 	case X86_INS_MULX:
 	case X86_INS_MULPD:
@@ -2530,6 +2642,7 @@
 	op->ptr = op->val = UT64_MAX;
 	op->src[0] = NULL;
 	op->src[1] = NULL;
+	op->dst = NULL;
 	op->size = 0;
 	op->delay = 0;
 	r_strbuf_init (&op->esil);
@@ -2570,12 +2683,17 @@
 			break;
 		case X86_PREFIX_LOCK:
 			op->prefix |= R_ANAL_OP_PREFIX_LOCK;
+			op->family = R_ANAL_OP_FAMILY_THREAD; // XXX ?
 			break;
 		}
 		anop (a, op, addr, buf, len, &handle, insn);
+		set_opdir (op, insn);
 		if (a->decode) {
 			anop_esil (a, op, addr, buf, len, &handle, insn);
 		}
+		if (a->fillval) {
+			op_fillval (a, op, &handle, insn);
+		}
 	}
 //#if X86_GRP_PRIVILEGE>0
 	if (insn) {
@@ -2592,7 +2710,7 @@
 }
 
 #if 0
-static int x86_int_0x80 (RAnalEsil *esil, int interrupt) {
+static int x86_int_0x80(RAnalEsil *esil, int interrupt) {
 	int syscall;
 	ut64 eax, ebx, ecx, edx;
 	if (!esil || (interrupt != 0x80))
@@ -2626,14 +2744,14 @@
 #endif
 
 #if 0
-static int esil_x86_cs_intr (RAnalEsil *esil, int intr) {
+static int esil_x86_cs_intr(RAnalEsil *esil, int intr) {
 	if (!esil) return false;
 	eprintf ("INTERRUPT 0x%02x HAPPENS\n", intr);
 	return true;
 }
 #endif
 
-static int esil_x86_cs_init (RAnalEsil *esil) {
+static int esil_x86_cs_init(RAnalEsil *esil) {
 	if (!esil) {
 		return false;
 	}
@@ -2644,7 +2762,13 @@
 	return true;
 }
 
-static int esil_x86_cs_fini (RAnalEsil *esil) {
+static int fini(void *p) {
+	cs_close (&handle);
+	handle = 0;
+	return true;
+}
+
+static int esil_x86_cs_fini(RAnalEsil *esil) {
 	return true;
 }
 
@@ -3051,6 +3175,7 @@
 	.op = &analop,
 	.archinfo = archinfo,
 	.get_reg_profile = &get_reg_profile,
+	.fini = fini,
 	.esil_init = esil_x86_cs_init,
 	.esil_fini = esil_x86_cs_fini,
 //	.esil_intr = esil_x86_cs_intr,
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_x86_udis.c radare2-2.8.0+dfsg/libr/anal/p/anal_x86_udis.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_x86_udis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_x86_udis.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,788 +0,0 @@
-/* radare - LGPL - Copyright 2009-2016 - nibble, pancake */
-
-#include <r_lib.h>
-#include <r_types.h>
-#include <r_anal.h>
-#include <r_util.h>
-
-#include "udis86/types.h"
-#include "udis86/extern.h"
-#include "esil.h"
-
-static st64 getval(ud_operand_t *op);
-// XXX Copypasta from udis
-#define UD_REG_TAB_SIZE (sizeof (ud_reg_tab)/sizeof (*ud_reg_tab))
-static const char* ud_reg_tab[] = {
-	"al",   "cl",   "dl",   "bl",
-	"ah",   "ch",   "dh",   "bh",
-	"spl",  "bpl",  "sil",  "dil",
-	"r8b",  "r9b",  "r10b", "r11b",
-	"r12b", "r13b", "r14b", "r15b",
-
-	"ax",   "cx",   "dx",   "bx",
-	"sp",   "bp",   "si",   "di",
-	"r8w",  "r9w",  "r10w", "r11w",
-	"r12w", "r13w", "r14w", "r15w",
-
-	"eax",  "ecx",  "edx",  "ebx",
-	"esp",  "ebp",  "esi",  "edi",
-	"r8d",  "r9d",  "r10d", "r11d",
-	"r12d", "r13d", "r14d", "r15d",
-
-	"rax",  "rcx",    "rdx",    "rbx",
-	"rsp",  "rbp",    "rsi",    "rdi",
-	"r8",   "r9",     "r10",    "r11",
-	"r12",  "r13",    "r14",    "r15",
-
-	"es",   "cs",   "ss",   "ds",
-	"fs",   "gs",
-
-	"cr0",  "cr1",    "cr2",    "cr3",
-	"cr4",  "cr5",    "cr6",    "cr7",
-	"cr8",  "cr9",    "cr10",   "cr11",
-	"cr12", "cr13",   "cr14",   "cr15",
-
-	"dr0",  "dr1",    "dr2",    "dr3",
-	"dr4",  "dr5",    "dr6",    "dr7",
-	"dr8",  "dr9",    "dr10",   "dr11",
-	"dr12", "dr13",   "dr14",   "dr15",
-
-	"mm0",  "mm1",    "mm2",    "mm3",
-	"mm4",  "mm5",    "mm6",    "mm7",
-
-	"st0",  "st1",    "st2",    "st3",
-	"st4",  "st5",    "st6",    "st7",
-
-	"xmm0", "xmm1",   "xmm2",   "xmm3",
-	"xmm4", "xmm5",   "xmm6",   "xmm7",
-	"xmm8", "xmm9",   "xmm10",  "xmm11",
-	"xmm12","xmm13",  "xmm14",  "xmm15",
-
-	"ymm0", "ymm1",   "ymm2",   "ymm3",
-	"ymm4", "ymm5",   "ymm6",   "ymm7",
-	"ymm8", "ymm9",   "ymm10",  "ymm11",
-	"ymm12","ymm13",  "ymm14",  "ymm15",
-
-	"rip"
-};
-
-static int getarg(char *src, struct ud *u, st64 mask, int idx, int regsz) {
-	ud_operand_t *op = &u->operand[idx];
-	st64 n;
-	src[0] = 0;
-	if (!mask) mask = UT64_MAX;
-
-	switch (op->type) {
-	case UD_OP_PTR:
-	case UD_OP_CONST:
-	case UD_OP_JIMM:
-	case UD_OP_IMM:
-		n = getval (op) & mask;
-		//mask = UT64_MAX; // uhm?
-		if (op->type == UD_OP_JIMM) n += u->pc;
-		if (n>=0 && n<256)
-			sprintf (src, "%"PFMT64d, n & mask);
-		else sprintf (src, "0x%"PFMT64x, n&mask);
-		break;
-	case UD_OP_REG:
-		idx = op->base-UD_R_AL;
-		if (idx>=0 && idx<UD_REG_TAB_SIZE)
-			strcpy (src, ud_reg_tab[idx]);
-		break;
-	case UD_OP_MEM:
-		n = getval (op);
-		// TODO ->scale
-		if (op->base != UD_NONE) {
-			idx = op->base-UD_R_AL;
-			if (idx>=0 && idx<UD_REG_TAB_SIZE) {
-				sprintf (src, "%s", ud_reg_tab[idx]);
-                                src += strlen (src);
-                                if (op->index != UD_NONE) {
-                                        idx = op->index - UD_R_AL;
-                                        if (idx >= 0 && idx < UD_REG_TAB_SIZE) {
-                                                sprintf (src, ",%d,%s,*,+",
-						op->scale, ud_reg_tab[idx]);
-					}
-                                        src += strlen (src);
-                                }
-                                if (u->mnemonic == UD_Ilea) {
-					if ((st16)n>0) sprintf (src, ",%"PFMT64d",+", n);
-					else if ((st16)n<0) sprintf (src, ",%"PFMT64d",-", UT32_MAX-n);
-				} else if ((st16)n >= -256 && (st16)n < 256) {
-					char nb = (char)n;
-					char absn = ((st16)nb<0)? -nb: nb;
-					if (n==0) sprintf (src, ",[%d]", regsz);
-					else sprintf (src, ",%d,%c,[%d]",
-						absn, nb<0?'-':'+', regsz);
-				} else {
-					sprintf (src, ",0x%"PFMT64x",+,[%d]",
-						mask & n, regsz);
-				}
-			} else {
-				/* If UDis86 works properly, it will never reach this point.
-				 * Only useful for debug purposes ("unknown reg" is clearer
-				 * than an empty string, right?)
-				 */
-			}
-		} else sprintf (src, "0x%"PFMT64x",[%d]", n & mask, regsz);
-		break;
-	default:
-		break;
-	}
-
-	return 0;
-}
-
-static st64 getval(ud_operand_t *op) {
-	int bits = op->size;
-	switch (op->type) {
-	case UD_OP_PTR:
-		return (op->lval.ptr.seg<<4) + (op->lval.ptr.off & 0xFFFF);
-	default:
-		break;
-	}
-	if (!bits) bits = 32;
-	if (op->signed_lval) { // TODO: honor sign
-		switch (bits) {
-		case 8: return (st64)(char) (op->lval.sbyte);
-		case 16: return (st64)(short) op->lval.uword;
-		case 32: return (ut64)(ut32)(op->lval.udword&UT32_MAX);
-		case 64: return op->lval.uqword;
-		}
-	} else {
-		switch (bits) {
-		case 8: return (st64)(char)(255-op->lval.sbyte); // XXX?
-		case 16: return (st64)(short) (op->lval.uword& UT16_MAX);
-		case 32: return (ut64)(ut32)(op->lval.udword & UT32_MAX);
-		case 64: return op->lval.uqword;
-		}
-	}
-	return 0LL;
-}
-
-int x86_udis86_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
-	const char *pc = anal->bits==64? "rip": anal->bits==32? "eip": "ip";
-	const char *sp = anal->bits==64? "rsp": anal->bits==32? "esp": "sp";
-        const char *bp = anal->bits==64? "rbp": anal->bits==32? "ebp": "bp";
-	int delta, oplen, regsz = 4;
-	char str[64], src[32], dst[32];
-	struct ud u;
-	switch (anal->bits) {
-	case 64: regsz = 8; break;
-	case 16: regsz = 2; break;
-	default:
-	case 32: regsz = 4; break;
-	}
-
-	UDis86Esil *handler;
-	UDis86OPInfo info = {0, anal->bits, (1LL << anal->bits) - 1, regsz, 0, pc, sp, bp};
-	memset (op, '\0', sizeof (RAnalOp));
-	op->addr = addr;
-	op->jump = op->fail = -1;
-	op->ptr = op->val = -1;
-
-	ud_init (&u);
-	ud_set_pc (&u, addr);
-	ud_set_mode (&u, anal->bits);
-	ud_set_syntax (&u, NULL);
-	ud_set_input_buffer (&u, data, len);
-	ud_disassemble (&u);
-
-	op->id = u.mnemonic;
-	oplen = op->size = ud_insn_len (&u);
-	r_strbuf_init (&op->esil);
-	if (anal->decode && (handler = udis86_esil_get_handler (u.mnemonic))) {
-		info.oplen = oplen;
-		//if (anal->bits==32)
-			info.bitmask = UT32_MAX;
-		if (handler->argc > 0) {
-			info.n = getval (u.operand);
-			getarg (dst, &u, info.bitmask, 0, regsz);
-			if (handler->argc > 1) {
-				getarg (src, &u, info.bitmask, 1, regsz);
-				if (handler->argc > 2)
-					getarg (str, &u, info.bitmask, 2, regsz);
-			}
-		}
-		handler->callback (&info, op, dst, src, str);
-	}
-#if 0
-	u->pfx_seg   = 0;
-	u->pfx_opr   = 0;
-	u->pfx_adr   = 0;
-	u->pfx_lock  = 0;
-	u->pfx_repne = 0;
-	u->pfx_rep   = 0;
-	u->pfx_repe  = 0;
-	u->pfx_rex   = 0;
-	u->pfx_str   = 0;
-#endif
-	op->prefix = 0;
-	if (u.pfx_rep) op->prefix |= R_ANAL_OP_PREFIX_REP;
-	if (u.pfx_repe) op->prefix |= R_ANAL_OP_PREFIX_REP;
-	if (u.pfx_repne) op->prefix |= R_ANAL_OP_PREFIX_REPNE;
-	if (u.pfx_lock) op->prefix |= R_ANAL_OP_PREFIX_LOCK;
-	switch (u.mnemonic) {
-	case UD_Iinvalid:
-		oplen = op->size = -1;
-		return -1;
-		break;
-	case UD_Itest:
-	case UD_Icmp:
-		op->type = R_ANAL_OP_TYPE_CMP;
-		// TODO: support 2nd parameter too?
-		switch (u.operand[0].type) {
-		case UD_OP_MEM:
-			op->refptr = u.operand[0].size /8;
-			switch (u.operand[0].base) {
-			case UD_R_RIP:
-				// Self modifying code? relative local vars
-				switch (u.operand[1].size) {
-				case  8:
-				case 16:
-				case 32: delta = u.operand[1].lval.udword; break;
-				case 64: delta = u.operand[1].lval.uqword; break;
-				default: delta = u.operand[1].lval.udword; break;
-				}
-				op->ptr = addr + oplen + delta;
-				break;
-			case UD_R_RBP:
-				op->stackop = R_ANAL_STACK_SET;
-				op->ptr = getval (&u.operand[0]); //-(st64)u.operand[0].lval.sbyte; //getval (&u.operand[0]);
-				op->ptr = (st64)((char)u.operand[0].lval.sbyte); //getval (&u.operand[0]);
-				// if positive = arg
-				// if negative = var
-				break;
-			default:
-				op->ptr = getval (&u.operand[0]);
-				break;
-			}
-			break;
-		case UD_OP_IMM:
-			op->ptr = getval (&u.operand[0]);
-		default:
-			break;
-		}
-		switch (u.operand[1].type) {
-		case UD_OP_MEM:
-			op->refptr = u.operand[0].size /8;
-			switch (u.operand[1].base) {
-			case UD_R_RIP:
-				// Self modifying code? relative local vars
-				delta = u.operand[1].lval.uword;
-				op->ptr = addr + oplen + delta;
-				break;
-			case UD_R_RBP:
-				op->stackop = R_ANAL_STACK_SET;
-				op->ptr = getval (&u.operand[1]); //-(st64)u.operand[0].lval.sbyte; //getval (&u.operand[0]);
-				op->ptr = (st64)((char)u.operand[1].lval.sbyte); //getval (&u.operand[0]);
-				// if positive = arg
-				// if negative = var
-				break;
-			default:
-				op->ptr = getval (&u.operand[1]);
-				break;
-			}
-			break;
-		case UD_OP_IMM:
-			op->ptr = getval (&u.operand[0]);
-		default:
-			break;
-		}
-		break;
-	case UD_Isalc: // ??
-		// al = cf
-		break;
-	case UD_Ixor:
-		op->type = R_ANAL_OP_TYPE_XOR;
-		break;
-	case UD_Ior:
-		op->type = R_ANAL_OP_TYPE_OR;
-		break;
-	case UD_Iand:
-		op->type = R_ANAL_OP_TYPE_AND;
-		break;
-	case UD_Isar:
-		op->type = R_ANAL_OP_TYPE_SAR;
-		break;
-	// XXX: sal ?!?
-	case UD_Ishl:
-		op->type = R_ANAL_OP_TYPE_SHL;
-		break;
-	case UD_Ishr:
-		op->type = R_ANAL_OP_TYPE_SHR;
-		break;
-	case UD_Irol:
-		op->type = R_ANAL_OP_TYPE_ROL;
-		break;
-	case UD_Iror:
-		op->type = R_ANAL_OP_TYPE_ROR;
-		break;
-	case UD_Iint1:
-	case UD_Iint3:
-		op->type = R_ANAL_OP_TYPE_TRAP;
-		break;
-	case UD_Iint:
-		op->type = R_ANAL_OP_TYPE_SWI;
-		op->val = u.operand[0].lval.uword;
-		break;
-	case UD_Ilea:
-	case UD_Imov:
-		op->type = R_ANAL_OP_TYPE_MOV;
-		switch (u.operand[0].type) {
-		case UD_OP_MEM:
-			op->refptr = u.operand[0].size/8;
-			switch (u.operand[0].base) {
-			case UD_R_RIP:
-				// Self modifying code? relative local vars
-				// op->type == 9
-				//switch (op->size) {
-				switch (u.operand[0].size) {
-				case  8:
-				case 16:
-				case 32: delta = u.operand[0].lval.udword; break;
-				case 64: delta = u.operand[0].lval.uqword; break;
-				default: delta = u.operand[0].lval.udword; break;
-				}
-				op->ptr = addr + oplen + delta;
-				break;
-			case UD_R_RBP:
-				op->stackop = R_ANAL_STACK_SET;
-				op->ptr = getval (&u.operand[0]); //-(st64)u.operand[0].lval.sbyte; //getval (&u.operand[0]);
-				// op->ptr = (st64)((char)u.operand[0].lval.sbyte); //getval (&u.operand[0]);
-				// if positive = arg
-				// if negative = var
-				break;
-			default:
-				/* nothing to do here yet */
-				op->ptr = getval (&u.operand[1]);
-				break;
-			}
-			break;
-		default:
-			switch (u.operand[1].type) {
-			case UD_OP_MEM:
-				op->refptr = u.operand[1].size /8;
-				switch (u.operand[1].base) {
-				case UD_R_RIP:
-					switch (u.operand[1].size) {
-					case  8:
-					case 16:
-					case 32: delta = u.operand[1].lval.udword; break;
-					case 64: delta = u.operand[1].lval.uqword; break;
-					default: delta = u.operand[1].lval.udword; break;
-					}
-					op->ptr = addr + oplen + delta;
-					break;
-				case UD_R_RBP:
-					op->stackop = R_ANAL_STACK_GET;
-					op->ptr = getval (&u.operand[1]);
-					// op->ptr = (st64)((char)u.operand[1].lval.sbyte); //getval (&u.operand[0]);
-					// if positive = arg
-					// if negative = var
-					break;
-				default:
-					/* nothing to do here yet */
-					op->ptr = getval (&u.operand[1]); //-(st64)u.operand[0].lval.sbyte; //getval (&u.operand[0]);
-					break;
-				}
-				break;
-			default:
-				op->ptr = getval (&u.operand[1]);
-				// XX
-				break;
-			}
-			break;
-		}
-		op->stackptr = regsz;
-		break;
-	case UD_Ipush:
-	case UD_Ipusha:
-	case UD_Ipushad:
-	case UD_Ipushfq:
-	case UD_Ipushfd:
-	case UD_Ipushfw:
-		switch (u.operand[0].type) {
-		case UD_OP_CONST:
-		case UD_OP_JIMM:
-		case UD_OP_IMM:
-			op->type = R_ANAL_OP_TYPE_PUSH;
-			op->ptr = getval (&u.operand[0]);
-			break;
-		case UD_OP_REG:
-		case UD_OP_PTR:
-		case UD_OP_MEM:
-		default:
-			op->type = R_ANAL_OP_TYPE_UPUSH;
-			op->ptr = 0;
-			break;
-		}
-		op->stackop = R_ANAL_STACK_INC;
-		op->stackptr = regsz;
-		break;
-	case UD_Ipop:
-	case UD_Ipopa:
-	case UD_Ipopad:
-	case UD_Ipopfw:
-	case UD_Ipopfd:
-	case UD_Ipopfq:
-		op->type = R_ANAL_OP_TYPE_POP;
-		op->stackop = R_ANAL_STACK_INC;
-		op->stackptr = -regsz;
-		break;
-	case UD_Ileave:
-		op->type = R_ANAL_OP_TYPE_MOV;
-		op->stackop = R_ANAL_STACK_INC;
-		op->stackptr = -regsz;
-		break;
-	case UD_Iadd:
-	case UD_Isub:
-		op->type = (u.mnemonic==UD_Iadd)? R_ANAL_OP_TYPE_ADD: R_ANAL_OP_TYPE_SUB;
-		op->ptr = 0;
-		op->stackptr = 0;
-		if (u.operand[0].type == UD_OP_REG) {
-			if (u.operand[0].base == UD_R_RSP) {
-				int o = (int)getval (&u.operand[1]);
-				op->stackop = R_ANAL_STACK_INC;
-				if (u.mnemonic ==UD_Iadd) {
-					op->stackptr = -o;
-				} else {
-					op->stackptr = o;
-				}
-			}
-			if (u.operand[1].type != UD_OP_REG)
-				op->val = getval (&u.operand[1]);
-		}
-		op->stackptr = 4;
-		break;
-	case UD_Iadc:
-	case UD_Iinc:
-		op->type = R_ANAL_OP_TYPE_ADD;
-		break;
-	case UD_Isbb:
-	case UD_Idec:
-		op->type = R_ANAL_OP_TYPE_SUB;
-		break;
-	case UD_Ijmp:
-		switch (u.operand[0].type) {
-		case UD_OP_MEM:
-			op->ptr = getval (&u.operand[0]);
-			op->type = R_ANAL_OP_TYPE_UJMP;
-			break;
-		case UD_OP_REG:
-			op->type = R_ANAL_OP_TYPE_UJMP;
-			break;
-		default:
-			op->type = R_ANAL_OP_TYPE_JMP;
-			if (u.operand[0].type==UD_OP_PTR) {
-				op->jump = getval (&u.operand[0]);
-			} else {
-				if (anal->bits==16) {
-					// honor segment
-					op->jump = (addr&0xf0000) + oplen + \
-						((((addr&0xffff)+getval (&u.operand[0]))&0xffff));
-				} else {
-					op->jump = addr + oplen + (int)getval (&u.operand[0]);
-				}
-			}
-		}
-		break;
-	case UD_Ije:
-	case UD_Ijne:
-	case UD_Ijb:
-	case UD_Ijbe:
-	case UD_Ija:
-	case UD_Ijae:
-	case UD_Ijs:
-	case UD_Ijns:
-	case UD_Ijo:
-	case UD_Ijno:
-	case UD_Ijp:
-	case UD_Ijnp:
-	case UD_Ijl:
-	case UD_Ijge:
-	case UD_Ijle:
-	case UD_Ijg:
-	case UD_Ijcxz:
-	case UD_Iloop:
-		op->type = R_ANAL_OP_TYPE_CJMP;
-		op->jump = addr + oplen + (int)getval (&u.operand[0]);
-		op->fail = addr+oplen;
-		break;
-	case UD_Icall:
-		op->type = R_ANAL_OP_TYPE_CALL;
-		switch (u.operand[0].type) {
-		case UD_OP_REG:
-			op->type = R_ANAL_OP_TYPE_UCALL;
-			op->jump = 0; // EAX, EBX, ... use anal->reg
-			break;
-		case UD_OP_PTR:
-			op->jump = (int)getval (&u.operand[0]);
-			break;
-		case UD_OP_IMM:
-		case UD_OP_MEM:
-		default:
-			op->jump = addr + oplen + (int)getval (&u.operand[0]);
-		}
-		op->fail = addr + oplen;
-		break;
-	case UD_Ihlt:
-		op->type = R_ANAL_OP_TYPE_TRAP; //HALT;
-		break;
-	case UD_Iin:
-	case UD_Iout:
-		op->type = R_ANAL_OP_TYPE_IO;
-		break;
-	case UD_Iret:
-	case UD_Iiretd:
-	case UD_Iretf:
-	case UD_Isysret:
-		op->type = R_ANAL_OP_TYPE_RET;
-		op->stackop = R_ANAL_STACK_INC;
-		op->stackptr = -regsz;
-		break;
-	case UD_Isyscall:
-		op->type = R_ANAL_OP_TYPE_SWI;
-		break;
-	case UD_Inop:
-		op->type = R_ANAL_OP_TYPE_NOP;
-		break;
-	default:
-		break;
-	}
-	return oplen;
-}
-
-static int set_reg_profile(RAnal *anal) {
-	const char *p = NULL;
-	switch (anal->bits) {
-	case 16: p =
-		"=PC	ip\n"
-		"=SP	sp\n"
-		"=BP	bp\n"
-		"=A0	ax\n"
-		"=A1	bx\n"
-		"=A2	cx\n"
-		"=A3	di\n"
-		"gpr	ip	.16	48	0\n"
-		"gpr	ax	.16	24	0\n"
-		"gpr	ah	.8	24	0\n"
-		"gpr	al	.8	25	0\n"
-		"gpr	bx	.16	0	0\n"
-		"gpr	bh	.8	1	0\n"
-		"gpr	bl	.8	0	0\n"
-		"gpr	cx	.16	4	0\n"
-		"gpr	ch	.8	5	0\n"
-		"gpr	cl	.8	4	0\n"
-		"gpr	dx	.16	8	0\n"
-		"gpr	dh	.8	9	0\n"
-		"gpr	dl	.8	8	0\n"
-		"gpr	sp	.16	60	0\n"
-		"gpr	bp	.16	20	0\n"
-		"gpr	si	.16	12	0\n"
-		"gpr	di	.16	16	0\n"
-		"seg	cs	.16	52	0\n"
-		"gpr	flags	.16	56	0\n"
-		"gpr	cf	.1	.448	0\n"
-		"flg	flag_p	.1	.449	0\n"
-		"flg	flag_a	.1	.450	0\n"
-		"gpr	zf	.1	.451	0\n"
-		"gpr	sf	.1	.452	0\n"
-		"flg	flag_t	.1	.453	0\n"
-		"flg	flag_i	.1	.454	0\n"
-		"flg	flag_d	.1	.455	0\n"
-		"flg	of	.1	.456	0\n"
-		"flg	flag_r	.1	.457	0\n";
-#if 0
-		"drx	dr0	.32	0	0\n"
-		"drx	dr1	.32	4	0\n"
-		"drx	dr2	.32	8	0\n"
-		"drx	dr3	.32	12	0\n"
-		//"drx	dr4	.32	16	0\n"
-		//"drx	dr5	.32	20	0\n"
-		"drx	dr6	.32	24	0\n"
-		"drx	dr7	.32	28	0\n"
-#endif
-		break;
-	case 32: p =
-		"=PC	eip\n"
-		"=SP	esp\n"
-		"=BP	ebp\n"
-		"=A0	eax\n"
-		"=A1	ebx\n"
-		"=A2	ecx\n"
-		"=A3	edi\n"
-		"gpr	eip	.32	48	0\n"
-		"gpr	ip	.16	48	0\n"
-		"gpr	oeax	.32	44	0\n"
-		"gpr	eax	.32	24	0\n"
-		"gpr	ax	.16	24	0\n"
-		"gpr	ah	.8	24	0\n"
-		"gpr	al	.8	25	0\n"
-		"gpr	ebx	.32	0	0\n"
-		"gpr	bx	.16	0	0\n"
-		"gpr	bh	.8	1	0\n"
-		"gpr	bl	.8	0	0\n"
-		"gpr	ecx	.32	4	0\n"
-		"gpr	cx	.16	4	0\n"
-		"gpr	ch	.8	5	0\n"
-		"gpr	cl	.8	4	0\n"
-		"gpr	edx	.32	8	0\n"
-		"gpr	dx	.16	8	0\n"
-		"gpr	dh	.8	9	0\n"
-		"gpr	dl	.8	8	0\n"
-		"gpr	esp	.32	60	0\n"
-		"gpr	sp	.16	60	0\n"
-		"gpr	ebp	.32	20	0\n"
-		"gpr	bp	.16	20	0\n"
-		"gpr	esi	.32	12	0\n"
-		"gpr	si	.16	12	0\n"
-		"gpr	edi	.32	16	0\n"
-		"gpr	di	.16	16	0\n"
-		"seg	xfs	.32	36	0\n"
-		"seg	xgs	.32	40	0\n"
-		"seg	xcs	.32	52	0\n"
-		"seg	cs	.16	52	0\n"
-		"seg	xss	.32	52	0\n"
-		"gpr	eflags	.32	56	0	c1p.a.zstido.n.rv\n"
-		"gpr	flags	.16	56	0\n"
-		"gpr	cf	.1	.448	0\n"
-		"flg	flag_p	.1	.449	0\n"
-		"flg	flag_a	.1	.450	0\n"
-		"gpr	zf	.1	.451	0\n"
-		"gpr	sf	.1	.452	0\n"
-		"flg	flag_t	.1	.453	0\n"
-		"flg	flag_i	.1	.454	0\n"
-		"flg	flag_d	.1	.455	0\n"
-		"flg	of	.1	.456	0\n"
-		"flg	flag_r	.1	.457	0\n"
-		"drx	dr0	.32	0	0\n"
-		"drx	dr1	.32	4	0\n"
-		"drx	dr2	.32	8	0\n"
-		"drx	dr3	.32	12	0\n"
-		//"drx	dr4	.32	16	0\n"
-		//"drx	dr5	.32	20	0\n"
-		"drx	dr6	.32	24	0\n"
-		"drx	dr7	.32	28	0\n";
-		 break;
-	default: p =
-		 "=PC	rip\n"
-		 "=SP	rsp\n"
-		 "=BP	rbp\n"
-		 "=A0	rax\n"
-		 "=A1	rbx\n"
-		 "=A2	rcx\n"
-		 "=A3	rdx\n"
-		 "# no profile defined for x86-64\n"
-		 "gpr	r15	.64	0	0\n"
-		 "gpr	r15d	.32	0	0\n"
-		 "gpr	r15w	.16	0	0\n"
-		 "gpr	r15b	.8	0	0\n"
-		 "gpr	r14	.64	8	0\n"
-		 "gpr	r14d	.32	8	0\n"
-		 "gpr	r14w	.16	8	0\n"
-		 "gpr	r14b	.8	8	0\n"
-		 "gpr	r13	.64	16	0\n"
-		 "gpr	r13d	.32	16	0\n"
-		 "gpr	r13w	.16	16	0\n"
-		 "gpr	r13b	.8	16	0\n"
-		 "gpr	r12	.64	24	0\n"
-		 "gpr	r12d	.32	24	0\n"
-		 "gpr	r12w	.16	24	0\n"
-		 "gpr	r12b	.8	24	0\n"
-		 "gpr	rbp	.64	32	0\n"
-		 "gpr	ebp	.32	32	0\n"
-		 "gpr	bp	.16	32	0\n"
-		 "gpr	bpl	.8	32	0\n"
-		 "gpr	rbx	.64	40	0\n"
-		 "gpr	ebx	.32	40	0\n"
-		 "gpr	bx	.16	40	0\n"
-		 "gpr	bl	.8	40	0\n"
-		 "gpr	r11	.64	48	0\n"
-		 "gpr	r11d	.32	48	0\n"
-		 "gpr	r11w	.16	48	0\n"
-		 "gpr	r11b	.8	48	0\n"
-		 "gpr	r10	.64	56	0\n"
-		 "gpr	r10d	.32	56	0\n"
-		 "gpr	r10w	.16	56	0\n"
-		 "gpr	r10b	.8	56	0\n"
-		 "gpr	r9	.64	64	0\n"
-		 "gpr	r9d	.32	64	0\n"
-		 "gpr	r9w	.16	64	0\n"
-		 "gpr	r9b	.8	64	0\n"
-		 "gpr	r8	.64	72	0\n"
-		 "gpr	r8d	.32	72	0\n"
-		 "gpr	r8w	.16	72	0\n"
-		 "gpr	r8b	.8	72	0\n"
-		 "gpr	rax	.64	80	0\n"
-		 "gpr	eax	.32	80	0\n"
-		 "gpr	ax	.16	80	0\n"
-		 "gpr	al	.8	80	0\n"
-		 "gpr	rcx	.64	88	0\n"
-		 "gpr	ecx	.32	88	0\n"
-		 "gpr	cx	.16	88	0\n"
-		 "gpr	cl	.8	88	0\n"
-		 "gpr	rdx	.64	96	0\n"
-		 "gpr	edx	.32	96	0\n"
-		 "gpr	dx	.16	96	0\n"
-		 "gpr	dl	.8	96	0\n"
-		 "gpr	rsi	.64	104	0\n"
-		 "gpr	esi	.32	104	0\n"
-		 "gpr	si	.16	104	0\n"
-		 "gpr	sil	.8	104	0\n"
-		 "gpr	rdi	.64	112	0\n"
-		 "gpr	edi	.32	112	0\n"
-		 "gpr	di	.16	112	0\n"
-		 "gpr	dil	.8	112	0\n"
-		 "gpr	oeax	.64	120	0\n"
-		 "gpr	rip	.64	128	0\n"
-		 "seg	cs	.64	136	0\n"
-		 //"flg	eflags	.64	144	0\n"
-		 "gpr	eflags	.32	144	0	c1p.a.zstido.n.rv\n"
-		 "gpr	cf	.1	.1152	0\n"
-		 "flg	flag_p	.1	.1153	0\n"
-		 "flg	flag_a	.1	.1154	0\n"
-		 "gpr	zf	.1	.1155	0\n"
-		 "gpr	sf	.1	.1156	0\n"
-		 "flg	flag_t	.1	.1157	0\n"
-		 "flg	flag_i	.1	.1158	0\n"
-		 "flg	flag_d	.1	.1159	0\n"
-		 "flg	of	.1	.1160	0\n"
-		 "flg	flag_r	.1	.1161	0\n"
-		 "gpr	rsp	.64	152	0\n"
-		 "seg	ss	.64	160	0\n"
-		 "seg	fs_base	.64	168	0\n"
-		 "seg	gs_base	.64	176	0\n"
-		 "seg	ds	.64	184	0\n"
-		 "seg	es	.64	192	0\n"
-		 "seg	fs	.64	200	0\n"
-		 "seg	gs	.64	208	0\n"
-		 "drx	dr0	.32	0	0\n"
-		 "drx	dr1	.32	4	0\n"
-		 "drx	dr2	.32	8	0\n"
-		 "drx	dr3	.32	12	0\n"
-		 "drx	dr6	.32	24	0\n"
-		 "drx	dr7	.32	28	0\n";
-		 break;
-	}
-	return r_reg_set_profile_string (anal->reg, p);
-}
-
-RAnalPlugin r_anal_plugin_x86_udis = {
-	.name = "x86.udis",
-	.desc = "X86 analysis plugin (udis86 backend)",
-	.license = "LGPL3",
-	.arch = "x86",
-	.esil = true,
-	.bits = 16|32|64,
-	.op = &x86_udis86_op,
-	.set_reg_profile = &set_reg_profile,
-};
-
-#ifndef CORELIB
-RLibStruct radare_plugin = {
-	.type = R_LIB_TYPE_ANAL,
-	.data = &r_anal_plugin_x86_udis,
-	.version = R2_VERSION
-};
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_xtensa.c radare2-2.8.0+dfsg/libr/anal/p/anal_xtensa.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_xtensa.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_xtensa.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2016 - pancake */
+/* radare2 - LGPL - Copyright 2016-2018 - pancake */
 
 #include <string.h>
 #include <r_types.h>
@@ -11,6 +11,9 @@
 #define CM ","
 #define XTENSA_MAX_LENGTH 8
 
+#if defined(_MSC_VER)
+__declspec(dllimport)
+#endif
 extern xtensa_isa xtensa_default_isa;
 
 static int xtensa_length(const ut8 *insn) {
@@ -20,15 +23,17 @@
 
 static inline ut64 xtensa_offset (ut64 addr, const ut8 *buf) {
 	ut32 offset = ((buf[0] >> 4) & 0xc) | (((ut32)buf[1]) << 4) | (((ut32)buf[2]) << 12);
-	if (offset & 0x80000)
+	if (offset & 0x80000) {
 		return (addr + 4 + offset - 0x100000) & ~3;
+	}
 	return (addr + 4 + offset) & ~3;
 }
 
 static inline ut64 xtensa_imm18s (ut64 addr, const ut8 *buf) {
 	ut32 offset = (buf[0] >> 6) | (((ut32)buf[1]) << 2) | (((ut32)buf[2]) << 10);
-	if (offset & 0x20000)
+	if (offset & 0x20000) {
 		return addr + 4 + offset - 0x40000;
+	}
 	return addr + 4 + offset;
 }
 
@@ -38,15 +43,17 @@
 }
 
 static inline ut64 xtensa_imm8s (ut64 addr, ut8 imm8) {
-	if (imm8 & 0x80)
+	if (imm8 & 0x80) {
 		return (addr + 4 + imm8 - 0x100);
+	}
 	return (addr + 4 + imm8);
 }
 
 static inline ut64 xtensa_imm12s (ut64 addr, const ut8 *buf) {
 	ut16 imm12 = (buf[1] >> 4) | (((ut16)buf[2]) << 4);
-	if (imm12 & 0x800)
+	if (imm12 & 0x800) {
 		return (addr + 4 + imm12 - 0x1000);
+	}
 	return (addr + 4 + imm12);
 }
 
@@ -483,6 +490,7 @@
 static void xtensa_lsai_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf) {
 	xtensa_lsai_fns[(buf[1] >> 4) & 0xf] (anal, op, addr, buf);
 }
+
 static void xtensa_lsci_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf) {
 	ut8 r = buf[1] >> 4;
 	op->family = R_ANAL_OP_FAMILY_FPU;
@@ -495,6 +503,7 @@
 		xtensa_unk_op (anal, op, addr, buf);
 	}
 }
+
 static void xtensa_calln_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf) {
 	op->type = R_ANAL_OP_TYPE_CALL;
 	op->fail = addr + op->size;
@@ -1605,7 +1614,7 @@
 		);
 	}
 
-	r_strbuf_append (&op->esil, "$jt" CM "=");
+	r_strbuf_append (&op->esil, "pc" CM "=");
 }
 
 static void esil_set_shift_amount(xtensa_isa isa, xtensa_opcode opcode,
@@ -1748,7 +1757,171 @@
 	);
 }
 
-static void analop_esil (RAnal *a, RAnalOp *op, ut64 addr, ut8 *buffer, size_t len) {
+static void analop_esil (xtensa_isa isa, xtensa_opcode opcode, xtensa_format format,
+						 size_t i, xtensa_insnbuf slot_buffer, RAnalOp *op) {
+	switch (opcode) {
+	case 26: /* add.n */
+	case 41: /* add */
+	case 43: /* addx2 */
+	case 44: /* addx4 */
+	case 45: /* addx8 */
+	case 42: /* sub */
+	case 46: /* subx2 */
+	case 47: /* subx4 */
+	case 48: /* subx8 */
+		esil_add_sub (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 32: /* mov.n */
+		esil_move (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 90: /* movi */
+	case 33: /* movi.n */
+		esil_move_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 0:  /* excw */
+	case 34: /* nop.n */
+		r_strbuf_setf (&op->esil, "");
+		break;
+	// TODO: s32cli (s32c1i) is conditional (CAS)
+	// should it be handled here?
+	case 453: /* s32c1i */
+	case 36:  /* s32i.n */
+	case 100: /* s32i */
+	case 99:  /* s16i */
+	case 101: /* s8i */
+		esil_store_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 27: /* addi.n */
+	case 39: /* addi */
+		xtensa_check_stack_op (isa, opcode, format, i, slot_buffer, op);
+		esil_add_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 98: /* ret */
+	case 35: /* ret.n */
+		r_strbuf_setf (&op->esil, "a0,pc,=");
+		break;
+	case 82: /* l16ui */
+	case 83: /* l16si */
+	case 84: /* l32i */
+	case 31: /* l32i.n */
+	case 86: /* l8ui */
+		esil_load_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	// TODO: s32r
+	// l32r is different because it is relative to LITBASE
+	// which also may or may not be present
+	case 85: /* l32r */
+		esil_load_relative (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 40: /* addmi */
+		break;
+	case 49: /* and */
+	case 50: /* or */
+	case 51: /* xor */
+		esil_bitwise_op (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 52: /* beqi */
+	case 53: /* bnei */
+	case 54: /* bgei */
+	case 55: /* blti */
+	case 58: /* bgeui */
+	case 59: /* bltui */
+		esil_branch_compare_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 56: /* bbci */
+	case 57: /* bbsi */
+		esil_branch_check_bit_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 60: /* beq */
+	case 61: /* bne */
+	case 62: /* bge */
+	case 63: /* blt */
+	case 64: /* bgeu */
+	case 65: /* bltu */
+		esil_branch_compare (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 66: /* bany */
+	case 67: /* bnone */
+	case 68: /* ball */
+	case 69: /* bnall */
+		esil_branch_check_mask (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 70: /* bbc */
+	case 71: /* bbs */
+		esil_branch_check_bit (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 72: /* beqz */
+	case 73: /* bnez */
+	case 28: /* beqz.n */
+	case 29: /* bnez.n */
+	case 74: /* bgez */
+	case 75: /* bltz */
+		esil_branch_compare_single (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 78: /* extui */
+		esil_extract_unsigned (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 79: /* ill */
+		r_strbuf_setf (&op->esil, "");
+		break;
+	// TODO: windowed calls?
+	case 7: /* call4 */
+		break;
+	case 76: /* call0 */
+	case 80: /* j */
+		esil_call (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 81: /* jx */
+	case 77: /* callx0 */
+		esil_callx (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 91: /* moveqz */
+	case 92: /* movnez */
+	case 93: /* movltz */
+	case 94: /* movgez */
+		esil_move_conditional (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 96: /* abs */
+	case 95: /* neg */
+		esil_abs_neg (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 102: /* ssr */
+	case 103: /* ssl */
+		esil_set_shift_amount (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 111: /* slli */
+	case 113: /* srli */
+		esil_shift_logic_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 106: /* ssai */
+		esil_set_shift_amount_imm (isa, opcode, format, i, slot_buffer, op);
+		break;
+	case 107: /* sll */
+	case 109: /* srl */
+		esil_shift_logic_sar (isa, opcode, format, i, slot_buffer, op);
+		break;
+	}
+}
+
+static int xtensa_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf_original, int len_original) {
+	if (!op)
+		return 1;
+	memset (op, 0, sizeof (RAnalOp));
+	r_strbuf_init (&op->esil);
+
+	op->size = xtensa_length (buf_original);
+	if (op->size > len_original)
+		return 1;
+
+	xtensa_op0_fns[(buf_original[0] & 0xf)] (anal, op, addr, buf_original);
+
+	if (anal->decode) {
+	}
+
+	ut8 buffer[XTENSA_MAX_LENGTH] = { 0 };
+	int len = R_MIN(op->size, XTENSA_MAX_LENGTH);
+	memcpy (buffer, buf_original, len);
+
 	unsigned int i;
 	if (!xtensa_default_isa) {
 		xtensa_default_isa = xtensa_isa_init (0, 0);
@@ -1776,179 +1949,25 @@
 	format = xtensa_format_decode (isa, insn_buffer);
 
 	if (format == XTENSA_UNDEFINED) {
-		return;
+		return op->size;
 	}
 
 	nslots = xtensa_format_num_slots (isa, format);
 	if (nslots < 1) {
-		return;
+		return op->size;
 	}
 
 	for (i = 0; i < nslots; i++) {
 		xtensa_format_get_slot (isa, format, i, insn_buffer, slot_buffer);
 		opcode = xtensa_opcode_decode (isa, format, i, slot_buffer);
 
-		switch (opcode) {
-		case 26: /* add.n */
-		case 41: /* add */
-		case 43: /* addx2 */
-		case 44: /* addx4 */
-		case 45: /* addx8 */
-		case 42: /* sub */
-		case 46: /* subx2 */
-		case 47: /* subx4 */
-		case 48: /* subx8 */
-			esil_add_sub (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 32: /* mov.n */
-			esil_move (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 90: /* movi */
-		case 33: /* movi.n */
-			esil_move_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 0:  /* excw */
-		case 34: /* nop.n */
-			r_strbuf_setf (&op->esil, "");
-			break;
-		// TODO: s32cli (s32c1i) is conditional (CAS)
-		// should it be handled here?
-		case 453: /* s32c1i */
-		case 36:  /* s32i.n */
-		case 100: /* s32i */
-		case 99:  /* s16i */
-		case 101: /* s8i */
-			esil_store_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 27: /* addi.n */
-		case 39: /* addi */
+		if (opcode == 39) { /* addi */
 			xtensa_check_stack_op (isa, opcode, format, i, slot_buffer, op);
-			esil_add_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 98: /* ret */
-		case 35: /* ret.n */
-			r_strbuf_setf (&op->esil, "a0,pc,=");
-			break;
-		case 82: /* l16ui */
-		case 83: /* l16si */
-		case 84: /* l32i */
-		case 31: /* l32i.n */
-		case 86: /* l8ui */
-			esil_load_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		// TODO: s32r
-		// l32r is different because it is relative to LITBASE
-		// which also may or may not be present
-		case 85: /* l32r */
-			esil_load_relative (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 40: /* addmi */
-			break;
-		case 49: /* and */
-		case 50: /* or */
-		case 51: /* xor */
-			esil_bitwise_op (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 52: /* beqi */
-		case 53: /* bnei */
-		case 54: /* bgei */
-		case 55: /* blti */
-		case 58: /* bgeui */
-		case 59: /* bltui */
-			esil_branch_compare_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 56: /* bbci */
-		case 57: /* bbsi */
-			esil_branch_check_bit_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 60: /* beq */
-		case 61: /* bne */
-		case 62: /* bge */
-		case 63: /* blt */
-		case 64: /* bgeu */
-		case 65: /* bltu */
-			esil_branch_compare (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 66: /* bany */
-		case 67: /* bnone */
-		case 68: /* ball */
-		case 69: /* bnall */
-			esil_branch_check_mask (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 70: /* bbc */
-		case 71: /* bbs */
-			esil_branch_check_bit (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 72: /* beqz */
-		case 73: /* bnez */
-		case 28: /* beqz.n */
-		case 29: /* bnez.n */
-		case 74: /* bgez */
-		case 75: /* bltz */
-			esil_branch_compare_single (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 78: /* extui */
-			esil_extract_unsigned (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 79: /* ill */
-			r_strbuf_setf (&op->esil, "");
-			break;
-		// TODO: windowed calls?
-		case 7: /* call4 */
-			break;
-		case 76: /* call0 */
-		case 80: /* j */
-			esil_call (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 81: /* jx */
-		case 77: /* callx0 */
-			esil_callx (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 91: /* moveqz */
-		case 92: /* movnez */
-		case 93: /* movltz */
-		case 94: /* movgez */
-			esil_move_conditional (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 96: /* abs */
-		case 95: /* neg */
-			esil_abs_neg (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 102: /* ssr */
-		case 103: /* ssl */
-			esil_set_shift_amount (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 111: /* slli */
-		case 113: /* srli */
-			esil_shift_logic_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 106: /* ssai */
-			esil_set_shift_amount_imm (isa, opcode, format, i, slot_buffer, op);
-			break;
-		case 107: /* sll */
-		case 109: /* srl */
-			esil_shift_logic_sar (isa, opcode, format, i, slot_buffer, op);
-			break;
 		}
-	}
-}
 
-static int xtensa_op (RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
-	if (!op)
-		return 1;
-	memset (op, 0, sizeof (RAnalOp));
-	r_strbuf_init (&op->esil);
-
-	op->size = xtensa_length (buf);
-	if (op->size > len)
-		return 1;
-
-	xtensa_op0_fns[(buf[0] & 0xf)] (anal, op, addr, buf);
-
-	if (anal->decode) {
-		ut8 copy[XTENSA_MAX_LENGTH] = { 0 };
-		memcpy (copy, buf, R_MIN(op->size, XTENSA_MAX_LENGTH));
-		analop_esil (anal, op, addr, copy, op->size);
+		if (anal->decode) {
+			analop_esil (isa, opcode, format, i, slot_buffer, op);
+		}
 	}
 
 	return op->size;
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/anal_z80.c radare2-2.8.0+dfsg/libr/anal/p/anal_z80.c
--- radare2-2.3.0+dfsg/libr/anal/p/anal_z80.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/anal_z80.c	2018-08-07 14:12:36.000000000 +0000
@@ -8,25 +8,32 @@
 #include <r_anal.h>
 #include "../../asm/arch/z80/z80_tab.h"
 
-static void z80_op_size(const ut8 *data, int *size, int *size_prefix) {
-	int type;
-	switch(data[0]) {
+static void z80_op_size(const ut8 *data, int len, int *size, int *size_prefix) {
+	int type = 0;
+	if (len <1) {
+		return;
+	}
+	switch (data[0]) {
 	case 0xed:
-//		type = dd[data[1]].type;
-		type = ed[data[1]].type;
+		if (len > 1) {
+			int idx = z80_ed_branch_index_res (data[1]);
+			type = ed[idx].type;
+		}
 		break;
 	case 0xcb:
 		type = Z80_OP16;
 		break;
 	case 0xdd:
-		type = dd[data[1]].type;
+		if (len >1) {
+			type = dd[z80_fddd_branch_index_res(data[1])].type;
+		}
 		break;
 	case 0xfd:
-//		type = dd[data[1]].type;
-		type = fd[data[1]].type;
+		if (len > 1) {
+			type = fd[z80_fddd_branch_index_res(data[1])].type;
+		}
 		break;
 	default:
-//		type = dd[data[0]].type;
 		type = z80_op[data[0]].type;
 		break;
 	}
@@ -50,7 +57,7 @@
 
 static int z80_anal_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int len) {
 	int ilen;
-	z80_op_size (data, &ilen, &op->nopcode);
+	z80_op_size (data, len, &ilen, &op->nopcode);
 
 	memset (op, '\0', sizeof (RAnalOp));
 	op->addr = addr;
@@ -232,7 +239,7 @@
 	case 0x30:
 	case 0x38:
 		op->type = R_ANAL_OP_TYPE_CJMP;
-		op->jump = addr + (st8)data[1] + ilen;
+		op->jump = addr + ((len>1)? (st8)data[1]:0) + ilen;
 		op->fail = addr + ilen;
 		break;
 
@@ -246,12 +253,12 @@
 	case 0xf2:
 	case 0xfa:
 		op->type = R_ANAL_OP_TYPE_CJMP;
-		op->jump = data[1] | data[2] << 8;
+		op->jump = (len > 2)? data[1] | data[2] << 8: 0;
 		op->fail = addr + ilen;
 		break;
 	case 0xc3: // jp xx
 		op->type = R_ANAL_OP_TYPE_JMP;
-		op->jump = data[1] | data[2] << 8;
+		op->jump = (len > 2)? data[1] | data[2] << 8: 0;
 		break;
 	case 0xe9: // jp (HL)
 		op->type = R_ANAL_OP_TYPE_UJMP;
@@ -301,7 +308,7 @@
 	case 0xec: // pe
 	case 0xfc: // m
 		op->type = R_ANAL_OP_TYPE_CCALL;
-		op->jump = data[1] | data[2] << 8;
+		op->jump = (len>2)? data[1] | data[2] << 8: 0;
 		op->fail = addr + ilen;
 		break;
 
@@ -404,6 +411,10 @@
 	return r_reg_set_profile_string (anal->reg, p);
 }
 
+static int archinfo(RAnal *anal, int q) {
+	return 1;
+}
+
 RAnalPlugin r_anal_plugin_z80 = {
 	.name = "z80",
 	.arch = "z80",
@@ -411,6 +422,7 @@
 	.bits = 16,
 	.set_reg_profile = &set_reg_profile,
 	.desc = "Z80 CPU code analysis plugin",
+	.archinfo = archinfo,
 	.op = &z80_anal_op,
 };
 
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/esil.h radare2-2.8.0+dfsg/libr/anal/p/esil.h
--- radare2-2.3.0+dfsg/libr/anal/p/esil.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/esil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#ifndef _UDIS86_ESIL_H
-#define _UDIS86_ESIL_H
-
-#include "udis86/extern.h"
-/* This may be useful for other architectures */
-#define esilprintf(op, fmt, ...) r_strbuf_setf (&op->esil, fmt, ##__VA_ARGS__)
-
-#define UDIS86_ESIL_ARGUMENTS const UDis86OPInfo *info, RAnalOp *op, const char *dst, const char *src, const char *src2
-
-typedef struct udis86_op_info {
-	ut64 n;
-	int  bits;
-	ut64 bitmask;
-	int  regsz;
-	int  oplen;
-	const char *pc;
-	const char *sp;
-	const char *bp;
-} UDis86OPInfo;
-
-typedef struct udis86_esil_t {
-        int argc;
-        void (*callback) (UDIS86_ESIL_ARGUMENTS);
-} UDis86Esil;
-
-#define _JOIN(a1, a2) a1 ## a2
-#define JOIN(a1, a2) _JOIN (a1, a2)
-
-#define UDIS86_ESIL_HANDLER(name) JOIN (JOIN (__x86_, name), _to_esil)
-#define UDIS86_ESIL_PROTO(name) void UDIS86_ESIL_HANDLER (name) (UDIS86_ESIL_ARGUMENTS)
-#define UDIS86_ESIL(name, fmt, ...) UDIS86_ESIL_PROTO (name) { esilprintf (op, fmt, ##__VA_ARGS__); }
-
-UDis86Esil *udis86_esil_get_handler (enum ud_mnemonic_code);
-
-#endif /* _UDIS86_ESIL_H */
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/esil_x86_udis.c radare2-2.8.0+dfsg/libr/anal/p/esil_x86_udis.c
--- radare2-2.3.0+dfsg/libr/anal/p/esil_x86_udis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/esil_x86_udis.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,261 +0,0 @@
-/* radare - LGPL - Copyright 2013-2014 - batchdrake */
-
-#include <r_lib.h>
-#include <r_types.h>
-#include <r_anal.h>
-#include <r_util.h>
-
-#include "udis86/types.h"
-#include "udis86/extern.h"
-#include "esil.h"
-
-#define RPN 
-
-RPN UDIS86_ESIL (nop,   ",");
-RPN UDIS86_ESIL (jo,    "of,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jno,   "of,!,?{,%s,%s,}", dst, info->pc);
-RPN UDIS86_ESIL (jb,    "cf,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jae,   "cf,?{,%s,%s,=,}", dst, info->pc);
-
-//  UDIS86_ESIL (je,    "?zf,%s=%s", info->pc, dst);
-RPN UDIS86_ESIL (je,    "zf,?{,%s,%s,=,}", dst, info->pc);
-
-//  UDIS86_ESIL (jne,   "?!zf,%s=%s", info->pc, dst);
-RPN UDIS86_ESIL (jne,   "zf,!,?{,%s,%s,=,}", dst, info->pc);
-
-RPN UDIS86_ESIL (ja,    "cf,!,zf,!,&,?{,%s,%s,}",dst, info->pc);
-RPN UDIS86_ESIL (jbe,   "zf,cf,&,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (js,    "sf,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jns,   "sf,!,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jp,    "pf,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jnp,   "pf,!,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jl,    "of,sf,^,?{,%s,%s,}", dst, info->pc);
-RPN UDIS86_ESIL (jge,   "of,!,sf,^,?{,%s,%s,}", dst, info->pc);
-RPN UDIS86_ESIL (jle,   "of,sf,^,zf,|,%s,%s,=", dst, info->pc);
-RPN UDIS86_ESIL (jg,    "sf,of,!,^,zf,!,&,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jcxz,  "cx,!,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jecxz, "ecx,!,?{,%s,%s,=,}", dst, info->pc);
-RPN UDIS86_ESIL (jrcxz, "rcx,!,?{,%s,%s,=,}", dst, info->pc);
-
-//  UDIS86_ESIL (jmp,   "%s=%s", info->pc, dst);
-RPN UDIS86_ESIL (jmp,   "%s,%s,=", dst, info->pc);
-
-RPN UDIS86_ESIL (call,
-	"%d,%s,+,"
-	"%d,%s,-=,%s,"
-	"=[],"
-	"%s,%s,=",
-	5, info->pc,
-	info->regsz, info->sp, info->sp,
-	dst, info->pc);
-    
-RPN UDIS86_ESIL (hlt, "hlt,TODO");
-RPN UDIS86_ESIL (shl, "%s,%s,<<=,cz,$z,zf,=", src, dst);
-RPN UDIS86_ESIL (shr, "%s,%s,>>=,cz,$z,zf,=", src, dst);
-RPN UDIS86_ESIL (salc, "%s,%s,<<=,$z,zf,=", src, dst);
-RPN UDIS86_ESIL (sar, "%s,%s,>>=,$z,zf,=", src, dst);
-RPN UDIS86_ESIL (rol, "%s,%s,<<<=", src, dst);
-RPN UDIS86_ESIL (ror, "%s,%s,>>>=", src, dst);
-#if 0
-RPN UDIS86_ESIL (rol, "%s,1,<<,%s,&,cf,=,%s,%s,>>=,%s,zf,=", src, dst, src, dst, dst)
-RPN UDIS86_ESIL (ror, "%s,%d,-,1,<<,%s,&,cf,=,%s,%s,>>=,%s,zf,=", src, info->regsz*8, dst, src, dst, dst)
-//  UDIS86_ESIL (rol, "cf=%s&(1<<%s),%s>>=%s,zf=%s==0", dst, src, dst, src, dst);
-    UDIS86_ESIL (ror, "cf=%s&(1<<%d-%s),%s<<<=%s,zf=%s==0", dst, info->regsz * 8, src, dst, src, dst);
-#endif
-//    UDIS86_ESIL (add,   "cf=%s<=-%s&%s!=0,of=!((%s^%s)>>%d)&(((%s+%s)^%s)>>%d),%s+=%s,zf=%s==0,sf=%s>>%d", dst, src, src, dst, src, info->bits - 1, dst, src, src, info->bits - 1, dst, src, dst, dst, info->bits - 1);
-// XXX: this is wrong coz add [rax], al -> al,[rax+0],= ;;; this is not valid esil
-RPN UDIS86_ESIL (add, "%s,%s,+=", src, dst); //cf=%s<=-%s&%s!=0,of=!((%s^%s)>>%d)&(((%s+%s)^%s)>>%d),%s+=%s,zf=%s==0,sf=%s>>%d", dst, src, src, dst, src, info->bits - 1, dst, src, src, info->bits - 1, dst, src, dst, dst, info->bits - 1);
-RPN UDIS86_ESIL (inc, "1,%s,+=,z,$z,zf,=", dst);
-RPN UDIS86_ESIL (dec, "1,%s,-=,$z,zf,=,$o,of,=,$s,sf,=", dst);
-//    UDIS86_ESIL (inc,   "of=(%s^(%s+1))>>%d,%s++,zf=%s==0,sf=%s>>%d", dst, dst, info->bits - 1, dst, dst, dst, info->bits - 1);
-//  UDIS86_ESIL (sub,   "cf=%s<%s,of=!((%s^%s)>>%d)&(((%s+%s)^%s)>>%d),%s-=%s,zf=%s==0,sf=%s>>%d", dst, src, dst, src, info->bits - 1, dst, src, src, info->bits - 1, dst, src, dst, dst, info->bits - 1);
-RPN UDIS86_ESIL (sub,   "%s,%s,-=,$c,cf,=,$z,zf,=,$s,sf,=,$o,of,=", src, dst); // TODO: update flags
-   // UDIS86_ESIL (dec,   "of=(%s^(%s-1))>>%d,%s--,zf=%s==0,sf=%s>>%d", dst, dst, info->bits - 1, dst, dst, dst, info->bits - 1);
-//  UDIS86_ESIL (cmp,   "cf=%s<%s,zf=%s==%s", dst, src, dst, src);
-RPN UDIS86_ESIL (cmp,  "%s,%s,==,$z,zf,=", dst, src);
-//  UDIS86_ESIL (xor,   "%s^=%s,zf=%s==0,sf=%s>>%d,cf=0,of=0", dst, src, dst, dst, info->bits - 1);
-RPN UDIS86_ESIL (xor,   "%s,%s,^=", dst, src);
-//  UDIS86_ESIL (or,    "%s|=%s,zf=%s==0,sf=%s>>%d,cf=0,of=0", dst, src, dst, dst, info->bits - 1);
-RPN UDIS86_ESIL (or,    "%s,%s,|=", src, dst);
-//    UDIS86_ESIL (and,   "%s&=%s,zf=%s==0,sf=%s>>%d,cf=0,of=0", dst, src, dst, dst, info->bits - 1);
-RPN UDIS86_ESIL (and,   "%s,%s,&=", src, dst);
-#if 0
-RPN UDIS86_ESIL (and,   "%s,%s,&=,%s,!,zf,%s,%d,>>,sf,=,0,cf,=,0,of,=",
-			src, dst, dst, dst, info->bits-1);
-#endif
-    // UDIS86_ESIL (test,  "zf=%s&%s==0,sf=%s>>%d,cf=0,of=0", dst, src, dst, info->bits - 1);
-RPN UDIS86_ESIL (test,  "%s,%s,==,$z,zf,=", dst, src);
-
-//  UDIS86_ESIL (syscall, "$");
-RPN UDIS86_ESIL (syscall, "$");
-//  UDIS86_ESIL (int3,  "$3");
-RPN UDIS86_ESIL (int3,  "3,$");
-//  UDIS86_ESIL (int,   "$0x%"PFMT64x, info->n);
-RPN UDIS86_ESIL (int,   "0x%"PFMT64x",$", info->n);
-
-RPN UDIS86_ESIL (lea,   "%s,%s,=", src, dst);
-RPN UDIS86_ESIL (movzx, "%s,%s,=", src, dst); // not working? try 0fb63d55380000
-RPN UDIS86_ESIL (mov,   "%s,%s,=", src, dst);
-//  UDIS86_ESIL (push,  "%s-=%d,%d[%s]=%s", info->sp, info->regsz, info->regsz, info->sp, dst);
-RPN UDIS86_ESIL (push,  "%s,%d,%s,-=,%s,=[%d]", dst, info->regsz, info->sp, info->sp, info->regsz);
-
-//  UDIS86_ESIL (pop,   "%s=%d[%s],%s+=%d", dst, info->regsz, info->sp, info->sp, info->regsz);
-RPN UDIS86_ESIL (pop,   "%s,[%d],%s,=,%d,%s,+=",
-	info->sp, info->regsz, dst, info->regsz, info->sp);
-RPN UDIS86_ESIL (leave, "%s,%s,=,%s,[%d],%s,%d,%s,-=",
-	info->bp, info->sp, info->sp, info->regsz, info->bp, info->regsz, info->sp);
-
-RPN UDIS86_ESIL (ret,   "%s,[%d],%s,=,%d,%s,+=", info->sp, info->regsz, info->pc, info->regsz, info->sp);
-RPN UDIS86_ESIL (iretf,   "%s,[%d],%s,=,%d,%s,+=", info->sp, info->regsz, info->pc, info->regsz, info->sp);
-RPN UDIS86_ESIL (iretd,   "%s,[%d],%s,=,%d,%s,+=", info->sp, info->regsz, info->pc, info->regsz, info->sp);
-
-//    UDIS86_ESIL (xchg,  "%s^=%s,%s^=%s,%s^=%s", dst, src, src, dst, dst, src);
-// TODO: add support for rpnesil tmp regs?
-
-//RPN UDIS86_ESIL (xchg,  "%s,%s,^=,%s,%s,^=,%s,%s,^=", src, dst, src, src, dst, dst);
-RPN UDIS86_ESIL (xchg,  "%s,%s,%s,=,%s,=", dst, src, dst, src);
-    UDIS86_ESIL (xadd,  "%s^=%s,%s^=%s,%s^=%s,cf=%s<=-%s&%s!=0,of=!((%s^%s)>>%d)&(((%s+%s)^%s)>>%d),%s+=%s,zf=%s==0,sf=%s>>%d", dst, src, src, dst, dst, src, dst, src, src, dst, src, info->bits - 1, dst, src, src, info->bits - 1, dst, src, dst, dst, info->bits - 1);
-    UDIS86_ESIL (bt,    "cf=%s&(1<<%d)!=0", dst, (int) info->n);
-    UDIS86_ESIL (btc,   "cf=%s&(1<<%d)!=0,%s^=(1<<%d)",  dst, (int) info->n, dst, (int) info->n);
-    UDIS86_ESIL (bts,   "cf=%s&(1<<%d)!=0,%s|=(1<<%d)",  dst, (int) info->n, dst, (int) info->n);
-    UDIS86_ESIL (btr,   "cf=%s&(1<<%d)!=0,%s&=!(1<<%d)", dst, (int) info->n, dst, (int) info->n);
-//  UDIS86_ESIL (clc,   "cf=0");
-RPN UDIS86_ESIL (clc,   "0,cf,=");
-
-RPN UDIS86_ESIL (sti,   "1,if,="); // interrupt flag
-RPN UDIS86_ESIL (cli,   "0,if,="); // interrupt flag
-//  UDIS86_ESIL (cld,   "df=0");
-RPN UDIS86_ESIL (std,   "1,df,=");
-RPN UDIS86_ESIL (cld,   "0,df,=");
-
-#define IS16 (info->bits==16)
-#define IS32 (info->bits==32)
-#define IS64 (info->bits==64)
-
-#define RSZ (IS32?4:IS64?8:2)
-RPN UDIS86_ESIL (pushad,
-	"%s"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]",
-	IS64? 
-	  "rdi,rsi,rbp,rsp,rbx,rdx,rcx,rax"
-	: "edi,esi,ebp,esp,ebx,edx,ecx,eax",
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp
-	);
-RPN UDIS86_ESIL (pusha,
-	"%s"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]"
-	",$r,%s,-=,%s,=[]",
-	IS64? 
-	  "rdi,rsi,rbp,rsp,rbx,rdx,rcx,rax"
-	: "edi,esi,ebp,esp,ebx,edx,ecx,eax",
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp,
-	info->sp, info->sp
-	);
-
-RPN UDIS86_ESIL (popad,
-	"%s", IS64?
-	"rsp,[],rdi,="
-	",8,rsp,+,[],rsi,="
-	",16,rsp,+,[],rbp,="
-	",24,rsp,+,[],rsp,="
-	",32,rsp,+,[],rbx,="
-	",40,rsp,+,[],rdx,="
-	",48,rsp,+,[],rcx,="
-	",56,rsp,+,[],rax,="
-	",64,rsp,+="
-	:
-	"esp,[],edi,="
-	",4,esp,+,[],esi,="
-	",8,esp,+,[],ebp,="
-	",12,esp,+,[],esp,="
-	",16,esp,+,[],ebx,="
-	",20,esp,+,[],edx,="
-	",24,esp,+,[],ecx,="
-	",28,esp,+,[],eax,="
-	",32,esp,+="
-	);
-RPN UDIS86_ESIL (popa,
-	"%s", IS64?
-	"rsp,[],rdi,="
-	",8,rsp,+,[],rsi,="
-	",16,rsp,+,[],rbp,="
-	",24,rsp,+,[],rsp,="
-	",32,rsp,+,[],rbx,="
-	",40,rsp,+,[],rdx,="
-	",48,rsp,+,[],rcx,="
-	",56,rsp,+,[],rax,="
-	",64,rsp,+="
-	:
-	"esp,[],edi,="
-	",4,esp,+,[],esi,="
-	",8,esp,+,[],ebp,="
-	",12,esp,+,[],esp,="
-	",16,esp,+,[],ebx,="
-	",20,esp,+,[],edx,="
-	",24,esp,+,[],ecx,="
-	",28,esp,+,[],eax,="
-	",32,esp,+="
-	);
-
-RPN UDIS86_ESIL (cmc,   "cf,!=");
-RPN UDIS86_ESIL (into,  "of,?{,4,$,}");
-RPN UDIS86_ESIL (lahf,  "%s,ah,=", info->bits == 16 ? "flags" : (info->bits == 32 ? "eflags" : "rflags"));
-RPN UDIS86_ESIL (loop,  "1,%s,-=,!,?{%s,%s,=,}",
-		info->bits == 16 ? "cx" : IS32 ? "ecx" : "rcx",
-		dst, info->pc);
-RPN UDIS86_ESIL (loope, "1,%s,-=,zf,?{,%s,%s,}",
-		info->bits == 16 ? "cx" : IS32 ? "ecx" : "rcx",
-		dst, info->pc);
-RPN UDIS86_ESIL (loopne, "1,%s,-=,zf,!,?{,%s,%s,}",
-		info->bits == 16 ? "cx" : IS32 ? "ecx" : "rcx",
-		dst, info->pc);
-
-#define OP(args, inst) [JOIN (UD_I, inst)] = {args, UDIS86_ESIL_HANDLER (inst)}
-
-/* This is the fastest way I can think about to implement this list of handlers */
-UDis86Esil udis86_esil_callback_table[ UD_MAX_MNEMONIC_CODE ] = {
-	OP (0, nop),  OP (1, jo),   OP (1, jno), OP (1, jb),   OP (1, jae),
-	OP (1, je),   OP (1, jne),  OP (1, ja),  OP (1, jbe),  OP (1, js),
-	OP (1, jns),  OP (1, jp),   OP (1, jnp), OP (1, jl),   OP (1, jge),
-	OP (1, jle),  OP (1, jg),   OP (1, jcxz),OP (1, jecxz),OP (1, jrcxz),
-	OP (1, jmp),  OP (1, call), OP (2, shl), OP (2, rol),  OP (2, ror),
-	OP (2, add),  OP (1, inc),  OP (2, sub), OP (1, dec),  OP (2, cmp),
-	OP (2, xor),  OP (2, or),   OP (2, and), OP (2, test), OP (0, syscall),
-	OP (1, int),  OP (2, lea),  OP (2, mov), OP (1, push), OP (1, pop),
-	OP (0, leave),OP (0, ret),  OP (2, xchg),OP (2, xadd), OP (2, bt),
-	OP (2, btc),  OP (2, bts),  OP (2, btr), OP (0, clc),  OP (0, cli),
-	OP (0, cld),  OP (0, cmc),  OP (0, int3),OP (0, into), OP (0, lahf),
-	OP (1, loop), OP (1, loope),OP (1, loopne), OP(2,sar), OP (2, salc)
-};
-
-UDis86Esil * udis86_esil_get_handler (enum ud_mnemonic_code code) {
-	if (!udis86_esil_callback_table[code].callback)
-		return NULL;
-	return udis86_esil_callback_table + code;
-}
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/hexagon.mk radare2-2.8.0+dfsg/libr/anal/p/hexagon.mk
--- radare2-2.3.0+dfsg/libr/anal/p/hexagon.mk	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/hexagon.mk	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,16 @@
+OBJ_HEXAGON=anal_hexagon.o
+OBJ_HEXAGON+=../../asm/arch/hexagon/hexagon.o
+OBJ_HEXAGON+=../../asm/arch/hexagon/hexagon_disas.o
+OBJ_HEXAGON+=../../anal/arch/hexagon/hexagon_anal.o
+
+CFLAGS +=-I../asm/arch/hexagon
+CFLAGS +=-I../anal/arch/hexagon
+
+STATIC_OBJ+=${OBJ_HEXAGON}
+TARGET_HEXAGON=anal_hexagon.${EXT_SO}
+
+ALL_TARGETS+=${TARGET_HEXAGON}
+
+${TARGET_HEXAGON}: ${OBJ_HEXAGON}
+	${CC} $(call libname,anal_hexagon) ${LDFLAGS} ${CFLAGS} \
+		-o $(TARGET_HEXAGON) $(OBJ_HEXAGON)
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/Makefile radare2-2.8.0+dfsg/libr/anal/p/Makefile
--- radare2-2.3.0+dfsg/libr/anal/p/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -12,7 +12,7 @@
 
 ALL_TARGETS=
 # TODO: rename to enabled plugins
-ARCHS=null.mk x86_udis.mk ppc_gnu.mk ppc_cs.mk arm_gnu.mk avr.mk xap.mk dalvik.mk sh.mk ebc.mk gb.mk malbolge.mk ws.mk h8300.mk cr16.mk v850.mk msp430.mk sparc_gnu.mk sparc_cs.mk x86_cs.mk cris.mk 6502.mk snes.mk riscv.mk vax.mk xtensa.mk rsp.mk
+ARCHS=null.mk ppc_gnu.mk ppc_cs.mk arm_gnu.mk avr.mk xap.mk dalvik.mk sh.mk ebc.mk gb.mk malbolge.mk ws.mk h8300.mk cr16.mk v850.mk msp430.mk sparc_gnu.mk sparc_cs.mk x86_cs.mk cris.mk 6502.mk snes.mk riscv.mk vax.mk xtensa.mk rsp.mk
 include $(ARCHS)
 
 clean:
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/pic.mk radare2-2.8.0+dfsg/libr/anal/p/pic.mk
--- radare2-2.3.0+dfsg/libr/anal/p/pic.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/pic.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,7 @@
 OBJ_PIC=anal_pic.o
 
 STATIC_OBJ+=$(OBJ_PIC)
+OBJ_PIC+=../../asm/arch/pic/pic_midrange.o
 TARGET_PIC=anal_pic.$(EXT_SO)
 
 ALL_TARTGETS+=$(TARGET_PIC)
diff -Nru radare2-2.3.0+dfsg/libr/anal/p/x86_udis.mk radare2-2.8.0+dfsg/libr/anal/p/x86_udis.mk
--- radare2-2.3.0+dfsg/libr/anal/p/x86_udis.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/p/x86_udis.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-OBJ_X86_UDIS86=anal_x86_udis.o
-OBJ_ESIL_UDIS86=esil_x86_udis.o
-SHARED_X86_UDIS86=../../shlr/udis86/decode.o
-SHARED_X86_UDIS86+=../../shlr/udis86/itab.o
-SHARED_X86_UDIS86+=../../shlr/udis86/syn-att.o
-SHARED_X86_UDIS86+=../../shlr/udis86/syn-intel.o
-SHARED_X86_UDIS86+=../../shlr/udis86/syn.o
-SHARED_X86_UDIS86+=../../shlr/udis86/udis86.o
-
-STATIC_OBJ+=${OBJ_X86_UDIS86} ${OBJ_ESIL_UDIS86}
-SHARED_OBJ+=${SHARED_X86_UDIS86}
-TARGET_X86_UDIS86=anal_x86_udis86.${EXT_SO}
-
-ALL_TARGETS+=${TARGET_X86_UDIS86}
-CFLAGS+=-I../asm/arch/x86/udis86 -I../../asm/arch/x86/udis86 -DHAVE_STRING_H=1
-
-${TARGET_X86_UDIS86}: ${OBJ_X86_UDIS86}
-	${CC} ${CFLAGS} $(call libname,anal_x86) \
-		-o anal_x86_udis.${EXT_SO} ${OBJ_X86_UDIS86}
diff -Nru radare2-2.3.0+dfsg/libr/anal/ref.c radare2-2.8.0+dfsg/libr/anal/ref.c
--- radare2-2.3.0+dfsg/libr/anal/ref.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/ref.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/* radare - LGPL - Copyright 2010-2015 - nibble, pancake */
-
-#include <r_anal.h>
-#include <r_util.h>
-#include <r_list.h>
-
-// This file contains the reversed api for querying xrefs.c which
-// is implemented on top of sdb. Anyway, the sdbization is not
-// complete because there's still r_anal_ref_new() which doesnt
-// serializes with sdb_native
-
-R_API RAnalRef *r_anal_ref_new() {
-	RAnalRef *ref = R_NEW0 (RAnalRef);
-	if (ref) {
-		ref->addr = -1;
-		ref->at = -1;
-		ref->type = R_ANAL_REF_TYPE_CODE;
-	}
-	return ref;
-}
-
-R_API RList *r_anal_ref_list_new() {
-	RList *list = r_list_new ();
-	if (!list) return NULL;
-	list->free = &r_anal_ref_free;
-	return list;
-}
-
-R_API void r_anal_ref_free(void *ref) {
-	free (ref);
-}
-
-R_API int r_anal_ref_add(RAnal *anal, ut64 addr, ut64 at, int type) {
-	r_anal_xrefs_set (anal, type, at, addr);
-	return true;
-}
-
-R_API const char *r_anal_ref_to_string(int type) {
-	switch (type) {
-	case R_ANAL_REF_TYPE_NULL: return "null";
-	case R_ANAL_REF_TYPE_CODE: return "code";
-	case R_ANAL_REF_TYPE_CALL: return "call";
-	case R_ANAL_REF_TYPE_DATA: return "data";
-	case R_ANAL_REF_TYPE_STRING: return "strg";
-	}
-	return "unk";
-}
-
-R_API int r_anal_ref_del(RAnal *anal, ut64 from, ut64 to) {
-#if USE_MHT
-// TODO Must delete from mht_refs too
-	mht *m = anal->mht_xrefs;
-	mhtkv *kv = mht_getr (m, from);
-	if (kv) {
-		mht *ht = kv->u;
-		if (ht) {
-			mht_del (ht, to);
-		}
-	}
-#else
-	r_anal_xrefs_deln (anal, R_ANAL_REF_TYPE_NULL, from, to);
-	r_anal_xrefs_deln (anal, R_ANAL_REF_TYPE_CODE, from, to);
-	r_anal_xrefs_deln (anal, R_ANAL_REF_TYPE_CALL, from, to);
-	r_anal_xrefs_deln (anal, R_ANAL_REF_TYPE_DATA, from, to);
-	r_anal_xrefs_deln (anal, R_ANAL_REF_TYPE_STRING, from, to);
-#endif
-	return true;
-}
-
-R_API RList *r_anal_xref_get(RAnal *anal, ut64 addr) {
-	return r_anal_xrefs_get (anal, addr);
-}
diff -Nru radare2-2.3.0+dfsg/libr/anal/reflines.c radare2-2.8.0+dfsg/libr/anal/reflines.c
--- radare2-2.3.0+dfsg/libr/anal/reflines.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/reflines.c	2018-08-07 14:12:36.000000000 +0000
@@ -131,7 +131,7 @@
 		addr += sz;
 		// This can segfault if opcode length and buffer check fails
 		r_anal_op_fini (&op);
-		sz = r_anal_op (anal, &op, addr, ptr, (int)(end - ptr));
+		sz = r_anal_op (anal, &op, addr, ptr, (int)(end - ptr), R_ANAL_OP_MASK_BASIC);
 		if (sz <= 0) {
 			sz = 1;
 			goto __next;
@@ -394,7 +394,7 @@
 		return NULL;
 	}
 	r_list_foreach (anal->reflines, iter, ref) {
-		if (core->cons && core->cons->breaked) {
+		if (core->cons && core->cons->context->breaked) {
 			r_list_free (lvls);
 			return NULL;
 		}
@@ -405,7 +405,7 @@
 	b = r_buf_new ();
 	r_buf_append_string (b, " ");
 	r_list_foreach (lvls, iter, ref) {
-		if (core->cons && core->cons->breaked) {
+		if (core->cons && core->cons->context->breaked) {
 			r_list_free (lvls);
 			r_buf_free (b);
 			return NULL;
@@ -483,7 +483,7 @@
 	if (core->cons->use_utf8 || opts & R_ANAL_REFLINE_TYPE_UTF8) {
 		str = r_str_replace (str, "<", c->vline[ARROW_LEFT], 1);
 		str = r_str_replace (str, ">", c->vline[ARROW_RIGHT], 1);
-		str = r_str_replace (str, "!", c->vline[LINE_UP], 1);
+		str = r_str_replace (str, ":", c->vline[LINE_UP], 1);
 		str = r_str_replace (str, "|", c->vline[LINE_VERT], 1);
 		str = r_str_replace (str, "=", c->vline[LINE_HORIZ], 1);
 		str = r_str_replace (str, "-", c->vline[LINE_HORIZ], 1);
diff -Nru radare2-2.3.0+dfsg/libr/anal/rtti.c radare2-2.8.0+dfsg/libr/anal/rtti.c
--- radare2-2.3.0+dfsg/libr/anal/rtti.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/rtti.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,117 @@
+/* radare - LGPL - Copyright 2009-2018 - pancake, maijin, thestr4ng3r */
+
+#include "r_anal.h"
+
+R_API void r_anal_rtti_print_at_vtable(RAnal *anal, ut64 addr, int mode) {
+	bool use_json = mode == 'j';
+	if (use_json) {
+		r_cons_print ("[");
+	}
+
+	RVTableContext context;
+	r_anal_vtable_begin (anal, &context);
+	if (context.abi == R_ANAL_CPP_ABI_MSVC) {
+		r_anal_rtti_msvc_print_at_vtable (&context, addr, mode, false);
+	} else {
+		r_anal_rtti_itanium_print_at_vtable (&context, addr, mode);
+	}
+
+	if (use_json) {
+		r_cons_print ("]\n");
+	}
+}
+
+static void rtti_msvc_print_all(RVTableContext *context, int mode) {
+	bool use_json = mode == 'j';
+	if (use_json) {
+		r_cons_print ("[");
+	}
+
+	r_cons_break_push (NULL, NULL);
+	RList *vtables = r_anal_vtable_search (context);
+	RListIter *vtableIter;
+	RVTableInfo *table;
+
+	if (vtables) {
+		bool comma = false;
+		bool success = false;
+		r_list_foreach (vtables, vtableIter, table) {
+			if (r_cons_is_breaked ()) {
+				break;
+			}
+
+			if (use_json && success) {
+				r_cons_print (",");
+				comma = true;
+			}
+			success = r_anal_rtti_msvc_print_at_vtable (context, table->saddr, mode, true);
+			if (success) {
+				comma = false;
+				if (!use_json) {
+					r_cons_print ("\n");
+				}
+			}
+		}
+		if (use_json && !success && comma) {
+			// drop last comma if necessary
+			r_cons_drop (1);
+		}
+	}
+	r_list_free (vtables);
+
+	if (use_json) {
+		r_cons_print ("]\n");
+	}
+
+	r_cons_break_pop ();
+}
+
+static void rtti_itanium_print_all(RVTableContext *context, int mode) {
+	bool use_json = mode == 'j';
+	bool json_first = true;
+	if (use_json) {
+		r_cons_print ("[");
+	}
+
+	r_cons_break_push (NULL, NULL);
+	RList *vtables = r_anal_vtable_search (context);
+	RListIter *vtableIter;
+	RVTableInfo *table;
+
+	if (vtables) {
+		r_list_foreach (vtables, vtableIter, table) {
+			if (r_cons_is_breaked ()) {
+				break;
+			}
+
+			if (use_json) {
+				if (json_first) {
+					json_first = false;
+				} else {
+					r_cons_print (",");
+				}
+			}
+			r_anal_rtti_itanium_print_at_vtable (context, table->saddr, mode);
+			if (!use_json) {
+				r_cons_print ("\n");
+			}
+		}
+	}
+	r_list_free (vtables);
+
+	if (use_json) {
+		r_cons_print ("]\n");
+	}
+
+	r_cons_break_pop ();
+}
+
+R_API void r_anal_rtti_print_all(RAnal *anal, int mode) {
+	RVTableContext context;
+	r_anal_vtable_begin (anal, &context);
+	if (context.abi == R_ANAL_CPP_ABI_MSVC) {
+		rtti_msvc_print_all (&context, mode);
+	} else {
+		rtti_itanium_print_all (&context, mode);
+	}
+}
diff -Nru radare2-2.3.0+dfsg/libr/anal/rtti_itanium.c radare2-2.8.0+dfsg/libr/anal/rtti_itanium.c
--- radare2-2.3.0+dfsg/libr/anal/rtti_itanium.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/rtti_itanium.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,311 @@
+/* radare - LGPL - Copyright 2018 - pancake, r00tus3r */
+
+#include <r_anal.h>
+#include <r_core.h>
+#include <r_flag.h>
+#include <r_cons.h>
+
+#define vmi_class_type_info_name "obj.vtablefor__cxxabiv1::__vmi_class_type_info"
+#define class_type_info_name "obj.vtablefor__cxxabiv1::__class_type_info"
+#define si_class_type_info_name "obj.vtablefor__cxxabiv1::__si_class_type_info"
+
+typedef struct class_type_info_t {
+	ut32 vtable_addr;
+	ut32 name_addr;
+} class_type_info;
+
+typedef struct base_class_type_info_t {
+	ut32 base_class_addr;
+	ut32 flags;
+	enum flags_masks_e {
+		base_is_virtual = 0x1,
+		base_is_public = 0x2
+	} flags_masks;
+} base_class_type_info;
+
+typedef struct si_class_type_info_t {
+	ut32 vtable_addr;
+	ut32 name_addr;
+	ut32 base_class_addr;
+} si_class_type_info;
+
+typedef struct vmi_class_type_info_t {
+	ut32 vtable_addr;
+	ut32 name_addr;
+	int vmi_flags;
+	int vmi_base_count;
+	base_class_type_info *vmi_bases;
+	enum vmi_flags_masks_e {
+		non_diamond_repeat_mask = 0x1,
+		diamond_shaped_mask = 0x2,
+		non_public_base_mask = 0x4,
+		public_base_mask = 0x8
+	} vmi_flags_masks;
+} vmi_class_type_info;
+
+static bool rtti_itanium_read_class_type_info (RVTableContext *context, ut64 addr, class_type_info *cti) {
+	ut64 at;
+	if (addr == UT64_MAX) {
+		return false;
+	}
+	if (!context->read_addr (context->anal, addr, &at)) {
+		return false;
+	}
+	cti->vtable_addr = at;
+	if (!context->read_addr (context->anal, addr + context->word_size, &at)) {
+		return false;
+	}
+	cti->name_addr = at;
+	return true;
+}
+
+static bool rtti_itanium_read_vmi_class_type_info (RVTableContext *context, ut64 addr, vmi_class_type_info *vmi_cti) {
+	ut64 at;
+	if (addr == UT64_MAX) {
+		return false;
+	}
+	if (!context->read_addr (context->anal, addr, &at)) {
+		return false;
+	}
+	vmi_cti->vtable_addr = at;
+	addr += context->word_size;
+	if (!context->read_addr (context->anal, addr, &at)) {
+		return false;
+	}
+	vmi_cti->name_addr = at;
+	addr += context->word_size;
+	if (!context->read_addr (context->anal, addr, &at)) {
+		return false;
+	}
+	vmi_cti->vmi_flags = at;
+	addr += 0x4;
+	if (!context->read_addr (context->anal, addr, &at)) {
+		return false;
+	}
+	if (at < 1) {
+		return false;
+	}
+	vmi_cti->vmi_base_count = at;
+	vmi_cti->vmi_bases = calloc (sizeof (base_class_type_info), vmi_cti->vmi_base_count);
+	ut64 tmp_addr = addr + 0x4;
+
+	int i;
+	for (i = 0; i < vmi_cti->vmi_base_count; i++) {
+		if (!context->read_addr (context->anal, tmp_addr, &at)) {
+			return false;
+		}
+		vmi_cti->vmi_bases[i].base_class_addr = at;
+		tmp_addr += context->word_size;
+		if (!context->read_addr (context->anal, tmp_addr, &at)) {
+			return false;
+		}
+		vmi_cti->vmi_bases[i].flags = at;
+		tmp_addr += context->word_size;
+	}
+	return true;
+}
+
+static bool rtti_itanium_read_si_class_type_info (RVTableContext *context, ut64 addr, si_class_type_info *si_cti) {
+	ut64 at;
+	if (addr == UT64_MAX) {
+		return false;
+	}
+	if (!context->read_addr (context->anal, addr, &at)) {
+		return false;
+	}
+	si_cti->vtable_addr = at;
+	if (!context->read_addr (context->anal, addr + context->word_size, &at)) {
+		return false;
+	}
+	si_cti->name_addr = at;
+	if (!context->read_addr (context->anal, addr + 2 * context->word_size, &at)) {
+		return false;
+	}
+	si_cti->base_class_addr = at;
+	return true;
+}
+
+static void rtti_itanium_print_class_type_info (class_type_info *cti, ut64 addr, const char *prefix) {
+	r_cons_printf ("%sType Info at 0x%08"PFMT64x ":\n"
+			"%s  Reference to RTTI's type class: 0x%08"PFMT32x "\n"
+			"%s  Reference to type's name: 0x%08"PFMT32x "\n",
+			prefix, addr,
+			prefix, cti->vtable_addr,
+			prefix, cti->name_addr);
+}
+
+static void rtti_itanium_print_class_type_info_json (class_type_info *cti, ut64 addr) {
+	r_cons_printf ("{\"type_info\": {\"found_at\":%"PFMT32u",\"ref_to_type_class\":%"PFMT32u","
+			"\"ref_to_type_name\": %"PFMT32u"}}",
+			addr, cti->vtable_addr, cti->name_addr);
+}
+
+static void rtti_itanium_print_vmi_class_type_info (vmi_class_type_info *vmi_cti, ut64 addr, const char *prefix) {
+	r_cons_printf ("%sVMI Type Info at 0x%08"PFMT64x ":\n"
+			"%s  Reference to RTTI's type class: 0x%08"PFMT32x "\n"
+			"%s  Reference to type's name: 0x%08"PFMT32x "\n"
+			"%s  Flags: 0x%x" "\n"
+			"%s  Count of base classes: 0x%x" "\n",
+			prefix, addr,
+			prefix, vmi_cti->vtable_addr,
+			prefix, vmi_cti->name_addr,
+			prefix, vmi_cti->vmi_flags,
+			prefix, vmi_cti->vmi_base_count);
+
+	int i;
+	for (i = 0; i < vmi_cti->vmi_base_count; i++) {
+		r_cons_printf("%s      Base class type descriptor address: 0x%08"PFMT32x "\n"
+				"%s      Base class flags: 0x%x" "\n",
+				prefix, vmi_cti->vmi_bases[i].base_class_addr,
+				prefix, vmi_cti->vmi_bases[i].flags);
+	}
+}
+
+static void rtti_itanium_print_vmi_class_type_info_json (vmi_class_type_info *vmi_cti, ut64 addr) {
+	r_cons_printf ("{\"vmi_type_info\": {\"found_at\":%"PFMT32u",\"ref_to_type_class\":%"PFMT32u","
+			"\"ref_to_type_name\":%"PFMT32u",\"flags\":%"PFMT32d","
+			"\"count_of_base_classes\":%"PFMT32d",",
+			addr, vmi_cti->vtable_addr, vmi_cti->name_addr, vmi_cti->vmi_flags,
+			vmi_cti->vmi_base_count);
+	r_cons_printf ("\"base_classes\":[");
+	int i;
+	for (i = 0; i < vmi_cti->vmi_base_count; i++) {
+		r_cons_printf("{\"type_desc_addr\":%"PFMT32u",\"flags\":%"PFMT32d"}",
+				vmi_cti->vmi_bases[i].base_class_addr,
+				vmi_cti->vmi_bases[i].flags);
+		if (i < vmi_cti->vmi_base_count - 1) {
+			r_cons_printf(",");
+		}
+	}
+	r_cons_printf ("]}}");
+}
+
+static void rtti_itanium_print_si_class_type_info (si_class_type_info *si_cti, ut64 addr, const char *prefix) {
+	r_cons_printf ("%sSI Type Info at 0x%08"PFMT64x ":\n"
+			"%s  Reference to RTTI's type class: 0x%08"PFMT32x "\n"
+			"%s  Reference to type's name: 0x%08"PFMT32x "\n"
+			"%s  Reference to parent's type name: 0x%08"PFMT32x "\n",
+			prefix, addr,
+			prefix, si_cti->vtable_addr,
+			prefix, si_cti->name_addr,
+			prefix, si_cti->base_class_addr);
+}
+
+static void rtti_itanium_print_si_class_type_info_json (si_class_type_info *si_cti, ut64 addr) {
+	r_cons_printf ("{\"si_type_info\": {\"found_at\":%"PFMT32u",\"ref_to_type_class\":%"PFMT32u","
+			"\"ref_to_type_name\": %"PFMT32u",\"ref_to_parent_type_name\":%"PFMT32u"}}",
+			addr, si_cti->vtable_addr, si_cti->name_addr, si_cti->base_class_addr);
+}
+
+R_API void r_anal_rtti_itanium_print_class_type_info(RVTableContext *context, ut64 addr, int mode) {
+	class_type_info cti;
+	if (!rtti_itanium_read_class_type_info (context, addr, &cti)) {
+		eprintf ("Failed to parse Type Info at 0x%08"PFMT64x"\n", addr);
+		return;
+	}
+	if (mode == 'j') {
+		rtti_itanium_print_class_type_info_json (&cti, addr);
+	} else {
+		rtti_itanium_print_class_type_info (&cti, addr, "");
+	}
+}
+
+R_API void r_anal_rtti_itanium_print_si_class_type_info(RVTableContext *context, ut64 addr, int mode) {
+	si_class_type_info si_cti;
+	if (!rtti_itanium_read_si_class_type_info (context, addr, &si_cti)) {
+		eprintf ("Failed to parse Type Info at 0x%08"PFMT64x"\n", addr);
+		return;
+	}
+	if (mode == 'j') {
+		rtti_itanium_print_si_class_type_info_json (&si_cti, addr);
+	} else {
+		rtti_itanium_print_si_class_type_info (&si_cti, addr, "");
+	}
+}
+
+R_API void r_anal_rtti_itanium_print_vmi_class_type_info(RVTableContext *context, ut64 addr, int mode) {
+	vmi_class_type_info vmi_cti;
+	if (!rtti_itanium_read_vmi_class_type_info (context, addr, &vmi_cti)) {
+		eprintf ("Failed to parse Type Info at 0x%08"PFMT64x"\n", addr);
+		return;
+	}
+	if (mode == 'j') {
+		rtti_itanium_print_vmi_class_type_info_json (&vmi_cti, addr);
+	} else {
+		rtti_itanium_print_vmi_class_type_info (&vmi_cti, addr, "");
+	}
+}
+
+static bool rtti_itanium_print_class_type_info_recurse(RVTableContext *context, ut64 atAddress, int mode) {
+	bool use_json = mode == 'j';
+	ut64 colRefAddr = atAddress - context->word_size; //Vtable: Type Info
+	ut64 colAddr; //Type Info
+	ut64 class_type_offset;
+
+	if (!context->read_addr (context->anal, colRefAddr, &colAddr)) {
+		return false;
+	}
+
+	if (!context->read_addr (context->anal, colAddr, &class_type_offset)) {
+		return false;
+	}
+
+	RCore *core = context->anal->coreb.core;
+
+	if (!core) {
+		return false;
+	}
+
+	class_type_offset -= 2 * context->word_size;
+	RFlagItem *flag;
+
+	flag = r_flag_get_i(core->flags, class_type_offset);
+	if (!flag) {
+		eprintf ("No RTTI found\n");
+		return false;
+	}
+
+	if (r_str_cmp (flag->name, vmi_class_type_info_name, r_str_len_utf8 (flag->name))) {
+		vmi_class_type_info vmi_cti;
+		if (!rtti_itanium_read_vmi_class_type_info (context, colAddr, &vmi_cti)) {
+			eprintf ("Failed to parse Type Info at 0x%08"PFMT64x" (referenced from 0x%08"PFMT64x")\n", colAddr, colRefAddr);
+			return false;
+		}
+		if (use_json) {
+			rtti_itanium_print_vmi_class_type_info_json (&vmi_cti, colAddr);
+		} else {
+			rtti_itanium_print_vmi_class_type_info (&vmi_cti, colAddr, "");
+		}
+	}
+
+	if (r_str_cmp (flag->name, si_class_type_info_name, r_str_len_utf8 (flag->name))) {
+		si_class_type_info si_cti;
+		if (!rtti_itanium_read_si_class_type_info (context, colAddr, &si_cti)) {
+			eprintf ("Failed to parse Type Info at 0x%08"PFMT64x" (referenced from 0x%08"PFMT64x")\n", colAddr, colRefAddr);
+			return false;
+		}
+		if (use_json) {
+			rtti_itanium_print_si_class_type_info_json (&si_cti, colAddr);
+		} else {
+			rtti_itanium_print_si_class_type_info (&si_cti, colAddr, "");
+		}
+	}
+
+	if (r_str_cmp (flag->name, class_type_info_name, r_str_len_utf8 (flag->name))) {
+		class_type_info cti;
+		if (!rtti_itanium_read_class_type_info (context, colAddr, &cti)) {
+			eprintf ("Failed to parse Type Info at 0x%08"PFMT64x" (referenced from 0x%08"PFMT64x")\n", colAddr, colRefAddr);
+			return false;
+		}
+		if (use_json) {
+			rtti_itanium_print_class_type_info_json (&cti, colAddr);
+		} else {
+			rtti_itanium_print_class_type_info (&cti, colAddr, "");
+		}
+	}
+	return true;
+}
+
+R_API void r_anal_rtti_itanium_print_at_vtable (RVTableContext *context, ut64 addr, int mode) {
+	rtti_itanium_print_class_type_info_recurse (context, addr, mode);
+}
diff -Nru radare2-2.3.0+dfsg/libr/anal/rtti_msvc.c radare2-2.8.0+dfsg/libr/anal/rtti_msvc.c
--- radare2-2.3.0+dfsg/libr/anal/rtti_msvc.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/rtti_msvc.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,554 @@
+/* radare - LGPL - Copyright 2009-2018 - pancake, maijin, thestr4ng3r */
+
+#include "r_anal.h"
+
+#define NAME_BUF_SIZE    64
+#define BASE_CLASSES_MAX 32
+
+
+typedef struct rtti_complete_object_locator_t {
+	ut32 signature;
+	ut32 vtable_offset;         // offset of the vtable within class
+	ut32 cd_offset;             // constructor displacement offset
+	ut32 type_descriptor_addr;  // only a relative offset for 64bit
+	ut32 class_descriptor_addr; // only a relative offset for 64bit
+	ut32 object_base;           // only for 64bit, see rtti_msvc_read_complete_object_locator()
+} rtti_complete_object_locator;
+
+typedef struct rtti_class_hierarchy_descriptor_t {
+	ut32 signature;
+	ut32 attributes;            // bit 0 set = multiple inheritance, bit 1 set = virtual inheritance
+	ut32 num_base_classes;
+	ut32 base_class_array_addr; // only a relative offset for 64bit
+} rtti_class_hierarchy_descriptor;
+
+typedef struct rtti_base_class_descriptor_t {
+	ut32 type_descriptor_addr;  // only a relative offset for 64bit
+	ut32 num_contained_bases;
+	struct {
+		st32 mdisp;             // member displacement
+		st32 pdisp;             // vbtable displacement
+		st32 vdisp;             // displacement inside vbtable
+	} where;
+	ut32 attributes;
+} rtti_base_class_descriptor;
+
+typedef struct rtti_type_descriptor_t {
+	ut64 vtable_addr;
+	ut64 spare;
+	char *name;
+} rtti_type_descriptor;
+
+static void rtti_type_descriptor_fini(rtti_type_descriptor *td) {
+	free (td->name);
+	td->name = NULL;
+}
+
+static bool rtti_msvc_read_complete_object_locator(RVTableContext *context, ut64 addr, rtti_complete_object_locator *col) {
+	if (addr == UT64_MAX) {
+		return false;
+	}
+
+	ut8 buf[6 * sizeof (ut32)];
+	int colSize = 5 * sizeof (ut32);
+	if (context->word_size == 8) {
+		colSize += sizeof(ut32);
+	}
+	if (colSize > sizeof (buf)) {
+		return false;
+	}
+
+	if (!context->anal->iob.read_at (context->anal->iob.io, addr, buf, colSize)) {
+		return false;
+	}
+
+	ut32 (*read_at_32)(const void *src, size_t offset) = context->anal->big_endian ? r_read_at_be32 : r_read_at_le32;
+	col->signature = read_at_32 (buf, 0);
+	col->vtable_offset = read_at_32 (buf, 4);
+	col->cd_offset = read_at_32 (buf, 8);
+
+	int offsetSize = R_MIN (context->word_size, 4);
+	col->type_descriptor_addr = (ut32) r_read_ble (buf + 12, (bool) context->anal->big_endian, offsetSize * 8);
+	col->class_descriptor_addr = (ut32) r_read_ble (buf + 12 + offsetSize, (bool) context->anal->big_endian, offsetSize * 8);
+	if (context->word_size == 8) {
+		// 64bit is special:
+		// Type Descriptor and Class Hierarchy Descriptor addresses are computed
+		// by 32 bit values *(col+12) + *(col+0x14)
+		// and *(col+16) + *(col+0x14) respectively
+		col->object_base = read_at_32 (buf, 20);
+	} else {
+		col->object_base = 0;
+	}
+
+	return true;
+}
+
+static bool rtti_msvc_read_class_hierarchy_descriptor(RVTableContext *context, ut64 addr, rtti_class_hierarchy_descriptor *chd) {
+	if (addr == UT64_MAX) {
+		return false;
+	}
+
+	ut8 buf[4 * sizeof (ut32)];
+	int chdSize = 3 * sizeof (ut32) + R_MIN (4, context->word_size);
+	if (chdSize > sizeof (buf)) {
+		return false;
+	}
+
+	if (!context->anal->iob.read_at (context->anal->iob.io, addr, buf, chdSize)) {
+		return false;
+	}
+
+	ut32 (*read_at_32)(const void *src, size_t offset) = context->anal->big_endian ? r_read_at_be32 : r_read_at_le32;
+	chd->signature = read_at_32 (buf, 0);
+	chd->attributes = read_at_32 (buf, 4);
+	chd->num_base_classes = read_at_32 (buf, 8);
+	if (context->word_size <= 4) {
+		chd->base_class_array_addr = (ut32) r_read_ble (buf + 12, (bool) context->anal->big_endian, context->word_size * 8);
+	} else {
+		// 64bit is special, like in Complete Object Locator.
+		// Only the offset from the base from Complete Object Locator
+		// is contained in Class Hierarchy Descriptor
+		chd->base_class_array_addr = read_at_32 (buf, 12);
+	}
+	return true;
+}
+
+static ut64 rtti_msvc_base_class_descriptor_size(RVTableContext *context) {
+	return context->word_size + 5 * sizeof (ut32);
+}
+
+static bool rtti_msvc_read_base_class_descriptor(RVTableContext *context, ut64 addr, rtti_base_class_descriptor *bcd) {
+	if (addr == UT64_MAX) {
+		return false;
+	}
+
+	ut8 buf[sizeof (ut64) + 5 * sizeof (ut32)];
+	int bcdSize = (int) rtti_msvc_base_class_descriptor_size (context);
+	if (bcdSize > sizeof (buf)) {
+		return false;
+	}
+
+	if (!context->anal->iob.read_at (context->anal->iob.io, addr, buf, bcdSize)) {
+		return false;
+	}
+
+	ut32 (*read_at_32)(const void *src, size_t offset) = context->anal->big_endian ? r_read_at_be32 : r_read_at_le32;
+	int typeDescriptorAddrSize = R_MIN (context->word_size, 4);
+	bcd->type_descriptor_addr = (ut32) r_read_ble (buf, (bool) context->anal->big_endian, typeDescriptorAddrSize * 8);
+	size_t offset = (size_t) typeDescriptorAddrSize;
+	bcd->num_contained_bases = read_at_32 (buf, offset);
+	bcd->where.mdisp = read_at_32 (buf, offset + sizeof (ut32));
+	bcd->where.pdisp = read_at_32 (buf, offset + 2 * sizeof (ut32));
+	bcd->where.vdisp = read_at_32 (buf, offset + 3 * sizeof (ut32));
+	bcd->attributes = read_at_32 (buf, offset + 4 * sizeof (ut32));
+	return true;
+}
+
+static RList *rtti_msvc_read_base_class_array(RVTableContext *context, ut32 num_base_classes, ut64 base, ut32 offset) {
+	if (base == UT64_MAX || offset == UT32_MAX || num_base_classes == UT32_MAX) {
+		return NULL;
+	}
+
+	RList *ret = r_list_newf (free);
+	if (!ret) {
+		return NULL;
+	}
+
+	ut64 addr = base + offset;
+	ut64 stride = R_MIN (context->word_size, 4);
+
+	if (num_base_classes > BASE_CLASSES_MAX) {
+		eprintf ("WARNING: Length of base class array at 0x%08"PFMT64x" exceeds %d.\n", addr, BASE_CLASSES_MAX);
+		num_base_classes = BASE_CLASSES_MAX;
+	}
+
+	r_cons_break_push (NULL, NULL);
+	while (num_base_classes > 0) {
+		if (r_cons_is_breaked ()) {
+			break;
+		}
+
+		ut64 bcdAddr;
+		if (context->word_size <= 4) {
+			if (!context->read_addr (context->anal, addr, &bcdAddr)) {
+				break;
+			}
+			if (bcdAddr == UT32_MAX) {
+				break;
+			}
+		} else {
+			// special offset calculation for 64bit
+			ut8 tmp[4] = {0};
+			if (!context->anal->iob.read_at(context->anal->iob.io, addr, tmp, 4)) {
+				r_list_free (ret);
+				return NULL;
+			}
+			ut32 (*read_32)(const void *src) = context->anal->big_endian ? r_read_be32 : r_read_le32;
+			ut32 bcdOffset = read_32 (tmp);
+			if (bcdOffset == UT32_MAX) {
+				break;
+			}
+			bcdAddr = base + bcdOffset;
+		}
+
+		rtti_base_class_descriptor *bcd = malloc (sizeof (rtti_base_class_descriptor));
+		if (!bcd) {
+			break;
+		}
+		if (!rtti_msvc_read_base_class_descriptor (context, bcdAddr, bcd)) {
+			free (bcd);
+			break;
+		}
+		r_list_append (ret, bcd);
+		addr += stride;
+		num_base_classes--;
+	}
+	r_cons_break_pop ();
+
+	if (num_base_classes > 0) {
+		// there was an error in the loop above
+		r_list_free (ret);
+		return NULL;
+	}
+
+	return ret;
+}
+
+static bool rtti_msvc_read_type_descriptor(RVTableContext *context, ut64 addr, rtti_type_descriptor *td) {
+	if (addr == UT64_MAX) {
+		return false;
+	}
+
+	if (!context->read_addr (context->anal, addr, &td->vtable_addr)) {
+		return false;
+	}
+	if (!context->read_addr (context->anal, addr + context->word_size, &td->spare)) {
+		return false;
+	}
+
+	ut64 nameAddr = addr + 2 * context->word_size;
+	ut8 buf[NAME_BUF_SIZE];
+	ut64 bufOffset = 0;
+	size_t nameLen = 0;
+	bool endFound = false;
+	bool endInvalid = false;
+	while (1) {
+		context->anal->iob.read_at (context->anal->iob.io, nameAddr + bufOffset, buf, sizeof (buf));
+		int i;
+		for (i=0; i<sizeof (buf); i++) {
+			if (buf[i] == '\0') {
+				endFound = true;
+				break;
+			}
+			if (buf[i] == 0xff) {
+				endInvalid = true;
+				break;
+			}
+			nameLen++;
+		}
+		if (endFound || endInvalid) {
+			break;
+		}
+		bufOffset += sizeof (buf);
+	}
+
+	if (endInvalid) {
+		return false;
+	}
+
+	td->name = malloc (nameLen + 1);
+	if (!td->name) {
+		return false;
+	}
+
+	if (bufOffset == 0) {
+		memcpy (td->name, buf, nameLen + 1);
+	} else {
+		context->anal->iob.read_at (context->anal->iob.io, nameAddr,
+									(ut8 *)td->name, (int) (nameLen + 1));
+	}
+
+	return true;
+}
+
+static void rtti_msvc_print_complete_object_locator(rtti_complete_object_locator *col, ut64 addr, const char *prefix) {
+	r_cons_printf ("%sComplete Object Locator at 0x%08"PFMT64x":\n"
+				   "%s\tsignature: %#x\n"
+				   "%s\tvftableOffset: %#x\n"
+				   "%s\tcdOffset: %#x\n"
+				   "%s\ttypeDescriptorAddr: 0x%08"PFMT32x"\n"
+				   "%s\tclassDescriptorAddr: 0x%08"PFMT32x"\n",
+				   prefix, addr,
+				   prefix, col->signature,
+				   prefix, col->vtable_offset,
+				   prefix, col->cd_offset,
+				   prefix, col->type_descriptor_addr,
+				   prefix, col->class_descriptor_addr);
+	r_cons_printf ("%s\tobjectBase: 0x%08"PFMT32x"\n\n",
+				   prefix, col->object_base);
+}
+
+static void rtti_msvc_print_complete_object_locator_json(rtti_complete_object_locator *col) {
+	r_cons_printf ("{\"signature\":%"PFMT32u",\"vftable_offset\":%"PFMT32u",\"cd_offset\":%"PFMT32u","
+				   "\"type_desc_addr\":%"PFMT32u",\"class_desc_addr\":%"PFMT32u",\"object_base\":%"PFMT32u"}",
+				   col->signature, col->vtable_offset, col->cd_offset, col->type_descriptor_addr,
+				   col->class_descriptor_addr, col->object_base);
+}
+
+static void rtti_msvc_print_type_descriptor(rtti_type_descriptor *td, ut64 addr, const char *prefix) {
+	r_cons_printf ("%sType Descriptor at 0x%08"PFMT64x":\n"
+				   "%s\tvtableAddr: 0x%08"PFMT64x"\n"
+				   "%s\tspare: 0x%08"PFMT64x"\n"
+				   "%s\tname: %s\n\n",
+				   prefix, addr,
+				   prefix, td->vtable_addr,
+				   prefix, td->spare,
+				   prefix, td->name);
+}
+
+static void rtti_msvc_print_type_descriptor_json(rtti_type_descriptor *td) {
+	r_cons_printf ("{\"vtable_addr\":%"PFMT32u",\"spare\":%"PFMT32u",\"name\":\"%s\"}",
+				   td->vtable_addr, td->spare, td->name);
+}
+
+static void rtti_msvc_print_class_hierarchy_descriptor(rtti_class_hierarchy_descriptor *chd, ut64 addr, const char *prefix) {
+	r_cons_printf ("%sClass Hierarchy Descriptor at 0x%08"PFMT64x":\n"
+				   "%s\tsignature: %#x\n"
+				   "%s\tattributes: %#x\n"
+				   "%s\tnumBaseClasses: %#x\n"
+				   "%s\tbaseClassArrayAddr: 0x%08"PFMT32x"\n\n",
+				   prefix, addr,
+				   prefix, chd->signature,
+				   prefix, chd->attributes,
+				   prefix, chd->num_base_classes,
+				   prefix, chd->base_class_array_addr);
+}
+
+static void rtti_msvc_print_class_hierarchy_descriptor_json(rtti_class_hierarchy_descriptor *chd) {
+	r_cons_printf ("{\"signature\":%"PFMT32u",\"attributes\":%"PFMT32u",\"num_base_classes\":%"PFMT32u","
+				   "\"base_class_array_addr\":%"PFMT32u"}",
+				   chd->signature, chd->attributes, chd->num_base_classes, chd->base_class_array_addr);
+}
+
+static void rtti_msvc_print_base_class_descriptor(rtti_base_class_descriptor *bcd, const char *prefix) {
+	r_cons_printf ("%sBase Class Descriptor:\n"
+				   "%s\ttypeDescriptorAddr: 0x%08"PFMT32x"\n"
+				   "%s\tnumContainedBases: %#x\n"
+				   "%s\twhere:\n"
+				   "%s\t\tmdisp: %d\n"
+				   "%s\t\tpdisp: %d\n"
+				   "%s\t\tvdisp: %d\n"
+				   "%s\tattributes: %#x\n\n",
+				   prefix,
+				   prefix, bcd->type_descriptor_addr,
+				   prefix, bcd->num_contained_bases,
+				   prefix,
+				   prefix, bcd->where.mdisp,
+				   prefix, bcd->where.pdisp,
+				   prefix, bcd->where.vdisp,
+				   prefix, bcd->attributes);
+}
+
+static void rtti_msvc_print_base_class_descriptor_json(rtti_base_class_descriptor *bcd) {
+	r_cons_printf ("{\"type_desc_addr\":%"PFMT32u",\"num_contained_bases\":%"PFMT32u","
+				   "\"where\":{\"mdisp\":%"PFMT32d",\"pdisp\":%"PFMT32d",\"vdisp\":%"PFMT32d"},"
+				   "\"attributes\":%"PFMT32u"}",
+				   bcd->type_descriptor_addr, bcd->num_contained_bases,
+				   bcd->where.mdisp, bcd->where.pdisp, bcd->where.vdisp, bcd->attributes);
+}
+
+R_API void r_anal_rtti_msvc_print_complete_object_locator(RVTableContext *context, ut64 addr, int mode) {
+	rtti_complete_object_locator col;
+	if (!rtti_msvc_read_complete_object_locator (context, addr, &col)) {
+		eprintf ("Failed to parse Complete Object Locator at 0x%08"PFMT64x"\n", addr);
+		return;
+	}
+
+	if (mode == 'j') {
+		rtti_msvc_print_complete_object_locator_json (&col);
+	} else {
+		rtti_msvc_print_complete_object_locator (&col, addr, "");
+	}
+}
+
+R_API void r_anal_rtti_msvc_print_type_descriptor(RVTableContext *context, ut64 addr, int mode) {
+	rtti_type_descriptor td = { 0 };
+	if (!rtti_msvc_read_type_descriptor (context, addr, &td)) {
+		eprintf ("Failed to parse Type Descriptor at 0x%08"PFMT64x"\n", addr);
+		return;
+	}
+
+	if (mode == 'j') {
+		rtti_msvc_print_type_descriptor_json (&td);
+	} else {
+		rtti_msvc_print_type_descriptor (&td, addr, "");
+	}
+
+	rtti_type_descriptor_fini (&td);
+}
+
+R_API void r_anal_rtti_msvc_print_class_hierarchy_descriptor(RVTableContext *context, ut64 addr, int mode) {
+	rtti_class_hierarchy_descriptor chd;
+	if (!rtti_msvc_read_class_hierarchy_descriptor (context, addr, &chd)) {
+		eprintf ("Failed to parse Class Hierarchy Descriptor at 0x%08"PFMT64x"\n", addr);
+		return;
+	}
+
+	if (mode == 'j') {
+		rtti_msvc_print_class_hierarchy_descriptor_json (&chd);
+	} else {
+		rtti_msvc_print_class_hierarchy_descriptor (&chd, addr, "");
+	}
+}
+
+R_API void r_anal_rtti_msvc_print_base_class_descriptor(RVTableContext *context, ut64 addr, int mode) {
+	rtti_base_class_descriptor bcd;
+	if (!rtti_msvc_read_base_class_descriptor (context, addr, &bcd)) {
+		eprintf ("Failed to parse Base Class Descriptor at 0x%08"PFMT64x"\n", addr);
+		return;
+	}
+
+	if (mode == 'j') {
+		rtti_msvc_print_base_class_descriptor_json (&bcd);
+	} else {
+		rtti_msvc_print_base_class_descriptor (&bcd, "");
+	}
+}
+
+static bool rtti_msvc_print_complete_object_locator_recurse(RVTableContext *context, ut64 atAddress, int mode, bool strict) {
+	bool use_json = mode == 'j';
+
+	ut64 colRefAddr = atAddress - context->word_size;
+	ut64 colAddr;
+	if (!context->read_addr (context->anal, colRefAddr, &colAddr)) {
+		return false;
+	}
+
+	// complete object locator
+	rtti_complete_object_locator col;
+	if (!rtti_msvc_read_complete_object_locator (context, colAddr, &col)) {
+		if (!strict) {
+			eprintf ("Failed to parse Complete Object Locator at 0x%08"PFMT64x" (referenced from 0x%08"PFMT64x")\n", colAddr, colRefAddr);
+		}
+		return false;
+	}
+
+	// type descriptor
+	ut64 typeDescriptorAddr = col.type_descriptor_addr;
+	if (context->word_size == 8) {
+		typeDescriptorAddr += colAddr - col.object_base;
+	}
+	rtti_type_descriptor td = { 0 };
+	if (!rtti_msvc_read_type_descriptor (context, typeDescriptorAddr, &td)) {
+		if (!strict) {
+			eprintf ("Failed to parse Type Descriptor at 0x%08"PFMT64x"\n", typeDescriptorAddr);
+		}
+		return false;
+	}
+
+	// class hierarchy descriptor
+	ut64 classHierarchyDescriptorAddr = col.class_descriptor_addr;
+	if (context->word_size == 8) {
+		classHierarchyDescriptorAddr += colAddr - col.object_base;
+	}
+	rtti_class_hierarchy_descriptor chd;
+	if (!rtti_msvc_read_class_hierarchy_descriptor (context, classHierarchyDescriptorAddr, &chd)) {
+		if (!strict) {
+			eprintf ("Failed to parse Class Hierarchy Descriptor at 0x%08"PFMT64x"\n", classHierarchyDescriptorAddr);
+		}
+		rtti_type_descriptor_fini (&td);
+		return false;
+	}
+
+	ut64 base = chd.base_class_array_addr;
+	ut32 baseClassArrayOffset = 0;
+	if (context->word_size == 8) {
+		base = colAddr - col.object_base;
+		baseClassArrayOffset = chd.base_class_array_addr;
+	}
+
+	RList *baseClassArray = rtti_msvc_read_base_class_array (context, chd.num_base_classes, base, baseClassArrayOffset);
+	if (!baseClassArray) {
+		if (!strict) {
+			eprintf ("Failed to parse Base Class Array starting at 0x%08"PFMT64x"\n", base + baseClassArrayOffset);
+		}
+		rtti_type_descriptor_fini (&td);
+		return false;
+	}
+
+
+	// print
+	if (use_json) {
+		r_cons_print ("{\"complete_object_locator\":");
+		rtti_msvc_print_complete_object_locator_json (&col);
+		r_cons_print (",\"type_desc\":");
+		rtti_msvc_print_type_descriptor_json (&td);
+		r_cons_print (",\"class_hierarchy_desc\":");
+		rtti_msvc_print_class_hierarchy_descriptor_json (&chd);
+		r_cons_print (",\"base_classes\":[");
+	} else {
+		rtti_msvc_print_complete_object_locator (&col, colAddr, "");
+		rtti_msvc_print_type_descriptor (&td, typeDescriptorAddr, "\t");
+		rtti_msvc_print_class_hierarchy_descriptor (&chd, classHierarchyDescriptorAddr, "\t");
+	}
+
+
+	// base classes
+	bool json_first = true;
+	RListIter *bcdIter;
+	rtti_base_class_descriptor *bcd;
+	r_list_foreach (baseClassArray, bcdIter, bcd) {
+		if (use_json) {
+			if (json_first) {
+				r_cons_print ("{\"desc\":");
+				json_first = false;
+			} else {
+				r_cons_print (",{\"desc\":");
+			}
+		}
+
+		if (use_json) {
+			rtti_msvc_print_base_class_descriptor_json (bcd);
+		} else {
+			rtti_msvc_print_base_class_descriptor (bcd, "\t\t");
+		}
+
+		ut64 baseTypeDescriptorAddr = bcd->type_descriptor_addr;
+		if (context->word_size == 8) {
+			baseTypeDescriptorAddr += colAddr - col.object_base;
+		}
+
+		rtti_type_descriptor btd = { 0 };
+		if (rtti_msvc_read_type_descriptor (context, baseTypeDescriptorAddr, &btd)) {
+			if (use_json) {
+				r_cons_print (",\"type_desc\":");
+				rtti_msvc_print_type_descriptor_json (&btd);
+			} else {
+				rtti_msvc_print_type_descriptor (&btd, baseTypeDescriptorAddr, "\t\t\t");
+			}
+			rtti_type_descriptor_fini (&btd);
+		} else {
+			if (!strict) {
+				eprintf ("Failed to parse Type Descriptor at 0x%08"PFMT64x"\n", baseTypeDescriptorAddr);
+			}
+		}
+
+		if(use_json) {
+			r_cons_print ("}");
+		}
+	}
+	if (use_json) {
+		r_cons_print ("]");
+	}
+
+	if (use_json) {
+		r_cons_print ("}");
+	}
+
+	rtti_type_descriptor_fini (&td);
+	return true;
+}
+
+R_API bool r_anal_rtti_msvc_print_at_vtable(RVTableContext *context, ut64 addr, int mode, bool strict) {
+	return rtti_msvc_print_complete_object_locator_recurse (context, addr, mode, strict);
+}
diff -Nru radare2-2.3.0+dfsg/libr/anal/sign.c radare2-2.8.0+dfsg/libr/anal/sign.c
--- radare2-2.3.0+dfsg/libr/anal/sign.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/sign.c	2018-08-07 14:12:36.000000000 +0000
@@ -1171,7 +1171,7 @@
 		}
 		free (abs);
 	} else {
-		char *home = r_str_home (".config/radare2/zigns/");
+		char *home = r_str_home (R2_HOME_ZIGNS);
 		abs = r_str_newf ("%s%s%s", home, R_SYS_DIR, file);
 		free (home);
 		if (r_file_is_regular (abs)) {
@@ -1180,9 +1180,7 @@
 		free (abs);
 	}
 
-	/// XXX mixed / and R_SYS_DIR
-	const char *pfx = "/share/radare2/" R2_VERSION "/zigns";
-	abs = r_str_newf ("%s%s%s%s", r_sys_prefix (NULL), pfx, R_SYS_DIR, file);
+	abs = r_str_newf (R_JOIN_3_PATHS ("%s", R2_ZIGNS, "%s"), r_sys_prefix (NULL), file);
 	if (r_file_is_regular (abs)) {
 		return abs;
 	}
diff -Nru radare2-2.3.0+dfsg/libr/anal/state.c radare2-2.8.0+dfsg/libr/anal/state.c
--- radare2-2.3.0+dfsg/libr/anal/state.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/state.c	2018-08-07 14:12:36.000000000 +0000
@@ -52,7 +52,7 @@
 	if (!r_anal_state_search_bb (state, bb->addr) && state->current_fcn) {
 		r_list_append (state->current_fcn->bbs, bb);
 		state->bytes_consumed += state->current_bb->op_sz;
-		const char *key = sdb_fmt (0, "0x%08"PFMT64x, bb->addr);
+		const char *key = sdb_fmt ("0x%08"PFMT64x, bb->addr);
 		if (!ht_insert (state->ht, key, bb)) {
 			eprintf ("Inserted bb 0x%04"PFMT64x" failure\n", bb->addr);
 		}
@@ -63,7 +63,7 @@
 	/*
 	 *   Return 0 if no rehash is needed, otherwise return 1
 	 */
-	const char *key = sdb_fmt (0, "0x%08"PFMT64x, addr);
+	const char *key = sdb_fmt ("0x%08"PFMT64x, addr);
 	RAnalBlock *tmp_bb = ht_find (state->ht, key, NULL);
 	return tmp_bb;
 }
diff -Nru radare2-2.3.0+dfsg/libr/anal/switch.c radare2-2.8.0+dfsg/libr/anal/switch.c
--- radare2-2.3.0+dfsg/libr/anal/switch.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/switch.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2014-2016 - pancake, dso */
+/* radare - LGPL - Copyright 2014-2018 - pancake, dso */
 
 #include <r_anal.h>
 
@@ -28,14 +28,16 @@
 }
 
 R_API void r_anal_switch_op_free(RAnalSwitchOp * swop) {
-	if (!swop || (((ut32)(size_t)swop)==UT32_MAX)) {
-		return;
+	if (swop) {
+		r_list_free (swop->cases);
+		free (swop);
 	}
-	r_list_free (swop->cases);
-	free (swop);
 }
 
 R_API RAnalCaseOp* r_anal_switch_op_add_case(RAnalSwitchOp * swop, ut64 addr, ut64 value, ut64 jump) {
+	if (!swop) {
+		return NULL;
+	}
 	RAnalCaseOp * caseop = R_NEW0 (RAnalCaseOp);
 	if (!caseop) {
 		return NULL;
diff -Nru radare2-2.3.0+dfsg/libr/anal/types.c radare2-2.8.0+dfsg/libr/anal/types.c
--- radare2-2.3.0+dfsg/libr/anal/types.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/types.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,457 +0,0 @@
-/* radare - LGPL - Copyright 2013-2016 - pancake, oddcoder */
-
-#include "r_anal.h"
-
-R_API int r_anal_type_set(RAnal *anal, ut64 at, const char *field, ut64 val) {
-	Sdb *DB = anal->sdb_types;
-	const char *kind;
-	char var[128];
-	sprintf (var, "link.%08"PFMT64x, at);
-	kind = sdb_const_get (DB, var, NULL);
-	if (kind) {
-		const char *p = sdb_const_get (DB, kind, NULL);
-		if (p) {
-			snprintf (var, sizeof (var), "%s.%s.%s", p, kind, field);
-			int off = sdb_array_get_num (DB, var, 1, NULL);
-			//int siz = sdb_array_get_num (DB, var, 2, NULL);
-			eprintf ("wv 0x%08"PFMT64x" @ 0x%08"PFMT64x, val, at+off);
-			return true;
-		}
-		eprintf ("Invalid kind of type\n");
-	}
-	return false;
-}
-
-R_API void r_anal_type_del(RAnal *anal, const char *name) {
-	Sdb *db = anal->sdb_types;
-	const char *kind = sdb_const_get (db, name, 0);
-	if (!kind) {
-		return;
-	}
-	if (!strcmp (kind, "type")) {
-		sdb_unset (db, sdb_fmt (-1, "type.%s", name), 0);
-		sdb_unset (db, sdb_fmt (-1, "type.%s.size", name), 0);
-		sdb_unset (db, sdb_fmt (-1, "type.%s.meta", name), 0);
-		sdb_unset (db, name, 0);
-	} else if (!strcmp (kind, "struct") || !strcmp (kind, "union")) {
-		int i, n = sdb_array_length(db, sdb_fmt (-1, "%s.%s", kind, name));
-		char *elements_key = r_str_newf ("%s.%s", kind, name);
-		for (i = 0; i< n; i++) {
-			char *p = sdb_array_get (db, elements_key, i, NULL);
-			sdb_unset (db, sdb_fmt (-1, "%s.%s", elements_key, p), 0);
-			free (p);
-		}
-		sdb_unset (db, elements_key, 0);
-		sdb_unset (db, name, 0);
-		free (elements_key);
-	} else if (!strcmp (kind, "func")) {
-		int i, n = sdb_num_get (db, sdb_fmt(-1, "func.%s.args", name), 0);
-		for (i = 0; i < n; i++) {
-			sdb_unset (db, sdb_fmt(-1, "func.%s.arg.%d", name, i), 0);
-		}
-		sdb_unset (db, sdb_fmt(-1, "func.%s.ret", name), 0);
-		sdb_unset (db, sdb_fmt(-1, "func.%s.cc", name), 0);
-		sdb_unset (db, sdb_fmt(-1, "func.%s.noreturn", name), 0);
-		sdb_unset (db, sdb_fmt(-1, "func.%s.args", name), 0);
-		sdb_unset (db, name, 0);
-	} else if (!strcmp (kind, "enum")) {
-		int i;
-		for (i=0;; i++) {
-			const char *tmp = sdb_const_get (db, sdb_fmt (-1, "%s.0x%x", name, i), 0);
-			if (!tmp) {
-				break;
-			}
-			sdb_unset (db, sdb_fmt (-1, "%s.%s", name, tmp), 0);
-			sdb_unset (db, sdb_fmt (-1, "%s.0x%x", name, i), 0);
-		}
-		sdb_unset (db, name, 0);
-	} else {
-		eprintf ("Unrecognized type \"%s\"\n", kind);
-	}
-}
-
-R_API int r_anal_type_get_size(RAnal *anal, const char *type) {
-	char *query;
-	/* Filter out the structure keyword if type looks like "struct mystruc" */
-	const char *tmptype;
-	if (!strncmp (type, "struct ", 7)) {
-		tmptype = type + 7;
-	} else {
-		tmptype = type;
-	}
-	const char *t = sdb_const_get (anal->sdb_types, tmptype, 0);
-	if (!t) {
-		return 0;
-	}
-	if (!strcmp (t, "type")){
-		query = sdb_fmt (-1, "type.%s.size", tmptype);
-		return sdb_num_get (anal->sdb_types, query, 0);
-	}
-	if (!strcmp (t, "struct")) {
-		query = sdb_fmt (-1, "struct.%s", tmptype);
-		char *members = sdb_get (anal->sdb_types, query, 0);
-		char *next, *ptr = members;
-		int ret = 0;
-		if (members) {
-			do {
-				char *name = sdb_anext (ptr, &next);
-				if (!name) {
-					break;
-				}
-				query = sdb_fmt (-1, "struct.%s.%s", tmptype, name);
-				char *subtype = sdb_get (anal->sdb_types, query, 0);
-				if (!subtype) {
-					break;
-				}
-				char *tmp = strchr (subtype, ',');
-				if (tmp) {
-					*tmp++ = 0;
-					tmp = strchr (tmp, ',');
-					if (tmp) {
-						*tmp++ = 0;
-					}
-					int elements = r_num_math (NULL, tmp);
-					if (elements == 0) {
-						elements = 1;
-					}
-					ret += r_anal_type_get_size (anal, subtype) * elements;
-				}
-				free (subtype);
-				ptr = next;
-			} while (next);
-			free (members);
-		}
-		return ret;
-	}
-	return 0;
-}
-
-// FIXME: Make it recursive
-static int get_types_by_offset(RAnal *anal, RList *offtypes, int offset, const char *k, const char *v) {
-	char buf[256] = {0};
-	//r_cons_printf ("tk %s=%s\n", k, v);
-	// TODO: Add unions support
-	if (!strncmp (v, "struct", 6) && strncmp (k, "struct.", 7)) {
-		char* query = sdb_fmt (-1, "struct.%s", k);
-		char *members = sdb_get (anal->sdb_types, query, 0);
-		char *next, *ptr = members;
-		if (members) {
-			// Search for members, summarize the size
-			int typesize = 0;
-			do {
-				char *name = sdb_anext (ptr, &next);
-				if (!name) {
-					break;
-				}
-				query = sdb_fmt (-1, "struct.%s.%s", k, name);
-				char *subtype = sdb_get (anal->sdb_types, query, 0);
-				if (!subtype) {
-					break;
-				}
-				char *tmp = strchr (subtype, ',');
-				if (tmp) {
-					*tmp++ = 0;
-					tmp = strchr (tmp, ',');
-					if (tmp) {
-						*tmp++ = 0;
-					}
-					// TODO: Go recurse here
-					int elements = r_num_math (NULL, tmp);
-					if (elements == 0) {
-						elements = 1;
-					}
-					// TODO: Handle also alignment, unions, etc
-					// If previous types size matches the offset
-					if ((typesize / 8) == offset) {
-						// Add them in the list
-						buf[0] = '\0';
-						sprintf (buf, "%s.%s", k, name);
-						r_list_append (offtypes, strdup (buf));
-					}
-					typesize += r_anal_type_get_size (anal, subtype) * elements;
-				}
-				free (subtype);
-				ptr = next;
-			} while (next);
-			free (members);
-		}
-	}
-	return 0;
-}
-
-R_API RList* r_anal_type_get_by_offset(RAnal *anal, ut64 offset) {
-	RList *offtypes = r_list_new ();
-	SdbList *ls = sdb_foreach_list (anal->sdb_types, true);
-	SdbListIter *lsi;
-	SdbKv *kv;
-	ls_foreach (ls, lsi, kv) {
-		get_types_by_offset (anal, offtypes, offset, kv->key, kv->value);
-	}
-	ls_free (ls);
-	return offtypes;
-}
-
-R_API char* r_anal_type_to_str (RAnal *a, const char *type) {
-	// convert to C text... maybe that should be in format string..
-	return NULL;
-}
-
-R_API RList *r_anal_type_list_new() {
-	return NULL;
-}
-
-R_API void r_anal_type_header (RAnal *anal, const char *hdr) {
-}
-
-R_API void r_anal_type_define (RAnal *anal, const char *key, const char *value) {
-
-}
-
-R_API int r_anal_type_link(RAnal *anal, const char *type, ut64 addr) {
-	if (sdb_const_get (anal->sdb_types, type, 0)) {
-		char *laddr = r_str_newf ("link.%08"PFMT64x, addr);
-		sdb_set (anal->sdb_types, laddr, type, 0);
-		free (laddr);
-		return true;
-	}
-	// eprintf ("Cannot find type\n");
-	return false;
-}
-
-R_API int r_anal_type_link_offset(RAnal *anal, const char *type, ut64 addr) {
-	if (sdb_const_get (anal->sdb_types, type, 0)) {
-		char *laddr = r_str_newf ("offset.%08"PFMT64x, addr);
-		sdb_set (anal->sdb_types, laddr, type, 0);
-		free (laddr);
-		return true;
-	}
-	// eprintf ("Cannot find type\n");
-	return false;
-}
-
-R_API int r_anal_type_unlink(RAnal *anal, ut64 addr) {
-	char *laddr = sdb_fmt (-1, "link.%08"PFMT64x, addr);
-	sdb_unset (anal->sdb_types, laddr, 0);
-	return true;
-}
-
-static void filter_type(char *t) {
-	for (;*t; t++) {
-		if (*t == ' ') {
-			*t = '_';
-		}
-		// memmove (t, t+1, strlen (t));
-	}
-}
-
-R_API char *r_anal_type_format(RAnal *anal, const char *t) {
-	int n;
-	char *p, var[128], var2[128], var3[128];
-	char *fmt = NULL;
-	char *vars = NULL;
-	Sdb *DB = anal->sdb_types;
-	const char *kind = sdb_const_get (DB, t, NULL);
-	if (!kind) return NULL;
-	// only supports struct atm
-	snprintf (var, sizeof (var), "%s.%s", kind, t);
-	if (!strcmp (kind, "type")) {
-		const char *fmt = sdb_const_get (DB, var, NULL);
-		if (fmt)
-			return strdup (fmt);
-	} else
-	if (!strcmp (kind, "struct")) {
-		// assumes var list is sorted by offset.. should do more checks here
-		for (n = 0; (p = sdb_array_get (DB, var, n, NULL)); n++) {
-			const char *tfmt;
-			char *type;
-			int elements;
-			//int off;
-			//int size;
-			bool isStruct = false;
-			bool isEnum = false;
-			snprintf (var2, sizeof (var2), "%s.%s", var, p);
-			type = sdb_array_get (DB, var2, 0, NULL);
-			if (type) {
-				//off = sdb_array_get_num (DB, var2, 1, NULL);
-				//size = sdb_array_get_num (DB, var2, 2, NULL);
-				if (!strncmp (type, "struct ", 7)) {
-					char* struct_name = type + 7;
-					// TODO: iterate over all the struct fields, and format the format and vars
-					snprintf (var3, sizeof (var3), "struct.%s", struct_name);
-					fmt = r_str_append (fmt, "?");
-					vars = r_str_appendf (vars, "(%s)%s", struct_name, p);
-					vars = r_str_append (vars, " ");
-				} else {
-					elements = sdb_array_get_num (DB, var2, 2, NULL);
-					// special case for char[]. Use char* format type without *
-					if (!strncmp (type, "char", 5) && elements > 0) {
-						tfmt = sdb_const_get (DB, "type.char *", NULL);
-						if (tfmt && *tfmt == '*') {
-							tfmt++;
-						}
-					} else {
-						if (!strncmp (type, "enum ", 5)) {
-							snprintf (var3, sizeof (var3), "%s", type + 5);
-							isEnum = true;
-						} else if (!strncmp (type, "struct ", 7)) {
-							snprintf (var3, sizeof (var3), "%s", type + 7);
-							isStruct = true;
-						} else {
-							snprintf (var3, sizeof (var3), "type.%s", type);
-						}
-						tfmt = sdb_const_get (DB, var3, NULL);
-					}
-					if (tfmt) {
-						filter_type (type);
-						if (elements > 0) {
-							fmt = r_str_appendf (fmt, "[%d]", elements);
-						}
-						if (isStruct) {
-							fmt = r_str_append (fmt, "?");
-							vars = r_str_appendf (vars, "(%s)%s", p, p);
-							vars = r_str_append (vars, " ");
-						} else if (isEnum) {
-							fmt = r_str_append (fmt, "E");
-							vars = r_str_appendf (vars, "(%s)%s", type + 5, p);
-							vars = r_str_append (vars, " ");
-						} else {
-							fmt = r_str_append (fmt, tfmt);
-							vars = r_str_append (vars, p);
-							vars = r_str_append (vars, " ");
-						}
-					} else {
-						eprintf ("Cannot resolve type '%s'\n", var3);
-					}
-				}
-			}
-			free (type);
-			free (p);
-		}
-		fmt = r_str_append (fmt, " ");
-		fmt = r_str_append (fmt, vars);
-		free (vars);
-		return fmt;
-	}
-	return NULL;
-}
-// Function prototypes api
-R_API int r_anal_type_func_exist(RAnal *anal, const char *func_name) {
-	const char *fcn = sdb_const_get (anal->sdb_types, func_name, 0);
-	return fcn && !strcmp (fcn, "func");
-}
-
-R_API const char *r_anal_type_func_ret(RAnal *anal, const char *func_name){
-	const char *query = sdb_fmt (-1, "func.%s.ret", func_name);
-	return sdb_const_get (anal->sdb_types, query, 0);
-}
-
-R_API const char *r_anal_type_func_cc(RAnal *anal, const char *func_name) {
-	const char *query = sdb_fmt (-1, "func.%s.cc", func_name);
-	const char *cc = sdb_const_get (anal->sdb_types, query, 0);
-	return cc ? cc : r_anal_cc_default (anal);
-}
-
-R_API int r_anal_type_func_args_count(RAnal *anal, const char *func_name) {
-	const char *query = sdb_fmt (-1, "func.%s.args", func_name);
-	return sdb_num_get (anal->sdb_types, query, 0);
-}
-
-R_API char *r_anal_type_func_args_type(RAnal *anal, const char *func_name, int i) {
-	const char *query = sdb_fmt (-1, "func.%s.arg.%d", func_name, i);
-	char *ret = sdb_get (anal->sdb_types, query, 0);
-	if (ret) {
-		char *comma = strchr (ret, ',');
-		if (comma) {
-			*comma = 0;
-			return ret;
-		}
-		free (ret);
-	}
-	return NULL;
-}
-
-R_API char *r_anal_type_func_args_name(RAnal *anal, const char *func_name, int i) {
-	const char *query = sdb_fmt (-1, "func.%s.arg.%d", func_name, i);
-	const char *get = sdb_const_get (anal->sdb_types, query, 0);
-	if (get) {
-		char *ret = strchr (get, ',');
-		return ret == 0 ? ret : ret + 1;
-	}
-	return NULL;
-}
-
-#define MIN_MATCH_LEN 4
-
-static char *type_func_try_guess(RAnal *anal, char *name) {
-	const char *res;
-	if (r_str_nlen (name, MIN_MATCH_LEN) < MIN_MATCH_LEN) {
-		return NULL;
-	}
-	if ((res = sdb_const_get (anal->sdb_types, name, NULL))) {
-		bool is_func = res && !strcmp ("func", res);
-		if (is_func) {
-			return strdup (name);
-		}
-	}
-	return NULL;
-}
-
-// TODO:
-// - symbol names are long and noisy, some of them might not be matched due
-//   to additional information added around name
-R_API char *r_anal_type_func_guess(RAnal *anal, char *func_name) {
-	int offset = 0;
-	char *str = func_name;
-	char *result = NULL;
-	char *first, *last;
-	if (!func_name) {
-		return NULL;
-	}
-
-	size_t slen = strlen (str);
-	if (slen < MIN_MATCH_LEN) {
-		return NULL;
-	}
-
-	if (slen > 4) { // were name-matching so ignore autonamed
-		if ((str[0] == 'f' && str[1] == 'c' && str[2] == 'n' && str[3] == '.') ||
-		    (str[0] == 'l' && str[1] == 'o' && str[2] == 'c' && str[3] == '.')) {
-			return NULL;
-		}
-	}
-	// strip r2 prefixes (sym, sym.imp, etc')
-	while (slen > 4 && (offset + 3 < slen) && str[offset + 3] == '.') {
-		offset += 4;
-	}
-	slen -= offset;
-	str += offset;
-	if ((result = type_func_try_guess (anal, str))) {
-		return result;
-	}
-	str = strdup (str);
-	// some names are in format module.dll_function_number, try to remove those
-	// also try module.dll_function and function_number
-	if ((first = strchr (str, '_'))) {
-		last = (char *)r_str_lchr (first, '_');
-		// middle + suffix or right half
-		if ((result = type_func_try_guess (anal, first + 1))) {
-			goto out;
-		}
-		last[0] = 0;
-		// prefix + middle or left
-		if ((result = type_func_try_guess (anal, str))) {
-			goto out;
-		}
-		if (last != first) {
-			// middle
-			if ((result = type_func_try_guess (anal, first + 1))) {
-				goto out;
-			}
-		}
-		result = NULL;
-		goto out;
-	}
-out:
-	free (str);
-	return result;
-}
diff -Nru radare2-2.3.0+dfsg/libr/anal/var.c radare2-2.8.0+dfsg/libr/anal/var.c
--- radare2-2.3.0+dfsg/libr/anal/var.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/var.c	2018-08-07 14:12:36.000000000 +0000
@@ -8,20 +8,20 @@
 #define DB a->sdb_fcns
 
 struct VarType {
-	char kind;
+	bool isarg;
 	char *type;
 	int size;
 	char *name;
 };
 
-#define SDB_VARTYPE_FMT "czdz"
+#define SDB_VARTYPE_FMT "bzdz"
 
 #define EXISTS(x, ...) snprintf (key, sizeof (key) - 1, x, ## __VA_ARGS__), sdb_exists (DB, key)
 #define SETKEY(x, ...) snprintf (key, sizeof (key) - 1, x, ## __VA_ARGS__);
 #define SETKEY2(x, ...) snprintf (key2, sizeof (key) - 1, x, ## __VA_ARGS__);
 #define SETVAL(x, ...) snprintf (val, sizeof (val) - 1, x, ## __VA_ARGS__);
 R_API bool r_anal_var_display(RAnal *anal, int delta, char kind, const char *type) {
-	char *fmt = r_anal_type_format (anal, type);
+	char *fmt = r_type_format (anal->sdb_types, type);
 	RRegItem *i;
 	if (!fmt) {
 		eprintf ("type:%s doesn't exist\n", type);
@@ -68,7 +68,8 @@
 	return true;
 }
 
-R_API bool r_anal_var_add(RAnal *a, ut64 addr, int scope, int delta, char kind, const char *type, int size, const char *name) {
+R_API bool r_anal_var_add(RAnal *a, ut64 addr, int scope, int delta, char kind, const char *type, int size,
+		bool isarg, const char *name) {
 	if (!a) {
 		return false;
 	}
@@ -87,7 +88,7 @@
 		eprintf ("Invalid var kind '%c'\n", kind);
 		return false;
 	}
-	const char *var_def = sdb_fmt (0, "%c,%s,%d,%s", kind, type, size, name);
+	const char *var_def = sdb_fmt ("%d,%s,%d,%s", isarg, type, size, name);
 	if (scope > 0) {
 		const char *sign = "";
 		if (delta < 0) {
@@ -95,28 +96,29 @@
 			sign = "_";
 		}
 		/* local variable */
-		const char *fcn_key = sdb_fmt (1, "fcn.0x%"PFMT64x ".%c", addr, kind);
-		const char *var_key = sdb_fmt (2, "var.0x%"PFMT64x ".%c.%d.%s%d", addr, kind, scope, sign, delta);
-		const char *name_key = sdb_fmt (3, "var.0x%"PFMT64x ".%d.%s", addr, scope, name);
-		const char *shortvar = sdb_fmt (4, "%d.%s%d", scope, sign, delta);
+		const char *fcn_key = sdb_fmt ("fcn.0x%"PFMT64x ".%c", addr, kind);
+		const char *var_key = sdb_fmt ("var.0x%"PFMT64x ".%c.%d.%s%d", addr, kind, scope, sign, delta);
+		const char *name_key = sdb_fmt ("var.0x%"PFMT64x ".%d.%s", addr, scope, name);
+		const char *shortvar = sdb_fmt ("%d.%s%d", scope, sign, delta);
 		sdb_array_add (DB, fcn_key, shortvar, 0);
 		sdb_set (DB, var_key, var_def, 0);
 		if (*sign) {
 			delta = -delta;
 		}
-		const char *name_val = sdb_fmt (5, "%c,%d", kind, delta);
+		char *name_val = r_str_newf ("%c,%d", kind, delta);
 		sdb_set (DB, name_key, name_val, 0);
+		free (name_val);
 	} else {
 		/* global variable */
-		const char *var_global = sdb_fmt (1, "var.0x%"PFMT64x, addr);
-		const char *var_def = sdb_fmt (2, "%c.%s,%d,%s", kind, type, size, name);
+		const char *var_global = sdb_fmt ("var.0x%"PFMT64x, addr);
+		const char *var_def = sdb_fmt ("%c.%s,%d,%s", kind, type, size, name);
 		sdb_array_add (DB, var_global, var_def, 0);
 	}
-// ls_sort (DB->ht->list, mystrcmp);
 	return true;
 }
 
-R_API int r_anal_var_retype(RAnal *a, ut64 addr, int scope, int delta, char kind, const char *type, int size, const char *name) {
+R_API int r_anal_var_retype(RAnal *a, ut64 addr, int scope, int delta, char kind, const char *type, int size, 
+		bool isarg, const char *name) {
 	if (!a) {
 		return false;
 	}
@@ -128,15 +130,14 @@
 	}
 	RAnalFunction *fcn = r_anal_get_fcn_in (a, addr, 0);
 	if (!fcn) {
-		eprintf ("Cant find function here\n");
 		return false;
 	}
-	if (size == -1) {
+	if ((size == -1) && (delta == -1) ) {
 		RList *list = r_anal_var_list (a, fcn, kind);
 		RListIter *iter;
 		RAnalVar *var;
 		r_list_foreach (list, iter, var) {
-			if (delta == -1 && !strcmp (var->name, name)) {
+			if (!strcmp (var->name, name)) {
 				delta = var->delta;
 				size = var->size;
 				break;
@@ -153,15 +154,15 @@
 		eprintf ("Invalid var kind '%c'\n", kind);
 		return false;
 	}
-	const char *var_def = sdb_fmt (0, "%c,%s,%d,%s", kind, type, size, name);
+	const char *var_def = sdb_fmt ("%d,%s,%d,%s", isarg, type, size, name);
 	if (scope > 0) {
-		char *sign = delta> 0? "": "_";
+		char *sign = delta >= 0 ? "": "_";
 		/* local variable */
-		const char *fcn_key = sdb_fmt (1, "fcn.0x%"PFMT64x ".%c", fcn->addr, kind);
-		const char *var_key = sdb_fmt (2, "var.0x%"PFMT64x ".%c.%d.%s%d", fcn->addr, kind, scope, sign, R_ABS(delta));
-		const char *name_key = sdb_fmt (3, "var.0x%"PFMT64x ".%d.%s", fcn->addr, scope, name);
-		const char *shortvar = sdb_fmt (4, "%d.%s%d", scope, sign, R_ABS(delta));
-		const char *name_val = sdb_fmt (5, "%c,%d", kind, delta);
+		const char *fcn_key = sdb_fmt ("fcn.0x%"PFMT64x ".%c", fcn->addr, kind);
+		const char *var_key = sdb_fmt ("var.0x%"PFMT64x ".%c.%d.%s%d", fcn->addr, kind, scope, sign, R_ABS(delta));
+		const char *name_key = sdb_fmt ("var.0x%"PFMT64x ".%d.%s", fcn->addr, scope, name);
+		const char *shortvar = sdb_fmt ("%d.%s%d", scope, sign, R_ABS(delta));
+		const char *name_val = sdb_fmt ("%c,%d", kind, delta);
 		sdb_array_add (DB, fcn_key, shortvar, 0);
 		sdb_set (DB, var_key, var_def, 0);
 		sdb_set (DB, name_key, name_val, 0);
@@ -186,7 +187,7 @@
 		}
 	} else {
 		/* global variable */
-		const char *var_global = sdb_fmt (1, "var.0x%"PFMT64x, fcn->addr);
+		const char *var_global = sdb_fmt ("var.0x%"PFMT64x, fcn->addr);
 		sdb_array_add (DB, var_global, var_def, 0);
 	}
 	return true;
@@ -219,10 +220,10 @@
 			delta = -delta;
 			sign = "_";
 		}
-		char *fcn_key = sdb_fmt (1, "fcn.0x%"PFMT64x ".%c", addr, kind);
-		char *var_key = sdb_fmt (2, "var.0x%"PFMT64x ".%c.%d.%s%d", addr, kind, scope, sign, delta);
-		char *name_key = sdb_fmt (3, "var.0x%"PFMT64x ".%d.%s", addr, scope, av->name);
-		char *shortvar = sdb_fmt (4, "%d.%s%d", scope, sign, delta);
+		char *fcn_key = sdb_fmt ("fcn.0x%"PFMT64x ".%c", addr, kind);
+		char *var_key = sdb_fmt ("var.0x%"PFMT64x ".%c.%d.%s%d", addr, kind, scope, sign, delta);
+		char *name_key = sdb_fmt ("var.0x%"PFMT64x ".%d.%s", addr, scope, av->name);
+		char *shortvar = sdb_fmt ("%d.%s%d", scope, sign, delta);
 		sdb_array_remove (DB, fcn_key, shortvar, 0);
 		sdb_unset (DB, var_key, 0);
 		sdb_unset (DB, name_key, 0);
@@ -230,8 +231,8 @@
 			delta = -delta;
 		}
 	} else {
-		char *var_global = sdb_fmt (1, "var.0x%"PFMT64x, addr);
-		char *var_def = sdb_fmt (2, "%c.%s,%d,%s", kind, av->type, av->size, av->name);
+		char *var_global = sdb_fmt ("var.0x%"PFMT64x, addr);
+		char *var_def = sdb_fmt ("%c.%s,%d,%s", kind, av->type, av->size, av->name);
 		sdb_array_remove (DB, var_global, var_def, 0);
 	}
 	r_anal_var_free (av);
@@ -244,7 +245,7 @@
 	if (!a || !fcn) {
 		return false;
 	}
-	varlist = sdb_get (DB, sdb_fmt (0, "fcn.0x%"PFMT64x ".%c",
+	varlist = sdb_get (DB, sdb_fmt ("fcn.0x%"PFMT64x ".%c",
 			fcn->addr, kind), 0);
 	if (varlist) {
 		char *next, *ptr = varlist;
@@ -252,7 +253,7 @@
 			do {
 				char *word = sdb_anext (ptr, &next);
 				char *sign = strstr (word, "_");
-				const char *vardef = sdb_const_get (DB, sdb_fmt (1,
+				const char *vardef = sdb_const_get (DB, sdb_fmt (
 						"var.0x%"PFMT64x ".%c.%s",
 						fcn->addr, kind, word), 0);
 				if (sign) {
@@ -266,10 +267,9 @@
 						if (p) {
 							p = strchr (p + 1, ',');
 							if (p) {
-								int mykind = vardef[0];
 								if (!strcmp (p + 1, name)) {
 									return r_anal_var_delete (a, fcn->addr,
-										mykind, 1, delta);
+										kind, 1, delta);
 								}
 							}
 						}
@@ -285,23 +285,25 @@
 	return false;
 }
 
-R_API RAnalVar *r_anal_var_get_byname(RAnal *a, RAnalFunction *fcn, const char *name) {
-	if (!fcn || !a || !name) {
+R_API RAnalVar *r_anal_var_get_byname(RAnal *a, ut64 addr, const char *name) {
+	if (!a || !name) {
 		// eprintf ("No something\n");
 		return NULL;
 	}
-	char *name_key = sdb_fmt (-1, "var.0x%"PFMT64x ".%d.%s", fcn->addr, 1, name);
-	const char *name_value = sdb_const_get (DB, name_key, 0);
+	char *name_key = sdb_fmt ("var.0x%"PFMT64x ".%d.%s", addr, 1, name);
+	char *name_value = sdb_get (DB, name_key, 0);
 	if (!name_value) {
 		// eprintf ("Cant find key for %s\n", name_key);
 		return NULL;
 	}
 	const char *comma = strchr (name_value, ',');
-	if (comma) {
+	if (comma && *comma) {
 		int delta = r_num_math (NULL, comma + 1);
-		// eprintf ("Silently failing (%s)\n", name_value);
-		return r_anal_var_get (a, fcn->addr, *name_value, 1, delta);
+		RAnalVar *res = r_anal_var_get (a, addr, *name_value, 1, delta);
+		free (name_value);
+		return res;
 	}
+	free (name_value);
 	return NULL;
 }
 
@@ -319,9 +321,9 @@
 		delta = -delta;
 		sign = "_";
 	}
-	const char *varkey = sdb_fmt (-1, "var.0x%"PFMT64x ".%c.%d.%s%d",
+	const char *varkey = sdb_fmt ("var.0x%"PFMT64x ".%c.%d.%s%d",
 			fcn->addr, kind, scope, sign, delta);
-	const char *vardef = sdb_const_get (DB, varkey, 0);
+	char *vardef = sdb_get (DB, varkey, 0);
 	if (!vardef) {
 		return NULL;
 	}
@@ -330,6 +332,7 @@
 	}
 	sdb_fmt_init (&vt, SDB_VARTYPE_FMT);
 	sdb_fmt_tobin (vardef, SDB_VARTYPE_FMT, &vt);
+	free (vardef);
 
 	av = R_NEW0 (RAnalVar);
 	if (!av) {
@@ -339,6 +342,7 @@
 	av->addr = fcn->addr;
 	av->scope = scope;
 	av->delta = delta;
+	av->isarg = vt.isarg;
 	av->name = vt.name? strdup (vt.name): strdup ("unkown_var");
 	av->size = vt.size;
 	av->type = vt.type? strdup (vt.type): strdup ("unkown_type");
@@ -359,6 +363,25 @@
 	}
 }
 
+R_API ut64 r_anal_var_addr(RAnal *a, RAnalFunction *fcn, const char *name) {
+	const char *regname = NULL;
+	ut64 ret = UT64_MAX;
+	if (!a || !fcn) {
+		return ret;
+	}
+	RAnalVar *v1 = r_anal_var_get_byname (a, fcn->addr, name);
+	if (v1) {
+		if (v1->kind == R_ANAL_VAR_KIND_BPV) {
+			regname = r_reg_get_name (a->reg, R_REG_NAME_BP);
+		} else if (v1->kind == R_ANAL_VAR_KIND_SPV) {
+			regname = r_reg_get_name (a->reg, R_REG_NAME_SP);
+		}
+		ret = r_reg_getv (a->reg, regname) + v1->delta;
+	}
+	r_anal_var_free (v1);
+	return ret;
+}
+
 /* (columns) elements in the array value */
 #define R_ANAL_VAR_SDB_KIND 0 /* char */
 #define R_ANAL_VAR_SDB_TYPE 1 /* string */
@@ -372,19 +395,19 @@
 }
 
 // afvn local_48 counter
-R_API int r_anal_var_rename(RAnal *a, ut64 var_addr, int scope, char kind, const char *old_name, const char *new_name) {
+R_API int r_anal_var_rename(RAnal *a, ut64 addr, int scope, char kind, const char *old_name, const char *new_name, bool verbose) {
 	char key[128], *stored_name;
 	int delta;
 
 	if (!r_anal_var_check_name (new_name)) {
-		// eprintf ("Invalid name\n");
 		return 0;
 	}
-	RAnalFunction *fcn = r_anal_get_fcn_in (a, var_addr, 0);
-	RAnalVar *v1 = r_anal_var_get_byname (a, fcn, new_name);
+	RAnalVar *v1 = r_anal_var_get_byname (a, addr, new_name);
 	if (v1) {
 		r_anal_var_free (v1);
-		eprintf ("variable or arg with name `%s` already exist\n", new_name);
+		if (verbose) {
+			eprintf ("variable or arg with name `%s` already exist\n", new_name);
+		}
 		return false;
 	}
 	// XXX: This is hardcoded because ->kind seems to be 0
@@ -392,60 +415,68 @@
 	// XXX. this is pretty weak, because oldname may not exist  too and error returned.
 	if (scope > 0) { // local
 		const char *sign = "";
-		SETKEY ("var.0x%"PFMT64x ".%d.%s", var_addr, scope, old_name);
+		SETKEY ("var.0x%"PFMT64x ".%d.%s", addr, scope, old_name);
 		char *name_val = sdb_get (DB, key, 0);
+		if (!name_val) {
+			return 0;
+		}
 		char *comma = strchr (name_val, ',');
 		if (comma) {
 			delta = r_num_math (NULL, comma + 1);
 			sdb_unset (DB, key, 0);
-			SETKEY ("var.0x%"PFMT64x ".%d.%s", var_addr, scope, new_name);
+			SETKEY ("var.0x%"PFMT64x ".%d.%s", addr, scope, new_name);
 			sdb_set (DB, key, name_val, 0);
 			free (name_val);
 			if (delta < 0) {
 				delta = -delta;
 				sign = "_";
 			}
-			SETKEY ("var.0x%"PFMT64x ".%c.%d.%s%d", var_addr, kind, scope, sign, delta);
+			SETKEY ("var.0x%"PFMT64x ".%c.%d.%s%d", addr, kind, scope, sign, delta);
 			sdb_array_set (DB, key, R_ANAL_VAR_SDB_NAME, new_name, 0);
 		}
 	} else { // global
-		SETKEY ("var.0x%"PFMT64x, var_addr);
+		SETKEY ("var.0x%"PFMT64x, addr);
 		stored_name = sdb_array_get (DB, key, R_ANAL_VAR_SDB_NAME, 0);
 		if (!stored_name) {
-			eprintf ("Cannot find key in storage.\n");
 			return 0;
 		}
 		if (!old_name) {
 			old_name = stored_name;
 		} else if (strcmp (stored_name, old_name)) {
-			eprintf ("Old name missmatch %s vs %s.\n", stored_name, old_name);
 			return 0;
 		}
 		sdb_unset (DB, key, 0);
-		SETKEY ("var.0x%"PFMT64x, var_addr);
+		SETKEY ("var.0x%"PFMT64x, addr);
 		sdb_array_set (DB, key, R_ANAL_VAR_SDB_NAME, new_name, 0);
 	}
-	// var.sdb_hash(old_name)=var_addr.scope.delta
 	return 1;
 }
 
+// Used for linking reg based arg and local-var like "mov [local_8h], rsi"
+static void r_anal_var_link (RAnal *a, ut64 addr, RAnalVar *var) {
+	const char *inst_key = sdb_fmt ("inst.0x%"PFMT64x ".lvar", addr);
+	const char *var_def = sdb_fmt ("0x%"PFMT64x ",%c,0x%x,0x%x", var->addr,
+			var->kind, var->scope, var->delta);
+	sdb_set (DB, inst_key, var_def, 0);
+}
+
 // avr
 R_API int r_anal_var_access(RAnal *a, ut64 var_addr, char kind, int scope, int delta, int xs_type, ut64 xs_addr) {
 	const char *var_global;
 	const char *xs_type_str = xs_type? "writes": "reads";
 	// TODO: kind is not used
 	if (scope > 0) { // local
-		const char *var_local = sdb_fmt (0, "var.0x%"PFMT64x ".%d.%d.%s",
+		const char *var_local = sdb_fmt ("var.0x%"PFMT64x ".%d.%d.%s",
 			var_addr, scope, delta, xs_type_str);
-		const char *inst_key = sdb_fmt (1, "inst.0x%"PFMT64x ".vars", xs_addr);
-		const char *var_def = sdb_fmt (2, "0x%"PFMT64x ",%c,0x%x,0x%x", var_addr,
+		const char *inst_key = sdb_fmt ("inst.0x%"PFMT64x ".vars", xs_addr);
+		const char *var_def = sdb_fmt ("0x%"PFMT64x ",%c,0x%x,0x%x", var_addr,
 			kind, scope, delta);
 		sdb_set (DB, inst_key, var_def, 0);
 		return sdb_array_add_num (DB, var_local, xs_addr, 0);
 	}
 	// global
-	sdb_add (DB, sdb_fmt (0, "var.0x%"PFMT64x, var_addr), "a,", 0);
-	var_global = sdb_fmt (0, "var.0x%"PFMT64x ".%s", var_addr, xs_type_str);
+	sdb_add (DB, sdb_fmt ("var.0x%"PFMT64x, var_addr), "a,", 0);
+	var_global = sdb_fmt ("var.0x%"PFMT64x ".%s", var_addr, xs_type_str);
 	return sdb_array_add_num (DB, var_global, xs_addr, 0);
 }
 
@@ -489,7 +520,7 @@
 			count[1]++;
 			continue;
 		}
-		count[(kind == R_ANAL_VAR_KIND_BPV && var->delta > 0) || (kind == R_ANAL_VAR_KIND_SPV && var->delta > fcn->maxstack)]++;
+		count[var->isarg]++;
 	}
 	r_list_free (list);
 	return count[type];
@@ -508,7 +539,7 @@
 			char *field_type = sdb_array_get (TDB, field_key, 0, NULL);
 			ut64 field_offset = sdb_array_get_num (TDB, field_key, 1, NULL);
 			int field_count = sdb_array_get_num (TDB, field_key, 2, NULL);
-			int field_size = r_anal_type_get_size (a, field_type) * (field_count? field_count: 1);
+			int field_size = r_type_get_bitsize (TDB, field_type) * (field_count? field_count: 1);
 			new_name = r_str_newf ( "%s.%s", base_name, field_name);
 			if (field_offset == 0) {
 				free (av->name);
@@ -535,6 +566,165 @@
 	}
 }
 
+#define VARPREFIX "local"
+#define ARGPREFIX "arg"
+
+//Variable recovery functions
+static char *get_varname(RAnal *a, RAnalFunction *fcn, char type, const char *pfx, int idx) {
+	char *varname = r_str_newf ("%s_%xh", pfx, idx);
+	int i = 2;
+	char v_kind;
+	int v_delta = 0;
+	while (1) {
+		char *name_key = sdb_fmt ("var.0x%"PFMT64x ".%d.%s", fcn->addr, 1, varname);
+		char *name_value = sdb_get (a->sdb_fcns, name_key, 0);
+		if (!name_value) {
+			break;
+		}
+		const char *comma = strchr (name_value, ',');
+		if (comma && *comma) {
+			v_delta = r_num_math (NULL, comma + 1);
+			v_kind = *name_value;
+		}
+		if (v_kind == type && R_ABS (v_delta) == idx) {
+			free (name_value);
+			return varname;
+		}
+		free (varname);
+		free (name_value);
+		varname = r_str_newf ("%s_%xh_%d", pfx, idx, i);
+		i++;
+	}
+	return varname;
+}
+
+static const char *get_regname(RAnal *anal, RAnalValue *value) {
+	const char *name = NULL;
+	if (value && value->reg && value->reg->name) {
+		name = value->reg->name;
+		RRegItem *ri = r_reg_get (anal->reg, value->reg->name, -1);
+		if (ri && (ri->size == 32) && (anal->bits == 64)) {
+			name = r_reg_32_to_64 (anal->reg, value->reg->name);
+		}
+	}
+	return name;
+}
+
+static void extract_arg(RAnal *anal, RAnalFunction *fcn, RAnalOp *op, const char *reg, const char *sign, char type) {
+	char sigstr[16] = {0};
+	st64 ptr;
+	char *addr;
+	if (!anal || !fcn || !op) {
+		return;
+	}
+	snprintf (sigstr, sizeof (sigstr), ",%s,%s", reg, sign);
+	const char *op_esil = r_strbuf_get (&op->esil);
+	if (!op_esil) {
+		return;
+	}
+	char *esil_buf = strdup (op_esil);
+	if (!esil_buf) {
+		return;
+	}
+	char *ptr_end = strstr (esil_buf, sigstr);
+	if (!ptr_end) {
+		free (esil_buf);
+		return;
+	}
+	*ptr_end = 0;
+	addr = ptr_end;
+	while ((addr[0] != '0' || addr[1] != 'x') && addr >= esil_buf + 1 && *addr != ',') {
+		addr--;
+	}
+	if (strncmp (addr, "0x", 2)) {
+		//XXX: This is a workaround for inconsistent esil
+		if ((op->stackop == R_ANAL_STACK_SET) || (op->stackop == R_ANAL_STACK_GET)) {
+			ptr = R_ABS (op->ptr);
+			if (ptr%4) {
+				goto beach;
+			}
+		} else {
+			goto beach;
+		}
+	} else {
+		ptr = (st64) r_num_get (NULL, addr);
+	}
+	int rw = (op->direction == R_ANAL_OP_DIR_WRITE) ? 1 : 0;
+	if (*sign == '+') {
+		const char *pfx = ((ptr < fcn->maxstack) && (type == 's')) ? VARPREFIX : ARGPREFIX;
+		bool isarg = strcmp(pfx , ARGPREFIX) ? false : true;
+		char *varname = get_varname (anal, fcn, type, pfx, R_ABS (ptr));
+		r_anal_var_add (anal, fcn->addr, 1, ptr, type, NULL, anal->bits / 8, isarg, varname);
+		r_anal_var_access (anal, fcn->addr, type, 1, ptr, rw, op->addr);
+		free (varname);
+	} else {
+		char *varname = get_varname (anal, fcn, type, VARPREFIX, R_ABS (ptr));
+		r_anal_var_add (anal, fcn->addr, 1, -ptr, type, NULL, anal->bits / 8, 0, varname);
+		r_anal_var_access (anal, fcn->addr, type, 1, -ptr, rw, op->addr);
+		free (varname);
+	}
+beach:
+	free (esil_buf);
+}
+
+R_API void extract_rarg(RAnal *anal, RAnalOp *op, RAnalFunction *fcn, int *reg_set, int *count) {
+	const char *opsreg = NULL;
+	const char *opdreg = NULL;
+	int i, delta = 0;
+
+	if (!anal || !op || !fcn) {
+		return;
+	}
+	int max_count = r_anal_cc_max_arg (anal, fcn->cc);
+	if (!max_count || (*count >= max_count)) {
+		return;
+	}
+	if (op->src[0]) {
+		opsreg = get_regname (anal, op->src[0]);
+	}
+	if (op->dst) {
+		opdreg = get_regname (anal, op->dst);
+	}
+	if (opsreg) {
+		RRegItem *ri = r_reg_get (anal->reg, opsreg, -1);
+		if (ri) {
+			delta = ri->index;
+		}
+	}
+	for (i = 0; i < max_count; i++) {
+		const char *regname = r_anal_cc_arg (anal, fcn->cc, i + 1);
+		// reg_set enusres we only extract first-read argument reg
+		if (!reg_set [i] && regname) {
+			if (op->src[0] && opsreg && !strcmp (opsreg, regname)) {
+				char *vname = r_str_newf ("%s%d", "arg", i + 1);
+				r_anal_var_add (anal, fcn->addr, 1, delta, 'r', NULL, anal->bits / 8,
+						1, vname);
+				if (op->var && op->var->kind != 'r') {
+					r_anal_var_link (anal, op->addr, op->var);
+				}
+				r_anal_var_access (anal, fcn->addr, 'r', 1, delta, 0, op->addr);
+				r_meta_set_string (anal, R_META_TYPE_VARTYPE, op->addr, vname);
+				free (vname);
+			}
+			if (op->dst && opdreg && !strcmp (opdreg, regname)) {
+				reg_set [i] = 1;
+				count++;
+			}
+		}
+	}
+}
+
+R_API void extract_vars(RAnal *anal, RAnalFunction *fcn, RAnalOp *op) {
+	if (!anal || !fcn || !op) {
+		return;
+	}
+	const char *BP = anal->reg->name[R_REG_NAME_BP];
+	const char *SP =  anal->reg->name[R_REG_NAME_SP];
+	extract_arg (anal, fcn, op, BP, "+", 'b');
+	extract_arg (anal, fcn, op, BP, "-", 'b');
+	extract_arg (anal, fcn, op, SP, "+", 's');
+}
+
 static RList *var_generate_list(RAnal *a, RAnalFunction *fcn, int kind, bool dynamicVars) {
 	if (!a || !fcn) {
 		return NULL;
@@ -543,7 +733,7 @@
 	if (kind < 1) {
 		kind = R_ANAL_VAR_KIND_BPV; // by default show vars
 	}
-	char *varlist = sdb_get (DB, sdb_fmt (0, "fcn.0x%"PFMT64x ".%c", fcn->addr, kind), 0);
+	char *varlist = sdb_get (DB, sdb_fmt ("fcn.0x%"PFMT64x ".%c", fcn->addr, kind), 0);
 	if (varlist && *varlist) {
 		char *next, *ptr = varlist;
 		do {
@@ -551,7 +741,7 @@
 			if (r_str_nlen (word, 3) < 3) {
 				return NULL;
 			}
-			const char *vardef = sdb_const_get (DB, sdb_fmt (1,
+			const char *vardef = sdb_const_get (DB, sdb_fmt (
 				"var.0x%"PFMT64x ".%c.%s",
 				fcn->addr, kind, word), 0);
 			if (word[2] == '_') {
@@ -578,6 +768,7 @@
 				av->delta = delta;
 				av->kind = kind;
 				av->name = strdup (vt.name);
+				av->isarg = vt.isarg;
 				av->size = vt.size;
 				av->type = strdup (vt.type);
 				r_list_append (list, av);
@@ -602,9 +793,15 @@
 	if (!list) {
 		return NULL;
 	}
-	r_list_join (list, r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_REG));
-	r_list_join (list, r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_BPV));
-	r_list_join (list, r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_SPV));
+	RList *reg_vars = r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_REG);
+	RList *bpv_vars = r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_BPV);
+	RList *spv_vars = r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_SPV);
+	r_list_join (list, reg_vars);
+	r_list_join (list, bpv_vars);
+	r_list_join (list, spv_vars);
+	r_list_free (reg_vars);
+	r_list_free (bpv_vars);
+	r_list_free (spv_vars);
 	return list;
 }
 
@@ -679,7 +876,7 @@
 			}
 				break;
 			case R_ANAL_VAR_KIND_SPV:
-				if (var->delta < fcn->maxstack) {
+				if (var->isarg) {
 					anal->cb_printf ("{\"name\":\"%s\","
 						"\"kind\":\"arg\",\"type\":\"%s\",\"ref\":"
 						"{\"base\":\"%s\", \"offset\":%"PFMT64d "}}",
@@ -719,12 +916,12 @@
 					eprintf ("Register not found");
 					break;
 				}
-				anal->cb_printf ("reg %s %s @ %s\n",
+				anal->cb_printf ("arg %s %s @ %s\n",
 					var->type, var->name, i->name);
 				}
 				break;
 			case R_ANAL_VAR_KIND_SPV:
-				if (var->delta < fcn->maxstack) {
+				if (!var->isarg) {
 					anal->cb_printf ("var %s %s @ %s+0x%x\n",
 						var->type, var->name,
 						anal->reg->name[R_REG_NAME_SP],
diff -Nru radare2-2.3.0+dfsg/libr/anal/vtable.c radare2-2.8.0+dfsg/libr/anal/vtable.c
--- radare2-2.3.0+dfsg/libr/anal/vtable.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/vtable.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,305 @@
+/* radare - LGPL - Copyright 2009-2018 - pancake, maijin, thestr4ng3r */
+
+#include "r_util.h"
+#include "r_anal.h"
+
+#define VTABLE_BUFF_SIZE 10
+
+#define VTABLE_READ_ADDR_FUNC(fname, read_fname, sz) \
+	static bool fname(RAnal *anal, ut64 addr, ut64 *buf) { \
+		ut8 tmp[sz]; \
+		if(!anal->iob.read_at(anal->iob.io, addr, tmp, sz)) { \
+			return false; \
+		} \
+		*buf = read_fname(tmp); \
+		return true; \
+	}
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_le8, r_read_le8, 1)
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_le16, r_read_le16, 2)
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_le32, r_read_le32, 4)
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_le64, r_read_le64, 8)
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_be8, r_read_be8, 1)
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_be16, r_read_be16, 2)
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_be32, r_read_be32, 4)
+VTABLE_READ_ADDR_FUNC (vtable_read_addr_be64, r_read_be64, 8)
+
+
+
+R_API void r_anal_vtable_info_fini(RVTableInfo *vtable) {
+	RListIter* iter;
+	RVTableMethodInfo *method;
+	r_list_foreach (vtable->methods, iter, method) {
+		free (method);
+	}
+	r_list_free (vtable->methods);
+}
+
+R_API ut64 r_anal_vtable_info_get_size(RVTableContext *context, RVTableInfo *vtable) {
+	return (ut64)vtable->method_count * context->word_size;
+}
+
+
+R_API bool r_anal_vtable_begin(RAnal *anal, RVTableContext *context) {
+	context->anal = anal;
+	context->abi = anal->cpp_abi;
+	context->word_size = (ut8)(anal->bits / 8);
+	switch (anal->bits) {
+		case 8:
+			context->read_addr = anal->big_endian ? vtable_read_addr_be8 : vtable_read_addr_le8;
+			break;
+		case 16:
+			context->read_addr = anal->big_endian ? vtable_read_addr_be16 : vtable_read_addr_le16;
+			break;
+		case 32:
+			context->read_addr = anal->big_endian ? vtable_read_addr_be32 : vtable_read_addr_le32;
+			break;
+		case 64:
+			context->read_addr = anal->big_endian ? vtable_read_addr_be64 : vtable_read_addr_le64;
+			break;
+		default:
+			return false;
+	}
+	return true;
+}
+
+R_API RList *r_anal_vtable_get_methods(RVTableContext *context, RVTableInfo *table) {
+	RAnal *anal = context->anal;
+	RList* vtableMethods = r_list_new ();
+	if (!table || !anal || !vtableMethods) {
+		r_list_free (vtableMethods);
+		return NULL;
+	}
+
+	int curMethod = 0;
+	int totalMethods = table->method_count;
+	ut64 startAddress = table->saddr;
+	while (curMethod < totalMethods) {
+		ut64 curAddressValue;
+		RVTableMethodInfo *methodInfo;
+		if (context->read_addr (context->anal, startAddress, &curAddressValue)
+			&& (methodInfo = (RVTableMethodInfo *)malloc (sizeof (RVTableMethodInfo)))) {
+			methodInfo->addr = curAddressValue;
+			methodInfo->vtable_offset = startAddress - table->saddr;
+			r_list_append (vtableMethods, methodInfo);
+		}
+		startAddress += context->word_size;
+		curMethod++;
+	}
+
+	table->methods = vtableMethods;
+	return vtableMethods;
+}
+
+static bool vtable_addr_in_text_section(RVTableContext *context, ut64 curAddress) {
+	//section of the curAddress
+	RBinSection* value = context->anal->binb.get_vsect_at (context->anal->binb.bin, curAddress);
+	//If the pointed value lies in .text section
+	return value && !strcmp (value->name, ".text");
+}
+
+static bool vtable_is_value_in_text_section(RVTableContext *context, ut64 curAddress) {
+	//value at the current address
+	ut64 curAddressValue;
+	if (!context->read_addr (context->anal, curAddress, &curAddressValue)) {
+		return false;
+	}
+	//if the value is in text section
+	return vtable_addr_in_text_section (context, curAddressValue);
+}
+
+static bool vtable_section_can_contain_vtables(RVTableContext *context, RBinSection *section) {
+	return !strcmp(section->name, ".rodata") ||
+		   !strcmp(section->name, ".rdata") ||
+		   !strcmp(section->name, ".data.rel.ro");
+}
+
+
+static int vtable_is_addr_vtable_start(RVTableContext *context, ut64 curAddress) {
+	RAnalRef *xref;
+	RListIter *xrefIter;
+
+	if (!curAddress || curAddress == UT64_MAX) {
+		return false;
+	}
+	if (!vtable_is_value_in_text_section (context, curAddress)) {
+		return false;
+	}
+	// total xref's to curAddress
+	RList *xrefs = r_anal_xrefs_get (context->anal, curAddress);
+	if (r_list_empty (xrefs)) {
+		return false;
+	}
+	r_list_foreach (xrefs, xrefIter, xref) {
+		// section in which currenct xref lies
+		if (vtable_addr_in_text_section (context, xref->addr)) {
+			ut8 buf[VTABLE_BUFF_SIZE];
+			context->anal->iob.read_at (context->anal->iob.io, xref->addr, buf, sizeof(buf));
+
+			RAnalOp analop = { 0 };
+			r_anal_op (context->anal, &analop, xref->addr, buf, sizeof(buf), R_ANAL_OP_MASK_BASIC);
+
+			if (analop.type == R_ANAL_OP_TYPE_MOV
+				|| analop.type == R_ANAL_OP_TYPE_LEA) {
+				return true;
+			}
+
+			r_anal_op_fini (&analop);
+		}
+	}
+	r_list_free (xrefs);
+	return false;
+}
+
+R_API RList *r_anal_vtable_search(RVTableContext *context) {
+	RAnal *anal = context->anal;
+	if (!anal) {
+		return NULL;
+	}
+
+	RList *vtables = r_list_newf ((RListFree)free);
+	if (!vtables) {
+		return NULL;
+	}
+
+	RList *sections = anal->binb.get_sections (anal->binb.bin);
+	if (!sections) {
+		r_list_free (vtables);
+		return NULL;
+	}
+
+	r_cons_break_push (NULL, NULL);
+
+	RListIter *iter;
+	RBinSection *section;
+	r_list_foreach (sections, iter, section) {
+		if (r_cons_is_breaked ()) {
+			break;
+		}
+
+		if (!vtable_section_can_contain_vtables (context, section)) {
+			continue;
+		}
+
+		// ut8 *segBuff = calloc (1, section->vsize);
+		// r_io_read_at (core->io, section->vaddr, segBuff, section->vsize);
+
+		ut64 startAddress = section->vaddr;
+		ut64 endAddress = startAddress + (section->vsize) - context->word_size;
+		while (startAddress <= endAddress) {
+			if (r_cons_is_breaked ()) {
+				break;
+			}
+
+			if (vtable_is_addr_vtable_start (context, startAddress)) {
+				RVTableInfo *vtable = calloc (1, sizeof(RVTableInfo));
+				vtable->saddr = startAddress;
+				int noOfMethods = 0;
+				while (vtable_is_value_in_text_section (context, startAddress)) {
+					noOfMethods++;
+					startAddress += context->word_size;
+
+					// a ref means the vtable has ended
+					RList *ll = r_anal_xrefs_get (context->anal, startAddress);
+					if (!r_list_empty (ll)) {
+						r_list_free (ll);
+						break;
+					}
+					r_list_free (ll);
+				}
+				vtable->method_count = noOfMethods;
+				r_list_append (vtables, vtable);
+				continue;
+			}
+			startAddress += 1;
+		}
+	}
+
+	r_cons_break_pop ();
+
+	if (r_list_empty (vtables)) {
+		// stripped binary?
+		eprintf ("No virtual tables found\n");
+		r_list_free (vtables);
+		return NULL;
+	}
+	return vtables;
+}
+
+R_API void r_anal_list_vtables(RAnal *anal, int rad) {
+	RVTableContext context;
+	r_anal_vtable_begin (anal, &context);
+
+	RList *vtableMethods;
+	const char *noMethodName = "No Name found";
+	RListIter* vtableMethodNameIter;
+	RVTableMethodInfo *curMethod;
+	RListIter* vtableIter;
+	RVTableInfo* table;
+
+	RList* vtables = r_anal_vtable_search (&context);
+	if (!vtables) {
+		return;
+	}
+
+	if (rad == 'j') {
+		bool isFirstElement = true;
+		r_cons_print ("[");
+		r_list_foreach (vtables, vtableIter, table) {
+			if (!isFirstElement) {
+				r_cons_print (",");
+			}
+			bool isFirstMethod = true;
+			r_cons_printf ("{\"offset\":%"PFMT64d",\"methods\":[", table->saddr);
+			vtableMethods = r_anal_vtable_get_methods (&context, table);
+			r_list_foreach (vtableMethods, vtableMethodNameIter, curMethod) {
+				if(!isFirstMethod)
+					r_cons_print (",");
+				RAnalFunction *fcn = r_anal_get_fcn_in (anal, curMethod->addr, 0);
+				const char* const name = fcn ? fcn->name : NULL;
+				r_cons_printf ("{\"offset\":%"PFMT64d",\"name\":\"%s\"}",
+						curMethod->addr, name ? name : noMethodName);
+				isFirstMethod = false;
+			}
+			r_cons_print ("]}");
+			isFirstElement = false;
+		}
+		r_cons_println ("]");
+	} else if (rad == '*') {
+		r_list_foreach (vtables, vtableIter, table) {
+			r_cons_printf ("f vtable.0x%08"PFMT64x" %"PFMT64d" @ 0x%08"PFMT64x"\n",
+						   table->saddr,
+						   r_anal_vtable_info_get_size (&context, table),
+						   table->saddr);
+			vtableMethods = r_anal_vtable_get_methods (&context, table);
+			r_list_foreach (vtableMethods, vtableMethodNameIter, curMethod) {
+				r_cons_printf ("Cd %d @ 0x%08"PFMT64x"\n", context.word_size, table->saddr + curMethod->vtable_offset);
+				RAnalFunction *fcn = r_anal_get_fcn_in (anal, curMethod->addr, 0);
+				const char *const name = fcn ? fcn->name : NULL;
+				if (name) {
+					r_cons_printf ("f %s=0x%08"PFMT64x"\n", name, curMethod->addr);
+				} else {
+					r_cons_printf ("f method.virtual.0x%08"PFMT64x"=0x%08"PFMT64x"\n", curMethod->addr, curMethod->addr);
+				}
+			}
+		}
+	} else {
+		r_list_foreach (vtables, vtableIter, table) {
+			ut64 vtableStartAddress = table->saddr;
+			vtableMethods = r_anal_vtable_get_methods (&context, table);
+			r_cons_printf ("\nVtable Found at 0x%08"PFMT64x"\n", vtableStartAddress);
+			r_list_foreach (vtableMethods, vtableMethodNameIter, curMethod) {
+				RAnalFunction *fcn = r_anal_get_fcn_in (anal, curMethod->addr, 0);
+				const char* const name = fcn ? fcn->name : NULL;
+				r_cons_printf ("0x%08"PFMT64x" : %s\n", vtableStartAddress, name ? name : noMethodName);
+				vtableStartAddress += context.word_size;
+			}
+			r_cons_newline ();
+		}
+	}
+	r_list_foreach (vtables, vtableIter, table) {
+			r_anal_vtable_info_fini (table);
+	}
+	r_list_free (vtables);
+}
+
+
diff -Nru radare2-2.3.0+dfsg/libr/anal/xrefs.c radare2-2.8.0+dfsg/libr/anal/xrefs.c
--- radare2-2.3.0+dfsg/libr/anal/xrefs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/anal/xrefs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,7 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake, nibble */
+/* radare - LGPL - Copyright 2009-2018 - pancake, nibble, defragger, ret2libc */
 
 #include <r_anal.h>
 #include <r_cons.h>
-#include <sdb.h>
-
-#define DB anal->sdb_xrefs
 
 #if 0
 DICT
@@ -24,285 +21,160 @@
 20: call 10
 #endif
 
-static const char *analref_toString(RAnalRefType type) {
-	switch (type) {
-	case R_ANAL_REF_TYPE_NULL:
-		/* do nothing */
-		break;
-	case R_ANAL_REF_TYPE_CODE:
-		return "code.jmp";
-	case R_ANAL_REF_TYPE_CALL:
-		return "code.call";
-	case R_ANAL_REF_TYPE_DATA:
-		return "data.mem";
-	case R_ANAL_REF_TYPE_STRING:
-		return "data.string";
+// XXX: is it possible to have multiple type for the same (from, to) pair?
+//      if it is, things need to be adjusted
+
+#define u64_to_key(x) (sdb_fmt ("%"PFMT64x, (x)))
+
+#define ht_find_u64(_ht,_key,_found) (ht_find ((_ht), u64_to_key (_key), (_found)))
+#define ht_insert_u64(_ht,_key,_value) (ht_insert ((_ht), u64_to_key (_key), _value))
+#define ht_update_u64(_ht,_key,_value) (ht_update ((_ht), u64_to_key (_key), _value))
+#define ht_delete_u64(_ht,_key) (ht_delete ((_ht), u64_to_key (_key)))
+
+R_API RAnalRef *r_anal_ref_new() {
+	RAnalRef *ref = R_NEW0 (RAnalRef);
+	if (ref) {
+		ref->addr = -1;
+		ref->at = -1;
+		ref->type = R_ANAL_REF_TYPE_CODE;
 	}
-	return "unk";
+	return ref;
 }
 
-static void XREFKEY(char * const key, const size_t key_len,
-	char const * const kind, const RAnalRefType type, const ut64 addr) {
-	char const * _sdb_type = analref_toString (type);
-	snprintf (key, key_len, "%s.%s.0x%"PFMT64x, kind, _sdb_type, addr);
+R_API RList *r_anal_ref_list_new() {
+	return r_list_newf (r_anal_ref_free);
 }
 
-R_API bool r_anal_xrefs_save(RAnal *anal, const char *prjDir) {
-#if USE_DICT
-	anal->sdb_xrefs = sdb_new0 ();
-#endif
-	char *xrefs_path = r_str_newf ("%s" R_SYS_DIR "xrefs.sdb", prjDir);
-	sdb_file (anal->sdb_xrefs, xrefs_path);
-	free (xrefs_path);
-	return sdb_sync (anal->sdb_xrefs);
+R_API void r_anal_ref_free(void *ref) {
+	free (ref);
+}
+void xrefs_ht_free(HtKv *kv) {
+	free (kv->key);
+	ht_free (kv->value);
+	free (kv);
 }
 
-#if USE_DICT
-static void appendRef(RList *list, dicti k, dicti v, void *u) {
-	RAnalRef *ref = r_anal_ref_new ();
-	if (ref) {
-#if 0
-		eprintf ("%s 0x%08llx -> 0x%08llx (0x%llx)\n",
-				kv->u, kv->k, kv->v, addr);
-#endif
-		ref->at = k;
-		ref->addr = v;
-		ref->type = u;
-		r_list_append (list, ref);
-	}
+void xrefs_ref_free(HtKv *kv) {
+	free (kv->key);
+	r_anal_ref_free (kv->value);
+	free (kv);
 }
 
-static void mylistrefs(dict *m, ut64 addr, RList *list) {
-	int i, j;
-	for (i = 0; i < m->size; i++) {
-		dictkv *kv = m->table[i];
-		if (!kv) {
-			continue;
-		}
-		while (kv->k != MHTNO) {
-			if (addr == UT64_MAX || addr == kv->k) {
-				appendRef (list, kv->k, kv->v, kv->u);
-			}
-			kv++;
-		}
+static bool appendRef(RList *list, const char *k, RAnalRef *ref) {
+	RAnalRef *cloned = r_anal_ref_new ();
+	if (!cloned) {
+		return false;
 	}
+	cloned->addr = ref->addr;
+	cloned->at = ref->at;
+	cloned->type = ref->type;
+	r_list_append (list, cloned);
+	return true;
 }
 
-static void listrefs(dict *m, ut64 addr, RList *list) {
-	int i;
-	if (addr == UT64_MAX) {
-		for (i = 0; i < m->size; i++) {
-			dictkv *kv = m->table[i];
-			if (kv) {
-				dict *ht = kv->u;
-				while (kv->k != MHTNO) {
-					mylistrefs (ht, UT64_MAX, list);
-					kv++;
-				}
-			}
-		}
-	} else {
-		dict *d = dict_getu (m, addr);
-		if (!d) {
-			return;
-		}
-		mylistrefs (d, addr, list);
-		for (i = 0; i < m->size; i++) {
-			dictkv *kv = m->table[i];
-			if (kv) {
-				while (kv->k != MHTNO) {
-					if (kv->k == addr) {
-						appendRef (list, kv->k, kv->v, kv->u);
-					}
-				//	mylistrefs (ht, UT64_MAX, list);
-					kv++;
-				}
-			}
-		}
+static bool mylistrefs_cb(RList *list, const char *k, SdbHash *ht) {
+	ht_foreach (ht, (HtForeachCallback)appendRef, list);
+	return true;
+}
+
+static int ref_cmp(const RAnalRef *a, const RAnalRef *b) {
+	if (a->at < b->at) {
+		return -1;
+	}
+	if (a->at > b->at) {
+		return 1;
+	}
+	if (a->addr < b->addr) {
+		return -1;
 	}
+	if (a->addr > b->addr) {
+		return 1;
+	}
+	return 0;
 }
 
-static void listxrefs(dict *m, ut64 addr, RList *list) {
-	int i;
+static void listxrefs(SdbHash *m, ut64 addr, RList *list) {
 	if (addr == UT64_MAX) {
-		for (i = 0; i < m->size; i++) {
-			dictkv *kv = m->table[i];
-			if (kv) {
-				dict *ht = kv->u;
-				while (kv->k != MHTNO) {
-					mylistrefs (ht, UT64_MAX, list);
-					kv++;
-				}
-			}
-		}
+		ht_foreach (m, (HtForeachCallback)mylistrefs_cb, list);
 	} else {
-		dict *d = dict_getu (m, addr);
-		if (!d) {
+		bool found;
+		SdbHash *d = ht_find_u64 (m, addr, &found);
+		if (!found) {
 			return;
 		}
-		mylistrefs (d, addr, list);
+
+		ht_foreach (d, (HtForeachCallback)appendRef, list);
 	}
+	r_list_sort (list, (RListComparator)ref_cmp);
 }
 
-// [from=[from:to,],]
-// 10->20
-static void setref(dict *m, ut64 from, ut64 to, int type) {
-	dict_set (m, from, to, r_anal_xrefs_type_tostring (type));
-}
+static void setxref(SdbHash *m, ut64 from, ut64 to, int type) {
+	bool found;
+	SdbHash *ht = ht_find_u64 (m, from, &found);
 
-static void setxref(dict *m, ut64 from, ut64 to, int type) {
-	dictkv *kv = dict_getr (m, from);
-	dict *d = NULL;
-	if (kv) {
-		d = kv->u;
-	} else {
-		d = R_NEW0 (dict);
-		if (d) {
-			dict_init (d, 9, dict_free);
-			dict_set (m, from, to, d);
+	if (!found) {
+		ht = ht_new (NULL, xrefs_ref_free, NULL);
+		if (!ht) {
+			return;
 		}
-	}
-	if (d) {
-		dict_set (d, from, to, r_anal_xrefs_type_tostring (type));
-	}
-}
 
-static void delref(dict *m, ut64 from, ut64 to, int type) {
-	dict_del (m, to);
-#if 0
-	dictkv *kv = dict_getr (m, from);
-	if (kv) {
-		dict *ht = kv->u;
-		if (ht) {
-			dict_del (ht, to);
-		}
+		ht_insert_u64 (m, from, ht);
 	}
-#endif
+
+	RAnalRef *ref = r_anal_ref_new ();
+	ref->at = from;
+	ref->addr = to;
+	ref->type = type;
+
+	ht_update_u64 (ht, to, ref);
 }
-#endif
 
-R_API int r_anal_xrefs_set (RAnal *anal, const RAnalRefType type, ut64 from, ut64 to) {
-	char key[33];
-	if (!anal || !DB) {
+// set a reference from FROM to TO and a cross-reference(xref) from TO to FROM.
+R_API int r_anal_xrefs_set(RAnal *anal, ut64 from, ut64 to, const RAnalRefType type) {
+	if (!anal) {
 		return false;
 	}
-	if (!anal->iob.is_valid_offset (anal->iob.io, to, 0)) {
+	if (!anal->iob.is_valid_offset (anal->iob.io, from, 0)) {
 		return false;
 	}
-	// unknown refs should not be stored. seems wrong
-#if 0
-	if (type == R_ANAL_REF_TYPE_NULL) {
+	if (!anal->iob.is_valid_offset (anal->iob.io, to, 0)) {
 		return false;
 	}
-#endif
-#if USE_DICT
 	setxref (anal->dict_xrefs, to, from, type);
-	setref (anal->dict_refs, from, to, type);
-	// setref (anal->dict_refs, from, to, type);
-//	setref (anal->dict_xrefs, from, to, type);
-//	setref (anal->dict_refs, to, from, type);
-// eprintf ("set %llx %llx %p\n", from , to, dict_getr(anal->dict_refs, from));
-	// dict_getu(m, from, checkType, "ref");
-#else
-	XREFKEY (key, sizeof (key), "ref", type, from);
-	sdb_array_add_num (DB, key, to, 0);
-
-	XREFKEY (key, sizeof (key), "xref", type, to);
-	sdb_array_add_num (DB, key, from, 0);
-#endif
-
+	setxref (anal->dict_refs, from, to, type);
 	return true;
 }
 
-R_API int r_anal_xrefs_deln (RAnal *anal, const RAnalRefType type, ut64 from, ut64 to) {
-	char key[33];
-	if (!anal || !DB) {
+R_API int r_anal_xrefs_deln(RAnal *anal, ut64 from, ut64 to, const RAnalRefType type) {
+	if (!anal) {
 		return false;
 	}
-#if USE_DICT
-	delref (anal->dict_refs, from, to, type);
-	delref (anal->dict_xrefs, to, from, type);
-#else
-	XREFKEY (key, sizeof (key), "ref", type, from);
-	sdb_array_remove_num (DB, key, to, 0);
-	XREFKEY (key, sizeof (key), "xref", type, to);
-	sdb_array_remove_num (DB, key, from, 0);
-#endif
+	ht_delete_u64 (anal->dict_refs, from);
+	ht_delete_u64 (anal->dict_xrefs, to);
 	return true;
 }
 
-static int _type = -1;
-static RList *_list = NULL;
-static char *_kpfx = NULL;
-
-static int xrefs_list_cb_any(RAnal *anal, const char *k, const char *v) {
-	//ut64 dst, src = r_num_get (NULL, v);
-	if (!strncmp (_kpfx, k, strlen (_kpfx))) {
-		RAnalRef *ref = r_anal_ref_new ();
-		if (ref) {
-			ref->addr = r_num_get (NULL, k + strlen (_kpfx) + 1);
-			ref->at = r_num_get (NULL, v); // XXX
-			ref->type = _type;
-			r_list_append (_list, ref);
-		}
-	}
-	return true;
+R_API int r_anal_xref_del(RAnal *anal, ut64 from, ut64 to) {
+	bool res = false;
+	res |= r_anal_xrefs_deln (anal, from, to, R_ANAL_REF_TYPE_NULL);
+	res |= r_anal_xrefs_deln (anal, from, to, R_ANAL_REF_TYPE_CODE);
+	res |= r_anal_xrefs_deln (anal, from, to, R_ANAL_REF_TYPE_CALL);
+	res |= r_anal_xrefs_deln (anal, from, to, R_ANAL_REF_TYPE_DATA);
+	res |= r_anal_xrefs_deln (anal, from, to, R_ANAL_REF_TYPE_STRING);
+	return res;
 }
 
-#if USE_DICT
-R_API int r_anal_xrefs_from (RAnal *anal, RList *list, const char *kind, const RAnalRefType type, ut64 addr) {
-	listrefs (anal->dict_refs, addr, list);
+R_API int r_anal_xrefs_from(RAnal *anal, RList *list, const char *kind, const RAnalRefType type, ut64 addr) {
+	listxrefs (anal->dict_refs, addr, list);
 	return true;
 }
-#else
-R_API int r_anal_xrefs_from (RAnal *anal, RList *list, const char *kind, const RAnalRefType type, ut64 addr) {
-	char *next, *s, *str, *ptr, key[256];
-	RAnalRef *ref = NULL;
-	if (addr == UT64_MAX) {
-		_type = type;
-		_list = list;
-		_kpfx = r_str_newf ("xref.%s", analref_toString (type));
-		sdb_foreach (DB, (SdbForeachCallback)xrefs_list_cb_any, anal);
-		free (_kpfx);
-		return true;
-	}
-	XREFKEY(key, sizeof (key), kind, type, addr);
-	str = sdb_get (DB, key, 0);
-	if (!str) {
-		return false;
-	}
-	for (next = ptr = str; next; ptr = next) {
-		s = sdb_anext (ptr, &next);
-		if (!(ref = r_anal_ref_new ())) {
-			return false;
-		}
-		ref->addr = r_num_get (NULL, s);
-		ref->at = addr;
-		ref->type = type;
-		r_list_append (list, ref);
-	}
-	free (str);
-	return true;
-}
-#endif
 
-R_API RList *r_anal_xrefs_get (RAnal *anal, ut64 to) {
-	RList *list = r_list_newf (r_anal_ref_free);
+R_API RList *r_anal_xrefs_get(RAnal *anal, ut64 to) {
+	RList *list = r_anal_ref_list_new ();
 	if (!list) {
 		return NULL;
 	}
-#if USE_DICT
-	// listrefs (anal->dict_refs, to, list);
-// XXX, one or the other?
 	listxrefs (anal->dict_xrefs, to, list);
-	// listrefs (anal->dict_xrefs, to, list);
-#else
-	r_anal_xrefs_from (anal, list, "xref", R_ANAL_REF_TYPE_NULL, to);
-	r_anal_xrefs_from (anal, list, "xref", R_ANAL_REF_TYPE_CODE, to);
-	r_anal_xrefs_from (anal, list, "xref", R_ANAL_REF_TYPE_CALL, to);
-	r_anal_xrefs_from (anal, list, "xref", R_ANAL_REF_TYPE_DATA, to);
-	r_anal_xrefs_from (anal, list, "xref", R_ANAL_REF_TYPE_STRING, to);
-#endif
 	if (r_list_empty (list)) {
 		r_list_free (list);
 		list = NULL;
@@ -310,22 +182,12 @@
 	return list;
 }
 
-R_API RList *r_anal_refs_get (RAnal *anal, ut64 from) {
-	RList *list = r_list_newf (r_anal_ref_free);
+R_API RList *r_anal_refs_get(RAnal *anal, ut64 from) {
+	RList *list = r_anal_ref_list_new ();
 	if (!list) {
 		return NULL;
 	}
-#if USE_DICT
-//	listrefs (anal->dict_refs, from, list);
-	listxrefs (anal->dict_xrefs, from, list);
-// eprintf ("refs_get from %llx %d\n", from, r_list_length (list));
-#else
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_NULL, from);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_CODE, from);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_CALL, from);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_DATA, from);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_STRING, from);
-#endif
+	listxrefs (anal->dict_refs, from, list);
 	if (r_list_empty (list)) {
 		r_list_free (list);
 		list = NULL;
@@ -333,21 +195,12 @@
 	return list;
 }
 
-R_API RList *r_anal_xrefs_get_from (RAnal *anal, ut64 to) {
-	RList *list = r_list_newf (NULL);
+R_API RList *r_anal_xrefs_get_from(RAnal *anal, ut64 to) {
+	RList *list = r_anal_ref_list_new ();
 	if (!list) {
 		return NULL;
 	}
-#if USE_DICT
-	listxrefs (anal->dict_xrefs, to, list);
-	//listrefs (anal->dict_refs, to, list);
-#else
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_NULL, to);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_CODE, to);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_CALL, to);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_DATA, to);
-	r_anal_xrefs_from (anal, list, "ref", R_ANAL_REF_TYPE_STRING, to);
-#endif
+	listxrefs (anal->dict_refs, to, list);
 	if (r_list_empty (list)) {
 		r_list_free (list);
 		list = NULL;
@@ -355,177 +208,66 @@
 	return list;
 }
 
-R_API bool r_anal_xrefs_init(RAnal *anal) {
-	sdb_reset (DB);
-	if (DB) {
-		sdb_array_set (DB, "types", -1, "code.jmp,code.call,data.mem,data.string", 0);
-		return true;
-	}
-	return false;
-}
-
-static int xrefs_list_cb_rad(RAnal *anal, const char *k, const char *v) {
-	ut64 dst, src = r_num_get (NULL, v);
-	if (!strncmp (k, "ref.", 4)) {
-		const char *p = r_str_rchr (k, NULL, '.');
-		if (p) {
-			dst = r_num_get (NULL, p + 1);
-			anal->cb_printf ("ax 0x%"PFMT64x" 0x%"PFMT64x"\n", src, dst);
-		}
+R_API void r_anal_xrefs_list(RAnal *anal, int rad) {
+	bool is_first = true;
+	RListIter *iter;
+	RAnalRef *ref;
+	RList *list = r_anal_ref_list_new();
+	listxrefs (anal->dict_refs, UT64_MAX, list);
+	if (rad == 'j') {
+		anal->cb_printf ("{");
 	}
-	return 1;
-}
-
-static int xrefs_list_cb_quiet(RAnal *anal, const char *k, const char *v) {
-	ut64 dst, src = r_num_get (NULL, v);
-	if (!strncmp (k, "ref.", 4)) {
-		const char *p = r_str_rchr (k, NULL, '.');
-		if (p) {
-			dst = r_num_get (NULL, p + 1);
-			char * type = strchr (k, '.');
-			if (type) {
-				type = strdup (type + 1);
-				char *t = strchr (type, '.');
-				if (t) {
-					*t = ' ';
-				}
-				char *T = (char *)r_str_rchr (type, NULL, '.');
-				if (T) {
-					T = (char *)r_str_rchr (T, NULL, '.');
-					if (T) {
-						*T = 0;
-						anal->cb_printf ("0x%08"PFMT64x" -> 0x%08"PFMT64x"  %s\n", src, dst, type);
-					}
+	r_list_foreach (list, iter, ref) {
+		int t = ref->type ? ref->type: ' ';
+		switch (rad) {
+		case '*':
+			anal->cb_printf ("ax%c 0x%"PFMT64x" 0x%"PFMT64x"\n",
+				t, ref->addr, ref->at);
+			break;
+		case '\0':
+			{
+				char *name = anal->coreb.getNameDelta (anal->coreb.core, ref->at);
+				r_str_replace_char (name, ' ', 0);
+				anal->cb_printf ("%40s", name? name: "");
+				free (name);
+				anal->cb_printf (" 0x%"PFMT64x" -> %9s -> 0x%"PFMT64x, ref->at, r_anal_xrefs_type_tostring (t), ref->addr);
+				name = anal->coreb.getNameDelta (anal->coreb.core, ref->addr);
+				r_str_replace_char (name, ' ', 0);
+				if (name && *name) {
+					anal->cb_printf (" %s\n", name);
 				} else {
-					if (t) {
-						*t = 0;
-					}
+					anal->cb_printf ("\n");
 				}
-				anal->cb_printf ("0x%08"PFMT64x" -> 0x%08"PFMT64x"  %s\n", src, dst, type);
-				free (type);
+				free (name);
 			}
-		}
-	}
-	return 1;
-}
-
-static int xrefs_list_cb_normal(RAnal *anal, const char *k, const char *v) {
-	ut64 dst, src = r_num_get (NULL, v);
-	if (!strncmp (k, "ref.", 4)) {
-		const char *p = r_str_rchr (k, NULL, '.');
-		if (p) {
-			dst = r_num_get (NULL, p + 1);
-			char * type = strchr (k, '.');
-			if (type) {
-				type = strdup (type + 1);
-				char *ot = strchr (type, '.');
-				if (ot) {
-					*ot = ' ';
-				}
-				char *t = (char *)r_str_rchr (type, NULL, '.');
-				if (t) {
-					t = (char *)r_str_rchr (t, NULL, '.');
-					if (t) {
-						*t = 0;
-					}
+			break;
+		case 'q':
+			anal->cb_printf ("0x%08"PFMT64x" -> 0x%08"PFMT64x"  %s\n", ref->at, ref->addr, r_anal_xrefs_type_tostring (t));
+			break;
+		case 'j':
+			{
+				if (is_first) {
+					is_first = false;
 				} else {
-					if (ot) {
-						*ot = 0;
-					}
-				}
-				{
-					char *name = anal->coreb.getNameDelta (anal->coreb.core, src);
-					r_str_replace_char (name, ' ', 0);
-					anal->cb_printf ("%40s", name? name: "");
-					free (name);
-					anal->cb_printf (" 0x%"PFMT64x" -> %9s -> 0x%"PFMT64x, src, type, dst);
-					name = anal->coreb.getNameDelta (anal->coreb.core, dst);
-					r_str_replace_char (name, ' ', 0);
-					if (name && *name) {
-						anal->cb_printf (" %s\n", name);
-					} else {
-						anal->cb_printf ("\n");
-					}
-					free (name);
+					anal->cb_printf (",");
 				}
-				free (type);
-			}
-		}
-	}
-	return 1;
-}
-
-static bool xrefs_list_cb_json(RAnal *anal, bool is_first, const char *k, const char *v) {
-	ut64 dst, src = r_num_get (NULL, v);
-	if (strlen (k) > 8) {
-		const char *p = r_str_rchr (k, NULL, '.');
-		if (p) {
-			if (is_first) {
-				is_first = false;
-			} else {
-				anal->cb_printf (",");
+				anal->cb_printf ("\"%"PFMT64d"\":%"PFMT64d, ref->at, ref->addr);
 			}
-			dst = r_num_get (NULL, p + 1);
-			sscanf (p + 1, "0x%"PFMT64x, &dst);
-			anal->cb_printf ("\"%"PFMT64d"\":%"PFMT64d, src, dst);
+			break;
+		default:
+			break;
 		}
 	}
-	return is_first;
-}
-
-static int xrefs_list_cb_plain(RAnal *anal, const char *k, const char *v) {
-	anal->cb_printf ("%s=%s\n", k, v);
-	return 1;
-}
-
-R_API void r_anal_xrefs_list(RAnal *anal, int rad) {
-#if USE_DICT
-	RListIter *iter;
-	RAnalRef *ref;
-	RList *list = r_list_new();
-	listxrefs (anal->dict_xrefs, UT64_MAX, list);
-	r_list_foreach (list, iter, ref) {
-		int type = ref->type? ref->type: ' ';
-		r_cons_printf ("%c 0x%08llx -> 0x%08llx\n", type, ref->at, ref->addr);
-	}
-	r_list_free (list);
-#else
-	switch (rad) {
-	case 1:
-	case '*':
-		sdb_foreach (DB, (SdbForeachCallback)xrefs_list_cb_rad, anal);
-		break;
-	case '\0':
-		sdb_foreach (DB, (SdbForeachCallback)xrefs_list_cb_normal, anal);
-		break;
-	case 'q':
-		sdb_foreach (DB, (SdbForeachCallback)xrefs_list_cb_quiet, anal);
-		break;
-	case 'j':
-		{
-		anal->cb_printf ("{");
-		bool is_first = true;
-		SdbListIter *sdb_iter;
-		SdbKv *kv;
-		SdbList *sdb_list = sdb_foreach_match (DB, "^ref.", false);
-		ls_foreach (sdb_list, sdb_iter, kv) {
-			is_first = xrefs_list_cb_json (anal, is_first, kv->key, kv->value);
-		}
-		ls_free (sdb_list);
+	if (rad == 'j') {
 		anal->cb_printf ("}\n");
-		}
-		break;
-	default:
-		sdb_foreach (DB, (SdbForeachCallback)xrefs_list_cb_plain, anal);
-		break;
 	}
-#endif
+	r_list_free (list);
 }
 
-R_API const char *r_anal_xrefs_type_tostring (char type) {
+R_API const char *r_anal_xrefs_type_tostring(RAnalRefType type) {
 	switch (type) {
 	case R_ANAL_REF_TYPE_CODE:
-		return "JMP";
+		return "CODE";
 	case R_ANAL_REF_TYPE_CALL:
 		return "CALL";
 	case R_ANAL_REF_TYPE_DATA:
@@ -538,20 +280,70 @@
 	}
 }
 
-typedef struct {
-	RAnal *anal;
-	int count;
-} CountState;
-
-static int countcb(CountState *cs, const char *k, const char *v) {
-	if (!strncmp (k, "ref.", 4)) {
-		cs->count ++;
+R_API RAnalRefType r_anal_xrefs_type(char ch) {
+	switch (ch) {
+	case R_ANAL_REF_TYPE_CODE:
+	case R_ANAL_REF_TYPE_CALL:
+	case R_ANAL_REF_TYPE_DATA:
+	case R_ANAL_REF_TYPE_STRING:
+	case R_ANAL_REF_TYPE_NULL:
+		return (RAnalRefType)ch;
+	default:
+		return R_ANAL_REF_TYPE_NULL;
 	}
-	return 1;
+}
+
+R_API bool r_anal_xrefs_init(RAnal *anal) {
+	SdbHash *tmp;
+
+	ht_free (anal->dict_refs);
+	anal->dict_refs = NULL;
+	ht_free (anal->dict_xrefs);
+	anal->dict_xrefs = NULL;
+
+	tmp = ht_new (NULL, xrefs_ht_free, NULL);
+	if (!tmp) {
+		return false;
+	}
+	anal->dict_refs = tmp;
+
+	tmp = ht_new (NULL, xrefs_ht_free, NULL);
+	if (!tmp) {
+		ht_free (anal->dict_refs);
+		anal->dict_refs = NULL;
+		return false;
+	}
+	anal->dict_xrefs = tmp;
+	return true;
 }
 
 R_API int r_anal_xrefs_count(RAnal *anal) {
-	CountState cs = { anal, 0 };
-	sdb_foreach (DB, (SdbForeachCallback)countcb, &cs);
-	return cs.count;
+	return anal->dict_xrefs->count;
+}
+
+static RList *fcn_get_refs(RAnalFunction *fcn, SdbHash *ht) {
+	RListIter *iter;
+	RAnalBlock *bb;
+	RList *list = r_anal_ref_list_new ();
+	if (!list) {
+		return NULL;
+	}
+
+	r_list_foreach (fcn->bbs, iter, bb) {
+		int i;
+
+		for (i = 0; i < bb->ninstr; ++i) {
+			ut64 at = bb->addr + r_anal_bb_offset_inst (bb, i);
+			listxrefs (ht, at, list);
+		}
+	}
+	return list;
+}
+
+R_API RList *r_anal_fcn_get_refs(RAnal *anal, RAnalFunction *fcn) {
+	return fcn_get_refs (fcn, anal->dict_refs);
+}
+
+R_API RList *r_anal_fcn_get_xrefs(RAnal *anal, RAnalFunction *fcn) {
+	return fcn_get_refs (fcn, anal->dict_xrefs);
 }
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/8051/8051_disas.c radare2-2.8.0+dfsg/libr/asm/arch/8051/8051_disas.c
--- radare2-2.3.0+dfsg/libr/asm/arch/8051/8051_disas.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/8051/8051_disas.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,42 @@
 #include "8051_ops.h"
 #include "8051_disas.h"
 
-R_API char* _replace_register (char* disasm, ut8 arg, ut8 val) {
+static const char *_8051_regs[] = {
+	"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", // 0x00
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x08
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x10
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x18
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x20
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x28
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x30
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x38
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x40
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x48
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x50
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x58
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x60
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x68
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x70
+	0, 0, 0, 0, 0, 0, 0, 0, // 0x78
+	"p0", "sp", "dpl", "dph", 0, 0, 0, "pcon", // 0x80
+	"tcon", "tmod", "tl0", "tl1", "th0", "th1", 0, 0, // 0x88
+	"p1", 0, 0, 0, 0, 0, 0, 0, // 0x90
+	"scon", "sbuf", 0, 0, 0, 0, 0, 0, // 0x98
+	"p2", 0, 0, 0, 0, 0, 0, 0, // 0xa0
+	"ie", 0, 0, 0, 0, 0, 0, 0, // 0xa8
+	"p3", 0, 0, 0, 0, 0, 0, 0, // 0xb0
+	"ip", 0, 0, 0, 0, 0, 0, 0, // 0xb8
+	0, 0, 0, 0, 0, 0, 0, 0, // 0xc0
+	0, 0, 0, 0, 0, 0, 0, 0, // 0xc8
+	"psw", 0, 0, 0, 0, 0, 0, 0, // 0xd0
+	0, 0, 0, 0, 0, 0, 0, 0, // 0xd8
+	"acc", 0, 0, 0, 0, 0, 0, 0, // 0xe0
+	0, 0, 0, 0, 0, 0, 0, 0, // 0xe8
+	"b", 0, 0, 0, 0, 0, 0, 0, // 0xf0
+	0, 0, 0, 0, 0, 0, 0, 0  // 0xf8
+};
+
+char* _replace_register (char* disasm, ut8 arg, ut8 val) {
 	char key[10];
 	char subst[10];
 	if (arg == A_DIRECT) {
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/8051/8051_ops.h radare2-2.8.0+dfsg/libr/asm/arch/8051/8051_ops.h
--- radare2-2.3.0+dfsg/libr/asm/arch/8051/8051_ops.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/8051/8051_ops.h	2018-08-07 14:12:36.000000000 +0000
@@ -213,40 +213,5 @@
 	{0xff, OP_INVALID, NULL, 0, 0, 0}
 };
 
-static const char *_8051_regs[] = {
-	"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", // 0x00
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x08
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x10
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x18
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x20
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x28
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x30
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x38
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x40
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x48
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x50
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x58
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x60
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x68
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x70
-	0, 0, 0, 0, 0, 0, 0, 0, // 0x78
-	"p0", "sp", "dpl", "dph", 0, 0, 0, "pcon", // 0x80
-	"tcon", "tmod", "tl0", "tl1", "th0", "th1", 0, 0, // 0x88
-	"p1", 0, 0, 0, 0, 0, 0, 0, // 0x90
-	"scon", "sbuf", 0, 0, 0, 0, 0, 0, // 0x98
-	"p2", 0, 0, 0, 0, 0, 0, 0, // 0xa0
-	"ie", 0, 0, 0, 0, 0, 0, 0, // 0xa8
-	"p3", 0, 0, 0, 0, 0, 0, 0, // 0xb0
-	"ip", 0, 0, 0, 0, 0, 0, 0, // 0xb8
-	0, 0, 0, 0, 0, 0, 0, 0, // 0xc0
-	0, 0, 0, 0, 0, 0, 0, 0, // 0xc8
-	"psw", 0, 0, 0, 0, 0, 0, 0, // 0xd0
-	0, 0, 0, 0, 0, 0, 0, 0, // 0xd8
-	"acc", 0, 0, 0, 0, 0, 0, 0, // 0xe0
-	0, 0, 0, 0, 0, 0, 0, 0, // 0xe8
-	"b", 0, 0, 0, 0, 0, 0, 0, // 0xf0
-	0, 0, 0, 0, 0, 0, 0, 0  // 0xf8
-};
-
 #endif
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arc/gnu/arc-dis.c radare2-2.8.0+dfsg/libr/asm/arch/arc/gnu/arc-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/arc/gnu/arc-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arc/gnu/arc-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -24,7 +24,7 @@
 
 #include "ansidecl.h"
 #include "libiberty.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 //#include "opcode/arc.h"
 #include "elf-bfd.h"
 #include "arc.h"
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arc/gnu/arcompact-dis.c radare2-2.8.0+dfsg/libr/asm/arch/arc/gnu/arcompact-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/arc/gnu/arcompact-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arc/gnu/arcompact-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -25,7 +25,7 @@
 #include <ansidecl.h>
 #include <string.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "arc.h"
 #include "arc-ext.h"
 #include "arc-dis.h"
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arm/aarch64/aarch64-dis.c radare2-2.8.0+dfsg/libr/asm/arch/arm/aarch64/aarch64-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/arm/aarch64/aarch64-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arm/aarch64/aarch64-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,7 +19,7 @@
    see <http://www.gnu.org/licenses/>.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "libiberty.h"
 #include "opintl.h"
 #include "aarch64-dis.h"
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arm/armass16_const.h radare2-2.8.0+dfsg/libr/asm/arch/arm/armass16_const.h
--- radare2-2.3.0+dfsg/libr/asm/arch/arm/armass16_const.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arm/armass16_const.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,53 @@
+#define THUMB_NONE 0x0
+#define THUMB_REG 0x1
+#define THUMB_CONST 0x2
+#define THUMB_OTHER 0xf
+#define THUMB_REG_REG 0x11
+#define THUMB_REG_CONST 0x21
+#define THUMB_OTHER_CONST 0x2f
+#define THUMB_REG_REG_REG 0x111
+#define THUMB_REG_REG_CONST 0x211
+#define THUMB_REG_CONST_CONST 0x221
+#define THUMB_REG_REG_SHIFT 0x311
+#define THUMB_REG_REG_CONST_CONST 0x2211
+#define THUMB_REG_REG_REG_SHIFT 0x3111
+#define THUMB_COPROC_CONST_REG_REG_REG 0x11124
+#define THUMB_COPROC_CONST_REG_REG_REG_CONST 0x211124
+#define THUMB_COPROC_CONST_COREG_COREG_COREG 0x55524
+#define THUMB_COPROC_CONST_COREG_COREG_COREG_CONST 0x255524
+#define THUMB_COPROC_COREG_BRACKREG_CONSTBRACK 0x8654
+#define THUMB_COPROC_COREG_BRACKREGBRACK 0x754
+#define THUMB_COPROC_COREG_BRACKREGBRACK_CONST 0x2754
+#define THUMB_COPROC_COREG_BRACKREG_CONSTBRACKBANG 0x9654
+#define THUMB_REGBANG_LIST 0xba
+#define THUMB_REG_LIST 0xb1
+#define THUMB_REG_BRACKREGBRACK 0x71
+#define THUMB_REG_BRACKREG_CONSTBRACK 0x861
+#define THUMB_REG_BRACKREGBRACK_CONST 0x271
+#define THUMB_REG_BRACKREG_CONSTBRACKBANG 0x961
+#define THUMB_REG_BRACKREG_REGBRACK 0xc61
+#define THUMB_REG_BRACKREG_REG_SHIFTBRACK 0xd161
+#define THUMB_REG_REG_BRACKREGBRACK 0x711
+#define THUMB_REG_REG_BRACKREG_CONSTBRACK 0x8611
+#define THUMB_REG_REG_BRACKREGBRACK_CONST 0x2711
+#define THUMB_REG_REG_BRACKREG_CONSTBRACKBANG 0x9611
+#define THUMB_REG_OTHER 0xf1
+#define THUMB_COPROC_CONST_REG_COREG_COREG 0x55124
+#define THUMB_COPROC_CONST_REG_COREG_COREG_CONST 0x255124
+#define THUMB_COPROC_CONST_REG_REG_COREG 0x51124
+#define THUMB_REG_REG_REG_REG 0x1111
+#define THUMB_BRACKREG_CONSTBRACK 0x86
+#define THUMB_BRACKREG_REGBRACK 0xc6
+#define THUMB_BRACKREG_REG_SHIFTBRACK 0xd16
+#define THUMB_LIST 0xb
+#define THUMB_REGBANG 0xa
+#define THUMB_OTHER_REG 0x1f
+#define THUMB_CONSTBANG 0xe
+#define THUMB_REG_CONST_REG 0x121
+#define THUMB_REG_CONST_REG_SHIFT 0x3121
+#define THUMB_REG_REG_REG_BRACKREGBRACK 0x7111
+
+#define THUMB_NOSUFFIX 0x0
+#define THUMB_LSUFFIX 0x100
+#define THUMB_XSUFFIX 0x200
+#define THUMB_LXSUFFIX 0x300
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arm/armass64.c radare2-2.8.0+dfsg/libr/asm/arch/arm/armass64.c
--- radare2-2.3.0+dfsg/libr/asm/arch/arm/armass64.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arm/armass64.c	2018-08-07 14:12:36.000000000 +0000
@@ -70,7 +70,7 @@
 	                         "xxx", "osh", "oshst", "oshld", NULL};
 	int i = 0;
 	while (options[i]) {
-		if (!strcasecmp (token, options[i])) {
+		if (!r_str_casecmp (token, options[i])) {
 			return 15 - i;
 		}
 		i++;
@@ -244,7 +244,7 @@
 }
 
 
-static ut32 sturop(ArmOp *op, int k) {
+static ut32 regsluop(ArmOp *op, int k) {
 	ut32 data = UT32_MAX;
 
 	if (op->operands[1].reg_type & ARM_REG32) {
@@ -796,7 +796,7 @@
 			if (token[1] == 'P' || token [1] == 'p') {
 				int i;
 				for (i = 0; msr_const[i].name; i++) {
-					if (!strncasecmp (token, msr_const[i].name, strlen (msr_const[i].name))) {
+					if (!r_str_ncasecmp (token, msr_const[i].name, strlen (msr_const[i].name))) {
 						op->operands[operand].sp_val = msr_const[i].val;
 						break;
 					}
@@ -914,7 +914,11 @@
 		return *op != -1;
 	}
 	if (!strncmp (str, "stur", 4)) {
-		*op = sturop (&ops, 0x000000f8);
+		*op = regsluop (&ops, 0x000000f8);
+		return *op != -1;
+	}
+	if (!strncmp (str, "ldur", 4)) {
+		*op = regsluop (&ops, 0x000040f8);
 		return *op != -1;
 	}
 	if (!strncmp (str, "str", 3)) {
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arm/armass.c radare2-2.8.0+dfsg/libr/asm/arch/arm/armass.c
--- radare2-2.3.0+dfsg/libr/asm/arch/arm/armass.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arm/armass.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,11 @@
-/* radare - LGPL - Copyright 2010-2017 - pancake */
+/* radare - LGPL - Copyright 2010-2018 - pancake */
 
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <r_util.h>
+#include "armass16_const.h"
 
 // TODO: only lo registers accessible in thumb arm
 
@@ -39,7 +40,10 @@
 	TYPE_UDF = 14,
 	TYPE_SHFT = 15,
 	TYPE_COPROC = 16,
-	TYPE_ENDIAN= 17,
+	TYPE_ENDIAN = 17,
+	TYPE_MUL = 18,
+	TYPE_CLZ = 19,
+	TYPE_REV = 20,
 };
 
 static int strcmpnull(const char *a, const char *b) {
@@ -105,7 +109,19 @@
 	{ "mov", 0xa001, TYPE_MOV },
 	{ "mvn", 0xe000, TYPE_MOV },
 	{ "svc", 0xf, TYPE_SWI }, // ???
-	{ "hlt", 0x70000001, TYPE_HLT }, // ???
+	{ "hlt", 0x70000001, TYPE_HLT }, // ???u
+
+	{ "mul", 0x900000e0, TYPE_MUL},
+	{ "smull", 0x9000c0e0, TYPE_MUL},
+	{ "umull", 0x900080e0, TYPE_MUL},
+	{ "smlal", 0x9000e0e0, TYPE_MUL},
+	{ "smlabb", 0x800000e1, TYPE_MUL},
+	{ "smlabt", 0xc00000e1, TYPE_MUL},
+	{ "smlatb", 0xa00000e1, TYPE_MUL},
+	{ "smlatt", 0xe00000e1, TYPE_MUL},
+	{ "smlawb", 0x800020e1, TYPE_MUL},
+	{ "smlawt", 0xc00020e1, TYPE_MUL},
+
 
 	{ "ands", 0x1000, TYPE_ARI },
 	{ "and", 0x0000, TYPE_ARI },
@@ -125,18 +141,302 @@
 	{"lsl", 0x1000a0e1, TYPE_SHFT},
 	{"ror", 0x7000a0e1, TYPE_SHFT},
 
+	{"rev16", 0xb00fbf06, TYPE_REV},
+	{"revsh", 0xb00fff06, TYPE_REV},
+	{"rev",   0x300fbf06, TYPE_REV},
+	{"rbit",  0x300fff06, TYPE_REV},
+
 	{"mrc", 0x100010ee, TYPE_COPROC},
 	{"setend", 0x000001f1, TYPE_ENDIAN},
+	{ "clz", 0x000f6f01, TYPE_CLZ},
 
 	{ NULL }
 };
 
+static const ut64 M_BIT = 0x1;
+static const ut64 S_BIT = 0x2;
+static const ut64 C_BITS = 0x3c;
+static const ut64 DOTN_BIT = 0x40;
+static const ut64 DOTW_BIT = 0x80;
+static const ut64 L_BIT = 0x100;
+static const ut64 X_BIT = 0x200;
+static const ut64 TWO_BIT = 0x400;
+static const ut64 IE_BIT = 0x800;
+static const ut64 ID_BIT = 0x1000;
+static const ut64 EA_BIT = 0x2000;
+static const ut64 FD_BIT = 0x4000;
+static const ut64 T_BIT = 0x8000;
+static const ut64 B_BIT = 0x10000;
+static const ut64 H_BIT = 0x20000;
+static const ut64 D_BIT = 0x40000;
+static const ut64 W_BIT = 0x80000;
+static const ut64 EIGHT_BIT = 0x100000;
+static const ut64 SIXTEEN_BIT = 0x200000;
+static const ut64 BB_BIT = 0x400000;
+static const ut64 BT_BIT = 0x800000;
+static const ut64 TB_BIT = 0x1000000;
+static const ut64 TT_BIT = 0x2000000;
+static const ut64 R_BIT = 0x4000000;
+static const ut64 IA_BIT = 0x8000000;
+static const ut64 DB_BIT = 0x10000000;
+static const ut64 SH_BIT = 0x20000000;
+static const ut64 WB_BIT = 0x40000000;
+static const ut64 WT_BIT = 0x80000000;
+static const ut64 C_MATCH_BIT = 0x100000000;
+
+static char *parse_hints(char *input) {
+	if (!strcmpnull (input, "unst")) {
+		return "6";
+	}
+	if (!strcmpnull (input, "un")) {
+		return "7";
+	}
+	if (!strcmpnull (input, "st")) {
+		return "14";
+	}
+	if (!strcmpnull (input, "sy")) {
+		return "15";
+	}
+	return "-1";
+}
+
+static st8 iflag(char *input) {
+	st8 res = 0;
+	ut8 i;
+	r_str_case (input, false);
+	
+	for (i = 0; i < strlen(input); i++) {
+		switch (input[i]) {
+		case 'a':
+			res |= 0x4;
+			break;
+		case 'i':
+			res |= 0x2;
+			break;
+		case 'f':
+			res |= 0x1;
+			break;
+		default:
+			return -1;
+		}
+	}
+	return res;
+}
+
+static ut64 cqcheck(char **input) {
+	ut64 res = 0;
+	int i;
+	ut8 offset = 0;
+	
+	const char *conds[] = {
+		"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
+		"hi", "ls", "ge", "lt", "gt", "le", "al", "nv", 0
+	};
+	for (i = 0; conds[i]; i++) {
+		if (r_str_startswith (*input, conds[i])) {
+			res |= C_MATCH_BIT;
+			res |= i << 2;
+			*input += 2;
+			offset += 2;
+			break;
+		}
+	}
+	if (r_str_startswith (*input, ".n")) {
+		res |= DOTN_BIT;
+		*input += 2;
+		offset += 2;
+	} else
+	if (r_str_startswith (*input, ".w")) {
+		res |= DOTW_BIT;
+		*input += 2;
+		offset += 2;
+	}
+	
+	if (**input == '\0') {
+		return res;
+	}
+	*input -= offset;
+	return 0;
+}
+
+static ut64 opmask(char *input, char *opcode, ut64 allowed_mask) {
+	ut64 res = 0;
+	
+	r_str_case (input, false);
+	if (strlen (opcode) > strlen (input)) {
+		return 0;
+	}
+	if (r_str_startswith (input, opcode)) {
+		input += strlen (opcode);
+		res |= M_BIT;
+		res |= cqcheck (&input);
+		
+		if ((*input == 's') && (S_BIT & allowed_mask)) {
+			res |= S_BIT;
+			input++;
+		}
+		res |= cqcheck (&input);
+
+		if ((r_str_startswith (input, "wb")) && (WB_BIT & allowed_mask)) {
+			res |= WB_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "wt")) && (WT_BIT & allowed_mask)) {
+			res |= WT_BIT;
+			input += 2;
+		}
+		res |= cqcheck (&input);
+		if ((r_str_startswith (input, "db")) && (DB_BIT & allowed_mask)) {
+			res |= DB_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "ea")) && (EA_BIT & allowed_mask)) {
+			res |= EA_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "ia")) && (IA_BIT & allowed_mask)) {
+			res |= IA_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "fd")) && (FD_BIT & allowed_mask)) {
+			res |= FD_BIT;
+			input += 2;
+		}
+		res |= cqcheck (&input);
+		if ((*input == 'l') && (L_BIT & allowed_mask)) {
+			res |= L_BIT;
+			input++;
+		}
+		res |= cqcheck (&input);
+		if ((r_str_startswith (input, "bb")) && (BB_BIT & allowed_mask)) {
+			res |= BB_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "tt")) && (TT_BIT & allowed_mask)) {
+			res |= TT_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "bt")) && (BT_BIT & allowed_mask)) {
+			res |= BT_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "tb")) && (TB_BIT & allowed_mask)) {
+			res |= TB_BIT;
+			input += 2;
+		}
+		res |= cqcheck (&input);
+		if ((*input == 'w') && (W_BIT & allowed_mask)) {
+			res |= W_BIT;
+			input++;
+		}
+		if ((*input == 'b') && (B_BIT & allowed_mask)) {
+			res |= B_BIT;
+			input++;
+		} else
+	        if ((*input == 'h') && (H_BIT & allowed_mask)) {
+			res |= H_BIT;
+			input++;
+		} else
+		if ((*input == 'd') && (D_BIT & allowed_mask)) {
+			res |= D_BIT;
+			input++;
+		}
+		if ((*input == 't') && (T_BIT & allowed_mask)) {
+			res |= T_BIT;
+			input++;
+		}
+		if ((*input == 's') && (S_BIT & allowed_mask)) {
+			res |= S_BIT;
+			input++;
+		}
+		res |= cqcheck (&input);
+		if ((*input == 'r') && (R_BIT & allowed_mask)) {
+			res |= R_BIT;
+			input++;
+		}
+		res |= cqcheck (&input);
+		if ((*input == '2') && (TWO_BIT & allowed_mask)) {
+			res |= TWO_BIT;
+			input++;
+		}
+		if ((*input == '8') && (EIGHT_BIT & allowed_mask)) {
+			res |= EIGHT_BIT;
+			input++;
+		}
+		if ((r_str_startswith (input, "16")) && (SIXTEEN_BIT & allowed_mask)) {
+			res |= SIXTEEN_BIT;
+			input += 2;
+		}
+		res |= cqcheck (&input);
+		if ((*input == 'l') && (L_BIT & allowed_mask)) {
+			res |= L_BIT;
+			input++;
+		}
+		if ((*input == 'x') && (X_BIT & allowed_mask)) {
+			res |= X_BIT;
+			input++;
+		}
+		res |= cqcheck (&input);
+		if ((r_str_startswith (input, "id")) && (ID_BIT & allowed_mask)) {
+			res |= ID_BIT;
+			input += 2;
+		}
+		if ((r_str_startswith (input, "ie")) && (IE_BIT & allowed_mask)) {
+			res |= IE_BIT;
+			input += 2;
+		}
+		res |= cqcheck (&input);
+		if ((r_str_startswith (input, "sh")) && (SH_BIT & allowed_mask)) {
+			res |= SH_BIT;
+			input += 2;
+		}
+		res |= cqcheck (&input);
+		if (!(res & C_MATCH_BIT)) {
+			res |= 15 << 2; // nv is the default condition
+		}
+		if (*input == 0) {
+			return res;
+		}
+	}
+	return 0;
+}
+
+static ut32 itmask(char *input) {
+	ut32 res = 0;
+	ut32 i, length;
+	r_str_case (input, false);
+	if (2 > strlen (input)) {
+		return 0;
+	}
+	if (r_str_startswith (input, "it")) {
+		input += 2;
+		res |= 1; // matched
+		if (strlen(input) > 3) {
+			return 0;
+		}
+		res |= (strlen (input) & 0x3) << 4;
+		length = strlen (input);
+		for (i = 0; i < length; i++, input++ ) {
+			if (*input == 'e') {
+				res |= 1 << (3 - i);
+				continue;
+			}
+			if (*input == 't') {
+				continue;
+			}
+			return 0;
+		}
+		return res;
+	}
+	return 0;
+}
+
 static bool err;
 //decode str as number
-static int getnum(const char *str) {
+static ut64 getnum(const char *str) {
 	char *endptr;
 	err = false;
-	double val;
+	ut64 val;
 
 	if (!str) {
 		err = true;
@@ -145,7 +445,7 @@
 	while (*str == '$' || *str == '#') {
 		str++;
 	}
-	val = strtod (str, &endptr);
+	val = strtol (str, &endptr, 0);
 	if (str != endptr && *endptr == '\0') {
 		return val;
 	}
@@ -153,6 +453,23 @@
 	return 0;
 }
 
+static ut64 getnumbang(const char *str) {
+	ut64 res;
+
+	if (!str || !*str || !r_str_endswith (str, "!")) {
+		err = true;
+		return 0;
+	}
+	char *temp = r_str_ndup (str, strlen (str) - 1);
+	if (!temp) {
+		return -1;
+	}
+	err = false;
+	res = getnum (temp);
+	free (temp);
+	return res; // err propagates
+}
+	
 static ut32 getimmed8(const char *str) {
 	ut32 num = getnum (str);
 	if (err) {
@@ -174,6 +491,109 @@
 	}
 }
 
+static st32 firstsigdigit (ut32 num) {
+	st32 f = -1;
+	st32 b = -1;
+	ut32 forwardmask = 0x80000000;
+	ut32 backwardmask = 0x1;
+	ut32 i;
+	for (i = 0; i < 32; i++ ) {
+		if ( (forwardmask & num) && (f == -1)) {
+			f = i;
+		}
+		if ( (backwardmask & num) && (b == -1)) {
+			b = 32-i;
+		}
+		forwardmask >>= 1;
+		backwardmask <<= 1;
+	}
+
+	if ((b-f) < 9) {
+		return f;
+	}
+	return -1;
+}
+
+static ut32 getthbimmed(st32 number) {
+	ut32 res = 0;
+	if (number < 0) {
+		res |= 1 << 18;
+	}
+	number >>= 1;
+	res |= (( number & 0xff) << 8);
+	number >>= 8;
+	res |= ( number & 0x07);
+	number >>= 3;
+	res |= (( number & 0xff) << 24);
+	number >>= 8;
+	res |= (( number & 0x3) << 16);
+	number >>= 2;
+	if (number < 0) {
+		res |= (( number & 0x1) << 3);
+		number >>= 1;
+		res |= (( number & 0x1) << 5);
+	} else {
+		res |= ((!( number & 0x1)) << 3);
+		number >>= 1;
+		res |= ((!( number & 0x1)) << 5);
+	}
+	return res;
+}
+
+static ut32 getthzeroimmed12(ut32 number) {
+	ut32 res = 0;
+	res |= (number & 0x800) << 7;
+	res |= (number & 0x700) >> 4;
+	res |= (number & 0x0ff) << 8;
+	return res;
+}
+
+static ut32 getthzeroimmed16(ut32 number) {
+	ut32 res = 0;
+	res |= (number & 0xf000) << 12;
+	res |= (number & 0x0800) << 7;
+	res |= (number & 0x0700) >> 4;
+	res |= (number & 0x00ff) << 8;
+	return res;
+}
+
+static ut32 getthimmed12(const char *str) {
+	ut64 num = getnum (str);
+	if (err) {
+		return 0;
+	}
+
+	st32 FSD = 0;
+	ut64 result = 0;
+	if (num <= 0xff) {
+		return num << 8;
+	} else 	if ( ((num & 0xff00ff00) == 0) && ((num & 0x00ff0000) == ((num & 0x000000ff) << 16)) ) {
+		result |= (num & 0x000000ff) << 8;
+		result |= 0x00000010;
+		return result;
+	} else if ( ((num & 0x00ff00ff) == 0) && ((num & 0xff000000) == ((num & 0x0000ff00) << 16)) ) {
+		result |= num & 0x0000ff00;
+		result |= 0x00000020;
+		return result;
+	} else if ( ((num & 0xff000000) == ((num & 0x00ff0000) << 8)) && ((num & 0xff000000) == ((num & 0x0000ff00) << 16)) && ((num &0xff000000) == ((num & 0x000000ff) << 24)) ) {
+		result |= num & 0x0000ff00;
+		result |= 0x00000030;
+		return result;
+	} else {
+		FSD = firstsigdigit(num);
+		if (FSD != -1) {
+		        result |= ((num >> (24-FSD)) & 0x0000007f) << 8;
+			result |= ((8+FSD) & 0x1) << 15;
+			result |= ((8+FSD) & 0xe) << 3;
+			result |= ((8+FSD) & 0x10) << 14;
+			return result;
+		} else {
+			err = true;
+			return 0;
+		}
+	}
+}
+
 static char *getrange(char *s) {
 	char *p = NULL;
 	while (s && *s) {
@@ -191,26 +611,19 @@
 	return p;
 }
 
-#if 0
-static int getshift_unused (const char *s) {
-	int i;
-	const char *shifts[] = { "lsl", "lsr", "asr", "ror", NULL };
-	for (i=0; shifts[i]; i++)
-		if (!strcmpnull (s, shifts[i]))
-			return i * 0x20;
-	return 0;
-}
-#endif
-
 //ret register #; -1 if failed
 static int getreg(const char *str) {
 	int i;
+	char *ep;
 	const char *aliases[] = { "sl", "fp", "ip", "sp", "lr", "pc", NULL };
 	if (!str || !*str) {
 		return -1;
 	}
 	if (*str == 'r') {
-		int reg = atoi (str + 1);
+		int reg = strtol (str + 1, &ep, 10);
+		if ((ep[0] != '\0') || (str[1] == '\0')) {
+			return -1;
+		}
 		if (reg < 16 && reg >= 0) {
 			return reg;
 		}
@@ -223,730 +636,5405 @@
 	return -1;
 }
 
-static int thumb_getreg(const char *str) {
-	if (!str)
-		return -1;
-	if (*str == 'r')
-		return atoi (str+1);
-	//FIXME Note that pc is only allowed in pop; lr in push in Thumb1 mode.
-	if (!strcmpnull (str, "pc") || !strcmpnull(str,"lr"))
-		return 8;
-	return -1;
-}
 
-static int getlist(char *op) {
-	int reg, list = 0;
-	char *ptr = strchr (op, '{');
-	if (ptr) {
-		do {
-			ptr++;
-			while (*ptr && *ptr == ' ') ptr++;
-			reg = getreg (ptr);
-			if (reg == -1)
-				break;
-			list |= (1 << reg);
-			while (*ptr && *ptr!=',') ptr++;
-		} while (*ptr && *ptr == ',');
+static st32 getlistmask(char *input) {
+	st32 tempres, res = 0;
+	int i, j;
+	int start, end;
+	char *temp = NULL;
+	char *temp2 = NULL;
+	char *otemp = NULL;
+	temp2 = malloc (strlen (input) + 1);
+	if (!temp2) {
+		res = -1;
+		goto end;
 	}
-	return list;
-}
-
-static ut32 getshift(const char *str) {
-	char type[128];
-	char arg[128];
-	char *space;
-	ut32 i=0, shift=0;
-	const char *shifts[] = {
-		"LSL", "LSR", "ASR", "ROR",
-		0, "RRX" // alias for ROR #0
-	};
-
-	strncpy (type, str, sizeof (type) - 1);
-	// XXX strcaecmp is probably unportable
-	if (!strcasecmp (type, shifts[5])) {
-		// handle RRX alias case
-		shift = 6;
-	} else { // all other shift types
-		space = strchr (type, ' ');
-		if (!space) {
-			return 0;
+	temp = (char *)malloc (strlen (input) + 1);
+	if (!temp) {
+		res = -1;
+		goto end;
+	}
+	otemp = temp;
+	while (*input != '\0') {
+		for (; *input == ' '; input++);
+		for (i = 0; input[i] != ',' && input[i] != '\0'; i++);
+		strncpy (temp, input, i);
+		temp[i] = 0;
+
+		input += i;
+		if (*input != '\0') {
+			input++;
 		}
-		*space = 0;
-		strncpy (arg, ++space, sizeof(arg) - 1);
 
-		for (i = 0; shifts[i]; i++) {
-			if (!strcasecmp (type, shifts[i])) {
-				shift = 1;
-				break;
+		for (i = 0; temp[i] != '-' && temp[i] != '\0'; i++);
+		if (i == strlen (temp)) {
+			tempres = getreg (temp);
+			if (tempres == -1 || tempres > 15) {
+				res = -1;
+				goto end;
 			}
-		}
-		if (!shift) {
-			return 0;
-		}
-		shift = i * 2;
-		if ((i = getreg (arg)) != -1) {
-			i <<= 8; // set reg
-//			i|=1; // use reg
-			i |= (1 << 4); // bitshift
-			i |= shift << 4; // set shift mode
-			if (shift == 6) i |= (1 << 20);
+			res |= 1 << tempres;
 		} else {
-			char *bracket = strchr (arg, ']');
-			if (bracket) {
-				*bracket = '\0';
+			strncpy (temp2, temp, i);
+			temp2[i] = 0;
+			temp += i + 1;
+			start = getreg (temp2);
+			if (start == -1 || start > 15) {
+				res = -1;
+				goto end;
+			}
+			end = getreg (temp);
+			if (end == -1 || end > 15) {
+				res = -1;
+				goto end;
+			}
+
+			for (j = start; j <= end; j++ ) {
+				res |= 1 << j;
 			}
-			i = getnum (arg);
-			// ensure only the bottom 5 bits are used
-			i &= 0x1f;
-			if (!i) i = 32;
-			i = (i * 8);
-			i |= shift; // lsl, ror, ...
-			i = i << 4;
 		}
 	}
+end:
+	free (otemp);
+	free (temp2);
+	return res;
+}
 
-	return i;
+static st32 getregmemstart(const char *input) {
+	if ((strlen (input) < 1) || (!(*input == '['))) {
+		return -1;
+	}
+	input++;
+	return getreg (input);
+}
+	
+static st32 getregmemstartend(const char *input) {
+	st32 res;
+	if (!input || (strlen (input) < 2) || (*input != '[') || !r_str_endswith (input, "]")) {
+		return -1;
+	}
+	input++;
+	char *temp = r_str_ndup (input, strlen (input) - 1);
+	if (!temp) {
+		return -1;
+	}
+	res = getreg (temp);
+	free (temp);
+	return res;
 }
+	
+static st32 getregmemend(const char *input) {
+	st32 res;
+	if (!input || !*input || !r_str_endswith (input, "]")) {
+		return -1;
+	}
 
-static void arm_opcode_parse(ArmOpcode *ao, const char *str) {
-	int i;
-	memset (ao, 0, sizeof (ArmOpcode));
-	if (strlen (str)+1>=sizeof (ao->op))
-		return;
-	strncpy (ao->op, str, sizeof (ao->op)-1);
-	strcpy (ao->opstr, ao->op);
-	ao->a[0] = strchr (ao->op, ' ');
-	for (i=0; i<15; i++) {
-		if (ao->a[i]) {
-			*ao->a[i] = 0;
-			ao->a[i+1] = strchr (++ao->a[i], ',');
-		} else break;
+	char *temp = r_str_ndup (input, strlen (input) - 1);
+	if (!temp) {
+		return -1;
 	}
-	if (ao->a[i]) {
-		*ao->a[i] = 0;
-		ao->a[i]++;
+	res = getreg (temp);
+	free (temp);
+	return res;
+}
+	
+static st32 getreglist(const char *input) {
+	st32 res;
+	
+	if (!input || (strlen (input) < 2) || (*input != '{') || !r_str_endswith (input, "}")) {
+		return -1;
 	}
-	for (i=0; i<16; i++) {
-		while (ao->a[i] && *ao->a[i] == ' ') {
-			ao->a[i]++;
-		}
+	if (*input) {
+		input++;
+	}
+	char *temp = r_str_ndup (input, strlen (input) - 1);
+	if (!temp) {
+		return -1;
 	}
+	res = getlistmask (temp);
+	free (temp);
+	return res;
 }
 
-static inline int arm_opcode_cond(ArmOpcode *ao, int delta) {
-	const char *conds[] = {
-		"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
-		"hi", "ls", "ge", "lt", "gt", "le", "al", "nv", 0
-	};
-	int i, cond = 14; // 'always' is default
-	char *c = ao->op+delta;
-	for (i=0; conds[i]; i++) {
-		if (!strcmpnull (c, conds[i])) {
-			cond = i;
-			break;
-		}
+static st32 getnummemend (const char *input) {
+	st32 res;
+	err = false;
+	if (!input || !*input || !r_str_endswith (input, "]")) {
+		err = true;
+		return -1;
 	}
-	ao->o |= cond << 4;
-	return cond;
+	char *temp = r_str_ndup (input, strlen (input) - 1);
+	if (!temp) {
+		err = true;
+		return -1;
+	}
+	res = getnum (temp);
+	free (temp);
+	return res;
 }
 
-static void thumb_swap (ut32 *a) {
-	ut32 a2 = *a;
-	ut8 *b = (ut8 *)a;
-	ut8 *b2 = (ut8 *) & a2;
-	b[0] = b2[1];
-	b[1] = b2[0];
-	b[2] = b2[3];
-	b[3] = b2[2];
+static st32 getnummemendbang (const char *input) {
+	st32 res;
+	err = false;
+	if (!input || (strlen (input) < 2) || (input[strlen(input) - 2] != ']' || !r_str_endswith (input, "!"))) {
+		err = true;
+		return 0;
+	}
+	char *temp = r_str_ndup (input, strlen (input) - 2);
+	if (!temp) {
+		err = true;
+		return 0;
+	}
+	res = getnum (temp);
+	free (temp);
+	return res;
 }
 
-// TODO: group similar instructions like for non-thumb
-static int thumb_assemble(ArmOpcode *ao, ut64 off, const char *str) {
-	int reg, j;
-	ao->o = UT32_MAX;
-	if (!strcmpnull (ao->op, "pop") && ao->a[0]) {
-		ao->o = 0xbc;
-		if (*ao->a[0] ++== '{') {
-			// XXX: inverse order?
-			for (j=0; j<16; j++) {
-				if (ao->a[j] && *ao->a[j]) {
-					int sr, er;
-					char *ers;
-					getrange (ao->a[j]); // XXX filter regname string
-					sr = er = thumb_getreg (ao->a[j]);
-					if ((ers = strchr (ao->a[j], '-'))) { // register sequence
-						er = thumb_getreg (ers+1);
-					}
-					for (reg = sr; reg <= er; reg++) {
-						if (reg != -1) {
-							if (reg < 8)
-								ao->o |= 1 << (8 + reg);
-							if (reg == 8) {
-								ao->o |= 1;
-							}
-							//	else ignore...
-						}
-					}
-				}
-			}
-		} else ao->o |= getnum (ao->a[0]) << 24; // ???
-		return 2;
-	} else
-	if (!strcmpnull (ao->op, "push") && ao->a[0]) {
-		ao->o = 0xb4;
-		if (*ao->a[0] ++== '{') {
-			for (j = 0; j < 16; j++) {
-				if (ao->a[j] && *ao->a[j]) {
-					getrange (ao->a[j]); // XXX filter regname string
-					reg = thumb_getreg (ao->a[j]);
-					if (reg != -1) {
-						if (reg < 8)
-							ao->o |= 1 << (8 + reg);
-						if (reg == 8)
-							ao->o |= 1;
-					//	else ignore...
-					}
-				}
-			}
-		} else ao->o |= getnum (ao->a[0]) << 24; // ???
-		return 2;
+static st32 getregmembang(const char *input) {
+	st32 res;
+	if (!input || !*input || !r_str_endswith (input, "!")) {
+		return -1;
+	}
+	char *temp = r_str_ndup (input, strlen (input) - 1);
+	if (!temp) {
+		return -1;
+	}
+	res = getreg (temp);
+	free (temp);
+	return res;
+}
+
+static int getcoproc(const char *str) {
+	char *ep;
+	if (!str || !*str) {
+		return -1;
+	}
+	if (*str == 'p') {
+		int coproc = strtol (str + 1, &ep, 10);
+		if ((ep[0] != '\0') || (str[1] == '\0')) {
+			return -1;
+		}
+		if (coproc < 16 && coproc >= 0) {
+			return coproc;
+		}
+	}
+	return -1;
+}
+
+static int getcoprocreg(const char *str) {
+	char *ep;
+	
+	if (!str || !*str) {
+		return -1;
+	}
+	if (r_str_startswith (str, "c")) {
+		int reg = strtol (str + 1, &ep, 10);
+		if ((ep[0] != '\0') || (str[1] == '\0')) {
+			return -1;
+		}
+		if (reg < 16 && reg >= 0) {
+			return reg;
+		}
+	}
+	return -1;
+}
+
+static ut8 interpret_msrbank (char *str, ut8 *spsr) {
+	const char fields[] = {'c', 'x', 's', 'f', 0};
+	int res = 0;
+	int i, j;
+	if (r_str_startswith (str, "spsr_")) {
+		*spsr = 1;
+	} else {
+		*spsr = 0;
+	}		
+	
+	if (r_str_startswith (str, "apsr_")) {
+		if (!(strcmp (str+5, "g"))) {
+			return 0x4;
+		}
+		if (!(strcmp (str+5, "nzcvq"))) {
+			return 0x8;
+		}
+		if (!(strcmp (str+5, "nzcvqg"))) {
+			return 0xc;
+		}
+	}
+	if (r_str_startswith (str, "cpsr_") || r_str_startswith (str, "spsr_")) {
+		for (i = 0; str[5+i]; i++) {
+			for (j = 0; fields[j]; j++) {
+				if (str[5+i] == fields[j]) {
+					break;
+				}
+			}
+			if (!(fields[j])) {
+				return 0;
+			}
+			res |= 1 << j;
+		}
+		return res;
+	}
+	return 0;
+}
+		
+static ut32 thumb_getshift(const char *str) {
+	// only immediate shifts are ever used by thumb-2. Bit positions are different from ARM.
+	const char *shifts[] = {
+		"LSL", "LSR", "ASR", "ROR", 0, "RRX"
+	};
+	char *type = strdup (str);
+	char *arg;
+	char *space;
+	ut32 res = 0;
+	ut32 shift = false;
+	err = false;
+	ut32 argn;
+	ut32 i;
+	
+	r_str_case (type,true);
+	
+	if (!strcmp (type, shifts[5])) {
+		// handle RRX alias case
+		res |= 3 << 12;	
+		free (type);
+		return res;
+	}
+	
+	space = strchr (type, ' ');
+	if (!space) {
+		free (type);
+		err = true;
+		return 0;
+	}
+	*space = 0;
+	arg = strdup (++space);
+	
+	for (i = 0; shifts[i]; i++) {
+		if (!strcmp (type, shifts[i])) {
+			shift = true;
+			break;
+		}
+	}
+	if (!shift) {
+		err = true;
+		free (type);
+		free (arg);
+		return 0;
+	}
+	res |= i << 12;
+		
+	argn = getnum (arg);
+	if (err || argn > 32) {
+		err = true;
+		free (type);
+		free (arg);
+		return 0;
+	}
+	res |= ( (argn & 0x1c) << 2);
+	res |= ( (argn & 0x3) << 14);
+
+	free (type);
+	free (arg);
+	return res;
+}
+
+static st32 getshiftmemend(const char *input) {
+	st32 res;
+	if (!input || !*input || !r_str_endswith (input, "]")) {
+		return -1;
+	}
+
+	char *temp = r_str_ndup (input, strlen (input) - 1);
+	if (!temp) {
+		return -1;
+	}
+	res = thumb_getshift (temp);
+	free (temp);
+	return res;
+}
+
+void collect_list(char *input[]) {
+	if (input[0] == NULL) {
+		return;
+	}
+	char *temp  = malloc (500);
+	if (!temp) {
+		return;
+	}
+	temp[0] = 0;
+	int i;
+	int conc = 0;
+	int start, end = 0;
+	int arrsz;
+	for (arrsz = 1; input[arrsz] != NULL; arrsz++);
+
+	for (i = 0; input[i]; i++) {
+		if (conc) {
+			strcat (temp, ", ");
+			strcat (temp, input[i]);
+		}
+		if (input[i][0] == '{') {
+			conc = 1;
+			strcat (temp, input[i]);
+			start = i;
+		}
+		if ((conc) & (input[i][strlen (input[i]) - 1] == '}')) {
+			conc = 0;
+			end = i;
+		}
+	}
+	if (end == 0) {
+		free (temp);
+		return;
+	}
+	input[start] = temp;
+	for (i = start + 1; i < arrsz; i++) {
+		input[i] = input[(end-start) + i];
+	}
+	input[i] = NULL;
+}
+
+static ut64 thumb_selector(char *args[]) {
+	collect_list(args);
+	ut64 res = 0;
+	ut8 i;
+	for (i = 0; i < 15; i++) {
+		if (args[i] == NULL) {
+			break;
+		}
+		if (getreg (args[i]) != -1) {
+			res |= 1 << (i*4);
+			continue;
+		}
+		err = false;
+		getnum (args[i]);
+		if (!err) {
+			res |= 2 << (i*4);
+			continue;
+		}
+		err = false;   	
+		thumb_getshift (args[i]);
+		if (!err) {
+			res |= 3 << (i*4);
+			continue;
+		}
+		if (getcoproc (args[i]) != -1) {
+			res |= 4 << (i*4);
+			continue;
+		}
+		if (getcoprocreg (args[i]) != -1) {
+			res |= 5 << (i*4);
+			continue;
+		}
+		if (getregmemstart (args[i]) != -1) {
+			res |= 6 << (i*4);
+			continue;
+		}
+		if (getregmemstartend (args[i]) != -1) {
+			res |= 7 << (i*4);
+			continue;
+		}
+		err = false;
+		getnummemend(args[i]);
+		if (!err) {
+			res |= 8 << (i*4);
+			continue;
+		}
+		err = false;
+		getnummemendbang(args[i]);
+		if (!err) {
+			res |= 9 << (i*4);
+			continue;
+		}
+		if (getregmembang (args[i]) != -1) {
+			res |= 0xa << (i*4);
+			continue;
+		}
+		if (getreglist (args[i]) != -1) {
+			res |= 0xb << (i*4);
+			continue;
+		}
+		if (getregmemend (args[i]) != -1) {
+			res |= 0xc << (i*4);
+			continue;
+		}
+		if (getshiftmemend (args[i]) != -1) {
+			res |= 0xd << (i*4);
+			continue;
+		}
+		err = false;
+		getnumbang(args[i]);
+		if (!err) {
+			res |= 0xe << (i*4);
+			continue;
+		}
+		res |= 0xf << (i*4);
+	}
+	err = false;
+	return res;
+}
+		
+static ut32 getshift(const char *str) {
+	char type[128];
+	char arg[128];
+	char *space;
+	ut32 i=0, shift=0;
+	const char *shifts[] = {
+		"LSL", "LSR", "ASR", "ROR",
+		0, "RRX" // alias for ROR #0
+	};
+
+	strncpy (type, str, sizeof (type) - 1);
+	// XXX strcaecmp is probably unportable
+	if (!r_str_casecmp (type, shifts[5])) {
+		// handle RRX alias case
+		shift = 6;
+	} else { // all other shift types
+		space = strchr (type, ' ');
+		if (!space) {
+			return 0;
+		}
+		*space = 0;
+		strncpy (arg, ++space, sizeof(arg) - 1);
+
+		for (i = 0; shifts[i]; i++) {
+			if (!r_str_casecmp (type, shifts[i])) {
+				shift = 1;
+				break;
+			}
+		}
+		if (!shift) {
+			return 0;
+		}
+		shift = i * 2;
+		if ((i = getreg (arg)) != -1) {
+			i <<= 8; // set reg
+//			i|=1; // use reg
+			i |= (1 << 4); // bitshift
+			i |= shift << 4; // set shift mode
+			if (shift == 6) i |= (1 << 20);
+		} else {
+			char *bracket = strchr (arg, ']');
+			if (bracket) {
+				*bracket = '\0';
+			}
+			// ensure only the bottom 5 bits are used
+			i &= 0x1f;
+			if (!i) i = 32;
+			i = (i * 8);
+			i |= shift; // lsl, ror, ...
+			i = i << 4;
+		}
+	}
+
+	return i;
+}
+
+static void arm_opcode_parse(ArmOpcode *ao, const char *str) {
+	int i;
+	memset (ao, 0, sizeof (ArmOpcode));
+	if (strlen (str)+1>=sizeof (ao->op))
+		return;
+	strncpy (ao->op, str, sizeof (ao->op)-1);
+	strcpy (ao->opstr, ao->op);
+	ao->a[0] = strchr (ao->op, ' ');
+	for (i=0; i<15; i++) {
+		if (ao->a[i]) {
+			*ao->a[i] = 0;
+			ao->a[i+1] = strchr (++ao->a[i], ',');
+		} else break;
+	}
+	if (ao->a[i]) {
+		*ao->a[i] = 0;
+		ao->a[i]++;
+	}
+	for (i=0; i<16; i++) {
+		while (ao->a[i] && *ao->a[i] == ' ') {
+			ao->a[i]++;
+		}
+	}
+}
+
+static inline int arm_opcode_cond(ArmOpcode *ao, int delta) {
+	const char *conds[] = {
+		"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
+		"hi", "ls", "ge", "lt", "gt", "le", "al", "nv", 0
+	};
+	int i, cond = 14; // 'always' is default
+	char *c = ao->op+delta;
+	for (i=0; conds[i]; i++) {
+		if (!strcmpnull (c, conds[i])) {
+			cond = i;
+			break;
+		}
+	}
+	ao->o |= cond << 4;
+	return cond;
+}
+
+static st32 thumb_getoffset(char *label, ut64 cur) {
+	st32 res = r_num_math (NULL, label);
+	res -= 4;
+	res -= cur; // possible integer underflow
+	//printf("thumb_getoffset: %s, %lld, %lld\n", label, res, cur);
+	return res;
+}
+
+static st8 std_16bit_2reg(ArmOpcode *ao, ut64 m) {
+	ut8 rd = getreg (ao->a[0]);
+	ut8 rn = getreg (ao->a[1]);
+	if ( (rd < 8) && (rn < 8) && !(m & DOTW_BIT)) {
+		ao->o |= rd << 8;
+		ao->o |= rn << 11;
+		return 2;
+	}
+	return 0;
+}
+
+static st8 mem_16bit_2reg(ArmOpcode *ao, ut64 m) {
+	ut8 rd = getreg (ao->a[0]);
+	ut8 rn = getregmemstart (ao->a[1]);
+	if ( (rd < 8) && (rn < 8) && !(m & DOTW_BIT)) {
+		ao->o |= rd << 8;
+		ao->o |= rn << 11;
+		return 2;
+	}
+	return 0;
+}
+
+static st8 std_32bit_2reg(ArmOpcode *ao, ut64 m, bool shift) {
+	ut8 rd = getreg (ao->a[0]);
+	ut8 rn = getreg (ao->a[1]);
+	if ((rd > 15) || (rn > 15) || (m & DOTN_BIT)) {
+		return -1;
+	}
+	if (m & S_BIT) {
+		ao->o |= 1 << 28;
+	}
+	if (shift) {
+		err = false;
+		ut32 shiftnum = thumb_getshift (ao->a[2]);
+		if (err) {
+			return -1;
+		}
+		ao->o |= shiftnum;
+		ao->o |= rd << 24;
+		ao->o |= rn << 8;
+	} else {
+		ao->o |= rd;
+		ao->o |= rn << 24;
+	}
+	return 4;
+}
+
+static st8 mem_32bit_2reg(ArmOpcode *ao, ut64 m) {
+	ut8 rd = getreg (ao->a[0]);
+	ut8 rn = getregmemstart (ao->a[1]);
+	if ((rd > 15) || (rn > 15) || (m & DOTN_BIT)) {
+		return -1;
+	}
+	ao->o |= rd << 4;
+	ao->o |= rn << 24;
+	return 4;
+}
+
+static st8 std_32bit_3reg(ArmOpcode *ao, ut64 m, bool shift) {
+	ut8 rd = getreg (ao->a[0]);
+	ut8 rn = getreg (ao->a[1]);
+	ut8 rm = getreg (ao->a[2]);
+	if ((rd > 15) || (rn > 15) || (rm > 15) || (m & DOTN_BIT)) {
+		return -1;
+	}
+	ao->o |= rd;
+	ao->o |= rn << 24;
+	ao->o |= rm << 8;
+	if (shift) {
+		err = false;
+		ut32 shiftnum = thumb_getshift (ao->a[3]);
+		if (err) {
+			return -1;
+		}
+		ao->o |= shiftnum;
+	}
+	if (m & S_BIT) {
+		ao->o |= 1 << 28;
+	}
+	return 4;
+}
+
+static void std_opt_2(ArmOpcode *ao) {
+	ao->a[2] = ao->a[1];
+	ao->a[1] = ao->a[0];
+}
+
+static void std_opt_3(ArmOpcode *ao) {
+	ao->a[3] = ao->a[2];
+	ao->a[2] = ao->a[1];
+	ao->a[1] = ao->a[0];
+}
+
+// TODO: group similar instructions like for non-thumb
+static int thumb_assemble(ArmOpcode *ao, ut64 off, const char *str) {
+	ut64 m;
+	ao->o = UT32_MAX;
+	if (!strcmpnull (ao->op, "udf")) {
+		ao->o = 0xde;
+		ao->o |= getnum (ao->a[0]) << 8;
+		return 2;
+	} else
+	if ((m = opmask (ao->op, "add", S_BIT | W_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 num = getnum (ao->a[2]);
+
+			if ((reg1 > 15) || (reg2 > 15)) {
+				return -1;
+			}
+			
+			if (reg2 == 13) {
+				if ((reg1 < 8) && (num < 1024) && (num % 4 == 0) && (!(m & DOTW_BIT)) && (!(m & W_BIT))) {
+					ao->o = 0x00a8;
+					ao->o |= reg1;
+					ao->o |= (num >> 2) << 8;
+					return 2;
+				}
+
+				if ((reg1 == 13) && (num < 512) && (num % 4 == 0) && (!(m & DOTW_BIT)) && (!(m & W_BIT))) {
+					ao->o = 0x00b0;
+					ao->o |= (num >> 2) << 8;
+					return 2;
+				}
+
+				err = false;
+				ut32 thnum = getthimmed12 (ao->a[2]);
+				if (!err && (!(m & W_BIT))) {
+					ao->o = 0x0df10000;
+					ao->o |= reg1;
+					ao->o |= thnum;
+					if (m & S_BIT) {
+						ao->o |= 1 << 28;
+					}
+					return 4;
+				}
+
+				if (num > 4095) {
+					return -1;
+				}
+
+				ao->o = 0x0df20000;
+				ao->o |= reg1;
+				ao->o |= getthzeroimmed12 (num);
+				return 4;
+			}
+
+			if (num < 8) {
+				ao->o = 0x001c;
+				ao->o |= (num & 0x3) << 14;
+				ao->o |= (num >> 2);
+				if (std_16bit_2reg (ao, m)) {
+					return 2;
+				}
+			}
+
+			if ((reg1 < 8) && (reg1 == reg2) && (num < 256)) {
+				ao->o = 0x0030;
+				ao->o |= reg1;
+				ao->o |= num << 8;
+				return 2;
+			}
+
+			err = false;
+			ut32 thnum = getthimmed12 (ao->a[2]);
+			if (!err && (!(m & W_BIT))) {
+				ao->o = 0x00f10000;
+				ao->o |= thnum;
+				return std_32bit_2reg (ao, m, false);
+			}
+
+			if (num > 4095) {
+				return -1;
+			}
+
+			ao->o = 0x00f20000;
+			ao->o |= getthzeroimmed12 (num);
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut32 shift = thumb_getshift (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15)) {
+				return -1;
+			}
+				
+			if (reg2 == 13) {
+				if ((reg1 == reg3) && (!(m & DOTW_BIT)) && (shift == 0)) {
+					ao->o = 0x6844;
+					ao->o |= (reg1 & 0x7) << 8;
+					ao->o |= (reg1 >> 3) << 15;
+					return 2;
+				}
+
+				if ((reg1 == 13) && (!(m & DOTW_BIT)) && (shift == 0)) {
+					ao->o = 0x8544;
+					ao->o |= reg3 << 11;
+					return 2;
+				}
+
+				ao->o = 0x0deb0000;
+				ao->o |= reg1;
+				ao->o |= reg3 << 8;
+				ao->o |= shift;
+				if (m & S_BIT) {
+					ao->o |= 1 << 28;
+				}
+				return 4;
+			}
+
+			if ((reg3 < 8) && (!(m & DOTW_BIT)) && (shift == 0)) {
+				ao->o = 0x0018;
+				ao->o |= (reg3 >> 2);
+				ao->o |= (reg3 & 0x3) << 14;
+				if (std_16bit_2reg (ao, m)) {
+					return 2;
+				}
+			}
+
+			if ((reg1 == reg2) && (!(m & DOTW_BIT)) && (shift == 0)) {
+				ao->o = 0x0044;
+				ao->o |= (reg1 & 0x7) << 8;
+				ao->o |= (reg1 >> 3) << 15;
+				ao->o |= reg3 << 11;
+				return 2;
+			}
+
+			ao->o = 0x00eb0000;
+			return std_32bit_3reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "adc", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			ao->o = 0x40f10000;
+			ao->o |= getthimmed12 (ao->a[2]);
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0x4041;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x40eb0000;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG_SHIFT: {
+			std_opt_3 (ao);
+		        }
+			// intentional fallthrough
+			// a bit naughty, perhaps?
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0x40eb0000;
+			return std_32bit_3reg(ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "adr", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg = getreg (ao->a[0]);
+			st32 label = getnum (ao->a[1]);
+			if ( !(m & DOTW_BIT) && (reg < 8) && (label < 1024) && (label >= 0) && (label % 4 == 0)) {
+				ao->o = 0x00a0;
+				ao->o |= reg;
+				ao->o |= (label / 4) << 8;
+				return 2;
+			} else if ((label < 0) && (label > -4096)) {
+				if (m & DOTN_BIT) {
+					// this is explicitly an error
+					return -1;
+				}
+				ao->o = 0xaff20000;
+				ao->o |= reg;
+				ao->o |= getthzeroimmed12 (-label);
+				return 4;
+			} else if ((label > 0) && (label < 4096)) {
+				if (m & DOTN_BIT) {
+					// this is explicitly an error
+					return -1;
+				}
+				ao->o = 0x0ff20000;
+				ao->o |= reg;
+				ao->o |= getthzeroimmed12 (label);
+				return 4;
+			}
+			return -1;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "and", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			ao->o = 0x0040;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x00ea0000;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			ut32 imm = getthimmed12 (ao->a[2]);
+			ao->o = 0x00f00000;
+			ao->o |= imm;
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG_SHIFT: {
+			std_opt_3 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0x00ea0000;
+			return std_32bit_3reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "asr", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 imm = getnum (ao->a[2]);
+			if (((int)imm < 1) && ((int)imm > 32)) {
+				return -1;
+			}
+			ao->o = 0x0010;
+			ao->o |= (imm & 0x3) << 14;
+			ao->o |= (imm & 0x1c) >> 2;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			ao->o = 0x4fea2000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			ao->o |= (imm & 0x3) << 14;
+			ao->o |= (imm & 0x1c) << 2;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0x0041;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x40fa00f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "b", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_CONST: {
+			st32 offset = thumb_getoffset (ao->a[0], off);
+			if (offset % 2 != 0) {
+				return -1;
+			}
+
+			if ((m & C_BITS) == C_BITS) {
+				if ((offset >= -2048) && (offset <= 2046) && (!(m & DOTW_BIT))) {
+					ao->o = 0x00e0;
+					ao->o |= ((offset/2 & 0xff) << 8);
+					ao->o |= ((offset/2 & 0x700) >> 8);
+					return 2;
+				}
+				if ((offset < -16777216) || (offset > 16777214) || (offset % 2 != 0)) {
+					return -1;
+				}
+				ao->o = 0x00f00090;
+				ao->o |= getthbimmed(offset);
+				return 4;
+			} else {
+				if ((offset >= -256) && (offset <= 254) && (!(m & DOTW_BIT))) {
+					ao->o = 0x00d0;
+					ao->o |= (ut16) ((offset/2) << 8);
+					ao->o |= ((m & C_BITS) >> 2);
+					return 2;
+				}
+				if ((offset < -1048576) || (offset > 1048574) || (offset % 2 != 0)) {
+					return -1;
+				}
+
+				ao->o = 0x00f00080;
+				ao->o |= (ut32)(offset & 0x80000) >> 16;
+				ao->o |= (ut32)(offset & 0x40000) >> 13;
+				ao->o |= (ut32)(offset & 0x3f000) << 12;
+				ao->o |= (ut32)(offset & 0xe00) >> 9;
+				ao->o |= (ut32)(offset & 0x1fe) << 7;
+				if (offset < 0) {
+					ao->o |= 1 << 18;
+				}
+				ao->o |= (((m & C_BITS) & 0xc) << 28);
+				ao->o |= (((m & C_BITS) & 0x30) << 12);
+				return 4;
+			}
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "bl", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_CONST: {
+			st32 offset = thumb_getoffset (ao->a[0], off);
+			ao->o = 0x00f000d0;
+			if ((offset > 16777214) || (offset < -16777216) || (offset % 2 != 0)) {
+				return -1;
+			}
+			ao->o |= getthbimmed(offset);
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "bx", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG: {
+			ut32 reg1 = getreg (ao->a[0]);
+			ao->o = 0x0047;
+			ao->o |= reg1 << 11;
+			return 2;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else 
+	if (( m = opmask (ao->op, "blx", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG: {
+			ut32 reg1 = getreg (ao->a[0]);
+			ao->o = 0x8047;
+			ao->o |= reg1 << 11;
+			return 2;
+		        }
+			break;
+		case THUMB_CONST: {
+			st32 offset = thumb_getoffset (ao->a[0], off);
+			ao->o = 0x00f000c0;
+			if ((offset > 16777214) || (offset < -16777216) || (offset % 2 != 0)) {
+				return -1;
+			}
+			offset += off & 0x2; // (Align(PC,4)
+			ao->o |= getthbimmed (offset);
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "bfc", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST_CONST: {
+			if (m & DOTN_BIT) {
+				// this is explicitly an error
+				return -1;
+			}
+			ut8 reg1 = getreg (ao->a[0]);
+			ut32 lsb = getnum (ao->a[1]);
+			ut32 width = getnum (ao->a[2]);
+			ut32 msb = lsb + width - 1;
+			if ((lsb > 31) || (msb > 31)) {
+				return -1;
+			}
+			ao->o = 0x6ff30000;
+			ao->o |= reg1;
+			ao->o |= ((lsb & 0x1c) << 2);
+			ao->o |= ((lsb & 0x3) << 14);
+			ao->o |= (msb << 8);
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "bfi", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_CONST_CONST: {
+			ut32 lsb = getnum (ao->a[2]);
+			ut32 width = getnum (ao->a[3]);
+			ut32 msb = lsb + width - 1;
+			if ((lsb > 31) || (msb > 31)) {
+				return -1;
+			}
+			ao->o = 0x60f30000;
+			ao->o |= ((lsb & 0x1c) << 2);
+			ao->o |= ((lsb & 0x3) << 14);
+			ao->o |= (msb << 8);
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "bic", S_BIT) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			ao->o = 0x8043;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x20ea0000;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			ao->o = 0x20f00000;
+			ao->o |= getthimmed12 (ao->a[2]);
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG_SHIFT: {
+			std_opt_3 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0x20ea0000;
+			return std_32bit_3reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "bkpt", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_CONST: {
+			ut32 num = getnum (ao->a[0]);
+			if (num > 255) {
+				return -1;
+			}
+			ao->o = 0x00be;
+			ao->o |= num << 8;
+			return 2;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "cbnz", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			st32 offset = thumb_getoffset (ao->a[1], off);
+			if ((reg1 > 7) || (offset > 127) || (offset % 2 != 0)) {
+				return -1;
+			}
+			ao->o = 0x00b9;
+			ao->o |= reg1 << 8;
+			ao->o |= (offset & 0x3e) << 10;
+			ao->o |= (offset & 0x40) >> 5;
+			return 2;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "cbz", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			st32 offset = thumb_getoffset (ao->a[1], off);
+			if ((reg1 > 7) || (offset > 127) || (offset % 2 != 0)) {
+				return -1;
+			}
+			ao->o = 0x00b1;
+			ao->o |= reg1 << 8;
+			ao->o |= (offset & 0x3e) << 10;
+			ao->o |= (offset & 0x40) >> 5;
+			return 2;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "cdp", TWO_BIT) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_COPROC_CONST_COREG_COREG_COREG: {
+			ao->a[5] = "0";
+		        }
+			//intentional fallthrough
+		case THUMB_COPROC_CONST_COREG_COREG_COREG_CONST: {
+			ut32 coproc = getcoproc (ao->a[0]);
+			ut32 opc1 = getnum (ao->a[1]);
+			ut8 reg1 = getcoprocreg (ao->a[2]);
+			ut8 reg2 = getcoprocreg (ao->a[3]);
+			ut8 reg3 = getcoprocreg (ao->a[4]);
+			ut32 opc2 = getnum (ao->a[5]);
+		        if ((coproc > 15) || (opc1 > 15) || (opc2 > 7)) {
+				return -1;
+			}
+			ao->o = 0x00ee0000;
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			ao->o |= coproc;
+			ao->o |= opc1 << 28;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2 << 24;
+			ao->o |= reg3 << 8;
+			ao->o |= opc2 << 13;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else 	
+	if (( m = opmask (ao->op, "clrex", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			ao->o = 0xbff32f8f;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "clz", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			ao->o = 0xb0fa80f0;
+			ao->a[2] = ao->a[1];
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "cmn", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut32 num = getthimmed12 (ao->a[1]);
+			ao->o = 0x10f1000f;
+			ao->o |= reg1 << 24;
+			ao->o |= num;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0xc042;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			ao->a[2] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			ao->o = 0x10eb000f;
+			return std_32bit_2reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "cmp", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut32 num = getnum (ao->a[1]);
+			if ((num < 256) && (!(m & DOTW_BIT))) {
+				ao->o = 0x0028;
+				ao->o |= reg1;
+				ao->o |= num << 8;
+				return 2;
+			}
+			num = getthimmed12 (ao->a[1]);
+			ao->o = 0xb0f1000f;
+			ao->o |= reg1 << 24;
+			ao->o |= num;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ao->o = 0x8042;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			if (!(m & DOTW_BIT)) {
+				ao->o = 0x0045;
+				ao->o |= ((reg1 & 0x7) << 8);
+				ao->o |= ((reg1 & 0x8) << 12);
+				ao->o |= reg2 << 11;
+				return 2;
+			}
+			ao->a[2] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 shift = thumb_getshift (ao->a[2]);
+			ao->o = 0xb0eb000f;
+			ao->o |= reg1 << 24;
+			ao->o |= reg2 << 8;
+			ao->o |= shift;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "cps", ID_BIT | IE_BIT) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_OTHER: {
+			st8 aif = iflag(ao->a[0]);
+			if (aif == -1) {
+				return -1;
+			}
+			if (!(m & DOTW_BIT)) {
+				ao->o = 0x60b6;
+				ao->o |= aif << 8;
+				if (m & ID_BIT) {
+					ao->o |= 1 << 12;
+				}
+				return 2;
+			}
+			ao->a[1] = "0";
+		        }
+			// intentional fallthrough
+		case THUMB_OTHER_CONST: {
+			st8 aif = iflag(ao->a[0]);
+			ut8 mode = getnum (ao->a[1]);
+			if ((mode > 31) || (aif == -1)) {
+				return -1;
+			}
+			ao->o = 0xaff30085;
+			ao->o |= mode << 8;
+			ao->o |= aif << 13;
+			if (m & ID_BIT) {
+				ao->o |= 1 << 1;
+			}
+			return 4;
+		        }
+			break;
+		case THUMB_CONST: {
+			ut8 mode = getnum (ao->a[0]);
+			if ((m & ID_BIT) || (m & IE_BIT) || (mode > 31)) {
+				return -1;
+			}
+			ao->o = 0xaff30081;
+			ao->o |= mode << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "dbg", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_CONST: {
+			ut32 option = getnum (ao->a[0]);
+			if (option > 15) {
+				return -1;
+			}
+			ao->o = 0xaff3f080;
+			ao->o |= option << 8;
+			return 4;
+		        }
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "dmb", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			ao->o = 0xbff35f8f;
+			return 4;
+		        }
+			break;
+		case THUMB_OTHER: {
+			r_str_case (ao->a[0], false);
+			if (strcmpnull (ao->a[0], "sy")) {
+				return -1;
+			}
+			ao->a[0] = "15";
+		        }
+			// intentional fallthrough
+		case THUMB_CONST: {
+			ut32 option = getnum (ao->a[0]);
+			if (option != 15) {
+				return -1;
+			}
+			ao->o = 0xbff3508f;
+			ao->o |= option << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "dsb", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			ao->o = 0xbff34f8f;
+			return 4;
+		        }
+			// intentional fallthrough
+		case THUMB_OTHER: {
+			r_str_case (ao->a[0], false);
+			if (!strcmpnull ((ao->a[0] = parse_hints(ao->a[0])), "-1")) {
+				return -1;
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_CONST: {
+			ut32 option = getnum (ao->a[0]);
+			if ((option != 6) && (option != 7) && (option != 14) && (option != 15)) {
+				return -1;
+			}
+			ao->o = 0xbff3408f;
+			ao->o |= option << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "eor", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST:
+			std_opt_2 (ao);
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			err = false;
+			ut32 imm = getthimmed12 (ao->a[2]);
+			if (err) {
+				return -1;
+			}
+			ao->o = 0x80f00000;
+			ao->o |= imm;
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0x4040;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG:
+			ao->a[3] = "lsl 0";
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0x80ea0000;
+			return std_32bit_3reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "isb", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			ao->o = 0xbff36f8f;
+			return 4;
+		        }
+			// intentional fallthrough
+		case THUMB_OTHER: {
+			r_str_case (ao->a[0], false);
+			if (strcmpnull (ao->a[0], "sy")) {
+				return -1;
+			}
+			ao->a[0] = "15";
+		        }
+			// intentional fallthrough
+		case THUMB_CONST: {
+			ut32 option = getnum (ao->a[0]);
+			if (option != 15) {
+				return -1;
+			}
+			ao->o = 0xbff3608f;
+			ao->o |= option << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = itmask (ao->op))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_OTHER: {
+			ut16 cond;
+			ut16 i;
+			
+			const char *conds[] = {
+				"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
+				"hi", "ls", "ge", "lt", "gt", "le", "al", "nv", 0
+			};
+			r_str_case (ao->a[0], false);
+			for (i = 0; conds[i]; i++) {
+				if (!(strcmpnull(ao->a[0], conds[i]))) {
+					cond = i;
+					break;
+				}
+			}
+
+			if (i == 16) {
+				return -1;
+			}
+			ao->o = 0x00bf;
+			ao->o |= cond << 12;
+
+			ut8 nrcs = (m & 0x30) >> 4;
+			ut8 thiset = 0;
+
+			for (i = 0; i < nrcs; i++) {
+				thiset = ((m & (1 << (3 - i))) >> (3 - i));
+				ao->o |= ((cond & 0x1) ^ thiset) << (11 - i);
+			}
+			ao->o |= 1 << (11 - i);
+			return 2;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ldc", TWO_BIT | L_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_COPROC_COREG_BRACKREG_CONSTBRACK: {
+			ut8 proc = getcoproc (ao->a[0]);
+			ut8 reg1 = getcoprocreg (ao->a[1]);
+			ut8 reg2 = getregmemstart (ao->a[2]);
+			st32 imm = getnummemend (ao->a[3]);
+			ao->o = 0x10ed0000;
+			if (m & L_BIT) {
+				ao->o |= 1 << 30;
+			}
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			if (imm < 0) {
+				imm = -imm;
+			} else {
+				ao->o |= 1 << 31;
+			}				
+			if ((proc > 15) || (reg1 > 15) || (reg2 > 15) || (imm > 1024) || (imm % 4 != 0)) {
+				return -1;
+			}
+			ao->o |= proc;
+			ao->o |= reg1 << 4;
+			ao->o |= (imm >> 2) << 8;
+			ao->o |= reg2 << 24;
+			return 4;
+		        }
+			break;
+		case THUMB_COPROC_COREG_BRACKREGBRACK:
+			ao->a[3] = "0";
+			// intentional fallthrough
+		case THUMB_COPROC_COREG_BRACKREGBRACK_CONST: {
+			ut8 proc = getcoproc (ao->a[0]);
+			ut8 reg1 = getcoprocreg (ao->a[1]);
+			ut8 reg2 = getregmemstartend (ao->a[2]);
+			st32 imm = getnum (ao->a[3]);
+			ao->o = 0x30ec0000;
+			if (m & L_BIT) {
+				ao->o |= 1 << 30;
+			}
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			if (imm < 0) {
+				imm = -imm;
+			} else {
+				ao->o |= 1 << 31;
+			}				
+			if ((proc > 15) || (reg1 > 15) || (reg2 > 15) || (imm > 1024) || (imm % 4 != 0)) {
+				return -1;
+			}
+			ao->o |= proc;
+			ao->o |= reg1 << 4;
+			ao->o |= (imm >> 2) << 8;
+			ao->o |= reg2 << 24;
+			return 4;
+		        }
+			break;
+		case THUMB_COPROC_COREG_BRACKREG_CONSTBRACKBANG: {
+			ut8 proc = getcoproc (ao->a[0]);
+			ut8 reg1 = getcoprocreg (ao->a[1]);
+			ut8 reg2 = getregmemstart (ao->a[2]);
+			st32 imm = getnummemendbang (ao->a[3]);
+			ao->o = 0x30ed0000;
+			if (m & L_BIT) {
+				ao->o |= 1 << 30;
+			}
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			if (imm < 0) {
+				imm = -imm;
+			} else {
+				ao->o |= 1 << 31;
+			}				
+			if ((proc > 15) || (reg1 > 15) || (reg2 > 15) || (imm > 1024) || (imm % 4 != 0)) {
+				return -1;
+			}
+			ao->o |= proc;
+			ao->o |= reg1 << 4;
+			ao->o |= (imm >> 2) << 8;
+			ao->o |= reg2 << 24;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ldm", DB_BIT | EA_BIT | IA_BIT | FD_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REGBANG_LIST: {
+			ut8 reg1 = getregmembang (ao->a[0]);
+			ut32 list = getreglist (ao->a[1]);
+			if (!((m & DB_BIT) || (m & EA_BIT)) && !(list & 0xff00) && (reg1 < 8) && !(m & DOTW_BIT)) {
+				ao->o = 0x00c8;
+				ao->o |= reg1;
+				if (list & (1 << reg1)) {
+					list ^= 1 << (reg1);
+				}
+				ao->o |= (list & 0xff) << 8;
+					
+				return 2;
+			}
+			if (list & 0x2000) {
+				return -1;
+			}
+			if ((m & DB_BIT) || (m & EA_BIT)) {
+				ao->o = 0x30e90000;
+			} else {
+				// ldmia is the default!
+				ao->o = 0xb0e80000;
+			}
+				
+			ao->o |= reg1 << 24;
+			ao->o |= (list & 0xff) << 8;
+			ao->o |= (list & 0xff00) >> 8;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_LIST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut32 list = getreglist (ao->a[1]);
+			if (!((m & DB_BIT) || (m & EA_BIT)) && !(list & 0xff00) && (reg1 < 8) && !(m & DOTW_BIT)) {
+				ao->o = 0x00c8;
+				ao->o |= reg1;
+				ao->o |= 1 << (reg1 + 8);
+				ao->o |= (list & 0xff) << 8;
+				return 2;
+			}
+			if (list & 0x2000) {
+				return -1;
+			}
+			
+			if ((m & DB_BIT) || (m & EA_BIT)) {
+				ao->o = 0x10e90000;
+			} else {
+				ao->o = 0x90e80000;
+			}
+				
+			ao->o |= reg1 << 24;
+			ao->o |= (list & 0xff) << 8;
+			ao->o |= (list & 0xff00) >> 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ldr", B_BIT | H_BIT | D_BIT | T_BIT | S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut32 ldrsel = m & (B_BIT | H_BIT | D_BIT);
+		if ((m & S_BIT) && !(m & (B_BIT | H_BIT))) {
+			return -1;
+		}
+		switch (argt) {
+		case THUMB_REG_CONST:
+			ao->a[2] = ao->a[1];
+			strcat (ao->a[2],"]");
+			ao->a[1] = "[r15";
+			// intentional fallthrough
+		case THUMB_REG_BRACKREGBRACK:
+			if (ao->a[2] == NULL) { // double fallthrough
+				ao->a[1][strlen (ao->a[1]) -1] = '\0';
+				ao->a[2] = "0]";
+			}
+			// intentional fallthrough
+		case THUMB_REG_BRACKREG_CONSTBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getregmemstart (ao->a[1]);
+			st32 num = getnummemend (ao->a[2]);
+			if (ldrsel == 0) {
+				if (m & T_BIT) {
+					if ((num < 0) || (num > 255)) {
+						return -1;
+					}
+					ao->o = 0x50f8000e;
+					ao->o |= num << 8;
+					return mem_32bit_2reg (ao, m);
+				}
+				if (reg2 == 15) {
+					if ((num > 4095) || (num < -4095)) {
+						return -1;
+					}
+					if ((reg1 < 8) && (num < 1024) && (num % 4 == 0)) {
+						ao->o = 0x0048;
+						ao->o |= reg1;
+						ao->o |= (num >> 2) << 8;
+						return 2;
+					}
+					ao->o = 0x5ff80000;
+					if (num < 0) {
+						num = -num;
+					} else {
+						ao->o |= 1 << 31;
+					}
+					ao->o |= reg1 << 4;
+					ao->o |= (num & 0xff) << 8;
+					ao->o |= (num & 0x0f00) >> 8;
+					return 4;
+				}
+				if ((reg2 == 13) && (reg1 < 8) && (num >= 0) && (num < 1024) && (num % 4 == 0) && (!(m & DOTW_BIT))) {
+					ao->o = 0x0098;
+					ao->o |= reg1;
+					ao->o |= (num >> 2) << 8;
+					return 2;
+				}
+				if ((num >= 0) && (num < 128) && (num % 4 == 0)) {
+					ao->o = 0x0068;
+					ao->o |= (num >> 4);
+					ao->o |= ((num >> 2) & 0x3) << 14;
+					if (mem_16bit_2reg (ao, m)) {
+						return 2;
+					}
+				}
+				if ((num > 4095) || (num < -1023)) {
+					return -1;
+				}
+				if (num >= 0) {
+					ao->o = 0xd0f80000;
+					ao->o |= (num & 0xff) << 8;
+					ao->o |= (num & 0xf00) >> 8;
+					return mem_32bit_2reg (ao, m);
+				}
+				ao->o = 0x50f8000c;
+				ao->o |= (-num & 0xff) << 8;
+				return mem_32bit_2reg (ao, m);
+			} else
+			if (ldrsel == B_BIT) {
+				if (m & T_BIT) {
+					if ((num < 0) || (num > 255)) {
+						return -1;
+					}
+					ao->o = 0x10f8000e;
+					if (m & S_BIT) {
+						ao->o |= 1 << 16;
+					}
+					ao->o |= num << 8;
+					return mem_32bit_2reg (ao, m);
+				}
+				if (reg2 == 15) {
+					if ((num > 4095) || (num < -4095)) {
+						return -1;
+					}
+					ao->o = 0x1ff80000;
+					if (m & S_BIT) {
+						ao->o |= 1 << 16;
+					}
+					if (num < 0) {
+						num = -num;
+					} else {
+						ao->o |= 1 << 31;
+					}
+					ao->o |= reg1 << 4;
+					ao->o |= (num & 0xff) << 8;
+					ao->o |= (num & 0x0f00) >> 8;
+					return 4;
+				}
+				if ((num >= 0) && (num < 32) && (!(m & S_BIT))) {
+					ao->o = 0x0078;
+					ao->o |= (num >> 2);
+					ao->o |= (num & 0x3) << 14;
+					if (mem_16bit_2reg (ao, m)) {
+						return 2;
+					}
+				}
+				if ((num > 4095) || (num < -255)) {
+					return -1;
+				}
+				if (num >= 0) {
+					ao->o = 0x90f80000;
+					if (m & S_BIT) {
+						ao->o |= 1 << 16;
+					}
+					ao->o |= (num & 0xff) << 8;
+					ao->o |= (num & 0xf00) >> 8;
+					return mem_32bit_2reg (ao, m);
+				}
+				ao->o = 0x10f8000c;
+				if (m & S_BIT) {
+					ao->o |= 1 << 16;
+				}
+				ao->o |= -num << 8;
+				return mem_32bit_2reg (ao, m);
+			} else
+			if (ldrsel == H_BIT) {
+				if (m & T_BIT) {
+					if ((num < 0) || (num > 255)) {
+						return -1;
+					}
+					ao->o = 0x30f8000e;
+					if (m & S_BIT) {
+						ao->o |= 1 << 16;
+					}
+					ao->o |= num << 8;
+					return mem_32bit_2reg (ao, m);
+				}
+				if (reg2 == 15) {
+					if ((num > 4095) || (num < -4095)) {
+						return -1;
+					}
+					ao->o = 0x3ff80000;
+					if (m & S_BIT) {
+						ao->o |= 1 << 16;
+					}
+					if (num < 0) {
+						num = -num;
+					} else {
+						ao->o |= 1 << 31;
+					}
+					ao->o |= reg1 << 4;
+					ao->o |= (num & 0xff) << 8;
+					ao->o |= (num & 0x0f00) >> 8;
+					return 4;
+				}
+				if ((num >= 0) && (num < 64) && (num % 2 == 0) && (!(m & S_BIT))) {
+					ao->o = 0x0088;
+					ao->o |= (num >> 3);
+					ao->o |= ((num >> 1) & 0x3) << 14;
+					if (mem_16bit_2reg (ao, m)) {
+						return 2;
+					}
+				}
+				if ((num > 4095) || (num < -255)) {
+					return -1;
+				}
+				if (num >= 0) {
+					ao->o = 0xb0f80000;
+					if (m & S_BIT) {
+						ao->o |= 1 << 16;
+					}
+					ao->o |= (num & 0xff) << 8;
+					ao->o |= (num & 0xf00) >> 8;
+					return mem_32bit_2reg (ao, m);
+				}
+				ao->o = 0x30f8000c;
+				if (m & S_BIT) {
+					ao->o |= 1 << 16;
+				}
+				ao->o |= -num << 8;
+				return mem_32bit_2reg (ao, m);
+			} else {
+				return -1;
+			}			
+		        }
+			break;
+		case THUMB_REG_BRACKREGBRACK_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getregmemstartend (ao->a[1]);
+			st32 num = getnum (ao->a[2]);
+			if ((num < -255) || (num > 255)) {
+				return -1;
+			}
+			if (ldrsel == 0) {
+				ao->o = 0x50f80009;
+			} else 
+			if (ldrsel == B_BIT) {
+				ao->o = 0x10f80009;
+			} else 
+			if (ldrsel == H_BIT) {
+				ao->o = 0x30f80009;
+			} else {
+				return -1;
+			}
+			if (m & S_BIT) {
+				ao->o |= 1 << 16;
+			}
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 1;
+			}
+			ao->o |= num << 8;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2 << 24;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_BRACKREG_CONSTBRACKBANG: {
+			st32 num = getnummemendbang (ao->a[2]);
+			if ((num < -255) || (num > 255)) {
+				return -1;
+			}
+			if (ldrsel == 0) {
+				ao->o = 0x50f8000d;
+			} else 
+			if (ldrsel == B_BIT) {
+				ao->o = 0x10f8000d;
+			} else 
+			if (ldrsel == H_BIT) {
+				ao->o = 0x30f8000d;
+			} else {
+				return -1;
+			}
+			if (m & S_BIT) {
+				ao->o |= 1 << 16;
+			}
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 1;
+			}
+			ao->o |= num << 8;
+			return mem_32bit_2reg (ao, m);
+		        }
+			break;
+		case THUMB_REG_BRACKREG_REGBRACK: {
+			ut8 reg3 = getregmemend (ao->a[2]);
+			if (reg3 < 8) {
+				if (ldrsel == 0) {
+					ao->o = 0x0058;
+				} else
+				if (ldrsel == B_BIT) {
+					if (m & S_BIT) {
+						ao->o = 0x0056;
+					} else {
+						ao->o = 0x005c;
+					}
+				} else
+				if (ldrsel == H_BIT) {
+					if (m & S_BIT) {
+						ao->o = 0x005e;
+					} else {
+						ao->o = 0x005a;
+					}
+				} else
+				{
+					return -1;
+				}
+				ao->o |= (reg3 & 0x3) << 14;
+				ao->o |= (reg3 & 0x4) >> 2;
+				if (mem_16bit_2reg (ao, m)) {
+					return 2;
+				}
+			}
+			ao->a[2][strlen (ao->a[2]) -1] = '\0';
+			ao->a[3] = "lsl 0]";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_BRACKREG_REG_SHIFTBRACK: {
+			ut8 reg3 = getreg (ao->a[2]);
+			ut32 shift = getshiftmemend (ao->a[3]);
+
+			shift >>= 2;
+			if (shift & 0xffffcfff) {
+				return -1;
+			}
+
+			if (ldrsel == 0) {
+				ao->o = 0x50f80000;
+			} else
+			if (ldrsel == B_BIT) {
+				ao->o = 0x10f80000;
+			} else
+			if (ldrsel == H_BIT) {
+				ao->o = 0x30f80000;
+			} else
+			{
+				return -1;
+			}
+			if (m & S_BIT) {
+				ao->o |= 1 << 16;
+			}
+			ao->o |= reg3 << 8;
+			ao->o |= shift;
+			return mem_32bit_2reg (ao, m);
+		        }
+			break;
+		case THUMB_REG_REG_BRACKREGBRACK: {
+			ao->a[2][strlen (ao->a[2]) -1] = '\0';
+			ao->a[3] = "0]";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_BRACKREG_CONSTBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstart (ao->a[2]);
+			st32 num = getnummemend (ao->a[3]);
+
+			if ((num > 1020) || (num < -1020) || (num % 4 != 0) || (ldrsel != D_BIT)) {
+				return -1;
+			}
+			ao->o = 0x50e90000;
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG_BRACKREGBRACK_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstartend (ao->a[2]);
+			st32 num = getnum (ao->a[3]);
+			if ((num > 1020) || (num < -1020) || (num % 4 != 0) || (ldrsel != D_BIT)) {
+				return -1;
+			}
+			ao->o = 0x70e80000;
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG_BRACKREG_CONSTBRACKBANG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstart (ao->a[2]);
+			st32 num = getnummemendbang (ao->a[3]);
+			if ((num > 1020) || (num < -1020) || (num % 4 != 0) || (ldrsel != D_BIT)) {
+				return -1;
+			}
+			ao->o = 0x70e90000;
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ldrex", B_BIT | H_BIT | D_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut32 ldrsel = m & (B_BIT | H_BIT | D_BIT);
+		switch (argt) {
+		case THUMB_REG_BRACKREGBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getregmemstartend (ao->a[1]);
+			
+			if (ldrsel == B_BIT) {
+				ao->o = 0xd0e84f0f;
+				ao->o |= reg1 << 4;
+				ao->o |= reg2 << 24;
+				return 4;
+			} else
+			if (ldrsel == H_BIT) {
+				ao->o = 0xd0e85f0f;
+				ao->o |= reg1 << 4;
+				ao->o |= reg2 << 24;
+				return 4;
+			} else
+			if (ldrsel == 0) {
+				ao->a[1][strlen (ao->a[1]) - 1] = '\0';
+				ao->a[2] = "0]";
+			} else 
+				return -1;
+		        }
+			// intentional fallthrough
+		case THUMB_REG_BRACKREG_CONSTBRACK: {
+			st32 num = getnummemend (ao->a[2]);
+			if ((ldrsel != 0) || (num < 0) || (num > 1020) || (num % 4 != 0)) {
+				return -1;
+			}
+			ao->o = 0x50e8000f;
+			ao->o |= (num >> 2) << 8;
+			return mem_32bit_2reg (ao, m);
+		        }
+			break;
+		case THUMB_REG_REG_BRACKREGBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstartend (ao->a[2]);
+			if (!(ldrsel & D_BIT)) {
+				return -1;
+			}
+			ao->o = 0xd0e87f00;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			return 4;
+		}
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "lsl", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 num = getnum (ao->a[2]);
+			if (num > 32) {
+				return -1;
+			}
+			ao->o = 0x0000;			
+			if (std_16bit_2reg (ao, m)) {
+				ao->o |= (num & 0x03) << 14;
+				ao->o |= num >> 2;
+				return 2;
+			}
+			ao->o = 0x4fea0000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			ao->o |= (num >> 2) << 4;
+			ao->o |= (num & 0x3) << 14;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0x8040;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x00fa00f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else		
+	if ((m = opmask (ao->op, "lsr", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 num = getnum (ao->a[2]);
+			if (num > 32) {
+				return -1;
+			}
+			ao->o = 0x0008;
+			if (std_16bit_2reg (ao, m)) {
+				ao->o |= (num & 0x03) << 14;
+				ao->o |= num >> 2;
+				return 2;
+			}
+			ao->o = 0x4fea1000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			ao->o |= (num >> 2) << 4;
+			ao->o |= (num & 0x3) << 14;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0xc040;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x20fa00f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mcr", R_BIT | TWO_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_COPROC_CONST_REG_COREG_COREG: {
+			ao->a[5] = "0";
+		        }
+			// intentional fallthrough
+		case THUMB_COPROC_CONST_REG_COREG_COREG_CONST: {
+			ut32 coproc = getcoproc (ao->a[0]);
+			ut32 opc1 = getnum (ao->a[1]);
+			ut32 reg1 = getreg (ao->a[2]);
+			ut32 coreg1 = getcoprocreg (ao->a[3]);
+			ut32 coreg2 = getcoprocreg (ao->a[4]);
+			ut32 opc2 = getnum (ao->a[5]);
+
+			if ((coproc > 15) || (opc1 > 7) || (reg1 > 15) || (coreg1 > 15) || (coreg2 > 15) || (opc2 > 7) || (m & R_BIT)) {
+				return -1;
+			}
+
+			ao->o = 0x00ee1000;
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			ao->o |= coproc;
+			ao->o |= opc1 << 29;
+			ao->o |= reg1 << 4;
+			ao->o |= coreg1 << 24;
+			ao->o |= coreg2 << 8;
+			ao->o |= opc2 << 13;
+			return 4;
+		        }
+			break;
+		case THUMB_COPROC_CONST_REG_REG_COREG: {
+			ut32 coproc = getcoproc (ao->a[0]);
+			ut32 opc = getnum (ao->a[1]);
+			ut32 reg1 = getreg (ao->a[2]);
+			ut32 reg2 = getreg (ao->a[3]);
+			ut32 coreg = getcoprocreg (ao->a[4]);
+
+			if ((coproc > 15) || (opc > 15) || (reg1 > 15) || (reg2 > 15) || (coreg > 15) || (!(m & R_BIT))) {
+				return -1;
+			}
+
+			ao->o = 0x40ec0000;
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			ao->o |= coproc;
+			ao->o |= opc << 12;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2 << 24;
+			ao->o |= coreg << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mla", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut32 reg4 = getreg (ao->a[3]);
+			if (reg4 > 15) {
+				return -1;
+			}
+			ao->o = 0x00fb0000;
+			ao->o |= reg4 << 4;
+
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mls", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut32 reg4 = getreg (ao->a[3]);
+			if (reg4 > 15) {
+				return -1;
+			}
+			ao->o = 0x00fb1000;
+			ao->o |= reg4 << 4;
+
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mov", S_BIT | W_BIT | T_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut32 reg1 = getreg (ao->a[0]);
+			err = false;
+			ut32 num = getnum (ao->a[1]);
+
+			if (reg1 > 15) {
+				return -1;
+			}
+			
+			if ((m & W_BIT) || (m & T_BIT)) {
+				ut32 wnum = getnum (ao->a[1]);
+				if (wnum > 65535) {
+					return -1;
+				}
+				ao->o = 0x40f20000;
+				if (m & T_BIT) {
+					ao->o |= 1 << 31;
+				}
+				ao->o |= reg1;
+				ao->o |= getthzeroimmed16 (wnum);
+				return 4;
+			}
+			
+			if (err) {
+				return -1;
+			}
+			
+			if ((num < 256) && (reg1 < 8) && (!(m & DOTW_BIT))) {
+				ao->o = 0x0020;
+				ao->o |= reg1;
+				ao->o |= num << 8;
+				return 2;
+			}
+				
+			ao->o = 0x4ff00000;
+			ao->o |= reg1;
+			ao->o |= getthimmed12 (ao->a[1]);
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ut32 reg1 = getreg (ao->a[0]);
+			ut32 reg2 = getreg (ao->a[1]);
+			
+			if ((reg1 > 15) || (reg2 > 15)) {
+				return -1;
+			}
+
+			if ((!(m & S_BIT)) && (!(m & DOTW_BIT))) {
+				ao->o = 0x0046;
+				ao->o |= (reg1 & 0x7) << 8;
+				ao->o |= (reg1 & 0x8) << 12;
+				ao->o |= reg2 << 11;
+				return 2;
+			}
+			
+			if ((reg1 < 8) && (reg2 < 8) && (!(m & DOTW_BIT))) {
+				ao->o = 0;
+				ao->o |= reg1 << 8;
+				ao->o |= reg2 << 11;
+				return 2;
+			}
+			
+			ao->o = 0x4fea0000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else 
+	if ((m = opmask (ao->op, "mrc", TWO_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_COPROC_CONST_REG_COREG_COREG: {
+			ao->a[5] = "0";
+		        }
+			// intentional fallthrough
+		case THUMB_COPROC_CONST_REG_COREG_COREG_CONST: {
+			ut32 coproc = getcoproc (ao->a[0]);
+			ut32 opc1 = getnum (ao->a[1]);
+			ut32 reg1 = getreg (ao->a[2]);
+			ut32 coreg1 = getcoprocreg (ao->a[3]);
+			ut32 coreg2 = getcoprocreg (ao->a[4]);
+			ut32 opc2 = getnum (ao->a[5]);
+
+			if ((coproc > 15) || (opc1 > 7) || (reg1 > 15) || (coreg1 > 15) || (coreg2 > 15) || (opc2 > 7)) {
+				return -1;
+			}
+
+			ao->o = 0x10ee1000;
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			ao->o |= coproc;
+			ao->o |= opc1 << 29;
+			ao->o |= reg1 << 4;
+			ao->o |= coreg1 << 24;
+			ao->o |= coreg2 << 8;
+			ao->o |= opc2 << 13;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mrrc", TWO_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_COPROC_CONST_REG_REG_COREG: {
+			ut32 coproc = getcoproc (ao->a[0]);
+			ut32 opc = getnum (ao->a[1]);
+			ut32 reg1 = getreg (ao->a[2]);
+			ut32 reg2 = getreg (ao->a[3]);
+			ut32 coreg = getcoprocreg (ao->a[4]);
+
+			if ((coproc > 15) || (opc > 15) || (reg1 > 15) || (reg2 > 15) || (coreg > 15)) {
+				return -1;
+			}
+
+			ao->o = 0x50ec0000;
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			ao->o |= coproc;
+			ao->o |= opc << 12;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2 << 24;
+			ao->o |= coreg << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mrs", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_OTHER: {
+			ut32 reg1 = getreg (ao->a[0]);
+			r_str_case (ao->a[1], false);
+
+			if (reg1 > 15) {
+				return -1;
+			}
+
+			if ((!strcmp(ao->a[1], "cpsr")) || (!strcmp(ao->a[1], "apsr"))) {
+				ao->o = 0xeff30080;
+				ao->o |= reg1;
+				return 4;
+			}
+
+			if (!strcmp(ao->a[1], "spsr")) {
+				ao->o = 0xfff30080;
+				ao->o |= reg1;
+				return 4;
+			}
+			
+			return -1;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else 
+	if ((m = opmask (ao->op, "msr", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_OTHER_REG: {
+			r_str_case (ao->a[0], false);
+			ut8 spsr = 0;
+			ut8 bank = interpret_msrbank (ao->a[0], &spsr);
+			ut32 reg1 = getreg (ao->a[1]);
+
+			if ((bank == 0) || (reg1 > 15)) {
+				return -1;
+			}
+			
+			ao->o = 0x80f30080;
+			ao->o |= reg1 << 24;
+			ao->o |= bank;
+			if (spsr != 0) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mul", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg3 = getreg (ao->a[2]);
+
+			ao->o = 0x4043;
+			if ((reg1 == reg3) && (std_16bit_2reg (ao, m))) {
+				return 2;
+			}
+
+			ao->o = 0x00fb00f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "mvn", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			err = false;
+			ut32 num = getthimmed12 (ao->a[1]);
+			
+			if ((reg1 > 15) || err) {
+				return -1;
+			}
+
+			ao->o = 0x6ff00000;
+			ao->o |= reg1;
+			ao->o |= num;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->a[2] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 shift = thumb_getshift (ao->a[2]);
+
+			if ((reg1 > 15) || (reg2 > 15)) {
+				return -1;
+			}
+			
+			ao->o = 0xc043;
+			if ((shift == 0) && (std_16bit_2reg (ao, m))) {
+				return 2;
+			}
+
+			ao->o = 0x6fea0000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			ao->o |= shift;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "nop", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			if (m & DOTW_BIT) {
+				ao->o = 0xaff30080;
+				return 4;
+			}
+			ao->o = 0x00bf;
+			return 2;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "orn", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			err = false;
+			ut32 num = getthimmed12 (ao->a[2]);
+
+			if (err) {
+				return -1;
+			}
+
+			ao->o = 0x60f00000;
+			ao->o |= num;
+			return (std_32bit_2reg (ao, m, false));
+		        }
+			break;
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0x60ea0000;
+			return std_32bit_3reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else 
+	if ((m = opmask (ao->op, "orr", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			err = false;
+			ut32 num = getthimmed12 (ao->a[2]);
+
+			if (err) {
+				return -1;
+			}
+
+			ao->o = 0x40f00000;
+			ao->o |= num;
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0x0043;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0x40ea0000;
+			return (std_32bit_3reg (ao, m, true));
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else 
+	if ((m = opmask (ao->op, "pkh", BT_BIT | TB_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & TB_BIT) {
+				ao->a[3] = "asr 0";
+			} else
+			if (m & BT_BIT) {
+				ao->a[3] = "lsl 0";
+			} else {
+				return -1;
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ut32 shift = thumb_getshift (ao->a[3]);
+
+			if (((m & TB_BIT) && ((shift & 0x00003000) != 0x00002000)) || ((m & BT_BIT) && ((shift & 0x00003000) != 0)) || ((m & (TB_BIT | BT_BIT)) == 0)) {	
+				return -1;
+			}
+
+			ao->o = 0xc0ea0000;
+			return (std_32bit_3reg (ao, m, true));
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "pld", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_BRACKREG_CONSTBRACK: {
+			ut8 reg1 = getregmemstart (ao->a[0]);
+			st32 num = getnummemend (ao->a[1]);
+
+			if (reg1 == 15) {
+				if ((num < -4095) || (num > 4095)) {
+					return -1;
+				}
+				ao->o = 0x1ff800f0;
+				if (num > 0) {
+					ao->o |= 1 << 31;
+				} else {
+					num = -num;
+				}
+				ao->o |= (num & 0x0ff) << 8;
+				ao->o |= (num & 0xf00) >> 8;
+				return 4;
+			}
+
+			if ((reg1 > 15) || (num < -255) || (num > 4095)) {
+				return -1;
+			}
+
+			if (num > 0) {
+				ao->o = 0x90f800f0;
+				ao->o |= (num & 0x0ff) << 8;
+				ao->o |= (num & 0xf00) >> 8;
+				ao->o |= reg1 << 24;
+				return 4;
+			}
+			num = -num;
+			ao->o = 0x10f800fc;
+			ao->o |= num << 8;
+			ao->o |= reg1 << 24;
+			return 4;
+		        }
+			break;
+		case THUMB_BRACKREG_REGBRACK: {
+			ao->a[1][strlen (ao->a[1]) - 1] = '\0';
+			ao->a[2] = "lsl 0]";
+		        }
+			// intentional fallthrough
+		case THUMB_BRACKREG_REG_SHIFTBRACK: {
+			ut8 reg1 = getregmemstart (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 shift = getshiftmemend (ao->a[2]) >> 2;
+
+			if ((reg1 > 15) || (reg2 > 15) || ((shift & 0xffffcfff) != 0)) {
+				return -1;
+			}
+
+			ao->o = 0x10f800f0;
+			ao->o |= reg1 << 24;
+			ao->o |= reg2 << 8;
+			ao->o |= shift;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "pli", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_BRACKREG_CONSTBRACK: {
+			ut8 reg1 = getregmemstart (ao->a[0]);
+			st32 num = getnummemend (ao->a[1]);
+
+			if (reg1 == 15) {
+				if ((num < -4095) || (num > 4095)) {
+					return -1;
+				}
+				ao->o = 0x1ff900f0;
+				if (num > 0) {
+					ao->o |= 1 << 31;
+				} else {
+					num = -num;
+				}
+				ao->o |= (num & 0x0ff) << 8;
+				ao->o |= (num & 0xf00) >> 8;
+				return 4;
+			}
+
+			if ((reg1 > 15) || (num < -255) || (num > 4095)) {
+				return -1;
+			}
+
+			if (num > 0) {
+				ao->o = 0x90f900f0;
+				ao->o |= (num & 0x0ff) << 8;
+				ao->o |= (num & 0xf00) >> 8;
+				ao->o |= reg1 << 24;
+				return 4;
+			}
+			num = -num;
+			ao->o = 0x10f900fc;
+			ao->o |= num << 8;
+			ao->o |= reg1 << 24;
+			return 4;
+		        }
+			break;
+		case THUMB_BRACKREG_REGBRACK: {
+			ao->a[1][strlen (ao->a[1]) -1] = '\0';
+			ao->a[2] = "lsl 0]";
+		        }
+			// intentional fallthrough
+		case THUMB_BRACKREG_REG_SHIFTBRACK: {
+			ut8 reg1 = getregmemstart (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 shift = getshiftmemend (ao->a[2]) >> 2;
+
+			if ((reg1 > 15) || (reg2 > 15) || ((shift & 0xffffcfff) != 0)) {
+				return -1;
+			}
+
+			ao->o = 0x10f900f0;
+			ao->o |= reg1 << 24;
+			ao->o |= reg2 << 8;
+			ao->o |= shift;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "pop", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_LIST: {
+			st32 list = getreglist (ao->a[0]);
+			if ((list <= 0) || ((list & (1 << 13)) != 0)) {
+				return -1;
+			}
+			if ((!(m & DOTW_BIT)) && ((list & 0x00007f00) == 0)) {
+				ao->o = 0x00bc;
+				ao->o |= (list & 0x8000) >> 15;
+				ao->o |= (list & 0xff) << 8;
+				return 2;
+			}
+			ao->o = 0xbde80000;
+			ao->o |= (list & 0xff00) >> 8;
+			ao->o |= (list & 0xff) << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "push", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_LIST: {
+			st32 list = getreglist (ao->a[0]);
+			if ((list <= 0) || ((list & 0x0000a000) != 0)) {
+				return -1;
+			}
+			if ((!(m & DOTW_BIT)) && ((list & 0x00001f00) == 0)) {
+				ao->o = 0x00b4;
+				ao->o |= (list & 0x4000) >> 14;
+				ao->o |= (list & 0xff) << 8;
+				return 2;
+			}
+			ao->o = 0x2de90000;
+			ao->o |= (list & 0xff00) >> 8;
+			ao->o |= (list & 0xff) << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "qadd", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0x90fa10f0;
+			} else
+			if (m & EIGHT_BIT) {
+				ao->o = 0x80fa10f0;
+			} else {
+				ao->o = 0x80fa80f0;
+			}
+
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "qasx", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xa0fa10f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "qdadd", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x80fa90f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "qdsub", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x80fab0f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "qsax", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xe0fa10f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "qsub", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0xd0fa10f0;
+			} else
+			if (m & EIGHT_BIT) {
+				ao->o = 0xc0fa10f0;
+			} else {
+				ao->o = 0x80faa0f0;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "rbit", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			ao->a[2] = ao->a[1];
+			ao->o = 0x90faa0f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "rev", SIXTEEN_BIT | SH_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0x40ba;
+			} else
+			if (m & SH_BIT) {
+				ao->o = 0xc0ba;
+			} else {
+				ao->o = 0x00ba;
+			}
+
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0x90fa90f0;
+			} else
+			if (m & SH_BIT) {
+				ao->o = 0x90fab0f0;
+			} else {
+				ao->o = 0x90fa80f0;
+			}
+			ao->a[2] = ao->a[1];
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "rfe", IA_BIT | FD_BIT | DB_BIT | EA_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut32 wb = 0;
+		switch (argt) {
+		case THUMB_REGBANG: {
+			ao->a[0][strlen (ao->a[0]) - 1] = '\0';
+			wb = 0x20000000;
+		        }
+			// intentional fallthrough
+		case THUMB_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+
+			if (reg1 > 15) {
+				return -1;
+			}
+			
+			if ((m & DB_BIT) || (m & EA_BIT)) {
+				ao->o = 0x10e800c0;
+			} else {
+				ao->o = 0x90e900c0;
+			}
+
+			ao->o |= reg1 << 24;
+			ao->o |= wb;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ror", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 num = getnum (ao->a[2]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (num > 31) || (num < 1)) {
+				return -1;
+			}
+
+			ao->o = 0x4fea3000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			ao->o |= (num & 0x3) << 14;
+			ao->o |= (num & 0x1c) << 2;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0xc041;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x60fa00f0;
+			return (std_32bit_3reg (ao, m, false));
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "rrx", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			
+			if ((reg1 > 15) || (reg2 > 15)) {
+				return -1;
+			}
+			
+			ao->o = 0x4fea3000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			if (m & S_BIT) {
+				ao->o |= 1 << 28;
+			}
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "rsb", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			err = false;
+			ut32 num = getthimmed12 (ao->a[2]);
+
+			if (err) {
+				return -1;
+			}
+
+			ao->o = 0x4042;
+			if ((num == 0) && std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+
+			ao->o = 0xc0f10000;
+			ao->o |= num;
+			return (std_32bit_2reg (ao, m, false));
+		        }
+			break;
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0xc0eb0000;
+			return (std_32bit_3reg (ao, m, true));
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "sadd", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0x90fa00f0;
+			} else
+			if (m & EIGHT_BIT) {
+				ao->o = 0x80fa00f0;
+			} else {
+				return -1;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "sasx", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xa0fa00f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "sbc", S_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			ao->o = 0x8041;
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ao->o = 0x60eb0000;
+			return std_32bit_3reg (ao, m, true);
+		        }
+			break;
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			ao->o = 0x60f10000;
+			err = false;
+			ut32 num = getthimmed12 (ao->a[2]);
+
+			if (err) {
+				return -1;
+			}
+			ao->o |= num;
+			
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if (( m = opmask (ao->op, "sbfx", 0) )) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_CONST_CONST: {
+			ut32 lsb = getnum (ao->a[2]);
+			ut32 width = getnum (ao->a[3]);
+			ut32 msb = lsb + width - 1;
+			if ((lsb > 31) || (msb > 31)) {
+				return -1;
+			}
+			ao->o = 0x40f30000;
+			ao->o |= ((lsb & 0x1c) << 2);
+			ao->o |= ((lsb & 0x3) << 14);
+			ao->o |= ((width - 1) << 8);
+			return std_32bit_2reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "sdiv", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x90fbf0f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "sel", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xa0fa80f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "setend", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_OTHER: {
+			r_str_case (ao->a[0], false);
+			ao->o = 0x50b6;
+			if (!(strcmpnull (ao->a[0], "be"))) {
+				ao->o |= 1 << 11;
+				return 2;
+			} else
+			if (!(strcmpnull (ao->a[0], "le"))) {
+				return 2;
+			} else {
+				return -1;
+			}
+			break;
+		        }
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "sev", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE:
+			if (m & DOTW_BIT) {
+				ao->o = 0xaff30480;
+				return 4;
+			} else {
+				ao->o = 0x40bf;
+				return 2;
+			}
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "shadd", EIGHT_BIT | SIXTEEN_BIT ))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0x90fa20f0;
+			} else
+			if (m & EIGHT_BIT) {
+				ao->o = 0x80fa20f0;
+			} else {
+				return -1;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "shasx", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xa0fa20f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "shsax", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xe0fa20f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "shsub", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0xd0fa20f0;
+			} else
+			if (m & EIGHT_BIT) {
+				ao->o = 0xc0fa20f0;
+			} else {
+				return -1;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smc", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_CONST: {
+			err = false;
+			ut32 num = getnum (ao->a[0]);
+			
+			if (err || (num > 15)) {
+				return -1;
+			}
+
+			ao->o = 0xf0f70080;
+			ao->o |= num << 24;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smla", BB_BIT | BT_BIT | TB_BIT | TT_BIT | WB_BIT | WT_BIT | L_BIT | D_BIT | X_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getreg (ao->a[3]);
+			
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15) || (m & DOTN_BIT)) {
+				return -1;
+			}
+			if (m & L_BIT) {
+				if (m & BB_BIT) {
+					ao->o = 0xc0fb8000;
+				} else
+				if (m & BT_BIT) {
+					ao->o = 0xc0fb9000;
+				} else
+				if (m & TB_BIT) {
+					ao->o = 0xc0fba000;
+				} else
+				if (m & TT_BIT) {
+					ao->o = 0xc0fbb000;
+				} else
+				if (m & D_BIT) {
+					ao->o = 0xc0fbc000;
+					if (m & X_BIT) {
+						ao->o |= 1 << 12;
+					}
+				} else {
+					ao->o = 0xc0fb0000;
+				}
+				ao->o |= reg1 << 4;
+				ao->o |= reg2;
+				ao->o |= reg3 << 24;
+				ao->o |= reg4 << 8;
+				return 4;
+			}
+			if (m & BB_BIT) {
+				ao->o = 0x10fb0000;
+				ao->o |= reg4 << 4;
+				return std_32bit_3reg (ao, m, false);
+			}
+			if (m & BT_BIT) {
+				ao->o = 0x10fb1000;
+				ao->o |= reg4 << 4;
+				return std_32bit_3reg (ao, m, false);
+			}
+			if (m & TB_BIT) {
+				ao->o = 0x10fb2000;
+				ao->o |= reg4 << 4;
+				return std_32bit_3reg (ao, m, false);
+			}
+			if (m & TT_BIT) {
+				ao->o = 0x10fb3000;
+				ao->o |= reg4 << 4;
+				return std_32bit_3reg (ao, m, false);
+			}
+			if (m & D_BIT) {
+				ao->o = 0x20fb0000;
+				if (m & X_BIT) {
+					ao->o |= 1 << 12;
+				}
+				ao->o |= reg4 << 4;
+				return std_32bit_3reg (ao, m, false);
+			}
+			if (m & WB_BIT) {
+				ao->o = 0x30fb0000;
+				ao->o |= reg4 << 4;
+				return std_32bit_3reg (ao, m, false);
+			}
+			if (m & WT_BIT) {
+				ao->o = 0x30fb1000;
+				ao->o |= reg4 << 4;
+				return std_32bit_3reg (ao, m, false);
+			}
+			return -1;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smlsd", X_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if (reg4 > 15) {
+				return -1;
+			}
+			ao->o = 0x40fb0000;
+			if (m & X_BIT) {
+				ao->o |= 1 << 12;
+			}
+			ao->o |= reg4 << 4;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smlsld", X_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15) || (m & DOTN_BIT)) {
+				return -1;
+			}
+			ao->o = 0xd0fbc000;
+
+			if (m & X_BIT) {
+				ao->o |= 1 << 12;
+			}
+
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= reg4 << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smmla", R_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if (reg4 > 15) {
+				return -1;
+			}
+			ao->o = 0x50fb0000;
+			if (m & R_BIT) {
+				ao->o |= 1 << 12;
+			}
+			ao->o |= reg4 << 4;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smmls", R_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if (reg4 > 15) {
+				return -1;
+			}
+			ao->o = 0x60fb0000;
+			if (m & R_BIT) {
+				ao->o |= 1 << 12;
+			}
+			ao->o |= reg4 << 4;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smmul", R_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x50fb00f0;
+			if (m & R_BIT) {
+				ao->o |= 1 << 12;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smuad", X_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x20fb00f0;
+			if (m & X_BIT) {
+				ao->o |= 1 << 12;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smul", BB_BIT | BT_BIT | TB_BIT | TT_BIT | WB_BIT | WT_BIT | L_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & BB_BIT) {
+				ao->o = 0x10fb00f0;
+			} else
+			if (m & BT_BIT) {
+				ao->o = 0x10fb10f0;
+			} else
+			if (m & TB_BIT) {
+				ao->o = 0x10fb20f0;
+			} else
+			if (m & TT_BIT) {
+				ao->o = 0x10fb30f0;
+			} else
+			if (m & WB_BIT) {
+				ao->o = 0x30fb00f0;
+			} else
+			if (m & WT_BIT) {
+				ao->o = 0x30fb10f0;
+			} else {
+				return -1;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15) || (m & DOTN_BIT) || (!(m & L_BIT))) {
+				return -1;
+			}
+
+			ao->o = 0x80fb0000;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= reg4 << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "smusd", X_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x40fb00f0;
+			if (m & X_BIT) {
+				ao->o |= 1 << 12;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "srs", DB_BIT | FD_BIT | IA_BIT | EA_BIT))) {
+		ut32 w = 0;
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_CONSTBANG: {
+			ao->a[0][strlen (ao->a[0]) - 1] = '\0';
+			w = 1;
+		        }
+			// intentional fallthrough
+		case THUMB_CONST: {
+			ut32 num = getnum (ao->a[0]);
+			if (num > 31) {
+				return -1;
+			}
+			if ((m & DB_BIT) || (m & FD_BIT)) {
+				ao->o = 0x0de800c0;
+			} else {
+				ao->o = 0x8de900c0;
+			}				
+			ao->o |= num << 8;
+			ao->o |= w << 29;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ssat", SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_CONST_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut32 num = getnum (ao->a[1]) - 1;
+			ut8 reg2 = getreg (ao->a[2]);
+			ut32 shift = thumb_getshift (ao->a[3]);
+
+			if (err || (reg1 > 15) || (reg2 > 15) || (num > 31) || (shift & 0x00001000) || ((m & SIXTEEN_BIT) && shift)) {
+				return -1;
+			}
+
+			if (shift & 0x00002000) {
+				shift |= 0x20000000;
+				shift &= 0xffffdfff;
+			}
+
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0x20f30000;
+			} else {
+				ao->o = 0x00f30000;
+			}
+
+			ao->o |= reg1;
+			ao->o |= reg2 << 24;
+			ao->o |= num << 8;
+			ao->o |= shift;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ssax", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xe0fa00f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "ssub", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & EIGHT_BIT) {
+				ao->o = 0xc0fa00f0;
+			} else
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0xd0fa00f0;
+			} else {
+				return -1;
+			}
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "stc", L_BIT | TWO_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_COPROC_COREG_BRACKREGBRACK: {
+			ao->a[2][strlen (ao->a[2]) - 1] = '\0';
+			ao->a[3] = "0]";
+		        }
+			// intentional fallthrough
+		case THUMB_COPROC_COREG_BRACKREG_CONSTBRACK: {
+			ut8 coproc = getcoproc (ao->a[0]);
+			ut8 coreg = getcoprocreg (ao->a[1]);
+			ut8 reg = getregmemstart (ao->a[2]);
+			st32 num = getnummemend (ao->a[3]);
+
+			if ((coproc > 15) || (coreg > 15) || (reg > 15) || (num > 4092) || (num < -4092) || (num % 4 != 0)) {
+				return -1;
+			}
+		
+			ao->o = 0x00ed0000;
+			if (m & L_BIT) {
+				ao->o |= 1 << 30;
+			}
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}				
+			ao->o |= coproc;
+			ao->o |= coreg << 4;
+			ao->o |= reg << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		case THUMB_COPROC_COREG_BRACKREGBRACK_CONST: {
+			ut8 coproc = getcoproc (ao->a[0]);
+			ut8 coreg = getcoprocreg (ao->a[1]);
+			ut8 reg = getregmemstartend (ao->a[2]);
+			st32 num = getnum (ao->a[3]);
+
+			if ((coproc > 15) || (coreg > 15) || (reg > 15) || (num > 4092) || (num < -4092) || (num % 4 != 0)) {
+				return -1;
+			}
+		
+			ao->o = 0x20ec0000;
+			if (m & L_BIT) {
+				ao->o |= 1 << 30;
+			}
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= coproc;
+			ao->o |= coreg << 4;
+			ao->o |= reg << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		case THUMB_COPROC_COREG_BRACKREG_CONSTBRACKBANG: {
+			ut8 coproc = getcoproc (ao->a[0]);
+			ut8 coreg = getcoprocreg (ao->a[1]);
+			ut8 reg = getregmemstart (ao->a[2]);
+			st32 num = getnummemendbang (ao->a[3]);
+
+			if ((coproc > 15) || (coreg > 15) || (reg > 15) || (num > 4092) || (num < -4092) || (num % 4 != 0)) {
+				return -1;
+			}
+		
+			ao->o = 0x20ed0000;
+			if (m & L_BIT) {
+				ao->o |= 1 << 30;
+			}
+			if (m & TWO_BIT) {
+				ao->o |= 1 << 20;
+			}
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= coproc;
+			ao->o |= coreg << 4;
+			ao->o |= reg << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "stm", FD_BIT | DB_BIT | IA_BIT | EA_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		bool wb = false;
+		switch (argt) {
+		case THUMB_REGBANG_LIST: {
+			wb = true;
+			ao->a[0][strlen (ao->a[0]) - 1] = '\0';
+		        }
+			// intentional fallthrough
+		case THUMB_REG_LIST: {
+			ut8 reg = getreg (ao->a[0]);
+			st32 list = getreglist (ao->a[1]);
+			if ((list <= 0) || ((list & 0x0000a000) != 0)) {
+				return -1;
+			}
+
+			if ((!(m & DOTW_BIT)) && ((list & 0x0000ff00) == 0) && (!(m & (FD_BIT | DB_BIT))) && wb) {
+				ao->o = 0x00c0;
+				ao->o |= (list & 0x000000ff) << 8;
+				ao->o |= reg;
+				return 2;
+			}
+
+			if ((m & (FD_BIT | DB_BIT | IA_BIT | EA_BIT)) == 0) {
+				return -1;
+			}
+			
+			if (m & (FD_BIT | DB_BIT)) {
+				ao->o = 0x00e90000;
+			} else {
+				ao->o = 0x80e80000;
+			}
+
+			if (wb) {
+				ao->o |= 1 << 29;
+			}
+
+			ao->o |= reg << 24;
+			ao->o |= (list & 0x000000ff) << 8;
+			ao->o |= (list & 0x0000ff00) >> 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else 
+	if ((m = opmask (ao->op, "str", B_BIT | T_BIT | D_BIT | H_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut32 strsel = m & (B_BIT | H_BIT | D_BIT);
+		switch (argt) {
+		case THUMB_REG_BRACKREGBRACK:
+			if (ao->a[2] == NULL) { // double fallthrough
+				ao->a[1][strlen (ao->a[1]) -1] = '\0';
+				ao->a[2] = "0]";
+			}
+			// intentional fallthrough
+		case THUMB_REG_BRACKREG_CONSTBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getregmemstart (ao->a[1]);
+			st32 num = getnummemend (ao->a[2]);
+			if (m & T_BIT) {
+				if ((num < 0) || (num > 255)) {
+					return -1;
+				}
+				if (strsel == 0) {
+					ao->o = 0x40f8000e;
+				} else
+			        if (strsel == H_BIT) {
+					ao->o = 0x20f8000e;
+				} else
+			        if (strsel == B_BIT) {
+					ao->o = 0x00f8000e;
+				} else {
+					return -1;
+				}
+				ao->o |= num << 8;
+				return mem_32bit_2reg (ao, m);
+			}
+			
+			if ((strsel == 0) && (reg2 == 13) && (num >= 0) && (num < 1024) && ((num % 4) == 0) && (reg1 < 8) & (!(m & DOTW_BIT))) {
+				ao->o = 0x0090;
+				ao->o |= reg1;
+				ao->o |= (num >> 2) << 8;
+				return 2;
+			}
+
+			bool t1form = false;
+			if ((strsel == 0) && (num < 128) && (num >= 0) && (num % 4 == 0)) {
+				ao->o = 0x0060;
+				ao->o |= (num >> 4);
+				ao->o |= ((num >> 2) & 0x3) << 14;
+				t1form = true;
+			}
+			if ((strsel == B_BIT) && (num < 32) && (num >= 0)) {
+				ao->o = 0x0070;
+				ao->o |= (num >> 2);
+				ao->o |= (num & 0x3) << 14;
+				t1form = true;
+			}
+			if ((strsel == H_BIT) && (num < 64) && (num >= 0) && (num % 2 == 0)) {
+				ao->o = 0x0080;
+				ao->o |= (num >> 3);
+				ao->o |= ((num >> 1) & 0x3) << 14;
+				t1form = true;
+			}
+			if (t1form) {
+				if (mem_16bit_2reg (ao, m)) {
+					return 2;
+				}
+			}
+			
+			if ((num > 4095) || (num < -255)) {
+				return -1;
+			}
+			if ((num >= 0) && (num < 4096)) {
+				if (strsel == 0) {
+					ao->o = 0xc0f80000;
+				} else
+				if (strsel == B_BIT) {
+					ao->o = 0x80f80000;
+				} else
+				if (strsel == H_BIT) {
+					ao->o = 0xa0f80000;
+				} else {
+					return -1;
+				}
+				ao->o |= (num >> 8);
+				ao->o |= (num & 0x000000ff) << 8;
+				return mem_32bit_2reg (ao, m);
+			}
+			if (strsel == 0) {
+				ao->o = 0x40f8000c;
+			} else
+			if (strsel == B_BIT) {
+				ao->o = 0x00f8000c;
+			} else
+			if (strsel == H_BIT) {
+				ao->o = 0x20f8000c;
+			} else {
+				return -1;
+			}
+			ao->o |= -num << 8;
+			return mem_32bit_2reg (ao, m);
+		        }
+			break;
+		case THUMB_REG_BRACKREGBRACK_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getregmemstartend (ao->a[1]);
+			st32 num = getnum (ao->a[2]);
+
+			if ((num > 255) || (num < -255)) {
+				return -1;
+			}
+
+			if (strsel == 0) {
+				ao->o = 0x40f80009;
+			} else 
+			if (strsel == B_BIT) {
+				ao->o = 0x00f80009;
+			} else 
+			if (strsel == H_BIT) {
+				ao->o = 0x20f80009;
+			} else {
+				return -1;
+			}
+
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 1;
+			}
+			ao->o |= num << 8;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2 << 24;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_BRACKREG_CONSTBRACKBANG: {
+			st32 num = getnummemendbang (ao->a[2]);
+
+			if ((num > 255) || (num < -255)) {
+				return -1;
+			}
+
+			if (strsel == 0) {
+				ao->o = 0x40f8000d;
+			} else 
+			if (strsel == B_BIT) {
+				ao->o = 0x00f8000d;
+			} else 
+			if (strsel == H_BIT) {
+				ao->o = 0x20f8000d;
+			} else {
+				return -1;
+			}
+
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 1;
+			}
+			ao->o |= num << 8;
+			return mem_32bit_2reg (ao, m);
+		        }
+			break;
+		case THUMB_REG_BRACKREG_REGBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getregmemstart (ao->a[1]);
+			ut8 reg3 = getregmemend (ao->a[2]);
+			if ((reg1 < 8) && (reg2 < 8) && (reg3 < 8) && (!(m & DOTW_BIT))) {
+				if (strsel == 0) {
+					ao->o = 0x0050;
+				} else
+				if (strsel == B_BIT) {
+					ao->o = 0x0054;
+				} else
+				if (strsel == H_BIT) {
+					ao->o = 0x0052;
+				} else {
+					return -1;
+				}
+				ao->o |= reg1 << 8;
+				ao->o |= reg2 << 11;
+				ao->o |= (reg3 & 0x3) << 14;
+				ao->o |= (reg3 >> 2);
+				return 2;
+			}
+			ao->a[2][strlen (ao->a[2]) - 1] = '\0';
+			ao->a[3] = "lsl 0]";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_BRACKREG_REG_SHIFTBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getregmemstart (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut32 shift = getshiftmemend (ao->a[3]) >> 2;
+			
+			if (((shift & 0xffffcfff) != 0) || (reg1 > 15) || (reg2 > 15) || (reg3 > 15)) {
+				return -1;
+			}
+
+			if (strsel == 0) {
+				ao->o = 0x40f80000;
+			} else 
+			if (strsel == B_BIT) {
+				ao->o = 0x00f80000;
+			} else 
+			if (strsel == H_BIT) {
+				ao->o = 0x20f80000;
+			} else {
+				return -1;
+			}
+			
+			ao->o |= reg1 << 4;
+			ao->o |= reg2 << 24;
+			ao->o |= reg3 << 8;
+			ao->o |= shift;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG_BRACKREGBRACK: {
+			ao->a[2][strlen (ao->a[2]) - 1] = '\0';
+			ao->a[3] = "0]";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_BRACKREG_CONSTBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstart (ao->a[2]);
+			st32 num = getnummemend (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (strsel != D_BIT) || (num > 1023) || (num < -1023) || ((num % 4) != 0)) {
+				return -1;
+			}
+
+			ao->o = 0x40e90000;
+
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG_BRACKREG_CONSTBRACKBANG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstart (ao->a[2]);
+			st32 num = getnummemendbang (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (strsel != D_BIT) || (num > 1023) || (num < -1023) || ((num % 4) != 0)) {
+				return -1;
+			}
+
+			ao->o = 0x60e90000;
+
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG_BRACKREGBRACK_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstartend (ao->a[2]);
+			st32 num = getnum (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (strsel != D_BIT) || (num > 1023) || (num < -1023) || ((num % 4) != 0)) {
+				return -1;
+			}
+
+			ao->o = 0x60e80000;
+
+			if (num < 0) {
+				num = -num;
+			} else {
+				ao->o |= 1 << 31;
+			}
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "strex", B_BIT | D_BIT | H_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut32 strsel = m & (B_BIT | H_BIT | D_BIT);
+		switch (argt) {
+		case THUMB_REG_REG_BRACKREGBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstartend (ao->a[2]);
+			
+			if ((strsel == D_BIT) || (reg1 > 15) || (reg2 > 15) || (reg3 > 15)) {
+				return -1;
+			}
+			if (strsel == B_BIT) {
+				ao->o = 0xc0e8400f;
+				ao->o |= reg1 << 8;
+				ao->o |= reg2 << 4;
+				ao->o |= reg3 << 24;
+				return 4;
+			} else
+			if (strsel == H_BIT) {
+				ao->o = 0xc0e8500f;
+				ao->o |= reg1 << 8;
+				ao->o |= reg2 << 4;
+				ao->o |= reg3 << 24;
+				return 4;
+			}
+
+			ao->a[2][strlen (ao->a[2]) - 1] = '\0';
+			ao->a[3] = "0]";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_BRACKREG_CONSTBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getregmemstart (ao->a[2]);
+			st32 num = getnummemend (ao->a[3]);
+
+			if ((strsel != 0) || (reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (num < 0) || (num > 1023) || ((num % 4) !=0)) {
+				return -1;
+			}
+
+			ao->o = 0x40e80000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 4;
+			ao->o |= reg3 << 24;
+			ao->o |= (num >> 2) << 8;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG_REG_BRACKREGBRACK: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getregmemstartend (ao->a[3]);
+
+			if ((strsel != D_BIT) || (reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15)) {
+				return -1;
+			}
+
+			ao->o = 0xc0e87000;
+			ao->o |= reg1 << 8;
+			ao->o |= reg2 << 4;
+			ao->o |= reg3;
+			ao->o |= reg4 << 24;
+			return 4;
+		        }
+			break;
+		}
+	} else 
+	if ((m = opmask (ao->op, "sub", S_BIT | W_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 num = getnum (ao->a[2]);
+
+			if ((reg1 > 15) || (reg2 > 15)) {
+				return -1;
+			}
+
+			if ((reg1 == 15) && (reg2 == 14) && (num < 256)) {
+				ao->o = 0xdef3008f;
+				ao->o |= num << 8;
+				return 4;
+			}
+			if (reg2 == 13) {
+				if ((reg1 == 13) && (!(m & DOTW_BIT)) && (!(m & W_BIT)) && (num <= 4096) && (num % 4 == 0)) {
+					ao->o = 0x80b0;
+					ao->o |= (num >> 2) << 8;
+					return 2;
+				}
+				err = false;
+				ut32 thnum = getthimmed12 (ao->a[2]);
+				
+				if (!err && (!(m & W_BIT))) {
+					ao->o = 0xadf10000;
+					ao->o |= thnum;
+					ao->o |= reg1;
+					if (m & S_BIT) {
+						ao->o |= 1 << 28;
+					}
+					return 4;
+				}
+
+				if (num > 4096) {
+					return -1;
+				}
+
+				ao->o = 0xadf20000;
+				ao->o |= getthzeroimmed12 (num);
+				ao->o |= reg1;
+				return 4;
+			}
+
+			if ((reg1 < 8) && (reg2 < 8) && (!(m & DOTW_BIT)) && (!(m & W_BIT)) && (num < 8)) {
+				ao->o = 0x001e;
+				ao->o |= reg1 << 8;
+				ao->o |= reg2 << 11;
+				ao->o |= (num & 0x3) << 14;
+				ao->o |= (num >> 2);
+				return 2;
+			}
+
+			if ((reg1 < 8) && (reg1 == reg2) && (!(m & DOTW_BIT)) && (!(m & W_BIT)) && (num < 256)) {
+				ao->o = 0x0038;
+				ao->o |= reg1;
+				ao->o |= num << 8;
+				return 2;
+			}
+
+			err = false;
+			ut32 thnum = getthimmed12 (ao->a[2]);
+			
+			if (!err && (!(m & W_BIT))) {
+				ao->o = 0xa0f10000;
+				ao->o |= thnum;
+				return std_32bit_2reg (ao, m, false);
+			}
+
+			if (num > 4096) {
+				return -1;
+			}
+
+			ao->o = 0xa0f20000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 24;
+			ao->o |= getthzeroimmed12 (num);
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT:
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut32 shift = thumb_getshift (ao->a[3]);
+
+			if (reg2 == 13) {
+				ao->o = 0xadeb0000;
+				ao->o |= reg1;
+				ao->o |= reg3 << 8;
+				ao->o |= shift;
+				if (m & S_BIT) {
+					ao->o |= 1 << 28;
+				}
+				return 4;
+			}
+
+			if ((shift == 0) && (reg1 < 8) && (reg2 < 8) && (reg3 < 8) && (!(m & DOTW_BIT))) {
+				ao->o = 0x001a;
+				ao->o |= reg1 << 8;
+				ao->o |= reg2 << 11;
+				ao->o |= (reg3 & 0x3) << 14;
+				ao->o |= (reg3 >> 2);
+				return 2;
+			}
+			
+			ao->o = 0xa0eb0000;
+			return std_32bit_3reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "svc", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_CONST: {
+			ut32 num = getnum (ao->a[0]);
+			if (num > 255) {
+				return -1;
+			}
+			ao->o = 0x00df;
+			ao->o |= num << 8;
+			return 2;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "sxta", B_BIT | H_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
+			}
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ut32 shift = thumb_getshift (ao->a[3]);
+
+			if ((shift != 0) && ((shift & 0x0000f010) != 0x00003000)) {
+				return -1;
+			}
+
+			ut64 sufsel = m & (B_BIT | H_BIT | SIXTEEN_BIT);
+			
+			if (sufsel == B_BIT) {
+				ao->o = 0x40fa80f0;
+			} else
+			if (sufsel == (B_BIT | SIXTEEN_BIT)) {
+				ao->o = 0x20fa80f0;
+			} else
+			if (sufsel == H_BIT) {
+				ao->o = 0x00fa80f0;
+			} else {
+				return -1;
+			}
+
+			ao->o |= (shift & 0x00000060) << 7;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		}
+	} else
+	if ((m = opmask (ao->op, "sxt", B_BIT | H_BIT | SIXTEEN_BIT))) {
+		ut64 sufsel = m & (B_BIT | H_BIT | SIXTEEN_BIT);
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			ao->a[2] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 shift = thumb_getshift (ao->a[2]);
+
+			if ((reg1 > 15) && (reg2 > 15) && (shift != 0) && ((shift & 0x0000f010) != 0x00003000)) {
+				return -1;
+			}
+
+			if (sufsel == B_BIT) {
+				ao->o = 0x40b2;
+				if ((shift == 0) && std_16bit_2reg (ao, m)) {
+					return 2;
+				}
+				ao->o = 0x4ffa80f0;
+			} else
+			if (sufsel == (B_BIT | SIXTEEN_BIT)) {
+				ao->o = 0x2ffa80f0;
+			} else
+			if (sufsel == H_BIT) {
+				ao->o = 0x00b2;
+				if ((shift == 0) && std_16bit_2reg (ao, m)) {
+					return 2;
+				}
+				ao->o = 0x0ffa80f0;
+			} else {
+				return -1;
+			}
+
+			ao->o |= (shift & 0x00000060) << 7;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			return 4;
+		        }
+			break;
+		}
+	} else
+	if ((m = opmask (ao->op, "tb", B_BIT | H_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (B_BIT | H_BIT);
+		switch (argt) {
+		case THUMB_BRACKREG_REGBRACK: {
+			ut8 reg1 = getregmemstart (ao->a[0]);
+			ut8 reg2 = getregmemend (ao->a[1]);
+
+			if ((reg1 > 15) || (reg2 > 15)) {
+				return -1;
+			}
+
+			if (sufsel == B_BIT) {
+				ao->o = 0xd0e800f0;
+				ao->o |= reg1 << 24;
+				ao->o |= reg2 << 8;
+				return 4;
+			}
+			ao->a[1][strlen (ao->a[1]) - 1] = '\0';
+			ao->a[2] = "lsl 1]";
+		        }
+			// intentional fallthrough
+		case THUMB_BRACKREG_REG_SHIFTBRACK: {
+			ut8 reg1 = getregmemstart (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 shift = getshiftmemend (ao->a[2]);
+			
+			if ((reg1 > 15) || (reg2 > 15) || (shift != 0x00004000) || (sufsel != H_BIT)) {
+				return -1;
+			}
+
+			ao->o = 0xd0e810f0;
+			ao->o |= reg1 << 24;
+			ao->o |= reg2 << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "teq", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg = getreg (ao->a[0]);
+			err = false;
+			ut32 num = getthimmed12 (ao->a[1]);
+
+			if (err || (reg > 15)) {
+				return -1;
+			}
+
+			ao->o = 0x90f0000f;
+			ao->o |= reg << 24;
+			ao->o |= num;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->a[2] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			ao->o = 0x90ea000f;
+			return std_32bit_2reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "tst", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			err = false;
+			ut32 num = getthimmed12 (ao->a[1]);
+
+			if (err || (reg1 > 15)) {
+				return -1;
+			}
+
+			ao->o = 0x10f0000f;
+			ao->o |= reg1 << 24;
+			ao->o |= num;
+			return 4;
+		        }
+			break;
+		case THUMB_REG_REG: {
+			ao->o = 0x0042;
+			
+			if (std_16bit_2reg (ao, m)) {
+				return 2;
+			}
+
+			ao->a[2] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			ao->o = 0x10ea000f;
+			return std_32bit_2reg (ao, m, true);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "ldmia")) {
-		ao->o = 0xc8 + getreg (ao->a[0]);
-		ao->o |= getlist(ao->opstr) << 8;
-		return 2;
+	if ((m = opmask (ao->op, "uadd", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (m & EIGHT_BIT) {
+				ao->o = 0x80fa40f0;
+			} else
+			if (m & SIXTEEN_BIT) {
+				ao->o = 0x90fa40f0;
+			} else {
+				return -1;
+			}
+
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "stmia")) {
-		ao->o = 0xc0 + getreg (ao->a[0]);
-		ao->o |= getlist(ao->opstr) << 8;
-		return 2;
+	if ((m = opmask (ao->op, "uasx", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xa0fa40f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "cbz")) {
-		ut64 dst = getnum (ao->a[1]);
-		int delta = dst - off;
-		if (delta < 4) {
+	if ((m = opmask (ao->op, "ubfx", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_CONST_CONST: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 lsb = getnum (ao->a[2]);
+			ut32 widthm1 = getnum (ao->a[3]) - 1;
+			
+			if ((reg1 > 15) || (reg2 > 15) || (lsb > 31) || ((31 - lsb) <= widthm1)) {
+				return -1;
+			}
+
+			ao->o = 0xc0f30000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 24;
+			ao->o |= (lsb & 0x1c) << 2;
+			ao->o |= (lsb & 0x3) << 14;
+			ao->o |= widthm1 << 8;
+			return 4;
+		        }
+			break;
+		default:
 			return -1;
 		}
-		ao->o = 0xb1;
-		ao->o += getreg (ao->a[0]) << 8;
-		delta -= 4;
-		delta /= 4;
-		ao->o |= delta << 12;
-		return 2;
 	} else
-	if (!strcmpnull (ao->op, "nop")) {
-		ao->o = 0xbf;
-		return 2;
+	if ((m = opmask (ao->op, "udiv", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xb0fbf0f0;
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "yield")) {
-		ao->o = 0x10bf;
-		return 2;
+	if ((m = opmask (ao->op, "uhadd", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (EIGHT_BIT | SIXTEEN_BIT);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (sufsel == EIGHT_BIT) {
+				ao->o = 0x80fa60f0;
+			} else 
+			if (sufsel == SIXTEEN_BIT) {
+				ao->o = 0x90fa60f0;
+			} else {
+				return -1;
+			}
+				
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "udf")) {
-		ao->o = 0xde;
-		ao->o |= getnum (ao->a[0]) << 8;
-		return 2;
+	if ((m = opmask (ao->op, "uhasx", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xa0fa60f0;
+			
+			return std_32bit_3reg (ao, m, false);
+			
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "wfe")) {
-		ao->o = 0x20bf;
-		return 2;
+	if ((m = opmask (ao->op, "uhsax", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xe0fa60f0;
+			
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "wfi")) {
-		ao->o = 0x30bf;
-		return 2;
+	if ((m = opmask (ao->op, "uhsub", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (EIGHT_BIT | SIXTEEN_BIT);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (sufsel == EIGHT_BIT) {
+				ao->o = 0xc0fa60f0;
+			} else 
+			if (sufsel == SIXTEEN_BIT) {
+				ao->o = 0xd0fa60f0;
+			} else {
+				return -1;
+			}
+				
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "sev")) {
-		ao->o = 0x40bf;
-		return 2;
+	if ((m = opmask (ao->op, "umaal", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15)) {
+				return -1;
+			}
+			
+			ao->o = 0xe0fb6000;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= reg4 << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "bkpt")) {
-		ao->o = 0xbe;
-		ao->o |= (0xff & getnum (ao->a[0])) << 8;
-		return 2;
+	if ((m = opmask (ao->op, "umlal", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15)) {
+				return -1;
+			}
+			
+			ao->o = 0xe0fb0000;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= reg4 << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-#if 0
-	if (!strcmpnull (ao->op, "and")) {
-		ao->o = 0x40;
-		ao->o |= (0xff & getreg (ao->a[0])) << 8;
-		ao->o |= (0xff & getreg (ao->a[1])) << 11;
-	} else
-#endif
-	if (!strcmpnull (ao->op, "svc")) {
-		ao->o = 0xdf;
-		ao->o |= (0xff & getnum (ao->a[0])) << 8;
-		return 2;
+	if ((m = opmask (ao->op, "umull", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15)) {
+				return -1;
+			}
+			
+			ao->o = 0xa0fb0000;
+			ao->o |= reg1 << 4;
+			ao->o |= reg2;
+			ao->o |= reg3 << 24;
+			ao->o |= reg4 << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "b") || !strcmpnull (ao->op, "b.n")) {
-		//uncond branch : PC += 4 + (delta*2)
-		int offset = getnum (ao->a[0]);
-		if (err) {
-			return 0;
+	if ((m = opmask (ao->op, "uqadd", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (EIGHT_BIT | SIXTEEN_BIT);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (sufsel == EIGHT_BIT) {
+				ao->o = 0x80fa50f0;
+			} else 
+			if (sufsel == SIXTEEN_BIT) {
+				ao->o = 0x90fa50f0;
+			} else {
+				return -1;
+			}
+				
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
 		}
-		int delta = offset - 4 - ao->off;
-		if ((delta < -2048) || (delta > 2046) || (delta & 1)) {
-			eprintf("branch out of range or not even\n");
-			return 0;
+	} else
+	if ((m = opmask (ao->op, "uqasx", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xa0fa50f0;
+			
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
 		}
-		ut16 opcode = 0xe000 | ((delta / 2) & 0x7ff);	//11bit offset>>1
-		ao->o = opcode >> 8;
-		ao->o |= (opcode & 0xff) << 8;    // XXX (ut32) ao->o holds the opcode in little-endian format !?
-		return 2;
 	} else
-	if (!strcmpnull (ao->op, "bx")) {
-		ao->o = 0x47;
-		ao->o |= getreg (ao->a[0]) << 11;
-		return 2;
+	if ((m = opmask (ao->op, "uqsax", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xe0fa50f0;
+			
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
 	} else
-	if (!strcmpnull (ao->op, "blx")) {
-		int reg = getreg (ao->a[0]);
-		ao->o = 0xf000e800;
-		//ao->o = 0x00f000e8;
-		if (reg == -1) {
-			ut64 n = getnum (ao->a[0]);
-			if ((st64)n < 4 || (n & 3)) {
-				eprintf ("Invalid destination for blx\n");
-				return 0;
+	if ((m = opmask (ao->op, "uqsub", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (EIGHT_BIT | SIXTEEN_BIT);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (sufsel == EIGHT_BIT) {
+				ao->o = 0xc0fa50f0;
+			} else 
+			if (sufsel == SIXTEEN_BIT) {
+				ao->o = 0xd0fa50f0;
+			} else {
+				return -1;
 			}
-			n -= 4;
-			n -= ao->off;
-			n /= 4; // always aligned jump
-			ao->o |= (n & 0xffff) << 1;
-			ao->o |= (n >> 10 & 0xff) << 16;
-			thumb_swap (&ao->o);
-		} else {
-			ao->o = 0x8047;
-			ao->o |= reg << 11;
+				
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
 		}
-		// XXX: length = 4
-		return 4;
 	} else
-	if (!strcmpnull (ao->op, "bl")) {
-		int high, low;
-		high = low = (getnum (ao->a[0]) - 4);
-		high &= 0x7FFFFF;
-		high >>= 12;
-		high |= 0xF000;
-		low &= 0xFFF;
-		low >>= 1;
-		low |= 0xF800;
-		ao->o = low;
-		ao->o |= (high << 16);
-		thumb_swap (&ao->o);
-		// XXX: length = 4
-		return 4;
-	} else
-	if (*ao->op == 'b') { // conditional branch
-		ao->o = 0xd0 | arm_opcode_cond (ao, 1);
-		int bdelta = getnum (ao->a[0]) -4;
-		if ((bdelta < -256) || (bdelta > 254) || (bdelta & 1)) {
-			eprintf("branch out of range or not even\n");
-			return 0;
+	if ((m = opmask (ao->op, "usad8", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0x70fb00f0;
+			
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
 		}
-		ao->o |= ((bdelta/2) & 0xff) << 8;	// 8bit offset >>1
-		return 2;
 	} else
-	if (!strcmpnull (ao->op, "mov")) {
-		int reg = getreg (ao->a[1]);
-		if (reg != -1) {
-			ao->o = 0x46;
-			ao->o |= (getreg (ao->a[0]) & 0x8) << 12;
-			ao->o |= (getreg (ao->a[0]) & 0x7) << 8;
-			ao->o |= reg << 11;
-		} else {
-			ao->o = 0x20;
-			ao->o |= (getreg (ao->a[0]));
-			ao->o |= (getnum (ao->a[1]) & 0xff) << 8;
+	if ((m = opmask (ao->op, "usada8", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG_REG_REG: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut8 reg3 = getreg (ao->a[2]);
+			ut8 reg4 = getreg (ao->a[3]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (reg3 > 15) || (reg4 > 15)) {
+				return -1;
+			}
+			
+			ao->o = 0x70fb0000;
+			ao->o |= reg1;
+			ao->o |= reg2 << 24;
+			ao->o |= reg3 << 8;
+			ao->o |= reg4 << 4;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
 		}
-		return 2;
 	} else
-	if (!strcmpnull (ao->op, "mov.w")) {
-		ao->o = 0x4ff00000;
-		int reg = getreg (ao->a[0]);
-		int num = getnum (ao->a[1]);
-		int top_bits = num & 0xf00;
-		if (reg != -1) {
-			ao->o |= reg;
-			if (num < 256) {
+	if ((m = opmask (ao->op, "usat", SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_CONST_REG: {
+			if (m & SIXTEEN_BIT) {
+				ut8 reg1 = getreg (ao->a[0]);
+				ut32 num = getnum (ao->a[1]);
+				ut8 reg2 = getreg (ao->a[2]);
+
+				if ((reg1 > 15) || (num > 15) || (reg2 > 15)) {
+					return -1;
+				}
+
+				ao->o = 0xa0f30000;
+				ao->o |= reg1;
+				ao->o |= reg2 << 24;
 				ao->o |= num << 8;
-			} else if (num < 512) {
-				if (num & 1) {
-					return 0;
-				}
-				num = (num ^ top_bits) >> 1;
-				ao->o |= 0x00048070 | num << 8;
-			} else if (num < 1024) {
-				if (num & 3) {
-					return 0;
-				}
-				num = (num ^ top_bits) >> 2;
-				ao->o |= 0x00040070 | num << 8;
-			} else if (num < 2048) {
-				if (num & 7) {
-					return 0;
-				}
-				num = (num ^ top_bits) >> 3;
-				ao->o |= 0x00048060 | num << 8;
-			} else if (num == 2048) {
-				ao->o = 0x4ff40060 | reg;
-			} else {
-				return 0;
+				return 4;
 			}
-		} else {
-			return 0;
+
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_CONST_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut32 num = getnum (ao->a[1]);
+			ut8 reg2 = getreg (ao->a[2]);
+			ut32 shift = thumb_getshift (ao->a[3]);
+
+			if ((reg1 > 15) || (num > 31) || (reg2 > 15) || (m & SIXTEEN_BIT) || ((shift & 0x00001000) != 0)) {
+				return -1;
+			}
+
+			ao->o = 0x80f30000;
+			ao->o |= reg1;
+			ao->o |= (num & 0xf) << 8;
+			ao->o |= (num >> 4 ) << 12;
+			ao->o |= reg2 << 24;
+			ao->o |= (shift & 0x00002000) << 16;
+			ao->o |= (shift & 0x0000c070);
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
 		}
-		return 8;
 	} else
-	if (!strncmp (ao->op, "ldr", 3)) {
-		char ch = (ao->op[3] == '.') ? ao->op[4] : ao->op[3];
-		getrange (ao->a[1]);
-		getrange (ao->a[2]);
-		switch (ch) {
-		case 'w': {
-			int a0 = getreg (ao->a[0]);
-			int a1 = getreg (ao->a[1]);
-			int a2 = getnum (ao->a[2]);
-			ao->o = 0xd0f80000;
-			ao->o |= ((a2 & 0xff) << 8);
-			ao->o |= (((a2 >> 8) & 0xff));
-			ao->o |= (a0 << 4);
-			ao->o |= (a1 << 24);
-			return 4;
-			}
+	if ((m = opmask (ao->op, "usax", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->o = 0xe0fa40f0;
+			
+			return std_32bit_3reg (ao, m, false);
+		        }
 			break;
-		case 'h': {
-			int a0 = getreg (ao->a[0]);
-			int a1 = getreg (ao->a[1]);
-			int a2 = getreg (ao->a[2]);
-			if (a2 ==-1) {
-				a2 = getnum (ao->a[2]) / 8;
-				ao->o = 0x88; // | (8+(0xf & a0));
-				ao->o |= (7 & a0) << 8;
-				ao->o |= (7 & a1) << 11;
-				ao->o += (7 & a2);
-				return 2;
-			} else return 0; }
-		case 'b': {
-			int a0 = getreg (ao->a[0]);
-			int a1 = getreg (ao->a[1]);
-			int a2 = getreg (ao->a[2]);
-			if (a2 ==-1) {
-				a2 = getnum (ao->a[2]) / 8;
-				ao->o = 0x78; // | (8+(0xf & a0));
-				ao->o |= (7 & a0) << 8;
-				ao->o |= (7 & a1) << 11;
-				ao->o |= (7 & a2);
-				return 2;
-			} else return 0; }
-		default: {
-			if (!strcmpnull (ao->a[1], "sp")) {
-				// ldr r0, [sp, n] = a[r0-7][nn]
-				if (getreg (ao->a[2]) == -1) {
-					// ldr r0, [sp, n]
-					ao->o = 0x98 + (0xf & getreg (ao->a[0]));
-					ao->o |= (0xff & getnum (ao->a[2]) / 4) << 8;
-					return 2;
-				} else return 0;
-			} else
-			if (!strcmpnull (ao->a[1], "pc")) {
-				// ldr r0, [pc, n] = 4[r0-8][nn*4]
-				if (getreg (ao->a[2]) == -1) {
-					ao->o = 0x40 | (8 + (0xf & getreg (ao->a[0])));
-					ao->o |= (0xff & getnum (ao->a[2]) / 4) << 8;
-					return 2;
-				} else return 0;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "usub", EIGHT_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (EIGHT_BIT | SIXTEEN_BIT);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			if (sufsel == EIGHT_BIT) {
+				ao->o = 0xc0fa40f0;
+			} else 
+			if (sufsel == SIXTEEN_BIT) {
+				ao->o = 0xd0fa40f0;
 			} else {
-				// ldr r0, [rN, rN] = 58[7bits:basereg + 7bits:destreg]
-				int a0 = getreg (ao->a[0]);
-				int a1 = getreg (ao->a[1]);
-				int a2 = getreg (ao->a[2]);
-				if (a2 == -1) {
-					int num= getnum (ao->a[2]);
-					if (num > 0) {
-						if (num >= 0x1000) {
-							return -1;
-						}
-						if (num < 0x78 &&
-						    (!(num & 0xb) || !(num & 0x7)) &&
-						    (a0 < 8 && a1 < 8)) {
-							ao->o = 0x68;
-							ao->o |= (num & 0xf) << 12;
-							ao->o |= a1 << 11;
-							ao->o |= a0 << 8;
-							ao->o |= num >> 4;
-							return 2;
-						}
-						// ldr r0, [rN, num]
-						// Separate out high bits
-						int h = num >> 8;
-						num &= 0xff;
-						ao->o = (0xd0 | a1) << 24;
-						ao->o |= 0xf8 << 16;
-						ao->o |= num << 8;
-						ao->o |= a0 << 4;
-						ao->o |= h;
-					} else {
-						// ldr r0, [rN]
-						ao->o = 0x68;
-						ao->o |= (7 & a0) << 8;
-						ao->o |= (7 & a1) << 11;
-					}
-				} else {
-					ao->o = 0x58; // | (8+(0xf & a0));
-					ao->o |= (7 & a0) << 8;
-					ao->o |= (7 & a1) << 11;
-					ao->o |= (7 & a2) << 14;
-				}
-				return 2;
+				return -1;
 			}
-		} }
-	} else
-	if (!strncmp (ao->op, "str", 3)) {
-		getrange (ao->a[1]);
-		getrange (ao->a[2]);
-		if (ao->op[3] == 'h') {
-			int a0 = getreg (ao->a[0]);
-			int a1 = getreg (ao->a[1]);
-			int a2 = getreg (ao->a[2]);
-			if (a2 == -1) {
-				a2 = getnum (ao->a[2]);
-				ao->o = 0x80; // | (8+(0xf & a0));
-				ao->o |= (7 & a0) << 8;
-				ao->o |= (7 & a1) << 11;
-				ao->o |= (7 & (a2 >> 1));
-				return 2;
+				
+			return std_32bit_3reg (ao, m, false);
+		        }
+			break;
+		default:
+			return -1;
+		}
+	} else
+	if ((m = opmask (ao->op, "uxta", B_BIT | H_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (B_BIT | H_BIT | SIXTEEN_BIT);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			std_opt_2 (ao);
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG: {
+			ao->a[3] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			if (ao->a[3] == NULL) { // double fallthrough
+				std_opt_3 (ao);
 			}
-		} else
-		if (ao->op[3] == 'b') {
-			int a0 = getreg (ao->a[0]);
-			int a1 = getreg (ao->a[1]);
-			int a2 = getreg (ao->a[2]);
-			if (a2 == -1) {
-				a2 = getnum (ao->a[2]);
-				ao->o = 0x70; // | (8+(0xf & a0));
-				ao->o |= (7 & a0) << 8;
-				ao->o |= (7 & a1) << 11;
-				ao->o |= (7 & a2);
-				return 2;
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_REG_SHIFT: {
+			ut32 shift = thumb_getshift (ao->a[3]);
+
+			if (shift && ((shift & 0x0000f010) != 0x00003000)) {
+				return -1;
 			}
-		} else {
-			if (!strcmpnull (ao->a[1], "sp")) {
-				// ldr r0, [sp, n] = a[r0-7][nn]
-				if (getreg (ao->a[2]) == -1) {
-					int ret = getnum (ao->a[2]);
-					if (ret%4) {
-						eprintf ("ldr index must be aligned to 4");
-						return 0;
-					}
-					ao->o = 0x90 + (0xf & getreg (ao->a[0]));
-					ao->o |= (0xff & getnum (ao->a[2]) / 4) << 8;
-					return 2;
-				}
+
+			if (sufsel == B_BIT) {
+				ao->o = 0x50fa80f0;
 			} else
-			if (!strcmpnull (ao->a[1], "pc")) {
-				return 0;
+			if (sufsel == (B_BIT | SIXTEEN_BIT)) {
+				ao->o = 0x30fa80f0;
+			} else
+			if (sufsel == H_BIT) {
+				ao->o = 0x10fa80f0;
 			} else {
-				int a0 = getreg (ao->a[0]);
-				int a1 = getreg (ao->a[1]);
-				int a2 = getreg (ao->a[2]);
-				if (a2 == -1) {
-					a2 = getnum (ao->a[2]);
-					ao->o = 0x60;
-					ao->o |= (7 & a0) << 8;
-					ao->o |= (7 & a1) << 11;
-					ao->o |= (3 & (a2 / 4)) << 14;
-				} else {
-					ao->o = 0x50;
-					ao->o |= (7 & a0) << 8;
-					ao->o |= (7 & a1) << 11;
-					ao->o |= (3 & a2) << 14;
-				}
-				return 2;
+				return -1;
 			}
+
+			ao->o |= (shift & 0x00000060) << 7;
+			return (std_32bit_3reg (ao, m, false));
+		        }
+			break;
+		default:
+			return -1;
 		}
 	} else
-	if (!strcmpnull (ao->op, "tst")) {
-		ao->o = 0x42;
-		ao->o |= (getreg (ao->a[0])) << 8;
-		ao->o |= getreg (ao->a[1]) << 11;
-		return 2;
-	} else
-	if (!strcmpnull (ao->op, "cmp")) {
-		int reg = getreg (ao->a[1]);
-		if (reg != -1) {
-			ao->o = 0x45;
-			ao->o |= (getreg (ao->a[0])) << 8;
-			ao->o |= reg << 11;
-		} else {
-			ao->o = 0x20;
-			ao->o |= 8 + (getreg (ao->a[0]));
-			ao->o |= (getnum (ao->a[1]) & 0xff) << 8;
-		}
-		return 2;
-	} else
-	if (!strcmpnull (ao->op, "and") || !strcmpnull (ao->op, "and.w")) {
-		int reg0 = getreg (ao->a[0]);
-		int reg1 = getreg (ao->a[1]);
-		int reg2 = getreg (ao->a[2]);
-		if (reg0!=-1 && reg1 != -1) {
-			if (reg2 == -1) {
-				reg0 = getreg (ao->a[0]);
-				reg1 = getreg (ao->a[0]);
-				reg2 = getreg (ao->a[1]);
-			}
-			ao->o = 0;
-			ao->o |= 0x00 | reg1;
-			ao->o <<= 8;
-			ao->o |= 0xea;
-			ao->o <<= 8;
-			ao->o |= 0x00 | reg2;
-			ao->o <<= 8;
-			ao->o |= 0xf0 | reg0;
-			return 4;
-		}
-	} else
-	if (!strcmpnull (ao->op, "mul") || !strcmpnull (ao->op, "mul.w")) {
-		int reg0 = getreg (ao->a[0]);
-		int reg1 = getreg (ao->a[1]);
-		int reg2 = getreg (ao->a[2]);
-		if (reg0!=-1 && reg1 != -1) {
-			if (reg2 == -1) {
-				reg0 = getreg (ao->a[0]);
-				reg1 = getreg (ao->a[0]);
-				reg2 = getreg (ao->a[1]);
-			}
-			ao->o = 0;
-			ao->o |= 0x00 | reg1;
-			ao->o <<= 8;
-			ao->o |= 0xfb;
-			ao->o <<= 8;
-			ao->o |= 0x00 | reg2;
-			ao->o <<= 8;
-			ao->o |= 0xf0 | reg0;
-			return 4;
-		}
-	} else
-	if (!strcmpnull (ao->op, "add")) {
-		// XXX: signed unsigned ??
-		// add r, r = 44[7bits,7bits]
-		// adds r, n = 3[r0-7][nn]
-		int reg3 = getreg (ao->a[2]);
-		if (reg3 != -1) {
-			return -1;
-		}
-		int reg = getreg (ao->a[1]);
-		if (reg != -1) {
-			ao->o = 0x44;
-			ao->o |= (getreg (ao->a[0])) << 8;
-			ao->o |= reg << 11;
-		} else {
-			if (reg < 10) {
-				int num = getnum (ao->a[1]);
-				if (err) {
-					return 0;
+	if ((m = opmask (ao->op, "uxt", B_BIT | H_BIT | SIXTEEN_BIT))) {
+		ut64 argt = thumb_selector (ao->a);
+		ut64 sufsel = m & (B_BIT | H_BIT | SIXTEEN_BIT);
+		switch (argt) {
+		case THUMB_REG_REG: {
+			if ((sufsel == B_BIT) || (sufsel == H_BIT)) {
+				if (sufsel == B_BIT) {
+					ao->o = 0xc0b2;
+				} else {
+					ao->o = 0x80b2;
 				}
-				if (getreg (ao->a[0]) == 13 &&
-				    (!(num & 0xb) || !(num & 0x7))) {
-					ao->o = 0x04b0;
-					ao->o |= num << 6;
+				if (std_16bit_2reg (ao, m)) {
 					return 2;
 				}
-				if (num > 0xff) {
-					if (num % 2) {
-						return 0;
-					}
-					ao->o = 0x00f58070;
-					ao->o |= (num >> 8) << 16;
-					ao->o |= (num & 0xff) << 7;
-				} else {
-					ao->o = 0x00f10000;
-					ao->o |= num << 8;
-				}
-				ao->o |= getreg (ao->a[0]) << 24;
-				ao->o |= getreg (ao->a[0]);
 			}
-			/*ao->o = 0x30;
-			ao->o |= (getreg (ao->a[0]));
-			ao->o |= (getnum (ao->a[1]) & 0xff) << 8;*/
+			ao->a[2] = "lsl 0";
+		        }
+			// intentional fallthrough
+		case THUMB_REG_REG_SHIFT: {
+			ut8 reg1 = getreg (ao->a[0]);
+			ut8 reg2 = getreg (ao->a[1]);
+			ut32 shift = thumb_getshift (ao->a[2]);
+
+			if ((reg1 > 15) || (reg2 > 15) || (shift && ((shift & 0x0000f010) != 0x00003000))) {
+				return -1;
+			}
+
+			if (sufsel == B_BIT) {
+				ao->o = 0x5ffa80f0;
+			} else
+			if (sufsel == (B_BIT | SIXTEEN_BIT)) {
+				ao->o = 0x3ffa80f0;
+			} else
+			if (sufsel == H_BIT) {
+				ao->o = 0x1ffa80f0;
+			} else {
+				return -1;
+			}
+
+			ao->o |= (shift & 0x00000060) << 7;
+			ao->o |= reg1;
+			ao->o |= reg2 << 8;
+			return 4;
+		        }
+			break;
+		default:
+			return -1;
+
 		}
-		return 2;
 	} else
-	if (!strcmpnull (ao->op, "sub")) {
-		int reg = getreg (ao->a[1]);
-		if (reg != -1) {
-			int n = getnum (ao->a[2]); // TODO: add limit
-			ao->o = 0x1e;
-			ao->o |= (getreg (ao->a[0])) << 8;
-			ao->o |= reg << 11;
-			ao->o |= n / 4 | ((n % 4) << 14);
-		} else {
-			if (reg < 10) {
-				int num = getnum (ao->a[1]);
-				if (err) {
-					return 0;
-				}
-				if (getreg (ao->a[0]) == 13 &&
-				    (!(num & 0xb) || !(num & 0x7))) {
-					ao->o = 0x80b0;
-					ao->o |= num << 6;
-					return 2;
-				}
-				if (num > 0xff) {
-					if (num % 2) {
-						return 0;
-					}
-					ao->o = 0xa0f58070;
-					ao->o |= (num >> 8) << 16;
-					ao->o |= (num & 0xff) << 7;
-				} else {
-					ao->o = 0xa0f10000;
-					ao->o |= num << 8;
-				}
-				ao->o |= getreg (ao->a[0]) << 24;
-				ao->o |= getreg (ao->a[0]);
-			}
-			/*ao->o = 0x30;
-			ao->o |= 8 + (getreg (ao->a[0]));
-			ao->o |= (getnum (ao->a[1]) & 0xff) << 8;*/
+	if ((m = opmask (ao->op, "wfe", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			if (m & DOTW_BIT) {
+				ao->o = 0xaff30280;
+				return 4;
+		        } else {
+				ao->o = 0x20bf;
+				return 2;
+		        }
+		        }
+			break;
+		default:
+			return -1;
 		}
-		return 2;
 	} else
-	if (!strcmpnull(ao->op, "lsls") || !strcmpnull(ao->op, "lsrs")) {
-		ut16 opcode = 0;	//0000 xiii iiMM MDDD; ls<x>s Rd, Rm, imm5
-		if (ao->op[2] == 'r') opcode=0x0800;	//lsrs
-		int Rd = getreg (ao->a[0]);
-		int Rm = getreg (ao->a[1]);
-		int a2 = getnum (ao->a[2]);
-		if ((Rd < 0) || (Rd > 7) || (Rm < 0) || (Rm > 7) ||
-				(a2 <= 0) || (a2 > 32)) {
-			eprintf("illegal shift\n");	//bad regs, or imm5 out of range
-			return 0;
+	if ((m = opmask (ao->op, "wfi", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			if (m & DOTW_BIT) {
+				ao->o = 0xaff30380;
+				return 4;
+		        } else {
+				ao->o = 0x30bf;
+				return 2;
+		        }
+		        }
+			break;
+		default:
+			return -1;
 		}
-		opcode |= a2 << 6;
-		opcode |= Rm << 3;
-		opcode |= Rd;
-		ao->o = (opcode >> 8) | ((opcode & 0xff) << 8);
-		return 2;
 	} else
-	if (!strcmpnull (ao->op, "lsr")) {
-		ao->o = 0x4fea1000;
-		int Rd = getreg (ao->a[0]);
-		int Rm = getreg (ao->a[1]);
-		int a2 = getnum (ao->a[2]);
-		if ((Rd < 0) || (Rd > 14) || (Rm < 0) || (Rm > 14) ||
-				(a2 <= 0) || (a2 > 32)) {
-			return 0;
+	if ((m = opmask (ao->op, "yield", 0))) {
+		ut64 argt = thumb_selector (ao->a);
+		switch (argt) {
+		case THUMB_NONE: {
+			if (m & DOTW_BIT) {
+				ao->o = 0xaff30180;
+				return 4;
+		        } else {
+				ao->o = 0x10bf;
+				return 2;
+		        }
+		        }
+			break;
+		default:
+			return -1;
 		}
-		ao->o |= Rd;
-		ao->o |= Rm << 8;
-		if (a2 == 32) {
-			a2 = 0;
-		}
-		int a2b = a2 & 3;
-		ao->o |= a2b << 14;
-		int a2h = a2 >> 2;
-		ao->o |= a2h << 4;
-
-		return 4;
 	}
 	return 0;
 }
@@ -1111,8 +6199,12 @@
 				if ((ret = getreg (ao->a[0])) == -1) {
 					ut32 dst = getnum (ao->a[0]);
 					dst -= (ao->off + 8);
+					if (dst & 0x2) {
+						ao->o = 0xfb;
+					} else {
+						ao->o = 0xfa;
+					}
 					dst /= 4;
-					ao->o = 0xfa;
 					ao->o |= ((dst >> 16) & 0xff) << 8;
 					ao->o |= ((dst >> 8) & 0xff) << 16;
 					ao->o |= ((dst) & 0xff) << 24;
@@ -1220,6 +6312,51 @@
 				ao->o |= (ret & 0xf000) >> 4;
 				ao->o |= (ret & 0xf00) << 8;
 				break;
+			case TYPE_MUL:
+				if (!strcmpnull (ao->op, "mul")) {
+					ret = getreg (ao->a[0]);
+					a = getreg (ao->a[1]);
+					b = getreg (ao->a[2]);
+					if (b == -1) {
+						b = a;
+						a = ret;
+					}
+					if (ret == -1 || a == -1) {
+						return 0;
+					}
+					ao->o |= ret << 8;
+					ao->o |= a << 24;
+					ao->o |= b << 16;
+				} else {
+					low = getreg (ao->a[0]);
+					high = getreg (ao->a[1]);
+					a = getreg (ao->a[2]);
+					b = getreg (ao->a[3]);
+					if (low == -1 || high == -1 || a == -1 || b == -1) {
+						return 0;
+					}
+					if (!strcmpnull (ao->op, "smlal")) {
+						ao->o |= low << 20;
+						ao->o |= high << 8;
+						ao->o |= a << 24;
+						ao->o |= b << 16;
+					} else if (!strncmp (ao->op, "smla", 4)) {
+						if (low > 14 || high > 14 || a > 14) {
+							return 0;
+						}
+						ao->o |= low << 8;
+						ao->o |= high << 24;
+						ao->o |= a << 16;
+						ao->o |= b << 20;
+						break;
+					} else {
+						ao->o |= low << 20;
+						ao->o |= high << 8;
+						ao->o |= a << 24;
+						ao->o |= b << 16;
+					}
+				}
+				break;
 			case TYPE_TST:
 				a = getreg (ao->a[0]);
 				b = getreg (ao->a[1]);
@@ -1274,6 +6411,20 @@
 				}
 				ao->o |= reg << 24;
 				break;
+			case TYPE_REV:
+				reg = getreg (ao->a[0]);
+				if (reg == -1 || reg > 14) {
+					return 0;
+				}
+				ao->o |= reg << 20;
+
+				reg = getreg (ao->a[1]);
+				if (reg == -1 || reg > 14) {
+					return 0;
+				}
+				ao->o |= reg << 24;
+
+				break;
 			case TYPE_ENDIAN:
 				if (!strcmp (ao->a[0], "le")) {
 					ao->o |= 0;
@@ -1334,6 +6485,22 @@
 				}
 
 				break;
+			case TYPE_CLZ:
+				ao->o |= 1 << 28;
+
+				reg = getreg (ao->a[0]);
+				if (reg == -1 || reg > 14) {
+					return 0;
+				}
+				ao->o |= reg << 20;
+
+				reg = getreg (ao->a[1]);
+				if (reg == -1 || reg > 14) {
+					return 0;
+				}
+				ao->o |= reg << 24;
+
+				break;
 			}
 			return 1;
 		}
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arm/gnu/arm-dis.c radare2-2.8.0+dfsg/libr/asm/arch/arm/gnu/arm-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/arm/gnu/arm-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arm/gnu/arm-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,7 +22,7 @@
 
 #include "sysdep.h"
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "opcode-arm.h"
 // #include "opcode/arm.h"
 #include "opintl.h"
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/arm/winedbg/be_arm.h radare2-2.8.0+dfsg/libr/asm/arch/arm/winedbg/be_arm.h
--- radare2-2.3.0+dfsg/libr/asm/arch/arm/winedbg/be_arm.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/arm/winedbg/be_arm.h	2018-08-07 14:12:36.000000000 +0000
@@ -10,13 +10,13 @@
 	ut64 jmp, fail;
 };
 
-R_API int arm_disasm_one_insn(struct winedbg_arm_insn *arminsn);
-R_API void arm_set_pc(struct winedbg_arm_insn *arminsn, ut64 pc);
-R_API void arm_set_input_buffer(struct winedbg_arm_insn *arminsn, const ut8 *buf);
-R_API void arm_set_thumb(struct winedbg_arm_insn *arminsn, int thumb);
-R_API char* winedbg_arm_insn_asm(struct winedbg_arm_insn *arminsn);
-R_API char* winedbg_arm_insn_hex(struct winedbg_arm_insn *arminsn);
-R_API void* arm_free(struct winedbg_arm_insn *arminsn);
-R_API struct winedbg_arm_insn* arm_new(void);
+int arm_disasm_one_insn(struct winedbg_arm_insn *arminsn);
+void arm_set_pc(struct winedbg_arm_insn *arminsn, ut64 pc);
+void arm_set_input_buffer(struct winedbg_arm_insn *arminsn, const ut8 *buf);
+void arm_set_thumb(struct winedbg_arm_insn *arminsn, int thumb);
+char* winedbg_arm_insn_asm(struct winedbg_arm_insn *arminsn);
+char* winedbg_arm_insn_hex(struct winedbg_arm_insn *arminsn);
+void* arm_free(struct winedbg_arm_insn *arminsn);
+struct winedbg_arm_insn* arm_new(void);
 
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/avr/format.c radare2-2.8.0+dfsg/libr/asm/arch/avr/format.c
--- radare2-2.3.0+dfsg/libr/asm/arch/avr/format.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/avr/format.c	2018-08-07 14:12:36.000000000 +0000
@@ -27,9 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "format.h"
-#ifdef _MSC_VER
-#define strcasecmp stricmp
-#endif
+
 /* Formats a disassembled operand with its prefix (such as 'R' to indicate a register) into the
  * pointer to a C-string strOperand, which must be free'd after it has been used.
  * I decided to format the disassembled operands individually into strings for maximum flexibility,
@@ -38,7 +36,6 @@
  * it will print the relative branch/jump/call with this prefix and the destination address as the label. */
 static int formatDisassembledOperand(char *strOperand, int operandNum, const disassembledInstruction dInstruction, formattingOptions fOptions);
 
-
 /* Prints a disassembled instruction, formatted with options set in the formattingOptions structure. */
 static int printDisassembledInstruction(char *out, const disassembledInstruction dInstruction, formattingOptions fOptions) {
 	//char fmt[64];
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/cr16/cr16_disas.h radare2-2.8.0+dfsg/libr/asm/arch/cr16/cr16_disas.h
--- radare2-2.3.0+dfsg/libr/asm/arch/cr16/cr16_disas.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/cr16/cr16_disas.h	2018-08-07 14:12:36.000000000 +0000
@@ -46,7 +46,7 @@
 	char	operands[CR16_INSTR_MAXLEN];
 };
 
-R_API int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd);
+int cr16_decode_command(const ut8 *instr, struct cr16_cmd *cmd);
 
 enum cr16_opcodes {
 	CR16_ADD	= 0x0,
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/cris/gnu/cris-dis.c radare2-2.8.0+dfsg/libr/asm/arch/cris/gnu/cris-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/cris/gnu/cris-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/cris/gnu/cris-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "sysdep.h"
 #include "opcode/cris.h"
 #include "libiberty.h"
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/ebc/ebc_disas.h radare2-2.8.0+dfsg/libr/asm/arch/ebc/ebc_disas.h
--- radare2-2.3.0+dfsg/libr/asm/arch/ebc/ebc_disas.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/ebc/ebc_disas.h	2018-08-07 14:12:36.000000000 +0000
@@ -91,6 +91,6 @@
 	char operands[EBC_OPERANDS_MAXLEN];
 } ebc_command_t;
 
-R_API int ebc_decode_command(const uint8_t *instr, ebc_command_t *cmd);
+int ebc_decode_command(const uint8_t *instr, ebc_command_t *cmd);
 
 #endif /* EBC_DISAS_H */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/h8300/h8300_disas.h radare2-2.8.0+dfsg/libr/asm/arch/h8300/h8300_disas.h
--- radare2-2.3.0+dfsg/libr/asm/arch/h8300/h8300_disas.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/h8300/h8300_disas.h	2018-08-07 14:12:36.000000000 +0000
@@ -125,6 +125,6 @@
 	char	operands[H8300_INSTR_MAXLEN];
 };
 
-R_API int h8300_decode_command(const ut8 *instr, struct h8300_cmd *cmd);
+int h8300_decode_command(const ut8 *instr, struct h8300_cmd *cmd);
 
 #endif /* H8300_DISAS_H */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-dis.c radare2-2.8.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,7 +19,7 @@
 
 #include "ansidecl.h"
 #include "libiberty.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "opcode/hexagon.h"
 #include "mybfd.h"
 //#include "elf/hexagon.h"
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-opc.c radare2-2.8.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-opc.c
--- radare2-2.3.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-opc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/hexagon/gnu/hexagon-opc.c	2018-08-07 14:12:36.000000000 +0000
@@ -1831,8 +1831,8 @@
 
           len = strlen (alias [i].name);
 
-          if (!strncasecmp (regs, alias [i].name, len)
-              || !strncasecmp (name, alias [i].name, len))
+          if (!r_str_ncasecmp (regs, alias [i].name, len)
+              || !r_str_ncasecmp (name, alias [i].name, len))
             {
               regn = alias [i].reg_num;
 
@@ -3167,7 +3167,7 @@
   for(i=0;i<hexagon_control_regs_count;i++){
     const char *name = hexagon_control_regs[i].name;
     size_t len = strlen(name);
-    if(!strncasecmp(reg_name,name,len)){
+    if(!r_str_ncasecmp(reg_name,name,len)){
       *return_value = hexagon_control_regs[i].reg_num;
       return 1;
     }
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon.c radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon.c
--- radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,242 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <r_types.h>
+#include <r_lib.h>
+#include <r_util.h>
+#include <r_asm.h>
+#include "hexagon.h"
+
+// TODO: Handle also control reg pairs
+char* hex_get_cntl_reg(int opreg){
+	switch (opreg) {
+		case HEX_REG_SA0:
+			return "SA0";
+		case HEX_REG_LC0:
+			return "LC0";
+		case HEX_REG_SA1:
+			return "SA1";
+		case HEX_REG_LC1:
+			return "LC1";
+		case HEX_REG_P:
+			return "P";
+		case HEX_REG_M0:
+			return "M0";
+		case HEX_REG_M1:
+			return "M1";
+		case HEX_REG_USR:
+			return "USR";
+		case HEX_REG_PC:
+			return "PC";
+		case HEX_REG_UGP:
+			return "UGP";
+		case HEX_REG_GP:
+			return "GP";
+		case HEX_REG_CS0:
+			return "CS0";
+		case HEX_REG_CS1:
+			return "CS1";
+		case HEX_REG_UPCYCLELO:
+			return "UPCYCLELO";
+		case HEX_REG_UPCYCLEHI:
+			return "UPCYCLEHI";
+		case HEX_REG_FRAMELIMIT:
+			return "FRAMELIMIT";
+		case HEX_REG_FRAMEKEY:
+			return "FRAMEKEY";
+		case HEX_REG_PKTCOUNTLO:
+			return "PKTCOUNTLO";
+		case HEX_REG_PKTCOUNTHI:
+			return "PKTCOUNTHI";
+		case HEX_REG_UTIMERLO:
+			return "UTIMERLO";
+		case HEX_REG_UTIMERHI:
+			return "UTIMERHI";
+		default:
+			return "<CRerr>";
+	}
+}
+
+char* hex_get_sys_reg(int opreg)
+{
+	static char tmp[5];
+	switch (opreg) {
+		case HEX_REG_SGP0:
+			return "SGP0";
+		case HEX_REG_SGP1:
+			return "SGP1";
+		case HEX_REG_STID:
+			return "STID";
+		case HEX_REG_ELR:
+			return "ELR";
+		case HEX_REG_BADVA0:
+			return "BADVA0";
+		case HEX_REG_BADVA1:
+			return "BADVA1";
+		case HEX_REG_SSR:
+			return "SSR";
+		case HEX_REG_CCR:
+			return "CCR";
+		case HEX_REG_HTID:
+			return "HTID";
+		case HEX_REG_BADVA:
+			return "BADVA";
+		case HEX_REG_IMASK:
+			return "IMASK";
+		case HEX_REG_EVB:
+			return "EVB";
+		case HEX_REG_MODECTL:
+			return "MODECTL";
+		case HEX_REG_SYSCFG:
+			return "SYSCFG";
+		case HEX_REG_IPEND:
+			return "IPEND";
+		case HEX_REG_VID:
+			return "VID";
+		case HEX_REG_IAD:
+			return "IAD";
+		case HEX_REG_IEL:
+			return "IEL";
+		case HEX_REG_IAHL:
+			return "IAHL";
+		case HEX_REG_CFGBASE:
+			return "CFGBASE";
+		case HEX_REG_DIAG:
+			return "DIAG";
+		case HEX_REG_REV:
+			return "REV";
+		case HEX_REG_PCYCLELO:
+			return "PCYCLELO";
+		case HEX_REG_PCYCLEHI:
+			return "PCYCLEHI";
+		case HEX_REG_ISDBST:
+			return "ISDBST";
+		case HEX_REG_ISDBCFG0:
+			return "ISDBCFG0";
+		case HEX_REG_ISDBCFG1:
+			return "ISDBCFG1";
+		case HEX_REG_BRKPTPC0:
+			return "BRKPTPC0";
+		case HEX_REG_BRKPTCFG0:
+			return "BRKPTCFG0";
+		case HEX_REG_BRKPTPC1:
+			return "BRKPTPC1";
+		case HEX_REG_BRKPTCFG1:
+			return "BRKPTCFG1";
+		case HEX_REG_ISDBMBXIN:
+			return "ISDBMBXIN";
+		case HEX_REG_ISDBMBXOUT:
+			return "ISDBMBXOUT";
+		case HEX_REG_ISDBEN:
+			return "ISDBEN";
+		case HEX_REG_ISDBGPR:
+			return "ISDBGPR";
+		case HEX_REG_PMUCNT0:
+			return "PMUCNT0";
+		case HEX_REG_PMUCNT1:
+			return "PMUCNT1";
+		case HEX_REG_PMUCNT2:
+			return "PMUCNT2";
+		case HEX_REG_PMUCNT3:
+			return "PMUCNT3";
+		case HEX_REG_PMUEVTCFG:
+			return "PMUEVTCFG";
+		case HEX_REG_PMUCFG:
+			return "PMUCFG";
+		default:
+			sprintf(tmp, "S%d", opreg);
+			return tmp;
+	}
+}
+
+char* hex_get_sub_reg(int opreg)
+{
+	switch (opreg) {
+		case HEX_SUB_REG_R0:
+			return "R0";
+		case HEX_SUB_REG_R1:
+			return "R1";
+		case HEX_SUB_REG_R2:
+			return "R2";
+		case HEX_SUB_REG_R3:
+			return "R3";
+		case HEX_SUB_REG_R4:
+			return "R4";
+		case HEX_SUB_REG_R5:
+			return "R5";
+		case HEX_SUB_REG_R6:
+			return "R6";
+		case HEX_SUB_REG_R7:
+			return "R7";
+		case HEX_SUB_REG_R16:
+			return "R16";
+		case HEX_SUB_REG_R17:
+			return "R17";
+		case HEX_SUB_REG_R18:
+			return "R18";
+		case HEX_SUB_REG_R19:
+			return "R19";
+		case HEX_SUB_REG_R20:
+			return "R20";
+		case HEX_SUB_REG_R21:
+			return "R21";
+		case HEX_SUB_REG_R22:
+			return "R22";
+		case HEX_SUB_REG_R23:
+			return "R23";
+		default:
+			return "<err>";
+	}
+}
+
+char* hex_get_sub_regpair(int opreg)
+{
+	switch (opreg) {
+		case HEX_SUB_REGPAIR_R1_R0:
+			return "R1:R0";
+		case HEX_SUB_REGPAIR_R3_R2:
+			return "R3:R2";
+		case HEX_SUB_REGPAIR_R5_R4:
+			return "R5:R4";
+		case HEX_SUB_REGPAIR_R7_R6:
+			return "R7:R6";
+		case HEX_SUB_REGPAIR_R17_R16:
+			return "R17:R16";
+		case HEX_SUB_REGPAIR_R19_R18:
+			return "R19:R18";
+		case HEX_SUB_REGPAIR_R21_R20:
+			return "R21:R20";
+		case HEX_SUB_REGPAIR_R23_R22:
+			return "R23:R22";
+		default:
+			return "<err>";
+	}
+}
+
+inline bool hex_if_duplex(uint32_t insn_word)
+{
+	if ((insn_word & (3 << 14)) == 0) {
+		return true;
+	}
+	return false;
+}
+
+// Constant extender value
+ut32 constant_extender = 1;
+
+void hex_op_extend(HexOp *op)
+{
+	if ((constant_extender != 1) && (op->type == HEX_OP_TYPE_IMM)) {
+		op->op.imm = ((op->op.imm) & 0x3F) | (constant_extender);
+	}
+	constant_extender = 1;
+}
+
+void hex_op_extend_off(HexOp *op, int offset)
+{
+	if ((constant_extender != 1) && (op->type == HEX_OP_TYPE_IMM)) {
+		op->op.imm = (op->op.imm) >> offset;
+		hex_op_extend(op);
+	}
+}
+
+
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon_disas.c radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon_disas.c
--- radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon_disas.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon_disas.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,45275 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <r_types.h>
+#include <r_util.h>
+#include <r_asm.h>
+#include "hexagon.h"
+#include "hexagon_insn.h"
+
+extern ut32 constant_extender;
+
+int hexagon_disasm_instruction(ut32 hi_u32, HexInsn *hi) {
+	// DUPLEXES
+	if (((hi_u32 >> 14) & 0x3) == 0) {
+		switch ((((hi_u32 >> 29) & 0xF) << 1) | ((hi_u32 >> 13) & 1)) {
+			case 0x0: {
+				if ((hi_u32 & 0xf000f000) == 0x10001000) {
+					// Instruction: 0: 0001IIIIuuuueeee0001iiiissssdddd | Re = memub (Ru + #U4:0) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0x1000) {
+					// Instruction: 0: 0000IIIIuuuueeee0001iiiissssdddd | Re = memw (Ru + #U4:2) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0x0) {
+					// Instruction: 0: 0000IIIIuuuueeee0000iiiissssdddd | Re = memw (Ru + #U4:2) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMW__RS____U4_2_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x1: {
+				if ((hi_u32 & 0xf000ffc4) == 0x10003f40) {
+					// Instruction: 1: 0001iiiissssdddd0011111101---0-- | Rd = memub (Rs + #u4:0) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc4) == 0x10003f00) {
+					// Instruction: 1: 0001iiiissssdddd0011111100---0-- | Rd = memub (Rs + #u4:0) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____DEALLOCFRAME;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003f45) {
+					// Instruction: 1: 0001iiiissssdddd0011111101---101 | Rd = memub (Rs + #u4:0) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003fc5) {
+					// Instruction: 1: 0001iiiissssdddd0011111111---101 | Rd = memub (Rs + #u4:0) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003f47) {
+					// Instruction: 1: 0001iiiissssdddd0011111101---111 | Rd = memub (Rs + #u4:0) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003fc7) {
+					// Instruction: 1: 0001iiiissssdddd0011111111---111 | Rd = memub (Rs + #u4:0) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003f44) {
+					// Instruction: 1: 0001iiiissssdddd0011111101---100 | Rd = memub (Rs + #u4:0) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003fc4) {
+					// Instruction: 1: 0001iiiissssdddd0011111111---100 | Rd = memub (Rs + #u4:0) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003f46) {
+					// Instruction: 1: 0001iiiissssdddd0011111101---110 | Rd = memub (Rs + #u4:0) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x10003fc6) {
+					// Instruction: 1: 0001iiiissssdddd0011111111---110 | Rd = memub (Rs + #u4:0) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc4) == 0x10003fc0) {
+					// Instruction: 1: 0001iiiissssdddd0011111111---0-- | Rd = memub (Rs + #u4:0) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc4) == 0x3f40) {
+					// Instruction: 1: 0000iiiissssdddd0011111101---0-- | Rd = memw (Rs + #u4:2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc4) == 0x3f00) {
+					// Instruction: 1: 0000iiiissssdddd0011111100---0-- | Rd = memw (Rs + #u4:2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____DEALLOCFRAME;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3f45) {
+					// Instruction: 1: 0000iiiissssdddd0011111101---101 | Rd = memw (Rs + #u4:2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3fc5) {
+					// Instruction: 1: 0000iiiissssdddd0011111111---101 | Rd = memw (Rs + #u4:2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3f47) {
+					// Instruction: 1: 0000iiiissssdddd0011111101---111 | Rd = memw (Rs + #u4:2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3fc7) {
+					// Instruction: 1: 0000iiiissssdddd0011111111---111 | Rd = memw (Rs + #u4:2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3f44) {
+					// Instruction: 1: 0000iiiissssdddd0011111101---100 | Rd = memw (Rs + #u4:2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3fc4) {
+					// Instruction: 1: 0000iiiissssdddd0011111111---100 | Rd = memw (Rs + #u4:2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3f46) {
+					// Instruction: 1: 0000iiiissssdddd0011111101---110 | Rd = memw (Rs + #u4:2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc7) == 0x3fc6) {
+					// Instruction: 1: 0000iiiissssdddd0011111111---110 | Rd = memw (Rs + #u4:2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ffc4) == 0x3fc0) {
+					// Instruction: 1: 0000iiiissssdddd0011111111---0-- | Rd = memw (Rs + #u4:2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0x10003c00) {
+					// Instruction: 1: 0001IIIIsssseeee0011110iiiiidddd | Re = memub (Rs + #U4:0) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUB__RS____U4_0____RD___MEMW__SP____U5_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0x10003e00) {
+					// Instruction: 1: 0001IIIIsssseeee00111110iiiiiddd | Re = memub (Rs + #U4:0) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUB__RS____U4_0____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0x10003000) {
+					// Instruction: 1: 0001IIIIuuuueeee00110iiissssdddd | Re = memub (Ru + #U4:0) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMB__RS____U3_0_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0x10002000) {
+					// Instruction: 1: 0001IIIIuuuueeee00100iiissssdddd | Re = memub (Ru + #U4:0) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMH__RS____U3_1_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0x10002800) {
+					// Instruction: 1: 0001IIIIuuuueeee00101iiissssdddd | Re = memub (Ru + #U4:0) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0x3c00) {
+					// Instruction: 1: 0000IIIIsssseeee0011110iiiiidddd | Re = memw (Rs + #U4:2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__RS____U4_2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0x3e00) {
+					// Instruction: 1: 0000IIIIsssseeee00111110iiiiiddd | Re = memw (Rs + #U4:2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__RS____U4_2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0x3000) {
+					// Instruction: 1: 0000IIIIuuuueeee00110iiissssdddd | Re = memw (Ru + #U4:2) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMB__RS____U3_0_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0x2000) {
+					// Instruction: 1: 0000IIIIuuuueeee00100iiissssdddd | Re = memw (Ru + #U4:2) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMH__RS____U3_1_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0x2800) {
+					// Instruction: 1: 0000IIIIuuuueeee00101iiissssdddd | Re = memw (Ru + #U4:2) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x2: {
+				if ((hi_u32 & 0xf800ffc4) == 0x30001f40) {
+					// Instruction: 2: 00110iiissssdddd0001111101---0-- | Rd = memb (Rs + #u3:0) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x30001f00) {
+					// Instruction: 2: 00110iiissssdddd0001111100---0-- | Rd = memb (Rs + #u3:0) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____DEALLOCFRAME;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001f45) {
+					// Instruction: 2: 00110iiissssdddd0001111101---101 | Rd = memb (Rs + #u3:0) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001fc5) {
+					// Instruction: 2: 00110iiissssdddd0001111111---101 | Rd = memb (Rs + #u3:0) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001f47) {
+					// Instruction: 2: 00110iiissssdddd0001111101---111 | Rd = memb (Rs + #u3:0) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001fc7) {
+					// Instruction: 2: 00110iiissssdddd0001111111---111 | Rd = memb (Rs + #u3:0) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001f44) {
+					// Instruction: 2: 00110iiissssdddd0001111101---100 | Rd = memb (Rs + #u3:0) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001fc4) {
+					// Instruction: 2: 00110iiissssdddd0001111111---100 | Rd = memb (Rs + #u3:0) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001f46) {
+					// Instruction: 2: 00110iiissssdddd0001111101---110 | Rd = memb (Rs + #u3:0) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x30001fc6) {
+					// Instruction: 2: 00110iiissssdddd0001111111---110 | Rd = memb (Rs + #u3:0) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x30001fc0) {
+					// Instruction: 2: 00110iiissssdddd0001111111---0-- | Rd = memb (Rs + #u3:0) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x20001f40) {
+					// Instruction: 2: 00100iiissssdddd0001111101---0-- | Rd = memh (Rs + #u3:1) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x20001f00) {
+					// Instruction: 2: 00100iiissssdddd0001111100---0-- | Rd = memh (Rs + #u3:1) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____DEALLOCFRAME;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001f45) {
+					// Instruction: 2: 00100iiissssdddd0001111101---101 | Rd = memh (Rs + #u3:1) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001fc5) {
+					// Instruction: 2: 00100iiissssdddd0001111111---101 | Rd = memh (Rs + #u3:1) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001f47) {
+					// Instruction: 2: 00100iiissssdddd0001111101---111 | Rd = memh (Rs + #u3:1) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001fc7) {
+					// Instruction: 2: 00100iiissssdddd0001111111---111 | Rd = memh (Rs + #u3:1) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001f44) {
+					// Instruction: 2: 00100iiissssdddd0001111101---100 | Rd = memh (Rs + #u3:1) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001fc4) {
+					// Instruction: 2: 00100iiissssdddd0001111111---100 | Rd = memh (Rs + #u3:1) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001f46) {
+					// Instruction: 2: 00100iiissssdddd0001111101---110 | Rd = memh (Rs + #u3:1) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x20001fc6) {
+					// Instruction: 2: 00100iiissssdddd0001111111---110 | Rd = memh (Rs + #u3:1) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x20001fc0) {
+					// Instruction: 2: 00100iiissssdddd0001111111---0-- | Rd = memh (Rs + #u3:1) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x28001f40) {
+					// Instruction: 2: 00101iiissssdddd0001111101---0-- | Rd = memuh (Rs + #u3:1) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x28001f00) {
+					// Instruction: 2: 00101iiissssdddd0001111100---0-- | Rd = memuh (Rs + #u3:1) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____DEALLOCFRAME;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001f45) {
+					// Instruction: 2: 00101iiissssdddd0001111101---101 | Rd = memuh (Rs + #u3:1) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001fc5) {
+					// Instruction: 2: 00101iiissssdddd0001111111---101 | Rd = memuh (Rs + #u3:1) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001f47) {
+					// Instruction: 2: 00101iiissssdddd0001111101---111 | Rd = memuh (Rs + #u3:1) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001fc7) {
+					// Instruction: 2: 00101iiissssdddd0001111111---111 | Rd = memuh (Rs + #u3:1) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001f44) {
+					// Instruction: 2: 00101iiissssdddd0001111101---100 | Rd = memuh (Rs + #u3:1) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001fc4) {
+					// Instruction: 2: 00101iiissssdddd0001111111---100 | Rd = memuh (Rs + #u3:1) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0__JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001f46) {
+					// Instruction: 2: 00101iiissssdddd0001111101---110 | Rd = memuh (Rs + #u3:1) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x28001fc6) {
+					// Instruction: 2: 00101iiissssdddd0001111111---110 | Rd = memuh (Rs + #u3:1) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x28001fc0) {
+					// Instruction: 2: 00101iiissssdddd0001111111---0-- | Rd = memuh (Rs + #u3:1) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____JUMPR_LR;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc4) == 0x3c001f40) {
+					// Instruction: 2: 0011110iiiiidddd0001111101---0-- | Rd = memw (Sp + #u5:2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc4) == 0x3c001f00) {
+					// Instruction: 2: 0011110iiiiidddd0001111100---0-- | Rd = memw (Sp + #u5:2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001f45) {
+					// Instruction: 2: 0011110iiiiidddd0001111101---101 | Rd = memw (Sp + #u5:2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001fc5) {
+					// Instruction: 2: 0011110iiiiidddd0001111111---101 | Rd = memw (Sp + #u5:2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001f47) {
+					// Instruction: 2: 0011110iiiiidddd0001111101---111 | Rd = memw (Sp + #u5:2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001fc7) {
+					// Instruction: 2: 0011110iiiiidddd0001111111---111 | Rd = memw (Sp + #u5:2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001f44) {
+					// Instruction: 2: 0011110iiiiidddd0001111101---100 | Rd = memw (Sp + #u5:2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001fc4) {
+					// Instruction: 2: 0011110iiiiidddd0001111111---100 | Rd = memw (Sp + #u5:2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001f46) {
+					// Instruction: 2: 0011110iiiiidddd0001111101---110 | Rd = memw (Sp + #u5:2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc7) == 0x3c001fc6) {
+					// Instruction: 2: 0011110iiiiidddd0001111111---110 | Rd = memw (Sp + #u5:2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ffc4) == 0x3c001fc0) {
+					// Instruction: 2: 0011110iiiiidddd0001111111---0-- | Rd = memw (Sp + #u5:2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x3e001f40) {
+					// Instruction: 2: 00111110iiiiiddd0001111101---0-- | Rdd = memd (Sp + #u5:3) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x3e001f00) {
+					// Instruction: 2: 00111110iiiiiddd0001111100---0-- | Rdd = memd (Sp + #u5:3) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; deallocframe", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001f45) {
+					// Instruction: 2: 00111110iiiiiddd0001111101---101 | Rdd = memd (Sp + #u5:3) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (! p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001fc5) {
+					// Instruction: 2: 00111110iiiiiddd0001111111---101 | Rdd = memd (Sp + #u5:3) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001f47) {
+					// Instruction: 2: 00111110iiiiiddd0001111101---111 | Rdd = memd (Sp + #u5:3) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001fc7) {
+					// Instruction: 2: 00111110iiiiiddd0001111111---111 | Rdd = memd (Sp + #u5:3) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001f44) {
+					// Instruction: 2: 00111110iiiiiddd0001111101---100 | Rdd = memd (Sp + #u5:3) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001fc4) {
+					// Instruction: 2: 00111110iiiiiddd0001111111---100 | Rdd = memd (Sp + #u5:3) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001f46) {
+					// Instruction: 2: 00111110iiiiiddd0001111101---110 | Rdd = memd (Sp + #u5:3) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x3e001fc6) {
+					// Instruction: 2: 00111110iiiiiddd0001111111---110 | Rdd = memd (Sp + #u5:3) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x3e001fc0) {
+					// Instruction: 2: 00111110iiiiiddd0001111111---0-- | Rdd = memd (Sp + #u5:3) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0x30001c00) {
+					// Instruction: 2: 00110IIIsssseeee0001110iiiiidddd | Re = memb (Rs + #U3:0) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMB__RS____U3_0____RD___MEMW__SP____U5_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x30001e00) {
+					// Instruction: 2: 00110IIIsssseeee00011110iiiiiddd | Re = memb (Rs + #U3:0) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMB__RS____U3_0____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x30001000) {
+					// Instruction: 2: 00110IIIuuuueeee00010iiissssdddd | Re = memb (Ru + #U3:0) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMB__RU____U3_0____RD___MEMB__RS____U3_0_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0x20001c00) {
+					// Instruction: 2: 00100IIIsssseeee0001110iiiiidddd | Re = memh (Rs + #U3:1) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMH__RS____U3_1____RD___MEMW__SP____U5_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20001e00) {
+					// Instruction: 2: 00100IIIsssseeee00011110iiiiiddd | Re = memh (Rs + #U3:1) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMH__RS____U3_1____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x20001000) {
+					// Instruction: 2: 00100IIIuuuueeee00010iiissssdddd | Re = memh (Ru + #U3:1) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMH__RU____U3_1____RD___MEMB__RS____U3_0_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x20000000) {
+					// Instruction: 2: 00100IIIuuuueeee00000iiissssdddd | Re = memh (Ru + #U3:1) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMH__RU____U3_1____RD___MEMH__RS____U3_1_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x20000800) {
+					// Instruction: 2: 00100IIIuuuueeee00001iiissssdddd | Re = memh (Ru + #U3:1) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMH__RU____U3_1____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0x28001c00) {
+					// Instruction: 2: 00101IIIsssseeee0001110iiiiidddd | Re = memuh (Rs + #U3:1) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUH__RS____U3_1____RD___MEMW__SP____U5_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x28001e00) {
+					// Instruction: 2: 00101IIIsssseeee00011110iiiiiddd | Re = memuh (Rs + #U3:1) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUH__RS____U3_1____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x28001000) {
+					// Instruction: 2: 00101IIIuuuueeee00010iiissssdddd | Re = memuh (Ru + #U3:1) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUH__RU____U3_1____RD___MEMB__RS____U3_0_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x28000800) {
+					// Instruction: 2: 00101IIIuuuueeee00001iiissssdddd | Re = memuh (Ru + #U3:1) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMUH__RU____U3_1____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[5].type = HEX_OP_TYPE_IMM;
+					hi->ops[5].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hex_get_sub_reg(hi->ops[4].op.reg), hi->ops[5].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0x3c001c00) {
+					// Instruction: 2: 0011110IIIIIeeee0001110iiiiidddd | Re = memw (Sp + #U5:2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__SP____U5_2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0x3c001e00) {
+					// Instruction: 2: 0011110IIIIIeeee00011110iiiiiddd | Re = memw (Sp + #U5:2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___MEMW__SP____U5_2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x3e001e00) {
+					// Instruction: 2: 00111110IIIIIeee00011110iiiiiddd | Ree = memd (Sp + #U5:3) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_REE___MEMD__SP____U5_3____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xffc4ffc7) == 0x3f001fc5) {
+					// Instruction: 2: 0011111100---0--0001111111---101 | deallocframe ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 0;
+					hi->duplex = true;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; if (! p0) jumpr Lr");
+					break;
+				}
+				if ((hi_u32 & 0xffc4ffc7) == 0x3f001fc7) {
+					// Instruction: 2: 0011111100---0--0001111111---111 | deallocframe ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 0;
+					hi->duplex = true;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; if (! p0.new) jumpr:nt Lr");
+					break;
+				}
+				if ((hi_u32 & 0xffc4ffc7) == 0x3f001fc4) {
+					// Instruction: 2: 0011111100---0--0001111111---100 | deallocframe ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___IF__P0__JUMPR_LR;
+					hi->op_count = 0;
+					hi->duplex = true;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; if (p0) jumpr Lr");
+					break;
+				}
+				if ((hi_u32 & 0xffc4ffc7) == 0x3f001fc6) {
+					// Instruction: 2: 0011111100---0--0001111111---110 | deallocframe ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 0;
+					hi->duplex = true;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; if (p0.new) jumpr:nt Lr");
+					break;
+				}
+				if ((hi_u32 & 0xffc4ffc4) == 0x3f001fc0) {
+					// Instruction: 2: 0011111100---0--0001111111---0-- | deallocframe ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___JUMPR_LR;
+					hi->op_count = 0;
+					hi->duplex = true;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; jumpr Lr");
+					break;
+				}
+				break;
+			}
+			case 0x3: {
+				if ((hi_u32 & 0xfc00ff00) == 0x28003900) {
+					// Instruction: 3: 001010IIIIIIdddd00111001ssss--ii | Rd = #U6 ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003800) {
+					// Instruction: 3: 001010iiiiiidddd00111000ssssxxxx | Rd = #u6 ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003800) {
+					// Instruction: 3: 001010iiiiiidddd00111000ssssxxxx | Rd = #u6 ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003800) {
+					// Instruction: 3: 00110000uuuudddd00111000ssssxxxx | Rd = Ru ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003800) {
+					// Instruction: 3: 00110000uuuudddd00111000ssssxxxx | Rd = Ru ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003900) {
+					// Instruction: 3: 00110000uuuudddd00111001ssss--ii | Rd = Ru ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003800) {
+					// Instruction: 3: 00110011uuuudddd00111000ssssxxxx | Rd = add (Ru, #-1) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003800) {
+					// Instruction: 3: 00110011uuuudddd00111000ssssxxxx | Rd = add (Ru, #-1) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003900) {
+					// Instruction: 3: 00110011uuuudddd00111001ssss--ii | Rd = add (Ru, #-1) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003800) {
+					// Instruction: 3: 00110001uuuudddd00111000ssssxxxx | Rd = add (Ru, #1) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003800) {
+					// Instruction: 3: 00110001uuuudddd00111000ssssxxxx | Rd = add (Ru, #1) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003900) {
+					// Instruction: 3: 00110001uuuudddd00111001ssss--ii | Rd = add (Ru, #1) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003900) {
+					// Instruction: 3: 001011IIIIIIdddd00111001ssss--ii | Rd = add (Sp, #U6:2) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003800) {
+					// Instruction: 3: 001011iiiiiidddd00111000ssssxxxx | Rd = add (Sp, #u6:2) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003800) {
+					// Instruction: 3: 001011iiiiiidddd00111000ssssxxxx | Rd = add (Sp, #u6:2) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003800) {
+					// Instruction: 3: 00110010uuuudddd00111000ssssxxxx | Rd = and (Ru, #1) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003800) {
+					// Instruction: 3: 00110010uuuudddd00111000ssssxxxx | Rd = and (Ru, #1) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003900) {
+					// Instruction: 3: 00110010uuuudddd00111001ssss--ii | Rd = and (Ru, #1) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x37003800) {
+					// Instruction: 3: 00110111uuuudddd00111000ssssxxxx | Rd = and (Ru, #255) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x37003800) {
+					// Instruction: 3: 00110111uuuudddd00111000ssssxxxx | Rd = and (Ru, #255) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x37003900) {
+					// Instruction: 3: 00110111uuuudddd00111001ssss--ii | Rd = and (Ru, #255) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x35003800) {
+					// Instruction: 3: 00110101uuuudddd00111000ssssxxxx | Rd = sxtb (Ru) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x35003800) {
+					// Instruction: 3: 00110101uuuudddd00111000ssssxxxx | Rd = sxtb (Ru) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x35003900) {
+					// Instruction: 3: 00110101uuuudddd00111001ssss--ii | Rd = sxtb (Ru) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x34003800) {
+					// Instruction: 3: 00110100uuuudddd00111000ssssxxxx | Rd = sxth (Ru) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x34003800) {
+					// Instruction: 3: 00110100uuuudddd00111000ssssxxxx | Rd = sxth (Ru) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x34003900) {
+					// Instruction: 3: 00110100uuuudddd00111001ssss--ii | Rd = sxth (Ru) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x36003800) {
+					// Instruction: 3: 00110110uuuudddd00111000ssssxxxx | Rd = zxth (Ru) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x36003800) {
+					// Instruction: 3: 00110110uuuudddd00111000ssssxxxx | Rd = zxth (Ru) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x36003900) {
+					// Instruction: 3: 00110110uuuudddd00111001ssss--ii | Rd = zxth (Ru) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe40) == 0x3a003a00) {
+					// Instruction: 3: 0011101--0--eeee0011101--0--dddd | Re = #-1 ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RD_____1;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40fd18) == 0x3a003c00) {
+					// Instruction: 3: 0011101--0--eeee001111-0-ii00ddd | Re = #-1 ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___0___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fd08) == 0x3a003d00) {
+					// Instruction: 3: 0011101--0--eeee001111-1ssss0ddd | Re = #-1 ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___0__RS_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40fd18) == 0x3a003c08) {
+					// Instruction: 3: 0011101--0--eeee001111-0-ii01ddd | Re = #-1 ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___1___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fd18) == 0x3a003c10) {
+					// Instruction: 3: 0011101--0--eeee001111-0-ii10ddd | Re = #-1 ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___2___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fd18) == 0x3a003c18) {
+					// Instruction: 3: 0011101--0--eeee001111-0-ii11ddd | Re = #-1 ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___3___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fd08) == 0x3a003d08) {
+					// Instruction: 3: 0011101--0--eeee001111-1ssss1ddd | Re = #-1 ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RDD___COMBINE__RS___0_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe70) == 0x3a003a70) {
+					// Instruction: 3: 0011101--0--eeee0011101--111dddd | Re = #-1 ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___IF___NOT__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe70) == 0x3a003a50) {
+					// Instruction: 3: 0011101--0--eeee0011101--101dddd | Re = #-1 ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe70) == 0x3a003a60) {
+					// Instruction: 3: 0011101--0--eeee0011101--110dddd | Re = #-1 ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___IF__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe70) == 0x3a003a40) {
+					// Instruction: 3: 0011101--0--eeee0011101--100dddd | Re = #-1 ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___IF__P0_NEW__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe40) == 0x28003a00) {
+					// Instruction: 3: 001010IIIIIIeeee0011101--0--dddd | Re = #U6 ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fc00) == 0x28002800) {
+					// Instruction: 3: 001010IIIIIIeeee001010iiiiiidddd | Re = #U6 ; Rd = #u6
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD____U6;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f0) >> 4);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = 0x%x", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003300) {
+					// Instruction: 3: 001010IIIIIIeeee00110011ssssdddd | Re = #U6 ; Rd = add (Rs, #-1)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___ADD__RS____1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = add (%s, #-1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003100) {
+					// Instruction: 3: 001010IIIIIIeeee00110001ssssdddd | Re = #U6 ; Rd = add (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___ADD__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = add (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fc00) == 0x28002c00) {
+					// Instruction: 3: 001010IIIIIIeeee001011iiiiiidddd | Re = #U6 ; Rd = add (Sp, #u6:2)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___ADD__SP___U6_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = add (Sp, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003200) {
+					// Instruction: 3: 001010IIIIIIeeee00110010ssssdddd | Re = #U6 ; Rd = and (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___AND__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = and (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003700) {
+					// Instruction: 3: 001010IIIIIIeeee00110111ssssdddd | Re = #U6 ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x28003c00) {
+					// Instruction: 3: 001010IIIIIIeeee001111-0-ii00ddd | Re = #U6 ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd08) == 0x28003d00) {
+					// Instruction: 3: 001010IIIIIIeeee001111-1ssss0ddd | Re = #U6 ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x28003c08) {
+					// Instruction: 3: 001010IIIIIIeeee001111-0-ii01ddd | Re = #U6 ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x28003c10) {
+					// Instruction: 3: 001010IIIIIIeeee001111-0-ii10ddd | Re = #U6 ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x28003c18) {
+					// Instruction: 3: 001010IIIIIIeeee001111-0-ii11ddd | Re = #U6 ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd08) == 0x28003d08) {
+					// Instruction: 3: 001010IIIIIIeeee001111-1ssss1ddd | Re = #U6 ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x28003a70) {
+					// Instruction: 3: 001010IIIIIIeeee0011101--111dddd | Re = #U6 ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x28003a50) {
+					// Instruction: 3: 001010IIIIIIeeee0011101--101dddd | Re = #U6 ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x28003a60) {
+					// Instruction: 3: 001010IIIIIIeeee0011101--110dddd | Re = #U6 ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x28003a40) {
+					// Instruction: 3: 001010IIIIIIeeee0011101--100dddd | Re = #U6 ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003000) {
+					// Instruction: 3: 001010iiiiiieeee00110000ssssdddd | Re = #u6 ; Rd = Rs
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___RS;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003500) {
+					// Instruction: 3: 001010iiiiiieeee00110101ssssdddd | Re = #u6 ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003400) {
+					// Instruction: 3: 001010iiiiiieeee00110100ssssdddd | Re = #u6 ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x28003600) {
+					// Instruction: 3: 001010iiiiiieeee00110110ssssdddd | Re = #u6 ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x30003a00) {
+					// Instruction: 3: 00110000sssseeee0011101--0--dddd | Re = Rs ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x30003c00) {
+					// Instruction: 3: 00110000sssseeee001111-0-ii00ddd | Re = Rs ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x30003c08) {
+					// Instruction: 3: 00110000sssseeee001111-0-ii01ddd | Re = Rs ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x30003c10) {
+					// Instruction: 3: 00110000sssseeee001111-0-ii10ddd | Re = Rs ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x30003c18) {
+					// Instruction: 3: 00110000sssseeee001111-0-ii11ddd | Re = Rs ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x30003a70) {
+					// Instruction: 3: 00110000sssseeee0011101--111dddd | Re = Rs ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x30003a50) {
+					// Instruction: 3: 00110000sssseeee0011101--101dddd | Re = Rs ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x30003a60) {
+					// Instruction: 3: 00110000sssseeee0011101--110dddd | Re = Rs ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x30003a40) {
+					// Instruction: 3: 00110000sssseeee0011101--100dddd | Re = Rs ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003000) {
+					// Instruction: 3: 00110000uuuueeee00110000ssssdddd | Re = Ru ; Rd = Rs
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___RS;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003300) {
+					// Instruction: 3: 00110000uuuueeee00110011ssssdddd | Re = Ru ; Rd = add (Rs, #-1)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___ADD__RS____1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = add (%s, #-1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003100) {
+					// Instruction: 3: 00110000uuuueeee00110001ssssdddd | Re = Ru ; Rd = add (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___ADD__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = add (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003200) {
+					// Instruction: 3: 00110000uuuueeee00110010ssssdddd | Re = Ru ; Rd = and (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___AND__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = and (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003700) {
+					// Instruction: 3: 00110000uuuueeee00110111ssssdddd | Re = Ru ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003500) {
+					// Instruction: 3: 00110000uuuueeee00110101ssssdddd | Re = Ru ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003400) {
+					// Instruction: 3: 00110000uuuueeee00110100ssssdddd | Re = Ru ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x30003600) {
+					// Instruction: 3: 00110000uuuueeee00110110ssssdddd | Re = Ru ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x30003d00) {
+					// Instruction: 3: 00110000uuuueeee001111-1ssss0ddd | Re = Ru ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x30003d08) {
+					// Instruction: 3: 00110000uuuueeee001111-1ssss1ddd | Re = Ru ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x33003a00) {
+					// Instruction: 3: 00110011sssseeee0011101--0--dddd | Re = add (Rs, #-1) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x33003c00) {
+					// Instruction: 3: 00110011sssseeee001111-0-ii00ddd | Re = add (Rs, #-1) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x33003c08) {
+					// Instruction: 3: 00110011sssseeee001111-0-ii01ddd | Re = add (Rs, #-1) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x33003c10) {
+					// Instruction: 3: 00110011sssseeee001111-0-ii10ddd | Re = add (Rs, #-1) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x33003c18) {
+					// Instruction: 3: 00110011sssseeee001111-0-ii11ddd | Re = add (Rs, #-1) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x33003a70) {
+					// Instruction: 3: 00110011sssseeee0011101--111dddd | Re = add (Rs, #-1) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x33003a50) {
+					// Instruction: 3: 00110011sssseeee0011101--101dddd | Re = add (Rs, #-1) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x33003a60) {
+					// Instruction: 3: 00110011sssseeee0011101--110dddd | Re = add (Rs, #-1) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x33003a40) {
+					// Instruction: 3: 00110011sssseeee0011101--100dddd | Re = add (Rs, #-1) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x31003a00) {
+					// Instruction: 3: 00110001sssseeee0011101--0--dddd | Re = add (Rs, #1) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x31003c00) {
+					// Instruction: 3: 00110001sssseeee001111-0-ii00ddd | Re = add (Rs, #1) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x31003c08) {
+					// Instruction: 3: 00110001sssseeee001111-0-ii01ddd | Re = add (Rs, #1) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x31003c10) {
+					// Instruction: 3: 00110001sssseeee001111-0-ii10ddd | Re = add (Rs, #1) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x31003c18) {
+					// Instruction: 3: 00110001sssseeee001111-0-ii11ddd | Re = add (Rs, #1) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x31003a70) {
+					// Instruction: 3: 00110001sssseeee0011101--111dddd | Re = add (Rs, #1) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x31003a50) {
+					// Instruction: 3: 00110001sssseeee0011101--101dddd | Re = add (Rs, #1) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x31003a60) {
+					// Instruction: 3: 00110001sssseeee0011101--110dddd | Re = add (Rs, #1) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x31003a40) {
+					// Instruction: 3: 00110001sssseeee0011101--100dddd | Re = add (Rs, #1) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003300) {
+					// Instruction: 3: 00110011uuuueeee00110011ssssdddd | Re = add (Ru, #-1) ; Rd = add (Rs, #-1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___ADD__RS____1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = add (%s, #-1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003700) {
+					// Instruction: 3: 00110011uuuueeee00110111ssssdddd | Re = add (Ru, #-1) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003500) {
+					// Instruction: 3: 00110011uuuueeee00110101ssssdddd | Re = add (Ru, #-1) ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003400) {
+					// Instruction: 3: 00110011uuuueeee00110100ssssdddd | Re = add (Ru, #-1) ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x33003600) {
+					// Instruction: 3: 00110011uuuueeee00110110ssssdddd | Re = add (Ru, #-1) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x33003d00) {
+					// Instruction: 3: 00110011uuuueeee001111-1ssss0ddd | Re = add (Ru, #-1) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x33003d08) {
+					// Instruction: 3: 00110011uuuueeee001111-1ssss1ddd | Re = add (Ru, #-1) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003300) {
+					// Instruction: 3: 00110001uuuueeee00110011ssssdddd | Re = add (Ru, #1) ; Rd = add (Rs, #-1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___ADD__RS____1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = add (%s, #-1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003100) {
+					// Instruction: 3: 00110001uuuueeee00110001ssssdddd | Re = add (Ru, #1) ; Rd = add (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___ADD__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = add (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003200) {
+					// Instruction: 3: 00110001uuuueeee00110010ssssdddd | Re = add (Ru, #1) ; Rd = and (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___AND__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = and (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003700) {
+					// Instruction: 3: 00110001uuuueeee00110111ssssdddd | Re = add (Ru, #1) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003500) {
+					// Instruction: 3: 00110001uuuueeee00110101ssssdddd | Re = add (Ru, #1) ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003400) {
+					// Instruction: 3: 00110001uuuueeee00110100ssssdddd | Re = add (Ru, #1) ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x31003600) {
+					// Instruction: 3: 00110001uuuueeee00110110ssssdddd | Re = add (Ru, #1) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x31003d00) {
+					// Instruction: 3: 00110001uuuueeee001111-1ssss0ddd | Re = add (Ru, #1) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x31003d08) {
+					// Instruction: 3: 00110001uuuueeee001111-1ssss1ddd | Re = add (Ru, #1) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe40) == 0x2c003a00) {
+					// Instruction: 3: 001011IIIIIIeeee0011101--0--dddd | Re = add (Sp, #U6:2) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003300) {
+					// Instruction: 3: 001011IIIIIIeeee00110011ssssdddd | Re = add (Sp, #U6:2) ; Rd = add (Rs, #-1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ADD__RS____1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = add (%s, #-1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003100) {
+					// Instruction: 3: 001011IIIIIIeeee00110001ssssdddd | Re = add (Sp, #U6:2) ; Rd = add (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ADD__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = add (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fc00) == 0x2c002c00) {
+					// Instruction: 3: 001011IIIIIIeeee001011iiiiiidddd | Re = add (Sp, #U6:2) ; Rd = add (Sp, #u6:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ADD__SP___U6_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = add (Sp, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003200) {
+					// Instruction: 3: 001011IIIIIIeeee00110010ssssdddd | Re = add (Sp, #U6:2) ; Rd = and (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___AND__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = and (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003700) {
+					// Instruction: 3: 001011IIIIIIeeee00110111ssssdddd | Re = add (Sp, #U6:2) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x2c003c00) {
+					// Instruction: 3: 001011IIIIIIeeee001111-0-ii00ddd | Re = add (Sp, #U6:2) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd08) == 0x2c003d00) {
+					// Instruction: 3: 001011IIIIIIeeee001111-1ssss0ddd | Re = add (Sp, #U6:2) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x2c003c08) {
+					// Instruction: 3: 001011IIIIIIeeee001111-0-ii01ddd | Re = add (Sp, #U6:2) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x2c003c10) {
+					// Instruction: 3: 001011IIIIIIeeee001111-0-ii10ddd | Re = add (Sp, #U6:2) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd18) == 0x2c003c18) {
+					// Instruction: 3: 001011IIIIIIeeee001111-0-ii11ddd | Re = add (Sp, #U6:2) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fd08) == 0x2c003d08) {
+					// Instruction: 3: 001011IIIIIIeeee001111-1ssss1ddd | Re = add (Sp, #U6:2) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x2c003a70) {
+					// Instruction: 3: 001011IIIIIIeeee0011101--111dddd | Re = add (Sp, #U6:2) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x2c003a50) {
+					// Instruction: 3: 001011IIIIIIeeee0011101--101dddd | Re = add (Sp, #U6:2) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x2c003a60) {
+					// Instruction: 3: 001011IIIIIIeeee0011101--110dddd | Re = add (Sp, #U6:2) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe70) == 0x2c003a40) {
+					// Instruction: 3: 001011IIIIIIeeee0011101--100dddd | Re = add (Sp, #U6:2) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003000) {
+					// Instruction: 3: 001011iiiiiieeee00110000ssssdddd | Re = add (Sp, #u6:2) ; Rd = Rs
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___RS;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003500) {
+					// Instruction: 3: 001011iiiiiieeee00110101ssssdddd | Re = add (Sp, #u6:2) ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003400) {
+					// Instruction: 3: 001011iiiiiieeee00110100ssssdddd | Re = add (Sp, #u6:2) ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x2c003600) {
+					// Instruction: 3: 001011iiiiiieeee00110110ssssdddd | Re = add (Sp, #u6:2) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x32003a00) {
+					// Instruction: 3: 00110010sssseeee0011101--0--dddd | Re = and (Rs, #1) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x32003c00) {
+					// Instruction: 3: 00110010sssseeee001111-0-ii00ddd | Re = and (Rs, #1) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x32003c08) {
+					// Instruction: 3: 00110010sssseeee001111-0-ii01ddd | Re = and (Rs, #1) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x32003c10) {
+					// Instruction: 3: 00110010sssseeee001111-0-ii10ddd | Re = and (Rs, #1) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x32003c18) {
+					// Instruction: 3: 00110010sssseeee001111-0-ii11ddd | Re = and (Rs, #1) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x32003a70) {
+					// Instruction: 3: 00110010sssseeee0011101--111dddd | Re = and (Rs, #1) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x32003a50) {
+					// Instruction: 3: 00110010sssseeee0011101--101dddd | Re = and (Rs, #1) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x32003a60) {
+					// Instruction: 3: 00110010sssseeee0011101--110dddd | Re = and (Rs, #1) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x32003a40) {
+					// Instruction: 3: 00110010sssseeee0011101--100dddd | Re = and (Rs, #1) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x37003a00) {
+					// Instruction: 3: 00110111sssseeee0011101--0--dddd | Re = and (Rs, #255) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x37003c00) {
+					// Instruction: 3: 00110111sssseeee001111-0-ii00ddd | Re = and (Rs, #255) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x37003c08) {
+					// Instruction: 3: 00110111sssseeee001111-0-ii01ddd | Re = and (Rs, #255) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x37003c10) {
+					// Instruction: 3: 00110111sssseeee001111-0-ii10ddd | Re = and (Rs, #255) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x37003c18) {
+					// Instruction: 3: 00110111sssseeee001111-0-ii11ddd | Re = and (Rs, #255) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x37003a70) {
+					// Instruction: 3: 00110111sssseeee0011101--111dddd | Re = and (Rs, #255) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x37003a50) {
+					// Instruction: 3: 00110111sssseeee0011101--101dddd | Re = and (Rs, #255) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x37003a60) {
+					// Instruction: 3: 00110111sssseeee0011101--110dddd | Re = and (Rs, #255) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x37003a40) {
+					// Instruction: 3: 00110111sssseeee0011101--100dddd | Re = and (Rs, #255) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003300) {
+					// Instruction: 3: 00110010uuuueeee00110011ssssdddd | Re = and (Ru, #1) ; Rd = add (Rs, #-1)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___ADD__RS____1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = add (%s, #-1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003200) {
+					// Instruction: 3: 00110010uuuueeee00110010ssssdddd | Re = and (Ru, #1) ; Rd = and (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___AND__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = and (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003700) {
+					// Instruction: 3: 00110010uuuueeee00110111ssssdddd | Re = and (Ru, #1) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003500) {
+					// Instruction: 3: 00110010uuuueeee00110101ssssdddd | Re = and (Ru, #1) ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003400) {
+					// Instruction: 3: 00110010uuuueeee00110100ssssdddd | Re = and (Ru, #1) ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x32003600) {
+					// Instruction: 3: 00110010uuuueeee00110110ssssdddd | Re = and (Ru, #1) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x32003d00) {
+					// Instruction: 3: 00110010uuuueeee001111-1ssss0ddd | Re = and (Ru, #1) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x32003d08) {
+					// Instruction: 3: 00110010uuuueeee001111-1ssss1ddd | Re = and (Ru, #1) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x37003700) {
+					// Instruction: 3: 00110111uuuueeee00110111ssssdddd | Re = and (Ru, #255) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x37003d00) {
+					// Instruction: 3: 00110111uuuueeee001111-1ssss0ddd | Re = and (Ru, #255) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x37003d08) {
+					// Instruction: 3: 00110111uuuueeee001111-1ssss1ddd | Re = and (Ru, #255) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x35003a00) {
+					// Instruction: 3: 00110101sssseeee0011101--0--dddd | Re = sxtb (Rs) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x35003c00) {
+					// Instruction: 3: 00110101sssseeee001111-0-ii00ddd | Re = sxtb (Rs) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x35003c08) {
+					// Instruction: 3: 00110101sssseeee001111-0-ii01ddd | Re = sxtb (Rs) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x35003c10) {
+					// Instruction: 3: 00110101sssseeee001111-0-ii10ddd | Re = sxtb (Rs) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x35003c18) {
+					// Instruction: 3: 00110101sssseeee001111-0-ii11ddd | Re = sxtb (Rs) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x35003a70) {
+					// Instruction: 3: 00110101sssseeee0011101--111dddd | Re = sxtb (Rs) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x35003a50) {
+					// Instruction: 3: 00110101sssseeee0011101--101dddd | Re = sxtb (Rs) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x35003a60) {
+					// Instruction: 3: 00110101sssseeee0011101--110dddd | Re = sxtb (Rs) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x35003a40) {
+					// Instruction: 3: 00110101sssseeee0011101--100dddd | Re = sxtb (Rs) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x35003700) {
+					// Instruction: 3: 00110101uuuueeee00110111ssssdddd | Re = sxtb (Ru) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x35003500) {
+					// Instruction: 3: 00110101uuuueeee00110101ssssdddd | Re = sxtb (Ru) ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x35003600) {
+					// Instruction: 3: 00110101uuuueeee00110110ssssdddd | Re = sxtb (Ru) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x35003d00) {
+					// Instruction: 3: 00110101uuuueeee001111-1ssss0ddd | Re = sxtb (Ru) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x35003d08) {
+					// Instruction: 3: 00110101uuuueeee001111-1ssss1ddd | Re = sxtb (Ru) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x34003a00) {
+					// Instruction: 3: 00110100sssseeee0011101--0--dddd | Re = sxth (Rs) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x34003c00) {
+					// Instruction: 3: 00110100sssseeee001111-0-ii00ddd | Re = sxth (Rs) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x34003c08) {
+					// Instruction: 3: 00110100sssseeee001111-0-ii01ddd | Re = sxth (Rs) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x34003c10) {
+					// Instruction: 3: 00110100sssseeee001111-0-ii10ddd | Re = sxth (Rs) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x34003c18) {
+					// Instruction: 3: 00110100sssseeee001111-0-ii11ddd | Re = sxth (Rs) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x34003a70) {
+					// Instruction: 3: 00110100sssseeee0011101--111dddd | Re = sxth (Rs) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x34003a50) {
+					// Instruction: 3: 00110100sssseeee0011101--101dddd | Re = sxth (Rs) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x34003a60) {
+					// Instruction: 3: 00110100sssseeee0011101--110dddd | Re = sxth (Rs) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x34003a40) {
+					// Instruction: 3: 00110100sssseeee0011101--100dddd | Re = sxth (Rs) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x34003700) {
+					// Instruction: 3: 00110100uuuueeee00110111ssssdddd | Re = sxth (Ru) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x34003500) {
+					// Instruction: 3: 00110100uuuueeee00110101ssssdddd | Re = sxth (Ru) ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x34003400) {
+					// Instruction: 3: 00110100uuuueeee00110100ssssdddd | Re = sxth (Ru) ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x34003600) {
+					// Instruction: 3: 00110100uuuueeee00110110ssssdddd | Re = sxth (Ru) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x34003d00) {
+					// Instruction: 3: 00110100uuuueeee001111-1ssss0ddd | Re = sxth (Ru) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x34003d08) {
+					// Instruction: 3: 00110100uuuueeee001111-1ssss1ddd | Re = sxth (Ru) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x36003a00) {
+					// Instruction: 3: 00110110sssseeee0011101--0--dddd | Re = zxth (Rs) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x36003c00) {
+					// Instruction: 3: 00110110sssseeee001111-0-ii00ddd | Re = zxth (Rs) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x36003c08) {
+					// Instruction: 3: 00110110sssseeee001111-0-ii01ddd | Re = zxth (Rs) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x36003c10) {
+					// Instruction: 3: 00110110sssseeee001111-0-ii10ddd | Re = zxth (Rs) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x36003c18) {
+					// Instruction: 3: 00110110sssseeee001111-0-ii11ddd | Re = zxth (Rs) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x36003a70) {
+					// Instruction: 3: 00110110sssseeee0011101--111dddd | Re = zxth (Rs) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x36003a50) {
+					// Instruction: 3: 00110110sssseeee0011101--101dddd | Re = zxth (Rs) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x36003a60) {
+					// Instruction: 3: 00110110sssseeee0011101--110dddd | Re = zxth (Rs) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x36003a40) {
+					// Instruction: 3: 00110110sssseeee0011101--100dddd | Re = zxth (Rs) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x36003700) {
+					// Instruction: 3: 00110110uuuueeee00110111ssssdddd | Re = zxth (Ru) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x36003600) {
+					// Instruction: 3: 00110110uuuueeee00110110ssssdddd | Re = zxth (Ru) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x36003d00) {
+					// Instruction: 3: 00110110uuuueeee001111-1ssss0ddd | Re = zxth (Ru) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x36003d08) {
+					// Instruction: 3: 00110110uuuueeee001111-1ssss1ddd | Re = zxth (Ru) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c003c00) {
+					// Instruction: 3: 001111-0-II00eee001111-0-ii00ddd | Ree = combine (#0, #U2) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = combine (#0, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c003d00) {
+					// Instruction: 3: 001111-0-II00eee001111-1ssss0ddd | Ree = combine (#0, #U2) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = combine (#0, %s)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c003c08) {
+					// Instruction: 3: 001111-0-II00eee001111-0-ii01ddd | Ree = combine (#0, #U2) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = combine (#1, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c003c10) {
+					// Instruction: 3: 001111-0-II00eee001111-0-ii10ddd | Ree = combine (#0, #U2) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = combine (#2, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c003c18) {
+					// Instruction: 3: 001111-0-II00eee001111-0-ii11ddd | Ree = combine (#0, #U2) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = combine (#3, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c003d08) {
+					// Instruction: 3: 001111-0-II00eee001111-1ssss1ddd | Ree = combine (#0, #U2) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = combine (%s, #0)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08fd08) == 0x3d003d00) {
+					// Instruction: 3: 001111-1uuuu0eee001111-1ssss0ddd | Ree = combine (#0, Ru) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RU____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = combine (#0, %s)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08fd08) == 0x3d003d08) {
+					// Instruction: 3: 001111-1uuuu0eee001111-1ssss1ddd | Ree = combine (#0, Ru) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RU____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = combine (%s, #0)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c083d00) {
+					// Instruction: 3: 001111-0-II01eee001111-1ssss0ddd | Ree = combine (#1, #U2) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = combine (#0, %s)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c083c08) {
+					// Instruction: 3: 001111-0-II01eee001111-0-ii01ddd | Ree = combine (#1, #U2) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = combine (#1, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c083c10) {
+					// Instruction: 3: 001111-0-II01eee001111-0-ii10ddd | Ree = combine (#1, #U2) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = combine (#2, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c083c18) {
+					// Instruction: 3: 001111-0-II01eee001111-0-ii11ddd | Ree = combine (#1, #U2) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = combine (#3, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c083d08) {
+					// Instruction: 3: 001111-0-II01eee001111-1ssss1ddd | Ree = combine (#1, #U2) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = combine (%s, #0)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c103d00) {
+					// Instruction: 3: 001111-0-II10eee001111-1ssss0ddd | Ree = combine (#2, #U2) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = combine (#0, %s)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c103c10) {
+					// Instruction: 3: 001111-0-II10eee001111-0-ii10ddd | Ree = combine (#2, #U2) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = combine (#2, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c103c18) {
+					// Instruction: 3: 001111-0-II10eee001111-0-ii11ddd | Ree = combine (#2, #U2) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = combine (#3, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c103d08) {
+					// Instruction: 3: 001111-0-II10eee001111-1ssss1ddd | Ree = combine (#2, #U2) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = combine (%s, #0)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c183d00) {
+					// Instruction: 3: 001111-0-II11eee001111-1ssss0ddd | Ree = combine (#3, #U2) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = combine (#0, %s)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd18) == 0x3c183c18) {
+					// Instruction: 3: 001111-0-II11eee001111-0-ii11ddd | Ree = combine (#3, #U2) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = combine (#3, 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fd08) == 0x3c183d08) {
+					// Instruction: 3: 001111-0-II11eee001111-1ssss1ddd | Ree = combine (#3, #U2) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = combine (%s, #0)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08fd08) == 0x3d083d08) {
+					// Instruction: 3: 001111-1uuuu1eee001111-1ssss1ddd | Ree = combine (Ru, #0) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RU___0____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = combine (%s, #0)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x38003a00) {
+					// Instruction: 3: 00111000ssssxxxx0011101--0--dddd | Rx = add (Rs, Rx) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c00) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii00ddd | Rx = add (Rs, Rx) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c08) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii01ddd | Rx = add (Rs, Rx) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c10) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii10ddd | Rx = add (Rs, Rx) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c18) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii11ddd | Rx = add (Rs, Rx) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a70) {
+					// Instruction: 3: 00111000ssssxxxx0011101--111dddd | Rx = add (Rs, Rx) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a50) {
+					// Instruction: 3: 00111000ssssxxxx0011101--101dddd | Rx = add (Rs, Rx) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a60) {
+					// Instruction: 3: 00111000ssssxxxx0011101--110dddd | Rx = add (Rs, Rx) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a40) {
+					// Instruction: 3: 00111000ssssxxxx0011101--100dddd | Rx = add (Rs, Rx) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x38003d00) {
+					// Instruction: 3: 00111000uuuuxxxx001111-1ssss0ddd | Rx = add (Ru, Rx) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x38003d08) {
+					// Instruction: 3: 00111000uuuuxxxx001111-1ssss1ddd | Rx = add (Ru, Rx) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x38003900) {
+					// Instruction: 3: 00111000uuuuxxxx00111001ssss--ii | Rx = add (Ru, Rx) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe40) == 0x20003a00) {
+					// Instruction: 3: 00100IIIIIIIxxxx0011101--0--dddd | Rx = add (Rx, #S7) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fc00) == 0x20002800) {
+					// Instruction: 3: 00100IIIIIIIxxxx001010iiiiiidddd | Rx = add (Rx, #S7) ; Rd = #u6
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD____U6;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f0) >> 4);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = 0x%x", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003300) {
+					// Instruction: 3: 00100IIIIIIIxxxx00110011ssssdddd | Rx = add (Rx, #S7) ; Rd = add (Rs, #-1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ADD__RS____1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = add (%s, #-1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003100) {
+					// Instruction: 3: 00100IIIIIIIxxxx00110001ssssdddd | Rx = add (Rx, #S7) ; Rd = add (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ADD__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = add (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fc00) == 0x20002c00) {
+					// Instruction: 3: 00100IIIIIIIxxxx001011iiiiiidddd | Rx = add (Rx, #S7) ; Rd = add (Sp, #u6:2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ADD__SP___U6_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = add (Sp, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003200) {
+					// Instruction: 3: 00100IIIIIIIxxxx00110010ssssdddd | Rx = add (Rx, #S7) ; Rd = and (Rs, #1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___AND__RS___1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = and (%s, #1)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003700) {
+					// Instruction: 3: 00100IIIIIIIxxxx00110111ssssdddd | Rx = add (Rx, #S7) ; Rd = and (Rs, #255)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___AND__RS___255_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = and (%s, #255)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fd18) == 0x20003c00) {
+					// Instruction: 3: 00100IIIIIIIxxxx001111-0-ii00ddd | Rx = add (Rx, #S7) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fd08) == 0x20003d00) {
+					// Instruction: 3: 00100IIIIIIIxxxx001111-1ssss0ddd | Rx = add (Rx, #S7) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fd18) == 0x20003c08) {
+					// Instruction: 3: 00100IIIIIIIxxxx001111-0-ii01ddd | Rx = add (Rx, #S7) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fd18) == 0x20003c10) {
+					// Instruction: 3: 00100IIIIIIIxxxx001111-0-ii10ddd | Rx = add (Rx, #S7) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fd18) == 0x20003c18) {
+					// Instruction: 3: 00100IIIIIIIxxxx001111-0-ii11ddd | Rx = add (Rx, #S7) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fd08) == 0x20003d08) {
+					// Instruction: 3: 00100IIIIIIIxxxx001111-1ssss1ddd | Rx = add (Rx, #S7) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe70) == 0x20003a70) {
+					// Instruction: 3: 00100IIIIIIIxxxx0011101--111dddd | Rx = add (Rx, #S7) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe70) == 0x20003a50) {
+					// Instruction: 3: 00100IIIIIIIxxxx0011101--101dddd | Rx = add (Rx, #S7) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe70) == 0x20003a60) {
+					// Instruction: 3: 00100IIIIIIIxxxx0011101--110dddd | Rx = add (Rx, #S7) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe70) == 0x20003a40) {
+					// Instruction: 3: 00100IIIIIIIxxxx0011101--100dddd | Rx = add (Rx, #S7) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003900) {
+					// Instruction: 3: 00100IIIIIIIxxxx00111001ssss--ii | Rx = add (Rx, #S7) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003000) {
+					// Instruction: 3: 00100iiiiiiixxxx00110000ssssdddd | Rx = add (Rx, #s7) ; Rd = Rs
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___RS;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003500) {
+					// Instruction: 3: 00100iiiiiiixxxx00110101ssssdddd | Rx = add (Rx, #s7) ; Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___SXTB__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = sxtb (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003400) {
+					// Instruction: 3: 00100iiiiiiixxxx00110100ssssdddd | Rx = add (Rx, #s7) ; Rd = sxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___SXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = sxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003600) {
+					// Instruction: 3: 00100iiiiiiixxxx00110110ssssdddd | Rx = add (Rx, #s7) ; Rd = zxth (Rs)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ZXTH__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = zxth (%s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x38003a00) {
+					// Instruction: 3: 00111000ssssxxxx0011101--0--dddd | Rx = add (Rx, Rs) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c00) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii00ddd | Rx = add (Rx, Rs) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c08) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii01ddd | Rx = add (Rx, Rs) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c10) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii10ddd | Rx = add (Rx, Rs) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x38003c18) {
+					// Instruction: 3: 00111000ssssxxxx001111-0-ii11ddd | Rx = add (Rx, Rs) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a70) {
+					// Instruction: 3: 00111000ssssxxxx0011101--111dddd | Rx = add (Rx, Rs) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a50) {
+					// Instruction: 3: 00111000ssssxxxx0011101--101dddd | Rx = add (Rx, Rs) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a60) {
+					// Instruction: 3: 00111000ssssxxxx0011101--110dddd | Rx = add (Rx, Rs) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x38003a40) {
+					// Instruction: 3: 00111000ssssxxxx0011101--100dddd | Rx = add (Rx, Rs) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x38003d00) {
+					// Instruction: 3: 00111000uuuuxxxx001111-1ssss0ddd | Rx = add (Rx, Ru) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x38003d08) {
+					// Instruction: 3: 00111000uuuuxxxx001111-1ssss1ddd | Rx = add (Rx, Ru) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x38003900) {
+					// Instruction: 3: 00111000uuuuxxxx00111001ssss--ii | Rx = add (Rx, Ru) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x38003800) {
+					// Instruction: 3: 00111000uuuuyyyy00111000ssssxxxx | Ry = add (Ru, Ry) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RY___ADD__RU__RY____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Ry) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x38003800) {
+					// Instruction: 3: 00111000uuuuyyyy00111000ssssxxxx | Ry = add (Ru, Ry) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RY___ADD__RU__RY____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Ry) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x20002000) {
+					// Instruction: 3: 00100IIIIIIIyyyy00100iiiiiiixxxx | Ry = add (Ry, #S7) ; Rx = add (Rx, #s7)
+					hi->instruction = HEX_INS_DUPLEX_RY___ADD__RY___S7____RX___ADD__RX___S7_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7f0) >> 4);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Ry, 0x%x) ; %s = add (Rx, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003800) {
+					// Instruction: 3: 00100iiiiiiiyyyy00111000ssssxxxx | Ry = add (Ry, #s7) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RY___ADD__RY___S7____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Ry, 0x%x) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x20003800) {
+					// Instruction: 3: 00100iiiiiiiyyyy00111000ssssxxxx | Ry = add (Ry, #s7) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RY___ADD__RY___S7____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Ry, 0x%x) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x38003800) {
+					// Instruction: 3: 00111000uuuuyyyy00111000ssssxxxx | Ry = add (Ry, Ru) ; Rx = add (Rs, Rx)
+					hi->instruction = HEX_INS_DUPLEX_RY___ADD__RY__RU____RX___ADD__RS__RX_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Ry, %s) ; %s = add (%s, Rx)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x38003800) {
+					// Instruction: 3: 00111000uuuuyyyy00111000ssssxxxx | Ry = add (Ry, Ru) ; Rx = add (Rx, Rs)
+					hi->instruction = HEX_INS_DUPLEX_RY___ADD__RY__RU____RX___ADD__RX__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Ry, %s) ; %s = add (Rx, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a703c00) {
+					// Instruction: 3: 0011101--111eeee001111-0-ii00ddd | if (! p0) Re = #0 ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___0___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a703d00) {
+					// Instruction: 3: 0011101--111eeee001111-1ssss0ddd | if (! p0) Re = #0 ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___0__RS_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a703c08) {
+					// Instruction: 3: 0011101--111eeee001111-0-ii01ddd | if (! p0) Re = #0 ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___1___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a703c10) {
+					// Instruction: 3: 0011101--111eeee001111-0-ii10ddd | if (! p0) Re = #0 ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___2___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a703c18) {
+					// Instruction: 3: 0011101--111eeee001111-0-ii11ddd | if (! p0) Re = #0 ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___3___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a703d08) {
+					// Instruction: 3: 0011101--111eeee001111-1ssss1ddd | if (! p0) Re = #0 ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE__RS___0_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a703a70) {
+					// Instruction: 3: 0011101--111eeee0011101--111dddd | if (! p0) Re = #0 ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___IF___NOT__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a503c00) {
+					// Instruction: 3: 0011101--101eeee001111-0-ii00ddd | if (! p0.new) Re = #0 ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___0___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a503d00) {
+					// Instruction: 3: 0011101--101eeee001111-1ssss0ddd | if (! p0.new) Re = #0 ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___0__RS_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a503c08) {
+					// Instruction: 3: 0011101--101eeee001111-0-ii01ddd | if (! p0.new) Re = #0 ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___1___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a503c10) {
+					// Instruction: 3: 0011101--101eeee001111-0-ii10ddd | if (! p0.new) Re = #0 ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___2___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a503c18) {
+					// Instruction: 3: 0011101--101eeee001111-0-ii11ddd | if (! p0.new) Re = #0 ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___3___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a503d08) {
+					// Instruction: 3: 0011101--101eeee001111-1ssss1ddd | if (! p0.new) Re = #0 ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE__RS___0_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a503a70) {
+					// Instruction: 3: 0011101--101eeee0011101--111dddd | if (! p0.new) Re = #0 ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___IF___NOT__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a503a50) {
+					// Instruction: 3: 0011101--101eeee0011101--101dddd | if (! p0.new) Re = #0 ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a503a60) {
+					// Instruction: 3: 0011101--101eeee0011101--110dddd | if (! p0.new) Re = #0 ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___IF__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a603c00) {
+					// Instruction: 3: 0011101--110eeee001111-0-ii00ddd | if (p0) Re = #0 ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___0___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a603d00) {
+					// Instruction: 3: 0011101--110eeee001111-1ssss0ddd | if (p0) Re = #0 ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___0__RS_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a603c08) {
+					// Instruction: 3: 0011101--110eeee001111-0-ii01ddd | if (p0) Re = #0 ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___1___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a603c10) {
+					// Instruction: 3: 0011101--110eeee001111-0-ii10ddd | if (p0) Re = #0 ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___2___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a603c18) {
+					// Instruction: 3: 0011101--110eeee001111-0-ii11ddd | if (p0) Re = #0 ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___3___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a603d08) {
+					// Instruction: 3: 0011101--110eeee001111-1ssss1ddd | if (p0) Re = #0 ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE__RS___0_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a603a70) {
+					// Instruction: 3: 0011101--110eeee0011101--111dddd | if (p0) Re = #0 ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___IF___NOT__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a603a60) {
+					// Instruction: 3: 0011101--110eeee0011101--110dddd | if (p0) Re = #0 ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___IF__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a403c00) {
+					// Instruction: 3: 0011101--100eeee001111-0-ii00ddd | if (p0.new) Re = #0 ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___0___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a403d00) {
+					// Instruction: 3: 0011101--100eeee001111-1ssss0ddd | if (p0.new) Re = #0 ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___0__RS_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a403c08) {
+					// Instruction: 3: 0011101--100eeee001111-0-ii01ddd | if (p0.new) Re = #0 ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___1___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a403c10) {
+					// Instruction: 3: 0011101--100eeee001111-0-ii10ddd | if (p0.new) Re = #0 ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___2___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd18) == 0x3a403c18) {
+					// Instruction: 3: 0011101--100eeee001111-0-ii11ddd | if (p0.new) Re = #0 ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___3___U2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fd08) == 0x3a403d08) {
+					// Instruction: 3: 0011101--100eeee001111-1ssss1ddd | if (p0.new) Re = #0 ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE__RS___0_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a403a70) {
+					// Instruction: 3: 0011101--100eeee0011101--111dddd | if (p0.new) Re = #0 ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF___NOT__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a403a50) {
+					// Instruction: 3: 0011101--100eeee0011101--101dddd | if (p0.new) Re = #0 ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a403a60) {
+					// Instruction: 3: 0011101--100eeee0011101--110dddd | if (p0.new) Re = #0 ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF__P0__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe70) == 0x3a403a40) {
+					// Instruction: 3: 0011101--100eeee0011101--100dddd | if (p0.new) Re = #0 ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF__P0_NEW__RD____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe40) == 0x39003a00) {
+					// Instruction: 3: 00111001ssss--II0011101--0--dddd | p0 = cmp.eq (Rs, #U2) ; Rd = #-1
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RD_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = #-1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x39003c00) {
+					// Instruction: 3: 00111001ssss--II001111-0-ii00ddd | p0 = cmp.eq (Rs, #U2) ; Rdd = combine (#0, #u2)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___0___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = combine (#0, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x39003c08) {
+					// Instruction: 3: 00111001ssss--II001111-0-ii01ddd | p0 = cmp.eq (Rs, #U2) ; Rdd = combine (#1, #u2)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___1___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = combine (#1, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x39003c10) {
+					// Instruction: 3: 00111001ssss--II001111-0-ii10ddd | p0 = cmp.eq (Rs, #U2) ; Rdd = combine (#2, #u2)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___2___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = combine (#2, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fd18) == 0x39003c18) {
+					// Instruction: 3: 00111001ssss--II001111-0-ii11ddd | p0 = cmp.eq (Rs, #U2) ; Rdd = combine (#3, #u2)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___3___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = combine (#3, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x39003a70) {
+					// Instruction: 3: 00111001ssss--II0011101--111dddd | p0 = cmp.eq (Rs, #U2) ; if (! p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (! p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x39003a50) {
+					// Instruction: 3: 00111001ssss--II0011101--101dddd | p0 = cmp.eq (Rs, #U2) ; if (! p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (! p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x39003a60) {
+					// Instruction: 3: 00111001ssss--II0011101--110dddd | p0 = cmp.eq (Rs, #U2) ; if (p0) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (p0) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe70) == 0x39003a40) {
+					// Instruction: 3: 00111001ssss--II0011101--100dddd | p0 = cmp.eq (Rs, #U2) ; if (p0.new) Rd = #0
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0_NEW__RD____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (p0.new) %s = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x39003d00) {
+					// Instruction: 3: 00111001uuuu--II001111-1ssss0ddd | p0 = cmp.eq (Ru, #U2) ; Rdd = combine (#0, Rs)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RDD___COMBINE___0__RS_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = combine (#0, %s)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fd08) == 0x39003d08) {
+					// Instruction: 3: 00111001uuuu--II001111-1ssss1ddd | p0 = cmp.eq (Ru, #U2) ; Rdd = combine (Rs, #0)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RDD___COMBINE__RS___0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = combine (%s, #0)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x39003900) {
+					// Instruction: 3: 00111001uuuu--II00111001ssss--ii | p0 = cmp.eq (Ru, #U2) ; p0 = cmp.eq (Rs, #u2)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____P0___CMP_EQ__RS___U2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; p0 = cmp.eq (%s, 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x4: {
+				if ((hi_u32 & 0xfe40f000) == 0x5a001000) {
+					// Instruction: 4: 0101101--0--eeee0001iiiissssdddd | Re = #-1 ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RD___MEMUB__RS____U4_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40f000) == 0x5a000000) {
+					// Instruction: 4: 0101101--0--eeee0000iiiissssdddd | Re = #-1 ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RD___MEMW__RS____U4_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x48001000) {
+					// Instruction: 4: 010010IIIIIIeeee0001iiiissssdddd | Re = #U6 ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x48000000) {
+					// Instruction: 4: 010010IIIIIIeeee0000iiiissssdddd | Re = #U6 ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x50001000) {
+					// Instruction: 4: 01010000uuuueeee0001iiiissssdddd | Re = Ru ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x50000000) {
+					// Instruction: 4: 01010000uuuueeee0000iiiissssdddd | Re = Ru ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x53001000) {
+					// Instruction: 4: 01010011uuuueeee0001iiiissssdddd | Re = add (Ru, #-1) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x53000000) {
+					// Instruction: 4: 01010011uuuueeee0000iiiissssdddd | Re = add (Ru, #-1) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x51001000) {
+					// Instruction: 4: 01010001uuuueeee0001iiiissssdddd | Re = add (Ru, #1) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x51000000) {
+					// Instruction: 4: 01010001uuuueeee0000iiiissssdddd | Re = add (Ru, #1) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x4c001000) {
+					// Instruction: 4: 010011IIIIIIeeee0001iiiissssdddd | Re = add (Sp, #U6:2) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x4c000000) {
+					// Instruction: 4: 010011IIIIIIeeee0000iiiissssdddd | Re = add (Sp, #U6:2) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x52001000) {
+					// Instruction: 4: 01010010uuuueeee0001iiiissssdddd | Re = and (Ru, #1) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x52000000) {
+					// Instruction: 4: 01010010uuuueeee0000iiiissssdddd | Re = and (Ru, #1) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x57001000) {
+					// Instruction: 4: 01010111uuuueeee0001iiiissssdddd | Re = and (Ru, #255) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x57000000) {
+					// Instruction: 4: 01010111uuuueeee0000iiiissssdddd | Re = and (Ru, #255) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x55001000) {
+					// Instruction: 4: 01010101uuuueeee0001iiiissssdddd | Re = sxtb (Ru) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x55000000) {
+					// Instruction: 4: 01010101uuuueeee0000iiiissssdddd | Re = sxtb (Ru) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x54001000) {
+					// Instruction: 4: 01010100uuuueeee0001iiiissssdddd | Re = sxth (Ru) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x54000000) {
+					// Instruction: 4: 01010100uuuueeee0000iiiissssdddd | Re = sxth (Ru) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x56001000) {
+					// Instruction: 4: 01010110uuuueeee0001iiiissssdddd | Re = zxth (Ru) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x56000000) {
+					// Instruction: 4: 01010110uuuueeee0000iiiissssdddd | Re = zxth (Ru) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c001000) {
+					// Instruction: 4: 010111-0-II00eee0001iiiissssdddd | Ree = combine (#0, #U2) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c000000) {
+					// Instruction: 4: 010111-0-II00eee0000iiiissssdddd | Ree = combine (#0, #U2) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x5d001000) {
+					// Instruction: 4: 010111-1uuuu0eee0001iiiissssdddd | Ree = combine (#0, Ru) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = memub (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x5d000000) {
+					// Instruction: 4: 010111-1uuuu0eee0000iiiissssdddd | Ree = combine (#0, Ru) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = memw (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c081000) {
+					// Instruction: 4: 010111-0-II01eee0001iiiissssdddd | Ree = combine (#1, #U2) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c080000) {
+					// Instruction: 4: 010111-0-II01eee0000iiiissssdddd | Ree = combine (#1, #U2) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c101000) {
+					// Instruction: 4: 010111-0-II10eee0001iiiissssdddd | Ree = combine (#2, #U2) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c100000) {
+					// Instruction: 4: 010111-0-II10eee0000iiiissssdddd | Ree = combine (#2, #U2) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c181000) {
+					// Instruction: 4: 010111-0-II11eee0001iiiissssdddd | Ree = combine (#3, #U2) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x5c180000) {
+					// Instruction: 4: 010111-0-II11eee0000iiiissssdddd | Ree = combine (#3, #U2) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x5d081000) {
+					// Instruction: 4: 010111-1uuuu1eee0001iiiissssdddd | Ree = combine (Ru, #0) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = memub (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x5d080000) {
+					// Instruction: 4: 010111-1uuuu1eee0000iiiissssdddd | Ree = combine (Ru, #0) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = memw (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x58001000) {
+					// Instruction: 4: 01011000uuuuxxxx0001iiiissssdddd | Rx = add (Ru, Rx) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x58000000) {
+					// Instruction: 4: 01011000uuuuxxxx0000iiiissssdddd | Rx = add (Ru, Rx) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x40001000) {
+					// Instruction: 4: 01000IIIIIIIxxxx0001iiiissssdddd | Rx = add (Rx, #S7) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x40000000) {
+					// Instruction: 4: 01000IIIIIIIxxxx0000iiiissssdddd | Rx = add (Rx, #S7) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x58001000) {
+					// Instruction: 4: 01011000uuuuxxxx0001iiiissssdddd | Rx = add (Rx, Ru) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x58000000) {
+					// Instruction: 4: 01011000uuuuxxxx0000iiiissssdddd | Rx = add (Rx, Ru) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a701000) {
+					// Instruction: 4: 0101101--111eeee0001iiiissssdddd | if (! p0) Re = #0 ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMUB__RS____U4_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a700000) {
+					// Instruction: 4: 0101101--111eeee0000iiiissssdddd | if (! p0) Re = #0 ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMW__RS____U4_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a501000) {
+					// Instruction: 4: 0101101--101eeee0001iiiissssdddd | if (! p0.new) Re = #0 ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMUB__RS____U4_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a500000) {
+					// Instruction: 4: 0101101--101eeee0000iiiissssdddd | if (! p0.new) Re = #0 ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMW__RS____U4_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a601000) {
+					// Instruction: 4: 0101101--110eeee0001iiiissssdddd | if (p0) Re = #0 ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMUB__RS____U4_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a600000) {
+					// Instruction: 4: 0101101--110eeee0000iiiissssdddd | if (p0) Re = #0 ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMW__RS____U4_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a401000) {
+					// Instruction: 4: 0101101--100eeee0001iiiissssdddd | if (p0.new) Re = #0 ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMUB__RS____U4_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x5a400000) {
+					// Instruction: 4: 0101101--100eeee0000iiiissssdddd | if (p0.new) Re = #0 ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMW__RS____U4_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x59001000) {
+					// Instruction: 4: 01011001uuuu--II0001iiiissssdddd | p0 = cmp.eq (Ru, #U2) ; Rd = memub (Rs + #u4:0)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMUB__RS____U4_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = memub (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x59000000) {
+					// Instruction: 4: 01011001uuuu--II0000iiiissssdddd | p0 = cmp.eq (Ru, #U2) ; Rd = memw (Rs + #u4:2)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMW__RS____U4_2_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = memw (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x5: {
+				if ((hi_u32 & 0xfe40ffc4) == 0x5a003f40) {
+					// Instruction: 5: 0101101--0--dddd0011111101---0-- | Rd = #-1 ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc4) == 0x5a003f00) {
+					// Instruction: 5: 0101101--0--dddd0011111100---0-- | Rd = #-1 ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___DEALLOCFRAME;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003f45) {
+					// Instruction: 5: 0101101--0--dddd0011111101---101 | Rd = #-1 ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003fc5) {
+					// Instruction: 5: 0101101--0--dddd0011111111---101 | Rd = #-1 ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003f47) {
+					// Instruction: 5: 0101101--0--dddd0011111101---111 | Rd = #-1 ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003fc7) {
+					// Instruction: 5: 0101101--0--dddd0011111111---111 | Rd = #-1 ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003f44) {
+					// Instruction: 5: 0101101--0--dddd0011111101---100 | Rd = #-1 ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003fc4) {
+					// Instruction: 5: 0101101--0--dddd0011111111---100 | Rd = #-1 ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003f46) {
+					// Instruction: 5: 0101101--0--dddd0011111101---110 | Rd = #-1 ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc7) == 0x5a003fc6) {
+					// Instruction: 5: 0101101--0--dddd0011111111---110 | Rd = #-1 ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ffc4) == 0x5a003fc0) {
+					// Instruction: 5: 0101101--0--dddd0011111111---0-- | Rd = #-1 ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc4) == 0x48003f40) {
+					// Instruction: 5: 010010iiiiiidddd0011111101---0-- | Rd = #u6 ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc4) == 0x48003f00) {
+					// Instruction: 5: 010010iiiiiidddd0011111100---0-- | Rd = #u6 ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003f45) {
+					// Instruction: 5: 010010iiiiiidddd0011111101---101 | Rd = #u6 ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003fc5) {
+					// Instruction: 5: 010010iiiiiidddd0011111111---101 | Rd = #u6 ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003f47) {
+					// Instruction: 5: 010010iiiiiidddd0011111101---111 | Rd = #u6 ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003fc7) {
+					// Instruction: 5: 010010iiiiiidddd0011111111---111 | Rd = #u6 ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003f44) {
+					// Instruction: 5: 010010iiiiiidddd0011111101---100 | Rd = #u6 ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003fc4) {
+					// Instruction: 5: 010010iiiiiidddd0011111111---100 | Rd = #u6 ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003f46) {
+					// Instruction: 5: 010010iiiiiidddd0011111101---110 | Rd = #u6 ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x48003fc6) {
+					// Instruction: 5: 010010iiiiiidddd0011111111---110 | Rd = #u6 ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc4) == 0x48003fc0) {
+					// Instruction: 5: 010010iiiiiidddd0011111111---0-- | Rd = #u6 ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x50003f40) {
+					// Instruction: 5: 01010000ssssdddd0011111101---0-- | Rd = Rs ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x50003f00) {
+					// Instruction: 5: 01010000ssssdddd0011111100---0-- | Rd = Rs ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003f45) {
+					// Instruction: 5: 01010000ssssdddd0011111101---101 | Rd = Rs ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003fc5) {
+					// Instruction: 5: 01010000ssssdddd0011111111---101 | Rd = Rs ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003f47) {
+					// Instruction: 5: 01010000ssssdddd0011111101---111 | Rd = Rs ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003fc7) {
+					// Instruction: 5: 01010000ssssdddd0011111111---111 | Rd = Rs ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003f44) {
+					// Instruction: 5: 01010000ssssdddd0011111101---100 | Rd = Rs ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003fc4) {
+					// Instruction: 5: 01010000ssssdddd0011111111---100 | Rd = Rs ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003f46) {
+					// Instruction: 5: 01010000ssssdddd0011111101---110 | Rd = Rs ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x50003fc6) {
+					// Instruction: 5: 01010000ssssdddd0011111111---110 | Rd = Rs ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x50003fc0) {
+					// Instruction: 5: 01010000ssssdddd0011111111---0-- | Rd = Rs ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x53003f40) {
+					// Instruction: 5: 01010011ssssdddd0011111101---0-- | Rd = add (Rs, #-1) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x53003f00) {
+					// Instruction: 5: 01010011ssssdddd0011111100---0-- | Rd = add (Rs, #-1) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003f45) {
+					// Instruction: 5: 01010011ssssdddd0011111101---101 | Rd = add (Rs, #-1) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003fc5) {
+					// Instruction: 5: 01010011ssssdddd0011111111---101 | Rd = add (Rs, #-1) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003f47) {
+					// Instruction: 5: 01010011ssssdddd0011111101---111 | Rd = add (Rs, #-1) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003fc7) {
+					// Instruction: 5: 01010011ssssdddd0011111111---111 | Rd = add (Rs, #-1) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003f44) {
+					// Instruction: 5: 01010011ssssdddd0011111101---100 | Rd = add (Rs, #-1) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003fc4) {
+					// Instruction: 5: 01010011ssssdddd0011111111---100 | Rd = add (Rs, #-1) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003f46) {
+					// Instruction: 5: 01010011ssssdddd0011111101---110 | Rd = add (Rs, #-1) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x53003fc6) {
+					// Instruction: 5: 01010011ssssdddd0011111111---110 | Rd = add (Rs, #-1) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x53003fc0) {
+					// Instruction: 5: 01010011ssssdddd0011111111---0-- | Rd = add (Rs, #-1) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x51003f40) {
+					// Instruction: 5: 01010001ssssdddd0011111101---0-- | Rd = add (Rs, #1) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x51003f00) {
+					// Instruction: 5: 01010001ssssdddd0011111100---0-- | Rd = add (Rs, #1) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003f45) {
+					// Instruction: 5: 01010001ssssdddd0011111101---101 | Rd = add (Rs, #1) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003fc5) {
+					// Instruction: 5: 01010001ssssdddd0011111111---101 | Rd = add (Rs, #1) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003f47) {
+					// Instruction: 5: 01010001ssssdddd0011111101---111 | Rd = add (Rs, #1) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003fc7) {
+					// Instruction: 5: 01010001ssssdddd0011111111---111 | Rd = add (Rs, #1) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003f44) {
+					// Instruction: 5: 01010001ssssdddd0011111101---100 | Rd = add (Rs, #1) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003fc4) {
+					// Instruction: 5: 01010001ssssdddd0011111111---100 | Rd = add (Rs, #1) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003f46) {
+					// Instruction: 5: 01010001ssssdddd0011111101---110 | Rd = add (Rs, #1) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x51003fc6) {
+					// Instruction: 5: 01010001ssssdddd0011111111---110 | Rd = add (Rs, #1) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x51003fc0) {
+					// Instruction: 5: 01010001ssssdddd0011111111---0-- | Rd = add (Rs, #1) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc4) == 0x4c003f40) {
+					// Instruction: 5: 010011iiiiiidddd0011111101---0-- | Rd = add (Sp, #u6:2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc4) == 0x4c003f00) {
+					// Instruction: 5: 010011iiiiiidddd0011111100---0-- | Rd = add (Sp, #u6:2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003f45) {
+					// Instruction: 5: 010011iiiiiidddd0011111101---101 | Rd = add (Sp, #u6:2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003fc5) {
+					// Instruction: 5: 010011iiiiiidddd0011111111---101 | Rd = add (Sp, #u6:2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003f47) {
+					// Instruction: 5: 010011iiiiiidddd0011111101---111 | Rd = add (Sp, #u6:2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003fc7) {
+					// Instruction: 5: 010011iiiiiidddd0011111111---111 | Rd = add (Sp, #u6:2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003f44) {
+					// Instruction: 5: 010011iiiiiidddd0011111101---100 | Rd = add (Sp, #u6:2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003fc4) {
+					// Instruction: 5: 010011iiiiiidddd0011111111---100 | Rd = add (Sp, #u6:2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003f46) {
+					// Instruction: 5: 010011iiiiiidddd0011111101---110 | Rd = add (Sp, #u6:2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc7) == 0x4c003fc6) {
+					// Instruction: 5: 010011iiiiiidddd0011111111---110 | Rd = add (Sp, #u6:2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ffc4) == 0x4c003fc0) {
+					// Instruction: 5: 010011iiiiiidddd0011111111---0-- | Rd = add (Sp, #u6:2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x52003f40) {
+					// Instruction: 5: 01010010ssssdddd0011111101---0-- | Rd = and (Rs, #1) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x52003f00) {
+					// Instruction: 5: 01010010ssssdddd0011111100---0-- | Rd = and (Rs, #1) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003f45) {
+					// Instruction: 5: 01010010ssssdddd0011111101---101 | Rd = and (Rs, #1) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003fc5) {
+					// Instruction: 5: 01010010ssssdddd0011111111---101 | Rd = and (Rs, #1) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003f47) {
+					// Instruction: 5: 01010010ssssdddd0011111101---111 | Rd = and (Rs, #1) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003fc7) {
+					// Instruction: 5: 01010010ssssdddd0011111111---111 | Rd = and (Rs, #1) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003f44) {
+					// Instruction: 5: 01010010ssssdddd0011111101---100 | Rd = and (Rs, #1) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003fc4) {
+					// Instruction: 5: 01010010ssssdddd0011111111---100 | Rd = and (Rs, #1) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003f46) {
+					// Instruction: 5: 01010010ssssdddd0011111101---110 | Rd = and (Rs, #1) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x52003fc6) {
+					// Instruction: 5: 01010010ssssdddd0011111111---110 | Rd = and (Rs, #1) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x52003fc0) {
+					// Instruction: 5: 01010010ssssdddd0011111111---0-- | Rd = and (Rs, #1) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x57003f40) {
+					// Instruction: 5: 01010111ssssdddd0011111101---0-- | Rd = and (Rs, #255) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x57003f00) {
+					// Instruction: 5: 01010111ssssdddd0011111100---0-- | Rd = and (Rs, #255) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003f45) {
+					// Instruction: 5: 01010111ssssdddd0011111101---101 | Rd = and (Rs, #255) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003fc5) {
+					// Instruction: 5: 01010111ssssdddd0011111111---101 | Rd = and (Rs, #255) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003f47) {
+					// Instruction: 5: 01010111ssssdddd0011111101---111 | Rd = and (Rs, #255) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003fc7) {
+					// Instruction: 5: 01010111ssssdddd0011111111---111 | Rd = and (Rs, #255) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003f44) {
+					// Instruction: 5: 01010111ssssdddd0011111101---100 | Rd = and (Rs, #255) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003fc4) {
+					// Instruction: 5: 01010111ssssdddd0011111111---100 | Rd = and (Rs, #255) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003f46) {
+					// Instruction: 5: 01010111ssssdddd0011111101---110 | Rd = and (Rs, #255) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x57003fc6) {
+					// Instruction: 5: 01010111ssssdddd0011111111---110 | Rd = and (Rs, #255) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x57003fc0) {
+					// Instruction: 5: 01010111ssssdddd0011111111---0-- | Rd = and (Rs, #255) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x55003f40) {
+					// Instruction: 5: 01010101ssssdddd0011111101---0-- | Rd = sxtb (Rs) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x55003f00) {
+					// Instruction: 5: 01010101ssssdddd0011111100---0-- | Rd = sxtb (Rs) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003f45) {
+					// Instruction: 5: 01010101ssssdddd0011111101---101 | Rd = sxtb (Rs) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003fc5) {
+					// Instruction: 5: 01010101ssssdddd0011111111---101 | Rd = sxtb (Rs) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003f47) {
+					// Instruction: 5: 01010101ssssdddd0011111101---111 | Rd = sxtb (Rs) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003fc7) {
+					// Instruction: 5: 01010101ssssdddd0011111111---111 | Rd = sxtb (Rs) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003f44) {
+					// Instruction: 5: 01010101ssssdddd0011111101---100 | Rd = sxtb (Rs) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003fc4) {
+					// Instruction: 5: 01010101ssssdddd0011111111---100 | Rd = sxtb (Rs) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003f46) {
+					// Instruction: 5: 01010101ssssdddd0011111101---110 | Rd = sxtb (Rs) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x55003fc6) {
+					// Instruction: 5: 01010101ssssdddd0011111111---110 | Rd = sxtb (Rs) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x55003fc0) {
+					// Instruction: 5: 01010101ssssdddd0011111111---0-- | Rd = sxtb (Rs) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x54003f40) {
+					// Instruction: 5: 01010100ssssdddd0011111101---0-- | Rd = sxth (Rs) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x54003f00) {
+					// Instruction: 5: 01010100ssssdddd0011111100---0-- | Rd = sxth (Rs) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003f45) {
+					// Instruction: 5: 01010100ssssdddd0011111101---101 | Rd = sxth (Rs) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003fc5) {
+					// Instruction: 5: 01010100ssssdddd0011111111---101 | Rd = sxth (Rs) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003f47) {
+					// Instruction: 5: 01010100ssssdddd0011111101---111 | Rd = sxth (Rs) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003fc7) {
+					// Instruction: 5: 01010100ssssdddd0011111111---111 | Rd = sxth (Rs) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003f44) {
+					// Instruction: 5: 01010100ssssdddd0011111101---100 | Rd = sxth (Rs) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003fc4) {
+					// Instruction: 5: 01010100ssssdddd0011111111---100 | Rd = sxth (Rs) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003f46) {
+					// Instruction: 5: 01010100ssssdddd0011111101---110 | Rd = sxth (Rs) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x54003fc6) {
+					// Instruction: 5: 01010100ssssdddd0011111111---110 | Rd = sxth (Rs) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x54003fc0) {
+					// Instruction: 5: 01010100ssssdddd0011111111---0-- | Rd = sxth (Rs) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x56003f40) {
+					// Instruction: 5: 01010110ssssdddd0011111101---0-- | Rd = zxth (Rs) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x56003f00) {
+					// Instruction: 5: 01010110ssssdddd0011111100---0-- | Rd = zxth (Rs) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003f45) {
+					// Instruction: 5: 01010110ssssdddd0011111101---101 | Rd = zxth (Rs) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003fc5) {
+					// Instruction: 5: 01010110ssssdddd0011111111---101 | Rd = zxth (Rs) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003f47) {
+					// Instruction: 5: 01010110ssssdddd0011111101---111 | Rd = zxth (Rs) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003fc7) {
+					// Instruction: 5: 01010110ssssdddd0011111111---111 | Rd = zxth (Rs) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003f44) {
+					// Instruction: 5: 01010110ssssdddd0011111101---100 | Rd = zxth (Rs) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003fc4) {
+					// Instruction: 5: 01010110ssssdddd0011111111---100 | Rd = zxth (Rs) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003f46) {
+					// Instruction: 5: 01010110ssssdddd0011111101---110 | Rd = zxth (Rs) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x56003fc6) {
+					// Instruction: 5: 01010110ssssdddd0011111111---110 | Rd = zxth (Rs) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x56003fc0) {
+					// Instruction: 5: 01010110ssssdddd0011111111---0-- | Rd = zxth (Rs) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c003f40) {
+					// Instruction: 5: 010111-0-ii00ddd0011111101---0-- | Rdd = combine (#0, #u2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c003f00) {
+					// Instruction: 5: 010111-0-ii00ddd0011111100---0-- | Rdd = combine (#0, #u2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; deallocframe", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003f45) {
+					// Instruction: 5: 010111-0-ii00ddd0011111101---101 | Rdd = combine (#0, #u2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (! p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003fc5) {
+					// Instruction: 5: 010111-0-ii00ddd0011111111---101 | Rdd = combine (#0, #u2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003f47) {
+					// Instruction: 5: 010111-0-ii00ddd0011111101---111 | Rdd = combine (#0, #u2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003fc7) {
+					// Instruction: 5: 010111-0-ii00ddd0011111111---111 | Rdd = combine (#0, #u2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003f44) {
+					// Instruction: 5: 010111-0-ii00ddd0011111101---100 | Rdd = combine (#0, #u2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003fc4) {
+					// Instruction: 5: 010111-0-ii00ddd0011111111---100 | Rdd = combine (#0, #u2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003f46) {
+					// Instruction: 5: 010111-0-ii00ddd0011111101---110 | Rdd = combine (#0, #u2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c003fc6) {
+					// Instruction: 5: 010111-0-ii00ddd0011111111---110 | Rdd = combine (#0, #u2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c003fc0) {
+					// Instruction: 5: 010111-0-ii00ddd0011111111---0-- | Rdd = combine (#0, #u2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc4) == 0x5d003f40) {
+					// Instruction: 5: 010111-1ssss0ddd0011111101---0-- | Rdd = combine (#0, Rs) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc4) == 0x5d003f00) {
+					// Instruction: 5: 010111-1ssss0ddd0011111100---0-- | Rdd = combine (#0, Rs) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; deallocframe", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003f45) {
+					// Instruction: 5: 010111-1ssss0ddd0011111101---101 | Rdd = combine (#0, Rs) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (! p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003fc5) {
+					// Instruction: 5: 010111-1ssss0ddd0011111111---101 | Rdd = combine (#0, Rs) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (! p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003f47) {
+					// Instruction: 5: 010111-1ssss0ddd0011111101---111 | Rdd = combine (#0, Rs) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (! p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003fc7) {
+					// Instruction: 5: 010111-1ssss0ddd0011111111---111 | Rdd = combine (#0, Rs) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003f44) {
+					// Instruction: 5: 010111-1ssss0ddd0011111101---100 | Rdd = combine (#0, Rs) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003fc4) {
+					// Instruction: 5: 010111-1ssss0ddd0011111111---100 | Rdd = combine (#0, Rs) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003f46) {
+					// Instruction: 5: 010111-1ssss0ddd0011111101---110 | Rdd = combine (#0, Rs) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d003fc6) {
+					// Instruction: 5: 010111-1ssss0ddd0011111111---110 | Rdd = combine (#0, Rs) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; if (p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc4) == 0x5d003fc0) {
+					// Instruction: 5: 010111-1ssss0ddd0011111111---0-- | Rdd = combine (#0, Rs) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c083f40) {
+					// Instruction: 5: 010111-0-ii01ddd0011111101---0-- | Rdd = combine (#1, #u2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c083f00) {
+					// Instruction: 5: 010111-0-ii01ddd0011111100---0-- | Rdd = combine (#1, #u2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; deallocframe", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083f45) {
+					// Instruction: 5: 010111-0-ii01ddd0011111101---101 | Rdd = combine (#1, #u2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (! p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083fc5) {
+					// Instruction: 5: 010111-0-ii01ddd0011111111---101 | Rdd = combine (#1, #u2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083f47) {
+					// Instruction: 5: 010111-0-ii01ddd0011111101---111 | Rdd = combine (#1, #u2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083fc7) {
+					// Instruction: 5: 010111-0-ii01ddd0011111111---111 | Rdd = combine (#1, #u2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083f44) {
+					// Instruction: 5: 010111-0-ii01ddd0011111101---100 | Rdd = combine (#1, #u2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083fc4) {
+					// Instruction: 5: 010111-0-ii01ddd0011111111---100 | Rdd = combine (#1, #u2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083f46) {
+					// Instruction: 5: 010111-0-ii01ddd0011111101---110 | Rdd = combine (#1, #u2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c083fc6) {
+					// Instruction: 5: 010111-0-ii01ddd0011111111---110 | Rdd = combine (#1, #u2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c083fc0) {
+					// Instruction: 5: 010111-0-ii01ddd0011111111---0-- | Rdd = combine (#1, #u2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c103f40) {
+					// Instruction: 5: 010111-0-ii10ddd0011111101---0-- | Rdd = combine (#2, #u2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c103f00) {
+					// Instruction: 5: 010111-0-ii10ddd0011111100---0-- | Rdd = combine (#2, #u2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; deallocframe", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103f45) {
+					// Instruction: 5: 010111-0-ii10ddd0011111101---101 | Rdd = combine (#2, #u2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (! p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103fc5) {
+					// Instruction: 5: 010111-0-ii10ddd0011111111---101 | Rdd = combine (#2, #u2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103f47) {
+					// Instruction: 5: 010111-0-ii10ddd0011111101---111 | Rdd = combine (#2, #u2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103fc7) {
+					// Instruction: 5: 010111-0-ii10ddd0011111111---111 | Rdd = combine (#2, #u2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103f44) {
+					// Instruction: 5: 010111-0-ii10ddd0011111101---100 | Rdd = combine (#2, #u2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103fc4) {
+					// Instruction: 5: 010111-0-ii10ddd0011111111---100 | Rdd = combine (#2, #u2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103f46) {
+					// Instruction: 5: 010111-0-ii10ddd0011111101---110 | Rdd = combine (#2, #u2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c103fc6) {
+					// Instruction: 5: 010111-0-ii10ddd0011111111---110 | Rdd = combine (#2, #u2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c103fc0) {
+					// Instruction: 5: 010111-0-ii10ddd0011111111---0-- | Rdd = combine (#2, #u2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c183f40) {
+					// Instruction: 5: 010111-0-ii11ddd0011111101---0-- | Rdd = combine (#3, #u2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c183f00) {
+					// Instruction: 5: 010111-0-ii11ddd0011111100---0-- | Rdd = combine (#3, #u2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; deallocframe", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183f45) {
+					// Instruction: 5: 010111-0-ii11ddd0011111101---101 | Rdd = combine (#3, #u2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (! p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183fc5) {
+					// Instruction: 5: 010111-0-ii11ddd0011111111---101 | Rdd = combine (#3, #u2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183f47) {
+					// Instruction: 5: 010111-0-ii11ddd0011111101---111 | Rdd = combine (#3, #u2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183fc7) {
+					// Instruction: 5: 010111-0-ii11ddd0011111111---111 | Rdd = combine (#3, #u2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183f44) {
+					// Instruction: 5: 010111-0-ii11ddd0011111101---100 | Rdd = combine (#3, #u2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183fc4) {
+					// Instruction: 5: 010111-0-ii11ddd0011111111---100 | Rdd = combine (#3, #u2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183f46) {
+					// Instruction: 5: 010111-0-ii11ddd0011111101---110 | Rdd = combine (#3, #u2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc7) == 0x5c183fc6) {
+					// Instruction: 5: 010111-0-ii11ddd0011111111---110 | Rdd = combine (#3, #u2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ffc4) == 0x5c183fc0) {
+					// Instruction: 5: 010111-0-ii11ddd0011111111---0-- | Rdd = combine (#3, #u2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc4) == 0x5d083f40) {
+					// Instruction: 5: 010111-1ssss1ddd0011111101---0-- | Rdd = combine (Rs, #0) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc4) == 0x5d083f00) {
+					// Instruction: 5: 010111-1ssss1ddd0011111100---0-- | Rdd = combine (Rs, #0) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; deallocframe", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083f45) {
+					// Instruction: 5: 010111-1ssss1ddd0011111101---101 | Rdd = combine (Rs, #0) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (! p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083fc5) {
+					// Instruction: 5: 010111-1ssss1ddd0011111111---101 | Rdd = combine (Rs, #0) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (! p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083f47) {
+					// Instruction: 5: 010111-1ssss1ddd0011111101---111 | Rdd = combine (Rs, #0) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (! p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083fc7) {
+					// Instruction: 5: 010111-1ssss1ddd0011111111---111 | Rdd = combine (Rs, #0) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083f44) {
+					// Instruction: 5: 010111-1ssss1ddd0011111101---100 | Rdd = combine (Rs, #0) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (p0) dealloc_return", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083fc4) {
+					// Instruction: 5: 010111-1ssss1ddd0011111111---100 | Rdd = combine (Rs, #0) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (p0) jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083f46) {
+					// Instruction: 5: 010111-1ssss1ddd0011111101---110 | Rdd = combine (Rs, #0) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (p0.new) dealloc_return:nt", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc7) == 0x5d083fc6) {
+					// Instruction: 5: 010111-1ssss1ddd0011111111---110 | Rdd = combine (Rs, #0) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; if (p0.new) jumpr:nt Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ffc4) == 0x5d083fc0) {
+					// Instruction: 5: 010111-1ssss1ddd0011111111---0-- | Rdd = combine (Rs, #0) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; jumpr Lr", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40f800) == 0x5a003000) {
+					// Instruction: 5: 0101101--0--eeee00110iiissssdddd | Re = #-1 ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RD___MEMB__RS____U3_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40f800) == 0x5a002000) {
+					// Instruction: 5: 0101101--0--eeee00100iiissssdddd | Re = #-1 ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RD___MEMH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40f800) == 0x5a002800) {
+					// Instruction: 5: 0101101--0--eeee00101iiissssdddd | Re = #-1 ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RD___MEMUH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe00) == 0x5a003c00) {
+					// Instruction: 5: 0101101--0--eeee0011110iiiiidddd | Re = #-1 ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RD___MEMW__SP____U5_2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40ff00) == 0x5a003e00) {
+					// Instruction: 5: 0101101--0--eeee00111110iiiiiddd | Re = #-1 ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE_____1___RDD___MEMD__SP____U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x48003000) {
+					// Instruction: 5: 010010IIIIIIeeee00110iiissssdddd | Re = #U6 ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x48002000) {
+					// Instruction: 5: 010010IIIIIIeeee00100iiissssdddd | Re = #U6 ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x48002800) {
+					// Instruction: 5: 010010IIIIIIeeee00101iiissssdddd | Re = #U6 ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x48003c00) {
+					// Instruction: 5: 010010IIIIIIeeee0011110iiiiidddd | Re = #U6 ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x48003e00) {
+					// Instruction: 5: 010010IIIIIIeeee00111110iiiiiddd | Re = #U6 ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE____U6___RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x50003c00) {
+					// Instruction: 5: 01010000sssseeee0011110iiiiidddd | Re = Rs ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x50003e00) {
+					// Instruction: 5: 01010000sssseeee00111110iiiiiddd | Re = Rs ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___RS___RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x50003000) {
+					// Instruction: 5: 01010000uuuueeee00110iiissssdddd | Re = Ru ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x50002000) {
+					// Instruction: 5: 01010000uuuueeee00100iiissssdddd | Re = Ru ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x50002800) {
+					// Instruction: 5: 01010000uuuueeee00101iiissssdddd | Re = Ru ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___RU___RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x53003c00) {
+					// Instruction: 5: 01010011sssseeee0011110iiiiidddd | Re = add (Rs, #-1) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x53003e00) {
+					// Instruction: 5: 01010011sssseeee00111110iiiiiddd | Re = add (Rs, #-1) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x51003c00) {
+					// Instruction: 5: 01010001sssseeee0011110iiiiidddd | Re = add (Rs, #1) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x51003e00) {
+					// Instruction: 5: 01010001sssseeee00111110iiiiiddd | Re = add (Rs, #1) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x53003000) {
+					// Instruction: 5: 01010011uuuueeee00110iiissssdddd | Re = add (Ru, #-1) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x53002000) {
+					// Instruction: 5: 01010011uuuueeee00100iiissssdddd | Re = add (Ru, #-1) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x53002800) {
+					// Instruction: 5: 01010011uuuueeee00101iiissssdddd | Re = add (Ru, #-1) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x51003000) {
+					// Instruction: 5: 01010001uuuueeee00110iiissssdddd | Re = add (Ru, #1) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x51002000) {
+					// Instruction: 5: 01010001uuuueeee00100iiissssdddd | Re = add (Ru, #1) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x51002800) {
+					// Instruction: 5: 01010001uuuueeee00101iiissssdddd | Re = add (Ru, #1) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x4c003000) {
+					// Instruction: 5: 010011IIIIIIeeee00110iiissssdddd | Re = add (Sp, #U6:2) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x4c002000) {
+					// Instruction: 5: 010011IIIIIIeeee00100iiissssdddd | Re = add (Sp, #U6:2) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x4c002800) {
+					// Instruction: 5: 010011IIIIIIeeee00101iiissssdddd | Re = add (Sp, #U6:2) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x4c003c00) {
+					// Instruction: 5: 010011IIIIIIeeee0011110iiiiidddd | Re = add (Sp, #U6:2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x4c003e00) {
+					// Instruction: 5: 010011IIIIIIeeee00111110iiiiiddd | Re = add (Sp, #U6:2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x52003c00) {
+					// Instruction: 5: 01010010sssseeee0011110iiiiidddd | Re = and (Rs, #1) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x52003e00) {
+					// Instruction: 5: 01010010sssseeee00111110iiiiiddd | Re = and (Rs, #1) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___1____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x57003c00) {
+					// Instruction: 5: 01010111sssseeee0011110iiiiidddd | Re = and (Rs, #255) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x57003e00) {
+					// Instruction: 5: 01010111sssseeee00111110iiiiiddd | Re = and (Rs, #255) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RS___255____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x52003000) {
+					// Instruction: 5: 01010010uuuueeee00110iiissssdddd | Re = and (Ru, #1) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x52002000) {
+					// Instruction: 5: 01010010uuuueeee00100iiissssdddd | Re = and (Ru, #1) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x52002800) {
+					// Instruction: 5: 01010010uuuueeee00101iiissssdddd | Re = and (Ru, #1) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x57003000) {
+					// Instruction: 5: 01010111uuuueeee00110iiissssdddd | Re = and (Ru, #255) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x57002000) {
+					// Instruction: 5: 01010111uuuueeee00100iiissssdddd | Re = and (Ru, #255) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x57002800) {
+					// Instruction: 5: 01010111uuuueeee00101iiissssdddd | Re = and (Ru, #255) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x55003c00) {
+					// Instruction: 5: 01010101sssseeee0011110iiiiidddd | Re = sxtb (Rs) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x55003e00) {
+					// Instruction: 5: 01010101sssseeee00111110iiiiiddd | Re = sxtb (Rs) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RS____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x55003000) {
+					// Instruction: 5: 01010101uuuueeee00110iiissssdddd | Re = sxtb (Ru) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x55002000) {
+					// Instruction: 5: 01010101uuuueeee00100iiissssdddd | Re = sxtb (Ru) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x55002800) {
+					// Instruction: 5: 01010101uuuueeee00101iiissssdddd | Re = sxtb (Ru) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x54003c00) {
+					// Instruction: 5: 01010100sssseeee0011110iiiiidddd | Re = sxth (Rs) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x54003e00) {
+					// Instruction: 5: 01010100sssseeee00111110iiiiiddd | Re = sxth (Rs) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RS____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x54003000) {
+					// Instruction: 5: 01010100uuuueeee00110iiissssdddd | Re = sxth (Ru) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x54002000) {
+					// Instruction: 5: 01010100uuuueeee00100iiissssdddd | Re = sxth (Ru) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x54002800) {
+					// Instruction: 5: 01010100uuuueeee00101iiissssdddd | Re = sxth (Ru) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x56003c00) {
+					// Instruction: 5: 01010110sssseeee0011110iiiiidddd | Re = zxth (Rs) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x56003e00) {
+					// Instruction: 5: 01010110sssseeee00111110iiiiiddd | Re = zxth (Rs) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x56003000) {
+					// Instruction: 5: 01010110uuuueeee00110iiissssdddd | Re = zxth (Ru) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x56002000) {
+					// Instruction: 5: 01010110uuuueeee00100iiissssdddd | Re = zxth (Ru) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x56002800) {
+					// Instruction: 5: 01010110uuuueeee00101iiissssdddd | Re = zxth (Ru) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c003000) {
+					// Instruction: 5: 010111-0-II00eee00110iiissssdddd | Ree = combine (#0, #U2) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c002000) {
+					// Instruction: 5: 010111-0-II00eee00100iiissssdddd | Ree = combine (#0, #U2) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c002800) {
+					// Instruction: 5: 010111-0-II00eee00101iiissssdddd | Ree = combine (#0, #U2) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x5c003c00) {
+					// Instruction: 5: 010111-0-II00eee0011110iiiiidddd | Ree = combine (#0, #U2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x5c003e00) {
+					// Instruction: 5: 010111-0-II00eee00111110iiiiiddd | Ree = combine (#0, #U2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x5d003c00) {
+					// Instruction: 5: 010111-1ssss0eee0011110iiiiidddd | Ree = combine (#0, Rs) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RS____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = memw (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x5d003e00) {
+					// Instruction: 5: 010111-1ssss0eee00111110iiiiiddd | Ree = combine (#0, Rs) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RS____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = memd (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x5d003000) {
+					// Instruction: 5: 010111-1uuuu0eee00110iiissssdddd | Ree = combine (#0, Ru) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = memb (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x5d002000) {
+					// Instruction: 5: 010111-1uuuu0eee00100iiissssdddd | Ree = combine (#0, Ru) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = memh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x5d002800) {
+					// Instruction: 5: 010111-1uuuu0eee00101iiissssdddd | Ree = combine (#0, Ru) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; %s = memuh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c083000) {
+					// Instruction: 5: 010111-0-II01eee00110iiissssdddd | Ree = combine (#1, #U2) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c082000) {
+					// Instruction: 5: 010111-0-II01eee00100iiissssdddd | Ree = combine (#1, #U2) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c082800) {
+					// Instruction: 5: 010111-0-II01eee00101iiissssdddd | Ree = combine (#1, #U2) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x5c083c00) {
+					// Instruction: 5: 010111-0-II01eee0011110iiiiidddd | Ree = combine (#1, #U2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x5c083e00) {
+					// Instruction: 5: 010111-0-II01eee00111110iiiiiddd | Ree = combine (#1, #U2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c103000) {
+					// Instruction: 5: 010111-0-II10eee00110iiissssdddd | Ree = combine (#2, #U2) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c102000) {
+					// Instruction: 5: 010111-0-II10eee00100iiissssdddd | Ree = combine (#2, #U2) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c102800) {
+					// Instruction: 5: 010111-0-II10eee00101iiissssdddd | Ree = combine (#2, #U2) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x5c103c00) {
+					// Instruction: 5: 010111-0-II10eee0011110iiiiidddd | Ree = combine (#2, #U2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x5c103e00) {
+					// Instruction: 5: 010111-0-II10eee00111110iiiiiddd | Ree = combine (#2, #U2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c183000) {
+					// Instruction: 5: 010111-0-II11eee00110iiissssdddd | Ree = combine (#3, #U2) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c182000) {
+					// Instruction: 5: 010111-0-II11eee00100iiissssdddd | Ree = combine (#3, #U2) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x5c182800) {
+					// Instruction: 5: 010111-0-II11eee00101iiissssdddd | Ree = combine (#3, #U2) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x5c183c00) {
+					// Instruction: 5: 010111-0-II11eee0011110iiiiidddd | Ree = combine (#3, #U2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x5c183e00) {
+					// Instruction: 5: 010111-0-II11eee00111110iiiiiddd | Ree = combine (#3, #U2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x5d083c00) {
+					// Instruction: 5: 010111-1ssss1eee0011110iiiiidddd | Ree = combine (Rs, #0) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RS___0____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = memw (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x5d083e00) {
+					// Instruction: 5: 010111-1ssss1eee00111110iiiiiddd | Ree = combine (Rs, #0) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RS___0____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = memd (Sp + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x5d083000) {
+					// Instruction: 5: 010111-1uuuu1eee00110iiissssdddd | Ree = combine (Ru, #0) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = memb (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x5d082000) {
+					// Instruction: 5: 010111-1uuuu1eee00100iiissssdddd | Ree = combine (Ru, #0) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = memh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x5d082800) {
+					// Instruction: 5: 010111-1uuuu1eee00101iiissssdddd | Ree = combine (Ru, #0) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; %s = memuh (%s + 0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x58003c00) {
+					// Instruction: 5: 01011000ssssxxxx0011110iiiiidddd | Rx = add (Rs, Rx) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x58003e00) {
+					// Instruction: 5: 01011000ssssxxxx00111110iiiiiddd | Rx = add (Rs, Rx) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x58003f40) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---0-- | Rx = add (Rs, Rx) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x58003f00) {
+					// Instruction: 5: 01011000ssssxxxx0011111100---0-- | Rx = add (Rs, Rx) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f45) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---101 | Rx = add (Rs, Rx) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc5) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---101 | Rx = add (Rs, Rx) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f47) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---111 | Rx = add (Rs, Rx) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc7) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---111 | Rx = add (Rs, Rx) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f44) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---100 | Rx = add (Rs, Rx) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc4) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---100 | Rx = add (Rs, Rx) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f46) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---110 | Rx = add (Rs, Rx) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc6) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---110 | Rx = add (Rs, Rx) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x58003fc0) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---0-- | Rx = add (Rs, Rx) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x58003000) {
+					// Instruction: 5: 01011000uuuuxxxx00110iiissssdddd | Rx = add (Ru, Rx) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x58002000) {
+					// Instruction: 5: 01011000uuuuxxxx00100iiissssdddd | Rx = add (Ru, Rx) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x58002800) {
+					// Instruction: 5: 01011000uuuuxxxx00101iiissssdddd | Rx = add (Ru, Rx) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x40003000) {
+					// Instruction: 5: 01000IIIIIIIxxxx00110iiissssdddd | Rx = add (Rx, #S7) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x40002000) {
+					// Instruction: 5: 01000IIIIIIIxxxx00100iiissssdddd | Rx = add (Rx, #S7) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x40002800) {
+					// Instruction: 5: 01000IIIIIIIxxxx00101iiissssdddd | Rx = add (Rx, #S7) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0x40003c00) {
+					// Instruction: 5: 01000IIIIIIIxxxx0011110iiiiidddd | Rx = add (Rx, #S7) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x40003e00) {
+					// Instruction: 5: 01000IIIIIIIxxxx00111110iiiiiddd | Rx = add (Rx, #S7) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x40003f40) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111101---0-- | Rx = add (Rx, #s7) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x40003f00) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111100---0-- | Rx = add (Rx, #s7) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003f45) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111101---101 | Rx = add (Rx, #s7) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003fc5) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111111---101 | Rx = add (Rx, #s7) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003f47) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111101---111 | Rx = add (Rx, #s7) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003fc7) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111111---111 | Rx = add (Rx, #s7) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003f44) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111101---100 | Rx = add (Rx, #s7) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003fc4) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111111---100 | Rx = add (Rx, #s7) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003f46) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111101---110 | Rx = add (Rx, #s7) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc7) == 0x40003fc6) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111111---110 | Rx = add (Rx, #s7) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ffc4) == 0x40003fc0) {
+					// Instruction: 5: 01000iiiiiiixxxx0011111111---0-- | Rx = add (Rx, #s7) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x58003c00) {
+					// Instruction: 5: 01011000ssssxxxx0011110iiiiidddd | Rx = add (Rx, Rs) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x58003e00) {
+					// Instruction: 5: 01011000ssssxxxx00111110iiiiiddd | Rx = add (Rx, Rs) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x58003f40) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---0-- | Rx = add (Rx, Rs) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x58003f00) {
+					// Instruction: 5: 01011000ssssxxxx0011111100---0-- | Rx = add (Rx, Rs) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f45) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---101 | Rx = add (Rx, Rs) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc5) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---101 | Rx = add (Rx, Rs) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f47) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---111 | Rx = add (Rx, Rs) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc7) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---111 | Rx = add (Rx, Rs) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f44) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---100 | Rx = add (Rx, Rs) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc4) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---100 | Rx = add (Rx, Rs) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003f46) {
+					// Instruction: 5: 01011000ssssxxxx0011111101---110 | Rx = add (Rx, Rs) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x58003fc6) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---110 | Rx = add (Rx, Rs) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x58003fc0) {
+					// Instruction: 5: 01011000ssssxxxx0011111111---0-- | Rx = add (Rx, Rs) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x58003000) {
+					// Instruction: 5: 01011000uuuuxxxx00110iiissssdddd | Rx = add (Rx, Ru) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x58002000) {
+					// Instruction: 5: 01011000uuuuxxxx00100iiissssdddd | Rx = add (Rx, Ru) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x58002800) {
+					// Instruction: 5: 01011000uuuuxxxx00101iiissssdddd | Rx = add (Rx, Ru) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a703f40) {
+					// Instruction: 5: 0101101--111dddd0011111101---0-- | if (! p0) Rd = #0 ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a703f00) {
+					// Instruction: 5: 0101101--111dddd0011111100---0-- | if (! p0) Rd = #0 ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___DEALLOCFRAME;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703f45) {
+					// Instruction: 5: 0101101--111dddd0011111101---101 | if (! p0) Rd = #0 ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703fc5) {
+					// Instruction: 5: 0101101--111dddd0011111111---101 | if (! p0) Rd = #0 ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703f47) {
+					// Instruction: 5: 0101101--111dddd0011111101---111 | if (! p0) Rd = #0 ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703fc7) {
+					// Instruction: 5: 0101101--111dddd0011111111---111 | if (! p0) Rd = #0 ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703f44) {
+					// Instruction: 5: 0101101--111dddd0011111101---100 | if (! p0) Rd = #0 ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703fc4) {
+					// Instruction: 5: 0101101--111dddd0011111111---100 | if (! p0) Rd = #0 ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703f46) {
+					// Instruction: 5: 0101101--111dddd0011111101---110 | if (! p0) Rd = #0 ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a703fc6) {
+					// Instruction: 5: 0101101--111dddd0011111111---110 | if (! p0) Rd = #0 ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a703fc0) {
+					// Instruction: 5: 0101101--111dddd0011111111---0-- | if (! p0) Rd = #0 ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a703000) {
+					// Instruction: 5: 0101101--111eeee00110iiissssdddd | if (! p0) Re = #0 ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMB__RS____U3_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a702000) {
+					// Instruction: 5: 0101101--111eeee00100iiissssdddd | if (! p0) Re = #0 ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a702800) {
+					// Instruction: 5: 0101101--111eeee00101iiissssdddd | if (! p0) Re = #0 ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMUH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x5a703c00) {
+					// Instruction: 5: 0101101--111eeee0011110iiiiidddd | if (! p0) Re = #0 ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMW__SP____U5_2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x5a703e00) {
+					// Instruction: 5: 0101101--111eeee00111110iiiiiddd | if (! p0) Re = #0 ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___MEMD__SP____U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a503f40) {
+					// Instruction: 5: 0101101--101dddd0011111101---0-- | if (! p0.new) Rd = #0 ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a503f00) {
+					// Instruction: 5: 0101101--101dddd0011111100---0-- | if (! p0.new) Rd = #0 ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___DEALLOCFRAME;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503f45) {
+					// Instruction: 5: 0101101--101dddd0011111101---101 | if (! p0.new) Rd = #0 ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503fc5) {
+					// Instruction: 5: 0101101--101dddd0011111111---101 | if (! p0.new) Rd = #0 ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503f47) {
+					// Instruction: 5: 0101101--101dddd0011111101---111 | if (! p0.new) Rd = #0 ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503fc7) {
+					// Instruction: 5: 0101101--101dddd0011111111---111 | if (! p0.new) Rd = #0 ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503f44) {
+					// Instruction: 5: 0101101--101dddd0011111101---100 | if (! p0.new) Rd = #0 ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503fc4) {
+					// Instruction: 5: 0101101--101dddd0011111111---100 | if (! p0.new) Rd = #0 ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503f46) {
+					// Instruction: 5: 0101101--101dddd0011111101---110 | if (! p0.new) Rd = #0 ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a503fc6) {
+					// Instruction: 5: 0101101--101dddd0011111111---110 | if (! p0.new) Rd = #0 ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a503fc0) {
+					// Instruction: 5: 0101101--101dddd0011111111---0-- | if (! p0.new) Rd = #0 ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a503000) {
+					// Instruction: 5: 0101101--101eeee00110iiissssdddd | if (! p0.new) Re = #0 ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMB__RS____U3_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a502000) {
+					// Instruction: 5: 0101101--101eeee00100iiissssdddd | if (! p0.new) Re = #0 ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a502800) {
+					// Instruction: 5: 0101101--101eeee00101iiissssdddd | if (! p0.new) Re = #0 ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMUH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x5a503c00) {
+					// Instruction: 5: 0101101--101eeee0011110iiiiidddd | if (! p0.new) Re = #0 ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMW__SP____U5_2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x5a503e00) {
+					// Instruction: 5: 0101101--101eeee00111110iiiiiddd | if (! p0.new) Re = #0 ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___MEMD__SP____U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a603f40) {
+					// Instruction: 5: 0101101--110dddd0011111101---0-- | if (p0) Rd = #0 ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a603f00) {
+					// Instruction: 5: 0101101--110dddd0011111100---0-- | if (p0) Rd = #0 ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___DEALLOCFRAME;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603f45) {
+					// Instruction: 5: 0101101--110dddd0011111101---101 | if (p0) Rd = #0 ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603fc5) {
+					// Instruction: 5: 0101101--110dddd0011111111---101 | if (p0) Rd = #0 ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603f47) {
+					// Instruction: 5: 0101101--110dddd0011111101---111 | if (p0) Rd = #0 ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603fc7) {
+					// Instruction: 5: 0101101--110dddd0011111111---111 | if (p0) Rd = #0 ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603f44) {
+					// Instruction: 5: 0101101--110dddd0011111101---100 | if (p0) Rd = #0 ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603fc4) {
+					// Instruction: 5: 0101101--110dddd0011111111---100 | if (p0) Rd = #0 ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603f46) {
+					// Instruction: 5: 0101101--110dddd0011111101---110 | if (p0) Rd = #0 ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a603fc6) {
+					// Instruction: 5: 0101101--110dddd0011111111---110 | if (p0) Rd = #0 ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a603fc0) {
+					// Instruction: 5: 0101101--110dddd0011111111---0-- | if (p0) Rd = #0 ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a603000) {
+					// Instruction: 5: 0101101--110eeee00110iiissssdddd | if (p0) Re = #0 ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMB__RS____U3_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a602000) {
+					// Instruction: 5: 0101101--110eeee00100iiissssdddd | if (p0) Re = #0 ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a602800) {
+					// Instruction: 5: 0101101--110eeee00101iiissssdddd | if (p0) Re = #0 ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMUH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x5a603c00) {
+					// Instruction: 5: 0101101--110eeee0011110iiiiidddd | if (p0) Re = #0 ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMW__SP____U5_2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x5a603e00) {
+					// Instruction: 5: 0101101--110eeee00111110iiiiiddd | if (p0) Re = #0 ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RE____0___RDD___MEMD__SP____U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a403f40) {
+					// Instruction: 5: 0101101--100dddd0011111101---0-- | if (p0.new) Rd = #0 ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a403f00) {
+					// Instruction: 5: 0101101--100dddd0011111100---0-- | if (p0.new) Rd = #0 ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___DEALLOCFRAME;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403f45) {
+					// Instruction: 5: 0101101--100dddd0011111101---101 | if (p0.new) Rd = #0 ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403fc5) {
+					// Instruction: 5: 0101101--100dddd0011111111---101 | if (p0.new) Rd = #0 ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403f47) {
+					// Instruction: 5: 0101101--100dddd0011111101---111 | if (p0.new) Rd = #0 ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403fc7) {
+					// Instruction: 5: 0101101--100dddd0011111111---111 | if (p0.new) Rd = #0 ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403f44) {
+					// Instruction: 5: 0101101--100dddd0011111101---100 | if (p0.new) Rd = #0 ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403fc4) {
+					// Instruction: 5: 0101101--100dddd0011111111---100 | if (p0.new) Rd = #0 ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0__JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403f46) {
+					// Instruction: 5: 0101101--100dddd0011111101---110 | if (p0.new) Rd = #0 ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc7) == 0x5a403fc6) {
+					// Instruction: 5: 0101101--100dddd0011111111---110 | if (p0.new) Rd = #0 ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ffc4) == 0x5a403fc0) {
+					// Instruction: 5: 0101101--100dddd0011111111---0-- | if (p0.new) Rd = #0 ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___JUMPR_LR;
+					hi->op_count = 1;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a403000) {
+					// Instruction: 5: 0101101--100eeee00110iiissssdddd | if (p0.new) Re = #0 ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMB__RS____U3_0_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a402000) {
+					// Instruction: 5: 0101101--100eeee00100iiissssdddd | if (p0.new) Re = #0 ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x5a402800) {
+					// Instruction: 5: 0101101--100eeee00101iiissssdddd | if (p0.new) Re = #0 ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMUH__RS____U3_1_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x5a403c00) {
+					// Instruction: 5: 0101101--100eeee0011110iiiiidddd | if (p0.new) Re = #0 ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMW__SP____U5_2_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x5a403e00) {
+					// Instruction: 5: 0101101--100eeee00111110iiiiiddd | if (p0.new) Re = #0 ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___MEMD__SP____U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x59003c00) {
+					// Instruction: 5: 01011001ssss--II0011110iiiiidddd | p0 = cmp.eq (Rs, #U2) ; Rd = memw (Sp + #u5:2)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RD___MEMW__SP____U5_2_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = memw (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x59003e00) {
+					// Instruction: 5: 01011001ssss--II00111110iiiiiddd | p0 = cmp.eq (Rs, #U2) ; Rdd = memd (Sp + #u5:3)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___MEMD__SP____U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf8) >> 3) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = memd (Sp + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x59003f40) {
+					// Instruction: 5: 01011001ssss--ii0011111101---0-- | p0 = cmp.eq (Rs, #u2) ; dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x59003f00) {
+					// Instruction: 5: 01011001ssss--ii0011111100---0-- | p0 = cmp.eq (Rs, #u2) ; deallocframe
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____DEALLOCFRAME;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; deallocframe", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003f45) {
+					// Instruction: 5: 01011001ssss--ii0011111101---101 | p0 = cmp.eq (Rs, #u2) ; if (! p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (! p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003fc5) {
+					// Instruction: 5: 01011001ssss--ii0011111111---101 | p0 = cmp.eq (Rs, #u2) ; if (! p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (! p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003f47) {
+					// Instruction: 5: 01011001ssss--ii0011111101---111 | p0 = cmp.eq (Rs, #u2) ; if (! p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (! p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003fc7) {
+					// Instruction: 5: 01011001ssss--ii0011111111---111 | p0 = cmp.eq (Rs, #u2) ; if (! p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (! p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003f44) {
+					// Instruction: 5: 01011001ssss--ii0011111101---100 | p0 = cmp.eq (Rs, #u2) ; if (p0) dealloc_return
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0__DEALLOC_RETURN;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (p0) dealloc_return", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003fc4) {
+					// Instruction: 5: 01011001ssss--ii0011111111---100 | p0 = cmp.eq (Rs, #u2) ; if (p0) jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0__JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (p0) jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003f46) {
+					// Instruction: 5: 01011001ssss--ii0011111101---110 | p0 = cmp.eq (Rs, #u2) ; if (p0.new) dealloc_return:nt
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (p0.new) dealloc_return:nt", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc7) == 0x59003fc6) {
+					// Instruction: 5: 01011001ssss--ii0011111111---110 | p0 = cmp.eq (Rs, #u2) ; if (p0.new) jumpr:nt Lr
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0_NEW__JUMPR_NT_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; if (p0.new) jumpr:nt Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ffc4) == 0x59003fc0) {
+					// Instruction: 5: 01011001ssss--ii0011111111---0-- | p0 = cmp.eq (Rs, #u2) ; jumpr Lr
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____JUMPR_LR;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; jumpr Lr", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x59003000) {
+					// Instruction: 5: 01011001uuuu--II00110iiissssdddd | p0 = cmp.eq (Ru, #U2) ; Rd = memb (Rs + #u3:0)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMB__RS____U3_0_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = memb (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x59002000) {
+					// Instruction: 5: 01011001uuuu--II00100iiissssdddd | p0 = cmp.eq (Ru, #U2) ; Rd = memh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = memh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x59002800) {
+					// Instruction: 5: 01011001uuuu--II00101iiissssdddd | p0 = cmp.eq (Ru, #U2) ; Rd = memuh (Rs + #u3:1)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMUH__RS____U3_1_;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rd
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; %s = memuh (%s + 0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x6: {
+				if ((hi_u32 & 0xfe40f000) == 0x7a001000) {
+					// Instruction: 6: 0111101--0--dddd0001iiiisssstttt | Rd = #-1 ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMB__RS____U4_0____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40f000) == 0x7a000000) {
+					// Instruction: 6: 0111101--0--dddd0000iiiisssstttt | Rd = #-1 ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMW__RS____U4_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x68001000) {
+					// Instruction: 6: 011010IIIIIIdddd0001iiiisssstttt | Rd = #U6 ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x68000000) {
+					// Instruction: 6: 011010IIIIIIdddd0000iiiisssstttt | Rd = #U6 ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x70001000) {
+					// Instruction: 6: 01110000uuuudddd0001iiiisssstttt | Rd = Ru ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x70000000) {
+					// Instruction: 6: 01110000uuuudddd0000iiiisssstttt | Rd = Ru ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x73001000) {
+					// Instruction: 6: 01110011uuuudddd0001iiiisssstttt | Rd = add (Ru, #-1) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x73000000) {
+					// Instruction: 6: 01110011uuuudddd0000iiiisssstttt | Rd = add (Ru, #-1) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x71001000) {
+					// Instruction: 6: 01110001uuuudddd0001iiiisssstttt | Rd = add (Ru, #1) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x71000000) {
+					// Instruction: 6: 01110001uuuudddd0000iiiisssstttt | Rd = add (Ru, #1) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x6c001000) {
+					// Instruction: 6: 011011IIIIIIdddd0001iiiisssstttt | Rd = add (Sp, #U6:2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00f000) == 0x6c000000) {
+					// Instruction: 6: 011011IIIIIIdddd0000iiiisssstttt | Rd = add (Sp, #U6:2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x72001000) {
+					// Instruction: 6: 01110010uuuudddd0001iiiisssstttt | Rd = and (Ru, #1) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x72000000) {
+					// Instruction: 6: 01110010uuuudddd0000iiiisssstttt | Rd = and (Ru, #1) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x77001000) {
+					// Instruction: 6: 01110111uuuudddd0001iiiisssstttt | Rd = and (Ru, #255) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x77000000) {
+					// Instruction: 6: 01110111uuuudddd0000iiiisssstttt | Rd = and (Ru, #255) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x75001000) {
+					// Instruction: 6: 01110101uuuudddd0001iiiisssstttt | Rd = sxtb (Ru) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x75000000) {
+					// Instruction: 6: 01110101uuuudddd0000iiiisssstttt | Rd = sxtb (Ru) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x74001000) {
+					// Instruction: 6: 01110100uuuudddd0001iiiisssstttt | Rd = sxth (Ru) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x74000000) {
+					// Instruction: 6: 01110100uuuudddd0000iiiisssstttt | Rd = sxth (Ru) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x76001000) {
+					// Instruction: 6: 01110110uuuudddd0001iiiisssstttt | Rd = zxth (Ru) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x76000000) {
+					// Instruction: 6: 01110110uuuudddd0000iiiisssstttt | Rd = zxth (Ru) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c001000) {
+					// Instruction: 6: 011111-0-II00ddd0001iiiisssstttt | Rdd = combine (#0, #U2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c000000) {
+					// Instruction: 6: 011111-0-II00ddd0000iiiisssstttt | Rdd = combine (#0, #U2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x7d001000) {
+					// Instruction: 6: 011111-1uuuu0ddd0001iiiisssstttt | Rdd = combine (#0, Ru) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memb (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x7d000000) {
+					// Instruction: 6: 011111-1uuuu0ddd0000iiiisssstttt | Rdd = combine (#0, Ru) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memw (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c081000) {
+					// Instruction: 6: 011111-0-II01ddd0001iiiisssstttt | Rdd = combine (#1, #U2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c080000) {
+					// Instruction: 6: 011111-0-II01ddd0000iiiisssstttt | Rdd = combine (#1, #U2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c101000) {
+					// Instruction: 6: 011111-0-II10ddd0001iiiisssstttt | Rdd = combine (#2, #U2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c100000) {
+					// Instruction: 6: 011111-0-II10ddd0000iiiisssstttt | Rdd = combine (#2, #U2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c181000) {
+					// Instruction: 6: 011111-0-II11ddd0001iiiisssstttt | Rdd = combine (#3, #U2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f000) == 0x7c180000) {
+					// Instruction: 6: 011111-0-II11ddd0000iiiisssstttt | Rdd = combine (#3, #U2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x7d081000) {
+					// Instruction: 6: 011111-1uuuu1ddd0001iiiisssstttt | Rdd = combine (Ru, #0) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memb (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08f000) == 0x7d080000) {
+					// Instruction: 6: 011111-1uuuu1ddd0000iiiisssstttt | Rdd = combine (Ru, #0) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memw (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x78001000) {
+					// Instruction: 6: 01111000uuuuxxxx0001iiiisssstttt | Rx = add (Ru, Rx) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x78000000) {
+					// Instruction: 6: 01111000uuuuxxxx0000iiiisssstttt | Rx = add (Ru, Rx) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x60001000) {
+					// Instruction: 6: 01100IIIIIIIxxxx0001iiiisssstttt | Rx = add (Rx, #S7) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x60000000) {
+					// Instruction: 6: 01100IIIIIIIxxxx0000iiiisssstttt | Rx = add (Rx, #S7) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x78001000) {
+					// Instruction: 6: 01111000uuuuxxxx0001iiiisssstttt | Rx = add (Rx, Ru) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x78000000) {
+					// Instruction: 6: 01111000uuuuxxxx0000iiiisssstttt | Rx = add (Rx, Ru) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a701000) {
+					// Instruction: 6: 0111101--111dddd0001iiiisssstttt | if (! p0) Rd = #0 ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMB__RS____U4_0____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a700000) {
+					// Instruction: 6: 0111101--111dddd0000iiiisssstttt | if (! p0) Rd = #0 ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__RS____U4_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a501000) {
+					// Instruction: 6: 0111101--101dddd0001iiiisssstttt | if (! p0.new) Rd = #0 ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMB__RS____U4_0____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a500000) {
+					// Instruction: 6: 0111101--101dddd0000iiiisssstttt | if (! p0.new) Rd = #0 ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__RS____U4_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a601000) {
+					// Instruction: 6: 0111101--110dddd0001iiiisssstttt | if (p0) Rd = #0 ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMB__RS____U4_0____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a600000) {
+					// Instruction: 6: 0111101--110dddd0000iiiisssstttt | if (p0) Rd = #0 ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__RS____U4_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a401000) {
+					// Instruction: 6: 0111101--100dddd0001iiiisssstttt | if (p0.new) Rd = #0 ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMB__RS____U4_0____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f000) == 0x7a400000) {
+					// Instruction: 6: 0111101--100dddd0000iiiisssstttt | if (p0.new) Rd = #0 ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__RS____U4_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x79001000) {
+					// Instruction: 6: 01111001uuuu--II0001iiiisssstttt | p0 = cmp.eq (Ru, #U2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x79000000) {
+					// Instruction: 6: 01111001uuuu--II0000iiiisssstttt | p0 = cmp.eq (Ru, #U2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				break;
+			}
+			case 0x7: {
+				if ((hi_u32 & 0xfe40fe00) == 0x7a003c00) {
+					// Instruction: 7: 0111101--0--dddd0011110iiiii---- | Rd = #-1 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___ALLOCFRAME___U5_3_;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40ff00) == 0x7a003200) {
+					// Instruction: 7: 0111101--0--dddd00110010ssssiiii | Rd = #-1 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMB__RS____U4_0_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40ff00) == 0x7a003300) {
+					// Instruction: 7: 0111101--0--dddd00110011ssssiiii | Rd = #-1 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMB__RS____U4_0_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe00) == 0x7a002a00) {
+					// Instruction: 7: 0111101--0--dddd0010101iiiiiittt | Rd = #-1 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMD__SP____S6_3____RTT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40f800) == 0x7a002000) {
+					// Instruction: 7: 0111101--0--dddd00100iiisssstttt | Rd = #-1 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMH__RS____U3_1____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe40ff00) == 0x7a003000) {
+					// Instruction: 7: 0111101--0--dddd00110000ssssiiii | Rd = #-1 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMW__RS____U4_2_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40ff00) == 0x7a003100) {
+					// Instruction: 7: 0111101--0--dddd00110001ssssiiii | Rd = #-1 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMW__RS____U4_2_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe40fe00) == 0x7a002800) {
+					// Instruction: 7: 0111101--0--dddd0010100iiiiitttt | Rd = #-1 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD_____1___MEMW__SP____U5_2____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = #-1 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x68003c00) {
+					// Instruction: 7: 011010IIIIIIdddd0011110iiiii---- | Rd = #U6 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x68003200) {
+					// Instruction: 7: 011010IIIIIIdddd00110010ssssiiii | Rd = #U6 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x68003300) {
+					// Instruction: 7: 011010IIIIIIdddd00110011ssssiiii | Rd = #U6 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x68002a00) {
+					// Instruction: 7: 011010IIIIIIdddd0010101iiiiiittt | Rd = #U6 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x68002000) {
+					// Instruction: 7: 011010IIIIIIdddd00100iiisssstttt | Rd = #U6 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x68003000) {
+					// Instruction: 7: 011010IIIIIIdddd00110000ssssiiii | Rd = #U6 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x68003100) {
+					// Instruction: 7: 011010IIIIIIdddd00110001ssssiiii | Rd = #U6 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x68002800) {
+					// Instruction: 7: 011010IIIIIIdddd0010100iiiiitttt | Rd = #U6 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD____U6___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = 0x%x ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x70003c00) {
+					// Instruction: 7: 01110000ssssdddd0011110iiiii---- | Rd = Rs ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x70002a00) {
+					// Instruction: 7: 01110000ssssdddd0010101iiiiiittt | Rd = Rs ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x70002800) {
+					// Instruction: 7: 01110000ssssdddd0010100iiiiitttt | Rd = Rs ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___RS___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x70003200) {
+					// Instruction: 7: 01110000uuuudddd00110010ssssiiii | Rd = Ru ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x70003300) {
+					// Instruction: 7: 01110000uuuudddd00110011ssssiiii | Rd = Ru ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x70002000) {
+					// Instruction: 7: 01110000uuuudddd00100iiisssstttt | Rd = Ru ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x70003000) {
+					// Instruction: 7: 01110000uuuudddd00110000ssssiiii | Rd = Ru ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x70003100) {
+					// Instruction: 7: 01110000uuuudddd00110001ssssiiii | Rd = Ru ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___RU___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = %s ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x73003c00) {
+					// Instruction: 7: 01110011ssssdddd0011110iiiii---- | Rd = add (Rs, #-1) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x73002a00) {
+					// Instruction: 7: 01110011ssssdddd0010101iiiiiittt | Rd = add (Rs, #-1) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x73002800) {
+					// Instruction: 7: 01110011ssssdddd0010100iiiiitttt | Rd = add (Rs, #-1) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS____1____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x71003c00) {
+					// Instruction: 7: 01110001ssssdddd0011110iiiii---- | Rd = add (Rs, #1) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x71002a00) {
+					// Instruction: 7: 01110001ssssdddd0010101iiiiiittt | Rd = add (Rs, #1) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x71002800) {
+					// Instruction: 7: 01110001ssssdddd0010100iiiiitttt | Rd = add (Rs, #1) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RS___1____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x73003200) {
+					// Instruction: 7: 01110011uuuudddd00110010ssssiiii | Rd = add (Ru, #-1) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x73003300) {
+					// Instruction: 7: 01110011uuuudddd00110011ssssiiii | Rd = add (Ru, #-1) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x73002000) {
+					// Instruction: 7: 01110011uuuudddd00100iiisssstttt | Rd = add (Ru, #-1) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x73003000) {
+					// Instruction: 7: 01110011uuuudddd00110000ssssiiii | Rd = add (Ru, #-1) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x73003100) {
+					// Instruction: 7: 01110011uuuudddd00110001ssssiiii | Rd = add (Ru, #-1) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU____1____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #-1) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x71003200) {
+					// Instruction: 7: 01110001uuuudddd00110010ssssiiii | Rd = add (Ru, #1) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x71003300) {
+					// Instruction: 7: 01110001uuuudddd00110011ssssiiii | Rd = add (Ru, #1) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x71002000) {
+					// Instruction: 7: 01110001uuuudddd00100iiisssstttt | Rd = add (Ru, #1) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x71003000) {
+					// Instruction: 7: 01110001uuuudddd00110000ssssiiii | Rd = add (Ru, #1) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x71003100) {
+					// Instruction: 7: 01110001uuuudddd00110001ssssiiii | Rd = add (Ru, #1) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__RU___1____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, #1) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x6c003c00) {
+					// Instruction: 7: 011011IIIIIIdddd0011110iiiii---- | Rd = add (Sp, #U6:2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x6c003200) {
+					// Instruction: 7: 011011IIIIIIdddd00110010ssssiiii | Rd = add (Sp, #U6:2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x6c003300) {
+					// Instruction: 7: 011011IIIIIIdddd00110011ssssiiii | Rd = add (Sp, #U6:2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x6c002a00) {
+					// Instruction: 7: 011011IIIIIIdddd0010101iiiiiittt | Rd = add (Sp, #U6:2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00f800) == 0x6c002000) {
+					// Instruction: 7: 011011IIIIIIdddd00100iiisssstttt | Rd = add (Sp, #U6:2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x6c003000) {
+					// Instruction: 7: 011011IIIIIIdddd00110000ssssiiii | Rd = add (Sp, #U6:2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00ff00) == 0x6c003100) {
+					// Instruction: 7: 011011IIIIIIdddd00110001ssssiiii | Rd = add (Sp, #U6:2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00fe00) == 0x6c002800) {
+					// Instruction: 7: 011011IIIIIIdddd0010100iiiiitttt | Rd = add (Sp, #U6:2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Sp, 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x72003c00) {
+					// Instruction: 7: 01110010ssssdddd0011110iiiii---- | Rd = and (Rs, #1) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x72002a00) {
+					// Instruction: 7: 01110010ssssdddd0010101iiiiiittt | Rd = and (Rs, #1) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x72002800) {
+					// Instruction: 7: 01110010ssssdddd0010100iiiiitttt | Rd = and (Rs, #1) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___1____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x77003c00) {
+					// Instruction: 7: 01110111ssssdddd0011110iiiii---- | Rd = and (Rs, #255) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x77002a00) {
+					// Instruction: 7: 01110111ssssdddd0010101iiiiiittt | Rd = and (Rs, #255) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x77002800) {
+					// Instruction: 7: 01110111ssssdddd0010100iiiiitttt | Rd = and (Rs, #255) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RS___255____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x72003200) {
+					// Instruction: 7: 01110010uuuudddd00110010ssssiiii | Rd = and (Ru, #1) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x72003300) {
+					// Instruction: 7: 01110010uuuudddd00110011ssssiiii | Rd = and (Ru, #1) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x72002000) {
+					// Instruction: 7: 01110010uuuudddd00100iiisssstttt | Rd = and (Ru, #1) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x72003000) {
+					// Instruction: 7: 01110010uuuudddd00110000ssssiiii | Rd = and (Ru, #1) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x72003100) {
+					// Instruction: 7: 01110010uuuudddd00110001ssssiiii | Rd = and (Ru, #1) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___1____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #1) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x77003200) {
+					// Instruction: 7: 01110111uuuudddd00110010ssssiiii | Rd = and (Ru, #255) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x77003300) {
+					// Instruction: 7: 01110111uuuudddd00110011ssssiiii | Rd = and (Ru, #255) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x77002000) {
+					// Instruction: 7: 01110111uuuudddd00100iiisssstttt | Rd = and (Ru, #255) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x77003000) {
+					// Instruction: 7: 01110111uuuudddd00110000ssssiiii | Rd = and (Ru, #255) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x77003100) {
+					// Instruction: 7: 01110111uuuudddd00110001ssssiiii | Rd = and (Ru, #255) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___AND__RU___255____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = and (%s, #255) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x75003c00) {
+					// Instruction: 7: 01110101ssssdddd0011110iiiii---- | Rd = sxtb (Rs) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x75002a00) {
+					// Instruction: 7: 01110101ssssdddd0010101iiiiiittt | Rd = sxtb (Rs) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x75002800) {
+					// Instruction: 7: 01110101ssssdddd0010100iiiiitttt | Rd = sxtb (Rs) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RS____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x75003200) {
+					// Instruction: 7: 01110101uuuudddd00110010ssssiiii | Rd = sxtb (Ru) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x75003300) {
+					// Instruction: 7: 01110101uuuudddd00110011ssssiiii | Rd = sxtb (Ru) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x75002000) {
+					// Instruction: 7: 01110101uuuudddd00100iiisssstttt | Rd = sxtb (Ru) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x75003000) {
+					// Instruction: 7: 01110101uuuudddd00110000ssssiiii | Rd = sxtb (Ru) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x75003100) {
+					// Instruction: 7: 01110101uuuudddd00110001ssssiiii | Rd = sxtb (Ru) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTB__RU____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxtb (%s) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x74003c00) {
+					// Instruction: 7: 01110100ssssdddd0011110iiiii---- | Rd = sxth (Rs) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x74002a00) {
+					// Instruction: 7: 01110100ssssdddd0010101iiiiiittt | Rd = sxth (Rs) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x74002800) {
+					// Instruction: 7: 01110100ssssdddd0010100iiiiitttt | Rd = sxth (Rs) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RS____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x74003200) {
+					// Instruction: 7: 01110100uuuudddd00110010ssssiiii | Rd = sxth (Ru) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x74003300) {
+					// Instruction: 7: 01110100uuuudddd00110011ssssiiii | Rd = sxth (Ru) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x74002000) {
+					// Instruction: 7: 01110100uuuudddd00100iiisssstttt | Rd = sxth (Ru) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x74003000) {
+					// Instruction: 7: 01110100uuuudddd00110000ssssiiii | Rd = sxth (Ru) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x74003100) {
+					// Instruction: 7: 01110100uuuudddd00110001ssssiiii | Rd = sxth (Ru) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___SXTH__RU____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = sxth (%s) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x76003c00) {
+					// Instruction: 7: 01110110ssssdddd0011110iiiii---- | Rd = zxth (Rs) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x76002a00) {
+					// Instruction: 7: 01110110ssssdddd0010101iiiiiittt | Rd = zxth (Rs) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x76002800) {
+					// Instruction: 7: 01110110ssssdddd0010100iiiiitttt | Rd = zxth (Rs) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RS____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x76003200) {
+					// Instruction: 7: 01110110uuuudddd00110010ssssiiii | Rd = zxth (Ru) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x76003300) {
+					// Instruction: 7: 01110110uuuudddd00110011ssssiiii | Rd = zxth (Ru) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x76002000) {
+					// Instruction: 7: 01110110uuuudddd00100iiisssstttt | Rd = zxth (Ru) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x76003000) {
+					// Instruction: 7: 01110110uuuudddd00110000ssssiiii | Rd = zxth (Ru) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x76003100) {
+					// Instruction: 7: 01110110uuuudddd00110001ssssiiii | Rd = zxth (Ru) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___ZXTH__RU____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = zxth (%s) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c003c00) {
+					// Instruction: 7: 011111-0-II00ddd0011110iiiii---- | Rdd = combine (#0, #U2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; allocframe (0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c003200) {
+					// Instruction: 7: 011111-0-II00ddd00110010ssssiiii | Rdd = combine (#0, #U2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c003300) {
+					// Instruction: 7: 011111-0-II00ddd00110011ssssiiii | Rdd = combine (#0, #U2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c002a00) {
+					// Instruction: 7: 011111-0-II00ddd0010101iiiiiittt | Rdd = combine (#0, #U2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x7c002000) {
+					// Instruction: 7: 011111-0-II00ddd00100iiisssstttt | Rdd = combine (#0, #U2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c003000) {
+					// Instruction: 7: 011111-0-II00ddd00110000ssssiiii | Rdd = combine (#0, #U2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c003100) {
+					// Instruction: 7: 011111-0-II00ddd00110001ssssiiii | Rdd = combine (#0, #U2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c002800) {
+					// Instruction: 7: 011111-0-II00ddd0010100iiiiitttt | Rdd = combine (#0, #U2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x7d003c00) {
+					// Instruction: 7: 011111-1ssss0ddd0011110iiiii---- | Rdd = combine (#0, Rs) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; allocframe (0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x7d002a00) {
+					// Instruction: 7: 011111-1ssss0ddd0010101iiiiiittt | Rdd = combine (#0, Rs) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memd (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x7d002800) {
+					// Instruction: 7: 011111-1ssss0ddd0010100iiiiitttt | Rdd = combine (#0, Rs) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RS____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memw (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d003200) {
+					// Instruction: 7: 011111-1uuuu0ddd00110010ssssiiii | Rdd = combine (#0, Ru) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memb (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d003300) {
+					// Instruction: 7: 011111-1uuuu0ddd00110011ssssiiii | Rdd = combine (#0, Ru) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memb (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x7d002000) {
+					// Instruction: 7: 011111-1uuuu0ddd00100iiisssstttt | Rdd = combine (#0, Ru) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memh (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d003000) {
+					// Instruction: 7: 011111-1uuuu0ddd00110000ssssiiii | Rdd = combine (#0, Ru) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memw (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d003100) {
+					// Instruction: 7: 011111-1uuuu0ddd00110001ssssiiii | Rdd = combine (#0, Ru) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#0, %s) ; memw (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c083c00) {
+					// Instruction: 7: 011111-0-II01ddd0011110iiiii---- | Rdd = combine (#1, #U2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; allocframe (0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c083200) {
+					// Instruction: 7: 011111-0-II01ddd00110010ssssiiii | Rdd = combine (#1, #U2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c083300) {
+					// Instruction: 7: 011111-0-II01ddd00110011ssssiiii | Rdd = combine (#1, #U2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c082a00) {
+					// Instruction: 7: 011111-0-II01ddd0010101iiiiiittt | Rdd = combine (#1, #U2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x7c082000) {
+					// Instruction: 7: 011111-0-II01ddd00100iiisssstttt | Rdd = combine (#1, #U2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c083000) {
+					// Instruction: 7: 011111-0-II01ddd00110000ssssiiii | Rdd = combine (#1, #U2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c083100) {
+					// Instruction: 7: 011111-0-II01ddd00110001ssssiiii | Rdd = combine (#1, #U2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c082800) {
+					// Instruction: 7: 011111-0-II01ddd0010100iiiiitttt | Rdd = combine (#1, #U2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#1, 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c103c00) {
+					// Instruction: 7: 011111-0-II10ddd0011110iiiii---- | Rdd = combine (#2, #U2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; allocframe (0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c103200) {
+					// Instruction: 7: 011111-0-II10ddd00110010ssssiiii | Rdd = combine (#2, #U2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c103300) {
+					// Instruction: 7: 011111-0-II10ddd00110011ssssiiii | Rdd = combine (#2, #U2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c102a00) {
+					// Instruction: 7: 011111-0-II10ddd0010101iiiiiittt | Rdd = combine (#2, #U2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x7c102000) {
+					// Instruction: 7: 011111-0-II10ddd00100iiisssstttt | Rdd = combine (#2, #U2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c103000) {
+					// Instruction: 7: 011111-0-II10ddd00110000ssssiiii | Rdd = combine (#2, #U2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c103100) {
+					// Instruction: 7: 011111-0-II10ddd00110001ssssiiii | Rdd = combine (#2, #U2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c102800) {
+					// Instruction: 7: 011111-0-II10ddd0010100iiiiitttt | Rdd = combine (#2, #U2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#2, 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c183c00) {
+					// Instruction: 7: 011111-0-II11ddd0011110iiiii---- | Rdd = combine (#3, #U2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; allocframe (0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c183200) {
+					// Instruction: 7: 011111-0-II11ddd00110010ssssiiii | Rdd = combine (#3, #U2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c183300) {
+					// Instruction: 7: 011111-0-II11ddd00110011ssssiiii | Rdd = combine (#3, #U2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c182a00) {
+					// Instruction: 7: 011111-0-II11ddd0010101iiiiiittt | Rdd = combine (#3, #U2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18f800) == 0x7c182000) {
+					// Instruction: 7: 011111-0-II11ddd00100iiisssstttt | Rdd = combine (#3, #U2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c183000) {
+					// Instruction: 7: 011111-0-II11ddd00110000ssssiiii | Rdd = combine (#3, #U2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18ff00) == 0x7c183100) {
+					// Instruction: 7: 011111-0-II11ddd00110001ssssiiii | Rdd = combine (#3, #U2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd18fe00) == 0x7c182800) {
+					// Instruction: 7: 011111-0-II11ddd0010100iiiiitttt | Rdd = combine (#3, #U2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (#3, 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x7d083c00) {
+					// Instruction: 7: 011111-1ssss1ddd0011110iiiii---- | Rdd = combine (Rs, #0) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; allocframe (0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x7d082a00) {
+					// Instruction: 7: 011111-1ssss1ddd0010101iiiiiittt | Rdd = combine (Rs, #0) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memd (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08fe00) == 0x7d082800) {
+					// Instruction: 7: 011111-1ssss1ddd0010100iiiiitttt | Rdd = combine (Rs, #0) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RS___0____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memw (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d083200) {
+					// Instruction: 7: 011111-1uuuu1ddd00110010ssssiiii | Rdd = combine (Ru, #0) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memb (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d083300) {
+					// Instruction: 7: 011111-1uuuu1ddd00110011ssssiiii | Rdd = combine (Ru, #0) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memb (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08f800) == 0x7d082000) {
+					// Instruction: 7: 011111-1uuuu1ddd00100iiisssstttt | Rdd = combine (Ru, #0) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memh (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d083000) {
+					// Instruction: 7: 011111-1uuuu1ddd00110000ssssiiii | Rdd = combine (Ru, #0) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memw (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfd08ff00) == 0x7d083100) {
+					// Instruction: 7: 011111-1uuuu1ddd00110001ssssiiii | Rdd = combine (Ru, #0) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = combine (%s, #0) ; memw (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x78003c00) {
+					// Instruction: 7: 01111000ssssxxxx0011110iiiii---- | Rx = add (Rs, Rx) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x78002a00) {
+					// Instruction: 7: 01111000ssssxxxx0010101iiiiiittt | Rx = add (Rs, Rx) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x78002800) {
+					// Instruction: 7: 01111000ssssxxxx0010100iiiiitttt | Rx = add (Rs, Rx) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RS__RX____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003200) {
+					// Instruction: 7: 01111000uuuuxxxx00110010ssssiiii | Rx = add (Ru, Rx) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003300) {
+					// Instruction: 7: 01111000uuuuxxxx00110011ssssiiii | Rx = add (Ru, Rx) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x78002000) {
+					// Instruction: 7: 01111000uuuuxxxx00100iiisssstttt | Rx = add (Ru, Rx) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003000) {
+					// Instruction: 7: 01111000uuuuxxxx00110000ssssiiii | Rx = add (Ru, Rx) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003100) {
+					// Instruction: 7: 01111000uuuuxxxx00110001ssssiiii | Rx = add (Ru, Rx) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (%s, Rx) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0x60003c00) {
+					// Instruction: 7: 01100IIIIIIIxxxx0011110iiiii---- | Rx = add (Rx, #S7) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x60003200) {
+					// Instruction: 7: 01100IIIIIIIxxxx00110010ssssiiii | Rx = add (Rx, #S7) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x60003300) {
+					// Instruction: 7: 01100IIIIIIIxxxx00110011ssssiiii | Rx = add (Rx, #S7) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0x60002a00) {
+					// Instruction: 7: 01100IIIIIIIxxxx0010101iiiiiittt | Rx = add (Rx, #S7) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0x60002000) {
+					// Instruction: 7: 01100IIIIIIIxxxx00100iiisssstttt | Rx = add (Rx, #S7) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x60003000) {
+					// Instruction: 7: 01100IIIIIIIxxxx00110000ssssiiii | Rx = add (Rx, #S7) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0x60003100) {
+					// Instruction: 7: 01100IIIIIIIxxxx00110001ssssiiii | Rx = add (Rx, #S7) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0x60002800) {
+					// Instruction: 7: 01100IIIIIIIxxxx0010100iiiiitttt | Rx = add (Rx, #S7) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7f00000) >> 20);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x78003c00) {
+					// Instruction: 7: 01111000ssssxxxx0011110iiiii---- | Rx = add (Rx, Rs) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x78002a00) {
+					// Instruction: 7: 01111000ssssxxxx0010101iiiiiittt | Rx = add (Rx, Rs) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x78002800) {
+					// Instruction: 7: 01111000ssssxxxx0010100iiiiitttt | Rx = add (Rx, Rs) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RS____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003200) {
+					// Instruction: 7: 01111000uuuuxxxx00110010ssssiiii | Rx = add (Rx, Ru) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003300) {
+					// Instruction: 7: 01111000uuuuxxxx00110011ssssiiii | Rx = add (Rx, Ru) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x78002000) {
+					// Instruction: 7: 01111000uuuuxxxx00100iiisssstttt | Rx = add (Rx, Ru) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003000) {
+					// Instruction: 7: 01111000uuuuxxxx00110000ssssiiii | Rx = add (Rx, Ru) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x78003100) {
+					// Instruction: 7: 01111000uuuuxxxx00110001ssssiiii | Rx = add (Rx, Ru) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = add (Rx, %s) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a703c00) {
+					// Instruction: 7: 0111101--111dddd0011110iiiii---- | if (! p0) Rd = #0 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___ALLOCFRAME___U5_3_;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a703200) {
+					// Instruction: 7: 0111101--111dddd00110010ssssiiii | if (! p0) Rd = #0 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMB__RS____U4_0_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a703300) {
+					// Instruction: 7: 0111101--111dddd00110011ssssiiii | if (! p0) Rd = #0 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMB__RS____U4_0_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a702a00) {
+					// Instruction: 7: 0111101--111dddd0010101iiiiiittt | if (! p0) Rd = #0 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMD__SP____S6_3____RTT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x7a702000) {
+					// Instruction: 7: 0111101--111dddd00100iiisssstttt | if (! p0) Rd = #0 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMH__RS____U3_1____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a703000) {
+					// Instruction: 7: 0111101--111dddd00110000ssssiiii | if (! p0) Rd = #0 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__RS____U4_2_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a703100) {
+					// Instruction: 7: 0111101--111dddd00110001ssssiiii | if (! p0) Rd = #0 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__RS____U4_2_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a702800) {
+					// Instruction: 7: 0111101--111dddd0010100iiiiitttt | if (! p0) Rd = #0 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__SP____U5_2____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0) %s = #0 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a503c00) {
+					// Instruction: 7: 0111101--101dddd0011110iiiii---- | if (! p0.new) Rd = #0 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___ALLOCFRAME___U5_3_;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a503200) {
+					// Instruction: 7: 0111101--101dddd00110010ssssiiii | if (! p0.new) Rd = #0 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMB__RS____U4_0_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a503300) {
+					// Instruction: 7: 0111101--101dddd00110011ssssiiii | if (! p0.new) Rd = #0 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMB__RS____U4_0_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a502a00) {
+					// Instruction: 7: 0111101--101dddd0010101iiiiiittt | if (! p0.new) Rd = #0 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMD__SP____S6_3____RTT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x7a502000) {
+					// Instruction: 7: 0111101--101dddd00100iiisssstttt | if (! p0.new) Rd = #0 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMH__RS____U3_1____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a503000) {
+					// Instruction: 7: 0111101--101dddd00110000ssssiiii | if (! p0.new) Rd = #0 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__RS____U4_2_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a503100) {
+					// Instruction: 7: 0111101--101dddd00110001ssssiiii | if (! p0.new) Rd = #0 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__RS____U4_2_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a502800) {
+					// Instruction: 7: 0111101--101dddd0010100iiiiitttt | if (! p0.new) Rd = #0 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__SP____U5_2____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (! p0.new) %s = #0 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a603c00) {
+					// Instruction: 7: 0111101--110dddd0011110iiiii---- | if (p0) Rd = #0 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___ALLOCFRAME___U5_3_;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a603200) {
+					// Instruction: 7: 0111101--110dddd00110010ssssiiii | if (p0) Rd = #0 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMB__RS____U4_0_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a603300) {
+					// Instruction: 7: 0111101--110dddd00110011ssssiiii | if (p0) Rd = #0 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMB__RS____U4_0_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a602a00) {
+					// Instruction: 7: 0111101--110dddd0010101iiiiiittt | if (p0) Rd = #0 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMD__SP____S6_3____RTT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x7a602000) {
+					// Instruction: 7: 0111101--110dddd00100iiisssstttt | if (p0) Rd = #0 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMH__RS____U3_1____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a603000) {
+					// Instruction: 7: 0111101--110dddd00110000ssssiiii | if (p0) Rd = #0 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__RS____U4_2_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a603100) {
+					// Instruction: 7: 0111101--110dddd00110001ssssiiii | if (p0) Rd = #0 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__RS____U4_2_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a602800) {
+					// Instruction: 7: 0111101--110dddd0010100iiiiitttt | if (p0) Rd = #0 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__SP____U5_2____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0) %s = #0 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a403c00) {
+					// Instruction: 7: 0111101--100dddd0011110iiiii---- | if (p0.new) Rd = #0 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___ALLOCFRAME___U5_3_;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a403200) {
+					// Instruction: 7: 0111101--100dddd00110010ssssiiii | if (p0.new) Rd = #0 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMB__RS____U4_0_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a403300) {
+					// Instruction: 7: 0111101--100dddd00110011ssssiiii | if (p0.new) Rd = #0 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMB__RS____U4_0_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a402a00) {
+					// Instruction: 7: 0111101--100dddd0010101iiiiiittt | if (p0.new) Rd = #0 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMD__SP____S6_3____RTT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_regpair(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70f800) == 0x7a402000) {
+					// Instruction: 7: 0111101--100dddd00100iiisssstttt | if (p0.new) Rd = #0 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMH__RS____U3_1____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a403000) {
+					// Instruction: 7: 0111101--100dddd00110000ssssiiii | if (p0.new) Rd = #0 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__RS____U4_2_____0;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70ff00) == 0x7a403100) {
+					// Instruction: 7: 0111101--100dddd00110001ssssiiii | if (p0.new) Rd = #0 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__RS____U4_2_____1;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe70fe00) == 0x7a402800) {
+					// Instruction: 7: 0111101--100dddd0010100iiiiitttt | if (p0.new) Rd = #0 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__SP____U5_2____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (p0.new) %s = #0 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x79003c00) {
+					// Instruction: 7: 01111001ssss--II0011110iiiii---- | p0 = cmp.eq (Rs, #U2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x79002a00) {
+					// Instruction: 7: 01111001ssss--II0010101iiiiiittt | p0 = cmp.eq (Rs, #U2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0x79002800) {
+					// Instruction: 7: 01111001ssss--II0010100iiiiitttt | p0 = cmp.eq (Rs, #U2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x79003200) {
+					// Instruction: 7: 01111001uuuu--II00110010ssssiiii | p0 = cmp.eq (Ru, #U2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x79003300) {
+					// Instruction: 7: 01111001uuuu--II00110011ssssiiii | p0 = cmp.eq (Ru, #U2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0x79002000) {
+					// Instruction: 7: 01111001uuuu--II00100iiisssstttt | p0 = cmp.eq (Ru, #U2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x79003000) {
+					// Instruction: 7: 01111001uuuu--II00110000ssssiiii | p0 = cmp.eq (Ru, #U2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0x79003100) {
+					// Instruction: 7: 01111001uuuu--II00110001ssssiiii | p0 = cmp.eq (Ru, #U2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (%s, 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x8: {
+				if ((hi_u32 & 0xf000f000) == 0x90001000) {
+					// Instruction: 8: 1001IIIIuuuudddd0001iiiisssstttt | Rd = memub (Ru + #U4:0) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMB__RS____U4_0____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0x90000000) {
+					// Instruction: 8: 1001IIIIuuuudddd0000iiiisssstttt | Rd = memub (Ru + #U4:0) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMW__RS____U4_2____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0x80001000) {
+					// Instruction: 8: 1000IIIIuuuudddd0001iiiisssstttt | Rd = memw (Ru + #U4:2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMB__RS____U4_0____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0x80000000) {
+					// Instruction: 8: 1000IIIIuuuudddd0000iiiisssstttt | Rd = memw (Ru + #U4:2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMW__RS____U4_2____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				break;
+			}
+			case 0x9: {
+				if ((hi_u32 & 0xf800f000) == 0x90003000) {
+					// Instruction: 9: 10010IIIuuuudddd0011iiiisssstttt | Rd = memb (Ru + #U3:0) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMB__RS____U4_0____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x90002000) {
+					// Instruction: 9: 10010IIIuuuudddd0010iiiisssstttt | Rd = memb (Ru + #U3:0) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMW__RS____U4_2____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x80003000) {
+					// Instruction: 9: 10000IIIuuuudddd0011iiiisssstttt | Rd = memh (Ru + #U3:1) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMB__RS____U4_0____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x80002000) {
+					// Instruction: 9: 10000IIIuuuudddd0010iiiisssstttt | Rd = memh (Ru + #U3:1) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMW__RS____U4_2____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x88003000) {
+					// Instruction: 9: 10001IIIuuuudddd0011iiiisssstttt | Rd = memuh (Ru + #U3:1) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMB__RS____U4_0____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800f000) == 0x88002000) {
+					// Instruction: 9: 10001IIIuuuudddd0010iiiisssstttt | Rd = memuh (Ru + #U3:1) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMW__RS____U4_2____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00f000) == 0x9c003000) {
+					// Instruction: 9: 1001110IIIIIdddd0011iiiisssstttt | Rd = memw (Sp + #U5:2) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00f000) == 0x9c002000) {
+					// Instruction: 9: 1001110IIIIIdddd0010iiiisssstttt | Rd = memw (Sp + #U5:2) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x9e003000) {
+					// Instruction: 9: 10011110IIIIIddd0011iiiisssstttt | Rdd = memd (Sp + #U5:3) ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMB__RS____U4_0____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memb (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f000) == 0x9e002000) {
+					// Instruction: 9: 10011110IIIIIddd0010iiiisssstttt | Rdd = memd (Sp + #U5:3) ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__RS____U4_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memw (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xffc4f000) == 0x9f003000) {
+					// Instruction: 9: 1001111100---0--0011iiiisssstttt | deallocframe ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMB__RS____U4_0____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xffc4f000) == 0x9f002000) {
+					// Instruction: 9: 1001111100---0--0010iiiisssstttt | deallocframe ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__RS____U4_2____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				break;
+			}
+			case 0xa: {
+				if ((hi_u32 & 0xf000f000) == 0xb0001000) {
+					// Instruction: 10: 1011IIIIuuuuvvvv0001iiiisssstttt | memb (Ru + #U4:0) = Rv ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0____RV___MEMB__RS____U4_0____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0xb0000000) {
+					// Instruction: 10: 1011IIIIuuuuvvvv0000iiiisssstttt | memb (Ru + #U4:0) = Rv ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0____RV___MEMW__RS____U4_2____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0xa0001000) {
+					// Instruction: 10: 1010IIIIuuuuvvvv0001iiiisssstttt | memw (Ru + #U4:2) = Rv ; memb (Rs + #u4:0) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2____RV___MEMB__RS____U4_0____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memb (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000f000) == 0xa0000000) {
+					// Instruction: 10: 1010IIIIuuuuvvvv0000iiiisssstttt | memw (Ru + #U4:2) = Rv ; memw (Rs + #u4:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2____RV___MEMW__RS____U4_2____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf00) >> 8) << 2; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memw (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				break;
+			}
+			case 0xb: {
+				if ((hi_u32 & 0xf000fe00) == 0xb0003c00) {
+					// Instruction: 11: 1011IIIIsssstttt0011110iiiii---- | memb (Rs + #U4:0) = Rt ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0____RT___ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xb0002a00) {
+					// Instruction: 11: 1011IIIIssssvvvv0010101iiiiiittt | memb (Rs + #U4:0) = Rv ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0____RV___MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xb0002800) {
+					// Instruction: 11: 1011IIIIssssvvvv0010100iiiiitttt | memb (Rs + #U4:0) = Rv ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0____RV___MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xb0003200) {
+					// Instruction: 11: 1011IIIIuuuutttt00110010ssssiiii | memb (Ru + #U4:0) = Rt ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xb0003300) {
+					// Instruction: 11: 1011IIIIuuuutttt00110011ssssiiii | memb (Ru + #U4:0) = Rt ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xb0003000) {
+					// Instruction: 11: 1011IIIIuuuutttt00110000ssssiiii | memb (Ru + #U4:0) = Rt ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xb0003100) {
+					// Instruction: 11: 1011IIIIuuuutttt00110001ssssiiii | memb (Ru + #U4:0) = Rt ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0xb0002000) {
+					// Instruction: 11: 1011IIIIuuuuvvvv00100iiisssstttt | memb (Ru + #U4:0) = Rv ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0____RV___MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = %s ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xa0003c00) {
+					// Instruction: 11: 1010IIIIsssstttt0011110iiiii---- | memw (Rs + #U4:2) = Rt ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2____RT___ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xa0002a00) {
+					// Instruction: 11: 1010IIIIssssvvvv0010101iiiiiittt | memw (Rs + #U4:2) = Rv ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2____RV___MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xa0002800) {
+					// Instruction: 11: 1010IIIIssssvvvv0010100iiiiitttt | memw (Rs + #U4:2) = Rv ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2____RV___MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xa0003200) {
+					// Instruction: 11: 1010IIIIuuuutttt00110010ssssiiii | memw (Ru + #U4:2) = Rt ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xa0003300) {
+					// Instruction: 11: 1010IIIIuuuutttt00110011ssssiiii | memw (Ru + #U4:2) = Rt ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xa0003000) {
+					// Instruction: 11: 1010IIIIuuuutttt00110000ssssiiii | memw (Ru + #U4:2) = Rt ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xa0003100) {
+					// Instruction: 11: 1010IIIIuuuutttt00110001ssssiiii | memw (Ru + #U4:2) = Rt ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0xa0002000) {
+					// Instruction: 11: 1010IIIIuuuuvvvv00100iiisssstttt | memw (Ru + #U4:2) = Rv ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2____RV___MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = %s ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				break;
+			}
+			case 0xc: {
+				if ((hi_u32 & 0xf000fe00) == 0xd0001c00) {
+					// Instruction: 12: 1101IIIIssssdddd0001110iiiii---- | Rd = memub (Rs + #U4:0) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xd0000a00) {
+					// Instruction: 12: 1101IIIIssssdddd0000101iiiiiittt | Rd = memub (Rs + #U4:0) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xd0000800) {
+					// Instruction: 12: 1101IIIIssssdddd0000100iiiiitttt | Rd = memub (Rs + #U4:0) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xd0001200) {
+					// Instruction: 12: 1101IIIIuuuudddd00010010ssssiiii | Rd = memub (Ru + #U4:0) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xd0001300) {
+					// Instruction: 12: 1101IIIIuuuudddd00010011ssssiiii | Rd = memub (Ru + #U4:0) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0xd0000000) {
+					// Instruction: 12: 1101IIIIuuuudddd00000iiisssstttt | Rd = memub (Ru + #U4:0) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xd0001000) {
+					// Instruction: 12: 1101IIIIuuuudddd00010000ssssiiii | Rd = memub (Ru + #U4:0) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xd0001100) {
+					// Instruction: 12: 1101IIIIuuuudddd00010001ssssiiii | Rd = memub (Ru + #U4:0) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memub (%s + 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xc0001c00) {
+					// Instruction: 12: 1100IIIIssssdddd0001110iiiii---- | Rd = memw (Rs + #U4:2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xc0000a00) {
+					// Instruction: 12: 1100IIIIssssdddd0000101iiiiiittt | Rd = memw (Rs + #U4:2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000fe00) == 0xc0000800) {
+					// Instruction: 12: 1100IIIIssssdddd0000100iiiiitttt | Rd = memw (Rs + #U4:2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xc0001200) {
+					// Instruction: 12: 1100IIIIuuuudddd00010010ssssiiii | Rd = memw (Ru + #U4:2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xc0001300) {
+					// Instruction: 12: 1100IIIIuuuudddd00010011ssssiiii | Rd = memw (Ru + #U4:2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000f800) == 0xc0000000) {
+					// Instruction: 12: 1100IIIIuuuudddd00000iiisssstttt | Rd = memw (Ru + #U4:2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xc0001000) {
+					// Instruction: 12: 1100IIIIuuuudddd00010000ssssiiii | Rd = memw (Ru + #U4:2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000ff00) == 0xc0001100) {
+					// Instruction: 12: 1100IIIIuuuudddd00010001ssssiiii | Rd = memw (Ru + #U4:2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf000000) >> 24) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (%s + 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0xd: {
+				if ((hi_u32 & 0xf800fe00) == 0xd0003c00) {
+					// Instruction: 13: 11010IIIssssdddd0011110iiiii---- | Rd = memb (Rs + #U3:0) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xd0002a00) {
+					// Instruction: 13: 11010IIIssssdddd0010101iiiiiittt | Rd = memb (Rs + #U3:0) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xd0002800) {
+					// Instruction: 13: 11010IIIssssdddd0010100iiiiitttt | Rd = memb (Rs + #U3:0) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xd0003200) {
+					// Instruction: 13: 11010IIIuuuudddd00110010ssssiiii | Rd = memb (Ru + #U3:0) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xd0003300) {
+					// Instruction: 13: 11010IIIuuuudddd00110011ssssiiii | Rd = memb (Ru + #U3:0) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0xd0002000) {
+					// Instruction: 13: 11010IIIuuuudddd00100iiisssstttt | Rd = memb (Ru + #U3:0) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xd0003000) {
+					// Instruction: 13: 11010IIIuuuudddd00110000ssssiiii | Rd = memb (Ru + #U3:0) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xd0003100) {
+					// Instruction: 13: 11010IIIuuuudddd00110001ssssiiii | Rd = memb (Ru + #U3:0) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memb (%s + 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xc0003c00) {
+					// Instruction: 13: 11000IIIssssdddd0011110iiiii---- | Rd = memh (Rs + #U3:1) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xc0002a00) {
+					// Instruction: 13: 11000IIIssssdddd0010101iiiiiittt | Rd = memh (Rs + #U3:1) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xc0002800) {
+					// Instruction: 13: 11000IIIssssdddd0010100iiiiitttt | Rd = memh (Rs + #U3:1) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc0003200) {
+					// Instruction: 13: 11000IIIuuuudddd00110010ssssiiii | Rd = memh (Ru + #U3:1) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc0003300) {
+					// Instruction: 13: 11000IIIuuuudddd00110011ssssiiii | Rd = memh (Ru + #U3:1) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0xc0002000) {
+					// Instruction: 13: 11000IIIuuuudddd00100iiisssstttt | Rd = memh (Ru + #U3:1) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc0003000) {
+					// Instruction: 13: 11000IIIuuuudddd00110000ssssiiii | Rd = memh (Ru + #U3:1) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc0003100) {
+					// Instruction: 13: 11000IIIuuuudddd00110001ssssiiii | Rd = memh (Ru + #U3:1) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memh (%s + 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xc8003c00) {
+					// Instruction: 13: 11001IIIssssdddd0011110iiiii---- | Rd = memuh (Rs + #U3:1) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xc8002a00) {
+					// Instruction: 13: 11001IIIssssdddd0010101iiiiiittt | Rd = memuh (Rs + #U3:1) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xc8002800) {
+					// Instruction: 13: 11001IIIssssdddd0010100iiiiitttt | Rd = memuh (Rs + #U3:1) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc8003200) {
+					// Instruction: 13: 11001IIIuuuudddd00110010ssssiiii | Rd = memuh (Ru + #U3:1) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc8003300) {
+					// Instruction: 13: 11001IIIuuuudddd00110011ssssiiii | Rd = memuh (Ru + #U3:1) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0xc8002000) {
+					// Instruction: 13: 11001IIIuuuudddd00100iiisssstttt | Rd = memuh (Ru + #U3:1) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc8003000) {
+					// Instruction: 13: 11001IIIuuuudddd00110000ssssiiii | Rd = memuh (Ru + #U3:1) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xc8003100) {
+					// Instruction: 13: 11001IIIuuuudddd00110001ssssiiii | Rd = memuh (Ru + #U3:1) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memuh (%s + 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xdc003c00) {
+					// Instruction: 13: 1101110IIIIIdddd0011110iiiii---- | Rd = memw (Sp + #U5:2) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xdc003200) {
+					// Instruction: 13: 1101110IIIIIdddd00110010ssssiiii | Rd = memw (Sp + #U5:2) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xdc003300) {
+					// Instruction: 13: 1101110IIIIIdddd00110011ssssiiii | Rd = memw (Sp + #U5:2) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xdc002a00) {
+					// Instruction: 13: 1101110IIIIIdddd0010101iiiiiittt | Rd = memw (Sp + #U5:2) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00f800) == 0xdc002000) {
+					// Instruction: 13: 1101110IIIIIdddd00100iiisssstttt | Rd = memw (Sp + #U5:2) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xdc003000) {
+					// Instruction: 13: 1101110IIIIIdddd00110000ssssiiii | Rd = memw (Sp + #U5:2) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xdc003100) {
+					// Instruction: 13: 1101110IIIIIdddd00110001ssssiiii | Rd = memw (Sp + #U5:2) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xdc002800) {
+					// Instruction: 13: 1101110IIIIIdddd0010100iiiiitttt | Rd = memw (Sp + #U5:2) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memw (Sp + 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xde003c00) {
+					// Instruction: 13: 11011110IIIIIddd0011110iiiii---- | Rdd = memd (Sp + #U5:3) ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; allocframe (0x%x)", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xde003200) {
+					// Instruction: 13: 11011110IIIIIddd00110010ssssiiii | Rdd = memd (Sp + #U5:3) ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memb (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xde003300) {
+					// Instruction: 13: 11011110IIIIIddd00110011ssssiiii | Rdd = memd (Sp + #U5:3) ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memb (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xde002a00) {
+					// Instruction: 13: 11011110IIIIIddd0010101iiiiiittt | Rdd = memd (Sp + #U5:3) ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memd (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0xde002000) {
+					// Instruction: 13: 11011110IIIIIddd00100iiisssstttt | Rdd = memd (Sp + #U5:3) ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memh (%s + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xde003000) {
+					// Instruction: 13: 11011110IIIIIddd00110000ssssiiii | Rdd = memd (Sp + #U5:3) ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memw (%s + 0x%x) = #0", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xde003100) {
+					// Instruction: 13: 11011110IIIIIddd00110001ssssiiii | Rdd = memd (Sp + #U5:3) ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memw (%s + 0x%x) = #1", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xde002800) {
+					// Instruction: 13: 11011110IIIIIddd0010100iiiiitttt | Rdd = memd (Sp + #U5:3) ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf80000) >> 19) << 3; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = memd (Sp + 0x%x) ; memw (Sp + 0x%x) = %s", hex_get_sub_regpair(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xffc4ff00) == 0xdf003200) {
+					// Instruction: 13: 1101111100---0--00110010ssssiiii | deallocframe ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMB__RS____U4_0_____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xffc4ff00) == 0xdf003300) {
+					// Instruction: 13: 1101111100---0--00110011ssssiiii | deallocframe ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMB__RS____U4_0_____1;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xffc4fe00) == 0xdf002a00) {
+					// Instruction: 13: 1101111100---0--0010101iiiiiittt | deallocframe ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMD__SP____S6_3____RTT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memd (Sp + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xffc4f800) == 0xdf002000) {
+					// Instruction: 13: 1101111100---0--00100iiisssstttt | deallocframe ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMH__RS____U3_1____RT;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xffc4ff00) == 0xdf003000) {
+					// Instruction: 13: 1101111100---0--00110000ssssiiii | deallocframe ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__RS____U4_2_____0;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xffc4ff00) == 0xdf003100) {
+					// Instruction: 13: 1101111100---0--00110001ssssiiii | deallocframe ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__RS____U4_2_____1;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xffc4fe00) == 0xdf002800) {
+					// Instruction: 13: 1101111100---0--0010100iiiiitttt | deallocframe ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__SP____U5_2____RT;
+					hi->op_count = 2;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe ; memw (Sp + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg));
+					break;
+				}
+				break;
+			}
+			case 0xe: {
+				if ((hi_u32 & 0xff00fe00) == 0xf2001c00) {
+					// Instruction: 14: 11110010ssssIIII0001110iiiii---- | memb (Rs + #U4:0) = #0 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0_____0___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf2000a00) {
+					// Instruction: 14: 11110010ssssIIII0000101iiiiiittt | memb (Rs + #U4:0) = #0 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0_____0___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf2000800) {
+					// Instruction: 14: 11110010ssssIIII0000100iiiiitttt | memb (Rs + #U4:0) = #0 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0_____0___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf3001c00) {
+					// Instruction: 14: 11110011ssssIIII0001110iiiii---- | memb (Rs + #U4:0) = #1 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0_____1___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf3000a00) {
+					// Instruction: 14: 11110011ssssIIII0000101iiiiiittt | memb (Rs + #U4:0) = #1 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0_____1___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf3000800) {
+					// Instruction: 14: 11110011ssssIIII0000100iiiiitttt | memb (Rs + #U4:0) = #1 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RS____U4_0_____1___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf2001200) {
+					// Instruction: 14: 11110010uuuuIIII00010010ssssiiii | memb (Ru + #U4:0) = #0 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf2001300) {
+					// Instruction: 14: 11110010uuuuIIII00010011ssssiiii | memb (Ru + #U4:0) = #0 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0xf2000000) {
+					// Instruction: 14: 11110010uuuuIIII00000iiisssstttt | memb (Ru + #U4:0) = #0 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf2001000) {
+					// Instruction: 14: 11110010uuuuIIII00010000ssssiiii | memb (Ru + #U4:0) = #0 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf2001100) {
+					// Instruction: 14: 11110010uuuuIIII00010001ssssiiii | memb (Ru + #U4:0) = #0 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #0 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf3001200) {
+					// Instruction: 14: 11110011uuuuIIII00010010ssssiiii | memb (Ru + #U4:0) = #1 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf3001300) {
+					// Instruction: 14: 11110011uuuuIIII00010011ssssiiii | memb (Ru + #U4:0) = #1 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0xf3000000) {
+					// Instruction: 14: 11110011uuuuIIII00000iiisssstttt | memb (Ru + #U4:0) = #1 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf3001000) {
+					// Instruction: 14: 11110011uuuuIIII00010000ssssiiii | memb (Ru + #U4:0) = #1 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf3001100) {
+					// Instruction: 14: 11110011uuuuIIII00010001ssssiiii | memb (Ru + #U4:0) = #1 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (%s + 0x%x) = #1 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xea001c00) {
+					// Instruction: 14: 1110101IIIIIIttt0001110iiiii---- | memd (Sp + #S6:3) = Rtt ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; allocframe (0x%x)", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xea001200) {
+					// Instruction: 14: 1110101IIIIIIttt00010010ssssiiii | memd (Sp + #S6:3) = Rtt ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; memb (%s + 0x%x) = #0", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xea001300) {
+					// Instruction: 14: 1110101IIIIIIttt00010011ssssiiii | memd (Sp + #S6:3) = Rtt ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; memb (%s + 0x%x) = #1", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xea001000) {
+					// Instruction: 14: 1110101IIIIIIttt00010000ssssiiii | memd (Sp + #S6:3) = Rtt ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; memw (%s + 0x%x) = #0", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xea001100) {
+					// Instruction: 14: 1110101IIIIIIttt00010001ssssiiii | memd (Sp + #S6:3) = Rtt ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; memw (%s + 0x%x) = #1", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xea000a00) {
+					// Instruction: 14: 1110101IIIIIIvvv0000101iiiiiittt | memd (Sp + #S6:3) = Rvv ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RVV___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; memd (Sp + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00f800) == 0xea000000) {
+					// Instruction: 14: 1110101IIIIIIvvv00000iiisssstttt | memd (Sp + #S6:3) = Rvv ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RVV___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; memh (%s + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xea000800) {
+					// Instruction: 14: 1110101IIIIIIvvv0000100iiiiitttt | memd (Sp + #S6:3) = Rvv ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMD__SP____S6_3____RVV___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f80000) >> 19) << 3; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (Sp + 0x%x) = %s ; memw (Sp + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_regpair(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xe0001c00) {
+					// Instruction: 14: 11100IIIsssstttt0001110iiiii---- | memh (Rs + #U3:1) = Rt ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RS____U3_1____RT___ALLOCFRAME___U5_3_;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xe0000a00) {
+					// Instruction: 14: 11100IIIssssvvvv0000101iiiiiittt | memh (Rs + #U3:1) = Rv ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RS____U3_1____RV___MEMD__SP____S6_3____RTT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_regpair(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800fe00) == 0xe0000800) {
+					// Instruction: 14: 11100IIIssssvvvv0000100iiiiitttt | memh (Rs + #U3:1) = Rv ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RS____U3_1____RV___MEMW__SP____U5_2____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xe0001200) {
+					// Instruction: 14: 11100IIIuuuutttt00010010ssssiiii | memh (Ru + #U3:1) = Rt ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMB__RS____U4_0_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xe0001300) {
+					// Instruction: 14: 11100IIIuuuutttt00010011ssssiiii | memh (Ru + #U3:1) = Rt ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMB__RS____U4_0_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xe0001000) {
+					// Instruction: 14: 11100IIIuuuutttt00010000ssssiiii | memh (Ru + #U3:1) = Rt ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMW__RS____U4_2_____0;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800ff00) == 0xe0001100) {
+					// Instruction: 14: 11100IIIuuuutttt00010001ssssiiii | memh (Ru + #U3:1) = Rt ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMW__RS____U4_2_____1;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800f800) == 0xe0000000) {
+					// Instruction: 14: 11100IIIuuuuvvvv00000iiisssstttt | memh (Ru + #U3:1) = Rv ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMH__RU____U3_1____RV___MEMH__RS____U3_1____RT;
+					hi->op_count = 6;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7000000) >> 24) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[5].type = HEX_OP_TYPE_REG;
+					hi->ops[5].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (%s + 0x%x) = %s ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hex_get_sub_reg(hi->ops[3].op.reg), hi->ops[4].op.imm, hex_get_sub_reg(hi->ops[5].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf0001c00) {
+					// Instruction: 14: 11110000ssssIIII0001110iiiii---- | memw (Rs + #U4:2) = #0 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2_____0___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf0000a00) {
+					// Instruction: 14: 11110000ssssIIII0000101iiiiiittt | memw (Rs + #U4:2) = #0 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2_____0___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf0000800) {
+					// Instruction: 14: 11110000ssssIIII0000100iiiiitttt | memw (Rs + #U4:2) = #0 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2_____0___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf1001c00) {
+					// Instruction: 14: 11110001ssssIIII0001110iiiii---- | memw (Rs + #U4:2) = #1 ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2_____1___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; allocframe (0x%x)", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf1000a00) {
+					// Instruction: 14: 11110001ssssIIII0000101iiiiiittt | memw (Rs + #U4:2) = #1 ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2_____1___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; memd (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00fe00) == 0xf1000800) {
+					// Instruction: 14: 11110001ssssIIII0000100iiiiitttt | memw (Rs + #U4:2) = #1 ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RS____U4_2_____1___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; memw (Sp + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf0001200) {
+					// Instruction: 14: 11110000uuuuIIII00010010ssssiiii | memw (Ru + #U4:2) = #0 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf0001300) {
+					// Instruction: 14: 11110000uuuuIIII00010011ssssiiii | memw (Ru + #U4:2) = #0 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0xf0000000) {
+					// Instruction: 14: 11110000uuuuIIII00000iiisssstttt | memw (Ru + #U4:2) = #0 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf0001000) {
+					// Instruction: 14: 11110000uuuuIIII00010000ssssiiii | memw (Ru + #U4:2) = #0 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf0001100) {
+					// Instruction: 14: 11110000uuuuIIII00010001ssssiiii | memw (Ru + #U4:2) = #0 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #0 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf1001200) {
+					// Instruction: 14: 11110001uuuuIIII00010010ssssiiii | memw (Ru + #U4:2) = #1 ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; memb (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf1001300) {
+					// Instruction: 14: 11110001uuuuIIII00010011ssssiiii | memw (Ru + #U4:2) = #1 ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; memb (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00f800) == 0xf1000000) {
+					// Instruction: 14: 11110001uuuuIIII00000iiisssstttt | memw (Ru + #U4:2) = #1 ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; memh (%s + 0x%x) = %s", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf1001000) {
+					// Instruction: 14: 11110001uuuuIIII00010000ssssiiii | memw (Ru + #U4:2) = #1 ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; memw (%s + 0x%x) = #0", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff00ff00) == 0xf1001100) {
+					// Instruction: 14: 11110001uuuuIIII00010001ssssiiii | memw (Ru + #U4:2) = #1 ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00000) >> 20); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0xf0000) >> 16) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (%s + 0x%x) = #1 ; memw (%s + 0x%x) = #1", hex_get_sub_reg(hi->ops[0].op.reg), hi->ops[1].op.imm, hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xe8001c00) {
+					// Instruction: 14: 1110100IIIIItttt0001110iiiii---- | memw (Sp + #U5:2) = Rt ; allocframe (#u5:3)
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___ALLOCFRAME___U5_3_;
+					hi->op_count = 3;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; allocframe (0x%x)", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xe8001200) {
+					// Instruction: 14: 1110100IIIIItttt00010010ssssiiii | memw (Sp + #U5:2) = Rt ; memb (Rs + #u4:0) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMB__RS____U4_0_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; memb (%s + 0x%x) = #0", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xe8001300) {
+					// Instruction: 14: 1110100IIIIItttt00010011ssssiiii | memw (Sp + #U5:2) = Rt ; memb (Rs + #u4:0) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMB__RS____U4_0_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; memb (%s + 0x%x) = #1", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xe8001000) {
+					// Instruction: 14: 1110100IIIIItttt00010000ssssiiii | memw (Sp + #U5:2) = Rt ; memw (Rs + #u4:2) = #0
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMW__RS____U4_2_____0;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; memw (%s + 0x%x) = #0", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00ff00) == 0xe8001100) {
+					// Instruction: 14: 1110100IIIIItttt00010001ssssiiii | memw (Sp + #U5:2) = Rt ; memw (Rs + #u4:2) = #1
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMW__RS____U4_2_____1;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xf) >> 0) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; memw (%s + 0x%x) = #1", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xe8000a00) {
+					// Instruction: 14: 1110100IIIIIvvvv0000101iiiiiittt | memw (Sp + #U5:2) = Rv ; memd (Sp + #s6:3) = Rtt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RV___MEMD__SP____S6_3____RTT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f8) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; memd (Sp + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_regpair(hi->ops[3].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00f800) == 0xe8000000) {
+					// Instruction: 14: 1110100IIIIIvvvv00000iiisssstttt | memw (Sp + #U5:2) = Rv ; memh (Rs + #u3:1) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RV___MEMH__RS____U3_1____RT;
+					hi->op_count = 5;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0xf0) >> 4); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x700) >> 8) << 1; // scaled
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; memh (%s + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hex_get_sub_reg(hi->ops[2].op.reg), hi->ops[3].op.imm, hex_get_sub_reg(hi->ops[4].op.reg));
+					break;
+				}
+				if ((hi_u32 & 0xfe00fe00) == 0xe8000800) {
+					// Instruction: 14: 1110100IIIIIvvvv0000100iiiiitttt | memw (Sp + #U5:2) = Rv ; memw (Sp + #u5:2) = Rt
+					hi->instruction = HEX_INS_DUPLEX_MEMW__SP____U5_2____RV___MEMW__SP____U5_2____RT;
+					hi->op_count = 4;
+					hi->duplex = true;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x1f00000) >> 20) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rv
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f0) >> 4) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0xf) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (Sp + 0x%x) = %s ; memw (Sp + 0x%x) = %s", hi->ops[0].op.imm, hex_get_sub_reg(hi->ops[1].op.reg), hi->ops[2].op.imm, hex_get_sub_reg(hi->ops[3].op.reg));
+					break;
+				}
+				break;
+			}
+		}
+	}
+	else {
+		switch ((hi_u32 >> 28) & 0xF) {
+			case 0x0: {
+				// Handle constant extender
+				hi->instruction = HEX_INS_IMMEXT;
+				hi->op_count = 1;
+				hi->ops[0].type = HEX_OP_TYPE_IMM;
+				hi->ops[0].attr |= HEX_OP_CONST_EXT;
+				hi->ops[0].op.imm = ((hi_u32 & 0x3FFF) | (((hi_u32 >> 16) & 0xFFF) << 14)) << 6;
+				constant_extender = hi->ops[0].op.imm;
+				sprintf(hi->mnem, "immext(#0x%x)", hi->ops[0].op.imm);
+				break;
+			}
+			case 0x1: {
+				if ((hi_u32 & 0xfc02300) == 0x1800000) {
+					// Instruction: 1: 0001000110iissssPP0---00iiiiiii- | p0 = cmp.eq (Rs, #-1) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS____1____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, #-1) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1800100) {
+					// Instruction: 1: 0001000110iissssPP0---01iiiiiii- | p0 = cmp.gt (Rs, #-1) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS____1____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, #-1) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1800300) {
+					// Instruction: 1: 0001000110iissssPP0---11iiiiiii- | p0 = tstbit (Rs, #0) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___TSTBIT__RS___0____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = tstbit (R%d, #0) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1802000) {
+					// Instruction: 1: 0001000110iissssPP1---00iiiiiii- | p0 = cmp.eq (Rs, #-1) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS____1____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, #-1) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1802100) {
+					// Instruction: 1: 0001000110iissssPP1---01iiiiiii- | p0 = cmp.gt (Rs, #-1) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS____1____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, #-1) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1802300) {
+					// Instruction: 1: 0001000110iissssPP1---11iiiiiii- | p0 = tstbit (Rs, #0) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___TSTBIT__RS___0____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = tstbit (R%d, #0) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1c00000) {
+					// Instruction: 1: 0001000111iissssPP0---00iiiiiii- | p0 = cmp.eq (Rs, #-1) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS____1____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, #-1) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1c00100) {
+					// Instruction: 1: 0001000111iissssPP0---01iiiiiii- | p0 = cmp.gt (Rs, #-1) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS____1____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, #-1) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1c00300) {
+					// Instruction: 1: 0001000111iissssPP0---11iiiiiii- | p0 = tstbit (Rs, #0) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___TSTBIT__RS___0____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = tstbit (R%d, #0) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1c02000) {
+					// Instruction: 1: 0001000111iissssPP1---00iiiiiii- | p0 = cmp.eq (Rs, #-1) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS____1____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, #-1) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1c02100) {
+					// Instruction: 1: 0001000111iissssPP1---01iiiiiii- | p0 = cmp.gt (Rs, #-1) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS____1____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, #-1) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x1c02300) {
+					// Instruction: 1: 0001000111iissssPP1---11iiiiiii- | p0 = tstbit (Rs, #0) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___TSTBIT__RS___0____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = tstbit (R%d, #0) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x0) {
+					// Instruction: 1: 0001000000iissssPP0IIIIIiiiiiii- | p0 = cmp.eq (Rs, #U5) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, 0x%x) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2000) {
+					// Instruction: 1: 0001000000iissssPP1IIIIIiiiiiii- | p0 = cmp.eq (Rs, #U5) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, 0x%x) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x400000) {
+					// Instruction: 1: 0001000001iissssPP0IIIIIiiiiiii- | p0 = cmp.eq (Rs, #U5) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, 0x%x) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x402000) {
+					// Instruction: 1: 0001000001iissssPP1IIIIIiiiiiii- | p0 = cmp.eq (Rs, #U5) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, 0x%x) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x800000) {
+					// Instruction: 1: 0001000010iissssPP0IIIIIiiiiiii- | p0 = cmp.gt (Rs, #U5) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS___U5____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, 0x%x) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x802000) {
+					// Instruction: 1: 0001000010iissssPP1IIIIIiiiiiii- | p0 = cmp.gt (Rs, #U5) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS___U5____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, 0x%x) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0xc00000) {
+					// Instruction: 1: 0001000011iissssPP0IIIIIiiiiiii- | p0 = cmp.gt (Rs, #U5) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, 0x%x) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0xc02000) {
+					// Instruction: 1: 0001000011iissssPP1IIIIIiiiiiii- | p0 = cmp.gt (Rs, #U5) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, 0x%x) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1000000) {
+					// Instruction: 1: 0001000100iissssPP0IIIIIiiiiiii- | p0 = cmp.gtu (Rs, #U5) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, 0x%x) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1002000) {
+					// Instruction: 1: 0001000100iissssPP1IIIIIiiiiiii- | p0 = cmp.gtu (Rs, #U5) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, 0x%x) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1400000) {
+					// Instruction: 1: 0001000101iissssPP0IIIIIiiiiiii- | p0 = cmp.gtu (Rs, #U5) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, 0x%x) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1402000) {
+					// Instruction: 1: 0001000101iissssPP1IIIIIiiiiiii- | p0 = cmp.gtu (Rs, #U5) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, 0x%x) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3800000) {
+					// Instruction: 1: 0001001110iissssPP0---00iiiiiii- | p1 = cmp.eq (Rs, #-1) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS____1____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, #-1) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3800100) {
+					// Instruction: 1: 0001001110iissssPP0---01iiiiiii- | p1 = cmp.gt (Rs, #-1) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS____1____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, #-1) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3800300) {
+					// Instruction: 1: 0001001110iissssPP0---11iiiiiii- | p1 = tstbit (Rs, #0) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___TSTBIT__RS___0____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = tstbit (R%d, #0) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3802000) {
+					// Instruction: 1: 0001001110iissssPP1---00iiiiiii- | p1 = cmp.eq (Rs, #-1) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS____1____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, #-1) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3802100) {
+					// Instruction: 1: 0001001110iissssPP1---01iiiiiii- | p1 = cmp.gt (Rs, #-1) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS____1____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, #-1) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3802300) {
+					// Instruction: 1: 0001001110iissssPP1---11iiiiiii- | p1 = tstbit (Rs, #0) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___TSTBIT__RS___0____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = tstbit (R%d, #0) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3c00000) {
+					// Instruction: 1: 0001001111iissssPP0---00iiiiiii- | p1 = cmp.eq (Rs, #-1) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS____1____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, #-1) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3c00100) {
+					// Instruction: 1: 0001001111iissssPP0---01iiiiiii- | p1 = cmp.gt (Rs, #-1) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS____1____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, #-1) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3c00300) {
+					// Instruction: 1: 0001001111iissssPP0---11iiiiiii- | p1 = tstbit (Rs, #0) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___TSTBIT__RS___0____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = tstbit (R%d, #0) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3c02000) {
+					// Instruction: 1: 0001001111iissssPP1---00iiiiiii- | p1 = cmp.eq (Rs, #-1) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS____1____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, #-1) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3c02100) {
+					// Instruction: 1: 0001001111iissssPP1---01iiiiiii- | p1 = cmp.gt (Rs, #-1) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS____1____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, #-1) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02300) == 0x3c02300) {
+					// Instruction: 1: 0001001111iissssPP1---11iiiiiii- | p1 = tstbit (Rs, #0) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___TSTBIT__RS___0____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = tstbit (R%d, #0) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2000000) {
+					// Instruction: 1: 0001001000iissssPP0IIIIIiiiiiii- | p1 = cmp.eq (Rs, #U5) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, 0x%x) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2002000) {
+					// Instruction: 1: 0001001000iissssPP1IIIIIiiiiiii- | p1 = cmp.eq (Rs, #U5) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, 0x%x) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2400000) {
+					// Instruction: 1: 0001001001iissssPP0IIIIIiiiiiii- | p1 = cmp.eq (Rs, #U5) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, 0x%x) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2402000) {
+					// Instruction: 1: 0001001001iissssPP1IIIIIiiiiiii- | p1 = cmp.eq (Rs, #U5) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, 0x%x) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2800000) {
+					// Instruction: 1: 0001001010iissssPP0IIIIIiiiiiii- | p1 = cmp.gt (Rs, #U5) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS___U5____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, 0x%x) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2802000) {
+					// Instruction: 1: 0001001010iissssPP1IIIIIiiiiiii- | p1 = cmp.gt (Rs, #U5) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS___U5____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, 0x%x) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2c00000) {
+					// Instruction: 1: 0001001011iissssPP0IIIIIiiiiiii- | p1 = cmp.gt (Rs, #U5) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, 0x%x) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2c02000) {
+					// Instruction: 1: 0001001011iissssPP1IIIIIiiiiiii- | p1 = cmp.gt (Rs, #U5) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, 0x%x) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x3000000) {
+					// Instruction: 1: 0001001100iissssPP0IIIIIiiiiiii- | p1 = cmp.gtu (Rs, #U5) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, 0x%x) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x3002000) {
+					// Instruction: 1: 0001001100iissssPP1IIIIIiiiiiii- | p1 = cmp.gtu (Rs, #U5) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, 0x%x) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x3400000) {
+					// Instruction: 1: 0001001101iissssPP0IIIIIiiiiiii- | p1 = cmp.gtu (Rs, #U5) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, 0x%x) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x3402000) {
+					// Instruction: 1: 0001001101iissssPP1IIIIIiiiiiii- | p1 = cmp.gtu (Rs, #U5) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, 0x%x) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4000000) {
+					// Instruction: 1: 0001010000iissssPP00ttttiiiiiii- | p0 = cmp.eq (Rs, Rt) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, R%d) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4001000) {
+					// Instruction: 1: 0001010000iissssPP01ttttiiiiiii- | p1 = cmp.eq (Rs, Rt) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, R%d) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4002000) {
+					// Instruction: 1: 0001010000iissssPP10ttttiiiiiii- | p0 = cmp.eq (Rs, Rt) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, R%d) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4003000) {
+					// Instruction: 1: 0001010000iissssPP11ttttiiiiiii- | p1 = cmp.eq (Rs, Rt) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, R%d) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4400000) {
+					// Instruction: 1: 0001010001iissssPP00ttttiiiiiii- | p0 = cmp.eq (Rs, Rt) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, R%d) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4401000) {
+					// Instruction: 1: 0001010001iissssPP01ttttiiiiiii- | p1 = cmp.eq (Rs, Rt) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, R%d) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4402000) {
+					// Instruction: 1: 0001010001iissssPP10ttttiiiiiii- | p0 = cmp.eq (Rs, Rt) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.eq (R%d, R%d) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4403000) {
+					// Instruction: 1: 0001010001iissssPP11ttttiiiiiii- | p1 = cmp.eq (Rs, Rt) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.eq (R%d, R%d) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4800000) {
+					// Instruction: 1: 0001010010iissssPP00ttttiiiiiii- | p0 = cmp.gt (Rs, Rt) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS__RT____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, R%d) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4801000) {
+					// Instruction: 1: 0001010010iissssPP01ttttiiiiiii- | p1 = cmp.gt (Rs, Rt) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS__RT____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, R%d) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4802000) {
+					// Instruction: 1: 0001010010iissssPP10ttttiiiiiii- | p0 = cmp.gt (Rs, Rt) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS__RT____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, R%d) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4803000) {
+					// Instruction: 1: 0001010010iissssPP11ttttiiiiiii- | p1 = cmp.gt (Rs, Rt) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS__RT____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, R%d) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4c00000) {
+					// Instruction: 1: 0001010011iissssPP00ttttiiiiiii- | p0 = cmp.gt (Rs, Rt) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, R%d) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4c01000) {
+					// Instruction: 1: 0001010011iissssPP01ttttiiiiiii- | p1 = cmp.gt (Rs, Rt) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, R%d) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4c02000) {
+					// Instruction: 1: 0001010011iissssPP10ttttiiiiiii- | p0 = cmp.gt (Rs, Rt) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GT__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gt (R%d, R%d) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x4c03000) {
+					// Instruction: 1: 0001010011iissssPP11ttttiiiiiii- | p1 = cmp.gt (Rs, Rt) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GT__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gt (R%d, R%d) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5000000) {
+					// Instruction: 1: 0001010100iissssPP00ttttiiiiiii- | p0 = cmp.gtu (Rs, Rt) ; if (p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF__P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, R%d) ; if (p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5001000) {
+					// Instruction: 1: 0001010100iissssPP01ttttiiiiiii- | p1 = cmp.gtu (Rs, Rt) ; if (p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF__P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, R%d) ; if (p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5002000) {
+					// Instruction: 1: 0001010100iissssPP10ttttiiiiiii- | p0 = cmp.gtu (Rs, Rt) ; if (p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF__P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, R%d) ; if (p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5003000) {
+					// Instruction: 1: 0001010100iissssPP11ttttiiiiiii- | p1 = cmp.gtu (Rs, Rt) ; if (p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF__P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, R%d) ; if (p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5400000) {
+					// Instruction: 1: 0001010101iissssPP00ttttiiiiiii- | p0 = cmp.gtu (Rs, Rt) ; if (!p0.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, R%d) ; if (!p0.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5401000) {
+					// Instruction: 1: 0001010101iissssPP01ttttiiiiiii- | p1 = cmp.gtu (Rs, Rt) ; if (!p1.new) jump:nt #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, R%d) ; if (!p1.new) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5402000) {
+					// Instruction: 1: 0001010101iissssPP10ttttiiiiiii- | p0 = cmp.gtu (Rs, Rt) ; if (!p0.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p0 = cmp.gtu (R%d, R%d) ; if (!p0.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc03000) == 0x5403000) {
+					// Instruction: 1: 0001010101iissssPP11ttttiiiiiii- | p1 = cmp.gtu (Rs, Rt) ; if (!p1.new) jump:t #r9:2
+					hi->instruction = HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p1 = cmp.gtu (R%d, R%d) ; if (!p1.new) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x6000000) {
+					// Instruction: 1: 00010110--iiddddPPIIIIIIiiiiiii- | Rd = #U6 ; jump #r9:2
+					hi->instruction = HEX_INS_MULT_RD____U6___JUMP__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = 0x%x ; jump 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x7000000) {
+					// Instruction: 1: 00010111--iissssPP--ddddiiiiiii- | Rd = Rs ; jump #r9:2
+					hi->instruction = HEX_INS_MULT_RD___RS___JUMP__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0xf00) >> 8); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0xf0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = R%d ; jump 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x2: {
+				if ((hi_u32 & 0xfc02000) == 0x0) {
+					// Instruction: 2: 0010000000ii-sssPP0tttttiiiiiii- | if (cmp.eq (Ns.new, Rt)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_EQ__NS_NEW__RT___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.eq (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2000) {
+					// Instruction: 2: 0010000000ii-sssPP1tttttiiiiiii- | if (cmp.eq (Ns.new, Rt)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_EQ__NS_NEW__RT___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.eq (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x400000) {
+					// Instruction: 2: 0010000001ii-sssPP0tttttiiiiiii- | if (!cmp.eq (Ns.new, Rt)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_EQ__NS_NEW__RT___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.eq (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x402000) {
+					// Instruction: 2: 0010000001ii-sssPP1tttttiiiiiii- | if (!cmp.eq (Ns.new, Rt)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_EQ__NS_NEW__RT___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.eq (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x800000) {
+					// Instruction: 2: 0010000010ii-sssPP0tttttiiiiiii- | if (cmp.gt (Ns.new, Rt)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__NS_NEW__RT___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gt (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x802000) {
+					// Instruction: 2: 0010000010ii-sssPP1tttttiiiiiii- | if (cmp.gt (Ns.new, Rt)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__NS_NEW__RT___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gt (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0xc00000) {
+					// Instruction: 2: 0010000011ii-sssPP0tttttiiiiiii- | if (!cmp.gt (Ns.new, Rt)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__NS_NEW__RT___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0xc02000) {
+					// Instruction: 2: 0010000011ii-sssPP1tttttiiiiiii- | if (!cmp.gt (Ns.new, Rt)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__NS_NEW__RT___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1000000) {
+					// Instruction: 2: 0010000100ii-sssPP0tttttiiiiiii- | if (cmp.gtu (Ns.new, Rt)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GTU__NS_NEW__RT___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gtu (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1002000) {
+					// Instruction: 2: 0010000100ii-sssPP1tttttiiiiiii- | if (cmp.gtu (Ns.new, Rt)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GTU__NS_NEW__RT___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gtu (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1400000) {
+					// Instruction: 2: 0010000101ii-sssPP0tttttiiiiiii- | if (!cmp.gtu (Ns.new, Rt)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GTU__NS_NEW__RT___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gtu (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1402000) {
+					// Instruction: 2: 0010000101ii-sssPP1tttttiiiiiii- | if (!cmp.gtu (Ns.new, Rt)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GTU__NS_NEW__RT___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gtu (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1800000) {
+					// Instruction: 2: 0010000110ii-sssPP0tttttiiiiiii- | if (cmp.gt (Rt, Ns.new)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__RT__NS_NEW___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gt (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1802000) {
+					// Instruction: 2: 0010000110ii-sssPP1tttttiiiiiii- | if (cmp.gt (Rt, Ns.new)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__RT__NS_NEW___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gt (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1c00000) {
+					// Instruction: 2: 0010000111ii-sssPP0tttttiiiiiii- | if (!cmp.gt (Rt, Ns.new)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__RT__NS_NEW___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x1c02000) {
+					// Instruction: 2: 0010000111ii-sssPP1tttttiiiiiii- | if (!cmp.gt (Rt, Ns.new)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__RT__NS_NEW___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2000000) {
+					// Instruction: 2: 0010001000ii-sssPP0tttttiiiiiii- | if (cmp.gtu (Rt, Ns.new)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GTU__RT__NS_NEW___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gtu (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2002000) {
+					// Instruction: 2: 0010001000ii-sssPP1tttttiiiiiii- | if (cmp.gtu (Rt, Ns.new)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GTU__RT__NS_NEW___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gtu (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2400000) {
+					// Instruction: 2: 0010001001ii-sssPP0tttttiiiiiii- | if (!cmp.gtu (Rt, Ns.new)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GTU__RT__NS_NEW___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gtu (R%d, R%d)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x2402000) {
+					// Instruction: 2: 0010001001ii-sssPP1tttttiiiiiii- | if (!cmp.gtu (Rt, Ns.new)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GTU__RT__NS_NEW___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gtu (R%d, R%d)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4000000) {
+					// Instruction: 2: 0010010000ii-sssPP0IIIIIiiiiiii- | if (cmp.eq (Ns.new, #U5)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_EQ__NS_NEW___U5___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (cmp.eq (R%d, 0x%x)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4002000) {
+					// Instruction: 2: 0010010000ii-sssPP1IIIIIiiiiiii- | if (cmp.eq (Ns.new, #U5)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_EQ__NS_NEW___U5___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (cmp.eq (R%d, 0x%x)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4400000) {
+					// Instruction: 2: 0010010001ii-sssPP0IIIIIiiiiiii- | if (!cmp.eq (Ns.new, #U5)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_EQ__NS_NEW___U5___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (!cmp.eq (R%d, 0x%x)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4402000) {
+					// Instruction: 2: 0010010001ii-sssPP1IIIIIiiiiiii- | if (!cmp.eq (Ns.new, #U5)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_EQ__NS_NEW___U5___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (!cmp.eq (R%d, 0x%x)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4800000) {
+					// Instruction: 2: 0010010010ii-sssPP0IIIIIiiiiiii- | if (cmp.gt (Ns.new, #U5)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__NS_NEW___U5___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (cmp.gt (R%d, 0x%x)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4802000) {
+					// Instruction: 2: 0010010010ii-sssPP1IIIIIiiiiiii- | if (cmp.gt (Ns.new, #U5)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__NS_NEW___U5___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (cmp.gt (R%d, 0x%x)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4c00000) {
+					// Instruction: 2: 0010010011ii-sssPP0IIIIIiiiiiii- | if (!cmp.gt (Ns.new, #U5)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__NS_NEW___U5___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, 0x%x)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x4c02000) {
+					// Instruction: 2: 0010010011ii-sssPP1IIIIIiiiiiii- | if (!cmp.gt (Ns.new, #U5)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__NS_NEW___U5___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, 0x%x)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5000000) {
+					// Instruction: 2: 0010010100ii-sssPP0IIIIIiiiiiii- | if (cmp.gtu (Ns.new, #U5)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GTU__NS_NEW___U5___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gtu (R%d, 0x%x)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5002000) {
+					// Instruction: 2: 0010010100ii-sssPP1IIIIIiiiiiii- | if (cmp.gtu (Ns.new, #U5)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GTU__NS_NEW___U5___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gtu (R%d, 0x%x)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5400000) {
+					// Instruction: 2: 0010010101ii-sssPP0IIIIIiiiiiii- | if (!cmp.gtu (Ns.new, #U5)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GTU__NS_NEW___U5___JUMP_NT__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gtu (R%d, 0x%x)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5402000) {
+					// Instruction: 2: 0010010101ii-sssPP1IIIIIiiiiiii- | if (!cmp.gtu (Ns.new, #U5)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GTU__NS_NEW___U5___JUMP_T__R9_2;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gtu (R%d, 0x%x)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5800000) {
+					// Instruction: 2: 0010010110ii-sssPP0-----iiiiiii- | if (tstbit (Ns.new, #0)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__TSTBIT__NS_NEW___0___JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (tstbit (R%d, #0)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5802000) {
+					// Instruction: 2: 0010010110ii-sssPP1-----iiiiiii- | if (tstbit (Ns.new, #0)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__TSTBIT__NS_NEW___0___JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (tstbit (R%d, #0)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5c00000) {
+					// Instruction: 2: 0010010111ii-sssPP0-----iiiiiii- | if (!tstbit (Ns.new, #0)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_TSTBIT__NS_NEW___0___JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!tstbit (R%d, #0)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x5c02000) {
+					// Instruction: 2: 0010010111ii-sssPP1-----iiiiiii- | if (!tstbit (Ns.new, #0)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_TSTBIT__NS_NEW___0___JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!tstbit (R%d, #0)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6000000) {
+					// Instruction: 2: 0010011000ii-sssPP0-----iiiiiii- | if (cmp.eq (Ns.new, #-1)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_EQ__NS_NEW____1___JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.eq (R%d, #-1)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6002000) {
+					// Instruction: 2: 0010011000ii-sssPP1-----iiiiiii- | if (cmp.eq (Ns.new, #-1)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_EQ__NS_NEW____1___JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.eq (R%d, #-1)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6400000) {
+					// Instruction: 2: 0010011001ii-sssPP0-----iiiiiii- | if (!cmp.eq (Ns.new, #-1)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_EQ__NS_NEW____1___JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.eq (R%d, #-1)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6402000) {
+					// Instruction: 2: 0010011001ii-sssPP1-----iiiiiii- | if (!cmp.eq (Ns.new, #-1)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_EQ__NS_NEW____1___JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.eq (R%d, #-1)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6800000) {
+					// Instruction: 2: 0010011010ii-sssPP0-----iiiiiii- | if (cmp.gt (Ns.new, #-1)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__NS_NEW____1___JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gt (R%d, #-1)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6802000) {
+					// Instruction: 2: 0010011010ii-sssPP1-----iiiiiii- | if (cmp.gt (Ns.new, #-1)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF__CMP_GT__NS_NEW____1___JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (cmp.gt (R%d, #-1)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6c00000) {
+					// Instruction: 2: 0010011011ii-sssPP0-----iiiiiii- | if (!cmp.gt (Ns.new, #-1)) jump:nt #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__NS_NEW____1___JUMP_NT__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, #-1)) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc02000) == 0x6c02000) {
+					// Instruction: 2: 0010011011ii-sssPP1-----iiiiiii- | if (!cmp.gt (Ns.new, #-1)) jump:t #r9:2
+					hi->instruction = HEX_INS_IF___NOT_CMP_GT__NS_NEW____1___JUMP_T__R9_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x70000) >> 16); // Ns.new
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x300000) >> 20) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (!cmp.gt (R%d, #-1)) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x3: {
+				if ((hi_u32 & 0xfe00000) == 0xac00000) {
+					// Instruction: 3: 00111010110sssssPPittttti--ddddd | Rdd = memd (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_RDD___MEMD__RS___RT_____U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d + R%d << 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xc00000) {
+					// Instruction: 3: 00110000110sssssPPitttttivvddddd | if (Pv) Rdd = memd (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV__RDD___MEMD__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) R%d:R%d = memd (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1c00000) {
+					// Instruction: 3: 00110001110sssssPPitttttivvddddd | if !Pv Rdd = memd (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_RDD___MEMD__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d R%d:R%d = memd (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2c00000) {
+					// Instruction: 3: 00110010110sssssPPitttttivvddddd | if (Pv.new) Rdd = memd (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV_NEW__RDD___MEMD__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d:R%d = memd (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3c00000) {
+					// Instruction: 3: 00110011110sssssPPitttttivvddddd | if !Pv.new Rdd = memd (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_RDD___MEMD__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new R%d:R%d = memd (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa000000) {
+					// Instruction: 3: 00111010000sssssPPittttti--ddddd | Rd = memb (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_RD___MEMB__RS___RT_____U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memb (R%d + R%d << 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x0) {
+					// Instruction: 3: 00110000000sssssPPitttttivvddddd | if (Pv) Rd = memb (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV__RD___MEMB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) R%d = memb (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1000000) {
+					// Instruction: 3: 00110001000sssssPPitttttivvddddd | if !Pv Rd = memb (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_RD___MEMB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d R%d = memb (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2000000) {
+					// Instruction: 3: 00110010000sssssPPitttttivvddddd | if (Pv.new) Rd = memb (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV_NEW__RD___MEMB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memb (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3000000) {
+					// Instruction: 3: 00110011000sssssPPitttttivvddddd | if !Pv.new Rd = memb (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_RD___MEMB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memb (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa400000) {
+					// Instruction: 3: 00111010010sssssPPittttti--ddddd | Rd = memh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_RD___MEMH__RS___RT_____U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memh (R%d + R%d << 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x400000) {
+					// Instruction: 3: 00110000010sssssPPitttttivvddddd | if (Pv) Rd = memh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV__RD___MEMH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) R%d = memh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1400000) {
+					// Instruction: 3: 00110001010sssssPPitttttivvddddd | if !Pv Rd = memh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_RD___MEMH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d R%d = memh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2400000) {
+					// Instruction: 3: 00110010010sssssPPitttttivvddddd | if (Pv.new) Rd = memh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV_NEW__RD___MEMH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3400000) {
+					// Instruction: 3: 00110011010sssssPPitttttivvddddd | if !Pv.new Rd = memh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_RD___MEMH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa200000) {
+					// Instruction: 3: 00111010001sssssPPittttti--ddddd | Rd = memub (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_RD___MEMUB__RS___RT_____U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memub (R%d + R%d << 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x200000) {
+					// Instruction: 3: 00110000001sssssPPitttttivvddddd | if (Pv) Rd = memub (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV__RD___MEMUB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) R%d = memub (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1200000) {
+					// Instruction: 3: 00110001001sssssPPitttttivvddddd | if !Pv Rd = memub (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_RD___MEMUB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d R%d = memub (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2200000) {
+					// Instruction: 3: 00110010001sssssPPitttttivvddddd | if (Pv.new) Rd = memub (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV_NEW__RD___MEMUB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memub (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3200000) {
+					// Instruction: 3: 00110011001sssssPPitttttivvddddd | if !Pv.new Rd = memub (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_RD___MEMUB__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memub (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa600000) {
+					// Instruction: 3: 00111010011sssssPPittttti--ddddd | Rd = memuh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_RD___MEMUH__RS___RT_____U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memuh (R%d + R%d << 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x600000) {
+					// Instruction: 3: 00110000011sssssPPitttttivvddddd | if (Pv) Rd = memuh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV__RD___MEMUH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) R%d = memuh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1600000) {
+					// Instruction: 3: 00110001011sssssPPitttttivvddddd | if !Pv Rd = memuh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_RD___MEMUH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d R%d = memuh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2600000) {
+					// Instruction: 3: 00110010011sssssPPitttttivvddddd | if (Pv.new) Rd = memuh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV_NEW__RD___MEMUH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memuh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3600000) {
+					// Instruction: 3: 00110011011sssssPPitttttivvddddd | if !Pv.new Rd = memuh (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_RD___MEMUH__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memuh (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa800000) {
+					// Instruction: 3: 00111010100sssssPPittttti--ddddd | Rd = memw (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_RD___MEMW__RS___RT_____U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw (R%d + R%d << 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x800000) {
+					// Instruction: 3: 00110000100sssssPPitttttivvddddd | if (Pv) Rd = memw (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV__RD___MEMW__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) R%d = memw (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1800000) {
+					// Instruction: 3: 00110001100sssssPPitttttivvddddd | if !Pv Rd = memw (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_RD___MEMW__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d R%d = memw (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2800000) {
+					// Instruction: 3: 00110010100sssssPPitttttivvddddd | if (Pv.new) Rd = memw (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__PV_NEW__RD___MEMW__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memw (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3800000) {
+					// Instruction: 3: 00110011100sssssPPitttttivvddddd | if !Pv.new Rd = memw (Rs + Rt << #u2)
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_RD___MEMW__RS___RT_____U2_;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[4].type = HEX_OP_TYPE_IMM;
+					hi->ops[4].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memw (R%d + R%d << 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg, hi->ops[4].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe000000) {
+					// Instruction: 3: 00111110-00sssssPP0iiiiii00ttttt | memb (Rs + #u6:0) += Rt
+					hi->instruction = HEX_INS_MEMB__RS____U6_0___PLUS_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) += R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe000020) {
+					// Instruction: 3: 00111110-00sssssPP0iiiiii01ttttt | memb (Rs + #u6:0) -= Rt
+					hi->instruction = HEX_INS_MEMB__RS____U6_0___MINUS_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) -= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe000040) {
+					// Instruction: 3: 00111110-00sssssPP0iiiiii10ttttt | memb (Rs + #u6:0) &= Rt
+					hi->instruction = HEX_INS_MEMB__RS____U6_0___AND_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) &= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe000060) {
+					// Instruction: 3: 00111110-00sssssPP0iiiiii11ttttt | memb (Rs + #u6:0) |= Rt
+					hi->instruction = HEX_INS_MEMB__RS____U6_0___OR_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) |= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf000000) {
+					// Instruction: 3: 00111111-00sssssPP0iiiiii00IIIII | memb (Rs + #u6:0) += #U5
+					hi->instruction = HEX_INS_MEMB__RS____U6_0___PLUS_EQ___U5;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) += 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf000020) {
+					// Instruction: 3: 00111111-00sssssPP0iiiiii01IIIII | memb (Rs + #u6:0) -= #U5
+					hi->instruction = HEX_INS_MEMB__RS____U6_0___MINUS_EQ___U5;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) -= 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf000040) {
+					// Instruction: 3: 00111111-00sssssPP0iiiiii10IIIII | memb (Rs + #u6:0) = clrbit (#U5)
+					hi->instruction = HEX_INS_MEMB__RS____U6_0____CLRBIT___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) = clrbit (0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf000060) {
+					// Instruction: 3: 00111111-00sssssPP0iiiiii11IIIII | memb (Rs + #u6:0) = setbit (#U5)
+					hi->instruction = HEX_INS_MEMB__RS____U6_0____SETBIT___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) = setbit (0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe200000) {
+					// Instruction: 3: 00111110-01sssssPP0iiiiii00ttttt | memh (Rs + #u6:1) += Rt
+					hi->instruction = HEX_INS_MEMH__RS____U6_1___PLUS_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) += R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe200020) {
+					// Instruction: 3: 00111110-01sssssPP0iiiiii01ttttt | memh (Rs + #u6:1) -= Rt
+					hi->instruction = HEX_INS_MEMH__RS____U6_1___MINUS_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) -= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe200040) {
+					// Instruction: 3: 00111110-01sssssPP0iiiiii10ttttt | memh (Rs + #u6:1) &= Rt
+					hi->instruction = HEX_INS_MEMH__RS____U6_1___AND_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) &= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe200060) {
+					// Instruction: 3: 00111110-01sssssPP0iiiiii11ttttt | memh (Rs + #u6:1) |= Rt
+					hi->instruction = HEX_INS_MEMH__RS____U6_1___OR_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) |= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf200000) {
+					// Instruction: 3: 00111111-01sssssPP0iiiiii00IIIII | memh (Rs + #u6:1) += #U5
+					hi->instruction = HEX_INS_MEMH__RS____U6_1___PLUS_EQ___U5;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) += 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf200020) {
+					// Instruction: 3: 00111111-01sssssPP0iiiiii01IIIII | memh (Rs + #u6:1) -= #U5
+					hi->instruction = HEX_INS_MEMH__RS____U6_1___MINUS_EQ___U5;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) -= 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf200040) {
+					// Instruction: 3: 00111111-01sssssPP0iiiiii10IIIII | memh (Rs + #u6:1) = clrbit (#U5)
+					hi->instruction = HEX_INS_MEMH__RS____U6_1____CLRBIT___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) = clrbit (0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf200060) {
+					// Instruction: 3: 00111111-01sssssPP0iiiiii11IIIII | memh (Rs + #u6:1) = setbit (#U5)
+					hi->instruction = HEX_INS_MEMH__RS____U6_1____SETBIT___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) = setbit (0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe400000) {
+					// Instruction: 3: 00111110-10sssssPP0iiiiii00ttttt | memw (Rs + #u6:2) += Rt
+					hi->instruction = HEX_INS_MEMW__RS____U6_2___PLUS_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) += R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe400020) {
+					// Instruction: 3: 00111110-10sssssPP0iiiiii01ttttt | memw (Rs + #u6:2) -= Rt
+					hi->instruction = HEX_INS_MEMW__RS____U6_2___MINUS_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) -= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe400040) {
+					// Instruction: 3: 00111110-10sssssPP0iiiiii10ttttt | memw (Rs + #u6:2) &= Rt
+					hi->instruction = HEX_INS_MEMW__RS____U6_2___AND_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) &= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xe400060) {
+					// Instruction: 3: 00111110-10sssssPP0iiiiii11ttttt | memw (Rs + #u6:2) |= Rt
+					hi->instruction = HEX_INS_MEMW__RS____U6_2___OR_EQ__RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) |= R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf400000) {
+					// Instruction: 3: 00111111-10sssssPP0iiiiii00IIIII | memw (Rs + #u6:2) += #U5
+					hi->instruction = HEX_INS_MEMW__RS____U6_2___PLUS_EQ___U5;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) += 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf400020) {
+					// Instruction: 3: 00111111-10sssssPP0iiiiii01IIIII | memw (Rs + #u6:2) -= #U5
+					hi->instruction = HEX_INS_MEMW__RS____U6_2___MINUS_EQ___U5;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) -= 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf400040) {
+					// Instruction: 3: 00111111-10sssssPP0iiiiii10IIIII | memw (Rs + #u6:2) = clrbit (#U5)
+					hi->instruction = HEX_INS_MEMW__RS____U6_2____CLRBIT___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) = clrbit (0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602060) == 0xf400060) {
+					// Instruction: 3: 00111111-10sssssPP0iiiiii11IIIII | memw (Rs + #u6:2) = setbit (#U5)
+					hi->instruction = HEX_INS_MEMW__RS____U6_2____SETBIT___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) = setbit (0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xba00000) {
+					// Instruction: 3: 00111011101sssssPPiuuuuui--00ttt | memb (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RS___RU_____U2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x4a00000) {
+					// Instruction: 3: 00110100101sssssPPiuuuuuivv00ttt | if (Pv) memb (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMB__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x5a00000) {
+					// Instruction: 3: 00110101101sssssPPiuuuuuivv00ttt | if !Pv memb (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x6a00000) {
+					// Instruction: 3: 00110110101sssssPPiuuuuuivv00ttt | if (Pv.new) memb (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x7a00000) {
+					// Instruction: 3: 00110111101sssssPPiuuuuuivv00ttt | if !Pv.new memb (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xba00008) {
+					// Instruction: 3: 00111011101sssssPPiuuuuui--01ttt | memh (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RS___RU_____U2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x4a00008) {
+					// Instruction: 3: 00110100101sssssPPiuuuuuivv01ttt | if (Pv) memh (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMH__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x5a00008) {
+					// Instruction: 3: 00110101101sssssPPiuuuuuivv01ttt | if !Pv memh (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x6a00008) {
+					// Instruction: 3: 00110110101sssssPPiuuuuuivv01ttt | if (Pv.new) memh (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x7a00008) {
+					// Instruction: 3: 00110111101sssssPPiuuuuuivv01ttt | if !Pv.new memh (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xba00010) {
+					// Instruction: 3: 00111011101sssssPPiuuuuui--10ttt | memw (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RS___RU_____U2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x4a00010) {
+					// Instruction: 3: 00110100101sssssPPiuuuuuivv10ttt | if (Pv) memw (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMW__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x5a00010) {
+					// Instruction: 3: 00110101101sssssPPiuuuuuivv10ttt | if !Pv memw (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x6a00010) {
+					// Instruction: 3: 00110110101sssssPPiuuuuuivv10ttt | if (Pv.new) memw (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0x7a00010) {
+					// Instruction: 3: 00110111101sssssPPiuuuuuivv10ttt | if !Pv.new memw (Rs + Ru << #u2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW__RS___RU_____U2____NT_NEW;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x7) >> 0); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xbc00000) {
+					// Instruction: 3: 00111011110sssssPPiuuuuui--ttttt | memd (Rs + Ru << #u2) = Rtt
+					hi->instruction = HEX_INS_MEMD__RS___RU_____U2____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (R%d + R%d << 0x%x) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4c00000) {
+					// Instruction: 3: 00110100110sssssPPiuuuuuivvttttt | if (Pv) memd (Rs + Ru << #u2) = Rtt
+					hi->instruction = HEX_INS_IF__PV__MEMD__RS___RU_____U2____RTT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memd (R%d + R%d << 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg + 1, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5c00000) {
+					// Instruction: 3: 00110101110sssssPPiuuuuuivvttttt | if !Pv memd (Rs + Ru << #u2) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMD__RS___RU_____U2____RTT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memd (R%d + R%d << 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg + 1, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6c00000) {
+					// Instruction: 3: 00110110110sssssPPiuuuuuivvttttt | if (Pv.new) memd (Rs + Ru << #u2) = Rtt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMD__RS___RU_____U2____RTT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memd (R%d + R%d << 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg + 1, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7c00000) {
+					// Instruction: 3: 00110111110sssssPPiuuuuuivvttttt | if !Pv.new memd (Rs + Ru << #u2) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMD__RS___RU_____U2____RTT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].attr |= HEX_OP_REG_PAIR;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memd (R%d + R%d << 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg + 1, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xb000000) {
+					// Instruction: 3: 00111011000sssssPPiuuuuui--ttttt | memb (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_MEMB__RS___RU_____U2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xe600000) == 0xc000000) {
+					// Instruction: 3: 0011110--00sssssPPIiiiiiiIIIIIII | memb (Rs + #u6:0) = #S8
+					hi->instruction = HEX_INS_MEMB__RS____U6_0_____S8;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x7f) >> 0));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d + 0x%x) = 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4000000) {
+					// Instruction: 3: 00110100000sssssPPiuuuuuivvttttt | if (Pv) memb (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMB__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5000000) {
+					// Instruction: 3: 00110101000sssssPPiuuuuuivvttttt | if !Pv memb (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6000000) {
+					// Instruction: 3: 00110110000sssssPPiuuuuuivvttttt | if (Pv.new) memb (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7000000) {
+					// Instruction: 3: 00110111000sssssPPiuuuuuivvttttt | if !Pv.new memb (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8000000) {
+					// Instruction: 3: 00111000000sssssPPIiiiiiivvIIIII | if (Pv) memb (Rs + #u6:0) = #S6
+					hi->instruction = HEX_INS_IF__PV__MEMB__RS____U6_0_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8800000) {
+					// Instruction: 3: 00111000100sssssPPIiiiiiivvIIIII | if !Pv memb (Rs + #u6:0) = #S6
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB__RS____U6_0_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9000000) {
+					// Instruction: 3: 00111001000sssssPPIiiiiiivvIIIII | if (Pv.new) memb (Rs + #u6:0) = #S6
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB__RS____U6_0_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9800000) {
+					// Instruction: 3: 00111001100sssssPPIiiiiiivvIIIII | if !Pv.new memb (Rs + #u6:0) = #S6
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB__RS____U6_0_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xb400000) {
+					// Instruction: 3: 00111011010sssssPPiuuuuui--ttttt | memh (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_MEMH__RS___RU_____U2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xb600000) {
+					// Instruction: 3: 00111011011sssssPPiuuuuui--ttttt | memh (Rs + Ru << #u2) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RS___RU_____U2____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + R%d << 0x%x) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xe600000) == 0xc200000) {
+					// Instruction: 3: 0011110--01sssssPPIiiiiiiIIIIIII | memh (Rs + #u6:1) = #S8
+					hi->instruction = HEX_INS_MEMH__RS____U6_1_____S8;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x7f) >> 0));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) = 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4400000) {
+					// Instruction: 3: 00110100010sssssPPiuuuuuivvttttt | if (Pv) memh (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMH__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4600000) {
+					// Instruction: 3: 00110100011sssssPPiuuuuuivvttttt | if (Pv) memh (Rs + Ru << #u2) = Rt.H
+					hi->instruction = HEX_INS_IF__PV__MEMH__RS___RU_____U2____RT_H;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d + R%d << 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5400000) {
+					// Instruction: 3: 00110101010sssssPPiuuuuuivvttttt | if !Pv memh (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5600000) {
+					// Instruction: 3: 00110101011sssssPPiuuuuuivvttttt | if !Pv memh (Rs + Ru << #u2) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RS___RU_____U2____RT_H;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d + R%d << 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6400000) {
+					// Instruction: 3: 00110110010sssssPPiuuuuuivvttttt | if (Pv.new) memh (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6600000) {
+					// Instruction: 3: 00110110011sssssPPiuuuuuivvttttt | if (Pv.new) memh (Rs + Ru << #u2) = Rt.H
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RS___RU_____U2____RT_H;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d + R%d << 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7400000) {
+					// Instruction: 3: 00110111010sssssPPiuuuuuivvttttt | if !Pv.new memh (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7600000) {
+					// Instruction: 3: 00110111011sssssPPiuuuuuivvttttt | if !Pv.new memh (Rs + Ru << #u2) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RS___RU_____U2____RT_H;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d + R%d << 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8200000) {
+					// Instruction: 3: 00111000001sssssPPIiiiiiivvIIIII | if (Pv) memh (Rs + #u6:1) = #S6
+					hi->instruction = HEX_INS_IF__PV__MEMH__RS____U6_1_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8a00000) {
+					// Instruction: 3: 00111000101sssssPPIiiiiiivvIIIII | if !Pv memh (Rs + #u6:1) = #S6
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RS____U6_1_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9200000) {
+					// Instruction: 3: 00111001001sssssPPIiiiiiivvIIIII | if (Pv.new) memh (Rs + #u6:1) = #S6
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RS____U6_1_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9a00000) {
+					// Instruction: 3: 00111001101sssssPPIiiiiiivvIIIII | if !Pv.new memh (Rs + #u6:1) = #S6
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xb800000) {
+					// Instruction: 3: 00111011100sssssPPiuuuuui--ttttt | memw (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_MEMW__RS___RU_____U2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xe600000) == 0xc400000) {
+					// Instruction: 3: 0011110--10sssssPPIiiiiiiIIIIIII | memw (Rs + #u6:2) = #S8
+					hi->instruction = HEX_INS_MEMW__RS____U6_2_____S8;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x7f) >> 0));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d + 0x%x) = 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4800000) {
+					// Instruction: 3: 00110100100sssssPPiuuuuuivvttttt | if (Pv) memw (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMW__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5800000) {
+					// Instruction: 3: 00110101100sssssPPiuuuuuivvttttt | if !Pv memw (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6800000) {
+					// Instruction: 3: 00110110100sssssPPiuuuuuivvttttt | if (Pv.new) memw (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7800000) {
+					// Instruction: 3: 00110111100sssssPPiuuuuuivvttttt | if !Pv.new memw (Rs + Ru << #u2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW__RS___RU_____U2____RT;
+					hi->op_count = 5;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[4].type = HEX_OP_TYPE_REG;
+					hi->ops[4].op.reg = (((hi_u32) & 0x1f) >> 0); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (R%d + R%d << 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm, hi->ops[4].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8400000) {
+					// Instruction: 3: 00111000010sssssPPIiiiiiivvIIIII | if (Pv) memw (Rs + #u6:2) = #S6
+					hi->instruction = HEX_INS_IF__PV__MEMW__RS____U6_2_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8c00000) {
+					// Instruction: 3: 00111000110sssssPPIiiiiiivvIIIII | if !Pv memw (Rs + #u6:2) = #S6
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW__RS____U6_2_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9400000) {
+					// Instruction: 3: 00111001010sssssPPIiiiiiivvIIIII | if (Pv.new) memw (Rs + #u6:2) = #S6
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW__RS____U6_2_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9c00000) {
+					// Instruction: 3: 00111001110sssssPPIiiiiiivvIIIII | if !Pv.new memw (Rs + #u6:2) = #S6
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW__RS____U6_2_____S6;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f80) >> 7) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x1f) >> 0));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (R%d + 0x%x) = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x4: {
+				if ((hi_u32 & 0x9e00000) == 0x9c00000) {
+					// Instruction: 4: 01001ii1110iiiiiPPiiiiiiiiiddddd | Rdd = memd (gp + #u16:3)
+					hi->instruction = HEX_INS_RDD___MEMD__GP____U16_3_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x3fe0) >> 5)) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd (gp + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x1c00000) {
+					// Instruction: 4: 01000001110sssssPP0ttiiiiiiddddd | if (Pt) Rdd = memd (Rs + #u6:3)
+					hi->instruction = HEX_INS_IF__PT__RDD___MEMD__RS____U6_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 3; // scaled
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend_off(&hi->ops[3], 3);
+					sprintf(hi->mnem, "if (P%d) R%d:R%d = memd (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x3c00000) {
+					// Instruction: 4: 01000011110sssssPP0ttiiiiiiddddd | if (Pt.new) Rdd = memd (Rs + #u6:3)
+					hi->instruction = HEX_INS_IF__PT_NEW__RDD___MEMD__RS____U6_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 3; // scaled
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend_off(&hi->ops[3], 3);
+					sprintf(hi->mnem, "if (P%d.new) R%d:R%d = memd (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5c00000) {
+					// Instruction: 4: 01000101110sssssPP0ttiiiiiiddddd | if !Pt Rdd = memd (Rs + #u6:3)
+					hi->instruction = HEX_INS_IF__NOT_PT_RDD___MEMD__RS____U6_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 3; // scaled
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend_off(&hi->ops[3], 3);
+					sprintf(hi->mnem, "if !P%d R%d:R%d = memd (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x7c00000) {
+					// Instruction: 4: 01000111110sssssPP0ttiiiiiiddddd | if !Pt.new Rdd = memd (Rs + #u6:3)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RDD___MEMD__RS____U6_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 3; // scaled
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend_off(&hi->ops[3], 3);
+					sprintf(hi->mnem, "if !P%d.new R%d:R%d = memd (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x9000000) {
+					// Instruction: 4: 01001ii1000iiiiiPPiiiiiiiiiddddd | Rd = memb (gp + #u16:0)
+					hi->instruction = HEX_INS_RD___MEMB__GP____U16_0_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x3fe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memb (gp + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x1000000) {
+					// Instruction: 4: 01000001000sssssPP0ttiiiiiiddddd | if (Pt) Rd = memb (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if (P%d) R%d = memb (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x3000000) {
+					// Instruction: 4: 01000011000sssssPP0ttiiiiiiddddd | if (Pt.new) Rd = memb (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memb (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5000000) {
+					// Instruction: 4: 01000101000sssssPP0ttiiiiiiddddd | if !Pt Rd = memb (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if !P%d R%d = memb (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x7000000) {
+					// Instruction: 4: 01000111000sssssPP0ttiiiiiiddddd | if !Pt.new Rd = memb (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if !P%d.new R%d = memb (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x9400000) {
+					// Instruction: 4: 01001ii1010iiiiiPPiiiiiiiiiddddd | Rd = memh (gp + #u16:1)
+					hi->instruction = HEX_INS_RD___MEMH__GP____U16_1_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x3fe0) >> 5)) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memh (gp + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x1400000) {
+					// Instruction: 4: 01000001010sssssPP0ttiiiiiiddddd | if (Pt) Rd = memh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if (P%d) R%d = memh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x3400000) {
+					// Instruction: 4: 01000011010sssssPP0ttiiiiiiddddd | if (Pt.new) Rd = memh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5400000) {
+					// Instruction: 4: 01000101010sssssPP0ttiiiiiiddddd | if !Pt Rd = memh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if !P%d R%d = memh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x7400000) {
+					// Instruction: 4: 01000111010sssssPP0ttiiiiiiddddd | if !Pt.new Rd = memh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if !P%d.new R%d = memh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x9200000) {
+					// Instruction: 4: 01001ii1001iiiiiPPiiiiiiiiiddddd | Rd = memub (gp + #u16:0)
+					hi->instruction = HEX_INS_RD___MEMUB__GP____U16_0_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x3fe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memub (gp + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x1200000) {
+					// Instruction: 4: 01000001001sssssPP0ttiiiiiiddddd | if (Pt) Rd = memub (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMUB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if (P%d) R%d = memub (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x3200000) {
+					// Instruction: 4: 01000011001sssssPP0ttiiiiiiddddd | if (Pt.new) Rd = memub (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMUB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memub (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5200000) {
+					// Instruction: 4: 01000101001sssssPP0ttiiiiiiddddd | if !Pt Rd = memub (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMUB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if !P%d R%d = memub (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x7200000) {
+					// Instruction: 4: 01000111001sssssPP0ttiiiiiiddddd | if !Pt.new Rd = memub (Rs + #u6:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMUB__RS____U6_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5);
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if !P%d.new R%d = memub (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x9600000) {
+					// Instruction: 4: 01001ii1011iiiiiPPiiiiiiiiiddddd | Rd = memuh (gp + #u16:1)
+					hi->instruction = HEX_INS_RD___MEMUH__GP____U16_1_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x3fe0) >> 5)) << 1; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memuh (gp + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x1600000) {
+					// Instruction: 4: 01000001011sssssPP0ttiiiiiiddddd | if (Pt) Rd = memuh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMUH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if (P%d) R%d = memuh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x3600000) {
+					// Instruction: 4: 01000011011sssssPP0ttiiiiiiddddd | if (Pt.new) Rd = memuh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMUH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memuh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5600000) {
+					// Instruction: 4: 01000101011sssssPP0ttiiiiiiddddd | if !Pt Rd = memuh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMUH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if !P%d R%d = memuh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x7600000) {
+					// Instruction: 4: 01000111011sssssPP0ttiiiiiiddddd | if !Pt.new Rd = memuh (Rs + #u6:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMUH__RS____U6_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 1; // scaled
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend_off(&hi->ops[3], 1);
+					sprintf(hi->mnem, "if !P%d.new R%d = memuh (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x9800000) {
+					// Instruction: 4: 01001ii1100iiiiiPPiiiiiiiiiddddd | Rd = memw (gp + #u16:2)
+					hi->instruction = HEX_INS_RD___MEMW__GP____U16_2_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x3fe0) >> 5)) << 2; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw (gp + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x1800000) {
+					// Instruction: 4: 01000001100sssssPP0ttiiiiiiddddd | if (Pt) Rd = memw (Rs + #u6:2)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMW__RS____U6_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 2; // scaled
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend_off(&hi->ops[3], 2);
+					sprintf(hi->mnem, "if (P%d) R%d = memw (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x3800000) {
+					// Instruction: 4: 01000011100sssssPP0ttiiiiiiddddd | if (Pt.new) Rd = memw (Rs + #u6:2)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMW__RS____U6_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 2; // scaled
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend_off(&hi->ops[3], 2);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memw (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5800000) {
+					// Instruction: 4: 01000101100sssssPP0ttiiiiiiddddd | if !Pt Rd = memw (Rs + #u6:2)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMW__RS____U6_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 2; // scaled
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend_off(&hi->ops[3], 2);
+					sprintf(hi->mnem, "if !P%d R%d = memw (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x7800000) {
+					// Instruction: 4: 01000111100sssssPP0ttiiiiiiddddd | if !Pt.new Rd = memw (Rs + #u6:2)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMW__RS____U6_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x1800) >> 11);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x7e0) >> 5) << 2; // scaled
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend_off(&hi->ops[3], 2);
+					sprintf(hi->mnem, "if !P%d.new R%d = memw (R%d + 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e01800) == 0x8a00000) {
+					// Instruction: 4: 01001ii0101iiiiiPPi00tttiiiiiiii | memb (gp + #u16:0) = Nt.new
+					hi->instruction = HEX_INS_MEMB__GP____U16_0____NT_NEW;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0));
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[0]);
+					sprintf(hi->mnem, "memb (gp + 0x%x) = R%d", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0xa00000) {
+					// Instruction: 4: 01000000101sssssPPi00tttiiiii0vv | if (Pv) memb (Rs + #u6:0) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMB__RS____U6_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x2a00000) {
+					// Instruction: 4: 01000010101sssssPPi00tttiiiii0vv | if (Pv.new) memb (Rs + #u6:0) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB__RS____U6_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x4a00000) {
+					// Instruction: 4: 01000100101sssssPPi00tttiiiii0vv | if !Pv memb (Rs + #u6:0) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB__RS____U6_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x6a00000) {
+					// Instruction: 4: 01000110101sssssPPi00tttiiiii0vv | if !Pv.new memb (Rs + #u6:0) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB__RS____U6_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e01800) == 0x8a00800) {
+					// Instruction: 4: 01001ii0101iiiiiPPi01tttiiiiiiii | memh (gp + #u16:1) = Nt.new
+					hi->instruction = HEX_INS_MEMH__GP____U16_1____NT_NEW;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 1; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (gp + 0x%x) = R%d", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0xa00800) {
+					// Instruction: 4: 01000000101sssssPPi01tttiiiii0vv | if (Pv) memh (Rs + #u6:1) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMH__RS____U6_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x2a00800) {
+					// Instruction: 4: 01000010101sssssPPi01tttiiiii0vv | if (Pv.new) memh (Rs + #u6:1) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RS____U6_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x4a00800) {
+					// Instruction: 4: 01000100101sssssPPi01tttiiiii0vv | if !Pv memh (Rs + #u6:1) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RS____U6_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x6a00800) {
+					// Instruction: 4: 01000110101sssssPPi01tttiiiii0vv | if !Pv.new memh (Rs + #u6:1) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e01800) == 0x8a01000) {
+					// Instruction: 4: 01001ii0101iiiiiPPi10tttiiiiiiii | memw (gp + #u16:2) = Nt.new
+					hi->instruction = HEX_INS_MEMW__GP____U16_2____NT_NEW;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (gp + 0x%x) = R%d", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0xa01000) {
+					// Instruction: 4: 01000000101sssssPPi10tttiiiii0vv | if (Pv) memw (Rs + #u6:2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMW__RS____U6_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x2a01000) {
+					// Instruction: 4: 01000010101sssssPPi10tttiiiii0vv | if (Pv.new) memw (Rs + #u6:2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW__RS____U6_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x4a01000) {
+					// Instruction: 4: 01000100101sssssPPi10tttiiiii0vv | if !Pv memw (Rs + #u6:2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW__RS____U6_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01804) == 0x6a01000) {
+					// Instruction: 4: 01000110101sssssPPi10tttiiiii0vv | if !Pv.new memw (Rs + #u6:2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW__RS____U6_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x8c00000) {
+					// Instruction: 4: 01001ii0110iiiiiPPitttttiiiiiiii | memd (gp + #u16:3) = Rtt
+					hi->instruction = HEX_INS_MEMD__GP____U16_3____RTT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 3; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (gp + 0x%x) = R%d:R%d", hi->ops[0].op.imm, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0xc00000) {
+					// Instruction: 4: 01000000110sssssPPitttttiiiii0vv | if (Pv) memd (Rs + #u6:3) = Rtt
+					hi->instruction = HEX_INS_IF__PV__MEMD__RS____U6_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 3; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					hex_op_extend_off(&hi->ops[2], 3);
+					sprintf(hi->mnem, "if (P%d) memd (R%d + 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x2c00000) {
+					// Instruction: 4: 01000010110sssssPPitttttiiiii0vv | if (Pv.new) memd (Rs + #u6:3) = Rtt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMD__RS____U6_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 3; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					hex_op_extend_off(&hi->ops[2], 3);
+					sprintf(hi->mnem, "if (P%d.new) memd (R%d + 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x4c00000) {
+					// Instruction: 4: 01000100110sssssPPitttttiiiii0vv | if !Pv memd (Rs + #u6:3) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMD__RS____U6_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 3; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					hex_op_extend_off(&hi->ops[2], 3);
+					sprintf(hi->mnem, "if !P%d memd (R%d + 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x6c00000) {
+					// Instruction: 4: 01000110110sssssPPitttttiiiii0vv | if !Pv.new memd (Rs + #u6:3) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMD__RS____U6_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 3; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					hex_op_extend_off(&hi->ops[2], 3);
+					sprintf(hi->mnem, "if !P%d.new memd (R%d + 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x8000000) {
+					// Instruction: 4: 01001ii0000iiiiiPPitttttiiiiiiii | memb (gp + #u16:0) = Rt
+					hi->instruction = HEX_INS_MEMB__GP____U16_0____RT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0));
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[0]);
+					sprintf(hi->mnem, "memb (gp + 0x%x) = R%d", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x0) {
+					// Instruction: 4: 01000000000sssssPPitttttiiiii0vv | if (Pv) memb (Rs + #u6:0) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMB__RS____U6_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x2000000) {
+					// Instruction: 4: 01000010000sssssPPitttttiiiii0vv | if (Pv.new) memb (Rs + #u6:0) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB__RS____U6_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x4000000) {
+					// Instruction: 4: 01000100000sssssPPitttttiiiii0vv | if !Pv memb (Rs + #u6:0) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB__RS____U6_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x6000000) {
+					// Instruction: 4: 01000110000sssssPPitttttiiiii0vv | if !Pv.new memb (Rs + #u6:0) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB__RS____U6_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3));
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new memb (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x8400000) {
+					// Instruction: 4: 01001ii0010iiiiiPPitttttiiiiiiii | memh (gp + #u16:1) = Rt
+					hi->instruction = HEX_INS_MEMH__GP____U16_1____RT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 1; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (gp + 0x%x) = R%d", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x8600000) {
+					// Instruction: 4: 01001ii0011iiiiiPPitttttiiiiiiii | memh (gp + #u16:1) = Rt.H
+					hi->instruction = HEX_INS_MEMH__GP____U16_1____RT_H;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 1; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (gp + 0x%x) = R%d.H", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x400000) {
+					// Instruction: 4: 01000000010sssssPPitttttiiiii0vv | if (Pv) memh (Rs + #u6:1) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMH__RS____U6_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					hex_op_extend_off(&hi->ops[2], 1);
+					sprintf(hi->mnem, "if (P%d) memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x600000) {
+					// Instruction: 4: 01000000011sssssPPitttttiiiii0vv | if (Pv) memh (Rs + #u6:1) = Rt.H
+					hi->instruction = HEX_INS_IF__PV__MEMH__RS____U6_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d + 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x2400000) {
+					// Instruction: 4: 01000010010sssssPPitttttiiiii0vv | if (Pv.new) memh (Rs + #u6:1) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RS____U6_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					hex_op_extend_off(&hi->ops[2], 1);
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x2600000) {
+					// Instruction: 4: 01000010011sssssPPitttttiiiii0vv | if (Pv.new) memh (Rs + #u6:1) = Rt.H
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RS____U6_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d + 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x4400000) {
+					// Instruction: 4: 01000100010sssssPPitttttiiiii0vv | if !Pv memh (Rs + #u6:1) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RS____U6_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					hex_op_extend_off(&hi->ops[2], 1);
+					sprintf(hi->mnem, "if !P%d memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x4600000) {
+					// Instruction: 4: 01000100011sssssPPitttttiiiii0vv | if !Pv memh (Rs + #u6:1) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RS____U6_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d + 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x6400000) {
+					// Instruction: 4: 01000110010sssssPPitttttiiiii0vv | if !Pv.new memh (Rs + #u6:1) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					hex_op_extend_off(&hi->ops[2], 1);
+					sprintf(hi->mnem, "if !P%d.new memh (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x6600000) {
+					// Instruction: 4: 01000110011sssssPPitttttiiiii0vv | if !Pv.new memh (Rs + #u6:1) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 1; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d + 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x8800000) {
+					// Instruction: 4: 01001ii0100iiiiiPPitttttiiiiiiii | memw (gp + #u16:2) = Rt
+					hi->instruction = HEX_INS_MEMW__GP____U16_2____RT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 2; // scaled
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (gp + 0x%x) = R%d", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x800000) {
+					// Instruction: 4: 01000000100sssssPPitttttiiiii0vv | if (Pv) memw (Rs + #u6:2) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMW__RS____U6_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (P%d) memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x2800000) {
+					// Instruction: 4: 01000010100sssssPPitttttiiiii0vv | if (Pv.new) memw (Rs + #u6:2) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW__RS____U6_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if (P%d.new) memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x4800000) {
+					// Instruction: 4: 01000100100sssssPPitttttiiiii0vv | if !Pv memw (Rs + #u6:2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW__RS____U6_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if !P%d memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00004) == 0x6800000) {
+					// Instruction: 4: 01000110100sssssPPitttttiiiii0vv | if !Pv.new memw (Rs + #u6:2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW__RS____U6_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xf8) >> 3)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "if !P%d.new memw (R%d + 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				break;
+			}
+			case 0x5: {
+				if ((hi_u32 & 0xfe00000) == 0xa00000) {
+					// Instruction: 5: 01010000101sssssPP-------------- | callr Rs
+					hi->instruction = HEX_INS_CALLR_RS;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "callr R%d", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1000000) {
+					// Instruction: 5: 01010001000sssssPP----uu-------- | if (Pu) callr Rs
+					hi->instruction = HEX_INS_IF__PU__CALLR_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) callr R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1200000) {
+					// Instruction: 5: 01010001001sssssPP----uu-------- | if !Pu callr Rs
+					hi->instruction = HEX_INS_IF__NOT_PU_CALLR_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d callr R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2a00000) {
+					// Instruction: 5: 01010010101sssssPP-------------- | hintjr (Rs)
+					hi->instruction = HEX_INS_HINTJR__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "hintjr (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2800000) {
+					// Instruction: 5: 01010010100sssssPP-------------- | jumpr Rs
+					hi->instruction = HEX_INS_JUMPR_RS;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "jumpr R%d", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3400000) {
+					// Instruction: 5: 01010011010sssssPP-00-uu-------- | if (Pu) jumpr:nt Rs
+					hi->instruction = HEX_INS_IF__PU__JUMPR_NT_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) jumpr:nt R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3400800) {
+					// Instruction: 5: 01010011010sssssPP-01-uu-------- | if (Pu.new) jumpr:nt Rs
+					hi->instruction = HEX_INS_IF__PU_NEW__JUMPR_NT_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) jumpr:nt R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3401000) {
+					// Instruction: 5: 01010011010sssssPP-10-uu-------- | if (Pu) jumpr:t Rs
+					hi->instruction = HEX_INS_IF__PU__JUMPR_T_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) jumpr:t R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3401800) {
+					// Instruction: 5: 01010011010sssssPP-11-uu-------- | if (Pu.new) jumpr:t Rs
+					hi->instruction = HEX_INS_IF__PU_NEW__JUMPR_T_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) jumpr:t R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3600000) {
+					// Instruction: 5: 01010011011sssssPP-00-uu-------- | if !Pu jumpr:nt Rs
+					hi->instruction = HEX_INS_IF__NOT_PU_JUMPR_NT_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d jumpr:nt R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3600800) {
+					// Instruction: 5: 01010011011sssssPP-01-uu-------- | if !Pu.new jumpr:nt Rs
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_JUMPR_NT_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new jumpr:nt R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3601000) {
+					// Instruction: 5: 01010011011sssssPP-10-uu-------- | if !Pu jumpr:t Rs
+					hi->instruction = HEX_INS_IF__NOT_PU_JUMPR_T_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d jumpr:t R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01800) == 0x3601800) {
+					// Instruction: 5: 01010011011sssssPP-11-uu-------- | if !Pu.new jumpr:t Rs
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_JUMPR_T_RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new jumpr:t R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xe000001) == 0xa000000) {
+					// Instruction: 5: 0101101iiiiiiiiiPPiiiiiiiiiiiii0 | call #r22:2
+					hi->instruction = HEX_INS_CALL__R22_2;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1ff0000) >> 16) | ((hi_u32 & 0x3ffe) >> 1)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[0], 2);
+					sprintf(hi->mnem, "call 0x%x", hi->ops[0].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf200800) == 0xd000000) {
+					// Instruction: 5: 01011101ii0iiiiiPPi-0-uuiiiiiii- | if (Pu) call #r15:2
+					hi->instruction = HEX_INS_IF__PU__CALL__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					hex_op_extend_off(&hi->ops[1], 2);
+					sprintf(hi->mnem, "if (P%d) call 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf200800) == 0xd200000) {
+					// Instruction: 5: 01011101ii1iiiiiPPi-0-uuiiiiiii- | if !Pu call #r15:2
+					hi->instruction = HEX_INS_IF__NOT_PU_CALL__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					hex_op_extend_off(&hi->ops[1], 2);
+					sprintf(hi->mnem, "if !P%d call 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xe000000) == 0x8000000) {
+					// Instruction: 5: 0101100iiiiiiiiiPPiiiiiiiiiiiii- | jump #r22:2
+					hi->instruction = HEX_INS_JUMP__R22_2;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1ff0000) >> 16) | ((hi_u32 & 0x3ffe) >> 1)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[0], 2);
+					sprintf(hi->mnem, "jump 0x%x", hi->ops[0].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc000000) {
+					// Instruction: 5: 01011100ii0iiiiiPPi00-uuiiiiiii- | if (Pu) jump:nt #r15:2
+					hi->instruction = HEX_INS_IF__PU__JUMP_NT__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) jump:nt 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc001000) {
+					// Instruction: 5: 01011100ii0iiiiiPPi10-uuiiiiiii- | if (Pu) jump:t #r15:2
+					hi->instruction = HEX_INS_IF__PU__JUMP_T__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) jump:t 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc200000) {
+					// Instruction: 5: 01011100ii1iiiiiPPi00-uuiiiiiii- | if !Pu jump:nt #r15:2
+					hi->instruction = HEX_INS_IF__NOT_PU_JUMP_NT__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d jump:nt 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc201000) {
+					// Instruction: 5: 01011100ii1iiiiiPPi10-uuiiiiiii- | if !Pu jump:t #r15:2
+					hi->instruction = HEX_INS_IF__NOT_PU_JUMP_T__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d jump:t 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc000800) {
+					// Instruction: 5: 01011100ii0iiiiiPPi01-uuiiiiiii- | if (Pu.new) jump:nt #r15:2
+					hi->instruction = HEX_INS_IF__PU_NEW__JUMP_NT__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) jump:nt 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc001800) {
+					// Instruction: 5: 01011100ii0iiiiiPPi11-uuiiiiiii- | if (Pu.new) jump:t #r15:2
+					hi->instruction = HEX_INS_IF__PU_NEW__JUMP_T__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) jump:t 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc200800) {
+					// Instruction: 5: 01011100ii1iiiiiPPi01-uuiiiiiii- | if !Pu.new jump:nt #r15:2
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_JUMP_NT__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new jump:nt 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf201800) == 0xc201800) {
+					// Instruction: 5: 01011100ii1iiiiiPPi11-uuiiiiiii- | if !Pu.new jump:t #r15:2
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_JUMP_T__R15_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xfe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new jump:t 0x%x", hi->ops[0].op.pred, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5a00000) {
+					// Instruction: 5: 01010101101sssssPP---------ddddd | Rd = icdatar (Rs)
+					hi->instruction = HEX_INS_RD___ICDATAR__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = icdatar (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5e00000) {
+					// Instruction: 5: 01010101111sssssPP---------ddddd | Rd = ictagr (Rs)
+					hi->instruction = HEX_INS_RD___ICTAGR__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = ictagr (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0x6c00800) {
+					// Instruction: 5: 01010110110sssssPP001----------- | icinvidx (Rs)
+					hi->instruction = HEX_INS_ICINVIDX__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "icinvidx (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5c00000) {
+					// Instruction: 5: 01010101110sssssPP-ttttt-------- | ictagw (Rs, Rt)
+					hi->instruction = HEX_INS_ICTAGW__RS__RT_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "ictagw (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0x6c01000) {
+					// Instruction: 5: 01010110110-----PP010----------- | ickill
+					hi->instruction = HEX_INS_ICKILL;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "ickill");
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x7e00000) {
+					// Instruction: 5: 01010111111-----PP00----000----- | rte
+					hi->instruction = HEX_INS_RTE;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "rte");
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x7e01000) {
+					// Instruction: 5: 01010111111-----PP01----000----- | rteunlock
+					hi->instruction = HEX_INS_RTEUNLOCK;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "rteunlock");
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0x6c00000) {
+					// Instruction: 5: 01010110110sssssPP000----------- | icinva (Rs)
+					hi->instruction = HEX_INS_ICINVA__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "icinva (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfff23ff) == 0x7c00002) {
+					// Instruction: 5: 0101011111000000PP0---0000000010 | isync
+					hi->instruction = HEX_INS_ISYNC;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "isync");
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x4400000) {
+					// Instruction: 5: 0101010001------PP-iiiii---iii-- | pause (#u8)
+					hi->instruction = HEX_INS_PAUSE___U8_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x1c) >> 2));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "pause (0x%x)", hi->ops[0].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x4000000) {
+					// Instruction: 5: 0101010000------PP-iiiii---iii-- | trap0 (#u8)
+					hi->instruction = HEX_INS_TRAP0___U8_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x1c) >> 2));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "trap0 (0x%x)", hi->ops[0].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x4800000) {
+					// Instruction: 5: 0101010010------PP-iiiii---iii-- | trap1 (#u8)
+					hi->instruction = HEX_INS_TRAP1___U8_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x1c) >> 2));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "trap1 (0x%x)", hi->ops[0].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x6: {
+				if ((hi_u32 & 0xff02090) == 0xb002090) {
+					// Instruction: 6: 011010110000--ssPP1---tt1--1--dd | Pd = fastcorner9 (Ps, Pt)
+					hi->instruction = HEX_INS_PD___FASTCORNER9__PS__PT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = fastcorner9 (P%d, P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02090) == 0xb102090) {
+					// Instruction: 6: 011010110001--ssPP1---tt1--1--dd | Pd = !fastcorner9 (Ps, Pt)
+					hi->instruction = HEX_INS_PD____NOT_FASTCORNER9__PS__PT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !fastcorner9 (P%d, P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb800000) {
+					// Instruction: 6: 011010111000--ssPP0-----------dd | Pd = any8 (Ps)
+					hi->instruction = HEX_INS_PD___ANY8__PS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = any8 (P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xba00000) {
+					// Instruction: 6: 011010111010--ssPP0-----------dd | Pd = all8 (Ps)
+					hi->instruction = HEX_INS_PD___ALL8__PS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = all8 (P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x0) {
+					// Instruction: 6: 01100000000sssssPP-iiiii---ii--- | loop0 (#r7:2, Rs)
+					hi->instruction = HEX_INS_LOOP0___R7_2__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[0], 2);
+					sprintf(hi->mnem, "loop0 (0x%x, R%d)", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x200000) {
+					// Instruction: 6: 01100000001sssssPP-iiiii---ii--- | loop1 (#r7:2, Rs)
+					hi->instruction = HEX_INS_LOOP1___R7_2__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[0], 2);
+					sprintf(hi->mnem, "loop1 (0x%x, R%d)", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9000000) {
+					// Instruction: 6: 01101001000IIIIIPP-iiiiiIIIii-II | loop0 (#r7:2, #U10)
+					hi->instruction = HEX_INS_LOOP0___R7_2___U10_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x3) >> 0));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "loop0 (0x%x, 0x%x)", hi->ops[0].op.imm, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9200000) {
+					// Instruction: 6: 01101001001IIIIIPP-iiiiiIIIii-II | loop1 (#r7:2, #U10)
+					hi->instruction = HEX_INS_LOOP1___R7_2___U10_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x3) >> 0));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "loop1 (0x%x, 0x%x)", hi->ops[0].op.imm, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfff0000) == 0xa490000) {
+					// Instruction: 6: 0110101001001001PP-iiiiii--ddddd | Rd = add (pc, #u6)
+					hi->instruction = HEX_INS_RD___ADD__PC___U6_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1f80) >> 7);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = add (pc, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa00000) {
+					// Instruction: 6: 01100000101sssssPP-iiiii---ii--- | p3 = sp1loop0 (#r7:2, Rs)
+					hi->instruction = HEX_INS_P3___SP1LOOP0___R7_2__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p3 = sp1loop0 (0x%x, R%d)", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xc00000) {
+					// Instruction: 6: 01100000110sssssPP-iiiii---ii--- | p3 = sp2loop0 (#r7:2, Rs)
+					hi->instruction = HEX_INS_P3___SP2LOOP0___R7_2__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p3 = sp2loop0 (0x%x, R%d)", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xe00000) {
+					// Instruction: 6: 01100000111sssssPP-iiiii---ii--- | p3 = sp3loop0 (#r7:2, Rs)
+					hi->instruction = HEX_INS_P3___SP3LOOP0___R7_2__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p3 = sp3loop0 (0x%x, R%d)", hi->ops[0].op.imm, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9a00000) {
+					// Instruction: 6: 01101001101IIIIIPP-iiiiiIIIii-II | p3 = sp1loop0 (#r7:2, #U10)
+					hi->instruction = HEX_INS_P3___SP1LOOP0___R7_2___U10_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x3) >> 0));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p3 = sp1loop0 (0x%x, 0x%x)", hi->ops[0].op.imm, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9c00000) {
+					// Instruction: 6: 01101001110IIIIIPP-iiiiiIIIii-II | p3 = sp2loop0 (#r7:2, #U10)
+					hi->instruction = HEX_INS_P3___SP2LOOP0___R7_2___U10_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x3) >> 0));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p3 = sp2loop0 (0x%x, 0x%x)", hi->ops[0].op.imm, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x9e00000) {
+					// Instruction: 6: 01101001111IIIIIPP-iiiiiIIIii-II | p3 = sp3loop0 (#r7:2, #U10)
+					hi->instruction = HEX_INS_P3___SP3LOOP0___R7_2___U10_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32 & 0x1f00) >> 8) | ((hi_u32 & 0x18) >> 3)) << 2; // scaled
+					if (hi->ops[0].op.imm & (1 << 0)) {
+						hi->ops[0].op.imm |= (0xFFFFFFFF << 0);
+					}
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x3) >> 0));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "p3 = sp3loop0 (0x%x, 0x%x)", hi->ops[0].op.imm, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb000000) {
+					// Instruction: 6: 011010110000--ssPP0---tt------dd | Pd = and (Pt, Ps)
+					hi->instruction = HEX_INS_PD___AND__PT__PS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = and (P%d, P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb100000) {
+					// Instruction: 6: 011010110001--ssPP0---ttuu----dd | Pd = and (Ps, and (Pt, Pu))
+					hi->instruction = HEX_INS_PD___AND__PS__AND__PT__PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = and (P%d, and (P%d, P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb200000) {
+					// Instruction: 6: 011010110010--ssPP0---tt------dd | Pd = or (Pt, Ps)
+					hi->instruction = HEX_INS_PD___OR__PT__PS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = or (P%d, P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb300000) {
+					// Instruction: 6: 011010110011--ssPP0---ttuu----dd | Pd = and (Ps, or (Pt, Pu))
+					hi->instruction = HEX_INS_PD___AND__PS__OR__PT__PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = and (P%d, or (P%d, P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb400000) {
+					// Instruction: 6: 011010110100--ssPP0---tt------dd | Pd = xor (Ps, Pt)
+					hi->instruction = HEX_INS_PD___XOR__PS__PT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = xor (P%d, P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb500000) {
+					// Instruction: 6: 011010110101--ssPP0---ttuu----dd | Pd = or (Ps, and (Pt, Pu))
+					hi->instruction = HEX_INS_PD___OR__PS__AND__PT__PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = or (P%d, and (P%d, P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb600000) {
+					// Instruction: 6: 011010110110--ssPP0---tt------dd | Pd = and (Pt, !Ps)
+					hi->instruction = HEX_INS_PD___AND__PT___NOT_PS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = and (P%d, !P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb700000) {
+					// Instruction: 6: 011010110111--ssPP0---ttuu----dd | Pd = or (Ps, or (Pt, Pu))
+					hi->instruction = HEX_INS_PD___OR__PS__OR__PT__PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = or (P%d, or (P%d, P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xb900000) {
+					// Instruction: 6: 011010111001--ssPP0---ttuu----dd | Pd = and (Ps, and (Pt, !Pu))
+					hi->instruction = HEX_INS_PD___AND__PS__AND__PT___NOT_PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = and (P%d, and (P%d, !P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xbb00000) {
+					// Instruction: 6: 011010111011--ssPP0---ttuu----dd | Pd = and (Ps, or (Pt, !Pu))
+					hi->instruction = HEX_INS_PD___AND__PS__OR__PT___NOT_PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = and (P%d, or (P%d, !P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xbc00000) {
+					// Instruction: 6: 011010111100--ssPP0-----------dd | Pd = not (Ps)
+					hi->instruction = HEX_INS_PD___NOT__PS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = not (P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xbd00000) {
+					// Instruction: 6: 011010111101--ssPP0---ttuu----dd | Pd = or (Ps, and (Pt, !Pu))
+					hi->instruction = HEX_INS_PD___OR__PS__AND__PT___NOT_PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = or (P%d, and (P%d, !P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xbe00000) {
+					// Instruction: 6: 011010111110--ssPP0---tt------dd | Pd = or (Pt, !Ps)
+					hi->instruction = HEX_INS_PD___OR__PT___NOT_PS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = or (P%d, !P%d)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xff02000) == 0xbf00000) {
+					// Instruction: 6: 011010111111--ssPP0---ttuu----dd | Pd = or (Ps, or (Pt, !Pu))
+					hi->instruction = HEX_INS_PD___OR__PS__OR__PT___NOT_PU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0xc0) >> 6);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = or (P%d, or (P%d, !P%d))", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.pred, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2200000) {
+					// Instruction: 6: 01100010001sssssPP---------ddddd | Cd = Rs
+					hi->instruction = HEX_INS_CD___RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_CONTROL;
+					hi->ops[0].op.cr = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = R%d", hex_get_cntl_reg(hi->ops[0].op.cr), hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3200000) {
+					// Instruction: 6: 01100011001sssssPP---------ddddd | Cdd = Rss
+					hi->instruction = HEX_INS_CDD___RSS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_CONTROL;
+					hi->ops[0].op.cr = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%sd = R%d:R%d", hex_get_cntl_reg(hi->ops[0].op.cr), hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8000000) {
+					// Instruction: 6: 01101000000sssssPP---------ddddd | Rdd = Css
+					hi->instruction = HEX_INS_RDD___CSS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_CONTROL;
+					hi->ops[1].op.cr = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = %ss", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hex_get_cntl_reg(hi->ops[1].op.cr));
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa000000) {
+					// Instruction: 6: 01101010000sssssPP---------ddddd | Rd = Cs
+					hi->instruction = HEX_INS_RD___CS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_CONTROL;
+					hi->ops[1].op.cr = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = %s", hi->ops[0].op.reg, hex_get_cntl_reg(hi->ops[1].op.cr));
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1000000) {
+					// Instruction: 6: 0110000100isssssPPi0iiiiiiiiiii- | if (Rs != #0) jump:nt #r13:2
+					hi->instruction = HEX_INS_IF__RS__NOT____0__JUMP_NT__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d != #0) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1001000) {
+					// Instruction: 6: 0110000100isssssPPi1iiiiiiiiiii- | if (Rs != #0) jump:t #r13:2
+					hi->instruction = HEX_INS_IF__RS__NOT____0__JUMP_T__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d != #0) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1400000) {
+					// Instruction: 6: 0110000101isssssPPi0iiiiiiiiiii- | if (Rs> = #0) jump:nt #r13:2
+					hi->instruction = HEX_INS_IF__RS_GT_EQ___0__JUMP_NT__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d> = #0) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1401000) {
+					// Instruction: 6: 0110000101isssssPPi1iiiiiiiiiii- | if (Rs> = #0) jump:t #r13:2
+					hi->instruction = HEX_INS_IF__RS_GT_EQ___0__JUMP_T__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d> = #0) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1800000) {
+					// Instruction: 6: 0110000110isssssPPi0iiiiiiiiiii- | if (Rs == #0) jump:nt #r13:2
+					hi->instruction = HEX_INS_IF__RS__EQ___0__JUMP_NT__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d == #0) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1801000) {
+					// Instruction: 6: 0110000110isssssPPi1iiiiiiiiiii- | if (Rs == #0) jump:t #r13:2
+					hi->instruction = HEX_INS_IF__RS__EQ___0__JUMP_T__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d == #0) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1c00000) {
+					// Instruction: 6: 0110000111isssssPPi0iiiiiiiiiii- | if (Rs< = #0) jump:nt #r13:2
+					hi->instruction = HEX_INS_IF__RS_LT_EQ___0__JUMP_NT__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d< = #0) jump:nt 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc01000) == 0x1c01000) {
+					// Instruction: 6: 0110000111isssssPPi1iiiiiiiiiii- | if (Rs< = #0) jump:t #r13:2
+					hi->instruction = HEX_INS_IF__RS_LT_EQ___0__JUMP_T__R13_2;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xffe) >> 1)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (R%d< = #0) jump:t 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2000000) {
+					// Instruction: 6: 01100010000sssssPP---------ddddd | Gd = Rs
+					hi->instruction = HEX_INS_GD___RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Gd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3000000) {
+					// Instruction: 6: 01100011000sssssPP---------ddddd | Gdd = Rss
+					hi->instruction = HEX_INS_GDD___RSS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Gd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%dd = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8200000) {
+					// Instruction: 6: 01101000001sssssPP---------ddddd | Rdd = Gss
+					hi->instruction = HEX_INS_RDD___GSS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Gs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = R%ds", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa200000) {
+					// Instruction: 6: 01101010001sssssPP---------ddddd | Rd = Gs
+					hi->instruction = HEX_INS_RD___GS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Gs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4000060) {
+					// Instruction: 6: 01100100000sssssPP------011----- | ciad (Rs)
+					hi->instruction = HEX_INS_CIAD__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "ciad (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5000000) {
+					// Instruction: 6: 01100101000xxxxxPP-------------- | crswap (Rx, sgp0)
+					hi->instruction = HEX_INS_CRSWAP__RX__SGP0_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "crswap (R%d, sgp0)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5200000) {
+					// Instruction: 6: 01100101001xxxxxPP-------------- | crswap (Rx, sgp1)
+					hi->instruction = HEX_INS_CRSWAP__RX__SGP1_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "crswap (R%d, sgp1)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc0001f) == 0xd800000) {
+					// Instruction: 6: 0110110110-xxxxxPP---------00000 | crswap (Rxx, sgp1:0)
+					hi->instruction = HEX_INS_CRSWAP__RXX__SGP1_0_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "crswap (R%d:R%d, sgp1:0)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4000020) {
+					// Instruction: 6: 01100100000sssssPP------001----- | cswi (Rs)
+					hi->instruction = HEX_INS_CSWI__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "cswi (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6000000) {
+					// Instruction: 6: 01100110000sssssPP---------ddddd | Rd = getimask (Rs)
+					hi->instruction = HEX_INS_RD___GETIMASK__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = getimask (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc200020) {
+					// Instruction: 6: 01101100001-----PP------001----- | tlblock
+					hi->instruction = HEX_INS_TLBLOCK;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "tlblock");
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc200060) {
+					// Instruction: 6: 01101100001-----PP------011----- | k0lock
+					hi->instruction = HEX_INS_K0LOCK;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "k0lock");
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc200040) {
+					// Instruction: 6: 01101100001-----PP------010----- | tlbunlock
+					hi->instruction = HEX_INS_TLBUNLOCK;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "tlbunlock");
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc200080) {
+					// Instruction: 6: 01101100001-----PP------100----- | k0unlock
+					hi->instruction = HEX_INS_K0UNLOCK;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "k0unlock");
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6600000) {
+					// Instruction: 6: 01100110011sssssPP---------ddddd | Rd = iassignr (Rs)
+					hi->instruction = HEX_INS_RD___IASSIGNR__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = iassignr (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4000040) {
+					// Instruction: 6: 01100100000sssssPP------010----- | iassignw (Rs)
+					hi->instruction = HEX_INS_IASSIGNW__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "iassignw (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4600040) {
+					// Instruction: 6: 01100100011sssssPP------010----- | nmi (Rs)
+					hi->instruction = HEX_INS_NMI__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "nmi (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4400020) {
+					// Instruction: 6: 01100100010sssssPP------001----- | resume (Rs)
+					hi->instruction = HEX_INS_RESUME__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "resume (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4800000) {
+					// Instruction: 6: 01100100100sssssPP----tt000----- | setimask (Pt, Rs)
+					hi->instruction = HEX_INS_SETIMASK__PT__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "setimask (P%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4800060) {
+					// Instruction: 6: 01100100100sssssPP------011----- | siad (Rs)
+					hi->instruction = HEX_INS_SIAD__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "siad (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4600020) {
+					// Instruction: 6: 01100100011sssssPP------001----- | start (Rs)
+					hi->instruction = HEX_INS_START__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "start (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4600000) {
+					// Instruction: 6: 01100100011sssssPP------000----- | stop (Rs)
+					hi->instruction = HEX_INS_STOP__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "stop (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4000000) {
+					// Instruction: 6: 01100100000sssssPP------000----- | swi (Rs)
+					hi->instruction = HEX_INS_SWI__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "swi (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xc000000) {
+					// Instruction: 6: 01101100000sssssPP0ttttt-------- | tlbw (Rss, Rt)
+					hi->instruction = HEX_INS_TLBW__RSS__RT_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "tlbw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xc400000) {
+					// Instruction: 6: 01101100010sssssPP---------ddddd | Rdd = tlbr (Rs)
+					hi->instruction = HEX_INS_RDD___TLBR__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = tlbr (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xc800000) {
+					// Instruction: 6: 01101100100sssssPP---------ddddd | Rd = tlbp (Rs)
+					hi->instruction = HEX_INS_RD___TLBP__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = tlbp (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xca00000) {
+					// Instruction: 6: 01101100101sssssPP-------------- | tlbinvasid (Rs)
+					hi->instruction = HEX_INS_TLBINVASID__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "tlbinvasid (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xcc00000) {
+					// Instruction: 6: 01101100110sssssPP0ttttt---ddddd | Rd = ctlbw (Rss, Rt)
+					hi->instruction = HEX_INS_RD___CTLBW__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = ctlbw (R%d:R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xce00000) {
+					// Instruction: 6: 01101100111sssssPP---------ddddd | Rd = tlboc (Rss)
+					hi->instruction = HEX_INS_RD___TLBOC__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = tlboc (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x7000000) {
+					// Instruction: 6: 0110011100-sssssPP--------dddddd | Sd = Rs
+					hi->instruction = HEX_INS_SD___RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_SYSTEM;
+					hi->ops[0].op.sys = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s = R%d", hex_get_sys_reg(hi->ops[0].op.sys), hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0xd000000) {
+					// Instruction: 6: 0110110100-sssssPP--------dddddd | Sdd = Rss
+					hi->instruction = HEX_INS_SDD___RSS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_SYSTEM;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.sys = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "%s:%s = R%d:R%d", hex_get_sys_reg(hi->ops[0].op.sys + 1), hex_get_sys_reg(hi->ops[0].op.sys), hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0xe800000) {
+					// Instruction: 6: 011011101-ssssssPP---------ddddd | Rd = Ss
+					hi->instruction = HEX_INS_RD___SS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_SYSTEM;
+					hi->ops[1].op.sys = (((hi_u32) & 0x3f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = %s", hi->ops[0].op.reg, hex_get_sys_reg(hi->ops[1].op.sys));
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0xf000000) {
+					// Instruction: 6: 011011110-ssssssPP---------ddddd | Rdd = Sss
+					hi->instruction = HEX_INS_RDD___SSS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_SYSTEM;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.sys = (((hi_u32) & 0x3f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = %s:%s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hex_get_sys_reg(hi->ops[1].op.sys + 1), hex_get_sys_reg(hi->ops[1].op.sys));
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4400000) {
+					// Instruction: 6: 01100100010sssssPP------000----- | wait (Rs)
+					hi->instruction = HEX_INS_WAIT__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "wait (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc200000) {
+					// Instruction: 6: 01101100001-----PP------000----- | brkpt
+					hi->instruction = HEX_INS_BRKPT;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "brkpt");
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2400000) {
+					// Instruction: 6: 01100010010sssssPP-------------- | trace (Rs)
+					hi->instruction = HEX_INS_TRACE__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "trace (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				break;
+			}
+			case 0x7: {
+				if ((hi_u32 & 0xfc00000) == 0x6000000) {
+					// Instruction: 7: 0111011000isssssPPiiiiiiiiiddddd | Rd = and (Rs, #s10)
+					hi->instruction = HEX_INS_RD___AND__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = and (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x6800000) {
+					// Instruction: 7: 0111011010isssssPPiiiiiiiiiddddd | Rd = or (Rs, #s10)
+					hi->instruction = HEX_INS_RD___OR__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = or (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0xf000000) {
+					// Instruction: 7: 01111111--------PP-------------- | nop
+					hi->instruction = HEX_INS_NOP;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "nop");
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x6400000) {
+					// Instruction: 7: 0111011001isssssPPiiiiiiiiiddddd | Rd = sub (#s10, Rs)
+					hi->instruction = HEX_INS_RD___SUB___S10__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = sub (0x%x, R%d)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xa00000) {
+					// Instruction: 7: 01110000101sssssPP0--------ddddd | Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_RD___SXTB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sxtb (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xe00000) {
+					// Instruction: 7: 01110000111sssssPP0--------ddddd | Rd = sxth (Rs)
+					hi->instruction = HEX_INS_RD___SXTH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sxth (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf200000) == 0x1200000) {
+					// Instruction: 7: 01110001ii1xxxxxPPiiiiiiiiiiiiii | Rx.L = #u16
+					hi->instruction = HEX_INS_RX_L____U16;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x3fff) >> 0));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d.L = 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf200000) == 0x2200000) {
+					// Instruction: 7: 01110010ii1xxxxxPPiiiiiiiiiiiiii | Rx.H = #u16
+					hi->instruction = HEX_INS_RX_H____U16;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x3fff) >> 0));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d.H = 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x8000000) {
+					// Instruction: 7: 01111000ii-iiiiiPPiiiiiiiiiddddd | Rd = #s16
+					hi->instruction = HEX_INS_RD____S16;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xc00000) >> 22) | ((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = 0x%x", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x600000) {
+					// Instruction: 7: 01110000011sssssPP0--------ddddd | Rd = Rs
+					hi->instruction = HEX_INS_RD___RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xc00000) {
+					// Instruction: 7: 01110000110sssssPP0--------ddddd | Rd = zxth (Rs)
+					hi->instruction = HEX_INS_RD___ZXTH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = zxth (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602000) == 0x3002000) {
+					// Instruction: 7: 01110011-00sssssPP1iiiiiiiiddddd | Rdd = combine (Rs, #s8)
+					hi->instruction = HEX_INS_RDD___COMBINE__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d:R%d = combine (R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602000) == 0x3202000) {
+					// Instruction: 7: 01110011-01sssssPP1iiiiiiiiddddd | Rdd = combine (#s8, Rs)
+					hi->instruction = HEX_INS_RDD___COMBINE___S8__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d:R%d = combine (0x%x, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0xc000000) {
+					// Instruction: 7: 011111000IIIIIIIPPIiiiiiiiiddddd | Rdd = combine (#s8, #S8)
+					hi->instruction = HEX_INS_RDD___COMBINE___S8___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x7f0000) >> 16) | ((hi_u32 & 0x2000) >> 13));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = combine (0x%x, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0xc800000) {
+					// Instruction: 7: 011111001--IIIIIPPIiiiiiiiiddddd | Rdd = combine (#s8, #U6)
+					hi->instruction = HEX_INS_RDD___COMBINE___S8___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x2000) >> 13));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d:R%d = combine (0x%x, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x3000000) {
+					// Instruction: 7: 011100110uusssssPP0iiiiiiiiddddd | Rd = mux (Pu, Rs, #s8)
+					hi->instruction = HEX_INS_RD___MUX__PU__RS___S8_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "R%d = mux (P%d, R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x3800000) {
+					// Instruction: 7: 011100111uusssssPP0iiiiiiiiddddd | Rd = mux (Pu, #s8, Rs)
+					hi->instruction = HEX_INS_RD___MUX__PU___S8__RS_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = mux (P%d, 0x%x, R%d)", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xe000000) == 0xa000000) {
+					// Instruction: 7: 0111101uuIIIIIIIPPIiiiiiiiiddddd | Rd = mux (Pu, #s8, #S8)
+					hi->instruction = HEX_INS_RD___MUX__PU___S8___S8_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x1800000) >> 23);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x7f0000) >> 16) | ((hi_u32 & 0x2000) >> 13));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "R%d = mux (P%d, 0x%x, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x0) {
+					// Instruction: 7: 01110000000sssssPP0--------ddddd | Rd = aslh (Rs)
+					hi->instruction = HEX_INS_RD___ASLH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = aslh (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x200000) {
+					// Instruction: 7: 01110000001sssssPP0--------ddddd | Rd = asrh (Rs)
+					hi->instruction = HEX_INS_RD___ASRH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = asrh (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x4000000) {
+					// Instruction: 7: 011101000uusssssPP0iiiiiiiiddddd | if (Pu) Rd = add (Rs, #s8)
+					hi->instruction = HEX_INS_IF__PU__RD___ADD__RS___S8_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if (P%d) R%d = add (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x4002000) {
+					// Instruction: 7: 011101000uusssssPP1iiiiiiiiddddd | if (Pu.new) Rd = add (Rs, #s8)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___ADD__RS___S8_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = add (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x4800000) {
+					// Instruction: 7: 011101001uusssssPP0iiiiiiiiddddd | if !Pu Rd = add (Rs, #s8)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___ADD__RS___S8_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if !P%d R%d = add (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x4802000) {
+					// Instruction: 7: 011101001uusssssPP1iiiiiiiiddddd | if !Pu.new Rd = add (Rs, #s8)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___ADD__RS___S8_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "if !P%d.new R%d = add (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x2000) {
+					// Instruction: 7: 01110000000sssssPP1-00uu---ddddd | if (Pu) Rd = aslh (Rs)
+					hi->instruction = HEX_INS_IF__PU__RD___ASLH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = aslh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x2400) {
+					// Instruction: 7: 01110000000sssssPP1-01uu---ddddd | if (Pu.new) Rd = aslh (Rs)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___ASLH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = aslh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x2800) {
+					// Instruction: 7: 01110000000sssssPP1-10uu---ddddd | if !Pu Rd = aslh (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___ASLH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = aslh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x2c00) {
+					// Instruction: 7: 01110000000sssssPP1-11uu---ddddd | if !Pu.new Rd = aslh (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___ASLH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = aslh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x202000) {
+					// Instruction: 7: 01110000001sssssPP1-00uu---ddddd | if (Pu) Rd = asrh (Rs)
+					hi->instruction = HEX_INS_IF__PU__RD___ASRH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = asrh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x202400) {
+					// Instruction: 7: 01110000001sssssPP1-01uu---ddddd | if (Pu.new) Rd = asrh (Rs)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___ASRH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = asrh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x202800) {
+					// Instruction: 7: 01110000001sssssPP1-10uu---ddddd | if !Pu Rd = asrh (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___ASRH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = asrh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x202c00) {
+					// Instruction: 7: 01110000001sssssPP1-11uu---ddddd | if !Pu.new Rd = asrh (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___ASRH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = asrh (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xa02000) {
+					// Instruction: 7: 01110000101sssssPP1-00uu---ddddd | if (Pu) Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_IF__PU__RD___SXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = sxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xa02400) {
+					// Instruction: 7: 01110000101sssssPP1-01uu---ddddd | if (Pu.new) Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___SXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = sxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xa02800) {
+					// Instruction: 7: 01110000101sssssPP1-10uu---ddddd | if !Pu Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___SXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = sxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xa02c00) {
+					// Instruction: 7: 01110000101sssssPP1-11uu---ddddd | if !Pu.new Rd = sxtb (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___SXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = sxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xe02000) {
+					// Instruction: 7: 01110000111sssssPP1-00uu---ddddd | if (Pu) Rd = sxth (Rs)
+					hi->instruction = HEX_INS_IF__PU__RD___SXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = sxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xe02400) {
+					// Instruction: 7: 01110000111sssssPP1-01uu---ddddd | if (Pu.new) Rd = sxth (Rs)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___SXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = sxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xe02800) {
+					// Instruction: 7: 01110000111sssssPP1-10uu---ddddd | if !Pu Rd = sxth (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___SXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = sxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xe02c00) {
+					// Instruction: 7: 01110000111sssssPP1-11uu---ddddd | if !Pu.new Rd = sxth (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___SXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = sxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf902000) == 0xe000000) {
+					// Instruction: 7: 011111100uu0iiiiPP0iiiiiiiiddddd | if (Pu) Rd = #s12
+					hi->instruction = HEX_INS_IF__PU__RD____S12;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf0000) >> 16) | ((hi_u32 & 0x1fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) R%d = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf902000) == 0xe002000) {
+					// Instruction: 7: 011111100uu0iiiiPP1iiiiiiiiddddd | if (Pu.new) Rd = #s12
+					hi->instruction = HEX_INS_IF__PU_NEW__RD____S12;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf0000) >> 16) | ((hi_u32 & 0x1fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf902000) == 0xe800000) {
+					// Instruction: 7: 011111101uu0iiiiPP0iiiiiiiiddddd | if !Pu Rd = #s12
+					hi->instruction = HEX_INS_IF__NOT_PU_RD____S12;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf0000) >> 16) | ((hi_u32 & 0x1fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d R%d = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf902000) == 0xe802000) {
+					// Instruction: 7: 011111101uu0iiiiPP1iiiiiiiiddddd | if !Pu.new Rd = #s12
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD____S12;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600000) >> 21);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf0000) >> 16) | ((hi_u32 & 0x1fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new R%d = 0x%x", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x802000) {
+					// Instruction: 7: 01110000100sssssPP1-00uu---ddddd | if (Pu) Rd = zxtb (Rs)
+					hi->instruction = HEX_INS_IF__PU__RD___ZXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = zxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x802400) {
+					// Instruction: 7: 01110000100sssssPP1-01uu---ddddd | if (Pu.new) Rd = zxtb (Rs)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___ZXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = zxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x802800) {
+					// Instruction: 7: 01110000100sssssPP1-10uu---ddddd | if !Pu Rd = zxtb (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___ZXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = zxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0x802c00) {
+					// Instruction: 7: 01110000100sssssPP1-11uu---ddddd | if !Pu.new Rd = zxtb (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___ZXTB__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = zxtb (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xc02000) {
+					// Instruction: 7: 01110000110sssssPP1-00uu---ddddd | if (Pu) Rd = zxth (Rs)
+					hi->instruction = HEX_INS_IF__PU__RD___ZXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = zxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xc02400) {
+					// Instruction: 7: 01110000110sssssPP1-01uu---ddddd | if (Pu.new) Rd = zxth (Rs)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___ZXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = zxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xc02800) {
+					// Instruction: 7: 01110000110sssssPP1-10uu---ddddd | if !Pu Rd = zxth (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___ZXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = zxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02c00) == 0xc02c00) {
+					// Instruction: 7: 01110000110sssssPP1-11uu---ddddd | if !Pu.new Rd = zxth (Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___ZXTH__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = zxth (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc0001c) == 0x5000000) {
+					// Instruction: 7: 0111010100isssssPPiiiiiiiii000dd | Pd = cmp.eq (Rs, #s10)
+					hi->instruction = HEX_INS_PD___CMP_EQ__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmp.eq (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc0001c) == 0x5000010) {
+					// Instruction: 7: 0111010100isssssPPiiiiiiiii100dd | Pd = !cmp.eq (Rs, #s10)
+					hi->instruction = HEX_INS_PD____NOT_CMP_EQ__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = !cmp.eq (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc0001c) == 0x5400000) {
+					// Instruction: 7: 0111010101isssssPPiiiiiiiii000dd | Pd = cmp.gt (Rs, #s10)
+					hi->instruction = HEX_INS_PD___CMP_GT__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmp.gt (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc0001c) == 0x5400010) {
+					// Instruction: 7: 0111010101isssssPPiiiiiiiii100dd | Pd = !cmp.gt (Rs, #s10)
+					hi->instruction = HEX_INS_PD____NOT_CMP_GT__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = !cmp.gt (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe0001c) == 0x5800000) {
+					// Instruction: 7: 01110101100sssssPPiiiiiiiii000dd | Pd = cmp.gtu (Rs, #u9)
+					hi->instruction = HEX_INS_PD___CMP_GTU__RS___U9_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmp.gtu (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe0001c) == 0x5800010) {
+					// Instruction: 7: 01110101100sssssPPiiiiiiiii100dd | Pd = !cmp.gtu (Rs, #u9)
+					hi->instruction = HEX_INS_PD____NOT_CMP_GTU__RS___U9_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = !cmp.gtu (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602000) == 0x3402000) {
+					// Instruction: 7: 01110011-10sssssPP1iiiiiiiiddddd | Rd = cmp.eq (Rs, #s8)
+					hi->instruction = HEX_INS_RD___CMP_EQ__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = cmp.eq (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf602000) == 0x3602000) {
+					// Instruction: 7: 01110011-11sssssPP1iiiiiiiiddddd | Rd = !cmp.eq (Rs, #s8)
+					hi->instruction = HEX_INS_RD____NOT_CMP_EQ__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = !cmp.eq (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x8: {
+				if ((hi_u32 & 0xfe000e0) == 0x8000c0) {
+					// Instruction: 8: 10000000100sssssPP------110ddddd | Rdd = abs (Rss)
+					hi->instruction = HEX_INS_RDD___ABS__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = abs (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc800080) {
+					// Instruction: 8: 10001100100sssssPP------100ddddd | Rd = abs (Rs)
+					hi->instruction = HEX_INS_RD___ABS__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = abs (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc8000a0) {
+					// Instruction: 8: 10001100100sssssPP------101ddddd | Rd = abs (Rs) :sat
+					hi->instruction = HEX_INS_RD___ABS__RS___SAT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = abs (R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x800080) {
+					// Instruction: 8: 10000000100sssssPP------100ddddd | Rdd = not (Rss)
+					hi->instruction = HEX_INS_RDD___NOT__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = not (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8000a0) {
+					// Instruction: 8: 10000000100sssssPP------101ddddd | Rdd = neg (Rss)
+					hi->instruction = HEX_INS_RDD___NEG__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = neg (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc8000c0) {
+					// Instruction: 8: 10001100100sssssPP------110ddddd | Rd = neg (Rs) :sat
+					hi->instruction = HEX_INS_RD___NEG__RS___SAT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = neg (R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8c00020) {
+					// Instruction: 8: 10001000110sssssPP------001ddddd | Rd = round (Rss) :sat
+					hi->instruction = HEX_INS_RD___ROUND__RSS___SAT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = round (R%d:R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020c0) == 0xce00000) {
+					// Instruction: 8: 10001100111sssssPP0iiiii00-ddddd | Rd = cround (Rs, #u5)
+					hi->instruction = HEX_INS_RD___CROUND__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = cround (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020c0) == 0xce00080) {
+					// Instruction: 8: 10001100111sssssPP0iiiii10-ddddd | Rd = round (Rs, #u5)
+					hi->instruction = HEX_INS_RD___ROUND__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = round (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020c0) == 0xce000c0) {
+					// Instruction: 8: 10001100111sssssPP0iiiii11-ddddd | Rd = round (Rs, #u5) :sat
+					hi->instruction = HEX_INS_RD___ROUND__RS___U5___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = round (R%d, 0x%x) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x4400000) {
+					// Instruction: 8: 1000010001-sssssPP------00-ddddd | Rdd = sxtw (Rs)
+					hi->instruction = HEX_INS_RDD___SXTW__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = sxtw (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x400080) {
+					// Instruction: 8: 10000000010sssssPP------100ddddd | Rdd = vabsh (Rss)
+					hi->instruction = HEX_INS_RDD___VABSH__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vabsh (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4000a0) {
+					// Instruction: 8: 10000000010sssssPP------101ddddd | Rdd = vabsh (Rss) :sat
+					hi->instruction = HEX_INS_RDD___VABSH__RSS___SAT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vabsh (R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4000c0) {
+					// Instruction: 8: 10000000010sssssPP------110ddddd | Rdd = vabsw (Rss)
+					hi->instruction = HEX_INS_RDD___VABSW__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vabsw (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x4000e0) {
+					// Instruction: 8: 10000000010sssssPP------111ddddd | Rdd = vabsw (Rss) :sat
+					hi->instruction = HEX_INS_RDD___VABSW__RSS___SAT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vabsw (R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8400000) {
+					// Instruction: 8: 10001000010sssssPP------000ddddd | Rd = clb (Rss)
+					hi->instruction = HEX_INS_RD___CLB__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = clb (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8400040) {
+					// Instruction: 8: 10001000010sssssPP------010ddddd | Rd = cl0 (Rss)
+					hi->instruction = HEX_INS_RD___CL0__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = cl0 (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8400080) {
+					// Instruction: 8: 10001000010sssssPP------100ddddd | Rd = cl1 (Rss)
+					hi->instruction = HEX_INS_RD___CL1__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = cl1 (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8600000) {
+					// Instruction: 8: 10001000011sssssPP------000ddddd | Rd = normamt (Rss)
+					hi->instruction = HEX_INS_RD___NORMAMT__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = normamt (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8600040) {
+					// Instruction: 8: 10001000011sssssPPiiiiii010ddddd | Rd = add (clb (Rss), #s6)
+					hi->instruction = HEX_INS_RD___ADD__CLB__RSS____S6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (clb (R%d:R%d), 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc200000) {
+					// Instruction: 8: 10001100001sssssPPiiiiii000ddddd | Rd = add (clb (Rs), #s6)
+					hi->instruction = HEX_INS_RD___ADD__CLB__RS____S6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (clb (R%d), 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc000080) {
+					// Instruction: 8: 10001100000sssssPP------100ddddd | Rd = clb (Rs)
+					hi->instruction = HEX_INS_RD___CLB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = clb (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc0000a0) {
+					// Instruction: 8: 10001100000sssssPP------101ddddd | Rd = cl0 (Rs)
+					hi->instruction = HEX_INS_RD___CL0__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = cl0 (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc0000c0) {
+					// Instruction: 8: 10001100000sssssPP------110ddddd | Rd = cl1 (Rs)
+					hi->instruction = HEX_INS_RD___CL1__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = cl1 (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc0000e0) {
+					// Instruction: 8: 10001100000sssssPP------111ddddd | Rd = normamt (Rs)
+					hi->instruction = HEX_INS_RD___NORMAMT__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = normamt (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8600060) {
+					// Instruction: 8: 10001000011sssssPP------011ddddd | Rd = popcount (Rss)
+					hi->instruction = HEX_INS_RD___POPCOUNT__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = popcount (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8e00040) {
+					// Instruction: 8: 10001000111sssssPP------010ddddd | Rd = ct0 (Rss)
+					hi->instruction = HEX_INS_RD___CT0__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = ct0 (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8e00080) {
+					// Instruction: 8: 10001000111sssssPP------100ddddd | Rd = ct1 (Rss)
+					hi->instruction = HEX_INS_RD___CT1__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = ct1 (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc400080) {
+					// Instruction: 8: 10001100010sssssPP------100ddddd | Rd = ct0 (Rs)
+					hi->instruction = HEX_INS_RD___CT0__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = ct0 (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc4000a0) {
+					// Instruction: 8: 10001100010sssssPP------101ddddd | Rd = ct1 (Rs)
+					hi->instruction = HEX_INS_RD___CT1__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = ct1 (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x1000000) {
+					// Instruction: 8: 10000001IIIsssssPPiiiiiiIIIddddd | Rdd = extractu (Rss, #u6, #U6)
+					hi->instruction = HEX_INS_RDD___EXTRACTU__RSS___U6___U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = extractu (R%d:R%d, 0x%x, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0xa000000) {
+					// Instruction: 8: 10001010IIIsssssPPiiiiiiIIIddddd | Rdd = extract (Rss, #u6, #U6)
+					hi->instruction = HEX_INS_RDD___EXTRACT__RSS___U6___U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = extract (R%d:R%d, 0x%x, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0xd000000) {
+					// Instruction: 8: 100011010IIsssssPP0iiiiiIIIddddd | Rd = extractu (Rs, #u5, #U5)
+					hi->instruction = HEX_INS_RD___EXTRACTU__RS___U5___U5_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = extractu (R%d, 0x%x, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0xd800000) {
+					// Instruction: 8: 100011011IIsssssPP0iiiiiIIIddddd | Rd = extract (Rs, #u5, #U5)
+					hi->instruction = HEX_INS_RD___EXTRACT__RS___U5___U5_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = extract (R%d, 0x%x, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x3000000) {
+					// Instruction: 8: 10000011IIIsssssPPiiiiiiIIIxxxxx | Rxx = insert (Rss, #u6, #U6)
+					hi->instruction = HEX_INS_RXX___INSERT__RSS___U6___U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = insert (R%d:R%d, 0x%x, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0xf000000) {
+					// Instruction: 8: 100011110IIsssssPP0iiiiiIIIxxxxx | Rx = insert (Rs, #u5, #U5)
+					hi->instruction = HEX_INS_RX___INSERT__RS___U5___U5_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = insert (R%d, 0x%x, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc00080) {
+					// Instruction: 8: 10000000110sssssPP------100ddddd | Rdd = deinterleave (Rss)
+					hi->instruction = HEX_INS_RDD___DEINTERLEAVE__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = deinterleave (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc000a0) {
+					// Instruction: 8: 10000000110sssssPP------101ddddd | Rdd = interleave (Rss)
+					hi->instruction = HEX_INS_RDD___INTERLEAVE__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = interleave (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc000c0) {
+					// Instruction: 8: 10000000110sssssPP------110ddddd | Rdd = brev (Rss)
+					hi->instruction = HEX_INS_RDD___BREV__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = brev (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc4000c0) {
+					// Instruction: 8: 10001100010sssssPP------110ddddd | Rd = brev (Rs)
+					hi->instruction = HEX_INS_RD___BREV__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = brev (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xcc00000) {
+					// Instruction: 8: 10001100110sssssPP0iiiii000ddddd | Rd = setbit (Rs, #u5)
+					hi->instruction = HEX_INS_RD___SETBIT__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = setbit (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xcc00020) {
+					// Instruction: 8: 10001100110sssssPP0iiiii001ddddd | Rd = clrbit (Rs, #u5)
+					hi->instruction = HEX_INS_RD___CLRBIT__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = clrbit (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xcc00040) {
+					// Instruction: 8: 10001100110sssssPP0iiiii010ddddd | Rd = togglebit (Rs, #u5)
+					hi->instruction = HEX_INS_RD___TOGGLEBIT__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = togglebit (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8c00080) {
+					// Instruction: 8: 10001000110sssssPP0iiiii100ddddd | Rdd = bitsplit (Rs, #u5)
+					hi->instruction = HEX_INS_RDD___BITSPLIT__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = bitsplit (R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x7000000) {
+					// Instruction: 8: 1000011100isssssPPIIIIIIiiixxxxx | Rx = tableidxb (Rs, #u4, #S6) :raw
+					hi->instruction = HEX_INS_RX___TABLEIDXB__RS___U4___S6___RAW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d = tableidxb (R%d, 0x%x, 0x%x) :raw", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x7400000) {
+					// Instruction: 8: 1000011101isssssPPIIIIIIiiixxxxx | Rx = tableidxh (Rs, #u4, #S6) :raw
+					hi->instruction = HEX_INS_RX___TABLEIDXH__RS___U4___S6___RAW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d = tableidxh (R%d, 0x%x, 0x%x) :raw", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x7800000) {
+					// Instruction: 8: 1000011110isssssPPIIIIIIiiixxxxx | Rx = tableidxw (Rs, #u4, #S6) :raw
+					hi->instruction = HEX_INS_RX___TABLEIDXW__RS___U4___S6___RAW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d = tableidxw (R%d, 0x%x, 0x%x) :raw", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x7c00000) {
+					// Instruction: 8: 1000011111isssssPPIIIIIIiiixxxxx | Rx = tableidxd (Rs, #u4, #S6) :raw
+					hi->instruction = HEX_INS_RX___TABLEIDXD__RS___U4___S6___RAW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0xe0) >> 5));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d = tableidxd (R%d, 0x%x, 0x%x) :raw", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8000e0) {
+					// Instruction: 8: 10000000100sssssPP------111ddddd | Rdd = vconj (Rss) :sat
+					hi->instruction = HEX_INS_RDD___VCONJ__RSS___SAT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vconj (R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5e00000) {
+					// Instruction: 8: 10000101111sssssPP0iiiii------dd | Pd = sfclass (Rs, #u5)
+					hi->instruction = HEX_INS_PD___SFCLASS__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = sfclass (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf8000e0) == 0x4800000) {
+					// Instruction: 8: 100001001--sssssPP------000ddddd | Rdd = convert_sf2df (Rs)
+					hi->instruction = HEX_INS_RDD___CONVERT_SF2DF__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_sf2df (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8000020) {
+					// Instruction: 8: 10001000000sssssPP------001ddddd | Rd = convert_df2sf (Rss)
+					hi->instruction = HEX_INS_RD___CONVERT_DF2SF__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_df2sf (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xe00040) {
+					// Instruction: 8: 10000000111sssssPP0-----010ddddd | Rdd = convert_ud2df (Rss)
+					hi->instruction = HEX_INS_RDD___CONVERT_UD2DF__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_ud2df (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xe00060) {
+					// Instruction: 8: 10000000111sssssPP0-----011ddddd | Rdd = convert_d2df (Rss)
+					hi->instruction = HEX_INS_RDD___CONVERT_D2DF__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_d2df (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8000e0) == 0x4800020) {
+					// Instruction: 8: 100001001--sssssPP------001ddddd | Rdd = convert_uw2df (Rs)
+					hi->instruction = HEX_INS_RDD___CONVERT_UW2DF__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_uw2df (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8000e0) == 0x4800040) {
+					// Instruction: 8: 100001001--sssssPP------010ddddd | Rdd = convert_w2df (Rs)
+					hi->instruction = HEX_INS_RDD___CONVERT_W2DF__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_w2df (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8200020) {
+					// Instruction: 8: 10001000001sssssPP------001ddddd | Rd = convert_ud2sf (Rss)
+					hi->instruction = HEX_INS_RD___CONVERT_UD2SF__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_ud2sf (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8400020) {
+					// Instruction: 8: 10001000010sssssPP------001ddddd | Rd = convert_d2sf (Rss)
+					hi->instruction = HEX_INS_RD___CONVERT_D2SF__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_d2sf (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xb200000) {
+					// Instruction: 8: 10001011001sssssPP------000ddddd | Rd = convert_uw2sf (Rs)
+					hi->instruction = HEX_INS_RD___CONVERT_UW2SF__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_uw2sf (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xb400000) {
+					// Instruction: 8: 10001011010sssssPP------000ddddd | Rd = convert_w2sf (Rs)
+					hi->instruction = HEX_INS_RD___CONVERT_W2SF__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_w2sf (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xe00000) {
+					// Instruction: 8: 10000000111sssssPP0-----000ddddd | Rdd = convert_df2d (Rss)
+					hi->instruction = HEX_INS_RDD___CONVERT_DF2D__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_df2d (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xe00020) {
+					// Instruction: 8: 10000000111sssssPP0-----001ddddd | Rdd = convert_df2ud (Rss)
+					hi->instruction = HEX_INS_RDD___CONVERT_DF2UD__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_df2ud (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xe000c0) {
+					// Instruction: 8: 10000000111sssssPP0-----110ddddd | Rdd = convert_df2d (Rss) :chop
+					hi->instruction = HEX_INS_RDD___CONVERT_DF2D__RSS___CHOP;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CHOP; // :chop
+					sprintf(hi->mnem, "R%d:R%d = convert_df2d (R%d:R%d) :chop", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xe000e0) {
+					// Instruction: 8: 10000000111sssssPP0-----111ddddd | Rdd = convert_df2ud (Rss) :chop
+					hi->instruction = HEX_INS_RDD___CONVERT_DF2UD__RSS___CHOP;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CHOP; // :chop
+					sprintf(hi->mnem, "R%d:R%d = convert_df2ud (R%d:R%d) :chop", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8000e0) == 0x4800060) {
+					// Instruction: 8: 100001001--sssssPP------011ddddd | Rdd = convert_sf2ud (Rs)
+					hi->instruction = HEX_INS_RDD___CONVERT_SF2UD__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_sf2ud (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8000e0) == 0x4800080) {
+					// Instruction: 8: 100001001--sssssPP------100ddddd | Rdd = convert_sf2d (Rs)
+					hi->instruction = HEX_INS_RDD___CONVERT_SF2D__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_sf2d (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8000e0) == 0x48000a0) {
+					// Instruction: 8: 100001001--sssssPP------101ddddd | Rdd = convert_sf2ud (Rs) :ch
+					hi->instruction = HEX_INS_RDD___CONVERT_SF2UD__RS___CH;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = convert_sf2ud (R%d) :ch", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8000e0) == 0x48000c0) {
+					// Instruction: 8: 100001001--sssssPP------110ddddd | Rdd = convert_sf2d (Rs) :chop
+					hi->instruction = HEX_INS_RDD___CONVERT_SF2D__RS___CHOP;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CHOP; // :chop
+					sprintf(hi->mnem, "R%d:R%d = convert_sf2d (R%d) :chop", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8600020) {
+					// Instruction: 8: 10001000011sssssPP------001ddddd | Rd = convert_df2uw (Rss)
+					hi->instruction = HEX_INS_RD___CONVERT_DF2UW__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_df2uw (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8800020) {
+					// Instruction: 8: 10001000100sssssPP------001ddddd | Rd = convert_df2w (Rss)
+					hi->instruction = HEX_INS_RD___CONVERT_DF2W__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_df2w (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8a00020) {
+					// Instruction: 8: 10001000101sssssPP------001ddddd | Rd = convert_df2uw (Rss) :chop
+					hi->instruction = HEX_INS_RD___CONVERT_DF2UW__RSS___CHOP;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CHOP; // :chop
+					sprintf(hi->mnem, "R%d = convert_df2uw (R%d:R%d) :chop", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8e00020) {
+					// Instruction: 8: 10001000111sssssPP------001ddddd | Rd = convert_df2w (Rss) :chop
+					hi->instruction = HEX_INS_RD___CONVERT_DF2W__RSS___CHOP;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CHOP; // :chop
+					sprintf(hi->mnem, "R%d = convert_df2w (R%d:R%d) :chop", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xb600000) {
+					// Instruction: 8: 10001011011sssssPP------000ddddd | Rd = convert_sf2uw (Rs)
+					hi->instruction = HEX_INS_RD___CONVERT_SF2UW__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_sf2uw (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xb600020) {
+					// Instruction: 8: 10001011011sssssPP------001ddddd | Rd = convert_sf2uw (Rs) :chop
+					hi->instruction = HEX_INS_RD___CONVERT_SF2UW__RS___CHOP;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CHOP; // :chop
+					sprintf(hi->mnem, "R%d = convert_sf2uw (R%d) :chop", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xb800000) {
+					// Instruction: 8: 10001011100sssssPP------000ddddd | Rd = convert_sf2w (Rs)
+					hi->instruction = HEX_INS_RD___CONVERT_SF2W__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = convert_sf2w (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xb800020) {
+					// Instruction: 8: 10001011100sssssPP------001ddddd | Rd = convert_sf2w (Rs) :chop
+					hi->instruction = HEX_INS_RD___CONVERT_SF2W__RS___CHOP;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CHOP; // :chop
+					sprintf(hi->mnem, "R%d = convert_sf2w (R%d) :chop", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xba00000) {
+					// Instruction: 8: 10001011101sssssPP------000ddddd | Rd = sffixupr (Rs)
+					hi->instruction = HEX_INS_RD___SFFIXUPR__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sffixupr (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xbe00000) {
+					// Instruction: 8: 10001011111sssssPP------0eeddddd | Rd, Pe = sfinvsqrta (Rs)
+					hi->instruction = HEX_INS_RD__PE___SFINVSQRTA__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d, P%d = sfinvsqrta (R%d)", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8c00000) {
+					// Instruction: 8: 10001000110sssssPP------000ddddd | Rd = sat (Rss)
+					hi->instruction = HEX_INS_RD___SAT__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sat (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xcc00080) {
+					// Instruction: 8: 10001100110sssssPP------100ddddd | Rd = sath (Rs)
+					hi->instruction = HEX_INS_RD___SATH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sath (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xcc000a0) {
+					// Instruction: 8: 10001100110sssssPP------101ddddd | Rd = satuh (Rs)
+					hi->instruction = HEX_INS_RD___SATUH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = satuh (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xcc000c0) {
+					// Instruction: 8: 10001100110sssssPP------110ddddd | Rd = satub (Rs)
+					hi->instruction = HEX_INS_RD___SATUB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = satub (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xcc000e0) {
+					// Instruction: 8: 10001100110sssssPP------111ddddd | Rd = satb (Rs)
+					hi->instruction = HEX_INS_RD___SATB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = satb (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc8000e0) {
+					// Instruction: 8: 10001100100sssssPP------111ddddd | Rd = swiz (Rs)
+					hi->instruction = HEX_INS_RD___SWIZ__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = swiz (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8800080) {
+					// Instruction: 8: 10001000100sssssPP------100ddddd | Rd = vrndwh (Rss)
+					hi->instruction = HEX_INS_RD___VRNDWH__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vrndwh (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x88000c0) {
+					// Instruction: 8: 10001000100sssssPP------110ddddd | Rd = vrndwh (Rss) :sat
+					hi->instruction = HEX_INS_RD___VRNDWH__RSS___SAT;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vrndwh (R%d:R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8000000) {
+					// Instruction: 8: 10001000000sssssPP------000ddddd | Rd = vsathub (Rss)
+					hi->instruction = HEX_INS_RD___VSATHUB__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsathub (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8000040) {
+					// Instruction: 8: 10001000000sssssPP------010ddddd | Rd = vsatwh (Rss)
+					hi->instruction = HEX_INS_RD___VSATWH__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsatwh (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8000080) {
+					// Instruction: 8: 10001000000sssssPP------100ddddd | Rd = vsatwuh (Rss)
+					hi->instruction = HEX_INS_RD___VSATWUH__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsatwuh (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x80000c0) {
+					// Instruction: 8: 10001000000sssssPP------110ddddd | Rd = vsathb (Rss)
+					hi->instruction = HEX_INS_RD___VSATHB__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsathb (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc800000) {
+					// Instruction: 8: 1000110010-sssssPP------00-ddddd | Rd = vsathb (Rs)
+					hi->instruction = HEX_INS_RD___VSATHB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsathb (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc800040) {
+					// Instruction: 8: 1000110010-sssssPP------01-ddddd | Rd = vsathub (Rs)
+					hi->instruction = HEX_INS_RD___VSATHUB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsathub (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x80) {
+					// Instruction: 8: 10000000000sssssPP------100ddddd | Rdd = vsathub (Rss)
+					hi->instruction = HEX_INS_RDD___VSATHUB__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsathub (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xa0) {
+					// Instruction: 8: 10000000000sssssPP------101ddddd | Rdd = vsatwuh (Rss)
+					hi->instruction = HEX_INS_RDD___VSATWUH__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsatwuh (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc0) {
+					// Instruction: 8: 10000000000sssssPP------110ddddd | Rdd = vsatwh (Rss)
+					hi->instruction = HEX_INS_RDD___VSATWH__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsatwh (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xe0) {
+					// Instruction: 8: 10000000000sssssPP------111ddddd | Rdd = vsathb (Rss)
+					hi->instruction = HEX_INS_RDD___VSATHB__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsathb (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x4400080) {
+					// Instruction: 8: 1000010001-sssssPP------10-ddddd | Rdd = vsplatb (Rs)
+					hi->instruction = HEX_INS_RDD___VSPLATB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsplatb (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc4000e0) {
+					// Instruction: 8: 10001100010sssssPP------111ddddd | Rd = vsplatb (Rs)
+					hi->instruction = HEX_INS_RD___VSPLATB__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsplatb (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x4400040) {
+					// Instruction: 8: 1000010001-sssssPP------01-ddddd | Rdd = vsplath (Rs)
+					hi->instruction = HEX_INS_RDD___VSPLATH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsplath (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x4000000) {
+					// Instruction: 8: 1000010000-sssssPP------00-ddddd | Rdd = vsxtbh (Rs)
+					hi->instruction = HEX_INS_RDD___VSXTBH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsxtbh (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x4000080) {
+					// Instruction: 8: 1000010000-sssssPP------10-ddddd | Rdd = vsxthw (Rs)
+					hi->instruction = HEX_INS_RDD___VSXTHW__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsxthw (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8800000) {
+					// Instruction: 8: 10001000100sssssPP------000ddddd | Rd = vtrunohb (Rss)
+					hi->instruction = HEX_INS_RD___VTRUNOHB__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vtrunohb (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x8800040) {
+					// Instruction: 8: 10001000100sssssPP------010ddddd | Rd = vtrunehb (Rss)
+					hi->instruction = HEX_INS_RD___VTRUNEHB__RSS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vtrunehb (R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x4000040) {
+					// Instruction: 8: 1000010000-sssssPP------01-ddddd | Rdd = vzxtbh (Rs)
+					hi->instruction = HEX_INS_RDD___VZXTBH__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vzxtbh (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x40000c0) {
+					// Instruction: 8: 1000010000-sssssPP------11-ddddd | Rdd = vzxthw (Rs)
+					hi->instruction = HEX_INS_RDD___VZXTHW__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vzxthw (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5800000) {
+					// Instruction: 8: 10000101100sssssPPiiiiii------dd | Pd = bitsclr (Rs, #u6)
+					hi->instruction = HEX_INS_PD___BITSCLR__RS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = bitsclr (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5a00000) {
+					// Instruction: 8: 10000101101sssssPPiiiiii------dd | Pd = !bitsclr (Rs, #u6)
+					hi->instruction = HEX_INS_PD____NOT_BITSCLR__RS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !bitsclr (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x6000000) {
+					// Instruction: 8: 10000110--------PP----tt---ddddd | Rdd = mask (Pt)
+					hi->instruction = HEX_INS_RDD___MASK__PT_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mask (P%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5400000) {
+					// Instruction: 8: 10000101010sssssPP------------dd | Pd = Rs
+					hi->instruction = HEX_INS_PD___RS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf400000) == 0x9400000) {
+					// Instruction: 8: 10001001-1----ssPP---------ddddd | Rd = Ps
+					hi->instruction = HEX_INS_RD___PS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = P%d", hi->ops[0].op.reg, hi->ops[1].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5000000) {
+					// Instruction: 8: 10000101000sssssPP0iiiii------dd | Pd = tstbit (Rs, #u5)
+					hi->instruction = HEX_INS_PD___TSTBIT__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = tstbit (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x5200000) {
+					// Instruction: 8: 10000101001sssssPP0iiiii------dd | Pd = !tstbit (Rs, #u5)
+					hi->instruction = HEX_INS_PD____NOT_TSTBIT__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !tstbit (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf600000) == 0x9000000) {
+					// Instruction: 8: 10001001-00---ssPP----tt---ddddd | Rd = vitpack (Ps, Pt)
+					hi->instruction = HEX_INS_RD___VITPACK__PS__PT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x30000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[2].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vitpack (P%d, P%d)", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x0) {
+					// Instruction: 8: 10000000000sssssPPiiiiii000ddddd | Rdd = asr (Rss, #u6)
+					hi->instruction = HEX_INS_RDD___ASR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = asr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x20) {
+					// Instruction: 8: 10000000000sssssPPiiiiii001ddddd | Rdd = lsr (Rss, #u6)
+					hi->instruction = HEX_INS_RDD___LSR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = lsr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x40) {
+					// Instruction: 8: 10000000000sssssPPiiiiii010ddddd | Rdd = asl (Rss, #u6)
+					hi->instruction = HEX_INS_RDD___ASL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = asl (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x60) {
+					// Instruction: 8: 10000000000sssssPPiiiiii011ddddd | Rdd = rol (Rss, #u6)
+					hi->instruction = HEX_INS_RDD___ROL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = rol (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xc000000) {
+					// Instruction: 8: 10001100000sssssPP0iiiii000ddddd | Rd = asr (Rs, #u5)
+					hi->instruction = HEX_INS_RD___ASR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = asr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xc000020) {
+					// Instruction: 8: 10001100000sssssPP0iiiii001ddddd | Rd = lsr (Rs, #u5)
+					hi->instruction = HEX_INS_RD___LSR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = lsr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xc000040) {
+					// Instruction: 8: 10001100000sssssPP0iiiii010ddddd | Rd = asl (Rs, #u5)
+					hi->instruction = HEX_INS_RD___ASL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = asl (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xc000060) {
+					// Instruction: 8: 10001100000sssssPP0iiiii011ddddd | Rd = rol (Rs, #u5)
+					hi->instruction = HEX_INS_RD___ROL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = rol (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2000000) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii000xxxxx | Rxx -= asr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__ASR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= asr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2000020) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii001xxxxx | Rxx -= lsr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__LSR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= lsr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2000040) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii010xxxxx | Rxx -= asl (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__ASL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= asl (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2000060) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii011xxxxx | Rxx -= rol (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__ROL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= rol (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2000080) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii100xxxxx | Rxx += asr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__ASR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += asr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x20000a0) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii101xxxxx | Rxx += lsr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__LSR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += lsr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x20000c0) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii110xxxxx | Rxx += asl (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__ASL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += asl (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x20000e0) {
+					// Instruction: 8: 1000001000-sssssPPiiiiii111xxxxx | Rxx += rol (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__ROL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += rol (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe000000) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii000xxxxx | Rx -= asr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__ASR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= asr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe000020) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii001xxxxx | Rx -= lsr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__LSR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= lsr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe000040) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii010xxxxx | Rx -= asl (Rs, #u5)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__ASL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= asl (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe000060) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii011xxxxx | Rx -= rol (Rs, #u5)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__ROL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= rol (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe000080) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii100xxxxx | Rx += asr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__ASR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += asr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe0000a0) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii101xxxxx | Rx += lsr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__LSR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += lsr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe0000c0) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii110xxxxx | Rx += asl (Rs, #u5)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__ASL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += asl (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe0000e0) {
+					// Instruction: 8: 1000111000-sssssPP0iiiii111xxxxx | Rx += rol (Rs, #u5)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__ROL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += rol (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2400000) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii000xxxxx | Rxx &= asr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__AND_EQ__ASR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= asr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2400020) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii001xxxxx | Rxx &= lsr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__AND_EQ__LSR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= lsr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2400040) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii010xxxxx | Rxx &= asl (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__AND_EQ__ASL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= asl (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2400060) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii011xxxxx | Rxx &= rol (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__AND_EQ__ROL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= rol (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2400080) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii100xxxxx | Rxx |= asr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__OR_EQ__ASR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= asr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x24000a0) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii101xxxxx | Rxx |= lsr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__OR_EQ__LSR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= lsr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x24000c0) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii110xxxxx | Rxx |= asl (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__OR_EQ__ASL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= asl (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x24000e0) {
+					// Instruction: 8: 1000001001-sssssPPiiiiii111xxxxx | Rxx |= rol (Rss, #u6)
+					hi->instruction = HEX_INS_RXX__OR_EQ__ROL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= rol (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2800020) {
+					// Instruction: 8: 1000001010-sssssPPiiiiii001xxxxx | Rxx ^= lsr (Rss, #u6)
+					hi->instruction = HEX_INS_RXX____LSR__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= lsr (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2800040) {
+					// Instruction: 8: 1000001010-sssssPPiiiiii010xxxxx | Rxx ^= asl (Rss, #u6)
+					hi->instruction = HEX_INS_RXX____ASL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= asl (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x2800060) {
+					// Instruction: 8: 1000001010-sssssPPiiiiii011xxxxx | Rxx ^= rol (Rss, #u6)
+					hi->instruction = HEX_INS_RXX____ROL__RSS___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= rol (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe400000) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii000xxxxx | Rx &= asr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__AND_EQ__ASR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= asr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe400020) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii001xxxxx | Rx &= lsr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__AND_EQ__LSR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= lsr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe400040) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii010xxxxx | Rx &= asl (Rs, #u5)
+					hi->instruction = HEX_INS_RX__AND_EQ__ASL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= asl (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe400060) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii011xxxxx | Rx &= rol (Rs, #u5)
+					hi->instruction = HEX_INS_RX__AND_EQ__ROL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= rol (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe400080) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii100xxxxx | Rx |= asr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__OR_EQ__ASR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= asr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe4000a0) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii101xxxxx | Rx |= lsr (Rs, #u5)
+					hi->instruction = HEX_INS_RX__OR_EQ__LSR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= lsr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe4000c0) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii110xxxxx | Rx |= asl (Rs, #u5)
+					hi->instruction = HEX_INS_RX__OR_EQ__ASL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= asl (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe4000e0) {
+					// Instruction: 8: 1000111001-sssssPP0iiiii111xxxxx | Rx |= rol (Rs, #u5)
+					hi->instruction = HEX_INS_RX__OR_EQ__ROL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= rol (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe800020) {
+					// Instruction: 8: 1000111010-sssssPP0iiiii001xxxxx | Rx ^= lsr (Rs, #u5)
+					hi->instruction = HEX_INS_RX____LSR__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d ^= lsr (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe800040) {
+					// Instruction: 8: 1000111010-sssssPP0iiiii010xxxxx | Rx ^= asl (Rs, #u5)
+					hi->instruction = HEX_INS_RX____ASL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d ^= asl (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xe800060) {
+					// Instruction: 8: 1000111010-sssssPP0iiiii011xxxxx | Rx ^= rol (Rs, #u5)
+					hi->instruction = HEX_INS_RX____ROL__RS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d ^= rol (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0xc000e0) {
+					// Instruction: 8: 10000000110sssssPPiiiiii111ddddd | Rdd = asr (Rss, #u6) :rnd
+					hi->instruction = HEX_INS_RDD___ASR__RSS___U6___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = asr (R%d:R%d, 0x%x) :rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xc400000) {
+					// Instruction: 8: 10001100010sssssPP0iiiii000ddddd | Rd = asr (Rs, #u5) :rnd
+					hi->instruction = HEX_INS_RD___ASR__RS___U5___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d = asr (R%d, 0x%x) :rnd", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xc400040) {
+					// Instruction: 8: 10001100010sssssPP0iiiii010ddddd | Rd = asl (Rs, #u5) :sat
+					hi->instruction = HEX_INS_RD___ASL__RS___U5___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = asl (R%d, 0x%x) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x800000) {
+					// Instruction: 8: 10000000100sssssPP00iiii000ddddd | Rdd = vasrh (Rss, #u4)
+					hi->instruction = HEX_INS_RDD___VASRH__RSS___U4_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vasrh (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x800020) {
+					// Instruction: 8: 10000000100sssssPP00iiii001ddddd | Rdd = vlsrh (Rss, #u4)
+					hi->instruction = HEX_INS_RDD___VLSRH__RSS___U4_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vlsrh (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x800040) {
+					// Instruction: 8: 10000000100sssssPP00iiii010ddddd | Rdd = vaslh (Rss, #u4)
+					hi->instruction = HEX_INS_RDD___VASLH__RSS___U4_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vaslh (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x200000) {
+					// Instruction: 8: 10000000001sssssPP00iiii000ddddd | Rdd = vasrh (Rss, #u4) :raw
+					hi->instruction = HEX_INS_RDD___VASRH__RSS___U4___RAW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d:R%d = vasrh (R%d:R%d, 0x%x) :raw", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x8600080) {
+					// Instruction: 8: 10001000011sssssPP00iiii100ddddd | Rd = vasrhub (Rss, #u4) :raw
+					hi->instruction = HEX_INS_RD___VASRHUB__RSS___U4___RAW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d = vasrhub (R%d:R%d, 0x%x) :raw", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe030e0) == 0x86000a0) {
+					// Instruction: 8: 10001000011sssssPP00iiii101ddddd | Rd = vasrhub (Rss, #u4) :sat
+					hi->instruction = HEX_INS_RD___VASRHUB__RSS___U4___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xf00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vasrhub (R%d:R%d, 0x%x) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x400000) {
+					// Instruction: 8: 10000000010sssssPP0iiiii000ddddd | Rdd = vasrw (Rss, #u5)
+					hi->instruction = HEX_INS_RDD___VASRW__RSS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vasrw (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x400020) {
+					// Instruction: 8: 10000000010sssssPP0iiiii001ddddd | Rdd = vlsrw (Rss, #u5)
+					hi->instruction = HEX_INS_RDD___VLSRW__RSS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vlsrw (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x400040) {
+					// Instruction: 8: 10000000010sssssPP0iiiii010ddddd | Rdd = vaslw (Rss, #u5)
+					hi->instruction = HEX_INS_RDD___VASLW__RSS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vaslw (R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8c00040) {
+					// Instruction: 8: 10001000110sssssPP0iiiii010ddddd | Rd = vasrw (Rss, #u5)
+					hi->instruction = HEX_INS_RD___VASRW__RSS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vasrw (R%d:R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0x9: {
+				if ((hi_u32 & 0x9e00000) == 0x1c00000) {
+					// Instruction: 9: 10010ii1110sssssPPiiiiiiiiiddddd | Rdd = memd (Rs + #s11:3)
+					hi->instruction = HEX_INS_RDD___MEMD__RS____S11_3_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 3);
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x9c00000) {
+					// Instruction: 9: 10011001110xxxxxPPu0--0iiiiddddd | Rdd = memd (Rx ++ #s4:3:circ (Mu))
+					hi->instruction = HEX_INS_RDD___MEMD__RX_____S4_3_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x9c00200) {
+					// Instruction: 9: 10011001110xxxxxPPu0--1-0--ddddd | Rdd = memd (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RDD___MEMD__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d ++ I:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xbc01000) {
+					// Instruction: 9: 10011011110eeeeePP01IIII-IIddddd | Rdd = memd (Re = #U6)
+					hi->instruction = HEX_INS_RDD___MEMD__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d = 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xbc00000) {
+					// Instruction: 9: 10011011110xxxxxPP00---iiiiddddd | Rdd = memd (Rx ++ #s4:3)
+					hi->instruction = HEX_INS_RDD___MEMD__RX_____S4_3_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d ++ 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xdc01000) {
+					// Instruction: 9: 10011101110tttttPPi1IIIIiIIddddd | Rdd = memd (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RDD___MEMD__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xdc00000) {
+					// Instruction: 9: 10011101110xxxxxPPu0----0--ddddd | Rdd = memd (Rx ++ Mu)
+					hi->instruction = HEX_INS_RDD___MEMD__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d ++ R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xfc00000) {
+					// Instruction: 9: 10011111110xxxxxPPu0----0--ddddd | Rdd = memd (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RDD___MEMD__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd (R%d ++ R%d:brev)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xbc02000) {
+					// Instruction: 9: 10011011110xxxxxPP100ttiiiiddddd | if (Pt) Rdd = memd (Rx ++ #s4:3)
+					hi->instruction = HEX_INS_IF__PT__RDD___MEMD__RX_____S4_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					sprintf(hi->mnem, "if (P%d) R%d:R%d = memd (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xbc02800) {
+					// Instruction: 9: 10011011110xxxxxPP101ttiiiiddddd | if !Pt Rdd = memd (Rx ++ #s4:3)
+					hi->instruction = HEX_INS_IF__NOT_PT_RDD___MEMD__RX_____S4_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					sprintf(hi->mnem, "if !P%d R%d:R%d = memd (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xbc03000) {
+					// Instruction: 9: 10011011110xxxxxPP110ttiiiiddddd | if (Pt.new) Rdd = memd (Rx ++ #s4:3)
+					hi->instruction = HEX_INS_IF__PT_NEW__RDD___MEMD__RX_____S4_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d:R%d = memd (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xbc03800) {
+					// Instruction: 9: 10011011110xxxxxPP111ttiiiiddddd | if !Pt.new Rdd = memd (Rx ++ #s4:3)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RDD___MEMD__RX_____S4_3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 3; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					sprintf(hi->mnem, "if !P%d.new R%d:R%d = memd (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xfc02080) {
+					// Instruction: 9: 10011111110iiiiiPP100tti1--ddddd | if (Pt) Rdd = memd (#u6)
+					hi->instruction = HEX_INS_IF__PT__RDD___MEMD___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) R%d:R%d = memd (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xfc02880) {
+					// Instruction: 9: 10011111110iiiiiPP101tti1--ddddd | if !Pt Rdd = memd (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_RDD___MEMD___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d R%d:R%d = memd (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xfc03080) {
+					// Instruction: 9: 10011111110iiiiiPP110tti1--ddddd | if (Pt.new) Rdd = memd (#u6)
+					hi->instruction = HEX_INS_IF__PT_NEW__RDD___MEMD___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) R%d:R%d = memd (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xfc03880) {
+					// Instruction: 9: 10011111110iiiiiPP111tti1--ddddd | if !Pt.new Rdd = memd (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RDD___MEMD___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new R%d:R%d = memd (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1000000) {
+					// Instruction: 9: 10010ii1000sssssPPiiiiiiiiiddddd | Rd = memb (Rs + #s11:0)
+					hi->instruction = HEX_INS_RD___MEMB__RS____S11_0_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memb (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x9000000) {
+					// Instruction: 9: 10011001000xxxxxPPu0--0iiiiddddd | Rd = memb (Rx ++ #s4:0:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMB__RX_____S4_0_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memb (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x9000200) {
+					// Instruction: 9: 10011001000xxxxxPPu0--1-0--ddddd | Rd = memb (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMB__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memb (R%d ++ I:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb001000) {
+					// Instruction: 9: 10011011000eeeeePP01IIII-IIddddd | Rd = memb (Re = #U6)
+					hi->instruction = HEX_INS_RD___MEMB__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memb (R%d = 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb000000) {
+					// Instruction: 9: 10011011000xxxxxPP00---iiiiddddd | Rd = memb (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_RD___MEMB__RX_____S4_0_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memb (R%d ++ 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xd001000) {
+					// Instruction: 9: 10011101000tttttPPi1IIIIiIIddddd | Rd = memb (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RD___MEMB__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memb (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xd000000) {
+					// Instruction: 9: 10011101000xxxxxPPu0----0--ddddd | Rd = memb (Rx ++ Mu)
+					hi->instruction = HEX_INS_RD___MEMB__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memb (R%d ++ R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xf000000) {
+					// Instruction: 9: 10011111000xxxxxPPu0----0--ddddd | Rd = memb (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RD___MEMB__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memb (R%d ++ R%d:brev)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb002000) {
+					// Instruction: 9: 10011011000xxxxxPP100ttiiiiddddd | if (Pt) Rd = memb (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					sprintf(hi->mnem, "if (P%d) R%d = memb (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb002800) {
+					// Instruction: 9: 10011011000xxxxxPP101ttiiiiddddd | if !Pt Rd = memb (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					sprintf(hi->mnem, "if !P%d R%d = memb (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb003000) {
+					// Instruction: 9: 10011011000xxxxxPP110ttiiiiddddd | if (Pt.new) Rd = memb (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memb (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb003800) {
+					// Instruction: 9: 10011011000xxxxxPP111ttiiiiddddd | if !Pt.new Rd = memb (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memb (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf002080) {
+					// Instruction: 9: 10011111000iiiiiPP100tti1--ddddd | if (Pt) Rd = memb (#u6)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) R%d = memb (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf002880) {
+					// Instruction: 9: 10011111000iiiiiPP101tti1--ddddd | if !Pt Rd = memb (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d R%d = memb (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf003080) {
+					// Instruction: 9: 10011111000iiiiiPP110tti1--ddddd | if (Pt.new) Rd = memb (#u6)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memb (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf003880) {
+					// Instruction: 9: 10011111000iiiiiPP111tti1--ddddd | if !Pt.new Rd = memb (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new R%d = memb (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x800000) {
+					// Instruction: 9: 10010ii0100sssssPPiiiiiiiiiyyyyy | Ryy = memb_fifo (Rs + #s11:0)
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RS____S11_0_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x8800000) {
+					// Instruction: 9: 10011000100xxxxxPPu0--0iiiiyyyyy | Ryy = memb_fifo (Rx ++ #s4:0:circ (Mu))
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RX_____S4_0_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x8800200) {
+					// Instruction: 9: 10011000100xxxxxPPu0--1-0--yyyyy | Ryy = memb_fifo (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d ++ I:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa801000) {
+					// Instruction: 9: 10011010100eeeeePP01IIII-IIyyyyy | Ryy = memb_fifo (Re = #U6)
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d = 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa800000) {
+					// Instruction: 9: 10011010100xxxxxPP00---iiiiyyyyy | Ryy = memb_fifo (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RX_____S4_0_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d ++ 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xc801000) {
+					// Instruction: 9: 10011100100tttttPPi1IIIIiIIyyyyy | Ryy = memb_fifo (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xc800000) {
+					// Instruction: 9: 10011100100xxxxxPPu0----0--yyyyy | Ryy = memb_fifo (Rx ++ Mu)
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d ++ R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xe800000) {
+					// Instruction: 9: 10011110100xxxxxPPu0----0--yyyyy | Ryy = memb_fifo (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RYY___MEMB_FIFO__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memb_fifo (R%d ++ R%d:brev)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x400000) {
+					// Instruction: 9: 10010ii0010sssssPPiiiiiiiiiyyyyy | Ryy = memh_fifo (Rs + #s11:1)
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RS____S11_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x8400000) {
+					// Instruction: 9: 10011000010xxxxxPPu0--0iiiiyyyyy | Ryy = memh_fifo (Rx ++ #s4:1:circ (Mu))
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RX_____S4_1_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x8400200) {
+					// Instruction: 9: 10011000010xxxxxPPu0--1-0--yyyyy | Ryy = memh_fifo (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d ++ I:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa401000) {
+					// Instruction: 9: 10011010010eeeeePP01IIII-IIyyyyy | Ryy = memh_fifo (Re = #U6)
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d = 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa400000) {
+					// Instruction: 9: 10011010010xxxxxPP00---iiiiyyyyy | Ryy = memh_fifo (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RX_____S4_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d ++ 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xc401000) {
+					// Instruction: 9: 10011100010tttttPPi1IIIIiIIyyyyy | Ryy = memh_fifo (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xc400000) {
+					// Instruction: 9: 10011100010xxxxxPPu0----0--yyyyy | Ryy = memh_fifo (Rx ++ Mu)
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d ++ R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xe400000) {
+					// Instruction: 9: 10011110010xxxxxPPu0----0--yyyyy | Ryy = memh_fifo (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RYY___MEMH_FIFO__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memh_fifo (R%d ++ R%d:brev)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1400000) {
+					// Instruction: 9: 10010ii1010sssssPPiiiiiiiiiddddd | Rd = memh (Rs + #s11:1)
+					hi->instruction = HEX_INS_RD___MEMH__RS____S11_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 1);
+					sprintf(hi->mnem, "R%d = memh (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x9400000) {
+					// Instruction: 9: 10011001010xxxxxPPu0--0iiiiddddd | Rd = memh (Rx ++ #s4:1:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMH__RX_____S4_1_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memh (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x9400200) {
+					// Instruction: 9: 10011001010xxxxxPPu0--1-0--ddddd | Rd = memh (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMH__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memh (R%d ++ I:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb401000) {
+					// Instruction: 9: 10011011010eeeeePP01IIII-IIddddd | Rd = memh (Re = #U6)
+					hi->instruction = HEX_INS_RD___MEMH__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memh (R%d = 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb400000) {
+					// Instruction: 9: 10011011010xxxxxPP00---iiiiddddd | Rd = memh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_RD___MEMH__RX_____S4_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memh (R%d ++ 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xd401000) {
+					// Instruction: 9: 10011101010tttttPPi1IIIIiIIddddd | Rd = memh (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RD___MEMH__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memh (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xd400000) {
+					// Instruction: 9: 10011101010xxxxxPPu0----0--ddddd | Rd = memh (Rx ++ Mu)
+					hi->instruction = HEX_INS_RD___MEMH__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memh (R%d ++ R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xf400000) {
+					// Instruction: 9: 10011111010xxxxxPPu0----0--ddddd | Rd = memh (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RD___MEMH__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memh (R%d ++ R%d:brev)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb402000) {
+					// Instruction: 9: 10011011010xxxxxPP100ttiiiiddddd | if (Pt) Pd = memh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__PT__PD___MEMH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					sprintf(hi->mnem, "if (P%d) P%d = memh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.pred, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb402800) {
+					// Instruction: 9: 10011011010xxxxxPP101ttiiiiddddd | if !Pt Rd = memh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					sprintf(hi->mnem, "if !P%d R%d = memh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb403000) {
+					// Instruction: 9: 10011011010xxxxxPP110ttiiiiddddd | if (Pt.new) Rd = memh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb403800) {
+					// Instruction: 9: 10011011010xxxxxPP111ttiiiiddddd | if !Pt.new Rd = memh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf402080) {
+					// Instruction: 9: 10011111010iiiiiPP100tti1--ddddd | if (Pt) Rd = memh (#u6)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) R%d = memh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf402880) {
+					// Instruction: 9: 10011111010iiiiiPP101tti1--ddddd | if !Pt Rd = memh (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d R%d = memh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf403080) {
+					// Instruction: 9: 10011111010iiiiiPP110tti1--ddddd | if (Pt.new) Rd = memh (#u6)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf403880) {
+					// Instruction: 9: 10011111010iiiiiPP111tti1--ddddd | if !Pt.new Rd = memh (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new R%d = memh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1200000) {
+					// Instruction: 9: 10010ii1001sssssPPiiiiiiiiiddddd | Rd = memub (Rs + #s11:0)
+					hi->instruction = HEX_INS_RD___MEMUB__RS____S11_0_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memub (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x9200000) {
+					// Instruction: 9: 10011001001xxxxxPPu0--0iiiiddddd | Rd = memub (Rx ++ #s4:0:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMUB__RX_____S4_0_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memub (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x9200200) {
+					// Instruction: 9: 10011001001xxxxxPPu0--1-0--ddddd | Rd = memub (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMUB__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memub (R%d ++ I:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb201000) {
+					// Instruction: 9: 10011011001eeeeePP01IIII-IIddddd | Rd = memub (Re = #U6)
+					hi->instruction = HEX_INS_RD___MEMUB__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memub (R%d = 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb200000) {
+					// Instruction: 9: 10011011001xxxxxPP00---iiiiddddd | Rd = memub (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_RD___MEMUB__RX_____S4_0_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memub (R%d ++ 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xd201000) {
+					// Instruction: 9: 10011101001tttttPPi1IIIIiIIddddd | Rd = memub (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RD___MEMUB__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memub (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xd200000) {
+					// Instruction: 9: 10011101001xxxxxPPu0----0--ddddd | Rd = memub (Rx ++ Mu)
+					hi->instruction = HEX_INS_RD___MEMUB__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memub (R%d ++ R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xf200000) {
+					// Instruction: 9: 10011111001xxxxxPPu0----0--ddddd | Rd = memub (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RD___MEMUB__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memub (R%d ++ R%d:brev)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb202000) {
+					// Instruction: 9: 10011011001xxxxxPP100ttiiiiddddd | if (Pt) Rd = memub (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMUB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					sprintf(hi->mnem, "if (P%d) R%d = memub (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb202800) {
+					// Instruction: 9: 10011011001xxxxxPP101ttiiiiddddd | if !Pt Rd = memub (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMUB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					sprintf(hi->mnem, "if !P%d R%d = memub (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb203000) {
+					// Instruction: 9: 10011011001xxxxxPP110ttiiiiddddd | if (Pt.new) Rd = memub (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMUB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memub (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb203800) {
+					// Instruction: 9: 10011011001xxxxxPP111ttiiiiddddd | if !Pt.new Rd = memub (Rx ++ #s4:0)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMUB__RX_____S4_0_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5);
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memub (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf202080) {
+					// Instruction: 9: 10011111001iiiiiPP100tti1--ddddd | if (Pt) Rd = memub (#u6)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMUB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) R%d = memub (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf202880) {
+					// Instruction: 9: 10011111001iiiiiPP101tti1--ddddd | if !Pt Rd = memub (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMUB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d R%d = memub (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf203080) {
+					// Instruction: 9: 10011111001iiiiiPP110tti1--ddddd | if (Pt.new) Rd = memub (#u6)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMUB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memub (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf203880) {
+					// Instruction: 9: 10011111001iiiiiPP111tti1--ddddd | if !Pt.new Rd = memub (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMUB___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new R%d = memub (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1600000) {
+					// Instruction: 9: 10010ii1011sssssPPiiiiiiiiiddddd | Rd = memuh (Rs + #s11:1)
+					hi->instruction = HEX_INS_RD___MEMUH__RS____S11_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 1);
+					sprintf(hi->mnem, "R%d = memuh (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x9600000) {
+					// Instruction: 9: 10011001011xxxxxPPu0--0iiiiddddd | Rd = memuh (Rx ++ #s4:1:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMUH__RX_____S4_1_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memuh (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x9600200) {
+					// Instruction: 9: 10011001011xxxxxPPu0--1-0--ddddd | Rd = memuh (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMUH__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memuh (R%d ++ I:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb601000) {
+					// Instruction: 9: 10011011011eeeeePP01IIII-IIddddd | Rd = memuh (Re = #U6)
+					hi->instruction = HEX_INS_RD___MEMUH__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memuh (R%d = 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb600000) {
+					// Instruction: 9: 10011011011xxxxxPP00---iiiiddddd | Rd = memuh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_RD___MEMUH__RX_____S4_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memuh (R%d ++ 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xd601000) {
+					// Instruction: 9: 10011101011tttttPPi1IIIIiIIddddd | Rd = memuh (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RD___MEMUH__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memuh (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xd600000) {
+					// Instruction: 9: 10011101011xxxxxPPu0----0--ddddd | Rd = memuh (Rx ++ Mu)
+					hi->instruction = HEX_INS_RD___MEMUH__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memuh (R%d ++ R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xf600000) {
+					// Instruction: 9: 10011111011xxxxxPPu0----0--ddddd | Rd = memuh (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RD___MEMUH__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memuh (R%d ++ R%d:brev)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb602000) {
+					// Instruction: 9: 10011011011xxxxxPP100ttiiiiddddd | if (Pt) Rd = memuh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMUH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					sprintf(hi->mnem, "if (P%d) R%d = memuh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb602800) {
+					// Instruction: 9: 10011011011xxxxxPP101ttiiiiddddd | if !Pt Rd = memuh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMUH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					sprintf(hi->mnem, "if !P%d R%d = memuh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb603000) {
+					// Instruction: 9: 10011011011xxxxxPP110ttiiiiddddd | if (Pt.new) Rd = memuh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMUH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memuh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb603800) {
+					// Instruction: 9: 10011011011xxxxxPP111ttiiiiddddd | if !Pt.new Rd = memuh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMUH__RX_____S4_1_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memuh (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf602080) {
+					// Instruction: 9: 10011111011iiiiiPP100tti1--ddddd | if (Pt) Rd = memuh (#u6)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMUH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) R%d = memuh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf602880) {
+					// Instruction: 9: 10011111011iiiiiPP101tti1--ddddd | if !Pt Rd = memuh (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMUH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d R%d = memuh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf603080) {
+					// Instruction: 9: 10011111011iiiiiPP110tti1--ddddd | if (Pt.new) Rd = memuh (#u6)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMUH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memuh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf603880) {
+					// Instruction: 9: 10011111011iiiiiPP111tti1--ddddd | if !Pt.new Rd = memuh (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMUH___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new R%d = memuh (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1800000) {
+					// Instruction: 9: 10010ii1100sssssPPiiiiiiiiiddddd | Rd = memw (Rs + #s11:2)
+					hi->instruction = HEX_INS_RD___MEMW__RS____S11_2_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[2], 2);
+					sprintf(hi->mnem, "R%d = memw (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x9800000) {
+					// Instruction: 9: 10011001100xxxxxPPu0--0iiiiddddd | Rd = memw (Rx ++ #s4:2:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMW__RX_____S4_2_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x9800200) {
+					// Instruction: 9: 10011001100xxxxxPPu0--1-0--ddddd | Rd = memw (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMW__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw (R%d ++ I:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb801000) {
+					// Instruction: 9: 10011011100eeeeePP01IIII-IIddddd | Rd = memw (Re = #U6)
+					hi->instruction = HEX_INS_RD___MEMW__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memw (R%d = 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xb800000) {
+					// Instruction: 9: 10011011100xxxxxPP00---iiiiddddd | Rd = memw (Rx ++ #s4:2)
+					hi->instruction = HEX_INS_RD___MEMW__RX_____S4_2_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw (R%d ++ 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xd801000) {
+					// Instruction: 9: 10011101100tttttPPi1IIIIiIIddddd | Rd = memw (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RD___MEMW__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = memw (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xd800000) {
+					// Instruction: 9: 10011101100xxxxxPPu0----0--ddddd | Rd = memw (Rx ++ Mu)
+					hi->instruction = HEX_INS_RD___MEMW__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw (R%d ++ R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xf800000) {
+					// Instruction: 9: 10011111100xxxxxPPu0----0--ddddd | Rd = memw (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RD___MEMW__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw (R%d ++ R%d:brev)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb802000) {
+					// Instruction: 9: 10011011100xxxxxPP100ttiiiiddddd | if (Pt) Rd = memw (Rx ++ #s4:2)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMW__RX_____S4_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					sprintf(hi->mnem, "if (P%d) R%d = memw (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb802800) {
+					// Instruction: 9: 10011011100xxxxxPP101ttiiiiddddd | if !Pt Rd = memw (Rx ++ #s4:2)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMW__RX_____S4_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					sprintf(hi->mnem, "if !P%d R%d = memw (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb803000) {
+					// Instruction: 9: 10011011100xxxxxPP110ttiiiiddddd | if (Pt.new) Rd = memw (Rx ++ #s4:2)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMW__RX_____S4_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = memw (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03800) == 0xb803800) {
+					// Instruction: 9: 10011011100xxxxxPP111ttiiiiddddd | if !Pt.new Rd = memw (Rx ++ #s4:2)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMW__RX_____S4_2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					sprintf(hi->mnem, "if !P%d.new R%d = memw (R%d ++ 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf802080) {
+					// Instruction: 9: 10011111100iiiiiPP100tti1--ddddd | if (Pt) Rd = memw (#u6)
+					hi->instruction = HEX_INS_IF__PT__RD___MEMW___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE; // if (Pt)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d) R%d = memw (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf802880) {
+					// Instruction: 9: 10011111100iiiiiPP101tti1--ddddd | if !Pt Rd = memw (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_RD___MEMW___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE; // if !Pt 
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d R%d = memw (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf803080) {
+					// Instruction: 9: 10011111100iiiiiPP110tti1--ddddd | if (Pt.new) Rd = memw (#u6)
+					hi->instruction = HEX_INS_IF__PT_NEW__RD___MEMW___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pt.new)
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if (P%d.new) R%d = memw (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xf803880) {
+					// Instruction: 9: 10011111100iiiiiPP111tti1--ddddd | if !Pt.new Rd = memw (#u6)
+					hi->instruction = HEX_INS_IF__NOT_PT_NEW_RD___MEMW___U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x600) >> 9);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x100) >> 8));
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pt.new
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "if !P%d.new R%d = memw (0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfff201f) == 0x1e001e) {
+					// Instruction: 9: 1001000000011110PP0--------11110 | deallocframe
+					hi->instruction = HEX_INS_DEALLOCFRAME;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "deallocframe");
+					break;
+				}
+				if ((hi_u32 & 0xfff3c1f) == 0x61e001e) {
+					// Instruction: 9: 1001011000011110PP0000-----11110 | dealloc_return
+					hi->instruction = HEX_INS_DEALLOC_RETURN;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dealloc_return");
+					break;
+				}
+				if ((hi_u32 & 0xfff3c1f) == 0x61e081e) {
+					// Instruction: 9: 1001011000011110PP0010ss---11110 | if (Ps.new) dealloc_return:nt
+					hi->instruction = HEX_INS_IF__PS_NEW__DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (P%d.new) dealloc_return:nt", hi->ops[0].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfff3c1f) == 0x61e101e) {
+					// Instruction: 9: 1001011000011110PP0100ss---11110 | if (Ps) dealloc_return
+					hi->instruction = HEX_INS_IF__PS__DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (P%d) dealloc_return", hi->ops[0].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfff3c1f) == 0x61e181e) {
+					// Instruction: 9: 1001011000011110PP0110ss---11110 | if (Ps.new) dealloc_return:t
+					hi->instruction = HEX_INS_IF__PS_NEW__DEALLOC_RETURN_T;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if (P%d.new) dealloc_return:t", hi->ops[0].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfff3c1f) == 0x61e281e) {
+					// Instruction: 9: 1001011000011110PP1010ss---11110 | if !Ps.new dealloc_return:nt
+					hi->instruction = HEX_INS_IF__NOT_PS_NEW_DEALLOC_RETURN_NT;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if !P%d.new dealloc_return:nt", hi->ops[0].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfff3c1f) == 0x61e301e) {
+					// Instruction: 9: 1001011000011110PP1100ss---11110 | if !Ps dealloc_return
+					hi->instruction = HEX_INS_IF__NOT_PS_DEALLOC_RETURN;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if !P%d dealloc_return", hi->ops[0].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfff3c1f) == 0x61e381e) {
+					// Instruction: 9: 1001011000011110PP1110ss---11110 | if !Ps.new dealloc_return:t
+					hi->instruction = HEX_INS_IF__NOT_PS_NEW_DEALLOC_RETURN_T;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x300) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "if !P%d.new dealloc_return:t", hi->ops[0].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x200000) {
+					// Instruction: 9: 10010ii0001sssssPPiiiiiiiiiddddd | Rd = membh (Rs + #s11:1)
+					hi->instruction = HEX_INS_RD___MEMBH__RS____S11_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x600000) {
+					// Instruction: 9: 10010ii0011sssssPPiiiiiiiiiddddd | Rd = memubh (Rs + #s11:1)
+					hi->instruction = HEX_INS_RD___MEMUBH__RS____S11_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0xa00000) {
+					// Instruction: 9: 10010ii0101sssssPPiiiiiiiiiddddd | Rdd = memubh (Rs + #s11:2)
+					hi->instruction = HEX_INS_RDD___MEMUBH__RS____S11_2_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0xe00000) {
+					// Instruction: 9: 10010ii0111sssssPPiiiiiiiiiddddd | Rdd = membh (Rs + #s11:2)
+					hi->instruction = HEX_INS_RDD___MEMBH__RS____S11_2_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x3fe0) >> 5)) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x8200000) {
+					// Instruction: 9: 10011000001xxxxxPPu0--0iiiiddddd | Rd = membh (Rx ++ #s4:1:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMBH__RX_____S4_1_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x8200200) {
+					// Instruction: 9: 10011000001xxxxxPPu0--1-0--ddddd | Rd = membh (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMBH__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d ++ I:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x8600000) {
+					// Instruction: 9: 10011000011xxxxxPPu0--0iiiiddddd | Rd = memubh (Rx ++ #s4:1:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMUBH__RX_____S4_1_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x8600200) {
+					// Instruction: 9: 10011000011xxxxxPPu0--1-0--ddddd | Rd = memubh (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RD___MEMUBH__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d ++ I:circ (R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x8a00000) {
+					// Instruction: 9: 10011000101xxxxxPPu0--0iiiiddddd | Rdd = memubh (Rx ++ #s4:2:circ (Mu))
+					hi->instruction = HEX_INS_RDD___MEMUBH__RX_____S4_2_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x8a00200) {
+					// Instruction: 9: 10011000101xxxxxPPu0--1-0--ddddd | Rdd = memubh (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RDD___MEMUBH__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d ++ I:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01200) == 0x8e00000) {
+					// Instruction: 9: 10011000111xxxxxPPu0--0iiiiddddd | Rdd = membh (Rx ++ #s4:2:circ (Mu))
+					hi->instruction = HEX_INS_RDD___MEMBH__RX_____S4_2_CIRC__MU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d ++ 0x%x:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01280) == 0x8e00200) {
+					// Instruction: 9: 10011000111xxxxxPPu0--1-0--ddddd | Rdd = membh (Rx ++ I:circ (Mu))
+					hi->instruction = HEX_INS_RDD___MEMBH__RX____I_CIRC__MU__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d ++ I:circ (R%d))", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa201000) {
+					// Instruction: 9: 10011010001eeeeePP01IIII-IIddddd | Rd = membh (Re = #U6)
+					hi->instruction = HEX_INS_RD___MEMBH__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d = 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa200000) {
+					// Instruction: 9: 10011010001xxxxxPP00---iiiiddddd | Rd = membh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_RD___MEMBH__RX_____S4_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d ++ 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa601000) {
+					// Instruction: 9: 10011010011eeeeePP01IIII-IIddddd | Rd = memubh (Re = #U6)
+					hi->instruction = HEX_INS_RD___MEMUBH__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d = 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xa600000) {
+					// Instruction: 9: 10011010011xxxxxPP00---iiiiddddd | Rd = memubh (Rx ++ #s4:1)
+					hi->instruction = HEX_INS_RD___MEMUBH__RX_____S4_1_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d ++ 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xaa01000) {
+					// Instruction: 9: 10011010101eeeeePP01IIII-IIddddd | Rdd = memubh (Re = #U6)
+					hi->instruction = HEX_INS_RDD___MEMUBH__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d = 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xaa00000) {
+					// Instruction: 9: 10011010101xxxxxPP00---iiiiddddd | Rdd = memubh (Rx ++ #s4:2)
+					hi->instruction = HEX_INS_RDD___MEMUBH__RX_____S4_2_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d ++ 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xae01000) {
+					// Instruction: 9: 10011010111eeeeePP01IIII-IIddddd | Rdd = membh (Re = #U6)
+					hi->instruction = HEX_INS_RDD___MEMBH__RE____U6_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d = 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe03000) == 0xae00000) {
+					// Instruction: 9: 10011010111xxxxxPP00---iiiiddddd | Rdd = membh (Rx ++ #s4:2)
+					hi->instruction = HEX_INS_RDD___MEMBH__RX_____S4_2_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1e0) >> 5) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d ++ 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xc201000) {
+					// Instruction: 9: 10011100001tttttPPi1IIIIiIIddddd | Rd = membh (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RD___MEMBH__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xc200000) {
+					// Instruction: 9: 10011100001xxxxxPPu0----0--ddddd | Rd = membh (Rx ++ Mu)
+					hi->instruction = HEX_INS_RD___MEMBH__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d ++ R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xc601000) {
+					// Instruction: 9: 10011100011tttttPPi1IIIIiIIddddd | Rd = memubh (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RD___MEMUBH__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xc600000) {
+					// Instruction: 9: 10011100011xxxxxPPu0----0--ddddd | Rd = memubh (Rx ++ Mu)
+					hi->instruction = HEX_INS_RD___MEMUBH__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d ++ R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xca01000) {
+					// Instruction: 9: 10011100101tttttPPi1IIIIiIIddddd | Rdd = memubh (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RDD___MEMUBH__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xca00000) {
+					// Instruction: 9: 10011100101xxxxxPPu0----0--ddddd | Rdd = memubh (Rx ++ Mu)
+					hi->instruction = HEX_INS_RDD___MEMUBH__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d ++ R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01000) == 0xce01000) {
+					// Instruction: 9: 10011100111tttttPPi1IIIIiIIddddd | Rdd = membh (Rt << #u2 + #U6)
+					hi->instruction = HEX_INS_RDD___MEMBH__RT_____U2____U6_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x80) >> 7));
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0xf00) >> 8) | ((hi_u32 & 0x60) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d << 0x%x + 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xce00000) {
+					// Instruction: 9: 10011100111xxxxxPPu0----0--ddddd | Rdd = membh (Rx ++ Mu)
+					hi->instruction = HEX_INS_RDD___MEMBH__RX____MU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d ++ R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xe200000) {
+					// Instruction: 9: 10011110001xxxxxPPu0----0--ddddd | Rd = membh (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RD___MEMBH__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = membh (R%d ++ R%d:brev)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xe600000) {
+					// Instruction: 9: 10011110011xxxxxPPu0----0--ddddd | Rd = memubh (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RD___MEMUBH__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memubh (R%d ++ R%d:brev)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xea00000) {
+					// Instruction: 9: 10011110101xxxxxPPu0----0--ddddd | Rdd = memubh (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RDD___MEMUBH__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memubh (R%d ++ R%d:brev)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01080) == 0xee00000) {
+					// Instruction: 9: 10011110111xxxxxPPu0----0--ddddd | Rdd = membh (Rx ++ Mu:brev)
+					hi->instruction = HEX_INS_RDD___MEMBH__RX____MU_BREV_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = membh (R%d ++ R%d:brev)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02020) == 0x2002000) {
+					// Instruction: 9: 10010010000sssssPP1ttttt--0ddddd | Rd = memw_phys (Rs, Rt)
+					hi->instruction = HEX_INS_RD___MEMW_PHYS__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw_phys (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03020) == 0x2000000) {
+					// Instruction: 9: 10010010000sssssPP00------0ddddd | Rd = memw_locked (Rs)
+					hi->instruction = HEX_INS_RD___MEMW_LOCKED__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = memw_locked (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03020) == 0x2001000) {
+					// Instruction: 9: 10010010000sssssPP01------0ddddd | Rdd = memd_locked (Rs)
+					hi->instruction = HEX_INS_RDD___MEMD_LOCKED__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = memd_locked (R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x4000000) {
+					// Instruction: 9: 10010100000sssssPP0--iiiiiiiiiii | dcfetch (Rs + #u11:3)
+					hi->instruction = HEX_INS_DCFETCH__RS____U11_3_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x7ff) >> 0) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dcfetch (R%d + 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0xa: {
+				if ((hi_u32 & 0x9e01800) == 0x1a00000) {
+					// Instruction: 10: 10100ii1101sssssPPi00tttiiiiiiii | memb (Rs + #s11:0) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RS____S11_0____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0));
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memb (R%d + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01882) == 0x9a00002) {
+					// Instruction: 10: 10101001101xxxxxPPu00ttt0-----1- | memb (Rx ++ I:circ (Mu)) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RX____I_CIRC__MU_____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ I:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01882) == 0x9a00000) {
+					// Instruction: 10: 10101001101xxxxxPPu00ttt0iiii-0- | memb (Rx ++ #s4:0:circ (Mu)) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RX_____S4_0_CIRC__MU_____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ 0x%x:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xba00080) {
+					// Instruction: 10: 10101011101eeeeePP000ttt1-IIIIII | memb (Re = #U6) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RE____U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d = 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03882) == 0xba00000) {
+					// Instruction: 10: 10101011101xxxxxPP000ttt0iiii-0- | memb (Rx ++ #s4:0) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RX_____S4_0____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xda00080) {
+					// Instruction: 10: 10101101101uuuuuPPi00ttt1iIIIIII | memb (Ru << #u2 + #U6) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RU_____U2____U6____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memb (R%d << 0x%x + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xda00000) {
+					// Instruction: 10: 10101101101xxxxxPPu00ttt0------- | memb (Rx ++ Mu) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RX____MU____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ R%d) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xfa00000) {
+					// Instruction: 10: 10101111101xxxxxPPu00ttt0------- | memb (Rx ++ Mu:brev) = Nt.new
+					hi->instruction = HEX_INS_MEMB__RX____MU_BREV____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ R%d:brev) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02000) {
+					// Instruction: 10: 10101011101xxxxxPP100ttt0iiii0vv | if (Pv) memb (Rx ++ #s4:0) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMB__RX_____S4_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02004) {
+					// Instruction: 10: 10101011101xxxxxPP100ttt0iiii1vv | if !Pv memb (Rx ++ #s4:0) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB__RX_____S4_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02080) {
+					// Instruction: 10: 10101011101xxxxxPP100ttt1iiii0vv | if (Pv.new) memb (Rx ++ #s4:0) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB__RX_____S4_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02084) {
+					// Instruction: 10: 10101011101xxxxxPP100ttt1iiii1vv | if !Pv.new memb (Rx ++ #s4:0) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB__RX_____S4_0____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa00080) {
+					// Instruction: 10: 10101111101---iiPP000ttt1iiii0vv | if (Pv) memb (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMB___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa00084) {
+					// Instruction: 10: 10101111101---iiPP000ttt1iiii1vv | if !Pv memb (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa02080) {
+					// Instruction: 10: 10101111101---iiPP100ttt1iiii0vv | if (Pv.new) memb (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa02084) {
+					// Instruction: 10: 10101111101---iiPP100ttt1iiii1vv | if !Pv.new memb (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e01800) == 0x1a00800) {
+					// Instruction: 10: 10100ii1101sssssPPi01tttiiiiiiii | memh (Rs + #s11:1) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RS____S11_1____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[1], 1);
+					sprintf(hi->mnem, "memh (R%d + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01882) == 0x9a00802) {
+					// Instruction: 10: 10101001101xxxxxPPu01ttt0-----1- | memh (Rx ++ I:circ (Mu)) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RX____I_CIRC__MU_____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ I:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01882) == 0x9a00800) {
+					// Instruction: 10: 10101001101xxxxxPPu01ttt0iiii-0- | memh (Rx ++ #s4:1:circ (Mu)) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RX_____S4_1_CIRC__MU_____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ 0x%x:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xba00880) {
+					// Instruction: 10: 10101011101eeeeePP001ttt1-IIIIII | memh (Re = #U6) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RE____U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d = 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03882) == 0xba00800) {
+					// Instruction: 10: 10101011101xxxxxPP001ttt0iiii-0- | memh (Rx ++ #s4:1) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RX_____S4_1____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xda00880) {
+					// Instruction: 10: 10101101101uuuuuPPi01ttt1iIIIIII | memh (Ru << #u2 + #U6) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RU_____U2____U6____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memh (R%d << 0x%x + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xda00800) {
+					// Instruction: 10: 10101101101xxxxxPPu01ttt0------- | memh (Rx ++ Mu) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RX____MU____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ R%d) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xfa00800) {
+					// Instruction: 10: 10101111101xxxxxPPu01ttt0------- | memh (Rx ++ Mu:brev) = Nt.new
+					hi->instruction = HEX_INS_MEMH__RX____MU_BREV____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ R%d:brev) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02800) {
+					// Instruction: 10: 10101011101xxxxxPP101ttt0iiii0vv | if (Pv) memh (Rx ++ #s4:1) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMH__RX_____S4_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02804) {
+					// Instruction: 10: 10101011101xxxxxPP101ttt0iiii1vv | if !Pv memh (Rx ++ #s4:1) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RX_____S4_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02880) {
+					// Instruction: 10: 10101011101xxxxxPP101ttt1iiii0vv | if (Pv.new) memh (Rx ++ #s4:1) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RX_____S4_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba02884) {
+					// Instruction: 10: 10101011101xxxxxPP101ttt1iiii1vv | if !Pv.new memh (Rx ++ #s4:1) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RX_____S4_1____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa00880) {
+					// Instruction: 10: 10101111101---iiPP001ttt1iiii0vv | if (Pv) memh (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMH___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa00884) {
+					// Instruction: 10: 10101111101---iiPP001ttt1iiii1vv | if !Pv memh (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa02880) {
+					// Instruction: 10: 10101111101---iiPP101ttt1iiii0vv | if (Pv.new) memh (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa02884) {
+					// Instruction: 10: 10101111101---iiPP101ttt1iiii1vv | if !Pv.new memh (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e01800) == 0x1a01000) {
+					// Instruction: 10: 10100ii1101sssssPPi10tttiiiiiiii | memw (Rs + #s11:2) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RS____S11_2____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[1], 2);
+					sprintf(hi->mnem, "memw (R%d + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01882) == 0x9a01002) {
+					// Instruction: 10: 10101001101xxxxxPPu10ttt0-----1- | memw (Rx ++ I:circ (Mu)) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RX____I_CIRC__MU_____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ I:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01882) == 0x9a01000) {
+					// Instruction: 10: 10101001101xxxxxPPu10ttt0iiii-0- | memw (Rx ++ #s4:2:circ (Mu)) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RX_____S4_2_CIRC__MU_____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ 0x%x:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03880) == 0xba01080) {
+					// Instruction: 10: 10101011101eeeeePP010ttt1-IIIIII | memw (Re = #U6) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RE____U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d = 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03882) == 0xba01000) {
+					// Instruction: 10: 10101011101xxxxxPP010ttt0iiii-0- | memw (Rx ++ #s4:2) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RX_____S4_2____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xda01080) {
+					// Instruction: 10: 10101101101uuuuuPPi10ttt1iIIIIII | memw (Ru << #u2 + #U6) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RU_____U2____U6____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memw (R%d << 0x%x + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xda01000) {
+					// Instruction: 10: 10101101101xxxxxPPu10ttt0------- | memw (Rx ++ Mu) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RX____MU____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ R%d) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01880) == 0xfa01000) {
+					// Instruction: 10: 10101111101xxxxxPPu10ttt0------- | memw (Rx ++ Mu:brev) = Nt.new
+					hi->instruction = HEX_INS_MEMW__RX____MU_BREV____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ R%d:brev) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba03000) {
+					// Instruction: 10: 10101011101xxxxxPP110ttt0iiii0vv | if (Pv) memw (Rx ++ #s4:2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMW__RX_____S4_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba03004) {
+					// Instruction: 10: 10101011101xxxxxPP110ttt0iiii1vv | if !Pv memw (Rx ++ #s4:2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW__RX_____S4_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba03080) {
+					// Instruction: 10: 10101011101xxxxxPP110ttt1iiii0vv | if (Pv.new) memw (Rx ++ #s4:2) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW__RX_____S4_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xba03084) {
+					// Instruction: 10: 10101011101xxxxxPP110ttt1iiii1vv | if !Pv.new memw (Rx ++ #s4:2) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW__RX_____S4_2____NT_NEW;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa01080) {
+					// Instruction: 10: 10101111101---iiPP010ttt1iiii0vv | if (Pv) memw (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__PV__MEMW___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa01084) {
+					// Instruction: 10: 10101111101---iiPP010ttt1iiii1vv | if !Pv memw (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa03080) {
+					// Instruction: 10: 10101111101---iiPP110ttt1iiii0vv | if (Pv.new) memw (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe03884) == 0xfa03084) {
+					// Instruction: 10: 10101111101---iiPP110ttt1iiii1vv | if !Pv.new memw (#u6) = Nt.new
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW___U6____NT_NEW;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x700) >> 8); // Nt.new
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1c00000) {
+					// Instruction: 10: 10100ii1110sssssPPitttttiiiiiiii | memd (Rs + #s11:3) = Rtt
+					hi->instruction = HEX_INS_MEMD__RS____S11_3____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[1], 3);
+					sprintf(hi->mnem, "memd (R%d + 0x%x) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9c00002) {
+					// Instruction: 10: 10101001110xxxxxPPuttttt0-----1- | memd (Rx ++ I:circ (Mu)) = Rtt
+					hi->instruction = HEX_INS_MEMD__RX____I_CIRC__MU_____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (R%d ++ I:circ (R%d)) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9c00000) {
+					// Instruction: 10: 10101001110xxxxxPPuttttt0iiii-0- | memd (Rx ++ #s4:3:circ (Mu)) = Rtt
+					hi->instruction = HEX_INS_MEMD__RX_____S4_3_CIRC__MU_____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (R%d ++ 0x%x:circ (R%d)) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xbc00080) {
+					// Instruction: 10: 10101011110eeeeePP0ttttt1-IIIIII | memd (Re = #U6) = Rtt
+					hi->instruction = HEX_INS_MEMD__RE____U6____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memd (R%d = 0x%x) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02082) == 0xbc00000) {
+					// Instruction: 10: 10101011110xxxxxPP0ttttt0iiii-0- | memd (Rx ++ #s4:3) = Rtt
+					hi->instruction = HEX_INS_MEMD__RX_____S4_3____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 3; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (R%d ++ 0x%x) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xdc00080) {
+					// Instruction: 10: 10101101110uuuuuPPittttt1iIIIIII | memd (Ru << #u2 + #U6) = Rtt
+					hi->instruction = HEX_INS_MEMD__RU_____U2____U6____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memd (R%d << 0x%x + 0x%x) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xdc00000) {
+					// Instruction: 10: 10101101110xxxxxPPuttttt0------- | memd (Rx ++ Mu) = Rtt
+					hi->instruction = HEX_INS_MEMD__RX____MU____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (R%d ++ R%d) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xfc00000) {
+					// Instruction: 10: 10101111110xxxxxPPuttttt0------- | memd (Rx ++ Mu:brev) = Rtt
+					hi->instruction = HEX_INS_MEMD__RX____MU_BREV____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd (R%d ++ R%d:brev) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xbc02000) {
+					// Instruction: 10: 10101011110xxxxxPP1ttttt0iiii0vv | if (Pv) memd (Rx ++ #s4:3) = Rtt
+					hi->instruction = HEX_INS_IF__PV__MEMD__RX_____S4_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memd (R%d ++ 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xbc02004) {
+					// Instruction: 10: 10101011110xxxxxPP1ttttt0iiii1vv | if !Pv memd (Rx ++ #s4:3) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMD__RX_____S4_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memd (R%d ++ 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xbc02080) {
+					// Instruction: 10: 10101011110xxxxxPP1ttttt1iiii0vv | if (Pv.new) memd (Rx ++ #s4:3) = Rtt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMD__RX_____S4_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memd (R%d ++ 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xbc02084) {
+					// Instruction: 10: 10101011110xxxxxPP1ttttt1iiii1vv | if !Pv.new memd (Rx ++ #s4:3) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMD__RX_____S4_3____RTT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 3; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memd (R%d ++ 0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xfc00080) {
+					// Instruction: 10: 10101111110---iiPP0ttttt1iiii0vv | if (Pv) memd (#u6) = Rtt
+					hi->instruction = HEX_INS_IF__PV__MEMD___U6____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memd (0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xfc00084) {
+					// Instruction: 10: 10101111110---iiPP0ttttt1iiii1vv | if !Pv memd (#u6) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMD___U6____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memd (0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xfc02080) {
+					// Instruction: 10: 10101111110---iiPP1ttttt1iiii0vv | if (Pv.new) memd (#u6) = Rtt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMD___U6____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memd (0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xfc02084) {
+					// Instruction: 10: 10101111110---iiPP1ttttt1iiii1vv | if !Pv.new memd (#u6) = Rtt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMD___U6____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memd (0x%x) = R%d:R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1000000) {
+					// Instruction: 10: 10100ii1000sssssPPitttttiiiiiiii | memb (Rs + #s11:0) = Rt
+					hi->instruction = HEX_INS_MEMB__RS____S11_0____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0));
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memb (R%d + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9000002) {
+					// Instruction: 10: 10101001000xxxxxPPuttttt0-----1- | memb (Rx ++ I:circ (Mu)) = Rt
+					hi->instruction = HEX_INS_MEMB__RX____I_CIRC__MU_____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ I:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9000000) {
+					// Instruction: 10: 10101001000xxxxxPPuttttt0iiii-0- | memb (Rx ++ #s4:0:circ (Mu)) = Rt
+					hi->instruction = HEX_INS_MEMB__RX_____S4_0_CIRC__MU_____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ 0x%x:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xb000080) {
+					// Instruction: 10: 10101011000eeeeePP0ttttt1-IIIIII | memb (Re = #U6) = Rt
+					hi->instruction = HEX_INS_MEMB__RE____U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memb (R%d = 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02082) == 0xb000000) {
+					// Instruction: 10: 10101011000xxxxxPP0ttttt0iiii-0- | memb (Rx ++ #s4:0) = Rt
+					hi->instruction = HEX_INS_MEMB__RX_____S4_0____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd000080) {
+					// Instruction: 10: 10101101000uuuuuPPittttt1iIIIIII | memb (Ru << #u2 + #U6) = Rt
+					hi->instruction = HEX_INS_MEMB__RU_____U2____U6____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memb (R%d << 0x%x + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd000000) {
+					// Instruction: 10: 10101101000xxxxxPPuttttt0------- | memb (Rx ++ Mu) = Rt
+					hi->instruction = HEX_INS_MEMB__RX____MU____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ R%d) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xf000000) {
+					// Instruction: 10: 10101111000xxxxxPPuttttt0------- | memb (Rx ++ Mu:brev) = Rt
+					hi->instruction = HEX_INS_MEMB__RX____MU_BREV____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memb (R%d ++ R%d:brev) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb002000) {
+					// Instruction: 10: 10101011000xxxxxPP1ttttt0iiii0vv | if (Pv) memb (Rx ++ #s4:0) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMB__RX_____S4_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb002004) {
+					// Instruction: 10: 10101011000xxxxxPP1ttttt0iiii1vv | if !Pv memb (Rx ++ #s4:0) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB__RX_____S4_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb002080) {
+					// Instruction: 10: 10101011000xxxxxPP1ttttt1iiii0vv | if (Pv.new) memb (Rx ++ #s4:0) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB__RX_____S4_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb002084) {
+					// Instruction: 10: 10101011000xxxxxPP1ttttt1iiii1vv | if !Pv.new memb (Rx ++ #s4:0) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB__RX_____S4_0____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf000080) {
+					// Instruction: 10: 10101111000---iiPP0ttttt1iiii0vv | if (Pv) memb (#u6) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMB___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf000084) {
+					// Instruction: 10: 10101111000---iiPP0ttttt1iiii1vv | if !Pv memb (#u6) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMB___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf002080) {
+					// Instruction: 10: 10101111000---iiPP1ttttt1iiii0vv | if (Pv.new) memb (#u6) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMB___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf002084) {
+					// Instruction: 10: 10101111000---iiPP1ttttt1iiii1vv | if !Pv.new memb (#u6) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMB___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memb (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1400000) {
+					// Instruction: 10: 10100ii1010sssssPPitttttiiiiiiii | memh (Rs + #s11:1) = Rt
+					hi->instruction = HEX_INS_MEMH__RS____S11_1____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[1], 1);
+					sprintf(hi->mnem, "memh (R%d + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1600000) {
+					// Instruction: 10: 10100ii1011sssssPPitttttiiiiiiii | memh (Rs + #s11:1) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RS____S11_1____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d + 0x%x) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9400002) {
+					// Instruction: 10: 10101001010xxxxxPPuttttt0-----1- | memh (Rx ++ I:circ (Mu)) = Rt
+					hi->instruction = HEX_INS_MEMH__RX____I_CIRC__MU_____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ I:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9400000) {
+					// Instruction: 10: 10101001010xxxxxPPuttttt0iiii-0- | memh (Rx ++ #s4:1:circ (Mu)) = Rt
+					hi->instruction = HEX_INS_MEMH__RX_____S4_1_CIRC__MU_____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ 0x%x:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9600002) {
+					// Instruction: 10: 10101001011xxxxxPPuttttt0-----1- | memh (Rx ++ I:circ (Mu)) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RX____I_CIRC__MU_____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ I:circ (R%d)) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9600000) {
+					// Instruction: 10: 10101001011xxxxxPPuttttt0iiii-0- | memh (Rx ++ #s4:1:circ (Mu)) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RX_____S4_1_CIRC__MU_____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ 0x%x:circ (R%d)) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xb400080) {
+					// Instruction: 10: 10101011010eeeeePP0ttttt1-IIIIII | memh (Re = #U6) = Rt
+					hi->instruction = HEX_INS_MEMH__RE____U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memh (R%d = 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02082) == 0xb400000) {
+					// Instruction: 10: 10101011010xxxxxPP0ttttt0iiii-0- | memh (Rx ++ #s4:1) = Rt
+					hi->instruction = HEX_INS_MEMH__RX_____S4_1____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xb600080) {
+					// Instruction: 10: 10101011011eeeeePP0ttttt1-IIIIII | memh (Re = #U6) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RE____U6____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d = 0x%x) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02082) == 0xb600000) {
+					// Instruction: 10: 10101011011xxxxxPP0ttttt0iiii-0- | memh (Rx ++ #s4:1) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RX_____S4_1____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ 0x%x) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd400080) {
+					// Instruction: 10: 10101101010uuuuuPPittttt1iIIIIII | memh (Ru << #u2 + #U6) = Rt
+					hi->instruction = HEX_INS_MEMH__RU_____U2____U6____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memh (R%d << 0x%x + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd400000) {
+					// Instruction: 10: 10101101010xxxxxPPuttttt0------- | memh (Rx ++ Mu) = Rt
+					hi->instruction = HEX_INS_MEMH__RX____MU____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ R%d) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd600080) {
+					// Instruction: 10: 10101101011uuuuuPPittttt1iIIIIII | memh (Ru << #u2 + #U6) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RU_____U2____U6____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d << 0x%x + 0x%x) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd600000) {
+					// Instruction: 10: 10101101011xxxxxPPuttttt0------- | memh (Rx ++ Mu) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RX____MU____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ R%d) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xf400000) {
+					// Instruction: 10: 10101111010xxxxxPPuttttt0------- | memh (Rx ++ Mu:brev) = Rt
+					hi->instruction = HEX_INS_MEMH__RX____MU_BREV____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ R%d:brev) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xf600000) {
+					// Instruction: 10: 10101111011xxxxxPPuttttt0------- | memh (Rx ++ Mu:brev) = Rt.H
+					hi->instruction = HEX_INS_MEMH__RX____MU_BREV____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memh (R%d ++ R%d:brev) = R%d.H", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb402000) {
+					// Instruction: 10: 10101011010xxxxxPP1ttttt0iiii0vv | if (Pv) memh (Rx ++ #s4:1) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMH__RX_____S4_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb402004) {
+					// Instruction: 10: 10101011010xxxxxPP1ttttt0iiii1vv | if !Pv memh (Rx ++ #s4:1) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RX_____S4_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb402080) {
+					// Instruction: 10: 10101011010xxxxxPP1ttttt1iiii0vv | if (Pv.new) memh (Rx ++ #s4:1) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RX_____S4_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb402084) {
+					// Instruction: 10: 10101011010xxxxxPP1ttttt1iiii1vv | if !Pv.new memh (Rx ++ #s4:1) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RX_____S4_1____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb602000) {
+					// Instruction: 10: 10101011011xxxxxPP1ttttt0iiii0vv | if (Pv) memh (Rx ++ #s4:1) = Rt.H
+					hi->instruction = HEX_INS_IF__PV__MEMH__RX_____S4_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (R%d ++ 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb602004) {
+					// Instruction: 10: 10101011011xxxxxPP1ttttt0iiii1vv | if !Pv memh (Rx ++ #s4:1) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH__RX_____S4_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (R%d ++ 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb602080) {
+					// Instruction: 10: 10101011011xxxxxPP1ttttt1iiii0vv | if (Pv.new) memh (Rx ++ #s4:1) = Rt.H
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH__RX_____S4_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (R%d ++ 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb602084) {
+					// Instruction: 10: 10101011011xxxxxPP1ttttt1iiii1vv | if !Pv.new memh (Rx ++ #s4:1) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH__RX_____S4_1____RT_H;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 1; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (R%d ++ 0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf400080) {
+					// Instruction: 10: 10101111010---iiPP0ttttt1iiii0vv | if (Pv) memh (#u6) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMH___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf400084) {
+					// Instruction: 10: 10101111010---iiPP0ttttt1iiii1vv | if !Pv memh (#u6) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf402080) {
+					// Instruction: 10: 10101111010---iiPP1ttttt1iiii0vv | if (Pv.new) memh (#u6) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf402084) {
+					// Instruction: 10: 10101111010---iiPP1ttttt1iiii1vv | if !Pv.new memh (#u6) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf600080) {
+					// Instruction: 10: 10101111011---iiPP0ttttt1iiii0vv | if (Pv) memh (#u6) = Rt.H
+					hi->instruction = HEX_INS_IF__PV__MEMH___U6____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memh (0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf600084) {
+					// Instruction: 10: 10101111011---iiPP0ttttt1iiii1vv | if !Pv memh (#u6) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMH___U6____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memh (0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf602080) {
+					// Instruction: 10: 10101111011---iiPP1ttttt1iiii0vv | if (Pv.new) memh (#u6) = Rt.H
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMH___U6____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memh (0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf602084) {
+					// Instruction: 10: 10101111011---iiPP1ttttt1iiii1vv | if !Pv.new memh (#u6) = Rt.H
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMH___U6____RT_H;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memh (0x%x) = R%d.H", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0x9e00000) == 0x1800000) {
+					// Instruction: 10: 10100ii1100sssssPPitttttiiiiiiii | memw (Rs + #s11:2) = Rt
+					hi->instruction = HEX_INS_MEMW__RS____S11_2____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x6000000) >> 25) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xff) >> 0)) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend_off(&hi->ops[1], 2);
+					sprintf(hi->mnem, "memw (R%d + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9800002) {
+					// Instruction: 10: 10101001100xxxxxPPuttttt0-----1- | memw (Rx ++ I:circ (Mu)) = Rt
+					hi->instruction = HEX_INS_MEMW__RX____I_CIRC__MU_____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ I:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00082) == 0x9800000) {
+					// Instruction: 10: 10101001100xxxxxPPuttttt0iiii-0- | memw (Rx ++ #s4:2:circ (Mu)) = Rt
+					hi->instruction = HEX_INS_MEMW__RX_____S4_2_CIRC__MU_____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ 0x%x:circ (R%d)) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xb800080) {
+					// Instruction: 10: 10101011100eeeeePP0ttttt1-IIIIII | memw (Re = #U6) = Rt
+					hi->instruction = HEX_INS_MEMW__RE____U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Re
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memw (R%d = 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02082) == 0xb800000) {
+					// Instruction: 10: 10101011100xxxxxPP0ttttt0iiii-0- | memw (Rx ++ #s4:2) = Rt
+					hi->instruction = HEX_INS_MEMW__RX_____S4_2____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd800080) {
+					// Instruction: 10: 10101101100uuuuuPPittttt1iIIIIII | memw (Ru << #u2 + #U6) = Rt
+					hi->instruction = HEX_INS_MEMW__RU_____U2____U6____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Ru
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x40) >> 6));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3f) >> 0);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "memw (R%d << 0x%x + 0x%x) = R%d", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xd800000) {
+					// Instruction: 10: 10101101100xxxxxPPuttttt0------- | memw (Rx ++ Mu) = Rt
+					hi->instruction = HEX_INS_MEMW__RX____MU____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ R%d) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0xf800000) {
+					// Instruction: 10: 10101111100xxxxxPPuttttt0------- | memw (Rx ++ Mu:brev) = Rt
+					hi->instruction = HEX_INS_MEMW__RX____MU_BREV____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x2000) >> 13); // Mu
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw (R%d ++ R%d:brev) = R%d", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb802000) {
+					// Instruction: 10: 10101011100xxxxxPP1ttttt0iiii0vv | if (Pv) memw (Rx ++ #s4:2) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMW__RX_____S4_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb802004) {
+					// Instruction: 10: 10101011100xxxxxPP1ttttt0iiii1vv | if !Pv memw (Rx ++ #s4:2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW__RX_____S4_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb802080) {
+					// Instruction: 10: 10101011100xxxxxPP1ttttt1iiii0vv | if (Pv.new) memw (Rx ++ #s4:2) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW__RX_____S4_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xb802084) {
+					// Instruction: 10: 10101011100xxxxxPP1ttttt1iiii1vv | if !Pv.new memw (Rx ++ #s4:2) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW__RX_____S4_2____RT;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x78) >> 3) << 2; // scaled
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (R%d ++ 0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf800080) {
+					// Instruction: 10: 10101111100---iiPP0ttttt1iiii0vv | if (Pv) memw (#u6) = Rt
+					hi->instruction = HEX_INS_IF__PV__MEMW___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pv)
+					sprintf(hi->mnem, "if (P%d) memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf800084) {
+					// Instruction: 10: 10101111100---iiPP0ttttt1iiii1vv | if !Pv memw (#u6) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_MEMW___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pv 
+					sprintf(hi->mnem, "if !P%d memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf802080) {
+					// Instruction: 10: 10101111100---iiPP1ttttt1iiii0vv | if (Pv.new) memw (#u6) = Rt
+					hi->instruction = HEX_INS_IF__PV_NEW__MEMW___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pv.new)
+					sprintf(hi->mnem, "if (P%d.new) memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02084) == 0xf802084) {
+					// Instruction: 10: 10101111100---iiPP1ttttt1iiii1vv | if !Pv.new memw (#u6) = Rt
+					hi->instruction = HEX_INS_IF__NOT_PV_NEW_MEMW___U6____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x30000) >> 16) | ((hi_u32 & 0x78) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pv.new
+					sprintf(hi->mnem, "if !P%d.new memw (0x%x) = R%d", hi->ops[0].op.pred, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfff3800) == 0x9d0000) {
+					// Instruction: 10: 1010000010011101PP000iiiiiiiiiii | allocframe (#u11:3)
+					hi->instruction = HEX_INS_ALLOCFRAME___U11_3_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_IMM;
+					hi->ops[0].op.imm = (((hi_u32) & 0x7ff) >> 0) << 3; // scaled
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "allocframe (0x%x)", hi->ops[0].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2000000) {
+					// Instruction: 10: 10100010000-----PP-------------- | dckill
+					hi->instruction = HEX_INS_DCKILL;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dckill");
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2200000) {
+					// Instruction: 10: 10100010001sssssPP-------------- | dccleanidx (Rs)
+					hi->instruction = HEX_INS_DCCLEANIDX__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dccleanidx (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2400000) {
+					// Instruction: 10: 10100010010sssssPP-------------- | dcinvidx (Rs)
+					hi->instruction = HEX_INS_DCINVIDX__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dcinvidx (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2600000) {
+					// Instruction: 10: 10100010011sssssPP-------------- | dccleaninvidx (Rs)
+					hi->instruction = HEX_INS_DCCLEANINVIDX__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dccleaninvidx (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4000000) {
+					// Instruction: 10: 10100100000sssssPP-ttttt-------- | dctagw (Rs, Rt)
+					hi->instruction = HEX_INS_DCTAGW__RS__RT_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dctagw (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4200000) {
+					// Instruction: 10: 10100100001sssssPP---------ddddd | Rd = dctagr (Rs)
+					hi->instruction = HEX_INS_RD___DCTAGR__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = dctagr (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6200000) {
+					// Instruction: 10: 10100110001sssssPP-------------- | l2cleanidx (Rs)
+					hi->instruction = HEX_INS_L2CLEANIDX__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2cleanidx (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6400000) {
+					// Instruction: 10: 10100110010sssssPP-------------- | l2invidx (Rs)
+					hi->instruction = HEX_INS_L2INVIDX__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2invidx (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8600000) {
+					// Instruction: 10: 10101000011sssssPP-------------- | l2cleaninvidx (Rs)
+					hi->instruction = HEX_INS_L2CLEANINVIDX__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2cleaninvidx (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6a00000) {
+					// Instruction: 10: 10100110101-----PP-ttttt-------- | l2gclean (Rtt)
+					hi->instruction = HEX_INS_L2GCLEAN__RTT_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2gclean (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6c00000) {
+					// Instruction: 10: 10100110110-----PP-ttttt-------- | l2gcleaninv (Rtt)
+					hi->instruction = HEX_INS_L2GCLEANINV__RTT_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2gcleaninv (R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01c00) == 0x8200000) {
+					// Instruction: 10: 10101000001-----PP-000---------- | l2kill
+					hi->instruction = HEX_INS_L2KILL;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2kill");
+					break;
+				}
+				if ((hi_u32 & 0xfe01c00) == 0x8200800) {
+					// Instruction: 10: 10101000001-----PP-010---------- | l2gunlock
+					hi->instruction = HEX_INS_L2GUNLOCK;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2gunlock");
+					break;
+				}
+				if ((hi_u32 & 0xfe01c00) == 0x8201000) {
+					// Instruction: 10: 10101000001-----PP-100---------- | l2gclean
+					hi->instruction = HEX_INS_L2GCLEAN;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2gclean");
+					break;
+				}
+				if ((hi_u32 & 0xfe01c00) == 0x8201800) {
+					// Instruction: 10: 10101000001-----PP-110---------- | l2gcleaninv
+					hi->instruction = HEX_INS_L2GCLEANINV;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2gcleaninv");
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xe02000) {
+					// Instruction: 10: 10100000111sssssPP1-----------dd | Pd = l2locka (Rs)
+					hi->instruction = HEX_INS_PD___L2LOCKA__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = l2locka (R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6600000) {
+					// Instruction: 10: 10100110011sssssPP-------------- | l2unlocka (Rs)
+					hi->instruction = HEX_INS_L2UNLOCKA__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2unlocka (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x4400000) {
+					// Instruction: 10: 10100100010sssssPP0ttttt-------- | l2tagw (Rs, Rt)
+					hi->instruction = HEX_INS_L2TAGW__RS__RT_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2tagw (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x4600000) {
+					// Instruction: 10: 10100100011sssssPP---------ddddd | Rd = l2tagr (Rs)
+					hi->instruction = HEX_INS_RD___L2TAGR__RS_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = l2tagr (R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xa00000) {
+					// Instruction: 10: 10100000101sssssPP-ttttt------dd | memw_locked (Rs, Pd) = Rt
+					hi->instruction = HEX_INS_MEMW_LOCKED__RS__PD____RT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memw_locked (R%d, P%d) = R%d", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xe00000) {
+					// Instruction: 10: 10100000111sssssPP0ttttt------dd | memd_locked (Rs, Pd) = Rtt
+					hi->instruction = HEX_INS_MEMD_LOCKED__RS__PD____RTT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "memd_locked (R%d, P%d) = R%d:R%d", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0xc00000) {
+					// Instruction: 10: 10100000110sssssPP0------------- | dczeroa (Rs)
+					hi->instruction = HEX_INS_DCZEROA__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dczeroa (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8000000) {
+					// Instruction: 10: 10101000000-----PP-------------- | barrier
+					hi->instruction = HEX_INS_BARRIER;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "barrier");
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x0) {
+					// Instruction: 10: 10100000000sssssPP-------------- | dccleana (Rs)
+					hi->instruction = HEX_INS_DCCLEANA__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dccleana (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x200000) {
+					// Instruction: 10: 10100000001sssssPP-------------- | dcinva (Rs)
+					hi->instruction = HEX_INS_DCINVA__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dcinva (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x400000) {
+					// Instruction: 10: 10100000010sssssPP-------------- | dccleaninva (Rs)
+					hi->instruction = HEX_INS_DCCLEANINVA__RS_;
+					hi->op_count = 1;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "dccleaninva (R%d)", hi->ops[0].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6000000) {
+					// Instruction: 10: 10100110000sssssPP-ttttt-------- | l2fetch (Rs, Rt)
+					hi->instruction = HEX_INS_L2FETCH__RS__RT_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2fetch (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6800000) {
+					// Instruction: 10: 10100110100sssssPP-ttttt-------- | l2fetch (Rs, Rtt)
+					hi->instruction = HEX_INS_L2FETCH__RS__RTT_;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "l2fetch (R%d, R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x8400000) {
+					// Instruction: 10: 10101000010-----PP-------------- | syncht
+					hi->instruction = HEX_INS_SYNCHT;
+					hi->op_count = 0;
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "syncht");
+					break;
+				}
+				break;
+			}
+			case 0xb: {
+				if ((hi_u32 & 0x0) == 0x0) {
+					// Instruction: 11: 1011iiiiiiisssssPPiiiiiiiiiddddd | Rd = add (Rs, #s16)
+					hi->instruction = HEX_INS_RD___ADD__RS___S16_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0xfe00000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = add (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0xc: {
+				if ((hi_u32 & 0xfe00000) == 0x2c00000) {
+					// Instruction: 12: 11000010110sssssPP-ttttt-xxddddd | Rdd = add (Rss, Rtt, Px) :carry
+					hi->instruction = HEX_INS_RDD___ADD__RSS__RTT__PX___CARRY;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = add (R%d:R%d, R%d:R%d, P%d) :carry", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2e00000) {
+					// Instruction: 12: 11000010111sssssPP-ttttt-xxddddd | Rdd = sub (Rss, Rtt, Px) :carry
+					hi->instruction = HEX_INS_RDD___SUB__RSS__RTT__PX___CARRY;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = sub (R%d:R%d, R%d:R%d, P%d) :carry", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfc020e0) == 0xa800000) {
+					// Instruction: 12: 1100101010-sssssPP0ttttt000xxxxx | Rxx ^= xor (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX____XOR__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= xor (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6c00000) {
+					// Instruction: 12: 1100011011-sssssPP-ttttt00-ddddd | Rd = cround (Rs, Rt)
+					hi->instruction = HEX_INS_RD___CROUND__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = cround (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6c00080) {
+					// Instruction: 12: 1100011011-sssssPP-ttttt10-ddddd | Rd = round (Rs, Rt)
+					hi->instruction = HEX_INS_RD___ROUND__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = round (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6c000c0) {
+					// Instruction: 12: 1100011011-sssssPP-ttttt11-ddddd | Rd = round (Rs, Rt) :sat
+					hi->instruction = HEX_INS_RD___ROUND__RS__RT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = round (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1400020) {
+					// Instruction: 12: 1100000101-sssssPP-ttttt001ddddd | Rd = vaddhub (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RD___VADDHUB__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vaddhub (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3c00040) {
+					// Instruction: 12: 1100001111-sssssPP-ttttt01-ddddd | Rdd = vcnegh (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VCNEGH__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vcnegh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb2020e0) {
+					// Instruction: 12: 11001011001sssssPP1ttttt111xxxxx | Rxx += vrcnegh (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCNEGH__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrcnegh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb200020) {
+					// Instruction: 12: 11001011001sssssPP0xxxxx001uuuuu | Rxx = vrmaxh (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMAXH__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmaxh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb202020) {
+					// Instruction: 12: 11001011001sssssPP1xxxxx001uuuuu | Rxx = vrmaxuh (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMAXUH__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmaxuh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb200040) {
+					// Instruction: 12: 11001011001sssssPP0xxxxx010uuuuu | Rxx = vrmaxw (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMAXW__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmaxw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb202040) {
+					// Instruction: 12: 11001011001sssssPP1xxxxx010uuuuu | Rxx = vrmaxuw (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMAXUW__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmaxuw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb2000a0) {
+					// Instruction: 12: 11001011001sssssPP0xxxxx101uuuuu | Rxx = vrminh (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMINH__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrminh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb2020a0) {
+					// Instruction: 12: 11001011001sssssPP1xxxxx101uuuuu | Rxx = vrminuh (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMINUH__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrminuh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb2000c0) {
+					// Instruction: 12: 11001011001sssssPP0xxxxx110uuuuu | Rxx = vrminw (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMINW__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrminw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb2020c0) {
+					// Instruction: 12: 11001011001sssssPP1xxxxx110uuuuu | Rxx = vrminuw (Rss, Ru)
+					hi->instruction = HEX_INS_RXX___VRMINUW__RSS__RU_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrminuw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x1000000) {
+					// Instruction: 12: 1100000100-sssssPP-ttttt00-ddddd | Rdd = extractu (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___EXTRACTU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = extractu (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x1c00080) {
+					// Instruction: 12: 1100000111-sssssPP-ttttt10-ddddd | Rdd = extract (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___EXTRACT__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = extract (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x9000000) {
+					// Instruction: 12: 1100100100-sssssPP-ttttt00-ddddd | Rd = extractu (Rs, Rtt)
+					hi->instruction = HEX_INS_RD___EXTRACTU__RS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = extractu (R%d, R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x9000040) {
+					// Instruction: 12: 1100100100-sssssPP-ttttt01-ddddd | Rd = extract (Rs, Rtt)
+					hi->instruction = HEX_INS_RD___EXTRACT__RS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = extract (R%d, R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x8000000) {
+					// Instruction: 12: 11001000---sssssPP-ttttt---xxxxx | Rx = insert (Rs, Rtt)
+					hi->instruction = HEX_INS_RX___INSERT__RS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = insert (R%d, R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0xa000000) {
+					// Instruction: 12: 110010100--sssssPP0ttttt---xxxxx | Rxx = insert (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX___INSERT__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = insert (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x18000c0) {
+					// Instruction: 12: 1100000110-sssssPP-ttttt110ddddd | Rdd = lfs (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___LFS__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = lfs (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6800000) {
+					// Instruction: 12: 1100011010-sssssPP-ttttt00-ddddd | Rd = setbit (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SETBIT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = setbit (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6800040) {
+					// Instruction: 12: 1100011010-sssssPP-ttttt01-ddddd | Rd = clrbit (Rs, Rt)
+					hi->instruction = HEX_INS_RD___CLRBIT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = clrbit (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6800080) {
+					// Instruction: 12: 1100011010-sssssPP-ttttt10-ddddd | Rd = togglebit (Rs, Rt)
+					hi->instruction = HEX_INS_RD___TOGGLEBIT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = togglebit (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1400080) {
+					// Instruction: 12: 1100000101-sssssPP-ttttt100ddddd | Rdd = vxaddsubh (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VXADDSUBH__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vxaddsubh (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x14000c0) {
+					// Instruction: 12: 1100000101-sssssPP-ttttt110ddddd | Rdd = vxsubaddh (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VXSUBADDH__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vxsubaddh (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x1c00000) {
+					// Instruction: 12: 1100000111-sssssPP-ttttt00-ddddd | Rdd = vxaddsubh (Rss, Rtt) :rnd:>>1:sat
+					hi->instruction = HEX_INS_RDD___VXADDSUBH__RSS__RTT___RND___1_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RSH1; // :>>1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vxaddsubh (R%d:R%d, R%d:R%d) :rnd:>>1:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x1c00040) {
+					// Instruction: 12: 1100000111-sssssPP-ttttt01-ddddd | Rdd = vxsubaddh (Rss, Rtt) :rnd:>>1:sat
+					hi->instruction = HEX_INS_RDD___VXSUBADDH__RSS__RTT___RND___1_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RSH1; // :>>1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vxsubaddh (R%d:R%d, R%d:R%d) :rnd:>>1:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1400000) {
+					// Instruction: 12: 1100000101-sssssPP-ttttt000ddddd | Rdd = vxaddsubw (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VXADDSUBW__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vxaddsubw (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1400040) {
+					// Instruction: 12: 1100000101-sssssPP-ttttt010ddddd | Rdd = vxsubaddw (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VXSUBADDW__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vxsubaddw (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf0000e0) == 0x5000080) {
+					// Instruction: 12: 11000101---sssssPP-ttttt100ddddd | Rd = cmpyiwh (Rss, Rt) :<<1:rnd:sat
+					hi->instruction = HEX_INS_RD___CMPYIWH__RSS__RT_____1_RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = cmpyiwh (R%d:R%d, R%d) :<<1:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf0000e0) == 0x50000a0) {
+					// Instruction: 12: 11000101---sssssPP-ttttt101ddddd | Rd = cmpyiwh (Rss, Rt *) :<<1:rnd:sat
+					hi->instruction = HEX_INS_RD___CMPYIWH__RSS__RT_______1_RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = cmpyiwh (R%d:R%d, R%d *) :<<1:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf0000e0) == 0x50000c0) {
+					// Instruction: 12: 11000101---sssssPP-ttttt110ddddd | Rd = cmpyrwh (Rss, Rt) :<<1:rnd:sat
+					hi->instruction = HEX_INS_RD___CMPYRWH__RSS__RT_____1_RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = cmpyrwh (R%d:R%d, R%d) :<<1:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf0000e0) == 0x50000e0) {
+					// Instruction: 12: 11000101---sssssPP-ttttt111ddddd | Rd = cmpyrwh (Rss, Rt *) :<<1:rnd:sat
+					hi->instruction = HEX_INS_RD___CMPYRWH__RSS__RT_______1_RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = cmpyrwh (R%d:R%d, R%d *) :<<1:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3c00000) {
+					// Instruction: 12: 1100001111-sssssPP-ttttt00-ddddd | Rdd = vcrotate (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VCROTATE__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vcrotate (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3c000c0) {
+					// Instruction: 12: 1100001111-sssssPPittttt11iddddd | Rdd = vrcrotate (Rss, Rt, #u2)
+					hi->instruction = HEX_INS_RDD___VRCROTATE__RSS__RT___U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x20) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrcrotate (R%d:R%d, R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0xba00000) {
+					// Instruction: 12: 11001011101sssssPPittttt--ixxxxx | Rxx += vrcrotate (Rss, Rt, #u2)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCROTATE__RSS__RT___U2_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0x20) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrcrotate (R%d:R%d, R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7e00000) {
+					// Instruction: 12: 11000111111sssssPP-ttttt000---dd | Pd = cmp.ge (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMP_GE__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.ge (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7e00020) {
+					// Instruction: 12: 11000111111sssssPP-ttttt001---dd | Pd = cmp.uo (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMP_UO__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.uo (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7e00060) {
+					// Instruction: 12: 11000111111sssssPP-ttttt011---dd | Pd = cmp.eq (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMP_EQ__RS__RT__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.eq (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7e00080) {
+					// Instruction: 12: 11000111111sssssPP-ttttt100---dd | Pd = cmp.gt (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMP_GT__RS__RT__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.gt (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x1c000c0) {
+					// Instruction: 12: 1100000111-sssssPP-ttttt11-ddddd | Rdd = decbin (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___DECBIN__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = decbin (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0x0) {
+					// Instruction: 12: 110000000--sssssPP-tttttiiiddddd | Rdd = valignb (Rtt, Rss, #u3)
+					hi->instruction = HEX_INS_RDD___VALIGNB__RTT__RSS___U3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = valignb (R%d:R%d, R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0x2000000) {
+					// Instruction: 12: 110000100--sssssPP-ttttt-uuddddd | Rdd = valignb (Rtt, Rss, Pu)
+					hi->instruction = HEX_INS_RDD___VALIGNB__RTT__RSS__PU_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = valignb (R%d:R%d, R%d:R%d, P%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x1000040) {
+					// Instruction: 12: 1100000100-sssssPP-ttttt01-ddddd | Rdd = shuffeb (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___SHUFFEB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = shuffeb (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x1000080) {
+					// Instruction: 12: 1100000100-sssssPP-ttttt10-ddddd | Rdd = shuffob (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___SHUFFOB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = shuffob (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x10000c0) {
+					// Instruction: 12: 1100000100-sssssPP-ttttt11-ddddd | Rdd = shuffeh (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___SHUFFEH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = shuffeh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1800000) {
+					// Instruction: 12: 1100000110-sssssPP-ttttt000ddddd | Rdd = shuffoh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___SHUFFOH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = shuffoh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0x800000) {
+					// Instruction: 12: 110000001--sssssPP-tttttiiiddddd | Rdd = vspliceb (Rss, Rtt, #u3)
+					hi->instruction = HEX_INS_RDD___VSPLICEB__RSS__RTT___U3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vspliceb (R%d:R%d, R%d:R%d, 0x%x)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x2800000) {
+					// Instruction: 12: 11000010100sssssPP-ttttt-uuddddd | Rdd = vspliceb (Rss, Rtt, Pu)
+					hi->instruction = HEX_INS_RDD___VSPLICEB__RSS__RTT__PU_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vspliceb (R%d:R%d, R%d:R%d, P%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1800040) {
+					// Instruction: 12: 1100000110-sssssPP-ttttt010ddddd | Rdd = vtrunewh (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VTRUNEWH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vtrunewh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1800060) {
+					// Instruction: 12: 1100000110-sssssPP-ttttt011ddddd | Rdd = vtrunehb (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VTRUNEHB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vtrunehb (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x1800080) {
+					// Instruction: 12: 1100000110-sssssPP-ttttt100ddddd | Rdd = vtrunowh (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VTRUNOWH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vtrunowh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000e0) == 0x18000a0) {
+					// Instruction: 12: 1100000110-sssssPP-ttttt101ddddd | Rdd = vtrunohb (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VTRUNOHB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vtrunohb (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7c00040) {
+					// Instruction: 12: 11000111110sssssPP-ttttt010---dd | Pd = cmpb.gt (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMPB_GT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmpb.gt (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7c000c0) {
+					// Instruction: 12: 11000111110sssssPP-ttttt110---dd | Pd = cmpb.eq (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMPB_EQ__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmpb.eq (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7c000e0) {
+					// Instruction: 12: 11000111110sssssPP-ttttt111---dd | Pd = cmpb.gtu (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMPB_GTU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmpb.gtu (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7c00060) {
+					// Instruction: 12: 11000111110sssssPP-ttttt011---dd | Pd = cmph.eq (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMPH_EQ__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmph.eq (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7c00080) {
+					// Instruction: 12: 11000111110sssssPP-ttttt100---dd | Pd = cmph.gt (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMPH_GT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmph.gt (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x7c000a0) {
+					// Instruction: 12: 11000111110sssssPP-ttttt101---dd | Pd = cmph.gtu (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMPH_GTU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmph.gtu (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7400000) {
+					// Instruction: 12: 11000111010sssssPP-ttttt------dd | Pd = bitsset (Rs, Rt)
+					hi->instruction = HEX_INS_PD___BITSSET__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = bitsset (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7600000) {
+					// Instruction: 12: 11000111011sssssPP-ttttt------dd | Pd = !bitsset (Rs, Rt)
+					hi->instruction = HEX_INS_PD____NOT_BITSSET__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !bitsset (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7800000) {
+					// Instruction: 12: 11000111100sssssPP-ttttt------dd | Pd = bitsclr (Rs, Rt)
+					hi->instruction = HEX_INS_PD___BITSCLR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = bitsclr (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7a00000) {
+					// Instruction: 12: 11000111101sssssPP-ttttt------dd | Pd = !bitsclr (Rs, Rt)
+					hi->instruction = HEX_INS_PD____NOT_BITSCLR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !bitsclr (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7000000) {
+					// Instruction: 12: 11000111000sssssPP-ttttt------dd | Pd = tstbit (Rs, Rt)
+					hi->instruction = HEX_INS_PD___TSTBIT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = tstbit (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x7200000) {
+					// Instruction: 12: 11000111001sssssPP-ttttt------dd | Pd = !tstbit (Rs, Rt)
+					hi->instruction = HEX_INS_PD____NOT_TSTBIT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !tstbit (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02000) == 0x4000000) {
+					// Instruction: 12: 11000100000sssssPP0tttttiiiddddd | Rd = addasl (Rt, Rs, #u3)
+					hi->instruction = HEX_INS_RD___ADDASL__RT__RS___U3_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32) & 0xe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = addasl (R%d, R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3800000) {
+					// Instruction: 12: 1100001110-sssssPP-ttttt00-ddddd | Rdd = asr (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___ASR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = asr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3800040) {
+					// Instruction: 12: 1100001110-sssssPP-ttttt01-ddddd | Rdd = lsr (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___LSR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = lsr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3800080) {
+					// Instruction: 12: 1100001110-sssssPP-ttttt10-ddddd | Rdd = asl (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___ASL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = asl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x38000c0) {
+					// Instruction: 12: 1100001110-sssssPP-ttttt11-ddddd | Rdd = lsl (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___LSL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = lsl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6400000) {
+					// Instruction: 12: 1100011001-sssssPP-ttttt00-ddddd | Rd = asr (Rs, Rt)
+					hi->instruction = HEX_INS_RD___ASR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = asr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6400040) {
+					// Instruction: 12: 1100011001-sssssPP-ttttt01-ddddd | Rd = lsr (Rs, Rt)
+					hi->instruction = HEX_INS_RD___LSR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = lsr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6400080) {
+					// Instruction: 12: 1100011001-sssssPP-ttttt10-ddddd | Rd = asl (Rs, Rt)
+					hi->instruction = HEX_INS_RD___ASL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = asl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x64000c0) {
+					// Instruction: 12: 1100011001-sssssPP-ttttt11-ddddd | Rd = lsl (Rs, Rt)
+					hi->instruction = HEX_INS_RD___LSL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = lsl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x68000c0) {
+					// Instruction: 12: 1100011010-iiiiiPP-ttttt11iddddd | Rd = lsl (#s6, Rt)
+					hi->instruction = HEX_INS_RD___LSL___S6__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x1f0000) >> 16) | ((hi_u32 & 0x20) >> 5));
+					if (hi->ops[1].op.imm & (1 << 1)) {
+						hi->ops[1].op.imm |= (0xFFFFFFFF << 1);
+					}
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = lsl (0x%x, R%d)", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb800000) {
+					// Instruction: 12: 11001011100sssssPP-ttttt00-xxxxx | Rxx -= asr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__ASR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= asr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb800040) {
+					// Instruction: 12: 11001011100sssssPP-ttttt01-xxxxx | Rxx -= lsr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__LSR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= lsr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb800080) {
+					// Instruction: 12: 11001011100sssssPP-ttttt10-xxxxx | Rxx -= asl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__ASL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= asl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb8000c0) {
+					// Instruction: 12: 11001011100sssssPP-ttttt11-xxxxx | Rxx -= lsl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__LSL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= lsl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xbc00000) {
+					// Instruction: 12: 11001011110sssssPP-ttttt00-xxxxx | Rxx += asr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__ASR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += asr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xbc00040) {
+					// Instruction: 12: 11001011110sssssPP-ttttt01-xxxxx | Rxx += lsr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__LSR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += lsr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xbc00080) {
+					// Instruction: 12: 11001011110sssssPP-ttttt10-xxxxx | Rxx += asl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__ASL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += asl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xbc000c0) {
+					// Instruction: 12: 11001011110sssssPP-ttttt11-xxxxx | Rxx += lsl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__LSL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += lsl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc800000) {
+					// Instruction: 12: 1100110010-sssssPP-ttttt00-xxxxx | Rx -= asr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__ASR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= asr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc800040) {
+					// Instruction: 12: 1100110010-sssssPP-ttttt01-xxxxx | Rx -= lsr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__LSR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= lsr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc800080) {
+					// Instruction: 12: 1100110010-sssssPP-ttttt10-xxxxx | Rx -= asl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__ASL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= asl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc8000c0) {
+					// Instruction: 12: 1100110010-sssssPP-ttttt11-xxxxx | Rx -= lsl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__LSL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= lsl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xcc00000) {
+					// Instruction: 12: 1100110011-sssssPP-ttttt00-xxxxx | Rx += asr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__ASR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += asr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xcc00040) {
+					// Instruction: 12: 1100110011-sssssPP-ttttt01-xxxxx | Rx += lsr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__LSR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += lsr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xcc00080) {
+					// Instruction: 12: 1100110011-sssssPP-ttttt10-xxxxx | Rx += asl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__ASL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += asl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xcc000c0) {
+					// Instruction: 12: 1100110011-sssssPP-ttttt11-xxxxx | Rx += lsl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__LSL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += lsl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb000000) {
+					// Instruction: 12: 11001011000sssssPP-ttttt00-xxxxx | Rxx |= asr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__OR_EQ__ASR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= asr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb000040) {
+					// Instruction: 12: 11001011000sssssPP-ttttt01-xxxxx | Rxx |= lsr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__OR_EQ__LSR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= lsr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb000080) {
+					// Instruction: 12: 11001011000sssssPP-ttttt10-xxxxx | Rxx |= asl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__OR_EQ__ASL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= asl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb0000c0) {
+					// Instruction: 12: 11001011000sssssPP-ttttt11-xxxxx | Rxx |= lsl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__OR_EQ__LSL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d |= lsl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb400000) {
+					// Instruction: 12: 11001011010sssssPP-ttttt00-xxxxx | Rxx &= asr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__AND_EQ__ASR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= asr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb400040) {
+					// Instruction: 12: 11001011010sssssPP-ttttt01-xxxxx | Rxx &= lsr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__AND_EQ__LSR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= lsr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb400080) {
+					// Instruction: 12: 11001011010sssssPP-ttttt10-xxxxx | Rxx &= asl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__AND_EQ__ASL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= asl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb4000c0) {
+					// Instruction: 12: 11001011010sssssPP-ttttt11-xxxxx | Rxx &= lsl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX__AND_EQ__LSL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d &= lsl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb600000) {
+					// Instruction: 12: 11001011011sssssPP-ttttt00-xxxxx | Rxx ^= asr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX____ASR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= asr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb600040) {
+					// Instruction: 12: 11001011011sssssPP-ttttt01-xxxxx | Rxx ^= lsr (Rss, Rt)
+					hi->instruction = HEX_INS_RXX____LSR__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= lsr (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb600080) {
+					// Instruction: 12: 11001011011sssssPP-ttttt10-xxxxx | Rxx ^= asl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX____ASL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= asl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0xb6000c0) {
+					// Instruction: 12: 11001011011sssssPP-ttttt11-xxxxx | Rxx ^= lsl (Rss, Rt)
+					hi->instruction = HEX_INS_RXX____LSL__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= lsl (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc000000) {
+					// Instruction: 12: 1100110000-sssssPP-ttttt00-xxxxx | Rx |= asr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__ASR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= asr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc000040) {
+					// Instruction: 12: 1100110000-sssssPP-ttttt01-xxxxx | Rx |= lsr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__LSR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= lsr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc000080) {
+					// Instruction: 12: 1100110000-sssssPP-ttttt10-xxxxx | Rx |= asl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__ASL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= asl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc0000c0) {
+					// Instruction: 12: 1100110000-sssssPP-ttttt11-xxxxx | Rx |= lsl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__LSL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= lsl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc400000) {
+					// Instruction: 12: 1100110001-sssssPP-ttttt00-xxxxx | Rx &= asr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__ASR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= asr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc400040) {
+					// Instruction: 12: 1100110001-sssssPP-ttttt01-xxxxx | Rx &= lsr (Rs, Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__LSR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= lsr (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc400080) {
+					// Instruction: 12: 1100110001-sssssPP-ttttt10-xxxxx | Rx &= asl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__ASL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= asl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0xc4000c0) {
+					// Instruction: 12: 1100110001-sssssPP-ttttt11-xxxxx | Rx &= lsl (Rs, Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__LSL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= lsl (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6000000) {
+					// Instruction: 12: 1100011000-sssssPP-ttttt00-ddddd | Rd = asr (Rs, Rt) :sat
+					hi->instruction = HEX_INS_RD___ASR__RS__RT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = asr (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x6000080) {
+					// Instruction: 12: 1100011000-sssssPP-ttttt10-ddddd | Rd = asl (Rs, Rt) :sat
+					hi->instruction = HEX_INS_RD___ASL__RS__RT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = asl (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3400000) {
+					// Instruction: 12: 1100001101-sssssPP-ttttt00-ddddd | Rdd = vasrh (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VASRH__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vasrh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3400040) {
+					// Instruction: 12: 1100001101-sssssPP-ttttt01-ddddd | Rdd = vlsrh (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VLSRH__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vlsrh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3400080) {
+					// Instruction: 12: 1100001101-sssssPP-ttttt10-ddddd | Rdd = vaslh (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VASLH__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vaslh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x34000c0) {
+					// Instruction: 12: 1100001101-sssssPP-ttttt11-ddddd | Rdd = vlslh (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VLSLH__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vlslh (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3000000) {
+					// Instruction: 12: 1100001100-sssssPP-ttttt00-ddddd | Rdd = vasrw (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VASRW__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vasrw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3000040) {
+					// Instruction: 12: 1100001100-sssssPP-ttttt01-ddddd | Rdd = vlsrw (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VLSRW__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vlsrw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x3000080) {
+					// Instruction: 12: 1100001100-sssssPP-ttttt10-ddddd | Rdd = vaslw (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VASLW__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vaslw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc000c0) == 0x30000c0) {
+					// Instruction: 12: 1100001100-sssssPP-ttttt11-ddddd | Rdd = vlslw (Rss, Rt)
+					hi->instruction = HEX_INS_RDD___VLSLW__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vlslw (R%d:R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf0000e0) == 0x5000040) {
+					// Instruction: 12: 11000101---sssssPP-ttttt010ddddd | Rd = vasrw (Rss, Rt)
+					hi->instruction = HEX_INS_RD___VASRW__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vasrw (R%d:R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				break;
+			}
+			case 0xd: {
+				if ((hi_u32 & 0xf800000) == 0xb000000) {
+					// Instruction: 13: 110110110iisssssPPidddddiiiuuuuu | Rd = add (Rs, add (Ru, #s6))
+					hi->instruction = HEX_INS_RD___ADD__RS__ADD__RU___S6__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5));
+					if (hi->ops[3].op.imm & (1 << 3)) {
+						hi->ops[3].op.imm |= (0xFFFFFFFF << 3);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[3]);
+					sprintf(hi->mnem, "R%d = add (R%d, add (R%d, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0xb800000) {
+					// Instruction: 13: 110110111iisssssPPidddddiiiuuuuu | Rd = add (Rs, sub (#s6, Ru))
+					hi->instruction = HEX_INS_RD___ADD__RS__SUB___S6__RU__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d = add (R%d, sub (0x%x, R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x30000e0) {
+					// Instruction: 13: 11010011000sssssPP-ttttt111ddddd | Rdd = add (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___ADD__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = add (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x36000a0) {
+					// Instruction: 13: 11010011011sssssPP-ttttt101ddddd | Rdd = add (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___ADD__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = add (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x36000c0) {
+					// Instruction: 13: 11010011011sssssPP-ttttt110ddddd | Rdd = add (Rss, Rtt) :raw:lo
+					hi->instruction = HEX_INS_RDD___ADD__RSS__RTT___RAW_LO;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LO; // :lo
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d:R%d = add (R%d:R%d, R%d:R%d) :raw:lo", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x36000e0) {
+					// Instruction: 13: 11010011011sssssPP-ttttt111ddddd | Rdd = add (Rss, Rtt) :raw:hi
+					hi->instruction = HEX_INS_RDD___ADD__RSS__RTT___RAW_HI;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_HI; // :hi
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "R%d:R%d = add (R%d:R%d, R%d:R%d) :raw:hi", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0x5800000) {
+					// Instruction: 13: 11010101100sssssPP-ttttt0--ddddd | Rd = add (Rs, Rt) :sat:deprecated
+					hi->instruction = HEX_INS_RD___ADD__RS__RT___SAT_DEPRECATED;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_DEPRECATED; // :deprecated
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d, R%d) :sat:deprecated", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x5000000) {
+					// Instruction: 13: 11010101000sssssPP-ttttt00-ddddd | Rd = add (Rt.L, Rs.L)
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_L_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.L)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x5000040) {
+					// Instruction: 13: 11010101000sssssPP-ttttt01-ddddd | Rd = add (Rt.L, Rs.H)
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_H_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.H)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x5000080) {
+					// Instruction: 13: 11010101000sssssPP-ttttt10-ddddd | Rd = add (Rt.L, Rs.L) :sat
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_L___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.L) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x50000c0) {
+					// Instruction: 13: 11010101000sssssPP-ttttt11-ddddd | Rd = add (Rt.L, Rs.H) :sat
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_H___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.H) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5400000) {
+					// Instruction: 13: 11010101010sssssPP-ttttt000ddddd | Rd = add (Rt.L, Rs.L) :<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_L_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.L) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5400020) {
+					// Instruction: 13: 11010101010sssssPP-ttttt001ddddd | Rd = add (Rt.L, Rs.H) :<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_H_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.H) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5400040) {
+					// Instruction: 13: 11010101010sssssPP-ttttt010ddddd | Rd = add (Rt.H, Rs.L) :<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_H__RS_L_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = add (R%d.H, R%d.L) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5400060) {
+					// Instruction: 13: 11010101010sssssPP-ttttt011ddddd | Rd = add (Rt.H, Rs.H) :<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_H__RS_H_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = add (R%d.H, R%d.H) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5400080) {
+					// Instruction: 13: 11010101010sssssPP-ttttt100ddddd | Rd = add (Rt.L, Rs.L) :sat:<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_L___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.L) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x54000a0) {
+					// Instruction: 13: 11010101010sssssPP-ttttt101ddddd | Rd = add (Rt.L, Rs.H) :sat:<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_L__RS_H___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d.L, R%d.H) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x54000c0) {
+					// Instruction: 13: 11010101010sssssPP-ttttt110ddddd | Rd = add (Rt.H, Rs.L) :sat:<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_H__RS_L___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d.H, R%d.L) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x54000e0) {
+					// Instruction: 13: 11010101010sssssPP-ttttt111ddddd | Rd = add (Rt.H, Rs.H) :sat:<<16
+					hi->instruction = HEX_INS_RD___ADD__RT_H__RS_H___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d.H, R%d.H) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3e00000) {
+					// Instruction: 13: 11010011111sssssPP-ttttt000ddddd | Rdd = and (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___AND__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = and (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3e00020) {
+					// Instruction: 13: 11010011111sssssPP-ttttt001ddddd | Rdd = and (Rtt, ~Rss)
+					hi->instruction = HEX_INS_RDD___AND__RTT___RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = and (R%d:R%d, ~R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3e00040) {
+					// Instruction: 13: 11010011111sssssPP-ttttt010ddddd | Rdd = or (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___OR__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = or (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3e00060) {
+					// Instruction: 13: 11010011111sssssPP-ttttt011ddddd | Rdd = or (Rtt, ~Rss)
+					hi->instruction = HEX_INS_RDD___OR__RTT___RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = or (R%d:R%d, ~R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3e00080) {
+					// Instruction: 13: 11010011111sssssPP-ttttt100ddddd | Rdd = xor (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___XOR__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = xor (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0xa000000) {
+					// Instruction: 13: 1101101000isssssPPiiiiiiiiixxxxx | Rx |= and (Rs, #s10)
+					hi->instruction = HEX_INS_RX__OR_EQ__AND__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= and (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0xa400000) {
+					// Instruction: 13: 1101101001ixxxxxPPiiiiiiiiiuuuuu | Rx = or (Ru, and (Rx, #s10))
+					hi->instruction = HEX_INS_RX___OR__RU__AND__RX___S10__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = or (R%d, and (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0xa800000) {
+					// Instruction: 13: 1101101010isssssPPiiiiiiiiixxxxx | Rx |= or (Rs, #s10)
+					hi->instruction = HEX_INS_RX__OR_EQ__OR__RS___S10_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= or (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0x5c00000) {
+					// Instruction: 13: 11010101110sssssPP-ttttt0--ddddd | Rd = max (Rs, Rt)
+					hi->instruction = HEX_INS_RD___MAX__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = max (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0x5c00080) {
+					// Instruction: 13: 11010101110sssssPP-ttttt1--ddddd | Rd = maxu (Rs, Rt)
+					hi->instruction = HEX_INS_RD___MAXU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = maxu (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c00080) {
+					// Instruction: 13: 11010011110sssssPP-ttttt100ddddd | Rdd = max (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___MAX__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = max (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c000a0) {
+					// Instruction: 13: 11010011110sssssPP-ttttt101ddddd | Rdd = maxu (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___MAXU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = maxu (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0x5a00000) {
+					// Instruction: 13: 11010101101sssssPP-ttttt0--ddddd | Rd = min (Rt, Rs)
+					hi->instruction = HEX_INS_RD___MIN__RT__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = min (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0x5a00080) {
+					// Instruction: 13: 11010101101sssssPP-ttttt1--ddddd | Rd = minu (Rt, Rs)
+					hi->instruction = HEX_INS_RD___MINU__RT__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = minu (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a000c0) {
+					// Instruction: 13: 11010011101sssssPP-ttttt110ddddd | Rdd = min (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___MIN__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = min (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a000e0) {
+					// Instruction: 13: 11010011101sssssPP-ttttt111ddddd | Rdd = minu (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___MINU__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = minu (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3e000e0) {
+					// Instruction: 13: 11010011111sssssPP-ttttt111ddddd | Rd = modwrap (Rs, Rt)
+					hi->instruction = HEX_INS_RD___MODWRAP__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = modwrap (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x32000e0) {
+					// Instruction: 13: 11010011001sssssPP-ttttt111ddddd | Rdd = sub (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___SUB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = sub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00080) == 0x5800080) {
+					// Instruction: 13: 11010101100sssssPP-ttttt1--ddddd | Rd = sub (Rt, Rs) :sat:deprecated
+					hi->instruction = HEX_INS_RD___SUB__RT__RS___SAT_DEPRECATED;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_DEPRECATED; // :deprecated
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d, R%d) :sat:deprecated", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x5200000) {
+					// Instruction: 13: 11010101001sssssPP-ttttt00-ddddd | Rd = sub (Rt.L, Rs.L)
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_L_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.L)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x5200040) {
+					// Instruction: 13: 11010101001sssssPP-ttttt01-ddddd | Rd = sub (Rt.L, Rs.H)
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_H_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.H)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x5200080) {
+					// Instruction: 13: 11010101001sssssPP-ttttt10-ddddd | Rd = sub (Rt.L, Rs.L) :sat
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_L___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.L) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x52000c0) {
+					// Instruction: 13: 11010101001sssssPP-ttttt11-ddddd | Rd = sub (Rt.L, Rs.H) :sat
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_H___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.H) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5600000) {
+					// Instruction: 13: 11010101011sssssPP-ttttt000ddddd | Rd = sub (Rt.L, Rs.L) :<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_L_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.L) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5600020) {
+					// Instruction: 13: 11010101011sssssPP-ttttt001ddddd | Rd = sub (Rt.L, Rs.H) :<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_H_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.H) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5600040) {
+					// Instruction: 13: 11010101011sssssPP-ttttt010ddddd | Rd = sub (Rt.H, Rs.L) :<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_H__RS_L_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = sub (R%d.H, R%d.L) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5600060) {
+					// Instruction: 13: 11010101011sssssPP-ttttt011ddddd | Rd = sub (Rt.H, Rs.H) :<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_H__RS_H_____16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					sprintf(hi->mnem, "R%d = sub (R%d.H, R%d.H) :<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x5600080) {
+					// Instruction: 13: 11010101011sssssPP-ttttt100ddddd | Rd = sub (Rt.L, Rs.L) :sat:<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_L___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.L) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x56000a0) {
+					// Instruction: 13: 11010101011sssssPP-ttttt101ddddd | Rd = sub (Rt.L, Rs.H) :sat:<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_L__RS_H___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d.L, R%d.H) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x56000c0) {
+					// Instruction: 13: 11010101011sssssPP-ttttt110ddddd | Rd = sub (Rt.H, Rs.L) :sat:<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_H__RS_L___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d.H, R%d.L) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x56000e0) {
+					// Instruction: 13: 11010101011sssssPP-ttttt111ddddd | Rd = sub (Rt.H, Rs.H) :sat:<<16
+					hi->instruction = HEX_INS_RD___SUB__RT_H__RS_H___SAT___16;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LSH16; // :<<16
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d.H, R%d.H) :sat:<<16", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3000040) {
+					// Instruction: 13: 11010011000sssssPP-ttttt010ddddd | Rdd = vaddh (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VADDH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vaddh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3000060) {
+					// Instruction: 13: 11010011000sssssPP-ttttt011ddddd | Rdd = vaddh (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VADDH__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vaddh (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3000080) {
+					// Instruction: 13: 11010011000sssssPP-ttttt100ddddd | Rdd = vadduh (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VADDUH__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vadduh (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3000000) {
+					// Instruction: 13: 11010011000sssssPP-ttttt000ddddd | Rdd = vaddub (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VADDUB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vaddub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3000020) {
+					// Instruction: 13: 11010011000sssssPP-ttttt001ddddd | Rdd = vaddub (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VADDUB__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vaddub (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x30000a0) {
+					// Instruction: 13: 11010011000sssssPP-ttttt101ddddd | Rdd = vaddw (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VADDW__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vaddw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x30000c0) {
+					// Instruction: 13: 11010011000sssssPP-ttttt110ddddd | Rdd = vaddw (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VADDW__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vaddw (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3400040) {
+					// Instruction: 13: 11010011010sssssPP-ttttt010ddddd | Rdd = vavgh (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VAVGH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vavgh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3400060) {
+					// Instruction: 13: 11010011010sssssPP-ttttt011ddddd | Rdd = vavgh (Rss, Rtt) :rnd
+					hi->instruction = HEX_INS_RDD___VAVGH__RSS__RTT___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = vavgh (R%d:R%d, R%d:R%d) :rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3400080) {
+					// Instruction: 13: 11010011010sssssPP-ttttt100ddddd | Rdd = vavgh (Rss, Rtt) :crnd
+					hi->instruction = HEX_INS_RDD___VAVGH__RSS__RTT___CRND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CRND; // :crnd
+					sprintf(hi->mnem, "R%d:R%d = vavgh (R%d:R%d, R%d:R%d) :crnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x34000a0) {
+					// Instruction: 13: 11010011010sssssPP-ttttt101ddddd | Rdd = vavguh (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VAVGUH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vavguh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x34000c0) {
+					// Instruction: 13: 11010011010sssssPP-ttttt11-ddddd | Rdd = vavguh (Rss, Rtt) :rnd
+					hi->instruction = HEX_INS_RDD___VAVGUH__RSS__RTT___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = vavguh (R%d:R%d, R%d:R%d) :rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3800000) {
+					// Instruction: 13: 11010011100sssssPP-ttttt000ddddd | Rdd = vnavgh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VNAVGH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vnavgh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3800020) {
+					// Instruction: 13: 11010011100sssssPP-ttttt001ddddd | Rdd = vnavgh (Rtt, Rss) :rnd:sat
+					hi->instruction = HEX_INS_RDD___VNAVGH__RTT__RSS___RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vnavgh (R%d:R%d, R%d:R%d) :rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3800040) {
+					// Instruction: 13: 11010011100sssssPP-ttttt010ddddd | Rdd = vnavgh (Rtt, Rss) :crnd:sat
+					hi->instruction = HEX_INS_RDD___VNAVGH__RTT__RSS___CRND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CRND; // :crnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vnavgh (R%d:R%d, R%d:R%d) :crnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3400000) {
+					// Instruction: 13: 11010011010sssssPP-ttttt000ddddd | Rdd = vavgub (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VAVGUB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vavgub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3400020) {
+					// Instruction: 13: 11010011010sssssPP-ttttt001ddddd | Rdd = vavgub (Rss, Rtt) :rnd
+					hi->instruction = HEX_INS_RDD___VAVGUB__RSS__RTT___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = vavgub (R%d:R%d, R%d:R%d) :rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3600000) {
+					// Instruction: 13: 11010011011sssssPP-ttttt000ddddd | Rdd = vavgw (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VAVGW__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vavgw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3600020) {
+					// Instruction: 13: 11010011011sssssPP-ttttt001ddddd | Rdd = vavgw (Rss, Rtt) :rnd
+					hi->instruction = HEX_INS_RDD___VAVGW__RSS__RTT___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = vavgw (R%d:R%d, R%d:R%d) :rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3600040) {
+					// Instruction: 13: 11010011011sssssPP-ttttt010ddddd | Rdd = vavgw (Rss, Rtt) :crnd
+					hi->instruction = HEX_INS_RDD___VAVGW__RSS__RTT___CRND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CRND; // :crnd
+					sprintf(hi->mnem, "R%d:R%d = vavgw (R%d:R%d, R%d:R%d) :crnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3600060) {
+					// Instruction: 13: 11010011011sssssPP-ttttt011ddddd | Rdd = vavguw (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VAVGUW__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vavguw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3600080) {
+					// Instruction: 13: 11010011011sssssPP-ttttt100ddddd | Rdd = vavguw (Rss, Rtt) :rnd
+					hi->instruction = HEX_INS_RDD___VAVGUW__RSS__RTT___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = vavguw (R%d:R%d, R%d:R%d) :rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3800060) {
+					// Instruction: 13: 11010011100sssssPP-ttttt011ddddd | Rdd = vnavgw (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VNAVGW__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vnavgw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x3800080) {
+					// Instruction: 13: 11010011100sssssPP-ttttt10-ddddd | Rdd = vnavgw (Rtt, Rss) :rnd:sat
+					hi->instruction = HEX_INS_RDD___VNAVGW__RTT__RSS___RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vnavgw (R%d:R%d, R%d:R%d) :rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000c0) == 0x38000c0) {
+					// Instruction: 13: 11010011100sssssPP-ttttt11-ddddd | Rdd = vnavgw (Rtt, Rss) :crnd:sat
+					hi->instruction = HEX_INS_RDD___VNAVGW__RTT__RSS___CRND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_CRND; // :crnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vnavgw (R%d:R%d, R%d:R%d) :crnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c00000) {
+					// Instruction: 13: 11010011110sssssPP-ttttt000ddddd | Rdd = vmaxub (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMAXUB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmaxub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c000c0) {
+					// Instruction: 13: 11010011110sssssPP-ttttt110ddddd | Rdd = vmaxb (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMAXB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmaxb (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c00020) {
+					// Instruction: 13: 11010011110sssssPP-ttttt001ddddd | Rdd = vmaxh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMAXH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmaxh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c00040) {
+					// Instruction: 13: 11010011110sssssPP-ttttt010ddddd | Rdd = vmaxuh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMAXUH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmaxuh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a000a0) {
+					// Instruction: 13: 11010011101sssssPP-ttttt101ddddd | Rdd = vmaxuw (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMAXUW__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmaxuw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c00060) {
+					// Instruction: 13: 11010011110sssssPP-ttttt011ddddd | Rdd = vmaxw (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMAXW__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmaxw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a00000) {
+					// Instruction: 13: 11010011101sssssPP-ttttt000ddddd | Rdd = vminub (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMINUB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vminub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3c000e0) {
+					// Instruction: 13: 11010011110sssssPP-ttttt111ddddd | Rdd = vminb (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMINB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vminb (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a00020) {
+					// Instruction: 13: 11010011101sssssPP-ttttt001ddddd | Rdd = vminh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMINH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vminh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a00040) {
+					// Instruction: 13: 11010011101sssssPP-ttttt010ddddd | Rdd = vminuh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMINUH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vminuh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a00060) {
+					// Instruction: 13: 11010011101sssssPP-ttttt011ddddd | Rdd = vminw (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMINW__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vminw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3a00080) {
+					// Instruction: 13: 11010011101sssssPP-ttttt100ddddd | Rdd = vminuw (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VMINUW__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vminuw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3200040) {
+					// Instruction: 13: 11010011001sssssPP-ttttt010ddddd | Rdd = vsubh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VSUBH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsubh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3200060) {
+					// Instruction: 13: 11010011001sssssPP-ttttt011ddddd | Rdd = vsubh (Rtt, Rss) :sat
+					hi->instruction = HEX_INS_RDD___VSUBH__RTT__RSS___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vsubh (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3200080) {
+					// Instruction: 13: 11010011001sssssPP-ttttt100ddddd | Rdd = vsubuh (Rtt, Rss) :sat
+					hi->instruction = HEX_INS_RDD___VSUBUH__RTT__RSS___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vsubuh (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3200000) {
+					// Instruction: 13: 11010011001sssssPP-ttttt000ddddd | Rdd = vsubub (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VSUBUB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsubub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x3200020) {
+					// Instruction: 13: 11010011001sssssPP-ttttt001ddddd | Rdd = vsubub (Rtt, Rss) :sat
+					hi->instruction = HEX_INS_RDD___VSUBUB__RTT__RSS___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vsubub (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x32000a0) {
+					// Instruction: 13: 11010011001sssssPP-ttttt101ddddd | Rdd = vsubw (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VSUBW__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vsubw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x32000c0) {
+					// Instruction: 13: 11010011001sssssPP-ttttt110ddddd | Rdd = vsubw (Rtt, Rss) :sat
+					hi->instruction = HEX_INS_RDD___VSUBW__RTT__RSS___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vsubw (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x0) {
+					// Instruction: 13: 11010000---sssssPP-ttttt---ddddd | Rd = parity (Rss, Rtt)
+					hi->instruction = HEX_INS_RD___PARITY__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = parity (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x5e00000) {
+					// Instruction: 13: 11010101111sssssPP-ttttt---ddddd | Rd = parity (Rs, Rt)
+					hi->instruction = HEX_INS_RD___PARITY__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = parity (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf200000) == 0x4200000) {
+					// Instruction: 13: 11010100--1sssssPP-ttttt---ddddd | Rdd = bitsplit (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___BITSPLIT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = bitsplit (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe01c18) == 0xc800010) {
+					// Instruction: 13: 11011100100sssssPP-000iiiii10-dd | Pd = dfclass (Rss, #u5)
+					hi->instruction = HEX_INS_PD___DFCLASS__RSS___U5_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x3e0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = dfclass (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x2e00000) {
+					// Instruction: 13: 11010010111sssssPP-ttttt000---dd | Pd = cmp.eq (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___CMP_EQ__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.eq (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x2e00020) {
+					// Instruction: 13: 11010010111sssssPP-ttttt001---dd | Pd = cmp.gt (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___CMP_GT__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.gt (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x2e00040) {
+					// Instruction: 13: 11010010111sssssPP-ttttt010---dd | Pd = cmp.ge (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___CMP_GE__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.ge (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x2e00060) {
+					// Instruction: 13: 11010010111sssssPP-ttttt011---dd | Pd = cmp.uo (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___CMP_UO__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.uo (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x6000000) {
+					// Instruction: 13: 1101011000i-----PPiiiiiiiiiddddd | Rd = sfmake (#u10) :pos
+					hi->instruction = HEX_INS_RD___SFMAKE___U10___POS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_POS; // :pos
+					sprintf(hi->mnem, "R%d = sfmake (0x%x) :pos", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x6400000) {
+					// Instruction: 13: 1101011001i-----PPiiiiiiiiiddddd | Rd = sfmake (#u10) :neg
+					hi->instruction = HEX_INS_RD___SFMAKE___U10___NEG;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_NEG; // :neg
+					sprintf(hi->mnem, "R%d = sfmake (0x%x) :neg", hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x9000000) {
+					// Instruction: 13: 1101100100i-----PPiiiiiiiiiddddd | Rdd = dfmake (#u10) :pos
+					hi->instruction = HEX_INS_RDD___DFMAKE___U10___POS;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_POS; // :pos
+					sprintf(hi->mnem, "R%d:R%d = dfmake (0x%x) :pos", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfc00000) == 0x9400000) {
+					// Instruction: 13: 1101100101i-----PPiiiiiiiiiddddd | Rdd = dfmake (#u10) :neg
+					hi->instruction = HEX_INS_RDD___DFMAKE___U10___NEG;
+					hi->op_count = 2;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x3fe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_NEG; // :neg
+					sprintf(hi->mnem, "R%d:R%d = dfmake (0x%x) :neg", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0x7000000) {
+					// Instruction: 13: 110101110iisssssPPitttttiiiddddd | Rd = add (#u6, mpyi (Rs, Rt))
+					hi->instruction = HEX_INS_RD___ADD___U6__MPYI__RS__RT__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (0x%x, mpyi (R%d, R%d))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x8000000) {
+					// Instruction: 13: 11011000IiisssssPPidddddiiiIIIII | Rd = add (#u6, mpyi (Rs, #U6))
+					hi->instruction = HEX_INS_RD___ADD___U6__MPYI__RS___U6__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5));
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x800000) >> 23) | ((hi_u32 & 0x1f) >> 0));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (0x%x, mpyi (R%d, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0xf000000) {
+					// Instruction: 13: 110111110iisssssPPidddddiiiuuuuu | Rd = add (Ru, mpyi (#u6:2, Rs))
+					hi->instruction = HEX_INS_RD___ADD__RU__MPYI___U6_2__RS__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5)) << 2; // scaled
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (R%d, mpyi (0x%x, R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0xf800000) {
+					// Instruction: 13: 110111111iisssssPPidddddiiiuuuuu | Rd = add (Ru, mpyi (Rs, #u6))
+					hi->instruction = HEX_INS_RD___ADD__RU__MPYI__RS___U6__;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_IMM;
+					hi->ops[3].op.imm = (((hi_u32 & 0x600000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5));
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (R%d, mpyi (R%d, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2002080) {
+					// Instruction: 13: 110100100--sssssPP1ttttt100---dd | Pd = boundscheck (Rss, Rtt) :raw:lo
+					hi->instruction = HEX_INS_PD___BOUNDSCHECK__RSS__RTT___RAW_LO;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LO; // :lo
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "P%d = boundscheck (R%d:R%d, R%d:R%d) :raw:lo", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x20020a0) {
+					// Instruction: 13: 110100100--sssssPP1ttttt101---dd | Pd = boundscheck (Rss, Rtt) :raw:hi
+					hi->instruction = HEX_INS_PD___BOUNDSCHECK__RSS__RTT___RAW_HI;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_HI; // :hi
+					hi->pf |= HEX_PF_RAW; // :raw
+					sprintf(hi->mnem, "P%d = boundscheck (R%d:R%d, R%d:R%d) :raw:hi", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf600018) == 0xd000000) {
+					// Instruction: 13: 11011101-00sssssPP-iiiiiiii00-dd | Pd = cmpb.eq (Rs, #u8)
+					hi->instruction = HEX_INS_PD___CMPB_EQ__RS___U8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmpb.eq (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf600018) == 0xd200000) {
+					// Instruction: 13: 11011101-01sssssPP-iiiiiiii00-dd | Pd = cmpb.gt (Rs, #s8)
+					hi->instruction = HEX_INS_PD___CMPB_GT__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmpb.gt (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf601018) == 0xd400000) {
+					// Instruction: 13: 11011101-10sssssPP-0iiiiiii00-dd | Pd = cmpb.gtu (Rs, #u7)
+					hi->instruction = HEX_INS_PD___CMPB_GTU__RS___U7_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xfe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmpb.gtu (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf600018) == 0xd000008) {
+					// Instruction: 13: 11011101-00sssssPP-iiiiiiii01-dd | Pd = cmph.eq (Rs, #s8)
+					hi->instruction = HEX_INS_PD___CMPH_EQ__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmph.eq (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf600018) == 0xd200008) {
+					// Instruction: 13: 11011101-01sssssPP-iiiiiiii01-dd | Pd = cmph.gt (Rs, #s8)
+					hi->instruction = HEX_INS_PD___CMPH_GT__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmph.gt (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf601018) == 0xd400008) {
+					// Instruction: 13: 11011101-10sssssPP-0iiiiiii01-dd | Pd = cmph.gtu (Rs, #u7)
+					hi->instruction = HEX_INS_PD___CMPH_GTU__RS___U7_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xfe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "P%d = cmph.gtu (R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x2800000) {
+					// Instruction: 13: 11010010100sssssPP-ttttt000---dd | Pd = cmp.eq (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___CMP_EQ__RSS__RTT__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.eq (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x2800040) {
+					// Instruction: 13: 11010010100sssssPP-ttttt010---dd | Pd = cmp.gt (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___CMP_GT__RSS__RTT__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.gt (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe000e0) == 0x2800080) {
+					// Instruction: 13: 11010010100sssssPP-ttttt100---dd | Pd = cmp.gtu (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___CMP_GTU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.gtu (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2002060) {
+					// Instruction: 13: 110100100--sssssPP1ttttt011---dd | Pd = tlbmatch (Rss, Rt)
+					hi->instruction = HEX_INS_PD___TLBMATCH__RSS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = tlbmatch (R%d:R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2000060) {
+					// Instruction: 13: 110100100--sssssPP0ttttt011---dd | Pd = vcmph.eq (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPH_EQ__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmph.eq (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2000080) {
+					// Instruction: 13: 110100100--sssssPP0ttttt100---dd | Pd = vcmph.gt (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPH_GT__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmph.gt (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x20000a0) {
+					// Instruction: 13: 110100100--sssssPP0ttttt101---dd | Pd = vcmph.gtu (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPH_GTU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmph.gtu (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xc000008) {
+					// Instruction: 13: 11011100000sssssPP-iiiiiiii01-dd | Pd = vcmph.eq (Rss, #s8)
+					hi->instruction = HEX_INS_PD___VCMPH_EQ__RSS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmph.eq (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xc200008) {
+					// Instruction: 13: 11011100001sssssPP-iiiiiiii01-dd | Pd = vcmph.gt (Rss, #s8)
+					hi->instruction = HEX_INS_PD___VCMPH_GT__RSS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmph.gt (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01018) == 0xc400008) {
+					// Instruction: 13: 11011100010sssssPP-0iiiiiii01-dd | Pd = vcmph.gtu (Rss, #u7)
+					hi->instruction = HEX_INS_PD___VCMPH_GTU__RSS___U7_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xfe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmph.gtu (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2002000) {
+					// Instruction: 13: 110100100--sssssPP1ttttt000---dd | Pd = any8 (vcmpb.eq (Rss, Rtt))
+					hi->instruction = HEX_INS_PD___ANY8__VCMPB_EQ__RSS__RTT__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = any8 (vcmpb.eq (R%d:R%d, R%d:R%d))", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x20000c0) {
+					// Instruction: 13: 110100100--sssssPP0ttttt110---dd | Pd = vcmpb.eq (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPB_EQ__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpb.eq (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x20000e0) {
+					// Instruction: 13: 110100100--sssssPP0ttttt111---dd | Pd = vcmpb.gtu (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPB_GTU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpb.gtu (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2002040) {
+					// Instruction: 13: 110100100--sssssPP1ttttt010---dd | Pd = vcmpb.gt (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPB_GT__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpb.gt (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xc000000) {
+					// Instruction: 13: 11011100000sssssPP-iiiiiiii00-dd | Pd = vcmpb.eq (Rss, #u8)
+					hi->instruction = HEX_INS_PD___VCMPB_EQ__RSS___U8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpb.eq (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xc200000) {
+					// Instruction: 13: 11011100001sssssPP-iiiiiiii00-dd | Pd = vcmpb.gt (Rss, #s8)
+					hi->instruction = HEX_INS_PD___VCMPB_GT__RSS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpb.gt (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01018) == 0xc400000) {
+					// Instruction: 13: 11011100010sssssPP-0iiiiiii00-dd | Pd = vcmpb.gtu (Rss, #u7)
+					hi->instruction = HEX_INS_PD___VCMPB_GTU__RSS___U7_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xfe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpb.gtu (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2000000) {
+					// Instruction: 13: 110100100--sssssPP0ttttt000---dd | Pd = vcmpw.eq (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPW_EQ__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpw.eq (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2000020) {
+					// Instruction: 13: 110100100--sssssPP0ttttt001---dd | Pd = vcmpw.gt (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPW_GT__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpw.gt (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf8020e0) == 0x2000040) {
+					// Instruction: 13: 110100100--sssssPP0ttttt010---dd | Pd = vcmpw.gtu (Rss, Rtt)
+					hi->instruction = HEX_INS_PD___VCMPW_GTU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpw.gtu (R%d:R%d, R%d:R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xc000010) {
+					// Instruction: 13: 11011100000sssssPP-iiiiiiii10-dd | Pd = vcmpw.eq (Rss, #s8)
+					hi->instruction = HEX_INS_PD___VCMPW_EQ__RSS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpw.eq (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe00018) == 0xc200010) {
+					// Instruction: 13: 11011100001sssssPP-iiiiiiii10-dd | Pd = vcmpw.gt (Rss, #s8)
+					hi->instruction = HEX_INS_PD___VCMPW_GT__RSS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpw.gt (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe01018) == 0xc400010) {
+					// Instruction: 13: 11011100010sssssPP-0iiiiiii10-dd | Pd = vcmpw.gtu (Rss, #u7)
+					hi->instruction = HEX_INS_PD___VCMPW_GTU__RSS___U7_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0xfe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = vcmpw.gtu (R%d:R%d, 0x%x)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x1000000) {
+					// Instruction: 13: 11010001---sssssPP-ttttt-uuddddd | Rdd = vmux (Pu, Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VMUX__PU__RSS__RTT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmux (P%d, R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000004) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii0i10- | Rx = add (#u8, asl (Rx, #U5))
+					hi->instruction = HEX_INS_RX___ADD___U8__ASL__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = add (0x%x, asl (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000006) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii0i11- | Rx = sub (#u8, asl (Rx, #U5))
+					hi->instruction = HEX_INS_RX___SUB___U8__ASL__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = sub (0x%x, asl (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000014) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii1i10- | Rx = add (#u8, lsr (Rx, #U5))
+					hi->instruction = HEX_INS_RX___ADD___U8__LSR__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = add (0x%x, lsr (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000016) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii1i11- | Rx = sub (#u8, lsr (Rx, #U5))
+					hi->instruction = HEX_INS_RX___SUB___U8__LSR__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = sub (0x%x, lsr (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000000) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii0i00- | Rx = and (#u8, asl (Rx, #U5))
+					hi->instruction = HEX_INS_RX___AND___U8__ASL__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = and (0x%x, asl (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000002) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii0i01- | Rx = or (#u8, asl (Rx, #U5))
+					hi->instruction = HEX_INS_RX___OR___U8__ASL__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = or (0x%x, asl (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000010) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii1i00- | Rx = and (#u8, lsr (Rx, #U5))
+					hi->instruction = HEX_INS_RX___AND___U8__LSR__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = and (0x%x, lsr (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf000016) == 0xe000012) {
+					// Instruction: 13: 11011110iiixxxxxPPiIIIIIiii1i01- | Rx = or (#u8, lsr (Rx, #U5))
+					hi->instruction = HEX_INS_RX___OR___U8__LSR__RX___U5__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_IMM;
+					hi->ops[1].op.imm = (((hi_u32 & 0xe00000) >> 21) | ((hi_u32 & 0x2000) >> 13) | ((hi_u32 & 0xe0) >> 5) | ((hi_u32 & 0x8) >> 3));
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[1]);
+					sprintf(hi->mnem, "R%d = or (0x%x, lsr (Rx, 0x%x))", hi->ops[0].op.reg, hi->ops[1].op.imm, hi->ops[2].op.imm);
+					break;
+				}
+				break;
+			}
+			case 0xe: {
+				if ((hi_u32 & 0xf802000) == 0x2000000) {
+					// Instruction: 14: 111000100--sssssPP0iiiiiiiixxxxx | Rx += add (Rs, #s8)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__ADD__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d += add (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x2800000) {
+					// Instruction: 14: 111000101--sssssPP0iiiiiiiixxxxx | Rx -= add (Rs, #s8)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__ADD__RS___S8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					if (hi->ops[2].op.imm & (1 << 2)) {
+						hi->ops[2].op.imm |= (0xFFFFFFFF << 2);
+					}
+					hi->predicate = HEX_NOPRED;
+					hex_op_extend(&hi->ops[2]);
+					sprintf(hi->mnem, "R%d -= add (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf000020) {
+					// Instruction: 14: 11101111000sssssPP0ttttt001xxxxx | Rx += add (Rs, Rt)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__ADD__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += add (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf800020) {
+					// Instruction: 14: 11101111100sssssPP0ttttt001xxxxx | Rx -= add (Rs, Rt)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__ADD__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= add (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf200000) {
+					// Instruction: 14: 11101111001sssssPP0ttttt000xxxxx | Rx |= and (Rs, ~Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__AND__RS___RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= and (R%d, ~R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf200020) {
+					// Instruction: 14: 11101111001sssssPP0ttttt001xxxxx | Rx &= and (Rs, ~Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__AND__RS___RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= and (R%d, ~R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf200040) {
+					// Instruction: 14: 11101111001sssssPP0ttttt010xxxxx | Rx ^= and (Rs, ~Rt)
+					hi->instruction = HEX_INS_RX____AND__RS___RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d ^= and (R%d, ~R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf400000) {
+					// Instruction: 14: 11101111010sssssPP0ttttt000xxxxx | Rx &= and (Rs, Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__AND__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= and (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf400020) {
+					// Instruction: 14: 11101111010sssssPP0ttttt001xxxxx | Rx &= or (Rs, Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__OR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= or (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf400040) {
+					// Instruction: 14: 11101111010sssssPP0ttttt010xxxxx | Rx &= xor (Rs, Rt)
+					hi->instruction = HEX_INS_RX__AND_EQ__XOR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d &= xor (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf400060) {
+					// Instruction: 14: 11101111010sssssPP0ttttt011xxxxx | Rx |= and (Rs, Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__AND__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= and (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf800060) {
+					// Instruction: 14: 11101111100sssssPP0ttttt011xxxxx | Rx ^= xor (Rs, Rt)
+					hi->instruction = HEX_INS_RX____XOR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d ^= xor (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xfc00000) {
+					// Instruction: 14: 11101111110sssssPP0ttttt000xxxxx | Rx |= or (Rs, Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__OR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= or (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xfc00020) {
+					// Instruction: 14: 11101111110sssssPP0ttttt001xxxxx | Rx |= xor (Rs, Rt)
+					hi->instruction = HEX_INS_RX__OR_EQ__XOR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d |= xor (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xfc00040) {
+					// Instruction: 14: 11101111110sssssPP0ttttt010xxxxx | Rx ^= and (Rs, Rt)
+					hi->instruction = HEX_INS_RX____AND__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d ^= and (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xfc00060) {
+					// Instruction: 14: 11101111110sssssPP0ttttt011xxxxx | Rx ^= or (Rs, Rt)
+					hi->instruction = HEX_INS_RX____OR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d ^= or (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf000060) {
+					// Instruction: 14: 11101111000sssssPP0ttttt011xxxxx | Rx += sub (Rt, Rs)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__SUB__RT__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += sub (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8a00000) {
+					// Instruction: 14: 11101000101sssssPP0ttttt000ddddd | Rdd = vabsdiffub (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VABSDIFFUB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vabsdiffub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8e00000) {
+					// Instruction: 14: 11101000111sssssPP0ttttt000ddddd | Rdd = vabsdiffb (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VABSDIFFB__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vabsdiffb (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8600000) {
+					// Instruction: 14: 11101000011sssssPP0ttttt000ddddd | Rdd = vabsdiffh (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VABSDIFFH__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vabsdiffh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8200000) {
+					// Instruction: 14: 11101000001sssssPP0ttttt000ddddd | Rdd = vabsdiffw (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD___VABSDIFFW__RTT__RSS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vabsdiffw (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xaa00000) {
+					// Instruction: 14: 11101010101sssssPP0ttttt0eexxxxx | Rxx, Pe = vacsh (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PE___VACSH__RSS__RTT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d, P%d = vacsh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8400020) {
+					// Instruction: 14: 11101000010sssssPP0ttttt001ddddd | Rdd = vraddub (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VRADDUB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vraddub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa400020) {
+					// Instruction: 14: 11101010010sssssPP0ttttt001xxxxx | Rxx += vraddub (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRADDUB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vraddub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf802060) == 0x9000020) {
+					// Instruction: 14: 111010010--sssssPP0ttttt-01ddddd | Rd = vradduh (Rss, Rtt)
+					hi->instruction = HEX_INS_RD___VRADDUH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vradduh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa020e0) == 0x92000e0) {
+					// Instruction: 14: 111010010-1sssssPP0ttttt111ddddd | Rd = vraddh (Rss, Rtt)
+					hi->instruction = HEX_INS_RD___VRADDH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vraddh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xae00000) {
+					// Instruction: 14: 11101010111sssssPP0ttttt0eeddddd | Rdd, Pe = vminub (Rtt, Rss)
+					hi->instruction = HEX_INS_RDD__PE___VMINUB__RTT__RSS_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].attr |= HEX_OP_REG_PAIR;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d, P%d = vminub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, hi->ops[3].op.reg + 1, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8400040) {
+					// Instruction: 14: 11101000010sssssPP0ttttt010ddddd | Rdd = vrsadub (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VRSADUB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrsadub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa400040) {
+					// Instruction: 14: 11101010010sssssPP0ttttt010xxxxx | Rxx += vrsadub (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRSADUB__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrsadub (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x50000c0) {
+					// Instruction: 14: 11100101N00sssssPP0ttttt110ddddd | Rdd = cmpy (Rs, Rt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___CMPY__RS__RT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = cmpy (R%d, R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x54000c0) {
+					// Instruction: 14: 11100101N10sssssPP0ttttt110ddddd | Rdd = cmpy (Rs, Rt *) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___CMPY__RS__RT________N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = cmpy (R%d, R%d *) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x70000c0) {
+					// Instruction: 14: 11100111N00sssssPP0ttttt110xxxxx | Rxx += cmpy (Rs, Rt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__CMPY__RS__RT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += cmpy (R%d, R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x70000e0) {
+					// Instruction: 14: 11100111N00sssssPP0ttttt111xxxxx | Rxx -= cmpy (Rs, Rt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__CMPY__RS__RT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d -= cmpy (R%d, R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x74000c0) {
+					// Instruction: 14: 11100111N10sssssPP0ttttt110xxxxx | Rxx += cmpy (Rs, Rt *) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__CMPY__RS__RT________N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += cmpy (R%d, R%d *) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x74000e0) {
+					// Instruction: 14: 11100111N10sssssPP0ttttt111xxxxx | Rxx -= cmpy (Rs, Rt *) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__CMPY__RS__RT________N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d -= cmpy (R%d, R%d *) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x5000020) {
+					// Instruction: 14: 11100101000sssssPP0ttttt001ddddd | Rdd = cmpyi (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___CMPYI__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = cmpyi (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x5000040) {
+					// Instruction: 14: 11100101000sssssPP0ttttt010ddddd | Rdd = cmpyr (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___CMPYR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = cmpyr (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7000020) {
+					// Instruction: 14: 11100111000sssssPP0ttttt001xxxxx | Rxx += cmpyi (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__CMPYI__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += cmpyi (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7000040) {
+					// Instruction: 14: 11100111000sssssPP0ttttt010xxxxx | Rxx += cmpyr (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__CMPYR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += cmpyr (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xd2000c0) {
+					// Instruction: 14: 11101101N01sssssPP0ttttt110ddddd | Rd = cmpy (Rs, Rt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___CMPY__RS__RT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = cmpy (R%d, R%d) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xd6000c0) {
+					// Instruction: 14: 11101101N11sssssPP0ttttt110ddddd | Rd = cmpy (Rs, Rt *) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___CMPY__RS__RT________N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = cmpy (R%d, R%d *) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x82000c0) {
+					// Instruction: 14: 11101000N01sssssPP0ttttt110ddddd | Rdd = vcmpyr (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VCMPYR__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vcmpyr (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x84000c0) {
+					// Instruction: 14: 11101000N10sssssPP0ttttt110ddddd | Rdd = vcmpyi (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VCMPYI__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vcmpyi (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa200080) {
+					// Instruction: 14: 11101010001sssssPP0ttttt100xxxxx | Rxx += vcmpyr (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VCMPYR__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vcmpyr (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa400080) {
+					// Instruction: 14: 11101010010sssssPP0ttttt100xxxxx | Rxx += vcmpyi (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VCMPYI__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vcmpyi (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8000000) {
+					// Instruction: 14: 11101000000sssssPP0ttttt000ddddd | Rdd = vrcmpyi (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VRCMPYI__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrcmpyi (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8000020) {
+					// Instruction: 14: 11101000000sssssPP0ttttt001ddddd | Rdd = vrcmpyr (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VRCMPYR__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrcmpyr (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8400000) {
+					// Instruction: 14: 11101000010sssssPP0ttttt000ddddd | Rdd = vrcmpyi (Rss, Rtt *)
+					hi->instruction = HEX_INS_RDD___VRCMPYI__RSS__RTT___;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrcmpyi (R%d:R%d, R%d:R%d *)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8600020) {
+					// Instruction: 14: 11101000011sssssPP0ttttt001ddddd | Rdd = vrcmpyr (Rss, Rtt *)
+					hi->instruction = HEX_INS_RDD___VRCMPYR__RSS__RTT___;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrcmpyr (R%d:R%d, R%d:R%d *)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa000000) {
+					// Instruction: 14: 11101010000sssssPP0ttttt000xxxxx | Rxx += vrcmpyi (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCMPYI__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrcmpyi (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa000020) {
+					// Instruction: 14: 11101010000sssssPP0ttttt001xxxxx | Rxx += vrcmpyr (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCMPYR__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrcmpyr (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa400000) {
+					// Instruction: 14: 11101010010sssssPP0ttttt000xxxxx | Rxx += vrcmpyi (Rss, Rtt *)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCMPYI__RSS__RTT___;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrcmpyi (R%d:R%d, R%d:R%d *)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa600020) {
+					// Instruction: 14: 11101010011sssssPP0ttttt001xxxxx | Rxx += vrcmpyr (Rss, Rtt *)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCMPYR__RSS__RTT___;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrcmpyr (R%d:R%d, R%d:R%d *)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8a00080) {
+					// Instruction: 14: 11101000101sssssPP0ttttt100ddddd | Rdd = vrcmpys (Rss, Rtt) :<<1:sat:raw:hi
+					hi->instruction = HEX_INS_RDD___VRCMPYS__RSS__RTT_____1_SAT_RAW_HI;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_HI; // :hi
+					hi->pf |= HEX_PF_RAW; // :raw
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vrcmpys (R%d:R%d, R%d:R%d) :<<1:sat:raw:hi", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8e00080) {
+					// Instruction: 14: 11101000111sssssPP0ttttt100ddddd | Rdd = vrcmpys (Rss, Rtt) :<<1:sat:raw:lo
+					hi->instruction = HEX_INS_RDD___VRCMPYS__RSS__RTT_____1_SAT_RAW_LO;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LO; // :lo
+					hi->pf |= HEX_PF_RAW; // :raw
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vrcmpys (R%d:R%d, R%d:R%d) :<<1:sat:raw:lo", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xaa00080) {
+					// Instruction: 14: 11101010101sssssPP0ttttt100xxxxx | Rxx += vrcmpys (Rss, Rtt) :<<1:sat:raw:hi
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCMPYS__RSS__RTT_____1_SAT_RAW_HI;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_HI; // :hi
+					hi->pf |= HEX_PF_RAW; // :raw
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vrcmpys (R%d:R%d, R%d:R%d) :<<1:sat:raw:hi", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xae00080) {
+					// Instruction: 14: 11101010111sssssPP0ttttt100xxxxx | Rxx += vrcmpys (Rss, Rtt) :<<1:sat:raw:lo
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRCMPYS__RSS__RTT_____1_SAT_RAW_LO;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LO; // :lo
+					hi->pf |= HEX_PF_RAW; // :raw
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vrcmpys (R%d:R%d, R%d:R%d) :<<1:sat:raw:lo", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa020e0) == 0x9a000c0) {
+					// Instruction: 14: 111010011-1sssssPP0ttttt110ddddd | Rd = vrcmpys (Rss, Rtt) :<<1:rnd:sat:raw:hi
+					hi->instruction = HEX_INS_RD___VRCMPYS__RSS__RTT_____1_RND_SAT_RAW_HI;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_HI; // :hi
+					hi->pf |= HEX_PF_RAW; // :raw
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vrcmpys (R%d:R%d, R%d:R%d) :<<1:rnd:sat:raw:hi", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa020e0) == 0x9a000e0) {
+					// Instruction: 14: 111010011-1sssssPP0ttttt111ddddd | Rd = vrcmpys (Rss, Rtt) :<<1:rnd:sat:raw:lo
+					hi->instruction = HEX_INS_RD___VRCMPYS__RSS__RTT_____1_RND_SAT_RAW_LO;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_LO; // :lo
+					hi->pf |= HEX_PF_RAW; // :raw
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vrcmpys (R%d:R%d, R%d:R%d) :<<1:rnd:sat:raw:lo", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb000000) {
+					// Instruction: 14: 11101011000sssssPP0ttttt000ddddd | Rd = sfadd (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SFADD__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sfadd (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xbc00000) {
+					// Instruction: 14: 11101011110sssssPP0ttttt000ddddd | Rd = sffixupn (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SFFIXUPN__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sffixupn (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xbc00020) {
+					// Instruction: 14: 11101011110sssssPP0ttttt001ddddd | Rd = sffixupd (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SFFIXUPD__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sffixupd (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf000080) {
+					// Instruction: 14: 11101111000sssssPP0ttttt100xxxxx | Rx += sfmpy (Rs, Rt)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__SFMPY__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += sfmpy (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf0000a0) {
+					// Instruction: 14: 11101111000sssssPP0ttttt101xxxxx | Rx -= sfmpy (Rs, Rt)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__SFMPY__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= sfmpy (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xf600080) {
+					// Instruction: 14: 11101111011sssssPP0ttttt1uuxxxxx | Rx += sfmpy (Rs, Rt, Pu) :scale
+					hi->instruction = HEX_INS_RX__PLUS_EQ__SFMPY__RS__RT__PU___SCALE;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[3].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SCALE; // :scale
+					sprintf(hi->mnem, "R%d += sfmpy (R%d, R%d, P%d) :scale", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.pred);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf0000c0) {
+					// Instruction: 14: 11101111000sssssPP0ttttt110xxxxx | Rx += sfmpy (Rs, Rt) :lib
+					hi->instruction = HEX_INS_RX__PLUS_EQ__SFMPY__RS__RT___LIB;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += sfmpy (R%d, R%d) :lib", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf0000e0) {
+					// Instruction: 14: 11101111000sssssPP0ttttt111xxxxx | Rx -= sfmpy (Rs, Rt) :lib
+					hi->instruction = HEX_INS_RX__MINUS_EQ__SFMPY__RS__RT___LIB;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= sfmpy (R%d, R%d) :lib", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb800000) {
+					// Instruction: 14: 11101011100sssssPP0ttttt000ddddd | Rd = sfmax (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SFMAX__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sfmax (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb800020) {
+					// Instruction: 14: 11101011100sssssPP0ttttt001ddddd | Rd = sfmin (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SFMIN__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sfmin (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb400000) {
+					// Instruction: 14: 11101011010sssssPP0ttttt000ddddd | Rd = sfmpy (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SFMPY__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sfmpy (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe02080) == 0xbe00080) {
+					// Instruction: 14: 11101011111sssssPP0ttttt1eeddddd | Rd, Pe = sfrecipa (Rs, Rt)
+					hi->instruction = HEX_INS_RD__PE___SFRECIPA__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d, P%d = sfrecipa (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xb000020) {
+					// Instruction: 14: 11101011000sssssPP0ttttt001ddddd | Rd = sfsub (Rs, Rt)
+					hi->instruction = HEX_INS_RD___SFSUB__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sfsub (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3000000) {
+					// Instruction: 14: 11100011000sssssPP-yyyyy---uuuuu | Ry = add (Ru, mpyi (Ry, Rs))
+					hi->instruction = HEX_INS_RY___ADD__RU__MPYI__RY__RS__;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f00) >> 8); // Ry
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Ru
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (R%d, mpyi (Ry, R%d))", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x0) {
+					// Instruction: 14: 111000000--sssssPP0iiiiiiiiddddd | Rd = + mpyi (Rs, #u8)
+					hi->instruction = HEX_INS_RD__EQ_PLUS__MPYI__RS___U8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = + mpyi (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x800000) {
+					// Instruction: 14: 111000001--sssssPP0iiiiiiiiddddd | Rd = - mpyi (Rs, #u8)
+					hi->instruction = HEX_INS_RD__EQ_MINUS__MPYI__RS___U8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = - mpyi (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x1000000) {
+					// Instruction: 14: 111000010--sssssPP0iiiiiiiixxxxx | Rx += mpyi (Rs, #u8)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPYI__RS___U8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpyi (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xf802000) == 0x1800000) {
+					// Instruction: 14: 111000011--sssssPP0iiiiiiiixxxxx | Rx -= mpyi (Rs, #u8)
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPYI__RS___U8_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_IMM;
+					hi->ops[2].op.imm = (((hi_u32) & 0x1fe0) >> 5);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpyi (R%d, 0x%x)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.imm);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xd000000) {
+					// Instruction: 14: 11101101000sssssPP0ttttt000ddddd | Rd = mpyi (Rs, Rt)
+					hi->instruction = HEX_INS_RD___MPYI__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpyi (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf000000) {
+					// Instruction: 14: 11101111000sssssPP0ttttt000xxxxx | Rx += mpyi (Rs, Rt)
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPYI__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpyi (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x80000a0) {
+					// Instruction: 14: 11101000N00sssssPP0ttttt101ddddd | Rdd = vmpyweh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VMPYWEH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpyweh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x80000e0) {
+					// Instruction: 14: 11101000N00sssssPP0ttttt111ddddd | Rdd = vmpywoh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VMPYWOH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpywoh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x82000a0) {
+					// Instruction: 14: 11101000N01sssssPP0ttttt101ddddd | Rdd = vmpyweh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RDD___VMPYWEH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpyweh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x82000e0) {
+					// Instruction: 14: 11101000N01sssssPP0ttttt111ddddd | Rdd = vmpywoh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RDD___VMPYWOH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpywoh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa0000a0) {
+					// Instruction: 14: 11101010N00sssssPP0ttttt101xxxxx | Rxx += vmpyweh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWEH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpyweh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa0000e0) {
+					// Instruction: 14: 11101010N00sssssPP0ttttt111xxxxx | Rxx += vmpywoh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWOH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpywoh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa2000a0) {
+					// Instruction: 14: 11101010N01sssssPP0ttttt101xxxxx | Rxx += vmpyweh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWEH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpyweh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa2000e0) {
+					// Instruction: 14: 11101010N01sssssPP0ttttt111xxxxx | Rxx += vmpywoh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWOH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpywoh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x84000a0) {
+					// Instruction: 14: 11101000N10sssssPP0ttttt101ddddd | Rdd = vmpyweuh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VMPYWEUH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpyweuh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x84000e0) {
+					// Instruction: 14: 11101000N10sssssPP0ttttt111ddddd | Rdd = vmpywouh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VMPYWOUH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpywouh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x86000a0) {
+					// Instruction: 14: 11101000N11sssssPP0ttttt101ddddd | Rdd = vmpyweuh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RDD___VMPYWEUH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpyweuh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x86000e0) {
+					// Instruction: 14: 11101000N11sssssPP0ttttt111ddddd | Rdd = vmpywouh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RDD___VMPYWOUH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpywouh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa4000a0) {
+					// Instruction: 14: 11101010N10sssssPP0ttttt101xxxxx | Rxx += vmpyweuh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWEUH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpyweuh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa4000e0) {
+					// Instruction: 14: 11101010N10sssssPP0ttttt111xxxxx | Rxx += vmpywouh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWOUH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpywouh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa6000a0) {
+					// Instruction: 14: 11101010N11sssssPP0ttttt101xxxxx | Rxx += vmpyweuh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWEUH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpyweuh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa6000e0) {
+					// Instruction: 14: 11101010N11sssssPP0ttttt111xxxxx | Rxx += vmpywouh (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYWOUH__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpywouh (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4000000) {
+					// Instruction: 14: 11100100N00sssssPP-ttttt-00ddddd | Rdd = mpy (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPY__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.L, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4000020) {
+					// Instruction: 14: 11100100N00sssssPP-ttttt-01ddddd | Rdd = mpy (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPY__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.L, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4000040) {
+					// Instruction: 14: 11100100N00sssssPP-ttttt-10ddddd | Rdd = mpy (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPY__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.H, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4000060) {
+					// Instruction: 14: 11100100N00sssssPP-ttttt-11ddddd | Rdd = mpy (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPY__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.H, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4200000) {
+					// Instruction: 14: 11100100N01sssssPP-ttttt-00ddddd | Rdd = mpy (Rs.L, Rt.L) [:<<N]:rnd
+					hi->instruction = HEX_INS_RDD___MPY__RS_L__RT_L______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.L, R%d.L) %s:rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4200020) {
+					// Instruction: 14: 11100100N01sssssPP-ttttt-01ddddd | Rdd = mpy (Rs.L, Rt.H) [:<<N]:rnd
+					hi->instruction = HEX_INS_RDD___MPY__RS_L__RT_H______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.L, R%d.H) %s:rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4200040) {
+					// Instruction: 14: 11100100N01sssssPP-ttttt-10ddddd | Rdd = mpy (Rs.H, Rt.L) [:<<N]:rnd
+					hi->instruction = HEX_INS_RDD___MPY__RS_H__RT_L______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.H, R%d.L) %s:rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4200060) {
+					// Instruction: 14: 11100100N01sssssPP-ttttt-11ddddd | Rdd = mpy (Rs.H, Rt.H) [:<<N]:rnd
+					hi->instruction = HEX_INS_RDD___MPY__RS_H__RT_H______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d.H, R%d.H) %s:rnd", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6000000) {
+					// Instruction: 14: 11100110N00sssssPP-ttttt000xxxxx | Rxx += mpy (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPY__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpy (R%d.L, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6000020) {
+					// Instruction: 14: 11100110N00sssssPP-ttttt001xxxxx | Rxx += mpy (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPY__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpy (R%d.L, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6000040) {
+					// Instruction: 14: 11100110N00sssssPP-ttttt010xxxxx | Rxx += mpy (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPY__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpy (R%d.H, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6000060) {
+					// Instruction: 14: 11100110N00sssssPP-ttttt011xxxxx | Rxx += mpy (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPY__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpy (R%d.H, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6200000) {
+					// Instruction: 14: 11100110N01sssssPP-ttttt000xxxxx | Rxx -= mpy (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPY__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpy (R%d.L, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6200020) {
+					// Instruction: 14: 11100110N01sssssPP-ttttt001xxxxx | Rxx -= mpy (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPY__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpy (R%d.L, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6200040) {
+					// Instruction: 14: 11100110N01sssssPP-ttttt010xxxxx | Rxx -= mpy (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPY__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpy (R%d.H, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6200060) {
+					// Instruction: 14: 11100110N01sssssPP-ttttt011xxxxx | Rxx -= mpy (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPY__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpy (R%d.H, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc000000) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt000ddddd | Rd = mpy (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc000020) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt001ddddd | Rd = mpy (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc000040) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt010ddddd | Rd = mpy (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc000060) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt011ddddd | Rd = mpy (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc000080) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt100ddddd | Rd = mpy (Rs.L, Rt.L) [:<<N]:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_L______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.L) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc0000a0) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt101ddddd | Rd = mpy (Rs.L, Rt.H) [:<<N]:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_H______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.H) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc0000c0) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt110ddddd | Rd = mpy (Rs.H, Rt.L) [:<<N]:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_L______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.L) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc0000e0) {
+					// Instruction: 14: 11101100N00sssssPP-ttttt111ddddd | Rd = mpy (Rs.H, Rt.H) [:<<N]:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_H______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.H) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc200000) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt000ddddd | Rd = mpy (Rs.L, Rt.L) [:<<N]:rnd
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_L______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.L) %s:rnd", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc200020) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt001ddddd | Rd = mpy (Rs.L, Rt.H) [:<<N]:rnd
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_H______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.H) %s:rnd", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc200040) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt010ddddd | Rd = mpy (Rs.H, Rt.L) [:<<N]:rnd
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_L______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.L) %s:rnd", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc200060) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt011ddddd | Rd = mpy (Rs.H, Rt.H) [:<<N]:rnd
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_H______N__RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.H) %s:rnd", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc200080) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt100ddddd | Rd = mpy (Rs.L, Rt.L) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_L______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.L) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc2000a0) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt101ddddd | Rd = mpy (Rs.L, Rt.H) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_L__RT_H______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.L, R%d.H) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc2000c0) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt110ddddd | Rd = mpy (Rs.H, Rt.L) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_L______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.L) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc2000e0) {
+					// Instruction: 14: 11101100N01sssssPP-ttttt111ddddd | Rd = mpy (Rs.H, Rt.H) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___MPY__RS_H__RT_H______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d.H, R%d.H) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe000000) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt000xxxxx | Rx += mpy (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpy (R%d.L, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe000020) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt001xxxxx | Rx += mpy (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpy (R%d.L, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe000040) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt010xxxxx | Rx += mpy (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpy (R%d.H, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe000060) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt011xxxxx | Rx += mpy (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpy (R%d.H, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe000080) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt100xxxxx | Rx += mpy (Rs.L, Rt.L) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_L______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d += mpy (R%d.L, R%d.L) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe0000a0) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt101xxxxx | Rx += mpy (Rs.L, Rt.H) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_H______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d += mpy (R%d.L, R%d.H) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe0000c0) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt110xxxxx | Rx += mpy (Rs.H, Rt.L) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_L______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d += mpy (R%d.H, R%d.L) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe0000e0) {
+					// Instruction: 14: 11101110N00sssssPP-ttttt111xxxxx | Rx += mpy (Rs.H, Rt.H) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_H______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d += mpy (R%d.H, R%d.H) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe200000) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt000xxxxx | Rx -= mpy (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpy (R%d.L, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe200020) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt001xxxxx | Rx -= mpy (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpy (R%d.L, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe200040) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt010xxxxx | Rx -= mpy (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpy (R%d.H, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe200060) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt011xxxxx | Rx -= mpy (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpy (R%d.H, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe200080) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt100xxxxx | Rx -= mpy (Rs.L, Rt.L) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_L______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d -= mpy (R%d.L, R%d.L) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe2000a0) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt101xxxxx | Rx -= mpy (Rs.L, Rt.H) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_H______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d -= mpy (R%d.L, R%d.H) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe2000c0) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt110xxxxx | Rx -= mpy (Rs.H, Rt.L) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_L______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d -= mpy (R%d.H, R%d.L) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe2000e0) {
+					// Instruction: 14: 11101110N01sssssPP-ttttt111xxxxx | Rx -= mpy (Rs.H, Rt.H) [:<<N]:sat
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_H______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d -= mpy (R%d.H, R%d.H) %s:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4400000) {
+					// Instruction: 14: 11100100N10sssssPP-ttttt-00ddddd | Rdd = mpyu (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPYU__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpyu (R%d.L, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4400020) {
+					// Instruction: 14: 11100100N10sssssPP-ttttt-01ddddd | Rdd = mpyu (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPYU__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpyu (R%d.L, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4400040) {
+					// Instruction: 14: 11100100N10sssssPP-ttttt-10ddddd | Rdd = mpyu (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPYU__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpyu (R%d.H, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf600060) == 0x4400060) {
+					// Instruction: 14: 11100100N10sssssPP-ttttt-11ddddd | Rdd = mpyu (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RDD___MPYU__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpyu (R%d.H, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6400000) {
+					// Instruction: 14: 11100110N10sssssPP-ttttt000xxxxx | Rxx += mpyu (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPYU__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpyu (R%d.L, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6400020) {
+					// Instruction: 14: 11100110N10sssssPP-ttttt001xxxxx | Rxx += mpyu (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPYU__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpyu (R%d.L, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6400040) {
+					// Instruction: 14: 11100110N10sssssPP-ttttt010xxxxx | Rxx += mpyu (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPYU__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpyu (R%d.H, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6400060) {
+					// Instruction: 14: 11100110N10sssssPP-ttttt011xxxxx | Rxx += mpyu (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPYU__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpyu (R%d.H, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6600000) {
+					// Instruction: 14: 11100110N11sssssPP-ttttt000xxxxx | Rxx -= mpyu (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPYU__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpyu (R%d.L, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6600020) {
+					// Instruction: 14: 11100110N11sssssPP-ttttt001xxxxx | Rxx -= mpyu (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPYU__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpyu (R%d.L, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6600040) {
+					// Instruction: 14: 11100110N11sssssPP-ttttt010xxxxx | Rxx -= mpyu (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPYU__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpyu (R%d.H, R%d.L) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0x6600060) {
+					// Instruction: 14: 11100110N11sssssPP-ttttt011xxxxx | Rxx -= mpyu (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPYU__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpyu (R%d.H, R%d.H) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc400000) {
+					// Instruction: 14: 11101100N10sssssPP-ttttt000ddddd | Rd = mpyu (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RD___MPYU__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpyu (R%d.L, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc400020) {
+					// Instruction: 14: 11101100N10sssssPP-ttttt001ddddd | Rd = mpyu (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RD___MPYU__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpyu (R%d.L, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc400040) {
+					// Instruction: 14: 11101100N10sssssPP-ttttt010ddddd | Rd = mpyu (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RD___MPYU__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpyu (R%d.H, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xc400060) {
+					// Instruction: 14: 11101100N10sssssPP-ttttt011ddddd | Rd = mpyu (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RD___MPYU__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpyu (R%d.H, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe400000) {
+					// Instruction: 14: 11101110N10sssssPP-ttttt000xxxxx | Rx += mpyu (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPYU__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpyu (R%d.L, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe400020) {
+					// Instruction: 14: 11101110N10sssssPP-ttttt001xxxxx | Rx += mpyu (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPYU__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpyu (R%d.L, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe400040) {
+					// Instruction: 14: 11101110N10sssssPP-ttttt010xxxxx | Rx += mpyu (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPYU__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpyu (R%d.H, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe400060) {
+					// Instruction: 14: 11101110N10sssssPP-ttttt011xxxxx | Rx += mpyu (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPYU__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d += mpyu (R%d.H, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe600000) {
+					// Instruction: 14: 11101110N11sssssPP-ttttt000xxxxx | Rx -= mpyu (Rs.L, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPYU__RS_L__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpyu (R%d.L, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe600020) {
+					// Instruction: 14: 11101110N11sssssPP-ttttt001xxxxx | Rx -= mpyu (Rs.L, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPYU__RS_L__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpyu (R%d.L, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe600040) {
+					// Instruction: 14: 11101110N11sssssPP-ttttt010xxxxx | Rx -= mpyu (Rs.H, Rt.L) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPYU__RS_H__RT_L______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpyu (R%d.H, R%d.L) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6000e0) == 0xe600060) {
+					// Instruction: 14: 11101110N11sssssPP-ttttt011xxxxx | Rx -= mpyu (Rs.H, Rt.H) [:<<N]
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPYU__RS_H__RT_H______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d -= mpyu (R%d.H, R%d.H) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x54000e0) {
+					// Instruction: 14: 11100101010sssssPP0ttttt111ddddd | Rdd = pmpyw (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___PMPYW__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = pmpyw (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x72000e0) {
+					// Instruction: 14: 11100111001sssssPP0ttttt111xxxxx | Rxx ^= pmpyw (Rs, Rt)
+					hi->instruction = HEX_INS_RXX____PMPYW__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= pmpyw (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x8200040) {
+					// Instruction: 14: 11101000N01sssssPP0ttttt010ddddd | Rdd = vrmpywoh (Rss, Rtt) [:<<N]
+					hi->instruction = HEX_INS_RDD___VRMPYWOH__RSS__RTT______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmpywoh (R%d:R%d, R%d:R%d) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x8400080) {
+					// Instruction: 14: 11101000N10sssssPP0ttttt100ddddd | Rdd = vrmpyweh (Rss, Rtt) [:<<N]
+					hi->instruction = HEX_INS_RDD___VRMPYWEH__RSS__RTT______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmpyweh (R%d:R%d, R%d:R%d) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa2000c0) {
+					// Instruction: 14: 11101010N01sssssPP0ttttt110xxxxx | Rxx += vrmpyweh (Rss, Rtt) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRMPYWEH__RSS__RTT______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrmpyweh (R%d:R%d, R%d:R%d) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa6000c0) {
+					// Instruction: 14: 11101010N11sssssPP0ttttt110xxxxx | Rxx += vrmpywoh (Rss, Rtt) [:<<N]
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRMPYWOH__RSS__RTT______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrmpywoh (R%d:R%d, R%d:R%d) %s", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xd200020) {
+					// Instruction: 14: 11101101001sssssPP0ttttt001ddddd | Rd = mpy (Rs, Rt) :rnd
+					hi->instruction = HEX_INS_RD___MPY__RS__RT___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d = mpy (R%d, R%d) :rnd", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xd400020) {
+					// Instruction: 14: 11101101010sssssPP0ttttt001ddddd | Rd = mpyu (Rs, Rt)
+					hi->instruction = HEX_INS_RD___MPYU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpyu (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xd600020) {
+					// Instruction: 14: 11101101011sssssPP0ttttt001ddddd | Rd = mpysu (Rs, Rt)
+					hi->instruction = HEX_INS_RD___MPYSU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpysu (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xda00000) {
+					// Instruction: 14: 11101101101sssssPP0ttttt000ddddd | Rd = mpy (Rs, Rt.H) :<<1:sat
+					hi->instruction = HEX_INS_RD___MPY__RS__RT_H_____1_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d, R%d.H) :<<1:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xda00020) {
+					// Instruction: 14: 11101101101sssssPP0ttttt001ddddd | Rd = mpy (Rs, Rt.L) :<<1:sat
+					hi->instruction = HEX_INS_RD___MPY__RS__RT_L_____1_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d, R%d.L) :<<1:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xda00080) {
+					// Instruction: 14: 11101101101sssssPP0ttttt100ddddd | Rd = mpy (Rs, Rt.H) :<<1:rnd:sat
+					hi->instruction = HEX_INS_RD___MPY__RS__RT_H_____1_RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d, R%d.H) :<<1:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xde00000) {
+					// Instruction: 14: 11101101111sssssPP0ttttt000ddddd | Rd = mpy (Rs, Rt) :<<1:sat
+					hi->instruction = HEX_INS_RD___MPY__RS__RT_____1_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d, R%d) :<<1:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xde00080) {
+					// Instruction: 14: 11101101111sssssPP0ttttt100ddddd | Rd = mpy (Rs, Rt.L) :<<1:rnd:sat
+					hi->instruction = HEX_INS_RD___MPY__RS__RT_L_____1_RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = mpy (R%d, R%d.L) :<<1:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf402080) == 0xd000000) {
+					// Instruction: 14: 11101101N0NsssssPP0ttttt0NNddddd | Rd = mpy (Rs, Rt) [:<<N]
+					hi->instruction = HEX_INS_RD___MPY__RS__RT______N_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32 & 0x800000) >> 23) | ((hi_u32 & 0x200000) >> 21) | ((hi_u32 & 0x60) >> 5))) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mpy (R%d, R%d) %s", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf600000) {
+					// Instruction: 14: 11101111011sssssPP0ttttt000xxxxx | Rx += mpy (Rs, Rt) :<<1:sat
+					hi->instruction = HEX_INS_RX__PLUS_EQ__MPY__RS__RT_____1_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d += mpy (R%d, R%d) :<<1:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xf600020) {
+					// Instruction: 14: 11101111011sssssPP0ttttt001xxxxx | Rx -= mpy (Rs, Rt) :<<1:sat
+					hi->instruction = HEX_INS_RX__MINUS_EQ__MPY__RS__RT_____1_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rx
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_LSH1; // :<<1
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d -= mpy (R%d, R%d) :<<1:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x5000000) {
+					// Instruction: 14: 11100101000sssssPP0ttttt000ddddd | Rdd = mpy (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___MPY__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpy (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x5400000) {
+					// Instruction: 14: 11100101010sssssPP0ttttt000ddddd | Rdd = mpyu (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___MPYU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = mpyu (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7000000) {
+					// Instruction: 14: 11100111000sssssPP0ttttt000xxxxx | Rxx += mpy (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPY__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpy (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7200000) {
+					// Instruction: 14: 11100111001sssssPP0ttttt000xxxxx | Rxx -= mpy (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPY__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpy (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7400000) {
+					// Instruction: 14: 11100111010sssssPP0ttttt000xxxxx | Rxx += mpyu (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__MPYU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += mpyu (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7600000) {
+					// Instruction: 14: 11100111011sssssPP0ttttt000xxxxx | Rxx -= mpyu (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__MINUS_EQ__MPYU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d -= mpyu (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x8000080) {
+					// Instruction: 14: 11101000N00sssssPP0ttttt100ddddd | Rdd = vdmpy (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VDMPY__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vdmpy (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa000080) {
+					// Instruction: 14: 11101010N00sssssPP0ttttt100xxxxx | Rxx += vdmpy (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VDMPY__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vdmpy (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf002060) == 0x9000000) {
+					// Instruction: 14: 11101001N--sssssPP0ttttt-00ddddd | Rd = vdmpy (Rss, Rtt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___VDMPY__RSS__RTT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vdmpy (R%d:R%d, R%d:R%d) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8800020) {
+					// Instruction: 14: 11101000100sssssPP0ttttt001ddddd | Rdd = vrmpybu (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VRMPYBU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmpybu (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8c00020) {
+					// Instruction: 14: 11101000110sssssPP0ttttt001ddddd | Rdd = vrmpybsu (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VRMPYBSU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmpybsu (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa800020) {
+					// Instruction: 14: 11101010100sssssPP0ttttt001xxxxx | Rxx += vrmpybu (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRMPYBU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrmpybu (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xac00020) {
+					// Instruction: 14: 11101010110sssssPP0ttttt001xxxxx | Rxx += vrmpybsu (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRMPYBSU__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrmpybsu (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8a00020) {
+					// Instruction: 14: 11101000101sssssPP0ttttt001ddddd | Rdd = vdmpybsu (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RDD___VDMPYBSU__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vdmpybsu (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa200020) {
+					// Instruction: 14: 11101010001sssssPP0ttttt001xxxxx | Rxx += vdmpybsu (Rss, Rtt) :sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VDMPYBSU__RSS__RTT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vdmpybsu (R%d:R%d, R%d:R%d) :sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x80000c0) {
+					// Instruction: 14: 11101000N00sssssPP0ttttt110ddddd | Rdd = vmpyeh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VMPYEH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpyeh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa200040) {
+					// Instruction: 14: 11101010001sssssPP0ttttt010xxxxx | Rxx += vmpyeh (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYEH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vmpyeh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xa0000c0) {
+					// Instruction: 14: 11101010N00sssssPP0ttttt110xxxxx | Rxx += vmpyeh (Rss, Rtt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYEH__RSS__RTT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpyeh (R%d:R%d, R%d:R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x50000a0) {
+					// Instruction: 14: 11100101N00sssssPP0ttttt101ddddd | Rdd = vmpyh (Rs, Rt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VMPYH__RS__RT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpyh (R%d, R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7200020) {
+					// Instruction: 14: 11100111001sssssPP0ttttt001xxxxx | Rxx += vmpyh (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYH__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vmpyh (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x70000a0) {
+					// Instruction: 14: 11100111N00sssssPP0ttttt101xxxxx | Rxx += vmpyh (Rs, Rt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYH__RS__RT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpyh (R%d, R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0xd2000e0) {
+					// Instruction: 14: 11101101N01sssssPP0ttttt111ddddd | Rd = vmpyh (Rs, Rt) [:<<N]:rnd:sat
+					hi->instruction = HEX_INS_RD___VMPYH__RS__RT______N__RND_SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vmpyh (R%d, R%d) %s:rnd:sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x50000e0) {
+					// Instruction: 14: 11100101N00sssssPP0ttttt111ddddd | Rdd = vmpyhsu (Rs, Rt) [:<<N]:sat
+					hi->instruction = HEX_INS_RDD___VMPYHSU__RS__RT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d = vmpyhsu (R%d, R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xf6020e0) == 0x76000a0) {
+					// Instruction: 14: 11100111N11sssssPP0ttttt101xxxxx | Rxx += vmpyhsu (Rs, Rt) [:<<N]:sat
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYHSU__RS__RT______N__SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					if ((((hi_u32) & 0x800000) >> 23)) {
+						hi->pf |= HEX_PF_LSH1; // [:<<1]
+					}
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d:R%d += vmpyhsu (R%d, R%d) %s:sat", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg, ((hi->pf & HEX_PF_LSH1) == HEX_PF_LSH1) ? ":<<1" : "");
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x8000040) {
+					// Instruction: 14: 11101000000sssssPP0ttttt010ddddd | Rdd = vrmpyh (Rss, Rtt)
+					hi->instruction = HEX_INS_RDD___VRMPYH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vrmpyh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0xa000040) {
+					// Instruction: 14: 11101010000sssssPP0ttttt010xxxxx | Rxx += vrmpyh (Rss, Rtt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VRMPYH__RSS__RTT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].attr |= HEX_OP_REG_PAIR;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8);
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vrmpyh (R%d:R%d, R%d:R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg + 1, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x5400020) {
+					// Instruction: 14: 11100101010sssssPP0ttttt001ddddd | Rdd = vmpybsu (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___VMPYBSU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmpybsu (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x5800020) {
+					// Instruction: 14: 11100101100sssssPP0ttttt001ddddd | Rdd = vmpybu (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___VMPYBU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vmpybu (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7800020) {
+					// Instruction: 14: 11100111100sssssPP0ttttt001xxxxx | Rxx += vmpybu (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYBU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vmpybu (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7c00020) {
+					// Instruction: 14: 11100111110sssssPP0ttttt001xxxxx | Rxx += vmpybsu (Rs, Rt)
+					hi->instruction = HEX_INS_RXX__PLUS_EQ__VMPYBSU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d += vmpybsu (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x5c000e0) {
+					// Instruction: 14: 11100101110sssssPP0ttttt111ddddd | Rdd = vpmpyh (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___VPMPYH__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = vpmpyh (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe020e0) == 0x7a000e0) {
+					// Instruction: 14: 11100111101sssssPP0ttttt111xxxxx | Rxx ^= vpmpyh (Rs, Rt)
+					hi->instruction = HEX_INS_RXX____VPMPYH__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d ^= vpmpyh (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				break;
+			}
+			case 0xf: {
+				if ((hi_u32 & 0xfe00000) == 0x3000000) {
+					// Instruction: 15: 11110011000sssssPP-ttttt---ddddd | Rd = add (Rs, Rt)
+					hi->instruction = HEX_INS_RD___ADD__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = add (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6400000) {
+					// Instruction: 15: 11110110010sssssPP-ttttt---ddddd | Rd = add (Rs, Rt) :sat
+					hi->instruction = HEX_INS_RD___ADD__RS__RT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = add (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1000000) {
+					// Instruction: 15: 11110001000sssssPP-ttttt---ddddd | Rd = and (Rs, Rt)
+					hi->instruction = HEX_INS_RD___AND__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = and (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1200000) {
+					// Instruction: 15: 11110001001sssssPP-ttttt---ddddd | Rd = or (Rs, Rt)
+					hi->instruction = HEX_INS_RD___OR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = or (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1600000) {
+					// Instruction: 15: 11110001011sssssPP-ttttt---ddddd | Rd = xor (Rs, Rt)
+					hi->instruction = HEX_INS_RD___XOR__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = xor (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1800000) {
+					// Instruction: 15: 11110001100sssssPP-ttttt---ddddd | Rd = and (Rt, ~Rs)
+					hi->instruction = HEX_INS_RD___AND__RT___RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = and (R%d, ~R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x1a00000) {
+					// Instruction: 15: 11110001101sssssPP-ttttt---ddddd | Rd = or (Rt, ~Rs)
+					hi->instruction = HEX_INS_RD___OR__RT___RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = or (R%d, ~R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3200000) {
+					// Instruction: 15: 11110011001sssssPP-ttttt---ddddd | Rd = sub (Rt, Rs)
+					hi->instruction = HEX_INS_RD___SUB__RT__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = sub (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6c00000) {
+					// Instruction: 15: 11110110110sssssPP-ttttt---ddddd | Rd = sub (Rt, Rs) :sat
+					hi->instruction = HEX_INS_RD___SUB__RT__RS___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = sub (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6000000) {
+					// Instruction: 15: 11110110000sssssPP-ttttt---ddddd | Rd = vaddh (Rs, Rt)
+					hi->instruction = HEX_INS_RD___VADDH__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vaddh (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6200000) {
+					// Instruction: 15: 11110110001sssssPP-ttttt---ddddd | Rd = vaddh (Rs, Rt) :sat
+					hi->instruction = HEX_INS_RD___VADDH__RS__RT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vaddh (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6600000) {
+					// Instruction: 15: 11110110011sssssPP-ttttt---ddddd | Rd = vadduh (Rs, Rt) :sat
+					hi->instruction = HEX_INS_RD___VADDUH__RS__RT___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vadduh (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf600000) == 0x7000000) {
+					// Instruction: 15: 11110111-00sssssPP-ttttt---ddddd | Rd = vavgh (Rs, Rt)
+					hi->instruction = HEX_INS_RD___VAVGH__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vavgh (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf600000) == 0x7200000) {
+					// Instruction: 15: 11110111-01sssssPP-ttttt---ddddd | Rd = vavgh (Rs, Rt) :rnd
+					hi->instruction = HEX_INS_RD___VAVGH__RS__RT___RND;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_RND; // :rnd
+					sprintf(hi->mnem, "R%d = vavgh (R%d, R%d) :rnd", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf600000) == 0x7600000) {
+					// Instruction: 15: 11110111-11sssssPP-ttttt---ddddd | Rd = vnavgh (Rt, Rs)
+					hi->instruction = HEX_INS_RD___VNAVGH__RT__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vnavgh (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6800000) {
+					// Instruction: 15: 11110110100sssssPP-ttttt---ddddd | Rd = vsubh (Rt, Rs)
+					hi->instruction = HEX_INS_RD___VSUBH__RT__RS_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = vsubh (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6a00000) {
+					// Instruction: 15: 11110110101sssssPP-ttttt---ddddd | Rd = vsubh (Rt, Rs) :sat
+					hi->instruction = HEX_INS_RD___VSUBH__RT__RS___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vsubh (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x6e00000) {
+					// Instruction: 15: 11110110111sssssPP-ttttt---ddddd | Rd = vsubuh (Rt, Rs) :sat
+					hi->instruction = HEX_INS_RD___VSUBUH__RT__RS___SAT;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					hi->pf |= HEX_PF_SAT; // :sat
+					sprintf(hi->mnem, "R%d = vsubuh (R%d, R%d) :sat", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3800000) {
+					// Instruction: 15: 11110011100sssssPP-ttttt---ddddd | Rd = combine (Rt.H, Rs.H)
+					hi->instruction = HEX_INS_RD___COMBINE__RT_H__RS_H_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = combine (R%d.H, R%d.H)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3a00000) {
+					// Instruction: 15: 11110011101sssssPP-ttttt---ddddd | Rd = combine (Rt.H, Rs.L)
+					hi->instruction = HEX_INS_RD___COMBINE__RT_H__RS_L_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = combine (R%d.H, R%d.L)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3c00000) {
+					// Instruction: 15: 11110011110sssssPP-ttttt---ddddd | Rd = combine (Rt.L, Rs.H)
+					hi->instruction = HEX_INS_RD___COMBINE__RT_L__RS_H_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = combine (R%d.L, R%d.H)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3e00000) {
+					// Instruction: 15: 11110011111sssssPP-ttttt---ddddd | Rd = combine (Rt.L, Rs.L)
+					hi->instruction = HEX_INS_RD___COMBINE__RT_L__RS_L_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = combine (R%d.L, R%d.L)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0x5000000) {
+					// Instruction: 15: 111101010--sssssPP-ttttt---ddddd | Rdd = combine (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___COMBINE__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = combine (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf000000) == 0x4000000) {
+					// Instruction: 15: 11110100---sssssPP-ttttt-uuddddd | Rd = mux (Pu, Rs, Rt)
+					hi->instruction = HEX_INS_RD___MUX__PU__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[1].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = mux (P%d, R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.pred, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf800000) == 0x5800000) {
+					// Instruction: 15: 111101011--sssssPP-ttttt---ddddd | Rdd = packhl (Rs, Rt)
+					hi->instruction = HEX_INS_RDD___PACKHL__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].attr |= HEX_OP_REG_PAIR;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d:R%d = packhl (R%d, R%d)", hi->ops[0].op.reg + 1, hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb000000) {
+					// Instruction: 15: 111110110-0sssssPP0ttttt0uuddddd | if (Pu) Rd = add (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU__RD___ADD__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = add (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb000080) {
+					// Instruction: 15: 111110110-0sssssPP0ttttt1uuddddd | if !Pu Rd = add (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___ADD__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = add (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb002000) {
+					// Instruction: 15: 111110110-0sssssPP1ttttt0uuddddd | if (Pu.new) Rd = add (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___ADD__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = add (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb002080) {
+					// Instruction: 15: 111110110-0sssssPP1ttttt1uuddddd | if !Pu.new Rd = add (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___ADD__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = add (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf002080) == 0xd000000) {
+					// Instruction: 15: 11111101---sssssPP0ttttt0uuddddd | if (Pu) Rdd = combine (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU__RDD___COMBINE__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d:R%d = combine (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf002080) == 0xd000080) {
+					// Instruction: 15: 11111101---sssssPP0ttttt1uuddddd | if !Pu Rdd = combine (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_RDD___COMBINE__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d:R%d = combine (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf002080) == 0xd002000) {
+					// Instruction: 15: 11111101---sssssPP1ttttt0uuddddd | if (Pu.new) Rdd = combine (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU_NEW__RDD___COMBINE__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d:R%d = combine (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf002080) == 0xd002080) {
+					// Instruction: 15: 11111101---sssssPP1ttttt1uuddddd | if !Pu.new Rdd = combine (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RDD___COMBINE__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].attr |= HEX_OP_REG_PAIR;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0);
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d:R%d = combine (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg + 1, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9000000) {
+					// Instruction: 15: 11111001-00sssssPP0ttttt0uuddddd | if (Pu) Rd = and (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU__RD___AND__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = and (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9000080) {
+					// Instruction: 15: 11111001-00sssssPP0ttttt1uuddddd | if !Pu Rd = and (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___AND__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = and (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9002000) {
+					// Instruction: 15: 11111001-00sssssPP1ttttt0uuddddd | if (Pu.new) Rd = and (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___AND__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = and (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9002080) {
+					// Instruction: 15: 11111001-00sssssPP1ttttt1uuddddd | if !Pu.new Rd = and (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___AND__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = and (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9200000) {
+					// Instruction: 15: 11111001-01sssssPP0ttttt0uuddddd | if (Pu) Rd = or (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU__RD___OR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = or (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9200080) {
+					// Instruction: 15: 11111001-01sssssPP0ttttt1uuddddd | if !Pu Rd = or (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___OR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = or (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9202000) {
+					// Instruction: 15: 11111001-01sssssPP1ttttt0uuddddd | if (Pu.new) Rd = or (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___OR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = or (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9202080) {
+					// Instruction: 15: 11111001-01sssssPP1ttttt1uuddddd | if !Pu.new Rd = or (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___OR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = or (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9600000) {
+					// Instruction: 15: 11111001-11sssssPP0ttttt0uuddddd | if (Pu) Rd = xor (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU__RD___XOR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = xor (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9600080) {
+					// Instruction: 15: 11111001-11sssssPP0ttttt1uuddddd | if !Pu Rd = xor (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___XOR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = xor (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9602000) {
+					// Instruction: 15: 11111001-11sssssPP1ttttt0uuddddd | if (Pu.new) Rd = xor (Rs, Rt)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___XOR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = xor (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf602080) == 0x9602080) {
+					// Instruction: 15: 11111001-11sssssPP1ttttt1uuddddd | if !Pu.new Rd = xor (Rs, Rt)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___XOR__RS__RT_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = xor (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb200000) {
+					// Instruction: 15: 111110110-1sssssPP0ttttt0uuddddd | if (Pu) Rd = sub (Rt, Rs)
+					hi->instruction = HEX_INS_IF__PU__RD___SUB__RT__RS_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE; // if (Pu)
+					sprintf(hi->mnem, "if (P%d) R%d = sub (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb200080) {
+					// Instruction: 15: 111110110-1sssssPP0ttttt1uuddddd | if !Pu Rd = sub (Rt, Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_RD___SUB__RT__RS_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE; // if !Pu 
+					sprintf(hi->mnem, "if !P%d R%d = sub (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb202000) {
+					// Instruction: 15: 111110110-1sssssPP1ttttt0uuddddd | if (Pu.new) Rd = sub (Rt, Rs)
+					hi->instruction = HEX_INS_IF__PU_NEW__RD___SUB__RT__RS_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_TRUE_NEW; // if (Pu.new)
+					sprintf(hi->mnem, "if (P%d.new) R%d = sub (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfa02080) == 0xb202080) {
+					// Instruction: 15: 111110110-1sssssPP1ttttt1uuddddd | if !Pu.new Rd = sub (Rt, Rs)
+					hi->instruction = HEX_INS_IF__NOT_PU_NEW_RD___SUB__RT__RS_;
+					hi->op_count = 4;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x60) >> 5);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->ops[3].type = HEX_OP_TYPE_REG;
+					hi->ops[3].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->predicate = HEX_PRED_FALSE_NEW; // if !Pu.new
+					sprintf(hi->mnem, "if !P%d.new R%d = sub (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg, hi->ops[3].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf60001c) == 0x2000000) {
+					// Instruction: 15: 11110010-00sssssPP-ttttt---000dd | Pd = cmp.eq (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMP_EQ__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.eq (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf60001c) == 0x2000010) {
+					// Instruction: 15: 11110010-00sssssPP-ttttt---100dd | Pd = !cmp.eq (Rs, Rt)
+					hi->instruction = HEX_INS_PD____NOT_CMP_EQ__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !cmp.eq (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf60001c) == 0x2400000) {
+					// Instruction: 15: 11110010-10sssssPP-ttttt---000dd | Pd = cmp.gt (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMP_GT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.gt (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf60001c) == 0x2400010) {
+					// Instruction: 15: 11110010-10sssssPP-ttttt---100dd | Pd = !cmp.gt (Rs, Rt)
+					hi->instruction = HEX_INS_PD____NOT_CMP_GT__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !cmp.gt (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf60001c) == 0x2600000) {
+					// Instruction: 15: 11110010-11sssssPP-ttttt---000dd | Pd = cmp.gtu (Rs, Rt)
+					hi->instruction = HEX_INS_PD___CMP_GTU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = cmp.gtu (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xf60001c) == 0x2600010) {
+					// Instruction: 15: 11110010-11sssssPP-ttttt---100dd | Pd = !cmp.gtu (Rs, Rt)
+					hi->instruction = HEX_INS_PD____NOT_CMP_GTU__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_PREDICATE;
+					hi->ops[0].op.pred = (((hi_u32) & 0x3) >> 0);
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "P%d = !cmp.gtu (R%d, R%d)", hi->ops[0].op.pred, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3400000) {
+					// Instruction: 15: 11110011010sssssPP-ttttt---ddddd | Rd = cmp.eq (Rs, Rt)
+					hi->instruction = HEX_INS_RD___CMP_EQ__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = cmp.eq (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				if ((hi_u32 & 0xfe00000) == 0x3600000) {
+					// Instruction: 15: 11110011011sssssPP-ttttt---ddddd | Rd = !cmp.eq (Rs, Rt)
+					hi->instruction = HEX_INS_RD____NOT_CMP_EQ__RS__RT_;
+					hi->op_count = 3;
+					hi->ops[0].type = HEX_OP_TYPE_REG;
+					hi->ops[0].op.reg = (((hi_u32) & 0x1f) >> 0); // Rd
+					hi->ops[1].type = HEX_OP_TYPE_REG;
+					hi->ops[1].op.reg = (((hi_u32) & 0x1f0000) >> 16); // Rs
+					hi->ops[2].type = HEX_OP_TYPE_REG;
+					hi->ops[2].op.reg = (((hi_u32) & 0x1f00) >> 8); // Rt
+					hi->predicate = HEX_NOPRED;
+					sprintf(hi->mnem, "R%d = !cmp.eq (R%d, R%d)", hi->ops[0].op.reg, hi->ops[1].op.reg, hi->ops[2].op.reg);
+					break;
+				}
+				break;
+			}
+		}
+	}
+	return 4;
+}
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon.h radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon.h
--- radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,277 @@
+// Predicates - declare the predicate state
+typedef enum {
+	HEX_NOPRED, // no conditional execution
+	HEX_PRED_TRUE, // if (Pd) ...
+	HEX_PRED_FALSE, // if (!Pd) ...
+	HEX_PRED_TRUE_NEW, // if (Pd.new) ...
+	HEX_PRED_FALSE_NEW, // if (!Pd.new) ...
+} HexPred;
+
+// Pre/post-fixes, different types
+typedef enum {
+	HEX_PF_RND = 1, // :rnd
+	HEX_PF_CRND = 1<<1, // :crnd
+	HEX_PF_RAW = 1<<2, // :raw
+	HEX_PF_CHOP = 1<<3, // :chop
+	HEX_PF_SAT = 1<<4, // :sat
+	HEX_PF_HI = 1<<5, // :hi
+	HEX_PF_LO = 1<<6, // :lo
+	HEX_PF_LSH1 = 1<<7, // :<<1
+	HEX_PF_LSH16 = 1<<8, // :<<16
+	HEX_PF_RSH1 = 1<<9, // :>>1
+	HEX_PF_NEG = 1<<10, // :neg
+	HEX_PF_POS = 1<<11, // :pos
+	HEX_PF_SCALE = 1<<12, // :scale, for FMA instructions
+	HEX_PF_DEPRECATED = 1<<15, // :deprecated
+} HexPf;
+
+typedef enum {
+	HEX_OP_TYPE_IMM,
+	HEX_OP_TYPE_REG,
+	HEX_OP_TYPE_PREDICATE,
+	HEX_OP_TYPE_CONTROL,
+	HEX_OP_TYPE_SYSTEM,
+	HEX_OP_TYPE_OPT, // Do not really use in the C code
+} HexOpType;
+
+// Attributes - .H/.L, const extender
+typedef enum {
+	HEX_OP_CONST_EXT = 1 << 0, // Constant extender marker for Immediate
+	HEX_OP_REG_HI = 1 << 1, // Rn.H marker
+	HEX_OP_REG_LO = 1 << 2, // Rn.L marker
+	HEX_OP_REG_PAIR = 1 << 3, // Is this a register pair?
+} HexOpAttr;
+
+typedef struct {
+	ut8 type;
+	union {
+		ut8 reg; // + additional Hi or Lo selector // + additional shift // + additional :brev //
+		ut32 imm;
+		ut8 pred; // predicates - P0-P3 registers
+		ut8 cr; // control register
+		ut8 sys; // system control register
+	} op;
+	ut8 attr;
+} HexOp;
+
+typedef struct {
+	int instruction;
+	ut32 mask;
+	HexPred predicate; // predicate set if set
+	ut16 pf; // additional prefixes (bitmap)
+	bool duplex; // is part of duplex container?
+	bool compound; // is part of compound instruction?
+	bool last; // is last in instruction packet?
+	int shift; // Optional shift left is it true?
+	ut8 op_count;
+	HexOp ops[6];
+	char mnem[128]; // Instruction mnemonic
+} HexInsn;
+
+// Instruction container (currently only 2 instructions)
+// Can handle duplexes
+typedef struct {
+	bool duplex;
+	HexInsn ins[2]; // Or make it pointer + size?
+} HexInsnCont;
+
+// Instruction packet (Maximum - 4 instructions)
+// Can handle up to 4 instructions or 1 duplex + 2 instructions
+// Can have a loop marks
+typedef struct {
+	bool loop0; // :endloop0 marker
+	bool loop1; // :endloop1 marker
+	int cont_cnt;
+	HexInsnCont ins[4]; // Or make it pointer + size?
+} HexInsnPkt;
+
+typedef enum {
+	HEX_INSN_CLASS_CEXT = 0, // Constant extender
+	HEX_INSN_CLASS_J1 = 1, // Jump
+	HEX_INSN_CLASS_J2 = 2, // Jump
+	HEX_INSN_CLASS_LD_ST = 3, // Load/Store
+	HEX_INSN_CLASS_LD_ST_COND_GP = 4, // Load/Store conditional or GP relative
+	HEX_INSN_CLASS_J3 = 5, // Jump
+	HEX_INSN_CLASS_CR = 6, // Control register instructions
+	HEX_INSN_CLASS_ALU32 = 7, // ALU32
+	HEX_INSN_CLASS_XTYPE = 8, // XTYPE
+	HEX_INSN_CLASS_LD = 9, // Just load instructions
+	HEX_INSN_CLASS_ST = 10, // Just store instructions
+	HEX_INSN_CLASS_ALU32_1 = 11, // ALU32
+	HEX_INSN_CLASS_XTYPE_1 = 12, // XTYPE again
+	HEX_INSN_CLASS_XTYPE_2 = 13, // XTYPE one more time
+	HEX_INSN_CLASS_XTYPE_3 = 14, // And again, XTYPE
+	HEX_INSN_CLASS_ALU32_2 = 12, // ALU32 again
+} HEX_INSN_CLASS;
+
+typedef enum {
+	HEX_REG_R0 = 0,
+	HEX_REG_R1 = 1,
+	HEX_REG_R2 = 2,
+	HEX_REG_R3 = 3,
+	HEX_REG_R4 = 4,
+	HEX_REG_R5 = 5,
+	HEX_REG_R6 = 6,
+	HEX_REG_R7 = 7,
+	HEX_REG_R8 = 8,
+	HEX_REG_R9 = 9,
+	HEX_REG_R10 = 10,
+	HEX_REG_R11 = 11,
+	HEX_REG_R12 = 12,
+	HEX_REG_R13 = 13,
+	HEX_REG_R14 = 14,
+	HEX_REG_R15 = 15,
+	HEX_REG_R16 = 16,
+	HEX_REG_R17 = 17,
+	HEX_REG_R18 = 18,
+	HEX_REG_R19 = 19,
+	HEX_REG_R20 = 20,
+	HEX_REG_R21 = 21,
+	HEX_REG_R22 = 22,
+	HEX_REG_R23 = 23,
+	HEX_REG_R24 = 24,
+	HEX_REG_R25 = 25,
+	HEX_REG_R26 = 26,
+	HEX_REG_R27 = 27,
+	HEX_REG_R28 = 28,
+	HEX_REG_R29 = 29,
+	HEX_REG_R30 = 30,
+	HEX_REG_R31 = 31,
+} HEX_REG;
+
+// TODO: Also add regpair values
+
+// Control registers
+typedef enum {
+	// Loop registers
+	HEX_REG_SA0 = 0, // C0
+	HEX_REG_LC0 = 1, // C1
+	HEX_REG_SA1 = 2, // C2
+	HEX_REG_LC1 = 3, // C3
+	HEX_REG_P = 4, // C4 - 4 of 8bit registers
+	// C5 is reserved
+	// Modifier registers
+	HEX_REG_M0 = 6, // C6
+	HEX_REG_M1 = 7, // C7
+	HEX_REG_USR = 8, // C8 // User Status Register
+	HEX_REG_PC = 9, // C9 // Program counter
+	HEX_REG_UGP = 10, // C10 // User General Pointer
+	HEX_REG_GP = 11, // C11 // Global Pointer
+	// Circular Start registers
+	HEX_REG_CS0 = 12, // C12
+	HEX_REG_CS1 = 13, // C13
+	// Cycle Count registers
+	HEX_REG_UPCYCLELO = 14, // C14
+	HEX_REG_UPCYCLEHI = 15, // C15
+	HEX_REG_FRAMELIMIT = 16, // C16 // Stack Bounds register
+	HEX_REG_FRAMEKEY = 17, // C17 // Stack Smash register
+	// Packet Count registers
+	HEX_REG_PKTCOUNTLO = 18, // C18
+	HEX_REG_PKTCOUNTHI = 19, // C19
+	// C20 - C29 are reserved
+	// Qtimer registers
+	HEX_REG_UTIMERLO = 30, // C30
+	HEX_REG_UTIMERHI = 31, // C31
+} HEX_CR_REG;
+
+// Supervisor control registers
+typedef enum {
+	HEX_REG_SGP0 = 0, // S0
+	HEX_REG_SGP1 = 1, // S1
+	HEX_REG_STID = 2, // S2
+	HEX_REG_ELR = 3, // S3
+	HEX_REG_BADVA0 = 4, // S4
+	HEX_REG_BADVA1 = 5, // S5
+	HEX_REG_SSR = 6, // S6
+	HEX_REG_CCR = 7, // S7
+	HEX_REG_HTID = 8, // S8
+	HEX_REG_BADVA = 9, // S9
+	HEX_REG_IMASK = 10, // S10
+	// S11 - S15 are reserved
+	HEX_REG_EVB = 16, // S16
+	HEX_REG_MODECTL = 17, // S17
+	HEX_REG_SYSCFG = 18, // S18
+	// S19 is reserved
+	HEX_REG_IPEND = 20, // S20
+	HEX_REG_VID = 21, // S21
+	HEX_REG_IAD = 22, // S22
+	// S23 is reserved
+	HEX_REG_IEL = 24, // S24
+	// S25 is reserved
+	HEX_REG_IAHL = 26, // S26
+	HEX_REG_CFGBASE = 27, // S27
+	HEX_REG_DIAG = 28, // S28
+	HEX_REG_REV = 29, // S29
+	HEX_REG_PCYCLELO = 30,  // S30
+	HEX_REG_PCYCLEHI = 31, // S31
+	HEX_REG_ISDBST = 32, // S32
+	HEX_REG_ISDBCFG0 = 33, // S33
+	HEX_REG_ISDBCFG1 = 34, // S34
+	// S35 is reserved
+	HEX_REG_BRKPTPC0 = 36, // S36
+	HEX_REG_BRKPTCFG0 = 37, // S37
+	HEX_REG_BRKPTPC1 = 38, // S38
+	HEX_REG_BRKPTCFG1 = 39, // S39
+	HEX_REG_ISDBMBXIN = 40, // S40
+	HEX_REG_ISDBMBXOUT = 41, // S41
+	HEX_REG_ISDBEN = 42, // S42
+	HEX_REG_ISDBGPR = 43, // S43
+	// S44 - S47 are reserved
+	HEX_REG_PMUCNT0 = 48, // S48
+	HEX_REG_PMUCNT1 = 49, // S49
+	HEX_REG_PMUCNT2 = 50, // S50
+	HEX_REG_PMUCNT3 = 51, // S51
+	HEX_REG_PMUEVTCFG = 52, // S52
+	HEX_REG_PMUCFG = 53, // S53
+	// S54 - S63 are reserved
+} HEX_SYSCR_REG;
+
+// Here are the register field values for subinstructions
+
+typedef enum {
+	HEX_SUB_REG_R0 = 0, // 0b0000
+	HEX_SUB_REG_R1 = 1, // 0b0001
+	HEX_SUB_REG_R2 = 2, // 0b0010
+	HEX_SUB_REG_R3 = 3, // 0b0011
+	HEX_SUB_REG_R4 = 4, // 0b0100
+	HEX_SUB_REG_R5 = 5, // 0b0101
+	HEX_SUB_REG_R6 = 6, // 0b0110
+	HEX_SUB_REG_R7 = 7, // 0b0111
+	HEX_SUB_REG_R16 = 8, // 0b1000
+	HEX_SUB_REG_R17 = 9, // 0b1001
+	HEX_SUB_REG_R18 = 10, // 0b1010
+	HEX_SUB_REG_R19 = 11, // 0b1011
+	HEX_SUB_REG_R20 = 12, // 0b1100
+	HEX_SUB_REG_R21 = 13, // 0b1101
+	HEX_SUB_REG_R22 = 14, // 0b1110
+	HEX_SUB_REG_R23 = 15, // 0b1111
+} HEX_SUB_REG;
+
+
+typedef enum {
+	HEX_SUB_REGPAIR_R1_R0 = 0, // 0b000
+	HEX_SUB_REGPAIR_R3_R2 = 1, // 0b001
+	HEX_SUB_REGPAIR_R5_R4 = 2, // 0b010
+	HEX_SUB_REGPAIR_R7_R6 = 3, // 0b011
+	HEX_SUB_REGPAIR_R17_R16 = 4, // 0b100
+	HEX_SUB_REGPAIR_R19_R18 = 5, // 0b101
+	HEX_SUB_REGPAIR_R21_R20 = 6, // 0b110
+	HEX_SUB_REGPAIR_R23_R22 = 7, // 0b111
+} HEX_SUB_REGPAIR;
+
+
+#define BIT_MASK(len) (BIT(len)-1)
+#define BF_MASK(start, len) (BIT_MASK(len)<<(start))
+#define BF_PREP(x, start, len) (((x)&BIT_MASK(len))<<(start))
+#define BF_GET(y, start, len) (((y)>>(start)) & BIT_MASK(len))
+#define BF_GETB(y, start, end) (BF_GET((y), (start), (end) - (start) + 1)
+
+char* hex_get_cntl_reg(int opreg);
+char* hex_get_sys_reg(int opreg);
+char* hex_get_sub_reg(int opreg);
+char* hex_get_sub_regpair(int opreg);
+bool hex_if_duplex(ut32 insn_word);
+void hex_op_extend(HexOp *op);
+void hex_op_extend_off(HexOp *op, int offset);
+int hexagon_disasm_instruction(ut32 hi_u32, HexInsn *hi);
+
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon_insn.h radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon_insn.h
--- radare2-2.3.0+dfsg/libr/asm/arch/hexagon/hexagon_insn.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/hexagon/hexagon_insn.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2802 @@
+enum HEX_INS {
+	HEX_INS_UNKNOWN,
+	HEX_INS_IMMEXT,
+	HEX_INS_RD___ADD__RS___S16_,
+	HEX_INS_RD___ADD__RS__RT_,
+	HEX_INS_RD___ADD__RS__RT___SAT,
+	HEX_INS_RD___AND__RS___S10_,
+	HEX_INS_RD___OR__RS___S10_,
+	HEX_INS_RD___AND__RS__RT_,
+	HEX_INS_RD___OR__RS__RT_,
+	HEX_INS_RD___XOR__RS__RT_,
+	HEX_INS_RD___AND__RT___RS_,
+	HEX_INS_RD___OR__RT___RS_,
+	HEX_INS_NOP,
+	HEX_INS_RD___SUB___S10__RS_,
+	HEX_INS_RD___SUB__RT__RS_,
+	HEX_INS_RD___SUB__RT__RS___SAT,
+	HEX_INS_RD___SXTB__RS_,
+	HEX_INS_RD___SXTH__RS_,
+	HEX_INS_RX_L____U16,
+	HEX_INS_RX_H____U16,
+	HEX_INS_RD____S16,
+	HEX_INS_RD___RS,
+	HEX_INS_RD___VADDH__RS__RT_,
+	HEX_INS_RD___VADDH__RS__RT___SAT,
+	HEX_INS_RD___VADDUH__RS__RT___SAT,
+	HEX_INS_RD___VAVGH__RS__RT_,
+	HEX_INS_RD___VAVGH__RS__RT___RND,
+	HEX_INS_RD___VNAVGH__RT__RS_,
+	HEX_INS_RD___VSUBH__RT__RS_,
+	HEX_INS_RD___VSUBH__RT__RS___SAT,
+	HEX_INS_RD___VSUBUH__RT__RS___SAT,
+	HEX_INS_RD___ZXTH__RS_,
+	HEX_INS_RDD___COMBINE__RS___S8_,
+	HEX_INS_RDD___COMBINE___S8__RS_,
+	HEX_INS_RDD___COMBINE___S8___S8_,
+	HEX_INS_RDD___COMBINE___S8___U6_,
+	HEX_INS_RD___COMBINE__RT_H__RS_H_,
+	HEX_INS_RD___COMBINE__RT_H__RS_L_,
+	HEX_INS_RD___COMBINE__RT_L__RS_H_,
+	HEX_INS_RD___COMBINE__RT_L__RS_L_,
+	HEX_INS_RDD___COMBINE__RS__RT_,
+	HEX_INS_RD___MUX__PU__RS___S8_,
+	HEX_INS_RD___MUX__PU___S8__RS_,
+	HEX_INS_RD___MUX__PU___S8___S8_,
+	HEX_INS_RD___MUX__PU__RS__RT_,
+	HEX_INS_RD___ASLH__RS_,
+	HEX_INS_RD___ASRH__RS_,
+	HEX_INS_RDD___PACKHL__RS__RT_,
+	HEX_INS_IF__PU__RD___ADD__RS___S8_,
+	HEX_INS_IF__PU_NEW__RD___ADD__RS___S8_,
+	HEX_INS_IF__NOT_PU_RD___ADD__RS___S8_,
+	HEX_INS_IF__NOT_PU_NEW_RD___ADD__RS___S8_,
+	HEX_INS_IF__PU__RD___ADD__RS__RT_,
+	HEX_INS_IF__NOT_PU_RD___ADD__RS__RT_,
+	HEX_INS_IF__PU_NEW__RD___ADD__RS__RT_,
+	HEX_INS_IF__NOT_PU_NEW_RD___ADD__RS__RT_,
+	HEX_INS_IF__PU__RD___ASLH__RS_,
+	HEX_INS_IF__PU_NEW__RD___ASLH__RS_,
+	HEX_INS_IF__NOT_PU_RD___ASLH__RS_,
+	HEX_INS_IF__NOT_PU_NEW_RD___ASLH__RS_,
+	HEX_INS_IF__PU__RD___ASRH__RS_,
+	HEX_INS_IF__PU_NEW__RD___ASRH__RS_,
+	HEX_INS_IF__NOT_PU_RD___ASRH__RS_,
+	HEX_INS_IF__NOT_PU_NEW_RD___ASRH__RS_,
+	HEX_INS_IF__PU__RDD___COMBINE__RS__RT_,
+	HEX_INS_IF__NOT_PU_RDD___COMBINE__RS__RT_,
+	HEX_INS_IF__PU_NEW__RDD___COMBINE__RS__RT_,
+	HEX_INS_IF__NOT_PU_NEW_RDD___COMBINE__RS__RT_,
+	HEX_INS_IF__PU__RD___AND__RS__RT_,
+	HEX_INS_IF__NOT_PU_RD___AND__RS__RT_,
+	HEX_INS_IF__PU_NEW__RD___AND__RS__RT_,
+	HEX_INS_IF__NOT_PU_NEW_RD___AND__RS__RT_,
+	HEX_INS_IF__PU__RD___OR__RS__RT_,
+	HEX_INS_IF__NOT_PU_RD___OR__RS__RT_,
+	HEX_INS_IF__PU_NEW__RD___OR__RS__RT_,
+	HEX_INS_IF__NOT_PU_NEW_RD___OR__RS__RT_,
+	HEX_INS_IF__PU__RD___XOR__RS__RT_,
+	HEX_INS_IF__NOT_PU_RD___XOR__RS__RT_,
+	HEX_INS_IF__PU_NEW__RD___XOR__RS__RT_,
+	HEX_INS_IF__NOT_PU_NEW_RD___XOR__RS__RT_,
+	HEX_INS_IF__PU__RD___SUB__RT__RS_,
+	HEX_INS_IF__NOT_PU_RD___SUB__RT__RS_,
+	HEX_INS_IF__PU_NEW__RD___SUB__RT__RS_,
+	HEX_INS_IF__NOT_PU_NEW_RD___SUB__RT__RS_,
+	HEX_INS_IF__PU__RD___SXTB__RS_,
+	HEX_INS_IF__PU_NEW__RD___SXTB__RS_,
+	HEX_INS_IF__NOT_PU_RD___SXTB__RS_,
+	HEX_INS_IF__NOT_PU_NEW_RD___SXTB__RS_,
+	HEX_INS_IF__PU__RD___SXTH__RS_,
+	HEX_INS_IF__PU_NEW__RD___SXTH__RS_,
+	HEX_INS_IF__NOT_PU_RD___SXTH__RS_,
+	HEX_INS_IF__NOT_PU_NEW_RD___SXTH__RS_,
+	HEX_INS_IF__PU__RD____S12,
+	HEX_INS_IF__PU_NEW__RD____S12,
+	HEX_INS_IF__NOT_PU_RD____S12,
+	HEX_INS_IF__NOT_PU_NEW_RD____S12,
+	HEX_INS_IF__PU__RD___ZXTB__RS_,
+	HEX_INS_IF__PU_NEW__RD___ZXTB__RS_,
+	HEX_INS_IF__NOT_PU_RD___ZXTB__RS_,
+	HEX_INS_IF__NOT_PU_NEW_RD___ZXTB__RS_,
+	HEX_INS_IF__PU__RD___ZXTH__RS_,
+	HEX_INS_IF__PU_NEW__RD___ZXTH__RS_,
+	HEX_INS_IF__NOT_PU_RD___ZXTH__RS_,
+	HEX_INS_IF__NOT_PU_NEW_RD___ZXTH__RS_,
+	HEX_INS_PD___CMP_EQ__RS___S10_,
+	HEX_INS_PD____NOT_CMP_EQ__RS___S10_,
+	HEX_INS_PD___CMP_GT__RS___S10_,
+	HEX_INS_PD____NOT_CMP_GT__RS___S10_,
+	HEX_INS_PD___CMP_GTU__RS___U9_,
+	HEX_INS_PD____NOT_CMP_GTU__RS___U9_,
+	HEX_INS_PD___CMP_EQ__RS__RT_,
+	HEX_INS_PD____NOT_CMP_EQ__RS__RT_,
+	HEX_INS_PD___CMP_GT__RS__RT_,
+	HEX_INS_PD____NOT_CMP_GT__RS__RT_,
+	HEX_INS_PD___CMP_GTU__RS__RT_,
+	HEX_INS_PD____NOT_CMP_GTU__RS__RT_,
+	HEX_INS_RD___CMP_EQ__RS___S8_,
+	HEX_INS_RD____NOT_CMP_EQ__RS___S8_,
+	HEX_INS_RD___CMP_EQ__RS__RT_,
+	HEX_INS_RD____NOT_CMP_EQ__RS__RT_,
+	HEX_INS_PD___FASTCORNER9__PS__PT_,
+	HEX_INS_PD____NOT_FASTCORNER9__PS__PT_,
+	HEX_INS_PD___ANY8__PS_,
+	HEX_INS_PD___ALL8__PS_,
+	HEX_INS_LOOP0___R7_2__RS_,
+	HEX_INS_LOOP1___R7_2__RS_,
+	HEX_INS_LOOP0___R7_2___U10_,
+	HEX_INS_LOOP1___R7_2___U10_,
+	HEX_INS_RD___ADD__PC___U6_,
+	HEX_INS_P3___SP1LOOP0___R7_2__RS_,
+	HEX_INS_P3___SP2LOOP0___R7_2__RS_,
+	HEX_INS_P3___SP3LOOP0___R7_2__RS_,
+	HEX_INS_P3___SP1LOOP0___R7_2___U10_,
+	HEX_INS_P3___SP2LOOP0___R7_2___U10_,
+	HEX_INS_P3___SP3LOOP0___R7_2___U10_,
+	HEX_INS_PD___AND__PT__PS_,
+	HEX_INS_PD___AND__PS__AND__PT__PU__,
+	HEX_INS_PD___OR__PT__PS_,
+	HEX_INS_PD___AND__PS__OR__PT__PU__,
+	HEX_INS_PD___XOR__PS__PT_,
+	HEX_INS_PD___OR__PS__AND__PT__PU__,
+	HEX_INS_PD___AND__PT___NOT_PS_,
+	HEX_INS_PD___OR__PS__OR__PT__PU__,
+	HEX_INS_PD___AND__PS__AND__PT___NOT_PU__,
+	HEX_INS_PD___AND__PS__OR__PT___NOT_PU__,
+	HEX_INS_PD___NOT__PS_,
+	HEX_INS_PD___OR__PS__AND__PT___NOT_PU__,
+	HEX_INS_PD___OR__PT___NOT_PS_,
+	HEX_INS_PD___OR__PS__OR__PT___NOT_PU__,
+	HEX_INS_CD___RS,
+	HEX_INS_CDD___RSS,
+	HEX_INS_RDD___CSS,
+	HEX_INS_RD___CS,
+	HEX_INS_CALLR_RS,
+	HEX_INS_IF__PU__CALLR_RS,
+	HEX_INS_IF__NOT_PU_CALLR_RS,
+	HEX_INS_HINTJR__RS_,
+	HEX_INS_JUMPR_RS,
+	HEX_INS_IF__PU__JUMPR_NT_RS,
+	HEX_INS_IF__PU_NEW__JUMPR_NT_RS,
+	HEX_INS_IF__PU__JUMPR_T_RS,
+	HEX_INS_IF__PU_NEW__JUMPR_T_RS,
+	HEX_INS_IF__NOT_PU_JUMPR_NT_RS,
+	HEX_INS_IF__NOT_PU_NEW_JUMPR_NT_RS,
+	HEX_INS_IF__NOT_PU_JUMPR_T_RS,
+	HEX_INS_IF__NOT_PU_NEW_JUMPR_T_RS,
+	HEX_INS_CALL__R22_2,
+	HEX_INS_IF__PU__CALL__R15_2,
+	HEX_INS_IF__NOT_PU_CALL__R15_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS____1____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS____1____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___TSTBIT__RS___0____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS____1____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS____1____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___TSTBIT__RS___0____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS____1____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS____1____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___TSTBIT__RS___0____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS____1____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS____1____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___TSTBIT__RS___0____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS___U5____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS___U5____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS___U5____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS____1____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS____1____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___TSTBIT__RS___0____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS____1____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS____1____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___TSTBIT__RS___0____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS____1____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS____1____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___TSTBIT__RS___0____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS____1____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS____1____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___TSTBIT__RS___0____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS___U5____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS___U5____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS___U5____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_EQ__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_EQ__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS__RT____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS__RT____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS__RT____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS__RT____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GT__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GT__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF__P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF__P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF__P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF__P1_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF___NOT_P0_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF___NOT_P1_NEW__JUMP_NT__R9_2,
+	HEX_INS_MULT_P0___CMP_GTU__RS__RT____IF___NOT_P0_NEW__JUMP_T__R9_2,
+	HEX_INS_MULT_P1___CMP_GTU__RS__RT____IF___NOT_P1_NEW__JUMP_T__R9_2,
+	HEX_INS_JUMP__R22_2,
+	HEX_INS_IF__PU__JUMP_NT__R15_2,
+	HEX_INS_IF__PU__JUMP_T__R15_2,
+	HEX_INS_IF__NOT_PU_JUMP_NT__R15_2,
+	HEX_INS_IF__NOT_PU_JUMP_T__R15_2,
+	HEX_INS_IF__PU_NEW__JUMP_NT__R15_2,
+	HEX_INS_IF__PU_NEW__JUMP_T__R15_2,
+	HEX_INS_IF__NOT_PU_NEW_JUMP_NT__R15_2,
+	HEX_INS_IF__NOT_PU_NEW_JUMP_T__R15_2,
+	HEX_INS_IF__RS__NOT____0__JUMP_NT__R13_2,
+	HEX_INS_IF__RS__NOT____0__JUMP_T__R13_2,
+	HEX_INS_IF__RS_GT_EQ___0__JUMP_NT__R13_2,
+	HEX_INS_IF__RS_GT_EQ___0__JUMP_T__R13_2,
+	HEX_INS_IF__RS__EQ___0__JUMP_NT__R13_2,
+	HEX_INS_IF__RS__EQ___0__JUMP_T__R13_2,
+	HEX_INS_IF__RS_LT_EQ___0__JUMP_NT__R13_2,
+	HEX_INS_IF__RS_LT_EQ___0__JUMP_T__R13_2,
+	HEX_INS_MULT_RD____U6___JUMP__R9_2,
+	HEX_INS_MULT_RD___RS___JUMP__R9_2,
+	HEX_INS_RDD___MEMD__RS___RT_____U2_,
+	HEX_INS_RDD___MEMD__GP____U16_3_,
+	HEX_INS_RDD___MEMD__RS____S11_3_,
+	HEX_INS_RDD___MEMD__RX_____S4_3_CIRC__MU__,
+	HEX_INS_RDD___MEMD__RX____I_CIRC__MU__,
+	HEX_INS_RDD___MEMD__RE____U6_,
+	HEX_INS_RDD___MEMD__RX_____S4_3_,
+	HEX_INS_RDD___MEMD__RT_____U2____U6_,
+	HEX_INS_RDD___MEMD__RX____MU_,
+	HEX_INS_RDD___MEMD__RX____MU_BREV_,
+	HEX_INS_IF__PV__RDD___MEMD__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_RDD___MEMD__RS___RT_____U2_,
+	HEX_INS_IF__PV_NEW__RDD___MEMD__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_NEW_RDD___MEMD__RS___RT_____U2_,
+	HEX_INS_IF__PT__RDD___MEMD__RS____U6_3_,
+	HEX_INS_IF__PT_NEW__RDD___MEMD__RS____U6_3_,
+	HEX_INS_IF__NOT_PT_RDD___MEMD__RS____U6_3_,
+	HEX_INS_IF__NOT_PT_NEW_RDD___MEMD__RS____U6_3_,
+	HEX_INS_IF__PT__RDD___MEMD__RX_____S4_3_,
+	HEX_INS_IF__NOT_PT_RDD___MEMD__RX_____S4_3_,
+	HEX_INS_IF__PT_NEW__RDD___MEMD__RX_____S4_3_,
+	HEX_INS_IF__NOT_PT_NEW_RDD___MEMD__RX_____S4_3_,
+	HEX_INS_IF__PT__RDD___MEMD___U6_,
+	HEX_INS_IF__NOT_PT_RDD___MEMD___U6_,
+	HEX_INS_IF__PT_NEW__RDD___MEMD___U6_,
+	HEX_INS_IF__NOT_PT_NEW_RDD___MEMD___U6_,
+	HEX_INS_RD___MEMB__RS___RT_____U2_,
+	HEX_INS_RD___MEMB__GP____U16_0_,
+	HEX_INS_RD___MEMB__RS____S11_0_,
+	HEX_INS_RD___MEMB__RX_____S4_0_CIRC__MU__,
+	HEX_INS_RD___MEMB__RX____I_CIRC__MU__,
+	HEX_INS_RD___MEMB__RE____U6_,
+	HEX_INS_RD___MEMB__RX_____S4_0_,
+	HEX_INS_RD___MEMB__RT_____U2____U6_,
+	HEX_INS_RD___MEMB__RX____MU_,
+	HEX_INS_RD___MEMB__RX____MU_BREV_,
+	HEX_INS_IF__PV__RD___MEMB__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_RD___MEMB__RS___RT_____U2_,
+	HEX_INS_IF__PV_NEW__RD___MEMB__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_NEW_RD___MEMB__RS___RT_____U2_,
+	HEX_INS_IF__PT__RD___MEMB__RS____U6_0_,
+	HEX_INS_IF__PT_NEW__RD___MEMB__RS____U6_0_,
+	HEX_INS_IF__NOT_PT_RD___MEMB__RS____U6_0_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMB__RS____U6_0_,
+	HEX_INS_IF__PT__RD___MEMB__RX_____S4_0_,
+	HEX_INS_IF__NOT_PT_RD___MEMB__RX_____S4_0_,
+	HEX_INS_IF__PT_NEW__RD___MEMB__RX_____S4_0_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMB__RX_____S4_0_,
+	HEX_INS_IF__PT__RD___MEMB___U6_,
+	HEX_INS_IF__NOT_PT_RD___MEMB___U6_,
+	HEX_INS_IF__PT_NEW__RD___MEMB___U6_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMB___U6_,
+	HEX_INS_RYY___MEMB_FIFO__RS____S11_0_,
+	HEX_INS_RYY___MEMB_FIFO__RX_____S4_0_CIRC__MU__,
+	HEX_INS_RYY___MEMB_FIFO__RX____I_CIRC__MU__,
+	HEX_INS_RYY___MEMB_FIFO__RE____U6_,
+	HEX_INS_RYY___MEMB_FIFO__RX_____S4_0_,
+	HEX_INS_RYY___MEMB_FIFO__RT_____U2____U6_,
+	HEX_INS_RYY___MEMB_FIFO__RX____MU_,
+	HEX_INS_RYY___MEMB_FIFO__RX____MU_BREV_,
+	HEX_INS_RYY___MEMH_FIFO__RS____S11_1_,
+	HEX_INS_RYY___MEMH_FIFO__RX_____S4_1_CIRC__MU__,
+	HEX_INS_RYY___MEMH_FIFO__RX____I_CIRC__MU__,
+	HEX_INS_RYY___MEMH_FIFO__RE____U6_,
+	HEX_INS_RYY___MEMH_FIFO__RX_____S4_1_,
+	HEX_INS_RYY___MEMH_FIFO__RT_____U2____U6_,
+	HEX_INS_RYY___MEMH_FIFO__RX____MU_,
+	HEX_INS_RYY___MEMH_FIFO__RX____MU_BREV_,
+	HEX_INS_RD___MEMH__RS___RT_____U2_,
+	HEX_INS_RD___MEMH__GP____U16_1_,
+	HEX_INS_RD___MEMH__RS____S11_1_,
+	HEX_INS_RD___MEMH__RX_____S4_1_CIRC__MU__,
+	HEX_INS_RD___MEMH__RX____I_CIRC__MU__,
+	HEX_INS_RD___MEMH__RE____U6_,
+	HEX_INS_RD___MEMH__RX_____S4_1_,
+	HEX_INS_RD___MEMH__RT_____U2____U6_,
+	HEX_INS_RD___MEMH__RX____MU_,
+	HEX_INS_RD___MEMH__RX____MU_BREV_,
+	HEX_INS_IF__PV__RD___MEMH__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_RD___MEMH__RS___RT_____U2_,
+	HEX_INS_IF__PV_NEW__RD___MEMH__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_NEW_RD___MEMH__RS___RT_____U2_,
+	HEX_INS_IF__PT__RD___MEMH__RS____U6_1_,
+	HEX_INS_IF__PT_NEW__RD___MEMH__RS____U6_1_,
+	HEX_INS_IF__NOT_PT_RD___MEMH__RS____U6_1_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMH__RS____U6_1_,
+	HEX_INS_IF__PT__PD___MEMH__RX_____S4_1_,
+	HEX_INS_IF__NOT_PT_RD___MEMH__RX_____S4_1_,
+	HEX_INS_IF__PT_NEW__RD___MEMH__RX_____S4_1_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMH__RX_____S4_1_,
+	HEX_INS_IF__PT__RD___MEMH___U6_,
+	HEX_INS_IF__NOT_PT_RD___MEMH___U6_,
+	HEX_INS_IF__PT_NEW__RD___MEMH___U6_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMH___U6_,
+	HEX_INS_RD___MEMUB__RS___RT_____U2_,
+	HEX_INS_RD___MEMUB__GP____U16_0_,
+	HEX_INS_RD___MEMUB__RS____S11_0_,
+	HEX_INS_RD___MEMUB__RX_____S4_0_CIRC__MU__,
+	HEX_INS_RD___MEMUB__RX____I_CIRC__MU__,
+	HEX_INS_RD___MEMUB__RE____U6_,
+	HEX_INS_RD___MEMUB__RX_____S4_0_,
+	HEX_INS_RD___MEMUB__RT_____U2____U6_,
+	HEX_INS_RD___MEMUB__RX____MU_,
+	HEX_INS_RD___MEMUB__RX____MU_BREV_,
+	HEX_INS_IF__PV__RD___MEMUB__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_RD___MEMUB__RS___RT_____U2_,
+	HEX_INS_IF__PV_NEW__RD___MEMUB__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_NEW_RD___MEMUB__RS___RT_____U2_,
+	HEX_INS_IF__PT__RD___MEMUB__RS____U6_0_,
+	HEX_INS_IF__PT_NEW__RD___MEMUB__RS____U6_0_,
+	HEX_INS_IF__NOT_PT_RD___MEMUB__RS____U6_0_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMUB__RS____U6_0_,
+	HEX_INS_IF__PT__RD___MEMUB__RX_____S4_0_,
+	HEX_INS_IF__NOT_PT_RD___MEMUB__RX_____S4_0_,
+	HEX_INS_IF__PT_NEW__RD___MEMUB__RX_____S4_0_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMUB__RX_____S4_0_,
+	HEX_INS_IF__PT__RD___MEMUB___U6_,
+	HEX_INS_IF__NOT_PT_RD___MEMUB___U6_,
+	HEX_INS_IF__PT_NEW__RD___MEMUB___U6_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMUB___U6_,
+	HEX_INS_RD___MEMUH__RS___RT_____U2_,
+	HEX_INS_RD___MEMUH__GP____U16_1_,
+	HEX_INS_RD___MEMUH__RS____S11_1_,
+	HEX_INS_RD___MEMUH__RX_____S4_1_CIRC__MU__,
+	HEX_INS_RD___MEMUH__RX____I_CIRC__MU__,
+	HEX_INS_RD___MEMUH__RE____U6_,
+	HEX_INS_RD___MEMUH__RX_____S4_1_,
+	HEX_INS_RD___MEMUH__RT_____U2____U6_,
+	HEX_INS_RD___MEMUH__RX____MU_,
+	HEX_INS_RD___MEMUH__RX____MU_BREV_,
+	HEX_INS_IF__PV__RD___MEMUH__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_RD___MEMUH__RS___RT_____U2_,
+	HEX_INS_IF__PV_NEW__RD___MEMUH__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_NEW_RD___MEMUH__RS___RT_____U2_,
+	HEX_INS_IF__PT__RD___MEMUH__RS____U6_1_,
+	HEX_INS_IF__PT_NEW__RD___MEMUH__RS____U6_1_,
+	HEX_INS_IF__NOT_PT_RD___MEMUH__RS____U6_1_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMUH__RS____U6_1_,
+	HEX_INS_IF__PT__RD___MEMUH__RX_____S4_1_,
+	HEX_INS_IF__NOT_PT_RD___MEMUH__RX_____S4_1_,
+	HEX_INS_IF__PT_NEW__RD___MEMUH__RX_____S4_1_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMUH__RX_____S4_1_,
+	HEX_INS_IF__PT__RD___MEMUH___U6_,
+	HEX_INS_IF__NOT_PT_RD___MEMUH___U6_,
+	HEX_INS_IF__PT_NEW__RD___MEMUH___U6_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMUH___U6_,
+	HEX_INS_RD___MEMW__RS___RT_____U2_,
+	HEX_INS_RD___MEMW__GP____U16_2_,
+	HEX_INS_RD___MEMW__RS____S11_2_,
+	HEX_INS_RD___MEMW__RX_____S4_2_CIRC__MU__,
+	HEX_INS_RD___MEMW__RX____I_CIRC__MU__,
+	HEX_INS_RD___MEMW__RE____U6_,
+	HEX_INS_RD___MEMW__RX_____S4_2_,
+	HEX_INS_RD___MEMW__RT_____U2____U6_,
+	HEX_INS_RD___MEMW__RX____MU_,
+	HEX_INS_RD___MEMW__RX____MU_BREV_,
+	HEX_INS_IF__PV__RD___MEMW__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_RD___MEMW__RS___RT_____U2_,
+	HEX_INS_IF__PV_NEW__RD___MEMW__RS___RT_____U2_,
+	HEX_INS_IF__NOT_PV_NEW_RD___MEMW__RS___RT_____U2_,
+	HEX_INS_IF__PT__RD___MEMW__RS____U6_2_,
+	HEX_INS_IF__PT_NEW__RD___MEMW__RS____U6_2_,
+	HEX_INS_IF__NOT_PT_RD___MEMW__RS____U6_2_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMW__RS____U6_2_,
+	HEX_INS_IF__PT__RD___MEMW__RX_____S4_2_,
+	HEX_INS_IF__NOT_PT_RD___MEMW__RX_____S4_2_,
+	HEX_INS_IF__PT_NEW__RD___MEMW__RX_____S4_2_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMW__RX_____S4_2_,
+	HEX_INS_IF__PT__RD___MEMW___U6_,
+	HEX_INS_IF__NOT_PT_RD___MEMW___U6_,
+	HEX_INS_IF__PT_NEW__RD___MEMW___U6_,
+	HEX_INS_IF__NOT_PT_NEW_RD___MEMW___U6_,
+	HEX_INS_DEALLOCFRAME,
+	HEX_INS_DEALLOC_RETURN,
+	HEX_INS_IF__PS_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_IF__PS__DEALLOC_RETURN,
+	HEX_INS_IF__PS_NEW__DEALLOC_RETURN_T,
+	HEX_INS_IF__NOT_PS_NEW_DEALLOC_RETURN_NT,
+	HEX_INS_IF__NOT_PS_DEALLOC_RETURN,
+	HEX_INS_IF__NOT_PS_NEW_DEALLOC_RETURN_T,
+	HEX_INS_RD___MEMBH__RS____S11_1_,
+	HEX_INS_RD___MEMUBH__RS____S11_1_,
+	HEX_INS_RDD___MEMUBH__RS____S11_2_,
+	HEX_INS_RDD___MEMBH__RS____S11_2_,
+	HEX_INS_RD___MEMBH__RX_____S4_1_CIRC__MU__,
+	HEX_INS_RD___MEMBH__RX____I_CIRC__MU__,
+	HEX_INS_RD___MEMUBH__RX_____S4_1_CIRC__MU__,
+	HEX_INS_RD___MEMUBH__RX____I_CIRC__MU__,
+	HEX_INS_RDD___MEMUBH__RX_____S4_2_CIRC__MU__,
+	HEX_INS_RDD___MEMUBH__RX____I_CIRC__MU__,
+	HEX_INS_RDD___MEMBH__RX_____S4_2_CIRC__MU__,
+	HEX_INS_RDD___MEMBH__RX____I_CIRC__MU__,
+	HEX_INS_RD___MEMBH__RE____U6_,
+	HEX_INS_RD___MEMBH__RX_____S4_1_,
+	HEX_INS_RD___MEMUBH__RE____U6_,
+	HEX_INS_RD___MEMUBH__RX_____S4_1_,
+	HEX_INS_RDD___MEMUBH__RE____U6_,
+	HEX_INS_RDD___MEMUBH__RX_____S4_2_,
+	HEX_INS_RDD___MEMBH__RE____U6_,
+	HEX_INS_RDD___MEMBH__RX_____S4_2_,
+	HEX_INS_RD___MEMBH__RT_____U2____U6_,
+	HEX_INS_RD___MEMBH__RX____MU_,
+	HEX_INS_RD___MEMUBH__RT_____U2____U6_,
+	HEX_INS_RD___MEMUBH__RX____MU_,
+	HEX_INS_RDD___MEMUBH__RT_____U2____U6_,
+	HEX_INS_RDD___MEMUBH__RX____MU_,
+	HEX_INS_RDD___MEMBH__RT_____U2____U6_,
+	HEX_INS_RDD___MEMBH__RX____MU_,
+	HEX_INS_RD___MEMBH__RX____MU_BREV_,
+	HEX_INS_RD___MEMUBH__RX____MU_BREV_,
+	HEX_INS_RDD___MEMUBH__RX____MU_BREV_,
+	HEX_INS_RDD___MEMBH__RX____MU_BREV_,
+	HEX_INS_MEMB__RS____U6_0___PLUS_EQ__RT,
+	HEX_INS_MEMB__RS____U6_0___MINUS_EQ__RT,
+	HEX_INS_MEMB__RS____U6_0___AND_EQ__RT,
+	HEX_INS_MEMB__RS____U6_0___OR_EQ__RT,
+	HEX_INS_MEMB__RS____U6_0___PLUS_EQ___U5,
+	HEX_INS_MEMB__RS____U6_0___MINUS_EQ___U5,
+	HEX_INS_MEMB__RS____U6_0____CLRBIT___U5_,
+	HEX_INS_MEMB__RS____U6_0____SETBIT___U5_,
+	HEX_INS_MEMH__RS____U6_1___PLUS_EQ__RT,
+	HEX_INS_MEMH__RS____U6_1___MINUS_EQ__RT,
+	HEX_INS_MEMH__RS____U6_1___AND_EQ__RT,
+	HEX_INS_MEMH__RS____U6_1___OR_EQ__RT,
+	HEX_INS_MEMH__RS____U6_1___PLUS_EQ___U5,
+	HEX_INS_MEMH__RS____U6_1___MINUS_EQ___U5,
+	HEX_INS_MEMH__RS____U6_1____CLRBIT___U5_,
+	HEX_INS_MEMH__RS____U6_1____SETBIT___U5_,
+	HEX_INS_MEMW__RS____U6_2___PLUS_EQ__RT,
+	HEX_INS_MEMW__RS____U6_2___MINUS_EQ__RT,
+	HEX_INS_MEMW__RS____U6_2___AND_EQ__RT,
+	HEX_INS_MEMW__RS____U6_2___OR_EQ__RT,
+	HEX_INS_MEMW__RS____U6_2___PLUS_EQ___U5,
+	HEX_INS_MEMW__RS____U6_2___MINUS_EQ___U5,
+	HEX_INS_MEMW__RS____U6_2____CLRBIT___U5_,
+	HEX_INS_MEMW__RS____U6_2____SETBIT___U5_,
+	HEX_INS_IF__CMP_EQ__NS_NEW__RT___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_EQ__NS_NEW__RT___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_EQ__NS_NEW__RT___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_EQ__NS_NEW__RT___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_GT__NS_NEW__RT___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_GT__NS_NEW__RT___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__NS_NEW__RT___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__NS_NEW__RT___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_GTU__NS_NEW__RT___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_GTU__NS_NEW__RT___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_GTU__NS_NEW__RT___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_GTU__NS_NEW__RT___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_GT__RT__NS_NEW___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_GT__RT__NS_NEW___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__RT__NS_NEW___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__RT__NS_NEW___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_GTU__RT__NS_NEW___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_GTU__RT__NS_NEW___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_GTU__RT__NS_NEW___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_GTU__RT__NS_NEW___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_EQ__NS_NEW___U5___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_EQ__NS_NEW___U5___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_EQ__NS_NEW___U5___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_EQ__NS_NEW___U5___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_GT__NS_NEW___U5___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_GT__NS_NEW___U5___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__NS_NEW___U5___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__NS_NEW___U5___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_GTU__NS_NEW___U5___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_GTU__NS_NEW___U5___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_GTU__NS_NEW___U5___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_GTU__NS_NEW___U5___JUMP_T__R9_2,
+	HEX_INS_IF__TSTBIT__NS_NEW___0___JUMP_NT__R9_2,
+	HEX_INS_IF__TSTBIT__NS_NEW___0___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_TSTBIT__NS_NEW___0___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_TSTBIT__NS_NEW___0___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_EQ__NS_NEW____1___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_EQ__NS_NEW____1___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_EQ__NS_NEW____1___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_EQ__NS_NEW____1___JUMP_T__R9_2,
+	HEX_INS_IF__CMP_GT__NS_NEW____1___JUMP_NT__R9_2,
+	HEX_INS_IF__CMP_GT__NS_NEW____1___JUMP_T__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__NS_NEW____1___JUMP_NT__R9_2,
+	HEX_INS_IF___NOT_CMP_GT__NS_NEW____1___JUMP_T__R9_2,
+	HEX_INS_MEMB__RS___RU_____U2____NT_NEW,
+	HEX_INS_MEMB__GP____U16_0____NT_NEW,
+	HEX_INS_MEMB__RS____S11_0____NT_NEW,
+	HEX_INS_MEMB__RX____I_CIRC__MU_____NT_NEW,
+	HEX_INS_MEMB__RX_____S4_0_CIRC__MU_____NT_NEW,
+	HEX_INS_MEMB__RE____U6____NT_NEW,
+	HEX_INS_MEMB__RX_____S4_0____NT_NEW,
+	HEX_INS_MEMB__RU_____U2____U6____NT_NEW,
+	HEX_INS_MEMB__RX____MU____NT_NEW,
+	HEX_INS_MEMB__RX____MU_BREV____NT_NEW,
+	HEX_INS_IF__PV__MEMB__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMB__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMB__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMB__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__PV__MEMB__RS____U6_0____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMB__RS____U6_0____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMB__RS____U6_0____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMB__RS____U6_0____NT_NEW,
+	HEX_INS_IF__PV__MEMB__RX_____S4_0____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMB__RX_____S4_0____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMB__RX_____S4_0____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMB__RX_____S4_0____NT_NEW,
+	HEX_INS_IF__PV__MEMB___U6____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMB___U6____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMB___U6____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMB___U6____NT_NEW,
+	HEX_INS_MEMH__RS___RU_____U2____NT_NEW,
+	HEX_INS_MEMH__GP____U16_1____NT_NEW,
+	HEX_INS_MEMH__RS____S11_1____NT_NEW,
+	HEX_INS_MEMH__RX____I_CIRC__MU_____NT_NEW,
+	HEX_INS_MEMH__RX_____S4_1_CIRC__MU_____NT_NEW,
+	HEX_INS_MEMH__RE____U6____NT_NEW,
+	HEX_INS_MEMH__RX_____S4_1____NT_NEW,
+	HEX_INS_MEMH__RU_____U2____U6____NT_NEW,
+	HEX_INS_MEMH__RX____MU____NT_NEW,
+	HEX_INS_MEMH__RX____MU_BREV____NT_NEW,
+	HEX_INS_IF__PV__MEMH__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMH__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMH__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__PV__MEMH__RS____U6_1____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMH__RS____U6_1____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMH__RS____U6_1____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1____NT_NEW,
+	HEX_INS_IF__PV__MEMH__RX_____S4_1____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMH__RX_____S4_1____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMH__RX_____S4_1____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RX_____S4_1____NT_NEW,
+	HEX_INS_IF__PV__MEMH___U6____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMH___U6____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMH___U6____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMH___U6____NT_NEW,
+	HEX_INS_MEMW__RS___RU_____U2____NT_NEW,
+	HEX_INS_MEMW__GP____U16_2____NT_NEW,
+	HEX_INS_MEMW__RS____S11_2____NT_NEW,
+	HEX_INS_MEMW__RX____I_CIRC__MU_____NT_NEW,
+	HEX_INS_MEMW__RX_____S4_2_CIRC__MU_____NT_NEW,
+	HEX_INS_MEMW__RE____U6____NT_NEW,
+	HEX_INS_MEMW__RX_____S4_2____NT_NEW,
+	HEX_INS_MEMW__RU_____U2____U6____NT_NEW,
+	HEX_INS_MEMW__RX____MU____NT_NEW,
+	HEX_INS_MEMW__RX____MU_BREV____NT_NEW,
+	HEX_INS_IF__PV__MEMW__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMW__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMW__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMW__RS___RU_____U2____NT_NEW,
+	HEX_INS_IF__PV__MEMW__RS____U6_2____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMW__RS____U6_2____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMW__RS____U6_2____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMW__RS____U6_2____NT_NEW,
+	HEX_INS_IF__PV__MEMW__RX_____S4_2____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMW__RX_____S4_2____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMW__RX_____S4_2____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMW__RX_____S4_2____NT_NEW,
+	HEX_INS_IF__PV__MEMW___U6____NT_NEW,
+	HEX_INS_IF__NOT_PV_MEMW___U6____NT_NEW,
+	HEX_INS_IF__PV_NEW__MEMW___U6____NT_NEW,
+	HEX_INS_IF__NOT_PV_NEW_MEMW___U6____NT_NEW,
+	HEX_INS_MEMD__RS___RU_____U2____RTT,
+	HEX_INS_MEMD__GP____U16_3____RTT,
+	HEX_INS_MEMD__RS____S11_3____RTT,
+	HEX_INS_MEMD__RX____I_CIRC__MU_____RTT,
+	HEX_INS_MEMD__RX_____S4_3_CIRC__MU_____RTT,
+	HEX_INS_MEMD__RE____U6____RTT,
+	HEX_INS_MEMD__RX_____S4_3____RTT,
+	HEX_INS_MEMD__RU_____U2____U6____RTT,
+	HEX_INS_MEMD__RX____MU____RTT,
+	HEX_INS_MEMD__RX____MU_BREV____RTT,
+	HEX_INS_IF__PV__MEMD__RS___RU_____U2____RTT,
+	HEX_INS_IF__NOT_PV_MEMD__RS___RU_____U2____RTT,
+	HEX_INS_IF__PV_NEW__MEMD__RS___RU_____U2____RTT,
+	HEX_INS_IF__NOT_PV_NEW_MEMD__RS___RU_____U2____RTT,
+	HEX_INS_IF__PV__MEMD__RS____U6_3____RTT,
+	HEX_INS_IF__PV_NEW__MEMD__RS____U6_3____RTT,
+	HEX_INS_IF__NOT_PV_MEMD__RS____U6_3____RTT,
+	HEX_INS_IF__NOT_PV_NEW_MEMD__RS____U6_3____RTT,
+	HEX_INS_IF__PV__MEMD__RX_____S4_3____RTT,
+	HEX_INS_IF__NOT_PV_MEMD__RX_____S4_3____RTT,
+	HEX_INS_IF__PV_NEW__MEMD__RX_____S4_3____RTT,
+	HEX_INS_IF__NOT_PV_NEW_MEMD__RX_____S4_3____RTT,
+	HEX_INS_IF__PV__MEMD___U6____RTT,
+	HEX_INS_IF__NOT_PV_MEMD___U6____RTT,
+	HEX_INS_IF__PV_NEW__MEMD___U6____RTT,
+	HEX_INS_IF__NOT_PV_NEW_MEMD___U6____RTT,
+	HEX_INS_MEMB__RS___RU_____U2____RT,
+	HEX_INS_MEMB__RS____U6_0_____S8,
+	HEX_INS_MEMB__GP____U16_0____RT,
+	HEX_INS_MEMB__RS____S11_0____RT,
+	HEX_INS_MEMB__RX____I_CIRC__MU_____RT,
+	HEX_INS_MEMB__RX_____S4_0_CIRC__MU_____RT,
+	HEX_INS_MEMB__RE____U6____RT,
+	HEX_INS_MEMB__RX_____S4_0____RT,
+	HEX_INS_MEMB__RU_____U2____U6____RT,
+	HEX_INS_MEMB__RX____MU____RT,
+	HEX_INS_MEMB__RX____MU_BREV____RT,
+	HEX_INS_IF__PV__MEMB__RS___RU_____U2____RT,
+	HEX_INS_IF__NOT_PV_MEMB__RS___RU_____U2____RT,
+	HEX_INS_IF__PV_NEW__MEMB__RS___RU_____U2____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMB__RS___RU_____U2____RT,
+	HEX_INS_IF__PV__MEMB__RS____U6_0_____S6,
+	HEX_INS_IF__NOT_PV_MEMB__RS____U6_0_____S6,
+	HEX_INS_IF__PV_NEW__MEMB__RS____U6_0_____S6,
+	HEX_INS_IF__NOT_PV_NEW_MEMB__RS____U6_0_____S6,
+	HEX_INS_IF__PV__MEMB__RS____U6_0____RT,
+	HEX_INS_IF__PV_NEW__MEMB__RS____U6_0____RT,
+	HEX_INS_IF__NOT_PV_MEMB__RS____U6_0____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMB__RS____U6_0____RT,
+	HEX_INS_IF__PV__MEMB__RX_____S4_0____RT,
+	HEX_INS_IF__NOT_PV_MEMB__RX_____S4_0____RT,
+	HEX_INS_IF__PV_NEW__MEMB__RX_____S4_0____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMB__RX_____S4_0____RT,
+	HEX_INS_IF__PV__MEMB___U6____RT,
+	HEX_INS_IF__NOT_PV_MEMB___U6____RT,
+	HEX_INS_IF__PV_NEW__MEMB___U6____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMB___U6____RT,
+	HEX_INS_MEMH__RS___RU_____U2____RT,
+	HEX_INS_MEMH__RS___RU_____U2____RT_H,
+	HEX_INS_MEMH__RS____U6_1_____S8,
+	HEX_INS_MEMH__GP____U16_1____RT,
+	HEX_INS_MEMH__GP____U16_1____RT_H,
+	HEX_INS_MEMH__RS____S11_1____RT,
+	HEX_INS_MEMH__RS____S11_1____RT_H,
+	HEX_INS_MEMH__RX____I_CIRC__MU_____RT,
+	HEX_INS_MEMH__RX_____S4_1_CIRC__MU_____RT,
+	HEX_INS_MEMH__RX____I_CIRC__MU_____RT_H,
+	HEX_INS_MEMH__RX_____S4_1_CIRC__MU_____RT_H,
+	HEX_INS_MEMH__RE____U6____RT,
+	HEX_INS_MEMH__RX_____S4_1____RT,
+	HEX_INS_MEMH__RE____U6____RT_H,
+	HEX_INS_MEMH__RX_____S4_1____RT_H,
+	HEX_INS_MEMH__RU_____U2____U6____RT,
+	HEX_INS_MEMH__RX____MU____RT,
+	HEX_INS_MEMH__RU_____U2____U6____RT_H,
+	HEX_INS_MEMH__RX____MU____RT_H,
+	HEX_INS_MEMH__RX____MU_BREV____RT,
+	HEX_INS_MEMH__RX____MU_BREV____RT_H,
+	HEX_INS_IF__PV__MEMH__RS___RU_____U2____RT,
+	HEX_INS_IF__PV__MEMH__RS___RU_____U2____RT_H,
+	HEX_INS_IF__NOT_PV_MEMH__RS___RU_____U2____RT,
+	HEX_INS_IF__NOT_PV_MEMH__RS___RU_____U2____RT_H,
+	HEX_INS_IF__PV_NEW__MEMH__RS___RU_____U2____RT,
+	HEX_INS_IF__PV_NEW__MEMH__RS___RU_____U2____RT_H,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RS___RU_____U2____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RS___RU_____U2____RT_H,
+	HEX_INS_IF__PV__MEMH__RS____U6_1_____S6,
+	HEX_INS_IF__NOT_PV_MEMH__RS____U6_1_____S6,
+	HEX_INS_IF__PV_NEW__MEMH__RS____U6_1_____S6,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1_____S6,
+	HEX_INS_IF__PV__MEMH__RS____U6_1____RT,
+	HEX_INS_IF__PV__MEMH__RS____U6_1____RT_H,
+	HEX_INS_IF__PV_NEW__MEMH__RS____U6_1____RT,
+	HEX_INS_IF__PV_NEW__MEMH__RS____U6_1____RT_H,
+	HEX_INS_IF__NOT_PV_MEMH__RS____U6_1____RT,
+	HEX_INS_IF__NOT_PV_MEMH__RS____U6_1____RT_H,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RS____U6_1____RT_H,
+	HEX_INS_IF__PV__MEMH__RX_____S4_1____RT,
+	HEX_INS_IF__NOT_PV_MEMH__RX_____S4_1____RT,
+	HEX_INS_IF__PV_NEW__MEMH__RX_____S4_1____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RX_____S4_1____RT,
+	HEX_INS_IF__PV__MEMH__RX_____S4_1____RT_H,
+	HEX_INS_IF__NOT_PV_MEMH__RX_____S4_1____RT_H,
+	HEX_INS_IF__PV_NEW__MEMH__RX_____S4_1____RT_H,
+	HEX_INS_IF__NOT_PV_NEW_MEMH__RX_____S4_1____RT_H,
+	HEX_INS_IF__PV__MEMH___U6____RT,
+	HEX_INS_IF__NOT_PV_MEMH___U6____RT,
+	HEX_INS_IF__PV_NEW__MEMH___U6____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMH___U6____RT,
+	HEX_INS_IF__PV__MEMH___U6____RT_H,
+	HEX_INS_IF__NOT_PV_MEMH___U6____RT_H,
+	HEX_INS_IF__PV_NEW__MEMH___U6____RT_H,
+	HEX_INS_IF__NOT_PV_NEW_MEMH___U6____RT_H,
+	HEX_INS_MEMW__RS___RU_____U2____RT,
+	HEX_INS_MEMW__RS____U6_2_____S8,
+	HEX_INS_MEMW__GP____U16_2____RT,
+	HEX_INS_MEMW__RS____S11_2____RT,
+	HEX_INS_MEMW__RX____I_CIRC__MU_____RT,
+	HEX_INS_MEMW__RX_____S4_2_CIRC__MU_____RT,
+	HEX_INS_MEMW__RE____U6____RT,
+	HEX_INS_MEMW__RX_____S4_2____RT,
+	HEX_INS_MEMW__RU_____U2____U6____RT,
+	HEX_INS_MEMW__RX____MU____RT,
+	HEX_INS_MEMW__RX____MU_BREV____RT,
+	HEX_INS_IF__PV__MEMW__RS___RU_____U2____RT,
+	HEX_INS_IF__NOT_PV_MEMW__RS___RU_____U2____RT,
+	HEX_INS_IF__PV_NEW__MEMW__RS___RU_____U2____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMW__RS___RU_____U2____RT,
+	HEX_INS_IF__PV__MEMW__RS____U6_2_____S6,
+	HEX_INS_IF__NOT_PV_MEMW__RS____U6_2_____S6,
+	HEX_INS_IF__PV_NEW__MEMW__RS____U6_2_____S6,
+	HEX_INS_IF__NOT_PV_NEW_MEMW__RS____U6_2_____S6,
+	HEX_INS_IF__PV__MEMW__RS____U6_2____RT,
+	HEX_INS_IF__PV_NEW__MEMW__RS____U6_2____RT,
+	HEX_INS_IF__NOT_PV_MEMW__RS____U6_2____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMW__RS____U6_2____RT,
+	HEX_INS_IF__PV__MEMW__RX_____S4_2____RT,
+	HEX_INS_IF__NOT_PV_MEMW__RX_____S4_2____RT,
+	HEX_INS_IF__PV_NEW__MEMW__RX_____S4_2____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMW__RX_____S4_2____RT,
+	HEX_INS_IF__PV__MEMW___U6____RT,
+	HEX_INS_IF__NOT_PV_MEMW___U6____RT,
+	HEX_INS_IF__PV_NEW__MEMW___U6____RT,
+	HEX_INS_IF__NOT_PV_NEW_MEMW___U6____RT,
+	HEX_INS_ALLOCFRAME___U11_3_,
+	HEX_INS_GD___RS,
+	HEX_INS_GDD___RSS,
+	HEX_INS_RDD___GSS,
+	HEX_INS_RD___GS,
+	HEX_INS_CIAD__RS_,
+	HEX_INS_CRSWAP__RX__SGP0_,
+	HEX_INS_CRSWAP__RX__SGP1_,
+	HEX_INS_CRSWAP__RXX__SGP1_0_,
+	HEX_INS_CSWI__RS_,
+	HEX_INS_DCKILL,
+	HEX_INS_DCCLEANIDX__RS_,
+	HEX_INS_DCINVIDX__RS_,
+	HEX_INS_DCCLEANINVIDX__RS_,
+	HEX_INS_DCTAGW__RS__RT_,
+	HEX_INS_RD___DCTAGR__RS_,
+	HEX_INS_RD___GETIMASK__RS_,
+	HEX_INS_TLBLOCK,
+	HEX_INS_K0LOCK,
+	HEX_INS_TLBUNLOCK,
+	HEX_INS_K0UNLOCK,
+	HEX_INS_RD___IASSIGNR__RS_,
+	HEX_INS_IASSIGNW__RS_,
+	HEX_INS_RD___ICDATAR__RS_,
+	HEX_INS_RD___ICTAGR__RS_,
+	HEX_INS_ICINVIDX__RS_,
+	HEX_INS_ICTAGW__RS__RT_,
+	HEX_INS_ICKILL,
+	HEX_INS_L2CLEANIDX__RS_,
+	HEX_INS_L2INVIDX__RS_,
+	HEX_INS_L2CLEANINVIDX__RS_,
+	HEX_INS_L2GCLEAN__RTT_,
+	HEX_INS_L2GCLEANINV__RTT_,
+	HEX_INS_L2KILL,
+	HEX_INS_L2GUNLOCK,
+	HEX_INS_L2GCLEAN,
+	HEX_INS_L2GCLEANINV,
+	HEX_INS_PD___L2LOCKA__RS_,
+	HEX_INS_L2UNLOCKA__RS_,
+	HEX_INS_L2TAGW__RS__RT_,
+	HEX_INS_RD___L2TAGR__RS_,
+	HEX_INS_RD___MEMW_PHYS__RS__RT_,
+	HEX_INS_NMI__RS_,
+	HEX_INS_RESUME__RS_,
+	HEX_INS_RTE,
+	HEX_INS_RTEUNLOCK,
+	HEX_INS_SETIMASK__PT__RS_,
+	HEX_INS_SIAD__RS_,
+	HEX_INS_START__RS_,
+	HEX_INS_STOP__RS_,
+	HEX_INS_SWI__RS_,
+	HEX_INS_TLBW__RSS__RT_,
+	HEX_INS_RDD___TLBR__RS_,
+	HEX_INS_RD___TLBP__RS_,
+	HEX_INS_TLBINVASID__RS_,
+	HEX_INS_RD___CTLBW__RSS__RT_,
+	HEX_INS_RD___TLBOC__RSS_,
+	HEX_INS_SD___RS,
+	HEX_INS_SDD___RSS,
+	HEX_INS_RD___SS,
+	HEX_INS_RDD___SSS,
+	HEX_INS_WAIT__RS_,
+	HEX_INS_RD___MEMW_LOCKED__RS_,
+	HEX_INS_RDD___MEMD_LOCKED__RS_,
+	HEX_INS_MEMW_LOCKED__RS__PD____RT,
+	HEX_INS_MEMD_LOCKED__RS__PD____RTT,
+	HEX_INS_DCZEROA__RS_,
+	HEX_INS_BARRIER,
+	HEX_INS_BRKPT,
+	HEX_INS_DCFETCH__RS____U11_3_,
+	HEX_INS_DCCLEANA__RS_,
+	HEX_INS_DCINVA__RS_,
+	HEX_INS_DCCLEANINVA__RS_,
+	HEX_INS_ICINVA__RS_,
+	HEX_INS_ISYNC,
+	HEX_INS_L2FETCH__RS__RT_,
+	HEX_INS_L2FETCH__RS__RTT_,
+	HEX_INS_PAUSE___U8_,
+	HEX_INS_SYNCHT,
+	HEX_INS_TRACE__RS_,
+	HEX_INS_TRAP0___U8_,
+	HEX_INS_TRAP1___U8_,
+	HEX_INS_RDD___ABS__RSS_,
+	HEX_INS_RD___ABS__RS_,
+	HEX_INS_RD___ABS__RS___SAT,
+	HEX_INS_RD___ADD__RS__ADD__RU___S6__,
+	HEX_INS_RD___ADD__RS__SUB___S6__RU__,
+	HEX_INS_RX__PLUS_EQ__ADD__RS___S8_,
+	HEX_INS_RX__MINUS_EQ__ADD__RS___S8_,
+	HEX_INS_RX__PLUS_EQ__ADD__RS__RT_,
+	HEX_INS_RX__MINUS_EQ__ADD__RS__RT_,
+	HEX_INS_RDD___ADD__RSS__RTT_,
+	HEX_INS_RDD___ADD__RSS__RTT___SAT,
+	HEX_INS_RDD___ADD__RSS__RTT___RAW_LO,
+	HEX_INS_RDD___ADD__RSS__RTT___RAW_HI,
+	HEX_INS_RD___ADD__RS__RT___SAT_DEPRECATED,
+	HEX_INS_RD___ADD__RT_L__RS_L_,
+	HEX_INS_RD___ADD__RT_L__RS_H_,
+	HEX_INS_RD___ADD__RT_L__RS_L___SAT,
+	HEX_INS_RD___ADD__RT_L__RS_H___SAT,
+	HEX_INS_RD___ADD__RT_L__RS_L_____16,
+	HEX_INS_RD___ADD__RT_L__RS_H_____16,
+	HEX_INS_RD___ADD__RT_H__RS_L_____16,
+	HEX_INS_RD___ADD__RT_H__RS_H_____16,
+	HEX_INS_RD___ADD__RT_L__RS_L___SAT___16,
+	HEX_INS_RD___ADD__RT_L__RS_H___SAT___16,
+	HEX_INS_RD___ADD__RT_H__RS_L___SAT___16,
+	HEX_INS_RD___ADD__RT_H__RS_H___SAT___16,
+	HEX_INS_RDD___ADD__RSS__RTT__PX___CARRY,
+	HEX_INS_RDD___SUB__RSS__RTT__PX___CARRY,
+	HEX_INS_RDD___NOT__RSS_,
+	HEX_INS_RDD___AND__RSS__RTT_,
+	HEX_INS_RDD___AND__RTT___RSS_,
+	HEX_INS_RDD___OR__RSS__RTT_,
+	HEX_INS_RDD___OR__RTT___RSS_,
+	HEX_INS_RDD___XOR__RSS__RTT_,
+	HEX_INS_RXX____XOR__RSS__RTT_,
+	HEX_INS_RX__OR_EQ__AND__RS___S10_,
+	HEX_INS_RX___OR__RU__AND__RX___S10__,
+	HEX_INS_RX__OR_EQ__OR__RS___S10_,
+	HEX_INS_RX__OR_EQ__AND__RS___RT_,
+	HEX_INS_RX__AND_EQ__AND__RS___RT_,
+	HEX_INS_RX____AND__RS___RT_,
+	HEX_INS_RX__AND_EQ__AND__RS__RT_,
+	HEX_INS_RX__AND_EQ__OR__RS__RT_,
+	HEX_INS_RX__AND_EQ__XOR__RS__RT_,
+	HEX_INS_RX__OR_EQ__AND__RS__RT_,
+	HEX_INS_RX____XOR__RS__RT_,
+	HEX_INS_RX__OR_EQ__OR__RS__RT_,
+	HEX_INS_RX__OR_EQ__XOR__RS__RT_,
+	HEX_INS_RX____AND__RS__RT_,
+	HEX_INS_RX____OR__RS__RT_,
+	HEX_INS_RD___MAX__RS__RT_,
+	HEX_INS_RD___MAXU__RS__RT_,
+	HEX_INS_RDD___MAX__RSS__RTT_,
+	HEX_INS_RDD___MAXU__RSS__RTT_,
+	HEX_INS_RD___MIN__RT__RS_,
+	HEX_INS_RD___MINU__RT__RS_,
+	HEX_INS_RDD___MIN__RTT__RSS_,
+	HEX_INS_RDD___MINU__RTT__RSS_,
+	HEX_INS_RD___MODWRAP__RS__RT_,
+	HEX_INS_RDD___NEG__RSS_,
+	HEX_INS_RD___NEG__RS___SAT,
+	HEX_INS_RD___ROUND__RSS___SAT,
+	HEX_INS_RD___CROUND__RS___U5_,
+	HEX_INS_RD___ROUND__RS___U5_,
+	HEX_INS_RD___ROUND__RS___U5___SAT,
+	HEX_INS_RD___CROUND__RS__RT_,
+	HEX_INS_RD___ROUND__RS__RT_,
+	HEX_INS_RD___ROUND__RS__RT___SAT,
+	HEX_INS_RDD___SUB__RTT__RSS_,
+	HEX_INS_RD___SUB__RT__RS___SAT_DEPRECATED,
+	HEX_INS_RX__PLUS_EQ__SUB__RT__RS_,
+	HEX_INS_RD___SUB__RT_L__RS_L_,
+	HEX_INS_RD___SUB__RT_L__RS_H_,
+	HEX_INS_RD___SUB__RT_L__RS_L___SAT,
+	HEX_INS_RD___SUB__RT_L__RS_H___SAT,
+	HEX_INS_RD___SUB__RT_L__RS_L_____16,
+	HEX_INS_RD___SUB__RT_L__RS_H_____16,
+	HEX_INS_RD___SUB__RT_H__RS_L_____16,
+	HEX_INS_RD___SUB__RT_H__RS_H_____16,
+	HEX_INS_RD___SUB__RT_L__RS_L___SAT___16,
+	HEX_INS_RD___SUB__RT_L__RS_H___SAT___16,
+	HEX_INS_RD___SUB__RT_H__RS_L___SAT___16,
+	HEX_INS_RD___SUB__RT_H__RS_H___SAT___16,
+	HEX_INS_RDD___SXTW__RS_,
+	HEX_INS_RDD___VABSH__RSS_,
+	HEX_INS_RDD___VABSH__RSS___SAT,
+	HEX_INS_RDD___VABSW__RSS_,
+	HEX_INS_RDD___VABSW__RSS___SAT,
+	HEX_INS_RDD___VABSDIFFUB__RTT__RSS_,
+	HEX_INS_RDD___VABSDIFFB__RTT__RSS_,
+	HEX_INS_RDD___VABSDIFFH__RTT__RSS_,
+	HEX_INS_RDD___VABSDIFFW__RTT__RSS_,
+	HEX_INS_RXX__PE___VACSH__RSS__RTT_,
+	HEX_INS_RDD___VADDH__RSS__RTT_,
+	HEX_INS_RDD___VADDH__RSS__RTT___SAT,
+	HEX_INS_RDD___VADDUH__RSS__RTT___SAT,
+	HEX_INS_RD___VADDHUB__RSS__RTT___SAT,
+	HEX_INS_RDD___VRADDUB__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VRADDUB__RSS__RTT_,
+	HEX_INS_RD___VRADDUH__RSS__RTT_,
+	HEX_INS_RD___VRADDH__RSS__RTT_,
+	HEX_INS_RDD___VADDUB__RSS__RTT_,
+	HEX_INS_RDD___VADDUB__RSS__RTT___SAT,
+	HEX_INS_RDD___VADDW__RSS__RTT_,
+	HEX_INS_RDD___VADDW__RSS__RTT___SAT,
+	HEX_INS_RDD___VAVGH__RSS__RTT_,
+	HEX_INS_RDD___VAVGH__RSS__RTT___RND,
+	HEX_INS_RDD___VAVGH__RSS__RTT___CRND,
+	HEX_INS_RDD___VAVGUH__RSS__RTT_,
+	HEX_INS_RDD___VAVGUH__RSS__RTT___RND,
+	HEX_INS_RDD___VNAVGH__RTT__RSS_,
+	HEX_INS_RDD___VNAVGH__RTT__RSS___RND_SAT,
+	HEX_INS_RDD___VNAVGH__RTT__RSS___CRND_SAT,
+	HEX_INS_RDD___VAVGUB__RSS__RTT_,
+	HEX_INS_RDD___VAVGUB__RSS__RTT___RND,
+	HEX_INS_RDD___VAVGW__RSS__RTT_,
+	HEX_INS_RDD___VAVGW__RSS__RTT___RND,
+	HEX_INS_RDD___VAVGW__RSS__RTT___CRND,
+	HEX_INS_RDD___VAVGUW__RSS__RTT_,
+	HEX_INS_RDD___VAVGUW__RSS__RTT___RND,
+	HEX_INS_RDD___VNAVGW__RTT__RSS_,
+	HEX_INS_RDD___VNAVGW__RTT__RSS___RND_SAT,
+	HEX_INS_RDD___VNAVGW__RTT__RSS___CRND_SAT,
+	HEX_INS_RDD___VCNEGH__RSS__RT_,
+	HEX_INS_RXX__PLUS_EQ__VRCNEGH__RSS__RT_,
+	HEX_INS_RDD___VMAXUB__RTT__RSS_,
+	HEX_INS_RDD___VMAXB__RTT__RSS_,
+	HEX_INS_RDD___VMAXH__RTT__RSS_,
+	HEX_INS_RDD___VMAXUH__RTT__RSS_,
+	HEX_INS_RXX___VRMAXH__RSS__RU_,
+	HEX_INS_RXX___VRMAXUH__RSS__RU_,
+	HEX_INS_RXX___VRMAXW__RSS__RU_,
+	HEX_INS_RXX___VRMAXUW__RSS__RU_,
+	HEX_INS_RDD___VMAXUW__RTT__RSS_,
+	HEX_INS_RDD___VMAXW__RTT__RSS_,
+	HEX_INS_RDD___VMINUB__RTT__RSS_,
+	HEX_INS_RDD___VMINB__RTT__RSS_,
+	HEX_INS_RDD__PE___VMINUB__RTT__RSS_,
+	HEX_INS_RDD___VMINH__RTT__RSS_,
+	HEX_INS_RDD___VMINUH__RTT__RSS_,
+	HEX_INS_RXX___VRMINH__RSS__RU_,
+	HEX_INS_RXX___VRMINUH__RSS__RU_,
+	HEX_INS_RXX___VRMINW__RSS__RU_,
+	HEX_INS_RXX___VRMINUW__RSS__RU_,
+	HEX_INS_RDD___VMINW__RTT__RSS_,
+	HEX_INS_RDD___VMINUW__RTT__RSS_,
+	HEX_INS_RDD___VRSADUB__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VRSADUB__RSS__RTT_,
+	HEX_INS_RDD___VSUBH__RTT__RSS_,
+	HEX_INS_RDD___VSUBH__RTT__RSS___SAT,
+	HEX_INS_RDD___VSUBUH__RTT__RSS___SAT,
+	HEX_INS_RDD___VSUBUB__RTT__RSS_,
+	HEX_INS_RDD___VSUBUB__RTT__RSS___SAT,
+	HEX_INS_RDD___VSUBW__RTT__RSS_,
+	HEX_INS_RDD___VSUBW__RTT__RSS___SAT,
+	HEX_INS_RD___CLB__RSS_,
+	HEX_INS_RD___CL0__RSS_,
+	HEX_INS_RD___CL1__RSS_,
+	HEX_INS_RD___NORMAMT__RSS_,
+	HEX_INS_RD___ADD__CLB__RSS____S6_,
+	HEX_INS_RD___ADD__CLB__RS____S6_,
+	HEX_INS_RD___CLB__RS_,
+	HEX_INS_RD___CL0__RS_,
+	HEX_INS_RD___CL1__RS_,
+	HEX_INS_RD___NORMAMT__RS_,
+	HEX_INS_RD___POPCOUNT__RSS_,
+	HEX_INS_RD___CT0__RSS_,
+	HEX_INS_RD___CT1__RSS_,
+	HEX_INS_RD___CT0__RS_,
+	HEX_INS_RD___CT1__RS_,
+	HEX_INS_RDD___EXTRACTU__RSS___U6___U6_,
+	HEX_INS_RDD___EXTRACT__RSS___U6___U6_,
+	HEX_INS_RD___EXTRACTU__RS___U5___U5_,
+	HEX_INS_RD___EXTRACT__RS___U5___U5_,
+	HEX_INS_RDD___EXTRACTU__RSS__RTT_,
+	HEX_INS_RDD___EXTRACT__RSS__RTT_,
+	HEX_INS_RD___EXTRACTU__RS__RTT_,
+	HEX_INS_RD___EXTRACT__RS__RTT_,
+	HEX_INS_RXX___INSERT__RSS___U6___U6_,
+	HEX_INS_RX___INSERT__RS___U5___U5_,
+	HEX_INS_RX___INSERT__RS__RTT_,
+	HEX_INS_RXX___INSERT__RSS__RTT_,
+	HEX_INS_RDD___DEINTERLEAVE__RSS_,
+	HEX_INS_RDD___INTERLEAVE__RSS_,
+	HEX_INS_RDD___LFS__RSS__RTT_,
+	HEX_INS_RD___PARITY__RSS__RTT_,
+	HEX_INS_RD___PARITY__RS__RT_,
+	HEX_INS_RDD___BREV__RSS_,
+	HEX_INS_RD___BREV__RS_,
+	HEX_INS_RD___SETBIT__RS___U5_,
+	HEX_INS_RD___CLRBIT__RS___U5_,
+	HEX_INS_RD___TOGGLEBIT__RS___U5_,
+	HEX_INS_RD___SETBIT__RS__RT_,
+	HEX_INS_RD___CLRBIT__RS__RT_,
+	HEX_INS_RD___TOGGLEBIT__RS__RT_,
+	HEX_INS_RDD___BITSPLIT__RS___U5_,
+	HEX_INS_RDD___BITSPLIT__RS__RT_,
+	HEX_INS_RX___TABLEIDXB__RS___U4___S6___RAW,
+	HEX_INS_RX___TABLEIDXH__RS___U4___S6___RAW,
+	HEX_INS_RX___TABLEIDXW__RS___U4___S6___RAW,
+	HEX_INS_RX___TABLEIDXD__RS___U4___S6___RAW,
+	HEX_INS_RDD___VXADDSUBH__RSS__RTT___SAT,
+	HEX_INS_RDD___VXSUBADDH__RSS__RTT___SAT,
+	HEX_INS_RDD___VXADDSUBH__RSS__RTT___RND___1_SAT,
+	HEX_INS_RDD___VXSUBADDH__RSS__RTT___RND___1_SAT,
+	HEX_INS_RDD___VXADDSUBW__RSS__RTT___SAT,
+	HEX_INS_RDD___VXSUBADDW__RSS__RTT___SAT,
+	HEX_INS_RDD___CMPY__RS__RT______N__SAT,
+	HEX_INS_RDD___CMPY__RS__RT________N__SAT,
+	HEX_INS_RXX__PLUS_EQ__CMPY__RS__RT______N__SAT,
+	HEX_INS_RXX__MINUS_EQ__CMPY__RS__RT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__CMPY__RS__RT________N__SAT,
+	HEX_INS_RXX__MINUS_EQ__CMPY__RS__RT________N__SAT,
+	HEX_INS_RDD___CMPYI__RS__RT_,
+	HEX_INS_RDD___CMPYR__RS__RT_,
+	HEX_INS_RXX__PLUS_EQ__CMPYI__RS__RT_,
+	HEX_INS_RXX__PLUS_EQ__CMPYR__RS__RT_,
+	HEX_INS_RD___CMPY__RS__RT______N__RND_SAT,
+	HEX_INS_RD___CMPY__RS__RT________N__RND_SAT,
+	HEX_INS_RD___CMPYIWH__RSS__RT_____1_RND_SAT,
+	HEX_INS_RD___CMPYIWH__RSS__RT_______1_RND_SAT,
+	HEX_INS_RD___CMPYRWH__RSS__RT_____1_RND_SAT,
+	HEX_INS_RD___CMPYRWH__RSS__RT_______1_RND_SAT,
+	HEX_INS_RDD___VCMPYR__RSS__RTT______N__SAT,
+	HEX_INS_RDD___VCMPYI__RSS__RTT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VCMPYR__RSS__RTT___SAT,
+	HEX_INS_RXX__PLUS_EQ__VCMPYI__RSS__RTT___SAT,
+	HEX_INS_RDD___VCONJ__RSS___SAT,
+	HEX_INS_RDD___VCROTATE__RSS__RT_,
+	HEX_INS_RDD___VRCMPYI__RSS__RTT_,
+	HEX_INS_RDD___VRCMPYR__RSS__RTT_,
+	HEX_INS_RDD___VRCMPYI__RSS__RTT___,
+	HEX_INS_RDD___VRCMPYR__RSS__RTT___,
+	HEX_INS_RXX__PLUS_EQ__VRCMPYI__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VRCMPYR__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VRCMPYI__RSS__RTT___,
+	HEX_INS_RXX__PLUS_EQ__VRCMPYR__RSS__RTT___,
+	HEX_INS_RDD___VRCMPYS__RSS__RTT_____1_SAT_RAW_HI,
+	HEX_INS_RDD___VRCMPYS__RSS__RTT_____1_SAT_RAW_LO,
+	HEX_INS_RXX__PLUS_EQ__VRCMPYS__RSS__RTT_____1_SAT_RAW_HI,
+	HEX_INS_RXX__PLUS_EQ__VRCMPYS__RSS__RTT_____1_SAT_RAW_LO,
+	HEX_INS_RD___VRCMPYS__RSS__RTT_____1_RND_SAT_RAW_HI,
+	HEX_INS_RD___VRCMPYS__RSS__RTT_____1_RND_SAT_RAW_LO,
+	HEX_INS_RDD___VRCROTATE__RSS__RT___U2_,
+	HEX_INS_RXX__PLUS_EQ__VRCROTATE__RSS__RT___U2_,
+	HEX_INS_RD___SFADD__RS__RT_,
+	HEX_INS_PD___SFCLASS__RS___U5_,
+	HEX_INS_PD___DFCLASS__RSS___U5_,
+	HEX_INS_PD___CMP_GE__RS__RT_,
+	HEX_INS_PD___CMP_UO__RS__RT_,
+	HEX_INS_PD___CMP_EQ__RS__RT__,
+	HEX_INS_PD___CMP_GT__RS__RT__,
+	HEX_INS_PD___CMP_EQ__RSS__RTT_,
+	HEX_INS_PD___CMP_GT__RSS__RTT_,
+	HEX_INS_PD___CMP_GE__RSS__RTT_,
+	HEX_INS_PD___CMP_UO__RSS__RTT_,
+	HEX_INS_RDD___CONVERT_SF2DF__RS_,
+	HEX_INS_RD___CONVERT_DF2SF__RSS_,
+	HEX_INS_RDD___CONVERT_UD2DF__RSS_,
+	HEX_INS_RDD___CONVERT_D2DF__RSS_,
+	HEX_INS_RDD___CONVERT_UW2DF__RS_,
+	HEX_INS_RDD___CONVERT_W2DF__RS_,
+	HEX_INS_RD___CONVERT_UD2SF__RSS_,
+	HEX_INS_RD___CONVERT_D2SF__RSS_,
+	HEX_INS_RD___CONVERT_UW2SF__RS_,
+	HEX_INS_RD___CONVERT_W2SF__RS_,
+	HEX_INS_RDD___CONVERT_DF2D__RSS_,
+	HEX_INS_RDD___CONVERT_DF2UD__RSS_,
+	HEX_INS_RDD___CONVERT_DF2D__RSS___CHOP,
+	HEX_INS_RDD___CONVERT_DF2UD__RSS___CHOP,
+	HEX_INS_RDD___CONVERT_SF2UD__RS_,
+	HEX_INS_RDD___CONVERT_SF2D__RS_,
+	HEX_INS_RDD___CONVERT_SF2UD__RS___CH,
+	HEX_INS_RDD___CONVERT_SF2D__RS___CHOP,
+	HEX_INS_RD___CONVERT_DF2UW__RSS_,
+	HEX_INS_RD___CONVERT_DF2W__RSS_,
+	HEX_INS_RD___CONVERT_DF2UW__RSS___CHOP,
+	HEX_INS_RD___CONVERT_DF2W__RSS___CHOP,
+	HEX_INS_RD___CONVERT_SF2UW__RS_,
+	HEX_INS_RD___CONVERT_SF2UW__RS___CHOP,
+	HEX_INS_RD___CONVERT_SF2W__RS_,
+	HEX_INS_RD___CONVERT_SF2W__RS___CHOP,
+	HEX_INS_RD___SFFIXUPR__RS_,
+	HEX_INS_RD___SFFIXUPN__RS__RT_,
+	HEX_INS_RD___SFFIXUPD__RS__RT_,
+	HEX_INS_RX__PLUS_EQ__SFMPY__RS__RT_,
+	HEX_INS_RX__MINUS_EQ__SFMPY__RS__RT_,
+	HEX_INS_RX__PLUS_EQ__SFMPY__RS__RT__PU___SCALE,
+	HEX_INS_RD__PE___SFINVSQRTA__RS_,
+	HEX_INS_RX__PLUS_EQ__SFMPY__RS__RT___LIB,
+	HEX_INS_RX__MINUS_EQ__SFMPY__RS__RT___LIB,
+	HEX_INS_RD___SFMAKE___U10___POS,
+	HEX_INS_RD___SFMAKE___U10___NEG,
+	HEX_INS_RDD___DFMAKE___U10___POS,
+	HEX_INS_RDD___DFMAKE___U10___NEG,
+	HEX_INS_RD___SFMAX__RS__RT_,
+	HEX_INS_RD___SFMIN__RS__RT_,
+	HEX_INS_RD___SFMPY__RS__RT_,
+	HEX_INS_RD__PE___SFRECIPA__RS__RT_,
+	HEX_INS_RD___SFSUB__RS__RT_,
+	HEX_INS_RD___ADD___U6__MPYI__RS__RT__,
+	HEX_INS_RD___ADD___U6__MPYI__RS___U6__,
+	HEX_INS_RD___ADD__RU__MPYI___U6_2__RS__,
+	HEX_INS_RD___ADD__RU__MPYI__RS___U6__,
+	HEX_INS_RY___ADD__RU__MPYI__RY__RS__,
+	HEX_INS_RD__EQ_PLUS__MPYI__RS___U8_,
+	HEX_INS_RD__EQ_MINUS__MPYI__RS___U8_,
+	HEX_INS_RX__PLUS_EQ__MPYI__RS___U8_,
+	HEX_INS_RX__MINUS_EQ__MPYI__RS___U8_,
+	HEX_INS_RD___MPYI__RS__RT_,
+	HEX_INS_RX__PLUS_EQ__MPYI__RS__RT_,
+	HEX_INS_RDD___VMPYWEH__RSS__RTT______N__SAT,
+	HEX_INS_RDD___VMPYWOH__RSS__RTT______N__SAT,
+	HEX_INS_RDD___VMPYWEH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RDD___VMPYWOH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWEH__RSS__RTT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWOH__RSS__RTT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWEH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWOH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RDD___VMPYWEUH__RSS__RTT______N__SAT,
+	HEX_INS_RDD___VMPYWOUH__RSS__RTT______N__SAT,
+	HEX_INS_RDD___VMPYWEUH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RDD___VMPYWOUH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWEUH__RSS__RTT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWOUH__RSS__RTT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWEUH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYWOUH__RSS__RTT______N__RND_SAT,
+	HEX_INS_RDD___MPY__RS_L__RT_L______N_,
+	HEX_INS_RDD___MPY__RS_L__RT_H______N_,
+	HEX_INS_RDD___MPY__RS_H__RT_L______N_,
+	HEX_INS_RDD___MPY__RS_H__RT_H______N_,
+	HEX_INS_RDD___MPY__RS_L__RT_L______N__RND,
+	HEX_INS_RDD___MPY__RS_L__RT_H______N__RND,
+	HEX_INS_RDD___MPY__RS_H__RT_L______N__RND,
+	HEX_INS_RDD___MPY__RS_H__RT_H______N__RND,
+	HEX_INS_RXX__PLUS_EQ__MPY__RS_L__RT_L______N_,
+	HEX_INS_RXX__PLUS_EQ__MPY__RS_L__RT_H______N_,
+	HEX_INS_RXX__PLUS_EQ__MPY__RS_H__RT_L______N_,
+	HEX_INS_RXX__PLUS_EQ__MPY__RS_H__RT_H______N_,
+	HEX_INS_RXX__MINUS_EQ__MPY__RS_L__RT_L______N_,
+	HEX_INS_RXX__MINUS_EQ__MPY__RS_L__RT_H______N_,
+	HEX_INS_RXX__MINUS_EQ__MPY__RS_H__RT_L______N_,
+	HEX_INS_RXX__MINUS_EQ__MPY__RS_H__RT_H______N_,
+	HEX_INS_RD___MPY__RS_L__RT_L______N_,
+	HEX_INS_RD___MPY__RS_L__RT_H______N_,
+	HEX_INS_RD___MPY__RS_H__RT_L______N_,
+	HEX_INS_RD___MPY__RS_H__RT_H______N_,
+	HEX_INS_RD___MPY__RS_L__RT_L______N__SAT,
+	HEX_INS_RD___MPY__RS_L__RT_H______N__SAT,
+	HEX_INS_RD___MPY__RS_H__RT_L______N__SAT,
+	HEX_INS_RD___MPY__RS_H__RT_H______N__SAT,
+	HEX_INS_RD___MPY__RS_L__RT_L______N__RND,
+	HEX_INS_RD___MPY__RS_L__RT_H______N__RND,
+	HEX_INS_RD___MPY__RS_H__RT_L______N__RND,
+	HEX_INS_RD___MPY__RS_H__RT_H______N__RND,
+	HEX_INS_RD___MPY__RS_L__RT_L______N__RND_SAT,
+	HEX_INS_RD___MPY__RS_L__RT_H______N__RND_SAT,
+	HEX_INS_RD___MPY__RS_H__RT_L______N__RND_SAT,
+	HEX_INS_RD___MPY__RS_H__RT_H______N__RND_SAT,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_L______N_,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_H______N_,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_L______N_,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_H______N_,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_L______N__SAT,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_L__RT_H______N__SAT,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_L______N__SAT,
+	HEX_INS_RX__PLUS_EQ__MPY__RS_H__RT_H______N__SAT,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_L______N_,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_H______N_,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_L______N_,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_H______N_,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_L______N__SAT,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_L__RT_H______N__SAT,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_L______N__SAT,
+	HEX_INS_RX__MINUS_EQ__MPY__RS_H__RT_H______N__SAT,
+	HEX_INS_RDD___MPYU__RS_L__RT_L______N_,
+	HEX_INS_RDD___MPYU__RS_L__RT_H______N_,
+	HEX_INS_RDD___MPYU__RS_H__RT_L______N_,
+	HEX_INS_RDD___MPYU__RS_H__RT_H______N_,
+	HEX_INS_RXX__PLUS_EQ__MPYU__RS_L__RT_L______N_,
+	HEX_INS_RXX__PLUS_EQ__MPYU__RS_L__RT_H______N_,
+	HEX_INS_RXX__PLUS_EQ__MPYU__RS_H__RT_L______N_,
+	HEX_INS_RXX__PLUS_EQ__MPYU__RS_H__RT_H______N_,
+	HEX_INS_RXX__MINUS_EQ__MPYU__RS_L__RT_L______N_,
+	HEX_INS_RXX__MINUS_EQ__MPYU__RS_L__RT_H______N_,
+	HEX_INS_RXX__MINUS_EQ__MPYU__RS_H__RT_L______N_,
+	HEX_INS_RXX__MINUS_EQ__MPYU__RS_H__RT_H______N_,
+	HEX_INS_RD___MPYU__RS_L__RT_L______N_,
+	HEX_INS_RD___MPYU__RS_L__RT_H______N_,
+	HEX_INS_RD___MPYU__RS_H__RT_L______N_,
+	HEX_INS_RD___MPYU__RS_H__RT_H______N_,
+	HEX_INS_RX__PLUS_EQ__MPYU__RS_L__RT_L______N_,
+	HEX_INS_RX__PLUS_EQ__MPYU__RS_L__RT_H______N_,
+	HEX_INS_RX__PLUS_EQ__MPYU__RS_H__RT_L______N_,
+	HEX_INS_RX__PLUS_EQ__MPYU__RS_H__RT_H______N_,
+	HEX_INS_RX__MINUS_EQ__MPYU__RS_L__RT_L______N_,
+	HEX_INS_RX__MINUS_EQ__MPYU__RS_L__RT_H______N_,
+	HEX_INS_RX__MINUS_EQ__MPYU__RS_H__RT_L______N_,
+	HEX_INS_RX__MINUS_EQ__MPYU__RS_H__RT_H______N_,
+	HEX_INS_RDD___PMPYW__RS__RT_,
+	HEX_INS_RXX____PMPYW__RS__RT_,
+	HEX_INS_RDD___VRMPYWOH__RSS__RTT______N_,
+	HEX_INS_RDD___VRMPYWEH__RSS__RTT______N_,
+	HEX_INS_RXX__PLUS_EQ__VRMPYWEH__RSS__RTT______N_,
+	HEX_INS_RXX__PLUS_EQ__VRMPYWOH__RSS__RTT______N_,
+	HEX_INS_RD___MPY__RS__RT___RND,
+	HEX_INS_RD___MPYU__RS__RT_,
+	HEX_INS_RD___MPYSU__RS__RT_,
+	HEX_INS_RD___MPY__RS__RT_H_____1_SAT,
+	HEX_INS_RD___MPY__RS__RT_L_____1_SAT,
+	HEX_INS_RD___MPY__RS__RT_H_____1_RND_SAT,
+	HEX_INS_RD___MPY__RS__RT_____1_SAT,
+	HEX_INS_RD___MPY__RS__RT_L_____1_RND_SAT,
+	HEX_INS_RD___MPY__RS__RT______N_,
+	HEX_INS_RX__PLUS_EQ__MPY__RS__RT_____1_SAT,
+	HEX_INS_RX__MINUS_EQ__MPY__RS__RT_____1_SAT,
+	HEX_INS_RDD___MPY__RS__RT_,
+	HEX_INS_RDD___MPYU__RS__RT_,
+	HEX_INS_RXX__PLUS_EQ__MPY__RS__RT_,
+	HEX_INS_RXX__MINUS_EQ__MPY__RS__RT_,
+	HEX_INS_RXX__PLUS_EQ__MPYU__RS__RT_,
+	HEX_INS_RXX__MINUS_EQ__MPYU__RS__RT_,
+	HEX_INS_RDD___VDMPY__RSS__RTT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VDMPY__RSS__RTT______N__SAT,
+	HEX_INS_RD___VDMPY__RSS__RTT______N__RND_SAT,
+	HEX_INS_RDD___VRMPYBU__RSS__RTT_,
+	HEX_INS_RDD___VRMPYBSU__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VRMPYBU__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VRMPYBSU__RSS__RTT_,
+	HEX_INS_RDD___VDMPYBSU__RSS__RTT___SAT,
+	HEX_INS_RXX__PLUS_EQ__VDMPYBSU__RSS__RTT___SAT,
+	HEX_INS_RDD___VMPYEH__RSS__RTT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYEH__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VMPYEH__RSS__RTT______N__SAT,
+	HEX_INS_RDD___VMPYH__RS__RT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYH__RS__RT_,
+	HEX_INS_RXX__PLUS_EQ__VMPYH__RS__RT______N__SAT,
+	HEX_INS_RD___VMPYH__RS__RT______N__RND_SAT,
+	HEX_INS_RDD___VMPYHSU__RS__RT______N__SAT,
+	HEX_INS_RXX__PLUS_EQ__VMPYHSU__RS__RT______N__SAT,
+	HEX_INS_RDD___VRMPYH__RSS__RTT_,
+	HEX_INS_RXX__PLUS_EQ__VRMPYH__RSS__RTT_,
+	HEX_INS_RDD___VMPYBSU__RS__RT_,
+	HEX_INS_RDD___VMPYBU__RS__RT_,
+	HEX_INS_RXX__PLUS_EQ__VMPYBU__RS__RT_,
+	HEX_INS_RXX__PLUS_EQ__VMPYBSU__RS__RT_,
+	HEX_INS_RDD___VPMPYH__RS__RT_,
+	HEX_INS_RXX____VPMPYH__RS__RT_,
+	HEX_INS_RDD___DECBIN__RSS__RTT_,
+	HEX_INS_RD___SAT__RSS_,
+	HEX_INS_RD___SATH__RS_,
+	HEX_INS_RD___SATUH__RS_,
+	HEX_INS_RD___SATUB__RS_,
+	HEX_INS_RD___SATB__RS_,
+	HEX_INS_RD___SWIZ__RS_,
+	HEX_INS_RDD___VALIGNB__RTT__RSS___U3_,
+	HEX_INS_RDD___VALIGNB__RTT__RSS__PU_,
+	HEX_INS_RD___VRNDWH__RSS_,
+	HEX_INS_RD___VRNDWH__RSS___SAT,
+	HEX_INS_RD___VSATHUB__RSS_,
+	HEX_INS_RD___VSATWH__RSS_,
+	HEX_INS_RD___VSATWUH__RSS_,
+	HEX_INS_RD___VSATHB__RSS_,
+	HEX_INS_RD___VSATHB__RS_,
+	HEX_INS_RD___VSATHUB__RS_,
+	HEX_INS_RDD___VSATHUB__RSS_,
+	HEX_INS_RDD___VSATWUH__RSS_,
+	HEX_INS_RDD___VSATWH__RSS_,
+	HEX_INS_RDD___VSATHB__RSS_,
+	HEX_INS_RDD___SHUFFEB__RSS__RTT_,
+	HEX_INS_RDD___SHUFFOB__RTT__RSS_,
+	HEX_INS_RDD___SHUFFEH__RSS__RTT_,
+	HEX_INS_RDD___SHUFFOH__RTT__RSS_,
+	HEX_INS_RDD___VSPLATB__RS_,
+	HEX_INS_RD___VSPLATB__RS_,
+	HEX_INS_RDD___VSPLATH__RS_,
+	HEX_INS_RDD___VSPLICEB__RSS__RTT___U3_,
+	HEX_INS_RDD___VSPLICEB__RSS__RTT__PU_,
+	HEX_INS_RDD___VSXTBH__RS_,
+	HEX_INS_RDD___VSXTHW__RS_,
+	HEX_INS_RD___VTRUNOHB__RSS_,
+	HEX_INS_RD___VTRUNEHB__RSS_,
+	HEX_INS_RDD___VTRUNEWH__RSS__RTT_,
+	HEX_INS_RDD___VTRUNEHB__RSS__RTT_,
+	HEX_INS_RDD___VTRUNOWH__RSS__RTT_,
+	HEX_INS_RDD___VTRUNOHB__RSS__RTT_,
+	HEX_INS_RDD___VZXTBH__RS_,
+	HEX_INS_RDD___VZXTHW__RS_,
+	HEX_INS_PD___BOUNDSCHECK__RSS__RTT___RAW_LO,
+	HEX_INS_PD___BOUNDSCHECK__RSS__RTT___RAW_HI,
+	HEX_INS_PD___CMPB_GT__RS__RT_,
+	HEX_INS_PD___CMPB_EQ__RS__RT_,
+	HEX_INS_PD___CMPB_GTU__RS__RT_,
+	HEX_INS_PD___CMPB_EQ__RS___U8_,
+	HEX_INS_PD___CMPB_GT__RS___S8_,
+	HEX_INS_PD___CMPB_GTU__RS___U7_,
+	HEX_INS_PD___CMPH_EQ__RS__RT_,
+	HEX_INS_PD___CMPH_GT__RS__RT_,
+	HEX_INS_PD___CMPH_GTU__RS__RT_,
+	HEX_INS_PD___CMPH_EQ__RS___S8_,
+	HEX_INS_PD___CMPH_GT__RS___S8_,
+	HEX_INS_PD___CMPH_GTU__RS___U7_,
+	HEX_INS_PD___CMP_EQ__RSS__RTT__,
+	HEX_INS_PD___CMP_GT__RSS__RTT__,
+	HEX_INS_PD___CMP_GTU__RSS__RTT_,
+	HEX_INS_PD___BITSCLR__RS___U6_,
+	HEX_INS_PD____NOT_BITSCLR__RS___U6_,
+	HEX_INS_PD___BITSSET__RS__RT_,
+	HEX_INS_PD____NOT_BITSSET__RS__RT_,
+	HEX_INS_PD___BITSCLR__RS__RT_,
+	HEX_INS_PD____NOT_BITSCLR__RS__RT_,
+	HEX_INS_RDD___MASK__PT_,
+	HEX_INS_PD___TLBMATCH__RSS__RT_,
+	HEX_INS_PD___RS,
+	HEX_INS_RD___PS,
+	HEX_INS_PD___TSTBIT__RS___U5_,
+	HEX_INS_PD____NOT_TSTBIT__RS___U5_,
+	HEX_INS_PD___TSTBIT__RS__RT_,
+	HEX_INS_PD____NOT_TSTBIT__RS__RT_,
+	HEX_INS_PD___VCMPH_EQ__RSS__RTT_,
+	HEX_INS_PD___VCMPH_GT__RSS__RTT_,
+	HEX_INS_PD___VCMPH_GTU__RSS__RTT_,
+	HEX_INS_PD___VCMPH_EQ__RSS___S8_,
+	HEX_INS_PD___VCMPH_GT__RSS___S8_,
+	HEX_INS_PD___VCMPH_GTU__RSS___U7_,
+	HEX_INS_PD___ANY8__VCMPB_EQ__RSS__RTT__,
+	HEX_INS_PD___VCMPB_EQ__RSS__RTT_,
+	HEX_INS_PD___VCMPB_GTU__RSS__RTT_,
+	HEX_INS_PD___VCMPB_GT__RSS__RTT_,
+	HEX_INS_PD___VCMPB_EQ__RSS___U8_,
+	HEX_INS_PD___VCMPB_GT__RSS___S8_,
+	HEX_INS_PD___VCMPB_GTU__RSS___U7_,
+	HEX_INS_PD___VCMPW_EQ__RSS__RTT_,
+	HEX_INS_PD___VCMPW_GT__RSS__RTT_,
+	HEX_INS_PD___VCMPW_GTU__RSS__RTT_,
+	HEX_INS_PD___VCMPW_EQ__RSS___S8_,
+	HEX_INS_PD___VCMPW_GT__RSS___S8_,
+	HEX_INS_PD___VCMPW_GTU__RSS___U7_,
+	HEX_INS_RD___VITPACK__PS__PT_,
+	HEX_INS_RDD___VMUX__PU__RSS__RTT_,
+	HEX_INS_RDD___ASR__RSS___U6_,
+	HEX_INS_RDD___LSR__RSS___U6_,
+	HEX_INS_RDD___ASL__RSS___U6_,
+	HEX_INS_RDD___ROL__RSS___U6_,
+	HEX_INS_RD___ASR__RS___U5_,
+	HEX_INS_RD___LSR__RS___U5_,
+	HEX_INS_RD___ASL__RS___U5_,
+	HEX_INS_RD___ROL__RS___U5_,
+	HEX_INS_RXX__MINUS_EQ__ASR__RSS___U6_,
+	HEX_INS_RXX__MINUS_EQ__LSR__RSS___U6_,
+	HEX_INS_RXX__MINUS_EQ__ASL__RSS___U6_,
+	HEX_INS_RXX__MINUS_EQ__ROL__RSS___U6_,
+	HEX_INS_RXX__PLUS_EQ__ASR__RSS___U6_,
+	HEX_INS_RXX__PLUS_EQ__LSR__RSS___U6_,
+	HEX_INS_RXX__PLUS_EQ__ASL__RSS___U6_,
+	HEX_INS_RXX__PLUS_EQ__ROL__RSS___U6_,
+	HEX_INS_RX__MINUS_EQ__ASR__RS___U5_,
+	HEX_INS_RX__MINUS_EQ__LSR__RS___U5_,
+	HEX_INS_RX__MINUS_EQ__ASL__RS___U5_,
+	HEX_INS_RX__MINUS_EQ__ROL__RS___U5_,
+	HEX_INS_RX__PLUS_EQ__ASR__RS___U5_,
+	HEX_INS_RX__PLUS_EQ__LSR__RS___U5_,
+	HEX_INS_RX__PLUS_EQ__ASL__RS___U5_,
+	HEX_INS_RX__PLUS_EQ__ROL__RS___U5_,
+	HEX_INS_RX___ADD___U8__ASL__RX___U5__,
+	HEX_INS_RX___SUB___U8__ASL__RX___U5__,
+	HEX_INS_RX___ADD___U8__LSR__RX___U5__,
+	HEX_INS_RX___SUB___U8__LSR__RX___U5__,
+	HEX_INS_RD___ADDASL__RT__RS___U3_,
+	HEX_INS_RXX__AND_EQ__ASR__RSS___U6_,
+	HEX_INS_RXX__AND_EQ__LSR__RSS___U6_,
+	HEX_INS_RXX__AND_EQ__ASL__RSS___U6_,
+	HEX_INS_RXX__AND_EQ__ROL__RSS___U6_,
+	HEX_INS_RXX__OR_EQ__ASR__RSS___U6_,
+	HEX_INS_RXX__OR_EQ__LSR__RSS___U6_,
+	HEX_INS_RXX__OR_EQ__ASL__RSS___U6_,
+	HEX_INS_RXX__OR_EQ__ROL__RSS___U6_,
+	HEX_INS_RXX____LSR__RSS___U6_,
+	HEX_INS_RXX____ASL__RSS___U6_,
+	HEX_INS_RXX____ROL__RSS___U6_,
+	HEX_INS_RX__AND_EQ__ASR__RS___U5_,
+	HEX_INS_RX__AND_EQ__LSR__RS___U5_,
+	HEX_INS_RX__AND_EQ__ASL__RS___U5_,
+	HEX_INS_RX__AND_EQ__ROL__RS___U5_,
+	HEX_INS_RX__OR_EQ__ASR__RS___U5_,
+	HEX_INS_RX__OR_EQ__LSR__RS___U5_,
+	HEX_INS_RX__OR_EQ__ASL__RS___U5_,
+	HEX_INS_RX__OR_EQ__ROL__RS___U5_,
+	HEX_INS_RX____LSR__RS___U5_,
+	HEX_INS_RX____ASL__RS___U5_,
+	HEX_INS_RX____ROL__RS___U5_,
+	HEX_INS_RX___AND___U8__ASL__RX___U5__,
+	HEX_INS_RX___OR___U8__ASL__RX___U5__,
+	HEX_INS_RX___AND___U8__LSR__RX___U5__,
+	HEX_INS_RX___OR___U8__LSR__RX___U5__,
+	HEX_INS_RDD___ASR__RSS___U6___RND,
+	HEX_INS_RD___ASR__RS___U5___RND,
+	HEX_INS_RD___ASL__RS___U5___SAT,
+	HEX_INS_RDD___ASR__RSS__RT_,
+	HEX_INS_RDD___LSR__RSS__RT_,
+	HEX_INS_RDD___ASL__RSS__RT_,
+	HEX_INS_RDD___LSL__RSS__RT_,
+	HEX_INS_RD___ASR__RS__RT_,
+	HEX_INS_RD___LSR__RS__RT_,
+	HEX_INS_RD___ASL__RS__RT_,
+	HEX_INS_RD___LSL__RS__RT_,
+	HEX_INS_RD___LSL___S6__RT_,
+	HEX_INS_RXX__MINUS_EQ__ASR__RSS__RT_,
+	HEX_INS_RXX__MINUS_EQ__LSR__RSS__RT_,
+	HEX_INS_RXX__MINUS_EQ__ASL__RSS__RT_,
+	HEX_INS_RXX__MINUS_EQ__LSL__RSS__RT_,
+	HEX_INS_RXX__PLUS_EQ__ASR__RSS__RT_,
+	HEX_INS_RXX__PLUS_EQ__LSR__RSS__RT_,
+	HEX_INS_RXX__PLUS_EQ__ASL__RSS__RT_,
+	HEX_INS_RXX__PLUS_EQ__LSL__RSS__RT_,
+	HEX_INS_RX__MINUS_EQ__ASR__RS__RT_,
+	HEX_INS_RX__MINUS_EQ__LSR__RS__RT_,
+	HEX_INS_RX__MINUS_EQ__ASL__RS__RT_,
+	HEX_INS_RX__MINUS_EQ__LSL__RS__RT_,
+	HEX_INS_RX__PLUS_EQ__ASR__RS__RT_,
+	HEX_INS_RX__PLUS_EQ__LSR__RS__RT_,
+	HEX_INS_RX__PLUS_EQ__ASL__RS__RT_,
+	HEX_INS_RX__PLUS_EQ__LSL__RS__RT_,
+	HEX_INS_RXX__OR_EQ__ASR__RSS__RT_,
+	HEX_INS_RXX__OR_EQ__LSR__RSS__RT_,
+	HEX_INS_RXX__OR_EQ__ASL__RSS__RT_,
+	HEX_INS_RXX__OR_EQ__LSL__RSS__RT_,
+	HEX_INS_RXX__AND_EQ__ASR__RSS__RT_,
+	HEX_INS_RXX__AND_EQ__LSR__RSS__RT_,
+	HEX_INS_RXX__AND_EQ__ASL__RSS__RT_,
+	HEX_INS_RXX__AND_EQ__LSL__RSS__RT_,
+	HEX_INS_RXX____ASR__RSS__RT_,
+	HEX_INS_RXX____LSR__RSS__RT_,
+	HEX_INS_RXX____ASL__RSS__RT_,
+	HEX_INS_RXX____LSL__RSS__RT_,
+	HEX_INS_RX__OR_EQ__ASR__RS__RT_,
+	HEX_INS_RX__OR_EQ__LSR__RS__RT_,
+	HEX_INS_RX__OR_EQ__ASL__RS__RT_,
+	HEX_INS_RX__OR_EQ__LSL__RS__RT_,
+	HEX_INS_RX__AND_EQ__ASR__RS__RT_,
+	HEX_INS_RX__AND_EQ__LSR__RS__RT_,
+	HEX_INS_RX__AND_EQ__ASL__RS__RT_,
+	HEX_INS_RX__AND_EQ__LSL__RS__RT_,
+	HEX_INS_RD___ASR__RS__RT___SAT,
+	HEX_INS_RD___ASL__RS__RT___SAT,
+	HEX_INS_RDD___VASRH__RSS___U4_,
+	HEX_INS_RDD___VLSRH__RSS___U4_,
+	HEX_INS_RDD___VASLH__RSS___U4_,
+	HEX_INS_RDD___VASRH__RSS___U4___RAW,
+	HEX_INS_RD___VASRHUB__RSS___U4___RAW,
+	HEX_INS_RD___VASRHUB__RSS___U4___SAT,
+	HEX_INS_RDD___VASRH__RSS__RT_,
+	HEX_INS_RDD___VLSRH__RSS__RT_,
+	HEX_INS_RDD___VASLH__RSS__RT_,
+	HEX_INS_RDD___VLSLH__RSS__RT_,
+	HEX_INS_RDD___VASRW__RSS___U5_,
+	HEX_INS_RDD___VLSRW__RSS___U5_,
+	HEX_INS_RDD___VASLW__RSS___U5_,
+	HEX_INS_RDD___VASRW__RSS__RT_,
+	HEX_INS_RDD___VLSRW__RSS__RT_,
+	HEX_INS_RDD___VASLW__RSS__RT_,
+	HEX_INS_RDD___VLSLW__RSS__RT_,
+	HEX_INS_RD___VASRW__RSS___U5_,
+	HEX_INS_RD___VASRW__RSS__RT_,
+	HEX_INS_DUPLEX_RD_____1___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD_____1___DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD_____1___DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD_____1___IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD_____1___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD_____1___IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD_____1___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD_____1___IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD_____1___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD_____1___IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD_____1___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD_____1___JUMPR_LR,
+	HEX_INS_DUPLEX_RD_____1___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD_____1___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD_____1___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD_____1___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD_____1___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD_____1___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD_____1___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD_____1___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD_____1___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD____U6___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD____U6___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD____U6___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD____U6___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD____U6___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD____U6___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD____U6___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD____U6___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD____U6___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD____U6___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD____U6___P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD____U6___RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD____U6___RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD____U6___DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD____U6___DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD____U6___IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD____U6___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD____U6___IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD____U6___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD____U6___IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD____U6___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD____U6___IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD____U6___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD____U6___JUMPR_LR,
+	HEX_INS_DUPLEX_RD___RS___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___RS___DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___RS___DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___RS___IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___RS___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___RS___IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___RS___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___RS___IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___RS___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___RS___IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___RS___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___RS___JUMPR_LR,
+	HEX_INS_DUPLEX_RD___RS___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___RS___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___RU___RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___RU___RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___RU___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___RU___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___RU___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___RU___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___RU___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___RU___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___RU___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___RU___P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___ADD__RS____1____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___ADD__RS___1____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___ADD__RU____1____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___ADD__RU___1____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ADD__SP___U6_2____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___1____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___AND__RS___1____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___AND__RS___1____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___AND__RS___1____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___1____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___1____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___AND__RS___1____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___AND__RS___255____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___AND__RS___255____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___AND__RS___255____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___AND__RS___255____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___255____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___AND__RS___255____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___AND__RS___255____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___AND__RU___1____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___AND__RU___1____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___AND__RU___1____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___AND__RU___1____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___AND__RU___1____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___AND__RU___1____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___AND__RU___1____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___AND__RU___1____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___AND__RU___1____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___AND__RU___1____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___AND__RU___255____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___AND__RU___255____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___AND__RU___255____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___AND__RU___255____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___AND__RU___255____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___AND__RU___255____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___AND__RU___255____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___AND__RU___255____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___AND__RU___255____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___AND__RU___255____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMB__RS____U3_0____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___MEMB__RU____U3_0____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMH__RS____U3_1____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___MEMH__RU____U3_1____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMUB__RS____U4_0____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___MEMUB__RU____U4_0____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMUH__RS____U3_1____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___MEMUH__RU____U3_1____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMW__RS____U4_2____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___MEMW__RU____U4_2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___MEMW__SP____U5_2____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___SXTB__RS____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___SXTB__RS____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___SXTB__RS____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___SXTB__RS____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___SXTB__RS____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___SXTB__RS____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___SXTB__RS____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___SXTB__RU____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___SXTB__RU____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___SXTB__RU____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___SXTB__RU____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___SXTB__RU____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___SXTB__RU____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___SXTB__RU____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___SXTB__RU____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___SXTB__RU____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___SXTB__RU____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___SXTH__RS____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___SXTH__RS____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___SXTH__RS____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___SXTH__RS____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___SXTH__RS____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___SXTH__RS____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___SXTH__RS____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___SXTH__RU____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___SXTH__RU____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___SXTH__RU____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___SXTH__RU____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___SXTH__RU____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___SXTH__RU____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___SXTH__RU____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___SXTH__RU____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___SXTH__RU____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___SXTH__RU____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____JUMPR_LR,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RD___ZXTH__RS____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RD___ZXTH__RU____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0___U2____JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RS____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___0__RU____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___1___U2____JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___2___U2____JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE___3___U2____JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RDD___COMBINE__RS___0____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RDD___COMBINE__RU___0____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RDD___MEMD__SP____U5_3____JUMPR_LR,
+	HEX_INS_DUPLEX_RE_____1___RD_____1,
+	HEX_INS_DUPLEX_RE_____1___RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE_____1___RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE_____1___RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE_____1___RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE_____1___RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE_____1___RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE_____1___RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE_____1___RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE_____1___RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE_____1___IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE_____1___IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE_____1___IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE_____1___IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE____U6___RD_____1,
+	HEX_INS_DUPLEX_RE____U6___RD____U6,
+	HEX_INS_DUPLEX_RE____U6___RD___ADD__RS____1_,
+	HEX_INS_DUPLEX_RE____U6___RD___ADD__RS___1_,
+	HEX_INS_DUPLEX_RE____U6___RD___ADD__SP___U6_2_,
+	HEX_INS_DUPLEX_RE____U6___RD___AND__RS___1_,
+	HEX_INS_DUPLEX_RE____U6___RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE____U6___RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE____U6___RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE____U6___RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE____U6___RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE____U6___RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE____U6___RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE____U6___RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE____U6___RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE____U6___RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE____U6___IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE____U6___IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE____U6___IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE____U6___IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE____U6___RD___RS,
+	HEX_INS_DUPLEX_RE____U6___RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE____U6___RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RE____U6___RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___RS___RD_____1,
+	HEX_INS_DUPLEX_RE___RS___RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___RS___RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___RS___RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___RS___IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___RS___IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___RS___IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___RS___IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___RU___RD___RS,
+	HEX_INS_DUPLEX_RE___RU___RD___ADD__RS____1_,
+	HEX_INS_DUPLEX_RE___RU___RD___ADD__RS___1_,
+	HEX_INS_DUPLEX_RE___RU___RD___AND__RS___1_,
+	HEX_INS_DUPLEX_RE___RU___RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___RU___RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___RU___RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___RU___RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___RU___RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___RU___RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___RU___RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE___RU___RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RE___RU___RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___RU___RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___RU___RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____RD_____1,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RS____1____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____RD_____1,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RS___1____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___ADD__RS____1_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU____1____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___ADD__RS____1_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___ADD__RS___1_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___AND__RS___1_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___ADD__RU___1____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD_____1,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ADD__RS____1_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ADD__RS___1_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ADD__SP___U6_2_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___AND__RS___1_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___RS,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RE___ADD__SP___U6_2____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___AND__RS___1____RD_____1,
+	HEX_INS_DUPLEX_RE___AND__RS___1____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___1____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___1____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___AND__RS___1____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RS___1____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RS___1____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RS___1____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RS___255____RD_____1,
+	HEX_INS_DUPLEX_RE___AND__RS___255____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___255____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___AND__RS___255____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___AND__RS___255____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RS___255____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RS___255____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RS___255____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___ADD__RS____1_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___AND__RS___1_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___AND__RU___1____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___AND__RU___255____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___MEMB__RS____U3_0____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___MEMB__RS____U3_0____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___MEMB__RU____U3_0____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___MEMH__RS____U3_1____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___MEMH__RS____U3_1____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___MEMH__RU____U3_1____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___MEMH__RU____U3_1____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___MEMH__RU____U3_1____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___MEMUB__RS____U4_0____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___MEMUB__RS____U4_0____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___MEMUB__RU____U4_0____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___MEMUH__RS____U3_1____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___MEMUH__RS____U3_1____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___MEMUH__RU____U3_1____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___MEMUH__RU____U3_1____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___MEMW__RS____U4_2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___MEMW__RS____U4_2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___MEMW__RU____U4_2____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___MEMW__SP____U5_2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___MEMW__SP____U5_2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___SXTB__RS____RD_____1,
+	HEX_INS_DUPLEX_RE___SXTB__RS____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___SXTB__RS____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___SXTB__RS____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___SXTB__RS____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___SXTB__RS____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___SXTB__RS____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___SXTB__RS____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___SXTB__RU____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___SXTH__RS____RD_____1,
+	HEX_INS_DUPLEX_RE___SXTH__RS____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___SXTH__RS____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___SXTH__RS____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___SXTH__RS____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___SXTH__RS____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___SXTH__RS____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___SXTH__RS____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___SXTH__RU____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____RD_____1,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RE___ZXTH__RS____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RE___ZXTH__RU____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_REE___COMBINE___0___U2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RS____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RS____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RU____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RU____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_REE___COMBINE___0__RU____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_REE___COMBINE___1___U2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_REE___COMBINE___2___U2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_REE___COMBINE___3___U2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_REE___COMBINE__RS___0____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_REE___COMBINE__RS___0____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_REE___COMBINE__RU___0____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_REE___COMBINE__RU___0____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_REE___MEMD__SP____U5_3____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____RD_____1,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RX___ADD__RS__RX____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RX___ADD__RU__RX____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD_____1,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD____U6,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ADD__RS____1_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ADD__RS___1_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ADD__SP___U6_2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___AND__RS___1_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___AND__RS___255_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___RS,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___SXTB__RS_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___SXTH__RS_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____RD___ZXTH__RS_,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX___S7____JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____RD_____1,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____DEALLOCFRAME,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____JUMPR_LR,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_RX___ADD__RX__RS____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_RX___ADD__RX__RU____P0___CMP_EQ__RS___U2_,
+	HEX_INS_DUPLEX_RY___ADD__RU__RY____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RY___ADD__RU__RY____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RY___ADD__RY___S7____RX___ADD__RX___S7_,
+	HEX_INS_DUPLEX_RY___ADD__RY___S7____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RY___ADD__RY___S7____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_RY___ADD__RY__RU____RX___ADD__RS__RX_,
+	HEX_INS_DUPLEX_RY___ADD__RY__RU____RX___ADD__RX__RS_,
+	HEX_INS_DUPLEX_DEALLOCFRAME___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_DEALLOCFRAME___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_DEALLOCFRAME___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_DEALLOCFRAME___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_DEALLOCFRAME___JUMPR_LR,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_DEALLOCFRAME___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___DEALLOCFRAME,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___JUMPR_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RD____0___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_IF___NOT__P0__RE____0___IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___DEALLOCFRAME,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___JUMPR_LR,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RD____0___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_IF___NOT__P0_NEW__RE____0___IF__P0__RD____0,
+	HEX_INS_DUPLEX_IF__P0__RD____0___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_IF__P0__RD____0___DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF__P0__RD____0___DEALLOCFRAME,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF__P0__RD____0___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF__P0__RD____0___JUMPR_LR,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_IF__P0__RD____0___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_IF__P0__RE____0___IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_IF__P0__RE____0___IF__P0__RD____0,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___DEALLOCFRAME,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___JUMPR_LR,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_IF__P0_NEW__RD____0___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF__P0__RD____0,
+	HEX_INS_DUPLEX_IF__P0_NEW__RE____0___IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0_____0___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0_____0___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0_____0___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0_____1___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0_____1___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0_____1___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0____RT___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0____RV___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMB__RS____U4_0____RV___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____0___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0_____1___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0____RT___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0____RV___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0____RV___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMB__RU____U4_0____RV___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RTT___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RVV___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RVV___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMD__SP____S6_3____RVV___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMH__RS____U3_1____RT___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMH__RS____U3_1____RV___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMH__RS____U3_1____RV___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMH__RU____U3_1____RT___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMH__RU____U3_1____RV___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2_____0___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2_____0___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2_____0___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2_____1___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2_____1___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2_____1___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2____RT___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2____RV___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMW__RS____U4_2____RV___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____0___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2_____1___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2____RT___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2____RV___MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2____RV___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMW__RU____U4_2____RV___MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RT___MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RV___MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RV___MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_MEMW__SP____U5_2____RV___MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RD_____1,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RD___MEMW__SP____U5_2_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___0___U2_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___1___U2_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___2___U2_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___COMBINE___3___U2_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____RDD___MEMD__SP____U5_3_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____ALLOCFRAME___U5_3_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0__RD____0,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0__RD____0,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0_NEW__RD____0,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____MEMD__SP____S6_3____RTT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____MEMW__SP____U5_2____RT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____DEALLOC_RETURN,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____DEALLOCFRAME,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF___NOT__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0__DEALLOC_RETURN,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0__JUMPR_LR,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0_NEW__DEALLOC_RETURN_NT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____IF__P0_NEW__JUMPR_NT_LR,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RS___U2____JUMPR_LR,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMB__RS____U3_0_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMH__RS____U3_1_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMUB__RS____U4_0_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMUH__RS____U3_1_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RD___MEMW__RS____U4_2_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RDD___COMBINE___0__RS_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____RDD___COMBINE__RS___0_,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMB__RS____U4_0_____0,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMB__RS____U4_0_____1,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMB__RS____U4_0____RT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMH__RS____U3_1____RT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMW__RS____U4_2_____0,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMW__RS____U4_2_____1,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____MEMW__RS____U4_2____RT,
+	HEX_INS_DUPLEX_P0___CMP_EQ__RU___U2____P0___CMP_EQ__RS___U2_,
+};
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/hppa/gnu/hppa-dis.c radare2-2.8.0+dfsg/libr/asm/arch/hppa/gnu/hppa-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/hppa/gnu/hppa-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/hppa/gnu/hppa-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,7 +22,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "libhppa.h"
 #include "opcode/hppa.h"
 #include <string.h>
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/include/disas-asm.h radare2-2.8.0+dfsg/libr/asm/arch/include/disas-asm.h
--- radare2-2.3.0+dfsg/libr/asm/arch/include/disas-asm.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/include/disas-asm.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,443 @@
+/* Interface between the opcode library and its callers.
+
+   Copyright (C) 1999-2017 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.
+
+   Written by Cygnus Support, 1993.
+
+   The opcode library (libopcodes.a) provides instruction decoders for
+   a large variety of instruction sets, callable with an identical
+   interface, for making instruction-processing programs more independent
+   of the instruction set being processed.  */
+
+#ifndef DIS_ASM_H
+#define DIS_ASM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include "mybfd.h"
+
+#define bfd_zalloc calloc
+#define bfd_malloc malloc
+#define xmalloc malloc
+
+  typedef int (*fprintf_ftype) (void *, const char*, ...) ATTRIBUTE_FPTR_PRINTF_2;
+
+enum dis_insn_type
+{
+  dis_noninsn,			/* Not a valid instruction.  */
+  dis_nonbranch,		/* Not a branch instruction.  */
+  dis_branch,			/* Unconditional branch.  */
+  dis_condbranch,		/* Conditional branch.  */
+  dis_jsr,			/* Jump to subroutine.  */
+  dis_condjsr,			/* Conditional jump to subroutine.  */
+  dis_dref,			/* Data reference instruction.  */
+  dis_dref2			/* Two data references in instruction.  */
+};
+
+/* This struct is passed into the instruction decoding routine,
+   and is passed back out into each callback.  The various fields are used
+   for conveying information from your main routine into your callbacks,
+   for passing information into the instruction decoders (such as the
+   addresses of the callback functions), or for passing information
+   back from the instruction decoders to their callers.
+
+   It must be initialized before it is first passed; this can be done
+   by hand, or using one of the initialization macros below.  */
+
+typedef struct disassemble_info
+{
+  fprintf_ftype fprintf_func;
+  void *stream;
+  void *application_data;
+
+  /* Target description.  We could replace this with a pointer to the bfd,
+     but that would require one.  There currently isn't any such requirement
+     so to avoid introducing one we record these explicitly.  */
+  /* The bfd_flavour.  This can be bfd_target_unknown_flavour.  */
+  enum bfd_flavour flavour;
+  /* The bfd_arch value.  */
+  enum bfd_architecture arch;
+  /* The bfd_mach value.  */
+  unsigned long mach;
+  /* Endianness (for bi-endian cpus).  Mono-endian cpus can ignore this.  */
+  enum bfd_endian endian;
+  /* Endianness of code, for mixed-endian situations such as ARM BE8.  */
+  enum bfd_endian endian_code;
+  /* An arch/mach-specific bitmask of selected instruction subsets, mainly
+     for processors with run-time-switchable instruction sets.  The default,
+     zero, means that there is no constraint.  CGEN-based opcodes ports
+     may use ISA_foo masks.  */
+  void *insn_sets;
+
+  /* Some targets need information about the current section to accurately
+     display insns.  If this is NULL, the target disassembler function
+     will have to make its best guess.  */
+  asection *section;
+
+  /* An array of pointers to symbols either at the location being disassembled
+     or at the start of the function being disassembled.  The array is sorted
+     so that the first symbol is intended to be the one used.  The others are
+     present for any misc. purposes.  This is not set reliably, but if it is
+     not NULL, it is correct.  */
+  asymbol **symbols;
+  /* Number of symbols in array.  */
+  int num_symbols;
+
+  /* Symbol table provided for targets that want to look at it.  This is
+     used on Arm to find mapping symbols and determine Arm/Thumb code.  */
+  asymbol **symtab;
+  int symtab_pos;
+  int symtab_size;
+
+  /* For use by the disassembler.
+     The top 16 bits are reserved for public use (and are documented here).
+     The bottom 16 bits are for the internal use of the disassembler.  */
+  unsigned long flags;
+  /* Set if the disassembler has determined that there are one or more
+     relocations associated with the instruction being disassembled.  */
+#define INSN_HAS_RELOC	 (1 << 31)
+  /* Set if the user has requested the disassembly of data as well as code.  */
+#define DISASSEMBLE_DATA (1 << 30)
+  /* Set if the user has specifically set the machine type encoded in the
+     mach field of this structure.  */
+#define USER_SPECIFIED_MACHINE_TYPE (1 << 29)
+
+  /* Use internally by the target specific disassembly code.  */
+  void *private_data;
+
+  /* Function used to get bytes to disassemble.  MEMADDR is the
+     address of the stuff to be disassembled, MYADDR is the address to
+     put the bytes in, and LENGTH is the number of bytes to read.
+     INFO is a pointer to this struct.
+     Returns an errno value or 0 for success.  */
+  int (*read_memory_func)
+    (bfd_vma memaddr, bfd_byte *myaddr, unsigned int length,
+     struct disassemble_info *dinfo);
+
+  /* Function which should be called if we get an error that we can't
+     recover from.  STATUS is the errno value from read_memory_func and
+     MEMADDR is the address that we were trying to read.  INFO is a
+     pointer to this struct.  */
+  void (*memory_error_func)
+    (int status, bfd_vma memaddr, struct disassemble_info *dinfo);
+
+  /* Function called to print ADDR.  */
+  void (*print_address_func)
+    (bfd_vma addr, struct disassemble_info *dinfo);
+
+  /* Function called to determine if there is a symbol at the given ADDR.
+     If there is, the function returns 1, otherwise it returns 0.
+     This is used by ports which support an overlay manager where
+     the overlay number is held in the top part of an address.  In
+     some circumstances we want to include the overlay number in the
+     address, (normally because there is a symbol associated with
+     that address), but sometimes we want to mask out the overlay bits.  */
+  int (* symbol_at_address_func)
+    (bfd_vma addr, struct disassemble_info *dinfo);
+
+  /* Function called to check if a SYMBOL is can be displayed to the user.
+     This is used by some ports that want to hide special symbols when
+     displaying debugging outout.  */
+  bfd_boolean (* symbol_is_valid)
+    (asymbol *, struct disassemble_info *dinfo);
+
+  /* These are for buffer_read_memory.  */
+  bfd_byte *buffer;
+  bfd_vma buffer_vma;
+  unsigned int buffer_length;
+
+  /* This variable may be set by the instruction decoder.  It suggests
+      the number of bytes objdump should display on a single line.  If
+      the instruction decoder sets this, it should always set it to
+      the same value in order to get reasonable looking output.  */
+  int bytes_per_line;
+
+  /* The next two variables control the way objdump displays the raw data.  */
+  /* For example, if bytes_per_line is 8 and bytes_per_chunk is 4, the */
+  /* output will look like this:
+     00:   00000000 00000000
+     with the chunks displayed according to "display_endian". */
+  int bytes_per_chunk;
+  enum bfd_endian display_endian;
+
+  /* Number of octets per incremented target address
+     Normally one, but some DSPs have byte sizes of 16 or 32 bits.  */
+  unsigned int octets_per_byte;
+
+  /* The number of zeroes we want to see at the end of a section before we
+     start skipping them.  */
+  unsigned int skip_zeroes;
+
+  /* The number of zeroes to skip at the end of a section.  If the number
+     of zeroes at the end is between SKIP_ZEROES_AT_END and SKIP_ZEROES,
+     they will be disassembled.  If there are fewer than
+     SKIP_ZEROES_AT_END, they will be skipped.  This is a heuristic
+     attempt to avoid disassembling zeroes inserted by section
+     alignment.  */
+  unsigned int skip_zeroes_at_end;
+
+  /* Whether the disassembler always needs the relocations.  */
+  bfd_boolean disassembler_needs_relocs;
+
+  /* Results from instruction decoders.  Not all decoders yet support
+     this information.  This info is set each time an instruction is
+     decoded, and is only valid for the last such instruction.
+
+     To determine whether this decoder supports this information, set
+     insn_info_valid to 0, decode an instruction, then check it.  */
+
+  char insn_info_valid;		/* Branch info has been set. */
+  char branch_delay_insns;	/* How many sequential insn's will run before
+				   a branch takes effect.  (0 = normal) */
+  char data_size;		/* Size of data reference in insn, in bytes */
+  enum dis_insn_type insn_type;	/* Type of instruction */
+  bfd_vma target;		/* Target address of branch or dref, if known;
+				   zero if unknown.  */
+  bfd_vma target2;		/* Second target address for dref2 */
+
+  /* Command line options specific to the target disassembler.  */
+  char * disassembler_options;
+
+  /* If non-zero then try not disassemble beyond this address, even if
+     there are values left in the buffer.  This address is the address
+     of the nearest symbol forwards from the start of the disassembly,
+     and it is assumed that it lies on the boundary between instructions.
+     If an instruction spans this address then this is an error in the
+     file being disassembled.  */
+  bfd_vma stop_vma;
+
+} disassemble_info;
+
+/* This struct is used to pass information about valid disassembler options
+   and their descriptions from the target to the generic GDB functions that
+   set and display them.  */
+
+typedef struct
+{
+  const char **name;
+  const char **description;
+} disasm_options_t;
+
+
+/* Standard disassemblers.  Disassemble one instruction at the given
+   target address.  Return number of octets processed.  */
+typedef int (*disassembler_ftype) (bfd_vma, disassemble_info *);
+
+extern int print_insn_aarch64		(bfd_vma, disassemble_info *);
+extern int print_insn_alpha		(bfd_vma, disassemble_info *);
+extern int print_insn_avr		(bfd_vma, disassemble_info *);
+extern int print_insn_bfin		(bfd_vma, disassemble_info *);
+extern int print_insn_big_arm		(bfd_vma, disassemble_info *);
+extern int print_insn_big_mips		(bfd_vma, disassemble_info *);
+extern int print_insn_big_nios2		(bfd_vma, disassemble_info *);
+extern int print_insn_big_powerpc	(bfd_vma, disassemble_info *);
+extern int print_insn_big_score         (bfd_vma, disassemble_info *);
+extern int print_insn_cr16              (bfd_vma, disassemble_info *);
+extern int print_insn_crx               (bfd_vma, disassemble_info *);
+extern int print_insn_d10v		(bfd_vma, disassemble_info *);
+extern int print_insn_d30v		(bfd_vma, disassemble_info *);
+extern int print_insn_dlx 		(bfd_vma, disassemble_info *);
+extern int print_insn_epiphany		(bfd_vma, disassemble_info *);
+extern int print_insn_fr30		(bfd_vma, disassemble_info *);
+extern int print_insn_frv		(bfd_vma, disassemble_info *);
+extern int print_insn_ft32  		(bfd_vma, disassemble_info *);
+extern int print_insn_h8300		(bfd_vma, disassemble_info *);
+extern int print_insn_h8300h		(bfd_vma, disassemble_info *);
+extern int print_insn_h8300s		(bfd_vma, disassemble_info *);
+extern int print_insn_h8500		(bfd_vma, disassemble_info *);
+extern int print_insn_lanai             (bfd_vma, disassemble_info *);
+extern int print_insn_hppa		(bfd_vma, disassemble_info *);
+extern int print_insn_i370		(bfd_vma, disassemble_info *);
+extern int print_insn_i386		(bfd_vma, disassemble_info *);
+extern int print_insn_i386_att		(bfd_vma, disassemble_info *);
+extern int print_insn_i386_intel	(bfd_vma, disassemble_info *);
+extern int print_insn_i860		(bfd_vma, disassemble_info *);
+extern int print_insn_i960		(bfd_vma, disassemble_info *);
+extern int print_insn_ia64		(bfd_vma, disassemble_info *);
+extern int print_insn_ip2k		(bfd_vma, disassemble_info *);
+extern int print_insn_iq2000		(bfd_vma, disassemble_info *);
+extern int print_insn_little_arm	(bfd_vma, disassemble_info *);
+extern int print_insn_little_mips	(bfd_vma, disassemble_info *);
+extern int print_insn_little_nios2	(bfd_vma, disassemble_info *);
+extern int print_insn_little_powerpc	(bfd_vma, disassemble_info *);
+extern int print_insn_riscv		(bfd_vma, disassemble_info *);
+extern int print_insn_little_score      (bfd_vma, disassemble_info *); 
+extern int print_insn_lm32		(bfd_vma, disassemble_info *);
+extern int print_insn_m32c	        (bfd_vma, disassemble_info *);
+extern int print_insn_m32r		(bfd_vma, disassemble_info *);
+extern int print_insn_m68hc11		(bfd_vma, disassemble_info *);
+extern int print_insn_m68hc12		(bfd_vma, disassemble_info *);
+extern int print_insn_m9s12x		(bfd_vma, disassemble_info *);
+extern int print_insn_m9s12xg		(bfd_vma, disassemble_info *);
+extern int print_insn_m68k		(bfd_vma, disassemble_info *);
+extern int print_insn_m88k		(bfd_vma, disassemble_info *);
+extern int print_insn_mcore		(bfd_vma, disassemble_info *);
+extern int print_insn_mep		(bfd_vma, disassemble_info *);
+extern int print_insn_metag		(bfd_vma, disassemble_info *);
+extern int print_insn_microblaze	(bfd_vma, disassemble_info *);
+extern int print_insn_mmix		(bfd_vma, disassemble_info *);
+extern int print_insn_mn10200		(bfd_vma, disassemble_info *);
+extern int print_insn_mn10300		(bfd_vma, disassemble_info *);
+extern int print_insn_moxie		(bfd_vma, disassemble_info *);
+extern int print_insn_msp430		(bfd_vma, disassemble_info *);
+extern int print_insn_mt                (bfd_vma, disassemble_info *);
+extern int print_insn_nds32		(bfd_vma, disassemble_info *);
+extern int print_insn_ns32k		(bfd_vma, disassemble_info *);
+extern int print_insn_or1k		(bfd_vma, disassemble_info *);
+extern int print_insn_pdp11		(bfd_vma, disassemble_info *);
+extern int print_insn_pj		(bfd_vma, disassemble_info *);
+extern int print_insn_pru		(bfd_vma, disassemble_info *);
+extern int print_insn_rs6000		(bfd_vma, disassemble_info *);
+extern int print_insn_s390		(bfd_vma, disassemble_info *);
+extern int print_insn_sh		(bfd_vma, disassemble_info *);
+extern int print_insn_sh64		(bfd_vma, disassemble_info *);
+extern int print_insn_sh64x_media	(bfd_vma, disassemble_info *);
+extern int print_insn_sparc		(bfd_vma, disassemble_info *);
+extern int print_insn_spu		(bfd_vma, disassemble_info *);
+extern int print_insn_tic30		(bfd_vma, disassemble_info *);
+extern int print_insn_tic4x		(bfd_vma, disassemble_info *);
+extern int print_insn_tic54x		(bfd_vma, disassemble_info *);
+extern int print_insn_tic6x		(bfd_vma, disassemble_info *);
+extern int print_insn_tic80		(bfd_vma, disassemble_info *);
+extern int print_insn_tilegx		(bfd_vma, disassemble_info *);
+extern int print_insn_tilepro		(bfd_vma, disassemble_info *);
+extern int print_insn_v850		(bfd_vma, disassemble_info *);
+extern int print_insn_vax		(bfd_vma, disassemble_info *);
+extern int print_insn_visium		(bfd_vma, disassemble_info *);
+extern int print_insn_w65		(bfd_vma, disassemble_info *);
+extern int print_insn_xc16x		(bfd_vma, disassemble_info *);
+extern int print_insn_xgate             (bfd_vma, disassemble_info *);
+extern int print_insn_xstormy16		(bfd_vma, disassemble_info *);
+extern int print_insn_xtensa		(bfd_vma, disassemble_info *);
+extern int print_insn_z80		(bfd_vma, disassemble_info *);
+extern int print_insn_z8001		(bfd_vma, disassemble_info *);
+extern int print_insn_z8002		(bfd_vma, disassemble_info *);
+extern int print_insn_rx		(bfd_vma, disassemble_info *);
+extern int print_insn_rl78		(bfd_vma, disassemble_info *);
+extern int print_insn_rl78_g10		(bfd_vma, disassemble_info *);
+extern int print_insn_rl78_g13		(bfd_vma, disassemble_info *);
+extern int print_insn_rl78_g14		(bfd_vma, disassemble_info *);
+
+extern disassembler_ftype arc_get_disassembler (bfd *);
+extern disassembler_ftype cris_get_disassembler (bfd *);
+extern disassembler_ftype rl78_get_disassembler (bfd *);
+
+extern void print_aarch64_disassembler_options (FILE *);
+extern void print_i386_disassembler_options (FILE *);
+extern void print_mips_disassembler_options (FILE *);
+extern void print_ppc_disassembler_options (FILE *);
+extern void print_riscv_disassembler_options (FILE *);
+extern void print_arm_disassembler_options (FILE *);
+extern void print_arc_disassembler_options (FILE *);
+extern void print_s390_disassembler_options (FILE *);
+extern bfd_boolean aarch64_symbol_is_valid (asymbol *, struct disassemble_info *);
+extern bfd_boolean arm_symbol_is_valid (asymbol *, struct disassemble_info *);
+extern void disassemble_init_powerpc (struct disassemble_info *);
+extern void disassemble_init_s390 (struct disassemble_info *);
+extern const disasm_options_t *disassembler_options_powerpc (void);
+extern const disasm_options_t *disassembler_options_arm (void);
+extern const disasm_options_t *disassembler_options_s390 (void);
+
+/* Fetch the disassembler for a given BFD, if that support is available.  */
+extern disassembler_ftype disassembler (bfd *);
+
+/* Amend the disassemble_info structure as necessary for the target architecture.
+   Should only be called after initialising the info->arch field.  */
+extern void disassemble_init_for_target (struct disassemble_info * dinfo);
+
+/* Document any target specific options available from the disassembler.  */
+extern void disassembler_usage (FILE *);
+
+/* Remove whitespace and consecutive commas.  */
+extern char *remove_whitespace_and_extra_commas (char *);
+
+/* Like STRCMP, but treat ',' the same as '\0' so that we match
+   strings like "foobar" against "foobar,xxyyzz,...".  */
+extern int disassembler_options_cmp (const char *, const char *);
+
+/* A helper function for FOR_EACH_DISASSEMBLER_OPTION.  */
+static inline char *
+next_disassembler_option (char *options)
+{
+  char *opt = strchr (options, ',');
+  if (opt != NULL)
+    opt++;
+  return opt;
+}
+
+/* A macro for iterating over each comma separated option in OPTIONS.  */
+#define FOR_EACH_DISASSEMBLER_OPTION(OPT, OPTIONS) \
+  for ((OPT) = (OPTIONS); \
+       (OPT) != NULL; \
+       (OPT) = next_disassembler_option (OPT))
+
+
+/* This block of definitions is for particular callers who read instructions
+   into a buffer before calling the instruction decoder.  */
+
+/* Here is a function which callers may wish to use for read_memory_func.
+   It gets bytes from a buffer.  */
+extern int buffer_read_memory
+  (bfd_vma, bfd_byte *, unsigned int, struct disassemble_info *);
+
+/* This function goes with buffer_read_memory.
+   It prints a message using info->fprintf_func and info->stream.  */
+extern void perror_memory (int, bfd_vma, struct disassemble_info *);
+
+
+/* Just print the address in hex.  This is included for completeness even
+   though both GDB and objdump provide their own (to print symbolic
+   addresses).  */
+extern void generic_print_address
+  (bfd_vma, struct disassemble_info *);
+
+/* Always true.  */
+extern int generic_symbol_at_address
+  (bfd_vma, struct disassemble_info *);
+
+/* Also always true.  */
+extern bfd_boolean generic_symbol_is_valid
+  (asymbol *, struct disassemble_info *);
+
+/* Method to initialize a disassemble_info struct.  This should be
+   called by all applications creating such a struct.  */
+extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream,
+				   fprintf_ftype fprintf_func);
+
+extern int print_insn_tricore (bfd_vma memaddr, struct disassemble_info *info);
+
+/* For compatibility with existing code.  */
+#define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \
+  init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC))
+#define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \
+  init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC))
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef _MSC_VER
+#undef xmalloc
+#endif
+
+#endif /* ! defined (DIS_ASM_H) */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/include/dis-asm.h radare2-2.8.0+dfsg/libr/asm/arch/include/dis-asm.h
--- radare2-2.3.0+dfsg/libr/asm/arch/include/dis-asm.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/include/dis-asm.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,443 +0,0 @@
-/* Interface between the opcode library and its callers.
-
-   Copyright (C) 1999-2017 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor,
-   Boston, MA 02110-1301, USA.
-
-   Written by Cygnus Support, 1993.
-
-   The opcode library (libopcodes.a) provides instruction decoders for
-   a large variety of instruction sets, callable with an identical
-   interface, for making instruction-processing programs more independent
-   of the instruction set being processed.  */
-
-#ifndef DIS_ASM_H
-#define DIS_ASM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include "mybfd.h"
-
-#define bfd_zalloc calloc
-#define bfd_malloc malloc
-#define xmalloc malloc
-
-  typedef int (*fprintf_ftype) (void *, const char*, ...) ATTRIBUTE_FPTR_PRINTF_2;
-
-enum dis_insn_type
-{
-  dis_noninsn,			/* Not a valid instruction.  */
-  dis_nonbranch,		/* Not a branch instruction.  */
-  dis_branch,			/* Unconditional branch.  */
-  dis_condbranch,		/* Conditional branch.  */
-  dis_jsr,			/* Jump to subroutine.  */
-  dis_condjsr,			/* Conditional jump to subroutine.  */
-  dis_dref,			/* Data reference instruction.  */
-  dis_dref2			/* Two data references in instruction.  */
-};
-
-/* This struct is passed into the instruction decoding routine,
-   and is passed back out into each callback.  The various fields are used
-   for conveying information from your main routine into your callbacks,
-   for passing information into the instruction decoders (such as the
-   addresses of the callback functions), or for passing information
-   back from the instruction decoders to their callers.
-
-   It must be initialized before it is first passed; this can be done
-   by hand, or using one of the initialization macros below.  */
-
-typedef struct disassemble_info
-{
-  fprintf_ftype fprintf_func;
-  void *stream;
-  void *application_data;
-
-  /* Target description.  We could replace this with a pointer to the bfd,
-     but that would require one.  There currently isn't any such requirement
-     so to avoid introducing one we record these explicitly.  */
-  /* The bfd_flavour.  This can be bfd_target_unknown_flavour.  */
-  enum bfd_flavour flavour;
-  /* The bfd_arch value.  */
-  enum bfd_architecture arch;
-  /* The bfd_mach value.  */
-  unsigned long mach;
-  /* Endianness (for bi-endian cpus).  Mono-endian cpus can ignore this.  */
-  enum bfd_endian endian;
-  /* Endianness of code, for mixed-endian situations such as ARM BE8.  */
-  enum bfd_endian endian_code;
-  /* An arch/mach-specific bitmask of selected instruction subsets, mainly
-     for processors with run-time-switchable instruction sets.  The default,
-     zero, means that there is no constraint.  CGEN-based opcodes ports
-     may use ISA_foo masks.  */
-  void *insn_sets;
-
-  /* Some targets need information about the current section to accurately
-     display insns.  If this is NULL, the target disassembler function
-     will have to make its best guess.  */
-  asection *section;
-
-  /* An array of pointers to symbols either at the location being disassembled
-     or at the start of the function being disassembled.  The array is sorted
-     so that the first symbol is intended to be the one used.  The others are
-     present for any misc. purposes.  This is not set reliably, but if it is
-     not NULL, it is correct.  */
-  asymbol **symbols;
-  /* Number of symbols in array.  */
-  int num_symbols;
-
-  /* Symbol table provided for targets that want to look at it.  This is
-     used on Arm to find mapping symbols and determine Arm/Thumb code.  */
-  asymbol **symtab;
-  int symtab_pos;
-  int symtab_size;
-
-  /* For use by the disassembler.
-     The top 16 bits are reserved for public use (and are documented here).
-     The bottom 16 bits are for the internal use of the disassembler.  */
-  unsigned long flags;
-  /* Set if the disassembler has determined that there are one or more
-     relocations associated with the instruction being disassembled.  */
-#define INSN_HAS_RELOC	 (1 << 31)
-  /* Set if the user has requested the disassembly of data as well as code.  */
-#define DISASSEMBLE_DATA (1 << 30)
-  /* Set if the user has specifically set the machine type encoded in the
-     mach field of this structure.  */
-#define USER_SPECIFIED_MACHINE_TYPE (1 << 29)
-
-  /* Use internally by the target specific disassembly code.  */
-  void *private_data;
-
-  /* Function used to get bytes to disassemble.  MEMADDR is the
-     address of the stuff to be disassembled, MYADDR is the address to
-     put the bytes in, and LENGTH is the number of bytes to read.
-     INFO is a pointer to this struct.
-     Returns an errno value or 0 for success.  */
-  int (*read_memory_func)
-    (bfd_vma memaddr, bfd_byte *myaddr, unsigned int length,
-     struct disassemble_info *dinfo);
-
-  /* Function which should be called if we get an error that we can't
-     recover from.  STATUS is the errno value from read_memory_func and
-     MEMADDR is the address that we were trying to read.  INFO is a
-     pointer to this struct.  */
-  void (*memory_error_func)
-    (int status, bfd_vma memaddr, struct disassemble_info *dinfo);
-
-  /* Function called to print ADDR.  */
-  void (*print_address_func)
-    (bfd_vma addr, struct disassemble_info *dinfo);
-
-  /* Function called to determine if there is a symbol at the given ADDR.
-     If there is, the function returns 1, otherwise it returns 0.
-     This is used by ports which support an overlay manager where
-     the overlay number is held in the top part of an address.  In
-     some circumstances we want to include the overlay number in the
-     address, (normally because there is a symbol associated with
-     that address), but sometimes we want to mask out the overlay bits.  */
-  int (* symbol_at_address_func)
-    (bfd_vma addr, struct disassemble_info *dinfo);
-
-  /* Function called to check if a SYMBOL is can be displayed to the user.
-     This is used by some ports that want to hide special symbols when
-     displaying debugging outout.  */
-  bfd_boolean (* symbol_is_valid)
-    (asymbol *, struct disassemble_info *dinfo);
-
-  /* These are for buffer_read_memory.  */
-  bfd_byte *buffer;
-  bfd_vma buffer_vma;
-  unsigned int buffer_length;
-
-  /* This variable may be set by the instruction decoder.  It suggests
-      the number of bytes objdump should display on a single line.  If
-      the instruction decoder sets this, it should always set it to
-      the same value in order to get reasonable looking output.  */
-  int bytes_per_line;
-
-  /* The next two variables control the way objdump displays the raw data.  */
-  /* For example, if bytes_per_line is 8 and bytes_per_chunk is 4, the */
-  /* output will look like this:
-     00:   00000000 00000000
-     with the chunks displayed according to "display_endian". */
-  int bytes_per_chunk;
-  enum bfd_endian display_endian;
-
-  /* Number of octets per incremented target address
-     Normally one, but some DSPs have byte sizes of 16 or 32 bits.  */
-  unsigned int octets_per_byte;
-
-  /* The number of zeroes we want to see at the end of a section before we
-     start skipping them.  */
-  unsigned int skip_zeroes;
-
-  /* The number of zeroes to skip at the end of a section.  If the number
-     of zeroes at the end is between SKIP_ZEROES_AT_END and SKIP_ZEROES,
-     they will be disassembled.  If there are fewer than
-     SKIP_ZEROES_AT_END, they will be skipped.  This is a heuristic
-     attempt to avoid disassembling zeroes inserted by section
-     alignment.  */
-  unsigned int skip_zeroes_at_end;
-
-  /* Whether the disassembler always needs the relocations.  */
-  bfd_boolean disassembler_needs_relocs;
-
-  /* Results from instruction decoders.  Not all decoders yet support
-     this information.  This info is set each time an instruction is
-     decoded, and is only valid for the last such instruction.
-
-     To determine whether this decoder supports this information, set
-     insn_info_valid to 0, decode an instruction, then check it.  */
-
-  char insn_info_valid;		/* Branch info has been set. */
-  char branch_delay_insns;	/* How many sequential insn's will run before
-				   a branch takes effect.  (0 = normal) */
-  char data_size;		/* Size of data reference in insn, in bytes */
-  enum dis_insn_type insn_type;	/* Type of instruction */
-  bfd_vma target;		/* Target address of branch or dref, if known;
-				   zero if unknown.  */
-  bfd_vma target2;		/* Second target address for dref2 */
-
-  /* Command line options specific to the target disassembler.  */
-  char * disassembler_options;
-
-  /* If non-zero then try not disassemble beyond this address, even if
-     there are values left in the buffer.  This address is the address
-     of the nearest symbol forwards from the start of the disassembly,
-     and it is assumed that it lies on the boundary between instructions.
-     If an instruction spans this address then this is an error in the
-     file being disassembled.  */
-  bfd_vma stop_vma;
-
-} disassemble_info;
-
-/* This struct is used to pass information about valid disassembler options
-   and their descriptions from the target to the generic GDB functions that
-   set and display them.  */
-
-typedef struct
-{
-  const char **name;
-  const char **description;
-} disasm_options_t;
-
-
-/* Standard disassemblers.  Disassemble one instruction at the given
-   target address.  Return number of octets processed.  */
-typedef int (*disassembler_ftype) (bfd_vma, disassemble_info *);
-
-extern int print_insn_aarch64		(bfd_vma, disassemble_info *);
-extern int print_insn_alpha		(bfd_vma, disassemble_info *);
-extern int print_insn_avr		(bfd_vma, disassemble_info *);
-extern int print_insn_bfin		(bfd_vma, disassemble_info *);
-extern int print_insn_big_arm		(bfd_vma, disassemble_info *);
-extern int print_insn_big_mips		(bfd_vma, disassemble_info *);
-extern int print_insn_big_nios2		(bfd_vma, disassemble_info *);
-extern int print_insn_big_powerpc	(bfd_vma, disassemble_info *);
-extern int print_insn_big_score         (bfd_vma, disassemble_info *);
-extern int print_insn_cr16              (bfd_vma, disassemble_info *);
-extern int print_insn_crx               (bfd_vma, disassemble_info *);
-extern int print_insn_d10v		(bfd_vma, disassemble_info *);
-extern int print_insn_d30v		(bfd_vma, disassemble_info *);
-extern int print_insn_dlx 		(bfd_vma, disassemble_info *);
-extern int print_insn_epiphany		(bfd_vma, disassemble_info *);
-extern int print_insn_fr30		(bfd_vma, disassemble_info *);
-extern int print_insn_frv		(bfd_vma, disassemble_info *);
-extern int print_insn_ft32  		(bfd_vma, disassemble_info *);
-extern int print_insn_h8300		(bfd_vma, disassemble_info *);
-extern int print_insn_h8300h		(bfd_vma, disassemble_info *);
-extern int print_insn_h8300s		(bfd_vma, disassemble_info *);
-extern int print_insn_h8500		(bfd_vma, disassemble_info *);
-extern int print_insn_lanai             (bfd_vma, disassemble_info *);
-extern int print_insn_hppa		(bfd_vma, disassemble_info *);
-extern int print_insn_i370		(bfd_vma, disassemble_info *);
-extern int print_insn_i386		(bfd_vma, disassemble_info *);
-extern int print_insn_i386_att		(bfd_vma, disassemble_info *);
-extern int print_insn_i386_intel	(bfd_vma, disassemble_info *);
-extern int print_insn_i860		(bfd_vma, disassemble_info *);
-extern int print_insn_i960		(bfd_vma, disassemble_info *);
-extern int print_insn_ia64		(bfd_vma, disassemble_info *);
-extern int print_insn_ip2k		(bfd_vma, disassemble_info *);
-extern int print_insn_iq2000		(bfd_vma, disassemble_info *);
-extern int print_insn_little_arm	(bfd_vma, disassemble_info *);
-extern int print_insn_little_mips	(bfd_vma, disassemble_info *);
-extern int print_insn_little_nios2	(bfd_vma, disassemble_info *);
-extern int print_insn_little_powerpc	(bfd_vma, disassemble_info *);
-extern int print_insn_riscv		(bfd_vma, disassemble_info *);
-extern int print_insn_little_score      (bfd_vma, disassemble_info *); 
-extern int print_insn_lm32		(bfd_vma, disassemble_info *);
-extern int print_insn_m32c	        (bfd_vma, disassemble_info *);
-extern int print_insn_m32r		(bfd_vma, disassemble_info *);
-extern int print_insn_m68hc11		(bfd_vma, disassemble_info *);
-extern int print_insn_m68hc12		(bfd_vma, disassemble_info *);
-extern int print_insn_m9s12x		(bfd_vma, disassemble_info *);
-extern int print_insn_m9s12xg		(bfd_vma, disassemble_info *);
-extern int print_insn_m68k		(bfd_vma, disassemble_info *);
-extern int print_insn_m88k		(bfd_vma, disassemble_info *);
-extern int print_insn_mcore		(bfd_vma, disassemble_info *);
-extern int print_insn_mep		(bfd_vma, disassemble_info *);
-extern int print_insn_metag		(bfd_vma, disassemble_info *);
-extern int print_insn_microblaze	(bfd_vma, disassemble_info *);
-extern int print_insn_mmix		(bfd_vma, disassemble_info *);
-extern int print_insn_mn10200		(bfd_vma, disassemble_info *);
-extern int print_insn_mn10300		(bfd_vma, disassemble_info *);
-extern int print_insn_moxie		(bfd_vma, disassemble_info *);
-extern int print_insn_msp430		(bfd_vma, disassemble_info *);
-extern int print_insn_mt                (bfd_vma, disassemble_info *);
-extern int print_insn_nds32		(bfd_vma, disassemble_info *);
-extern int print_insn_ns32k		(bfd_vma, disassemble_info *);
-extern int print_insn_or1k		(bfd_vma, disassemble_info *);
-extern int print_insn_pdp11		(bfd_vma, disassemble_info *);
-extern int print_insn_pj		(bfd_vma, disassemble_info *);
-extern int print_insn_pru		(bfd_vma, disassemble_info *);
-extern int print_insn_rs6000		(bfd_vma, disassemble_info *);
-extern int print_insn_s390		(bfd_vma, disassemble_info *);
-extern int print_insn_sh		(bfd_vma, disassemble_info *);
-extern int print_insn_sh64		(bfd_vma, disassemble_info *);
-extern int print_insn_sh64x_media	(bfd_vma, disassemble_info *);
-extern int print_insn_sparc		(bfd_vma, disassemble_info *);
-extern int print_insn_spu		(bfd_vma, disassemble_info *);
-extern int print_insn_tic30		(bfd_vma, disassemble_info *);
-extern int print_insn_tic4x		(bfd_vma, disassemble_info *);
-extern int print_insn_tic54x		(bfd_vma, disassemble_info *);
-extern int print_insn_tic6x		(bfd_vma, disassemble_info *);
-extern int print_insn_tic80		(bfd_vma, disassemble_info *);
-extern int print_insn_tilegx		(bfd_vma, disassemble_info *);
-extern int print_insn_tilepro		(bfd_vma, disassemble_info *);
-extern int print_insn_v850		(bfd_vma, disassemble_info *);
-extern int print_insn_vax		(bfd_vma, disassemble_info *);
-extern int print_insn_visium		(bfd_vma, disassemble_info *);
-extern int print_insn_w65		(bfd_vma, disassemble_info *);
-extern int print_insn_xc16x		(bfd_vma, disassemble_info *);
-extern int print_insn_xgate             (bfd_vma, disassemble_info *);
-extern int print_insn_xstormy16		(bfd_vma, disassemble_info *);
-extern int print_insn_xtensa		(bfd_vma, disassemble_info *);
-extern int print_insn_z80		(bfd_vma, disassemble_info *);
-extern int print_insn_z8001		(bfd_vma, disassemble_info *);
-extern int print_insn_z8002		(bfd_vma, disassemble_info *);
-extern int print_insn_rx		(bfd_vma, disassemble_info *);
-extern int print_insn_rl78		(bfd_vma, disassemble_info *);
-extern int print_insn_rl78_g10		(bfd_vma, disassemble_info *);
-extern int print_insn_rl78_g13		(bfd_vma, disassemble_info *);
-extern int print_insn_rl78_g14		(bfd_vma, disassemble_info *);
-
-extern disassembler_ftype arc_get_disassembler (bfd *);
-extern disassembler_ftype cris_get_disassembler (bfd *);
-extern disassembler_ftype rl78_get_disassembler (bfd *);
-
-extern void print_aarch64_disassembler_options (FILE *);
-extern void print_i386_disassembler_options (FILE *);
-extern void print_mips_disassembler_options (FILE *);
-extern void print_ppc_disassembler_options (FILE *);
-extern void print_riscv_disassembler_options (FILE *);
-extern void print_arm_disassembler_options (FILE *);
-extern void print_arc_disassembler_options (FILE *);
-extern void print_s390_disassembler_options (FILE *);
-extern bfd_boolean aarch64_symbol_is_valid (asymbol *, struct disassemble_info *);
-extern bfd_boolean arm_symbol_is_valid (asymbol *, struct disassemble_info *);
-extern void disassemble_init_powerpc (struct disassemble_info *);
-extern void disassemble_init_s390 (struct disassemble_info *);
-extern const disasm_options_t *disassembler_options_powerpc (void);
-extern const disasm_options_t *disassembler_options_arm (void);
-extern const disasm_options_t *disassembler_options_s390 (void);
-
-/* Fetch the disassembler for a given BFD, if that support is available.  */
-extern disassembler_ftype disassembler (bfd *);
-
-/* Amend the disassemble_info structure as necessary for the target architecture.
-   Should only be called after initialising the info->arch field.  */
-extern void disassemble_init_for_target (struct disassemble_info * dinfo);
-
-/* Document any target specific options available from the disassembler.  */
-extern void disassembler_usage (FILE *);
-
-/* Remove whitespace and consecutive commas.  */
-extern char *remove_whitespace_and_extra_commas (char *);
-
-/* Like STRCMP, but treat ',' the same as '\0' so that we match
-   strings like "foobar" against "foobar,xxyyzz,...".  */
-extern int disassembler_options_cmp (const char *, const char *);
-
-/* A helper function for FOR_EACH_DISASSEMBLER_OPTION.  */
-static inline char *
-next_disassembler_option (char *options)
-{
-  char *opt = strchr (options, ',');
-  if (opt != NULL)
-    opt++;
-  return opt;
-}
-
-/* A macro for iterating over each comma separated option in OPTIONS.  */
-#define FOR_EACH_DISASSEMBLER_OPTION(OPT, OPTIONS) \
-  for ((OPT) = (OPTIONS); \
-       (OPT) != NULL; \
-       (OPT) = next_disassembler_option (OPT))
-
-
-/* This block of definitions is for particular callers who read instructions
-   into a buffer before calling the instruction decoder.  */
-
-/* Here is a function which callers may wish to use for read_memory_func.
-   It gets bytes from a buffer.  */
-extern int buffer_read_memory
-  (bfd_vma, bfd_byte *, unsigned int, struct disassemble_info *);
-
-/* This function goes with buffer_read_memory.
-   It prints a message using info->fprintf_func and info->stream.  */
-extern void perror_memory (int, bfd_vma, struct disassemble_info *);
-
-
-/* Just print the address in hex.  This is included for completeness even
-   though both GDB and objdump provide their own (to print symbolic
-   addresses).  */
-extern void generic_print_address
-  (bfd_vma, struct disassemble_info *);
-
-/* Always true.  */
-extern int generic_symbol_at_address
-  (bfd_vma, struct disassemble_info *);
-
-/* Also always true.  */
-extern bfd_boolean generic_symbol_is_valid
-  (asymbol *, struct disassemble_info *);
-
-/* Method to initialize a disassemble_info struct.  This should be
-   called by all applications creating such a struct.  */
-extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream,
-				   fprintf_ftype fprintf_func);
-
-extern int print_insn_tricore (bfd_vma memaddr, struct disassemble_info *info);
-
-/* For compatibility with existing code.  */
-#define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \
-  init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC))
-#define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \
-  init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC))
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef _MSC_VER
-#undef xmalloc
-#endif
-
-#endif /* ! defined (DIS_ASM_H) */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/include/xtensa-isa.h radare2-2.8.0+dfsg/libr/asm/arch/include/xtensa-isa.h
--- radare2-2.3.0+dfsg/libr/asm/arch/include/xtensa-isa.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/include/xtensa-isa.h	2018-08-07 14:12:36.000000000 +0000
@@ -178,19 +178,19 @@
 
 /* Get the size in "insnbuf_words" of the xtensa_insnbuf array.  */
 
-R_API extern int
+extern int
 xtensa_insnbuf_size (xtensa_isa isa); 
 
 
 /* Allocate an xtensa_insnbuf of the right size.  */
 
-R_API extern xtensa_insnbuf
+extern xtensa_insnbuf
 xtensa_insnbuf_alloc (xtensa_isa isa);
 
 
 /* Release an xtensa_insnbuf.  */
 
-R_API extern void
+extern void
 xtensa_insnbuf_free (xtensa_isa isa, xtensa_insnbuf buf);
 
 
@@ -208,11 +208,11 @@
    can be read or written.  Otherwise, if "num_chars" is zero, the
    functions may read or write past the end of the code.  */
 
-R_API extern int
+extern int
 xtensa_insnbuf_to_chars (xtensa_isa isa, const xtensa_insnbuf insn,
 			 unsigned char *cp, int num_chars);
 
-R_API extern void
+extern void
 xtensa_insnbuf_from_chars (xtensa_isa isa, xtensa_insnbuf insn,
 			   const unsigned char *cp, int num_chars);
 
@@ -222,19 +222,19 @@
 
 /* Initialize the ISA information.  */
 
-R_API extern xtensa_isa
+extern xtensa_isa
 xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p);
 
 
 /* Deallocate an xtensa_isa structure.  */
 
-R_API extern void
+extern void
 xtensa_isa_free (xtensa_isa isa);
 
 
 /* Get the maximum instruction size in bytes.  */
 
-R_API extern int
+extern int
 xtensa_isa_maxlength (xtensa_isa isa); 
 
 
@@ -243,7 +243,7 @@
    required to decode the instruction length.  Returns
    XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_isa_length_from_chars (xtensa_isa isa, const unsigned char *cp);
 
 
@@ -254,31 +254,31 @@
    actual processor hardware, e.g., the hardware may have additional
    stages before stage 0.  Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_isa_num_pipe_stages (xtensa_isa isa); 
 
 
 /* Get the number of various entities that are defined for this processor.  */
 
-R_API extern int
+extern int
 xtensa_isa_num_formats (xtensa_isa isa);
 
-R_API extern int
+extern int
 xtensa_isa_num_opcodes (xtensa_isa isa);
 
-R_API extern int
+extern int
 xtensa_isa_num_regfiles (xtensa_isa isa);
 
-R_API extern int
+extern int
 xtensa_isa_num_states (xtensa_isa isa);
 
-R_API extern int
+extern int
 xtensa_isa_num_sysregs (xtensa_isa isa);
 
-R_API extern int
+extern int
 xtensa_isa_num_interfaces (xtensa_isa isa);
 
-R_API extern int
+extern int
 xtensa_isa_num_funcUnits (xtensa_isa isa);
 
 
@@ -287,49 +287,49 @@
 
 /* Get the name of a format.  Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_format_name (xtensa_isa isa, xtensa_format fmt);
 
 
 /* Given a format name, return the format number.  Returns
    XTENSA_UNDEFINED if the name is not a valid format.  */
 
-R_API extern xtensa_format
+extern xtensa_format
 xtensa_format_lookup (xtensa_isa isa, const char *fmtname);
 
 
 /* Decode the instruction format from a binary instruction buffer.
    Returns XTENSA_UNDEFINED if the format is not recognized.  */
 
-R_API extern xtensa_format
+extern xtensa_format
 xtensa_format_decode (xtensa_isa isa, const xtensa_insnbuf insn);
 
 
 /* Set the instruction format field(s) in a binary instruction buffer.
    All the other fields are set to zero.  Returns non-zero on error.  */
 
-R_API extern int
+extern int
 xtensa_format_encode (xtensa_isa isa, xtensa_format fmt, xtensa_insnbuf insn);
 
 
 /* Find the length (in bytes) of an instruction.  Returns
    XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_format_length (xtensa_isa isa, xtensa_format fmt);
 
 
 /* Get the number of slots in an instruction.  Returns XTENSA_UNDEFINED
    on error.  */
 
-R_API extern int
+extern int
 xtensa_format_num_slots (xtensa_isa isa, xtensa_format fmt);
 
 
 /* Get the opcode for a no-op in a particular slot.
    Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern xtensa_opcode
+extern xtensa_opcode
 xtensa_format_slot_nop_opcode (xtensa_isa isa, xtensa_format fmt, int slot);
 
 
@@ -337,11 +337,11 @@
    instruction as a whole and put them into an insnbuf for that one
    slot, and do the opposite to set a slot.  Return non-zero on error.  */
 
-R_API extern int
+extern int
 xtensa_format_get_slot (xtensa_isa isa, xtensa_format fmt, int slot,
 			const xtensa_insnbuf insn, xtensa_insnbuf slotbuf);
 
-R_API extern int
+extern int
 xtensa_format_set_slot (xtensa_isa isa, xtensa_format fmt, int slot,
 			xtensa_insnbuf insn, const xtensa_insnbuf slotbuf);
 
@@ -352,7 +352,7 @@
 /* Translate a mnemonic name to an opcode.  Returns XTENSA_UNDEFINED if
    the name is not a valid opcode mnemonic.  */
 
-R_API extern xtensa_opcode
+extern xtensa_opcode
 xtensa_opcode_lookup (xtensa_isa isa, const char *opname);
 
 
@@ -360,7 +360,7 @@
    buffer.  Returns the opcode or XTENSA_UNDEFINED if the opcode is
    illegal.  */
 
-R_API extern xtensa_opcode
+extern xtensa_opcode
 xtensa_opcode_decode (xtensa_isa isa, xtensa_format fmt, int slot,
 		      const xtensa_insnbuf slotbuf);
 
@@ -369,14 +369,14 @@
    in the slot are set to zero.  Returns non-zero if the opcode cannot
    be encoded.  */
 
-R_API extern int
+extern int
 xtensa_opcode_encode (xtensa_isa isa, xtensa_format fmt, int slot,
 		      xtensa_insnbuf slotbuf, xtensa_opcode opc);
 
 
 /* Get the mnemonic name for an opcode.  Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_opcode_name (xtensa_isa isa, xtensa_opcode opc);
 
 
@@ -396,16 +396,16 @@
    checking if the instruction has a PC-relative immediate
    operand.  */
 
-R_API extern int
+extern int
 xtensa_opcode_is_branch (xtensa_isa isa, xtensa_opcode opc);
 
-R_API extern int
+extern int
 xtensa_opcode_is_jump (xtensa_isa isa, xtensa_opcode opc);
 
-R_API extern int
+extern int
 xtensa_opcode_is_loop (xtensa_isa isa, xtensa_opcode opc);
 
-R_API extern int
+extern int
 xtensa_opcode_is_call (xtensa_isa isa, xtensa_opcode opc);
 
 
@@ -413,13 +413,13 @@
    operands for an instruction.  These return XTENSA_UNDEFINED on
    error.  */
 
-R_API extern int
+extern int
 xtensa_opcode_num_operands (xtensa_isa isa, xtensa_opcode opc);
 
-R_API extern int
+extern int
 xtensa_opcode_num_stateOperands (xtensa_isa isa, xtensa_opcode opc);
 
-R_API extern int
+extern int
 xtensa_opcode_num_interfaceOperands (xtensa_isa isa, xtensa_opcode opc);
 
 
@@ -435,10 +435,10 @@
   int stage;
 } xtensa_funcUnit_use;
 
-R_API extern int
+extern int
 xtensa_opcode_num_funcUnit_uses (xtensa_isa isa, xtensa_opcode opc);
 
-R_API extern xtensa_funcUnit_use *
+extern xtensa_funcUnit_use *
 xtensa_opcode_funcUnit_use (xtensa_isa isa, xtensa_opcode opc, int u);
 
 
@@ -447,7 +447,7 @@
 
 /* Get the name of an operand.  Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_operand_name (xtensa_isa isa, xtensa_opcode opc, int opnd);
 
 
@@ -464,7 +464,7 @@
    "implicit", i.e., whether it is encoded in a field in the
    instruction.  */
 
-R_API extern int
+extern int
 xtensa_operand_is_visible (xtensa_isa isa, xtensa_opcode opc, int opnd);
 
 
@@ -475,7 +475,7 @@
    properly handle register allocation for conditional assignments.
    Returns 0 on error.  */
 
-R_API extern char
+extern char
 xtensa_operand_inout (xtensa_isa isa, xtensa_opcode opc, int opnd);
 
 
@@ -485,12 +485,12 @@
    functions return non-zero on error, e.g., if the field is not defined
    for the specified slot.  */
 
-R_API extern int
+extern int
 xtensa_operand_get_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
 			  xtensa_format fmt, int slot,
 			  const xtensa_insnbuf slotbuf, uint32 *valp);
 
-R_API extern int
+extern int
 xtensa_operand_set_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
 			  xtensa_format fmt, int slot,
 			  xtensa_insnbuf slotbuf, uint32 val);
@@ -501,11 +501,11 @@
    the details of that encoding.  The result values are returned through
    the argument pointer.  The return value is non-zero on error.  */
 
-R_API extern int
+extern int
 xtensa_operand_encode (xtensa_isa isa, xtensa_opcode opc, int opnd,
 		       uint32 *valp);
 
-R_API extern int
+extern int
 xtensa_operand_decode (xtensa_isa isa, xtensa_opcode opc, int opnd,
 		       uint32 *valp);
 
@@ -516,10 +516,10 @@
    XTENSA_UNDEFINED on error.  The "regfile" function returns the
    regfile for a register operand, or XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_operand_is_register (xtensa_isa isa, xtensa_opcode opc, int opnd);
 
-R_API extern xtensa_regfile
+extern xtensa_regfile
 xtensa_operand_regfile (xtensa_isa isa, xtensa_opcode opc, int opnd);
 
 
@@ -530,7 +530,7 @@
    non-register operands, the return value is undefined.  Returns
    XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_operand_num_regs (xtensa_isa isa, xtensa_opcode opc, int opnd);
 				 
 
@@ -542,7 +542,7 @@
    register value is unknown, 1 if known, and XTENSA_UNDEFINED on
    error.  */
 
-R_API extern int
+extern int
 xtensa_operand_is_known_reg (xtensa_isa isa, xtensa_opcode opc, int opnd);
 
 
@@ -550,7 +550,7 @@
    operands and non-PC-relative immediates, 1 for PC-relative
    immediates, and XTENSA_UNDEFINED on error.  */
  
-R_API extern int
+extern int
 xtensa_operand_is_PCrelative (xtensa_isa isa, xtensa_opcode opc, int opnd);
 
 
@@ -568,11 +568,11 @@
    operands must be encoded/decoded separately and the encode functions
    are responsible for detecting invalid operand values.  */
 
-R_API extern int
+extern int
 xtensa_operand_do_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
 			 uint32 *valp, uint32 pc);
 
-R_API extern int
+extern int
 xtensa_operand_undo_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
 			   uint32 *valp, uint32 pc);
 
@@ -583,14 +583,14 @@
 /* Get the state accessed by a state operand.  Returns XTENSA_UNDEFINED
    on error.  */
 
-R_API extern xtensa_state
+extern xtensa_state
 xtensa_stateOperand_state (xtensa_isa isa, xtensa_opcode opc, int stOp);
 
 
 /* Check if a state operand is an input ('i'), output ('o'), or inout
    ('m') operand.  Returns 0 on error.  */
 
-R_API extern char
+extern char
 xtensa_stateOperand_inout (xtensa_isa isa, xtensa_opcode opc, int stOp);
 
 
@@ -600,7 +600,7 @@
 /* Get the external interface accessed by an interface operand.
    Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern xtensa_interface
+extern xtensa_interface
 xtensa_interfaceOperand_interface (xtensa_isa isa, xtensa_opcode opc,
 				   int ifOp);
 
@@ -620,20 +620,20 @@
    ignores "view" regfiles since they always have the same shortname as
    their parents.  */
 
-R_API extern xtensa_regfile
+extern xtensa_regfile
 xtensa_regfile_lookup (xtensa_isa isa, const char *name);
 
-R_API extern xtensa_regfile
+extern xtensa_regfile
 xtensa_regfile_lookup_shortname (xtensa_isa isa, const char *shortname);
 
 
 /* Get the name or abbreviated "short name" of a regfile.
    Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_regfile_name (xtensa_isa isa, xtensa_regfile rf);
 
-R_API extern const char *
+extern const char *
 xtensa_regfile_shortname (xtensa_isa isa, xtensa_regfile rf);
 
 
@@ -641,21 +641,21 @@
    view, the result is the same as the input parameter.  Returns
    XTENSA_UNDEFINED on error.  */
 
-R_API extern xtensa_regfile
+extern xtensa_regfile
 xtensa_regfile_view_parent (xtensa_isa isa, xtensa_regfile rf);
 
 
 /* Get the bit width of a regfile or regfile view.
    Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_regfile_num_bits (xtensa_isa isa, xtensa_regfile rf);
 
 
 /* Get the number of regfile entries.  Returns XTENSA_UNDEFINED on
    error.  */
 
-R_API extern int
+extern int
 xtensa_regfile_num_entries (xtensa_isa isa, xtensa_regfile rf);
 
 
@@ -664,20 +664,20 @@
 
 /* Look up a state by name.  Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern xtensa_state
+extern xtensa_state
 xtensa_state_lookup (xtensa_isa isa, const char *name);
 
 
 /* Get the name for a processor state.  Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_state_name (xtensa_isa isa, xtensa_state st);
 
 
 /* Get the bit width for a processor state.
    Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_state_num_bits (xtensa_isa isa, xtensa_state st);
 
 
@@ -685,14 +685,14 @@
    the condition is false, 1 if the condition is true, and
    XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_state_is_exported (xtensa_isa isa, xtensa_state st);
 
 
 /* Check for a "shared_or" state.  Returns 0 if the condition is false,
    1 if the condition is true, and XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_state_is_shared_or (xtensa_isa isa, xtensa_state st);
 
 
@@ -703,26 +703,26 @@
    or a "special register".  Returns XTENSA_UNDEFINED if the sysreg does
    not exist.  */
 
-R_API extern xtensa_sysreg
+extern xtensa_sysreg
 xtensa_sysreg_lookup (xtensa_isa isa, int num, int is_user);
 
 
 /* Check if there exists a sysreg with a given name.
    If not, this function returns XTENSA_UNDEFINED.  */
 
-R_API extern xtensa_sysreg
+extern xtensa_sysreg
 xtensa_sysreg_lookup_name (xtensa_isa isa, const char *name);
 
 
 /* Get the name of a sysreg.  Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_sysreg_name (xtensa_isa isa, xtensa_sysreg sysreg);
 
 
 /* Get the register number.  Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_sysreg_number (xtensa_isa isa, xtensa_sysreg sysreg);
 
 
@@ -730,7 +730,7 @@
    Returns 0 for special registers, 1 for user registers and
    XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_sysreg_is_user (xtensa_isa isa, xtensa_sysreg sysreg);
 
 
@@ -740,27 +740,27 @@
 /* Find an interface by name.  The return value is XTENSA_UNDEFINED if
    the specified interface is not found.  */
 
-R_API extern xtensa_interface
+extern xtensa_interface
 xtensa_interface_lookup (xtensa_isa isa, const char *ifname);
 
 
 /* Get the name of an interface.  Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_interface_name (xtensa_isa isa, xtensa_interface intf);
 
 
 /* Get the bit width for an interface.
    Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_interface_num_bits (xtensa_isa isa, xtensa_interface intf);
 
 
 /* Check if an interface is an input ('i') or output ('o') with respect
    to the Xtensa processor core.  Returns 0 on error.  */
 
-R_API extern char
+extern char
 xtensa_interface_inout (xtensa_isa isa, xtensa_interface intf);
 
 
@@ -769,7 +769,7 @@
    interfaces do not.  Returns 1 if there are side effects, 0 if not,
    and XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_interface_has_side_effect (xtensa_isa isa, xtensa_interface intf);
 
 
@@ -782,7 +782,7 @@
    interfaces are related; the specific values of the identifiers have
    no particular meaning otherwise.  */
 
-R_API extern int
+extern int
 xtensa_interface_class_id (xtensa_isa isa, xtensa_interface intf);
 
 
@@ -792,20 +792,20 @@
 /* Find a functional unit by name.  The return value is XTENSA_UNDEFINED if
    the specified unit is not found.  */
 
-R_API extern xtensa_funcUnit
+extern xtensa_funcUnit
 xtensa_funcUnit_lookup (xtensa_isa isa, const char *fname);
 
 
 /* Get the name of a functional unit.  Returns null on error.  */
 
-R_API extern const char *
+extern const char *
 xtensa_funcUnit_name (xtensa_isa isa, xtensa_funcUnit fun);
 
 
 /* Functional units may be replicated.  See how many instances of a
    particular function unit exist.  Returns XTENSA_UNDEFINED on error.  */
 
-R_API extern int
+extern int
 xtensa_funcUnit_num_copies (xtensa_isa isa, xtensa_funcUnit fun);
 
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/lanai/gnu/lanai-dis.c radare2-2.8.0+dfsg/libr/asm/arch/lanai/gnu/lanai-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/lanai/gnu/lanai-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/lanai/gnu/lanai-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -60,7 +60,7 @@
 
 #include "ansidecl.h"
 #include "opcode/lanai.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 static  char *reg_names[] =
 { "r0", "r1", "pc", "ps", "sp", "fp", "r6", "r7",	
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/mips/gnu/mips-dis.c radare2-2.8.0+dfsg/libr/asm/arch/mips/gnu/mips-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/mips/gnu/mips-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/mips/gnu/mips-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include "ansidecl.h"
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "libiberty.h"
 #include "elf/mips.h"
 #include "opintl.h"
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/mips/mipsasm.c radare2-2.8.0+dfsg/libr/asm/arch/mips/mipsasm.c
--- radare2-2.3.0+dfsg/libr/asm/arch/mips/mipsasm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/mips/mipsasm.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - Copyright 2012-2016 - pancake */
+/* radare - Copyright 2012-2018 - pancake */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -35,6 +35,7 @@
 	{ "xori", 'I', 3, 14, 0 },
 	{ "addi", 'I', 3, 8, 0 },
 	{ "addiu", 'I', 3, 9, 0 },
+	{ "b", 'B', -1, 4, 0},
 	{ "bnez", 'B', 2, 5, 0 },
 	{ "bal", 'B', -1, -1, 17},
 	{ "bne", 'B', 3, 5, 0 },
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/msp430/msp430_disas.c radare2-2.8.0+dfsg/libr/asm/arch/msp430/msp430_disas.c
--- radare2-2.3.0+dfsg/libr/asm/arch/msp430/msp430_disas.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/msp430/msp430_disas.c	2018-08-07 14:12:36.000000000 +0000
@@ -298,24 +298,18 @@
 
 static int decode_twoop_opcode(ut16 instr, ut16 op1, ut16 op2, struct msp430_cmd *cmd)
 {
-	int ret;
-	ut8 opcode;
+	ut8 opcode = get_twoop_opcode(instr);
 
-	opcode = get_twoop_opcode(instr);
-
-	snprintf(cmd->instr, MSP430_INSTR_MAXLEN - 1, "%s", two_op_instrs[opcode]);
-	if (get_bw(instr)) {
-		strncat(cmd->instr, ".b", MSP430_INSTR_MAXLEN - 1 - strlen(cmd->instr));
+	snprintf (cmd->instr, MSP430_INSTR_MAXLEN - 1, "%s", two_op_instrs[opcode]);
+	if (get_bw (instr)) {
+		strncat (cmd->instr, ".b", MSP430_INSTR_MAXLEN - 1 - strlen(cmd->instr));
 	}
 
-	cmd->opcode = get_twoop_opcode(instr);
-	ret = decode_addressing_mode(instr, op1, op2, cmd);
-
-	return ret;
+	cmd->opcode = get_twoop_opcode (instr);
+	return decode_addressing_mode (instr, op1, op2, cmd);
 }
 
-static ut8 get_jmp_opcode(ut16 instr)
-{
+static ut8 get_jmp_opcode(ut16 instr) {
 	return instr >> 13;
 }
 
@@ -445,16 +439,14 @@
 	return ret;
 }
 
-int msp430_decode_command(const ut8 *in, struct msp430_cmd *cmd)
-{
+int msp430_decode_command(const ut8 *in, int len, struct msp430_cmd *cmd) {
 	int ret = -1;
-	ut16 instr;
 	ut16 operand1, operand2;
-	ut8 opcode;
-
-	instr = r_read_le16 (in);
-
-	opcode = get_twoop_opcode(instr);
+	if (len < 2) {
+		return -1;
+	}
+	ut16 instr = r_read_le16 (in);
+	ut8 opcode = get_twoop_opcode (instr);
 
 	switch (opcode) {
 	case MSP430_MOV:
@@ -469,21 +461,28 @@
 	case MSP430_BIS:
 	case MSP430_XOR:
 	case MSP430_AND:
-		cmd->type = MSP430_TWOOP;
-		operand1 = r_read_at_le16 (in, 2);
-		operand2 = r_read_at_le16 (in, 4);
-		ret = decode_twoop_opcode(instr, operand1, operand2, cmd);
-	break;
+		// XXX this conditional is wrong, but seems to be safe
+		if (len >= 4) {
+			cmd->type = MSP430_TWOOP;
+			operand1 = r_read_at_le16 (in, 2);
+			operand2 = r_read_at_le16 (in, 4);
+		} else {
+			operand1 = 0;
+			operand2 = 0;
+		}
+		ret = decode_twoop_opcode (instr, operand1, operand2, cmd);
+		break;
 	}
 
 	if (ret > 0) {
 		return ret;
 	}
 
-	ret = decode_jmp(instr, cmd);
+	ret = decode_jmp (instr, cmd);
 
-	if (ret > 0)
+	if (ret > 0) {
 		return ret;
+	}
 
 	operand1 = r_read_at_le16 (in, 2);
 	ret = decode_oneop_opcode(instr, operand1, cmd);
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/msp430/msp430_disas.h radare2-2.8.0+dfsg/libr/asm/arch/msp430/msp430_disas.h
--- radare2-2.3.0+dfsg/libr/asm/arch/msp430/msp430_disas.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/msp430/msp430_disas.h	2018-08-07 14:12:36.000000000 +0000
@@ -84,5 +84,5 @@
 	char	operands[MSP430_INSTR_MAXLEN];
 };
 
-R_API int msp430_decode_command(const ut8 *instr, struct msp430_cmd *cmd);
+int msp430_decode_command(const ut8 *instr, int len, struct msp430_cmd *cmd);
 #endif /* MSP430_DISAS_H */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/nios/gnu/nios2-dis.c radare2-2.8.0+dfsg/libr/asm/arch/nios/gnu/nios2-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/nios/gnu/nios2-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/nios/gnu/nios2-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -21,7 +21,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "opcode/nios2.h"
 #include "libiberty.h"
 #include <string.h>
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/pic/pic_midrange.c radare2-2.8.0+dfsg/libr/asm/arch/pic/pic_midrange.c
--- radare2-2.3.0+dfsg/libr/asm/arch/pic/pic_midrange.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/pic/pic_midrange.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,266 @@
+/* radare2 - LGPL - Copyright 2018 - courk */
+
+#include "pic_midrange.h"
+
+static const PicMidrangeOpInfo
+	pic_midrange_op_info[PIC_MIDRANGE_OPCODE_INVALID] = {
+		{"nop", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"return", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"retfie", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"option", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"sleep", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"clrwdt", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"tris", PIC_MIDRANGE_OP_ARGS_2F},
+		{"movwf", PIC_MIDRANGE_OP_ARGS_7F},
+		{"clr", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"subwf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"decf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"iorwf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"andwf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"xorwf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"addwf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"movf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"comf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"incf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"decfsz", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"rrf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"rlf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"swapf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"incfsz", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"bcf", PIC_MIDRANGE_OP_ARGS_3B_7F},
+		{"bsf", PIC_MIDRANGE_OP_ARGS_3B_7F},
+		{"btfsc", PIC_MIDRANGE_OP_ARGS_3B_7F},
+		{"btfss", PIC_MIDRANGE_OP_ARGS_3B_7F},
+		{"call", PIC_MIDRANGE_OP_ARGS_11K},
+		{"goto", PIC_MIDRANGE_OP_ARGS_11K},
+		{"movlw", PIC_MIDRANGE_OP_ARGS_8K},
+		{"retlw", PIC_MIDRANGE_OP_ARGS_8K},
+		{"iorlw", PIC_MIDRANGE_OP_ARGS_8K},
+		{"andlw", PIC_MIDRANGE_OP_ARGS_8K},
+		{"xorlw", PIC_MIDRANGE_OP_ARGS_8K},
+		{"sublw", PIC_MIDRANGE_OP_ARGS_8K},
+		{"addlw", PIC_MIDRANGE_OP_ARGS_8K},
+		{"reset", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"callw", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"brw", PIC_MIDRANGE_OP_ARGS_NONE},
+		{"moviw", PIC_MIDRANGE_OP_ARGS_1N_2M},
+		{"movwi", PIC_MIDRANGE_OP_ARGS_1N_2M},
+		{"movlb", PIC_MIDRANGE_OP_ARGS_4K},
+		{"lslf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"lsrf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"asrf", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"subwfb", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"addwfc", PIC_MIDRANGE_OP_ARGS_1D_7F},
+		{"addfsr", PIC_MIDRANGE_OP_ARGS_1N_6K},
+		{"movlp", PIC_MIDRANGE_OP_ARGS_7F},
+		{"bra", PIC_MIDRANGE_OP_ARGS_9K},
+		{"moviw", PIC_MIDRANGE_OP_ARGS_1N_6K},
+		{"movwi", PIC_MIDRANGE_OP_ARGS_1N_6K}};
+
+static const char *PicMidrangeFsrOps[] = {"++FSR%d", "--FSR%d", "FSR%d++",
+					  "FSR%d--"};
+
+PicMidrangeOpcode pic_midrange_get_opcode (ut16 instr) {
+	if (instr & (1 << 14)) {
+		return PIC_MIDRANGE_OPCODE_INVALID;
+	}
+
+	switch (instr >> 11) { // 3 first MSB bits
+	case 0x4: return PIC_MIDRANGE_OPCODE_CALL;
+	case 0x5: return PIC_MIDRANGE_OPCODE_GOTO;
+	}
+
+	switch (instr >> 10) { // 4 first MSB bits
+	case 0x4: return PIC_MIDRANGE_OPCODE_BCF;
+	case 0x5: return PIC_MIDRANGE_OPCODE_BSF;
+	case 0x6: return PIC_MIDRANGE_OPCODE_BTFSC;
+	case 0x7: return PIC_MIDRANGE_OPCODE_BTFSS;
+	}
+
+	switch (instr >> 9) { // 5 first MSB bits
+	case 0x19: return PIC_MIDRANGE_OPCODE_BRA;
+	}
+
+	switch (instr >> 8) { // 6 first MSB bits
+	case 0x1: return PIC_MIDRANGE_OPCODE_CLR;
+	case 0x2: return PIC_MIDRANGE_OPCODE_SUBWF;
+	case 0x3: return PIC_MIDRANGE_OPCODE_DECF;
+	case 0x4: return PIC_MIDRANGE_OPCODE_IORWF;
+	case 0x5: return PIC_MIDRANGE_OPCODE_ANDWF;
+	case 0x6: return PIC_MIDRANGE_OPCODE_XORWF;
+	case 0x7: return PIC_MIDRANGE_OPCODE_ADDWF;
+	case 0x8: return PIC_MIDRANGE_OPCODE_MOVF;
+	case 0x9: return PIC_MIDRANGE_OPCODE_COMF;
+	case 0xa: return PIC_MIDRANGE_OPCODE_INCF;
+	case 0xb: return PIC_MIDRANGE_OPCODE_DECFSZ;
+	case 0xc: return PIC_MIDRANGE_OPCODE_RRF;
+	case 0xd: return PIC_MIDRANGE_OPCODE_RLF;
+	case 0xe: return PIC_MIDRANGE_OPCODE_SWAPF;
+	case 0xf: return PIC_MIDRANGE_OPCODE_INCFSZ;
+	case 0x38: return PIC_MIDRANGE_OPCODE_IORLW;
+	case 0x39: return PIC_MIDRANGE_OPCODE_ANDLW;
+	case 0x3a: return PIC_MIDRANGE_OPCODE_XORLW;
+	case 0x30: return PIC_MIDRANGE_OPCODE_MOVLW;
+	case 0x34: return PIC_MIDRANGE_OPCODE_RETLW;
+	case 0x3c: return PIC_MIDRANGE_OPCODE_SUBLW;
+	case 0x3e: return PIC_MIDRANGE_OPCODE_ADDLW;
+	case 0x35: return PIC_MIDRANGE_OPCODE_LSLF;
+	case 0x36: return PIC_MIDRANGE_OPCODE_LSRF;
+	case 0x37: return PIC_MIDRANGE_OPCODE_ASRF;
+	case 0x3b: return PIC_MIDRANGE_OPCODE_SUBWFB;
+	case 0x3d: return PIC_MIDRANGE_OPCODE_ADDWFC;
+	}
+
+	switch (instr >> 7) { // 7 first MSB bits
+	case 0x1: return PIC_MIDRANGE_OPCODE_MOVWF;
+	case 0x62: return PIC_MIDRANGE_OPCODE_ADDFSR;
+	case 0x63: return PIC_MIDRANGE_OPCODE_MOVLP;
+	case 0x7e: return PIC_MIDRANGE_OPCODE_MOVIW_2;
+	case 0x7f: return PIC_MIDRANGE_OPCODE_MOVWI_2;
+	}
+
+	switch (instr >> 5) { // 9 first MSB bits
+	case 0x1: return PIC_MIDRANGE_OPCODE_MOVLB;
+	}
+
+	switch (instr >> 3) { // 11 first MSB bits
+	case 0x2: return PIC_MIDRANGE_OPCODE_MOVIW_1;
+	case 0x3: return PIC_MIDRANGE_OPCODE_MOVWI_1;
+	}
+
+	switch (instr >> 2) { // 12 first MSB bits
+	case 0x19: return PIC_MIDRANGE_OPCODE_TRIS;
+	}
+
+	switch (instr) {
+	case 0x0: return PIC_MIDRANGE_OPCODE_NOP;
+	case 0x1: return PIC_MIDRANGE_OPCODE_RESET;
+	case 0xa: return PIC_MIDRANGE_OPCODE_CALLW;
+	case 0xb: return PIC_MIDRANGE_OPCODE_BRW;
+	case 0x8: return PIC_MIDRANGE_OPCODE_RETURN;
+	case 0x9: return PIC_MIDRANGE_OPCODE_RETFIE;
+	case 0x62: return PIC_MIDRANGE_OPCODE_OPTION;
+	case 0x63: return PIC_MIDRANGE_OPCODE_SLEEP;
+	case 0x64: return PIC_MIDRANGE_OPCODE_CLRWDT;
+	}
+
+	return PIC_MIDRANGE_OPCODE_INVALID;
+}
+
+const PicMidrangeOpInfo *pic_midrange_get_op_info (PicMidrangeOpcode opcode) {
+	if (opcode >= PIC_MIDRANGE_OPCODE_INVALID) {
+		return NULL;
+	}
+	return &pic_midrange_op_info[opcode];
+}
+
+int pic_midrange_disassemble (RAsm *a, RAsmOp *op, const ut8 *b, int l) {
+	char fsr_op[6];
+	st16 branch;
+
+#define EMIT_INVALID                                                         \
+	{                                                                    \
+		op->size = 2;                                                \
+		strncpy (op->buf_asm, "invalid", sizeof (op->buf_asm) - 1);  \
+		return 1;                                                    \
+	}
+	if (!b || l < 2) {
+		EMIT_INVALID
+	}
+
+	ut16 instr = r_read_le16 (b);
+	PicMidrangeOpcode opcode = pic_midrange_get_opcode (instr);
+	if (opcode == PIC_MIDRANGE_OPCODE_INVALID) {
+		EMIT_INVALID
+	}
+
+	const PicMidrangeOpInfo *op_info = pic_midrange_get_op_info (opcode);
+	if (!op_info) {
+		EMIT_INVALID
+	}
+
+#undef EMIT_INVALID
+
+	op->size = 2;
+
+	switch (op_info->args) {
+	case PIC_MIDRANGE_OP_ARGS_NONE:
+		strncpy (op->buf_asm, op_info->mnemonic,
+			 sizeof (op->buf_asm) - 1);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_2F:
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s 0x%x",
+			  op_info->mnemonic,
+			  instr & PIC_MIDRANGE_OP_ARGS_2F_MASK_F);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_7F:
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s 0x%x",
+			  op_info->mnemonic,
+			  instr & PIC_MIDRANGE_OP_ARGS_7F_MASK_F);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_1D_7F:
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s 0x%x, %c",
+			  op_info->mnemonic,
+			  instr & PIC_MIDRANGE_OP_ARGS_1D_7F_MASK_F,
+			  (instr & PIC_MIDRANGE_OP_ARGS_1D_7F_MASK_D) >> 7 ?
+				  'f' :
+				  'w');
+		break;
+	case PIC_MIDRANGE_OP_ARGS_1N_6K:
+		if (opcode == PIC_MIDRANGE_OPCODE_ADDFSR) {
+			snprintf (
+				op->buf_asm, sizeof (op->buf_asm),
+				"%s FSR%d, 0x%x", op_info->mnemonic,
+				(instr & PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_N) >>
+					6,
+				instr & PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_K);
+		} else {
+			snprintf (
+				op->buf_asm, sizeof (op->buf_asm),
+				"%s 0x%x[FSR%d]", op_info->mnemonic,
+				instr & PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_K,
+				(instr & PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_N) >>
+					6);
+		}
+		break;
+	case PIC_MIDRANGE_OP_ARGS_3B_7F:
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s 0x%x, %d",
+			  op_info->mnemonic,
+			  instr & PIC_MIDRANGE_OP_ARGS_3B_7F_MASK_F,
+			  (instr & PIC_MIDRANGE_OP_ARGS_3B_7F_MASK_B) >> 7);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_4K:
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s 0x%x",
+			  op_info->mnemonic,
+			  instr & PIC_MIDRANGE_OP_ARGS_4K_MASK_K);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_8K:
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s 0x%x",
+			  op_info->mnemonic,
+			  instr & PIC_MIDRANGE_OP_ARGS_8K_MASK_K);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_9K:
+		branch = (instr & PIC_MIDRANGE_OP_ARGS_9K_MASK_K);
+		branch |= ((branch & 0x100) ? 0xfe00 : 0);
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s %s0x%x",
+			  op_info->mnemonic, branch < 0 ? "-" : "",
+			  branch < 0 ? -branch : branch);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_11K:
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s 0x%x",
+			  op_info->mnemonic,
+			  instr & PIC_MIDRANGE_OP_ARGS_11K_MASK_K);
+		break;
+	case PIC_MIDRANGE_OP_ARGS_1N_2M:
+		snprintf (
+			fsr_op, sizeof (fsr_op),
+			PicMidrangeFsrOps[instr &
+					  PIC_MIDRANGE_OP_ARGS_1N_2M_MASK_M],
+			(instr & PIC_MIDRANGE_OP_ARGS_1N_2M_MASK_N) >> 2);
+		snprintf (op->buf_asm, sizeof (op->buf_asm), "%s %s",
+			  op_info->mnemonic, fsr_op);
+		break;
+	}
+
+	return op->size;
+}
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/pic/pic_midrange.h radare2-2.8.0+dfsg/libr/asm/arch/pic/pic_midrange.h
--- radare2-2.3.0+dfsg/libr/asm/arch/pic/pic_midrange.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/pic/pic_midrange.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,103 @@
+/* radare2 - LGPL - Copyright 2018 - courk */
+
+#ifndef PIC_MIDRANGE_H
+#define PIC_MIDRANGE_H
+
+#include <r_asm.h>
+#include <r_types.h>
+
+typedef enum {
+	PIC_MIDRANGE_OP_ARGS_NONE = 0,
+	PIC_MIDRANGE_OP_ARGS_2F,
+	PIC_MIDRANGE_OP_ARGS_7F,
+	PIC_MIDRANGE_OP_ARGS_1D_7F,
+	PIC_MIDRANGE_OP_ARGS_1N_6K,
+	PIC_MIDRANGE_OP_ARGS_3B_7F,
+	PIC_MIDRANGE_OP_ARGS_4K,
+	PIC_MIDRANGE_OP_ARGS_8K,
+	PIC_MIDRANGE_OP_ARGS_9K,
+	PIC_MIDRANGE_OP_ARGS_11K,
+	PIC_MIDRANGE_OP_ARGS_1N_2M
+} PicMidrangeOpArgs;
+
+#define PIC_MIDRANGE_OP_ARGS_2F_MASK_F 0x3
+#define PIC_MIDRANGE_OP_ARGS_7F_MASK_F 0x7f
+#define PIC_MIDRANGE_OP_ARGS_1D_7F_MASK_D (1 << 7)
+#define PIC_MIDRANGE_OP_ARGS_1D_7F_MASK_F 0x7f
+#define PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_N (1 << 6)
+#define PIC_MIDRANGE_OP_ARGS_1N_6K_MASK_K 0x3f
+#define PIC_MIDRANGE_OP_ARGS_3B_7F_MASK_B (0x7 << 7)
+#define PIC_MIDRANGE_OP_ARGS_3B_7F_MASK_F 0x7f
+#define PIC_MIDRANGE_OP_ARGS_4K_MASK_K 0xf
+#define PIC_MIDRANGE_OP_ARGS_8K_MASK_K 0xff
+#define PIC_MIDRANGE_OP_ARGS_9K_MASK_K 0x1ff
+#define PIC_MIDRANGE_OP_ARGS_11K_MASK_K 0x7ff
+#define PIC_MIDRANGE_OP_ARGS_1N_2M_MASK_N (1 << 2)
+#define PIC_MIDRANGE_OP_ARGS_1N_2M_MASK_M 0x3
+
+typedef struct _pic_midrange_op {
+	const char *mnemonic;
+	PicMidrangeOpArgs args;
+} PicMidrangeOpInfo;
+
+typedef enum {
+	PIC_MIDRANGE_OPCODE_NOP = 0,
+	PIC_MIDRANGE_OPCODE_RETURN,
+	PIC_MIDRANGE_OPCODE_RETFIE,
+	PIC_MIDRANGE_OPCODE_OPTION,
+	PIC_MIDRANGE_OPCODE_SLEEP,
+	PIC_MIDRANGE_OPCODE_CLRWDT,
+	PIC_MIDRANGE_OPCODE_TRIS,
+	PIC_MIDRANGE_OPCODE_MOVWF,
+	PIC_MIDRANGE_OPCODE_CLR,
+	PIC_MIDRANGE_OPCODE_SUBWF,
+	PIC_MIDRANGE_OPCODE_DECF,
+	PIC_MIDRANGE_OPCODE_IORWF,
+	PIC_MIDRANGE_OPCODE_ANDWF,
+	PIC_MIDRANGE_OPCODE_XORWF,
+	PIC_MIDRANGE_OPCODE_ADDWF,
+	PIC_MIDRANGE_OPCODE_MOVF,
+	PIC_MIDRANGE_OPCODE_COMF,
+	PIC_MIDRANGE_OPCODE_INCF,
+	PIC_MIDRANGE_OPCODE_DECFSZ,
+	PIC_MIDRANGE_OPCODE_RRF,
+	PIC_MIDRANGE_OPCODE_RLF,
+	PIC_MIDRANGE_OPCODE_SWAPF,
+	PIC_MIDRANGE_OPCODE_INCFSZ,
+	PIC_MIDRANGE_OPCODE_BCF,
+	PIC_MIDRANGE_OPCODE_BSF,
+	PIC_MIDRANGE_OPCODE_BTFSC,
+	PIC_MIDRANGE_OPCODE_BTFSS,
+	PIC_MIDRANGE_OPCODE_CALL,
+	PIC_MIDRANGE_OPCODE_GOTO,
+	PIC_MIDRANGE_OPCODE_MOVLW,
+	PIC_MIDRANGE_OPCODE_RETLW,
+	PIC_MIDRANGE_OPCODE_IORLW,
+	PIC_MIDRANGE_OPCODE_ANDLW,
+	PIC_MIDRANGE_OPCODE_XORLW,
+	PIC_MIDRANGE_OPCODE_SUBLW,
+	PIC_MIDRANGE_OPCODE_ADDLW,
+	PIC_MIDRANGE_OPCODE_RESET,
+	PIC_MIDRANGE_OPCODE_CALLW,
+	PIC_MIDRANGE_OPCODE_BRW,
+	PIC_MIDRANGE_OPCODE_MOVIW_1,
+	PIC_MIDRANGE_OPCODE_MOVWI_1,
+	PIC_MIDRANGE_OPCODE_MOVLB,
+	PIC_MIDRANGE_OPCODE_LSLF,
+	PIC_MIDRANGE_OPCODE_LSRF,
+	PIC_MIDRANGE_OPCODE_ASRF,
+	PIC_MIDRANGE_OPCODE_SUBWFB,
+	PIC_MIDRANGE_OPCODE_ADDWFC,
+	PIC_MIDRANGE_OPCODE_ADDFSR,
+	PIC_MIDRANGE_OPCODE_MOVLP,
+	PIC_MIDRANGE_OPCODE_BRA,
+	PIC_MIDRANGE_OPCODE_MOVIW_2,
+	PIC_MIDRANGE_OPCODE_MOVWI_2,
+	PIC_MIDRANGE_OPCODE_INVALID
+} PicMidrangeOpcode;
+
+PicMidrangeOpcode pic_midrange_get_opcode (ut16 instr);
+const PicMidrangeOpInfo *pic_midrange_get_op_info (PicMidrangeOpcode opcode);
+int pic_midrange_disassemble (RAsm *a, RAsmOp *op, const ut8 *b, int l);
+
+#endif // PIC_MIDRANGE_H
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/ppc/gnu/ppc-dis.c radare2-2.8.0+dfsg/libr/asm/arch/ppc/gnu/ppc-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/ppc/gnu/ppc-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/ppc/gnu/ppc-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -24,11 +24,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sysdep.h>
-#include <dis-asm.h>
+#include <disas-asm.h>
 #include <opcode/ppc.h>
 
 /* This file provides several disassembler functions, all of which use
-   the disassembler interface defined in dis-asm.h.  Several functions
+   the disassembler interface defined in disas-asm.h.  Several functions
    are provided because this file handles disassembly for the PowerPC
    in both big and little endian mode and also for the POWER (RS/6000)
    chip.  */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/ppc/libps/libps.h radare2-2.8.0+dfsg/libr/asm/arch/ppc/libps/libps.h
--- radare2-2.3.0+dfsg/libr/asm/arch/ppc/libps/libps.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/ppc/libps/libps.h	2018-08-07 14:12:36.000000000 +0000
@@ -17,8 +17,8 @@
     ut32 anal_op;
 } ppcps_t;
 
-R_API bool libps_decode(ut32 data, ppcps_t* ps);
-R_API void libps_snprint(char* str, int size, ut64 addr, ppcps_t* instr);
+bool libps_decode(ut32 data, ppcps_t* ps);
+void libps_snprint(char* str, int size, ut64 addr, ppcps_t* instr);
 
 #endif /* LIBPS_H */
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/ppc/libvle/vle.c radare2-2.8.0+dfsg/libr/asm/arch/ppc/libvle/vle.c
--- radare2-2.3.0+dfsg/libr/asm/arch/ppc/libvle/vle.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/ppc/libvle/vle.c	2018-08-07 14:12:36.000000000 +0000
@@ -93,6 +93,10 @@
 	{ "and."       , 0x7C000038, 0x7C000039 | F_MASK_X   ,     F_X,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "andc"       , 0x7C000078, 0x7C000078 | F_MASK_X   ,     F_X,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "andc."      , 0x7C000078, 0x7C000079 | F_MASK_X   ,     F_X,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
+	{ "or"         , 0x7C000378, 0x7C000378 | F_MASK_X   ,     F_X,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
+	{ "or."        , 0x7C000378, 0x7C000379 | F_MASK_X   ,     F_X,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
+	{ "nor"        , 0x7C0000f8, 0x7C0000f8 | F_MASK_X   ,     F_X,   R_ANAL_OP_TYPE_NOR, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
+	{ "nor."       , 0x7C0000f8, 0x7C0000f9 | F_MASK_X   ,     F_X,   R_ANAL_OP_TYPE_NOR, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "brinc"      , 0x1000020F, 0x1000020F | F_MASK_EVX ,   F_EVX,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "cmp"        , 0x7C000000, 0x7C000000 | F_MASK_CMP ,   F_CMP,   R_ANAL_OP_TYPE_CMP, R_ANAL_COND_AL, {TYPE_CR, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "cmpl"       , 0x7C000040, 0x7C000040 | F_MASK_CMP ,   F_CMP,   R_ANAL_OP_TYPE_CMP, R_ANAL_COND_AL, {TYPE_CR, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
@@ -162,15 +166,22 @@
  	{ "mfdcr"      , 0x7C000286, 0x7C000286 | F_MASK_MFPR,  F_MFPR,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
 	{ "mfdcrux"    , 0x7C000246, 0x7C000246 | F_MASK_EXT ,   F_EXT,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
 	{ "mfdcrx"     , 0x7C000206, 0x7C000206 | F_MASK_EXT ,   F_EXT,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
- 	{ "mfmsr"      , 0x7C000400, 0x7C000400 | F_MASK_XFX ,   F_XFX,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_IMM, TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
- 	{ "mfspr"      , 0x7C0003A6, 0x7C000286 | F_MASK_MFPR,  F_MFPR,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
- 	{ "mtspr"      , 0x7C0003A6, 0x7C000286 | F_MASK_MTPR,  F_MTPR,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_IMM, TYPE_REG, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+ 	{ "mfmsr"      , 0x7C0000A6, 0x7C0000A6 | F_MASK_XFX ,   F_XFX,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+ 	{ "mfspr"      , 0x7C0002A6, 0x7C0002A6 | F_MASK_MFPR,  F_MFPR,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+ 	{ "mtspr"      , 0x7C0003A6, 0x7C0003A6 | F_MASK_MTPR,  F_MTPR,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_IMM, TYPE_REG, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+ 	{ "mtmsr"      , 0x7C000124, 0x7C000124 | F_MASK_XFX ,   F_XFX,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+	{ "msync"      , 0x7C0004AC, 0x7C0004AC | F_MASK_XFX ,   F_XFX,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+	{ "tlbre"      , 0x7C000764, 0x7C000764 | F_MASK_XFX ,  F_NONE,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+	{ "tlbwe"      , 0x7C0007A4, 0x7C0007A4 | F_MASK_XFX ,  F_NONE,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+	{ "stwx"       , 0x7C00012E, 0x7C00012E | E_MASK_XL  ,   E_XL ,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_NONE, TYPE_NONE}},
+	{ "mfcr"       , 0x7C000026, 0x7C000026 | E_MASK_XL  ,   E_XL ,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_NONE, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
+	{ "mtcrf"      , 0x7C000120, 0x7C000120 | E_MASK_XL  ,   E_XL ,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE, TYPE_NONE}}, //crf rossz
 
 };
 
 const e_vle_t e_ops[] = {
 //	{ "name"       , op        , mask                    , type   ,   op_type           , R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_REG, TYPE_REG, TYPE_REG}}
-	{ "e_add16i"   , 0x1C000000, 0x1C000000 | E_MASK_D   , E_D    ,   R_ANAL_OP_TYPE_ADD, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE}},
+	{ "e_add16i"   , 0x1C000000, 0x1F000000 | E_MASK_D   , E_D    ,   R_ANAL_OP_TYPE_ADD, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE}},
 	{ "e_add2i."   , 0x70008800, 0x70008800 | E_MASK_I16A, E_I16A ,   R_ANAL_OP_TYPE_ADD, R_ANAL_COND_AL, {TYPE_IMM, TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE}},
 	{ "e_add2is"   , 0x70009000, 0x70009000 | E_MASK_I16A, E_I16A ,   R_ANAL_OP_TYPE_ADD, R_ANAL_COND_AL, {TYPE_IMM, TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE}},
 	{ "e_addi"     , 0x18008000, 0x18008000 | E_MASK_SCI8, E_SCI8 ,   R_ANAL_OP_TYPE_ADD, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_IMM, TYPE_IMM, TYPE_IMM}},
@@ -246,7 +257,7 @@
 	{ "e_li"       , 0x70000000, 0x70000000 | E_MASK_LI20, E_LI20 ,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
 	{ "e_lis"      , 0x7000E000, 0x7000E000 | E_MASK_I16L, E_I16LS,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_REG, TYPE_IMM, TYPE_IMM, TYPE_NONE, TYPE_NONE}},
 	{ "e_lmw"      , 0x18000800, 0x18000800 | E_MASK_D8  , E_D8   ,   R_ANAL_OP_TYPE_MUL, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
-	{ "e_lwz"      , 0x50000000, 0x50000000 | E_MASK_D   , E_D    ,  R_ANAL_OP_TYPE_LOAD, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
+	{ "e_lwz"      , 0x50000000, 0x53000000 | E_MASK_D   , E_D    ,  R_ANAL_OP_TYPE_LOAD, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "e_lwzu"     , 0x18000200, 0x18000200 | E_MASK_D8  , E_D8   ,  R_ANAL_OP_TYPE_LOAD, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "e_mcrf"     , 0x7C000020, 0x7C000020 | E_MASK_XL  , E_XLSP ,   R_ANAL_OP_TYPE_MOV, R_ANAL_COND_AL, {TYPE_CR, TYPE_CR, TYPE_NONE, TYPE_NONE, TYPE_NONE}},
 	{ "e_mull2i"   , 0x7000A000, 0x7000A000 | E_MASK_I16A, E_I16A ,   R_ANAL_OP_TYPE_MUL, R_ANAL_COND_AL, {TYPE_IMM, TYPE_REG, TYPE_IMM, TYPE_NONE, TYPE_NONE}},
@@ -270,7 +281,7 @@
 	{ "e_sth"      , 0x5C000000, 0x5C000000 | E_MASK_D   , E_D    , R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "e_sthu"     , 0x18000500, 0x18000500 | E_MASK_D8  , E_D8   , R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "e_stmw"     , 0x18000900, 0x18000900 | E_MASK_D8  , E_D8   , R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
-	{ "e_stw"      , 0x54000000, 0x54000000 | E_MASK_D   , E_D    , R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
+	{ "e_stw"      , 0x54000000, 0x56000000 | E_MASK_D   , E_D    , R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "e_stwu"     , 0x18000600, 0x18000600 | E_MASK_D8  , E_D8   , R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {TYPE_REG, TYPE_MEM, TYPE_REG, TYPE_NONE, TYPE_NONE}},
 	{ "e_subfic"   , 0x1800B000, 0x1800B000 | E_MASK_SCI8, E_SCI8 ,   R_ANAL_OP_TYPE_SUB, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_IMM, TYPE_IMM, TYPE_IMM}},
 	{ "e_subfic."  , 0x1800B800, 0x1800B800 | E_MASK_SCI8, E_SCI8 ,   R_ANAL_OP_TYPE_SUB, R_ANAL_COND_AL, {TYPE_REG, TYPE_REG, TYPE_IMM, TYPE_IMM, TYPE_IMM}},
@@ -314,7 +325,7 @@
 	{ "se_addi"   , 0x2000, 0x21FF, 2,   R_ANAL_OP_TYPE_ADD, R_ANAL_COND_AL, {{0x01F0,  4,  0,  1, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 	{ "se_and"    , 0x4600, 0x46FF, 2,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {{0x00F0,  4,  0,  0, 1, TYPE_REG}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 	{ "se_and."   , 0x4700, 0x47FF, 2,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {{0x00F0,  4,  0,  0, 1, TYPE_REG}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
-	{ "se_andi"   , 0x2F00, 0x2FFF, 2,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
+	{ "se_andi"   , 0x2E00, 0x2FFF, 2,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 	{ "se_andc"   , 0x4500, 0x45FF, 2,   R_ANAL_OP_TYPE_AND, R_ANAL_COND_AL, {{0x00F0,  4,  0,  0, 1, TYPE_REG}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 	{ "se_b"      , 0xE800, 0xE8FF, 1,   R_ANAL_OP_TYPE_JMP, R_ANAL_COND_AL, {{0x00FF,  0,  1,  0, 0, TYPE_JMP}, {0}, {0}, {0}, {0}}},
 	{ "se_bl"     , 0xE900, 0xE9FF, 1,  R_ANAL_OP_TYPE_CALL, R_ANAL_COND_AL, {{0x00FF,  0,  1,  0, 0, TYPE_JMP}, {0}, {0}, {0}, {0}}},
@@ -329,7 +340,7 @@
 	{ "se_bso"    , 0xE000, 0xE7FF, 1,  R_ANAL_OP_TYPE_CJMP, R_ANAL_COND_VS, {{0x00FF,  0,  1,  0, 0, TYPE_JMP}, {0}, {0}, {0}, {0}}},
 	{ "se_bc"     , 0xE000, 0xE7FF, 2,  R_ANAL_OP_TYPE_CJMP, R_ANAL_COND_VS, {{0x0700,  8,  0, 32, 0, TYPE_JMP}, {0x00FF,  0,  1,  0,  1, TYPE_IMM}, {0}, {0}, {0}}},
 	{ "se_bclri"  , 0x6000, 0x61FF, 2,  R_ANAL_OP_TYPE_CJMP, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_JMP}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
-	{ "se_bgeni"  , 0x6300, 0x63FF, 2,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
+	{ "se_bgeni"  , 0x6200, 0x63FF, 2,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 	{ "se_bmaski" , 0x2C00, 0x2DFF, 2,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 	{ "se_bseti"  , 0x6400, 0x65FF, 2,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 	{ "se_btsti"  , 0x6600, 0x67FF, 2,    R_ANAL_OP_TYPE_OR, R_ANAL_COND_AL, {{0x01F0,  4,  0,  0, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
@@ -349,8 +360,8 @@
 	{ "se_stb"    , 0x9000, 0x9FFF, 3, R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {{0x0F00,  6,  0,  0, 2, TYPE_MEM}, {0x00F0,  4,  0,  0,  0, TYPE_REG}, {0x000F,  0,  0,  0,  1, TYPE_MEM}, {0}, {0}}},
 	{ "se_sth"    , 0xB000, 0xBFFF, 3, R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {{0x0F00,  6,  0,  0, 2, TYPE_MEM}, {0x00F0,  4,  0,  0,  0, TYPE_REG}, {0x000F,  0,  0,  0,  1, TYPE_MEM}, {0}, {0}}},
 	{ "se_stw"    , 0xD000, 0xDFFF, 3, R_ANAL_OP_TYPE_STORE, R_ANAL_COND_AL, {{0x0F00,  6,  0,  0, 2, TYPE_MEM}, {0x00F0,  4,  0,  0,  0, TYPE_REG}, {0x000F,  0,  0,  0,  1, TYPE_MEM}, {0}, {0}}},
-	{ "se_subi"   , 0x2500, 0x25FF, 2,   R_ANAL_OP_TYPE_SUB, R_ANAL_COND_AL, {{0x01F0,  4,  0,  1, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
-	{ "se_subi."  , 0x2700, 0x27FF, 2,   R_ANAL_OP_TYPE_SUB, R_ANAL_COND_AL, {{0x01F0,  4,  0,  1, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
+	{ "se_subi"   , 0x2400, 0x25FF, 2,   R_ANAL_OP_TYPE_SUB, R_ANAL_COND_AL, {{0x01F0,  4,  0,  1, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
+	{ "se_subi."  , 0x2600, 0x27FF, 2,   R_ANAL_OP_TYPE_SUB, R_ANAL_COND_AL, {{0x01F0,  4,  0,  1, 1, TYPE_IMM}, {0x000F,  0,  0,  0,  0, TYPE_REG}, {0}, {0}, {0}}},
 };
 
 static void set_e_fields(vle_t * v, const e_vle_t* p, ut32 data) {
@@ -691,6 +702,7 @@
 			v->fields[1].value = (data & 0x1FF800) >> 11;
 			v->fields[1].type = p->types[1];
 		}
+			break;
 		case F_MTPR:
 		{
 			v->n = 2;
@@ -812,13 +824,13 @@
 	handle->pos += handle->inc;
 	// 'e-32' always before 'se-16'
 
-	if (USE_INTERNAL_PPC (handle) && handle->pos + 2 < handle->end) {
+	if (USE_INTERNAL_PPC (handle) && handle->pos + 4 <= handle->end) {
 		op = find_ppc (handle->pos);
 	}
-	if (!op && handle->pos + 2 < handle->end) {
+	if (!op && handle->pos + 4 <= handle->end) {
 		op = find_e (handle->pos);
 	}
-	if (!op) {
+	if (!op && handle->pos + 2 <= handle->end) {
 		op = find_se (handle->pos);
 	}
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/ppc/libvle/vle.h radare2-2.8.0+dfsg/libr/asm/arch/ppc/libvle/vle.h
--- radare2-2.3.0+dfsg/libr/asm/arch/ppc/libvle/vle.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/ppc/libvle/vle.h	2018-08-07 14:12:36.000000000 +0000
@@ -33,10 +33,10 @@
 	int cond;
 } vle_t;
 
-R_API int vle_init(vle_handle* handle, const ut8* buffer, const ut32 size);
-R_API vle_t* vle_next(vle_handle* handle);
-R_API int vle_option(vle_handle* handle, ut32 option);
-R_API void vle_free(vle_t* instr);
-R_API void vle_snprint(char* str, int size, ut64 addr, vle_t* instr);
+int vle_init(vle_handle* handle, const ut8* buffer, const ut32 size);
+vle_t* vle_next(vle_handle* handle);
+int vle_option(vle_handle* handle, ut32 option);
+void vle_free(vle_t* instr);
+void vle_snprint(char* str, int size, ut64 addr, vle_t* instr);
 
-#endif
\ No newline at end of file
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/sh/gnu/sh-dis.c radare2-2.8.0+dfsg/libr/asm/arch/sh/gnu/sh-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/sh/gnu/sh-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/sh/gnu/sh-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,7 +22,7 @@
 #define DEFINE_TABLE
 
 #include "sh-opc.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "mybfd.h"
 
 #define LITTLE_BIT 2
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/sparc/gnu/sparc-dis.c radare2-2.8.0+dfsg/libr/asm/arch/sparc/gnu/sparc-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/sparc/gnu/sparc-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/sparc/gnu/sparc-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -28,7 +28,7 @@
 
 #include "sysdep.h"
 #include "opcode/sparc.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #ifndef _MSC_VER
 #include "libiberty.h"
 #else
@@ -567,9 +567,7 @@
 
 	  {
 	    const char *s;
-
-	    if (opcode->args[0] != ',')
-	      (*info->fprintf_func) (stream, " ");
+	    int brackets = 0;
 
 	    for (s = opcode->args; *s != '\0'; ++s)
 	      {
@@ -599,7 +597,17 @@
 		      }
 		  }
 
-		(*info->fprintf_func) (stream, " ");
+		  if (*s != '[' && !brackets) {
+		      (*info->fprintf_func) (stream, " ");
+		  } else if (*s == ']') {
+		      (*info->fprintf_func) (stream, "%c", *s);
+		      brackets = 0;
+		      continue;
+		  } else if (*s == '[') {
+		      (*info->fprintf_func) (stream, " %c", *s);
+		      brackets = 1;
+		      continue;
+		  }
 
 		switch (*s)
 		  {
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c radare2-2.8.0+dfsg/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c
--- radare2-2.3.0+dfsg/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tms320/c55x_plus/c55plus_decode.c	2018-08-07 14:12:36.000000000 +0000
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <r_types.h>
+#include <r_util.h>
 
 #include "ins.h"
 #include "decode.h"
@@ -18,27 +19,27 @@
 static ut32 get_q_bits(ut32 val, char *ins, ut32 ins_len, int *err_code) {
 	ut32 res = 0;
 
-	if (!strncasecmp(ins, "q_MMAP", 6)) {
+	if (!r_str_ncasecmp(ins, "q_MMAP", 6)) {
 		res = val & 1;
-	} else if (!strncasecmp(ins, "q_LOCK", 6)) {
+	} else if (!r_str_ncasecmp(ins, "q_LOCK", 6)) {
 		res = val & 1;
-	} else if (!strncasecmp(ins, "q_LINR", 6)) {
+	} else if (!r_str_ncasecmp(ins, "q_LINR", 6)) {
 		res = (val >> 2) & 1;
-	} else if (!strncasecmp(ins, "q_CIRC", 6)) {
+	} else if (!r_str_ncasecmp(ins, "q_CIRC", 6)) {
 		res = (val >> 3) & 1;
-	} else if (!strncasecmp(ins, "q_PORT_READ", 11)) {
+	} else if (!r_str_ncasecmp(ins, "q_PORT_READ", 11)) {
 		res = (val >> 4) & 1;
-	} else if (!strncasecmp(ins, "q_PORT_WRITE", 12)) {
+	} else if (!r_str_ncasecmp(ins, "q_PORT_WRITE", 12)) {
 		res = (val >> 5) & 1;
-	} else if (!strncasecmp(ins, "q_XPORT_READ", 12)) {
+	} else if (!r_str_ncasecmp(ins, "q_XPORT_READ", 12)) {
 		res = (val >> 6) & 1;
-	} else if (!strncasecmp(ins, "q_XPORT_WRITE", 13)) {
+	} else if (!r_str_ncasecmp(ins, "q_XPORT_WRITE", 13)) {
 		res = (val >> 7) & 1;
-	} else if (!strncasecmp(ins, "q_SAT", 5)) {
+	} else if (!r_str_ncasecmp(ins, "q_SAT", 5)) {
 		res = (val >> 8) & 1;
-	} else if (!strncasecmp(ins, "q_XC0", 5)) {
+	} else if (!r_str_ncasecmp(ins, "q_XC0", 5)) {
 		res = (val >> 9) & 1;
-	} else if (!strncasecmp(ins, "q_XC1", 5)) {
+	} else if (!r_str_ncasecmp(ins, "q_XC1", 5)) {
 		res = (val >> 10) & 1;
 	} else {
 		/* INVALID CONDITION */
@@ -125,7 +126,7 @@
 					      ((ins_bits & 1) << 6));
 			break;
 		case 100:
-			if (strncasecmp(reg_arg, "d(ALLx", 6)) {
+			if (r_str_ncasecmp(reg_arg, "d(ALLx", 6)) {
 				fprintf(stderr, "invalid register! %s\n", reg_arg);
 				*err_code = -1;
 				return NULL;
@@ -136,7 +137,7 @@
 			}
 			break;
 		case 41:
-			if (strncasecmp(reg_arg, ")ALLx", 5)) {
+			if (r_str_ncasecmp(reg_arg, ")ALLx", 5)) {
 				fprintf(stderr, "invalid register! %s\n", reg_arg);
 				*err_code = -1;
 				return NULL;
@@ -147,13 +148,13 @@
 			}
 			break;
 		case 65:
-			if (!strncasecmp(reg_arg, "ACLH", 4)) {
+			if (!r_str_ncasecmp(reg_arg, "ACLH", 4)) {
 				res = get_reg_name_1(ins_bits + 64);
-			} else if (!strncasecmp(reg_arg, "ACxP", 4)) {
+			} else if (!r_str_ncasecmp(reg_arg, "ACxP", 4)) {
 				res = get_reg_name_1(ins_bits + 1);
-			} else if (!strncasecmp(reg_arg, "ACx", 3) ||
-				  !strncasecmp(reg_arg, "ADR", 3) ||
-				  !strncasecmp(reg_arg, "ALL", 3) /* 430ADC */
+			} else if (!r_str_ncasecmp(reg_arg, "ACx", 3) ||
+				  !r_str_ncasecmp(reg_arg, "ADR", 3) ||
+				  !r_str_ncasecmp(reg_arg, "ALL", 3) /* 430ADC */
 				 ) {
 				res = get_reg_name_1(ins_bits);
 			}
@@ -165,7 +166,7 @@
 			res = get_reg_name_1(ins_bits + 32);
 			break;
 		case 77:
-			if (!strncasecmp(reg_arg, "MA", 2) || !strncasecmp(reg_arg, "MR", 2)) {
+			if (!r_str_ncasecmp(reg_arg, "MA", 2) || !r_str_ncasecmp(reg_arg, "MR", 2)) {
 				res = get_reg_name_1(ins_bits);
 			} else {
 				res = get_reg_name_2(ins_bits);
@@ -175,11 +176,11 @@
 			res = get_reg_name_1(ins_bits);
 			break;
 		case 82:
-			if (!strncasecmp(reg_arg, "RA", 2) || !strncasecmp(reg_arg, "RL", 2)) {
+			if (!r_str_ncasecmp(reg_arg, "RA", 2) || !r_str_ncasecmp(reg_arg, "RL", 2)) {
 				res = get_reg_name_1(ins_bits);
-			} else if (!strncasecmp(reg_arg, "RLP", 3) || !strncasecmp(reg_arg, "RxP", 3)) {
+			} else if (!r_str_ncasecmp(reg_arg, "RLP", 3) || !r_str_ncasecmp(reg_arg, "RxP", 3)) {
 				res = get_reg_name_1(ins_bits + 1);
-			} else if (!strncasecmp(reg_arg, "RX", 2)) {
+			} else if (!r_str_ncasecmp(reg_arg, "RX", 2)) {
 				res = get_reg_name_1(ins_bits);
 			} else {
 				res = get_reg_name_2(ins_bits);
@@ -189,18 +190,18 @@
 			res = get_reg_name_1(ins_bits + 48);
 			break;
 		case 87:
-			if (!strncasecmp(reg_arg, "WD", 2)) {
+			if (!r_str_ncasecmp(reg_arg, "WD", 2)) {
 				res = get_reg_name_2(ins_bits);
-			} else if (!strncasecmp(reg_arg, "WA", 2)) {
+			} else if (!r_str_ncasecmp(reg_arg, "WA", 2)) {
 				res = get_reg_name_1(ins_bits);
 			} else {
 				res = NULL;
 			}
 			break;
 		case 88:
-			if (!strncasecmp(reg_arg, "XR", 2)) {
+			if (!r_str_ncasecmp(reg_arg, "XR", 2)) {
 				res = get_reg_name_3(ins_bits);
-			} else if (!strncasecmp(reg_arg, "XD", 2)) {
+			} else if (!r_str_ncasecmp(reg_arg, "XD", 2)) {
 				res = get_reg_name_2(ins_bits + 32);
 			} else {
 				res = NULL;
@@ -578,7 +579,7 @@
 			if (*reg_arg == '!') {
 				res = get_reg_pair(ins_bits);
 				break;
-			} else if (!strncasecmp(reg_arg, "ST", 2)) {
+			} else if (!r_str_ncasecmp(reg_arg, "ST", 2)) {
 				res = get_status_regs_and_bits(reg_arg, ins_bits);
 				break;
 			}
@@ -846,11 +847,11 @@
 		res = strdup(res);
 		break;
 	case 78:
-		if (!strncasecmp (ins_token, "q_SAT", 5)) {
+		if (!r_str_ncasecmp (ins_token, "q_SAT", 5)) {
 			res = ins_bits? "s": NULL;
-		} else if (!strncasecmp(ins_token, "q_CIRC", 6)) {
+		} else if (!r_str_ncasecmp(ins_token, "q_CIRC", 6)) {
 			res = ins_bits? ".cr": NULL;
-		} else if (!strncasecmp(ins_token, "q_LINR", 6)) {
+		} else if (!r_str_ncasecmp(ins_token, "q_LINR", 6)) {
 			res = ins_bits? ".lr": NULL;
 		} else {
 			fprintf (stderr, "Invalid instruction %s\n!", ins_token);
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tms320/c55x_plus/hashvector.c radare2-2.8.0+dfsg/libr/asm/arch/tms320/c55x_plus/hashvector.c
--- radare2-2.3.0+dfsg/libr/asm/arch/tms320/c55x_plus/hashvector.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tms320/c55x_plus/hashvector.c	2018-08-07 14:12:36.000000000 +0000
@@ -95,1029 +95,516 @@
 extern st32 get_hashfunc_91(st32 A1, st32 A2);
 
 static HASHCODE_ENTRY_T ins_hash[] = {
-{0x223,
-get_hashfunc_02},
-{0x223,
-get_hashfunc_03},
-{0x223,
-get_hashfunc_04},
-{0x223,
-get_hashfunc_05},
-{0xDF,
-get_hashfunc_01},
-{0xE0,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_06},
-{0x223,
-get_hashfunc_07},
-{0xEE,
-get_hashfunc_01},
-{0xEE,
-get_hashfunc_01},
-{0xEF,
-get_hashfunc_01},
-{0xEF,
-get_hashfunc_01},
-{0xF0,
-get_hashfunc_01},
-{0xF0,
-get_hashfunc_01},
-{0xF1,
-get_hashfunc_01},
-{0xF1,
-get_hashfunc_01},
-{0x1,
-get_hashfunc_01},
-{0x1,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_08},
-{0x223,
-get_hashfunc_09},
-{0x1E7,
-get_hashfunc_01},
-{0x1E7,
-get_hashfunc_01},
-{0x6B,
-get_hashfunc_01},
-{0x6B,
-get_hashfunc_01},
-{0x71,
-get_hashfunc_01},
-{0x70,
-get_hashfunc_01},
-{0x72,
-get_hashfunc_01},
-{0x72,
-get_hashfunc_01},
-{0x6E,
-get_hashfunc_01},
-{0x6E,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x3A,
-get_hashfunc_01},
-{0x3A,
-get_hashfunc_01},
-{0x65,
-get_hashfunc_01},
-{0x65,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0xE7,
-get_hashfunc_01},
-{0xE7,
-get_hashfunc_01},
-{0xE8,
-get_hashfunc_01},
-{0xE8,
-get_hashfunc_01},
-{0x1A8,
-get_hashfunc_01},
-{0x1A8,
-get_hashfunc_01},
-{0xEC,
-get_hashfunc_01},
-{0xEC,
-get_hashfunc_01},
-{0xED,
-get_hashfunc_01},
-{0xED,
-get_hashfunc_01},
-{0xE9,
-get_hashfunc_01},
-{0xE9,
-get_hashfunc_01},
-{0xEA,
-get_hashfunc_01},
-{0xEA,
-get_hashfunc_01},
-{0x1E3,
-get_hashfunc_01},
-{0x1E3,
-get_hashfunc_01},
-{0x1E4,
-get_hashfunc_01},
-{0x1E4,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x1DC,
-get_hashfunc_01},
-{0x1DC,
-get_hashfunc_01},
-{0x1E1,
-get_hashfunc_01},
-{0x1E1,
-get_hashfunc_01},
-{0x1E2,
-get_hashfunc_01},
-{0x1E2,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x160,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DF,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1DD,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x1D0,
-get_hashfunc_01},
-{0x135,
-get_hashfunc_01},
-{0x135,
-get_hashfunc_01},
-{0xF3,
-get_hashfunc_01},
-{0xF3,
-get_hashfunc_01},
-{0x1CE,
-get_hashfunc_01},
-{0x1CE,
-get_hashfunc_01},
-{0x1CF,
-get_hashfunc_01},
-{0x1CF,
-get_hashfunc_01},
-{0x17B,
-get_hashfunc_01},
-{0x17B,
-get_hashfunc_01},
-{0x16E,
-get_hashfunc_01},
-{0x16E,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0xF6,
-get_hashfunc_01},
-{0xF6,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_10},
-{0x223,
-get_hashfunc_10},
-{0x223,
-get_hashfunc_11},
-{0x223,
-get_hashfunc_11},
-{0x223,
-get_hashfunc_12},
-{0x223,
-get_hashfunc_12},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x3,
-get_hashfunc_01},
-{0x3,
-get_hashfunc_01},
-{0x4,
-get_hashfunc_01},
-{0x4,
-get_hashfunc_01},
-{0x2,
-get_hashfunc_01},
-{0x2,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x6,
-get_hashfunc_01},
-{0x6,
-get_hashfunc_01},
-{0x0,
-get_hashfunc_01},
-{0x0,
-get_hashfunc_01},
-{0x69,
-get_hashfunc_01},
-{0x69,
-get_hashfunc_01},
-{0x7,
-get_hashfunc_01},
-{0x7,
-get_hashfunc_01},
-{0x46,
-get_hashfunc_01},
-{0x46,
-get_hashfunc_01},
-{0x47,
-get_hashfunc_01},
-{0x47,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_13},
-{0x1F,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_14},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_15},
-{0x223,
-get_hashfunc_16},
-{0x223,
-get_hashfunc_17},
-{0x223,
-get_hashfunc_18},
-{0x223,
-get_hashfunc_19},
-{0x19D,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x7B,
-get_hashfunc_01},
-{0x80,
-get_hashfunc_01},
-{0x81,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_20},
-{0x223,
-get_hashfunc_21},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x109,
-get_hashfunc_01},
-{0x109,
-get_hashfunc_01},
-{0x10A,
-get_hashfunc_01},
-{0x10A,
-get_hashfunc_01},
-{0x10B,
-get_hashfunc_01},
-{0x10B,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x10C,
-get_hashfunc_01},
-{0x10C,
-get_hashfunc_01},
-{0x10D,
-get_hashfunc_01},
-{0x10D,
-get_hashfunc_01},
-{0x10E,
-get_hashfunc_01},
-{0x10E,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_22},
-{0x223,
-get_hashfunc_22},
-{0x223,
-get_hashfunc_23},
-{0x223,
-get_hashfunc_23},
-{0x223,
-get_hashfunc_24},
-{0x223,
-get_hashfunc_24},
-{0x223,
-get_hashfunc_25},
-{0x223,
-get_hashfunc_25},
-{0x223,
-get_hashfunc_26},
-{0x223,
-get_hashfunc_26},
-{0x223,
-get_hashfunc_27},
-{0x223,
-get_hashfunc_27},
-{0x223,
-get_hashfunc_28},
-{0x223,
-get_hashfunc_28},
-{0x223,
-get_hashfunc_29},
-{0x223,
-get_hashfunc_29},
-{0x223,
-get_hashfunc_30},
-{0x223,
-get_hashfunc_30},
-{0x223,
-get_hashfunc_31},
-{0x223,
-get_hashfunc_31},
-{0x223,
-get_hashfunc_32},
-{0x223,
-get_hashfunc_32},
-{0x223,
-get_hashfunc_32},
-{0x223,
-get_hashfunc_32},
-{0x223,
-get_hashfunc_33},
-{0x223,
-get_hashfunc_33},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_34},
-{0x223,
-get_hashfunc_34},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x94,
-get_hashfunc_01},
-{0x94,
-get_hashfunc_01},
-{0x95,
-get_hashfunc_01},
-{0x95,
-get_hashfunc_01},
-{0x92,
-get_hashfunc_01},
-{0x92,
-get_hashfunc_01},
-{0x93,
-get_hashfunc_01},
-{0x93,
-get_hashfunc_01},
-{0x92,
-get_hashfunc_01},
-{0x92,
-get_hashfunc_01},
-{0x93,
-get_hashfunc_01},
-{0x93,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_35},
-{0x223,
-get_hashfunc_35},
-{0x223,
-get_hashfunc_36},
-{0x223,
-get_hashfunc_37},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_38},
-{0x223,
-get_hashfunc_39},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_40},
-{0x223,
-get_hashfunc_41},
-{0x223,
-get_hashfunc_42},
-{0x223,
-get_hashfunc_43},
-{0x223,
-get_hashfunc_44},
-{0x223,
-get_hashfunc_44},
-{0x223,
-get_hashfunc_45},
-{0x223,
-get_hashfunc_46},
-{0x223,
-get_hashfunc_47},
-{0x223,
-get_hashfunc_48},
-{0x223,
-get_hashfunc_47},
-{0x223,
-get_hashfunc_48},
-{0x9F,
-get_hashfunc_01},
-{0x9F,
-get_hashfunc_01},
-{0x1D1,
-get_hashfunc_01},
-{0x1D1,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_49},
-{0xA0,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x19C,
-get_hashfunc_01},
-{0x19C,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_50},
-{0x223,
-get_hashfunc_50},
-{0x223,
-get_hashfunc_51},
-{0x223,
-get_hashfunc_51},
-{0x223,
-get_hashfunc_52},
-{0x223,
-get_hashfunc_52},
-{0x223,
-get_hashfunc_53},
-{0x223,
-get_hashfunc_53},
-{0x223,
-get_hashfunc_54},
-{0x223,
-get_hashfunc_54},
-{0x223,
-get_hashfunc_55},
-{0x223,
-get_hashfunc_55},
-{0x223,
-get_hashfunc_56},
-{0x223,
-get_hashfunc_56},
-{0x223,
-get_hashfunc_57},
-{0x223,
-get_hashfunc_57},
-{0x223,
-get_hashfunc_57},
-{0x223,
-get_hashfunc_57},
-{0x223,
-get_hashfunc_58},
-{0x223,
-get_hashfunc_58},
-{0x223,
-get_hashfunc_58},
-{0x223,
-get_hashfunc_58},
-{0x223,
-get_hashfunc_59},
-{0x223,
-get_hashfunc_59},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_60},
-{0xB1,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_61},
-{0xB0,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_62},
-{0x9C,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_63},
-{0x9B,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_64},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_65},
-{0xB7,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_66},
-{0x223,
-get_hashfunc_66},
-{0x223,
-get_hashfunc_67},
-{0x223,
-get_hashfunc_67},
-{0x223,
-get_hashfunc_68},
-{0x223,
-get_hashfunc_69},
-{0x223,
-get_hashfunc_68},
-{0x223,
-get_hashfunc_69},
-{0x223,
-get_hashfunc_70},
-{0x223,
-get_hashfunc_71},
-{0x223,
-get_hashfunc_70},
-{0x223,
-get_hashfunc_71},
-{0xDB,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_72},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_73},
-{0x223,
-get_hashfunc_74},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x1DE,
-get_hashfunc_01},
-{0x1DE,
-get_hashfunc_01},
-{0x1D2,
-get_hashfunc_01},
-{0x1D2,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_75},
-{0x1CA,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_76},
-{0x223,
-get_hashfunc_77},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x90,
-get_hashfunc_01},
-{0x90,
-get_hashfunc_01},
-{0x91,
-get_hashfunc_01},
-{0x91,
-get_hashfunc_01},
-{0x1CD,
-get_hashfunc_01},
-{0x1CD,
-get_hashfunc_01},
-{0x1CD,
-get_hashfunc_01},
-{0x1CD,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x96,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_78},
-{0x223,
-get_hashfunc_78},
-{0x223,
-get_hashfunc_78},
-{0x223,
-get_hashfunc_78},
-{0x223,
-get_hashfunc_79},
-{0x223,
-get_hashfunc_79},
-{0x223,
-get_hashfunc_80},
-{0x223,
-get_hashfunc_80},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_81},
-{0x223,
-get_hashfunc_82},
-{0x223,
-get_hashfunc_81},
-{0x223,
-get_hashfunc_82},
-{0x223,
-get_hashfunc_83},
-{0xCC,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_83},
-{0xCC,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_84},
-{0x223,
-get_hashfunc_85},
-{0x223,
-get_hashfunc_84},
-{0x223,
-get_hashfunc_85},
-{0x223,
-get_hashfunc_86},
-{0x223,
-get_hashfunc_86},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_87},
-{0x223,
-get_hashfunc_87},
-{0x223,
-get_hashfunc_88},
-{0x223,
-get_hashfunc_88},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_89},
-{0x223,
-get_hashfunc_90},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_91},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01},
-{0x223,
-get_hashfunc_01
-}
+{0x223, get_hashfunc_02},
+{0x223, get_hashfunc_03},
+{0x223, get_hashfunc_04},
+{0x223, get_hashfunc_05},
+{0xDF, get_hashfunc_01},
+{0xE0, get_hashfunc_01},
+{0x223, get_hashfunc_06},
+{0x223, get_hashfunc_07},
+{0xEE, get_hashfunc_01},
+{0xEE, get_hashfunc_01},
+{0xEF, get_hashfunc_01},
+{0xEF, get_hashfunc_01},
+{0xF0, get_hashfunc_01},
+{0xF0, get_hashfunc_01},
+{0xF1, get_hashfunc_01},
+{0xF1, get_hashfunc_01},
+{0x1, get_hashfunc_01},
+{0x1, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_08},
+{0x223, get_hashfunc_09},
+{0x1E7, get_hashfunc_01},
+{0x1E7, get_hashfunc_01},
+{0x6B, get_hashfunc_01},
+{0x6B, get_hashfunc_01},
+{0x71, get_hashfunc_01},
+{0x70, get_hashfunc_01},
+{0x72, get_hashfunc_01},
+{0x72, get_hashfunc_01},
+{0x6E, get_hashfunc_01},
+{0x6E, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x3A, get_hashfunc_01},
+{0x3A, get_hashfunc_01},
+{0x65, get_hashfunc_01},
+{0x65, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0xE7, get_hashfunc_01},
+{0xE7, get_hashfunc_01},
+{0xE8, get_hashfunc_01},
+{0xE8, get_hashfunc_01},
+{0x1A8, get_hashfunc_01},
+{0x1A8, get_hashfunc_01},
+{0xEC, get_hashfunc_01},
+{0xEC, get_hashfunc_01},
+{0xED, get_hashfunc_01},
+{0xED, get_hashfunc_01},
+{0xE9, get_hashfunc_01},
+{0xE9, get_hashfunc_01},
+{0xEA, get_hashfunc_01},
+{0xEA, get_hashfunc_01},
+{0x1E3, get_hashfunc_01},
+{0x1E3, get_hashfunc_01},
+{0x1E4, get_hashfunc_01},
+{0x1E4, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x1DC, get_hashfunc_01},
+{0x1DC, get_hashfunc_01},
+{0x1E1, get_hashfunc_01},
+{0x1E1, get_hashfunc_01},
+{0x1E2, get_hashfunc_01},
+{0x1E2, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x160, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DF, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1DD, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x1D0, get_hashfunc_01},
+{0x135, get_hashfunc_01},
+{0x135, get_hashfunc_01},
+{0xF3, get_hashfunc_01},
+{0xF3, get_hashfunc_01},
+{0x1CE, get_hashfunc_01},
+{0x1CE, get_hashfunc_01},
+{0x1CF, get_hashfunc_01},
+{0x1CF, get_hashfunc_01},
+{0x17B, get_hashfunc_01},
+{0x17B, get_hashfunc_01},
+{0x16E, get_hashfunc_01},
+{0x16E, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0xF6, get_hashfunc_01},
+{0xF6, get_hashfunc_01},
+{0x223, get_hashfunc_10},
+{0x223, get_hashfunc_10},
+{0x223, get_hashfunc_11},
+{0x223, get_hashfunc_11},
+{0x223, get_hashfunc_12},
+{0x223, get_hashfunc_12},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x3, get_hashfunc_01},
+{0x3, get_hashfunc_01},
+{0x4, get_hashfunc_01},
+{0x4, get_hashfunc_01},
+{0x2, get_hashfunc_01},
+{0x2, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x6, get_hashfunc_01},
+{0x6, get_hashfunc_01},
+{0x0, get_hashfunc_01},
+{0x0, get_hashfunc_01},
+{0x69, get_hashfunc_01},
+{0x69, get_hashfunc_01},
+{0x7, get_hashfunc_01},
+{0x7, get_hashfunc_01},
+{0x46, get_hashfunc_01},
+{0x46, get_hashfunc_01},
+{0x47, get_hashfunc_01},
+{0x47, get_hashfunc_01},
+{0x223, get_hashfunc_13},
+{0x1F, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_14},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_15},
+{0x223, get_hashfunc_16},
+{0x223, get_hashfunc_17},
+{0x223, get_hashfunc_18},
+{0x223, get_hashfunc_19},
+{0x19D, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x7B, get_hashfunc_01},
+{0x80, get_hashfunc_01},
+{0x81, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_20},
+{0x223, get_hashfunc_21},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x109, get_hashfunc_01},
+{0x109, get_hashfunc_01},
+{0x10A, get_hashfunc_01},
+{0x10A, get_hashfunc_01},
+{0x10B, get_hashfunc_01},
+{0x10B, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x10C, get_hashfunc_01},
+{0x10C, get_hashfunc_01},
+{0x10D, get_hashfunc_01},
+{0x10D, get_hashfunc_01},
+{0x10E, get_hashfunc_01},
+{0x10E, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_22},
+{0x223, get_hashfunc_22},
+{0x223, get_hashfunc_23},
+{0x223, get_hashfunc_23},
+{0x223, get_hashfunc_24},
+{0x223, get_hashfunc_24},
+{0x223, get_hashfunc_25},
+{0x223, get_hashfunc_25},
+{0x223, get_hashfunc_26},
+{0x223, get_hashfunc_26},
+{0x223, get_hashfunc_27},
+{0x223, get_hashfunc_27},
+{0x223, get_hashfunc_28},
+{0x223, get_hashfunc_28},
+{0x223, get_hashfunc_29},
+{0x223, get_hashfunc_29},
+{0x223, get_hashfunc_30},
+{0x223, get_hashfunc_30},
+{0x223, get_hashfunc_31},
+{0x223, get_hashfunc_31},
+{0x223, get_hashfunc_32},
+{0x223, get_hashfunc_32},
+{0x223, get_hashfunc_32},
+{0x223, get_hashfunc_32},
+{0x223, get_hashfunc_33},
+{0x223, get_hashfunc_33},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_34},
+{0x223, get_hashfunc_34},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x94, get_hashfunc_01},
+{0x94, get_hashfunc_01},
+{0x95, get_hashfunc_01},
+{0x95, get_hashfunc_01},
+{0x92, get_hashfunc_01},
+{0x92, get_hashfunc_01},
+{0x93, get_hashfunc_01},
+{0x93, get_hashfunc_01},
+{0x92, get_hashfunc_01},
+{0x92, get_hashfunc_01},
+{0x93, get_hashfunc_01},
+{0x93, get_hashfunc_01},
+{0x223, get_hashfunc_35},
+{0x223, get_hashfunc_35},
+{0x223, get_hashfunc_36},
+{0x223, get_hashfunc_37},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_38},
+{0x223, get_hashfunc_39},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_40},
+{0x223, get_hashfunc_41},
+{0x223, get_hashfunc_42},
+{0x223, get_hashfunc_43},
+{0x223, get_hashfunc_44},
+{0x223, get_hashfunc_44},
+{0x223, get_hashfunc_45},
+{0x223, get_hashfunc_46},
+{0x223, get_hashfunc_47},
+{0x223, get_hashfunc_48},
+{0x223, get_hashfunc_47},
+{0x223, get_hashfunc_48},
+{0x9F, get_hashfunc_01},
+{0x9F, get_hashfunc_01},
+{0x1D1, get_hashfunc_01},
+{0x1D1, get_hashfunc_01},
+{0x223, get_hashfunc_49},
+{0xA0, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x19C, get_hashfunc_01},
+{0x19C, get_hashfunc_01},
+{0x223, get_hashfunc_50},
+{0x223, get_hashfunc_50},
+{0x223, get_hashfunc_51},
+{0x223, get_hashfunc_51},
+{0x223, get_hashfunc_52},
+{0x223, get_hashfunc_52},
+{0x223, get_hashfunc_53},
+{0x223, get_hashfunc_53},
+{0x223, get_hashfunc_54},
+{0x223, get_hashfunc_54},
+{0x223, get_hashfunc_55},
+{0x223, get_hashfunc_55},
+{0x223, get_hashfunc_56},
+{0x223, get_hashfunc_56},
+{0x223, get_hashfunc_57},
+{0x223, get_hashfunc_57},
+{0x223, get_hashfunc_57},
+{0x223, get_hashfunc_57},
+{0x223, get_hashfunc_58},
+{0x223, get_hashfunc_58},
+{0x223, get_hashfunc_58},
+{0x223, get_hashfunc_58},
+{0x223, get_hashfunc_59},
+{0x223, get_hashfunc_59},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_60},
+{0xB1, get_hashfunc_01},
+{0x223, get_hashfunc_61},
+{0xB0, get_hashfunc_01},
+{0x223, get_hashfunc_62},
+{0x9C, get_hashfunc_01},
+{0x223, get_hashfunc_63},
+{0x9B, get_hashfunc_01},
+{0x223, get_hashfunc_64},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_65},
+{0xB7, get_hashfunc_01},
+{0x223, get_hashfunc_66},
+{0x223, get_hashfunc_66},
+{0x223, get_hashfunc_67},
+{0x223, get_hashfunc_67},
+{0x223, get_hashfunc_68},
+{0x223, get_hashfunc_69},
+{0x223, get_hashfunc_68},
+{0x223, get_hashfunc_69},
+{0x223, get_hashfunc_70},
+{0x223, get_hashfunc_71},
+{0x223, get_hashfunc_70},
+{0x223, get_hashfunc_71},
+{0xDB, get_hashfunc_01},
+{0x223, get_hashfunc_72},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_73},
+{0x223, get_hashfunc_74},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x1DE, get_hashfunc_01},
+{0x1DE, get_hashfunc_01},
+{0x1D2, get_hashfunc_01},
+{0x1D2, get_hashfunc_01},
+{0x223, get_hashfunc_75},
+{0x1CA, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_76},
+{0x223, get_hashfunc_77},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x90, get_hashfunc_01},
+{0x90, get_hashfunc_01},
+{0x91, get_hashfunc_01},
+{0x91, get_hashfunc_01},
+{0x1CD, get_hashfunc_01},
+{0x1CD, get_hashfunc_01},
+{0x1CD, get_hashfunc_01},
+{0x1CD, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x96, get_hashfunc_01},
+{0x223, get_hashfunc_78},
+{0x223, get_hashfunc_78},
+{0x223, get_hashfunc_78},
+{0x223, get_hashfunc_78},
+{0x223, get_hashfunc_79},
+{0x223, get_hashfunc_79},
+{0x223, get_hashfunc_80},
+{0x223, get_hashfunc_80},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_81},
+{0x223, get_hashfunc_82},
+{0x223, get_hashfunc_81},
+{0x223, get_hashfunc_82},
+{0x223, get_hashfunc_83},
+{0xCC, get_hashfunc_01},
+{0x223, get_hashfunc_83},
+{0xCC, get_hashfunc_01},
+{0x223, get_hashfunc_84},
+{0x223, get_hashfunc_85},
+{0x223, get_hashfunc_84},
+{0x223, get_hashfunc_85},
+{0x223, get_hashfunc_86},
+{0x223, get_hashfunc_86},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_87},
+{0x223, get_hashfunc_87},
+{0x223, get_hashfunc_88},
+{0x223, get_hashfunc_88},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_89},
+{0x223, get_hashfunc_90},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_91},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01},
+{0x223, get_hashfunc_01}
 };
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tms320/c55x_plus/ins.h radare2-2.8.0+dfsg/libr/asm/arch/tms320/c55x_plus/ins.h
--- radare2-2.3.0+dfsg/libr/asm/arch/tms320/c55x_plus/ins.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tms320/c55x_plus/ins.h	2018-08-07 14:12:36.000000000 +0000
@@ -5,7 +5,7 @@
 #include "utils.h"
 
 // instruction length
-R_API ut32 get_ins_len(ut8 opcode);
+ut32 get_ins_len(ut8 opcode);
 
 // gets instruction bytes from a position
 ut32 get_ins_part(ut32 pos, ut32 len);
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tms320/tms320_dasm.c radare2-2.8.0+dfsg/libr/asm/arch/tms320/tms320_dasm.c
--- radare2-2.3.0+dfsg/libr/asm/arch/tms320/tms320_dasm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tms320/tms320_dasm.c	2018-08-07 14:12:36.000000000 +0000
@@ -1022,17 +1022,17 @@
 	}
 	while (e_list && (e_list[0] && e_list[1])) {
 		if ((dasm->opcode & e_list[0]) == e_list[1]) {
-			const char *key = sdb_fmt (0, "%c", e_list[1]);
+			const char *key = sdb_fmt ("%c", e_list[1]);
 			dasm->head = ht_find (dasm->map, key, NULL);
 			break;
 		}
 		e_list += 2;
 	}
 	if (!dasm->head) {
-		const char *key = sdb_fmt (0, "%c", dasm->opcode);
+		const char *key = sdb_fmt ("%c", dasm->opcode);
 		dasm->head = ht_find (dasm->map, key, NULL);
 		if (!dasm->head) {
-			const char *key = sdb_fmt (0, "%c", (dasm->opcode & 0xfe));
+			const char *key = sdb_fmt ("%c", (dasm->opcode & 0xfe));
 			dasm->head = ht_find (dasm->map, key, NULL);
 		}
 	}
@@ -1114,7 +1114,7 @@
 		return 0;
 	}
 	for (i = 0; i < ARRAY_SIZE(c55x_list); i++) {
-		const char *key = sdb_fmt (0, "%c", c55x_list[i].byte);
+		const char *key = sdb_fmt ("%c", c55x_list[i].byte);
 		ht_insert (dasm->map, key, &c55x_list[i]);
 	}
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tms320/tms320_dasm.h radare2-2.8.0+dfsg/libr/asm/arch/tms320/tms320_dasm.h
--- radare2-2.3.0+dfsg/libr/asm/arch/tms320/tms320_dasm.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tms320/tms320_dasm.h	2018-08-07 14:12:36.000000000 +0000
@@ -237,9 +237,9 @@
 #define INSN_FLAG(af, av)		{ .f = af, .v = TMS320_FLAG_##av }
 #define INSN_SYNTAX(...)		(char *)#__VA_ARGS__
 
-R_API extern int tms320_dasm(tms320_dasm_t *, const ut8 *, int);
+extern int tms320_dasm(tms320_dasm_t *, const ut8 *, int);
 
-R_API extern int tms320_dasm_init(tms320_dasm_t *);
-R_API extern int tms320_dasm_fini(tms320_dasm_t *);
+extern int tms320_dasm_init(tms320_dasm_t *);
+extern int tms320_dasm_fini(tms320_dasm_t *);
 
 #endif /* __TMS320_DASM_H__ */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tricore/gnu/cpu-tricore.c radare2-2.8.0+dfsg/libr/asm/arch/tricore/gnu/cpu-tricore.c
--- radare2-2.3.0+dfsg/libr/asm/arch/tricore/gnu/cpu-tricore.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tricore/gnu/cpu-tricore.c	2018-08-07 14:12:36.000000000 +0000
@@ -25,7 +25,7 @@
 
 //#include "bfd.h"
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 //#include "libbfd.h"
 #include "opcode/tricore.h"
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tricore/gnu/tricore-dis.c radare2-2.8.0+dfsg/libr/asm/arch/tricore/gnu/tricore-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/tricore/gnu/tricore-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tricore/gnu/tricore-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -24,7 +24,7 @@
 #include "ansidecl.h"
 #include "sysdep.h"
 #include "opcode/tricore.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #ifndef _MSC_VER
 #include "libiberty.h"
 #else
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/tricore/gnu/tricore-opc.c radare2-2.8.0+dfsg/libr/asm/arch/tricore/gnu/tricore-opc.c
--- radare2-2.3.0+dfsg/libr/asm/arch/tricore/gnu/tricore-opc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/tricore/gnu/tricore-opc.c	2018-08-07 14:12:36.000000000 +0000
@@ -2082,6 +2082,8 @@
 		 TRICORE_RIDER_B_UP, INDICES},
   {"st.b",       1, 0x00000025, 0x0c0000da, F(ABS),  2, "td",    "12",
 		 TRICORE_GENERIC, INDICES},
+  {"st.b",       1, 0x000000e9, 0x00000016, F(BOL),  3, "@wd",   "213",
+		 TRICORE_GENERIC, INDICES},
   {"st.b",       1, 0x00000089, 0x0fc00076, F(BO),   3, ">0d",   "213",
 		 TRICORE_GENERIC, INDICES},
   {"st.b",       1, 0x000000a9, 0xffff0056, F(BO),   2, "#d",    "23",
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/v810/v810_disas.h radare2-2.8.0+dfsg/libr/asm/arch/v810/v810_disas.h
--- radare2-2.3.0+dfsg/libr/asm/arch/v810/v810_disas.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/v810/v810_disas.h	2018-08-07 14:12:36.000000000 +0000
@@ -141,6 +141,6 @@
 	char operands[V810_INSTR_MAXLEN];
 };
 
-R_API int v810_decode_command(const ut8 *instr, int len, struct v810_cmd *cmd);
+int v810_decode_command(const ut8 *instr, int len, struct v810_cmd *cmd);
 
 #endif /* R2_V810_DISASM_H */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/v850/v850_disas.c radare2-2.8.0+dfsg/libr/asm/arch/v850/v850_disas.c
--- radare2-2.3.0+dfsg/libr/asm/arch/v850/v850_disas.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/v850/v850_disas.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,3 +1,5 @@
+/* radare - LGPL - Copyright 2014-2018 - Fedor Sakharov */
+
 #include <r_types.h>
 #include <r_util.h>
 #include <r_endian.h>
@@ -99,9 +101,7 @@
 };
 
 static int decode_reg_reg(const ut16 instr, struct v850_cmd *cmd) {
-	ut8 opcode;
-
-	opcode = get_opcode (instr);
+	ut8 opcode = get_opcode (instr);
 
 	if (opcode >= sizeof (instrs)/sizeof (char *)) {
 		return -1;
@@ -121,18 +121,14 @@
 }
 
 static int decode_imm_reg(const ut16 instr, struct v850_cmd *cmd) {
-	ut8 opcode;
-	st8 immed;
-
-	opcode = get_opcode (instr);
-
-	if (opcode >= sizeof (instrs)/sizeof (char *)) {
+	ut8 opcode = get_opcode (instr);
+	if (opcode >= sizeof (instrs) / sizeof (char *)) {
 		return -1;
 	}
 
 	snprintf (cmd->instr, V850_INSTR_MAXLEN - 1, "%s", instrs[opcode]);
 
-	immed = get_reg1 (instr);
+	st8 immed = get_reg1 (instr);
 
 	if (immed & 0x10) {
 		immed |= 0xE0;
@@ -154,29 +150,33 @@
 	return 2;
 }
 
-static int decode_bcond(const ut16 instr, struct v850_cmd *cmd) {
-	ut16 disp;
-
-	disp = ((instr >> 4) & 0x7) | (instr >> 11);
-	disp = disp << 1;
-
+static int decode_bcond(const ut16 instr, int len, struct v850_cmd *cmd) {
+#if 0
+	ut16 disp = ((instr >> 4) & 0x7) | (instr >> 11);
+	disp <<= 1;
 	snprintf (cmd->instr, V850_INSTR_MAXLEN - 1, "b%s", conds[instr & 0xF]);
-
 	snprintf (cmd->operands, V850_INSTR_MAXLEN - 1, "0x%x", disp);
-
+#else
+	ut64 delta = ((((instr >> 4) & 0x7) | ((instr >> 11) << 3)) << 1);
+	if (delta & 0x100) {
+		delta |= 0xFE00;
+	}
+	snprintf (cmd->instr, V850_INSTR_MAXLEN - 1, "b%s", conds[instr & 0xF]);
+	snprintf (cmd->operands, V850_INSTR_MAXLEN - 1, "0x%08"PFMT64x, cmd->addr + delta);
+#endif
 	return 2;
 }
 
-static int decode_jarl(const ut8 *instr, struct v850_cmd *cmd) {
-	ut8 reg;
-	ut16 word1, word2;
-	ut32 disp;
+static int decode_jarl(const ut8 *instr, int len, struct v850_cmd *cmd) {
+	if (len < 4) {
+		return -1;
+	}
 
-	word1 = r_read_le16 (instr);
-	word2 = r_read_at_le16 (instr, 2);
+	ut16 word1 = r_read_le16 (instr);
+	ut16 word2 = r_read_at_le16 (instr, 2);
 
-	reg = get_reg2 (word1);
-	disp = (word2 << 6) | get_reg1 (word1);
+	ut8 reg = get_reg2 (word1);
+	ut32 disp = (word2 << 6) | get_reg1 (word1);
 
 	snprintf (cmd->instr, V850_INSTR_MAXLEN - 1, "%s", instrs[get_opcode (word1)]);
 	snprintf (cmd->operands, V850_INSTR_MAXLEN - 1, "0x%08x, r%d",
@@ -185,24 +185,25 @@
 	return 4;
 }
 
-static int decode_3operands(const ut8 *instr, struct v850_cmd *cmd) {
-	ut16 word1, word2;
-
-	word1 = r_read_le16 (instr);
-	word2 = r_read_at_le16 (instr, 2);
-
+static int decode_3operands(const ut8 *instr, int len, struct v850_cmd *cmd) {
+	if (len < 4) {
+		return -1;
+	}
+	ut16 word1 = r_read_le16 (instr);
+	ut16 word2 = r_read_at_le16 (instr, 2);
 	snprintf (cmd->instr, V850_INSTR_MAXLEN - 1, "%s", instrs[get_opcode (word1)]);
 	snprintf (cmd->operands, V850_INSTR_MAXLEN - 1, "0x%x, r%d, r%d",
 			word2, get_reg1 (word1), get_reg2 (word1));
-
 	return 4;
 }
 
-static int decode_load_store(const ut8 *instr, struct v850_cmd *cmd) {
-	ut16 word1, word2;
+static int decode_load_store(const ut8 *instr, int len, struct v850_cmd *cmd) {
+	if (len < 4) {
+		return -1;
+	}
 
-	word1 = r_read_le16 (instr);
-	word2 = r_read_at_le16 (instr, 2);
+	ut16 word1 = r_read_le16 (instr);
+	ut16 word2 = r_read_at_le16 (instr, 2);
 
 	switch (get_opcode (word1)) {
 	case V850_STB:
@@ -232,27 +233,27 @@
 	return 4;
 }
 
-static int decode_bit_op(const ut8 *instr, struct v850_cmd *cmd) {
-	ut16 word1, word2;
-	ut8 reg1;
-
-	word1 = r_read_le16 (instr);
-	word2 = r_read_at_le16 (instr, 2);
+static int decode_bit_op(const ut8 *instr, int len, struct v850_cmd *cmd) {
+	if (len < 4) {
+		return -1;
+	}
 
+	ut16 word1 = r_read_le16 (instr);
+	ut16 word2 = r_read_at_le16 (instr, 2);
 	snprintf (cmd->instr, V850_INSTR_MAXLEN - 1, "%s", bit_instrs[word1 >> 14]);
-
-	reg1 = get_reg1 (word1);
-
+	ut8 reg1 = get_reg1 (word1);
 	snprintf (cmd->operands, V850_INSTR_MAXLEN - 1, "%u, 0x%x[r%d]",
 			(word1 >> 11) & 0x7, word2, reg1);
 	return 4;
 }
 
-static int decode_extended(const ut8 *instr, struct v850_cmd *cmd) {
-	ut16 word1, word2;
+static int decode_extended(const ut8 *instr, int len, struct v850_cmd *cmd) {
+	if (len < 4) {
+		return -1;
+	}
 
-	word1 = r_read_le16 (instr);
-	word2 = r_read_at_le16 (instr, 2);
+	ut16 word1 = r_read_le16 (instr);
+	ut16 word2 = r_read_at_le16 (instr, 2);
 
 	snprintf (cmd->instr, V850_INSTR_MAXLEN - 1, "%s",
 			ext_instrs1[get_subopcode (word1)]);
@@ -296,11 +297,13 @@
 	return 4;
 }
 
-int v850_decode_command (const ut8 *instr, struct v850_cmd *cmd) {
+int v850_decode_command (const ut8 *instr, int len, struct v850_cmd *cmd) {
 	int ret;
-	ut16 in;
 
-	in = r_read_le16 (instr);
+	if (len < 2) {
+		return -1;
+	}
+	ut16 in = r_read_le16 (instr);
 
 	switch (get_opcode (in)) {
 	case V850_MOV:
@@ -339,27 +342,27 @@
 	case V850_XORI:
 	case V850_ANDI:
 	case V850_MULHI:
-		ret = decode_3operands (instr, cmd);
+		ret = decode_3operands (instr, len, cmd);
 		break;
 	case V850_JARL1:
 	case V850_JARL2:
-		ret = decode_jarl (instr, cmd);
+		ret = decode_jarl (instr, len, cmd);
 		break;
 	case V850_STB:
 	case V850_LDB:
 	case V850_LDHW:
 	case V850_STHW:
-		ret = decode_load_store (instr, cmd);
+		ret = decode_load_store (instr, len, cmd);
 		break;
 	case V850_BIT_MANIP:
-		ret = decode_bit_op (instr, cmd);
+		ret = decode_bit_op (instr, len, cmd);
 		break;
 	case V850_EXT1:
-		ret = decode_extended (instr, cmd);
+		ret = decode_extended (instr, len, cmd);
 		break;
 	default:
 		if ((get_opcode (in) >> 2) == 0xB) {
-			ret = decode_bcond (in, cmd);
+			ret = decode_bcond (in, len, cmd);
 		} else {
 			ret = -1;
 		}
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/v850/v850_disas.h radare2-2.8.0+dfsg/libr/asm/arch/v850/v850_disas.h
--- radare2-2.3.0+dfsg/libr/asm/arch/v850/v850_disas.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/v850/v850_disas.h	2018-08-07 14:12:36.000000000 +0000
@@ -232,7 +232,7 @@
 	V850_LP = 0x1F,
 };
 
-static char* V850_REG_NAMES[] = {
+static const char* V850_REG_NAMES[] = {
 	"zero",
 	"r1",
 	"r2",
@@ -290,6 +290,7 @@
 };
 
 struct v850_cmd {
+	ut64 addr;
 	unsigned type;
 	char	instr[V850_INSTR_MAXLEN];
 	char	operands[V850_INSTR_MAXLEN];
@@ -312,5 +313,5 @@
 	return instr >> 11;
 }
 
-R_API int v850_decode_command (const ut8 *instr, struct v850_cmd *cmd);
+int v850_decode_command (const ut8 *instr, int len, struct v850_cmd *cmd);
 #endif /* R2_V850_DISASM_H */
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/vax/vax-dis.c radare2-2.8.0+dfsg/libr/asm/arch/vax/vax-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/vax/vax-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/vax/vax-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "vax.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 static char *reg_names[] =
 {
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/wasm/wasm.c radare2-2.8.0+dfsg/libr/asm/arch/wasm/wasm.c
--- radare2-2.3.0+dfsg/libr/asm/arch/wasm/wasm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/wasm/wasm.c	2018-08-07 14:12:36.000000000 +0000
@@ -6,8 +6,8 @@
 #include <r_lib.h>
 #include <string.h>
 
-#include "../../asm/arch/wasm/wasm.h"
-#include "../../bin/format/wasm/wasm.h"
+#include "wasm.h"
+#include "../../../bin/format/wasm/wasm.h"
 
 static WasmOpDef opcodes[256] = {
 	[WASM_OP_TRAP] = { "trap", 1, 1 },
@@ -393,7 +393,7 @@
 		{
 			ut32 count = 0, *table = NULL, def = 0;
 			size_t n = read_u32_leb128 (buf + 1, buf + buf_len, &count);
-			if (!(n > 0 && n < buf_len)) {
+			if (!(n > 0 && n < buf_len && count < 0xffff)) {
 				goto err;
 			}
 			if (!(table = calloc (count, sizeof (ut32)))) {
@@ -406,6 +406,9 @@
 				if (!(op->len + n <= buf_len)) {
 					goto beach;
 				}
+				if (n < 1) {
+					break;
+				}
 				op->len += n;
 			}
 			n = read_u32_leb128 (buf + op->len, buf + buf_len, &def);
@@ -414,14 +417,20 @@
 			}
 			op->len += n;
 			snprintf (op->txt, R_ASM_BUFSIZE, "%s %d ", opdef->txt, count);
-			for (i = 0; i < count && strlen (op->txt) + 10 < R_ASM_BUFSIZE; i++) {
-				int optxtlen = strlen (op->txt);
-				snprintf (op->txt + optxtlen, R_ASM_BUFSIZE - optxtlen, "%d ", table[i]);
+			char *txt = op->txt;
+			int txtLen = strlen (op->txt);
+			int txtLeft = R_ASM_BUFSIZE - txtLen;
+			txt += txtLen;
+			for (i = 0; i < count && txtLen + 10 < R_ASM_BUFSIZE; i++) {
+				snprintf (txt, txtLeft, "%d ", table[i]);
+				txtLen = strlen (txt);
+				txt += txtLen;
+				txtLeft -= txtLen;
 			}
-			snprintf (op->txt + strlen (op->txt), R_ASM_BUFSIZE, "%d", def);
+			snprintf (txt, txtLeft - 1, "%d", def);
 			free (table);
 			break;
-			beach:
+		beach:
 			free (table);
 			goto err;
 		}
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/xtensa/gnu/elf32-xtensa.c radare2-2.8.0+dfsg/libr/asm/arch/xtensa/gnu/elf32-xtensa.c
--- radare2-2.3.0+dfsg/libr/asm/arch/xtensa/gnu/elf32-xtensa.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/xtensa/gnu/elf32-xtensa.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,7 +19,7 @@
    02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -507,7 +507,7 @@
 
   for (i = 0; i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]); i++)
     if (elf_howto_table[i].name != NULL
-	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
+	&& r_str_casecmp (elf_howto_table[i].name, r_name) == 0)
       return &elf_howto_table[i];
 
   return NULL;
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-dis.c radare2-2.8.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-dis.c
--- radare2-2.3.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-dis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-dis.c	2018-08-07 14:12:36.000000000 +0000
@@ -27,9 +27,13 @@
 #include "xtensa-isa.h"
 #include "ansidecl.h"
 #include <setjmp.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "libiberty.h"
 
+
+#if defined(_MSC_VER)
+__declspec(dllimport)
+#endif
 extern xtensa_isa xtensa_default_isa;
 
 #ifndef MAX
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-isa.c radare2-2.8.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-isa.c
--- radare2-2.3.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-isa.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/xtensa/gnu/xtensa-isa.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,13 +22,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../../include/dis-asm.h"
+#include "../../include/disas-asm.h"
 #include "../../include/sysdep.h"
 //#include "bfd.h"
 //#include "libbfd.h"
 #include "../../include/xtensa-isa.h"
 #include "../../include/xtensa-isa-internal.h"
 #include "r_types.h"
+#include "r_util.h"
 extern int filename_cmp (const char *s1, const char *s2);
 xtensa_isa_status xtisa_errno;
 char xtisa_error_msg[1024];
@@ -391,7 +392,7 @@
   xtensa_lookup_entry *e1 = (xtensa_lookup_entry *) v1;
   xtensa_lookup_entry *e2 = (xtensa_lookup_entry *) v2;
 
-  return strcasecmp (e1->key, e2->key);
+  return r_str_casecmp (e1->key, e2->key);
 }
 
 
@@ -547,7 +548,7 @@
 
   for (fmt = 0; fmt < intisa->num_formats; fmt++)
     {
-      if (strcasecmp (fmtname, intisa->formats[fmt].name) == 0)
+      if (r_str_casecmp (fmtname, intisa->formats[fmt].name) == 0)
 	return fmt;
     }
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/z80/z80.c radare2-2.8.0+dfsg/libr/asm/arch/z80/z80.c
--- radare2-2.3.0+dfsg/libr/asm/arch/z80/z80.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/z80/z80.c	2018-08-07 14:12:36.000000000 +0000
@@ -8,154 +8,6 @@
 #include <string.h>
 #include "z80_tab.h"
 
-static ut8 z80_fddd_branch_index_res (ut8 hex)
-{
-	switch (hex) {
-		case 0x9:
-			return 0x0;
-		case 0x19:
-			return 0x1;
-		case 0x21:
-		case 0x22:
-		case 0x23:
-		case 0x24:
-		case 0x25:
-		case 0x26:
-			return hex-0x1f;
-		case 0x29:
-		case 0x2a:
-		case 0x2b:
-		case 0x2c:
-		case 0x2d:
-		case 0x2e:
-			return hex-0x21;
-		case 0x34:
-		case 0x35:
-		case 0x36:
-			return hex-0x26;
-		case 0x39:
-			return 0x11;
-		case 0x44:
-		case 0x45:
-		case 0x46:
-			return hex-0x32;
-		case 0x4c:
-		case 0x4d:
-		case 0x4e:
-			return hex-0x37;
-		case 0x54:			//0x18
-		case 0x55:
-		case 0x56:
-			return hex-0x3c;
-		case 0x5c:
-		case 0x5d:
-		case 0x5e:			//0x1d
-			return hex-0x41;
-		case 0x60:
-		case 0x61:
-		case 0x62:
-		case 0x63:
-		case 0x64:
-		case 0x65:
-		case 0x66:
-		case 0x67:
-		case 0x68:
-		case 0x69:
-		case 0x6a:
-		case 0x6b:
-		case 0x6c:
-		case 0x6d:
-		case 0x6e:
-		case 0x6f:
-		case 0x70:
-		case 0x71:
-		case 0x72:
-		case 0x73:
-		case 0x74:
-		case 0x75:
-			return hex-0x42;
-		case 0x77:
-			return 0x34;
-		case 0x7c:
-		case 0x7d:
-		case 0x7e:
-			return hex-0x47;
-		case 0x84:
-		case 0x85:
-		case 0x86:
-			return hex-0x4c;
-		case 0x8c:
-		case 0x8d:
-		case 0x8e:
-			return hex-0x51;
-		case 0x94:
-		case 0x95:
-		case 0x96:
-			return hex-0x56;
-		case 0x9c:
-		case 0x9d:
-		case 0x9e:
-			return hex-0x5b;
-		case 0xa4:
-		case 0xa5:
-		case 0xa6:
-			return hex-0x60;
-		case 0xac:
-		case 0xad:
-		case 0xae:
-			return hex-0x65;
-		case 0xb4:
-		case 0xb5:
-		case 0xb6:
-			return hex-0x6a;
-		case 0xbc:
-		case 0xbd:
-		case 0xbe:
-			return hex-0x6f;
-		case 0xcb:
-			return 0x50;
-		case 0xe1:
-			return 0x51;
-		case 0xe3:
-			return 0x52;
-		case 0xe5:
-			return 0x53;
-		case 0xe9:
-			return 0x54;
-		case 0xf9:
-			return 0x55;
-	}
-	return 0x56;
-}
-
-static ut8 z80_ed_branch_index_res (ut8 hex) {
-	if (hex > 0x3f && 0x4c > hex)
-		return hex-0x40;
-	if (hex == 0x4d)
-		return 0xc;
-	if (hex > 0x4d && 0x54 > hex)
-		return hex-0x42;
-	if (hex > 0x55 && 0x5c > hex)
-		return hex-0x44;
-	if (hex > 0x5d && 0x63 > hex)
-		return hex-0x46;
-	if (hex > 0x66 && 0x6b > hex)
-		return hex-0x4a;
-	if (hex > 0x6e && 0x74 > hex)
-		return hex-0x4e;
-	if (hex > 0x77 && 0x7c > hex)
-		return hex-0x52;
-	if (hex > 0x9f && 0xa4 > hex)
-		return hex-0x76;
-	if (hex > 0xa7 && 0xac > hex)
-		return hex-0x7a;
-	if (hex > 0xaf && 0xb4 > hex)
-		return hex-0x7e;
-	if (hex > 0xb7 && 0xbc > hex)
-		return hex-0x82;
-	return 0x3b;
-}
-
 static ut8 z80_op_24_branch_index_res (ut8 hex) {
 	if (hex < 0x40)
 		return hex;
@@ -217,7 +69,8 @@
 	return ret;
 }
 
-static int z80Disass (RAsmOp *op, const ut8 *buf, int len) {
+// #include'd in asm/p/asm_z80.c
+FUNC_ATTR_USED static int z80Disass (RAsmOp *op, const ut8 *buf, int len) {
 	int ret = z80OpLength (buf, len);
 	z80_opcode *z_op;
 	char **cb_tab;
diff -Nru radare2-2.3.0+dfsg/libr/asm/arch/z80/z80_tab.h radare2-2.8.0+dfsg/libr/asm/arch/z80/z80_tab.h
--- radare2-2.3.0+dfsg/libr/asm/arch/z80/z80_tab.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/arch/z80/z80_tab.h	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,8 @@
 /* radare - LGPL - Copyright 2014-2016 - condret */
 
+#ifndef Z80_TAB_H
+#define Z80_TAB_H
+
 #ifdef NULL
 #undef NULL
 #endif
@@ -22,6 +25,153 @@
 	void *op_moar;
 } z80_opcode;
 
+static ut8 z80_fddd_branch_index_res (ut8 hex) {
+	switch (hex) {
+		case 0x9:
+			return 0x0;
+		case 0x19:
+			return 0x1;
+		case 0x21:
+		case 0x22:
+		case 0x23:
+		case 0x24:
+		case 0x25:
+		case 0x26:
+			return hex-0x1f;
+		case 0x29:
+		case 0x2a:
+		case 0x2b:
+		case 0x2c:
+		case 0x2d:
+		case 0x2e:
+			return hex-0x21;
+		case 0x34:
+		case 0x35:
+		case 0x36:
+			return hex-0x26;
+		case 0x39:
+			return 0x11;
+		case 0x44:
+		case 0x45:
+		case 0x46:
+			return hex-0x32;
+		case 0x4c:
+		case 0x4d:
+		case 0x4e:
+			return hex-0x37;
+		case 0x54:			//0x18
+		case 0x55:
+		case 0x56:
+			return hex-0x3c;
+		case 0x5c:
+		case 0x5d:
+		case 0x5e:			//0x1d
+			return hex-0x41;
+		case 0x60:
+		case 0x61:
+		case 0x62:
+		case 0x63:
+		case 0x64:
+		case 0x65:
+		case 0x66:
+		case 0x67:
+		case 0x68:
+		case 0x69:
+		case 0x6a:
+		case 0x6b:
+		case 0x6c:
+		case 0x6d:
+		case 0x6e:
+		case 0x6f:
+		case 0x70:
+		case 0x71:
+		case 0x72:
+		case 0x73:
+		case 0x74:
+		case 0x75:
+			return hex-0x42;
+		case 0x77:
+			return 0x34;
+		case 0x7c:
+		case 0x7d:
+		case 0x7e:
+			return hex-0x47;
+		case 0x84:
+		case 0x85:
+		case 0x86:
+			return hex-0x4c;
+		case 0x8c:
+		case 0x8d:
+		case 0x8e:
+			return hex-0x51;
+		case 0x94:
+		case 0x95:
+		case 0x96:
+			return hex-0x56;
+		case 0x9c:
+		case 0x9d:
+		case 0x9e:
+			return hex-0x5b;
+		case 0xa4:
+		case 0xa5:
+		case 0xa6:
+			return hex-0x60;
+		case 0xac:
+		case 0xad:
+		case 0xae:
+			return hex-0x65;
+		case 0xb4:
+		case 0xb5:
+		case 0xb6:
+			return hex-0x6a;
+		case 0xbc:
+		case 0xbd:
+		case 0xbe:
+			return hex-0x6f;
+		case 0xcb:
+			return 0x50;
+		case 0xe1:
+			return 0x51;
+		case 0xe3:
+			return 0x52;
+		case 0xe5:
+			return 0x53;
+		case 0xe9:
+			return 0x54;
+		case 0xf9:
+			return 0x55;
+	}
+	return 0x56;
+}
+
+static ut8 z80_ed_branch_index_res (ut8 hex) {
+	if (hex > 0x3f && 0x4c > hex)
+		return hex-0x40;
+	if (hex == 0x4d)
+		return 0xc;
+	if (hex > 0x4d && 0x54 > hex)
+		return hex-0x42;
+	if (hex > 0x55 && 0x5c > hex)
+		return hex-0x44;
+	if (hex > 0x5d && 0x63 > hex)
+		return hex-0x46;
+	if (hex > 0x66 && 0x6b > hex)
+		return hex-0x4a;
+	if (hex > 0x6e && 0x74 > hex)
+		return hex-0x4e;
+	if (hex > 0x77 && 0x7c > hex)
+		return hex-0x52;
+	if (hex > 0x9f && 0xa4 > hex)
+		return hex-0x76;
+	if (hex > 0xa7 && 0xac > hex)
+		return hex-0x7a;
+	if (hex > 0xaf && 0xb4 > hex)
+		return hex-0x7e;
+	if (hex > 0xb7 && 0xbc > hex)
+		return hex-0x82;
+	return 0x3b;
+}
+
 static const char *cb[] = {
 	"rlc b",
 	"rlc c",
@@ -839,6 +989,7 @@
 	{"cpdr",		Z80_OP16		,NULL},
 	{"indr",		Z80_OP16		,NULL},
 	{"otdr",		Z80_OP16		,NULL},
+	{"invalid",		Z80_OP16		,NULL},
 	{"invalid",		Z80_OP16		,NULL}
 };
 
@@ -1190,3 +1341,5 @@
 	{"cp 0x%02x",		Z80_OP8^Z80_ARG8	,NULL},
 	{"rst 0x38",		Z80_OP8			,NULL},
 };
+
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/asm.c radare2-2.8.0+dfsg/libr/asm/asm.c
--- radare2-2.3.0+dfsg/libr/asm/asm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/asm.c	2018-08-07 14:12:36.000000000 +0000
@@ -8,8 +8,6 @@
 #include <spp/spp.h>
 #include <config.h>
 
-#define R_ASM_OPCODES_PATH "/share/radare2/" R2_VERSION "/opcodes"
-
 R_LIB_VERSION (r_asm);
 
 char *directives[] = {
@@ -137,6 +135,34 @@
 	return size;
 }
 
+static inline int r_asm_pseudo_incbin(RAsmOp *op, char *input) {
+	int skip = 0;
+	int count = 0;
+	int bytes_read = 0;
+	r_str_replace_char (input, ',', ' ');
+	// int len = r_str_word_count (input);
+	r_str_word_set0 (input);
+	//const char *filename = r_str_word_get0 (input, 0);
+	skip = (int)r_num_math (NULL, r_str_word_get0 (input, 1));
+	count = (int)r_num_math (NULL,r_str_word_get0 (input, 2));
+	char *content = r_file_slurp (input, &bytes_read);
+	if (skip > 0) {
+		skip = skip > bytes_read ? bytes_read : skip;
+	}
+	if (count > 0) {
+		count = count > bytes_read ? 0 : count;
+	} else {
+		count = bytes_read;
+	}
+	// Need to handle arbitrary amount of data
+	r_buf_free (op->buf_inc);
+	op->buf_inc = r_buf_new_with_string (content + skip);
+	// Terminate the original buffer
+	op->buf_hex[0] = '\0';
+	free (content);
+	return count;
+}
+
 static void plugin_free(RAsmPlugin *p) {
 	if (p && p->fini) {
 		p->fini (NULL);
@@ -275,8 +301,6 @@
 
 // TODO: this can be optimized using r_str_hash()
 R_API int r_asm_use(RAsm *a, const char *name) {
-	const char *dirPrefix = r_sys_prefix (NULL);
-	char file[1024];
 	RAsmPlugin *h;
 	RListIter *iter;
 	if (!a || !name) {
@@ -285,12 +309,13 @@
 	r_list_foreach (a->plugins, iter, h) {
 		if (!strcmp (h->name, name) && h->arch) {
 			if (!a->cur || (a->cur && strcmp (a->cur->arch, h->arch))) {
-				//const char *dop = r_config_get (core->config, "dir.opcodes");
-				// TODO: allow configurable path for sdb files
-				snprintf (file, sizeof (file), "%s/"R_ASM_OPCODES_PATH"/%s.sdb", dirPrefix, h->arch);
-				sdb_free (a->pair);
+				char *r2prefix = r_str_r2_prefix (R2_SDB_OPCODES);
+				char *file = r_str_newf ("%s/%s.sdb", r_str_get (r2prefix), h->arch);
 				r_asm_set_cpu (a, NULL);
+				sdb_free (a->pair);
 				a->pair = sdb_new (NULL, file, 0);
+				free (r2prefix);
+				free (file);
 			}
 			a->cur = h;
 			return true;
@@ -443,11 +468,16 @@
 	if (a->ofilter) {
 		r_parse_parse (a->ofilter, op->buf_asm, op->buf_asm);
 	}
-	//XXX check against R_ASM_BUFSIZE other oob write
-	memcpy (op->buf, buf, R_MIN (R_ASM_BUFSIZE - 1, oplen));
-	const int addrbytes = a->user ? ((RCore *)a->user)->io->addrbytes : 1;
-	r_hex_bin2str (buf, R_MIN (addrbytes * oplen,
-		(sizeof (op->buf_hex) - 1) / 2), op->buf_hex);
+	// XXX this is crap and needs proper fix
+	int dstlen = R_MIN ((R_ASM_BUFSIZE -1), oplen);
+	int cpylen = R_MIN (dstlen, len);
+	if (cpylen > 0) {
+		memcpy (op->buf, buf, cpylen);
+		const int addrbytes = a->user ? ((RCore *)a->user)->io->addrbytes : 1;
+		int len = R_MIN (addrbytes * oplen, (sizeof (op->buf_hex) - 1) / 2);
+		// len is the length in input buffer, not len of output, so we must / 2
+		r_hex_bin2str (op->buf, len, op->buf_hex);
+	}
 	return ret;
 }
 
@@ -684,6 +714,8 @@
 	acode->code_align = 0;
 	memset (&op, 0, sizeof (op));
 
+	/* consider ,, an alias for a newline */
+	lbuf = r_str_replace (lbuf, ",,", "\n", true);
 	/* accept ';' as comments when input is multiline */
 	{
 		char *nl = strchr (lbuf, '\n');
@@ -763,7 +795,7 @@
 					isavrseparator (*ptr_start); ptr_start++);
 			} else {
 				for (ptr_start = buf_token; *ptr_start &&
-					ISSEPARATOR (*ptr_start); ptr_start++);
+					IS_SEPARATOR (*ptr_start); ptr_start++);
 			}
 			if (!strncmp (ptr_start, "/*", 2)) {
 				if (!strstr (ptr_start + 2, "*/")) {
@@ -896,8 +928,15 @@
 					acode->code_offset = a->pc;
 				} else if (!strncmp (ptr, ".data", 5)) {
 					acode->data_offset = a->pc;
+				} else if (!strncmp (ptr, ".incbin", 7)) {
+					if (ptr[7] != ' ') {
+						eprintf ("incbin missing filename\n");
+						continue;
+					}
+					ret = r_asm_pseudo_incbin (&op, ptr + 8);
 				} else {
 					eprintf ("Unknown directive (%s)\n", ptr);
+					free(lbuf);
 					return r_asm_code_free (acode);
 				}
 				if (!ret) {
@@ -905,6 +944,7 @@
 				}
 				if (ret < 0) {
 					eprintf ("!!! Oops\n");
+					free(lbuf);
 					return r_asm_code_free (acode);
 				}
 			} else { /* Instruction */
@@ -930,21 +970,35 @@
 			if (stage == STAGES - 1) {
 				if (ret < 1) {
 					eprintf ("Cannot assemble '%s' at line %d\n", ptr_start, linenum);
+					free(lbuf);
 					return r_asm_code_free (acode);
 				}
 				acode->len = idx + ret;
 				char *newbuf = realloc (acode->buf, (idx + ret) * 2);
 				if (!newbuf) {
+					free(lbuf);
 					return r_asm_code_free (acode);
 				}
 				acode->buf = (ut8*)newbuf;
-				newbuf = realloc (acode->buf_hex, strlen (acode->buf_hex) + strlen (op.buf_hex) + 1);
+				newbuf = realloc (acode->buf_hex, strlen (acode->buf_hex) + strlen (op.buf_hex) + r_buf_size (op.buf_inc) + 1);
 				if (!newbuf) {
+					free(lbuf);
 					return r_asm_code_free (acode);
 				}
 				acode->buf_hex = newbuf;
 				memcpy (acode->buf + idx, op.buf, ret);
 				strcat (acode->buf_hex, op.buf_hex);
+				if (r_buf_size (op.buf_inc) > 1) {
+					if (strlen (acode->buf_hex) > 0) {
+						strcat (acode->buf_hex, "\n");
+					}
+					char *s = r_buf_free_to_string (op.buf_inc);
+					if (s) {
+						strcat (acode->buf_hex, s);
+						free (s);
+					}
+				}
+
 			}
 		}
 	}
@@ -1021,12 +1075,13 @@
 }
 
 R_API ut8 *r_asm_from_string(RAsm *a, ut64 addr, const char *b, int *l) {
-	RAsmCode *code;
 	r_asm_set_pc (a, addr);
-	code = r_asm_massemble (a, b);
+	RAsmCode *code = r_asm_massemble (a, b);
 	if (code) {
 		ut8 *buf = code->buf;
-		if (l) *l = code->len;
+		if (l) {
+			*l = code->len;
+		}
 		r_asm_code_free (code);
 		return buf;
 	}
diff -Nru radare2-2.3.0+dfsg/libr/asm/d/8051.sdb.txt radare2-2.8.0+dfsg/libr/asm/d/8051.sdb.txt
--- radare2-2.3.0+dfsg/libr/asm/d/8051.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/d/8051.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -2,16 +2,15 @@
 add=add
 addc=add with carry
 ajmp=absolute jump
-anl=logical-and
+anl=logical and
 cjne=compare and jump if not equal
 clr=clear
 cpl=complement
-da=decimal-adjust accumulator for addition
+da=decimal-adjust accumulator after addition
 dec=decrement
-digit indirect ram with acc
-div=divide
+div=divide accumulator by b register
 djnz=decrement and jump if not zero
-inc=increment data pointer
+inc=increment
 jb=jump if bit set
 jbc=jump if bit is set and clear bit
 jc=jump if carry is set
@@ -22,23 +21,24 @@
 jz=jump if accumulator zero
 lcall=long call
 ljmp=long jump
-mov=move
-movc=moves a byte from the code or program memory to the accumulator
-movx=move external
+mov=move 
+movc=move from code or program memory to accumulator
+movx=move between external memory and accumulator
+mul=multiply accumulator and b register
 nop=no operation
-orl=logical-or
-pop=pop from stack.pop
+orl=logical or
+pop=pop from stack
 push=push onto stack
 ret=return from subroutine
 reti=return from interrupt
 rl=rotate accumulator left
-rlc=rotate accumulator left through the carry flag
+rlc=rotate accumulator left through carry
 rr=rotate accumulator right
-rrc=rotate accumulator right through the carry
+rrc=rotate accumulator right through carry
 setb=set bit
 sjmp=short jump (relative addr)
 subb=subtract with borrow
 swap=swap nibbles within the accumulator
 xch=exchange
-xchd=exchange low-order
+xchd=exchange low-order nibbles between accumulator and RAM location
 xrl=logical exclusive-or
diff -Nru radare2-2.3.0+dfsg/libr/asm/d/Makefile radare2-2.8.0+dfsg/libr/asm/d/Makefile
--- radare2-2.3.0+dfsg/libr/asm/d/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/d/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -1,7 +1,10 @@
 FILES=6502 8051 m68k x86 arc arm avr LH5801 ppc z80 mips sparc sh malbolge xtensa
-FILES+=i8080 java i4004 dalvik msp430 lm32 sysz tms320 riscv propeller v810 pic18c
+FILES+=i8080 java i4004 dalvik msp430 lm32 sysz tms320 riscv propeller v810 v850 pic18c
 F_SDB=$(addsuffix .sdb,${FILES})
 SDB=../../../shlr/sdb/sdb
+
+CFLAGS+=-fvisibility=hidden
+LDFLAGS+=-fvisibility=hidden
 include ../../../config-user.mk
 
 all: ${F_SDB}
diff -Nru radare2-2.3.0+dfsg/libr/asm/d/meson.build radare2-2.8.0+dfsg/libr/asm/d/meson.build
--- radare2-2.3.0+dfsg/libr/asm/d/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/d/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,42 @@
+sdb_files = [
+  '6502',
+  '8051',
+  'm68k',
+  'x86',
+  'arc',
+  'arm',
+  'avr',
+  'LH5801',
+  'ppc',
+  'z80',
+  'mips',
+  'sparc',
+  'sh',
+  'malbolge',
+  'xtensa',
+  'i8080',
+  'java',
+  'i4004',
+  'dalvik',
+  'msp430',
+  'lm32',
+  'sysz',
+  'tms320',
+  'riscv',
+  'propeller',
+  'v810',
+  'pic18c'
+]
+
+foreach file : sdb_files
+  outfile = '@0@.sdb'.format(file)
+  custom_target(outfile,
+    input: '@0@.sdb.txt'.format(file),
+    output: outfile,
+    command: sdb_gen_cmd,
+    depends: sdb_exe,
+    build_by_default: true,
+    install: true,
+    install_dir: join_paths(r2_sdb, 'opcodes')
+  )
+endforeach
diff -Nru radare2-2.3.0+dfsg/libr/asm/d/ppc.sdb.txt radare2-2.8.0+dfsg/libr/asm/d/ppc.sdb.txt
--- radare2-2.3.0+dfsg/libr/asm/d/ppc.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/d/ppc.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -93,7 +93,7 @@
 crnor=CR NOR
 cror=CR OR
 crorc=CR OR with Complement
-crxor=CR XOR
+crxor=Conditional Register bit XOR
 dadd.=DFP Add
 dadd=DFP Add
 daddq.=DFP Add Quad
@@ -1171,9 +1171,180 @@
 xxsldwi=VSX Vector Shift Left Double by Word Immediate
 xxspltib=VSX Vector Splat Immediate Byte
 xxspltw=VSX Vector Splat Word
+# PPC VLE
+e_add16i=Add Immediate
+e_add2i.=Add (2 operand) Immediate and Record
+e_add2is=Add (2 operand) Immediate Shifted
+e_addi=Add Scaled Immediate
+e_addi.=Add Scaled Immediate
+e_addic=Add Scaled Immediate Carrying
+e_addic.=Add Scaled Immediate Carrying
+e_and2i=AND (two operand) Immediate
+e_and2is=AND (2 operand) Immediate Shifted
+e_and2i.=AND (two operand) Immediate
+e_and2is.=AND (2 operand) Immediate Shifted
+e_andi=AND Scaled Immediate
+e_andi.=AND Scaled Immediate
+e_b=Branch
+e_bl=Branch and Link
+e_bc=Branch Conditional
+e_bcl=Branch Conditional and Link
+e_cmp16i=Compare Immediate Word
+e_cmph=Compare Halfword
+e_cmph16i=Compare Halfword Immediate
+e_cmphl=Compare Halfword Logical
+e_cmphl16i=Compare Halfword Logical Immediate
+e_cmpi=Compare Scaled Immediate Word
+e_cmpl16i=Compare Logical Immediate Word
+e_cmpli=Compare Logical Scaled Immediate Word
+e_crand=Condition Register AND
+e_crandc=Condition Register AND with Complement
+e_creqv=Condition Register Equivalent
+e_crnand=Condition Register NAND
+e_crnor=Condition Register NOR
+e_cror=Condition Register OR
+e_crorc=Condition Register OR with Complement
+e_crxor=Condition Register XOR
+e_lbz=Load Byte and Zero
+e_lbzu=Load Byte and Zero with Update
+e_lha=Load Halfword Algebraic
+e_lhau=Load Halfword Algebraic with Update
+e_lhz=Load Halfword and Zero
+e_lhzu=Load Halfword and Zero with Update
+e_li=Load Immediate; e_li r3, 1; r3 = 1
+e_lis=Load Immediate Shifted; e_lis r3, 0x7; r3 = 0x70000; r3 = (0x7 << 16)
+e_lmw=Load Multiple Word
+e_lwz=Load Word and Zero
+e_lwzu=Load Word and Zero with Update
+e_mcrf=Move CR Field
+e_mull2i=Multiply (2 operand) Low Immediate
+e_mulli=Multiply Low Scaled Immediate
+e_or2i=OR (two operand) Immediate
+e_or2is=OR (2 operand) Immediate Shifted
+e_ori=OR Scaled Immediate
+e_ori.=OR Scaled Immediate
+e_rlw=Rotate Left Word
+e_rlw.=Rotate Left Word
+e_rlwi=Rotate Left Word Immediate
+e_rlwi.=Rotate Left Word Immediate
+e_rlwimi=Rotate Left Word Immediate then Mask Insert
+e_rlwinm=Rotate Left Word Immediate then AND with Mask,
+e_sc=System Call
+e_slwi=Shift Left Word Immediate
+e_srwi=Shift Right Word Immediate
+e_slwi.=Shift Left Word Immediate
+e_srwi.=Shift Right Word Immediate
+e_stb=Store Byte
+e_stbu=Store Byte with Update
+e_sth=Store Halfword
+e_sthu=Store Halfword with Update
+e_stmw=Store Multiple Word
+e_stw=Store Word
+e_stwu=Store Word with Update
+e_subfic=Subtract From Scaled Immediate Carrying
+e_subfic.=Subtract From Scaled Immediate Carrying
+e_xori=XOR Scaled Immediate
+e_xori.=XOR Scaled Immediate
+se_add=Add Short Form
+se_addi=Add Immediate Short Form
+se_and=AND Short Form
+se_and.=AND Short Form
+se_andc=AND with Complement Short Form
+se_andi=AND Immediate Short Form
+se_b=Branch
+se_bl=Branch and Link
+se_bc=Branch Conditional Short Form
+se_bclri=Bit Clear Immediate
+se_bctr=Branch to Count Register
+se_bctrl=Branch to Count Register and Link
+se_bgeni=Bit Generate Immediate
+se_blr=Branch to Link Register
+se_blrl=Branch to Link Register and Link
+se_bmaski=Bit Mask Generate Immediate
+se_bseti=Bit Set Immediate
+se_btsti=Bit Test Immediate
+se_cmp=Compare Word
+se_cmph=Compare Halfword Short Form
+se_cmphl=Compare Halfword Logical Short Form
+se_cmpi=Compare Immediate Word Short Form
+se_cmpl=Compare Logical Word
+se_cmpli=Compare Logical Immediate Word
+se_extsb=Extend Sign Byte Short Form
+se_extsh=Extend Sign Halfword Short Form
+se_extzb=Extend Zero Byte
+se_extzh=Extend Zero Halfword
+se_illegal=Illegal Instruction
+se_isync=Instruction Synchronize
+se_lbz=Load Byte and Zero Short Form
+se_lhz=Load Halfword and Zero Short Form
+se_li=Load Immediate Short Form; se_li r3, 1; r3 = 1
+se_lwz=Load Word and Zero Short Form
+se_mfar=Move from Alternate Register
+se_mfctr=Move From Count Register
+se_mflr=Move From Link Register
+se_mr=Move Register
+se_mtar=Move To Alternate Register
+se_mtctr=Move To Count Register
+se_mtlr=Move To Link Register
+se_mullw=Multiply Low Word Short Form
+se_neg=Negate Short Form
+se_not=NOT Short Form
+se_or=OR Short Form
+se_rfci=Return From Critical Interrupt
+se_rfdi=Return From Debug Interrupt
+se_rfgi=Return From Guest Interrupt
+se_rfi=Return From Interrupt
+se_rfmci=Return From Machine Check Interrupt
+se_sc=System Call
+se_slw=Shift Left Word
+se_slwi=Shift Left Word Immediate Short Form
+se_sraw=Shift Right Algebraic Word
+se_srawi=Shift Right Algebraic Immediate
+se_srw=Shift Right Word
+se_srwi=Shift Right Word Immediate Short Form
+se_stb=Store Byte Short Form
+se_sth=Store Halfword Short Form
+se_stw=Store Word Short Form
+se_sub=Subtract
+se_subf=Subtract From Short Form
+se_subi=Subtract Immediate
+se_subi.=Subtract Immediate
 # Pseudo instructions (incomplete)
 addic=Add Immediate Carrying and Record ; addic r3, r3, 1
-cmplw=compare logical word; cmplwi CR0, r0, 33(unsigned)
-cmplwi=compare logical word against int; cmplwi CR0, r0, 33(unsigned)
-cmpw=compare word; cmpw CR0, r0, r1 (signed)
-li=load integer into register; li r3, 1
+bctrl=Branch to Count Register and Link
+bge=Branch if Greater Or Equal
+blr=Branch to Link Register
+blt=Branch if Less
+beq=Branch if Equal bne=Branch if Not Equal
+bnelr=Branch if Not Equal to Link Register
+bt=Branch if condition true
+cmplw=Compare Logical Word; cmplwi CR0, r0, 33(unsigned)
+cmplwi=Compare Logical Word Immediate; cmplwi CR0, r0, 33(unsigned)
+cmpw=Compare Word; cmpw CR0, r0, r1 (signed)
+cmpwi=Compare Immediate Word
+cmpwi=Compare Word Immediate
+li=Load Immediate; li r3, 1; r3 = 1
+lis=Load Immediate Shifted; lis r3, 0x7; r3 = 0x70000; r3 = (0x7 << 16)
+lwz=Load Word And Zero
+mflr=Move From Link Register
+mr=Move To Register
+mtctr=Move To Special Count Register
+mtctrl=Move To Special Count Register and Link
+mtlr=Move To Link Register
+nop=No Operation
+slwi=Shift Left Word Immediate
+srwi=Shift Right Word Immedate
+bdz=Decrement CTR and Branch if its Zero
+bdzt=Decrement CTR and Branch if its Zero (true)
+bdzf=Decrement CTR and Branch if its Zero (false)
+bgt=Branch if Greater Than
+bnl=Branch if Not Less
+ble=Branch if Less or Equal
+crclr=Conditional Register clear (xor nth bit with itself)
+crnot=CR NOT
+crset=cR Set
+clrlwi=Clear Left immediate
+extlwi=Extract and Left Justify Immediate
+extrwi=Extract and Right Justify Immediate
+inslwi=Insert from left immediate
+insrwi=Insert from right immediate
diff -Nru radare2-2.3.0+dfsg/libr/asm/d/sparc.sdb.txt radare2-2.8.0+dfsg/libr/asm/d/sparc.sdb.txt
--- radare2-2.3.0+dfsg/libr/asm/d/sparc.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/d/sparc.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -87,6 +87,7 @@
 fxtoq=convert 64-bit integer to floating
 fxtos=convert 64-bit integer to floating
 iprefetch=instruction prefetch
+ld=load from memory into register
 lda=load floating-point register from alternate space
 ldda=load double floating-point register from alternate space
 ldqa=load quad floating-point register from alternate space
@@ -94,6 +95,7 @@
 ldswa=load signed word from alternate space
 ldx=load extended word
 ldxa=load extended word from alternate space
+ldub=load unsigned byte from addr
 membar=memory barrier
 mov=moves data from src to dst
 mova=move always
@@ -131,6 +133,8 @@
 ret=return from subroutine
 retl=return from leaf subroutine
 signx=sign-extend 32-bit value to 64 bits
+st=stores word to addr
+stb=store byte
 sta=store floating-point register to alternate space
 stda=store double floating-point register to alternate space
 stqa=store quad floating-point register to alternate space
@@ -138,3 +142,30 @@
 stxa=store extended word into alternate space
 stxfsr=store floating-point register (all 64-bits)
 udivx=unsigned divide (64-bit)
+sethi=sets upper 22 bits of rd with const
+unimp=unimplemented instruction
+or=binary or
+orn=binary nor
+and=binary and
+sub=substract
+add=addition
+save=provide new register window
+restore=restore previous register window
+cmp=sets appropriate condition codes
+nop=no operation
+be,pn=branch if equal
+retl=return from leaf procedure
+rett=return from trap instruction
+ba,a=branch always
+call=call a subroutine, saving return address in o7
+bcs,a,pn=branch if carry bit is set
+bcc,a,pn=branch if carry bit is clear
+bne,pn=branch if not equal
+sll=shift left logical
+srl=shift right logic
+addcc=adds to numbers and updates Z, N, V flags
+addx=add with carry
+lduh=load unsigned half word (16bit)
+sra=arithmetic right-shift of rs1, shift by op2 and stores result
+smul=signed multiplication
+subx=substract with carry
diff -Nru radare2-2.3.0+dfsg/libr/asm/d/v850.sdb.txt radare2-2.8.0+dfsg/libr/asm/d/v850.sdb.txt
--- radare2-2.3.0+dfsg/libr/asm/d/v850.sdb.txt	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/d/v850.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,84 @@
+add=add
+addf.s=add floating short
+addi=add immediate
+and=and
+andbsu=and bit string upward
+andi=and immediate
+andnbsu=and not bit string upward
+be=branch if zero/equal
+bge=branch if greater/equal (signed)
+bgt=branch if greater than (signed)
+bh=branch if higher (unsigned)
+bl=branch if carry/less than
+ble=branch if less/equal (signed)
+blt=branch if less than (signed)
+bn=branch if negative
+bne=branch if not zero/equal
+bnh=branch if not higher (unsigned)
+bnl=branch if not carry/less than
+bnv=branch if not overflow
+bp=branch if positive
+br=branch always
+bv=branch if overflow
+caxi=compare and exchange interlocked
+cli=clear interrupt disable flag
+cmp=compare
+cmpf.s=compare floating short
+cvt.sw=convert floating short to word
+cvt.ws=convert word to floating short
+div=divide signed
+divf.s=divide floating short
+divu=divide unsigned
+halt=halt cpu
+in.b=input byte
+in.h=input halfword
+in.w=input word
+jal=jump and link
+jmp=jump register
+jr=jump relative
+ld.b=load byte
+ld.h=load halfword
+ld.w=load word
+ldsr=load into system register
+mov=move
+movbsu=move bit string upward
+movea=add immediate
+movhi=add high halfword
+mpyhw=multiply halfword signed
+mul=multiply signed
+mulf.s=multiply floating short
+mulu=multiply unsigned
+not=not
+notbsu=not bit string upward
+or=or
+orbsu=or bit string upward
+ori=or immediate
+ornbsu=or not bit string immediate
+out.b=output byte
+out.h=output halfword
+out.w=output word
+reti=return from trap/irq
+rev=reverse bits
+sar=shift arithmetic right
+sch0bsd=search bit 0 downward
+sch0bsu=search bit 0 upward
+sch1bsd=search bit 1 downward
+sch1bsu=search bit 1 upward
+sei=set interrupt disable flag
+setf=set flag condition
+shl=shift left
+shr=shift right
+st.b=store byte
+st.h=store halfword
+st.w=store word
+stsr=store from system register
+sub=subtract
+subf.s=subtract floating short
+trap=trap
+trnc.sw=truncate floating short to word
+xb=swap low bytes
+xh=swap halfwords
+xor=exclusive or register
+xorbsu=exclusive or bit string upward
+xori=exclusive or immediate
+xornbsu=exclusive or not bit string upward
diff -Nru radare2-2.3.0+dfsg/libr/asm/Makefile radare2-2.8.0+dfsg/libr/asm/Makefile
--- radare2-2.3.0+dfsg/libr/asm/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -8,13 +8,9 @@
 
 include $(TOP)/libr/config.mk
 
-ifeq ($(WITHNONPIC),1)
-# do not statically link capstone when creating libars
-else
 include p/capstone.mk
 LDFLAGS+=${CS_LDFLAGS}
 include $(STOP)/java/deps.mk
-endif
 
 .PHONY: all plugins
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/meson.build radare2-2.8.0+dfsg/libr/asm/meson.build
--- radare2-2.3.0+dfsg/libr/asm/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,167 +1,209 @@
-files=[
-'asm.c',
-'code.c',
-'p/asm_6502.c',
-'p/asm_8051.c',
-'p/asm_arc.c',
-'p/asm_arm_as.c',
-'p/asm_arm_cs.c',
-'p/asm_arm_gnu.c',
-'p/asm_arm_winedbg.c',
-'p/asm_avr.c',
-'p/asm_bf.c',
-'p/asm_cr16.c',
-'p/asm_cris_gnu.c',
-'p/asm_dalvik.c',
-'p/asm_dcpu16.c',
-'p/asm_ebc.c',
-'p/asm_gas.c',
-'p/asm_gb.c',
-'p/asm_h8300.c',
-'p/asm_hppa_gnu.c',
-'p/asm_i4004.c',
-'p/asm_i8080.c',
-'p/asm_java.c',
-'p/asm_lanai_gnu.c',
-'p/asm_lm32.c',
-'p/asm_lh5801.c',
-'p/asm_m68k_cs.c',
-'p/asm_malbolge.c',
-'p/asm_mcs96.c',
-'p/asm_mips_cs.c',
-'p/asm_mips_gnu.c',
-'p/asm_msp430.c',
-'p/asm_nios2.c',
-'p/asm_pic.c',
-'p/asm_ppc_cs.c',
-'p/asm_ppc_gnu.c',
-'p/asm_propeller.c',
-'p/asm_riscv.c',
-'p/asm_rsp.c',
-'p/asm_sh.c',
-'p/asm_snes.c',
-'p/asm_sparc_cs.c',
-'p/asm_sparc_gnu.c',
-'p/asm_spc700.c',
-'p/asm_sysz.c',
-'p/asm_tms320.c',
-'p/asm_tms320c64x.c',
-'p/asm_tricore.c',
-'p/asm_v810.c',
-'p/asm_v850.c',
-'p/asm_vax.c',
-'p/asm_wasm.c',
-'p/asm_ws.c',
-'p/asm_x86_as.c',
-'p/asm_x86_cs.c',
-'p/asm_x86_nasm.c',
-'p/asm_x86_nz.c',
-'p/asm_x86_udis.c',
-'p/asm_xap.c',
-'p/asm_xcore_cs.c',
-'p/asm_xtensa.c',
-'p/asm_z80.c',
-'arch/6502/6502dis.c',
-'arch/8051/8051_disas.c',
-'arch/arc/gnu/arc-dis.c',
-'arch/arc/gnu/arc-ext.c',
-'arch/arc/gnu/arc-opc.c',
-'arch/arc/gnu/arcompact-dis.c',
-'arch/arm/aarch64/aarch64-dis-2.c',
-'arch/arm/aarch64/aarch64-dis.c',
-'arch/arm/aarch64/aarch64-opc-2.c',
-'arch/arm/aarch64/aarch64-opc.c',
-'arch/arm/armass.c',
-'arch/arm/armass64.c',
-'arch/arm/gnu/arm-dis.c',
-'arch/arm/gnu/floatformat.c',
-'arch/arm/winedbg/be_arm.c',
-'arch/avr/avr_disasm.c',
-'arch/avr/disasm.c',
-'arch/cr16/cr16_disas.c',
-'arch/cris/gnu/cris-dis.c',
-'arch/cris/gnu/cris-opc.c',
-#'arch/dcpu16/asm.c',
-#'arch/dcpu16/dis.c',
-#'arch/dcpu16/main.c',
-'arch/ebc/ebc_disas.c',
-'arch/gb/gbasm.c',
-'arch/gb/gbdis.c',
-'arch/h8300/h8300_disas.c',
-'arch/hppa/gnu/hppa-dis.c',
-'arch/i4004/i4004dis.c',
-'arch/i8080/i8080dis.c',
-'arch/lanai/gnu/lanai-dis.c',
-'arch/lanai/gnu/lanai-opc.c',
-'arch/mips/gnu/mips-dis.c',
-'arch/mips/gnu/mips-opc.c',
-'arch/mips/gnu/mips16-opc.c',
-'arch/mips/mipsasm.c',
-'arch/msp430/msp430_disas.c',
-'arch/nios/gnu/nios2-dis.c',
-'arch/nios/gnu/nios2-opc.c',
-'arch/pic/pic_baseline.c',
-'arch/pic/pic_pic18.c',
-'arch/ppc/gnu/ppc-dis.c',
-'arch/ppc/gnu/ppc-opc.c',
-'arch/ppc/libvle/vle.c',
-'arch/ppc/libps/libps.c',
-'arch/propeller/propeller_disas.c',
-#'arch/riscv/riscv-opc.c',
-#'arch/riscv/riscv.c',
-'arch/rsp/rsp_idec.c',
-'arch/sh/gnu/sh-dis.c',
-'arch/snes/snesdis.c',
-'arch/sparc/gnu/sparc-dis.c',
-'arch/sparc/gnu/sparc-opc.c',
-'arch/spc700/spc700dis.c',
-'arch/tms320/c55x_plus/c55plus.c',
-'arch/tms320/c55x_plus/c55plus_decode.c',
-'arch/tms320/c55x_plus/decode_funcs.c',
-'arch/tms320/c55x_plus/hashtable.c',
-'arch/tms320/c55x_plus/hashvector.c',
-'arch/tms320/c55x_plus/ins.c',
-'arch/tms320/c55x_plus/utils.c',
-'arch/tms320/tms320_dasm.c',
-'arch/tricore/gnu/cpu-tricore.c',
-'arch/tricore/gnu/tricore-dis.c',
-'arch/tricore/gnu/tricore-opc.c',
-'arch/v810/v810_disas.c',
-'arch/v850/v850_disas.c',
-'arch/vax/vax-dis.c',
-'arch/wasm/wasm.c',
-'arch/whitespace/wsdis.c',
-'arch/xap/dis.c',
-'arch/xtensa/gnu/elf32-xtensa.c',
-'arch/xtensa/gnu/xtensa-dis.c',
-'arch/xtensa/gnu/xtensa-isa.c',
-'arch/xtensa/gnu/xtensa-modules.c',
-#'arch/z80/expressions.c',
-'arch/z80/z80.c',
-#'arch/z80/z80asm.c',
+files = [
+  'asm.c',
+  'code.c',
+  'p/asm_6502.c',
+  'p/asm_8051.c',
+  'p/asm_arc.c',
+  'p/asm_arm_as.c',
+  'p/asm_arm_cs.c',
+  'p/asm_arm_gnu.c',
+  'p/asm_arm_winedbg.c',
+  'p/asm_avr.c',
+  'p/asm_bf.c',
+  'p/asm_chip8.c',
+  'p/asm_cr16.c',
+  'p/asm_cris_gnu.c',
+  'p/asm_dalvik.c',
+  'p/asm_dcpu16.c',
+  'p/asm_ebc.c',
+  #'p/asm_gas.c',
+  'p/asm_gb.c',
+  'p/asm_h8300.c',
+  'p/asm_hexagon.c',
+  #'p/asm_hexagon_gnu.c',
+  'p/asm_hppa_gnu.c',
+  'p/asm_i4004.c',
+  'p/asm_i8080.c',
+  'p/asm_java.c',
+  'p/asm_lanai_gnu.c',
+  'p/asm_lh5801.c',
+  'p/asm_lm32.c',
+  'p/asm_m68k_cs.c',
+  'p/asm_malbolge.c',
+  'p/asm_mcs96.c',
+  'p/asm_mips_cs.c',
+  'p/asm_mips_gnu.c',
+  'p/asm_msp430.c',
+  'p/asm_nios2.c',
+  'p/asm_pic.c',
+  'p/asm_ppc_cs.c',
+  'p/asm_ppc_gnu.c',
+  'p/asm_propeller.c',
+  'p/asm_riscv.c',
+  'p/asm_rsp.c',
+  'p/asm_sh.c',
+  'p/asm_snes.c',
+  'p/asm_sparc_cs.c',
+  'p/asm_sparc_gnu.c',
+  'p/asm_spc700.c',
+  'p/asm_sysz.c',
+  'p/asm_tms320.c',
+  'p/asm_tms320c64x.c',
+  'p/asm_tricore.c',
+  'p/asm_v810.c',
+  'p/asm_v850.c',
+  'p/asm_vax.c',
+  'p/asm_wasm.c',
+  'p/asm_ws.c',
+  'p/asm_x86_as.c',
+  'p/asm_x86_cs.c',
+  'p/asm_x86_nasm.c',
+  'p/asm_x86_nz.c',
+  #'p/asm_x86_vm.c',
+  'p/asm_xap.c',
+  'p/asm_xcore_cs.c',
+  'p/asm_xtensa.c',
+  'p/asm_z80.c',
+  #'arch/6502/6502dis.c',
+  'arch/8051/8051_disas.c',
+  'arch/arc/gnu/arc-dis.c',
+  'arch/arc/gnu/arc-ext.c',
+  'arch/arc/gnu/arc-opc.c',
+  'arch/arc/gnu/arcompact-dis.c',
+  'arch/arm/aarch64/aarch64-dis-2.c',
+  'arch/arm/aarch64/aarch64-dis.c',
+  'arch/arm/aarch64/aarch64-opc-2.c',
+  'arch/arm/aarch64/aarch64-opc.c',
+  'arch/arm/armass.c',
+  'arch/arm/armass64.c',
+  'arch/arm/gnu/arm-dis.c',
+  'arch/arm/gnu/floatformat.c',
+  'arch/arm/winedbg/be_arm.c',
+  #'arch/avr/avr_disasm.c',
+  'arch/avr/disasm.c',
+  'arch/cr16/cr16_disas.c',
+  'arch/cris/gnu/cris-dis.c',
+  'arch/cris/gnu/cris-opc.c',
+  #'arch/dcpu16/asm.c',
+  #'arch/dcpu16/dis.c',
+  #'arch/dcpu16/main.c',
+  'arch/ebc/ebc_disas.c',
+  #'arch/gb/gbasm.c',
+  #'arch/gb/gbdis.c',
+  'arch/h8300/h8300_disas.c',
+  'arch/hexagon/hexagon.c',
+  'arch/hexagon/hexagon_disas.c',
+  #'arch/hexagon/gnu/hexagon-dis.c',
+  #'arch/hexagon/gnu/hexagon-opc.c',
+  #'arch/hexagon/gnu/safe-ctype.c',
+  'arch/hppa/gnu/hppa-dis.c',
+  #'arch/i4004/i4004dis.c',
+  #'arch/i8080/i8080dis.c',
+  'arch/lanai/gnu/lanai-dis.c',
+  'arch/lanai/gnu/lanai-opc.c',
+  'arch/mips/gnu/mips-dis.c',
+  'arch/mips/gnu/mips-opc.c',
+  'arch/mips/gnu/mips16-opc.c',
+  'arch/mips/mipsasm.c',
+  'arch/msp430/msp430_disas.c',
+  'arch/nios/gnu/nios2-dis.c',
+  'arch/nios/gnu/nios2-opc.c',
+  'arch/pic/pic_baseline.c',
+  'arch/pic/pic_midrange.c',
+  'arch/pic/pic_pic18.c',
+  'arch/ppc/gnu/ppc-dis.c',
+  'arch/ppc/gnu/ppc-opc.c',
+  'arch/ppc/libvle/vle.c',
+  'arch/ppc/libps/libps.c',
+  'arch/propeller/propeller_disas.c',
+  #'arch/riscv/riscv-opc.c',
+  #'arch/riscv/riscv.c',
+  'arch/rsp/rsp_idec.c',
+  'arch/sh/gnu/sh-dis.c',
+  #'arch/snes/snesdis.c',
+  'arch/sparc/gnu/sparc-dis.c',
+  'arch/sparc/gnu/sparc-opc.c',
+  #'arch/spc700/spc700dis.c',
+  'arch/tms320/c55x_plus/c55plus.c',
+  'arch/tms320/c55x_plus/c55plus_decode.c',
+  'arch/tms320/c55x_plus/decode_funcs.c',
+  'arch/tms320/c55x_plus/hashtable.c',
+  #'arch/tms320/c55x_plus/hashvector.c',
+  'arch/tms320/c55x_plus/ins.c',
+  'arch/tms320/c55x_plus/utils.c',
+  'arch/tms320/tms320_dasm.c',
+  'arch/tricore/gnu/cpu-tricore.c',
+  'arch/tricore/gnu/tricore-dis.c',
+  'arch/tricore/gnu/tricore-opc.c',
+  'arch/v810/v810_disas.c',
+  'arch/v850/v850_disas.c',
+  'arch/vax/vax-dis.c',
+  'arch/wasm/wasm.c',
+  'arch/whitespace/wsdis.c',
+  #'arch/xap/dis.c',
+  'arch/xtensa/gnu/elf32-xtensa.c',
+  'arch/xtensa/gnu/xtensa-dis.c',
+  'arch/xtensa/gnu/xtensa-isa.c',
+  'arch/xtensa/gnu/xtensa-modules.c',
+  #'arch/z80/expressions.c',
+  'arch/z80/z80.c',
+  #'arch/z80/z80asm.c',
+]
+
+r_asm_inc = [
+  platform_inc,
+  include_directories(
+    '../../shlr',
+    'arch/include',
+    'arch',
+    'arch/h8300',
+    'arch/hexagon',
+    'arch/msp430',
+    'arch/rsp',
+    'arch/v850',
+    'arch/propeller',
+    'arch/ebc',
+    'arch/cr16',
+    'arch/8051',
+    'arch/v810'
+  )
 ]
 
 r_asm = library('r_asm', files,
-  include_directories: [platform_inc, include_directories([
-	'arch/include',
-	'../../shlr/capstone/include',
-	'../../shlr',
-	'arch',
-	'arch/h8300',
-	'arch/msp430',
-	'arch/rsp',
-	'arch/v850',
-	'arch/propeller',
-	'arch/ebc',
-	'arch/cr16',
-	'arch/8051',
-  ])],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_syscall, r_parse, r_lang, r_flag, r_socket, libr2java, libr2udis86],
-  objects: [
-	libr2capstone.extract_all_objects(),
-	libr2sdb.extract_all_objects(),
-	libr2spp.extract_all_objects(),
+  include_directories: r_asm_inc,
+  c_args: ['-DCORELIB=1'],
+  dependencies: [
+    r_util_dep,
+    r_syscall_dep,
+    r_parse_dep,
+    r_lang_dep,
+    r_flag_dep,
+    r_socket_dep,
+    capstone_dep,
+    spp_dep,
+    java_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_asm_dep = declare_dependency(link_with: r_asm,
+                               include_directories: r_asm_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_asm],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_asm',
+  filebase: 'r_asm',
+  requires: [
+    'r_util',
+    'r_syscall',
+    'r_parse',
+    'r_lang',
+    'r_flag',
+    'r_socket'
   ],
-  install: true
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_8051.c radare2-2.8.0+dfsg/libr/asm/p/asm_8051.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_8051.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_8051.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2013-2017 - pancake, astuder */
+/* radare2 - LGPL - Copyright 2013-2018 - pancake, astuder */
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -26,7 +26,10 @@
 	.endian = R_SYS_ENDIAN_NONE,
 	.desc = "8051 Intel CPU",
 	.disassemble = &disassemble,
-	.license = "PD"
+	.license = "PD",
+	.cpus =
+		"8051-generic," // First one is default
+		"8051-shared-code-xdata"
 };
 
 #ifndef CORELIB
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_arc.c radare2-2.8.0+dfsg/libr/asm/p/asm_arc.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_arc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_arc.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <mybfd.h>
 
 /* extern */
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_arm_as.c radare2-2.8.0+dfsg/libr/asm/p/asm_arm_as.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_arm_as.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_arm_as.c	2018-08-07 14:12:36.000000000 +0000
@@ -72,10 +72,12 @@
 			eprintf ("Cannot find water marks\n");
 			len = 0;
 		} else {
-			len = (int)(size_t)(end-begin-9);
-			if (len>0) {
-				memcpy (op->buf, begin+9, len);
-			} else len = 0;
+			len = (int)(size_t)(end - begin - 9);
+			if (len > 0) {
+				memcpy (op->buf, begin + 9, len);
+			} else {
+				len = 0;
+			}
 		}
 	} else {
 		eprintf ("Error running: %s %s -o %s", as, ipath, opath);
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_arm_cs.c radare2-2.8.0+dfsg/libr/asm/p/asm_arm_cs.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_arm_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_arm_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -131,7 +131,8 @@
 		opsize = o > 0? 4: 2; //(o&0x80 && ((o&0xe0)==0xe0))? 4: 2;
 		if (opsize == 4) {
 			if (a->big_endian) {
-				r_write_le32 (op->buf, opcode);
+				r_write_le16 (op->buf, opcode >> 16);
+				r_write_le16 (op->buf + 2, opcode & UT16_MAX);
 			} else {
 				r_write_be32 (op->buf, opcode);
 			}
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_arm_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_arm_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_arm_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_arm_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 #include <r_util.h>
 #include <r_lib.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "../arch/arm/gnu/opcode-arm.h"
 
 #if 0
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_cris_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_cris_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_cris_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_cris_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -18,7 +18,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 
 static unsigned long Offset = 0;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_hexagon.c radare2-2.8.0+dfsg/libr/asm/p/asm_hexagon.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_hexagon.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_hexagon.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,36 @@
+/* radare - LGPL - Copyright 2018 - xvilka */
+
+#include <r_types.h>
+#include <r_util.h>
+#include <r_asm.h>
+#include <r_lib.h>
+#include "hexagon.h"
+#include "hexagon_insn.h"
+
+static int disassemble (RAsm *a, RAsmOp *op, const ut8 *buf, int l)
+{
+	HexInsn hi;
+	ut32 data = 0;
+	memset(&hi, 0, sizeof(hi));
+	data = r_read_le32(buf);
+	int size = hexagon_disasm_instruction(data, &hi);
+	op->size = size;
+	strcpy(op->buf_asm, hi.mnem);
+	return size;
+}
+
+RAsmPlugin r_asm_plugin_hexagon = {
+	.name = "hexagon",
+	.arch = "hexagon",
+	.license = "LGPL3",
+	.bits = 32,
+	.desc = "Qualcomm Hexagon (QDSP6) V6",
+	.disassemble = &disassemble,
+};
+
+#ifndef CORELIB
+struct r_lib_struct_t radare_plugin = {
+	.type = R_LIB_TYPE_ASM,
+	.data = &r_asm_plugin_hexagon
+};
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_hexagon_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_hexagon_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_hexagon_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_hexagon_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <mybfd.h>
 
 disassembler_ftype
@@ -90,8 +90,8 @@
 }
 
 RAsmPlugin r_asm_plugin_hexagon_gnu = {
-	.name = "hexagon",
-	.arch = "hexagon",
+	.name = "hexagon.gnu",
+	.arch = "hexagon.gnu",
 	.bits = 32,
 	.endian = R_SYS_ENDIAN_BIG | R_SYS_ENDIAN_LITTLE,
 	.license = "GPL3",
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_hppa_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_hppa_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_hppa_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_hppa_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 
 static unsigned long Offset = 0;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_lanai_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_lanai_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_lanai_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_lanai_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 
 static unsigned long Offset = 0;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_m68k_cs.c radare2-2.8.0+dfsg/libr/asm/p/asm_m68k_cs.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_m68k_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_m68k_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2015-2016 - pancake */
+/* radare2 - LGPL - Copyright 2015-2018 - pancake */
 
 #include <r_asm.h>
 #include <r_lib.h>
@@ -47,8 +47,10 @@
 		mode |= CS_MODE_M68K_040;
 	if (a->cpu && strstr (a->cpu, "68060"))
 		mode |= CS_MODE_M68K_060;
-	op->size = 4;
-	op->buf_asm[0] = 0;
+	if (op) {
+		op->size = 4;
+		op->buf_asm[0] = 0;
+	}
 	if (cd == 0) {
 		ret = cs_open (CS_ARCH_M68K, mode, &cd);
 		if (ret) {
@@ -61,31 +63,40 @@
 	} else {
 		cs_option (cd, CS_OPT_DETAIL, CS_OPT_OFF);
 	}
-	n = cs_disasm (cd, buf, R_MIN (8, len),
-		a->pc, 1, &insn);
-	if (n<1) {
+	if (!buf) {
+		goto beach;
+	}
+	ut8 mybuf[8] = {0};
+	int mylen = R_MIN (8, len);
+	memcpy (mybuf, buf, R_MIN (8, len));
+	n = cs_disasm (cd, mybuf, mylen, a->pc, 1, &insn);
+	if (n < 1) {
 		ret = -1;
 		goto beach;
 	}
-	op->size = 0;
+	if (op) {
+		op->size = 0;
+	}
 	if (insn->size<1) {
 		ret = -1;
 		goto beach;
 	}
 	if (a->features && *a->features) {
 		if (!check_features (a, insn)) {
+			if (op) {
 			op->size = insn->size;
 			strcpy (op->buf_asm, "illegal");
+			}
 		}
 	}
-	if (!op->size) {
+	if (op && !op->size) {
 		op->size = insn->size;
 		snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s%s%s",
 			insn->mnemonic,
 			insn->op_str[0]?" ":"",
 			insn->op_str);
 	}
-	{
+	if (op) {
 		char *p = r_str_replace (strdup (op->buf_asm),
 			"$", "0x", true);
 		if (p) {
@@ -96,11 +107,14 @@
 	cs_free (insn, n);
 	beach:
 	//cs_close (&cd);
-	if (!strncmp (op->buf_asm, "dc.w", 4)) {
-		strcpy (op->buf_asm, "invalid");
+	if (op) {
+		if (!strncmp (op->buf_asm, "dc.w", 4)) {
+			strcpy (op->buf_asm, "invalid");
+		}
+		r_str_rmch (op->buf_asm, '#');
+		return op->size;
 	}
-	r_str_rmch (op->buf_asm, '#');
-	return op->size;
+	return ret;
 }
 
 RAsmPlugin r_asm_plugin_m68k_cs = {
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_mips_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_mips_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_mips_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_mips_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "opcode/mips.h"
 int mips_assemble(const char *str, ut64 pc, ut8 *out);
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_msp430.c radare2-2.8.0+dfsg/libr/asm/p/asm_msp430.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_msp430.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_msp430.c	2018-08-07 14:12:36.000000000 +0000
@@ -6,13 +6,9 @@
 
 #include <msp430_disas.h>
 
-static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len)
-{
-	int ret;
+static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	struct msp430_cmd cmd;
-
-	ret = msp430_decode_command (buf, &cmd);
-
+	int ret = msp430_decode_command (buf, len, &cmd);
 	if (ret > 0) {
 		if (cmd.operands[0]) {
 			snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s %s", cmd.instr, cmd.operands);
@@ -21,9 +17,7 @@
 		}
 	}
 
-	op->size = ret;
-
-	return ret;
+	return op->size = ret;
 }
 
 RAsmPlugin r_asm_plugin_msp430 = {
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_nios2.c radare2-2.8.0+dfsg/libr/asm/p/asm_nios2.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_nios2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_nios2.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 
 int print_insn_big_nios2 (bfd_vma address, disassemble_info *info);
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_pic.c radare2-2.8.0+dfsg/libr/asm/p/asm_pic.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_pic.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_pic.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,15 +1,19 @@
-/* radare2 - LGPL - Copyright 2018 - thestr4ng3r */
+/* radare2 - LGPL - Copyright 2018 - thestr4ng3r, courk */
 
 #include <r_asm.h>
 #include <r_lib.h>
 
 #include "../arch/pic/pic_baseline.h"
 #include "../arch/pic/pic_pic18.h"
+#include "../arch/pic/pic_midrange.h"
 
 static int asm_pic_disassemble(RAsm *a, RAsmOp *op, const ut8 *b, int l) {
 	if (a->cpu && strcasecmp (a->cpu, "baseline") == 0) {
 		return pic_baseline_disassemble (a, op, b, l);
 	}
+	if (a->cpu && strcasecmp (a->cpu, "midrange") == 0) {
+		return pic_midrange_disassemble (a, op, b, l);
+	}
 	if (a->cpu && strcasecmp (a->cpu, "pic18") == 0) {
 		return pic_pic18_disassemble (a, op, b, l);
 	}
@@ -21,7 +25,7 @@
 RAsmPlugin r_asm_plugin_pic = {
 	.name = "pic",
 	.arch = "pic",
-	.cpus = "baseline,pic18",
+	.cpus = "baseline,midrange,pic18",
 	.bits = 8,
 	.license = "LGPL3",
 	.desc = "PIC disassembler",
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_ppc_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_ppc_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_ppc_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_ppc_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 
 static unsigned long Offset = 0;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_sh.c radare2-2.8.0+dfsg/libr/asm/p/asm_sh.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_sh.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_sh.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 static unsigned long Offset = 0;
 static char *buf_global = NULL;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_sparc_gnu.c radare2-2.8.0+dfsg/libr/asm/p/asm_sparc_gnu.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_sparc_gnu.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_sparc_gnu.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 #include <r_lib.h>
 #include <r_util.h>
 #include <r_asm.h>
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include <mybfd.h>
 
 static unsigned long Offset = 0;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_tms320.c radare2-2.8.0+dfsg/libr/asm/p/asm_tms320.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_tms320.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_tms320.c	2018-08-07 14:12:36.000000000 +0000
@@ -74,15 +74,15 @@
 static tms320_dasm_t engine = { 0 };
 
 static int tms320_disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
-	if (a->cpu && strcasecmp (a->cpu, "c54x") == 0) {
+	if (a->cpu && r_str_casecmp (a->cpu, "c54x") == 0) {
 		tms320_f_set_cpu (&engine, TMS320_F_CPU_C54X);
-	} else if (a->cpu && strcasecmp(a->cpu, "c55x+") == 0) {
+	} else if (a->cpu && r_str_casecmp(a->cpu, "c55x+") == 0) {
 		tms320_f_set_cpu (&engine, TMS320_F_CPU_C55X_PLUS);
-	} else if (a->cpu && strcasecmp(a->cpu, "c55x") == 0) {
+	} else if (a->cpu && r_str_casecmp(a->cpu, "c55x") == 0) {
 		tms320_f_set_cpu (&engine, TMS320_F_CPU_C55X);
 	} else {
 #if CAPSTONE_HAS_TMS320C64X
-		if (a->cpu && !strcasecmp (a->cpu, "c64x")) {
+		if (a->cpu && !r_str_casecmp (a->cpu, "c64x")) {
 			return tms320c64x_disassemble (a, op, buf, len);
 		}
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_tricore.c radare2-2.8.0+dfsg/libr/asm/p/asm_tricore.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_tricore.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_tricore.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 
 static unsigned long Offset = 0;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_v850.c radare2-2.8.0+dfsg/libr/asm/p/asm_v850.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_v850.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_v850.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2012-2015 - pancake */
+/* radare - LGPL - Copyright 2012-2018 - pancake */
 
 #include <stdio.h>
 #include <string.h>
@@ -10,11 +10,14 @@
 
 static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	struct v850_cmd cmd = {
+		.addr = a->pc,
 		.instr = "",
 		.operands = ""
 	};
-	if (len < 2) return -1;
-	int ret = v850_decode_command (buf, &cmd);
+	if (len < 2) {
+		return -1;
+	}
+	int ret = v850_decode_command (buf, len, &cmd);
 	if (ret > 0) {
 		snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s %s",
 			  cmd.instr, cmd.operands);
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_vax.c radare2-2.8.0+dfsg/libr/asm/p/asm_vax.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_vax.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_vax.c	2018-08-07 14:12:36.000000000 +0000
@@ -11,7 +11,7 @@
 #include <r_lib.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 #include "../arch/vax/vax.h"
 
 static unsigned long Offset = 0;
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_x86_cs.c radare2-2.8.0+dfsg/libr/asm/p/asm_x86_cs.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_x86_cs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_x86_cs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2013-2016 - pancake */
+/* radare2 - LGPL - Copyright 2013-2018 - pancake */
 
 #include <r_asm.h>
 #include <r_lib.h>
@@ -29,6 +29,8 @@
 
 #include "cs_mnemonics.c"
 
+#include "asm_x86_vm.c"
+
 static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	static int omode = 0;
 	int mode, ret;
@@ -111,6 +113,8 @@
 		if (ptrstr) {
 			memmove (ptrstr, ptrstr + 4, strlen (ptrstr + 4) + 1);
 		}
+	} else {
+		decompile_vm (a, op, buf, len);
 	}
 	if (a->syntax == R_ASM_SYNTAX_JZ) {
 		if (!strncmp (op->buf_asm, "je ", 3)) {
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_x86_nz.c radare2-2.8.0+dfsg/libr/asm/p/asm_x86_nz.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_x86_nz.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_x86_nz.c	2018-08-07 14:12:36.000000000 +0000
@@ -95,12 +95,12 @@
 typedef struct operand_t {
 	ut32 type;
 	st8 sign;
+	struct {
+		Register reg;
+		bool extended;
+	};
 	union {
 		struct {
-			Register reg;
-			bool extended;
-		};
-		struct {
 			long offset;
 			st8 offset_sign;
 			Register regs[2];
@@ -114,6 +114,9 @@
 			char rep_op[MAX_REPOP_LENGTH];
 		};
 	};
+	bool explicit_size;
+	ut32 dest_size;
+	ut32 reg_size;
 } Operand;
 
 typedef struct Opcode_t {
@@ -553,6 +556,30 @@
 	return process_1byte_op (a, data, op, 0x08);
 }
 
+static int opxadd(RAsm *a, ut8 *data, const Opcode *op) {
+	int i = 0;
+	if (op->operands_count < 2 ) {
+		return -1;
+	}
+	if (a->bits == 64) {
+		data[i++] = 0x48;
+	};
+	data[i++] = 0x0f;
+	if (op->operands[0].type & OT_BYTE &&
+	   op->operands[1].type & OT_BYTE) {
+		data[i++] = 0xc0;
+	} else {
+		data[i++] = 0xc1;
+	}
+	if (op->operands[0].type & OT_REGALL &&
+       op->operands[1].type & OT_REGALL) { // TODO memory modes
+		data[i] |= 0xc0;
+		data[i] |= (op->operands[1].reg << 3);
+		data[i++] |= op->operands[0].reg;
+	}
+	return i;
+}
+
 static int opxor(RAsm *a, ut8 * data, const Opcode *op) {
 	if (op->operands_count < 2) {
 		return -1;
@@ -840,6 +867,11 @@
 		eprintf ("Error: Invalid operands\n");
 		return -1;
 	}
+	if (op->operands[0].type & OT_MEMORY) {
+		if (!op->operands[0].explicit_size) {
+			return -1;
+		}
+	}
 	if (op->operands[0].type & OT_BYTE) {
 		data[l++] = 0xfe;
 		if (op->operands[0].type & OT_MEMORY) {
@@ -1131,6 +1163,11 @@
 
 static int opinc(RAsm *a, ut8 *data, const Opcode *op) {
 	int l = 0;
+	if (op->operands[0].type & OT_MEMORY) {
+		if (!op->operands[0].explicit_size) {
+			return -1;
+		}
+	}
 	if (a->bits == 64) {
 		if (op->operands[0].type & OT_GPREG) {
 			data[l++] = 0x48;
@@ -1172,7 +1209,7 @@
 static int opjc(RAsm *a, ut8 *data, const Opcode *op) {
 	int l = 0;
 	bool is_short = op->is_short;
-	st64 bigimm = op->operands[0].immediate * op->operands[0].sign;
+	// st64 bigimm = op->operands[0].immediate * op->operands[0].sign;
 	st64 immediate = op->operands[0].immediate * op->operands[0].sign;
 	if (is_short && (immediate > ST8_MAX || immediate < ST8_MIN)) {
 		return l;
@@ -1384,7 +1421,7 @@
 
 static int opmov(RAsm *a, ut8 *data, const Opcode *op) {
 	int l = 0;
-	long offset = 0;
+	st64 offset = 0;
 	int mod = 0;
 	int base = 0;
 	int rex = 0;
@@ -1439,106 +1476,150 @@
 				}
 			}
 		} else if (op->operands[0].type & OT_MEMORY) {
-			if (a->bits == 64) {
-				if (op->operands[0].extended) {
-					if (op->operands[0].reg < 0) {
-						return -1;
-					}
-					data[l++] = 0x41;
-					data[l++] = 0xc6;
-					// For r12 and r13
-					if (op->operands[0].reg == 4) {
-						data[l++] = 0x04;
-						data[l++] = 0x24;
-					} else if (op->operands[0].reg == 5) {
-						data[l++] = 0x45;
-						data[l++] = 0x00;
-					} else {
-						data[l++] = op->operands[0].reg;
-					}
-					data[l++] = op->operands[1].immediate;
-					return l;
-				} else if (!(op->operands[0].type & OT_BYTE) &&
-				           !(op->operands[0].type & OT_QWORD)) {
-					data[l++] = 0x67;
-				} else if (op->operands[0].type & OT_QWORD) {
-					// The operand is a QWORD PTR memory access, so we want a
-					// REX prefix with a set W bit.
-					data[l++] = 0x48;
-				}
+			int dest_bits = 8 * ((op->operands[0].dest_size & ALL_SIZE) >> OPSIZE_SHIFT);
+			int reg_bits = 8 * ((op->operands[0].reg_size & ALL_SIZE) >> OPSIZE_SHIFT);
+			int offset = op->operands[0].offset * op->operands[0].offset_sign;
+
+			if (!op->operands[0].explicit_size) {
+				//dest_bits = op->operands[0].type;
+				//we can use the previous line if we prefer to have a default behavior instead of an error
+				return -1;
 			}
-			if (op->operands[0].type & (OT_DWORD | OT_QWORD)) {
-				data[l++] = 0xc7;
-			} else if (op->operands[0].type & OT_BYTE) {
-				data[l++] = 0xc6;
-			} else if (op->operands[0].type & OT_WORD) {
-				if (a->bits > 16) {
-					data[l++] = 0x66;
-				}
+
+                        //addr_size_override prefix
+			bool use_aso = false;
+			if (reg_bits < a->bits) {
+				use_aso = true;
 			}
-			offset = op->operands[0].offset * op->operands[0].offset_sign;
 
-			if (op->operands[0].scale[0] > 1) {
-				int s = op->operands[0].scale[0];
-				// Check for power of 2 as valid sib
-				if (!(s & (s - 1))) {
-					return -1;
-				}
-				data[l++] = 0x04;
-				data[l++] = getsib (s) << 6 | op->operands[0].regs[0] << 3 | 5;
-				data[l++] = offset;
-				data[l++] = offset >> 8;
-				data[l++] = offset >> 16;
-				data[l++] = offset >> 24;
-				data[l++] = immediate;
-				if (op->operands[0].type & (OT_DWORD | OT_QWORD)) {
-					data[l++] = immediate >> 8;
-					data[l++] = immediate >> 16;
-					data[l++] = immediate >> 24;
-				}
-				return l;
+                        //op_size_override prefix
+			bool use_oso = false;
+			if (dest_bits == 16) {
+				use_oso = true;
 			}
 
-			if (offset) {
-				mod = (offset > 128 || offset < -129) ? 0x2 : 0x1;
+			bool rip_rel = op->operands[0].regs[0] == X86R_RIP;
+
+                        //rex prefix
+			int rex = 1 << 6;
+			bool use_rex = false;
+			if (dest_bits == 64) {			//W field
+				use_rex = true;
+				rex |= 1 << 3;
+			}
+			if (op->operands[0].extended) {		//B field
+				use_rex = true;
+				rex |= 1;
 			}
 
-			//if (op->operands[0].regs[0] == X86R_EBP) mod = 0x2;
-			if (op->operands[0].regs[1] != X86R_UNDEFINED) {
-				data[l++] = 0x44;
-				if (op->operands[0].regs[1] == X86R_ESP) {
-					data[l++] = 0x4 | op->operands[0].regs[0] << 3;
+                        //opcode selection
+			int opcode;
+			if (dest_bits == 8) {
+				opcode = 0xc6;
+			} else {
+				opcode = 0xc7;
+			}
+
+			//modrm and SIB selection
+			int modrm = 0;
+			int mod;
+			int reg = 0;
+			int rm;
+			bool use_sib = false;
+			int sib;
+			//mod
+			if (offset == 0) {
+				mod = 0;
+			} else if (offset < 128 && offset > -129) {
+				mod = 1;
+			} else {
+				mod = 2;
+			}
+
+			if (reg_bits == 16) {
+				if (op->operands[0].regs[0] == X86R_BX && op->operands[0].regs[1] == X86R_SI) {
+					rm = B0000;
+				} else if (op->operands[0].regs[0] == X86R_BX && op->operands[0].regs[1] == X86R_DI) {
+					rm = B0001;
+				} else if (op->operands[0].regs[0] == X86R_BP && op->operands[0].regs[1] == X86R_SI) {
+					rm = B0010;
+				} else if (op->operands[0].regs[0] == X86R_BP && op->operands[0].regs[1] == X86R_DI) {
+					rm = B0011;
+				} else if (op->operands[0].regs[0] == X86R_SI && op->operands[0].regs[1] == -1) {
+					rm = B0100;
+				} else if (op->operands[0].regs[0] == X86R_DI && op->operands[0].regs[1] == -1) {
+					rm = B0101;
+				} else if (op->operands[0].regs[0] == X86R_BX && op->operands[0].regs[1] == -1) {
+					rm = B0111;
 				} else {
-					data[l++] = op->operands[0].regs[1] << 3 | op->operands[0].regs[0];
+					//TODO allow for displacement only when parser is reworked
+					return -1;
 				}
+				modrm = (mod << 6) | (reg << 3) | rm;
 			} else {
-				if (op->operands[0].regs[0] == X86R_UNDEFINED) {
-					data[l++] = 0x5;
-					mod = 0x02;
-				} else if (op->operands[0].scale[0] < 2) {
-					data[l++] = mod << 6 | op->operands[0].regs[0];
-				}
-
-				if (op->operands[0].regs[0] == X86R_ESP) {
-					data[l++] = 0x24;
+	                        //rm
+				if (op->operands[0].extended) {
+					rm = op->operands[0].reg;
+				} else {
+					rm = op->operands[0].regs[0];
 				}
-				if (op->operands[0].regs[0] == X86R_EBP && !offset) {
-					data[l++] = 0x00;
+				//[epb] alone is illegal, so we need to fake a [ebp+0]
+				if (rm == 5 && mod == 0) {
+					mod = 1;
+				}
+
+	                        //sib
+				int index = op->operands[0].regs[1];
+	                        int scale = getsib(op->operands[0].scale[1]);
+				if (index != -1) {
+					use_sib = true;
+					sib = (scale << 6) | (index << 3) | rm;
+				} else if (rm == 4) {
+					use_sib = true;
+					sib = 0x24;
+				}
+				if (use_sib) {
+					rm = B0100;
+				}
+				if (rip_rel) {
+					modrm = (B0000 << 6) | (reg << 3) | B0101;
+					sib = (scale << 6) | (B0100 << 3) | B0101;
+				} else {
+					modrm = (mod << 6) | (reg << 3) | rm;
 				}
 			}
-			if (offset) {
-				data[l++] = offset;
+
+			//build the final result
+			if (use_aso) {
+				data[l++] = 0x67;
 			}
-			if (mod == 2) {
+			if (use_oso) {
+				data[l++] = 0x66;
+			}
+			if (use_rex) {
+				data[l++] = rex;
+			}
+			data[l++] = opcode;
+			data[l++] = modrm;
+			if (use_sib) {
+				data[l++] = sib;
+			}
+                        //offset
+			if (mod == 1) {
+				data[l++] = offset;
+			} else if (reg_bits == 16 && mod == 2) {
+				data[l++] = offset;
+				data[l++] = offset >> 8;
+			} else if (mod == 2 || rip_rel) {
+				data[l++] = offset;
 				data[l++] = offset >> 8;
 				data[l++] = offset >> 16;
 				data[l++] = offset >> 24;
 			}
-			data[l++] = immediate;
-			if (op->operands[0].type & (OT_DWORD | OT_QWORD)) {
-				data[l++] = immediate >> 8;
-				data[l++] = immediate >> 16;
-				data[l++] = immediate >> 24;
+                        //immediate
+			int byte;
+			for (byte = 0; byte < dest_bits && byte < 32; byte += 8) {
+				data[l++] = (immediate >> byte);
 			}
 		}
 	} else if (op->operands[1].type & OT_REGALL &&
@@ -1590,15 +1671,14 @@
 
 		if (op->operands[0].scale[0] > 1) {
 				data[l++] = op->operands[1].reg << 3 | 4;
-				if (op->operands[0].scale[0] > 2) {
-					data[l++] = getsib (op->operands[0].scale[0]) << 6 |
-										op->operands[0].regs[0] << 3 | 5;
+				data[l++] = getsib (op->operands[0].scale[0]) << 6 |
+						    op->operands[0].regs[0] << 3 | 5;
+
+				data[l++] = offset;
+				data[l++] = offset >> 8;
+				data[l++] = offset >> 16;
+				data[l++] = offset >> 24;
 
-					data[l++] = offset;
-					data[l++] = offset >> 8;
-					data[l++] = offset >> 16;
-					data[l++] = offset >> 24;
-				}
 				return l;
 			}
 
@@ -1700,6 +1780,8 @@
 					}
 					data[l++] = 0x48;
 				}
+			} else if (op->operands[1].type & OT_DWORD) {
+				data[l++] = 0x44;
 			} else if (!(op->operands[1].type & OT_QWORD)) {
 				data[l++] = 0x67;
 			}
@@ -1733,7 +1815,7 @@
 			if (op->operands[1].scale[0] > 1) {
 				data[l++] = op->operands[0].reg << 3 | 4;
 
-				if (op->operands[1].scale[0] > 2) {
+				if (op->operands[1].scale[0] >= 2) {
 					base = 5;
 				}
 				if (base) {
@@ -1775,8 +1857,10 @@
 					mod = 0x1;
 				}
 			} else {
-				if (op->operands[1].regs[0] == X86R_EIP) {
+				if (op->operands[1].regs[0] == X86R_EIP && (op->operands[0].type & OT_DWORD)) {
 					data[l++] = 0x0d;
+				} else if (op->operands[1].regs[0] == X86R_RIP && (op->operands[0].type & OT_QWORD)) {
+					data[l++] = 0x05;
 				} else {
 					data[l++] = mod << 5 | op->operands[0].reg << 3 | op->operands[1].regs[0];
 				}
@@ -1786,14 +1870,14 @@
 			}
 			if (mod >= 0x2) {
 				data[l++] = offset;
-				if (op->operands[1].offset > 128) {
+				if (op->operands[1].offset > 128 || op->operands[1].regs[0] == X86R_EIP) {
 					data[l++] = offset >> 8;
 					data[l++] = offset >> 16;
 					data[l++] = offset >> 24;
 				}
-			} else if (a->bits == 64 && offset) {
+			} else if (a->bits == 64 && (offset || op->operands[1].regs[0] == X86R_RIP)) {
 				data[l++] = offset;
-				if (op->operands[1].offset > 127) {
+				if (op->operands[1].offset > 127 || op->operands[1].regs[0] == X86R_RIP) {
 					data[l++] = offset >> 8;
 					data[l++] = offset >> 16;
 					data[l++] = offset >> 24;
@@ -1952,16 +2036,16 @@
 	st32 immediate = 0;
 	if (op->operands[0].reg == X86R_DX) {
 		if (op->operands[1].reg == X86R_AL && op->operands[1].type & OT_BYTE) {
-			data[l++] = 0xec;
+			data[l++] = 0xee;
 			return l;
 		}
 		if (op->operands[1].reg == X86R_AX && op->operands[1].type & OT_WORD) {
 			data[l++] = 0x66;
-			data[l++] = 0xed;
+			data[l++] = 0xef;
 			return l;
 		}
 		if (op->operands[1].reg == X86R_EAX && op->operands[1].type & OT_DWORD) {
-			data[l++] = 0xed;
+			data[l++] = 0xef;
 			return l;
 		}
 	} else if (op->operands[0].type & OT_CONSTANT) {
@@ -1969,16 +2053,15 @@
 		if (immediate > 255 || immediate < -128) {
 			return -1;
 		}
-		if (op->operands[0].reg == X86R_AL && op->operands[1].type & OT_BYTE) {
+		if (op->operands[1].reg == X86R_AL && op->operands[1].type & OT_BYTE) {
 			data[l++] = 0xe6;
-		} else if (op->operands[0].reg == X86R_AX && op->operands[0].type & OT_BYTE) {
+		} else if (op->operands[1].reg == X86R_AX && op->operands[1].type & OT_WORD) {
 			data[l++] = 0x66;
 			data[l++] = 0xe7;
 		} else if (op->operands[1].reg == X86R_EAX && op->operands[1].type & OT_DWORD) {
 			data[l++] = 0xe7;
 		} else {
-			// TODO: this is wrong
-			data[l++] = 0xe7;
+			return -1;
 		}
 		data[l++] = immediate;
 	} else {
@@ -2132,7 +2215,7 @@
 		if (op->operands[0].type & OT_BYTE) {
 			data[l++] = 0xf6;
 			data[l++] = op->operands[0].regs[0];
-			data[l++] = op->operands[1].reg;
+			data[l++] = op->operands[1].immediate;
 			return l;
 		}
 		data[l++] = 0xf7;
@@ -2141,10 +2224,10 @@
 		} else {
 			data[l++] = 0xc0 | op->operands[0].reg;
 		}
-		data[l++] = op->operands[1].reg >> 0;
-		data[l++] = op->operands[1].reg >> 8;
-		data[l++] = op->operands[1].reg >> 16;
-		data[l++] = op->operands[1].reg >> 24;
+		data[l++] = op->operands[1].immediate >> 0;
+		data[l++] = op->operands[1].immediate >> 8;
+		data[l++] = op->operands[1].immediate >> 16;
+		data[l++] = op->operands[1].immediate >> 24;
 		return l;
 	}
 	if (op->operands[0].type & OT_BYTE ||
@@ -3959,6 +4042,7 @@
 	{"wait", 0, NULL, 0x9b, 1},
 	{"wbinvd", 0, NULL, 0x0f09, 2},
 	{"wrmsr", 0, NULL, 0x0f30, 2},
+	{"xadd", 0, &opxadd, 0},
 	{"xchg", 0, &opxchg, 0},
 	{"xgetbv", 0, NULL, 0x0f01d0, 3},
 	{"xlatb", 0, NULL, 0xd7, 1},
@@ -3970,21 +4054,24 @@
 
 static x86newTokenType getToken(const char *str, size_t *begin, size_t *end) {
 	// Skip whitespace
-	while (isspace ((int)str[*begin]))
+	while (begin && isspace ((int)str[*begin])) {
 		++(*begin);
+	}
 
 	if (!str[*begin]) {                // null byte
 		*end = *begin;
 		return TT_EOF;
 	} else if (isalpha ((int)str[*begin])) {   // word token
 		*end = *begin;
-		while (isalnum ((int)str[*end]))
+		while (end && isalnum ((int)str[*end])) {
 			++(*end);
+		}
 		return TT_WORD;
 	} else if (isdigit ((int)str[*begin])) {   // number token
 		*end = *begin;
-		while (isalnum ((int)str[*end]))     // accept alphanumeric characters, because hex.
+		while (end && isalnum ((int)str[*end])) {     // accept alphanumeric characters, because hex.
 			++(*end);
+		}
 		return TT_NUMBER;
 	} else {                             // special character: [, ], +, *, ...
 		*end = *begin + 1;
@@ -4017,28 +4104,28 @@
 	// General purpose registers
 	if (length == 3 && token[0] == 'e') {
 		for (i = 0; regs[i]; i++)
-			if (!strncasecmp (regs[i], token, length)) {
+			if (!r_str_ncasecmp (regs[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_DWORD;
 				return i;
 			}
 	}
 	if (length == 2 && (token[1] == 'l' || token[1] == 'h')) {
 		for (i = 0; regs8[i]; i++)
-			if (!strncasecmp (regs8[i], token, length)) {
+			if (!r_str_ncasecmp (regs8[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_BYTE;
 				return i;
 			}
 	}
 	if (length == 2) {
 		for (i = 0; regs16[i]; i++) {
-			if (!strncasecmp (regs16[i], token, length)) {
+			if (!r_str_ncasecmp (regs16[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_WORD;
 				return i;
 			}
 		}
 		// This isn't working properly yet
 		for (i = 0; sregs[i]; i++) {
-			if (!strncasecmp (sregs[i], token, length)) {
+			if (!r_str_ncasecmp (sregs[i], token, length)) {
 				*type = (OT_SEGMENTREG & OT_REG (i)) | OT_WORD;
 				return i;
 			}
@@ -4046,38 +4133,38 @@
 	}
 	if (token[0] == 'r') {
 		for (i = 0; regs64[i]; i++) {
-			if (!strncasecmp (regs64[i], token, length)) {
+			if (!r_str_ncasecmp (regs64[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_QWORD;
 				a->bits = 64;
 				return i;
 			}
 		}
 		for (i = 0; regs64ext[i]; i++) {
-			if (!strncasecmp (regs64ext[i], token, length)) {
+			if (!r_str_ncasecmp (regs64ext[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_QWORD;
 				a->bits = 64;
-				return i + 8;
+				return i + 9;
 			}
 		}
 		for (i = 0; regsext[i]; i++) {
-			if (!strncasecmp (regsext[i], token, length)) {
+			if (!r_str_ncasecmp (regsext[i], token, length)) {
 				*type = (OT_GPREG & OT_REG (i)) | OT_DWORD;
 				a->bits = 32;
-				return i + 8;
+				return i + 9;
 			}
 		}
 	}
 
 	// Extended registers
-	if (!strncasecmp ("st", token, 2)) {
+	if (!r_str_ncasecmp ("st", token, 2)) {
 		*type = (OT_FPUREG & ~OT_REGALL);
 		*pos = 3;
 	}
-	if (!strncasecmp ("mm", token, 2)) {
+	if (!r_str_ncasecmp ("mm", token, 2)) {
 		*type = (OT_MMXREG & ~OT_REGALL);
 		*pos = 3;
 	}
-	if (!strncasecmp ("xmm", token, 3)) {
+	if (!r_str_ncasecmp ("xmm", token, 3)) {
 		*type = (OT_XMMREG & ~OT_REGALL);
 		*pos = 4;
 	}
@@ -4115,7 +4202,7 @@
 			eprintf ("Too large register index!\n");
 			return X86R_UNDEFINED;
 		}
-		*type |= (OT_REG(reg) & ~OT_REGTYPE);
+		*type |= (OT_REG (reg) & ~OT_REGTYPE);
 		return reg;
 	}
 
@@ -4159,25 +4246,31 @@
 		last_type = getToken (str, &pos, &nextpos);
 
 		// Token may indicate size: then skip
-		if (!strncasecmp (str + pos, "ptr", 3))
+		if (!r_str_ncasecmp (str + pos, "ptr", 3))
 			continue;
-		else if (!strncasecmp (str + pos, "byte", 4)) {
+		else if (!r_str_ncasecmp (str + pos, "byte", 4)) {
 			op->type |= OT_MEMORY | OT_BYTE;
+			op->dest_size = OT_BYTE;
 			explicit_size = true;
-		} else if (!strncasecmp (str + pos, "word", 4)) {
+		} else if (!r_str_ncasecmp (str + pos, "word", 4)) {
 			op->type |= OT_MEMORY | OT_WORD;
+			op->dest_size = OT_WORD;
 			explicit_size = true;
-		} else if (!strncasecmp (str + pos, "dword", 5)) {
+		} else if (!r_str_ncasecmp (str + pos, "dword", 5)) {
 			op->type |= OT_MEMORY | OT_DWORD;
+			op->dest_size = OT_DWORD;
 			explicit_size = true;
-		} else if (!strncasecmp (str + pos, "qword", 5)) {
+		} else if (!r_str_ncasecmp (str + pos, "qword", 5)) {
 			op->type |= OT_MEMORY | OT_QWORD;
+			op->dest_size = OT_QWORD;
 			explicit_size = true;
-		} else if (!strncasecmp (str + pos, "oword", 5)) {
+		} else if (!r_str_ncasecmp (str + pos, "oword", 5)) {
 			op->type |= OT_MEMORY | OT_OWORD;
+			op->dest_size = OT_OWORD;
 			explicit_size = true;
-		} else if (!strncasecmp (str + pos, "tbyte", 5)) {
+		} else if (!r_str_ncasecmp (str + pos, "tbyte", 5)) {
 			op->type |= OT_MEMORY | OT_TBYTE;
+			op->dest_size = OT_TBYTE;
 			explicit_size = true;
 		} else	// the current token doesn't denote a size
 			size_token = 0;
@@ -4196,6 +4289,10 @@
 		ut64 temp = 1;
 		Register reg = X86R_UNDEFINED;
 		while (str[pos] != ']') {
+			if (pos > nextpos) {
+			//	eprintf ("Error parsing instruction\n");
+				break;
+			}
 			pos = nextpos;
 			if (!str[pos]) {
 				break;
@@ -4234,9 +4331,9 @@
 				nextpos = pos;
 				reg = parseReg (a, str, &nextpos, &reg_type);
 				op->extended = false;
-				if (reg > 7) {
+				if (reg > 8) {
 					op->extended = true;
-					op->reg = reg - 8;
+					op->reg = reg - 9;
 				}
 				if (reg_type & OT_REGTYPE & OT_SEGMENTREG) {
 					op->reg = reg;
@@ -4249,6 +4346,9 @@
 				if (!explicit_size) {
 					op->type |= reg_type;
 				}
+				op->reg_size = reg_type;
+				op->explicit_size = explicit_size;
+
 				// Addressing only via general purpose registers
 				if (!(reg_type & OT_GPREG)) {
 					op->type = 0;	// Make the result invalid
@@ -4263,6 +4363,13 @@
 						op->offset_sign = -1;
 					}
 				}
+				//with SIB notation, we need to consider the right sign
+				char * plus = strchr (str, '+');
+				char * minus = strchr (str, '-');
+				char * closeB = strchr (str, ']');
+				if (plus && minus && plus < closeB && minus < closeB) {
+					op->offset_sign = -1;
+				}
 				// If there's a scale, we don't want to parse out the
 				// scale with the offset (scale + offset) otherwise the scale
 				// will be the sum of the two. This splits the numbers
@@ -4281,9 +4388,9 @@
 		op->reg = parseReg (a, str, &nextpos, &op->type);
 
 		op->extended = false;
-		if (op->reg > 7) {
+		if (op->reg > 8) {
 			op->extended = true;
-			op->reg -= 8;
+			op->reg -= 9;
 		}
 		if (op->type & OT_REGTYPE & OT_SEGMENTREG) {
 			parse_segment_offset (a, str, &nextpos, op, reg_index);
@@ -4352,7 +4459,7 @@
 	} else {
 		return 1;
 	}
-	if (!strncasecmp (args, "short", 5)) {
+	if (!r_str_ncasecmp (args, "short", 5)) {
 		out->is_short = true;
 		args += 5;
 	}
@@ -4361,7 +4468,7 @@
 	}
 	parseOperand (a, args, &(out->operands[0]), isrepop);
 	out->operands_count = 1;
-	while (out->operands_count <= MAX_OPERANDS) {
+	while (out->operands_count < MAX_OPERANDS) {
 		args = strchr (args, ',');
 		if (!args) {
 			break;
@@ -4395,7 +4502,7 @@
 	parseOpcode (a, op->operands[0].rep_op, &instr);
 
 	for (lt_ptr = oplookup; strcmp (lt_ptr->mnemonic, "null"); lt_ptr++) {
-		if (!strcasecmp (instr.mnemonic, lt_ptr->mnemonic)) {
+		if (!r_str_casecmp (instr.mnemonic, lt_ptr->mnemonic)) {
 			if (lt_ptr->opcode > 0) {
 				if (lt_ptr->only_x32 && a->bits == 64) {
 					return -1;
@@ -4439,7 +4546,7 @@
 	op[sizeof (op) - 1] = '\0';
 	parseOpcode (a, op, &instr);
 	for (lt_ptr = oplookup; strcmp (lt_ptr->mnemonic, "null"); lt_ptr++) {
-		if (!strcasecmp (instr.mnemonic, lt_ptr->mnemonic)) {
+		if (!r_str_casecmp (instr.mnemonic, lt_ptr->mnemonic)) {
 			if (lt_ptr->opcode > 0) {
 				if (!lt_ptr->only_x32 || a->bits != 64) {
 					ut8 *ptr = (ut8 *)&lt_ptr->opcode;
@@ -4477,7 +4584,8 @@
 	.arch = "x86",
 	.bits = 16 | 32 | 64,
 	.endian = R_SYS_ENDIAN_LITTLE,
-	.assemble = &assemble };
+	.assemble = &assemble
+};
 
 #ifndef CORELIB
 RLibStruct radare_plugin = {
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_x86_udis.c radare2-2.8.0+dfsg/libr/asm/p/asm_x86_udis.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_x86_udis.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_x86_udis.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/* radare - LGPL - Copyright 2009-2014 - pancake, nibble */
-
-#include <stdio.h>
-#include <string.h>
-#include <r_types.h>
-#include <r_lib.h>
-#include <r_asm.h>
-#include "udis86/types.h"
-#include "udis86/extern.h"
-
-// TODO : split into get/set... we need a way to create binary masks from asm buffers
-// -- move this shit into r_anal.. ??
-// -- delta, size, mode.. mode is for a->pc-5, register handling and things like this
-static int modify(RAsm *a, ut8 *buf, int field, ut64 val) {
-	ut32 val32 = (ut32)val;
-	switch (buf[0]) {
-	case 0x68: // push dword 
-		if (field == R_ASM_MOD_RAWVALUE || field == R_ASM_MOD_VALUE) {
-			memcpy (buf+1, &val, sizeof (val32));
-		}
-		return 5;
-	case 0xe8: // call
-		if (field == R_ASM_MOD_RAWVALUE) {
-			memcpy (buf+1, &val32, sizeof (val32));
-		} else
-		if (field == R_ASM_MOD_VALUE) {
-			val32 = (ut32)(val-a->pc-5);
-			memcpy (buf+1, &val32, sizeof (val32));
-		}
-		return 5;
-	case 0xeb: // jmp short
-	case 0x73: // jnz
-		if (field == R_ASM_MOD_RAWVALUE) {
-			buf[1] = (char)val;
-		} else
-		if (field == R_ASM_MOD_VALUE) {
-			buf[1] = (char)(val-a->pc);
-		}
-		return 2;
-	}
-	return 0;
-}
-
-static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
-	int opsize;
-	static ud_t d = {0};
-	static int osyntax = 0;
-	if (!d.dis_mode)
-		ud_init (&d);
-	if (osyntax != a->syntax) {
-		ud_set_syntax (&d, (a->syntax==R_ASM_SYNTAX_ATT)?
-				UD_SYN_ATT: UD_SYN_INTEL);
-		osyntax = a->syntax;
-	}
-	ud_set_input_buffer (&d, (uint8_t*) buf, len);
-	ud_set_pc (&d, a->pc);
-	ud_set_mode (&d, a->bits);
-	opsize = ud_disassemble (&d);
-	strncpy (op->buf_asm, ud_insn_asm (&d), R_ASM_BUFSIZE-1);
-	op->buf_asm[R_ASM_BUFSIZE-1] = 0;
-	if (opsize<1 || strstr (op->buf_asm, "invalid"))
-		opsize = 0;
-	op->size = opsize;
-	if (a->syntax == R_ASM_SYNTAX_JZ) {
-		if (!strncmp (op->buf_asm, "je ", 3)) {
-			memcpy (op->buf_asm, "jz", 2);
-		} else if (!strncmp (op->buf_asm, "jne ", 4)) {
-			memcpy (op->buf_asm, "jnz", 3);
-		}
-	}
-	return opsize;
-}
-
-RAsmPlugin r_asm_plugin_x86_udis = {
-	.name = "x86.udis",
-	.desc = "udis86 x86-16,32,64",
-	.arch = "x86",
-	.license = "BSD",
-	.bits = 16 | 32 | 64,
-	.endian = R_SYS_ENDIAN_LITTLE,
-	.disassemble = &disassemble,
-	.modify = &modify,
-};
-
-#ifndef CORELIB
-RLibStruct radare_plugin = {
-	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_x86_udis,
-	.version = R2_VERSION
-};
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_x86_vm.c radare2-2.8.0+dfsg/libr/asm/p/asm_x86_vm.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_x86_vm.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_x86_vm.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,113 @@
+/* radare2 - LGPL - Copyright 2018 - wargio */
+
+/*
+	"Missing" vm ops:
+
+	0F 01 C0 vmxoff
+	0F 01 C1 vmcall
+	0F 01 C2 vmlaunch
+	0F 01 C3 vmresume
+	0F 01 C4 vmxon
+	0F 78 /r vmread r/m32,r32
+	0F 79 /r vmwrite r32,r/m32
+	0F C7 /6 m64 vmptrld m64
+	0F C7 /7 m64 vmptrst m64
+	66 0F C7 /6 m64 vmclear m64
+	0F A6 /r xbts r32,r/m32
+	0F A7 /r ibts r/m32,r32
+	0F 37 getsec
+	F0 FA clx
+	F0 FB stx
+	? smret
+	? smcall
+	? skinit
+	? stgi
+
+*/
+
+#define VPCEXT2(y,x) ((y)[2]==(x))
+
+void decompile_vm(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
+	if (len > 3 && buf[0] == 0x0F && buf[1] == 0x3F && (VPCEXT2 (buf, 0x01) || VPCEXT2 (buf, 0x05) || VPCEXT2 (buf, 0x07) || VPCEXT2 (buf, 0x0D) || VPCEXT2 (buf, 0x10))) {
+		if(a->syntax == R_ASM_SYNTAX_ATT) {
+			snprintf (op->buf_asm, R_ASM_BUFSIZE, "vpcext $0x%x, $0x%x", buf[3], buf[2]);
+		} else {
+			snprintf (op->buf_asm, R_ASM_BUFSIZE, "vpcext %xh, %xh", buf[2], buf[3]);
+		}
+		op->size = 4;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 1 && buf[4] == 0) {
+		/* 0F C6 28 01 00 vmcpuid */
+		strcpy (op->buf_asm, "vmcpuid");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x00 && buf[4] == 0x00) {
+		/* 0F C6 28 00 00 vmgetinfo */
+		strcpy (op->buf_asm, "vmgetinfo");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x00 && buf[4] == 0x01) {
+		/* 0F C6 28 00 01 vmsetinfo */
+		strcpy (op->buf_asm, "vmsetinfo");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x00 && buf[4] == 0x02) {
+		/* 0F C6 28 00 02 vmdxdsbl */
+		strcpy (op->buf_asm, "vmdxdsbl");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x00 && buf[4] == 0x03) {
+		/* 0F C6 28 00 03 vmdxenbl */
+		strcpy (op->buf_asm, "vmdxenbl");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x01 && buf[4] == 0x00) {
+		/* 0F C6 28 01 00 vmcpuid */
+		strcpy (op->buf_asm, "vmcpuid");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x01 && buf[4] == 0x01) {
+		/* 0F C6 28 01 01 vmhlt */
+		strcpy (op->buf_asm, "vmhlt");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x01 && buf[4] == 0x02) {
+		/* 0F C6 28 01 02 vmsplaf */
+		strcpy (op->buf_asm, "vmsplaf");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x02 && buf[4] == 0x00) {
+		/* 0F C6 28 02 00 vmpushfd */
+		strcpy (op->buf_asm, "vmpushfd");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x02 && buf[4] == 0x01) {
+		/* 0F C6 28 02 01 vmpopfd */
+		strcpy (op->buf_asm, "vmpopfd");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x02 && buf[4] == 0x02) {
+		/* 0F C6 28 02 02 vmcli */
+		strcpy (op->buf_asm, "vmcli");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x02 && buf[4] == 0x03) {
+		/* 0F C6 28 02 03 vmsti */
+		strcpy (op->buf_asm, "vmsti");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x02 && buf[4] == 0x04) {
+		/* 0F C6 28 02 04 vmiretd */
+		strcpy (op->buf_asm, "vmiretd");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x03 && buf[4] == 0x00) {
+		/* 0F C6 28 03 00 vmsgdt */
+		strcpy (op->buf_asm, "vmsgdt");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x03 && buf[4] == 0x01) {
+		/* 0F C6 28 03 01 vmsidt */
+		strcpy (op->buf_asm, "vmsidt");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x03 && buf[4] == 0x02) {
+		/* 0F C6 28 03 02 vmsldt */
+		strcpy (op->buf_asm, "vmsldt");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x03 && buf[4] == 0x03) {
+		/* 0F C6 28 03 03 vmstr */
+		strcpy (op->buf_asm, "vmstr");
+		op->size = 5;
+	} else if (len > 4 && buf[0] == 0x0F && buf[1] == 0xC6 && buf[2] == 0x28 && buf[3] == 0x04 && buf[4] == 0x00) {
+		/* 0F C6 28 04 00 vmsdte */
+		strcpy (op->buf_asm, "vmsdte");
+		op->size = 5;
+	}
+}
+
+#undef VPCEXT2
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/asm_xtensa.c radare2-2.8.0+dfsg/libr/asm/p/asm_xtensa.c
--- radare2-2.3.0+dfsg/libr/asm/p/asm_xtensa.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/asm_xtensa.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2016 - pancake */
+/* radare2 - LGPL - Copyright 2016-2018 - pancake */
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -9,7 +9,7 @@
 #include <r_util.h>
 #include <r_asm.h>
 
-#include "dis-asm.h"
+#include "disas-asm.h"
 
 #define INSN_BUFFER_SIZE 4
 
@@ -21,7 +21,6 @@
 	if (length > INSN_BUFFER_SIZE) {
 		length = INSN_BUFFER_SIZE;
 	}
-
 	memcpy (myaddr, bytes, length);
 	return 0;
 }
@@ -36,26 +35,28 @@
 
 static void print_address(bfd_vma address, struct disassemble_info *info) {
 	char tmp[32];
-	if (!buf_global)
+	if (!buf_global) {
 		return;
-	sprintf(tmp, "0x%08"PFMT64x"", (ut64)address);
-	strcat(buf_global, tmp);
+	}
+	sprintf (tmp, "0x%08"PFMT64x"", (ut64)address);
+	strcat (buf_global, tmp);
 }
 
 static int buf_fprintf(void *stream, const char *format, ...) {
-	int flen, glen;
 	va_list ap;
-	char *tmp;
-	if (!buf_global)
+	if (!buf_global) {
 		return 0;
+	}
 	va_start (ap, format);
-	flen = strlen (format);
-	glen = strlen (buf_global);
-	tmp = malloc (flen + glen + 2);
-	if (!tmp) return 0;
+	int flen = strlen (format);
+	int glen = strlen (buf_global);
+	char *tmp = malloc (flen + glen + 2);
+	if (!tmp) {
+		return 0;
+	}
 	memcpy (tmp, buf_global, glen);
 	memcpy (tmp+glen, format, flen);
-	tmp[flen+glen] = 0;
+	tmp[flen + glen] = 0;
 // XXX: overflow here?
 	vsprintf (buf_global, tmp, ap);
 	va_end (ap);
@@ -65,7 +66,7 @@
 
 static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	struct disassemble_info disasm_obj;
-	op->buf_asm[0]='\0';
+	op->buf_asm[0] = '\0';
 	buf_global = op->buf_asm;
 	offset = a->pc;
 	if (len > INSN_BUFFER_SIZE) {
@@ -87,9 +88,9 @@
 	disasm_obj.stream = stdout;
 
 	op->size = print_insn_xtensa ((bfd_vma)offset, &disasm_obj);
-	if (op->size == -1)
+	if (op->size == -1) {
 		strncpy (op->buf_asm, " (data)", R_ASM_BUFSIZE);
-
+	}
 	return op->size;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/hexagon_gnu.mk radare2-2.8.0+dfsg/libr/asm/p/hexagon_gnu.mk
--- radare2-2.3.0+dfsg/libr/asm/p/hexagon_gnu.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/hexagon_gnu.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1,14 +1,14 @@
-OBJ_HEXAGON=asm_hexagon_gnu.o
-OBJ_HEXAGON+=../arch/hexagon/gnu/hexagon-dis.o
-OBJ_HEXAGON+=../arch/hexagon/gnu/hexagon-opc.o
-OBJ_HEXAGON+=../arch/hexagon/gnu/safe-ctype.o
+OBJ_HEXAGON_GNU=asm_hexagon_gnu.o
+OBJ_HEXAGON_GNU+=../arch/hexagon/gnu/hexagon-dis.o
+OBJ_HEXAGON_GNU+=../arch/hexagon/gnu/hexagon-opc.o
+OBJ_HEXAGON_GNU+=../arch/hexagon/gnu/safe-ctype.o
 
-STATIC_OBJ+=${OBJ_HEXAGON}
+STATIC_OBJ+=${OBJ_HEXAGON_GNU}
 
-TARGET_HEXAGON=asm_hexagon_gnu.${EXT_SO}
+TARGET_HEXAGON_GNU=asm_hexagon_gnu.${EXT_SO}
 ifeq ($(WITHPIC),1)
-ALL_TARGETS+=${TARGET_HEXAGON}
+ALL_TARGETS+=${TARGET_HEXAGON_GNU}
 
-${TARGET_HEXAGON}: ${OBJ_HEXAGON}
-	${CC} $(call libname,asm_hexagon_gnu) ${LDFLAGS} ${CFLAGS} -o ${TARGET_HEXAGON} ${OBJ_HEXAGON}
+${TARGET_HEXAGON_GNU}: ${OBJ_HEXAGON_GNU}
+	${CC} $(call libname,asm_hexagon_gnu) ${LDFLAGS} ${CFLAGS} -o ${TARGET_HEXAGON_GNU} ${OBJ_HEXAGON_GNU}
 endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/hexagon.mk radare2-2.8.0+dfsg/libr/asm/p/hexagon.mk
--- radare2-2.3.0+dfsg/libr/asm/p/hexagon.mk	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/hexagon.mk	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,15 @@
+OBJ_HEXAGON=asm_hexagon.o
+OBJ_HEXAGON+=../arch/hexagon/hexagon.o
+OBJ_HEXAGON+=../arch/hexagon/hexagon_disas.o
+
+CFLAGS +=-I../asm/arch/hexagon
+
+STATIC_OBJ+=${OBJ_HEXAGON}
+
+TARGET_HEXAGON=asm_hexagon.${EXT_SO}
+ifeq ($(WITHPIC),1)
+ALL_TARGETS+=${TARGET_HEXAGON}
+
+${TARGET_HEXAGON}: ${OBJ_HEXAGON}
+	${CC} $(call libname,asm_hexagon) ${LDFLAGS} ${CFLAGS} -o ${TARGET_HEXAGON} ${OBJ_HEXAGON}
+endif
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/Makefile radare2-2.8.0+dfsg/libr/asm/p/Makefile
--- radare2-2.3.0+dfsg/libr/asm/p/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -19,7 +19,7 @@
 # TODO: rename to enabled plugins
 ARCHS=mips_gnu.mk x86_cs.mk sparc_cs.mk sparc_gnu.mk java.mk bf.mk arm_gnu.mk dalvik.mk
 ARCHS+=x86_as.mk x86_nz.mk cris_gnu.mk vax.mk
-ARCHS+=ppc_gnu.mk ppc_cs.mk x86_udis.mk xap.mk x86_nasm.mk avr.mk
+ARCHS+=ppc_gnu.mk ppc_cs.mk xap.mk x86_nasm.mk avr.mk
 ARCHS+=sh.mk arm_winedbg.mk tms320.mk gb.mk snes.mk ebc.mk malbolge.mk ws.mk
 ARCHS+=6502.mk h8300.mk cr16.mk v850.mk spc700.mk propeller.mk msp430.mk i4004.mk
 ARCHS+=lh5801.mk v810.mk mcs96.mk lm32.mk
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/pic.mk radare2-2.8.0+dfsg/libr/asm/p/pic.mk
--- radare2-2.3.0+dfsg/libr/asm/p/pic.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/pic.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,7 @@
 OBJ_PIC=asm_pic.o
 OBJ_PIC+=../arch/pic/pic_baseline.o \
-    ../arch/pic/pic_pic18.o
+    ../arch/pic/pic_pic18.o \
+    ../arch/pic/pic_midrange.o
 
 STATIC_OBJ+=${OBJ_PIC}
 TARGET_PIC=asm_pic.${EXT_SO}
diff -Nru radare2-2.3.0+dfsg/libr/asm/p/x86_udis.mk radare2-2.8.0+dfsg/libr/asm/p/x86_udis.mk
--- radare2-2.3.0+dfsg/libr/asm/p/x86_udis.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/asm/p/x86_udis.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-OBJ_X86=asm_x86_udis.o
-# udis86
-SHARED_X86=../../shlr/udis86/decode.o
-SHARED_X86+=../../shlr/udis86/itab.o
-SHARED_X86+=../../shlr/udis86/syn-att.o
-SHARED_X86+=../../shlr/udis86/syn-intel.o
-SHARED_X86+=../../shlr/udis86/syn.o
-SHARED_X86+=../../shlr/udis86/udis86.o
-
-SHARED2_X86=$(addprefix ../,${SHARED_X86})
-
-STATIC_OBJ+=${OBJ_X86}
-SHARED_OBJ+=${SHARED_X86}
-TARGET_X86=asm_x86_udis.${EXT_SO}
-
-ifeq ($(WITHPIC),1)
-ALL_TARGETS+=${TARGET_X86}
-
-${TARGET_X86}: ${OBJ_X86}
-	${CC} $(call libname,asm_x86) ${LDFLAGS} ${CFLAGS} -o ${TARGET_X86} ${OBJ_X86} ${SHARED2_X86}
-endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/bin.c radare2-2.8.0+dfsg/libr/bin/bin.c
--- radare2-2.3.0+dfsg/libr/bin/bin.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/bin.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,7 +1,5 @@
 /* radare2 - LGPL - Copyright 2009-2018 - pancake, nibble, dso */
 
-// TODO: dlopen library and show address
-
 #include <r_bin.h>
 #include <r_types.h>
 #include <r_util.h>
@@ -11,21 +9,12 @@
 
 R_LIB_VERSION (r_bin);
 
-#define bprintf if(binfile->rbin->verbose)eprintf
 #define DB a->sdb;
 #define RBINLISTFREE(x)\
 	if (x) { \
 		r_list_free (x);\
 		x = NULL;\
 	}
-#define REBASE_PADDR(o, l, type_t)\
-	do { \
-		RListIter *_it;\
-		type_t *_el;\
-		r_list_foreach ((l), _it, _el) { \
-			_el->paddr += (o)->loadaddr;\
-		}\
-	} while (0)
 
 #define ARCHS_KEY "archs"
 
@@ -43,50 +32,7 @@
 static RBinXtrPlugin *bin_xtr_static_plugins[] = { R_BIN_XTR_STATIC_PLUGINS, NULL };
 static RBinLdrPlugin *bin_ldr_static_plugins[] = { R_BIN_LDR_STATIC_PLUGINS, NULL };
 
-static int is_data_section(RBinFile *a, RBinSection *s);
-static RList *get_strings(RBinFile *a, int min, int dump);
-static void r_bin_object_delete_items(RBinObject *o);
-static void r_bin_object_free(void /*RBinObject*/ *o_);
-// static int r_bin_object_set_items(RBinFile *binfile, RBinObject *o);
-static int r_bin_file_set_bytes(RBinFile *binfile, const ut8 *bytes, ut64 sz, bool steal_ptr);
-//static int remove_bin_file_by_binfile (RBin *bin, RBinFile * binfile);
-//static void r_bin_free_bin_files (RBin *bin);
-static void r_bin_file_free(void /*RBinFile*/ *bf_);
-static RBinFile *r_bin_file_create_append(RBin *bin, const char *file,
-					   const ut8 *bytes, ut64 sz,
-					   ut64 file_sz, int rawstr, int fd,
-					   const char *xtrname, bool steal_ptr);
-
-static RBinFile *r_bin_file_xtr_load_bytes(RBin *bin, RBinXtrPlugin *xtr,
-					    const char *filename,
-					    const ut8 *bytes, ut64 sz,
-					    ut64 file_sz, ut64 baseaddr,
-					    ut64 loadaddr, int idx, int fd,
-					    int rawstr);
-
-R_API int r_bin_load_io_at_offset_as_sz(RBin *bin, int fd, ut64 baseaddr,
-				   ut64 loadaddr, int xtr_idx, ut64 offset,
-				   const char *name, ut64 sz);
-
-static RBinPlugin *r_bin_get_binplugin_by_name(RBin *bin, const char *name);
-static RBinXtrPlugin *r_bin_get_xtrplugin_by_name(RBin *bin, const char *name);
-static RBinPlugin *r_bin_get_binplugin_any(RBin *bin);
-
-static RBinObject *r_bin_object_new(RBinFile *binfile, RBinPlugin *plugin,
-				     ut64 baseaddr, ut64 loadaddr, ut64 offset,
-				     ut64 sz);
-
-static RBinFile *r_bin_file_new(RBin *bin, const char *file, const ut8 *bytes,
-				 ut64 sz, ut64 file_sz, int rawstr, int fd,
-				 const char *xtrname, Sdb *sdb, bool steal_ptr);
-
-static RBinFile *r_bin_file_new_from_bytes(RBin *bin, const char *file,
-					    const ut8 *bytes, ut64 sz,
-					    ut64 file_sz, int rawstr,
-					    ut64 baseaddr, ut64 loadaddr,
-					    int fd, const char *pluginname,
-					    const char *xtrname, ut64 offset,
-					    bool steal_ptr);
+static bool r_bin_load_io_at_offset_as(RBin *bin, int fd, ut64 baseaddr, ut64 loadaddr, int xtr_idx, ut64 offset, const char *name);
 
 static int getoffset(RBin *bin, int type, int idx) {
 	RBinFile *a = r_bin_cur (bin);
@@ -105,56 +51,11 @@
 	}
 	return NULL;
 }
-static int r_bin_file_object_add(RBinFile *binfile, RBinObject *o) {
-	if (!o) {
-		return false;
-	}
-	r_list_append (binfile->objs, o);
-	r_bin_file_set_cur_binfile_obj (binfile->rbin, binfile, o);
-	return true;
-}
-
-static void binobj_set_baddr(RBinObject *o, ut64 baddr) {
-	if (!o || baddr == UT64_MAX) {
-		return;
-	}
-	o->baddr_shift = baddr - o->baddr;
-}
 
 static ut64 binobj_a2b(RBinObject *o, ut64 addr) {
 	return addr + (o? o->baddr_shift: 0);
 }
 
-static void filterStrings (RBin *bin, RList *strings) {
-	RBinString *ptr;
-	RListIter *iter;
-	r_list_foreach (strings, iter, ptr) {
-		char *dec = (char *)r_base64_decode_dyn (ptr->string, -1);
-		if (dec) {
-			char *s = ptr->string;
-			do {
-				char *dec2 = (char *)r_base64_decode_dyn (s, -1);
-				if (!dec2) {
-					break;
-				}
-				if (!r_str_is_printable (dec2)) {
-					free (dec2);
-					break;
-				}
-				free (dec);
-				s = dec = dec2;
-			} while (true);
-			if (r_str_is_printable (dec) && strlen (dec) > 3) {
-				free (ptr->string);
-				ptr->string = dec;
-				ptr->type = R_STRING_TYPE_BASE64;
-			} else {
-				free (dec);
-			}
-		}
-	}
-}
-
 R_API void r_bin_iobind(RBin *bin, RIO *io) {
 	r_io_bind (io, &bin->iob);
 }
@@ -172,12 +73,14 @@
 	data->file_count = file_count;
 	data->metadata = metadata;
 	data->loaded = 0;
+	// TODO: USE RBuffer *buf inside RBinXtrData*
 	data->buffer = malloc (size + 1);
 	// data->laddr = 0; /// XXX
 	if (!data->buffer) {
 		free (data);
 		return NULL;
 	}
+	// XXX unnecessary memcpy, this is slow
 	memcpy (data->buffer, r_buf_buffer (buf), size);
 	data->buffer[size] = 0;
 	return data;
@@ -209,393 +112,16 @@
 	}
 }
 
-R_API RBinObject *r_bin_file_object_get_cur(RBinFile *binfile) {
-	return binfile? binfile->o: NULL;
-}
-
-R_API RBinObject *r_bin_object_get_cur(RBin *bin) {
-	return bin
-		? r_bin_file_object_get_cur (r_bin_cur (bin))
-		: NULL;
-}
-
-R_API RBinPlugin *r_bin_file_cur_plugin(RBinFile *binfile) {
-	return binfile && binfile->o? binfile->o->plugin: NULL;
-}
-
-R_API int r_bin_file_cur_set_plugin(RBinFile *binfile, RBinPlugin *plugin) {
-	if (binfile && binfile->o) {
-		binfile->o->plugin = plugin;
-		return true;
-	}
-	return false;
-}
-
-#define MODE_PRINT 0x000
-#define MODE_RADARE 0x001
-#define MODE_SIMPLE 0x004
-
-static void print_string(RBinString *string, RBinFile *bf) {
-	if (!string || !bf) {
-		return;
-	}
-	int mode = bf->strmode;
-	ut64 addr , vaddr;
-	RBin *bin = bf->rbin;
-	const char *section_name, *type_string;
-	RIO *io = bin->iob.io;
-	if (!io) {
-		return;
-	}
-	RBinSection *s = r_bin_get_section_at (bf->o, string->paddr, false);
-	if (s) {
-		string->vaddr = s->vaddr + (string->paddr - s->paddr);
-	}
-	section_name = s ? s->name : "";
-	type_string = r_bin_string_type (string->type);
-	vaddr = addr = r_bin_get_vaddr (bin, string->paddr, string->vaddr);
-
-	switch(mode) {
-	case MODE_SIMPLE :
-		io->cb_printf ("0x%08" PFMT64x " %s\n", addr, string->string);
-		break;
-	case MODE_RADARE :
-		{
-		char *f_name, *nstr;
-		f_name = strdup (string->string);
-		r_name_filter (f_name, 512);
-		if (bin->prefix) {
-			nstr = r_str_newf ("%s.str.%s", bin->prefix, f_name);
-			io->cb_printf ("f %s.str.%s %"PFMT64d" @ 0x%08"PFMT64x"\n"
-					"Cs %"PFMT64d" @ 0x%08"PFMT64x"\n",
-					bin->prefix, f_name, string->size, addr,
-					string->size, addr);
-		} else {
-			nstr = r_str_newf ("str.%s", f_name);
-			io->cb_printf ("f str.%s %"PFMT64d" @ 0x%08"PFMT64x"\n"
-					"Cs %"PFMT64d" @ 0x%08"PFMT64x"\n",
-					f_name, string->size, addr,
-					string->size, addr);
-		}
-		free (nstr);
-		free (f_name);
-		break;
-		}
-	case MODE_PRINT :
-		io->cb_printf ("%03u 0x%08"PFMT64x" 0x%08"
-				PFMT64x" %3u %3u "
-				"(%s) %5s %s\n",
-				string->ordinal, string->paddr, vaddr,
-				string->length, string->size,
-				section_name, type_string, string->string);
-		break;
-	}
-}
-
-
-// maybe too big sometimes? 2KB of stack eaten here..
-#define R_STRING_SCAN_BUFFER_SIZE 2048
-
-static int string_scan_range(RList *list, RBinFile *bf, int min,
-			      const ut64 from, const ut64 to, int type) {
-	ut8 tmp[R_STRING_SCAN_BUFFER_SIZE];
-	ut64 str_start, needle = from;
-	int count = 0, i, rc, runes;
-	const ut8 *buf = r_buf_buffer (bf->buf);
-	int str_type = R_STRING_TYPE_DETECT;
-
-	if (type == -1) {
-		type = R_STRING_TYPE_DETECT;
-	}
-	if (!buf || !min) {
-		return -1;
-	}
-	while (needle < to) {
-		rc = r_utf8_decode (buf + needle, to - needle, NULL);
-		if (!rc) {
-			needle++;
-			continue;
-		}
-
-		if (type == R_STRING_TYPE_DETECT) {
-			char *w = (char *)buf + needle + rc;
-			if ((to - needle) > 4) {
-				bool is_wide32 = needle + rc + 2 < to && !w[0] && !w[1] && !w[2] && w[3] && !w[4];
-				if (is_wide32) {
-					str_type = R_STRING_TYPE_WIDE32;
-				} else {
-					bool is_wide = needle + rc + 2 < to && !w[0] && w[1] && !w[2];
-					str_type = is_wide? R_STRING_TYPE_WIDE: R_STRING_TYPE_ASCII;
-				}
-			} else {
-				str_type = R_STRING_TYPE_ASCII;
-			}
-		} else {
-			str_type = type;
-		}
-
-
-		runes = 0;
-		str_start = needle;
-
-		/* Eat a whole C string */
-		for (rc = i = 0; i < sizeof (tmp) - 3 && needle < to; i += rc) {
-			RRune r = {0};
-
-			if (str_type == R_STRING_TYPE_WIDE32) {
-				rc = r_utf32le_decode (buf + needle, to - needle, &r);
-				if (rc) {
-					rc = 4;
-				}
-			} else if (str_type == R_STRING_TYPE_WIDE) {
-				rc = r_utf16le_decode (buf + needle, to - needle, &r);
-				if (rc == 1) {
-					rc = 2;
-				}
-			} else {
-				rc = r_utf8_decode (buf + needle, to - needle, &r);
-				if (rc > 1) {
-					str_type = R_STRING_TYPE_UTF8;
-				}
-			}
-
-			/* Invalid sequence detected */
-			if (!rc) {
-				needle++;
-				break;
-			}
-
-			needle += rc;
-
-			if (r_isprint (r) && r != '\\') {
-				if (str_type == R_STRING_TYPE_WIDE32) {
-					if (r == 0xff) {
-						r = 0;
-					}
-				}
-				rc = r_utf8_encode (&tmp[i], r);
-				runes++;
-				/* Print the escape code */
-			} else if (r && r < 0x100 && strchr ("\b\v\f\n\r\t\a\033\\", (char)r)) {
-				if ((i + 32) < sizeof (tmp) && r < 93) {
-					tmp[i + 0] = '\\';
-					tmp[i + 1] = "       abtnvfr             e  "
-					             "                              "
-					             "                              "
-					             "  \\"[r];
-				} else {
-					// string too long
-					break;
-				}
-				rc = 2;
-				runes++;
-			} else {
-				/* \0 marks the end of C-strings */
-				break;
-			}
-		}
-
-		tmp[i++] = '\0';
-
-		if (runes >= min) {
-			if (str_type == R_STRING_TYPE_ASCII) {
-				// reduce false positives
-				int j;
-				for (j = 0; j < i; j++) {
-					char ch = tmp[j];
-					if (ch != '\n' && ch != '\r' && ch != '\t') {
-						if (!IS_PRINTABLE (tmp[j])) {
-							continue;
-						}
-					}
-				}
-			}
-			RBinString *bs = R_NEW0 (RBinString);
-			if (!bs) {
-				break;
-			}
-			bs->type = str_type;
-			bs->length = runes;
-			bs->size = needle - str_start;
-			bs->ordinal = count++;
-			// TODO: move into adjust_offset
-			switch (str_type) {
-			case R_STRING_TYPE_WIDE:
-				if (str_start > 1) {
-					const ut8 *p = buf + str_start - 2;
-					if (p[0] == 0xff && p[1] == 0xfe) {
-						str_start -= 2; // \xff\xfe
-					}
-				}
-				break;
-			case R_STRING_TYPE_WIDE32:
-				if (str_start > 3) {
-					const ut8 *p = buf + str_start - 4;
-					if (p[0] == 0xff && p[1] == 0xfe) {
-						str_start -= 4; // \xff\xfe\x00\x00
-					}
-				}
-				break;
-			}
-			bs->paddr = bs->vaddr = str_start;
-			bs->string = r_str_ndup ((const char *)tmp, i);
-			if (list) {
-				r_list_append (list, bs);
-			} else {
-				print_string (bs, bf);
-				r_bin_string_free (bs);
-			}
-		}
-	}
-	return count;
-}
-
-static void get_strings_range(RBinFile *bf, RList *list, int min, ut64 from, ut64 to) {
-	RBinPlugin *plugin = r_bin_file_cur_plugin (bf);
-	RBinString *ptr;
-	RListIter *it;
-
-	if (!bf || !bf->buf || !bf->buf->buf) {
-		return;
-	}
-	if (!bf->rawstr) {
-		if (!plugin || !plugin->info) {
-			return;
-		}
-	}
-	if (!min) {
-		min = plugin? plugin->minstrlen: 4;
-	}
-	/* Some plugins return zero, fix it up */
-	if (!min) {
-		min = 4;
-	}
-	if (min < 0) {
-		return;
-	}
-	if (!to || to > bf->buf->length) {
-		to = r_buf_size (bf->buf);
-	}
-	if (bf->rawstr != 2) {
-		ut64 size = to - from;
-		// in case of dump ignore here
-		if (bf->rbin->maxstrbuf && size && size > bf->rbin->maxstrbuf) {
-			if (bf->rbin->verbose) {
-				eprintf ("WARNING: bin_strings buffer is too big "
-					"(0x%08" PFMT64x
-					")."
-					" Use -zzz or set bin.maxstrbuf "
-					"(RABIN2_MAXSTRBUF) in r2 (rabin2)\n",
-					size);
-			}
-			return;
-		}
-	}
-	if (string_scan_range (list, bf, min, from, to, -1) < 0) {
-		return;
-	}
-	r_list_foreach (list, it, ptr) {
-		RBinSection *s = r_bin_get_section_at (bf->o, ptr->paddr, false);
-		if (s) {
-			ptr->vaddr = s->vaddr + (ptr->paddr - s->paddr);
-		}
-	}
-}
-
-static int is_data_section(RBinFile *a, RBinSection *s) {
-	if (s->has_strings || s->is_data) {
-		return true;
-	}
-	if (s->is_data) {
-		return true;
-	}
- 	// Rust
-	return (strstr (s->name, "_const") != NULL);
-}
-
-static RList *get_strings(RBinFile *a, int min, int dump) {
-	RListIter *iter;
-	RBinSection *section;
-	RBinObject *o = a? a->o: NULL;
-	RList *ret;
-
-	if (!o) {
-		return NULL;
-	}
-	if (dump) {
-		/* dump to stdout, not stored in list */
-		ret = NULL;
-	} else {
-		ret = r_list_newf (r_bin_string_free);
-		if (!ret) {
-			return NULL;
-		}
-	}
-	if (o->sections && !r_list_empty (o->sections) && !a->rawstr) {
-		r_list_foreach (o->sections, iter, section) {
-			if (is_data_section (a, section)) {
-				get_strings_range (a, ret, min, section->paddr,
-						section->paddr + section->size);
-			}
-		}
-		r_list_foreach (o->sections, iter, section) {
-			RBinString *s;
-			RListIter *iter2;
-			/* load objc/swift strings */
-			const int bits = (a->o && a->o->info) ? a->o->info->bits : 32;
-			const int cfstr_size = (bits == 64) ? 32 : 16;
-			const int cfstr_offs = (bits == 64) ? 16 :  8;
-			if (strstr (section->name, "__cfstring")) {
-				int i;
-// XXX do not walk if bin.strings == 0
-				ut8 *p;
-				for (i = 0; i < section->size; i += cfstr_size) {
-					ut8 buf[32];
-					if (!r_buf_read_at (
-						    a->buf, section->paddr + i + cfstr_offs,
-						    buf, sizeof (buf))) {
-						break;
-					}
-					p = buf;
-					ut64 cfstr_vaddr = section->vaddr + i;
-					ut64 cstr_vaddr = (bits == 64)
-								   ? r_read_le64 (p)
-								   : r_read_le32 (p);
-					r_list_foreach (ret, iter2, s) {
-						if (s->vaddr == cstr_vaddr) {
-							RBinString *new = R_NEW0 (RBinString);
-							new->type = s->type;
-							new->length = s->length;
-							new->size = s->size;
-							new->ordinal = s->ordinal;
-							new->paddr = new->vaddr = cfstr_vaddr;
-							new->string = r_str_newf ("cstr.%s", s->string);
-							r_list_append (ret, new);
-							break;
-						}
-					}
-				}
-			}
-		}
-	} else {
-		get_strings_range (a, ret, min, 0, a->size);
-	}
-	return ret;
-}
-
-R_API RList* r_bin_raw_strings(RBinFile *a, int min) {
+R_API RList* r_bin_raw_strings(RBinFile *bf, int min) {
 	RList *l = NULL;
-	if (a) {
-		int tmp = a->rawstr;
-		a->rawstr = 2;
-		l = get_strings (a, min, 0);
-		a->rawstr = tmp;
+	if (bf) {
+		l = r_bin_file_get_strings (bf, min, 0, 2);
 	}
 	return l;
 }
 
-R_API int r_bin_dump_strings(RBinFile *a, int min) {
-	get_strings (a, min, 1);
+R_API int r_bin_dump_strings(RBinFile *a, int min, int raw) {
+	r_bin_file_get_strings (a, min, 1, raw);
 	return 0;
 }
 
@@ -622,55 +148,6 @@
 	return R_BIN_NM_NONE;
 }
 
-static void mem_free(void *data) {
-	RBinMem *mem = (RBinMem *)data;
-	if (mem && mem->mirrors) {
-		mem->mirrors->free = mem_free;
-		r_list_free (mem->mirrors);
-		mem->mirrors = NULL;
-	}
-	free (mem);
-}
-
-static void r_bin_object_delete_items(RBinObject *o) {
-	ut32 i = 0;
-	if (!o) {
-		return;
-	}
-	r_list_free (o->entries);
-	r_list_free (o->fields);
-	r_list_free (o->imports);
-	r_list_free (o->libs);
-	r_list_free (o->relocs);
-	r_list_free (o->sections);
-	r_list_free (o->strings);
-	r_list_free (o->symbols);
-	r_list_free (o->classes);
-	r_list_free (o->lines);
-	sdb_free (o->kv);
-	if (o->mem) {
-		o->mem->free = mem_free;
-	}
-	r_list_free (o->mem);
-	o->mem = NULL;
-	o->entries = NULL;
-	o->fields = NULL;
-	o->imports = NULL;
-	o->libs = NULL;
-	o->relocs = NULL;
-	o->sections = NULL;
-	o->strings = NULL;
-	o->symbols = NULL;
-	o->classes = NULL;
-	o->lines = NULL;
-	o->info = NULL;
-	o->kv = NULL;
-	for (i = 0; i < R_BIN_SYM_LAST; i++) {
-		free (o->binsym[i]);
-		o->binsym[i] = NULL;
-	}
-}
-
 R_API void r_bin_info_free(RBinInfo *rb) {
 	if (!rb) {
 		return;
@@ -691,6 +168,17 @@
 	free (rb);
 }
 
+R_API RBinImport *r_bin_import_clone(RBinImport *o) {
+	RBinImport *res = r_mem_dup (o, sizeof (*o));
+	if (!res) {
+		return NULL;
+	}
+	res->name = R_STR_DUP (o->name);
+	res->classname = R_STR_DUP (o->classname);
+	res->descriptor = R_STR_DUP (o->descriptor);
+	return res;
+}
+
 R_API void r_bin_import_free(void *_imp) {
 	RBinImport *imp = (RBinImport *)_imp;
 	if (imp) {
@@ -701,11 +189,24 @@
 	}
 }
 
+R_API RBinSymbol *r_bin_symbol_clone(RBinSymbol *o) {
+	RBinSymbol *res = r_mem_dup (o, sizeof (*o));
+	if (!res) {
+		return NULL;
+	}
+	res->name = R_STR_DUP (o->name);
+	res->dname = R_STR_DUP (o->dname);
+	res->classname = R_STR_DUP (o->classname);
+	return res;
+}
+
 R_API void r_bin_symbol_free(void *_sym) {
 	RBinSymbol *sym = (RBinSymbol *)_sym;
-	free (sym->name);
-	free (sym->classname);
-	free (sym);
+	if (sym) {
+		free (sym->name);
+		free (sym->classname);
+		free (sym);
+	}
 }
 
 R_API void r_bin_string_free(void *_str) {
@@ -714,224 +215,9 @@
 	free (str);
 }
 
-static void r_bin_object_free(void /*RBinObject*/ *o_) {
-	RBinObject *o = o_;
-	if (!o) {
-		return;
-	}
-	r_bin_info_free (o->info);
-	r_bin_object_delete_items (o);
-	R_FREE (o);
-}
-
-static char *swiftField(const char *dn, const char *cn) {
-	char *p = strstr (dn, ".getter_");
-	if (!p) {
-		p = strstr (dn, ".setter_");
-		if (!p) {
-			p = strstr (dn, ".method_");
-		}
-	}
-	if (p) {
-		char *q = strstr (dn, cn);
-		if (q && q[strlen (cn)] == '.') {
-			q = strdup (q + strlen (cn) + 1);
-			char *r = strchr (q, '.');
-			if (r) {
-				*r = 0;
-			}
-			return q;
-		}
-	}
-	return NULL;
-}
-
-R_API RList *r_bin_classes_from_symbols (RBinFile *bf, RBinObject *o) {
-	RBinSymbol *sym;
-	RListIter *iter;
-	RList *symbols = o->symbols;
-	RList *classes = o->classes;
-	if (!classes) {
-		classes = r_list_newf ((RListFree)r_bin_class_free);
-	}
-	r_list_foreach (symbols, iter, sym) {
-		if (sym->name[0] != '_') {
-			continue;
-		}
-		const char *cn = sym->classname;
-		if (cn) {
-			RBinClass *c = r_bin_class_new (bf, sym->classname, NULL, 0);
-			if (!c) {
-				continue;
-			}
-			// swift specific
-			char *dn = sym->dname;
-			char *fn = swiftField (dn, cn);
-			if (fn) {
-				// eprintf ("FIELD %s  %s\n", cn, fn);
-				RBinField *f = r_bin_field_new (sym->paddr, sym->vaddr, sym->size, fn, NULL, NULL);
-				r_list_append (c->fields, f);
-				free (fn);
-			} else {
-				char *mn = strstr (dn, "..");
-				if (mn) {
-					// eprintf ("META %s  %s\n", sym->classname, mn);
-				} else {
-					char *mn = strstr (dn, cn);
-					if (mn && mn[strlen(cn)] == '.') {
-						mn += strlen (cn) + 1;
-						// eprintf ("METHOD %s  %s\n", sym->classname, mn);
-						r_list_append (c->methods, sym);
-					}
-				}
-			}
-		}
-	}
-	if (r_list_empty (classes)) {
-		r_list_free (classes);
-		return NULL;
-	}
-	return classes;
-}
-
 // XXX - change this to RBinObject instead of RBinFile
 // makes no sense to pass in a binfile and set the RBinObject
 // kinda a clunky functions
-R_API int r_bin_object_set_items(RBinFile *binfile, RBinObject *o) {
-	RBinObject *old_o;
-	RBinPlugin *cp;
-	int i, minlen;
-	RBin *bin;
-	if (!binfile || !o || !o->plugin) {
-		return false;
-	}
-	bin = binfile->rbin;
-	old_o = binfile->o;
-	cp = o->plugin;
-	if (binfile->rbin->minstrlen > 0) {
-		minlen = binfile->rbin->minstrlen;
-	} else {
-		minlen = cp->minstrlen;
-	}
-	binfile->o = o;
-	if (cp->baddr) {
-		ut64 old_baddr = o->baddr;
-		o->baddr = cp->baddr (binfile);
-		binobj_set_baddr (o, old_baddr);
-	}
-	if (cp->boffset) {
-		o->boffset = cp->boffset (binfile);
-	}
-	// XXX: no way to get info from xtr pluginz?
-	// Note, object size can not be set from here due to potential
-	// inconsistencies
-	if (cp->size) {
-		o->size = cp->size (binfile);
-	}
-	if (cp->binsym) {
-		for (i = 0; i < R_BIN_SYM_LAST; i++) {
-			o->binsym[i] = cp->binsym (binfile, i);
-			if (o->binsym[i]) {
-				o->binsym[i]->paddr += o->loadaddr;
-			}
-		}
-	}
-	if (cp->entries) {
-		o->entries = cp->entries (binfile);
-		REBASE_PADDR (o, o->entries, RBinAddr);
-	}
-	if (cp->fields) {
-		o->fields = cp->fields (binfile);
-		if (o->fields) {
-			o->fields->free = r_bin_field_free;
-			REBASE_PADDR (o, o->fields, RBinField);
-		}
-	}
-	if (cp->imports) {
-		r_list_free (o->imports);
-		o->imports = cp->imports (binfile);
-		if (o->imports) {
-			o->imports->free = r_bin_import_free;
-		}
-	}
-	//if (bin->filter_rules & (R_BIN_REQ_SYMBOLS | R_BIN_REQ_IMPORTS)) {
-	if (true) {
-		if (cp->symbols) {
-			o->symbols = cp->symbols (binfile);
-			if (o->symbols) {
-				o->symbols->free = r_bin_symbol_free;
-				REBASE_PADDR (o, o->symbols, RBinSymbol);
-				if (bin->filter) {
-					r_bin_filter_symbols (o->symbols);
-				}
-			}
-		}
-	}
-	//}
-	o->info = cp->info? cp->info (binfile): NULL;
-	if (cp->libs) {
-		o->libs = cp->libs (binfile);
-	}
-	if (cp->sections) {
-		// XXX sections are populated by call to size
-		if (!o->sections) {
-			o->sections = cp->sections (binfile);
-		}
-		REBASE_PADDR (o, o->sections, RBinSection);
-		if (bin->filter) {
-			r_bin_filter_sections (o->sections);
-		}
-	}
-	if (bin->filter_rules & (R_BIN_REQ_RELOCS | R_BIN_REQ_IMPORTS)) {
-		if (cp->relocs) {
-			o->relocs = cp->relocs (binfile);
-			REBASE_PADDR (o, o->relocs, RBinReloc);
-		}
-	}
-	if (bin->filter_rules & R_BIN_REQ_STRINGS) {
-		if (cp->strings) {
-			o->strings = cp->strings (binfile);
-		} else {
-			o->strings = get_strings (binfile, minlen, 0);
-		}
-		if (bin->debase64) {
-			filterStrings (bin, o->strings);
-		}
-		REBASE_PADDR (o, o->strings, RBinString);
-	}
-	if (bin->filter_rules & R_BIN_REQ_CLASSES) {
-		if (cp->classes) {
-			o->classes = cp->classes (binfile);
-			if (r_bin_lang_swift (binfile)) {
-				o->classes = r_bin_classes_from_symbols (binfile, o);
-			}
-		} else {
-			o->classes = r_bin_classes_from_symbols (binfile, o);
-		}
-		if (bin->filter) {
-			r_bin_filter_classes (o->classes);
-		}
-	}
-	if (cp->lines) {
-		o->lines = cp->lines (binfile);
-	}
-	if (cp->get_sdb) {
-		Sdb* new_kv = cp->get_sdb (binfile);
-		if (new_kv != o->kv) {
-			sdb_free (o->kv);
-		}
-		o->kv = new_kv;
-	}
-	if (cp->mem)  {
-		o->mem = cp->mem (binfile);
-	}
-	if (bin->filter_rules & (R_BIN_REQ_SYMBOLS | R_BIN_REQ_IMPORTS)) {
-		o->lang = r_bin_load_languages (binfile);
-	}
-	binfile->o = old_o;
-	return true;
-}
-
 // XXX - this is a rather hacky way to do things, there may need to be a better
 // way.
 R_API int r_bin_load(RBin *bin, const char *file, ut64 baseaddr, ut64 loadaddr, int xtr_idx, int fd, int rawstr) {
@@ -1013,12 +299,14 @@
 	bf->o = NULL;
 
 	sz = iob->fd_size (iob->io, fd);
-	if (sz == UT64_MAX || sz > (64 * 1024 * 1024)) {
+	if (sz == UT64_MAX) { // || sz > (64 * 1024 * 1024)) {
 		// too big, probably wrong
 		eprintf ("Too big\n");
 		res = false;
 		goto error;
 	}
+// TODO: deprecate, the code in the else should be enough
+#if 1
 	if (sz == UT64_MAX && iob->fd_is_dbg (iob->io, fd)) {
 		// attempt a local open and read
 		// This happens when a plugin like debugger does not have a
@@ -1039,6 +327,7 @@
 			res = false;
 			goto error;
 		}
+		// OMG NOES we want to use io, not this shit. 
 		buf_bytes = calloc (1, sz + 1);
 		if (!buf_bytes) {
 			iob->fd_close (iob->io, tfd);
@@ -1064,9 +353,11 @@
 			goto error;
 		}
 	}
-
 	bool yes_plz_steal_ptr = true;
 	r_bin_file_set_bytes (bf, buf_bytes, sz, yes_plz_steal_ptr);
+#else
+	bf->buf = r_buf_new_with_io (iob, fd);
+#endif
 
 	if (r_list_length (the_obj_list) == 1) {
 		RBinObject *old_o = (RBinObject *)r_list_get_n (the_obj_list, 0);
@@ -1141,17 +432,23 @@
 			}
 		}
 	}
+	// this thing works for 2GB ELF core from vbox
 	if (!buf_bytes) {
-		buf_bytes = calloc (1, sz + 1);
+		if ((int)sz < 0) {
+			eprintf ("Cannot allocate %d bytes\n", (int)(sz));
+			return false;
+		}
+		const int asz = sz? sz: 1;
+		buf_bytes = calloc (1, asz);
 		if (!buf_bytes) {
+			eprintf ("Cannot allocate %d bytes.\n", asz);
 			return false;
 		}
 		ut64 seekaddr = is_debugger? baseaddr: loadaddr;
-		if (!iob->fd_read_at (io, fd, seekaddr, buf_bytes, sz)) {
+		if (!iob->fd_read_at (io, fd, seekaddr, buf_bytes, asz)) {
 			sz = 0LL;
 		}
 	}
-
 	if (bin->use_xtr && !name && (st64)sz > 0) {
 		// XXX - for the time being this is fine, but we may want to
 		// change the name to something like
@@ -1171,7 +468,7 @@
 								(void) iob->fd_read_at (io, tfd, 0, buf_bytes, sz);
 							}
 						}
-				//DOUBLECLOSE UAF : iob->fd_close (io, tfd);
+						// DOUBLECLOSE UAF : iob->fd_close (io, tfd);
 						tfd = -1;	// marking it closed
 					} else if (sz != file_sz) {
 						(void) iob->read_at (io, 0LL, buf_bytes, sz);
@@ -1186,15 +483,14 @@
 		}
 	}
 	if (!binfile) {
-		bool steal_ptr = true; // transfer buf_bytes ownership to binfile
 		binfile = r_bin_file_new_from_bytes (
 			bin, fname, buf_bytes, sz, file_sz, bin->rawstr,
-			baseaddr, loadaddr, fd, name, NULL, offset, steal_ptr);
+			baseaddr, loadaddr, fd, name, NULL, offset, true);
 	}
 	return binfile? r_bin_file_set_cur_binfile (bin, binfile): false;
 }
 
-R_API bool r_bin_load_io_at_offset_as(RBin *bin, int fd, ut64 baseaddr,
+static bool r_bin_load_io_at_offset_as(RBin *bin, int fd, ut64 baseaddr,
 		ut64 loadaddr, int xtr_idx, ut64 offset, const char *name) {
 	// adding file_sz to help reduce the performance impact on the system
 	// in this case the number of bytes read will be limited to 2MB
@@ -1210,133 +506,7 @@
 	return res;
 }
 
-R_API int r_bin_file_deref_by_bind(RBinBind *binb) {
-	RBin *bin = binb? binb->bin: NULL;
-	RBinFile *a = r_bin_cur (bin);
-	return r_bin_file_deref (bin, a);
-}
-
-R_API int r_bin_file_deref(RBin *bin, RBinFile *a) {
-	RBinObject *o = r_bin_cur_object (bin);
-	int res = false;
-	if (a && !o) {
-		//r_list_delete_data (bin->binfiles, a);
-		res = true;
-	} else if (a && o->referenced - 1 < 1) {
-		//r_list_delete_data (bin->binfiles, a);
-		res = true;
-		// not thread safe
-	} else if (o) {
-		o->referenced--;
-	}
-	// it is possible for a file not
-	// to be bound to RBin and RBinFiles
-	// XXX - is this an ok assumption?
-	if (bin) bin->cur = NULL;
-	return res;
-}
-
-R_API int r_bin_file_ref_by_bind(RBinBind *binb) {
-	RBin *bin = binb? binb->bin: NULL;
-	RBinFile *a = r_bin_cur (bin);
-	return r_bin_file_ref (bin, a);
-}
-
-R_API int r_bin_file_ref(RBin *bin, RBinFile *a) {
-	RBinObject *o = r_bin_cur_object (bin);
-	if (a && o) {
-		o->referenced--;
-		return true;
-	}
-	return false;
-}
-
-static void r_bin_file_free(void /*RBinFile*/ *bf_) {
-	RBinFile *a = bf_;
-	RBinPlugin *plugin = r_bin_file_cur_plugin (a);
-
-	if (!a) {
-		return;
-	}
-
-	// Binary format objects are connected to the
-	// RBinObject, so the plugin must destroy the
-	// format data first
-	if (plugin && plugin->destroy) {
-		plugin->destroy (a);
-	}
-	if (a->curxtr && a->curxtr->destroy && a->xtr_obj) {
-		a->curxtr->free_xtr ((void *)(a->xtr_obj));
-	}
-	r_buf_free (a->buf);
-	// TODO: unset related sdb namespaces
-	if (a && a->sdb_addrinfo) {
-		sdb_free (a->sdb_addrinfo);
-		a->sdb_addrinfo = NULL;
-	}
-	free (a->file);
-	a->o = NULL;
-	r_list_free (a->objs);
-	r_list_free (a->xtr_data);
-	r_id_pool_kick_id (a->rbin->file_ids, a->id);
-	memset (a, 0, sizeof (RBinFile));
-	free (a);
-}
-
-static RBinFile *r_bin_file_create_append(RBin *bin, const char *file,
-					   const ut8 *bytes, ut64 sz,
-					   ut64 file_sz, int rawstr, int fd,
-					   const char *xtrname, bool steal_ptr) {
-	RBinFile *bf = r_bin_file_new (bin, file, bytes, sz, file_sz, rawstr,
-				       fd, xtrname, bin->sdb, steal_ptr);
-	if (bf) {
-		r_list_append (bin->binfiles, bf);
-	}
-	return bf;
-}
-
-// This function populate RBinFile->xtr_data, that information is enough to
-// create RBinObject when needed using r_bin_file_object_new_from_xtr_data
-static RBinFile *r_bin_file_xtr_load_bytes(RBin *bin, RBinXtrPlugin *xtr,
-					    const char *filename,
-					    const ut8 *bytes, ut64 sz,
-					    ut64 file_sz, ut64 baseaddr,
-					    ut64 loadaddr, int idx, int fd,
-					    int rawstr) {
-	if (!bin || !bytes) {
-		return NULL;
-	}
-	RBinFile *bf = r_bin_file_find_by_name (bin, filename);
-	if (!bf) {
-		bf = r_bin_file_create_append (bin, filename, bytes, sz,
-					       file_sz, rawstr, fd, xtr->name, false);
-		if (!bf) {
-			return NULL;
-		}
-		if (!bin->cur) {
-			bin->cur = bf;
-		}
-	}
-	if (bf->xtr_data) {
-		r_list_free (bf->xtr_data);
-	}
-	if (xtr && bytes) {
-		RList *xtr_data_list = xtr->extractall_from_bytes (bin, bytes, sz);
-		RListIter *iter;
-		RBinXtrData *xtr;
-		//populate xtr_data with baddr and laddr that will be used later on
-		//r_bin_file_object_new_from_xtr_data
-		r_list_foreach (xtr_data_list, iter, xtr) {
-			xtr->baddr = baseaddr? baseaddr : UT64_MAX;
-			xtr->laddr = loadaddr? loadaddr : UT64_MAX;
-		}
-		bf->loadaddr = loadaddr;
-		bf->xtr_data = xtr_data_list ? xtr_data_list : NULL;
-	}
-	return bf;
-}
-
-static RBinPlugin *r_bin_get_binplugin_by_name(RBin *bin, const char *name) {
+R_API RBinPlugin *r_bin_get_binplugin_by_name(RBin *bin, const char *name) {
 	RBinPlugin *plugin;
 	RListIter *it;
 	if (bin && name) {
@@ -1363,10 +533,13 @@
 	return NULL;
 }
 
-static RBinXtrPlugin *r_bin_get_xtrplugin_by_name(RBin *bin, const char *name) {
+R_API RBinXtrPlugin *r_bin_get_xtrplugin_by_name(RBin *bin, const char *name) {
 	RBinXtrPlugin *xtr;
 	RListIter *it;
-	if (!bin || !name) return NULL;
+	if (!bin || !name) {
+		return NULL;
+	}
+	// TODO: use a hashtable here
 	r_list_foreach (bin->binxtrs, it, xtr) {
 		if (!strcmp (xtr->name, name)) {
 			return xtr;
@@ -1377,288 +550,11 @@
 	return NULL;
 }
 
-static RBinPlugin *r_bin_get_binplugin_any(RBin *bin) {
+R_API RBinPlugin *r_bin_get_binplugin_any(RBin *bin) {
 	return r_bin_get_binplugin_by_name (bin, "any");
 }
 
-static RBinObject *r_bin_object_new(RBinFile *binfile, RBinPlugin *plugin,
-				     ut64 baseaddr, ut64 loadaddr, ut64 offset,
-				     ut64 sz) {
-	const ut8 *bytes = binfile? r_buf_buffer (binfile->buf): NULL;
-	ut64 bytes_sz = binfile? r_buf_size (binfile->buf): 0;
-	Sdb *sdb = binfile? binfile->sdb: NULL;
-	RBinObject *o = R_NEW0 (RBinObject);
-	if (!o) {
-		return NULL;
-	}
-	o->obj_size = bytes && (bytes_sz >= sz + offset)? sz: 0;
-	o->boffset = offset;
-	o->id = r_num_rand (0xfffff000);
-	o->kv = sdb_new0 ();
-	o->baddr = baseaddr;
-	o->baddr_shift = 0;
-	o->plugin = plugin;
-	o->loadaddr = loadaddr != UT64_MAX ? loadaddr : 0;
-
-	// XXX more checking will be needed here
-	// only use LoadBytes if buffer offset != 0
-	// if (offset != 0 && bytes && plugin && plugin->load_bytes && (bytes_sz
-	// >= sz + offset) ) {
-	if (bytes && plugin && plugin->load_bytes && (bytes_sz >= sz + offset)) {
-		ut64 bsz = bytes_sz - offset;
-		if (sz < bsz) {
-			bsz = sz;
-		}
-		o->bin_obj = plugin->load_bytes (binfile, bytes + offset, sz,
-						 loadaddr, sdb);
-		if (!o->bin_obj) {
-			bprintf (
-				"Error in r_bin_object_new: load_bytes failed "
-				"for %s plugin\n",
-				plugin->name);
-			sdb_free (o->kv);
-			free (o);
-			return NULL;
-		}
-	} else if (binfile && plugin && plugin->load) {
-		// XXX - haha, this is a hack.
-		// switching out the current object for the new
-		// one to be processed
-		RBinObject *old_o = binfile->o;
-		binfile->o = o;
-		if (plugin->load (binfile)) {
-			binfile->sdb_info = o->kv;
-			// mark as do not walk
-			sdb_ns_set (binfile->sdb, "info", o->kv);
-		} else {
-			binfile->o = old_o;
-		}
-		o->obj_size = sz;
-	} else {
-		sdb_free (o->kv);
-		free (o);
-		return NULL;
-	}
-
-	// XXX - binfile could be null here meaning an improper load
-	// XXX - object size cant be set here and needs to be set where
-	// where the object is created from.  The reason for this is to prevent
-	// mis-reporting when the file is loaded from impartial bytes or is
-	// extracted
-	// from a set of bytes in the file
-	r_bin_object_set_items (binfile, o);
-	r_bin_file_object_add (binfile, o);
-
-	// XXX this is a very hacky alternative to rewriting the
-	// RIO stuff, as discussed here:
-	return o;
-}
-
-#define LIMIT_SIZE 0
-static int r_bin_file_set_bytes(RBinFile *binfile, const ut8 *bytes, ut64 sz, bool steal_ptr) {
-	if (!bytes) {
-		return false;
-	}
-	r_buf_free (binfile->buf);
-	binfile->buf = r_buf_new ();
-#if LIMIT_SIZE
-	if (sz > 1024 * 1024) {
-		eprintf ("Too big\n");
-		// TODO: use r_buf_io instead of setbytes all the time to save memory
-		return NULL;
-	}
-#else
-	if (steal_ptr) {
-		r_buf_set_bytes_steal (binfile->buf, bytes, sz);
-	} else {
-		r_buf_set_bytes (binfile->buf, bytes, sz);
-	}
-#endif
-	return binfile->buf != NULL;
-}
-
-static RBinFile *r_bin_file_new(RBin *bin, const char *file, const ut8 *bytes,
-				 ut64 sz, ut64 file_sz, int rawstr, int fd,
-				 const char *xtrname, Sdb *sdb, bool steal_ptr) {
-	RBinFile *binfile = R_NEW0 (RBinFile);
-	if (!binfile) {
-		return NULL;
-	}
-	if (!r_id_pool_grab_id (bin->file_ids, &binfile->id)) {
-		if (steal_ptr) { // we own the ptr, free on error
-			free ((void*) bytes);
-		}
-		free (binfile);		//no id means no binfile
-		return NULL;
-	}
-	int res = r_bin_file_set_bytes (binfile, bytes, sz, steal_ptr);
-	if (!res && steal_ptr) { // we own the ptr, free on error
-		free((void*) bytes);
-	}
-	binfile->rbin = bin;
-	binfile->file = file? strdup (file): NULL;
-	binfile->rawstr = rawstr;
-	binfile->fd = fd;
-	binfile->curxtr = r_bin_get_xtrplugin_by_name (bin, xtrname);
-	binfile->sdb = sdb;
-	binfile->size = file_sz;
-	binfile->xtr_data = r_list_newf ((RListFree)r_bin_xtrdata_free);
-	binfile->objs = r_list_newf ((RListFree)r_bin_object_free);
-	binfile->xtr_obj  = NULL;
-
-	if (!binfile->buf) {
-		//r_bin_file_free (binfile);
-		binfile->buf = r_buf_new ();
-		//	return NULL;
-	}
-
-	if (sdb) {
-		binfile->sdb = sdb_ns (sdb, sdb_fmt (0, "fd.%d", fd), 1);
-		sdb_set (binfile->sdb, "archs", "0:0:x86:32", 0); // x86??
-		/* NOTE */
-		/* Those refs++ are necessary because sdb_ns() doesnt rerefs all
-		 * sub-namespaces */
-		/* And if any namespace is referenced backwards it gets
-		 * double-freed */
-		binfile->sdb_addrinfo = sdb_ns (binfile->sdb, "addrinfo", 1);
-		binfile->sdb_addrinfo->refs++;
-		sdb_ns_set (sdb, "cur", binfile->sdb);
-		binfile->sdb->refs++;
-	}
-	return binfile;
-}
-
-R_API bool r_bin_file_object_new_from_xtr_data(RBin *bin, RBinFile *bf,
-						ut64 baseaddr, ut64 loadaddr,
-						RBinXtrData *data) {
-	RBinObject *o = NULL;
-	RBinPlugin *plugin = NULL;
-	ut8* bytes;
-	ut64 offset = data? data->offset: 0;
-	ut64 sz = data ? data->size : 0;
-	if (!data || !bf) {
-		return false;
-	}
-
-	// for right now the bytes used will just be the offest into the binfile
-	// buffer
-	// if the extraction requires some sort of transformation then this will
-	// need to be fixed
-	// here.
-	bytes = data->buffer;
-	if (!bytes) {
-		return false;
-	}
-	plugin = r_bin_get_binplugin_by_bytes (bin, (const ut8*)bytes, sz);
-	if (!plugin) {
-		plugin = r_bin_get_binplugin_any (bin);
-	}
-	r_buf_free (bf->buf);
-	bf->buf = r_buf_new_with_bytes ((const ut8*)bytes, data->size);
-	//r_bin_object_new append the new object into binfile
-	o = r_bin_object_new (bf, plugin, baseaddr, loadaddr, offset, sz);
-	// size is set here because the reported size of the object depends on
-	// if loaded from xtr plugin or partially read
-	if (!o) {
-		return false;
-	}
-	if (o && !o->size) {
-		o->size = sz;
-	}
-	bf->narch = data->file_count;
-	if (!o->info) {
-		o->info = R_NEW0 (RBinInfo);
-	}
-	free (o->info->file);
-	free (o->info->arch);
-	free (o->info->machine);
-	free (o->info->type);
-	o->info->file = strdup (bf->file);
-	o->info->arch = strdup (data->metadata->arch);
-	o->info->machine = strdup (data->metadata->machine);
-	o->info->type = strdup (data->metadata->type);
-	o->info->bits = data->metadata->bits;
-	o->info->has_crypto = bf->o->info->has_crypto;
-	data->loaded = true;
-	return true;
-}
-
-static RBinFile *r_bin_file_new_from_bytes(RBin *bin, const char *file,
-					    const ut8 *bytes, ut64 sz,
-					    ut64 file_sz, int rawstr,
-					    ut64 baseaddr, ut64 loadaddr,
-					    int fd, const char *pluginname,
-					    const char *xtrname, ut64 offset,
-					    bool steal_ptr) {
-	ut8 binfile_created = false;
-	RBinPlugin *plugin = NULL;
-	RBinXtrPlugin *xtr = NULL;
-	RBinObject *o = NULL;
-	RBinFile *bf = NULL;
-	if (sz == UT64_MAX) {
-		return NULL;
-	}
-
-	if (xtrname) {
-		xtr = r_bin_get_xtrplugin_by_name (bin, xtrname);
-	}
-
-	if (xtr && xtr->check_bytes (bytes, sz)) {
-		return r_bin_file_xtr_load_bytes (bin, xtr, file,
-						bytes, sz, file_sz, baseaddr, loadaddr, 0,
-						fd, rawstr);
-	}
-
-	if (!bf) {
-		bf = r_bin_file_create_append (bin, file, bytes, sz, file_sz,
-					       rawstr, fd, xtrname, steal_ptr);
-		if (!bf) {
-			if (!steal_ptr) { // we own the ptr, free on error
-				free ((void*) bytes);
-			}
-			return NULL;
-		}
-		binfile_created = true;
-	}
-
-	if (bin->force) {
-		plugin = r_bin_get_binplugin_by_name (bin, bin->force);
-	}
-	if (!plugin) {
-		if (pluginname) {
-			plugin = r_bin_get_binplugin_by_name (bin, pluginname);
-		}
-		if (!plugin) {
-			plugin = r_bin_get_binplugin_by_bytes (bin, bytes, sz);
-			if (!plugin) {
-				plugin = r_bin_get_binplugin_any (bin);
-			}
-		}
-	}
-
-	o = r_bin_object_new (bf, plugin, baseaddr, loadaddr, 0, r_buf_size (bf->buf));
-	// size is set here because the reported size of the object depends on
-	// if loaded from xtr plugin or partially read
-	if (o && !o->size) {
-		o->size = file_sz;
-	}
-
-	if (!o) {
-		if (bf && binfile_created) {
-			r_list_delete_data (bin->binfiles, bf);
-		}
-		return NULL;
-	}
-	/* WTF */
-	if (strcmp (plugin->name, "any")) {
-		bf->narch = 1;
-	}
-
-	/* free unnecessary rbuffer (???) */
-	return bf;
-}
-
-static void plugin_free(RBinPlugin *p) {
+static void r_bin_plugin_free(RBinPlugin *p) {
 	if (p && p->fini) {
 		p->fini (NULL);
 	}
@@ -1731,8 +627,9 @@
 	r_list_free (bin->binfiles);
 	r_list_free (bin->binxtrs);
 	r_list_free (bin->plugins);
+	r_list_free (bin->binldrs);
 	sdb_free (bin->sdb);
-	r_id_pool_free (bin->file_ids);
+	r_id_storage_free (bin->ids);
 	memset (bin, 0, sizeof (RBin));
 	free (bin);
 	return NULL;
@@ -1869,18 +766,10 @@
 	return false;
 }
 
-static ut64 binobj_get_baddr(RBinObject *o) {
-	return o? o->baddr + o->baddr_shift: UT64_MAX;
-}
-
-R_API ut64 r_binfile_get_baddr(RBinFile *binfile) {
-	return binfile? binobj_get_baddr (binfile->o): UT64_MAX;
-}
-
 /* returns the base address of bin or UT64_MAX in case of errors */
 R_API ut64 r_bin_get_baddr(RBin *bin) {
 	RBinObject *o = r_bin_cur_object (bin);
-	return binobj_get_baddr (o);
+	return r_bin_object_get_baddr (o);
 }
 
 /* returns the load address of bin or UT64_MAX in case of errors */
@@ -1891,7 +780,7 @@
 
 R_API void r_bin_set_baddr(RBin *bin, ut64 baddr) {
 	RBinObject *o = r_bin_cur_object (bin);
-	binobj_set_baddr (o, baddr);
+	r_bin_object_set_baddr (o, baddr);
 	// XXX - update all the infos?
 }
 
@@ -1934,7 +823,6 @@
 	return o? o->libs: NULL;
 }
 
-
 R_API RList * r_bin_patch_relocs(RBin *bin) {
 	static bool first = true;
 	RBinObject *o = r_bin_cur_object (bin);
@@ -2010,10 +898,10 @@
 	if (plugin && plugin->strings) {
 		o->strings = plugin->strings (a);
 	} else {
-		o->strings = get_strings (a, bin->minstrlen, 0);
+		o->strings = r_bin_file_get_strings (a, bin->minstrlen, 0, a->rawstr);
 	}
 	if (bin->debase64) {
-		filterStrings (bin, o->strings);
+		r_bin_object_filter_strings (o);
 	}
 	return o->strings;
 }
@@ -2124,13 +1012,13 @@
 	bin->filter_rules = UT64_MAX;
 	bin->sdb = sdb_new0 ();
 	bin->cb_printf = (PrintfCallback)printf;
-	bin->plugins = r_list_newf ((RListFree)plugin_free);
+	bin->plugins = r_list_newf ((RListFree)r_bin_plugin_free);
 	bin->minstrlen = 0;
 	bin->strpurge = NULL;
 	bin->want_dbginfo = true;
 	bin->cur = NULL;
 	bin->io_owned = false;
-	bin->file_ids = r_id_pool_new (0, 0xffffffff);
+	bin->ids = r_id_storage_new (0, ST32_MAX);
 
 	/* bin parsers */
 	bin->binfiles = r_list_newf ((RListFree)r_bin_file_free);
@@ -2164,8 +1052,7 @@
 	return bin;
 }
 
-R_API int r_bin_use_arch(RBin *bin, const char *arch, int bits,
-			  const char *name) {
+R_API int r_bin_use_arch(RBin *bin, const char *arch, int bits, const char *name) {
 	RBinFile *binfile = r_bin_file_find_by_arch_bits (bin, arch, bits, name);
 	RBinObject *obj = NULL;
 	if (binfile) {
@@ -2187,159 +1074,37 @@
 				bin->cur->curplugin = plugin;
 			}
 			binfile = r_bin_file_new (bin, "-", NULL, 0, 0, 0, 999, NULL, NULL, false);
+			if (!binfile) {
+				return false;
+			}
 			// create object and set arch/bits
 			obj = r_bin_object_new (binfile, plugin, 0, 0, 0, 1024);
+			if (!obj) {
+				return false;
+			}
 			binfile->o = obj;
 			obj->info = R_NEW0 (RBinInfo);
 			obj->info->arch = strdup (arch);
 			obj->info->bits = bits;
 		}
 	}
-	return (binfile && r_bin_file_set_cur_binfile_obj (bin, binfile, obj));
-}
-
-R_API RBinObject *r_bin_object_find_by_arch_bits(RBinFile *binfile,
-						  const char *arch, int bits,
-						  const char *name) {
-	RBinObject *obj = NULL;
-	RListIter *iter = NULL;
-	RBinInfo *info = NULL;
-	r_list_foreach (binfile->objs, iter, obj) {
-		info = obj->info;
-		if (info && info->arch && info->file &&
-		   (bits == info->bits) &&
-			!strcmp (info->arch, arch) &&
-			!strcmp (info->file, name)) {
-			break;
-		}
-		obj = NULL;
-	}
-	return obj;
-}
-
-R_API RBinFile *r_bin_file_find_by_arch_bits(RBin *bin, const char *arch,
-					      int bits, const char *name) {
-	RListIter *iter;
-	RBinFile *binfile = NULL;
-	RBinXtrData *xtr_data;
-
-	if (!name || !arch) {
-		return NULL;
-	}
-	r_list_foreach (bin->binfiles, iter, binfile) {
-		RListIter *iter_xtr;
-		if (!binfile->xtr_data) {
-			continue;
-		}
-		// look for sub-bins in Xtr Data and Load if we need to
-		r_list_foreach (binfile->xtr_data, iter_xtr, xtr_data) {
-			if (xtr_data->metadata && xtr_data->metadata->arch) {
-				char *iter_arch = xtr_data->metadata->arch;
-				int iter_bits = xtr_data->metadata->bits;
-				if (bits == iter_bits && !strcmp (iter_arch, arch)) {
-					if (!xtr_data->loaded) {
-						if (!r_bin_file_object_new_from_xtr_data (
-							    bin, binfile, xtr_data->baddr,
-							    xtr_data->laddr, xtr_data)) {
-							return NULL;
-						}
-						return binfile;
-					}
-				}
-			}
-		}
-	}
-	return binfile;
+	return r_bin_file_set_cur_binfile_obj (bin, binfile, obj);
 }
 
-R_API int r_bin_select(RBin *bin, const char *arch, int bits,
-			const char *name) {
-	RBinFile *cur = r_bin_cur (bin), *binfile = NULL;
+R_API int r_bin_select(RBin *bin, const char *arch, int bits, const char *name) {
+	RBinFile *cur = r_bin_cur (bin);
 	RBinObject *obj = NULL;
 	name = !name && cur? cur->file: name;
-	binfile = r_bin_file_find_by_arch_bits (bin, arch, bits, name);
+	RBinFile *binfile = r_bin_file_find_by_arch_bits (bin, arch, bits, name);
 	if (binfile && name) {
 		obj = r_bin_object_find_by_arch_bits (binfile, arch, bits, name);
 	}
-	return binfile && r_bin_file_set_cur_binfile_obj (bin, binfile, obj);
+	return r_bin_file_set_cur_binfile_obj (bin, binfile, obj);
 }
 
-R_API int r_bin_select_object(RBinFile *binfile, const char *arch, int bits,
-			       const char *name) {
-	RBinObject *obj = binfile ? r_bin_object_find_by_arch_bits (
-					    binfile, arch, bits, name) :
-				    NULL;
-	return obj &&
-	       r_bin_file_set_cur_binfile_obj (binfile->rbin, binfile, obj);
-}
-
-static RBinObject *r_bin_file_object_find_by_id(RBinFile *binfile,
-						 ut32 binobj_id) {
-	RBinObject *obj;
-	RListIter *iter;
-	if (binfile)  {
-		r_list_foreach (binfile->objs, iter, obj) {
-			if (obj->id == binobj_id) {
-				return obj;
-			}
-		}
-	}
-	return NULL;
-}
-
-static RBinFile *r_bin_file_find_by_object_id(RBin *bin, ut32 binobj_id) {
-	RListIter *iter;
-	RBinFile *binfile;
-	r_list_foreach (bin->binfiles, iter, binfile) {
-		if (r_bin_file_object_find_by_id (binfile, binobj_id)) {
-			return binfile;
-		}
-	}
-	return NULL;
-}
-
-static RBinFile *r_bin_file_find_by_id(RBin *bin, ut32 binfile_id) {
-	RBinFile *binfile = NULL;
-	RListIter *iter = NULL;
-	r_list_foreach (bin->binfiles, iter, binfile) {
-		if (binfile->id == binfile_id) {
-			break;
-		}
-		binfile = NULL;
-	}
-	return binfile;
-}
-
-R_API int r_bin_object_delete(RBin *bin, ut32 binfile_id, ut32 binobj_id) {
-	RBinFile *binfile = NULL; //, *cbinfile = r_bin_cur (bin);
-	RBinObject *obj = NULL;
-	int res = false;
-
-	if (binfile_id == UT32_MAX) {
-		binfile = r_bin_file_find_by_object_id (bin, binobj_id);
-		obj = binfile? r_bin_file_object_find_by_id (binfile, binobj_id): NULL;
-	} else if (binobj_id == UT32_MAX) {
-		binfile = r_bin_file_find_by_id (bin, binfile_id);
-		obj = binfile? binfile->o: NULL;
-	} else {
-		binfile = r_bin_file_find_by_id (bin, binfile_id);
-		obj = binfile? r_bin_file_object_find_by_id (binfile, binobj_id): NULL;
-	}
-	if (binfile && bin->cur == binfile) {
-		bin->cur = NULL;
-	}
-
-	if (binfile) {
-		binfile->o = NULL;
-		r_list_delete_data (binfile->objs, obj);
-		RBinObject *newObj = (RBinObject *)r_list_get_n (binfile->objs, 0);
-		res = newObj && binfile &&
-		      r_bin_file_set_cur_binfile_obj (bin, binfile, newObj);
-	}
-	if (binfile && obj && r_list_length (binfile->objs) == 0) {
-		r_list_delete_data (bin->binfiles, binfile);
-	}
-	return res;
+R_API int r_bin_select_object(RBinFile *binfile, const char *arch, int bits, const char *name) {
+	RBinObject *obj = r_bin_object_find_by_arch_bits (binfile, arch, bits, name);
+	return r_bin_file_set_cur_binfile_obj (binfile->rbin, binfile, obj);
 }
 
 R_API int r_bin_select_by_ids(RBin *bin, ut32 binfile_id, ut32 binobj_id) {
@@ -2359,10 +1124,7 @@
 		binfile = r_bin_file_find_by_id (bin, binfile_id);
 		obj = binfile? r_bin_file_object_find_by_id (binfile, binobj_id): NULL;
 	}
-	if (!binfile || !obj) {
-		return false;
-	}
-	return obj && binfile && r_bin_file_set_cur_binfile_obj (bin, binfile, obj);
+	return r_bin_file_set_cur_binfile_obj (bin, binfile, obj);
 }
 
 R_API int r_bin_select_idx(RBin *bin, const char *name, int idx) {
@@ -2375,8 +1137,7 @@
 	}
 	nbinfile = r_bin_file_find_by_name_n (bin, tname, idx);
 	obj = nbinfile? r_list_get_n (nbinfile->objs, idx): NULL;
-	return obj && nbinfile &&
-	       r_bin_file_set_cur_binfile_obj (bin, nbinfile, obj);
+	return r_bin_file_set_cur_binfile_obj (bin, nbinfile, obj);
 }
 
 static void list_xtr_archs(RBin *bin, int mode) {
@@ -2554,6 +1315,7 @@
 	RBinObject *cur = r_bin_object_get_cur (bin);
 	return r_bin_get_section_at (cur, vaddr, true);
 }
+
 R_API void r_bin_bind(RBin *bin, RBinBind *b) {
 	if (b) {
 		b->bin = bin;
@@ -2768,7 +1530,7 @@
 
 /* returns vaddr, rebased with the baseaddr of binfile, if va is enabled for
  * bin, paddr otherwise */
-R_API ut64 r_binfile_get_vaddr(RBinFile *binfile, ut64 paddr, ut64 vaddr) {
+R_API ut64 r_bin_file_get_vaddr(RBinFile *binfile, ut64 paddr, ut64 vaddr) {
 	int use_va = 0;
 	if (binfile && binfile->o && binfile->o->info) {
 		use_va = binfile->o->info->has_va;
@@ -2779,12 +1541,15 @@
 /* returns vaddr, rebased with the baseaddr of bin, if va is enabled for bin,
  * paddr otherwise */
 R_API ut64 r_bin_get_vaddr(RBin *bin, ut64 paddr, ut64 vaddr) {
-	if (!bin || !bin->cur) {
+	if (!bin) {
 		return UT64_MAX;
 	}
 	if (paddr == UT64_MAX) {
 		return UT64_MAX;
 	}
+	if (!bin->cur) {
+		return paddr;
+	}
 	/* hack to realign thumb symbols */
 	if (bin->cur->o && bin->cur->o->info && bin->cur->o->info->arch) {
 		if (bin->cur->o->info->bits == 16) {
@@ -2797,7 +1562,7 @@
 			}
 		}
 	}
-	return r_binfile_get_vaddr (bin->cur, paddr, vaddr);
+	return r_bin_file_get_vaddr (bin->cur, paddr, vaddr);
 }
 
 R_API ut64 r_bin_a2b(RBin *bin, ut64 addr) {
@@ -2810,114 +1575,6 @@
 	return o ? o->size : 0;
 }
 
-R_API int r_bin_file_delete_all(RBin *bin) {
-	int counter = 0;
-	if (bin) {
-		counter = r_list_length (bin->binfiles);
-		r_list_purge (bin->binfiles);
-		bin->cur = NULL;
-	}
-	return counter;
-}
-
-R_API int r_bin_file_delete(RBin *bin, ut32 bin_fd) {
-	RListIter *iter;
-	RBinFile *bf;
-	RBinFile *cur = r_bin_cur (bin);
-	if (bin && cur) {
-		r_list_foreach (bin->binfiles, iter, bf) {
-			if (bf && bf->fd == bin_fd) {
-				if (cur->fd == bin_fd) {
-					//avoiding UaF due to dead reference
-					bin->cur = NULL;
-				}
-				r_list_delete (bin->binfiles, iter);
-				return 1;
-			}
-		}
-	}
-	return 0;
-}
-
-R_API RBinFile *r_bin_file_find_by_fd(RBin *bin, ut32 bin_fd) {
-	RListIter *iter;
-	RBinFile *bf;
-	if (bin) {
-		r_list_foreach (bin->binfiles, iter, bf) {
-			if (bf && bf->fd == bin_fd) {
-				return bf;
-			}
-		}
-	}
-	return NULL;
-}
-
-R_API RBinFile *r_bin_file_find_by_name(RBin *bin, const char *name) {
-	RListIter *iter;
-	RBinFile *bf = NULL;
-	if (!bin || !name) {
-		return NULL;
-	}
-	r_list_foreach (bin->binfiles, iter, bf) {
-		if (bf && bf->file && !strcmp (bf->file, name)) {
-			break;
-		}
-		bf = NULL;
-	}
-	return bf;
-}
-
-R_API RBinFile *r_bin_file_find_by_name_n(RBin *bin, const char *name, int idx) {
-	RListIter *iter;
-	RBinFile *bf = NULL;
-	int i = 0;
-	if (!bin) {
-		return bf;
-	}
-
-	r_list_foreach (bin->binfiles, iter, bf) {
-		if (bf && bf->file && !strcmp (bf->file, name)) {
-			if (i == idx) {
-				break;
-			}
-			i++;
-		}
-		bf = NULL;
-	}
-	return bf;
-}
-
-R_API int r_bin_file_set_cur_by_fd(RBin *bin, ut32 bin_fd) {
-	RBinFile *bf = r_bin_file_find_by_fd (bin, bin_fd);
-	return r_bin_file_set_cur_binfile (bin, bf);
-}
-
-R_API int r_bin_file_set_cur_binfile_obj(RBin *bin, RBinFile *bf, RBinObject *obj) {
-	RBinPlugin *plugin = NULL;
-	if (!bin || !bf || !obj) {
-		return false;
-	}
-	bin->file = bf->file;
-	bin->cur = bf;
-	bin->narch = bf->narch;
-	bf->o = obj;
-	plugin = r_bin_file_cur_plugin (bf);
-	if (bin->minstrlen < 1) {
-		bin->minstrlen = plugin? plugin->minstrlen: bin->minstrlen;
-	}
-	return true;
-}
-
-R_API int r_bin_file_set_cur_binfile(RBin *bin, RBinFile *bf) {
-	RBinObject *obj = bf? bf->o: NULL;
-	return obj? r_bin_file_set_cur_binfile_obj (bin, bf, obj): false;
-}
-
-R_API int r_bin_file_set_cur_by_name(RBin *bin, const char *name) {
-	RBinFile *bf = r_bin_file_find_by_name (bin, name);
-	return r_bin_file_set_cur_binfile (bin, bf);
-}
-
 R_API RBinFile *r_bin_cur(RBin *bin) {
 	return bin? bin->cur: NULL;
 }
@@ -2960,6 +1617,8 @@
 		return "fini";
 	case R_BIN_ENTRY_TYPE_TLS:
 		return "tls";
+	case R_BIN_ENTRY_TYPE_PREINIT:
+		return "preinit";
 	}
 	return NULL;
 }
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/aclui.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/aclui.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/aclui.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/aclui.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,8 +1,8 @@
-1=CreateSecurityPage
-5=EditConditionalAceClaims
-4=EditResourceCondition
-2=EditSecurity
-3=EditSecurityAdvanced
-6=GetLocalizedStringForCondition
-7=GetTlsIndexForClaimDictionary
-16=IID_ISecurityInformation
+1=CreateSecurityPage
+5=EditConditionalAceClaims
+4=EditResourceCondition
+2=EditSecurity
+3=EditSecurityAdvanced
+6=GetLocalizedStringForCondition
+7=GetTlsIndexForClaimDictionary
+16=IID_ISecurityInformation
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/activeds.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/activeds.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/activeds.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/activeds.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,29 +1,29 @@
-4=ADsBuildEnumerator
-8=ADsBuildVarArrayInt
-7=ADsBuildVarArrayStr
-24=ADsDecodeBinaryData
-20=ADsEncodeBinaryData
-6=ADsEnumerateNext
-5=ADsFreeEnumerator
-13=ADsGetLastError
-3=ADsGetObject
-9=ADsOpenObject
-12=ADsSetLastError
-23=AdsFreeAdsValues
-22=AdsTypeToPropVariant
-25=AdsTypeToPropVariant2
-14=AllocADsMem
-17=AllocADsStr
-29=BinarySDToSecurityDescriptor
-27=ConvertSecDescriptorToVariant
-28=ConvertSecurityDescriptorToSecDes
-31=ConvertTrusteeToSid
-10=DllCanUnloadNow
-11=DllGetClassObject
-15=FreeADsMem
-18=FreeADsStr
-21=PropVariantToAdsType
-26=PropVariantToAdsType2
-16=ReallocADsMem
-19=ReallocADsStr
-30=SecurityDescriptorToBinarySD
+4=ADsBuildEnumerator
+8=ADsBuildVarArrayInt
+7=ADsBuildVarArrayStr
+24=ADsDecodeBinaryData
+20=ADsEncodeBinaryData
+6=ADsEnumerateNext
+5=ADsFreeEnumerator
+13=ADsGetLastError
+3=ADsGetObject
+9=ADsOpenObject
+12=ADsSetLastError
+23=AdsFreeAdsValues
+22=AdsTypeToPropVariant
+25=AdsTypeToPropVariant2
+14=AllocADsMem
+17=AllocADsStr
+29=BinarySDToSecurityDescriptor
+27=ConvertSecDescriptorToVariant
+28=ConvertSecurityDescriptorToSecDes
+31=ConvertTrusteeToSid
+10=DllCanUnloadNow
+11=DllGetClassObject
+15=FreeADsMem
+18=FreeADsStr
+21=PropVariantToAdsType
+26=PropVariantToAdsType2
+16=ReallocADsMem
+19=ReallocADsStr
+30=SecurityDescriptorToBinarySD
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/atl.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/atl.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/atl.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/atl.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,54 +1,54 @@
-10=AtlAdvise
-41=AtlAxAttachControl
-39=AtlAxCreateControl
-40=AtlAxCreateControlEx
-38=AtlAxCreateDialogA
-37=AtlAxCreateDialogW
-36=AtlAxDialogBoxA
-35=AtlAxDialogBoxW
-47=AtlAxGetControl
-48=AtlAxGetHost
-42=AtlAxWinInit
-30=AtlComPtrAssign
-31=AtlComQIPtrAssign
-26=AtlCreateTargetDC
-29=AtlDevModeW2A
-12=AtlFreeMarshalStream
-54=AtlGetObjectSourceInterface
-34=AtlGetVersion
-27=AtlHiMetricToPixel
-52=AtlIPersistPropertyBag_Load
-53=AtlIPersistPropertyBag_Save
-60=AtlIPersistStreamInit_GetSizeMax
-50=AtlIPersistStreamInit_Load
-51=AtlIPersistStreamInit_Save
-32=AtlInternalQueryInterface
-13=AtlMarshalPtrInProc
-43=AtlModuleAddCreateWndData
-58=AtlModuleAddTermFunc
-44=AtlModuleExtractCreateWndData
-15=AtlModuleGetClassObject
-16=AtlModuleInit
-56=AtlModuleLoadTypeLib
-17=AtlModuleRegisterClassObjects
-18=AtlModuleRegisterServer
-19=AtlModuleRegisterTypeLib
-46=AtlModuleRegisterWndClassInfoA
-45=AtlModuleRegisterWndClassInfoW
-20=AtlModuleRevokeClassObjects
-21=AtlModuleTerm
-55=AtlModuleUnRegisterTypeLib
-22=AtlModuleUnregisterServer
-57=AtlModuleUnregisterServerEx
-23=AtlModuleUpdateRegistryFromResourceD
-28=AtlPixelToHiMetric
-49=AtlRegisterClassCategoriesHelper
-25=AtlSetErrorInfo
-59=AtlSetErrorInfo2
-11=AtlUnadvise
-14=AtlUnmarshalPtr
-24=AtlWaitWithMessageLoop
-33=DllCanUnloadNow
-61=DllGetClassObject
-62=DllRegisterServer
-63=DllUnregisterServer
+10=AtlAdvise
+41=AtlAxAttachControl
+39=AtlAxCreateControl
+40=AtlAxCreateControlEx
+38=AtlAxCreateDialogA
+37=AtlAxCreateDialogW
+36=AtlAxDialogBoxA
+35=AtlAxDialogBoxW
+47=AtlAxGetControl
+48=AtlAxGetHost
+42=AtlAxWinInit
+30=AtlComPtrAssign
+31=AtlComQIPtrAssign
+26=AtlCreateTargetDC
+29=AtlDevModeW2A
+12=AtlFreeMarshalStream
+54=AtlGetObjectSourceInterface
+34=AtlGetVersion
+27=AtlHiMetricToPixel
+52=AtlIPersistPropertyBag_Load
+53=AtlIPersistPropertyBag_Save
+60=AtlIPersistStreamInit_GetSizeMax
+50=AtlIPersistStreamInit_Load
+51=AtlIPersistStreamInit_Save
+32=AtlInternalQueryInterface
+13=AtlMarshalPtrInProc
+43=AtlModuleAddCreateWndData
+58=AtlModuleAddTermFunc
+44=AtlModuleExtractCreateWndData
+15=AtlModuleGetClassObject
+16=AtlModuleInit
+56=AtlModuleLoadTypeLib
+17=AtlModuleRegisterClassObjects
+18=AtlModuleRegisterServer
+19=AtlModuleRegisterTypeLib
+46=AtlModuleRegisterWndClassInfoA
+45=AtlModuleRegisterWndClassInfoW
+20=AtlModuleRevokeClassObjects
+21=AtlModuleTerm
+55=AtlModuleUnRegisterTypeLib
+22=AtlModuleUnregisterServer
+57=AtlModuleUnregisterServerEx
+23=AtlModuleUpdateRegistryFromResourceD
+28=AtlPixelToHiMetric
+49=AtlRegisterClassCategoriesHelper
+25=AtlSetErrorInfo
+59=AtlSetErrorInfo2
+11=AtlUnadvise
+14=AtlUnmarshalPtr
+24=AtlWaitWithMessageLoop
+33=DllCanUnloadNow
+61=DllGetClassObject
+62=DllRegisterServer
+63=DllUnregisterServer
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/borlndmm.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/borlndmm.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/borlndmm.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/borlndmm.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,15 +1,15 @@
-15=@Borlndmm@HeapAddRef$qqrv
-14=@Borlndmm@HeapRelease$qqrv
-10=@Borlndmm@SysAllocMem$qqri
-12=@Borlndmm@SysFreeMem$qqrpv
-13=@Borlndmm@SysGetMem$qqri
-11=@Borlndmm@SysReallocMem$qqrpvi
-9=@Borlndmm@SysRegisterExpectedMemoryLeak$qqrpi
-8=@Borlndmm@SysUnregisterExpectedMemoryLeak$qqrpi
-4=DumpBlocks
-6=FreeMemory
-2=GetAllocMemCount
-1=GetAllocMemSize
-3=GetHeapStatus
-7=GetMemory
-5=ReallocMemory
+15=@Borlndmm@HeapAddRef$qqrv
+14=@Borlndmm@HeapRelease$qqrv
+10=@Borlndmm@SysAllocMem$qqri
+12=@Borlndmm@SysFreeMem$qqrpv
+13=@Borlndmm@SysGetMem$qqri
+11=@Borlndmm@SysReallocMem$qqrpvi
+9=@Borlndmm@SysRegisterExpectedMemoryLeak$qqrpi
+8=@Borlndmm@SysUnregisterExpectedMemoryLeak$qqrpi
+4=DumpBlocks
+6=FreeMemory
+2=GetAllocMemCount
+1=GetAllocMemSize
+3=GetHeapStatus
+7=GetMemory
+5=ReallocMemory
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/browseui.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/browseui.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/browseui.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/browseui.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,3 +1,3 @@
-104=DllCanUnloadNow
-108=DllGetClassObject
-109=DllGetVersion
+104=DllCanUnloadNow
+108=DllGetClassObject
+109=DllGetVersion
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/comctl32.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/comctl32.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/comctl32.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/comctl32.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,118 +1,118 @@
-401=AddMRUStringW
-400=CreateMRUListW
-8=CreateMappedBitmap
-12=CreatePropertySheetPage
-18=CreatePropertySheetPageA
-19=CreatePropertySheetPageW
-20=CreateStatusWindow
-6=CreateStatusWindowA
-21=CreateStatusWindowW
-7=CreateToolbar
-22=CreateToolbarEx
-16=CreateUpDownControl
-331=DPA_Clone
-328=DPA_Create
-340=DPA_CreateEx
-337=DPA_DeleteAllPtrs
-336=DPA_DeletePtr
-329=DPA_Destroy
-386=DPA_DestroyCallback
-385=DPA_EnumCallback
-332=DPA_GetPtr
-333=DPA_GetPtrIndex
-330=DPA_Grow
-334=DPA_InsertPtr
-9=DPA_LoadStream
-11=DPA_Merge
-10=DPA_SaveStream
-339=DPA_Search
-335=DPA_SetPtr
-338=DPA_Sort
-320=DSA_Create
-327=DSA_DeleteAllItems
-326=DSA_DeleteItem
-321=DSA_Destroy
-388=DSA_DestroyCallback
-387=DSA_EnumCallback
-322=DSA_GetItem
-323=DSA_GetItemPtr
-324=DSA_InsertItem
-325=DSA_SetItem
-413=DefSubclassProc
-23=DestroyPropertySheetPage
-24=DllGetVersion
-15=DrawInsert
-25=DrawStatusText
-5=DrawStatusTextA
-26=DrawStatusTextW
-403=EnumMRUListW
-27=FlatSB_EnableScrollBar
-28=FlatSB_GetScrollInfo
-29=FlatSB_GetScrollPos
-30=FlatSB_GetScrollProp
-31=FlatSB_GetScrollRange
-32=FlatSB_SetScrollInfo
-33=FlatSB_SetScrollPos
-34=FlatSB_SetScrollProp
-35=FlatSB_SetScrollRange
-36=FlatSB_ShowScrollBar
-152=FreeMRUList
-4=GetEffectiveClientRect
-37=GetMUILanguage
-38=ImageList_Add
-39=ImageList_AddIcon
-40=ImageList_AddMasked
-41=ImageList_BeginDrag
-42=ImageList_Copy
-43=ImageList_Create
-44=ImageList_Destroy
-45=ImageList_DragEnter
-46=ImageList_DragLeave
-47=ImageList_DragMove
-48=ImageList_DragShowNolock
-49=ImageList_Draw
-50=ImageList_DrawEx
-51=ImageList_DrawIndirect
-52=ImageList_Duplicate
-53=ImageList_EndDrag
-54=ImageList_GetBkColor
-55=ImageList_GetDragImage
-56=ImageList_GetFlags
-57=ImageList_GetIcon
-58=ImageList_GetIconSize
-59=ImageList_GetImageCount
-60=ImageList_GetImageInfo
-61=ImageList_GetImageRect
-62=ImageList_LoadImage
-63=ImageList_LoadImageA
-64=ImageList_LoadImageW
-65=ImageList_Merge
-66=ImageList_Read
-67=ImageList_Remove
-68=ImageList_Replace
-69=ImageList_ReplaceIcon
-70=ImageList_SetBkColor
-75=ImageList_SetDragCursorImage
-76=ImageList_SetFilter
-77=ImageList_SetFlags
-78=ImageList_SetIconSize
-79=ImageList_SetImageCount
-80=ImageList_SetOverlayImage
-81=ImageList_Write
-17=InitCommonControls
-82=InitCommonControlsEx
-83=InitMUILanguage
-84=InitializeFlatSB
-14=LBItemFromPt
-13=MakeDragList
-2=MenuHelp
-85=PropertySheet
-86=PropertySheetA
-87=PropertySheetW
-88=RegisterClassNameW
-412=RemoveWindowSubclass
-410=SetWindowSubclass
-3=ShowHideMenuCtl
-236=Str_SetPtrW
-89=UninitializeFlatSB
-90=_TrackMouseEvent
+401=AddMRUStringW
+400=CreateMRUListW
+8=CreateMappedBitmap
+12=CreatePropertySheetPage
+18=CreatePropertySheetPageA
+19=CreatePropertySheetPageW
+20=CreateStatusWindow
+6=CreateStatusWindowA
+21=CreateStatusWindowW
+7=CreateToolbar
+22=CreateToolbarEx
+16=CreateUpDownControl
+331=DPA_Clone
+328=DPA_Create
+340=DPA_CreateEx
+337=DPA_DeleteAllPtrs
+336=DPA_DeletePtr
+329=DPA_Destroy
+386=DPA_DestroyCallback
+385=DPA_EnumCallback
+332=DPA_GetPtr
+333=DPA_GetPtrIndex
+330=DPA_Grow
+334=DPA_InsertPtr
+9=DPA_LoadStream
+11=DPA_Merge
+10=DPA_SaveStream
+339=DPA_Search
+335=DPA_SetPtr
+338=DPA_Sort
+320=DSA_Create
+327=DSA_DeleteAllItems
+326=DSA_DeleteItem
+321=DSA_Destroy
+388=DSA_DestroyCallback
+387=DSA_EnumCallback
+322=DSA_GetItem
+323=DSA_GetItemPtr
+324=DSA_InsertItem
+325=DSA_SetItem
+413=DefSubclassProc
+23=DestroyPropertySheetPage
+24=DllGetVersion
+15=DrawInsert
+25=DrawStatusText
+5=DrawStatusTextA
+26=DrawStatusTextW
+403=EnumMRUListW
+27=FlatSB_EnableScrollBar
+28=FlatSB_GetScrollInfo
+29=FlatSB_GetScrollPos
+30=FlatSB_GetScrollProp
+31=FlatSB_GetScrollRange
+32=FlatSB_SetScrollInfo
+33=FlatSB_SetScrollPos
+34=FlatSB_SetScrollProp
+35=FlatSB_SetScrollRange
+36=FlatSB_ShowScrollBar
+152=FreeMRUList
+4=GetEffectiveClientRect
+37=GetMUILanguage
+38=ImageList_Add
+39=ImageList_AddIcon
+40=ImageList_AddMasked
+41=ImageList_BeginDrag
+42=ImageList_Copy
+43=ImageList_Create
+44=ImageList_Destroy
+45=ImageList_DragEnter
+46=ImageList_DragLeave
+47=ImageList_DragMove
+48=ImageList_DragShowNolock
+49=ImageList_Draw
+50=ImageList_DrawEx
+51=ImageList_DrawIndirect
+52=ImageList_Duplicate
+53=ImageList_EndDrag
+54=ImageList_GetBkColor
+55=ImageList_GetDragImage
+56=ImageList_GetFlags
+57=ImageList_GetIcon
+58=ImageList_GetIconSize
+59=ImageList_GetImageCount
+60=ImageList_GetImageInfo
+61=ImageList_GetImageRect
+62=ImageList_LoadImage
+63=ImageList_LoadImageA
+64=ImageList_LoadImageW
+65=ImageList_Merge
+66=ImageList_Read
+67=ImageList_Remove
+68=ImageList_Replace
+69=ImageList_ReplaceIcon
+70=ImageList_SetBkColor
+75=ImageList_SetDragCursorImage
+76=ImageList_SetFilter
+77=ImageList_SetFlags
+78=ImageList_SetIconSize
+79=ImageList_SetImageCount
+80=ImageList_SetOverlayImage
+81=ImageList_Write
+17=InitCommonControls
+82=InitCommonControlsEx
+83=InitMUILanguage
+84=InitializeFlatSB
+14=LBItemFromPt
+13=MakeDragList
+2=MenuHelp
+85=PropertySheet
+86=PropertySheetA
+87=PropertySheetW
+88=RegisterClassNameW
+412=RemoveWindowSubclass
+410=SetWindowSubclass
+3=ShowHideMenuCtl
+236=Str_SetPtrW
+89=UninitializeFlatSB
+90=_TrackMouseEvent
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/dsound.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/dsound.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/dsound.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/dsound.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,12 +1,12 @@
-6=DirectSoundCaptureCreate
-12=DirectSoundCaptureCreate8
-7=DirectSoundCaptureEnumerateA
-8=DirectSoundCaptureEnumerateW
-1=DirectSoundCreate
-11=DirectSoundCreate8
-2=DirectSoundEnumerateA
-3=DirectSoundEnumerateW
-10=DirectSoundFullDuplexCreate
-4=DllCanUnloadNow
-5=DllGetClassObject
-9=GetDeviceID
+6=DirectSoundCaptureCreate
+12=DirectSoundCaptureCreate8
+7=DirectSoundCaptureEnumerateA
+8=DirectSoundCaptureEnumerateW
+1=DirectSoundCreate
+11=DirectSoundCreate8
+2=DirectSoundEnumerateA
+3=DirectSoundEnumerateW
+10=DirectSoundFullDuplexCreate
+4=DllCanUnloadNow
+5=DllGetClassObject
+9=GetDeviceID
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/mfc120.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/mfc120.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/mfc120.sdb.txt	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/mfc120.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,13242 @@
+266 delete
+317 _AFX_D2D_STATE::_AFX_D2D_STATE
+318 _AFX_THREAD_STATE::_AFX_THREAD_STATE
+319 AFX_DDPDATA::AFX_DDPDATA
+320 AFX_EXCEPTION_LINK::AFX_EXCEPTION_LINK
+321 AFX_GLOBAL_DATA::AFX_GLOBAL_DATA
+322 AFX_MAINTAIN_STATE::AFX_MAINTAIN_STATE
+323 AFX_MAINTAIN_STATE2::AFX_MAINTAIN_STATE2
+325 AFX_MODULE_THREAD_STATE::AFX_MODULE_THREAD_STATE
+327 CAnimationBaseObject::CAnimationBaseObject
+329 CAnimationColor::CAnimationColor
+330 CAnimationController::CAnimationController
+331 CAnimationGroup::CAnimationGroup
+333 CAnimationPoint::CAnimationPoint
+337 CAnimationRect::CAnimationRect
+339 CAnimationSize::CAnimationSize
+341 CAnimationValue::CAnimationValue
+342 CAnimationVariable::CAnimationVariable
+343 CAppDestinations::CAppDestinations
+344 CAppDestinations::CAppDestinations
+345 CArchive::CArchive
+346 CArchivePropExchange::CArchivePropExchange
+347 CArchiveStream::CArchiveStream
+348 CAsyncMonikerFile::CAsyncMonikerFile
+349 CAsyncPropExchange::CAsyncPropExchange
+350 CAsyncSocket::CAsyncSocket
+351 CAutoHideDockSite::CAutoHideDockSite
+352 CBasePane::CBasePane
+353 CBaseTabbedPane::CBaseTabbedPane
+354 CBlobProperty::CBlobProperty
+355 CBrowserControlSite::CBrowserControlSite
+356 CBrush::CBrush
+357 CBrush::CBrush
+358 CBrush::CBrush
+359 CByteArray::CByteArray
+360 CChevronOwnerDrawMenu::CChevronOwnerDrawMenu
+361 CClientDC::CClientDC
+362 CCmdTarget::CCmdTarget
+363 CCmdUI::CCmdUI
+364 CColorDialog::CColorDialog
+365 CCommandLineInfo::CCommandLineInfo
+366 CCommandManager::CCommandManager
+367 CConnectionPoint::CConnectionPoint
+368 CContextMenuManager::CContextMenuManager
+369 CControlBar::CControlBar
+370 CControlBarInfo::CControlBarInfo
+371 CControlCreationInfo::CControlCreationInfo
+372 COleControl::CControlDataSource::CControlDataSource
+373 CControlFrameWnd::CControlFrameWnd
+374 CControlSiteFactoryMgr::CControlSiteFactoryMgr
+375 CCtrlView::CCtrlView
+376 CD2DBitmap::CD2DBitmap
+377 CD2DBitmap::CD2DBitmap
+378 CD2DBitmap::CD2DBitmap
+379 CD2DBitmap::CD2DBitmap
+380 CD2DBitmapBrush::CD2DBitmapBrush
+381 CD2DBitmapBrush::CD2DBitmapBrush
+382 CD2DBitmapBrush::CD2DBitmapBrush
+383 CD2DBrush::CD2DBrush
+384 CD2DBrushProperties::CD2DBrushProperties
+385 CD2DBrushProperties::CD2DBrushProperties
+386 CD2DBrushProperties::CD2DBrushProperties
+387 CD2DEllipse::CD2DEllipse
+388 CD2DEllipse::CD2DEllipse
+389 CD2DEllipse::CD2DEllipse
+390 CD2DEllipse::CD2DEllipse
+391 CD2DGeometry::CD2DGeometry
+392 CD2DGeometrySink::CD2DGeometrySink
+393 CD2DGradientBrush::CD2DGradientBrush
+394 CD2DLayer::CD2DLayer
+395 CD2DLinearGradientBrush::CD2DLinearGradientBrush
+396 CD2DMesh::CD2DMesh
+397 CD2DPathGeometry::CD2DPathGeometry
+398 CD2DPointF::CD2DPointF
+399 CD2DPointF::CD2DPointF
+400 CD2DPointF::CD2DPointF
+401 CD2DPointF::CD2DPointF
+402 CD2DPointF::CD2DPointF
+403 CD2DPointF::CD2DPointF
+404 CD2DPointU::CD2DPointU
+405 CD2DPointU::CD2DPointU
+406 CD2DRadialGradientBrush::CD2DRadialGradientBrush
+407 CD2DRectF::CD2DRectF
+408 CD2DRectF::CD2DRectF
+409 CD2DRectF::CD2DRectF
+410 CD2DRectF::CD2DRectF
+411 CD2DRectF::CD2DRectF
+412 CD2DRectF::CD2DRectF
+413 CD2DRectU::CD2DRectU
+414 CD2DRectU::CD2DRectU
+415 CD2DResource::CD2DResource
+416 CD2DRoundedRect::CD2DRoundedRect
+417 CD2DRoundedRect::CD2DRoundedRect
+418 CD2DRoundedRect::CD2DRoundedRect
+419 CD2DPointF::CD2DPointF
+420 CD2DPointF::CD2DPointF
+421 CD2DPointF::CD2DPointF
+422 CD2DPointF::CD2DPointF
+423 CD2DPointF::CD2DPointF
+424 CD2DPointF::CD2DPointF
+425 CD2DPointU::CD2DPointU
+426 CD2DPointU::CD2DPointU
+427 CD2DSolidColorBrush::CD2DSolidColorBrush
+429 CD2DTextFormat::CD2DTextFormat
+430 CD2DTextLayout::CD2DTextLayout
+431 CDatabase::CDatabase
+432 CDataBoundProperty::CDataBoundProperty
+433 CDataExchange::CDataExchange
+434 CDataRecoveryHandler::CDataRecoveryHandler
+435 CDataSourceControl::CDataSourceControl
+436 CDBException::CDBException
+437 CDBVariant::CDBVariant
+438 CDC::CDC
+439 CDCRenderTarget::CDCRenderTarget
+440 CDHtmlControlSink::CDHtmlControlSink
+441 CDHtmlControlSink::CDHtmlControlSink
+442 CDHtmlDialog::CDHtmlDialog
+443 CDHtmlDialog::CDHtmlDialog
+444 CDHtmlDialog::CDHtmlDialog
+445 CDHtmlElementEventSink::CDHtmlElementEventSink
+446 CDialog::CDialog
+447 CDialog::CDialog
+448 CDialog::CDialog
+449 CDialogBar::CDialogBar
+450 CDialogEx::CDialogEx
+451 CDialogEx::CDialogEx
+452 CDialogEx::CDialogEx
+453 CDialogImpl::CDialogImpl
+454 CDialogTemplate::CDialogTemplate
+455 CDialogTemplate::CDialogTemplate
+456 CDocItem::CDocItem
+457 CDockablePane::CDockablePane
+458 CDockablePaneAdapter::CDockablePaneAdapter
+459 CDockBar::CDockBar
+460 CDockContext::CDockContext
+461 CDockingManager::CDockingManager
+462 CDockingPanesRow::CDockingPanesRow
+463 CDockSite::CDockSite
+464 CDockState::CDockState
+465 CDocManager::CDocManager
+466 CDocObjectServer::CDocObjectServer
+467 CDocObjectServerItem::CDocObjectServerItem
+468 CDocTemplate::CDocTemplate
+469 CDocument::CDocument
+470 CDrawingManager::CDrawingManager
+471 CDumpContext::CDumpContext
+472 CDWordArray::CDWordArray
+473 CDynLinkLibrary::CDynLinkLibrary
+474 CDynLinkLibrary::CDynLinkLibrary
+475 CEditView::CEditView
+476 CEnumArray::CEnumArray
+477 CEnumConnections::CEnumConnections
+478 CEnumConnPoints::CEnumConnPoints
+479 CEnumFormatEtc::CEnumFormatEtc
+480 CEvent::CEvent
+481 CException::CException
+482 CException::CException
+483 CFieldExchange::CFieldExchange
+484 CFile::CFile
+485 CFile::CFile
+486 CFile::CFile
+487 CFile::CFile
+488 CFile::CFile
+489 CFileDialog::CFileDialog
+490 CFileFind::CFileFind
+491 CFileFind::CFileFind
+492 CFindReplaceDialog::CFindReplaceDialog
+493 CFixedAlloc::CFixedAlloc
+494 CFixedAllocNoSync::CFixedAllocNoSync
+495 CFolderPickerDialog::CFolderPickerDialog
+496 CFontDialog::CFontDialog
+497 CFontDialog::CFontDialog
+498 CFontHolder::CFontHolder
+499 CFormView::CFormView
+500 CFormView::CFormView
+501 CFrameImpl::CFrameImpl
+502 CFrameWnd::CFrameWnd
+503 CFrameWndEx::CFrameWndEx
+504 CFtpConnection::CFtpConnection
+505 CFtpConnection::CFtpConnection
+506 CFtpFileFind::CFtpFileFind
+507 CFullScreenImpl::CFullScreenImpl
+508 CGestureConfig::CGestureConfig
+509 CGlobalUtils::CGlobalUtils
+510 CGopherConnection::CGopherConnection
+511 CGopherConnection::CGopherConnection
+512 CGopherFile::CGopherFile
+513 CGopherFile::CGopherFile
+514 CGopherFileFind::CGopherFileFind
+515 CGopherLocator::CGopherLocator
+517 CHtmlControlSite::CHtmlControlSite
+518 CHtmlEditCtrl::CHtmlEditCtrl
+519 CHtmlEditDoc::CHtmlEditDoc
+520 CHtmlEditView::CHtmlEditView
+521 CHtmlView::CHtmlView
+522 CHttpConnection::CHttpConnection
+523 CHttpConnection::CHttpConnection
+524 CHttpConnection::CHttpConnection
+525 CHttpFile::CHttpFile
+526 CHttpFile::CHttpFile
+527 CHwndRenderTarget::CHwndRenderTarget
+528 CImageList::CImageList
+529 CInternetConnection::CInternetConnection
+530 CInternetException::CInternetException
+531 CInternetFile::CInternetFile
+532 CInternetFile::CInternetFile
+533 CInternetSession::CInternetSession
+534 CJumpList::CJumpList
+535 CKeyboardManager::CKeyboardManager
+536 CKeyFrame::CKeyFrame
+537 CKeyFrame::CKeyFrame
+538 CLongBinary::CLongBinary
+539 CMapPtrToPtr::CMapPtrToPtr
+540 CMapPtrToWord::CMapPtrToWord
+541 CMapStringToOb::CMapStringToOb
+542 CMapStringToPtr::CMapStringToPtr
+543 CMapStringToString::CMapStringToString
+544 CMapWordToOb::CMapWordToOb
+545 CMapWordToPtr::CMapWordToPtr
+546 CMDIChildWnd::CMDIChildWnd
+547 CMDIChildWndEx::CMDIChildWndEx
+548 CMDIClientAreaWnd::CMDIClientAreaWnd
+549 CMDIFrameWnd::CMDIFrameWnd
+550 CMDIFrameWndEx::CMDIFrameWndEx
+551 CMDITabInfo::CMDITabInfo
+552 CMDITabProxyWnd::CMDITabProxyWnd
+553 CMemDC::CMemDC
+554 CMemDC::CMemDC
+555 CMemFile::CMemFile
+556 CMemFile::CMemFile
+557 CMenuHash::CMenuHash
+558 CMenuTearOffManager::CMenuTearOffManager
+559 CMetaFileDC::CMetaFileDC
+560 CMFCAcceleratorKey::CMFCAcceleratorKey
+561 CMFCAcceleratorKey::CMFCAcceleratorKey
+562 CMFCAcceleratorKeyAssignCtrl::CMFCAcceleratorKeyAssignCtrl
+563 CMFCAutoHideBar::CMFCAutoHideBar
+564 CMFCAutoHideButton::CMFCAutoHideButton
+565 CMFCBaseTabCtrl::CMFCBaseTabCtrl
+566 CMFCBaseToolBar::CMFCBaseToolBar
+567 CMFCBaseVisualManager::CMFCBaseVisualManager
+568 CMFCButton::CMFCButton
+569 CMFCCaptionBar::CMFCCaptionBar
+570 CMFCCaptionButton::CMFCCaptionButton
+571 CMFCCaptionButton::CMFCCaptionButton
+572 CMFCCaptionButtonEx::CMFCCaptionButtonEx
+573 CMFCCaptionMenuButton::CMFCCaptionMenuButton
+574 CMFCCaptionMenuButton::CMFCCaptionMenuButton
+575 CMFCCmdUsageCount::CMFCCmdUsageCount
+576 CMFCColorBar::CMFCColorBar
+577 CMFCColorBar::CMFCColorBar
+578 CMFCColorBar::CMFCColorBar
+579 CMFCColorBar::CMFCColorBar
+580 CMFCColorBarCmdUI::CMFCColorBarCmdUI
+581 CMFCColorButton::CMFCColorButton
+582 CMFCColorDialog::CMFCColorDialog
+583 CMFCColorMenuButton::CMFCColorMenuButton
+584 CMFCColorMenuButton::CMFCColorMenuButton
+585 CMFCColorPickerCtrl::CMFCColorPickerCtrl
+586 CMFCColorPropertySheet::CMFCColorPropertySheet
+587 CMFCColorPropertySheet::CMFCColorPropertySheet
+588 CMFCControlBarImpl::CMFCControlBarImpl
+589 CMFCControlContainer::CMFCControlContainer
+590 CMFCControlRenderer::CMFCControlRenderer
+591 CMFCControlRendererInfo::CMFCControlRendererInfo
+592 CMFCControlRendererInfo::CMFCControlRendererInfo
+593 CMFCControlRendererInfo::CMFCControlRendererInfo
+594 CMFCControlRendererInfo::CMFCControlRendererInfo
+595 CMFCControlRendererInfo::CMFCControlRendererInfo
+596 CMFCControlRendererInfo::CMFCControlRendererInfo
+597 CMFCCustomColorsPropertyPage::CMFCCustomColorsPropertyPage
+598 CMFCCustomizeButton::CMFCCustomizeButton
+599 CMFCCustomizeButton::CMFCCustomizeButton
+600 CMFCCustomizeMenuButton::CMFCCustomizeMenuButton
+601 CMFCCustomizeMenuButton::CMFCCustomizeMenuButton
+602 CMFCDesktopAlertDialog::CMFCDesktopAlertDialog
+603 CMFCDesktopAlertWnd::CMFCDesktopAlertWnd
+604 CMFCDragFrameImpl::CMFCDragFrameImpl
+605 CMFCDropDownFrame::CMFCDropDownFrame
+606 CMFCDropDownListBox::CMFCDropDownListBox
+607 CMFCDropDownListBox::CMFCDropDownListBox
+608 CMFCDropDownListBox::CMFCDropDownListBox
+609 CMFCDropDownToolbarButton::CMFCDropDownToolbarButton
+610 CMFCDropDownToolbarButton::CMFCDropDownToolbarButton
+611 CMFCEditBrowseCtrl::CMFCEditBrowseCtrl
+612 CMFCFilterChunkValueImpl::CMFCFilterChunkValueImpl
+613 CMFCFontComboBox::CMFCFontComboBox
+614 CMFCHeaderCtrl::CMFCHeaderCtrl
+615 CMFCImageEditorDialog::CMFCImageEditorDialog
+616 CMFCImagePaintArea::CMFCImagePaintArea
+617 CMFCKeyMapDialog::CMFCKeyMapDialog
+618 CMFCLinkCtrl::CMFCLinkCtrl
+619 CMFCListCtrl::CMFCListCtrl
+620 CMFCMaskedEdit::CMFCMaskedEdit
+621 CMFCMenuBar::CMFCMenuBar
+622 CMFCMenuButton::CMFCMenuButton
+623 CMFCMousePropertyPage::CMFCMousePropertyPage
+624 CMFCOutlookBar::CMFCOutlookBar
+625 CMFCOutlookBarPane::CMFCOutlookBarPane
+626 CMFCOutlookBarPaneAdapter::CMFCOutlookBarPaneAdapter
+627 CMFCOutlookBarPaneButton::CMFCOutlookBarPaneButton
+628 CMFCOutlookBarTabCtrl::CMFCOutlookBarTabCtrl
+629 CMFCOutlookBarToolBar::CMFCOutlookBarToolBar
+630 CMFCPopupMenu::CMFCPopupMenu
+631 CMFCPopupMenu::CMFCPopupMenu
+632 CMFCPopupMenuBar::CMFCPopupMenuBar
+633 CMFCPreviewCtrlImpl::CMFCPreviewCtrlImpl
+634 CMFCPropertyGridColorProperty::CMFCPropertyGridColorProperty
+635 CMFCPropertyGridCtrl::CMFCPropertyGridCtrl
+636 CMFCPropertyGridFileProperty::CMFCPropertyGridFileProperty
+637 CMFCPropertyGridFileProperty::CMFCPropertyGridFileProperty
+638 CMFCPropertyGridFontProperty::CMFCPropertyGridFontProperty
+639 CMFCPropertyGridProperty::CMFCPropertyGridProperty
+640 CMFCPropertyGridProperty::CMFCPropertyGridProperty
+641 CMFCPropertyGridToolTipCtrl::CMFCPropertyGridToolTipCtrl
+642 CMFCPropertyPage::CMFCPropertyPage
+643 CMFCPropertyPage::CMFCPropertyPage
+644 CMFCPropertyPage::CMFCPropertyPage
+645 CMFCPropertySheet::CMFCPropertySheet
+646 CMFCPropertySheet::CMFCPropertySheet
+647 CMFCPropertySheet::CMFCPropertySheet
+648 CMFCPropertySheetCategoryInfo::CMFCPropertySheetCategoryInfo
+649 CMFCPropertySheetTabCtrl::CMFCPropertySheetTabCtrl
+651 CMFCReBar::CMFCReBar
+652 CMFCRibbonBar::CMFCRibbonBar
+653 CMFCRibbonBaseElement::CMFCRibbonBaseElement
+654 CMFCRibbonButton::CMFCRibbonButton
+655 CMFCRibbonButton::CMFCRibbonButton
+656 CMFCRibbonButton::CMFCRibbonButton
+657 CMFCRibbonButtonsGroup::CMFCRibbonButtonsGroup
+658 CMFCRibbonButtonsGroup::CMFCRibbonButtonsGroup
+659 CMFCRibbonCaptionButton::CMFCRibbonCaptionButton
+660 CMFCRibbonCategory::CMFCRibbonCategory
+661 CMFCRibbonCategory::CMFCRibbonCategory
+662 CMFCRibbonCheckBox::CMFCRibbonCheckBox
+663 CMFCRibbonCheckBox::CMFCRibbonCheckBox
+664 CMFCRibbonCmdUI::CMFCRibbonCmdUI
+665 CMFCRibbonCollector::CMFCRibbonCollector
+666 CMFCRibbonColorButton::CMFCRibbonColorButton
+667 CMFCRibbonColorButton::CMFCRibbonColorButton
+668 CMFCRibbonColorButton::CMFCRibbonColorButton
+669 CMFCRibbonComboBox::CMFCRibbonComboBox
+670 CMFCRibbonComboBox::CMFCRibbonComboBox
+671 CMFCRibbonCommandsListBox::CMFCRibbonCommandsListBox
+672 CMFCRibbonConstructor::CMFCRibbonConstructor
+673 CMFCRibbonContextCaption::CMFCRibbonContextCaption
+674 CMFCRibbonContextCaption::CMFCRibbonContextCaption
+675 CMFCRibbonCustomizeDialog::CMFCRibbonCustomizeDialog
+676 CMFCRibbonCustomizePropertyPage::CMFCRibbonCustomizePropertyPage
+677 CMFCRibbonDefaultPanelButton::CMFCRibbonDefaultPanelButton
+678 CMFCRibbonEdit::CMFCRibbonEdit
+679 CMFCRibbonEdit::CMFCRibbonEdit
+680 CMFCRibbonFontComboBox::CMFCRibbonFontComboBox
+681 CMFCRibbonFontComboBox::CMFCRibbonFontComboBox
+682 CMFCRibbonGallery::CMFCRibbonGallery
+683 CMFCRibbonGallery::CMFCRibbonGallery
+684 CMFCRibbonGallery::CMFCRibbonGallery
+685 CMFCRibbonGallery::CMFCRibbonGallery
+686 CMFCRibbonGalleryIcon::CMFCRibbonGalleryIcon
+687 CMFCRibbonGalleryMenuButton::CMFCRibbonGalleryMenuButton
+688 CMFCRibbonGalleryMenuButton::CMFCRibbonGalleryMenuButton
+689 CMFCRibbonGalleryMenuButton::CMFCRibbonGalleryMenuButton
+690 CMFCRibbonInfo::CMFCRibbonInfo
+691 CMFCRibbonInfoLoader::CMFCRibbonInfoLoader
+692 CMFCRibbonKeyboardCustomizeDialog::CMFCRibbonKeyboardCustomizeDialog
+693 CMFCRibbonKeyTip::CMFCRibbonKeyTip
+694 CMFCRibbonLabel::CMFCRibbonLabel
+695 CMFCRibbonLabel::CMFCRibbonLabel
+696 CMFCRibbonLaunchButton::CMFCRibbonLaunchButton
+697 CMFCRibbonLinkCtrl::CMFCRibbonLinkCtrl
+698 CMFCRibbonLinkCtrl::CMFCRibbonLinkCtrl
+699 CMFCRibbonMainPanel::CMFCRibbonMainPanel
+700 CMFCRibbonMainPanelButton::CMFCRibbonMainPanelButton
+701 CMFCRibbonMainPanelButton::CMFCRibbonMainPanelButton
+702 CMFCRibbonMainPanelButton::CMFCRibbonMainPanelButton
+703 CMFCRibbonMiniToolBar::CMFCRibbonMiniToolBar
+704 CMFCRibbonPanel::CMFCRibbonPanel
+705 CMFCRibbonPanel::CMFCRibbonPanel
+706 CMFCRibbonPanelMenu::CMFCRibbonPanelMenu
+707 CMFCRibbonPanelMenu::CMFCRibbonPanelMenu
+708 CMFCRibbonPanelMenu::CMFCRibbonPanelMenu
+709 CMFCRibbonPanelMenu::CMFCRibbonPanelMenu
+710 CMFCRibbonPanelMenu::CMFCRibbonPanelMenu
+711 CMFCRibbonPanelMenuBar::CMFCRibbonPanelMenuBar
+712 CMFCRibbonPanelMenuBar::CMFCRibbonPanelMenuBar
+713 CMFCRibbonPanelMenuBar::CMFCRibbonPanelMenuBar
+714 CMFCRibbonPanelMenuBar::CMFCRibbonPanelMenuBar
+715 CMFCRibbonPanelMenuBar::CMFCRibbonPanelMenuBar
+716 CMFCRibbonProgressBar::CMFCRibbonProgressBar
+717 CMFCRibbonProgressBar::CMFCRibbonProgressBar
+718 CMFCRibbonQuickAccessToolBar::CMFCRibbonQuickAccessToolBar
+719 CMFCRibbonQuickAccessToolBarDefaultState::CMFCRibbonQuickAccessToolBarDefaultState
+720 CMFCRibbonRichEditCtrl::CMFCRibbonRichEditCtrl
+721 CMFCRibbonSeparator::CMFCRibbonSeparator
+722 CMFCRibbonSlider::CMFCRibbonSlider
+723 CMFCRibbonSlider::CMFCRibbonSlider
+724 CMFCRibbonStatusBar::CMFCRibbonStatusBar
+725 CMFCRibbonStatusBarPane::CMFCRibbonStatusBarPane
+726 CMFCRibbonStatusBarPane::CMFCRibbonStatusBarPane
+727 CMFCRibbonStatusBarPane::CMFCRibbonStatusBarPane
+728 CMFCRibbonStatusBarPane::CMFCRibbonStatusBarPane
+729 CMFCRibbonTab::CMFCRibbonTab
+730 CMFCRibbonUndoButton::CMFCRibbonUndoButton
+731 CMFCRibbonUndoButton::CMFCRibbonUndoButton
+732 CMFCRibbonUndoButton::CMFCRibbonUndoButton
+733 CMFCShadowRenderer::CMFCShadowRenderer
+734 CMFCShellListCtrl::CMFCShellListCtrl
+735 CMFCShellTreeCtrl::CMFCShellTreeCtrl
+736 CMFCShowAllButton::CMFCShowAllButton
+737 CMFCSpinButtonCtrl::CMFCSpinButtonCtrl
+738 CMFCStandardColorsPropertyPage::CMFCStandardColorsPropertyPage
+739 CMFCStatusBar::CMFCStatusBar
+740 CMFCTabCtrl::CMFCTabCtrl
+741 CMFCTasksPane::CMFCTasksPane
+742 CMFCTasksPaneFrameWnd::CMFCTasksPaneFrameWnd
+743 CMFCToolBar::CMFCToolBar
+744 CMFCToolBarButton::CMFCToolBarButton
+745 CMFCToolBarButton::CMFCToolBarButton
+746 CMFCToolBarButtonCustomizeDialog::CMFCToolBarButtonCustomizeDialog
+747 CMFCToolBarButtonsListButton::CMFCToolBarButtonsListButton
+748 CMFCToolBarComboBoxButton::CMFCToolBarComboBoxButton
+749 CMFCToolBarComboBoxButton::CMFCToolBarComboBoxButton
+750 CMFCToolBarComboBoxEdit::CMFCToolBarComboBoxEdit
+751 CMFCToolBarDateTimeCtrl::CMFCToolBarDateTimeCtrl
+752 CMFCToolBarDateTimeCtrl::CMFCToolBarDateTimeCtrl
+753 CMFCToolBarDropSource::CMFCToolBarDropSource
+754 CMFCToolBarDropTarget::CMFCToolBarDropTarget
+755 CMFCToolBarEditBoxButton::CMFCToolBarEditBoxButton
+756 CMFCToolBarEditBoxButton::CMFCToolBarEditBoxButton
+757 CMFCToolBarEditCtrl::CMFCToolBarEditCtrl
+758 CMFCToolBarFontComboBox::CMFCToolBarFontComboBox
+759 CMFCToolBarFontComboBox::CMFCToolBarFontComboBox
+760 CMFCToolBarFontComboBox::CMFCToolBarFontComboBox
+761 CMFCToolBarFontSizeComboBox::CMFCToolBarFontSizeComboBox
+762 CMFCToolBarFontSizeComboBox::CMFCToolBarFontSizeComboBox
+763 CMFCToolBarImages::CMFCToolBarImages
+764 CMFCToolBarImages::CMFCToolBarImages
+765 CMFCToolBarInfo::CMFCToolBarInfo
+766 CMFCToolBarMenuButton::CMFCToolBarMenuButton
+767 CMFCToolBarMenuButton::CMFCToolBarMenuButton
+768 CMFCToolBarMenuButton::CMFCToolBarMenuButton
+769 CMFCToolBarMenuButtonsButton::CMFCToolBarMenuButtonsButton
+770 CMFCToolBarMenuButtonsButton::CMFCToolBarMenuButtonsButton
+771 CMFCToolBarNameDialog::CMFCToolBarNameDialog
+772 CMFCToolBarsCommandsListBox::CMFCToolBarsCommandsListBox
+773 CMFCToolBarsCommandsPropertyPage::CMFCToolBarsCommandsPropertyPage
+774 CMFCToolBarsCustomizeDialog::CMFCToolBarsCustomizeDialog
+775 CMFCToolBarsKeyboardPropertyPage::CMFCToolBarsKeyboardPropertyPage
+776 CMFCToolBarsListCheckBox::CMFCToolBarsListCheckBox
+777 CMFCToolBarsListPropertyPage::CMFCToolBarsListPropertyPage
+778 CMFCToolBarsMenuPropertyPage::CMFCToolBarsMenuPropertyPage
+779 CMFCToolBarsOptionsPropertyPage::CMFCToolBarsOptionsPropertyPage
+780 CMFCToolBarSpinEditBoxButton::CMFCToolBarSpinEditBoxButton
+781 CMFCToolBarSpinEditBoxButton::CMFCToolBarSpinEditBoxButton
+782 CMFCToolBarsToolsPropertyPage::CMFCToolBarsToolsPropertyPage
+783 CMFCToolBarSystemMenuButton::CMFCToolBarSystemMenuButton
+784 CMFCToolBarSystemMenuButton::CMFCToolBarSystemMenuButton
+785 CMFCToolTipCtrl::CMFCToolTipCtrl
+786 CMFCVisualManager::CMFCVisualManager
+787 CMFCVisualManagerBitmapCache::CMFCVisualManagerBitmapCache
+788 CMFCVisualManagerBitmapCache::CMFCVisualManagerBitmapCacheItem::CMFCVisualManagerBitmapCacheItem
+789 CMFCVisualManagerOffice2003::CMFCVisualManagerOffice2003
+790 CMFCVisualManagerOffice2007::CMFCVisualManagerOffice2007
+791 CMFCVisualManagerOfficeXP::CMFCVisualManagerOfficeXP
+792 CMFCVisualManagerVS2005::CMFCVisualManagerVS2005
+793 CMFCVisualManagerVS2008::CMFCVisualManagerVS2008
+794 CMFCVisualManagerWindows::CMFCVisualManagerWindows
+795 CMFCVisualManagerWindows7::CMFCVisualManagerWindows7
+796 CMFCWindowsManagerDialog::CMFCWindowsManagerDialog
+797 CMFCZoomKernel::CMFCZoomKernel
+798 CMiniDockFrameWnd::CMiniDockFrameWnd
+799 CMiniFrameWnd::CMiniFrameWnd
+800 CMouseManager::CMouseManager
+801 CMultiDocTemplate::CMultiDocTemplate
+802 CMultiLock::CMultiLock
+803 CMultiPageDHtmlDialog::CMultiPageDHtmlDialog
+804 CMultiPageDHtmlDialog::CMultiPageDHtmlDialog
+805 CMultiPageDHtmlDialog::CMultiPageDHtmlDialog
+806 CMultiPaneFrameWnd::CMultiPaneFrameWnd
+807 CMutex::CMutex
+808 CObArray::CObArray
+809 CObList::CObList
+810 COleBusyDialog::COleBusyDialog
+811 COleChangeIconDialog::COleChangeIconDialog
+812 COleChangeSourceDialog::COleChangeSourceDialog
+813 COleClientItem::COleClientItem
+814 COleCmdUI::COleCmdUI
+815 COleCntrFrameWnd::COleCntrFrameWnd
+816 COleCntrFrameWndEx::COleCntrFrameWndEx
+817 COleControl::COleControl
+818 COleControlContainer::COleControlContainer
+819 COleControlLock::COleControlLock
+820 COleControlSite::COleControlSite
+821 COleControlSiteOrWnd::COleControlSiteOrWnd
+822 COleControlSiteOrWnd::COleControlSiteOrWnd
+823 COleControlSiteOrWnd::COleControlSiteOrWnd
+824 COleConvertDialog::COleConvertDialog
+825 COleCurrency::COleCurrency
+826 COleDataObject::COleDataObject
+827 COleDataSource::COleDataSource
+828 COleDialog::COleDialog
+829 COleDispatchDriver::COleDispatchDriver
+830 COleDispatchDriver::COleDispatchDriver
+831 COleDispatchDriver::COleDispatchDriver
+832 COleDispatchException::COleDispatchException
+833 COleDocIPFrameWnd::COleDocIPFrameWnd
+834 COleDocIPFrameWndEx::COleDocIPFrameWndEx
+835 COleDocObjectItem::COleDocObjectItem
+836 COleDocument::COleDocument
+837 COleDropSource::COleDropSource
+838 COleDropTarget::COleDropTarget
+839 COleFrameHook::COleFrameHook
+840 COleInsertDialog::COleInsertDialog
+841 COleIPFrameWnd::COleIPFrameWnd
+842 COleIPFrameWndEx::COleIPFrameWndEx
+843 COleLinkingDoc::COleLinkingDoc
+844 COleLinksDialog::COleLinksDialog
+845 COleMessageFilter::COleMessageFilter
+846 COleObjectFactory::COleObjectFactory
+847 COleObjectFactory::COleObjectFactory
+848 COlePasteSpecialDialog::COlePasteSpecialDialog
+849 COlePropertiesDialog::COlePropertiesDialog
+850 COlePropertyPage::COlePropertyPage
+851 COleResizeBar::COleResizeBar
+852 COleSafeArray::COleSafeArray
+853 COleSafeArray::COleSafeArray
+854 COleSafeArray::COleSafeArray
+855 COleSafeArray::COleSafeArray
+856 COleSafeArray::COleSafeArray
+857 COleSafeArray::COleSafeArray
+858 COleServerDoc::COleServerDoc
+859 COleServerDocEx::COleServerDocEx
+860 COleServerItem::COleServerItem
+861 COleStreamFile::COleStreamFile
+862 COleTemplateServer::COleTemplateServer
+863 COleUILinkInfo::COleUILinkInfo
+864 COleUILinkInfo::COleUILinkInfo
+865 COleUpdateDialog::COleUpdateDialog
+866 COleVariant::COleVariant
+867 COleVariant::COleVariant
+868 COleVariant::COleVariant
+869 COleVariant::COleVariant
+870 COleVariant::COleVariant
+871 COleVariant::COleVariant
+872 COleVariant::COleVariant
+873 COutlookOptionsDlg::COutlookOptionsDlg
+874 CPageSetupDialog::CPageSetupDialog
+875 CPaintDC::CPaintDC
+876 CPane::CPane
+877 CPaneContainer::CPaneContainer
+878 CPaneContainerManager::CPaneContainerManager
+879 CPaneDialog::CPaneDialog
+880 CPaneDivider::CPaneDivider
+881 CPaneDivider::CPaneDivider
+882 CPaneFrameWnd::CPaneFrameWnd
+883 CPen::CPen
+884 CPen::CPen
+886 CPngImage::CPngImage
+887 CPreviewDC::CPreviewDC
+888 CPreviewView::CPreviewView
+889 CPreviewViewEx::CPreviewViewEx
+890 CPrintDialog::CPrintDialog
+891 CPrintDialog::CPrintDialog
+892 CPrintDialogEx::CPrintDialogEx
+893 CPrintInfo::CPrintInfo
+894 CPrintPreviewState::CPrintPreviewState
+895 CPropbagPropExchange::CPropbagPropExchange
+896 CProperty::CProperty
+897 CProperty::CProperty
+898 CPropertyPage::CPropertyPage
+899 CPropertyPage::CPropertyPage
+900 CPropertyPage::CPropertyPage
+901 CPropertyPage::CPropertyPage
+902 CPropertyPage::CPropertyPage
+903 CPropertySection::CPropertySection
+904 CPropertySection::CPropertySection
+905 CPropertySet::CPropertySet
+906 CPropertySet::CPropertySet
+907 CPropertySheet::CPropertySheet
+908 CPropertySheet::CPropertySheet
+909 CPropertySheet::CPropertySheet
+910 CPropertySheet::CPropertySheet
+911 CPropertySheet::CPropertySheet
+912 CPropsetPropExchange::CPropsetPropExchange
+913 CPtrArray::CPtrArray
+914 CPtrList::CPtrList
+915 CReBar::CReBar
+916 CRecentDockSiteInfo::CRecentDockSiteInfo
+917 CRecentFileList::CRecentFileList
+918 CRecentPaneContainerInfo::CRecentPaneContainerInfo
+919 CRecordset::CRecordset
+920 CRecordView::CRecordView
+921 CRecordView::CRecordView
+922 CRectTracker::CRectTracker
+923 CRenderTarget::CRenderTarget
+924 CReObject::CReObject
+925 CReObject::CReObject
+926 CResetPropExchange::CResetPropExchange
+927 CRibbonCategoryScroll::CRibbonCategoryScroll
+928 CRichEditCntrItem::CRichEditCntrItem
+929 CRichEditDoc::CRichEditDoc
+930 CRichEditView::CRichEditView
+931 CScreenWnd::CScreenWnd
+932 CScrollView::CScrollView
+933 CSemaphore::CSemaphore
+934 CSettingsStore::CSettingsStore
+935 CSettingsStore::CSettingsStore
+936 CSharedFile::CSharedFile
+937 CShellManager::CShellManager
+938 CSingleDocTemplate::CSingleDocTemplate
+939 CSingleLock::CSingleLock
+940 CSmartDockingGroupGuide::CSmartDockingGroupGuide
+941 CSmartDockingGroupGuidesManager::CSmartDockingGroupGuidesManager
+942 CSmartDockingGroupGuidesWnd::CSmartDockingGroupGuidesWnd
+943 CSmartDockingHighlighterWnd::CSmartDockingHighlighterWnd
+944 CSmartDockingInfo::CSmartDockingInfo
+945 CSmartDockingManager::CSmartDockingManager
+946 CSmartDockingStandaloneGuide::CSmartDockingStandaloneGuide
+947 CSmartDockingStandaloneGuideWnd::CSmartDockingStandaloneGuideWnd
+948 CSocket::CSocket
+949 CSocketFile::CSocketFile
+950 CSocketWnd::CSocketWnd
+951 CSplitterWnd::CSplitterWnd
+952 CSplitterWndEx::CSplitterWndEx
+953 CStatusBar::CStatusBar
+954 CStdioFile::CStdioFile
+955 CStdioFile::CStdioFile
+956 CStdioFile::CStdioFile
+957 CStdioFile::CStdioFile
+958 CStdioFile::CStdioFile
+959 CStringArray::CStringArray
+960 CStringList::CStringList
+961 CSyncObject::CSyncObject
+962 CTabbedPane::CTabbedPane
+963 CTabView::CTabView
+964 CTagManager::CTagManager
+965 CTestCmdUI::CTestCmdUI
+966 CThreadSlotData::CThreadSlotData
+967 CToolBar::CToolBar
+968 CToolTipCtrl::CToolTipCtrl
+969 CTooltipManager::CTooltipManager
+970 CUIntArray::CUIntArray
+971 CUserTool::CUserTool
+972 CUserToolsManager::CUserToolsManager
+973 CUserToolsManager::CUserToolsManager
+974 CView::CView
+975 CVSListBox::CVSListBox
+976 CVSListBoxBase::CVSListBoxBase
+977 CVSListBoxEditCtrl::CVSListBoxEditCtrl
+978 CWinApp::CWinApp
+979 CWinAppEx::CWinAppEx
+980 CWindowDC::CWindowDC
+981 CWindowlessDC::CWindowlessDC
+983 CWinThread::CWinThread
+984 CWnd::CWnd
+985 CWnd::CWnd
+986 CWordArray::CWordArray
+987 CXMLParserCollection::CXMLParserCollection
+988 CPreviewView::PAGE_INFO::PAGE_INFO
+989 CMFCRibbonInfo::XBase::XBase
+990 CMFCRibbonInfo::XCategory::XCategory
+991 CMFCRibbonInfo::XCategoryMain::XCategoryMain
+992 CMFCRibbonInfo::XContext::XContext
+993 CMFCRibbonInfo::XElement::XElement
+994 CMFCRibbonInfo::XElementButton::XElementButton
+995 CMFCRibbonInfo::XElementButton::XElementButton
+996 CMFCRibbonInfo::XElementButtonApplication::XElementButtonApplication
+997 CMFCRibbonInfo::XElementButtonCheck::XElementButtonCheck
+998 CMFCRibbonInfo::XElementButtonColor::XElementButtonColor
+999 CMFCRibbonInfo::XElementButtonGallery::XElementButtonGallery
+1000 CMFCRibbonInfo::XElementButtonGallery::XElementButtonGallery
+1001 CMFCRibbonInfo::XElementButtonLaunch::XElementButtonLaunch
+1002 CMFCRibbonInfo::XElementButtonLinkCtrl::XElementButtonLinkCtrl
+1003 CMFCRibbonInfo::XElementButtonMainPanel::XElementButtonMainPanel
+1004 CMFCRibbonInfo::XElementButtonUndo::XElementButtonUndo
+1005 CMFCRibbonInfo::XElementComboBox::XElementComboBox
+1006 CMFCRibbonInfo::XElementComboBox::XElementComboBox
+1007 CMFCRibbonInfo::XElementEdit::XElementEdit
+1008 CMFCRibbonInfo::XElementEdit::XElementEdit
+1009 CMFCRibbonInfo::XElementFontComboBox::XElementFontComboBox
+1010 CMFCRibbonInfo::XElementGroup::XElementGroup
+1011 CMFCRibbonInfo::XElementLabel::XElementLabel
+1012 CMFCRibbonInfo::XElementProgressBar::XElementProgressBar
+1013 CMFCRibbonInfo::XElementSeparator::XElementSeparator
+1014 CMFCRibbonInfo::XElementSlider::XElementSlider
+1015 CMFCRibbonInfo::XElementButtonGallery::XGalleryGroup::XGalleryGroup
+1016 CMFCRibbonInfo::XElementButtonGallery::XGalleryGroup::XGalleryGroup
+1017 CMFCRibbonInfo::XImage::XImage
+1018 CMFCRibbonInfo::XInfoError::XInfoError
+1019 CMFCRibbonInfo::XPanel::XPanel
+1020 CMFCRibbonInfo::XQAT::XQAT
+1021 CMFCRibbonInfo::XQAT::XQATItem::XQATItem
+1022 CMFCRibbonInfo::XRibbonBar::XRibbonBar
+1023 CMFCRibbonInfo::XRibbonInfoParser::XRibbonInfoParser
+1024 CMFCRibbonInfo::XRibbonInfoParserCollection::XRibbonInfoParserCollection
+1025 CMFCRibbonInfo::XRibbonInfoParserRoot::XRibbonInfoParserRoot
+1030 _AFX_D2D_STATE::~_AFX_D2D_STATE
+1031 _AFX_THREAD_STATE::~_AFX_THREAD_STATE
+1032 AFX_GLOBAL_DATA::~AFX_GLOBAL_DATA
+1033 AFX_MAINTAIN_STATE::~AFX_MAINTAIN_STATE
+1034 AFX_MAINTAIN_STATE2::~AFX_MAINTAIN_STATE2
+1035 AFX_MODULE_STATE::~AFX_MODULE_STATE
+1036 AFX_MODULE_THREAD_STATE::~AFX_MODULE_THREAD_STATE
+1037 CAnimateCtrl::~CAnimateCtrl
+1038 CAnimationBaseObject::~CAnimationBaseObject
+1039 CAnimationController::~CAnimationController
+1040 CAnimationGroup::~CAnimationGroup
+1041 CAnimationVariable::~CAnimationVariable
+1042 CArchive::~CArchive
+1043 CAsyncMonikerFile::~CAsyncMonikerFile
+1044 CAsyncSocket::~CAsyncSocket
+1045 CAutoHideDockSite::~CAutoHideDockSite
+1046 CBasePane::~CBasePane
+1047 CBaseTabbedPane::~CBaseTabbedPane
+1048 CButton::~CButton
+1049 CByteArray::~CByteArray
+1050 CClientDC::~CClientDC
+1051 CCmdTarget::~CCmdTarget
+1052 CComboBox::~CComboBox
+1053 CComboBoxEx::~CComboBoxEx
+1054 CCommandLineInfo::~CCommandLineInfo
+1055 CCommandManager::~CCommandManager
+1056 CConnectionPoint::~CConnectionPoint
+1057 CContextMenuManager::~CContextMenuManager
+1058 CControlBar::~CControlBar
+1059 CControlSiteFactoryMgr::~CControlSiteFactoryMgr
+1060 CCtrlView::~CCtrlView
+1061 CD2DBitmap::~CD2DBitmap
+1062 CD2DBitmapBrush::~CD2DBitmapBrush
+1063 CD2DBrush::~CD2DBrush
+1064 CD2DGeometry::~CD2DGeometry
+1065 CD2DGeometrySink::~CD2DGeometrySink
+1066 CD2DGradientBrush::~CD2DGradientBrush
+1067 CD2DLayer::~CD2DLayer
+1068 CD2DLinearGradientBrush::~CD2DLinearGradientBrush
+1069 CD2DMesh::~CD2DMesh
+1070 CD2DRadialGradientBrush::~CD2DRadialGradientBrush
+1071 CD2DResource::~CD2DResource
+1072 CD2DSolidColorBrush::~CD2DSolidColorBrush
+1073 CD2DTextFormat::~CD2DTextFormat
+1074 CD2DTextLayout::~CD2DTextLayout
+1075 CDatabase::~CDatabase
+1076 CDataRecoveryHandler::~CDataRecoveryHandler
+1077 CDataSourceControl::~CDataSourceControl
+1078 CDateTimeCtrl::~CDateTimeCtrl
+1079 CDBException::~CDBException
+1080 CDBVariant::~CDBVariant
+1081 CDC::~CDC
+1082 CDHtmlControlSink::~CDHtmlControlSink
+1083 CDHtmlDialog::~CDHtmlDialog
+1084 CDialog::~CDialog
+1085 CDialogBar::~CDialogBar
+1086 CDialogImpl::~CDialogImpl
+1087 CDialogTemplate::~CDialogTemplate
+1088 CDocItem::~CDocItem
+1089 CDockablePane::~CDockablePane
+1090 CDockablePaneAdapter::~CDockablePaneAdapter
+1091 CDockBar::~CDockBar
+1092 CDockContext::~CDockContext
+1093 CDockingManager::~CDockingManager
+1094 CDockingPanesRow::~CDockingPanesRow
+1095 CDockSite::~CDockSite
+1096 CDockState::~CDockState
+1097 CDocManager::~CDocManager
+1098 CDocObjectServer::~CDocObjectServer
+1099 CDocObjectServerItem::~CDocObjectServerItem
+1100 CDocTemplate::~CDocTemplate
+1101 CDocument::~CDocument
+1102 CDragListBox::~CDragListBox
+1103 CDrawingManager::~CDrawingManager
+1104 CDWordArray::~CDWordArray
+1105 CDynLinkLibrary::~CDynLinkLibrary
+1106 CEdit::~CEdit
+1107 CEditView::~CEditView
+1108 CEnumArray::~CEnumArray
+1109 CEnumConnections::~CEnumConnections
+1110 CEnumConnPoints::~CEnumConnPoints
+1111 CEnumFormatEtc::~CEnumFormatEtc
+1112 CEnumOleVerb::~CEnumOleVerb
+1113 CEnumUnknown::~CEnumUnknown
+1114 CEvent::~CEvent
+1115 CFile::~CFile
+1116 CFileDialog::~CFileDialog
+1117 CFileFind::~CFileFind
+1118 CFixedAlloc::~CFixedAlloc
+1119 CFixedAllocNoSync::~CFixedAllocNoSync
+1120 CFolderPickerDialog::~CFolderPickerDialog
+1121 CFontHolder::~CFontHolder
+1122 CFormView::~CFormView
+1123 CFrameImpl::~CFrameImpl
+1124 CFrameWnd::~CFrameWnd
+1125 CFrameWndEx::~CFrameWndEx
+1126 CFtpConnection::~CFtpConnection
+1127 CFtpFileFind::~CFtpFileFind
+1128 CFullScreenImpl::~CFullScreenImpl
+1129 CGestureConfig::~CGestureConfig
+1130 CGlobalUtils::~CGlobalUtils
+1131 CGopherConnection::~CGopherConnection
+1132 CGopherFile::~CGopherFile
+1133 CGopherFileFind::~CGopherFileFind
+1134 CGopherLocator::~CGopherLocator
+1135 CHeaderCtrl::~CHeaderCtrl
+1136 CHotKeyCtrl::~CHotKeyCtrl
+1137 CHtmlControlSite::~CHtmlControlSite
+1138 CHtmlEditCtrl::~CHtmlEditCtrl
+1139 CHtmlEditDoc::~CHtmlEditDoc
+1140 CHtmlEditView::~CHtmlEditView
+1141 CHtmlView::~CHtmlView
+1142 CHttpConnection::~CHttpConnection
+1143 CHttpFile::~CHttpFile
+1144 CImageList::~CImageList
+1145 CInternetConnection::~CInternetConnection
+1146 CInternetException::~CInternetException
+1147 CInternetFile::~CInternetFile
+1148 CInternetSession::~CInternetSession
+1149 CIPAddressCtrl::~CIPAddressCtrl
+1150 CJumpList::~CJumpList
+1151 CKeyboardManager::~CKeyboardManager
+1152 CListBox::~CListBox
+1153 CListCtrl::~CListCtrl
+1154 CLongBinary::~CLongBinary
+1156 CMapPtrToWord::~CMapPtrToWord
+1157 CMapStringToOb::~CMapStringToOb
+1158 CMapStringToPtr::~CMapStringToPtr
+1159 CMapStringToString::~CMapStringToString
+1160 CMapWordToOb::~CMapWordToOb
+1161 CMapWordToPtr::~CMapWordToPtr
+1162 CMDIChildWndEx::~CMDIChildWndEx
+1163 CMDIClientAreaWnd::~CMDIClientAreaWnd
+1164 CMDIFrameWndEx::~CMDIFrameWndEx
+1165 CMDITabProxyWnd::~CMDITabProxyWnd
+1166 CMemDC::~CMemDC
+1167 CMemFile::~CMemFile
+1168 CMenuHash::~CMenuHash
+1169 CMenuTearOffManager::~CMenuTearOffManager
+1170 CMetaFileDC::~CMetaFileDC
+1171 CMFCAcceleratorKey::~CMFCAcceleratorKey
+1172 CMFCAcceleratorKeyAssignCtrl::~CMFCAcceleratorKeyAssignCtrl
+1173 CMFCAutoHideBar::~CMFCAutoHideBar
+1174 CMFCAutoHideButton::~CMFCAutoHideButton
+1175 CMFCBaseTabCtrl::~CMFCBaseTabCtrl
+1176 CMFCBaseToolBar::~CMFCBaseToolBar
+1177 CMFCBaseVisualManager::~CMFCBaseVisualManager
+1178 CMFCButton::~CMFCButton
+1179 CMFCCaptionBar::~CMFCCaptionBar
+1180 CMFCCaptionButton::~CMFCCaptionButton
+1181 CMFCCaptionButton::~CMFCCaptionButton
+1182 CMFCCaptionButton::~CMFCCaptionButton
+1183 CMFCCmdUsageCount::~CMFCCmdUsageCount
+1184 CMFCColorBar::~CMFCColorBar
+1185 CMFCColorButton::~CMFCColorButton
+1186 CMFCColorDialog::~CMFCColorDialog
+1187 CMFCColorMenuButton::~CMFCColorMenuButton
+1188 CMFCColorPickerCtrl::~CMFCColorPickerCtrl
+1189 CMFCColorPopupMenu::~CMFCColorPopupMenu
+1190 CMFCColorPropertySheet::~CMFCColorPropertySheet
+1191 CMFCControlBarImpl::~CMFCControlBarImpl
+1192 CMFCControlContainer::~CMFCControlContainer
+1193 CMFCControlRenderer::~CMFCControlRenderer
+1194 CMFCControlRendererInfo::~CMFCControlRendererInfo
+1195 CMFCCustomizeButton::~CMFCCustomizeButton
+1196 CMFCCustomizeMenuButton::~CMFCCustomizeMenuButton
+1197 CMFCDesktopAlertDialog::~CMFCDesktopAlertDialog
+1198 CMFCDesktopAlertWnd::~CMFCDesktopAlertWnd
+1199 CMFCDragFrameImpl::~CMFCDragFrameImpl
+1200 CMFCDropDownFrame::~CMFCDropDownFrame
+1201 CMFCDropDownListBox::~CMFCDropDownListBox
+1202 CMFCDropDownToolbarButton::~CMFCDropDownToolbarButton
+1203 CMFCEditBrowseCtrl::~CMFCEditBrowseCtrl
+1204 CMFCFilterChunkValueImpl::~CMFCFilterChunkValueImpl
+1205 CMFCFontComboBox::~CMFCFontComboBox
+1206 CMFCHeaderCtrl::~CMFCHeaderCtrl
+1207 CMFCImagePaintArea::~CMFCImagePaintArea
+1208 CMFCKeyMapDialog::~CMFCKeyMapDialog
+1209 CMFCLinkCtrl::~CMFCLinkCtrl
+1210 CMFCListCtrl::~CMFCListCtrl
+1211 CMFCMaskedEdit::~CMFCMaskedEdit
+1212 CMFCMenuBar::~CMFCMenuBar
+1213 CMFCMenuButton::~CMFCMenuButton
+1214 CMFCMousePropertyPage::~CMFCMousePropertyPage
+1215 CMFCOutlookBar::~CMFCOutlookBar
+1216 CMFCOutlookBarPane::~CMFCOutlookBarPane
+1217 CDockablePaneAdapter::~CDockablePaneAdapter
+1218 CMFCOutlookBarPaneButton::~CMFCOutlookBarPaneButton
+1219 CMFCOutlookBarTabCtrl::~CMFCOutlookBarTabCtrl
+1220 CMFCPopupMenu::~CMFCPopupMenu
+1221 CMFCPopupMenuBar::~CMFCPopupMenuBar
+1222 CMFCPreviewCtrlImpl::~CMFCPreviewCtrlImpl
+1223 CMFCPropertyGridColorProperty::~CMFCPropertyGridColorProperty
+1224 CMFCPropertyGridCtrl::~CMFCPropertyGridCtrl
+1225 CMFCPropertyGridFileProperty::~CMFCPropertyGridFileProperty
+1226 CMFCPropertyGridFontProperty::~CMFCPropertyGridFontProperty
+1227 CMFCPropertyGridProperty::~CMFCPropertyGridProperty
+1228 CMFCPropertyGridToolTipCtrl::~CMFCPropertyGridToolTipCtrl
+1229 CMFCPropertyPage::~CMFCPropertyPage
+1230 CMFCPropertySheet::~CMFCPropertySheet
+1231 CMFCPropertySheetCategoryInfo::~CMFCPropertySheetCategoryInfo
+1232 CMFCRibbonBar::~CMFCRibbonBar
+1233 CMFCRibbonBaseElement::~CMFCRibbonBaseElement
+1234 CMFCRibbonButton::~CMFCRibbonButton
+1235 CMFCRibbonButtonsGroup::~CMFCRibbonButtonsGroup
+1236 CMFCRibbonCategory::~CMFCRibbonCategory
+1237 CMFCRibbonCheckBox::~CMFCRibbonCheckBox
+1238 CMFCRibbonCollector::~CMFCRibbonCollector
+1239 CMFCRibbonColorButton::~CMFCRibbonColorButton
+1240 CMFCRibbonComboBox::~CMFCRibbonComboBox
+1241 CMFCRibbonCommandsListBox::~CMFCRibbonCommandsListBox
+1242 CMFCRibbonConstructor::~CMFCRibbonConstructor
+1243 CMFCRibbonCustomizeDialog::~CMFCRibbonCustomizeDialog
+1244 CMFCRibbonCustomizePropertyPage::~CMFCRibbonCustomizePropertyPage
+1245 CMFCRibbonEdit::~CMFCRibbonEdit
+1246 CMFCRibbonFontComboBox::~CMFCRibbonFontComboBox
+1247 CMFCRibbonGallery::~CMFCRibbonGallery
+1248 CMFCRibbonGalleryMenuButton::~CMFCRibbonGalleryMenuButton
+1249 CMFCRibbonInfo::~CMFCRibbonInfo
+1250 CMFCRibbonInfoLoader::~CMFCRibbonInfoLoader
+1251 CMFCRibbonKeyboardCustomizeDialog::~CMFCRibbonKeyboardCustomizeDialog
+1252 CMFCRibbonKeyTip::~CMFCRibbonKeyTip
+1253 CMFCRibbonLabel::~CMFCRibbonLabel
+1254 CMFCRibbonLinkCtrl::~CMFCRibbonLinkCtrl
+1255 CMFCRibbonMainPanel::~CMFCRibbonMainPanel
+1256 CMFCRibbonMainPanelButton::~CMFCRibbonMainPanelButton
+1257 CMFCRibbonMiniToolBar::~CMFCRibbonMiniToolBar
+1258 CMFCRibbonPanel::~CMFCRibbonPanel
+1259 CMFCRibbonPanelMenu::~CMFCRibbonPanelMenu
+1260 CMFCRibbonPanelMenuBar::~CMFCRibbonPanelMenuBar
+1261 CMFCRibbonProgressBar::~CMFCRibbonProgressBar
+1262 CMFCRibbonQuickAccessToolBar::~CMFCRibbonQuickAccessToolBar
+1263 CMFCRibbonRichEditCtrl::~CMFCRibbonRichEditCtrl
+1264 CMFCRibbonSlider::~CMFCRibbonSlider
+1265 CMFCRibbonStatusBar::~CMFCRibbonStatusBar
+1266 CMFCRibbonStatusBarPane::~CMFCRibbonStatusBarPane
+1267 CMFCRibbonUndoButton::~CMFCRibbonUndoButton
+1268 CMFCShadowRenderer::~CMFCShadowRenderer
+1269 CMFCShellListCtrl::~CMFCShellListCtrl
+1270 CMFCShellTreeCtrl::~CMFCShellTreeCtrl
+1271 CMFCShowAllButton::~CMFCShowAllButton
+1272 CMFCSpinButtonCtrl::~CMFCSpinButtonCtrl
+1273 CMFCStatusBar::~CMFCStatusBar
+1274 CMFCTabCtrl::~CMFCTabCtrl
+1275 CMFCTasksPane::~CMFCTasksPane
+1276 CMFCTasksPaneFrameWnd::~CMFCTasksPaneFrameWnd
+1277 CMFCToolBar::~CMFCToolBar
+1278 CMFCToolBarButton::~CMFCToolBarButton
+1279 CMFCToolBarButtonCustomizeDialog::~CMFCToolBarButtonCustomizeDialog
+1280 CMFCToolBarButtonsListButton::~CMFCToolBarButtonsListButton
+1281 CMFCToolBarComboBoxButton::~CMFCToolBarComboBoxButton
+1282 CMFCToolBarComboBoxEdit::~CMFCToolBarComboBoxEdit
+1283 CMFCToolBarDateTimeCtrl::~CMFCToolBarDateTimeCtrl
+1284 CMFCToolBarDropSource::~CMFCToolBarDropSource
+1285 CMFCToolBarDropTarget::~CMFCToolBarDropTarget
+1286 CMFCToolBarEditBoxButton::~CMFCToolBarEditBoxButton
+1287 CMFCToolBarEditCtrl::~CMFCToolBarEditCtrl
+1288 CMFCToolBarFontComboBox::~CMFCToolBarFontComboBox
+1289 CMFCToolBarFontSizeComboBox::~CMFCToolBarFontSizeComboBox
+1290 CMFCToolBarImages::~CMFCToolBarImages
+1291 CMFCToolBarMenuButton::~CMFCToolBarMenuButton
+1292 CMFCToolBarMenuButtonsButton::~CMFCToolBarMenuButtonsButton
+1293 CMFCToolBarsCommandsListBox::~CMFCToolBarsCommandsListBox
+1294 CMFCToolBarsCommandsPropertyPage::~CMFCToolBarsCommandsPropertyPage
+1295 CMFCToolBarsCustomizeDialog::~CMFCToolBarsCustomizeDialog
+1296 CMFCToolBarsKeyboardPropertyPage::~CMFCToolBarsKeyboardPropertyPage
+1297 CMFCToolBarsListCheckBox::~CMFCToolBarsListCheckBox
+1298 CMFCToolBarsListPropertyPage::~CMFCToolBarsListPropertyPage
+1299 CMFCToolBarsMenuPropertyPage::~CMFCToolBarsMenuPropertyPage
+1300 CMFCToolBarsOptionsPropertyPage::~CMFCToolBarsOptionsPropertyPage
+1301 CMFCToolBarSpinEditBoxButton::~CMFCToolBarSpinEditBoxButton
+1302 CMFCToolBarsToolsPropertyPage::~CMFCToolBarsToolsPropertyPage
+1303 CMFCToolBarSystemMenuButton::~CMFCToolBarSystemMenuButton
+1304 CMFCToolTipCtrl::~CMFCToolTipCtrl
+1305 CMFCVisualManager::~CMFCVisualManager
+1306 CMFCVisualManagerBitmapCache::~CMFCVisualManagerBitmapCache
+1307 CMFCVisualManagerBitmapCache::CMFCVisualManagerBitmapCacheItem::~CMFCVisualManagerBitmapCacheItem
+1308 CMFCVisualManagerOffice2003::~CMFCVisualManagerOffice2003
+1309 CMFCVisualManagerOffice2007::~CMFCVisualManagerOffice2007
+1310 CMFCVisualManagerOfficeXP::~CMFCVisualManagerOfficeXP
+1311 CMFCVisualManagerVS2005::~CMFCVisualManagerVS2005
+1312 CMFCVisualManagerVS2008::~CMFCVisualManagerVS2008
+1313 CMFCVisualManagerWindows::~CMFCVisualManagerWindows
+1314 CMFCVisualManagerWindows7::~CMFCVisualManagerWindows7
+1315 CMFCZoomKernel::~CMFCZoomKernel
+1316 CMiniFrameWnd::~CMiniFrameWnd
+1317 CMonikerFile::~CMonikerFile
+1318 CMonthCalCtrl::~CMonthCalCtrl
+1319 CMouseManager::~CMouseManager
+1320 CMultiDocTemplate::~CMultiDocTemplate
+1321 CMultiLock::~CMultiLock
+1322 CMultiPageDHtmlDialog::~CMultiPageDHtmlDialog
+1323 CMultiPaneFrameWnd::~CMultiPaneFrameWnd
+1324 CMutex::~CMutex
+1326 CObList::~CObList
+1327 CColorDialog::~CColorDialog
+1328 COleChangeIconDialog::~COleChangeIconDialog
+1329 COleChangeSourceDialog::~COleChangeSourceDialog
+1330 COleClientItem::~COleClientItem
+1331 COleCntrFrameWnd::~COleCntrFrameWnd
+1332 COleCntrFrameWndEx::~COleCntrFrameWndEx
+1333 COleControl::~COleControl
+1334 COleControlContainer::~COleControlContainer
+1335 COleControlLock::~COleControlLock
+1336 COleControlSite::~COleControlSite
+1337 COleControlSiteOrWnd::~COleControlSiteOrWnd
+1338 COleConvertDialog::~COleConvertDialog
+1339 COleDataSource::~COleDataSource
+1340 COleDispatchException::~COleDispatchException
+1341 COleDocIPFrameWnd::~COleDocIPFrameWnd
+1342 COleDocIPFrameWndEx::~COleDocIPFrameWndEx
+1343 COleDocObjectItem::~COleDocObjectItem
+1344 COleDocument::~COleDocument
+1345 COleDropTarget::~COleDropTarget
+1346 COleFrameHook::~COleFrameHook
+1347 COleInsertDialog::~COleInsertDialog
+1348 COleIPFrameWnd::~COleIPFrameWnd
+1349 COleIPFrameWndEx::~COleIPFrameWndEx
+1350 COleLinkingDoc::~COleLinkingDoc
+1351 CColorDialog::~CColorDialog
+1352 COleMessageFilter::~COleMessageFilter
+1353 COleObjectFactory::~COleObjectFactory
+1354 COlePasteSpecialDialog::~COlePasteSpecialDialog
+1355 COlePropertyPage::~COlePropertyPage
+1356 COleResizeBar::~COleResizeBar
+1357 COleServerDoc::~COleServerDoc
+1358 COleServerDocEx::~COleServerDocEx
+1359 COleServerItem::~COleServerItem
+1360 COleStreamFile::~COleStreamFile
+1361 COleUpdateDialog::~COleUpdateDialog
+1362 CPaintDC::~CPaintDC
+1363 CPane::~CPane
+1364 CPaneContainer::~CPaneContainer
+1365 CPaneContainerManager::~CPaneContainerManager
+1366 CPaneDialog::~CPaneDialog
+1367 CPaneDivider::~CPaneDivider
+1368 CPaneFrameWnd::~CPaneFrameWnd
+1369 CPictureHolder::~CPictureHolder
+1370 CBitmap::~CBitmap
+1371 CPreviewDC::~CPreviewDC
+1372 CPreviewView::~CPreviewView
+1373 CPreviewViewEx::~CPreviewViewEx
+1374 CPrintInfo::~CPrintInfo
+1375 CProcessLocalObject::~CProcessLocalObject
+1376 CProgressCtrl::~CProgressCtrl
+1377 CPropbagPropExchange::~CPropbagPropExchange
+1378 CProperty::~CProperty
+1379 CPropertyPage::~CPropertyPage
+1380 CPropertySection::~CPropertySection
+1381 CPropertySet::~CPropertySet
+1382 CPropertySheet::~CPropertySheet
+1383 CPtrArray::~CPtrArray
+1385 CReBarCtrl::~CReBarCtrl
+1386 CRecentDockSiteInfo::~CRecentDockSiteInfo
+1387 CRecentFileList::~CRecentFileList
+1388 CRecentPaneContainerInfo::~CRecentPaneContainerInfo
+1389 CRecordset::~CRecordset
+1390 CRecordView::~CRecordView
+1391 CRectTracker::~CRectTracker
+1392 CRenderTarget::~CRenderTarget
+1393 CReObject::~CReObject
+1394 CRichEditCntrItem::~CRichEditCntrItem
+1395 CRichEditCtrl::~CRichEditCtrl
+1396 CScreenWnd::~CScreenWnd
+1397 CScrollBar::~CScrollBar
+1398 CScrollView::~CScrollView
+1399 CSemaphore::~CSemaphore
+1400 CSettingsStore::~CSettingsStore
+1401 CSharedFile::~CSharedFile
+1402 CShellManager::~CShellManager
+1403 CSingleDocTemplate::~CSingleDocTemplate
+1404 CSliderCtrl::~CSliderCtrl
+1405 CSmartDockingGroupGuide::~CSmartDockingGroupGuide
+1406 CSmartDockingGroupGuidesManager::~CSmartDockingGroupGuidesManager
+1407 CSmartDockingHighlighterWnd::~CSmartDockingHighlighterWnd
+1408 CSmartDockingManager::~CSmartDockingManager
+1409 CSmartDockingStandaloneGuide::~CSmartDockingStandaloneGuide
+1410 CSmartDockingStandaloneGuideWnd::~CSmartDockingStandaloneGuideWnd
+1411 CSocket::~CSocket
+1412 CSocketFile::~CSocketFile
+1413 CSpinButtonCtrl::~CSpinButtonCtrl
+1414 CSplitterWnd::~CSplitterWnd
+1415 CSplitterWndEx::~CSplitterWndEx
+1416 CStatic::~CStatic
+1417 CStatusBar::~CStatusBar
+1418 CStatusBarCtrl::~CStatusBarCtrl
+1419 CStdioFile::~CStdioFile
+1420 CStringArray::~CStringArray
+1421 CStringList::~CStringList
+1422 CSyncObject::~CSyncObject
+1423 CTabbedPane::~CTabbedPane
+1424 CTabCtrl::~CTabCtrl
+1425 CTabView::~CTabView
+1426 CTagManager::~CTagManager
+1427 CThreadLocalObject::~CThreadLocalObject
+1428 CThreadSlotData::~CThreadSlotData
+1429 CToolBar::~CToolBar
+1430 CToolBarCtrl::~CToolBarCtrl
+1431 CToolTipCtrl::~CToolTipCtrl
+1432 CTooltipManager::~CTooltipManager
+1433 CTreeCtrl::~CTreeCtrl
+1434 CUIntArray::~CUIntArray
+1435 CUserTool::~CUserTool
+1436 CUserToolsManager::~CUserToolsManager
+1437 CView::~CView
+1438 CVSListBox::~CVSListBox
+1439 CVSListBoxBase::~CVSListBoxBase
+1440 CVSListBoxEditCtrl::~CVSListBoxEditCtrl
+1441 CWinApp::~CWinApp
+1442 CWinAppEx::~CWinAppEx
+1443 CWindowDC::~CWindowDC
+1444 CWinThread::~CWinThread
+1445 CWnd::~CWnd
+1446 CWordArray::~CWordArray
+1447 CMFCRibbonInfo::XBase::~XBase
+1448 CMFCRibbonInfo::XCategory::~XCategory
+1449 CMFCRibbonInfo::XCategoryMain::~XCategoryMain
+1450 CMFCRibbonInfo::XContext::~XContext
+1451 CMFCRibbonInfo::XElement::~XElement
+1452 CMFCRibbonInfo::XElementButton::~XElementButton
+1453 CMFCRibbonInfo::XElementButtonApplication::~XElementButtonApplication
+1454 CMFCRibbonInfo::XElementButtonCheck::~XElementButtonCheck
+1455 CMFCRibbonInfo::XElementButtonColor::~XElementButtonColor
+1456 CMFCRibbonInfo::XElementButtonGallery::~XElementButtonGallery
+1457 CMFCRibbonInfo::XElementButtonLaunch::~XElementButtonLaunch
+1458 CMFCRibbonInfo::XElementButtonLinkCtrl::~XElementButtonLinkCtrl
+1459 CMFCRibbonInfo::XElementButtonMainPanel::~XElementButtonMainPanel
+1460 CMFCRibbonInfo::XElementButtonUndo::~XElementButtonUndo
+1461 CMFCRibbonInfo::XElementComboBox::~XElementComboBox
+1462 CMFCRibbonInfo::XElementEdit::~XElementEdit
+1463 CMFCRibbonInfo::XElementFontComboBox::~XElementFontComboBox
+1464 CMFCRibbonInfo::XElementGroup::~XElementGroup
+1465 CMFCRibbonInfo::XElementLabel::~XElementLabel
+1466 CMFCRibbonInfo::XElementProgressBar::~XElementProgressBar
+1467 CMFCRibbonInfo::XElementSeparator::~XElementSeparator
+1468 CMFCRibbonInfo::XElementSlider::~XElementSlider
+1471 CMFCRibbonInfo::XImage::~XImage
+1472 CMFCControlRendererInfo::~CMFCControlRendererInfo
+1473 CMFCRibbonInfo::XPanel::~XPanel
+1474 CMFCRibbonInfo::XQAT::~XQAT
+1476 CMFCRibbonInfo::XRibbonBar::~XRibbonBar
+1477 CMFCRibbonInfo::XRibbonInfoParser::~XRibbonInfoParser
+1478 CMFCRibbonInfo::XRibbonInfoParserCollection::~XRibbonInfoParserCollection
+1479 CMFCRibbonInfo::XRibbonInfoParserRoot::~XRibbonInfoParserRoot
+1480 new
+1481 new
+1482 delete
+1483 delete
+1670 _AfxFindSiteOrWnd
+1671 _AfxSocketInit
+1672 CArchive::Abort
+1673 CFile::Abort
+1674 CInternetFile::Abort
+1675 CMemFile::Abort
+1676 CMirrorFile::Abort
+1677 COleStreamFile::Abort
+1678 CSocketFile::Abort
+1679 CStdioFile::Abort
+1680 COleControlSite::XNotifyDBEvents::AboutToDo
+1681 CCheckListBox::accDoDefaultAction
+1682 CMFCRibbonBar::accDoDefaultAction
+1683 CMFCToolBar::accDoDefaultAction
+1684 CWnd::accDoDefaultAction
+1685 CWnd::XAccessible::accDoDefaultAction
+1686 CAsyncSocket::Accept
+1687 CSocket::Accept
+1688 COleSafeArray::AccessData
+1689 CMFCToolBar::AccGetButtonByChildId
+1690 CMFCToolBar::AccGetButtonsCount
+1691 CMFCToolBar::AccGetChildIdByButtonIndex
+1692 CBasePane::accHitTest
+1693 CMFCPropertyGridCtrl::accHitTest
+1694 CMFCRibbonBar::accHitTest
+1695 CMFCToolBar::accHitTest
+1696 CWnd::accHitTest
+1697 CWnd::XAccessible::accHitTest
+1698 CBasePane::accLocation
+1699 CMFCPropertyGridCtrl::accLocation
+1700 CWnd::accLocation
+1701 CWnd::XAccessible::accLocation
+1702 CMFCRibbonBar::accNavigate
+1703 CMFCToolBar::accNavigate
+1704 CWnd::accNavigate
+1705 CWnd::XAccessible::accNavigate
+1706 CMFCToolBar::AccNotifyObjectFocusEvent
+1707 CBasePane::accSelect
+1708 CBasePane::accSelect
+1709 CWnd::accSelect
+1710 CWnd::XAccessible::accSelect
+1711 COleClientItem::Activate
+1712 COlePropertyPage::XPropertyPage::Activate
+1713 COleDocObjectItem::ActivateAndShow
+1714 COleClientItem::ActivateAs
+1715 CRichEditCntrItem::ActivateAs
+1716 CMFCRibbonBar::ActivateContextCategory
+1717 CDocObjectServer::ActivateDocObject
+1718 COleServerDoc::ActivateDocObject
+1719 CFrameWnd::ActivateFrame
+1720 CMDIChildWnd::ActivateFrame
+1721 CMDIChildWndEx::ActivateFrame
+1722 COleServerDoc::ActivateInPlace
+1723 CMFCTabCtrl::ActivateMDITab
+1724 COleDocObjectItem::XOleDocumentSite::ActivateMe
+1725 CSplitterWnd::ActivateNext
+1726 CMFCPopupMenu::ActivatePopupMenu
+1727 CMDIChildWndEx::ActivateTopLevelFrame
+1728 CWnd::ActivateTopParent
+1729 CFrameWndEx::ActiveItemRecalcLayout
+1730 CMDIFrameWndEx::ActiveItemRecalcLayout
+1731 CMFCToolBarImages::AdaptColors
+1732 CMFCRibbonMainPanel::Add
+1733 CMFCRibbonPanel::Add
+1734 CMFCRibbonQuickAccessToolBar::Add
+1735 CRecentFileList::Add
+1736 CRecentFileList::Add
+1737 CRecentFileList::Add
+1738 CRecentFileList::Add
+1739 CRecentFileList::Add
+1740 CAnimationController::AddAnimationObject
+1741 CD2DGeometrySink::AddArc
+1742 CMFCAutoHideBar::AddAutoHideWindow
+1743 CMFCReBar::AddBar
+1744 CMFCReBar::AddBar
+1745 CReBar::AddBar
+1746 CReBar::AddBar
+1747 CMFCToolBar::AddBasicCommand
+1748 CD2DGeometrySink::AddBezier
+1749 CD2DGeometrySink::AddBeziers
+1750 CToolBarCtrl::AddBitmap
+1751 CToolBarCtrl::AddBitmap
+1752 CMFCOutlookBarPane::AddBitmapImage
+1753 CMFCOutlookBarPane::AddButton
+1754 CMFCOutlookBarPane::AddButton
+1755 CMFCOutlookBarPane::AddButton
+1756 CMFCOutlookBarPane::AddButton
+1757 CMFCOutlookBarPane::AddButton
+1758 CMFCRibbonButtonsGroup::AddButton
+1759 CMFCTasksPaneFrameWnd::AddButton
+1760 CMFCToolBarButtonsListButton::AddButton
+1761 CMFCToolBarsCustomizeDialog::AddButton
+1762 CMFCToolBarsCustomizeDialog::AddButton
+1763 CPaneFrameWnd::AddButton
+1764 CVSListBoxBase::AddButton
+1765 CMFCRibbonButtonsGroup::AddButtons
+1766 CMFCRibbonPanelMenuBar::AddButtons
+1767 COleClientItem::AddCachedData
+1768 CMFCRibbonBar::AddCategory
+1769 CMFCPropertySheet::AddCategoryToTree
+1770 CFileDialog::AddCheckButton
+1771 COleInsertDialog::AddClassIDToList
+1772 CMFCCmdUsageCount::AddCmd
+1773 CMFCRibbonColorButton::AddColorsGroup
+1774 CFileDialog::AddComboBox
+1775 CMFCRibbonCommandsListBox::AddCommand
+1776 CMFCRibbonQuickAccessToolBarDefaultState::AddCommand
+1777 CMFCToolBar::AddCommandUsage
+1778 CEnumConnections::AddConnection
+1779 CEnumConnPoints::AddConnPoint
+1780 CMFCRibbonBar::AddContextCategory
+1781 CMFCOutlookBarTabCtrl::AddControl
+1782 CFileDialog::AddControlItem
+1783 CMFCRibbonCustomizePropertyPage::AddCustomCategory
+1784 CFrameImpl::AddDefaultButtonsToCustomizePane
+1785 CJumpList::AddDestination
+1786 CJumpList::AddDestination
+1787 CJumpList::AddDestination
+1788 CDockingManager::AddDockSite
+1789 delete
+1790 delete
+1791 delete
+1792 delete
+1793 delete
+1794 delete
+1795 CDocManager::AddDocTemplate
+1796 CWinApp::AddDocTemplate
+1797 CDocTemplate::AddDocument
+1798 CMultiDocTemplate::AddDocument
+1799 CSingleDocTemplate::AddDocument
+1800 CMFCRibbonStatusBar::AddDynamicElement
+1801 CFileDialog::AddEditBox
+1802 CMFCRibbonStatusBar::AddElement
+1803 CMFCRibbonInfo::AddElementImages
+1804 CMFCRibbonStatusBar::AddExtendedElement
+1805 CMFCToolBarFontComboBox::AddFont
+1806 CEnumFormatEtc::AddFormat
+1807 COlePasteSpecialDialog::AddFormat
+1808 COlePasteSpecialDialog::AddFormat
+1809 CFrameImpl::AddFrame
+1810 COleControl::AddFrameLevelUI
+1811 CFrameWnd::AddFrameWnd
+1812 CMFCRibbonGallery::AddGroup
+1813 CMFCRibbonGallery::AddGroup
+1814 CMFCRibbonGallery::AddGroup
+1815 CMFCTasksPane::AddGroup
+1816 CObList::AddHead
+1817 CObList::AddHead
+1818 CObList::AddHead
+1819 CObList::AddHead
+1820 CSimpleList::AddHead
+1821 CStringList::AddHead
+1822 CStringList::AddHead
+1823 CStringList::AddHead
+1824 CMFCRibbonCategory::AddHidden
+1825 CDockingManager::AddHiddenMDITabbedBar
+1826 CMFCToolBarImages::AddIcon
+1827 CMFCToolBarImages::AddImage
+1828 CMFCToolBarImages::AddImage
+1829 CMFCVisualManagerBitmapCache::CMFCVisualManagerBitmapCacheItem::AddImage
+1830 CMFCRibbonComboBox::AddItem
+1831 CMFCToolBarComboBoxButton::AddItem
+1832 COleDocument::AddItem
+1833 CVSListBox::AddItem
+1834 CMFCRibbonInfo::XQAT::AddItem
+1835 CMFCRibbonKeyboardCustomizeDialog::AddKeyEntry
+1836 CMFCToolBarsKeyboardPropertyPage::AddKeyEntry
+1837 CAnimationGroup::AddKeyframes
+1838 CAnimationController::AddKeyframeToGroup
+1839 CJumpList::AddKnownCategory
+1840 CD2DGeometrySink::AddLine
+1841 CD2DGeometrySink::AddLines
+1842 COlePasteSpecialDialog::AddLinkEntry
+1843 CMFCRibbonBar::AddMainCategory
+1844 CContextMenuManager::AddMenu
+1845 CContextMenuManager::AddMenu
+1846 CFileDialog::AddMenu
+1847 CMFCToolBarsCustomizeDialog::AddMenu
+1848 CMFCToolBarsCustomizeDialog::AddMenuCommands
+1849 CDockingManager::AddMiniFrame
+1850 CMFCTasksPane::AddMRUFilesList
+1851 CRecordset::AddNew
+1852 CPaneContainer::AddNode
+1853 CMFCPropertyGridProperty::AddOption
+1854 COleServerItem::AddOtherClipboardData
+1855 CMFCPropertySheet::AddPage
+1856 CMFCTasksPane::AddPage
+1857 CPropertySheet::AddPage
+1858 CMFCPropertySheet::AddPageToTree
+1859 CBasePane::AddPane
+1860 CDockingManager::AddPane
+1861 CDockingPanesRow::AddPane
+1862 CFrameWndEx::AddPane
+1863 CMDIChildWndEx::AddPane
+1864 CMDIFrameWndEx::AddPane
+1865 CMultiPaneFrameWnd::AddPane
+1866 COleCntrFrameWndEx::AddPane
+1867 COleDocIPFrameWndEx::AddPane
+1868 COleDocIPFrameWndEx::AddPane
+1869 CPaneContainer::AddPane
+1870 CPaneContainerManager::AddPane
+1871 CPaneDivider::AddPane
+1872 CPaneFrameWnd::AddPane
+1873 CPaneContainerManager::AddPaneAndPaneContainer
+1874 CPaneContainerManager::AddPaneAndPaneDivider
+1875 CPaneDivider::AddPaneContainer
+1876 CPaneDivider::AddPaneContainer
+1877 CPaneContainerManager::AddPaneContainerManager
+1878 CPaneContainerManager::AddPaneContainerManager
+1879 CPaneContainerManager::AddPaneContainerManagerToDockablePane
+1880 CDockingPanesRow::AddPaneFromRow
+1881 CMFCRibbonCategory::AddPanel
+1882 CPaneContainerManager::AddPanesToList
+1883 CPaneContainerManager::AddPaneToList
+1884 CPaneContainerManager::AddPaneToRecentPaneContainer
+1885 CFileDialog::AddPlace
+1886 CFileDialog::AddPlace
+1887 CMFCRibbonBar::AddPrintPreviewCategory
+1888 CMFCPropertyGridCtrl::AddProperty
+1889 CPropertySection::AddProperty
+1890 CPropertySet::AddProperty
+1891 CFileDialog::AddPushButton
+1892 CMFCRibbonBar::AddQATOnlyCategory
+1893 CD2DGeometrySink::AddQuadraticBezier
+1894 CD2DGeometrySink::AddQuadraticBeziers
+1895 CFileDialog::AddRadioButtonList
+1896 CMFCRibbonMainPanel::AddRecentFilesList
+1897 CMultiPaneFrameWnd::AddRecentPane
+1898 CPaneDivider::AddRecentPane
+1899 CArchiveStream::AddRef
+1900 CBlobProperty::AddRef
+1901 CBrowserControlSite::AddRef
+1902 CArchiveStream::AddRef
+1903 CArchiveStream::AddRef
+1904 CArchiveStream::AddRef
+1905 CInnerUnknown::AddRef
+1906 COleConnPtContainer::AddRef
+1907 COleDispatchImpl::AddRef
+1908 COleUILinkInfo::AddRef
+1909 CPaneContainer::AddRef
+1910 CArchiveStream::AddRef
+1911 CPaneFrameWnd::AddRemovePaneFromGlobalList
+1912 CMFCToolBar::AddRemoveSeparator
+1913 CToolBar::AddReplaceBitmap
+1914 CHttpFile::AddRequestHeaders
+1915 CHttpFile::AddRequestHeaders
+1916 CDockSite::AddRow
+1917 CPropertySet::AddSection
+1918 CPropertySet::AddSection
+1919 CFileDialog::AddSeparator
+1920 CMFCRibbonPanel::AddSeparator
+1921 CMFCRibbonStatusBar::AddSeparator
+1922 CMFCToolBarComboBoxButton::AddSortedItem
+1923 COlePasteSpecialDialog::AddStandardFormats
+1924 CMFCDropDownListBox::AddString
+1925 CToolBarCtrl::AddString
+1926 CMFCPropertyGridProperty::AddSubItem
+1927 CMFCRibbonButton::AddSubItem
+1928 CMFCRibbonGallery::AddSubItem
+1929 CPaneContainer::AddSubPaneContainer
+1930 CBaseTabbedPane::AddTab
+1931 CMFCBaseTabCtrl::AddTab
+1932 CMFCBaseTabCtrl::AddTab
+1933 CMDIChildWndEx::AddTabbedPane
+1934 CObList::AddTail
+1935 CObList::AddTail
+1936 CObList::AddTail
+1937 CObList::AddTail
+1938 CStringList::AddTail
+1939 CStringList::AddTail
+1940 CStringList::AddTail
+1941 CJumpList::AddTask
+1942 CJumpList::AddTask
+1944 CJumpList::AddTasks
+1945 CJumpList::AddTaskSeparator
+1946 CFrameImpl::AddTearOffToolbar
+1947 CMFCPropertyGridProperty::AddTerminalProp
+1948 CFileDialog::AddText
+1949 CMFCRibbonMainPanel::AddToBottom
+1950 CMFCRibbonBaseElement::AddToKeyList
+1951 CMFCRibbonButtonsGroup::AddToKeyList
+1952 CMFCRibbonBaseElement::AddToListBox
+1953 CMFCRibbonButton::AddToListBox
+1954 CMFCRibbonButtonsGroup::AddToListBox
+1955 CMFCRibbonSeparator::AddToListBox
+1956 CToolTipCtrl::AddTool
+1957 CToolTipCtrl::AddTool
+1958 CMFCRibbonPanel::AddToolBar
+1959 CMFCToolBarsCustomizeDialog::AddToolBar
+1960 CMFCToolBarsCustomizeDialog::AddToolBar
+1961 CMFCToolBar::AddToolBarForImageCollection
+1962 CWinApp::AddToRecentFileList
+1963 CMFCRibbonMainPanel::AddToRight
+1964 CArchiveStream::AddRef
+1965 CBaseTransition::AddToStoryboard
+1966 CKeyFrame::AddToStoryboard
+1967 CKeyFrame::AddToStoryboardAfterTransition
+1968 CBaseTransition::AddToStoryboardAtKeyframes
+1969 CKeyFrame::AddToStoryboardAtOffset
+1970 CMFCRibbonBar::AddToTabs
+1971 CAnimationColor::AddTransition
+1972 CAnimationPoint::AddTransition
+1973 CAnimationRect::AddTransition
+1974 CAnimationPoint::AddTransition
+1975 CAnimationValue::AddTransition
+1976 CAnimationVariable::AddTransition
+1977 CAnimationGroup::AddTransitions
+1978 CMFCPropertySheet::AddTreeCategory
+1979 CMFCRibbonUndoButton::AddUndoAction
+1980 CMFCToolBarsCustomizeDialog::AddUserTools
+1981 CDocument::AddView
+1982 CMouseManager::AddView
+1983 CMouseManager::AddView
+1984 CTabView::AddView
+1985 CMFCAcceleratorKey::AddVirtKeyStr
+1987 CMFCPropertyGridProperty::AdjustButtonRect
+1988 CFrameWndEx::AdjustClientArea
+1989 CMDIChildWndEx::AdjustClientArea
+1990 CMDIFrameWndEx::AdjustClientArea
+1991 COleCntrFrameWndEx::AdjustClientArea
+1992 CMFCStandardColorsPropertyPage::AdjustControlWidth
+1993 CMetaFileDC::AdjustCP
+1994 CRichEditView::AdjustDialogPosition
+1995 CBasePane::AdjustDockingLayout
+1996 CDockingManager::AdjustDockingLayout
+1997 CDockSite::AdjustDockingLayout
+1998 CFrameWndEx::AdjustDockingLayout
+1999 CMDIChildWndEx::AdjustDockingLayout
+2000 CMDIFrameWndEx::AdjustDockingLayout
+2001 COleCntrFrameWndEx::AdjustDockingLayout
+2002 COleDocIPFrameWndEx::AdjustDockingLayout
+2003 COleDocIPFrameWndEx::AdjustDockingLayout
+2004 CMFCVisualManager::AdjustFrames
+2005 CMFCPropertyGridColorProperty::AdjustInPlaceEditRect
+2006 CMFCPropertyGridProperty::AdjustInPlaceEditRect
+2007 CDockSite::AdjustLayout
+2008 CMFCCaptionBar::AdjustLayout
+2009 CMFCPopupMenuBar::AdjustLayout
+2010 CMFCPropertyGridCtrl::AdjustLayout
+2011 CMFCTasksPaneToolBar::AdjustLayout
+2012 CMFCToolBar::AdjustLayout
+2013 CPaneFrameWnd::AdjustLayout
+2014 CVSListBoxBase::AdjustLayout
+2015 CMFCColorBar::AdjustLocations
+2016 CMFCMenuBar::AdjustLocations
+2017 CMFCOutlookBarPane::AdjustLocations
+2018 CMFCOutlookBarToolBar::AdjustLocations
+2019 CMFCPopupMenuBar::AdjustLocations
+2020 CMFCRibbonPanelMenuBar::AdjustLocations
+2021 CMFCTasksPaneToolBar::AdjustLocations
+2022 CMFCToolBar::AdjustLocations
+2023 CMDIClientAreaWnd::AdjustMDIChildren
+2024 CDockingManager::AdjustPaneFrames
+2025 CMultiPaneFrameWnd::AdjustPaneFrames
+2026 CDockablePane::AdjustPaneToPaneContainer
+2027 CDockingPanesRow::AdjustPaneToRowArea
+2028 delete
+2029 CSmartDockingGroupGuidesManager::AdjustPos
+2030 CSmartDockingStandaloneGuide::AdjustPos
+2031 CMFCToolBarComboBoxButton::AdjustRect
+2032 CMFCToolBarDateTimeCtrl::AdjustRect
+2033 CRectTracker::AdjustRect
+2034 COleControlSite::XOleIPSite::AdjustRect
+2035 CDockingManager::AdjustRectToClientArea
+2036 CMFCCaptionBar::AdjustRectToMargin
+2037 CGlobalUtils::AdjustRectToWorkArea
+2038 CMFCPopupMenu::AdjustScroll
+2039 CMFCTasksPane::AdjustScroll
+2040 CMFCToolBar::AdjustSize
+2041 CPane::AdjustSizeImmediate
+2042 CMFCTabCtrl::AdjustTabs
+2043 CMFCTabCtrl::AdjustTabsScroll
+2044 CMFCVisualManager::AdjustToolbars
+2045 CMFCTabCtrl::AdjustWndScroll
+2046 CDHtmlElementEventSink::Advise
+2047 CConnectionPoint::XConnPt::Advise
+2048 CDocObjectServer::XOleObject::Advise
+2049 COleControl::XOleObject::Advise
+2050 COleServerDoc::XOleObject::Advise
+2051 COleServerItem::XOleObject::Advise
+2096 AfxA2WHelper
+2097 AfxAbort
+2098 AfxApplicationRecoveryWrapper
+2099 AfxAutosaveTimerProc
+2101 AfxBeginThread
+2102 AfxBSTR2ABSTR
+2103 AfxBSTR2CString
+2104 AfxCallWndProc
+2105 AfxCancelModes
+2106 AfxCheckError
+2107 AfxClassInit
+2108 AfxComparePath
+2109 AfxCompareValueByRef
+2110 AfxConnectionAdvise
+2111 AfxConnectionUnadvise
+2112 AfxCopyValueByRef
+2113 AfxCoreInitModule
+2114 AfxCreateDC
+2115 AfxCriticalInit
+2116 AfxCriticalNewHandler
+2117 AfxCriticalTerm
+2118 AfxCustomLogFont
+2120 AfxDeleteObject
+2121 AfxDelRegTreeHelper
+2122 AfxDevModeA2W
+2123 AfxDevModeW2A
+2124 AfxDlgProc
+2125 AfxDllCanUnloadNow
+2126 AfxDllGetClassObject
+2127 AfxDoRegisterMFCControlClass
+2128 AfxDrawDitheredBitmap
+2129 AfxDrawGrayBitmap
+2130 AfxDynamicDownCast
+2131 AfxEnableControlContainer
+2132 AfxEndDeferRegisterClass
+2133 AfxEndThread
+2134 AfxEnumMetaFileProc
+2135 AfxExtractSubString
+2136 AfxFailMaxChars
+2137 AfxFailRadio
+2138 AfxFieldText
+2139 AfxFindMessageEntry
+2140 AfxFindResourceHandle
+2141 AfxFindStringResourceHandle
+2142 AfxFormatString1
+2143 AfxFormatString2
+2144 AfxFormatStrings
+2145 AfxFormatStrings
+2146 AfxFreeLibrary
+2147 AfxFullPath
+2149 AfxGetAppModuleState
+2150 AfxGetClassIDFromString
+2151 AfxGetCurrentMessage
+2152 AfxGetD2DState
+2153 AfxGetDitheredBitmap
+2154 AfxGetDlgItemStartFromHWND
+2155 AfxGetDllVersion
+2156 AfxGetFileName
+2157 AfxGetFileTitle
+2158 AfxGetGrayBitmap
+2159 AfxGetHENV
+2160 AfxGetInProcServer
+2161 AfxGetInstanceHandleHelper
+2162 AfxGetInternetHandleType
+2163 AfxGetModuleFileName
+2164 AfxGetModuleShortFileName
+2165 AfxGetModuleState
+2166 AfxGetModuleThreadState
+2168 AFXGetParentFrame
+2169 AfxGetParentOwner
+2170 AfxGetPerUserRegistration
+2171 AfxGetPropSheetFont
+2172 AFXGetRegPath
+2173 AfxGetRoot
+2174 AfxGetStringManager
+2175 AfxGetThread
+2176 AfxGetThreadState
+2177 AfxGetTypeLibCache
+2179 AfxGlobalFree
+2180 AfxGlobalsAddRef
+2181 AfxGlobalsRelease
+2183 AfxHelpEnabled
+2184 AfxHookWindowCreate
+2185 AfxHtmlHelp
+2186 AfxInitCurrentStateApp
+2187 AfxInitExtensionModule
+2188 AfxInitLocalData
+2189 AfxInitNetworkAddressControl
+2190 AfxInitRichEdit
+2191 AfxInitRichEdit2
+2192 AfxInitThread
+2193 AfxInternalIsIdleMessage
+2194 AfxInternalPreTranslateMessage
+2195 AfxInternalProcessWndProcException
+2196 AfxInternalPumpMessage
+2197 AfxInternetStatusCallback
+2198 AfxIsDescendant
+2199 AfxIsExtendedFrameClass
+2200 AfxIsIdleMessage
+2201 AfxIsMFCToolBar
+2202 AfxIsModuleDll
+2203 AfxIsValidAddress
+2204 AfxIsValidAtom
+2205 AfxIsValidAtom
+2206 AfxIsValidAddress
+2207 AfxIsValidAddress
+2209 AfxLoadField
+2210 AfxLoadLangResourceDLL
+2211 AfxLoadLangResourceDLL
+2212 AfxLoadLibrary
+2213 AfxLoadLibraryEx
+2214 AfxLoadString
+2215 AfxLoadString
+2216 AfxLoadSysColorBitmap
+2217 AfxLockGlobals
+2218 AfxLockTempMaps
+2220 AfxMergeMenus
+2221 AfxMessageBox
+2222 AfxMessageBox
+2223 AfxOleCanExitApp
+2224 AfxOleGetUserCtrl
+2225 AfxOleInit
+2226 AfxOleInprocRegisterHelper
+2227 AfxOleLockApp
+2228 AfxOleLockControl
+2229 AfxOleLockControl
+2230 AfxOleOnReleaseAllObjects
+2231 AfxOleRegisterControlClass
+2232 AfxOleRegisterHelper
+2233 AfxOleRegisterPropertyPageClass
+2234 AfxOleRegisterPropertyPageClass
+2235 AfxOleRegisterServerClass
+2236 AfxOleRegisterServerClass
+2237 AfxOleRegisterTypeLib
+2238 AfxOleSetEditMenu
+2239 AfxOleSetUserCtrl
+2240 AfxOleTerm
+2241 AfxOleTermOrFreeLib
+2242 AfxOleUnlockAllControls
+2243 AfxOleUnlockApp
+2244 AfxOleUnlockControl
+2245 AfxOleUnlockControl
+2246 AfxOleUnregisterClass
+2247 AfxOleUnregisterHelper
+2248 AfxOleUnregisterServerClass
+2249 AfxOleUnregisterTypeLib
+2250 AfxParseURL
+2251 AfxParseURLEx
+2252 AFXPlaySystemSound
+2253 AfxPostQuitMessage
+2254 AfxPreTranslateMessage
+2255 AFXPrintPreview
+2256 AfxProcessWndProcException
+2257 AfxPropPageCallback
+2258 AfxPropSheetCallback
+2259 AfxPumpMessage
+2260 AfxReadStringLength
+2261 AfxRegCreateKey
+2262 AfxRegDeleteKey
+2263 AfxRegisterClass
+2264 AfxRegisterMFCCtrlClasses
+2265 AfxRegisterPreviewHandler
+2266 AfxRegisterSiteFactory
+2267 AfxRegisterThumbnailHandler
+2268 AfxRegisterWndClass
+2269 AfxRegOpenKey
+2270 AfxRegOpenKeyEx
+2271 AfxRegQueryValue
+2272 AfxRegSetValue
+2273 AfxReleaseD2DRefs
+2274 AfxRepositionWindow
+2275 AfxResetMsgCache
+2276 AfxResolveShortcut
+2277 AfxRFXBulkDefault
+2278 AfxSafeArrayInit
+2279 AfxSetModuleState
+2281 AfxSetPerUserRegistration
+2282 AfxSetWindowText
+2284 AfxSocketTerm
+2285 AFXSoundThreadProc
+2286 AfxStoreField
+2287 AfxStringFromCLSID
+2288 AfxTaskStringA2W
+2289 AfxTaskStringW2A
+2290 AfxTermExtensionModule
+2291 AfxTermLocalData
+2292 AfxTermThread
+2293 AfxTextFloatFormat
+2294 AfxTextMetricA2W
+2295 AfxTextMetricW2A
+2296 AfxThrowArchiveException
+2297 AfxThrowDBException
+2298 AfxThrowFileException
+2299 AfxThrowInternetException
+2300 AfxThrowInvalidArgException
+2301 AfxThrowLastCleanup
+2302 AfxThrowMemoryException
+2303 AfxThrowNotSupportedException
+2304 AfxThrowOleDispatchException
+2305 AfxThrowOleDispatchException
+2306 AfxThrowOleException
+2307 AfxThrowResourceException
+2308 AfxThrowUserException
+2309 AfxTimeToFileTime
+2310 AfxTlsAddRef
+2311 AfxTlsRelease
+2312 AfxTrackerTerm
+2313 AfxTryCleanup
+2314 AfxUnhookWindowCreate
+2315 AfxUnlockGlobals
+2316 AfxUnlockTempMaps
+2317 AfxUnmergeMenus
+2318 AfxUnRegisterPreviewHandler
+2319 AfxUnregisterSiteFactory
+2320 AfxUnregisterWndClasses
+2322 AfxVariantInit
+2323 AfxVerifyLicFile
+2324 AfxW2AHelper
+2325 AfxWinInit
+2326 AfxWinMain
+2327 AfxWinTerm
+2328 AfxWndProc
+2329 AfxWndProcDllOle
+2330 AfxWriteStringLength
+2331 CDockingManager::AlignAutoHidePane
+2332 CDockingManager::AlignByRect
+2333 CDockSite::AlignDockSite
+2334 CFixedAlloc::Alloc
+2335 CFixedAllocNoSync::Alloc
+2336 CMemFile::Alloc
+2337 CSharedFile::Alloc
+2338 CRecordset::AllocAndCacheFieldInfo
+2339 CAfxStringMgr::Allocate
+2340 CDatabase::AllocConnect
+2341 COleSafeArray::AllocData
+2342 CRecordset::AllocDataCache
+2343 COleSafeArray::AllocDescriptor
+2344 CControlBar::AllocElements
+2345 CPane::AllocElements
+2346 CStatusBar::AllocElements
+2347 CRecordset::AllocHstmt
+2348 CPropertyPage::AllocPSP
+2349 CRecordset::AllocRowset
+2350 CThreadSlotData::AllocSlot
+2351 CRecordset::AllocStatusArrays
+2354 CProperty::AllocValue
+2355 COleControl::AmbientAppearance
+2356 COleControl::AmbientBackColor
+2357 COleControl::AmbientDisplayName
+2358 COleControl::AmbientFont
+2359 COleControl::AmbientForeColor
+2360 COleControl::AmbientLocaleID
+2361 COleControl::AmbientScaleUnits
+2362 COleControl::AmbientShowGrabHandles
+2363 COleControl::AmbientShowHatching
+2364 COleControl::AmbientTextAlign
+2365 COleControl::AmbientUIDead
+2366 COleControl::AmbientUserMode
+2367 CAnimationGroup::Animate
+2368 CAnimationController::AnimateGroup
+2369 CMFCRibbonStatusBarPane::AnimTimerProc
+2376 CByteArray::Append
+2377 CDWordArray::Append
+2378 CObArray::Append
+2379 CObArray::Append
+2380 CStringArray::Append
+2381 CDWordArray::Append
+2382 CWordArray::Append
+2385 CRecordset::AppendFilterAndSortSQL
+2392 CRecordset::AppendNames
+2393 CRecordset::AppendNamesValues
+2394 CRecordset::AppendValues
+2395 CWinApp::ApplicationRecoveryCallback
+2396 COlePropertyPage::XPropertyPage::Apply
+2397 CFileDialog::ApplyOFNToShellDialog
+2398 CMDIClientAreaWnd::ApplyParams
+2399 COleDocument::ApplyPrintDevice
+2400 COleDocument::ApplyPrintDevice
+2401 CBaseTabbedPane::ApplyRestoredTabInfo
+2402 CMFCBaseTabCtrl::ApplyRestoredTabInfo
+2403 CAnimationBaseObject::ApplyTransitions
+2404 CAnimationGroup::ApplyTransitions
+2405 CAnimationVariable::ApplyTransitions
+2406 CDocObjectServer::XOleDocumentView::ApplyViewState
+2407 CDC::ArcTo
+2408 CPaneFrameWnd::ArrangeCaptionButtons
+2409 CDockingPanesRow::ArrangePanes
+2410 CDockingPanesRow::ArrangePanes
+2411 CDockingPanesRow::ArrangePanesRect
+2412 CSmartDockingStandaloneGuideWnd::Assign
+2413 CThreadSlotData::AssignInstance
+2414 CAsyncSocket::AsyncSelect
+2417 CAsyncSocket::Attach
+2418 CBitmapRenderTarget::Attach
+2419 CD2DBitmap::Attach
+2420 CD2DBitmapBrush::Attach
+2421 CD2DBitmap::Attach
+2422 CD2DBitmap::Attach
+2423 CD2DBitmap::Attach
+2424 CD2DLinearGradientBrush::Attach
+2425 CD2DBitmap::Attach
+2426 CD2DPathGeometry::Attach
+2427 CD2DRadialGradientBrush::Attach
+2428 CD2DSolidColorBrush::Attach
+2429 CDC::Attach
+2430 CBitmapRenderTarget::Attach
+2431 CGdiObject::Attach
+2432 CBitmapRenderTarget::Attach
+2433 CImageList::Attach
+2434 CMemFile::Attach
+2435 CMenu::Attach
+2436 CMonikerFile::Attach
+2437 CMonikerFile::Attach
+2438 COleDataObject::Attach
+2439 COleSafeArray::Attach
+2440 COleStreamFile::Attach
+2441 COleVariant::Attach
+2442 CRenderTarget::Attach
+2443 CWnd::Attach
+2444 COleDataObject::AttachClipboard
+2445 COleControlContainer::AttachControlSite
+2446 CWnd::AttachControlSite
+2447 CWnd::AttachControlSite
+2448 COleClientItem::AttachDataObject
+2449 COleDispatchDriver::AttachDispatch
+2450 CAsyncSocket::AttachHandle
+2451 CPrintDialog::AttachOnSetup
+2452 CDockablePane::AttachToTabWnd
+2453 COleControlSite::AttachWindow
+2454 CMFCToolBar::AutoGrayInactiveImages
+2455 CDockingManager::AutoHidePane
+2456 CBitmapButton::AutoLoad
+2457 CDataRecoveryHandler::AutosaveAllDocumentInfo
+2458 CDataRecoveryHandler::AutosaveDocumentInfo
+2459 CSocket::AuxQueueAdd
+2460 CHtmlView::BeforeNavigate2
+2461 COleMessageFilter::BeginBusyState
+2462 CDragListBox::BeginDrag
+2463 CRenderTarget::BeginDraw
+2464 COleDataObject::BeginEnumFormats
+2465 CD2DGeometrySink::BeginFigure
+2466 CFrameWnd::BeginModalState
+2467 CDocument::BeginReadChunks
+2468 CDatabase::BeginTrans
+2469 CDockingPanesRow::BeginTrans
+2470 CCmdTarget::BeginWaitCursor
+2471 CAsyncSocket::Bind
+2472 CDataSourceControl::BindColumns
+2473 COccManager::BindControls
+2474 CDCRenderTarget::BindDC
+2475 COleControlSite::BindDefaultProperty
+2476 CWnd::BindDefaultProperty
+2477 CRecordset::BindFieldsForUpdate
+2478 CRecordset::BindFieldsToColumns
+2479 delete
+2480 CRecordset::BindParams
+2481 CDataSourceControl::BindProp
+2482 CDataSourceControl::BindProp
+2483 COleControlSite::BindProperty
+2484 CWnd::BindProperty
+2485 CMFCImagePaintArea::BitmapToClient
+2486 COleControl::BoundPropertyChanged
+2487 COleControl::BoundPropertyRequestEdit
+2488 CDockingManager::BringBarsToTop
+2489 CFrameWnd::BringToTop
+2490 COleControlContainer::BroadcastAmbientPropertyChange
+2491 CShellManager::BrowseCallbackProc
+2492 CShellManager::BrowseForFolder
+2493 CMenuTearOffManager::Build
+2494 CDBException::BuildErrorString
+2495 CMFCRibbonFontComboBox::BuildFonts
+2496 CMFCMenuBar::BuildOrigItems
+2497 CMFCPopupMenuBar::BuildOrigItems
+2498 CDockingManager::BuildPanesMenu
+2499 CPropertySheet::BuildPropPageArray
+2500 CRecordset::BuildSelectSQL
+2501 COleControl::BuildSharedMenu
+2502 COleDocIPFrameWnd::BuildSharedMenu
+2503 COleIPFrameWnd::BuildSharedMenu
+2504 CRecordset::BuildSQL
+2505 CRecordset::BuildUpdateSQL
+2506 COleControl::ButtonDblClk
+2507 COleControl::ButtonDown
+2508 CMFCAutoHideBar::ButtonFromAutoHideWindow
+2509 CMFCAutoHideBar::ButtonFromPoint
+2510 CMFCToolBar::ButtonToIndex
+2511 COleControl::ButtonUp
+2512 CMFCVisualManagerBitmapCache::Cache
+2513 CMFCVisualManagerBitmapCache::CMFCVisualManagerBitmapCacheItem::Cache
+2514 CTypeLibCache::Cache
+2515 COleControl::XOleCache::Cache
+2516 COleDataSource::CacheData
+2517 COleDataSource::CacheGlobalData
+2518 CTypeLibCache::CacheTypeInfo
+2519 CMFCVisualManagerBitmapCache::CacheY
+2520 CPaneContainer::CalcAvailablePaneSpace
+2521 CPane::CalcAvailableSize
+2522 CPaneContainer::CalcAvailableSpace
+2523 CMiniFrameWnd::CalcBorders
+2524 CMFCTasksPaneFrameWnd::CalcBorderSize
+2525 CPaneFrameWnd::CalcBorderSize
+2526 CDockablePane::CalcCorrectOffset
+2527 CControlBar::CalcDynamicLayout
+2528 CControlBar::CalcDynamicLayout
+2529 CToolBar::CalcDynamicLayout
+2530 CMFCPropertyGridCtrl::CalcEditMargin
+2531 CDockingManager::CalcExpectedDockedRect
+2532 CGlobalUtils::CalcExpectedDockedRect
+2533 CMultiPaneFrameWnd::CalcExpectedDockedRect
+2534 CPaneDivider::CalcExpectedDockedRect
+2535 CBasePane::CalcFixedLayout
+2536 CDialogBar::CalcFixedLayout
+2537 CDockablePane::CalcFixedLayout
+2538 CDockBar::CalcFixedLayout
+2539 CDockingPanesRow::CalcFixedLayout
+2540 CDockSite::CalcFixedLayout
+2541 CDockablePane::CalcFixedLayout
+2542 CMFCCaptionBar::CalcFixedLayout
+2543 CMFCMenuBar::CalcFixedLayout
+2544 CMFCOutlookBarPane::CalcFixedLayout
+2545 CMFCReBar::CalcFixedLayout
+2546 CMFCRibbonBar::CalcFixedLayout
+2547 CMFCRibbonStatusBar::CalcFixedLayout
+2548 CMFCStatusBar::CalcFixedLayout
+2549 CMFCToolBar::CalcFixedLayout
+2550 CPaneDivider::CalcFixedLayout
+2551 CReBar::CalcFixedLayout
+2552 CStatusBar::CalcFixedLayout
+2553 CToolBar::CalcFixedLayout
+2554 CControlBar::CalcInsideRect
+2555 CPane::CalcInsideRect
+2556 CStatusBar::CalcInsideRect
+2557 CDockingPanesRow::CalcLastPaneOffset
+2558 CMFCMenuBar::CalcLayout
+2559 CMFCToolBar::CalcLayout
+2560 CToolBar::CalcLayout
+2561 CMFCMenuBar::CalcMaxButtonHeight
+2562 CMFCToolBar::CalcMaxButtonHeight
+2563 CCheckListBox::CalcMinimumItemHeight
+2564 CPaneFrameWnd::CalcMinSize
+2565 CMFCControlBarImpl::CalcNcSize
+2566 CPreviewView::CalcPageDisplaySize
+2567 CDockingManager::CalcPaneOffset
+2568 CPane::CalcRecentDockedRect
+2569 CDockablePane::CalcRectForSliding
+2570 CPaneContainerManager::CalcRects
+2571 CPreviewView::CalcScaleRatio
+2572 CMFCColorBar::CalcSize
+2573 CMFCPopupMenuBar::CalcSize
+2574 CMFCRibbonPanelMenuBar::CalcSize
+2575 CMFCToolBar::CalcSize
+2576 CToolBar::CalcSize
+2577 CMFCMenuBar::CalcSysButtonSize
+2578 CMFCRibbonPanel::CalcTotalWidth
+2579 CPaneContainer::CalculateRecentSize
+2580 CDockSite::CalcWindowRect
+2581 CEditView::CalcWindowRect
+2582 CMDIClientAreaWnd::CalcWindowRect
+2583 CScrollView::CalcWindowRect
+2584 CView::CalcWindowRect
+2585 CWnd::CalcWindowRect
+2586 CMDIClientAreaWnd::CalcWindowRectForMDITabbedGroups
+2587 CCmdTarget::CallMemberFunc
+2588 CDockablePane::CanAcceptMiniFrame
+2589 CAutoHideDockSite::CanAcceptPane
+2590 CDockSite::CanAcceptPane
+2591 CMFCOutlookBar::CanAcceptPane
+2592 CDHtmlDialog::CanAccessExternal
+2593 COleClientItem::CanActivate
+2594 CRichEditCntrItem::CanActivate
+2595 CSplitterWnd::CanActivateNext
+2596 CDockablePane::CanAutoHide
+2597 CMFCRibbonBaseElement::CanBeAddedToQuickAccessToolBar
+2598 CGlobalUtils::CanBeAttached
+2599 CPaneContainerManager::CanBeAttached
+2600 CMultiPaneFrameWnd::CanBeDockedToPane
+2601 CPaneFrameWnd::CanBeDockedToPane
+2602 CMFCOutlookBarPaneButton::CanBeDropped
+2603 CMFCToolBar::CanBeRestored
+2604 CMFCRibbonButton::CanBeStretched
+2605 CPane::CanBeTabbedDocument
+2606 CRecordset::CanBookmark
+2607 CDatabase::Cancel
+2608 CRecordset::Cancel
+2609 CSocket::CancelBlockingCall
+2610 CDragListBox::CancelDrag
+2611 COleControlSite::XNotifyDBEvents::Cancelled
+2612 COleUILinkInfo::CancelLink
+2613 CDockContext::CancelLoop
+2614 CMFCRibbonPanel::CancelMode
+2615 CPropertyPage::CancelToClose
+2616 CWnd::CancelToolTips
+2617 CRecordset::CancelUpdate
+2618 CDocument::CanCloseFrame
+2619 COleServerDoc::CanCloseFrame
+2620 COleClientItem::CanCreateFromData
+2621 COleClientItem::CanCreateLinkFromData
+2622 CDockContext::CanDock
+2623 CFrameWnd::CanDock
+2624 CFrameWnd::CanEnterHelpMode
+2625 CBasePane::CanFloat
+2626 CBaseTabbedPane::CanFloat
+2627 CMFCToolBar::CanHandleSiblings
+2628 COleClientItem::XOleIPSite::CanInPlaceActivate
+2629 COleUILinkInfo::AddRef
+2630 CGlobalUtils::CanPaneBeInFloatingMultiPaneFrameWnd
+2631 COleClientItem::CanPaste
+2632 CRichEditCtrl::CanPaste
+2633 CRichEditView::CanPaste
+2634 COleClientItem::CanPasteLink
+2635 CMFCOutlookBarTabCtrl::CanShowFewerPageButtons
+2636 CMFCOutlookBarTabCtrl::CanShowMorePageButtons
+2637 COleControlSite::XOleIPSite::CanWindowlessActivate
+2638 CSmartDockingManager::CauseCancelMode
+2639 CDHtmlEventSink::CDHtmlSinkHandlerQueryInterface
+2640 CMFCRibbonPanel::CenterElementsInColumn
+2641 CScrollView::CenterOnPoint
+2642 CWnd::CenterWindow
+2643 CMFCTasksPane::ChangeActivePage
+2644 COleVariant::ChangeType
+2645 CListBox::CharToItem
+2648 CDatabase::Check
+2649 CRecordset::Check
+2650 CGlobalUtils::CheckAlignment
+2651 CPaneContainerManager::CheckAndRemoveNonValidPane
+2652 CMFCPopupMenu::CheckArea
+2653 CDialog::CheckAutoCenter
+2654 CArchiveStream::AddRef
+2655 CDockablePane::CheckAutoHideCondition
+2656 CMFCMaskedEdit::CheckChar
+2657 CArchive::CheckCount
+2658 COleControlContainer::CheckDlgButton
+2659 CWnd::CheckDlgButton
+2660 CPaneContainerManager::CheckForMiniFrameAndCaption
+2661 CCheckListBox::CheckFromPoint
+2662 COleClientItem::CheckGeneral
+2663 CMultiPaneFrameWnd::CheckGripperVisibility
+2664 CDatabase::CheckHstmt
+2667 CMFCButton::CheckNextPrevRadioButton
+2668 CPaneContainer::CheckPaneDividerVisibility
+2669 CDockingPanesRow::CheckPanes
+2670 COleControlContainer::CheckRadioButton
+2671 CWnd::CheckRadioButton
+2672 CMFCCaptionBar::CheckRectangle
+2673 CJumpList::CheckRemovedItems
+2674 CRecordset::CheckRowsetCurrencyStatus
+2675 CRecordset::CheckRowsetError
+2676 CScrollView::CheckScrollBars
+2677 CDockablePane::CheckStopSlideCondition
+2678 CArchiveStream::AddRef
+2679 CPaneDivider::CheckVisibility
+2680 ChWindowFromPoint
+2681 CWinAppEx::CleanState
+2682 CMFCVisualManagerOffice2007::CleanStyle
+2683 CMFCVisualManagerWindows7::CleanStyle
+2684 AFX_GLOBAL_DATA::CleanUp
+2685 CCommandManager::CleanUp
+2686 CKeyboardManager::CleanUp
+2687 CMenuHash::CleanUp
+2688 CMenuImages::CleanUp
+2689 CMFCBaseTabCtrl::CleanUp
+2690 CMFCButton::CleanUp
+2691 CMFCControlRenderer::CleanUp
+2692 CMFCFontComboBox::CleanUp
+2693 CMFCToolBarImages::CleanUp
+2694 CMFCVisualManagerOffice2007::CleanUp
+2695 CMFCVisualManagerWindows7::CleanUp
+2696 CPaneContainer::CleanUp
+2697 CPropertyPage::Cleanup
+2698 CRecentDockSiteInfo::CleanUp
+2699 CMFCAutoHideBar::CleanUpAutoHideButtons
+2700 CMFCRibbonStatusBar::CleanUpCustomizeItems
+2701 CAnimationController::CleanUpGroup
+2702 CAnimationController::CleanUpGroup
+2703 CMFCToolBar::CleanUpImages
+2704 CMFCToolBar::CleanUpLockedImages
+2705 COlePropertyPage::CleanupObjectArray
+2706 CMFCRibbonButtonsGroup::CleanUpSizes
+2707 CMFCRibbonCategory::CleanUpSizes
+2708 CMFCRibbonPanel::CleanUpSizes
+2709 CMFCBaseVisualManager::CleanUpThemes
+2710 CMFCRibbonUndoButton::CleanUpUndoList
+2711 CDBVariant::Clear
+2712 CDockState::Clear
+2713 CMFCFilterChunkValueImpl::Clear
+2714 CMFCRibbonGallery::Clear
+2715 CMFCToolBarImages::Clear
+2716 CMFCVisualManagerBitmapCache::Clear
+2718 CJumpList::ClearAll
+2719 CMFCOutlookBarPane::ClearAll
+2720 CCommandManager::ClearAllCmdImages
+2721 CJumpList::ClearAllDestinations
+2722 CDocument::ClearChunkList
+2723 CCommandManager::ClearCmdImage
+2724 CMFCControlContainer::ClearControlData
+2725 delete
+2726 CMFCRibbonFontComboBox::ClearData
+2727 CRecordset::ClearDirtyFieldStatus
+2728 CRecordset::ClearFieldStatus
+2729 CMFCToolBarFontComboBox::ClearFonts
+2730 CMFCBaseTabCtrl::ClearImageList
+2731 CMFCButton::ClearImages
+2732 CRecordset::ClearNullFieldStatus
+2733 CRecordset::ClearNullParamStatus
+2734 CDocument::ClearPathName
+2735 CAnimationBaseObject::ClearTransitions
+2736 CAnimationVariable::ClearTransitions
+2737 CCommandManager::ClearUserCmdImages
+2738 COleControl::ClientToParent
+2739 CWnd::ClientToScreen
+2740 COleControl::ClipCaretRect
+2741 CPreviewDC::ClipToPage
+2743 CArchiveStream::Clone
+2744 CEnumArray::XEnumVOID::Clone
+2745 CDocObjectServer::XOleDocumentView::Clone
+2748 CArchive::Close
+2749 CAsyncMonikerFile::Close
+2750 CAsyncSocket::Close
+2751 CCachedDataPathProperty::Close
+2752 CD2DGeometrySink::Close
+2753 CDatabase::Close
+2754 CFile::Close
+2755 CFileFind::Close
+2756 CInternetConnection::Close
+2757 CInternetFile::Close
+2758 CInternetSession::Close
+2759 CMemFile::Close
+2760 CMirrorFile::Close
+2761 CMonikerFile::Close
+2762 COleClientItem::Close
+2763 COleStreamFile::Close
+2764 CRecordset::Close
+2765 CSettingsStore::Close
+2766 CSocket::Close
+2767 CSocketFile::Close
+2768 CStdioFile::Close
+2769 CDocObjectServer::XOleObject::Close
+2770 COleControl::XOleObject::Close
+2771 COleServerDoc::XOleObject::Close
+2772 CArchiveStream::Clone
+2773 CDocManager::CloseAllDocuments
+2774 CDocTemplate::CloseAllDocuments
+2775 CWinApp::CloseAllDocuments
+2776 CMDIClientAreaWnd::CloseAllWindows
+2777 CMFCPropertyGridCtrl::CloseColorPopup
+2778 CFileFind::CloseContext
+2779 CFtpFileFind::CloseContext
+2780 CFtpFileFind::CloseContext
+2781 CMFCToolBarsMenuPropertyPage::CloseContextMenu
+2782 CMFCPopupMenuBar::CloseDelayedSubMenu
+2783 CMFCRibbonPanelMenuBar::CloseDelayedSubMenu
+2784 CMFCPopupMenu::CloseMenu
+2785 CMultiPaneFrameWnd::CloseMiniFrame
+2786 CPaneFrameWnd::CloseMiniFrame
+2787 CMFCRibbonBaseElement::ClosePopupMenu
+2788 CMFCRibbonButton::ClosePopupMenu
+2789 CDocObjectServer::XOleDocumentView::CloseView
+2790 CMFCTasksPane::CollapseAllGroups
+2791 CMFCTasksPane::CollapseAllGroups
+2792 CMFCTasksPane::CollapseGroup
+2793 CMFCPopupMenu::CollapseSubmenus
+2798 CMFCRibbonCollector::CollectBaseElement
+2799 CMFCRibbonCollector::CollectCategory
+2800 CMFCRibbonCollector::CollectCategoryMain
+2801 CMFCRibbonCollector::CollectElement
+2802 CMFCRibbonCollector::CollectElement
+2803 CMFCRibbonCollector::CollectImageInfo
+2804 CMFCRibbonCollector::CollectPanel
+2805 CMFCRibbonCollector::CollectQATElements
+2806 CMFCRibbonCollector::CollectRibbonBar
+2807 CMFCRibbonCollector::CollectRibbonBar
+2809 CD2DGeometry::CombineWithGeometry
+2810 CFtpConnection::Command
+2811 CMFCStatusBar::CommandToIndex
+2812 CMFCToolBar::CommandToIndex
+2813 CStatusBar::CommandToIndex
+2814 CToolBar::CommandToIndex
+2815 CArchiveStream::Clone
+2816 COleClientItem::CommitItem
+2817 COleDocument::CommitItems
+2818 CJumpList::CommitList
+2819 CDatabase::CommitTrans
+2820 CDockingPanesRow::CommitTrans
+2821 CFile::CommonBaseInit
+2822 CStdioFile::CommonBaseInit
+2823 CDialogEx::CommonConstruct
+2824 COleObjectFactory::CommonConstruct
+2825 CPropertyPage::CommonConstruct
+2826 CPropertyPage::CommonConstruct
+2827 CPropertySheet::CommonConstruct
+2828 CPropertySheet::CommonConstruct
+2829 CWinThread::CommonConstruct
+2830 CMFCDesktopAlertWnd::CommonCreate
+2831 CD2DBitmap::CommonInit
+2832 CD2DBitmapBrush::CommonInit
+2833 CD2DBrushProperties::CommonInit
+2834 CFile::CommonInit
+2835 CMFCControlRendererInfo::CommonInit
+2836 CMFCCustomizeButton::CommonInit
+2837 CMFCDropDownListBox::CommonInit
+2838 CMFCHeaderCtrl::CommonInit
+2839 CMFCPropertyPage::CommonInit
+2840 CMFCPropertySheet::CommonInit
+2841 CMFCRibbonButton::CommonInit
+2842 CMFCRibbonCategory::CommonInit
+2843 CMFCRibbonColorButton::CommonInit
+2844 CMFCRibbonComboBox::CommonInit
+2845 CMFCRibbonEdit::CommonInit
+2846 CMFCRibbonGallery::CommonInit
+2847 CMFCRibbonGalleryMenuButton::CommonInit
+2848 CMFCRibbonPanel::CommonInit
+2849 CMFCRibbonPanelMenuBar::CommonInit
+2850 CMFCRibbonProgressBar::CommonInit
+2851 CMFCRibbonSlider::CommonInit
+2852 CMFCRibbonStatusBarPane::CommonInit
+2853 CMFCRibbonUndoButton::CommonInit
+2854 CMFCToolBarImages::CommonInit
+2855 CStdioFile::CommonInit
+2858 CMFCToolBarComboBoxButton::Compare
+2859 COleUILinkInfo::AddRef
+2860 COleUILinkInfo::AddRef
+2861 CMFCFontComboBox::CompareItem
+2864 CMFCListCtrl::CompareProc
+2865 CMFCShellTreeCtrl::CompareProc
+2866 CMFCPropertyGridCtrl::CompareProps
+2867 CMFCToolBarButton::CompareWith
+2868 CMFCToolBarMenuButton::CompareWith
+2869 CD2DGeometry::CompareWithGeometry
+2870 CD2DGeometry::ComputeArea
+2871 CPreviewDC::ComputeDeltas
+2872 CD2DGeometry::ComputeLength
+2873 CD2DGeometry::ComputePointAtLength
+2876 CShellManager::ConcatenateItem
+2877 CAsyncSocket::Connect
+2878 CDatabase::Connect
+2879 CDHtmlDialog::ConnectDHtmlElementEvents
+2880 CDHtmlDialog::ConnectDHtmlEvents
+2881 CAsyncSocket::ConnectHelper
+2882 CSocket::ConnectHelper
+2883 COleControlSite::ConnectSink
+2884 COleTemplateServer::ConnectTemplate
+2885 CDHtmlEventSink::ConnectToConnectionPoint
+2886 CDHtmlControlSink::ConnectToControl
+2887 COleServerDoc::ConnectView
+2890 CPropertyPage::Construct
+2891 CPropertyPage::Construct
+2892 CPropertyPage::Construct
+2893 CPropertyPage::Construct
+2894 CPropertySheet::Construct
+2895 CPropertySheet::Construct
+2896 CPropertySheet::Construct
+2897 CPropertySheet::Construct
+2898 CRectTracker::Construct
+2899 CMFCRibbonConstructor::ConstructBaseElement
+2900 CMFCRibbonConstructor::ConstructCategory
+2901 CMFCRibbonConstructor::ConstructCategoryMain
+2902 CMFCRibbonConstructor::ConstructElement
+2903 CMFCRibbonConstructor::ConstructPanel
+2904 CMFCRibbonConstructor::ConstructQATElements
+2905 CMFCRibbonConstructor::ConstructRibbonBar
+2906 CMFCRibbonConstructor::ConstructTabElements
+2907 CAnimationBaseObject::ContainsVariable
+2908 CArchiveStream::Clone
+2909 COleServerDoc::XOleInPlaceActiveObject::ContextSensitiveHelp
+2910 COleFrameHook::XOleInPlaceFrame::ContextSensitiveHelp
+2911 CArchiveStream::Clone
+2912 COleServerDoc::XOleInPlaceObject::ContextSensitiveHelp
+2913 CArchiveStream::Clone
+2914 COleClientItem::XOleIPSite::ContextSensitiveHelp
+2915 CArchiveStream::Clone
+2916 CDocument::XOleWindow::ContextSensitiveHelp
+2917 CArchiveStream::Clone
+2918 CMFCColorBar::ContextToSize
+2919 CPropertySheet::ContinueModal
+2920 CWnd::ContinueModal
+2921 ControlBarCleanUp
+2922 CMDIFrameWndEx::ControlBarToTabbedDocument
+2923 COleControl::ControlInfoChanged
+2924 COlePropertiesDialog::XOleUIObjInfo::ConvertObject
+2925 COleClientItem::ConvertTo
+2926 CRichEditCntrItem::ConvertTo
+2927 CMFCToolBarImages::ConvertTo32Bits
+2928 CBaseTabbedPane::ConvertToTabbedDocument
+2929 CDockablePane::ConvertToTabbedDocument
+2930 CMultiPaneFrameWnd::ConvertToTabbedDocument
+2931 delete
+2932 CPaneFrameWnd::ConvertToTabbedDocument
+2933 CByteArray::Copy
+2934 CDWordArray::Copy
+2935 CMFCToolBarImages::Copy
+2936 CObArray::Copy
+2937 COleSafeArray::Copy
+2938 CPaneContainer::Copy
+2939 CObArray::Copy
+2940 CStringArray::Copy
+2941 CDWordArray::Copy
+2942 CWordArray::Copy
+2943 CMFCOutlookBarPane::CopyButtonsList
+2948 CMFCFilterChunkValueImpl::CopyChunk
+2949 CDataSourceControl::CopyColumnID
+2950 CMFCColorMenuButton::CopyFrom
+2951 CMFCCustomizeButton::CopyFrom
+2952 CMFCCustomizeMenuButton::CopyFrom
+2953 CMFCDropDownToolbarButton::CopyFrom
+2954 CMFCFilterChunkValueImpl::CopyFrom
+2955 CMFCRibbonBaseElement::CopyFrom
+2956 CMFCRibbonButton::CopyFrom
+2957 CMFCRibbonButtonsGroup::CopyFrom
+2958 CMFCRibbonCategory::CopyFrom
+2959 CMFCRibbonColorButton::CopyFrom
+2960 CMFCRibbonComboBox::CopyFrom
+2961 CMFCRibbonDefaultPanelButton::CopyFrom
+2962 CMFCRibbonEdit::CopyFrom
+2963 CMFCRibbonFontComboBox::CopyFrom
+2964 CMFCRibbonGallery::CopyFrom
+2965 CMFCRibbonGalleryIcon::CopyFrom
+2966 CMFCRibbonGalleryMenuButton::CopyFrom
+2967 CMFCRibbonLinkCtrl::CopyFrom
+2968 CMFCRibbonMainPanel::CopyFrom
+2969 CMFCRibbonPanel::CopyFrom
+2970 CMFCRibbonProgressBar::CopyFrom
+2971 CMFCRibbonQuickAccessToolBarDefaultState::CopyFrom
+2972 CMFCRibbonSeparator::CopyFrom
+2973 CMFCRibbonSlider::CopyFrom
+2974 CMFCRibbonStatusBarPane::CopyFrom
+2975 CMFCRibbonTab::CopyFrom
+2976 CMFCRibbonUndoButton::CopyFrom
+2977 CMFCToolBarButton::CopyFrom
+2978 CMFCToolBarComboBoxButton::CopyFrom
+2979 CMFCToolBarDateTimeCtrl::CopyFrom
+2980 CMFCToolBarEditBoxButton::CopyFrom
+2981 CMFCToolBarFontComboBox::CopyFrom
+2982 CMFCToolBarMenuButton::CopyFrom
+2983 CMFCToolBarMenuButtonsButton::CopyFrom
+2984 CMFCToolBarSpinEditBoxButton::CopyFrom
+2985 CMFCToolBarSystemMenuButton::CopyFrom
+2986 CRibbonCategoryScroll::CopyFrom
+2987 CD2DBitmap::CopyFromBitmap
+2988 CD2DBitmap::CopyFromMemory
+2989 CD2DBitmap::CopyFromRenderTarget
+2990 CUserTool::CopyIconToClipboard
+2991 CMFCToolBarImages::CopyImageToClipboard
+2992 CShellManager::CopyItem
+2993 CMFCKeyMapDialog::CopyKeyMap
+2994 CContextMenuManager::CopyOriginalMenuItemsFromMenu
+2995 CContextMenuManager::CopyOriginalMenuItemsToMenu
+2996 CBasePane::CopyState
+2997 CDockablePane::CopyState
+2998 CPane::CopyState
+2999 CMFCToolBarImages::CopyTemp
+3000 CArchiveStream::Clone
+3001 CMFCToolBarImages::CopyTo
+3002 CSmartDockingInfo::CopyTo
+3003 COleClientItem::CopyToClipboard
+3004 COleServerItem::CopyToClipboard
+3005 CMFCZoomKernel::CorrectZoomSize
+3006 CAnimateCtrl::Create
+3007 CAnimationVariable::Create
+3008 CAsyncSocket::Create
+3009 CButton::Create
+3010 CCheckListBox::Create
+3011 CComboBox::Create
+3012 CComboBoxEx::Create
+3013 CControlFrameWnd::Create
+3014 CD2DBitmap::Create
+3015 CD2DBitmapBrush::Create
+3016 CD2DLayer::Create
+3017 CD2DLinearGradientBrush::Create
+3018 CD2DMesh::Create
+3019 CD2DPathGeometry::Create
+3020 CD2DRadialGradientBrush::Create
+3021 CD2DSolidColorBrush::Create
+3022 CDateTimeCtrl::Create
+3023 CDCRenderTarget::Create
+3024 CDialog::Create
+3025 CDialogBar::Create
+3026 CDockablePane::Create
+3027 CDockablePane::Create
+3028 CDockBar::Create
+3029 CDockingManager::Create
+3030 CDockSite::Create
+3031 CEdit::Create
+3032 CFindReplaceDialog::Create
+3033 CFormView::Create
+3034 CFrameWnd::Create
+3035 CHeaderCtrl::Create
+3036 CHotKeyCtrl::Create
+3037 CHtmlEditCtrl::Create
+3038 CHtmlEditView::Create
+3039 CHtmlView::Create
+3040 CHwndRenderTarget::Create
+3041 CImageList::Create
+3042 CImageList::Create
+3043 CImageList::Create
+3044 CImageList::Create
+3045 CImageList::Create
+3046 CIPAddressCtrl::Create
+3047 CLinkCtrl::Create
+3048 CLinkCtrl::Create
+3049 CListBox::Create
+3050 CListCtrl::Create
+3051 CMDIChildWnd::Create
+3052 CMFCAutoHideBar::Create
+3053 CMFCAutoHideButton::Create
+3054 CMFCCaptionBar::Create
+3055 CMFCColorBar::Create
+3056 CMFCControlRenderer::Create
+3057 CMFCDesktopAlertWnd::Create
+3058 CMFCDesktopAlertWnd::Create
+3059 CMFCDropDownFrame::Create
+3060 CMFCMenuBar::Create
+3061 CMFCOutlookBar::Create
+3062 CMFCOutlookBarPane::Create
+3063 CMFCOutlookBarTabCtrl::Create
+3064 CMFCPopupMenu::Create
+3065 CMFCPreviewCtrlImpl::Create
+3066 CMFCPreviewCtrlImpl::Create
+3067 CMFCPropertyGridCtrl::Create
+3068 CMFCPropertyGridToolTipCtrl::Create
+3069 CMFCReBar::Create
+3070 CMFCRibbonBar::Create
+3071 CMFCRibbonStatusBar::Create
+3072 COleUILinkInfo::AddRef
+3073 CMFCShadowRenderer::Create
+3074 CMFCShadowWnd::Create
+3075 CMFCStatusBar::Create
+3076 CMFCTabCtrl::Create
+3077 CMFCToolBar::Create
+3078 CMFCToolBarsCustomizeDialog::Create
+3079 CMFCZoomKernel::Create
+3080 CMFCZoomKernel::Create
+3081 CMiniDockFrameWnd::Create
+3082 CMiniFrameWnd::Create
+3083 CMonthCalCtrl::Create
+3084 CMonthCalCtrl::Create
+3085 COleResizeBar::Create
+3086 COleSafeArray::Create
+3087 COleSafeArray::Create
+3088 CPagerCtrl::Create
+3089 CPane::Create
+3090 CPaneContainerManager::Create
+3091 CPaneDialog::Create
+3092 CPaneDialog::Create
+3093 CPaneDivider::Create
+3094 CPaneFrameWnd::Create
+3095 CPlex::Create
+3096 CProgressCtrl::Create
+3097 CPropertySheet::Create
+3098 CReBar::Create
+3099 CReBarCtrl::Create
+3100 CReflectorWnd::Create
+3101 CRichEditCtrl::Create
+3102 CScreenWnd::Create
+3103 CScrollBar::Create
+3104 CSettingsStoreSP::Create
+3105 CSliderCtrl::Create
+3106 CSmartDockingGroupGuide::Create
+3107 delete
+3108 CSmartDockingGroupGuidesManager::Create
+3109 CSmartDockingHighlighterWnd::Create
+3110 CSmartDockingManager::Create
+3111 CSmartDockingStandaloneGuide::Create
+3112 CSmartDockingStandaloneGuideWnd::Create
+3113 CSpinButtonCtrl::Create
+3114 CSplitterWnd::Create
+3115 CStatic::Create
+3116 CStatusBar::Create
+3117 CStatusBarCtrl::Create
+3118 CTabCtrl::Create
+3119 CToolBar::Create
+3120 CToolBarCtrl::Create
+3121 CToolTipCtrl::Create
+3122 CTreeCtrl::Create
+3123 CWnd::Create
+3124 CWnd::CreateAccessibleProxy
+3125 CMFCRibbonConstructor::CreateApplicationButton
+3126 CMFCVisualManagerVS2005::CreateAutoHideButtonRegion
+3127 COleUILinkInfo::AddRef
+3128 CMonikerFile::CreateBindHost
+3129 CAsyncMonikerFile::CreateBindStatusCallback
+3130 CDrawingManager::CreateBitmap_32
+3131 CDrawingManager::CreateBitmap_32
+3132 CMFCPropertyGridCtrl::CreateBoldFont
+3133 CMFCRibbonConstructor::CreateCategory
+3134 CMFCRibbonConstructor::CreateCategoryContext
+3135 CMFCRibbonConstructor::CreateCategoryMain
+3136 CMDIFrameWnd::CreateClient
+3137 CRichEditDoc::CreateClientItem
+3138 COleClientItem::CreateCloneFrom
+3139 CMFCPropertyGridProperty::CreateCombo
+3140 CMFCToolBarComboBoxButton::CreateCombo
+3141 CMFCToolBarFontComboBox::CreateCombo
+3142 CMFCToolBarFontSizeComboBox::CreateCombo
+3143 CSplitterWnd::CreateCommon
+3144 CRenderTarget::CreateCompatibleRenderTarget
+3145 CConnectionPoint::CreateConnectionArray
+3146 COccManager::CreateContainer
+3147 CMFCColorBar::CreateControl
+3148 COleControlContainer::CreateControl
+3149 COleControlContainer::CreateControl
+3150 COleControlContainer::CreateControl
+3151 COleControlSite::CreateControl
+3152 COleControlSite::CreateControl
+3153 COleControlSite::CreateControl
+3154 CWnd::CreateControl
+3155 CWnd::CreateControl
+3156 CWnd::CreateControl
+3157 CWnd::CreateControl
+3158 COleControlContainer::CreateControlCommon
+3159 COleControlSite::CreateControlCommon
+3160 CWnd::CreateControlContainer
+3161 CDHtmlDialog::CreateControlSite
+3162 CHtmlView::CreateControlSite
+3163 CWnd::CreateControlSite
+3164 COleControl::CreateControlWindow
+3165 CMenuImages::CreateCopy
+3166 CMFCOutlookBar::CreateCustomPage
+3167 CMFCToolBarDateTimeCtrl::CreateDateTimeCtrl
+3168 CMFCTasksPane::CreateDefaultMiniframe
+3169 CPane::CreateDefaultMiniframe
+3170 CDockablePane::CreateDefaultPaneDivider
+3171 CBrush::CreateDIBPatternBrush
+3172 CFtpConnection::CreateDirectoryA
+3173 COleDispatchDriver::CreateDispatch
+3174 COleDispatchDriver::CreateDispatch
+3175 AFX_GLOBAL_DATA::CreateDitherBitmap
+3176 CWnd::CreateDlg
+3177 CMFCControlContainer::CreateDlgControl
+3178 COccManager::CreateDlgControl
+3179 COccManager::CreateDlgControls
+3180 COccManager::CreateDlgControls
+3181 CWnd::CreateDlgIndirect
+3182 CDataRecoveryHandler::CreateDocumentInfo
+3183 COleUILinkInfo::AddRef
+3184 CListCtrl::CreateDragImage
+3185 CTreeCtrl::CreateDragImage
+3186 CMFCOutlookBarPane::CreateDroppedButton
+3187 CMFCPopupMenuBar::CreateDroppedButton
+3188 CMFCToolBar::CreateDroppedButton
+3189 CMFCRibbonEdit::CreateEdit
+3190 CMFCToolBarComboBoxButton::CreateEdit
+3191 CMFCToolBarEditBoxButton::CreateEdit
+3192 CMFCToolBarSpinEditBoxButton::CreateEdit
+3193 CMFCRibbonConstructor::CreateElement
+3194 CPictureHolder::CreateEmpty
+3195 CAnimateCtrl::CreateEx
+3196 CBasePane::CreateEx
+3197 CAnimateCtrl::CreateEx
+3198 CDockablePane::CreateEx
+3199 CDockSite::CreateEx
+3200 CAnimateCtrl::CreateEx
+3201 CAnimateCtrl::CreateEx
+3202 CAnimateCtrl::CreateEx
+3203 CLinkCtrl::CreateEx
+3204 CLinkCtrl::CreateEx
+3205 CListCtrl::CreateEx
+3206 CMFCMenuBar::CreateEx
+3207 CMFCRibbonBar::CreateEx
+3208 CMFCRibbonStatusBar::CreateEx
+3209 CMFCStatusBar::CreateEx
+3210 CMFCToolBar::CreateEx
+3211 CMiniFrameWnd::CreateEx
+3212 CAnimateCtrl::CreateEx
+3213 CPane::CreateEx
+3214 CPaneDivider::CreateEx
+3215 CPaneFrameWnd::CreateEx
+3216 CAnimateCtrl::CreateEx
+3217 CReBarCtrl::CreateEx
+3218 CRichEditCtrl::CreateEx
+3219 CAnimateCtrl::CreateEx
+3220 CAnimateCtrl::CreateEx
+3221 CStatusBar::CreateEx
+3222 CStatusBarCtrl::CreateEx
+3223 CAnimateCtrl::CreateEx
+3224 CToolBar::CreateEx
+3225 CToolBarCtrl::CreateEx
+3226 CToolTipCtrl::CreateEx
+3227 CTreeCtrl::CreateEx
+3228 CWnd::CreateEx
+3229 CWnd::CreateEx
+3230 CFrameWnd::CreateFloatingFrame
+3231 CMFCTasksPane::CreateFonts
+3232 COleControl::CreateFrameWindow
+3233 CPictureHolder::CreateFromBitmap
+3234 CPictureHolder::CreateFromBitmap
+3235 CPictureHolder::CreateFromBitmap
+3236 COleClientItem::CreateFromClipboard
+3237 COleClientItem::CreateFromData
+3238 COleClientItem::CreateFromFile
+3239 CPictureHolder::CreateFromIcon
+3240 CPictureHolder::CreateFromIcon
+3241 CMFCToolBarImages::CreateFromImageList
+3242 CMFCMenuBar::CreateFromMenu
+3243 CMFCToolBarMenuButton::CreateFromMenu
+3244 CMFCToolBarSystemMenuButton::CreateFromMenu
+3245 CPictureHolder::CreateFromMetafile
+3246 CMFCToolBarButton::CreateFromOleData
+3247 CMFCDesktopAlertDialog::CreateFromParams
+3248 CMFCRibbonInfo::XBase::CreateFromTag
+3249 CMFCRibbonInfo::XBase::CreateFromType
+3250 CMFCRibbonInfo::XElement::CreateFromType
+3251 CMFCVisualManagerOfficeXP::CreateGripperBrush
+3252 CMFCColorPickerCtrl::CreateHexagon
+3253 CMFCColorPickerCtrl::CreateHexGreyScaleBar
+3254 CMFCRibbonGallery::CreateIcons
+3255 CDialog::CreateIndirect
+3256 CDialog::CreateIndirect
+3257 CDialog::CreateIndirect
+3258 CDialog::CreateIndirect
+3259 CMFCPropertyGridProperty::CreateInPlaceEdit
+3260 COleServerDoc::CreateInPlaceFrame
+3261 AFX_COM::CreateInstance
+3262 COleObjectFactory::XClassFactory::CreateInstance
+3263 COleObjectFactory::XClassFactory::CreateInstanceLic
+3264 COleInsertDialog::CreateItem
+3265 COlePasteSpecialDialog::CreateItem
+3266 CShellManager::CreateItem
+3267 CSettingsStore::CreateKey
+3268 CAnimationController::CreateKeyframe
+3269 CAnimationController::CreateKeyframe
+3270 COleClientItem::CreateLinkFromClipboard
+3271 COleClientItem::CreateLinkFromData
+3272 COleClientItem::CreateLinkFromFile
+3273 CGopherConnection::CreateLocator
+3274 CGopherConnection::CreateLocator
+3275 CGopherConnection::CreateLocator
+3276 CMFCToolBarImages::CreateMask
+3277 COleStreamFile::CreateMemoryStream
+3278 CMFCTasksPane::CreateMenu
+3279 CMFCToolBarMenuButton::CreateMenu
+3280 CMFCToolBarSystemMenuButton::CreateMenu
+3281 CMFCTasksPane::CreateNavigationToolbar
+3282 CMDIFrameWnd::CreateNewChild
+3283 CDocTemplate::CreateNewDocument
+3284 CDocTemplate::CreateNewFrame
+3285 COleClientItem::CreateNewItem
+3286 CVSListBoxBase::CreateNewItem
+3287 CMDIClientAreaWnd::CreateNewTabGroup
+3288 CMFCToolBarsToolsPropertyPage::CreateNewTool
+3289 CUserToolsManager::CreateNewTool
+3290 CFrameImpl::CreateNewToolBar
+3291 CMDIFrameWndEx::CreateNewWindow
+3292 CAnimationController::CreateObject
+3293 CAutoHideDockSite::CreateObject
+3294 CByteArray::CreateObject
+3295 CDC::CreateObject
+3296 CDocItem::CreateObject
+3297 CDockablePane::CreateObject
+3298 CDockablePaneAdapter::CreateObject
+3299 CDockSite::CreateObject
+3300 CDockState::CreateObject
+3301 CDWordArray::CreateObject
+3302 CEditView::CreateObject
+3303 CFrameWnd::CreateObject
+3304 CFrameWndEx::CreateObject
+3305 CGdiObject::CreateObject
+3306 CHelpComboBoxButton::CreateObject
+3307 CHtmlEditView::CreateObject
+3308 CHtmlView::CreateObject
+3309 CImageList::CreateObject
+3310 CListView::CreateObject
+3311 CMapStringToOb::CreateObject
+3312 CMapStringToString::CreateObject
+3313 CMapWordToOb::CreateObject
+3314 CMDIChildWnd::CreateObject
+3315 CMDIChildWndEx::CreateObject
+3316 CMDIFrameWnd::CreateObject
+3317 CMDIFrameWndEx::CreateObject
+3318 CMDITabProxyWnd::CreateObject
+3319 CMenu::CreateObject
+3320 CMFCAutoHideBar::CreateObject
+3321 CMFCAutoHideButton::CreateObject
+3322 CMFCBaseToolBar::CreateObject
+3323 CMFCButton::CreateObject
+3324 CMFCCaptionBar::CreateObject
+3325 CMFCColorBar::CreateObject
+3326 CMFCColorMenuButton::CreateObject
+3327 CMFCControlRenderer::CreateObject
+3328 CMFCCustomColorsPropertyPage::CreateObject
+3329 CMFCCustomizeButton::CreateObject
+3330 CMFCCustomizeMenuButton::CreateObject
+3331 CMFCDesktopAlertDialog::CreateObject
+3332 CMFCDropDownFrame::CreateObject
+3333 CMFCDropDownToolBar::CreateObject
+3334 CMFCDropDownToolbarButton::CreateObject
+3335 CMFCMenuBar::CreateObject
+3336 CMFCMousePropertyPage::CreateObject
+3337 CMFCOutlookBar::CreateObject
+3338 CMFCOutlookBarPane::CreateObject
+3339 CMFCOutlookBarPaneAdapter::CreateObject
+3340 CMFCOutlookBarPaneButton::CreateObject
+3341 CMFCOutlookBarTabCtrl::CreateObject
+3342 CMFCPopupMenu::CreateObject
+3343 CMFCPopupMenuBar::CreateObject
+3344 CMFCPropertyPage::CreateObject
+3345 CMFCRibbonApplicationButton::CreateObject
+3346 CMFCRibbonButton::CreateObject
+3347 CMFCRibbonButtonsGroup::CreateObject
+3348 CMFCRibbonCaptionButton::CreateObject
+3349 CMFCRibbonCategory::CreateObject
+3350 CMFCRibbonCheckBox::CreateObject
+3351 CMFCRibbonColorButton::CreateObject
+3352 CMFCRibbonColorMenuButton::CreateObject
+3353 CMFCRibbonComboBox::CreateObject
+3354 CMFCRibbonContextCaption::CreateObject
+3355 CMFCRibbonCustomizePropertyPage::CreateObject
+3356 CMFCRibbonDefaultPanelButton::CreateObject
+3357 CMFCRibbonEdit::CreateObject
+3358 CMFCRibbonFontComboBox::CreateObject
+3359 CMFCRibbonGallery::CreateObject
+3360 CMFCRibbonGalleryIcon::CreateObject
+3361 CMFCRibbonGalleryMenuButton::CreateObject
+3362 CMFCRibbonLabel::CreateObject
+3363 CMFCRibbonLaunchButton::CreateObject
+3364 CMFCRibbonLinkCtrl::CreateObject
+3365 CMFCRibbonMainPanel::CreateObject
+3366 CMFCRibbonMainPanelButton::CreateObject
+3367 CMFCRibbonMiniToolBar::CreateObject
+3368 CMFCRibbonPanel::CreateObject
+3369 CMFCRibbonProgressBar::CreateObject
+3370 CMFCRibbonQuickAccessCustomizeButton::CreateObject
+3371 CMFCRibbonQuickAccessToolBar::CreateObject
+3372 CMFCRibbonRecentFilesList::CreateObject
+3373 CMFCRibbonSeparator::CreateObject
+3374 CMFCRibbonSlider::CreateObject
+3375 CMFCRibbonStatusBarCustomizeButton::CreateObject
+3376 CMFCRibbonStatusBarPane::CreateObject
+3377 CMFCRibbonUndoButton::CreateObject
+3378 CMFCShadowRenderer::CreateObject
+3379 CMFCShowAllButton::CreateObject
+3380 CMFCStandardColorsPropertyPage::CreateObject
+3381 CMFCTabCtrl::CreateObject
+3382 CMFCTasksPane::CreateObject
+3383 CMFCTasksPaneFrameWnd::CreateObject
+3384 CMFCTasksPaneToolBar::CreateObject
+3385 CMFCToolBar::CreateObject
+3386 CMFCToolBarButton::CreateObject
+3387 CMFCToolBarColorButton::CreateObject
+3388 CMFCToolBarComboBoxButton::CreateObject
+3389 CMFCToolBarDateTimeCtrl::CreateObject
+3390 CMFCToolBarEditBoxButton::CreateObject
+3391 CMFCToolBarFontComboBox::CreateObject
+3392 CMFCToolBarFontSizeComboBox::CreateObject
+3393 CMFCToolBarMenuButton::CreateObject
+3394 CMFCToolBarMenuButtonsButton::CreateObject
+3395 CMFCToolBarsCommandsPropertyPage::CreateObject
+3396 CMFCToolBarsKeyboardPropertyPage::CreateObject
+3397 CMFCToolBarsListPropertyPage::CreateObject
+3398 CMFCToolBarsMenuPropertyPage::CreateObject
+3399 CMFCToolBarsOptionsPropertyPage::CreateObject
+3400 CMFCToolBarSpinEditBoxButton::CreateObject
+3401 CMFCToolBarSystemMenuButton::CreateObject
+3402 CMFCToolTipCtrl::CreateObject
+3403 CMFCVisualManager::CreateObject
+3404 CMFCVisualManagerOffice2003::CreateObject
+3405 CMFCVisualManagerOffice2007::CreateObject
+3406 CMFCVisualManagerOfficeXP::CreateObject
+3407 CMFCVisualManagerVS2005::CreateObject
+3408 CMFCVisualManagerVS2008::CreateObject
+3409 CMFCVisualManagerWindows::CreateObject
+3410 CMFCVisualManagerWindows7::CreateObject
+3411 CMiniDockFrameWnd::CreateObject
+3412 CMiniFrameWnd::CreateObject
+3413 CMouseManager::CreateObject
+3414 CMultiPaneFrameWnd::CreateObject
+3415 CObArray::CreateObject
+3416 CObList::CreateObject
+3417 COleDocIPFrameWnd::CreateObject
+3418 COleDocIPFrameWndEx::CreateObject
+3419 COleIPFrameWnd::CreateObject
+3420 COleIPFrameWndEx::CreateObject
+3421 COleServerDocEx::CreateObject
+3422 COutlookCustomizeButton::CreateObject
+3423 CPane::CreateObject
+3424 CPaneContainerManager::CreateObject
+3425 CPaneDialog::CreateObject
+3426 CPaneDivider::CreateObject
+3427 CPaneFrameWnd::CreateObject
+3428 CPreviewView::CreateObject
+3429 CPreviewViewEx::CreateObject
+3430 CRibbonUndoLabel::CreateObject
+3431 CRichEditCntrItem::CreateObject
+3432 CRichEditView::CreateObject
+3433 CRuntimeClass::CreateObject
+3434 CRuntimeClass::CreateObject
+3435 CRuntimeClass::CreateObject
+3436 CSettingsStore::CreateObject
+3437 CSmartDockingGroupGuidesManager::CreateObject
+3438 CSmartDockingStandaloneGuide::CreateObject
+3439 CStringArray::CreateObject
+3440 CStringList::CreateObject
+3441 CTabbedPane::CreateObject
+3442 CTabView::CreateObject
+3443 CTasksPaneHistoryButton::CreateObject
+3444 CTasksPaneMenuButton::CreateObject
+3445 CTasksPaneNavigateButton::CreateObject
+3446 CTreeView::CreateObject
+3447 CUserTool::CreateObject
+3448 CWnd::CreateObject
+3449 CWordArray::CreateObject
+3450 COleControlContainer::CreateOleFont
+3451 CDocTemplate::CreateOleFrame
+3452 COleSafeArray::CreateOneDim
+3453 COleControlSite::CreateOrLoad
+3454 COleControlSite::CreateOrLoad
+3455 CMFCColorBar::CreatePalette
+3456 CPaneContainerManager::CreatePaneDivider
+3457 CMFCRibbonConstructor::CreatePanel
+3458 CFont::CreatePointFont
+3459 CFont::CreatePointFontIndirect
+3460 CMFCColorMenuButton::CreatePopupMenu
+3461 CMFCCustomizeButton::CreatePopupMenu
+3462 CMFCRibbonGalleryMenuButton::CreatePopupMenu
+3463 COutlookCustomizeButton::CreatePopupMenu
+3464 CDocTemplate::CreatePreviewFrame
+3465 CPageSetupDialog::CreatePrinterDC
+3466 CPrintDialog::CreatePrinterDC
+3467 CPrintDialogEx::CreatePrinterDC
+3468 CWinApp::CreatePrinterDC
+3469 CMFCToolBarImages::CreateRegionFromImage
+3470 CDockSite::CreateRow
+3471 CWnd::CreateRunDlgIndirect
+3472 CSplitterWnd::CreateScrollBarCtrl
+3473 CControlSiteFactoryMgr::CreateSite
+3474 COleUILinkInfo::AddRef
+3475 COccManager::CreateSite
+3476 CMFCRibbonEdit::CreateSpinButton
+3477 CMFCPropertyGridProperty::CreateSpinControl
+3478 CSplitterWnd::CreateStatic
+3479 COleClientItem::CreateStaticFromClipboard
+3480 COleClientItem::CreateStaticFromData
+3481 COleStreamFile::CreateStream
+3482 CDockablePane::CreateTabbedPane
+3483 CMDIClientAreaWnd::CreateTabGroup
+3484 CMFCColorPopupMenu::CreateTearOffBar
+3485 CMFCPopupMenu::CreateTearOffBar
+3486 CWinThread::CreateThread
+3487 CTooltipManager::CreateToolTip
+3488 CTooltipManager::CreateToolTipObject
+3489 COleControl::CreateTracker
+3490 COleControl::CreateTracker
+3491 CAnimationBaseObject::CreateTransitions
+3492 CAnimationGroup::CreateTransitions
+3493 CAnimationVariable::CreateTransitions
+3494 CFrameWnd::CreateView
+3495 CSplitterWnd::CreateView
+3496 CDocObjectServer::XOleDocument::CreateView
+3497 CMFCVisualManager::CreateVisualManager
+3498 COleControl::CreateWindowForSubclassedControl
+3499 CMFCBaseTabCtrl::CreateWrapper
+3500 CGlobalUtils::CyFromString
+3501 COleControl::XDataObject::DAdvise
+3502 COleDataSource::XDataObject::DAdvise
+3503 COleServerDoc::XDataObject::DAdvise
+3504 COleServerItem::XDataObject::DAdvise
+3505 DDP_Check
+3506 DDP_EndCheck
+3507 DDP_EndRadio
+3508 DDP_EndText
+3509 DDP_EndText
+3510 DDP_EndText
+3511 DDP_EndText
+3512 DDP_EndText
+3513 DDP_EndText
+3514 DDP_EndText
+3515 DDP_EndText
+3516 DDP_EndText
+3517 DDP_PostProcessing
+3518 DDP_Radio
+3519 DDP_Text
+3520 DDP_Text
+3521 DDP_Text
+3522 DDP_Text
+3523 DDP_Text
+3524 DDP_Text
+3525 DDP_Text
+3526 DDP_Text
+3527 DDP_Text
+3528 DDV_MaxChars
+3529 DDV_MinMaxByte
+3530 DDV_MinMaxDateTime
+3531 DDV_MinMaxDateTime
+3532 DDV_MinMaxDouble
+3533 DDV_MinMaxDWord
+3534 DDV_MinMaxFloat
+3535 DDV_MinMaxInt
+3536 DDV_MinMaxInt
+3537 DDV_MinMaxLongLong
+3538 DDV_MinMaxMonth
+3539 DDV_MinMaxMonth
+3540 DDV_MinMaxShort
+3541 DDV_MinMaxSlider
+3542 DDV_MinMaxDWord
+3543 DDV_MinMaxULongLong
+3544 DDX_CBIndex
+3545 DDX_CBString
+3546 DDX_CBStringExact
+3547 DDX_Check
+3548 DDX_Control
+3549 DDX_DateTimeCtrl
+3550 DDX_DateTimeCtrl
+3551 DDX_DateTimeCtrl
+3552 DDX_DateTimeCtrl
+3553 DDX_DateTimeCtrl
+3554 DDX_DateTimeCtrl
+3555 CDHtmlDialog::DDX_DHtml_AxControl
+3556 CDHtmlDialog::DDX_DHtml_AxControl
+3557 CDHtmlDialog::DDX_DHtml_AxControl
+3558 CDHtmlDialog::DDX_DHtml_AxControl
+3559 CDHtmlDialog::DDX_DHtml_CheckBox
+3560 CDHtmlDialog::DDX_DHtml_CheckBox
+3561 CDHtmlDialog::DDX_DHtml_ElementText
+3562 CDHtmlDialog::DDX_DHtml_ElementText
+3563 CDHtmlDialog::DDX_DHtml_ElementText
+3564 CDHtmlDialog::DDX_DHtml_ElementText
+3565 CDHtmlDialog::DDX_DHtml_ElementText
+3566 CDHtmlDialog::DDX_DHtml_ElementText
+3567 CDHtmlDialog::DDX_DHtml_ElementText
+3568 CDHtmlDialog::DDX_DHtml_ElementText
+3569 CDHtmlDialog::DDX_DHtml_ElementText
+3570 CDHtmlDialog::DDX_DHtml_ElementText
+3571 CDHtmlDialog::DDX_DHtml_ElementText
+3572 CDHtmlDialog::DDX_DHtml_ElementText
+3573 CDHtmlDialog::DDX_DHtml_ElementText
+3574 CDHtmlDialog::DDX_DHtml_ElementText
+3575 CDHtmlDialog::DDX_DHtml_ElementTextFloatFormat
+3576 CDHtmlDialog::DDX_DHtml_ElementTextWithFormat
+3577 CDHtmlDialog::DDX_DHtml_Radio
+3578 CDHtmlDialog::DDX_DHtml_Radio
+3579 CDHtmlDialog::DDX_DHtml_SelectIndex
+3580 CDHtmlDialog::DDX_DHtml_SelectIndex
+3581 CDHtmlDialog::DDX_DHtml_SelectString
+3582 CDHtmlDialog::DDX_DHtml_SelectString
+3583 CDHtmlDialog::DDX_DHtml_SelectValue
+3584 CDHtmlDialog::DDX_DHtml_SelectValue
+3585 DDX_FieldCBIndex
+3586 DDX_FieldCBString
+3587 DDX_FieldCBStringExact
+3588 DDX_FieldCheck
+3589 DDX_FieldLBIndex
+3590 DDX_FieldLBString
+3591 DDX_FieldLBStringExact
+3592 DDX_FieldRadio
+3593 DDX_FieldScroll
+3594 DDX_FieldText
+3595 DDX_FieldText
+3596 DDX_FieldText
+3597 DDX_FieldText
+3598 DDX_FieldText
+3599 DDX_FieldText
+3600 DDX_FieldText
+3601 DDX_FieldText
+3602 DDX_FieldText
+3603 DDX_IPAddress
+3604 DDX_LBIndex
+3605 DDX_LBString
+3606 DDX_LBStringExact
+3607 DDX_MonthCalCtrl
+3608 DDX_DateTimeCtrl
+3609 DDX_MonthCalCtrl
+3610 DDX_MonthCalCtrl
+3611 DDX_OCBool
+3612 DDX_OCBoolRO
+3613 DDX_OCColor
+3614 DDX_OCColorRO
+3615 DDX_OCFloat
+3616 DDX_OCFloat
+3617 DDX_OCFloatRO
+3618 DDX_OCFloatRO
+3619 DDX_OCColor
+3620 DDX_OCColor
+3621 DDX_OCColorRO
+3622 DDX_OCColorRO
+3623 DDX_OCShort
+3624 DDX_OCShortRO
+3625 DDX_OCText
+3626 DDX_OCTextRO
+3627 DDX_Radio
+3628 DDX_Scroll
+3629 DDX_Slider
+3630 DDX_Text
+3631 DDX_Text
+3632 DDX_Text
+3633 DDX_Text
+3634 DDX_Text
+3635 DDX_Text
+3636 DDX_Text
+3637 DDX_Text
+3638 DDX_Text
+3639 DDX_Text
+3640 DDX_Text
+3641 DDX_Text
+3642 DDX_Text
+3643 DDX_Text
+3644 DDX_Text
+3645 DDX_Text
+3646 DDX_Text
+3647 DDX_Text
+3648 DDX_Text
+3649 DDX_Text
+3650 CMFCPropertyGridToolTipCtrl::Deactivate
+3651 CMFCToolBar::Deactivate
+3652 COleClientItem::Deactivate
+3653 COlePropertyPage::XPropertyPage::Deactivate
+3654 COleServerDoc::DeactivateAndUndo
+3655 COleClientItem::XOleIPSite::DeactivateAndUndo
+3656 COleControlSite::XOleIPSite::DeactivateAndUndo
+3657 CMFCRibbonBar::DeactivateKeyboardFocus
+3658 CFrameImpl::DeactivateMenu
+3659 COleClientItem::DeactivateUI
+3660 CGlobalUtils::DecimalFromString
+3661 CFieldExchange::Default
+3662 CWnd::Default
+3663 CMDIChildWnd::DefWindowProcA
+3664 CMDIFrameWnd::DefWindowProcA
+3665 COleControl::DefWindowProcA
+3666 COleUILinkInfo::AddRef
+3667 CWnd::DefWindowProcA
+3668 COleDataSource::DelayRenderData
+3669 COleDataSource::DelayRenderFileData
+3670 COleDataSource::DelaySetData
+3671 CControlBar::DelayShow
+3672 CFrameWnd::DelayUpdateFrameMenu
+3673 CFrameWndEx::DelayUpdateFrameMenu
+3674 CMDIFrameWnd::DelayUpdateFrameMenu
+3677 CException::Delete
+3678 COleClientItem::Delete
+3679 CRecordset::Delete
+3680 CWinThread::Delete
+3681 CDataRecoveryHandler::DeleteAllAutosavedFiles
+3682 CDataRecoveryHandler::DeleteAutosavedFile
+3683 CSplitterWnd::DeleteColumn
+3684 delete
+3685 CEditView::DeleteContents
+3686 CHtmlEditDoc::DeleteContents
+3687 COleDocument::DeleteContents
+3688 COleServerDoc::DeleteContents
+3689 CRichEditDoc::DeleteContents
+3690 CRichEditView::DeleteContents
+3691 CDC::DeleteDC
+3692 CUserTool::DeleteIcon
+3693 CMFCToolBarImages::DeleteImage
+3694 CImageList::DeleteImageList
+3695 delete
+3696 CComboBoxEx::DeleteItem
+3697 delete
+3698 CMFCRibbonComboBox::DeleteItem
+3699 CMFCRibbonComboBox::DeleteItem
+3700 CMFCRibbonComboBox::DeleteItem
+3701 CMFCToolBarComboBoxButton::DeleteItem
+3702 CMFCToolBarComboBoxButton::DeleteItem
+3703 CMFCToolBarComboBoxButton::DeleteItem
+3704 CSettingsStore::DeleteKey
+3705 CGdiObject::DeleteObject
+3706 CRichEditView::XRichEditOleCallback::DeleteObject
+3707 CPaneContainer::DeletePane
+3708 CMFCPropertyGridCtrl::DeleteProperty
+3709 CSplitterWnd::DeleteRow
+3710 CMFCFontComboBox::DeleteString
+3711 CHandleMap::DeleteTemp
+3712 CDC::DeleteTempMap
+3713 CGdiObject::DeleteTempMap
+3714 CImageList::DeleteTempMap
+3715 CMenu::DeleteTempMap
+3716 CWnd::DeleteTempMap
+3717 CFrameImpl::DeleteToolBar
+3718 CTooltipManager::DeleteToolTip
+3719 CRichEditDoc::DeleteUnmarkedItems
+3720 CSettingsStore::DeleteValue
+3721 CThreadSlotData::DeleteValues
+3722 CThreadSlotData::DeleteValues
+3723 CSplitterWnd::DeleteView
+3724 CWinApp::DelRegTree
+3725 CToolTipCtrl::DelTool
+3726 CD2DBitmap::Destroy
+3727 CD2DBitmapBrush::Destroy
+3728 CD2DBrush::Destroy
+3729 CD2DBitmap::Destroy
+3730 CD2DGradientBrush::Destroy
+3731 CD2DBitmap::Destroy
+3732 CD2DLinearGradientBrush::Destroy
+3733 CD2DBitmap::Destroy
+3734 CD2DPathGeometry::Destroy
+3735 CD2DRadialGradientBrush::Destroy
+3736 CD2DSolidColorBrush::Destroy
+3737 CMFCPreviewCtrlImpl::Destroy
+3738 COleSafeArray::Destroy
+3739 CRenderTarget::Destroy
+3740 delete
+3741 CSmartDockingGroupGuidesManager::Destroy
+3742 CSmartDockingManager::Destroy
+3743 CSmartDockingStandaloneGuide::Destroy
+3744 COleControlSite::DestroyControl
+3745 CMFCRibbonEdit::DestroyCtrl
+3746 COleSafeArray::DestroyData
+3747 COleSafeArray::DestroyDescriptor
+3748 CFrameWnd::DestroyDockBars
+3749 CSmartDockingGroupGuide::DestroyImages
+3750 COleServerDoc::DestroyInPlaceFrame
+3751 CMFCVisualManager::DestroyInstance
+3752 CMenu::DestroyMenu
+3753 CDHtmlDialog::DestroyModeless
+3754 COleControl::DestroySharedMenu
+3755 COleDocIPFrameWnd::DestroySharedMenu
+3756 COleDocIPFrameWnd::DestroySharedMenu
+3757 CToolTipCtrl::DestroyToolTipCtrl
+3758 COleControl::DestroyTracker
+3759 CControlBar::DestroyWindow
+3760 CMDIChildWnd::DestroyWindow
+3761 CWnd::DestroyWindow
+3762 CAsyncSocket::Detach
+3763 CBitmapRenderTarget::Detach
+3764 CD2DBitmap::Detach
+3765 CD2DBitmapBrush::Detach
+3766 CD2DBitmap::Detach
+3767 CD2DBitmap::Detach
+3768 CD2DBitmap::Detach
+3769 CD2DLinearGradientBrush::Detach
+3770 CD2DBitmap::Detach
+3771 CD2DPathGeometry::Detach
+3772 CD2DRadialGradientBrush::Detach
+3773 CD2DSolidColorBrush::Detach
+3774 CDC::Detach
+3775 CDCRenderTarget::Detach
+3776 CDialogTemplate::Detach
+3777 CGdiObject::Detach
+3778 CDCRenderTarget::Detach
+3779 CImageList::Detach
+3780 CMemFile::Detach
+3781 CMenu::Detach
+3782 CMonikerFile::Detach
+3783 COleDataObject::Detach
+3784 COleSafeArray::Detach
+3785 COleStreamFile::Detach
+3786 COleSafeArray::Detach
+3787 CRenderTarget::Detach
+3788 CSharedFile::Detach
+3789 CWindowlessDC::Detach
+3790 CWnd::Detach
+3791 CDialogTemplate::Detach
+3792 CAsyncSocket::DetachHandle
+3793 CBaseTabbedPane::DetachPane
+3794 CTabbedPane::DetachPane
+3795 CMFCBaseTabCtrl::DetachTab
+3796 COleControlSite::DetachWindow
+3797 CDockingManager::DeterminePaneAndStatus
+3798 CWinApp::DevModeChange
+3799 COleUILinkInfo::AddRef
+3800 CDialogImpl::DialogMouseHookProc
+3801 COleControlSite::XNotifyDBEvents::DidEvent
+3802 CMFCMaskedEdit::DisableMask
+3803 COleServerDoc::DiscardUndoState
+3804 COleClientItem::XOleIPSite::DiscardUndoState
+3805 COleUILinkInfo::AddRef
+3806 COleDispatchImpl::Disconnect
+3807 CDHtmlDialog::DisconnectDHtmlElementEvents
+3808 CDHtmlDialog::DisconnectDHtmlEvents
+3809 CDHtmlEventSink::DisconnectFromConnectionPoint
+3810 COleControlSite::DisconnectSink
+3811 CDocument::DisconnectViews
+3812 CWinThread::DispatchThreadMessage
+3813 CWinThread::DispatchThreadMessageEx
+3814 COleControl::DisplayError
+3815 CMFCShellListCtrl::DisplayFolder
+3816 CMFCShellListCtrl::DisplayFolder
+3817 CMFCShellListCtrl::DisplayParentFolder
+3818 CDocObjectServer::DoBeginPrinting
+3819 delete
+3820 CAsyncSocket::DoCallBack
+3821 COleChangeIconDialog::DoChangeIcon
+3822 CBaseTabbedPane::Dock
+3823 CDockablePane::Dock
+3824 CMFCOutlookBarPane::Dock
+3825 CPane::Dock
+3826 CPane::DockByMouse
+3827 CDockBar::DockControlBar
+3828 CFrameWnd::DockControlBar
+3829 CFrameWnd::DockControlBar
+3830 CMultiPaneFrameWnd::DockFrame
+3831 CAutoHideDockSite::DockPane
+3832 CDockingManager::DockPane
+3833 CDockSite::DockPane
+3834 CFrameWndEx::DockPane
+3835 CMDIChildWndEx::DockPane
+3836 CMDIFrameWndEx::DockPane
+3837 CMultiPaneFrameWnd::DockPane
+3838 COleCntrFrameWndEx::DockPane
+3839 COleDocIPFrameWndEx::DockPane
+3840 COleDocIPFrameWndEx::DockPane
+3841 CPane::DockPane
+3842 CPaneFrameWnd::DockPane
+3843 CDockablePane::DockPaneContainer
+3844 CDockingManager::DockPaneLeftOf
+3845 CDockSite::DockPaneLeftOf
+3846 CFrameWndEx::DockPaneLeftOf
+3847 CMDIChildWndEx::DockPaneLeftOf
+3848 CMDIFrameWndEx::DockPaneLeftOf
+3849 COleCntrFrameWndEx::DockPaneLeftOf
+3850 COleDocIPFrameWndEx::DockPaneLeftOf
+3851 COleDocIPFrameWndEx::DockPaneLeftOf
+3852 CDockablePane::DockPaneStandard
+3853 CMultiPaneFrameWnd::DockPaneStandard
+3854 CPaneFrameWnd::DockPaneStandard
+3855 CBasePane::DockPaneUsingRTTI
+3856 CMultiPaneFrameWnd::DockRecentPaneToMainFrame
+3857 CDockablePane::DockToFrameWindow
+3858 CDockablePane::DockToWindow
+3859 COleControl::DoClick
+3860 COleFrameHook::DoContextSensitiveHelp
+3861 COleConvertDialog::DoConvert
+3862 CHtmlView::DocumentComplete
+3863 CWnd::DoD2DPaint
+3864 CMFCColorDialog::DoDataExchange
+3865 CMFCCustomColorsPropertyPage::DoDataExchange
+3866 CMFCImageEditorDialog::DoDataExchange
+3867 CMFCKeyMapDialog::DoDataExchange
+3868 CMFCMousePropertyPage::DoDataExchange
+3869 CMFCRibbonCustomizePropertyPage::DoDataExchange
+3870 CMFCRibbonKeyboardCustomizeDialog::DoDataExchange
+3871 CMFCStandardColorsPropertyPage::DoDataExchange
+3872 CMFCToolBarButtonCustomizeDialog::DoDataExchange
+3873 CMFCToolBarNameDialog::DoDataExchange
+3874 CMFCToolBarsCommandsPropertyPage::DoDataExchange
+3875 CMFCToolBarsKeyboardPropertyPage::DoDataExchange
+3876 CMFCToolBarsListPropertyPage::DoDataExchange
+3877 CMFCToolBarsMenuPropertyPage::DoDataExchange
+3878 CMFCToolBarsOptionsPropertyPage::DoDataExchange
+3879 CMFCToolBarsToolsPropertyPage::DoDataExchange
+3880 CMFCWindowsManagerDialog::DoDataExchange
+3881 COutlookOptionsDlg::DoDataExchange
+3882 CMFCShellListCtrl::DoDefault
+3883 COleDocObjectItem::DoDefaultPrinting
+3884 COleClientItem::DoDragDrop
+3885 COleDataSource::DoDragDrop
+3886 COleServerItem::DoDragDrop
+3887 CMFCVisualManager::DoDrawHeaderSortArrow
+3888 COleFrameHook::DoEnableModeless
+3889 CWinApp::DoEnableModeless
+3890 CDocObjectServer::DoEndPrinting
+3891 CPaneContainerManager::DoesAllowDynInsertBefore
+3892 CPaneDivider::DoesAllowDynInsertBefore
+3893 CPaneContainerManager::DoesContainFloatingPane
+3894 CPaneDivider::DoesContainFloatingPane
+3895 delete
+3896 CDocument::DoFileSave
+3897 CSplitterWnd::DoKeyboardSplit
+3898 CWinApp::DoMessageBox
+3899 CColorDialog::DoModal
+3900 CDialog::DoModal
+3901 CFileDialog::DoModal
+3902 CFontDialog::DoModal
+3903 COleBusyDialog::DoModal
+3904 COleChangeIconDialog::DoModal
+3905 COleChangeSourceDialog::DoModal
+3906 COleConvertDialog::DoModal
+3907 COleInsertDialog::DoModal
+3908 COleInsertDialog::DoModal
+3909 COleLinksDialog::DoModal
+3910 COlePasteSpecialDialog::DoModal
+3911 COlePropertiesDialog::DoModal
+3912 COleUpdateDialog::DoModal
+3913 CPageSetupDialog::DoModal
+3914 CPrintDialog::DoModal
+3915 CPrintDialogEx::DoModal
+3916 CPropertySheet::DoModal
+3917 CScrollView::DoMouseWheel
+3918 CCmdTarget::DoOleVerb
+3919 CBasePane::DoPaint
+3920 CControlBar::DoPaint
+3921 delete
+3922 CMFCAutoHideBar::DoPaint
+3923 CMFCColorBar::DoPaint
+3924 CMFCOutlookBarPane::DoPaint
+3925 CMFCPopupMenu::DoPaint
+3926 delete
+3927 CMFCRibbonMainPanel::DoPaint
+3928 CMFCRibbonPanel::DoPaint
+3929 CMFCRibbonPanelMenu::DoPaint
+3930 CMFCRibbonPanelMenuBar::DoPaint
+3931 CMFCStatusBar::DoPaint
+3932 CMFCTasksPane::DoPaint
+3933 CMFCToolBar::DoPaint
+3934 CRichEditView::DoPaste
+3935 CDocObjectServer::DoPrepareDC
+3936 CDocObjectServer::DoPreparePrinting
+3937 CView::DoPreparePrinting
+3938 CDocument::XPreviewHandler::DoPreview
+3939 CDocObjectServer::DoPrint
+3940 CWinApp::DoPrintDialog
+3941 CView::DoPrintPreview
+3942 CDocManager::DoPromptFileName
+3943 CWinApp::DoPromptFileName
+3944 COleControl::DoPropExchange
+3945 CDocument::DoSave
+3946 COleDocument::DoSave
+3947 CSplitterWnd::DoScroll
+3948 CSplitterWnd::DoScrollBy
+3949 COleControl::DoSuperclassPaint
+3950 CCmdUI::DoUpdate
+3951 CMFCMaskedEdit::DoUpdate
+3952 COleCmdUI::DoUpdate
+3953 COleClientItem::DoVerb
+3954 COleControlSite::DoVerb
+3955 CDocObjectServer::XOleObject::DoVerb
+3956 COleControl::XOleObject::DoVerb
+3957 COleServerDoc::XOleObject::DoVerb
+3958 COleServerItem::XOleObject::DoVerb
+3959 CWinApp::DoWaitCursor
+3960 CPreviewView::DoZoom
+3961 CDC::DPtoHIMETRIC
+3962 CDC::DPtoLP
+3963 COleDropTarget::XDropTarget::DragEnter
+3964 CDragListBox::Dragging
+3965 COleDropTarget::XDropTarget::DragLeave
+3966 COleDropTarget::XDropTarget::DragOver
+3967 CMenuImages::Draw
+3968 CMenuImages::Draw
+3969 CMFCControlRenderer::Draw
+3970 CMFCShadowRenderer::Draw
+3971 CMFCToolBarImages::Draw
+3972 CMFCVisualManagerBitmapCache::CMFCVisualManagerBitmapCacheItem::Draw
+3973 COleClientItem::Draw
+3974 CRectTracker::Draw
+3975 CSmartDockingGroupGuide::Draw
+3977 CDC::Draw3dRect
+3978 CDC::Draw3dRect
+3979 CMFCTabCtrl::Draw3DTab
+3980 CSplitterWnd::DrawAllSplitBars
+3981 CDrawingManager::DrawAlpha
+3982 CMFCDesktopAlertWnd::DrawAnimation
+3983 CMFCRibbonMainPanel::DrawApplicationButton
+3984 CRenderTarget::DrawBitmap
+3985 CMFCButton::DrawBorder
+3986 CControlBar::DrawBorders
+3987 CMFCRibbonButton::DrawBottomText
+3988 CMFCToolBar::DrawButton
+3989 CDockablePane::DrawCaption
+3990 CMFCTasksPane::DrawCaption
+3991 CSmartDockingGroupGuidesManager::DrawCentralGroupGuides
+3992 CMFCBaseVisualManager::DrawCheckBox
+3993 CMFCCustomizeMenuButton::DrawCheckBox
+3994 CMFCBaseVisualManager::DrawComboBorder
+3995 CMFCBaseVisualManager::DrawComboDropButton
+3996 COleControl::DrawContent
+3997 CMFCColorPickerCtrl::DrawCursor
+3998 CMFCVisualManagerOffice2003::DrawCustomizeButton
+3999 CMFCToolBarMenuButton::DrawDocumentIcon
+4000 CMFCPopupMenuBar::DrawDragCursor
+4001 CMFCToolBar::DrawDragCursor
+4002 CMFCDragFrameImpl::DrawDragFrame
+4003 CDC::DrawDragRect
+4004 CDrawingManager::DrawEllipse
+4005 CRenderTarget::DrawEllipse
+4006 CMFCToolBarImages::DrawEx
+4007 CMFCPopupMenu::DrawFade
+4008 CMFCTabCtrl::DrawFlatTab
+4009 CDockContext::DrawFocusRect
+4010 CMFCControlRenderer::DrawFrame
+4011 CMFCShadowRenderer::DrawFrame
+4012 CMFCDragFrameImpl::DrawFrameTab
+4013 CRenderTarget::DrawGeometry
+4014 CRenderTarget::DrawGlyphRun
+4015 CDrawingManager::DrawGradientRing
+4016 CControlBar::DrawGripper
+4017 CMFCColorPickerCtrl::DrawHex
+4018 CMFCRibbonApplicationButton::DrawImage
+4019 CMFCRibbonButton::DrawImage
+4020 CMFCRibbonColorButton::DrawImage
+4021 CMFCRibbonDefaultPanelButton::DrawImage
+4022 CImageList::DrawIndirect
+4023 CImageList::DrawIndirect
+4024 CDragListBox::DrawInsert
+4025 CBitmapButton::DrawItem
+4026 delete
+4027 CCheckListBox::DrawItem
+4028 CChevronOwnerDrawMenu::DrawItem
+4029 delete
+4030 delete
+4031 delete
+4032 delete
+4033 delete
+4034 delete
+4035 CMFCButton::DrawItem
+4036 CMFCColorPickerCtrl::DrawItem
+4037 CMFCFontComboBox::DrawItem
+4038 CMFCImagePaintArea::DrawItem
+4040 CMFCRibbonCommandsListBox::DrawItem
+4041 CMFCToolBarButtonsListButton::DrawItem
+4042 CMFCToolBarsCommandsListBox::DrawItem
+4043 delete
+4044 delete
+4045 delete
+4046 delete
+4047 CDrawingManager::DrawLine
+4048 CRenderTarget::DrawLine
+4049 CDrawingManager::DrawLineA
+4050 CMFCColorPickerCtrl::DrawLuminanceBar
+4051 CMFCRibbonBar::DrawMenuImage
+4052 CMFCToolBarMenuButton::DrawMenuItem
+4053 COleControl::DrawMetafile
+4054 CMFCControlBarImpl::DrawNcArea
+4055 CMFCVisualManagerOffice2007::DrawNcBtn
+4056 CMFCVisualManagerWindows7::DrawNcBtn
+4057 CMFCVisualManagerOffice2007::DrawNcCaption
+4058 CControlBar::DrawNCGripper
+4059 CMFCVisualManagerOffice2007::DrawNcText
+4060 CMFCVisualManagerWindows7::DrawNcText
+4061 CMDIClientAreaWnd::DrawNewGroupRect
+4062 CControlBar::DrawNonThemedGripper
+4063 AFX_GLOBAL_DATA::DrawParentBackground
+4064 CMFCColorPickerCtrl::DrawPicker
+4065 CMFCImagePaintArea::DrawPixel
+4066 CMFCBaseVisualManager::DrawPushButton
+4067 CMFCBaseVisualManager::DrawRadioButton
+4068 CDrawingManager::DrawRect
+4069 CRenderTarget::DrawRectangle
+4070 CMFCTabCtrl::DrawResizeDragRect
+4071 CMFCRibbonButton::DrawRibbonText
+4072 CMFCRibbonStatusBarPane::DrawRibbonText
+4073 CDrawingManager::DrawRotated
+4074 CRenderTarget::DrawRoundedRectangle
+4075 CMFCPopupMenuBar::DrawSeparator
+4076 CMFCToolBar::DrawSeparator
+4077 CMFCVisualManagerOffice2007::DrawSeparator
+4078 CMFCVisualManagerOffice2007::DrawSeparator
+4079 CMFCVisualManagerOffice2007::DrawSeparator
+4080 CDrawingManager::DrawShadow
+4081 CDragListBox::DrawSingle
+4082 CMFCBaseVisualManager::DrawStatusBarProgress
+4083 CMFCOutlookBarTabCtrl::DrawTabButton
+4084 CMetaFileDC::DrawTextA
+4085 CPreviewDC::DrawTextA
+4086 CRenderTarget::DrawTextA
+4087 CMetaFileDC::DrawTextExA
+4088 CPreviewDC::DrawTextExA
+4089 CRenderTarget::DrawTextLayout
+4090 AFX_GLOBAL_DATA::DrawTextOnGlass
+4091 CMFCVisualManager::DrawTextOnGlass
+4092 CControlBar::DrawThemedGripper
+4093 CUserTool::DrawToolIcon
+4094 CRectTracker::DrawTrackerRect
+4095 CMFCVisualManagerBitmapCache::CMFCVisualManagerBitmapCacheItem::DrawY
+4096 COleDropTarget::XDropTarget::Drop
+4097 CMFCRibbonComboBox::DropDownList
+4098 CMFCRibbonFontComboBox::DropDownList
+4099 CMFCToolBar::DropDownMenu
+4100 CMFCDropDownToolbarButton::DropDownToolbar
+4101 CDragListBox::Dropped
+4102 CDumpContext::DumpAsHex
+4103 CDumpContext::DumpAsHex
+4104 CDumpContext::DumpAsHex
+4105 CDumpContext::DumpAsHex
+4106 CDumpContext::DumpAsHex
+4107 CDumpContext::DumpAsHex
+4108 CDumpContext::DumpAsHex
+4109 CDumpContext::DumpAsHex
+4110 COleControl::XDataObject::DUnadvise
+4111 COleDataSource::XDataObject::DUnadvise
+4112 COleServerDoc::XDataObject::DUnadvise
+4113 COleServerItem::XDataObject::DUnadvise
+4114 CFile::Duplicate
+4115 CSocketFile::Abort
+4116 CSocketFile::Abort
+4117 COleStreamFile::Duplicate
+4118 CSocketFile::Abort
+4119 CSocketFile::Abort
+4120 CMFCRibbonBar::DWMCompositionChanged
+4122 CRecordset::Edit
+4123 CMFCPropertyGridCtrl::EditItem
+4124 CVSListBox::EditItem
+4125 COlePropertyPage::XPropertyPage::EditProperty
+4126 CRichEditView::EditStreamCallBack
+4127 CMFCRibbonInfo::ElementNameFromType
+4128 CMFCRibbonInfo::ElementTypeFromName
+4131 CDBException::Empty
+4132 CMFCZoomKernel::Empty
+4133 COleDataSource::Empty
+4134 CMFCRibbonInfo::XInfoError::Empty
+4135 CCheckListBox::Enable
+4136 CCmdUI::Enable
+4137 CMFCColorBarCmdUI::Enable
+4138 CMFCPropertyGridProperty::Enable
+4139 CMFCRibbonCmdUI::Enable
+4140 CMFCStatusBarCmdUI::Enable
+4141 CMFCTasksPaneToolBarCmdUI::Enable
+4142 CMFCToolBarCmdUI::Enable
+4143 COleCmdUI::Enable
+4144 CStatusCmdUI::Enable
+4145 CMFCColorBarCmdUI::Enable
+4146 CToolCmdUI::Enable
+4147 AFX_GLOBAL_DATA::EnableAccessibilitySupport
+4148 CMFCTabCtrl::EnableActiveTabCloseButton
+4149 CCmdTarget::EnableAggregation
+4150 CMFCOutlookBarTabCtrl::EnableAnimation
+4151 CAnimationController::EnableAnimationManagerEvent
+4152 CAnimationController::EnableAnimationTimerEventHandler
+4153 CMFCBaseTabCtrl::EnableAutoColor
+4154 CDockingManager::EnableAutoHidePanes
+4155 CFrameWndEx::EnableAutoHidePanes
+4156 CMDIChildWndEx::EnableAutoHidePanes
+4157 CMDIFrameWndEx::EnableAutoHidePanes
+4158 COleCntrFrameWndEx::EnableAutoHidePanes
+4159 COleDocIPFrameWndEx::EnableAutoHidePanes
+4160 COleDocIPFrameWndEx::EnableAutoHidePanes
+4161 CMFCColorBar::EnableAutomaticButton
+4162 CMFCColorButton::EnableAutomaticButton
+4163 CMFCColorMenuButton::EnableAutomaticButton
+4164 CMFCPropertyGridColorProperty::EnableAutomaticButton
+4165 CMFCRibbonColorButton::EnableAutomaticButton
+4166 CCmdTarget::EnableAutomation
+4167 CRecordset::EnableBookmarks
+4168 CMFCEditBrowseCtrl::EnableBrowseButton
+4169 CVSListBoxBase::EnableBrowseButton
+4170 CDockablePane::EnableButton
+4171 CMFCCaptionBar::EnableButton
+4172 CVSListBoxBase::EnableButton
+4173 CMFCToolBarsListCheckBox::EnableCheck
+4174 CCmdTarget::EnableConnections
+4175 CMFCOutlookBarPane::EnableContextMenuItems
+4176 CMFCPopupMenuBar::EnableContextMenuItems
+4177 CMFCToolBar::EnableContextMenuItems
+4178 CMFCToolBarButtonCustomizeDialog::EnableControls
+4179 CMFCToolBarsToolsPropertyPage::EnableControls
+4180 CMFCToolBar::EnableCustomizeButton
+4181 CMFCToolBar::EnableCustomizeButton
+4182 CMFCBaseTabCtrl::EnableCustomToolTips
+4183 CWinApp::EnableD2DSupport
+4184 CWnd::EnableD2DSupport
+4185 CMFCMousePropertyPage::EnableDblClkControls
+4186 CMFCPropertyGridCtrl::EnableDescriptionArea
+4187 CControlBar::EnableDocking
+4188 CDockingManager::EnableDocking
+4189 CFrameWnd::EnableDocking
+4190 CFrameWndEx::EnableDocking
+4191 CMDIChildWndEx::EnableDocking
+4192 CMDIFrameWndEx::EnableDocking
+4193 CMFCToolBar::EnableDocking
+4194 COleCntrFrameWndEx::EnableDocking
+4195 COleDocIPFrameWndEx::EnableDocking
+4196 COleDocIPFrameWndEx::EnableDocking
+4197 CMFCColorMenuButton::EnableDocumentColors
+4198 COleControlSite::EnableDSC
+4199 CMFCEditBrowseCtrl::EnableFileBrowseButton
+4200 CMFCEditBrowseCtrl::EnableFolderBrowseButton
+4201 CMFCButton::EnableFullTextTooltip
+4202 CDockablePane::EnableGripper
+4203 CPaneContainerManager::EnableGrippers
+4204 CMFCPropertyGridCtrl::EnableHeaderCtrl
+4205 CMFCMenuBar::EnableHelpCombobox
+4206 CMFCTasksPane::EnableHistoryMenuButtons
+4207 CMFCTabCtrl::EnableInPlaceEdit
+4208 CAnimationBaseObject::EnableIntegerValueChangedEvent
+4209 CAnimationVariable::EnableIntegerValueChangedEvent
+4210 CMFCRibbonBar::EnableKeyTips
+4211 CMFCToolBar::EnableLargeIcons
+4212 CMFCRibbonPanel::EnableLaunchButton
+4213 CMFCListCtrl::EnableMarkSortedColumn
+4214 CMFCMaskedEdit::EnableMask
+4215 CMDIClientAreaWnd::EnableMDITabbedGroups
+4216 CMDIFrameWndEx::EnableMDITabbedGroups
+4217 CMDIClientAreaWnd::EnableMDITabs
+4218 CMDIFrameWndEx::EnableMDITabs
+4219 CMFCButton::EnableMenuFont
+4220 CCommandManager::EnableMenuItemImage
+4221 CMFCPopupMenu::EnableMenuLogo
+4222 CBrowserControlSite::EnableModeless
+4223 CArchiveStream::Clone
+4224 CWinApp::EnableModeless
+4225 CHtmlControlSite::XDocHostUIHandler::EnableModeless
+4226 COleUILinkInfo::AddRef
+4227 COleServerDoc::XOleInPlaceActiveObject::EnableModeless
+4228 COleFrameHook::XOleInPlaceFrame::EnableModeless
+4229 COleUILinkInfo::AddRef
+4230 CMFCHeaderCtrl::EnableMultipleSort
+4231 CMFCListCtrl::EnableMultipleSort
+4232 CMFCTasksPane::EnableNavigationToolbar
+4233 CFileDialog::EnableOpenDropDown
+4234 CMFCColorBar::EnableOtherButton
+4235 CMFCColorButton::EnableOtherButton
+4236 CMFCColorMenuButton::EnableOtherButton
+4237 CMFCPropertyGridColorProperty::EnableOtherButton
+4238 CMFCRibbonColorButton::EnableOtherButton
+4239 CMFCPropertySheet::EnablePageHeader
+4240 CGestureConfig::EnablePan
+4241 CDockingManager::EnablePaneContextMenu
+4242 CMFCStatusBar::EnablePaneDoubleClick
+4243 CMFCStatusBar::EnablePaneProgressBar
+4244 CGestureConfig::EnablePressAndTap
+4245 CMFCRibbonBar::EnablePrintPreview
+4247 CMFCPopupMenu::EnableResize
+4248 CGestureConfig::EnableRotate
+4249 CMFCToolBarImages::EnableRTL
+4250 CWnd::EnableScrollBarCtrl
+4251 CMFCOutlookBarTabCtrl::EnableScrollButtons
+4252 CMFCShellListCtrl::EnableShellContextMenu
+4253 CMFCShellTreeCtrl::EnableShellContextMenu
+4254 CWinApp::EnableShellOpen
+4255 COleControl::EnableSimpleFrame
+4256 CMFCRibbonEdit::EnableSpinButtons
+4257 CMFCPropertyGridProperty::EnableSpinControl
+4258 CPropertySheet::EnableStackedTabs
+4259 CInternetSession::EnableStatusCallback
+4260 CAnimationController::EnableStoryboardEventHandler
+4261 CTabbedPane::EnableTabAutoColor
+4262 CMFCBaseTabCtrl::EnableTabDetach
+4263 CMFCTabCtrl::EnableTabDocumentsMenu
+4264 CWinApp::EnableTaskbarInteraction
+4265 CMDIChildWndEx::EnableTaskbarThumbnailClipRect
+4266 CMFCColorMenuButton::EnableTearOff
+4267 CWinAppEx::EnableTearOffMenus
+4268 CMFCToolBar::EnableTextLabels
+4269 CMFCRibbonBaseElement::EnableTooltipInfoShortcut
+4270 CMFCRibbonBar::EnableToolTips
+4271 CWnd::EnableToolTips
+4272 CWnd::EnableTrackingToolTips
+4273 CGestureConfig::EnableTwoFingerTap
+4274 CCmdTarget::EnableTypeLib
+4275 CMFCRibbonBaseElement::EnableUpdateTooltipInfo
+4276 CMFCToolBarsCustomizeDialog::EnableUserDefinedToolbars
+4277 CWinAppEx::EnableUserTools
+4278 CAnimationBaseObject::EnableValueChangedEvent
+4279 CAnimationVariable::EnableValueChangedEvent
+4280 CMFCPopupMenu::EnableVertResize
+4281 COleControlSite::EnableWindow
+4282 CWnd::EnableWindow
+4283 CMDIFrameWndEx::EnableWindowsDialog
+4284 CMDIFrameWndEx::EnableWindowsDialog
+4285 CMFCButton::EnableWindowsTheming
+4286 CGestureConfig::EnableZoom
+4287 COleMessageFilter::EndBusyState
+4288 CAsyncMonikerFile::EndCallbacks
+4289 COleLinkingDoc::EndDeferErrors
+4290 CDialog::EndDialog
+4291 CPropertyPage::EndDialog
+4292 CPropertySheet::EndDialog
+4293 CDockContext::EndDrag
+4294 CRenderTarget::EndDraw
+4295 CMFCDragFrameImpl::EndDrawDragFrame
+4296 CMFCToolBarImages::EndDrawImage
+4297 CMFCPropertyGridCtrl::EndEditItem
+4298 CD2DGeometrySink::EndFigure
+4299 CWnd::EndModalLoop
+4300 CFrameWnd::EndModalState
+4301 CHttpFile::EndRequest
+4302 CDockContext::EndResize
+4303 CFileDialog::EndVisualGroup
+4304 CCmdTarget::EndWaitCursor
+4305 COleDataObject::EnsureClipboardObject
+4306 CArchive::EnsureSchemaMapExists
+4307 CWnd::EnsureStdObj
+4308 CMFCOutlookBarPaneList::EnsureVisible
+4309 CMFCPropertyGridCtrl::EnsureVisible
+4310 CMFCRibbonCategory::EnsureVisible
+4311 CMFCTabCtrl::EnsureVisible
+4312 CDockablePane::EnterDragMode
+4313 CMFCBaseTabCtrl::EnterDragMode
+4314 CPane::EnterDragMode
+4315 CPaneFrameWnd::EnterDragMode
+4316 CDocObjectServer::XOleObject::EnumAdvise
+4317 COleControl::XOleObject::EnumAdvise
+4318 COleServerDoc::XOleObject::EnumAdvise
+4319 COleServerItem::XOleObject::EnumAdvise
+4320 COleControl::XOleCache::EnumCache
+4321 COlePropertyPage::EnumChildProc
+4322 COleConnPtContainer::EnumConnectionPoints
+4323 CConnectionPoint::XConnPt::EnumConnections
+4324 COlePropertyPage::EnumControls
+4325 COleControl::XDataObject::EnumDAdvise
+4326 COleDataSource::XDataObject::EnumDAdvise
+4327 COleServerDoc::XDataObject::EnumDAdvise
+4328 COleServerItem::XOleObject::EnumAdvise
+4329 CMFCToolBarFontComboBox::EnumFamPrinterCallBackEx
+4330 CMFCToolBarFontComboBox::EnumFamScreenCallBackEx
+4331 COleControl::XDataObject::EnumFormatEtc
+4332 COleDataSource::XDataObject::EnumFormatEtc
+4333 COleServerDoc::XDataObject::EnumFormatEtc
+4334 COleServerItem::XDataObject::EnumFormatEtc
+4335 CMFCShellListCtrl::EnumObjects
+4336 CMFCShellTreeCtrl::EnumObjects
+4337 COleControlContainer::XOleContainer::EnumObjects
+4338 COleLinkingDoc::XOleItemContainer::EnumObjects
+4339 CCmdTarget::EnumOleVerbs
+4340 CMFCToolBarFontSizeComboBox::EnumSizeCallBack
+4341 CDocObjectServer::XOleObject::EnumVerbs
+4342 COleControl::XOleObject::EnumVerbs
+4343 COleServerDoc::XOleObject::EnumVerbs
+4344 COleServerItem::XOleObject::EnumVerbs
+4345 CDocObjectServer::XOleDocument::EnumViews
+4346 CControlBar::EraseNonClient
+4347 CFileException::ErrnoToException
+4348 CHttpFile::ErrorDlg
+4349 CMetaFileDC::Escape
+4350 CPreviewDC::Escape
+4351 CArchivePropExchange::ExchangeBlobProp
+4352 COleUILinkInfo::AddRef
+4353 CPropbagPropExchange::ExchangeBlobProp
+4354 CPropsetPropExchange::ExchangeBlobProp
+4355 CResetPropExchange::ExchangeBlobProp
+4356 COleControl::ExchangeExtent
+4357 CArchivePropExchange::ExchangeFontProp
+4358 COleUILinkInfo::AddRef
+4359 CPropbagPropExchange::ExchangeFontProp
+4360 CPropsetPropExchange::ExchangeFontProp
+4361 CResetPropExchange::ExchangeFontProp
+4362 CArchivePropExchange::ExchangePersistentProp
+4363 COleUILinkInfo::AddRef
+4364 CPropbagPropExchange::ExchangePersistentProp
+4365 CPropsetPropExchange::ExchangePersistentProp
+4366 CResetPropExchange::ExchangePersistentProp
+4367 CArchivePropExchange::ExchangeProp
+4368 COleUILinkInfo::AddRef
+4369 CPropbagPropExchange::ExchangeProp
+4370 CPropsetPropExchange::ExchangeProp
+4371 CResetPropExchange::ExchangeProp
+4372 COleControl::ExchangeStockProps
+4373 CAsyncPropExchange::ExchangeVersion
+4374 CPropExchange::ExchangeVersion
+4375 CDC::ExcludeClipRect
+4376 CDC::ExcludeClipRect
+4377 AFX_GLOBAL_DATA::ExcludeTag
+4378 CTagManager::ExcludeTag
+4379 CDocObjectServer::XOleCommandTarget::Exec
+4380 COleFrameHook::XOleCommandTarget::Exec
+4381 COleDocObjectItem::ExecCommand
+4382 CHtmlView::ExecFormsCommand
+4383 COleUILinkInfo::AddRef
+4384 CWnd::ExecuteDlgInit
+4385 CWnd::ExecuteDlgInit
+4386 CRecordset::ExecuteSetPosUpdate
+4387 CDatabase::ExecuteSQL
+4388 CRecordset::ExecuteUpdateSQL
+4389 CHtmlView::ExecWB
+4390 CFrameWnd::ExitHelpMode
+4391 COleControlModule::ExitInstance
+4392 CWinApp::ExitInstance
+4393 CWinAppEx::ExitInstance
+4394 CWinThread::ExitInstance
+4395 CMFCPropertyGridProperty::Expand
+4396 CMFCPropertyGridCtrl::ExpandAll
+4397 CMFCPropertyGridProperty::ExpandDeep
+4398 CDockingPanesRow::ExpandStretchedPanes
+4399 CDockingPanesRow::ExpandStretchedPanesRect
+4400 CMFCPopupMenuBar::ExportToMenu
+4401 CMFCDropDownToolbarButton::ExportToMenuButton
+4402 CMFCToolBarButton::ExportToMenuButton
+4403 CMFCToolBarComboBoxButton::ExportToMenuButton
+4404 CMFCToolBarComboBoxButton::ExportToMenuButton
+4405 CMFCVisualManagerOfficeXP::ExtendMenuButton
+4406 CCmdTarget::ExternalAddRef
+4407 CCmdTarget::ExternalDisconnect
+4408 CCmdTarget::ExternalQueryInterface
+4409 CCmdTarget::ExternalRelease
+4410 CMFCToolBarImages::ExtractIconA
+4411 CMetaFileDC::ExtTextOutA
+4412 CPreviewDC::ExtTextOutA
+4413 CDataExchange::Fail
+4414 COleControlSite::XNotifyDBEvents::FailedToDo
+4415 CRecordset::FetchData
+4416 CDrawingManager::Fill4ColorsGradient
+4417 CMFCToolBarsCustomizeDialog::FillAllCommandsList
+4418 CDrawingManager::FillAlpha
+4419 CArchive::FillBuffer
+4420 CMFCToolBarsCustomizeDialog::FillCategoriesComboBox
+4421 CMFCToolBarsCustomizeDialog::FillCategoriesListBox
+4422 CD2DGeometry::FillContainsPoint
+4423 CBaseTabbedPane::FillDefaultTabsOrderArray
+4424 CMFCToolBarImages::FillDitheredRect
+4425 CRenderTarget::FillEllipse
+4426 CMFCRibbonCommandsListBox::FillFromArray
+4427 CMFCRibbonCommandsListBox::FillFromCategory
+4428 CMFCRibbonCommandsListBox::FillFromIDs
+4429 CRenderTarget::FillGeometry
+4430 CDrawingManager::FillGradient
+4431 CDrawingManager::FillGradient2
+4432 CFontDialog::FillInLogFont
+4433 CMFCControlRenderer::FillInterior
+4434 CMFCControlRenderer::FillInterior
+4435 CMFCToolBarButton::FillInterior
+4436 CToolTipCtrl::FillInToolInfo
+4437 CMFCRibbonRecentFilesList::FillList
+4438 COleControlContainer::FillListSitesOrWnds
+4439 CRenderTarget::FillMesh
+4440 CRenderTarget::FillOpacityMask
+4441 CScrollView::FillOutsideRect
+4442 CMFCBaseVisualManager::FillReBarPane
+4443 CRenderTarget::FillRectangle
+4444 CRenderTarget::FillRoundedRectangle
+4445 CDC::FillSolidRect
+4446 CDC::FillSolidRect
+4447 CMFCRibbonButton::FillWindowList
+4448 CMFCWindowsManagerDialog::FillWindowList
+4449 CMFCZoomKernel::Filter
+4450 CBrowserControlSite::FilterDataObject
+4451 CDHtmlDialog::FilterDataObject
+4452 CHtmlControlSite::XDocHostUIHandler::FilterDataObject
+4454 CWnd::FilterToolTipMessage
+4455 CMFCZoomKernel::FilterWidth
+4460 CMFCRibbonBaseElement::Find
+4461 CMFCRibbonButtonsGroup::Find
+4462 CObList::Find
+4463 CObList::Find
+4464 CStringList::Find
+4465 CMDIClientAreaWnd::FindActiveTabWnd
+4466 CMDIClientAreaWnd::FindActiveTabWndByActiveChild
+4467 CRichEditView::FindAndSelect
+4468 CAnimationController::FindAnimationGroup
+4469 CAnimationController::FindAnimationGroup
+4470 CAnimationController::FindAnimationObject
+4471 CAnimationGroup::FindAnimationObject
+4472 CMFCOutlookBar::FindAvailablePageID
+4473 CDockBar::FindBar
+4474 CBaseTabbedPane::FindBarByTabNumber
+4475 CDockablePane::FindButton
+4476 CPaneFrameWnd::FindButton
+4477 CPaneFrameWnd::FindButton
+4478 CDockablePane::FindButtonByHit
+4479 CMFCRibbonBar::FindByData
+4480 CMFCRibbonBaseElement::FindByData
+4481 CMFCRibbonButton::FindByData
+4482 CMFCRibbonButtonsGroup::FindByData
+4483 CMFCRibbonCategory::FindByData
+4484 CMFCRibbonPanel::FindByData
+4485 CMFCRibbonBar::FindByID
+4486 CMFCRibbonBaseElement::FindByID
+4487 CMFCRibbonButton::FindByID
+4488 CMFCRibbonButtonsGroup::FindByID
+4489 CMFCRibbonCategory::FindByID
+4490 CMFCRibbonPanel::FindByID
+4491 CMFCRibbonPanelMenuBar::FindByOrigin
+4492 CMFCRibbonBaseElement::FindByOriginal
+4493 CMFCRibbonButtonsGroup::FindByOriginal
+4494 CMFCRibbonBar::FindCategoryIndexByData
+4495 CDocument::FindChunk
+4496 COleConnPtContainer::FindConnectionPoint
+4497 CMFCRibbonBar::FindContextCaption
+4498 CKeyboardManager::FindDefaultAccelerator
+4499 CMFCPopupMenuBar::FindDestintationToolBar
+4500 CDHtmlEventSink::FindDHtmlEventEntry
+4501 CDockingManager::FindDockSite
+4502 CDockingManager::FindDockSiteByPane
+4503 CMFCMenuBar::FindDropIndex
+4504 CMFCPopupMenuBar::FindDropIndex
+4505 CMFCToolBar::FindDropIndex
+4506 CMFCRibbonStatusBar::FindElement
+4507 CFileFind::FindFile
+4508 CFtpFileFind::FindFile
+4509 CGopherFileFind::FindFile
+4510 CGopherFileFind::FindFile
+4511 CDockingPanesRow::FindFirstVisiblePane
+4512 CPaneFrameWnd::FindFloatingPaneByID
+4513 CMFCVisualManagerBitmapCache::FindIndex
+4514 CObList::FindIndex
+4515 CObList::FindIndex
+4516 CObList::FindIndex
+4517 CMFCRibbonComboBox::FindItem
+4518 CMFCToolBarComboBoxButton::FindItem
+4519 COleControlContainer::FindItem
+4520 CMFCPropertyGridCtrl::FindItemByData
+4521 CMFCMenuBar::FindMenuItemText
+4522 CMFCPopupMenu::FindMenuWithConnectedFloaty
+4523 CMFCRibbonBar::FindNearest
+4524 CFileFind::FindNextFileA
+4525 CFtpFileFind::FindNextFileA
+4526 CGopherFileFind::FindNextFileA
+4527 CMFCRibbonBar::FindNextFocusedElement
+4528 CMDIClientAreaWnd::FindNextRegisteredWithTaskbarMDIChild
+4529 CMDIClientAreaWnd::FindNextRegisteredWithTaskbarMDIChild
+4530 CDockSite::FindNextVisibleRow
+4533 CMFCPropertySheet::FindPageIndexInList
+4534 CPreviewView::FindPageRect
+4535 CPaneContainerManager::FindPane
+4536 CPaneContainerManager::FindPane
+4537 CBaseTabbedPane::FindPaneByID
+4538 CDockingManager::FindPaneByID
+4539 CDockSite::FindPaneByID
+4540 CPaneContainerManager::FindPaneContainer
+4541 CPaneDivider::FindPaneContainer
+4542 CMFCRibbonCategory::FindPanelWithElem
+4543 CDockSite::FindRowByRect
+4544 CDockSite::FindRowIndex
+4545 CDHtmlDialog::FindSinkForObject
+4546 CWnd::FindSiteOrWnd
+4547 CWnd::FindSiteOrWndWithFocus
+4548 CRecordset::FindSQLToken
+4549 CMFCPopupMenu::FindSubItemByCommand
+4550 CMFCPropertyGridProperty::FindSubItemByData
+4551 CMFCRibbonButton::FindSubItemIndexByID
+4552 CPaneContainer::FindSubPaneContainer
+4553 CTabView::FindTab
+4554 CPaneContainer::FindTabbedPane
+4555 CPaneContainerManager::FindTabbedPane
+4556 CPaneDivider::FindTabbedPane
+4557 CMFCBaseTabCtrl::FindTabInfo
+4558 CMDIClientAreaWnd::FindTabWndByChild
+4559 CMFCOutlookBarTabCtrl::FindTargetWnd
+4560 CMFCTabCtrl::FindTargetWnd
+4561 CEditView::FindTextA
+4562 CRichEditView::FindTextA
+4563 CRichEditView::FindTextSimple
+4564 CUserToolsManager::FindTool
+4565 COleClientItem::FinishCreate
+4566 CMFCBaseTabCtrl::FireChangeActiveTab
+4567 CMFCBaseTabCtrl::FireChangingActiveTab
+4568 COleControl::FireError
+4569 COleControl::FireEvent
+4570 COleControlSite::XNotifyDBEvents::FireEvent
+4571 COleControl::FireEventV
+4572 CRecordset::Fixups
+4573 CDockingManager::FixupVirtualRects
+4574 CDockingPanesRow::FixupVirtualRects
+4575 CDockSite::FixupVirtualRects
+4576 CGlobalUtils::FlipRect
+4577 CFrameWnd::FloatControlBar
+4578 CBaseTabbedPane::FloatPane
+4579 CPane::FloatPane
+4580 CBaseTabbedPane::FloatTab
+4581 CMFCOutlookBar::FloatTab
+4582 CTabbedPane::FloatTab
+4583 CMFCImagePaintArea::FloodFill
+4584 CArchive::Flush
+4585 CDumpContext::Flush
+4586 CFile::Flush
+4587 CInternetFile::Flush
+4588 delete
+4589 CMonikerFile::Flush
+4590 COleStreamFile::Flush
+4591 CRenderTarget::Flush
+4592 delete
+4593 CStdioFile::Flush
+4594 COleDataSource::FlushClipboard
+4595 CRecordset::FlushResultSet
+4596 CMFCPreviewCtrlImpl::Focus
+4597 CGlobalUtils::ForceAdjustLayout
+4598 CMFCRibbonBar::ForceRecalcLayout
+4605 CMFCAcceleratorKey::Format
+4606 COleCurrency::Format
+4607 CMFCKeyMapDialog::FormatItem
+4618 CMFCPropertyGridColorProperty::FormatProperty
+4619 CMFCPropertyGridFontProperty::FormatProperty
+4620 CMFCPropertyGridProperty::FormatProperty
+4623 COleControl::ForwardActivationMsg
+4624 CDockingManager::FrameFromPoint
+4625 CPaneFrameWnd::FrameFromPoint
+4626 CAfxStringMgr::Free
+4627 CDatabase::Free
+4628 CFixedAlloc::Free
+4629 CFixedAllocNoSync::Free
+4630 CAfxStringMgr::Free
+4631 CSharedFile::Free
+4632 CFixedAlloc::FreeAll
+4633 CFixedAllocNoSync::FreeAll
+4634 CMapPtrToPtr::FreeAssoc
+4635 CMapPtrToPtr::FreeAssoc
+4636 CMapStringToOb::FreeAssoc
+4637 CMapStringToOb::FreeAssoc
+4638 CMapStringToString::FreeAssoc
+4639 CMapPtrToPtr::FreeAssoc
+4640 CMapPtrToPtr::FreeAssoc
+4641 CRecordset::FreeDataCache
+4642 CPlex::FreeDataChain
+4645 CByteArray::FreeExtra
+4646 CDWordArray::FreeExtra
+4647 CObArray::FreeExtra
+4648 CObArray::FreeExtra
+4649 CObArray::FreeExtra
+4650 CDWordArray::FreeExtra
+4651 CWordArray::FreeExtra
+4652 CShellManager::FreeItem
+4653 CObList::FreeNode
+4654 CObList::FreeNode
+4655 CStringList::FreeNode
+4656 CPaneContainer::FreeReleasedPaneContainer
+4657 CRecordset::FreeRowset
+4658 CThreadSlotData::FreeSlot
+4659 CMFCControlContainer::FreeSubclassedControls
+4660 CProperty::FreeValue
+4661 CArchiveStream::Clone
+4662 COleControlContainer::FreezeAllEvents
+4663 COleControlSite::FreezeEvents
+4664 COleControl::XOleControl::FreezeEvents
+4665 COleClientItem::FreezeLink
+4666 CDC::FromHandle
+4667 CGdiObject::FromHandle
+4668 CHandleMap::FromHandle
+4669 CImageList::FromHandle
+4670 CMenu::FromHandle
+4671 CWnd::FromHandle
+4672 CImageList::FromHandlePermanent
+4673 CMenu::FromHandlePermanent
+4674 CMFCToolBar::FromHandlePermanent
+4675 CWnd::FromHandlePermanent
+4676 CCmdTarget::FromIDispatch
+4677 CRuntimeClass::FromName
+4678 CRuntimeClass::FromName
+4680 CDataRecoveryHandler::GenerateAutosaveFileName
+4681 CGestureConfig::Get
+4682 CMFCVisualManagerBitmapCache::Get
+4683 CMFCVisualManagerBitmapCache::Get
+4684 CProperty::Get
+4685 CProperty::Get
+4686 CPropertySection::Get
+4687 CPropertySection::Get
+4688 CPropertySet::Get
+4689 CPropertySet::Get
+4690 CBasePane::get_accChild
+4691 CMFCPopupMenu::get_accChild
+4692 CMFCPropertyGridCtrl::get_accChild
+4693 CMFCRibbonBar::get_accChild
+4694 CMFCToolBar::get_accChild
+4695 CWnd::get_accChild
+4696 CWnd::XAccessible::get_accChild
+4697 CBasePane::get_accChildCount
+4698 CMFCPopupMenu::get_accChildCount
+4699 CBasePane::get_accChildCount
+4700 CMFCRibbonBar::get_accChildCount
+4701 CMFCToolBar::get_accChildCount
+4702 CWnd::get_accChildCount
+4703 CWnd::XAccessible::get_accChildCount
+4704 CBasePane::get_accDefaultAction
+4705 CCheckListBox::get_accDefaultAction
+4706 CMFCPropertyGridCtrl::get_accDefaultAction
+4707 CWnd::get_accDefaultAction
+4708 CWnd::XAccessible::get_accDefaultAction
+4709 CBasePane::get_accDescription
+4710 CMFCPropertyGridCtrl::get_accDescription
+4711 CWnd::get_accDescription
+4712 CWnd::XAccessible::get_accDescription
+4713 CBasePane::get_accFocus
+4714 CBasePane::get_accFocus
+4715 CWnd::get_accFocus
+4716 CWnd::XAccessible::get_accFocus
+4717 CBasePane::get_accHelp
+4718 CArchiveStream::AddRef
+4719 CWnd::get_accHelp
+4720 CWnd::XAccessible::get_accHelp
+4721 CArchiveStream::AddRef
+4722 CArchiveStream::AddRef
+4723 CWnd::get_accHelpTopic
+4724 CWnd::XAccessible::get_accHelpTopic
+4725 CBasePane::get_accKeyboardShortcut
+4726 CArchiveStream::AddRef
+4727 CWnd::get_accKeyboardShortcut
+4728 CWnd::XAccessible::get_accKeyboardShortcut
+4729 CBasePane::get_accName
+4730 CMFCPopupMenu::get_accName
+4731 CMFCPropertyGridCtrl::get_accName
+4732 CToolBar::get_accName
+4733 CWnd::get_accName
+4734 CWnd::XAccessible::get_accName
+4735 CBasePane::get_accParent
+4736 CMFCPopupMenu::get_accParent
+4737 CWnd::get_accParent
+4738 CWnd::XAccessible::get_accParent
+4739 CBasePane::get_accRole
+4740 CCheckListBox::get_accRole
+4741 CMFCPopupMenu::get_accRole
+4742 CMFCPopupMenuBar::get_accRole
+4743 CMFCPropertyGridCtrl::get_accRole
+4744 CWnd::get_accRole
+4745 CWnd::XAccessible::get_accRole
+4746 CBasePane::get_accFocus
+4747 CBasePane::get_accFocus
+4748 CWnd::get_accSelection
+4749 CWnd::XAccessible::get_accSelection
+4750 CBasePane::get_accState
+4751 CCheckListBox::get_accState
+4752 CMFCButton::get_accState
+4753 CMFCPopupMenu::get_accState
+4754 CMFCPopupMenuBar::get_accState
+4755 CMFCPropertyGridCtrl::get_accState
+4756 CWnd::get_accState
+4757 CWnd::XAccessible::get_accState
+4758 CBasePane::get_accValue
+4759 CMFCPropertyGridCtrl::get_accValue
+4760 CWnd::get_accValue
+4761 CWnd::XAccessible::get_accValue
+4762 CMFCToolBarButton::GetAccCount
+4763 CWnd::GetAccessibilityHitTest
+4764 CWnd::GetAccessibilityLocation
+4765 CWnd::GetAccessibleChild
+4766 CWnd::GetAccessibleChildCount
+4767 CWnd::GetAccessibleName
+4768 COleUILinkInfo::AddRef
+4769 COleControl::XPointerInactive::GetActivationPolicy
+4770 CFrameWnd::GetActiveDocument
+4772 CMDIFrameWnd::GetActiveFrame
+4773 CPropertySheet::GetActiveIndex
+4774 CPropertySheet::GetActivePage
+4775 CSplitterWnd::GetActivePane
+4776 CFrameWnd::GetActiveView
+4777 COleDocObjectItem::GetActiveView
+4778 CTabView::GetActiveView
+4779 CMFCBaseTabCtrl::GetActiveWnd
+4780 CMFCRibbonQuickAccessToolBar::GetActualWidth
+4781 CIPAddressCtrl::GetAddress
+4782 CHtmlView::GetAddressBar
+4783 COleControl::XViewObject::GetAdvise
+4784 CMFCCaptionBar::GetAlignment
+4785 CAutoHideDockSite::GetAlignRect
+4788 CMFCToolBar::GetAllToolbars
+4789 COleControl::GetAmbientDispatchDriver
+4790 COleControlContainer::GetAmbientProp
+4791 COleControl::GetAmbientProperty
+4792 CMFCColorPickerCtrl::GetAngleFromPoint
+4793 CAnimationColor::GetAnimationVariableList
+4794 CAnimationPoint::GetAnimationVariableList
+4795 CAnimationRect::GetAnimationVariableList
+4796 CAnimationPoint::GetAnimationVariableList
+4797 CAnimationValue::GetAnimationVariableList
+4798 CRenderTarget::GetAntialiasMode
+4799 COleControl::GetAppearance
+4800 CHtmlView::GetApplication
+4801 CWinApp::GetAppRegistryKey
+4802 CMFCRibbonInfo::GetArrayImages
+4803 CMapPtrToPtr::GetAssocAt
+4804 CMapPtrToPtr::GetAssocAt
+4805 CMapStringToOb::GetAssocAt
+4806 CMapStringToOb::GetAssocAt
+4807 CMapStringToString::GetAssocAt
+4808 CMapWordToOb::GetAssocAt
+4809 CMapWordToOb::GetAssocAt
+4810 CPaneContainer::GetAssociatedSiblingPaneIDs
+4813 CGopherConnection::GetAttribute
+4814 CMFCVisualManager::GetAutoHideButtonTextColor
+4815 CMFCVisualManagerOfficeXP::GetAutoHideButtonTextColor
+4816 CPane::GetAvailableExpandSize
+4817 CDockingPanesRow::GetAvailableLength
+4818 CDockingPanesRow::GetAvailableLengthRect
+4819 CDockingPanesRow::GetAvailableSpace
+4820 CPaneContainerManager::GetAvailableSpace
+4821 CPane::GetAvailableStretchSize
+4822 COleControl::GetBackColor
+4823 CMFCControlBarImpl::GetBackgroundFromParent
+4824 CControlBar::GetBarInfo
+4825 CDockBar::GetBarInfo
+4826 CMFCVisualManagerOffice2003::GetBaseThemeColor
+4827 CDocManager::GetBestTemplate
+4828 CWinAppEx::GetBinary
+4829 CAsyncMonikerFile::GetBindInfo
+4830 CBitmapRenderTarget::GetBitmap
+4831 CBlobProperty::GetBlob
+4832 CRecordset::GetBookmark
+4833 COleFrameHook::XOleInPlaceFrame::GetBorder
+4834 CArchiveStream::Clone
+4835 CPane::GetBorders
+4836 CStatusBarCtrl::GetBorders
+4837 CMFCPopupMenu::GetBorderSize
+4838 CMFCRibbonPanelMenu::GetBorderSize
+4839 COleControl::GetBorderStyle
+4840 CDataSourceControl::GetBoundClientRow
+4841 CRecordset::GetBoundFieldIndex
+4842 CRecordset::GetBoundParamIndex
+4843 CD2DGeometry::GetBounds
+4848 CEditView::GetBufferLength
+4849 COleUILinkInfo::AddRef
+4850 CMemFile::GetBufferPtr
+4851 CSocketFile::GetBufferPtr
+4854 CHtmlView::GetBusy
+4855 CMFCToolBar::GetButton
+4856 CMFCVisualManagerWindows::GetButtonExtraBorder
+4857 CVSListBoxBase::GetButtonID
+4858 CMFCToolBar::GetButtonInfo
+4859 CToolBar::GetButtonInfo
+4860 CVSListBoxBase::GetButtonNum
+4861 CMFCToolBar::GetButtonStyle
+4862 CToolBar::GetButtonStyle
+4863 CMFCToolBar::GetButtonText
+4864 CMFCToolBar::GetButtonText
+4865 CToolBar::GetButtonText
+4866 CToolBar::GetButtonText
+4867 CMFCToolBarComboBoxButton::GetByCmd
+4868 CMFCToolBarDateTimeCtrl::GetByCmd
+4869 CMFCToolBarEditBoxButton::GetByCmd
+4870 COleSafeArray::GetByteArray
+4871 COleSafeArray::GetByteArray
+4872 CPropertySet::GetByteOrder
+4873 COleClientItem::GetCachedExtent
+4874 COleDataSource::GetCacheEntry
+4875 COleControl::XDataObject::GetCanonicalFormatEtc
+4876 COleDataSource::XDataObject::GetCanonicalFormatEtc
+4877 COleDataSource::XDataObject::GetCanonicalFormatEtc
+4878 COleDataSource::XDataObject::GetCanonicalFormatEtc
+4879 CMFCVisualManager::GetCaptionBarTextColor
+4880 CMFCVisualManagerOffice2007::GetCaptionBarTextColor
+4881 CMFCVisualManagerWindows::GetCaptionButtonExtraBorder
+4882 CPaneFrameWnd::GetCaptionButtonTotalWidth
+4883 CDockablePane::GetCaptionHeight
+4884 CMFCDesktopAlertWnd::GetCaptionHeight
+4885 CFrameImpl::GetCaptionRect
+4886 CMFCDesktopAlertWnd::GetCaptionRect
+4887 CPaneFrameWnd::GetCaptionRect
+4888 CMFCRibbonPanel::GetCaptionSize
+4889 CMultiPaneFrameWnd::GetCaptionText
+4890 CPaneFrameWnd::GetCaptionText
+4891 COleControl::GetCapture
+4892 COleControlSite::XOleIPSite::GetCapture
+4893 CMFCRibbonBar::GetCategory
+4894 CMFCRibbonBar::GetCategoryCount
+4895 CMFCRibbonCollector::GetCategoryImages
+4896 CMFCRibbonCollector::GetCategoryImages
+4897 CMFCRibbonBar::GetCategoryIndex
+4898 CD2DRadialGradientBrush::GetCenter
+4899 CFontDialog::GetCharFormat
+4900 CRichEditView::GetCharFormatSelection
+4901 CCheckListBox::GetCheck
+4902 CListCtrl::GetCheck
+4903 CTreeCtrl::GetCheck
+4904 CFileDialog::GetCheckButtonState
+4905 CWnd::GetCheckedRadioButton
+4906 CMFCShellTreeCtrl::GetChildItems
+4907 CBlobProperty::GetClassID
+4908 COleClientItem::GetClassID
+4909 CPropertySet::GetClassID
+4910 COleLinkingDoc::XPersistFile::GetClassID
+4911 COleControl::XPersistMemory::GetClassID
+4912 COleControl::XPersistPropertyBag::GetClassID
+4913 COleControl::XPersistStorage::GetClassID
+4914 COleServerDoc::XPersistStorage::GetClassID
+4915 COleControl::XPersistStreamInit::GetClassID
+4916 COleControl::XProvideClassInfo::GetClassInfoA
+4917 AFX_COM::GetClassObject
+4918 CMDITabProxyWnd::GetClientBitmap
+4919 COleControl::GetClientOffset
+4920 CDockingPanesRow::GetClientRect
+4921 COleControl::GetClientRect
+4922 COleClientItem::GetClientSite
+4923 COleControl::GetClientSite
+4924 CRichEditCntrItem::GetClientSite
+4925 CDocObjectServer::XOleObject::GetClientSite
+4926 COleControl::XOleObject::GetClientSite
+4927 COleServerDoc::XOleObject::GetClientSite
+4928 COleServerItem::XOleObject::GetClientSite
+4929 COleClientItem::GetClipboardData
+4930 COleServerItem::GetClipboardData
+4931 CArchiveStream::Clone
+4932 CDocObjectServer::XOleObject::GetClipboardData
+4933 CArchiveStream::Clone
+4934 COleServerDoc::XOleObject::GetClipboardData
+4935 COleServerItem::XOleObject::GetClipboardData
+4936 CRichEditView::XRichEditOleCallback::GetClipboardData
+4937 CMFCToolBarButton::GetClipboardFormat
+4938 COleDataSource::GetClipboardOwner
+4939 CDC::GetClipBox
+4940 CMetaFileDC::GetClipBox
+4941 CCommandManager::GetCmdImage
+4942 GetCmdMgr
+4943 AFX_GLOBAL_DATA::GetColor
+4945 CMFCColorMenuButton::GetColorByCmdID
+4946 CMFCRibbonColorButton::GetColorByIndex
+4947 CMFCColorBar::GetColorGridSize
+4948 CReBarCtrl::GetColorScheme
+4949 COleControl::XViewObject::GetColorSet
+4950 CSplitterWnd::GetColumnInfo
+4951 CListCtrl::GetColumnOrderArray
+4952 CMFCHeaderCtrl::GetColumnState
+4953 CMFCRibbonCommandsListBox::GetCommand
+4954 CMFCToolBar::GetCommandButtons
+4955 CMFCRibbonCommandsListBox::GetCommandIndex
+4956 CMFCKeyMapDialog::GetCommandKeys
+4957 CCmdTarget::GetCommandMap
+4958 COleDocObjectItem::GetCommandMap
+4959 CMFCToolBarsCustomizeDialog::GetCommandName
+4960 CMFCRibbonQuickAccessToolBar::GetCommands
+4961 CMFCRibbonMainPanel::GetCommandsFrame
+4962 CMFCPopupMenuBar::GetCommandTarget
+4963 GetCommCtrlVersion
+4964 CMFCRibbonButton::GetCompactSize
+4965 CMFCRibbonEdit::GetCompactSize
+4966 CMFCRibbonGallery::GetCompactSize
+4967 CMFCRibbonBaseElement::GetCompactSize
+4968 CMFCRibbonBaseElement::GetCompactSize
+4969 CDatabase::GetConnectInfo
+4970 CConnectionPoint::GetConnectionCount
+4971 COleUILinkInfo::AddRef
+4972 COleControl::GetConnectionHook
+4973 CConnectionPoint::XConnPt::GetConnectionInterface
+4974 CCmdTarget::GetConnectionMap
+4975 COleControl::GetConnectionMap
+4976 CConnectionPoint::XConnPt::GetConnectionPointContainer
+4977 CConnectionPoint::GetConnections
+4978 CConnectionPoint::GetContainer
+4979 CHtmlView::GetContainer
+4980 COleUILinkInfo::AddRef
+4981 COleLinkingDoc::GetContainer
+4982 COleClientItem::XOleClientSite::GetContainer
+4983 COleControlSite::XOleClientSite::GetContainer
+4984 COleDocIPFrameWndEx::GetContainerFrameWindow
+4985 COleDocIPFrameWndEx::GetContainerFrameWindow
+4986 COleControl::XQuickActivate::GetContentExtent
+4987 CMFCToolBarEditBoxButton::GetContentsAll
+4988 COleUILinkInfo::AddRef
+4989 CRichEditView::XRichEditOleCallback::GetContextMenu
+4990 CWinAppEx::GetContextMenuManager
+4991 CMFCRibbonBar::GetContextName
+4992 CFrameWnd::GetControlBar
+4993 CWnd::GetControlContainer
+4994 CMFCControlContainer::GetControlData
+4995 CDHtmlDialog::GetControlDispatch
+4996 CSocketFile::GetBufferPtr
+4997 COleControlSite::GetControlInfo
+4998 COleControl::XOleControl::GetControlInfo
+4999 CFileDialog::GetControlItemState
+5000 CDocObjectServer::GetControllingFrame
+5001 CCmdTarget::GetControllingUnknown
+5002 CDHtmlDialog::GetControlProperty
+5003 CDHtmlDialog::GetControlProperty
+5004 CDHtmlDialog::GetControlProperty
+5005 COleControl::GetControlSize
+5006 CFileDialog::GetControlState
+5007 COlePropertyPage::GetControlStatus
+5008 CWnd::GetControlUnknown
+5009 COlePropertiesDialog::XOleUIObjInfo::GetConvertInfo
+5010 CInternetSession::GetCookie
+5011 CInternetSession::GetCookie
+5012 CInternetSession::GetCookieLength
+5013 CPrintDialog::GetCopies
+5014 CPrintDialogEx::GetCopies
+5015 CMFCCmdUsageCount::GetCount
+5016 CMFCDropDownListBox::GetCount
+5017 CMFCRibbonPanel::GetCount
+5018 CMFCRibbonStatusBar::GetCount
+5019 CMFCToolBar::GetCount
+5020 COleDocObjectItem::GetActiveView
+5021 CPropertySection::GetCount
+5022 CMFCFilterChunkValueImpl::GetChunkPID
+5023 CVSListBox::GetCount
+5024 CMFCToolBarComboBoxButton::GetCountAll
+5025 CMFCToolBarsCustomizeDialog::GetCountInCategory
+5026 CFileFind::GetCreationTime
+5027 CFileFind::GetCreationTime
+5028 CGopherFileFind::GetCreationTime
+5029 CGopherFileFind::GetCreationTime
+5030 COleLinkingDoc::XPersistFile::GetCurFile
+5031 CBasePane::GetCurrentAlignment
+5032 CFtpConnection::GetCurrentDirectoryA
+5033 CFtpConnection::GetCurrentDirectoryA
+5034 CFtpConnection::GetCurrentDirectoryAsURL
+5035 CFtpConnection::GetCurrentDirectoryAsURL
+5036 CMFCShellListCtrl::GetCurrentFolder
+5037 CMFCShellListCtrl::GetCurrentFolderName
+5038 CFontDialog::GetCurrentFont
+5039 CMFCStatusBar::GetCurrentFont
+5040 CWnd::GetCurrentMessage
+5041 CDHtmlDialog::GetCurrentUrl
+5042 CMFCDropDownListBox::GetCurSel
+5043 CMonthCalCtrl::GetCurSel
+5044 CMonthCalCtrl::GetCurSel
+5045 CMFCToolBarComboBoxButton::GetCurSelAll
+5046 CDataBoundProperty::GetCursor
+5047 CDataSourceControl::GetCursor
+5048 COleControlSite::GetCursor
+5049 COleControlSite::XBoundObjectSite::GetCursor
+5050 CMFCColorPickerCtrl::GetCursorPos
+5051 CMFCColorPickerCtrl::GetCursorRect
+5052 CMFCPropertyGridCtrl::GetCustomColors
+5055 COleDataObject::GetData
+5057 CRecordset::GetData
+5059 COleControl::XDataObject::GetData
+5060 COleDataSource::XDataObject::GetData
+5061 COleServerDoc::XDataObject::GetData
+5062 COleServerItem::XDataObject::GetData
+5063 CDatabase::GetDatabaseName
+5064 CRecordset::GetDataBuffer
+5065 COleControl::XDataObject::GetDataHere
+5066 COleDataSource::XDataObject::GetDataHere
+5067 COleServerDoc::XDataObject::GetDataHere
+5068 COleServerItem::XDataObject::GetDataHere
+5069 CThreadLocalObject::GetDataNA
+5070 COleServerItem::GetDataObject
+5071 CWinApp::GetDataRecoveryHandler
+5072 COleControl::GetDataSource
+5073 CWinAppEx::GetDataVersion
+5074 COleControl::GetDC
+5075 COleControlSite::XOleIPSite::GetDC
+5076 COleUILinkInfo::AddRef
+5077 CFrameWnd::GetDefaultAccelerator
+5078 COleServerDoc::GetDefaultAccelerator
+5079 CRichEditCtrl::GetDefaultCharFormat
+5080 CRichEditCtrl::GetDefaultCharFormat
+5081 CMFCRibbonQuickAccessToolBar::GetDefaultCommands
+5082 CRecordset::GetDefaultConnect
+5083 CRecordset::GetDefaultFieldType
+5084 COleUILinkInfo::AddRef
+5085 COleServerDoc::GetDefaultMenu
+5086 CDockablePane::GetDefaultPaneDivider
+5087 CPrintDialog::GetDefaults
+5088 CPrintDialogEx::GetDefaults
+5089 CRecordset::GetDefaultSQL
+5090 CAnimationColor::GetDefaultValue
+5091 CAnimationPoint::GetDefaultValue
+5092 CAnimationRect::GetDefaultValue
+5093 CAnimationPoint::GetDefaultValue
+5094 COccManager::GetDefBtnCode
+5095 COleControlSite::GetDefBtnCode
+5096 CWnd::GetDescendantWindow
+5097 CMFCRibbonBaseElement::GetDescription
+5098 CMFCRibbonGalleryIcon::GetDescription
+5099 CPageSetupDialog::GetDeviceName
+5100 CPrintDialog::GetDeviceName
+5101 CPrintDialogEx::GetDeviceName
+5102 CScrollView::GetDeviceScrollPosition
+5103 CScrollView::GetDeviceScrollSizes
+5104 CPageSetupDialog::GetDevMode
+5105 CPrintDialog::GetDevMode
+5106 CPrintDialogEx::GetDevMode
+5107 CHtmlEditView::GetDHtmlCommandMapping
+5108 CDHtmlDialog::GetDHtmlDocument
+5109 CHtmlEditCtrl::GetDHtmlDocument
+5110 CHtmlEditView::GetDHtmlDocument
+5111 GetDHtmlEventMap
+5112 COleUILinkInfo::AddRef
+5113 CMultiPageDHtmlDialog::GetDHtmlEventMap
+5114 CMFCDesktopAlertWnd::GetDialogSize
+5115 COleUILinkInfo::AddRef
+5116 COleControl::GetDispatchIID
+5117 CCmdTarget::GetDispatchMap
+5118 COleControlContainer::GetDispatchMap
+5119 CCmdTarget::GetDispEntry
+5120 CRecentFileList::GetDisplayName
+5121 CFontHolder::GetDisplayString
+5122 CPictureHolder::GetDisplayString
+5123 COleControl::XPerPropertyBrowsing::GetDisplayString
+5124 COleControlSite::GetDlgCtrlID
+5125 CWnd::GetDlgCtrlID
+5126 COleControlContainer::GetDlgItem
+5127 COleControlContainer::GetDlgItem
+5128 CWnd::GetDlgItem
+5129 CWnd::GetDlgItem
+5130 COleControlContainer::GetDlgItemInt
+5131 CWnd::GetDlgItemInt
+5132 COleControlContainer::GetDlgItemTextA
+5133 CWnd::GetDlgItemTextA
+5134 CWnd::GetDlgItemTextA
+5135 CMFCDesktopAlertDialog::GetDlgSize
+5136 CDockContext::GetDockBar
+5137 CDockBar::GetDockedControlBar
+5138 CDockBar::GetDockedCount
+5139 CDockBar::GetDockedVisibleCount
+5140 CControlBar::GetDockingFrame
+5141 CGlobalUtils::GetDockingManager
+5142 CBasePane::GetDockingMode
+5143 CPaneFrameWnd::GetDockingMode
+5144 CDockablePane::GetDockingStatus
+5145 CMFCOutlookBar::GetDockingStatus
+5146 CMFCVisualManagerVS2005::GetDockingTabsBordersSize
+5147 CBasePane::GetDockSiteFrameWnd
+5148 CFrameWnd::GetDockState
+5149 CDocObjectServer::XOleDocument::GetDocMiscStatus
+5150 COleUILinkInfo::AddRef
+5151 CDocTemplate::GetDocString
+5152 CDocObjectServer::XOleDocumentView::GetDocument
+5153 CDocManager::GetDocumentCount
+5154 CMFCTabCtrl::GetDocumentIcon
+5155 CDataRecoveryHandler::GetDocumentListName
+5156 CMDIChildWndEx::GetDocumentName
+5157 CD2DBitmap::GetDPI
+5158 CRenderTarget::GetDpi
+5159 CRichEditView::XRichEditOleCallback::GetDragDropEffect
+5160 CPageSetupDialog::GetDriverName
+5161 CPrintDialog::GetDriverName
+5162 CPrintDialogEx::GetDriverName
+5163 CMFCRibbonBaseElement::GetDropDownImageWidth
+5164 CMFCRibbonBar::GetDroppedDown
+5165 CMFCRibbonBaseElement::GetDroppedDown
+5166 CMFCRibbonButtonsGroup::GetDroppedDown
+5167 CMFCRibbonCategory::GetDroppedDown
+5168 CMFCRibbonGallery::GetDroppedDown
+5169 CMFCRibbonPanel::GetDroppedDown
+5170 CMFCRibbonPanelMenuBar::GetDroppedDown
+5171 CMFCRibbonStatusBar::GetDroppedDown
+5172 CMFCToolBar::GetDroppedDownMenu
+5173 CBrowserControlSite::GetDropTarget
+5174 COleLinkingDoc::XOleItemContainer::EnumObjects
+5175 CToolBarCtrl::GetDropTarget
+5176 CHtmlControlSite::XDocHostUIHandler::GetDropTarget
+5177 COleControl::XOleInPlaceObject::GetDropTarget
+5178 CWnd::GetDSCCursor
+5179 CMFCToolBarEditBoxButton::GetEditBorder
+5180 CMFCToolBarSpinEditBoxButton::GetEditBorder
+5181 CFileDialog::GetEditBoxText
+5182 CDHtmlDialog::GetElement
+5183 CDHtmlDialog::GetElement
+5184 CMFCRibbonPanel::GetElement
+5185 CMFCRibbonStatusBar::GetElement
+5186 COleSafeArray::GetElement
+5187 CDHtmlDialog::GetElementHtml
+5188 CMFCRibbonCollector::GetElementImages
+5189 CDHtmlDialog::GetElementInterface
+5190 CDHtmlDialog::GetElementProperty
+5191 CMFCRibbonButton::GetElements
+5192 CMFCRibbonCategory::GetElements
+5193 CMFCRibbonPanel::GetElements
+5194 CMFCRibbonBar::GetElementsByID
+5195 CMFCRibbonBaseElement::GetElementsByID
+5196 CMFCRibbonButton::GetElementsByID
+5197 CMFCRibbonButtonsGroup::GetElementsByID
+5198 CMFCRibbonCategory::GetElementsByID
+5199 CMFCRibbonPanel::GetElementsByID
+5200 CDHtmlDialog::GetElementText
+5201 COleServerDoc::GetEmbeddedItem
+5202 COleClientItem::GetEmbeddedItemData
+5203 COleServerItem::GetEmbedSourceData
+5204 COleControl::GetEnabled
+5205 CD2DLinearGradientBrush::GetEndPoint
+5206 CCmdTarget::GetEntryCount
+5207 CWnd::XAccessibleServer::GetEnumVariant
+5212 CArchiveException::GetErrorMessage
+5213 CDBException::GetErrorMessage
+5214 CException::GetErrorMessage
+5215 CException::GetErrorMessage
+5216 CFileException::GetErrorMessage
+5217 CInternetException::GetErrorMessage
+5218 COleDispatchException::GetErrorMessage
+5219 COleException::GetErrorMessage
+5220 CSimpleException::GetErrorMessage
+5221 CDHtmlDialog::GetEvent
+5222 COleControlSite::GetEventIID
+5223 COleControl::GetEventMap
+5224 COleControl::GetEventMapEntry
+5225 COleUILinkInfo::AddRef
+5226 CCmdTarget::GetEventSinkEntry
+5227 CCmdTarget::GetEventSinkMap
+5228 CDHtmlDialog::GetEventSinkMap
+5229 CHtmlEditCtrl::GetEventSinkMap
+5230 CHtmlView::GetEventSinkMap
+5231 CMFCRibbonStatusBar::GetExCount
+5232 CMFCRibbonStatusBar::GetExElement
+5233 CMFCPropertyGridProperty::GetExpandedSubItems
+5234 COleControlSite::GetExStyle
+5235 CWnd::GetExStyle
+5236 CMFCRibbonStatusBar::GetExtendedArea
+5237 CMFCStatusBar::GetExtendedArea
+5238 COleControl::GetExtendedControl
+5239 CArchiveStream::Clone
+5240 CD2DBitmapBrush::GetExtendModeX
+5241 CD2DBitmapBrush::GetExtendModeY
+5242 COleClientItem::GetExtent
+5243 CDocObjectServer::XOleObject::GetExtent
+5244 COleControl::XOleObject::GetExtent
+5245 COleServerDoc::XOleObject::GetExtent
+5246 COleServerItem::XOleObject::GetExtent
+5247 COleControl::XViewObject::GetExtent
+5248 CBrowserControlSite::GetExternal
+5249 CDHtmlDialog::GetExternal
+5250 CHtmlControlSite::XDocHostUIHandler::GetExternal
+5251 COleUILinkInfo::AddRef
+5252 COleControl::GetExtraConnectionPoints
+5253 CMFCColorBar::GetExtraHeight
+5254 CRecordset::GetFieldIndexByName
+5255 CRecordset::GetFieldLengthBuffer
+5256 CRecordset::GetFieldStatus
+5257 CRecordset::GetFieldValue
+5258 CRecordset::GetFieldValue
+5259 CRecordset::GetFieldValue
+5260 CRecordset::GetFieldValue
+5261 CRecordset::GetFieldValue
+5262 CRecordset::GetFieldValue
+5263 CD2DPathGeometry::GetFigureCount
+5264 CDocument::GetFile
+5265 CFtpConnection::GetFile
+5266 COleDataObject::GetFileData
+5267 CFileDialog::GetFileExt
+5268 CFile::GetFileName
+5269 CFileDialog::GetFileName
+5270 CFileFind::GetFileName
+5271 CSocketFile::Abort
+5272 CFile::GetFilePath
+5273 CFileFind::GetFilePath
+5274 CSocketFile::Abort
+5275 CFile::GetFileTitle
+5276 CFileDialog::GetFileTitle
+5277 CFileFind::GetFileTitle
+5278 CSocketFile::Abort
+5279 COleServerDoc::GetFileTypeString
+5280 CFileFind::GetFileURL
+5281 CFtpFileFind::GetFileURL
+5282 CSocketFile::Abort
+5283 CHttpFile::GetFileURL
+5284 CMFCAutoHideBar::GetFirstAHWindow
+5285 CMonthCalCtrl::GetFirstDayOfWeek
+5286 CMultiDocTemplate::GetFirstDocPosition
+5287 CSingleDocTemplate::GetFirstDocPosition
+5288 CBlobProperty::GetBlob
+5289 CWinApp::GetFirstDocTemplatePosition
+5290 COleDocument::GetFirstFrame
+5291 CPaneContainerManager::GetFirstPane
+5292 CPaneDivider::GetFirstPane
+5293 CMFCRibbonButtonsGroup::GetFirstTabStop
+5294 CMFCRibbonPanel::GetFirstTabStop
+5295 CMDIClientAreaWnd::GetFirstTabWnd
+5296 CDocument::GetFirstViewPosition
+5297 CMFCRibbonCategory::GetFirstVisibleElement
+5298 CPaneContainerManager::GetFirstVisiblePane
+5299 CPaneFrameWnd::GetFirstVisiblePane
+5300 CBaseTabbedPane::GetFirstVisibleTab
+5301 CMFCBaseTabCtrl::GetFirstVisibleTab
+5302 CMFCBaseTabCtrl::GetFirstVisibleTab
+5303 CMFCToolTipCtrl::GetFixedWidth
+5304 CMFCMenuBar::GetFloatPopupDirection
+5305 COleControl::GetFocus
+5306 COleControlSite::XOleIPSite::AdjustRect
+5307 CMFCRibbonBar::GetFocused
+5308 CMFCRibbonBaseElement::GetFocused
+5309 CMFCRibbonButtonsGroup::GetFocused
+5310 CMFCRibbonCategory::GetFocused
+5311 CMFCRibbonPanel::GetFocused
+5312 CMFCRibbonPanelMenuBar::GetFocused
+5313 CFileDialog::GetFolderPath
+5314 CDialogTemplate::GetFont
+5315 CDialogTemplate::GetFont
+5316 COleControl::GetFont
+5317 CFontHolder::GetFontDispatch
+5318 CD2DTextFormat::GetFontFamilyName
+5319 CD2DTextLayout::GetFontFamilyName
+5320 CFontHolder::GetFontHandle
+5321 CFontHolder::GetFontHandle
+5322 CMFCRibbonFontComboBox::GetFontsCount
+5323 CMFCToolBarFontComboBox::GetFontsCount
+5324 CDialogTemplate::GetFontSizeField
+5325 COleControl::GetFontTextMetrics
+5326 COleControl::GetForeColor
+5327 CPropertySection::GetFormatID
+5328 CPropertySet::GetFormatVersion
+5329 CMDIChildWndEx::GetFrameIcon
+5330 CMDIChildWndEx::GetFrameText
+5331 CFrameImpl::GetFreeCtrlBarID
+5332 CMenuTearOffManager::GetFreeTearOffID
+5333 CInternetSession::GetFtpConnection
+5334 CHtmlView::GetFullName
+5335 CHtmlView::GetFullScreen
+5336 CDHtmlControlSink::GetFuncInfoFromId
+5337 CMFCRibbonPanel::GetGalleryRect
+5338 CWnd::GetGestureConfig
+5339 CArchiveStream::AddRef
+5340 COleDataObject::GetGlobalData
+5341 CInternetSession::GetGopherConnection
+5342 CD2DRadialGradientBrush::GetGradientOriginOffset
+5343 CMFCControlBarImpl::GetGripperRect
+5344 CMFCMaskedEdit::GetGroupBounds
+5345 CMFCRibbonButton::GetGroupButtonExtraWidth
+5346 CDockingPanesRow::GetGroupFromPane
+5347 CMFCTasksPane::GetGroupLocation
+5348 CMFCRibbonGallery::GetGroupName
+5349 COleControl::XProvideClassInfo::GetGUID
+5350 CMFCPopupMenuBar::GetGutterWidth
+5351 CDC::GetHalftoneBrush
+5352 AFX_GLOBAL_DATA::GetHandCursor
+5353 CRectTracker::GetHandleMask
+5354 CRectTracker::GetHandleRect
+5355 CRectTracker::GetHandleSize
+5356 CListCtrl::GetHeaderCtrl
+5357 CHtmlView::GetHeight
+5358 CMFCRibbonPanel::GetHeight
+5359 CMFCMenuBar::GetHelpCombobox
+5360 COleDocObjectItem::GetHelpMenu
+5361 CMFCPropertyGridProperty::GetHierarchyLevel
+5362 CMFCRibbonBaseElement::GetHighlighted
+5363 CMFCRibbonButtonsGroup::GetHighlighted
+5364 CMFCRibbonCategory::GetHighlighted
+5365 CMFCRibbonGallery::GetHighlighted
+5366 CMFCRibbonPanel::GetHighlighted
+5367 CMFCToolBar::GetHighlightedButton
+5368 CMFCColorBar::GetHighlightedColor
+5369 CMFCRibbonColorButton::GetHighlightedColor
+5370 CMFCVisualManager::GetHighlightedMenuItemTextColor
+5371 CMFCVisualManagerOffice2007::GetHighlightedMenuItemTextColor
+5372 CMFCVisualManagerOfficeXP::GetHighlightedMenuItemTextColor
+5373 CMFCVisualManagerWindows::GetHighlightedMenuItemTextColor
+5374 CMFCCaptionButton::GetHit
+5375 CSplitterWnd::GetHitRect
+5376 CMFCRibbonSlider::GetHitTest
+5377 CMFCColorPickerCtrl::GetHLS
+5378 CBrowserControlSite::GetHostInfo
+5379 CDHtmlDialog::GetHostInfo
+5380 CHtmlControlSite::XDocHostUIHandler::GetHostInfo
+5381 CMFCToolTipCtrl::GetHotButton
+5382 CHotKeyCtrl::GetHotKey
+5383 CHotKeyCtrl::GetHotKeyName
+5384 CMFCToolBar::GetHotTextColor
+5385 CHtmlView::GetHtmlDocument
+5386 CInternetSession::GetHttpConnection
+5387 CInternetSession::GetHttpConnection
+5388 COleControl::GetHwnd
+5389 CWnd::XAccessibleServer::GetHWND
+5390 CMFCRibbonGallery::GetIconDescription
+5391 COleClientItem::GetIconFromRegistry
+5392 COleClientItem::GetIconFromRegistry
+5393 COleClientItem::GetIconicMetafile
+5394 CMFCCaptionButton::GetIconID
+5395 CMFCRibbonGallery::GetIconSize
+5396 CMFCRibbonUndoButton::GetIconSize
+5397 CMFCToolTipCtrl::GetIconSize
+5398 CMFCRibbonColorButton::GetIconToolTip
+5399 CMFCRibbonGallery::GetIconToolTip
+5400 CFrameWnd::GetIconWndClass
+5401 CMFCRibbonCollector::GetID
+5402 CProperty::GetID
+5403 CPropertySection::GetID
+5404 COleDataObject::GetIDataObject
+5405 CCmdTarget::GetIDispatch
+5406 CArchiveStream::Clone
+5407 CArchiveStream::Clone
+5408 CArchiveStream::Clone
+5409 COleDispatchImpl::GetIDsOfNames
+5410 CWnd::XAccessible::GetIDsOfNames
+5411 CArchiveStream::Clone
+5412 CArchiveStream::Clone
+5413 CFileDialog::GetIFileDialogCustomize
+5414 CFileDialog::GetIFileOpenDialog
+5415 CFileDialog::GetIFileSaveDialog
+5416 COleControl::XEventConnPt::GetIID
+5417 CMFCButton::GetImageHorzMargin
+5418 CMFCToolBar::GetImageList
+5419 CReBarCtrl::GetImageList
+5420 CMFCToolBarMenuButton::GetImageRect
+5421 CMFCCaptionBar::GetImageSize
+5422 CMFCRibbonButton::GetImageSize
+5423 CMFCRibbonButtonsGroup::GetImageSize
+5424 CMFCRibbonCategory::GetImageSize
+5425 CMFCRibbonPanel::GetIndex
+5426 CFrameWndEx::GetInPlaceActiveItem
+5427 CFrameWndEx::GetInPlaceActiveItem
+5428 COleDocument::GetInPlaceActiveItem
+5429 CRichEditDoc::GetInPlaceActiveItem
+5430 CRichEditView::GetInPlaceActiveItem
+5431 CRichEditView::XRichEditOleCallback::GetInPlaceContext
+5432 COleIPFrameWnd::GetInPlaceMenu
+5433 CDocObjectServer::XOleDocumentView::GetInPlaceSite
+5434 COleClientItem::GetInPlaceWindow
+5435 CSplitterWnd::GetInsideRect
+5436 CWinAppEx::GetInt
+5437 CCmdTarget::GetInterface
+5438 CBrowserControlSite::GetInterfaceHook
+5439 COleUILinkInfo::AddRef
+5440 COleControl::GetInterfaceHook
+5441 COleServerDoc::GetInterfaceHook
+5442 CCmdTarget::GetInterfaceMap
+5443 CDocObjectServer::GetInterfaceMap
+5444 CDocument::GetInterfaceMap
+5445 CEnumConnections::GetInterfaceMap
+5446 CEnumConnPoints::GetInterfaceMap
+5447 CEnumFormatEtc::GetInterfaceMap
+5448 CEnumOleVerb::GetInterfaceMap
+5449 CEnumUnknown::GetInterfaceMap
+5450 CFileDialog::GetInterfaceMap
+5451 CHtmlControlSite::GetInterfaceMap
+5452 COleClientItem::GetInterfaceMap
+5453 COleControl::GetInterfaceMap
+5454 COleControlContainer::GetInterfaceMap
+5455 COleControlSite::GetInterfaceMap
+5456 COleDataSource::GetInterfaceMap
+5457 COleDocObjectItem::GetInterfaceMap
+5458 COleDropSource::GetInterfaceMap
+5459 COleDropTarget::GetInterfaceMap
+5460 COleFrameHook::GetInterfaceMap
+5461 COleLinkingDoc::GetInterfaceMap
+5462 COleMessageFilter::GetInterfaceMap
+5463 COleObjectFactory::GetInterfaceMap
+5464 COlePropertyPage::GetInterfaceMap
+5465 COleServerDoc::GetInterfaceMap
+5466 COleServerItem::GetInterfaceMap
+5467 CRichEditView::GetInterfaceMap
+5468 CWnd::GetInterfaceMap
+5469 CMFCRibbonButton::GetIntermediateSize
+5470 CMFCRibbonCheckBox::GetIntermediateSize
+5471 CMFCRibbonComboBox::GetIntermediateSize
+5472 CMFCRibbonEdit::GetIntermediateSize
+5473 CMFCRibbonLabel::GetIntermediateSize
+5474 CMFCRibbonStatusBarPane::GetIntermediateSize
+5475 CD2DBitmapBrush::GetInterpolationMode
+5476 CMFCToolBar::GetInvalidateItemRect
+5477 CMFCToolBarEditBoxButton::GetInvalidateRect
+5478 CRichEditCtrl::GetIRichEditOle
+5479 AFX_GLOBAL_DATA::GetITaskbarList
+5480 CWinApp::GetITaskbarList
+5481 AFX_GLOBAL_DATA::GetITaskbarList3
+5482 CWinApp::GetITaskbarList3
+5483 CComboBoxEx::GetItem
+5484 CMFCDropDownListBox::GetItem
+5485 CMFCRibbonComboBox::GetItem
+5486 CMFCToolBarComboBoxButton::GetItem
+5487 CMFCToolBarComboBoxButton::GetItemAll
+5488 COleServerDoc::GetItemClipRect
+5489 CShellManager::GetItemCount
+5490 CListCtrl::GetItemData
+5491 CMFCRibbonComboBox::GetItemData
+5492 CMFCToolBarComboBoxButton::GetItemData
+5493 CTreeCtrl::GetItemData
+5494 CVSListBox::GetItemData
+5495 CMFCToolBarComboBoxButton::GetItemDataAll
+5496 CMFCToolBarComboBoxButton::GetItemDataPtrAll
+5497 CMFCStatusBar::GetItemID
+5498 CMFCToolBar::GetItemID
+5499 CStatusBar::GetItemID
+5500 CToolBar::GetItemID
+5501 CMFCRibbonBar::GetItemIDsList
+5502 CMFCRibbonBaseElement::GetItemIDsList
+5503 CMFCRibbonButtonsGroup::GetItemIDsList
+5504 CMFCRibbonCategory::GetItemIDsList
+5505 CMFCRibbonPanel::GetItemIDsList
+5506 CTreeCtrl::GetItemImage
+5507 COleClientItem::GetItemName
+5508 COleClientItem::GetItemName
+5509 CMFCShellListCtrl::GetItemPath
+5510 CMFCShellTreeCtrl::GetItemPath
+5511 COleServerDoc::GetItemPosition
+5512 CListCtrl::GetItemRect
+5513 CMFCStatusBar::GetItemRect
+5514 CMFCToolBar::GetItemRect
+5515 CStatusBar::GetItemRect
+5516 CToolBar::GetItemRect
+5517 CTreeCtrl::GetItemRect
+5518 CShellManager::GetItemSize
+5519 CTabCtrl::GetItemState
+5520 CTreeCtrl::GetItemState
+5521 COleClientItem::GetItemStorage
+5522 COleClientItem::GetItemStorageCompound
+5523 COleClientItem::GetItemStorageFlat
+5524 CListCtrl::GetItemText
+5525 CListCtrl::GetItemText
+5526 CTreeCtrl::GetItemText
+5527 CVSListBox::GetItemText
+5528 CMFCRibbonGallery::GetItemToolTip
+5529 CWinAppEx::GetKeyboardManager
+5530 CAnimationController::GetKeyframeStoryboardStart
+5531 CHotKeyCtrl::GetKeyName
+5532 CMFCRibbonButton::GetKeyTipRect
+5533 CMFCRibbonGallery::GetKeyTipRect
+5534 CMFCRibbonLaunchButton::GetKeyTipRect
+5535 CMFCRibbonTab::GetKeyTipRect
+5536 CMFCRibbonBaseElement::GetKeyTipSize
+5537 CFileFind::GetLastAccessTime
+5538 CFileFind::GetLastAccessTime
+5539 CGopherFileFind::GetCreationTime
+5540 CGopherFileFind::GetCreationTime
+5541 CMFCRibbonGallery::GetLastSelectedItem
+5542 CMFCRibbonButtonsGroup::GetLastTabStop
+5543 CMFCRibbonPanel::GetLastTabStop
+5544 COleUILinkInfo::GetLastUpdate
+5545 CMFCRibbonCategory::GetLastVisibleElement
+5546 CMFCBaseTabCtrl::GetLastVisibleTab
+5547 CFileFind::GetLastWriteTime
+5548 CFileFind::GetLastWriteTime
+5549 CGopherFileFind::GetLastWriteTime
+5550 CGopherFileFind::GetLastWriteTime
+5551 CDC::GetLayout
+5552 CRecordset::GetLBFetchSize
+5553 COleSafeArray::GetLBound
+5554 CRecordset::GetLBFetchSize
+5555 CComboBox::GetLBText
+5556 CHtmlView::GetLeft
+5559 CFile::GetLength
+5560 CFileFind::GetLength
+5561 CGopherFileFind::GetLength
+5562 CInternetFile::GetLength
+5563 CMemFile::GetLength
+5564 COleStreamFile::GetLength
+5565 CSocketFile::Abort
+5566 CStdioFile::GetLength
+5567 COleUILinkInfo::AddRef
+5568 COleObjectFactory::XClassFactory::GetLicInfo
+5569 CRichEditCtrl::GetLine
+5570 CRichEditCtrl::GetLine
+5571 COleUILinkInfo::GetLinkItem
+5572 COleUILinkInfo::GetLinkSource
+5573 COleClientItem::GetLinkSourceData
+5574 COleServerItem::GetLinkSourceData
+5575 COleClientItem::GetLinkUpdateOptions
+5576 COleUILinkInfo::GetLinkUpdateOptions
+5577 _AfxBindStatusCallback::GetInnerUnknown
+5578 CMFCFilterChunkValueImpl::GetChunkGUID
+5579 CD2DTextFormat::GetLocaleName
+5580 CD2DTextLayout::GetLocaleName
+5581 CHtmlView::GetLocationName
+5582 CHtmlView::GetLocationURL
+5583 CGopherFileFind::GetLocator
+5584 CFieldExchange::GetLongBinaryData
+5585 CRecordset::GetLongBinaryDataAndCleanup
+5586 CFieldExchange::GetLongBinarySize
+5587 CRecordset::GetLongCharDataAndCleanup
+5588 CRecordset::GetLongCharDataAndCleanup
+5589 CWinThread::GetMainWnd
+5594 CPageSetupDialog::GetMargins
+5595 CMFCToolBarImages::GetMask
+5596 CMFCMaskedEdit::GetMaskedValue
+5597 CMFCRibbonApplicationButton::AddToListBox
+5598 CMFCRibbonCategory::GetMaxHeight
+5599 CRenderTarget::GetMaximumBitmapSize
+5600 CDockingPanesRow::GetMaxPaneSize
+5601 CJumpList::GetMaxSlots
+5602 CMFCBaseTabCtrl::GetMaxWindowSize
+5603 CMDIChildWnd::GetMDIFrame
+5604 CMDIClientAreaWnd::GetMDITabsContextMenuAllowedItems
+5605 CFrameWnd::GetMenu
+5606 CWnd::GetMenu
+5607 CHtmlView::GetMenuBar
+5608 CFrameWnd::GetMenuBarInfo
+5609 CFrameWnd::GetMenuBarState
+5610 CFrameWnd::GetMenuBarVisibility
+5611 CMFCToolBar::GetMenuButtonSize
+5612 CContextMenuManager::GetMenuById
+5613 CContextMenuManager::GetMenuByName
+5614 CMFCRibbonMainPanel::GetMenuElements
+5615 CMFCMenuBar::GetMenuFont
+5616 CMFCToolBar::GetMenuImageSize
+5617 CMFCMenuBar::GetMenuItem
+5618 CMFCPopupMenu::GetMenuItem
+5619 CMFCPopupMenu::GetMenuItemCount
+5620 CMFCRibbonGallery::GetMenuItems
+5621 CMFCVisualManager::GetMenuItemTextColor
+5622 CMFCVisualManagerOffice2007::GetMenuItemTextColor
+5623 CContextMenuManager::GetMenuNames
+5624 CMFCRibbonGallery::GetMenuRowHeight
+5625 CMenu::GetMenuStringA
+5626 CFrameWnd::GetMessageBar
+5627 CMDIChildWnd::GetMessageBar
+5628 CAutoHideDockSite::GetMessageMap
+5629 CBasePane::GetMessageMap
+5630 CBaseTabbedPane::GetMessageMap
+5631 CCheckListBox::GetMessageMap
+5632 CCmdTarget::GetMessageMap
+5633 CCommonDialog::GetMessageMap
+5634 CControlBar::GetMessageMap
+5635 CControlFrameWnd::GetMessageMap
+5636 CCtrlView::GetMessageMap
+5637 CDHtmlDialog::GetMessageMap
+5638 CDialog::GetMessageMap
+5639 CDialogBar::GetMessageMap
+5640 CDialogEx::GetMessageMap
+5641 CDockablePane::GetMessageMap
+5642 CDockablePaneAdapter::GetMessageMap
+5643 CDockBar::GetMessageMap
+5644 CDockSite::GetMessageMap
+5645 CDocObjectServer::GetMessageMap
+5646 CDocument::GetMessageMap
+5647 CDummyDockablePane::GetMessageMap
+5648 CEditView::GetMessageMap
+5649 CFormView::GetMessageMap
+5650 CFrameWnd::GetMessageMap
+5651 CFrameWndEx::GetMessageMap
+5652 CHtmlEditView::GetMessageMap
+5653 CHtmlView::GetMessageMap
+5654 CListCtrl::GetMessageMap
+5655 CListView::GetMessageMap
+5656 CMDIChildWnd::GetMessageMap
+5657 CMDIChildWndEx::GetMessageMap
+5658 CMDIClientAreaWnd::GetMessageMap
+5659 CMDIFrameWnd::GetMessageMap
+5660 CMDIFrameWndEx::GetMessageMap
+5661 CMDITabProxyWnd::GetMessageMap
+5662 CMFCAcceleratorKeyAssignCtrl::GetMessageMap
+5663 CMFCAutoHideBar::GetMessageMap
+5664 CMFCBaseTabCtrl::GetMessageMap
+5665 CMFCBaseToolBar::GetMessageMap
+5666 CMFCButton::GetMessageMap
+5667 CMFCCaptionBar::GetMessageMap
+5668 CMFCColorBar::GetMessageMap
+5669 CMFCColorButton::GetMessageMap
+5670 CMFCColorDialog::GetMessageMap
+5671 CMFCColorPickerCtrl::GetMessageMap
+5672 CMFCColorPopupMenu::GetMessageMap
+5673 CMFCColorPropertySheet::GetMessageMap
+5674 CMFCCustomColorsPropertyPage::GetMessageMap
+5675 CMFCDesktopAlertDialog::GetMessageMap
+5676 CMFCDesktopAlertWnd::GetMessageMap
+5677 CMFCDropDownFrame::GetMessageMap
+5678 CMFCDropDownListBox::GetMessageMap
+5679 CMFCDropDownToolBar::GetMessageMap
+5680 CMFCEditBrowseCtrl::GetMessageMap
+5681 CMFCFontComboBox::GetMessageMap
+5682 CMFCHeaderCtrl::GetMessageMap
+5683 CMFCImageEditorDialog::GetMessageMap
+5684 CMFCImagePaintArea::GetMessageMap
+5685 CMFCKeyMapDialog::GetMessageMap
+5686 CMFCLinkCtrl::GetMessageMap
+5687 CMFCListCtrl::GetMessageMap
+5688 CMFCMaskedEdit::GetMessageMap
+5689 CMFCMenuBar::GetMessageMap
+5690 CMFCMenuButton::GetMessageMap
+5691 CMFCMousePropertyPage::GetMessageMap
+5692 CMFCOutlookBar::GetMessageMap
+5693 CMFCOutlookBarPane::GetMessageMap
+5694 CMFCOutlookBarPaneAdapter::GetMessageMap
+5695 CMFCOutlookBarTabCtrl::GetMessageMap
+5696 CMFCOutlookBarToolBar::GetMessageMap
+5697 CMFCPopupMenu::GetMessageMap
+5698 CMFCPopupMenuBar::GetMessageMap
+5699 CMFCPreviewCtrlImpl::GetMessageMap
+5700 CMFCPrintPreviewToolBar::GetMessageMap
+5701 CMFCPropertyGridCtrl::GetMessageMap
+5702 CMFCPropertyGridToolTipCtrl::GetMessageMap
+5703 CMFCPropertyPage::GetMessageMap
+5704 CMFCPropertySheet::GetMessageMap
+5706 CMFCReBar::GetMessageMap
+5707 CMFCRibbonBar::GetMessageMap
+5708 CMFCRibbonCommandsListBox::GetMessageMap
+5709 CMFCRibbonCustomizePropertyPage::GetMessageMap
+5710 CMFCRibbonKeyboardCustomizeDialog::GetMessageMap
+5711 CMFCRibbonKeyTip::GetMessageMap
+5712 CMFCRibbonMiniToolBar::GetMessageMap
+5713 CMFCRibbonPanelMenu::GetMessageMap
+5714 CMFCRibbonPanelMenuBar::GetMessageMap
+5715 CMFCRibbonRichEditCtrl::GetMessageMap
+5716 CMFCRibbonSpinButtonCtrl::GetMessageMap
+5717 CMFCRibbonStatusBar::GetMessageMap
+5718 CMFCShadowWnd::GetMessageMap
+5719 CMFCShellListCtrl::GetMessageMap
+5720 CMFCShellTreeCtrl::GetMessageMap
+5721 CMFCSpinButtonCtrl::GetMessageMap
+5722 CMFCStandardColorsPropertyPage::GetMessageMap
+5723 CMFCStatusBar::GetMessageMap
+5724 CMFCTabCtrl::GetMessageMap
+5725 CMFCTasksPane::GetMessageMap
+5726 CMFCTasksPaneFrameWnd::GetMessageMap
+5727 CMFCTasksPaneToolBar::GetMessageMap
+5728 CMFCToolBar::GetMessageMap
+5729 CMFCToolBarButtonCustomizeDialog::GetMessageMap
+5730 CMFCToolBarButtonsListButton::GetMessageMap
+5731 CMFCToolBarComboBoxEdit::GetMessageMap
+5732 CMFCToolBarDateTimeCtrlImpl::GetMessageMap
+5733 CMFCToolBarDropSource::GetMessageMap
+5734 CMFCToolBarDropTarget::GetMessageMap
+5735 CMFCToolBarEditCtrl::GetMessageMap
+5736 CMFCToolBarNameDialog::GetMessageMap
+5737 CMFCToolBarsCommandsListBox::GetMessageMap
+5738 CMFCToolBarsCommandsPropertyPage::GetMessageMap
+5739 CMFCToolBarsCustomizeDialog::GetMessageMap
+5740 CMFCToolBarsKeyboardPropertyPage::GetMessageMap
+5741 CMFCToolBarsListCheckBox::GetMessageMap
+5742 CMFCToolBarsListPropertyPage::GetMessageMap
+5743 CMFCToolBarsMenuPropertyPage::GetMessageMap
+5744 CMFCToolBarsOptionsPropertyPage::GetMessageMap
+5745 CMFCToolBarsToolsPropertyPage::GetMessageMap
+5746 CMFCToolTipCtrl::GetMessageMap
+5747 CMFCWindowsManagerDialog::GetMessageMap
+5748 CMiniDockFrameWnd::GetMessageMap
+5749 CMiniFrameWnd::GetMessageMap
+5750 CMultiPaneFrameWnd::GetMessageMap
+5751 COleCntrFrameWndEx::GetMessageMap
+5752 COleControl::GetMessageMap
+5753 COleDBRecordView::GetMessageMap
+5754 COleDocIPFrameWnd::GetMessageMap
+5755 COleDocIPFrameWndEx::GetMessageMap
+5756 COleIPFrameWnd::GetMessageMap
+5757 COleIPFrameWndEx::GetMessageMap
+5758 COlePropertyPage::GetMessageMap
+5759 COleResizeBar::GetMessageMap
+5760 COleServerDoc::GetMessageMap
+5761 COleServerDocEx::GetMessageMap
+5762 COutlookOptionsDlg::GetMessageMap
+5763 CPane::GetMessageMap
+5764 CPaneDialog::GetMessageMap
+5765 CPaneDivider::GetMessageMap
+5766 CPaneFrameWnd::GetMessageMap
+5767 CPreviewView::GetMessageMap
+5768 CPreviewViewEx::GetMessageMap
+5769 CPrintDialog::GetMessageMap
+5770 CPrintDialogEx::GetMessageMap
+5771 CPropertyPage::GetMessageMap
+5772 CPropertySheet::GetMessageMap
+5773 CReBar::GetMessageMap
+5774 CRecordView::GetMessageMap
+5775 CRichEditView::GetMessageMap
+5776 CScreenWnd::GetMessageMap
+5777 CScrollView::GetMessageMap
+5778 CSmartDockingGroupGuidesWnd::GetMessageMap
+5779 CSmartDockingHighlighterWnd::GetMessageMap
+5780 CSmartDockingStandaloneGuideWnd::GetMessageMap
+5781 CSocketWnd::GetMessageMap
+5782 CSplitterWnd::GetMessageMap
+5783 CSplitterWndEx::GetMessageMap
+5784 CStatusBar::GetMessageMap
+5785 CTabbedPane::GetMessageMap
+5786 CTabCtrl::GetMessageMap
+5787 CTabView::GetMessageMap
+5788 CToolBar::GetMessageMap
+5789 CToolBarCtrl::GetMessageMap
+5790 CToolTipCtrl::GetMessageMap
+5791 CTreeCtrl::GetMessageMap
+5792 CTreeView::GetMessageMap
+5793 CView::GetMessageMap
+5794 CVSListBox::GetMessageMap
+5795 CVSListBoxBase::GetMessageMap
+5796 CVSListBoxEditCtrl::GetMessageMap
+5797 CWinApp::GetMessageMap
+5798 CWnd::GetMessageMap
+5799 CFrameWnd::GetMessageString
+5800 CFrameWnd::GetMessageString
+5801 CDataSourceControl::GetMetaData
+5802 COleControl::GetMetafileData
+5803 COleServerItem::GetMetafileData
+5804 CPaneContainerManager::GetMinMaxOffset
+5805 CBaseTabbedPane::GetMinSize
+5806 CPaneContainer::GetMinSize
+5807 CPaneContainerManager::GetMinSize
+5808 CPaneContainer::GetMinSizeLeft
+5809 CPaneContainer::GetMinSizeRight
+5810 CMFCRibbonCategory::GetMinWidth
+5811 CMFCRibbonPanel::GetMinWidth
+5812 CDocObjectServer::XOleObject::GetMiscStatus
+5813 COleControl::XOleObject::GetMiscStatus
+5814 COleServerDoc::XOleObject::GetMiscStatus
+5815 COleServerItem::XOleObject::GetMiscStatus
+5816 CRectTracker::GetModifyPointers
+5817 COleDocument::GetMoniker
+5818 COleLinkingDoc::GetMoniker
+5819 COleServerDoc::GetMoniker
+5820 COleServerItem::GetMoniker
+5821 COleClientItem::XOleClientSite::GetMoniker
+5822 CArchiveStream::Clone
+5823 CDocObjectServer::XOleObject::GetMoniker
+5824 CArchiveStream::Clone
+5825 COleServerDoc::XOleObject::GetMoniker
+5826 COleServerItem::XOleObject::GetMoniker
+5827 CMonthCalCtrl::GetMonthRange
+5828 CMonthCalCtrl::GetMonthRange
+5829 CMonthCalCtrl::GetMonthRange
+5830 CWinAppEx::GetMouseManager
+5831 CMFCTasksPane::GetMRUFileName
+5832 CRecordset::GetDefaultSQL
+5833 COleControl::XViewObject::GetNaturalExtent
+5834 CPane::CalcSize
+5835 CMFCVisualManagerOffice2007::GetNcBtnSize
+5836 COleClientItem::GetNewItemNumber
+5837 CRichEditView::XRichEditOleCallback::GetNewStorage
+5838 CDataBoundProperty::GetNext
+5839 CMapPtrToPtr::GetNextAssoc
+5840 CMapPtrToWord::GetNextAssoc
+5841 CMapStringToOb::GetNextAssoc
+5842 CMapStringToOb::GetNextAssoc
+5843 CMapStringToString::GetNextAssoc
+5844 CMapWordToOb::GetNextAssoc
+5845 CMapWordToOb::GetNextAssoc
+5846 COleDocument::GetNextClientItem
+5847 CConnectionPoint::GetNextConnection
+5848 CWnd::GetNextDlgGroupItem
+5849 CWnd::GetNextDlgTabItem
+5850 CMultiDocTemplate::GetNextDoc
+5851 CSingleDocTemplate::GetNextDoc
+5852 CMultiDocTemplate::GetNextDoc
+5853 CWinApp::GetNextDocTemplate
+5854 COleDataObject::GetNextFormat
+5855 COleDocument::GetNextItem
+5856 CShellManager::GetNextItem
+5857 COleDocument::GetNextItemOfKind
+5858 COleUILinkInfo::GetNextLink
+5859 CMFCTasksPane::GetNextPages
+5860 CFileDialog::GetNextPathName
+5861 COleDocument::GetNextServerItem
+5862 CMDIClientAreaWnd::GetNextTabWnd
+5863 COleDocument::GetNextItem
+5864 CAfxStringMgr::GetNilString
+5865 CPaneContainer::GetNodeCount
+5866 CPaneContainerManager::GetNodeCount
+5867 AFX_GLOBAL_DATA::GetNonClientMetrics
+5868 CDataRecoveryHandler::GetNormalDocumentTitle
+5869 CFindReplaceDialog::GetNotifier
+5870 CCmdTarget::GetNotSupported
+5871 COleControl::GetNotSupported
+5872 CHttpFile::GetObjectA
+5873 CWinAppEx::GetObjectA
+5874 COleLinkingDoc::XOleItemContainer::GetObjectA
+5875 COlePropertyPage::GetObjectArray
+5876 CJumpList::GetObjectCollection
+5877 COleClientItem::GetObjectDescriptorData
+5878 COleServerItem::GetObjectDescriptorData
+5879 COlePropertiesDialog::XOleUIObjInfo::GetObjectInfo
+5880 CArchive::GetObjectSchema
+5881 COleLinkingDoc::XOleItemContainer::GetObjectStorage
+5882 CDialog::GetOccDialogInfo
+5883 CFormView::GetOccDialogInfo
+5884 COleUILinkInfo::AddRef
+5885 CRecordset::GetODBCFieldInfo
+5886 CRecordset::GetODBCFieldInfo
+5887 CHtmlView::GetOffline
+5888 CFileDialog::GetOFN
+5889 CFileDialog::GetOFN
+5890 CWnd::GetOleControlSite
+5891 COleServerItem::GetOleObject
+5892 COleSafeArray::GetOneDimSize
+5893 CD2DBrush::GetOpacity
+5894 CDocManager::GetOpenDocumentCount
+5895 CWinApp::GetOpenDocumentCount
+5896 CGlobalUtils::GetOppositeAlignment
+5897 CMFCDesktopAlertDialog::GetOptimalTextSize
+5898 CMFCPropertyGridProperty::GetOption
+5899 CMFCPropertyGridProperty::GetOptionCount
+5900 CBrowserControlSite::GetOptionKeyPath
+5901 CArchiveStream::Clone
+5902 CHtmlControlSite::XDocHostUIHandler::GetOptionKeyPath
+5903 CHeaderCtrl::GetOrderArray
+5904 CPropertySet::GetOSVersion
+5905 COleControl::GetOuterWindow
+5906 CDockingPanesRow::GetOutOfBoundsOffset
+5907 CDockingPanesRow::GetOutOfBoundsOffsetRect
+5908 CMFCTasksPane::GetPageByGroup
+5909 COleDocObjectItem::GetPageCount
+5910 CPropertySheet::GetPageCount
+5911 CPropertySheet::GetPageIndex
+5912 CDocObjectServer::XPrint::GetPageInfo
+5913 COlePropertyPage::XPropertyPage::GetPageInfo
+5914 COleControl::XSpecifyPropertyPages::GetPages
+5915 COlePropertyPage::GetPageSite
+5916 CMFCRibbonPanel::GetPaltteMinSize
+5917 CFrameWndEx::GetPane
+5918 CMDIChildWndEx::GetPane
+5919 CMDIFrameWndEx::GetPane
+5920 CMultiPaneFrameWnd::GetPane
+5921 COleCntrFrameWndEx::GetPane
+5922 COleDocIPFrameWndEx::GetPane
+5923 COleDocIPFrameWndEx::GetPane
+5924 CPaneFrameWnd::GetPane
+5925 CSplitterWnd::GetPane
+5926 CGlobalUtils::GetPaneAndAlignFromPoint
+5927 CPaneDivider::GetPaneDividers
+5928 CBaseTabbedPane::GetPaneIcon
+5929 CMFCStatusBar::GetPaneInfo
+5930 CStatusBar::GetPaneInfo
+5931 CMFCRibbonCategory::GetPanel
+5932 CMFCRibbonCategory::GetPanelCount
+5933 CMFCRibbonCategory::GetPanelFromPoint
+5934 CMFCRibbonCategory::GetPanelIndex
+5935 CBaseTabbedPane::GetPaneList
+5936 CDockingManager::GetPaneList
+5937 CPaneFrameWnd::GetPaneList
+5938 CPane::GetPaneName
+5939 CMFCStatusBar::GetPaneProgress
+5940 CPaneDivider::GetPanes
+5941 CMFCStatusBar::GetPaneStyle
+5942 CStatusBar::GetPaneStyle
+5943 CMFCStatusBar::GetPaneText
+5944 CMFCStatusBar::GetPaneText
+5945 CStatusBar::GetPaneText
+5946 CStatusBar::GetPaneText
+5947 CMFCStatusBar::GetPaneWidth
+5948 CRichEditCtrl::GetParaFormat
+5949 CRichEditCtrl::GetParaFormat
+5950 CRichEditView::GetParaFormatSelection
+5951 CMFCPopupMenu::GetParentArea
+5952 CHtmlView::GetParentBrowser
+5953 CMFCRibbonCategory::GetParentButton
+5954 CMFCRibbonPanel::GetParentButton
+5955 CWnd::GetParentFrame
+5956 CShellManager::GetParentItem
+5957 CMFCDropDownFrame::GetParentMenuBar
+5958 CBasePane::GetParentMiniFrame
+5959 CWnd::GetParentOwner
+5960 CMFCRibbonBaseElement::GetParentPanel
+5961 CMFCDropDownFrame::GetParentPopupMenu
+5962 CMFCPopupMenu::GetParentPopupMenu
+5963 CMFCRibbonPanelMenu::GetParentRibbonMenuBar
+5964 CPropertyPage::GetParentSheet
+5965 CView::GetParentSplitter
+5966 CBasePane::GetParentTabbedPane
+5967 CBasePane::GetParentTabWnd
+5968 CMFCPopupMenu::GetParentToolBar
+5969 CMFCRibbonBaseElement::GetParentWnd
+5971 CFileDialog::GetPathName
+5972 CAsyncSocket::GetPeerName
+5973 CPictureHolder::GetPictureDispatch
+5974 CD2DBitmap::GetPixelFormat
+5975 CRenderTarget::GetPixelFormat
+5976 CD2DBitmap::GetPixelSize
+5977 CRenderTarget::GetPixelSize
+5978 CPageSetupDialog::GetPortName
+5979 CPrintDialog::GetPortName
+5980 CPrintDialogEx::GetPortName
+5981 CMFCRibbonSlider::GetPosFromPoint
+5982 CFile::GetPosition
+5983 CMemFile::GetPosition
+5984 COleStreamFile::GetPosition
+5985 CSocketFile::Abort
+5986 CStdioFile::GetPosition
+5987 COleControl::XPerPropertyBrowsing::GetPredefinedStrings
+5988 COleControl::XPerPropertyBrowsing::GetPredefinedValue
+5989 CMFCRibbonMainPanel::GetPreferedMenuLocation
+5990 CMFCRibbonBaseElement::GetPressed
+5991 CMFCRibbonButtonsGroup::GetPressed
+5992 CMFCRibbonGallery::GetPressed
+5993 CMFCRibbonPanel::GetPressed
+5994 CWnd::GetPrevDlgGroupItem
+5995 CMFCTasksPane::GetPreviousPages
+5996 COleDocument::GetPrimarySelectedItem
+5997 CRichEditDoc::GetPrimarySelectedItem
+5998 COleClientItem::GetPrintDeviceInfo
+5999 CWinApp::GetPrinterDeviceDefaults
+6000 CEditView::GetPrinterFont
+6001 COleUILinkInfo::AddRef
+6002 CWinApp::GetProfileBinary
+6003 CWinApp::GetProfileIntA
+6004 CWinApp::GetProfileStringA
+6005 COlePropertyPage::GetPropCheck
+6006 CHtmlView::GetProperty
+6007 CHtmlView::GetProperty
+6008 CMFCPropertyGridCtrl::GetProperty
+6009 COleControlSite::GetProperty
+6010 COleDispatchDriver::GetProperty
+6011 CPropertySection::GetProperty
+6012 CPropertySet::GetProperty
+6013 CWnd::GetProperty
+6014 CMFCVisualManager::GetPropertyGridGroupColor
+6015 CMFCVisualManagerOffice2003::GetPropertyGridGroupColor
+6016 CMFCVisualManagerOfficeXP::GetPropertyGridGroupColor
+6017 CMFCVisualManagerVS2005::GetPropertyGridGroupColor
+6018 CMFCVisualManager::GetPropertyGridGroupTextColor
+6019 CMFCVisualManagerOffice2003::GetPropertyGridGroupTextColor
+6020 CMFCVisualManagerOfficeXP::GetPropertyGridGroupTextColor
+6021 COlePropertyPage::GetPropIndex
+6022 COleControl::GetPropPageIDs
+6023 COlePropertyPage::GetPropRadio
+6024 COleControl::GetPropsetData
+6025 COlePropertyPage::GetPropText
+6026 COlePropertyPage::GetPropText
+6027 COlePropertyPage::GetPropText
+6028 COlePropertyPage::GetPropText
+6029 COlePropertyPage::GetPropText
+6030 COlePropertyPage::GetPropText
+6031 COlePropertyPage::GetPropText
+6032 COlePropertyPage::GetPropText
+6033 COlePropertyPage::GetPropText
+6034 CFileDialog::GetOFN
+6035 CFileDialog::GetOFN
+6036 CMFCRibbonBar::GetQuickAccessCommands
+6037 CD2DRadialGradientBrush::GetRadiusX
+6038 CD2DRadialGradientBrush::GetRadiusY
+6039 CDateTimeCtrl::GetRange
+6040 CDateTimeCtrl::GetRange
+6041 CMFCToolBarSpinEditBoxButton::GetRange
+6042 CMonthCalCtrl::GetRange
+6043 CMonthCalCtrl::GetRange
+6044 CMonthCalCtrl::GetRange
+6045 CProgressCtrl::GetRange
+6046 CSliderCtrl::GetRange
+6047 CSpinButtonCtrl::GetRange
+6048 ATL::CFixedStringMgr::Clone
+6049 CHtmlView::GetReadyState
+6050 COleControl::GetReadyState
+6052 CRecentDockSiteInfo::GetRecentDefaultPaneDivider
+6053 CRecentDockSiteInfo::GetRecentDockedPercent
+6054 CRecentDockSiteInfo::GetRecentDockedRect
+6055 CRecentDockSiteInfo::GetRecentListOfPanes
+6056 CRecentDockSiteInfo::GetRecentPaneContainer
+6057 CRecentDockSiteInfo::GetRecentTabContainer
+6058 CDataRecoveryHandler::GetRecoveredDocumentTitle
+6059 CDocObjectServer::XOleDocumentView::GetRect
+6060 COleControl::XViewObject::GetRect
+6061 COleControl::GetRectInContainer
+6062 CHtmlView::GetRegisterAsBrowser
+6063 CHtmlView::GetRegisterAsDropTarget
+6064 CMDIFrameWndEx::GetRegisteredWithTaskBarMDIChildCount
+6065 CWinAppEx::GetRegSectionPath
+6066 CMFCRibbonButton::GetRegularSize
+6067 CMFCRibbonButtonsGroup::GetRegularSize
+6068 CMFCRibbonCaptionButton::GetRegularSize
+6069 CMFCRibbonGallery::GetRegularSize
+6070 CMFCRibbonGalleryIcon::GetRegularSize
+6071 CMFCRibbonLaunchButton::GetRegularSize
+6072 CMFCRibbonLinkCtrl::GetRegularSize
+6073 CMFCRibbonProgressBar::GetRegularSize
+6074 CMFCRibbonQuickAccessToolBar::GetRegularSize
+6075 CMFCRibbonRecentFilesList::GetRegularSize
+6076 CMFCRibbonSeparator::GetRegularSize
+6077 CMFCRibbonSlider::GetRegularSize
+6078 CPane::CalcSize
+6079 CMFCShellTreeCtrl::GetRelatedList
+6080 CMFCShellListCtrl::GetRelatedTree
+6081 CWnd::GetRenderTarget
+6082 CPaneContainer::GetResizeStep
+6083 CMFCControlRendererInfo::GetResourceID
+6084 CFileDialog::GetResult
+6085 CFileDialog::GetResults
+6086 CMFCVisualManagerOffice2007::GetRibbonBar
+6087 CMFCVisualManagerOffice2007::GetRibbonBar
+6088 CMFCRibbonCollector::GetRibbonBarImages
+6089 CMFCVisualManager::GetRibbonEditBackgroundColor
+6090 CMFCVisualManagerOffice2007::GetRibbonEditBackgroundColor
+6091 CMFCVisualManagerWindows7::GetRibbonEditBackgroundColor
+6092 CMFCVisualManager::GetRibbonHyperlinkTextColor
+6093 CMFCVisualManagerOffice2007::GetRibbonHyperlinkTextColor
+6094 CMFCVisualManagerOffice2007::GetRibbonPopupBorderSize
+6095 CMFCVisualManagerWindows7::GetRibbonPopupBorderSize
+6096 CMFCVisualManagerOffice2007::GetRibbonQuickAccessToolBarRightMargin
+6097 CMFCVisualManager::GetRibbonSliderColors
+6098 CMFCVisualManagerOfficeXP::GetRibbonSliderColors
+6099 CMFCVisualManager::GetAutoHideButtonTextColor
+6100 CMFCVisualManagerOffice2007::GetRibbonStatusBarTextColor
+6101 CFileFind::GetRoot
+6102 CSocketFile::Abort
+6103 CPaneDivider::GetRootContainerRect
+6104 CMFCShellTreeCtrl::GetRootItems
+6105 CCmdTarget::GetRoutingFrame
+6106 CCmdTarget::GetRoutingFrame
+6107 CCmdTarget::GetRoutingView
+6108 CCmdTarget::GetRoutingView
+6109 CMFCMenuBar::GetRowHeight
+6110 CMFCToolBar::GetRowHeight
+6111 CSplitterWnd::GetRowInfo
+6112 CAnimateCtrl::GetRuntimeClass
+6113 CAnimationBaseObject::GetRuntimeClass
+6114 CAnimationColor::GetRuntimeClass
+6115 CAnimationController::GetRuntimeClass
+6116 CAnimationPoint::GetRuntimeClass
+6117 CAnimationRect::GetRuntimeClass
+6118 CAnimationSize::GetRuntimeClass
+6119 CAnimationValue::GetRuntimeClass
+6120 CArchiveException::GetRuntimeClass
+6121 CAsyncMonikerFile::GetRuntimeClass
+6122 CAsyncSocket::GetRuntimeClass
+6123 CAutoHideDockSite::GetRuntimeClass
+6124 CBaseKeyFrame::GetRuntimeClass
+6125 CBasePane::GetRuntimeClass
+6126 CBaseTabbedPane::GetRuntimeClass
+6127 CBaseTransition::GetRuntimeClass
+6128 CBitmap::GetRuntimeClass
+6129 CBitmapButton::GetRuntimeClass
+6130 CBitmapRenderTarget::GetRuntimeClass
+6131 CBrush::GetRuntimeClass
+6132 CButton::GetRuntimeClass
+6133 CByteArray::GetRuntimeClass
+6134 CCachedDataPathProperty::GetRuntimeClass
+6135 CCheckListBox::GetRuntimeClass
+6136 CClientDC::GetRuntimeClass
+6137 CCmdTarget::GetRuntimeClass
+6138 CColorDialog::GetRuntimeClass
+6139 CComboBox::GetRuntimeClass
+6140 CComboBoxEx::GetRuntimeClass
+6141 CCommonDialog::GetRuntimeClass
+6142 CControlBar::GetRuntimeClass
+6143 CCriticalSection::GetRuntimeClass
+6144 CCtrlView::GetRuntimeClass
+6145 CD2DBitmap::GetRuntimeClass
+6146 CD2DBitmapBrush::GetRuntimeClass
+6147 CD2DBrush::GetRuntimeClass
+6148 CD2DGeometry::GetRuntimeClass
+6149 CD2DGradientBrush::GetRuntimeClass
+6150 CD2DLayer::GetRuntimeClass
+6151 CD2DLinearGradientBrush::GetRuntimeClass
+6152 CD2DMesh::GetRuntimeClass
+6153 CD2DPathGeometry::GetRuntimeClass
+6154 CD2DRadialGradientBrush::GetRuntimeClass
+6155 CD2DResource::GetRuntimeClass
+6156 CD2DSolidColorBrush::GetRuntimeClass
+6157 CD2DTextFormat::GetRuntimeClass
+6158 CD2DTextLayout::GetRuntimeClass
+6159 CDatabase::GetRuntimeClass
+6160 CDataPathProperty::GetRuntimeClass
+6161 CDateTimeCtrl::GetRuntimeClass
+6162 CDBException::GetRuntimeClass
+6163 CDC::GetRuntimeClass
+6164 CDCRenderTarget::GetRuntimeClass
+6165 CDHtmlDialog::GetRuntimeClass
+6166 CDialog::GetRuntimeClass
+6167 CDialogBar::GetRuntimeClass
+6168 CDialogEx::GetRuntimeClass
+6169 CDocItem::GetRuntimeClass
+6170 CDockablePane::GetRuntimeClass
+6171 CDockablePaneAdapter::GetRuntimeClass
+6172 CDockBar::GetRuntimeClass
+6173 CDockingPanesRow::GetRuntimeClass
+6174 CDockSite::GetRuntimeClass
+6175 CDockState::GetRuntimeClass
+6176 CDocManager::GetRuntimeClass
+6177 CDocObjectServer::GetRuntimeClass
+6178 CDocObjectServerItem::GetRuntimeClass
+6179 CDocTemplate::GetRuntimeClass
+6180 CDocument::GetRuntimeClass
+6181 CDragListBox::GetRuntimeClass
+6182 CDWordArray::GetRuntimeClass
+6183 CDynLinkLibrary::GetRuntimeClass
+6184 CEdit::GetRuntimeClass
+6185 CEditView::GetRuntimeClass
+6186 CEvent::GetRuntimeClass
+6187 CException::GetRuntimeClass
+6188 CFile::GetRuntimeClass
+6189 CFileDialog::GetRuntimeClass
+6190 CFileException::GetRuntimeClass
+6191 CFileFind::GetRuntimeClass
+6192 CFindReplaceDialog::GetRuntimeClass
+6193 CFolderPickerDialog::GetRuntimeClass
+6194 CFont::GetRuntimeClass
+6195 CFontDialog::GetRuntimeClass
+6196 CFormView::GetRuntimeClass
+6197 CFrameWnd::GetRuntimeClass
+6198 CFrameWndEx::GetRuntimeClass
+6199 CFtpConnection::GetRuntimeClass
+6200 CFtpFileFind::GetRuntimeClass
+6201 CGdiObject::GetRuntimeClass
+6202 CGopherConnection::GetRuntimeClass
+6203 CGopherFile::GetRuntimeClass
+6204 CGopherFileFind::GetRuntimeClass
+6205 CHeaderCtrl::GetRuntimeClass
+6206 CHelpComboBoxButton::GetRuntimeClass
+6207 CHotKeyCtrl::GetRuntimeClass
+6208 CHtmlEditDoc::GetRuntimeClass
+6209 CHtmlEditView::GetRuntimeClass
+6210 CHtmlView::GetRuntimeClass
+6211 CHttpConnection::GetRuntimeClass
+6212 CHttpFile::GetRuntimeClass
+6213 CHwndRenderTarget::GetRuntimeClass
+6214 CImageList::GetRuntimeClass
+6215 CInternetConnection::GetRuntimeClass
+6216 CInternetException::GetRuntimeClass
+6217 CInternetFile::GetRuntimeClass
+6218 CInternetSession::GetRuntimeClass
+6219 CInvalidArgException::GetRuntimeClass
+6220 CIPAddressCtrl::GetRuntimeClass
+6221 CKeyFrame::GetRuntimeClass
+6222 CLinkCtrl::GetRuntimeClass
+6223 CListBox::GetRuntimeClass
+6224 CListCtrl::GetRuntimeClass
+6225 CListView::GetRuntimeClass
+6226 CLongBinary::GetRuntimeClass
+6227 CMapPtrToPtr::GetRuntimeClass
+6228 CMapPtrToWord::GetRuntimeClass
+6229 CMapStringToOb::GetRuntimeClass
+6230 CMapStringToPtr::GetRuntimeClass
+6231 CMapStringToString::GetRuntimeClass
+6232 CMapWordToOb::GetRuntimeClass
+6233 CMapWordToPtr::GetRuntimeClass
+6234 CMDIChildWnd::GetRuntimeClass
+6235 CMDIChildWndEx::GetRuntimeClass
+6236 CMDIClientAreaWnd::GetRuntimeClass
+6237 CMDIFrameWnd::GetRuntimeClass
+6238 CMDIFrameWndEx::GetRuntimeClass
+6239 CMDITabProxyWnd::GetRuntimeClass
+6240 CMemFile::GetRuntimeClass
+6241 CMemoryException::GetRuntimeClass
+6242 CMenu::GetRuntimeClass
+6243 CMetaFileDC::GetRuntimeClass
+6244 CMFCAutoHideBar::GetRuntimeClass
+6245 CMFCAutoHideButton::GetRuntimeClass
+6246 CMFCBaseTabCtrl::GetRuntimeClass
+6247 CMFCBaseToolBar::GetRuntimeClass
+6248 CMFCButton::GetRuntimeClass
+6249 CMFCCaptionBar::GetRuntimeClass
+6250 CMFCColorBar::GetRuntimeClass
+6251 CMFCColorButton::GetRuntimeClass
+6252 CMFCColorMenuButton::GetRuntimeClass
+6253 CMFCColorPopupMenu::GetRuntimeClass
+6254 CMFCColorPropertySheet::GetRuntimeClass
+6255 CMFCControlRenderer::GetRuntimeClass
+6256 CMFCCustomColorsPropertyPage::GetRuntimeClass
+6257 CMFCCustomizeButton::GetRuntimeClass
+6258 CMFCCustomizeMenuButton::GetRuntimeClass
+6259 CMFCDesktopAlertDialog::GetRuntimeClass
+6260 CMFCDesktopAlertWnd::GetRuntimeClass
+6261 CMFCDropDownFrame::GetRuntimeClass
+6262 CMFCDropDownListBox::GetRuntimeClass
+6263 CMFCDropDownToolBar::GetRuntimeClass
+6264 CMFCDropDownToolbarButton::GetRuntimeClass
+6265 CMFCEditBrowseCtrl::GetRuntimeClass
+6266 CMFCHeaderCtrl::GetRuntimeClass
+6267 CMFCLinkCtrl::GetRuntimeClass
+6268 CMFCListCtrl::GetRuntimeClass
+6269 CMFCMaskedEdit::GetRuntimeClass
+6270 CMFCMenuBar::GetRuntimeClass
+6271 CMFCMenuButton::GetRuntimeClass
+6272 CMFCMousePropertyPage::GetRuntimeClass
+6273 CMFCOutlookBar::GetRuntimeClass
+6274 CMFCOutlookBarPane::GetRuntimeClass
+6275 CMFCOutlookBarPaneAdapter::GetRuntimeClass
+6276 CMFCOutlookBarPaneButton::GetRuntimeClass
+6277 CMFCOutlookBarTabCtrl::GetRuntimeClass
+6278 CMFCOutlookBarToolBar::GetRuntimeClass
+6279 CMFCPopupMenu::GetRuntimeClass
+6280 CMFCPopupMenuBar::GetRuntimeClass
+6281 CMFCPreviewCtrlImpl::GetRuntimeClass
+6282 CMFCPrintPreviewToolBar::GetRuntimeClass
+6283 CMFCPropertyGridColorProperty::GetRuntimeClass
+6284 CMFCPropertyGridCtrl::GetRuntimeClass
+6285 CMFCPropertyGridFileProperty::GetRuntimeClass
+6286 CMFCPropertyGridFontProperty::GetRuntimeClass
+6287 CMFCPropertyGridProperty::GetRuntimeClass
+6288 CMFCPropertyGridToolTipCtrl::GetRuntimeClass
+6289 CMFCPropertyPage::GetRuntimeClass
+6290 CMFCPropertySheet::GetRuntimeClass
+6291 CMFCPropertySheetCategoryInfo::GetRuntimeClass
+6292 CMFCReBar::GetRuntimeClass
+6293 CMFCRibbonApplicationButton::GetRuntimeClass
+6294 CMFCRibbonBar::GetRuntimeClass
+6295 CMFCRibbonBaseElement::GetRuntimeClass
+6296 CMFCRibbonButton::GetRuntimeClass
+6297 CMFCRibbonButtonsGroup::GetRuntimeClass
+6298 CMFCRibbonCaptionButton::GetRuntimeClass
+6299 CMFCRibbonCategory::GetRuntimeClass
+6300 CMFCRibbonCheckBox::GetRuntimeClass
+6301 CMFCRibbonColorButton::GetRuntimeClass
+6302 CMFCRibbonColorMenuButton::GetRuntimeClass
+6303 CMFCRibbonComboBox::GetRuntimeClass
+6304 CMFCRibbonContextCaption::GetRuntimeClass
+6305 CMFCRibbonCustomizeCategory::GetRuntimeClass
+6306 CMFCRibbonCustomizeDialog::GetRuntimeClass
+6307 CMFCRibbonCustomizePropertyPage::GetRuntimeClass
+6308 CMFCRibbonDefaultPanelButton::GetRuntimeClass
+6309 CMFCRibbonEdit::GetRuntimeClass
+6310 CMFCRibbonFontComboBox::GetRuntimeClass
+6311 CMFCRibbonGallery::GetRuntimeClass
+6312 CMFCRibbonGalleryIcon::GetRuntimeClass
+6313 CMFCRibbonGalleryMenuButton::GetRuntimeClass
+6314 CMFCRibbonLabel::GetRuntimeClass
+6315 CMFCRibbonLaunchButton::GetRuntimeClass
+6316 CMFCRibbonLinkCtrl::GetRuntimeClass
+6317 CMFCRibbonMainPanel::GetRuntimeClass
+6318 CMFCRibbonMainPanelButton::GetRuntimeClass
+6319 CMFCRibbonMiniToolBar::GetRuntimeClass
+6320 CMFCRibbonPanel::GetRuntimeClass
+6321 CMFCRibbonPanelMenu::GetRuntimeClass
+6322 CMFCRibbonPanelMenuBar::GetRuntimeClass
+6323 CMFCRibbonProgressBar::GetRuntimeClass
+6324 CMFCRibbonQuickAccessCustomizeButton::GetRuntimeClass
+6325 CMFCRibbonQuickAccessToolBar::GetRuntimeClass
+6326 CMFCRibbonRecentFilesList::GetRuntimeClass
+6327 CMFCRibbonRichEditCtrl::GetRuntimeClass
+6328 CMFCRibbonSeparator::GetRuntimeClass
+6329 CMFCRibbonSlider::GetRuntimeClass
+6330 CMFCRibbonStatusBar::GetRuntimeClass
+6331 CMFCRibbonStatusBarCustomizeButton::GetRuntimeClass
+6332 CMFCRibbonStatusBarPane::GetRuntimeClass
+6333 CMFCRibbonTab::GetRuntimeClass
+6334 CMFCRibbonUndoButton::GetRuntimeClass
+6335 CMFCShadowRenderer::GetRuntimeClass
+6336 CMFCShellListCtrl::GetRuntimeClass
+6337 CMFCShellTreeCtrl::GetRuntimeClass
+6338 CMFCShowAllButton::GetRuntimeClass
+6339 CMFCStandardColorsPropertyPage::GetRuntimeClass
+6340 CMFCStatusBar::GetRuntimeClass
+6341 CMFCTabCtrl::GetRuntimeClass
+6342 CMFCTasksPane::GetRuntimeClass
+6343 CMFCTasksPaneFrameWnd::GetRuntimeClass
+6344 CMFCTasksPaneToolBar::GetRuntimeClass
+6345 CMFCToolBar::GetRuntimeClass
+6346 CMFCToolBarButton::GetRuntimeClass
+6347 CMFCToolBarColorButton::GetRuntimeClass
+6348 CMFCToolBarComboBoxButton::GetRuntimeClass
+6349 CMFCToolBarDateTimeCtrl::GetRuntimeClass
+6350 CMFCToolBarEditBoxButton::GetRuntimeClass
+6351 CMFCToolBarFontComboBox::GetRuntimeClass
+6352 CMFCToolBarFontSizeComboBox::GetRuntimeClass
+6353 CMFCToolBarMenuButton::GetRuntimeClass
+6354 CMFCToolBarMenuButtonsButton::GetRuntimeClass
+6355 CMFCToolBarsCommandsPropertyPage::GetRuntimeClass
+6356 CMFCToolBarsCustomizeDialog::GetRuntimeClass
+6357 CMFCToolBarsKeyboardPropertyPage::GetRuntimeClass
+6358 CMFCToolBarsListPropertyPage::GetRuntimeClass
+6359 CMFCToolBarsMenuPropertyPage::GetRuntimeClass
+6360 CMFCToolBarsOptionsPropertyPage::GetRuntimeClass
+6361 CMFCToolBarSpinEditBoxButton::GetRuntimeClass
+6362 CMFCToolBarSystemMenuButton::GetRuntimeClass
+6363 CMFCToolTipCtrl::GetRuntimeClass
+6364 CMFCVisualManager::GetRuntimeClass
+6365 CMFCVisualManagerOffice2003::GetRuntimeClass
+6366 CMFCVisualManagerOffice2007::GetRuntimeClass
+6367 CMFCVisualManagerOfficeXP::GetRuntimeClass
+6368 CMFCVisualManagerVS2005::GetRuntimeClass
+6369 CMFCVisualManagerVS2008::GetRuntimeClass
+6370 CMFCVisualManagerWindows::GetRuntimeClass
+6371 CMFCVisualManagerWindows7::GetRuntimeClass
+6372 CMiniDockFrameWnd::GetRuntimeClass
+6373 CMiniFrameWnd::GetRuntimeClass
+6374 CMonikerFile::GetRuntimeClass
+6375 CMonthCalCtrl::GetRuntimeClass
+6376 CMouseManager::GetRuntimeClass
+6377 CMultiDocTemplate::GetRuntimeClass
+6378 CMultiPageDHtmlDialog::GetRuntimeClass
+6379 CMultiPaneFrameWnd::GetRuntimeClass
+6380 CMutex::GetRuntimeClass
+6381 CNotSupportedException::GetRuntimeClass
+6382 CObArray::GetRuntimeClass
+6383 CObject::GetRuntimeClass
+6384 CObList::GetRuntimeClass
+6385 COleBusyDialog::GetRuntimeClass
+6386 COleChangeIconDialog::GetRuntimeClass
+6387 COleChangeSourceDialog::GetRuntimeClass
+6388 COleClientItem::GetRuntimeClass
+6389 COleCntrFrameWndEx::GetRuntimeClass
+6390 COleControl::GetRuntimeClass
+6391 COleControlModule::GetRuntimeClass
+6392 COleConvertDialog::GetRuntimeClass
+6393 COleDBRecordView::GetRuntimeClass
+6394 COleDialog::GetRuntimeClass
+6395 COleDispatchException::GetRuntimeClass
+6396 COleDocIPFrameWnd::GetRuntimeClass
+6397 COleDocIPFrameWndEx::GetRuntimeClass
+6398 COleDocObjectItem::GetRuntimeClass
+6399 COleDocument::GetRuntimeClass
+6400 COleException::GetRuntimeClass
+6401 COleInsertDialog::GetRuntimeClass
+6402 COleIPFrameWnd::GetRuntimeClass
+6403 COleIPFrameWndEx::GetRuntimeClass
+6404 COleLinkingDoc::GetRuntimeClass
+6405 COleLinksDialog::GetRuntimeClass
+6406 COleObjectFactory::GetRuntimeClass
+6407 COlePasteSpecialDialog::GetRuntimeClass
+6408 COlePropertiesDialog::GetRuntimeClass
+6409 COlePropertyPage::GetRuntimeClass
+6410 COleResizeBar::GetRuntimeClass
+6411 COleServerDoc::GetRuntimeClass
+6412 COleServerDocEx::GetRuntimeClass
+6413 COleServerItem::GetRuntimeClass
+6414 COleStreamFile::GetRuntimeClass
+6415 COleUpdateDialog::GetRuntimeClass
+6416 COutlookCustomizeButton::GetRuntimeClass
+6417 CPagerCtrl::GetRuntimeClass
+6418 CPageSetupDialog::GetRuntimeClass
+6419 CPaintDC::GetRuntimeClass
+6420 CPalette::GetRuntimeClass
+6421 CPane::GetRuntimeClass
+6422 CPaneContainer::GetRuntimeClass
+6423 CPaneContainerManager::GetRuntimeClass
+6424 CPaneDialog::GetRuntimeClass
+6425 CPaneDivider::GetRuntimeClass
+6426 CPaneFrameWnd::GetRuntimeClass
+6427 CPen::GetRuntimeClass
+6428 CPreviewDC::GetRuntimeClass
+6429 CPreviewView::GetRuntimeClass
+6430 CPreviewViewEx::GetRuntimeClass
+6431 CPrintDialog::GetRuntimeClass
+6432 CPrintDialogEx::GetRuntimeClass
+6433 CProgressCtrl::GetRuntimeClass
+6434 CPropertyPage::GetRuntimeClass
+6435 CPropertySheet::GetRuntimeClass
+6436 CPtrArray::GetRuntimeClass
+6437 CPtrList::GetRuntimeClass
+6438 CReBar::GetRuntimeClass
+6439 CReBarCtrl::GetRuntimeClass
+6440 CRecordset::GetRuntimeClass
+6441 CRecordView::GetRuntimeClass
+6442 CRenderTarget::GetRuntimeClass
+6443 CResourceException::GetRuntimeClass
+6444 CRgn::GetRuntimeClass
+6445 CRibbonUndoLabel::GetRuntimeClass
+6446 CRichEditCntrItem::GetRuntimeClass
+6447 CRichEditCtrl::GetRuntimeClass
+6448 CRichEditDoc::GetRuntimeClass
+6449 CRichEditView::GetRuntimeClass
+6450 CScrollBar::GetRuntimeClass
+6451 CScrollView::GetRuntimeClass
+6452 CSemaphore::GetRuntimeClass
+6453 CSettingsStore::GetRuntimeClass
+6454 CSharedFile::GetRuntimeClass
+6455 CSimpleException::GetRuntimeClass
+6456 CSingleDocTemplate::GetRuntimeClass
+6457 CSliderCtrl::GetRuntimeClass
+6458 CSmartDockingGroupGuidesManager::GetRuntimeClass
+6459 CSmartDockingStandaloneGuide::GetRuntimeClass
+6460 CSocket::GetRuntimeClass
+6461 CSocketFile::GetRuntimeClass
+6462 CSpinButtonCtrl::GetRuntimeClass
+6463 CSplitterWnd::GetRuntimeClass
+6464 CSplitterWndEx::GetRuntimeClass
+6465 CStatic::GetRuntimeClass
+6466 CStatusBar::GetRuntimeClass
+6467 CStatusBarCtrl::GetRuntimeClass
+6468 CStdioFile::GetRuntimeClass
+6469 CStringArray::GetRuntimeClass
+6470 CStringList::GetRuntimeClass
+6471 CSyncObject::GetRuntimeClass
+6472 CTabbedPane::GetRuntimeClass
+6473 CTabCtrl::GetRuntimeClass
+6474 CTabView::GetRuntimeClass
+6475 CTasksPaneHistoryButton::GetRuntimeClass
+6476 CTasksPaneMenuButton::GetRuntimeClass
+6477 CTasksPaneNavigateButton::GetRuntimeClass
+6478 CToolBar::GetRuntimeClass
+6479 CToolBarCtrl::GetRuntimeClass
+6480 CToolTipCtrl::GetRuntimeClass
+6481 CTreeCtrl::GetRuntimeClass
+6482 CTreeView::GetRuntimeClass
+6483 CUIntArray::GetRuntimeClass
+6484 CUserException::GetRuntimeClass
+6485 CUserTool::GetRuntimeClass
+6486 CView::GetRuntimeClass
+6487 CWinApp::GetRuntimeClass
+6488 CWinAppEx::GetRuntimeClass
+6489 CWindowDC::GetRuntimeClass
+6490 CWindowlessDC::GetRuntimeClass
+6491 CWinThread::GetRuntimeClass
+6492 CWnd::GetRuntimeClass
+6493 CWordArray::GetRuntimeClass
+6494 CWnd::GetSafeOwner
+6495 CWnd::GetSafeOwner_
+6496 CColorDialog::GetSavedCustomColors
+6497 CGopherFileFind::GetScreenName
+6498 CDockState::GetScreenSize
+6499 CMFCPropertyGridCtrl::GetScrollBarCtrl
+6500 CMFCTasksPane::GetScrollBarCtrl
+6501 CMFCToolBarButtonsListButton::GetScrollBarCtrl
+6502 CView::GetScrollBarCtrl
+6503 COleUILinkInfo::AddRef
+6504 CScrollView::GetScrollBarSizes
+6505 CScrollView::GetScrollBarState
+6506 CWnd::GetScrollInfo
+6507 CWnd::GetScrollLimit
+6508 CWnd::GetScrollPos
+6509 CScrollView::GetScrollPosition
+6510 CWnd::GetScrollRange
+6511 CSplitterWnd::GetScrollStyle
+6512 CPropertySet::GetSection
+6513 CWinAppEx::GetSectionBinary
+6514 CWinAppEx::GetSectionInt
+6515 CWinApp::GetSectionKey
+6516 CPropertySection::GetSectionName
+6517 CWinAppEx::GetSectionObject
+6518 CWinAppEx::GetSectionString
+6519 CD2DPathGeometry::GetSegmentCount
+6520 CRichEditCtrl::GetSel
+6521 CMFCRibbonCommandsListBox::GetSelected
+6522 CFileDialog::GetSelectedControlItem
+6523 CRichEditView::GetSelectedItem
+6524 CEditView::GetSelectedText
+6525 CSliderCtrl::GetSelection
+6526 CRichEditCtrl::GetSelectionCharFormat
+6527 CRichEditCtrl::GetSelectionCharFormat
+6528 COleConvertDialog::GetSelectionType
+6529 COleInsertDialog::GetSelectionType
+6530 COlePasteSpecialDialog::GetSelectionType
+6531 CMFCFontComboBox::GetSelFont
+6532 CMFCPopupMenu::GetSelItem
+6533 CVSListBox::GetSelItem
+6534 CMonthCalCtrl::GetSelRange
+6535 CMonthCalCtrl::GetSelRange
+6536 CMonthCalCtrl::GetSelRange
+6537 CRichEditCtrl::GetSelText
+6538 CMFCShellListCtrl::GetShellImageList
+6539 CWinAppEx::GetShellManager
+6540 CMFCVisualManager::GetShowAllMenuItemsHeight
+6541 CMFCVisualManagerOffice2003::GetShowAllMenuItemsHeight
+6542 CMFCVisualManagerOffice2007::GetShowAllMenuItemsHeight
+6543 CHtmlView::GetSilent
+6544 CPrintDialogEx::GetSite
+6545 CDocument::XObjectWithSite::GetSite
+6546 CD2DBitmap::GetSize
+6547 CD2DBitmap::GetSize
+6548 CMFCAutoHideButton::GetSize
+6549 CPropertySection::GetSize
+6550 CRenderTarget::GetSize
+6551 CDialogTemplate::GetSizeInDialogUnits
+6552 CDialogTemplate::GetSizeInPixels
+6553 CBlobProperty::GetSizeMax
+6554 CArchiveStream::Clone
+6555 CArchiveStream::Clone
+6556 CSplitterWnd::GetSizingParent
+6557 CMFCVisualManager::GetSmartDockingBaseGuideColors
+6558 CMFCVisualManagerOffice2003::GetSmartDockingBaseGuideColors
+6559 CMFCVisualManagerOfficeXP::GetSmartDockingBaseGuideColors
+6560 CMFCVisualManager::GetSmartDockingHighlightToneColor
+6561 CMFCVisualManagerOffice2003::GetSmartDockingHighlightToneColor
+6562 CMFCVisualManagerOffice2007::GetSmartDockingTheme
+6563 CMFCVisualManagerOffice2007::GetSmartDockingTheme
+6564 CAsyncSocket::GetSockName
+6565 CMFCHeaderCtrl::GetSortColumn
+6566 CHtmlView::GetSource
+6567 CCmdTarget::GetStackSize
+6568 CCmdTarget::GetStandardProp
+6569 CMFCBaseVisualManager::GetStandardWindowsTheme
+6570 CHtmlEditCtrl::GetStartDocument
+6571 CHtmlEditCtrl::GetStartDocument
+6572 CD2DLinearGradientBrush::GetStartPoint
+6573 CConnectionPoint::GetStartPosition
+6574 COleDocument::GetStartPosition
+6575 CRichEditDoc::GetStartPosition
+6576 CFile::GetStatus
+6577 CFile::GetStatus
+6578 CMemFile::GetStatus
+6579 COleStreamFile::GetStatus
+6580 CHtmlView::GetStatusBar
+6581 CMFCVisualManager::GetStatusBarPaneTextColor
+6582 CMFCVisualManagerOffice2007::GetStatusBarPaneTextColor
+6583 CVSListBoxBase::GetStdButtonNum
+6584 COleControl::GetStockTextMetrics
+6585 COleStreamFile::GetStorageName
+6586 COleStreamFile::GetStream
+6589 CToolBarCtrl::GetString
+6590 CWinAppEx::GetString
+6591 CMFCVisualManagerOffice2007::GetStyle
+6592 COleControlSite::GetStyle
+6593 COleControlSiteOrWnd::GetStyle
+6594 CWnd::GetStyle
+6595 CMFCVisualManagerOffice2007::GetStyleResourceID
+6596 CMFCVisualManagerWindows7::GetStyleResourceID
+6597 CMFCPropertyGridProperty::GetSubItem
+6598 CListCtrl::GetSubItemRect
+6600 CFrameImpl::GetSysButton
+6601 CWinApp::GetSysPolicyValue
+6602 CMFCVisualManagerOffice2007::GetSystemBorders
+6603 CMFCVisualManagerOffice2007::GetSystemBorders
+6604 CMFCMenuBar::GetSystemButton
+6605 CMFCMenuBar::GetSystemMenu
+6606 CMFCPropertySheet::GetTab
+6607 CMFCOutlookBar::GetTabArea
+6608 CMFCOutlookBarTabCtrl::GetTabArea
+6609 CTabbedPane::GetTabArea
+6610 CMFCBaseTabCtrl::GetTabBkColor
+6611 CMFCBaseTabCtrl::GetTabByID
+6612 CMFCVisualManager::GetTabFrameColors
+6613 CMFCVisualManagerOffice2003::GetTabFrameColors
+6614 CMFCVisualManagerOffice2007::GetTabFrameColors
+6615 CMFCVisualManagerVS2005::GetTabFrameColors
+6616 CMFCVisualManagerVS2008::GetTabFrameColors
+6617 CMFCBaseTabCtrl::GetTabFromHwnd
+6618 CMFCBaseTabCtrl::GetTabFromPoint
+6619 CMFCTabCtrl::GetTabFromPoint
+6620 CMFCBaseTabCtrl::GetTabFullWidth
+6621 CMFCBaseTabCtrl::GetTabHicon
+6622 CMFCVisualManagerOffice2007::GetTabHorzMargin
+6623 CMFCBaseTabCtrl::GetTabIcon
+6624 CMFCBaseTabCtrl::GetTabID
+6625 CMFCBaseTabCtrl::GetTabLabel
+6626 CMFCBaseTabCtrl::GetTabNumberToDetach
+6627 CMFCOutlookBarTabCtrl::GetTabNumberToDetach
+6628 CMFCBaseTabCtrl::GetTabRect
+6629 CMFCBaseTabCtrl::GetTabTextColor
+6630 CMFCVisualManagerOffice2007::GetTabTextColor
+6631 CMFCBaseTabCtrl::GetTabWnd
+6632 CMFCBaseTabCtrl::GetTabWndNoWrapper
+6633 CRenderTarget::GetTags
+6634 CMFCTasksPane::GetTask
+6635 CMDIChildWndEx::GetTaskbarPreviewWnd
+6636 CMDIChildWndEx::GetTaskbarThumbnailClipRect
+6637 CMFCTasksPane::GetTaskGroup
+6638 CMFCTasksPane::GetTaskLocation
+6639 CMFCTasksPane::GetTaskLocation
+6640 CMFCTasksPane::GetTaskLocation
+6641 CMFCTasksPane::GetTasksGroupBorders
+6642 CDialogTemplate::GetTemplateSize
+6643 CListBox::GetText
+6644 CMFCDropDownListBox::GetText
+6645 COleControl::GetText
+6646 CStatusBarCtrl::GetText
+6647 CStatusBarCtrl::GetText
+6648 CToolTipCtrl::GetText
+6649 CMFCToolBarComboBoxButton::GetTextAll
+6650 CRenderTarget::GetTextAntialiasMode
+6651 CMFCToolBarMenuButton::GetTextHorzOffsets
+6652 CRecordset::GetTextLen
+6653 CStatusBarCtrl::GetTextLength
+6654 CRichEditCtrl::GetTextLengthEx
+6655 CRichEditCtrl::GetTextRange
+6656 CRenderTarget::GetTextRenderingParams
+6657 CMFCAutoHideButton::GetTextSize
+6658 CMFCCaptionBar::GetTextSize
+6659 CMFCRibbonCategory::GetTextTopLine
+6660 CHtmlView::GetTheaterMode
+6661 CMFCVisualManagerOffice2003::GetThemeColor
+6662 CAnimateCtrl::GetRuntimeClass
+6663 CAnimationBaseObject::GetRuntimeClass
+6664 CAnimationColor::GetRuntimeClass
+6665 CAnimationController::GetRuntimeClass
+6666 CAnimationPoint::GetRuntimeClass
+6667 CAnimationRect::GetRuntimeClass
+6668 CAnimationSize::GetRuntimeClass
+6669 CAnimationValue::GetRuntimeClass
+6670 CArchiveException::GetRuntimeClass
+6671 CAsyncMonikerFile::GetRuntimeClass
+6672 CAsyncSocket::GetRuntimeClass
+6673 CAutoHideDockSite::GetRuntimeClass
+6674 CBaseKeyFrame::GetRuntimeClass
+6675 CBasePane::GetRuntimeClass
+6676 CBaseTabbedPane::GetRuntimeClass
+6677 CBaseTransition::GetRuntimeClass
+6678 CBitmap::GetRuntimeClass
+6679 CBitmapButton::GetRuntimeClass
+6680 CBitmapRenderTarget::GetRuntimeClass
+6681 CBrush::GetRuntimeClass
+6682 CButton::GetRuntimeClass
+6683 CByteArray::GetRuntimeClass
+6684 CCachedDataPathProperty::GetRuntimeClass
+6685 CCheckListBox::GetRuntimeClass
+6686 CClientDC::GetRuntimeClass
+6687 CCmdTarget::GetRuntimeClass
+6688 CColorDialog::GetRuntimeClass
+6689 CComboBox::GetRuntimeClass
+6690 CComboBoxEx::GetRuntimeClass
+6691 CCommonDialog::GetRuntimeClass
+6692 CControlBar::GetRuntimeClass
+6693 CCriticalSection::GetRuntimeClass
+6694 CCtrlView::GetRuntimeClass
+6695 CD2DBitmap::GetRuntimeClass
+6696 CD2DBitmapBrush::GetRuntimeClass
+6697 CD2DBrush::GetRuntimeClass
+6698 CD2DGeometry::GetRuntimeClass
+6699 CD2DGradientBrush::GetRuntimeClass
+6700 CD2DLayer::GetRuntimeClass
+6701 CD2DLinearGradientBrush::GetRuntimeClass
+6702 CD2DMesh::GetRuntimeClass
+6703 CD2DPathGeometry::GetRuntimeClass
+6704 CD2DRadialGradientBrush::GetRuntimeClass
+6705 CD2DResource::GetRuntimeClass
+6706 CD2DSolidColorBrush::GetRuntimeClass
+6707 CD2DTextFormat::GetRuntimeClass
+6708 CD2DTextLayout::GetRuntimeClass
+6709 CDatabase::GetRuntimeClass
+6710 CDataPathProperty::GetRuntimeClass
+6711 CDateTimeCtrl::GetRuntimeClass
+6712 CDBException::GetRuntimeClass
+6713 CDC::GetRuntimeClass
+6714 CDCRenderTarget::GetRuntimeClass
+6715 CDHtmlDialog::GetRuntimeClass
+6716 CDialog::GetRuntimeClass
+6717 CDialogBar::GetRuntimeClass
+6718 CDialogEx::GetRuntimeClass
+6719 CDocItem::GetRuntimeClass
+6720 CDockablePane::GetRuntimeClass
+6721 CDockablePaneAdapter::GetRuntimeClass
+6722 CDockBar::GetRuntimeClass
+6723 CDockingPanesRow::GetRuntimeClass
+6724 CDockSite::GetRuntimeClass
+6725 CDockState::GetRuntimeClass
+6726 CDocManager::GetRuntimeClass
+6727 CDocObjectServer::GetRuntimeClass
+6728 CDocObjectServerItem::GetRuntimeClass
+6729 CDocTemplate::GetRuntimeClass
+6730 CDocument::GetRuntimeClass
+6731 CDragListBox::GetRuntimeClass
+6732 CDWordArray::GetRuntimeClass
+6733 CDynLinkLibrary::GetRuntimeClass
+6734 CEdit::GetRuntimeClass
+6735 CEditView::GetRuntimeClass
+6736 CEvent::GetRuntimeClass
+6737 CException::GetRuntimeClass
+6738 CFile::GetRuntimeClass
+6739 CFileDialog::GetRuntimeClass
+6740 CFileException::GetRuntimeClass
+6741 CFileFind::GetRuntimeClass
+6742 CFindReplaceDialog::GetRuntimeClass
+6743 CFolderPickerDialog::GetRuntimeClass
+6744 CFont::GetRuntimeClass
+6745 CFontDialog::GetRuntimeClass
+6746 CFormView::GetRuntimeClass
+6747 CFrameWnd::GetRuntimeClass
+6748 CFrameWndEx::GetRuntimeClass
+6749 CFtpConnection::GetRuntimeClass
+6750 CFtpFileFind::GetRuntimeClass
+6751 CGdiObject::GetRuntimeClass
+6752 CGopherConnection::GetRuntimeClass
+6753 CGopherFile::GetRuntimeClass
+6754 CGopherFileFind::GetRuntimeClass
+6755 CHeaderCtrl::GetRuntimeClass
+6756 CHelpComboBoxButton::GetRuntimeClass
+6757 CHotKeyCtrl::GetRuntimeClass
+6758 CHtmlEditDoc::GetRuntimeClass
+6759 CHtmlEditView::GetRuntimeClass
+6760 CHtmlView::GetRuntimeClass
+6761 CHttpConnection::GetRuntimeClass
+6762 CHttpFile::GetRuntimeClass
+6763 CHwndRenderTarget::GetRuntimeClass
+6764 CImageList::GetRuntimeClass
+6765 CInternetConnection::GetRuntimeClass
+6766 CInternetException::GetRuntimeClass
+6767 CInternetFile::GetRuntimeClass
+6768 CInternetSession::GetRuntimeClass
+6769 CInvalidArgException::GetRuntimeClass
+6770 CIPAddressCtrl::GetRuntimeClass
+6771 CKeyFrame::GetRuntimeClass
+6772 CLinkCtrl::GetRuntimeClass
+6773 CListBox::GetRuntimeClass
+6774 CListCtrl::GetRuntimeClass
+6775 CListView::GetRuntimeClass
+6776 CLongBinary::GetRuntimeClass
+6777 CMapPtrToPtr::GetRuntimeClass
+6778 CMapPtrToWord::GetRuntimeClass
+6779 CMapStringToOb::GetRuntimeClass
+6780 CMapStringToPtr::GetRuntimeClass
+6781 CMapStringToString::GetRuntimeClass
+6782 CMapWordToOb::GetRuntimeClass
+6783 CMapWordToPtr::GetRuntimeClass
+6784 CMDIChildWnd::GetRuntimeClass
+6785 CMDIChildWndEx::GetRuntimeClass
+6786 CMDIClientAreaWnd::GetRuntimeClass
+6787 CMDIFrameWnd::GetRuntimeClass
+6788 CMDIFrameWndEx::GetRuntimeClass
+6789 CMDITabProxyWnd::GetRuntimeClass
+6790 CMemFile::GetRuntimeClass
+6791 CMemoryException::GetRuntimeClass
+6792 CMenu::GetRuntimeClass
+6793 CMetaFileDC::GetRuntimeClass
+6794 CMFCAutoHideBar::GetRuntimeClass
+6795 CMFCAutoHideButton::GetRuntimeClass
+6796 CMFCBaseTabCtrl::GetRuntimeClass
+6797 CMFCBaseToolBar::GetRuntimeClass
+6798 CMFCButton::GetRuntimeClass
+6799 CMFCCaptionBar::GetRuntimeClass
+6800 CMFCColorBar::GetRuntimeClass
+6801 CMFCColorButton::GetRuntimeClass
+6802 CMFCColorMenuButton::GetRuntimeClass
+6803 CMFCColorPopupMenu::GetRuntimeClass
+6804 CMFCColorPropertySheet::GetRuntimeClass
+6805 CMFCControlRenderer::GetRuntimeClass
+6806 CMFCCustomColorsPropertyPage::GetRuntimeClass
+6807 CMFCCustomizeButton::GetRuntimeClass
+6808 CMFCCustomizeMenuButton::GetRuntimeClass
+6809 CMFCDesktopAlertDialog::GetRuntimeClass
+6810 CMFCDesktopAlertWnd::GetRuntimeClass
+6811 CMFCDropDownFrame::GetRuntimeClass
+6812 CMFCDropDownListBox::GetRuntimeClass
+6813 CMFCDropDownToolBar::GetRuntimeClass
+6814 CMFCDropDownToolbarButton::GetRuntimeClass
+6815 CMFCEditBrowseCtrl::GetRuntimeClass
+6816 CMFCHeaderCtrl::GetRuntimeClass
+6817 CMFCLinkCtrl::GetRuntimeClass
+6818 CMFCListCtrl::GetRuntimeClass
+6819 CMFCMaskedEdit::GetRuntimeClass
+6820 CMFCMenuBar::GetRuntimeClass
+6821 CMFCMenuButton::GetRuntimeClass
+6822 CMFCMousePropertyPage::GetRuntimeClass
+6823 CMFCOutlookBar::GetRuntimeClass
+6824 CMFCOutlookBarPane::GetRuntimeClass
+6825 CMFCOutlookBarPaneAdapter::GetRuntimeClass
+6826 CMFCOutlookBarPaneButton::GetRuntimeClass
+6827 CMFCOutlookBarTabCtrl::GetRuntimeClass
+6828 CMFCOutlookBarToolBar::GetRuntimeClass
+6829 CMFCPopupMenu::GetRuntimeClass
+6830 CMFCPopupMenuBar::GetRuntimeClass
+6831 CMFCPreviewCtrlImpl::GetRuntimeClass
+6832 CMFCPrintPreviewToolBar::GetRuntimeClass
+6833 CMFCPropertyGridColorProperty::GetRuntimeClass
+6834 CMFCPropertyGridCtrl::GetRuntimeClass
+6835 CMFCPropertyGridFileProperty::GetRuntimeClass
+6836 CMFCPropertyGridFontProperty::GetRuntimeClass
+6837 CMFCPropertyGridProperty::GetRuntimeClass
+6838 CMFCPropertyGridToolTipCtrl::GetRuntimeClass
+6839 CMFCPropertyPage::GetRuntimeClass
+6840 CMFCPropertySheet::GetRuntimeClass
+6841 CMFCPropertySheetCategoryInfo::GetRuntimeClass
+6842 CMFCReBar::GetRuntimeClass
+6843 CMFCRibbonApplicationButton::GetRuntimeClass
+6844 CMFCRibbonBar::GetRuntimeClass
+6845 CMFCRibbonBaseElement::GetRuntimeClass
+6846 CMFCRibbonButton::GetRuntimeClass
+6847 CMFCRibbonButtonsGroup::GetRuntimeClass
+6848 CMFCRibbonCaptionButton::GetRuntimeClass
+6849 CMFCRibbonCategory::GetRuntimeClass
+6850 CMFCRibbonCheckBox::GetRuntimeClass
+6851 CMFCRibbonColorButton::GetRuntimeClass
+6852 CMFCRibbonColorMenuButton::GetRuntimeClass
+6853 CMFCRibbonComboBox::GetRuntimeClass
+6854 CMFCRibbonContextCaption::GetRuntimeClass
+6855 CMFCRibbonCustomizeCategory::GetRuntimeClass
+6856 CMFCRibbonCustomizeDialog::GetRuntimeClass
+6857 CMFCRibbonCustomizePropertyPage::GetRuntimeClass
+6858 CMFCRibbonDefaultPanelButton::GetRuntimeClass
+6859 CMFCRibbonEdit::GetRuntimeClass
+6860 CMFCRibbonFontComboBox::GetRuntimeClass
+6861 CMFCRibbonGallery::GetRuntimeClass
+6862 CMFCRibbonGalleryIcon::GetRuntimeClass
+6863 CMFCRibbonGalleryMenuButton::GetRuntimeClass
+6864 CMFCRibbonLabel::GetRuntimeClass
+6865 CMFCRibbonLaunchButton::GetRuntimeClass
+6866 CMFCRibbonLinkCtrl::GetRuntimeClass
+6867 CMFCRibbonMainPanel::GetRuntimeClass
+6868 CMFCRibbonMainPanelButton::GetRuntimeClass
+6869 CMFCRibbonMiniToolBar::GetRuntimeClass
+6870 CMFCRibbonPanel::GetRuntimeClass
+6871 CMFCRibbonPanelMenu::GetRuntimeClass
+6872 CMFCRibbonPanelMenuBar::GetRuntimeClass
+6873 CMFCRibbonProgressBar::GetRuntimeClass
+6874 CMFCRibbonQuickAccessCustomizeButton::GetRuntimeClass
+6875 CMFCRibbonQuickAccessToolBar::GetRuntimeClass
+6876 CMFCRibbonRecentFilesList::GetRuntimeClass
+6877 CMFCRibbonRichEditCtrl::GetRuntimeClass
+6878 CMFCRibbonSeparator::GetRuntimeClass
+6879 CMFCRibbonSlider::GetRuntimeClass
+6880 CMFCRibbonStatusBar::GetRuntimeClass
+6881 CMFCRibbonStatusBarCustomizeButton::GetRuntimeClass
+6882 CMFCRibbonStatusBarPane::GetRuntimeClass
+6883 CMFCRibbonTab::GetRuntimeClass
+6884 CMFCRibbonUndoButton::GetRuntimeClass
+6885 CMFCShadowRenderer::GetRuntimeClass
+6886 CMFCShellListCtrl::GetRuntimeClass
+6887 CMFCShellTreeCtrl::GetRuntimeClass
+6888 CMFCShowAllButton::GetRuntimeClass
+6889 CMFCStandardColorsPropertyPage::GetRuntimeClass
+6890 CMFCStatusBar::GetRuntimeClass
+6891 CMFCTabCtrl::GetRuntimeClass
+6892 CMFCTasksPane::GetRuntimeClass
+6893 CMFCTasksPaneFrameWnd::GetRuntimeClass
+6894 CMFCTasksPaneToolBar::GetRuntimeClass
+6895 CMFCToolBar::GetRuntimeClass
+6896 CMFCToolBarButton::GetRuntimeClass
+6897 CMFCToolBarColorButton::GetRuntimeClass
+6898 CMFCToolBarComboBoxButton::GetRuntimeClass
+6899 CMFCToolBarDateTimeCtrl::GetRuntimeClass
+6900 CMFCToolBarEditBoxButton::GetRuntimeClass
+6901 CMFCToolBarFontComboBox::GetRuntimeClass
+6902 CMFCToolBarFontSizeComboBox::GetRuntimeClass
+6903 CMFCToolBarMenuButton::GetRuntimeClass
+6904 CMFCToolBarMenuButtonsButton::GetRuntimeClass
+6905 CMFCToolBarsCommandsPropertyPage::GetRuntimeClass
+6906 CMFCToolBarsCustomizeDialog::GetRuntimeClass
+6907 CMFCToolBarsKeyboardPropertyPage::GetRuntimeClass
+6908 CMFCToolBarsListPropertyPage::GetRuntimeClass
+6909 CMFCToolBarsMenuPropertyPage::GetRuntimeClass
+6910 CMFCToolBarsOptionsPropertyPage::GetRuntimeClass
+6911 CMFCToolBarSpinEditBoxButton::GetRuntimeClass
+6912 CMFCToolBarSystemMenuButton::GetRuntimeClass
+6913 CMFCToolTipCtrl::GetRuntimeClass
+6914 CMFCVisualManager::GetRuntimeClass
+6915 CMFCVisualManagerOffice2003::GetRuntimeClass
+6916 CMFCVisualManagerOffice2007::GetRuntimeClass
+6917 CMFCVisualManagerOfficeXP::GetRuntimeClass
+6918 CMFCVisualManagerVS2005::GetRuntimeClass
+6919 CMFCVisualManagerVS2008::GetRuntimeClass
+6920 CMFCVisualManagerWindows::GetRuntimeClass
+6921 CMFCVisualManagerWindows7::GetRuntimeClass
+6922 CMiniDockFrameWnd::GetRuntimeClass
+6923 CMiniFrameWnd::GetRuntimeClass
+6924 CMonikerFile::GetRuntimeClass
+6925 CMonthCalCtrl::GetRuntimeClass
+6926 CMouseManager::GetRuntimeClass
+6927 CMultiDocTemplate::GetRuntimeClass
+6928 CMultiPageDHtmlDialog::GetRuntimeClass
+6929 CMultiPaneFrameWnd::GetRuntimeClass
+6930 CMutex::GetRuntimeClass
+6931 CNotSupportedException::GetRuntimeClass
+6932 CObArray::GetRuntimeClass
+6933 CObject::GetRuntimeClass
+6934 CObList::GetRuntimeClass
+6935 COleBusyDialog::GetRuntimeClass
+6936 COleChangeIconDialog::GetRuntimeClass
+6937 COleChangeSourceDialog::GetRuntimeClass
+6938 COleClientItem::GetRuntimeClass
+6939 COleCntrFrameWndEx::GetRuntimeClass
+6940 COleControl::GetRuntimeClass
+6941 COleControlModule::GetRuntimeClass
+6942 COleConvertDialog::GetRuntimeClass
+6943 COleDBRecordView::GetRuntimeClass
+6944 COleDialog::GetRuntimeClass
+6945 COleDispatchException::GetRuntimeClass
+6946 COleDocIPFrameWnd::GetRuntimeClass
+6947 COleDocIPFrameWndEx::GetRuntimeClass
+6948 COleDocObjectItem::GetRuntimeClass
+6949 COleDocument::GetRuntimeClass
+6950 COleException::GetRuntimeClass
+6951 COleInsertDialog::GetRuntimeClass
+6952 COleIPFrameWnd::GetRuntimeClass
+6953 COleIPFrameWndEx::GetRuntimeClass
+6954 COleLinkingDoc::GetRuntimeClass
+6955 COleLinksDialog::GetRuntimeClass
+6956 COleObjectFactory::GetRuntimeClass
+6957 COlePasteSpecialDialog::GetRuntimeClass
+6958 COlePropertiesDialog::GetRuntimeClass
+6959 COlePropertyPage::GetRuntimeClass
+6960 COleResizeBar::GetRuntimeClass
+6961 COleServerDoc::GetRuntimeClass
+6962 COleServerDocEx::GetRuntimeClass
+6963 COleServerItem::GetRuntimeClass
+6964 COleStreamFile::GetRuntimeClass
+6965 COleUpdateDialog::GetRuntimeClass
+6966 COutlookCustomizeButton::GetRuntimeClass
+6967 CPagerCtrl::GetRuntimeClass
+6968 CPageSetupDialog::GetRuntimeClass
+6969 CPaintDC::GetRuntimeClass
+6970 CPalette::GetRuntimeClass
+6971 CPane::GetRuntimeClass
+6972 CPaneContainer::GetRuntimeClass
+6973 CPaneContainerManager::GetRuntimeClass
+6974 CPaneDialog::GetRuntimeClass
+6975 CPaneDivider::GetRuntimeClass
+6976 CPaneFrameWnd::GetRuntimeClass
+6977 CPen::GetRuntimeClass
+6978 CPreviewDC::GetRuntimeClass
+6979 CPreviewView::GetRuntimeClass
+6980 CPreviewViewEx::GetRuntimeClass
+6981 CPrintDialog::GetRuntimeClass
+6982 CPrintDialogEx::GetRuntimeClass
+6983 CProgressCtrl::GetRuntimeClass
+6984 CPropertyPage::GetRuntimeClass
+6985 CPropertySheet::GetRuntimeClass
+6986 CPtrArray::GetRuntimeClass
+6987 CPtrList::GetRuntimeClass
+6988 CReBar::GetRuntimeClass
+6989 CReBarCtrl::GetRuntimeClass
+6990 CRecordset::GetRuntimeClass
+6991 CRecordView::GetRuntimeClass
+6992 CRenderTarget::GetRuntimeClass
+6993 CResourceException::GetRuntimeClass
+6994 CRgn::GetRuntimeClass
+6995 CRibbonUndoLabel::GetRuntimeClass
+6996 CRichEditCntrItem::GetRuntimeClass
+6997 CRichEditCtrl::GetRuntimeClass
+6998 CRichEditDoc::GetRuntimeClass
+6999 CRichEditView::GetRuntimeClass
+7000 CScrollBar::GetRuntimeClass
+7001 CScrollView::GetRuntimeClass
+7002 CSemaphore::GetRuntimeClass
+7003 CSettingsStore::GetRuntimeClass
+7004 CSharedFile::GetRuntimeClass
+7005 CSimpleException::GetRuntimeClass
+7006 CSingleDocTemplate::GetRuntimeClass
+7007 CSliderCtrl::GetRuntimeClass
+7008 CSmartDockingGroupGuidesManager::GetRuntimeClass
+7009 CSmartDockingStandaloneGuide::GetRuntimeClass
+7010 CSocket::GetRuntimeClass
+7011 CSocketFile::GetRuntimeClass
+7012 CSpinButtonCtrl::GetRuntimeClass
+7013 CSplitterWnd::GetRuntimeClass
+7014 CSplitterWndEx::GetRuntimeClass
+7015 CStatic::GetRuntimeClass
+7016 CStatusBar::GetRuntimeClass
+7017 CStatusBarCtrl::GetRuntimeClass
+7018 CStdioFile::GetRuntimeClass
+7019 CStringArray::GetRuntimeClass
+7020 CStringList::GetRuntimeClass
+7021 CSyncObject::GetRuntimeClass
+7022 CTabbedPane::GetRuntimeClass
+7023 CTabCtrl::GetRuntimeClass
+7024 CTabView::GetRuntimeClass
+7025 CTasksPaneHistoryButton::GetRuntimeClass
+7026 CTasksPaneMenuButton::GetRuntimeClass
+7027 CTasksPaneNavigateButton::GetRuntimeClass
+7028 CToolBar::GetRuntimeClass
+7029 CToolBarCtrl::GetRuntimeClass
+7030 CToolTipCtrl::GetRuntimeClass
+7031 CTreeCtrl::GetRuntimeClass
+7032 CTreeView::GetRuntimeClass
+7033 CUIntArray::GetRuntimeClass
+7034 CUserException::GetRuntimeClass
+7035 CUserTool::GetRuntimeClass
+7036 CView::GetRuntimeClass
+7037 CWinApp::GetRuntimeClass
+7038 CWinAppEx::GetRuntimeClass
+7039 CWindowDC::GetRuntimeClass
+7040 CWindowlessDC::GetRuntimeClass
+7041 CWinThread::GetRuntimeClass
+7042 CWnd::GetRuntimeClass
+7043 CWordArray::GetRuntimeClass
+7044 CCmdTarget::GetCommandMap
+7045 COleDocObjectItem::GetCommandMap
+7046 CCmdTarget::GetConnectionMap
+7047 COleControl::GetConnectionMap
+7048 CCmdTarget::GetDispatchMap
+7049 COleControlContainer::GetDispatchMap
+7050 COleControl::GetEventMap
+7051 CCmdTarget::GetEventSinkMap
+7052 CDHtmlDialog::GetEventSinkMap
+7053 CHtmlEditCtrl::GetEventSinkMap
+7054 CHtmlView::GetEventSinkMap
+7055 CCmdTarget::GetInterfaceMap
+7056 CDocObjectServer::GetInterfaceMap
+7057 CDocument::GetInterfaceMap
+7058 CEnumConnections::GetInterfaceMap
+7059 CEnumConnPoints::GetInterfaceMap
+7060 CEnumFormatEtc::GetInterfaceMap
+7061 CEnumOleVerb::GetInterfaceMap
+7062 CEnumUnknown::GetInterfaceMap
+7063 CFileDialog::GetInterfaceMap
+7064 CHtmlControlSite::GetInterfaceMap
+7065 COleClientItem::GetInterfaceMap
+7066 COleControl::GetInterfaceMap
+7067 COleControlContainer::GetInterfaceMap
+7068 COleControlSite::GetInterfaceMap
+7069 COleDataSource::GetInterfaceMap
+7070 COleDocObjectItem::GetInterfaceMap
+7071 COleDropSource::GetInterfaceMap
+7072 COleDropTarget::GetInterfaceMap
+7073 COleFrameHook::GetInterfaceMap
+7074 COleLinkingDoc::GetInterfaceMap
+7075 COleMessageFilter::GetInterfaceMap
+7076 COleObjectFactory::GetInterfaceMap
+7077 COlePropertyPage::GetInterfaceMap
+7078 COleServerDoc::GetInterfaceMap
+7079 COleServerItem::GetInterfaceMap
+7080 CRichEditView::GetInterfaceMap
+7081 CWnd::GetInterfaceMap
+7082 CAutoHideDockSite::GetMessageMap
+7083 CBasePane::GetMessageMap
+7084 CBaseTabbedPane::GetMessageMap
+7085 CCheckListBox::GetMessageMap
+7086 CCmdTarget::GetMessageMap
+7087 CCommonDialog::GetMessageMap
+7088 CControlBar::GetMessageMap
+7089 CControlFrameWnd::GetMessageMap
+7090 CCtrlView::GetMessageMap
+7091 CDHtmlDialog::GetMessageMap
+7092 CDialog::GetMessageMap
+7093 CDialogBar::GetMessageMap
+7094 CDialogEx::GetMessageMap
+7095 CDockablePane::GetMessageMap
+7096 CDockablePaneAdapter::GetMessageMap
+7097 CDockBar::GetMessageMap
+7098 CDockSite::GetMessageMap
+7099 CDocObjectServer::GetMessageMap
+7100 CDocument::GetMessageMap
+7101 CDummyDockablePane::GetMessageMap
+7102 CEditView::GetMessageMap
+7103 CFormView::GetMessageMap
+7104 CFrameWnd::GetMessageMap
+7105 CFrameWndEx::GetMessageMap
+7106 CHtmlEditView::GetMessageMap
+7107 CHtmlView::GetMessageMap
+7108 CListCtrl::GetMessageMap
+7109 CListView::GetMessageMap
+7110 CMDIChildWnd::GetMessageMap
+7111 CMDIChildWndEx::GetMessageMap
+7112 CMDIClientAreaWnd::GetMessageMap
+7113 CMDIFrameWnd::GetMessageMap
+7114 CMDIFrameWndEx::GetMessageMap
+7115 CMDITabProxyWnd::GetMessageMap
+7116 CMFCAcceleratorKeyAssignCtrl::GetMessageMap
+7117 CMFCAutoHideBar::GetMessageMap
+7118 CMFCBaseTabCtrl::GetMessageMap
+7119 CMFCBaseToolBar::GetMessageMap
+7120 CMFCButton::GetMessageMap
+7121 CMFCCaptionBar::GetMessageMap
+7122 CMFCColorBar::GetMessageMap
+7123 CMFCColorButton::GetMessageMap
+7124 CMFCColorDialog::GetMessageMap
+7125 CMFCColorPickerCtrl::GetMessageMap
+7126 CMFCColorPopupMenu::GetMessageMap
+7127 CMFCColorPropertySheet::GetMessageMap
+7128 CMFCCustomColorsPropertyPage::GetMessageMap
+7129 CMFCDesktopAlertDialog::GetMessageMap
+7130 CMFCDesktopAlertWnd::GetMessageMap
+7131 CMFCDropDownFrame::GetMessageMap
+7132 CMFCDropDownListBox::GetMessageMap
+7133 CMFCDropDownToolBar::GetMessageMap
+7134 CMFCEditBrowseCtrl::GetMessageMap
+7135 CMFCFontComboBox::GetMessageMap
+7136 CMFCHeaderCtrl::GetMessageMap
+7137 CMFCImageEditorDialog::GetMessageMap
+7138 CMFCImagePaintArea::GetMessageMap
+7139 CMFCKeyMapDialog::GetMessageMap
+7140 CMFCLinkCtrl::GetMessageMap
+7141 CMFCListCtrl::GetMessageMap
+7142 CMFCMaskedEdit::GetMessageMap
+7143 CMFCMenuBar::GetMessageMap
+7144 CMFCMenuButton::GetMessageMap
+7145 CMFCMousePropertyPage::GetMessageMap
+7146 CMFCOutlookBar::GetMessageMap
+7147 CMFCOutlookBarPane::GetMessageMap
+7148 CMFCOutlookBarPaneAdapter::GetMessageMap
+7149 CMFCOutlookBarTabCtrl::GetMessageMap
+7150 CMFCOutlookBarToolBar::GetMessageMap
+7151 CMFCPopupMenu::GetMessageMap
+7152 CMFCPopupMenuBar::GetMessageMap
+7153 CMFCPreviewCtrlImpl::GetMessageMap
+7154 CMFCPrintPreviewToolBar::GetMessageMap
+7155 CMFCPropertyGridCtrl::GetMessageMap
+7156 CMFCPropertyGridToolTipCtrl::GetMessageMap
+7157 CMFCPropertyPage::GetMessageMap
+7158 CMFCPropertySheet::GetMessageMap
+7160 CMFCReBar::GetMessageMap
+7161 CMFCRibbonBar::GetMessageMap
+7162 CMFCRibbonCommandsListBox::GetMessageMap
+7163 CMFCRibbonCustomizePropertyPage::GetMessageMap
+7164 CMFCRibbonKeyboardCustomizeDialog::GetMessageMap
+7165 CMFCRibbonKeyTip::GetMessageMap
+7166 CMFCRibbonMiniToolBar::GetMessageMap
+7167 CMFCRibbonPanelMenu::GetMessageMap
+7168 CMFCRibbonPanelMenuBar::GetMessageMap
+7169 CMFCRibbonRichEditCtrl::GetMessageMap
+7170 CMFCRibbonSpinButtonCtrl::GetMessageMap
+7171 CMFCRibbonStatusBar::GetMessageMap
+7172 CMFCShadowWnd::GetMessageMap
+7173 CMFCShellListCtrl::GetMessageMap
+7174 CMFCShellTreeCtrl::GetMessageMap
+7175 CMFCSpinButtonCtrl::GetMessageMap
+7176 CMFCStandardColorsPropertyPage::GetMessageMap
+7177 CMFCStatusBar::GetMessageMap
+7178 CMFCTabCtrl::GetMessageMap
+7179 CMFCTasksPane::GetMessageMap
+7180 CMFCTasksPaneFrameWnd::GetMessageMap
+7181 CMFCTasksPaneToolBar::GetMessageMap
+7182 CMFCToolBar::GetMessageMap
+7183 CMFCToolBarButtonCustomizeDialog::GetMessageMap
+7184 CMFCToolBarButtonsListButton::GetMessageMap
+7185 CMFCToolBarComboBoxEdit::GetMessageMap
+7186 CMFCToolBarDateTimeCtrlImpl::GetMessageMap
+7187 CMFCToolBarDropSource::GetMessageMap
+7188 CMFCToolBarDropTarget::GetMessageMap
+7189 CMFCToolBarEditCtrl::GetMessageMap
+7190 CMFCToolBarNameDialog::GetMessageMap
+7191 CMFCToolBarsCommandsListBox::GetMessageMap
+7192 CMFCToolBarsCommandsPropertyPage::GetMessageMap
+7193 CMFCToolBarsCustomizeDialog::GetMessageMap
+7194 CMFCToolBarsKeyboardPropertyPage::GetMessageMap
+7195 CMFCToolBarsListCheckBox::GetMessageMap
+7196 CMFCToolBarsListPropertyPage::GetMessageMap
+7197 CMFCToolBarsMenuPropertyPage::GetMessageMap
+7198 CMFCToolBarsOptionsPropertyPage::GetMessageMap
+7199 CMFCToolBarsToolsPropertyPage::GetMessageMap
+7200 CMFCToolTipCtrl::GetMessageMap
+7201 CMFCWindowsManagerDialog::GetMessageMap
+7202 CMiniDockFrameWnd::GetMessageMap
+7203 CMiniFrameWnd::GetMessageMap
+7204 CMultiPaneFrameWnd::GetMessageMap
+7205 COleCntrFrameWndEx::GetMessageMap
+7206 COleControl::GetMessageMap
+7207 COleDBRecordView::GetMessageMap
+7208 COleDocIPFrameWnd::GetMessageMap
+7209 COleDocIPFrameWndEx::GetMessageMap
+7210 COleIPFrameWnd::GetMessageMap
+7211 COleIPFrameWndEx::GetMessageMap
+7212 COlePropertyPage::GetMessageMap
+7213 COleResizeBar::GetMessageMap
+7214 COleServerDoc::GetMessageMap
+7215 COleServerDocEx::GetMessageMap
+7216 COutlookOptionsDlg::GetMessageMap
+7217 CPane::GetMessageMap
+7218 CPaneDialog::GetMessageMap
+7219 CPaneDivider::GetMessageMap
+7220 CPaneFrameWnd::GetMessageMap
+7221 CPreviewView::GetMessageMap
+7222 CPreviewViewEx::GetMessageMap
+7223 CPrintDialog::GetMessageMap
+7224 CPrintDialogEx::GetMessageMap
+7225 CPropertyPage::GetMessageMap
+7226 CPropertySheet::GetMessageMap
+7227 CReBar::GetMessageMap
+7228 CRecordView::GetMessageMap
+7229 CRichEditView::GetMessageMap
+7230 CScreenWnd::GetMessageMap
+7231 CScrollView::GetMessageMap
+7232 CSmartDockingGroupGuidesWnd::GetMessageMap
+7233 CSmartDockingHighlighterWnd::GetMessageMap
+7234 CSmartDockingStandaloneGuideWnd::GetMessageMap
+7235 CSocketWnd::GetMessageMap
+7236 CSplitterWnd::GetMessageMap
+7237 CSplitterWndEx::GetMessageMap
+7238 CStatusBar::GetMessageMap
+7239 CTabbedPane::GetMessageMap
+7240 CTabCtrl::GetMessageMap
+7241 CTabView::GetMessageMap
+7242 CToolBar::GetMessageMap
+7243 CToolBarCtrl::GetMessageMap
+7244 CToolTipCtrl::GetMessageMap
+7245 CTreeCtrl::GetMessageMap
+7246 CTreeView::GetMessageMap
+7247 CView::GetMessageMap
+7248 CVSListBox::GetMessageMap
+7249 CVSListBoxBase::GetMessageMap
+7250 CVSListBoxEditCtrl::GetMessageMap
+7251 CWinApp::GetMessageMap
+7252 CWnd::GetMessageMap
+7253 CDocument::GetThumbnail
+7254 CDateTimeCtrl::GetTime
+7255 CDateTimeCtrl::GetTime
+7256 CMFCToolBarDateTimeCtrl::GetTimeAll
+7257 CMFCToolBarDateTimeCtrl::GetTimeAll
+7258 CMFCToolBarDateTimeCtrl::GetTimeAll
+7259 CMFCStatusBar::GetTipText
+7260 CStatusBarCtrl::GetTipText
+7261 CMonthCalCtrl::GetToday
+7262 CMonthCalCtrl::GetToday
+7263 CHtmlView::GetToolBar
+7264 CMFCVisualManager::GetToolbarButtonTextColor
+7265 CMFCVisualManagerOffice2007::GetToolbarButtonTextColor
+7266 CMFCVisualManagerOfficeXP::GetToolbarButtonTextColor
+7267 CMFCVisualManagerWindows::GetToolbarButtonTextColor
+7268 CMFCVisualManager::GetToolbarDisabledTextColor
+7269 CMFCVisualManager::GetToolbarHighlightColor
+7270 CToolTipCtrl::GetToolInfo
+7271 CMFCVisualManager::GetToolTipInfo
+7272 CMFCVisualManagerOffice2003::GetToolTipInfo
+7273 CMFCVisualManagerOffice2007::GetToolTipInfo
+7274 CWinAppEx::GetTooltipManager
+7275 CMFCRibbonBaseElement::GetToolTipText
+7276 CMFCRibbonButton::GetToolTipText
+7277 CMFCRibbonGalleryIcon::GetToolTipText
+7278 CMFCRibbonStatusBarPane::GetToolTipText
+7279 CMFCRibbonTab::GetToolTipText
+7280 CHtmlView::GetTop
+7281 CHtmlView::GetTopLevelContainer
+7282 CWnd::GetTopLevelFrame
+7283 CWnd::GetTopLevelOwner
+7284 CWnd::GetTopLevelParent
+7285 CMFCRibbonBaseElement::GetTopLevelRibbonBar
+7286 CMFCRibbonPanelMenuBar::GetTopLevelRibbonBar
+7287 CMFCPropertyGridCtrl::GetTotalItems
+7288 CPaneContainerManager::GetTotalRefCount
+7289 CPaneContainer::GetTotalReferenceCount
+7290 CMDIChildWnd::GetTrackingID
+7291 CD2DBrush::GetTransform
+7292 CRenderTarget::GetTransform
+7293 CBaseTransition::GetTransition
+7294 CScrollView::GetTrueClientSize
+7295 CRectTracker::GetTrueRect
+7296 CMFCToolBarFontSizeComboBox::GetTwipSize
+7297 CHtmlView::GetType
+7298 CPictureHolder::GetType
+7299 CPropertySet::GetOSVersion
+7300 CDHtmlControlSink::GetTypeInfo
+7301 CDHtmlControlSink::GetTypeInfo
+7302 CDHtmlControlSink::GetTypeInfo
+7303 COleDispatchImpl::GetTypeInfo
+7304 CArchiveStream::Clone
+7305 CArchiveStream::Clone
+7306 CArchiveStream::Clone
+7307 COleUILinkInfo::AddRef
+7308 CDHtmlControlSink::GetTypeInfoCount
+7309 CDHtmlControlSink::GetTypeInfoCount
+7310 CDHtmlControlSink::GetTypeInfoCount
+7311 COleDispatchImpl::GetTypeInfoCount
+7312 CWnd::XAccessible::GetTypeInfoCount
+7313 CArchiveStream::Clone
+7314 CArchiveStream::Clone
+7315 CCmdTarget::GetTypeInfoOfGuid
+7316 CCmdTarget::GetTypeLib
+7317 COleUILinkInfo::AddRef
+7318 COleSafeArray::GetUBound
+7319 CAnimationController::GetUIAnimationManager
+7320 CAnimationController::GetUIAnimationTimer
+7321 CAnimationController::GetUITransitionFactory
+7322 CAnimationController::GetUITransitionLibrary
+7323 CDocObjectServer::XOleObject::GetUserClassID
+7324 COleControl::XOleObject::GetUserClassID
+7325 COleServerDoc::XOleObject::GetUserClassID
+7326 COleServerItem::XOleObject::GetUserClassID
+7327 CDHtmlControlSink::GetUserDefinedType
+7328 CFrameImpl::GetUserToolBarByIndex
+7329 CWinAppEx::GetUserToolsManager
+7330 COleClientItem::GetUserType
+7331 COleControl::GetUserType
+7332 CDocObjectServer::XOleObject::GetUserType
+7333 COleControl::XOleObject::GetUserType
+7334 COleServerDoc::XOleObject::GetUserType
+7335 COleServerItem::XOleObject::GetUserType
+7336 CAnimationColor::GetValue
+7337 CAnimationPoint::GetValue
+7338 CAnimationRect::GetValue
+7339 CAnimationPoint::GetValue
+7340 CAnimationValue::GetValue
+7341 CAnimationValue::GetValue
+7342 CAnimationVariable::GetValue
+7343 CAnimationVariable::GetValue
+7344 CMFCFilterChunkValueImpl::GetValue
+7345 CMapPtrToPtr::GetValueAt
+7346 CRecordset::GetDefaultSQL
+7347 CHttpFile::GetVerb
+7348 CDockState::GetVersion
+7349 CMFCButton::GetVertMargin
+7350 CHtmlEditDoc::GetView
+7351 CRichEditDoc::GetView
+7352 CMouseManager::GetViewDblClickCommand
+7353 CMouseManager::GetViewIconId
+7354 CMouseManager::GetViewIdByName
+7355 COlePropertiesDialog::XOleUIObjInfo::GetViewInfo
+7356 CMouseManager::GetViewNames
+7357 COleControl::XViewObject::GetViewStatus
+7358 CPane::GetVirtualRect
+7359 CHtmlView::GetVisible
+7360 CMFCRibbonBar::GetVisibleCategoryCount
+7361 CDockingPanesRow::GetVisibleCount
+7362 CMFCAutoHideBar::GetVisibleCount
+7363 CMFCRibbonBar::GetVisibleElements
+7364 CMFCRibbonBaseElement::GetVisibleElements
+7365 CMFCRibbonButtonsGroup::GetVisibleElements
+7366 CMFCRibbonCategory::GetVisibleElements
+7367 CMFCRibbonPanel::GetVisibleElements
+7368 CPaneContainerManager::GetVisiblePaneCount
+7369 CMFCBaseTabCtrl::GetVisibleTabsNum
+7370 CScrollView::GetWheelScrollDistance
+7371 CD2DGeometry::GetWidenedBounds
+7372 CHtmlView::GetWidth
+7373 COleControl::XOleInPlaceActiveObject::GetWindow
+7374 COleServerDoc::XOleInPlaceActiveObject::GetWindow
+7375 COleFrameHook::XOleInPlaceFrame::GetWindow
+7376 COleControl::XOleInPlaceObject::GetWindow
+7377 COleServerDoc::XOleInPlaceObject::GetWindow
+7378 COleControlContainer::XOleIPFrame::GetWindow
+7379 COleClientItem::XOleIPSite::GetWindow
+7380 COleControlSite::XOleIPSite::GetWindow
+7381 CDocument::XOleWindow::GetWindow
+7382 CMFCVisualManagerOffice2003::GetWindowColor
+7383 CMFCVisualManagerOfficeXP::GetWindowColor
+7384 CRichEditCntrItem::GetWindowContext
+7385 CRichEditView::GetWindowContext
+7386 COleClientItem::XOleIPSite::GetWindowContext
+7387 COleControlSite::XOleIPSite::GetWindowContext
+7388 CWnd::GetWindowedChildCount
+7389 CWnd::GetWindowLessChildCount
+7390 COleUILinkInfo::AddRef
+7391 CMDIFrameWnd::GetWindowMenuPopup
+7392 CMDIFrameWndEx::GetWindowMenuPopup
+7393 CWnd::GetWindowPlacement
+7394 CDockingPanesRow::GetWindowRect
+7395 CPaneContainer::GetWindowRect
+7396 CPaneContainerManager::GetWindowRect
+7397 CSmartDockingGroupGuidesManager::GetWindowRect
+7398 CMFCMaskedEdit::GetWindowTextA
+7399 CMFCMaskedEdit::GetWindowTextA
+7400 COleControlSite::GetWindowTextA
+7401 CWnd::GetWindowTextA
+7402 CWnd::GetWindowTextA
+7403 CWnd::GetWindowTextLengthA
+7404 CGlobalUtils::GetWndIcon
+7405 COleServerDoc::GetZoomFactor
+7406 CMFCToolBarDropSource::GiveFeedback
+7407 COleDropSource::GiveFeedback
+7408 COleDropSource::XDropSource::GiveFeedback
+7409 CWnd::GrayCtlColor
+7410 CMFCToolBarImages::GrayImages
+7411 CDrawingManager::GrayRect
+7413 CMFCTasksPane::GroupCaptionHitTest
+7414 CMemFile::GrowFile
+7415 CWnd::HandleFloatingSysCommand
+7416 COleMessageFilter::XMessageFilter::HandleInComingCall
+7417 CBasePane::HandleInitDialog
+7418 CDialog::HandleInitDialog
+7419 CDialogBar::HandleInitDialog
+7420 CFormView::HandleInitDialog
+7421 CPaneDialog::HandleInitDialog
+7422 CPrintDialogEx::HandleInitDialog
+7423 CPropertySheet::HandleInitDialog
+7424 CScrollView::HandleMButtonDown
+7425 CPrintDialogEx::HandleMessage
+7426 COleControlContainer::HandleSetFocus
+7428 COleControlContainer::HandleWindowlessMessage
+7429 COleControl::XPersistStorage::HandsOffStorage
+7430 COleServerDoc::XPersistStorage::HandsOffStorage
+7431 COleDocument::HasBlankItems
+7432 CMFCPropertyGridProperty::HasButton
+7433 CMFCRibbonPanel::HasElement
+7434 CMFCCmdUsageCount::HasEnoughInformation
+7435 CMFCDesktopAlertDialog::HasFocus
+7436 CMFCToolBarComboBoxButton::HasFocus
+7437 CDialogTemplate::HasFont
+7438 CMFCBaseTabCtrl::HasImage
+7439 COlePropertyPage::XPropertyPage::Help
+7440 CDumpContext::HexDump
+7442 CMFCPropertyGridToolTipCtrl::Hide
+7443 CMFCRibbonKeyTip::Hide
+7444 CSmartDockingHighlighterWnd::Hide
+7445 CMFCTabCtrl::HideActiveWindowHorzScrollBar
+7446 CPaneContainerManager::HideAll
+7447 CMFCRibbonBar::HideAllContextCategories
+7448 CWinApp::HideApplication
+7449 CDockingManager::HideAutoHidePanes
+7450 CFileDialog::HideControl
+7451 CDockingManager::HideForPrintPreview
+7452 CMFCRibbonBar::HideKeyTips
+7453 CMFCTabCtrl::HideNoTabs
+7454 CSmartDockingManager::HidePlace
+7455 CMFCPopupMenu::HideRarelyUsedCommands
+7456 CMFCBaseTabCtrl::HideSingleTab
+7457 CMFCTabCtrl::HideSingleTab
+7458 CBrowserControlSite::HideUI
+7459 CArchiveStream::Clone
+7460 CHtmlControlSite::XDocHostUIHandler::HideUI
+7461 CMFCRibbonPanel::Highlight
+7462 CSmartDockingGroupGuide::Highlight
+7463 CSmartDockingStandaloneGuide::Highlight
+7464 CSmartDockingStandaloneGuideWnd::Highlight
+7465 CMFCAutoHideButton::HighlightButton
+7466 CMFCDropDownListBox::HighlightItem
+7467 CMFCRibbonCategory::HighlightPanel
+7468 CDrawingManager::HighlightRect
+7469 CDC::HIMETRICtoDP
+7470 CDC::HIMETRICtoLP
+7471 CDockablePane::HitTest
+7472 CListCtrl::HitTest
+7473 CMFCPropertyGridCtrl::HitTest
+7474 CMFCPropertyGridProperty::HitTest
+7475 CMFCRibbonBar::HitTest
+7477 CMFCRibbonButtonsGroup::HitTest
+7478 CMFCRibbonCategory::HitTest
+7479 CMFCRibbonGallery::HitTest
+7480 CMFCRibbonPanel::HitTest
+7481 CMFCRibbonPanelMenuBar::HitTest
+7482 CMFCRibbonStatusBar::HitTest
+7483 CMFCStatusBar::HitTest
+7484 CMFCToolBar::HitTest
+7485 CMFCToolBarButtonsListButton::HitTest
+7486 CPaneFrameWnd::HitTest
+7487 CRectTracker::HitTest
+7488 CSplitterWnd::HitTest
+7489 CToolTipCtrl::HitTest
+7490 CTreeCtrl::HitTest
+7491 CMFCRibbonCategory::HitTestEx
+7492 CMFCRibbonPanel::HitTestEx
+7493 CMFCRibbonPanelMenuBar::HitTestEx
+7494 CRectTracker::HitTestHandles
+7495 CMFCRibbonCategory::HitTestScrollButtons
+7496 CDrawingManager::HLStoRGB_ONE
+7497 CDrawingManager::HLStoRGB_TWO
+7498 CDrawingManager::HSVtoRGB
+7499 CFrameWndEx::HtmlHelpA
+7500 CMDIFrameWndEx::HtmlHelpA
+7501 COleDocIPFrameWndEx::HtmlHelpA
+7502 COleIPFrameWndEx::HtmlHelpA
+7503 CWinApp::HtmlHelpA
+7504 CWnd::HtmlHelpA
+7505 CDrawingManager::HueToRGB
+7506 CDrawingManager::HuetoRGB
+7507 CSplitterWnd::IdFromRowCol
+7508 COlePropertyPage::IgnoreApply
+7509 COleControl::IgnoreWindowMessage
+7510 CMFCPopupMenuBar::ImportFromMenu
+7511 CAppDestinations::Init
+7512 CMFCDragFrameImpl::Init
+7513 CMFCFontComboBox::Init
+7514 CMFCPropertyGridCtrl::Init
+7515 CMFCPropertyGridProperty::Init
+7516 CMFCToolBarSpinEditBoxButton::Init
+7517 CPaneDivider::Init
+7518 CRecentDockSiteInfo::Init
+7519 CRecentPaneContainerInfo::Init
+7520 CVSListBoxBase::Init
+7521 CWinApp::InitApplication
+7522 CMFCBaseTabCtrl::InitAutoColors
+7523 COleControl::XOleCache::InitCache
+7524 CMFCColorBar::InitColors
+7525 CMFCListCtrl::InitColors
+7526 CWinAppEx::InitContextMenuManager
+7527 CWnd::InitControlContainer
+7528 _AFX_D2D_STATE::InitD2D
+7529 CPropertyPage::InitDialogInfo
+7530 CArchiveStream::AddRef
+7531 CDocObjectServer::XOleObject::InitFromData
+7532 CArchiveStream::Clone
+7533 COleServerDoc::XOleObject::InitFromData
+7534 CArchiveStream::Clone
+7535 CMapPtrToPtr::InitHashTable
+7536 CMapPtrToPtr::InitHashTable
+7537 CMapPtrToPtr::InitHashTable
+7538 CMapPtrToPtr::InitHashTable
+7539 CMapPtrToPtr::InitHashTable
+7540 CMapPtrToPtr::InitHashTable
+7541 CMapPtrToPtr::InitHashTable
+7542 CMFCListCtrl::InitHeader
+7543 CMFCPropertyGridCtrl::InitHeader
+7544 AFX_GLOBAL_DATA::Initialize
+7545 CDataRecoveryHandler::Initialize
+7546 CDataSourceControl::Initialize
+7547 CDHtmlDialog::Initialize
+7548 CDialog::Initialize
+7549 CMenuImages::Initialize
+7550 CMenuTearOffManager::Initialize
+7551 CMFCColorMenuButton::Initialize
+7552 CMFCPopupMenu::Initialize
+7553 CMFCToolBarButton::Initialize
+7554 CMFCToolBarComboBoxButton::Initialize
+7555 CMFCToolBarDateTimeCtrl::Initialize
+7556 CMFCToolBarEditBoxButton::Initialize
+7557 CMFCToolBarImages::Initialize
+7558 CMFCToolBarMenuButton::Initialize
+7559 CMFCToolBarMenuButton::Initialize
+7560 CDocument::XInitializeWithStream::Initialize
+7561 CFontHolder::InitializeFont
+7562 COleControl::InitializeIIDs
+7563 CJumpList::InitializeList
+7564 CEditView::InitializeReplace
+7565 CDocTemplate::InitialUpdateFrame
+7566 CFrameWnd::InitialUpdateFrame
+7567 CSmartDockingStandaloneGuide::InitImages
+7568 COleControlModule::InitInstance
+7569 CWinApp::InitInstance
+7570 COleUILinkInfo::AddRef
+7571 CWinAppEx::InitKeyboardManager
+7572 delete
+7573 CMFCListCtrl::InitList
+7574 CMFCShellListCtrl::InitList
+7575 CDockContext::InitLoop
+7576 CMFCPopupMenu::InitMenuBar
+7577 CDialog::InitModalIndirect
+7578 CDialog::InitModalIndirect
+7579 CWinAppEx::InitMouseManager
+7580 CMFCPropertySheet::InitNavigationControl
+7581 COleControl::XPersistMemory::InitNew
+7582 COleControl::XPersistPropertyBag::InitNew
+7583 COleControl::XPersistStorage::InitNew
+7584 COleServerDoc::XPersistStorage::InitNew
+7585 COleControl::XPersistStreamInit::InitNew
+7586 CRecordset::InitRecord
+7587 CWinAppEx::InitShellManager
+7588 COleControl::InitStockEventMask
+7589 COleControl::InitStockPropMask
+7590 CSimpleException::InitString
+7591 CMFCButton::InitStyle
+7592 CWinAppEx::InitTooltipManager
+7593 CMFCShellTreeCtrl::InitTree
+7594 CFrameImpl::InitUserToolbars
+7595 COleControl::XOleInPlaceObject::InPlaceDeactivate
+7596 COleServerDoc::XOleInPlaceObject::InPlaceDeactivate
+7601 CDockBar::Insert
+7602 CMFCRibbonPanel::Insert
+7603 CObList::InsertAfter
+7604 CObList::InsertAfter
+7605 CStringList::InsertAfter
+7606 CStringList::InsertAfter
+7607 CByteArray::InsertAt
+7608 CByteArray::InsertAt
+7609 CDWordArray::InsertAt
+7610 CDWordArray::InsertAt
+7611 CObArray::InsertAt
+7612 CObArray::InsertAt
+7613 CObArray::InsertAt
+7614 CObArray::InsertAt
+7615 CStringArray::InsertAt
+7616 CStringArray::InsertAt
+7617 CStringArray::InsertAt
+7618 CDWordArray::InsertAt
+7619 CDWordArray::InsertAt
+7620 CWordArray::InsertAt
+7621 CWordArray::InsertAt
+7622 CObList::InsertBefore
+7623 CObList::InsertBefore
+7624 CStringList::InsertBefore
+7625 CStringList::InsertBefore
+7626 CMFCToolBar::InsertButton
+7627 CMFCToolBar::InsertButton
+7628 CListCtrl::InsertColumn
+7629 CDockingManager::InsertDockSite
+7630 CStringArray::InsertEmpty
+7631 CRichEditView::InsertFileAsObject
+7632 CComboBoxEx::InsertItem
+7633 CListCtrl::InsertItem
+7634 CMFCPopupMenu::InsertItem
+7635 CRichEditView::InsertItem
+7636 CTabCtrl::InsertItem
+7637 CTabCtrl::InsertItem
+7638 CTreeCtrl::InsertItem
+7639 COleFrameHook::XOleInPlaceFrame::InsertMenus
+7640 CArchiveStream::Clone
+7641 CBasePane::InsertPane
+7642 CDockingManager::InsertPane
+7643 CFrameWndEx::InsertPane
+7644 CMDIChildWndEx::InsertPane
+7645 CMDIFrameWndEx::InsertPane
+7646 CMultiPaneFrameWnd::InsertPane
+7647 COleCntrFrameWndEx::InsertPane
+7648 COleDocIPFrameWndEx::InsertPane
+7649 COleDocIPFrameWndEx::InsertPane
+7650 CPaneContainerManager::InsertPane
+7651 CPaneDivider::InsertPane
+7652 CMFCToolBar::InsertResetStateButton
+7653 CMFCPopupMenu::InsertSeparator
+7654 CMFCRibbonPanel::InsertSeparator
+7655 CMFCToolBar::InsertSeparator
+7656 CMFCToolBarFontSizeComboBox::InsertSize
+7657 CMFCBaseTabCtrl::InsertTab
+7658 CMFCBaseTabCtrl::InsertTab
+7659 CMFCOutlookBarPane::InternalAddButton
+7660 CMFCPropertySheet::InternalAddPage
+7661 COleControl::InternalGetFont
+7662 COleControl::InternalGetText
+7663 CCmdTarget::InternalQueryInterface
+7664 CCmdTarget::InternalRelease
+7665 CDC::IntersectClipRect
+7666 CDC::IntersectClipRect
+7667 CMFCToolBar::InvalidateButton
+7668 CCheckListBox::InvalidateCheck
+7669 COleControl::InvalidateControl
+7670 CMDIChildWndEx::InvalidateIconicBitmaps
+7671 CCheckListBox::InvalidateItem
+7672 CMFCStatusBar::InvalidatePaneContent
+7673 COleControlSite::XOleIPSite::InvalidateRect
+7674 COleControl::InvalidateRgn
+7675 COleControlSite::XOleIPSite::InvalidateRgn
+7676 CMFCBaseTabCtrl::InvalidateTab
+7677 CDHtmlControlSink::Invoke
+7678 CDHtmlElementEventSink::Invoke
+7679 CDHtmlEventSink::Invoke
+7680 COleDispatchImpl::Invoke
+7681 CUserTool::Invoke
+7682 CWnd::XAccessible::Invoke
+7683 COleControlSite::XAmbientProps::Invoke
+7684 COleControlSite::XEventSink::Invoke
+7685 CMFCCustomizeButton::InvokeCommand
+7687 COleControlSite::InvokeHelper
+7688 COleDispatchDriver::InvokeHelper
+7689 CWnd::InvokeHelper
+7690 COleControlSite::InvokeHelperV
+7691 COleDispatchDriver::InvokeHelperV
+7692 CMFCPopupMenuBar::InvokeMenuCommand
+7693 CUserToolsManager::InvokeTool
+7694 CArchiveStream::AddRef
+7695 CMFCRibbonPanelMenu::IsAlwaysClose
+7696 CAnimationController::IsAnimationInProgress
+7697 CMFCHeaderCtrl::IsAscending
+7698 CMFCRibbonGalleryIcon::IsAutoRepeatMode
+7699 CMFCRibbonSlider::IsAutoRepeatMode
+7700 COleUILinkInfo::AddRef
+7701 CArchiveStream::AddRef
+7702 CDockablePane::IsButtonEnabled
+7703 CPropertyPage::IsButtonEnabled
+7704 CMFCToolBar::IsButtonHighlighted
+7705 CMFCVisualManagerBitmapCache::IsCached
+7706 CDockablePane::IsChangeState
+7707 CMFCOutlookBarPane::IsChangeState
+7708 CPane::IsChangeState
+7709 CMFCToolBarsListCheckBox::IsCheckEnabled
+7710 CSplitterWnd::IsChildPane
+7711 CMFCRibbonPanel::IsCollapsed
+7712 CMFCBaseTabCtrl::IsColored
+7713 CMFCCustomizeMenuButton::IsCommandExist
+7714 CMFCToolBar::IsCommandRarelyUsed
+7715 COleServerItem::IsConnected
+7716 CPaneFrameWnd::IsCustModeAndNotFloatingToolbar
+7717 CFrameImpl::IsCustomizePane
+7718 CWnd::IsD2DSupportEnabled
+7719 COleDataObject::IsDataAvailable
+7720 COleControlSite::IsDefaultButton
+7721 CMFCVisualManagerWindows::IsDefaultWinXPPopupButton
+7722 CRuntimeClass::IsDerivedFrom
+7723 COccManager::IsDialogMessageA
+7724 CWnd::IsDialogMessageA
+7725 COleUILinkInfo::AddRef
+7726 COleLinkingDoc::XPersistFile::IsDirty
+7727 COleControl::XPersistMemory::IsDirty
+7728 COleControl::XPersistStorage::IsDirty
+7729 COleServerDoc::XPersistStorage::IsDirty
+7730 COleControl::XPersistStreamInit::IsDirty
+7731 COleControlContainer::IsDlgButtonChecked
+7732 CWnd::IsDlgButtonChecked
+7733 COleUILinkInfo::AddRef
+7734 CArchiveStream::AddRef
+7735 CBasePane::IsDocked
+7736 CBasePane::IsDocked
+7737 CArchiveStream::AddRef
+7738 CFileFind::IsDots
+7739 COleUILinkInfo::AddRef
+7740 CDockSite::IsDragMode
+7741 CMFCColorButton::IsDrawXPTheme
+7742 AFX_GLOBAL_DATA::IsDwmCompositionEnabled
+7745 CPaneContainer::IsEmpty
+7746 CPaneContainerManager::IsEmpty
+7747 CCheckListBox::IsEnabled
+7748 CDockingPanesRow::IsEnoughSpaceToMove
+7749 CDockingPanesRow::IsExclusiveRow
+7750 CMFCRibbonStatusBar::IsExtendedElement
+7751 COleUILinkInfo::AddRef
+7752 CRecordset::IsFieldDirty
+7753 CRecordset::IsFieldNull
+7754 CRecordset::IsFieldNullable
+7755 CRecordset::IsFieldNullable
+7756 CRecordset::IsFieldStatusDirty
+7757 CRecordset::IsFieldStatusNull
+7758 CFieldExchange::IsFieldType
+7759 CMFCRibbonGalleryIcon::IsFirst
+7760 CMFCToolBarButton::IsFirstInGroup
+7761 CControlBar::IsFloating
+7762 CArchiveStream::AddRef
+7763 COleUILinkInfo::AddRef
+7764 CMFCCmdUsageCount::IsFrequentlyUsedCmd
+7765 IsHelpKey
+7766 IsHelpKey
+7767 CMFCVisualManagerOffice2007::IsHighlightWholeMenuItem
+7768 CMFCVisualManagerWindows7::IsHighlightWholeMenuItem
+7769 CMFCAutoHideButton::IsHorizontal
+7770 CWinThread::IsIdleMessage
+7771 CDockablePane::IsInFloatingMultiPaneFrameWnd
+7772 CArchiveStream::AddRef
+7773 COleControl::IsInvokeAllowed
+7774 CRecordset::IsJoin
+7775 CMDIClientAreaWnd::IsKeepClientEdge
+7776 CKeyboardManager::IsKeyHandled
+7777 CKeyboardManager::IsKeyPrintable
+7778 CObject::IsKindOf
+7779 COccManager::IsLabelControl
+7780 COccManager::IsLabelControl
+7781 CMFCRibbonGalleryIcon::IsLast
+7782 CMFCToolBar::IsLastCommandFromButton
+7783 CMFCToolBarButton::IsLastInGroup
+7784 CDockSite::IsLastRow
+7785 CPane::IsLeftOf
+7786 CPaneContainer::IsLeftPane
+7787 CPaneContainer::IsLeftPaneContainer
+7788 CPaneContainer::IsLeftPartEmpty
+7789 COleObjectFactory::IsLicenseValid
+7790 CControlCreationInfo::IsManaged
+7791 CMFCMaskedEdit::IsMaskedChar
+7792 COccManager::IsMatchingMnemonic
+7793 COccManager::IsMatchingMnemonic
+7794 COleControlSite::IsMatchingMnemonic
+7795 CMDITabProxyWnd::IsMDIChildActive
+7796 CBasePane::IsMDITabbed
+7797 CMFCTabCtrl::IsMDITabGroup
+7798 CMDIClientAreaWnd::IsMemberOfMDITabGroup
+7799 CMFCRibbonBaseElement::IsMenuMode
+7800 CMFCOutlookBarTabCtrl::IsMode2003
+7801 CHtmlEditDoc::IsModified
+7802 COleClientItem::IsModified
+7803 COleControl::IsModified
+7804 CMFCRibbonBaseElement::IsDisabled
+7805 CRichEditDoc::IsModified
+7806 CMFCListCtrl::IsMultipleSort
+7807 CMFCToolBar::IsOneRowWithSibling
+7808 CRecordView::IsOnFirstRecord
+7809 CRecordView::IsOnLastRecord
+7810 CRecordset::IsOpen
+7811 CMFCVisualManagerOffice2007::IsOwnerDrawMenuCheck
+7812 CMFCVisualManagerWindows7::IsOwnerDrawMenuCheck
+7813 COlePropertyPage::XPropertyPage::IsPageDirty
+7814 CPaneContainer::IsPaneDividerHorz
+7815 CRecordset::IsParamStatusNull
+7816 CMFCPropertyGridProperty::IsParentExpanded
+7817 CBasePane::IsPointNearDockSite
+7818 CDockingManager::IsPointNearDockSite
+7819 CFrameWndEx::IsPointNearDockSite
+7820 CMDIChildWndEx::IsPointNearDockSite
+7821 CMDIFrameWndEx::IsPointNearDockSite
+7822 COleCntrFrameWndEx::IsPointNearDockSite
+7823 COleDocIPFrameWndEx::IsPointNearDockSite
+7824 COleDocIPFrameWndEx::IsPointNearDockSite
+7825 CFrameImpl::IsPrintPreview
+7826 CSmartDockingGroupGuide::IsPtIn
+7827 CSmartDockingStandaloneGuide::IsPtIn
+7828 CMFCOutlookBarTabCtrl::IsPtInTabArea
+7829 CMFCTabCtrl::IsPtInTabArea
+7830 CMFCMenuBar::IsPureMenuButton
+7831 CRecentDockSiteInfo::IsRecentLeftPane
+7832 CRecordset::IsRecordsetUpdatable
+7833 CDockSite::IsRectWithinDockSite
+7834 CMDIChildWndEx::IsRegisteredWithTaskbarTabs
+7835 CCmdTarget::IsResultExpected
+7836 CMFCVisualManagerOffice2007::IsRibbonPresent
+7837 CMFCVisualManagerOffice2007::IsRibbonPresent
+7838 CRichEditView::IsRichEditFormat
+7839 CPaneContainer::IsRightPartEmpty
+7840 CPaneFrameWnd::IsRollDown
+7841 CPaneFrameWnd::IsRollUp
+7842 CPaneContainerManager::IsRootPaneContainerVisible
+7843 COleLinkingDoc::XOleItemContainer::IsRunning
+7844 CMFCPopupMenu::IsScrollDnAvailable
+7845 CMFCRibbonPanelMenu::IsScrollDnAvailable
+7846 CMFCPopupMenu::IsScrollUpAvailable
+7847 CMFCRibbonPanelMenu::IsScrollUpAvailable
+7848 CDocument::IsSearchAndOrganizeHandler
+7849 CMFCPropertyGridProperty::IsSelected
+7850 CMFCBaseTabCtrl::GetTabsNum
+7851 CRichEditView::IsSelected
+7852 COleUILinkInfo::AddRef
+7853 CRecordset::IsSelectQueryUpdatable
+7854 CObject::IsSerializable
+7855 COleMessageFilter::IsSignificantMessage
+7856 CDHtmlDialog::IsSinkedElement
+7857 CRecordset::IsSQLUpdatable
+7858 CWinAppEx::IsStateExists
+7859 COleControl::IsSubclassedControl
+7860 CMFCControlContainer::IsSubclassedFeaturePackControl
+7861 CMFCPropertyGridProperty::IsSubItem
+7862 CRenderTarget::IsSupported
+7863 CBasePane::IsTabbed
+7864 CPane::IsTabbed
+7865 CMDIChildWndEx::IsTabbedMDIChild
+7866 CMFCBaseTabCtrl::IsTabDetachable
+7867 CMFCOutlookBarTabCtrl::IsTabDetachable
+7868 CMFCBaseTabCtrl::IsTabIconOnly
+7869 CTabbedPane::IsTabLocationBottom
+7870 CMFCBaseTabCtrl::IsTabVisible
+7871 CWinApp::IsTaskbarInteractionEnabled
+7872 CMDIChildWndEx::IsTaskbarTabsSupportEnabled
+7873 CMFCVisualManagerOffice2003::IsToolbarRoundShape
+7874 CWnd::IsTopParentActive
+7875 CWnd::IsTouchWindow
+7876 CFrameWnd::IsTracking
+7877 CDocObjectServer::XOleObject::IsUpToDate
+7878 COleUILinkInfo::AddRef
+7879 COleServerDoc::XOleObject::IsUpToDate
+7880 COleServerItem::XOleObject::IsUpToDate
+7881 CMFCToolBar::IsUserDefined
+7882 CFrameImpl::IsUserDefinedToolbar
+7883 CMFCPropertyGridProperty::IsValueChanged
+7884 CBasePane::IsVisible
+7885 CControlBar::IsVisible
+7886 CDockablePane::IsVisible
+7887 CPaneContainer::IsVisible
+7888 CMFCVisualManagerOffice2007::IsWindowActive
+7889 CMFCVisualManagerWindows7::IsWindowActive
+7890 COleControlSite::IsWindowEnabled
+7891 CWnd::IsWindowEnabled
+7892 COleControl::GetForeColor
+7893 CMFCRibbonCategory::IsWindows7Look
+7894 CMFCRibbonPanel::IsWindows7Look
+7895 CMFCVisualManagerWindows::IsWinXPThemeAvailable
+7896 CShellManager::ItemFromPath
+7897 CListBox::ItemFromPoint
+7898 CTreeCtrl::ItemHasChildren
+7899 CMFCRibbonPanel::JustifyElementsInColumn
+7900 COleControl::KeyDown
+7901 COleControl::KeyUp
+7902 CPaneFrameWnd::KillDockingTimer
+7903 CPaneFrameWnd::KillRollupTimer
+7904 CAsyncSocket::KillSocket
+7905 CToolBar::Layout
+7908 CRichEditCtrl::LineIndex
+7909 CRichEditCtrl::LineLength
+7910 CRichEditCtrl::LineScroll
+7911 CDC::LineTo
+7913 CBlobProperty::Load
+7914 CDialogTemplate::Load
+7915 CMFCRibbonInfoLoader::Load
+7916 CMFCRibbonInfoLoader::Load
+7917 CMFCToolBarImages::Load
+7918 CMFCToolBarImages::Load
+7919 COleControl::Load
+7920 CPngImage::Load
+7921 CPngImage::Load
+7922 CRuntimeClass::Load
+7923 COleLinkingDoc::XPersistFile::Load
+7924 COleControl::XPersistMemory::Load
+7925 COleControl::XPersistPropertyBag::Load
+7926 COleControl::XPersistStorage::Load
+7927 COleServerDoc::XPersistStorage::Load
+7928 COleControl::XPersistStreamInit::Load
+7929 CKeyboardManager::LoadAcceleratorState
+7930 CMFCColorPropertySheet::LoadAcceleratorTable
+7931 CFrameWnd::LoadAccelTable
+7932 CWinApp::LoadAppLangResourceDLL
+7933 CFrameWnd::LoadBarState
+7934 CMFCToolBar::LoadBitmapA
+7935 CToolBar::LoadBitmapA
+7936 CMFCToolBar::LoadBitmapEx
+7937 CBitmapButton::LoadBitmaps
+7938 CUserTool::LoadDefaultIcon
+7939 CFrameImpl::LoadDockState
+7940 CDocument::LoadDocumentFromStream
+7941 CRecordset::LoadFields
+7942 CFrameWnd::LoadFrame
+7943 CFrameWndEx::LoadFrame
+7944 CMDIChildWnd::LoadFrame
+7945 CMDIFrameWnd::LoadFrame
+7946 CMDIFrameWndEx::LoadFrame
+7947 COleDocIPFrameWndEx::LoadFrame
+7948 COleIPFrameWnd::LoadFrame
+7949 COleDocIPFrameWndEx::LoadFrame
+7950 CMFCRibbonBar::LoadFromBuffer
+7951 CMFCRibbonInfoLoader::LoadFromBuffer
+7952 CMFCRibbonInfoLoader::LoadFromBuffer
+7953 CPngImage::LoadFromBuffer
+7954 CPngImage::LoadFromFile
+7955 CTagManager::LoadFromFile
+7956 CMFCPopupMenuBar::LoadFromHash
+7957 CDHtmlDialog::LoadFromResource
+7958 CDHtmlDialog::LoadFromResource
+7959 CHtmlView::LoadFromResource
+7960 CHtmlView::LoadFromResource
+7961 CMFCRibbonBar::LoadFromResource
+7962 CMFCRibbonBar::LoadFromResource
+7963 CTagManager::LoadFromResource
+7964 CTagManager::LoadFromResource
+7965 COleDocument::LoadFromStorage
+7966 CMFCRibbonInfoLoader::LoadImageA
+7967 CMFCRibbonInfoLoader::LoadImageA
+7968 CFrameImpl::LoadLargeIconsState
+7969 CMFCToolBar::LoadLargeIconsState
+7970 CMFCToolBar::LoadLastOriginalState
+7971 CMDIFrameWndEx::LoadMDIState
+7972 CMenuHash::LoadMenuBar
+7973 CMFCToolBar::LoadParameters
+7974 CMFCReBarState::LoadRebarStateProc
+7975 CMFCToolBar::LoadResetOriginalState
+7976 CBaseTabbedPane::LoadSiblingPaneIDs
+7977 CBasePane::LoadState
+7978 CBaseTabbedPane::LoadState
+7979 CCommandManager::LoadState
+7980 CContextMenuManager::LoadState
+7981 CControlBarInfo::LoadState
+7982 CDockablePane::LoadState
+7983 CDockablePaneAdapter::LoadState
+7984 CDockingManager::LoadState
+7985 CDockState::LoadState
+7986 CKeyboardManager::LoadState
+7987 CMDIClientAreaWnd::LoadState
+7988 CMFCMenuBar::LoadState
+7989 CMFCOutlookBar::LoadState
+7990 CMFCReBarState::LoadState
+7991 CMFCRibbonBar::LoadState
+7992 CMFCRibbonStatusBar::LoadState
+7993 CMFCTasksPane::LoadState
+7994 CMFCToolBar::LoadState
+7995 CMouseManager::LoadState
+7996 CMultiPaneFrameWnd::LoadState
+7997 COleControl::LoadState
+7998 CPane::LoadState
+7999 CPaneFrameWnd::LoadState
+8000 CUserToolsManager::LoadState
+8001 CWinAppEx::LoadState
+8002 CWinAppEx::LoadState
+8003 CWinAppEx::LoadState
+8004 CWinAppEx::LoadState
+8005 CWinApp::LoadStdProfileSettings
+8006 CMFCToolBarImages::LoadStr
+8013 CWinApp::LoadSysPolicies
+8014 CPaneContainer::LoadTabbedPane
+8015 CFrameImpl::LoadTearOffMenus
+8016 CDocTemplate::LoadTemplate
+8017 CMultiDocTemplate::LoadTemplate
+8018 CMFCToolBar::LoadToolBar
+8019 CToolBar::LoadToolBar
+8020 CMFCToolBar::LoadToolBarEx
+8021 CFrameImpl::LoadUserToolbars
+8022 CWinAppEx::LoadWindowPlacement
+8023 CMultiLock::Lock
+8024 COleSafeArray::Lock
+8025 CSingleLock::Lock
+8026 CSyncObject::Lock
+8027 CTypeLibCache::Lock
+8030 CEditView::LockBuffer
+8031 CArchiveStream::Clone
+8032 COleLinkingDoc::XOleItemContainer::LockContainer
+8033 CMFCShellListCtrl::LockCurrentFolder
+8034 COleLinkingDoc::LockExternal
+8035 COleControl::LockInPlaceActive
+8036 CArchiveStream::Clone
+8037 CFile::LockRange
+8038 CSocketFile::Abort
+8039 CSocketFile::Abort
+8040 COleStreamFile::LockRange
+8041 CSocketFile::Abort
+8042 CSocketFile::Abort
+8043 CArchiveStream::Clone
+8044 CWnd::LockRenderTarget
+8045 COleObjectFactory::XClassFactory::LockServer
+8046 CVSListBoxEditCtrl::LockSize
+8047 CDockingManager::LockUpdate
+8048 CMapPtrToPtr::Lookup
+8049 CMapPtrToWord::Lookup
+8050 CMapStringToOb::Lookup
+8051 CMapStringToOb::Lookup
+8052 CMapStringToString::Lookup
+8053 CMapWordToOb::Lookup
+8054 CMapWordToOb::Lookup
+8055 COleDataSource::Lookup
+8056 CTypeLibCache::Lookup
+8057 CAsyncSocket::LookupHandle
+8058 CRichEditDoc::LookupItem
+8059 CMapStringToOb::LookupKey
+8060 CMapStringToOb::LookupKey
+8061 CMapStringToString::LookupKey
+8062 CTypeLibCache::LookupTypeInfo
+8063 CDC::LPtoDP
+8064 CDC::LPtoHIMETRIC
+8065 CMFCColorPickerCtrl::LumFromPoint
+8254 CMFCRibbonPanel::MakeGalleryItemVisible
+8257 CFileDialog::MakeProminent
+8258 CMFCVisualManagerOffice2007::MakeResourceID
+8259 CMFCVisualManagerWindows7::MakeResourceID
+8264 CMFCToolBarImages::MapBmpTo3dColors
+8265 CMFCToolBarImages::MapFromSysColor
+8266 CArchive::MapObject
+8267 COleControl::XPerPropertyBrowsing::MapPropertyToPage
+8268 COleDialog::MapResult
+8269 CMFCToolBarImages::MapTo3dColors
+8270 CMFCToolBarImages::MapToSysColor
+8271 CMFCToolBarImages::MapToSysColorAlpha
+8272 CPropertyPage::MapWizardResult
+8273 CRecordset::MarkForAddNew
+8274 CRecordset::MarkForUpdate
+8275 CRichEditDoc::MarkItemsClear
+8276 CMFCPropertyGridCtrl::MarkModifiedProperties
+8277 CDocTemplate::MatchDocType
+8278 CFileFind::MatchesMask
+8279 CMDIFrameWnd::MDIGetActive
+8280 CMFCWindowsManagerDialog::MDIMessage
+8281 CMDIClientAreaWnd::MDITabMoveToNextGroup
+8282 CMDIClientAreaWnd::MDITabNewGroup
+8283 delete
+8284 CChevronOwnerDrawMenu::MeasureItem
+8285 delete
+8286 delete
+8287 delete
+8288 CMFCFontComboBox::MeasureItem
+8290 CMFCRibbonCommandsListBox::MeasureItem
+8291 CMFCToolBarsCommandsListBox::MeasureItem
+8292 CCmdTarget::MemberIDFromName
+8293 CMemFile::Memcpy
+8294 COlePropertyPage::MessageBoxA
+8295 CWnd::MessageBoxA
+8296 COleMessageFilter::XMessageFilter::MessagePending
+8301 CMFCControlRenderer::Mirror
+8302 CMFCToolBarImages::Mirror
+8303 CPreviewDC::MirrorAttributes
+8304 CMFCToolBarImages::MirrorBitmap
+8305 CMFCToolBarImages::MirrorBitmapVert
+8306 CPreviewDC::MirrorFont
+8307 CPreviewDC::MirrorMappingMode
+8308 CDrawingManager::MirrorRect
+8309 CMFCToolBarImages::MirrorVert
+8310 CPreviewDC::MirrorViewportOrg
+8311 CGestureConfig::Modify
+8312 CMFCVisualManagerOffice2003::ModifyGlobalColors
+8313 COleControlSite::ModifyStyle
+8314 CWnd::ModifyStyle
+8315 CWnd::ModifyStyle
+8316 COleControlSite::ModifyStyleEx
+8317 CWnd::ModifyStyleEx
+8318 CWnd::ModifyStyleEx
+8319 CMFCTabCtrl::ModifyTabStyle
+8320 CDC::ModifyWorldTransform
+8321 CMFCRibbonMainPanel::MouseButtonDown
+8322 CMFCRibbonPanel::MouseButtonDown
+8323 CMFCRibbonPanel::MouseButtonUp
+8324 CDockContext::Move
+8325 CDockingPanesRow::Move
+8326 CMFCAutoHideButton::Move
+8327 CPaneContainer::Move
+8328 CPaneDivider::Move
+8329 CRecordset::Move
+8330 COlePropertyPage::XPropertyPage::Move
+8331 CPane::MoveByAlignment
+8332 CSmartDockingManager::MoveCentralGroup
+8333 CMFCDragFrameImpl::MoveDragFrame
+8334 CPaneFrameWnd::MoveDragFrame
+8335 CMFCRibbonCustomizePropertyPage::MoveItem
+8336 COutlookOptionsDlg::MoveItem
+8337 CPaneFrameWnd::MoveMiniFrame
+8338 CDockingPanesRow::MovePane
+8339 CDockingPanesRow::MovePane
+8340 CDockingPanesRow::MovePane
+8341 CDockingPanesRow::MovePane
+8342 CDockSite::MovePane
+8343 CPane::MovePane
+8344 CDockingPanesRow::MovePaneRect
+8345 CMFCBaseTabCtrl::MoveTab
+8346 CMFCTabCtrl::MoveTab
+8347 CDC::MoveTo
+8348 CUserToolsManager::MoveToolDown
+8349 CUserToolsManager::MoveToolUp
+8350 CDockingPanesRow::MoveTrailingPanes
+8351 CBasePane::MoveWindow
+8352 COleControlSite::MoveWindow
+8353 CWnd::MoveWindow
+8354 CMDIClientAreaWnd::MoveWindowToTabGroup
+8355 CPaneContainer::MoveWnd
+8356 CDHtmlDialog::Navigate
+8357 CHtmlView::Navigate
+8358 CHtmlView::Navigate2
+8359 CHtmlView::Navigate2
+8360 CHtmlView::Navigate2
+8361 CHtmlView::NavigateComplete2
+8362 CHtmlView::NavigateError
+8363 CMFCRibbonBar::NavigateRibbon
+8366 CFrameWnd::NegotiateBorderSpace
+8367 CFrameWndEx::NegotiateBorderSpace
+8368 CMDIFrameWndEx::NegotiateBorderSpace
+8369 CMapPtrToPtr::NewAssoc
+8370 CMapPtrToWord::NewAssoc
+8371 CMapStringToOb::NewAssoc
+8372 CMapStringToOb::NewAssoc
+8373 CMapStringToString::NewAssoc
+8374 CMapWordToOb::NewAssoc
+8375 CMapWordToOb::NewAssoc
+8376 CObList::NewNode
+8377 CObList::NewNode
+8378 CStringList::NewNode
+8379 CEnumArray::XEnumVOID::Next
+8380 CMFCToolBar::NextMenu
+8382 CMFCRibbonCategory::NormalizeFloatingRect
+8383 CRectTracker::NormalizeHit
+8384 CDataBoundProperty::Notify
+8385 CPaneDivider::NotifyAboutRelease
+8386 CMFCPropertyGridCtrl::NotifyAccessibility
+8388 COleServerDoc::NotifyAllItems
+8389 COleServerItem::NotifyClient
+8390 CMFCRibbonBaseElement::NotifyCommand
+8391 CMFCRibbonSlider::NotifyCommand
+8392 CMFCToolBarComboBoxButton::NotifyCommand
+8393 CMFCToolBarDateTimeCtrl::NotifyCommand
+8394 CMFCToolBarEditBoxButton::NotifyCommand
+8395 COleUILinkInfo::AddRef
+8396 CMFCRibbonCategory::NotifyControlCommand
+8397 CMFCRibbonPanel::NotifyControlCommand
+8398 CMFCToolBar::NotifyControlCommand
+8399 CFrameWnd::NotifyFloatingWindows
+8400 CMFCRibbonBaseElement::NotifyHighlightListItem
+8401 CMFCRibbonColorButton::NotifyHighlightListItem
+8402 CMFCRibbonUndoButton::NotifyHighlightListItem
+8403 CPaneContainerManager::NotifyPaneDivider
+8404 CMFCColorPickerCtrl::NotifyParent
+8405 CMFCPopupMenu::NotifyParentDlg
+8406 COleServerDoc::NotifyRename
+8412 CDC::OffsetClipRgn
+8413 CDC::OffsetClipRgn
+8414 CDockingPanesRow::OffsetFromRect
+8415 CDockablePane::OffsetRectForSliding
+8416 CDC::OffsetViewportOrg
+8417 CMetaFileDC::OffsetViewportOrg
+8418 CPreviewDC::OffsetViewportOrg
+8419 CDC::OffsetWindowOrg
+8420 COleControlSite::XNotifyDBEvents::OKToDo
+8421 CMFCRibbonBaseElement::OnAccDefaultAction
+8422 CMFCRibbonButton::OnAccDefaultAction
+8423 CMFCRibbonTab::OnAccDefaultAction
+8424 delete
+8425 CControlFrameWnd::OnActivate
+8426 CDialogEx::OnActivate
+8427 CDialogImpl::OnActivate
+8428 CFrameWnd::OnActivate
+8429 CFrameWndEx::OnActivate
+8430 CMDIFrameWndEx::OnActivate
+8431 CMDITabProxyWnd::OnActivate
+8432 CMFCPropertyPage::OnActivate
+8433 CMFCWindowsManagerDialog::OnActivate
+8434 COleClientItem::OnActivate
+8435 COleDocIPFrameWndEx::OnActivate
+8436 COleFrameHook::OnActivate
+8437 COleIPFrameWndEx::OnActivate
+8438 CFrameImpl::OnActivateApp
+8439 CFrameWndEx::OnActivateApp
+8440 CMDIFrameWndEx::OnActivateApp
+8441 CMFCDropDownFrame::OnActivateApp
+8442 CMFCPopupMenu::OnActivateApp
+8443 delete
+8444 CMFCPropertyGridProperty::OnActivateByTab
+8445 CDockingManager::OnActivateFrame
+8446 CFormView::OnActivateFrame
+8447 delete
+8448 COleControl::OnActivateInPlace
+8449 CMFCPropertySheet::OnActivatePage
+8450 CFrameWnd::OnActivateTopLevel
+8451 CWnd::OnActivateTopLevel
+8452 COleClientItem::OnActivateUI
+8453 CDocObjectServer::OnActivateView
+8454 CFormView::OnActivateView
+8455 CPreviewView::OnActivateView
+8456 CRichEditView::OnActivateView
+8457 CView::OnActivateView
+8458 CMDIClientAreaWnd::OnActiveTabChanged
+8459 CMFCRibbonCustomizePropertyPage::OnAdd
+8460 CMFCToolBarButtonCustomizeDialog::OnAddImage
+8461 CMFCToolBarComboBoxButton::OnAddToCustomizePage
+8462 CMFCToolBarComboBoxButton::OnAddToCustomizePage
+8463 CMFCToolBarComboBoxButton::OnAddToCustomizePage
+8464 CToolTipCtrl::OnAddTool
+8465 CMFCRibbonBaseElement::OnAddToQAToolbar
+8466 CMFCRibbonGalleryIcon::OnAddToQAToolbar
+8467 delete
+8468 COleControl::XEventConnPt::OnAdvise
+8469 CMFCPropertySheet::OnAfterActivatePage
+8470 CVSToolsListBox::OnAfterAddItem
+8471 CMFCPopupMenuBar::OnAfterButtonDelete
+8472 CMFCToolBar::OnAfterButtonDelete
+8473 CDockablePane::OnAfterChangeParent
+8474 delete
+8475 CPane::OnAfterChangeParent
+8476 CMFCRibbonBaseElement::OnAfterChangeRect
+8477 CMFCRibbonButton::OnAfterChangeRect
+8478 CMFCRibbonButtonsGroup::OnAfterChangeRect
+8479 CMFCRibbonComboBox::OnAfterChangeRect
+8480 CMFCRibbonEdit::OnAfterChangeRect
+8481 CMFCRibbonGallery::OnAfterChangeRect
+8482 CMFCRibbonBaseElement::OnAfterChangeRect
+8483 CMFCRibbonPanel::OnAfterChangeRect
+8484 CMFCRibbonQuickAccessToolBar::OnAfterChangeRect
+8485 CMFCRibbonRecentFilesList::OnAfterChangeRect
+8486 CMFCRibbonSlider::OnAfterChangeRect
+8487 CMFCToolBarSystemMenuButton::OnAfterCreatePopupMenu
+8488 CDockablePane::OnAfterDock
+8489 CMFCToolBar::OnAfterDock
+8490 CMFCToolBar::OnAfterFloat
+8491 CPane::OnAfterFloat
+8492 CVSToolsListBox::OnAfterMoveItemDown
+8493 CVSToolsListBox::OnAfterMoveItemUp
+8494 CVSToolsListBox::OnAfterRenameItem
+8495 CAnimationController::CleanUpGroup
+8496 CMFCBaseToolBar::OnAfterStretch
+8497 CMDIFrameWndEx::OnAfterTaskbarActivate
+8498 CMFCEditBrowseCtrl::OnAfterUpdate
+8499 CWnd::OnAmbientProperty
+8500 delete
+8501 COleControl::XOleControl::OnAmbientPropertyChange
+8502 delete
+8503 CAnimationController::OnAnimationManagerStatusChanged
+8504 CAnimationController::OnAnimationTimerPostUpdate
+8505 delete
+8506 delete
+8507 delete
+8508 CWinAppEx::OnAppContextHelp
+8509 COleControl::OnAppearanceChanged
+8510 CWinApp::OnAppExit
+8511 CPropertyPage::OnApply
+8512 COleUILinkInfo::AddRef
+8513 delete
+8514 CMFCToolBarsToolsPropertyPage::OnArgumentsOptions
+8515 CMFCRibbonKeyboardCustomizeDialog::OnAssign
+8516 CMFCToolBarsKeyboardPropertyPage::OnAssign
+8517 CMFCRibbonGalleryIcon::OnAutoRepeat
+8518 CMFCRibbonSlider::OnAutoRepeat
+8519 CRibbonCategoryScroll::OnAutoRepeat
+8520 CMFCTasksPane::OnBack
+8521 COleControl::OnAppearanceChanged
+8522 CFrameWnd::OnBarCheck
+8523 COleIPFrameWnd::OnBarCheck
+8524 delete
+8525 CStatusBar::OnBarStyleChange
+8526 CToolBar::OnBarStyleChange
+8527 delete
+8528 CDockablePane::OnBeforeChangeParent
+8529 CMFCToolBar::OnBeforeChangeParent
+8530 CPane::OnBeforeChangeParent
+8531 CPane::OnBeforeDock
+8532 CPaneFrameWnd::OnBeforeDock
+8533 CMFCToolBarMenuButton::OnBeforeDrag
+8534 CDockablePane::OnBeforeFloat
+8535 CMFCOutlookBarPane::OnBeforeFloat
+8536 CArchiveStream::AddRef
+8537 CDHtmlDialog::OnBeforeNavigate
+8538 CHtmlView::OnBeforeNavigate2
+8539 CMFCRibbonBar::OnBeforeProcessKey
+8540 CVSToolsListBox::OnBeforeRemoveItem
+8541 CMFCToolBarDropSource::OnBeginDrag
+8542 COleDropSource::OnBeginDrag
+8543 CEditView::OnBeginPrinting
+8544 CRichEditView::OnBeginPrinting
+8545 delete
+8546 COleControl::OnAppearanceChanged
+8547 CMFCEditBrowseCtrl::OnBrowse
+8548 CMFCToolBarsToolsPropertyPage::OnBrowseCommand
+8549 CRichEditView::OnBullet
+8550 COleMessageFilter::OnBusyDialog
+8551 delete
+8552 CFileDialog::XFileDialogControlEvents::OnButtonClicked
+8553 COleControl::OnButtonDblClk
+8554 COleControl::OnButtonDown
+8555 COleControl::OnButtonUp
+8556 CMFCPopupMenuBar::OnCalcSeparatorRect
+8557 CMFCToolBar::OnCalcSeparatorRect
+8558 CMFCRibbonButton::OnCalcTextSize
+8559 CMFCRibbonLabel::OnCalcTextSize
+8560 CMFCRibbonStatusBarPane::OnCalcTextSize
+8561 CMFCCustomizeButton::OnCalculateSize
+8562 CMFCCustomizeMenuButton::OnCalculateSize
+8563 CMFCDropDownToolbarButton::OnCalculateSize
+8564 CMFCOutlookBarPaneButton::OnCalculateSize
+8565 CMFCShowAllButton::OnCalculateSize
+8566 CMFCToolBarButton::OnCalculateSize
+8567 CMFCToolBarComboBoxButton::OnCalculateSize
+8568 CMFCToolBarDateTimeCtrl::OnCalculateSize
+8569 CMFCToolBarEditBoxButton::OnCalculateSize
+8570 CMFCToolBarMenuButton::OnCalculateSize
+8571 CMFCToolBarMenuButtonsButton::OnCalculateSize
+8572 CMFCToolBarSystemMenuButton::OnCalculateSize
+8573 CListBox::CharToItem
+8574 CDialog::OnCancel
+8575 CMFCTasksPane::OnCancel
+8576 delete
+8577 CRichEditView::OnCancelEditCntr
+8578 CDockablePane::OnCancelMode
+8579 CMFCBaseTabCtrl::OnCancelMode
+8580 CMFCButton::OnCancelMode
+8581 CListBox::CharToItem
+8582 CMFCCustomizeButton::OnCancelMode
+8583 CMFCDesktopAlertWnd::OnCancelMode
+8584 CMFCDropDownToolbarButton::OnCancelMode
+8585 CMFCEditBrowseCtrl::OnCancelMode
+8586 CMFCHeaderCtrl::OnCancelMode
+8587 CMFCImagePaintArea::OnCancelMode
+8588 CMFCOutlookBarTabCtrl::OnCancelMode
+8589 CMFCPropertyGridCtrl::OnCancelMode
+8590 CMFCRibbonBar::OnCancelMode
+8591 CMFCRibbonCategory::OnCancelMode
+8592 CMFCSpinButtonCtrl::OnCancelMode
+8593 CMFCTabCtrl::OnCancelMode
+8594 CMFCTasksPane::OnCancelMode
+8595 CMFCToolBar::OnCancelMode
+8596 CMFCToolBarMenuButton::OnCancelMode
+8597 CMFCToolBarSystemMenuButton::OnCancelMode
+8598 COleControl::OnCancelMode
+8599 CPane::OnCancelMode
+8600 CPaneDivider::OnCancelMode
+8601 CPaneFrameWnd::OnCancelMode
+8602 CSplitterWnd::OnCancelMode
+8603 CMDIClientAreaWnd::OnCancelTabMove
+8604 CPaneFrameWnd::OnCapture
+8605 CMFCWindowsManagerDialog::OnCascade
+8606 CMFCRibbonRichEditCtrl::OnChange
+8607 CMFCToolBarComboBoxEdit::OnChange
+8608 COleClientItem::OnChange
+8609 CBaseTabbedPane::OnChangeActiveTab
+8610 CTabView::OnChangeActiveTab
+8611 COleControl::XFontNotification::OnChanged
+8612 COleControlSite::XPropertyNotifySink::OnChanged
+8613 COlePropertyPage::XPropNotifySink::OnChanged
+8614 delete
+8615 CDocument::OnChangedViewList
+8616 CMFCRibbonPanelMenuBar::OnChangeHighlighted
+8617 CMFCColorBar::OnChangeHot
+8618 CMFCDropDownListBox::OnChangeHot
+8619 CMFCMenuBar::OnChangeHot
+8620 CMFCPopupMenuBar::OnChangeHot
+8621 CMFCToolBar::OnChangeHot
+8622 COleClientItem::OnChangeItemPosition
+8623 COleUILinkInfo::AddRef
+8624 CMFCEditBrowseCtrl::OnChangeLayout
+8625 CMFCColorMenuButton::OnChangeParentWnd
+8626 CMFCCustomizeButton::OnChangeParentWnd
+8627 CMFCDropDownToolbarButton::OnChangeParentWnd
+8628 CMFCOutlookBarPaneButton::OnChangeParentWnd
+8629 CMFCToolBarButton::OnChangeParentWnd
+8630 CMFCToolBarComboBoxButton::OnChangeParentWnd
+8631 CMFCToolBarDateTimeCtrl::OnChangeParentWnd
+8632 CMFCToolBarEditBoxButton::OnChangeParentWnd
+8633 CMFCToolBarMenuButton::OnChangeParentWnd
+8634 CMFCToolBarsCommandsPropertyPage::OnChangeSelButton
+8635 CMFCOutlookBarTabCtrl::OnChangeTabs
+8636 CFrameImpl::OnChangeVisualManager
+8637 CFrameWndEx::OnChangeVisualManager
+8638 CMDIChildWndEx::OnChangeVisualManager
+8639 CMDIFrameWndEx::OnChangeVisualManager
+8640 CMFCToolBar::OnChangeVisualManager
+8641 CMFCMaskedEdit::OnChar
+8642 CMFCPropertyGridCtrl::OnChar
+8643 COleControl::OnChar
+8644 CPane::OnChar
+8645 CPaneFrameWnd::OnChar
+8646 CMFCMaskedEdit::OnCharBackspace
+8647 CRichEditView::OnCharBold
+8648 CMFCMaskedEdit::OnCharDelete
+8649 CRichEditView::OnCharEffect
+8650 CRichEditView::OnCharItalic
+8651 CMFCMaskedEdit::OnCharPrintchar
+8652 CWnd::OnCharToItem
+8653 CRichEditView::OnCharUnderline
+8654 delete
+8655 CFileDialog::XFileDialogControlEvents::OnCheckButtonToggled
+8656 CMultiPaneFrameWnd::OnCheckEmptyState
+8657 CPaneFrameWnd::OnCheckEmptyState
+8658 CPaneFrameWnd::OnCheckRollState
+8659 CFrameWnd::OnChevronPushed
+8660 CButton::OnChildNotify
+8661 CCheckListBox::OnChildNotify
+8662 CComboBox::OnChildNotify
+8663 CDragListBox::OnChildNotify
+8664 CHeaderCtrl::OnChildNotify
+8665 CListBox::OnChildNotify
+8666 CListCtrl::OnChildNotify
+8667 CListView::OnChildNotify
+8668 CMFCShellTreeCtrl::OnChildNotify
+8669 CButton::OnChildNotify
+8670 CStatusBar::OnChildNotify
+8671 CListCtrl::OnChildNotify
+8672 CHeaderCtrl::OnChildNotify
+8673 CWnd::OnChildNotify
+8674 CMFCDropDownListBox::OnChooseItem
+8676 CMFCDropDownToolbarButton::OnClick
+8677 CMFCRibbonButton::OnClick
+8678 CMFCRibbonGalleryIcon::OnClick
+8679 CMFCRibbonLaunchButton::OnClick
+8680 CMFCRibbonUndoButton::OnClick
+8681 CMFCShowAllButton::OnClick
+8682 CMFCToolBarComboBoxButton::OnClick
+8683 CMFCToolBarDateTimeCtrl::OnClick
+8684 CMFCToolBarEditBoxButton::OnClick
+8685 CMFCToolBarMenuButton::OnClick
+8686 COleControl::OnClick
+8687 CMFCPropertyGridColorProperty::OnClickButton
+8688 CMFCPropertyGridCtrl::OnClickButton
+8689 CMFCPropertyGridFileProperty::OnClickButton
+8690 CMFCPropertyGridFontProperty::OnClickButton
+8691 CMFCPropertyGridProperty::OnClickButton
+8692 CMFCRibbonBar::OnClickButton
+8693 CMFCRibbonPanelMenuBar::OnClickButton
+8694 CVSListBoxBase::OnClickButton
+8695 CMFCLinkCtrl::OnClicked
+8696 CMFCCustomizeMenuButton::OnClickMenuItem
+8697 CMFCRibbonColorButton::OnClickPaletteIcon
+8698 CMFCRibbonGallery::OnClickPaletteIcon
+8699 CMFCRibbonColorButton::OnClickPaletteSubItem
+8700 CMFCRibbonUndoButton::OnClickPaletteSubItem
+8702 CMFCDropDownToolbarButton::OnClickUp
+8703 CMFCPropertyGridProperty::OnClickValue
+8704 CEnumArray::OnClone
+8705 CEnumConnections::OnClone
+8706 delete
+8707 CControlFrameWnd::OnClose
+8708 CDockablePane::OnClose
+8709 CFrameWnd::OnClose
+8710 CFrameWndEx::OnClose
+8711 CMDIFrameWndEx::OnClose
+8712 CMDITabProxyWnd::OnClose
+8713 CMFCDesktopAlertWnd::OnClose
+8714 CMFCTasksPane::OnClose
+8715 CMFCToolBarsCustomizeDialog::OnClose
+8716 CMFCWindowsManagerDialog::OnClose
+8717 CMiniDockFrameWnd::OnClose
+8718 COleControl::OnClose
+8719 COleDocIPFrameWndEx::OnClose
+8720 COleDocIPFrameWndEx::OnClose
+8721 COleServerDoc::OnClose
+8722 CPaneFrameWnd::OnClose
+8723 CPropertySheet::OnClose
+8724 delete
+8725 delete
+8726 delete
+8727 COleClientItem::XAdviseSink::OnClose
+8728 CMFCPropertyGridCtrl::OnCloseCombo
+8729 CMFCPropertyGridProperty::OnCloseCombo
+8730 CDocObjectServer::OnCloseDocument
+8731 CDocument::OnCloseDocument
+8732 COleDocument::OnCloseDocument
+8733 COleLinkingDoc::OnCloseDocument
+8734 COleServerDoc::OnCloseDocument
+8735 CFrameImpl::OnCloseFrame
+8736 CPaneFrameWnd::OnCloseMiniFrame
+8737 CDockingManager::OnClosePopupMenu
+8738 CFrameWndEx::OnClosePopupMenu
+8739 CMDIFrameWndEx::OnClosePopupMenu
+8740 COleDocIPFrameWndEx::OnClosePopupMenu
+8741 COleDocIPFrameWndEx::OnClosePopupMenu
+8742 CWinAppEx::OnClosingMainFrame
+8743 CCmdTarget::OnCmdMsg
+8744 CDialog::OnCmdMsg
+8745 CDocTemplate::OnCmdMsg
+8746 CDocument::OnCmdMsg
+8747 CFrameWnd::OnCmdMsg
+8748 CFrameWndEx::OnCmdMsg
+8749 CHtmlEditView::OnCmdMsg
+8750 CMDIFrameWnd::OnCmdMsg
+8751 CMDIFrameWndEx::OnCmdMsg
+8752 CMFCPopupMenu::OnCmdMsg
+8753 COleCntrFrameWnd::OnCmdMsg
+8754 COleDocIPFrameWndEx::OnCmdMsg
+8755 COleDocObjectItem::OnCmdMsg
+8756 COleDocument::OnCmdMsg
+8757 COleDocIPFrameWndEx::OnCmdMsg
+8758 COleTemplateServer::OnCmdMsg
+8759 CDialog::OnCmdMsg
+8760 CView::OnCmdMsg
+8761 CRichEditView::OnColorDefault
+8762 COleUILinkInfo::AddRef
+8763 CRichEditView::OnColorPick
+8764 CMFCImageEditorDialog::OnColors
+8765 CMFCColorDialog::OnColorSelect
+8766 CMFCCustomColorsPropertyPage::OnColour
+8767 CMFCListCtrl::OnColumnClick
+8768 CMFCPropertyGridCtrl::OnComboKillFocus
+8769 CDialogEx::OnCommand
+8770 CDialogImpl::OnCommand
+8771 CFrameWnd::OnCommand
+8772 CFrameWndEx::OnCommand
+8773 CMDIFrameWnd::OnCommand
+8774 CMDIFrameWndEx::OnCommand
+8775 CMFCDesktopAlertDialog::OnCommand
+8776 CMFCDesktopAlertWnd::OnCommand
+8777 CMFCOutlookBarTabCtrl::OnCommand
+8778 CDialogEx::OnCommand
+8779 CMFCRibbonBar::OnCommand
+8780 CMFCTabCtrl::OnCommand
+8781 CMFCToolBar::OnCommand
+8782 CMFCToolBarsCustomizeDialog::OnCommand
+8783 CMFCToolBarsListPropertyPage::OnCommand
+8784 COleDocIPFrameWndEx::OnCommand
+8785 COleDocIPFrameWndEx::OnCommand
+8786 COlePropertyPage::OnCommand
+8787 CPropertySheet::OnCommand
+8788 CSplitterWnd::OnCommand
+8789 CVSListBoxBase::OnCommand
+8790 CWnd::OnCommand
+8791 CDialog::OnCommandHelp
+8792 CFrameWnd::OnCommandHelp
+8793 CMDIFrameWnd::OnCommandHelp
+8794 CPropertySheet::OnCommandHelp
+8795 delete
+8796 CWnd::OnCompareItem
+8797 COleUILinkInfo::AddRef
+8798 CMFCShellListCtrl::OnCompareItems
+8799 CFrameImpl::OnCompositionChanged
+8800 CFrameWndEx::OnCompositionChanged
+8801 CMDIFrameWndEx::OnCompositionChanged
+8802 delete
+8803 CFrameWnd::OnContextHelp
+8804 CFrameWndEx::OnContextHelp
+8805 CMDIFrameWndEx::OnContextHelp
+8806 COleDocIPFrameWndEx::OnContextHelp
+8807 COleFrameHook::OnContextHelp
+8808 COleIPFrameWnd::OnContextHelp
+8809 COleIPFrameWndEx::OnContextHelp
+8810 CWinApp::OnContextHelp
+8811 CDockablePane::OnContextMenu
+8812 CDockSite::OnContextMenu
+8813 CMDIFrameWndEx::OnContextMenu
+8814 delete
+8815 CMFCRibbonPanelMenuBar::OnContextMenu
+8816 CMFCRibbonRichEditCtrl::OnContextMenu
+8817 CMFCShellListCtrl::OnContextMenu
+8818 CMFCShellTreeCtrl::OnContextMenu
+8819 CMFCToolBar::OnContextMenu
+8820 CMFCToolBarComboBoxEdit::OnContextMenu
+8821 CMFCToolBarEditCtrl::OnContextMenu
+8822 CPane::OnContextMenu
+8823 CPaneFrameWnd::OnContextMenu
+8824 CPane::OnContinueMoving
+8825 delete
+8826 CFileDialog::XFileDialogControlEvents::OnControlActivating
+8827 COleControlSite::XOleControlSite::OnControlInfoChanged
+8828 CMFCKeyMapDialog::OnCopy
+8829 CMFCToolBar::OnCopyImage
+8830 CCheckListBox::OnCreate
+8831 CControlBar::OnCreate
+8832 CDockablePane::OnCreate
+8833 CEditView::OnCreate
+8834 CFormView::OnCreate
+8835 CFrameWnd::OnCreate
+8836 CFrameWndEx::OnCreate
+8837 CMDIChildWnd::OnCreate
+8838 CMDIChildWndEx::OnCreate
+8839 CMDIFrameWndEx::OnCreate
+8840 CMFCAutoHideBar::OnCreate
+8841 CMFCBaseTabCtrl::OnCreate
+8842 CMFCCaptionBar::OnCreate
+8843 CMFCColorBar::OnCreate
+8844 CMFCColorPopupMenu::OnCreate
+8845 CMFCDesktopAlertDialog::OnCreate
+8846 CMFCDropDownFrame::OnCreate
+8847 CMFCFontComboBox::OnCreate
+8848 CMFCHeaderCtrl::OnCreate
+8849 CMFCListCtrl::OnCreate
+8850 CMFCMaskedEdit::OnCreate
+8851 CMFCMenuBar::OnCreate
+8852 CMFCOutlookBar::OnCreate
+8853 CMFCOutlookBarPane::OnCreate
+8854 CMFCOutlookBarTabCtrl::OnCreate
+8855 CMFCPopupMenu::OnCreate
+8856 CMFCPopupMenuBar::OnCreate
+8857 CMFCPropertyGridCtrl::OnCreate
+8858 CMFCRibbonBar::OnCreate
+8859 CMFCRibbonMiniToolBar::OnCreate
+8860 CMFCRibbonPanelMenuBar::OnCreate
+8861 CMFCShellListCtrl::OnCreate
+8862 CMFCShellTreeCtrl::OnCreate
+8863 CMFCStatusBar::OnCreate
+8864 CMFCTabCtrl::OnCreate
+8865 CMFCTasksPane::OnCreate
+8866 CMFCToolBar::OnCreate
+8867 CMFCToolBarsCustomizeDialog::OnCreate
+8868 CMFCToolTipCtrl::OnCreate
+8869 CMultiPaneFrameWnd::OnCreate
+8870 COleControl::OnCreate
+8871 COleIPFrameWnd::OnCreate
+8872 CPaneDivider::OnCreate
+8873 CPaneFrameWnd::OnCreate
+8874 CPreviewView::OnCreate
+8875 CPreviewViewEx::OnCreate
+8876 CRichEditView::OnCreate
+8877 CTabbedPane::OnCreate
+8878 CTabView::OnCreate
+8879 CToolBarCtrl::OnCreate
+8880 CView::OnCreate
+8881 CVSListBoxBase::OnCreate
+8882 CArchiveStream::AddRef
+8883 CArchiveStream::AddRef
+8884 CFrameWnd::OnCreateClient
+8885 CMDIFrameWnd::OnCreateClient
+8886 CMDIFrameWndEx::OnCreateClient
+8887 COleDocIPFrameWndEx::OnCreateControlBars
+8888 COleIPFrameWnd::OnCreateControlBars
+8889 CArchiveStream::AddRef
+8890 COleDocIPFrameWndEx::OnCreateControlBars
+8891 CFrameWnd::OnCreateHelper
+8892 CVSListBox::OnCreateList
+8893 COleObjectFactory::OnCreateObject
+8894 COleTemplateServer::OnCreateObject
+8895 CDocument::OnCreatePreviewFrame
+8896 CControlBar::OnCtlColor
+8897 CDialogEx::OnCtlColor
+8898 CMFCDesktopAlertDialog::OnCtlColor
+8899 CMFCPropertyGridCtrl::OnCtlColor
+8900 CMFCPropertyGridProperty::OnCtlColor
+8901 CMFCToolBar::OnCtlColor
+8902 CMFCToolBarButtonsListButton::OnCtlColor
+8903 CMFCToolBarComboBoxButton::OnCtlColor
+8904 CMFCToolBarComboBoxButton::OnCtlColor
+8905 CMFCToolBarComboBoxButton::OnCtlColor
+8906 COlePropertyPage::OnCtlColor
+8907 CPropertyPage::OnCtlColor
+8908 CPropertySheet::OnCtlColor
+8909 CWnd::OnCtlColor
+8910 CMFCListCtrl::OnCustomDraw
+8911 CMFCRibbonCustomizePropertyPage::OnCustomizeKeyboard
+8912 CMFCDropDownToolbarButton::OnCustomizeMenu
+8913 CMFCOutlookBarToolBar::OnCustomizeMode
+8914 CMFCToolBar::OnCustomizeMode
+8916 delete
+8917 CCachedDataPathProperty::OnDataAvailable
+8918 delete
+8919 COleClientItem::XAdviseSink::OnDataChange
+8920 CMFCToolBarDateTimeCtrlImpl::OnDateTimeChange
+8921 CMFCToolBarDateTimeCtrlImpl::OnDateTimeCloseUp
+8922 CMFCToolBarDateTimeCtrlImpl::OnDateTimeDropDown
+8923 CMFCPropertyGridProperty::OnDblClk
+8924 CMFCShellListCtrl::OnDblClk
+8925 CMFCToolBarSystemMenuButton::OnDblClk
+8926 COutlookOptionsDlg::OnDblclkList
+8927 CVSListBox::OnDblclkList
+8928 CMFCToolBarsListPropertyPage::OnDblClkToolBarList
+8929 CDocManager::OnDDECommand
+8930 CWinApp::OnDDECommand
+8934 CDHtmlDialog::OnDDXError
+8935 COleClientItem::OnDeactivate
+8936 COleServerDoc::OnDeactivate
+8937 COleClientItem::OnDeactivateAndUndo
+8938 COleClientItem::OnDeactivateUI
+8939 COleServerDoc::OnDeactivateUI
+8940 CRichEditCntrItem::OnDeactivateUI
+8941 CMFCToolBarButtonCustomizeDialog::OnDefaultImage
+8942 COleControlSite::XOleIPSite::AdjustRect
+8943 CMFCShellListCtrl::OnDeleteitem
+8944 CMFCShellTreeCtrl::OnDeleteitem
+8945 CWnd::OnDeleteItem
+8946 CMFCToolBarsListPropertyPage::OnDeleteToolbar
+8947 CMFCRibbonSpinButtonCtrl::OnDeltapos
+8948 CControlBar::OnDestroy
+8949 CDHtmlDialog::OnDestroy
+8950 CDialogEx::OnDestroy
+8951 CDialogImpl::OnDestroy
+8952 CDockablePane::OnDestroy
+8953 CDockSite::OnDestroy
+8954 CEditView::OnDestroy
+8955 CFrameWnd::OnDestroy
+8956 CFrameWndEx::OnDestroy
+8957 delete
+8958 CMDIChildWnd::OnDestroy
+8959 CMDIChildWndEx::OnDestroy
+8960 CMDIFrameWnd::OnDestroy
+8961 CMDIFrameWndEx::OnDestroy
+8962 CMFCBaseTabCtrl::OnDestroy
+8963 CMFCButton::OnDestroy
+8964 CMFCCaptionBar::OnDestroy
+8965 CMFCColorBar::OnDestroy
+8966 CMFCColorDialog::OnDestroy
+8967 CMFCDesktopAlertWnd::OnDestroy
+8968 CMFCDropDownFrame::OnDestroy
+8969 CMFCFontComboBox::OnDestroy
+8970 CMFCKeyMapDialog::OnDestroy
+8971 CMFCPopupMenu::OnDestroy
+8972 CMFCPopupMenuBar::OnDestroy
+8973 CMFCPrintPreviewToolBar::OnDestroy
+8974 CMFCPropertyGridCtrl::OnDestroy
+8975 CMFCRibbonBar::OnDestroy
+8976 CMFCRibbonKeyTip::OnDestroy
+8977 CMFCRibbonPanelMenu::OnDestroy
+8978 CMFCRibbonPanelMenuBar::OnDestroy
+8979 CMFCShellListCtrl::OnDestroy
+8980 CMFCShellTreeCtrl::OnDestroy
+8981 CMFCStatusBar::OnDestroy
+8982 CMFCTabCtrl::OnDestroy
+8983 CMFCTasksPane::OnDestroy
+8984 CMFCToolBar::OnDestroy
+8985 CMFCToolBarsMenuPropertyPage::OnDestroy
+8986 COleControl::OnDestroy
+8987 COleDocIPFrameWndEx::OnDestroy
+8988 COleIPFrameWnd::OnDestroy
+8989 COleDocIPFrameWndEx::OnDestroy
+8990 CPane::OnDestroy
+8991 CPaneDivider::OnDestroy
+8992 CPaneFrameWnd::OnDestroy
+8993 CRichEditView::OnDestroy
+8994 CTabbedPane::OnDestroy
+8995 CTabCtrl::OnDestroy
+8996 CTreeCtrl::OnDestroy
+8997 CTreeView::OnDestroy
+8998 CView::OnDestroy
+8999 CWnd::OnDestroy
+9000 CDHtmlDialog::OnDestroyModeless
+9001 CMFCPropertyGridProperty::OnDestroyWindow
+9002 CRichEditView::OnDevModeChange
+9003 CWnd::OnDevModeChange
+9004 CToolTipCtrl::OnDisableModal
+9005 delete
+9006 CSplitterWnd::OnDisplayChange
+9008 CPreviewView::OnDisplayPageNumber
+9009 CPreviewViewEx::OnDisplayPageNumber
+9010 COleFrameHook::OnDocActivate
+9011 CMultiPaneFrameWnd::OnDockToRecentPos
+9012 CPaneFrameWnd::OnDockToRecentPos
+9013 CDHtmlDialog::OnDocumentComplete
+9014 delete
+9015 CDocument::OnDocumentEvent
+9016 CDHtmlDialog::OnDocumentReadyStateChange
+9017 CBrowserControlSite::OnDocWindowActivate
+9018 CArchiveStream::Clone
+9019 COleUILinkInfo::AddRef
+9020 COleServerDoc::OnDocWindowActivate
+9021 COleServerDocEx::OnDocWindowActivate
+9022 CHtmlControlSite::XDocHostUIHandler::OnDocWindowActivate
+9023 COleControl::XOleInPlaceActiveObject::OnDocWindowActivate
+9024 COleServerDoc::XOleInPlaceActiveObject::OnDocWindowActivate
+9025 CMFCCustomColorsPropertyPage::OnDoubleClickedColor
+9026 CMFCCustomColorsPropertyPage::OnDoubleClickedColor
+9027 CDocObjectServerItem::OnDoVerb
+9028 COleControl::OnDoVerb
+9029 COleServerItem::OnDoVerb
+9030 CMFCRibbonCustomizePropertyPage::OnDown
+9031 delete
+9032 delete
+9033 CMDIClientAreaWnd::OnDragComplete
+9034 CMFCOutlookBarTabCtrl::OnDragEnter
+9035 CMFCOutlookBarTabCtrl::OnDragEnter
+9036 CMFCTabDropTarget::OnDragEnter
+9037 CMFCToolBar::OnDragEnter
+9038 CMFCToolBarDropTarget::OnDragEnter
+9039 COleDropTarget::OnDragEnter
+9040 COleUILinkInfo::AddRef
+9041 CMFCTabDropTarget::OnDragLeave
+9042 CMFCToolBar::OnDragLeave
+9043 CMFCToolBarDropTarget::OnDragLeave
+9044 COleDropTarget::OnDragLeave
+9045 delete
+9046 CWnd::OnDragList
+9047 CMFCOutlookBarPane::OnDragOver
+9048 CMFCOutlookBarTabCtrl::OnDragOver
+9049 CMFCPopupMenuBar::OnDragOver
+9050 COleUILinkInfo::AddRef
+9051 CMFCTabDropTarget::OnDragOver
+9052 CMFCToolBar::OnDragOver
+9053 CMFCToolBarDropTarget::OnDragOver
+9054 COleDropTarget::OnDragOver
+9055 COleUILinkInfo::AddRef
+9056 COleDropTarget::OnDragScroll
+9057 CView::OnDragScroll
+9058 delete
+9059 CFormView::OnDraw
+9060 delete
+9061 CMFCAutoHideButton::OnDraw
+9062 CMFCButton::OnDraw
+9063 CMFCCaptionButton::OnDraw
+9064 CMFCCaptionMenuButton::OnDraw
+9065 CMFCColorButton::OnDraw
+9066 CMFCColorMenuButton::OnDraw
+9067 CMFCCustomizeButton::OnDraw
+9068 CMFCCustomizeMenuButton::OnDraw
+9069 CMFCDesktopAlertDialog::OnDraw
+9070 CMFCDesktopAlertWnd::OnDraw
+9071 CMFCDesktopAlertWndButton::OnDraw
+9072 CMFCDropDownToolbarButton::OnDraw
+9073 CMFCLinkCtrl::OnDraw
+9074 CMFCMenuButton::OnDraw
+9075 CMFCOutlookBarPaneButton::OnDraw
+9076 CMFCPropertyGridCtrl::OnDraw
+9077 CMFCRibbonButton::OnDraw
+9078 CMFCRibbonButtonsGroup::OnDraw
+9079 CMFCRibbonCaptionButton::OnDraw
+9080 CMFCRibbonCategory::OnDraw
+9081 CMFCRibbonCheckBox::OnDraw
+9082 CMFCRibbonComboBox::OnDraw
+9083 CMFCRibbonContextCaption::OnDraw
+9084 CMFCRibbonDefaultPanelButton::OnDraw
+9085 CMFCRibbonEdit::OnDraw
+9086 CMFCRibbonGallery::OnDraw
+9087 CMFCRibbonGalleryIcon::OnDraw
+9088 CMFCRibbonLabel::OnDraw
+9089 CMFCRibbonLaunchButton::OnDraw
+9090 CMFCRibbonLinkCtrl::OnDraw
+9091 CMFCRibbonProgressBar::OnDraw
+9092 CMFCRibbonRecentFilesList::OnDraw
+9093 CMFCRibbonSeparator::OnDraw
+9094 CMFCRibbonSlider::OnDraw
+9095 CMFCRibbonStatusBarPane::OnDraw
+9096 CMFCRibbonTab::OnDraw
+9097 CMFCShowAllButton::OnDraw
+9098 CMFCSpinButtonCtrl::OnDraw
+9099 CMFCTabCtrl::OnDraw
+9100 CMFCToolBarButton::OnDraw
+9101 CMFCToolBarColorButton::OnDraw
+9102 CMFCToolBarComboBoxButton::OnDraw
+9103 CMFCToolBarDateTimeCtrl::OnDraw
+9104 CMFCToolBarEditBoxButton::OnDraw
+9105 CMFCToolBarMenuButton::OnDraw
+9106 CMFCToolBarMenuButtonsButton::OnDraw
+9107 CMFCToolBarSystemMenuButton::OnDraw
+9108 delete
+9109 COutlookCustomizeButton::OnDraw
+9110 CPreviewView::OnDraw
+9111 CRibbonCategoryScroll::OnDraw
+9112 CSplitterWnd::OnDraw
+9113 delete
+9114 delete
+9115 CMFCVisualManager::OnDrawAutoHideButtonBorder
+9116 CMFCVisualManagerOffice2003::OnDrawAutoHideButtonBorder
+9117 CMFCVisualManagerVS2005::OnDrawAutoHideButtonBorder
+9118 CMFCVisualManagerVS2008::OnDrawAutoHideButtonBorder
+9119 CMFCCaptionBar::OnDrawBackground
+9120 CMFCVisualManager::OnDrawBarGripper
+9121 CMFCVisualManagerOffice2003::OnDrawBarGripper
+9122 CMFCVisualManagerOffice2007::OnDrawBarGripper
+9123 CMFCVisualManagerOfficeXP::OnDrawBarGripper
+9124 CMFCVisualManagerWindows::OnDrawBarGripper
+9125 CMFCAutoHideButton::OnDrawBorder
+9126 CMFCButton::OnDrawBorder
+9127 CMFCCaptionBar::OnDrawBorder
+9128 CMFCColorButton::OnDrawBorder
+9129 CMFCDesktopAlertWndButton::OnDrawBorder
+9130 CMFCOutlookBarScrollButton::OnDrawBorder
+9131 delete
+9132 CMFCRibbonButton::OnDrawBorder
+9133 CMFCRibbonMainPanelButton::OnDrawBorder
+9134 CMFCTabButton::OnDrawBorder
+9135 CMFCTasksPaneFrameWnd::OnDrawBorder
+9136 CMFCToolTipCtrl::OnDrawBorder
+9137 CPaneFrameWnd::OnDrawBorder
+9138 CMFCEditBrowseCtrl::OnDrawBrowseButton
+9139 CMFCVisualManager::OnDrawBrowseButton
+9140 CMFCVisualManagerOffice2003::OnDrawBrowseButton
+9141 CMFCVisualManagerOfficeXP::OnDrawBrowseButton
+9142 CMFCVisualManagerWindows::OnDrawBrowseButton
+9143 CMFCCaptionBar::OnDrawButton
+9144 CMFCPropertyGridProperty::OnDrawButton
+9145 CMFCVisualManager::OnDrawButtonBorder
+9146 CMFCVisualManagerOffice2003::OnDrawButtonBorder
+9147 CMFCVisualManagerOffice2007::OnDrawButtonBorder
+9148 CMFCVisualManagerOfficeXP::OnDrawButtonBorder
+9149 CMFCVisualManagerVS2008::OnDrawButtonBorder
+9150 CMFCVisualManagerWindows::OnDrawButtonBorder
+9151 CMFCVisualManagerWindows7::OnDrawButtonBorder
+9152 CMFCVisualManager::OnDrawButtonSeparator
+9153 CMFCVisualManagerOffice2007::OnDrawButtonSeparator
+9154 CMFCVisualManagerOfficeXP::OnDrawButtonSeparator
+9155 CMFCVisualManagerWindows::OnDrawButtonSeparator
+9156 CMFCVisualManager::OnDrawCaptionBarBorder
+9157 CMFCVisualManagerOffice2003::OnDrawCaptionBarBorder
+9158 CMFCVisualManager::OnDrawCaptionBarButtonBorder
+9159 CMFCVisualManagerOfficeXP::OnDrawCaptionBarButtonBorder
+9160 CMFCVisualManager::OnDrawCaptionBarInfoArea
+9161 CMFCVisualManagerOffice2007::OnDrawCaptionBarInfoArea
+9162 CMFCVisualManagerOfficeXP::OnDrawCaptionBarInfoArea
+9163 CMFCVisualManager::OnDrawCaptionButton
+9164 CMFCVisualManagerOfficeXP::OnDrawCaptionButton
+9165 CMFCVisualManagerVS2005::OnDrawCaptionButton
+9166 CMFCVisualManagerWindows::OnDrawCaptionButton
+9167 CMFCVisualManagerOfficeXP::OnDrawCaptionButtonIcon
+9168 CMFCVisualManagerWindows::OnDrawCaptionButtonIcon
+9169 CMFCTasksPaneFrameWnd::OnDrawCaptionButtons
+9170 CPaneFrameWnd::OnDrawCaptionButtons
+9171 CMFCVisualManager::OnDrawCheckBox
+9172 CMFCVisualManager::OnDrawCheckBoxEx
+9173 CMFCVisualManagerOffice2003::OnDrawCheckBoxEx
+9174 CMFCVisualManagerOffice2007::OnDrawCheckBoxEx
+9175 CMFCVisualManagerOffice2003::OnDrawCheckBoxEx
+9176 CMFCVisualManagerWindows7::OnDrawCheckBoxEx
+9177 CMFCVisualManager::OnDrawComboBorder
+9178 CMFCVisualManagerOffice2003::OnDrawComboBorder
+9179 CMFCVisualManagerOffice2007::OnDrawComboBorder
+9180 CMFCVisualManagerOfficeXP::OnDrawComboBorder
+9181 CMFCVisualManagerWindows::OnDrawComboBorder
+9182 CMFCVisualManager::OnDrawComboDropButton
+9183 CMFCVisualManagerOffice2003::OnDrawComboDropButton
+9184 CMFCVisualManagerOffice2007::OnDrawComboDropButton
+9185 CMFCVisualManagerOfficeXP::OnDrawComboDropButton
+9186 CMFCVisualManagerWindows::OnDrawComboDropButton
+9187 CMFCVisualManagerWindows7::OnDrawComboDropButton
+9188 CMFCVisualManager::OnDrawControlBorder
+9189 CMFCVisualManagerOffice2003::OnDrawControlBorder
+9190 CMFCVisualManagerOffice2003::OnDrawControlBorder
+9191 CMFCVisualManager::OnDrawDefaultRibbonImage
+9192 CMFCVisualManagerOffice2007::OnDrawDefaultRibbonImage
+9193 CMFCVisualManagerWindows7::OnDrawDefaultRibbonImage
+9194 CMFCPropertyGridCtrl::OnDrawDescription
+9195 CMFCPropertyGridProperty::OnDrawDescription
+9196 CMFCToolTipCtrl::OnDrawDescription
+9197 CDockablePane::OnDrawDragRect
+9198 COleUILinkInfo::AddRef
+9199 CMFCRibbonFontComboBox::OnDrawDropListItem
+9200 CMFCVisualManager::OnDrawEditBorder
+9201 CMFCVisualManagerOffice2007::OnDrawEditBorder
+9202 CMFCVisualManagerOfficeXP::OnDrawEditBorder
+9203 CMFCVisualManagerWindows::OnDrawEditBorder
+9204 COleServerItem::OnDrawEx
+9205 CMFCPropertyGridProperty::OnDrawExpandBox
+9206 CMFCVisualManager::OnDrawExpandingBox
+9207 CMFCVisualManagerOffice2003::OnDrawExpandingBox
+9208 CMFCVisualManagerOffice2003::OnDrawExpandingBox
+9209 CMFCVisualManager::OnDrawFloatingToolbarBorder
+9210 CMFCVisualManagerOffice2007::OnDrawFloatingToolbarBorder
+9211 CMFCVisualManagerOfficeXP::OnDrawFloatingToolbarBorder
+9212 CMFCVisualManagerWindows::OnDrawFloatingToolbarBorder
+9213 CMFCButton::OnDrawFocusRect
+9214 CMFCColorButton::OnDrawFocusRect
+9215 CMFCLinkCtrl::OnDrawFocusRect
+9216 CMFCVisualManager::OnDrawHeaderCtrlBorder
+9217 CMFCVisualManagerOffice2003::OnDrawHeaderCtrlBorder
+9218 CMFCVisualManagerOffice2007::OnDrawHeaderCtrlBorder
+9219 CMFCVisualManagerOffice2003::OnDrawHeaderCtrlBorder
+9220 CMFCVisualManager::OnDrawHeaderCtrlSortArrow
+9221 CMFCVisualManagerWindows::OnDrawHeaderCtrlSortArrow
+9222 CMFCToolTipCtrl::OnDrawIcon
+9223 CHtmlView::OnDrawIconicThumbnailOrLivePreview
+9224 CWnd::OnDrawIconicThumbnailOrLivePreview
+9225 CMFCCaptionBar::OnDrawImage
+9226 CMFCRibbonButtonsGroup::OnDrawImage
+9227 CMFCRibbonCategory::OnDrawImage
+9228 CMFCRibbonStatusBar::OnDrawInformation
+9229 CMFCDropDownListBox::OnDrawItem
+9230 CMFCHeaderCtrl::OnDrawItem
+9231 CMFCWindowsManagerDialog::OnDrawItem
+9232 CWnd::OnDrawItem
+9233 CMFCRibbonBaseElement::OnDrawKeyTip
+9234 CMFCToolTipCtrl::OnDrawLabel
+9235 CMFCRibbonEdit::OnDrawLabelAndImage
+9236 CMFCPropertyGridCtrl::OnDrawList
+9237 CMFCVisualManager::OnDrawMenuArrowOnCustomizeList
+9238 CMFCVisualManagerOfficeXP::OnDrawMenuArrowOnCustomizeList
+9239 CMFCRibbonMainPanel::OnDrawMenuBorder
+9240 CMFCRibbonPanelMenuBar::OnDrawMenuBorder
+9241 CMFCVisualManager::OnDrawMenuBorder
+9242 CMFCVisualManagerOffice2003::OnDrawMenuBorder
+9243 CMFCVisualManagerOffice2007::OnDrawMenuBorder
+9244 CMFCVisualManagerOfficeXP::OnDrawMenuBorder
+9245 CMFCVisualManagerWindows::OnDrawMenuBorder
+9246 CMFCVisualManagerWindows7::OnDrawMenuBorder
+9247 CMFCVisualManager::OnDrawMenuCheck
+9248 CMFCVisualManagerOffice2007::OnDrawMenuCheck
+9249 CMFCVisualManagerWindows7::OnDrawMenuCheck
+9250 CFrameWndEx::OnDrawMenuImage
+9251 CMDIFrameWndEx::OnDrawMenuImage
+9252 CMFCVisualManager::OnDrawMenuItemButton
+9253 CMFCVisualManagerOffice2007::OnDrawMenuItemButton
+9254 CMFCVisualManager::OnDrawMenuLabel
+9255 CMFCVisualManagerOffice2007::OnDrawMenuLabel
+9256 CMFCVisualManagerOfficeXP::OnDrawMenuLabel
+9257 CMFCVisualManagerWindows7::OnDrawMenuLabel
+9258 CMFCVisualManager::OnDrawMenuResizeBar
+9259 CMFCVisualManagerOffice2007::OnDrawMenuResizeBar
+9260 CMFCVisualManagerOfficeXP::OnDrawMenuResizeBar
+9261 CMFCVisualManager::OnDrawMenuScrollButton
+9262 CMFCVisualManagerOffice2007::OnDrawMenuScrollButton
+9263 CMFCVisualManagerOfficeXP::OnDrawMenuScrollButton
+9264 CMFCVisualManager::OnDrawMenuShadow
+9265 CMFCVisualManagerOfficeXP::OnDrawMenuShadow
+9266 CMFCVisualManager::OnDrawMenuSystemButton
+9267 CMFCVisualManagerOffice2007::OnDrawMenuSystemButton
+9268 CMFCVisualManagerOfficeXP::OnDrawMenuSystemButton
+9269 CMFCVisualManagerWindows::OnDrawMenuSystemButton
+9270 COleControl::OnDrawMetafile
+9271 CMFCVisualManager::OnDrawMiniFrameBorder
+9272 CMFCVisualManagerOffice2007::OnDrawMiniFrameBorder
+9273 CMFCVisualManagerOfficeXP::OnDrawMiniFrameBorder
+9274 CMFCVisualManagerWindows::OnDrawMiniFrameBorder
+9275 CMFCPropertyGridProperty::OnDrawName
+9276 CMFCColorMenuButton::OnDrawOnCustomizeList
+9277 CMFCDropDownToolbarButton::OnDrawOnCustomizeList
+9278 CMFCToolBarButton::OnDrawOnCustomizeList
+9279 CMFCToolBarComboBoxButton::OnDrawOnCustomizeList
+9280 CMFCToolBarDateTimeCtrl::OnDrawOnCustomizeList
+9281 CMFCToolBarEditBoxButton::OnDrawOnCustomizeList
+9282 CMFCToolBarMenuButton::OnDrawOnCustomizeList
+9283 CMFCRibbonBaseElement::OnDrawOnList
+9284 CMFCRibbonButton::OnDrawOnList
+9285 CMFCRibbonCheckBox::OnDrawOnList
+9286 CMFCRibbonDefaultPanelButton::OnDrawOnList
+9287 CMFCRibbonEdit::OnDrawOnList
+9288 CMFCRibbonProgressBar::OnDrawOnList
+9289 CMFCRibbonSeparator::OnDrawOnList
+9290 CMFCRibbonSlider::OnDrawOnList
+9291 CMFCVisualManager::OnDrawOutlookBarSplitter
+9292 CMFCVisualManagerOffice2003::OnDrawOutlookBarSplitter
+9293 CMFCVisualManagerOffice2007::OnDrawOutlookBarSplitter
+9294 CMFCVisualManager::OnDrawOutlookPageButtonBorder
+9295 CMFCVisualManagerOffice2003::OnDrawOutlookPageButtonBorder
+9296 CMFCVisualManagerOffice2007::OnDrawOutlookPageButtonBorder
+9297 CMFCVisualManagerWindows::OnDrawOutlookPageButtonBorder
+9298 COleUILinkInfo::AddRef
+9299 delete
+9300 CMFCRibbonColorButton::OnDrawPaletteIcon
+9301 CMFCRibbonGallery::OnDrawPaletteIcon
+9302 CMFCRibbonUndoButton::OnDrawPaletteIcon
+9303 CMFCRibbonPanel::OnDrawPaletteMenu
+9304 CMFCStatusBar::OnDrawPane
+9305 CMFCVisualManager::OnDrawPaneBorder
+9306 CMFCVisualManagerOffice2003::OnDrawPaneBorder
+9307 CMFCVisualManagerOfficeXP::OnDrawPaneBorder
+9308 CMFCVisualManagerWindows::OnDrawPaneBorder
+9309 CMFCVisualManager::OnDrawPaneCaption
+9310 CMFCVisualManagerOffice2003::OnDrawPaneCaption
+9311 CMFCVisualManagerOffice2007::OnDrawPaneCaption
+9312 CMFCVisualManagerOfficeXP::OnDrawPaneCaption
+9313 CMFCVisualManagerVS2005::OnDrawPaneCaption
+9314 CMFCVisualManagerVS2008::OnDrawPaneCaption
+9315 CMFCVisualManagerWindows::OnDrawPaneCaption
+9316 CMFCVisualManager::OnDrawPaneDivider
+9317 CMFCButton::OnDrawParentBackground
+9318 CMFCVisualManager::OnDrawPopupWindowBorder
+9319 CMFCVisualManagerOffice2003::OnDrawPopupWindowBorder
+9320 CMFCVisualManagerOfficeXP::OnDrawPopupWindowBorder
+9321 CMFCVisualManager::OnDrawPopupWindowButtonBorder
+9322 CMFCVisualManagerOffice2003::OnDrawPopupWindowButtonBorder
+9323 CMFCVisualManagerOffice2003::OnDrawPopupWindowButtonBorder
+9324 CMFCVisualManagerWindows::OnDrawPopupWindowButtonBorder
+9325 CMFCVisualManager::OnDrawPopupWindowCaption
+9326 CMFCVisualManagerOffice2003::OnDrawPopupWindowCaption
+9327 CMFCVisualManagerOffice2007::OnDrawPopupWindowCaption
+9328 CMFCVisualManagerOfficeXP::OnDrawPopupWindowCaption
+9329 CMFCPropertyGridCtrl::OnDrawProperty
+9330 CMFCVisualManager::OnDrawPropertySheetListItem
+9331 CMFCVisualManagerOffice2007::OnDrawPropertySheetListItem
+9332 CMFCVisualManagerOfficeXP::OnDrawPropertySheetListItem
+9333 CMFCVisualManagerWindows7::OnDrawRadioButton
+9334 CMFCVisualManager::OnDrawRibbonApplicationButton
+9335 CMFCVisualManagerOffice2007::OnDrawRibbonApplicationButton
+9336 CMFCVisualManagerWindows7::OnDrawRibbonApplicationButton
+9337 CMFCVisualManager::OnDrawRibbonButtonBorder
+9338 CMFCVisualManagerOffice2007::OnDrawRibbonButtonBorder
+9339 CMFCVisualManagerOfficeXP::OnDrawRibbonButtonBorder
+9340 CMFCVisualManagerWindows7::OnDrawRibbonButtonBorder
+9341 CMFCRibbonApplicationButton::AddToListBox
+9342 CMFCVisualManagerOffice2003::OnDrawRibbonButtonsGroup
+9343 CMFCVisualManagerOffice2007::OnDrawRibbonButtonsGroup
+9344 CMFCVisualManager::OnDrawRibbonCaption
+9345 CMFCVisualManagerOffice2007::OnDrawRibbonCaption
+9346 CMFCVisualManagerWindows7::OnDrawRibbonCaption
+9347 CMFCVisualManager::OnDrawRibbonCaptionButton
+9348 CMFCVisualManagerOffice2007::OnDrawRibbonCaptionButton
+9349 CMFCVisualManagerWindows7::OnDrawRibbonCaptionButton
+9350 CMFCVisualManager::OnDrawRibbonCategory
+9351 CMFCVisualManagerOffice2007::OnDrawRibbonCategory
+9352 CMFCVisualManagerWindows7::OnDrawRibbonCategory
+9353 CMFCVisualManager::OnDrawRibbonCategoryCaption
+9354 CMFCVisualManagerOffice2003::OnDrawRibbonCategoryCaption
+9355 CMFCVisualManagerOffice2007::OnDrawRibbonCategoryCaption
+9356 CMFCVisualManagerWindows7::OnDrawRibbonCategoryCaption
+9357 CMFCVisualManager::OnDrawRibbonCategoryScroll
+9358 CMFCVisualManagerOffice2007::OnDrawRibbonCategoryScroll
+9359 CMFCVisualManagerOfficeXP::OnDrawRibbonCategoryScroll
+9360 CMFCVisualManagerWindows7::OnDrawRibbonCategoryScroll
+9361 CMFCVisualManager::OnDrawRibbonCategoryTab
+9362 CMFCVisualManagerOffice2003::OnDrawRibbonCategoryTab
+9363 CMFCVisualManagerOffice2007::OnDrawRibbonCategoryTab
+9364 CMFCVisualManagerWindows7::OnDrawRibbonCategoryTab
+9365 CMFCVisualManager::OnDrawRibbonCheckBoxOnList
+9366 CMFCVisualManagerOffice2007::OnDrawRibbonCheckBoxOnList
+9367 CMFCVisualManager::OnDrawRibbonColorPaletteBox
+9368 CMFCVisualManagerOfficeXP::OnDrawRibbonColorPaletteBox
+9369 CMFCVisualManager::OnDrawRibbonDefaultPaneButton
+9370 CMFCVisualManagerOffice2007::OnDrawRibbonDefaultPaneButton
+9371 CMFCVisualManagerWindows7::OnDrawRibbonDefaultPaneButton
+9372 CMFCVisualManager::OnDrawRibbonDefaultPaneButtonContext
+9373 CMFCVisualManager::OnDrawRibbonDefaultPaneButtonIndicator
+9374 CMFCVisualManagerOffice2007::OnDrawRibbonDefaultPaneButtonIndicator
+9375 CMFCVisualManager::OnDrawRibbonGalleryBorder
+9376 CMFCVisualManagerOffice2007::OnDrawRibbonGalleryBorder
+9377 CMFCVisualManager::OnDrawRibbonGalleryButton
+9378 CMFCVisualManagerOffice2007::OnDrawRibbonGalleryButton
+9379 CMFCVisualManagerWindows7::OnDrawRibbonGalleryButton
+9380 CMFCVisualManager::OnDrawRibbonKeyTip
+9381 CMFCVisualManagerOffice2007::OnDrawRibbonKeyTip
+9382 delete
+9383 CMFCVisualManager::OnDrawRibbonLaunchButton
+9384 CMFCVisualManagerOffice2007::OnDrawRibbonLaunchButton
+9385 CMFCVisualManagerWindows7::OnDrawRibbonLaunchButton
+9386 CMFCVisualManager::OnDrawRibbonMainPanelButtonBorder
+9387 CMFCVisualManagerOffice2007::OnDrawRibbonMainPanelButtonBorder
+9388 CMFCVisualManager::OnDrawRibbonMainPanelFrame
+9389 CMFCVisualManagerOffice2007::OnDrawRibbonMainPanelFrame
+9390 CMFCVisualManager::OnDrawRibbonMenuCheckFrame
+9391 CMFCVisualManagerOffice2007::OnDrawRibbonMenuCheckFrame
+9392 CMFCVisualManagerOfficeXP::OnDrawRibbonMenuCheckFrame
+9393 CMFCVisualManagerWindows7::OnDrawRibbonMenuCheckFrame
+9394 CMFCVisualManager::OnDrawRibbonPanel
+9395 CMFCVisualManagerOffice2007::OnDrawRibbonPanel
+9396 CMFCVisualManagerWindows7::OnDrawRibbonPanel
+9397 CMFCVisualManager::OnDrawRibbonPanelCaption
+9398 CMFCVisualManagerOffice2007::OnDrawRibbonPanelCaption
+9399 CMFCVisualManagerWindows7::OnDrawRibbonPanelCaption
+9400 CMFCVisualManager::OnDrawRibbonProgressBar
+9401 CMFCVisualManagerOffice2003::OnDrawRibbonProgressBar
+9402 CMFCVisualManagerOffice2007::OnDrawRibbonProgressBar
+9403 CMFCVisualManagerWindows7::OnDrawRibbonProgressBar
+9404 CMFCVisualManager::OnDrawRibbonQuickAccessToolBarSeparator
+9405 CMFCVisualManagerOffice2003::OnDrawRibbonQuickAccessToolBarSeparator
+9406 CMFCVisualManagerOfficeXP::OnDrawRibbonQuickAccessToolBarSeparator
+9407 CMFCVisualManager::OnDrawRibbonRecentFilesFrame
+9408 CMFCVisualManagerOffice2007::OnDrawRibbonRecentFilesFrame
+9409 CMFCVisualManagerOfficeXP::OnDrawRibbonRecentFilesFrame
+9410 CMFCVisualManagerWindows7::OnDrawRibbonRecentFilesFrame
+9411 CMFCVisualManager::OnDrawRibbonSliderChannel
+9412 CMFCVisualManagerOffice2003::OnDrawRibbonSliderChannel
+9413 CMFCVisualManagerOffice2007::OnDrawRibbonSliderChannel
+9414 CMFCVisualManagerWindows7::OnDrawRibbonSliderChannel
+9415 CMFCVisualManager::OnDrawRibbonSliderThumb
+9416 CMFCVisualManagerOffice2003::OnDrawRibbonSliderThumb
+9417 CMFCVisualManagerOffice2007::OnDrawRibbonSliderThumb
+9418 CMFCVisualManagerWindows7::OnDrawRibbonSliderThumb
+9419 CMFCVisualManager::OnDrawRibbonSliderZoomButton
+9420 CMFCVisualManagerOffice2003::OnDrawRibbonSliderZoomButton
+9421 CMFCVisualManagerOffice2007::OnDrawRibbonSliderZoomButton
+9422 CMFCVisualManagerWindows7::OnDrawRibbonSliderZoomButton
+9423 CMFCVisualManager::OnDrawRibbonStatusBarPane
+9424 CMFCVisualManagerOffice2003::OnDrawRibbonStatusBarPane
+9425 CMFCVisualManagerOffice2007::OnDrawRibbonStatusBarPane
+9426 CMFCVisualManagerOfficeXP::OnDrawRibbonStatusBarPane
+9427 CMFCVisualManagerWindows7::OnDrawRibbonStatusBarPane
+9428 CMFCVisualManager::OnDrawRibbonTabsFrame
+9429 CMFCVisualManagerOffice2007::OnDrawRibbonTabsFrame
+9430 CMFCRibbonApplicationButton::AddToListBox
+9431 CMFCVisualManager::OnDrawScrollButtons
+9432 CMFCVisualManagerOffice2003::OnDrawScrollButtons
+9433 CMFCVisualManagerOffice2007::OnDrawScrollButtons
+9434 CMFCVisualManagerOfficeXP::OnDrawScrollButtons
+9435 CMFCVisualManager::OnDrawScrollButtons
+9436 CMFCToolTipCtrl::OnDrawSeparator
+9437 CMFCVisualManager::OnDrawSeparator
+9438 CMFCVisualManagerOffice2003::OnDrawSeparator
+9439 CMFCVisualManagerOffice2007::OnDrawSeparator
+9440 CMFCVisualManagerOfficeXP::OnDrawSeparator
+9441 CMFCVisualManagerVS2005::OnDrawSeparator
+9442 CMFCVisualManagerWindows::OnDrawSeparator
+9443 CMFCVisualManager::OnDrawShowAllMenuItems
+9444 CMFCVisualManagerOffice2003::OnDrawShowAllMenuItems
+9445 CMFCVisualManagerOffice2007::OnDrawShowAllMenuItems
+9446 CMFCHeaderCtrl::OnDrawSortArrow
+9447 CMFCVisualManager::OnDrawSpinButtons
+9448 CMFCVisualManagerOfficeXP::OnDrawSpinButtons
+9449 CMFCVisualManagerWindows::OnDrawSpinButtons
+9450 CSplitterWnd::OnDrawSplitter
+9451 CSplitterWndEx::OnDrawSplitter
+9452 CMFCVisualManager::OnDrawSplitterBorder
+9453 CMFCVisualManagerOfficeXP::OnDrawSplitterBorder
+9454 CMFCVisualManager::OnDrawSplitterBox
+9455 CMFCVisualManagerOfficeXP::OnDrawSplitterBox
+9456 CMFCVisualManager::OnDrawStatusBarPaneBorder
+9457 CMFCVisualManagerOffice2003::OnDrawStatusBarPaneBorder
+9458 CMFCVisualManagerOffice2007::OnDrawStatusBarPaneBorder
+9459 CMFCVisualManagerOfficeXP::OnDrawStatusBarPaneBorder
+9460 CMFCVisualManagerWindows::OnDrawStatusBarPaneBorder
+9461 CMFCVisualManager::OnDrawStatusBarProgress
+9462 CMFCVisualManagerOffice2003::OnDrawStatusBarProgress
+9463 CMFCVisualManagerOffice2003::OnDrawStatusBarProgress
+9464 CMFCVisualManager::OnDrawStatusBarSizeBox
+9465 CMFCVisualManagerOffice2003::OnDrawStatusBarSizeBox
+9466 CMFCVisualManagerOffice2007::OnDrawStatusBarSizeBox
+9467 CMFCVisualManagerOffice2003::OnDrawStatusBarSizeBox
+9468 CMFCVisualManagerWindows7::OnDrawStatusBarSizeBox
+9469 CMFCVisualManager::OnDrawTab
+9470 CMFCVisualManagerOffice2003::OnDrawTab
+9471 CMFCVisualManagerOffice2007::OnDrawTab
+9472 CMFCVisualManagerOfficeXP::OnDrawTab
+9473 CMFCVisualManagerVS2005::OnDrawTab
+9474 CMFCVisualManagerVS2008::OnDrawTab
+9475 CMFCVisualManagerWindows::OnDrawTab
+9476 CMFCVisualManager::OnDrawTabCloseButton
+9477 CMFCVisualManagerOfficeXP::OnDrawTabCloseButton
+9478 CMFCVisualManagerWindows::OnDrawTabCloseButton
+9479 CMFCVisualManager::OnDrawTabContent
+9480 CMFCVisualManager::OnDrawTabResizeBar
+9481 CMFCVisualManagerVS2008::OnDrawTabResizeBar
+9482 CMFCVisualManager::OnDrawTabsButtonBorder
+9483 CMFCVisualManagerOffice2003::OnDrawTabsButtonBorder
+9484 CMFCVisualManagerOffice2007::OnDrawTabsButtonBorder
+9485 CMFCVisualManagerOfficeXP::OnDrawTabsButtonBorder
+9486 CMFCVisualManagerWindows::OnDrawTabsButtonBorder
+9487 CMFCVisualManager::OnDrawTask
+9488 CMFCVisualManagerOffice2003::OnDrawTask
+9489 CMFCVisualManagerOffice2007::OnDrawTask
+9490 CMFCVisualManagerOfficeXP::OnDrawTask
+9491 CMFCVisualManagerWindows::OnDrawTask
+9492 CMFCTasksPane::OnDrawTasks
+9493 CMFCVisualManager::OnDrawTasksGroupAreaBorder
+9494 CMFCVisualManagerOffice2003::OnDrawTasksGroupAreaBorder
+9495 delete
+9496 CMFCVisualManagerWindows::OnDrawTasksGroupAreaBorder
+9497 CMFCVisualManager::OnDrawTasksGroupCaption
+9498 CMFCVisualManagerOffice2003::OnDrawTasksGroupCaption
+9499 CMFCVisualManagerOffice2007::OnDrawTasksGroupCaption
+9500 CMFCVisualManagerOfficeXP::OnDrawTasksGroupCaption
+9501 CMFCVisualManagerWindows::OnDrawTasksGroupCaption
+9502 CMFCVisualManager::OnDrawTasksGroupIcon
+9503 CMFCVisualManager::OnDrawTearOffCaption
+9504 CMFCVisualManagerOffice2003::OnDrawTearOffCaption
+9505 CMFCVisualManagerOffice2007::OnDrawTearOffCaption
+9506 CMFCVisualManagerOfficeXP::OnDrawTearOffCaption
+9507 CMFCVisualManagerWindows::OnDrawTearOffCaption
+9508 CMFCButton::OnDrawText
+9509 CMFCCaptionBar::OnDrawText
+9510 delete
+9511 CMFCVisualManager::OnDrawToolBoxFrame
+9512 CMFCVisualManagerVS2005::OnDrawToolBoxFrame
+9513 CMFCPropertyGridColorProperty::OnDrawValue
+9514 CMFCPropertyGridProperty::OnDrawValue
+9515 CMFCToolBar::OnDrop
+9516 COleDropTarget::OnDrop
+9517 COleUILinkInfo::AddRef
+9518 CMFCTabDropTarget::OnDropEx
+9519 CMFCToolBarDropTarget::OnDropEx
+9520 COleDropTarget::OnDropEx
+9521 CMFCRibbonApplicationButton::AddToListBox
+9522 CFrameWnd::OnDropFiles
+9523 CRichEditView::OnDropFiles
+9524 CMFCPropertyGridColorProperty::OnEdit
+9525 CMFCPropertyGridProperty::OnEdit
+9526 COleControl::OnEdit
+9527 CEditView::OnEditChange
+9528 COleDocument::OnEditChangeIcon
+9529 CEditView::OnEditClear
+9530 CEditView::OnEditClear
+9531 CMFCRibbonBar::OnEditContextMenu
+9532 COleDocument::OnEditConvert
+9533 CEditView::OnEditCopy
+9534 CHtmlView::OnEditCopy
+9535 CEditView::OnEditCopy
+9536 CEditView::OnEditCut
+9537 CHtmlView::OnEditCut
+9538 CEditView::OnEditCut
+9539 CEditView::OnEditFind
+9540 CRichEditView::OnEditFind
+9541 CEditView::OnEditFindReplace
+9542 CRichEditView::OnEditFindReplace
+9543 CMFCToolBarButtonCustomizeDialog::OnEditImage
+9544 CMFCPropertyGridCtrl::OnEditKillFocus
+9545 COleDocument::OnEditLinks
+9546 CEditView::OnEditPaste
+9547 CHtmlView::OnEditPaste
+9548 CRichEditView::OnEditPaste
+9549 CRichEditView::OnEditPasteSpecial
+9550 CRichEditView::OnEditProperties
+9551 COleUILinkInfo::AddRef
+9552 CRichEditView::OnEditRedo
+9553 CEditView::OnEditRepeat
+9554 CRichEditView::OnEditRepeat
+9555 CEditView::OnEditReplace
+9556 CRichEditView::OnEditReplace
+9557 CEditView::OnEditSelectAll
+9558 CRichEditView::OnEditSelectAll
+9559 CMFCToolBarsCustomizeDialog::OnEditToolbarMenuImage
+9560 CEditView::OnEditUndo
+9561 CRichEditView::OnEditUndo
+9562 CFrameWnd::OnEnable
+9563 CMFCButton::OnEnable
+9564 CMFCRibbonEdit::OnEnable
+9565 CMFCRibbonGallery::OnEnable
+9566 CMFCToolBarButtonsListButton::OnEnable
+9567 CToolTipCtrl::OnEnable
+9568 CVSListBoxBase::OnEnable
+9569 COleControl::OnAppearanceChanged
+9570 COleUILinkInfo::AddRef
+9571 COleFrameHook::OnEnableModeless
+9572 CMFCPropertyGridProperty::OnEndEdit
+9573 CVSListBoxBase::OnEndEditLabel
+9574 CVSListBox::OnEndLabelEdit
+9575 CEditView::OnEndPrinting
+9576 CRichEditView::OnEndPrinting
+9577 delete
+9578 CView::OnEndPrintPreview
+9579 CDialog::OnEndSession
+9580 CFrameWnd::OnEndSession
+9581 CFrameWnd::OnEnterIdle
+9582 COleControl::OnEnterIdle
+9583 CWnd::OnEnterIdle
+9584 COleControl::OnEnumVerbs
+9585 CArchiveStream::AddRef
+9586 CArchiveStream::AddRef
+9587 CDialogEx::OnEraseBkgnd
+9588 CDockBar::OnEraseBkgnd
+9589 CDockSite::OnEraseBkgnd
+9590 CFrameWnd::OnEraseBkgnd
+9591 CArchiveStream::AddRef
+9592 CMDIClientAreaWnd::OnEraseBkgnd
+9593 CArchiveStream::AddRef
+9594 CArchiveStream::AddRef
+9595 CArchiveStream::AddRef
+9596 CArchiveStream::AddRef
+9597 CArchiveStream::AddRef
+9598 CMFCDropDownFrame::OnEraseBkgnd
+9599 CArchiveStream::AddRef
+9600 CArchiveStream::AddRef
+9601 CMFCListCtrl::OnEraseBkgnd
+9602 CArchiveStream::AddRef
+9603 CArchiveStream::AddRef
+9604 CArchiveStream::AddRef
+9605 CArchiveStream::AddRef
+9606 CArchiveStream::AddRef
+9607 CArchiveStream::AddRef
+9608 CMFCPropertyPage::OnEraseBkgnd
+9609 CListBox::CharToItem
+9610 CArchiveStream::AddRef
+9611 CArchiveStream::AddRef
+9612 CArchiveStream::AddRef
+9613 CArchiveStream::AddRef
+9614 CMFCTabCtrl::OnEraseBkgnd
+9615 CArchiveStream::AddRef
+9616 CArchiveStream::AddRef
+9617 CMFCToolBarButtonsListButton::OnEraseBkgnd
+9618 CMFCToolBarsCommandsListBox::OnEraseBkgnd
+9619 CMFCToolTipCtrl::OnEraseBkgnd
+9620 COleControl::OnEraseBkgnd
+9621 CArchiveStream::AddRef
+9622 CPaneDialog::OnEraseBkgnd
+9623 CArchiveStream::AddRef
+9624 CArchiveStream::AddRef
+9625 CPreviewView::OnEraseBkgnd
+9626 CPreviewViewEx::OnEraseBkgnd
+9627 CListBox::CharToItem
+9628 CArchiveStream::AddRef
+9629 CArchiveStream::AddRef
+9630 CArchiveStream::AddRef
+9631 CArchiveStream::AddRef
+9632 CListBox::CharToItem
+9633 CArchiveStream::AddRef
+9634 COleUILinkInfo::AddRef
+9635 CMFCVisualManagerOffice2007::OnEraseMDIClientArea
+9636 CMFCVisualManager::OnErasePopupWindowButton
+9637 CMFCVisualManagerOffice2003::OnErasePopupWindowButton
+9638 CMFCVisualManagerOfficeXP::OnErasePopupWindowButton
+9639 CMFCVisualManagerWindows::OnErasePopupWindowButton
+9640 CMFCVisualManager::OnEraseTabsArea
+9641 CMFCVisualManagerOffice2003::OnEraseTabsArea
+9642 CMFCVisualManagerOffice2007::OnEraseTabsArea
+9643 CMFCVisualManagerOfficeXP::OnEraseTabsArea
+9644 CMFCVisualManagerVS2005::OnEraseTabsArea
+9645 CMFCVisualManagerVS2008::OnEraseTabsArea
+9646 CMFCVisualManagerWindows::OnEraseTabsArea
+9647 CMFCVisualManager::OnEraseTabsArea
+9648 CMFCVisualManagerOffice2003::OnEraseTabsButton
+9649 CMFCVisualManagerOffice2007::OnEraseTabsButton
+9650 CMFCVisualManagerOfficeXP::OnEraseTabsButton
+9651 CMFCVisualManagerVS2008::OnEraseTabsButton
+9652 CMFCVisualManagerWindows::OnEraseTabsButton
+9653 CMFCVisualManager::OnEraseTabsFrame
+9654 CMFCVisualManagerOffice2003::OnEraseTabsFrame
+9655 CMFCVisualManagerOffice2007::OnEraseTabsFrame
+9656 CMFCVisualManagerVS2008::OnEraseTabsFrame
+9657 CMFCVisualManagerWindows::OnEraseTabsFrame
+9658 CMFCOutlookBarPane::OnEraseWorkArea
+9659 CCmdTarget::OnEvent
+9660 COccManager::OnEvent
+9661 COleControlSite::OnEvent
+9662 delete
+9663 CDocObjectServer::OnExecOleCmd
+9664 CArchiveStream::Clone
+9665 CFrameWndEx::OnExitSizeMove
+9666 CMDIFrameWndEx::OnExitSizeMove
+9667 CPaneFrameWnd::OnExitSizeMove
+9668 COleControlSite::XRowsetNotify::OnFieldChange
+9669 CDocument::OnFileClose
+9670 delete
+9671 COleUILinkInfo::AddRef
+9672 CDocManager::OnFileNew
+9673 CWinApp::OnFileNew
+9674 CFileDialog::XFileDialogEvents::OnFileOk
+9675 CDocManager::OnFileOpen
+9676 CWinApp::OnFileOpen
+9677 CHtmlView::OnFilePrint
+9678 CView::OnFilePrint
+9679 CView::OnFilePrintPreview
+9680 CWinApp::OnFilePrintSetup
+9681 CDocument::OnFileSave
+9682 CDocument::OnFileSaveAs
+9683 COleServerDoc::OnFileSaveCopyAs
+9684 CDocument::OnFileSendMail
+9685 COleDocument::OnFileSendMail
+9686 COleServerDoc::OnFileUpdate
+9687 CMFCVisualManager::OnEraseTabsArea
+9688 CMFCVisualManagerOffice2003::OnFillAutoHideButtonBackground
+9689 CMFCVisualManagerVS2005::OnFillAutoHideButtonBackground
+9690 CMFCAutoHideButton::OnFillBackground
+9691 CMFCButton::OnFillBackground
+9692 CMFCColorButton::OnFillBackground
+9693 CMFCDesktopAlertWndButton::OnFillBackground
+9694 CMFCHeaderCtrl::OnFillBackground
+9695 CMFCOutlookBarScrollButton::OnFillBackground
+9696 CMFCPopupMenuBar::OnFillBackground
+9697 CMFCPropertyGridCtrl::OnFillBackground
+9698 CMFCRibbonBar::OnFillBackground
+9699 CMFCRibbonButton::OnFillBackground
+9700 CMFCRibbonMainPanelButton::OnFillBackground
+9701 CMFCRibbonStatusBarPane::OnFillBackground
+9702 CMFCTabButton::OnFillBackground
+9703 CMFCTasksPane::OnFillBackground
+9704 CMFCToolTipCtrl::OnFillBackground
+9705 CMFCVisualManager::OnFillBarBackground
+9706 CMFCVisualManagerOffice2003::OnFillBarBackground
+9707 CMFCVisualManagerOffice2007::OnFillBarBackground
+9708 CMFCVisualManagerOfficeXP::OnFillBarBackground
+9709 CMFCVisualManagerVS2008::OnFillBarBackground
+9710 CMFCVisualManagerWindows::OnFillBarBackground
+9711 CMFCVisualManagerWindows7::OnFillBarBackground
+9712 CMFCVisualManager::OnFillButtonInterior
+9713 CMFCVisualManagerOffice2003::OnFillButtonInterior
+9714 CMFCVisualManagerOffice2007::OnFillButtonInterior
+9715 CMFCVisualManagerOfficeXP::OnFillButtonInterior
+9716 CMFCVisualManagerVS2008::OnFillButtonInterior
+9717 CMFCVisualManagerWindows::OnFillButtonInterior
+9718 CMFCVisualManagerWindows7::OnFillButtonInterior
+9719 CMFCVisualManager::OnFillCaptionBarButton
+9720 CMFCVisualManagerOffice2007::OnFillCaptionBarButton
+9721 CMFCVisualManagerOfficeXP::OnFillCaptionBarButton
+9722 CMFCVisualManager::OnFillCommandsListBackground
+9723 CMFCVisualManagerOffice2003::OnFillCommandsListBackground
+9724 CMFCVisualManagerOfficeXP::OnFillCommandsListBackground
+9725 CMFCVisualManagerVS2008::OnFillCommandsListBackground
+9726 CMFCVisualManagerWindows::OnFillCommandsListBackground
+9727 CMFCVisualManager::OnFillHeaderCtrlBackground
+9728 CMFCVisualManagerOffice2003::OnFillHeaderCtrlBackground
+9729 CMFCVisualManagerOffice2003::OnFillHighlightedArea
+9730 CMFCVisualManagerOffice2007::OnFillHighlightedArea
+9731 CMFCVisualManagerOfficeXP::OnFillHighlightedArea
+9732 CMFCVisualManagerVS2005::OnFillHighlightedArea
+9733 CMFCVisualManagerWindows::OnFillMenuImageRect
+9734 CMFCVisualManagerWindows7::OnFillMenuImageRect
+9735 CMFCVisualManager::OnFillMiniFrameCaption
+9736 CMFCVisualManagerOffice2007::OnFillMiniFrameCaption
+9737 CMFCVisualManagerOfficeXP::OnFillMiniFrameCaption
+9738 CMFCVisualManagerVS2005::OnFillMiniFrameCaption
+9739 CMFCVisualManagerWindows::OnFillMiniFrameCaption
+9740 CMFCVisualManager::OnFillOutlookBarCaption
+9741 CMFCVisualManagerOffice2003::OnFillOutlookBarCaption
+9742 CMFCVisualManagerOffice2007::OnFillOutlookBarCaption
+9743 CMFCVisualManager::OnFillOutlookPageButton
+9744 CMFCVisualManagerOffice2003::OnFillOutlookPageButton
+9745 CMFCVisualManagerOffice2007::OnFillOutlookPageButton
+9746 CMFCVisualManagerWindows::OnFillOutlookPageButton
+9747 CMFCVisualManager::OnEraseTabsArea
+9748 CMFCVisualManagerOffice2003::OnFillPopupWindowBackground
+9749 CMFCVisualManagerOffice2007::OnFillPopupWindowBackground
+9750 CMFCVisualManagerOfficeXP::OnFillPopupWindowBackground
+9751 CMFCVisualManager::OnFillRibbonButton
+9752 CMFCVisualManagerOffice2007::OnFillRibbonButton
+9753 CMFCVisualManagerOfficeXP::OnFillRibbonButton
+9754 CMFCVisualManagerWindows7::OnFillRibbonButton
+9755 CMFCVisualManager::OnFillRibbonEdit
+9756 CMFCVisualManagerOffice2007::OnFillRibbonEdit
+9757 CMFCVisualManager::OnFillRibbonMainPanelButton
+9758 CMFCVisualManagerOffice2007::OnFillRibbonMainPanelButton
+9759 CMFCVisualManager::OnFillRibbonMenuFrame
+9760 CMFCVisualManagerOffice2007::OnFillRibbonMenuFrame
+9761 CMFCVisualManagerOfficeXP::OnFillRibbonMenuFrame
+9762 CMFCVisualManager::OnFillRibbonQuickAccessToolBarPopup
+9763 CMFCVisualManagerOffice2007::OnFillRibbonQuickAccessToolBarPopup
+9764 CMFCVisualManagerWindows7::OnFillRibbonQuickAccessToolBarPopup
+9765 CMFCVisualManager::OnFillSplitterBackground
+9766 CMFCVisualManager::OnFillTab
+9767 CMFCVisualManagerOffice2003::OnFillTab
+9768 CMFCVisualManagerOffice2007::OnFillTab
+9769 CMFCVisualManagerOfficeXP::OnFillTab
+9770 delete
+9771 CMFCVisualManagerOffice2003::OnFillTasksGroupInterior
+9772 CMFCVisualManagerOfficeXP::OnFillTasksGroupInterior
+9773 CMFCVisualManagerWindows::OnFillTasksGroupInterior
+9774 CMFCVisualManager::OnFillTasksPaneBackground
+9775 CMFCVisualManagerOffice2003::OnFillTasksPaneBackground
+9776 CMFCVisualManagerWindows::OnFillTasksPaneBackground
+9777 CMFCVisualManager::OnFillToolTip
+9778 CArchiveStream::AddRef
+9779 CCmdTarget::OnFinalRelease
+9780 CDocument::OnFinalRelease
+9781 COleControl::OnFinalRelease
+9782 COlePropertyPage::OnFinalRelease
+9783 COleServerItem::OnFinalRelease
+9784 CWnd::OnFinalRelease
+9785 COleLinkingDoc::OnFindEmbeddedItem
+9786 CEditView::OnFindNext
+9787 CRichEditView::OnFindNext
+9788 CEditView::OnFindReplaceCmd
+9789 CRichEditView::OnFindReplaceCmd
+9790 CMiniFrameWnd::OnFloatStatus
+9791 CMiniFrameWnd::OnFloatStatus
+9792 COleUILinkInfo::AddRef
+9793 delete
+9794 CFileDialog::XFileDialogEvents::OnFolderChange
+9795 CFileDialog::XFileDialogEvents::OnFolderChanging
+9796 COleControl::OnFontChanged
+9797 COleControl::OnAppearanceChanged
+9798 CMFCShellListCtrl::OnFormatFileDate
+9799 CMFCShellListCtrl::OnFormatFileSize
+9800 CRichEditView::OnFormatFont
+9801 CMFCTasksPane::OnForward
+9802 COleControl::OnFrameClose
+9803 CBrowserControlSite::OnFrameWindowActivate
+9804 CArchiveStream::Clone
+9805 COleUILinkInfo::AddRef
+9806 COleServerDoc::OnFrameWindowActivate
+9807 CHtmlControlSite::XDocHostUIHandler::OnFrameWindowActivate
+9808 COleUILinkInfo::AddRef
+9809 COleServerDoc::XOleInPlaceActiveObject::OnFrameWindowActivate
+9810 delete
+9811 delete
+9812 CWnd::OnGesture
+9813 COleUILinkInfo::AddRef
+9814 COleUILinkInfo::AddRef
+9815 COleUILinkInfo::AddRef
+9816 COleUILinkInfo::AddRef
+9817 COleUILinkInfo::AddRef
+9818 CMFCToolBar::OnGetButton
+9819 CMFCToolBar::OnGetButtonCount
+9820 CMFCToolBar::OnGetButtonText
+9821 CMFCButton::OnGetCheck
+9822 CCheckListBox::OnGetCheckPosition
+9823 COleClientItem::OnGetClipboardData
+9824 COleServerItem::OnGetClipboardData
+9825 COleClientItem::OnGetClipRect
+9826 COleUILinkInfo::AddRef
+9827 COleControl::OnGetControlInfo
+9828 CMFCPropertySheet::OnGetDispInfo
+9829 CVSListBox::OnGetdispinfo
+9830 COleControl::OnGetDisplayString
+9831 CArchiveStream::AddRef
+9832 CArchiveStream::AddRef
+9833 CArchiveStream::AddRef
+9834 CMFCPropertyGridCtrl::OnGetDlgCode
+9835 CArchiveStream::AddRef
+9836 COleControl::OnGetDlgCode
+9837 CMFCVisualManagerVS2008::GetMDITabsBordersSize
+9838 CMDIClientAreaWnd::OnGetDragBounds
+9839 CPane::CalcSize
+9840 CMFCRibbonFontComboBox::OnGetDropListItemSize
+9841 CArchiveStream::AddRef
+9842 COleUILinkInfo::AddRef
+9843 COleUILinkInfo::AddRef
+9844 COleServerItem::OnGetExtent
+9845 CArchiveStream::AddRef
+9853 COleUILinkInfo::AddRef
+9854 CMFCButton::OnGetImage
+9855 COleUILinkInfo::AddRef
+9856 CMFCShellListCtrl::OnGetItemIcon
+9857 CMFCShellTreeCtrl::OnGetItemIcon
+9858 delete
+9859 COleClientItem::OnGetClipRect
+9860 CMFCToolBar::OnGetItemRect
+9861 CMFCDropDownListBox::OnGetItemSize
+9862 CMFCShellListCtrl::OnGetItemText
+9863 CMFCShellTreeCtrl::OnGetItemText
+9864 COleUILinkInfo::AddRef
+9865 COleServerDoc::OnGetLinkedItem
+9866 CFrameImpl::OnGetMinMaxInfo
+9867 CFrameWndEx::OnGetMinMaxInfo
+9868 CFullScreenImpl::OnGetMinMaxInfo
+9869 CMDIChildWndEx::OnGetMinMaxInfo
+9870 CMDIFrameWndEx::OnGetMinMaxInfo
+9871 CMiniFrameWnd::OnGetMinMaxInfo
+9872 CMultiPaneFrameWnd::OnGetMinMaxInfo
+9873 CPaneFrameWnd::OnGetMinMaxInfo
+9874 COleUILinkInfo::AddRef
+9875 CBasePane::OnGetObject
+9876 CMFCPropertyGridCtrl::OnGetObject
+9877 CWnd::OnGetObject
+9878 CArchiveStream::AddRef
+9879 COleControl::OnGetPredefinedStrings
+9880 COleControl::OnGetPredefinedValue
+9887 COleControl::OnGetViewExtent
+9888 COleControl::OnGetViewRect
+9889 CArchiveStream::AddRef
+9890 COleClientItem::OnGetWindowContext
+9891 CMFCToolBar::OnGlobalFontsChanged
+9892 CMFCToolBarComboBoxButton::OnGlobalFontsChanged
+9893 CMFCToolBarDateTimeCtrl::OnGlobalFontsChanged
+9894 CMFCToolBarEditBoxButton::OnGlobalFontsChanged
+9895 CMFCStandardColorsPropertyPage::OnGreyscale
+9896 COleUILinkInfo::AddRef
+9897 COleUILinkInfo::AddRef
+9898 COleUILinkInfo::AddRef
+9899 COleUILinkInfo::AddRef
+9900 CMFCPropertyGridCtrl::OnHeaderEndTrack
+9901 CMFCPropertyGridCtrl::OnHeaderItemChanged
+9902 CMFCPropertyGridCtrl::OnHeaderTrack
+9903 CMFCReBar::OnHeightChange
+9904 CReBar::OnHeightChange
+9905 CFrameWnd::OnHelp
+9906 COleUILinkInfo::AddRef
+9907 CWinApp::OnHelp
+9908 CWnd::OnHelp
+9909 CFileDialog::XFileDialogEvents::OnFolderChanging
+9910 CWinApp::OnHelpFinder
+9911 CWnd::OnHelpFinder
+9912 CBasePane::OnHelpHitTest
+9913 CControlBar::OnHelpHitTest
+9914 CDialog::OnHelpHitTest
+9915 CFrameWnd::OnHelpHitTest
+9916 CMFCToolBar::OnHelpHitTest
+9917 CWinApp::OnHelpIndex
+9918 CWnd::OnHelpIndex
+9919 CCommonDialog::OnHelpInfo
+9920 CMFCToolBarsCustomizeDialog::OnHelpInfo
+9921 CMFCWindowsManagerDialog::OnHelpInfo
+9922 CWnd::OnHelpInfo
+9923 CFrameWnd::OnHelpPromptAddr
+9924 CWinApp::OnHelpUsing
+9925 CWnd::OnHelpUsing
+9926 CMFCStandardColorsPropertyPage::OnHexColor
+9927 CDocObjectServerItem::OnHide
+9928 COleControl::OnHide
+9929 COleServerItem::OnHide
+9930 delete
+9931 delete
+9932 COleUILinkInfo::AddRef
+9933 CMFCRibbonEdit::OnHighlight
+9934 CMFCRibbonGalleryIcon::OnHighlight
+9935 CMFCVisualManager::OnHighlightMenuItem
+9936 CMFCVisualManagerOffice2007::OnHighlightMenuItem
+9937 CMFCVisualManagerOfficeXP::OnHighlightMenuItem
+9938 CMFCVisualManagerVS2008::OnHighlightMenuItem
+9939 CMFCVisualManagerWindows::OnHighlightMenuItem
+9940 CMFCVisualManagerWindows7::OnHighlightMenuItem
+9941 CMFCVisualManagerOffice2003::OnHighlightQuickCustomizeMenuButton
+9942 CMFCVisualManagerOfficeXP::OnHighlightQuickCustomizeMenuButton
+9943 CMFCVisualManager::OnHighlightRarelyUsedMenuItems
+9944 CMFCVisualManagerOffice2003::OnHighlightRarelyUsedMenuItems
+9945 CMFCVisualManagerOffice2007::OnHighlightRarelyUsedMenuItems
+9946 CMFCVisualManagerOfficeXP::OnHighlightRarelyUsedMenuItems
+9947 CMFCVisualManagerVS2008::OnHighlightRarelyUsedMenuItems
+9948 CMFCVisualManagerWindows::OnHighlightRarelyUsedMenuItems
+9949 CMFCCustomColorsPropertyPage::OnHLSChanged
+9950 CMFCTasksPane::OnHome
+9951 CFrameWnd::OnHScroll
+9952 CMFCTabCtrl::OnHScroll
+9953 CPreviewView::OnHScroll
+9954 CScrollView::OnHScroll
+9955 CSplitterWnd::OnHScroll
+9956 CWnd::OnHScroll
+9957 CDocTemplate::OnIdle
+9958 CDocument::OnIdle
+9959 COleDocument::OnIdle
+9960 CWinApp::OnIdle
+9961 CWinThread::OnIdle
+9962 CBasePane::OnIdleUpdateCmdUI
+9963 CControlBar::OnIdleUpdateCmdUI
+9964 CFrameWnd::OnIdleUpdateCmdUI
+9965 CFrameWndEx::OnIdleUpdateCmdUI
+9966 CMDIChildWndEx::OnIdleUpdateCmdUI
+9967 CMDIFrameWnd::OnIdleUpdateCmdUI
+9968 CMDIFrameWndEx::OnIdleUpdateCmdUI
+9969 CMFCPopupMenuBar::OnIdleUpdateCmdUI
+9970 CMFCTasksPaneToolBar::OnIdleUpdateCmdUI
+9971 CMultiPaneFrameWnd::OnIdleUpdateCmdUI
+9972 COleCntrFrameWnd::OnIdleUpdateCmdUI
+9973 COleCntrFrameWndEx::OnIdleUpdateCmdUI
+9974 COleDocIPFrameWndEx::OnIdleUpdateCmdUI
+9975 COleIPFrameWnd::OnIdleUpdateCmdUI
+9976 COleDocIPFrameWndEx::OnIdleUpdateCmdUI
+9977 CPaneFrameWnd::OnIdleUpdateCmdUI
+9978 CMFCEditBrowseCtrl::OnIllegalFileName
+9979 CMFCToolBarButtonCustomizeDialog::OnImage
+9980 CMFCToolBarButtonCustomizeDialog::OnImageList
+9981 CMFCToolBarButtonCustomizeDialog::OnImageText
+9982 COleControl::OnInactiveMouseMove
+9983 COleControl::XPointerInactive::OnInactiveMouseMove
+9984 COleControl::OnInactiveSetCursor
+9985 COleControl::XPointerInactive::OnInactiveSetCursor
+9986 CMFCButton::OnInitControl
+9987 CMFCColorButton::OnInitControl
+9988 CMFCEditBrowseCtrl::OnInitControl
+9989 CMFCFontComboBox::OnInitControl
+9990 CMFCLinkCtrl::OnInitControl
+9991 CMFCMaskedEdit::OnInitControl
+9992 CMFCMenuButton::OnInitControl
+9993 CMFCPropertyGridCtrl::OnInitControl
+9994 CMFCShellListCtrl::OnInitControl
+9995 CMFCShellTreeCtrl::OnInitControl
+9996 CVSListBox::OnInitControl
+9997 CDHtmlDialog::OnInitDialog
+9998 CDialog::OnInitDialog
+9999 CMFCColorDialog::OnInitDialog
+10000 CMFCColorPropertySheet::OnInitDialog
+10001 CMFCCustomColorsPropertyPage::OnInitDialog
+10002 CMFCDesktopAlertDialog::OnInitDialog
+10003 CMFCImageEditorDialog::OnInitDialog
+10004 CMFCKeyMapDialog::OnInitDialog
+10005 CMFCMousePropertyPage::OnInitDialog
+10006 CMFCPropertyPage::OnInitDialog
+10007 CMFCPropertySheet::OnInitDialog
+10008 CMFCRibbonCustomizePropertyPage::OnInitDialog
+10009 CMFCRibbonKeyboardCustomizeDialog::OnInitDialog
+10010 CMFCStandardColorsPropertyPage::OnInitDialog
+10011 CMFCToolBarButtonCustomizeDialog::OnInitDialog
+10012 CMFCToolBarNameDialog::OnInitDialog
+10013 CMFCToolBarsCommandsPropertyPage::OnInitDialog
+10014 CMFCToolBarsCustomizeDialog::OnInitDialog
+10015 CMFCToolBarsKeyboardPropertyPage::OnInitDialog
+10016 CMFCToolBarsListPropertyPage::OnInitDialog
+10017 CMFCToolBarsMenuPropertyPage::OnInitDialog
+10018 CMFCToolBarsOptionsPropertyPage::OnInitDialog
+10019 CMFCToolBarsToolsPropertyPage::OnInitDialog
+10020 CMFCWindowsManagerDialog::OnInitDialog
+10021 COlePropertiesDialog::OnInitDialog
+10022 COlePropertyPage::OnInitDialog
+10023 COutlookOptionsDlg::OnInitDialog
+10024 CPropertySheet::OnInitDialog
+10025 CFileDialog::OnInitDone
+10026 COleServerItem::OnInitFromData
+10027 CMFCToolBarsToolsPropertyPage::OnInitialDirectoryOptions
+10028 CControlBar::OnInitialUpdate
+10029 CFormView::OnInitialUpdate
+10030 COleDBRecordView::OnInitialUpdate
+10031 CRecordView::OnInitialUpdate
+10032 CRichEditView::OnInitialUpdate
+10033 CTabView::OnInitialUpdate
+10034 CView::OnInitialUpdate
+10035 CFrameWnd::OnInitMenu
+10036 COleFrameHook::OnInitMenu
+10037 CFrameWnd::OnInitMenuPopup
+10038 COleControl::OnInitMenuPopup
+10039 COleFrameHook::OnInitMenuPopup
+10040 COleClientItem::XOleIPSite::OnInPlaceActivate
+10041 COleUILinkInfo::AddRef
+10042 COleControlSite::XOleIPSite::OnInPlaceActivateEx
+10043 COleClientItem::XOleIPSite::OnInPlaceDeactivate
+10044 COleControlSite::XOleIPSite::OnInPlaceDeactivate
+10045 CGopherFileFind::GetCreationTime
+10046 CMFCKeyMapDialog::OnInsertItem
+10047 COleClientItem::OnInsertMenus
+10048 COleDocObjectItem::OnInsertMenus
+10049 CRichEditView::OnInsertObject
+10050 CDockingPanesRow::OnInsertPane
+10051 CDockSite::OnInsertRow
+10052 CSplitterWnd::OnInvertTracker
+10053 CVSListBox::OnItemChanged
+10054 CMFCMousePropertyPage::OnItemchangedListViews
+10055 CMFCShellTreeCtrl::OnItemexpanding
+10056 delete
+10057 CFileDialog::XFileDialogControlEvents::OnItemSelected
+10058 CDockContext::OnKey
+10059 CMFCColorBar::OnKey
+10060 CMFCPopupMenuBar::OnKey
+10061 CMFCRibbonApplicationButton::OnKey
+10062 CMFCRibbonBaseElement::OnKey
+10063 CMFCRibbonButton::OnKey
+10064 CMFCRibbonCategory::OnKey
+10065 CMFCRibbonDefaultPanelButton::OnKey
+10066 CMFCRibbonEdit::OnKey
+10067 CMFCRibbonGallery::OnKey
+10068 CMFCRibbonPanel::OnKey
+10069 CMFCRibbonPanelMenuBar::OnKey
+10070 CMFCRibbonTab::OnKey
+10071 CVSListBoxBase::OnKey
+10072 CCheckListBox::OnKeyDown
+10073 CMFCColorButton::OnKeyDown
+10074 CMFCColorPickerCtrl::OnKeyDown
+10075 CMFCDropDownListBox::OnKeyDown
+10076 CMFCMaskedEdit::OnKeyDown
+10077 CMFCMenuButton::OnKeyDown
+10078 CMFCPopupMenu::OnKeyDown
+10079 CMFCPropertyGridCtrl::OnKeyDown
+10080 CMFCRibbonPanelMenu::OnKeyDown
+10081 CMFCToolBarButtonsListButton::OnKeyDown
+10082 CMFCToolBarsListCheckBox::OnKeyDown
+10083 COleControl::OnKeyDown
+10084 CRichEditView::OnKeyDown
+10085 CSplitterWnd::OnKeyDown
+10086 CVSListBox::OnKeyDown
+10087 CVSListBoxEditCtrl::OnKeyDown
+10088 delete
+10089 delete
+10090 COleControl::OnKeyUp
+10091 delete
+10092 CMFCImageEditorDialog::OnKickIdle
+10093 CPropertySheet::OnKickIdle
+10094 CMFCToolBarsToolsPropertyPage::OnKillActive
+10095 CPropertyPage::OnKillActive
+10096 CMFCAcceleratorKeyAssignCtrl::OnKillFocus
+10097 CMFCButton::OnKillFocus
+10098 CMFCColorPickerCtrl::OnKillFocus
+10099 CMFCMenuButton::OnKillFocus
+10100 CMFCPropertyGridCtrl::OnKillFocus
+10101 CMFCRibbonBar::OnKillFocus
+10102 CMFCRibbonRichEditCtrl::OnKillFocus
+10103 CMFCToolBar::OnKillFocus
+10104 CMFCToolBarComboBoxEdit::OnKillFocus
+10105 CMFCToolBarEditCtrl::OnKillFocus
+10106 COleControl::OnKillFocus
+10107 CMultiPaneFrameWnd::OnKillRollUpTimer
+10108 CPaneFrameWnd::OnKillRollUpTimer
+10109 CMFCToolBarsOptionsPropertyPage::OnLargeIcons
+10110 CCheckListBox::OnLBAddString
+10111 CMFCToolBarsListCheckBox::OnLBAddString
+10112 CMFCToolBarsListCheckBox::OnLBDeleteString
+10113 CCheckListBox::OnLBFindString
+10114 CCheckListBox::OnLBFindStringExact
+10115 CCheckListBox::OnLBGetItemData
+10116 CCheckListBox::OnLBGetText
+10117 CCheckListBox::OnLBInsertString
+10118 CMFCToolBarsListCheckBox::OnLBInsertString
+10119 CMFCToolBarsListCheckBox::OnLBResetContent
+10120 delete
+10121 CCheckListBox::OnLBSelectString
+10122 CCheckListBox::OnLBSetItemData
+10123 CCheckListBox::OnLBSetItemHeight
+10124 CCheckListBox::OnLButtonDblClk
+10125 CControlBar::OnLButtonDblClk
+10126 CDockablePane::OnLButtonDblClk
+10127 CMFCBaseTabCtrl::OnLButtonDblClk
+10128 CMFCButton::OnLButtonDblClk
+10129 CMFCColorBar::OnLButtonDblClk
+10130 CMFCColorPickerCtrl::OnLButtonDblClk
+10131 CMFCMenuBar::OnLButtonDblClk
+10132 CMFCMenuButton::OnLButtonDblClk
+10133 CMFCPopupMenuBar::OnLButtonDblClk
+10134 CMFCPropertyGridCtrl::OnLButtonDblClk
+10135 CMFCRibbonApplicationButton::OnLButtonDblClk
+10136 CMFCRibbonBar::OnLButtonDblClk
+10137 CMFCRibbonPanelMenuBar::OnLButtonDblClk
+10138 CMFCRibbonTab::OnLButtonDblClk
+10139 CMFCStatusBar::OnLButtonDblClk
+10140 CMFCTabCtrl::OnLButtonDblClk
+10141 CMFCToolBar::OnLButtonDblClk
+10142 CMFCToolBarsListCheckBox::OnLButtonDblClk
+10143 CMultiPaneFrameWnd::OnLButtonDblClk
+10144 COleControl::OnLButtonDblClk
+10145 CPane::OnLButtonDblClk
+10146 CPaneDialog::OnLButtonDblClk
+10147 CPaneFrameWnd::OnLButtonDblClk
+10148 CSplitterWnd::OnLButtonDblClk
+10149 CCheckListBox::OnLButtonDown
+10150 CControlBar::OnLButtonDown
+10151 CDockablePane::OnLButtonDown
+10152 CFrameImpl::OnLButtonDown
+10153 CFrameWndEx::OnLButtonDown
+10154 CMDIChildWndEx::OnLButtonDown
+10155 CMDIFrameWndEx::OnLButtonDown
+10156 CMFCAutoHideBar::OnLButtonDown
+10157 CMFCBaseTabCtrl::OnLButtonDown
+10158 CMFCButton::OnLButtonDown
+10159 CMFCCaptionBar::OnLButtonDown
+10160 CMFCColorBar::OnLButtonDown
+10161 CMFCColorButton::OnLButtonDown
+10162 CMFCColorDialog::OnLButtonDown
+10163 CMFCColorPickerCtrl::OnLButtonDown
+10164 CMFCDesktopAlertDialog::OnLButtonDown
+10165 CMFCDesktopAlertWnd::OnLButtonDown
+10166 CMFCEditBrowseCtrl::OnLButtonDown
+10167 CMFCHeaderCtrl::OnLButtonDown
+10168 CMFCImagePaintArea::OnLButtonDown
+10169 CMFCMenuBar::OnLButtonDown
+10170 CMFCMenuButton::OnLButtonDown
+10171 CMFCOutlookBarTabCtrl::OnLButtonDown
+10172 CMFCPopupMenu::OnLButtonDown
+10173 CMFCPopupMenuBar::OnLButtonDown
+10174 CMFCPropertyGridCtrl::OnLButtonDown
+10175 CMFCReBar::OnLButtonDown
+10176 CMFCRibbonApplicationButton::OnLButtonDown
+10177 CMFCRibbonBar::OnLButtonDown
+10178 CMFCRibbonBaseElement::OnLButtonDown
+10179 CMFCRibbonButton::OnLButtonDown
+10180 CMFCRibbonCategory::OnLButtonDown
+10181 CMFCRibbonComboBox::OnLButtonDown
+10182 CMFCRibbonDefaultPanelButton::OnLButtonDown
+10183 CMFCRibbonEdit::OnLButtonDown
+10184 CMFCRibbonGalleryIcon::OnLButtonDown
+10185 CMFCRibbonPanelMenu::OnLButtonDown
+10186 CMFCRibbonPanelMenuBar::OnLButtonDown
+10187 CMFCRibbonSlider::OnLButtonDown
+10188 CMFCRibbonTab::OnLButtonDown
+10189 CMFCSpinButtonCtrl::OnLButtonDown
+10190 CMFCTabCtrl::OnLButtonDown
+10191 CMFCTasksPane::OnLButtonDown
+10192 CMFCToolBar::OnLButtonDown
+10193 CMFCToolBarButtonsListButton::OnLButtonDown
+10194 CMFCToolBarsCommandsListBox::OnLButtonDown
+10195 CMFCToolBarsListCheckBox::OnLButtonDown
+10196 COleControl::OnLButtonDown
+10197 COleResizeBar::OnLButtonDown
+10198 CPane::OnLButtonDown
+10199 CPaneDialog::OnLButtonDown
+10200 CPaneDivider::OnLButtonDown
+10201 CPaneFrameWnd::OnLButtonDown
+10202 CPreviewView::OnLButtonDown
+10203 CScreenWnd::OnLButtonDown
+10204 CSplitterWnd::OnLButtonDown
+10205 CDockablePane::OnLButtonUp
+10206 CFrameImpl::OnLButtonUp
+10207 CFrameWndEx::OnLButtonUp
+10208 CMDIChildWndEx::OnLButtonUp
+10209 CMDIFrameWndEx::OnLButtonUp
+10210 CMFCBaseTabCtrl::OnLButtonUp
+10211 CMFCButton::OnLButtonUp
+10212 CMFCCaptionBar::OnLButtonUp
+10213 CMFCColorBar::OnLButtonUp
+10214 CMFCColorPickerCtrl::OnLButtonUp
+10215 CMFCDesktopAlertWnd::OnLButtonUp
+10216 CMFCDropDownToolBar::OnLButtonUp
+10217 CMFCEditBrowseCtrl::OnLButtonUp
+10218 CMFCHeaderCtrl::OnLButtonUp
+10219 CMFCImagePaintArea::OnLButtonUp
+10220 CMFCMaskedEdit::OnLButtonUp
+10221 CMFCMenuButton::OnLButtonUp
+10222 CMFCOutlookBarPane::OnLButtonUp
+10223 CMFCOutlookBarTabCtrl::OnLButtonUp
+10224 CMFCPopupMenu::OnLButtonUp
+10225 CMFCPopupMenuBar::OnLButtonUp
+10226 CMFCPropertyGridCtrl::OnLButtonUp
+10227 CMFCReBar::OnLButtonDown
+10228 CMFCRibbonBar::OnLButtonUp
+10229 CMFCRibbonButton::OnLButtonUp
+10230 CMFCRibbonCaptionButton::OnLButtonUp
+10231 CMFCRibbonCategory::OnLButtonUp
+10232 delete
+10233 CMFCRibbonContextCaption::OnLButtonUp
+10234 delete
+10235 CMFCRibbonPanelMenuBar::OnLButtonUp
+10236 CMFCRibbonSlider::OnLButtonUp
+10237 CMFCSpinButtonCtrl::OnLButtonUp
+10238 CMFCTabCtrl::OnLButtonUp
+10239 CMFCTasksPane::OnLButtonUp
+10240 CMFCToolBar::OnLButtonUp
+10241 COleControl::OnLButtonUp
+10242 CPane::OnLButtonUp
+10243 CPaneDivider::OnLButtonUp
+10244 CPaneFrameWnd::OnLButtonUp
+10245 CSplitterWnd::OnLButtonUp
+10246 CDocument::OnLoadDocumentFromStream
+10247 COleDocument::OnLoadDocumentFromStream
+10248 CFrameImpl::OnLoadFrame
+10249 delete
+10250 CMFCCustomColorsPropertyPage::OnLuminance
+10251 COleControl::OnMapPropertyToPage
+10252 COleControl::OnMButtonDblClk
+10253 COleControl::OnMButtonDown
+10254 COleControl::OnMButtonUp
+10255 CMDIChildWnd::OnMDIActivate
+10256 CMDIChildWndEx::OnMDIActivate
+10260 CMDIFrameWnd::OnMDIWindowCmd
+10261 CWnd::OnMeasureItem
+10262 delete
+10263 CFrameImpl::OnMenuChar
+10264 CFrameWnd::OnMenuChar
+10265 CFrameWndEx::OnMenuChar
+10266 CMDIFrameWnd::OnMenuChar
+10267 CMDIFrameWndEx::OnMenuChar
+10268 COleDocIPFrameWndEx::OnMenuChar
+10269 COleDocIPFrameWndEx::OnMenuChar
+10270 CMFCRibbonRecentFilesList::OnMenuKey
+10271 CFrameWnd::OnMenuSelect
+10272 COleControl::OnMenuSelect
+10273 COleFrameHook::OnMenuSelect
+10274 COleMessageFilter::OnMessagePending
+10275 CSocket::OnMessagePending
+10276 CMFCWindowsManagerDialog::OnMinimize
+10277 delete
+10278 COleControl::XOleControl::OnMnemonic
+10279 CControlBar::OnMouseActivate
+10280 CMDIChildWnd::OnMouseActivate
+10281 CMDITabProxyWnd::OnMouseActivate
+10282 CAsyncMonikerFile::GetBindInfo
+10283 CAsyncMonikerFile::GetBindInfo
+10284 CAsyncMonikerFile::GetBindInfo
+10285 CMiniDockFrameWnd::OnMouseActivate
+10286 COleControl::OnMouseActivate
+10287 CPaneFrameWnd::OnMouseActivate
+10288 CTabView::OnMouseActivate
+10289 CView::OnMouseActivate
+10290 CMFCAutoHideBar::OnMouseLeave
+10291 CMFCCaptionBar::OnMouseLeave
+10292 CMFCColorBar::OnMouseLeave
+10293 CMFCHeaderCtrl::OnMouseLeave
+10295 CMFCRibbonBar::OnMouseLeave
+10296 CMFCRibbonPanelMenuBar::OnMouseLeave
+10297 CMFCRibbonRichEditCtrl::OnMouseLeave
+10298 CMFCSpinButtonCtrl::OnMouseLeave
+10299 CMFCToolBar::OnMouseLeave
+10300 CMFCToolBarComboBoxEdit::OnMouseLeave
+10301 CMFCToolBarEditCtrl::OnMouseLeave
+10302 CDockablePane::OnMouseMove
+10303 CFrameImpl::OnMouseMove
+10304 CFrameWndEx::OnMouseMove
+10305 CMDIChildWndEx::OnMouseMove
+10306 CMDIFrameWndEx::OnMouseMove
+10307 CMFCAutoHideBar::OnMouseMove
+10308 CMFCBaseTabCtrl::OnMouseMove
+10309 CMFCButton::OnMouseMove
+10310 CMFCCaptionBar::OnMouseMove
+10311 CMFCColorBar::OnMouseMove
+10312 CMFCColorButton::OnMouseMove
+10313 CMFCColorDialog::OnMouseMove
+10314 CMFCColorPickerCtrl::OnMouseMove
+10315 CMFCDesktopAlertWnd::OnMouseMove
+10316 CMFCDropDownToolBar::OnMouseMove
+10317 CMFCEditBrowseCtrl::OnMouseMove
+10318 CMFCHeaderCtrl::OnMouseMove
+10319 CMFCImagePaintArea::OnMouseMove
+10320 CMFCOutlookBarTabCtrl::OnMouseMove
+10321 CMFCPopupMenu::OnMouseMove
+10322 CMFCPopupMenuBar::OnMouseMove
+10323 CMFCPropertyGridCtrl::OnMouseMove
+10325 CMFCReBar::OnLButtonDown
+10326 CMFCRibbonBar::OnMouseMove
+10327 CMFCRibbonButton::OnMouseMove
+10328 CMFCRibbonCategory::OnMouseMove
+10329 CMFCRibbonLinkCtrl::OnMouseMove
+10330 CMFCRibbonPanelMenuBar::OnMouseMove
+10331 CMFCRibbonSlider::OnMouseMove
+10332 CMFCSpinButtonCtrl::OnMouseMove
+10333 CMFCTabCtrl::OnMouseMove
+10334 CMFCTasksPane::OnMouseMove
+10335 CMFCToolBar::OnMouseMove
+10336 CMFCToolBarComboBoxEdit::OnMouseMove
+10337 CMFCToolBarEditCtrl::OnMouseMove
+10338 COleControl::OnMouseMove
+10339 CPane::OnMouseMove
+10340 CPaneDivider::OnMouseMove
+10341 CPaneFrameWnd::OnMouseMove
+10342 CRibbonCategoryScroll::OnMouseMove
+10343 CScreenWnd::OnMouseMove
+10344 CSmartDockingManager::OnMouseMove
+10345 CSplitterWnd::OnMouseMove
+10346 CMFCPopupMenu::OnMouseWheel
+10347 CMFCPropertyGridCtrl::OnMouseWheel
+10348 CMFCRibbonBar::OnMouseWheel
+10349 CMFCRibbonPanelMenu::OnMouseWheel
+10350 CMFCTasksPane::OnMouseWheel
+10351 CScrollView::OnMouseWheel
+10352 CSplitterWnd::OnMouseWheel
+10353 CMFCToolBarComboBoxButton::OnMove
+10354 CMFCToolBarDateTimeCtrl::OnMove
+10355 CMFCToolBarEditBoxButton::OnMove
+10356 CMFCToolBarSpinEditBoxButton::OnMove
+10357 COleControl::OnMove
+10358 COleDBRecordView::OnMove
+10359 CRecordView::OnMove
+10360 COutlookOptionsDlg::OnMoveDown
+10361 CPaneContainer::OnMoveInternalPaneDivider
+10362 CDockingManager::OnMoveMiniFrame
+10363 CFrameWndEx::OnMoveMiniFrame
+10364 CMDIChildWndEx::OnMoveMiniFrame
+10365 CMDIFrameWndEx::OnMoveMiniFrame
+10366 COleCntrFrameWndEx::OnMoveMiniFrame
+10367 COleDocIPFrameWndEx::OnMoveMiniFrame
+10368 COleDocIPFrameWndEx::OnMoveMiniFrame
+10369 CPaneFrameWnd::OnMovePane
+10370 CMDIClientAreaWnd::OnMoveTabComplete
+10371 COutlookOptionsDlg::OnMoveUp
+10372 CPaneFrameWnd::OnMoving
+10373 CDHtmlDialog::OnNavigateComplete
+10374 CMultiPageDHtmlDialog::OnNavigateComplete
+10375 CHtmlEditView::OnNavigateComplete2
+10376 delete
+10377 CHtmlView::OnNavigateError
+10378 CDialogEx::OnNcActivate
+10379 CDialogImpl::OnNcActivate
+10380 CFrameImpl::OnNcActivate
+10381 CFrameWnd::OnNcActivate
+10382 CFrameWndEx::OnNcActivate
+10383 CListBox::CharToItem
+10384 CMDIChildWndEx::OnNcActivate
+10385 CMDIFrameWndEx::OnNcActivate
+10386 CDialogEx::OnNcActivate
+10387 COleUILinkInfo::AddRef
+10388 CMFCVisualManagerOffice2007::OnNcActivate
+10389 CMFCVisualManagerWindows7::OnNcActivate
+10390 CMiniFrameWnd::OnNcActivate
+10391 CPaneFrameWnd::OnNcActivate
+10392 CDockablePane::OnNcCalcSize
+10393 CDockBar::OnNcCalcSize
+10394 CFrameImpl::OnNcCalcSize
+10395 CFrameWndEx::OnNcCalcSize
+10396 CMDIChildWndEx::OnNcCalcSize
+10397 CMDIFrameWndEx::OnNcCalcSize
+10398 CMFCCaptionBar::OnNcCalcSize
+10399 CMFCColorBar::OnNcCalcSize
+10400 CMFCEditBrowseCtrl::OnNcCalcSize
+10401 CMFCOutlookBarPane::OnNcCalcSize
+10402 delete
+10403 delete
+10404 CMFCPropertyGridCtrl::OnNcCalcSize
+10405 CMFCReBar::OnNcCalcSize
+10406 CMFCToolBar::OnNcCalcSize
+10407 COleControl::OnNcCalcSize
+10408 CPaneFrameWnd::OnNcCalcSize
+10409 CReBar::OnNcCalcSize
+10410 CStatusBar::OnNcCalcSize
+10411 CToolBar::OnNcCalcSize
+10412 CVSListBoxEditCtrl::OnNcCalcSize
+10413 CMDIChildWnd::OnNcCreate
+10414 CMFCReBar::OnNcCreate
+10415 CMiniFrameWnd::OnNcCreate
+10416 COleControl::OnNcCreate
+10417 CMiniFrameWnd::OnNcCreate
+10418 CPropertySheet::OnNcCreate
+10419 CMFCReBar::OnNcCreate
+10420 CSplitterWnd::OnNcCreate
+10421 CToolBar::OnNcCreate
+10422 CBaseTabbedPane::OnNcDestroy
+10423 CDockSite::OnNcDestroy
+10424 CListCtrl::OnNcDestroy
+10425 CListCtrl::OnNcDestroy
+10426 CMFCAutoHideBar::OnNcDestroy
+10427 CDockSite::OnNcDestroy
+10428 CMFCOutlookBarPane::OnNcDestroy
+10429 CMFCOutlookBarPaneAdapter::OnNcDestroy
+10430 CMFCPreviewCtrlImpl::OnNcDestroy
+10431 CPane::OnNcDestroy
+10432 CPaneDivider::OnNcDestroy
+10433 CPaneFrameWnd::OnNcDestroy
+10434 CWnd::OnNcDestroy
+10435 CDockablePane::OnNcHitTest
+10436 CFrameImpl::OnNcHitTest
+10437 CFrameWndEx::OnNcHitTest
+10438 CMDIChildWndEx::OnNcHitTest
+10439 CMDIFrameWndEx::OnNcHitTest
+10440 CMFCEditBrowseCtrl::OnNcHitTest
+10441 CMFCPopupMenu::OnNcHitTest
+10442 CMFCRibbonStatusBar::OnNcHitTest
+10443 CMFCStatusBar::OnNcHitTest
+10444 CArchiveStream::AddRef
+10445 CMiniFrameWnd::OnNcHitTest
+10446 COleControl::OnNcHitTest
+10447 CPaneFrameWnd::OnNcHitTest
+10448 CStatusBar::OnNcHitTest
+10449 CArchiveStream::AddRef
+10450 delete
+10451 CMiniDockFrameWnd::OnNcLButtonDblClk
+10452 CMFCReBar::OnLButtonDown
+10453 CDockablePane::OnNcLButtonDown
+10454 CMFCPopupMenu::OnNcLButtonDown
+10455 CMiniDockFrameWnd::OnNcLButtonDown
+10456 COleControl::OnNcLButtonDown
+10457 CDockablePane::OnNcMouseMove
+10458 CFrameImpl::OnNcMouseMove
+10459 CFrameWndEx::OnNcMouseMove
+10460 CMDIChildWndEx::OnNcMouseMove
+10461 CMDIFrameWndEx::OnNcMouseMove
+10462 CMFCEditBrowseCtrl::OnNcMouseMove
+10463 CPaneFrameWnd::OnNcMouseMove
+10464 CDockablePane::OnNcPaint
+10465 CDockBar::OnNcPaint
+10466 CFrameImpl::OnNcPaint
+10467 CFrameWndEx::OnNcPaint
+10468 CMDIChildWndEx::OnNcPaint
+10469 CMDIFrameWndEx::OnNcPaint
+10470 CMFCCaptionBar::OnNcPaint
+10471 CMFCColorBar::OnNcPaint
+10472 CMFCEditBrowseCtrl::OnNcPaint
+10473 delete
+10474 delete
+10475 CMFCPropertyGridCtrl::OnNcPaint
+10476 CMFCReBar::OnNcPaint
+10477 CMFCTasksPaneFrameWnd::OnNcPaint
+10478 CMFCToolBar::OnNcPaint
+10479 COleUILinkInfo::AddRef
+10480 CMFCVisualManagerOffice2007::OnNcPaint
+10481 CMFCVisualManagerWindows7::OnNcPaint
+10482 COleControl::OnNcPaint
+10483 CPaneFrameWnd::OnNcPaint
+10484 CDockBar::OnNcPaint
+10485 CDockBar::OnNcPaint
+10486 CDockBar::OnNcPaint
+10487 CMDIChildWndEx::OnNcRButtonUp
+10488 CDockablePane::OnNeedTipText
+10489 CMFCBaseTabCtrl::OnNeedTipText
+10490 CMFCCaptionBar::OnNeedTipText
+10491 CMFCPropertyGridCtrl::OnNeedTipText
+10492 CMFCRibbonBar::OnNeedTipText
+10493 CMFCRibbonPanelMenuBar::OnNeedTipText
+10494 CMFCTasksPane::OnNeedTipText
+10495 CMFCTasksPaneFrameWnd::OnNeedTipText
+10496 CMFCToolBar::OnNeedTipText
+10497 CPaneFrameWnd::OnNeedTipText
+10498 CDocument::OnNewDocument
+10499 CDocument::OnNewDocument
+10500 COleDocument::OnNewDocument
+10501 COleLinkingDoc::OnNewDocument
+10502 COleServerDocEx::OnNewDocument
+10503 COleServerDoc::OnNewEmbedding
+10504 CMFCToolBarsListCheckBox::OnNewString
+10505 CMFCToolBarsListPropertyPage::OnNewToolbar
+10506 CHtmlView::OnNewWindow2
+10507 CEnumArray::OnNext
+10508 CEnumConnPoints::OnNext
+10509 CEnumConnPoints::OnNext
+10510 CEnumFormatEtc::OnNext
+10511 CEnumOleVerb::OnNext
+10512 CEnumConnPoints::OnNext
+10513 CPreviewView::OnNextPage
+10514 CView::OnNextPaneCmd
+10515 CMFCMousePropertyPage::OnNoDblcliick
+10516 CFileDialog::OnNotify
+10517 CMFCColorPropertySheet::OnNotify
+10518 CMFCKeyMapDialog::OnNotify
+10519 CMFCPopupMenu::OnNotify
+10520 CMFCPropertyGridCtrl::OnNotify
+10521 CMFCTabCtrl::OnNotify
+10522 CPropertyPage::OnNotify
+10523 CSplitterWnd::OnNotify
+10524 CWnd::OnNotify
+10525 COleMessageFilter::OnNotRespondingDialog
+10526 CWnd::OnNTCtlColor
+10527 CPreviewView::OnNumPageChange
+10528 delete
+10529 COleControl::OnOcmCtlColorBtn
+10530 COleControl::OnOcmCtlColorDlg
+10531 COleControl::OnOcmCtlColorEdit
+10532 COleControl::OnOcmCtlColorListBox
+10533 COleControl::OnOcmCtlColorMsgBox
+10534 COleControl::OnOcmCtlColorScrollBar
+10535 COleControl::OnOcmCtlColorStatic
+10536 CCommonDialog::OnOK
+10537 CDialog::OnOK
+10538 CMFCRibbonCustomizePropertyPage::OnOK
+10539 CMFCTasksPane::OnOK
+10540 CMFCToolBarButtonCustomizeDialog::OnOK
+10541 CMFCToolBarsToolsPropertyPage::OnOK
+10542 COutlookOptionsDlg::OnOK
+10543 delete
+10544 COleControl::OnOpen
+10545 COleServerItem::OnOpen
+10546 CDocument::OnOpenDocument
+10547 CHtmlEditDoc::OnOpenDocument
+10548 COleDocument::OnOpenDocument
+10549 COleLinkingDoc::OnOpenDocument
+10550 COleServerDoc::OnOpenEmbedding
+10551 CWinApp::OnOpenRecentFile
+10552 CMFCTasksPane::OnOther
+10553 delete
+10554 CFileDialog::XFileDialogEvents::OnFolderChanging
+10555 CAutoHideDockSite::OnPaint
+10556 CBasePane::OnPaint
+10557 CListBox::CharToItem
+10558 CControlBar::OnPaint
+10559 CListBox::CharToItem
+10560 CDialog::OnPaint
+10561 CDockSite::OnPaint
+10562 CDockBar::OnPaint
+10563 CDockSite::OnPaint
+10564 CListBox::CharToItem
+10565 CListBox::CharToItem
+10566 CMFCCaptionBar::OnPaint
+10567 CMFCDesktopAlertDialog::OnPaint
+10568 CMFCDesktopAlertWnd::OnPaint
+10569 CMFCDropDownFrame::OnPaint
+10570 CMFCHeaderCtrl::OnPaint
+10571 CMFCImageEditorDialog::OnPaint
+10572 CAutoHideDockSite::OnPaint
+10573 CMFCOutlookBarTabCtrl::OnPaint
+10574 CMFCPopupMenu::OnPaint
+10575 CMFCPreviewCtrlImpl::OnPaint
+10576 CMFCPropertyGridCtrl::OnPaint
+10577 CMFCPropertyGridToolTipCtrl::OnPaint
+10578 CListBox::CharToItem
+10579 CMFCRibbonBar::OnPaint
+10580 CMFCRibbonKeyTip::OnPaint
+10581 CMFCRibbonRichEditCtrl::OnPaint
+10582 CMFCRibbonStatusBar::OnPaint
+10583 CMFCSpinButtonCtrl::OnPaint
+10584 CMFCTabCtrl::OnPaint
+10585 CMFCTasksPane::OnPaint
+10586 CMFCToolBarButtonCustomizeDialog::OnPaint
+10587 CMFCToolBarComboBoxEdit::OnPaint
+10588 CMFCToolTipCtrl::OnPaint
+10589 COleControl::OnPaint
+10590 COleControlContainer::OnPaint
+10591 COleResizeBar::OnPaint
+10592 CPaneDivider::OnPaint
+10593 CListBox::CharToItem
+10594 CSmartDockingGroupGuidesWnd::OnPaint
+10595 CSmartDockingHighlighterWnd::OnPaint
+10596 CSmartDockingStandaloneGuideWnd::OnPaint
+10597 CSplitterWnd::OnPaint
+10598 CStatusBar::OnPaint
+10599 CToolBar::OnPaint
+10600 CView::OnPaint
+10601 CVSListBoxBase::OnPaint
+10602 CWnd::OnPaint
+10603 CFrameWnd::OnPaletteChanged
+10604 CMFCColorBar::OnPaletteChanged
+10605 CMFCColorPickerCtrl::OnPaletteChanged
+10606 COleFrameHook::OnPaletteChanged
+10607 CFrameWndEx::OnPaneCheck
+10608 CMDIFrameWndEx::OnPaneCheck
+10609 COleDocIPFrameWndEx::OnPaneCheck
+10610 COleDocIPFrameWndEx::OnPaneCheck
+10611 CBasePane::OnPaneContextMenu
+10612 CDockingManager::OnPaneContextMenu
+10613 CMFCRibbonBar::OnPaneContextMenu
+10614 CMFCRibbonStatusBar::OnPaneContextMenu
+10615 CPaneContainerManager::OnPaneDividerMove
+10616 CMultiPaneFrameWnd::OnPaneRecalcLayout
+10617 CPaneFrameWnd::OnPaneRecalcLayout
+10618 CRichEditView::OnParaAlign
+10619 CRichEditView::OnParaCenter
+10620 CRichEditView::OnParaLeft
+10621 CRichEditView::OnParaRight
+10622 CWnd::OnParentNotify
+10624 COleUILinkInfo::AddRef
+10625 CMFCImageEditorDialog::OnPickColor
+10626 CMFCToolTipCtrl::OnPop
+10627 CFrameWnd::OnPopMessageString
+10628 CSmartDockingManager::OnPosChange
+10629 COleClientItem::XOleIPSite::OnPosRectChange
+10630 COleControlSite::XOleIPSite::OnPosRectChange
+10631 COleUILinkInfo::AddRef
+10632 COleUILinkInfo::AddRef
+10633 CMFCRibbonBar::OnPostRecalcLayout
+10636 CEditView::OnPrepareDC
+10637 CPreviewView::OnPrepareDC
+10638 CRichEditView::OnPrepareDC
+10639 CScrollView::OnPrepareDC
+10640 CView::OnPrepareDC
+10641 CEditView::OnPreparePrinting
+10642 CArchiveStream::AddRef
+10643 COleDocObjectItem::OnPreparePrinting
+10644 CArchiveStream::AddRef
+10645 CToolBar::OnPreserveSizingPolicyHelper
+10646 CToolBar::OnPreserveZeroBorderHelper
+10647 CMFCTasksPane::OnPressBackButton
+10648 CMFCTasksPane::OnPressButtons
+10649 CMFCTasksPaneFrameWnd::OnPressButtons
+10650 CPaneFrameWnd::OnPressButtons
+10651 CDockablePane::OnPressCloseButton
+10652 CPane::OnPressCloseButton
+10653 CTabbedPane::OnPressCloseButton
+10654 CMFCTasksPane::OnPressForwardButton
+10655 CMFCTasksPane::OnPressHomeButton
+10656 CMFCTasksPane::OnPressOtherButton
+10657 CMDIChildWndEx::OnPressTaskbarThmbnailCloseButton
+10658 COleFrameHook::OnPreTranslateMessage
+10659 CPreviewView::OnPreviewClose
+10660 CDocument::OnPreviewHandlerQueryFocus
+10661 CDocument::OnPreviewHandlerTranslateAccelerator
+10662 CPreviewView::OnPreviewPrint
+10663 CPreviewView::OnPrevPage
+10664 CEditView::OnPrint
+10665 CMFCKeyMapDialog::OnPrint
+10666 COleDocObjectItem::OnPrint
+10667 CRichEditView::OnPrint
+10668 CView::OnPrint
+10680 CRichEditView::OnPrinterChanged
+10681 CMFCKeyMapDialog::OnPrintHeader
+10682 CMFCKeyMapDialog::OnPrintItem
+10683 CPrintDialog::OnPrintSetup
+10684 CPane::OnProcessDblClk
+10685 delete
+10686 delete
+10687 CMFCToolBar::OnPromptReset
+10688 COleControl::OnProperties
+10689 delete
+10690 CMFCPropertyGridCtrl::OnPropertyChanged
+10691 CArchiveStream::AddRef
+10692 CMiniFrameWnd::OnQueryCenterWnd
+10693 CDialog::OnQueryEndSession
+10694 CFrameWnd::OnQueryEndSession
+10695 COleControl::OnQueryHitPoint
+10696 COleControl::OnQueryHitPoint
+10697 CFrameWnd::OnQueryNewPalette
+10698 CMFCColorBar::OnQueryNewPalette
+10699 CMFCColorPickerCtrl::OnQueryNewPalette
+10700 COleFrameHook::OnQueryNewPalette
+10701 COleServerItem::OnQueryUpdateItems
+10702 delete
+10703 COleControl::OnRButtonDblClk
+10704 CDockablePane::OnRButtonDown
+10705 CMFCBaseTabCtrl::OnRButtonDown
+10706 CMFCEditBrowseCtrl::OnRButtonDown
+10707 CMFCPropertyGridCtrl::OnRButtonDown
+10708 CMFCShellTreeCtrl::OnRButtonDown
+10709 CMFCToolBar::OnRButtonDown
+10710 COleControl::OnRButtonDown
+10711 CMFCCaptionBar::OnRButtonUp
+10712 CMFCEditBrowseCtrl::OnRButtonDown
+10713 COleControl::OnRButtonUp
+10714 COleUILinkInfo::AddRef
+10715 COleFrameHook::OnRecalcLayout
+10716 CMFCReBar::OnRecalcParent
+10717 COleIPFrameWnd::OnRecalcParent
+10718 CReBar::OnRecalcParent
+10719 delete
+10720 COleControl::OnReflectorDestroyed
+10721 CMFCRibbonCustomizePropertyPage::OnRemove
+10722 CMFCRibbonKeyboardCustomizeDialog::OnRemove
+10723 CMFCToolBarsKeyboardPropertyPage::OnRemove
+10724 COleClientItem::OnRemoveMenus
+10725 COleDocObjectItem::OnRemoveMenus
+10726 CDockSite::OnRemoveRow
+10727 CMFCPropertySheet::OnRemoveTreePage
+10728 delete
+10729 CMFCToolBarsListPropertyPage::OnRenameToolbar
+10730 COleControl::CControlDataSource::OnRenderData
+10731 COleServerItem::CItemDataSource::OnRenderData
+10732 COleControl::OnRenderData
+10733 COleDataSource::OnRenderData
+10734 COleServerItem::OnRenderData
+10735 COleControl::CControlDataSource::OnRenderFileData
+10736 COleServerItem::CItemDataSource::OnRenderFileData
+10737 COleUILinkInfo::AddRef
+10738 COleUILinkInfo::AddRef
+10739 COleUILinkInfo::AddRef
+10740 COleControl::CControlDataSource::OnRenderGlobalData
+10741 COleServerItem::CItemDataSource::OnRenderGlobalData
+10742 COleUILinkInfo::AddRef
+10743 COleUILinkInfo::AddRef
+10744 COleUILinkInfo::AddRef
+10745 CEditView::OnReplaceAll
+10746 CRichEditView::OnReplaceAll
+10747 CEditView::OnReplaceSel
+10748 CRichEditView::OnReplaceSel
+10749 COleUILinkInfo::AddRef
+10750 COleControlSite::XPropertyNotifySink::OnRequestEdit
+10751 COleUILinkInfo::AddRef
+10752 COleDocIPFrameWnd::OnRequestPositionChange
+10753 COleDocIPFrameWnd::OnRequestPositionChange
+10754 CEnumArray::OnReset
+10755 COutlookOptionsDlg::OnReset
+10756 CPropertyPage::OnReset
+10757 CMFCRibbonKeyboardCustomizeDialog::OnResetAll
+10758 CMFCToolBarsKeyboardPropertyPage::OnResetAll
+10759 CMFCToolBarsListPropertyPage::OnResetAllToolbars
+10760 CMFCToolBarsMenuPropertyPage::OnResetFrameMenu
+10761 CMFCToolBarsMenuPropertyPage::OnResetMenu
+10762 COleControl::OnResetState
+10763 CMFCToolBarsListPropertyPage::OnResetToolbar
+10764 CMFCToolBarsOptionsPropertyPage::OnResetUsageData
+10765 COleUILinkInfo::AddRef
+10766 COleServerDoc::OnResizeBorder
+10767 COleServerDocEx::OnResizeBorder
+10768 COleIPFrameWnd::OnResizeChild
+10769 delete
+10770 CDockSite::OnResizeRow
+10771 CMFCShellListCtrl::OnDblClk
+10772 CMFCCustomColorsPropertyPage::OnRGBChanged
+10773 CDocument::OnRichPreviewUnload
+10774 CMFCPropertyGridProperty::OnRotateListValue
+10775 COleControlSite::XRowsetNotify::OnRowChange
+10776 COleControlSite::XRowsetNotify::OnRowsetChange
+10777 CMFCRibbonBar::OnRTLChanged
+10778 CMFCRibbonButtonsGroup::OnRTLChanged
+10779 CMFCRibbonCategory::OnRTLChanged
+10780 CMFCRibbonEdit::OnRTLChanged
+10781 CMFCRibbonGallery::OnRTLChanged
+10782 CMFCRibbonPanel::OnRTLChanged
+10783 CMFCRibbonStatusBar::OnRTLChanged
+10784 CMFCRibbonStatusBarPane::OnRTLChanged
+10785 CPane::OnRTLChanged
+10786 CMFCWindowsManagerDialog::OnSave
+10787 COleClientItem::XAdviseSink::OnSave
+10788 CDocument::OnSaveDocument
+10789 CHtmlEditDoc::OnSaveDocument
+10790 COleDocument::OnSaveDocument
+10791 COleLinkingDoc::OnSaveDocument
+10792 COleServerDoc::OnSaveDocument
+10793 COleServerDoc::OnSaveEmbedding
+10794 COleServerItem::OnSaveEmbedding
+10795 delete
+10796 CScrollView::OnScroll
+10797 COleUILinkInfo::AddRef
+10798 COleClientItem::OnScrollBy
+10799 CScrollView::OnScrollBy
+10800 COleUILinkInfo::AddRef
+10801 CMFCRibbonCategory::OnScrollHorz
+10802 COutlookOptionsDlg::OnSelchange
+10803 CRichEditView::OnSelChange
+10804 CMFCKeyMapDialog::OnSelchangeCategory
+10805 CMFCRibbonKeyboardCustomizeDialog::OnSelchangeCategory
+10806 CMFCToolBarsCommandsPropertyPage::OnSelchangeCategory
+10807 CMFCToolBarsKeyboardPropertyPage::OnSelchangeCategory
+10808 CMFCRibbonCustomizePropertyPage::OnSelchangeCommandsList
+10809 CMFCRibbonKeyboardCustomizeDialog::OnSelchangeCommandsList
+10810 CMFCToolBarsKeyboardPropertyPage::OnSelchangeCommandsList
+10811 CMFCToolBarsMenuPropertyPage::OnSelchangeContextMenuList
+10812 CMFCRibbonKeyboardCustomizeDialog::OnSelchangeCurrentKeysList
+10813 CMFCToolBarsKeyboardPropertyPage::OnSelchangeCurrentKeysList
+10814 CMFCWindowsManagerDialog::OnSelchangeList
+10815 CMFCMousePropertyPage::OnSelchangeListOfCommands
+10816 CMFCToolBarsMenuPropertyPage::OnSelchangeMenuList
+10817 CMFCRibbonCustomizePropertyPage::OnSelchangeQATCommands
+10818 CMFCToolBarsListPropertyPage::OnSelchangeToolbarList
+10819 CMFCToolBarsCommandsPropertyPage::OnSelchangeUserTools
+10820 CMFCKeyMapDialog::OnSelchangeViewType
+10821 CMFCRibbonKeyboardCustomizeDialog::OnSelchangeViewType
+10822 CMFCToolBarsKeyboardPropertyPage::OnSelchangeViewType
+10823 CMFCPropertyGridCtrl::OnSelectCombo
+10824 CMFCPropertyGridProperty::OnSelectCombo
+10825 CFileDialog::XFileDialogEvents::OnSelectionChange
+10826 CVSToolsListBox::OnSelectionChanged
+10827 CMFCRibbonComboBox::OnSelectItem
+10828 CMFCPropertySheet::OnSelectList
+10829 CMFCPropertySheet::OnSelectTree
+10830 CMFCRibbonCustomizePropertyPage::OnSelendokCategoryCombo
+10831 delete
+10832 CMFCColorBar::OnSendCommand
+10833 CMFCDropDownToolBar::OnSendCommand
+10834 CMFCMenuBar::OnSendCommand
+10835 CMFCOutlookBarPaneList::OnSendCommand
+10836 CMFCOutlookBarToolBar::OnSendCommand
+10837 CMFCPopupMenuBar::OnSendCommand
+10838 CMDIChildWndEx::OnSendIconicLivePreviewBitmap
+10840 CMDIChildWndEx::OnSendIconicThumbnail
+10842 CArchiveStream::AddRef
+10843 CMFCRibbonBar::OnSetAccData
+10844 CMFCRibbonPanelMenuBar::OnSetAccData
+10845 CMFCTasksPane::OnSetAccData
+10846 CMFCToolBar::OnSetAccData
+10847 CMFCPropertyPage::OnSetActive
+10848 CPropertyPage::OnSetActive
+10849 CToolBar::OnSetBitmapSize
+10850 CToolBar::OnSetButtonSize
+10851 CMFCButton::OnSetCheck
+10852 COleControl::OnSetClientSite
+10853 COleUILinkInfo::AddRef
+10854 CMFCKeyMapDialog::OnSetColumns
+10855 CMFCShellListCtrl::OnSetColumns
+10856 CFrameWnd::OnSetCursor
+10857 CMFCButton::OnSetCursor
+10858 CMFCColorDialog::OnSetCursor
+10859 CMFCImagePaintArea::OnSetCursor
+10860 CMFCOutlookBarTabCtrl::OnSetCursor
+10861 CMFCOutlookBarToolBar::OnSetCursor
+10862 CMFCPopupMenu::OnSetCursor
+10863 CMFCPropertyGridCtrl::OnSetCursor
+10864 CMFCPropertyGridProperty::OnSetCursor
+10865 CMFCRibbonBar::OnSetCursor
+10866 CMFCTabCtrl::OnSetCursor
+10867 CMFCTasksPane::OnSetCursor
+10868 CMFCToolBar::OnSetCursor
+10869 COleControl::OnSetCursor
+10870 COleResizeBar::OnSetCursor
+10871 CPaneDivider::OnSetCursor
+10872 CPaneFrameWnd::OnSetCursor
+10873 CPreviewView::OnSetCursor
+10874 CSplitterWnd::OnSetCursor
+10875 COleControl::CControlDataSource::OnSetData
+10876 COleServerItem::CItemDataSource::OnSetData
+10877 COleControl::OnSetData
+10878 COleUILinkInfo::AddRef
+10879 COleUILinkInfo::AddRef
+10880 CMFCMenuBar::OnSetDefaultButtonText
+10881 CMFCPopupMenuBar::OnSetDefaultButtonText
+10882 CMFCToolBar::OnSetDefaultButtonText
+10883 CPropertySheet::OnSetDefID
+10884 COleControl::OnSetExtent
+10885 COleServerItem::OnSetExtent
+10886 CBaseTabbedPane::OnSetFocus
+10887 CDockablePane::OnSetFocus
+10888 CFormView::OnSetFocus
+10889 CFrameWnd::OnSetFocus
+10890 CMFCColorPickerCtrl::OnSetFocus
+10891 CMFCDesktopAlertDialog::OnSetFocus
+10892 CMFCMenuBar::OnSetFocus
+10893 CMFCOutlookBarPane::OnSetFocus
+10894 CMFCPropertyGridCtrl::OnSetFocus
+10895 CMFCRibbonBar::OnSetFocus
+10896 CMFCRibbonEdit::OnSetFocus
+10897 CMFCRibbonGallery::OnSetFocus
+10898 CMFCRibbonRichEditCtrl::OnSetFocus
+10899 CMFCTabCtrl::OnSetFocus
+10900 CMFCToolBar::OnSetFocus
+10901 CMFCToolBarComboBoxEdit::OnSetFocus
+10902 CMFCToolBarEditCtrl::OnSetFocus
+10903 CMultiPaneFrameWnd::OnSetFocus
+10904 COleControl::OnSetFocus
+10905 CPaneFrameWnd::OnSetFocus
+10906 CVSListBoxBase::OnSetFocus
+10907 CWnd::OnSetFocus
+10908 CMFCMaskedEdit::OnSetFocusR
+10910 delete
+10921 COleServerDoc::OnSetHostNames
+10924 CMFCRibbonLinkCtrl::OnSetIcon
+10925 CMFCButton::OnSetImage
+10926 CDocObjectServer::OnSetItemRects
+10927 COleServerDoc::OnSetItemRects
+10928 CFrameWndEx::OnSetMenu
+10929 CFrameWndEx::OnSetMenu
+10931 CMDIFrameWndEx::OnSetMenu
+10932 COleClientItem::OnSetMenu
+10933 COleDocIPFrameWndEx::OnSetMenu
+10934 COleDocIPFrameWndEx::OnSetMenu
+10935 COleDocIPFrameWndEx::OnSetMenu
+10936 COleDocIPFrameWndEx::OnSetMenu
+10937 CFrameWnd::OnSetMessageString
+10938 COleControl::OnSetMessageString
+10939 COleIPFrameWnd::OnSetMessageString
+10940 CStatusBar::OnSetMinHeight
+10941 COleControl::OnSetObjectRects
+10942 CDatabase::OnSetOptions
+10943 CRecordset::OnSetOptions
+10944 COlePropertyPage::OnSetPageSite
+10945 CFrameWnd::OnSetPreviewMode
+10946 CFrameWndEx::OnSetPreviewMode
+10947 CMDIChildWndEx::OnSetPreviewMode
+10948 CMDIFrameWndEx::OnSetPreviewMode
+10949 COleDocIPFrameWndEx::OnSetPreviewMode
+10950 COleDocIPFrameWndEx::OnSetPreviewMode
+10951 CMFCRibbonBar::OnSetPrintPreviewKeys
+10952 CMultiPaneFrameWnd::OnSetRollUpTimer
+10953 CPaneFrameWnd::OnSetRollUpTimer
+10954 CToolBar::OnSetSizeHelper
+10956 CFrameImpl::OnSetText
+10966 AFX_GLOBAL_DATA::OnSettingChange
+10967 CBasePane::OnSettingChange
+10968 CDialogEx::OnSettingChange
+10969 CDockablePane::OnSettingChange
+10970 CMFCMenuBar::OnSettingChange
+10971 CDialogEx::OnSettingChange
+10972 CMFCRibbonBar::OnSettingChange
+10973 CMFCStatusBar::OnSettingChange
+10974 CMFCTabCtrl::OnSettingChange
+10975 CMFCTasksPane::OnSettingChange
+10976 CMFCToolBar::OnSettingChange
+10977 CPaneFrameWnd::OnSettingChange
+10978 CWnd::OnSettingChange
+10979 delete
+10980 CDockSite::OnSetWindowPos
+10981 CMFCVisualManager::OnSetWindowRegion
+10982 CMFCVisualManagerOffice2007::OnSetWindowRegion
+10983 COleUILinkInfo::AddRef
+10984 CFileDialog::XFileDialogEvents::OnShareViolation
+10985 CDocObjectServerItem::OnShow
+10986 CMFCRibbonButtonsGroup::OnShow
+10987 CMFCRibbonEdit::OnShow
+10988 CMFCRibbonPanel::OnShow
+10989 CMFCToolBarComboBoxButton::OnShow
+10990 CMFCToolBarDateTimeCtrl::OnShow
+10991 CMFCToolBarEditBoxButton::OnShow
+10992 CMFCToolTipCtrl::OnShow
+10993 COleServerItem::OnShow
+10994 CMFCReBar::OnShowBand
+10995 CReBar::OnShowBand
+10996 CMFCColorButton::OnShowColorPopup
+10997 CArchiveStream::AddRef
+10998 CMFCShellTreeCtrl::OnShowContextMenu
+10999 CPane::OnShowControlBarMenu
+11000 COleClientItem::OnShowControlBars
+11001 COleServerDoc::OnShowControlBars
+11002 COleServerDocEx::OnShowControlBars
+11003 CFrameImpl::OnShowCustomizePane
+11004 COleServerDoc::OnShowDocument
+11005 CMFCToolBarSpinEditBoxButton::OnShowEditbox
+11006 CMFCOutlookBarTabCtrl::OnShowFewerPageButtons
+11007 COleClientItem::OnShowItem
+11008 CMDIFrameWndEx::OnShowMDITabContextMenu
+11009 CMFCMenuButton::OnShowMenu
+11010 delete
+11011 CMFCToolBarsOptionsPropertyPage::OnShowMenusDelay
+11012 CMFCOutlookBarTabCtrl::OnShowMorePageButtons
+11013 CMFCOutlookBarTabCtrl::OnShowOptions
+11014 CMultiPaneFrameWnd::OnShowPane
+11015 CPaneContainer::OnShowPane
+11016 CPaneContainerManager::OnShowPane
+11017 CPaneDivider::OnShowPane
+11018 CFrameWndEx::OnShowPanes
+11019 CMDIFrameWndEx::OnShowPanes
+11020 COleCntrFrameWndEx::OnShowPanes
+11021 COleDocIPFrameWndEx::OnShowPanes
+11022 COleDocIPFrameWndEx::OnShowPanes
+11023 CFrameImpl::OnShowPopupMenu
+11024 CFrameWndEx::OnShowPopupMenu
+11025 CFrameWndEx::OnShowPopupMenu
+11026 CMFCRibbonBaseElement::OnShowPopupMenu
+11027 CMFCRibbonButton::OnShowPopupMenu
+11028 CMFCRibbonColorButton::OnShowPopupMenu
+11029 CMFCRibbonDefaultPanelButton::OnShowPopupMenu
+11030 CMFCRibbonGallery::OnShowPopupMenu
+11031 CMFCRibbonUndoButton::OnShowPopupMenu
+11032 CMFCToolBarsOptionsPropertyPage::OnShowRecentlyUsedMenus
+11033 CMFCRibbonBar::OnShowRibbonContextMenu
+11034 CMFCRibbonBar::OnShowRibbonQATMenu
+11035 CDockSite::OnShowRow
+11036 CMFCTabCtrl::OnShowTabDocumentsMenu
+11037 COleControl::OnShowToolBars
+11038 CMFCToolBarsOptionsPropertyPage::OnShowTooltips
+11039 CArchiveStream::AddRef
+11040 delete
+11041 COleLinkingDoc::OnShowViews
+11042 CMFCPopupMenu::OnShowWindow
+11043 CMFCRibbonBar::OnShowWindow
+11044 CMFCRibbonStatusBar::OnShowWindow
+11045 CMFCStatusBar::OnShowWindow
+11046 CMFCToolBar::OnShowWindow
+11047 COleControl::OnMove
+11048 COleClientItem::XOleClientSite::OnShowWindow
+11049 COleUILinkInfo::AddRef
+11050 CBasePane::OnSize
+11051 CBaseTabbedPane::OnSize
+11052 CDHtmlDialog::OnSize
+11053 CDockablePaneAdapter::OnSize
+11054 CListBox::CharToItem
+11055 CFrameWnd::OnSize
+11056 CFrameWndEx::OnSize
+11057 CHtmlView::OnSize
+11058 CMDIChildWnd::OnSize
+11059 CMDIChildWndEx::OnSize
+11060 CMDIFrameWnd::OnSize
+11061 CMDIFrameWndEx::OnSize
+11062 CMFCButton::OnSize
+11063 CMFCCaptionBar::OnSize
+11064 CMFCColorPickerCtrl::OnSize
+11065 CMFCColorPropertySheet::OnSize
+11066 CMFCDropDownFrame::OnSize
+11067 CMFCKeyMapDialog::OnSize
+11068 CMFCListCtrl::OnSize
+11069 CMFCOutlookBarPane::OnSize
+11070 CMFCOutlookBarTabCtrl::OnSize
+11071 CMFCPopupMenu::OnSize
+11072 CMFCPreviewCtrlImpl::OnSize
+11073 CMFCPropertyGridCtrl::OnSize
+11074 CMFCRibbonBar::OnSize
+11075 CMFCRibbonPanelMenuBar::OnSize
+11076 CMFCRibbonStatusBar::OnSize
+11077 CMFCShadowWnd::OnSize
+11078 CMFCStandardColorsPropertyPage::OnSize
+11079 CMFCStatusBar::OnSize
+11080 CMFCTabCtrl::OnSize
+11081 CMFCTasksPane::OnSize
+11082 CMFCToolBar::OnSize
+11083 CMFCToolBarButtonsListButton::OnSize
+11084 CMFCToolBarComboBoxButton::OnSize
+11085 CMFCToolBarDateTimeCtrl::OnSize
+11086 CMFCToolBarEditBoxButton::OnSize
+11087 CMultiPaneFrameWnd::OnSize
+11088 COleCntrFrameWndEx::OnSize
+11089 COleControl::OnMove
+11090 delete
+11091 COleResizeBar::OnSize
+11092 CListBox::CharToItem
+11093 CPaneFrameWnd::OnSize
+11094 CPreviewView::OnSize
+11095 CPreviewViewEx::OnSize
+11096 CScrollView::OnSize
+11097 CSplitterWnd::OnSize
+11098 CStatusBar::OnSize
+11099 CTabView::OnSize
+11100 CVSListBoxBase::OnSize
+11101 CVSListBox::OnSizeList
+11102 CControlBar::OnSizeParent
+11103 CDockBar::OnSizeParent
+11104 COleResizeBar::OnSizeParent
+11105 CFrameWndEx::OnSizing
+11106 CMDIChildWndEx::OnSizing
+11107 CMFCRibbonBar::OnSizing
+11108 CListBox::CharToItem
+11109 COleCntrFrameWndEx::OnSizing
+11110 CPaneFrameWnd::OnSizing
+11111 CEnumArray::OnSkip
+11112 CDockablePane::OnSlide
+11113 CSocketWnd::OnSocketDead
+11114 CSocketWnd::OnSocketNotify
+11115 CMFCPropertyGridCtrl::OnSpinDeltaPos
+11116 CView::OnSplitCmd
+11117 delete
+11118 delete
+11119 CInternetSession::OnStatusCallback
+11120 CHtmlView::OnStatusTextChange
+11121 delete
+11122 delete
+11123 delete
+11124 CMDIChildWndEx::OnStyleChanged
+11125 CMFCListCtrl::OnStyleChanged
+11126 CMFCPropertyGridCtrl::OnStyleChanged
+11127 CMFCStatusBar::OnStyleChanged
+11128 CPane::OnStyleChanged
+11129 CMDIClientAreaWnd::OnStyleChanging
+11130 CDialogEx::OnSysColorChange
+11131 CFrameWndEx::OnSysColorChange
+11132 CMDIFrameWndEx::OnSysColorChange
+11133 CMFCBaseTabCtrl::OnSysColorChange
+11134 delete
+11135 CMFCColorButton::OnSysColorChange
+11136 CMFCColorDialog::OnSysColorChange
+11137 CMFCControlRenderer::OnSysColorChange
+11138 CMFCListCtrl::OnSysColorChange
+11139 CMFCOutlookBarPane::OnSysColorChange
+11140 CDialogEx::OnSysColorChange
+11141 CMFCRibbonBar::OnSysColorChange
+11142 delete
+11143 CMFCTabCtrl::OnSysColorChange
+11144 CMFCToolBar::OnSysColorChange
+11145 CMFCToolBarButtonsListButton::OnSysColorChange
+11146 CMFCToolBarImages::OnSysColorChange
+11147 CToolBar::OnSysColorChange
+11148 CWnd::OnSysColorChange
+11149 CFrameWnd::OnSysCommand
+11150 CMDIChildWndEx::OnSysCommand
+11151 CMDITabProxyWnd::OnSysCommand
+11152 CMFCRibbonBar::OnSysCommand
+11153 CMFCRibbonStatusBar::OnSysCommand
+11154 CMFCStatusBar::OnSysCommand
+11155 CMiniFrameWnd::OnSysCommand
+11156 CPropertySheet::OnSysCommand
+11157 CSplitterWnd::OnSysCommand
+11158 CMFCRibbonBar::OnSysKeyDown
+11159 COleControl::OnSysKeyDown
+11160 CMFCRibbonBar::OnSysKeyUp
+11161 COleControl::OnSysKeyUp
+11162 CMDIClientAreaWnd::OnTabGroupMouseMove
+11163 CWnd::OnTabletQuerySystemGestureStatus
+11164 CMDIChildWndEx::OnTaskbarTabThumbnailActivate
+11165 CMDIChildWndEx::OnTaskbarTabThumbnailMouseActivate
+11166 CMDIChildWndEx::OnTaskbarTabThumbnailStretch
+11167 CMFCToolBarButtonCustomizeDialog::OnText
+11168 COleControl::OnAppearanceChanged
+11169 CMFCToolBarsListPropertyPage::OnTextLabels
+11170 CEditView::OnTextNotFound
+11171 CRichEditView::OnTextNotFound
+11172 delete
+11173 CControlBar::OnThemeChanged
+11174 CMFCWindowsManagerDialog::OnTilehorz
+11175 CMFCWindowsManagerDialog::OnTilevert
+11176 CControlBar::OnTimer
+11177 CDockablePane::OnTimer
+11178 CMFCAutoHideBar::OnTimer
+11179 CMFCButton::OnTimer
+11180 CMFCDesktopAlertWnd::OnTimer
+11181 CMFCMenuBar::OnTimer
+11182 CMFCOutlookBarPane::OnTimer
+11183 CMFCPopupMenu::OnTimer
+11184 CMFCPopupMenuBar::OnTimer
+11185 CMFCRibbonBar::OnTimer
+11186 CMFCRibbonMiniToolBar::OnTimer
+11187 CMFCRibbonPanelMenuBar::OnTimer
+11188 CMFCStatusBar::OnTimer
+11189 CMFCTasksPane::OnTimer
+11190 CPaneFrameWnd::OnTimer
+11191 delete
+11192 delete
+11193 CMFCToolBar::OnToolbarAppearance
+11194 CMFCOutlookBarTabCtrl::OnToolbarCommand
+11195 CArchiveStream::AddRef
+11196 CArchiveStream::AddRef
+11197 CArchiveStream::AddRef
+11198 CArchiveStream::AddRef
+11199 CFrameWndEx::OnToolbarCreateNew
+11200 CMDIFrameWndEx::OnToolbarCreateNew
+11201 COleDocIPFrameWndEx::OnToolbarCreateNew
+11202 COleDocIPFrameWndEx::OnToolbarCreateNew
+11203 CFrameWndEx::OnToolbarDelete
+11204 CMDIFrameWndEx::OnToolbarDelete
+11205 CMFCToolBar::OnToolbarDelete
+11206 COleDocIPFrameWndEx::OnToolbarDelete
+11207 COleDocIPFrameWndEx::OnToolbarDelete
+11208 CMFCToolBar::OnToolbarImage
+11209 CMFCPopupMenuBar::OnToolbarImageAndText
+11210 CMFCToolBar::OnToolbarImageAndText
+11211 CMFCToolBar::OnToolbarNewMenu
+11212 CMFCRibbonCustomizePropertyPage::OnToolbarReset
+11213 CMFCToolBar::OnToolbarReset
+11214 CMFCToolBar::OnToolbarStartGroup
+11215 CMFCPopupMenuBar::OnToolbarText
+11216 CMFCToolBar::OnToolbarText
+11217 CMFCImageEditorDialog::OnToolClear
+11218 CMFCImageEditorDialog::OnToolCopy
+11219 CMFCImageEditorDialog::OnToolEllipse
+11220 CMFCImageEditorDialog::OnToolFill
+11221 CMFCMenuBar::OnToolHitTest
+11222 CMFCPopupMenuBar::OnToolHitTest
+11223 CMFCPrintPreviewToolBar::OnToolHitTest
+11224 CMFCReBar::OnToolHitTest
+11225 CMFCShowAllButton::OnToolHitTest
+11226 CMFCStatusBar::OnToolHitTest
+11227 CMFCToolBar::OnToolHitTest
+11228 CMFCToolBarButton::OnToolHitTest
+11229 CReBar::OnToolHitTest
+11230 CToolBar::OnToolHitTest
+11231 CWnd::OnToolHitTest
+11232 CMFCImageEditorDialog::OnToolLine
+11233 CMFCImageEditorDialog::OnToolPaste
+11234 CMFCImageEditorDialog::OnToolPen
+11235 CMFCImageEditorDialog::OnToolPick
+11236 CMFCImageEditorDialog::OnToolRect
+11237 CFrameWnd::OnToolTipText
+11238 CMDIChildWnd::OnToolTipText
+11239 COleUILinkInfo::AddRef
+11240 CWnd::OnTouchInputs
+11241 CWnd::OnTouchMessage
+11242 CDockablePane::OnTrackCaptionButtons
+11243 CFrameImpl::OnTrackCaptionButtons
+11244 CMFCTasksPane::OnTrackCaptionButtons
+11245 CMFCTasksPaneFrameWnd::OnTrackCaptionButtons
+11246 CPaneFrameWnd::OnTrackCaptionButtons
+11247 CArchiveStream::AddRef
+11248 CArchiveStream::AddRef
+11249 delete
+11250 CFileDialog::XFileDialogEvents::OnTypeChange
+11251 COleControlContainer::OnUIActivate
+11252 COleClientItem::XOleIPSite::OnUIActivate
+11253 COleControlSite::XOleIPSite::OnUIActivate
+11254 COleControlContainer::OnUIDeactivate
+11255 COleClientItem::XOleIPSite::OnUIDeactivate
+11256 COleControlSite::XOleIPSite::OnUIDeactivate
+11257 delete
+11258 CMFCRibbonCustomizePropertyPage::OnUp
+11259 COleServerItem::OnUpdate
+11260 CView::OnUpdate
+11261 CMFCTasksPane::OnUpdateBack
+11262 CRichEditView::OnUpdateBullet
+11263 CRichEditView::OnUpdateCharBold
+11264 CRichEditView::OnUpdateCharEffect
+11265 CRichEditView::OnUpdateCharItalic
+11266 CRichEditView::OnUpdateCharUnderline
+11267 CMFCTasksPane::OnUpdateClose
+11268 CDialogBar::OnUpdateCmdUI
+11269 CDockablePane::OnUpdateCmdUI
+11270 delete
+11271 delete
+11272 CMFCColorBar::OnUpdateCmdUI
+11273 CMFCDropDownToolBar::OnUpdateCmdUI
+11274 CMFCOutlookBarToolBar::OnUpdateCmdUI
+11275 CDialogBar::OnUpdateCmdUI
+11276 CMFCRibbonBar::OnUpdateCmdUI
+11277 CMFCRibbonBaseElement::OnUpdateCmdUI
+11278 CMFCRibbonButtonsGroup::OnUpdateCmdUI
+11279 CMFCRibbonCategory::OnUpdateCmdUI
+11280 CMFCRibbonPanel::OnUpdateCmdUI
+11281 CMFCRibbonPanelMenuBar::OnUpdateCmdUI
+11282 CMFCRibbonStatusBar::OnUpdateCmdUI
+11283 CMFCStatusBar::OnUpdateCmdUI
+11284 CMFCTasksPane::OnUpdateCmdUI
+11285 CMFCToolBar::OnUpdateCmdUI
+11286 delete
+11287 CPaneDialog::OnUpdateCmdUI
+11288 CDialogBar::OnUpdateCmdUI
+11289 CStatusBar::OnUpdateCmdUI
+11290 CToolBar::OnUpdateCmdUI
+11291 CFrameWnd::OnUpdateContextHelp
+11292 CFrameWnd::OnUpdateControlBarMenu
+11293 COleIPFrameWnd::OnUpdateControlBarMenu
+11294 COleServerDoc::OnUpdateDocument
+11295 COleDocument::OnUpdateEditChangeIcon
+11296 CHtmlView::OnUpdateEditCopy
+11297 CHtmlView::OnUpdateEditCut
+11298 COleDocument::OnUpdateEditLinksMenu
+11299 CHtmlView::OnUpdateEditPaste
+11300 CRichEditView::OnUpdateEditPasteSpecial
+11301 CRichEditView::OnUpdateEditProperties
+11302 CRichEditView::OnUpdateEditRedo
+11303 CEditView::OnUpdateEditUndo
+11304 CRichEditView::OnUpdateEditUndo
+11305 COleServerDoc::OnUpdateFileExit
+11306 CDocument::OnUpdateFileSendMail
+11307 COleServerDoc::OnUpdateFileUpdate
+11308 CMFCTasksPane::OnUpdateForward
+11309 CFrameWnd::OnUpdateFrameMenu
+11310 CFrameWndEx::OnUpdateFrameMenu
+11311 CMDIChildWnd::OnUpdateFrameMenu
+11312 CMDIFrameWnd::OnUpdateFrameMenu
+11313 CMDIFrameWndEx::OnUpdateFrameMenu
+11314 CFrameWnd::OnUpdateFrameTitle
+11315 CFrameWndEx::OnUpdateFrameTitle
+11316 CMDIChildWnd::OnUpdateFrameTitle
+11317 CMDIChildWndEx::OnUpdateFrameTitle
+11318 CMDIFrameWnd::OnUpdateFrameTitle
+11319 COleUILinkInfo::AddRef
+11320 COleFrameHook::OnUpdateFrameTitle
+11321 COleServerItem::OnUpdateItems
+11322 CFrameWnd::OnUpdateKeyIndicator
+11323 CMDIFrameWnd::OnUpdateMDIWindowCmd
+11324 CEditView::OnUpdateNeedClip
+11325 CRichEditView::OnUpdateEditPasteSpecial
+11326 CEditView::OnUpdateNeedFind
+11327 CRichEditView::OnUpdateNeedFind
+11328 CEditView::OnUpdateNeedSel
+11329 CRichEditView::OnUpdateNeedSel
+11330 CEditView::OnUpdateNeedText
+11331 CRichEditView::OnUpdateNeedText
+11332 CMFCRibbonKeyboardCustomizeDialog::OnUpdateNewShortcutKey
+11333 CMFCToolBarsKeyboardPropertyPage::OnUpdateNewShortcutKey
+11334 CPreviewView::OnUpdateNextPage
+11335 CView::OnUpdateNextPaneMenu
+11336 CPreviewView::OnUpdateNumPageChange
+11337 COleDocument::OnUpdateObjectVerbMenu
+11338 COleDocument::OnUpdateObjectVerbPopup
+11339 CFrameWndEx::OnUpdatePaneMenu
+11340 CMDIFrameWndEx::OnUpdatePaneMenu
+11341 COleDocIPFrameWndEx::OnUpdatePaneMenu
+11342 COleDocIPFrameWndEx::OnUpdatePaneMenu
+11343 CRichEditView::OnUpdateParaAlign
+11344 CRichEditView::OnUpdateParaCenter
+11345 CRichEditView::OnUpdateParaLeft
+11346 CRichEditView::OnUpdateParaRight
+11347 COleDocument::OnUpdatePasteLinkMenu
+11348 COleDocument::OnUpdatePasteMenu
+11349 CPreviewViewEx::OnUpdatePreviewNumPage
+11350 CPreviewView::OnUpdatePrevPage
+11351 CMFCMaskedEdit::OnUpdateR
+11352 CWinApp::OnUpdateRecentFileMenu
+11353 COleDBRecordView::OnUpdateRecordFirst
+11354 CRecordView::OnUpdateRecordFirst
+11355 COleDBRecordView::OnUpdateRecordLast
+11356 CRecordView::OnUpdateRecordLast
+11357 COleDBRecordView::OnUpdateRecordLast
+11358 CRecordView::OnUpdateRecordNext
+11359 COleDBRecordView::OnUpdateRecordFirst
+11360 CRecordView::OnUpdateRecordPrev
+11361 CMFCRibbonStatusBar::OnUpdateShadows
+11362 CMFCPropertyGridCtrl::OnUpdateSpin
+11363 CView::OnUpdateSplitCmd
+11364 delete
+11365 CMFCVisualManagerOffice2003::OnUpdateSystemColors
+11366 CMFCVisualManagerOffice2007::OnUpdateSystemColors
+11367 CMFCVisualManagerOfficeXP::OnUpdateSystemColors
+11368 CMFCVisualManagerVS2005::OnUpdateSystemColors
+11369 CMFCVisualManagerVS2008::OnUpdateSystemColors
+11370 CMFCVisualManagerWindows::OnUpdateSystemColors
+11371 CMFCVisualManagerWindows7::OnUpdateSystemColors
+11372 CMDIClientAreaWnd::OnUpdateTabs
+11373 CMFCToolBarsToolsPropertyPage::OnUpdateTool
+11374 CMFCOutlookBarTabCtrl::OnUpdateToolbarCommand
+11375 CMFCToolBarNameDialog::OnUpdateToolbarName
+11376 CMFCImageEditorDialog::OnUpdateToolEllipse
+11377 CMFCImageEditorDialog::OnUpdateToolFill
+11378 CMFCImageEditorDialog::OnUpdateToolLine
+11379 CMFCImageEditorDialog::OnUpdateToolPaste
+11380 CMFCImageEditorDialog::OnUpdateToolPen
+11381 CMFCImageEditorDialog::OnUpdateToolPick
+11382 CMFCImageEditorDialog::OnUpdateToolRect
+11383 CMFCToolBarComboBoxButton::OnUpdateToolTip
+11384 CMFCToolBarDateTimeCtrl::OnUpdateToolTip
+11385 CMFCToolBarEditBoxButton::OnUpdateToolTip
+11386 CMFCToolBarSpinEditBoxButton::OnUpdateToolTip
+11387 CDockablePane::OnUpdateToolTips
+11388 CMFCButton::OnUpdateToolTips
+11389 CMFCCaptionBar::OnUpdateToolTips
+11390 CMFCRibbonBar::OnUpdateToolTips
+11391 CMFCRibbonPanelMenuBar::OnUpdateToolTips
+11392 CMFCTabCtrl::OnUpdateToolTips
+11393 CMFCToolBar::OnUpdateToolTips
+11394 CPaneFrameWnd::OnUpdateToolTips
+11395 COleUILinkInfo::AddRef
+11396 CMFCPropertyGridColorProperty::OnUpdateValue
+11397 CMFCPropertyGridProperty::OnUpdateValue
+11398 CPreviewView::OnUpdateZoomIn
+11399 CPreviewView::OnUpdateZoomOut
+11400 CMFCMousePropertyPage::OnUseDblcliick
+11401 CMFCToolBarButtonCustomizeDialog::OnUserImage
+11402 CMFCOutlookBarToolBar::OnUserToolTip
+11403 CMFCTasksPaneToolBar::OnUserToolTip
+11404 CMFCToolBar::OnUserToolTip
+11405 COleClientItem::XAdviseSink::OnViewChange
+11406 CWinAppEx::OnViewDoubleClick
+11407 delete
+11408 CWnd::OnCharToItem
+11409 CFrameWnd::OnVScroll
+11410 CMFCPopupMenu::OnVScroll
+11411 CMFCPropertyGridCtrl::OnVScroll
+11412 CMFCRibbonPanelMenuBar::OnVScroll
+11413 CMFCTasksPane::OnVScroll
+11414 CMFCToolBarButtonsListButton::OnVScroll
+11415 CPreviewView::OnVScroll
+11416 CScrollView::OnVScroll
+11417 CSplitterWnd::OnVScroll
+11418 CWnd::OnHScroll
+11419 CToolTipCtrl::OnWindowFromPoint
+11420 CMFCWindowsManagerDialog::OnWindowHelp
+11421 COleControl::OnWindowlessMessage
+11422 COleControl::XOleInPlaceObject::OnWindowMessage
+11423 CMDIFrameWnd::OnWindowNew
+11424 CMDIFrameWndEx::OnWindowNew
+11425 CFrameWndEx::OnWindowPosChanged
+11426 CMDIChildWndEx::OnWindowPosChanged
+11427 CMDIFrameWndEx::OnWindowPosChanged
+11428 CMFCBaseTabCtrl::OnWindowPosChanged
+11429 CListBox::CharToItem
+11430 CMFCPopupMenu::OnWindowPosChanged
+11431 CMFCTabCtrl::OnWindowPosChanged
+11432 CMFCToolBar::OnWindowPosChanged
+11433 CControlBar::OnWindowPosChanging
+11434 CDockBar::OnWindowPosChanging
+11435 CFrameImpl::OnWindowPosChanging
+11436 CMDIChildWnd::OnWindowPosChanging
+11437 CMFCTabCtrl::OnWindowPosChanging
+11438 CMFCToolBar::OnWindowPosChanging
+11439 COleIPFrameWnd::OnWindowPosChanging
+11440 CPaneDialog::OnWindowPosChanging
+11441 CPaneFrameWnd::OnWindowPosChanging
+11442 CDockBar::OnWindowPosChanging
+11443 CToolBar::OnWindowPosChanging
+11444 CVSListBoxEditCtrl::OnWindowPosChanging
+11445 COleUILinkInfo::AddRef
+11446 CPropertyPage::OnWizardFinish
+11447 CPropertyPage::OnWizardFinishEx
+11448 COleUILinkInfo::AddRef
+11449 CWnd::OnWndMsg
+11450 CPreviewView::OnZoomIn
+11451 CPreviewView::OnZoomOut
+11452 CAsyncMonikerFile::Open
+11453 CAsyncMonikerFile::Open
+11454 CAsyncMonikerFile::Open
+11455 CAsyncMonikerFile::Open
+11456 CAsyncMonikerFile::Open
+11457 CAsyncMonikerFile::Open
+11458 CAsyncMonikerFile::Open
+11459 CAsyncMonikerFile::Open
+11460 CD2DMesh::Open
+11461 CD2DPathGeometry::Open
+11462 CDatabase::Open
+11463 CDataPathProperty::Open
+11464 CDataPathProperty::Open
+11465 CDataPathProperty::Open
+11466 CDataPathProperty::Open
+11467 CFile::Open
+11468 CFile::Open
+11469 CMirrorFile::Open
+11470 CMonikerFile::Open
+11471 CMonikerFile::Open
+11472 CMonikerFile::Open
+11473 CMonikerFile::Open
+11474 CRecordset::Open
+11475 CSettingsStore::Open
+11476 CSocketFile::Abort
+11477 CFile::Open
+11478 CStdioFile::Open
+11479 CDocObjectServer::XOleDocumentView::Open
+11480 CMFCColorBar::OpenColorDialog
+11481 CMFCColorMenuButton::OpenColorDialog
+11482 CDocManager::OpenDocumentFile
+11483 CDocManager::OpenDocumentFile
+11484 CMultiDocTemplate::OpenDocumentFile
+11485 CMultiDocTemplate::OpenDocumentFile
+11486 CMultiDocTemplate::OpenDocumentFile
+11487 CSingleDocTemplate::OpenDocumentFile
+11488 CWinApp::OpenDocumentFile
+11489 CWinApp::OpenDocumentFile
+11490 CDatabase::OpenEx
+11491 CFtpConnection::OpenFile
+11492 CGopherConnection::OpenFile
+11493 CMFCRibbonLinkCtrl::OpenLink
+11494 COleUILinkInfo::OpenLinkSource
+11495 CMFCDropDownToolbarButton::OnContextHelp
+11496 CMFCToolBarMenuButton::OpenPopupMenu
+11497 CHttpConnection::OpenRequest
+11498 CHttpConnection::OpenRequest
+11499 COleStreamFile::OpenStream
+11500 CHtmlEditDoc::OpenURL
+11501 CInternetSession::OpenURL
+11502 CFileException::OsErrorToException
+11503 CMFCToolBarsOptionsPropertyPage::OShowTooltipsWithKeys
+11504 CD2DGeometry::Outline
+11505 CDumpContext::OutputString
+11506 CEditView::PaginateTo
+11507 CRichEditView::PaginateTo
+11508 CPageSetupDialog::PaintHookProc
+11509 CWnd::PaintWindowlessControls
+11510 CBasePane::PaneFromPoint
+11511 CDockingManager::PaneFromPoint
+11512 CDockingManager::PaneFromPoint
+11513 CDockSite::PaneFromPoint
+11514 CFrameWndEx::PaneFromPoint
+11515 CFrameWndEx::PaneFromPoint
+11516 CMDIChildWndEx::PaneFromPoint
+11517 CMDIChildWndEx::PaneFromPoint
+11518 CMDIFrameWndEx::PaneFromPoint
+11519 CMDIFrameWndEx::PaneFromPoint
+11520 CMultiPaneFrameWnd::PaneFromPoint
+11521 COleCntrFrameWndEx::PaneFromPoint
+11522 COleCntrFrameWndEx::PaneFromPoint
+11523 COleDocIPFrameWndEx::PaneFromPoint
+11524 COleDocIPFrameWndEx::PaneFromPoint
+11525 COleDocIPFrameWndEx::PaneFromPoint
+11526 COleDocIPFrameWndEx::PaneFromPoint
+11527 CPaneContainerManager::PaneFromPoint
+11528 CPaneFrameWnd::PaneFromPoint
+11529 COleControl::ParentToClient
+11530 CMenuTearOffManager::Parse
+11531 CTagManager::ParseColor
+11532 CTagManager::ParseColorHEX
+11533 CWinApp::ParseCommandLine
+11534 CTagManager::ParseControlRenderer
+11535 CTagManager::ParseControlRenderer
+11536 CTagManager::ParseControlRendererInfo
+11537 COleCurrency::ParseCurrency
+11538 CArchiveStream::Clone
+11539 COleLinkingDoc::XOleItemContainer::ParseDisplayName
+11540 CTagManager::ParseFont
+11541 CCommandLineInfo::ParseLast
+11542 CCommandLineInfo::ParseParam
+11543 CCommandLineInfo::ParseParamFlag
+11544 CCommandLineInfo::ParseParamNotFlag
+11545 CTagManager::ParsePoint
+11546 CTagManager::ParseRect
+11547 CTagManager::ParseSize
+11548 CTagManager::ParseString
+11549 CTagManager::ParseToolBarImages
+11550 CTagManager::ParseToolBarImages
+11551 CTagManager::ParseToolTipInfo
+11552 CRichEditCtrl::PasteSpecial
+11553 CMapStringToString::PGetFirstAssoc
+11554 CMapStringToString::PGetFirstAssoc
+11555 CMapStringToString::PGetNextAssoc
+11556 CMapStringToString::PGetNextAssoc
+11557 CDrawingManager::PixelAlpha
+11558 CDrawingManager::PixelAlpha
+11559 CDrawingManager::PixelAlpha
+11560 CMFCDragFrameImpl::PlaceTabPreDocking
+11561 CMFCDragFrameImpl::PlaceTabPreDocking
+11562 CDC::PlayMetaFile
+11563 CMapStringToString::PLookup
+11564 CMapStringToString::PLookup
+11565 CMFCColorPickerCtrl::PointFromLum
+11566 CDC::PolyBezierTo
+11567 CDC::PolyDraw
+11568 CDC::PolylineTo
+11569 CRenderTarget::PopAxisAlignedClip
+11570 CRenderTarget::PopLayer
+11571 CMFCRibbonBar::PopTooltip
+11572 CMFCRibbonPanelMenuBar::PopTooltip
+11573 CPreviewView::PositionPage
+11574 CAsyncMonikerFile::PostBindToStream
+11575 CMonikerFile::PostBindToStream
+11576 CMFCPopupMenu::PostCommand
+11577 COccManager::PostCreateDialog
+11578 CMFCRibbonBaseElement::PostMenuCommand
+11579 CDialog::PostModal
+11580 CPrintDialogEx::PostModal
+11581 COleControl::PostModalDialog
+11582 CControlBar::PostNcDestroy
+11583 CControlFrameWnd::PostNcDestroy
+11584 CControlFrameWnd::PostNcDestroy
+11585 CControlFrameWnd::PostNcDestroy
+11586 CMFCColorPropertySheet::PostNcDestroy
+11587 CMFCDropDownFrame::PostNcDestroy
+11588 CMFCPopupMenu::PostNcDestroy
+11589 CMFCToolBarsCustomizeDialog::PostNcDestroy
+11590 delete
+11591 CReflectorWnd::PostNcDestroy
+11592 CControlFrameWnd::PostNcDestroy
+11593 delete
+11596 delete
+11597 delete
+11598 COleDocument::PreCloseFrame
+11599 CRichEditDoc::PreCloseFrame
+11600 CCheckListBox::PreCompareItem
+11601 COccManager::PreCreateDialog
+11602 CControlBar::PreCreateWindow
+11603 CControlFrameWnd::PreCreateWindow
+11604 CCtrlView::PreCreateWindow
+11605 CEditView::PreCreateWindow
+11606 CFrameWnd::PreCreateWindow
+11607 CFrameWndEx::PreCreateWindow
+11608 CHtmlView::PreCreateWindow
+11609 CListView::PreCreateWindow
+11610 CMDIChildWnd::PreCreateWindow
+11611 CMDIChildWndEx::PreCreateWindow
+11612 CMDIFrameWnd::PreCreateWindow
+11613 CMDIFrameWndEx::PreCreateWindow
+11614 CMFCButton::PreCreateWindow
+11615 CMFCColorPickerCtrl::PreCreateWindow
+11616 CMFCRibbonBar::PreCreateWindow
+11617 CMFCRibbonStatusBar::PreCreateWindow
+11618 CMFCStatusBar::PreCreateWindow
+11619 CMiniFrameWnd::PreCreateWindow
+11620 COleCntrFrameWndEx::PreCreateWindow
+11621 COleDocIPFrameWndEx::PreCreateWindow
+11622 COleDocIPFrameWndEx::PreCreateWindow
+11623 CPaneFrameWnd::PreCreateWindow
+11624 CRichEditView::PreCreateWindow
+11625 CStatusBar::PreCreateWindow
+11626 CListView::PreCreateWindow
+11627 CView::PreCreateWindow
+11628 CWnd::PreCreateWindow
+11629 CCheckListBox::PreDeleteItem
+11630 CCheckListBox::PreDrawItem
+11631 CCheckListBox::PreDrawItemHelper
+11632 CCheckListBox::PreDrawItemNonThemed
+11633 CCheckListBox::PreDrawItemThemed
+11634 COleUILinkInfo::AddRef
+11635 delete
+11636 COleChangeSourceDialog::PreInitDialog
+11637 CMFCRibbonEdit::PreLMouseDown
+11638 CCheckListBox::PreMeasureItem
+11639 CDialog::PreModal
+11640 CPrintDialogEx::PreModal
+11641 COleControl::PreModalDialog
+11642 CMFCToolBarImages::PreMultiplyAlpha
+11643 CMFCToolBarImages::PreMultiplyAlpha
+11644 CRecordset::PrepareAndExecute
+11645 CDataExchange::PrepareCtrl
+11646 CMFCToolBarButton::PrepareDrag
+11647 CMFCToolBarImages::PrepareDrawImage
+11648 CDataExchange::PrepareEditCtrl
+11649 CWnd::PrepareForHelp
+11650 CDataExchange::PrepareOleCtrl
+11651 CDrawingManager::PrepareShadowMask
+11652 CPane::PrepareToDock
+11653 CRecordset::PrepareUpdateHstmt
+11658 CPropertyPage::PreProcessPageTemplate
+11659 CDragListBox::PreSubclassWindow
+11660 CMDIClientAreaWnd::PreSubclassWindow
+11661 CMFCButton::PreSubclassWindow
+11662 CMFCColorPickerCtrl::PreSubclassWindow
+11663 CMFCFontComboBox::PreSubclassWindow
+11664 CMFCHeaderCtrl::PreSubclassWindow
+11665 CMFCImagePaintArea::PreSubclassWindow
+11666 CMFCListCtrl::PreSubclassWindow
+11667 CMFCPropertyGridCtrl::PreSubclassWindow
+11668 CMFCShellListCtrl::PreSubclassWindow
+11669 CMFCShellTreeCtrl::PreSubclassWindow
+11670 CMFCToolBarsCommandsListBox::PreSubclassWindow
+11671 CVSListBoxBase::PreSubclassWindow
+11672 delete
+11673 CWnd::PreTranslateInput
+11674 CBasePane::PreTranslateMessage
+11675 CControlBar::PreTranslateMessage
+11676 CDialog::PreTranslateMessage
+11677 CDialogEx::PreTranslateMessage
+11678 CDialogImpl::PreTranslateMessage
+11679 CDockablePane::PreTranslateMessage
+11680 CFormView::PreTranslateMessage
+11681 CFrameWnd::PreTranslateMessage
+11682 CFrameWndEx::PreTranslateMessage
+11683 CHtmlView::PreTranslateMessage
+11684 CMDIChildWnd::PreTranslateMessage
+11685 CMDIChildWndEx::PreTranslateMessage
+11686 CMDIFrameWnd::PreTranslateMessage
+11687 CMDIFrameWndEx::PreTranslateMessage
+11688 CMFCAcceleratorKeyAssignCtrl::PreTranslateMessage
+11689 CMFCBaseTabCtrl::PreTranslateMessage
+11690 CMFCButton::PreTranslateMessage
+11691 CMFCCaptionBar::PreTranslateMessage
+11692 CMFCColorBar::PreTranslateMessage
+11693 CMFCColorDialog::PreTranslateMessage
+11694 CMFCColorPropertySheet::PreTranslateMessage
+11695 CMFCDesktopAlertDialog::PreTranslateMessage
+11696 CMFCEditBrowseCtrl::PreTranslateMessage
+11697 CMFCFontComboBox::PreTranslateMessage
+11698 CMFCLinkCtrl::PreTranslateMessage
+11699 CMFCMenuBar::PreTranslateMessage
+11700 CMFCMenuButton::PreTranslateMessage
+11701 CMFCOutlookBarPane::PreTranslateMessage
+11702 CMFCPopupMenu::PreTranslateMessage
+11703 CMFCPropertyGridCtrl::PreTranslateMessage
+11704 CMFCPropertyGridToolTipCtrl::PreTranslateMessage
+11705 CMFCPropertyPage::PreTranslateMessage
+11706 CMFCPropertySheet::PreTranslateMessage
+11707 CMFCRibbonBar::PreTranslateMessage
+11708 CMFCRibbonPanelMenuBar::PreTranslateMessage
+11709 CMFCRibbonRichEditCtrl::PreTranslateMessage
+11710 CMFCTabCtrl::PreTranslateMessage
+11711 CMFCTasksPane::PreTranslateMessage
+11712 CMFCToolBar::PreTranslateMessage
+11713 CMFCToolBarComboBoxEdit::PreTranslateMessage
+11714 CMFCToolBarEditCtrl::PreTranslateMessage
+11715 COleDocIPFrameWndEx::PreTranslateMessage
+11716 COleIPFrameWnd::PreTranslateMessage
+11717 COleDocIPFrameWndEx::PreTranslateMessage
+11718 COlePropertyPage::PreTranslateMessage
+11719 CPaneFrameWnd::PreTranslateMessage
+11720 CPropertyPage::PreTranslateMessage
+11721 CPropertySheet::PreTranslateMessage
+11722 CVSListBox::PreTranslateMessage
+11723 CWinThread::PreTranslateMessage
+11724 CPropertyPage::PreTranslateMessage
+11725 CMFCControlContainer::PreUnsubclassControl
+11726 CMFCToolBar::PrevMenu
+11727 CDocObjectServer::XPrint::Print
+11728 CPreviewDC::PrinterDPtoScreenDP
+11729 CEditView::PrintInsideRect
+11730 CRichEditView::PrintInsideRect
+11731 CMFCKeyMapDialog::PrintKeyMap
+11732 CRichEditView::PrintPage
+11733 COleDispatchException::Process
+11734 COleException::Process
+11735 CSocket::ProcessAuxQueue
+11736 CMFCPropertyGridCtrl::ProcessClipboardAccelerators
+11737 CMFCRibbonRichEditCtrl::ProcessClipboardAccelerators
+11738 CMFCDesktopAlertWnd::ProcessCommand
+11739 CMFCToolBar::ProcessCommand
+11740 CFrameWnd::ProcessHelpMsg
+11741 CMFCRibbonBar::ProcessKey
+11742 CFrameImpl::ProcessKeyboard
+11743 CWinThread::ProcessMessageFilter
+11744 CDialogImpl::ProcessMouseClick
+11745 CFrameImpl::ProcessMouseClick
+11746 CDialogImpl::ProcessMouseMove
+11747 CFrameImpl::ProcessMouseMove
+11748 CFrameImpl::ProcessMouseWheel
+11749 CDockingManager::ProcessPaneContextMenuCommand
+11750 CWinApp::ProcessShellCommand
+11751 CWinApp::ProcessWndProcException
+11752 CWinThread::ProcessWndProcException
+11753 COleSafeArray::PtrOfIndex
+11754 CMetaFileDC::PtVisible
+11755 CWinThread::PumpMessage
+11756 CSocket::PumpMessages
+11757 CRenderTarget::PushAxisAlignedClip
+11758 CMFCPropertyGridProperty::PushChar
+11759 CRenderTarget::PushLayer
+11760 CCmdTarget::PushStackArgs
+11761 CWnd::put_accName
+11762 CWnd::XAccessible::put_accName
+11763 CWnd::put_accName
+11764 CWnd::XAccessible::put_accValue
+11765 COleSafeArray::PutElement
+11766 CFtpConnection::PutFile
+11767 CHtmlView::PutProperty
+11768 PX_Blob
+11769 PX_Bool
+11770 PX_Bool
+11771 PX_Color
+11772 PX_Color
+11773 PX_Currency
+11774 PX_Currency
+11775 PX_DataPath
+11776 PX_DataPath
+11777 PX_Double
+11778 PX_Double
+11779 PX_Float
+11780 PX_Float
+11781 PX_Font
+11782 PX_IUnknown
+11783 PX_Color
+11784 PX_Color
+11785 PX_Picture
+11786 PX_Picture
+11787 PX_Short
+11788 PX_Short
+11789 PX_String
+11790 PX_String
+11791 PX_String
+11792 PX_Color
+11793 PX_Color
+11794 PX_Short
+11795 PX_Short
+11796 PX_VBXFontConvert
+11797 CRichEditView::QueryAcceptData
+11798 CRichEditView::XRichEditOleCallback::QueryAcceptData
+11799 CCmdTarget::QueryAggregates
+11800 COleDocObjectItem::QueryCommand
+11801 CMFCToolBarDropSource::QueryContinueDrag
+11802 COleDropSource::QueryContinueDrag
+11803 COleDropSource::XDropSource::QueryContinueDrag
+11804 COleControl::QueryDefHandler
+11805 CDocument::XPreviewHandler::QueryFocus
+11806 CHtmlView::QueryFormsCommand
+11807 COleControl::XDataObject::QueryGetData
+11808 COleDataSource::XDataObject::QueryGetData
+11809 COleServerDoc::XDataObject::QueryGetData
+11810 COleServerItem::XDataObject::QueryGetData
+11811 COleControl::XViewObject::QueryHitPoint
+11812 COleControl::XViewObject::QueryHitRect
+11813 CHttpFile::QueryInfo
+11814 CHttpFile::QueryInfo
+11815 CHttpFile::QueryInfo
+11816 CHttpFile::QueryInfo
+11817 CHttpFile::QueryInfoStatusCode
+11818 CRichEditView::XRichEditOleCallback::QueryInsertObject
+11819 CArchiveStream::QueryInterface
+11820 CBlobProperty::QueryInterface
+11821 CBrowserControlSite::QueryInterface
+11822 CDHtmlControlSink::QueryInterface
+11823 CDHtmlElementEventSink::QueryInterface
+11824 CInnerUnknown::QueryInterface
+11825 COleConnPtContainer::QueryInterface
+11826 COleDispatchImpl::QueryInterface
+11827 CArchiveStream::Clone
+11828 CPrintDialogEx::QueryInterface
+11829 CInternetConnection::QueryOption
+11830 CInternetConnection::QueryOption
+11831 CInternetFile::QueryOption
+11832 CInternetFile::QueryOption
+11833 CInternetSession::QueryOption
+11834 CInternetSession::QueryOption
+11835 CDataRecoveryHandler::QueryRestoreAutosavedDocuments
+11836 CPropertyPage::QuerySiblings
+11837 CConnectionPoint::QuerySinkInterface
+11838 COleControl::XEventConnPt::QuerySinkInterface
+11839 CDocObjectServer::XOleCommandTarget::QueryStatus
+11840 COleFrameHook::XOleCommandTarget::QueryStatus
+11841 CHtmlView::QueryStatusWB
+11842 CFontHolder::QueryTextMetrics
+11843 COleControlSite::QuickActivate
+11844 COleControl::XQuickActivate::QuickActivate
+11845 COleClientItem::ReactivateAndUndo
+11846 CArchiveStream::Clone
+11847 COleServerDoc::XOleInPlaceObject::ReactivateAndUndo
+11848 CArchive::Read
+11849 CArchiveStream::Read
+11850 CAsyncMonikerFile::Read
+11851 CFile::Read
+11852 CImageList::Read
+11853 CInternetFile::Read
+11854 CMemFile::Read
+11855 CMFCRibbonInfo::Read
+11856 CMFCRibbonInfo::Read
+11857 CMFCRibbonInfo::Read
+11858 COleStreamFile::Read
+11859 CMemFile::Abort
+11860 CSettingsStore::Read
+11861 CSettingsStore::Read
+11862 CSettingsStore::Read
+11863 CSettingsStore::Read
+11864 CSettingsStore::Read
+11865 CSettingsStore::Read
+11866 CSocketFile::Read
+11867 CStdioFile::Read
+11868 CMFCRibbonInfo::XCategory::Read
+11869 CMFCRibbonInfo::XCategoryMain::Read
+11870 CMFCRibbonInfo::XContext::Read
+11871 CMFCRibbonInfo::XElement::Read
+11872 CMFCRibbonInfo::XElementButton::Read
+11873 CMFCRibbonInfo::XElementButtonApplication::Read
+11874 CMFCRibbonInfo::XElementButtonCheck::Read
+11875 CMFCRibbonInfo::XElementButtonColor::Read
+11876 CMFCRibbonInfo::XElementButtonGallery::Read
+11877 CMFCRibbonInfo::XElementButtonCheck::Read
+11878 CMFCRibbonInfo::XElementButtonLinkCtrl::Read
+11879 CMFCRibbonInfo::XElementButtonCheck::Read
+11880 CMFCRibbonInfo::XElementButtonUndo::Read
+11881 CMFCRibbonInfo::XElementComboBox::Read
+11882 CMFCRibbonInfo::XElementEdit::Read
+11883 CMFCRibbonInfo::XElementFontComboBox::Read
+11884 CMFCRibbonInfo::XElementGroup::Read
+11885 CMFCRibbonInfo::XElementButtonCheck::Read
+11886 CMFCRibbonInfo::XElementProgressBar::Read
+11887 CMFCRibbonInfo::XElementSeparator::Read
+11888 CMFCRibbonInfo::XElementSlider::Read
+11889 CMFCRibbonInfo::XElementButtonGallery::XGalleryGroup::Read
+11890 CMFCRibbonInfo::XID::Read
+11891 CMFCRibbonInfo::XImage::Read
+11892 CMFCRibbonInfo::XPanel::Read
+11893 CMFCRibbonInfo::XQAT::Read
+11894 CMFCRibbonInfo::XQAT::XQATItem::Read
+11895 CMFCRibbonInfo::XRibbonBar::Read
+11896 CTagManager::ReadBool
+11897 CMFCRibbonInfo::XRibbonInfoParser::ReadBool
+11898 ReadBoolProp
+11899 CArchive::ReadClass
+11900 CTagManager::ReadColor
+11901 CMFCRibbonInfo::XRibbonInfoParser::ReadColor
+11902 CTagManager::ReadControlRenderer
+11903 CTagManager::ReadControlRenderer
+11904 CTagManager::ReadControlRendererInfo
+11905 CArchive::ReadCount
+11906 CTagManager::ReadFont
+11907 CEditView::ReadFromArchive
+11908 CProperty::ReadFromStream
+11909 CPropertySection::ReadFromStream
+11910 CPropertySet::ReadFromStream
+11911 CTagManager::ReadInt
+11912 CMFCRibbonInfo::XRibbonInfoParser::ReadInt
+11913 COleClientItem::ReadItem
+11914 COleClientItem::ReadItemCompound
+11915 COleClientItem::ReadItemFlat
+11916 CRecentFileList::ReadList
+11917 CPropertySection::ReadNameDictFromStream
+11918 CDocument::ReadNextChunkValue
+11919 CArchive::ReadObject
+11920 CDataRecoveryHandler::ReadOpenDocumentList
+11921 CTagManager::ReadPoint
+11922 CTagManager::ReadRect
+11923 CTagManager::ReadSize
+11924 CMFCRibbonInfo::XRibbonInfoParser::ReadSize
+11925 CArchive::ReadString
+11926 CArchive::ReadString
+11927 CInternetFile::ReadString
+11928 CInternetFile::ReadString
+11929 CStdioFile::ReadString
+11930 CStdioFile::ReadString
+11931 CTagManager::ReadToolBarImages
+11932 CTagManager::ReadToolBarImages
+11933 CTagManager::ReadToolTipInfo
+11934 CMFCRibbonInfo::XRibbonInfoParser::ReadUInt
+11935 CMemFile::Realloc
+11936 CSharedFile::Realloc
+11939 CAfxStringMgr::Reallocate
+11940 CFieldExchange::ReallocLongBinary
+11941 CRecordset::RebindParams
+11942 CMFCColorBar::Rebuild
+11943 CMFCToolBar::RebuildAccelerationKeys
+11944 CMFCRibbonFontComboBox::RebuildFonts
+11945 CMFCToolBarFontComboBox::RebuildFonts
+11946 CMFCToolBarFontSizeComboBox::RebuildFontSizes
+11947 CMFCRibbonQuickAccessToolBar::RebuildHiddenItems
+11948 CMFCRibbonGallery::RebuildIconLocations
+11949 CMFCToolBarButtonCustomizeDialog::RebuildImageList
+11950 CMFCRibbonQuickAccessToolBar::RebuildKeys
+11951 CMFCToolBarButtonsListButton::RebuildLocations
+11952 CMFCTasksPane::RebuildMenu
+11953 CMFCColorButton::RebuildPalette
+11954 CMFCColorDialog::RebuildPalette
+11955 CMFCOutlookBarTabCtrl::RebuildToolBar
+11956 CPaneFrameWnd::RecalcCaptionHeight
+11957 CControlBar::RecalcDelayShow
+11958 CBaseTabbedPane::RecalcLayout
+11959 CDockingManager::RecalcLayout
+11960 CFrameWnd::RecalcLayout
+11961 CFrameWndEx::RecalcLayout
+11962 CMDIChildWndEx::RecalcLayout
+11963 CMDIFrameWndEx::RecalcLayout
+11964 CMFCCaptionBar::RecalcLayout
+11965 CMFCDropDownFrame::RecalcLayout
+11966 CMFCOutlookBarTabCtrl::RecalcLayout
+11967 CMFCPopupMenu::RecalcLayout
+11968 CMFCRibbonBar::RecalcLayout
+11969 CMFCRibbonCategory::RecalcLayout
+11970 CMFCRibbonStatusBar::RecalcLayout
+11971 CMFCStatusBar::RecalcLayout
+11972 CMFCTabCtrl::RecalcLayout
+11973 CMFCTasksPane::RecalcLayout
+11974 CMiniDockFrameWnd::RecalcLayout
+11975 COleCntrFrameWnd::RecalcLayout
+11976 COleCntrFrameWndEx::RecalcLayout
+11977 COleDocIPFrameWnd::RecalcLayout
+11978 COleDocIPFrameWndEx::RecalcLayout
+11979 COleIPFrameWnd::RecalcLayout
+11980 COleIPFrameWndEx::RecalcLayout
+11981 CPane::RecalcLayout
+11982 CSplitterWnd::RecalcLayout
+11983 CMFCRibbonCategory::RecalcPanelWidths
+11984 CMFCRibbonMainPanel::RecalcWidths
+11985 CMFCRibbonPanel::RecalcWidths
+11986 CAsyncSocket::Receive
+11987 CSocket::Receive
+11988 CAsyncSocket::ReceiveFrom
+11989 CAsyncSocket::ReceiveFromHelper
+11990 CSocket::ReceiveFromHelper
+11991 CD2DResource::ReCreate
+11992 CHwndRenderTarget::ReCreate
+11993 COleControl::RecreateControlWindow
+11995 CDockSite::RectSideFromPoint
+11996 CArchiveStream::AddRef
+11997 COleSafeArray::Redim
+11998 CDockBar::ReDockControlBar
+11999 CFrameWnd::ReDockControlBar
+12000 CMFCPreviewCtrlImpl::Redraw
+12001 CMFCPropertyGridProperty::Redraw
+12002 CMFCRibbonBaseElement::Redraw
+12003 CMFCRibbonEdit::Redraw
+12004 CMFCRibbonTab::Redraw
+12005 CDockingPanesRow::RedrawAll
+12006 CMFCVisualManager::RedrawAll
+12007 CPaneFrameWnd::RedrawAll
+12008 CDockingManager::RedrawAllMiniFrames
+12009 CDockablePane::RedrawButton
+12010 CFrameImpl::RedrawCaptionButton
+12011 CPaneFrameWnd::RedrawCaptionButton
+12012 CMFCToolBar::RedrawCustomizeButton
+12013 CMFCRibbonPanel::RedrawElement
+12014 CMFCRibbonGallery::RedrawIcons
+12015 CMFCToolBarButtonsListButton::RedrawSelection
+12016 CMFCToolBar::RedrawUnderlines
+12017 CWnd::ReflectChildNotify
+12018 CWnd::ReflectLastMsg
+12019 CMFCShellListCtrl::Refresh
+12020 CMFCShellTreeCtrl::Refresh
+12021 COleControl::Refresh
+12022 CRecordset::RefreshRowset
+12023 CMFCTabDropTarget::Register
+12024 CMFCTabDropTarget::Register
+12025 COleDropTarget::Register
+12026 COleLinkingDoc::Register
+12027 COleMessageFilter::Register
+12028 COleObjectFactory::Register
+12029 COleTemplateServer::Register
+12030 CArchiveStream::AddRef
+12031 COleObjectFactory::RegisterAll
+12032 CMDIFrameWndEx::RegisterAllMDIChildrenWithTaskbar
+12033 COleLinkingDoc::RegisterIfServerAttached
+12034 CDocManager::RegisterShellFileTypes
+12035 CWinApp::RegisterShellFileTypes
+12036 CControlSiteFactoryMgr::RegisterSiteFactory
+12037 CMDIChildWndEx::RegisterTaskbarTab
+12038 CWnd::RegisterTouchWindow
+12039 AFX_GLOBAL_DATA::RegisterWindowClass
+12040 CWinApp::RegisterWithRestartManager
+12042 COleUILinkInfo::AddRef
+12043 CBlobProperty::Release
+12044 CBrowserControlSite::Release
+12045 CArchiveStream::AddRef
+12046 CArchiveStream::AddRef
+12047 CArchiveStream::AddRef
+12048 CInnerUnknown::Release
+12049 COleClientItem::Release
+12050 COleConnPtContainer::Release
+12051 COleDataObject::Release
+12052 COleDispatchImpl::Release
+12053 COleDocObjectItem::Release
+12054 COleUILinkInfo::AddRef
+12055 CPaneContainer::Release
+12056 CArchiveStream::AddRef
+12057 CDC::ReleaseAttribDC
+12062 COleControl::ReleaseCaches
+12063 COleControl::ReleaseCapture
+12064 CMFCShellListCtrl::ReleaseCurrFolder
+12065 _AFX_D2D_STATE::ReleaseD2DRefs
+12066 COleControl::ReleaseDC
+12067 COleControlSite::XOleIPSite::ReleaseDC
+12068 COleDispatchDriver::ReleaseDispatch
+12069 CDocObjectServer::ReleaseDocSite
+12070 CPaneContainer::ReleaseEmptyPaneContainer
+12071 CDockingManager::ReleaseEmptyPaneContainers
+12072 CPaneContainerManager::ReleaseEmptyPaneContainers
+12073 CPaneDivider::ReleaseEmptyPaneContainers
+12074 CDocument::ReleaseFile
+12075 CFontHolder::ReleaseFont
+12076 CJumpList::ReleaseObjectArray
+12077 CDC::ReleaseOutputDC
+12078 delete
+12079 CPreviewDC::ReleaseOutputDC
+12080 CWinApp::ReleaseTaskBarRefs
+12081 COleClientItem::Reload
+12082 CWinAppEx::ReloadWindowPlacement
+12085 CFile::Remove
+12086 CFtpConnection::Remove
+12087 CMFCRibbonPanel::Remove
+12088 CMFCRibbonQuickAccessToolBar::Remove
+12089 CPropertySection::Remove
+12090 CPropertySet::Remove
+12091 CPropertySet::Remove
+12092 CRecentFileList::Remove
+12093 CSimpleList::Remove
+12094 CMapPtrToPtr::RemoveAll
+12095 CMapPtrToPtr::RemoveAll
+12096 CMapStringToOb::RemoveAll
+12097 CMapStringToOb::RemoveAll
+12099 CMapPtrToPtr::RemoveAll
+12100 CMapPtrToPtr::RemoveAll
+12101 CMFCPropertyGridCtrl::RemoveAll
+12102 CMFCRibbonButtonsGroup::RemoveAll
+12103 CMFCRibbonGallery::RemoveAll
+12104 CMFCRibbonPanel::RemoveAll
+12105 CMFCRibbonQuickAccessToolBarDefaultState::RemoveAll
+12106 CMFCRibbonStatusBar::RemoveAll
+12108 CPropertySection::RemoveAll
+12109 CPropertySet::RemoveAll
+12111 CStringList::RemoveAll
+12112 CTypeLibCacheMap::RemoveAll
+12113 CAnimationController::RemoveAllAnimationGroups
+12114 CMFCOutlookBarPane::RemoveAllButtons
+12115 CMFCToolBar::RemoveAllButtons
+12116 CPaneFrameWnd::RemoveAllCaptionButtons
+12117 CMFCRibbonBar::RemoveAllCategories
+12118 CMFCRibbonColorButton::RemoveAllColorGroups
+12119 CAppDestinations::RemoveAllDestinations
+12120 CMFCRibbonBar::RemoveAllFromTabs
+12121 CMFCTasksPane::RemoveAllGroups
+12122 CMFCPopupMenu::RemoveAllItems
+12123 CMFCRibbonComboBox::RemoveAllItems
+12124 CMFCToolBarComboBoxButton::RemoveAllItems
+12125 CMFCRibbonBar::RemoveAllKeys
+12126 CMFCPropertyGridProperty::RemoveAllOptions
+12127 CMFCTasksPane::RemoveAllPages
+12128 CPaneContainerManager::RemoveAllPanesAndPaneDividers
+12129 CMFCRibbonButton::RemoveAllSubItems
+12130 CMFCBaseTabCtrl::RemoveAllTabs
+12131 CMFCTasksPane::RemoveAllTasks
+12132 CAnimationController::RemoveAnimationGroup
+12133 CAnimationController::RemoveAnimationObject
+12134 CByteArray::RemoveAt
+12136 CObArray::RemoveAt
+12137 CObList::RemoveAt
+12138 CObArray::RemoveAt
+12139 CObList::RemoveAt
+12140 CStringArray::RemoveAt
+12141 CStringList::RemoveAt
+12143 CWordArray::RemoveAt
+12144 CMFCAutoHideBar::RemoveAutoHideWindow
+12145 CMFCCaptionBar::RemoveBitmap
+12146 CMFCCaptionBar::RemoveButton
+12147 CMFCOutlookBarPane::RemoveButton
+12148 CMFCToolBar::RemoveButton
+12149 CMFCToolBarsCustomizeDialog::RemoveButton
+12150 CMFCToolBarsCustomizeDialog::RemoveButton
+12151 CPaneFrameWnd::RemoveButton
+12152 CMFCOutlookBarPane::RemoveButtonByIndex
+12153 CMFCToolBarButtonsListButton::RemoveButtons
+12154 CDockablePane::RemoveCaptionButtons
+12155 CMFCPropertySheet::RemoveCategory
+12156 CMFCRibbonBar::RemoveCategory
+12157 CDocument::RemoveChunk
+12158 CDockBar::RemoveControlBar
+12159 CFrameWnd::RemoveControlBar
+12160 CFileDialog::RemoveControlItem
+12161 CMFCOutlookBar::RemoveCustomPage
+12162 CAppDestinations::RemoveDestination
+12163 CFtpConnection::RemoveDirectoryA
+12164 CDocTemplate::RemoveDocument
+12165 CMultiDocTemplate::RemoveDocument
+12166 CSingleDocTemplate::RemoveDocument
+12167 CDataRecoveryHandler::RemoveDocumentInfo
+12168 CMFCRibbonStatusBar::RemoveElement
+12169 CFrameImpl::RemoveFrame
+12170 COleControl::RemoveFrameLevelUI
+12171 CFrameWnd::RemoveFrameWnd
+12172 CDockablePane::RemoveFromDefaultPaneDivider
+12173 CPane::RemoveFromMiniframe
+12174 CMFCTasksPane::RemoveGroup
+12175 CObList::RemoveHead
+12176 CObList::RemoveHead
+12177 CStringList::RemoveHead
+12178 CDockingManager::RemoveHiddenMDITabbedBar
+12179 CMFCCaptionBar::RemoveIcon
+12180 CListCtrl::RemoveImageList
+12181 CListCtrl::RemoveImageList
+12182 CTreeCtrl::RemoveImageList
+12183 CTreeCtrl::RemoveImageList
+12184 CMFCPopupMenu::RemoveItem
+12185 COleDocument::RemoveItem
+12186 CVSListBox::RemoveItem
+12187 CMFCRibbonGallery::RemoveItemToolTips
+12188 CMapPtrToPtr::RemoveKey
+12189 CMapPtrToPtr::RemoveKey
+12190 CMapStringToOb::RemoveKey
+12191 CMapStringToOb::RemoveKey
+12192 CMapStringToString::RemoveKey
+12193 CMapWordToOb::RemoveKey
+12194 CMapWordToOb::RemoveKey
+12195 CAnimationGroup::RemoveKeyframes
+12196 CMenuHash::RemoveMenu
+12197 COleFrameHook::XOleInPlaceFrame::RemoveMenus
+12198 CArchiveStream::Clone
+12199 CDockingManager::RemoveMiniFrame
+12200 CMultiPaneFrameWnd::RemoveNonValidPanes
+12201 CPaneContainer::RemoveNonValidPanes
+12202 CPaneContainerManager::RemoveNonValidPanes
+12203 CPaneFrameWnd::RemoveNonValidPanes
+12204 CMFCPropertySheet::RemovePage
+12205 CMFCPropertySheet::RemovePage
+12206 CMFCTasksPane::RemovePage
+12207 CPropertySheet::RemovePage
+12208 CPropertySheet::RemovePage
+12209 CBaseTabbedPane::RemovePane
+12210 CDockingPanesRow::RemovePane
+12211 CDockSite::RemovePane
+12212 CMultiPaneFrameWnd::RemovePane
+12213 CPaneContainer::RemovePane
+12214 CPaneDivider::RemovePane
+12215 CPaneFrameWnd::RemovePane
+12216 CPaneContainerManager::RemovePaneDivider
+12217 CBasePane::RemovePaneFromDockManager
+12218 CDockingManager::RemovePaneFromDockManager
+12219 CFrameWndEx::RemovePaneFromDockManager
+12220 CMDIChildWndEx::RemovePaneFromDockManager
+12221 CMDIFrameWndEx::RemovePaneFromDockManager
+12222 COleCntrFrameWndEx::RemovePaneFromDockManager
+12223 COleDocIPFrameWndEx::RemovePaneFromDockManager
+12224 COleDocIPFrameWndEx::RemovePaneFromDockManager
+12225 CPaneContainerManager::RemovePaneFromPaneContainer
+12226 CMFCRibbonCategory::RemovePanel
+12227 CDockBar::RemovePlaceHolder
+12228 CWnd::RemoveRadioCheckFromGroup
+12229 CMFCToolBar::RemoveResetStateButton
+12230 CDockSite::RemoveRow
+12231 CMFCHeaderCtrl::RemoveSortColumn
+12232 CMFCListCtrl::RemoveSortColumn
+12233 CDataBoundProperty::RemoveSource
+12234 CMFCToolBar::RemoveStateFromRegistry
+12235 CMFCPropertyGridProperty::RemoveSubItem
+12236 CMFCRibbonButton::RemoveSubItem
+12237 CMFCBaseTabCtrl::RemoveTab
+12238 CMDIClientAreaWnd::RemoveTabGroup
+12239 CMFCDragFrameImpl::RemoveTabPreDocking
+12240 CObList::RemoveTail
+12241 CObList::RemoveTail
+12242 CStringList::RemoveTail
+12243 CMFCTasksPane::RemoveTask
+12244 CFrameImpl::RemoveTearOffToolbar
+12245 CMFCCaptionBar::RemoveText
+12246 CUserToolsManager::RemoveTool
+12247 CAnimationController::RemoveTransitions
+12248 CAnimationGroup::RemoveTransitions
+12249 CDocument::RemoveView
+12250 CTabView::RemoveView
+12251 CFile::Rename
+12252 CFtpConnection::Rename
+12253 CMFCToolBarsCustomizeDialog::RenameCategory
+12254 CMFCBaseTabCtrl::RenameTab
+12255 CPictureHolder::Render
+12256 CDataRecoveryHandler::ReopenPreviousDocuments
+12257 COleControl::ReparentControlWindow
+12262 CMFCRibbonPanel::Replace
+12263 CDatabase::ReplaceBrackets
+12264 CMFCToolBar::ReplaceButton
+12265 CMFCToolBarsCustomizeDialog::ReplaceButton
+12266 CPaneFrameWnd::ReplaceButton
+12267 COleUILinkInfo::AddRef
+12268 CMFCRibbonButtonsGroup::ReplaceByID
+12269 CMFCRibbonPanel::ReplaceByID
+12270 CMFCRibbonQuickAccessToolBar::ReplaceCommands
+12271 CDockablePane::ReplacePane
+12272 CDockingManager::ReplacePane
+12273 CDockingPanesRow::ReplacePane
+12274 CDockSite::ReplacePane
+12275 CMFCAutoHideButton::ReplacePane
+12276 CMultiPaneFrameWnd::ReplacePane
+12277 CPaneContainerManager::ReplacePane
+12278 CPaneDivider::ReplacePane
+12279 CPaneFrameWnd::ReplacePane
+12280 CException::ReportError
+12281 COleClientItem::ReportError
+12282 CDocument::ReportSaveLoadException
+12283 COleLinkingDoc::ReportSaveLoadException
+12284 CMFCShadowWnd::Repos
+12285 CMFCTabCtrl::ReposButtons
+12286 CMFCPropertyGridProperty::Reposition
+12287 CMFCRibbonMainPanel::Reposition
+12288 CMFCRibbonPanel::Reposition
+12289 CWnd::RepositionBars
+12290 COleIPFrameWnd::RepositionFrame
+12291 CMFCRibbonPanel::RepositionMenu
+12292 CAutoHideDockSite::RepositionPanes
+12293 CDockingPanesRow::RepositionPanes
+12294 CDockSite::RepositionPanes
+12295 CPaneDivider::RepositionPanes
+12296 CMFCRibbonEdit::RepositionRibbonEditCtrl
+12297 CMFCRibbonPanel::ReposPalette
+12298 CMFCRibbonCategory::ReposPanels
+12299 CMFCPropertyGridCtrl::ReposProperties
+12300 CMFCTasksPane::ReposTasks
+12301 CRecordset::Requery
+12302 COleFrameHook::XOleInPlaceFrame::RequestBorderSpace
+12303 CArchiveStream::Clone
+12304 COleObjectFactory::XClassFactory::RequestLicKey
+12305 CArchiveStream::Clone
+12306 CArchiveStream::Clone
+12307 COleServerDoc::RequestPositionChange
+12308 COleControlSite::XOleIPSite::CanWindowlessActivate
+12309 CMenuTearOffManager::Reset
+12310 CMFCCmdUsageCount::Reset
+12311 CEnumArray::XEnumVOID::Reset
+12312 CKeyboardManager::ResetAll
+12313 CMFCToolBar::ResetAll
+12314 CMFCToolBar::ResetAllImages
+12315 CMFCRibbonQuickAccessToolBar::ResetCommands
+12316 CMFCDropDownListBox::ResetContent
+12317 CRecordset::ResetCursor
+12318 CCachedDataPathProperty::ResetData
+12319 delete
+12320 CMFCBaseTabCtrl::ResetImageList
+12321 CMFCMenuBar::ResetImages
+12322 CMFCToolBar::ResetImages
+12323 CMFCToolBarButton::ResetImageToDefault
+12324 CMFCToolBarMenuButton::ResetImageToDefault
+12325 CMFCAcceleratorKeyAssignCtrl::ResetKey
+12326 CMFCPropertyGridColorProperty::ResetOriginalValue
+12327 CMFCPropertyGridFontProperty::ResetOriginalValue
+12328 CMFCPropertyGridProperty::ResetOriginalValue
+12329 CMFCPropertyGridCtrl::ResetOriginalValues
+12330 CMFCRibbonCategory::ResetPanelsLayout
+12331 CContextMenuManager::ResetState
+12332 CMFCDragFrameImpl::ResetState
+12333 COleControl::ResetStockProps
+12334 CTabbedPane::ResetTabs
+12335 CControlBar::ResetTimer
+12336 COleControl::ResetVersion
+12337 CDockingPanesRow::Resize
+12338 CHwndRenderTarget::Resize
+12339 CPaneContainer::Resize
+12340 CBrowserControlSite::ResizeBorder
+12341 CArchiveStream::Clone
+12342 CHtmlControlSite::XDocHostUIHandler::ResizeBorder
+12343 COleUILinkInfo::AddRef
+12344 COleServerDoc::XOleInPlaceActiveObject::ResizeBorder
+12345 CMFCColorPropertySheet::ResizeControl
+12346 CDockSite::ResizeDockSite
+12347 CDockSite::ResizeDockSiteByOffset
+12348 COleControl::ResizeFrameWindow
+12349 COleSafeArray::ResizeOneDim
+12350 COleControl::ResizeOpenControl
+12351 CPaneContainer::ResizePane
+12352 CPaneContainerManager::ResizePaneContainers
+12353 CPaneContainerManager::ResizePaneContainers
+12354 CScrollView::ResizeParentToFit
+12355 CPaneContainer::ResizePartOfPaneContainer
+12356 CDockSite::ResizeRow
+12357 CDockingPanesRow::ResolveIntersection
+12358 CDockingPanesRow::ResolveIntersectionRect
+12359 CDockingManager::ResortMiniFramesForZOrder
+12360 CWinApp::RestartInstance
+12361 CDataRecoveryHandler::RestoreAutosavedDocuments
+12362 CDC::RestoreDC
+12363 CPreviewDC::RestoreDC
+12364 CMFCPopupMenuBar::RestoreDelayedSubMenu
+12365 CMFCRibbonPanelMenuBar::RestoreDelayedSubMenu
+12366 CRenderTarget::RestoreDrawingState
+12367 CMFCToolBar::RestoreFocus
+12368 CMFCMenuBar::RestoreMaximizeMode
+12369 CMFCMenuBar::RestoreOriginalState
+12370 CMFCOutlookBarPane::RestoreOriginalState
+12371 CMFCToolBar::RestoreOriginalState
+12372 CFrameImpl::RestorePosition
+12373 CFullScreenImpl::RestoreState
+12374 CToolBarCtrl::RestoreState
+12375 CCmdTarget::RestoreWaitCursor
+12376 CMFCControlContainer::ReSubclassControl
+12377 AFX_GLOBAL_DATA::Resume
+12378 COleMessageFilter::XMessageFilter::RetryRejectedCall
+12381 CArchiveStream::Clone
+12382 COleDropTarget::Revoke
+12383 COleLinkingDoc::Revoke
+12384 COleMessageFilter::Revoke
+12385 COleObjectFactory::Revoke
+12386 COleObjectFactory::RevokeAll
+12387 RFX_BigInt
+12388 RFX_Binary
+12389 RFX_Binary_Bulk
+12390 RFX_Bool
+12391 RFX_Bool_Bulk
+12392 RFX_Byte
+12393 RFX_Byte_Bulk
+12394 RFX_Date
+12395 RFX_Date
+12396 RFX_Date
+12397 RFX_Date_Bulk
+12398 RFX_Double
+12399 RFX_Double_Bulk
+12400 RFX_Int
+12401 RFX_Bool_Bulk
+12402 RFX_Long
+12403 RFX_Bool_Bulk
+12404 RFX_LongBinary
+12405 RFX_Single
+12406 RFX_Single_Bulk
+12407 RFX_Text
+12408 RFX_Text
+12409 RFX_Text
+12410 RFX_Text
+12411 RFX_Text_Bulk
+12412 RFX_Text_Bulk
+12413 CDrawingManager::RGBtoHSL
+12414 CDrawingManager::RGBtoHSV
+12415 CMFCVisualManager::RibbonCategoryColorToRGB
+12418 CDatabase::Rollback
+12419 CDockSite::RowFromPane
+12420 CDockSite::RowFromPoint
+12421 COleClientItem::Run
+12422 CWinApp::Run
+12423 CWinThread::Run
+12424 CWinApp::RunAutomated
+12425 CWinApp::RunEmbedded
+12426 CWnd::RunModalLoop
+12427 COleControlSite::SafeSetProperty
+12428 CEditView::SameAsSelected
+12429 CRichEditView::SameAsSelected
+12430 CBlobProperty::Save
+12431 CMFCToolBarImages::Save
+12432 COleLinkingDoc::XPersistFile::Save
+12433 CArchiveStream::Clone
+12434 COleControl::XPersistPropertyBag::Save
+12435 COleControl::XPersistStorage::Save
+12436 COleServerDoc::XPersistStorage::Save
+12437 COleControl::XPersistStreamInit::Save
+12438 CKeyboardManager::SaveAcceleratorState
+12439 CDocManager::SaveAllModified
+12440 CDocTemplate::SaveAllModified
+12441 CWinApp::SaveAllModified
+12442 CFrameWnd::SaveBarState
+12443 CMFCToolBarMenuButton::SaveBarState
+12444 COleLinkingDoc::XPersistFile::SaveCompleted
+12445 COleControl::XPersistStorage::SaveCompleted
+12446 COleServerDoc::XPersistStorage::SaveCompleted
+12447 CDC::SaveDC
+12448 CPreviewDC::SaveDC
+12449 CFrameImpl::SaveDockState
+12450 CRenderTarget::SaveDrawingState
+12451 COleServerDoc::SaveEmbedding
+12452 CFormView::SaveFocusControl
+12453 CMFCTasksPane::SaveHistory
+12454 CRecentDockSiteInfo::SaveListOfRecentPanes
+12455 CMDIFrameWndEx::SaveMDIState
+12456 CMFCToolBarsMenuPropertyPage::SaveMenu
+12457 CMenuHash::SaveMenuBar
+12458 CDocument::SaveModified
+12459 COleDocument::SaveModified
+12460 COleServerDoc::SaveModified
+12461 COleServerDoc::SaveModifiedPrompt
+12462 COleClientItem::XOleClientSite::SaveObject
+12463 CArchiveStream::Clone
+12464 CDataRecoveryHandler::SaveOpenDocumentList
+12465 CMFCToolBar::SaveOriginalState
+12466 CMFCToolBar::SaveParameters
+12467 CMFCReBarState::SaveRebarStateProc
+12468 CMultiPaneFrameWnd::SaveRecentFloatingState
+12469 CPaneFrameWnd::SaveRecentFloatingState
+12470 CMFCToolBar::SaveResetOriginalState
+12471 CBaseTabbedPane::SaveSiblingBarIDs
+12472 CBasePane::SaveState
+12473 CBaseTabbedPane::SaveState
+12474 CCommandManager::SaveState
+12475 CContextMenuManager::SaveState
+12476 CControlBarInfo::SaveState
+12477 CDockablePane::SaveState
+12478 CDockablePaneAdapter::SaveState
+12479 CDockingManager::SaveState
+12480 CDockState::SaveState
+12481 CKeyboardManager::SaveState
+12482 CMDIClientAreaWnd::SaveState
+12483 CMFCMenuBar::SaveState
+12484 CMFCOutlookBar::SaveState
+12485 CMFCPopupMenu::SaveState
+12486 CMFCReBarState::SaveState
+12487 CMFCRibbonBar::SaveState
+12488 CMFCRibbonStatusBar::SaveState
+12489 CMFCTasksPane::SaveState
+12490 CMFCToolBar::SaveState
+12491 CMouseManager::SaveState
+12492 CMultiPaneFrameWnd::SaveState
+12493 COleControl::SaveState
+12494 CPane::SaveState
+12495 CPaneFrameWnd::SaveState
+12496 CToolBarCtrl::SaveState
+12497 CUserToolsManager::SaveState
+12498 CWinAppEx::SaveState
+12499 CWinAppEx::SaveState
+12500 CWinAppEx::SaveState
+12501 CWinAppEx::SaveState
+12502 CWinApp::SaveStdProfileSettings
+12503 CPaneContainer::SaveTabbedPane
+12504 CFrameImpl::SaveTearOffMenus
+12505 COleDocument::SaveToStorage
+12506 COleLinkingDoc::SaveToStorage
+12507 CMFCRibbonBar::SaveToXMLBuffer
+12508 CMFCRibbonBar::SaveToXMLFile
+12509 CFrameImpl::SaveUserToolbars
+12510 CDocObjectServer::XOleDocumentView::SaveViewState
+12511 CDockState::ScalePoint
+12512 CDockState::ScaleRectPos
+12513 CDC::ScaleViewportExt
+12514 CMetaFileDC::ScaleViewportExt
+12515 CPreviewDC::ScaleViewportExt
+12516 CDC::ScaleWindowExt
+12517 CPreviewDC::ScaleWindowExt
+12518 CAnimationGroup::Schedule
+12519 CAnimationController::ScheduleGroup
+12520 CMFCImagePaintArea::ScreenToBitmap
+12521 CDockingPanesRow::ScreenToClient
+12522 CWnd::ScreenToClient
+12523 COleClientItem::XOleIPSite::Scroll
+12524 CArchiveStream::AddRef
+12525 COleControlContainer::ScrollChildren
+12526 COleServerDoc::ScrollContainerBy
+12527 CMFCOutlookBarPane::ScrollDown
+12528 CMFCOutlookBarPane::ScrollPageDown
+12529 CMFCOutlookBarPane::ScrollPageUp
+12530 CMFCRibbonPanel::ScrollPalette
+12531 COleControlSite::XOleIPSite::AdjustRect
+12532 CScrollView::ScrollToDevicePosition
+12533 CScrollView::ScrollToPosition
+12534 CMFCOutlookBarPane::ScrollUp
+12535 COleControl::ScrollWindow
+12536 CWnd::ScrollWindow
+12537 CWnd::ScrollWindowEx
+12538 CMFCCustomizeMenuButton::SearchCommandText
+12539 CArchiveStream::Seek
+12540 CFile::Seek
+12541 CInternetFile::Seek
+12542 CMemFile::Seek
+12543 COleStreamFile::Seek
+12544 COleUILinkInfo::AddRef
+12545 CStdioFile::Seek
+12546 CMFCWindowsManagerDialog::SelActive
+12547 CFontHolder::Select
+12548 CDHtmlDialog::Select_FindString
+12549 CMFCToolBarButtonsListButton::SelectButton
+12550 CMFCToolBarButtonsListButton::SelectButton
+12551 CMFCColorPickerCtrl::SelectCellHexagon
+12552 CMFCColorPickerCtrl::SelectCellHexagon
+12553 CDC::SelectClipPath
+12554 CDC::SelectClipRgn
+12555 CDC::SelectClipRgn
+12556 CMFCMousePropertyPage::SelectCommand
+12557 CMFCButton::SelectFont
+12558 CMFCFontComboBox::SelectFont
+12559 CMFCFontComboBox::SelectFont
+12560 CMFCHeaderCtrl::SelectFont
+12561 COleControl::SelectFontObject
+12562 CDC::SelectGdiObject
+12563 CArchiveStream::AddRef
+12564 CMFCRibbonComboBox::SelectItem
+12565 CMFCRibbonComboBox::SelectItem
+12566 CMFCRibbonComboBox::SelectItem
+12567 CMFCRibbonGallery::SelectItem
+12568 CMFCToolBarComboBoxButton::SelectItem
+12569 CMFCToolBarComboBoxButton::SelectItem
+12570 CMFCToolBarComboBoxButton::SelectItem
+12571 CVSListBox::SelectItem
+12572 CMFCToolBarComboBoxButton::SelectItemAll
+12573 CMFCToolBarComboBoxButton::SelectItemAll
+12574 CMFCToolBarComboBoxButton::SelectItemAll
+12575 CMFCToolBarsMenuPropertyPage::SelectMenu
+12576 CDC::SelectObject
+12577 CDC::SelectObject
+12578 CDC::SelectObject
+12579 CDC::SelectObject
+12580 CPreviewDC::SelectObject
+12581 CDC::SelectPalette
+12582 CMFCColorBar::SelectPalette
+12583 CMFCShellTreeCtrl::SelectPath
+12584 CMFCShellTreeCtrl::SelectPath
+12585 CWinApp::SelectPrinter
+12586 COleControl::SelectStockFont
+12587 CDC::SelectStockObject
+12588 CPreviewDC::SelectStockObject
+12589 CAsyncSocket::Send
+12590 CSocket::Send
+12591 COleControl::SendAdvise
+12592 CWnd::SendChildNotifyLastMsg
+12593 CSocket::SendChunk
+12594 COleControlContainer::SendDlgItemMessageA
+12595 CWnd::SendDlgItemMessageA
+12596 CDocument::SendInitialUpdate
+12597 CRecordset::SendLongBinaryData
+12598 CWnd::SendMessageToDescendants
+12599 CDockingManager::SendMessageToMiniFrames
+12600 COleControlSite::SendMnemonic
+12601 CHttpFile::SendRequest
+12602 CHttpFile::SendRequest
+12603 CHttpFile::SendRequestEx
+12604 CHttpFile::SendRequestEx
+12605 CAsyncSocket::SendTo
+12606 CAsyncSocket::SendToHelper
+12607 CSocket::SendToHelper
+12608 AFX_AUTOHIDE_DOCKSITE_SAVE_INFO::Serialize
+12609 CBasePane::Serialize
+12610 CBaseTabbedPane::Serialize
+12611 CByteArray::Serialize
+12612 CControlBarInfo::Serialize
+12613 CDocItem::Serialize
+12614 CDockablePane::Serialize
+12615 CDockingManager::Serialize
+12616 CDockState::Serialize
+12617 CDWordArray::Serialize
+12618 CEditView::Serialize
+12619 CMapStringToOb::Serialize
+12620 CMapStringToString::Serialize
+12621 CMapWordToOb::Serialize
+12622 CMDIClientAreaWnd::Serialize
+12623 CMDITabInfo::Serialize
+12624 CMFCBaseTabCtrl::Serialize
+12625 CMFCCmdUsageCount::Serialize
+12626 CMFCColorBar::Serialize
+12627 CMFCColorMenuButton::Serialize
+12628 CMFCDropDownToolbarButton::Serialize
+12629 CMFCTasksPane::Serialize
+12630 CMFCToolBar::Serialize
+12631 CMFCToolBarButton::Serialize
+12632 CMFCToolBarComboBoxButton::Serialize
+12633 CMFCToolBarDateTimeCtrl::Serialize
+12634 CMFCToolBarEditBoxButton::Serialize
+12635 CMFCToolBarFontComboBox::Serialize
+12636 CMFCToolBarMenuButton::Serialize
+12637 CMFCToolBarSpinEditBoxButton::Serialize
+12638 CMouseManager::Serialize
+12639 CMultiPaneFrameWnd::Serialize
+12640 CObArray::Serialize
+12641 CObList::Serialize
+12642 COleClientItem::Serialize
+12643 COleControl::Serialize
+12644 COleDocument::Serialize
+12645 COleServerDocEx::Serialize
+12646 CPaneContainer::Serialize
+12647 CPaneContainerManager::Serialize
+12648 CPaneDivider::Serialize
+12649 CPaneFrameWnd::Serialize
+12650 CRichEditDoc::Serialize
+12651 CRichEditView::Serialize
+12652 CStringArray::Serialize
+12653 CStringList::Serialize
+12654 CUserTool::Serialize
+12655 CWordArray::Serialize
+12656 ATL::CTime::Serialize64
+12657 ATL::CTime::Serialize64
+12658 CArchive::SerializeClass
+12659 COleControl::SerializeExtent
+12660 CMDIClientAreaWnd::SerializeOpenChildren
+12661 CEditView::SerializeRaw
+12662 COleControl::SerializeStockProps
+12663 CMDIClientAreaWnd::SerializeTabGroup
+12664 CBaseTabbedPane::SerializeTabWindow
+12665 COleControl::SerializeVersion
+12666 CProperty::Set
+12667 CProperty::Set
+12668 CProperty::Set
+12669 CPropertySection::Set
+12670 CPropertySection::Set
+12671 CPropertySet::Set
+12672 CPropertySet::Set
+12673 CMFCRibbonBaseElement::SetACCData
+12674 CMFCRibbonButton::SetACCData
+12675 CMFCRibbonColorButton::SetACCData
+12676 CMFCRibbonDefaultPanelButton::SetACCData
+12677 CMFCRibbonEdit::SetACCData
+12678 CMFCRibbonGalleryIcon::SetACCData
+12679 CMFCRibbonLabel::SetACCData
+12680 CMFCRibbonLaunchButton::SetACCData
+12681 CMFCRibbonTab::SetACCData
+12682 CMFCTasksPanePropertyPage::SetACCData
+12683 CMFCTasksPaneTask::SetACCData
+12684 CMFCTasksPaneTaskGroup::SetACCData
+12685 CMFCToolBarButton::SetACCData
+12686 CMFCToolBarComboBoxButton::SetACCData
+12687 CMFCToolBarEditBoxButton::SetACCData
+12688 CMFCToolBarMenuButton::SetACCData
+12689 CMFCToolBarSpinEditBoxButton::SetACCData
+12690 CMFCAcceleratorKeyAssignCtrl::SetAccelFlag
+12691 CKeyboardManager::SetAccelTable
+12692 CMFCRibbonCategory::SetActive
+12693 CMFCRibbonPanelMenuBar::SetActive
+12694 CMFCRibbonBar::SetActiveCategory
+12695 CMFCAutoHideBar::SetActiveInGroup
+12696 CPane::SetActiveInGroup
+12697 CMFCRibbonBar::SetActiveMDIChild
+12698 CDialogEx::SetActiveMenu
+12699 CDialogImpl::SetActiveMenu
+12700 CDialogEx::SetActiveMenu
+12701 COleFrameHook::XOleInPlaceFrame::SetActiveObject
+12702 COleControlContainer::XOleIPFrame::SetActiveObject
+12703 CMFCTasksPane::SetActivePage
+12704 CPropertySheet::SetActivePage
+12705 CPropertySheet::SetActivePage
+12706 CSplitterWnd::SetActivePane
+12707 CFrameWnd::SetActivePreviewView
+12708 CMDIClientAreaWnd::SetActiveTab
+12709 CMFCOutlookBarTabCtrl::SetActiveTab
+12710 CMFCPropertySheetTabCtrl::SetActiveTab
+12711 CMFCTabCtrl::SetActiveTab
+12712 CMFCTabCtrl::SetActiveTabBoldFont
+12713 CMFCBaseTabCtrl::SetActiveTabColor
+12714 CMFCBaseTabCtrl::SetActiveTabTextColor
+12715 CFrameWnd::SetActiveView
+12716 CTabView::SetActiveView
+12717 COleControl::XViewObject::SetAdvise
+12718 CMFCToolBarsCommandsPropertyPage::SetAllCategory
+12719 CMFCToolBarsKeyboardPropertyPage::SetAllCategory
+12720 CMFCPropertyGridCtrl::SetAlphabeticMode
+12721 CMFCRibbonStatusBarPane::SetAnimationList
+12722 CMFCRibbonStatusBarPane::SetAnimationList
+12723 CMFCDesktopAlertWnd::SetAnimationSpeed
+12724 CMFCPopupMenu::SetAnimationSpeed
+12725 CRenderTarget::SetAntialiasMode
+12726 COleControl::SetAppearance
+12727 CAppDestinations::SetAppID
+12728 CWinApp::SetAppID
+12729 CMFCRibbonBar::SetApplicationButton
+12730 CDC::SetArcDirection
+12733 CByteArray::SetAtGrow
+12734 CDWordArray::SetAtGrow
+12735 CObArray::SetAtGrow
+12736 CObArray::SetAtGrow
+12737 CStringArray::SetAtGrow
+12738 CStringArray::SetAtGrow
+12739 CDWordArray::SetAtGrow
+12740 CWordArray::SetAtGrow
+12741 CDC::SetAttribDC
+12742 CMetaFileDC::SetAttribDC
+12743 CPreviewDC::SetAttribDC
+12744 CMFCBaseTabCtrl::SetAutoColors
+12745 CAnimationGroup::SetAutodestroyTransitions
+12746 CBaseTabbedPane::SetAutoHideMode
+12747 CDockablePane::SetAutoHideMode
+12748 CDockablePane::SetAutoHideParents
+12749 CDockingManager::SetAutohideZOrder
+12750 CMFCButton::SetAutorepeatMode
+12751 CDataRecoveryHandler::SetAutosaveInterval
+12752 CMFCOutlookBarPane::SetBackColor
+12753 COleControl::SetBackColor
+12754 CDialogEx::SetBackgroundColor
+12755 CDocument::XPreviewHandlerVisuals::SetBackgroundColor
+12756 CDialogEx::SetBackgroundImage
+12757 CDialogEx::SetBackgroundImage
+12758 CMFCOutlookBarPane::SetBackImage
+12759 CControlBar::SetBarInfo
+12760 CDockBar::SetBarInfo
+12761 CControlBar::SetBarStyle
+12762 CMFCToolBar::SetBasicCommands
+12763 CD2DBitmapBrush::SetBitmap
+12764 CMFCCaptionBar::SetBitmap
+12765 CMFCCaptionBar::SetBitmap
+12766 CMFCImagePaintArea::SetBitmap
+12767 CToolBar::SetBitmap
+12768 CDC::SetBkColor
+12769 CPreviewDC::SetBkColor
+12770 CListCtrl::SetBkImage
+12771 CListCtrl::SetBkImage
+12772 CDC::SetBkMode
+12773 CRecordset::SetBookmark
+12774 CMFCPropertyGridCtrl::SetBoolLabels
+12775 CMFCFilterChunkValueImpl::SetBoolValue
+12776 CMFCFilterChunkValueImpl::SetBoolValue
+12777 CControlBar::SetBorders
+12778 CPane::SetBorders
+12779 CPane::SetBorders
+12780 CMFCOutlookBarTabCtrl::SetBorderSize
+12781 COleFrameHook::XOleInPlaceFrame::SetBorderSpace
+12782 CArchiveStream::Clone
+12783 COleControl::SetBorderStyle
+12784 CMFCEditBrowseCtrl::SetBrowseButtonImage
+12785 CMFCEditBrowseCtrl::SetBrowseButtonImage
+12786 CMFCEditBrowseCtrl::SetBrowseButtonImage
+12787 CTagManager::SetBuffer
+12788 CMFCCaptionBar::SetButton
+12789 CMFCToolBar::SetButtonInfo
+12790 CToolBar::SetButtonInfo
+12791 CMFCCaptionBar::SetButtonPressed
+12792 CMFCToolBar::SetButtons
+12793 CToolBar::SetButtons
+12794 CMFCOutlookBar::SetButtonsFont
+12795 CMFCPopupMenuBar::SetButtonStyle
+12796 CMFCToolBar::SetButtonStyle
+12797 CToolBar::SetButtonStyle
+12798 CMFCToolBar::SetButtonText
+12799 CToolBar::SetButtonText
+12800 CMFCCaptionBar::SetButtonToolTip
+12801 CMFCTasksPane::SetCaption
+12802 CDockablePane::SetCaptionButtons
+12803 CMFCTasksPane::SetCaptionButtons
+12804 CMFCTasksPaneFrameWnd::SetCaptionButtons
+12805 CPaneFrameWnd::SetCaptionButtons
+12806 CPaneFrameWnd::SetCaptionButtonsToolTips
+12807 COleControl::SetCapture
+12808 COleControlSite::XOleIPSite::SetCapture
+12809 CD2DRadialGradientBrush::SetCenter
+12810 CRichEditView::SetCharFormat
+12811 CCheckListBox::SetCheck
+12812 CCmdUI::SetCheck
+12813 CListCtrl::SetCheck
+12814 CMFCRibbonCmdUI::SetCheck
+12815 CMFCStatusBarCmdUI::SetCheck
+12816 CMFCToolBarCmdUI::SetCheck
+12817 COleCmdUI::SetCheck
+12818 CStatusCmdUI::SetCheck
+12819 delete
+12820 CToolCmdUI::SetCheck
+12821 CTreeCtrl::SetCheck
+12822 CFileDialog::SetCheckButtonState
+12823 CMFCButton::SetCheckedImage
+12824 CMFCButton::SetCheckedImage
+12825 CMFCButton::SetCheckedImage
+12826 CCheckListBox::SetCheckStyle
+12827 CMFCFilterChunkValueImpl::SetChunk
+12828 CDocument::SetChunkValue
+12829 CPropertySet::SetClassID
+12830 CDataBoundProperty::SetClientSite
+12831 CDocObjectServer::XOleObject::SetClientSite
+12832 COleControl::XOleObject::SetClientSite
+12833 COleServerDoc::XOleObject::SetClientSite
+12834 CArchiveStream::Clone
+12835 COleDataSource::SetClipboard
+12836 CMFCToolBarButton::SetClipboardFormatName
+12837 CCommandManager::SetCmdImage
+12838 CMFCRibbonCategory::SetCollapseOrder
+12840 CMenuImages::SetColor
+12841 CMFCColorBar::SetColor
+12842 CMFCColorButton::SetColor
+12843 CMFCColorMenuButton::SetColor
+12844 CMFCColorPickerCtrl::SetColor
+12845 CMFCImagePaintArea::SetColor
+12846 CMFCPropertyGridColorProperty::SetColor
+12847 CDC::SetColorAdjustment
+12848 CMFCRibbonColorButton::SetColorBoxSize
+12849 CMFCColorMenuButton::SetColorName
+12850 CReBarCtrl::SetColorScheme
+12851 CDocObjectServer::XOleObject::SetColorScheme
+12852 CArchiveStream::Clone
+12853 COleServerDoc::XOleObject::SetColorScheme
+12854 COleServerItem::XOleObject::SetColorScheme
+12855 CSplitterWnd::SetColumnInfo
+12856 CListCtrl::SetColumnOrderArray
+12857 CMFCPropertyGridColorProperty::SetColumnsNumber
+12858 CMFCKeyMapDialog::SetColumnsWidth
+12859 CUserTool::SetCommand
+12860 CMouseManager::SetCommandForDblClk
+12861 CMFCRibbonMiniToolBar::SetCommands
+12862 CMFCRibbonQuickAccessToolBar::SetCommands
+12863 CMFCRibbonQuickAccessToolBar::SetCommands
+12864 CMFCToolBar::SetCommandUsageOptions
+12865 CRecordset::SetConcurrencyAndCursorType
+12866 CDocTemplate::SetContainerInfo
+12867 COleControl::XQuickActivate::SetContentExtent
+12868 CMFCToolBarEditBoxButton::SetContents
+12869 CMFCToolBarEditBoxButton::SetContentsAll
+12870 CMFCToolBarFontComboBox::SetContext
+12871 CReflectorWnd::SetControl
+12872 CMFCControlContainer::SetControlData
+12873 CFileDialog::SetControlItemState
+12874 CFileDialog::SetControlItemText
+12875 CFileDialog::SetControlLabel
+12876 CDHtmlDialog::SetControlProperty
+12877 CDHtmlDialog::SetControlProperty
+12878 CDHtmlDialog::SetControlProperty
+12879 COleControl::SetControlSize
+12880 CFileDialog::SetControlState
+12881 COlePropertyPage::SetControlStatus
+12882 CFileDialog::SetControlText
+12883 CInternetSession::SetCookie
+12884 COleCurrency::SetCurrency
+12885 CColorDialog::SetCurrentColor
+12886 CMFCColorDialog::SetCurrentColor
+12887 CFtpConnection::SetCurrentDirectoryA
+12888 CWinApp::SetCurrentHandles
+12889 CPreviewView::SetCurrentPage
+12890 CMFCPropertyGridCtrl::SetCurrFont
+12891 CMFCDropDownListBox::SetCurSel
+12892 CMFCPropertyGridCtrl::SetCurSel
+12893 CMonthCalCtrl::SetCurSel
+12894 CMonthCalCtrl::SetCurSel
+12895 CRectTracker::SetCursor
+12896 CMFCPropertyGridCtrl::SetCustomColors
+12897 CMFCToolBar::SetCustomizeMode
+12898 COleControl::XDataObject::SetData
+12899 COleDataSource::XDataObject::SetData
+12900 COleServerDoc::XDataObject::SetData
+12901 COleServerItem::XDataObject::SetData
+12902 COleControl::XOleCache::SetData
+12903 CMonthCalCtrl::SetDayState
+12904 COccManager::SetDefaultButton
+12905 COleControlSite::SetDefaultButton
+12906 CRichEditCtrl::SetDefaultCharFormat
+12907 CRichEditCtrl::SetDefaultCharFormat
+12908 CMFCDropDownToolbarButton::SetDefaultCommand
+12909 CMFCVisualManager::SetDefaultManager
+12910 CMFCMenuBar::SetDefaultMenuResId
+12911 CDockablePane::SetDefaultPaneDivider
+12912 CPaneContainerManager::SetDefaultPaneDividerForPanes
+12913 CMFCOutlookBarPane::SetDefaultState
+12914 CMultiDocTemplate::SetDefaultTitle
+12915 CSingleDocTemplate::SetDefaultTitle
+12916 CAnimationColor::SetDefaultValue
+12917 CAnimationPoint::SetDefaultValue
+12918 CAnimationRect::SetDefaultValue
+12919 CAnimationPoint::SetDefaultValue
+12920 CAnimationVariable::SetDefaultValue
+12921 CMFCVisualManagerOffice2003::SetDefaultWinXPColors
+12922 CFileDialog::SetDefExt
+12923 CMFCRibbonBaseElement::SetDescription
+12924 CMFCRibbonButton::SetDescription
+12925 CMFCToolTipCtrl::SetDescription
+12926 CMFCPropertyGridCtrl::SetDescriptionRows
+12927 COlePropertyPage::SetDialogResource
+12928 CRecordset::SetDirtyFieldStatus
+12929 COleControlSite::SetDlgCtrlID
+12930 CWnd::SetDlgCtrlID
+12931 COleControlContainer::SetDlgItemInt
+12932 CWnd::SetDlgItemInt
+12933 COleControlContainer::SetDlgItemTextA
+12934 CWnd::SetDlgItemTextA
+12935 CDockingManager::SetDockingMode
+12936 CPaneFrameWnd::SetDockingTimer
+12937 CDockingManager::SetDockState
+12938 CFrameImpl::SetDockState
+12939 CFrameWnd::SetDockState
+12940 CMultiPaneFrameWnd::SetDockState
+12941 CPane::SetDockState
+12942 CPaneFrameWnd::SetDockState
+12943 CDocObjectServer::SetDocSite
+12944 CMFCColorBar::SetDocumentColors
+12945 CMFCColorButton::SetDocumentColors
+12946 CMFCRibbonColorButton::SetDocumentColors
+12947 CRenderTarget::SetDpi
+12948 CPane::SetDragMode
+12949 COleClientItem::SetDrawAspect
+12950 CRichEditCntrItem::SetDrawAspect
+12951 CMFCTabCtrl::SetDrawFrame
+12952 CMFCBaseTabCtrl::SetDrawNoPrefix
+12953 CMFCRibbonComboBox::SetDropDownHeight
+12954 CMFCToolBarComboBoxButton::SetDropDownHeight
+12955 CMFCRibbonBaseElement::SetDroppedDown
+12956 CDataBoundProperty::SetDSCSite
+12957 CMFCFilterChunkValueImpl::SetDwordValue
+12958 CFileDialog::SetEditBoxText
+12959 CMFCRibbonEdit::SetEditText
+12960 CDHtmlDialog::SetElementHtml
+12961 CDHtmlDialog::SetElementHtml
+12962 CMFCRibbonBar::SetElementKeys
+12963 CMFCRibbonPanel::SetElementMenu
+12964 CMFCRibbonPanel::SetElementMenu
+12965 CDHtmlDialog::SetElementProperty
+12966 CMFCRibbonPanel::SetElementRTC
+12967 CMFCRibbonPanel::SetElementRTCByID
+12968 CDHtmlDialog::SetElementText
+12969 CDHtmlDialog::SetElementText
+12970 COleControl::SetEnabled
+12971 CD2DLinearGradientBrush::SetEndPoint
+12972 CMFCRibbonInfo::XInfoError::SetError
+12973 CD2DBitmapBrush::SetExtendModeX
+12974 CD2DBitmapBrush::SetExtendModeY
+12975 COleClientItem::SetExtent
+12976 COleControlSite::SetExtent
+12977 CDocObjectServer::XOleObject::SetExtent
+12978 COleControl::XOleObject::SetExtent
+12979 COleServerDoc::XOleObject::SetExtent
+12980 COleServerItem::XOleObject::SetExtent
+12981 CDHtmlDialog::SetExternalDispatch
+12982 CMFCButton::SetFaceColor
+12983 CRecordset::SetFieldDirty
+12984 CRecordset::SetFieldNull
+12985 CRecordset::SetFieldStatus
+12986 CMFCFilterChunkValueImpl::SetFileTimeValue
+12987 CD2DGeometrySink::SetFillMode
+12988 CMonthCalCtrl::SetFirstDayOfWeek
+12989 CMFCPropertyGridProperty::SetFlags
+12990 CMFCShellTreeCtrl::SetFlags
+12991 COleControl::SetFocus
+12992 COleControlSite::SetFocus
+12993 COleControlSite::SetFocus
+12994 CWnd::SetFocus
+12995 COleControlSite::XOleIPSite::SetFocus
+12996 CDocument::XPreviewHandler::SetFocus
+12997 CMFCRibbonPanel::SetFocused
+12998 CDHtmlDialog::SetFocusToElement
+12999 CDialogTemplate::SetFont
+13000 CFontHolder::SetFont
+13001 CMFCRibbonFontComboBox::SetFont
+13002 CMFCTasksPane::SetFont
+13003 CMFCToolBarFontComboBox::SetFont
+13004 COleControl::SetFont
+13005 CDocument::XPreviewHandlerVisuals::SetFont
+13006 CD2DTextLayout::SetFontFamilyName
+13007 CDC::SetAttribDC
+13008 COleControl::SetForeColor
+13009 CPropertySection::SetFormatID
+13010 CPropertySet::SetFormatVersion
+13011 CMFCToolBarsCustomizeDialog::SetFrameCustMode
+13012 CWnd::SetGestureConfig
+13013 CD2DRadialGradientBrush::SetGradientOriginOffset
+13014 CDC::SetGraphicsMode
+13015 CVSListBoxBase::SetGrayDisabledButtons
+13016 CMFCRibbonGallery::SetGroupName
+13017 CMFCTasksPane::SetGroupName
+13018 CMFCPropertyGridCtrl::SetGroupNameFullWidth
+13019 CMFCTasksPane::SetGroupTextColor
+13020 CSharedFile::SetHandle
+13021 CMDIChildWnd::SetHandles
+13022 CMFCToolBar::SetHeight
+13023 CToolBar::SetHeight
+13024 CFrameWnd::SetHelpCapture
+13025 COlePropertyPage::SetHelpInfo
+13026 CMFCToolBar::SetHelpMode
+13027 CFrameImpl::SetHighlightedSysButton
+13028 CMFCColorPickerCtrl::SetHLS
+13029 CMFCColorBar::SetHorzMargin
+13030 CMFCPreviewCtrlImpl::SetHost
+13031 CDHtmlDialog::SetHostFlags
+13032 COleClientItem::SetHostNames
+13033 CDocObjectServer::XOleObject::SetHostNames
+13034 COleUILinkInfo::AddRef
+13035 COleServerDoc::XOleObject::SetHostNames
+13036 CArchiveStream::Clone
+13037 CMFCToolBar::SetHot
+13038 CMFCToolBarComboBoxButton::SetHotEdit
+13039 CMFCToolBarEditBoxButton::SetHotEdit
+13040 CMFCToolTipCtrl::SetHotRibbonButton
+13041 CMFCToolBar::SetHotTextColor
+13042 CMFCCaptionBar::SetIcon
+13043 CMFCRibbonConstructor::SetIcon
+13044 COleClientItem::SetIconicMetafile
+13045 CMFCPropertySheet::SetIconsList
+13046 CMFCPropertySheet::SetIconsList
+13047 CMFCTasksPane::SetIconsList
+13048 CMFCTasksPane::SetIconsList
+13049 CListCtrl::SetIconSpacing
+13050 CListCtrl::SetIconSpacing
+13051 CAnimationBaseObject::SetID
+13052 CMFCRibbonBaseElement::SetID
+13053 CMFCRibbonConstructor::SetID
+13054 CProperty::SetID
+13055 CMFCButton::SetImage
+13056 CMFCButton::SetImage
+13057 CMFCButton::SetImage
+13058 CMFCOutlookBarPaneButton::SetImage
+13059 CMFCRibbonApplicationButton::SetImage
+13060 CMFCRibbonApplicationButton::SetImage
+13061 CMFCToolBarButton::SetImage
+13062 CMFCButton::SetImageInternal
+13063 CMFCButton::SetImageInternal
+13064 CMFCButton::SetImageInternal
+13065 CMFCBaseTabCtrl::SetImageList
+13066 CMFCBaseTabCtrl::SetImageList
+13067 CMFCTabCtrl::SetImageList
+13068 CMFCTabCtrl::SetImageList
+13069 CReBarCtrl::SetImageList
+13070 CMFCRibbonButtonsGroup::SetImages
+13071 CMFCToolBarButtonsListButton::SetImages
+13072 CMFCCaptionBar::SetImageToolTip
+13073 CMFCPopupMenuBar::SetInCommand
+13074 CMFCStatusBar::SetIndicators
+13075 CStatusBar::SetIndicators
+13076 CMFCRibbonProgressBar::SetInfiniteMode
+13077 CRecentDockSiteInfo::SetInfo
+13078 CRecentPaneContainerInfo::SetInfo
+13079 CMFCRibbonStatusBar::SetInformation
+13080 COleControl::SetInitialDataFormats
+13081 CDocObjectServer::XPrint::SetInitialPageNum
+13082 COleControl::SetInitialSize
+13083 CReflectorWnd::SetControl
+13084 CDocObjectServer::XOleDocumentView::SetInPlaceSite
+13085 CMFCFilterChunkValueImpl::SetInt64Value
+13086 CMFCEditBrowseCtrl::SetInternalImage
+13087 CD2DBitmapBrush::SetInterpolationMode
+13088 CMFCFilterChunkValueImpl::SetIntValue
+13089 CMenuTearOffManager::SetInUse
+13090 CComboBoxEx::SetItem
+13091 CListCtrl::SetItem
+13092 CListCtrl::SetItem
+13093 CTreeCtrl::SetItem
+13094 CListCtrl::SetItemCountEx
+13095 CVSListBox::SetItemData
+13096 CTreeCtrl::SetItemEx
+13097 CMFCCustomizeMenuButton::SetItemIndex
+13098 COleClientItem::SetItemRects
+13099 CListCtrl::SetItemState
+13100 CTabCtrl::SetItemState
+13101 CListCtrl::SetItemText
+13102 CVSListBox::SetItemText
+13103 CMFCRibbonGallery::SetItemToolTip
+13104 CMFCShellListCtrl::SetItemTypes
+13105 CMFCRibbonBar::SetKeyboardNavigationLevel
+13106 CMFCRibbonBaseElement::SetKeys
+13107 CMFCRibbonCategory::SetKeys
+13108 CMFCRibbonPanel::SetKeys
+13109 CMFCToolBar::SetLargeIcons
+13110 AFX_GLOBAL_DATA::SetLayeredAttrib
+13111 CDC::SetLayout
+13114 CFile::SetLength
+13115 CSocketFile::Abort
+13116 CMemFile::SetLength
+13117 COleStreamFile::SetLength
+13118 CSocketFile::Abort
+13119 CMFCRibbonLinkCtrl::SetLink
+13120 COleUILinkInfo::SetLinkSource
+13121 COleClientItem::SetLinkUpdateOptions
+13122 COleUILinkInfo::SetLinkUpdateOptions
+13123 CMFCPropertyGridCtrl::SetListDelimiter
+13124 CD2DTextLayout::SetLocaleName
+13125 CMFCBaseTabCtrl::SetLocation
+13126 CMFCToolTipCtrl::SetLocation
+13127 CMFCToolBar::SetLockedSizes
+13128 CRecordset::SetLockingMode
+13129 CMFCFilterChunkValueImpl::SetIntValue
+13130 CMFCPropertySheet::SetLook
+13131 CMFCColorPickerCtrl::SetLuminanceBarWidth
+13134 CDC::SetMapMode
+13135 CPreviewDC::SetMapMode
+13136 CDC::SetMapperFlags
+13137 CMFCMenuBar::SetMaximizeMode
+13138 CMFCRibbonBar::SetMaximizeMode
+13139 CMFCPopupMenu::SetMaxWidth
+13140 CFrameWnd::SetMenu
+13141 CMFCRibbonButton::SetMenu
+13142 CMFCRibbonButton::SetMenu
+13143 CWnd::SetMenu
+13144 COleFrameHook::XOleInPlaceFrame::SetMenu
+13145 CArchiveStream::Clone
+13146 CFrameImpl::SetMenuBar
+13147 CFrameWnd::SetMenuBarState
+13148 CMDIFrameWnd::SetMenuBarState
+13149 CFrameWnd::SetMenuBarVisibility
+13150 CMDIFrameWnd::SetMenuBarVisibility
+13151 CMFCMenuBar::SetMenuButtonRTC
+13152 AFX_GLOBAL_DATA::SetMenuFont
+13153 CMFCMenuBar::SetMenuFont
+13154 CMFCToolBarMenuButton::SetMenuPaletteMode
+13155 CMFCToolBar::SetMenuSizes
+13156 CFrameWnd::SetMessageText
+13157 CFrameWnd::SetMessageText
+13158 CMFCOutlookBar::SetMode2003
+13159 CPropertyPage::SetModified
+13160 CMFCPropertyGridProperty::SetModifiedFlag
+13161 COleControl::SetModifiedFlag
+13162 COlePropertyPage::SetModifiedFlag
+13163 CRichEditDoc::SetModifiedFlag
+13164 CDocObjectServer::XOleObject::SetMoniker
+13165 CArchiveStream::Clone
+13166 COleServerDoc::XOleObject::SetMoniker
+13167 CArchiveStream::Clone
+13168 CMFCButton::SetMouseCursor
+13169 CMFCButton::SetMouseCursorHand
+13170 CMFCPropertyGridProperty::SetName
+13171 CMFCRibbonCategory::SetName
+13172 CPropertySection::SetName
+13173 CMFCColorDialog::SetNewColor
+13174 CGlobalUtils::SetNewParent
+13175 CFrameImpl::SetNewUserToolBarRTC
+13176 CMFCToolBar::SetNonPermittedCommands
+13177 CMFCRibbonGallery::SetNotifyParentID
+13178 COleControl::SetNotPermitted
+13179 CCmdTarget::SetNotSupported
+13180 COleControl::SetNotSupported
+13181 CRecordset::SetNullFieldStatus
+13182 CRecordset::SetNullParamStatus
+13183 COleControl::XOleInPlaceObject::SetObjectRects
+13184 COleServerDoc::XOleInPlaceObject::SetObjectRects
+13185 COlePropertyPage::XPropertyPage::SetObjects
+13186 CDialog::SetOccDialogInfo
+13187 CDialogBar::SetOccDialogInfo
+13188 CFormView::SetOccDialogInfo
+13189 CPaneDialog::SetOccDialogInfo
+13190 COleUILinkInfo::AddRef
+13191 CMFCVisualManagerWindows::SetOfficeStyleMenus
+13192 CMFCToolBar::SetOneRowWithSibling
+13193 CD2DBrush::SetOpacity
+13194 CInternetConnection::SetOption
+13195 CInternetFile::SetOption
+13196 CInternetSession::SetOption
+13197 CMFCToolBar::SetCommandUsageOptions
+13198 CHeaderCtrl::SetOrderArray
+13199 CMFCToolBar::SetOrigButtons
+13200 CMFCRibbonBaseElement::SetOriginal
+13201 CMFCRibbonButton::SetOriginal
+13202 CMFCRibbonButtonsGroup::SetOriginal
+13203 CMFCColorPickerCtrl::SetOriginalColor
+13204 CMFCPropertyGridProperty::SetOriginalValue
+13205 CPropertySet::SetOSVersion
+13206 CSmartDockingManager::SetOuterRect
+13207 CDC::SetOutputDC
+13208 delete
+13209 CPreviewDC::SetOutputDC
+13210 CToolBar::SetOwner
+13211 CMFCPropertyGridProperty::SetOwnerList
+13212 CMFCOutlookBarTabCtrl::SetPageButtonTextAlign
+13213 CMFCTasksPane::SetPageCaption
+13214 COlePropertyPage::SetPageName
+13215 CMFCColorDialog::SetPageOne
+13216 COlePropertyPage::XPropertyPage::SetPageSite
+13217 CMFCColorDialog::SetPageTwo
+13218 CMFCColorButton::SetPalette
+13219 CMFCColorPickerCtrl::SetPalette
+13220 CMFCRibbonColorButton::SetPalette
+13221 CMFCRibbonGallery::SetPalette
+13222 CMFCRibbonGallery::SetPalette
+13223 CPaneContainer::SetPane
+13224 CMFCReBar::SetPaneAlignment
+13225 CMFCStatusBar::SetPaneAnimation
+13226 CMFCStatusBar::SetPaneBackgroundColor
+13227 CPaneContainer::SetPaneContainer
+13228 CPaneContainer::SetPaneContainerManager
+13229 CMFCStatusBar::SetPaneIcon
+13230 CMFCStatusBar::SetPaneIcon
+13231 CMFCStatusBar::SetPaneInfo
+13232 CStatusBar::SetPaneInfo
+13233 CMFCRibbonCategory::SetPanelsLayout
+13234 CMFCStatusBar::SetPaneProgress
+13235 CMFCStatusBar::SetPaneStyle
+13236 CStatusBar::SetPaneStyle
+13237 CMFCStatusBar::SetPaneText
+13238 CStatusBar::SetPaneText
+13239 CMFCStatusBar::SetPaneTextColor
+13240 CMFCStatusBar::SetPaneWidth
+13241 CRichEditCtrl::SetParaFormat
+13242 CRichEditCtrl::SetParaFormat
+13243 CRichEditView::SetParaFormat
+13244 CRecordset::SetParamNull
+13245 CMFCToolTipCtrl::SetParams
+13246 CAnimationBaseObject::SetParentAnimationObjects
+13247 CMFCRibbonBaseElement::SetParentCategory
+13248 CMFCRibbonButton::SetParentCategory
+13249 CMFCRibbonButtonsGroup::SetParentCategory
+13250 CMFCRibbonGallery::SetParentCategory
+13251 CMFCRibbonBaseElement::SetParentMenu
+13252 CMFCRibbonButtonsGroup::SetParentMenu
+13253 CMFCRibbonButton::SetParentRibbonBar
+13254 CMFCRibbonButtonsGroup::SetParentRibbonBar
+13255 CMFCPopupMenu::SetParentRibbonElement
+13256 CDocument::SetPathName
+13257 COleDocument::SetPathName
+13258 CRichEditDoc::SetPathName
+13259 CPictureHolder::SetPictureDispatch
+13260 CDrawingManager::SetPixel
+13261 CDC::SetPolyFillMode
+13262 CMFCRibbonProgressBar::SetPos
+13263 CMFCRibbonSlider::SetPos
+13264 CMultiPaneFrameWnd::SetPreDockState
+13265 CPaneFrameWnd::SetPreDockState
+13266 CMFCRibbonPanelMenuBar::SetPreferedSize
+13267 CDocTemplate::SetPreviewInfo
+13268 CMFCPreviewCtrlImpl::SetPreviewVisuals
+13269 COleClientItem::SetPrintDevice
+13270 COleClientItem::SetPrintDevice
+13271 CEditView::SetPrinterFont
+13272 CDockingManager::SetPrintPreviewMode
+13273 CMFCRibbonBar::SetPrintPreviewMode
+13274 CPreviewView::SetPrintView
+13275 CFrameWnd::SetProgressBarPosition
+13276 CFrameWnd::SetProgressBarRange
+13277 CFrameWnd::SetProgressBarState
+13278 COlePropertyPage::SetPropCheck
+13279 CFileDialog::SetProperties
+13280 COleControlSite::SetProperty
+13281 COleDispatchDriver::SetProperty
+13282 CWnd::SetProperty
+13283 COleControlSite::SetPropertyV
+13284 COlePropertyPage::SetPropIndex
+13285 COlePropertyPage::SetPropRadio
+13286 COleControl::SetPropsetData
+13287 COlePropertyPage::SetPropText
+13288 COlePropertyPage::SetPropText
+13289 COlePropertyPage::SetPropText
+13290 COlePropertyPage::SetPropText
+13291 COlePropertyPage::SetPropText
+13292 COlePropertyPage::SetPropText
+13293 COlePropertyPage::SetPropText
+13294 COlePropertyPage::SetPropText
+13295 COlePropertyPage::SetPropText
+13296 CMFCToolBarButton::SetProtectedCommands
+13297 CWnd::SetProxy
+13298 CWnd::XAccessibleServer::SetProxy
+13299 CMFCRibbonBar::SetQuickAccessCommands
+13300 CMFCRibbonBar::SetQuickAccessDefaultState
+13301 CMFCRibbonBar::SetQuickAccessToolbarOnTop
+13302 CMFCPopupMenu::SetQuickMode
+13303 CCmdUI::SetRadio
+13304 CMFCRibbonCmdUI::SetRadio
+13305 CMFCToolBarCmdUI::SetRadio
+13306 CMFCToolBarMenuButton::SetRadio
+13307 delete
+13308 CD2DRadialGradientBrush::SetRadiusX
+13309 CD2DRadialGradientBrush::SetRadiusY
+13310 CDateTimeCtrl::SetRange
+13311 CDateTimeCtrl::SetRange
+13312 CMFCRibbonProgressBar::SetRange
+13313 CMFCRibbonProgressBar::SetRange
+13314 CMFCToolBarSpinEditBoxButton::SetRange
+13315 CMonthCalCtrl::SetRange
+13316 CMonthCalCtrl::SetRange
+13317 CMonthCalCtrl::SetRange
+13318 CSliderCtrl::SetRange
+13319 CInternetFile::SetReadBufferSize
+13320 CMFCMenuBar::SetRecentlyUsedMenus
+13321 CMFCPreviewCtrlImpl::SetRect
+13322 CDocObjectServer::XOleDocumentView::SetRect
+13323 CDocument::XPreviewHandler::SetRect
+13324 CDocObjectServer::XOleDocumentView::Clone
+13325 COleControl::SetRectInContainer
+13326 CWinAppEx::SetRegistryBase
+13327 CWinApp::SetRegistryKey
+13328 CWinApp::SetRegistryKey
+13329 CMFCShellTreeCtrl::SetRelatedList
+13330 CReflectorWnd::SetControl
+13331 CDockablePane::SetResizeMode
+13332 CMFCTabCtrl::SetResizeMode
+13333 CPaneContainerManager::SetResizeMode
+13334 CMFCVisualManagerOffice2007::SetResourceHandle
+13335 CMFCVisualManagerWindows7::SetResourceHandle
+13336 CMFCControlRendererInfo::SetResourceID
+13337 CPaneFrameWnd::SetRollUpTimer
+13338 CDC::SetROP2
+13339 CMFCToolBar::SetRoundedRgn
+13340 CSplitterWnd::SetRowInfo
+13341 CRecordset::SetRowsetCurrencyStatus
+13342 CRecordset::SetRowsetCursorPosition
+13343 CRecordset::SetRowsetSize
+13344 CSettingsStoreSP::SetRuntimeClass
+13345 CPreviewView::SetScaledSize
+13346 CPreviewDC::SetScaleRatio
+13347 CScrollView::SetScaleToFitSize
+13348 CDockState::SetScreenSize
+13349 CMFCPopupMenu::SetScrollBar
+13350 CMFCTabCtrl::SetScrollButtons
+13351 CWnd::SetScrollInfo
+13352 CWnd::SetScrollPos
+13353 CWnd::SetScrollRange
+13354 CMFCPropertyGridCtrl::SetScrollSizes
+13355 CMFCTasksPane::SetScrollSizes
+13356 CScrollView::SetScrollSizes
+13357 CSplitterWnd::SetScrollStyle
+13358 CPropertySection::SetSectionName
+13359 CD2DGeometrySink::SetSegmentFlags
+13360 CRichEditCtrl::SetSel
+13361 CFileDialog::SetSelectedControlItem
+13362 CSliderCtrl::SetSelection
+13363 CRichEditCtrl::SetSelectionCharFormat
+13364 CRichEditCtrl::SetSelectionCharFormat
+13365 CCheckListBox::SetSelectionCheck
+13366 CMonthCalCtrl::SetSelRange
+13367 CMonthCalCtrl::SetSelRange
+13368 CMonthCalCtrl::SetSelRange
+13369 CDocTemplate::SetServerInfo
+13370 CMFCMenuBar::SetShowAllCommands
+13371 CMFCToolBar::SetSiblingToolBar
+13372 CMFCToolBarImages::SetSingleImage
+13373 CPrintDialogEx::SetSite
+13374 CDocument::XObjectWithSite::SetSite
+13375 CArchiveStream::Clone
+13376 CByteArray::SetSize
+13377 CDWordArray::SetSize
+13378 CObArray::SetSize
+13379 CObArray::SetSize
+13380 CStringArray::SetSize
+13381 CDWordArray::SetSize
+13382 CWordArray::SetSize
+13383 CMFCToolBar::SetSizes
+13384 CToolBar::SetSizes
+13385 CDockingManager::SetSmartDockingParams
+13386 CMFCHeaderCtrl::SetSortColumn
+13387 CMFCListCtrl::SetSortColumn
+13388 CSplitterWnd::SetSplitCursor
+13389 CVSListBoxBase::SetStandardButtons
+13390 CCmdTarget::SetStandardProp
+13391 CD2DLinearGradientBrush::SetStartPoint
+13392 CRecordset::SetState
+13393 CFile::SetStatus
+13394 CMFCVisualManagerOffice2003::SetStatusBarOfficeXPLook
+13395 CControlBar::SetStatusText
+13396 COleUILinkInfo::AddRef
+13397 COleFrameHook::XOleInPlaceFrame::SetStatusText
+13398 CArchiveStream::Clone
+13399 CMFCButton::SetStdImage
+13400 CDC::SetStretchBltMode
+13405 COleVariant::SetString
+13406 CMFCToolBarComboBoxButton::SetStyle
+13407 CMFCToolBarDateTimeCtrl::SetStyle
+13408 CMFCToolBarEditBoxButton::SetStyle
+13409 CMFCVisualManagerOffice2007::SetStyle
+13410 CMFCVisualManagerWindows7::SetStyle
+13413 CDialogTemplate::SetSystemFont
+13414 CMFCFilterChunkValueImpl::SetSystemTimeValue
+13415 CTabbedPane::SetTabAutoColors
+13416 CMFCBaseTabCtrl::SetTabBkColor
+13417 CMFCBaseTabCtrl::SetTabBorderSize
+13418 CMFCBaseTabCtrl::SetTabHicon
+13419 CMFCBaseTabCtrl::SetTabIcon
+13420 CMFCBaseTabCtrl::SetTabIconOnly
+13421 CMFCBaseTabCtrl::SetTabLabel
+13422 CMFCTabCtrl::SetTabMaxWidth
+13423 CMFCBaseTabCtrl::SetTabsHeight
+13424 CMFCTabCtrl::SetTabsHeight
+13425 CMFCBaseTabCtrl::SetTabsOrder
+13426 CEditView::SetTabStops
+13427 CMFCBaseTabCtrl::SetTabTextColor
+13428 CRenderTarget::SetTags
+13429 CFrameWnd::SetTaskbarOverlayIcon
+13430 CFrameWnd::SetTaskbarOverlayIcon
+13431 CMDIChildWndEx::SetTaskbarTabActive
+13432 CMDIChildWndEx::SetTaskbarTabOrder
+13433 CMDIClientAreaWnd::SetTaskbarTabOrder
+13434 CMDIChildWndEx::SetTaskbarTabProperties
+13435 CMDIChildWndEx::SetTaskbarTabText
+13436 CMDIChildWndEx::SetTaskbarThumbnailClipRect
+13437 CMFCTasksPane::SetTaskName
+13438 CMFCTasksPaneFrameWnd::SetTaskPaneCaptionButtons
+13439 CMFCTasksPane::SetTaskTextColor
+13440 CMFCToolBarMenuButton::SetTearOff
+13441 CDialogTemplate::SetTemplate
+13442 CFileDialog::SetTemplate
+13443 CCmdUI::SetText
+13444 CMFCCaptionBar::SetText
+13445 CMFCRibbonBaseElement::SetText
+13446 CMFCRibbonButton::SetText
+13447 CMFCRibbonCmdUI::SetText
+13448 CMFCStatusBarCmdUI::SetText
+13449 CMFCTasksPaneToolBarCmdUI::SetText
+13450 CMFCToolBarCmdUI::SetText
+13451 CMFCToolBarComboBoxButton::SetText
+13452 COleCmdUI::SetText
+13453 COleControl::SetText
+13454 CStatusCmdUI::SetText
+13455 delete
+13456 delete
+13457 CDC::SetTextAlign
+13458 CMFCRibbonEdit::SetTextAlign
+13459 CMFCRibbonBaseElement::SetTextAlwaysOnRight
+13460 CRenderTarget::SetTextAntialiasMode
+13461 CDC::SetTextCharacterExtra
+13462 CDC::SetTextColor
+13463 CMFCOutlookBarPane::SetTextColor
+13464 CPreviewDC::SetTextColor
+13465 CDocument::XPreviewHandlerVisuals::SetTextColor
+13466 CDC::SetTextJustification
+13467 CRenderTarget::SetTextRenderingParams
+13468 CMFCFilterChunkValueImpl::SetTextValue
+13469 CMFCRibbonSlider::SetThumbRect
+13470 CDateTimeCtrl::SetTime
+13471 CDateTimeCtrl::SetTime
+13472 CDateTimeCtrl::SetTime
+13473 CMFCToolBarDateTimeCtrl::SetTime
+13474 CMFCToolBarDateTimeCtrl::SetTime
+13475 CMFCToolBarDateTimeCtrl::SetTime
+13476 CMFCToolBarDateTimeCtrl::SetTimeAll
+13477 CMFCToolBarDateTimeCtrl::SetTimeAll
+13478 CMFCToolBarDateTimeCtrl::SetTimeAll
+13479 CMFCStatusBar::SetTipText
+13480 CDocument::SetTitle
+13481 CPropertySheet::SetTitle
+13482 CRichEditDoc::SetTitle
+13483 CMonthCalCtrl::SetToday
+13484 CMonthCalCtrl::SetToday
+13485 CMFCToolBar::SetToolBarBtnText
+13486 CMFCOutlookBarTabCtrl::SetToolbarImageList
+13487 CPreviewViewEx::SetToolbarSize
+13488 CUserTool::SetToolIcon
+13489 CToolTipCtrl::SetToolRect
+13490 CMFCButton::SetTooltip
+13491 CMFCRibbonBar::SetTooltipFixedWidth
+13492 CTooltipManager::SetTooltipParams
+13493 CMFCRibbonBaseElement::SetToolTipText
+13494 CTooltipManager::SetTooltipText
+13495 CPreviewDC::SetTopLeftOffset
+13496 CD2DBrush::SetTransform
+13497 CRenderTarget::SetTransform
+13498 CRenderTarget::SetTransform
+13499 CMFCOutlookBarPane::SetTransparentColor
+13500 CMFCToolBarFontSizeComboBox::SetTwipSize
+13501 CMFCToolBar::SetTwoRowsWithSibling
+13502 CMFCShellTreeCtrl::EnableShellContextMenu
+13503 CPropertySet::SetOSVersion
+13504 CMFCCustomColorsPropertyPage::Setup
+13505 CMFCFontComboBox::Setup
+13506 CPaneContainer::SetUpByID
+13507 CRecordset::SetUpdateMethod
+13508 CMFCToolBarsCustomizeDialog::SetupFromMenus
+13509 CMenuTearOffManager::SetupTearOffMenus
+13510 CFrameImpl::SetupToolbarMenu
+13511 CMFCLinkCtrl::SetURL
+13512 CMFCLinkCtrl::SetURLPrefix
+13513 CMFCVisualManagerOffice2003::SetUseGlobalTheme
+13514 CMFCToolBarsCommandsPropertyPage::SetUserCategory
+13515 CMFCToolBarsCustomizeDialog::SetUserCategory
+13516 CMFCToolBar::SetUserImages
+13517 CMFCMaskedEdit::SetValidChars
+13518 CMFCMaskedEdit::SetValue
+13519 CMFCPropertyGridProperty::SetValue
+13520 CThreadSlotData::SetValue
+13521 CMFCColorBar::SetVertMargin
+13522 COlePropertiesDialog::XOleUIObjInfo::SetViewInfo
+13523 CDC::SetViewportExt
+13524 CMetaFileDC::SetViewportExt
+13525 CPreviewDC::SetViewportExt
+13526 CDC::SetViewportOrg
+13527 CMetaFileDC::SetViewportOrg
+13528 CPreviewDC::SetViewportOrg
+13529 CPane::SetVirtualRect
+13530 CSmartDockingGroupGuide::SetVisible
+13531 CMFCPropertyGridCtrl::SetVSDotNetLook
+13532 CMFCRibbonEdit::SetWidth
+13533 CDocument::XPreviewHandler::SetWindow
+13534 CDC::SetWindowExt
+13535 CPreviewDC::SetWindowExt
+13536 CMFCTasksPane::SetWindowHeight
+13537 CMFCTasksPane::SetWindowHeight
+13538 CDC::SetWindowOrg
+13539 CWnd::SetWindowPlacement
+13540 CBasePane::SetWindowPos
+13541 COleControlSite::SetWindowPos
+13542 CWnd::SetWindowPos
+13543 CMFCRibbonApplicationButton::SetWindows7Image
+13544 CMFCRibbonApplicationButton::SetWindows7Image
+13545 CMFCRibbonBar::SetWindows7Look
+13546 CMFCMaskedEdit::SetWindowTextA
+13547 COleControlSite::SetWindowTextA
+13548 CWnd::SetWindowTextA
+13549 CRichEditCtrl::SetWordCharFormat
+13550 CRichEditCtrl::SetWordCharFormat
+13551 CDC::SetWorldTransform
+13552 CDockablePaneAdapter::SetWrappedWnd
+13553 CInternetFile::SetWriteBufferSize
+13554 CMFCRibbonSlider::SetZoomButtons
+13555 CVSListBoxBase::EnableBrowseButton
+13556 CPreviewView::SetZoomState
+13557 AFX_GLOBAL_DATA::ShellCreateItemFromParsingName
+13558 CDockingPanesRow::ShiftPanes
+13559 CDockingPanesRow::ShiftPanesRect
+13560 CMFCPropertyGridProperty::Show
+13561 CMFCRibbonKeyTip::Show
+13562 CMFCRibbonMiniToolBar::Show
+13563 delete
+13564 CSmartDockingGroupGuidesManager::Show
+13565 CSmartDockingManager::Show
+13566 CSmartDockingStandaloneGuide::Show
+13567 CDocObjectServer::XOleDocumentView::Show
+13568 COlePropertyPage::XPropertyPage::Show
+13569 CDockBar::ShowAll
+13570 CKeyboardManager::ShowAllAccelerators
+13571 CMFCPopupMenu::ShowAllCommands
+13572 CWinApp::ShowAppMessageBox
+13573 CSmartDockingHighlighterWnd::ShowAt
+13574 CMFCAutoHideButton::ShowAttachedWindow
+13575 CMFCAutoHideBar::ShowAutoHideWindow
+13576 CMFCAutoHideButton::ShowButton
+13577 CPaneFrameWnd::ShowButton
+13578 CMFCRibbonBar::ShowCategory
+13579 CSmartDockingManager::ShowCentralGroup
+13580 CMFCColorBar::ShowCommandMessageString
+13581 CMFCPopupMenuBar::ShowCommandMessageString
+13582 CMFCTasksPane::ShowCommandMessageString
+13583 CMFCToolBar::ShowCommandMessageString
+13584 CRichEditCntrItem::ShowContainerUI
+13585 CRichEditView::ShowContainerUI
+13586 CRichEditView::XRichEditOleCallback::ShowContainerUI
+13587 CMFCRibbonBar::ShowContextCategories
+13588 CBrowserControlSite::ShowContextMenu
+13589 CArchiveStream::AddRef
+13590 CHtmlControlSite::XDocHostUIHandler::ShowContextMenu
+13591 CFrameWnd::ShowControlBar
+13592 CMFCRibbonPanel::ShowDefaultButton
+13593 CDockingManager::ShowDelayShowMiniFrames
+13594 CDockingPanesRow::ShowDockSiteRow
+13595 CMFCRibbonCategory::ShowElements
+13596 CMFCRibbonCategory::ShowFloating
+13597 CFullScreenImpl::ShowFullScreen
+13598 CFullScreenImpl::ShowFullScreen
+13599 CSmartDockingGroupGuidesManager::ShowGuide
+13600 CMFCRibbonBar::ShowKeyTips
+13601 CMFCRibbonApplicationButton::ShowMainMenu
+13602 CMFCCaptionMenuButton::ShowMenu
+13603 COleClientItem::XOleClientSite::ShowObject
+13604 COleControlSite::XOleClientSite::ShowObject
+13605 CFrameWnd::ShowOwnedWindows
+13606 CBasePane::ShowPane
+13607 CDockablePane::ShowPane
+13608 CDockingPanesRow::ShowPane
+13609 CDockSite::ShowPane
+13610 CFrameWndEx::ShowPane
+13611 CFrameWndEx::ShowPane
+13612 CFrameWndEx::ShowPane
+13613 CFrameWndEx::ShowPane
+13614 CFrameWndEx::ShowPane
+13615 CFrameWndEx::ShowPane
+13616 CDockingManager::ShowPanes
+13617 CSmartDockingManager::ShowPlaceAt
+13618 CMFCRibbonPanel::ShowPopup
+13619 CContextMenuManager::ShowPopupMenu
+13620 CContextMenuManager::ShowPopupMenu
+13621 CFrameWndEx::ShowPopupMenu
+13622 CMDIFrameWndEx::ShowPopupMenu
+13623 COleDocIPFrameWndEx::ShowPopupMenu
+13624 COleDocIPFrameWndEx::ShowPopupMenu
+13625 CWinAppEx::ShowPopupMenu
+13626 CArchiveStream::Clone
+13627 CFrameImpl::ShowQuickCustomizePane
+13628 CDockSite::ShowRow
+13629 CMFCRibbonBar::ShowSysMenu
+13630 CBaseTabbedPane::ShowTab
+13631 CMFCBaseTabCtrl::ShowTab
+13632 CSmartDockingHighlighterWnd::ShowTabbedAt
+13633 CSmartDockingManager::ShowTabbedPlaceAt
+13634 CMFCTasksPane::ShowTask
+13635 CMFCTasksPane::ShowTaskByCmdId
+13636 CMFCToolBarsCustomizeDialog::ShowToolBar
+13637 CMFCToolBarsListPropertyPage::ShowToolBar
+13638 CBrowserControlSite::ShowUI
+13639 CArchiveStream::AddRef
+13640 CHtmlControlSite::XDocHostUIHandler::ShowUI
+13641 COleControlSite::ShowWindow
+13642 CPaneDivider::ShowWindow
+13643 CPaneDivider::ShowWindow
+13644 CMDIFrameWndEx::ShowWindowsDialog
+13645 CMFCRibbonMiniToolBar::ShowWithContextMenu
+13646 CD2DGeometry::Simplify
+13647 CMenuImages::Size
+13649 CMonthCalCtrl::SizeMinReq
+13650 CBitmapButton::SizeToContent
+13651 CMFCButton::SizeToContent
+13652 CMFCColorButton::SizeToContent
+13653 CMFCLinkCtrl::SizeToContent
+13654 CMFCColorButton::SizeToContent
+13655 CPaneFrameWnd::SizeToContent
+13656 CMFCToolBar::SizeToolBar
+13657 CToolBar::SizeToolBar
+13658 CEnumArray::XEnumVOID::Skip
+13659 CRecordset::SkipDeletedRecords
+13660 CDockablePane::Slide
+13661 CDrawingManager::SmartMixColors
+13662 CMFCOutlookBarPane::SmartUpdate
+13663 CMFCToolBar::SmartUpdate
+13664 CMFCControlRenderer::SmoothResize
+13665 CMFCToolBarImages::SmoothResize
+13666 CAsyncSocket::Socket
+13667 CMFCListCtrl::Sort
+13672 CSplitterWnd::SplitColumn
+13673 COccManager::SplitDialogTemplate
+13674 CSplitterWnd::SplitRow
+13675 CSmartDockingManager::Start
+13676 CMFCDesktopAlertWnd::StartAnimation
+13677 CMFCRibbonStatusBarPane::StartAnimation
+13678 CDC::StartDocA
+13679 CDockContext::StartDrag
+13680 CMFCPopupMenuBar::StartPopupMenuTimer
+13681 CMFCBaseTabCtrl::StartRenameTab
+13682 CDockContext::StartResize
+13683 CMFCPopupMenu::StartResize
+13684 CPaneFrameWnd::StartTearOff
+13685 CSplitterWnd::StartTracking
+13686 CFileDialog::StartVisualGroup
+13687 CMFCDesktopAlertWnd::StartWindowMove
+13688 CArchiveStream::Clone
+13689 CSmartDockingManager::Stop
+13690 CMFCRibbonStatusBarPane::StopAnimation
+13691 CDockablePane::StopCaptionButtonsTracking
+13692 CFrameImpl::StopCaptionButtonsTracking
+13693 CMFCTasksPane::StopCaptionButtonsTracking
+13694 CMFCTasksPaneFrameWnd::StopCaptionButtonsTracking
+13695 CPaneFrameWnd::StopCaptionButtonsTracking
+13696 CMFCTabCtrl::StopResize
+13697 CPaneDivider::StopTracking
+13698 CSplitterWnd::StopTracking
+13699 CRuntimeClass::Store
+13700 CRecentDockSiteInfo::StoreDockInfo
+13701 CRecentPaneContainerInfo::StoreDockInfo
+13702 CRecordset::StoreFields
+13703 CBaseTabbedPane::StoreRecentDockSiteInfo
+13704 CDockablePane::StoreRecentDockSiteInfo
+13705 CMultiPaneFrameWnd::StoreRecentDockSiteInfo
+13706 CPane::StoreRecentDockSiteInfo
+13707 CPaneContainer::StoreRecentDockSiteInfo
+13708 CPaneContainerManager::StoreRecentDockSiteInfo
+13709 CPaneDivider::StoreRecentDockSiteInfo
+13710 delete
+13711 CDockablePane::StoreRecentTabRelatedInfo
+13712 CMultiPaneFrameWnd::StoreRecentTabRelatedInfo
+13713 CPaneDivider::StoreRecentTabRelatedInfo
+13714 delete
+13715 CFrameImpl::StoreWindowPlacement
+13716 CWinAppEx::StoreWindowPlacement
+13717 CD2DPathGeometry::Stream
+13718 CRichEditView::Stream
+13719 CDockContext::Stretch
+13720 CMFCAutoHideBar::StretchPane
+13721 CMFCToolBar::StretchPane
+13722 CPaneContainer::StretchPaneContainer
+13723 CPane::StretchPaneDeferWndPos
+13724 CDockingPanesRow::StretchPaneRect
+13725 CMFCRibbonBaseElement::StretchToWholeRow
+13726 CGlobalUtils::StringFromCy
+13727 CGlobalUtils::StringFromDecimal
+13732 CD2DGeometry::StrokeContainsPoint
+13733 CMFCControlContainer::SubclassDlgControls
+13734 CWnd::SubclassDlgItem
+13735 CWnd::SubclassWindow
+13736 COleDocObjectItem::SupportsIPrint
+13737 CDockSite::SwapRows
+13738 CMFCBaseTabCtrl::SwapTabs
+13739 CMFCTabCtrl::SwapTabs
+13740 COleControlSite::XNotifyDBEvents::SyncAfter
+13741 COleControlSite::XNotifyDBEvents::SyncBefore
+13742 CMFCTabCtrl::SynchronizeScrollBar
+13743 CRichEditCntrItem::SyncToRichEditObject
+13744 CMDIFrameWndEx::TabbedDocumentToControlBar
+13745 CMetaFileDC::TabbedTextOutA
+13746 CPreviewDC::TabbedTextOutA
+13747 CMDIClientAreaWnd::TabWndFromPoint
+13748 CMFCTasksPane::TaskHitTest
+13749 CMFCPopupMenu::TearOff
+13750 CD2DGeometry::Tessellate
+13751 CRichEditView::TextNotFound
+13752 CMetaFileDC::TextOutA
+13753 CPreviewDC::TextOutA
+13754 CMFCPropertyGridProperty::TextToVar
+13755 CFileException::ThrowErrno
+13756 COleControl::ThrowError
+13757 COleControl::ThrowError
+13760 CFileException::ThrowOsError
+13761 CDockablePane::ToggleAutoHide
+13762 CDockContext::ToggleDocking
+13763 CMFCRibbonBar::ToggleMimimizeState
+13766 CMFCToolBar::ToolBarMouseHookProc
+13767 CDataSourceControl::ToVariant
+13768 CDockContext::Track
+13769 CMFCDropDownListBox::Track
+13770 CMFCPropertyGridToolTipCtrl::Track
+13771 CRectTracker::Track
+13772 CSplitterWnd::TrackColumnSize
+13773 CMFCPropertyGridCtrl::TrackDescr
+13774 CRectTracker::TrackHandle
+13775 CMFCPropertyGridCtrl::TrackHeader
+13776 CContextMenuManager::TrackPopupMenu
+13777 CMenu::TrackPopupMenu
+13778 CMenu::TrackPopupMenuEx
+13779 CSplitterWnd::TrackRowSize
+13780 CRectTracker::TrackRubberBand
+13781 CMFCPropertyGridCtrl::TrackToolTip
+13782 COleControl::TransformCoords
+13783 COleControlSite::XOleControlSite::TransformCoords
+13784 CBrowserControlSite::TranslateAcceleratorA
+13785 CArchiveStream::AddRef
+13786 CHtmlControlSite::XDocHostUIHandler::TranslateAcceleratorA
+13787 CArchiveStream::Clone
+13788 COleControl::XOleInPlaceActiveObject::TranslateAcceleratorA
+13789 COleServerDoc::XOleInPlaceActiveObject::TranslateAcceleratorA
+13790 COleFrameHook::XOleInPlaceFrame::TranslateAcceleratorA
+13791 CArchiveStream::Clone
+13792 CDocument::XPreviewHandler::TranslateAcceleratorA
+13793 COlePropertyPage::XPropertyPage::TranslateAcceleratorA
+13794 CMFCRibbonBar::TranslateChar
+13795 CMFCToolBar::TranslateChar
+13796 CKeyboardManager::TranslateCharToUpper
+13797 COleControl::TranslateColor
+13798 CBrowserControlSite::TranslateUrl
+13799 CDHtmlDialog::TranslateUrl
+13800 CHtmlControlSite::XDocHostUIHandler::TranslateUrl
+13801 CMFCToolBarImages::TransparentBlt
+13802 CMFCPopupMenu::TriggerResize
+13823 CMFCToolBarFontSizeComboBox::TwipsToPointString
+13824 CDocObjectServer::XOleDocumentView::UIActivate
+13825 COccManager::UIActivateControl
+13826 COleControl::XOleInPlaceObject::UIDeactivate
+13827 COleServerDoc::XOleInPlaceObject::UIDeactivate
+13828 COccManager::UIDeactivateIfNecessary
+13829 COleSafeArray::UnaccessData
+13830 CDHtmlElementEventSink::UnAdvise
+13831 CConnectionPoint::XConnPt::Unadvise
+13832 CDocObjectServer::XOleObject::Unadvise
+13833 COleControl::XOleObject::Unadvise
+13834 COleServerDoc::XOleObject::Unadvise
+13835 COleServerItem::XDataObject::DUnadvise
+13836 CRecordset::UnbindFieldsForUpdate
+13837 COleControl::XOleCache::Uncache
+13838 CMFCButton::UncheckRadioButtonsInGroup
+13839 CFullScreenImpl::UndockAndHidePanes
+13840 CDockablePane::UndockPane
+13841 CPane::UndockPane
+13842 CArchiveStream::Clone
+13843 CDocument::XPreviewHandler::Unload
+13844 CArchiveStream::AddRef
+13845 CMultiLock::Unlock
+13846 CMultiLock::Unlock
+13847 CMutex::Unlock
+13848 COleSafeArray::Unlock
+13849 CSemaphore::Unlock
+13850 CSingleLock::Unlock
+13851 CSingleLock::Unlock
+13852 CTypeLibCache::Unlock
+13855 CEditView::UnlockBuffer
+13856 CFile::UnlockRange
+13857 CSocketFile::Abort
+13858 CSocketFile::Abort
+13859 COleStreamFile::UnlockRange
+13860 CSocketFile::Abort
+13861 CSocketFile::Abort
+13862 CArchiveStream::Clone
+13863 CWnd::UnlockRenderTarget
+13864 CArchiveStream::AddRef
+13865 COleTemplateServer::Unregister
+13866 CWinApp::Unregister
+13867 COleObjectFactory::UnregisterAll
+13868 CDocManager::UnregisterShellFileTypes
+13869 CWinApp::UnregisterShellFileTypes
+13870 CControlSiteFactoryMgr::UnregisterSiteFactory
+13871 CMDIChildWndEx::UnregisterTaskbarTab
+13872 CAutoHideDockSite::UnSetAutoHideMode
+13873 CDockablePane::UnSetAutoHideMode
+13874 CMFCAutoHideBar::UnSetAutoHideMode
+13875 CMFCAutoHideButton::UnSetAutoHideMode
+13876 CWnd::UnsubclassWindow
+13877 CMFCTasksPane::Update
+13878 CRecordset::Update
+13879 CSmartDockingGroupGuidesWnd::Update
+13880 CDocObjectServer::XOleObject::Update
+13881 COleUILinkInfo::AddRef
+13882 COleServerDoc::XOleObject::Update
+13883 COleServerItem::XOleObject::Update
+13884 CKeyboardManager::UpdateAccelTable
+13885 CKeyboardManager::UpdateAccelTable
+13886 COleServerDoc::UpdateAllItems
+13887 CStatusBar::UpdateAllPanes
+13888 CMFCPopupMenu::UpdateAllShadows
+13889 CDocument::UpdateAllViews
+13890 CAnimationController::UpdateAnimationManager
+13891 CScrollView::UpdateBars
+13892 CMFCPopupMenu::UpdateBottomWindows
+13893 CMFCToolBar::UpdateButton
+13894 CMFCTasksPaneToolBar::UpdateButtons
+13895 CMFCWindowsManagerDialog::UpdateButtons
+13896 CFrameImpl::UpdateCaption
+13897 CMFCTasksPane::UpdateCaption
+13898 CMDIChildWnd::UpdateClientEdge
+13899 CMFCColorButton::UpdateColor
+13900 CMFCPropertyGridCtrl::UpdateColor
+13901 CMFCRibbonColorButton::UpdateColor
+13902 CDataSourceControl::UpdateControls
+13903 CMFCToolBarImages::UpdateCount
+13904 CDataSourceControl::UpdateCursor
+13905 CMFCCustomizeMenuButton::UpdateCustomizeButton
+13906 CWnd::UpdateData
+13907 CWnd::UpdateDialogControls
+13908 CDataRecoveryHandler::UpdateDocumentInfo
+13909 AFX_GLOBAL_DATA::UpdateFonts
+13910 CDocument::UpdateFrameCounts
+13911 CFrameWnd::UpdateFrameTitleForDocument
+13912 CMFCToolBarImages::UpdateImage
+13913 CMFCToolBar::UpdateImagesColor
+13914 CRecordset::UpdateInsertDelete
+13915 CMFCToolBarImages::UpdateInternalImage
+13916 COleClientItem::UpdateItemType
+13917 CSmartDockingStandaloneGuideWnd::UpdateLayered
+13918 COleClientItem::UpdateLink
+13919 COleUILinkInfo::UpdateLink
+13920 CMFCMenuBar::UpdateMDIChildrenMenus
+13921 CMDIFrameWndEx::UpdateMDITabbedBarsIcons
+13922 CMDIClientAreaWnd::UpdateMDITabbedGroups
+13923 CRecentFileList::UpdateMenu
+13924 CMFCTasksPaneToolBar::UpdateMenuButtonText
+13925 CMFCRibbonKeyTip::UpdateMenuShadow
+13926 COleDocument::UpdateModifiedFlag
+13927 delete
+13928 CRichEditDoc::UpdateObjectCache
+13929 CFileDialog::UpdateOFNFromShellDialog
+13930 CWinApp::UpdatePrinterSelection
+13931 COleObjectFactory::UpdateRegistry
+13932 COleObjectFactory::UpdateRegistry
+13933 COleTemplateServer::UpdateRegistry
+13934 COleObjectFactory::UpdateRegistryAll
+13935 CMFCRibbonCategory::UpdateScrollButtons
+13936 CMFCTabCtrl::UpdateScrollButtonsState
+13937 CMFCPopupMenu::UpdateShadow
+13938 CDockContext::UpdateState
+13939 AFX_GLOBAL_DATA::UpdateSysColors
+13940 CMFCBaseVisualManager::UpdateSystemColors
+13941 CMDIClientAreaWnd::UpdateTabs
+13942 CMDIChildWndEx::UpdateTaskbarTabIcon
+13943 AFX_GLOBAL_DATA::UpdateTextMetrics
+13944 CToolTipCtrl::UpdateTipText
+13945 CToolTipCtrl::UpdateTipText
+13946 CMFCRibbonBaseElement::UpdateTooltipInfo
+13947 CDockablePane::UpdateTooltips
+13948 CMFCCaptionBar::UpdateTooltips
+13949 CMFCToolBar::UpdateTooltips
+13950 CPaneFrameWnd::UpdateTooltips
+13951 CTooltipManager::UpdateTooltips
+13952 CMFCRibbonBar::UpdateToolTipsRect
+13953 CMFCRibbonMiniToolBar::UpdateTransparency
+13954 CBrowserControlSite::UpdateUI
+13955 CArchiveStream::Clone
+13956 CHtmlControlSite::XDocHostUIHandler::UpdateUI
+13957 COleServerDoc::UpdateUsingHostObj
+13958 CPane::UpdateVirtualRect
+13959 CPane::UpdateVirtualRect
+13960 CPane::UpdateVirtualRect
+13961 COleLinkingDoc::UpdateVisibleLock
+13962 CDockingPanesRow::UpdateVisibleState
+13963 CMFCAutoHideBar::UpdateVisibleState
+13964 CMFCControlContainer::UTF8ToString
+13965 CDatabase::VerifyConnect
+13966 CRecordset::VerifyCursorSupport
+13967 CRecordset::VerifyDriverBehavior
+13968 COleObjectFactory::VerifyLicenseKey
+13969 CRenderTarget::VerifyResource
+13970 CArchiveStream::AddRef
+13971 CListBox::CharToItem
+13972 CWnd::WalkPreTranslateTree
+13973 CD2DGeometry::Widen
+13974 COleControl::WillAmbientsBeValidDuringLoad
+13975 CBasePane::WindowProc
+13976 CControlBar::WindowProc
+13977 CMFCReBar::WindowProc
+13978 CMFCRibbonBar::WindowProc
+13979 CMFCShellListCtrl::WindowProc
+13980 CMFCShellTreeCtrl::WindowProc
+13981 COleControl::WindowProc
+13982 COlePropertyPage::WindowProc
+13983 CParkingWnd::WindowProc
+13984 CReBar::WindowProc
+13985 CReflectorWnd::WindowProc
+13986 CWnd::WindowProc
+13991 CWinApp::WinHelpA
+13992 CWnd::WinHelpA
+13993 CWinApp::WinHelpInternal
+13994 CWnd::WinHelpInternal
+13999 CRichEditView::WrapChanged
+14000 CMFCToolBar::WrapToolBar
+14001 CToolBar::WrapToolBar
+14002 CArchive::Write
+14003 CArchiveStream::Write
+14004 CFile::Write
+14005 CSocketFile::Abort
+14006 CImageList::Write
+14007 CInternetFile::Write
+14008 CMemFile::Write
+14009 CMFCRibbonInfo::Write
+14010 CMFCRibbonInfo::Write
+14011 CMFCRibbonInfo::Write
+14012 COleStreamFile::Write
+14013 CSettingsStore::Write
+14014 CSettingsStore::Write
+14015 CSettingsStore::Write
+14016 CSettingsStore::Write
+14017 CSettingsStore::Write
+14018 CSettingsStore::Write
+14019 CGopherFileFind::GetCreationTime
+14020 CSocketFile::Write
+14021 CStdioFile::Write
+14022 CMFCRibbonInfo::XBase::Write
+14023 CMFCRibbonInfo::XCategory::Write
+14024 CMFCRibbonInfo::XCategoryMain::Write
+14025 CMFCRibbonInfo::XContext::Write
+14026 CMFCRibbonInfo::XElement::Write
+14027 CMFCRibbonInfo::XElementButton::Write
+14028 CMFCRibbonInfo::XElementButtonApplication::Write
+14029 CMFCRibbonInfo::XElementButtonCheck::Write
+14030 CMFCRibbonInfo::XElementButtonColor::Write
+14031 CMFCRibbonInfo::XElementButtonGallery::Write
+14032 CMFCRibbonInfo::XElementButtonCheck::Write
+14033 CMFCRibbonInfo::XElementButtonLinkCtrl::Write
+14034 CMFCRibbonInfo::XElementButtonCheck::Write
+14035 CMFCRibbonInfo::XElementButtonUndo::Write
+14036 CMFCRibbonInfo::XElementComboBox::Write
+14037 CMFCRibbonInfo::XElementEdit::Write
+14038 CMFCRibbonInfo::XElementFontComboBox::Write
+14039 CMFCRibbonInfo::XElementGroup::Write
+14040 CMFCRibbonInfo::XElementButtonCheck::Write
+14041 CMFCRibbonInfo::XElementProgressBar::Write
+14042 CMFCRibbonInfo::XElementSeparator::Write
+14043 CMFCRibbonInfo::XElementSlider::Write
+14044 CMFCRibbonInfo::XElementButtonGallery::XGalleryGroup::Write
+14045 CMFCRibbonInfo::XID::Write
+14046 CMFCRibbonInfo::XImage::Write
+14047 CMFCRibbonInfo::XPanel::Write
+14048 CMFCRibbonInfo::XQAT::Write
+14049 CMFCRibbonInfo::XQAT::XQATItem::Write
+14050 CMFCRibbonInfo::XRibbonBar::Write
+14051 CWinAppEx::WriteBinary
+14052 CMFCRibbonInfo::XRibbonInfoParser::WriteBool
+14053 CArchive::WriteClass
+14054 CMFCRibbonInfo::XRibbonInfoParser::WriteColor
+14055 CArchive::WriteCount
+14056 CWinAppEx::WriteInt
+14057 CMFCRibbonInfo::XRibbonInfoParser::WriteInt
+14058 COleClientItem::WriteItem
+14059 COleClientItem::WriteItemCompound
+14060 COleClientItem::WriteItemFlat
+14061 CRecentFileList::WriteList
+14062 CPropertySection::WriteNameDictToStream
+14063 CArchive::WriteObject
+14064 CWinAppEx::WriteObject
+14065 CWinApp::WriteProfileBinary
+14066 CWinApp::WriteProfileInt
+14067 CWinApp::WriteProfileStringA
+14068 CWinAppEx::WriteSectionBinary
+14069 CWinAppEx::WriteSectionInt
+14070 CWinAppEx::WriteSectionObject
+14071 CWinAppEx::WriteSectionString
+14072 CMFCRibbonInfo::XRibbonInfoParser::WriteSize
+14073 CArchive::WriteString
+14074 CSocketFile::Abort
+14075 CInternetFile::WriteString
+14076 CStdioFile::WriteString
+14077 CWinAppEx::WriteString
+14078 CEditView::WriteToArchive
+14079 CProperty::WriteToStream
+14080 CPropertySection::WriteToStream
+14081 CPropertySet::WriteToStream
+14082 CMFCRibbonInfo::XRibbonInfoParser::WriteUInt
+14083 CAnimationBaseObject::CAnimationBaseObject
+14084 CAnimationColor::CAnimationColor
+14085 CAnimationPoint::CAnimationPoint
+14086 CAnimationRect::CAnimationRect
+14087 CAnimationRect::CAnimationRect
+14088 CAnimationRect::CAnimationRect
+14089 CAnimationSize::CAnimationSize
+14090 CAnimationValue::CAnimationValue
+14091 CMFCPropertySheetListBox::CMFCPropertySheetListBox
+14092 CMFCTasksPane::AddTask
+14093 CMFCTasksPane::AddWindow
+14094 CMFCPropertySheetListBox::DrawItem
+14095 CMDIClientAreaWnd::EnableMDITabsLastActiveActivation
+14096 CAnimationController::EnablePriorityComparisonHandler
+14097 CMFCPropertySheetListBox::GetMessageMap
+14098 CMFCPropertySheetListBox::GetMessageMap
+14099 CMFCPropertySheetListBox::MeasureItem
+14100 CMFCMaskedEdit::OnClear
+14101 CMFCTasksPane::OnClickTask
+14102 CMFCMaskedEdit::OnClear
+14103 CFrameWnd::OnDDEExecute
+14104 CFrameWnd::OnDDEInitiate
+14105 CFrameWnd::OnDDETerminate
+14106 CWnd::OnDisplayChange
+14107 CMFCButton::OnGetFont
+14108 CMFCCaptionBar::OnGetFont
+14109 CMFCPropertyGridCtrl::OnGetFont
+14110 CMFCRibbonBar::OnGetFont
+14111 CMFCStatusBar::OnGetFont
+14112 CMFCTasksPane::OnGetFont
+14113 CVSListBoxBase::OnGetFont
+14114 CMFCMaskedEdit::OnGetText
+14115 CMFCStatusBar::OnGetText
+14116 CStatusBar::OnGetText
+14117 CMFCMaskedEdit::OnGetTextLength
+14118 CMFCStatusBar::OnGetTextLength
+14119 CStatusBar::OnGetTextLength
+14120 CMDIClientAreaWnd::OnMDIDestroy
+14121 CMDIClientAreaWnd::OnMDINext
+14122 CMDIClientAreaWnd::OnMDIRefreshMenu
+14123 CMDIClientAreaWnd::OnMDISetMenu
+14124 CMFCPropertySheetListBox::OnMouseLeave
+14125 CMFCPropertySheetListBox::OnMouseMove
+14126 CMFCMaskedEdit::OnPaste
+14127 CBasePane::OnPrintClient
+14128 CListBox::CharToItem
+14129 CFormView::OnPrintClient
+14130 CMFCDesktopAlertDialog::OnPrintClient
+14131 CMFCDesktopAlertWnd::OnPrintClient
+14132 CMFCPropertyGridCtrl::OnPrintClient
+14133 CPaneDialog::OnPrintClient
+14134 CScrollView::OnPrintClient
+14135 CSplitterWnd::OnPrintClient
+14136 CTabView::OnPrintClient
+14137 CView::OnPrintClient
+14138 CMDITabProxyWnd::OnSendIconicLivePreviewBitmap
+14139 CMDITabProxyWnd::OnSendIconicThumbnail
+14140 CCheckListBox::OnSetFont
+14141 CDialog::OnSetFont
+14142 CEditView::OnSetFont
+14143 CMFCButton::OnSetFont
+14144 CMFCCaptionBar::OnSetFont
+14145 CMFCHeaderCtrl::OnSetFont
+14146 CMFCPropertyGridCtrl::OnSetFont
+14147 CMFCPropertyGridToolTipCtrl::OnSetFont
+14148 CMFCRibbonBar::OnSetFont
+14149 CMFCStatusBar::OnSetFont
+14150 CMFCTasksPane::OnSetFont
+14151 CVSListBoxBase::OnSetFont
+14152 CBasePane::OnSetIcon
+14153 CMDIChildWndEx::OnSetIcon
+14154 CDockablePane::OnSetText
+14155 CFrameWndEx::OnSetText
+14156 CMDIChildWndEx::OnSetText
+14157 CMDIFrameWndEx::OnSetText
+14158 CMFCMaskedEdit::OnSetText
+14159 CMFCStatusBar::OnSetText
+14160 CMFCTasksPane::OnSetText
+14161 COleControl::OnSetText
+14162 CStatusBar::OnSetText
+14163 CVSListBoxBase::OnSetText
+14164 CFrameWndEx::WinHelpA
+14165 CMDIFrameWndEx::WinHelpA
+14166 COleDocIPFrameWndEx::WinHelpA
+14167 COleIPFrameWndEx::WinHelpA
+14168 CDatabase::GetConnect
+14169 CVSListBox::GetRuntimeClass
+14170 CVSListBoxBase::GetRuntimeClass
+14171 CVSListBoxEditCtrl::GetRuntimeClass
+14172 CVSListBox::GetRuntimeClass
+14173 CVSListBoxBase::GetRuntimeClass
+14174 CVSListBoxEditCtrl::GetRuntimeClass
+14175 CFrameWndEx::OnPowerBroadcast
+14176 CFrameWndEx::OnPowerBroadcast
+14177 CMFCBaseAccessibleObject::CMFCBaseAccessibleObject
+14178 CMFCRibbonTabsGroup::CMFCRibbonTabsGroup
+14179 CMFCRibbonTabsGroup::CMFCRibbonTabsGroup
+14180 CMFCBaseAccessibleObject::~CMFCBaseAccessibleObject
+14181 CMFCRibbonTabsGroup::~CMFCRibbonTabsGroup
+14182 CArchiveStream::AddRef
+14183 CMFCRibbonBaseElement::accDoDefaultAction
+14184 CMFCRibbonContextCaption::accDoDefaultAction
+14185 CMFCRibbonPanel::accDoDefaultAction
+14186 CMFCRibbonQuickAccessToolBar::accDoDefaultAction
+14187 CMFCRibbonTabsGroup::accDoDefaultAction
+14188 CMFCBaseAccessibleObject::XAccessible::accDoDefaultAction
+14189 CMFCRibbonBar::AccessibleObjectByIndex
+14190 CMFCRibbonBar::AccessibleObjectFromPoint
+14191 CArchiveStream::AddRef
+14192 CMFCRibbonBaseElement::accHitTest
+14193 CMFCRibbonCategory::accHitTest
+14194 CMFCRibbonPanel::accHitTest
+14195 CMFCRibbonQuickAccessToolBar::accHitTest
+14196 CMFCRibbonTab::accHitTest
+14197 CMFCRibbonTabsGroup::accHitTest
+14198 CMFCBaseAccessibleObject::XAccessible::accHitTest
+14199 CArchiveStream::AddRef
+14200 CMFCRibbonBar::accLocation
+14201 CMFCRibbonBaseElement::accLocation
+14202 CMFCRibbonCategory::accLocation
+14203 CMFCRibbonPanel::accLocation
+14204 CMFCRibbonQuickAccessToolBar::accLocation
+14205 CMFCRibbonTab::accLocation
+14206 CMFCBaseAccessibleObject::XAccessible::accLocation
+14207 CArchiveStream::AddRef
+14208 CMFCRibbonApplicationButton::accNavigate
+14209 CMFCRibbonBaseElement::accNavigate
+14210 CMFCRibbonCategory::accNavigate
+14211 CMFCRibbonContextCaption::accNavigate
+14212 CMFCRibbonPanel::accNavigate
+14213 CMFCRibbonQuickAccessToolBar::accNavigate
+14214 CMFCRibbonTab::accNavigate
+14215 CMFCRibbonTabsGroup::accNavigate
+14216 CMFCBaseAccessibleObject::XAccessible::accNavigate
+14217 CArchiveStream::AddRef
+14218 CMFCBaseAccessibleObject::XAccessible::accSelect
+14219 CMFCRibbonTabsGroup::CreateObject
+14220 CMFCBaseAccessibleObject::get_accChild
+14221 CMFCRibbonCategory::get_accChild
+14222 CMFCBaseAccessibleObject::XAccessible::get_accChild
+14223 CBasePane::get_accChildCount
+14224 CMFCRibbonCategory::get_accChildCount
+14225 CMFCRibbonContextCaption::get_accChildCount
+14226 CMFCRibbonPanel::get_accChildCount
+14227 CMFCRibbonQuickAccessToolBar::get_accChildCount
+14228 CBasePane::get_accChildCount
+14229 CMFCRibbonTabsGroup::get_accChildCount
+14230 CMFCBaseAccessibleObject::XAccessible::get_accChildCount
+14231 CMFCBaseAccessibleObject::get_accDefaultAction
+14232 CMFCRibbonTab::get_accDefaultAction
+14233 CMFCRibbonTabsGroup::get_accDefaultAction
+14234 CMFCBaseAccessibleObject::XAccessible::get_accDefaultAction
+14235 CMFCBaseAccessibleObject::get_accDescription
+14236 CMFCBaseAccessibleObject::XAccessible::get_accDescription
+14237 CMFCBaseAccessibleObject::get_accFocus
+14238 CMFCBaseAccessibleObject::XAccessible::get_accFocus
+14239 CMFCBaseAccessibleObject::get_accHelp
+14240 CMFCBaseAccessibleObject::XAccessible::get_accHelp
+14241 CArchiveStream::Clone
+14242 CMFCBaseAccessibleObject::XAccessible::get_accHelpTopic
+14243 CMFCBaseAccessibleObject::get_accKeyboardShortcut
+14244 CMFCBaseAccessibleObject::XAccessible::get_accKeyboardShortcut
+14245 CMFCBaseAccessibleObject::get_accName
+14246 CMFCBaseAccessibleObject::XAccessible::get_accName
+14247 CMFCBaseAccessibleObject::get_accParent
+14248 CMFCRibbonApplicationButton::get_accParent
+14249 CMFCRibbonBaseElement::get_accParent
+14250 CMFCRibbonCategory::get_accParent
+14251 CMFCRibbonApplicationButton::get_accParent
+14252 CMFCRibbonPanel::get_accParent
+14253 CMFCRibbonApplicationButton::get_accParent
+14254 CMFCRibbonTab::get_accParent
+14255 CMFCRibbonApplicationButton::get_accParent
+14256 CMFCBaseAccessibleObject::XAccessible::get_accParent
+14257 CMFCBaseAccessibleObject::get_accRole
+14258 CMFCBaseAccessibleObject::XAccessible::get_accRole
+14259 CMFCBaseAccessibleObject::get_accFocus
+14260 CMFCBaseAccessibleObject::XAccessible::get_accSelection
+14261 CMFCBaseAccessibleObject::get_accState
+14262 CMFCBaseAccessibleObject::XAccessible::get_accState
+14263 CMFCBaseAccessibleObject::get_accValue
+14264 CMFCBaseAccessibleObject::XAccessible::get_accValue
+14265 CMFCRibbonBar::GetAccessibleDispatch
+14266 CMFCRibbonBar::GetAccObjectCount
+14267 CMFCRibbonButtonsGroup::GetButtonIndex
+14268 CMFCRibbonContextCaption::GetContextCaptionIndex
+14269 CMFCRibbonContextCaption::GetContextCategories
+14270 CMFCRibbonContextCaption::GetContextCategoryCount
+14271 CMFCBaseAccessibleObject::XAccessible::GetIDsOfNames
+14272 CMFCBaseAccessibleObject::GetInterfaceMap
+14273 CMFCRibbonPanel::GetParentWnd
+14274 CMFCBaseAccessibleObject::GetRuntimeClass
+14275 CMFCRibbonTabsGroup::GetRuntimeClass
+14276 CMFCPopupMenu::GetSafeActivePopupMenu
+14277 CGlobalUtils::GetSystemBorders
+14278 CGlobalUtils::GetSystemBorders
+14279 CMFCBaseAccessibleObject::GetRuntimeClass
+14280 CMFCRibbonTabsGroup::GetRuntimeClass
+14281 CMFCBaseAccessibleObject::GetInterfaceMap
+14282 CMFCBaseAccessibleObject::XAccessible::GetTypeInfo
+14283 CMFCBaseAccessibleObject::XAccessible::GetTypeInfoCount
+14284 CMFCRibbonBar::GetVisibleContextCaptionCount
+14285 CMFCRibbonBar::GetVisibleContextCaptions
+14286 CMFCRibbonBar::GetVisibleContextCaptions
+14287 CMFCBaseAccessibleObject::XAccessible::Invoke
+14288 CMFCRibbonBar::IsCaptionButtons
+14289 CMFCRibbonLinkCtrl::OnAccDefaultAction
+14290 COleUILinkInfo::AddRef
+14291 CMFCRibbonCategory::OnSetAccData
+14292 CMFCRibbonContextCaption::OnSetAccData
+14293 CMFCRibbonPanel::OnSetAccData
+14294 CMFCRibbonQuickAccessToolBar::OnSetAccData
+14295 CMFCRibbonTabsGroup::OnSetAccData
+14296 CArchiveStream::AddRef
+14297 CMFCBaseAccessibleObject::XAccessible::put_accName
+14298 CArchiveStream::AddRef
+14299 CMFCBaseAccessibleObject::XAccessible::put_accValue
+14300 COleUILinkInfo::AddRef
+14301 CMFCRibbonApplicationButton::SetACCData
+14302 CMFCRibbonCategory::SetACCData
+14303 CMFCRibbonComboBox::SetACCData
+14304 CMFCRibbonContextCaption::SetACCData
+14305 CMFCRibbonLinkCtrl::SetACCData
+14306 CMFCRibbonPanel::SetACCData
+14307 CMFCRibbonProgressBar::SetACCData
+14308 CMFCRibbonQuickAccessToolBar::SetACCData
+14309 CMFCRibbonSlider::SetACCData
+14310 CMFCRibbonTabsGroup::SetACCData
+14311 CMFCRibbonTabsGroup::UpdateTabs
+14312 CD2DSolidColorBrush::CD2DSolidColorBrush
+14313 CRenderTarget::Clear
+14314 CRenderTarget::COLORREF_TO_D2DCOLOR
+14315 CD2DSolidColorBrush::GetColor
+14316 CD2DSolidColorBrush::SetColor
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/mfc42.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/mfc42.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/mfc42.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/mfc42.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,6400 +1,6400 @@
-5=CRuntimeClassconstCCachedDataPathProperty::classCCachedDataPathProperty
-6=CRuntimeClassconstCDataPathProperty::classCDataPathProperty
-7=DllCanUnloadNow
-8=DllGetClassObject
-9=DllRegisterServer
-10=DllUnregisterServer
-256=_AFX_CHECKLIST_STATE::_AFX_CHECKLIST_STATE
-257=_AFX_COLOR_STATE::_AFX_COLOR_STATE
-258=???0_AFX_CONTROLPOS@@QAE@XZ@@YAXXZ
-259=_AFX_DAO_STATE::_AFX_DAO_STATE
-260=_AFX_EDIT_STATE::_AFX_EDIT_STATE
-261=_AFX_OLE_STATE::_AFX_OLE_STATE
-262=_AFX_THREAD_STATE::_AFX_THREAD_STATE
-263=_AFX_WIN_STATE::_AFX_WIN_STATE
-264=_AFXCTL_AMBIENT_CACHE::_AFXCTL_AMBIENT_CACHE
-265=_AFXCTL_UIACTIVE_INFO::_AFXCTL_UIACTIVE_INFO
-266=AFX_CLASSINIT::AFX_CLASSINIT
-267=AFX_DDPDATA::AFX_DDPDATA
-268=AFX_EXCEPTION_LINK::AFX_EXCEPTION_LINK
-269=AFX_MODULE_STATE::AFX_MODULE_STATE
-270=AFX_MODULE_STATE::AFX_MODULE_STATE
-271=AFX_MODULE_THREAD_STATE::AFX_MODULE_THREAD_STATE
-272=CAnimateCtrl::CAnimateCtrl
-273=CArchive::CArchive
-274=CArchivePropExchange::CArchivePropExchange
-275=CArchiveStream::CArchiveStream
-276=CAsyncMonikerFile::CAsyncMonikerFile
-277=CAsyncPropExchange::CAsyncPropExchange
-278=CAsyncSocket::CAsyncSocket
-279=CBitmap::CBitmap
-280=CBitmapButton::CBitmapButton
-281=CBlobProperty::CBlobProperty
-282=CBrush::CBrush
-283=CBrush::CBrush
-284=CBrush::CBrush
-285=CBrush::CBrush
-286=CButton::CButton
-287=CByteArray::CByteArray
-288=CCheckListBox::CCheckListBox
-289=CClientDC::CClientDC
-290=CCmdTarget::CCmdTarget
-291=CCmdUI::CCmdUI
-292=CColorButton::CColorButton
-293=CColorDialog::CColorDialog
-294=CColorPropPage::CColorPropPage
-295=CComboBox::CComboBox
-296=CCommandLineInfo::CCommandLineInfo
-297=CConnectionPoint::CConnectionPoint
-298=CControlBar::CControlBar
-299=CControlBarInfo::CControlBarInfo
-300=COleControl::CControlDataSource::CControlDataSource
-301=CControlFrameWnd::CControlFrameWnd
-302=CCriticalSection::CCriticalSection
-303=CCtrlView::CCtrlView
-304=CDaoDatabase::CDaoDatabase
-305=CDaoException::CDaoException
-306=CDaoFieldExchange::CDaoFieldExchange
-307=CDaoIndexFieldInfo::CDaoIndexFieldInfo
-308=CDaoIndexInfo::CDaoIndexInfo
-309=CDaoQueryDef::CDaoQueryDef
-310=CDaoRecordset::CDaoRecordset
-311=CDaoRecordView::CDaoRecordView
-312=CDaoRecordView::CDaoRecordView
-313=CDaoRelationFieldInfo::CDaoRelationFieldInfo
-314=CDaoRelationInfo::CDaoRelationInfo
-315=CDaoTableDef::CDaoTableDef
-316=CDaoWorkspace::CDaoWorkspace
-317=CDatabase::CDatabase
-318=CDataBoundProperty::CDataBoundProperty
-319=CDataExchange::CDataExchange
-320=CDataSourceControl::CDataSourceControl
-321=CDBException::CDBException
-322=CDBVariant::CDBVariant
-323=CDC::CDC
-324=CDialog::CDialog
-325=CDialog::CDialog
-326=CDialog::CDialog
-327=CDialogBar::CDialogBar
-328=CDialogTemplate::CDialogTemplate
-329=CDialogTemplate::CDialogTemplate
-330=CDocItem::CDocItem
-331=CDockBar::CDockBar
-332=CDockContext::CDockContext
-333=CDockState::CDockState
-334=CDocManager::CDocManager
-335=CDocObjectServer::CDocObjectServer
-336=CDocObjectServerItem::CDocObjectServerItem
-337=CDocTemplate::CDocTemplate
-338=CDocument::CDocument
-339=CDragListBox::CDragListBox
-340=CDumpContext::CDumpContext
-341=CDWordArray::CDWordArray
-342=CDynLinkLibrary::CDynLinkLibrary
-343=CEdit::CEdit
-344=CEditView::CEditView
-345=CEnumArray::CEnumArray
-346=CEnumConnPoints::CEnumConnPoints
-347=CEnumFormatEtc::CEnumFormatEtc
-348=CEvent::CEvent
-349=CException::CException
-350=CException::CException
-351=CFieldExchange::CFieldExchange
-352=CFile::CFile
-353=CFile::CFile
-354=CFile::CFile
-355=CFileDialog::CFileDialog
-356=CFileFind::CFileFind
-357=CFindReplaceDialog::CFindReplaceDialog
-358=CFont::CFont
-359=CFontComboBox::CFontComboBox
-360=CFontDialog::CFontDialog
-361=CFontDialog::CFontDialog
-362=CFontHolder::CFontHolder
-363=CFontPropPage::CFontPropPage
-364=CFormView::CFormView
-365=CFormView::CFormView
-366=CFrameWnd::CFrameWnd
-367=CFtpConnection::CFtpConnection
-368=CFtpConnection::CFtpConnection
-369=CFtpFileFind::CFtpFileFind
-370=CGdiObject::CGdiObject
-371=CGopherConnection::CGopherConnection
-372=CGopherConnection::CGopherConnection
-373=CGopherFile::CGopherFile
-374=CGopherFile::CGopherFile
-375=CGopherFileFind::CGopherFileFind
-376=CGopherLocator::CGopherLocator
-377=CHandleMap::CHandleMap
-378=CHeaderCtrl::CHeaderCtrl
-379=CHotKeyCtrl::CHotKeyCtrl
-380=CHttpConnection::CHttpConnection
-381=CHttpConnection::CHttpConnection
-382=CHttpFile::CHttpFile
-383=CHttpFile::CHttpFile
-384=CImageList::CImageList
-385=CInternetConnection::CInternetConnection
-386=CInternetException::CInternetException
-387=CInternetFile::CInternetFile
-388=CInternetFile::CInternetFile
-389=CInternetSession::CInternetSession
-390=CListBox::CListBox
-391=CListCtrl::CListCtrl
-392=CListView::CListView
-393=CLongBinary::CLongBinary
-394=CMapPtrToPtr::CMapPtrToPtr
-395=CMapPtrToWord::CMapPtrToWord
-396=CMapStringToOb::CMapStringToOb
-397=CMapStringToPtr::CMapStringToPtr
-398=CMapStringToString::CMapStringToString
-399=CMapWordToOb::CMapWordToOb
-400=CMapWordToPtr::CMapWordToPtr
-401=CMDIChildWnd::CMDIChildWnd
-402=CMDIFrameWnd::CMDIFrameWnd
-403=CMemFile::CMemFile
-404=CMemFile::CMemFile
-405=CMenu::CMenu
-406=CMetaFileDC::CMetaFileDC
-407=CMiniDockFrameWnd::CMiniDockFrameWnd
-408=CMiniFrameWnd::CMiniFrameWnd
-409=CMirrorFile::CMirrorFile
-410=CMonikerFile::CMonikerFile
-411=CMultiDocTemplate::CMultiDocTemplate
-412=CMultiLock::CMultiLock
-413=CMutex::CMutex
-414=CObArray::CObArray
-415=CObList::CObList
-416=CODBCFieldInfo::CODBCFieldInfo
-417=COleBusyDialog::COleBusyDialog
-418=COleChangeIconDialog::COleChangeIconDialog
-419=COleChangeSourceDialog::COleChangeSourceDialog
-420=COleClientItem::COleClientItem
-421=COleCmdUI::COleCmdUI
-422=COleCntrFrameWnd::COleCntrFrameWnd
-423=COleControl::COleControl
-424=COleControlContainer::COleControlContainer
-425=COleControlLock::COleControlLock
-426=COleControlSite::COleControlSite
-427=COleConvertDialog::COleConvertDialog
-428=COleCurrency::COleCurrency
-429=COleDataObject::COleDataObject
-430=COleDataSource::COleDataSource
-431=COleDialog::COleDialog
-432=COleDispatchDriver::COleDispatchDriver
-433=COleDispatchDriver::COleDispatchDriver
-434=COleDispatchDriver::COleDispatchDriver
-435=COleDispatchException::COleDispatchException
-436=COleDocIPFrameWnd::COleDocIPFrameWnd
-437=COleDocument::COleDocument
-438=COleDropSource::COleDropSource
-439=COleDropTarget::COleDropTarget
-440=COleFrameHook::COleFrameHook
-441=COleInsertDialog::COleInsertDialog
-442=COleIPFrameWnd::COleIPFrameWnd
-443=COleLinkingDoc::COleLinkingDoc
-444=COleLinksDialog::COleLinksDialog
-445=COleMessageFilter::COleMessageFilter
-446=COleObjectFactory::COleObjectFactory
-447=COlePasteSpecialDialog::COlePasteSpecialDialog
-448=COlePropertiesDialog::COlePropertiesDialog
-449=COlePropertyPage::COlePropertyPage
-450=COleResizeBar::COleResizeBar
-451=COleSafeArray::COleSafeArray
-452=COleSafeArray::COleSafeArray
-453=COleSafeArray::COleSafeArray
-454=COleSafeArray::COleSafeArray
-455=COleSafeArray::COleSafeArray
-456=COleServerDoc::COleServerDoc
-457=COleServerItem::COleServerItem
-458=COleStreamFile::COleStreamFile
-459=COleTemplateServer::COleTemplateServer
-460=COleUILinkInfo::COleUILinkInfo
-461=COleUpdateDialog::COleUpdateDialog
-462=COleVariant::COleVariant
-463=COleVariant::COleVariant
-464=COleVariant::COleVariant
-465=COleVariant::COleVariant
-466=COleVariant::COleVariant
-467=COleVariant::COleVariant
-468=COleVariant::COleVariant
-469=CPageSetupDialog::CPageSetupDialog
-470=CPaintDC::CPaintDC
-471=CPalette::CPalette
-472=CPen::CPen
-473=CPen::CPen
-474=CPen::CPen
-475=CPictureHolder::CPictureHolder
-476=CPicturePropPage::CPicturePropPage
-477=CPoint::CPoint
-478=CPoint::CPoint
-479=CPreviewDC::CPreviewDC
-480=CPreviewView::CPreviewView
-481=CPrintDialog::CPrintDialog
-482=CPrintDialog::CPrintDialog
-483=CPrintInfo::CPrintInfo
-484=CPrintPreviewState::CPrintPreviewState
-485=CProgressCtrl::CProgressCtrl
-486=CPropbagPropExchange::CPropbagPropExchange
-487=CProperty::CProperty
-488=CProperty::CProperty
-489=CPropertyPage::CPropertyPage
-490=CPropertyPage::CPropertyPage
-491=CPropertyPage::CPropertyPage
-492=CPropertySection::CPropertySection
-493=CPropertySection::CPropertySection
-494=CPropertySet::CPropertySet
-495=CPropertySet::CPropertySet
-496=CPropertySheet::CPropertySheet
-497=CPropertySheet::CPropertySheet
-498=CPropertySheet::CPropertySheet
-499=CPropsetPropExchange::CPropsetPropExchange
-500=CPtrArray::CPtrArray
-501=CPtrList::CPtrList
-502=CRecentFileList::CRecentFileList
-503=CRecordset::CRecordset
-504=CRecordView::CRecordView
-505=CRecordView::CRecordView
-506=CRectTracker::CRectTracker
-507=CRectTracker::CRectTracker
-508=CReObject::CReObject
-509=CReObject::CReObject
-510=CResetPropExchange::CResetPropExchange
-511=CRgn::CRgn
-512=CRichEditCntrItem::CRichEditCntrItem
-513=CRichEditCtrl::CRichEditCtrl
-514=CRichEditDoc::CRichEditDoc
-515=CRichEditView::CRichEditView
-516=CScrollBar::CScrollBar
-517=CScrollView::CScrollView
-518=CSemaphore::CSemaphore
-519=CSharedFile::CSharedFile
-520=CSingleDocTemplate::CSingleDocTemplate
-521=CSingleLock::CSingleLock
-522=CSliderCtrl::CSliderCtrl
-523=CSocket::CSocket
-524=CSocketFile::CSocketFile
-525=CSocketWnd::CSocketWnd
-526=CSpinButtonCtrl::CSpinButtonCtrl
-527=CSplitterWnd::CSplitterWnd
-528=CStatic::CStatic
-529=CStatusBar::CStatusBar
-530=CStatusBarCtrl::CStatusBarCtrl
-531=CStdioFile::CStdioFile
-532=CStdioFile::CStdioFile
-533=CStdioFile::CStdioFile
-534=CStockPropPage::CStockPropPage
-535=CString::CString
-536=CString::CString
-537=CString::CString
-538=CString::CString
-539=CString::CString
-540=CString::CString
-541=CStringArray::CStringArray
-542=CStringList::CStringList
-543=CSyncObject::CSyncObject
-544=CTabCtrl::CTabCtrl
-545=CTestCmdUI::CTestCmdUI
-546=CThreadSlotData::CThreadSlotData
-547=CTime::CTime
-548=CTime::CTime
-549=CTime::CTime
-550=CTime::CTime
-551=CTime::CTime
-552=CTime::CTime
-553=CTimeSpan::CTimeSpan
-554=CToolBar::CToolBar
-555=CToolBarCtrl::CToolBarCtrl
-556=CToolTipCtrl::CToolTipCtrl
-557=CTreeCtrl::CTreeCtrl
-558=CTreeView::CTreeView
-559=CUIntArray::CUIntArray
-560=CView::CView
-561=CWinApp::CWinApp
-562=CWindowDC::CWindowDC
-563=CWindowlessDC::CWindowlessDC
-564=CWinThread::CWinThread
-565=CWinThread::CWinThread
-566=CWnd::CWnd
-567=CWnd::CWnd
-568=CWordArray::CWordArray
-569=CPreviewView::PAGE_INFO::PAGE_INFO
-570=tagFONTOBJECT::tagFONTOBJECT
-571=_CIP<IBindCtx&_GUIDconstIID_IBindCtx>::~_CIP<IBindCtx&_GUIDconstIID_IBindCtx>
-572=_CIP<IBindHost&_GUIDconstIID_IBindHost>::~_CIP<IBindHost&_GUIDconstIID_IBindHost>
-573=_CIP<IBinding&_GUIDconstIID_IBinding>::~_CIP<IBinding&_GUIDconstIID_IBinding>
-574=_CIP<IMoniker&_GUIDconstIID_IMoniker>::~_CIP<IMoniker&_GUIDconstIID_IMoniker>
-575=_CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>::~_CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>
-576=_CIP<IStream&_GUIDconstIID_IStream>::~_CIP<IStream&_GUIDconstIID_IStream>
-577=CIP<IBindCtx&_GUIDconstIID_IBindCtx>::~CIP<IBindCtx&_GUIDconstIID_IBindCtx>
-578=CIP<IBindHost&_GUIDconstIID_IBindHost>::~CIP<IBindHost&_GUIDconstIID_IBindHost>
-579=CIP<IBinding&_GUIDconstIID_IBinding>::~CIP<IBinding&_GUIDconstIID_IBinding>
-580=CIP<IMoniker&_GUIDconstIID_IMoniker>::~CIP<IMoniker&_GUIDconstIID_IMoniker>
-581=CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>::~CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>
-582=CIP<IStream&_GUIDconstIID_IStream>::~CIP<IStream&_GUIDconstIID_IStream>
-583=CThreadLocal<AFX_MODULE_THREAD_STATE>::~CThreadLocal<AFX_MODULE_THREAD_STATE>
-584=_AFX_CHECKLIST_STATE::~_AFX_CHECKLIST_STATE
-585=_AFX_CTL3D_STATE::~_AFX_CTL3D_STATE
-586=_AFX_CTL3D_THREAD::~_AFX_CTL3D_THREAD
-587=_AFX_DAO_STATE::~_AFX_DAO_STATE
-588=_AFX_DB_STATE::~_AFX_DB_STATE
-589=_AFX_EDIT_STATE::~_AFX_EDIT_STATE
-590=???1_AFX_EXTDLL_STATE@@UAE@XZ@@YAXXZ
-591=_AFX_MAIL_STATE::~_AFX_MAIL_STATE
-592=_AFX_OLE_STATE::~_AFX_OLE_STATE
-593=_AFX_RICHEDIT_STATE::~_AFX_RICHEDIT_STATE
-594=_AFX_SOCK_STATE::~_AFX_SOCK_STATE
-595=_AFX_THREAD_STATE::~_AFX_THREAD_STATE
-596=_AFX_WIN_STATE::~_AFX_WIN_STATE
-597=_AFXCTL_UIACTIVE_INFO::~_AFXCTL_UIACTIVE_INFO
-598=???1AFX_COM@@QAE@XZ@@YAXXZ
-599=AFX_MAINTAIN_STATE::~AFX_MAINTAIN_STATE
-600=AFX_MODULE_STATE::~AFX_MODULE_STATE
-601=AFX_MODULE_THREAD_STATE::~AFX_MODULE_THREAD_STATE
-602=CAnimateCtrl::~CAnimateCtrl
-603=CArchive::~CArchive
-604=CAsyncMonikerFile::~CAsyncMonikerFile
-605=CAsyncSocket::~CAsyncSocket
-606=CBitmap::~CBitmap
-607=CBitmapButton::~CBitmapButton
-608=CBrush::~CBrush
-609=CButton::~CButton
-610=CByteArray::~CByteArray
-611=CCachedDataPathProperty::~CCachedDataPathProperty
-612=CCheckListBox::~CCheckListBox
-613=CClientDC::~CClientDC
-614=CCmdTarget::~CCmdTarget
-615=CColorButton::~CColorButton
-616=CComboBox::~CComboBox
-617=CCommandLineInfo::~CCommandLineInfo
-618=CCommonDialog::~CCommonDialog
-619=CConnectionPoint::~CConnectionPoint
-620=CControlBar::~CControlBar
-621=CCriticalSection::~CCriticalSection
-622=CCtrlView::~CCtrlView
-623=CDaoDatabase::~CDaoDatabase
-624=CDaoException::~CDaoException
-625=CDaoFieldInfo::~CDaoFieldInfo
-626=CDaoIndexFieldInfo::~CDaoIndexFieldInfo
-627=CDaoIndexInfo::~CDaoIndexInfo
-628=CDaoQueryDef::~CDaoQueryDef
-629=CDaoRecordset::~CDaoRecordset
-630=CDaoRecordView::~CDaoRecordView
-631=CDaoRelationFieldInfo::~CDaoRelationFieldInfo
-632=CDaoRelationInfo::~CDaoRelationInfo
-633=CDaoTableDef::~CDaoTableDef
-634=CDaoWorkspace::~CDaoWorkspace
-635=CDatabase::~CDatabase
-636=CDataPathProperty::~CDataPathProperty
-637=CDataSourceControl::~CDataSourceControl
-638=CDBException::~CDBException
-639=CDBVariant::~CDBVariant
-640=CDC::~CDC
-641=CDialog::~CDialog
-642=CDialogBar::~CDialogBar
-643=CDialogTemplate::~CDialogTemplate
-644=CDocItem::~CDocItem
-645=CDockBar::~CDockBar
-646=CDockContext::~CDockContext
-647=CDockState::~CDockState
-648=CDocManager::~CDocManager
-649=CDocObjectServer::~CDocObjectServer
-650=CDocObjectServerItem::~CDocObjectServerItem
-651=CDocTemplate::~CDocTemplate
-652=CDocument::~CDocument
-653=CDragListBox::~CDragListBox
-654=CDWordArray::~CDWordArray
-655=CDynLinkLibrary::~CDynLinkLibrary
-656=CEdit::~CEdit
-657=CEditView::~CEditView
-658=CEnumArray::~CEnumArray
-659=CEnumConnPoints::~CEnumConnPoints
-660=CEnumFormatEtc::~CEnumFormatEtc
-661=CEnumOleVerb::~CEnumOleVerb
-662=CEnumUnknown::~CEnumUnknown
-663=CEvent::~CEvent
-664=CException::~CException
-665=CFile::~CFile
-666=CFileDialog::~CFileDialog
-667=CFileException::~CFileException
-668=CFileFind::~CFileFind
-669=CFont::~CFont
-670=CFontComboBox::~CFontComboBox
-671=CFontDialog::~CFontDialog
-672=CFontHolder::~CFontHolder
-673=CFormView::~CFormView
-674=CFrameWnd::~CFrameWnd
-675=CFtpConnection::~CFtpConnection
-676=CFtpFileFind::~CFtpFileFind
-677=CGdiObject::~CGdiObject
-678=CGopherConnection::~CGopherConnection
-679=CGopherFile::~CGopherFile
-680=CGopherFileFind::~CGopherFileFind
-681=CGopherLocator::~CGopherLocator
-682=CHeaderCtrl::~CHeaderCtrl
-683=CHotKeyCtrl::~CHotKeyCtrl
-684=CHttpConnection::~CHttpConnection
-685=CHttpFile::~CHttpFile
-686=CImageList::~CImageList
-687=CInternetConnection::~CInternetConnection
-688=CInternetException::~CInternetException
-689=CInternetFile::~CInternetFile
-690=CInternetSession::~CInternetSession
-691=COleServerItem::CItemDataSource::~CItemDataSource
-692=CListBox::~CListBox
-693=CListCtrl::~CListCtrl
-694=CListView::~CListView
-695=CLongBinary::~CLongBinary
-696=CMapPtrToPtr::~CMapPtrToPtr
-697=CMapPtrToWord::~CMapPtrToWord
-698=CMapStringToOb::~CMapStringToOb
-699=CMapStringToPtr::~CMapStringToPtr
-700=CMapStringToString::~CMapStringToString
-701=CMapWordToOb::~CMapWordToOb
-702=CMapWordToPtr::~CMapWordToPtr
-703=CMemFile::~CMemFile
-704=CMenu::~CMenu
-705=CMetaFileDC::~CMetaFileDC
-706=CMiniFrameWnd::~CMiniFrameWnd
-707=CMirrorFile::~CMirrorFile
-708=CMonikerFile::~CMonikerFile
-709=CMultiDocTemplate::~CMultiDocTemplate
-710=CMultiLock::~CMultiLock
-711=CMutex::~CMutex
-712=CNoTrackObject::~CNoTrackObject
-713=CObArray::~CObArray
-714=CObject::~CObject
-715=CObList::~CObList
-716=CODBCFieldInfo::~CODBCFieldInfo
-717=COleBusyDialog::~COleBusyDialog
-718=COleChangeIconDialog::~COleChangeIconDialog
-719=COleChangeSourceDialog::~COleChangeSourceDialog
-720=COleClientItem::~COleClientItem
-721=COleCmdUI::~COleCmdUI
-722=COleCntrFrameWnd::~COleCntrFrameWnd
-723=COleControl::~COleControl
-724=COleControlContainer::~COleControlContainer
-725=COleControlLock::~COleControlLock
-726=COleControlSite::~COleControlSite
-727=COleConvertDialog::~COleConvertDialog
-728=COleDataObject::~COleDataObject
-729=COleDataSource::~COleDataSource
-730=COleDialog::~COleDialog
-731=COleDispatchDriver::~COleDispatchDriver
-732=COleDispatchException::~COleDispatchException
-733=COleDocIPFrameWnd::~COleDocIPFrameWnd
-734=COleDocument::~COleDocument
-735=COleDropSource::~COleDropSource
-736=COleDropTarget::~COleDropTarget
-737=COleFrameHook::~COleFrameHook
-738=COleInsertDialog::~COleInsertDialog
-739=COleIPFrameWnd::~COleIPFrameWnd
-740=COleLinkingDoc::~COleLinkingDoc
-741=COleLinksDialog::~COleLinksDialog
-742=COleMessageFilter::~COleMessageFilter
-743=COleObjectFactory::~COleObjectFactory
-744=COlePasteSpecialDialog::~COlePasteSpecialDialog
-745=COlePropertiesDialog::~COlePropertiesDialog
-746=COlePropertyPage::~COlePropertyPage
-747=COleResizeBar::~COleResizeBar
-748=COleServerDoc::~COleServerDoc
-749=COleServerItem::~COleServerItem
-750=COleStreamFile::~COleStreamFile
-751=COleTemplateServer::~COleTemplateServer
-752=COleUpdateDialog::~COleUpdateDialog
-753=COleVariant::~COleVariant
-754=CPageSetupDialog::~CPageSetupDialog
-755=CPaintDC::~CPaintDC
-756=CPalette::~CPalette
-757=CPen::~CPen
-758=CPictureHolder::~CPictureHolder
-759=CPicturePropPage::~CPicturePropPage
-760=CPreviewDC::~CPreviewDC
-761=CPreviewView::~CPreviewView
-762=CPrintDialog::~CPrintDialog
-763=CPrintInfo::~CPrintInfo
-764=CProcessLocalObject::~CProcessLocalObject
-765=CProgressCtrl::~CProgressCtrl
-766=CPropbagPropExchange::~CPropbagPropExchange
-767=CProperty::~CProperty
-768=CPropertyPage::~CPropertyPage
-769=CPropertySection::~CPropertySection
-770=CPropertySet::~CPropertySet
-771=CPropertySheet::~CPropertySheet
-772=CPtrArray::~CPtrArray
-773=CPtrList::~CPtrList
-774=CRecentFileList::~CRecentFileList
-775=CRecordset::~CRecordset
-776=CRecordView::~CRecordView
-777=CRectTracker::~CRectTracker
-778=CReObject::~CReObject
-779=CRgn::~CRgn
-780=CRichEditCntrItem::~CRichEditCntrItem
-781=CRichEditCtrl::~CRichEditCtrl
-782=CRichEditView::~CRichEditView
-783=CScrollBar::~CScrollBar
-784=CScrollView::~CScrollView
-785=CSemaphore::~CSemaphore
-786=CSharedFile::~CSharedFile
-787=CSimpleException::~CSimpleException
-788=CSingleDocTemplate::~CSingleDocTemplate
-789=CSizeComboBox::~CSizeComboBox
-790=CSliderCtrl::~CSliderCtrl
-791=CSocket::~CSocket
-792=CSocketFile::~CSocketFile
-793=CSpinButtonCtrl::~CSpinButtonCtrl
-794=CSplitterWnd::~CSplitterWnd
-795=CStatic::~CStatic
-796=CStatusBar::~CStatusBar
-797=CStatusBarCtrl::~CStatusBarCtrl
-798=CStdioFile::~CStdioFile
-799=CStockPropPage::~CStockPropPage
-800=CString::~CString
-801=CStringArray::~CStringArray
-802=CStringList::~CStringList
-803=CSyncObject::~CSyncObject
-804=CTabCtrl::~CTabCtrl
-805=CThreadLocalObject::~CThreadLocalObject
-806=CThreadSlotData::~CThreadSlotData
-807=CToolBar::~CToolBar
-808=CToolBarCtrl::~CToolBarCtrl
-809=CToolTipCtrl::~CToolTipCtrl
-810=CTreeCtrl::~CTreeCtrl
-811=CTreeView::~CTreeView
-812=CUIntArray::~CUIntArray
-813=CView::~CView
-814=CWaitCursor::~CWaitCursor
-815=CWinApp::~CWinApp
-816=CWindowDC::~CWindowDC
-817=CWinThread::~CWinThread
-818=CWnd::~CWnd
-819=CWordArray::~CWordArray
-820=tagFONTOBJECT::~tagFONTOBJECT
-821=COleControl::XEventConnPt::~XEventConnPt
-822=COleControl::XPropConnPt::~XPropConnPt
-823=operatornew
-824=CNoTrackObject::operatornew
-825=operatordelete
-826=CNoTrackObject::operatordelete
-827=CObject::operatordelete
-828=_CIP<IBindHost&_GUIDconstIID_IBindHost>::operator
-829=COleCurrency::operator
-830=COleCurrency::operator
-831=COleCurrency::operator
-832=COleDateTime::operator
-833=COleDateTime::operator
-834=COleDateTime::operator
-835=COleDateTime::operator
-836=COleDateTime::operator
-837=COleDateTimeSpan::operator
-838=COleDateTimeSpan::operator
-839=COleDispatchDriver::operator
-840=COleSafeArray::operator
-841=COleSafeArray::operator
-842=COleSafeArray::operator
-843=COleSafeArray::operator
-844=COleVariant::operator
-845=COleVariant::operator
-846=COleVariant::operator
-847=COleVariant::operator
-848=COleVariant::operator
-849=COleVariant::operator
-850=COleVariant::operator
-851=COleVariant::operator
-852=COleVariant::operator
-853=COleVariant::operator
-854=COleVariant::operator
-855=COleVariant::operator
-856=COleVariant::operator
-857=COleVariant::operator
-858=CString::operator
-859=CString::operator
-860=CString::operator
-861=CString::operator
-862=operator>>
-863=operator>>
-864=operator>>
-865=operator>>
-866=operator>>
-867=operator>>
-868=operator>>
-869=operator>>
-870=operator>>
-871=operator>>
-872=operator>>
-873=operator>>
-874=operator>>
-875=operator>>
-876=operator>>
-877=operator>>
-878=operator>>
-879=operator>>
-880=operator>>
-881=operator>>
-882=operator<<
-883=operator<<
-884=operator<<
-885=operator<<
-886=operator<<
-887=operator<<
-888=operator<<
-889=CDumpContext::operator<<
-890=CDumpContext::operator<<
-891=CDumpContext::operator<<
-892=CDumpContext::operator<<
-893=CDumpContext::operator<<
-894=CDumpContext::operator<<
-895=CDumpContext::operator<<
-896=CDumpContext::operator<<
-897=CDumpContext::operator<<
-898=CDumpContext::operator<<
-899=CDumpContext::operator<<
-900=COleSafeArray::operator
-901=COleSafeArray::operator
-902=COleSafeArray::operator
-903=COleSafeArray::operator
-904=COleSafeArray::operator
-905=COleSafeArray::operator
-906=COleVariant::operator
-907=CTime::operator
-908=CTime::operator!
-909=CMapPtrToPtr::operator[]
-910=CMapPtrToWord::operator[]
-911=CMapStringToOb::operator[]
-912=CMapStringToPtr::operator[]
-913=CMapStringToString::operator[]
-914=CMapWordToOb::operator[]
-915=CMapWordToPtr::operator[]
-916=COleCurrency::operator*
-917=COleCurrency::operator-
-918=COleCurrency::operator-
-919=COleDateTime::operator-
-920=COleDateTime::operator-
-921=COleDateTimeSpan::operator-
-922=operator+
-923=operator+
-924=operator+
-925=operator+
-926=operator+
-927=COleCurrency::operator+
-928=COleDateTime::operator+
-929=COleDateTimeSpan::operator+
-930=COleCurrency::operator/
-931=COleCurrency::operator<
-932=COleDateTime::operator<
-933=COleCurrency::operator<
-934=COleDateTime::operator<
-935=COleCurrency::operator>
-936=COleDateTime::operator>
-937=COleCurrency::operator>
-938=COleDateTime::operator>
-939=CString::operator+
-940=CString::operator+
-941=CString::operator+
-942=_AfxAbortProc
-943=??_afxAdvApi@@3UAFX_ADVAPI_CALL@@A@@YAXXZ
-944=CThreadLocal<_AFXCTL_AMBIENT_CACHE>_afxAmbientCache
-945=??_afxComDlg@@3UAFX_COMDLG_CALL@@A@@YAXXZ
-946=??_afxCommCtrl@@3UAFX_COMMCTRL_CALL@@A@@YAXXZ
-947=intconst_afxDBCS
-948=??_afxODBC@@3UAFX_ODBC_CALL@@A@@YAXXZ
-949=??_afxOLE@@3UAFX_OLE_CALL@@A@@YAXXZ
-950=CProcessLocal<_AFX_RICHEDIT_STATE>_afxRichEditState
-951=??_afxShell@@3UAFX_SHELL_CALL@@A@@YAXXZ
-952=??_afxSOCK@@3UAFX_SOCK_CALL@@A@@YAXXZ
-953=??_afxUrlMon@@3UAFX_URLMON_CALL@@A@@YAXXZ
-954=??_afxWinSpool@@3UAFX_WINSPOOL_CALL@@A@@YAXXZ
-955=_mbstowcsz
-956=_wcstombsz
-957=CArchive::Abort
-958=CFile::Abort
-959=CInternetFile::Abort
-960=CMemFile::Abort
-961=CMirrorFile::Abort
-962=COleStreamFile::Abort
-963=CSocketFile::Abort
-964=CStdioFile::Abort
-965=COleControlSite::XNotifyDBEvents::AboutToDo
-966=CAsyncSocket::Accept
-967=CSocket::Accept
-968=COleSafeArray::AccessData
-969=COleClientItem::Activate
-970=COlePropertyPage::XPropertyPage::Activate
-971=COleClientItem::ActivateAs
-972=CRichEditCntrItem::ActivateAs
-973=CDocObjectServer::ActivateDocObject
-974=COleServerDoc::ActivateDocObject
-975=CFrameWnd::ActivateFrame
-976=CMDIChildWnd::ActivateFrame
-977=COleServerDoc::ActivateInPlace
-978=CSplitterWnd::ActivateNext
-979=CWnd::ActivateTopParent
-980=CRecentFileList::Add
-981=CToolBarCtrl::AddBitmap
-982=CToolBarCtrl::AddBitmap
-983=COleClientItem::AddCachedData
-984=CEnumConnPoints::AddConnPoint
-985=CDocManager::AddDocTemplate
-986=CWinApp::AddDocTemplate
-987=CDocTemplate::AddDocument
-988=CMultiDocTemplate::AddDocument
-989=CSingleDocTemplate::AddDocument
-990=CFontComboBox::AddFont
-991=CEnumFormatEtc::AddFormat
-992=COlePasteSpecialDialog::AddFormat
-993=COlePasteSpecialDialog::AddFormat
-994=COleControl::AddFrameLevelUI
-995=CFrameWnd::AddFrameWnd
-996=CObList::AddHead
-997=CObList::AddHead
-998=CPtrList::AddHead
-999=CPtrList::AddHead
-1000=CSimpleList::AddHead
-1001=CStringList::AddHead
-1002=CStringList::AddHead
-1003=COleDocument::AddItem
-1004=COlePasteSpecialDialog::AddLinkEntry
-1005=CDaoRecordset::AddNew
-1006=CRecordset::AddNew
-1007=COleServerItem::AddOtherClipboardData
-1008=CPropertySheet::AddPage
-1009=CPropertySection::AddProperty
-1010=CPropertySet::AddProperty
-1011=CArchiveStream::AddRef
-1012=CBlobProperty::AddRef
-1013=CInnerUnknown::AddRef
-1014=COleConnPtContainer::AddRef
-1015=COleDispatchImpl::AddRef
-1016=COleUILinkInfo::AddRef
-1017=COleClientItem::XAdviseSink::AddRef
-1018=COleControlSite::XAmbientProps::AddRef
-1019=COleControlSite::XBoundObjectSite::AddRef
-1020=COleObjectFactory::XClassFactory::AddRef
-1021=CConnectionPoint::XConnPt::AddRef
-1022=COleControl::XDataObject::AddRef
-1023=COleDataSource::XDataObject::AddRef
-1024=COleServerDoc::XDataObject::AddRef
-1025=COleServerItem::XDataObject::AddRef
-1026=COleDropSource::XDropSource::AddRef
-1027=COleDropTarget::XDropTarget::AddRef
-1028=CEnumArray::XEnumVOID::AddRef
-1029=COleControlSite::XEventSink::AddRef
-1030=COleControl::XFontNotification::AddRef
-1031=COleMessageFilter::XMessageFilter::AddRef
-1032=COleControlSite::XNotifyDBEvents::AddRef
-1033=COleControl::XOleCache::AddRef
-1034=COleClientItem::XOleClientSite::AddRef
-1035=COleControlSite::XOleClientSite::AddRef
-1036=CDocObjectServer::XOleCommandTarget::AddRef
-1037=COleControlContainer::XOleContainer::AddRef
-1038=COleControl::XOleControl::AddRef
-1039=COleControlSite::XOleControlSite::AddRef
-1040=CDocObjectServer::XOleDocument::AddRef
-1041=CDocObjectServer::XOleDocumentView::AddRef
-1042=COleControl::XOleInPlaceActiveObject::AddRef
-1043=COleServerDoc::XOleInPlaceActiveObject::AddRef
-1044=COleFrameHook::XOleInPlaceFrame::AddRef
-1045=COleControl::XOleInPlaceObject::AddRef
-1046=COleServerDoc::XOleInPlaceObject::AddRef
-1047=COleControlContainer::XOleIPFrame::AddRef
-1048=COleClientItem::XOleIPSite::AddRef
-1049=COleControlSite::XOleIPSite::AddRef
-1050=COleLinkingDoc::XOleItemContainer::AddRef
-1051=CDocObjectServer::XOleObject::AddRef
-1052=COleControl::XOleObject::AddRef
-1053=COleServerDoc::XOleObject::AddRef
-1054=COleServerItem::XOleObject::AddRef
-1055=COlePropertiesDialog::XOleUIObjInfo::AddRef
-1056=COleControl::XPerPropertyBrowsing::AddRef
-1057=COleLinkingDoc::XPersistFile::AddRef
-1058=COleControl::XPersistMemory::AddRef
-1059=COleControl::XPersistPropertyBag::AddRef
-1060=COleControl::XPersistStorage::AddRef
-1061=COleServerDoc::XPersistStorage::AddRef
-1062=COleControl::XPersistStreamInit::AddRef
-1063=COleControl::XPointerInactive::AddRef
-1064=CDocObjectServer::XPrint::AddRef
-1065=COleControlSite::XPropertyNotifySink::AddRef
-1066=COlePropertyPage::XPropertyPage::AddRef
-1067=COlePropertyPage::XPropNotifySink::AddRef
-1068=COleControl::XProvideClassInfo::AddRef
-1069=COleControl::XQuickActivate::AddRef
-1070=CRichEditView::XRichEditOleCallback::AddRef
-1071=COleControl::XSpecifyPropertyPages::AddRef
-1072=COleControl::XViewObject::AddRef
-1073=CToolBar::AddReplaceBitmap
-1074=CHttpFile::AddRequestHeaders
-1075=CHttpFile::AddRequestHeaders
-1076=CPropertySet::AddSection
-1077=CPropertySet::AddSection
-1078=CSizeComboBox::AddSize
-1079=COlePasteSpecialDialog::AddStandardFormats
-1080=CToolBarCtrl::AddString
-1081=CObList::AddTail
-1082=CObList::AddTail
-1083=CPtrList::AddTail
-1084=CPtrList::AddTail
-1085=CStringList::AddTail
-1086=CStringList::AddTail
-1087=CToolTipCtrl::AddTool
-1088=CToolTipCtrl::AddTool
-1089=CWinApp::AddToRecentFileList
-1090=CDocument::AddView
-1091=CMetaFileDC::AdjustCP
-1092=CRichEditView::AdjustDialogPosition
-1093=CRectTracker::AdjustRect
-1094=CConnectionPoint::XConnPt::Advise
-1095=CDocObjectServer::XOleObject::Advise
-1096=COleControl::XOleObject::Advise
-1097=COleServerDoc::XOleObject::Advise
-1098=COleServerItem::XOleObject::Advise
-1099=AfxA2WHelper
-1100=AfxAbort
-1101=AfxAllocTaskAnsiString
-1102=AfxAllocTaskAnsiString
-1103=AfxAllocTaskWideString
-1104=AfxAllocTaskWideString
-1105=AfxBeginThread
-1106=AfxBeginThread
-1107=AfxBSTR2ABSTR
-1108=AfxBSTR2CString
-1109=AfxCallWndProc
-1110=AfxCancelModes
-1111=AfxComparePath
-1112=AfxCompareValueByRef
-1113=AfxConnectionAdvise
-1114=AfxConnectionUnadvise
-1115=AfxCopyValueByRef
-1116=AfxCoreInitModule
-1117=AfxCreateDC
-1118=AfxCriticalInit
-1119=AfxCriticalNewHandler
-1120=AfxCriticalTerm
-1121=AfxCustomLogFont
-1122=AfxDaoCheck
-1123=AfxDaoGetEngine
-1124=AfxDaoInit
-1125=AfxDaoTerm
-1126=AUX_DATAafxData
-1127=AfxDeleteObject
-1128=AfxDevModeA2W
-1129=AfxDevModeW2A
-1130=AfxDlgProc
-1131=AfxDllCanUnloadNow
-1132=AfxDllGetClassObject
-1133=AfxDynamicDownCast
-1134=AfxEnableControlContainer
-1135=AfxEnableWin31Compatibility
-1136=AfxEnableWin40Compatibility
-1137=AfxEndDeferRegisterClass
-1138=AfxEndThread
-1139=AfxEnumMetaFileProc
-1140=AfxExtractSubString
-1141=AfxFailMaxChars
-1142=AfxFailRadio
-1143=AfxFieldText
-1144=AfxFieldText
-1145=AfxFindMessageEntry
-1146=AfxFindResourceHandle
-1147=AfxFormatString1
-1148=AfxFormatString2
-1149=AfxFormatStrings
-1150=AfxFormatStrings
-1151=AfxFreeLibrary
-1152=AfxFullPath
-1153=AfxGetAfxWndProc
-1154=AfxGetAppModuleState
-1155=AfxGetClassIDFromString
-1156=AfxGetCtl3dState
-1157=AfxGetDaoState
-1158=AfxGetEmptyString
-1159=AfxGetFieldInfo
-1160=AfxGetFileName
-1161=AfxGetFileTitle
-1162=AfxGetIndexFieldInfo
-1163=AfxGetIndexFields
-1164=AfxGetIndexInfo
-1165=AfxGetInProcServer
-1166=AfxGetInternetHandleType
-1167=AfxGetModuleShortFileName
-1168=AfxGetModuleState
-1169=AfxGetModuleThreadState
-1170=AfxGetNewHandler
-1171=AfxGetParentOwner
-1172=AfxGetPropSheetFont
-1173=AfxGetRichEditState
-1174=AfxGetRoot
-1175=AfxGetThread
-1176=AfxGetThreadState
-1177=AfxGetTypeLibCache
-1178=AfxGlobalFree
-1179=AfxHelpEnabled
-1180=AfxHookWindowCreate
-1181=??AfxINetLoad@@YGXPAP6GHXZPBD@Z@@YAXXZ
-1182=AfxInitExtensionModule
-1183=AfxInitLocalData
-1184=AfxInitThread
-1185=AfxInternetStatusCallback
-1186=AfxIsDescendant
-1187=AfxIsValidAddress
-1188=AfxIsValidString
-1189=AfxIsValidString
-1190=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBD@Z@@YAXXZ
-1191=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBDPAP6GHXZ1@Z@@YAXXZ
-1192=AfxLoadField
-1193=AfxLoadLibrary
-1194=AfxLoadString
-1195=AfxLoadSysColorBitmap
-1196=AfxLockGlobals
-1197=AfxLockTempMaps
-1198=AfxMergeMenus
-1199=AfxMessageBox
-1200=AfxMessageBox
-1201=AfxNewHandler
-1202=AfxOleCanExitApp
-1203=AfxOleGetUserCtrl
-1204=AfxOleHookProc
-1205=AfxOleInit
-1206=AfxOleLockApp
-1207=AfxOleLockControl
-1208=AfxOleLockControl
-1209=AfxOleOnReleaseAllObjects
-1210=AfxOleRegisterControlClass
-1211=AfxOleRegisterHelper
-1212=AfxOleRegisterPropertyPageClass
-1213=AfxOleRegisterPropertyPageClass
-1214=AfxOleRegisterServerClass
-1215=AfxOleRegisterServerClassCompat
-1216=AfxOleRegisterTypeLib
-1217=AfxOleSetEditMenu
-1218=AfxOleSetUserCtrl
-1219=AfxOleTerm
-1220=AfxOleTermOrFreeLib
-1221=AfxOleTypeMatchGuid
-1222=AfxOleUnlockAllControls
-1223=AfxOleUnlockApp
-1224=AfxOleUnlockControl
-1225=AfxOleUnlockControl
-1226=AfxOleUnregisterClass
-1227=AfxOleUnregisterTypeLib
-1228=AfxParseURL
-1229=AfxPostQuitMessage
-1230=AfxPropPageCallback
-1231=AfxPropSheetCallback
-1232=AfxRegisterClass
-1233=AfxRegisterWndClass
-1234=AfxRepositionWindow
-1235=AfxResetMsgCache
-1236=AfxResolveShortcut
-1237=AfxRFXBulkDefault
-1238=AfxSafeArrayInit
-1239=AfxSetCurrentRecord
-1240=AfxSetFieldInfo
-1241=AfxSetIndexFieldInfo
-1242=AfxSetIndexInfo
-1243=AfxSetModuleState
-1244=AfxSetNewHandler
-1245=AfxSetRecordCount
-1246=AfxSetWindowText
-1247=AfxSocketInit
-1248=AfxSocketTerm
-1249=AfxStoreField
-1250=AfxStringFromCLSID
-1251=AfxTaskStringA2W
-1252=AfxTaskStringW2A
-1253=AfxTermExtensionModule
-1254=AfxTermLocalData
-1255=AfxTermThread
-1256=AfxTextFloatFormat
-1257=AfxTextMetricA2W
-1258=AfxTextMetricW2A
-1259=AfxThrowArchiveException
-1260=AfxThrowDaoException
-1261=AfxThrowDBException
-1262=AfxThrowFileException
-1263=AfxThrowInternetException
-1264=AfxThrowLastCleanup
-1265=AfxThrowMemoryException
-1266=AfxThrowNotSupportedException
-1267=AfxThrowOleDispatchException
-1268=AfxThrowOleDispatchException
-1269=AfxThrowOleException
-1270=AfxThrowResourceException
-1271=AfxThrowUserException
-1564=AfxTimeToFileTime
-1565=AfxTlsAddRef
-1566=AfxTlsRelease
-1567=AfxTryCleanup
-1568=AfxUnhookWindowCreate
-1569=AfxUnlockGlobals
-1570=AfxUnlockTempMaps
-1571=AfxUnmergeMenus
-1572=AfxVariantInit
-1573=AfxVerifyLicFile
-1574=AfxW2AHelper
-1575=AfxWinInit
-1576=AfxWinMain
-1577=AfxWinTerm
-1578=AfxWndProc
-1579=AfxWndProcBase
-1580=AfxWndProcDllOle
-1581=CMemFile::Alloc
-1582=CSharedFile::Alloc
-1583=CRecordset::AllocAndCacheFieldInfo
-1584=CString::AllocBeforeWrite
-1585=CString::AllocBuffer
-1586=CDaoRecordset::AllocCache
-1587=CDaoFieldExchange::AllocCacheValue
-1588=CDatabase::AllocConnect
-1589=CString::AllocCopy
-1590=COleSafeArray::AllocData
-1591=CDaoRecordset::AllocDatabase
-1592=CRecordset::AllocDataCache
-1593=COleSafeArray::AllocDescriptor
-1594=CControlBar::AllocElements
-1595=CStatusBar::AllocElements
-1596=CRecordset::AllocHstmt
-1597=AllocLongBinary
-1598=CRecordset::AllocRowset
-1599=CThreadSlotData::AllocSlot
-1600=CRecordset::AllocStatusArrays
-1601=CString::AllocSysString
-1602=CProperty::AllocValue
-1603=COleControl::AmbientAppearance
-1604=COleControl::AmbientBackColor
-1605=COleControl::AmbientDisplayName
-1606=COleControl::AmbientFont
-1607=COleControl::AmbientForeColor
-1608=COleControl::AmbientLocaleID
-1609=COleControl::AmbientScaleUnits
-1610=COleControl::AmbientShowGrabHandles
-1611=COleControl::AmbientShowHatching
-1612=COleControl::AmbientTextAlign
-1613=COleControl::AmbientUIDead
-1614=COleControl::AmbientUserMode
-1615=CByteArray::Append
-1616=CDaoQueryDef::Append
-1617=CDaoTableDef::Append
-1618=CDaoWorkspace::Append
-1619=CDWordArray::Append
-1620=CObArray::Append
-1621=CPtrArray::Append
-1622=CStringArray::Append
-1623=CUIntArray::Append
-1624=CWordArray::Append
-1625=CRecordset::AppendFilterAndSortSQL
-1626=CRecordset::AppendNames
-1627=CRecordset::AppendNamesValues
-1628=CDaoFieldExchange::AppendParamType
-1629=CRecordset::AppendValues
-1630=COlePropertyPage::XPropertyPage::Apply
-1631=COleDocument::ApplyPrintDevice
-1632=COleDocument::ApplyPrintDevice
-1633=CDocObjectServer::XOleDocumentView::ApplyViewState
-1634=CDC::ArcTo
-1635=CObject::AssertValid
-1636=CString::AssignCopy
-1637=CThreadSlotData::AssignInstance
-1638=CAsyncSocket::AsyncSelect
-1639=CAsyncSocket::Attach
-1640=CDC::Attach
-1641=CGdiObject::Attach
-1642=CImageList::Attach
-1643=CMemFile::Attach
-1644=CMenu::Attach
-1645=CMonikerFile::Attach
-1646=CMonikerFile::Attach
-1647=COleDataObject::Attach
-1648=COleSafeArray::Attach
-1649=COleStreamFile::Attach
-1650=COleVariant::Attach
-1651=CWnd::Attach
-1652=COleDataObject::AttachClipboard
-1653=CWnd::AttachControlSite
-1654=CWnd::AttachControlSite
-1655=COleClientItem::AttachDataObject
-1656=COleDispatchDriver::AttachDispatch
-1657=CAsyncSocket::AttachHandle
-1658=CPrintDialog::AttachOnSetup
-1659=COleControlSite::AttachWindow
-1660=CBitmapButton::AutoLoad
-1661=CSocket::AuxQueueAdd
-1662=COleMessageFilter::BeginBusyState
-1663=CDragListBox::BeginDrag
-1664=COleDataObject::BeginEnumFormats
-1665=CFrameWnd::BeginModalState
-1666=CWnd::BeginModalState
-1667=CDaoWorkspace::BeginTrans
-1668=CDatabase::BeginTrans
-1669=CCmdTarget::BeginWaitCursor
-1670=CAsyncSocket::Bind
-1671=CDataSourceControl::BindColumns
-1672=COccManager::BindControls
-1673=COleControlSite::BindDefaultProperty
-1674=CWnd::BindDefaultProperty
-1675=CDaoRecordset::BindFields
-1676=CRecordset::BindFieldsForUpdate
-1677=CRecordset::BindFieldsToColumns
-1678=CDaoRecordset::BindParameters
-1679=CDatabase::BindParameters
-1680=CRecordset::BindParams
-1681=CDataSourceControl::BindProp
-1682=CDataSourceControl::BindProp
-1683=COleControlSite::BindProperty
-1684=CWnd::BindProperty
-1685=COleControl::BoundPropertyChanged
-1686=COleControl::BoundPropertyRequestEdit
-1687=CFrameWnd::BringToTop
-1688=CDBException::BuildErrorString
-1689=CDaoRecordset::BuildParameterList
-1690=CPropertySheet::BuildPropPageArray
-1691=CDaoRecordset::BuildSelectList
-1692=CRecordset::BuildSelectSQL
-1693=COleControl::BuildSharedMenu
-1694=COleDocIPFrameWnd::BuildSharedMenu
-1695=COleIPFrameWnd::BuildSharedMenu
-1696=CDaoRecordset::BuildSQL
-1697=CRecordset::BuildSQL
-1698=CRecordset::BuildUpdateSQL
-1699=COleControl::ButtonDblClk
-1700=COleControl::ButtonDown
-1701=COleControl::ButtonUp
-1702=_AFXCTL_AMBIENT_CACHE::Cache
-1703=CTypeLibCache::Cache
-1704=COleControl::XOleCache::Cache
-1705=COleDataSource::CacheData
-1706=COleDataSource::CacheGlobalData
-1707=CTypeLibCache::CacheTypeInfo
-1708=CMiniFrameWnd::CalcBorders
-1709=CControlBar::CalcDynamicLayout
-1710=CToolBar::CalcDynamicLayout
-1711=CControlBar::CalcFixedLayout
-1712=CDialogBar::CalcFixedLayout
-1713=CDockBar::CalcFixedLayout
-1714=CStatusBar::CalcFixedLayout
-1715=CToolBar::CalcFixedLayout
-1716=CControlBar::CalcInsideRect
-1717=CStatusBar::CalcInsideRect
-1718=CToolBar::CalcLayout
-1719=CCheckListBox::CalcMinimumItemHeight
-1720=CPreviewView::CalcPageDisplaySize
-1721=CPreviewView::CalcScaleRatio
-1722=CToolBar::CalcSize
-1723=CEditView::CalcWindowRect
-1724=CMiniFrameWnd::CalcWindowRect
-1725=CScrollView::CalcWindowRect
-1726=CView::CalcWindowRect
-1727=CWnd::CalcWindowRect
-1728=CCmdTarget::CallMemberFunc
-1729=COleClientItem::CanActivate
-1730=CRichEditCntrItem::CanActivate
-1731=CSplitterWnd::CanActivateNext
-1732=CDaoRecordset::CanAppend
-1733=CDaoRecordset::CanBookmark
-1734=CRecordset::CanBookmark
-1735=CDatabase::Cancel
-1736=CRecordset::Cancel
-1737=CSocket::CancelBlockingCall
-1738=CDragListBox::CancelDrag
-1739=COleControlSite::XNotifyDBEvents::Cancelled
-1740=COleUILinkInfo::CancelLink
-1741=CDockContext::CancelLoop
-1742=CPropertyPage::CancelToClose
-1743=CWnd::CancelToolTips
-1744=CDaoRecordset::CancelUpdate
-1745=CRecordset::CancelUpdate
-1746=CDocument::CanCloseFrame
-1747=COleServerDoc::CanCloseFrame
-1748=COleClientItem::CanCreateFromData
-1749=COleClientItem::CanCreateLinkFromData
-1750=CDockContext::CanDock
-1751=CFrameWnd::CanDock
-1752=CFrameWnd::CanEnterHelpMode
-1753=COleClientItem::XOleIPSite::CanInPlaceActivate
-1754=COleControlSite::XOleIPSite::CanInPlaceActivate
-1755=COleClientItem::CanPaste
-1756=CRichEditCtrl::CanPaste
-1757=CRichEditView::CanPaste
-1758=COleClientItem::CanPasteLink
-1759=CDaoRecordset::CanRestart
-1760=CDaoRecordset::CanScroll
-1761=CDaoDatabase::CanTransact
-1762=CDaoRecordset::CanTransact
-1763=CDaoDatabase::CanUpdate
-1764=CDaoQueryDef::CanUpdate
-1765=CDaoRecordset::CanUpdate
-1766=CDaoTableDef::CanUpdate
-1767=CScrollView::CenterOnPoint
-1768=CWnd::CenterWindow
-1769=CPicturePropPage::ChangePicture
-1770=COleVariant::ChangeType
-1771=CListBox::CharToItem
-1772=CString::CharToOemA
-1773=CDatabase::Check
-1774=CRecordset::Check
-1775=CDialog::CheckAutoCenter
-1776=CWnd::CheckAutoCenter
-1777=CArchive::CheckCount
-1778=COleControlContainer::CheckDlgButton
-1779=CWnd::CheckDlgButton
-1780=CCheckListBox::CheckFromPoint
-1781=COleClientItem::CheckGeneral
-1782=COleControlContainer::CheckRadioButton
-1783=CWnd::CheckRadioButton
-1784=COleDateTime::CheckRange
-1785=COleDateTimeSpan::CheckRange
-1786=CRecordset::CheckRowsetCurrencyStatus
-1787=CRecordset::CheckRowsetError
-1788=CRuntimeClassconstCAnimateCtrl::classCAnimateCtrl
-1789=CRuntimeClassconstCArchiveException::classCArchiveException
-1790=CRuntimeClassconstCAsyncMonikerFile::classCAsyncMonikerFile
-1791=CRuntimeClassconstCAsyncSocket::classCAsyncSocket
-1792=CRuntimeClassconstCBitmap::classCBitmap
-1793=CRuntimeClassconstCBitmapButton::classCBitmapButton
-1794=CRuntimeClassconstCBrush::classCBrush
-1795=CRuntimeClassconstCButton::classCButton
-1796=CRuntimeClassCByteArray::classCByteArray
-1797=CRuntimeClassconstCCheckListBox::classCCheckListBox
-1798=CRuntimeClassconstCClientDC::classCClientDC
-1799=CRuntimeClassconstCCmdTarget::classCCmdTarget
-1800=CRuntimeClassconstCColorDialog::classCColorDialog
-1801=CRuntimeClassconstCColorPropPage::classCColorPropPage
-1802=CRuntimeClassconstCComboBox::classCComboBox
-1803=CRuntimeClassconstCControlBar::classCControlBar
-1804=CRuntimeClassconstCCriticalSection::classCCriticalSection
-1805=CRuntimeClassconstCCtrlView::classCCtrlView
-1806=CRuntimeClassconstCDaoDatabase::classCDaoDatabase
-1807=CRuntimeClassconstCDaoException::classCDaoException
-1808=CRuntimeClassconstCDaoQueryDef::classCDaoQueryDef
-1809=CRuntimeClassconstCDaoRecordset::classCDaoRecordset
-1810=CRuntimeClassconstCDaoRecordView::classCDaoRecordView
-1811=CRuntimeClassconstCDaoTableDef::classCDaoTableDef
-1812=CRuntimeClassconstCDaoWorkspace::classCDaoWorkspace
-1813=CRuntimeClassconstCDatabase::classCDatabase
-1814=CRuntimeClassconstCDBException::classCDBException
-1815=CRuntimeClassconstCDC::classCDC
-1816=CRuntimeClassconstCDialog::classCDialog
-1817=CRuntimeClassconstCDialogBar::classCDialogBar
-1818=CRuntimeClassCDocItem::classCDocItem
-1819=CRuntimeClassconstCDockBar::classCDockBar
-1820=CRuntimeClassCDockState::classCDockState
-1821=CRuntimeClassconstCDocManager::classCDocManager
-1822=CRuntimeClassconstCDocObjectServer::classCDocObjectServer
-1823=CRuntimeClassconstCDocObjectServerItem::classCDocObjectServerItem
-1824=CRuntimeClassconstCDocTemplate::classCDocTemplate
-1825=CRuntimeClassconstCDocument::classCDocument
-1826=CRuntimeClassconstCDragListBox::classCDragListBox
-1827=CRuntimeClassCDWordArray::classCDWordArray
-1828=CRuntimeClassconstCDynLinkLibrary::classCDynLinkLibrary
-1829=CRuntimeClassconstCEdit::classCEdit
-1830=CRuntimeClassconstCEditView::classCEditView
-1831=CRuntimeClassconstCEvent::classCEvent
-1832=CRuntimeClassconstCException::classCException
-1833=CRuntimeClassconstCFile::classCFile
-1834=CRuntimeClassconstCFileDialog::classCFileDialog
-1835=CRuntimeClassconstCFileException::classCFileException
-1836=CRuntimeClassconstCFileFind::classCFileFind
-1837=CRuntimeClassconstCFindReplaceDialog::classCFindReplaceDialog
-1838=CRuntimeClassconstCFont::classCFont
-1839=CRuntimeClassconstCFontDialog::classCFontDialog
-1840=CRuntimeClassconstCFontPropPage::classCFontPropPage
-1841=CRuntimeClassconstCFormView::classCFormView
-1842=CRuntimeClassconstCFrameWnd::classCFrameWnd
-1843=CRuntimeClassconstCGdiObject::classCGdiObject
-1844=CRuntimeClassconstCHeaderCtrl::classCHeaderCtrl
-1845=CRuntimeClassconstCHotKeyCtrl::classCHotKeyCtrl
-1846=CRuntimeClassconstCImageList::classCImageList
-1847=CRuntimeClassconstCListBox::classCListBox
-1848=CRuntimeClassconstCListCtrl::classCListCtrl
-1849=CRuntimeClassconstCListView::classCListView
-1850=CRuntimeClassconstCLongBinary::classCLongBinary
-1851=CRuntimeClassconstCMapPtrToPtr::classCMapPtrToPtr
-1852=CRuntimeClassconstCMapPtrToWord::classCMapPtrToWord
-1853=CRuntimeClassCMapStringToOb::classCMapStringToOb
-1854=CRuntimeClassconstCMapStringToPtr::classCMapStringToPtr
-1855=CRuntimeClassCMapStringToString::classCMapStringToString
-1856=CRuntimeClassCMapWordToOb::classCMapWordToOb
-1857=CRuntimeClassconstCMapWordToPtr::classCMapWordToPtr
-1858=CRuntimeClassconstCMDIChildWnd::classCMDIChildWnd
-1859=CRuntimeClassconstCMDIFrameWnd::classCMDIFrameWnd
-1860=CRuntimeClassconstCMemFile::classCMemFile
-1861=CRuntimeClassconstCMemoryException::classCMemoryException
-1862=CRuntimeClassconstCMenu::classCMenu
-1863=CRuntimeClassconstCMetaFileDC::classCMetaFileDC
-1864=CRuntimeClassconstCMiniDockFrameWnd::classCMiniDockFrameWnd
-1865=CRuntimeClassconstCMiniFrameWnd::classCMiniFrameWnd
-1866=CRuntimeClassconstCMonikerFile::classCMonikerFile
-1867=CRuntimeClassconstCMultiDocTemplate::classCMultiDocTemplate
-1868=CRuntimeClassconstCMutex::classCMutex
-1869=CRuntimeClassconstCNotSupportedException::classCNotSupportedException
-1870=CRuntimeClassCObArray::classCObArray
-1871=CRuntimeClassconstCObject::classCObject
-1872=CRuntimeClassCObList::classCObList
-1873=CRuntimeClassconstCOleBusyDialog::classCOleBusyDialog
-1874=CRuntimeClassconstCOleChangeIconDialog::classCOleChangeIconDialog
-1875=CRuntimeClassconstCOleChangeSourceDialog::classCOleChangeSourceDialog
-1876=CRuntimeClassconstCOleClientItem::classCOleClientItem
-1877=CRuntimeClassconstCOleControl::classCOleControl
-1878=CRuntimeClassconstCOleControlModule::classCOleControlModule
-1879=CRuntimeClassconstCOleConvertDialog::classCOleConvertDialog
-1880=CRuntimeClassconstCOleDialog::classCOleDialog
-1881=CRuntimeClassconstCOleDispatchException::classCOleDispatchException
-1882=CRuntimeClassconstCOleDocIPFrameWnd::classCOleDocIPFrameWnd
-1883=CRuntimeClassconstCOleDocument::classCOleDocument
-1884=CRuntimeClassconstCOleException::classCOleException
-1885=CRuntimeClassconstCOleInsertDialog::classCOleInsertDialog
-1886=CRuntimeClassconstCOleIPFrameWnd::classCOleIPFrameWnd
-1887=CRuntimeClassconstCOleLinkingDoc::classCOleLinkingDoc
-1888=CRuntimeClassconstCOleLinksDialog::classCOleLinksDialog
-1889=CRuntimeClassconstCOleObjectFactory::classCOleObjectFactory
-1890=CRuntimeClassconstCOlePasteSpecialDialog::classCOlePasteSpecialDialog
-1891=CRuntimeClassconstCOlePropertiesDialog::classCOlePropertiesDialog
-1892=CRuntimeClassconstCOlePropertyPage::classCOlePropertyPage
-1893=CRuntimeClassconstCOleResizeBar::classCOleResizeBar
-1894=CRuntimeClassconstCOleServerDoc::classCOleServerDoc
-1895=CRuntimeClassconstCOleServerItem::classCOleServerItem
-1896=CRuntimeClassconstCOleStreamFile::classCOleStreamFile
-1897=CRuntimeClassconstCOleUpdateDialog::classCOleUpdateDialog
-1898=CRuntimeClassconstCPageSetupDialog::classCPageSetupDialog
-1899=CRuntimeClassconstCPaintDC::classCPaintDC
-1900=CRuntimeClassconstCPalette::classCPalette
-1901=CRuntimeClassconstCPen::classCPen
-1902=CRuntimeClassconstCPicturePropPage::classCPicturePropPage
-1903=CRuntimeClassconstCPreviewDC::classCPreviewDC
-1904=CRuntimeClassconstCPreviewView::classCPreviewView
-1905=CRuntimeClassconstCPrintDialog::classCPrintDialog
-1906=CRuntimeClassconstCProgressCtrl::classCProgressCtrl
-1907=CRuntimeClassconstCPropertyPage::classCPropertyPage
-1908=CRuntimeClassconstCPropertySheet::classCPropertySheet
-1909=CRuntimeClassconstCPtrArray::classCPtrArray
-1910=CRuntimeClassconstCPtrList::classCPtrList
-1911=CRuntimeClassconstCRecordset::classCRecordset
-1912=CRuntimeClassconstCRecordView::classCRecordView
-1913=CRuntimeClassconstCResourceException::classCResourceException
-1914=CRuntimeClassconstCRgn::classCRgn
-1915=CRuntimeClassCRichEditCntrItem::classCRichEditCntrItem
-1916=CRuntimeClassconstCRichEditCtrl::classCRichEditCtrl
-1917=CRuntimeClassconstCRichEditDoc::classCRichEditDoc
-1918=CRuntimeClassconstCRichEditView::classCRichEditView
-1919=CRuntimeClassconstCScrollBar::classCScrollBar
-1920=CRuntimeClassconstCScrollView::classCScrollView
-1921=CRuntimeClassconstCSemaphore::classCSemaphore
-1922=CRuntimeClassconstCSharedFile::classCSharedFile
-1923=CRuntimeClassconstCSingleDocTemplate::classCSingleDocTemplate
-1924=CRuntimeClassconstCSliderCtrl::classCSliderCtrl
-1925=CRuntimeClassconstCSocket::classCSocket
-1926=CRuntimeClassconstCSocketFile::classCSocketFile
-1927=CRuntimeClassconstCSpinButtonCtrl::classCSpinButtonCtrl
-1928=CRuntimeClassconstCSplitterWnd::classCSplitterWnd
-1929=CRuntimeClassconstCStatic::classCStatic
-1930=CRuntimeClassconstCStatusBar::classCStatusBar
-1931=CRuntimeClassconstCStatusBarCtrl::classCStatusBarCtrl
-1932=CRuntimeClassconstCStdioFile::classCStdioFile
-1933=CRuntimeClassconstCStockPropPage::classCStockPropPage
-1934=CRuntimeClassCStringArray::classCStringArray
-1935=CRuntimeClassCStringList::classCStringList
-1936=CRuntimeClassconstCSyncObject::classCSyncObject
-1937=CRuntimeClassconstCTabCtrl::classCTabCtrl
-1938=CRuntimeClassconstCToolBar::classCToolBar
-1939=CRuntimeClassconstCToolBarCtrl::classCToolBarCtrl
-1940=CRuntimeClassconstCToolTipCtrl::classCToolTipCtrl
-1941=CRuntimeClassconstCTreeCtrl::classCTreeCtrl
-1942=CRuntimeClassconstCTreeView::classCTreeView
-1943=CRuntimeClassconstCUIntArray::classCUIntArray
-1944=CRuntimeClassconstCUserException::classCUserException
-1945=CRuntimeClassconstCView::classCView
-1946=CRuntimeClassconstCWinApp::classCWinApp
-1947=CRuntimeClassconstCWindowDC::classCWindowDC
-1948=CRuntimeClassconstCWinThread::classCWinThread
-1949=CRuntimeClassconstCWnd::classCWnd
-1950=CRuntimeClassCWordArray::classCWordArray
-1951=CPropertyPage::Cleanup
-1952=COlePropertyPage::CleanupObjectArray
-1953=CDBVariant::Clear
-1954=CDockState::Clear
-1955=COleVariant::Clear
-1956=CDaoRecordset::ClearDirtyFieldStatus
-1957=CRecordset::ClearDirtyFieldStatus
-1958=CRecordset::ClearFieldStatus
-1959=CDaoRecordset::ClearFieldStatusFlags
-1960=CDaoRecordset::ClearNullFieldStatus
-1961=CRecordset::ClearNullFieldStatus
-1962=CRecordset::ClearNullParamStatus
-1963=COleControl::ClientToParent
-1964=COleControl::ClipCaretRect
-1965=CPreviewDC::ClipToPage
-1966=CArchiveStream::Clone
-1967=CEnumArray::XEnumVOID::Clone
-1968=CDocObjectServer::XOleDocumentView::Clone
-1969=CArchive::Close
-1970=CAsyncMonikerFile::Close
-1971=CAsyncSocket::Close
-1972=CCachedDataPathProperty::Close
-1973=CDaoDatabase::Close
-1974=CDaoQueryDef::Close
-1975=CDaoRecordset::Close
-1976=CDaoTableDef::Close
-1977=CDaoWorkspace::Close
-1978=CDatabase::Close
-1979=CFile::Close
-1980=CFileFind::Close
-1981=CFtpConnection::Close
-1982=CGopherConnection::Close
-1983=CGopherFile::Close
-1984=CHttpConnection::Close
-1985=CHttpFile::Close
-1986=CInternetConnection::Close
-1987=CInternetFile::Close
-1988=CInternetSession::Close
-1989=CMemFile::Close
-1990=CMirrorFile::Close
-1991=CMonikerFile::Close
-1992=COleClientItem::Close
-1993=COleStreamFile::Close
-1994=CRecordset::Close
-1995=CSocket::Close
-1996=CSocketFile::Close
-1997=CStdioFile::Close
-1998=CDocObjectServer::XOleObject::Close
-1999=COleControl::XOleObject::Close
-2000=COleServerDoc::XOleObject::Close
-2001=COleServerItem::XOleObject::Close
-2002=CDocManager::CloseAllDocuments
-2003=CDocTemplate::CloseAllDocuments
-2004=CWinApp::CloseAllDocuments
-2005=CFileFind::CloseContext
-2006=CFtpFileFind::CloseContext
-2007=CGopherFileFind::CloseContext
-2008=CDocObjectServer::XOleDocumentView::CloseView
-2009=CColorButton::colGetFaceColor
-2010=AFX_OLECMDMAPconstCCmdTarget::commandMap
-2011=CStatusBar::CommandToIndex
-2012=CToolBar::CommandToIndex
-2013=CArchiveStream::Commit
-2014=COleClientItem::CommitItem
-2015=COleDocument::CommitItems
-2016=CDaoWorkspace::CommitTrans
-2017=CDatabase::CommitTrans
-2018=CPropertyPage::CommonConstruct
-2019=CPropertySheet::CommonConstruct
-2020=CWinThread::CommonConstruct
-2021=CDaoWorkspace::CompactDatabase
-2022=CDaoWorkspace::CompactDatabase
-2023=CComboBox::CompareItem
-2024=CListBox::CompareItem
-2025=CDaoFieldExchange::CompareValue
-2026=CPreviewDC::ComputeDeltas
-2027=CString::ConcatCopy
-2028=CString::ConcatInPlace
-2029=CAsyncSocket::Connect
-2030=CDatabase::Connect
-2031=CAsyncSocket::ConnectHelper
-2032=CSocket::ConnectHelper
-2033=AFX_CONNECTIONMAPconstCCmdTarget::connectionMap
-2034=AFX_CONNECTIONMAPconstCOleControl::connectionMap
-2035=COleControlSite::ConnectSink
-2036=COleTemplateServer::ConnectTemplate
-2037=COleServerDoc::ConnectView
-2038=CPropertyPage::Construct
-2039=CPropertyPage::Construct
-2040=CPropertySheet::Construct
-2041=CPropertySheet::Construct
-2042=CRectTracker::Construct
-2043=ConstructElements
-2044=ConstructElements
-2045=COleControl::XOleInPlaceActiveObject::ContextSensitiveHelp
-2046=COleServerDoc::XOleInPlaceActiveObject::ContextSensitiveHelp
-2047=COleFrameHook::XOleInPlaceFrame::ContextSensitiveHelp
-2048=COleControl::XOleInPlaceObject::ContextSensitiveHelp
-2049=COleServerDoc::XOleInPlaceObject::ContextSensitiveHelp
-2050=COleControlContainer::XOleIPFrame::ContextSensitiveHelp
-2051=COleClientItem::XOleIPSite::ContextSensitiveHelp
-2052=COleControlSite::XOleIPSite::ContextSensitiveHelp
-2053=CRichEditView::XRichEditOleCallback::ContextSensitiveHelp
-2054=CPropertySheet::ContinueModal
-2055=CWnd::ContinueModal
-2056=COleControl::ControlInfoChanged
-2057=COlePropertiesDialog::XOleUIObjInfo::ConvertObject
-2058=COleClientItem::ConvertTo
-2059=CRichEditCntrItem::ConvertTo
-2060=CByteArray::Copy
-2061=CDWordArray::Copy
-2062=CObArray::Copy
-2063=COleSafeArray::Copy
-2064=CPtrArray::Copy
-2065=CStringArray::Copy
-2066=CUIntArray::Copy
-2067=CWordArray::Copy
-2068=CString::CopyBeforeWrite
-2069=CDataSourceControl::CopyColumnID
-2070=CopyElements
-2071=CopyElements
-2072=CArchiveStream::CopyTo
-2073=COleClientItem::CopyToClipboard
-2074=COleServerItem::CopyToClipboard
-2075=CDaoFieldExchange::CopyValue
-2076=CAnimateCtrl::Create
-2077=CAsyncSocket::Create
-2078=CButton::Create
-2079=CCheckListBox::Create
-2080=CComboBox::Create
-2081=CControlFrameWnd::Create
-2082=CDaoDatabase::Create
-2083=CDaoQueryDef::Create
-2084=CDaoTableDef::Create
-2085=CDaoWorkspace::Create
-2086=CDialog::Create
-2087=CDialogBar::Create
-2088=CDockBar::Create
-2089=CEdit::Create
-2090=CFindReplaceDialog::Create
-2091=CFormView::Create
-2092=CFrameWnd::Create
-2093=CHeaderCtrl::Create
-2094=CHotKeyCtrl::Create
-2095=CImageList::Create
-2096=CImageList::Create
-2097=CImageList::Create
-2098=CImageList::Create
-2099=CListBox::Create
-2100=CListCtrl::Create
-2101=CMDIChildWnd::Create
-2102=CMiniDockFrameWnd::Create
-2103=CMiniFrameWnd::Create
-2104=COleResizeBar::Create
-2105=COleSafeArray::Create
-2106=COleSafeArray::Create
-2107=CPlex::Create
-2108=CProgressCtrl::Create
-2109=CPropertySheet::Create
-2110=CReflectorWnd::Create
-2111=CRichEditCtrl::Create
-2112=CScrollBar::Create
-2113=CSliderCtrl::Create
-2114=CSpinButtonCtrl::Create
-2115=CSplitterWnd::Create
-2116=CStatic::Create
-2117=CStatusBar::Create
-2118=CStatusBarCtrl::Create
-2119=CTabCtrl::Create
-2120=CToolBar::Create
-2121=CToolBarCtrl::Create
-2122=CToolTipCtrl::Create
-2123=CTreeCtrl::Create
-2124=CWnd::Create
-2125=CMonikerFile::CreateBindContext
-2126=CMonikerFile::CreateBindHost
-2127=CMDIFrameWnd::CreateClient
-2128=CRichEditDoc::CreateClientItem
-2129=COleClientItem::CreateCloneFrom
-2130=CSplitterWnd::CreateCommon
-2131=CConnectionPoint::CreateConnectionArray
-2132=COccManager::CreateContainer
-2133=COleControlContainer::CreateControl
-2134=COleControlSite::CreateControl
-2135=CWnd::CreateControl
-2136=CWnd::CreateControl
-2137=COleControl::CreateControlWindow
-2138=CBrush::CreateDIBPatternBrush
-2139=CFtpConnection::CreateDirectoryA
-2140=COleDispatchDriver::CreateDispatch
-2141=COleDispatchDriver::CreateDispatch
-2142=CWnd::CreateDlg
-2143=COccManager::CreateDlgControl
-2144=COccManager::CreateDlgControls
-2145=COccManager::CreateDlgControls
-2146=CWnd::CreateDlgIndirect
-2147=CWnd::CreateDlgIndirect
-2148=CListCtrl::CreateDragImage
-2149=CTreeCtrl::CreateDragImage
-2150=CPictureHolder::CreateEmpty
-2151=CMiniFrameWnd::CreateEx
-2152=CWnd::CreateEx
-2153=CDaoTableDef::CreateField
-2154=CDaoTableDef::CreateField
-2155=CFrameWnd::CreateFloatingFrame
-2156=COleControl::CreateFrameWindow
-2157=CPictureHolder::CreateFromBitmap
-2158=CPictureHolder::CreateFromBitmap
-2159=CPictureHolder::CreateFromBitmap
-2160=COleClientItem::CreateFromClipboard
-2161=COleClientItem::CreateFromData
-2162=COleClientItem::CreateFromFile
-2163=CPictureHolder::CreateFromIcon
-2164=CPictureHolder::CreateFromIcon
-2165=CPictureHolder::CreateFromMetafile
-2166=CDaoTableDef::CreateIndex
-2167=CDialog::CreateIndirect
-2168=CDialog::CreateIndirect
-2169=CDialog::CreateIndirect
-2170=CDialog::CreateIndirect
-2171=COleServerDoc::CreateInPlaceFrame
-2172=AFX_COM::CreateInstance
-2173=COleObjectFactory::XClassFactory::CreateInstance
-2174=COleObjectFactory::XClassFactory::CreateInstanceLic
-2175=COleInsertDialog::CreateItem
-2176=COlePasteSpecialDialog::CreateItem
-2177=COleClientItem::CreateLinkFromClipboard
-2178=COleClientItem::CreateLinkFromData
-2179=COleClientItem::CreateLinkFromFile
-2180=CGopherConnection::CreateLocator
-2181=CGopherConnection::CreateLocator
-2182=CGopherConnection::CreateLocator
-2183=COleStreamFile::CreateMemoryStream
-2184=CDocTemplate::CreateNewDocument
-2185=CDocTemplate::CreateNewFrame
-2186=COleClientItem::CreateNewItem
-2187=CProcessLocal<_AFX_PROPPAGEFONTINFO>::CreateObject
-2188=CProcessLocal<_AFX_BASE_MODULE_STATE>::CreateObject
-2189=CProcessLocal<_AFX_CHECKLIST_STATE>::CreateObject
-2190=CProcessLocal<_AFX_COLOR_STATE>::CreateObject
-2191=CProcessLocal<_AFX_CTL3D_STATE>::CreateObject
-2192=CProcessLocal<_AFX_DB_STATE>::CreateObject
-2193=CProcessLocal<_AFX_EDIT_STATE>::CreateObject
-2194=??CreateObject@?$CProcessLocal@V_AFX_EXTDLL_STATE@@@@SGPAVCNoTrackObject@@XZ@@YAXXZ
-2195=CProcessLocal<_AFX_MAIL_STATE>::CreateObject
-2196=CProcessLocal<_AFX_OLE_STATE>::CreateObject
-2197=CProcessLocal<_AFX_RICHEDIT_STATE>::CreateObject
-2198=CProcessLocal<_AFX_SOCK_STATE>::CreateObject
-2199=CProcessLocal<_AFX_WIN_STATE>::CreateObject
-2200=CProcessLocal<COccManager>::CreateObject
-2201=CThreadLocal<_AFX_CTL3D_THREAD>::CreateObject
-2202=CThreadLocal<_AFX_THREAD_STATE>::CreateObject
-2203=CThreadLocal<_AFXCTL_AMBIENT_CACHE>::CreateObject
-2204=CThreadLocal<AFX_MODULE_THREAD_STATE>::CreateObject
-2205=CByteArray::CreateObject
-2206=CColorPropPage::CreateObject
-2207=CDC::CreateObject
-2208=CDocItem::CreateObject
-2209=CDockState::CreateObject
-2210=CDWordArray::CreateObject
-2211=CEditView::CreateObject
-2212=CFontPropPage::CreateObject
-2213=CFrameWnd::CreateObject
-2214=CGdiObject::CreateObject
-2215=CImageList::CreateObject
-2216=CListView::CreateObject
-2217=CMapStringToOb::CreateObject
-2218=CMapStringToString::CreateObject
-2219=CMapWordToOb::CreateObject
-2220=CMDIChildWnd::CreateObject
-2221=CMDIFrameWnd::CreateObject
-2222=CMenu::CreateObject
-2223=CMiniDockFrameWnd::CreateObject
-2224=CMiniFrameWnd::CreateObject
-2225=CObArray::CreateObject
-2226=CObList::CreateObject
-2227=COleDocIPFrameWnd::CreateObject
-2228=COleIPFrameWnd::CreateObject
-2229=CPicturePropPage::CreateObject
-2230=CPreviewView::CreateObject
-2231=CRichEditCntrItem::CreateObject
-2232=CRichEditView::CreateObject
-2233=CRuntimeClass::CreateObject
-2234=CStringArray::CreateObject
-2235=CStringList::CreateObject
-2236=CTreeView::CreateObject
-2237=CWnd::CreateObject
-2238=CWordArray::CreateObject
-2239=COleControlContainer::CreateOleFont
-2240=CDocTemplate::CreateOleFrame
-2241=COleSafeArray::CreateOneDim
-2242=COleControlSite::CreateOrLoad
-2243=CFont::CreatePointFont
-2244=CFont::CreatePointFontIndirect
-2245=CPageSetupDialog::CreatePrinterDC
-2246=CPrintDialog::CreatePrinterDC
-2247=CWinApp::CreatePrinterDC
-2248=CDaoDatabase::CreateRelation
-2249=CDaoDatabase::CreateRelation
-2250=CSplitterWnd::CreateScrollBarCtrl
-2251=COccManager::CreateSite
-2252=CSplitterWnd::CreateStatic
-2253=COleClientItem::CreateStaticFromClipboard
-2254=COleClientItem::CreateStaticFromData
-2255=COleStreamFile::CreateStream
-2256=CWinThread::CreateThread
-2257=COleControl::CreateTracker
-2258=CFrameWnd::CreateView
-2259=CSplitterWnd::CreateView
-2260=CDocObjectServer::XOleDocument::CreateView
-2261=COleControl::CreateWindowForSubclassedControl
-2262=COleControl::XDataObject::DAdvise
-2263=COleDataSource::XDataObject::DAdvise
-2264=COleServerDoc::XDataObject::DAdvise
-2265=COleServerItem::XDataObject::DAdvise
-2266=DDP_Check
-2267=DDP_EndCheck
-2268=DDP_EndRadio
-2269=DDP_EndText
-2270=DDP_EndText
-2271=DDP_EndText
-2272=DDP_EndText
-2273=DDP_EndText
-2274=DDP_EndText
-2275=DDP_EndText
-2276=DDP_EndText
-2277=DDP_EndText
-2278=DDP_PostProcessing
-2279=DDP_Radio
-2280=DDP_Text
-2281=DDP_Text
-2282=DDP_Text
-2283=DDP_Text
-2284=DDP_Text
-2285=DDP_Text
-2286=DDP_Text
-2287=DDP_Text
-2288=DDP_Text
-2289=DDV_MaxChars
-2290=DDV_MinMaxByte
-2291=DDV_MinMaxDouble
-2292=DDV_MinMaxDWord
-2293=DDV_MinMaxFloat
-2294=DDV_MinMaxInt
-2295=DDV_MinMaxLong
-2296=DDV_MinMaxShort
-2297=DDV_MinMaxUInt
-2298=DDX_CBIndex
-2299=DDX_CBString
-2300=DDX_CBStringExact
-2301=DDX_Check
-2302=DDX_Control
-2303=DDX_FieldCBIndex
-2304=DDX_FieldCBIndex
-2305=DDX_FieldCBString
-2306=DDX_FieldCBString
-2307=DDX_FieldCBStringExact
-2308=DDX_FieldCBStringExact
-2309=DDX_FieldCheck
-2310=DDX_FieldCheck
-2311=DDX_FieldLBIndex
-2312=DDX_FieldLBIndex
-2313=DDX_FieldLBString
-2314=DDX_FieldLBString
-2315=DDX_FieldLBStringExact
-2316=DDX_FieldLBStringExact
-2317=DDX_FieldRadio
-2318=DDX_FieldRadio
-2319=DDX_FieldScroll
-2320=DDX_FieldScroll
-2321=DDX_FieldText
-2322=DDX_FieldText
-2323=DDX_FieldText
-2324=DDX_FieldText
-2325=DDX_FieldText
-2326=DDX_FieldText
-2327=DDX_FieldText
-2328=DDX_FieldText
-2329=DDX_FieldText
-2330=DDX_FieldText
-2331=DDX_FieldText
-2332=DDX_FieldText
-2333=DDX_FieldText
-2334=DDX_FieldText
-2335=DDX_FieldText
-2336=DDX_FieldText
-2337=DDX_FieldText
-2338=DDX_FieldText
-2339=DDX_LBIndex
-2340=DDX_LBString
-2341=DDX_LBStringExact
-2342=DDX_OCBool
-2343=DDX_OCBoolRO
-2344=DDX_OCColor
-2345=DDX_OCColorRO
-2346=DDX_OCFloat
-2347=DDX_OCFloat
-2348=DDX_OCFloatRO
-2349=DDX_OCFloatRO
-2350=DDX_OCInt
-2351=DDX_OCInt
-2352=DDX_OCIntRO
-2353=DDX_OCIntRO
-2354=DDX_OCShort
-2355=DDX_OCShortRO
-2356=DDX_OCText
-2357=DDX_OCTextRO
-2358=DDX_Radio
-2359=DDX_Scroll
-2360=DDX_Text
-2361=DDX_Text
-2362=DDX_Text
-2363=DDX_Text
-2364=DDX_Text
-2365=DDX_Text
-2366=DDX_Text
-2367=DDX_Text
-2368=DDX_Text
-2369=DDX_Text
-2370=DDX_Text
-2371=COleClientItem::Deactivate
-2372=COlePropertyPage::XPropertyPage::Deactivate
-2373=COleServerDoc::DeactivateAndUndo
-2374=COleClientItem::XOleIPSite::DeactivateAndUndo
-2375=COleControlSite::XOleIPSite::DeactivateAndUndo
-2376=COleClientItem::DeactivateUI
-2377=CDaoFieldExchange::Default
-2378=CFieldExchange::Default
-2379=CWnd::Default
-2380=CRect::DeflateRect
-2381=CRect::DeflateRect
-2382=CMDIChildWnd::DefWindowProcA
-2383=CMDIFrameWnd::DefWindowProcA
-2384=COleControl::DefWindowProcA
-2385=CWnd::DefWindowProcA
-2386=COleDataSource::DelayRenderData
-2387=COleDataSource::DelayRenderFileData
-2388=COleDataSource::DelaySetData
-2389=CControlBar::DelayShow
-2390=CFrameWnd::DelayUpdateFrameMenu
-2391=CMDIFrameWnd::DelayUpdateFrameMenu
-2392=CDaoRecordset::Delete
-2393=CException::Delete
-2394=COleClientItem::Delete
-2395=CRecordset::Delete
-2396=CWinThread::Delete
-2397=CDaoFieldExchange::DeleteCacheValue
-2398=CSplitterWnd::DeleteColumn
-2399=CDocument::DeleteContents
-2400=CEditView::DeleteContents
-2401=COleDocument::DeleteContents
-2402=COleServerDoc::DeleteContents
-2403=CRichEditDoc::DeleteContents
-2404=CRichEditView::DeleteContents
-2405=CDC::DeleteDC
-2406=CDaoTableDef::DeleteField
-2407=CDaoTableDef::DeleteField
-2408=CImageList::DeleteImageList
-2409=CDaoTableDef::DeleteIndex
-2410=CDaoTableDef::DeleteIndex
-2411=CComboBox::DeleteItem
-2412=CFontComboBox::DeleteItem
-2413=CListBox::DeleteItem
-2414=CGdiObject::DeleteObject
-2415=CRichEditView::XRichEditOleCallback::DeleteObject
-2416=CDaoDatabase::DeleteQueryDef
-2417=CDaoDatabase::DeleteRelation
-2418=CSplitterWnd::DeleteRow
-2419=CDaoDatabase::DeleteTableDef
-2420=CHandleMap::DeleteTemp
-2421=CDC::DeleteTempMap
-2422=CGdiObject::DeleteTempMap
-2423=CImageList::DeleteTempMap
-2424=CMenu::DeleteTempMap
-2425=CWnd::DeleteTempMap
-2426=CRichEditDoc::DeleteUnmarkedItems
-2427=CThreadSlotData::DeleteValues
-2428=CThreadSlotData::DeleteValues
-2429=CSplitterWnd::DeleteView
-2430=CWinApp::DelRegTree
-2431=CToolTipCtrl::DelTool
-2432=COleSafeArray::Destroy
-2433=COleControlSite::DestroyControl
-2434=COleSafeArray::DestroyData
-2435=COleSafeArray::DestroyDescriptor
-2436=CFrameWnd::DestroyDockBars
-2437=COleServerDoc::DestroyInPlaceFrame
-2438=CMenu::DestroyMenu
-2439=COleControl::DestroySharedMenu
-2440=COleDocIPFrameWnd::DestroySharedMenu
-2441=COleIPFrameWnd::DestroySharedMenu
-2442=CToolTipCtrl::DestroyToolTipCtrl
-2443=COleControl::DestroyTracker
-2444=CControlBar::DestroyWindow
-2445=CMDIChildWnd::DestroyWindow
-2446=CWnd::DestroyWindow
-2447=DestructElements
-2448=DestructElements
-2449=CAsyncSocket::Detach
-2450=CDC::Detach
-2451=CDialogTemplate::Detach
-2452=CGdiObject::Detach
-2453=CImageList::Detach
-2454=CMemFile::Detach
-2455=CMenu::Detach
-2456=CMonikerFile::Detach
-2457=COleDataObject::Detach
-2458=COleSafeArray::Detach
-2459=COleStreamFile::Detach
-2460=COleVariant::Detach
-2461=CSharedFile::Detach
-2462=CWindowlessDC::Detach
-2463=CWnd::Detach
-2464=COleDispatchDriver::DetachDispatch
-2465=CAsyncSocket::DetachHandle
-2466=COleControlSite::DetachWindow
-2467=CWinApp::DevModeChange
-2468=DFX_Binary
-2469=DFX_Bool
-2470=DFX_Byte
-2471=DFX_Currency
-2472=DFX_DateTime
-2473=DFX_Double
-2474=DFX_Long
-2475=DFX_LongBinary
-2476=DFX_Short
-2477=DFX_Single
-2478=DFX_Text
-2479=COleControlSite::XNotifyDBEvents::DidEvent
-2480=COleServerDoc::DiscardUndoState
-2481=COleClientItem::XOleIPSite::DiscardUndoState
-2482=COleControlSite::XOleIPSite::DiscardUndoState
-2483=COleDispatchImpl::Disconnect
-2484=COleControlSite::DisconnectSink
-2485=CDocument::DisconnectViews
-2486=AFX_DISPMAPconstCCmdTarget::dispatchMap
-2487=CWinThread::DispatchThreadMessage
-2488=COleControl::DisplayError
-2489=CDocObjectServer::DoBeginPrinting
-2490=CRecordset::DoBulkFieldExchange
-2491=CAsyncSocket::DoCallBack
-2492=COleChangeIconDialog::DoChangeIcon
-2493=CDockBar::DockControlBar
-2494=CFrameWnd::DockControlBar
-2495=CFrameWnd::DockControlBar
-2496=COleControl::DoClick
-2497=COleFrameHook::DoContextSensitiveHelp
-2498=COleConvertDialog::DoConvert
-2499=CColorPropPage::DoDataExchange
-2500=CFontPropPage::DoDataExchange
-2501=CPicturePropPage::DoDataExchange
-2502=CWnd::DoDataExchange
-2503=COleClientItem::DoDragDrop
-2504=COleDataSource::DoDragDrop
-2505=COleServerItem::DoDragDrop
-2506=COleFrameHook::DoEnableModeless
-2507=CDocObjectServer::DoEndPrinting
-2508=CDaoRecordset::DoFieldExchange
-2509=CRecordset::DoFieldExchange
-2510=CDocument::DoFileSave
-2511=CSplitterWnd::DoKeyboardSplit
-2512=CWinApp::DoMessageBox
-2513=CColorDialog::DoModal
-2514=CDialog::DoModal
-2515=CFileDialog::DoModal
-2516=CFontDialog::DoModal
-2517=COleBusyDialog::DoModal
-2518=COleChangeIconDialog::DoModal
-2519=COleChangeSourceDialog::DoModal
-2520=COleConvertDialog::DoModal
-2521=COleInsertDialog::DoModal
-2522=COleLinksDialog::DoModal
-2523=COlePasteSpecialDialog::DoModal
-2524=COlePropertiesDialog::DoModal
-2525=COleUpdateDialog::DoModal
-2526=CPageSetupDialog::DoModal
-2527=CPrintDialog::DoModal
-2528=CPropertySheet::DoModal
-2529=CCmdTarget::DoOleVerb
-2530=CControlBar::DoPaint
-2531=CDockBar::DoPaint
-2532=CRichEditView::DoPaste
-2533=CDocObjectServer::DoPrepareDC
-2534=CDocObjectServer::DoPreparePrinting
-2535=CView::DoPreparePrinting
-2536=CDocObjectServer::DoPrint
-2537=CWinApp::DoPrintDialog
-2538=CView::DoPrintPreview
-2539=CDocManager::DoPromptFileName
-2540=CWinApp::DoPromptFileName
-2541=COleControl::DoPropExchange
-2542=CDocument::DoSave
-2543=CSplitterWnd::DoScroll
-2544=CSplitterWnd::DoScrollBy
-2545=COleControl::DoSuperclassPaint
-2546=CCmdUI::DoUpdate
-2547=COleCmdUI::DoUpdate
-2548=COleClientItem::DoVerb
-2549=COleControlSite::DoVerb
-2550=CDocObjectServer::XOleObject::DoVerb
-2551=COleControl::XOleObject::DoVerb
-2552=COleServerDoc::XOleObject::DoVerb
-2553=COleServerItem::XOleObject::DoVerb
-2554=CWinApp::DoWaitCursor
-2555=CPreviewView::DoZoom
-2556=CDC::DPtoHIMETRIC
-2557=CDC::DPtoLP
-2558=CWnd::DragAcceptFiles
-2559=COleDropTarget::XDropTarget::DragEnter
-2560=CDragListBox::Dragging
-2561=COleDropTarget::XDropTarget::DragLeave
-2562=COleDropTarget::XDropTarget::DragOver
-2563=COleClientItem::Draw
-2564=CRectTracker::Draw
-2565=COleControl::XViewObject::Draw
-2566=CDC::Draw3dRect
-2567=CDC::Draw3dRect
-2568=CSplitterWnd::DrawAllSplitBars
-2569=CControlBar::DrawBorders
-2570=COleControl::DrawContent
-2571=CDC::DrawDragRect
-2572=CDockContext::DrawFocusRect
-2573=CDragListBox::DrawInsert
-2574=CBitmapButton::DrawItem
-2575=CButton::DrawItem
-2576=CCheckListBox::DrawItem
-2577=CColorButton::DrawItem
-2578=CComboBox::DrawItem
-2579=CFontComboBox::DrawItem
-2580=CHeaderCtrl::DrawItem
-2581=CListBox::DrawItem
-2582=CListCtrl::DrawItem
-2583=CListView::DrawItem
-2584=CMenu::DrawItem
-2585=CStatusBar::DrawItem
-2586=CStatusBarCtrl::DrawItem
-2587=CTabCtrl::DrawItem
-2588=COleControl::DrawMetafile
-2589=CDragListBox::DrawSingle
-2590=CDC::DrawTextA
-2591=CMetaFileDC::DrawTextA
-2592=CPreviewDC::DrawTextA
-2593=CRectTracker::DrawTrackerRect
-2594=COleDropTarget::XDropTarget::Drop
-2595=CDragListBox::Dropped
-2596=CObject::Dump
-2597=COleControl::XDataObject::DUnadvise
-2598=COleDataSource::XDataObject::DUnadvise
-2599=COleServerDoc::XDataObject::DUnadvise
-2600=COleServerItem::XDataObject::DUnadvise
-2601=CFile::Duplicate
-2602=CInternetFile::Duplicate
-2603=CMemFile::Duplicate
-2604=COleStreamFile::Duplicate
-2605=CSocketFile::Duplicate
-2606=CStdioFile::Duplicate
-2607=ulongconstCEditView::dwStyleDefault
-2608=CDaoRecordset::Edit
-2609=CRecordset::Edit
-2610=COlePropertyPage::XPropertyPage::EditProperty
-2611=CRichEditView::EditStreamCallBack
-2612=CDBException::Empty
-2613=COleDataSource::Empty
-2614=CString::Empty
-2615=CCheckListBox::Enable
-2616=CCmdUI::Enable
-2617=COleCmdUI::Enable
-2618=CStatusCmdUI::Enable
-2619=CTestCmdUI::Enable
-2620=CToolCmdUI::Enable
-2621=CWinApp::Enable3dControls
-2622=CCmdTarget::EnableAggregation
-2623=CCmdTarget::EnableAutomation
-2624=CRecordset::EnableBookmarks
-2625=CCmdTarget::EnableConnections
-2626=CControlBar::EnableDocking
-2627=CFrameWnd::EnableDocking
-2628=COleControlSite::EnableDSC
-2629=CWinApp::EnableModeless
-2630=COleControl::XOleInPlaceActiveObject::EnableModeless
-2631=COleServerDoc::XOleInPlaceActiveObject::EnableModeless
-2632=COleFrameHook::XOleInPlaceFrame::EnableModeless
-2633=COleControlContainer::XOleIPFrame::EnableModeless
-2634=CWnd::EnableScrollBarCtrl
-2635=CWinApp::EnableShellOpen
-2636=COleControl::EnableSimpleFrame
-2637=CPropertySheet::EnableStackedTabs
-2638=CInternetSession::EnableStatusCallback
-2639=CWnd::EnableToolTips
-2640=CCmdTarget::EnableTypeLib
-2641=COleControlSite::EnableWindow
-2642=CWnd::EnableWindow
-2643=COleMessageFilter::EndBusyState
-2644=COleLinkingDoc::EndDeferErrors
-2645=CDialog::EndDialog
-2646=CPropertySheet::EndDialog
-2647=CDockContext::EndDrag
-2648=CWnd::EndModalLoop
-2649=CFrameWnd::EndModalState
-2650=CWnd::EndModalState
-2651=CDockContext::EndResize
-2652=CCmdTarget::EndWaitCursor
-2653=COleDataObject::EnsureClipboardObject
-2654=CDocObjectServer::XOleObject::EnumAdvise
-2655=COleControl::XOleObject::EnumAdvise
-2656=COleServerDoc::XOleObject::EnumAdvise
-2657=COleServerItem::XOleObject::EnumAdvise
-2658=COleControl::XOleCache::EnumCache
-2659=COlePropertyPage::EnumChildProc
-2660=COleConnPtContainer::EnumConnectionPoints
-2661=CConnectionPoint::XConnPt::EnumConnections
-2662=COlePropertyPage::EnumControls
-2663=COleControl::XDataObject::EnumDAdvise
-2664=COleDataSource::XDataObject::EnumDAdvise
-2665=COleServerDoc::XDataObject::EnumDAdvise
-2666=COleServerItem::XDataObject::EnumDAdvise
-2667=CFontPropPage::EnumFontFamiliesCallBack
-2668=CFontPropPage::EnumFontFamiliesCallBack2
-2669=COleControl::XDataObject::EnumFormatEtc
-2670=COleDataSource::XDataObject::EnumFormatEtc
-2671=COleServerDoc::XDataObject::EnumFormatEtc
-2672=COleServerItem::XDataObject::EnumFormatEtc
-2673=COleControlContainer::XOleContainer::EnumObjects
-2674=COleLinkingDoc::XOleItemContainer::EnumObjects
-2675=CCmdTarget::EnumOleVerbs
-2676=CDocObjectServer::XOleObject::EnumVerbs
-2677=COleControl::XOleObject::EnumVerbs
-2678=COleServerDoc::XOleObject::EnumVerbs
-2679=COleServerItem::XOleObject::EnumVerbs
-2680=CDocObjectServer::XOleDocument::EnumViews
-2681=CControlBar::EraseNonClient
-2682=CFileException::ErrnoToException
-2683=CHttpFile::ErrorDlg
-2684=CDC::Escape
-2685=CMetaFileDC::Escape
-2686=CPreviewDC::Escape
-2687=AFX_EVENTMAPconstCOleControl::eventMap
-2688=AFX_EVENTSINKMAPconstCCmdTarget::eventsinkMap
-2689=CArchivePropExchange::ExchangeBlobProp
-2690=CAsyncPropExchange::ExchangeBlobProp
-2691=CPropbagPropExchange::ExchangeBlobProp
-2692=CPropsetPropExchange::ExchangeBlobProp
-2693=CResetPropExchange::ExchangeBlobProp
-2694=COleControl::ExchangeExtent
-2695=CArchivePropExchange::ExchangeFontProp
-2696=CAsyncPropExchange::ExchangeFontProp
-2697=CPropbagPropExchange::ExchangeFontProp
-2698=CPropsetPropExchange::ExchangeFontProp
-2699=CResetPropExchange::ExchangeFontProp
-2700=CArchivePropExchange::ExchangePersistentProp
-2701=CAsyncPropExchange::ExchangePersistentProp
-2702=CPropbagPropExchange::ExchangePersistentProp
-2703=CPropsetPropExchange::ExchangePersistentProp
-2704=CResetPropExchange::ExchangePersistentProp
-2705=CArchivePropExchange::ExchangeProp
-2706=CAsyncPropExchange::ExchangeProp
-2707=CPropbagPropExchange::ExchangeProp
-2708=CPropsetPropExchange::ExchangeProp
-2709=CResetPropExchange::ExchangeProp
-2710=COleControl::ExchangeStockProps
-2711=CAsyncPropExchange::ExchangeVersion
-2712=CPropExchange::ExchangeVersion
-2713=CDC::ExcludeClipRect
-2714=CDC::ExcludeClipRect
-2715=CDocObjectServer::XOleCommandTarget::Exec
-2716=CDaoDatabase::Execute
-2717=CDaoQueryDef::Execute
-2718=CWnd::ExecuteDlgInit
-2719=CWnd::ExecuteDlgInit
-2720=CRecordset::ExecuteSetPosUpdate
-2721=CDatabase::ExecuteSQL
-2722=CRecordset::ExecuteUpdateSQL
-2723=CFrameWnd::ExitHelpMode
-2724=COleControlModule::ExitInstance
-2725=CWinApp::ExitInstance
-2726=CWinThread::ExitInstance
-2727=CCmdTarget::ExternalAddRef
-2728=CCmdTarget::ExternalDisconnect
-2729=CCmdTarget::ExternalQueryInterface
-2730=CCmdTarget::ExternalRelease
-2731=CDC::ExtTextOutA
-2732=CMetaFileDC::ExtTextOutA
-2733=CPreviewDC::ExtTextOutA
-2734=CColorPropPage::CColorPropPageFactoryCColorPropPage::factory
-2735=CFontPropPage::CFontPropPageFactoryCFontPropPage::factory
-2736=CPicturePropPage::CPicturePropPageFactoryCPicturePropPage::factory
-2737=CDataExchange::Fail
-2738=COleControlSite::XNotifyDBEvents::FailedToDo
-2739=CRecordset::FetchData
-2740=CArchive::FillBuffer
-2741=CDaoRecordset::FillCache
-2742=CDaoWorkspace::FillDatabaseInfo
-2743=CDaoException::FillErrorInfo
-2744=CFontPropPage::FillFacenameList
-2745=CFontDialog::FillInLogFont
-2746=CToolTipCtrl::FillInToolInfo
-2747=CScrollView::FillOutsideRect
-2748=CDaoQueryDef::FillParameterInfo
-2749=CStockPropPage::FillPropnameList
-2750=CDaoDatabase::FillQueryDefInfo
-2751=CDaoDatabase::FillRelationInfo
-2752=CFontPropPage::FillSizeList
-2753=CDC::FillSolidRect
-2754=CDC::FillSolidRect
-2755=CColorPropPage::FillSysColors
-2756=CDaoDatabase::FillTableDefInfo
-2757=CDaoFieldExchange::FillVariant
-2758=CDaoWorkspace::FillWorkspaceInfo
-2759=CWnd::FilterToolTipMessage
-2760=CDaoRecordset::Find
-2761=CObList::Find
-2762=CPtrList::Find
-2763=CString::Find
-2764=CString::Find
-2765=CStringList::Find
-2766=CRichEditView::FindAndSelect
-2767=CDockBar::FindBar
-2768=COleConnPtContainer::FindConnectionPoint
-2769=??FindDlgItem@@YAPAVCWnd@@PAV1@K@Z@@YAXXZ
-2770=CFileFind::FindFile
-2771=CFtpFileFind::FindFile
-2772=CGopherFileFind::FindFile
-2773=CGopherFileFind::FindFile
-2774=CDaoRecordset::FindFirst
-2775=CObList::FindIndex
-2776=CPtrList::FindIndex
-2777=CStringList::FindIndex
-2778=COleControlContainer::FindItem
-2779=CDaoRecordset::FindLast
-2780=CDaoRecordset::FindNext
-2781=CFileFind::FindNextFileA
-2782=CFtpFileFind::FindNextFileA
-2783=CGopherFileFind::FindNextFileA
-2784=CString::FindOneOf
-2785=CPreviewView::FindPageRect
-2786=CDaoRecordset::FindPrev
-2787=CRecordset::FindSQLToken
-2788=CEditView::FindTextA
-2789=CRichEditView::FindTextA
-2790=CRichEditView::FindTextA
-2791=CRichEditView::FindTextSimple
-2792=CRichEditView::FindTextSimple
-2793=COleClientItem::FinishCreate
-2794=COleControl::FireError
-2795=COleControl::FireEvent
-2796=COleControlSite::XNotifyDBEvents::FireEvent
-2797=COleControl::FireEventV
-2798=CDaoRecordset::Fixup
-2799=CRecordset::Fixups
-2800=CFrameWnd::FloatControlBar
-2801=CArchive::Flush
-2802=CDumpContext::Flush
-2803=CFile::Flush
-2804=CInternetFile::Flush
-2805=CMemFile::Flush
-2806=COleStreamFile::Flush
-2807=CSocketFile::Flush
-2808=CStdioFile::Flush
-2809=COleDataSource::FlushClipboard
-2810=CRecordset::FlushResultSet
-2811=COleCurrency::Format
-2812=COleDateTime::Format
-2813=COleDateTime::Format
-2814=COleDateTime::Format
-2815=COleDateTimeSpan::Format
-2816=COleDateTimeSpan::Format
-2817=CString::Format
-2818=CString::Format
-2819=CTime::Format
-2820=CTime::Format
-2821=CTimeSpan::Format
-2822=CTimeSpan::Format
-2823=CTime::FormatGmt
-2824=CTime::FormatGmt
-2825=CString::FormatMessageA
-2826=CString::FormatMessageA
-2827=CString::FormatV
-2828=COleControl::ForwardActivationMsg
-2829=CDatabase::Free
-2830=CMemFile::Free
-2831=CSharedFile::Free
-2832=CMapPtrToPtr::FreeAssoc
-2833=CMapPtrToWord::FreeAssoc
-2834=CMapStringToOb::FreeAssoc
-2835=CMapStringToPtr::FreeAssoc
-2836=CMapStringToString::FreeAssoc
-2837=CMapWordToOb::FreeAssoc
-2838=CMapWordToPtr::FreeAssoc
-2839=CDaoRecordset::FreeCache
-2840=CRecordset::FreeDataCache
-2841=CPlex::FreeDataChain
-2842=CByteArray::FreeExtra
-2843=CDWordArray::FreeExtra
-2844=CObArray::FreeExtra
-2845=CPtrArray::FreeExtra
-2846=CString::FreeExtra
-2847=CStringArray::FreeExtra
-2848=CUIntArray::FreeExtra
-2849=CWordArray::FreeExtra
-2850=CObList::FreeNode
-2851=CPtrList::FreeNode
-2852=CStringList::FreeNode
-2853=CRecordset::FreeRowset
-2854=CThreadSlotData::FreeSlot
-2855=CProperty::FreeValue
-2856=COleControl::XViewObject::Freeze
-2857=COleControl::XOleControl::FreezeEvents
-2858=COleClientItem::FreezeLink
-2859=CDC::FromHandle
-2860=CGdiObject::FromHandle
-2861=CHandleMap::FromHandle
-2862=CImageList::FromHandle
-2863=CMenu::FromHandle
-2864=CWnd::FromHandle
-2865=CImageList::FromHandlePermanent
-2866=CMenu::FromHandlePermanent
-2867=CWnd::FromHandlePermanent
-2868=CCmdTarget::FromIDispatch
-2869=CProperty::Get
-2870=CProperty::Get
-2871=CPropertySection::Get
-2872=CPropertySection::Get
-2873=CPropertySet::Get
-2874=CPropertySet::Get
-2875=CDaoRecordset::GetAbsolutePosition
-2876=COleControl::GetActivationPolicy
-2877=COleControl::XPointerInactive::GetActivationPolicy
-2878=CFrameWnd::GetActiveDocument
-2879=CFrameWnd::GetActiveFrame
-2880=CMDIFrameWnd::GetActiveFrame
-2881=CPropertySheet::GetActiveIndex
-2882=CPropertySheet::GetActivePage
-2883=CSplitterWnd::GetActivePane
-2884=CFrameWnd::GetActiveView
-2885=COleControl::XViewObject::GetAdvise
-2886=COleControl::GetAmbientDispatchDriver
-2887=COleControlContainer::GetAmbientProp
-2888=COleControl::GetAmbientProperty
-2889=COleControl::GetAppearance
-2890=CWinApp::GetAppRegistryKey
-2891=CMapPtrToPtr::GetAssocAt
-2892=CMapPtrToWord::GetAssocAt
-2893=CMapStringToOb::GetAssocAt
-2894=CMapStringToPtr::GetAssocAt
-2895=CMapStringToString::GetAssocAt
-2896=CMapWordToOb::GetAssocAt
-2897=CMapWordToPtr::GetAssocAt
-2898=CStringArray::GetAt
-2899=CGopherConnection::GetAttribute
-2900=CDaoTableDef::GetAttributes
-2901=COleControl::GetBackColor
-2902=CControlBar::GetBarInfo
-2903=CDockBar::GetBarInfo
-2904=CAsyncMonikerFile::GetBindInfo
-2905=CBlobProperty::GetBlob
-2906=CDaoRecordset::GetBookmark
-2907=CRecordset::GetBookmark
-2908=COleFrameHook::XOleInPlaceFrame::GetBorder
-2909=COleControlContainer::XOleIPFrame::GetBorder
-2910=CStatusBarCtrl::GetBorders
-2911=COleControl::GetBorderStyle
-2912=CDataSourceControl::GetBoundClientRow
-2913=CRecordset::GetBoundFieldIndex
-2914=CRecordset::GetBoundParamIndex
-2915=CString::GetBuffer
-2916=CEditView::GetBufferLength
-2917=CFile::GetBufferPtr
-2918=CMemFile::GetBufferPtr
-2919=CString::GetBufferSetLength
-2920=CToolBar::GetButtonInfo
-2921=CToolBar::GetButtonStyle
-2922=CToolBar::GetButtonText
-2923=CToolBar::GetButtonText
-2924=CPropertySet::GetByteOrder
-2925=COleClientItem::GetCachedExtent
-2926=COleDataSource::GetCacheEntry
-2927=CDaoRecordset::GetCacheSize
-2928=CDaoRecordset::GetCacheStart
-2929=CDaoFieldExchange::GetCacheValue
-2930=COleControl::XDataObject::GetCanonicalFormatEtc
-2931=COleDataSource::XDataObject::GetCanonicalFormatEtc
-2932=COleServerDoc::XDataObject::GetCanonicalFormatEtc
-2933=COleServerItem::XDataObject::GetCanonicalFormatEtc
-2934=COleControl::GetCapture
-2935=CFontDialog::GetCharFormat
-2936=CRichEditView::GetCharFormatSelection
-2937=CCheckListBox::GetCheck
-2938=CWnd::GetCheckedRadioButton
-2939=CBlobProperty::GetClassID
-2940=CColorPropPage::GetClassID
-2941=CFontPropPage::GetClassID
-2942=COleClientItem::GetClassID
-2943=CPicturePropPage::GetClassID
-2944=CPropertySet::GetClassID
-2945=COleLinkingDoc::XPersistFile::GetClassID
-2946=COleControl::XPersistMemory::GetClassID
-2947=COleControl::XPersistPropertyBag::GetClassID
-2948=COleControl::XPersistStorage::GetClassID
-2949=COleServerDoc::XPersistStorage::GetClassID
-2950=COleControl::XPersistStreamInit::GetClassID
-2951=COleControl::XProvideClassInfo::GetClassInfoA
-2952=AFX_COM::GetClassObject
-2953=COleControl::GetClientOffset
-2954=COleControl::GetClientRect
-2955=COleClientItem::GetClientSite
-2956=COleControl::GetClientSite
-2957=CRichEditCntrItem::GetClientSite
-2958=CDocObjectServer::XOleObject::GetClientSite
-2959=COleControl::XOleObject::GetClientSite
-2960=COleServerDoc::XOleObject::GetClientSite
-2961=COleServerItem::XOleObject::GetClientSite
-2962=COleClientItem::GetClipboardData
-2963=COleServerItem::GetClipboardData
-2964=CRichEditView::GetClipboardData
-2965=CDocObjectServer::XOleObject::GetClipboardData
-2966=COleControl::XOleObject::GetClipboardData
-2967=COleServerDoc::XOleObject::GetClipboardData
-2968=COleServerItem::XOleObject::GetClipboardData
-2969=CRichEditView::XRichEditOleCallback::GetClipboardData
-2970=COleDataSource::GetClipboardOwner
-2971=CDC::GetClipBox
-2972=CMetaFileDC::GetClipBox
-2973=CColorPropPage::GetColorProp
-2974=COleControl::XViewObject::GetColorSet
-2975=CSplitterWnd::GetColumnInfo
-2976=CCmdTarget::GetCommandMap
-2977=CDaoDatabase::GetConnect
-2978=CDaoQueryDef::GetConnect
-2979=CDaoTableDef::GetConnect
-2980=CDatabase::GetConnectInfo
-2981=CConnectionPoint::GetConnectionCount
-2982=CCmdTarget::GetConnectionHook
-2983=COleControl::GetConnectionHook
-2984=CConnectionPoint::XConnPt::GetConnectionInterface
-2985=CCmdTarget::GetConnectionMap
-2986=COleControl::GetConnectionMap
-2987=CConnectionPoint::XConnPt::GetConnectionPointContainer
-2988=CConnectionPoint::GetConnections
-2989=CConnectionPoint::GetContainer
-2990=COleDocument::GetContainer
-2991=COleLinkingDoc::GetContainer
-2992=COleClientItem::XOleClientSite::GetContainer
-2993=COleControlSite::XOleClientSite::GetContainer
-2994=COleControl::XQuickActivate::GetContentExtent
-2995=CRichEditView::GetContextMenu
-2996=CRichEditView::XRichEditOleCallback::GetContextMenu
-2997=CFrameWnd::GetControlBar
-2998=COleControl::GetControlFlags
-2999=COleControlSite::GetControlInfo
-3000=COleControl::XOleControl::GetControlInfo
-3001=CDocObjectServer::GetControllingFrame
-3002=CCmdTarget::GetControllingUnknown
-3003=COleControl::GetControlSize
-3004=COlePropertyPage::GetControlStatus
-3005=CWnd::GetControlUnknown
-3006=COlePropertiesDialog::XOleUIObjInfo::GetConvertInfo
-3007=CPrintDialog::GetCopies
-3008=CPropertySection::GetCount
-3009=CPropertySet::GetCount
-3010=CFileFind::GetCreationTime
-3011=CFileFind::GetCreationTime
-3012=CGopherFileFind::GetCreationTime
-3013=CGopherFileFind::GetCreationTime
-3014=COleLinkingDoc::XPersistFile::GetCurFile
-3015=CFtpConnection::GetCurrentDirectoryA
-3016=CFtpConnection::GetCurrentDirectoryA
-3017=CFtpConnection::GetCurrentDirectoryAsURL
-3018=CFtpConnection::GetCurrentDirectoryAsURL
-3019=CFontDialog::GetCurrentFont
-3020=CDaoRecordset::GetCurrentIndex
-3021=CWnd::GetCurrentMessage
-3022=CFontComboBox::GetCurrentName
-3023=CDataBoundProperty::GetCursor
-3024=CDataSourceControl::GetCursor
-3025=COleControlSite::GetCursor
-3026=COleControlSite::XBoundObjectSite::GetCursor
-3027=COleDataObject::GetData
-3028=CProcessLocalObject::GetData
-3029=CRecordset::GetData
-3030=CThreadLocalObject::GetData
-3031=COleControl::XDataObject::GetData
-3032=COleDataSource::XDataObject::GetData
-3033=COleServerDoc::XDataObject::GetData
-3034=COleServerItem::XDataObject::GetData
-3035=CDaoRecordset::GetDataAndFixupNulls
-3036=CDaoWorkspace::GetDatabaseCount
-3037=CDaoWorkspace::GetDatabaseInfo
-3038=CDaoWorkspace::GetDatabaseInfo
-3039=CDatabase::GetDatabaseName
-3040=CRecordset::GetDataBuffer
-3041=COleControl::XDataObject::GetDataHere
-3042=COleDataSource::XDataObject::GetDataHere
-3043=COleServerDoc::XDataObject::GetDataHere
-3044=COleServerItem::XDataObject::GetDataHere
-3045=CThreadLocalObject::GetDataNA
-3046=COleServerItem::GetDataObject
-3047=COleControl::GetDataSource
-3048=CDaoQueryDef::GetDateCreated
-3049=CDaoRecordset::GetDateCreated
-3050=CDaoTableDef::GetDateCreated
-3051=CDaoQueryDef::GetDateLastUpdated
-3052=CDaoRecordset::GetDateLastUpdated
-3053=CDaoTableDef::GetDateLastUpdated
-3054=COleDateTime::GetDay
-3055=COleDateTime::GetDayOfWeek
-3056=COleDateTime::GetDayOfYear
-3057=COleControl::GetDC
-3058=CDocument::GetDefaultAccelerator
-3059=CFrameWnd::GetDefaultAccelerator
-3060=COleServerDoc::GetDefaultAccelerator
-3061=CRichEditCtrl::GetDefaultCharFormat
-3062=CRecordset::GetDefaultConnect
-3063=CDaoRecordset::GetDefaultDBName
-3064=CRecordset::GetDefaultFieldType
-3065=CDocument::GetDefaultMenu
-3066=COleServerDoc::GetDefaultMenu
-3067=CPrintDialog::GetDefaults
-3068=CDaoRecordset::GetDefaultSQL
-3069=CRecordset::GetDefaultSQL
-3070=COccManager::GetDefBtnCode
-3071=COleControlSite::GetDefBtnCode
-3072=CWnd::GetDescendantWindow
-3073=CPageSetupDialog::GetDeviceName
-3074=CPrintDialog::GetDeviceName
-3075=CScrollView::GetDeviceScrollPosition
-3076=CScrollView::GetDeviceScrollSizes
-3077=CPageSetupDialog::GetDevMode
-3078=CPrintDialog::GetDevMode
-3079=CCmdTarget::GetDispatchIID
-3080=COleControl::GetDispatchIID
-3081=CCmdTarget::GetDispatchMap
-3082=COleControlContainer::GetDispatchMap
-3083=CCmdTarget::GetDispEntry
-3084=CRecentFileList::GetDisplayName
-3085=CFontHolder::GetDisplayString
-3086=CPictureHolder::GetDisplayString
-3087=COleControl::XPerPropertyBrowsing::GetDisplayString
-3088=COleControlSite::GetDlgCtrlID
-3089=CWnd::GetDlgCtrlID
-3090=COleControlContainer::GetDlgItem
-3091=COleControlContainer::GetDlgItem
-3092=CWnd::GetDlgItem
-3093=CWnd::GetDlgItem
-3094=COleControlContainer::GetDlgItemInt
-3095=CWnd::GetDlgItemInt
-3096=COleControlContainer::GetDlgItemTextA
-3097=CWnd::GetDlgItemTextA
-3098=CWnd::GetDlgItemTextA
-3099=CDockContext::GetDockBar
-3100=CDockBar::GetDockedControlBar
-3101=CDockBar::GetDockedCount
-3102=CDockBar::GetDockedVisibleCount
-3103=CControlBar::GetDockingFrame
-3104=CFrameWnd::GetDockState
-3105=CDocObjectServer::XOleDocument::GetDocMiscStatus
-3106=COleServerDoc::GetDocObjectServer
-3107=CDocTemplate::GetDocString
-3108=CDocObjectServer::XOleDocumentView::GetDocument
-3109=CRichEditView::XRichEditOleCallback::GetDragDropEffect
-3110=CPageSetupDialog::GetDriverName
-3111=CPrintDialog::GetDriverName
-3112=COleControl::XOleInPlaceObject::GetDropTarget
-3113=CWnd::GetDSCCursor
-3114=CDaoRecordset::GetEditMode
-3115=COleSafeArray::GetElement
-3116=COleServerDoc::GetEmbeddedItem
-3117=COleClientItem::GetEmbeddedItemData
-3118=COleServerItem::GetEmbedSourceData
-3119=COleControl::GetEnabled
-3120=CCmdTarget::GetEntryCount
-3121=CDaoException::GetErrorCount
-3122=CDaoException::GetErrorInfo
-3123=CArchiveException::GetErrorMessage
-3124=CDaoException::GetErrorMessage
-3125=CDBException::GetErrorMessage
-3126=CException::GetErrorMessage
-3127=CFileException::GetErrorMessage
-3128=CInternetException::GetErrorMessage
-3129=COleDispatchException::GetErrorMessage
-3130=COleException::GetErrorMessage
-3131=CSimpleException::GetErrorMessage
-3132=COleControlSite::GetEventIID
-3133=COleControl::GetEventMap
-3134=COleControl::GetEventMapEntry
-3135=CCmdTarget::GetEventSinkEntry
-3136=CCmdTarget::GetEventSinkMap
-3137=COleControlSite::GetExStyle
-3138=CWnd::GetExStyle
-3139=COleControl::GetExtendedControl
-3140=COleControlSite::XOleControlSite::GetExtendedControl
-3141=COleClientItem::GetExtent
-3142=CDocObjectServer::XOleObject::GetExtent
-3143=COleControl::XOleObject::GetExtent
-3144=COleServerDoc::XOleObject::GetExtent
-3145=COleServerItem::XOleObject::GetExtent
-3146=COleControl::XViewObject::GetExtent
-3147=CCmdTarget::GetExtraConnectionPoints
-3148=COleControl::GetExtraConnectionPoints
-3149=CFontDialog::GetFaceName
-3150=CDaoQueryDef::GetFieldCount
-3151=CDaoRecordset::GetFieldCount
-3152=CDaoTableDef::GetFieldCount
-3153=CDaoRecordset::GetFieldIndex
-3154=CRecordset::GetFieldIndexByName
-3155=CDaoQueryDef::GetFieldInfo
-3156=CDaoQueryDef::GetFieldInfo
-3157=CDaoRecordset::GetFieldInfo
-3158=CDaoRecordset::GetFieldInfo
-3159=CDaoTableDef::GetFieldInfo
-3160=CDaoTableDef::GetFieldInfo
-3161=CDaoRecordset::GetFieldLength
-3162=CRecordset::GetFieldLengthBuffer
-3163=CRecordset::GetFieldStatus
-3164=CDaoRecordset::GetFieldValue
-3165=CDaoRecordset::GetFieldValue
-3166=CDaoRecordset::GetFieldValue
-3167=CDaoRecordset::GetFieldValue
-3168=CRecordset::GetFieldValue
-3169=CRecordset::GetFieldValue
-3170=CRecordset::GetFieldValue
-3171=CRecordset::GetFieldValue
-3172=CDocument::GetFile
-3173=CFtpConnection::GetFile
-3174=COleDataObject::GetFileData
-3175=CFileDialog::GetFileExt
-3176=CFile::GetFileName
-3177=CFileDialog::GetFileName
-3178=CFileFind::GetFileName
-3179=CGopherFileFind::GetFileName
-3180=CFile::GetFilePath
-3181=CFileFind::GetFilePath
-3182=CGopherFileFind::GetFilePath
-3183=CFile::GetFileTitle
-3184=CFileDialog::GetFileTitle
-3185=CFileFind::GetFileTitle
-3186=CGopherFileFind::GetFileTitle
-3187=COleServerDoc::GetFileTypeString
-3188=CFileFind::GetFileURL
-3189=CFtpFileFind::GetFileURL
-3190=CGopherFileFind::GetFileURL
-3191=CHttpFile::GetFileURL
-3192=CFindReplaceDialog::GetFindString
-3193=CMultiDocTemplate::GetFirstDocPosition
-3194=CSingleDocTemplate::GetFirstDocPosition
-3195=CDocManager::GetFirstDocTemplatePosition
-3196=CWinApp::GetFirstDocTemplatePosition
-3197=COleDocument::GetFirstFrame
-3198=CDocument::GetFirstViewPosition
-3199=COleControl::GetFocus
-3200=CFileDialog::GetFolderPath
-3201=CDialogTemplate::GetFont
-3202=CDialogTemplate::GetFont
-3203=COleControl::GetFont
-3204=CFontHolder::GetFontDispatch
-3205=CFontHolder::GetFontHandle
-3206=CFontHolder::GetFontHandle
-3207=CFontComboBox::GetFontItem
-3208=CFontPropPage::GetFontProps
-3209=CDialogTemplate::GetFontSizeField
-3210=COleControl::GetFontTextMetrics
-3211=CFontComboBox::GetFontType
-3212=COleControl::GetForeColor
-3213=CPropertySection::GetFormatID
-3214=CPropertySet::GetFormatVersion
-3215=CInternetSession::GetFtpConnection
-3216=COleDataObject::GetGlobalData
-3217=CTime::GetGmtTm
-3218=CInternetSession::GetGopherConnection
-3219=COleControl::XProvideClassInfo::GetGUID
-3220=CDC::GetHalftoneBrush
-3221=CRectTracker::GetHandleMask
-3222=CRectTracker::GetHandleRect
-3223=CRectTracker::GetHandleSize
-3224=CSizeComboBox::GetHeight
-3225=CSplitterWnd::GetHitRect
-3226=CHotKeyCtrl::GetHotKey
-3227=COleDateTime::GetHour
-3228=COleDateTimeSpan::GetHours
-3229=CInternetSession::GetHttpConnection
-3230=COleControl::GetHwnd
-3231=COleClientItem::GetIconicMetafile
-3232=CFrameWnd::GetIconWndClass
-3233=COleControlSite::GetID
-3234=CProperty::GetID
-3235=CPropertySection::GetID
-3236=COleDataObject::GetIDataObject
-3237=CCmdTarget::GetIDispatch
-3238=COleDispatchImpl::GetIDsOfNames
-3239=COleControlSite::XAmbientProps::GetIDsOfNames
-3240=COleControlSite::XEventSink::GetIDsOfNames
-3241=COleControl::XEventConnPt::GetIID
-3242=COleControl::XPropConnPt::GetIID
-3243=CDaoRecordset::GetIndexCount
-3244=CDaoTableDef::GetIndexCount
-3245=CDaoRecordset::GetIndexInfo
-3246=CDaoRecordset::GetIndexInfo
-3247=CDaoTableDef::GetIndexInfo
-3248=CDaoTableDef::GetIndexInfo
-3249=CDaoWorkspace::GetIniPath
-3250=COleDocument::GetInPlaceActiveItem
-3251=CRichEditDoc::GetInPlaceActiveItem
-3252=CRichEditView::GetInPlaceActiveItem
-3253=CRichEditView::XRichEditOleCallback::GetInPlaceContext
-3254=COleIPFrameWnd::GetInPlaceMenu
-3255=CDocObjectServer::XOleDocumentView::GetInPlaceSite
-3256=COleClientItem::GetInPlaceWindow
-3257=CSplitterWnd::GetInsideRect
-3258=CCmdTarget::GetInterface
-3259=CCmdTarget::GetInterfaceHook
-3260=COleControl::GetInterfaceHook
-3261=COleServerDoc::GetInterfaceHook
-3262=CCmdTarget::GetInterfaceMap
-3263=CDocObjectServer::GetInterfaceMap
-3264=CEnumConnPoints::GetInterfaceMap
-3265=CEnumFormatEtc::GetInterfaceMap
-3266=CEnumOleVerb::GetInterfaceMap
-3267=CEnumUnknown::GetInterfaceMap
-3268=COleClientItem::GetInterfaceMap
-3269=COleControl::GetInterfaceMap
-3270=COleControlContainer::GetInterfaceMap
-3271=COleControlSite::GetInterfaceMap
-3272=COleDataSource::GetInterfaceMap
-3273=COleDropSource::GetInterfaceMap
-3274=COleDropTarget::GetInterfaceMap
-3275=COleFrameHook::GetInterfaceMap
-3276=COleLinkingDoc::GetInterfaceMap
-3277=COleMessageFilter::GetInterfaceMap
-3278=COleObjectFactory::GetInterfaceMap
-3279=COlePropertyPage::GetInterfaceMap
-3280=COleServerDoc::GetInterfaceMap
-3281=COleServerItem::GetInterfaceMap
-3282=CRichEditView::GetInterfaceMap
-3283=CRichEditCtrl::GetIRichEditOle
-3284=CDaoWorkspace::GetIsolateODBCTrans
-3285=COleServerDoc::GetItemClipRect
-3286=CListCtrl::GetItemData
-3287=CTreeCtrl::GetItemData
-3288=CStatusBar::GetItemID
-3289=CToolBar::GetItemID
-3290=CTreeCtrl::GetItemImage
-3291=COleClientItem::GetItemName
-3292=COleServerDoc::GetItemPosition
-3293=CListCtrl::GetItemRect
-3294=CStatusBar::GetItemRect
-3295=CToolBar::GetItemRect
-3296=CTreeCtrl::GetItemRect
-3297=CTreeCtrl::GetItemState
-3298=COleClientItem::GetItemStorage
-3299=COleClientItem::GetItemStorageCompound
-3300=COleClientItem::GetItemStorageFlat
-3301=CListCtrl::GetItemText
-3302=CListCtrl::GetItemText
-3303=CTreeCtrl::GetItemText
-3304=CFileFind::GetLastAccessTime
-3305=CFileFind::GetLastAccessTime
-3306=CGopherFileFind::GetLastAccessTime
-3307=CGopherFileFind::GetLastAccessTime
-3308=CDaoRecordset::GetLastModifiedBookmark
-3309=COleUILinkInfo::GetLastUpdate
-3310=CFileFind::GetLastWriteTime
-3311=CFileFind::GetLastWriteTime
-3312=CGopherFileFind::GetLastWriteTime
-3313=CGopherFileFind::GetLastWriteTime
-3314=CRecordset::GetLBFetchSize
-3315=COleSafeArray::GetLBound
-3316=CRecordset::GetLBReallocSize
-3317=CComboBox::GetLBText
-3318=CFile::GetLength
-3319=CFileFind::GetLength
-3320=CGopherFileFind::GetLength
-3321=CInternetFile::GetLength
-3322=COleStreamFile::GetLength
-3323=CSocketFile::GetLength
-3324=CFileFind::GetLength64
-3325=CGopherFileFind::GetLength64
-3326=COleObjectFactory::GetLicenseKey
-3327=COleObjectFactory::XClassFactory::GetLicInfo
-3328=CRichEditCtrl::GetLine
-3329=CRichEditCtrl::GetLine
-3330=COleUILinkInfo::GetLinkSource
-3331=COleClientItem::GetLinkSourceData
-3332=COleServerItem::GetLinkSourceData
-3333=COleClientItem::GetLinkUpdateOptions
-3334=COleUILinkInfo::GetLinkUpdateOptions
-3335=CPropertySection::GetList
-3336=CPropertySet::GetList
-3337=CTime::GetLocalTm
-3338=CGopherFileFind::GetLocator
-3339=CDaoRecordset::GetLockingMode
-3340=CFontComboBox::GetLogFont
-3341=CDaoWorkspace::GetLoginTimeout
-3342=CFieldExchange::GetLongBinaryData
-3343=CRecordset::GetLongBinaryDataAndCleanup
-3344=CFieldExchange::GetLongBinarySize
-3345=CRecordset::GetLongCharDataAndCleanup
-3346=CWinThread::GetMainWnd
-3347=CPageSetupDialog::GetMargins
-3348=CConnectionPoint::GetMaxConnections
-3349=CMDIChildWnd::GetMDIFrame
-3350=CFrameWnd::GetMessageBar
-3351=CMDIChildWnd::GetMessageBar
-3352=CCheckListBox::GetMessageMap
-3353=CCmdTarget::GetMessageMap
-3354=CColorDialog::GetMessageMap
-3355=CColorPropPage::GetMessageMap
-3356=CCommonDialog::GetMessageMap
-3357=CControlBar::GetMessageMap
-3358=CControlFrameWnd::GetMessageMap
-3359=CCtrlView::GetMessageMap
-3360=CDaoRecordView::GetMessageMap
-3361=CDialog::GetMessageMap
-3362=CDialogBar::GetMessageMap
-3363=CDockBar::GetMessageMap
-3364=CDocObjectServer::GetMessageMap
-3365=CDocument::GetMessageMap
-3366=CEditView::GetMessageMap
-3367=CFontPropPage::GetMessageMap
-3368=CFormView::GetMessageMap
-3369=CFrameWnd::GetMessageMap
-3370=CListCtrl::GetMessageMap
-3371=CListView::GetMessageMap
-3372=CMDIChildWnd::GetMessageMap
-3373=CMDIFrameWnd::GetMessageMap
-3374=CMiniDockFrameWnd::GetMessageMap
-3375=CMiniFrameWnd::GetMessageMap
-3376=COleControl::GetMessageMap
-3377=COleDocIPFrameWnd::GetMessageMap
-3378=COleIPFrameWnd::GetMessageMap
-3379=COlePropertyPage::GetMessageMap
-3380=COleResizeBar::GetMessageMap
-3381=COleServerDoc::GetMessageMap
-3382=CPicturePropPage::GetMessageMap
-3383=CPreviewView::GetMessageMap
-3384=CPrintDialog::GetMessageMap
-3385=CPropertyPage::GetMessageMap
-3386=CPropertySheet::GetMessageMap
-3387=CRecordView::GetMessageMap
-3388=CRichEditView::GetMessageMap
-3389=CScrollView::GetMessageMap
-3390=CSocketWnd::GetMessageMap
-3391=CSplitterWnd::GetMessageMap
-3392=CStatusBar::GetMessageMap
-3393=CStockPropPage::GetMessageMap
-3394=CTabCtrl::GetMessageMap
-3395=CToolBar::GetMessageMap
-3396=CToolBarCtrl::GetMessageMap
-3397=CToolTipCtrl::GetMessageMap
-3398=CTreeCtrl::GetMessageMap
-3399=CTreeView::GetMessageMap
-3400=CView::GetMessageMap
-3401=CWinApp::GetMessageMap
-3402=CWnd::GetMessageMap
-3403=CFrameWnd::GetMessageString
-3404=COleControl::GetMessageString
-3405=CDataSourceControl::GetMetaData
-3406=COleControl::GetMetafileData
-3407=COleServerItem::GetMetafileData
-3408=COleDateTime::GetMinute
-3409=COleDateTimeSpan::GetMinutes
-3410=CDocObjectServer::XOleObject::GetMiscStatus
-3411=COleControl::XOleObject::GetMiscStatus
-3412=COleServerDoc::XOleObject::GetMiscStatus
-3413=COleServerItem::XOleObject::GetMiscStatus
-3414=CRectTracker::GetModifyPointers
-3415=COleDocument::GetMoniker
-3416=COleLinkingDoc::GetMoniker
-3417=COleServerDoc::GetMoniker
-3418=COleServerItem::GetMoniker
-3419=COleClientItem::XOleClientSite::GetMoniker
-3420=COleControlSite::XOleClientSite::GetMoniker
-3421=CDocObjectServer::XOleObject::GetMoniker
-3422=COleControl::XOleObject::GetMoniker
-3423=COleServerDoc::XOleObject::GetMoniker
-3424=COleServerItem::XOleObject::GetMoniker
-3425=COleDateTime::GetMonth
-3426=CDaoDatabase::GetName
-3427=CDaoQueryDef::GetName
-3428=CDaoRecordset::GetName
-3429=CDaoTableDef::GetName
-3430=CDaoWorkspace::GetName
-3431=COleControl::XViewObject::GetNaturalExtent
-3432=COleClientItem::GetNewItemNumber
-3433=CRichEditView::XRichEditOleCallback::GetNewStorage
-3434=CDataBoundProperty::GetNext
-3435=CMapPtrToPtr::GetNextAssoc
-3436=CMapPtrToWord::GetNextAssoc
-3437=CMapStringToOb::GetNextAssoc
-3438=CMapStringToPtr::GetNextAssoc
-3439=CMapStringToString::GetNextAssoc
-3440=CMapWordToOb::GetNextAssoc
-3441=CMapWordToPtr::GetNextAssoc
-3442=COleDocument::GetNextClientItem
-3443=CConnectionPoint::GetNextConnection
-3444=CMultiDocTemplate::GetNextDoc
-3445=CSingleDocTemplate::GetNextDoc
-3446=CDocManager::GetNextDocTemplate
-3447=CWinApp::GetNextDocTemplate
-3448=COleDataObject::GetNextFormat
-3449=COleDocument::GetNextItem
-3450=COleDocument::GetNextItemOfKind
-3451=COleUILinkInfo::GetNextLink
-3452=CFileDialog::GetNextPathName
-3453=COleDocument::GetNextServerItem
-3454=CDocument::GetNextView
-3455=CFindReplaceDialog::GetNotifier
-3456=CCmdTarget::GetNotSupported
-3457=COleControl::GetNotSupported
-3458=CHttpFile::GetObjectA
-3459=COleLinkingDoc::XOleItemContainer::GetObjectA
-3460=COlePropertyPage::GetObjectArray
-3461=COleClientItem::GetObjectDescriptorData
-3462=COleServerItem::GetObjectDescriptorData
-3463=COlePropertiesDialog::XOleUIObjInfo::GetObjectInfo
-3464=CArchive::GetObjectSchema
-3465=COleLinkingDoc::XOleItemContainer::GetObjectStorage
-3466=CRecordset::GetODBCFieldInfo
-3467=CRecordset::GetODBCFieldInfo
-3468=CDaoQueryDef::GetODBCTimeout
-3469=COleServerItem::GetOleObject
-3470=COleSafeArray::GetOneDimSize
-3471=CDocManager::GetOpenDocumentCount
-3472=CWinApp::GetOpenDocumentCount
-3473=CPropertySet::GetOSVersion
-3474=COleControl::GetOuterWindow
-3475=CPropertySheet::GetPageCount
-3476=CPropertySheet::GetPageIndex
-3477=CDocObjectServer::XPrint::GetPageInfo
-3478=COlePropertyPage::XPropertyPage::GetPageInfo
-3479=COleControl::XSpecifyPropertyPages::GetPages
-3480=COlePropertyPage::GetPageSite
-3481=CSplitterWnd::GetPane
-3482=CStatusBar::GetPaneInfo
-3483=CStatusBar::GetPaneStyle
-3484=CStatusBar::GetPaneText
-3485=CStatusBar::GetPaneText
-3486=CRichEditCtrl::GetParaFormat
-3487=CRichEditView::GetParaFormatSelection
-3488=CDaoQueryDef::GetParameterCount
-3489=CDaoQueryDef::GetParameterInfo
-3490=CDaoQueryDef::GetParameterInfo
-3491=CDaoQueryDef::GetParamValue
-3492=CDaoQueryDef::GetParamValue
-3493=CDaoRecordset::GetParamValue
-3494=CDaoRecordset::GetParamValue
-3495=CWnd::GetParentFrame
-3496=CWnd::GetParentOwner
-3497=CView::GetParentSplitter
-3498=CDataPathProperty::GetPath
-3499=CFileDialog::GetPathName
-3500=CAsyncSocket::GetPeerName
-3501=CDaoRecordset::GetPercentPosition
-3502=CPictureHolder::GetPictureDispatch
-3503=CPicturePropPage::GetPictureProp
-3504=CSizeComboBox::GetPointSize
-3505=CPageSetupDialog::GetPortName
-3506=CPrintDialog::GetPortName
-3507=CFile::GetPosition
-3508=CMemFile::GetPosition
-3509=COleStreamFile::GetPosition
-3510=CSocketFile::GetPosition
-3511=CStdioFile::GetPosition
-3512=COleControl::XPerPropertyBrowsing::GetPredefinedStrings
-3513=COleControl::XPerPropertyBrowsing::GetPredefinedValue
-3514=COleDocument::GetPrimarySelectedItem
-3515=CRichEditDoc::GetPrimarySelectedItem
-3516=COleClientItem::GetPrintDeviceInfo
-3517=CWinApp::GetPrinterDeviceDefaults
-3518=CEditView::GetPrinterFont
-3519=CAsyncMonikerFile::GetPriority
-3520=CWinApp::GetProfileBinary
-3521=CWinApp::GetProfileIntA
-3522=CWinApp::GetProfileStringA
-3523=COlePropertyPage::GetPropCheck
-3524=COleControlSite::GetProperty
-3525=COleDispatchDriver::GetProperty
-3526=CPropertySection::GetProperty
-3527=CPropertySet::GetProperty
-3528=CWnd::GetProperty
-3529=COlePropertyPage::GetPropIndex
-3530=COleControl::GetPropPageIDs
-3531=COlePropertyPage::GetPropRadio
-3532=COleControl::GetPropsetData
-3533=COlePropertyPage::GetPropText
-3534=COlePropertyPage::GetPropText
-3535=COlePropertyPage::GetPropText
-3536=COlePropertyPage::GetPropText
-3537=COlePropertyPage::GetPropText
-3538=COlePropertyPage::GetPropText
-3539=COlePropertyPage::GetPropText
-3540=COlePropertyPage::GetPropText
-3541=COlePropertyPage::GetPropText
-3542=CDaoDatabase::GetQueryDefCount
-3543=CDaoDatabase::GetQueryDefInfo
-3544=CDaoDatabase::GetQueryDefInfo
-3545=CDaoDatabase::GetQueryTimeout
-3546=CSliderCtrl::GetRange
-3547=CSpinButtonCtrl::GetRange
-3548=CProperty::GetRawValue
-3549=COleControl::GetReadyState
-3550=CDaoRecordset::GetRecordCount
-3551=CDaoTableDef::GetRecordCount
-3552=CDaoDatabase::GetRecordsAffected
-3553=CDaoQueryDef::GetRecordsAffected
-3554=CDocObjectServer::XOleDocumentView::GetRect
-3555=COleControl::XViewObject::GetRect
-3556=COleControl::GetRectInContainer
-3557=CDaoDatabase::GetRelationCount
-3558=CDaoDatabase::GetRelationInfo
-3559=CDaoDatabase::GetRelationInfo
-3560=CFindReplaceDialog::GetReplaceString
-3561=CDaoQueryDef::GetReturnsRecords
-3562=CFileFind::GetRoot
-3563=CGopherFileFind::GetRoot
-3564=CCmdTarget::GetRoutingFrame
-3565=CCmdTarget::GetRoutingView
-3566=CSplitterWnd::GetRowInfo
-3567=CAnimateCtrl::GetRuntimeClass
-3568=CArchiveException::GetRuntimeClass
-3569=CAsyncMonikerFile::GetRuntimeClass
-3570=CAsyncSocket::GetRuntimeClass
-3571=CBitmap::GetRuntimeClass
-3572=CBitmapButton::GetRuntimeClass
-3573=CBrush::GetRuntimeClass
-3574=CButton::GetRuntimeClass
-3575=CByteArray::GetRuntimeClass
-3576=CCachedDataPathProperty::GetRuntimeClass
-3577=CCheckListBox::GetRuntimeClass
-3578=CClientDC::GetRuntimeClass
-3579=CCmdTarget::GetRuntimeClass
-3580=CColorDialog::GetRuntimeClass
-3581=CColorPropPage::GetRuntimeClass
-3582=CComboBox::GetRuntimeClass
-3583=CControlBar::GetRuntimeClass
-3584=CCriticalSection::GetRuntimeClass
-3585=CCtrlView::GetRuntimeClass
-3586=CDaoDatabase::GetRuntimeClass
-3587=CDaoException::GetRuntimeClass
-3588=CDaoQueryDef::GetRuntimeClass
-3589=CDaoRecordset::GetRuntimeClass
-3590=CDaoRecordView::GetRuntimeClass
-3591=CDaoTableDef::GetRuntimeClass
-3592=CDaoWorkspace::GetRuntimeClass
-3593=CDatabase::GetRuntimeClass
-3594=CDataPathProperty::GetRuntimeClass
-3595=CDBException::GetRuntimeClass
-3596=CDC::GetRuntimeClass
-3597=CDialog::GetRuntimeClass
-3598=CDialogBar::GetRuntimeClass
-3599=CDocItem::GetRuntimeClass
-3600=CDockBar::GetRuntimeClass
-3601=CDockState::GetRuntimeClass
-3602=CDocManager::GetRuntimeClass
-3603=CDocObjectServer::GetRuntimeClass
-3604=CDocObjectServerItem::GetRuntimeClass
-3605=CDocTemplate::GetRuntimeClass
-3606=CDocument::GetRuntimeClass
-3607=CDragListBox::GetRuntimeClass
-3608=CDWordArray::GetRuntimeClass
-3609=CDynLinkLibrary::GetRuntimeClass
-3610=CEdit::GetRuntimeClass
-3611=CEditView::GetRuntimeClass
-3612=CEvent::GetRuntimeClass
-3613=CException::GetRuntimeClass
-3614=CFile::GetRuntimeClass
-3615=CFileDialog::GetRuntimeClass
-3616=CFileException::GetRuntimeClass
-3617=CFileFind::GetRuntimeClass
-3618=CFindReplaceDialog::GetRuntimeClass
-3619=CFont::GetRuntimeClass
-3620=CFontDialog::GetRuntimeClass
-3621=CFontPropPage::GetRuntimeClass
-3622=CFormView::GetRuntimeClass
-3623=CFrameWnd::GetRuntimeClass
-3624=CFtpConnection::GetRuntimeClass
-3625=CFtpFileFind::GetRuntimeClass
-3626=CGdiObject::GetRuntimeClass
-3627=CGopherConnection::GetRuntimeClass
-3628=CGopherFile::GetRuntimeClass
-3629=CGopherFileFind::GetRuntimeClass
-3630=CHeaderCtrl::GetRuntimeClass
-3631=CHotKeyCtrl::GetRuntimeClass
-3632=CHttpConnection::GetRuntimeClass
-3633=CHttpFile::GetRuntimeClass
-3634=CImageList::GetRuntimeClass
-3635=CInternetConnection::GetRuntimeClass
-3636=CInternetException::GetRuntimeClass
-3637=CInternetFile::GetRuntimeClass
-3638=CInternetSession::GetRuntimeClass
-3639=CListBox::GetRuntimeClass
-3640=CListCtrl::GetRuntimeClass
-3641=CListView::GetRuntimeClass
-3642=CLongBinary::GetRuntimeClass
-3643=CMapPtrToPtr::GetRuntimeClass
-3644=CMapPtrToWord::GetRuntimeClass
-3645=CMapStringToOb::GetRuntimeClass
-3646=CMapStringToPtr::GetRuntimeClass
-3647=CMapStringToString::GetRuntimeClass
-3648=CMapWordToOb::GetRuntimeClass
-3649=CMapWordToPtr::GetRuntimeClass
-3650=CMDIChildWnd::GetRuntimeClass
-3651=CMDIFrameWnd::GetRuntimeClass
-3652=CMemFile::GetRuntimeClass
-3653=CMemoryException::GetRuntimeClass
-3654=CMenu::GetRuntimeClass
-3655=CMetaFileDC::GetRuntimeClass
-3656=CMiniDockFrameWnd::GetRuntimeClass
-3657=CMiniFrameWnd::GetRuntimeClass
-3658=CMonikerFile::GetRuntimeClass
-3659=CMultiDocTemplate::GetRuntimeClass
-3660=CMutex::GetRuntimeClass
-3661=CNotSupportedException::GetRuntimeClass
-3662=CObArray::GetRuntimeClass
-3663=CObject::GetRuntimeClass
-3664=CObList::GetRuntimeClass
-3665=COleBusyDialog::GetRuntimeClass
-3666=COleChangeIconDialog::GetRuntimeClass
-3667=COleChangeSourceDialog::GetRuntimeClass
-3668=COleClientItem::GetRuntimeClass
-3669=COleControl::GetRuntimeClass
-3670=COleControlModule::GetRuntimeClass
-3671=COleConvertDialog::GetRuntimeClass
-3672=COleDialog::GetRuntimeClass
-3673=COleDispatchException::GetRuntimeClass
-3674=COleDocIPFrameWnd::GetRuntimeClass
-3675=COleDocument::GetRuntimeClass
-3676=COleException::GetRuntimeClass
-3677=COleInsertDialog::GetRuntimeClass
-3678=COleIPFrameWnd::GetRuntimeClass
-3679=COleLinkingDoc::GetRuntimeClass
-3680=COleLinksDialog::GetRuntimeClass
-3681=COleObjectFactory::GetRuntimeClass
-3682=COlePasteSpecialDialog::GetRuntimeClass
-3683=COlePropertiesDialog::GetRuntimeClass
-3684=COlePropertyPage::GetRuntimeClass
-3685=COleResizeBar::GetRuntimeClass
-3686=COleServerDoc::GetRuntimeClass
-3687=COleServerItem::GetRuntimeClass
-3688=COleStreamFile::GetRuntimeClass
-3689=COleUpdateDialog::GetRuntimeClass
-3690=CPageSetupDialog::GetRuntimeClass
-3691=CPaintDC::GetRuntimeClass
-3692=CPalette::GetRuntimeClass
-3693=CPen::GetRuntimeClass
-3694=CPicturePropPage::GetRuntimeClass
-3695=CPreviewDC::GetRuntimeClass
-3696=CPreviewView::GetRuntimeClass
-3697=CPrintDialog::GetRuntimeClass
-3698=CProgressCtrl::GetRuntimeClass
-3699=CPropertyPage::GetRuntimeClass
-3700=CPropertySheet::GetRuntimeClass
-3701=CPtrArray::GetRuntimeClass
-3702=CPtrList::GetRuntimeClass
-3703=CRecordset::GetRuntimeClass
-3704=CRecordView::GetRuntimeClass
-3705=CResourceException::GetRuntimeClass
-3706=CRgn::GetRuntimeClass
-3707=CRichEditCntrItem::GetRuntimeClass
-3708=CRichEditCtrl::GetRuntimeClass
-3709=CRichEditDoc::GetRuntimeClass
-3710=CRichEditView::GetRuntimeClass
-3711=CScrollBar::GetRuntimeClass
-3712=CScrollView::GetRuntimeClass
-3713=CSemaphore::GetRuntimeClass
-3714=CSharedFile::GetRuntimeClass
-3715=CSingleDocTemplate::GetRuntimeClass
-3716=CSliderCtrl::GetRuntimeClass
-3717=CSocket::GetRuntimeClass
-3718=CSocketFile::GetRuntimeClass
-3719=CSpinButtonCtrl::GetRuntimeClass
-3720=CSplitterWnd::GetRuntimeClass
-3721=CStatic::GetRuntimeClass
-3722=CStatusBar::GetRuntimeClass
-3723=CStatusBarCtrl::GetRuntimeClass
-3724=CStdioFile::GetRuntimeClass
-3725=CStockPropPage::GetRuntimeClass
-3726=CStringArray::GetRuntimeClass
-3727=CStringList::GetRuntimeClass
-3728=CSyncObject::GetRuntimeClass
-3729=CTabCtrl::GetRuntimeClass
-3730=CToolBar::GetRuntimeClass
-3731=CToolBarCtrl::GetRuntimeClass
-3732=CToolTipCtrl::GetRuntimeClass
-3733=CTreeCtrl::GetRuntimeClass
-3734=CTreeView::GetRuntimeClass
-3735=CUIntArray::GetRuntimeClass
-3736=CUserException::GetRuntimeClass
-3737=CView::GetRuntimeClass
-3738=CWinApp::GetRuntimeClass
-3739=CWindowDC::GetRuntimeClass
-3740=CWindowlessDC::GetRuntimeClass
-3741=CWinThread::GetRuntimeClass
-3742=CWnd::GetRuntimeClass
-3743=CWordArray::GetRuntimeClass
-3744=CWnd::GetSafeOwner
-3745=CColorDialog::GetSavedCustomColors
-3746=CGopherFileFind::GetScreenName
-3747=CDockState::GetScreenSize
-3748=CView::GetScrollBarCtrl
-3749=CWnd::GetScrollBarCtrl
-3750=CScrollView::GetScrollBarSizes
-3751=CScrollView::GetScrollBarState
-3752=CWnd::GetScrollInfo
-3753=CWnd::GetScrollLimit
-3754=CWnd::GetScrollPos
-3755=CScrollView::GetScrollPosition
-3756=CWnd::GetScrollRange
-3757=CSplitterWnd::GetScrollStyle
-3758=COleDateTime::GetSecond
-3759=COleDateTimeSpan::GetSeconds
-3760=CPropertySet::GetSection
-3761=CWinApp::GetSectionKey
-3762=CPropertySection::GetSectionName
-3763=CRichEditCtrl::GetSel
-3764=CRichEditView::GetSelectedItem
-3765=CEditView::GetSelectedText
-3766=CSliderCtrl::GetSelection
-3767=CRichEditCtrl::GetSelectionCharFormat
-3768=COleConvertDialog::GetSelectionType
-3769=COleInsertDialog::GetSelectionType
-3770=COlePasteSpecialDialog::GetSelectionType
-3771=CRichEditCtrl::GetSelText
-3772=CInternetConnection::GetServerName
-3773=CPropertySection::GetSize
-3774=CDialogTemplate::GetSizeInDialogUnits
-3775=CDialogTemplate::GetSizeInPixels
-3776=CBlobProperty::GetSizeMax
-3777=COleControl::XPersistMemory::GetSizeMax
-3778=COleControl::XPersistStreamInit::GetSizeMax
-3779=CSplitterWnd::GetSizingParent
-3780=CAsyncSocket::GetSockName
-3781=CDaoTableDef::GetSourceTableName
-3782=CDaoQueryDef::GetSQL
-3783=CDaoRecordset::GetSQL
-3784=CCmdTarget::GetStackSize
-3785=CCmdTarget::GetStandardProp
-3786=CConnectionPoint::GetStartPosition
-3787=COleDocument::GetStartPosition
-3788=CRichEditDoc::GetStartPosition
-3789=CFile::GetStatus
-3790=CFile::GetStatus
-3791=CMemFile::GetStatus
-3792=COleStreamFile::GetStatus
-3793=COleControl::GetStockTextMetrics
-3794=COleStreamFile::GetStorageName
-3795=COleStreamFile::GetStream
-3796=COleControlSite::GetStyle
-3797=CWnd::GetStyle
-3798=CWnd::GetSuperWndProcAddr
-3799=CDaoDatabase::GetTableDefCount
-3800=CDaoDatabase::GetTableDefInfo
-3801=CDaoDatabase::GetTableDefInfo
-3802=CDialogTemplate::GetTemplateSize
-3803=CListBox::GetText
-3804=COleControl::GetText
-3805=CStatusBarCtrl::GetText
-3806=CStatusBarCtrl::GetText
-3807=CToolTipCtrl::GetText
-3808=CRecordset::GetTextLen
-3809=CStatusBarCtrl::GetTextLength
-3810=COleDateTime::GetTickCount
-3811=CTime::GetTickCount
-3812=CToolTipCtrl::GetToolInfo
-3813=CWnd::GetTopLevelFrame
-3814=CWnd::GetTopLevelOwner
-3815=CWnd::GetTopLevelParent
-3816=CScrollView::GetTrueClientSize
-3817=CRectTracker::GetTrueRect
-3818=CDaoQueryDef::GetType
-3819=CDaoRecordset::GetType
-3820=CPictureHolder::GetType
-3821=CProperty::GetType
-3822=COleDispatchImpl::GetTypeInfo
-3823=COleControlSite::XAmbientProps::GetTypeInfo
-3824=COleControlSite::XEventSink::GetTypeInfo
-3825=CCmdTarget::GetTypeInfoCount
-3826=COleDispatchImpl::GetTypeInfoCount
-3827=COleControlSite::XAmbientProps::GetTypeInfoCount
-3828=COleControlSite::XEventSink::GetTypeInfoCount
-3829=CCmdTarget::GetTypeInfoOfGuid
-3830=CCmdTarget::GetTypeLib
-3831=CCmdTarget::GetTypeLibCache
-3832=COleSafeArray::GetUBound
-3833=CDocObjectServer::XOleObject::GetUserClassID
-3834=COleControl::XOleObject::GetUserClassID
-3835=COleServerDoc::XOleObject::GetUserClassID
-3836=COleServerItem::XOleObject::GetUserClassID
-3837=CDaoWorkspace::GetUserNameA
-3838=COleClientItem::GetUserType
-3839=COleControl::GetUserType
-3840=CDocObjectServer::XOleObject::GetUserType
-3841=COleControl::XOleObject::GetUserType
-3842=COleServerDoc::XOleObject::GetUserType
-3843=COleServerItem::XOleObject::GetUserType
-3844=CDaoRecordset::GetValidationRule
-3845=CDaoTableDef::GetValidationRule
-3846=CDaoRecordset::GetValidationText
-3847=CDaoTableDef::GetValidationText
-3848=CMapPtrToPtr::GetValueAt
-3849=CHttpFile::GetVerb
-3850=CDaoDatabase::GetVersion
-3851=CDaoWorkspace::GetVersion
-3852=CDockState::GetVersion
-3853=CRichEditDoc::GetView
-3854=COlePropertiesDialog::XOleUIObjInfo::GetViewInfo
-3855=COleControl::XViewObject::GetViewStatus
-3856=COleControl::XOleInPlaceActiveObject::GetWindow
-3857=COleServerDoc::XOleInPlaceActiveObject::GetWindow
-3858=COleFrameHook::XOleInPlaceFrame::GetWindow
-3859=COleControl::XOleInPlaceObject::GetWindow
-3860=COleServerDoc::XOleInPlaceObject::GetWindow
-3861=COleControlContainer::XOleIPFrame::GetWindow
-3862=COleClientItem::XOleIPSite::GetWindow
-3863=COleControlSite::XOleIPSite::GetWindow
-3864=CRichEditCntrItem::GetWindowContext
-3865=CRichEditView::GetWindowContext
-3866=COleClientItem::XOleIPSite::GetWindowContext
-3867=COleControlSite::XOleIPSite::GetWindowContext
-3868=COleControl::GetWindowlessDropTarget
-3869=CMDIFrameWnd::GetWindowMenuPopup
-3870=CWnd::GetWindowPlacement
-3871=COleControlSite::GetWindowTextA
-3872=COleControlSite::GetWindowTextA
-3873=CWnd::GetWindowTextA
-3874=CWnd::GetWindowTextA
-3875=COleControlSite::GetWindowTextLengthA
-3876=CWnd::GetWindowTextLengthA
-3877=CDaoWorkspace::GetWorkspaceCount
-3878=CDaoWorkspace::GetWorkspaceInfo
-3879=CDaoWorkspace::GetWorkspaceInfo
-3880=COleDateTime::GetYear
-3881=COleServerDoc::GetZoomFactor
-3882=COleDropSource::GiveFeedback
-3883=COleDropSource::XDropSource::GiveFeedback
-3884=CWnd::GrayCtlColor
-3885=CDC::GrayStringA
-3886=CPreviewDC::GrayStringA
-3887=CMemFile::GrowFile
-3888=_GUIDconstCColorPropPage::guid
-3889=_GUIDconstCFontPropPage::guid
-3890=_GUIDconstCPicturePropPage::guid
-3891=CWnd::HandleFloatingSysCommand
-3892=COleMessageFilter::XMessageFilter::HandleInComingCall
-3893=CDialog::HandleInitDialog
-3894=CDialogBar::HandleInitDialog
-3895=CFormView::HandleInitDialog
-3896=CPropertySheet::HandleInitDialog
-3897=CDialog::HandleSetFont
-3898=COleControl::XPersistStorage::HandsOffStorage
-3899=COleServerDoc::XPersistStorage::HandsOffStorage
-3900=COleDocument::HasBlankItems
-3901=CDialogTemplate::HasFont
-3902=HashKey
-3903=HashKey
-3904=COlePropertyPage::XPropertyPage::Help
-3905=CDumpContext::HexDump
-3906=CWinApp::HideApplication
-3907=CFileDialog::HideControl
-3908=CDC::HIMETRICtoDP
-3909=CDC::HIMETRICtoLP
-3910=CListCtrl::HitTest
-3911=CRectTracker::HitTest
-3912=CSplitterWnd::HitTest
-3913=CToolTipCtrl::HitTest
-3914=CTreeCtrl::HitTest
-3915=CRectTracker::HitTestHandles
-3916=CSplitterWnd::IdFromRowCol
-3917=CDaoWorkspace::Idle
-3918=COlePropertyPage::IgnoreApply
-3919=COleControl::IgnoreWindowMessage
-3920=CRect::InflateRect
-3921=CRect::InflateRect
-3922=CWinApp::InitApplication
-3923=COleControl::XOleCache::InitCache
-3924=CWnd::InitControlContainer
-3925=CDaoWorkspace::InitDatabasesCollection
-3926=CPropertyPage::InitDialogInfo
-3927=CDaoException::InitErrorsCollection
-3928=CDaoQueryDef::InitFieldsCollection
-3929=CDaoRecordset::InitFieldsCollection
-3930=CDaoTableDef::InitFieldsCollection
-3931=CDocObjectServer::XOleObject::InitFromData
-3932=COleControl::XOleObject::InitFromData
-3933=COleServerDoc::XOleObject::InitFromData
-3934=COleServerItem::XOleObject::InitFromData
-3935=CMapPtrToPtr::InitHashTable
-3936=CMapPtrToWord::InitHashTable
-3937=CMapStringToOb::InitHashTable
-3938=CMapStringToPtr::InitHashTable
-3939=CMapStringToString::InitHashTable
-3940=CMapWordToOb::InitHashTable
-3941=CMapWordToPtr::InitHashTable
-3942=CDataSourceControl::Initialize
-3943=CMiniFrameWnd::Initialize
-3944=CDaoWorkspace::InitializeEngine
-3945=CFontHolder::InitializeFont
-3946=COleControl::InitializeIIDs
-3947=CEditView::InitializeReplace
-3948=CDocTemplate::InitialUpdateFrame
-3949=CFrameWnd::InitialUpdateFrame
-3950=CDaoRecordset::InitIndexesCollection
-3951=CDaoTableDef::InitIndexesCollection
-3952=COleControlModule::InitInstance
-3953=CWinApp::InitInstance
-3954=CWinThread::InitInstance
-3955=CDockContext::InitLoop
-3956=CDialog::InitModalIndirect
-3957=CDialog::InitModalIndirect
-3958=COleControl::XPersistMemory::InitNew
-3959=COleControl::XPersistPropertyBag::InitNew
-3960=COleControl::XPersistStorage::InitNew
-3961=COleServerDoc::XPersistStorage::InitNew
-3962=COleControl::XPersistStreamInit::InitNew
-3963=CDaoQueryDef::InitParametersCollection
-3964=CDaoDatabase::InitQueryDefsCollection
-3965=CRecordset::InitRecord
-3966=CDaoDatabase::InitRelationsCollection
-3967=COleControl::InitStockEventMask
-3968=COleControl::InitStockPropMask
-3969=CSimpleException::InitString
-3970=CDaoDatabase::InitTableDefsCollection
-3971=CDaoDatabase::InitWorkspace
-3972=CDaoWorkspace::InitWorkspacesCollection
-3973=COleControl::XOleInPlaceObject::InPlaceDeactivate
-3974=COleServerDoc::XOleInPlaceObject::InPlaceDeactivate
-3975=CDockBar::Insert
-3976=CObList::InsertAfter
-3977=CPtrList::InsertAfter
-3978=CStringList::InsertAfter
-3979=CByteArray::InsertAt
-3980=CByteArray::InsertAt
-3981=CDWordArray::InsertAt
-3982=CDWordArray::InsertAt
-3983=CObArray::InsertAt
-3984=CObArray::InsertAt
-3985=CPtrArray::InsertAt
-3986=CPtrArray::InsertAt
-3987=CStringArray::InsertAt
-3988=CStringArray::InsertAt
-3989=CUIntArray::InsertAt
-3990=CUIntArray::InsertAt
-3991=CWordArray::InsertAt
-3992=CWordArray::InsertAt
-3993=CObList::InsertBefore
-3994=CPtrList::InsertBefore
-3995=CStringList::InsertBefore
-3996=CListCtrl::InsertColumn
-3997=CRichEditView::InsertFileAsObject
-3998=CListCtrl::InsertItem
-3999=CRichEditView::InsertItem
-4000=CTreeCtrl::InsertItem
-4001=COleFrameHook::XOleInPlaceFrame::InsertMenus
-4002=COleControlContainer::XOleIPFrame::InsertMenus
-4003=AFX_INTERFACEMAPconstCCmdTarget::interfaceMap
-4004=AFX_INTERFACEMAPconstCDocObjectServer::interfaceMap
-4005=AFX_INTERFACEMAPconstCOleClientItem::interfaceMap
-4006=AFX_INTERFACEMAPconstCOleControl::interfaceMap
-4007=AFX_INTERFACEMAPconstCOleDataSource::interfaceMap
-4008=AFX_INTERFACEMAPconstCOleDropSource::interfaceMap
-4009=AFX_INTERFACEMAPconstCOleDropTarget::interfaceMap
-4010=AFX_INTERFACEMAPconstCOleFrameHook::interfaceMap
-4011=AFX_INTERFACEMAPconstCOleLinkingDoc::interfaceMap
-4012=AFX_INTERFACEMAPconstCOleMessageFilter::interfaceMap
-4013=AFX_INTERFACEMAPconstCOleObjectFactory::interfaceMap
-4014=AFX_INTERFACEMAPconstCOlePropertyPage::interfaceMap
-4015=AFX_INTERFACEMAPconstCOleServerDoc::interfaceMap
-4016=AFX_INTERFACEMAPconstCOleServerItem::interfaceMap
-4017=AFX_INTERFACEMAPconstCRichEditView::interfaceMap
-4018=COleControl::InternalGetFont
-4019=COleControl::InternalGetText
-4020=CCmdTarget::InternalQueryInterface
-4021=CCmdTarget::InternalRelease
-4022=CDC::IntersectClipRect
-4023=CDC::IntersectClipRect
-4024=CCheckListBox::InvalidateCheck
-4025=COleControl::InvalidateControl
-4026=CCheckListBox::InvalidateItem
-4027=COleControl::InvalidateRgn
-4028=CMiniFrameWnd::InvertSysMenu
-4029=COleDispatchImpl::Invoke
-4030=COleControlSite::XAmbientProps::Invoke
-4031=COleControlSite::XEventSink::Invoke
-4032=COleControlSite::InvokeHelper
-4033=COleDispatchDriver::InvokeHelper
-4034=CWnd::InvokeHelper
-4035=COleControlSite::InvokeHelperV
-4036=COleDispatchDriver::InvokeHelperV
-4037=CDocItem::IsBlank
-4038=COleServerItem::IsBlank
-4039=CDaoRecordset::IsBOF
-4040=CSplitterWnd::IsChildPane
-4041=COleServerItem::IsConnected
-4042=COleDataObject::IsDataAvailable
-4043=COleControlSite::IsDefaultButton
-4044=CDaoRecordset::IsDeleted
-4045=CRuntimeClass::IsDerivedFrom
-4046=COccManager::IsDialogMessageA
-4047=CWnd::IsDialogMessageA
-4048=CBlobProperty::IsDirty
-4049=COleLinkingDoc::XPersistFile::IsDirty
-4050=COleControl::XPersistMemory::IsDirty
-4051=COleControl::XPersistStorage::IsDirty
-4052=COleServerDoc::XPersistStorage::IsDirty
-4053=COleControl::XPersistStreamInit::IsDirty
-4054=COleControlContainer::IsDlgButtonChecked
-4055=CWnd::IsDlgButtonChecked
-4056=CControlBar::IsDockBar
-4057=CDockBar::IsDockBar
-4058=CFileFind::IsDots
-4059=CGopherFileFind::IsDots
-4060=CCheckListBox::IsEnabled
-4061=CDaoRecordset::IsEOF
-4062=CDaoRecordset::IsFieldDirty
-4063=CRecordset::IsFieldDirty
-4064=CDaoRecordset::IsFieldNull
-4065=CRecordset::IsFieldNull
-4066=CDaoRecordset::IsFieldNullable
-4067=CRecordset::IsFieldNullable
-4068=CRecordset::IsFieldNullable
-4069=CDaoRecordset::IsFieldStatusDirty
-4070=CRecordset::IsFieldStatusDirty
-4071=CDaoRecordset::IsFieldStatusNull
-4072=CRecordset::IsFieldStatusNull
-4073=CDaoRecordset::IsFieldStatusNullable
-4074=CDaoRecordset::IsFieldStatusNullableKnown
-4075=CFieldExchange::IsFieldType
-4076=CControlBar::IsFloating
-4077=CFrameWnd::IsFrameWnd
-4078=CWnd::IsFrameWnd
-4079=CWinThread::IsIdleMessage
-4080=CCmdTarget::IsInvokeAllowed
-4081=COleControl::IsInvokeAllowed
-4082=CRecordset::IsJoin
-4083=CObject::IsKindOf
-4084=COccManager::IsLabelControl
-4085=COleObjectFactory::IsLicenseValid
-4086=CDaoRecordset::IsMatch
-4087=COccManager::IsMatchingMnemonic
-4088=COleControlSite::IsMatchingMnemonic
-4089=CDocument::IsModified
-4090=COleClientItem::IsModified
-4091=COleControl::IsModified
-4092=COlePropertyPage::IsModified
-4093=CRichEditDoc::IsModified
-4094=CDaoFieldExchange::IsNullValue
-4095=CDaoRecordView::IsOnFirstRecord
-4096=CRecordView::IsOnFirstRecord
-4097=CDaoRecordView::IsOnLastRecord
-4098=CRecordView::IsOnLastRecord
-4099=CRecordset::IsOpen
-4100=COlePropertyPage::XPropertyPage::IsPageDirty
-4101=CRecordset::IsParamStatusNull
-4102=CRecordset::IsRecordsetUpdatable
-4103=COleObjectFactory::IsRegistered
-4104=CCmdTarget::IsResultExpected
-4105=CRichEditView::IsRichEditFormat
-4106=COleLinkingDoc::XOleItemContainer::IsRunning
-4107=CRichEditView::IsSelected
-4108=CView::IsSelected
-4109=CRecordset::IsSelectQueryUpdatable
-4110=CObject::IsSerializable
-4111=COleMessageFilter::IsSignificantMessage
-4112=CRecordset::IsSQLUpdatable
-4113=COleControl::IsSubclassedControl
-4114=CWnd::IsTopParentActive
-4115=CFrameWnd::IsTracking
-4116=CDocObjectServer::XOleObject::IsUpToDate
-4117=COleControl::XOleObject::IsUpToDate
-4118=COleServerDoc::XOleObject::IsUpToDate
-4119=COleServerItem::XOleObject::IsUpToDate
-4120=CDaoFieldExchange::IsValidOperation
-4121=CControlBar::IsVisible
-4122=COleControlSite::IsWindowEnabled
-4123=CWnd::IsWindowEnabled
-4124=CListBox::ItemFromPoint
-4125=CTreeCtrl::ItemHasChildren
-4126=COleControl::KeyDown
-4127=COleControl::KeyUp
-4128=CAsyncSocket::KillSocket
-4129=CString::Left
-4130=CRichEditCtrl::LineIndex
-4131=CRichEditCtrl::LineLength
-4132=CRichEditCtrl::LineScroll
-4133=CDC::LineTo
-4134=ulongCRichEditView::lMaxSize
-4135=CBlobProperty::Load
-4136=CDialogTemplate::Load
-4137=COleControl::Load
-4138=CRuntimeClass::Load
-4139=COleLinkingDoc::XPersistFile::Load
-4140=COleControl::XPersistMemory::Load
-4141=COleControl::XPersistPropertyBag::Load
-4142=COleControl::XPersistStorage::Load
-4143=COleServerDoc::XPersistStorage::Load
-4144=COleControl::XPersistStreamInit::Load
-4145=CFrameWnd::LoadAccelTable
-4146=CFrameWnd::LoadBarState
-4147=CToolBar::LoadBitmapA
-4148=CBitmapButton::LoadBitmaps
-4149=CDaoRecordset::LoadFields
-4150=CRecordset::LoadFields
-4151=CFrameWnd::LoadFrame
-4152=CMDIChildWnd::LoadFrame
-4153=CMDIFrameWnd::LoadFrame
-4154=COleIPFrameWnd::LoadFrame
-4155=COleDocument::LoadFromStorage
-4156=CControlBarInfo::LoadState
-4157=CDockState::LoadState
-4158=COleControl::LoadState
-4159=CWinApp::LoadStdProfileSettings
-4160=CString::LoadStringA
-4161=CDocTemplate::LoadTemplate
-4162=CMultiDocTemplate::LoadTemplate
-4163=CToolBar::LoadToolBar
-4164=CCriticalSection::Lock
-4165=CMultiLock::Lock
-4166=COleSafeArray::Lock
-4167=CSingleLock::Lock
-4168=CSyncObject::Lock
-4169=CTypeLibCache::Lock
-4170=CEditView::LockBuffer
-4171=CString::LockBuffer
-4172=COleControlContainer::XOleContainer::LockContainer
-4173=COleLinkingDoc::XOleItemContainer::LockContainer
-4174=COleLinkingDoc::LockExternal
-4175=COleControl::LockInPlaceActive
-4176=COleControlSite::XOleControlSite::LockInPlaceActive
-4177=CFile::LockRange
-4178=CInternetFile::LockRange
-4179=CMemFile::LockRange
-4180=COleStreamFile::LockRange
-4181=CSocketFile::LockRange
-4182=CStdioFile::LockRange
-4183=CArchiveStream::LockRegion
-4184=COleObjectFactory::XClassFactory::LockServer
-4185=CMapPtrToPtr::Lookup
-4186=CMapPtrToWord::Lookup
-4187=CMapStringToOb::Lookup
-4188=CMapStringToPtr::Lookup
-4189=CMapStringToString::Lookup
-4190=CMapWordToOb::Lookup
-4191=CMapWordToPtr::Lookup
-4192=COleDataSource::Lookup
-4193=CTypeLibCache::Lookup
-4194=CAsyncSocket::LookupHandle
-4195=CRichEditDoc::LookupItem
-4196=CMapStringToOb::LookupKey
-4197=CMapStringToPtr::LookupKey
-4198=CMapStringToString::LookupKey
-4199=CTypeLibCache::LookupTypeInfo
-4200=CDC::LPtoDP
-4201=CDC::LPtoHIMETRIC
-4202=CString::MakeLower
-4203=CString::MakeReverse
-4204=CString::MakeUpper
-4205=CArchive::MapObject
-4206=COleControl::XPerPropertyBrowsing::MapPropertyToPage
-4207=COleDialog::MapResult
-4208=CPropertyPage::MapWizardResult
-4209=CDaoRecordset::MarkForAddNew
-4210=CRecordset::MarkForAddNew
-4211=CDaoRecordset::MarkForEdit
-4212=CRecordset::MarkForUpdate
-4213=CRichEditDoc::MarkItemsClear
-4214=CDocTemplate::MatchDocType
-4215=CFileFind::MatchesMask
-4216=CMDIFrameWnd::MDIGetActive
-4217=CCheckListBox::MeasureItem
-4218=CComboBox::MeasureItem
-4219=CListBox::MeasureItem
-4220=CMenu::MeasureItem
-4221=CCmdTarget::MemberIDFromName
-4222=CMemFile::Memcpy
-4223=COlePropertyPage::MessageBoxA
-4224=CWnd::MessageBoxA
-4225=AFX_MSGMAPconstCCheckListBox::messageMap
-4226=AFX_MSGMAPconstCCmdTarget::messageMap
-4227=AFX_MSGMAPconstCColorDialog::messageMap
-4228=AFX_MSGMAPconstCColorPropPage::messageMap
-4229=AFX_MSGMAPconstCCommonDialog::messageMap
-4230=AFX_MSGMAPconstCControlBar::messageMap
-4231=AFX_MSGMAPconstCControlFrameWnd::messageMap
-4232=AFX_MSGMAPconstCCtrlView::messageMap
-4233=AFX_MSGMAPconstCDaoRecordView::messageMap
-4234=AFX_MSGMAPconstCDialog::messageMap
-4235=AFX_MSGMAPconstCDialogBar::messageMap
-4236=AFX_MSGMAPconstCDockBar::messageMap
-4237=AFX_MSGMAPconstCDocObjectServer::messageMap
-4238=AFX_MSGMAPconstCDocument::messageMap
-4239=AFX_MSGMAPconstCEditView::messageMap
-4240=AFX_MSGMAPconstCFontPropPage::messageMap
-4241=AFX_MSGMAPconstCFormView::messageMap
-4242=AFX_MSGMAPconstCFrameWnd::messageMap
-4243=AFX_MSGMAPconstCListCtrl::messageMap
-4244=AFX_MSGMAPconstCListView::messageMap
-4245=AFX_MSGMAPconstCMDIChildWnd::messageMap
-4246=AFX_MSGMAPconstCMDIFrameWnd::messageMap
-4247=AFX_MSGMAPconstCMiniDockFrameWnd::messageMap
-4248=AFX_MSGMAPconstCMiniFrameWnd::messageMap
-4249=AFX_MSGMAPconstCOleControl::messageMap
-4250=AFX_MSGMAPconstCOleDocIPFrameWnd::messageMap
-4251=AFX_MSGMAPconstCOleIPFrameWnd::messageMap
-4252=AFX_MSGMAPconstCOlePropertyPage::messageMap
-4253=AFX_MSGMAPconstCOleResizeBar::messageMap
-4254=AFX_MSGMAPconstCOleServerDoc::messageMap
-4255=AFX_MSGMAPconstCPicturePropPage::messageMap
-4256=AFX_MSGMAPconstCPreviewView::messageMap
-4257=AFX_MSGMAPconstCPrintDialog::messageMap
-4258=AFX_MSGMAPconstCPropertyPage::messageMap
-4259=AFX_MSGMAPconstCPropertySheet::messageMap
-4260=AFX_MSGMAPconstCRecordView::messageMap
-4261=AFX_MSGMAPconstCRichEditView::messageMap
-4262=AFX_MSGMAPconstCScrollView::messageMap
-4263=AFX_MSGMAPconstCSocketWnd::messageMap
-4264=AFX_MSGMAPconstCSplitterWnd::messageMap
-4265=AFX_MSGMAPconstCStatusBar::messageMap
-4266=AFX_MSGMAPconstCStockPropPage::messageMap
-4267=AFX_MSGMAPconstCTabCtrl::messageMap
-4268=AFX_MSGMAPconstCToolBar::messageMap
-4269=AFX_MSGMAPconstCToolBarCtrl::messageMap
-4270=AFX_MSGMAPconstCToolTipCtrl::messageMap
-4271=AFX_MSGMAPconstCTreeCtrl::messageMap
-4272=AFX_MSGMAPconstCTreeView::messageMap
-4273=AFX_MSGMAPconstCView::messageMap
-4274=AFX_MSGMAPconstCWinApp::messageMap
-4275=AFX_MSGMAPconstCWnd::messageMap
-4276=COleMessageFilter::XMessageFilter::MessagePending
-4277=CString::Mid
-4278=CString::Mid
-4279=CPreviewDC::MirrorAttributes
-4280=CPreviewDC::MirrorFont
-4281=CPreviewDC::MirrorMappingMode
-4282=CPreviewDC::MirrorViewportOrg
-4283=COleControlSite::ModifyStyle
-4284=CWnd::ModifyStyle
-4285=CWnd::ModifyStyle
-4286=COleControlSite::ModifyStyleEx
-4287=CWnd::ModifyStyleEx
-4288=CWnd::ModifyStyleEx
-4289=CDaoRecordset::Move
-4290=CDockContext::Move
-4291=CRecordset::Move
-4292=COlePropertyPage::XPropertyPage::Move
-4293=CDaoRecordset::MoveFirst
-4294=CDaoRecordset::MoveLast
-4295=CDaoRecordset::MoveNext
-4296=CDaoRecordset::MovePrev
-4297=CDC::MoveTo
-4298=COleControlSite::MoveWindow
-4299=CWnd::MoveWindow
-4300=CRect::MulDiv
-4301=uintCOleDropSource::nDragDelay
-4302=uintCOleDropSource::nDragMinDist
-4303=CFrameWnd::NegotiateBorderSpace
-4304=CMapPtrToPtr::NewAssoc
-4305=CMapPtrToWord::NewAssoc
-4306=CMapStringToOb::NewAssoc
-4307=CMapStringToPtr::NewAssoc
-4308=CMapStringToString::NewAssoc
-4309=CMapWordToOb::NewAssoc
-4310=CMapWordToPtr::NewAssoc
-4311=CObList::NewNode
-4312=CPtrList::NewNode
-4313=CStringList::NewNode
-4314=CEnumArray::XEnumVOID::Next
-4315=uintconstCEditView::nMaxSize
-4316=CRectTracker::NormalizeHit
-4317=CRect::NormalizeRect
-4318=CDataBoundProperty::Notify
-4319=COleFrameHook::NotifyAllInPlace
-4320=COleServerDoc::NotifyAllItems
-4321=COleServerItem::NotifyClient
-4322=CFrameWnd::NotifyFloatingWindows
-4323=COleServerDoc::NotifyRename
-4324=uintCOleDropTarget::nScrollDelay
-4325=intCOleDropTarget::nScrollInset
-4326=uintCOleDropTarget::nScrollInterval
-4327=CString::OemToCharA
-4328=CDC::OffsetClipRgn
-4329=CDC::OffsetClipRgn
-4330=CDC::OffsetViewportOrg
-4331=CMetaFileDC::OffsetViewportOrg
-4332=CPreviewDC::OffsetViewportOrg
-4333=CDC::OffsetWindowOrg
-4334=COleControlSite::XNotifyDBEvents::OKToDo
-4335=CAsyncSocket::OnAccept
-4336=CControlFrameWnd::OnActivate
-4337=CFrameWnd::OnActivate
-4338=COleClientItem::OnActivate
-4339=COleFrameHook::OnActivate
-4340=CFormView::OnActivateFrame
-4341=CView::OnActivateFrame
-4342=COleControl::OnActivateInPlace
-4343=CFrameWnd::OnActivateTopLevel
-4344=CWnd::OnActivateTopLevel
-4345=COleClientItem::OnActivateUI
-4346=CDocObjectServer::OnActivateView
-4347=CFormView::OnActivateView
-4348=CPreviewView::OnActivateView
-4349=CView::OnActivateView
-4350=CToolTipCtrl::OnAddTool
-4351=CConnectionPoint::OnAdvise
-4352=COleControl::XEventConnPt::OnAdvise
-4353=CWnd::OnAmbientProperty
-4354=COleControl::OnAmbientPropertyChange
-4355=COleControl::XOleControl::OnAmbientPropertyChange
-4356=COleControl::OnAppearanceChanged
-4357=CWinApp::OnAppExit
-4358=CPropertyPage::OnApply
-4359=COlePropertiesDialog::OnApplyScale
-4360=CDocObjectServer::OnApplyViewState
-4361=COleControl::OnBackColorChanged
-4362=CFrameWnd::OnBarCheck
-4363=COleIPFrameWnd::OnBarCheck
-4364=CControlBar::OnBarStyleChange
-4365=CStatusBar::OnBarStyleChange
-4366=CToolBar::OnBarStyleChange
-4367=COleDropSource::OnBeginDrag
-4368=CEditView::OnBeginPrinting
-4369=CRichEditView::OnBeginPrinting
-4370=CView::OnBeginPrinting
-4371=COleControl::OnBorderStyleChanged
-4372=CPicturePropPage::OnBrowse
-4373=CRichEditView::OnBullet
-4374=COleMessageFilter::OnBusyDialog
-4375=CCommonDialog::OnCancel
-4376=CDialog::OnCancel
-4377=CPropertyPage::OnCancel
-4378=CRichEditView::OnCancelEditCntr
-4379=COleControl::OnCancelMode
-4380=CSplitterWnd::OnCancelMode
-4381=CWnd::OnCancelMode
-4382=COleClientItem::OnChange
-4383=COleControl::XFontNotification::OnChanged
-4384=COleControlSite::XPropertyNotifySink::OnChanged
-4385=COlePropertyPage::XPropNotifySink::OnChanged
-4386=CRectTracker::OnChangedRect
-4387=CDocument::OnChangedViewList
-4388=COleClientItem::OnChangeItemPosition
-4389=CRichEditCntrItem::OnChangeItemPosition
-4390=COleControl::OnChar
-4391=CRichEditView::OnCharBold
-4392=CRichEditView::OnCharEffect
-4393=CRichEditView::OnCharItalic
-4394=CWnd::OnCharToItem
-4395=CRichEditView::OnCharUnderline
-4396=CButton::OnChildNotify
-4397=CCheckListBox::OnChildNotify
-4398=CComboBox::OnChildNotify
-4399=CDragListBox::OnChildNotify
-4400=CHeaderCtrl::OnChildNotify
-4401=CListBox::OnChildNotify
-4402=CListCtrl::OnChildNotify
-4403=CListView::OnChildNotify
-4404=CStatusBar::OnChildNotify
-4405=CStatusBarCtrl::OnChildNotify
-4406=CTabCtrl::OnChildNotify
-4407=CWnd::OnChildNotify
-4408=CPicturePropPage::OnClear
-4409=COleControl::OnClick
-4410=CEnumArray::OnClone
-4411=CAsyncSocket::OnClose
-4412=CControlFrameWnd::OnClose
-4413=CFrameWnd::OnClose
-4414=CMiniDockFrameWnd::OnClose
-4415=COleControl::OnClose
-4416=COleServerDoc::OnClose
-4417=CPropertySheet::OnClose
-4418=COleClientItem::XAdviseSink::OnClose
-4419=CDocObjectServer::OnCloseDocument
-4420=CDocument::OnCloseDocument
-4421=COleDocument::OnCloseDocument
-4422=COleLinkingDoc::OnCloseDocument
-4423=COleServerDoc::OnCloseDocument
-4424=CCmdTarget::OnCmdMsg
-4425=CDialog::OnCmdMsg
-4426=CDocument::OnCmdMsg
-4427=CFrameWnd::OnCmdMsg
-4428=CMDIFrameWnd::OnCmdMsg
-4429=COleCntrFrameWnd::OnCmdMsg
-4430=COleDocument::OnCmdMsg
-4431=CPropertySheet::OnCmdMsg
-4432=CView::OnCmdMsg
-4433=CRichEditView::OnColorDefault
-4434=CColorDialog::OnColorOK
-4435=CRichEditView::OnColorPick
-4436=CFrameWnd::OnCommand
-4437=CMDIFrameWnd::OnCommand
-4438=COlePropertyPage::OnCommand
-4439=CPropertySheet::OnCommand
-4440=CSplitterWnd::OnCommand
-4441=CWnd::OnCommand
-4442=CDialog::OnCommandHelp
-4443=CFrameWnd::OnCommandHelp
-4444=CMDIFrameWnd::OnCommandHelp
-4445=CPropertySheet::OnCommandHelp
-4446=CWnd::OnCompareItem
-4447=CAsyncSocket::OnConnect
-4448=CFrameWnd::OnContextHelp
-4449=COleFrameHook::OnContextHelp
-4450=COleIPFrameWnd::OnContextHelp
-4451=CWinApp::OnContextHelp
-4452=COleControlSite::XOleControlSite::OnControlInfoChanged
-4453=CCheckListBox::OnCreate
-4454=CControlBar::OnCreate
-4455=CEditView::OnCreate
-4456=CFormView::OnCreate
-4457=CFrameWnd::OnCreate
-4458=CMDIChildWnd::OnCreate
-4459=COleControl::OnCreate
-4460=COleIPFrameWnd::OnCreate
-4461=CPreviewView::OnCreate
-4462=CRichEditView::OnCreate
-4463=CToolBarCtrl::OnCreate
-4464=CView::OnCreate
-4465=CCmdTarget::OnCreateAggregates
-4466=COleControl::OnCreateAggregates
-4467=CFrameWnd::OnCreateClient
-4468=CMDIFrameWnd::OnCreateClient
-4469=COleIPFrameWnd::OnCreateControlBars
-4470=COleIPFrameWnd::OnCreateControlBars
-4471=CFrameWnd::OnCreateHelper
-4472=COleObjectFactory::OnCreateObject
-4473=COleTemplateServer::OnCreateObject
-4474=CColorDialog::OnCtlColor
-4475=CControlBar::OnCtlColor
-4476=CDialog::OnCtlColor
-4477=COlePropertyPage::OnCtlColor
-4478=CPropertyPage::OnCtlColor
-4479=CPropertySheet::OnCtlColor
-4480=CWnd::OnCtlColor
-4481=CAsyncMonikerFile::OnDataAvailable
-4482=CCachedDataPathProperty::OnDataAvailable
-4483=COleClientItem::OnDataChange
-4484=COleClientItem::XAdviseSink::OnDataChange
-4485=CDocManager::OnDDECommand
-4486=CWinApp::OnDDECommand
-4487=CFrameWnd::OnDDEExecute
-4488=CFrameWnd::OnDDEInitiate
-4489=CFrameWnd::OnDDETerminate
-4490=COleClientItem::OnDeactivate
-4491=COleServerDoc::OnDeactivate
-4492=COleClientItem::OnDeactivateAndUndo
-4493=COleClientItem::OnDeactivateUI
-4494=COleServerDoc::OnDeactivateUI
-4495=CRichEditCntrItem::OnDeactivateUI
-4496=CWnd::OnDeleteItem
-4497=CControlBar::OnDestroy
-4498=CEditView::OnDestroy
-4499=CFrameWnd::OnDestroy
-4500=CMDIChildWnd::OnDestroy
-4501=CMDIFrameWnd::OnDestroy
-4502=COleControl::OnDestroy
-4503=COleIPFrameWnd::OnDestroy
-4504=CRichEditView::OnDestroy
-4505=CTabCtrl::OnDestroy
-4506=CTreeCtrl::OnDestroy
-4507=CTreeView::OnDestroy
-4508=CView::OnDestroy
-4509=CRichEditView::OnDevModeChange
-4510=CWnd::OnDevModeChange
-4511=CToolTipCtrl::OnDisableModal
-4512=COleClientItem::OnDiscardUndoState
-4513=CSplitterWnd::OnDisplayChange
-4514=CWnd::OnDisplayChange
-4515=CPreviewView::OnDisplayPageNumber
-4516=COleFrameHook::OnDocActivate
-4517=COleServerDoc::OnDocWindowActivate
-4518=COleControl::XOleInPlaceActiveObject::OnDocWindowActivate
-4519=COleServerDoc::XOleInPlaceActiveObject::OnDocWindowActivate
-4520=CDocObjectServerItem::OnDoVerb
-4521=COleControl::OnDoVerb
-4522=COleServerItem::OnDoVerb
-4523=COleDropTarget::OnDragEnter
-4524=CView::OnDragEnter
-4525=COleDropTarget::OnDragLeave
-4526=CView::OnDragLeave
-4527=CWnd::OnDragList
-4528=COleDropTarget::OnDragOver
-4529=CView::OnDragOver
-4530=COleDropTarget::OnDragScroll
-4531=CView::OnDragScroll
-4532=CCtrlView::OnDraw
-4533=CFormView::OnDraw
-4534=COleControl::OnDraw
-4535=CPreviewView::OnDraw
-4536=CView::OnDraw
-4537=COleServerItem::OnDrawEx
-4538=CWnd::OnDrawItem
-4539=COleControl::OnDrawMetafile
-4540=CPageSetupDialog::OnDrawPage
-4541=CSplitterWnd::OnDrawSplitter
-4542=COleDropTarget::OnDrop
-4543=CView::OnDrop
-4544=COleDropTarget::OnDropEx
-4545=CView::OnDropEx
-4546=CFrameWnd::OnDropFiles
-4547=CRichEditView::OnDropFiles
-4548=COleControl::OnEdit
-4549=CEditView::OnEditChange
-4550=CFontPropPage::OnEditchangeFontstyles
-4551=COleDocument::OnEditChangeIcon
-4552=CEditView::OnEditClear
-4553=CRichEditView::OnEditClear
-4554=COleDocument::OnEditConvert
-4555=CEditView::OnEditCopy
-4556=CRichEditView::OnEditCopy
-4557=CEditView::OnEditCut
-4558=CRichEditView::OnEditCut
-4559=CEditView::OnEditFind
-4560=CRichEditView::OnEditFind
-4561=CEditView::OnEditFindReplace
-4562=CRichEditView::OnEditFindReplace
-4563=COleDocument::OnEditLinks
-4564=CEditView::OnEditPaste
-4565=CRichEditView::OnEditPaste
-4566=CRichEditView::OnEditPasteSpecial
-4567=CRichEditView::OnEditProperties
-4568=CColorPropPage::OnEditProperty
-4569=CFontPropPage::OnEditProperty
-4570=COlePropertyPage::OnEditProperty
-4571=CPicturePropPage::OnEditProperty
-4572=CStockPropPage::OnEditProperty
-4573=CEditView::OnEditRepeat
-4574=CRichEditView::OnEditRepeat
-4575=CEditView::OnEditReplace
-4576=CRichEditView::OnEditReplace
-4577=CEditView::OnEditSelectAll
-4578=CRichEditView::OnEditSelectAll
-4579=CEditView::OnEditUndo
-4580=CRichEditView::OnEditUndo
-4581=CFontPropPage::OnEditupdateFontnames
-4582=CFontPropPage::OnEditupdateFontsizes
-4583=CFrameWnd::OnEnable
-4584=COleControl::OnEnabledChanged
-4585=COleFrameHook::OnEnableModeless
-4586=CEditView::OnEndPrinting
-4587=CRichEditView::OnEndPrinting
-4588=CView::OnEndPrinting
-4589=CView::OnEndPrintPreview
-4590=CFrameWnd::OnEndSession
-4591=CFrameWnd::OnEnterIdle
-4592=COleControl::OnEnterIdle
-4593=CWnd::OnEnterIdle
-4594=COleControl::OnEnumVerbs
-4595=CFrameWnd::OnEraseBkgnd
-4596=COleResizeBar::OnEraseBkgnd
-4597=CPreviewView::OnEraseBkgnd
-4598=CToolBar::OnEraseBkgnd
-4599=CWnd::OnEraseBkgnd
-4600=CCmdTarget::OnEvent
-4601=COccManager::OnEvent
-4602=COleControlSite::OnEvent
-4603=COleControl::OnEventAdvise
-4604=CDocObjectServer::OnExecOleCmd
-4605=COleServerDoc::OnExecOleCmd
-4606=CDocument::OnFileClose
-4607=CFileDialog::OnFileNameChange
-4608=CFileDialog::OnFileNameOK
-4609=CDocManager::OnFileNew
-4610=CWinApp::OnFileNew
-4611=CDocManager::OnFileOpen
-4612=CWinApp::OnFileOpen
-4613=CView::OnFilePrint
-4614=CView::OnFilePrintPreview
-4615=CWinApp::OnFilePrintSetup
-4616=CDocument::OnFileSave
-4617=CDocument::OnFileSaveAs
-4618=COleServerDoc::OnFileSaveCopyAs
-4619=CDocument::OnFileSendMail
-4620=COleDocument::OnFileSendMail
-4621=COleServerDoc::OnFileUpdate
-4622=CCmdTarget::OnFinalRelease
-4623=CDocument::OnFinalRelease
-4624=COleControl::OnFinalRelease
-4625=COlePropertyPage::OnFinalRelease
-4626=COleServerItem::OnFinalRelease
-4627=CWnd::OnFinalRelease
-4628=COleLinkingDoc::OnFindEmbeddedItem
-4629=CEditView::OnFindNext
-4630=CRichEditView::OnFindNext
-4631=CEditView::OnFindReplaceCmd
-4632=CRichEditView::OnFindReplaceCmd
-4633=CMiniFrameWnd::OnFloatStatus
-4634=COleControlSite::XOleControlSite::OnFocus
-4635=CFileDialog::OnFolderChange
-4636=COleControl::OnFontChanged
-4637=COleControl::OnForeColorChanged
-4638=CRichEditView::OnFormatFont
-4639=COleControl::OnFrameClose
-4640=COleServerDoc::OnFrameWindowActivate
-4641=COleControl::XOleInPlaceActiveObject::OnFrameWindowActivate
-4642=COleServerDoc::XOleInPlaceActiveObject::OnFrameWindowActivate
-4643=COleControl::OnFreezeEvents
-4644=CCheckListBox::OnGetCheckPosition
-4645=COleClientItem::OnGetClipboardData
-4646=COleServerItem::OnGetClipboardData
-4647=COleClientItem::OnGetClipRect
-4648=COleControl::OnGetColorSet
-4649=COleControl::OnGetControlInfo
-4650=COleControl::OnGetDisplayString
-4651=COleControl::OnGetDlgCode
-4652=CRichEditDoc::OnGetEmbeddedItem
-4653=COleServerItem::OnGetExtent
-4654=COleControl::OnGetInPlaceMenu
-4655=COleClientItem::OnGetItemPosition
-4656=COleLinkingDoc::OnGetLinkedItem
-4657=COleServerDoc::OnGetLinkedItem
-4658=CMiniFrameWnd::OnGetMinMaxInfo
-4659=COleControl::OnGetNaturalExtent
-4660=COleControl::OnGetPredefinedStrings
-4661=COleControl::OnGetPredefinedValue
-4662=CMiniFrameWnd::OnGetText
-4663=CStatusBar::OnGetText
-4664=CMiniFrameWnd::OnGetTextLength
-4665=CStatusBar::OnGetTextLength
-4666=COleControl::OnGetViewExtent
-4667=COleControl::OnGetViewRect
-4668=COleControl::OnGetViewStatus
-4669=COleClientItem::OnGetWindowContext
-4670=CWnd::OnGrayCtlColor
-4671=CFrameWnd::OnHelp
-4672=COlePropertyPage::OnHelp
-4673=CWinApp::OnHelp
-4674=CWnd::OnHelp
-4675=CWinApp::OnHelpFinder
-4676=CWnd::OnHelpFinder
-4677=CControlBar::OnHelpHitTest
-4678=CDialog::OnHelpHitTest
-4679=CFrameWnd::OnHelpHitTest
-4680=CWinApp::OnHelpIndex
-4681=CWnd::OnHelpIndex
-4682=CCommonDialog::OnHelpInfo
-4683=CWnd::OnHelpInfo
-4684=CWinApp::OnHelpUsing
-4685=CWnd::OnHelpUsing
-4686=CDocObjectServerItem::OnHide
-4687=COleControl::OnHide
-4688=COleServerItem::OnHide
-4689=COleControl::OnHideToolBars
-4690=CFrameWnd::OnHScroll
-4691=CPreviewView::OnHScroll
-4692=CScrollView::OnHScroll
-4693=CSplitterWnd::OnHScroll
-4694=CWnd::OnHScroll
-4695=CDocTemplate::OnIdle
-4696=CDocument::OnIdle
-4697=COleDocument::OnIdle
-4698=CWinApp::OnIdle
-4699=CWinThread::OnIdle
-4700=CControlBar::OnIdleUpdateCmdUI
-4701=CFrameWnd::OnIdleUpdateCmdUI
-4702=CMDIFrameWnd::OnIdleUpdateCmdUI
-4703=COleCntrFrameWnd::OnIdleUpdateCmdUI
-4704=COleIPFrameWnd::OnIdleUpdateCmdUI
-4705=COleControl::OnInactiveMouseMove
-4706=COleControl::XPointerInactive::OnInactiveMouseMove
-4707=COleControl::OnInactiveSetCursor
-4708=COleControl::XPointerInactive::OnInactiveSetCursor
-4709=CColorPropPage::OnInitDialog
-4710=CDialog::OnInitDialog
-4711=CFontPropPage::OnInitDialog
-4712=COlePropertiesDialog::OnInitDialog
-4713=COlePropertyPage::OnInitDialog
-4714=CPicturePropPage::OnInitDialog
-4715=CPropertySheet::OnInitDialog
-4716=CFileDialog::OnInitDone
-4717=COleServerItem::OnInitFromData
-4718=CControlBar::OnInitialUpdate
-4719=CDaoRecordView::OnInitialUpdate
-4720=CFormView::OnInitialUpdate
-4721=CRecordView::OnInitialUpdate
-4722=CRichEditView::OnInitialUpdate
-4723=CView::OnInitialUpdate
-4724=CFrameWnd::OnInitMenuPopup
-4725=COleControl::OnInitMenuPopup
-4726=COleClientItem::XOleIPSite::OnInPlaceActivate
-4727=COleControlSite::XOleIPSite::OnInPlaceActivate
-4728=COleClientItem::XOleIPSite::OnInPlaceDeactivate
-4729=COleControlSite::XOleIPSite::OnInPlaceDeactivate
-4730=COleClientItem::OnInsertMenus
-4731=CRichEditView::OnInsertObject
-4732=CSplitterWnd::OnInvertTracker
-4733=CDockContext::OnKey
-4734=CCheckListBox::OnKeyDown
-4735=COleControl::OnKeyDown
-4736=CRichEditView::OnKeyDown
-4737=CSplitterWnd::OnKeyDown
-4738=COleControl::OnKeyDownEvent
-4739=COleControl::OnKeyPressEvent
-4740=COleControl::OnKeyUp
-4741=COleControl::OnKeyUpEvent
-4742=CPropertyPage::OnKillActive
-4743=COleControl::OnKillFocus
-4744=CCheckListBox::OnLBAddString
-4745=CCheckListBox::OnLBFindString
-4746=CCheckListBox::OnLBFindStringExact
-4747=CCheckListBox::OnLBGetItemData
-4748=CCheckListBox::OnLBGetText
-4749=CCheckListBox::OnLBInsertString
-4750=CFileDialog::OnLBSelChangedNotify
-4751=CCheckListBox::OnLBSelectString
-4752=CCheckListBox::OnLBSetItemData
-4753=CCheckListBox::OnLBSetItemHeight
-4754=CCheckListBox::OnLButtonDblClk
-4755=CControlBar::OnLButtonDblClk
-4756=COleControl::OnLButtonDblClk
-4757=CSplitterWnd::OnLButtonDblClk
-4758=CCheckListBox::OnLButtonDown
-4759=CControlBar::OnLButtonDown
-4760=COleControl::OnLButtonDown
-4761=COleResizeBar::OnLButtonDown
-4762=CPreviewView::OnLButtonDown
-4763=CSplitterWnd::OnLButtonDown
-4764=CMiniFrameWnd::OnLButtonUp
-4765=COleControl::OnLButtonUp
-4766=CSplitterWnd::OnLButtonUp
-4767=CAsyncMonikerFile::OnLowResource
-4768=COleControl::OnMapPropertyToPage
-4769=COleControl::OnMButtonDblClk
-4770=COleControl::OnMButtonDown
-4771=COleControl::OnMButtonUp
-4772=CMDIChildWnd::OnMDIActivate
-4773=CMDIFrameWnd::OnMDIWindowCmd
-4774=CWnd::OnMeasureItem
-4775=CMDIFrameWnd::OnMenuChar
-4776=CFrameWnd::OnMenuSelect
-4777=COleControl::OnMenuSelect
-4778=COleMessageFilter::OnMessagePending
-4779=CSocket::OnMessagePending
-4780=COleControl::OnMnemonic
-4781=COleControl::XOleControl::OnMnemonic
-4782=CControlBar::OnMouseActivate
-4783=CMDIChildWnd::OnMouseActivate
-4784=CMiniDockFrameWnd::OnMouseActivate
-4785=COleControl::OnMouseActivate
-4786=CView::OnMouseActivate
-4787=CMiniFrameWnd::OnMouseMove
-4788=COleControl::OnMouseMove
-4789=CSplitterWnd::OnMouseMove
-4790=CDaoRecordView::OnMove
-4791=COleControl::OnMove
-4792=CRecordView::OnMove
-4793=CFrameWnd::OnNcActivate
-4794=CMDIChildWnd::OnNcActivate
-4795=CMiniFrameWnd::OnNcActivate
-4796=CDockBar::OnNcCalcSize
-4797=CMiniFrameWnd::OnNcCalcSize
-4798=COleControl::OnNcCalcSize
-4799=CStatusBar::OnNcCalcSize
-4800=CToolBar::OnNcCalcSize
-4801=CMDIChildWnd::OnNcCreate
-4802=CMiniFrameWnd::OnNcCreate
-4803=COleControl::OnNcCreate
-4804=CPropertySheet::OnNcCreate
-4805=CSplitterWnd::OnNcCreate
-4806=CToolBar::OnNcCreate
-4807=CListCtrl::OnNcDestroy
-4808=CListView::OnNcDestroy
-4809=CWnd::OnNcDestroy
-4810=CMiniFrameWnd::OnNcHitTest
-4811=COleControl::OnNcHitTest
-4812=CStatusBar::OnNcHitTest
-4813=CToolBar::OnNcHitTest
-4814=CMiniDockFrameWnd::OnNcLButtonDblClk
-4815=CMiniDockFrameWnd::OnNcLButtonDown
-4816=CMiniFrameWnd::OnNcLButtonDown
-4817=COleControl::OnNcLButtonDown
-4818=CDockBar::OnNcPaint
-4819=CMiniFrameWnd::OnNcPaint
-4820=COleControl::OnNcPaint
-4821=CStatusBar::OnNcPaint
-4822=CToolBar::OnNcPaint
-4823=CDocument::OnNewDocument
-4824=COleDocument::OnNewDocument
-4825=COleLinkingDoc::OnNewDocument
-4826=COleServerDoc::OnNewEmbedding
-4827=CEnumArray::OnNext
-4828=CEnumConnPoints::OnNext
-4829=CEnumFormatEtc::OnNext
-4830=CEnumOleVerb::OnNext
-4831=CEnumUnknown::OnNext
-4832=CPreviewView::OnNextPage
-4833=CView::OnNextPaneCmd
-4834=CFileDialog::OnNotify
-4835=CPropertyPage::OnNotify
-4836=CSplitterWnd::OnNotify
-4837=CWnd::OnNotify
-4838=COleMessageFilter::OnNotRespondingDialog
-4839=CWnd::OnNTCtlColor
-4840=CPreviewView::OnNumPageChange
-4841=CColorPropPage::OnObjectsChanged
-4842=CFontPropPage::OnObjectsChanged
-4843=COlePropertyPage::OnObjectsChanged
-4844=CPicturePropPage::OnObjectsChanged
-4845=COleControl::OnOcmCtlColorBtn
-4846=COleControl::OnOcmCtlColorDlg
-4847=COleControl::OnOcmCtlColorEdit
-4848=COleControl::OnOcmCtlColorListBox
-4849=COleControl::OnOcmCtlColorMsgBox
-4850=COleControl::OnOcmCtlColorScrollBar
-4851=COleControl::OnOcmCtlColorStatic
-4852=CCommonDialog::OnOK
-4853=CDialog::OnOK
-4854=CPropertyPage::OnOK
-4855=CDocObjectServerItem::OnOpen
-4856=COleControl::OnOpen
-4857=COleServerItem::OnOpen
-4858=CDocument::OnOpenDocument
-4859=COleDocument::OnOpenDocument
-4860=COleLinkingDoc::OnOpenDocument
-4861=COleServerDoc::OnOpenEmbedding
-4862=CWinApp::OnOpenRecentFile
-4863=CAsyncSocket::OnOutOfBandData
-4864=CControlBar::OnPaint
-4865=CCtrlView::OnPaint
-4866=CDockBar::OnPaint
-4867=CFontPropPage::OnPaint
-4868=COleControl::OnPaint
-4869=COleResizeBar::OnPaint
-4870=CPicturePropPage::OnPaint
-4871=CSplitterWnd::OnPaint
-4872=CStatusBar::OnPaint
-4873=CToolBar::OnPaint
-4874=CView::OnPaint
-4875=CFrameWnd::OnPaletteChanged
-4876=COleFrameHook::OnPaletteChanged
-4877=CRichEditView::OnParaAlign
-4878=CRichEditView::OnParaCenter
-4879=CRichEditView::OnParaLeft
-4880=CRichEditView::OnParaRight
-4881=CWnd::OnParentNotify
-4882=CRichEditView::OnPasteNativeObject
-4883=CFrameWnd::OnPopMessageString
-4884=COleClientItem::XOleIPSite::OnPosRectChange
-4885=COleControlSite::XOleIPSite::OnPosRectChange
-4886=CEditView::OnPrepareDC
-4887=CPreviewView::OnPrepareDC
-4888=CRichEditView::OnPrepareDC
-4889=CScrollView::OnPrepareDC
-4890=CView::OnPrepareDC
-4891=CEditView::OnPreparePrinting
-4892=CView::OnPreparePrinting
-4893=COleFrameHook::OnPreTranslateMessage
-4894=CPreviewView::OnPreviewClose
-4895=CPreviewView::OnPreviewPrint
-4896=CPreviewView::OnPrevPage
-4897=CEditView::OnPrint
-4898=CRichEditView::OnPrint
-4899=CView::OnPrint
-4900=CRichEditView::OnPrinterChanged
-4901=CPrintDialog::OnPrintSetup
-4902=CAsyncMonikerFile::OnProgress
-4903=COleControl::OnProperties
-4904=CWnd::OnQuery3dControls
-4905=CPropertyPage::OnQueryCancel
-4906=CMiniFrameWnd::OnQueryCenterWnd
-4907=CFrameWnd::OnQueryEndSession
-4908=COleControl::OnQueryHitPoint
-4909=COleControl::OnQueryHitRect
-4910=CFrameWnd::OnQueryNewPalette
-4911=COleFrameHook::OnQueryNewPalette
-4912=COleServerItem::OnQueryUpdateItems
-4913=COleControl::OnRButtonDblClk
-4914=COleControl::OnRButtonDown
-4915=COleControl::OnRButtonUp
-4916=COleServerDoc::OnReactivateAndUndo
-4917=COleFrameHook::OnRecalcLayout
-4918=COleIPFrameWnd::OnRecalcParent
-4919=CAsyncSocket::OnReceive
-4920=COleControl::OnReflectorDestroyed
-4921=COleClientItem::OnRemoveMenus
-4922=COleClientItem::XAdviseSink::OnRename
-4923=COleControl::CControlDataSource::OnRenderData
-4924=COleServerItem::CItemDataSource::OnRenderData
-4925=COleControl::OnRenderData
-4926=COleDataSource::OnRenderData
-4927=COleServerItem::OnRenderData
-4928=COleControl::CControlDataSource::OnRenderFileData
-4929=COleServerItem::CItemDataSource::OnRenderFileData
-4930=COleControl::OnRenderFileData
-4931=COleDataSource::OnRenderFileData
-4932=COleServerItem::OnRenderFileData
-4933=COleControl::CControlDataSource::OnRenderGlobalData
-4934=COleServerItem::CItemDataSource::OnRenderGlobalData
-4935=COleControl::OnRenderGlobalData
-4936=COleDataSource::OnRenderGlobalData
-4937=COleServerItem::OnRenderGlobalData
-4938=CEditView::OnReplaceAll
-4939=CRichEditView::OnReplaceAll
-4940=CEditView::OnReplaceSel
-4941=CRichEditView::OnReplaceSel
-4942=COleControl::XFontNotification::OnRequestEdit
-4943=COleControlSite::XPropertyNotifySink::OnRequestEdit
-4944=COlePropertyPage::XPropNotifySink::OnRequestEdit
-4945=COleDocIPFrameWnd::OnRequestPositionChange
-4946=COleIPFrameWnd::OnRequestPositionChange
-4947=CEnumArray::OnReset
-4948=CPropertyPage::OnReset
-4949=COleControl::OnResetState
-4950=COleServerDoc::OnResizeBorder
-4951=COleIPFrameWnd::OnResizeChild
-4952=COleClientItem::XAdviseSink::OnSave
-4953=CDocument::OnSaveDocument
-4954=COleDocument::OnSaveDocument
-4955=COleLinkingDoc::OnSaveDocument
-4956=COleServerDoc::OnSaveDocument
-4957=COleServerDoc::OnSaveEmbedding
-4958=COleServerItem::OnSaveEmbedding
-4959=CDocObjectServer::OnSaveViewState
-4960=CScrollView::OnScroll
-4961=CView::OnScroll
-4962=COleClientItem::OnScrollBy
-4963=CScrollView::OnScrollBy
-4964=CView::OnScrollBy
-4965=CRichEditView::OnSelChange
-4966=CColorPropPage::OnSelchangeColorprop
-4967=CFontPropPage::OnSelchangeFontnames
-4968=CFontPropPage::OnSelchangeFontprop
-4969=CFontPropPage::OnSelchangeFontsizes
-4970=CFontPropPage::OnSelchangeFontstyles
-4971=CPicturePropPage::OnSelchangePictProp
-4972=CStockPropPage::OnSelchangePropname
-4973=CColorPropPage::OnSelchangeSystemcolors
-4974=CColorPropPage::OnSelect
-4975=CAsyncSocket::OnSend
-4976=CPropertyPage::OnSetActive
-4977=CToolBar::OnSetBitmapSize
-4978=CToolBar::OnSetButtonSize
-4979=COleControl::OnSetClientSite
-4980=COleServerItem::OnSetColorScheme
-4981=CFrameWnd::OnSetCursor
-4982=COleControl::OnSetCursor
-4983=COleResizeBar::OnSetCursor
-4984=CPreviewView::OnSetCursor
-4985=CSplitterWnd::OnSetCursor
-4986=COleControl::CControlDataSource::OnSetData
-4987=COleServerItem::CItemDataSource::OnSetData
-4988=COleControl::OnSetData
-4989=COleDataSource::OnSetData
-4990=COleServerItem::OnSetData
-4991=CPropertySheet::OnSetDefID
-4992=COleControl::OnSetExtent
-4993=COleServerItem::OnSetExtent
-4994=CFormView::OnSetFocus
-4995=CFrameWnd::OnSetFocus
-4996=COleControl::OnSetFocus
-4997=CCheckListBox::OnSetFont
-4998=CDialog::OnSetFont
-4999=CEditView::OnSetFont
-5000=COleServerDoc::OnSetHostNames
-5001=CDocObjectServer::OnSetItemRects
-5002=COleServerDoc::OnSetItemRects
-5003=COleClientItem::OnSetMenu
-5004=CFrameWnd::OnSetMessageString
-5005=COleControl::OnSetMessageString
-5006=COleIPFrameWnd::OnSetMessageString
-5007=CStatusBar::OnSetMinHeight
-5008=COleControl::OnSetObjectRects
-5009=CDatabase::OnSetOptions
-5010=CRecordset::OnSetOptions
-5011=COlePropertyPage::OnSetPageSite
-5012=CFrameWnd::OnSetPreviewMode
-5013=CMiniFrameWnd::OnSetText
-5014=COleControl::OnSetText
-5015=CStatusBar::OnSetText
-5016=CFileDialog::OnShareViolation
-5017=CDocObjectServerItem::OnShow
-5018=COleServerItem::OnShow
-5019=COleClientItem::OnShowControlBars
-5020=COleServerDoc::OnShowControlBars
-5021=COleServerDoc::OnShowDocument
-5022=COleClientItem::OnShowItem
-5023=COleControl::OnShowToolBars
-5024=COleDocument::OnShowViews
-5025=COleLinkingDoc::OnShowViews
-5026=COleControl::OnShowWindow
-5027=CWnd::OnShowWindow
-5028=COleClientItem::XOleClientSite::OnShowWindow
-5029=COleControlSite::XOleClientSite::OnShowWindow
-5030=CFrameWnd::OnSize
-5031=CMDIChildWnd::OnSize
-5032=CMDIFrameWnd::OnSize
-5033=COleControl::OnSize
-5034=COleIPFrameWnd::OnSize
-5035=COleResizeBar::OnSize
-5036=CPreviewView::OnSize
-5037=CScrollView::OnSize
-5038=CSplitterWnd::OnSize
-5039=CStatusBar::OnSize
-5040=CWnd::OnSize
-5041=CControlBar::OnSizeParent
-5042=CDockBar::OnSizeParent
-5043=COleResizeBar::OnSizeParent
-5044=CEnumArray::OnSkip
-5045=CSocketWnd::OnSocketDead
-5046=CSocketWnd::OnSocketNotify
-5047=CView::OnSplitCmd
-5048=CAsyncMonikerFile::OnStartBinding
-5049=CInternetSession::OnStatusCallback
-5050=CAsyncMonikerFile::OnStopBinding
-5051=CFontPropPage::OnStrikeout
-5052=CToolBar::OnSysColorChange
-5053=CWnd::OnSysColorChange
-5054=CFrameWnd::OnSysCommand
-5055=CMiniFrameWnd::OnSysCommand
-5056=CPropertySheet::OnSysCommand
-5057=CSplitterWnd::OnSysCommand
-5058=COleControl::OnSysKeyDown
-5059=COleControl::OnSysKeyUp
-5060=COleControl::OnTextChanged
-5061=CEditView::OnTextNotFound
-5062=CRichEditView::OnTextNotFound
-5063=CControlBar::OnTimer
-5064=CToolBar::OnToolHitTest
-5065=CWnd::OnToolHitTest
-5066=CFrameWnd::OnToolTipText
-5067=CFileDialog::OnTypeChange
-5068=COleControlContainer::OnUIActivate
-5069=COleClientItem::XOleIPSite::OnUIActivate
-5070=COleControlSite::XOleIPSite::OnUIActivate
-5071=COleControlContainer::OnUIDeactivate
-5072=COleClientItem::XOleIPSite::OnUIDeactivate
-5073=COleControlSite::XOleIPSite::OnUIDeactivate
-5074=CFontPropPage::OnUnderline
-5075=COleServerItem::OnUpdate
-5076=CView::OnUpdate
-5077=CRichEditView::OnUpdateBullet
-5078=CRichEditView::OnUpdateCharBold
-5079=CRichEditView::OnUpdateCharEffect
-5080=CRichEditView::OnUpdateCharItalic
-5081=CRichEditView::OnUpdateCharUnderline
-5082=CDialogBar::OnUpdateCmdUI
-5083=CDockBar::OnUpdateCmdUI
-5084=COleResizeBar::OnUpdateCmdUI
-5085=CStatusBar::OnUpdateCmdUI
-5086=CToolBar::OnUpdateCmdUI
-5087=CFrameWnd::OnUpdateContextHelp
-5088=CFrameWnd::OnUpdateControlBarMenu
-5089=COleIPFrameWnd::OnUpdateControlBarMenu
-5090=COleServerDoc::OnUpdateDocument
-5091=COleDocument::OnUpdateEditChangeIcon
-5092=COleDocument::OnUpdateEditLinksMenu
-5093=CRichEditView::OnUpdateEditPasteSpecial
-5094=CRichEditView::OnUpdateEditProperties
-5095=CEditView::OnUpdateEditUndo
-5096=CRichEditView::OnUpdateEditUndo
-5097=COleServerDoc::OnUpdateFileExit
-5098=CDocument::OnUpdateFileSendMail
-5099=COleServerDoc::OnUpdateFileUpdate
-5100=CFrameWnd::OnUpdateFrameMenu
-5101=CMDIChildWnd::OnUpdateFrameMenu
-5102=CMDIFrameWnd::OnUpdateFrameMenu
-5103=CFrameWnd::OnUpdateFrameTitle
-5104=CMDIChildWnd::OnUpdateFrameTitle
-5105=CMDIFrameWnd::OnUpdateFrameTitle
-5106=COleClientItem::OnUpdateFrameTitle
-5107=COleFrameHook::OnUpdateFrameTitle
-5108=COleServerItem::OnUpdateItems
-5109=CFrameWnd::OnUpdateKeyIndicator
-5110=CMDIFrameWnd::OnUpdateMDIWindowCmd
-5111=CEditView::OnUpdateNeedClip
-5112=CRichEditView::OnUpdateNeedClip
-5113=CEditView::OnUpdateNeedFind
-5114=CRichEditView::OnUpdateNeedFind
-5115=CEditView::OnUpdateNeedSel
-5116=CRichEditView::OnUpdateNeedSel
-5117=CEditView::OnUpdateNeedText
-5118=CRichEditView::OnUpdateNeedText
-5119=CPreviewView::OnUpdateNextPage
-5120=CView::OnUpdateNextPaneMenu
-5121=CPreviewView::OnUpdateNumPageChange
-5122=COleDocument::OnUpdateObjectVerbMenu
-5123=CRichEditView::OnUpdateParaAlign
-5124=CRichEditView::OnUpdateParaCenter
-5125=CRichEditView::OnUpdateParaLeft
-5126=CRichEditView::OnUpdateParaRight
-5127=COleDocument::OnUpdatePasteLinkMenu
-5128=COleDocument::OnUpdatePasteMenu
-5129=CPreviewView::OnUpdatePrevPage
-5130=CWinApp::OnUpdateRecentFileMenu
-5131=CDaoRecordView::OnUpdateRecordFirst
-5132=CRecordView::OnUpdateRecordFirst
-5133=CDaoRecordView::OnUpdateRecordLast
-5134=CRecordView::OnUpdateRecordLast
-5135=CDaoRecordView::OnUpdateRecordNext
-5136=CRecordView::OnUpdateRecordNext
-5137=CDaoRecordView::OnUpdateRecordPrev
-5138=CRecordView::OnUpdateRecordPrev
-5139=CView::OnUpdateSplitCmd
-5140=CPreviewView::OnUpdateZoomIn
-5141=CPreviewView::OnUpdateZoomOut
-5142=COleClientItem::XAdviseSink::OnViewChange
-5143=CWnd::OnVKeyToItem
-5144=CFrameWnd::OnVScroll
-5145=CPreviewView::OnVScroll
-5146=CScrollView::OnVScroll
-5147=CSplitterWnd::OnVScroll
-5148=CWnd::OnVScroll
-5149=CToolTipCtrl::OnWindowFromPoint
-5150=COleControl::OnWindowlessMessage
-5151=COleControl::XOleInPlaceObject::OnWindowMessage
-5152=CMDIFrameWnd::OnWindowNew
-5153=CControlBar::OnWindowPosChanging
-5154=CDockBar::OnWindowPosChanging
-5155=CMDIChildWnd::OnWindowPosChanging
-5156=COleIPFrameWnd::OnWindowPosChanging
-5157=CStatusBar::OnWindowPosChanging
-5158=CToolBar::OnWindowPosChanging
-5159=CWnd::OnWinIniChange
-5160=CPropertyPage::OnWizardBack
-5161=CPropertyPage::OnWizardFinish
-5162=CPropertyPage::OnWizardNext
-5163=CWnd::OnWndMsg
-5164=CPreviewView::OnZoomIn
-5165=CPreviewView::OnZoomOut
-5166=CAsyncMonikerFile::Open
-5167=CAsyncMonikerFile::Open
-5168=CAsyncMonikerFile::Open
-5169=CAsyncMonikerFile::Open
-5170=CAsyncMonikerFile::Open
-5171=CAsyncMonikerFile::Open
-5172=CAsyncMonikerFile::Open
-5173=CAsyncMonikerFile::Open
-5174=CDaoDatabase::Open
-5175=CDaoQueryDef::Open
-5176=CDaoRecordset::Open
-5177=CDaoRecordset::Open
-5178=CDaoRecordset::Open
-5179=CDaoTableDef::Open
-5180=CDaoWorkspace::Open
-5181=CDatabase::Open
-5182=CDataPathProperty::Open
-5183=CDataPathProperty::Open
-5184=CDataPathProperty::Open
-5185=CDataPathProperty::Open
-5186=CFile::Open
-5187=CMirrorFile::Open
-5188=CMonikerFile::Open
-5189=CMonikerFile::Open
-5190=CMonikerFile::Open
-5191=CMonikerFile::Open
-5192=CRecordset::Open
-5193=CSocketFile::Open
-5194=CStdioFile::Open
-5195=CDocObjectServer::XOleDocumentView::Open
-5196=CDocManager::OpenDocumentFile
-5197=CMultiDocTemplate::OpenDocumentFile
-5198=CSingleDocTemplate::OpenDocumentFile
-5199=CWinApp::OpenDocumentFile
-5200=CDatabase::OpenEx
-5201=CFtpConnection::OpenFile
-5202=CGopherConnection::OpenFile
-5203=COleUILinkInfo::OpenLinkSource
-5204=CHttpConnection::OpenRequest
-5205=CHttpConnection::OpenRequest
-5206=COleStreamFile::OpenStream
-5207=CInternetSession::OpenURL
-5208=CFileException::OsErrorToException
-5209=CDumpContext::OutputString
-5210=CEditView::PaginateTo
-5211=CRichEditView::PaginateTo
-5212=CPageSetupDialog::PaintHookProc
-5213=COleControl::ParentToClient
-5214=CWinApp::ParseCommandLine
-5215=COleCurrency::ParseCurrency
-5216=COleDateTime::ParseDateTime
-5217=COleControlContainer::XOleContainer::ParseDisplayName
-5218=COleLinkingDoc::XOleItemContainer::ParseDisplayName
-5219=CCommandLineInfo::ParseLast
-5220=CCommandLineInfo::ParseParam
-5221=CCommandLineInfo::ParseParamFlag
-5222=CCommandLineInfo::ParseParamNotFlag
-5223=CRichEditCtrl::PasteSpecial
-5224=CDC::PlayMetaFile
-5225=CDC::PolyBezierTo
-5226=CDC::PolyDraw
-5227=CDC::PolylineTo
-5228=CPreviewView::PositionPage
-5229=CAsyncMonikerFile::PostBindToStream
-5230=CMonikerFile::PostBindToStream
-5231=COccManager::PostCreateDialog
-5232=CDialog::PostModal
-5233=COleControl::PostModalDialog
-5234=CControlBar::PostNcDestroy
-5235=CControlFrameWnd::PostNcDestroy
-5236=CFindReplaceDialog::PostNcDestroy
-5237=CFrameWnd::PostNcDestroy
-5238=COleCntrFrameWnd::PostNcDestroy
-5239=CReflectorWnd::PostNcDestroy
-5240=CView::PostNcDestroy
-5241=CWnd::PostNcDestroy
-5242=CRecordset::PreBindFields
-5243=CDocument::PreCloseFrame
-5244=COleDocument::PreCloseFrame
-5245=CRichEditDoc::PreCloseFrame
-5246=CCheckListBox::PreCompareItem
-5247=COccManager::PreCreateDialog
-5248=CControlBar::PreCreateWindow
-5249=CControlFrameWnd::PreCreateWindow
-5250=CCtrlView::PreCreateWindow
-5251=CEditView::PreCreateWindow
-5252=CFrameWnd::PreCreateWindow
-5253=CListView::PreCreateWindow
-5254=CMDIChildWnd::PreCreateWindow
-5255=CMDIFrameWnd::PreCreateWindow
-5256=CMiniFrameWnd::PreCreateWindow
-5257=CRichEditView::PreCreateWindow
-5258=CStatusBar::PreCreateWindow
-5259=CTreeView::PreCreateWindow
-5260=CView::PreCreateWindow
-5261=CWnd::PreCreateWindow
-5262=CCheckListBox::PreDeleteItem
-5263=CCheckListBox::PreDrawItem
-5264=CPageSetupDialog::PreDrawPage
-5265=CDialog::PreInitDialog
-5266=COleChangeSourceDialog::PreInitDialog
-5267=CCheckListBox::PreMeasureItem
-5268=CDialog::PreModal
-5269=COleControl::PreModalDialog
-5270=CRecordset::PrepareAndExecute
-5271=CDataExchange::PrepareCtrl
-5272=CDataExchange::PrepareEditCtrl
-5273=CDataExchange::PrepareOleCtrl
-5274=CRecordset::PrepareUpdateHstmt
-5275=CPropertyPage::PreProcessPageTemplate
-5276=CDragListBox::PreSubclassWindow
-5277=CWnd::PreSubclassWindow
-5278=CWnd::PreTranslateInput
-5279=CControlBar::PreTranslateMessage
-5280=CDialog::PreTranslateMessage
-5281=CFormView::PreTranslateMessage
-5282=CFrameWnd::PreTranslateMessage
-5283=CMDIChildWnd::PreTranslateMessage
-5284=CMDIFrameWnd::PreTranslateMessage
-5285=COleIPFrameWnd::PreTranslateMessage
-5286=COlePropertyPage::PreTranslateMessage
-5287=CPropertyPage::PreTranslateMessage
-5288=CPropertySheet::PreTranslateMessage
-5289=CWinThread::PreTranslateMessage
-5290=CWnd::PreTranslateMessage
-5291=CDocObjectServer::XPrint::Print
-5292=CPreviewDC::PrinterDPtoScreenDP
-5293=CEditView::PrintInsideRect
-5294=CRichEditView::PrintInsideRect
-5295=CRichEditView::PrintPage
-5296=COleDispatchException::Process
-5297=COleException::Process
-5298=CSocket::ProcessAuxQueue
-5299=CFrameWnd::ProcessHelpMsg
-5300=CWinThread::ProcessMessageFilter
-5301=CWinApp::ProcessShellCommand
-5302=CWinApp::ProcessWndProcException
-5303=CWinThread::ProcessWndProcException
-5304=COleSafeArray::PtrOfIndex
-5305=CDC::PtVisible
-5306=CMetaFileDC::PtVisible
-5307=CWinThread::PumpMessage
-5308=CSocket::PumpMessages
-5309=CCmdTarget::PushStackArgs
-5310=COleSafeArray::PutElement
-5311=CFtpConnection::PutFile
-5312=PX_Blob
-5313=PX_Bool
-5314=PX_Bool
-5315=PX_Color
-5316=PX_Color
-5317=PX_Currency
-5318=PX_Currency
-5319=PX_DataPath
-5320=PX_DataPath
-5321=PX_Double
-5322=PX_Double
-5323=PX_Float
-5324=PX_Float
-5325=PX_Font
-5326=PX_IUnknown
-5327=PX_Long
-5328=PX_Long
-5329=PX_Picture
-5330=PX_Picture
-5331=PX_Short
-5332=PX_Short
-5333=PX_String
-5334=PX_String
-5335=PX_String
-5336=PX_ULong
-5337=PX_ULong
-5338=PX_UShort
-5339=PX_UShort
-5340=PX_VBXFontConvert
-5341=CRichEditView::QueryAcceptData
-5342=CRichEditView::XRichEditOleCallback::QueryAcceptData
-5343=CCmdTarget::QueryAggregates
-5344=COleDropSource::QueryContinueDrag
-5345=COleDropSource::XDropSource::QueryContinueDrag
-5346=COleControl::QueryDefHandler
-5347=COleControl::XDataObject::QueryGetData
-5348=COleDataSource::XDataObject::QueryGetData
-5349=COleServerDoc::XDataObject::QueryGetData
-5350=COleServerItem::XDataObject::QueryGetData
-5351=COleControl::XViewObject::QueryHitPoint
-5352=COleControl::XViewObject::QueryHitRect
-5353=CHttpFile::QueryInfo
-5354=CHttpFile::QueryInfo
-5355=CHttpFile::QueryInfo
-5356=CHttpFile::QueryInfoStatusCode
-5357=CRichEditView::XRichEditOleCallback::QueryInsertObject
-5358=_CIP<IBindHost&_GUIDconstIID_IBindHost>::QueryInterface
-5359=CArchiveStream::QueryInterface
-5360=CBlobProperty::QueryInterface
-5361=CInnerUnknown::QueryInterface
-5362=COleConnPtContainer::QueryInterface
-5363=COleDispatchImpl::QueryInterface
-5364=COleUILinkInfo::QueryInterface
-5365=COleClientItem::XAdviseSink::QueryInterface
-5366=COleControlSite::XAmbientProps::QueryInterface
-5367=COleControlSite::XBoundObjectSite::QueryInterface
-5368=COleObjectFactory::XClassFactory::QueryInterface
-5369=CConnectionPoint::XConnPt::QueryInterface
-5370=COleControl::XDataObject::QueryInterface
-5371=COleDataSource::XDataObject::QueryInterface
-5372=COleServerDoc::XDataObject::QueryInterface
-5373=COleServerItem::XDataObject::QueryInterface
-5374=COleDropSource::XDropSource::QueryInterface
-5375=COleDropTarget::XDropTarget::QueryInterface
-5376=CEnumArray::XEnumVOID::QueryInterface
-5377=COleControlSite::XEventSink::QueryInterface
-5378=COleControl::XFontNotification::QueryInterface
-5379=COleMessageFilter::XMessageFilter::QueryInterface
-5380=COleControlSite::XNotifyDBEvents::QueryInterface
-5381=COleControl::XOleCache::QueryInterface
-5382=COleClientItem::XOleClientSite::QueryInterface
-5383=COleControlSite::XOleClientSite::QueryInterface
-5384=CDocObjectServer::XOleCommandTarget::QueryInterface
-5385=COleControlContainer::XOleContainer::QueryInterface
-5386=COleControl::XOleControl::QueryInterface
-5387=COleControlSite::XOleControlSite::QueryInterface
-5388=CDocObjectServer::XOleDocument::QueryInterface
-5389=CDocObjectServer::XOleDocumentView::QueryInterface
-5390=COleControl::XOleInPlaceActiveObject::QueryInterface
-5391=COleServerDoc::XOleInPlaceActiveObject::QueryInterface
-5392=COleFrameHook::XOleInPlaceFrame::QueryInterface
-5393=COleControl::XOleInPlaceObject::QueryInterface
-5394=COleServerDoc::XOleInPlaceObject::QueryInterface
-5395=COleControlContainer::XOleIPFrame::QueryInterface
-5396=COleClientItem::XOleIPSite::QueryInterface
-5397=COleControlSite::XOleIPSite::QueryInterface
-5398=COleLinkingDoc::XOleItemContainer::QueryInterface
-5399=CDocObjectServer::XOleObject::QueryInterface
-5400=COleControl::XOleObject::QueryInterface
-5401=COleServerDoc::XOleObject::QueryInterface
-5402=COleServerItem::XOleObject::QueryInterface
-5403=COlePropertiesDialog::XOleUIObjInfo::QueryInterface
-5404=COleControl::XPerPropertyBrowsing::QueryInterface
-5405=COleLinkingDoc::XPersistFile::QueryInterface
-5406=COleControl::XPersistMemory::QueryInterface
-5407=COleControl::XPersistPropertyBag::QueryInterface
-5408=COleControl::XPersistStorage::QueryInterface
-5409=COleServerDoc::XPersistStorage::QueryInterface
-5410=COleControl::XPersistStreamInit::QueryInterface
-5411=COleControl::XPointerInactive::QueryInterface
-5412=CDocObjectServer::XPrint::QueryInterface
-5413=COleControlSite::XPropertyNotifySink::QueryInterface
-5414=COlePropertyPage::XPropertyPage::QueryInterface
-5415=COlePropertyPage::XPropNotifySink::QueryInterface
-5416=COleControl::XProvideClassInfo::QueryInterface
-5417=COleControl::XQuickActivate::QueryInterface
-5418=CRichEditView::XRichEditOleCallback::QueryInterface
-5419=COleControl::XSpecifyPropertyPages::QueryInterface
-5420=COleControl::XViewObject::QueryInterface
-5421=CInternetConnection::QueryOption
-5422=CInternetConnection::QueryOption
-5423=CInternetConnection::QueryOption
-5424=CInternetFile::QueryOption
-5425=CInternetFile::QueryOption
-5426=CInternetFile::QueryOption
-5427=CInternetSession::QueryOption
-5428=CInternetSession::QueryOption
-5429=CInternetSession::QueryOption
-5430=CPropertyPage::QuerySiblings
-5431=CConnectionPoint::QuerySinkInterface
-5432=COleControl::XEventConnPt::QuerySinkInterface
-5433=CDocObjectServer::XOleCommandTarget::QueryStatus
-5434=CFontHolder::QueryTextMetrics
-5435=COleControlSite::QuickActivate
-5436=COleControl::XQuickActivate::QuickActivate
-5437=COleClientItem::ReactivateAndUndo
-5438=COleControl::XOleInPlaceObject::ReactivateAndUndo
-5439=COleServerDoc::XOleInPlaceObject::ReactivateAndUndo
-5440=CArchive::Read
-5441=CArchiveStream::Read
-5442=CFile::Read
-5443=CImageList::Read
-5444=CInternetFile::Read
-5445=CMemFile::Read
-5446=COleStreamFile::Read
-5447=CSocketFile::Read
-5448=CStdioFile::Read
-5449=CArchive::ReadClass
-5450=CArchive::ReadCount
-5451=CEditView::ReadFromArchive
-5452=CProperty::ReadFromStream
-5453=CPropertySection::ReadFromStream
-5454=CPropertySet::ReadFromStream
-5455=COleClientItem::ReadItem
-5456=COleClientItem::ReadItemCompound
-5457=COleClientItem::ReadItemFlat
-5458=CRecentFileList::ReadList
-5459=CPropertySection::ReadNameDictFromStream
-5460=CArchive::ReadObject
-5461=CArchive::ReadString
-5462=CArchive::ReadString
-5463=CInternetFile::ReadString
-5464=CInternetFile::ReadString
-5465=CStdioFile::ReadString
-5466=CStdioFile::ReadString
-5467=CMemFile::Realloc
-5468=CSharedFile::Realloc
-5469=CFieldExchange::ReallocLongBinary
-5470=CRecordset::RebindParams
-5471=CControlBar::RecalcDelayShow
-5472=CFrameWnd::RecalcLayout
-5473=CMiniDockFrameWnd::RecalcLayout
-5474=COleCntrFrameWnd::RecalcLayout
-5475=COleDocIPFrameWnd::RecalcLayout
-5476=COleIPFrameWnd::RecalcLayout
-5477=CSplitterWnd::RecalcLayout
-5478=CAsyncSocket::Receive
-5479=CSocket::Receive
-5480=CAsyncSocket::ReceiveFrom
-5481=CAsyncSocket::ReceiveFromHelper
-5482=CSocket::ReceiveFromHelper
-5483=COleControl::RecreateControlWindow
-5484=CRectconstCFrameWnd::rectDefault
-5485=CDC::RectVisible
-5486=CMetaFileDC::RectVisible
-5487=COleSafeArray::Redim
-5488=CDockBar::ReDockControlBar
-5489=CFrameWnd::ReDockControlBar
-5490=CWnd::ReflectChildNotify
-5491=CWnd::ReflectLastMsg
-5492=COleControl::Refresh
-5493=CDaoTableDef::RefreshLink
-5494=CRecordset::RefreshRowset
-5495=COleDropTarget::Register
-5496=COleLinkingDoc::Register
-5497=COleMessageFilter::Register
-5498=COleObjectFactory::Register
-5499=COleTemplateServer::Register
-5500=COleObjectFactory::RegisterAll
-5501=COleLinkingDoc::RegisterIfServerAttached
-5502=CDocManager::RegisterShellFileTypes
-5503=CWinApp::RegisterShellFileTypes
-5504=CWinApp::RegisterShellFileTypesCompat
-5505=CArchiveStream::Release
-5506=CBlobProperty::Release
-5507=CInnerUnknown::Release
-5508=COleClientItem::Release
-5509=COleConnPtContainer::Release
-5510=COleDataObject::Release
-5511=COleDispatchImpl::Release
-5512=COleUILinkInfo::Release
-5513=CString::Release
-5514=CString::Release
-5515=COleClientItem::XAdviseSink::Release
-5516=COleControlSite::XAmbientProps::Release
-5517=COleControlSite::XBoundObjectSite::Release
-5518=COleObjectFactory::XClassFactory::Release
-5519=CConnectionPoint::XConnPt::Release
-5520=COleControl::XDataObject::Release
-5521=COleDataSource::XDataObject::Release
-5522=COleServerDoc::XDataObject::Release
-5523=COleServerItem::XDataObject::Release
-5524=COleDropSource::XDropSource::Release
-5525=COleDropTarget::XDropTarget::Release
-5526=CEnumArray::XEnumVOID::Release
-5527=COleControlSite::XEventSink::Release
-5528=COleControl::XFontNotification::Release
-5529=COleMessageFilter::XMessageFilter::Release
-5530=COleControlSite::XNotifyDBEvents::Release
-5531=COleControl::XOleCache::Release
-5532=COleClientItem::XOleClientSite::Release
-5533=COleControlSite::XOleClientSite::Release
-5534=CDocObjectServer::XOleCommandTarget::Release
-5535=COleControlContainer::XOleContainer::Release
-5536=COleControl::XOleControl::Release
-5537=COleControlSite::XOleControlSite::Release
-5538=CDocObjectServer::XOleDocument::Release
-5539=CDocObjectServer::XOleDocumentView::Release
-5540=COleControl::XOleInPlaceActiveObject::Release
-5541=COleServerDoc::XOleInPlaceActiveObject::Release
-5542=COleFrameHook::XOleInPlaceFrame::Release
-5543=COleControl::XOleInPlaceObject::Release
-5544=COleServerDoc::XOleInPlaceObject::Release
-5545=COleControlContainer::XOleIPFrame::Release
-5546=COleClientItem::XOleIPSite::Release
-5547=COleControlSite::XOleIPSite::Release
-5548=COleLinkingDoc::XOleItemContainer::Release
-5549=CDocObjectServer::XOleObject::Release
-5550=COleControl::XOleObject::Release
-5551=COleServerDoc::XOleObject::Release
-5552=COleServerItem::XOleObject::Release
-5553=COlePropertiesDialog::XOleUIObjInfo::Release
-5554=COleControl::XPerPropertyBrowsing::Release
-5555=COleLinkingDoc::XPersistFile::Release
-5556=COleControl::XPersistMemory::Release
-5557=COleControl::XPersistPropertyBag::Release
-5558=COleControl::XPersistStorage::Release
-5559=COleServerDoc::XPersistStorage::Release
-5560=COleControl::XPersistStreamInit::Release
-5561=COleControl::XPointerInactive::Release
-5562=CDocObjectServer::XPrint::Release
-5563=COleControlSite::XPropertyNotifySink::Release
-5564=COlePropertyPage::XPropertyPage::Release
-5565=COlePropertyPage::XPropNotifySink::Release
-5566=COleControl::XProvideClassInfo::Release
-5567=COleControl::XQuickActivate::Release
-5568=CRichEditView::XRichEditOleCallback::Release
-5569=COleControl::XSpecifyPropertyPages::Release
-5570=COleControl::XViewObject::Release
-5571=CDC::ReleaseAttribDC
-5572=CString::ReleaseBuffer
-5573=COleControl::ReleaseCapture
-5574=COleControl::ReleaseDC
-5575=COleDispatchDriver::ReleaseDispatch
-5576=CDocObjectServer::ReleaseDocSite
-5577=CDocument::ReleaseFile
-5578=CFontHolder::ReleaseFont
-5579=CDC::ReleaseOutputDC
-5580=CMetaFileDC::ReleaseOutputDC
-5581=CPreviewDC::ReleaseOutputDC
-5582=COleClientItem::Reload
-5583=CFile::Remove
-5584=CFtpConnection::Remove
-5585=CPropertySection::Remove
-5586=CPropertySet::Remove
-5587=CPropertySet::Remove
-5588=CRecentFileList::Remove
-5589=CSimpleList::Remove
-5590=CMapPtrToPtr::RemoveAll
-5591=CMapPtrToWord::RemoveAll
-5592=CMapStringToOb::RemoveAll
-5593=CMapStringToPtr::RemoveAll
-5594=CMapStringToString::RemoveAll
-5595=CMapWordToOb::RemoveAll
-5596=CMapWordToPtr::RemoveAll
-5597=CObList::RemoveAll
-5598=CPropertySection::RemoveAll
-5599=CPropertySet::RemoveAll
-5600=CPtrList::RemoveAll
-5601=CStringList::RemoveAll
-5602=CByteArray::RemoveAt
-5603=CDWordArray::RemoveAt
-5604=CObArray::RemoveAt
-5605=CObList::RemoveAt
-5606=CPtrArray::RemoveAt
-5607=CPtrList::RemoveAt
-5608=CStringArray::RemoveAt
-5609=CStringList::RemoveAt
-5610=CUIntArray::RemoveAt
-5611=CWordArray::RemoveAt
-5612=CDockBar::RemoveControlBar
-5613=CFrameWnd::RemoveControlBar
-5614=CFtpConnection::RemoveDirectoryA
-5615=CDocTemplate::RemoveDocument
-5616=CMultiDocTemplate::RemoveDocument
-5617=CSingleDocTemplate::RemoveDocument
-5618=COleControl::RemoveFrameLevelUI
-5619=CFrameWnd::RemoveFrameWnd
-5620=CObList::RemoveHead
-5621=CPtrList::RemoveHead
-5622=CStringList::RemoveHead
-5623=CListCtrl::RemoveImageList
-5624=CListView::RemoveImageList
-5625=CTreeCtrl::RemoveImageList
-5626=CTreeView::RemoveImageList
-5627=COleDocument::RemoveItem
-5628=CMapPtrToPtr::RemoveKey
-5629=CMapPtrToWord::RemoveKey
-5630=CMapStringToOb::RemoveKey
-5631=CMapStringToPtr::RemoveKey
-5632=CMapStringToString::RemoveKey
-5633=CMapWordToOb::RemoveKey
-5634=CMapWordToPtr::RemoveKey
-5635=COleFrameHook::XOleInPlaceFrame::RemoveMenus
-5636=COleControlContainer::XOleIPFrame::RemoveMenus
-5637=CPropertySheet::RemovePage
-5638=CPropertySheet::RemovePage
-5639=CDockBar::RemovePlaceHolder
-5640=CDataBoundProperty::RemoveSource
-5641=CObList::RemoveTail
-5642=CPtrList::RemoveTail
-5643=CStringList::RemoveTail
-5644=CDocument::RemoveView
-5645=CFile::Rename
-5646=CFtpConnection::Rename
-5647=CPictureHolder::Render
-5648=CDaoWorkspace::RepairDatabase
-5649=COleControl::ReparentControlWindow
-5650=CDatabase::ReplaceBrackets
-5651=CException::ReportError
-5652=COleClientItem::ReportError
-5653=CDocument::ReportSaveLoadException
-5654=COleLinkingDoc::ReportSaveLoadException
-5655=CWnd::RepositionBars
-5656=COleIPFrameWnd::RepositionFrame
-5657=CDaoRecordset::Requery
-5658=CRecordset::Requery
-5659=COleFrameHook::XOleInPlaceFrame::RequestBorderSpace
-5660=COleControlContainer::XOleIPFrame::RequestBorderSpace
-5661=COleObjectFactory::XClassFactory::RequestLicKey
-5662=COleClientItem::XOleClientSite::RequestNewObjectLayout
-5663=COleControlSite::XOleClientSite::RequestNewObjectLayout
-5664=COleServerDoc::RequestPositionChange
-5665=CEnumArray::XEnumVOID::Reset
-5666=CRecordset::ResetCursor
-5667=CCachedDataPathProperty::ResetData
-5668=CDataPathProperty::ResetData
-5669=COleControl::ResetStockProps
-5670=CControlBar::ResetTimer
-5671=COleControl::ResetVersion
-5672=COleControl::XOleInPlaceActiveObject::ResizeBorder
-5673=COleServerDoc::XOleInPlaceActiveObject::ResizeBorder
-5674=COleControl::ResizeFrameWindow
-5675=COleSafeArray::ResizeOneDim
-5676=COleControl::ResizeOpenControl
-5677=CScrollView::ResizeParentToFit
-5678=CDC::RestoreDC
-5679=CPreviewDC::RestoreDC
-5680=CToolBarCtrl::RestoreState
-5681=CCmdTarget::RestoreWaitCursor
-5682=COleMessageFilter::XMessageFilter::RetryRejectedCall
-5683=CString::ReverseFind
-5684=CArchiveStream::Revert
-5685=COleDropTarget::Revoke
-5686=COleLinkingDoc::Revoke
-5687=COleMessageFilter::Revoke
-5688=COleObjectFactory::Revoke
-5689=COleObjectFactory::RevokeAll
-5690=RFX_Binary
-5691=RFX_Binary_Bulk
-5692=RFX_Bool
-5693=RFX_Bool_Bulk
-5694=RFX_Byte
-5695=RFX_Byte_Bulk
-5696=RFX_Date
-5697=RFX_Date
-5698=RFX_Date_Bulk
-5699=RFX_Double
-5700=RFX_Double_Bulk
-5701=RFX_Int
-5702=RFX_Int_Bulk
-5703=RFX_Long
-5704=RFX_Long_Bulk
-5705=RFX_LongBinary
-5706=RFX_Single
-5707=RFX_Single_Bulk
-5708=RFX_Text
-5709=RFX_Text_Bulk
-5710=CString::Right
-5711=CDaoWorkspace::Rollback
-5712=CDatabase::Rollback
-5713=COleClientItem::Run
-5714=CWinApp::Run
-5715=CWinThread::Run
-5716=CWinApp::RunAutomated
-5717=CWinApp::RunEmbedded
-5718=CWnd::RunModalLoop
-5719=COleControlSite::SafeSetProperty
-5720=CEditView::SameAsSelected
-5721=CRichEditView::SameAsSelected
-5722=CBlobProperty::Save
-5723=COleLinkingDoc::XPersistFile::Save
-5724=COleControl::XPersistMemory::Save
-5725=COleControl::XPersistPropertyBag::Save
-5726=COleControl::XPersistStorage::Save
-5727=COleServerDoc::XPersistStorage::Save
-5728=COleControl::XPersistStreamInit::Save
-5729=CDocManager::SaveAllModified
-5730=CDocTemplate::SaveAllModified
-5731=CWinApp::SaveAllModified
-5732=CFrameWnd::SaveBarState
-5733=COleLinkingDoc::XPersistFile::SaveCompleted
-5734=COleControl::XPersistStorage::SaveCompleted
-5735=COleServerDoc::XPersistStorage::SaveCompleted
-5736=CDC::SaveDC
-5737=CPreviewDC::SaveDC
-5738=COleServerDoc::SaveEmbedding
-5739=CFormView::SaveFocusControl
-5740=CDocument::SaveModified
-5741=COleDocument::SaveModified
-5742=COleServerDoc::SaveModified
-5743=COleServerDoc::SaveModifiedPrompt
-5744=COleClientItem::XOleClientSite::SaveObject
-5745=COleControlSite::XOleClientSite::SaveObject
-5746=CControlBarInfo::SaveState
-5747=CDockState::SaveState
-5748=COleControl::SaveState
-5749=CToolBarCtrl::SaveState
-5750=CWinApp::SaveStdProfileSettings
-5751=COleDocument::SaveToStorage
-5752=COleLinkingDoc::SaveToStorage
-5753=CDocObjectServer::XOleDocumentView::SaveViewState
-5754=CDockState::ScalePoint
-5755=CDockState::ScaleRectPos
-5756=CDC::ScaleViewportExt
-5757=CMetaFileDC::ScaleViewportExt
-5758=CPreviewDC::ScaleViewportExt
-5759=CDC::ScaleWindowExt
-5760=CPreviewDC::ScaleWindowExt
-5761=COleClientItem::XOleIPSite::Scroll
-5762=COleControlSite::XOleIPSite::Scroll
-5763=COleControlContainer::ScrollChildren
-5764=COleServerDoc::ScrollContainerBy
-5765=CScrollView::ScrollToDevicePosition
-5766=CScrollView::ScrollToPosition
-5767=COleControl::ScrollWindow
-5768=CWnd::ScrollWindow
-5769=CWnd::ScrollWindowEx
-5770=CArchiveStream::Seek
-5771=CDaoRecordset::Seek
-5772=CDaoRecordset::Seek
-5773=CFile::Seek
-5774=CInternetFile::Seek
-5775=CMemFile::Seek
-5776=COleStreamFile::Seek
-5777=CSocketFile::Seek
-5778=CStdioFile::Seek
-5779=CFontHolder::Select
-5780=CDC::SelectClipPath
-5781=CDC::SelectClipRgn
-5782=CDC::SelectClipRgn
-5783=CFontPropPage::SelectFontFromList
-5784=COleControl::SelectFontObject
-5785=CDC::SelectGdiObject
-5786=CDC::SelectObject
-5787=CDC::SelectObject
-5788=CDC::SelectObject
-5789=CDC::SelectObject
-5790=CPreviewDC::SelectObject
-5791=CDC::SelectPalette
-5792=CWinApp::SelectPrinter
-5793=COleControl::SelectStockFont
-5794=CDC::SelectStockObject
-5795=CPreviewDC::SelectStockObject
-5796=CAsyncSocket::Send
-5797=CSocket::Send
-5798=COleControl::SendAdvise
-5799=CWnd::SendChildNotifyLastMsg
-5800=CSocket::SendChunk
-5801=COleControlContainer::SendDlgItemMessageA
-5802=CWnd::SendDlgItemMessageA
-5803=CDocument::SendInitialUpdate
-5804=CRecordset::SendLongBinaryData
-5805=CWnd::SendMessageToDescendants
-5806=COleControlSite::SendMnemonic
-5807=CHttpFile::SendRequest
-5808=CHttpFile::SendRequest
-5809=CAsyncSocket::SendTo
-5810=CAsyncSocket::SendToHelper
-5811=CSocket::SendToHelper
-5812=CByteArray::Serialize
-5813=CControlBarInfo::Serialize
-5814=CDocItem::Serialize
-5815=CDockState::Serialize
-5816=CDWordArray::Serialize
-5817=CEditView::Serialize
-5818=CMapStringToOb::Serialize
-5819=CMapStringToString::Serialize
-5820=CMapWordToOb::Serialize
-5821=CObArray::Serialize
-5822=CObject::Serialize
-5823=CObList::Serialize
-5824=COleClientItem::Serialize
-5825=COleControl::Serialize
-5826=COleDocument::Serialize
-5827=CRichEditDoc::Serialize
-5828=CRichEditView::Serialize
-5829=CStringArray::Serialize
-5830=CStringList::Serialize
-5831=CWordArray::Serialize
-5832=CArchive::SerializeClass
-5833=SerializeElements
-5834=SerializeElements
-5835=COleControl::SerializeExtent
-5836=CEditView::SerializeRaw
-5837=COleControl::SerializeStockProps
-5838=COleControl::SerializeVersion
-5839=CProperty::Set
-5840=CProperty::Set
-5841=CProperty::Set
-5842=CPropertySection::Set
-5843=CPropertySection::Set
-5844=CPropertySet::Set
-5845=CPropertySet::Set
-5846=CDaoRecordset::SetAbsolutePosition
-5847=COleFrameHook::XOleInPlaceFrame::SetActiveObject
-5848=COleControlContainer::XOleIPFrame::SetActiveObject
-5849=CPropertySheet::SetActivePage
-5850=CPropertySheet::SetActivePage
-5851=CSplitterWnd::SetActivePane
-5852=CFrameWnd::SetActiveView
-5853=COleControl::XViewObject::SetAdvise
-5854=COleControl::SetAppearance
-5855=CDC::SetArcDirection
-5856=CString::SetAt
-5857=CByteArray::SetAtGrow
-5858=CDWordArray::SetAtGrow
-5859=CObArray::SetAtGrow
-5860=CPtrArray::SetAtGrow
-5861=CStringArray::SetAtGrow
-5862=CUIntArray::SetAtGrow
-5863=CWordArray::SetAtGrow
-5864=CDC::SetAttribDC
-5865=CMetaFileDC::SetAttribDC
-5866=CPreviewDC::SetAttribDC
-5867=CDaoTableDef::SetAttributes
-5868=COleControl::SetBackColor
-5869=CControlBar::SetBarInfo
-5870=CDockBar::SetBarInfo
-5871=CControlBar::SetBarStyle
-5872=CToolBar::SetBitmap
-5873=CDC::SetBkColor
-5874=CPreviewDC::SetBkColor
-5875=CDC::SetBkMode
-5876=CDaoRecordset::SetBookmark
-5877=CRecordset::SetBookmark
-5878=COleFrameHook::XOleInPlaceFrame::SetBorderSpace
-5879=COleControlContainer::XOleIPFrame::SetBorderSpace
-5880=COleControl::SetBorderStyle
-5881=CColorPropPage::SetButton
-5882=CToolBar::SetButtonInfo
-5883=CToolBar::SetButtons
-5884=CToolBar::SetButtonStyle
-5885=CToolBar::SetButtonText
-5886=CDaoRecordset::SetCacheSize
-5887=CDaoRecordset::SetCacheStart
-5888=COleControl::SetCapture
-5889=CRichEditView::SetCharFormat
-5890=CCheckListBox::SetCheck
-5891=CCmdUI::SetCheck
-5892=COleCmdUI::SetCheck
-5893=CStatusCmdUI::SetCheck
-5894=CTestCmdUI::SetCheck
-5895=CToolCmdUI::SetCheck
-5896=CCheckListBox::SetCheckStyle
-5897=CPropertySet::SetClassID
-5898=CDataBoundProperty::SetClientSite
-5899=CDocObjectServer::XOleObject::SetClientSite
-5900=COleControl::XOleObject::SetClientSite
-5901=COleServerDoc::XOleObject::SetClientSite
-5902=COleServerItem::XOleObject::SetClientSite
-5903=COleDataSource::SetClipboard
-5904=CDC::SetColorAdjustment
-5905=CColorPropPage::SetColorProp
-5906=CDocObjectServer::XOleObject::SetColorScheme
-5907=COleControl::XOleObject::SetColorScheme
-5908=COleServerDoc::XOleObject::SetColorScheme
-5909=COleServerItem::XOleObject::SetColorScheme
-5910=CSplitterWnd::SetColumnInfo
-5911=CRecordset::SetConcurrencyAndCursorType
-5912=CDaoQueryDef::SetConnect
-5913=CDaoTableDef::SetConnect
-5914=CDocTemplate::SetContainerInfo
-5915=COleControl::XQuickActivate::SetContentExtent
-5916=CReflectorWnd::SetControl
-5917=COleControl::SetControlSize
-5918=COlePropertyPage::SetControlStatus
-5919=CFileDialog::SetControlText
-5920=COleCurrency::SetCurrency
-5921=CColorDialog::SetCurrentColor
-5922=CFtpConnection::SetCurrentDirectoryA
-5923=CWinApp::SetCurrentHandles
-5924=CDaoRecordset::SetCurrentIndex
-5925=CPreviewView::SetCurrentPage
-5926=CRectTracker::SetCursor
-5927=CDaoRecordset::SetCursorAttributes
-5928=COleControl::XDataObject::SetData
-5929=COleDataSource::XDataObject::SetData
-5930=COleServerDoc::XDataObject::SetData
-5931=COleServerItem::XDataObject::SetData
-5932=COleControl::XOleCache::SetData
-5933=COleDateTime::SetDateTime
-5934=COleDateTimeSpan::SetDateTimeSpan
-5935=COccManager::SetDefaultButton
-5936=COleControlSite::SetDefaultButton
-5937=CRichEditCtrl::SetDefaultCharFormat
-5938=CDaoWorkspace::SetDefaultPassword
-5939=CMultiDocTemplate::SetDefaultTitle
-5940=CSingleDocTemplate::SetDefaultTitle
-5941=CDaoWorkspace::SetDefaultUser
-5942=CFileDialog::SetDefExt
-5943=CWinApp::SetDialogBkColor
-5944=COlePropertyPage::SetDialogResource
-5945=CDaoRecordset::SetDirtyFields
-5946=CDaoRecordset::SetDirtyFieldStatus
-5947=CRecordset::SetDirtyFieldStatus
-5948=COleControlSite::SetDlgCtrlID
-5949=CWnd::SetDlgCtrlID
-5950=COleControlContainer::SetDlgItemInt
-5951=CWnd::SetDlgItemInt
-5952=COleControlContainer::SetDlgItemTextA
-5953=CWnd::SetDlgItemTextA
-5954=CFrameWnd::SetDockState
-5955=CDocObjectServer::SetDocSite
-5956=COleClientItem::SetDrawAspect
-5957=CRichEditCntrItem::SetDrawAspect
-5958=CDataBoundProperty::SetDSCSite
-5959=COleControl::SetEnabled
-5960=COleClientItem::SetExtent
-5961=COleControlSite::SetExtent
-5962=CDocObjectServer::XOleObject::SetExtent
-5963=COleControl::XOleObject::SetExtent
-5964=COleServerDoc::XOleObject::SetExtent
-5965=COleServerItem::XOleObject::SetExtent
-5966=CColorButton::SetFaceColor
-5967=CDaoRecordset::SetFieldDirty
-5968=CRecordset::SetFieldDirty
-5969=CDaoRecordset::SetFieldNull
-5970=CRecordset::SetFieldNull
-5971=CRecordset::SetFieldStatus
-5972=CDaoRecordset::SetFieldValue
-5973=CDaoRecordset::SetFieldValue
-5974=CDaoRecordset::SetFieldValue
-5975=CDaoRecordset::SetFieldValue
-5976=CDaoRecordset::SetFieldValueNull
-5977=CDaoRecordset::SetFieldValueNull
-5978=CFile::SetFilePath
-5979=COleControl::SetFocus
-5980=COleControlSite::SetFocus
-5981=CWnd::SetFocus
-5982=CDialogTemplate::SetFont
-5983=CFontHolder::SetFont
-5984=COleControl::SetFont
-5985=CFontPropPage::SetFontProps
-5986=COleControl::SetForeColor
-5987=CPropertySection::SetFormatID
-5988=CPropertySet::SetFormatVersion
-5989=CSharedFile::SetHandle
-5990=CToolBar::SetHeight
-5991=CFrameWnd::SetHelpCapture
-5992=COlePropertyPage::SetHelpInfo
-5993=COleClientItem::SetHostNames
-5994=CDocObjectServer::XOleObject::SetHostNames
-5995=COleControl::XOleObject::SetHostNames
-5996=COleServerDoc::XOleObject::SetHostNames
-5997=COleServerItem::XOleObject::SetHostNames
-5998=COleClientItem::SetIconicMetafile
-5999=CProperty::SetID
-6000=CStatusBar::SetIndicators
-6001=CDaoWorkspace::SetIniPath
-6002=COleControl::SetInitialDataFormats
-6003=CDocObjectServer::XPrint::SetInitialPageNum
-6004=COleControl::SetInitialSize
-6005=CDocObjectServer::XOleDocumentView::SetInPlaceSite
-6006=CDaoWorkspace::SetIsolateODBCTrans
-6007=CListCtrl::SetItem
-6008=CTreeCtrl::SetItem
-6009=COleClientItem::SetItemRects
-6010=CFile::SetLength
-6011=CInternetFile::SetLength
-6012=CMemFile::SetLength
-6013=COleStreamFile::SetLength
-6014=CSocketFile::SetLength
-6015=COleUILinkInfo::SetLinkSource
-6016=COleClientItem::SetLinkUpdateOptions
-6017=COleUILinkInfo::SetLinkUpdateOptions
-6018=CDaoRecordset::SetLockingMode
-6019=CRecordset::SetLockingMode
-6020=CDaoWorkspace::SetLoginTimeout
-6021=CDC::SetMapMode
-6022=CPreviewDC::SetMapMode
-6023=CDC::SetMapperFlags
-6024=COleFrameHook::XOleInPlaceFrame::SetMenu
-6025=COleControlContainer::XOleIPFrame::SetMenu
-6026=CFrameWnd::SetMessageText
-6027=CFrameWnd::SetMessageText
-6028=CPropertyPage::SetModified
-6029=CDocument::SetModifiedFlag
-6030=COleControl::SetModifiedFlag
-6031=COlePropertyPage::SetModifiedFlag
-6032=CRichEditDoc::SetModifiedFlag
-6033=CDocObjectServer::XOleObject::SetMoniker
-6034=COleControl::XOleObject::SetMoniker
-6035=COleServerDoc::XOleObject::SetMoniker
-6036=COleServerItem::XOleObject::SetMoniker
-6037=CDaoQueryDef::SetName
-6038=CDaoTableDef::SetName
-6039=CPropertySection::SetName
-6040=COleControl::SetNotPermitted
-6041=CCmdTarget::SetNotSupported
-6042=COleControl::SetNotSupported
-6043=CDaoRecordset::SetNullableFieldStatus
-6044=CDaoRecordset::SetNullableKnownFieldStatus
-6045=CDaoRecordset::SetNullFieldStatus
-6046=CRecordset::SetNullFieldStatus
-6047=CRecordset::SetNullParamStatus
-6048=CDaoFieldExchange::SetNullValue
-6049=COleControl::XOleInPlaceObject::SetObjectRects
-6050=COleServerDoc::XOleInPlaceObject::SetObjectRects
-6051=COlePropertyPage::XPropertyPage::SetObjects
-6052=CDialog::SetOccDialogInfo
-6053=CDialogBar::SetOccDialogInfo
-6054=CFormView::SetOccDialogInfo
-6055=CWnd::SetOccDialogInfo
-6056=CDaoQueryDef::SetODBCTimeout
-6057=CInternetConnection::SetOption
-6058=CInternetFile::SetOption
-6059=CInternetSession::SetOption
-6060=CPropertySet::SetOSVersion
-6061=CDC::SetOutputDC
-6062=CMetaFileDC::SetOutputDC
-6063=CPreviewDC::SetOutputDC
-6064=CToolBar::SetOwner
-6065=COlePropertyPage::SetPageName
-6066=COlePropertyPage::XPropertyPage::SetPageSite
-6067=CStatusBar::SetPaneInfo
-6068=CStatusBar::SetPaneStyle
-6069=CStatusBar::SetPaneText
-6070=CRichEditCtrl::SetParaFormat
-6071=CRichEditView::SetParaFormat
-6072=CDaoQueryDef::SetParamValue
-6073=CDaoQueryDef::SetParamValue
-6074=CDaoRecordset::SetParamValue
-6075=CDaoRecordset::SetParamValue
-6076=CDaoQueryDef::SetParamValueNull
-6077=CDaoQueryDef::SetParamValueNull
-6078=CDaoRecordset::SetParamValueNull
-6079=CDaoRecordset::SetParamValueNull
-6080=CDocument::SetPathName
-6081=COleDocument::SetPathName
-6082=CRichEditDoc::SetPathName
-6083=CDaoRecordset::SetPercentPosition
-6084=CPictureHolder::SetPictureDispatch
-6085=CPicturePropPage::SetPictureProp
-6086=CDC::SetPolyFillMode
-6087=COleClientItem::SetPrintDevice
-6088=COleClientItem::SetPrintDevice
-6089=CEditView::SetPrinterFont
-6090=CPreviewView::SetPrintView
-6091=COlePropertyPage::SetPropCheck
-6092=COleControlSite::SetProperty
-6093=COleDispatchDriver::SetProperty
-6094=CWnd::SetProperty
-6095=COleControlSite::SetPropertyV
-6096=COlePropertyPage::SetPropIndex
-6097=COlePropertyPage::SetPropRadio
-6098=COleControl::SetPropsetData
-6099=COlePropertyPage::SetPropText
-6100=COlePropertyPage::SetPropText
-6101=COlePropertyPage::SetPropText
-6102=COlePropertyPage::SetPropText
-6103=COlePropertyPage::SetPropText
-6104=COlePropertyPage::SetPropText
-6105=COlePropertyPage::SetPropText
-6106=COlePropertyPage::SetPropText
-6107=COlePropertyPage::SetPropText
-6108=CDaoDatabase::SetQueryTimeout
-6109=CCmdUI::SetRadio
-6110=CTestCmdUI::SetRadio
-6111=CSliderCtrl::SetRange
-6112=CInternetFile::SetReadBufferSize
-6113=CDocObjectServer::XOleDocumentView::SetRect
-6114=CDocObjectServer::XOleDocumentView::SetRectComplex
-6115=COleControl::SetRectInContainer
-6116=CWinApp::SetRegistryKey
-6117=CWinApp::SetRegistryKey
-6118=CDaoQueryDef::SetReturnsRecords
-6119=CDC::SetROP2
-6120=CSplitterWnd::SetRowInfo
-6121=CRecordset::SetRowsetCurrencyStatus
-6122=CRecordset::SetRowsetCursorPosition
-6123=CRecordset::SetRowsetSize
-6124=CPreviewView::SetScaledSize
-6125=CPreviewDC::SetScaleRatio
-6126=CScrollView::SetScaleToFitSize
-6127=CDockState::SetScreenSize
-6128=CWnd::SetScrollInfo
-6129=CWnd::SetScrollPos
-6130=CWnd::SetScrollRange
-6131=CScrollView::SetScrollSizes
-6132=CSplitterWnd::SetScrollStyle
-6133=CPropertySection::SetSectionName
-6134=CRichEditCtrl::SetSel
-6135=CSliderCtrl::SetSelection
-6136=CRichEditCtrl::SetSelectionCharFormat
-6137=CDocTemplate::SetServerInfo
-6138=CArchiveStream::SetSize
-6139=CByteArray::SetSize
-6140=CDWordArray::SetSize
-6141=CObArray::SetSize
-6142=CPtrArray::SetSize
-6143=CStringArray::SetSize
-6144=CUIntArray::SetSize
-6145=CWordArray::SetSize
-6146=CToolBar::SetSizes
-6147=CDaoTableDef::SetSourceTableName
-6148=CSplitterWnd::SetSplitCursor
-6149=CDaoQueryDef::SetSQL
-6150=CCmdTarget::SetStandardProp
-6151=CColorButton::SetState
-6152=CRecordset::SetState
-6153=CFile::SetStatus
-6154=CControlBar::SetStatusText
-6155=COleFrameHook::XOleInPlaceFrame::SetStatusText
-6156=COleControlContainer::XOleIPFrame::SetStatusText
-6157=CDC::SetStretchBltMode
-6158=COleVariant::SetString
-6159=CString::SetSysString
-6160=CDialogTemplate::SetSystemFont
-6161=CEditView::SetTabStops
-6162=CDialogTemplate::SetTemplate
-6163=CFileDialog::SetTemplate
-6164=CCmdUI::SetText
-6165=COleCmdUI::SetText
-6166=COleControl::SetText
-6167=CStatusCmdUI::SetText
-6168=CTestCmdUI::SetText
-6169=CToolCmdUI::SetText
-6170=CDC::SetTextAlign
-6171=CDC::SetTextCharacterExtra
-6172=CDC::SetTextColor
-6173=CPreviewDC::SetTextColor
-6174=CDC::SetTextJustification
-6175=CDocument::SetTitle
-6176=CPropertySheet::SetTitle
-6177=CRichEditDoc::SetTitle
-6178=CToolTipCtrl::SetToolRect
-6179=CPreviewDC::SetTopLeftOffset
-6180=CProperty::SetType
-6181=CRecordset::SetUpdateMethod
-6182=CDaoTableDef::SetValidationRule
-6183=CDaoTableDef::SetValidationText
-6184=CThreadSlotData::SetValue
-6185=COlePropertiesDialog::XOleUIObjInfo::SetViewInfo
-6186=CDC::SetViewportExt
-6187=CMetaFileDC::SetViewportExt
-6188=CPreviewDC::SetViewportExt
-6189=CDC::SetViewportOrg
-6190=CMetaFileDC::SetViewportOrg
-6191=CPreviewDC::SetViewportOrg
-6192=CDC::SetWindowExt
-6193=CPreviewDC::SetWindowExt
-6194=CDC::SetWindowOrg
-6195=CWnd::SetWindowPlacement
-6196=COleControlSite::SetWindowPos
-6197=CWnd::SetWindowPos
-6198=COleControlSite::SetWindowTextA
-6199=CWnd::SetWindowTextA
-6200=CRichEditCtrl::SetWordCharFormat
-6201=CInternetFile::SetWriteBufferSize
-6202=CPreviewView::SetZoomState
-6203=CDocObjectServer::XOleDocumentView::Show
-6204=COlePropertyPage::XPropertyPage::Show
-6205=CDockBar::ShowAll
-6206=CRichEditCntrItem::ShowContainerUI
-6207=CRichEditView::ShowContainerUI
-6208=CRichEditView::XRichEditOleCallback::ShowContainerUI
-6209=CFrameWnd::ShowControlBar
-6210=COleClientItem::XOleClientSite::ShowObject
-6211=COleControlSite::XOleClientSite::ShowObject
-6212=CFrameWnd::ShowOwnedWindows
-6213=COleControlSite::XOleControlSite::ShowPropertyFrame
-6214=COleControlSite::ShowWindow
-6215=CWnd::ShowWindow
-6216=tagSIZEconstCScrollView::sizeDefault
-6217=CBitmapButton::SizeToContent
-6218=CToolBar::SizeToolBar
-6219=CEnumArray::XEnumVOID::Skip
-6220=CRecordset::SkipDeletedRecords
-6221=CAsyncSocket::Socket
-6222=CString::SpanExcluding
-6223=CString::SpanIncluding
-6224=CSplitterWnd::SplitColumn
-6225=COccManager::SplitDialogTemplate
-6226=CSplitterWnd::SplitRow
-6227=CDC::StartDocA
-6228=CDockContext::StartDrag
-6229=CDockContext::StartResize
-6230=CSplitterWnd::StartTracking
-6231=CArchiveStream::Stat
-6232=CSplitterWnd::StopTracking
-6233=CRuntimeClass::Store
-6234=CDaoRecordset::StoreFields
-6235=CRecordset::StoreFields
-6236=CRichEditView::Stream
-6237=CDockContext::Stretch
-6238=CDaoRecordset::StripBrackets
-6239=CWnd::SubclassCtl3d
-6240=CWnd::SubclassDlg3d
-6241=CWnd::SubclassDlgItem
-6242=CWnd::SubclassWindow
-6243=COleControlSite::XNotifyDBEvents::SyncAfter
-6244=COleControlSite::XNotifyDBEvents::SyncBefore
-6245=CRichEditCntrItem::SyncToRichEditObject
-6246=CDC::TabbedTextOutA
-6247=CMetaFileDC::TabbedTextOutA
-6248=CPreviewDC::TabbedTextOutA
-6249=CRichEditView::TextNotFound
-6250=CDC::TextOutA
-6251=CMetaFileDC::TextOutA
-6252=CPreviewDC::TextOutA
-6253=CDaoDatabase::ThrowDaoException
-6254=CDaoQueryDef::ThrowDaoException
-6255=CDaoRecordset::ThrowDaoException
-6256=CDaoTableDef::ThrowDaoException
-6257=CDaoWorkspace::ThrowDaoException
-6258=CDatabase::ThrowDBException
-6259=CRecordset::ThrowDBException
-6260=CFileException::ThrowErrno
-6261=COleControl::ThrowError
-6262=COleControl::ThrowError
-6263=ThrowGetRowsDaoException
-6264=CFileException::ThrowOsError
-6265=CDockContext::ToggleDocking
-6266=CDockContext::Track
-6267=CRectTracker::Track
-6268=CSplitterWnd::TrackColumnSize
-6269=CRectTracker::TrackHandle
-6270=CMenu::TrackPopupMenu
-6271=CSplitterWnd::TrackRowSize
-6272=CRectTracker::TrackRubberBand
-6273=COleControl::TransformCoords
-6274=COleControlSite::XOleControlSite::TransformCoords
-6275=COleControlSite::XOleControlSite::TranslateAcceleratorA
-6276=COleControl::XOleInPlaceActiveObject::TranslateAcceleratorA
-6277=COleServerDoc::XOleInPlaceActiveObject::TranslateAcceleratorA
-6278=COleFrameHook::XOleInPlaceFrame::TranslateAcceleratorA
-6279=COleControlContainer::XOleIPFrame::TranslateAcceleratorA
-6280=COlePropertyPage::XPropertyPage::TranslateAcceleratorA
-6281=COleControl::TranslateColor
-6282=CString::TrimLeft
-6283=CString::TrimRight
-6284=CDocObjectServer::XOleDocumentView::UIActivate
-6285=COccManager::UIActivateControl
-6286=COleControl::XOleInPlaceObject::UIDeactivate
-6287=COleServerDoc::XOleInPlaceObject::UIDeactivate
-6288=COccManager::UIDeactivateIfNecessary
-6289=COleSafeArray::UnaccessData
-6290=CConnectionPoint::XConnPt::Unadvise
-6291=CDocObjectServer::XOleObject::Unadvise
-6292=COleControl::XOleObject::Unadvise
-6293=COleServerDoc::XOleObject::Unadvise
-6294=COleServerItem::XOleObject::Unadvise
-6295=CRecordset::UnbindFieldsForUpdate
-6296=COleControl::XOleCache::Uncache
-6297=COleControl::XViewObject::Unfreeze
-6298=CCriticalSection::Unlock
-6299=CEvent::Unlock
-6300=CMultiLock::Unlock
-6301=CMultiLock::Unlock
-6302=CMutex::Unlock
-6303=COleSafeArray::Unlock
-6304=CSemaphore::Unlock
-6305=CSemaphore::Unlock
-6306=CSingleLock::Unlock
-6307=CSingleLock::Unlock
-6308=CSyncObject::Unlock
-6309=CTypeLibCache::Unlock
-6310=CEditView::UnlockBuffer
-6311=CString::UnlockBuffer
-6312=CFile::UnlockRange
-6313=CInternetFile::UnlockRange
-6314=CMemFile::UnlockRange
-6315=COleStreamFile::UnlockRange
-6316=CSocketFile::UnlockRange
-6317=CStdioFile::UnlockRange
-6318=CArchiveStream::UnlockRegion
-6319=CWinApp::Unregister
-6320=CWnd::UnsubclassWindow
-6321=CDaoRecordset::Update
-6322=CRecordset::Update
-6323=CDocObjectServer::XOleObject::Update
-6324=COleControl::XOleObject::Update
-6325=COleServerDoc::XOleObject::Update
-6326=COleServerItem::XOleObject::Update
-6327=COleServerDoc::UpdateAllItems
-6328=CStatusBar::UpdateAllPanes
-6329=CDocument::UpdateAllViews
-6330=CScrollView::UpdateBars
-6331=CMDIChildWnd::UpdateClientEdge
-6332=CDataSourceControl::UpdateControls
-6333=CDataSourceControl::UpdateCursor
-6334=CWnd::UpdateData
-6335=CWnd::UpdateDialogControls
-6336=CDocument::UpdateFrameCounts
-6337=CFrameWnd::UpdateFrameTitleForDocument
-6338=CRecordset::UpdateInsertDelete
-6339=COleClientItem::UpdateItemType
-6340=COleClientItem::UpdateLink
-6341=COleUILinkInfo::UpdateLink
-6342=CSizeComboBox::UpdateLogFont
-6343=CRecentFileList::UpdateMenu
-6344=COleDocument::UpdateModifiedFlag
-6345=CRichEditDoc::UpdateModifiedFlag
-6346=CRichEditDoc::UpdateObjectCache
-6347=CWinApp::UpdatePrinterSelection
-6348=CColorPropPage::CColorPropPageFactory::UpdateRegistry
-6349=CFontPropPage::CFontPropPageFactory::UpdateRegistry
-6350=COleObjectFactory::UpdateRegistry
-6351=COleObjectFactory::UpdateRegistry
-6352=COleTemplateServer::UpdateRegistry
-6353=CPicturePropPage::CPicturePropPageFactory::UpdateRegistry
-6354=COleObjectFactory::UpdateRegistryAll
-6355=CFontPropPage::UpdateSampleFont
-6356=CDockContext::UpdateState
-6357=CToolTipCtrl::UpdateTipText
-6358=CToolTipCtrl::UpdateTipText
-6359=COleServerDoc::UpdateUsingHostObj
-6360=COleLinkingDoc::UpdateVisibleLock
-6361=CDatabase::VerifyConnect
-6362=CRecordset::VerifyCursorSupport
-6363=CRecordset::VerifyDriverBehavior
-6364=COleObjectFactory::VerifyLicenseKey
-6365=COleObjectFactory::VerifyUserLicense
-6366=CListBox::VKeyToItem
-6367=CWnd::WalkPreTranslateTree
-6368=COleControl::WillAmbientsBeValidDuringLoad
-6369=CControlBar::WindowProc
-6370=COleControl::WindowProc
-6371=COlePropertyPage::WindowProc
-6372=CParkingWnd::WindowProc
-6373=CReflectorWnd::WindowProc
-6374=CWnd::WindowProc
-6375=CWinApp::WinHelpA
-6376=CWnd::WinHelpA
-6377=CWndconstCWnd::wndBottom
-6378=CWndconstCWnd::wndNoTopMost
-6379=CWndconstCWnd::wndTop
-6380=CWndconstCWnd::wndTopMost
-6381=CRichEditView::WrapChanged
-6382=CToolBar::WrapToolBar
-6383=CArchive::Write
-6384=CArchiveStream::Write
-6385=CFile::Write
-6386=CGopherFile::Write
-6387=CImageList::Write
-6388=CInternetFile::Write
-6389=CMemFile::Write
-6390=COleStreamFile::Write
-6391=CSocketFile::Write
-6392=CStdioFile::Write
-6393=CArchive::WriteClass
-6394=CArchive::WriteCount
-6395=COleClientItem::WriteItem
-6396=COleClientItem::WriteItemCompound
-6397=COleClientItem::WriteItemFlat
-6398=CRecentFileList::WriteList
-6399=CPropertySection::WriteNameDictToStream
-6400=CArchive::WriteObject
-6401=CWinApp::WriteProfileBinary
-6402=CWinApp::WriteProfileInt
-6403=CWinApp::WriteProfileStringA
-6404=CArchive::WriteString
-6405=CGopherFile::WriteString
-6406=CInternetFile::WriteString
-6407=CStdioFile::WriteString
-6408=CEditView::WriteToArchive
-6409=CProperty::WriteToStream
-6410=CPropertySection::WriteToStream
-6411=CPropertySet::WriteToStream
-6412=charafxChNil
-6413=CHttpConnection::CHttpConnection
-6414=_CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>::~_CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>
-6415=???1?$_CIP@UIUnknown@@$1?IID_IUnknown@@3U_GUID@@B@@QAE@XZ@@YAXXZ
-6416=CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>::~CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>
-6417=CIP<IUnknown&_GUIDconstIID_IUnknown>::~CIP<IUnknown&_GUIDconstIID_IUnknown>
-6418=AfxParseURLEx
-6421=CRuntimeClassconstCInternetException::classCInternetException
-6422=CAsyncMonikerFile::CreateBindStatusCallback
-6423=CWinThread::DispatchThreadMessageEx
-6424=CAsyncMonikerFile::EndCallbacks
-6425=CMonikerFile::Flush
-6426=CInternetSession::GetHttpConnection
-6427=CAsyncMonikerFile::Read
-6428=CEnumConnections::CEnumConnections
-6429=CEnumConnections::~CEnumConnections
-6430=CHtmlStream::operator<<
-6431=CHtmlStream::operator<<
-6432=CHttpServerContext::operator<<
-6433=CHttpServerContext::operator<<
-6434=_AfxDeleteRegKey
-6435=CEnumConnections::AddConnection
-6436=AfxGetDefaultValue
-6437=AfxGetResourceHandle
-6438=AfxInitRichEdit
-6439=AfxOleUnregisterHelper
-6440=AfxOleUnregisterServerClass
-6441=AfxSetDefaultValue
-6442=CWnd::CreateEx
-6443=CScrollView::DoMouseWheel
-6444=COleControlContainer::FreezeAllEvents
-6445=COleControlSite::FreezeEvents
-6446=CEnumConnections::GetInterfaceMap
-6447=HashKey
-6448=AFX_INTERFACEMAPconstCOleControlContainer::interfaceMap
-6449=AFX_INTERFACEMAPconstCOleControlSite::interfaceMap
-6450=CEnumConnections::OnClone
-6451=CDocTemplate::OnCmdMsg
-6452=COleTemplateServer::OnCmdMsg
-6453=CWnd::OnDestroy
-6454=CScrollView::OnMouseWheel
-6455=CSplitterWnd::OnMouseWheel
-6456=CEnumConnections::OnNext
-6457=CFrameWnd::OnRegisteredMouseWheel
-6458=CWnd::OnSettingChange
-6459=CRecordset::SetParamNull
-6460=COleObjectFactory::Unregister
-6461=COleTemplateServer::Unregister
-6462=COleObjectFactory::UnregisterAll
-6463=CDocManager::UnregisterShellFileTypes
-6464=CWinApp::UnregisterShellFileTypes
-6465=AFX_CLASSINIT_COMPAT::AFX_CLASSINIT_COMPAT
-6466=AFX_EVENT::AFX_EVENT
-6467=AFX_MAINTAIN_STATE2::AFX_MAINTAIN_STATE2
-6468=CCachedDataPathProperty::CCachedDataPathProperty
-6469=CColorPropPage::CColorPropPageFactory::CColorPropPageFactory
-6470=CDaoErrorInfo::CDaoErrorInfo
-6471=CDaoFieldInfo::CDaoFieldInfo
-6472=CDataPathProperty::CDataPathProperty
-6473=CDynLinkLibrary::CDynLinkLibrary
-6474=CFileStatus::CFileStatus
-6475=CFixedAlloc::CFixedAlloc
-6476=CFontPropPage::CFontPropPageFactory::CFontPropPageFactory
-6477=CGopherLocator::CGopherLocator
-6478=CHtmlView::CHtmlView
-6479=CMemoryException::CMemoryException
-6480=CNotSupportedException::CNotSupportedException
-6481=COleDocObjectItem::COleDocObjectItem
-6482=COleVariant::COleVariant
-6483=CParkingWnd::CParkingWnd
-6484=CPicturePropPage::CPicturePropPageFactory::CPicturePropPageFactory
-6485=CPropertyPageEx::CPropertyPageEx
-6486=CPropertyPageEx::CPropertyPageEx
-6487=CPropertyPageEx::CPropertyPageEx
-6488=CPropertySheetEx::CPropertySheetEx
-6489=CPropertySheetEx::CPropertySheetEx
-6490=CPropertySheetEx::CPropertySheetEx
-6491=CReBar::CReBar
-6492=CResourceException::CResourceException
-6493=CString::CString
-6494=CUserException::CUserException
-6495=CEmbeddedButActsLikePtr<CMapPtrToPtr>::~CEmbeddedButActsLikePtr<CMapPtrToPtr>
-6496=CEmbeddedButActsLikePtr<CPtrList>::~CEmbeddedButActsLikePtr<CPtrList>
-6497=AFX_MAINTAIN_STATE2::~AFX_MAINTAIN_STATE2
-6498=CArchiveException::~CArchiveException
-6499=CColorDialog::~CColorDialog
-6500=CColorPropPage::~CColorPropPage
-6501=CColorPropPage::CColorPropPageFactory::~CColorPropPageFactory
-6502=CComboBoxEx::~CComboBoxEx
-6503=CControlBarInfo::~CControlBarInfo
-6504=COleControl::CControlDataSource::~CControlDataSource
-6505=CControlFrameWnd::~CControlFrameWnd
-6506=CControlRectTracker::~CControlRectTracker
-6507=CDaoErrorInfo::~CDaoErrorInfo
-6508=CDateTimeCtrl::~CDateTimeCtrl
-6509=CFindReplaceDialog::~CFindReplaceDialog
-6510=CFixedAlloc::~CFixedAlloc
-6511=CFontPropPage::~CFontPropPage
-6512=CFontPropPage::CFontPropPageFactory::~CFontPropPageFactory
-6513=CHandleMap::~CHandleMap
-6514=CHtmlView::~CHtmlView
-6515=CIPAddressCtrl::~CIPAddressCtrl
-6516=CMDIChildWnd::~CMDIChildWnd
-6517=CMDIFrameWnd::~CMDIFrameWnd
-6518=CMemoryException::~CMemoryException
-6519=CMiniDockFrameWnd::~CMiniDockFrameWnd
-6520=CMonthCalCtrl::~CMonthCalCtrl
-6521=CNotSupportedException::~CNotSupportedException
-6522=COccManager::~COccManager
-6523=COleDocObjectItem::~COleDocObjectItem
-6524=COleException::~COleException
-6525=COleSafeArray::~COleSafeArray
-6526=CParkingWnd::~CParkingWnd
-6527=CPicturePropPage::CPicturePropPageFactory::~CPicturePropPageFactory
-6528=CPropertyPageEx::~CPropertyPageEx
-6529=CPropertySheetEx::~CPropertySheetEx
-6530=CPushRoutingFrame::~CPushRoutingFrame
-6531=CPushRoutingView::~CPushRoutingView
-6532=CReBar::~CReBar
-6533=CReflectorWnd::~CReflectorWnd
-6534=CResourceException::~CResourceException
-6535=CRichEditDoc::~CRichEditDoc
-6536=CSocketWnd::~CSocketWnd
-6537=CTempDC::~CTempDC
-6538=CTempGdiObject::~CTempGdiObject
-6539=CTempImageList::~CTempImageList
-6540=CTempMenu::~CTempMenu
-6541=CTempWnd::~CTempWnd
-6542=CThreadData::~CThreadData
-6543=CTypeLibCacheMap::~CTypeLibCacheMap
-6544=CUserException::~CUserException
-6545=CWindowlessDC::~CWindowlessDC
-6546=CTempWnd::operatordelete
-6547=CArchive::operator>>
-6548=CArchive::operator>>
-6549=CArchive::operator>>
-6550=CArchive::operator>>
-6551=CArchive::operator>>
-6552=CArchive::operator>>
-6553=CArchive::operator<<
-6554=CArchive::operator<<
-6555=CArchive::operator<<
-6556=CArchive::operator<<
-6557=CArchive::operator<<
-6558=CArchive::operator<<
-6559=operator
-6560=CTime::operator<
-6561=CTime::operator>
-6562=COleDocObjectItem::ActivateAndShow
-6563=COleDocObjectItem::XOleDocumentSite::ActivateMe
-6564=CReBar::AddBar
-6565=CReBar::AddBar
-6566=COleInsertDialog::AddClassIDToList
-6567=CStringList::AddHead
-6568=CPropertySheetEx::AddPage
-6569=CStringList::AddTail
-6570=AfxCheckError
-6571=AfxClassInit
-6572=AfxDelRegTreeHelper
-6573=AfxGetExceptionContext
-6574=AfxGetHENV
-6575=AfxGetMainWnd
-6576=AfxGetResourceHandleCompat
-6577=afxMapHDC
-6578=afxMapHGDIOBJ
-6579=afxMapHIMAGELIST
-6580=afxMapHMENU
-6581=afxMapHWND
-6582=AfxOleRegisterServerClass
-6583=AfxTrackerTerm
-6584=AfxWingdixTerm
-6585=CFixedAlloc::Alloc
-6586=AtlA2WHelper
-6587=AtlDevModeA2W
-6588=AtlDevModeW2A
-6589=AtlW2AHelper
-6590=COleControlContainer::AttachControlSite
-6591=CHtmlView::BeforeNavigate2
-6592=CPropertySheetEx::BuildPropPageArray
-6593=CReBar::CalcDynamicLayout
-6594=CReBar::CalcFixedLayout
-6595=CDatabase::CheckHstmt
-6596=CRuntimeClassconstCComboBoxEx::classCComboBoxEx
-6597=CRuntimeClassconstCHtmlView::classCHtmlView
-6598=CRuntimeClassconstCIPAddressCtrl::classCIPAddressCtrl
-6599=CRuntimeClassconstCOleDBRecordView::classCOleDBRecordView
-6600=CRuntimeClassconstCOleDocObjectItem::classCOleDocObjectItem
-6601=CRuntimeClassconstCPropertyPageEx::classCPropertyPageEx
-6602=CRuntimeClassconstCPropertySheetEx::classCPropertySheetEx
-6603=CRuntimeClassconstCReBar::classCReBar
-6604=CRuntimeClassconstCReBarCtrl::classCReBarCtrl
-6605=CWnd::ClientToScreen
-6606=CPropertyPageEx::CommonConstruct
-6607=CPropertySheetEx::CommonConstruct
-6608=CPropertyPageEx::Construct
-6609=CPropertyPageEx::Construct
-6610=CPropertySheetEx::Construct
-6611=CPropertySheetEx::Construct
-6612=CComboBoxEx::Create
-6613=CDateTimeCtrl::Create
-6614=CHtmlView::Create
-6615=CImageList::Create
-6616=CIPAddressCtrl::Create
-6617=CMonthCalCtrl::Create
-6618=CMonthCalCtrl::Create
-6619=CReBar::Create
-6620=CReBarCtrl::Create
-6621=COleControlContainer::CreateControl
-6622=COleControlSite::CreateControl
-6623=CWnd::CreateControl
-6624=CStatusBar::CreateEx
-6625=CToolBar::CreateEx
-6626=CMDIFrameWnd::CreateNewChild
-6627=CHtmlView::CreateObject
-6628=CTempDC::CreateObject
-6629=CTempGdiObject::CreateObject
-6630=CTempImageList::CreateObject
-6631=CTempMenu::CreateObject
-6632=CTempWnd::CreateObject
-6633=COleControl::CreateTracker
-6634=DDV_MinMaxDateTime
-6635=DDV_MinMaxDateTime
-6636=DDV_MinMaxMonth
-6637=DDV_MinMaxMonth
-6638=DDV_MinMaxSlider
-6639=DDX_DateTimeCtrl
-6640=DDX_DateTimeCtrl
-6641=DDX_FieldSlider
-6642=DDX_FieldText
-6643=DDX_FieldText
-6644=DDX_MonthCalCtrl
-6645=DDX_MonthCalCtrl
-6646=DDX_Slider
-6647=DDX_Text
-6648=CString::Delete
-6649=CComboBoxEx::DeleteItem
-6650=CHtmlView::DocumentComplete
-6651=COleInsertDialog::DoModal
-6652=CControlBar::DrawGripper
-6653=CImageList::DrawIndirect
-6654=CImageList::DrawIndirect
-6655=CWnd::EnableTrackingToolTips
-6656=CPropertyPage::EndDialog
-6657=CHttpFile::EndRequest
-6658=AFX_EVENTSINKMAPconstCHtmlView::eventsinkMap
-6659=COleFrameHook::XOleCommandTarget::Exec
-6660=COleDocObjectItem::ExecCommand
-6661=CHtmlView::ExecWB
-6662=CString::Find
-6663=CString::Find
-6664=FontAttrSize
-6665=CFixedAlloc::Free
-6666=CFixedAlloc::FreeAll
-6667=CString::FreeData
-6668=COleDocObjectItem::GetActiveView
-6669=CIPAddressCtrl::GetAddress
-6670=CHtmlView::GetAddressBar
-6671=CHtmlView::GetApplication
-6672=COleDateTime::GetAsSystemTime
-6673=CTime::GetAsSystemTime
-6674=CHtmlView::GetBusy
-6675=CListCtrl::GetCheck
-6676=CTreeCtrl::GetCheck
-6677=CReBarCtrl::GetColorScheme
-6678=CListCtrl::GetColumnOrderArray
-6679=CHtmlView::GetContainer
-6680=CInternetSession::GetCookie
-6681=CInternetSession::GetCookie
-6682=CInternetSession::GetCookieLength
-6683=CListBox::GetCurSel
-6684=CMonthCalCtrl::GetCurSel
-6685=CMonthCalCtrl::GetCurSel
-6686=CDataBoundProperty::GetCursor
-6687=CDataSourceControl::GetCursor
-6688=COleControlSite::GetCursor
-6689=CDocManager::GetDocumentCount
-6690=CToolBarCtrl::GetDropTarget
-6691=CHtmlView::GetEventSinkMap
-6692=CMonthCalCtrl::GetFirstDayOfWeek
-6693=CWnd::GetFont
-6694=CHtmlView::GetFullName
-6695=CHtmlView::GetFullScreen
-6696=CListCtrl::GetHeaderCtrl
-6697=CHtmlView::GetHeight
-6698=COleDocObjectItem::GetHelpMenu
-6699=CHtmlView::GetHtmlDocument
-6700=COleClientItem::GetIconFromRegistry
-6701=COleClientItem::GetIconFromRegistry
-6702=CReBarCtrl::GetImageList
-6703=COleFrameHook::GetInterfaceHook
-6704=COleDocObjectItem::GetInterfaceMap
-6705=CComboBoxEx::GetItem
-6706=CTabCtrl::GetItemState
-6707=CDC::GetLayout
-6708=CHtmlView::GetLeft
-6709=CHtmlView::GetLocationName
-6710=CHtmlView::GetLocationURL
-6711=CHtmlView::GetMenuBar
-6712=CHtmlView::GetMessageMap
-6713=COleDBRecordView::GetMessageMap
-6714=CReBar::GetMessageMap
-6715=CMonikerFile::GetMoniker
-6716=CMonthCalCtrl::GetMonthRange
-6717=CMonthCalCtrl::GetMonthRange
-6718=CMonthCalCtrl::GetMonthRange
-6719=CHtmlView::GetOffline
-6720=CHeaderCtrl::GetOrderArray
-6721=CWnd::GetOwner
-6722=COleDocObjectItem::GetPageCount
-6723=CRichEditView::GetPageRect
-6724=CHtmlView::GetParentBrowser
-6725=CRichEditView::GetPrintRect
-6726=CHtmlView::GetProperty
-6727=CHtmlView::GetProperty
-6728=CPropertySheet::GetPropSheetHeader
-6729=CDateTimeCtrl::GetRange
-6730=CDateTimeCtrl::GetRange
-6731=CMonthCalCtrl::GetRange
-6732=CMonthCalCtrl::GetRange
-6733=CMonthCalCtrl::GetRange
-6734=CProgressCtrl::GetRange
-6735=CHtmlView::GetReadyState
-6736=CHtmlView::GetRegisterAsBrowser
-6737=CHtmlView::GetRegisterAsDropTarget
-6738=CCmdTarget::GetRoutingFrame_
-6739=CCmdTarget::GetRoutingView_
-6740=CComboBoxEx::GetRuntimeClass
-6741=CDateTimeCtrl::GetRuntimeClass
-6742=CHtmlView::GetRuntimeClass
-6743=CIPAddressCtrl::GetRuntimeClass
-6744=CMonthCalCtrl::GetRuntimeClass
-6745=COleDBRecordView::GetRuntimeClass
-6746=COleDocObjectItem::GetRuntimeClass
-6747=CPropertyPageEx::GetRuntimeClass
-6748=CPropertySheetEx::GetRuntimeClass
-6749=CReBar::GetRuntimeClass
-6750=CReBarCtrl::GetRuntimeClass
-6751=CTempDC::GetRuntimeClass
-6752=CTempGdiObject::GetRuntimeClass
-6753=CTempImageList::GetRuntimeClass
-6754=CTempMenu::GetRuntimeClass
-6755=CTempWnd::GetRuntimeClass
-6756=CWnd::GetSafeOwner_
-6757=CMonthCalCtrl::GetSelRange
-6758=CMonthCalCtrl::GetSelRange
-6759=CMonthCalCtrl::GetSelRange
-6760=CHtmlView::GetSilent
-6761=CHtmlView::GetStatusBar
-6762=CListCtrl::GetSubItemRect
-6763=CPropertySheet::GetTabControl
-6764=CMirrorFile::GetTempName
-6765=CHtmlView::GetTheaterMode
-6766=CDateTimeCtrl::GetTime
-6767=CDateTimeCtrl::GetTime
-6768=CStatusBarCtrl::GetTipText
-6769=CFrameWnd::GetTitle
-6770=CMonthCalCtrl::GetToday
-6771=CMonthCalCtrl::GetToday
-6772=CHtmlView::GetToolBar
-6773=CHtmlView::GetTop
-6774=CHtmlView::GetTopLevelContainer
-6775=CHtmlView::GetType
-6776=CHtmlView::GetVisible
-6777=HasFont
-6778=CString::Insert
-6779=CString::Insert
-6780=CStringList::InsertAfter
-6781=CStringArray::InsertAt
-6782=CStringList::InsertBefore
-6783=CStringArray::InsertEmpty
-6784=CComboBoxEx::InsertItem
-6785=CTabCtrl::InsertItem
-6786=CTabCtrl::InsertItem
-6787=AFX_INTERFACEMAPconstCOleDocObjectItem::interfaceMap
-6788=CPropertyPage::IsButtonEnabled
-6789=IsButtonUp
-6790=IsDialogEx
-6791=IsDirSep
-6792=IsEnterKey
-6793=IsHelpKey
-6794=CToolBar::Layout
-6795=CBitmap::LoadBitmapA
-6796=CHtmlView::LoadFromResource
-6797=CHtmlView::LoadFromResource
-6798=CMDIChildWnd::MDIActivate
-6799=CMDIChildWnd::MDIDestroy
-6800=AFX_MSGMAPconstCHtmlView::messageMap
-6801=AFX_MSGMAPconstCOleDBRecordView::messageMap
-6802=AFX_MSGMAPconstCReBar::messageMap
-6803=CHtmlView::Navigate
-6804=CHtmlView::Navigate2
-6805=CHtmlView::Navigate2
-6806=CHtmlView::Navigate2
-6807=CHtmlView::NavigateComplete2
-6808=CHtmlView::OnBeforeNavigate2
-6809=COleControl::OnButtonDblClk
-6810=COleControl::OnButtonDown
-6811=COleControl::OnButtonUp
-6812=CHtmlView::OnCommandStateChange
-6813=CHtmlView::OnDestroy
-6814=CHtmlView::OnDocumentComplete
-6815=CHtmlView::OnDownloadBegin
-6816=CHtmlView::OnDownloadComplete
-6817=CHtmlView::OnDraw
-6818=CToolTipCtrl::OnEnable
-6819=COleControl::OnEraseBkgnd
-6820=CReBar::OnEraseBkgnd
-6821=COleControlSite::XRowsetNotify::OnFieldChange
-6822=CHtmlView::OnFilePrint
-6823=CHtmlView::OnFullScreen
-6824=COleDocObjectItem::OnGetItemPosition
-6825=CReBar::OnHeightChange
-6826=CFrameWnd::OnHelpPromptAddr
-6827=COleDBRecordView::OnInitialUpdate
-6828=CFrameWnd::OnInitMenu
-6829=COleFrameHook::OnInitMenu
-6830=COleFrameHook::OnInitMenuPopup
-6831=COleDocObjectItem::OnInsertMenus
-6832=CHtmlView::OnMenuBar
-6833=COleFrameHook::OnMenuSelect
-6834=COleDBRecordView::OnMove
-6835=CHtmlView::OnNavigateComplete2
-6836=CReBar::OnNcCalcSize
-6837=CReBar::OnNcCreate
-6838=CReBar::OnNcPaint
-6839=CHtmlView::OnNewWindow2
-6840=CHtmlView::OnPaint
-6841=CReBar::OnPaint
-6842=COleDocObjectItem::OnPreparePrinting
-6843=CToolBar::OnPreserveZeroBorderHelper
-6844=COleDocObjectItem::OnPrint
-6845=CHtmlView::OnProgressChange
-6846=CHtmlView::OnPropertyChange
-6847=CHtmlView::OnQuit
-6848=CReBar::OnRecalcParent
-6849=COleDocObjectItem::OnRemoveMenus
-6850=COleControlSite::XRowsetNotify::OnRowChange
-6851=COleControlSite::XRowsetNotify::OnRowsetChange
-6852=CToolBar::OnSetSizeHelper
-6853=CReBar::OnShowBand
-6854=CHtmlView::OnSize
-6855=CHtmlView::OnStatusBar
-6856=CHtmlView::OnStatusTextChange
-6857=CHtmlView::OnTheaterMode
-6858=CHtmlView::OnTitleChange
-6859=CHtmlView::OnToolBar
-6860=CReBar::OnToolHitTest
-6861=CMDIChildWnd::OnToolTipText
-6862=CReBar::OnUpdateCmdUI
-6863=COleDBRecordView::OnUpdateRecordFirst
-6864=COleDBRecordView::OnUpdateRecordLast
-6865=COleDBRecordView::OnUpdateRecordNext
-6866=COleDBRecordView::OnUpdateRecordPrev
-6867=CHtmlView::OnVisible
-6868=CHtmlView::PutProperty
-6869=CHttpFile::QueryInfo
-6870=COleFrameHook::XOleCommandTarget::QueryStatus
-6871=CHtmlView::QueryStatusWB
-6872=COleDocObjectItem::Release
-6873=COleControl::ReleaseCaches
-6874=CString::Remove
-6875=CTypeLibCacheMap::RemoveAll
-6876=CString::Replace
-6877=CString::Replace
-6878=RFX_Date
-6879=RFX_Text
-6880=CWnd::ScreenToClient
-6881=CHttpFile::SendRequestEx
-6882=CHttpFile::SendRequestEx
-6883=CStringArray::SetAtGrow
-6884=CAsyncMonikerFile::SetBinding
-6885=CListCtrl::SetBkImage
-6886=CListCtrl::SetBkImage
-6887=CControlBar::SetBorders
-6888=CListCtrl::SetCheck
-6889=CTreeCtrl::SetCheck
-6890=CReBarCtrl::SetColorScheme
-6891=CListCtrl::SetColumnOrderArray
-6892=CInternetSession::SetCookie
-6893=CMonthCalCtrl::SetCurSel
-6894=CMonthCalCtrl::SetCurSel
-6895=CMonthCalCtrl::SetDayState
-6896=CMonthCalCtrl::SetFirstDayOfWeek
-6897=CFontHolder::SetFontNotifySink
-6898=CAsyncMonikerFile::SetFormatEtc
-6899=CMDIChildWnd::SetHandles
-6900=CListCtrl::SetIconSpacing
-6901=CListCtrl::SetIconSpacing
-6902=CReBarCtrl::SetImageList
-6903=CComboBoxEx::SetItem
-6904=CListCtrl::SetItemCountEx
-6905=CListCtrl::SetItemState
-6906=CTabCtrl::SetItemState
-6907=CListCtrl::SetItemText
-6908=CDC::SetLayout
-6909=CHeaderCtrl::SetOrderArray
-6910=CDateTimeCtrl::SetRange
-6911=CDateTimeCtrl::SetRange
-6912=CMonthCalCtrl::SetRange
-6913=CMonthCalCtrl::SetRange
-6914=CMonthCalCtrl::SetRange
-6915=CCheckListBox::SetSelectionCheck
-6916=CMonthCalCtrl::SetSelRange
-6917=CMonthCalCtrl::SetSelRange
-6918=CMonthCalCtrl::SetSelRange
-6919=CDateTimeCtrl::SetTime
-6920=CDateTimeCtrl::SetTime
-6921=CDateTimeCtrl::SetTime
-6922=CMonthCalCtrl::SetToday
-6923=CMonthCalCtrl::SetToday
-6924=CMonthCalCtrl::SizeMinReq
-6925=COleDocObjectItem::SupportsIPrint
-6926=CDataSourceControl::ToVariant
-6927=CString::TrimLeft
-6928=CString::TrimLeft
-6929=CString::TrimRight
-6930=CString::TrimRight
-6931=CReBar::WindowProc
-6932=CMenu::GetMenuStringA
-6933=CInvalidArgException::CInvalidArgException
-6934=CInvalidArgException::~CInvalidArgException
-6935=CInvalidArgException::GetRuntimeClass
-6936=CRuntimeClassconstCInvalidArgException::classCInvalidArgException
-6937=AfxThrowInvalidArgException
-6938=CTime::GetMonth
-6939=CThreadSlotData::GetThreadValue
-6940=CTime::GetYear
-6941=CMapStringToOb::HashKey
-6942=CMapStringToPtr::HashKey
-6943=CMapStringToString::HashKey
+5=CRuntimeClassconstCCachedDataPathProperty::classCCachedDataPathProperty
+6=CRuntimeClassconstCDataPathProperty::classCDataPathProperty
+7=DllCanUnloadNow
+8=DllGetClassObject
+9=DllRegisterServer
+10=DllUnregisterServer
+256=_AFX_CHECKLIST_STATE::_AFX_CHECKLIST_STATE
+257=_AFX_COLOR_STATE::_AFX_COLOR_STATE
+258=???0_AFX_CONTROLPOS@@QAE@XZ@@YAXXZ
+259=_AFX_DAO_STATE::_AFX_DAO_STATE
+260=_AFX_EDIT_STATE::_AFX_EDIT_STATE
+261=_AFX_OLE_STATE::_AFX_OLE_STATE
+262=_AFX_THREAD_STATE::_AFX_THREAD_STATE
+263=_AFX_WIN_STATE::_AFX_WIN_STATE
+264=_AFXCTL_AMBIENT_CACHE::_AFXCTL_AMBIENT_CACHE
+265=_AFXCTL_UIACTIVE_INFO::_AFXCTL_UIACTIVE_INFO
+266=AFX_CLASSINIT::AFX_CLASSINIT
+267=AFX_DDPDATA::AFX_DDPDATA
+268=AFX_EXCEPTION_LINK::AFX_EXCEPTION_LINK
+269=AFX_MODULE_STATE::AFX_MODULE_STATE
+270=AFX_MODULE_STATE::AFX_MODULE_STATE
+271=AFX_MODULE_THREAD_STATE::AFX_MODULE_THREAD_STATE
+272=CAnimateCtrl::CAnimateCtrl
+273=CArchive::CArchive
+274=CArchivePropExchange::CArchivePropExchange
+275=CArchiveStream::CArchiveStream
+276=CAsyncMonikerFile::CAsyncMonikerFile
+277=CAsyncPropExchange::CAsyncPropExchange
+278=CAsyncSocket::CAsyncSocket
+279=CBitmap::CBitmap
+280=CBitmapButton::CBitmapButton
+281=CBlobProperty::CBlobProperty
+282=CBrush::CBrush
+283=CBrush::CBrush
+284=CBrush::CBrush
+285=CBrush::CBrush
+286=CButton::CButton
+287=CByteArray::CByteArray
+288=CCheckListBox::CCheckListBox
+289=CClientDC::CClientDC
+290=CCmdTarget::CCmdTarget
+291=CCmdUI::CCmdUI
+292=CColorButton::CColorButton
+293=CColorDialog::CColorDialog
+294=CColorPropPage::CColorPropPage
+295=CComboBox::CComboBox
+296=CCommandLineInfo::CCommandLineInfo
+297=CConnectionPoint::CConnectionPoint
+298=CControlBar::CControlBar
+299=CControlBarInfo::CControlBarInfo
+300=COleControl::CControlDataSource::CControlDataSource
+301=CControlFrameWnd::CControlFrameWnd
+302=CCriticalSection::CCriticalSection
+303=CCtrlView::CCtrlView
+304=CDaoDatabase::CDaoDatabase
+305=CDaoException::CDaoException
+306=CDaoFieldExchange::CDaoFieldExchange
+307=CDaoIndexFieldInfo::CDaoIndexFieldInfo
+308=CDaoIndexInfo::CDaoIndexInfo
+309=CDaoQueryDef::CDaoQueryDef
+310=CDaoRecordset::CDaoRecordset
+311=CDaoRecordView::CDaoRecordView
+312=CDaoRecordView::CDaoRecordView
+313=CDaoRelationFieldInfo::CDaoRelationFieldInfo
+314=CDaoRelationInfo::CDaoRelationInfo
+315=CDaoTableDef::CDaoTableDef
+316=CDaoWorkspace::CDaoWorkspace
+317=CDatabase::CDatabase
+318=CDataBoundProperty::CDataBoundProperty
+319=CDataExchange::CDataExchange
+320=CDataSourceControl::CDataSourceControl
+321=CDBException::CDBException
+322=CDBVariant::CDBVariant
+323=CDC::CDC
+324=CDialog::CDialog
+325=CDialog::CDialog
+326=CDialog::CDialog
+327=CDialogBar::CDialogBar
+328=CDialogTemplate::CDialogTemplate
+329=CDialogTemplate::CDialogTemplate
+330=CDocItem::CDocItem
+331=CDockBar::CDockBar
+332=CDockContext::CDockContext
+333=CDockState::CDockState
+334=CDocManager::CDocManager
+335=CDocObjectServer::CDocObjectServer
+336=CDocObjectServerItem::CDocObjectServerItem
+337=CDocTemplate::CDocTemplate
+338=CDocument::CDocument
+339=CDragListBox::CDragListBox
+340=CDumpContext::CDumpContext
+341=CDWordArray::CDWordArray
+342=CDynLinkLibrary::CDynLinkLibrary
+343=CEdit::CEdit
+344=CEditView::CEditView
+345=CEnumArray::CEnumArray
+346=CEnumConnPoints::CEnumConnPoints
+347=CEnumFormatEtc::CEnumFormatEtc
+348=CEvent::CEvent
+349=CException::CException
+350=CException::CException
+351=CFieldExchange::CFieldExchange
+352=CFile::CFile
+353=CFile::CFile
+354=CFile::CFile
+355=CFileDialog::CFileDialog
+356=CFileFind::CFileFind
+357=CFindReplaceDialog::CFindReplaceDialog
+358=CFont::CFont
+359=CFontComboBox::CFontComboBox
+360=CFontDialog::CFontDialog
+361=CFontDialog::CFontDialog
+362=CFontHolder::CFontHolder
+363=CFontPropPage::CFontPropPage
+364=CFormView::CFormView
+365=CFormView::CFormView
+366=CFrameWnd::CFrameWnd
+367=CFtpConnection::CFtpConnection
+368=CFtpConnection::CFtpConnection
+369=CFtpFileFind::CFtpFileFind
+370=CGdiObject::CGdiObject
+371=CGopherConnection::CGopherConnection
+372=CGopherConnection::CGopherConnection
+373=CGopherFile::CGopherFile
+374=CGopherFile::CGopherFile
+375=CGopherFileFind::CGopherFileFind
+376=CGopherLocator::CGopherLocator
+377=CHandleMap::CHandleMap
+378=CHeaderCtrl::CHeaderCtrl
+379=CHotKeyCtrl::CHotKeyCtrl
+380=CHttpConnection::CHttpConnection
+381=CHttpConnection::CHttpConnection
+382=CHttpFile::CHttpFile
+383=CHttpFile::CHttpFile
+384=CImageList::CImageList
+385=CInternetConnection::CInternetConnection
+386=CInternetException::CInternetException
+387=CInternetFile::CInternetFile
+388=CInternetFile::CInternetFile
+389=CInternetSession::CInternetSession
+390=CListBox::CListBox
+391=CListCtrl::CListCtrl
+392=CListView::CListView
+393=CLongBinary::CLongBinary
+394=CMapPtrToPtr::CMapPtrToPtr
+395=CMapPtrToWord::CMapPtrToWord
+396=CMapStringToOb::CMapStringToOb
+397=CMapStringToPtr::CMapStringToPtr
+398=CMapStringToString::CMapStringToString
+399=CMapWordToOb::CMapWordToOb
+400=CMapWordToPtr::CMapWordToPtr
+401=CMDIChildWnd::CMDIChildWnd
+402=CMDIFrameWnd::CMDIFrameWnd
+403=CMemFile::CMemFile
+404=CMemFile::CMemFile
+405=CMenu::CMenu
+406=CMetaFileDC::CMetaFileDC
+407=CMiniDockFrameWnd::CMiniDockFrameWnd
+408=CMiniFrameWnd::CMiniFrameWnd
+409=CMirrorFile::CMirrorFile
+410=CMonikerFile::CMonikerFile
+411=CMultiDocTemplate::CMultiDocTemplate
+412=CMultiLock::CMultiLock
+413=CMutex::CMutex
+414=CObArray::CObArray
+415=CObList::CObList
+416=CODBCFieldInfo::CODBCFieldInfo
+417=COleBusyDialog::COleBusyDialog
+418=COleChangeIconDialog::COleChangeIconDialog
+419=COleChangeSourceDialog::COleChangeSourceDialog
+420=COleClientItem::COleClientItem
+421=COleCmdUI::COleCmdUI
+422=COleCntrFrameWnd::COleCntrFrameWnd
+423=COleControl::COleControl
+424=COleControlContainer::COleControlContainer
+425=COleControlLock::COleControlLock
+426=COleControlSite::COleControlSite
+427=COleConvertDialog::COleConvertDialog
+428=COleCurrency::COleCurrency
+429=COleDataObject::COleDataObject
+430=COleDataSource::COleDataSource
+431=COleDialog::COleDialog
+432=COleDispatchDriver::COleDispatchDriver
+433=COleDispatchDriver::COleDispatchDriver
+434=COleDispatchDriver::COleDispatchDriver
+435=COleDispatchException::COleDispatchException
+436=COleDocIPFrameWnd::COleDocIPFrameWnd
+437=COleDocument::COleDocument
+438=COleDropSource::COleDropSource
+439=COleDropTarget::COleDropTarget
+440=COleFrameHook::COleFrameHook
+441=COleInsertDialog::COleInsertDialog
+442=COleIPFrameWnd::COleIPFrameWnd
+443=COleLinkingDoc::COleLinkingDoc
+444=COleLinksDialog::COleLinksDialog
+445=COleMessageFilter::COleMessageFilter
+446=COleObjectFactory::COleObjectFactory
+447=COlePasteSpecialDialog::COlePasteSpecialDialog
+448=COlePropertiesDialog::COlePropertiesDialog
+449=COlePropertyPage::COlePropertyPage
+450=COleResizeBar::COleResizeBar
+451=COleSafeArray::COleSafeArray
+452=COleSafeArray::COleSafeArray
+453=COleSafeArray::COleSafeArray
+454=COleSafeArray::COleSafeArray
+455=COleSafeArray::COleSafeArray
+456=COleServerDoc::COleServerDoc
+457=COleServerItem::COleServerItem
+458=COleStreamFile::COleStreamFile
+459=COleTemplateServer::COleTemplateServer
+460=COleUILinkInfo::COleUILinkInfo
+461=COleUpdateDialog::COleUpdateDialog
+462=COleVariant::COleVariant
+463=COleVariant::COleVariant
+464=COleVariant::COleVariant
+465=COleVariant::COleVariant
+466=COleVariant::COleVariant
+467=COleVariant::COleVariant
+468=COleVariant::COleVariant
+469=CPageSetupDialog::CPageSetupDialog
+470=CPaintDC::CPaintDC
+471=CPalette::CPalette
+472=CPen::CPen
+473=CPen::CPen
+474=CPen::CPen
+475=CPictureHolder::CPictureHolder
+476=CPicturePropPage::CPicturePropPage
+477=CPoint::CPoint
+478=CPoint::CPoint
+479=CPreviewDC::CPreviewDC
+480=CPreviewView::CPreviewView
+481=CPrintDialog::CPrintDialog
+482=CPrintDialog::CPrintDialog
+483=CPrintInfo::CPrintInfo
+484=CPrintPreviewState::CPrintPreviewState
+485=CProgressCtrl::CProgressCtrl
+486=CPropbagPropExchange::CPropbagPropExchange
+487=CProperty::CProperty
+488=CProperty::CProperty
+489=CPropertyPage::CPropertyPage
+490=CPropertyPage::CPropertyPage
+491=CPropertyPage::CPropertyPage
+492=CPropertySection::CPropertySection
+493=CPropertySection::CPropertySection
+494=CPropertySet::CPropertySet
+495=CPropertySet::CPropertySet
+496=CPropertySheet::CPropertySheet
+497=CPropertySheet::CPropertySheet
+498=CPropertySheet::CPropertySheet
+499=CPropsetPropExchange::CPropsetPropExchange
+500=CPtrArray::CPtrArray
+501=CPtrList::CPtrList
+502=CRecentFileList::CRecentFileList
+503=CRecordset::CRecordset
+504=CRecordView::CRecordView
+505=CRecordView::CRecordView
+506=CRectTracker::CRectTracker
+507=CRectTracker::CRectTracker
+508=CReObject::CReObject
+509=CReObject::CReObject
+510=CResetPropExchange::CResetPropExchange
+511=CRgn::CRgn
+512=CRichEditCntrItem::CRichEditCntrItem
+513=CRichEditCtrl::CRichEditCtrl
+514=CRichEditDoc::CRichEditDoc
+515=CRichEditView::CRichEditView
+516=CScrollBar::CScrollBar
+517=CScrollView::CScrollView
+518=CSemaphore::CSemaphore
+519=CSharedFile::CSharedFile
+520=CSingleDocTemplate::CSingleDocTemplate
+521=CSingleLock::CSingleLock
+522=CSliderCtrl::CSliderCtrl
+523=CSocket::CSocket
+524=CSocketFile::CSocketFile
+525=CSocketWnd::CSocketWnd
+526=CSpinButtonCtrl::CSpinButtonCtrl
+527=CSplitterWnd::CSplitterWnd
+528=CStatic::CStatic
+529=CStatusBar::CStatusBar
+530=CStatusBarCtrl::CStatusBarCtrl
+531=CStdioFile::CStdioFile
+532=CStdioFile::CStdioFile
+533=CStdioFile::CStdioFile
+534=CStockPropPage::CStockPropPage
+535=CString::CString
+536=CString::CString
+537=CString::CString
+538=CString::CString
+539=CString::CString
+540=CString::CString
+541=CStringArray::CStringArray
+542=CStringList::CStringList
+543=CSyncObject::CSyncObject
+544=CTabCtrl::CTabCtrl
+545=CTestCmdUI::CTestCmdUI
+546=CThreadSlotData::CThreadSlotData
+547=CTime::CTime
+548=CTime::CTime
+549=CTime::CTime
+550=CTime::CTime
+551=CTime::CTime
+552=CTime::CTime
+553=CTimeSpan::CTimeSpan
+554=CToolBar::CToolBar
+555=CToolBarCtrl::CToolBarCtrl
+556=CToolTipCtrl::CToolTipCtrl
+557=CTreeCtrl::CTreeCtrl
+558=CTreeView::CTreeView
+559=CUIntArray::CUIntArray
+560=CView::CView
+561=CWinApp::CWinApp
+562=CWindowDC::CWindowDC
+563=CWindowlessDC::CWindowlessDC
+564=CWinThread::CWinThread
+565=CWinThread::CWinThread
+566=CWnd::CWnd
+567=CWnd::CWnd
+568=CWordArray::CWordArray
+569=CPreviewView::PAGE_INFO::PAGE_INFO
+570=tagFONTOBJECT::tagFONTOBJECT
+571=_CIP<IBindCtx&_GUIDconstIID_IBindCtx>::~_CIP<IBindCtx&_GUIDconstIID_IBindCtx>
+572=_CIP<IBindHost&_GUIDconstIID_IBindHost>::~_CIP<IBindHost&_GUIDconstIID_IBindHost>
+573=_CIP<IBinding&_GUIDconstIID_IBinding>::~_CIP<IBinding&_GUIDconstIID_IBinding>
+574=_CIP<IMoniker&_GUIDconstIID_IMoniker>::~_CIP<IMoniker&_GUIDconstIID_IMoniker>
+575=_CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>::~_CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>
+576=_CIP<IStream&_GUIDconstIID_IStream>::~_CIP<IStream&_GUIDconstIID_IStream>
+577=CIP<IBindCtx&_GUIDconstIID_IBindCtx>::~CIP<IBindCtx&_GUIDconstIID_IBindCtx>
+578=CIP<IBindHost&_GUIDconstIID_IBindHost>::~CIP<IBindHost&_GUIDconstIID_IBindHost>
+579=CIP<IBinding&_GUIDconstIID_IBinding>::~CIP<IBinding&_GUIDconstIID_IBinding>
+580=CIP<IMoniker&_GUIDconstIID_IMoniker>::~CIP<IMoniker&_GUIDconstIID_IMoniker>
+581=CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>::~CIP<IServiceProvider&_GUIDconstIID_IServiceProvider>
+582=CIP<IStream&_GUIDconstIID_IStream>::~CIP<IStream&_GUIDconstIID_IStream>
+583=CThreadLocal<AFX_MODULE_THREAD_STATE>::~CThreadLocal<AFX_MODULE_THREAD_STATE>
+584=_AFX_CHECKLIST_STATE::~_AFX_CHECKLIST_STATE
+585=_AFX_CTL3D_STATE::~_AFX_CTL3D_STATE
+586=_AFX_CTL3D_THREAD::~_AFX_CTL3D_THREAD
+587=_AFX_DAO_STATE::~_AFX_DAO_STATE
+588=_AFX_DB_STATE::~_AFX_DB_STATE
+589=_AFX_EDIT_STATE::~_AFX_EDIT_STATE
+590=???1_AFX_EXTDLL_STATE@@UAE@XZ@@YAXXZ
+591=_AFX_MAIL_STATE::~_AFX_MAIL_STATE
+592=_AFX_OLE_STATE::~_AFX_OLE_STATE
+593=_AFX_RICHEDIT_STATE::~_AFX_RICHEDIT_STATE
+594=_AFX_SOCK_STATE::~_AFX_SOCK_STATE
+595=_AFX_THREAD_STATE::~_AFX_THREAD_STATE
+596=_AFX_WIN_STATE::~_AFX_WIN_STATE
+597=_AFXCTL_UIACTIVE_INFO::~_AFXCTL_UIACTIVE_INFO
+598=???1AFX_COM@@QAE@XZ@@YAXXZ
+599=AFX_MAINTAIN_STATE::~AFX_MAINTAIN_STATE
+600=AFX_MODULE_STATE::~AFX_MODULE_STATE
+601=AFX_MODULE_THREAD_STATE::~AFX_MODULE_THREAD_STATE
+602=CAnimateCtrl::~CAnimateCtrl
+603=CArchive::~CArchive
+604=CAsyncMonikerFile::~CAsyncMonikerFile
+605=CAsyncSocket::~CAsyncSocket
+606=CBitmap::~CBitmap
+607=CBitmapButton::~CBitmapButton
+608=CBrush::~CBrush
+609=CButton::~CButton
+610=CByteArray::~CByteArray
+611=CCachedDataPathProperty::~CCachedDataPathProperty
+612=CCheckListBox::~CCheckListBox
+613=CClientDC::~CClientDC
+614=CCmdTarget::~CCmdTarget
+615=CColorButton::~CColorButton
+616=CComboBox::~CComboBox
+617=CCommandLineInfo::~CCommandLineInfo
+618=CCommonDialog::~CCommonDialog
+619=CConnectionPoint::~CConnectionPoint
+620=CControlBar::~CControlBar
+621=CCriticalSection::~CCriticalSection
+622=CCtrlView::~CCtrlView
+623=CDaoDatabase::~CDaoDatabase
+624=CDaoException::~CDaoException
+625=CDaoFieldInfo::~CDaoFieldInfo
+626=CDaoIndexFieldInfo::~CDaoIndexFieldInfo
+627=CDaoIndexInfo::~CDaoIndexInfo
+628=CDaoQueryDef::~CDaoQueryDef
+629=CDaoRecordset::~CDaoRecordset
+630=CDaoRecordView::~CDaoRecordView
+631=CDaoRelationFieldInfo::~CDaoRelationFieldInfo
+632=CDaoRelationInfo::~CDaoRelationInfo
+633=CDaoTableDef::~CDaoTableDef
+634=CDaoWorkspace::~CDaoWorkspace
+635=CDatabase::~CDatabase
+636=CDataPathProperty::~CDataPathProperty
+637=CDataSourceControl::~CDataSourceControl
+638=CDBException::~CDBException
+639=CDBVariant::~CDBVariant
+640=CDC::~CDC
+641=CDialog::~CDialog
+642=CDialogBar::~CDialogBar
+643=CDialogTemplate::~CDialogTemplate
+644=CDocItem::~CDocItem
+645=CDockBar::~CDockBar
+646=CDockContext::~CDockContext
+647=CDockState::~CDockState
+648=CDocManager::~CDocManager
+649=CDocObjectServer::~CDocObjectServer
+650=CDocObjectServerItem::~CDocObjectServerItem
+651=CDocTemplate::~CDocTemplate
+652=CDocument::~CDocument
+653=CDragListBox::~CDragListBox
+654=CDWordArray::~CDWordArray
+655=CDynLinkLibrary::~CDynLinkLibrary
+656=CEdit::~CEdit
+657=CEditView::~CEditView
+658=CEnumArray::~CEnumArray
+659=CEnumConnPoints::~CEnumConnPoints
+660=CEnumFormatEtc::~CEnumFormatEtc
+661=CEnumOleVerb::~CEnumOleVerb
+662=CEnumUnknown::~CEnumUnknown
+663=CEvent::~CEvent
+664=CException::~CException
+665=CFile::~CFile
+666=CFileDialog::~CFileDialog
+667=CFileException::~CFileException
+668=CFileFind::~CFileFind
+669=CFont::~CFont
+670=CFontComboBox::~CFontComboBox
+671=CFontDialog::~CFontDialog
+672=CFontHolder::~CFontHolder
+673=CFormView::~CFormView
+674=CFrameWnd::~CFrameWnd
+675=CFtpConnection::~CFtpConnection
+676=CFtpFileFind::~CFtpFileFind
+677=CGdiObject::~CGdiObject
+678=CGopherConnection::~CGopherConnection
+679=CGopherFile::~CGopherFile
+680=CGopherFileFind::~CGopherFileFind
+681=CGopherLocator::~CGopherLocator
+682=CHeaderCtrl::~CHeaderCtrl
+683=CHotKeyCtrl::~CHotKeyCtrl
+684=CHttpConnection::~CHttpConnection
+685=CHttpFile::~CHttpFile
+686=CImageList::~CImageList
+687=CInternetConnection::~CInternetConnection
+688=CInternetException::~CInternetException
+689=CInternetFile::~CInternetFile
+690=CInternetSession::~CInternetSession
+691=COleServerItem::CItemDataSource::~CItemDataSource
+692=CListBox::~CListBox
+693=CListCtrl::~CListCtrl
+694=CListView::~CListView
+695=CLongBinary::~CLongBinary
+696=CMapPtrToPtr::~CMapPtrToPtr
+697=CMapPtrToWord::~CMapPtrToWord
+698=CMapStringToOb::~CMapStringToOb
+699=CMapStringToPtr::~CMapStringToPtr
+700=CMapStringToString::~CMapStringToString
+701=CMapWordToOb::~CMapWordToOb
+702=CMapWordToPtr::~CMapWordToPtr
+703=CMemFile::~CMemFile
+704=CMenu::~CMenu
+705=CMetaFileDC::~CMetaFileDC
+706=CMiniFrameWnd::~CMiniFrameWnd
+707=CMirrorFile::~CMirrorFile
+708=CMonikerFile::~CMonikerFile
+709=CMultiDocTemplate::~CMultiDocTemplate
+710=CMultiLock::~CMultiLock
+711=CMutex::~CMutex
+712=CNoTrackObject::~CNoTrackObject
+713=CObArray::~CObArray
+714=CObject::~CObject
+715=CObList::~CObList
+716=CODBCFieldInfo::~CODBCFieldInfo
+717=COleBusyDialog::~COleBusyDialog
+718=COleChangeIconDialog::~COleChangeIconDialog
+719=COleChangeSourceDialog::~COleChangeSourceDialog
+720=COleClientItem::~COleClientItem
+721=COleCmdUI::~COleCmdUI
+722=COleCntrFrameWnd::~COleCntrFrameWnd
+723=COleControl::~COleControl
+724=COleControlContainer::~COleControlContainer
+725=COleControlLock::~COleControlLock
+726=COleControlSite::~COleControlSite
+727=COleConvertDialog::~COleConvertDialog
+728=COleDataObject::~COleDataObject
+729=COleDataSource::~COleDataSource
+730=COleDialog::~COleDialog
+731=COleDispatchDriver::~COleDispatchDriver
+732=COleDispatchException::~COleDispatchException
+733=COleDocIPFrameWnd::~COleDocIPFrameWnd
+734=COleDocument::~COleDocument
+735=COleDropSource::~COleDropSource
+736=COleDropTarget::~COleDropTarget
+737=COleFrameHook::~COleFrameHook
+738=COleInsertDialog::~COleInsertDialog
+739=COleIPFrameWnd::~COleIPFrameWnd
+740=COleLinkingDoc::~COleLinkingDoc
+741=COleLinksDialog::~COleLinksDialog
+742=COleMessageFilter::~COleMessageFilter
+743=COleObjectFactory::~COleObjectFactory
+744=COlePasteSpecialDialog::~COlePasteSpecialDialog
+745=COlePropertiesDialog::~COlePropertiesDialog
+746=COlePropertyPage::~COlePropertyPage
+747=COleResizeBar::~COleResizeBar
+748=COleServerDoc::~COleServerDoc
+749=COleServerItem::~COleServerItem
+750=COleStreamFile::~COleStreamFile
+751=COleTemplateServer::~COleTemplateServer
+752=COleUpdateDialog::~COleUpdateDialog
+753=COleVariant::~COleVariant
+754=CPageSetupDialog::~CPageSetupDialog
+755=CPaintDC::~CPaintDC
+756=CPalette::~CPalette
+757=CPen::~CPen
+758=CPictureHolder::~CPictureHolder
+759=CPicturePropPage::~CPicturePropPage
+760=CPreviewDC::~CPreviewDC
+761=CPreviewView::~CPreviewView
+762=CPrintDialog::~CPrintDialog
+763=CPrintInfo::~CPrintInfo
+764=CProcessLocalObject::~CProcessLocalObject
+765=CProgressCtrl::~CProgressCtrl
+766=CPropbagPropExchange::~CPropbagPropExchange
+767=CProperty::~CProperty
+768=CPropertyPage::~CPropertyPage
+769=CPropertySection::~CPropertySection
+770=CPropertySet::~CPropertySet
+771=CPropertySheet::~CPropertySheet
+772=CPtrArray::~CPtrArray
+773=CPtrList::~CPtrList
+774=CRecentFileList::~CRecentFileList
+775=CRecordset::~CRecordset
+776=CRecordView::~CRecordView
+777=CRectTracker::~CRectTracker
+778=CReObject::~CReObject
+779=CRgn::~CRgn
+780=CRichEditCntrItem::~CRichEditCntrItem
+781=CRichEditCtrl::~CRichEditCtrl
+782=CRichEditView::~CRichEditView
+783=CScrollBar::~CScrollBar
+784=CScrollView::~CScrollView
+785=CSemaphore::~CSemaphore
+786=CSharedFile::~CSharedFile
+787=CSimpleException::~CSimpleException
+788=CSingleDocTemplate::~CSingleDocTemplate
+789=CSizeComboBox::~CSizeComboBox
+790=CSliderCtrl::~CSliderCtrl
+791=CSocket::~CSocket
+792=CSocketFile::~CSocketFile
+793=CSpinButtonCtrl::~CSpinButtonCtrl
+794=CSplitterWnd::~CSplitterWnd
+795=CStatic::~CStatic
+796=CStatusBar::~CStatusBar
+797=CStatusBarCtrl::~CStatusBarCtrl
+798=CStdioFile::~CStdioFile
+799=CStockPropPage::~CStockPropPage
+800=CString::~CString
+801=CStringArray::~CStringArray
+802=CStringList::~CStringList
+803=CSyncObject::~CSyncObject
+804=CTabCtrl::~CTabCtrl
+805=CThreadLocalObject::~CThreadLocalObject
+806=CThreadSlotData::~CThreadSlotData
+807=CToolBar::~CToolBar
+808=CToolBarCtrl::~CToolBarCtrl
+809=CToolTipCtrl::~CToolTipCtrl
+810=CTreeCtrl::~CTreeCtrl
+811=CTreeView::~CTreeView
+812=CUIntArray::~CUIntArray
+813=CView::~CView
+814=CWaitCursor::~CWaitCursor
+815=CWinApp::~CWinApp
+816=CWindowDC::~CWindowDC
+817=CWinThread::~CWinThread
+818=CWnd::~CWnd
+819=CWordArray::~CWordArray
+820=tagFONTOBJECT::~tagFONTOBJECT
+821=COleControl::XEventConnPt::~XEventConnPt
+822=COleControl::XPropConnPt::~XPropConnPt
+823=operatornew
+824=CNoTrackObject::operatornew
+825=operatordelete
+826=CNoTrackObject::operatordelete
+827=CObject::operatordelete
+828=_CIP<IBindHost&_GUIDconstIID_IBindHost>::operator
+829=COleCurrency::operator
+830=COleCurrency::operator
+831=COleCurrency::operator
+832=COleDateTime::operator
+833=COleDateTime::operator
+834=COleDateTime::operator
+835=COleDateTime::operator
+836=COleDateTime::operator
+837=COleDateTimeSpan::operator
+838=COleDateTimeSpan::operator
+839=COleDispatchDriver::operator
+840=COleSafeArray::operator
+841=COleSafeArray::operator
+842=COleSafeArray::operator
+843=COleSafeArray::operator
+844=COleVariant::operator
+845=COleVariant::operator
+846=COleVariant::operator
+847=COleVariant::operator
+848=COleVariant::operator
+849=COleVariant::operator
+850=COleVariant::operator
+851=COleVariant::operator
+852=COleVariant::operator
+853=COleVariant::operator
+854=COleVariant::operator
+855=COleVariant::operator
+856=COleVariant::operator
+857=COleVariant::operator
+858=CString::operator
+859=CString::operator
+860=CString::operator
+861=CString::operator
+862=operator>>
+863=operator>>
+864=operator>>
+865=operator>>
+866=operator>>
+867=operator>>
+868=operator>>
+869=operator>>
+870=operator>>
+871=operator>>
+872=operator>>
+873=operator>>
+874=operator>>
+875=operator>>
+876=operator>>
+877=operator>>
+878=operator>>
+879=operator>>
+880=operator>>
+881=operator>>
+882=operator<<
+883=operator<<
+884=operator<<
+885=operator<<
+886=operator<<
+887=operator<<
+888=operator<<
+889=CDumpContext::operator<<
+890=CDumpContext::operator<<
+891=CDumpContext::operator<<
+892=CDumpContext::operator<<
+893=CDumpContext::operator<<
+894=CDumpContext::operator<<
+895=CDumpContext::operator<<
+896=CDumpContext::operator<<
+897=CDumpContext::operator<<
+898=CDumpContext::operator<<
+899=CDumpContext::operator<<
+900=COleSafeArray::operator
+901=COleSafeArray::operator
+902=COleSafeArray::operator
+903=COleSafeArray::operator
+904=COleSafeArray::operator
+905=COleSafeArray::operator
+906=COleVariant::operator
+907=CTime::operator
+908=CTime::operator!
+909=CMapPtrToPtr::operator[]
+910=CMapPtrToWord::operator[]
+911=CMapStringToOb::operator[]
+912=CMapStringToPtr::operator[]
+913=CMapStringToString::operator[]
+914=CMapWordToOb::operator[]
+915=CMapWordToPtr::operator[]
+916=COleCurrency::operator*
+917=COleCurrency::operator-
+918=COleCurrency::operator-
+919=COleDateTime::operator-
+920=COleDateTime::operator-
+921=COleDateTimeSpan::operator-
+922=operator+
+923=operator+
+924=operator+
+925=operator+
+926=operator+
+927=COleCurrency::operator+
+928=COleDateTime::operator+
+929=COleDateTimeSpan::operator+
+930=COleCurrency::operator/
+931=COleCurrency::operator<
+932=COleDateTime::operator<
+933=COleCurrency::operator<
+934=COleDateTime::operator<
+935=COleCurrency::operator>
+936=COleDateTime::operator>
+937=COleCurrency::operator>
+938=COleDateTime::operator>
+939=CString::operator+
+940=CString::operator+
+941=CString::operator+
+942=_AfxAbortProc
+943=??_afxAdvApi@@3UAFX_ADVAPI_CALL@@A@@YAXXZ
+944=CThreadLocal<_AFXCTL_AMBIENT_CACHE>_afxAmbientCache
+945=??_afxComDlg@@3UAFX_COMDLG_CALL@@A@@YAXXZ
+946=??_afxCommCtrl@@3UAFX_COMMCTRL_CALL@@A@@YAXXZ
+947=intconst_afxDBCS
+948=??_afxODBC@@3UAFX_ODBC_CALL@@A@@YAXXZ
+949=??_afxOLE@@3UAFX_OLE_CALL@@A@@YAXXZ
+950=CProcessLocal<_AFX_RICHEDIT_STATE>_afxRichEditState
+951=??_afxShell@@3UAFX_SHELL_CALL@@A@@YAXXZ
+952=??_afxSOCK@@3UAFX_SOCK_CALL@@A@@YAXXZ
+953=??_afxUrlMon@@3UAFX_URLMON_CALL@@A@@YAXXZ
+954=??_afxWinSpool@@3UAFX_WINSPOOL_CALL@@A@@YAXXZ
+955=_mbstowcsz
+956=_wcstombsz
+957=CArchive::Abort
+958=CFile::Abort
+959=CInternetFile::Abort
+960=CMemFile::Abort
+961=CMirrorFile::Abort
+962=COleStreamFile::Abort
+963=CSocketFile::Abort
+964=CStdioFile::Abort
+965=COleControlSite::XNotifyDBEvents::AboutToDo
+966=CAsyncSocket::Accept
+967=CSocket::Accept
+968=COleSafeArray::AccessData
+969=COleClientItem::Activate
+970=COlePropertyPage::XPropertyPage::Activate
+971=COleClientItem::ActivateAs
+972=CRichEditCntrItem::ActivateAs
+973=CDocObjectServer::ActivateDocObject
+974=COleServerDoc::ActivateDocObject
+975=CFrameWnd::ActivateFrame
+976=CMDIChildWnd::ActivateFrame
+977=COleServerDoc::ActivateInPlace
+978=CSplitterWnd::ActivateNext
+979=CWnd::ActivateTopParent
+980=CRecentFileList::Add
+981=CToolBarCtrl::AddBitmap
+982=CToolBarCtrl::AddBitmap
+983=COleClientItem::AddCachedData
+984=CEnumConnPoints::AddConnPoint
+985=CDocManager::AddDocTemplate
+986=CWinApp::AddDocTemplate
+987=CDocTemplate::AddDocument
+988=CMultiDocTemplate::AddDocument
+989=CSingleDocTemplate::AddDocument
+990=CFontComboBox::AddFont
+991=CEnumFormatEtc::AddFormat
+992=COlePasteSpecialDialog::AddFormat
+993=COlePasteSpecialDialog::AddFormat
+994=COleControl::AddFrameLevelUI
+995=CFrameWnd::AddFrameWnd
+996=CObList::AddHead
+997=CObList::AddHead
+998=CPtrList::AddHead
+999=CPtrList::AddHead
+1000=CSimpleList::AddHead
+1001=CStringList::AddHead
+1002=CStringList::AddHead
+1003=COleDocument::AddItem
+1004=COlePasteSpecialDialog::AddLinkEntry
+1005=CDaoRecordset::AddNew
+1006=CRecordset::AddNew
+1007=COleServerItem::AddOtherClipboardData
+1008=CPropertySheet::AddPage
+1009=CPropertySection::AddProperty
+1010=CPropertySet::AddProperty
+1011=CArchiveStream::AddRef
+1012=CBlobProperty::AddRef
+1013=CInnerUnknown::AddRef
+1014=COleConnPtContainer::AddRef
+1015=COleDispatchImpl::AddRef
+1016=COleUILinkInfo::AddRef
+1017=COleClientItem::XAdviseSink::AddRef
+1018=COleControlSite::XAmbientProps::AddRef
+1019=COleControlSite::XBoundObjectSite::AddRef
+1020=COleObjectFactory::XClassFactory::AddRef
+1021=CConnectionPoint::XConnPt::AddRef
+1022=COleControl::XDataObject::AddRef
+1023=COleDataSource::XDataObject::AddRef
+1024=COleServerDoc::XDataObject::AddRef
+1025=COleServerItem::XDataObject::AddRef
+1026=COleDropSource::XDropSource::AddRef
+1027=COleDropTarget::XDropTarget::AddRef
+1028=CEnumArray::XEnumVOID::AddRef
+1029=COleControlSite::XEventSink::AddRef
+1030=COleControl::XFontNotification::AddRef
+1031=COleMessageFilter::XMessageFilter::AddRef
+1032=COleControlSite::XNotifyDBEvents::AddRef
+1033=COleControl::XOleCache::AddRef
+1034=COleClientItem::XOleClientSite::AddRef
+1035=COleControlSite::XOleClientSite::AddRef
+1036=CDocObjectServer::XOleCommandTarget::AddRef
+1037=COleControlContainer::XOleContainer::AddRef
+1038=COleControl::XOleControl::AddRef
+1039=COleControlSite::XOleControlSite::AddRef
+1040=CDocObjectServer::XOleDocument::AddRef
+1041=CDocObjectServer::XOleDocumentView::AddRef
+1042=COleControl::XOleInPlaceActiveObject::AddRef
+1043=COleServerDoc::XOleInPlaceActiveObject::AddRef
+1044=COleFrameHook::XOleInPlaceFrame::AddRef
+1045=COleControl::XOleInPlaceObject::AddRef
+1046=COleServerDoc::XOleInPlaceObject::AddRef
+1047=COleControlContainer::XOleIPFrame::AddRef
+1048=COleClientItem::XOleIPSite::AddRef
+1049=COleControlSite::XOleIPSite::AddRef
+1050=COleLinkingDoc::XOleItemContainer::AddRef
+1051=CDocObjectServer::XOleObject::AddRef
+1052=COleControl::XOleObject::AddRef
+1053=COleServerDoc::XOleObject::AddRef
+1054=COleServerItem::XOleObject::AddRef
+1055=COlePropertiesDialog::XOleUIObjInfo::AddRef
+1056=COleControl::XPerPropertyBrowsing::AddRef
+1057=COleLinkingDoc::XPersistFile::AddRef
+1058=COleControl::XPersistMemory::AddRef
+1059=COleControl::XPersistPropertyBag::AddRef
+1060=COleControl::XPersistStorage::AddRef
+1061=COleServerDoc::XPersistStorage::AddRef
+1062=COleControl::XPersistStreamInit::AddRef
+1063=COleControl::XPointerInactive::AddRef
+1064=CDocObjectServer::XPrint::AddRef
+1065=COleControlSite::XPropertyNotifySink::AddRef
+1066=COlePropertyPage::XPropertyPage::AddRef
+1067=COlePropertyPage::XPropNotifySink::AddRef
+1068=COleControl::XProvideClassInfo::AddRef
+1069=COleControl::XQuickActivate::AddRef
+1070=CRichEditView::XRichEditOleCallback::AddRef
+1071=COleControl::XSpecifyPropertyPages::AddRef
+1072=COleControl::XViewObject::AddRef
+1073=CToolBar::AddReplaceBitmap
+1074=CHttpFile::AddRequestHeaders
+1075=CHttpFile::AddRequestHeaders
+1076=CPropertySet::AddSection
+1077=CPropertySet::AddSection
+1078=CSizeComboBox::AddSize
+1079=COlePasteSpecialDialog::AddStandardFormats
+1080=CToolBarCtrl::AddString
+1081=CObList::AddTail
+1082=CObList::AddTail
+1083=CPtrList::AddTail
+1084=CPtrList::AddTail
+1085=CStringList::AddTail
+1086=CStringList::AddTail
+1087=CToolTipCtrl::AddTool
+1088=CToolTipCtrl::AddTool
+1089=CWinApp::AddToRecentFileList
+1090=CDocument::AddView
+1091=CMetaFileDC::AdjustCP
+1092=CRichEditView::AdjustDialogPosition
+1093=CRectTracker::AdjustRect
+1094=CConnectionPoint::XConnPt::Advise
+1095=CDocObjectServer::XOleObject::Advise
+1096=COleControl::XOleObject::Advise
+1097=COleServerDoc::XOleObject::Advise
+1098=COleServerItem::XOleObject::Advise
+1099=AfxA2WHelper
+1100=AfxAbort
+1101=AfxAllocTaskAnsiString
+1102=AfxAllocTaskAnsiString
+1103=AfxAllocTaskWideString
+1104=AfxAllocTaskWideString
+1105=AfxBeginThread
+1106=AfxBeginThread
+1107=AfxBSTR2ABSTR
+1108=AfxBSTR2CString
+1109=AfxCallWndProc
+1110=AfxCancelModes
+1111=AfxComparePath
+1112=AfxCompareValueByRef
+1113=AfxConnectionAdvise
+1114=AfxConnectionUnadvise
+1115=AfxCopyValueByRef
+1116=AfxCoreInitModule
+1117=AfxCreateDC
+1118=AfxCriticalInit
+1119=AfxCriticalNewHandler
+1120=AfxCriticalTerm
+1121=AfxCustomLogFont
+1122=AfxDaoCheck
+1123=AfxDaoGetEngine
+1124=AfxDaoInit
+1125=AfxDaoTerm
+1126=AUX_DATAafxData
+1127=AfxDeleteObject
+1128=AfxDevModeA2W
+1129=AfxDevModeW2A
+1130=AfxDlgProc
+1131=AfxDllCanUnloadNow
+1132=AfxDllGetClassObject
+1133=AfxDynamicDownCast
+1134=AfxEnableControlContainer
+1135=AfxEnableWin31Compatibility
+1136=AfxEnableWin40Compatibility
+1137=AfxEndDeferRegisterClass
+1138=AfxEndThread
+1139=AfxEnumMetaFileProc
+1140=AfxExtractSubString
+1141=AfxFailMaxChars
+1142=AfxFailRadio
+1143=AfxFieldText
+1144=AfxFieldText
+1145=AfxFindMessageEntry
+1146=AfxFindResourceHandle
+1147=AfxFormatString1
+1148=AfxFormatString2
+1149=AfxFormatStrings
+1150=AfxFormatStrings
+1151=AfxFreeLibrary
+1152=AfxFullPath
+1153=AfxGetAfxWndProc
+1154=AfxGetAppModuleState
+1155=AfxGetClassIDFromString
+1156=AfxGetCtl3dState
+1157=AfxGetDaoState
+1158=AfxGetEmptyString
+1159=AfxGetFieldInfo
+1160=AfxGetFileName
+1161=AfxGetFileTitle
+1162=AfxGetIndexFieldInfo
+1163=AfxGetIndexFields
+1164=AfxGetIndexInfo
+1165=AfxGetInProcServer
+1166=AfxGetInternetHandleType
+1167=AfxGetModuleShortFileName
+1168=AfxGetModuleState
+1169=AfxGetModuleThreadState
+1170=AfxGetNewHandler
+1171=AfxGetParentOwner
+1172=AfxGetPropSheetFont
+1173=AfxGetRichEditState
+1174=AfxGetRoot
+1175=AfxGetThread
+1176=AfxGetThreadState
+1177=AfxGetTypeLibCache
+1178=AfxGlobalFree
+1179=AfxHelpEnabled
+1180=AfxHookWindowCreate
+1181=??AfxINetLoad@@YGXPAP6GHXZPBD@Z@@YAXXZ
+1182=AfxInitExtensionModule
+1183=AfxInitLocalData
+1184=AfxInitThread
+1185=AfxInternetStatusCallback
+1186=AfxIsDescendant
+1187=AfxIsValidAddress
+1188=AfxIsValidString
+1189=AfxIsValidString
+1190=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBD@Z@@YAXXZ
+1191=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBDPAP6GHXZ1@Z@@YAXXZ
+1192=AfxLoadField
+1193=AfxLoadLibrary
+1194=AfxLoadString
+1195=AfxLoadSysColorBitmap
+1196=AfxLockGlobals
+1197=AfxLockTempMaps
+1198=AfxMergeMenus
+1199=AfxMessageBox
+1200=AfxMessageBox
+1201=AfxNewHandler
+1202=AfxOleCanExitApp
+1203=AfxOleGetUserCtrl
+1204=AfxOleHookProc
+1205=AfxOleInit
+1206=AfxOleLockApp
+1207=AfxOleLockControl
+1208=AfxOleLockControl
+1209=AfxOleOnReleaseAllObjects
+1210=AfxOleRegisterControlClass
+1211=AfxOleRegisterHelper
+1212=AfxOleRegisterPropertyPageClass
+1213=AfxOleRegisterPropertyPageClass
+1214=AfxOleRegisterServerClass
+1215=AfxOleRegisterServerClassCompat
+1216=AfxOleRegisterTypeLib
+1217=AfxOleSetEditMenu
+1218=AfxOleSetUserCtrl
+1219=AfxOleTerm
+1220=AfxOleTermOrFreeLib
+1221=AfxOleTypeMatchGuid
+1222=AfxOleUnlockAllControls
+1223=AfxOleUnlockApp
+1224=AfxOleUnlockControl
+1225=AfxOleUnlockControl
+1226=AfxOleUnregisterClass
+1227=AfxOleUnregisterTypeLib
+1228=AfxParseURL
+1229=AfxPostQuitMessage
+1230=AfxPropPageCallback
+1231=AfxPropSheetCallback
+1232=AfxRegisterClass
+1233=AfxRegisterWndClass
+1234=AfxRepositionWindow
+1235=AfxResetMsgCache
+1236=AfxResolveShortcut
+1237=AfxRFXBulkDefault
+1238=AfxSafeArrayInit
+1239=AfxSetCurrentRecord
+1240=AfxSetFieldInfo
+1241=AfxSetIndexFieldInfo
+1242=AfxSetIndexInfo
+1243=AfxSetModuleState
+1244=AfxSetNewHandler
+1245=AfxSetRecordCount
+1246=AfxSetWindowText
+1247=AfxSocketInit
+1248=AfxSocketTerm
+1249=AfxStoreField
+1250=AfxStringFromCLSID
+1251=AfxTaskStringA2W
+1252=AfxTaskStringW2A
+1253=AfxTermExtensionModule
+1254=AfxTermLocalData
+1255=AfxTermThread
+1256=AfxTextFloatFormat
+1257=AfxTextMetricA2W
+1258=AfxTextMetricW2A
+1259=AfxThrowArchiveException
+1260=AfxThrowDaoException
+1261=AfxThrowDBException
+1262=AfxThrowFileException
+1263=AfxThrowInternetException
+1264=AfxThrowLastCleanup
+1265=AfxThrowMemoryException
+1266=AfxThrowNotSupportedException
+1267=AfxThrowOleDispatchException
+1268=AfxThrowOleDispatchException
+1269=AfxThrowOleException
+1270=AfxThrowResourceException
+1271=AfxThrowUserException
+1564=AfxTimeToFileTime
+1565=AfxTlsAddRef
+1566=AfxTlsRelease
+1567=AfxTryCleanup
+1568=AfxUnhookWindowCreate
+1569=AfxUnlockGlobals
+1570=AfxUnlockTempMaps
+1571=AfxUnmergeMenus
+1572=AfxVariantInit
+1573=AfxVerifyLicFile
+1574=AfxW2AHelper
+1575=AfxWinInit
+1576=AfxWinMain
+1577=AfxWinTerm
+1578=AfxWndProc
+1579=AfxWndProcBase
+1580=AfxWndProcDllOle
+1581=CMemFile::Alloc
+1582=CSharedFile::Alloc
+1583=CRecordset::AllocAndCacheFieldInfo
+1584=CString::AllocBeforeWrite
+1585=CString::AllocBuffer
+1586=CDaoRecordset::AllocCache
+1587=CDaoFieldExchange::AllocCacheValue
+1588=CDatabase::AllocConnect
+1589=CString::AllocCopy
+1590=COleSafeArray::AllocData
+1591=CDaoRecordset::AllocDatabase
+1592=CRecordset::AllocDataCache
+1593=COleSafeArray::AllocDescriptor
+1594=CControlBar::AllocElements
+1595=CStatusBar::AllocElements
+1596=CRecordset::AllocHstmt
+1597=AllocLongBinary
+1598=CRecordset::AllocRowset
+1599=CThreadSlotData::AllocSlot
+1600=CRecordset::AllocStatusArrays
+1601=CString::AllocSysString
+1602=CProperty::AllocValue
+1603=COleControl::AmbientAppearance
+1604=COleControl::AmbientBackColor
+1605=COleControl::AmbientDisplayName
+1606=COleControl::AmbientFont
+1607=COleControl::AmbientForeColor
+1608=COleControl::AmbientLocaleID
+1609=COleControl::AmbientScaleUnits
+1610=COleControl::AmbientShowGrabHandles
+1611=COleControl::AmbientShowHatching
+1612=COleControl::AmbientTextAlign
+1613=COleControl::AmbientUIDead
+1614=COleControl::AmbientUserMode
+1615=CByteArray::Append
+1616=CDaoQueryDef::Append
+1617=CDaoTableDef::Append
+1618=CDaoWorkspace::Append
+1619=CDWordArray::Append
+1620=CObArray::Append
+1621=CPtrArray::Append
+1622=CStringArray::Append
+1623=CUIntArray::Append
+1624=CWordArray::Append
+1625=CRecordset::AppendFilterAndSortSQL
+1626=CRecordset::AppendNames
+1627=CRecordset::AppendNamesValues
+1628=CDaoFieldExchange::AppendParamType
+1629=CRecordset::AppendValues
+1630=COlePropertyPage::XPropertyPage::Apply
+1631=COleDocument::ApplyPrintDevice
+1632=COleDocument::ApplyPrintDevice
+1633=CDocObjectServer::XOleDocumentView::ApplyViewState
+1634=CDC::ArcTo
+1635=CObject::AssertValid
+1636=CString::AssignCopy
+1637=CThreadSlotData::AssignInstance
+1638=CAsyncSocket::AsyncSelect
+1639=CAsyncSocket::Attach
+1640=CDC::Attach
+1641=CGdiObject::Attach
+1642=CImageList::Attach
+1643=CMemFile::Attach
+1644=CMenu::Attach
+1645=CMonikerFile::Attach
+1646=CMonikerFile::Attach
+1647=COleDataObject::Attach
+1648=COleSafeArray::Attach
+1649=COleStreamFile::Attach
+1650=COleVariant::Attach
+1651=CWnd::Attach
+1652=COleDataObject::AttachClipboard
+1653=CWnd::AttachControlSite
+1654=CWnd::AttachControlSite
+1655=COleClientItem::AttachDataObject
+1656=COleDispatchDriver::AttachDispatch
+1657=CAsyncSocket::AttachHandle
+1658=CPrintDialog::AttachOnSetup
+1659=COleControlSite::AttachWindow
+1660=CBitmapButton::AutoLoad
+1661=CSocket::AuxQueueAdd
+1662=COleMessageFilter::BeginBusyState
+1663=CDragListBox::BeginDrag
+1664=COleDataObject::BeginEnumFormats
+1665=CFrameWnd::BeginModalState
+1666=CWnd::BeginModalState
+1667=CDaoWorkspace::BeginTrans
+1668=CDatabase::BeginTrans
+1669=CCmdTarget::BeginWaitCursor
+1670=CAsyncSocket::Bind
+1671=CDataSourceControl::BindColumns
+1672=COccManager::BindControls
+1673=COleControlSite::BindDefaultProperty
+1674=CWnd::BindDefaultProperty
+1675=CDaoRecordset::BindFields
+1676=CRecordset::BindFieldsForUpdate
+1677=CRecordset::BindFieldsToColumns
+1678=CDaoRecordset::BindParameters
+1679=CDatabase::BindParameters
+1680=CRecordset::BindParams
+1681=CDataSourceControl::BindProp
+1682=CDataSourceControl::BindProp
+1683=COleControlSite::BindProperty
+1684=CWnd::BindProperty
+1685=COleControl::BoundPropertyChanged
+1686=COleControl::BoundPropertyRequestEdit
+1687=CFrameWnd::BringToTop
+1688=CDBException::BuildErrorString
+1689=CDaoRecordset::BuildParameterList
+1690=CPropertySheet::BuildPropPageArray
+1691=CDaoRecordset::BuildSelectList
+1692=CRecordset::BuildSelectSQL
+1693=COleControl::BuildSharedMenu
+1694=COleDocIPFrameWnd::BuildSharedMenu
+1695=COleIPFrameWnd::BuildSharedMenu
+1696=CDaoRecordset::BuildSQL
+1697=CRecordset::BuildSQL
+1698=CRecordset::BuildUpdateSQL
+1699=COleControl::ButtonDblClk
+1700=COleControl::ButtonDown
+1701=COleControl::ButtonUp
+1702=_AFXCTL_AMBIENT_CACHE::Cache
+1703=CTypeLibCache::Cache
+1704=COleControl::XOleCache::Cache
+1705=COleDataSource::CacheData
+1706=COleDataSource::CacheGlobalData
+1707=CTypeLibCache::CacheTypeInfo
+1708=CMiniFrameWnd::CalcBorders
+1709=CControlBar::CalcDynamicLayout
+1710=CToolBar::CalcDynamicLayout
+1711=CControlBar::CalcFixedLayout
+1712=CDialogBar::CalcFixedLayout
+1713=CDockBar::CalcFixedLayout
+1714=CStatusBar::CalcFixedLayout
+1715=CToolBar::CalcFixedLayout
+1716=CControlBar::CalcInsideRect
+1717=CStatusBar::CalcInsideRect
+1718=CToolBar::CalcLayout
+1719=CCheckListBox::CalcMinimumItemHeight
+1720=CPreviewView::CalcPageDisplaySize
+1721=CPreviewView::CalcScaleRatio
+1722=CToolBar::CalcSize
+1723=CEditView::CalcWindowRect
+1724=CMiniFrameWnd::CalcWindowRect
+1725=CScrollView::CalcWindowRect
+1726=CView::CalcWindowRect
+1727=CWnd::CalcWindowRect
+1728=CCmdTarget::CallMemberFunc
+1729=COleClientItem::CanActivate
+1730=CRichEditCntrItem::CanActivate
+1731=CSplitterWnd::CanActivateNext
+1732=CDaoRecordset::CanAppend
+1733=CDaoRecordset::CanBookmark
+1734=CRecordset::CanBookmark
+1735=CDatabase::Cancel
+1736=CRecordset::Cancel
+1737=CSocket::CancelBlockingCall
+1738=CDragListBox::CancelDrag
+1739=COleControlSite::XNotifyDBEvents::Cancelled
+1740=COleUILinkInfo::CancelLink
+1741=CDockContext::CancelLoop
+1742=CPropertyPage::CancelToClose
+1743=CWnd::CancelToolTips
+1744=CDaoRecordset::CancelUpdate
+1745=CRecordset::CancelUpdate
+1746=CDocument::CanCloseFrame
+1747=COleServerDoc::CanCloseFrame
+1748=COleClientItem::CanCreateFromData
+1749=COleClientItem::CanCreateLinkFromData
+1750=CDockContext::CanDock
+1751=CFrameWnd::CanDock
+1752=CFrameWnd::CanEnterHelpMode
+1753=COleClientItem::XOleIPSite::CanInPlaceActivate
+1754=COleControlSite::XOleIPSite::CanInPlaceActivate
+1755=COleClientItem::CanPaste
+1756=CRichEditCtrl::CanPaste
+1757=CRichEditView::CanPaste
+1758=COleClientItem::CanPasteLink
+1759=CDaoRecordset::CanRestart
+1760=CDaoRecordset::CanScroll
+1761=CDaoDatabase::CanTransact
+1762=CDaoRecordset::CanTransact
+1763=CDaoDatabase::CanUpdate
+1764=CDaoQueryDef::CanUpdate
+1765=CDaoRecordset::CanUpdate
+1766=CDaoTableDef::CanUpdate
+1767=CScrollView::CenterOnPoint
+1768=CWnd::CenterWindow
+1769=CPicturePropPage::ChangePicture
+1770=COleVariant::ChangeType
+1771=CListBox::CharToItem
+1772=CString::CharToOemA
+1773=CDatabase::Check
+1774=CRecordset::Check
+1775=CDialog::CheckAutoCenter
+1776=CWnd::CheckAutoCenter
+1777=CArchive::CheckCount
+1778=COleControlContainer::CheckDlgButton
+1779=CWnd::CheckDlgButton
+1780=CCheckListBox::CheckFromPoint
+1781=COleClientItem::CheckGeneral
+1782=COleControlContainer::CheckRadioButton
+1783=CWnd::CheckRadioButton
+1784=COleDateTime::CheckRange
+1785=COleDateTimeSpan::CheckRange
+1786=CRecordset::CheckRowsetCurrencyStatus
+1787=CRecordset::CheckRowsetError
+1788=CRuntimeClassconstCAnimateCtrl::classCAnimateCtrl
+1789=CRuntimeClassconstCArchiveException::classCArchiveException
+1790=CRuntimeClassconstCAsyncMonikerFile::classCAsyncMonikerFile
+1791=CRuntimeClassconstCAsyncSocket::classCAsyncSocket
+1792=CRuntimeClassconstCBitmap::classCBitmap
+1793=CRuntimeClassconstCBitmapButton::classCBitmapButton
+1794=CRuntimeClassconstCBrush::classCBrush
+1795=CRuntimeClassconstCButton::classCButton
+1796=CRuntimeClassCByteArray::classCByteArray
+1797=CRuntimeClassconstCCheckListBox::classCCheckListBox
+1798=CRuntimeClassconstCClientDC::classCClientDC
+1799=CRuntimeClassconstCCmdTarget::classCCmdTarget
+1800=CRuntimeClassconstCColorDialog::classCColorDialog
+1801=CRuntimeClassconstCColorPropPage::classCColorPropPage
+1802=CRuntimeClassconstCComboBox::classCComboBox
+1803=CRuntimeClassconstCControlBar::classCControlBar
+1804=CRuntimeClassconstCCriticalSection::classCCriticalSection
+1805=CRuntimeClassconstCCtrlView::classCCtrlView
+1806=CRuntimeClassconstCDaoDatabase::classCDaoDatabase
+1807=CRuntimeClassconstCDaoException::classCDaoException
+1808=CRuntimeClassconstCDaoQueryDef::classCDaoQueryDef
+1809=CRuntimeClassconstCDaoRecordset::classCDaoRecordset
+1810=CRuntimeClassconstCDaoRecordView::classCDaoRecordView
+1811=CRuntimeClassconstCDaoTableDef::classCDaoTableDef
+1812=CRuntimeClassconstCDaoWorkspace::classCDaoWorkspace
+1813=CRuntimeClassconstCDatabase::classCDatabase
+1814=CRuntimeClassconstCDBException::classCDBException
+1815=CRuntimeClassconstCDC::classCDC
+1816=CRuntimeClassconstCDialog::classCDialog
+1817=CRuntimeClassconstCDialogBar::classCDialogBar
+1818=CRuntimeClassCDocItem::classCDocItem
+1819=CRuntimeClassconstCDockBar::classCDockBar
+1820=CRuntimeClassCDockState::classCDockState
+1821=CRuntimeClassconstCDocManager::classCDocManager
+1822=CRuntimeClassconstCDocObjectServer::classCDocObjectServer
+1823=CRuntimeClassconstCDocObjectServerItem::classCDocObjectServerItem
+1824=CRuntimeClassconstCDocTemplate::classCDocTemplate
+1825=CRuntimeClassconstCDocument::classCDocument
+1826=CRuntimeClassconstCDragListBox::classCDragListBox
+1827=CRuntimeClassCDWordArray::classCDWordArray
+1828=CRuntimeClassconstCDynLinkLibrary::classCDynLinkLibrary
+1829=CRuntimeClassconstCEdit::classCEdit
+1830=CRuntimeClassconstCEditView::classCEditView
+1831=CRuntimeClassconstCEvent::classCEvent
+1832=CRuntimeClassconstCException::classCException
+1833=CRuntimeClassconstCFile::classCFile
+1834=CRuntimeClassconstCFileDialog::classCFileDialog
+1835=CRuntimeClassconstCFileException::classCFileException
+1836=CRuntimeClassconstCFileFind::classCFileFind
+1837=CRuntimeClassconstCFindReplaceDialog::classCFindReplaceDialog
+1838=CRuntimeClassconstCFont::classCFont
+1839=CRuntimeClassconstCFontDialog::classCFontDialog
+1840=CRuntimeClassconstCFontPropPage::classCFontPropPage
+1841=CRuntimeClassconstCFormView::classCFormView
+1842=CRuntimeClassconstCFrameWnd::classCFrameWnd
+1843=CRuntimeClassconstCGdiObject::classCGdiObject
+1844=CRuntimeClassconstCHeaderCtrl::classCHeaderCtrl
+1845=CRuntimeClassconstCHotKeyCtrl::classCHotKeyCtrl
+1846=CRuntimeClassconstCImageList::classCImageList
+1847=CRuntimeClassconstCListBox::classCListBox
+1848=CRuntimeClassconstCListCtrl::classCListCtrl
+1849=CRuntimeClassconstCListView::classCListView
+1850=CRuntimeClassconstCLongBinary::classCLongBinary
+1851=CRuntimeClassconstCMapPtrToPtr::classCMapPtrToPtr
+1852=CRuntimeClassconstCMapPtrToWord::classCMapPtrToWord
+1853=CRuntimeClassCMapStringToOb::classCMapStringToOb
+1854=CRuntimeClassconstCMapStringToPtr::classCMapStringToPtr
+1855=CRuntimeClassCMapStringToString::classCMapStringToString
+1856=CRuntimeClassCMapWordToOb::classCMapWordToOb
+1857=CRuntimeClassconstCMapWordToPtr::classCMapWordToPtr
+1858=CRuntimeClassconstCMDIChildWnd::classCMDIChildWnd
+1859=CRuntimeClassconstCMDIFrameWnd::classCMDIFrameWnd
+1860=CRuntimeClassconstCMemFile::classCMemFile
+1861=CRuntimeClassconstCMemoryException::classCMemoryException
+1862=CRuntimeClassconstCMenu::classCMenu
+1863=CRuntimeClassconstCMetaFileDC::classCMetaFileDC
+1864=CRuntimeClassconstCMiniDockFrameWnd::classCMiniDockFrameWnd
+1865=CRuntimeClassconstCMiniFrameWnd::classCMiniFrameWnd
+1866=CRuntimeClassconstCMonikerFile::classCMonikerFile
+1867=CRuntimeClassconstCMultiDocTemplate::classCMultiDocTemplate
+1868=CRuntimeClassconstCMutex::classCMutex
+1869=CRuntimeClassconstCNotSupportedException::classCNotSupportedException
+1870=CRuntimeClassCObArray::classCObArray
+1871=CRuntimeClassconstCObject::classCObject
+1872=CRuntimeClassCObList::classCObList
+1873=CRuntimeClassconstCOleBusyDialog::classCOleBusyDialog
+1874=CRuntimeClassconstCOleChangeIconDialog::classCOleChangeIconDialog
+1875=CRuntimeClassconstCOleChangeSourceDialog::classCOleChangeSourceDialog
+1876=CRuntimeClassconstCOleClientItem::classCOleClientItem
+1877=CRuntimeClassconstCOleControl::classCOleControl
+1878=CRuntimeClassconstCOleControlModule::classCOleControlModule
+1879=CRuntimeClassconstCOleConvertDialog::classCOleConvertDialog
+1880=CRuntimeClassconstCOleDialog::classCOleDialog
+1881=CRuntimeClassconstCOleDispatchException::classCOleDispatchException
+1882=CRuntimeClassconstCOleDocIPFrameWnd::classCOleDocIPFrameWnd
+1883=CRuntimeClassconstCOleDocument::classCOleDocument
+1884=CRuntimeClassconstCOleException::classCOleException
+1885=CRuntimeClassconstCOleInsertDialog::classCOleInsertDialog
+1886=CRuntimeClassconstCOleIPFrameWnd::classCOleIPFrameWnd
+1887=CRuntimeClassconstCOleLinkingDoc::classCOleLinkingDoc
+1888=CRuntimeClassconstCOleLinksDialog::classCOleLinksDialog
+1889=CRuntimeClassconstCOleObjectFactory::classCOleObjectFactory
+1890=CRuntimeClassconstCOlePasteSpecialDialog::classCOlePasteSpecialDialog
+1891=CRuntimeClassconstCOlePropertiesDialog::classCOlePropertiesDialog
+1892=CRuntimeClassconstCOlePropertyPage::classCOlePropertyPage
+1893=CRuntimeClassconstCOleResizeBar::classCOleResizeBar
+1894=CRuntimeClassconstCOleServerDoc::classCOleServerDoc
+1895=CRuntimeClassconstCOleServerItem::classCOleServerItem
+1896=CRuntimeClassconstCOleStreamFile::classCOleStreamFile
+1897=CRuntimeClassconstCOleUpdateDialog::classCOleUpdateDialog
+1898=CRuntimeClassconstCPageSetupDialog::classCPageSetupDialog
+1899=CRuntimeClassconstCPaintDC::classCPaintDC
+1900=CRuntimeClassconstCPalette::classCPalette
+1901=CRuntimeClassconstCPen::classCPen
+1902=CRuntimeClassconstCPicturePropPage::classCPicturePropPage
+1903=CRuntimeClassconstCPreviewDC::classCPreviewDC
+1904=CRuntimeClassconstCPreviewView::classCPreviewView
+1905=CRuntimeClassconstCPrintDialog::classCPrintDialog
+1906=CRuntimeClassconstCProgressCtrl::classCProgressCtrl
+1907=CRuntimeClassconstCPropertyPage::classCPropertyPage
+1908=CRuntimeClassconstCPropertySheet::classCPropertySheet
+1909=CRuntimeClassconstCPtrArray::classCPtrArray
+1910=CRuntimeClassconstCPtrList::classCPtrList
+1911=CRuntimeClassconstCRecordset::classCRecordset
+1912=CRuntimeClassconstCRecordView::classCRecordView
+1913=CRuntimeClassconstCResourceException::classCResourceException
+1914=CRuntimeClassconstCRgn::classCRgn
+1915=CRuntimeClassCRichEditCntrItem::classCRichEditCntrItem
+1916=CRuntimeClassconstCRichEditCtrl::classCRichEditCtrl
+1917=CRuntimeClassconstCRichEditDoc::classCRichEditDoc
+1918=CRuntimeClassconstCRichEditView::classCRichEditView
+1919=CRuntimeClassconstCScrollBar::classCScrollBar
+1920=CRuntimeClassconstCScrollView::classCScrollView
+1921=CRuntimeClassconstCSemaphore::classCSemaphore
+1922=CRuntimeClassconstCSharedFile::classCSharedFile
+1923=CRuntimeClassconstCSingleDocTemplate::classCSingleDocTemplate
+1924=CRuntimeClassconstCSliderCtrl::classCSliderCtrl
+1925=CRuntimeClassconstCSocket::classCSocket
+1926=CRuntimeClassconstCSocketFile::classCSocketFile
+1927=CRuntimeClassconstCSpinButtonCtrl::classCSpinButtonCtrl
+1928=CRuntimeClassconstCSplitterWnd::classCSplitterWnd
+1929=CRuntimeClassconstCStatic::classCStatic
+1930=CRuntimeClassconstCStatusBar::classCStatusBar
+1931=CRuntimeClassconstCStatusBarCtrl::classCStatusBarCtrl
+1932=CRuntimeClassconstCStdioFile::classCStdioFile
+1933=CRuntimeClassconstCStockPropPage::classCStockPropPage
+1934=CRuntimeClassCStringArray::classCStringArray
+1935=CRuntimeClassCStringList::classCStringList
+1936=CRuntimeClassconstCSyncObject::classCSyncObject
+1937=CRuntimeClassconstCTabCtrl::classCTabCtrl
+1938=CRuntimeClassconstCToolBar::classCToolBar
+1939=CRuntimeClassconstCToolBarCtrl::classCToolBarCtrl
+1940=CRuntimeClassconstCToolTipCtrl::classCToolTipCtrl
+1941=CRuntimeClassconstCTreeCtrl::classCTreeCtrl
+1942=CRuntimeClassconstCTreeView::classCTreeView
+1943=CRuntimeClassconstCUIntArray::classCUIntArray
+1944=CRuntimeClassconstCUserException::classCUserException
+1945=CRuntimeClassconstCView::classCView
+1946=CRuntimeClassconstCWinApp::classCWinApp
+1947=CRuntimeClassconstCWindowDC::classCWindowDC
+1948=CRuntimeClassconstCWinThread::classCWinThread
+1949=CRuntimeClassconstCWnd::classCWnd
+1950=CRuntimeClassCWordArray::classCWordArray
+1951=CPropertyPage::Cleanup
+1952=COlePropertyPage::CleanupObjectArray
+1953=CDBVariant::Clear
+1954=CDockState::Clear
+1955=COleVariant::Clear
+1956=CDaoRecordset::ClearDirtyFieldStatus
+1957=CRecordset::ClearDirtyFieldStatus
+1958=CRecordset::ClearFieldStatus
+1959=CDaoRecordset::ClearFieldStatusFlags
+1960=CDaoRecordset::ClearNullFieldStatus
+1961=CRecordset::ClearNullFieldStatus
+1962=CRecordset::ClearNullParamStatus
+1963=COleControl::ClientToParent
+1964=COleControl::ClipCaretRect
+1965=CPreviewDC::ClipToPage
+1966=CArchiveStream::Clone
+1967=CEnumArray::XEnumVOID::Clone
+1968=CDocObjectServer::XOleDocumentView::Clone
+1969=CArchive::Close
+1970=CAsyncMonikerFile::Close
+1971=CAsyncSocket::Close
+1972=CCachedDataPathProperty::Close
+1973=CDaoDatabase::Close
+1974=CDaoQueryDef::Close
+1975=CDaoRecordset::Close
+1976=CDaoTableDef::Close
+1977=CDaoWorkspace::Close
+1978=CDatabase::Close
+1979=CFile::Close
+1980=CFileFind::Close
+1981=CFtpConnection::Close
+1982=CGopherConnection::Close
+1983=CGopherFile::Close
+1984=CHttpConnection::Close
+1985=CHttpFile::Close
+1986=CInternetConnection::Close
+1987=CInternetFile::Close
+1988=CInternetSession::Close
+1989=CMemFile::Close
+1990=CMirrorFile::Close
+1991=CMonikerFile::Close
+1992=COleClientItem::Close
+1993=COleStreamFile::Close
+1994=CRecordset::Close
+1995=CSocket::Close
+1996=CSocketFile::Close
+1997=CStdioFile::Close
+1998=CDocObjectServer::XOleObject::Close
+1999=COleControl::XOleObject::Close
+2000=COleServerDoc::XOleObject::Close
+2001=COleServerItem::XOleObject::Close
+2002=CDocManager::CloseAllDocuments
+2003=CDocTemplate::CloseAllDocuments
+2004=CWinApp::CloseAllDocuments
+2005=CFileFind::CloseContext
+2006=CFtpFileFind::CloseContext
+2007=CGopherFileFind::CloseContext
+2008=CDocObjectServer::XOleDocumentView::CloseView
+2009=CColorButton::colGetFaceColor
+2010=AFX_OLECMDMAPconstCCmdTarget::commandMap
+2011=CStatusBar::CommandToIndex
+2012=CToolBar::CommandToIndex
+2013=CArchiveStream::Commit
+2014=COleClientItem::CommitItem
+2015=COleDocument::CommitItems
+2016=CDaoWorkspace::CommitTrans
+2017=CDatabase::CommitTrans
+2018=CPropertyPage::CommonConstruct
+2019=CPropertySheet::CommonConstruct
+2020=CWinThread::CommonConstruct
+2021=CDaoWorkspace::CompactDatabase
+2022=CDaoWorkspace::CompactDatabase
+2023=CComboBox::CompareItem
+2024=CListBox::CompareItem
+2025=CDaoFieldExchange::CompareValue
+2026=CPreviewDC::ComputeDeltas
+2027=CString::ConcatCopy
+2028=CString::ConcatInPlace
+2029=CAsyncSocket::Connect
+2030=CDatabase::Connect
+2031=CAsyncSocket::ConnectHelper
+2032=CSocket::ConnectHelper
+2033=AFX_CONNECTIONMAPconstCCmdTarget::connectionMap
+2034=AFX_CONNECTIONMAPconstCOleControl::connectionMap
+2035=COleControlSite::ConnectSink
+2036=COleTemplateServer::ConnectTemplate
+2037=COleServerDoc::ConnectView
+2038=CPropertyPage::Construct
+2039=CPropertyPage::Construct
+2040=CPropertySheet::Construct
+2041=CPropertySheet::Construct
+2042=CRectTracker::Construct
+2043=ConstructElements
+2044=ConstructElements
+2045=COleControl::XOleInPlaceActiveObject::ContextSensitiveHelp
+2046=COleServerDoc::XOleInPlaceActiveObject::ContextSensitiveHelp
+2047=COleFrameHook::XOleInPlaceFrame::ContextSensitiveHelp
+2048=COleControl::XOleInPlaceObject::ContextSensitiveHelp
+2049=COleServerDoc::XOleInPlaceObject::ContextSensitiveHelp
+2050=COleControlContainer::XOleIPFrame::ContextSensitiveHelp
+2051=COleClientItem::XOleIPSite::ContextSensitiveHelp
+2052=COleControlSite::XOleIPSite::ContextSensitiveHelp
+2053=CRichEditView::XRichEditOleCallback::ContextSensitiveHelp
+2054=CPropertySheet::ContinueModal
+2055=CWnd::ContinueModal
+2056=COleControl::ControlInfoChanged
+2057=COlePropertiesDialog::XOleUIObjInfo::ConvertObject
+2058=COleClientItem::ConvertTo
+2059=CRichEditCntrItem::ConvertTo
+2060=CByteArray::Copy
+2061=CDWordArray::Copy
+2062=CObArray::Copy
+2063=COleSafeArray::Copy
+2064=CPtrArray::Copy
+2065=CStringArray::Copy
+2066=CUIntArray::Copy
+2067=CWordArray::Copy
+2068=CString::CopyBeforeWrite
+2069=CDataSourceControl::CopyColumnID
+2070=CopyElements
+2071=CopyElements
+2072=CArchiveStream::CopyTo
+2073=COleClientItem::CopyToClipboard
+2074=COleServerItem::CopyToClipboard
+2075=CDaoFieldExchange::CopyValue
+2076=CAnimateCtrl::Create
+2077=CAsyncSocket::Create
+2078=CButton::Create
+2079=CCheckListBox::Create
+2080=CComboBox::Create
+2081=CControlFrameWnd::Create
+2082=CDaoDatabase::Create
+2083=CDaoQueryDef::Create
+2084=CDaoTableDef::Create
+2085=CDaoWorkspace::Create
+2086=CDialog::Create
+2087=CDialogBar::Create
+2088=CDockBar::Create
+2089=CEdit::Create
+2090=CFindReplaceDialog::Create
+2091=CFormView::Create
+2092=CFrameWnd::Create
+2093=CHeaderCtrl::Create
+2094=CHotKeyCtrl::Create
+2095=CImageList::Create
+2096=CImageList::Create
+2097=CImageList::Create
+2098=CImageList::Create
+2099=CListBox::Create
+2100=CListCtrl::Create
+2101=CMDIChildWnd::Create
+2102=CMiniDockFrameWnd::Create
+2103=CMiniFrameWnd::Create
+2104=COleResizeBar::Create
+2105=COleSafeArray::Create
+2106=COleSafeArray::Create
+2107=CPlex::Create
+2108=CProgressCtrl::Create
+2109=CPropertySheet::Create
+2110=CReflectorWnd::Create
+2111=CRichEditCtrl::Create
+2112=CScrollBar::Create
+2113=CSliderCtrl::Create
+2114=CSpinButtonCtrl::Create
+2115=CSplitterWnd::Create
+2116=CStatic::Create
+2117=CStatusBar::Create
+2118=CStatusBarCtrl::Create
+2119=CTabCtrl::Create
+2120=CToolBar::Create
+2121=CToolBarCtrl::Create
+2122=CToolTipCtrl::Create
+2123=CTreeCtrl::Create
+2124=CWnd::Create
+2125=CMonikerFile::CreateBindContext
+2126=CMonikerFile::CreateBindHost
+2127=CMDIFrameWnd::CreateClient
+2128=CRichEditDoc::CreateClientItem
+2129=COleClientItem::CreateCloneFrom
+2130=CSplitterWnd::CreateCommon
+2131=CConnectionPoint::CreateConnectionArray
+2132=COccManager::CreateContainer
+2133=COleControlContainer::CreateControl
+2134=COleControlSite::CreateControl
+2135=CWnd::CreateControl
+2136=CWnd::CreateControl
+2137=COleControl::CreateControlWindow
+2138=CBrush::CreateDIBPatternBrush
+2139=CFtpConnection::CreateDirectoryA
+2140=COleDispatchDriver::CreateDispatch
+2141=COleDispatchDriver::CreateDispatch
+2142=CWnd::CreateDlg
+2143=COccManager::CreateDlgControl
+2144=COccManager::CreateDlgControls
+2145=COccManager::CreateDlgControls
+2146=CWnd::CreateDlgIndirect
+2147=CWnd::CreateDlgIndirect
+2148=CListCtrl::CreateDragImage
+2149=CTreeCtrl::CreateDragImage
+2150=CPictureHolder::CreateEmpty
+2151=CMiniFrameWnd::CreateEx
+2152=CWnd::CreateEx
+2153=CDaoTableDef::CreateField
+2154=CDaoTableDef::CreateField
+2155=CFrameWnd::CreateFloatingFrame
+2156=COleControl::CreateFrameWindow
+2157=CPictureHolder::CreateFromBitmap
+2158=CPictureHolder::CreateFromBitmap
+2159=CPictureHolder::CreateFromBitmap
+2160=COleClientItem::CreateFromClipboard
+2161=COleClientItem::CreateFromData
+2162=COleClientItem::CreateFromFile
+2163=CPictureHolder::CreateFromIcon
+2164=CPictureHolder::CreateFromIcon
+2165=CPictureHolder::CreateFromMetafile
+2166=CDaoTableDef::CreateIndex
+2167=CDialog::CreateIndirect
+2168=CDialog::CreateIndirect
+2169=CDialog::CreateIndirect
+2170=CDialog::CreateIndirect
+2171=COleServerDoc::CreateInPlaceFrame
+2172=AFX_COM::CreateInstance
+2173=COleObjectFactory::XClassFactory::CreateInstance
+2174=COleObjectFactory::XClassFactory::CreateInstanceLic
+2175=COleInsertDialog::CreateItem
+2176=COlePasteSpecialDialog::CreateItem
+2177=COleClientItem::CreateLinkFromClipboard
+2178=COleClientItem::CreateLinkFromData
+2179=COleClientItem::CreateLinkFromFile
+2180=CGopherConnection::CreateLocator
+2181=CGopherConnection::CreateLocator
+2182=CGopherConnection::CreateLocator
+2183=COleStreamFile::CreateMemoryStream
+2184=CDocTemplate::CreateNewDocument
+2185=CDocTemplate::CreateNewFrame
+2186=COleClientItem::CreateNewItem
+2187=CProcessLocal<_AFX_PROPPAGEFONTINFO>::CreateObject
+2188=CProcessLocal<_AFX_BASE_MODULE_STATE>::CreateObject
+2189=CProcessLocal<_AFX_CHECKLIST_STATE>::CreateObject
+2190=CProcessLocal<_AFX_COLOR_STATE>::CreateObject
+2191=CProcessLocal<_AFX_CTL3D_STATE>::CreateObject
+2192=CProcessLocal<_AFX_DB_STATE>::CreateObject
+2193=CProcessLocal<_AFX_EDIT_STATE>::CreateObject
+2194=??CreateObject@?$CProcessLocal@V_AFX_EXTDLL_STATE@@@@SGPAVCNoTrackObject@@XZ@@YAXXZ
+2195=CProcessLocal<_AFX_MAIL_STATE>::CreateObject
+2196=CProcessLocal<_AFX_OLE_STATE>::CreateObject
+2197=CProcessLocal<_AFX_RICHEDIT_STATE>::CreateObject
+2198=CProcessLocal<_AFX_SOCK_STATE>::CreateObject
+2199=CProcessLocal<_AFX_WIN_STATE>::CreateObject
+2200=CProcessLocal<COccManager>::CreateObject
+2201=CThreadLocal<_AFX_CTL3D_THREAD>::CreateObject
+2202=CThreadLocal<_AFX_THREAD_STATE>::CreateObject
+2203=CThreadLocal<_AFXCTL_AMBIENT_CACHE>::CreateObject
+2204=CThreadLocal<AFX_MODULE_THREAD_STATE>::CreateObject
+2205=CByteArray::CreateObject
+2206=CColorPropPage::CreateObject
+2207=CDC::CreateObject
+2208=CDocItem::CreateObject
+2209=CDockState::CreateObject
+2210=CDWordArray::CreateObject
+2211=CEditView::CreateObject
+2212=CFontPropPage::CreateObject
+2213=CFrameWnd::CreateObject
+2214=CGdiObject::CreateObject
+2215=CImageList::CreateObject
+2216=CListView::CreateObject
+2217=CMapStringToOb::CreateObject
+2218=CMapStringToString::CreateObject
+2219=CMapWordToOb::CreateObject
+2220=CMDIChildWnd::CreateObject
+2221=CMDIFrameWnd::CreateObject
+2222=CMenu::CreateObject
+2223=CMiniDockFrameWnd::CreateObject
+2224=CMiniFrameWnd::CreateObject
+2225=CObArray::CreateObject
+2226=CObList::CreateObject
+2227=COleDocIPFrameWnd::CreateObject
+2228=COleIPFrameWnd::CreateObject
+2229=CPicturePropPage::CreateObject
+2230=CPreviewView::CreateObject
+2231=CRichEditCntrItem::CreateObject
+2232=CRichEditView::CreateObject
+2233=CRuntimeClass::CreateObject
+2234=CStringArray::CreateObject
+2235=CStringList::CreateObject
+2236=CTreeView::CreateObject
+2237=CWnd::CreateObject
+2238=CWordArray::CreateObject
+2239=COleControlContainer::CreateOleFont
+2240=CDocTemplate::CreateOleFrame
+2241=COleSafeArray::CreateOneDim
+2242=COleControlSite::CreateOrLoad
+2243=CFont::CreatePointFont
+2244=CFont::CreatePointFontIndirect
+2245=CPageSetupDialog::CreatePrinterDC
+2246=CPrintDialog::CreatePrinterDC
+2247=CWinApp::CreatePrinterDC
+2248=CDaoDatabase::CreateRelation
+2249=CDaoDatabase::CreateRelation
+2250=CSplitterWnd::CreateScrollBarCtrl
+2251=COccManager::CreateSite
+2252=CSplitterWnd::CreateStatic
+2253=COleClientItem::CreateStaticFromClipboard
+2254=COleClientItem::CreateStaticFromData
+2255=COleStreamFile::CreateStream
+2256=CWinThread::CreateThread
+2257=COleControl::CreateTracker
+2258=CFrameWnd::CreateView
+2259=CSplitterWnd::CreateView
+2260=CDocObjectServer::XOleDocument::CreateView
+2261=COleControl::CreateWindowForSubclassedControl
+2262=COleControl::XDataObject::DAdvise
+2263=COleDataSource::XDataObject::DAdvise
+2264=COleServerDoc::XDataObject::DAdvise
+2265=COleServerItem::XDataObject::DAdvise
+2266=DDP_Check
+2267=DDP_EndCheck
+2268=DDP_EndRadio
+2269=DDP_EndText
+2270=DDP_EndText
+2271=DDP_EndText
+2272=DDP_EndText
+2273=DDP_EndText
+2274=DDP_EndText
+2275=DDP_EndText
+2276=DDP_EndText
+2277=DDP_EndText
+2278=DDP_PostProcessing
+2279=DDP_Radio
+2280=DDP_Text
+2281=DDP_Text
+2282=DDP_Text
+2283=DDP_Text
+2284=DDP_Text
+2285=DDP_Text
+2286=DDP_Text
+2287=DDP_Text
+2288=DDP_Text
+2289=DDV_MaxChars
+2290=DDV_MinMaxByte
+2291=DDV_MinMaxDouble
+2292=DDV_MinMaxDWord
+2293=DDV_MinMaxFloat
+2294=DDV_MinMaxInt
+2295=DDV_MinMaxLong
+2296=DDV_MinMaxShort
+2297=DDV_MinMaxUInt
+2298=DDX_CBIndex
+2299=DDX_CBString
+2300=DDX_CBStringExact
+2301=DDX_Check
+2302=DDX_Control
+2303=DDX_FieldCBIndex
+2304=DDX_FieldCBIndex
+2305=DDX_FieldCBString
+2306=DDX_FieldCBString
+2307=DDX_FieldCBStringExact
+2308=DDX_FieldCBStringExact
+2309=DDX_FieldCheck
+2310=DDX_FieldCheck
+2311=DDX_FieldLBIndex
+2312=DDX_FieldLBIndex
+2313=DDX_FieldLBString
+2314=DDX_FieldLBString
+2315=DDX_FieldLBStringExact
+2316=DDX_FieldLBStringExact
+2317=DDX_FieldRadio
+2318=DDX_FieldRadio
+2319=DDX_FieldScroll
+2320=DDX_FieldScroll
+2321=DDX_FieldText
+2322=DDX_FieldText
+2323=DDX_FieldText
+2324=DDX_FieldText
+2325=DDX_FieldText
+2326=DDX_FieldText
+2327=DDX_FieldText
+2328=DDX_FieldText
+2329=DDX_FieldText
+2330=DDX_FieldText
+2331=DDX_FieldText
+2332=DDX_FieldText
+2333=DDX_FieldText
+2334=DDX_FieldText
+2335=DDX_FieldText
+2336=DDX_FieldText
+2337=DDX_FieldText
+2338=DDX_FieldText
+2339=DDX_LBIndex
+2340=DDX_LBString
+2341=DDX_LBStringExact
+2342=DDX_OCBool
+2343=DDX_OCBoolRO
+2344=DDX_OCColor
+2345=DDX_OCColorRO
+2346=DDX_OCFloat
+2347=DDX_OCFloat
+2348=DDX_OCFloatRO
+2349=DDX_OCFloatRO
+2350=DDX_OCInt
+2351=DDX_OCInt
+2352=DDX_OCIntRO
+2353=DDX_OCIntRO
+2354=DDX_OCShort
+2355=DDX_OCShortRO
+2356=DDX_OCText
+2357=DDX_OCTextRO
+2358=DDX_Radio
+2359=DDX_Scroll
+2360=DDX_Text
+2361=DDX_Text
+2362=DDX_Text
+2363=DDX_Text
+2364=DDX_Text
+2365=DDX_Text
+2366=DDX_Text
+2367=DDX_Text
+2368=DDX_Text
+2369=DDX_Text
+2370=DDX_Text
+2371=COleClientItem::Deactivate
+2372=COlePropertyPage::XPropertyPage::Deactivate
+2373=COleServerDoc::DeactivateAndUndo
+2374=COleClientItem::XOleIPSite::DeactivateAndUndo
+2375=COleControlSite::XOleIPSite::DeactivateAndUndo
+2376=COleClientItem::DeactivateUI
+2377=CDaoFieldExchange::Default
+2378=CFieldExchange::Default
+2379=CWnd::Default
+2380=CRect::DeflateRect
+2381=CRect::DeflateRect
+2382=CMDIChildWnd::DefWindowProcA
+2383=CMDIFrameWnd::DefWindowProcA
+2384=COleControl::DefWindowProcA
+2385=CWnd::DefWindowProcA
+2386=COleDataSource::DelayRenderData
+2387=COleDataSource::DelayRenderFileData
+2388=COleDataSource::DelaySetData
+2389=CControlBar::DelayShow
+2390=CFrameWnd::DelayUpdateFrameMenu
+2391=CMDIFrameWnd::DelayUpdateFrameMenu
+2392=CDaoRecordset::Delete
+2393=CException::Delete
+2394=COleClientItem::Delete
+2395=CRecordset::Delete
+2396=CWinThread::Delete
+2397=CDaoFieldExchange::DeleteCacheValue
+2398=CSplitterWnd::DeleteColumn
+2399=CDocument::DeleteContents
+2400=CEditView::DeleteContents
+2401=COleDocument::DeleteContents
+2402=COleServerDoc::DeleteContents
+2403=CRichEditDoc::DeleteContents
+2404=CRichEditView::DeleteContents
+2405=CDC::DeleteDC
+2406=CDaoTableDef::DeleteField
+2407=CDaoTableDef::DeleteField
+2408=CImageList::DeleteImageList
+2409=CDaoTableDef::DeleteIndex
+2410=CDaoTableDef::DeleteIndex
+2411=CComboBox::DeleteItem
+2412=CFontComboBox::DeleteItem
+2413=CListBox::DeleteItem
+2414=CGdiObject::DeleteObject
+2415=CRichEditView::XRichEditOleCallback::DeleteObject
+2416=CDaoDatabase::DeleteQueryDef
+2417=CDaoDatabase::DeleteRelation
+2418=CSplitterWnd::DeleteRow
+2419=CDaoDatabase::DeleteTableDef
+2420=CHandleMap::DeleteTemp
+2421=CDC::DeleteTempMap
+2422=CGdiObject::DeleteTempMap
+2423=CImageList::DeleteTempMap
+2424=CMenu::DeleteTempMap
+2425=CWnd::DeleteTempMap
+2426=CRichEditDoc::DeleteUnmarkedItems
+2427=CThreadSlotData::DeleteValues
+2428=CThreadSlotData::DeleteValues
+2429=CSplitterWnd::DeleteView
+2430=CWinApp::DelRegTree
+2431=CToolTipCtrl::DelTool
+2432=COleSafeArray::Destroy
+2433=COleControlSite::DestroyControl
+2434=COleSafeArray::DestroyData
+2435=COleSafeArray::DestroyDescriptor
+2436=CFrameWnd::DestroyDockBars
+2437=COleServerDoc::DestroyInPlaceFrame
+2438=CMenu::DestroyMenu
+2439=COleControl::DestroySharedMenu
+2440=COleDocIPFrameWnd::DestroySharedMenu
+2441=COleIPFrameWnd::DestroySharedMenu
+2442=CToolTipCtrl::DestroyToolTipCtrl
+2443=COleControl::DestroyTracker
+2444=CControlBar::DestroyWindow
+2445=CMDIChildWnd::DestroyWindow
+2446=CWnd::DestroyWindow
+2447=DestructElements
+2448=DestructElements
+2449=CAsyncSocket::Detach
+2450=CDC::Detach
+2451=CDialogTemplate::Detach
+2452=CGdiObject::Detach
+2453=CImageList::Detach
+2454=CMemFile::Detach
+2455=CMenu::Detach
+2456=CMonikerFile::Detach
+2457=COleDataObject::Detach
+2458=COleSafeArray::Detach
+2459=COleStreamFile::Detach
+2460=COleVariant::Detach
+2461=CSharedFile::Detach
+2462=CWindowlessDC::Detach
+2463=CWnd::Detach
+2464=COleDispatchDriver::DetachDispatch
+2465=CAsyncSocket::DetachHandle
+2466=COleControlSite::DetachWindow
+2467=CWinApp::DevModeChange
+2468=DFX_Binary
+2469=DFX_Bool
+2470=DFX_Byte
+2471=DFX_Currency
+2472=DFX_DateTime
+2473=DFX_Double
+2474=DFX_Long
+2475=DFX_LongBinary
+2476=DFX_Short
+2477=DFX_Single
+2478=DFX_Text
+2479=COleControlSite::XNotifyDBEvents::DidEvent
+2480=COleServerDoc::DiscardUndoState
+2481=COleClientItem::XOleIPSite::DiscardUndoState
+2482=COleControlSite::XOleIPSite::DiscardUndoState
+2483=COleDispatchImpl::Disconnect
+2484=COleControlSite::DisconnectSink
+2485=CDocument::DisconnectViews
+2486=AFX_DISPMAPconstCCmdTarget::dispatchMap
+2487=CWinThread::DispatchThreadMessage
+2488=COleControl::DisplayError
+2489=CDocObjectServer::DoBeginPrinting
+2490=CRecordset::DoBulkFieldExchange
+2491=CAsyncSocket::DoCallBack
+2492=COleChangeIconDialog::DoChangeIcon
+2493=CDockBar::DockControlBar
+2494=CFrameWnd::DockControlBar
+2495=CFrameWnd::DockControlBar
+2496=COleControl::DoClick
+2497=COleFrameHook::DoContextSensitiveHelp
+2498=COleConvertDialog::DoConvert
+2499=CColorPropPage::DoDataExchange
+2500=CFontPropPage::DoDataExchange
+2501=CPicturePropPage::DoDataExchange
+2502=CWnd::DoDataExchange
+2503=COleClientItem::DoDragDrop
+2504=COleDataSource::DoDragDrop
+2505=COleServerItem::DoDragDrop
+2506=COleFrameHook::DoEnableModeless
+2507=CDocObjectServer::DoEndPrinting
+2508=CDaoRecordset::DoFieldExchange
+2509=CRecordset::DoFieldExchange
+2510=CDocument::DoFileSave
+2511=CSplitterWnd::DoKeyboardSplit
+2512=CWinApp::DoMessageBox
+2513=CColorDialog::DoModal
+2514=CDialog::DoModal
+2515=CFileDialog::DoModal
+2516=CFontDialog::DoModal
+2517=COleBusyDialog::DoModal
+2518=COleChangeIconDialog::DoModal
+2519=COleChangeSourceDialog::DoModal
+2520=COleConvertDialog::DoModal
+2521=COleInsertDialog::DoModal
+2522=COleLinksDialog::DoModal
+2523=COlePasteSpecialDialog::DoModal
+2524=COlePropertiesDialog::DoModal
+2525=COleUpdateDialog::DoModal
+2526=CPageSetupDialog::DoModal
+2527=CPrintDialog::DoModal
+2528=CPropertySheet::DoModal
+2529=CCmdTarget::DoOleVerb
+2530=CControlBar::DoPaint
+2531=CDockBar::DoPaint
+2532=CRichEditView::DoPaste
+2533=CDocObjectServer::DoPrepareDC
+2534=CDocObjectServer::DoPreparePrinting
+2535=CView::DoPreparePrinting
+2536=CDocObjectServer::DoPrint
+2537=CWinApp::DoPrintDialog
+2538=CView::DoPrintPreview
+2539=CDocManager::DoPromptFileName
+2540=CWinApp::DoPromptFileName
+2541=COleControl::DoPropExchange
+2542=CDocument::DoSave
+2543=CSplitterWnd::DoScroll
+2544=CSplitterWnd::DoScrollBy
+2545=COleControl::DoSuperclassPaint
+2546=CCmdUI::DoUpdate
+2547=COleCmdUI::DoUpdate
+2548=COleClientItem::DoVerb
+2549=COleControlSite::DoVerb
+2550=CDocObjectServer::XOleObject::DoVerb
+2551=COleControl::XOleObject::DoVerb
+2552=COleServerDoc::XOleObject::DoVerb
+2553=COleServerItem::XOleObject::DoVerb
+2554=CWinApp::DoWaitCursor
+2555=CPreviewView::DoZoom
+2556=CDC::DPtoHIMETRIC
+2557=CDC::DPtoLP
+2558=CWnd::DragAcceptFiles
+2559=COleDropTarget::XDropTarget::DragEnter
+2560=CDragListBox::Dragging
+2561=COleDropTarget::XDropTarget::DragLeave
+2562=COleDropTarget::XDropTarget::DragOver
+2563=COleClientItem::Draw
+2564=CRectTracker::Draw
+2565=COleControl::XViewObject::Draw
+2566=CDC::Draw3dRect
+2567=CDC::Draw3dRect
+2568=CSplitterWnd::DrawAllSplitBars
+2569=CControlBar::DrawBorders
+2570=COleControl::DrawContent
+2571=CDC::DrawDragRect
+2572=CDockContext::DrawFocusRect
+2573=CDragListBox::DrawInsert
+2574=CBitmapButton::DrawItem
+2575=CButton::DrawItem
+2576=CCheckListBox::DrawItem
+2577=CColorButton::DrawItem
+2578=CComboBox::DrawItem
+2579=CFontComboBox::DrawItem
+2580=CHeaderCtrl::DrawItem
+2581=CListBox::DrawItem
+2582=CListCtrl::DrawItem
+2583=CListView::DrawItem
+2584=CMenu::DrawItem
+2585=CStatusBar::DrawItem
+2586=CStatusBarCtrl::DrawItem
+2587=CTabCtrl::DrawItem
+2588=COleControl::DrawMetafile
+2589=CDragListBox::DrawSingle
+2590=CDC::DrawTextA
+2591=CMetaFileDC::DrawTextA
+2592=CPreviewDC::DrawTextA
+2593=CRectTracker::DrawTrackerRect
+2594=COleDropTarget::XDropTarget::Drop
+2595=CDragListBox::Dropped
+2596=CObject::Dump
+2597=COleControl::XDataObject::DUnadvise
+2598=COleDataSource::XDataObject::DUnadvise
+2599=COleServerDoc::XDataObject::DUnadvise
+2600=COleServerItem::XDataObject::DUnadvise
+2601=CFile::Duplicate
+2602=CInternetFile::Duplicate
+2603=CMemFile::Duplicate
+2604=COleStreamFile::Duplicate
+2605=CSocketFile::Duplicate
+2606=CStdioFile::Duplicate
+2607=ulongconstCEditView::dwStyleDefault
+2608=CDaoRecordset::Edit
+2609=CRecordset::Edit
+2610=COlePropertyPage::XPropertyPage::EditProperty
+2611=CRichEditView::EditStreamCallBack
+2612=CDBException::Empty
+2613=COleDataSource::Empty
+2614=CString::Empty
+2615=CCheckListBox::Enable
+2616=CCmdUI::Enable
+2617=COleCmdUI::Enable
+2618=CStatusCmdUI::Enable
+2619=CTestCmdUI::Enable
+2620=CToolCmdUI::Enable
+2621=CWinApp::Enable3dControls
+2622=CCmdTarget::EnableAggregation
+2623=CCmdTarget::EnableAutomation
+2624=CRecordset::EnableBookmarks
+2625=CCmdTarget::EnableConnections
+2626=CControlBar::EnableDocking
+2627=CFrameWnd::EnableDocking
+2628=COleControlSite::EnableDSC
+2629=CWinApp::EnableModeless
+2630=COleControl::XOleInPlaceActiveObject::EnableModeless
+2631=COleServerDoc::XOleInPlaceActiveObject::EnableModeless
+2632=COleFrameHook::XOleInPlaceFrame::EnableModeless
+2633=COleControlContainer::XOleIPFrame::EnableModeless
+2634=CWnd::EnableScrollBarCtrl
+2635=CWinApp::EnableShellOpen
+2636=COleControl::EnableSimpleFrame
+2637=CPropertySheet::EnableStackedTabs
+2638=CInternetSession::EnableStatusCallback
+2639=CWnd::EnableToolTips
+2640=CCmdTarget::EnableTypeLib
+2641=COleControlSite::EnableWindow
+2642=CWnd::EnableWindow
+2643=COleMessageFilter::EndBusyState
+2644=COleLinkingDoc::EndDeferErrors
+2645=CDialog::EndDialog
+2646=CPropertySheet::EndDialog
+2647=CDockContext::EndDrag
+2648=CWnd::EndModalLoop
+2649=CFrameWnd::EndModalState
+2650=CWnd::EndModalState
+2651=CDockContext::EndResize
+2652=CCmdTarget::EndWaitCursor
+2653=COleDataObject::EnsureClipboardObject
+2654=CDocObjectServer::XOleObject::EnumAdvise
+2655=COleControl::XOleObject::EnumAdvise
+2656=COleServerDoc::XOleObject::EnumAdvise
+2657=COleServerItem::XOleObject::EnumAdvise
+2658=COleControl::XOleCache::EnumCache
+2659=COlePropertyPage::EnumChildProc
+2660=COleConnPtContainer::EnumConnectionPoints
+2661=CConnectionPoint::XConnPt::EnumConnections
+2662=COlePropertyPage::EnumControls
+2663=COleControl::XDataObject::EnumDAdvise
+2664=COleDataSource::XDataObject::EnumDAdvise
+2665=COleServerDoc::XDataObject::EnumDAdvise
+2666=COleServerItem::XDataObject::EnumDAdvise
+2667=CFontPropPage::EnumFontFamiliesCallBack
+2668=CFontPropPage::EnumFontFamiliesCallBack2
+2669=COleControl::XDataObject::EnumFormatEtc
+2670=COleDataSource::XDataObject::EnumFormatEtc
+2671=COleServerDoc::XDataObject::EnumFormatEtc
+2672=COleServerItem::XDataObject::EnumFormatEtc
+2673=COleControlContainer::XOleContainer::EnumObjects
+2674=COleLinkingDoc::XOleItemContainer::EnumObjects
+2675=CCmdTarget::EnumOleVerbs
+2676=CDocObjectServer::XOleObject::EnumVerbs
+2677=COleControl::XOleObject::EnumVerbs
+2678=COleServerDoc::XOleObject::EnumVerbs
+2679=COleServerItem::XOleObject::EnumVerbs
+2680=CDocObjectServer::XOleDocument::EnumViews
+2681=CControlBar::EraseNonClient
+2682=CFileException::ErrnoToException
+2683=CHttpFile::ErrorDlg
+2684=CDC::Escape
+2685=CMetaFileDC::Escape
+2686=CPreviewDC::Escape
+2687=AFX_EVENTMAPconstCOleControl::eventMap
+2688=AFX_EVENTSINKMAPconstCCmdTarget::eventsinkMap
+2689=CArchivePropExchange::ExchangeBlobProp
+2690=CAsyncPropExchange::ExchangeBlobProp
+2691=CPropbagPropExchange::ExchangeBlobProp
+2692=CPropsetPropExchange::ExchangeBlobProp
+2693=CResetPropExchange::ExchangeBlobProp
+2694=COleControl::ExchangeExtent
+2695=CArchivePropExchange::ExchangeFontProp
+2696=CAsyncPropExchange::ExchangeFontProp
+2697=CPropbagPropExchange::ExchangeFontProp
+2698=CPropsetPropExchange::ExchangeFontProp
+2699=CResetPropExchange::ExchangeFontProp
+2700=CArchivePropExchange::ExchangePersistentProp
+2701=CAsyncPropExchange::ExchangePersistentProp
+2702=CPropbagPropExchange::ExchangePersistentProp
+2703=CPropsetPropExchange::ExchangePersistentProp
+2704=CResetPropExchange::ExchangePersistentProp
+2705=CArchivePropExchange::ExchangeProp
+2706=CAsyncPropExchange::ExchangeProp
+2707=CPropbagPropExchange::ExchangeProp
+2708=CPropsetPropExchange::ExchangeProp
+2709=CResetPropExchange::ExchangeProp
+2710=COleControl::ExchangeStockProps
+2711=CAsyncPropExchange::ExchangeVersion
+2712=CPropExchange::ExchangeVersion
+2713=CDC::ExcludeClipRect
+2714=CDC::ExcludeClipRect
+2715=CDocObjectServer::XOleCommandTarget::Exec
+2716=CDaoDatabase::Execute
+2717=CDaoQueryDef::Execute
+2718=CWnd::ExecuteDlgInit
+2719=CWnd::ExecuteDlgInit
+2720=CRecordset::ExecuteSetPosUpdate
+2721=CDatabase::ExecuteSQL
+2722=CRecordset::ExecuteUpdateSQL
+2723=CFrameWnd::ExitHelpMode
+2724=COleControlModule::ExitInstance
+2725=CWinApp::ExitInstance
+2726=CWinThread::ExitInstance
+2727=CCmdTarget::ExternalAddRef
+2728=CCmdTarget::ExternalDisconnect
+2729=CCmdTarget::ExternalQueryInterface
+2730=CCmdTarget::ExternalRelease
+2731=CDC::ExtTextOutA
+2732=CMetaFileDC::ExtTextOutA
+2733=CPreviewDC::ExtTextOutA
+2734=CColorPropPage::CColorPropPageFactoryCColorPropPage::factory
+2735=CFontPropPage::CFontPropPageFactoryCFontPropPage::factory
+2736=CPicturePropPage::CPicturePropPageFactoryCPicturePropPage::factory
+2737=CDataExchange::Fail
+2738=COleControlSite::XNotifyDBEvents::FailedToDo
+2739=CRecordset::FetchData
+2740=CArchive::FillBuffer
+2741=CDaoRecordset::FillCache
+2742=CDaoWorkspace::FillDatabaseInfo
+2743=CDaoException::FillErrorInfo
+2744=CFontPropPage::FillFacenameList
+2745=CFontDialog::FillInLogFont
+2746=CToolTipCtrl::FillInToolInfo
+2747=CScrollView::FillOutsideRect
+2748=CDaoQueryDef::FillParameterInfo
+2749=CStockPropPage::FillPropnameList
+2750=CDaoDatabase::FillQueryDefInfo
+2751=CDaoDatabase::FillRelationInfo
+2752=CFontPropPage::FillSizeList
+2753=CDC::FillSolidRect
+2754=CDC::FillSolidRect
+2755=CColorPropPage::FillSysColors
+2756=CDaoDatabase::FillTableDefInfo
+2757=CDaoFieldExchange::FillVariant
+2758=CDaoWorkspace::FillWorkspaceInfo
+2759=CWnd::FilterToolTipMessage
+2760=CDaoRecordset::Find
+2761=CObList::Find
+2762=CPtrList::Find
+2763=CString::Find
+2764=CString::Find
+2765=CStringList::Find
+2766=CRichEditView::FindAndSelect
+2767=CDockBar::FindBar
+2768=COleConnPtContainer::FindConnectionPoint
+2769=??FindDlgItem@@YAPAVCWnd@@PAV1@K@Z@@YAXXZ
+2770=CFileFind::FindFile
+2771=CFtpFileFind::FindFile
+2772=CGopherFileFind::FindFile
+2773=CGopherFileFind::FindFile
+2774=CDaoRecordset::FindFirst
+2775=CObList::FindIndex
+2776=CPtrList::FindIndex
+2777=CStringList::FindIndex
+2778=COleControlContainer::FindItem
+2779=CDaoRecordset::FindLast
+2780=CDaoRecordset::FindNext
+2781=CFileFind::FindNextFileA
+2782=CFtpFileFind::FindNextFileA
+2783=CGopherFileFind::FindNextFileA
+2784=CString::FindOneOf
+2785=CPreviewView::FindPageRect
+2786=CDaoRecordset::FindPrev
+2787=CRecordset::FindSQLToken
+2788=CEditView::FindTextA
+2789=CRichEditView::FindTextA
+2790=CRichEditView::FindTextA
+2791=CRichEditView::FindTextSimple
+2792=CRichEditView::FindTextSimple
+2793=COleClientItem::FinishCreate
+2794=COleControl::FireError
+2795=COleControl::FireEvent
+2796=COleControlSite::XNotifyDBEvents::FireEvent
+2797=COleControl::FireEventV
+2798=CDaoRecordset::Fixup
+2799=CRecordset::Fixups
+2800=CFrameWnd::FloatControlBar
+2801=CArchive::Flush
+2802=CDumpContext::Flush
+2803=CFile::Flush
+2804=CInternetFile::Flush
+2805=CMemFile::Flush
+2806=COleStreamFile::Flush
+2807=CSocketFile::Flush
+2808=CStdioFile::Flush
+2809=COleDataSource::FlushClipboard
+2810=CRecordset::FlushResultSet
+2811=COleCurrency::Format
+2812=COleDateTime::Format
+2813=COleDateTime::Format
+2814=COleDateTime::Format
+2815=COleDateTimeSpan::Format
+2816=COleDateTimeSpan::Format
+2817=CString::Format
+2818=CString::Format
+2819=CTime::Format
+2820=CTime::Format
+2821=CTimeSpan::Format
+2822=CTimeSpan::Format
+2823=CTime::FormatGmt
+2824=CTime::FormatGmt
+2825=CString::FormatMessageA
+2826=CString::FormatMessageA
+2827=CString::FormatV
+2828=COleControl::ForwardActivationMsg
+2829=CDatabase::Free
+2830=CMemFile::Free
+2831=CSharedFile::Free
+2832=CMapPtrToPtr::FreeAssoc
+2833=CMapPtrToWord::FreeAssoc
+2834=CMapStringToOb::FreeAssoc
+2835=CMapStringToPtr::FreeAssoc
+2836=CMapStringToString::FreeAssoc
+2837=CMapWordToOb::FreeAssoc
+2838=CMapWordToPtr::FreeAssoc
+2839=CDaoRecordset::FreeCache
+2840=CRecordset::FreeDataCache
+2841=CPlex::FreeDataChain
+2842=CByteArray::FreeExtra
+2843=CDWordArray::FreeExtra
+2844=CObArray::FreeExtra
+2845=CPtrArray::FreeExtra
+2846=CString::FreeExtra
+2847=CStringArray::FreeExtra
+2848=CUIntArray::FreeExtra
+2849=CWordArray::FreeExtra
+2850=CObList::FreeNode
+2851=CPtrList::FreeNode
+2852=CStringList::FreeNode
+2853=CRecordset::FreeRowset
+2854=CThreadSlotData::FreeSlot
+2855=CProperty::FreeValue
+2856=COleControl::XViewObject::Freeze
+2857=COleControl::XOleControl::FreezeEvents
+2858=COleClientItem::FreezeLink
+2859=CDC::FromHandle
+2860=CGdiObject::FromHandle
+2861=CHandleMap::FromHandle
+2862=CImageList::FromHandle
+2863=CMenu::FromHandle
+2864=CWnd::FromHandle
+2865=CImageList::FromHandlePermanent
+2866=CMenu::FromHandlePermanent
+2867=CWnd::FromHandlePermanent
+2868=CCmdTarget::FromIDispatch
+2869=CProperty::Get
+2870=CProperty::Get
+2871=CPropertySection::Get
+2872=CPropertySection::Get
+2873=CPropertySet::Get
+2874=CPropertySet::Get
+2875=CDaoRecordset::GetAbsolutePosition
+2876=COleControl::GetActivationPolicy
+2877=COleControl::XPointerInactive::GetActivationPolicy
+2878=CFrameWnd::GetActiveDocument
+2879=CFrameWnd::GetActiveFrame
+2880=CMDIFrameWnd::GetActiveFrame
+2881=CPropertySheet::GetActiveIndex
+2882=CPropertySheet::GetActivePage
+2883=CSplitterWnd::GetActivePane
+2884=CFrameWnd::GetActiveView
+2885=COleControl::XViewObject::GetAdvise
+2886=COleControl::GetAmbientDispatchDriver
+2887=COleControlContainer::GetAmbientProp
+2888=COleControl::GetAmbientProperty
+2889=COleControl::GetAppearance
+2890=CWinApp::GetAppRegistryKey
+2891=CMapPtrToPtr::GetAssocAt
+2892=CMapPtrToWord::GetAssocAt
+2893=CMapStringToOb::GetAssocAt
+2894=CMapStringToPtr::GetAssocAt
+2895=CMapStringToString::GetAssocAt
+2896=CMapWordToOb::GetAssocAt
+2897=CMapWordToPtr::GetAssocAt
+2898=CStringArray::GetAt
+2899=CGopherConnection::GetAttribute
+2900=CDaoTableDef::GetAttributes
+2901=COleControl::GetBackColor
+2902=CControlBar::GetBarInfo
+2903=CDockBar::GetBarInfo
+2904=CAsyncMonikerFile::GetBindInfo
+2905=CBlobProperty::GetBlob
+2906=CDaoRecordset::GetBookmark
+2907=CRecordset::GetBookmark
+2908=COleFrameHook::XOleInPlaceFrame::GetBorder
+2909=COleControlContainer::XOleIPFrame::GetBorder
+2910=CStatusBarCtrl::GetBorders
+2911=COleControl::GetBorderStyle
+2912=CDataSourceControl::GetBoundClientRow
+2913=CRecordset::GetBoundFieldIndex
+2914=CRecordset::GetBoundParamIndex
+2915=CString::GetBuffer
+2916=CEditView::GetBufferLength
+2917=CFile::GetBufferPtr
+2918=CMemFile::GetBufferPtr
+2919=CString::GetBufferSetLength
+2920=CToolBar::GetButtonInfo
+2921=CToolBar::GetButtonStyle
+2922=CToolBar::GetButtonText
+2923=CToolBar::GetButtonText
+2924=CPropertySet::GetByteOrder
+2925=COleClientItem::GetCachedExtent
+2926=COleDataSource::GetCacheEntry
+2927=CDaoRecordset::GetCacheSize
+2928=CDaoRecordset::GetCacheStart
+2929=CDaoFieldExchange::GetCacheValue
+2930=COleControl::XDataObject::GetCanonicalFormatEtc
+2931=COleDataSource::XDataObject::GetCanonicalFormatEtc
+2932=COleServerDoc::XDataObject::GetCanonicalFormatEtc
+2933=COleServerItem::XDataObject::GetCanonicalFormatEtc
+2934=COleControl::GetCapture
+2935=CFontDialog::GetCharFormat
+2936=CRichEditView::GetCharFormatSelection
+2937=CCheckListBox::GetCheck
+2938=CWnd::GetCheckedRadioButton
+2939=CBlobProperty::GetClassID
+2940=CColorPropPage::GetClassID
+2941=CFontPropPage::GetClassID
+2942=COleClientItem::GetClassID
+2943=CPicturePropPage::GetClassID
+2944=CPropertySet::GetClassID
+2945=COleLinkingDoc::XPersistFile::GetClassID
+2946=COleControl::XPersistMemory::GetClassID
+2947=COleControl::XPersistPropertyBag::GetClassID
+2948=COleControl::XPersistStorage::GetClassID
+2949=COleServerDoc::XPersistStorage::GetClassID
+2950=COleControl::XPersistStreamInit::GetClassID
+2951=COleControl::XProvideClassInfo::GetClassInfoA
+2952=AFX_COM::GetClassObject
+2953=COleControl::GetClientOffset
+2954=COleControl::GetClientRect
+2955=COleClientItem::GetClientSite
+2956=COleControl::GetClientSite
+2957=CRichEditCntrItem::GetClientSite
+2958=CDocObjectServer::XOleObject::GetClientSite
+2959=COleControl::XOleObject::GetClientSite
+2960=COleServerDoc::XOleObject::GetClientSite
+2961=COleServerItem::XOleObject::GetClientSite
+2962=COleClientItem::GetClipboardData
+2963=COleServerItem::GetClipboardData
+2964=CRichEditView::GetClipboardData
+2965=CDocObjectServer::XOleObject::GetClipboardData
+2966=COleControl::XOleObject::GetClipboardData
+2967=COleServerDoc::XOleObject::GetClipboardData
+2968=COleServerItem::XOleObject::GetClipboardData
+2969=CRichEditView::XRichEditOleCallback::GetClipboardData
+2970=COleDataSource::GetClipboardOwner
+2971=CDC::GetClipBox
+2972=CMetaFileDC::GetClipBox
+2973=CColorPropPage::GetColorProp
+2974=COleControl::XViewObject::GetColorSet
+2975=CSplitterWnd::GetColumnInfo
+2976=CCmdTarget::GetCommandMap
+2977=CDaoDatabase::GetConnect
+2978=CDaoQueryDef::GetConnect
+2979=CDaoTableDef::GetConnect
+2980=CDatabase::GetConnectInfo
+2981=CConnectionPoint::GetConnectionCount
+2982=CCmdTarget::GetConnectionHook
+2983=COleControl::GetConnectionHook
+2984=CConnectionPoint::XConnPt::GetConnectionInterface
+2985=CCmdTarget::GetConnectionMap
+2986=COleControl::GetConnectionMap
+2987=CConnectionPoint::XConnPt::GetConnectionPointContainer
+2988=CConnectionPoint::GetConnections
+2989=CConnectionPoint::GetContainer
+2990=COleDocument::GetContainer
+2991=COleLinkingDoc::GetContainer
+2992=COleClientItem::XOleClientSite::GetContainer
+2993=COleControlSite::XOleClientSite::GetContainer
+2994=COleControl::XQuickActivate::GetContentExtent
+2995=CRichEditView::GetContextMenu
+2996=CRichEditView::XRichEditOleCallback::GetContextMenu
+2997=CFrameWnd::GetControlBar
+2998=COleControl::GetControlFlags
+2999=COleControlSite::GetControlInfo
+3000=COleControl::XOleControl::GetControlInfo
+3001=CDocObjectServer::GetControllingFrame
+3002=CCmdTarget::GetControllingUnknown
+3003=COleControl::GetControlSize
+3004=COlePropertyPage::GetControlStatus
+3005=CWnd::GetControlUnknown
+3006=COlePropertiesDialog::XOleUIObjInfo::GetConvertInfo
+3007=CPrintDialog::GetCopies
+3008=CPropertySection::GetCount
+3009=CPropertySet::GetCount
+3010=CFileFind::GetCreationTime
+3011=CFileFind::GetCreationTime
+3012=CGopherFileFind::GetCreationTime
+3013=CGopherFileFind::GetCreationTime
+3014=COleLinkingDoc::XPersistFile::GetCurFile
+3015=CFtpConnection::GetCurrentDirectoryA
+3016=CFtpConnection::GetCurrentDirectoryA
+3017=CFtpConnection::GetCurrentDirectoryAsURL
+3018=CFtpConnection::GetCurrentDirectoryAsURL
+3019=CFontDialog::GetCurrentFont
+3020=CDaoRecordset::GetCurrentIndex
+3021=CWnd::GetCurrentMessage
+3022=CFontComboBox::GetCurrentName
+3023=CDataBoundProperty::GetCursor
+3024=CDataSourceControl::GetCursor
+3025=COleControlSite::GetCursor
+3026=COleControlSite::XBoundObjectSite::GetCursor
+3027=COleDataObject::GetData
+3028=CProcessLocalObject::GetData
+3029=CRecordset::GetData
+3030=CThreadLocalObject::GetData
+3031=COleControl::XDataObject::GetData
+3032=COleDataSource::XDataObject::GetData
+3033=COleServerDoc::XDataObject::GetData
+3034=COleServerItem::XDataObject::GetData
+3035=CDaoRecordset::GetDataAndFixupNulls
+3036=CDaoWorkspace::GetDatabaseCount
+3037=CDaoWorkspace::GetDatabaseInfo
+3038=CDaoWorkspace::GetDatabaseInfo
+3039=CDatabase::GetDatabaseName
+3040=CRecordset::GetDataBuffer
+3041=COleControl::XDataObject::GetDataHere
+3042=COleDataSource::XDataObject::GetDataHere
+3043=COleServerDoc::XDataObject::GetDataHere
+3044=COleServerItem::XDataObject::GetDataHere
+3045=CThreadLocalObject::GetDataNA
+3046=COleServerItem::GetDataObject
+3047=COleControl::GetDataSource
+3048=CDaoQueryDef::GetDateCreated
+3049=CDaoRecordset::GetDateCreated
+3050=CDaoTableDef::GetDateCreated
+3051=CDaoQueryDef::GetDateLastUpdated
+3052=CDaoRecordset::GetDateLastUpdated
+3053=CDaoTableDef::GetDateLastUpdated
+3054=COleDateTime::GetDay
+3055=COleDateTime::GetDayOfWeek
+3056=COleDateTime::GetDayOfYear
+3057=COleControl::GetDC
+3058=CDocument::GetDefaultAccelerator
+3059=CFrameWnd::GetDefaultAccelerator
+3060=COleServerDoc::GetDefaultAccelerator
+3061=CRichEditCtrl::GetDefaultCharFormat
+3062=CRecordset::GetDefaultConnect
+3063=CDaoRecordset::GetDefaultDBName
+3064=CRecordset::GetDefaultFieldType
+3065=CDocument::GetDefaultMenu
+3066=COleServerDoc::GetDefaultMenu
+3067=CPrintDialog::GetDefaults
+3068=CDaoRecordset::GetDefaultSQL
+3069=CRecordset::GetDefaultSQL
+3070=COccManager::GetDefBtnCode
+3071=COleControlSite::GetDefBtnCode
+3072=CWnd::GetDescendantWindow
+3073=CPageSetupDialog::GetDeviceName
+3074=CPrintDialog::GetDeviceName
+3075=CScrollView::GetDeviceScrollPosition
+3076=CScrollView::GetDeviceScrollSizes
+3077=CPageSetupDialog::GetDevMode
+3078=CPrintDialog::GetDevMode
+3079=CCmdTarget::GetDispatchIID
+3080=COleControl::GetDispatchIID
+3081=CCmdTarget::GetDispatchMap
+3082=COleControlContainer::GetDispatchMap
+3083=CCmdTarget::GetDispEntry
+3084=CRecentFileList::GetDisplayName
+3085=CFontHolder::GetDisplayString
+3086=CPictureHolder::GetDisplayString
+3087=COleControl::XPerPropertyBrowsing::GetDisplayString
+3088=COleControlSite::GetDlgCtrlID
+3089=CWnd::GetDlgCtrlID
+3090=COleControlContainer::GetDlgItem
+3091=COleControlContainer::GetDlgItem
+3092=CWnd::GetDlgItem
+3093=CWnd::GetDlgItem
+3094=COleControlContainer::GetDlgItemInt
+3095=CWnd::GetDlgItemInt
+3096=COleControlContainer::GetDlgItemTextA
+3097=CWnd::GetDlgItemTextA
+3098=CWnd::GetDlgItemTextA
+3099=CDockContext::GetDockBar
+3100=CDockBar::GetDockedControlBar
+3101=CDockBar::GetDockedCount
+3102=CDockBar::GetDockedVisibleCount
+3103=CControlBar::GetDockingFrame
+3104=CFrameWnd::GetDockState
+3105=CDocObjectServer::XOleDocument::GetDocMiscStatus
+3106=COleServerDoc::GetDocObjectServer
+3107=CDocTemplate::GetDocString
+3108=CDocObjectServer::XOleDocumentView::GetDocument
+3109=CRichEditView::XRichEditOleCallback::GetDragDropEffect
+3110=CPageSetupDialog::GetDriverName
+3111=CPrintDialog::GetDriverName
+3112=COleControl::XOleInPlaceObject::GetDropTarget
+3113=CWnd::GetDSCCursor
+3114=CDaoRecordset::GetEditMode
+3115=COleSafeArray::GetElement
+3116=COleServerDoc::GetEmbeddedItem
+3117=COleClientItem::GetEmbeddedItemData
+3118=COleServerItem::GetEmbedSourceData
+3119=COleControl::GetEnabled
+3120=CCmdTarget::GetEntryCount
+3121=CDaoException::GetErrorCount
+3122=CDaoException::GetErrorInfo
+3123=CArchiveException::GetErrorMessage
+3124=CDaoException::GetErrorMessage
+3125=CDBException::GetErrorMessage
+3126=CException::GetErrorMessage
+3127=CFileException::GetErrorMessage
+3128=CInternetException::GetErrorMessage
+3129=COleDispatchException::GetErrorMessage
+3130=COleException::GetErrorMessage
+3131=CSimpleException::GetErrorMessage
+3132=COleControlSite::GetEventIID
+3133=COleControl::GetEventMap
+3134=COleControl::GetEventMapEntry
+3135=CCmdTarget::GetEventSinkEntry
+3136=CCmdTarget::GetEventSinkMap
+3137=COleControlSite::GetExStyle
+3138=CWnd::GetExStyle
+3139=COleControl::GetExtendedControl
+3140=COleControlSite::XOleControlSite::GetExtendedControl
+3141=COleClientItem::GetExtent
+3142=CDocObjectServer::XOleObject::GetExtent
+3143=COleControl::XOleObject::GetExtent
+3144=COleServerDoc::XOleObject::GetExtent
+3145=COleServerItem::XOleObject::GetExtent
+3146=COleControl::XViewObject::GetExtent
+3147=CCmdTarget::GetExtraConnectionPoints
+3148=COleControl::GetExtraConnectionPoints
+3149=CFontDialog::GetFaceName
+3150=CDaoQueryDef::GetFieldCount
+3151=CDaoRecordset::GetFieldCount
+3152=CDaoTableDef::GetFieldCount
+3153=CDaoRecordset::GetFieldIndex
+3154=CRecordset::GetFieldIndexByName
+3155=CDaoQueryDef::GetFieldInfo
+3156=CDaoQueryDef::GetFieldInfo
+3157=CDaoRecordset::GetFieldInfo
+3158=CDaoRecordset::GetFieldInfo
+3159=CDaoTableDef::GetFieldInfo
+3160=CDaoTableDef::GetFieldInfo
+3161=CDaoRecordset::GetFieldLength
+3162=CRecordset::GetFieldLengthBuffer
+3163=CRecordset::GetFieldStatus
+3164=CDaoRecordset::GetFieldValue
+3165=CDaoRecordset::GetFieldValue
+3166=CDaoRecordset::GetFieldValue
+3167=CDaoRecordset::GetFieldValue
+3168=CRecordset::GetFieldValue
+3169=CRecordset::GetFieldValue
+3170=CRecordset::GetFieldValue
+3171=CRecordset::GetFieldValue
+3172=CDocument::GetFile
+3173=CFtpConnection::GetFile
+3174=COleDataObject::GetFileData
+3175=CFileDialog::GetFileExt
+3176=CFile::GetFileName
+3177=CFileDialog::GetFileName
+3178=CFileFind::GetFileName
+3179=CGopherFileFind::GetFileName
+3180=CFile::GetFilePath
+3181=CFileFind::GetFilePath
+3182=CGopherFileFind::GetFilePath
+3183=CFile::GetFileTitle
+3184=CFileDialog::GetFileTitle
+3185=CFileFind::GetFileTitle
+3186=CGopherFileFind::GetFileTitle
+3187=COleServerDoc::GetFileTypeString
+3188=CFileFind::GetFileURL
+3189=CFtpFileFind::GetFileURL
+3190=CGopherFileFind::GetFileURL
+3191=CHttpFile::GetFileURL
+3192=CFindReplaceDialog::GetFindString
+3193=CMultiDocTemplate::GetFirstDocPosition
+3194=CSingleDocTemplate::GetFirstDocPosition
+3195=CDocManager::GetFirstDocTemplatePosition
+3196=CWinApp::GetFirstDocTemplatePosition
+3197=COleDocument::GetFirstFrame
+3198=CDocument::GetFirstViewPosition
+3199=COleControl::GetFocus
+3200=CFileDialog::GetFolderPath
+3201=CDialogTemplate::GetFont
+3202=CDialogTemplate::GetFont
+3203=COleControl::GetFont
+3204=CFontHolder::GetFontDispatch
+3205=CFontHolder::GetFontHandle
+3206=CFontHolder::GetFontHandle
+3207=CFontComboBox::GetFontItem
+3208=CFontPropPage::GetFontProps
+3209=CDialogTemplate::GetFontSizeField
+3210=COleControl::GetFontTextMetrics
+3211=CFontComboBox::GetFontType
+3212=COleControl::GetForeColor
+3213=CPropertySection::GetFormatID
+3214=CPropertySet::GetFormatVersion
+3215=CInternetSession::GetFtpConnection
+3216=COleDataObject::GetGlobalData
+3217=CTime::GetGmtTm
+3218=CInternetSession::GetGopherConnection
+3219=COleControl::XProvideClassInfo::GetGUID
+3220=CDC::GetHalftoneBrush
+3221=CRectTracker::GetHandleMask
+3222=CRectTracker::GetHandleRect
+3223=CRectTracker::GetHandleSize
+3224=CSizeComboBox::GetHeight
+3225=CSplitterWnd::GetHitRect
+3226=CHotKeyCtrl::GetHotKey
+3227=COleDateTime::GetHour
+3228=COleDateTimeSpan::GetHours
+3229=CInternetSession::GetHttpConnection
+3230=COleControl::GetHwnd
+3231=COleClientItem::GetIconicMetafile
+3232=CFrameWnd::GetIconWndClass
+3233=COleControlSite::GetID
+3234=CProperty::GetID
+3235=CPropertySection::GetID
+3236=COleDataObject::GetIDataObject
+3237=CCmdTarget::GetIDispatch
+3238=COleDispatchImpl::GetIDsOfNames
+3239=COleControlSite::XAmbientProps::GetIDsOfNames
+3240=COleControlSite::XEventSink::GetIDsOfNames
+3241=COleControl::XEventConnPt::GetIID
+3242=COleControl::XPropConnPt::GetIID
+3243=CDaoRecordset::GetIndexCount
+3244=CDaoTableDef::GetIndexCount
+3245=CDaoRecordset::GetIndexInfo
+3246=CDaoRecordset::GetIndexInfo
+3247=CDaoTableDef::GetIndexInfo
+3248=CDaoTableDef::GetIndexInfo
+3249=CDaoWorkspace::GetIniPath
+3250=COleDocument::GetInPlaceActiveItem
+3251=CRichEditDoc::GetInPlaceActiveItem
+3252=CRichEditView::GetInPlaceActiveItem
+3253=CRichEditView::XRichEditOleCallback::GetInPlaceContext
+3254=COleIPFrameWnd::GetInPlaceMenu
+3255=CDocObjectServer::XOleDocumentView::GetInPlaceSite
+3256=COleClientItem::GetInPlaceWindow
+3257=CSplitterWnd::GetInsideRect
+3258=CCmdTarget::GetInterface
+3259=CCmdTarget::GetInterfaceHook
+3260=COleControl::GetInterfaceHook
+3261=COleServerDoc::GetInterfaceHook
+3262=CCmdTarget::GetInterfaceMap
+3263=CDocObjectServer::GetInterfaceMap
+3264=CEnumConnPoints::GetInterfaceMap
+3265=CEnumFormatEtc::GetInterfaceMap
+3266=CEnumOleVerb::GetInterfaceMap
+3267=CEnumUnknown::GetInterfaceMap
+3268=COleClientItem::GetInterfaceMap
+3269=COleControl::GetInterfaceMap
+3270=COleControlContainer::GetInterfaceMap
+3271=COleControlSite::GetInterfaceMap
+3272=COleDataSource::GetInterfaceMap
+3273=COleDropSource::GetInterfaceMap
+3274=COleDropTarget::GetInterfaceMap
+3275=COleFrameHook::GetInterfaceMap
+3276=COleLinkingDoc::GetInterfaceMap
+3277=COleMessageFilter::GetInterfaceMap
+3278=COleObjectFactory::GetInterfaceMap
+3279=COlePropertyPage::GetInterfaceMap
+3280=COleServerDoc::GetInterfaceMap
+3281=COleServerItem::GetInterfaceMap
+3282=CRichEditView::GetInterfaceMap
+3283=CRichEditCtrl::GetIRichEditOle
+3284=CDaoWorkspace::GetIsolateODBCTrans
+3285=COleServerDoc::GetItemClipRect
+3286=CListCtrl::GetItemData
+3287=CTreeCtrl::GetItemData
+3288=CStatusBar::GetItemID
+3289=CToolBar::GetItemID
+3290=CTreeCtrl::GetItemImage
+3291=COleClientItem::GetItemName
+3292=COleServerDoc::GetItemPosition
+3293=CListCtrl::GetItemRect
+3294=CStatusBar::GetItemRect
+3295=CToolBar::GetItemRect
+3296=CTreeCtrl::GetItemRect
+3297=CTreeCtrl::GetItemState
+3298=COleClientItem::GetItemStorage
+3299=COleClientItem::GetItemStorageCompound
+3300=COleClientItem::GetItemStorageFlat
+3301=CListCtrl::GetItemText
+3302=CListCtrl::GetItemText
+3303=CTreeCtrl::GetItemText
+3304=CFileFind::GetLastAccessTime
+3305=CFileFind::GetLastAccessTime
+3306=CGopherFileFind::GetLastAccessTime
+3307=CGopherFileFind::GetLastAccessTime
+3308=CDaoRecordset::GetLastModifiedBookmark
+3309=COleUILinkInfo::GetLastUpdate
+3310=CFileFind::GetLastWriteTime
+3311=CFileFind::GetLastWriteTime
+3312=CGopherFileFind::GetLastWriteTime
+3313=CGopherFileFind::GetLastWriteTime
+3314=CRecordset::GetLBFetchSize
+3315=COleSafeArray::GetLBound
+3316=CRecordset::GetLBReallocSize
+3317=CComboBox::GetLBText
+3318=CFile::GetLength
+3319=CFileFind::GetLength
+3320=CGopherFileFind::GetLength
+3321=CInternetFile::GetLength
+3322=COleStreamFile::GetLength
+3323=CSocketFile::GetLength
+3324=CFileFind::GetLength64
+3325=CGopherFileFind::GetLength64
+3326=COleObjectFactory::GetLicenseKey
+3327=COleObjectFactory::XClassFactory::GetLicInfo
+3328=CRichEditCtrl::GetLine
+3329=CRichEditCtrl::GetLine
+3330=COleUILinkInfo::GetLinkSource
+3331=COleClientItem::GetLinkSourceData
+3332=COleServerItem::GetLinkSourceData
+3333=COleClientItem::GetLinkUpdateOptions
+3334=COleUILinkInfo::GetLinkUpdateOptions
+3335=CPropertySection::GetList
+3336=CPropertySet::GetList
+3337=CTime::GetLocalTm
+3338=CGopherFileFind::GetLocator
+3339=CDaoRecordset::GetLockingMode
+3340=CFontComboBox::GetLogFont
+3341=CDaoWorkspace::GetLoginTimeout
+3342=CFieldExchange::GetLongBinaryData
+3343=CRecordset::GetLongBinaryDataAndCleanup
+3344=CFieldExchange::GetLongBinarySize
+3345=CRecordset::GetLongCharDataAndCleanup
+3346=CWinThread::GetMainWnd
+3347=CPageSetupDialog::GetMargins
+3348=CConnectionPoint::GetMaxConnections
+3349=CMDIChildWnd::GetMDIFrame
+3350=CFrameWnd::GetMessageBar
+3351=CMDIChildWnd::GetMessageBar
+3352=CCheckListBox::GetMessageMap
+3353=CCmdTarget::GetMessageMap
+3354=CColorDialog::GetMessageMap
+3355=CColorPropPage::GetMessageMap
+3356=CCommonDialog::GetMessageMap
+3357=CControlBar::GetMessageMap
+3358=CControlFrameWnd::GetMessageMap
+3359=CCtrlView::GetMessageMap
+3360=CDaoRecordView::GetMessageMap
+3361=CDialog::GetMessageMap
+3362=CDialogBar::GetMessageMap
+3363=CDockBar::GetMessageMap
+3364=CDocObjectServer::GetMessageMap
+3365=CDocument::GetMessageMap
+3366=CEditView::GetMessageMap
+3367=CFontPropPage::GetMessageMap
+3368=CFormView::GetMessageMap
+3369=CFrameWnd::GetMessageMap
+3370=CListCtrl::GetMessageMap
+3371=CListView::GetMessageMap
+3372=CMDIChildWnd::GetMessageMap
+3373=CMDIFrameWnd::GetMessageMap
+3374=CMiniDockFrameWnd::GetMessageMap
+3375=CMiniFrameWnd::GetMessageMap
+3376=COleControl::GetMessageMap
+3377=COleDocIPFrameWnd::GetMessageMap
+3378=COleIPFrameWnd::GetMessageMap
+3379=COlePropertyPage::GetMessageMap
+3380=COleResizeBar::GetMessageMap
+3381=COleServerDoc::GetMessageMap
+3382=CPicturePropPage::GetMessageMap
+3383=CPreviewView::GetMessageMap
+3384=CPrintDialog::GetMessageMap
+3385=CPropertyPage::GetMessageMap
+3386=CPropertySheet::GetMessageMap
+3387=CRecordView::GetMessageMap
+3388=CRichEditView::GetMessageMap
+3389=CScrollView::GetMessageMap
+3390=CSocketWnd::GetMessageMap
+3391=CSplitterWnd::GetMessageMap
+3392=CStatusBar::GetMessageMap
+3393=CStockPropPage::GetMessageMap
+3394=CTabCtrl::GetMessageMap
+3395=CToolBar::GetMessageMap
+3396=CToolBarCtrl::GetMessageMap
+3397=CToolTipCtrl::GetMessageMap
+3398=CTreeCtrl::GetMessageMap
+3399=CTreeView::GetMessageMap
+3400=CView::GetMessageMap
+3401=CWinApp::GetMessageMap
+3402=CWnd::GetMessageMap
+3403=CFrameWnd::GetMessageString
+3404=COleControl::GetMessageString
+3405=CDataSourceControl::GetMetaData
+3406=COleControl::GetMetafileData
+3407=COleServerItem::GetMetafileData
+3408=COleDateTime::GetMinute
+3409=COleDateTimeSpan::GetMinutes
+3410=CDocObjectServer::XOleObject::GetMiscStatus
+3411=COleControl::XOleObject::GetMiscStatus
+3412=COleServerDoc::XOleObject::GetMiscStatus
+3413=COleServerItem::XOleObject::GetMiscStatus
+3414=CRectTracker::GetModifyPointers
+3415=COleDocument::GetMoniker
+3416=COleLinkingDoc::GetMoniker
+3417=COleServerDoc::GetMoniker
+3418=COleServerItem::GetMoniker
+3419=COleClientItem::XOleClientSite::GetMoniker
+3420=COleControlSite::XOleClientSite::GetMoniker
+3421=CDocObjectServer::XOleObject::GetMoniker
+3422=COleControl::XOleObject::GetMoniker
+3423=COleServerDoc::XOleObject::GetMoniker
+3424=COleServerItem::XOleObject::GetMoniker
+3425=COleDateTime::GetMonth
+3426=CDaoDatabase::GetName
+3427=CDaoQueryDef::GetName
+3428=CDaoRecordset::GetName
+3429=CDaoTableDef::GetName
+3430=CDaoWorkspace::GetName
+3431=COleControl::XViewObject::GetNaturalExtent
+3432=COleClientItem::GetNewItemNumber
+3433=CRichEditView::XRichEditOleCallback::GetNewStorage
+3434=CDataBoundProperty::GetNext
+3435=CMapPtrToPtr::GetNextAssoc
+3436=CMapPtrToWord::GetNextAssoc
+3437=CMapStringToOb::GetNextAssoc
+3438=CMapStringToPtr::GetNextAssoc
+3439=CMapStringToString::GetNextAssoc
+3440=CMapWordToOb::GetNextAssoc
+3441=CMapWordToPtr::GetNextAssoc
+3442=COleDocument::GetNextClientItem
+3443=CConnectionPoint::GetNextConnection
+3444=CMultiDocTemplate::GetNextDoc
+3445=CSingleDocTemplate::GetNextDoc
+3446=CDocManager::GetNextDocTemplate
+3447=CWinApp::GetNextDocTemplate
+3448=COleDataObject::GetNextFormat
+3449=COleDocument::GetNextItem
+3450=COleDocument::GetNextItemOfKind
+3451=COleUILinkInfo::GetNextLink
+3452=CFileDialog::GetNextPathName
+3453=COleDocument::GetNextServerItem
+3454=CDocument::GetNextView
+3455=CFindReplaceDialog::GetNotifier
+3456=CCmdTarget::GetNotSupported
+3457=COleControl::GetNotSupported
+3458=CHttpFile::GetObjectA
+3459=COleLinkingDoc::XOleItemContainer::GetObjectA
+3460=COlePropertyPage::GetObjectArray
+3461=COleClientItem::GetObjectDescriptorData
+3462=COleServerItem::GetObjectDescriptorData
+3463=COlePropertiesDialog::XOleUIObjInfo::GetObjectInfo
+3464=CArchive::GetObjectSchema
+3465=COleLinkingDoc::XOleItemContainer::GetObjectStorage
+3466=CRecordset::GetODBCFieldInfo
+3467=CRecordset::GetODBCFieldInfo
+3468=CDaoQueryDef::GetODBCTimeout
+3469=COleServerItem::GetOleObject
+3470=COleSafeArray::GetOneDimSize
+3471=CDocManager::GetOpenDocumentCount
+3472=CWinApp::GetOpenDocumentCount
+3473=CPropertySet::GetOSVersion
+3474=COleControl::GetOuterWindow
+3475=CPropertySheet::GetPageCount
+3476=CPropertySheet::GetPageIndex
+3477=CDocObjectServer::XPrint::GetPageInfo
+3478=COlePropertyPage::XPropertyPage::GetPageInfo
+3479=COleControl::XSpecifyPropertyPages::GetPages
+3480=COlePropertyPage::GetPageSite
+3481=CSplitterWnd::GetPane
+3482=CStatusBar::GetPaneInfo
+3483=CStatusBar::GetPaneStyle
+3484=CStatusBar::GetPaneText
+3485=CStatusBar::GetPaneText
+3486=CRichEditCtrl::GetParaFormat
+3487=CRichEditView::GetParaFormatSelection
+3488=CDaoQueryDef::GetParameterCount
+3489=CDaoQueryDef::GetParameterInfo
+3490=CDaoQueryDef::GetParameterInfo
+3491=CDaoQueryDef::GetParamValue
+3492=CDaoQueryDef::GetParamValue
+3493=CDaoRecordset::GetParamValue
+3494=CDaoRecordset::GetParamValue
+3495=CWnd::GetParentFrame
+3496=CWnd::GetParentOwner
+3497=CView::GetParentSplitter
+3498=CDataPathProperty::GetPath
+3499=CFileDialog::GetPathName
+3500=CAsyncSocket::GetPeerName
+3501=CDaoRecordset::GetPercentPosition
+3502=CPictureHolder::GetPictureDispatch
+3503=CPicturePropPage::GetPictureProp
+3504=CSizeComboBox::GetPointSize
+3505=CPageSetupDialog::GetPortName
+3506=CPrintDialog::GetPortName
+3507=CFile::GetPosition
+3508=CMemFile::GetPosition
+3509=COleStreamFile::GetPosition
+3510=CSocketFile::GetPosition
+3511=CStdioFile::GetPosition
+3512=COleControl::XPerPropertyBrowsing::GetPredefinedStrings
+3513=COleControl::XPerPropertyBrowsing::GetPredefinedValue
+3514=COleDocument::GetPrimarySelectedItem
+3515=CRichEditDoc::GetPrimarySelectedItem
+3516=COleClientItem::GetPrintDeviceInfo
+3517=CWinApp::GetPrinterDeviceDefaults
+3518=CEditView::GetPrinterFont
+3519=CAsyncMonikerFile::GetPriority
+3520=CWinApp::GetProfileBinary
+3521=CWinApp::GetProfileIntA
+3522=CWinApp::GetProfileStringA
+3523=COlePropertyPage::GetPropCheck
+3524=COleControlSite::GetProperty
+3525=COleDispatchDriver::GetProperty
+3526=CPropertySection::GetProperty
+3527=CPropertySet::GetProperty
+3528=CWnd::GetProperty
+3529=COlePropertyPage::GetPropIndex
+3530=COleControl::GetPropPageIDs
+3531=COlePropertyPage::GetPropRadio
+3532=COleControl::GetPropsetData
+3533=COlePropertyPage::GetPropText
+3534=COlePropertyPage::GetPropText
+3535=COlePropertyPage::GetPropText
+3536=COlePropertyPage::GetPropText
+3537=COlePropertyPage::GetPropText
+3538=COlePropertyPage::GetPropText
+3539=COlePropertyPage::GetPropText
+3540=COlePropertyPage::GetPropText
+3541=COlePropertyPage::GetPropText
+3542=CDaoDatabase::GetQueryDefCount
+3543=CDaoDatabase::GetQueryDefInfo
+3544=CDaoDatabase::GetQueryDefInfo
+3545=CDaoDatabase::GetQueryTimeout
+3546=CSliderCtrl::GetRange
+3547=CSpinButtonCtrl::GetRange
+3548=CProperty::GetRawValue
+3549=COleControl::GetReadyState
+3550=CDaoRecordset::GetRecordCount
+3551=CDaoTableDef::GetRecordCount
+3552=CDaoDatabase::GetRecordsAffected
+3553=CDaoQueryDef::GetRecordsAffected
+3554=CDocObjectServer::XOleDocumentView::GetRect
+3555=COleControl::XViewObject::GetRect
+3556=COleControl::GetRectInContainer
+3557=CDaoDatabase::GetRelationCount
+3558=CDaoDatabase::GetRelationInfo
+3559=CDaoDatabase::GetRelationInfo
+3560=CFindReplaceDialog::GetReplaceString
+3561=CDaoQueryDef::GetReturnsRecords
+3562=CFileFind::GetRoot
+3563=CGopherFileFind::GetRoot
+3564=CCmdTarget::GetRoutingFrame
+3565=CCmdTarget::GetRoutingView
+3566=CSplitterWnd::GetRowInfo
+3567=CAnimateCtrl::GetRuntimeClass
+3568=CArchiveException::GetRuntimeClass
+3569=CAsyncMonikerFile::GetRuntimeClass
+3570=CAsyncSocket::GetRuntimeClass
+3571=CBitmap::GetRuntimeClass
+3572=CBitmapButton::GetRuntimeClass
+3573=CBrush::GetRuntimeClass
+3574=CButton::GetRuntimeClass
+3575=CByteArray::GetRuntimeClass
+3576=CCachedDataPathProperty::GetRuntimeClass
+3577=CCheckListBox::GetRuntimeClass
+3578=CClientDC::GetRuntimeClass
+3579=CCmdTarget::GetRuntimeClass
+3580=CColorDialog::GetRuntimeClass
+3581=CColorPropPage::GetRuntimeClass
+3582=CComboBox::GetRuntimeClass
+3583=CControlBar::GetRuntimeClass
+3584=CCriticalSection::GetRuntimeClass
+3585=CCtrlView::GetRuntimeClass
+3586=CDaoDatabase::GetRuntimeClass
+3587=CDaoException::GetRuntimeClass
+3588=CDaoQueryDef::GetRuntimeClass
+3589=CDaoRecordset::GetRuntimeClass
+3590=CDaoRecordView::GetRuntimeClass
+3591=CDaoTableDef::GetRuntimeClass
+3592=CDaoWorkspace::GetRuntimeClass
+3593=CDatabase::GetRuntimeClass
+3594=CDataPathProperty::GetRuntimeClass
+3595=CDBException::GetRuntimeClass
+3596=CDC::GetRuntimeClass
+3597=CDialog::GetRuntimeClass
+3598=CDialogBar::GetRuntimeClass
+3599=CDocItem::GetRuntimeClass
+3600=CDockBar::GetRuntimeClass
+3601=CDockState::GetRuntimeClass
+3602=CDocManager::GetRuntimeClass
+3603=CDocObjectServer::GetRuntimeClass
+3604=CDocObjectServerItem::GetRuntimeClass
+3605=CDocTemplate::GetRuntimeClass
+3606=CDocument::GetRuntimeClass
+3607=CDragListBox::GetRuntimeClass
+3608=CDWordArray::GetRuntimeClass
+3609=CDynLinkLibrary::GetRuntimeClass
+3610=CEdit::GetRuntimeClass
+3611=CEditView::GetRuntimeClass
+3612=CEvent::GetRuntimeClass
+3613=CException::GetRuntimeClass
+3614=CFile::GetRuntimeClass
+3615=CFileDialog::GetRuntimeClass
+3616=CFileException::GetRuntimeClass
+3617=CFileFind::GetRuntimeClass
+3618=CFindReplaceDialog::GetRuntimeClass
+3619=CFont::GetRuntimeClass
+3620=CFontDialog::GetRuntimeClass
+3621=CFontPropPage::GetRuntimeClass
+3622=CFormView::GetRuntimeClass
+3623=CFrameWnd::GetRuntimeClass
+3624=CFtpConnection::GetRuntimeClass
+3625=CFtpFileFind::GetRuntimeClass
+3626=CGdiObject::GetRuntimeClass
+3627=CGopherConnection::GetRuntimeClass
+3628=CGopherFile::GetRuntimeClass
+3629=CGopherFileFind::GetRuntimeClass
+3630=CHeaderCtrl::GetRuntimeClass
+3631=CHotKeyCtrl::GetRuntimeClass
+3632=CHttpConnection::GetRuntimeClass
+3633=CHttpFile::GetRuntimeClass
+3634=CImageList::GetRuntimeClass
+3635=CInternetConnection::GetRuntimeClass
+3636=CInternetException::GetRuntimeClass
+3637=CInternetFile::GetRuntimeClass
+3638=CInternetSession::GetRuntimeClass
+3639=CListBox::GetRuntimeClass
+3640=CListCtrl::GetRuntimeClass
+3641=CListView::GetRuntimeClass
+3642=CLongBinary::GetRuntimeClass
+3643=CMapPtrToPtr::GetRuntimeClass
+3644=CMapPtrToWord::GetRuntimeClass
+3645=CMapStringToOb::GetRuntimeClass
+3646=CMapStringToPtr::GetRuntimeClass
+3647=CMapStringToString::GetRuntimeClass
+3648=CMapWordToOb::GetRuntimeClass
+3649=CMapWordToPtr::GetRuntimeClass
+3650=CMDIChildWnd::GetRuntimeClass
+3651=CMDIFrameWnd::GetRuntimeClass
+3652=CMemFile::GetRuntimeClass
+3653=CMemoryException::GetRuntimeClass
+3654=CMenu::GetRuntimeClass
+3655=CMetaFileDC::GetRuntimeClass
+3656=CMiniDockFrameWnd::GetRuntimeClass
+3657=CMiniFrameWnd::GetRuntimeClass
+3658=CMonikerFile::GetRuntimeClass
+3659=CMultiDocTemplate::GetRuntimeClass
+3660=CMutex::GetRuntimeClass
+3661=CNotSupportedException::GetRuntimeClass
+3662=CObArray::GetRuntimeClass
+3663=CObject::GetRuntimeClass
+3664=CObList::GetRuntimeClass
+3665=COleBusyDialog::GetRuntimeClass
+3666=COleChangeIconDialog::GetRuntimeClass
+3667=COleChangeSourceDialog::GetRuntimeClass
+3668=COleClientItem::GetRuntimeClass
+3669=COleControl::GetRuntimeClass
+3670=COleControlModule::GetRuntimeClass
+3671=COleConvertDialog::GetRuntimeClass
+3672=COleDialog::GetRuntimeClass
+3673=COleDispatchException::GetRuntimeClass
+3674=COleDocIPFrameWnd::GetRuntimeClass
+3675=COleDocument::GetRuntimeClass
+3676=COleException::GetRuntimeClass
+3677=COleInsertDialog::GetRuntimeClass
+3678=COleIPFrameWnd::GetRuntimeClass
+3679=COleLinkingDoc::GetRuntimeClass
+3680=COleLinksDialog::GetRuntimeClass
+3681=COleObjectFactory::GetRuntimeClass
+3682=COlePasteSpecialDialog::GetRuntimeClass
+3683=COlePropertiesDialog::GetRuntimeClass
+3684=COlePropertyPage::GetRuntimeClass
+3685=COleResizeBar::GetRuntimeClass
+3686=COleServerDoc::GetRuntimeClass
+3687=COleServerItem::GetRuntimeClass
+3688=COleStreamFile::GetRuntimeClass
+3689=COleUpdateDialog::GetRuntimeClass
+3690=CPageSetupDialog::GetRuntimeClass
+3691=CPaintDC::GetRuntimeClass
+3692=CPalette::GetRuntimeClass
+3693=CPen::GetRuntimeClass
+3694=CPicturePropPage::GetRuntimeClass
+3695=CPreviewDC::GetRuntimeClass
+3696=CPreviewView::GetRuntimeClass
+3697=CPrintDialog::GetRuntimeClass
+3698=CProgressCtrl::GetRuntimeClass
+3699=CPropertyPage::GetRuntimeClass
+3700=CPropertySheet::GetRuntimeClass
+3701=CPtrArray::GetRuntimeClass
+3702=CPtrList::GetRuntimeClass
+3703=CRecordset::GetRuntimeClass
+3704=CRecordView::GetRuntimeClass
+3705=CResourceException::GetRuntimeClass
+3706=CRgn::GetRuntimeClass
+3707=CRichEditCntrItem::GetRuntimeClass
+3708=CRichEditCtrl::GetRuntimeClass
+3709=CRichEditDoc::GetRuntimeClass
+3710=CRichEditView::GetRuntimeClass
+3711=CScrollBar::GetRuntimeClass
+3712=CScrollView::GetRuntimeClass
+3713=CSemaphore::GetRuntimeClass
+3714=CSharedFile::GetRuntimeClass
+3715=CSingleDocTemplate::GetRuntimeClass
+3716=CSliderCtrl::GetRuntimeClass
+3717=CSocket::GetRuntimeClass
+3718=CSocketFile::GetRuntimeClass
+3719=CSpinButtonCtrl::GetRuntimeClass
+3720=CSplitterWnd::GetRuntimeClass
+3721=CStatic::GetRuntimeClass
+3722=CStatusBar::GetRuntimeClass
+3723=CStatusBarCtrl::GetRuntimeClass
+3724=CStdioFile::GetRuntimeClass
+3725=CStockPropPage::GetRuntimeClass
+3726=CStringArray::GetRuntimeClass
+3727=CStringList::GetRuntimeClass
+3728=CSyncObject::GetRuntimeClass
+3729=CTabCtrl::GetRuntimeClass
+3730=CToolBar::GetRuntimeClass
+3731=CToolBarCtrl::GetRuntimeClass
+3732=CToolTipCtrl::GetRuntimeClass
+3733=CTreeCtrl::GetRuntimeClass
+3734=CTreeView::GetRuntimeClass
+3735=CUIntArray::GetRuntimeClass
+3736=CUserException::GetRuntimeClass
+3737=CView::GetRuntimeClass
+3738=CWinApp::GetRuntimeClass
+3739=CWindowDC::GetRuntimeClass
+3740=CWindowlessDC::GetRuntimeClass
+3741=CWinThread::GetRuntimeClass
+3742=CWnd::GetRuntimeClass
+3743=CWordArray::GetRuntimeClass
+3744=CWnd::GetSafeOwner
+3745=CColorDialog::GetSavedCustomColors
+3746=CGopherFileFind::GetScreenName
+3747=CDockState::GetScreenSize
+3748=CView::GetScrollBarCtrl
+3749=CWnd::GetScrollBarCtrl
+3750=CScrollView::GetScrollBarSizes
+3751=CScrollView::GetScrollBarState
+3752=CWnd::GetScrollInfo
+3753=CWnd::GetScrollLimit
+3754=CWnd::GetScrollPos
+3755=CScrollView::GetScrollPosition
+3756=CWnd::GetScrollRange
+3757=CSplitterWnd::GetScrollStyle
+3758=COleDateTime::GetSecond
+3759=COleDateTimeSpan::GetSeconds
+3760=CPropertySet::GetSection
+3761=CWinApp::GetSectionKey
+3762=CPropertySection::GetSectionName
+3763=CRichEditCtrl::GetSel
+3764=CRichEditView::GetSelectedItem
+3765=CEditView::GetSelectedText
+3766=CSliderCtrl::GetSelection
+3767=CRichEditCtrl::GetSelectionCharFormat
+3768=COleConvertDialog::GetSelectionType
+3769=COleInsertDialog::GetSelectionType
+3770=COlePasteSpecialDialog::GetSelectionType
+3771=CRichEditCtrl::GetSelText
+3772=CInternetConnection::GetServerName
+3773=CPropertySection::GetSize
+3774=CDialogTemplate::GetSizeInDialogUnits
+3775=CDialogTemplate::GetSizeInPixels
+3776=CBlobProperty::GetSizeMax
+3777=COleControl::XPersistMemory::GetSizeMax
+3778=COleControl::XPersistStreamInit::GetSizeMax
+3779=CSplitterWnd::GetSizingParent
+3780=CAsyncSocket::GetSockName
+3781=CDaoTableDef::GetSourceTableName
+3782=CDaoQueryDef::GetSQL
+3783=CDaoRecordset::GetSQL
+3784=CCmdTarget::GetStackSize
+3785=CCmdTarget::GetStandardProp
+3786=CConnectionPoint::GetStartPosition
+3787=COleDocument::GetStartPosition
+3788=CRichEditDoc::GetStartPosition
+3789=CFile::GetStatus
+3790=CFile::GetStatus
+3791=CMemFile::GetStatus
+3792=COleStreamFile::GetStatus
+3793=COleControl::GetStockTextMetrics
+3794=COleStreamFile::GetStorageName
+3795=COleStreamFile::GetStream
+3796=COleControlSite::GetStyle
+3797=CWnd::GetStyle
+3798=CWnd::GetSuperWndProcAddr
+3799=CDaoDatabase::GetTableDefCount
+3800=CDaoDatabase::GetTableDefInfo
+3801=CDaoDatabase::GetTableDefInfo
+3802=CDialogTemplate::GetTemplateSize
+3803=CListBox::GetText
+3804=COleControl::GetText
+3805=CStatusBarCtrl::GetText
+3806=CStatusBarCtrl::GetText
+3807=CToolTipCtrl::GetText
+3808=CRecordset::GetTextLen
+3809=CStatusBarCtrl::GetTextLength
+3810=COleDateTime::GetTickCount
+3811=CTime::GetTickCount
+3812=CToolTipCtrl::GetToolInfo
+3813=CWnd::GetTopLevelFrame
+3814=CWnd::GetTopLevelOwner
+3815=CWnd::GetTopLevelParent
+3816=CScrollView::GetTrueClientSize
+3817=CRectTracker::GetTrueRect
+3818=CDaoQueryDef::GetType
+3819=CDaoRecordset::GetType
+3820=CPictureHolder::GetType
+3821=CProperty::GetType
+3822=COleDispatchImpl::GetTypeInfo
+3823=COleControlSite::XAmbientProps::GetTypeInfo
+3824=COleControlSite::XEventSink::GetTypeInfo
+3825=CCmdTarget::GetTypeInfoCount
+3826=COleDispatchImpl::GetTypeInfoCount
+3827=COleControlSite::XAmbientProps::GetTypeInfoCount
+3828=COleControlSite::XEventSink::GetTypeInfoCount
+3829=CCmdTarget::GetTypeInfoOfGuid
+3830=CCmdTarget::GetTypeLib
+3831=CCmdTarget::GetTypeLibCache
+3832=COleSafeArray::GetUBound
+3833=CDocObjectServer::XOleObject::GetUserClassID
+3834=COleControl::XOleObject::GetUserClassID
+3835=COleServerDoc::XOleObject::GetUserClassID
+3836=COleServerItem::XOleObject::GetUserClassID
+3837=CDaoWorkspace::GetUserNameA
+3838=COleClientItem::GetUserType
+3839=COleControl::GetUserType
+3840=CDocObjectServer::XOleObject::GetUserType
+3841=COleControl::XOleObject::GetUserType
+3842=COleServerDoc::XOleObject::GetUserType
+3843=COleServerItem::XOleObject::GetUserType
+3844=CDaoRecordset::GetValidationRule
+3845=CDaoTableDef::GetValidationRule
+3846=CDaoRecordset::GetValidationText
+3847=CDaoTableDef::GetValidationText
+3848=CMapPtrToPtr::GetValueAt
+3849=CHttpFile::GetVerb
+3850=CDaoDatabase::GetVersion
+3851=CDaoWorkspace::GetVersion
+3852=CDockState::GetVersion
+3853=CRichEditDoc::GetView
+3854=COlePropertiesDialog::XOleUIObjInfo::GetViewInfo
+3855=COleControl::XViewObject::GetViewStatus
+3856=COleControl::XOleInPlaceActiveObject::GetWindow
+3857=COleServerDoc::XOleInPlaceActiveObject::GetWindow
+3858=COleFrameHook::XOleInPlaceFrame::GetWindow
+3859=COleControl::XOleInPlaceObject::GetWindow
+3860=COleServerDoc::XOleInPlaceObject::GetWindow
+3861=COleControlContainer::XOleIPFrame::GetWindow
+3862=COleClientItem::XOleIPSite::GetWindow
+3863=COleControlSite::XOleIPSite::GetWindow
+3864=CRichEditCntrItem::GetWindowContext
+3865=CRichEditView::GetWindowContext
+3866=COleClientItem::XOleIPSite::GetWindowContext
+3867=COleControlSite::XOleIPSite::GetWindowContext
+3868=COleControl::GetWindowlessDropTarget
+3869=CMDIFrameWnd::GetWindowMenuPopup
+3870=CWnd::GetWindowPlacement
+3871=COleControlSite::GetWindowTextA
+3872=COleControlSite::GetWindowTextA
+3873=CWnd::GetWindowTextA
+3874=CWnd::GetWindowTextA
+3875=COleControlSite::GetWindowTextLengthA
+3876=CWnd::GetWindowTextLengthA
+3877=CDaoWorkspace::GetWorkspaceCount
+3878=CDaoWorkspace::GetWorkspaceInfo
+3879=CDaoWorkspace::GetWorkspaceInfo
+3880=COleDateTime::GetYear
+3881=COleServerDoc::GetZoomFactor
+3882=COleDropSource::GiveFeedback
+3883=COleDropSource::XDropSource::GiveFeedback
+3884=CWnd::GrayCtlColor
+3885=CDC::GrayStringA
+3886=CPreviewDC::GrayStringA
+3887=CMemFile::GrowFile
+3888=_GUIDconstCColorPropPage::guid
+3889=_GUIDconstCFontPropPage::guid
+3890=_GUIDconstCPicturePropPage::guid
+3891=CWnd::HandleFloatingSysCommand
+3892=COleMessageFilter::XMessageFilter::HandleInComingCall
+3893=CDialog::HandleInitDialog
+3894=CDialogBar::HandleInitDialog
+3895=CFormView::HandleInitDialog
+3896=CPropertySheet::HandleInitDialog
+3897=CDialog::HandleSetFont
+3898=COleControl::XPersistStorage::HandsOffStorage
+3899=COleServerDoc::XPersistStorage::HandsOffStorage
+3900=COleDocument::HasBlankItems
+3901=CDialogTemplate::HasFont
+3902=HashKey
+3903=HashKey
+3904=COlePropertyPage::XPropertyPage::Help
+3905=CDumpContext::HexDump
+3906=CWinApp::HideApplication
+3907=CFileDialog::HideControl
+3908=CDC::HIMETRICtoDP
+3909=CDC::HIMETRICtoLP
+3910=CListCtrl::HitTest
+3911=CRectTracker::HitTest
+3912=CSplitterWnd::HitTest
+3913=CToolTipCtrl::HitTest
+3914=CTreeCtrl::HitTest
+3915=CRectTracker::HitTestHandles
+3916=CSplitterWnd::IdFromRowCol
+3917=CDaoWorkspace::Idle
+3918=COlePropertyPage::IgnoreApply
+3919=COleControl::IgnoreWindowMessage
+3920=CRect::InflateRect
+3921=CRect::InflateRect
+3922=CWinApp::InitApplication
+3923=COleControl::XOleCache::InitCache
+3924=CWnd::InitControlContainer
+3925=CDaoWorkspace::InitDatabasesCollection
+3926=CPropertyPage::InitDialogInfo
+3927=CDaoException::InitErrorsCollection
+3928=CDaoQueryDef::InitFieldsCollection
+3929=CDaoRecordset::InitFieldsCollection
+3930=CDaoTableDef::InitFieldsCollection
+3931=CDocObjectServer::XOleObject::InitFromData
+3932=COleControl::XOleObject::InitFromData
+3933=COleServerDoc::XOleObject::InitFromData
+3934=COleServerItem::XOleObject::InitFromData
+3935=CMapPtrToPtr::InitHashTable
+3936=CMapPtrToWord::InitHashTable
+3937=CMapStringToOb::InitHashTable
+3938=CMapStringToPtr::InitHashTable
+3939=CMapStringToString::InitHashTable
+3940=CMapWordToOb::InitHashTable
+3941=CMapWordToPtr::InitHashTable
+3942=CDataSourceControl::Initialize
+3943=CMiniFrameWnd::Initialize
+3944=CDaoWorkspace::InitializeEngine
+3945=CFontHolder::InitializeFont
+3946=COleControl::InitializeIIDs
+3947=CEditView::InitializeReplace
+3948=CDocTemplate::InitialUpdateFrame
+3949=CFrameWnd::InitialUpdateFrame
+3950=CDaoRecordset::InitIndexesCollection
+3951=CDaoTableDef::InitIndexesCollection
+3952=COleControlModule::InitInstance
+3953=CWinApp::InitInstance
+3954=CWinThread::InitInstance
+3955=CDockContext::InitLoop
+3956=CDialog::InitModalIndirect
+3957=CDialog::InitModalIndirect
+3958=COleControl::XPersistMemory::InitNew
+3959=COleControl::XPersistPropertyBag::InitNew
+3960=COleControl::XPersistStorage::InitNew
+3961=COleServerDoc::XPersistStorage::InitNew
+3962=COleControl::XPersistStreamInit::InitNew
+3963=CDaoQueryDef::InitParametersCollection
+3964=CDaoDatabase::InitQueryDefsCollection
+3965=CRecordset::InitRecord
+3966=CDaoDatabase::InitRelationsCollection
+3967=COleControl::InitStockEventMask
+3968=COleControl::InitStockPropMask
+3969=CSimpleException::InitString
+3970=CDaoDatabase::InitTableDefsCollection
+3971=CDaoDatabase::InitWorkspace
+3972=CDaoWorkspace::InitWorkspacesCollection
+3973=COleControl::XOleInPlaceObject::InPlaceDeactivate
+3974=COleServerDoc::XOleInPlaceObject::InPlaceDeactivate
+3975=CDockBar::Insert
+3976=CObList::InsertAfter
+3977=CPtrList::InsertAfter
+3978=CStringList::InsertAfter
+3979=CByteArray::InsertAt
+3980=CByteArray::InsertAt
+3981=CDWordArray::InsertAt
+3982=CDWordArray::InsertAt
+3983=CObArray::InsertAt
+3984=CObArray::InsertAt
+3985=CPtrArray::InsertAt
+3986=CPtrArray::InsertAt
+3987=CStringArray::InsertAt
+3988=CStringArray::InsertAt
+3989=CUIntArray::InsertAt
+3990=CUIntArray::InsertAt
+3991=CWordArray::InsertAt
+3992=CWordArray::InsertAt
+3993=CObList::InsertBefore
+3994=CPtrList::InsertBefore
+3995=CStringList::InsertBefore
+3996=CListCtrl::InsertColumn
+3997=CRichEditView::InsertFileAsObject
+3998=CListCtrl::InsertItem
+3999=CRichEditView::InsertItem
+4000=CTreeCtrl::InsertItem
+4001=COleFrameHook::XOleInPlaceFrame::InsertMenus
+4002=COleControlContainer::XOleIPFrame::InsertMenus
+4003=AFX_INTERFACEMAPconstCCmdTarget::interfaceMap
+4004=AFX_INTERFACEMAPconstCDocObjectServer::interfaceMap
+4005=AFX_INTERFACEMAPconstCOleClientItem::interfaceMap
+4006=AFX_INTERFACEMAPconstCOleControl::interfaceMap
+4007=AFX_INTERFACEMAPconstCOleDataSource::interfaceMap
+4008=AFX_INTERFACEMAPconstCOleDropSource::interfaceMap
+4009=AFX_INTERFACEMAPconstCOleDropTarget::interfaceMap
+4010=AFX_INTERFACEMAPconstCOleFrameHook::interfaceMap
+4011=AFX_INTERFACEMAPconstCOleLinkingDoc::interfaceMap
+4012=AFX_INTERFACEMAPconstCOleMessageFilter::interfaceMap
+4013=AFX_INTERFACEMAPconstCOleObjectFactory::interfaceMap
+4014=AFX_INTERFACEMAPconstCOlePropertyPage::interfaceMap
+4015=AFX_INTERFACEMAPconstCOleServerDoc::interfaceMap
+4016=AFX_INTERFACEMAPconstCOleServerItem::interfaceMap
+4017=AFX_INTERFACEMAPconstCRichEditView::interfaceMap
+4018=COleControl::InternalGetFont
+4019=COleControl::InternalGetText
+4020=CCmdTarget::InternalQueryInterface
+4021=CCmdTarget::InternalRelease
+4022=CDC::IntersectClipRect
+4023=CDC::IntersectClipRect
+4024=CCheckListBox::InvalidateCheck
+4025=COleControl::InvalidateControl
+4026=CCheckListBox::InvalidateItem
+4027=COleControl::InvalidateRgn
+4028=CMiniFrameWnd::InvertSysMenu
+4029=COleDispatchImpl::Invoke
+4030=COleControlSite::XAmbientProps::Invoke
+4031=COleControlSite::XEventSink::Invoke
+4032=COleControlSite::InvokeHelper
+4033=COleDispatchDriver::InvokeHelper
+4034=CWnd::InvokeHelper
+4035=COleControlSite::InvokeHelperV
+4036=COleDispatchDriver::InvokeHelperV
+4037=CDocItem::IsBlank
+4038=COleServerItem::IsBlank
+4039=CDaoRecordset::IsBOF
+4040=CSplitterWnd::IsChildPane
+4041=COleServerItem::IsConnected
+4042=COleDataObject::IsDataAvailable
+4043=COleControlSite::IsDefaultButton
+4044=CDaoRecordset::IsDeleted
+4045=CRuntimeClass::IsDerivedFrom
+4046=COccManager::IsDialogMessageA
+4047=CWnd::IsDialogMessageA
+4048=CBlobProperty::IsDirty
+4049=COleLinkingDoc::XPersistFile::IsDirty
+4050=COleControl::XPersistMemory::IsDirty
+4051=COleControl::XPersistStorage::IsDirty
+4052=COleServerDoc::XPersistStorage::IsDirty
+4053=COleControl::XPersistStreamInit::IsDirty
+4054=COleControlContainer::IsDlgButtonChecked
+4055=CWnd::IsDlgButtonChecked
+4056=CControlBar::IsDockBar
+4057=CDockBar::IsDockBar
+4058=CFileFind::IsDots
+4059=CGopherFileFind::IsDots
+4060=CCheckListBox::IsEnabled
+4061=CDaoRecordset::IsEOF
+4062=CDaoRecordset::IsFieldDirty
+4063=CRecordset::IsFieldDirty
+4064=CDaoRecordset::IsFieldNull
+4065=CRecordset::IsFieldNull
+4066=CDaoRecordset::IsFieldNullable
+4067=CRecordset::IsFieldNullable
+4068=CRecordset::IsFieldNullable
+4069=CDaoRecordset::IsFieldStatusDirty
+4070=CRecordset::IsFieldStatusDirty
+4071=CDaoRecordset::IsFieldStatusNull
+4072=CRecordset::IsFieldStatusNull
+4073=CDaoRecordset::IsFieldStatusNullable
+4074=CDaoRecordset::IsFieldStatusNullableKnown
+4075=CFieldExchange::IsFieldType
+4076=CControlBar::IsFloating
+4077=CFrameWnd::IsFrameWnd
+4078=CWnd::IsFrameWnd
+4079=CWinThread::IsIdleMessage
+4080=CCmdTarget::IsInvokeAllowed
+4081=COleControl::IsInvokeAllowed
+4082=CRecordset::IsJoin
+4083=CObject::IsKindOf
+4084=COccManager::IsLabelControl
+4085=COleObjectFactory::IsLicenseValid
+4086=CDaoRecordset::IsMatch
+4087=COccManager::IsMatchingMnemonic
+4088=COleControlSite::IsMatchingMnemonic
+4089=CDocument::IsModified
+4090=COleClientItem::IsModified
+4091=COleControl::IsModified
+4092=COlePropertyPage::IsModified
+4093=CRichEditDoc::IsModified
+4094=CDaoFieldExchange::IsNullValue
+4095=CDaoRecordView::IsOnFirstRecord
+4096=CRecordView::IsOnFirstRecord
+4097=CDaoRecordView::IsOnLastRecord
+4098=CRecordView::IsOnLastRecord
+4099=CRecordset::IsOpen
+4100=COlePropertyPage::XPropertyPage::IsPageDirty
+4101=CRecordset::IsParamStatusNull
+4102=CRecordset::IsRecordsetUpdatable
+4103=COleObjectFactory::IsRegistered
+4104=CCmdTarget::IsResultExpected
+4105=CRichEditView::IsRichEditFormat
+4106=COleLinkingDoc::XOleItemContainer::IsRunning
+4107=CRichEditView::IsSelected
+4108=CView::IsSelected
+4109=CRecordset::IsSelectQueryUpdatable
+4110=CObject::IsSerializable
+4111=COleMessageFilter::IsSignificantMessage
+4112=CRecordset::IsSQLUpdatable
+4113=COleControl::IsSubclassedControl
+4114=CWnd::IsTopParentActive
+4115=CFrameWnd::IsTracking
+4116=CDocObjectServer::XOleObject::IsUpToDate
+4117=COleControl::XOleObject::IsUpToDate
+4118=COleServerDoc::XOleObject::IsUpToDate
+4119=COleServerItem::XOleObject::IsUpToDate
+4120=CDaoFieldExchange::IsValidOperation
+4121=CControlBar::IsVisible
+4122=COleControlSite::IsWindowEnabled
+4123=CWnd::IsWindowEnabled
+4124=CListBox::ItemFromPoint
+4125=CTreeCtrl::ItemHasChildren
+4126=COleControl::KeyDown
+4127=COleControl::KeyUp
+4128=CAsyncSocket::KillSocket
+4129=CString::Left
+4130=CRichEditCtrl::LineIndex
+4131=CRichEditCtrl::LineLength
+4132=CRichEditCtrl::LineScroll
+4133=CDC::LineTo
+4134=ulongCRichEditView::lMaxSize
+4135=CBlobProperty::Load
+4136=CDialogTemplate::Load
+4137=COleControl::Load
+4138=CRuntimeClass::Load
+4139=COleLinkingDoc::XPersistFile::Load
+4140=COleControl::XPersistMemory::Load
+4141=COleControl::XPersistPropertyBag::Load
+4142=COleControl::XPersistStorage::Load
+4143=COleServerDoc::XPersistStorage::Load
+4144=COleControl::XPersistStreamInit::Load
+4145=CFrameWnd::LoadAccelTable
+4146=CFrameWnd::LoadBarState
+4147=CToolBar::LoadBitmapA
+4148=CBitmapButton::LoadBitmaps
+4149=CDaoRecordset::LoadFields
+4150=CRecordset::LoadFields
+4151=CFrameWnd::LoadFrame
+4152=CMDIChildWnd::LoadFrame
+4153=CMDIFrameWnd::LoadFrame
+4154=COleIPFrameWnd::LoadFrame
+4155=COleDocument::LoadFromStorage
+4156=CControlBarInfo::LoadState
+4157=CDockState::LoadState
+4158=COleControl::LoadState
+4159=CWinApp::LoadStdProfileSettings
+4160=CString::LoadStringA
+4161=CDocTemplate::LoadTemplate
+4162=CMultiDocTemplate::LoadTemplate
+4163=CToolBar::LoadToolBar
+4164=CCriticalSection::Lock
+4165=CMultiLock::Lock
+4166=COleSafeArray::Lock
+4167=CSingleLock::Lock
+4168=CSyncObject::Lock
+4169=CTypeLibCache::Lock
+4170=CEditView::LockBuffer
+4171=CString::LockBuffer
+4172=COleControlContainer::XOleContainer::LockContainer
+4173=COleLinkingDoc::XOleItemContainer::LockContainer
+4174=COleLinkingDoc::LockExternal
+4175=COleControl::LockInPlaceActive
+4176=COleControlSite::XOleControlSite::LockInPlaceActive
+4177=CFile::LockRange
+4178=CInternetFile::LockRange
+4179=CMemFile::LockRange
+4180=COleStreamFile::LockRange
+4181=CSocketFile::LockRange
+4182=CStdioFile::LockRange
+4183=CArchiveStream::LockRegion
+4184=COleObjectFactory::XClassFactory::LockServer
+4185=CMapPtrToPtr::Lookup
+4186=CMapPtrToWord::Lookup
+4187=CMapStringToOb::Lookup
+4188=CMapStringToPtr::Lookup
+4189=CMapStringToString::Lookup
+4190=CMapWordToOb::Lookup
+4191=CMapWordToPtr::Lookup
+4192=COleDataSource::Lookup
+4193=CTypeLibCache::Lookup
+4194=CAsyncSocket::LookupHandle
+4195=CRichEditDoc::LookupItem
+4196=CMapStringToOb::LookupKey
+4197=CMapStringToPtr::LookupKey
+4198=CMapStringToString::LookupKey
+4199=CTypeLibCache::LookupTypeInfo
+4200=CDC::LPtoDP
+4201=CDC::LPtoHIMETRIC
+4202=CString::MakeLower
+4203=CString::MakeReverse
+4204=CString::MakeUpper
+4205=CArchive::MapObject
+4206=COleControl::XPerPropertyBrowsing::MapPropertyToPage
+4207=COleDialog::MapResult
+4208=CPropertyPage::MapWizardResult
+4209=CDaoRecordset::MarkForAddNew
+4210=CRecordset::MarkForAddNew
+4211=CDaoRecordset::MarkForEdit
+4212=CRecordset::MarkForUpdate
+4213=CRichEditDoc::MarkItemsClear
+4214=CDocTemplate::MatchDocType
+4215=CFileFind::MatchesMask
+4216=CMDIFrameWnd::MDIGetActive
+4217=CCheckListBox::MeasureItem
+4218=CComboBox::MeasureItem
+4219=CListBox::MeasureItem
+4220=CMenu::MeasureItem
+4221=CCmdTarget::MemberIDFromName
+4222=CMemFile::Memcpy
+4223=COlePropertyPage::MessageBoxA
+4224=CWnd::MessageBoxA
+4225=AFX_MSGMAPconstCCheckListBox::messageMap
+4226=AFX_MSGMAPconstCCmdTarget::messageMap
+4227=AFX_MSGMAPconstCColorDialog::messageMap
+4228=AFX_MSGMAPconstCColorPropPage::messageMap
+4229=AFX_MSGMAPconstCCommonDialog::messageMap
+4230=AFX_MSGMAPconstCControlBar::messageMap
+4231=AFX_MSGMAPconstCControlFrameWnd::messageMap
+4232=AFX_MSGMAPconstCCtrlView::messageMap
+4233=AFX_MSGMAPconstCDaoRecordView::messageMap
+4234=AFX_MSGMAPconstCDialog::messageMap
+4235=AFX_MSGMAPconstCDialogBar::messageMap
+4236=AFX_MSGMAPconstCDockBar::messageMap
+4237=AFX_MSGMAPconstCDocObjectServer::messageMap
+4238=AFX_MSGMAPconstCDocument::messageMap
+4239=AFX_MSGMAPconstCEditView::messageMap
+4240=AFX_MSGMAPconstCFontPropPage::messageMap
+4241=AFX_MSGMAPconstCFormView::messageMap
+4242=AFX_MSGMAPconstCFrameWnd::messageMap
+4243=AFX_MSGMAPconstCListCtrl::messageMap
+4244=AFX_MSGMAPconstCListView::messageMap
+4245=AFX_MSGMAPconstCMDIChildWnd::messageMap
+4246=AFX_MSGMAPconstCMDIFrameWnd::messageMap
+4247=AFX_MSGMAPconstCMiniDockFrameWnd::messageMap
+4248=AFX_MSGMAPconstCMiniFrameWnd::messageMap
+4249=AFX_MSGMAPconstCOleControl::messageMap
+4250=AFX_MSGMAPconstCOleDocIPFrameWnd::messageMap
+4251=AFX_MSGMAPconstCOleIPFrameWnd::messageMap
+4252=AFX_MSGMAPconstCOlePropertyPage::messageMap
+4253=AFX_MSGMAPconstCOleResizeBar::messageMap
+4254=AFX_MSGMAPconstCOleServerDoc::messageMap
+4255=AFX_MSGMAPconstCPicturePropPage::messageMap
+4256=AFX_MSGMAPconstCPreviewView::messageMap
+4257=AFX_MSGMAPconstCPrintDialog::messageMap
+4258=AFX_MSGMAPconstCPropertyPage::messageMap
+4259=AFX_MSGMAPconstCPropertySheet::messageMap
+4260=AFX_MSGMAPconstCRecordView::messageMap
+4261=AFX_MSGMAPconstCRichEditView::messageMap
+4262=AFX_MSGMAPconstCScrollView::messageMap
+4263=AFX_MSGMAPconstCSocketWnd::messageMap
+4264=AFX_MSGMAPconstCSplitterWnd::messageMap
+4265=AFX_MSGMAPconstCStatusBar::messageMap
+4266=AFX_MSGMAPconstCStockPropPage::messageMap
+4267=AFX_MSGMAPconstCTabCtrl::messageMap
+4268=AFX_MSGMAPconstCToolBar::messageMap
+4269=AFX_MSGMAPconstCToolBarCtrl::messageMap
+4270=AFX_MSGMAPconstCToolTipCtrl::messageMap
+4271=AFX_MSGMAPconstCTreeCtrl::messageMap
+4272=AFX_MSGMAPconstCTreeView::messageMap
+4273=AFX_MSGMAPconstCView::messageMap
+4274=AFX_MSGMAPconstCWinApp::messageMap
+4275=AFX_MSGMAPconstCWnd::messageMap
+4276=COleMessageFilter::XMessageFilter::MessagePending
+4277=CString::Mid
+4278=CString::Mid
+4279=CPreviewDC::MirrorAttributes
+4280=CPreviewDC::MirrorFont
+4281=CPreviewDC::MirrorMappingMode
+4282=CPreviewDC::MirrorViewportOrg
+4283=COleControlSite::ModifyStyle
+4284=CWnd::ModifyStyle
+4285=CWnd::ModifyStyle
+4286=COleControlSite::ModifyStyleEx
+4287=CWnd::ModifyStyleEx
+4288=CWnd::ModifyStyleEx
+4289=CDaoRecordset::Move
+4290=CDockContext::Move
+4291=CRecordset::Move
+4292=COlePropertyPage::XPropertyPage::Move
+4293=CDaoRecordset::MoveFirst
+4294=CDaoRecordset::MoveLast
+4295=CDaoRecordset::MoveNext
+4296=CDaoRecordset::MovePrev
+4297=CDC::MoveTo
+4298=COleControlSite::MoveWindow
+4299=CWnd::MoveWindow
+4300=CRect::MulDiv
+4301=uintCOleDropSource::nDragDelay
+4302=uintCOleDropSource::nDragMinDist
+4303=CFrameWnd::NegotiateBorderSpace
+4304=CMapPtrToPtr::NewAssoc
+4305=CMapPtrToWord::NewAssoc
+4306=CMapStringToOb::NewAssoc
+4307=CMapStringToPtr::NewAssoc
+4308=CMapStringToString::NewAssoc
+4309=CMapWordToOb::NewAssoc
+4310=CMapWordToPtr::NewAssoc
+4311=CObList::NewNode
+4312=CPtrList::NewNode
+4313=CStringList::NewNode
+4314=CEnumArray::XEnumVOID::Next
+4315=uintconstCEditView::nMaxSize
+4316=CRectTracker::NormalizeHit
+4317=CRect::NormalizeRect
+4318=CDataBoundProperty::Notify
+4319=COleFrameHook::NotifyAllInPlace
+4320=COleServerDoc::NotifyAllItems
+4321=COleServerItem::NotifyClient
+4322=CFrameWnd::NotifyFloatingWindows
+4323=COleServerDoc::NotifyRename
+4324=uintCOleDropTarget::nScrollDelay
+4325=intCOleDropTarget::nScrollInset
+4326=uintCOleDropTarget::nScrollInterval
+4327=CString::OemToCharA
+4328=CDC::OffsetClipRgn
+4329=CDC::OffsetClipRgn
+4330=CDC::OffsetViewportOrg
+4331=CMetaFileDC::OffsetViewportOrg
+4332=CPreviewDC::OffsetViewportOrg
+4333=CDC::OffsetWindowOrg
+4334=COleControlSite::XNotifyDBEvents::OKToDo
+4335=CAsyncSocket::OnAccept
+4336=CControlFrameWnd::OnActivate
+4337=CFrameWnd::OnActivate
+4338=COleClientItem::OnActivate
+4339=COleFrameHook::OnActivate
+4340=CFormView::OnActivateFrame
+4341=CView::OnActivateFrame
+4342=COleControl::OnActivateInPlace
+4343=CFrameWnd::OnActivateTopLevel
+4344=CWnd::OnActivateTopLevel
+4345=COleClientItem::OnActivateUI
+4346=CDocObjectServer::OnActivateView
+4347=CFormView::OnActivateView
+4348=CPreviewView::OnActivateView
+4349=CView::OnActivateView
+4350=CToolTipCtrl::OnAddTool
+4351=CConnectionPoint::OnAdvise
+4352=COleControl::XEventConnPt::OnAdvise
+4353=CWnd::OnAmbientProperty
+4354=COleControl::OnAmbientPropertyChange
+4355=COleControl::XOleControl::OnAmbientPropertyChange
+4356=COleControl::OnAppearanceChanged
+4357=CWinApp::OnAppExit
+4358=CPropertyPage::OnApply
+4359=COlePropertiesDialog::OnApplyScale
+4360=CDocObjectServer::OnApplyViewState
+4361=COleControl::OnBackColorChanged
+4362=CFrameWnd::OnBarCheck
+4363=COleIPFrameWnd::OnBarCheck
+4364=CControlBar::OnBarStyleChange
+4365=CStatusBar::OnBarStyleChange
+4366=CToolBar::OnBarStyleChange
+4367=COleDropSource::OnBeginDrag
+4368=CEditView::OnBeginPrinting
+4369=CRichEditView::OnBeginPrinting
+4370=CView::OnBeginPrinting
+4371=COleControl::OnBorderStyleChanged
+4372=CPicturePropPage::OnBrowse
+4373=CRichEditView::OnBullet
+4374=COleMessageFilter::OnBusyDialog
+4375=CCommonDialog::OnCancel
+4376=CDialog::OnCancel
+4377=CPropertyPage::OnCancel
+4378=CRichEditView::OnCancelEditCntr
+4379=COleControl::OnCancelMode
+4380=CSplitterWnd::OnCancelMode
+4381=CWnd::OnCancelMode
+4382=COleClientItem::OnChange
+4383=COleControl::XFontNotification::OnChanged
+4384=COleControlSite::XPropertyNotifySink::OnChanged
+4385=COlePropertyPage::XPropNotifySink::OnChanged
+4386=CRectTracker::OnChangedRect
+4387=CDocument::OnChangedViewList
+4388=COleClientItem::OnChangeItemPosition
+4389=CRichEditCntrItem::OnChangeItemPosition
+4390=COleControl::OnChar
+4391=CRichEditView::OnCharBold
+4392=CRichEditView::OnCharEffect
+4393=CRichEditView::OnCharItalic
+4394=CWnd::OnCharToItem
+4395=CRichEditView::OnCharUnderline
+4396=CButton::OnChildNotify
+4397=CCheckListBox::OnChildNotify
+4398=CComboBox::OnChildNotify
+4399=CDragListBox::OnChildNotify
+4400=CHeaderCtrl::OnChildNotify
+4401=CListBox::OnChildNotify
+4402=CListCtrl::OnChildNotify
+4403=CListView::OnChildNotify
+4404=CStatusBar::OnChildNotify
+4405=CStatusBarCtrl::OnChildNotify
+4406=CTabCtrl::OnChildNotify
+4407=CWnd::OnChildNotify
+4408=CPicturePropPage::OnClear
+4409=COleControl::OnClick
+4410=CEnumArray::OnClone
+4411=CAsyncSocket::OnClose
+4412=CControlFrameWnd::OnClose
+4413=CFrameWnd::OnClose
+4414=CMiniDockFrameWnd::OnClose
+4415=COleControl::OnClose
+4416=COleServerDoc::OnClose
+4417=CPropertySheet::OnClose
+4418=COleClientItem::XAdviseSink::OnClose
+4419=CDocObjectServer::OnCloseDocument
+4420=CDocument::OnCloseDocument
+4421=COleDocument::OnCloseDocument
+4422=COleLinkingDoc::OnCloseDocument
+4423=COleServerDoc::OnCloseDocument
+4424=CCmdTarget::OnCmdMsg
+4425=CDialog::OnCmdMsg
+4426=CDocument::OnCmdMsg
+4427=CFrameWnd::OnCmdMsg
+4428=CMDIFrameWnd::OnCmdMsg
+4429=COleCntrFrameWnd::OnCmdMsg
+4430=COleDocument::OnCmdMsg
+4431=CPropertySheet::OnCmdMsg
+4432=CView::OnCmdMsg
+4433=CRichEditView::OnColorDefault
+4434=CColorDialog::OnColorOK
+4435=CRichEditView::OnColorPick
+4436=CFrameWnd::OnCommand
+4437=CMDIFrameWnd::OnCommand
+4438=COlePropertyPage::OnCommand
+4439=CPropertySheet::OnCommand
+4440=CSplitterWnd::OnCommand
+4441=CWnd::OnCommand
+4442=CDialog::OnCommandHelp
+4443=CFrameWnd::OnCommandHelp
+4444=CMDIFrameWnd::OnCommandHelp
+4445=CPropertySheet::OnCommandHelp
+4446=CWnd::OnCompareItem
+4447=CAsyncSocket::OnConnect
+4448=CFrameWnd::OnContextHelp
+4449=COleFrameHook::OnContextHelp
+4450=COleIPFrameWnd::OnContextHelp
+4451=CWinApp::OnContextHelp
+4452=COleControlSite::XOleControlSite::OnControlInfoChanged
+4453=CCheckListBox::OnCreate
+4454=CControlBar::OnCreate
+4455=CEditView::OnCreate
+4456=CFormView::OnCreate
+4457=CFrameWnd::OnCreate
+4458=CMDIChildWnd::OnCreate
+4459=COleControl::OnCreate
+4460=COleIPFrameWnd::OnCreate
+4461=CPreviewView::OnCreate
+4462=CRichEditView::OnCreate
+4463=CToolBarCtrl::OnCreate
+4464=CView::OnCreate
+4465=CCmdTarget::OnCreateAggregates
+4466=COleControl::OnCreateAggregates
+4467=CFrameWnd::OnCreateClient
+4468=CMDIFrameWnd::OnCreateClient
+4469=COleIPFrameWnd::OnCreateControlBars
+4470=COleIPFrameWnd::OnCreateControlBars
+4471=CFrameWnd::OnCreateHelper
+4472=COleObjectFactory::OnCreateObject
+4473=COleTemplateServer::OnCreateObject
+4474=CColorDialog::OnCtlColor
+4475=CControlBar::OnCtlColor
+4476=CDialog::OnCtlColor
+4477=COlePropertyPage::OnCtlColor
+4478=CPropertyPage::OnCtlColor
+4479=CPropertySheet::OnCtlColor
+4480=CWnd::OnCtlColor
+4481=CAsyncMonikerFile::OnDataAvailable
+4482=CCachedDataPathProperty::OnDataAvailable
+4483=COleClientItem::OnDataChange
+4484=COleClientItem::XAdviseSink::OnDataChange
+4485=CDocManager::OnDDECommand
+4486=CWinApp::OnDDECommand
+4487=CFrameWnd::OnDDEExecute
+4488=CFrameWnd::OnDDEInitiate
+4489=CFrameWnd::OnDDETerminate
+4490=COleClientItem::OnDeactivate
+4491=COleServerDoc::OnDeactivate
+4492=COleClientItem::OnDeactivateAndUndo
+4493=COleClientItem::OnDeactivateUI
+4494=COleServerDoc::OnDeactivateUI
+4495=CRichEditCntrItem::OnDeactivateUI
+4496=CWnd::OnDeleteItem
+4497=CControlBar::OnDestroy
+4498=CEditView::OnDestroy
+4499=CFrameWnd::OnDestroy
+4500=CMDIChildWnd::OnDestroy
+4501=CMDIFrameWnd::OnDestroy
+4502=COleControl::OnDestroy
+4503=COleIPFrameWnd::OnDestroy
+4504=CRichEditView::OnDestroy
+4505=CTabCtrl::OnDestroy
+4506=CTreeCtrl::OnDestroy
+4507=CTreeView::OnDestroy
+4508=CView::OnDestroy
+4509=CRichEditView::OnDevModeChange
+4510=CWnd::OnDevModeChange
+4511=CToolTipCtrl::OnDisableModal
+4512=COleClientItem::OnDiscardUndoState
+4513=CSplitterWnd::OnDisplayChange
+4514=CWnd::OnDisplayChange
+4515=CPreviewView::OnDisplayPageNumber
+4516=COleFrameHook::OnDocActivate
+4517=COleServerDoc::OnDocWindowActivate
+4518=COleControl::XOleInPlaceActiveObject::OnDocWindowActivate
+4519=COleServerDoc::XOleInPlaceActiveObject::OnDocWindowActivate
+4520=CDocObjectServerItem::OnDoVerb
+4521=COleControl::OnDoVerb
+4522=COleServerItem::OnDoVerb
+4523=COleDropTarget::OnDragEnter
+4524=CView::OnDragEnter
+4525=COleDropTarget::OnDragLeave
+4526=CView::OnDragLeave
+4527=CWnd::OnDragList
+4528=COleDropTarget::OnDragOver
+4529=CView::OnDragOver
+4530=COleDropTarget::OnDragScroll
+4531=CView::OnDragScroll
+4532=CCtrlView::OnDraw
+4533=CFormView::OnDraw
+4534=COleControl::OnDraw
+4535=CPreviewView::OnDraw
+4536=CView::OnDraw
+4537=COleServerItem::OnDrawEx
+4538=CWnd::OnDrawItem
+4539=COleControl::OnDrawMetafile
+4540=CPageSetupDialog::OnDrawPage
+4541=CSplitterWnd::OnDrawSplitter
+4542=COleDropTarget::OnDrop
+4543=CView::OnDrop
+4544=COleDropTarget::OnDropEx
+4545=CView::OnDropEx
+4546=CFrameWnd::OnDropFiles
+4547=CRichEditView::OnDropFiles
+4548=COleControl::OnEdit
+4549=CEditView::OnEditChange
+4550=CFontPropPage::OnEditchangeFontstyles
+4551=COleDocument::OnEditChangeIcon
+4552=CEditView::OnEditClear
+4553=CRichEditView::OnEditClear
+4554=COleDocument::OnEditConvert
+4555=CEditView::OnEditCopy
+4556=CRichEditView::OnEditCopy
+4557=CEditView::OnEditCut
+4558=CRichEditView::OnEditCut
+4559=CEditView::OnEditFind
+4560=CRichEditView::OnEditFind
+4561=CEditView::OnEditFindReplace
+4562=CRichEditView::OnEditFindReplace
+4563=COleDocument::OnEditLinks
+4564=CEditView::OnEditPaste
+4565=CRichEditView::OnEditPaste
+4566=CRichEditView::OnEditPasteSpecial
+4567=CRichEditView::OnEditProperties
+4568=CColorPropPage::OnEditProperty
+4569=CFontPropPage::OnEditProperty
+4570=COlePropertyPage::OnEditProperty
+4571=CPicturePropPage::OnEditProperty
+4572=CStockPropPage::OnEditProperty
+4573=CEditView::OnEditRepeat
+4574=CRichEditView::OnEditRepeat
+4575=CEditView::OnEditReplace
+4576=CRichEditView::OnEditReplace
+4577=CEditView::OnEditSelectAll
+4578=CRichEditView::OnEditSelectAll
+4579=CEditView::OnEditUndo
+4580=CRichEditView::OnEditUndo
+4581=CFontPropPage::OnEditupdateFontnames
+4582=CFontPropPage::OnEditupdateFontsizes
+4583=CFrameWnd::OnEnable
+4584=COleControl::OnEnabledChanged
+4585=COleFrameHook::OnEnableModeless
+4586=CEditView::OnEndPrinting
+4587=CRichEditView::OnEndPrinting
+4588=CView::OnEndPrinting
+4589=CView::OnEndPrintPreview
+4590=CFrameWnd::OnEndSession
+4591=CFrameWnd::OnEnterIdle
+4592=COleControl::OnEnterIdle
+4593=CWnd::OnEnterIdle
+4594=COleControl::OnEnumVerbs
+4595=CFrameWnd::OnEraseBkgnd
+4596=COleResizeBar::OnEraseBkgnd
+4597=CPreviewView::OnEraseBkgnd
+4598=CToolBar::OnEraseBkgnd
+4599=CWnd::OnEraseBkgnd
+4600=CCmdTarget::OnEvent
+4601=COccManager::OnEvent
+4602=COleControlSite::OnEvent
+4603=COleControl::OnEventAdvise
+4604=CDocObjectServer::OnExecOleCmd
+4605=COleServerDoc::OnExecOleCmd
+4606=CDocument::OnFileClose
+4607=CFileDialog::OnFileNameChange
+4608=CFileDialog::OnFileNameOK
+4609=CDocManager::OnFileNew
+4610=CWinApp::OnFileNew
+4611=CDocManager::OnFileOpen
+4612=CWinApp::OnFileOpen
+4613=CView::OnFilePrint
+4614=CView::OnFilePrintPreview
+4615=CWinApp::OnFilePrintSetup
+4616=CDocument::OnFileSave
+4617=CDocument::OnFileSaveAs
+4618=COleServerDoc::OnFileSaveCopyAs
+4619=CDocument::OnFileSendMail
+4620=COleDocument::OnFileSendMail
+4621=COleServerDoc::OnFileUpdate
+4622=CCmdTarget::OnFinalRelease
+4623=CDocument::OnFinalRelease
+4624=COleControl::OnFinalRelease
+4625=COlePropertyPage::OnFinalRelease
+4626=COleServerItem::OnFinalRelease
+4627=CWnd::OnFinalRelease
+4628=COleLinkingDoc::OnFindEmbeddedItem
+4629=CEditView::OnFindNext
+4630=CRichEditView::OnFindNext
+4631=CEditView::OnFindReplaceCmd
+4632=CRichEditView::OnFindReplaceCmd
+4633=CMiniFrameWnd::OnFloatStatus
+4634=COleControlSite::XOleControlSite::OnFocus
+4635=CFileDialog::OnFolderChange
+4636=COleControl::OnFontChanged
+4637=COleControl::OnForeColorChanged
+4638=CRichEditView::OnFormatFont
+4639=COleControl::OnFrameClose
+4640=COleServerDoc::OnFrameWindowActivate
+4641=COleControl::XOleInPlaceActiveObject::OnFrameWindowActivate
+4642=COleServerDoc::XOleInPlaceActiveObject::OnFrameWindowActivate
+4643=COleControl::OnFreezeEvents
+4644=CCheckListBox::OnGetCheckPosition
+4645=COleClientItem::OnGetClipboardData
+4646=COleServerItem::OnGetClipboardData
+4647=COleClientItem::OnGetClipRect
+4648=COleControl::OnGetColorSet
+4649=COleControl::OnGetControlInfo
+4650=COleControl::OnGetDisplayString
+4651=COleControl::OnGetDlgCode
+4652=CRichEditDoc::OnGetEmbeddedItem
+4653=COleServerItem::OnGetExtent
+4654=COleControl::OnGetInPlaceMenu
+4655=COleClientItem::OnGetItemPosition
+4656=COleLinkingDoc::OnGetLinkedItem
+4657=COleServerDoc::OnGetLinkedItem
+4658=CMiniFrameWnd::OnGetMinMaxInfo
+4659=COleControl::OnGetNaturalExtent
+4660=COleControl::OnGetPredefinedStrings
+4661=COleControl::OnGetPredefinedValue
+4662=CMiniFrameWnd::OnGetText
+4663=CStatusBar::OnGetText
+4664=CMiniFrameWnd::OnGetTextLength
+4665=CStatusBar::OnGetTextLength
+4666=COleControl::OnGetViewExtent
+4667=COleControl::OnGetViewRect
+4668=COleControl::OnGetViewStatus
+4669=COleClientItem::OnGetWindowContext
+4670=CWnd::OnGrayCtlColor
+4671=CFrameWnd::OnHelp
+4672=COlePropertyPage::OnHelp
+4673=CWinApp::OnHelp
+4674=CWnd::OnHelp
+4675=CWinApp::OnHelpFinder
+4676=CWnd::OnHelpFinder
+4677=CControlBar::OnHelpHitTest
+4678=CDialog::OnHelpHitTest
+4679=CFrameWnd::OnHelpHitTest
+4680=CWinApp::OnHelpIndex
+4681=CWnd::OnHelpIndex
+4682=CCommonDialog::OnHelpInfo
+4683=CWnd::OnHelpInfo
+4684=CWinApp::OnHelpUsing
+4685=CWnd::OnHelpUsing
+4686=CDocObjectServerItem::OnHide
+4687=COleControl::OnHide
+4688=COleServerItem::OnHide
+4689=COleControl::OnHideToolBars
+4690=CFrameWnd::OnHScroll
+4691=CPreviewView::OnHScroll
+4692=CScrollView::OnHScroll
+4693=CSplitterWnd::OnHScroll
+4694=CWnd::OnHScroll
+4695=CDocTemplate::OnIdle
+4696=CDocument::OnIdle
+4697=COleDocument::OnIdle
+4698=CWinApp::OnIdle
+4699=CWinThread::OnIdle
+4700=CControlBar::OnIdleUpdateCmdUI
+4701=CFrameWnd::OnIdleUpdateCmdUI
+4702=CMDIFrameWnd::OnIdleUpdateCmdUI
+4703=COleCntrFrameWnd::OnIdleUpdateCmdUI
+4704=COleIPFrameWnd::OnIdleUpdateCmdUI
+4705=COleControl::OnInactiveMouseMove
+4706=COleControl::XPointerInactive::OnInactiveMouseMove
+4707=COleControl::OnInactiveSetCursor
+4708=COleControl::XPointerInactive::OnInactiveSetCursor
+4709=CColorPropPage::OnInitDialog
+4710=CDialog::OnInitDialog
+4711=CFontPropPage::OnInitDialog
+4712=COlePropertiesDialog::OnInitDialog
+4713=COlePropertyPage::OnInitDialog
+4714=CPicturePropPage::OnInitDialog
+4715=CPropertySheet::OnInitDialog
+4716=CFileDialog::OnInitDone
+4717=COleServerItem::OnInitFromData
+4718=CControlBar::OnInitialUpdate
+4719=CDaoRecordView::OnInitialUpdate
+4720=CFormView::OnInitialUpdate
+4721=CRecordView::OnInitialUpdate
+4722=CRichEditView::OnInitialUpdate
+4723=CView::OnInitialUpdate
+4724=CFrameWnd::OnInitMenuPopup
+4725=COleControl::OnInitMenuPopup
+4726=COleClientItem::XOleIPSite::OnInPlaceActivate
+4727=COleControlSite::XOleIPSite::OnInPlaceActivate
+4728=COleClientItem::XOleIPSite::OnInPlaceDeactivate
+4729=COleControlSite::XOleIPSite::OnInPlaceDeactivate
+4730=COleClientItem::OnInsertMenus
+4731=CRichEditView::OnInsertObject
+4732=CSplitterWnd::OnInvertTracker
+4733=CDockContext::OnKey
+4734=CCheckListBox::OnKeyDown
+4735=COleControl::OnKeyDown
+4736=CRichEditView::OnKeyDown
+4737=CSplitterWnd::OnKeyDown
+4738=COleControl::OnKeyDownEvent
+4739=COleControl::OnKeyPressEvent
+4740=COleControl::OnKeyUp
+4741=COleControl::OnKeyUpEvent
+4742=CPropertyPage::OnKillActive
+4743=COleControl::OnKillFocus
+4744=CCheckListBox::OnLBAddString
+4745=CCheckListBox::OnLBFindString
+4746=CCheckListBox::OnLBFindStringExact
+4747=CCheckListBox::OnLBGetItemData
+4748=CCheckListBox::OnLBGetText
+4749=CCheckListBox::OnLBInsertString
+4750=CFileDialog::OnLBSelChangedNotify
+4751=CCheckListBox::OnLBSelectString
+4752=CCheckListBox::OnLBSetItemData
+4753=CCheckListBox::OnLBSetItemHeight
+4754=CCheckListBox::OnLButtonDblClk
+4755=CControlBar::OnLButtonDblClk
+4756=COleControl::OnLButtonDblClk
+4757=CSplitterWnd::OnLButtonDblClk
+4758=CCheckListBox::OnLButtonDown
+4759=CControlBar::OnLButtonDown
+4760=COleControl::OnLButtonDown
+4761=COleResizeBar::OnLButtonDown
+4762=CPreviewView::OnLButtonDown
+4763=CSplitterWnd::OnLButtonDown
+4764=CMiniFrameWnd::OnLButtonUp
+4765=COleControl::OnLButtonUp
+4766=CSplitterWnd::OnLButtonUp
+4767=CAsyncMonikerFile::OnLowResource
+4768=COleControl::OnMapPropertyToPage
+4769=COleControl::OnMButtonDblClk
+4770=COleControl::OnMButtonDown
+4771=COleControl::OnMButtonUp
+4772=CMDIChildWnd::OnMDIActivate
+4773=CMDIFrameWnd::OnMDIWindowCmd
+4774=CWnd::OnMeasureItem
+4775=CMDIFrameWnd::OnMenuChar
+4776=CFrameWnd::OnMenuSelect
+4777=COleControl::OnMenuSelect
+4778=COleMessageFilter::OnMessagePending
+4779=CSocket::OnMessagePending
+4780=COleControl::OnMnemonic
+4781=COleControl::XOleControl::OnMnemonic
+4782=CControlBar::OnMouseActivate
+4783=CMDIChildWnd::OnMouseActivate
+4784=CMiniDockFrameWnd::OnMouseActivate
+4785=COleControl::OnMouseActivate
+4786=CView::OnMouseActivate
+4787=CMiniFrameWnd::OnMouseMove
+4788=COleControl::OnMouseMove
+4789=CSplitterWnd::OnMouseMove
+4790=CDaoRecordView::OnMove
+4791=COleControl::OnMove
+4792=CRecordView::OnMove
+4793=CFrameWnd::OnNcActivate
+4794=CMDIChildWnd::OnNcActivate
+4795=CMiniFrameWnd::OnNcActivate
+4796=CDockBar::OnNcCalcSize
+4797=CMiniFrameWnd::OnNcCalcSize
+4798=COleControl::OnNcCalcSize
+4799=CStatusBar::OnNcCalcSize
+4800=CToolBar::OnNcCalcSize
+4801=CMDIChildWnd::OnNcCreate
+4802=CMiniFrameWnd::OnNcCreate
+4803=COleControl::OnNcCreate
+4804=CPropertySheet::OnNcCreate
+4805=CSplitterWnd::OnNcCreate
+4806=CToolBar::OnNcCreate
+4807=CListCtrl::OnNcDestroy
+4808=CListView::OnNcDestroy
+4809=CWnd::OnNcDestroy
+4810=CMiniFrameWnd::OnNcHitTest
+4811=COleControl::OnNcHitTest
+4812=CStatusBar::OnNcHitTest
+4813=CToolBar::OnNcHitTest
+4814=CMiniDockFrameWnd::OnNcLButtonDblClk
+4815=CMiniDockFrameWnd::OnNcLButtonDown
+4816=CMiniFrameWnd::OnNcLButtonDown
+4817=COleControl::OnNcLButtonDown
+4818=CDockBar::OnNcPaint
+4819=CMiniFrameWnd::OnNcPaint
+4820=COleControl::OnNcPaint
+4821=CStatusBar::OnNcPaint
+4822=CToolBar::OnNcPaint
+4823=CDocument::OnNewDocument
+4824=COleDocument::OnNewDocument
+4825=COleLinkingDoc::OnNewDocument
+4826=COleServerDoc::OnNewEmbedding
+4827=CEnumArray::OnNext
+4828=CEnumConnPoints::OnNext
+4829=CEnumFormatEtc::OnNext
+4830=CEnumOleVerb::OnNext
+4831=CEnumUnknown::OnNext
+4832=CPreviewView::OnNextPage
+4833=CView::OnNextPaneCmd
+4834=CFileDialog::OnNotify
+4835=CPropertyPage::OnNotify
+4836=CSplitterWnd::OnNotify
+4837=CWnd::OnNotify
+4838=COleMessageFilter::OnNotRespondingDialog
+4839=CWnd::OnNTCtlColor
+4840=CPreviewView::OnNumPageChange
+4841=CColorPropPage::OnObjectsChanged
+4842=CFontPropPage::OnObjectsChanged
+4843=COlePropertyPage::OnObjectsChanged
+4844=CPicturePropPage::OnObjectsChanged
+4845=COleControl::OnOcmCtlColorBtn
+4846=COleControl::OnOcmCtlColorDlg
+4847=COleControl::OnOcmCtlColorEdit
+4848=COleControl::OnOcmCtlColorListBox
+4849=COleControl::OnOcmCtlColorMsgBox
+4850=COleControl::OnOcmCtlColorScrollBar
+4851=COleControl::OnOcmCtlColorStatic
+4852=CCommonDialog::OnOK
+4853=CDialog::OnOK
+4854=CPropertyPage::OnOK
+4855=CDocObjectServerItem::OnOpen
+4856=COleControl::OnOpen
+4857=COleServerItem::OnOpen
+4858=CDocument::OnOpenDocument
+4859=COleDocument::OnOpenDocument
+4860=COleLinkingDoc::OnOpenDocument
+4861=COleServerDoc::OnOpenEmbedding
+4862=CWinApp::OnOpenRecentFile
+4863=CAsyncSocket::OnOutOfBandData
+4864=CControlBar::OnPaint
+4865=CCtrlView::OnPaint
+4866=CDockBar::OnPaint
+4867=CFontPropPage::OnPaint
+4868=COleControl::OnPaint
+4869=COleResizeBar::OnPaint
+4870=CPicturePropPage::OnPaint
+4871=CSplitterWnd::OnPaint
+4872=CStatusBar::OnPaint
+4873=CToolBar::OnPaint
+4874=CView::OnPaint
+4875=CFrameWnd::OnPaletteChanged
+4876=COleFrameHook::OnPaletteChanged
+4877=CRichEditView::OnParaAlign
+4878=CRichEditView::OnParaCenter
+4879=CRichEditView::OnParaLeft
+4880=CRichEditView::OnParaRight
+4881=CWnd::OnParentNotify
+4882=CRichEditView::OnPasteNativeObject
+4883=CFrameWnd::OnPopMessageString
+4884=COleClientItem::XOleIPSite::OnPosRectChange
+4885=COleControlSite::XOleIPSite::OnPosRectChange
+4886=CEditView::OnPrepareDC
+4887=CPreviewView::OnPrepareDC
+4888=CRichEditView::OnPrepareDC
+4889=CScrollView::OnPrepareDC
+4890=CView::OnPrepareDC
+4891=CEditView::OnPreparePrinting
+4892=CView::OnPreparePrinting
+4893=COleFrameHook::OnPreTranslateMessage
+4894=CPreviewView::OnPreviewClose
+4895=CPreviewView::OnPreviewPrint
+4896=CPreviewView::OnPrevPage
+4897=CEditView::OnPrint
+4898=CRichEditView::OnPrint
+4899=CView::OnPrint
+4900=CRichEditView::OnPrinterChanged
+4901=CPrintDialog::OnPrintSetup
+4902=CAsyncMonikerFile::OnProgress
+4903=COleControl::OnProperties
+4904=CWnd::OnQuery3dControls
+4905=CPropertyPage::OnQueryCancel
+4906=CMiniFrameWnd::OnQueryCenterWnd
+4907=CFrameWnd::OnQueryEndSession
+4908=COleControl::OnQueryHitPoint
+4909=COleControl::OnQueryHitRect
+4910=CFrameWnd::OnQueryNewPalette
+4911=COleFrameHook::OnQueryNewPalette
+4912=COleServerItem::OnQueryUpdateItems
+4913=COleControl::OnRButtonDblClk
+4914=COleControl::OnRButtonDown
+4915=COleControl::OnRButtonUp
+4916=COleServerDoc::OnReactivateAndUndo
+4917=COleFrameHook::OnRecalcLayout
+4918=COleIPFrameWnd::OnRecalcParent
+4919=CAsyncSocket::OnReceive
+4920=COleControl::OnReflectorDestroyed
+4921=COleClientItem::OnRemoveMenus
+4922=COleClientItem::XAdviseSink::OnRename
+4923=COleControl::CControlDataSource::OnRenderData
+4924=COleServerItem::CItemDataSource::OnRenderData
+4925=COleControl::OnRenderData
+4926=COleDataSource::OnRenderData
+4927=COleServerItem::OnRenderData
+4928=COleControl::CControlDataSource::OnRenderFileData
+4929=COleServerItem::CItemDataSource::OnRenderFileData
+4930=COleControl::OnRenderFileData
+4931=COleDataSource::OnRenderFileData
+4932=COleServerItem::OnRenderFileData
+4933=COleControl::CControlDataSource::OnRenderGlobalData
+4934=COleServerItem::CItemDataSource::OnRenderGlobalData
+4935=COleControl::OnRenderGlobalData
+4936=COleDataSource::OnRenderGlobalData
+4937=COleServerItem::OnRenderGlobalData
+4938=CEditView::OnReplaceAll
+4939=CRichEditView::OnReplaceAll
+4940=CEditView::OnReplaceSel
+4941=CRichEditView::OnReplaceSel
+4942=COleControl::XFontNotification::OnRequestEdit
+4943=COleControlSite::XPropertyNotifySink::OnRequestEdit
+4944=COlePropertyPage::XPropNotifySink::OnRequestEdit
+4945=COleDocIPFrameWnd::OnRequestPositionChange
+4946=COleIPFrameWnd::OnRequestPositionChange
+4947=CEnumArray::OnReset
+4948=CPropertyPage::OnReset
+4949=COleControl::OnResetState
+4950=COleServerDoc::OnResizeBorder
+4951=COleIPFrameWnd::OnResizeChild
+4952=COleClientItem::XAdviseSink::OnSave
+4953=CDocument::OnSaveDocument
+4954=COleDocument::OnSaveDocument
+4955=COleLinkingDoc::OnSaveDocument
+4956=COleServerDoc::OnSaveDocument
+4957=COleServerDoc::OnSaveEmbedding
+4958=COleServerItem::OnSaveEmbedding
+4959=CDocObjectServer::OnSaveViewState
+4960=CScrollView::OnScroll
+4961=CView::OnScroll
+4962=COleClientItem::OnScrollBy
+4963=CScrollView::OnScrollBy
+4964=CView::OnScrollBy
+4965=CRichEditView::OnSelChange
+4966=CColorPropPage::OnSelchangeColorprop
+4967=CFontPropPage::OnSelchangeFontnames
+4968=CFontPropPage::OnSelchangeFontprop
+4969=CFontPropPage::OnSelchangeFontsizes
+4970=CFontPropPage::OnSelchangeFontstyles
+4971=CPicturePropPage::OnSelchangePictProp
+4972=CStockPropPage::OnSelchangePropname
+4973=CColorPropPage::OnSelchangeSystemcolors
+4974=CColorPropPage::OnSelect
+4975=CAsyncSocket::OnSend
+4976=CPropertyPage::OnSetActive
+4977=CToolBar::OnSetBitmapSize
+4978=CToolBar::OnSetButtonSize
+4979=COleControl::OnSetClientSite
+4980=COleServerItem::OnSetColorScheme
+4981=CFrameWnd::OnSetCursor
+4982=COleControl::OnSetCursor
+4983=COleResizeBar::OnSetCursor
+4984=CPreviewView::OnSetCursor
+4985=CSplitterWnd::OnSetCursor
+4986=COleControl::CControlDataSource::OnSetData
+4987=COleServerItem::CItemDataSource::OnSetData
+4988=COleControl::OnSetData
+4989=COleDataSource::OnSetData
+4990=COleServerItem::OnSetData
+4991=CPropertySheet::OnSetDefID
+4992=COleControl::OnSetExtent
+4993=COleServerItem::OnSetExtent
+4994=CFormView::OnSetFocus
+4995=CFrameWnd::OnSetFocus
+4996=COleControl::OnSetFocus
+4997=CCheckListBox::OnSetFont
+4998=CDialog::OnSetFont
+4999=CEditView::OnSetFont
+5000=COleServerDoc::OnSetHostNames
+5001=CDocObjectServer::OnSetItemRects
+5002=COleServerDoc::OnSetItemRects
+5003=COleClientItem::OnSetMenu
+5004=CFrameWnd::OnSetMessageString
+5005=COleControl::OnSetMessageString
+5006=COleIPFrameWnd::OnSetMessageString
+5007=CStatusBar::OnSetMinHeight
+5008=COleControl::OnSetObjectRects
+5009=CDatabase::OnSetOptions
+5010=CRecordset::OnSetOptions
+5011=COlePropertyPage::OnSetPageSite
+5012=CFrameWnd::OnSetPreviewMode
+5013=CMiniFrameWnd::OnSetText
+5014=COleControl::OnSetText
+5015=CStatusBar::OnSetText
+5016=CFileDialog::OnShareViolation
+5017=CDocObjectServerItem::OnShow
+5018=COleServerItem::OnShow
+5019=COleClientItem::OnShowControlBars
+5020=COleServerDoc::OnShowControlBars
+5021=COleServerDoc::OnShowDocument
+5022=COleClientItem::OnShowItem
+5023=COleControl::OnShowToolBars
+5024=COleDocument::OnShowViews
+5025=COleLinkingDoc::OnShowViews
+5026=COleControl::OnShowWindow
+5027=CWnd::OnShowWindow
+5028=COleClientItem::XOleClientSite::OnShowWindow
+5029=COleControlSite::XOleClientSite::OnShowWindow
+5030=CFrameWnd::OnSize
+5031=CMDIChildWnd::OnSize
+5032=CMDIFrameWnd::OnSize
+5033=COleControl::OnSize
+5034=COleIPFrameWnd::OnSize
+5035=COleResizeBar::OnSize
+5036=CPreviewView::OnSize
+5037=CScrollView::OnSize
+5038=CSplitterWnd::OnSize
+5039=CStatusBar::OnSize
+5040=CWnd::OnSize
+5041=CControlBar::OnSizeParent
+5042=CDockBar::OnSizeParent
+5043=COleResizeBar::OnSizeParent
+5044=CEnumArray::OnSkip
+5045=CSocketWnd::OnSocketDead
+5046=CSocketWnd::OnSocketNotify
+5047=CView::OnSplitCmd
+5048=CAsyncMonikerFile::OnStartBinding
+5049=CInternetSession::OnStatusCallback
+5050=CAsyncMonikerFile::OnStopBinding
+5051=CFontPropPage::OnStrikeout
+5052=CToolBar::OnSysColorChange
+5053=CWnd::OnSysColorChange
+5054=CFrameWnd::OnSysCommand
+5055=CMiniFrameWnd::OnSysCommand
+5056=CPropertySheet::OnSysCommand
+5057=CSplitterWnd::OnSysCommand
+5058=COleControl::OnSysKeyDown
+5059=COleControl::OnSysKeyUp
+5060=COleControl::OnTextChanged
+5061=CEditView::OnTextNotFound
+5062=CRichEditView::OnTextNotFound
+5063=CControlBar::OnTimer
+5064=CToolBar::OnToolHitTest
+5065=CWnd::OnToolHitTest
+5066=CFrameWnd::OnToolTipText
+5067=CFileDialog::OnTypeChange
+5068=COleControlContainer::OnUIActivate
+5069=COleClientItem::XOleIPSite::OnUIActivate
+5070=COleControlSite::XOleIPSite::OnUIActivate
+5071=COleControlContainer::OnUIDeactivate
+5072=COleClientItem::XOleIPSite::OnUIDeactivate
+5073=COleControlSite::XOleIPSite::OnUIDeactivate
+5074=CFontPropPage::OnUnderline
+5075=COleServerItem::OnUpdate
+5076=CView::OnUpdate
+5077=CRichEditView::OnUpdateBullet
+5078=CRichEditView::OnUpdateCharBold
+5079=CRichEditView::OnUpdateCharEffect
+5080=CRichEditView::OnUpdateCharItalic
+5081=CRichEditView::OnUpdateCharUnderline
+5082=CDialogBar::OnUpdateCmdUI
+5083=CDockBar::OnUpdateCmdUI
+5084=COleResizeBar::OnUpdateCmdUI
+5085=CStatusBar::OnUpdateCmdUI
+5086=CToolBar::OnUpdateCmdUI
+5087=CFrameWnd::OnUpdateContextHelp
+5088=CFrameWnd::OnUpdateControlBarMenu
+5089=COleIPFrameWnd::OnUpdateControlBarMenu
+5090=COleServerDoc::OnUpdateDocument
+5091=COleDocument::OnUpdateEditChangeIcon
+5092=COleDocument::OnUpdateEditLinksMenu
+5093=CRichEditView::OnUpdateEditPasteSpecial
+5094=CRichEditView::OnUpdateEditProperties
+5095=CEditView::OnUpdateEditUndo
+5096=CRichEditView::OnUpdateEditUndo
+5097=COleServerDoc::OnUpdateFileExit
+5098=CDocument::OnUpdateFileSendMail
+5099=COleServerDoc::OnUpdateFileUpdate
+5100=CFrameWnd::OnUpdateFrameMenu
+5101=CMDIChildWnd::OnUpdateFrameMenu
+5102=CMDIFrameWnd::OnUpdateFrameMenu
+5103=CFrameWnd::OnUpdateFrameTitle
+5104=CMDIChildWnd::OnUpdateFrameTitle
+5105=CMDIFrameWnd::OnUpdateFrameTitle
+5106=COleClientItem::OnUpdateFrameTitle
+5107=COleFrameHook::OnUpdateFrameTitle
+5108=COleServerItem::OnUpdateItems
+5109=CFrameWnd::OnUpdateKeyIndicator
+5110=CMDIFrameWnd::OnUpdateMDIWindowCmd
+5111=CEditView::OnUpdateNeedClip
+5112=CRichEditView::OnUpdateNeedClip
+5113=CEditView::OnUpdateNeedFind
+5114=CRichEditView::OnUpdateNeedFind
+5115=CEditView::OnUpdateNeedSel
+5116=CRichEditView::OnUpdateNeedSel
+5117=CEditView::OnUpdateNeedText
+5118=CRichEditView::OnUpdateNeedText
+5119=CPreviewView::OnUpdateNextPage
+5120=CView::OnUpdateNextPaneMenu
+5121=CPreviewView::OnUpdateNumPageChange
+5122=COleDocument::OnUpdateObjectVerbMenu
+5123=CRichEditView::OnUpdateParaAlign
+5124=CRichEditView::OnUpdateParaCenter
+5125=CRichEditView::OnUpdateParaLeft
+5126=CRichEditView::OnUpdateParaRight
+5127=COleDocument::OnUpdatePasteLinkMenu
+5128=COleDocument::OnUpdatePasteMenu
+5129=CPreviewView::OnUpdatePrevPage
+5130=CWinApp::OnUpdateRecentFileMenu
+5131=CDaoRecordView::OnUpdateRecordFirst
+5132=CRecordView::OnUpdateRecordFirst
+5133=CDaoRecordView::OnUpdateRecordLast
+5134=CRecordView::OnUpdateRecordLast
+5135=CDaoRecordView::OnUpdateRecordNext
+5136=CRecordView::OnUpdateRecordNext
+5137=CDaoRecordView::OnUpdateRecordPrev
+5138=CRecordView::OnUpdateRecordPrev
+5139=CView::OnUpdateSplitCmd
+5140=CPreviewView::OnUpdateZoomIn
+5141=CPreviewView::OnUpdateZoomOut
+5142=COleClientItem::XAdviseSink::OnViewChange
+5143=CWnd::OnVKeyToItem
+5144=CFrameWnd::OnVScroll
+5145=CPreviewView::OnVScroll
+5146=CScrollView::OnVScroll
+5147=CSplitterWnd::OnVScroll
+5148=CWnd::OnVScroll
+5149=CToolTipCtrl::OnWindowFromPoint
+5150=COleControl::OnWindowlessMessage
+5151=COleControl::XOleInPlaceObject::OnWindowMessage
+5152=CMDIFrameWnd::OnWindowNew
+5153=CControlBar::OnWindowPosChanging
+5154=CDockBar::OnWindowPosChanging
+5155=CMDIChildWnd::OnWindowPosChanging
+5156=COleIPFrameWnd::OnWindowPosChanging
+5157=CStatusBar::OnWindowPosChanging
+5158=CToolBar::OnWindowPosChanging
+5159=CWnd::OnWinIniChange
+5160=CPropertyPage::OnWizardBack
+5161=CPropertyPage::OnWizardFinish
+5162=CPropertyPage::OnWizardNext
+5163=CWnd::OnWndMsg
+5164=CPreviewView::OnZoomIn
+5165=CPreviewView::OnZoomOut
+5166=CAsyncMonikerFile::Open
+5167=CAsyncMonikerFile::Open
+5168=CAsyncMonikerFile::Open
+5169=CAsyncMonikerFile::Open
+5170=CAsyncMonikerFile::Open
+5171=CAsyncMonikerFile::Open
+5172=CAsyncMonikerFile::Open
+5173=CAsyncMonikerFile::Open
+5174=CDaoDatabase::Open
+5175=CDaoQueryDef::Open
+5176=CDaoRecordset::Open
+5177=CDaoRecordset::Open
+5178=CDaoRecordset::Open
+5179=CDaoTableDef::Open
+5180=CDaoWorkspace::Open
+5181=CDatabase::Open
+5182=CDataPathProperty::Open
+5183=CDataPathProperty::Open
+5184=CDataPathProperty::Open
+5185=CDataPathProperty::Open
+5186=CFile::Open
+5187=CMirrorFile::Open
+5188=CMonikerFile::Open
+5189=CMonikerFile::Open
+5190=CMonikerFile::Open
+5191=CMonikerFile::Open
+5192=CRecordset::Open
+5193=CSocketFile::Open
+5194=CStdioFile::Open
+5195=CDocObjectServer::XOleDocumentView::Open
+5196=CDocManager::OpenDocumentFile
+5197=CMultiDocTemplate::OpenDocumentFile
+5198=CSingleDocTemplate::OpenDocumentFile
+5199=CWinApp::OpenDocumentFile
+5200=CDatabase::OpenEx
+5201=CFtpConnection::OpenFile
+5202=CGopherConnection::OpenFile
+5203=COleUILinkInfo::OpenLinkSource
+5204=CHttpConnection::OpenRequest
+5205=CHttpConnection::OpenRequest
+5206=COleStreamFile::OpenStream
+5207=CInternetSession::OpenURL
+5208=CFileException::OsErrorToException
+5209=CDumpContext::OutputString
+5210=CEditView::PaginateTo
+5211=CRichEditView::PaginateTo
+5212=CPageSetupDialog::PaintHookProc
+5213=COleControl::ParentToClient
+5214=CWinApp::ParseCommandLine
+5215=COleCurrency::ParseCurrency
+5216=COleDateTime::ParseDateTime
+5217=COleControlContainer::XOleContainer::ParseDisplayName
+5218=COleLinkingDoc::XOleItemContainer::ParseDisplayName
+5219=CCommandLineInfo::ParseLast
+5220=CCommandLineInfo::ParseParam
+5221=CCommandLineInfo::ParseParamFlag
+5222=CCommandLineInfo::ParseParamNotFlag
+5223=CRichEditCtrl::PasteSpecial
+5224=CDC::PlayMetaFile
+5225=CDC::PolyBezierTo
+5226=CDC::PolyDraw
+5227=CDC::PolylineTo
+5228=CPreviewView::PositionPage
+5229=CAsyncMonikerFile::PostBindToStream
+5230=CMonikerFile::PostBindToStream
+5231=COccManager::PostCreateDialog
+5232=CDialog::PostModal
+5233=COleControl::PostModalDialog
+5234=CControlBar::PostNcDestroy
+5235=CControlFrameWnd::PostNcDestroy
+5236=CFindReplaceDialog::PostNcDestroy
+5237=CFrameWnd::PostNcDestroy
+5238=COleCntrFrameWnd::PostNcDestroy
+5239=CReflectorWnd::PostNcDestroy
+5240=CView::PostNcDestroy
+5241=CWnd::PostNcDestroy
+5242=CRecordset::PreBindFields
+5243=CDocument::PreCloseFrame
+5244=COleDocument::PreCloseFrame
+5245=CRichEditDoc::PreCloseFrame
+5246=CCheckListBox::PreCompareItem
+5247=COccManager::PreCreateDialog
+5248=CControlBar::PreCreateWindow
+5249=CControlFrameWnd::PreCreateWindow
+5250=CCtrlView::PreCreateWindow
+5251=CEditView::PreCreateWindow
+5252=CFrameWnd::PreCreateWindow
+5253=CListView::PreCreateWindow
+5254=CMDIChildWnd::PreCreateWindow
+5255=CMDIFrameWnd::PreCreateWindow
+5256=CMiniFrameWnd::PreCreateWindow
+5257=CRichEditView::PreCreateWindow
+5258=CStatusBar::PreCreateWindow
+5259=CTreeView::PreCreateWindow
+5260=CView::PreCreateWindow
+5261=CWnd::PreCreateWindow
+5262=CCheckListBox::PreDeleteItem
+5263=CCheckListBox::PreDrawItem
+5264=CPageSetupDialog::PreDrawPage
+5265=CDialog::PreInitDialog
+5266=COleChangeSourceDialog::PreInitDialog
+5267=CCheckListBox::PreMeasureItem
+5268=CDialog::PreModal
+5269=COleControl::PreModalDialog
+5270=CRecordset::PrepareAndExecute
+5271=CDataExchange::PrepareCtrl
+5272=CDataExchange::PrepareEditCtrl
+5273=CDataExchange::PrepareOleCtrl
+5274=CRecordset::PrepareUpdateHstmt
+5275=CPropertyPage::PreProcessPageTemplate
+5276=CDragListBox::PreSubclassWindow
+5277=CWnd::PreSubclassWindow
+5278=CWnd::PreTranslateInput
+5279=CControlBar::PreTranslateMessage
+5280=CDialog::PreTranslateMessage
+5281=CFormView::PreTranslateMessage
+5282=CFrameWnd::PreTranslateMessage
+5283=CMDIChildWnd::PreTranslateMessage
+5284=CMDIFrameWnd::PreTranslateMessage
+5285=COleIPFrameWnd::PreTranslateMessage
+5286=COlePropertyPage::PreTranslateMessage
+5287=CPropertyPage::PreTranslateMessage
+5288=CPropertySheet::PreTranslateMessage
+5289=CWinThread::PreTranslateMessage
+5290=CWnd::PreTranslateMessage
+5291=CDocObjectServer::XPrint::Print
+5292=CPreviewDC::PrinterDPtoScreenDP
+5293=CEditView::PrintInsideRect
+5294=CRichEditView::PrintInsideRect
+5295=CRichEditView::PrintPage
+5296=COleDispatchException::Process
+5297=COleException::Process
+5298=CSocket::ProcessAuxQueue
+5299=CFrameWnd::ProcessHelpMsg
+5300=CWinThread::ProcessMessageFilter
+5301=CWinApp::ProcessShellCommand
+5302=CWinApp::ProcessWndProcException
+5303=CWinThread::ProcessWndProcException
+5304=COleSafeArray::PtrOfIndex
+5305=CDC::PtVisible
+5306=CMetaFileDC::PtVisible
+5307=CWinThread::PumpMessage
+5308=CSocket::PumpMessages
+5309=CCmdTarget::PushStackArgs
+5310=COleSafeArray::PutElement
+5311=CFtpConnection::PutFile
+5312=PX_Blob
+5313=PX_Bool
+5314=PX_Bool
+5315=PX_Color
+5316=PX_Color
+5317=PX_Currency
+5318=PX_Currency
+5319=PX_DataPath
+5320=PX_DataPath
+5321=PX_Double
+5322=PX_Double
+5323=PX_Float
+5324=PX_Float
+5325=PX_Font
+5326=PX_IUnknown
+5327=PX_Long
+5328=PX_Long
+5329=PX_Picture
+5330=PX_Picture
+5331=PX_Short
+5332=PX_Short
+5333=PX_String
+5334=PX_String
+5335=PX_String
+5336=PX_ULong
+5337=PX_ULong
+5338=PX_UShort
+5339=PX_UShort
+5340=PX_VBXFontConvert
+5341=CRichEditView::QueryAcceptData
+5342=CRichEditView::XRichEditOleCallback::QueryAcceptData
+5343=CCmdTarget::QueryAggregates
+5344=COleDropSource::QueryContinueDrag
+5345=COleDropSource::XDropSource::QueryContinueDrag
+5346=COleControl::QueryDefHandler
+5347=COleControl::XDataObject::QueryGetData
+5348=COleDataSource::XDataObject::QueryGetData
+5349=COleServerDoc::XDataObject::QueryGetData
+5350=COleServerItem::XDataObject::QueryGetData
+5351=COleControl::XViewObject::QueryHitPoint
+5352=COleControl::XViewObject::QueryHitRect
+5353=CHttpFile::QueryInfo
+5354=CHttpFile::QueryInfo
+5355=CHttpFile::QueryInfo
+5356=CHttpFile::QueryInfoStatusCode
+5357=CRichEditView::XRichEditOleCallback::QueryInsertObject
+5358=_CIP<IBindHost&_GUIDconstIID_IBindHost>::QueryInterface
+5359=CArchiveStream::QueryInterface
+5360=CBlobProperty::QueryInterface
+5361=CInnerUnknown::QueryInterface
+5362=COleConnPtContainer::QueryInterface
+5363=COleDispatchImpl::QueryInterface
+5364=COleUILinkInfo::QueryInterface
+5365=COleClientItem::XAdviseSink::QueryInterface
+5366=COleControlSite::XAmbientProps::QueryInterface
+5367=COleControlSite::XBoundObjectSite::QueryInterface
+5368=COleObjectFactory::XClassFactory::QueryInterface
+5369=CConnectionPoint::XConnPt::QueryInterface
+5370=COleControl::XDataObject::QueryInterface
+5371=COleDataSource::XDataObject::QueryInterface
+5372=COleServerDoc::XDataObject::QueryInterface
+5373=COleServerItem::XDataObject::QueryInterface
+5374=COleDropSource::XDropSource::QueryInterface
+5375=COleDropTarget::XDropTarget::QueryInterface
+5376=CEnumArray::XEnumVOID::QueryInterface
+5377=COleControlSite::XEventSink::QueryInterface
+5378=COleControl::XFontNotification::QueryInterface
+5379=COleMessageFilter::XMessageFilter::QueryInterface
+5380=COleControlSite::XNotifyDBEvents::QueryInterface
+5381=COleControl::XOleCache::QueryInterface
+5382=COleClientItem::XOleClientSite::QueryInterface
+5383=COleControlSite::XOleClientSite::QueryInterface
+5384=CDocObjectServer::XOleCommandTarget::QueryInterface
+5385=COleControlContainer::XOleContainer::QueryInterface
+5386=COleControl::XOleControl::QueryInterface
+5387=COleControlSite::XOleControlSite::QueryInterface
+5388=CDocObjectServer::XOleDocument::QueryInterface
+5389=CDocObjectServer::XOleDocumentView::QueryInterface
+5390=COleControl::XOleInPlaceActiveObject::QueryInterface
+5391=COleServerDoc::XOleInPlaceActiveObject::QueryInterface
+5392=COleFrameHook::XOleInPlaceFrame::QueryInterface
+5393=COleControl::XOleInPlaceObject::QueryInterface
+5394=COleServerDoc::XOleInPlaceObject::QueryInterface
+5395=COleControlContainer::XOleIPFrame::QueryInterface
+5396=COleClientItem::XOleIPSite::QueryInterface
+5397=COleControlSite::XOleIPSite::QueryInterface
+5398=COleLinkingDoc::XOleItemContainer::QueryInterface
+5399=CDocObjectServer::XOleObject::QueryInterface
+5400=COleControl::XOleObject::QueryInterface
+5401=COleServerDoc::XOleObject::QueryInterface
+5402=COleServerItem::XOleObject::QueryInterface
+5403=COlePropertiesDialog::XOleUIObjInfo::QueryInterface
+5404=COleControl::XPerPropertyBrowsing::QueryInterface
+5405=COleLinkingDoc::XPersistFile::QueryInterface
+5406=COleControl::XPersistMemory::QueryInterface
+5407=COleControl::XPersistPropertyBag::QueryInterface
+5408=COleControl::XPersistStorage::QueryInterface
+5409=COleServerDoc::XPersistStorage::QueryInterface
+5410=COleControl::XPersistStreamInit::QueryInterface
+5411=COleControl::XPointerInactive::QueryInterface
+5412=CDocObjectServer::XPrint::QueryInterface
+5413=COleControlSite::XPropertyNotifySink::QueryInterface
+5414=COlePropertyPage::XPropertyPage::QueryInterface
+5415=COlePropertyPage::XPropNotifySink::QueryInterface
+5416=COleControl::XProvideClassInfo::QueryInterface
+5417=COleControl::XQuickActivate::QueryInterface
+5418=CRichEditView::XRichEditOleCallback::QueryInterface
+5419=COleControl::XSpecifyPropertyPages::QueryInterface
+5420=COleControl::XViewObject::QueryInterface
+5421=CInternetConnection::QueryOption
+5422=CInternetConnection::QueryOption
+5423=CInternetConnection::QueryOption
+5424=CInternetFile::QueryOption
+5425=CInternetFile::QueryOption
+5426=CInternetFile::QueryOption
+5427=CInternetSession::QueryOption
+5428=CInternetSession::QueryOption
+5429=CInternetSession::QueryOption
+5430=CPropertyPage::QuerySiblings
+5431=CConnectionPoint::QuerySinkInterface
+5432=COleControl::XEventConnPt::QuerySinkInterface
+5433=CDocObjectServer::XOleCommandTarget::QueryStatus
+5434=CFontHolder::QueryTextMetrics
+5435=COleControlSite::QuickActivate
+5436=COleControl::XQuickActivate::QuickActivate
+5437=COleClientItem::ReactivateAndUndo
+5438=COleControl::XOleInPlaceObject::ReactivateAndUndo
+5439=COleServerDoc::XOleInPlaceObject::ReactivateAndUndo
+5440=CArchive::Read
+5441=CArchiveStream::Read
+5442=CFile::Read
+5443=CImageList::Read
+5444=CInternetFile::Read
+5445=CMemFile::Read
+5446=COleStreamFile::Read
+5447=CSocketFile::Read
+5448=CStdioFile::Read
+5449=CArchive::ReadClass
+5450=CArchive::ReadCount
+5451=CEditView::ReadFromArchive
+5452=CProperty::ReadFromStream
+5453=CPropertySection::ReadFromStream
+5454=CPropertySet::ReadFromStream
+5455=COleClientItem::ReadItem
+5456=COleClientItem::ReadItemCompound
+5457=COleClientItem::ReadItemFlat
+5458=CRecentFileList::ReadList
+5459=CPropertySection::ReadNameDictFromStream
+5460=CArchive::ReadObject
+5461=CArchive::ReadString
+5462=CArchive::ReadString
+5463=CInternetFile::ReadString
+5464=CInternetFile::ReadString
+5465=CStdioFile::ReadString
+5466=CStdioFile::ReadString
+5467=CMemFile::Realloc
+5468=CSharedFile::Realloc
+5469=CFieldExchange::ReallocLongBinary
+5470=CRecordset::RebindParams
+5471=CControlBar::RecalcDelayShow
+5472=CFrameWnd::RecalcLayout
+5473=CMiniDockFrameWnd::RecalcLayout
+5474=COleCntrFrameWnd::RecalcLayout
+5475=COleDocIPFrameWnd::RecalcLayout
+5476=COleIPFrameWnd::RecalcLayout
+5477=CSplitterWnd::RecalcLayout
+5478=CAsyncSocket::Receive
+5479=CSocket::Receive
+5480=CAsyncSocket::ReceiveFrom
+5481=CAsyncSocket::ReceiveFromHelper
+5482=CSocket::ReceiveFromHelper
+5483=COleControl::RecreateControlWindow
+5484=CRectconstCFrameWnd::rectDefault
+5485=CDC::RectVisible
+5486=CMetaFileDC::RectVisible
+5487=COleSafeArray::Redim
+5488=CDockBar::ReDockControlBar
+5489=CFrameWnd::ReDockControlBar
+5490=CWnd::ReflectChildNotify
+5491=CWnd::ReflectLastMsg
+5492=COleControl::Refresh
+5493=CDaoTableDef::RefreshLink
+5494=CRecordset::RefreshRowset
+5495=COleDropTarget::Register
+5496=COleLinkingDoc::Register
+5497=COleMessageFilter::Register
+5498=COleObjectFactory::Register
+5499=COleTemplateServer::Register
+5500=COleObjectFactory::RegisterAll
+5501=COleLinkingDoc::RegisterIfServerAttached
+5502=CDocManager::RegisterShellFileTypes
+5503=CWinApp::RegisterShellFileTypes
+5504=CWinApp::RegisterShellFileTypesCompat
+5505=CArchiveStream::Release
+5506=CBlobProperty::Release
+5507=CInnerUnknown::Release
+5508=COleClientItem::Release
+5509=COleConnPtContainer::Release
+5510=COleDataObject::Release
+5511=COleDispatchImpl::Release
+5512=COleUILinkInfo::Release
+5513=CString::Release
+5514=CString::Release
+5515=COleClientItem::XAdviseSink::Release
+5516=COleControlSite::XAmbientProps::Release
+5517=COleControlSite::XBoundObjectSite::Release
+5518=COleObjectFactory::XClassFactory::Release
+5519=CConnectionPoint::XConnPt::Release
+5520=COleControl::XDataObject::Release
+5521=COleDataSource::XDataObject::Release
+5522=COleServerDoc::XDataObject::Release
+5523=COleServerItem::XDataObject::Release
+5524=COleDropSource::XDropSource::Release
+5525=COleDropTarget::XDropTarget::Release
+5526=CEnumArray::XEnumVOID::Release
+5527=COleControlSite::XEventSink::Release
+5528=COleControl::XFontNotification::Release
+5529=COleMessageFilter::XMessageFilter::Release
+5530=COleControlSite::XNotifyDBEvents::Release
+5531=COleControl::XOleCache::Release
+5532=COleClientItem::XOleClientSite::Release
+5533=COleControlSite::XOleClientSite::Release
+5534=CDocObjectServer::XOleCommandTarget::Release
+5535=COleControlContainer::XOleContainer::Release
+5536=COleControl::XOleControl::Release
+5537=COleControlSite::XOleControlSite::Release
+5538=CDocObjectServer::XOleDocument::Release
+5539=CDocObjectServer::XOleDocumentView::Release
+5540=COleControl::XOleInPlaceActiveObject::Release
+5541=COleServerDoc::XOleInPlaceActiveObject::Release
+5542=COleFrameHook::XOleInPlaceFrame::Release
+5543=COleControl::XOleInPlaceObject::Release
+5544=COleServerDoc::XOleInPlaceObject::Release
+5545=COleControlContainer::XOleIPFrame::Release
+5546=COleClientItem::XOleIPSite::Release
+5547=COleControlSite::XOleIPSite::Release
+5548=COleLinkingDoc::XOleItemContainer::Release
+5549=CDocObjectServer::XOleObject::Release
+5550=COleControl::XOleObject::Release
+5551=COleServerDoc::XOleObject::Release
+5552=COleServerItem::XOleObject::Release
+5553=COlePropertiesDialog::XOleUIObjInfo::Release
+5554=COleControl::XPerPropertyBrowsing::Release
+5555=COleLinkingDoc::XPersistFile::Release
+5556=COleControl::XPersistMemory::Release
+5557=COleControl::XPersistPropertyBag::Release
+5558=COleControl::XPersistStorage::Release
+5559=COleServerDoc::XPersistStorage::Release
+5560=COleControl::XPersistStreamInit::Release
+5561=COleControl::XPointerInactive::Release
+5562=CDocObjectServer::XPrint::Release
+5563=COleControlSite::XPropertyNotifySink::Release
+5564=COlePropertyPage::XPropertyPage::Release
+5565=COlePropertyPage::XPropNotifySink::Release
+5566=COleControl::XProvideClassInfo::Release
+5567=COleControl::XQuickActivate::Release
+5568=CRichEditView::XRichEditOleCallback::Release
+5569=COleControl::XSpecifyPropertyPages::Release
+5570=COleControl::XViewObject::Release
+5571=CDC::ReleaseAttribDC
+5572=CString::ReleaseBuffer
+5573=COleControl::ReleaseCapture
+5574=COleControl::ReleaseDC
+5575=COleDispatchDriver::ReleaseDispatch
+5576=CDocObjectServer::ReleaseDocSite
+5577=CDocument::ReleaseFile
+5578=CFontHolder::ReleaseFont
+5579=CDC::ReleaseOutputDC
+5580=CMetaFileDC::ReleaseOutputDC
+5581=CPreviewDC::ReleaseOutputDC
+5582=COleClientItem::Reload
+5583=CFile::Remove
+5584=CFtpConnection::Remove
+5585=CPropertySection::Remove
+5586=CPropertySet::Remove
+5587=CPropertySet::Remove
+5588=CRecentFileList::Remove
+5589=CSimpleList::Remove
+5590=CMapPtrToPtr::RemoveAll
+5591=CMapPtrToWord::RemoveAll
+5592=CMapStringToOb::RemoveAll
+5593=CMapStringToPtr::RemoveAll
+5594=CMapStringToString::RemoveAll
+5595=CMapWordToOb::RemoveAll
+5596=CMapWordToPtr::RemoveAll
+5597=CObList::RemoveAll
+5598=CPropertySection::RemoveAll
+5599=CPropertySet::RemoveAll
+5600=CPtrList::RemoveAll
+5601=CStringList::RemoveAll
+5602=CByteArray::RemoveAt
+5603=CDWordArray::RemoveAt
+5604=CObArray::RemoveAt
+5605=CObList::RemoveAt
+5606=CPtrArray::RemoveAt
+5607=CPtrList::RemoveAt
+5608=CStringArray::RemoveAt
+5609=CStringList::RemoveAt
+5610=CUIntArray::RemoveAt
+5611=CWordArray::RemoveAt
+5612=CDockBar::RemoveControlBar
+5613=CFrameWnd::RemoveControlBar
+5614=CFtpConnection::RemoveDirectoryA
+5615=CDocTemplate::RemoveDocument
+5616=CMultiDocTemplate::RemoveDocument
+5617=CSingleDocTemplate::RemoveDocument
+5618=COleControl::RemoveFrameLevelUI
+5619=CFrameWnd::RemoveFrameWnd
+5620=CObList::RemoveHead
+5621=CPtrList::RemoveHead
+5622=CStringList::RemoveHead
+5623=CListCtrl::RemoveImageList
+5624=CListView::RemoveImageList
+5625=CTreeCtrl::RemoveImageList
+5626=CTreeView::RemoveImageList
+5627=COleDocument::RemoveItem
+5628=CMapPtrToPtr::RemoveKey
+5629=CMapPtrToWord::RemoveKey
+5630=CMapStringToOb::RemoveKey
+5631=CMapStringToPtr::RemoveKey
+5632=CMapStringToString::RemoveKey
+5633=CMapWordToOb::RemoveKey
+5634=CMapWordToPtr::RemoveKey
+5635=COleFrameHook::XOleInPlaceFrame::RemoveMenus
+5636=COleControlContainer::XOleIPFrame::RemoveMenus
+5637=CPropertySheet::RemovePage
+5638=CPropertySheet::RemovePage
+5639=CDockBar::RemovePlaceHolder
+5640=CDataBoundProperty::RemoveSource
+5641=CObList::RemoveTail
+5642=CPtrList::RemoveTail
+5643=CStringList::RemoveTail
+5644=CDocument::RemoveView
+5645=CFile::Rename
+5646=CFtpConnection::Rename
+5647=CPictureHolder::Render
+5648=CDaoWorkspace::RepairDatabase
+5649=COleControl::ReparentControlWindow
+5650=CDatabase::ReplaceBrackets
+5651=CException::ReportError
+5652=COleClientItem::ReportError
+5653=CDocument::ReportSaveLoadException
+5654=COleLinkingDoc::ReportSaveLoadException
+5655=CWnd::RepositionBars
+5656=COleIPFrameWnd::RepositionFrame
+5657=CDaoRecordset::Requery
+5658=CRecordset::Requery
+5659=COleFrameHook::XOleInPlaceFrame::RequestBorderSpace
+5660=COleControlContainer::XOleIPFrame::RequestBorderSpace
+5661=COleObjectFactory::XClassFactory::RequestLicKey
+5662=COleClientItem::XOleClientSite::RequestNewObjectLayout
+5663=COleControlSite::XOleClientSite::RequestNewObjectLayout
+5664=COleServerDoc::RequestPositionChange
+5665=CEnumArray::XEnumVOID::Reset
+5666=CRecordset::ResetCursor
+5667=CCachedDataPathProperty::ResetData
+5668=CDataPathProperty::ResetData
+5669=COleControl::ResetStockProps
+5670=CControlBar::ResetTimer
+5671=COleControl::ResetVersion
+5672=COleControl::XOleInPlaceActiveObject::ResizeBorder
+5673=COleServerDoc::XOleInPlaceActiveObject::ResizeBorder
+5674=COleControl::ResizeFrameWindow
+5675=COleSafeArray::ResizeOneDim
+5676=COleControl::ResizeOpenControl
+5677=CScrollView::ResizeParentToFit
+5678=CDC::RestoreDC
+5679=CPreviewDC::RestoreDC
+5680=CToolBarCtrl::RestoreState
+5681=CCmdTarget::RestoreWaitCursor
+5682=COleMessageFilter::XMessageFilter::RetryRejectedCall
+5683=CString::ReverseFind
+5684=CArchiveStream::Revert
+5685=COleDropTarget::Revoke
+5686=COleLinkingDoc::Revoke
+5687=COleMessageFilter::Revoke
+5688=COleObjectFactory::Revoke
+5689=COleObjectFactory::RevokeAll
+5690=RFX_Binary
+5691=RFX_Binary_Bulk
+5692=RFX_Bool
+5693=RFX_Bool_Bulk
+5694=RFX_Byte
+5695=RFX_Byte_Bulk
+5696=RFX_Date
+5697=RFX_Date
+5698=RFX_Date_Bulk
+5699=RFX_Double
+5700=RFX_Double_Bulk
+5701=RFX_Int
+5702=RFX_Int_Bulk
+5703=RFX_Long
+5704=RFX_Long_Bulk
+5705=RFX_LongBinary
+5706=RFX_Single
+5707=RFX_Single_Bulk
+5708=RFX_Text
+5709=RFX_Text_Bulk
+5710=CString::Right
+5711=CDaoWorkspace::Rollback
+5712=CDatabase::Rollback
+5713=COleClientItem::Run
+5714=CWinApp::Run
+5715=CWinThread::Run
+5716=CWinApp::RunAutomated
+5717=CWinApp::RunEmbedded
+5718=CWnd::RunModalLoop
+5719=COleControlSite::SafeSetProperty
+5720=CEditView::SameAsSelected
+5721=CRichEditView::SameAsSelected
+5722=CBlobProperty::Save
+5723=COleLinkingDoc::XPersistFile::Save
+5724=COleControl::XPersistMemory::Save
+5725=COleControl::XPersistPropertyBag::Save
+5726=COleControl::XPersistStorage::Save
+5727=COleServerDoc::XPersistStorage::Save
+5728=COleControl::XPersistStreamInit::Save
+5729=CDocManager::SaveAllModified
+5730=CDocTemplate::SaveAllModified
+5731=CWinApp::SaveAllModified
+5732=CFrameWnd::SaveBarState
+5733=COleLinkingDoc::XPersistFile::SaveCompleted
+5734=COleControl::XPersistStorage::SaveCompleted
+5735=COleServerDoc::XPersistStorage::SaveCompleted
+5736=CDC::SaveDC
+5737=CPreviewDC::SaveDC
+5738=COleServerDoc::SaveEmbedding
+5739=CFormView::SaveFocusControl
+5740=CDocument::SaveModified
+5741=COleDocument::SaveModified
+5742=COleServerDoc::SaveModified
+5743=COleServerDoc::SaveModifiedPrompt
+5744=COleClientItem::XOleClientSite::SaveObject
+5745=COleControlSite::XOleClientSite::SaveObject
+5746=CControlBarInfo::SaveState
+5747=CDockState::SaveState
+5748=COleControl::SaveState
+5749=CToolBarCtrl::SaveState
+5750=CWinApp::SaveStdProfileSettings
+5751=COleDocument::SaveToStorage
+5752=COleLinkingDoc::SaveToStorage
+5753=CDocObjectServer::XOleDocumentView::SaveViewState
+5754=CDockState::ScalePoint
+5755=CDockState::ScaleRectPos
+5756=CDC::ScaleViewportExt
+5757=CMetaFileDC::ScaleViewportExt
+5758=CPreviewDC::ScaleViewportExt
+5759=CDC::ScaleWindowExt
+5760=CPreviewDC::ScaleWindowExt
+5761=COleClientItem::XOleIPSite::Scroll
+5762=COleControlSite::XOleIPSite::Scroll
+5763=COleControlContainer::ScrollChildren
+5764=COleServerDoc::ScrollContainerBy
+5765=CScrollView::ScrollToDevicePosition
+5766=CScrollView::ScrollToPosition
+5767=COleControl::ScrollWindow
+5768=CWnd::ScrollWindow
+5769=CWnd::ScrollWindowEx
+5770=CArchiveStream::Seek
+5771=CDaoRecordset::Seek
+5772=CDaoRecordset::Seek
+5773=CFile::Seek
+5774=CInternetFile::Seek
+5775=CMemFile::Seek
+5776=COleStreamFile::Seek
+5777=CSocketFile::Seek
+5778=CStdioFile::Seek
+5779=CFontHolder::Select
+5780=CDC::SelectClipPath
+5781=CDC::SelectClipRgn
+5782=CDC::SelectClipRgn
+5783=CFontPropPage::SelectFontFromList
+5784=COleControl::SelectFontObject
+5785=CDC::SelectGdiObject
+5786=CDC::SelectObject
+5787=CDC::SelectObject
+5788=CDC::SelectObject
+5789=CDC::SelectObject
+5790=CPreviewDC::SelectObject
+5791=CDC::SelectPalette
+5792=CWinApp::SelectPrinter
+5793=COleControl::SelectStockFont
+5794=CDC::SelectStockObject
+5795=CPreviewDC::SelectStockObject
+5796=CAsyncSocket::Send
+5797=CSocket::Send
+5798=COleControl::SendAdvise
+5799=CWnd::SendChildNotifyLastMsg
+5800=CSocket::SendChunk
+5801=COleControlContainer::SendDlgItemMessageA
+5802=CWnd::SendDlgItemMessageA
+5803=CDocument::SendInitialUpdate
+5804=CRecordset::SendLongBinaryData
+5805=CWnd::SendMessageToDescendants
+5806=COleControlSite::SendMnemonic
+5807=CHttpFile::SendRequest
+5808=CHttpFile::SendRequest
+5809=CAsyncSocket::SendTo
+5810=CAsyncSocket::SendToHelper
+5811=CSocket::SendToHelper
+5812=CByteArray::Serialize
+5813=CControlBarInfo::Serialize
+5814=CDocItem::Serialize
+5815=CDockState::Serialize
+5816=CDWordArray::Serialize
+5817=CEditView::Serialize
+5818=CMapStringToOb::Serialize
+5819=CMapStringToString::Serialize
+5820=CMapWordToOb::Serialize
+5821=CObArray::Serialize
+5822=CObject::Serialize
+5823=CObList::Serialize
+5824=COleClientItem::Serialize
+5825=COleControl::Serialize
+5826=COleDocument::Serialize
+5827=CRichEditDoc::Serialize
+5828=CRichEditView::Serialize
+5829=CStringArray::Serialize
+5830=CStringList::Serialize
+5831=CWordArray::Serialize
+5832=CArchive::SerializeClass
+5833=SerializeElements
+5834=SerializeElements
+5835=COleControl::SerializeExtent
+5836=CEditView::SerializeRaw
+5837=COleControl::SerializeStockProps
+5838=COleControl::SerializeVersion
+5839=CProperty::Set
+5840=CProperty::Set
+5841=CProperty::Set
+5842=CPropertySection::Set
+5843=CPropertySection::Set
+5844=CPropertySet::Set
+5845=CPropertySet::Set
+5846=CDaoRecordset::SetAbsolutePosition
+5847=COleFrameHook::XOleInPlaceFrame::SetActiveObject
+5848=COleControlContainer::XOleIPFrame::SetActiveObject
+5849=CPropertySheet::SetActivePage
+5850=CPropertySheet::SetActivePage
+5851=CSplitterWnd::SetActivePane
+5852=CFrameWnd::SetActiveView
+5853=COleControl::XViewObject::SetAdvise
+5854=COleControl::SetAppearance
+5855=CDC::SetArcDirection
+5856=CString::SetAt
+5857=CByteArray::SetAtGrow
+5858=CDWordArray::SetAtGrow
+5859=CObArray::SetAtGrow
+5860=CPtrArray::SetAtGrow
+5861=CStringArray::SetAtGrow
+5862=CUIntArray::SetAtGrow
+5863=CWordArray::SetAtGrow
+5864=CDC::SetAttribDC
+5865=CMetaFileDC::SetAttribDC
+5866=CPreviewDC::SetAttribDC
+5867=CDaoTableDef::SetAttributes
+5868=COleControl::SetBackColor
+5869=CControlBar::SetBarInfo
+5870=CDockBar::SetBarInfo
+5871=CControlBar::SetBarStyle
+5872=CToolBar::SetBitmap
+5873=CDC::SetBkColor
+5874=CPreviewDC::SetBkColor
+5875=CDC::SetBkMode
+5876=CDaoRecordset::SetBookmark
+5877=CRecordset::SetBookmark
+5878=COleFrameHook::XOleInPlaceFrame::SetBorderSpace
+5879=COleControlContainer::XOleIPFrame::SetBorderSpace
+5880=COleControl::SetBorderStyle
+5881=CColorPropPage::SetButton
+5882=CToolBar::SetButtonInfo
+5883=CToolBar::SetButtons
+5884=CToolBar::SetButtonStyle
+5885=CToolBar::SetButtonText
+5886=CDaoRecordset::SetCacheSize
+5887=CDaoRecordset::SetCacheStart
+5888=COleControl::SetCapture
+5889=CRichEditView::SetCharFormat
+5890=CCheckListBox::SetCheck
+5891=CCmdUI::SetCheck
+5892=COleCmdUI::SetCheck
+5893=CStatusCmdUI::SetCheck
+5894=CTestCmdUI::SetCheck
+5895=CToolCmdUI::SetCheck
+5896=CCheckListBox::SetCheckStyle
+5897=CPropertySet::SetClassID
+5898=CDataBoundProperty::SetClientSite
+5899=CDocObjectServer::XOleObject::SetClientSite
+5900=COleControl::XOleObject::SetClientSite
+5901=COleServerDoc::XOleObject::SetClientSite
+5902=COleServerItem::XOleObject::SetClientSite
+5903=COleDataSource::SetClipboard
+5904=CDC::SetColorAdjustment
+5905=CColorPropPage::SetColorProp
+5906=CDocObjectServer::XOleObject::SetColorScheme
+5907=COleControl::XOleObject::SetColorScheme
+5908=COleServerDoc::XOleObject::SetColorScheme
+5909=COleServerItem::XOleObject::SetColorScheme
+5910=CSplitterWnd::SetColumnInfo
+5911=CRecordset::SetConcurrencyAndCursorType
+5912=CDaoQueryDef::SetConnect
+5913=CDaoTableDef::SetConnect
+5914=CDocTemplate::SetContainerInfo
+5915=COleControl::XQuickActivate::SetContentExtent
+5916=CReflectorWnd::SetControl
+5917=COleControl::SetControlSize
+5918=COlePropertyPage::SetControlStatus
+5919=CFileDialog::SetControlText
+5920=COleCurrency::SetCurrency
+5921=CColorDialog::SetCurrentColor
+5922=CFtpConnection::SetCurrentDirectoryA
+5923=CWinApp::SetCurrentHandles
+5924=CDaoRecordset::SetCurrentIndex
+5925=CPreviewView::SetCurrentPage
+5926=CRectTracker::SetCursor
+5927=CDaoRecordset::SetCursorAttributes
+5928=COleControl::XDataObject::SetData
+5929=COleDataSource::XDataObject::SetData
+5930=COleServerDoc::XDataObject::SetData
+5931=COleServerItem::XDataObject::SetData
+5932=COleControl::XOleCache::SetData
+5933=COleDateTime::SetDateTime
+5934=COleDateTimeSpan::SetDateTimeSpan
+5935=COccManager::SetDefaultButton
+5936=COleControlSite::SetDefaultButton
+5937=CRichEditCtrl::SetDefaultCharFormat
+5938=CDaoWorkspace::SetDefaultPassword
+5939=CMultiDocTemplate::SetDefaultTitle
+5940=CSingleDocTemplate::SetDefaultTitle
+5941=CDaoWorkspace::SetDefaultUser
+5942=CFileDialog::SetDefExt
+5943=CWinApp::SetDialogBkColor
+5944=COlePropertyPage::SetDialogResource
+5945=CDaoRecordset::SetDirtyFields
+5946=CDaoRecordset::SetDirtyFieldStatus
+5947=CRecordset::SetDirtyFieldStatus
+5948=COleControlSite::SetDlgCtrlID
+5949=CWnd::SetDlgCtrlID
+5950=COleControlContainer::SetDlgItemInt
+5951=CWnd::SetDlgItemInt
+5952=COleControlContainer::SetDlgItemTextA
+5953=CWnd::SetDlgItemTextA
+5954=CFrameWnd::SetDockState
+5955=CDocObjectServer::SetDocSite
+5956=COleClientItem::SetDrawAspect
+5957=CRichEditCntrItem::SetDrawAspect
+5958=CDataBoundProperty::SetDSCSite
+5959=COleControl::SetEnabled
+5960=COleClientItem::SetExtent
+5961=COleControlSite::SetExtent
+5962=CDocObjectServer::XOleObject::SetExtent
+5963=COleControl::XOleObject::SetExtent
+5964=COleServerDoc::XOleObject::SetExtent
+5965=COleServerItem::XOleObject::SetExtent
+5966=CColorButton::SetFaceColor
+5967=CDaoRecordset::SetFieldDirty
+5968=CRecordset::SetFieldDirty
+5969=CDaoRecordset::SetFieldNull
+5970=CRecordset::SetFieldNull
+5971=CRecordset::SetFieldStatus
+5972=CDaoRecordset::SetFieldValue
+5973=CDaoRecordset::SetFieldValue
+5974=CDaoRecordset::SetFieldValue
+5975=CDaoRecordset::SetFieldValue
+5976=CDaoRecordset::SetFieldValueNull
+5977=CDaoRecordset::SetFieldValueNull
+5978=CFile::SetFilePath
+5979=COleControl::SetFocus
+5980=COleControlSite::SetFocus
+5981=CWnd::SetFocus
+5982=CDialogTemplate::SetFont
+5983=CFontHolder::SetFont
+5984=COleControl::SetFont
+5985=CFontPropPage::SetFontProps
+5986=COleControl::SetForeColor
+5987=CPropertySection::SetFormatID
+5988=CPropertySet::SetFormatVersion
+5989=CSharedFile::SetHandle
+5990=CToolBar::SetHeight
+5991=CFrameWnd::SetHelpCapture
+5992=COlePropertyPage::SetHelpInfo
+5993=COleClientItem::SetHostNames
+5994=CDocObjectServer::XOleObject::SetHostNames
+5995=COleControl::XOleObject::SetHostNames
+5996=COleServerDoc::XOleObject::SetHostNames
+5997=COleServerItem::XOleObject::SetHostNames
+5998=COleClientItem::SetIconicMetafile
+5999=CProperty::SetID
+6000=CStatusBar::SetIndicators
+6001=CDaoWorkspace::SetIniPath
+6002=COleControl::SetInitialDataFormats
+6003=CDocObjectServer::XPrint::SetInitialPageNum
+6004=COleControl::SetInitialSize
+6005=CDocObjectServer::XOleDocumentView::SetInPlaceSite
+6006=CDaoWorkspace::SetIsolateODBCTrans
+6007=CListCtrl::SetItem
+6008=CTreeCtrl::SetItem
+6009=COleClientItem::SetItemRects
+6010=CFile::SetLength
+6011=CInternetFile::SetLength
+6012=CMemFile::SetLength
+6013=COleStreamFile::SetLength
+6014=CSocketFile::SetLength
+6015=COleUILinkInfo::SetLinkSource
+6016=COleClientItem::SetLinkUpdateOptions
+6017=COleUILinkInfo::SetLinkUpdateOptions
+6018=CDaoRecordset::SetLockingMode
+6019=CRecordset::SetLockingMode
+6020=CDaoWorkspace::SetLoginTimeout
+6021=CDC::SetMapMode
+6022=CPreviewDC::SetMapMode
+6023=CDC::SetMapperFlags
+6024=COleFrameHook::XOleInPlaceFrame::SetMenu
+6025=COleControlContainer::XOleIPFrame::SetMenu
+6026=CFrameWnd::SetMessageText
+6027=CFrameWnd::SetMessageText
+6028=CPropertyPage::SetModified
+6029=CDocument::SetModifiedFlag
+6030=COleControl::SetModifiedFlag
+6031=COlePropertyPage::SetModifiedFlag
+6032=CRichEditDoc::SetModifiedFlag
+6033=CDocObjectServer::XOleObject::SetMoniker
+6034=COleControl::XOleObject::SetMoniker
+6035=COleServerDoc::XOleObject::SetMoniker
+6036=COleServerItem::XOleObject::SetMoniker
+6037=CDaoQueryDef::SetName
+6038=CDaoTableDef::SetName
+6039=CPropertySection::SetName
+6040=COleControl::SetNotPermitted
+6041=CCmdTarget::SetNotSupported
+6042=COleControl::SetNotSupported
+6043=CDaoRecordset::SetNullableFieldStatus
+6044=CDaoRecordset::SetNullableKnownFieldStatus
+6045=CDaoRecordset::SetNullFieldStatus
+6046=CRecordset::SetNullFieldStatus
+6047=CRecordset::SetNullParamStatus
+6048=CDaoFieldExchange::SetNullValue
+6049=COleControl::XOleInPlaceObject::SetObjectRects
+6050=COleServerDoc::XOleInPlaceObject::SetObjectRects
+6051=COlePropertyPage::XPropertyPage::SetObjects
+6052=CDialog::SetOccDialogInfo
+6053=CDialogBar::SetOccDialogInfo
+6054=CFormView::SetOccDialogInfo
+6055=CWnd::SetOccDialogInfo
+6056=CDaoQueryDef::SetODBCTimeout
+6057=CInternetConnection::SetOption
+6058=CInternetFile::SetOption
+6059=CInternetSession::SetOption
+6060=CPropertySet::SetOSVersion
+6061=CDC::SetOutputDC
+6062=CMetaFileDC::SetOutputDC
+6063=CPreviewDC::SetOutputDC
+6064=CToolBar::SetOwner
+6065=COlePropertyPage::SetPageName
+6066=COlePropertyPage::XPropertyPage::SetPageSite
+6067=CStatusBar::SetPaneInfo
+6068=CStatusBar::SetPaneStyle
+6069=CStatusBar::SetPaneText
+6070=CRichEditCtrl::SetParaFormat
+6071=CRichEditView::SetParaFormat
+6072=CDaoQueryDef::SetParamValue
+6073=CDaoQueryDef::SetParamValue
+6074=CDaoRecordset::SetParamValue
+6075=CDaoRecordset::SetParamValue
+6076=CDaoQueryDef::SetParamValueNull
+6077=CDaoQueryDef::SetParamValueNull
+6078=CDaoRecordset::SetParamValueNull
+6079=CDaoRecordset::SetParamValueNull
+6080=CDocument::SetPathName
+6081=COleDocument::SetPathName
+6082=CRichEditDoc::SetPathName
+6083=CDaoRecordset::SetPercentPosition
+6084=CPictureHolder::SetPictureDispatch
+6085=CPicturePropPage::SetPictureProp
+6086=CDC::SetPolyFillMode
+6087=COleClientItem::SetPrintDevice
+6088=COleClientItem::SetPrintDevice
+6089=CEditView::SetPrinterFont
+6090=CPreviewView::SetPrintView
+6091=COlePropertyPage::SetPropCheck
+6092=COleControlSite::SetProperty
+6093=COleDispatchDriver::SetProperty
+6094=CWnd::SetProperty
+6095=COleControlSite::SetPropertyV
+6096=COlePropertyPage::SetPropIndex
+6097=COlePropertyPage::SetPropRadio
+6098=COleControl::SetPropsetData
+6099=COlePropertyPage::SetPropText
+6100=COlePropertyPage::SetPropText
+6101=COlePropertyPage::SetPropText
+6102=COlePropertyPage::SetPropText
+6103=COlePropertyPage::SetPropText
+6104=COlePropertyPage::SetPropText
+6105=COlePropertyPage::SetPropText
+6106=COlePropertyPage::SetPropText
+6107=COlePropertyPage::SetPropText
+6108=CDaoDatabase::SetQueryTimeout
+6109=CCmdUI::SetRadio
+6110=CTestCmdUI::SetRadio
+6111=CSliderCtrl::SetRange
+6112=CInternetFile::SetReadBufferSize
+6113=CDocObjectServer::XOleDocumentView::SetRect
+6114=CDocObjectServer::XOleDocumentView::SetRectComplex
+6115=COleControl::SetRectInContainer
+6116=CWinApp::SetRegistryKey
+6117=CWinApp::SetRegistryKey
+6118=CDaoQueryDef::SetReturnsRecords
+6119=CDC::SetROP2
+6120=CSplitterWnd::SetRowInfo
+6121=CRecordset::SetRowsetCurrencyStatus
+6122=CRecordset::SetRowsetCursorPosition
+6123=CRecordset::SetRowsetSize
+6124=CPreviewView::SetScaledSize
+6125=CPreviewDC::SetScaleRatio
+6126=CScrollView::SetScaleToFitSize
+6127=CDockState::SetScreenSize
+6128=CWnd::SetScrollInfo
+6129=CWnd::SetScrollPos
+6130=CWnd::SetScrollRange
+6131=CScrollView::SetScrollSizes
+6132=CSplitterWnd::SetScrollStyle
+6133=CPropertySection::SetSectionName
+6134=CRichEditCtrl::SetSel
+6135=CSliderCtrl::SetSelection
+6136=CRichEditCtrl::SetSelectionCharFormat
+6137=CDocTemplate::SetServerInfo
+6138=CArchiveStream::SetSize
+6139=CByteArray::SetSize
+6140=CDWordArray::SetSize
+6141=CObArray::SetSize
+6142=CPtrArray::SetSize
+6143=CStringArray::SetSize
+6144=CUIntArray::SetSize
+6145=CWordArray::SetSize
+6146=CToolBar::SetSizes
+6147=CDaoTableDef::SetSourceTableName
+6148=CSplitterWnd::SetSplitCursor
+6149=CDaoQueryDef::SetSQL
+6150=CCmdTarget::SetStandardProp
+6151=CColorButton::SetState
+6152=CRecordset::SetState
+6153=CFile::SetStatus
+6154=CControlBar::SetStatusText
+6155=COleFrameHook::XOleInPlaceFrame::SetStatusText
+6156=COleControlContainer::XOleIPFrame::SetStatusText
+6157=CDC::SetStretchBltMode
+6158=COleVariant::SetString
+6159=CString::SetSysString
+6160=CDialogTemplate::SetSystemFont
+6161=CEditView::SetTabStops
+6162=CDialogTemplate::SetTemplate
+6163=CFileDialog::SetTemplate
+6164=CCmdUI::SetText
+6165=COleCmdUI::SetText
+6166=COleControl::SetText
+6167=CStatusCmdUI::SetText
+6168=CTestCmdUI::SetText
+6169=CToolCmdUI::SetText
+6170=CDC::SetTextAlign
+6171=CDC::SetTextCharacterExtra
+6172=CDC::SetTextColor
+6173=CPreviewDC::SetTextColor
+6174=CDC::SetTextJustification
+6175=CDocument::SetTitle
+6176=CPropertySheet::SetTitle
+6177=CRichEditDoc::SetTitle
+6178=CToolTipCtrl::SetToolRect
+6179=CPreviewDC::SetTopLeftOffset
+6180=CProperty::SetType
+6181=CRecordset::SetUpdateMethod
+6182=CDaoTableDef::SetValidationRule
+6183=CDaoTableDef::SetValidationText
+6184=CThreadSlotData::SetValue
+6185=COlePropertiesDialog::XOleUIObjInfo::SetViewInfo
+6186=CDC::SetViewportExt
+6187=CMetaFileDC::SetViewportExt
+6188=CPreviewDC::SetViewportExt
+6189=CDC::SetViewportOrg
+6190=CMetaFileDC::SetViewportOrg
+6191=CPreviewDC::SetViewportOrg
+6192=CDC::SetWindowExt
+6193=CPreviewDC::SetWindowExt
+6194=CDC::SetWindowOrg
+6195=CWnd::SetWindowPlacement
+6196=COleControlSite::SetWindowPos
+6197=CWnd::SetWindowPos
+6198=COleControlSite::SetWindowTextA
+6199=CWnd::SetWindowTextA
+6200=CRichEditCtrl::SetWordCharFormat
+6201=CInternetFile::SetWriteBufferSize
+6202=CPreviewView::SetZoomState
+6203=CDocObjectServer::XOleDocumentView::Show
+6204=COlePropertyPage::XPropertyPage::Show
+6205=CDockBar::ShowAll
+6206=CRichEditCntrItem::ShowContainerUI
+6207=CRichEditView::ShowContainerUI
+6208=CRichEditView::XRichEditOleCallback::ShowContainerUI
+6209=CFrameWnd::ShowControlBar
+6210=COleClientItem::XOleClientSite::ShowObject
+6211=COleControlSite::XOleClientSite::ShowObject
+6212=CFrameWnd::ShowOwnedWindows
+6213=COleControlSite::XOleControlSite::ShowPropertyFrame
+6214=COleControlSite::ShowWindow
+6215=CWnd::ShowWindow
+6216=tagSIZEconstCScrollView::sizeDefault
+6217=CBitmapButton::SizeToContent
+6218=CToolBar::SizeToolBar
+6219=CEnumArray::XEnumVOID::Skip
+6220=CRecordset::SkipDeletedRecords
+6221=CAsyncSocket::Socket
+6222=CString::SpanExcluding
+6223=CString::SpanIncluding
+6224=CSplitterWnd::SplitColumn
+6225=COccManager::SplitDialogTemplate
+6226=CSplitterWnd::SplitRow
+6227=CDC::StartDocA
+6228=CDockContext::StartDrag
+6229=CDockContext::StartResize
+6230=CSplitterWnd::StartTracking
+6231=CArchiveStream::Stat
+6232=CSplitterWnd::StopTracking
+6233=CRuntimeClass::Store
+6234=CDaoRecordset::StoreFields
+6235=CRecordset::StoreFields
+6236=CRichEditView::Stream
+6237=CDockContext::Stretch
+6238=CDaoRecordset::StripBrackets
+6239=CWnd::SubclassCtl3d
+6240=CWnd::SubclassDlg3d
+6241=CWnd::SubclassDlgItem
+6242=CWnd::SubclassWindow
+6243=COleControlSite::XNotifyDBEvents::SyncAfter
+6244=COleControlSite::XNotifyDBEvents::SyncBefore
+6245=CRichEditCntrItem::SyncToRichEditObject
+6246=CDC::TabbedTextOutA
+6247=CMetaFileDC::TabbedTextOutA
+6248=CPreviewDC::TabbedTextOutA
+6249=CRichEditView::TextNotFound
+6250=CDC::TextOutA
+6251=CMetaFileDC::TextOutA
+6252=CPreviewDC::TextOutA
+6253=CDaoDatabase::ThrowDaoException
+6254=CDaoQueryDef::ThrowDaoException
+6255=CDaoRecordset::ThrowDaoException
+6256=CDaoTableDef::ThrowDaoException
+6257=CDaoWorkspace::ThrowDaoException
+6258=CDatabase::ThrowDBException
+6259=CRecordset::ThrowDBException
+6260=CFileException::ThrowErrno
+6261=COleControl::ThrowError
+6262=COleControl::ThrowError
+6263=ThrowGetRowsDaoException
+6264=CFileException::ThrowOsError
+6265=CDockContext::ToggleDocking
+6266=CDockContext::Track
+6267=CRectTracker::Track
+6268=CSplitterWnd::TrackColumnSize
+6269=CRectTracker::TrackHandle
+6270=CMenu::TrackPopupMenu
+6271=CSplitterWnd::TrackRowSize
+6272=CRectTracker::TrackRubberBand
+6273=COleControl::TransformCoords
+6274=COleControlSite::XOleControlSite::TransformCoords
+6275=COleControlSite::XOleControlSite::TranslateAcceleratorA
+6276=COleControl::XOleInPlaceActiveObject::TranslateAcceleratorA
+6277=COleServerDoc::XOleInPlaceActiveObject::TranslateAcceleratorA
+6278=COleFrameHook::XOleInPlaceFrame::TranslateAcceleratorA
+6279=COleControlContainer::XOleIPFrame::TranslateAcceleratorA
+6280=COlePropertyPage::XPropertyPage::TranslateAcceleratorA
+6281=COleControl::TranslateColor
+6282=CString::TrimLeft
+6283=CString::TrimRight
+6284=CDocObjectServer::XOleDocumentView::UIActivate
+6285=COccManager::UIActivateControl
+6286=COleControl::XOleInPlaceObject::UIDeactivate
+6287=COleServerDoc::XOleInPlaceObject::UIDeactivate
+6288=COccManager::UIDeactivateIfNecessary
+6289=COleSafeArray::UnaccessData
+6290=CConnectionPoint::XConnPt::Unadvise
+6291=CDocObjectServer::XOleObject::Unadvise
+6292=COleControl::XOleObject::Unadvise
+6293=COleServerDoc::XOleObject::Unadvise
+6294=COleServerItem::XOleObject::Unadvise
+6295=CRecordset::UnbindFieldsForUpdate
+6296=COleControl::XOleCache::Uncache
+6297=COleControl::XViewObject::Unfreeze
+6298=CCriticalSection::Unlock
+6299=CEvent::Unlock
+6300=CMultiLock::Unlock
+6301=CMultiLock::Unlock
+6302=CMutex::Unlock
+6303=COleSafeArray::Unlock
+6304=CSemaphore::Unlock
+6305=CSemaphore::Unlock
+6306=CSingleLock::Unlock
+6307=CSingleLock::Unlock
+6308=CSyncObject::Unlock
+6309=CTypeLibCache::Unlock
+6310=CEditView::UnlockBuffer
+6311=CString::UnlockBuffer
+6312=CFile::UnlockRange
+6313=CInternetFile::UnlockRange
+6314=CMemFile::UnlockRange
+6315=COleStreamFile::UnlockRange
+6316=CSocketFile::UnlockRange
+6317=CStdioFile::UnlockRange
+6318=CArchiveStream::UnlockRegion
+6319=CWinApp::Unregister
+6320=CWnd::UnsubclassWindow
+6321=CDaoRecordset::Update
+6322=CRecordset::Update
+6323=CDocObjectServer::XOleObject::Update
+6324=COleControl::XOleObject::Update
+6325=COleServerDoc::XOleObject::Update
+6326=COleServerItem::XOleObject::Update
+6327=COleServerDoc::UpdateAllItems
+6328=CStatusBar::UpdateAllPanes
+6329=CDocument::UpdateAllViews
+6330=CScrollView::UpdateBars
+6331=CMDIChildWnd::UpdateClientEdge
+6332=CDataSourceControl::UpdateControls
+6333=CDataSourceControl::UpdateCursor
+6334=CWnd::UpdateData
+6335=CWnd::UpdateDialogControls
+6336=CDocument::UpdateFrameCounts
+6337=CFrameWnd::UpdateFrameTitleForDocument
+6338=CRecordset::UpdateInsertDelete
+6339=COleClientItem::UpdateItemType
+6340=COleClientItem::UpdateLink
+6341=COleUILinkInfo::UpdateLink
+6342=CSizeComboBox::UpdateLogFont
+6343=CRecentFileList::UpdateMenu
+6344=COleDocument::UpdateModifiedFlag
+6345=CRichEditDoc::UpdateModifiedFlag
+6346=CRichEditDoc::UpdateObjectCache
+6347=CWinApp::UpdatePrinterSelection
+6348=CColorPropPage::CColorPropPageFactory::UpdateRegistry
+6349=CFontPropPage::CFontPropPageFactory::UpdateRegistry
+6350=COleObjectFactory::UpdateRegistry
+6351=COleObjectFactory::UpdateRegistry
+6352=COleTemplateServer::UpdateRegistry
+6353=CPicturePropPage::CPicturePropPageFactory::UpdateRegistry
+6354=COleObjectFactory::UpdateRegistryAll
+6355=CFontPropPage::UpdateSampleFont
+6356=CDockContext::UpdateState
+6357=CToolTipCtrl::UpdateTipText
+6358=CToolTipCtrl::UpdateTipText
+6359=COleServerDoc::UpdateUsingHostObj
+6360=COleLinkingDoc::UpdateVisibleLock
+6361=CDatabase::VerifyConnect
+6362=CRecordset::VerifyCursorSupport
+6363=CRecordset::VerifyDriverBehavior
+6364=COleObjectFactory::VerifyLicenseKey
+6365=COleObjectFactory::VerifyUserLicense
+6366=CListBox::VKeyToItem
+6367=CWnd::WalkPreTranslateTree
+6368=COleControl::WillAmbientsBeValidDuringLoad
+6369=CControlBar::WindowProc
+6370=COleControl::WindowProc
+6371=COlePropertyPage::WindowProc
+6372=CParkingWnd::WindowProc
+6373=CReflectorWnd::WindowProc
+6374=CWnd::WindowProc
+6375=CWinApp::WinHelpA
+6376=CWnd::WinHelpA
+6377=CWndconstCWnd::wndBottom
+6378=CWndconstCWnd::wndNoTopMost
+6379=CWndconstCWnd::wndTop
+6380=CWndconstCWnd::wndTopMost
+6381=CRichEditView::WrapChanged
+6382=CToolBar::WrapToolBar
+6383=CArchive::Write
+6384=CArchiveStream::Write
+6385=CFile::Write
+6386=CGopherFile::Write
+6387=CImageList::Write
+6388=CInternetFile::Write
+6389=CMemFile::Write
+6390=COleStreamFile::Write
+6391=CSocketFile::Write
+6392=CStdioFile::Write
+6393=CArchive::WriteClass
+6394=CArchive::WriteCount
+6395=COleClientItem::WriteItem
+6396=COleClientItem::WriteItemCompound
+6397=COleClientItem::WriteItemFlat
+6398=CRecentFileList::WriteList
+6399=CPropertySection::WriteNameDictToStream
+6400=CArchive::WriteObject
+6401=CWinApp::WriteProfileBinary
+6402=CWinApp::WriteProfileInt
+6403=CWinApp::WriteProfileStringA
+6404=CArchive::WriteString
+6405=CGopherFile::WriteString
+6406=CInternetFile::WriteString
+6407=CStdioFile::WriteString
+6408=CEditView::WriteToArchive
+6409=CProperty::WriteToStream
+6410=CPropertySection::WriteToStream
+6411=CPropertySet::WriteToStream
+6412=charafxChNil
+6413=CHttpConnection::CHttpConnection
+6414=_CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>::~_CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>
+6415=???1?$_CIP@UIUnknown@@$1?IID_IUnknown@@3U_GUID@@B@@QAE@XZ@@YAXXZ
+6416=CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>::~CIP<IBindStatusCallback&_GUIDconstIID_IBindStatusCallback>
+6417=CIP<IUnknown&_GUIDconstIID_IUnknown>::~CIP<IUnknown&_GUIDconstIID_IUnknown>
+6418=AfxParseURLEx
+6421=CRuntimeClassconstCInternetException::classCInternetException
+6422=CAsyncMonikerFile::CreateBindStatusCallback
+6423=CWinThread::DispatchThreadMessageEx
+6424=CAsyncMonikerFile::EndCallbacks
+6425=CMonikerFile::Flush
+6426=CInternetSession::GetHttpConnection
+6427=CAsyncMonikerFile::Read
+6428=CEnumConnections::CEnumConnections
+6429=CEnumConnections::~CEnumConnections
+6430=CHtmlStream::operator<<
+6431=CHtmlStream::operator<<
+6432=CHttpServerContext::operator<<
+6433=CHttpServerContext::operator<<
+6434=_AfxDeleteRegKey
+6435=CEnumConnections::AddConnection
+6436=AfxGetDefaultValue
+6437=AfxGetResourceHandle
+6438=AfxInitRichEdit
+6439=AfxOleUnregisterHelper
+6440=AfxOleUnregisterServerClass
+6441=AfxSetDefaultValue
+6442=CWnd::CreateEx
+6443=CScrollView::DoMouseWheel
+6444=COleControlContainer::FreezeAllEvents
+6445=COleControlSite::FreezeEvents
+6446=CEnumConnections::GetInterfaceMap
+6447=HashKey
+6448=AFX_INTERFACEMAPconstCOleControlContainer::interfaceMap
+6449=AFX_INTERFACEMAPconstCOleControlSite::interfaceMap
+6450=CEnumConnections::OnClone
+6451=CDocTemplate::OnCmdMsg
+6452=COleTemplateServer::OnCmdMsg
+6453=CWnd::OnDestroy
+6454=CScrollView::OnMouseWheel
+6455=CSplitterWnd::OnMouseWheel
+6456=CEnumConnections::OnNext
+6457=CFrameWnd::OnRegisteredMouseWheel
+6458=CWnd::OnSettingChange
+6459=CRecordset::SetParamNull
+6460=COleObjectFactory::Unregister
+6461=COleTemplateServer::Unregister
+6462=COleObjectFactory::UnregisterAll
+6463=CDocManager::UnregisterShellFileTypes
+6464=CWinApp::UnregisterShellFileTypes
+6465=AFX_CLASSINIT_COMPAT::AFX_CLASSINIT_COMPAT
+6466=AFX_EVENT::AFX_EVENT
+6467=AFX_MAINTAIN_STATE2::AFX_MAINTAIN_STATE2
+6468=CCachedDataPathProperty::CCachedDataPathProperty
+6469=CColorPropPage::CColorPropPageFactory::CColorPropPageFactory
+6470=CDaoErrorInfo::CDaoErrorInfo
+6471=CDaoFieldInfo::CDaoFieldInfo
+6472=CDataPathProperty::CDataPathProperty
+6473=CDynLinkLibrary::CDynLinkLibrary
+6474=CFileStatus::CFileStatus
+6475=CFixedAlloc::CFixedAlloc
+6476=CFontPropPage::CFontPropPageFactory::CFontPropPageFactory
+6477=CGopherLocator::CGopherLocator
+6478=CHtmlView::CHtmlView
+6479=CMemoryException::CMemoryException
+6480=CNotSupportedException::CNotSupportedException
+6481=COleDocObjectItem::COleDocObjectItem
+6482=COleVariant::COleVariant
+6483=CParkingWnd::CParkingWnd
+6484=CPicturePropPage::CPicturePropPageFactory::CPicturePropPageFactory
+6485=CPropertyPageEx::CPropertyPageEx
+6486=CPropertyPageEx::CPropertyPageEx
+6487=CPropertyPageEx::CPropertyPageEx
+6488=CPropertySheetEx::CPropertySheetEx
+6489=CPropertySheetEx::CPropertySheetEx
+6490=CPropertySheetEx::CPropertySheetEx
+6491=CReBar::CReBar
+6492=CResourceException::CResourceException
+6493=CString::CString
+6494=CUserException::CUserException
+6495=CEmbeddedButActsLikePtr<CMapPtrToPtr>::~CEmbeddedButActsLikePtr<CMapPtrToPtr>
+6496=CEmbeddedButActsLikePtr<CPtrList>::~CEmbeddedButActsLikePtr<CPtrList>
+6497=AFX_MAINTAIN_STATE2::~AFX_MAINTAIN_STATE2
+6498=CArchiveException::~CArchiveException
+6499=CColorDialog::~CColorDialog
+6500=CColorPropPage::~CColorPropPage
+6501=CColorPropPage::CColorPropPageFactory::~CColorPropPageFactory
+6502=CComboBoxEx::~CComboBoxEx
+6503=CControlBarInfo::~CControlBarInfo
+6504=COleControl::CControlDataSource::~CControlDataSource
+6505=CControlFrameWnd::~CControlFrameWnd
+6506=CControlRectTracker::~CControlRectTracker
+6507=CDaoErrorInfo::~CDaoErrorInfo
+6508=CDateTimeCtrl::~CDateTimeCtrl
+6509=CFindReplaceDialog::~CFindReplaceDialog
+6510=CFixedAlloc::~CFixedAlloc
+6511=CFontPropPage::~CFontPropPage
+6512=CFontPropPage::CFontPropPageFactory::~CFontPropPageFactory
+6513=CHandleMap::~CHandleMap
+6514=CHtmlView::~CHtmlView
+6515=CIPAddressCtrl::~CIPAddressCtrl
+6516=CMDIChildWnd::~CMDIChildWnd
+6517=CMDIFrameWnd::~CMDIFrameWnd
+6518=CMemoryException::~CMemoryException
+6519=CMiniDockFrameWnd::~CMiniDockFrameWnd
+6520=CMonthCalCtrl::~CMonthCalCtrl
+6521=CNotSupportedException::~CNotSupportedException
+6522=COccManager::~COccManager
+6523=COleDocObjectItem::~COleDocObjectItem
+6524=COleException::~COleException
+6525=COleSafeArray::~COleSafeArray
+6526=CParkingWnd::~CParkingWnd
+6527=CPicturePropPage::CPicturePropPageFactory::~CPicturePropPageFactory
+6528=CPropertyPageEx::~CPropertyPageEx
+6529=CPropertySheetEx::~CPropertySheetEx
+6530=CPushRoutingFrame::~CPushRoutingFrame
+6531=CPushRoutingView::~CPushRoutingView
+6532=CReBar::~CReBar
+6533=CReflectorWnd::~CReflectorWnd
+6534=CResourceException::~CResourceException
+6535=CRichEditDoc::~CRichEditDoc
+6536=CSocketWnd::~CSocketWnd
+6537=CTempDC::~CTempDC
+6538=CTempGdiObject::~CTempGdiObject
+6539=CTempImageList::~CTempImageList
+6540=CTempMenu::~CTempMenu
+6541=CTempWnd::~CTempWnd
+6542=CThreadData::~CThreadData
+6543=CTypeLibCacheMap::~CTypeLibCacheMap
+6544=CUserException::~CUserException
+6545=CWindowlessDC::~CWindowlessDC
+6546=CTempWnd::operatordelete
+6547=CArchive::operator>>
+6548=CArchive::operator>>
+6549=CArchive::operator>>
+6550=CArchive::operator>>
+6551=CArchive::operator>>
+6552=CArchive::operator>>
+6553=CArchive::operator<<
+6554=CArchive::operator<<
+6555=CArchive::operator<<
+6556=CArchive::operator<<
+6557=CArchive::operator<<
+6558=CArchive::operator<<
+6559=operator
+6560=CTime::operator<
+6561=CTime::operator>
+6562=COleDocObjectItem::ActivateAndShow
+6563=COleDocObjectItem::XOleDocumentSite::ActivateMe
+6564=CReBar::AddBar
+6565=CReBar::AddBar
+6566=COleInsertDialog::AddClassIDToList
+6567=CStringList::AddHead
+6568=CPropertySheetEx::AddPage
+6569=CStringList::AddTail
+6570=AfxCheckError
+6571=AfxClassInit
+6572=AfxDelRegTreeHelper
+6573=AfxGetExceptionContext
+6574=AfxGetHENV
+6575=AfxGetMainWnd
+6576=AfxGetResourceHandleCompat
+6577=afxMapHDC
+6578=afxMapHGDIOBJ
+6579=afxMapHIMAGELIST
+6580=afxMapHMENU
+6581=afxMapHWND
+6582=AfxOleRegisterServerClass
+6583=AfxTrackerTerm
+6584=AfxWingdixTerm
+6585=CFixedAlloc::Alloc
+6586=AtlA2WHelper
+6587=AtlDevModeA2W
+6588=AtlDevModeW2A
+6589=AtlW2AHelper
+6590=COleControlContainer::AttachControlSite
+6591=CHtmlView::BeforeNavigate2
+6592=CPropertySheetEx::BuildPropPageArray
+6593=CReBar::CalcDynamicLayout
+6594=CReBar::CalcFixedLayout
+6595=CDatabase::CheckHstmt
+6596=CRuntimeClassconstCComboBoxEx::classCComboBoxEx
+6597=CRuntimeClassconstCHtmlView::classCHtmlView
+6598=CRuntimeClassconstCIPAddressCtrl::classCIPAddressCtrl
+6599=CRuntimeClassconstCOleDBRecordView::classCOleDBRecordView
+6600=CRuntimeClassconstCOleDocObjectItem::classCOleDocObjectItem
+6601=CRuntimeClassconstCPropertyPageEx::classCPropertyPageEx
+6602=CRuntimeClassconstCPropertySheetEx::classCPropertySheetEx
+6603=CRuntimeClassconstCReBar::classCReBar
+6604=CRuntimeClassconstCReBarCtrl::classCReBarCtrl
+6605=CWnd::ClientToScreen
+6606=CPropertyPageEx::CommonConstruct
+6607=CPropertySheetEx::CommonConstruct
+6608=CPropertyPageEx::Construct
+6609=CPropertyPageEx::Construct
+6610=CPropertySheetEx::Construct
+6611=CPropertySheetEx::Construct
+6612=CComboBoxEx::Create
+6613=CDateTimeCtrl::Create
+6614=CHtmlView::Create
+6615=CImageList::Create
+6616=CIPAddressCtrl::Create
+6617=CMonthCalCtrl::Create
+6618=CMonthCalCtrl::Create
+6619=CReBar::Create
+6620=CReBarCtrl::Create
+6621=COleControlContainer::CreateControl
+6622=COleControlSite::CreateControl
+6623=CWnd::CreateControl
+6624=CStatusBar::CreateEx
+6625=CToolBar::CreateEx
+6626=CMDIFrameWnd::CreateNewChild
+6627=CHtmlView::CreateObject
+6628=CTempDC::CreateObject
+6629=CTempGdiObject::CreateObject
+6630=CTempImageList::CreateObject
+6631=CTempMenu::CreateObject
+6632=CTempWnd::CreateObject
+6633=COleControl::CreateTracker
+6634=DDV_MinMaxDateTime
+6635=DDV_MinMaxDateTime
+6636=DDV_MinMaxMonth
+6637=DDV_MinMaxMonth
+6638=DDV_MinMaxSlider
+6639=DDX_DateTimeCtrl
+6640=DDX_DateTimeCtrl
+6641=DDX_FieldSlider
+6642=DDX_FieldText
+6643=DDX_FieldText
+6644=DDX_MonthCalCtrl
+6645=DDX_MonthCalCtrl
+6646=DDX_Slider
+6647=DDX_Text
+6648=CString::Delete
+6649=CComboBoxEx::DeleteItem
+6650=CHtmlView::DocumentComplete
+6651=COleInsertDialog::DoModal
+6652=CControlBar::DrawGripper
+6653=CImageList::DrawIndirect
+6654=CImageList::DrawIndirect
+6655=CWnd::EnableTrackingToolTips
+6656=CPropertyPage::EndDialog
+6657=CHttpFile::EndRequest
+6658=AFX_EVENTSINKMAPconstCHtmlView::eventsinkMap
+6659=COleFrameHook::XOleCommandTarget::Exec
+6660=COleDocObjectItem::ExecCommand
+6661=CHtmlView::ExecWB
+6662=CString::Find
+6663=CString::Find
+6664=FontAttrSize
+6665=CFixedAlloc::Free
+6666=CFixedAlloc::FreeAll
+6667=CString::FreeData
+6668=COleDocObjectItem::GetActiveView
+6669=CIPAddressCtrl::GetAddress
+6670=CHtmlView::GetAddressBar
+6671=CHtmlView::GetApplication
+6672=COleDateTime::GetAsSystemTime
+6673=CTime::GetAsSystemTime
+6674=CHtmlView::GetBusy
+6675=CListCtrl::GetCheck
+6676=CTreeCtrl::GetCheck
+6677=CReBarCtrl::GetColorScheme
+6678=CListCtrl::GetColumnOrderArray
+6679=CHtmlView::GetContainer
+6680=CInternetSession::GetCookie
+6681=CInternetSession::GetCookie
+6682=CInternetSession::GetCookieLength
+6683=CListBox::GetCurSel
+6684=CMonthCalCtrl::GetCurSel
+6685=CMonthCalCtrl::GetCurSel
+6686=CDataBoundProperty::GetCursor
+6687=CDataSourceControl::GetCursor
+6688=COleControlSite::GetCursor
+6689=CDocManager::GetDocumentCount
+6690=CToolBarCtrl::GetDropTarget
+6691=CHtmlView::GetEventSinkMap
+6692=CMonthCalCtrl::GetFirstDayOfWeek
+6693=CWnd::GetFont
+6694=CHtmlView::GetFullName
+6695=CHtmlView::GetFullScreen
+6696=CListCtrl::GetHeaderCtrl
+6697=CHtmlView::GetHeight
+6698=COleDocObjectItem::GetHelpMenu
+6699=CHtmlView::GetHtmlDocument
+6700=COleClientItem::GetIconFromRegistry
+6701=COleClientItem::GetIconFromRegistry
+6702=CReBarCtrl::GetImageList
+6703=COleFrameHook::GetInterfaceHook
+6704=COleDocObjectItem::GetInterfaceMap
+6705=CComboBoxEx::GetItem
+6706=CTabCtrl::GetItemState
+6707=CDC::GetLayout
+6708=CHtmlView::GetLeft
+6709=CHtmlView::GetLocationName
+6710=CHtmlView::GetLocationURL
+6711=CHtmlView::GetMenuBar
+6712=CHtmlView::GetMessageMap
+6713=COleDBRecordView::GetMessageMap
+6714=CReBar::GetMessageMap
+6715=CMonikerFile::GetMoniker
+6716=CMonthCalCtrl::GetMonthRange
+6717=CMonthCalCtrl::GetMonthRange
+6718=CMonthCalCtrl::GetMonthRange
+6719=CHtmlView::GetOffline
+6720=CHeaderCtrl::GetOrderArray
+6721=CWnd::GetOwner
+6722=COleDocObjectItem::GetPageCount
+6723=CRichEditView::GetPageRect
+6724=CHtmlView::GetParentBrowser
+6725=CRichEditView::GetPrintRect
+6726=CHtmlView::GetProperty
+6727=CHtmlView::GetProperty
+6728=CPropertySheet::GetPropSheetHeader
+6729=CDateTimeCtrl::GetRange
+6730=CDateTimeCtrl::GetRange
+6731=CMonthCalCtrl::GetRange
+6732=CMonthCalCtrl::GetRange
+6733=CMonthCalCtrl::GetRange
+6734=CProgressCtrl::GetRange
+6735=CHtmlView::GetReadyState
+6736=CHtmlView::GetRegisterAsBrowser
+6737=CHtmlView::GetRegisterAsDropTarget
+6738=CCmdTarget::GetRoutingFrame_
+6739=CCmdTarget::GetRoutingView_
+6740=CComboBoxEx::GetRuntimeClass
+6741=CDateTimeCtrl::GetRuntimeClass
+6742=CHtmlView::GetRuntimeClass
+6743=CIPAddressCtrl::GetRuntimeClass
+6744=CMonthCalCtrl::GetRuntimeClass
+6745=COleDBRecordView::GetRuntimeClass
+6746=COleDocObjectItem::GetRuntimeClass
+6747=CPropertyPageEx::GetRuntimeClass
+6748=CPropertySheetEx::GetRuntimeClass
+6749=CReBar::GetRuntimeClass
+6750=CReBarCtrl::GetRuntimeClass
+6751=CTempDC::GetRuntimeClass
+6752=CTempGdiObject::GetRuntimeClass
+6753=CTempImageList::GetRuntimeClass
+6754=CTempMenu::GetRuntimeClass
+6755=CTempWnd::GetRuntimeClass
+6756=CWnd::GetSafeOwner_
+6757=CMonthCalCtrl::GetSelRange
+6758=CMonthCalCtrl::GetSelRange
+6759=CMonthCalCtrl::GetSelRange
+6760=CHtmlView::GetSilent
+6761=CHtmlView::GetStatusBar
+6762=CListCtrl::GetSubItemRect
+6763=CPropertySheet::GetTabControl
+6764=CMirrorFile::GetTempName
+6765=CHtmlView::GetTheaterMode
+6766=CDateTimeCtrl::GetTime
+6767=CDateTimeCtrl::GetTime
+6768=CStatusBarCtrl::GetTipText
+6769=CFrameWnd::GetTitle
+6770=CMonthCalCtrl::GetToday
+6771=CMonthCalCtrl::GetToday
+6772=CHtmlView::GetToolBar
+6773=CHtmlView::GetTop
+6774=CHtmlView::GetTopLevelContainer
+6775=CHtmlView::GetType
+6776=CHtmlView::GetVisible
+6777=HasFont
+6778=CString::Insert
+6779=CString::Insert
+6780=CStringList::InsertAfter
+6781=CStringArray::InsertAt
+6782=CStringList::InsertBefore
+6783=CStringArray::InsertEmpty
+6784=CComboBoxEx::InsertItem
+6785=CTabCtrl::InsertItem
+6786=CTabCtrl::InsertItem
+6787=AFX_INTERFACEMAPconstCOleDocObjectItem::interfaceMap
+6788=CPropertyPage::IsButtonEnabled
+6789=IsButtonUp
+6790=IsDialogEx
+6791=IsDirSep
+6792=IsEnterKey
+6793=IsHelpKey
+6794=CToolBar::Layout
+6795=CBitmap::LoadBitmapA
+6796=CHtmlView::LoadFromResource
+6797=CHtmlView::LoadFromResource
+6798=CMDIChildWnd::MDIActivate
+6799=CMDIChildWnd::MDIDestroy
+6800=AFX_MSGMAPconstCHtmlView::messageMap
+6801=AFX_MSGMAPconstCOleDBRecordView::messageMap
+6802=AFX_MSGMAPconstCReBar::messageMap
+6803=CHtmlView::Navigate
+6804=CHtmlView::Navigate2
+6805=CHtmlView::Navigate2
+6806=CHtmlView::Navigate2
+6807=CHtmlView::NavigateComplete2
+6808=CHtmlView::OnBeforeNavigate2
+6809=COleControl::OnButtonDblClk
+6810=COleControl::OnButtonDown
+6811=COleControl::OnButtonUp
+6812=CHtmlView::OnCommandStateChange
+6813=CHtmlView::OnDestroy
+6814=CHtmlView::OnDocumentComplete
+6815=CHtmlView::OnDownloadBegin
+6816=CHtmlView::OnDownloadComplete
+6817=CHtmlView::OnDraw
+6818=CToolTipCtrl::OnEnable
+6819=COleControl::OnEraseBkgnd
+6820=CReBar::OnEraseBkgnd
+6821=COleControlSite::XRowsetNotify::OnFieldChange
+6822=CHtmlView::OnFilePrint
+6823=CHtmlView::OnFullScreen
+6824=COleDocObjectItem::OnGetItemPosition
+6825=CReBar::OnHeightChange
+6826=CFrameWnd::OnHelpPromptAddr
+6827=COleDBRecordView::OnInitialUpdate
+6828=CFrameWnd::OnInitMenu
+6829=COleFrameHook::OnInitMenu
+6830=COleFrameHook::OnInitMenuPopup
+6831=COleDocObjectItem::OnInsertMenus
+6832=CHtmlView::OnMenuBar
+6833=COleFrameHook::OnMenuSelect
+6834=COleDBRecordView::OnMove
+6835=CHtmlView::OnNavigateComplete2
+6836=CReBar::OnNcCalcSize
+6837=CReBar::OnNcCreate
+6838=CReBar::OnNcPaint
+6839=CHtmlView::OnNewWindow2
+6840=CHtmlView::OnPaint
+6841=CReBar::OnPaint
+6842=COleDocObjectItem::OnPreparePrinting
+6843=CToolBar::OnPreserveZeroBorderHelper
+6844=COleDocObjectItem::OnPrint
+6845=CHtmlView::OnProgressChange
+6846=CHtmlView::OnPropertyChange
+6847=CHtmlView::OnQuit
+6848=CReBar::OnRecalcParent
+6849=COleDocObjectItem::OnRemoveMenus
+6850=COleControlSite::XRowsetNotify::OnRowChange
+6851=COleControlSite::XRowsetNotify::OnRowsetChange
+6852=CToolBar::OnSetSizeHelper
+6853=CReBar::OnShowBand
+6854=CHtmlView::OnSize
+6855=CHtmlView::OnStatusBar
+6856=CHtmlView::OnStatusTextChange
+6857=CHtmlView::OnTheaterMode
+6858=CHtmlView::OnTitleChange
+6859=CHtmlView::OnToolBar
+6860=CReBar::OnToolHitTest
+6861=CMDIChildWnd::OnToolTipText
+6862=CReBar::OnUpdateCmdUI
+6863=COleDBRecordView::OnUpdateRecordFirst
+6864=COleDBRecordView::OnUpdateRecordLast
+6865=COleDBRecordView::OnUpdateRecordNext
+6866=COleDBRecordView::OnUpdateRecordPrev
+6867=CHtmlView::OnVisible
+6868=CHtmlView::PutProperty
+6869=CHttpFile::QueryInfo
+6870=COleFrameHook::XOleCommandTarget::QueryStatus
+6871=CHtmlView::QueryStatusWB
+6872=COleDocObjectItem::Release
+6873=COleControl::ReleaseCaches
+6874=CString::Remove
+6875=CTypeLibCacheMap::RemoveAll
+6876=CString::Replace
+6877=CString::Replace
+6878=RFX_Date
+6879=RFX_Text
+6880=CWnd::ScreenToClient
+6881=CHttpFile::SendRequestEx
+6882=CHttpFile::SendRequestEx
+6883=CStringArray::SetAtGrow
+6884=CAsyncMonikerFile::SetBinding
+6885=CListCtrl::SetBkImage
+6886=CListCtrl::SetBkImage
+6887=CControlBar::SetBorders
+6888=CListCtrl::SetCheck
+6889=CTreeCtrl::SetCheck
+6890=CReBarCtrl::SetColorScheme
+6891=CListCtrl::SetColumnOrderArray
+6892=CInternetSession::SetCookie
+6893=CMonthCalCtrl::SetCurSel
+6894=CMonthCalCtrl::SetCurSel
+6895=CMonthCalCtrl::SetDayState
+6896=CMonthCalCtrl::SetFirstDayOfWeek
+6897=CFontHolder::SetFontNotifySink
+6898=CAsyncMonikerFile::SetFormatEtc
+6899=CMDIChildWnd::SetHandles
+6900=CListCtrl::SetIconSpacing
+6901=CListCtrl::SetIconSpacing
+6902=CReBarCtrl::SetImageList
+6903=CComboBoxEx::SetItem
+6904=CListCtrl::SetItemCountEx
+6905=CListCtrl::SetItemState
+6906=CTabCtrl::SetItemState
+6907=CListCtrl::SetItemText
+6908=CDC::SetLayout
+6909=CHeaderCtrl::SetOrderArray
+6910=CDateTimeCtrl::SetRange
+6911=CDateTimeCtrl::SetRange
+6912=CMonthCalCtrl::SetRange
+6913=CMonthCalCtrl::SetRange
+6914=CMonthCalCtrl::SetRange
+6915=CCheckListBox::SetSelectionCheck
+6916=CMonthCalCtrl::SetSelRange
+6917=CMonthCalCtrl::SetSelRange
+6918=CMonthCalCtrl::SetSelRange
+6919=CDateTimeCtrl::SetTime
+6920=CDateTimeCtrl::SetTime
+6921=CDateTimeCtrl::SetTime
+6922=CMonthCalCtrl::SetToday
+6923=CMonthCalCtrl::SetToday
+6924=CMonthCalCtrl::SizeMinReq
+6925=COleDocObjectItem::SupportsIPrint
+6926=CDataSourceControl::ToVariant
+6927=CString::TrimLeft
+6928=CString::TrimLeft
+6929=CString::TrimRight
+6930=CString::TrimRight
+6931=CReBar::WindowProc
+6932=CMenu::GetMenuStringA
+6933=CInvalidArgException::CInvalidArgException
+6934=CInvalidArgException::~CInvalidArgException
+6935=CInvalidArgException::GetRuntimeClass
+6936=CRuntimeClassconstCInvalidArgException::classCInvalidArgException
+6937=AfxThrowInvalidArgException
+6938=CTime::GetMonth
+6939=CThreadSlotData::GetThreadValue
+6940=CTime::GetYear
+6941=CMapStringToOb::HashKey
+6942=CMapStringToPtr::HashKey
+6943=CMapStringToString::HashKey
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/mfc42u.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/mfc42u.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/mfc42u.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/mfc42u.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,6397 +1,6397 @@
-5=CRuntimeClassconstCCachedDataPathProperty::classCCachedDataPathProperty
-6=CRuntimeClassconstCDataPathProperty::classCDataPathProperty
-7=DllCanUnloadNow
-8=DllGetClassObject
-9=DllRegisterServer
-10=DllUnregisterServer
-256=_AFX_CHECKLIST_STATE::_AFX_CHECKLIST_STATE
-257=_AFX_COLOR_STATE::_AFX_COLOR_STATE
-258=???0_AFX_CONTROLPOS@@QAE@XZ@@YAXXZ
-259=_AFX_DAO_STATE::_AFX_DAO_STATE
-260=_AFX_EDIT_STATE::_AFX_EDIT_STATE
-261=_AFX_OLE_STATE::_AFX_OLE_STATE
-262=_AFX_THREAD_STATE::_AFX_THREAD_STATE
-263=_AFX_WIN_STATE::_AFX_WIN_STATE
-264=_AFXCTL_AMBIENT_CACHE::_AFXCTL_AMBIENT_CACHE
-265=_AFXCTL_UIACTIVE_INFO::_AFXCTL_UIACTIVE_INFO
-266=AFX_CLASSINIT::AFX_CLASSINIT
-267=AFX_DDPDATA::AFX_DDPDATA
-268=AFX_EXCEPTION_LINK::AFX_EXCEPTION_LINK
-269=AFX_MODULE_STATE::AFX_MODULE_STATE
-270=AFX_MODULE_STATE::AFX_MODULE_STATE
-271=AFX_MODULE_THREAD_STATE::AFX_MODULE_THREAD_STATE
-272=CAnimateCtrl::CAnimateCtrl
-273=CArchive::CArchive
-274=CArchivePropExchange::CArchivePropExchange
-275=CArchiveStream::CArchiveStream
-276=CAsyncMonikerFile::CAsyncMonikerFile
-277=CAsyncPropExchange::CAsyncPropExchange
-278=CAsyncSocket::CAsyncSocket
-279=CBitmap::CBitmap
-280=CBitmapButton::CBitmapButton
-281=CBlobProperty::CBlobProperty
-282=CBrush::CBrush
-283=CBrush::CBrush
-284=CBrush::CBrush
-285=CBrush::CBrush
-286=CButton::CButton
-287=CByteArray::CByteArray
-288=CCheckListBox::CCheckListBox
-289=CClientDC::CClientDC
-290=CCmdTarget::CCmdTarget
-291=CCmdUI::CCmdUI
-292=CColorButton::CColorButton
-293=CColorDialog::CColorDialog
-294=CColorPropPage::CColorPropPage
-295=CComboBox::CComboBox
-296=CCommandLineInfo::CCommandLineInfo
-297=CConnectionPoint::CConnectionPoint
-298=CControlBar::CControlBar
-299=CControlBarInfo::CControlBarInfo
-300=COleControl::CControlDataSource::CControlDataSource
-301=CControlFrameWnd::CControlFrameWnd
-302=CCriticalSection::CCriticalSection
-303=CCtrlView::CCtrlView
-304=CDaoDatabase::CDaoDatabase
-305=CDaoException::CDaoException
-306=CDaoFieldExchange::CDaoFieldExchange
-307=CDaoIndexFieldInfo::CDaoIndexFieldInfo
-308=CDaoIndexInfo::CDaoIndexInfo
-309=CDaoQueryDef::CDaoQueryDef
-310=CDaoRecordset::CDaoRecordset
-311=CDaoRecordView::CDaoRecordView
-312=CDaoRecordView::CDaoRecordView
-313=CDaoRelationFieldInfo::CDaoRelationFieldInfo
-314=CDaoRelationInfo::CDaoRelationInfo
-315=CDaoTableDef::CDaoTableDef
-316=CDaoWorkspace::CDaoWorkspace
-317=CDatabase::CDatabase
-318=CDataBoundProperty::CDataBoundProperty
-319=CDataExchange::CDataExchange
-320=CDataSourceControl::CDataSourceControl
-321=CDBException::CDBException
-322=CDBVariant::CDBVariant
-323=CDC::CDC
-324=CDialog::CDialog
-325=CDialog::CDialog
-326=CDialog::CDialog
-327=CDialogBar::CDialogBar
-328=CDialogTemplate::CDialogTemplate
-329=CDialogTemplate::CDialogTemplate
-330=CDocItem::CDocItem
-331=CDockBar::CDockBar
-332=CDockContext::CDockContext
-333=CDockState::CDockState
-334=CDocManager::CDocManager
-335=CDocObjectServer::CDocObjectServer
-336=CDocObjectServerItem::CDocObjectServerItem
-337=CDocTemplate::CDocTemplate
-338=CDocument::CDocument
-339=CDragListBox::CDragListBox
-340=CDumpContext::CDumpContext
-341=CDWordArray::CDWordArray
-342=CDynLinkLibrary::CDynLinkLibrary
-343=CEdit::CEdit
-344=CEditView::CEditView
-345=CEnumArray::CEnumArray
-346=CEnumConnPoints::CEnumConnPoints
-347=CEnumFormatEtc::CEnumFormatEtc
-348=CEvent::CEvent
-349=CException::CException
-350=CException::CException
-351=CFieldExchange::CFieldExchange
-352=CFile::CFile
-353=CFile::CFile
-354=CFile::CFile
-355=CFileDialog::CFileDialog
-356=CFileFind::CFileFind
-357=CFindReplaceDialog::CFindReplaceDialog
-358=CFont::CFont
-359=CFontComboBox::CFontComboBox
-360=CFontDialog::CFontDialog
-361=CFontDialog::CFontDialog
-362=CFontHolder::CFontHolder
-363=CFontPropPage::CFontPropPage
-364=CFormView::CFormView
-365=CFormView::CFormView
-366=CFrameWnd::CFrameWnd
-367=CFtpConnection::CFtpConnection
-368=CFtpConnection::CFtpConnection
-369=CFtpFileFind::CFtpFileFind
-370=CGdiObject::CGdiObject
-371=CGopherConnection::CGopherConnection
-372=CGopherConnection::CGopherConnection
-373=CGopherFile::CGopherFile
-374=CGopherFile::CGopherFile
-375=CGopherFileFind::CGopherFileFind
-376=CGopherLocator::CGopherLocator
-377=CHandleMap::CHandleMap
-378=CHeaderCtrl::CHeaderCtrl
-379=CHotKeyCtrl::CHotKeyCtrl
-380=CHttpConnection::CHttpConnection
-381=CHttpConnection::CHttpConnection
-382=CHttpFile::CHttpFile
-383=CHttpFile::CHttpFile
-384=CImageList::CImageList
-385=CInternetConnection::CInternetConnection
-386=CInternetException::CInternetException
-387=CInternetFile::CInternetFile
-388=CInternetFile::CInternetFile
-389=CInternetSession::CInternetSession
-390=CListBox::CListBox
-391=CListCtrl::CListCtrl
-392=CListView::CListView
-393=CLongBinary::CLongBinary
-394=CMapPtrToPtr::CMapPtrToPtr
-395=CMapPtrToWord::CMapPtrToWord
-396=CMapStringToOb::CMapStringToOb
-397=CMapStringToPtr::CMapStringToPtr
-398=CMapStringToString::CMapStringToString
-399=CMapWordToOb::CMapWordToOb
-400=CMapWordToPtr::CMapWordToPtr
-401=CMDIChildWnd::CMDIChildWnd
-402=CMDIFrameWnd::CMDIFrameWnd
-403=CMemFile::CMemFile
-404=CMemFile::CMemFile
-405=CMenu::CMenu
-406=CMetaFileDC::CMetaFileDC
-407=CMiniDockFrameWnd::CMiniDockFrameWnd
-408=CMiniFrameWnd::CMiniFrameWnd
-409=CMirrorFile::CMirrorFile
-410=CMonikerFile::CMonikerFile
-411=CMultiDocTemplate::CMultiDocTemplate
-412=CMultiLock::CMultiLock
-413=CMutex::CMutex
-414=CObArray::CObArray
-415=CObList::CObList
-416=CODBCFieldInfo::CODBCFieldInfo
-417=COleBusyDialog::COleBusyDialog
-418=COleChangeIconDialog::COleChangeIconDialog
-419=COleChangeSourceDialog::COleChangeSourceDialog
-420=COleClientItem::COleClientItem
-421=COleCmdUI::COleCmdUI
-422=COleCntrFrameWnd::COleCntrFrameWnd
-423=COleControl::COleControl
-424=COleControlContainer::COleControlContainer
-425=COleControlLock::COleControlLock
-426=COleControlSite::COleControlSite
-427=COleConvertDialog::COleConvertDialog
-428=COleCurrency::COleCurrency
-429=COleDataObject::COleDataObject
-430=COleDataSource::COleDataSource
-431=COleDialog::COleDialog
-432=COleDispatchDriver::COleDispatchDriver
-433=COleDispatchDriver::COleDispatchDriver
-434=COleDispatchDriver::COleDispatchDriver
-435=COleDispatchException::COleDispatchException
-436=COleDocIPFrameWnd::COleDocIPFrameWnd
-437=COleDocument::COleDocument
-438=COleDropSource::COleDropSource
-439=COleDropTarget::COleDropTarget
-440=COleFrameHook::COleFrameHook
-441=COleInsertDialog::COleInsertDialog
-442=COleIPFrameWnd::COleIPFrameWnd
-443=COleLinkingDoc::COleLinkingDoc
-444=COleLinksDialog::COleLinksDialog
-445=COleMessageFilter::COleMessageFilter
-446=COleObjectFactory::COleObjectFactory
-447=COlePasteSpecialDialog::COlePasteSpecialDialog
-448=COlePropertiesDialog::COlePropertiesDialog
-449=COlePropertyPage::COlePropertyPage
-450=COleResizeBar::COleResizeBar
-451=COleSafeArray::COleSafeArray
-452=COleSafeArray::COleSafeArray
-453=COleSafeArray::COleSafeArray
-454=COleSafeArray::COleSafeArray
-455=COleSafeArray::COleSafeArray
-456=COleServerDoc::COleServerDoc
-457=COleServerItem::COleServerItem
-458=COleStreamFile::COleStreamFile
-459=COleTemplateServer::COleTemplateServer
-460=COleUILinkInfo::COleUILinkInfo
-461=COleUpdateDialog::COleUpdateDialog
-462=COleVariant::COleVariant
-463=COleVariant::COleVariant
-464=COleVariant::COleVariant
-465=COleVariant::COleVariant
-466=COleVariant::COleVariant
-467=COleVariant::COleVariant
-468=COleVariant::COleVariant
-469=CPageSetupDialog::CPageSetupDialog
-470=CPaintDC::CPaintDC
-471=CPalette::CPalette
-472=CPen::CPen
-473=CPen::CPen
-474=CPen::CPen
-475=CPictureHolder::CPictureHolder
-476=CPicturePropPage::CPicturePropPage
-477=CPoint::CPoint
-478=CPoint::CPoint
-479=CPreviewDC::CPreviewDC
-480=CPreviewView::CPreviewView
-481=CPrintDialog::CPrintDialog
-482=CPrintDialog::CPrintDialog
-483=CPrintInfo::CPrintInfo
-484=CPrintPreviewState::CPrintPreviewState
-485=CProgressCtrl::CProgressCtrl
-486=CPropbagPropExchange::CPropbagPropExchange
-487=CProperty::CProperty
-488=CProperty::CProperty
-489=CPropertyPage::CPropertyPage
-490=CPropertyPage::CPropertyPage
-491=CPropertyPage::CPropertyPage
-492=CPropertySection::CPropertySection
-493=CPropertySection::CPropertySection
-494=CPropertySet::CPropertySet
-495=CPropertySet::CPropertySet
-496=CPropertySheet::CPropertySheet
-497=CPropertySheet::CPropertySheet
-498=CPropertySheet::CPropertySheet
-499=CPropsetPropExchange::CPropsetPropExchange
-500=CPtrArray::CPtrArray
-501=CPtrList::CPtrList
-502=CRecentFileList::CRecentFileList
-503=CRecordset::CRecordset
-504=CRecordView::CRecordView
-505=CRecordView::CRecordView
-506=CRectTracker::CRectTracker
-507=CRectTracker::CRectTracker
-508=CReObject::CReObject
-509=CReObject::CReObject
-510=CResetPropExchange::CResetPropExchange
-511=CRgn::CRgn
-512=CRichEditCntrItem::CRichEditCntrItem
-513=CRichEditCtrl::CRichEditCtrl
-514=CRichEditDoc::CRichEditDoc
-515=CRichEditView::CRichEditView
-516=CScrollBar::CScrollBar
-517=CScrollView::CScrollView
-518=CSemaphore::CSemaphore
-519=CSharedFile::CSharedFile
-520=CSingleDocTemplate::CSingleDocTemplate
-521=CSingleLock::CSingleLock
-522=CSliderCtrl::CSliderCtrl
-523=CSocket::CSocket
-524=CSocketFile::CSocketFile
-525=CSocketWnd::CSocketWnd
-526=CSpinButtonCtrl::CSpinButtonCtrl
-527=CSplitterWnd::CSplitterWnd
-528=CStatic::CStatic
-529=CStatusBar::CStatusBar
-530=CStatusBarCtrl::CStatusBarCtrl
-531=CStdioFile::CStdioFile
-532=CStdioFile::CStdioFile
-533=CStdioFile::CStdioFile
-534=CStockPropPage::CStockPropPage
-535=CString::CString
-536=CString::CString
-537=CString::CString
-538=CString::CString
-539=CString::CString
-540=CString::CString
-541=CStringArray::CStringArray
-542=CStringList::CStringList
-543=CSyncObject::CSyncObject
-544=CTabCtrl::CTabCtrl
-545=CTestCmdUI::CTestCmdUI
-546=CThreadSlotData::CThreadSlotData
-547=CTime::CTime
-548=CTime::CTime
-549=CTime::CTime
-550=CTime::CTime
-551=CTime::CTime
-552=CTime::CTime
-553=CTimeSpan::CTimeSpan
-554=CToolBar::CToolBar
-555=CToolBarCtrl::CToolBarCtrl
-556=CToolTipCtrl::CToolTipCtrl
-557=CTreeCtrl::CTreeCtrl
-558=CTreeView::CTreeView
-559=CUIntArray::CUIntArray
-560=CView::CView
-561=CWinApp::CWinApp
-562=CWindowDC::CWindowDC
-563=CWindowlessDC::CWindowlessDC
-564=CWinThread::CWinThread
-565=CWinThread::CWinThread
-566=CWnd::CWnd
-567=CWnd::CWnd
-568=CWordArray::CWordArray
-569=CPreviewView::PAGE_INFO::PAGE_INFO
-570=tagFONTOBJECT::tagFONTOBJECT
-571=_CIP<IBindCtx
-572=_CIP<IBindHost
-573=_CIP<IBinding
-574=_CIP<IMoniker
-575=_CIP<IServiceProvider
-576=_CIP<IStream
-577=CIP<IBindCtx
-578=CIP<IBindHost
-579=CIP<IBinding
-580=CIP<IMoniker
-581=CIP<IServiceProvider
-582=CIP<IStream
-583=CThreadLocal<AFX_MODULE_THREAD_STATE>::~CThreadLocal<AFX_MODULE_THREAD_STATE>
-584=_AFX_CHECKLIST_STATE::~_AFX_CHECKLIST_STATE
-585=_AFX_CTL3D_STATE::~_AFX_CTL3D_STATE
-586=_AFX_CTL3D_THREAD::~_AFX_CTL3D_THREAD
-587=_AFX_DAO_STATE::~_AFX_DAO_STATE
-588=_AFX_DB_STATE::~_AFX_DB_STATE
-589=_AFX_EDIT_STATE::~_AFX_EDIT_STATE
-590=???1_AFX_EXTDLL_STATE@@UAE@XZ@@YAXXZ
-591=_AFX_MAIL_STATE::~_AFX_MAIL_STATE
-592=_AFX_OLE_STATE::~_AFX_OLE_STATE
-593=_AFX_RICHEDIT_STATE::~_AFX_RICHEDIT_STATE
-594=_AFX_SOCK_STATE::~_AFX_SOCK_STATE
-595=_AFX_THREAD_STATE::~_AFX_THREAD_STATE
-596=_AFX_WIN_STATE::~_AFX_WIN_STATE
-597=_AFXCTL_UIACTIVE_INFO::~_AFXCTL_UIACTIVE_INFO
-598=???1AFX_COM@@QAE@XZ@@YAXXZ
-599=AFX_MAINTAIN_STATE::~AFX_MAINTAIN_STATE
-600=AFX_MODULE_STATE::~AFX_MODULE_STATE
-601=AFX_MODULE_THREAD_STATE::~AFX_MODULE_THREAD_STATE
-602=CAnimateCtrl::~CAnimateCtrl
-603=CArchive::~CArchive
-604=CAsyncMonikerFile::~CAsyncMonikerFile
-605=CAsyncSocket::~CAsyncSocket
-606=CBitmap::~CBitmap
-607=CBitmapButton::~CBitmapButton
-608=CBrush::~CBrush
-609=CButton::~CButton
-610=CByteArray::~CByteArray
-611=CCachedDataPathProperty::~CCachedDataPathProperty
-612=CCheckListBox::~CCheckListBox
-613=CClientDC::~CClientDC
-614=CCmdTarget::~CCmdTarget
-615=CColorButton::~CColorButton
-616=CComboBox::~CComboBox
-617=CCommandLineInfo::~CCommandLineInfo
-618=CCommonDialog::~CCommonDialog
-619=CConnectionPoint::~CConnectionPoint
-620=CControlBar::~CControlBar
-621=CCriticalSection::~CCriticalSection
-622=CCtrlView::~CCtrlView
-623=CDaoDatabase::~CDaoDatabase
-624=CDaoException::~CDaoException
-625=CDaoFieldInfo::~CDaoFieldInfo
-626=CDaoIndexFieldInfo::~CDaoIndexFieldInfo
-627=CDaoIndexInfo::~CDaoIndexInfo
-628=CDaoQueryDef::~CDaoQueryDef
-629=CDaoRecordset::~CDaoRecordset
-630=CDaoRecordView::~CDaoRecordView
-631=CDaoRelationFieldInfo::~CDaoRelationFieldInfo
-632=CDaoRelationInfo::~CDaoRelationInfo
-633=CDaoTableDef::~CDaoTableDef
-634=CDaoWorkspace::~CDaoWorkspace
-635=CDatabase::~CDatabase
-636=CDataPathProperty::~CDataPathProperty
-637=CDataSourceControl::~CDataSourceControl
-638=CDBException::~CDBException
-639=CDBVariant::~CDBVariant
-640=CDC::~CDC
-641=CDialog::~CDialog
-642=CDialogBar::~CDialogBar
-643=CDialogTemplate::~CDialogTemplate
-644=CDocItem::~CDocItem
-645=CDockBar::~CDockBar
-646=CDockContext::~CDockContext
-647=CDockState::~CDockState
-648=CDocManager::~CDocManager
-649=CDocObjectServer::~CDocObjectServer
-650=CDocObjectServerItem::~CDocObjectServerItem
-651=CDocTemplate::~CDocTemplate
-652=CDocument::~CDocument
-653=CDragListBox::~CDragListBox
-654=CDWordArray::~CDWordArray
-655=CDynLinkLibrary::~CDynLinkLibrary
-656=CEdit::~CEdit
-657=CEditView::~CEditView
-658=CEnumArray::~CEnumArray
-659=CEnumConnPoints::~CEnumConnPoints
-660=CEnumFormatEtc::~CEnumFormatEtc
-661=CEnumOleVerb::~CEnumOleVerb
-662=CEnumUnknown::~CEnumUnknown
-663=CEvent::~CEvent
-664=CException::~CException
-665=CFile::~CFile
-666=CFileDialog::~CFileDialog
-667=CFileException::~CFileException
-668=CFileFind::~CFileFind
-669=CFont::~CFont
-670=CFontComboBox::~CFontComboBox
-671=CFontDialog::~CFontDialog
-672=CFontHolder::~CFontHolder
-673=CFormView::~CFormView
-674=CFrameWnd::~CFrameWnd
-675=CFtpConnection::~CFtpConnection
-676=CFtpFileFind::~CFtpFileFind
-677=CGdiObject::~CGdiObject
-678=CGopherConnection::~CGopherConnection
-679=CGopherFile::~CGopherFile
-680=CGopherFileFind::~CGopherFileFind
-681=CGopherLocator::~CGopherLocator
-682=CHeaderCtrl::~CHeaderCtrl
-683=CHotKeyCtrl::~CHotKeyCtrl
-684=CHttpConnection::~CHttpConnection
-685=CHttpFile::~CHttpFile
-686=CImageList::~CImageList
-687=CInternetConnection::~CInternetConnection
-688=CInternetException::~CInternetException
-689=CInternetFile::~CInternetFile
-690=CInternetSession::~CInternetSession
-691=COleServerItem::CItemDataSource::~CItemDataSource
-692=CListBox::~CListBox
-693=CListCtrl::~CListCtrl
-694=CListView::~CListView
-695=CLongBinary::~CLongBinary
-696=CMapPtrToPtr::~CMapPtrToPtr
-697=CMapPtrToWord::~CMapPtrToWord
-698=CMapStringToOb::~CMapStringToOb
-699=CMapStringToPtr::~CMapStringToPtr
-700=CMapStringToString::~CMapStringToString
-701=CMapWordToOb::~CMapWordToOb
-702=CMapWordToPtr::~CMapWordToPtr
-703=CMemFile::~CMemFile
-704=CMenu::~CMenu
-705=CMetaFileDC::~CMetaFileDC
-706=CMiniFrameWnd::~CMiniFrameWnd
-707=CMirrorFile::~CMirrorFile
-708=CMonikerFile::~CMonikerFile
-709=CMultiDocTemplate::~CMultiDocTemplate
-710=CMultiLock::~CMultiLock
-711=CMutex::~CMutex
-712=CNoTrackObject::~CNoTrackObject
-713=CObArray::~CObArray
-714=CObject::~CObject
-715=CObList::~CObList
-716=CODBCFieldInfo::~CODBCFieldInfo
-717=COleBusyDialog::~COleBusyDialog
-718=COleChangeIconDialog::~COleChangeIconDialog
-719=COleChangeSourceDialog::~COleChangeSourceDialog
-720=COleClientItem::~COleClientItem
-721=COleCmdUI::~COleCmdUI
-722=COleCntrFrameWnd::~COleCntrFrameWnd
-723=COleControl::~COleControl
-724=COleControlContainer::~COleControlContainer
-725=COleControlLock::~COleControlLock
-726=COleControlSite::~COleControlSite
-727=COleConvertDialog::~COleConvertDialog
-728=COleDataObject::~COleDataObject
-729=COleDataSource::~COleDataSource
-730=COleDialog::~COleDialog
-731=COleDispatchDriver::~COleDispatchDriver
-732=COleDispatchException::~COleDispatchException
-733=COleDocIPFrameWnd::~COleDocIPFrameWnd
-734=COleDocument::~COleDocument
-735=COleDropSource::~COleDropSource
-736=COleDropTarget::~COleDropTarget
-737=COleFrameHook::~COleFrameHook
-738=COleInsertDialog::~COleInsertDialog
-739=COleIPFrameWnd::~COleIPFrameWnd
-740=COleLinkingDoc::~COleLinkingDoc
-741=COleLinksDialog::~COleLinksDialog
-742=COleMessageFilter::~COleMessageFilter
-743=COleObjectFactory::~COleObjectFactory
-744=COlePasteSpecialDialog::~COlePasteSpecialDialog
-745=COlePropertiesDialog::~COlePropertiesDialog
-746=COlePropertyPage::~COlePropertyPage
-747=COleResizeBar::~COleResizeBar
-748=COleServerDoc::~COleServerDoc
-749=COleServerItem::~COleServerItem
-750=COleStreamFile::~COleStreamFile
-751=COleTemplateServer::~COleTemplateServer
-752=COleUpdateDialog::~COleUpdateDialog
-753=COleVariant::~COleVariant
-754=CPageSetupDialog::~CPageSetupDialog
-755=CPaintDC::~CPaintDC
-756=CPalette::~CPalette
-757=CPen::~CPen
-758=CPictureHolder::~CPictureHolder
-759=CPicturePropPage::~CPicturePropPage
-760=CPreviewDC::~CPreviewDC
-761=CPreviewView::~CPreviewView
-762=CPrintDialog::~CPrintDialog
-763=CPrintInfo::~CPrintInfo
-764=CProcessLocalObject::~CProcessLocalObject
-765=CProgressCtrl::~CProgressCtrl
-766=CPropbagPropExchange::~CPropbagPropExchange
-767=CProperty::~CProperty
-768=CPropertyPage::~CPropertyPage
-769=CPropertySection::~CPropertySection
-770=CPropertySet::~CPropertySet
-771=CPropertySheet::~CPropertySheet
-772=CPtrArray::~CPtrArray
-773=CPtrList::~CPtrList
-774=CRecentFileList::~CRecentFileList
-775=CRecordset::~CRecordset
-776=CRecordView::~CRecordView
-777=CRectTracker::~CRectTracker
-778=CReObject::~CReObject
-779=CRgn::~CRgn
-780=CRichEditCntrItem::~CRichEditCntrItem
-781=CRichEditCtrl::~CRichEditCtrl
-782=CRichEditView::~CRichEditView
-783=CScrollBar::~CScrollBar
-784=CScrollView::~CScrollView
-785=CSemaphore::~CSemaphore
-786=CSharedFile::~CSharedFile
-787=CSimpleException::~CSimpleException
-788=CSingleDocTemplate::~CSingleDocTemplate
-789=CSizeComboBox::~CSizeComboBox
-790=CSliderCtrl::~CSliderCtrl
-791=CSocket::~CSocket
-792=CSocketFile::~CSocketFile
-793=CSpinButtonCtrl::~CSpinButtonCtrl
-794=CSplitterWnd::~CSplitterWnd
-795=CStatic::~CStatic
-796=CStatusBar::~CStatusBar
-797=CStatusBarCtrl::~CStatusBarCtrl
-798=CStdioFile::~CStdioFile
-799=CStockPropPage::~CStockPropPage
-800=CString::~CString
-801=CStringArray::~CStringArray
-802=CStringList::~CStringList
-803=CSyncObject::~CSyncObject
-804=CTabCtrl::~CTabCtrl
-805=CThreadLocalObject::~CThreadLocalObject
-806=CThreadSlotData::~CThreadSlotData
-807=CToolBar::~CToolBar
-808=CToolBarCtrl::~CToolBarCtrl
-809=CToolTipCtrl::~CToolTipCtrl
-810=CTreeCtrl::~CTreeCtrl
-811=CTreeView::~CTreeView
-812=CUIntArray::~CUIntArray
-813=CView::~CView
-814=CWaitCursor::~CWaitCursor
-815=CWinApp::~CWinApp
-816=CWindowDC::~CWindowDC
-817=CWinThread::~CWinThread
-818=CWnd::~CWnd
-819=CWordArray::~CWordArray
-820=tagFONTOBJECT::~tagFONTOBJECT
-821=COleControl::XEventConnPt::~XEventConnPt
-822=COleControl::XPropConnPt::~XPropConnPt
-823=operatornew
-824=CNoTrackObject::operatornew
-825=operatordelete
-826=CNoTrackObject::operatordelete
-827=CObject::operatordelete
-828=_CIP<IBindHost
-829=COleCurrency::operator=
-830=COleCurrency::operator=
-831=COleCurrency::operator=
-832=COleDateTime::operator=
-833=COleDateTime::operator=
-834=COleDateTime::operator=
-835=COleDateTime::operator=
-836=COleDateTime::operator=
-837=COleDateTimeSpan::operator=
-838=COleDateTimeSpan::operator=
-839=COleDispatchDriver::operator=
-840=COleSafeArray::operator=
-841=COleSafeArray::operator=
-842=COleSafeArray::operator=
-843=COleSafeArray::operator=
-844=COleVariant::operator=
-845=COleVariant::operator=
-846=COleVariant::operator=
-847=COleVariant::operator=
-848=COleVariant::operator=
-849=COleVariant::operator=
-850=COleVariant::operator=
-851=COleVariant::operator=
-852=COleVariant::operator=
-853=COleVariant::operator=
-854=COleVariant::operator=
-855=COleVariant::operator=
-856=COleVariant::operator=
-857=COleVariant::operator=
-858=CString::operator=
-859=CString::operator=
-860=CString::operator=
-861=CString::operator=
-862=operator>>
-863=operator>>
-864=operator>>
-865=operator>>
-866=operator>>
-867=operator>>
-868=operator>>
-869=operator>>
-870=operator>>
-871=operator>>
-872=operator>>
-873=operator>>
-874=operator>>
-875=operator>>
-876=operator>>
-877=operator>>
-878=operator>>
-879=operator>>
-880=operator>>
-881=operator>>
-882=operator<<
-883=operator<<
-884=operator<<
-885=operator<<
-886=operator<<
-887=operator<<
-888=operator<<
-889=CDumpContext::operator<<
-890=CDumpContext::operator<<
-891=CDumpContext::operator<<
-892=CDumpContext::operator<<
-893=CDumpContext::operator<<
-894=CDumpContext::operator<<
-895=CDumpContext::operator<<
-896=CDumpContext::operator<<
-897=CDumpContext::operator<<
-898=CDumpContext::operator<<
-899=CDumpContext::operator<<
-900=COleSafeArray::operator==
-901=COleSafeArray::operator==
-902=COleSafeArray::operator==
-903=COleSafeArray::operator==
-904=COleSafeArray::operator==
-905=COleSafeArray::operator==
-906=COleVariant::operator==
-907=CTime::operator==
-908=CTime::operator!=
-909=CMapPtrToPtr::operator[]
-910=CMapPtrToWord::operator[]
-911=CMapStringToOb::operator[]
-912=CMapStringToPtr::operator[]
-913=CMapStringToString::operator[]
-914=CMapWordToOb::operator[]
-915=CMapWordToPtr::operator[]
-916=COleCurrency::operator*
-917=COleCurrency::operator-
-918=COleCurrency::operator-
-919=COleDateTime::operator-
-920=COleDateTime::operator-
-921=COleDateTimeSpan::operator-
-922=operator+
-923=operator+
-924=operator+
-925=operator+
-926=operator+
-927=operator+
-928=COleCurrency::operator+
-929=COleDateTime::operator+
-930=COleDateTimeSpan::operator+
-931=COleCurrency::operator/
-932=COleCurrency::operator<
-933=COleDateTime::operator<
-934=COleCurrency::operator<=
-935=COleDateTime::operator<=
-936=COleCurrency::operator>
-937=COleDateTime::operator>
-938=COleCurrency::operator>=
-939=COleDateTime::operator>=
-940=CString::operator+=
-941=CString::operator+=
-942=CString::operator+=
-943=_AfxAbortProc
-944=??_afxAdvApi@@3UAFX_ADVAPI_CALL@@A@@YAXXZ
-945=CThreadLocal<_AFXCTL_AMBIENT_CACHE>_afxAmbientCache
-946=??_afxComDlg@@3UAFX_COMDLG_CALL@@A@@YAXXZ
-947=??_afxCommCtrl@@3UAFX_COMMCTRL_CALL@@A@@YAXXZ
-948=??_afxODBC@@3UAFX_ODBC_CALL@@A@@YAXXZ
-949=??_afxOLE@@3UAFX_OLE_CALL@@A@@YAXXZ
-950=CProcessLocal<_AFX_RICHEDIT_STATE>_afxRichEditState
-951=??_afxShell@@3UAFX_SHELL_CALL@@A@@YAXXZ
-952=??_afxSOCK@@3UAFX_SOCK_CALL@@A@@YAXXZ
-953=??_afxUrlMon@@3UAFX_URLMON_CALL@@A@@YAXXZ
-954=??_afxWinSpool@@3UAFX_WINSPOOL_CALL@@A@@YAXXZ
-955=_mbstowcsz
-956=_wcstombsz
-957=CArchive::Abort
-958=CFile::Abort
-959=CInternetFile::Abort
-960=CMemFile::Abort
-961=CMirrorFile::Abort
-962=COleStreamFile::Abort
-963=CSocketFile::Abort
-964=CStdioFile::Abort
-965=COleControlSite::XNotifyDBEvents::AboutToDo
-966=CAsyncSocket::Accept
-967=CSocket::Accept
-968=COleSafeArray::AccessData
-969=COleClientItem::Activate
-970=COlePropertyPage::XPropertyPage::Activate
-971=COleClientItem::ActivateAs
-972=CRichEditCntrItem::ActivateAs
-973=CDocObjectServer::ActivateDocObject
-974=COleServerDoc::ActivateDocObject
-975=CFrameWnd::ActivateFrame
-976=CMDIChildWnd::ActivateFrame
-977=COleServerDoc::ActivateInPlace
-978=CSplitterWnd::ActivateNext
-979=CWnd::ActivateTopParent
-980=CRecentFileList::Add
-981=CToolBarCtrl::AddBitmap
-982=CToolBarCtrl::AddBitmap
-983=COleClientItem::AddCachedData
-984=CEnumConnPoints::AddConnPoint
-985=CDocManager::AddDocTemplate
-986=CWinApp::AddDocTemplate
-987=CDocTemplate::AddDocument
-988=CMultiDocTemplate::AddDocument
-989=CSingleDocTemplate::AddDocument
-990=CFontComboBox::AddFont
-991=CEnumFormatEtc::AddFormat
-992=COlePasteSpecialDialog::AddFormat
-993=COlePasteSpecialDialog::AddFormat
-994=COleControl::AddFrameLevelUI
-995=CFrameWnd::AddFrameWnd
-996=CObList::AddHead
-997=CObList::AddHead
-998=CPtrList::AddHead
-999=CPtrList::AddHead
-1000=CSimpleList::AddHead
-1001=CStringList::AddHead
-1002=CStringList::AddHead
-1003=COleDocument::AddItem
-1004=COlePasteSpecialDialog::AddLinkEntry
-1005=CDaoRecordset::AddNew
-1006=CRecordset::AddNew
-1007=COleServerItem::AddOtherClipboardData
-1008=CPropertySheet::AddPage
-1009=CPropertySection::AddProperty
-1010=CPropertySet::AddProperty
-1011=CArchiveStream::AddRef
-1012=CBlobProperty::AddRef
-1013=CInnerUnknown::AddRef
-1014=COleConnPtContainer::AddRef
-1015=COleDispatchImpl::AddRef
-1016=COleUILinkInfo::AddRef
-1017=COleClientItem::XAdviseSink::AddRef
-1018=COleControlSite::XAmbientProps::AddRef
-1019=COleControlSite::XBoundObjectSite::AddRef
-1020=COleObjectFactory::XClassFactory::AddRef
-1021=CConnectionPoint::XConnPt::AddRef
-1022=COleControl::XDataObject::AddRef
-1023=COleDataSource::XDataObject::AddRef
-1024=COleServerDoc::XDataObject::AddRef
-1025=COleServerItem::XDataObject::AddRef
-1026=COleDropSource::XDropSource::AddRef
-1027=COleDropTarget::XDropTarget::AddRef
-1028=CEnumArray::XEnumVOID::AddRef
-1029=COleControlSite::XEventSink::AddRef
-1030=COleControl::XFontNotification::AddRef
-1031=COleMessageFilter::XMessageFilter::AddRef
-1032=COleControlSite::XNotifyDBEvents::AddRef
-1033=COleControl::XOleCache::AddRef
-1034=COleClientItem::XOleClientSite::AddRef
-1035=COleControlSite::XOleClientSite::AddRef
-1036=CDocObjectServer::XOleCommandTarget::AddRef
-1037=COleControlContainer::XOleContainer::AddRef
-1038=COleControl::XOleControl::AddRef
-1039=COleControlSite::XOleControlSite::AddRef
-1040=CDocObjectServer::XOleDocument::AddRef
-1041=CDocObjectServer::XOleDocumentView::AddRef
-1042=COleControl::XOleInPlaceActiveObject::AddRef
-1043=COleServerDoc::XOleInPlaceActiveObject::AddRef
-1044=COleFrameHook::XOleInPlaceFrame::AddRef
-1045=COleControl::XOleInPlaceObject::AddRef
-1046=COleServerDoc::XOleInPlaceObject::AddRef
-1047=COleControlContainer::XOleIPFrame::AddRef
-1048=COleClientItem::XOleIPSite::AddRef
-1049=COleControlSite::XOleIPSite::AddRef
-1050=COleLinkingDoc::XOleItemContainer::AddRef
-1051=CDocObjectServer::XOleObject::AddRef
-1052=COleControl::XOleObject::AddRef
-1053=COleServerDoc::XOleObject::AddRef
-1054=COleServerItem::XOleObject::AddRef
-1055=COlePropertiesDialog::XOleUIObjInfo::AddRef
-1056=COleControl::XPerPropertyBrowsing::AddRef
-1057=COleLinkingDoc::XPersistFile::AddRef
-1058=COleControl::XPersistMemory::AddRef
-1059=COleControl::XPersistPropertyBag::AddRef
-1060=COleControl::XPersistStorage::AddRef
-1061=COleServerDoc::XPersistStorage::AddRef
-1062=COleControl::XPersistStreamInit::AddRef
-1063=COleControl::XPointerInactive::AddRef
-1064=CDocObjectServer::XPrint::AddRef
-1065=COleControlSite::XPropertyNotifySink::AddRef
-1066=COlePropertyPage::XPropertyPage::AddRef
-1067=COlePropertyPage::XPropNotifySink::AddRef
-1068=COleControl::XProvideClassInfo::AddRef
-1069=COleControl::XQuickActivate::AddRef
-1070=CRichEditView::XRichEditOleCallback::AddRef
-1071=COleControl::XSpecifyPropertyPages::AddRef
-1072=COleControl::XViewObject::AddRef
-1073=CToolBar::AddReplaceBitmap
-1074=CHttpFile::AddRequestHeaders
-1075=CHttpFile::AddRequestHeaders
-1076=CPropertySet::AddSection
-1077=CPropertySet::AddSection
-1078=CSizeComboBox::AddSize
-1079=COlePasteSpecialDialog::AddStandardFormats
-1080=CToolBarCtrl::AddString
-1081=CObList::AddTail
-1082=CObList::AddTail
-1083=CPtrList::AddTail
-1084=CPtrList::AddTail
-1085=CStringList::AddTail
-1086=CStringList::AddTail
-1087=CToolTipCtrl::AddTool
-1088=CToolTipCtrl::AddTool
-1089=CWinApp::AddToRecentFileList
-1090=CDocument::AddView
-1091=CMetaFileDC::AdjustCP
-1092=CRichEditView::AdjustDialogPosition
-1093=CRectTracker::AdjustRect
-1094=CConnectionPoint::XConnPt::Advise
-1095=CDocObjectServer::XOleObject::Advise
-1096=COleControl::XOleObject::Advise
-1097=COleServerDoc::XOleObject::Advise
-1098=COleServerItem::XOleObject::Advise
-1099=AfxA2WHelper
-1100=AfxAbort
-1101=AfxAllocTaskAnsiString
-1102=AfxAllocTaskAnsiString
-1103=AfxAllocTaskWideString
-1104=AfxAllocTaskWideString
-1105=AfxBeginThread
-1106=AfxBeginThread
-1107=AfxBSTR2CString
-1108=AfxCallWndProc
-1109=AfxCancelModes
-1110=AfxComparePath
-1111=AfxCompareValueByRef
-1112=AfxConnectionAdvise
-1113=AfxConnectionUnadvise
-1114=AfxCopyValueByRef
-1115=AfxCoreInitModule
-1116=AfxCreateDC
-1117=AfxCriticalInit
-1118=AfxCriticalNewHandler
-1119=AfxCriticalTerm
-1120=AfxCustomLogFont
-1121=AfxDaoCheck
-1122=AfxDaoGetEngine
-1123=AfxDaoInit
-1124=AfxDaoTerm
-1125=AUX_DATAafxData
-1126=AfxDeleteObject
-1127=AfxDlgProc
-1128=AfxDllCanUnloadNow
-1129=AfxDllGetClassObject
-1130=AfxDynamicDownCast
-1131=AfxEnableControlContainer
-1132=AfxEnableWin31Compatibility
-1133=AfxEnableWin40Compatibility
-1134=AfxEndDeferRegisterClass
-1135=AfxEndThread
-1136=AfxEnumMetaFileProc
-1137=AfxExtractSubString
-1138=AfxFailMaxChars
-1139=AfxFailRadio
-1140=AfxFieldText
-1141=AfxFieldText
-1142=AfxFindMessageEntry
-1143=AfxFindResourceHandle
-1144=AfxFormatString1
-1145=AfxFormatString2
-1146=AfxFormatStrings
-1147=AfxFormatStrings
-1148=AfxFreeLibrary
-1149=AfxFullPath
-1150=AfxGetAfxWndProc
-1151=AfxGetAppModuleState
-1152=AfxGetClassIDFromString
-1153=AfxGetCtl3dState
-1154=AfxGetDaoState
-1155=AfxGetEmptyString
-1156=AfxGetFieldInfo
-1157=AfxGetFileName
-1158=AfxGetFileTitle
-1159=AfxGetIndexFieldInfo
-1160=AfxGetIndexFields
-1161=AfxGetIndexInfo
-1162=AfxGetInProcServer
-1163=AfxGetInternetHandleType
-1164=AfxGetModuleShortFileName
-1165=AfxGetModuleState
-1166=AfxGetModuleThreadState
-1167=AfxGetNewHandler
-1168=AfxGetParentOwner
-1169=AfxGetPropSheetFont
-1170=AfxGetRichEditState
-1171=AfxGetRoot
-1172=AfxGetThread
-1173=AfxGetThreadState
-1174=AfxGetTypeLibCache
-1175=AfxGlobalFree
-1176=AfxHelpEnabled
-1177=AfxHookWindowCreate
-1178=??AfxINetLoad@@YGXPAP6GHXZPBD@Z@@YAXXZ
-1179=AfxInitExtensionModule
-1180=AfxInitLocalData
-1181=AfxInitThread
-1182=AfxInternetStatusCallback
-1183=AfxIsDescendant
-1184=AfxIsValidAddress
-1185=AfxIsValidString
-1186=AfxIsValidString
-1187=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBD@Z@@YAXXZ
-1188=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBDPAP6GHXZ1@Z@@YAXXZ
-1189=AfxLoadField
-1190=AfxLoadLibrary
-1191=AfxLoadString
-1192=AfxLoadSysColorBitmap
-1193=AfxLockGlobals
-1194=AfxLockTempMaps
-1195=AfxMergeMenus
-1196=AfxMessageBox
-1197=AfxMessageBox
-1198=AfxNewHandler
-1199=AfxOleCanExitApp
-1200=AfxOleGetUserCtrl
-1201=AfxOleHookProc
-1202=AfxOleInit
-1203=AfxOleLockApp
-1204=AfxOleLockControl
-1205=AfxOleLockControl
-1206=AfxOleOnReleaseAllObjects
-1207=AfxOleRegisterControlClass
-1208=AfxOleRegisterHelper
-1209=AfxOleRegisterPropertyPageClass
-1210=AfxOleRegisterPropertyPageClass
-1211=AfxOleRegisterServerClass
-1212=AfxOleRegisterServerClassCompat
-1213=AfxOleRegisterTypeLib
-1214=AfxOleSetEditMenu
-1215=AfxOleSetUserCtrl
-1216=AfxOleTerm
-1217=AfxOleTermOrFreeLib
-1218=AfxOleTypeMatchGuid
-1219=AfxOleUnlockAllControls
-1220=AfxOleUnlockApp
-1221=AfxOleUnlockControl
-1222=AfxOleUnlockControl
-1223=AfxOleUnregisterClass
-1224=AfxOleUnregisterTypeLib
-1225=AfxParseURL
-1226=AfxPostQuitMessage
-1227=AfxPropPageCallback
-1228=AfxPropSheetCallback
-1229=AfxRegisterClass
-1230=AfxRegisterWndClass
-1231=AfxRepositionWindow
-1232=AfxResetMsgCache
-1233=AfxResolveShortcut
-1234=AfxRFXBulkDefault
-1235=AfxSafeArrayInit
-1236=AfxSetCurrentRecord
-1237=AfxSetFieldInfo
-1238=AfxSetIndexFieldInfo
-1239=AfxSetIndexInfo
-1240=AfxSetModuleState
-1241=AfxSetNewHandler
-1242=AfxSetRecordCount
-1243=AfxSetWindowText
-1244=AfxSocketInit
-1245=AfxSocketTerm
-1246=AfxStoreField
-1247=AfxStringFromCLSID
-1248=AfxTermExtensionModule
-1249=AfxTermLocalData
-1250=AfxTermThread
-1251=AfxTextFloatFormat
-1252=AfxThrowArchiveException
-1253=AfxThrowDaoException
-1254=AfxThrowDBException
-1255=AfxThrowFileException
-1256=AfxThrowInternetException
-1257=AfxThrowLastCleanup
-1258=AfxThrowMemoryException
-1259=AfxThrowNotSupportedException
-1260=AfxThrowOleDispatchException
-1261=AfxThrowOleDispatchException
-1262=AfxThrowOleException
-1263=AfxThrowResourceException
-1264=AfxThrowUserException
-1557=AfxTimeToFileTime
-1558=AfxTlsAddRef
-1559=AfxTlsRelease
-1560=AfxTryCleanup
-1561=AfxUnhookWindowCreate
-1562=AfxUnlockGlobals
-1563=AfxUnlockTempMaps
-1564=AfxUnmergeMenus
-1565=AfxVariantInit
-1566=AfxVerifyLicFile
-1567=AfxW2AHelper
-1568=AfxWinInit
-1569=AfxWinMain
-1570=AfxWinTerm
-1571=AfxWndProc
-1572=AfxWndProcBase
-1573=AfxWndProcDllOle
-1574=CMemFile::Alloc
-1575=CSharedFile::Alloc
-1576=CRecordset::AllocAndCacheFieldInfo
-1577=CString::AllocBeforeWrite
-1578=CString::AllocBuffer
-1579=CDaoRecordset::AllocCache
-1580=CDaoFieldExchange::AllocCacheValue
-1581=CDatabase::AllocConnect
-1582=CString::AllocCopy
-1583=COleSafeArray::AllocData
-1584=CDaoRecordset::AllocDatabase
-1585=CRecordset::AllocDataCache
-1586=COleSafeArray::AllocDescriptor
-1587=CControlBar::AllocElements
-1588=CStatusBar::AllocElements
-1589=CRecordset::AllocHstmt
-1590=AllocLongBinary
-1591=CRecordset::AllocRowset
-1592=CThreadSlotData::AllocSlot
-1593=CRecordset::AllocStatusArrays
-1594=CString::AllocSysString
-1595=CProperty::AllocValue
-1596=COleControl::AmbientAppearance
-1597=COleControl::AmbientBackColor
-1598=COleControl::AmbientDisplayName
-1599=COleControl::AmbientFont
-1600=COleControl::AmbientForeColor
-1601=COleControl::AmbientLocaleID
-1602=COleControl::AmbientScaleUnits
-1603=COleControl::AmbientShowGrabHandles
-1604=COleControl::AmbientShowHatching
-1605=COleControl::AmbientTextAlign
-1606=COleControl::AmbientUIDead
-1607=COleControl::AmbientUserMode
-1608=CByteArray::Append
-1609=CDaoQueryDef::Append
-1610=CDaoTableDef::Append
-1611=CDaoWorkspace::Append
-1612=CDWordArray::Append
-1613=CObArray::Append
-1614=CPtrArray::Append
-1615=CStringArray::Append
-1616=CUIntArray::Append
-1617=CWordArray::Append
-1618=CRecordset::AppendFilterAndSortSQL
-1619=CRecordset::AppendNames
-1620=CRecordset::AppendNamesValues
-1621=CDaoFieldExchange::AppendParamType
-1622=CRecordset::AppendValues
-1623=COlePropertyPage::XPropertyPage::Apply
-1624=COleDocument::ApplyPrintDevice
-1625=COleDocument::ApplyPrintDevice
-1626=CDocObjectServer::XOleDocumentView::ApplyViewState
-1627=CDC::ArcTo
-1628=CObject::AssertValid
-1629=CString::AssignCopy
-1630=CThreadSlotData::AssignInstance
-1631=CAsyncSocket::AsyncSelect
-1632=CAsyncSocket::Attach
-1633=CDC::Attach
-1634=CGdiObject::Attach
-1635=CImageList::Attach
-1636=CMemFile::Attach
-1637=CMenu::Attach
-1638=CMonikerFile::Attach
-1639=CMonikerFile::Attach
-1640=COleDataObject::Attach
-1641=COleSafeArray::Attach
-1642=COleStreamFile::Attach
-1643=COleVariant::Attach
-1644=CWnd::Attach
-1645=COleDataObject::AttachClipboard
-1646=CWnd::AttachControlSite
-1647=CWnd::AttachControlSite
-1648=COleClientItem::AttachDataObject
-1649=COleDispatchDriver::AttachDispatch
-1650=CAsyncSocket::AttachHandle
-1651=CPrintDialog::AttachOnSetup
-1652=COleControlSite::AttachWindow
-1653=CBitmapButton::AutoLoad
-1654=CSocket::AuxQueueAdd
-1655=COleMessageFilter::BeginBusyState
-1656=CDragListBox::BeginDrag
-1657=COleDataObject::BeginEnumFormats
-1658=CFrameWnd::BeginModalState
-1659=CWnd::BeginModalState
-1660=CDaoWorkspace::BeginTrans
-1661=CDatabase::BeginTrans
-1662=CCmdTarget::BeginWaitCursor
-1663=CAsyncSocket::Bind
-1664=CDataSourceControl::BindColumns
-1665=COccManager::BindControls
-1666=COleControlSite::BindDefaultProperty
-1667=CWnd::BindDefaultProperty
-1668=CDaoRecordset::BindFields
-1669=CRecordset::BindFieldsForUpdate
-1670=CRecordset::BindFieldsToColumns
-1671=CDaoRecordset::BindParameters
-1672=CDatabase::BindParameters
-1673=CRecordset::BindParams
-1674=CDataSourceControl::BindProp
-1675=CDataSourceControl::BindProp
-1676=COleControlSite::BindProperty
-1677=CWnd::BindProperty
-1678=COleControl::BoundPropertyChanged
-1679=COleControl::BoundPropertyRequestEdit
-1680=CFrameWnd::BringToTop
-1681=CDBException::BuildErrorString
-1682=CDaoRecordset::BuildParameterList
-1683=CPropertySheet::BuildPropPageArray
-1684=CDaoRecordset::BuildSelectList
-1685=CRecordset::BuildSelectSQL
-1686=COleControl::BuildSharedMenu
-1687=COleDocIPFrameWnd::BuildSharedMenu
-1688=COleIPFrameWnd::BuildSharedMenu
-1689=CDaoRecordset::BuildSQL
-1690=CRecordset::BuildSQL
-1691=CRecordset::BuildUpdateSQL
-1692=COleControl::ButtonDblClk
-1693=COleControl::ButtonDown
-1694=COleControl::ButtonUp
-1695=_AFXCTL_AMBIENT_CACHE::Cache
-1696=CTypeLibCache::Cache
-1697=COleControl::XOleCache::Cache
-1698=COleDataSource::CacheData
-1699=COleDataSource::CacheGlobalData
-1700=CTypeLibCache::CacheTypeInfo
-1701=CMiniFrameWnd::CalcBorders
-1702=CControlBar::CalcDynamicLayout
-1703=CToolBar::CalcDynamicLayout
-1704=CControlBar::CalcFixedLayout
-1705=CDialogBar::CalcFixedLayout
-1706=CDockBar::CalcFixedLayout
-1707=CStatusBar::CalcFixedLayout
-1708=CToolBar::CalcFixedLayout
-1709=CControlBar::CalcInsideRect
-1710=CStatusBar::CalcInsideRect
-1711=CToolBar::CalcLayout
-1712=CCheckListBox::CalcMinimumItemHeight
-1713=CPreviewView::CalcPageDisplaySize
-1714=CPreviewView::CalcScaleRatio
-1715=CToolBar::CalcSize
-1716=CEditView::CalcWindowRect
-1717=CMiniFrameWnd::CalcWindowRect
-1718=CScrollView::CalcWindowRect
-1719=CView::CalcWindowRect
-1720=CWnd::CalcWindowRect
-1721=CCmdTarget::CallMemberFunc
-1722=COleClientItem::CanActivate
-1723=CRichEditCntrItem::CanActivate
-1724=CSplitterWnd::CanActivateNext
-1725=CDaoRecordset::CanAppend
-1726=CDaoRecordset::CanBookmark
-1727=CRecordset::CanBookmark
-1728=CDatabase::Cancel
-1729=CRecordset::Cancel
-1730=CSocket::CancelBlockingCall
-1731=CDragListBox::CancelDrag
-1732=COleControlSite::XNotifyDBEvents::Cancelled
-1733=COleUILinkInfo::CancelLink
-1734=CDockContext::CancelLoop
-1735=CPropertyPage::CancelToClose
-1736=CWnd::CancelToolTips
-1737=CDaoRecordset::CancelUpdate
-1738=CRecordset::CancelUpdate
-1739=CDocument::CanCloseFrame
-1740=COleServerDoc::CanCloseFrame
-1741=COleClientItem::CanCreateFromData
-1742=COleClientItem::CanCreateLinkFromData
-1743=CDockContext::CanDock
-1744=CFrameWnd::CanDock
-1745=CFrameWnd::CanEnterHelpMode
-1746=COleClientItem::XOleIPSite::CanInPlaceActivate
-1747=COleControlSite::XOleIPSite::CanInPlaceActivate
-1748=COleClientItem::CanPaste
-1749=CRichEditCtrl::CanPaste
-1750=CRichEditView::CanPaste
-1751=COleClientItem::CanPasteLink
-1752=CDaoRecordset::CanRestart
-1753=CDaoRecordset::CanScroll
-1754=CDaoDatabase::CanTransact
-1755=CDaoRecordset::CanTransact
-1756=CDaoDatabase::CanUpdate
-1757=CDaoQueryDef::CanUpdate
-1758=CDaoRecordset::CanUpdate
-1759=CDaoTableDef::CanUpdate
-1760=CScrollView::CenterOnPoint
-1761=CWnd::CenterWindow
-1762=CPicturePropPage::ChangePicture
-1763=COleVariant::ChangeType
-1764=CListBox::CharToItem
-1765=CDatabase::Check
-1766=CRecordset::Check
-1767=CDialog::CheckAutoCenter
-1768=CWnd::CheckAutoCenter
-1769=CArchive::CheckCount
-1770=COleControlContainer::CheckDlgButton
-1771=CWnd::CheckDlgButton
-1772=CCheckListBox::CheckFromPoint
-1773=COleClientItem::CheckGeneral
-1774=COleControlContainer::CheckRadioButton
-1775=CWnd::CheckRadioButton
-1776=COleDateTime::CheckRange
-1777=COleDateTimeSpan::CheckRange
-1778=CRecordset::CheckRowsetCurrencyStatus
-1779=CRecordset::CheckRowsetError
-1780=CRuntimeClassconstCAnimateCtrl::classCAnimateCtrl
-1781=CRuntimeClassconstCArchiveException::classCArchiveException
-1782=CRuntimeClassconstCAsyncMonikerFile::classCAsyncMonikerFile
-1783=CRuntimeClassconstCAsyncSocket::classCAsyncSocket
-1784=CRuntimeClassconstCBitmap::classCBitmap
-1785=CRuntimeClassconstCBitmapButton::classCBitmapButton
-1786=CRuntimeClassconstCBrush::classCBrush
-1787=CRuntimeClassconstCButton::classCButton
-1788=CRuntimeClassCByteArray::classCByteArray
-1789=CRuntimeClassconstCCheckListBox::classCCheckListBox
-1790=CRuntimeClassconstCClientDC::classCClientDC
-1791=CRuntimeClassconstCCmdTarget::classCCmdTarget
-1792=CRuntimeClassconstCColorDialog::classCColorDialog
-1793=CRuntimeClassconstCColorPropPage::classCColorPropPage
-1794=CRuntimeClassconstCComboBox::classCComboBox
-1795=CRuntimeClassconstCControlBar::classCControlBar
-1796=CRuntimeClassconstCCriticalSection::classCCriticalSection
-1797=CRuntimeClassconstCCtrlView::classCCtrlView
-1798=CRuntimeClassconstCDaoDatabase::classCDaoDatabase
-1799=CRuntimeClassconstCDaoException::classCDaoException
-1800=CRuntimeClassconstCDaoQueryDef::classCDaoQueryDef
-1801=CRuntimeClassconstCDaoRecordset::classCDaoRecordset
-1802=CRuntimeClassconstCDaoRecordView::classCDaoRecordView
-1803=CRuntimeClassconstCDaoTableDef::classCDaoTableDef
-1804=CRuntimeClassconstCDaoWorkspace::classCDaoWorkspace
-1805=CRuntimeClassconstCDatabase::classCDatabase
-1806=CRuntimeClassconstCDBException::classCDBException
-1807=CRuntimeClassconstCDC::classCDC
-1808=CRuntimeClassconstCDialog::classCDialog
-1809=CRuntimeClassconstCDialogBar::classCDialogBar
-1810=CRuntimeClassCDocItem::classCDocItem
-1811=CRuntimeClassconstCDockBar::classCDockBar
-1812=CRuntimeClassCDockState::classCDockState
-1813=CRuntimeClassconstCDocManager::classCDocManager
-1814=CRuntimeClassconstCDocObjectServer::classCDocObjectServer
-1815=CRuntimeClassconstCDocObjectServerItem::classCDocObjectServerItem
-1816=CRuntimeClassconstCDocTemplate::classCDocTemplate
-1817=CRuntimeClassconstCDocument::classCDocument
-1818=CRuntimeClassconstCDragListBox::classCDragListBox
-1819=CRuntimeClassCDWordArray::classCDWordArray
-1820=CRuntimeClassconstCDynLinkLibrary::classCDynLinkLibrary
-1821=CRuntimeClassconstCEdit::classCEdit
-1822=CRuntimeClassconstCEditView::classCEditView
-1823=CRuntimeClassconstCEvent::classCEvent
-1824=CRuntimeClassconstCException::classCException
-1825=CRuntimeClassconstCFile::classCFile
-1826=CRuntimeClassconstCFileDialog::classCFileDialog
-1827=CRuntimeClassconstCFileException::classCFileException
-1828=CRuntimeClassconstCFileFind::classCFileFind
-1829=CRuntimeClassconstCFindReplaceDialog::classCFindReplaceDialog
-1830=CRuntimeClassconstCFont::classCFont
-1831=CRuntimeClassconstCFontDialog::classCFontDialog
-1832=CRuntimeClassconstCFontPropPage::classCFontPropPage
-1833=CRuntimeClassconstCFormView::classCFormView
-1834=CRuntimeClassconstCFrameWnd::classCFrameWnd
-1835=CRuntimeClassconstCGdiObject::classCGdiObject
-1836=CRuntimeClassconstCHeaderCtrl::classCHeaderCtrl
-1837=CRuntimeClassconstCHotKeyCtrl::classCHotKeyCtrl
-1838=CRuntimeClassconstCImageList::classCImageList
-1839=CRuntimeClassconstCListBox::classCListBox
-1840=CRuntimeClassconstCListCtrl::classCListCtrl
-1841=CRuntimeClassconstCListView::classCListView
-1842=CRuntimeClassconstCLongBinary::classCLongBinary
-1843=CRuntimeClassconstCMapPtrToPtr::classCMapPtrToPtr
-1844=CRuntimeClassconstCMapPtrToWord::classCMapPtrToWord
-1845=CRuntimeClassCMapStringToOb::classCMapStringToOb
-1846=CRuntimeClassconstCMapStringToPtr::classCMapStringToPtr
-1847=CRuntimeClassCMapStringToString::classCMapStringToString
-1848=CRuntimeClassCMapWordToOb::classCMapWordToOb
-1849=CRuntimeClassconstCMapWordToPtr::classCMapWordToPtr
-1850=CRuntimeClassconstCMDIChildWnd::classCMDIChildWnd
-1851=CRuntimeClassconstCMDIFrameWnd::classCMDIFrameWnd
-1852=CRuntimeClassconstCMemFile::classCMemFile
-1853=CRuntimeClassconstCMemoryException::classCMemoryException
-1854=CRuntimeClassconstCMenu::classCMenu
-1855=CRuntimeClassconstCMetaFileDC::classCMetaFileDC
-1856=CRuntimeClassconstCMiniDockFrameWnd::classCMiniDockFrameWnd
-1857=CRuntimeClassconstCMiniFrameWnd::classCMiniFrameWnd
-1858=CRuntimeClassconstCMonikerFile::classCMonikerFile
-1859=CRuntimeClassconstCMultiDocTemplate::classCMultiDocTemplate
-1860=CRuntimeClassconstCMutex::classCMutex
-1861=CRuntimeClassconstCNotSupportedException::classCNotSupportedException
-1862=CRuntimeClassCObArray::classCObArray
-1863=CRuntimeClassconstCObject::classCObject
-1864=CRuntimeClassCObList::classCObList
-1865=CRuntimeClassconstCOleBusyDialog::classCOleBusyDialog
-1866=CRuntimeClassconstCOleChangeIconDialog::classCOleChangeIconDialog
-1867=CRuntimeClassconstCOleChangeSourceDialog::classCOleChangeSourceDialog
-1868=CRuntimeClassconstCOleClientItem::classCOleClientItem
-1869=CRuntimeClassconstCOleControl::classCOleControl
-1870=CRuntimeClassconstCOleControlModule::classCOleControlModule
-1871=CRuntimeClassconstCOleConvertDialog::classCOleConvertDialog
-1872=CRuntimeClassconstCOleDialog::classCOleDialog
-1873=CRuntimeClassconstCOleDispatchException::classCOleDispatchException
-1874=CRuntimeClassconstCOleDocIPFrameWnd::classCOleDocIPFrameWnd
-1875=CRuntimeClassconstCOleDocument::classCOleDocument
-1876=CRuntimeClassconstCOleException::classCOleException
-1877=CRuntimeClassconstCOleInsertDialog::classCOleInsertDialog
-1878=CRuntimeClassconstCOleIPFrameWnd::classCOleIPFrameWnd
-1879=CRuntimeClassconstCOleLinkingDoc::classCOleLinkingDoc
-1880=CRuntimeClassconstCOleLinksDialog::classCOleLinksDialog
-1881=CRuntimeClassconstCOleObjectFactory::classCOleObjectFactory
-1882=CRuntimeClassconstCOlePasteSpecialDialog::classCOlePasteSpecialDialog
-1883=CRuntimeClassconstCOlePropertiesDialog::classCOlePropertiesDialog
-1884=CRuntimeClassconstCOlePropertyPage::classCOlePropertyPage
-1885=CRuntimeClassconstCOleResizeBar::classCOleResizeBar
-1886=CRuntimeClassconstCOleServerDoc::classCOleServerDoc
-1887=CRuntimeClassconstCOleServerItem::classCOleServerItem
-1888=CRuntimeClassconstCOleStreamFile::classCOleStreamFile
-1889=CRuntimeClassconstCOleUpdateDialog::classCOleUpdateDialog
-1890=CRuntimeClassconstCPageSetupDialog::classCPageSetupDialog
-1891=CRuntimeClassconstCPaintDC::classCPaintDC
-1892=CRuntimeClassconstCPalette::classCPalette
-1893=CRuntimeClassconstCPen::classCPen
-1894=CRuntimeClassconstCPicturePropPage::classCPicturePropPage
-1895=CRuntimeClassconstCPreviewDC::classCPreviewDC
-1896=CRuntimeClassconstCPreviewView::classCPreviewView
-1897=CRuntimeClassconstCPrintDialog::classCPrintDialog
-1898=CRuntimeClassconstCProgressCtrl::classCProgressCtrl
-1899=CRuntimeClassconstCPropertyPage::classCPropertyPage
-1900=CRuntimeClassconstCPropertySheet::classCPropertySheet
-1901=CRuntimeClassconstCPtrArray::classCPtrArray
-1902=CRuntimeClassconstCPtrList::classCPtrList
-1903=CRuntimeClassconstCRecordset::classCRecordset
-1904=CRuntimeClassconstCRecordView::classCRecordView
-1905=CRuntimeClassconstCResourceException::classCResourceException
-1906=CRuntimeClassconstCRgn::classCRgn
-1907=CRuntimeClassCRichEditCntrItem::classCRichEditCntrItem
-1908=CRuntimeClassconstCRichEditCtrl::classCRichEditCtrl
-1909=CRuntimeClassconstCRichEditDoc::classCRichEditDoc
-1910=CRuntimeClassconstCRichEditView::classCRichEditView
-1911=CRuntimeClassconstCScrollBar::classCScrollBar
-1912=CRuntimeClassconstCScrollView::classCScrollView
-1913=CRuntimeClassconstCSemaphore::classCSemaphore
-1914=CRuntimeClassconstCSharedFile::classCSharedFile
-1915=CRuntimeClassconstCSingleDocTemplate::classCSingleDocTemplate
-1916=CRuntimeClassconstCSliderCtrl::classCSliderCtrl
-1917=CRuntimeClassconstCSocket::classCSocket
-1918=CRuntimeClassconstCSocketFile::classCSocketFile
-1919=CRuntimeClassconstCSpinButtonCtrl::classCSpinButtonCtrl
-1920=CRuntimeClassconstCSplitterWnd::classCSplitterWnd
-1921=CRuntimeClassconstCStatic::classCStatic
-1922=CRuntimeClassconstCStatusBar::classCStatusBar
-1923=CRuntimeClassconstCStatusBarCtrl::classCStatusBarCtrl
-1924=CRuntimeClassconstCStdioFile::classCStdioFile
-1925=CRuntimeClassconstCStockPropPage::classCStockPropPage
-1926=CRuntimeClassCStringArray::classCStringArray
-1927=CRuntimeClassCStringList::classCStringList
-1928=CRuntimeClassconstCSyncObject::classCSyncObject
-1929=CRuntimeClassconstCTabCtrl::classCTabCtrl
-1930=CRuntimeClassconstCToolBar::classCToolBar
-1931=CRuntimeClassconstCToolBarCtrl::classCToolBarCtrl
-1932=CRuntimeClassconstCToolTipCtrl::classCToolTipCtrl
-1933=CRuntimeClassconstCTreeCtrl::classCTreeCtrl
-1934=CRuntimeClassconstCTreeView::classCTreeView
-1935=CRuntimeClassconstCUIntArray::classCUIntArray
-1936=CRuntimeClassconstCUserException::classCUserException
-1937=CRuntimeClassconstCView::classCView
-1938=CRuntimeClassconstCWinApp::classCWinApp
-1939=CRuntimeClassconstCWindowDC::classCWindowDC
-1940=CRuntimeClassconstCWinThread::classCWinThread
-1941=CRuntimeClassconstCWnd::classCWnd
-1942=CRuntimeClassCWordArray::classCWordArray
-1943=CPropertyPage::Cleanup
-1944=COlePropertyPage::CleanupObjectArray
-1945=CDBVariant::Clear
-1946=CDockState::Clear
-1947=COleVariant::Clear
-1948=CDaoRecordset::ClearDirtyFieldStatus
-1949=CRecordset::ClearDirtyFieldStatus
-1950=CRecordset::ClearFieldStatus
-1951=CDaoRecordset::ClearFieldStatusFlags
-1952=CDaoRecordset::ClearNullFieldStatus
-1953=CRecordset::ClearNullFieldStatus
-1954=CRecordset::ClearNullParamStatus
-1955=COleControl::ClientToParent
-1956=COleControl::ClipCaretRect
-1957=CPreviewDC::ClipToPage
-1958=CArchiveStream::Clone
-1959=CEnumArray::XEnumVOID::Clone
-1960=CDocObjectServer::XOleDocumentView::Clone
-1961=CArchive::Close
-1962=CAsyncMonikerFile::Close
-1963=CAsyncSocket::Close
-1964=CCachedDataPathProperty::Close
-1965=CDaoDatabase::Close
-1966=CDaoQueryDef::Close
-1967=CDaoRecordset::Close
-1968=CDaoTableDef::Close
-1969=CDaoWorkspace::Close
-1970=CDatabase::Close
-1971=CFile::Close
-1972=CFileFind::Close
-1973=CFtpConnection::Close
-1974=CGopherConnection::Close
-1975=CGopherFile::Close
-1976=CHttpConnection::Close
-1977=CHttpFile::Close
-1978=CInternetConnection::Close
-1979=CInternetFile::Close
-1980=CInternetSession::Close
-1981=CMemFile::Close
-1982=CMirrorFile::Close
-1983=CMonikerFile::Close
-1984=COleClientItem::Close
-1985=COleStreamFile::Close
-1986=CRecordset::Close
-1987=CSocket::Close
-1988=CSocketFile::Close
-1989=CStdioFile::Close
-1990=CDocObjectServer::XOleObject::Close
-1991=COleControl::XOleObject::Close
-1992=COleServerDoc::XOleObject::Close
-1993=COleServerItem::XOleObject::Close
-1994=CDocManager::CloseAllDocuments
-1995=CDocTemplate::CloseAllDocuments
-1996=CWinApp::CloseAllDocuments
-1997=CFileFind::CloseContext
-1998=CFtpFileFind::CloseContext
-1999=CGopherFileFind::CloseContext
-2000=CDocObjectServer::XOleDocumentView::CloseView
-2001=CColorButton::colGetFaceColor
-2002=AFX_OLECMDMAPconstCCmdTarget::commandMap
-2003=CStatusBar::CommandToIndex
-2004=CToolBar::CommandToIndex
-2005=CArchiveStream::Commit
-2006=COleClientItem::CommitItem
-2007=COleDocument::CommitItems
-2008=CDaoWorkspace::CommitTrans
-2009=CDatabase::CommitTrans
-2010=CPropertyPage::CommonConstruct
-2011=CPropertySheet::CommonConstruct
-2012=CWinThread::CommonConstruct
-2013=CDaoWorkspace::CompactDatabase
-2014=CDaoWorkspace::CompactDatabase
-2015=CComboBox::CompareItem
-2016=CListBox::CompareItem
-2017=CDaoFieldExchange::CompareValue
-2018=CPreviewDC::ComputeDeltas
-2019=CString::ConcatCopy
-2020=CString::ConcatInPlace
-2021=CAsyncSocket::Connect
-2022=CDatabase::Connect
-2023=CAsyncSocket::ConnectHelper
-2024=CSocket::ConnectHelper
-2025=AFX_CONNECTIONMAPconstCCmdTarget::connectionMap
-2026=AFX_CONNECTIONMAPconstCOleControl::connectionMap
-2027=COleControlSite::ConnectSink
-2028=COleTemplateServer::ConnectTemplate
-2029=COleServerDoc::ConnectView
-2030=CPropertyPage::Construct
-2031=CPropertyPage::Construct
-2032=CPropertySheet::Construct
-2033=CPropertySheet::Construct
-2034=CRectTracker::Construct
-2035=ConstructElements
-2036=ConstructElements
-2037=COleControl::XOleInPlaceActiveObject::ContextSensitiveHelp
-2038=COleServerDoc::XOleInPlaceActiveObject::ContextSensitiveHelp
-2039=COleFrameHook::XOleInPlaceFrame::ContextSensitiveHelp
-2040=COleControl::XOleInPlaceObject::ContextSensitiveHelp
-2041=COleServerDoc::XOleInPlaceObject::ContextSensitiveHelp
-2042=COleControlContainer::XOleIPFrame::ContextSensitiveHelp
-2043=COleClientItem::XOleIPSite::ContextSensitiveHelp
-2044=COleControlSite::XOleIPSite::ContextSensitiveHelp
-2045=CRichEditView::XRichEditOleCallback::ContextSensitiveHelp
-2046=CPropertySheet::ContinueModal
-2047=CWnd::ContinueModal
-2048=COleControl::ControlInfoChanged
-2049=COlePropertiesDialog::XOleUIObjInfo::ConvertObject
-2050=COleClientItem::ConvertTo
-2051=CRichEditCntrItem::ConvertTo
-2052=CByteArray::Copy
-2053=CDWordArray::Copy
-2054=CObArray::Copy
-2055=COleSafeArray::Copy
-2056=CPtrArray::Copy
-2057=CStringArray::Copy
-2058=CUIntArray::Copy
-2059=CWordArray::Copy
-2060=CString::CopyBeforeWrite
-2061=CDataSourceControl::CopyColumnID
-2062=CopyElements
-2063=CopyElements
-2064=CArchiveStream::CopyTo
-2065=COleClientItem::CopyToClipboard
-2066=COleServerItem::CopyToClipboard
-2067=CDaoFieldExchange::CopyValue
-2068=CAnimateCtrl::Create
-2069=CAsyncSocket::Create
-2070=CButton::Create
-2071=CCheckListBox::Create
-2072=CComboBox::Create
-2073=CControlFrameWnd::Create
-2074=CDaoDatabase::Create
-2075=CDaoQueryDef::Create
-2076=CDaoTableDef::Create
-2077=CDaoWorkspace::Create
-2078=CDialog::Create
-2079=CDialogBar::Create
-2080=CDockBar::Create
-2081=CEdit::Create
-2082=CFindReplaceDialog::Create
-2083=CFormView::Create
-2084=CFrameWnd::Create
-2085=CHeaderCtrl::Create
-2086=CHotKeyCtrl::Create
-2087=CImageList::Create
-2088=CImageList::Create
-2089=CImageList::Create
-2090=CImageList::Create
-2091=CListBox::Create
-2092=CListCtrl::Create
-2093=CMDIChildWnd::Create
-2094=CMiniDockFrameWnd::Create
-2095=CMiniFrameWnd::Create
-2096=COleResizeBar::Create
-2097=COleSafeArray::Create
-2098=COleSafeArray::Create
-2099=CPlex::Create
-2100=CProgressCtrl::Create
-2101=CPropertySheet::Create
-2102=CReflectorWnd::Create
-2103=CRichEditCtrl::Create
-2104=CScrollBar::Create
-2105=CSliderCtrl::Create
-2106=CSpinButtonCtrl::Create
-2107=CSplitterWnd::Create
-2108=CStatic::Create
-2109=CStatusBar::Create
-2110=CStatusBarCtrl::Create
-2111=CTabCtrl::Create
-2112=CToolBar::Create
-2113=CToolBarCtrl::Create
-2114=CToolTipCtrl::Create
-2115=CTreeCtrl::Create
-2116=CWnd::Create
-2117=CMonikerFile::CreateBindContext
-2118=CMonikerFile::CreateBindHost
-2119=CMDIFrameWnd::CreateClient
-2120=CRichEditDoc::CreateClientItem
-2121=COleClientItem::CreateCloneFrom
-2122=CSplitterWnd::CreateCommon
-2123=CConnectionPoint::CreateConnectionArray
-2124=COccManager::CreateContainer
-2125=COleControlContainer::CreateControl
-2126=COleControlSite::CreateControl
-2127=CWnd::CreateControl
-2128=CWnd::CreateControl
-2129=COleControl::CreateControlWindow
-2130=CBrush::CreateDIBPatternBrush
-2131=CFtpConnection::CreateDirectoryW
-2132=COleDispatchDriver::CreateDispatch
-2133=COleDispatchDriver::CreateDispatch
-2134=CWnd::CreateDlg
-2135=COccManager::CreateDlgControl
-2136=COccManager::CreateDlgControls
-2137=COccManager::CreateDlgControls
-2138=CWnd::CreateDlgIndirect
-2139=CWnd::CreateDlgIndirect
-2140=CListCtrl::CreateDragImage
-2141=CTreeCtrl::CreateDragImage
-2142=CPictureHolder::CreateEmpty
-2143=CMiniFrameWnd::CreateEx
-2144=CWnd::CreateEx
-2145=CDaoTableDef::CreateField
-2146=CDaoTableDef::CreateField
-2147=CFrameWnd::CreateFloatingFrame
-2148=COleControl::CreateFrameWindow
-2149=CPictureHolder::CreateFromBitmap
-2150=CPictureHolder::CreateFromBitmap
-2151=CPictureHolder::CreateFromBitmap
-2152=COleClientItem::CreateFromClipboard
-2153=COleClientItem::CreateFromData
-2154=COleClientItem::CreateFromFile
-2155=CPictureHolder::CreateFromIcon
-2156=CPictureHolder::CreateFromIcon
-2157=CPictureHolder::CreateFromMetafile
-2158=CDaoTableDef::CreateIndex
-2159=CDialog::CreateIndirect
-2160=CDialog::CreateIndirect
-2161=CDialog::CreateIndirect
-2162=CDialog::CreateIndirect
-2163=COleServerDoc::CreateInPlaceFrame
-2164=AFX_COM::CreateInstance
-2165=COleObjectFactory::XClassFactory::CreateInstance
-2166=COleObjectFactory::XClassFactory::CreateInstanceLic
-2167=COleInsertDialog::CreateItem
-2168=COlePasteSpecialDialog::CreateItem
-2169=COleClientItem::CreateLinkFromClipboard
-2170=COleClientItem::CreateLinkFromData
-2171=COleClientItem::CreateLinkFromFile
-2172=CGopherConnection::CreateLocator
-2173=CGopherConnection::CreateLocator
-2174=CGopherConnection::CreateLocator
-2175=COleStreamFile::CreateMemoryStream
-2176=CDocTemplate::CreateNewDocument
-2177=CDocTemplate::CreateNewFrame
-2178=COleClientItem::CreateNewItem
-2179=CProcessLocal<_AFX_PROPPAGEFONTINFO>::CreateObject
-2180=CProcessLocal<_AFX_BASE_MODULE_STATE>::CreateObject
-2181=CProcessLocal<_AFX_CHECKLIST_STATE>::CreateObject
-2182=CProcessLocal<_AFX_COLOR_STATE>::CreateObject
-2183=CProcessLocal<_AFX_CTL3D_STATE>::CreateObject
-2184=CProcessLocal<_AFX_DB_STATE>::CreateObject
-2185=CProcessLocal<_AFX_EDIT_STATE>::CreateObject
-2186=??CreateObject@?$CProcessLocal@V_AFX_EXTDLL_STATE@@@@SGPAVCNoTrackObject@@XZ@@YAXXZ
-2187=CProcessLocal<_AFX_MAIL_STATE>::CreateObject
-2188=CProcessLocal<_AFX_OLE_STATE>::CreateObject
-2189=CProcessLocal<_AFX_RICHEDIT_STATE>::CreateObject
-2190=CProcessLocal<_AFX_SOCK_STATE>::CreateObject
-2191=CProcessLocal<_AFX_WIN_STATE>::CreateObject
-2192=CProcessLocal<COccManager>::CreateObject
-2193=CThreadLocal<_AFX_CTL3D_THREAD>::CreateObject
-2194=CThreadLocal<_AFX_THREAD_STATE>::CreateObject
-2195=CThreadLocal<_AFXCTL_AMBIENT_CACHE>::CreateObject
-2196=CThreadLocal<AFX_MODULE_THREAD_STATE>::CreateObject
-2197=CByteArray::CreateObject
-2198=CColorPropPage::CreateObject
-2199=CDC::CreateObject
-2200=CDocItem::CreateObject
-2201=CDockState::CreateObject
-2202=CDWordArray::CreateObject
-2203=CEditView::CreateObject
-2204=CFontPropPage::CreateObject
-2205=CFrameWnd::CreateObject
-2206=CGdiObject::CreateObject
-2207=CImageList::CreateObject
-2208=CListView::CreateObject
-2209=CMapStringToOb::CreateObject
-2210=CMapStringToString::CreateObject
-2211=CMapWordToOb::CreateObject
-2212=CMDIChildWnd::CreateObject
-2213=CMDIFrameWnd::CreateObject
-2214=CMenu::CreateObject
-2215=CMiniDockFrameWnd::CreateObject
-2216=CMiniFrameWnd::CreateObject
-2217=CObArray::CreateObject
-2218=CObList::CreateObject
-2219=COleDocIPFrameWnd::CreateObject
-2220=COleIPFrameWnd::CreateObject
-2221=CPicturePropPage::CreateObject
-2222=CPreviewView::CreateObject
-2223=CRichEditCntrItem::CreateObject
-2224=CRichEditView::CreateObject
-2225=CRuntimeClass::CreateObject
-2226=CStringArray::CreateObject
-2227=CStringList::CreateObject
-2228=CTreeView::CreateObject
-2229=CWnd::CreateObject
-2230=CWordArray::CreateObject
-2231=COleControlContainer::CreateOleFont
-2232=CDocTemplate::CreateOleFrame
-2233=COleSafeArray::CreateOneDim
-2234=COleControlSite::CreateOrLoad
-2235=CFont::CreatePointFont
-2236=CFont::CreatePointFontIndirect
-2237=CPageSetupDialog::CreatePrinterDC
-2238=CPrintDialog::CreatePrinterDC
-2239=CWinApp::CreatePrinterDC
-2240=CDaoDatabase::CreateRelation
-2241=CDaoDatabase::CreateRelation
-2242=CSplitterWnd::CreateScrollBarCtrl
-2243=COccManager::CreateSite
-2244=CSplitterWnd::CreateStatic
-2245=COleClientItem::CreateStaticFromClipboard
-2246=COleClientItem::CreateStaticFromData
-2247=COleStreamFile::CreateStream
-2248=CWinThread::CreateThread
-2249=COleControl::CreateTracker
-2250=CFrameWnd::CreateView
-2251=CSplitterWnd::CreateView
-2252=CDocObjectServer::XOleDocument::CreateView
-2253=COleControl::CreateWindowForSubclassedControl
-2254=COleControl::XDataObject::DAdvise
-2255=COleDataSource::XDataObject::DAdvise
-2256=COleServerDoc::XDataObject::DAdvise
-2257=COleServerItem::XDataObject::DAdvise
-2258=DDP_Check
-2259=DDP_EndCheck
-2260=DDP_EndRadio
-2261=DDP_EndText
-2262=DDP_EndText
-2263=DDP_EndText
-2264=DDP_EndText
-2265=DDP_EndText
-2266=DDP_EndText
-2267=DDP_EndText
-2268=DDP_EndText
-2269=DDP_EndText
-2270=DDP_PostProcessing
-2271=DDP_Radio
-2272=DDP_Text
-2273=DDP_Text
-2274=DDP_Text
-2275=DDP_Text
-2276=DDP_Text
-2277=DDP_Text
-2278=DDP_Text
-2279=DDP_Text
-2280=DDP_Text
-2281=DDV_MaxChars
-2282=DDV_MinMaxByte
-2283=DDV_MinMaxDouble
-2284=DDV_MinMaxDWord
-2285=DDV_MinMaxFloat
-2286=DDV_MinMaxInt
-2287=DDV_MinMaxLong
-2288=DDV_MinMaxShort
-2289=DDV_MinMaxUInt
-2290=DDX_CBIndex
-2291=DDX_CBString
-2292=DDX_CBStringExact
-2293=DDX_Check
-2294=DDX_Control
-2295=DDX_FieldCBIndex
-2296=DDX_FieldCBIndex
-2297=DDX_FieldCBString
-2298=DDX_FieldCBString
-2299=DDX_FieldCBStringExact
-2300=DDX_FieldCBStringExact
-2301=DDX_FieldCheck
-2302=DDX_FieldCheck
-2303=DDX_FieldLBIndex
-2304=DDX_FieldLBIndex
-2305=DDX_FieldLBString
-2306=DDX_FieldLBString
-2307=DDX_FieldLBStringExact
-2308=DDX_FieldLBStringExact
-2309=DDX_FieldRadio
-2310=DDX_FieldRadio
-2311=DDX_FieldScroll
-2312=DDX_FieldScroll
-2313=DDX_FieldText
-2314=DDX_FieldText
-2315=DDX_FieldText
-2316=DDX_FieldText
-2317=DDX_FieldText
-2318=DDX_FieldText
-2319=DDX_FieldText
-2320=DDX_FieldText
-2321=DDX_FieldText
-2322=DDX_FieldText
-2323=DDX_FieldText
-2324=DDX_FieldText
-2325=DDX_FieldText
-2326=DDX_FieldText
-2327=DDX_FieldText
-2328=DDX_FieldText
-2329=DDX_FieldText
-2330=DDX_FieldText
-2331=DDX_LBIndex
-2332=DDX_LBString
-2333=DDX_LBStringExact
-2334=DDX_OCBool
-2335=DDX_OCBoolRO
-2336=DDX_OCColor
-2337=DDX_OCColorRO
-2338=DDX_OCFloat
-2339=DDX_OCFloat
-2340=DDX_OCFloatRO
-2341=DDX_OCFloatRO
-2342=DDX_OCInt
-2343=DDX_OCInt
-2344=DDX_OCIntRO
-2345=DDX_OCIntRO
-2346=DDX_OCShort
-2347=DDX_OCShortRO
-2348=DDX_OCText
-2349=DDX_OCTextRO
-2350=DDX_Radio
-2351=DDX_Scroll
-2352=DDX_Text
-2353=DDX_Text
-2354=DDX_Text
-2355=DDX_Text
-2356=DDX_Text
-2357=DDX_Text
-2358=DDX_Text
-2359=DDX_Text
-2360=DDX_Text
-2361=DDX_Text
-2362=DDX_Text
-2363=COleClientItem::Deactivate
-2364=COlePropertyPage::XPropertyPage::Deactivate
-2365=COleServerDoc::DeactivateAndUndo
-2366=COleClientItem::XOleIPSite::DeactivateAndUndo
-2367=COleControlSite::XOleIPSite::DeactivateAndUndo
-2368=COleClientItem::DeactivateUI
-2369=CDaoFieldExchange::Default
-2370=CFieldExchange::Default
-2371=CWnd::Default
-2372=CRect::DeflateRect
-2373=CRect::DeflateRect
-2374=CMDIChildWnd::DefWindowProcW
-2375=CMDIFrameWnd::DefWindowProcW
-2376=COleControl::DefWindowProcW
-2377=CWnd::DefWindowProcW
-2378=COleDataSource::DelayRenderData
-2379=COleDataSource::DelayRenderFileData
-2380=COleDataSource::DelaySetData
-2381=CControlBar::DelayShow
-2382=CFrameWnd::DelayUpdateFrameMenu
-2383=CMDIFrameWnd::DelayUpdateFrameMenu
-2384=CDaoRecordset::Delete
-2385=CException::Delete
-2386=COleClientItem::Delete
-2387=CRecordset::Delete
-2388=CWinThread::Delete
-2389=CDaoFieldExchange::DeleteCacheValue
-2390=CSplitterWnd::DeleteColumn
-2391=CDocument::DeleteContents
-2392=CEditView::DeleteContents
-2393=COleDocument::DeleteContents
-2394=COleServerDoc::DeleteContents
-2395=CRichEditDoc::DeleteContents
-2396=CRichEditView::DeleteContents
-2397=CDC::DeleteDC
-2398=CDaoTableDef::DeleteField
-2399=CDaoTableDef::DeleteField
-2400=CImageList::DeleteImageList
-2401=CDaoTableDef::DeleteIndex
-2402=CDaoTableDef::DeleteIndex
-2403=CComboBox::DeleteItem
-2404=CFontComboBox::DeleteItem
-2405=CListBox::DeleteItem
-2406=CGdiObject::DeleteObject
-2407=CRichEditView::XRichEditOleCallback::DeleteObject
-2408=CDaoDatabase::DeleteQueryDef
-2409=CDaoDatabase::DeleteRelation
-2410=CSplitterWnd::DeleteRow
-2411=CDaoDatabase::DeleteTableDef
-2412=CHandleMap::DeleteTemp
-2413=CDC::DeleteTempMap
-2414=CGdiObject::DeleteTempMap
-2415=CImageList::DeleteTempMap
-2416=CMenu::DeleteTempMap
-2417=CWnd::DeleteTempMap
-2418=CRichEditDoc::DeleteUnmarkedItems
-2419=CThreadSlotData::DeleteValues
-2420=CThreadSlotData::DeleteValues
-2421=CSplitterWnd::DeleteView
-2422=CWinApp::DelRegTree
-2423=CToolTipCtrl::DelTool
-2424=COleSafeArray::Destroy
-2425=COleControlSite::DestroyControl
-2426=COleSafeArray::DestroyData
-2427=COleSafeArray::DestroyDescriptor
-2428=CFrameWnd::DestroyDockBars
-2429=COleServerDoc::DestroyInPlaceFrame
-2430=CMenu::DestroyMenu
-2431=COleControl::DestroySharedMenu
-2432=COleDocIPFrameWnd::DestroySharedMenu
-2433=COleIPFrameWnd::DestroySharedMenu
-2434=CToolTipCtrl::DestroyToolTipCtrl
-2435=COleControl::DestroyTracker
-2436=CControlBar::DestroyWindow
-2437=CMDIChildWnd::DestroyWindow
-2438=CWnd::DestroyWindow
-2439=DestructElements
-2440=DestructElements
-2441=CAsyncSocket::Detach
-2442=CDC::Detach
-2443=CDialogTemplate::Detach
-2444=CGdiObject::Detach
-2445=CImageList::Detach
-2446=CMemFile::Detach
-2447=CMenu::Detach
-2448=CMonikerFile::Detach
-2449=COleDataObject::Detach
-2450=COleSafeArray::Detach
-2451=COleStreamFile::Detach
-2452=COleVariant::Detach
-2453=CSharedFile::Detach
-2454=CWindowlessDC::Detach
-2455=CWnd::Detach
-2456=COleDispatchDriver::DetachDispatch
-2457=CAsyncSocket::DetachHandle
-2458=COleControlSite::DetachWindow
-2459=CWinApp::DevModeChange
-2460=DFX_Binary
-2461=DFX_Bool
-2462=DFX_Byte
-2463=DFX_Currency
-2464=DFX_DateTime
-2465=DFX_Double
-2466=DFX_Long
-2467=DFX_LongBinary
-2468=DFX_Short
-2469=DFX_Single
-2470=DFX_Text
-2471=COleControlSite::XNotifyDBEvents::DidEvent
-2472=COleServerDoc::DiscardUndoState
-2473=COleClientItem::XOleIPSite::DiscardUndoState
-2474=COleControlSite::XOleIPSite::DiscardUndoState
-2475=COleDispatchImpl::Disconnect
-2476=COleControlSite::DisconnectSink
-2477=CDocument::DisconnectViews
-2478=AFX_DISPMAPconstCCmdTarget::dispatchMap
-2479=CWinThread::DispatchThreadMessage
-2480=COleControl::DisplayError
-2481=CDocObjectServer::DoBeginPrinting
-2482=CRecordset::DoBulkFieldExchange
-2483=CAsyncSocket::DoCallBack
-2484=COleChangeIconDialog::DoChangeIcon
-2485=CDockBar::DockControlBar
-2486=CFrameWnd::DockControlBar
-2487=CFrameWnd::DockControlBar
-2488=COleControl::DoClick
-2489=COleFrameHook::DoContextSensitiveHelp
-2490=COleConvertDialog::DoConvert
-2491=CColorPropPage::DoDataExchange
-2492=CFontPropPage::DoDataExchange
-2493=CPicturePropPage::DoDataExchange
-2494=CWnd::DoDataExchange
-2495=COleClientItem::DoDragDrop
-2496=COleDataSource::DoDragDrop
-2497=COleServerItem::DoDragDrop
-2498=COleFrameHook::DoEnableModeless
-2499=CDocObjectServer::DoEndPrinting
-2500=CDaoRecordset::DoFieldExchange
-2501=CRecordset::DoFieldExchange
-2502=CDocument::DoFileSave
-2503=CSplitterWnd::DoKeyboardSplit
-2504=CWinApp::DoMessageBox
-2505=CColorDialog::DoModal
-2506=CDialog::DoModal
-2507=CFileDialog::DoModal
-2508=CFontDialog::DoModal
-2509=COleBusyDialog::DoModal
-2510=COleChangeIconDialog::DoModal
-2511=COleChangeSourceDialog::DoModal
-2512=COleConvertDialog::DoModal
-2513=COleInsertDialog::DoModal
-2514=COleLinksDialog::DoModal
-2515=COlePasteSpecialDialog::DoModal
-2516=COlePropertiesDialog::DoModal
-2517=COleUpdateDialog::DoModal
-2518=CPageSetupDialog::DoModal
-2519=CPrintDialog::DoModal
-2520=CPropertySheet::DoModal
-2521=CCmdTarget::DoOleVerb
-2522=CControlBar::DoPaint
-2523=CDockBar::DoPaint
-2524=CRichEditView::DoPaste
-2525=CDocObjectServer::DoPrepareDC
-2526=CDocObjectServer::DoPreparePrinting
-2527=CView::DoPreparePrinting
-2528=CDocObjectServer::DoPrint
-2529=CWinApp::DoPrintDialog
-2530=CView::DoPrintPreview
-2531=CDocManager::DoPromptFileName
-2532=CWinApp::DoPromptFileName
-2533=COleControl::DoPropExchange
-2534=CDocument::DoSave
-2535=CSplitterWnd::DoScroll
-2536=CSplitterWnd::DoScrollBy
-2537=COleControl::DoSuperclassPaint
-2538=CCmdUI::DoUpdate
-2539=COleCmdUI::DoUpdate
-2540=COleClientItem::DoVerb
-2541=COleControlSite::DoVerb
-2542=CDocObjectServer::XOleObject::DoVerb
-2543=COleControl::XOleObject::DoVerb
-2544=COleServerDoc::XOleObject::DoVerb
-2545=COleServerItem::XOleObject::DoVerb
-2546=CWinApp::DoWaitCursor
-2547=CPreviewView::DoZoom
-2548=CDC::DPtoHIMETRIC
-2549=CDC::DPtoLP
-2550=CWnd::DragAcceptFiles
-2551=COleDropTarget::XDropTarget::DragEnter
-2552=CDragListBox::Dragging
-2553=COleDropTarget::XDropTarget::DragLeave
-2554=COleDropTarget::XDropTarget::DragOver
-2555=COleClientItem::Draw
-2556=CRectTracker::Draw
-2557=COleControl::XViewObject::Draw
-2558=CDC::Draw3dRect
-2559=CDC::Draw3dRect
-2560=CSplitterWnd::DrawAllSplitBars
-2561=CControlBar::DrawBorders
-2562=COleControl::DrawContent
-2563=CDC::DrawDragRect
-2564=CDockContext::DrawFocusRect
-2565=CDragListBox::DrawInsert
-2566=CBitmapButton::DrawItem
-2567=CButton::DrawItem
-2568=CCheckListBox::DrawItem
-2569=CColorButton::DrawItem
-2570=CComboBox::DrawItem
-2571=CFontComboBox::DrawItem
-2572=CHeaderCtrl::DrawItem
-2573=CListBox::DrawItem
-2574=CListCtrl::DrawItem
-2575=CListView::DrawItem
-2576=CMenu::DrawItem
-2577=CStatusBar::DrawItem
-2578=CStatusBarCtrl::DrawItem
-2579=CTabCtrl::DrawItem
-2580=COleControl::DrawMetafile
-2581=CDragListBox::DrawSingle
-2582=CDC::DrawTextW
-2583=CMetaFileDC::DrawTextW
-2584=CPreviewDC::DrawTextW
-2585=CRectTracker::DrawTrackerRect
-2586=COleDropTarget::XDropTarget::Drop
-2587=CDragListBox::Dropped
-2588=CObject::Dump
-2589=COleControl::XDataObject::DUnadvise
-2590=COleDataSource::XDataObject::DUnadvise
-2591=COleServerDoc::XDataObject::DUnadvise
-2592=COleServerItem::XDataObject::DUnadvise
-2593=CFile::Duplicate
-2594=CInternetFile::Duplicate
-2595=CMemFile::Duplicate
-2596=COleStreamFile::Duplicate
-2597=CSocketFile::Duplicate
-2598=CStdioFile::Duplicate
-2599=ulongconstCEditView::dwStyleDefault
-2600=CDaoRecordset::Edit
-2601=CRecordset::Edit
-2602=COlePropertyPage::XPropertyPage::EditProperty
-2603=CRichEditView::EditStreamCallBack
-2604=CDBException::Empty
-2605=COleDataSource::Empty
-2606=CString::Empty
-2607=CCheckListBox::Enable
-2608=CCmdUI::Enable
-2609=COleCmdUI::Enable
-2610=CStatusCmdUI::Enable
-2611=CTestCmdUI::Enable
-2612=CToolCmdUI::Enable
-2613=CWinApp::Enable3dControls
-2614=CCmdTarget::EnableAggregation
-2615=CCmdTarget::EnableAutomation
-2616=CRecordset::EnableBookmarks
-2617=CCmdTarget::EnableConnections
-2618=CControlBar::EnableDocking
-2619=CFrameWnd::EnableDocking
-2620=COleControlSite::EnableDSC
-2621=CWinApp::EnableModeless
-2622=COleControl::XOleInPlaceActiveObject::EnableModeless
-2623=COleServerDoc::XOleInPlaceActiveObject::EnableModeless
-2624=COleFrameHook::XOleInPlaceFrame::EnableModeless
-2625=COleControlContainer::XOleIPFrame::EnableModeless
-2626=CWnd::EnableScrollBarCtrl
-2627=CWinApp::EnableShellOpen
-2628=COleControl::EnableSimpleFrame
-2629=CPropertySheet::EnableStackedTabs
-2630=CInternetSession::EnableStatusCallback
-2631=CWnd::EnableToolTips
-2632=CCmdTarget::EnableTypeLib
-2633=COleControlSite::EnableWindow
-2634=CWnd::EnableWindow
-2635=COleMessageFilter::EndBusyState
-2636=COleLinkingDoc::EndDeferErrors
-2637=CDialog::EndDialog
-2638=CPropertySheet::EndDialog
-2639=CDockContext::EndDrag
-2640=CWnd::EndModalLoop
-2641=CFrameWnd::EndModalState
-2642=CWnd::EndModalState
-2643=CDockContext::EndResize
-2644=CCmdTarget::EndWaitCursor
-2645=COleDataObject::EnsureClipboardObject
-2646=CDocObjectServer::XOleObject::EnumAdvise
-2647=COleControl::XOleObject::EnumAdvise
-2648=COleServerDoc::XOleObject::EnumAdvise
-2649=COleServerItem::XOleObject::EnumAdvise
-2650=COleControl::XOleCache::EnumCache
-2651=COlePropertyPage::EnumChildProc
-2652=COleConnPtContainer::EnumConnectionPoints
-2653=CConnectionPoint::XConnPt::EnumConnections
-2654=COlePropertyPage::EnumControls
-2655=COleControl::XDataObject::EnumDAdvise
-2656=COleDataSource::XDataObject::EnumDAdvise
-2657=COleServerDoc::XDataObject::EnumDAdvise
-2658=COleServerItem::XDataObject::EnumDAdvise
-2659=CFontPropPage::EnumFontFamiliesCallBack
-2660=CFontPropPage::EnumFontFamiliesCallBack2
-2661=COleControl::XDataObject::EnumFormatEtc
-2662=COleDataSource::XDataObject::EnumFormatEtc
-2663=COleServerDoc::XDataObject::EnumFormatEtc
-2664=COleServerItem::XDataObject::EnumFormatEtc
-2665=COleControlContainer::XOleContainer::EnumObjects
-2666=COleLinkingDoc::XOleItemContainer::EnumObjects
-2667=CCmdTarget::EnumOleVerbs
-2668=CDocObjectServer::XOleObject::EnumVerbs
-2669=COleControl::XOleObject::EnumVerbs
-2670=COleServerDoc::XOleObject::EnumVerbs
-2671=COleServerItem::XOleObject::EnumVerbs
-2672=CDocObjectServer::XOleDocument::EnumViews
-2673=CControlBar::EraseNonClient
-2674=CFileException::ErrnoToException
-2675=CHttpFile::ErrorDlg
-2676=CDC::Escape
-2677=CMetaFileDC::Escape
-2678=CPreviewDC::Escape
-2679=AFX_EVENTMAPconstCOleControl::eventMap
-2680=AFX_EVENTSINKMAPconstCCmdTarget::eventsinkMap
-2681=CArchivePropExchange::ExchangeBlobProp
-2682=CAsyncPropExchange::ExchangeBlobProp
-2683=CPropbagPropExchange::ExchangeBlobProp
-2684=CPropsetPropExchange::ExchangeBlobProp
-2685=CResetPropExchange::ExchangeBlobProp
-2686=COleControl::ExchangeExtent
-2687=CArchivePropExchange::ExchangeFontProp
-2688=CAsyncPropExchange::ExchangeFontProp
-2689=CPropbagPropExchange::ExchangeFontProp
-2690=CPropsetPropExchange::ExchangeFontProp
-2691=CResetPropExchange::ExchangeFontProp
-2692=CArchivePropExchange::ExchangePersistentProp
-2693=CAsyncPropExchange::ExchangePersistentProp
-2694=CPropbagPropExchange::ExchangePersistentProp
-2695=CPropsetPropExchange::ExchangePersistentProp
-2696=CResetPropExchange::ExchangePersistentProp
-2697=CArchivePropExchange::ExchangeProp
-2698=CAsyncPropExchange::ExchangeProp
-2699=CPropbagPropExchange::ExchangeProp
-2700=CPropsetPropExchange::ExchangeProp
-2701=CResetPropExchange::ExchangeProp
-2702=COleControl::ExchangeStockProps
-2703=CAsyncPropExchange::ExchangeVersion
-2704=CPropExchange::ExchangeVersion
-2705=CDC::ExcludeClipRect
-2706=CDC::ExcludeClipRect
-2707=CDocObjectServer::XOleCommandTarget::Exec
-2708=CDaoDatabase::Execute
-2709=CDaoQueryDef::Execute
-2710=CWnd::ExecuteDlgInit
-2711=CWnd::ExecuteDlgInit
-2712=CRecordset::ExecuteSetPosUpdate
-2713=CDatabase::ExecuteSQL
-2714=CRecordset::ExecuteUpdateSQL
-2715=CFrameWnd::ExitHelpMode
-2716=COleControlModule::ExitInstance
-2717=CWinApp::ExitInstance
-2718=CWinThread::ExitInstance
-2719=CCmdTarget::ExternalAddRef
-2720=CCmdTarget::ExternalDisconnect
-2721=CCmdTarget::ExternalQueryInterface
-2722=CCmdTarget::ExternalRelease
-2723=CDC::ExtTextOutW
-2724=CMetaFileDC::ExtTextOutW
-2725=CPreviewDC::ExtTextOutW
-2726=CColorPropPage::CColorPropPageFactoryCColorPropPage::factory
-2727=CFontPropPage::CFontPropPageFactoryCFontPropPage::factory
-2728=CPicturePropPage::CPicturePropPageFactoryCPicturePropPage::factory
-2729=CDataExchange::Fail
-2730=COleControlSite::XNotifyDBEvents::FailedToDo
-2731=CRecordset::FetchData
-2732=CArchive::FillBuffer
-2733=CDaoRecordset::FillCache
-2734=CDaoWorkspace::FillDatabaseInfo
-2735=CDaoException::FillErrorInfo
-2736=CFontPropPage::FillFacenameList
-2737=CFontDialog::FillInLogFont
-2738=CToolTipCtrl::FillInToolInfo
-2739=CScrollView::FillOutsideRect
-2740=CDaoQueryDef::FillParameterInfo
-2741=CStockPropPage::FillPropnameList
-2742=CDaoDatabase::FillQueryDefInfo
-2743=CDaoDatabase::FillRelationInfo
-2744=CFontPropPage::FillSizeList
-2745=CDC::FillSolidRect
-2746=CDC::FillSolidRect
-2747=CColorPropPage::FillSysColors
-2748=CDaoDatabase::FillTableDefInfo
-2749=CDaoFieldExchange::FillVariant
-2750=CDaoWorkspace::FillWorkspaceInfo
-2751=CWnd::FilterToolTipMessage
-2752=CDaoRecordset::Find
-2753=CObList::Find
-2754=CPtrList::Find
-2755=CString::Find
-2756=CString::Find
-2757=CStringList::Find
-2758=CRichEditView::FindAndSelect
-2759=CDockBar::FindBar
-2760=COleConnPtContainer::FindConnectionPoint
-2761=??FindDlgItem@@YAPAVCWnd@@PAV1@K@Z@@YAXXZ
-2762=CFileFind::FindFile
-2763=CFtpFileFind::FindFile
-2764=CGopherFileFind::FindFile
-2765=CGopherFileFind::FindFile
-2766=CDaoRecordset::FindFirst
-2767=CObList::FindIndex
-2768=CPtrList::FindIndex
-2769=CStringList::FindIndex
-2770=COleControlContainer::FindItem
-2771=CDaoRecordset::FindLast
-2772=CDaoRecordset::FindNext
-2773=CFileFind::FindNextFileW
-2774=CFtpFileFind::FindNextFileW
-2775=CGopherFileFind::FindNextFileW
-2776=CString::FindOneOf
-2777=CPreviewView::FindPageRect
-2778=CDaoRecordset::FindPrev
-2779=CRecordset::FindSQLToken
-2780=CRichEditView::FindTextSimple
-2781=CRichEditView::FindTextSimple
-2782=CEditView::FindTextW
-2783=CRichEditView::FindTextW
-2784=CRichEditView::FindTextW
-2785=COleClientItem::FinishCreate
-2786=COleControl::FireError
-2787=COleControl::FireEvent
-2788=COleControlSite::XNotifyDBEvents::FireEvent
-2789=COleControl::FireEventV
-2790=CDaoRecordset::Fixup
-2791=CRecordset::Fixups
-2792=CFrameWnd::FloatControlBar
-2793=CArchive::Flush
-2794=CDumpContext::Flush
-2795=CFile::Flush
-2796=CInternetFile::Flush
-2797=CMemFile::Flush
-2798=COleStreamFile::Flush
-2799=CSocketFile::Flush
-2800=CStdioFile::Flush
-2801=COleDataSource::FlushClipboard
-2802=CRecordset::FlushResultSet
-2803=COleCurrency::Format
-2804=COleDateTime::Format
-2805=COleDateTime::Format
-2806=COleDateTime::Format
-2807=COleDateTimeSpan::Format
-2808=COleDateTimeSpan::Format
-2809=CString::Format
-2810=CString::Format
-2811=CTime::Format
-2812=CTime::Format
-2813=CTime::Format
-2814=CTimeSpan::Format
-2815=CTimeSpan::Format
-2816=CTimeSpan::Format
-2817=CTime::FormatGmt
-2818=CTime::FormatGmt
-2819=CTime::FormatGmt
-2820=CString::FormatMessageW
-2821=CString::FormatMessageW
-2822=CString::FormatV
-2823=COleControl::ForwardActivationMsg
-2824=CDatabase::Free
-2825=CMemFile::Free
-2826=CSharedFile::Free
-2827=CMapPtrToPtr::FreeAssoc
-2828=CMapPtrToWord::FreeAssoc
-2829=CMapStringToOb::FreeAssoc
-2830=CMapStringToPtr::FreeAssoc
-2831=CMapStringToString::FreeAssoc
-2832=CMapWordToOb::FreeAssoc
-2833=CMapWordToPtr::FreeAssoc
-2834=CDaoRecordset::FreeCache
-2835=CRecordset::FreeDataCache
-2836=CPlex::FreeDataChain
-2837=CByteArray::FreeExtra
-2838=CDWordArray::FreeExtra
-2839=CObArray::FreeExtra
-2840=CPtrArray::FreeExtra
-2841=CString::FreeExtra
-2842=CStringArray::FreeExtra
-2843=CUIntArray::FreeExtra
-2844=CWordArray::FreeExtra
-2845=CObList::FreeNode
-2846=CPtrList::FreeNode
-2847=CStringList::FreeNode
-2848=CRecordset::FreeRowset
-2849=CThreadSlotData::FreeSlot
-2850=CProperty::FreeValue
-2851=COleControl::XViewObject::Freeze
-2852=COleControl::XOleControl::FreezeEvents
-2853=COleClientItem::FreezeLink
-2854=CDC::FromHandle
-2855=CGdiObject::FromHandle
-2856=CHandleMap::FromHandle
-2857=CImageList::FromHandle
-2858=CMenu::FromHandle
-2859=CWnd::FromHandle
-2860=CImageList::FromHandlePermanent
-2861=CMenu::FromHandlePermanent
-2862=CWnd::FromHandlePermanent
-2863=CCmdTarget::FromIDispatch
-2864=CProperty::Get
-2865=CProperty::Get
-2866=CPropertySection::Get
-2867=CPropertySection::Get
-2868=CPropertySet::Get
-2869=CPropertySet::Get
-2870=CDaoRecordset::GetAbsolutePosition
-2871=COleControl::GetActivationPolicy
-2872=COleControl::XPointerInactive::GetActivationPolicy
-2873=CFrameWnd::GetActiveDocument
-2874=CFrameWnd::GetActiveFrame
-2875=CMDIFrameWnd::GetActiveFrame
-2876=CPropertySheet::GetActiveIndex
-2877=CPropertySheet::GetActivePage
-2878=CSplitterWnd::GetActivePane
-2879=CFrameWnd::GetActiveView
-2880=COleControl::XViewObject::GetAdvise
-2881=COleControl::GetAmbientDispatchDriver
-2882=COleControlContainer::GetAmbientProp
-2883=COleControl::GetAmbientProperty
-2884=COleControl::GetAppearance
-2885=CWinApp::GetAppRegistryKey
-2886=CMapPtrToPtr::GetAssocAt
-2887=CMapPtrToWord::GetAssocAt
-2888=CMapStringToOb::GetAssocAt
-2889=CMapStringToPtr::GetAssocAt
-2890=CMapStringToString::GetAssocAt
-2891=CMapWordToOb::GetAssocAt
-2892=CMapWordToPtr::GetAssocAt
-2893=CStringArray::GetAt
-2894=CGopherConnection::GetAttribute
-2895=CDaoTableDef::GetAttributes
-2896=COleControl::GetBackColor
-2897=CControlBar::GetBarInfo
-2898=CDockBar::GetBarInfo
-2899=CAsyncMonikerFile::GetBindInfo
-2900=CBlobProperty::GetBlob
-2901=CDaoRecordset::GetBookmark
-2902=CRecordset::GetBookmark
-2903=COleFrameHook::XOleInPlaceFrame::GetBorder
-2904=COleControlContainer::XOleIPFrame::GetBorder
-2905=CStatusBarCtrl::GetBorders
-2906=COleControl::GetBorderStyle
-2907=CDataSourceControl::GetBoundClientRow
-2908=CRecordset::GetBoundFieldIndex
-2909=CRecordset::GetBoundParamIndex
-2910=CString::GetBuffer
-2911=CEditView::GetBufferLength
-2912=CFile::GetBufferPtr
-2913=CMemFile::GetBufferPtr
-2914=CString::GetBufferSetLength
-2915=CToolBar::GetButtonInfo
-2916=CToolBar::GetButtonStyle
-2917=CToolBar::GetButtonText
-2918=CToolBar::GetButtonText
-2919=CPropertySet::GetByteOrder
-2920=COleClientItem::GetCachedExtent
-2921=COleDataSource::GetCacheEntry
-2922=CDaoRecordset::GetCacheSize
-2923=CDaoRecordset::GetCacheStart
-2924=CDaoFieldExchange::GetCacheValue
-2925=COleControl::XDataObject::GetCanonicalFormatEtc
-2926=COleDataSource::XDataObject::GetCanonicalFormatEtc
-2927=COleServerDoc::XDataObject::GetCanonicalFormatEtc
-2928=COleServerItem::XDataObject::GetCanonicalFormatEtc
-2929=COleControl::GetCapture
-2930=CFontDialog::GetCharFormat
-2931=CRichEditView::GetCharFormatSelection
-2932=CCheckListBox::GetCheck
-2933=CWnd::GetCheckedRadioButton
-2934=CBlobProperty::GetClassID
-2935=CColorPropPage::GetClassID
-2936=CFontPropPage::GetClassID
-2937=COleClientItem::GetClassID
-2938=CPicturePropPage::GetClassID
-2939=CPropertySet::GetClassID
-2940=COleLinkingDoc::XPersistFile::GetClassID
-2941=COleControl::XPersistMemory::GetClassID
-2942=COleControl::XPersistPropertyBag::GetClassID
-2943=COleControl::XPersistStorage::GetClassID
-2944=COleServerDoc::XPersistStorage::GetClassID
-2945=COleControl::XPersistStreamInit::GetClassID
-2946=COleControl::XProvideClassInfo::GetClassInfoW
-2947=AFX_COM::GetClassObject
-2948=COleControl::GetClientOffset
-2949=COleControl::GetClientRect
-2950=COleClientItem::GetClientSite
-2951=COleControl::GetClientSite
-2952=CRichEditCntrItem::GetClientSite
-2953=CDocObjectServer::XOleObject::GetClientSite
-2954=COleControl::XOleObject::GetClientSite
-2955=COleServerDoc::XOleObject::GetClientSite
-2956=COleServerItem::XOleObject::GetClientSite
-2957=COleClientItem::GetClipboardData
-2958=COleServerItem::GetClipboardData
-2959=CRichEditView::GetClipboardData
-2960=CDocObjectServer::XOleObject::GetClipboardData
-2961=COleControl::XOleObject::GetClipboardData
-2962=COleServerDoc::XOleObject::GetClipboardData
-2963=COleServerItem::XOleObject::GetClipboardData
-2964=CRichEditView::XRichEditOleCallback::GetClipboardData
-2965=COleDataSource::GetClipboardOwner
-2966=CDC::GetClipBox
-2967=CMetaFileDC::GetClipBox
-2968=CColorPropPage::GetColorProp
-2969=COleControl::XViewObject::GetColorSet
-2970=CSplitterWnd::GetColumnInfo
-2971=CCmdTarget::GetCommandMap
-2972=CDaoDatabase::GetConnect
-2973=CDaoQueryDef::GetConnect
-2974=CDaoTableDef::GetConnect
-2975=CDatabase::GetConnectInfo
-2976=CConnectionPoint::GetConnectionCount
-2977=CCmdTarget::GetConnectionHook
-2978=COleControl::GetConnectionHook
-2979=CConnectionPoint::XConnPt::GetConnectionInterface
-2980=CCmdTarget::GetConnectionMap
-2981=COleControl::GetConnectionMap
-2982=CConnectionPoint::XConnPt::GetConnectionPointContainer
-2983=CConnectionPoint::GetConnections
-2984=CConnectionPoint::GetContainer
-2985=COleDocument::GetContainer
-2986=COleLinkingDoc::GetContainer
-2987=COleClientItem::XOleClientSite::GetContainer
-2988=COleControlSite::XOleClientSite::GetContainer
-2989=COleControl::XQuickActivate::GetContentExtent
-2990=CRichEditView::GetContextMenu
-2991=CRichEditView::XRichEditOleCallback::GetContextMenu
-2992=CFrameWnd::GetControlBar
-2993=COleControl::GetControlFlags
-2994=COleControlSite::GetControlInfo
-2995=COleControl::XOleControl::GetControlInfo
-2996=CDocObjectServer::GetControllingFrame
-2997=CCmdTarget::GetControllingUnknown
-2998=COleControl::GetControlSize
-2999=COlePropertyPage::GetControlStatus
-3000=CWnd::GetControlUnknown
-3001=COlePropertiesDialog::XOleUIObjInfo::GetConvertInfo
-3002=CPrintDialog::GetCopies
-3003=CPropertySection::GetCount
-3004=CPropertySet::GetCount
-3005=CFileFind::GetCreationTime
-3006=CFileFind::GetCreationTime
-3007=CGopherFileFind::GetCreationTime
-3008=CGopherFileFind::GetCreationTime
-3009=COleLinkingDoc::XPersistFile::GetCurFile
-3010=CFtpConnection::GetCurrentDirectoryAsURL
-3011=CFtpConnection::GetCurrentDirectoryAsURL
-3012=CFtpConnection::GetCurrentDirectoryW
-3013=CFtpConnection::GetCurrentDirectoryW
-3014=CFontDialog::GetCurrentFont
-3015=CDaoRecordset::GetCurrentIndex
-3016=CWnd::GetCurrentMessage
-3017=CFontComboBox::GetCurrentName
-3018=CDataBoundProperty::GetCursor
-3019=CDataSourceControl::GetCursor
-3020=COleControlSite::GetCursor
-3021=COleControlSite::XBoundObjectSite::GetCursor
-3022=COleDataObject::GetData
-3023=CProcessLocalObject::GetData
-3024=CRecordset::GetData
-3025=CThreadLocalObject::GetData
-3026=COleControl::XDataObject::GetData
-3027=COleDataSource::XDataObject::GetData
-3028=COleServerDoc::XDataObject::GetData
-3029=COleServerItem::XDataObject::GetData
-3030=CDaoRecordset::GetDataAndFixupNulls
-3031=CDaoWorkspace::GetDatabaseCount
-3032=CDaoWorkspace::GetDatabaseInfo
-3033=CDaoWorkspace::GetDatabaseInfo
-3034=CDatabase::GetDatabaseName
-3035=CRecordset::GetDataBuffer
-3036=COleControl::XDataObject::GetDataHere
-3037=COleDataSource::XDataObject::GetDataHere
-3038=COleServerDoc::XDataObject::GetDataHere
-3039=COleServerItem::XDataObject::GetDataHere
-3040=CThreadLocalObject::GetDataNA
-3041=COleServerItem::GetDataObject
-3042=COleControl::GetDataSource
-3043=CDaoQueryDef::GetDateCreated
-3044=CDaoRecordset::GetDateCreated
-3045=CDaoTableDef::GetDateCreated
-3046=CDaoQueryDef::GetDateLastUpdated
-3047=CDaoRecordset::GetDateLastUpdated
-3048=CDaoTableDef::GetDateLastUpdated
-3049=COleDateTime::GetDay
-3050=COleDateTime::GetDayOfWeek
-3051=COleDateTime::GetDayOfYear
-3052=COleControl::GetDC
-3053=CDocument::GetDefaultAccelerator
-3054=CFrameWnd::GetDefaultAccelerator
-3055=COleServerDoc::GetDefaultAccelerator
-3056=CRichEditCtrl::GetDefaultCharFormat
-3057=CRecordset::GetDefaultConnect
-3058=CDaoRecordset::GetDefaultDBName
-3059=CRecordset::GetDefaultFieldType
-3060=CDocument::GetDefaultMenu
-3061=COleServerDoc::GetDefaultMenu
-3062=CPrintDialog::GetDefaults
-3063=CDaoRecordset::GetDefaultSQL
-3064=CRecordset::GetDefaultSQL
-3065=COccManager::GetDefBtnCode
-3066=COleControlSite::GetDefBtnCode
-3067=CWnd::GetDescendantWindow
-3068=CPageSetupDialog::GetDeviceName
-3069=CPrintDialog::GetDeviceName
-3070=CScrollView::GetDeviceScrollPosition
-3071=CScrollView::GetDeviceScrollSizes
-3072=CPageSetupDialog::GetDevMode
-3073=CPrintDialog::GetDevMode
-3074=CCmdTarget::GetDispatchIID
-3075=COleControl::GetDispatchIID
-3076=CCmdTarget::GetDispatchMap
-3077=COleControlContainer::GetDispatchMap
-3078=CCmdTarget::GetDispEntry
-3079=CRecentFileList::GetDisplayName
-3080=CFontHolder::GetDisplayString
-3081=CPictureHolder::GetDisplayString
-3082=COleControl::XPerPropertyBrowsing::GetDisplayString
-3083=COleControlSite::GetDlgCtrlID
-3084=CWnd::GetDlgCtrlID
-3085=COleControlContainer::GetDlgItem
-3086=COleControlContainer::GetDlgItem
-3087=CWnd::GetDlgItem
-3088=CWnd::GetDlgItem
-3089=COleControlContainer::GetDlgItemInt
-3090=CWnd::GetDlgItemInt
-3091=COleControlContainer::GetDlgItemTextW
-3092=CWnd::GetDlgItemTextW
-3093=CWnd::GetDlgItemTextW
-3094=CDockContext::GetDockBar
-3095=CDockBar::GetDockedControlBar
-3096=CDockBar::GetDockedCount
-3097=CDockBar::GetDockedVisibleCount
-3098=CControlBar::GetDockingFrame
-3099=CFrameWnd::GetDockState
-3100=CDocObjectServer::XOleDocument::GetDocMiscStatus
-3101=COleServerDoc::GetDocObjectServer
-3102=CDocTemplate::GetDocString
-3103=CDocObjectServer::XOleDocumentView::GetDocument
-3104=CRichEditView::XRichEditOleCallback::GetDragDropEffect
-3105=CPageSetupDialog::GetDriverName
-3106=CPrintDialog::GetDriverName
-3107=COleControl::XOleInPlaceObject::GetDropTarget
-3108=CWnd::GetDSCCursor
-3109=CDaoRecordset::GetEditMode
-3110=COleSafeArray::GetElement
-3111=COleServerDoc::GetEmbeddedItem
-3112=COleClientItem::GetEmbeddedItemData
-3113=COleServerItem::GetEmbedSourceData
-3114=COleControl::GetEnabled
-3115=CCmdTarget::GetEntryCount
-3116=CDaoException::GetErrorCount
-3117=CDaoException::GetErrorInfo
-3118=CArchiveException::GetErrorMessage
-3119=CDaoException::GetErrorMessage
-3120=CDBException::GetErrorMessage
-3121=CException::GetErrorMessage
-3122=CFileException::GetErrorMessage
-3123=CInternetException::GetErrorMessage
-3124=COleDispatchException::GetErrorMessage
-3125=COleException::GetErrorMessage
-3126=CSimpleException::GetErrorMessage
-3127=COleControlSite::GetEventIID
-3128=COleControl::GetEventMap
-3129=COleControl::GetEventMapEntry
-3130=CCmdTarget::GetEventSinkEntry
-3131=CCmdTarget::GetEventSinkMap
-3132=COleControlSite::GetExStyle
-3133=CWnd::GetExStyle
-3134=COleControl::GetExtendedControl
-3135=COleControlSite::XOleControlSite::GetExtendedControl
-3136=COleClientItem::GetExtent
-3137=CDocObjectServer::XOleObject::GetExtent
-3138=COleControl::XOleObject::GetExtent
-3139=COleServerDoc::XOleObject::GetExtent
-3140=COleServerItem::XOleObject::GetExtent
-3141=COleControl::XViewObject::GetExtent
-3142=CCmdTarget::GetExtraConnectionPoints
-3143=COleControl::GetExtraConnectionPoints
-3144=CFontDialog::GetFaceName
-3145=CDaoQueryDef::GetFieldCount
-3146=CDaoRecordset::GetFieldCount
-3147=CDaoTableDef::GetFieldCount
-3148=CDaoRecordset::GetFieldIndex
-3149=CRecordset::GetFieldIndexByName
-3150=CDaoQueryDef::GetFieldInfo
-3151=CDaoQueryDef::GetFieldInfo
-3152=CDaoRecordset::GetFieldInfo
-3153=CDaoRecordset::GetFieldInfo
-3154=CDaoTableDef::GetFieldInfo
-3155=CDaoTableDef::GetFieldInfo
-3156=CDaoRecordset::GetFieldLength
-3157=CRecordset::GetFieldLengthBuffer
-3158=CRecordset::GetFieldStatus
-3159=CDaoRecordset::GetFieldValue
-3160=CDaoRecordset::GetFieldValue
-3161=CDaoRecordset::GetFieldValue
-3162=CDaoRecordset::GetFieldValue
-3163=CRecordset::GetFieldValue
-3164=CRecordset::GetFieldValue
-3165=CRecordset::GetFieldValue
-3166=CRecordset::GetFieldValue
-3167=CDocument::GetFile
-3168=CFtpConnection::GetFile
-3169=COleDataObject::GetFileData
-3170=CFileDialog::GetFileExt
-3171=CFile::GetFileName
-3172=CFileDialog::GetFileName
-3173=CFileFind::GetFileName
-3174=CGopherFileFind::GetFileName
-3175=CFile::GetFilePath
-3176=CFileFind::GetFilePath
-3177=CGopherFileFind::GetFilePath
-3178=CFile::GetFileTitle
-3179=CFileDialog::GetFileTitle
-3180=CFileFind::GetFileTitle
-3181=CGopherFileFind::GetFileTitle
-3182=COleServerDoc::GetFileTypeString
-3183=CFileFind::GetFileURL
-3184=CFtpFileFind::GetFileURL
-3185=CGopherFileFind::GetFileURL
-3186=CHttpFile::GetFileURL
-3187=CFindReplaceDialog::GetFindString
-3188=CMultiDocTemplate::GetFirstDocPosition
-3189=CSingleDocTemplate::GetFirstDocPosition
-3190=CDocManager::GetFirstDocTemplatePosition
-3191=CWinApp::GetFirstDocTemplatePosition
-3192=COleDocument::GetFirstFrame
-3193=CDocument::GetFirstViewPosition
-3194=COleControl::GetFocus
-3195=CFileDialog::GetFolderPath
-3196=CDialogTemplate::GetFont
-3197=CDialogTemplate::GetFont
-3198=COleControl::GetFont
-3199=CFontHolder::GetFontDispatch
-3200=CFontHolder::GetFontHandle
-3201=CFontHolder::GetFontHandle
-3202=CFontComboBox::GetFontItem
-3203=CFontPropPage::GetFontProps
-3204=CDialogTemplate::GetFontSizeField
-3205=COleControl::GetFontTextMetrics
-3206=CFontComboBox::GetFontType
-3207=COleControl::GetForeColor
-3208=CPropertySection::GetFormatID
-3209=CPropertySet::GetFormatVersion
-3210=CInternetSession::GetFtpConnection
-3211=COleDataObject::GetGlobalData
-3212=CTime::GetGmtTm
-3213=CInternetSession::GetGopherConnection
-3214=COleControl::XProvideClassInfo::GetGUID
-3215=CDC::GetHalftoneBrush
-3216=CRectTracker::GetHandleMask
-3217=CRectTracker::GetHandleRect
-3218=CRectTracker::GetHandleSize
-3219=CSizeComboBox::GetHeight
-3220=CSplitterWnd::GetHitRect
-3221=CHotKeyCtrl::GetHotKey
-3222=COleDateTime::GetHour
-3223=COleDateTimeSpan::GetHours
-3224=CInternetSession::GetHttpConnection
-3225=COleControl::GetHwnd
-3226=COleClientItem::GetIconicMetafile
-3227=CFrameWnd::GetIconWndClass
-3228=COleControlSite::GetID
-3229=CProperty::GetID
-3230=CPropertySection::GetID
-3231=COleDataObject::GetIDataObject
-3232=CCmdTarget::GetIDispatch
-3233=COleDispatchImpl::GetIDsOfNames
-3234=COleControlSite::XAmbientProps::GetIDsOfNames
-3235=COleControlSite::XEventSink::GetIDsOfNames
-3236=COleControl::XEventConnPt::GetIID
-3237=COleControl::XPropConnPt::GetIID
-3238=CDaoRecordset::GetIndexCount
-3239=CDaoTableDef::GetIndexCount
-3240=CDaoRecordset::GetIndexInfo
-3241=CDaoRecordset::GetIndexInfo
-3242=CDaoTableDef::GetIndexInfo
-3243=CDaoTableDef::GetIndexInfo
-3244=CDaoWorkspace::GetIniPath
-3245=COleDocument::GetInPlaceActiveItem
-3246=CRichEditDoc::GetInPlaceActiveItem
-3247=CRichEditView::GetInPlaceActiveItem
-3248=CRichEditView::XRichEditOleCallback::GetInPlaceContext
-3249=COleIPFrameWnd::GetInPlaceMenu
-3250=CDocObjectServer::XOleDocumentView::GetInPlaceSite
-3251=COleClientItem::GetInPlaceWindow
-3252=CSplitterWnd::GetInsideRect
-3253=CCmdTarget::GetInterface
-3254=CCmdTarget::GetInterfaceHook
-3255=COleControl::GetInterfaceHook
-3256=COleServerDoc::GetInterfaceHook
-3257=CCmdTarget::GetInterfaceMap
-3258=CDocObjectServer::GetInterfaceMap
-3259=CEnumConnPoints::GetInterfaceMap
-3260=CEnumFormatEtc::GetInterfaceMap
-3261=CEnumOleVerb::GetInterfaceMap
-3262=CEnumUnknown::GetInterfaceMap
-3263=COleClientItem::GetInterfaceMap
-3264=COleControl::GetInterfaceMap
-3265=COleControlContainer::GetInterfaceMap
-3266=COleControlSite::GetInterfaceMap
-3267=COleDataSource::GetInterfaceMap
-3268=COleDropSource::GetInterfaceMap
-3269=COleDropTarget::GetInterfaceMap
-3270=COleFrameHook::GetInterfaceMap
-3271=COleLinkingDoc::GetInterfaceMap
-3272=COleMessageFilter::GetInterfaceMap
-3273=COleObjectFactory::GetInterfaceMap
-3274=COlePropertyPage::GetInterfaceMap
-3275=COleServerDoc::GetInterfaceMap
-3276=COleServerItem::GetInterfaceMap
-3277=CRichEditView::GetInterfaceMap
-3278=CRichEditCtrl::GetIRichEditOle
-3279=CDaoWorkspace::GetIsolateODBCTrans
-3280=COleServerDoc::GetItemClipRect
-3281=CListCtrl::GetItemData
-3282=CTreeCtrl::GetItemData
-3283=CStatusBar::GetItemID
-3284=CToolBar::GetItemID
-3285=CTreeCtrl::GetItemImage
-3286=COleClientItem::GetItemName
-3287=COleServerDoc::GetItemPosition
-3288=CListCtrl::GetItemRect
-3289=CStatusBar::GetItemRect
-3290=CToolBar::GetItemRect
-3291=CTreeCtrl::GetItemRect
-3292=CTreeCtrl::GetItemState
-3293=COleClientItem::GetItemStorage
-3294=COleClientItem::GetItemStorageCompound
-3295=COleClientItem::GetItemStorageFlat
-3296=CListCtrl::GetItemText
-3297=CListCtrl::GetItemText
-3298=CTreeCtrl::GetItemText
-3299=CFileFind::GetLastAccessTime
-3300=CFileFind::GetLastAccessTime
-3301=CGopherFileFind::GetLastAccessTime
-3302=CGopherFileFind::GetLastAccessTime
-3303=CDaoRecordset::GetLastModifiedBookmark
-3304=COleUILinkInfo::GetLastUpdate
-3305=CFileFind::GetLastWriteTime
-3306=CFileFind::GetLastWriteTime
-3307=CGopherFileFind::GetLastWriteTime
-3308=CGopherFileFind::GetLastWriteTime
-3309=CRecordset::GetLBFetchSize
-3310=COleSafeArray::GetLBound
-3311=CRecordset::GetLBReallocSize
-3312=CComboBox::GetLBText
-3313=CFile::GetLength
-3314=CFileFind::GetLength
-3315=CGopherFileFind::GetLength
-3316=CInternetFile::GetLength
-3317=COleStreamFile::GetLength
-3318=CSocketFile::GetLength
-3319=CFileFind::GetLength64
-3320=CGopherFileFind::GetLength64
-3321=COleObjectFactory::GetLicenseKey
-3322=COleObjectFactory::XClassFactory::GetLicInfo
-3323=CRichEditCtrl::GetLine
-3324=CRichEditCtrl::GetLine
-3325=COleUILinkInfo::GetLinkSource
-3326=COleClientItem::GetLinkSourceData
-3327=COleServerItem::GetLinkSourceData
-3328=COleClientItem::GetLinkUpdateOptions
-3329=COleUILinkInfo::GetLinkUpdateOptions
-3330=CPropertySection::GetList
-3331=CPropertySet::GetList
-3332=CTime::GetLocalTm
-3333=CGopherFileFind::GetLocator
-3334=CDaoRecordset::GetLockingMode
-3335=CFontComboBox::GetLogFont
-3336=CDaoWorkspace::GetLoginTimeout
-3337=CFieldExchange::GetLongBinaryData
-3338=CRecordset::GetLongBinaryDataAndCleanup
-3339=CFieldExchange::GetLongBinarySize
-3340=CRecordset::GetLongCharDataAndCleanup
-3341=CWinThread::GetMainWnd
-3342=CPageSetupDialog::GetMargins
-3343=CConnectionPoint::GetMaxConnections
-3344=CMDIChildWnd::GetMDIFrame
-3345=CFrameWnd::GetMessageBar
-3346=CMDIChildWnd::GetMessageBar
-3347=CCheckListBox::GetMessageMap
-3348=CCmdTarget::GetMessageMap
-3349=CColorDialog::GetMessageMap
-3350=CColorPropPage::GetMessageMap
-3351=CCommonDialog::GetMessageMap
-3352=CControlBar::GetMessageMap
-3353=CControlFrameWnd::GetMessageMap
-3354=CCtrlView::GetMessageMap
-3355=CDaoRecordView::GetMessageMap
-3356=CDialog::GetMessageMap
-3357=CDialogBar::GetMessageMap
-3358=CDockBar::GetMessageMap
-3359=CDocObjectServer::GetMessageMap
-3360=CDocument::GetMessageMap
-3361=CEditView::GetMessageMap
-3362=CFontPropPage::GetMessageMap
-3363=CFormView::GetMessageMap
-3364=CFrameWnd::GetMessageMap
-3365=CListCtrl::GetMessageMap
-3366=CListView::GetMessageMap
-3367=CMDIChildWnd::GetMessageMap
-3368=CMDIFrameWnd::GetMessageMap
-3369=CMiniDockFrameWnd::GetMessageMap
-3370=CMiniFrameWnd::GetMessageMap
-3371=COleControl::GetMessageMap
-3372=COleDocIPFrameWnd::GetMessageMap
-3373=COleIPFrameWnd::GetMessageMap
-3374=COlePropertyPage::GetMessageMap
-3375=COleResizeBar::GetMessageMap
-3376=COleServerDoc::GetMessageMap
-3377=CPicturePropPage::GetMessageMap
-3378=CPreviewView::GetMessageMap
-3379=CPrintDialog::GetMessageMap
-3380=CPropertyPage::GetMessageMap
-3381=CPropertySheet::GetMessageMap
-3382=CRecordView::GetMessageMap
-3383=CRichEditView::GetMessageMap
-3384=CScrollView::GetMessageMap
-3385=CSocketWnd::GetMessageMap
-3386=CSplitterWnd::GetMessageMap
-3387=CStatusBar::GetMessageMap
-3388=CStockPropPage::GetMessageMap
-3389=CTabCtrl::GetMessageMap
-3390=CToolBar::GetMessageMap
-3391=CToolBarCtrl::GetMessageMap
-3392=CToolTipCtrl::GetMessageMap
-3393=CTreeCtrl::GetMessageMap
-3394=CTreeView::GetMessageMap
-3395=CView::GetMessageMap
-3396=CWinApp::GetMessageMap
-3397=CWnd::GetMessageMap
-3398=CFrameWnd::GetMessageString
-3399=COleControl::GetMessageString
-3400=CDataSourceControl::GetMetaData
-3401=COleControl::GetMetafileData
-3402=COleServerItem::GetMetafileData
-3403=COleDateTime::GetMinute
-3404=COleDateTimeSpan::GetMinutes
-3405=CDocObjectServer::XOleObject::GetMiscStatus
-3406=COleControl::XOleObject::GetMiscStatus
-3407=COleServerDoc::XOleObject::GetMiscStatus
-3408=COleServerItem::XOleObject::GetMiscStatus
-3409=CRectTracker::GetModifyPointers
-3410=COleDocument::GetMoniker
-3411=COleLinkingDoc::GetMoniker
-3412=COleServerDoc::GetMoniker
-3413=COleServerItem::GetMoniker
-3414=COleClientItem::XOleClientSite::GetMoniker
-3415=COleControlSite::XOleClientSite::GetMoniker
-3416=CDocObjectServer::XOleObject::GetMoniker
-3417=COleControl::XOleObject::GetMoniker
-3418=COleServerDoc::XOleObject::GetMoniker
-3419=COleServerItem::XOleObject::GetMoniker
-3420=COleDateTime::GetMonth
-3421=CDaoDatabase::GetName
-3422=CDaoQueryDef::GetName
-3423=CDaoRecordset::GetName
-3424=CDaoTableDef::GetName
-3425=CDaoWorkspace::GetName
-3426=COleControl::XViewObject::GetNaturalExtent
-3427=COleClientItem::GetNewItemNumber
-3428=CRichEditView::XRichEditOleCallback::GetNewStorage
-3429=CDataBoundProperty::GetNext
-3430=CMapPtrToPtr::GetNextAssoc
-3431=CMapPtrToWord::GetNextAssoc
-3432=CMapStringToOb::GetNextAssoc
-3433=CMapStringToPtr::GetNextAssoc
-3434=CMapStringToString::GetNextAssoc
-3435=CMapWordToOb::GetNextAssoc
-3436=CMapWordToPtr::GetNextAssoc
-3437=COleDocument::GetNextClientItem
-3438=CConnectionPoint::GetNextConnection
-3439=CMultiDocTemplate::GetNextDoc
-3440=CSingleDocTemplate::GetNextDoc
-3441=CDocManager::GetNextDocTemplate
-3442=CWinApp::GetNextDocTemplate
-3443=COleDataObject::GetNextFormat
-3444=COleDocument::GetNextItem
-3445=COleDocument::GetNextItemOfKind
-3446=COleUILinkInfo::GetNextLink
-3447=CFileDialog::GetNextPathName
-3448=COleDocument::GetNextServerItem
-3449=CDocument::GetNextView
-3450=CFindReplaceDialog::GetNotifier
-3451=CCmdTarget::GetNotSupported
-=COleControl::GetNotSupported
-3453=COlePropertyPage::GetObjectArray
-3454=COleClientItem::GetObjectDescriptorData
-3455=COleServerItem::GetObjectDescriptorData
-3456=COlePropertiesDialog::XOleUIObjInfo::GetObjectInfo
-3457=CArchive::GetObjectSchema
-3458=COleLinkingDoc::XOleItemContainer::GetObjectStorage
-3459=CHttpFile::GetObjectW
-3460=COleLinkingDoc::XOleItemContainer::GetObjectW
-3461=CRecordset::GetODBCFieldInfo
-3462=CRecordset::GetODBCFieldInfo
-3463=CDaoQueryDef::GetODBCTimeout
-3464=COleServerItem::GetOleObject
-3465=COleSafeArray::GetOneDimSize
-3466=CDocManager::GetOpenDocumentCount
-3467=CWinApp::GetOpenDocumentCount
-3468=CPropertySet::GetOSVersion
-3469=COleControl::GetOuterWindow
-3470=CPropertySheet::GetPageCount
-3471=CPropertySheet::GetPageIndex
-3472=CDocObjectServer::XPrint::GetPageInfo
-3473=COlePropertyPage::XPropertyPage::GetPageInfo
-3474=COleControl::XSpecifyPropertyPages::GetPages
-3475=COlePropertyPage::GetPageSite
-3476=CSplitterWnd::GetPane
-3477=CStatusBar::GetPaneInfo
-3478=CStatusBar::GetPaneStyle
-3479=CStatusBar::GetPaneText
-3480=CStatusBar::GetPaneText
-3481=CRichEditCtrl::GetParaFormat
-3482=CRichEditView::GetParaFormatSelection
-3483=CDaoQueryDef::GetParameterCount
-3484=CDaoQueryDef::GetParameterInfo
-3485=CDaoQueryDef::GetParameterInfo
-3486=CDaoQueryDef::GetParamValue
-3487=CDaoQueryDef::GetParamValue
-3488=CDaoRecordset::GetParamValue
-3489=CDaoRecordset::GetParamValue
-3490=CWnd::GetParentFrame
-3491=CWnd::GetParentOwner
-3492=CView::GetParentSplitter
-3493=CDataPathProperty::GetPath
-3494=CFileDialog::GetPathName
-3495=CAsyncSocket::GetPeerName
-3496=CDaoRecordset::GetPercentPosition
-3497=CPictureHolder::GetPictureDispatch
-3498=CPicturePropPage::GetPictureProp
-3499=CSizeComboBox::GetPointSize
-3500=CPageSetupDialog::GetPortName
-3501=CPrintDialog::GetPortName
-3502=CFile::GetPosition
-3503=CMemFile::GetPosition
-3504=COleStreamFile::GetPosition
-3505=CSocketFile::GetPosition
-3506=CStdioFile::GetPosition
-3507=COleControl::XPerPropertyBrowsing::GetPredefinedStrings
-3508=COleControl::XPerPropertyBrowsing::GetPredefinedValue
-3509=COleDocument::GetPrimarySelectedItem
-3510=CRichEditDoc::GetPrimarySelectedItem
-3511=COleClientItem::GetPrintDeviceInfo
-3512=CWinApp::GetPrinterDeviceDefaults
-3513=CEditView::GetPrinterFont
-3514=CAsyncMonikerFile::GetPriority
-3515=CWinApp::GetProfileBinary
-3516=CWinApp::GetProfileIntW
-3517=CWinApp::GetProfileStringW
-3518=COlePropertyPage::GetPropCheck
-3519=COleControlSite::GetProperty
-3520=COleDispatchDriver::GetProperty
-3521=CPropertySection::GetProperty
-3522=CPropertySet::GetProperty
-3523=CWnd::GetProperty
-3524=COlePropertyPage::GetPropIndex
-3525=COleControl::GetPropPageIDs
-3526=COlePropertyPage::GetPropRadio
-3527=COleControl::GetPropsetData
-3528=COlePropertyPage::GetPropText
-3529=COlePropertyPage::GetPropText
-3530=COlePropertyPage::GetPropText
-3531=COlePropertyPage::GetPropText
-3532=COlePropertyPage::GetPropText
-3533=COlePropertyPage::GetPropText
-3534=COlePropertyPage::GetPropText
-3535=COlePropertyPage::GetPropText
-3536=COlePropertyPage::GetPropText
-3537=CDaoDatabase::GetQueryDefCount
-3538=CDaoDatabase::GetQueryDefInfo
-3539=CDaoDatabase::GetQueryDefInfo
-3540=CDaoDatabase::GetQueryTimeout
-3541=CSliderCtrl::GetRange
-3542=CSpinButtonCtrl::GetRange
-3543=CProperty::GetRawValue
-3544=COleControl::GetReadyState
-3545=CDaoRecordset::GetRecordCount
-3546=CDaoTableDef::GetRecordCount
-3547=CDaoDatabase::GetRecordsAffected
-3548=CDaoQueryDef::GetRecordsAffected
-3549=CDocObjectServer::XOleDocumentView::GetRect
-3550=COleControl::XViewObject::GetRect
-3551=COleControl::GetRectInContainer
-3552=CDaoDatabase::GetRelationCount
-3553=CDaoDatabase::GetRelationInfo
-3554=CDaoDatabase::GetRelationInfo
-3555=CFindReplaceDialog::GetReplaceString
-3556=CDaoQueryDef::GetReturnsRecords
-3557=CFileFind::GetRoot
-3558=CGopherFileFind::GetRoot
-3559=CCmdTarget::GetRoutingFrame
-3560=CCmdTarget::GetRoutingView
-3561=CSplitterWnd::GetRowInfo
-3562=CAnimateCtrl::GetRuntimeClass
-3563=CArchiveException::GetRuntimeClass
-3564=CAsyncMonikerFile::GetRuntimeClass
-3565=CAsyncSocket::GetRuntimeClass
-3566=CBitmap::GetRuntimeClass
-3567=CBitmapButton::GetRuntimeClass
-3568=CBrush::GetRuntimeClass
-3569=CButton::GetRuntimeClass
-3570=CByteArray::GetRuntimeClass
-3571=CCachedDataPathProperty::GetRuntimeClass
-3572=CCheckListBox::GetRuntimeClass
-3573=CClientDC::GetRuntimeClass
-3574=CCmdTarget::GetRuntimeClass
-3575=CColorDialog::GetRuntimeClass
-3576=CColorPropPage::GetRuntimeClass
-3577=CComboBox::GetRuntimeClass
-3578=CControlBar::GetRuntimeClass
-3579=CCriticalSection::GetRuntimeClass
-3580=CCtrlView::GetRuntimeClass
-3581=CDaoDatabase::GetRuntimeClass
-3582=CDaoException::GetRuntimeClass
-3583=CDaoQueryDef::GetRuntimeClass
-3584=CDaoRecordset::GetRuntimeClass
-3585=CDaoRecordView::GetRuntimeClass
-3586=CDaoTableDef::GetRuntimeClass
-3587=CDaoWorkspace::GetRuntimeClass
-3588=CDatabase::GetRuntimeClass
-3589=CDataPathProperty::GetRuntimeClass
-3590=CDBException::GetRuntimeClass
-3591=CDC::GetRuntimeClass
-3592=CDialog::GetRuntimeClass
-3593=CDialogBar::GetRuntimeClass
-3594=CDocItem::GetRuntimeClass
-3595=CDockBar::GetRuntimeClass
-3596=CDockState::GetRuntimeClass
-3597=CDocManager::GetRuntimeClass
-3598=CDocObjectServer::GetRuntimeClass
-3599=CDocObjectServerItem::GetRuntimeClass
-3600=CDocTemplate::GetRuntimeClass
-3601=CDocument::GetRuntimeClass
-3602=CDragListBox::GetRuntimeClass
-3603=CDWordArray::GetRuntimeClass
-3604=CDynLinkLibrary::GetRuntimeClass
-3605=CEdit::GetRuntimeClass
-3606=CEditView::GetRuntimeClass
-3607=CEvent::GetRuntimeClass
-3608=CException::GetRuntimeClass
-3609=CFile::GetRuntimeClass
-3610=CFileDialog::GetRuntimeClass
-3611=CFileException::GetRuntimeClass
-3612=CFileFind::GetRuntimeClass
-3613=CFindReplaceDialog::GetRuntimeClass
-3614=CFont::GetRuntimeClass
-3615=CFontDialog::GetRuntimeClass
-3616=CFontPropPage::GetRuntimeClass
-3617=CFormView::GetRuntimeClass
-3618=CFrameWnd::GetRuntimeClass
-3619=CFtpConnection::GetRuntimeClass
-3620=CFtpFileFind::GetRuntimeClass
-3621=CGdiObject::GetRuntimeClass
-3622=CGopherConnection::GetRuntimeClass
-3623=CGopherFile::GetRuntimeClass
-3624=CGopherFileFind::GetRuntimeClass
-3625=CHeaderCtrl::GetRuntimeClass
-3626=CHotKeyCtrl::GetRuntimeClass
-3627=CHttpConnection::GetRuntimeClass
-3628=CHttpFile::GetRuntimeClass
-3629=CImageList::GetRuntimeClass
-3630=CInternetConnection::GetRuntimeClass
-3631=CInternetException::GetRuntimeClass
-3632=CInternetFile::GetRuntimeClass
-3633=CInternetSession::GetRuntimeClass
-3634=CListBox::GetRuntimeClass
-3635=CListCtrl::GetRuntimeClass
-3636=CListView::GetRuntimeClass
-3637=CLongBinary::GetRuntimeClass
-3638=CMapPtrToPtr::GetRuntimeClass
-3639=CMapPtrToWord::GetRuntimeClass
-3640=CMapStringToOb::GetRuntimeClass
-3641=CMapStringToPtr::GetRuntimeClass
-3642=CMapStringToString::GetRuntimeClass
-3643=CMapWordToOb::GetRuntimeClass
-3644=CMapWordToPtr::GetRuntimeClass
-3645=CMDIChildWnd::GetRuntimeClass
-3646=CMDIFrameWnd::GetRuntimeClass
-3647=CMemFile::GetRuntimeClass
-3648=CMemoryException::GetRuntimeClass
-3649=CMenu::GetRuntimeClass
-3650=CMetaFileDC::GetRuntimeClass
-3651=CMiniDockFrameWnd::GetRuntimeClass
-3652=CMiniFrameWnd::GetRuntimeClass
-3653=CMonikerFile::GetRuntimeClass
-3654=CMultiDocTemplate::GetRuntimeClass
-3655=CMutex::GetRuntimeClass
-3656=CNotSupportedException::GetRuntimeClass
-3657=CObArray::GetRuntimeClass
-3658=CObject::GetRuntimeClass
-3659=CObList::GetRuntimeClass
-3660=COleBusyDialog::GetRuntimeClass
-3661=COleChangeIconDialog::GetRuntimeClass
-3662=COleChangeSourceDialog::GetRuntimeClass
-3663=COleClientItem::GetRuntimeClass
-3664=COleControl::GetRuntimeClass
-3665=COleControlModule::GetRuntimeClass
-3666=COleConvertDialog::GetRuntimeClass
-3667=COleDialog::GetRuntimeClass
-3668=COleDispatchException::GetRuntimeClass
-3669=COleDocIPFrameWnd::GetRuntimeClass
-3670=COleDocument::GetRuntimeClass
-3671=COleException::GetRuntimeClass
-3672=COleInsertDialog::GetRuntimeClass
-3673=COleIPFrameWnd::GetRuntimeClass
-3674=COleLinkingDoc::GetRuntimeClass
-3675=COleLinksDialog::GetRuntimeClass
-3676=COleObjectFactory::GetRuntimeClass
-3677=COlePasteSpecialDialog::GetRuntimeClass
-3678=COlePropertiesDialog::GetRuntimeClass
-3679=COlePropertyPage::GetRuntimeClass
-3680=COleResizeBar::GetRuntimeClass
-3681=COleServerDoc::GetRuntimeClass
-3682=COleServerItem::GetRuntimeClass
-3683=COleStreamFile::GetRuntimeClass
-3684=COleUpdateDialog::GetRuntimeClass
-3685=CPageSetupDialog::GetRuntimeClass
-3686=CPaintDC::GetRuntimeClass
-3687=CPalette::GetRuntimeClass
-3688=CPen::GetRuntimeClass
-3689=CPicturePropPage::GetRuntimeClass
-3690=CPreviewDC::GetRuntimeClass
-3691=CPreviewView::GetRuntimeClass
-3692=CPrintDialog::GetRuntimeClass
-3693=CProgressCtrl::GetRuntimeClass
-3694=CPropertyPage::GetRuntimeClass
-3695=CPropertySheet::GetRuntimeClass
-3696=CPtrArray::GetRuntimeClass
-3697=CPtrList::GetRuntimeClass
-3698=CRecordset::GetRuntimeClass
-3699=CRecordView::GetRuntimeClass
-3700=CResourceException::GetRuntimeClass
-3701=CRgn::GetRuntimeClass
-3702=CRichEditCntrItem::GetRuntimeClass
-3703=CRichEditCtrl::GetRuntimeClass
-3704=CRichEditDoc::GetRuntimeClass
-3705=CRichEditView::GetRuntimeClass
-3706=CScrollBar::GetRuntimeClass
-3707=CScrollView::GetRuntimeClass
-3708=CSemaphore::GetRuntimeClass
-3709=CSharedFile::GetRuntimeClass
-3710=CSingleDocTemplate::GetRuntimeClass
-3711=CSliderCtrl::GetRuntimeClass
-3712=CSocket::GetRuntimeClass
-3713=CSocketFile::GetRuntimeClass
-3714=CSpinButtonCtrl::GetRuntimeClass
-3715=CSplitterWnd::GetRuntimeClass
-3716=CStatic::GetRuntimeClass
-3717=CStatusBar::GetRuntimeClass
-3718=CStatusBarCtrl::GetRuntimeClass
-3719=CStdioFile::GetRuntimeClass
-3720=CStockPropPage::GetRuntimeClass
-3721=CStringArray::GetRuntimeClass
-3722=CStringList::GetRuntimeClass
-3723=CSyncObject::GetRuntimeClass
-3724=CTabCtrl::GetRuntimeClass
-3725=CToolBar::GetRuntimeClass
-3726=CToolBarCtrl::GetRuntimeClass
-3727=CToolTipCtrl::GetRuntimeClass
-3728=CTreeCtrl::GetRuntimeClass
-3729=CTreeView::GetRuntimeClass
-3730=CUIntArray::GetRuntimeClass
-3731=CUserException::GetRuntimeClass
-3732=CView::GetRuntimeClass
-3733=CWinApp::GetRuntimeClass
-3734=CWindowDC::GetRuntimeClass
-3735=CWindowlessDC::GetRuntimeClass
-3736=CWinThread::GetRuntimeClass
-3737=CWnd::GetRuntimeClass
-3738=CWordArray::GetRuntimeClass
-3739=CWnd::GetSafeOwner
-3740=CColorDialog::GetSavedCustomColors
-3741=CGopherFileFind::GetScreenName
-3742=CDockState::GetScreenSize
-3743=CView::GetScrollBarCtrl
-3744=CWnd::GetScrollBarCtrl
-3745=CScrollView::GetScrollBarSizes
-3746=CScrollView::GetScrollBarState
-3747=CWnd::GetScrollInfo
-3748=CWnd::GetScrollLimit
-3749=CWnd::GetScrollPos
-3750=CScrollView::GetScrollPosition
-3751=CWnd::GetScrollRange
-3752=CSplitterWnd::GetScrollStyle
-3753=COleDateTime::GetSecond
-3754=COleDateTimeSpan::GetSeconds
-3755=CPropertySet::GetSection
-3756=CWinApp::GetSectionKey
-3757=CPropertySection::GetSectionName
-3758=CRichEditCtrl::GetSel
-3759=CRichEditView::GetSelectedItem
-3760=CEditView::GetSelectedText
-3761=CSliderCtrl::GetSelection
-3762=CRichEditCtrl::GetSelectionCharFormat
-3763=COleConvertDialog::GetSelectionType
-3764=COleInsertDialog::GetSelectionType
-3765=COlePasteSpecialDialog::GetSelectionType
-3766=CRichEditCtrl::GetSelText
-3767=CInternetConnection::GetServerName
-3768=CPropertySection::GetSize
-3769=CDialogTemplate::GetSizeInDialogUnits
-3770=CDialogTemplate::GetSizeInPixels
-3771=CBlobProperty::GetSizeMax
-3772=COleControl::XPersistMemory::GetSizeMax
-3773=COleControl::XPersistStreamInit::GetSizeMax
-3774=CSplitterWnd::GetSizingParent
-3775=CAsyncSocket::GetSockName
-3776=CDaoTableDef::GetSourceTableName
-3777=CDaoQueryDef::GetSQL
-3778=CDaoRecordset::GetSQL
-3779=CCmdTarget::GetStackSize
-3780=CCmdTarget::GetStandardProp
-3781=CConnectionPoint::GetStartPosition
-3782=COleDocument::GetStartPosition
-3783=CRichEditDoc::GetStartPosition
-3784=CFile::GetStatus
-3785=CFile::GetStatus
-3786=CMemFile::GetStatus
-3787=COleStreamFile::GetStatus
-3788=COleControl::GetStockTextMetrics
-3789=COleStreamFile::GetStorageName
-3790=COleStreamFile::GetStream
-3791=COleControlSite::GetStyle
-3792=CWnd::GetStyle
-3793=CWnd::GetSuperWndProcAddr
-3794=CDaoDatabase::GetTableDefCount
-3795=CDaoDatabase::GetTableDefInfo
-3796=CDaoDatabase::GetTableDefInfo
-3797=CDialogTemplate::GetTemplateSize
-3798=CListBox::GetText
-3799=COleControl::GetText
-3800=CStatusBarCtrl::GetText
-3801=CStatusBarCtrl::GetText
-3802=CToolTipCtrl::GetText
-3803=CRecordset::GetTextLen
-3804=CStatusBarCtrl::GetTextLength
-3805=COleDateTime::GetTickCount
-3806=CTime::GetTickCount
-3807=CToolTipCtrl::GetToolInfo
-3808=CWnd::GetTopLevelFrame
-3809=CWnd::GetTopLevelOwner
-3810=CWnd::GetTopLevelParent
-3811=CScrollView::GetTrueClientSize
-3812=CRectTracker::GetTrueRect
-3813=CDaoQueryDef::GetType
-3814=CDaoRecordset::GetType
-3815=CPictureHolder::GetType
-3816=CProperty::GetType
-3817=COleDispatchImpl::GetTypeInfo
-3818=COleControlSite::XAmbientProps::GetTypeInfo
-3819=COleControlSite::XEventSink::GetTypeInfo
-3820=CCmdTarget::GetTypeInfoCount
-3821=COleDispatchImpl::GetTypeInfoCount
-3822=COleControlSite::XAmbientProps::GetTypeInfoCount
-3823=COleControlSite::XEventSink::GetTypeInfoCount
-3824=CCmdTarget::GetTypeInfoOfGuid
-3825=CCmdTarget::GetTypeLib
-3826=CCmdTarget::GetTypeLibCache
-3827=COleSafeArray::GetUBound
-3828=CDocObjectServer::XOleObject::GetUserClassID
-3829=COleControl::XOleObject::GetUserClassID
-3830=COleServerDoc::XOleObject::GetUserClassID
-3831=COleServerItem::XOleObject::GetUserClassID
-3832=CDaoWorkspace::GetUserNameW
-3833=COleClientItem::GetUserType
-3834=COleControl::GetUserType
-3835=CDocObjectServer::XOleObject::GetUserType
-3836=COleControl::XOleObject::GetUserType
-3837=COleServerDoc::XOleObject::GetUserType
-3838=COleServerItem::XOleObject::GetUserType
-3839=CDaoRecordset::GetValidationRule
-3840=CDaoTableDef::GetValidationRule
-3841=CDaoRecordset::GetValidationText
-3842=CDaoTableDef::GetValidationText
-3843=CMapPtrToPtr::GetValueAt
-3844=CHttpFile::GetVerb
-3845=CDaoDatabase::GetVersion
-3846=CDaoWorkspace::GetVersion
-3847=CDockState::GetVersion
-3848=CRichEditDoc::GetView
-3849=COlePropertiesDialog::XOleUIObjInfo::GetViewInfo
-3850=COleControl::XViewObject::GetViewStatus
-3851=COleControl::XOleInPlaceActiveObject::GetWindow
-3852=COleServerDoc::XOleInPlaceActiveObject::GetWindow
-3853=COleFrameHook::XOleInPlaceFrame::GetWindow
-3854=COleControl::XOleInPlaceObject::GetWindow
-3855=COleServerDoc::XOleInPlaceObject::GetWindow
-3856=COleControlContainer::XOleIPFrame::GetWindow
-3857=COleClientItem::XOleIPSite::GetWindow
-3858=COleControlSite::XOleIPSite::GetWindow
-3859=CRichEditCntrItem::GetWindowContext
-3860=CRichEditView::GetWindowContext
-3861=COleClientItem::XOleIPSite::GetWindowContext
-3862=COleControlSite::XOleIPSite::GetWindowContext
-3863=COleControl::GetWindowlessDropTarget
-3864=CMDIFrameWnd::GetWindowMenuPopup
-3865=CWnd::GetWindowPlacement
-3866=COleControlSite::GetWindowTextLengthW
-3867=CWnd::GetWindowTextLengthW
-3868=COleControlSite::GetWindowTextW
-3869=COleControlSite::GetWindowTextW
-3870=CWnd::GetWindowTextW
-3871=CWnd::GetWindowTextW
-3872=CDaoWorkspace::GetWorkspaceCount
-3873=CDaoWorkspace::GetWorkspaceInfo
-3874=CDaoWorkspace::GetWorkspaceInfo
-3875=COleDateTime::GetYear
-3876=COleServerDoc::GetZoomFactor
-3877=COleDropSource::GiveFeedback
-3878=COleDropSource::XDropSource::GiveFeedback
-3879=CWnd::GrayCtlColor
-3880=CDC::GrayStringW
-3881=CPreviewDC::GrayStringW
-3882=CMemFile::GrowFile
-3883=_GUIDconstCColorPropPage::guid
-3884=_GUIDconstCFontPropPage::guid
-3885=_GUIDconstCPicturePropPage::guid
-3886=CWnd::HandleFloatingSysCommand
-3887=COleMessageFilter::XMessageFilter::HandleInComingCall
-3888=CDialog::HandleInitDialog
-3889=CDialogBar::HandleInitDialog
-3890=CFormView::HandleInitDialog
-3891=CPropertySheet::HandleInitDialog
-3892=CDialog::HandleSetFont
-3893=COleControl::XPersistStorage::HandsOffStorage
-3894=COleServerDoc::XPersistStorage::HandsOffStorage
-3895=COleDocument::HasBlankItems
-3896=CDialogTemplate::HasFont
-3897=HashKey
-3898=HashKey
-3899=COlePropertyPage::XPropertyPage::Help
-3900=CDumpContext::HexDump
-3901=CWinApp::HideApplication
-3902=CFileDialog::HideControl
-3903=CDC::HIMETRICtoDP
-3904=CDC::HIMETRICtoLP
-3905=CListCtrl::HitTest
-3906=CRectTracker::HitTest
-3907=CSplitterWnd::HitTest
-3908=CToolTipCtrl::HitTest
-3909=CTreeCtrl::HitTest
-3910=CRectTracker::HitTestHandles
-3911=CSplitterWnd::IdFromRowCol
-3912=CDaoWorkspace::Idle
-3913=COlePropertyPage::IgnoreApply
-3914=COleControl::IgnoreWindowMessage
-3915=CRect::InflateRect
-3916=CRect::InflateRect
-3917=CWinApp::InitApplication
-3918=COleControl::XOleCache::InitCache
-3919=CWnd::InitControlContainer
-3920=CDaoWorkspace::InitDatabasesCollection
-3921=CPropertyPage::InitDialogInfo
-3922=CDaoException::InitErrorsCollection
-3923=CDaoQueryDef::InitFieldsCollection
-3924=CDaoRecordset::InitFieldsCollection
-3925=CDaoTableDef::InitFieldsCollection
-3926=CDocObjectServer::XOleObject::InitFromData
-3927=COleControl::XOleObject::InitFromData
-3928=COleServerDoc::XOleObject::InitFromData
-3929=COleServerItem::XOleObject::InitFromData
-3930=CMapPtrToPtr::InitHashTable
-3931=CMapPtrToWord::InitHashTable
-3932=CMapStringToOb::InitHashTable
-3933=CMapStringToPtr::InitHashTable
-3934=CMapStringToString::InitHashTable
-3935=CMapWordToOb::InitHashTable
-3936=CMapWordToPtr::InitHashTable
-3937=CDataSourceControl::Initialize
-3938=CMiniFrameWnd::Initialize
-3939=CDaoWorkspace::InitializeEngine
-3940=CFontHolder::InitializeFont
-3941=COleControl::InitializeIIDs
-3942=CEditView::InitializeReplace
-3943=CDocTemplate::InitialUpdateFrame
-3944=CFrameWnd::InitialUpdateFrame
-3945=CDaoRecordset::InitIndexesCollection
-3946=CDaoTableDef::InitIndexesCollection
-3947=COleControlModule::InitInstance
-3948=CWinApp::InitInstance
-3949=CWinThread::InitInstance
-3950=CDockContext::InitLoop
-3951=CDialog::InitModalIndirect
-3952=CDialog::InitModalIndirect
-3953=COleControl::XPersistMemory::InitNew
-3954=COleControl::XPersistPropertyBag::InitNew
-3955=COleControl::XPersistStorage::InitNew
-3956=COleServerDoc::XPersistStorage::InitNew
-3957=COleControl::XPersistStreamInit::InitNew
-3958=CDaoQueryDef::InitParametersCollection
-3959=CDaoDatabase::InitQueryDefsCollection
-3960=CRecordset::InitRecord
-3961=CDaoDatabase::InitRelationsCollection
-3962=COleControl::InitStockEventMask
-3963=COleControl::InitStockPropMask
-3964=CSimpleException::InitString
-3965=CDaoDatabase::InitTableDefsCollection
-3966=CDaoDatabase::InitWorkspace
-3967=CDaoWorkspace::InitWorkspacesCollection
-3968=COleControl::XOleInPlaceObject::InPlaceDeactivate
-3969=COleServerDoc::XOleInPlaceObject::InPlaceDeactivate
-3970=CDockBar::Insert
-3971=CObList::InsertAfter
-3972=CPtrList::InsertAfter
-3973=CStringList::InsertAfter
-3974=CByteArray::InsertAt
-3975=CByteArray::InsertAt
-3976=CDWordArray::InsertAt
-3977=CDWordArray::InsertAt
-3978=CObArray::InsertAt
-3979=CObArray::InsertAt
-3980=CPtrArray::InsertAt
-3981=CPtrArray::InsertAt
-3982=CStringArray::InsertAt
-3983=CStringArray::InsertAt
-3984=CUIntArray::InsertAt
-3985=CUIntArray::InsertAt
-3986=CWordArray::InsertAt
-3987=CWordArray::InsertAt
-3988=CObList::InsertBefore
-3989=CPtrList::InsertBefore
-3990=CStringList::InsertBefore
-3991=CListCtrl::InsertColumn
-3992=CRichEditView::InsertFileAsObject
-3993=CListCtrl::InsertItem
-3994=CRichEditView::InsertItem
-3995=CTreeCtrl::InsertItem
-3996=COleFrameHook::XOleInPlaceFrame::InsertMenus
-3997=COleControlContainer::XOleIPFrame::InsertMenus
-3998=AFX_INTERFACEMAPconstCCmdTarget::interfaceMap
-3999=AFX_INTERFACEMAPconstCDocObjectServer::interfaceMap
-4000=AFX_INTERFACEMAPconstCOleClientItem::interfaceMap
-4001=AFX_INTERFACEMAPconstCOleControl::interfaceMap
-4002=AFX_INTERFACEMAPconstCOleDataSource::interfaceMap
-4003=AFX_INTERFACEMAPconstCOleDropSource::interfaceMap
-4004=AFX_INTERFACEMAPconstCOleDropTarget::interfaceMap
-4005=AFX_INTERFACEMAPconstCOleFrameHook::interfaceMap
-4006=AFX_INTERFACEMAPconstCOleLinkingDoc::interfaceMap
-4007=AFX_INTERFACEMAPconstCOleMessageFilter::interfaceMap
-4008=AFX_INTERFACEMAPconstCOleObjectFactory::interfaceMap
-4009=AFX_INTERFACEMAPconstCOlePropertyPage::interfaceMap
-4010=AFX_INTERFACEMAPconstCOleServerDoc::interfaceMap
-4011=AFX_INTERFACEMAPconstCOleServerItem::interfaceMap
-4012=AFX_INTERFACEMAPconstCRichEditView::interfaceMap
-4013=COleControl::InternalGetFont
-4014=COleControl::InternalGetText
-4015=CCmdTarget::InternalQueryInterface
-4016=CCmdTarget::InternalRelease
-4017=CDC::IntersectClipRect
-4018=CDC::IntersectClipRect
-4019=CCheckListBox::InvalidateCheck
-4020=COleControl::InvalidateControl
-4021=CCheckListBox::InvalidateItem
-4022=COleControl::InvalidateRgn
-4023=CMiniFrameWnd::InvertSysMenu
-4024=COleDispatchImpl::Invoke
-4025=COleControlSite::XAmbientProps::Invoke
-4026=COleControlSite::XEventSink::Invoke
-4027=COleControlSite::InvokeHelper
-4028=COleDispatchDriver::InvokeHelper
-4029=CWnd::InvokeHelper
-4030=COleControlSite::InvokeHelperV
-4031=COleDispatchDriver::InvokeHelperV
-4032=CDocItem::IsBlank
-4033=COleServerItem::IsBlank
-4034=CDaoRecordset::IsBOF
-4035=CSplitterWnd::IsChildPane
-4036=COleServerItem::IsConnected
-4037=COleDataObject::IsDataAvailable
-4038=COleControlSite::IsDefaultButton
-4039=CDaoRecordset::IsDeleted
-4040=CRuntimeClass::IsDerivedFrom
-4041=COccManager::IsDialogMessageW
-4042=CWnd::IsDialogMessageW
-4043=CBlobProperty::IsDirty
-4044=COleLinkingDoc::XPersistFile::IsDirty
-4045=COleControl::XPersistMemory::IsDirty
-4046=COleControl::XPersistStorage::IsDirty
-4047=COleServerDoc::XPersistStorage::IsDirty
-4048=COleControl::XPersistStreamInit::IsDirty
-4049=COleControlContainer::IsDlgButtonChecked
-4050=CWnd::IsDlgButtonChecked
-4051=CControlBar::IsDockBar
-4052=CDockBar::IsDockBar
-4053=CFileFind::IsDots
-4054=CGopherFileFind::IsDots
-4055=CCheckListBox::IsEnabled
-4056=CDaoRecordset::IsEOF
-4057=CDaoRecordset::IsFieldDirty
-4058=CRecordset::IsFieldDirty
-4059=CDaoRecordset::IsFieldNull
-4060=CRecordset::IsFieldNull
-4061=CDaoRecordset::IsFieldNullable
-4062=CRecordset::IsFieldNullable
-4063=CRecordset::IsFieldNullable
-4064=CDaoRecordset::IsFieldStatusDirty
-4065=CRecordset::IsFieldStatusDirty
-4066=CDaoRecordset::IsFieldStatusNull
-4067=CRecordset::IsFieldStatusNull
-4068=CDaoRecordset::IsFieldStatusNullable
-4069=CDaoRecordset::IsFieldStatusNullableKnown
-4070=CFieldExchange::IsFieldType
-4071=CControlBar::IsFloating
-4072=CFrameWnd::IsFrameWnd
-4073=CWnd::IsFrameWnd
-4074=CWinThread::IsIdleMessage
-4075=CCmdTarget::IsInvokeAllowed
-4076=COleControl::IsInvokeAllowed
-4077=CRecordset::IsJoin
-4078=CObject::IsKindOf
-4079=COccManager::IsLabelControl
-4080=COleObjectFactory::IsLicenseValid
-4081=CDaoRecordset::IsMatch
-4082=COccManager::IsMatchingMnemonic
-4083=COleControlSite::IsMatchingMnemonic
-4084=CDocument::IsModified
-4085=COleClientItem::IsModified
-4086=COleControl::IsModified
-4087=COlePropertyPage::IsModified
-4088=CRichEditDoc::IsModified
-4089=CDaoFieldExchange::IsNullValue
-4090=CDaoRecordView::IsOnFirstRecord
-4091=CRecordView::IsOnFirstRecord
-4092=CDaoRecordView::IsOnLastRecord
-4093=CRecordView::IsOnLastRecord
-4094=CRecordset::IsOpen
-4095=COlePropertyPage::XPropertyPage::IsPageDirty
-4096=CRecordset::IsParamStatusNull
-4097=CRecordset::IsRecordsetUpdatable
-4098=COleObjectFactory::IsRegistered
-4099=CCmdTarget::IsResultExpected
-4100=CRichEditView::IsRichEditFormat
-4101=COleLinkingDoc::XOleItemContainer::IsRunning
-4102=CRichEditView::IsSelected
-4103=CView::IsSelected
-4104=CRecordset::IsSelectQueryUpdatable
-4105=CObject::IsSerializable
-4106=COleMessageFilter::IsSignificantMessage
-4107=CRecordset::IsSQLUpdatable
-4108=COleControl::IsSubclassedControl
-4109=CWnd::IsTopParentActive
-4110=CFrameWnd::IsTracking
-4111=CDocObjectServer::XOleObject::IsUpToDate
-4112=COleControl::XOleObject::IsUpToDate
-4113=COleServerDoc::XOleObject::IsUpToDate
-4114=COleServerItem::XOleObject::IsUpToDate
-4115=CDaoFieldExchange::IsValidOperation
-4116=CControlBar::IsVisible
-4117=COleControlSite::IsWindowEnabled
-4118=CWnd::IsWindowEnabled
-4119=CListBox::ItemFromPoint
-4120=CTreeCtrl::ItemHasChildren
-4121=COleControl::KeyDown
-4122=COleControl::KeyUp
-4123=CAsyncSocket::KillSocket
-4124=CString::Left
-4125=CRichEditCtrl::LineIndex
-4126=CRichEditCtrl::LineLength
-4127=CRichEditCtrl::LineScroll
-4128=CDC::LineTo
-4129=ulongCRichEditView::lMaxSize
-4130=CBlobProperty::Load
-4131=CDialogTemplate::Load
-4132=COleControl::Load
-4133=CRuntimeClass::Load
-4134=COleLinkingDoc::XPersistFile::Load
-4135=COleControl::XPersistMemory::Load
-4136=COleControl::XPersistPropertyBag::Load
-4137=COleControl::XPersistStorage::Load
-4138=COleServerDoc::XPersistStorage::Load
-4139=COleControl::XPersistStreamInit::Load
-4140=CFrameWnd::LoadAccelTable
-4141=CFrameWnd::LoadBarState
-4142=CBitmapButton::LoadBitmaps
-4143=CToolBar::LoadBitmapW
-4144=CDaoRecordset::LoadFields
-4145=CRecordset::LoadFields
-4146=CFrameWnd::LoadFrame
-4147=CMDIChildWnd::LoadFrame
-4148=CMDIFrameWnd::LoadFrame
-4149=COleIPFrameWnd::LoadFrame
-4150=COleDocument::LoadFromStorage
-4151=CControlBarInfo::LoadState
-4152=CDockState::LoadState
-4153=COleControl::LoadState
-4154=CWinApp::LoadStdProfileSettings
-4155=CString::LoadStringW
-4156=CDocTemplate::LoadTemplate
-4157=CMultiDocTemplate::LoadTemplate
-4158=CToolBar::LoadToolBar
-4159=CCriticalSection::Lock
-4160=CMultiLock::Lock
-4161=COleSafeArray::Lock
-4162=CSingleLock::Lock
-4163=CSyncObject::Lock
-4164=CTypeLibCache::Lock
-4165=CEditView::LockBuffer
-4166=CString::LockBuffer
-4167=COleControlContainer::XOleContainer::LockContainer
-4168=COleLinkingDoc::XOleItemContainer::LockContainer
-4169=COleLinkingDoc::LockExternal
-4170=COleControl::LockInPlaceActive
-4171=COleControlSite::XOleControlSite::LockInPlaceActive
-4172=CFile::LockRange
-4173=CInternetFile::LockRange
-4174=CMemFile::LockRange
-4175=COleStreamFile::LockRange
-4176=CSocketFile::LockRange
-4177=CStdioFile::LockRange
-4178=CArchiveStream::LockRegion
-4179=COleObjectFactory::XClassFactory::LockServer
-4180=CMapPtrToPtr::Lookup
-4181=CMapPtrToWord::Lookup
-4182=CMapStringToOb::Lookup
-4183=CMapStringToPtr::Lookup
-4184=CMapStringToString::Lookup
-4185=CMapWordToOb::Lookup
-4186=CMapWordToPtr::Lookup
-4187=COleDataSource::Lookup
-4188=CTypeLibCache::Lookup
-4189=CAsyncSocket::LookupHandle
-4190=CRichEditDoc::LookupItem
-4191=CMapStringToOb::LookupKey
-4192=CMapStringToPtr::LookupKey
-4193=CMapStringToString::LookupKey
-4194=CTypeLibCache::LookupTypeInfo
-4195=CDC::LPtoDP
-4196=CDC::LPtoHIMETRIC
-4197=CString::MakeLower
-4198=CString::MakeReverse
-4199=CString::MakeUpper
-4200=CArchive::MapObject
-4201=COleControl::XPerPropertyBrowsing::MapPropertyToPage
-4202=COleDialog::MapResult
-4203=CPropertyPage::MapWizardResult
-4204=CDaoRecordset::MarkForAddNew
-4205=CRecordset::MarkForAddNew
-4206=CDaoRecordset::MarkForEdit
-4207=CRecordset::MarkForUpdate
-4208=CRichEditDoc::MarkItemsClear
-4209=CDocTemplate::MatchDocType
-4210=CFileFind::MatchesMask
-4211=CMDIFrameWnd::MDIGetActive
-4212=CCheckListBox::MeasureItem
-4213=CComboBox::MeasureItem
-4214=CListBox::MeasureItem
-4215=CMenu::MeasureItem
-4216=CCmdTarget::MemberIDFromName
-4217=CMemFile::Memcpy
-4218=COlePropertyPage::MessageBoxW
-4219=CWnd::MessageBoxW
-4220=AFX_MSGMAPconstCCheckListBox::messageMap
-4221=AFX_MSGMAPconstCCmdTarget::messageMap
-4222=AFX_MSGMAPconstCColorDialog::messageMap
-4223=AFX_MSGMAPconstCColorPropPage::messageMap
-4224=AFX_MSGMAPconstCCommonDialog::messageMap
-4225=AFX_MSGMAPconstCControlBar::messageMap
-4226=AFX_MSGMAPconstCControlFrameWnd::messageMap
-4227=AFX_MSGMAPconstCCtrlView::messageMap
-4228=AFX_MSGMAPconstCDaoRecordView::messageMap
-4229=AFX_MSGMAPconstCDialog::messageMap
-4230=AFX_MSGMAPconstCDialogBar::messageMap
-4231=AFX_MSGMAPconstCDockBar::messageMap
-4232=AFX_MSGMAPconstCDocObjectServer::messageMap
-4233=AFX_MSGMAPconstCDocument::messageMap
-4234=AFX_MSGMAPconstCEditView::messageMap
-4235=AFX_MSGMAPconstCFontPropPage::messageMap
-4236=AFX_MSGMAPconstCFormView::messageMap
-4237=AFX_MSGMAPconstCFrameWnd::messageMap
-4238=AFX_MSGMAPconstCListCtrl::messageMap
-4239=AFX_MSGMAPconstCListView::messageMap
-4240=AFX_MSGMAPconstCMDIChildWnd::messageMap
-4241=AFX_MSGMAPconstCMDIFrameWnd::messageMap
-4242=AFX_MSGMAPconstCMiniDockFrameWnd::messageMap
-4243=AFX_MSGMAPconstCMiniFrameWnd::messageMap
-4244=AFX_MSGMAPconstCOleControl::messageMap
-4245=AFX_MSGMAPconstCOleDocIPFrameWnd::messageMap
-4246=AFX_MSGMAPconstCOleIPFrameWnd::messageMap
-4247=AFX_MSGMAPconstCOlePropertyPage::messageMap
-4248=AFX_MSGMAPconstCOleResizeBar::messageMap
-4249=AFX_MSGMAPconstCOleServerDoc::messageMap
-4250=AFX_MSGMAPconstCPicturePropPage::messageMap
-4251=AFX_MSGMAPconstCPreviewView::messageMap
-4252=AFX_MSGMAPconstCPrintDialog::messageMap
-4253=AFX_MSGMAPconstCPropertyPage::messageMap
-4254=AFX_MSGMAPconstCPropertySheet::messageMap
-4255=AFX_MSGMAPconstCRecordView::messageMap
-4256=AFX_MSGMAPconstCRichEditView::messageMap
-4257=AFX_MSGMAPconstCScrollView::messageMap
-4258=AFX_MSGMAPconstCSocketWnd::messageMap
-4259=AFX_MSGMAPconstCSplitterWnd::messageMap
-4260=AFX_MSGMAPconstCStatusBar::messageMap
-4261=AFX_MSGMAPconstCStockPropPage::messageMap
-4262=AFX_MSGMAPconstCTabCtrl::messageMap
-4263=AFX_MSGMAPconstCToolBar::messageMap
-4264=AFX_MSGMAPconstCToolBarCtrl::messageMap
-4265=AFX_MSGMAPconstCToolTipCtrl::messageMap
-4266=AFX_MSGMAPconstCTreeCtrl::messageMap
-4267=AFX_MSGMAPconstCTreeView::messageMap
-4268=AFX_MSGMAPconstCView::messageMap
-4269=AFX_MSGMAPconstCWinApp::messageMap
-4270=AFX_MSGMAPconstCWnd::messageMap
-4271=COleMessageFilter::XMessageFilter::MessagePending
-4272=CString::Mid
-4273=CString::Mid
-4274=CPreviewDC::MirrorAttributes
-4275=CPreviewDC::MirrorFont
-4276=CPreviewDC::MirrorMappingMode
-4277=CPreviewDC::MirrorViewportOrg
-4278=COleControlSite::ModifyStyle
-4279=CWnd::ModifyStyle
-4280=CWnd::ModifyStyle
-4281=COleControlSite::ModifyStyleEx
-4282=CWnd::ModifyStyleEx
-4283=CWnd::ModifyStyleEx
-4284=CDaoRecordset::Move
-4285=CDockContext::Move
-4286=CRecordset::Move
-4287=COlePropertyPage::XPropertyPage::Move
-4288=CDaoRecordset::MoveFirst
-4289=CDaoRecordset::MoveLast
-4290=CDaoRecordset::MoveNext
-4291=CDaoRecordset::MovePrev
-4292=CDC::MoveTo
-4293=COleControlSite::MoveWindow
-4294=CWnd::MoveWindow
-4295=CRect::MulDiv
-4296=uintCOleDropSource::nDragDelay
-4297=uintCOleDropSource::nDragMinDist
-4298=CFrameWnd::NegotiateBorderSpace
-4299=CMapPtrToPtr::NewAssoc
-4300=CMapPtrToWord::NewAssoc
-4301=CMapStringToOb::NewAssoc
-4302=CMapStringToPtr::NewAssoc
-4303=CMapStringToString::NewAssoc
-4304=CMapWordToOb::NewAssoc
-4305=CMapWordToPtr::NewAssoc
-4306=CObList::NewNode
-4307=CPtrList::NewNode
-4308=CStringList::NewNode
-4309=CEnumArray::XEnumVOID::Next
-4310=uintconstCEditView::nMaxSize
-4311=CRectTracker::NormalizeHit
-4312=CRect::NormalizeRect
-4313=CDataBoundProperty::Notify
-4314=COleFrameHook::NotifyAllInPlace
-4315=COleServerDoc::NotifyAllItems
-4316=COleServerItem::NotifyClient
-4317=CFrameWnd::NotifyFloatingWindows
-4318=COleServerDoc::NotifyRename
-4319=uintCOleDropTarget::nScrollDelay
-4320=intCOleDropTarget::nScrollInset
-4321=uintCOleDropTarget::nScrollInterval
-4322=CDC::OffsetClipRgn
-4323=CDC::OffsetClipRgn
-4324=CDC::OffsetViewportOrg
-4325=CMetaFileDC::OffsetViewportOrg
-4326=CPreviewDC::OffsetViewportOrg
-4327=CDC::OffsetWindowOrg
-4328=COleControlSite::XNotifyDBEvents::OKToDo
-4329=CAsyncSocket::OnAccept
-4330=CControlFrameWnd::OnActivate
-4331=CFrameWnd::OnActivate
-4332=COleClientItem::OnActivate
-4333=COleFrameHook::OnActivate
-4334=CFormView::OnActivateFrame
-4335=CView::OnActivateFrame
-4336=COleControl::OnActivateInPlace
-4337=CFrameWnd::OnActivateTopLevel
-4338=CWnd::OnActivateTopLevel
-4339=COleClientItem::OnActivateUI
-4340=CDocObjectServer::OnActivateView
-4341=CFormView::OnActivateView
-4342=CPreviewView::OnActivateView
-4343=CView::OnActivateView
-4344=CToolTipCtrl::OnAddTool
-4345=CConnectionPoint::OnAdvise
-4346=COleControl::XEventConnPt::OnAdvise
-4347=CWnd::OnAmbientProperty
-4348=COleControl::OnAmbientPropertyChange
-4349=COleControl::XOleControl::OnAmbientPropertyChange
-4350=COleControl::OnAppearanceChanged
-4351=CWinApp::OnAppExit
-4352=CPropertyPage::OnApply
-4353=COlePropertiesDialog::OnApplyScale
-4354=CDocObjectServer::OnApplyViewState
-4355=COleControl::OnBackColorChanged
-4356=CFrameWnd::OnBarCheck
-4357=COleIPFrameWnd::OnBarCheck
-4358=CControlBar::OnBarStyleChange
-4359=CStatusBar::OnBarStyleChange
-4360=CToolBar::OnBarStyleChange
-4361=COleDropSource::OnBeginDrag
-4362=CEditView::OnBeginPrinting
-4363=CRichEditView::OnBeginPrinting
-4364=CView::OnBeginPrinting
-4365=COleControl::OnBorderStyleChanged
-4366=CPicturePropPage::OnBrowse
-4367=CRichEditView::OnBullet
-4368=COleMessageFilter::OnBusyDialog
-4369=CCommonDialog::OnCancel
-4370=CDialog::OnCancel
-4371=CPropertyPage::OnCancel
-4372=CRichEditView::OnCancelEditCntr
-4373=COleControl::OnCancelMode
-4374=CSplitterWnd::OnCancelMode
-4375=CWnd::OnCancelMode
-4376=COleClientItem::OnChange
-4377=COleControl::XFontNotification::OnChanged
-4378=COleControlSite::XPropertyNotifySink::OnChanged
-4379=COlePropertyPage::XPropNotifySink::OnChanged
-4380=CRectTracker::OnChangedRect
-4381=CDocument::OnChangedViewList
-4382=COleClientItem::OnChangeItemPosition
-4383=CRichEditCntrItem::OnChangeItemPosition
-4384=COleControl::OnChar
-4385=CRichEditView::OnCharBold
-4386=CRichEditView::OnCharEffect
-4387=CRichEditView::OnCharItalic
-4388=CWnd::OnCharToItem
-4389=CRichEditView::OnCharUnderline
-4390=CButton::OnChildNotify
-4391=CCheckListBox::OnChildNotify
-4392=CComboBox::OnChildNotify
-4393=CDragListBox::OnChildNotify
-4394=CHeaderCtrl::OnChildNotify
-4395=CListBox::OnChildNotify
-4396=CListCtrl::OnChildNotify
-4397=CListView::OnChildNotify
-4398=CStatusBar::OnChildNotify
-4399=CStatusBarCtrl::OnChildNotify
-4400=CTabCtrl::OnChildNotify
-4401=CWnd::OnChildNotify
-4402=CPicturePropPage::OnClear
-4403=COleControl::OnClick
-4404=CEnumArray::OnClone
-4405=CAsyncSocket::OnClose
-4406=CControlFrameWnd::OnClose
-4407=CFrameWnd::OnClose
-4408=CMiniDockFrameWnd::OnClose
-4409=COleControl::OnClose
-4410=COleServerDoc::OnClose
-4411=CPropertySheet::OnClose
-4412=COleClientItem::XAdviseSink::OnClose
-4413=CDocObjectServer::OnCloseDocument
-4414=CDocument::OnCloseDocument
-4415=COleDocument::OnCloseDocument
-4416=COleLinkingDoc::OnCloseDocument
-4417=COleServerDoc::OnCloseDocument
-4418=CCmdTarget::OnCmdMsg
-4419=CDialog::OnCmdMsg
-4420=CDocument::OnCmdMsg
-4421=CFrameWnd::OnCmdMsg
-4422=CMDIFrameWnd::OnCmdMsg
-4423=COleCntrFrameWnd::OnCmdMsg
-4424=COleDocument::OnCmdMsg
-4425=CPropertySheet::OnCmdMsg
-4426=CView::OnCmdMsg
-4427=CRichEditView::OnColorDefault
-4428=CColorDialog::OnColorOK
-4429=CRichEditView::OnColorPick
-4430=CFrameWnd::OnCommand
-4431=CMDIFrameWnd::OnCommand
-4432=COlePropertyPage::OnCommand
-4433=CPropertySheet::OnCommand
-4434=CSplitterWnd::OnCommand
-4435=CWnd::OnCommand
-4436=CDialog::OnCommandHelp
-4437=CFrameWnd::OnCommandHelp
-4438=CMDIFrameWnd::OnCommandHelp
-4439=CPropertySheet::OnCommandHelp
-4440=CWnd::OnCompareItem
-4441=CAsyncSocket::OnConnect
-4442=CFrameWnd::OnContextHelp
-4443=COleFrameHook::OnContextHelp
-4444=COleIPFrameWnd::OnContextHelp
-4445=CWinApp::OnContextHelp
-4446=COleControlSite::XOleControlSite::OnControlInfoChanged
-4447=CCheckListBox::OnCreate
-4448=CControlBar::OnCreate
-4449=CEditView::OnCreate
-4450=CFormView::OnCreate
-4451=CFrameWnd::OnCreate
-4452=CMDIChildWnd::OnCreate
-4453=COleControl::OnCreate
-4454=COleIPFrameWnd::OnCreate
-4455=CPreviewView::OnCreate
-4456=CRichEditView::OnCreate
-4457=CToolBarCtrl::OnCreate
-4458=CView::OnCreate
-4459=CCmdTarget::OnCreateAggregates
-4460=COleControl::OnCreateAggregates
-4461=CFrameWnd::OnCreateClient
-4462=CMDIFrameWnd::OnCreateClient
-4463=COleIPFrameWnd::OnCreateControlBars
-4464=COleIPFrameWnd::OnCreateControlBars
-4465=CFrameWnd::OnCreateHelper
-4466=COleObjectFactory::OnCreateObject
-4467=COleTemplateServer::OnCreateObject
-4468=CColorDialog::OnCtlColor
-4469=CControlBar::OnCtlColor
-4470=CDialog::OnCtlColor
-4471=COlePropertyPage::OnCtlColor
-4472=CPropertyPage::OnCtlColor
-4473=CPropertySheet::OnCtlColor
-4474=CWnd::OnCtlColor
-4475=CAsyncMonikerFile::OnDataAvailable
-4476=CCachedDataPathProperty::OnDataAvailable
-4477=COleClientItem::OnDataChange
-4478=COleClientItem::XAdviseSink::OnDataChange
-4479=CDocManager::OnDDECommand
-4480=CWinApp::OnDDECommand
-4481=CFrameWnd::OnDDEExecute
-4482=CFrameWnd::OnDDEInitiate
-4483=CFrameWnd::OnDDETerminate
-4484=COleClientItem::OnDeactivate
-4485=COleServerDoc::OnDeactivate
-4486=COleClientItem::OnDeactivateAndUndo
-4487=COleClientItem::OnDeactivateUI
-4488=COleServerDoc::OnDeactivateUI
-4489=CRichEditCntrItem::OnDeactivateUI
-4490=CWnd::OnDeleteItem
-4491=CControlBar::OnDestroy
-4492=CEditView::OnDestroy
-4493=CFrameWnd::OnDestroy
-4494=CMDIChildWnd::OnDestroy
-4495=CMDIFrameWnd::OnDestroy
-4496=COleControl::OnDestroy
-4497=COleIPFrameWnd::OnDestroy
-4498=CRichEditView::OnDestroy
-4499=CTabCtrl::OnDestroy
-4500=CTreeCtrl::OnDestroy
-4501=CTreeView::OnDestroy
-4502=CView::OnDestroy
-4503=CRichEditView::OnDevModeChange
-4504=CWnd::OnDevModeChange
-4505=CToolTipCtrl::OnDisableModal
-4506=COleClientItem::OnDiscardUndoState
-4507=CSplitterWnd::OnDisplayChange
-4508=CWnd::OnDisplayChange
-4509=CPreviewView::OnDisplayPageNumber
-4510=COleFrameHook::OnDocActivate
-4511=COleServerDoc::OnDocWindowActivate
-4512=COleControl::XOleInPlaceActiveObject::OnDocWindowActivate
-4513=COleServerDoc::XOleInPlaceActiveObject::OnDocWindowActivate
-4514=CDocObjectServerItem::OnDoVerb
-4515=COleControl::OnDoVerb
-4516=COleServerItem::OnDoVerb
-4517=COleDropTarget::OnDragEnter
-4518=CView::OnDragEnter
-4519=COleDropTarget::OnDragLeave
-4520=CView::OnDragLeave
-4521=CWnd::OnDragList
-4522=COleDropTarget::OnDragOver
-4523=CView::OnDragOver
-4524=COleDropTarget::OnDragScroll
-4525=CView::OnDragScroll
-4526=CCtrlView::OnDraw
-4527=CFormView::OnDraw
-4528=COleControl::OnDraw
-4529=CPreviewView::OnDraw
-4530=CView::OnDraw
-4531=COleServerItem::OnDrawEx
-4532=CWnd::OnDrawItem
-4533=COleControl::OnDrawMetafile
-4534=CPageSetupDialog::OnDrawPage
-4535=CSplitterWnd::OnDrawSplitter
-4536=COleDropTarget::OnDrop
-4537=CView::OnDrop
-4538=COleDropTarget::OnDropEx
-4539=CView::OnDropEx
-4540=CFrameWnd::OnDropFiles
-4541=CRichEditView::OnDropFiles
-4542=COleControl::OnEdit
-4543=CEditView::OnEditChange
-4544=CFontPropPage::OnEditchangeFontstyles
-4545=COleDocument::OnEditChangeIcon
-4546=CEditView::OnEditClear
-4547=CRichEditView::OnEditClear
-4548=COleDocument::OnEditConvert
-4549=CEditView::OnEditCopy
-4550=CRichEditView::OnEditCopy
-4551=CEditView::OnEditCut
-4552=CRichEditView::OnEditCut
-4553=CEditView::OnEditFind
-4554=CRichEditView::OnEditFind
-4555=CEditView::OnEditFindReplace
-4556=CRichEditView::OnEditFindReplace
-4557=COleDocument::OnEditLinks
-4558=CEditView::OnEditPaste
-4559=CRichEditView::OnEditPaste
-4560=CRichEditView::OnEditPasteSpecial
-4561=CRichEditView::OnEditProperties
-4562=CColorPropPage::OnEditProperty
-4563=CFontPropPage::OnEditProperty
-4564=COlePropertyPage::OnEditProperty
-4565=CPicturePropPage::OnEditProperty
-4566=CStockPropPage::OnEditProperty
-4567=CEditView::OnEditRepeat
-4568=CRichEditView::OnEditRepeat
-4569=CEditView::OnEditReplace
-4570=CRichEditView::OnEditReplace
-4571=CEditView::OnEditSelectAll
-4572=CRichEditView::OnEditSelectAll
-4573=CEditView::OnEditUndo
-4574=CRichEditView::OnEditUndo
-4575=CFontPropPage::OnEditupdateFontnames
-4576=CFontPropPage::OnEditupdateFontsizes
-4577=CFrameWnd::OnEnable
-4578=COleControl::OnEnabledChanged
-4579=COleFrameHook::OnEnableModeless
-4580=CEditView::OnEndPrinting
-4581=CRichEditView::OnEndPrinting
-4582=CView::OnEndPrinting
-4583=CView::OnEndPrintPreview
-4584=CFrameWnd::OnEndSession
-4585=CFrameWnd::OnEnterIdle
-4586=COleControl::OnEnterIdle
-4587=CWnd::OnEnterIdle
-4588=COleControl::OnEnumVerbs
-4589=CFrameWnd::OnEraseBkgnd
-4590=COleResizeBar::OnEraseBkgnd
-4591=CPreviewView::OnEraseBkgnd
-4592=CToolBar::OnEraseBkgnd
-4593=CWnd::OnEraseBkgnd
-4594=CCmdTarget::OnEvent
-4595=COccManager::OnEvent
-4596=COleControlSite::OnEvent
-4597=COleControl::OnEventAdvise
-4598=CDocObjectServer::OnExecOleCmd
-4599=COleServerDoc::OnExecOleCmd
-4600=CDocument::OnFileClose
-4601=CFileDialog::OnFileNameChange
-4602=CFileDialog::OnFileNameOK
-4603=CDocManager::OnFileNew
-4604=CWinApp::OnFileNew
-4605=CDocManager::OnFileOpen
-4606=CWinApp::OnFileOpen
-4607=CView::OnFilePrint
-4608=CView::OnFilePrintPreview
-4609=CWinApp::OnFilePrintSetup
-4610=CDocument::OnFileSave
-4611=CDocument::OnFileSaveAs
-4612=COleServerDoc::OnFileSaveCopyAs
-4613=CDocument::OnFileSendMail
-4614=COleDocument::OnFileSendMail
-4615=COleServerDoc::OnFileUpdate
-4616=CCmdTarget::OnFinalRelease
-4617=CDocument::OnFinalRelease
-4618=COleControl::OnFinalRelease
-4619=COlePropertyPage::OnFinalRelease
-4620=COleServerItem::OnFinalRelease
-4621=CWnd::OnFinalRelease
-4622=COleLinkingDoc::OnFindEmbeddedItem
-4623=CEditView::OnFindNext
-4624=CRichEditView::OnFindNext
-4625=CEditView::OnFindReplaceCmd
-4626=CRichEditView::OnFindReplaceCmd
-4627=CMiniFrameWnd::OnFloatStatus
-4628=COleControlSite::XOleControlSite::OnFocus
-4629=CFileDialog::OnFolderChange
-4630=COleControl::OnFontChanged
-4631=COleControl::OnForeColorChanged
-4632=CRichEditView::OnFormatFont
-4633=COleControl::OnFrameClose
-4634=COleServerDoc::OnFrameWindowActivate
-4635=COleControl::XOleInPlaceActiveObject::OnFrameWindowActivate
-4636=COleServerDoc::XOleInPlaceActiveObject::OnFrameWindowActivate
-4637=COleControl::OnFreezeEvents
-4638=CCheckListBox::OnGetCheckPosition
-4639=COleClientItem::OnGetClipboardData
-4640=COleServerItem::OnGetClipboardData
-4641=COleClientItem::OnGetClipRect
-4642=COleControl::OnGetColorSet
-4643=COleControl::OnGetControlInfo
-4644=COleControl::OnGetDisplayString
-4645=COleControl::OnGetDlgCode
-4646=CRichEditDoc::OnGetEmbeddedItem
-4647=COleServerItem::OnGetExtent
-4648=COleControl::OnGetInPlaceMenu
-4649=COleClientItem::OnGetItemPosition
-4650=COleLinkingDoc::OnGetLinkedItem
-4651=COleServerDoc::OnGetLinkedItem
-4652=CMiniFrameWnd::OnGetMinMaxInfo
-4653=COleControl::OnGetNaturalExtent
-4654=COleControl::OnGetPredefinedStrings
-4655=COleControl::OnGetPredefinedValue
-4656=CMiniFrameWnd::OnGetText
-4657=CStatusBar::OnGetText
-4658=CMiniFrameWnd::OnGetTextLength
-4659=CStatusBar::OnGetTextLength
-4660=COleControl::OnGetViewExtent
-4661=COleControl::OnGetViewRect
-4662=COleControl::OnGetViewStatus
-4663=COleClientItem::OnGetWindowContext
-4664=CWnd::OnGrayCtlColor
-4665=CFrameWnd::OnHelp
-4666=COlePropertyPage::OnHelp
-4667=CWinApp::OnHelp
-4668=CWnd::OnHelp
-4669=CWinApp::OnHelpFinder
-4670=CWnd::OnHelpFinder
-4671=CControlBar::OnHelpHitTest
-4672=CDialog::OnHelpHitTest
-4673=CFrameWnd::OnHelpHitTest
-4674=CWinApp::OnHelpIndex
-4675=CWnd::OnHelpIndex
-4676=CCommonDialog::OnHelpInfo
-4677=CWnd::OnHelpInfo
-4678=CWinApp::OnHelpUsing
-4679=CWnd::OnHelpUsing
-4680=CDocObjectServerItem::OnHide
-4681=COleControl::OnHide
-4682=COleServerItem::OnHide
-4683=COleControl::OnHideToolBars
-4684=CFrameWnd::OnHScroll
-4685=CPreviewView::OnHScroll
-4686=CScrollView::OnHScroll
-4687=CSplitterWnd::OnHScroll
-4688=CWnd::OnHScroll
-4689=CDocTemplate::OnIdle
-4690=CDocument::OnIdle
-4691=COleDocument::OnIdle
-4692=CWinApp::OnIdle
-4693=CWinThread::OnIdle
-4694=CControlBar::OnIdleUpdateCmdUI
-4695=CFrameWnd::OnIdleUpdateCmdUI
-4696=CMDIFrameWnd::OnIdleUpdateCmdUI
-4697=COleCntrFrameWnd::OnIdleUpdateCmdUI
-4698=COleIPFrameWnd::OnIdleUpdateCmdUI
-4699=COleControl::OnInactiveMouseMove
-4700=COleControl::XPointerInactive::OnInactiveMouseMove
-4701=COleControl::OnInactiveSetCursor
-4702=COleControl::XPointerInactive::OnInactiveSetCursor
-4703=CColorPropPage::OnInitDialog
-4704=CDialog::OnInitDialog
-4705=CFontPropPage::OnInitDialog
-4706=COlePropertiesDialog::OnInitDialog
-4707=COlePropertyPage::OnInitDialog
-4708=CPicturePropPage::OnInitDialog
-4709=CPropertySheet::OnInitDialog
-4710=CFileDialog::OnInitDone
-4711=COleServerItem::OnInitFromData
-4712=CControlBar::OnInitialUpdate
-4713=CDaoRecordView::OnInitialUpdate
-4714=CFormView::OnInitialUpdate
-4715=CRecordView::OnInitialUpdate
-4716=CRichEditView::OnInitialUpdate
-4717=CView::OnInitialUpdate
-4718=CFrameWnd::OnInitMenuPopup
-4719=COleControl::OnInitMenuPopup
-4720=COleClientItem::XOleIPSite::OnInPlaceActivate
-4721=COleControlSite::XOleIPSite::OnInPlaceActivate
-4722=COleClientItem::XOleIPSite::OnInPlaceDeactivate
-4723=COleControlSite::XOleIPSite::OnInPlaceDeactivate
-4724=COleClientItem::OnInsertMenus
-4725=CRichEditView::OnInsertObject
-4726=CSplitterWnd::OnInvertTracker
-4727=CDockContext::OnKey
-4728=CCheckListBox::OnKeyDown
-4729=COleControl::OnKeyDown
-4730=CRichEditView::OnKeyDown
-4731=CSplitterWnd::OnKeyDown
-4732=COleControl::OnKeyDownEvent
-4733=COleControl::OnKeyPressEvent
-4734=COleControl::OnKeyUp
-4735=COleControl::OnKeyUpEvent
-4736=CPropertyPage::OnKillActive
-4737=COleControl::OnKillFocus
-4738=CCheckListBox::OnLBAddString
-4739=CCheckListBox::OnLBFindString
-4740=CCheckListBox::OnLBFindStringExact
-4741=CCheckListBox::OnLBGetItemData
-4742=CCheckListBox::OnLBGetText
-4743=CCheckListBox::OnLBInsertString
-4744=CFileDialog::OnLBSelChangedNotify
-4745=CCheckListBox::OnLBSelectString
-4746=CCheckListBox::OnLBSetItemData
-4747=CCheckListBox::OnLBSetItemHeight
-4748=CCheckListBox::OnLButtonDblClk
-4749=CControlBar::OnLButtonDblClk
-4750=COleControl::OnLButtonDblClk
-4751=CSplitterWnd::OnLButtonDblClk
-4752=CCheckListBox::OnLButtonDown
-4753=CControlBar::OnLButtonDown
-4754=COleControl::OnLButtonDown
-4755=COleResizeBar::OnLButtonDown
-4756=CPreviewView::OnLButtonDown
-4757=CSplitterWnd::OnLButtonDown
-4758=CMiniFrameWnd::OnLButtonUp
-4759=COleControl::OnLButtonUp
-4760=CSplitterWnd::OnLButtonUp
-4761=CAsyncMonikerFile::OnLowResource
-4762=COleControl::OnMapPropertyToPage
-4763=COleControl::OnMButtonDblClk
-4764=COleControl::OnMButtonDown
-4765=COleControl::OnMButtonUp
-4766=CMDIChildWnd::OnMDIActivate
-4767=CMDIFrameWnd::OnMDIWindowCmd
-4768=CWnd::OnMeasureItem
-4769=CMDIFrameWnd::OnMenuChar
-4770=CFrameWnd::OnMenuSelect
-4771=COleControl::OnMenuSelect
-4772=COleMessageFilter::OnMessagePending
-4773=CSocket::OnMessagePending
-4774=COleControl::OnMnemonic
-4775=COleControl::XOleControl::OnMnemonic
-4776=CControlBar::OnMouseActivate
-4777=CMDIChildWnd::OnMouseActivate
-4778=CMiniDockFrameWnd::OnMouseActivate
-4779=COleControl::OnMouseActivate
-4780=CView::OnMouseActivate
-4781=CMiniFrameWnd::OnMouseMove
-4782=COleControl::OnMouseMove
-4783=CSplitterWnd::OnMouseMove
-4784=CDaoRecordView::OnMove
-4785=COleControl::OnMove
-4786=CRecordView::OnMove
-4787=CFrameWnd::OnNcActivate
-4788=CMDIChildWnd::OnNcActivate
-4789=CMiniFrameWnd::OnNcActivate
-4790=CDockBar::OnNcCalcSize
-4791=CMiniFrameWnd::OnNcCalcSize
-4792=COleControl::OnNcCalcSize
-4793=CStatusBar::OnNcCalcSize
-4794=CToolBar::OnNcCalcSize
-4795=CMDIChildWnd::OnNcCreate
-4796=CMiniFrameWnd::OnNcCreate
-4797=COleControl::OnNcCreate
-4798=CPropertySheet::OnNcCreate
-4799=CSplitterWnd::OnNcCreate
-4800=CToolBar::OnNcCreate
-4801=CListCtrl::OnNcDestroy
-4802=CListView::OnNcDestroy
-4803=CWnd::OnNcDestroy
-4804=CMiniFrameWnd::OnNcHitTest
-4805=COleControl::OnNcHitTest
-4806=CStatusBar::OnNcHitTest
-4807=CToolBar::OnNcHitTest
-4808=CMiniDockFrameWnd::OnNcLButtonDblClk
-4809=CMiniDockFrameWnd::OnNcLButtonDown
-4810=CMiniFrameWnd::OnNcLButtonDown
-4811=COleControl::OnNcLButtonDown
-4812=CDockBar::OnNcPaint
-4813=CMiniFrameWnd::OnNcPaint
-4814=COleControl::OnNcPaint
-4815=CStatusBar::OnNcPaint
-4816=CToolBar::OnNcPaint
-4817=CDocument::OnNewDocument
-4818=COleDocument::OnNewDocument
-4819=COleLinkingDoc::OnNewDocument
-4820=COleServerDoc::OnNewEmbedding
-4821=CEnumArray::OnNext
-4822=CEnumConnPoints::OnNext
-4823=CEnumFormatEtc::OnNext
-4824=CEnumOleVerb::OnNext
-4825=CEnumUnknown::OnNext
-4826=CPreviewView::OnNextPage
-4827=CView::OnNextPaneCmd
-4828=CFileDialog::OnNotify
-4829=CPropertyPage::OnNotify
-4830=CSplitterWnd::OnNotify
-4831=CWnd::OnNotify
-4832=COleMessageFilter::OnNotRespondingDialog
-4833=CWnd::OnNTCtlColor
-4834=CPreviewView::OnNumPageChange
-4835=CColorPropPage::OnObjectsChanged
-4836=CFontPropPage::OnObjectsChanged
-4837=COlePropertyPage::OnObjectsChanged
-4838=CPicturePropPage::OnObjectsChanged
-4839=COleControl::OnOcmCtlColorBtn
-4840=COleControl::OnOcmCtlColorDlg
-4841=COleControl::OnOcmCtlColorEdit
-4842=COleControl::OnOcmCtlColorListBox
-4843=COleControl::OnOcmCtlColorMsgBox
-4844=COleControl::OnOcmCtlColorScrollBar
-4845=COleControl::OnOcmCtlColorStatic
-4846=CCommonDialog::OnOK
-4847=CDialog::OnOK
-4848=CPropertyPage::OnOK
-4849=CDocObjectServerItem::OnOpen
-4850=COleControl::OnOpen
-4851=COleServerItem::OnOpen
-4852=CDocument::OnOpenDocument
-4853=COleDocument::OnOpenDocument
-4854=COleLinkingDoc::OnOpenDocument
-4855=COleServerDoc::OnOpenEmbedding
-4856=CWinApp::OnOpenRecentFile
-4857=CAsyncSocket::OnOutOfBandData
-4858=CControlBar::OnPaint
-4859=CCtrlView::OnPaint
-4860=CDockBar::OnPaint
-4861=CFontPropPage::OnPaint
-4862=COleControl::OnPaint
-4863=COleResizeBar::OnPaint
-4864=CPicturePropPage::OnPaint
-4865=CSplitterWnd::OnPaint
-4866=CStatusBar::OnPaint
-4867=CToolBar::OnPaint
-4868=CView::OnPaint
-4869=CFrameWnd::OnPaletteChanged
-4870=COleFrameHook::OnPaletteChanged
-4871=CRichEditView::OnParaAlign
-4872=CRichEditView::OnParaCenter
-4873=CRichEditView::OnParaLeft
-4874=CRichEditView::OnParaRight
-4875=CWnd::OnParentNotify
-4876=CRichEditView::OnPasteNativeObject
-4877=CFrameWnd::OnPopMessageString
-4878=COleClientItem::XOleIPSite::OnPosRectChange
-4879=COleControlSite::XOleIPSite::OnPosRectChange
-4880=CEditView::OnPrepareDC
-4881=CPreviewView::OnPrepareDC
-4882=CRichEditView::OnPrepareDC
-4883=CScrollView::OnPrepareDC
-4884=CView::OnPrepareDC
-4885=CEditView::OnPreparePrinting
-4886=CView::OnPreparePrinting
-4887=COleFrameHook::OnPreTranslateMessage
-4888=CPreviewView::OnPreviewClose
-4889=CPreviewView::OnPreviewPrint
-4890=CPreviewView::OnPrevPage
-4891=CEditView::OnPrint
-4892=CRichEditView::OnPrint
-4893=CView::OnPrint
-4894=CRichEditView::OnPrinterChanged
-4895=CPrintDialog::OnPrintSetup
-4896=CAsyncMonikerFile::OnProgress
-4897=COleControl::OnProperties
-4898=CWnd::OnQuery3dControls
-4899=CPropertyPage::OnQueryCancel
-4900=CMiniFrameWnd::OnQueryCenterWnd
-4901=CFrameWnd::OnQueryEndSession
-4902=COleControl::OnQueryHitPoint
-4903=COleControl::OnQueryHitRect
-4904=CFrameWnd::OnQueryNewPalette
-4905=COleFrameHook::OnQueryNewPalette
-4906=COleServerItem::OnQueryUpdateItems
-4907=COleControl::OnRButtonDblClk
-4908=COleControl::OnRButtonDown
-4909=COleControl::OnRButtonUp
-4910=COleServerDoc::OnReactivateAndUndo
-4911=COleFrameHook::OnRecalcLayout
-4912=COleIPFrameWnd::OnRecalcParent
-4913=CAsyncSocket::OnReceive
-4914=COleControl::OnReflectorDestroyed
-4915=COleClientItem::OnRemoveMenus
-4916=COleClientItem::XAdviseSink::OnRename
-4917=COleControl::CControlDataSource::OnRenderData
-4918=COleServerItem::CItemDataSource::OnRenderData
-4919=COleControl::OnRenderData
-4920=COleDataSource::OnRenderData
-4921=COleServerItem::OnRenderData
-4922=COleControl::CControlDataSource::OnRenderFileData
-4923=COleServerItem::CItemDataSource::OnRenderFileData
-4924=COleControl::OnRenderFileData
-4925=COleDataSource::OnRenderFileData
-4926=COleServerItem::OnRenderFileData
-4927=COleControl::CControlDataSource::OnRenderGlobalData
-4928=COleServerItem::CItemDataSource::OnRenderGlobalData
-4929=COleControl::OnRenderGlobalData
-4930=COleDataSource::OnRenderGlobalData
-4931=COleServerItem::OnRenderGlobalData
-4932=CEditView::OnReplaceAll
-4933=CRichEditView::OnReplaceAll
-4934=CEditView::OnReplaceSel
-4935=CRichEditView::OnReplaceSel
-4936=COleControl::XFontNotification::OnRequestEdit
-4937=COleControlSite::XPropertyNotifySink::OnRequestEdit
-4938=COlePropertyPage::XPropNotifySink::OnRequestEdit
-4939=COleDocIPFrameWnd::OnRequestPositionChange
-4940=COleIPFrameWnd::OnRequestPositionChange
-4941=CEnumArray::OnReset
-4942=CPropertyPage::OnReset
-4943=COleControl::OnResetState
-4944=COleServerDoc::OnResizeBorder
-4945=COleIPFrameWnd::OnResizeChild
-4946=COleClientItem::XAdviseSink::OnSave
-4947=CDocument::OnSaveDocument
-4948=COleDocument::OnSaveDocument
-4949=COleLinkingDoc::OnSaveDocument
-4950=COleServerDoc::OnSaveDocument
-4951=COleServerDoc::OnSaveEmbedding
-4952=COleServerItem::OnSaveEmbedding
-4953=CDocObjectServer::OnSaveViewState
-4954=CScrollView::OnScroll
-4955=CView::OnScroll
-4956=COleClientItem::OnScrollBy
-4957=CScrollView::OnScrollBy
-4958=CView::OnScrollBy
-4959=CRichEditView::OnSelChange
-4960=CColorPropPage::OnSelchangeColorprop
-4961=CFontPropPage::OnSelchangeFontnames
-4962=CFontPropPage::OnSelchangeFontprop
-4963=CFontPropPage::OnSelchangeFontsizes
-4964=CFontPropPage::OnSelchangeFontstyles
-4965=CPicturePropPage::OnSelchangePictProp
-4966=CStockPropPage::OnSelchangePropname
-4967=CColorPropPage::OnSelchangeSystemcolors
-4968=CColorPropPage::OnSelect
-4969=CAsyncSocket::OnSend
-4970=CPropertyPage::OnSetActive
-4971=CToolBar::OnSetBitmapSize
-4972=CToolBar::OnSetButtonSize
-4973=COleControl::OnSetClientSite
-4974=COleServerItem::OnSetColorScheme
-4975=CFrameWnd::OnSetCursor
-4976=COleControl::OnSetCursor
-4977=COleResizeBar::OnSetCursor
-4978=CPreviewView::OnSetCursor
-4979=CSplitterWnd::OnSetCursor
-4980=COleControl::CControlDataSource::OnSetData
-4981=COleServerItem::CItemDataSource::OnSetData
-4982=COleControl::OnSetData
-4983=COleDataSource::OnSetData
-4984=COleServerItem::OnSetData
-4985=CPropertySheet::OnSetDefID
-4986=COleControl::OnSetExtent
-4987=COleServerItem::OnSetExtent
-4988=CFormView::OnSetFocus
-4989=CFrameWnd::OnSetFocus
-4990=COleControl::OnSetFocus
-4991=CCheckListBox::OnSetFont
-4992=CDialog::OnSetFont
-4993=CEditView::OnSetFont
-4994=COleServerDoc::OnSetHostNames
-4995=CDocObjectServer::OnSetItemRects
-4996=COleServerDoc::OnSetItemRects
-4997=COleClientItem::OnSetMenu
-4998=CFrameWnd::OnSetMessageString
-4999=COleControl::OnSetMessageString
-5000=COleIPFrameWnd::OnSetMessageString
-5001=CStatusBar::OnSetMinHeight
-5002=COleControl::OnSetObjectRects
-5003=CDatabase::OnSetOptions
-5004=CRecordset::OnSetOptions
-5005=COlePropertyPage::OnSetPageSite
-5006=CFrameWnd::OnSetPreviewMode
-5007=CMiniFrameWnd::OnSetText
-5008=COleControl::OnSetText
-5009=CStatusBar::OnSetText
-5010=CFileDialog::OnShareViolation
-5011=CDocObjectServerItem::OnShow
-5012=COleServerItem::OnShow
-5013=COleClientItem::OnShowControlBars
-5014=COleServerDoc::OnShowControlBars
-5015=COleServerDoc::OnShowDocument
-5016=COleClientItem::OnShowItem
-5017=COleControl::OnShowToolBars
-5018=COleDocument::OnShowViews
-5019=COleLinkingDoc::OnShowViews
-5020=COleControl::OnShowWindow
-5021=CWnd::OnShowWindow
-5022=COleClientItem::XOleClientSite::OnShowWindow
-5023=COleControlSite::XOleClientSite::OnShowWindow
-5024=CFrameWnd::OnSize
-5025=CMDIChildWnd::OnSize
-5026=CMDIFrameWnd::OnSize
-5027=COleControl::OnSize
-5028=COleIPFrameWnd::OnSize
-5029=COleResizeBar::OnSize
-5030=CPreviewView::OnSize
-5031=CScrollView::OnSize
-5032=CSplitterWnd::OnSize
-5033=CStatusBar::OnSize
-5034=CWnd::OnSize
-5035=CControlBar::OnSizeParent
-5036=CDockBar::OnSizeParent
-5037=COleResizeBar::OnSizeParent
-5038=CEnumArray::OnSkip
-5039=CSocketWnd::OnSocketDead
-5040=CSocketWnd::OnSocketNotify
-5041=CView::OnSplitCmd
-5042=CAsyncMonikerFile::OnStartBinding
-5043=CInternetSession::OnStatusCallback
-5044=CAsyncMonikerFile::OnStopBinding
-5045=CFontPropPage::OnStrikeout
-5046=CToolBar::OnSysColorChange
-5047=CWnd::OnSysColorChange
-5048=CFrameWnd::OnSysCommand
-5049=CMiniFrameWnd::OnSysCommand
-5050=CPropertySheet::OnSysCommand
-5051=CSplitterWnd::OnSysCommand
-5052=COleControl::OnSysKeyDown
-5053=COleControl::OnSysKeyUp
-5054=COleControl::OnTextChanged
-5055=CEditView::OnTextNotFound
-5056=CRichEditView::OnTextNotFound
-5057=CControlBar::OnTimer
-5058=CToolBar::OnToolHitTest
-5059=CWnd::OnToolHitTest
-5060=CFrameWnd::OnToolTipText
-5061=CFileDialog::OnTypeChange
-5062=COleControlContainer::OnUIActivate
-5063=COleClientItem::XOleIPSite::OnUIActivate
-5064=COleControlSite::XOleIPSite::OnUIActivate
-5065=COleControlContainer::OnUIDeactivate
-5066=COleClientItem::XOleIPSite::OnUIDeactivate
-5067=COleControlSite::XOleIPSite::OnUIDeactivate
-5068=CFontPropPage::OnUnderline
-5069=COleServerItem::OnUpdate
-5070=CView::OnUpdate
-5071=CRichEditView::OnUpdateBullet
-5072=CRichEditView::OnUpdateCharBold
-5073=CRichEditView::OnUpdateCharEffect
-5074=CRichEditView::OnUpdateCharItalic
-5075=CRichEditView::OnUpdateCharUnderline
-5076=CDialogBar::OnUpdateCmdUI
-5077=CDockBar::OnUpdateCmdUI
-5078=COleResizeBar::OnUpdateCmdUI
-5079=CStatusBar::OnUpdateCmdUI
-5080=CToolBar::OnUpdateCmdUI
-5081=CFrameWnd::OnUpdateContextHelp
-5082=CFrameWnd::OnUpdateControlBarMenu
-5083=COleIPFrameWnd::OnUpdateControlBarMenu
-5084=COleServerDoc::OnUpdateDocument
-5085=COleDocument::OnUpdateEditChangeIcon
-5086=COleDocument::OnUpdateEditLinksMenu
-5087=CRichEditView::OnUpdateEditPasteSpecial
-5088=CRichEditView::OnUpdateEditProperties
-5089=CEditView::OnUpdateEditUndo
-5090=CRichEditView::OnUpdateEditUndo
-5091=COleServerDoc::OnUpdateFileExit
-5092=CDocument::OnUpdateFileSendMail
-5093=COleServerDoc::OnUpdateFileUpdate
-5094=CFrameWnd::OnUpdateFrameMenu
-5095=CMDIChildWnd::OnUpdateFrameMenu
-5096=CMDIFrameWnd::OnUpdateFrameMenu
-5097=CFrameWnd::OnUpdateFrameTitle
-5098=CMDIChildWnd::OnUpdateFrameTitle
-5099=CMDIFrameWnd::OnUpdateFrameTitle
-5100=COleClientItem::OnUpdateFrameTitle
-5101=COleFrameHook::OnUpdateFrameTitle
-5102=COleServerItem::OnUpdateItems
-5103=CFrameWnd::OnUpdateKeyIndicator
-5104=CMDIFrameWnd::OnUpdateMDIWindowCmd
-5105=CEditView::OnUpdateNeedClip
-5106=CRichEditView::OnUpdateNeedClip
-5107=CEditView::OnUpdateNeedFind
-5108=CRichEditView::OnUpdateNeedFind
-5109=CEditView::OnUpdateNeedSel
-5110=CRichEditView::OnUpdateNeedSel
-5111=CEditView::OnUpdateNeedText
-5112=CRichEditView::OnUpdateNeedText
-5113=CPreviewView::OnUpdateNextPage
-5114=CView::OnUpdateNextPaneMenu
-5115=CPreviewView::OnUpdateNumPageChange
-5116=COleDocument::OnUpdateObjectVerbMenu
-5117=CRichEditView::OnUpdateParaAlign
-5118=CRichEditView::OnUpdateParaCenter
-5119=CRichEditView::OnUpdateParaLeft
-5120=CRichEditView::OnUpdateParaRight
-5121=COleDocument::OnUpdatePasteLinkMenu
-5122=COleDocument::OnUpdatePasteMenu
-5123=CPreviewView::OnUpdatePrevPage
-5124=CWinApp::OnUpdateRecentFileMenu
-5125=CDaoRecordView::OnUpdateRecordFirst
-5126=CRecordView::OnUpdateRecordFirst
-5127=CDaoRecordView::OnUpdateRecordLast
-5128=CRecordView::OnUpdateRecordLast
-5129=CDaoRecordView::OnUpdateRecordNext
-5130=CRecordView::OnUpdateRecordNext
-5131=CDaoRecordView::OnUpdateRecordPrev
-5132=CRecordView::OnUpdateRecordPrev
-5133=CView::OnUpdateSplitCmd
-5134=CPreviewView::OnUpdateZoomIn
-5135=CPreviewView::OnUpdateZoomOut
-5136=COleClientItem::XAdviseSink::OnViewChange
-5137=CWnd::OnVKeyToItem
-5138=CFrameWnd::OnVScroll
-5139=CPreviewView::OnVScroll
-5140=CScrollView::OnVScroll
-5141=CSplitterWnd::OnVScroll
-5142=CWnd::OnVScroll
-5143=CToolTipCtrl::OnWindowFromPoint
-5144=COleControl::OnWindowlessMessage
-5145=COleControl::XOleInPlaceObject::OnWindowMessage
-5146=CMDIFrameWnd::OnWindowNew
-5147=CControlBar::OnWindowPosChanging
-5148=CDockBar::OnWindowPosChanging
-5149=CMDIChildWnd::OnWindowPosChanging
-5150=COleIPFrameWnd::OnWindowPosChanging
-5151=CStatusBar::OnWindowPosChanging
-5152=CToolBar::OnWindowPosChanging
-5153=CWnd::OnWinIniChange
-5154=CPropertyPage::OnWizardBack
-5155=CPropertyPage::OnWizardFinish
-5156=CPropertyPage::OnWizardNext
-5157=CWnd::OnWndMsg
-5158=CPreviewView::OnZoomIn
-5159=CPreviewView::OnZoomOut
-5160=CAsyncMonikerFile::Open
-5161=CAsyncMonikerFile::Open
-5162=CAsyncMonikerFile::Open
-5163=CAsyncMonikerFile::Open
-5164=CAsyncMonikerFile::Open
-5165=CAsyncMonikerFile::Open
-5166=CAsyncMonikerFile::Open
-5167=CAsyncMonikerFile::Open
-5168=CDaoDatabase::Open
-5169=CDaoQueryDef::Open
-5170=CDaoRecordset::Open
-5171=CDaoRecordset::Open
-5172=CDaoRecordset::Open
-5173=CDaoTableDef::Open
-5174=CDaoWorkspace::Open
-5175=CDatabase::Open
-5176=CDataPathProperty::Open
-5177=CDataPathProperty::Open
-5178=CDataPathProperty::Open
-5179=CDataPathProperty::Open
-5180=CFile::Open
-5181=CMirrorFile::Open
-5182=CMonikerFile::Open
-5183=CMonikerFile::Open
-5184=CMonikerFile::Open
-5185=CMonikerFile::Open
-5186=CRecordset::Open
-5187=CSocketFile::Open
-5188=CStdioFile::Open
-5189=CDocObjectServer::XOleDocumentView::Open
-5190=CDocManager::OpenDocumentFile
-5191=CMultiDocTemplate::OpenDocumentFile
-5192=CSingleDocTemplate::OpenDocumentFile
-5193=CWinApp::OpenDocumentFile
-5194=CDatabase::OpenEx
-5195=CFtpConnection::OpenFile
-5196=CGopherConnection::OpenFile
-5197=COleUILinkInfo::OpenLinkSource
-5198=CHttpConnection::OpenRequest
-5199=CHttpConnection::OpenRequest
-5200=COleStreamFile::OpenStream
-5201=CInternetSession::OpenURL
-5202=CFileException::OsErrorToException
-5203=CDumpContext::OutputString
-5204=CEditView::PaginateTo
-5205=CRichEditView::PaginateTo
-5206=CPageSetupDialog::PaintHookProc
-5207=COleControl::ParentToClient
-5208=CWinApp::ParseCommandLine
-5209=COleCurrency::ParseCurrency
-5210=COleDateTime::ParseDateTime
-5211=COleControlContainer::XOleContainer::ParseDisplayName
-5212=COleLinkingDoc::XOleItemContainer::ParseDisplayName
-5213=CCommandLineInfo::ParseLast
-5214=CCommandLineInfo::ParseParam
-5215=CCommandLineInfo::ParseParam
-5216=CCommandLineInfo::ParseParamFlag
-5217=CCommandLineInfo::ParseParamNotFlag
-5218=CCommandLineInfo::ParseParamNotFlag
-5219=CRichEditCtrl::PasteSpecial
-5220=CDC::PlayMetaFile
-5221=CDC::PolyBezierTo
-5222=CDC::PolyDraw
-5223=CDC::PolylineTo
-5224=CPreviewView::PositionPage
-5225=CAsyncMonikerFile::PostBindToStream
-5226=CMonikerFile::PostBindToStream
-5227=COccManager::PostCreateDialog
-5228=CDialog::PostModal
-5229=COleControl::PostModalDialog
-5230=CControlBar::PostNcDestroy
-5231=CControlFrameWnd::PostNcDestroy
-5232=CFindReplaceDialog::PostNcDestroy
-5233=CFrameWnd::PostNcDestroy
-5234=COleCntrFrameWnd::PostNcDestroy
-5235=CReflectorWnd::PostNcDestroy
-5236=CView::PostNcDestroy
-5237=CWnd::PostNcDestroy
-5238=CRecordset::PreBindFields
-5239=CDocument::PreCloseFrame
-5240=COleDocument::PreCloseFrame
-5241=CRichEditDoc::PreCloseFrame
-5242=CCheckListBox::PreCompareItem
-5243=COccManager::PreCreateDialog
-5244=CControlBar::PreCreateWindow
-5245=CControlFrameWnd::PreCreateWindow
-5246=CCtrlView::PreCreateWindow
-5247=CEditView::PreCreateWindow
-5248=CFrameWnd::PreCreateWindow
-5249=CListView::PreCreateWindow
-5250=CMDIChildWnd::PreCreateWindow
-5251=CMDIFrameWnd::PreCreateWindow
-5252=CMiniFrameWnd::PreCreateWindow
-5253=CRichEditView::PreCreateWindow
-5254=CStatusBar::PreCreateWindow
-5255=CTreeView::PreCreateWindow
-5256=CView::PreCreateWindow
-5257=CWnd::PreCreateWindow
-5258=CCheckListBox::PreDeleteItem
-5259=CCheckListBox::PreDrawItem
-5260=CPageSetupDialog::PreDrawPage
-5261=CDialog::PreInitDialog
-5262=COleChangeSourceDialog::PreInitDialog
-5263=CCheckListBox::PreMeasureItem
-5264=CDialog::PreModal
-5265=COleControl::PreModalDialog
-5266=CRecordset::PrepareAndExecute
-5267=CDataExchange::PrepareCtrl
-5268=CDataExchange::PrepareEditCtrl
-5269=CDataExchange::PrepareOleCtrl
-5270=CRecordset::PrepareUpdateHstmt
-5271=CPropertyPage::PreProcessPageTemplate
-5272=CDragListBox::PreSubclassWindow
-5273=CWnd::PreSubclassWindow
-5274=CWnd::PreTranslateInput
-5275=CControlBar::PreTranslateMessage
-5276=CDialog::PreTranslateMessage
-5277=CFormView::PreTranslateMessage
-5278=CFrameWnd::PreTranslateMessage
-5279=CMDIChildWnd::PreTranslateMessage
-5280=CMDIFrameWnd::PreTranslateMessage
-5281=COleIPFrameWnd::PreTranslateMessage
-5282=COlePropertyPage::PreTranslateMessage
-5283=CPropertyPage::PreTranslateMessage
-5284=CPropertySheet::PreTranslateMessage
-5285=CWinThread::PreTranslateMessage
-5286=CWnd::PreTranslateMessage
-5287=CDocObjectServer::XPrint::Print
-5288=CPreviewDC::PrinterDPtoScreenDP
-5289=CEditView::PrintInsideRect
-5290=CRichEditView::PrintInsideRect
-5291=CRichEditView::PrintPage
-5292=COleDispatchException::Process
-5293=COleException::Process
-5294=CSocket::ProcessAuxQueue
-5295=CFrameWnd::ProcessHelpMsg
-5296=CWinThread::ProcessMessageFilter
-5297=CWinApp::ProcessShellCommand
-5298=CWinApp::ProcessWndProcException
-5299=CWinThread::ProcessWndProcException
-5300=COleSafeArray::PtrOfIndex
-5301=CDC::PtVisible
-5302=CMetaFileDC::PtVisible
-5303=CWinThread::PumpMessage
-5304=CSocket::PumpMessages
-5305=CCmdTarget::PushStackArgs
-5306=COleSafeArray::PutElement
-5307=CFtpConnection::PutFile
-5308=PX_Blob
-5309=PX_Bool
-5310=PX_Bool
-5311=PX_Color
-5312=PX_Color
-5313=PX_Currency
-5314=PX_Currency
-5315=PX_DataPath
-5316=PX_DataPath
-5317=PX_Double
-5318=PX_Double
-5319=PX_Float
-5320=PX_Float
-5321=PX_Font
-5322=PX_IUnknown
-5323=PX_Long
-5324=PX_Long
-5325=PX_Picture
-5326=PX_Picture
-5327=PX_Short
-5328=PX_Short
-5329=PX_String
-5330=PX_String
-5331=PX_String
-5332=PX_ULong
-5333=PX_ULong
-5334=PX_UShort
-5335=PX_UShort
-5336=PX_VBXFontConvert
-5337=CRichEditView::QueryAcceptData
-5338=CRichEditView::XRichEditOleCallback::QueryAcceptData
-5339=CCmdTarget::QueryAggregates
-5340=COleDropSource::QueryContinueDrag
-5341=COleDropSource::XDropSource::QueryContinueDrag
-5342=COleControl::QueryDefHandler
-5343=COleControl::XDataObject::QueryGetData
-5344=COleDataSource::XDataObject::QueryGetData
-5345=COleServerDoc::XDataObject::QueryGetData
-5346=COleServerItem::XDataObject::QueryGetData
-5347=COleControl::XViewObject::QueryHitPoint
-5348=COleControl::XViewObject::QueryHitRect
-5349=CHttpFile::QueryInfo
-5350=CHttpFile::QueryInfo
-5351=CHttpFile::QueryInfo
-5352=CHttpFile::QueryInfoStatusCode
-5353=CRichEditView::XRichEditOleCallback::QueryInsertObject
-5354=_CIP<IBindHost
-5355=CArchiveStream::QueryInterface
-5356=CBlobProperty::QueryInterface
-5357=CInnerUnknown::QueryInterface
-5358=COleConnPtContainer::QueryInterface
-5359=COleDispatchImpl::QueryInterface
-5360=COleUILinkInfo::QueryInterface
-5361=COleClientItem::XAdviseSink::QueryInterface
-5362=COleControlSite::XAmbientProps::QueryInterface
-5363=COleControlSite::XBoundObjectSite::QueryInterface
-5364=COleObjectFactory::XClassFactory::QueryInterface
-5365=CConnectionPoint::XConnPt::QueryInterface
-5366=COleControl::XDataObject::QueryInterface
-5367=COleDataSource::XDataObject::QueryInterface
-5368=COleServerDoc::XDataObject::QueryInterface
-5369=COleServerItem::XDataObject::QueryInterface
-5370=COleDropSource::XDropSource::QueryInterface
-5371=COleDropTarget::XDropTarget::QueryInterface
-5372=CEnumArray::XEnumVOID::QueryInterface
-5373=COleControlSite::XEventSink::QueryInterface
-5374=COleControl::XFontNotification::QueryInterface
-5375=COleMessageFilter::XMessageFilter::QueryInterface
-5376=COleControlSite::XNotifyDBEvents::QueryInterface
-5377=COleControl::XOleCache::QueryInterface
-5378=COleClientItem::XOleClientSite::QueryInterface
-5379=COleControlSite::XOleClientSite::QueryInterface
-5380=CDocObjectServer::XOleCommandTarget::QueryInterface
-5381=COleControlContainer::XOleContainer::QueryInterface
-5382=COleControl::XOleControl::QueryInterface
-5383=COleControlSite::XOleControlSite::QueryInterface
-5384=CDocObjectServer::XOleDocument::QueryInterface
-5385=CDocObjectServer::XOleDocumentView::QueryInterface
-5386=COleControl::XOleInPlaceActiveObject::QueryInterface
-5387=COleServerDoc::XOleInPlaceActiveObject::QueryInterface
-5388=COleFrameHook::XOleInPlaceFrame::QueryInterface
-5389=COleControl::XOleInPlaceObject::QueryInterface
-5390=COleServerDoc::XOleInPlaceObject::QueryInterface
-5391=COleControlContainer::XOleIPFrame::QueryInterface
-5392=COleClientItem::XOleIPSite::QueryInterface
-5393=COleControlSite::XOleIPSite::QueryInterface
-5394=COleLinkingDoc::XOleItemContainer::QueryInterface
-5395=CDocObjectServer::XOleObject::QueryInterface
-5396=COleControl::XOleObject::QueryInterface
-5397=COleServerDoc::XOleObject::QueryInterface
-5398=COleServerItem::XOleObject::QueryInterface
-5399=COlePropertiesDialog::XOleUIObjInfo::QueryInterface
-5400=COleControl::XPerPropertyBrowsing::QueryInterface
-5401=COleLinkingDoc::XPersistFile::QueryInterface
-5402=COleControl::XPersistMemory::QueryInterface
-5403=COleControl::XPersistPropertyBag::QueryInterface
-5404=COleControl::XPersistStorage::QueryInterface
-5405=COleServerDoc::XPersistStorage::QueryInterface
-5406=COleControl::XPersistStreamInit::QueryInterface
-5407=COleControl::XPointerInactive::QueryInterface
-5408=CDocObjectServer::XPrint::QueryInterface
-5409=COleControlSite::XPropertyNotifySink::QueryInterface
-5410=COlePropertyPage::XPropertyPage::QueryInterface
-5411=COlePropertyPage::XPropNotifySink::QueryInterface
-5412=COleControl::XProvideClassInfo::QueryInterface
-5413=COleControl::XQuickActivate::QueryInterface
-5414=CRichEditView::XRichEditOleCallback::QueryInterface
-5415=COleControl::XSpecifyPropertyPages::QueryInterface
-5416=COleControl::XViewObject::QueryInterface
-5417=CInternetConnection::QueryOption
-5418=CInternetConnection::QueryOption
-5419=CInternetConnection::QueryOption
-5420=CInternetFile::QueryOption
-5421=CInternetFile::QueryOption
-5422=CInternetFile::QueryOption
-5423=CInternetSession::QueryOption
-5424=CInternetSession::QueryOption
-5425=CInternetSession::QueryOption
-5426=CPropertyPage::QuerySiblings
-5427=CConnectionPoint::QuerySinkInterface
-5428=COleControl::XEventConnPt::QuerySinkInterface
-5429=CDocObjectServer::XOleCommandTarget::QueryStatus
-5430=CFontHolder::QueryTextMetrics
-5431=COleControlSite::QuickActivate
-5432=COleControl::XQuickActivate::QuickActivate
-5433=COleClientItem::ReactivateAndUndo
-5434=COleControl::XOleInPlaceObject::ReactivateAndUndo
-5435=COleServerDoc::XOleInPlaceObject::ReactivateAndUndo
-5436=CArchive::Read
-5437=CArchiveStream::Read
-5438=CFile::Read
-5439=CImageList::Read
-5440=CInternetFile::Read
-5441=CMemFile::Read
-5442=COleStreamFile::Read
-5443=CSocketFile::Read
-5444=CStdioFile::Read
-5445=CArchive::ReadClass
-5446=CArchive::ReadCount
-5447=CEditView::ReadFromArchive
-5448=CProperty::ReadFromStream
-5449=CPropertySection::ReadFromStream
-5450=CPropertySet::ReadFromStream
-5451=COleClientItem::ReadItem
-5452=COleClientItem::ReadItemCompound
-5453=COleClientItem::ReadItemFlat
-5454=CRecentFileList::ReadList
-5455=CPropertySection::ReadNameDictFromStream
-5456=CArchive::ReadObject
-5457=CArchive::ReadString
-5458=CArchive::ReadString
-5459=CInternetFile::ReadString
-5460=CInternetFile::ReadString
-5461=CStdioFile::ReadString
-5462=CStdioFile::ReadString
-5463=CMemFile::Realloc
-5464=CSharedFile::Realloc
-5465=CFieldExchange::ReallocLongBinary
-5466=CRecordset::RebindParams
-5467=CControlBar::RecalcDelayShow
-5468=CFrameWnd::RecalcLayout
-5469=CMiniDockFrameWnd::RecalcLayout
-5470=COleCntrFrameWnd::RecalcLayout
-5471=COleDocIPFrameWnd::RecalcLayout
-5472=COleIPFrameWnd::RecalcLayout
-5473=CSplitterWnd::RecalcLayout
-5474=CAsyncSocket::Receive
-5475=CSocket::Receive
-5476=CAsyncSocket::ReceiveFrom
-5477=CAsyncSocket::ReceiveFromHelper
-5478=CSocket::ReceiveFromHelper
-5479=COleControl::RecreateControlWindow
-5480=CRectconstCFrameWnd::rectDefault
-5481=CDC::RectVisible
-5482=CMetaFileDC::RectVisible
-5483=COleSafeArray::Redim
-5484=CDockBar::ReDockControlBar
-5485=CFrameWnd::ReDockControlBar
-5486=CWnd::ReflectChildNotify
-5487=CWnd::ReflectLastMsg
-5488=COleControl::Refresh
-5489=CDaoTableDef::RefreshLink
-5490=CRecordset::RefreshRowset
-5491=COleDropTarget::Register
-5492=COleLinkingDoc::Register
-5493=COleMessageFilter::Register
-5494=COleObjectFactory::Register
-5495=COleTemplateServer::Register
-5496=COleObjectFactory::RegisterAll
-5497=COleLinkingDoc::RegisterIfServerAttached
-5498=CDocManager::RegisterShellFileTypes
-5499=CWinApp::RegisterShellFileTypes
-5500=CWinApp::RegisterShellFileTypesCompat
-5501=CArchiveStream::Release
-5502=CBlobProperty::Release
-5503=CInnerUnknown::Release
-5504=COleClientItem::Release
-5505=COleConnPtContainer::Release
-5506=COleDataObject::Release
-5507=COleDispatchImpl::Release
-5508=COleUILinkInfo::Release
-5509=CString::Release
-5510=CString::Release
-5511=COleClientItem::XAdviseSink::Release
-5512=COleControlSite::XAmbientProps::Release
-5513=COleControlSite::XBoundObjectSite::Release
-5514=COleObjectFactory::XClassFactory::Release
-5515=CConnectionPoint::XConnPt::Release
-5516=COleControl::XDataObject::Release
-5517=COleDataSource::XDataObject::Release
-5518=COleServerDoc::XDataObject::Release
-5519=COleServerItem::XDataObject::Release
-5520=COleDropSource::XDropSource::Release
-5521=COleDropTarget::XDropTarget::Release
-5522=CEnumArray::XEnumVOID::Release
-5523=COleControlSite::XEventSink::Release
-5524=COleControl::XFontNotification::Release
-5525=COleMessageFilter::XMessageFilter::Release
-5526=COleControlSite::XNotifyDBEvents::Release
-5527=COleControl::XOleCache::Release
-5528=COleClientItem::XOleClientSite::Release
-5529=COleControlSite::XOleClientSite::Release
-5530=CDocObjectServer::XOleCommandTarget::Release
-5531=COleControlContainer::XOleContainer::Release
-5532=COleControl::XOleControl::Release
-5533=COleControlSite::XOleControlSite::Release
-5534=CDocObjectServer::XOleDocument::Release
-5535=CDocObjectServer::XOleDocumentView::Release
-5536=COleControl::XOleInPlaceActiveObject::Release
-5537=COleServerDoc::XOleInPlaceActiveObject::Release
-5538=COleFrameHook::XOleInPlaceFrame::Release
-5539=COleControl::XOleInPlaceObject::Release
-5540=COleServerDoc::XOleInPlaceObject::Release
-5541=COleControlContainer::XOleIPFrame::Release
-5542=COleClientItem::XOleIPSite::Release
-5543=COleControlSite::XOleIPSite::Release
-5544=COleLinkingDoc::XOleItemContainer::Release
-5545=CDocObjectServer::XOleObject::Release
-5546=COleControl::XOleObject::Release
-5547=COleServerDoc::XOleObject::Release
-5548=COleServerItem::XOleObject::Release
-5549=COlePropertiesDialog::XOleUIObjInfo::Release
-5550=COleControl::XPerPropertyBrowsing::Release
-5551=COleLinkingDoc::XPersistFile::Release
-5552=COleControl::XPersistMemory::Release
-5553=COleControl::XPersistPropertyBag::Release
-5554=COleControl::XPersistStorage::Release
-5555=COleServerDoc::XPersistStorage::Release
-5556=COleControl::XPersistStreamInit::Release
-5557=COleControl::XPointerInactive::Release
-5558=CDocObjectServer::XPrint::Release
-5559=COleControlSite::XPropertyNotifySink::Release
-5560=COlePropertyPage::XPropertyPage::Release
-5561=COlePropertyPage::XPropNotifySink::Release
-5562=COleControl::XProvideClassInfo::Release
-5563=COleControl::XQuickActivate::Release
-5564=CRichEditView::XRichEditOleCallback::Release
-5565=COleControl::XSpecifyPropertyPages::Release
-5566=COleControl::XViewObject::Release
-5567=CDC::ReleaseAttribDC
-5568=CString::ReleaseBuffer
-5569=COleControl::ReleaseCapture
-5570=COleControl::ReleaseDC
-5571=COleDispatchDriver::ReleaseDispatch
-5572=CDocObjectServer::ReleaseDocSite
-5573=CDocument::ReleaseFile
-5574=CFontHolder::ReleaseFont
-5575=CDC::ReleaseOutputDC
-5576=CMetaFileDC::ReleaseOutputDC
-5577=CPreviewDC::ReleaseOutputDC
-5578=COleClientItem::Reload
-5579=CFile::Remove
-5580=CFtpConnection::Remove
-5581=CPropertySection::Remove
-5582=CPropertySet::Remove
-5583=CPropertySet::Remove
-5584=CRecentFileList::Remove
-5585=CSimpleList::Remove
-5586=CMapPtrToPtr::RemoveAll
-5587=CMapPtrToWord::RemoveAll
-5588=CMapStringToOb::RemoveAll
-5589=CMapStringToPtr::RemoveAll
-5590=CMapStringToString::RemoveAll
-5591=CMapWordToOb::RemoveAll
-5592=CMapWordToPtr::RemoveAll
-5593=CObList::RemoveAll
-5594=CPropertySection::RemoveAll
-5595=CPropertySet::RemoveAll
-5596=CPtrList::RemoveAll
-5597=CStringList::RemoveAll
-5598=CByteArray::RemoveAt
-5599=CDWordArray::RemoveAt
-5600=CObArray::RemoveAt
-5601=CObList::RemoveAt
-5602=CPtrArray::RemoveAt
-5603=CPtrList::RemoveAt
-5604=CStringArray::RemoveAt
-5605=CStringList::RemoveAt
-5606=CUIntArray::RemoveAt
-5607=CWordArray::RemoveAt
-5608=CDockBar::RemoveControlBar
-5609=CFrameWnd::RemoveControlBar
-5610=CFtpConnection::RemoveDirectoryW
-5611=CDocTemplate::RemoveDocument
-5612=CMultiDocTemplate::RemoveDocument
-5613=CSingleDocTemplate::RemoveDocument
-5614=COleControl::RemoveFrameLevelUI
-5615=CFrameWnd::RemoveFrameWnd
-5616=CObList::RemoveHead
-5617=CPtrList::RemoveHead
-5618=CStringList::RemoveHead
-5619=CListCtrl::RemoveImageList
-5620=CListView::RemoveImageList
-5621=CTreeCtrl::RemoveImageList
-5622=CTreeView::RemoveImageList
-5623=COleDocument::RemoveItem
-5624=CMapPtrToPtr::RemoveKey
-5625=CMapPtrToWord::RemoveKey
-5626=CMapStringToOb::RemoveKey
-5627=CMapStringToPtr::RemoveKey
-5628=CMapStringToString::RemoveKey
-5629=CMapWordToOb::RemoveKey
-5630=CMapWordToPtr::RemoveKey
-5631=COleFrameHook::XOleInPlaceFrame::RemoveMenus
-5632=COleControlContainer::XOleIPFrame::RemoveMenus
-5633=CPropertySheet::RemovePage
-5634=CPropertySheet::RemovePage
-5635=CDockBar::RemovePlaceHolder
-5636=CDataBoundProperty::RemoveSource
-5637=CObList::RemoveTail
-5638=CPtrList::RemoveTail
-5639=CStringList::RemoveTail
-5640=CDocument::RemoveView
-5641=CFile::Rename
-5642=CFtpConnection::Rename
-5643=CPictureHolder::Render
-5644=CDaoWorkspace::RepairDatabase
-5645=COleControl::ReparentControlWindow
-5646=CDatabase::ReplaceBrackets
-5647=CException::ReportError
-5648=COleClientItem::ReportError
-5649=CDocument::ReportSaveLoadException
-5650=COleLinkingDoc::ReportSaveLoadException
-5651=CWnd::RepositionBars
-5652=COleIPFrameWnd::RepositionFrame
-5653=CDaoRecordset::Requery
-5654=CRecordset::Requery
-5655=COleFrameHook::XOleInPlaceFrame::RequestBorderSpace
-5656=COleControlContainer::XOleIPFrame::RequestBorderSpace
-5657=COleObjectFactory::XClassFactory::RequestLicKey
-5658=COleClientItem::XOleClientSite::RequestNewObjectLayout
-5659=COleControlSite::XOleClientSite::RequestNewObjectLayout
-5660=COleServerDoc::RequestPositionChange
-5661=CEnumArray::XEnumVOID::Reset
-5662=CRecordset::ResetCursor
-5663=CCachedDataPathProperty::ResetData
-5664=CDataPathProperty::ResetData
-5665=COleControl::ResetStockProps
-5666=CControlBar::ResetTimer
-5667=COleControl::ResetVersion
-5668=COleControl::XOleInPlaceActiveObject::ResizeBorder
-5669=COleServerDoc::XOleInPlaceActiveObject::ResizeBorder
-5670=COleControl::ResizeFrameWindow
-5671=COleSafeArray::ResizeOneDim
-5672=COleControl::ResizeOpenControl
-5673=CScrollView::ResizeParentToFit
-5674=CDC::RestoreDC
-5675=CPreviewDC::RestoreDC
-5676=CToolBarCtrl::RestoreState
-5677=CCmdTarget::RestoreWaitCursor
-5678=COleMessageFilter::XMessageFilter::RetryRejectedCall
-5679=CString::ReverseFind
-5680=CArchiveStream::Revert
-5681=COleDropTarget::Revoke
-5682=COleLinkingDoc::Revoke
-5683=COleMessageFilter::Revoke
-5684=COleObjectFactory::Revoke
-5685=COleObjectFactory::RevokeAll
-5686=RFX_Binary
-5687=RFX_Binary_Bulk
-5688=RFX_Bool
-5689=RFX_Bool_Bulk
-5690=RFX_Byte
-5691=RFX_Byte_Bulk
-5692=RFX_Date
-5693=RFX_Date
-5694=RFX_Date_Bulk
-5695=RFX_Double
-5696=RFX_Double_Bulk
-5697=RFX_Int
-5698=RFX_Int_Bulk
-5699=RFX_Long
-5700=RFX_Long_Bulk
-5701=RFX_LongBinary
-5702=RFX_Single
-5703=RFX_Single_Bulk
-5704=RFX_Text
-5705=RFX_Text_Bulk
-5706=CString::Right
-5707=CDaoWorkspace::Rollback
-5708=CDatabase::Rollback
-5709=COleClientItem::Run
-5710=CWinApp::Run
-5711=CWinThread::Run
-5712=CWinApp::RunAutomated
-5713=CWinApp::RunEmbedded
-5714=CWnd::RunModalLoop
-5715=COleControlSite::SafeSetProperty
-5716=CEditView::SameAsSelected
-5717=CRichEditView::SameAsSelected
-5718=CBlobProperty::Save
-5719=COleLinkingDoc::XPersistFile::Save
-5720=COleControl::XPersistMemory::Save
-5721=COleControl::XPersistPropertyBag::Save
-5722=COleControl::XPersistStorage::Save
-5723=COleServerDoc::XPersistStorage::Save
-5724=COleControl::XPersistStreamInit::Save
-5725=CDocManager::SaveAllModified
-5726=CDocTemplate::SaveAllModified
-5727=CWinApp::SaveAllModified
-5728=CFrameWnd::SaveBarState
-5729=COleLinkingDoc::XPersistFile::SaveCompleted
-5730=COleControl::XPersistStorage::SaveCompleted
-5731=COleServerDoc::XPersistStorage::SaveCompleted
-5732=CDC::SaveDC
-5733=CPreviewDC::SaveDC
-5734=COleServerDoc::SaveEmbedding
-5735=CFormView::SaveFocusControl
-5736=CDocument::SaveModified
-5737=COleDocument::SaveModified
-5738=COleServerDoc::SaveModified
-5739=COleServerDoc::SaveModifiedPrompt
-5740=COleClientItem::XOleClientSite::SaveObject
-5741=COleControlSite::XOleClientSite::SaveObject
-5742=CControlBarInfo::SaveState
-5743=CDockState::SaveState
-5744=COleControl::SaveState
-5745=CToolBarCtrl::SaveState
-5746=CWinApp::SaveStdProfileSettings
-5747=COleDocument::SaveToStorage
-5748=COleLinkingDoc::SaveToStorage
-5749=CDocObjectServer::XOleDocumentView::SaveViewState
-5750=CDockState::ScalePoint
-5751=CDockState::ScaleRectPos
-5752=CDC::ScaleViewportExt
-5753=CMetaFileDC::ScaleViewportExt
-5754=CPreviewDC::ScaleViewportExt
-5755=CDC::ScaleWindowExt
-5756=CPreviewDC::ScaleWindowExt
-5757=COleClientItem::XOleIPSite::Scroll
-5758=COleControlSite::XOleIPSite::Scroll
-5759=COleControlContainer::ScrollChildren
-5760=COleServerDoc::ScrollContainerBy
-5761=CScrollView::ScrollToDevicePosition
-5762=CScrollView::ScrollToPosition
-5763=COleControl::ScrollWindow
-5764=CWnd::ScrollWindow
-5765=CWnd::ScrollWindowEx
-5766=CArchiveStream::Seek
-5767=CDaoRecordset::Seek
-5768=CDaoRecordset::Seek
-5769=CFile::Seek
-5770=CInternetFile::Seek
-5771=CMemFile::Seek
-5772=COleStreamFile::Seek
-5773=CSocketFile::Seek
-5774=CStdioFile::Seek
-5775=CFontHolder::Select
-5776=CDC::SelectClipPath
-5777=CDC::SelectClipRgn
-5778=CDC::SelectClipRgn
-5779=CFontPropPage::SelectFontFromList
-5780=COleControl::SelectFontObject
-5781=CDC::SelectGdiObject
-5782=CDC::SelectObject
-5783=CDC::SelectObject
-5784=CDC::SelectObject
-5785=CDC::SelectObject
-5786=CPreviewDC::SelectObject
-5787=CDC::SelectPalette
-5788=CWinApp::SelectPrinter
-5789=COleControl::SelectStockFont
-5790=CDC::SelectStockObject
-5791=CPreviewDC::SelectStockObject
-5792=CAsyncSocket::Send
-5793=CSocket::Send
-5794=COleControl::SendAdvise
-5795=CWnd::SendChildNotifyLastMsg
-5796=CSocket::SendChunk
-5797=COleControlContainer::SendDlgItemMessageW
-5798=CWnd::SendDlgItemMessageW
-5799=CDocument::SendInitialUpdate
-5800=CRecordset::SendLongBinaryData
-5801=CWnd::SendMessageToDescendants
-5802=COleControlSite::SendMnemonic
-5803=CHttpFile::SendRequest
-5804=CHttpFile::SendRequest
-5805=CAsyncSocket::SendTo
-5806=CAsyncSocket::SendToHelper
-5807=CSocket::SendToHelper
-5808=CByteArray::Serialize
-5809=CControlBarInfo::Serialize
-5810=CDocItem::Serialize
-5811=CDockState::Serialize
-5812=CDWordArray::Serialize
-5813=CEditView::Serialize
-5814=CMapStringToOb::Serialize
-5815=CMapStringToString::Serialize
-5816=CMapWordToOb::Serialize
-5817=CObArray::Serialize
-5818=CObject::Serialize
-5819=CObList::Serialize
-5820=COleClientItem::Serialize
-5821=COleControl::Serialize
-5822=COleDocument::Serialize
-5823=CRichEditDoc::Serialize
-5824=CRichEditView::Serialize
-5825=CStringArray::Serialize
-5826=CStringList::Serialize
-5827=CWordArray::Serialize
-5828=CArchive::SerializeClass
-5829=SerializeElements
-5830=SerializeElements
-5831=COleControl::SerializeExtent
-5832=CEditView::SerializeRaw
-5833=COleControl::SerializeStockProps
-5834=COleControl::SerializeVersion
-5835=CProperty::Set
-5836=CProperty::Set
-5837=CProperty::Set
-5838=CPropertySection::Set
-5839=CPropertySection::Set
-5840=CPropertySet::Set
-5841=CPropertySet::Set
-5842=CDaoRecordset::SetAbsolutePosition
-5843=COleFrameHook::XOleInPlaceFrame::SetActiveObject
-5844=COleControlContainer::XOleIPFrame::SetActiveObject
-5845=CPropertySheet::SetActivePage
-5846=CPropertySheet::SetActivePage
-5847=CSplitterWnd::SetActivePane
-5848=CFrameWnd::SetActiveView
-5849=COleControl::XViewObject::SetAdvise
-5850=COleControl::SetAppearance
-5851=CDC::SetArcDirection
-5852=CString::SetAt
-5853=CByteArray::SetAtGrow
-5854=CDWordArray::SetAtGrow
-5855=CObArray::SetAtGrow
-5856=CPtrArray::SetAtGrow
-5857=CStringArray::SetAtGrow
-5858=CUIntArray::SetAtGrow
-5859=CWordArray::SetAtGrow
-5860=CDC::SetAttribDC
-5861=CMetaFileDC::SetAttribDC
-5862=CPreviewDC::SetAttribDC
-5863=CDaoTableDef::SetAttributes
-5864=COleControl::SetBackColor
-5865=CControlBar::SetBarInfo
-5866=CDockBar::SetBarInfo
-5867=CControlBar::SetBarStyle
-5868=CToolBar::SetBitmap
-5869=CDC::SetBkColor
-5870=CPreviewDC::SetBkColor
-5871=CDC::SetBkMode
-5872=CDaoRecordset::SetBookmark
-5873=CRecordset::SetBookmark
-5874=COleFrameHook::XOleInPlaceFrame::SetBorderSpace
-5875=COleControlContainer::XOleIPFrame::SetBorderSpace
-5876=COleControl::SetBorderStyle
-5877=CColorPropPage::SetButton
-5878=CToolBar::SetButtonInfo
-5879=CToolBar::SetButtons
-5880=CToolBar::SetButtonStyle
-5881=CToolBar::SetButtonText
-5882=CDaoRecordset::SetCacheSize
-5883=CDaoRecordset::SetCacheStart
-5884=COleControl::SetCapture
-5885=CRichEditView::SetCharFormat
-5886=CCheckListBox::SetCheck
-5887=CCmdUI::SetCheck
-5888=COleCmdUI::SetCheck
-5889=CStatusCmdUI::SetCheck
-5890=CTestCmdUI::SetCheck
-5891=CToolCmdUI::SetCheck
-5892=CCheckListBox::SetCheckStyle
-5893=CPropertySet::SetClassID
-5894=CDataBoundProperty::SetClientSite
-5895=CDocObjectServer::XOleObject::SetClientSite
-5896=COleControl::XOleObject::SetClientSite
-5897=COleServerDoc::XOleObject::SetClientSite
-5898=COleServerItem::XOleObject::SetClientSite
-5899=COleDataSource::SetClipboard
-5900=CDC::SetColorAdjustment
-5901=CColorPropPage::SetColorProp
-5902=CDocObjectServer::XOleObject::SetColorScheme
-5903=COleControl::XOleObject::SetColorScheme
-5904=COleServerDoc::XOleObject::SetColorScheme
-5905=COleServerItem::XOleObject::SetColorScheme
-5906=CSplitterWnd::SetColumnInfo
-5907=CRecordset::SetConcurrencyAndCursorType
-5908=CDaoQueryDef::SetConnect
-5909=CDaoTableDef::SetConnect
-5910=CDocTemplate::SetContainerInfo
-5911=COleControl::XQuickActivate::SetContentExtent
-5912=CReflectorWnd::SetControl
-5913=COleControl::SetControlSize
-5914=COlePropertyPage::SetControlStatus
-5915=CFileDialog::SetControlText
-5916=COleCurrency::SetCurrency
-5917=CColorDialog::SetCurrentColor
-5918=CFtpConnection::SetCurrentDirectoryW
-5919=CWinApp::SetCurrentHandles
-5920=CDaoRecordset::SetCurrentIndex
-5921=CPreviewView::SetCurrentPage
-5922=CRectTracker::SetCursor
-5923=CDaoRecordset::SetCursorAttributes
-5924=COleControl::XDataObject::SetData
-5925=COleDataSource::XDataObject::SetData
-5926=COleServerDoc::XDataObject::SetData
-5927=COleServerItem::XDataObject::SetData
-5928=COleControl::XOleCache::SetData
-5929=COleDateTime::SetDateTime
-5930=COleDateTimeSpan::SetDateTimeSpan
-5931=COccManager::SetDefaultButton
-5932=COleControlSite::SetDefaultButton
-5933=CRichEditCtrl::SetDefaultCharFormat
-5934=CDaoWorkspace::SetDefaultPassword
-5935=CMultiDocTemplate::SetDefaultTitle
-5936=CSingleDocTemplate::SetDefaultTitle
-5937=CDaoWorkspace::SetDefaultUser
-5938=CFileDialog::SetDefExt
-5939=CWinApp::SetDialogBkColor
-5940=COlePropertyPage::SetDialogResource
-5941=CDaoRecordset::SetDirtyFields
-5942=CDaoRecordset::SetDirtyFieldStatus
-5943=CRecordset::SetDirtyFieldStatus
-5944=COleControlSite::SetDlgCtrlID
-5945=CWnd::SetDlgCtrlID
-5946=COleControlContainer::SetDlgItemInt
-5947=CWnd::SetDlgItemInt
-5948=COleControlContainer::SetDlgItemTextW
-5949=CWnd::SetDlgItemTextW
-5950=CFrameWnd::SetDockState
-5951=CDocObjectServer::SetDocSite
-5952=COleClientItem::SetDrawAspect
-5953=CRichEditCntrItem::SetDrawAspect
-5954=CDataBoundProperty::SetDSCSite
-5955=COleControl::SetEnabled
-5956=COleClientItem::SetExtent
-5957=COleControlSite::SetExtent
-5958=CDocObjectServer::XOleObject::SetExtent
-5959=COleControl::XOleObject::SetExtent
-5960=COleServerDoc::XOleObject::SetExtent
-5961=COleServerItem::XOleObject::SetExtent
-5962=CColorButton::SetFaceColor
-5963=CDaoRecordset::SetFieldDirty
-5964=CRecordset::SetFieldDirty
-5965=CDaoRecordset::SetFieldNull
-5966=CRecordset::SetFieldNull
-5967=CRecordset::SetFieldStatus
-5968=CDaoRecordset::SetFieldValue
-5969=CDaoRecordset::SetFieldValue
-5970=CDaoRecordset::SetFieldValue
-5971=CDaoRecordset::SetFieldValue
-5972=CDaoRecordset::SetFieldValueNull
-5973=CDaoRecordset::SetFieldValueNull
-5974=CFile::SetFilePath
-5975=COleControl::SetFocus
-5976=COleControlSite::SetFocus
-5977=CWnd::SetFocus
-5978=CDialogTemplate::SetFont
-5979=CFontHolder::SetFont
-5980=COleControl::SetFont
-5981=CFontPropPage::SetFontProps
-5982=COleControl::SetForeColor
-5983=CPropertySection::SetFormatID
-5984=CPropertySet::SetFormatVersion
-5985=CSharedFile::SetHandle
-5986=CToolBar::SetHeight
-5987=CFrameWnd::SetHelpCapture
-5988=COlePropertyPage::SetHelpInfo
-5989=COleClientItem::SetHostNames
-5990=CDocObjectServer::XOleObject::SetHostNames
-5991=COleControl::XOleObject::SetHostNames
-5992=COleServerDoc::XOleObject::SetHostNames
-5993=COleServerItem::XOleObject::SetHostNames
-5994=COleClientItem::SetIconicMetafile
-5995=CProperty::SetID
-5996=CStatusBar::SetIndicators
-5997=CDaoWorkspace::SetIniPath
-5998=COleControl::SetInitialDataFormats
-5999=CDocObjectServer::XPrint::SetInitialPageNum
-6000=COleControl::SetInitialSize
-6001=CDocObjectServer::XOleDocumentView::SetInPlaceSite
-6002=CDaoWorkspace::SetIsolateODBCTrans
-6003=CListCtrl::SetItem
-6004=CTreeCtrl::SetItem
-6005=COleClientItem::SetItemRects
-6006=CFile::SetLength
-6007=CInternetFile::SetLength
-6008=CMemFile::SetLength
-6009=COleStreamFile::SetLength
-6010=CSocketFile::SetLength
-6011=COleUILinkInfo::SetLinkSource
-6012=COleClientItem::SetLinkUpdateOptions
-6013=COleUILinkInfo::SetLinkUpdateOptions
-6014=CDaoRecordset::SetLockingMode
-6015=CRecordset::SetLockingMode
-6016=CDaoWorkspace::SetLoginTimeout
-6017=CDC::SetMapMode
-6018=CPreviewDC::SetMapMode
-6019=CDC::SetMapperFlags
-6020=COleFrameHook::XOleInPlaceFrame::SetMenu
-6021=COleControlContainer::XOleIPFrame::SetMenu
-6022=CFrameWnd::SetMessageText
-6023=CFrameWnd::SetMessageText
-6024=CPropertyPage::SetModified
-6025=CDocument::SetModifiedFlag
-6026=COleControl::SetModifiedFlag
-6027=COlePropertyPage::SetModifiedFlag
-6028=CRichEditDoc::SetModifiedFlag
-6029=CDocObjectServer::XOleObject::SetMoniker
-6030=COleControl::XOleObject::SetMoniker
-6031=COleServerDoc::XOleObject::SetMoniker
-6032=COleServerItem::XOleObject::SetMoniker
-6033=CDaoQueryDef::SetName
-6034=CDaoTableDef::SetName
-6035=CPropertySection::SetName
-6036=COleControl::SetNotPermitted
-6037=CCmdTarget::SetNotSupported
-6038=COleControl::SetNotSupported
-6039=CDaoRecordset::SetNullableFieldStatus
-6040=CDaoRecordset::SetNullableKnownFieldStatus
-6041=CDaoRecordset::SetNullFieldStatus
-6042=CRecordset::SetNullFieldStatus
-6043=CRecordset::SetNullParamStatus
-6044=CDaoFieldExchange::SetNullValue
-6045=COleControl::XOleInPlaceObject::SetObjectRects
-6046=COleServerDoc::XOleInPlaceObject::SetObjectRects
-6047=COlePropertyPage::XPropertyPage::SetObjects
-6048=CDialog::SetOccDialogInfo
-6049=CDialogBar::SetOccDialogInfo
-6050=CFormView::SetOccDialogInfo
-6051=CWnd::SetOccDialogInfo
-6052=CDaoQueryDef::SetODBCTimeout
-6053=CInternetConnection::SetOption
-6054=CInternetFile::SetOption
-6055=CInternetSession::SetOption
-6056=CPropertySet::SetOSVersion
-6057=CDC::SetOutputDC
-6058=CMetaFileDC::SetOutputDC
-6059=CPreviewDC::SetOutputDC
-6060=CToolBar::SetOwner
-6061=COlePropertyPage::SetPageName
-6062=COlePropertyPage::XPropertyPage::SetPageSite
-6063=CStatusBar::SetPaneInfo
-6064=CStatusBar::SetPaneStyle
-6065=CStatusBar::SetPaneText
-6066=CRichEditCtrl::SetParaFormat
-6067=CRichEditView::SetParaFormat
-6068=CDaoQueryDef::SetParamValue
-6069=CDaoQueryDef::SetParamValue
-6070=CDaoRecordset::SetParamValue
-6071=CDaoRecordset::SetParamValue
-6072=CDaoQueryDef::SetParamValueNull
-6073=CDaoQueryDef::SetParamValueNull
-6074=CDaoRecordset::SetParamValueNull
-6075=CDaoRecordset::SetParamValueNull
-6076=CDocument::SetPathName
-6077=COleDocument::SetPathName
-6078=CRichEditDoc::SetPathName
-6079=CDaoRecordset::SetPercentPosition
-6080=CPictureHolder::SetPictureDispatch
-6081=CPicturePropPage::SetPictureProp
-6082=CDC::SetPolyFillMode
-6083=COleClientItem::SetPrintDevice
-6084=COleClientItem::SetPrintDevice
-6085=CEditView::SetPrinterFont
-6086=CPreviewView::SetPrintView
-6087=COlePropertyPage::SetPropCheck
-6088=COleControlSite::SetProperty
-6089=COleDispatchDriver::SetProperty
-6090=CWnd::SetProperty
-6091=COleControlSite::SetPropertyV
-6092=COlePropertyPage::SetPropIndex
-6093=COlePropertyPage::SetPropRadio
-6094=COleControl::SetPropsetData
-6095=COlePropertyPage::SetPropText
-6096=COlePropertyPage::SetPropText
-6097=COlePropertyPage::SetPropText
-6098=COlePropertyPage::SetPropText
-6099=COlePropertyPage::SetPropText
-6100=COlePropertyPage::SetPropText
-6101=COlePropertyPage::SetPropText
-6102=COlePropertyPage::SetPropText
-6103=COlePropertyPage::SetPropText
-6104=CDaoDatabase::SetQueryTimeout
-6105=CCmdUI::SetRadio
-6106=CTestCmdUI::SetRadio
-6107=CSliderCtrl::SetRange
-6108=CInternetFile::SetReadBufferSize
-6109=CDocObjectServer::XOleDocumentView::SetRect
-6110=CDocObjectServer::XOleDocumentView::SetRectComplex
-6111=COleControl::SetRectInContainer
-6112=CWinApp::SetRegistryKey
-6113=CWinApp::SetRegistryKey
-6114=CDaoQueryDef::SetReturnsRecords
-6115=CDC::SetROP2
-6116=CSplitterWnd::SetRowInfo
-6117=CRecordset::SetRowsetCurrencyStatus
-6118=CRecordset::SetRowsetCursorPosition
-6119=CRecordset::SetRowsetSize
-6120=CPreviewView::SetScaledSize
-6121=CPreviewDC::SetScaleRatio
-6122=CScrollView::SetScaleToFitSize
-6123=CDockState::SetScreenSize
-6124=CWnd::SetScrollInfo
-6125=CWnd::SetScrollPos
-6126=CWnd::SetScrollRange
-6127=CScrollView::SetScrollSizes
-6128=CSplitterWnd::SetScrollStyle
-6129=CPropertySection::SetSectionName
-6130=CRichEditCtrl::SetSel
-6131=CSliderCtrl::SetSelection
-6132=CRichEditCtrl::SetSelectionCharFormat
-6133=CDocTemplate::SetServerInfo
-6134=CArchiveStream::SetSize
-6135=CByteArray::SetSize
-6136=CDWordArray::SetSize
-6137=CObArray::SetSize
-6138=CPtrArray::SetSize
-6139=CStringArray::SetSize
-6140=CUIntArray::SetSize
-6141=CWordArray::SetSize
-6142=CToolBar::SetSizes
-6143=CDaoTableDef::SetSourceTableName
-6144=CSplitterWnd::SetSplitCursor
-6145=CDaoQueryDef::SetSQL
-6146=CCmdTarget::SetStandardProp
-6147=CColorButton::SetState
-6148=CRecordset::SetState
-6149=CFile::SetStatus
-6150=CControlBar::SetStatusText
-6151=COleFrameHook::XOleInPlaceFrame::SetStatusText
-6152=COleControlContainer::XOleIPFrame::SetStatusText
-6153=CDC::SetStretchBltMode
-6154=COleVariant::SetString
-6155=CString::SetSysString
-6156=CDialogTemplate::SetSystemFont
-6157=CEditView::SetTabStops
-6158=CDialogTemplate::SetTemplate
-6159=CFileDialog::SetTemplate
-6160=CCmdUI::SetText
-6161=COleCmdUI::SetText
-6162=COleControl::SetText
-6163=CStatusCmdUI::SetText
-6164=CTestCmdUI::SetText
-6165=CToolCmdUI::SetText
-6166=CDC::SetTextAlign
-6167=CDC::SetTextCharacterExtra
-6168=CDC::SetTextColor
-6169=CPreviewDC::SetTextColor
-6170=CDC::SetTextJustification
-6171=CDocument::SetTitle
-6172=CPropertySheet::SetTitle
-6173=CRichEditDoc::SetTitle
-6174=CToolTipCtrl::SetToolRect
-6175=CPreviewDC::SetTopLeftOffset
-6176=CProperty::SetType
-6177=CRecordset::SetUpdateMethod
-6178=CDaoTableDef::SetValidationRule
-6179=CDaoTableDef::SetValidationText
-6180=CThreadSlotData::SetValue
-6181=COlePropertiesDialog::XOleUIObjInfo::SetViewInfo
-6182=CDC::SetViewportExt
-6183=CMetaFileDC::SetViewportExt
-6184=CPreviewDC::SetViewportExt
-6185=CDC::SetViewportOrg
-6186=CMetaFileDC::SetViewportOrg
-6187=CPreviewDC::SetViewportOrg
-6188=CDC::SetWindowExt
-6189=CPreviewDC::SetWindowExt
-6190=CDC::SetWindowOrg
-6191=CWnd::SetWindowPlacement
-6192=COleControlSite::SetWindowPos
-6193=CWnd::SetWindowPos
-6194=COleControlSite::SetWindowTextW
-6195=CWnd::SetWindowTextW
-6196=CRichEditCtrl::SetWordCharFormat
-6197=CInternetFile::SetWriteBufferSize
-6198=CPreviewView::SetZoomState
-6199=CDocObjectServer::XOleDocumentView::Show
-6200=COlePropertyPage::XPropertyPage::Show
-6201=CDockBar::ShowAll
-6202=CRichEditCntrItem::ShowContainerUI
-6203=CRichEditView::ShowContainerUI
-6204=CRichEditView::XRichEditOleCallback::ShowContainerUI
-6205=CFrameWnd::ShowControlBar
-6206=COleClientItem::XOleClientSite::ShowObject
-6207=COleControlSite::XOleClientSite::ShowObject
-6208=CFrameWnd::ShowOwnedWindows
-6209=COleControlSite::XOleControlSite::ShowPropertyFrame
-6210=COleControlSite::ShowWindow
-6211=CWnd::ShowWindow
-6212=tagSIZEconstCScrollView::sizeDefault
-6213=CBitmapButton::SizeToContent
-6214=CToolBar::SizeToolBar
-6215=CEnumArray::XEnumVOID::Skip
-6216=CRecordset::SkipDeletedRecords
-6217=CAsyncSocket::Socket
-6218=CString::SpanExcluding
-6219=CString::SpanIncluding
-6220=CSplitterWnd::SplitColumn
-6221=COccManager::SplitDialogTemplate
-6222=CSplitterWnd::SplitRow
-6223=CDC::StartDocW
-6224=CDockContext::StartDrag
-6225=CDockContext::StartResize
-6226=CSplitterWnd::StartTracking
-6227=CArchiveStream::Stat
-6228=CSplitterWnd::StopTracking
-6229=CRuntimeClass::Store
-6230=CDaoRecordset::StoreFields
-6231=CRecordset::StoreFields
-6232=CRichEditView::Stream
-6233=CDockContext::Stretch
-6234=CDaoRecordset::StripBrackets
-6235=CWnd::SubclassCtl3d
-6236=CWnd::SubclassDlg3d
-6237=CWnd::SubclassDlgItem
-6238=CWnd::SubclassWindow
-6239=COleControlSite::XNotifyDBEvents::SyncAfter
-6240=COleControlSite::XNotifyDBEvents::SyncBefore
-6241=CRichEditCntrItem::SyncToRichEditObject
-6242=CDC::TabbedTextOutW
-6243=CMetaFileDC::TabbedTextOutW
-6244=CPreviewDC::TabbedTextOutW
-6245=CRichEditView::TextNotFound
-6246=CDC::TextOutW
-6247=CMetaFileDC::TextOutW
-6248=CPreviewDC::TextOutW
-6249=CDaoDatabase::ThrowDaoException
-6250=CDaoQueryDef::ThrowDaoException
-6251=CDaoRecordset::ThrowDaoException
-6252=CDaoTableDef::ThrowDaoException
-6253=CDaoWorkspace::ThrowDaoException
-6254=CDatabase::ThrowDBException
-6255=CRecordset::ThrowDBException
-6256=CFileException::ThrowErrno
-6257=COleControl::ThrowError
-6258=COleControl::ThrowError
-6259=ThrowGetRowsDaoException
-6260=CFileException::ThrowOsError
-6261=CDockContext::ToggleDocking
-6262=CDockContext::Track
-6263=CRectTracker::Track
-6264=CSplitterWnd::TrackColumnSize
-6265=CRectTracker::TrackHandle
-6266=CMenu::TrackPopupMenu
-6267=CSplitterWnd::TrackRowSize
-6268=CRectTracker::TrackRubberBand
-6269=COleControl::TransformCoords
-6270=COleControlSite::XOleControlSite::TransformCoords
-6271=COleControlSite::XOleControlSite::TranslateAcceleratorW
-6272=COleControl::XOleInPlaceActiveObject::TranslateAcceleratorW
-6273=COleServerDoc::XOleInPlaceActiveObject::TranslateAcceleratorW
-6274=COleFrameHook::XOleInPlaceFrame::TranslateAcceleratorW
-6275=COleControlContainer::XOleIPFrame::TranslateAcceleratorW
-6276=COlePropertyPage::XPropertyPage::TranslateAcceleratorW
-6277=COleControl::TranslateColor
-6278=CString::TrimLeft
-6279=CString::TrimRight
-6280=CDocObjectServer::XOleDocumentView::UIActivate
-6281=COccManager::UIActivateControl
-6282=COleControl::XOleInPlaceObject::UIDeactivate
-6283=COleServerDoc::XOleInPlaceObject::UIDeactivate
-6284=COccManager::UIDeactivateIfNecessary
-6285=COleSafeArray::UnaccessData
-6286=CConnectionPoint::XConnPt::Unadvise
-6287=CDocObjectServer::XOleObject::Unadvise
-6288=COleControl::XOleObject::Unadvise
-6289=COleServerDoc::XOleObject::Unadvise
-6290=COleServerItem::XOleObject::Unadvise
-6291=CRecordset::UnbindFieldsForUpdate
-6292=COleControl::XOleCache::Uncache
-6293=COleControl::XViewObject::Unfreeze
-6294=CCriticalSection::Unlock
-6295=CEvent::Unlock
-6296=CMultiLock::Unlock
-6297=CMultiLock::Unlock
-6298=CMutex::Unlock
-6299=COleSafeArray::Unlock
-6300=CSemaphore::Unlock
-6301=CSemaphore::Unlock
-6302=CSingleLock::Unlock
-6303=CSingleLock::Unlock
-6304=CSyncObject::Unlock
-6305=CTypeLibCache::Unlock
-6306=CEditView::UnlockBuffer
-6307=CString::UnlockBuffer
-6308=CFile::UnlockRange
-6309=CInternetFile::UnlockRange
-6310=CMemFile::UnlockRange
-6311=COleStreamFile::UnlockRange
-6312=CSocketFile::UnlockRange
-6313=CStdioFile::UnlockRange
-6314=CArchiveStream::UnlockRegion
-6315=CWinApp::Unregister
-6316=CWnd::UnsubclassWindow
-6317=CDaoRecordset::Update
-6318=CRecordset::Update
-6319=CDocObjectServer::XOleObject::Update
-6320=COleControl::XOleObject::Update
-6321=COleServerDoc::XOleObject::Update
-6322=COleServerItem::XOleObject::Update
-6323=COleServerDoc::UpdateAllItems
-6324=CStatusBar::UpdateAllPanes
-6325=CDocument::UpdateAllViews
-6326=CScrollView::UpdateBars
-6327=CMDIChildWnd::UpdateClientEdge
-6328=CDataSourceControl::UpdateControls
-6329=CDataSourceControl::UpdateCursor
-6330=CWnd::UpdateData
-6331=CWnd::UpdateDialogControls
-6332=CDocument::UpdateFrameCounts
-6333=CFrameWnd::UpdateFrameTitleForDocument
-6334=CRecordset::UpdateInsertDelete
-6335=COleClientItem::UpdateItemType
-6336=COleClientItem::UpdateLink
-6337=COleUILinkInfo::UpdateLink
-6338=CSizeComboBox::UpdateLogFont
-6339=CRecentFileList::UpdateMenu
-6340=COleDocument::UpdateModifiedFlag
-6341=CRichEditDoc::UpdateModifiedFlag
-6342=CRichEditDoc::UpdateObjectCache
-6343=CWinApp::UpdatePrinterSelection
-6344=CColorPropPage::CColorPropPageFactory::UpdateRegistry
-6345=CFontPropPage::CFontPropPageFactory::UpdateRegistry
-6346=COleObjectFactory::UpdateRegistry
-6347=COleObjectFactory::UpdateRegistry
-6348=COleTemplateServer::UpdateRegistry
-6349=CPicturePropPage::CPicturePropPageFactory::UpdateRegistry
-6350=COleObjectFactory::UpdateRegistryAll
-6351=CFontPropPage::UpdateSampleFont
-6352=CDockContext::UpdateState
-6353=CToolTipCtrl::UpdateTipText
-6354=CToolTipCtrl::UpdateTipText
-6355=COleServerDoc::UpdateUsingHostObj
-6356=COleLinkingDoc::UpdateVisibleLock
-6357=CDatabase::VerifyConnect
-6358=CRecordset::VerifyCursorSupport
-6359=CRecordset::VerifyDriverBehavior
-6360=COleObjectFactory::VerifyLicenseKey
-6361=COleObjectFactory::VerifyUserLicense
-6362=CListBox::VKeyToItem
-6363=CWnd::WalkPreTranslateTree
-6364=COleControl::WillAmbientsBeValidDuringLoad
-6365=CControlBar::WindowProc
-6366=COleControl::WindowProc
-6367=COlePropertyPage::WindowProc
-6368=CParkingWnd::WindowProc
-6369=CReflectorWnd::WindowProc
-6370=CWnd::WindowProc
-6371=CWinApp::WinHelpW
-6372=CWnd::WinHelpW
-6373=CWndconstCWnd::wndBottom
-6374=CWndconstCWnd::wndNoTopMost
-6375=CWndconstCWnd::wndTop
-6376=CWndconstCWnd::wndTopMost
-6377=CRichEditView::WrapChanged
-6378=CToolBar::WrapToolBar
-6379=CArchive::Write
-6380=CArchiveStream::Write
-6381=CFile::Write
-6382=CGopherFile::Write
-6383=CImageList::Write
-6384=CInternetFile::Write
-6385=CMemFile::Write
-6386=COleStreamFile::Write
-6387=CSocketFile::Write
-6388=CStdioFile::Write
-6389=CArchive::WriteClass
-6390=CArchive::WriteCount
-6391=COleClientItem::WriteItem
-6392=COleClientItem::WriteItemCompound
-6393=COleClientItem::WriteItemFlat
-6394=CRecentFileList::WriteList
-6395=CPropertySection::WriteNameDictToStream
-6396=CArchive::WriteObject
-6397=CWinApp::WriteProfileBinary
-6398=CWinApp::WriteProfileInt
-6399=CWinApp::WriteProfileStringW
-6400=CArchive::WriteString
-6401=CGopherFile::WriteString
-6402=CInternetFile::WriteString
-6403=CStdioFile::WriteString
-6404=CEditView::WriteToArchive
-6405=CProperty::WriteToStream
-6406=CPropertySection::WriteToStream
-6407=CPropertySet::WriteToStream
-6408=ushortafxChNil
-6409=CHttpConnection::CHttpConnection
-6410=_CIP<IBindStatusCallback
-6411=_CIP<IUnknown
-6412=CIP<IBindStatusCallback
-6413=CIP<IUnknown
-6414=AfxParseURLEx
-6417=CRuntimeClassconstCInternetException::classCInternetException
-6418=CAsyncMonikerFile::CreateBindStatusCallback
-6419=CWinThread::DispatchThreadMessageEx
-6420=CAsyncMonikerFile::EndCallbacks
-6421=CMonikerFile::Flush
-6422=CInternetSession::GetHttpConnection
-6423=CAsyncMonikerFile::Read
-6424=CColorPropPage::CColorPropPageFactory::CColorPropPageFactory
-6425=CEnumConnections::CEnumConnections
-6426=CFontPropPage::CFontPropPageFactory::CFontPropPageFactory
-6427=CPicturePropPage::CPicturePropPageFactory::CPicturePropPageFactory
-6428=Duplicate1_??1?$CIP@UIStream@@$1?IID_IStream@@3U_GUID@@B@@QAE@XZ
-6429=CEnumConnections::~CEnumConnections
-6430=_AfxDeleteRegKey
-6431=CEnumConnections::AddConnection
-6432=AfxGetDefaultValue
-6433=AfxInitRichEdit
-6434=AfxOleUnregisterHelper
-6435=AfxOleUnregisterServerClass
-6436=AfxSetDefaultValue
-6437=CWnd::CreateEx
-6438=CScrollView::DoMouseWheel
-6439=Duplicate1_?FindAndSelect@CRichEditView@@QAEJKAAU_findtextexa@@@Z
-6440=COleControlContainer::FreezeAllEvents
-6441=COleControlSite::FreezeEvents
-6442=CEnumConnections::GetInterfaceMap
-6443=HashKey
-6444=AFX_INTERFACEMAPconstCOleControlContainer::interfaceMap
-6445=AFX_INTERFACEMAPconstCOleControlSite::interfaceMap
-6446=CBitmap::LoadBitmapW
-6447=OLE2CT
-6448=CEnumConnections::OnClone
-6449=CDocTemplate::OnCmdMsg
-6450=COleTemplateServer::OnCmdMsg
-6451=CWnd::OnDestroy
-6452=CScrollView::OnMouseWheel
-6453=CSplitterWnd::OnMouseWheel
-6454=CEnumConnections::OnNext
-6455=CFrameWnd::OnRegisteredMouseWheel
-6456=CWnd::OnSettingChange
-6457=CRecordset::SetParamNull
-6458=T2OLE
-6459=COleObjectFactory::Unregister
-6460=COleTemplateServer::Unregister
-6461=COleObjectFactory::UnregisterAll
-6462=CDocManager::UnregisterShellFileTypes
-6463=CWinApp::UnregisterShellFileTypes
-6464=AFX_CLASSINIT_COMPAT::AFX_CLASSINIT_COMPAT
-6465=AFX_EVENT::AFX_EVENT
-6466=AFX_MAINTAIN_STATE2::AFX_MAINTAIN_STATE2
-6467=CCachedDataPathProperty::CCachedDataPathProperty
-6468=CDaoErrorInfo::CDaoErrorInfo
-6469=CDaoFieldInfo::CDaoFieldInfo
-6470=CDataPathProperty::CDataPathProperty
-6471=CDynLinkLibrary::CDynLinkLibrary
-6472=CFileStatus::CFileStatus
-6473=CFixedAlloc::CFixedAlloc
-6474=CGopherLocator::CGopherLocator
-6475=CHtmlView::CHtmlView
-6476=CMemoryException::CMemoryException
-6477=CNotSupportedException::CNotSupportedException
-6478=COleDocObjectItem::COleDocObjectItem
-6479=COleVariant::COleVariant
-6480=CParkingWnd::CParkingWnd
-6481=CPropertyPageEx::CPropertyPageEx
-6482=CPropertyPageEx::CPropertyPageEx
-6483=CPropertyPageEx::CPropertyPageEx
-6484=CPropertySheetEx::CPropertySheetEx
-6485=CPropertySheetEx::CPropertySheetEx
-6486=CPropertySheetEx::CPropertySheetEx
-6487=CReBar::CReBar
-6488=CResourceException::CResourceException
-6489=CString::CString
-6490=CUserException::CUserException
-6491=CEmbeddedButActsLikePtr<CMapPtrToPtr>::~CEmbeddedButActsLikePtr<CMapPtrToPtr>
-6492=CEmbeddedButActsLikePtr<CPtrList>::~CEmbeddedButActsLikePtr<CPtrList>
-6493=AFX_MAINTAIN_STATE2::~AFX_MAINTAIN_STATE2
-6494=CArchiveException::~CArchiveException
-6495=CColorDialog::~CColorDialog
-6496=CColorPropPage::~CColorPropPage
-6497=CColorPropPage::CColorPropPageFactory::~CColorPropPageFactory
-6498=CComboBoxEx::~CComboBoxEx
-6499=CControlBarInfo::~CControlBarInfo
-6500=COleControl::CControlDataSource::~CControlDataSource
-6501=CControlFrameWnd::~CControlFrameWnd
-6502=CControlRectTracker::~CControlRectTracker
-6503=CDaoErrorInfo::~CDaoErrorInfo
-6504=CDateTimeCtrl::~CDateTimeCtrl
-6505=CFindReplaceDialog::~CFindReplaceDialog
-6506=CFixedAlloc::~CFixedAlloc
-6507=CFontPropPage::~CFontPropPage
-6508=CFontPropPage::CFontPropPageFactory::~CFontPropPageFactory
-6509=CHandleMap::~CHandleMap
-6510=CHtmlView::~CHtmlView
-6511=CIPAddressCtrl::~CIPAddressCtrl
-6512=CMDIChildWnd::~CMDIChildWnd
-6513=CMDIFrameWnd::~CMDIFrameWnd
-6514=CMemoryException::~CMemoryException
-6515=CMiniDockFrameWnd::~CMiniDockFrameWnd
-6516=CMonthCalCtrl::~CMonthCalCtrl
-6517=CNotSupportedException::~CNotSupportedException
-6518=COccManager::~COccManager
-6519=COleDocObjectItem::~COleDocObjectItem
-6520=COleException::~COleException
-6521=COleSafeArray::~COleSafeArray
-6522=CParkingWnd::~CParkingWnd
-6523=CPicturePropPage::CPicturePropPageFactory::~CPicturePropPageFactory
-6524=CPropertyPageEx::~CPropertyPageEx
-6525=CPropertySheetEx::~CPropertySheetEx
-6526=CPushRoutingFrame::~CPushRoutingFrame
-6527=CPushRoutingView::~CPushRoutingView
-6528=CReBar::~CReBar
-6529=CReflectorWnd::~CReflectorWnd
-6530=CResourceException::~CResourceException
-6531=CRichEditDoc::~CRichEditDoc
-6532=CSocketWnd::~CSocketWnd
-6533=CTempDC::~CTempDC
-6534=CTempGdiObject::~CTempGdiObject
-6535=CTempImageList::~CTempImageList
-6536=CTempMenu::~CTempMenu
-6537=CTempWnd::~CTempWnd
-6538=CThreadData::~CThreadData
-6539=CTypeLibCacheMap::~CTypeLibCacheMap
-6540=CUserException::~CUserException
-6541=CWindowlessDC::~CWindowlessDC
-6542=CTempWnd::operatordelete
-6543=CArchive::operator>>
-6544=CArchive::operator>>
-6545=CArchive::operator>>
-6546=CArchive::operator>>
-6547=CArchive::operator>>
-6548=CArchive::operator>>
-6549=CArchive::operator<<
-6550=CArchive::operator<<
-6551=CArchive::operator<<
-6552=CArchive::operator<<
-6553=CArchive::operator<<
-6554=CArchive::operator<<
-6555=operator==
-6556=CTime::operator<
-6557=CTime::operator>
-6558=COleDocObjectItem::ActivateAndShow
-6559=COleDocObjectItem::XOleDocumentSite::ActivateMe
-6560=CReBar::AddBar
-6561=CReBar::AddBar
-6562=COleInsertDialog::AddClassIDToList
-6563=CStringList::AddHead
-6564=CPropertySheetEx::AddPage
-6565=CStringList::AddTail
-6566=AfxCheckError
-6567=AfxClassInit
-6568=AfxDelRegTreeHelper
-6569=AfxEditviewTerm
-6570=AfxGetExceptionContext
-6571=AfxGetHENV
-6572=AfxGetMainWnd
-6573=afxMapHDC
-6574=afxMapHGDIOBJ
-6575=afxMapHIMAGELIST
-6576=afxMapHMENU
-6577=afxMapHWND
-6578=AfxOleRegisterServerClass
-6579=AfxTrackerTerm
-6580=AfxWingdixTerm
-6581=CFixedAlloc::Alloc
-6582=COleControlContainer::AttachControlSite
-6583=CHtmlView::BeforeNavigate2
-6584=CPropertySheetEx::BuildPropPageArray
-6585=CReBar::CalcDynamicLayout
-6586=CReBar::CalcFixedLayout
-6587=CDatabase::CheckHstmt
-6588=CRuntimeClassconstCComboBoxEx::classCComboBoxEx
-6589=CRuntimeClassconstCHtmlView::classCHtmlView
-6590=CRuntimeClassconstCIPAddressCtrl::classCIPAddressCtrl
-6591=CRuntimeClassconstCOleDBRecordView::classCOleDBRecordView
-6592=CRuntimeClassconstCOleDocObjectItem::classCOleDocObjectItem
-6593=CRuntimeClassconstCPropertyPageEx::classCPropertyPageEx
-6594=CRuntimeClassconstCPropertySheetEx::classCPropertySheetEx
-6595=CRuntimeClassconstCReBar::classCReBar
-6596=CRuntimeClassconstCReBarCtrl::classCReBarCtrl
-6597=CWnd::ClientToScreen
-6598=CPropertyPageEx::CommonConstruct
-6599=CPropertySheetEx::CommonConstruct
-6600=CPropertyPageEx::Construct
-6601=CPropertyPageEx::Construct
-6602=CPropertySheetEx::Construct
-6603=CPropertySheetEx::Construct
-6604=CComboBoxEx::Create
-6605=CDateTimeCtrl::Create
-6606=CHtmlView::Create
-6607=CImageList::Create
-6608=CIPAddressCtrl::Create
-6609=CMonthCalCtrl::Create
-6610=CMonthCalCtrl::Create
-6611=CReBar::Create
-6612=CReBarCtrl::Create
-6613=ColeControlContainer::CreateControl
-6614=COleControlSite::CreateControl
-6615=CWnd::CreateControl
-6616=CStatusBar::CreateEx
-6617=CToolBar::CreateEx
-6618=CMDIFrameWnd::CreateNewChild
-6619=CHtmlView::CreateObject
-6620=CTempDC::CreateObject
-6621=CTempGdiObject::CreateObject
-6622=CTempImageList::CreateObject
-6623=CTempMenu::CreateObject
-6624=CTempWnd::CreateObject
-6625=COleControl::CreateTracker
-6626=DDV_MinMaxDateTime
-6627=DDV_MinMaxDateTime
-6628=DDV_MinMaxMonth
-6629=DDV_MinMaxMonth
-6630=DDV_MinMaxSlider
-6631=DDX_DateTimeCtrl
-6632=DDX_DateTimeCtrl
-6633=DDX_FieldSlider
-6634=DDX_FieldText
-6635=DDX_FieldText
-6636=DDX_MonthCalCtrl
-6637=DDX_MonthCalCtrl
-6638=DDX_Slider
-6639=DDX_Text
-6640=CString::Delete
-6641=CComboBoxEx::DeleteItem
-6642=CHtmlView::DocumentComplete
-6643=COleInsertDialog::DoModal
-6644=CControlBar::DrawGripper
-6645=CImageList::DrawIndirect
-6646=CImageList::DrawIndirect
-6647=CWnd::EnableTrackingToolTips
-6648=CPropertyPage::EndDialog
-6649=CHttpFile::EndRequest
-6650=AFX_EVENTSINKMAPconstCHtmlView::eventsinkMap
-6651=COleFrameHook::XOleCommandTarget::Exec
-6652=COleDocObjectItem::ExecCommand
-6653=CHtmlView::ExecWB
-6654=CString::Find
-6655=CString::Find
-6656=FontAttrSize
-6657=CFixedAlloc::Free
-6658=CFixedAlloc::FreeAll
-6659=CString::FreeData
-6660=COleDocObjectItem::GetActiveView
-6661=CIPAddressCtrl::GetAddress
-6662=CHtmlView::GetAddressBar
-6663=CHtmlView::GetApplication
-6664=COleDateTime::GetAsSystemTime
-6665=CTime::GetAsSystemTime
-6666=CHtmlView::GetBusy
-6667=CListCtrl::GetCheck
-6668=CTreeCtrl::GetCheck
-6669=CReBarCtrl::GetColorScheme
-6670=CListCtrl::GetColumnOrderArray
-6671=CHtmlView::GetContainer
-6672=CInternetSession::GetCookie
-6673=CInternetSession::GetCookie
-6674=CInternetSession::GetCookieLength
-6675=CListBox::GetCurSel
-6676=CMonthCalCtrl::GetCurSel
-6677=CMonthCalCtrl::GetCurSel
-6678=CDataBoundProperty::GetCursor
-6679=CDataSourceControl::GetCursor
-6680=COleControlSite::GetCursor
-6681=CDocManager::GetDocumentCount
-6682=CToolBarCtrl::GetDropTarget
-6683=CHtmlView::GetEventSinkMap
-6684=CMonthCalCtrl::GetFirstDayOfWeek
-6685=CWnd::GetFont
-6686=CHtmlView::GetFullName
-6687=CHtmlView::GetFullScreen
-6688=CListCtrl::GetHeaderCtrl
-6689=CHtmlView::GetHeight
-6690=COleDocObjectItem::GetHelpMenu
-6691=CHtmlView::GetHtmlDocument
-6692=COleClientItem::GetIconFromRegistry
-6693=COleClientItem::GetIconFromRegistry
-6694=CReBarCtrl::GetImageList
-6695=COleFrameHook::GetInterfaceHook
-6696=COleDocObjectItem::GetInterfaceMap
-6697=CComboBoxEx::GetItem
-6698=CTabCtrl::GetItemState
-6699=CDC::GetLayout
-6700=CHtmlView::GetLeft
-6701=CHtmlView::GetLocationName
-6702=CHtmlView::GetLocationURL
-6703=CHtmlView::GetMenuBar
-6704=CHtmlView::GetMessageMap
-6705=COleDBRecordView::GetMessageMap
-6706=CReBar::GetMessageMap
-6707=CMonikerFile::GetMoniker
-6708=CMonthCalCtrl::GetMonthRange
-6709=CMonthCalCtrl::GetMonthRange
-6710=CMonthCalCtrl::GetMonthRange
-6711=CHtmlView::GetOffline
-6712=CHeaderCtrl::GetOrderArray
-6713=CWnd::GetOwner
-6714=COleDocObjectItem::GetPageCount
-6715=CRichEditView::GetPageRect
-6716=CHtmlView::GetParentBrowser
-6717=CRichEditView::GetPrintRect
-6718=CHtmlView::GetProperty
-6719=CHtmlView::GetProperty
-6720=CPropertySheet::GetPropSheetHeader
-6721=CDateTimeCtrl::GetRange
-6722=CDateTimeCtrl::GetRange
-6723=CMonthCalCtrl::GetRange
-6724=CMonthCalCtrl::GetRange
-6725=CMonthCalCtrl::GetRange
-6726=CProgressCtrl::GetRange
-6727=CHtmlView::GetReadyState
-6728=CHtmlView::GetRegisterAsBrowser
-6729=CHtmlView::GetRegisterAsDropTarget
-6730=CCmdTarget::GetRoutingFrame_
-6731=CCmdTarget::GetRoutingView_
-6732=CComboBoxEx::GetRuntimeClass
-6733=CDateTimeCtrl::GetRuntimeClass
-6734=CHtmlView::GetRuntimeClass
-6735=CIPAddressCtrl::GetRuntimeClass
-6736=CMonthCalCtrl::GetRuntimeClass
-6737=COleDBRecordView::GetRuntimeClass
-6738=COleDocObjectItem::GetRuntimeClass
-6739=CPropertyPageEx::GetRuntimeClass
-6740=CPropertySheetEx::GetRuntimeClass
-6741=CReBar::GetRuntimeClass
-6742=CReBarCtrl::GetRuntimeClass
-6743=CTempDC::GetRuntimeClass
-6744=CTempGdiObject::GetRuntimeClass
-6745=CTempImageList::GetRuntimeClass
-6746=CTempMenu::GetRuntimeClass
-6747=CTempWnd::GetRuntimeClass
-6748=CWnd::GetSafeOwner_
-6749=CMonthCalCtrl::GetSelRange
-6750=CMonthCalCtrl::GetSelRange
-6751=CMonthCalCtrl::GetSelRange
-6752=CHtmlView::GetSilent
-6753=CHtmlView::GetStatusBar
-6754=CListCtrl::GetSubItemRect
-6755=CPropertySheet::GetTabControl
-6756=CMirrorFile::GetTempName
-6757=CHtmlView::GetTheaterMode
-6758=CDateTimeCtrl::GetTime
-6759=CDateTimeCtrl::GetTime
-6760=CStatusBarCtrl::GetTipText
-6761=CFrameWnd::GetTitle
-6762=CMonthCalCtrl::GetToday
-6763=CMonthCalCtrl::GetToday
-6764=CHtmlView::GetToolBar
-6765=CHtmlView::GetTop
-6766=CHtmlView::GetTopLevelContainer
-6767=CHtmlView::GetType
-6768=CHtmlView::GetVisible
-6769=HasFont
-6770=CString::Insert
-6771=CString::Insert
-6772=CStringList::InsertAfter
-6773=CStringArray::InsertAt
-6774=CStringList::InsertBefore
-6775=CStringArray::InsertEmpty
-6776=CComboBoxEx::InsertItem
-6777=CTabCtrl::InsertItem
-6778=CTabCtrl::InsertItem
-6779=AFX_INTERFACEMAPconstCOleDocObjectItem::interfaceMap
-6780=CPropertyPage::IsButtonEnabled
-6781=IsButtonUp
-6782=IsDialogEx
-6783=IsDirSep
-6784=IsEnterKey
-6785=IsHelpKey
-6786=CToolBar::Layout
-6787=CHtmlView::LoadFromResource
-6788=CHtmlView::LoadFromResource
-6789=CMDIChildWnd::MDIActivate
-6790=CMDIChildWnd::MDIDestroy
-6791=AFX_MSGMAPconstCHtmlView::messageMap
-6792=AFX_MSGMAPconstCOleDBRecordView::messageMap
-6793=AFX_MSGMAPconstCReBar::messageMap
-6794=CHtmlView::Navigate
-6795=CHtmlView::Navigate2
-6796=CHtmlView::Navigate2
-6797=CHtmlView::Navigate2
-6798=CHtmlView::NavigateComplete2
-6799=CHtmlView::OnBeforeNavigate2
-6800=COleControl::OnButtonDblClk
-6801=COleControl::OnButtonDown
-6802=COleControl::OnButtonUp
-6803=CHtmlView::OnCommandStateChange
-6804=CHtmlView::OnDestroy
-6805=CHtmlView::OnDocumentComplete
-6806=CHtmlView::OnDownloadBegin
-6807=CHtmlView::OnDownloadComplete
-6808=CHtmlView::OnDraw
-6809=CToolTipCtrl::OnEnable
-6810=COleControl::OnEraseBkgnd
-6811=CReBar::OnEraseBkgnd
-6812=COleControlSite::XRowsetNotify::OnFieldChange
-6813=CHtmlView::OnFilePrint
-6814=CHtmlView::OnFullScreen
-6815=COleDocObjectItem::OnGetItemPosition
-6816=CReBar::OnHeightChange
-6817=CFrameWnd::OnHelpPromptAddr
-6818=COleDBRecordView::OnInitialUpdate
-6819=CFrameWnd::OnInitMenu
-6820=COleFrameHook::OnInitMenu
-6821=COleFrameHook::OnInitMenuPopup
-6822=COleDocObjectItem::OnInsertMenus
-6823=CHtmlView::OnMenuBar
-6824=COleFrameHook::OnMenuSelect
-6825=COleDBRecordView::OnMove
-6826=CHtmlView::OnNavigateComplete2
-6827=CReBar::OnNcCalcSize
-6828=CReBar::OnNcCreate
-6829=CReBar::OnNcPaint
-6830=CHtmlView::OnNewWindow2
-6831=CHtmlView::OnPaint
-6832=CReBar::OnPaint
-6833=COleDocObjectItem::OnPreparePrinting
-6834=CToolBar::OnPreserveZeroBorderHelper
-6835=COleDocObjectItem::OnPrint
-6836=CHtmlView::OnProgressChange
-6837=CHtmlView::OnPropertyChange
-6838=CHtmlView::OnQuit
-6839=CReBar::OnRecalcParent
-6840=COleDocObjectItem::OnRemoveMenus
-6841=COleControlSite::XRowsetNotify::OnRowChange
-6842=COleControlSite::XRowsetNotify::OnRowsetChange
-6843=CToolBar::OnSetSizeHelper
-6844=CReBar::OnShowBand
-6845=CHtmlView::OnSize
-6846=CHtmlView::OnStatusBar
-6847=CHtmlView::OnStatusTextChange
-6848=CHtmlView::OnTheaterMode
-6849=CHtmlView::OnTitleChange
-6850=CHtmlView::OnToolBar
-6851=CReBar::OnToolHitTest
-6852=CMDIChildWnd::OnToolTipText
-6853=CReBar::OnUpdateCmdUI
-6854=COleDBRecordView::OnUpdateRecordFirst
-6855=COleDBRecordView::OnUpdateRecordLast
-6856=COleDBRecordView::OnUpdateRecordNext
-6857=COleDBRecordView::OnUpdateRecordPrev
-6858=CHtmlView::OnVisible
-6859=CHtmlView::PutProperty
-6860=CHttpFile::QueryInfo
-6861=COleFrameHook::XOleCommandTarget::QueryStatus
-6862=CHtmlView::QueryStatusWB
-6863=COleDocObjectItem::Release
-6864=COleControl::ReleaseCaches
-6865=CString::Remove
-6866=CTypeLibCacheMap::RemoveAll
-6867=CString::Replace
-6868=CString::Replace
-6869=RFX_Date
-6870=RFX_Text
-6871=CWnd::ScreenToClient
-6872=CHttpFile::SendRequestEx
-6873=CHttpFile::SendRequestEx
-6874=CStringArray::SetAtGrow
-6875=CAsyncMonikerFile::SetBinding
-6876=CListCtrl::SetBkImage
-6877=CListCtrl::SetBkImage
-6878=CControlBar::SetBorders
-6879=CListCtrl::SetCheck
-6880=CTreeCtrl::SetCheck
-6881=CReBarCtrl::SetColorScheme
-6882=CListCtrl::SetColumnOrderArray
-6883=CInternetSession::SetCookie
-6884=CMonthCalCtrl::SetCurSel
-6885=CMonthCalCtrl::SetCurSel
-6886=CMonthCalCtrl::SetDayState
-6887=CMonthCalCtrl::SetFirstDayOfWeek
-6888=CFontHolder::SetFontNotifySink
-6889=CAsyncMonikerFile::SetFormatEtc
-6890=CMDIChildWnd::SetHandles
-6891=CListCtrl::SetIconSpacing
-6892=CListCtrl::SetIconSpacing
-6893=CReBarCtrl::SetImageList
-6894=CComboBoxEx::SetItem
-6895=CListCtrl::SetItemCountEx
-6896=CListCtrl::SetItemState
-6897=CTabCtrl::SetItemState
-6898=CListCtrl::SetItemText
-6899=CDC::SetLayout
-6900=CHeaderCtrl::SetOrderArray
-6901=CDateTimeCtrl::SetRange
-6902=CDateTimeCtrl::SetRange
-6903=CMonthCalCtrl::SetRange
-6904=CMonthCalCtrl::SetRange
-6905=CMonthCalCtrl::SetRange
-6906=CCheckListBox::SetSelectionCheck
-6907=CMonthCalCtrl::SetSelRange
-6908=CMonthCalCtrl::SetSelRange
-6909=CMonthCalCtrl::SetSelRange
-6910=CDateTimeCtrl::SetTime
-6911=CDateTimeCtrl::SetTime
-6912=CDateTimeCtrl::SetTime
-6913=CMonthCalCtrl::SetToday
-6914=CMonthCalCtrl::SetToday
-6915=CMonthCalCtrl::SizeMinReq
-6916=COleDocObjectItem::SupportsIPrint
-6917=CDataSourceControl::ToVariant
-6918=CString::TrimLeft
-6919=CString::TrimLeft
-6920=CString::TrimRight
-6921=CString::TrimRight
-6922=CReBar::WindowProc
-6923=CMenu::GetMenuStringW
-6924=CInvalidArgException::CInvalidArgException
-6925=CInvalidArgException::~CInvalidArgException
-6926=CInvalidArgException::GetRuntimeClass
-6927=CRuntimeClassconstCInvalidArgException::classCInvalidArgException
-6928=AfxThrowInvalidArgException
-6929=AtlA2WHelper
-6930=AtlW2AHelper
-6931=CTime::GetMonth
-6932=CThreadSlotData::GetThreadValue
-6933=CTime::GetYear
-6934=CMapStringToOb::HashKey
-6935=CMapStringToPtr::HashKey
-6936=CMapStringToString::HashKey
-6937=OLE2CT_EX
-6938=OLE2T
-6939=T2COLE
-6940=T2OLE_EX
+5=CRuntimeClassconstCCachedDataPathProperty::classCCachedDataPathProperty
+6=CRuntimeClassconstCDataPathProperty::classCDataPathProperty
+7=DllCanUnloadNow
+8=DllGetClassObject
+9=DllRegisterServer
+10=DllUnregisterServer
+256=_AFX_CHECKLIST_STATE::_AFX_CHECKLIST_STATE
+257=_AFX_COLOR_STATE::_AFX_COLOR_STATE
+258=???0_AFX_CONTROLPOS@@QAE@XZ@@YAXXZ
+259=_AFX_DAO_STATE::_AFX_DAO_STATE
+260=_AFX_EDIT_STATE::_AFX_EDIT_STATE
+261=_AFX_OLE_STATE::_AFX_OLE_STATE
+262=_AFX_THREAD_STATE::_AFX_THREAD_STATE
+263=_AFX_WIN_STATE::_AFX_WIN_STATE
+264=_AFXCTL_AMBIENT_CACHE::_AFXCTL_AMBIENT_CACHE
+265=_AFXCTL_UIACTIVE_INFO::_AFXCTL_UIACTIVE_INFO
+266=AFX_CLASSINIT::AFX_CLASSINIT
+267=AFX_DDPDATA::AFX_DDPDATA
+268=AFX_EXCEPTION_LINK::AFX_EXCEPTION_LINK
+269=AFX_MODULE_STATE::AFX_MODULE_STATE
+270=AFX_MODULE_STATE::AFX_MODULE_STATE
+271=AFX_MODULE_THREAD_STATE::AFX_MODULE_THREAD_STATE
+272=CAnimateCtrl::CAnimateCtrl
+273=CArchive::CArchive
+274=CArchivePropExchange::CArchivePropExchange
+275=CArchiveStream::CArchiveStream
+276=CAsyncMonikerFile::CAsyncMonikerFile
+277=CAsyncPropExchange::CAsyncPropExchange
+278=CAsyncSocket::CAsyncSocket
+279=CBitmap::CBitmap
+280=CBitmapButton::CBitmapButton
+281=CBlobProperty::CBlobProperty
+282=CBrush::CBrush
+283=CBrush::CBrush
+284=CBrush::CBrush
+285=CBrush::CBrush
+286=CButton::CButton
+287=CByteArray::CByteArray
+288=CCheckListBox::CCheckListBox
+289=CClientDC::CClientDC
+290=CCmdTarget::CCmdTarget
+291=CCmdUI::CCmdUI
+292=CColorButton::CColorButton
+293=CColorDialog::CColorDialog
+294=CColorPropPage::CColorPropPage
+295=CComboBox::CComboBox
+296=CCommandLineInfo::CCommandLineInfo
+297=CConnectionPoint::CConnectionPoint
+298=CControlBar::CControlBar
+299=CControlBarInfo::CControlBarInfo
+300=COleControl::CControlDataSource::CControlDataSource
+301=CControlFrameWnd::CControlFrameWnd
+302=CCriticalSection::CCriticalSection
+303=CCtrlView::CCtrlView
+304=CDaoDatabase::CDaoDatabase
+305=CDaoException::CDaoException
+306=CDaoFieldExchange::CDaoFieldExchange
+307=CDaoIndexFieldInfo::CDaoIndexFieldInfo
+308=CDaoIndexInfo::CDaoIndexInfo
+309=CDaoQueryDef::CDaoQueryDef
+310=CDaoRecordset::CDaoRecordset
+311=CDaoRecordView::CDaoRecordView
+312=CDaoRecordView::CDaoRecordView
+313=CDaoRelationFieldInfo::CDaoRelationFieldInfo
+314=CDaoRelationInfo::CDaoRelationInfo
+315=CDaoTableDef::CDaoTableDef
+316=CDaoWorkspace::CDaoWorkspace
+317=CDatabase::CDatabase
+318=CDataBoundProperty::CDataBoundProperty
+319=CDataExchange::CDataExchange
+320=CDataSourceControl::CDataSourceControl
+321=CDBException::CDBException
+322=CDBVariant::CDBVariant
+323=CDC::CDC
+324=CDialog::CDialog
+325=CDialog::CDialog
+326=CDialog::CDialog
+327=CDialogBar::CDialogBar
+328=CDialogTemplate::CDialogTemplate
+329=CDialogTemplate::CDialogTemplate
+330=CDocItem::CDocItem
+331=CDockBar::CDockBar
+332=CDockContext::CDockContext
+333=CDockState::CDockState
+334=CDocManager::CDocManager
+335=CDocObjectServer::CDocObjectServer
+336=CDocObjectServerItem::CDocObjectServerItem
+337=CDocTemplate::CDocTemplate
+338=CDocument::CDocument
+339=CDragListBox::CDragListBox
+340=CDumpContext::CDumpContext
+341=CDWordArray::CDWordArray
+342=CDynLinkLibrary::CDynLinkLibrary
+343=CEdit::CEdit
+344=CEditView::CEditView
+345=CEnumArray::CEnumArray
+346=CEnumConnPoints::CEnumConnPoints
+347=CEnumFormatEtc::CEnumFormatEtc
+348=CEvent::CEvent
+349=CException::CException
+350=CException::CException
+351=CFieldExchange::CFieldExchange
+352=CFile::CFile
+353=CFile::CFile
+354=CFile::CFile
+355=CFileDialog::CFileDialog
+356=CFileFind::CFileFind
+357=CFindReplaceDialog::CFindReplaceDialog
+358=CFont::CFont
+359=CFontComboBox::CFontComboBox
+360=CFontDialog::CFontDialog
+361=CFontDialog::CFontDialog
+362=CFontHolder::CFontHolder
+363=CFontPropPage::CFontPropPage
+364=CFormView::CFormView
+365=CFormView::CFormView
+366=CFrameWnd::CFrameWnd
+367=CFtpConnection::CFtpConnection
+368=CFtpConnection::CFtpConnection
+369=CFtpFileFind::CFtpFileFind
+370=CGdiObject::CGdiObject
+371=CGopherConnection::CGopherConnection
+372=CGopherConnection::CGopherConnection
+373=CGopherFile::CGopherFile
+374=CGopherFile::CGopherFile
+375=CGopherFileFind::CGopherFileFind
+376=CGopherLocator::CGopherLocator
+377=CHandleMap::CHandleMap
+378=CHeaderCtrl::CHeaderCtrl
+379=CHotKeyCtrl::CHotKeyCtrl
+380=CHttpConnection::CHttpConnection
+381=CHttpConnection::CHttpConnection
+382=CHttpFile::CHttpFile
+383=CHttpFile::CHttpFile
+384=CImageList::CImageList
+385=CInternetConnection::CInternetConnection
+386=CInternetException::CInternetException
+387=CInternetFile::CInternetFile
+388=CInternetFile::CInternetFile
+389=CInternetSession::CInternetSession
+390=CListBox::CListBox
+391=CListCtrl::CListCtrl
+392=CListView::CListView
+393=CLongBinary::CLongBinary
+394=CMapPtrToPtr::CMapPtrToPtr
+395=CMapPtrToWord::CMapPtrToWord
+396=CMapStringToOb::CMapStringToOb
+397=CMapStringToPtr::CMapStringToPtr
+398=CMapStringToString::CMapStringToString
+399=CMapWordToOb::CMapWordToOb
+400=CMapWordToPtr::CMapWordToPtr
+401=CMDIChildWnd::CMDIChildWnd
+402=CMDIFrameWnd::CMDIFrameWnd
+403=CMemFile::CMemFile
+404=CMemFile::CMemFile
+405=CMenu::CMenu
+406=CMetaFileDC::CMetaFileDC
+407=CMiniDockFrameWnd::CMiniDockFrameWnd
+408=CMiniFrameWnd::CMiniFrameWnd
+409=CMirrorFile::CMirrorFile
+410=CMonikerFile::CMonikerFile
+411=CMultiDocTemplate::CMultiDocTemplate
+412=CMultiLock::CMultiLock
+413=CMutex::CMutex
+414=CObArray::CObArray
+415=CObList::CObList
+416=CODBCFieldInfo::CODBCFieldInfo
+417=COleBusyDialog::COleBusyDialog
+418=COleChangeIconDialog::COleChangeIconDialog
+419=COleChangeSourceDialog::COleChangeSourceDialog
+420=COleClientItem::COleClientItem
+421=COleCmdUI::COleCmdUI
+422=COleCntrFrameWnd::COleCntrFrameWnd
+423=COleControl::COleControl
+424=COleControlContainer::COleControlContainer
+425=COleControlLock::COleControlLock
+426=COleControlSite::COleControlSite
+427=COleConvertDialog::COleConvertDialog
+428=COleCurrency::COleCurrency
+429=COleDataObject::COleDataObject
+430=COleDataSource::COleDataSource
+431=COleDialog::COleDialog
+432=COleDispatchDriver::COleDispatchDriver
+433=COleDispatchDriver::COleDispatchDriver
+434=COleDispatchDriver::COleDispatchDriver
+435=COleDispatchException::COleDispatchException
+436=COleDocIPFrameWnd::COleDocIPFrameWnd
+437=COleDocument::COleDocument
+438=COleDropSource::COleDropSource
+439=COleDropTarget::COleDropTarget
+440=COleFrameHook::COleFrameHook
+441=COleInsertDialog::COleInsertDialog
+442=COleIPFrameWnd::COleIPFrameWnd
+443=COleLinkingDoc::COleLinkingDoc
+444=COleLinksDialog::COleLinksDialog
+445=COleMessageFilter::COleMessageFilter
+446=COleObjectFactory::COleObjectFactory
+447=COlePasteSpecialDialog::COlePasteSpecialDialog
+448=COlePropertiesDialog::COlePropertiesDialog
+449=COlePropertyPage::COlePropertyPage
+450=COleResizeBar::COleResizeBar
+451=COleSafeArray::COleSafeArray
+452=COleSafeArray::COleSafeArray
+453=COleSafeArray::COleSafeArray
+454=COleSafeArray::COleSafeArray
+455=COleSafeArray::COleSafeArray
+456=COleServerDoc::COleServerDoc
+457=COleServerItem::COleServerItem
+458=COleStreamFile::COleStreamFile
+459=COleTemplateServer::COleTemplateServer
+460=COleUILinkInfo::COleUILinkInfo
+461=COleUpdateDialog::COleUpdateDialog
+462=COleVariant::COleVariant
+463=COleVariant::COleVariant
+464=COleVariant::COleVariant
+465=COleVariant::COleVariant
+466=COleVariant::COleVariant
+467=COleVariant::COleVariant
+468=COleVariant::COleVariant
+469=CPageSetupDialog::CPageSetupDialog
+470=CPaintDC::CPaintDC
+471=CPalette::CPalette
+472=CPen::CPen
+473=CPen::CPen
+474=CPen::CPen
+475=CPictureHolder::CPictureHolder
+476=CPicturePropPage::CPicturePropPage
+477=CPoint::CPoint
+478=CPoint::CPoint
+479=CPreviewDC::CPreviewDC
+480=CPreviewView::CPreviewView
+481=CPrintDialog::CPrintDialog
+482=CPrintDialog::CPrintDialog
+483=CPrintInfo::CPrintInfo
+484=CPrintPreviewState::CPrintPreviewState
+485=CProgressCtrl::CProgressCtrl
+486=CPropbagPropExchange::CPropbagPropExchange
+487=CProperty::CProperty
+488=CProperty::CProperty
+489=CPropertyPage::CPropertyPage
+490=CPropertyPage::CPropertyPage
+491=CPropertyPage::CPropertyPage
+492=CPropertySection::CPropertySection
+493=CPropertySection::CPropertySection
+494=CPropertySet::CPropertySet
+495=CPropertySet::CPropertySet
+496=CPropertySheet::CPropertySheet
+497=CPropertySheet::CPropertySheet
+498=CPropertySheet::CPropertySheet
+499=CPropsetPropExchange::CPropsetPropExchange
+500=CPtrArray::CPtrArray
+501=CPtrList::CPtrList
+502=CRecentFileList::CRecentFileList
+503=CRecordset::CRecordset
+504=CRecordView::CRecordView
+505=CRecordView::CRecordView
+506=CRectTracker::CRectTracker
+507=CRectTracker::CRectTracker
+508=CReObject::CReObject
+509=CReObject::CReObject
+510=CResetPropExchange::CResetPropExchange
+511=CRgn::CRgn
+512=CRichEditCntrItem::CRichEditCntrItem
+513=CRichEditCtrl::CRichEditCtrl
+514=CRichEditDoc::CRichEditDoc
+515=CRichEditView::CRichEditView
+516=CScrollBar::CScrollBar
+517=CScrollView::CScrollView
+518=CSemaphore::CSemaphore
+519=CSharedFile::CSharedFile
+520=CSingleDocTemplate::CSingleDocTemplate
+521=CSingleLock::CSingleLock
+522=CSliderCtrl::CSliderCtrl
+523=CSocket::CSocket
+524=CSocketFile::CSocketFile
+525=CSocketWnd::CSocketWnd
+526=CSpinButtonCtrl::CSpinButtonCtrl
+527=CSplitterWnd::CSplitterWnd
+528=CStatic::CStatic
+529=CStatusBar::CStatusBar
+530=CStatusBarCtrl::CStatusBarCtrl
+531=CStdioFile::CStdioFile
+532=CStdioFile::CStdioFile
+533=CStdioFile::CStdioFile
+534=CStockPropPage::CStockPropPage
+535=CString::CString
+536=CString::CString
+537=CString::CString
+538=CString::CString
+539=CString::CString
+540=CString::CString
+541=CStringArray::CStringArray
+542=CStringList::CStringList
+543=CSyncObject::CSyncObject
+544=CTabCtrl::CTabCtrl
+545=CTestCmdUI::CTestCmdUI
+546=CThreadSlotData::CThreadSlotData
+547=CTime::CTime
+548=CTime::CTime
+549=CTime::CTime
+550=CTime::CTime
+551=CTime::CTime
+552=CTime::CTime
+553=CTimeSpan::CTimeSpan
+554=CToolBar::CToolBar
+555=CToolBarCtrl::CToolBarCtrl
+556=CToolTipCtrl::CToolTipCtrl
+557=CTreeCtrl::CTreeCtrl
+558=CTreeView::CTreeView
+559=CUIntArray::CUIntArray
+560=CView::CView
+561=CWinApp::CWinApp
+562=CWindowDC::CWindowDC
+563=CWindowlessDC::CWindowlessDC
+564=CWinThread::CWinThread
+565=CWinThread::CWinThread
+566=CWnd::CWnd
+567=CWnd::CWnd
+568=CWordArray::CWordArray
+569=CPreviewView::PAGE_INFO::PAGE_INFO
+570=tagFONTOBJECT::tagFONTOBJECT
+571=_CIP<IBindCtx
+572=_CIP<IBindHost
+573=_CIP<IBinding
+574=_CIP<IMoniker
+575=_CIP<IServiceProvider
+576=_CIP<IStream
+577=CIP<IBindCtx
+578=CIP<IBindHost
+579=CIP<IBinding
+580=CIP<IMoniker
+581=CIP<IServiceProvider
+582=CIP<IStream
+583=CThreadLocal<AFX_MODULE_THREAD_STATE>::~CThreadLocal<AFX_MODULE_THREAD_STATE>
+584=_AFX_CHECKLIST_STATE::~_AFX_CHECKLIST_STATE
+585=_AFX_CTL3D_STATE::~_AFX_CTL3D_STATE
+586=_AFX_CTL3D_THREAD::~_AFX_CTL3D_THREAD
+587=_AFX_DAO_STATE::~_AFX_DAO_STATE
+588=_AFX_DB_STATE::~_AFX_DB_STATE
+589=_AFX_EDIT_STATE::~_AFX_EDIT_STATE
+590=???1_AFX_EXTDLL_STATE@@UAE@XZ@@YAXXZ
+591=_AFX_MAIL_STATE::~_AFX_MAIL_STATE
+592=_AFX_OLE_STATE::~_AFX_OLE_STATE
+593=_AFX_RICHEDIT_STATE::~_AFX_RICHEDIT_STATE
+594=_AFX_SOCK_STATE::~_AFX_SOCK_STATE
+595=_AFX_THREAD_STATE::~_AFX_THREAD_STATE
+596=_AFX_WIN_STATE::~_AFX_WIN_STATE
+597=_AFXCTL_UIACTIVE_INFO::~_AFXCTL_UIACTIVE_INFO
+598=???1AFX_COM@@QAE@XZ@@YAXXZ
+599=AFX_MAINTAIN_STATE::~AFX_MAINTAIN_STATE
+600=AFX_MODULE_STATE::~AFX_MODULE_STATE
+601=AFX_MODULE_THREAD_STATE::~AFX_MODULE_THREAD_STATE
+602=CAnimateCtrl::~CAnimateCtrl
+603=CArchive::~CArchive
+604=CAsyncMonikerFile::~CAsyncMonikerFile
+605=CAsyncSocket::~CAsyncSocket
+606=CBitmap::~CBitmap
+607=CBitmapButton::~CBitmapButton
+608=CBrush::~CBrush
+609=CButton::~CButton
+610=CByteArray::~CByteArray
+611=CCachedDataPathProperty::~CCachedDataPathProperty
+612=CCheckListBox::~CCheckListBox
+613=CClientDC::~CClientDC
+614=CCmdTarget::~CCmdTarget
+615=CColorButton::~CColorButton
+616=CComboBox::~CComboBox
+617=CCommandLineInfo::~CCommandLineInfo
+618=CCommonDialog::~CCommonDialog
+619=CConnectionPoint::~CConnectionPoint
+620=CControlBar::~CControlBar
+621=CCriticalSection::~CCriticalSection
+622=CCtrlView::~CCtrlView
+623=CDaoDatabase::~CDaoDatabase
+624=CDaoException::~CDaoException
+625=CDaoFieldInfo::~CDaoFieldInfo
+626=CDaoIndexFieldInfo::~CDaoIndexFieldInfo
+627=CDaoIndexInfo::~CDaoIndexInfo
+628=CDaoQueryDef::~CDaoQueryDef
+629=CDaoRecordset::~CDaoRecordset
+630=CDaoRecordView::~CDaoRecordView
+631=CDaoRelationFieldInfo::~CDaoRelationFieldInfo
+632=CDaoRelationInfo::~CDaoRelationInfo
+633=CDaoTableDef::~CDaoTableDef
+634=CDaoWorkspace::~CDaoWorkspace
+635=CDatabase::~CDatabase
+636=CDataPathProperty::~CDataPathProperty
+637=CDataSourceControl::~CDataSourceControl
+638=CDBException::~CDBException
+639=CDBVariant::~CDBVariant
+640=CDC::~CDC
+641=CDialog::~CDialog
+642=CDialogBar::~CDialogBar
+643=CDialogTemplate::~CDialogTemplate
+644=CDocItem::~CDocItem
+645=CDockBar::~CDockBar
+646=CDockContext::~CDockContext
+647=CDockState::~CDockState
+648=CDocManager::~CDocManager
+649=CDocObjectServer::~CDocObjectServer
+650=CDocObjectServerItem::~CDocObjectServerItem
+651=CDocTemplate::~CDocTemplate
+652=CDocument::~CDocument
+653=CDragListBox::~CDragListBox
+654=CDWordArray::~CDWordArray
+655=CDynLinkLibrary::~CDynLinkLibrary
+656=CEdit::~CEdit
+657=CEditView::~CEditView
+658=CEnumArray::~CEnumArray
+659=CEnumConnPoints::~CEnumConnPoints
+660=CEnumFormatEtc::~CEnumFormatEtc
+661=CEnumOleVerb::~CEnumOleVerb
+662=CEnumUnknown::~CEnumUnknown
+663=CEvent::~CEvent
+664=CException::~CException
+665=CFile::~CFile
+666=CFileDialog::~CFileDialog
+667=CFileException::~CFileException
+668=CFileFind::~CFileFind
+669=CFont::~CFont
+670=CFontComboBox::~CFontComboBox
+671=CFontDialog::~CFontDialog
+672=CFontHolder::~CFontHolder
+673=CFormView::~CFormView
+674=CFrameWnd::~CFrameWnd
+675=CFtpConnection::~CFtpConnection
+676=CFtpFileFind::~CFtpFileFind
+677=CGdiObject::~CGdiObject
+678=CGopherConnection::~CGopherConnection
+679=CGopherFile::~CGopherFile
+680=CGopherFileFind::~CGopherFileFind
+681=CGopherLocator::~CGopherLocator
+682=CHeaderCtrl::~CHeaderCtrl
+683=CHotKeyCtrl::~CHotKeyCtrl
+684=CHttpConnection::~CHttpConnection
+685=CHttpFile::~CHttpFile
+686=CImageList::~CImageList
+687=CInternetConnection::~CInternetConnection
+688=CInternetException::~CInternetException
+689=CInternetFile::~CInternetFile
+690=CInternetSession::~CInternetSession
+691=COleServerItem::CItemDataSource::~CItemDataSource
+692=CListBox::~CListBox
+693=CListCtrl::~CListCtrl
+694=CListView::~CListView
+695=CLongBinary::~CLongBinary
+696=CMapPtrToPtr::~CMapPtrToPtr
+697=CMapPtrToWord::~CMapPtrToWord
+698=CMapStringToOb::~CMapStringToOb
+699=CMapStringToPtr::~CMapStringToPtr
+700=CMapStringToString::~CMapStringToString
+701=CMapWordToOb::~CMapWordToOb
+702=CMapWordToPtr::~CMapWordToPtr
+703=CMemFile::~CMemFile
+704=CMenu::~CMenu
+705=CMetaFileDC::~CMetaFileDC
+706=CMiniFrameWnd::~CMiniFrameWnd
+707=CMirrorFile::~CMirrorFile
+708=CMonikerFile::~CMonikerFile
+709=CMultiDocTemplate::~CMultiDocTemplate
+710=CMultiLock::~CMultiLock
+711=CMutex::~CMutex
+712=CNoTrackObject::~CNoTrackObject
+713=CObArray::~CObArray
+714=CObject::~CObject
+715=CObList::~CObList
+716=CODBCFieldInfo::~CODBCFieldInfo
+717=COleBusyDialog::~COleBusyDialog
+718=COleChangeIconDialog::~COleChangeIconDialog
+719=COleChangeSourceDialog::~COleChangeSourceDialog
+720=COleClientItem::~COleClientItem
+721=COleCmdUI::~COleCmdUI
+722=COleCntrFrameWnd::~COleCntrFrameWnd
+723=COleControl::~COleControl
+724=COleControlContainer::~COleControlContainer
+725=COleControlLock::~COleControlLock
+726=COleControlSite::~COleControlSite
+727=COleConvertDialog::~COleConvertDialog
+728=COleDataObject::~COleDataObject
+729=COleDataSource::~COleDataSource
+730=COleDialog::~COleDialog
+731=COleDispatchDriver::~COleDispatchDriver
+732=COleDispatchException::~COleDispatchException
+733=COleDocIPFrameWnd::~COleDocIPFrameWnd
+734=COleDocument::~COleDocument
+735=COleDropSource::~COleDropSource
+736=COleDropTarget::~COleDropTarget
+737=COleFrameHook::~COleFrameHook
+738=COleInsertDialog::~COleInsertDialog
+739=COleIPFrameWnd::~COleIPFrameWnd
+740=COleLinkingDoc::~COleLinkingDoc
+741=COleLinksDialog::~COleLinksDialog
+742=COleMessageFilter::~COleMessageFilter
+743=COleObjectFactory::~COleObjectFactory
+744=COlePasteSpecialDialog::~COlePasteSpecialDialog
+745=COlePropertiesDialog::~COlePropertiesDialog
+746=COlePropertyPage::~COlePropertyPage
+747=COleResizeBar::~COleResizeBar
+748=COleServerDoc::~COleServerDoc
+749=COleServerItem::~COleServerItem
+750=COleStreamFile::~COleStreamFile
+751=COleTemplateServer::~COleTemplateServer
+752=COleUpdateDialog::~COleUpdateDialog
+753=COleVariant::~COleVariant
+754=CPageSetupDialog::~CPageSetupDialog
+755=CPaintDC::~CPaintDC
+756=CPalette::~CPalette
+757=CPen::~CPen
+758=CPictureHolder::~CPictureHolder
+759=CPicturePropPage::~CPicturePropPage
+760=CPreviewDC::~CPreviewDC
+761=CPreviewView::~CPreviewView
+762=CPrintDialog::~CPrintDialog
+763=CPrintInfo::~CPrintInfo
+764=CProcessLocalObject::~CProcessLocalObject
+765=CProgressCtrl::~CProgressCtrl
+766=CPropbagPropExchange::~CPropbagPropExchange
+767=CProperty::~CProperty
+768=CPropertyPage::~CPropertyPage
+769=CPropertySection::~CPropertySection
+770=CPropertySet::~CPropertySet
+771=CPropertySheet::~CPropertySheet
+772=CPtrArray::~CPtrArray
+773=CPtrList::~CPtrList
+774=CRecentFileList::~CRecentFileList
+775=CRecordset::~CRecordset
+776=CRecordView::~CRecordView
+777=CRectTracker::~CRectTracker
+778=CReObject::~CReObject
+779=CRgn::~CRgn
+780=CRichEditCntrItem::~CRichEditCntrItem
+781=CRichEditCtrl::~CRichEditCtrl
+782=CRichEditView::~CRichEditView
+783=CScrollBar::~CScrollBar
+784=CScrollView::~CScrollView
+785=CSemaphore::~CSemaphore
+786=CSharedFile::~CSharedFile
+787=CSimpleException::~CSimpleException
+788=CSingleDocTemplate::~CSingleDocTemplate
+789=CSizeComboBox::~CSizeComboBox
+790=CSliderCtrl::~CSliderCtrl
+791=CSocket::~CSocket
+792=CSocketFile::~CSocketFile
+793=CSpinButtonCtrl::~CSpinButtonCtrl
+794=CSplitterWnd::~CSplitterWnd
+795=CStatic::~CStatic
+796=CStatusBar::~CStatusBar
+797=CStatusBarCtrl::~CStatusBarCtrl
+798=CStdioFile::~CStdioFile
+799=CStockPropPage::~CStockPropPage
+800=CString::~CString
+801=CStringArray::~CStringArray
+802=CStringList::~CStringList
+803=CSyncObject::~CSyncObject
+804=CTabCtrl::~CTabCtrl
+805=CThreadLocalObject::~CThreadLocalObject
+806=CThreadSlotData::~CThreadSlotData
+807=CToolBar::~CToolBar
+808=CToolBarCtrl::~CToolBarCtrl
+809=CToolTipCtrl::~CToolTipCtrl
+810=CTreeCtrl::~CTreeCtrl
+811=CTreeView::~CTreeView
+812=CUIntArray::~CUIntArray
+813=CView::~CView
+814=CWaitCursor::~CWaitCursor
+815=CWinApp::~CWinApp
+816=CWindowDC::~CWindowDC
+817=CWinThread::~CWinThread
+818=CWnd::~CWnd
+819=CWordArray::~CWordArray
+820=tagFONTOBJECT::~tagFONTOBJECT
+821=COleControl::XEventConnPt::~XEventConnPt
+822=COleControl::XPropConnPt::~XPropConnPt
+823=operatornew
+824=CNoTrackObject::operatornew
+825=operatordelete
+826=CNoTrackObject::operatordelete
+827=CObject::operatordelete
+828=_CIP<IBindHost
+829=COleCurrency::operator=
+830=COleCurrency::operator=
+831=COleCurrency::operator=
+832=COleDateTime::operator=
+833=COleDateTime::operator=
+834=COleDateTime::operator=
+835=COleDateTime::operator=
+836=COleDateTime::operator=
+837=COleDateTimeSpan::operator=
+838=COleDateTimeSpan::operator=
+839=COleDispatchDriver::operator=
+840=COleSafeArray::operator=
+841=COleSafeArray::operator=
+842=COleSafeArray::operator=
+843=COleSafeArray::operator=
+844=COleVariant::operator=
+845=COleVariant::operator=
+846=COleVariant::operator=
+847=COleVariant::operator=
+848=COleVariant::operator=
+849=COleVariant::operator=
+850=COleVariant::operator=
+851=COleVariant::operator=
+852=COleVariant::operator=
+853=COleVariant::operator=
+854=COleVariant::operator=
+855=COleVariant::operator=
+856=COleVariant::operator=
+857=COleVariant::operator=
+858=CString::operator=
+859=CString::operator=
+860=CString::operator=
+861=CString::operator=
+862=operator>>
+863=operator>>
+864=operator>>
+865=operator>>
+866=operator>>
+867=operator>>
+868=operator>>
+869=operator>>
+870=operator>>
+871=operator>>
+872=operator>>
+873=operator>>
+874=operator>>
+875=operator>>
+876=operator>>
+877=operator>>
+878=operator>>
+879=operator>>
+880=operator>>
+881=operator>>
+882=operator<<
+883=operator<<
+884=operator<<
+885=operator<<
+886=operator<<
+887=operator<<
+888=operator<<
+889=CDumpContext::operator<<
+890=CDumpContext::operator<<
+891=CDumpContext::operator<<
+892=CDumpContext::operator<<
+893=CDumpContext::operator<<
+894=CDumpContext::operator<<
+895=CDumpContext::operator<<
+896=CDumpContext::operator<<
+897=CDumpContext::operator<<
+898=CDumpContext::operator<<
+899=CDumpContext::operator<<
+900=COleSafeArray::operator==
+901=COleSafeArray::operator==
+902=COleSafeArray::operator==
+903=COleSafeArray::operator==
+904=COleSafeArray::operator==
+905=COleSafeArray::operator==
+906=COleVariant::operator==
+907=CTime::operator==
+908=CTime::operator!=
+909=CMapPtrToPtr::operator[]
+910=CMapPtrToWord::operator[]
+911=CMapStringToOb::operator[]
+912=CMapStringToPtr::operator[]
+913=CMapStringToString::operator[]
+914=CMapWordToOb::operator[]
+915=CMapWordToPtr::operator[]
+916=COleCurrency::operator*
+917=COleCurrency::operator-
+918=COleCurrency::operator-
+919=COleDateTime::operator-
+920=COleDateTime::operator-
+921=COleDateTimeSpan::operator-
+922=operator+
+923=operator+
+924=operator+
+925=operator+
+926=operator+
+927=operator+
+928=COleCurrency::operator+
+929=COleDateTime::operator+
+930=COleDateTimeSpan::operator+
+931=COleCurrency::operator/
+932=COleCurrency::operator<
+933=COleDateTime::operator<
+934=COleCurrency::operator<=
+935=COleDateTime::operator<=
+936=COleCurrency::operator>
+937=COleDateTime::operator>
+938=COleCurrency::operator>=
+939=COleDateTime::operator>=
+940=CString::operator+=
+941=CString::operator+=
+942=CString::operator+=
+943=_AfxAbortProc
+944=??_afxAdvApi@@3UAFX_ADVAPI_CALL@@A@@YAXXZ
+945=CThreadLocal<_AFXCTL_AMBIENT_CACHE>_afxAmbientCache
+946=??_afxComDlg@@3UAFX_COMDLG_CALL@@A@@YAXXZ
+947=??_afxCommCtrl@@3UAFX_COMMCTRL_CALL@@A@@YAXXZ
+948=??_afxODBC@@3UAFX_ODBC_CALL@@A@@YAXXZ
+949=??_afxOLE@@3UAFX_OLE_CALL@@A@@YAXXZ
+950=CProcessLocal<_AFX_RICHEDIT_STATE>_afxRichEditState
+951=??_afxShell@@3UAFX_SHELL_CALL@@A@@YAXXZ
+952=??_afxSOCK@@3UAFX_SOCK_CALL@@A@@YAXXZ
+953=??_afxUrlMon@@3UAFX_URLMON_CALL@@A@@YAXXZ
+954=??_afxWinSpool@@3UAFX_WINSPOOL_CALL@@A@@YAXXZ
+955=_mbstowcsz
+956=_wcstombsz
+957=CArchive::Abort
+958=CFile::Abort
+959=CInternetFile::Abort
+960=CMemFile::Abort
+961=CMirrorFile::Abort
+962=COleStreamFile::Abort
+963=CSocketFile::Abort
+964=CStdioFile::Abort
+965=COleControlSite::XNotifyDBEvents::AboutToDo
+966=CAsyncSocket::Accept
+967=CSocket::Accept
+968=COleSafeArray::AccessData
+969=COleClientItem::Activate
+970=COlePropertyPage::XPropertyPage::Activate
+971=COleClientItem::ActivateAs
+972=CRichEditCntrItem::ActivateAs
+973=CDocObjectServer::ActivateDocObject
+974=COleServerDoc::ActivateDocObject
+975=CFrameWnd::ActivateFrame
+976=CMDIChildWnd::ActivateFrame
+977=COleServerDoc::ActivateInPlace
+978=CSplitterWnd::ActivateNext
+979=CWnd::ActivateTopParent
+980=CRecentFileList::Add
+981=CToolBarCtrl::AddBitmap
+982=CToolBarCtrl::AddBitmap
+983=COleClientItem::AddCachedData
+984=CEnumConnPoints::AddConnPoint
+985=CDocManager::AddDocTemplate
+986=CWinApp::AddDocTemplate
+987=CDocTemplate::AddDocument
+988=CMultiDocTemplate::AddDocument
+989=CSingleDocTemplate::AddDocument
+990=CFontComboBox::AddFont
+991=CEnumFormatEtc::AddFormat
+992=COlePasteSpecialDialog::AddFormat
+993=COlePasteSpecialDialog::AddFormat
+994=COleControl::AddFrameLevelUI
+995=CFrameWnd::AddFrameWnd
+996=CObList::AddHead
+997=CObList::AddHead
+998=CPtrList::AddHead
+999=CPtrList::AddHead
+1000=CSimpleList::AddHead
+1001=CStringList::AddHead
+1002=CStringList::AddHead
+1003=COleDocument::AddItem
+1004=COlePasteSpecialDialog::AddLinkEntry
+1005=CDaoRecordset::AddNew
+1006=CRecordset::AddNew
+1007=COleServerItem::AddOtherClipboardData
+1008=CPropertySheet::AddPage
+1009=CPropertySection::AddProperty
+1010=CPropertySet::AddProperty
+1011=CArchiveStream::AddRef
+1012=CBlobProperty::AddRef
+1013=CInnerUnknown::AddRef
+1014=COleConnPtContainer::AddRef
+1015=COleDispatchImpl::AddRef
+1016=COleUILinkInfo::AddRef
+1017=COleClientItem::XAdviseSink::AddRef
+1018=COleControlSite::XAmbientProps::AddRef
+1019=COleControlSite::XBoundObjectSite::AddRef
+1020=COleObjectFactory::XClassFactory::AddRef
+1021=CConnectionPoint::XConnPt::AddRef
+1022=COleControl::XDataObject::AddRef
+1023=COleDataSource::XDataObject::AddRef
+1024=COleServerDoc::XDataObject::AddRef
+1025=COleServerItem::XDataObject::AddRef
+1026=COleDropSource::XDropSource::AddRef
+1027=COleDropTarget::XDropTarget::AddRef
+1028=CEnumArray::XEnumVOID::AddRef
+1029=COleControlSite::XEventSink::AddRef
+1030=COleControl::XFontNotification::AddRef
+1031=COleMessageFilter::XMessageFilter::AddRef
+1032=COleControlSite::XNotifyDBEvents::AddRef
+1033=COleControl::XOleCache::AddRef
+1034=COleClientItem::XOleClientSite::AddRef
+1035=COleControlSite::XOleClientSite::AddRef
+1036=CDocObjectServer::XOleCommandTarget::AddRef
+1037=COleControlContainer::XOleContainer::AddRef
+1038=COleControl::XOleControl::AddRef
+1039=COleControlSite::XOleControlSite::AddRef
+1040=CDocObjectServer::XOleDocument::AddRef
+1041=CDocObjectServer::XOleDocumentView::AddRef
+1042=COleControl::XOleInPlaceActiveObject::AddRef
+1043=COleServerDoc::XOleInPlaceActiveObject::AddRef
+1044=COleFrameHook::XOleInPlaceFrame::AddRef
+1045=COleControl::XOleInPlaceObject::AddRef
+1046=COleServerDoc::XOleInPlaceObject::AddRef
+1047=COleControlContainer::XOleIPFrame::AddRef
+1048=COleClientItem::XOleIPSite::AddRef
+1049=COleControlSite::XOleIPSite::AddRef
+1050=COleLinkingDoc::XOleItemContainer::AddRef
+1051=CDocObjectServer::XOleObject::AddRef
+1052=COleControl::XOleObject::AddRef
+1053=COleServerDoc::XOleObject::AddRef
+1054=COleServerItem::XOleObject::AddRef
+1055=COlePropertiesDialog::XOleUIObjInfo::AddRef
+1056=COleControl::XPerPropertyBrowsing::AddRef
+1057=COleLinkingDoc::XPersistFile::AddRef
+1058=COleControl::XPersistMemory::AddRef
+1059=COleControl::XPersistPropertyBag::AddRef
+1060=COleControl::XPersistStorage::AddRef
+1061=COleServerDoc::XPersistStorage::AddRef
+1062=COleControl::XPersistStreamInit::AddRef
+1063=COleControl::XPointerInactive::AddRef
+1064=CDocObjectServer::XPrint::AddRef
+1065=COleControlSite::XPropertyNotifySink::AddRef
+1066=COlePropertyPage::XPropertyPage::AddRef
+1067=COlePropertyPage::XPropNotifySink::AddRef
+1068=COleControl::XProvideClassInfo::AddRef
+1069=COleControl::XQuickActivate::AddRef
+1070=CRichEditView::XRichEditOleCallback::AddRef
+1071=COleControl::XSpecifyPropertyPages::AddRef
+1072=COleControl::XViewObject::AddRef
+1073=CToolBar::AddReplaceBitmap
+1074=CHttpFile::AddRequestHeaders
+1075=CHttpFile::AddRequestHeaders
+1076=CPropertySet::AddSection
+1077=CPropertySet::AddSection
+1078=CSizeComboBox::AddSize
+1079=COlePasteSpecialDialog::AddStandardFormats
+1080=CToolBarCtrl::AddString
+1081=CObList::AddTail
+1082=CObList::AddTail
+1083=CPtrList::AddTail
+1084=CPtrList::AddTail
+1085=CStringList::AddTail
+1086=CStringList::AddTail
+1087=CToolTipCtrl::AddTool
+1088=CToolTipCtrl::AddTool
+1089=CWinApp::AddToRecentFileList
+1090=CDocument::AddView
+1091=CMetaFileDC::AdjustCP
+1092=CRichEditView::AdjustDialogPosition
+1093=CRectTracker::AdjustRect
+1094=CConnectionPoint::XConnPt::Advise
+1095=CDocObjectServer::XOleObject::Advise
+1096=COleControl::XOleObject::Advise
+1097=COleServerDoc::XOleObject::Advise
+1098=COleServerItem::XOleObject::Advise
+1099=AfxA2WHelper
+1100=AfxAbort
+1101=AfxAllocTaskAnsiString
+1102=AfxAllocTaskAnsiString
+1103=AfxAllocTaskWideString
+1104=AfxAllocTaskWideString
+1105=AfxBeginThread
+1106=AfxBeginThread
+1107=AfxBSTR2CString
+1108=AfxCallWndProc
+1109=AfxCancelModes
+1110=AfxComparePath
+1111=AfxCompareValueByRef
+1112=AfxConnectionAdvise
+1113=AfxConnectionUnadvise
+1114=AfxCopyValueByRef
+1115=AfxCoreInitModule
+1116=AfxCreateDC
+1117=AfxCriticalInit
+1118=AfxCriticalNewHandler
+1119=AfxCriticalTerm
+1120=AfxCustomLogFont
+1121=AfxDaoCheck
+1122=AfxDaoGetEngine
+1123=AfxDaoInit
+1124=AfxDaoTerm
+1125=AUX_DATAafxData
+1126=AfxDeleteObject
+1127=AfxDlgProc
+1128=AfxDllCanUnloadNow
+1129=AfxDllGetClassObject
+1130=AfxDynamicDownCast
+1131=AfxEnableControlContainer
+1132=AfxEnableWin31Compatibility
+1133=AfxEnableWin40Compatibility
+1134=AfxEndDeferRegisterClass
+1135=AfxEndThread
+1136=AfxEnumMetaFileProc
+1137=AfxExtractSubString
+1138=AfxFailMaxChars
+1139=AfxFailRadio
+1140=AfxFieldText
+1141=AfxFieldText
+1142=AfxFindMessageEntry
+1143=AfxFindResourceHandle
+1144=AfxFormatString1
+1145=AfxFormatString2
+1146=AfxFormatStrings
+1147=AfxFormatStrings
+1148=AfxFreeLibrary
+1149=AfxFullPath
+1150=AfxGetAfxWndProc
+1151=AfxGetAppModuleState
+1152=AfxGetClassIDFromString
+1153=AfxGetCtl3dState
+1154=AfxGetDaoState
+1155=AfxGetEmptyString
+1156=AfxGetFieldInfo
+1157=AfxGetFileName
+1158=AfxGetFileTitle
+1159=AfxGetIndexFieldInfo
+1160=AfxGetIndexFields
+1161=AfxGetIndexInfo
+1162=AfxGetInProcServer
+1163=AfxGetInternetHandleType
+1164=AfxGetModuleShortFileName
+1165=AfxGetModuleState
+1166=AfxGetModuleThreadState
+1167=AfxGetNewHandler
+1168=AfxGetParentOwner
+1169=AfxGetPropSheetFont
+1170=AfxGetRichEditState
+1171=AfxGetRoot
+1172=AfxGetThread
+1173=AfxGetThreadState
+1174=AfxGetTypeLibCache
+1175=AfxGlobalFree
+1176=AfxHelpEnabled
+1177=AfxHookWindowCreate
+1178=??AfxINetLoad@@YGXPAP6GHXZPBD@Z@@YAXXZ
+1179=AfxInitExtensionModule
+1180=AfxInitLocalData
+1181=AfxInitThread
+1182=AfxInternetStatusCallback
+1183=AfxIsDescendant
+1184=AfxIsValidAddress
+1185=AfxIsValidString
+1186=AfxIsValidString
+1187=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBD@Z@@YAXXZ
+1188=??AfxLoadDll@@YGPAUHINSTANCE__@@RAPAU1@PBDPAP6GHXZ1@Z@@YAXXZ
+1189=AfxLoadField
+1190=AfxLoadLibrary
+1191=AfxLoadString
+1192=AfxLoadSysColorBitmap
+1193=AfxLockGlobals
+1194=AfxLockTempMaps
+1195=AfxMergeMenus
+1196=AfxMessageBox
+1197=AfxMessageBox
+1198=AfxNewHandler
+1199=AfxOleCanExitApp
+1200=AfxOleGetUserCtrl
+1201=AfxOleHookProc
+1202=AfxOleInit
+1203=AfxOleLockApp
+1204=AfxOleLockControl
+1205=AfxOleLockControl
+1206=AfxOleOnReleaseAllObjects
+1207=AfxOleRegisterControlClass
+1208=AfxOleRegisterHelper
+1209=AfxOleRegisterPropertyPageClass
+1210=AfxOleRegisterPropertyPageClass
+1211=AfxOleRegisterServerClass
+1212=AfxOleRegisterServerClassCompat
+1213=AfxOleRegisterTypeLib
+1214=AfxOleSetEditMenu
+1215=AfxOleSetUserCtrl
+1216=AfxOleTerm
+1217=AfxOleTermOrFreeLib
+1218=AfxOleTypeMatchGuid
+1219=AfxOleUnlockAllControls
+1220=AfxOleUnlockApp
+1221=AfxOleUnlockControl
+1222=AfxOleUnlockControl
+1223=AfxOleUnregisterClass
+1224=AfxOleUnregisterTypeLib
+1225=AfxParseURL
+1226=AfxPostQuitMessage
+1227=AfxPropPageCallback
+1228=AfxPropSheetCallback
+1229=AfxRegisterClass
+1230=AfxRegisterWndClass
+1231=AfxRepositionWindow
+1232=AfxResetMsgCache
+1233=AfxResolveShortcut
+1234=AfxRFXBulkDefault
+1235=AfxSafeArrayInit
+1236=AfxSetCurrentRecord
+1237=AfxSetFieldInfo
+1238=AfxSetIndexFieldInfo
+1239=AfxSetIndexInfo
+1240=AfxSetModuleState
+1241=AfxSetNewHandler
+1242=AfxSetRecordCount
+1243=AfxSetWindowText
+1244=AfxSocketInit
+1245=AfxSocketTerm
+1246=AfxStoreField
+1247=AfxStringFromCLSID
+1248=AfxTermExtensionModule
+1249=AfxTermLocalData
+1250=AfxTermThread
+1251=AfxTextFloatFormat
+1252=AfxThrowArchiveException
+1253=AfxThrowDaoException
+1254=AfxThrowDBException
+1255=AfxThrowFileException
+1256=AfxThrowInternetException
+1257=AfxThrowLastCleanup
+1258=AfxThrowMemoryException
+1259=AfxThrowNotSupportedException
+1260=AfxThrowOleDispatchException
+1261=AfxThrowOleDispatchException
+1262=AfxThrowOleException
+1263=AfxThrowResourceException
+1264=AfxThrowUserException
+1557=AfxTimeToFileTime
+1558=AfxTlsAddRef
+1559=AfxTlsRelease
+1560=AfxTryCleanup
+1561=AfxUnhookWindowCreate
+1562=AfxUnlockGlobals
+1563=AfxUnlockTempMaps
+1564=AfxUnmergeMenus
+1565=AfxVariantInit
+1566=AfxVerifyLicFile
+1567=AfxW2AHelper
+1568=AfxWinInit
+1569=AfxWinMain
+1570=AfxWinTerm
+1571=AfxWndProc
+1572=AfxWndProcBase
+1573=AfxWndProcDllOle
+1574=CMemFile::Alloc
+1575=CSharedFile::Alloc
+1576=CRecordset::AllocAndCacheFieldInfo
+1577=CString::AllocBeforeWrite
+1578=CString::AllocBuffer
+1579=CDaoRecordset::AllocCache
+1580=CDaoFieldExchange::AllocCacheValue
+1581=CDatabase::AllocConnect
+1582=CString::AllocCopy
+1583=COleSafeArray::AllocData
+1584=CDaoRecordset::AllocDatabase
+1585=CRecordset::AllocDataCache
+1586=COleSafeArray::AllocDescriptor
+1587=CControlBar::AllocElements
+1588=CStatusBar::AllocElements
+1589=CRecordset::AllocHstmt
+1590=AllocLongBinary
+1591=CRecordset::AllocRowset
+1592=CThreadSlotData::AllocSlot
+1593=CRecordset::AllocStatusArrays
+1594=CString::AllocSysString
+1595=CProperty::AllocValue
+1596=COleControl::AmbientAppearance
+1597=COleControl::AmbientBackColor
+1598=COleControl::AmbientDisplayName
+1599=COleControl::AmbientFont
+1600=COleControl::AmbientForeColor
+1601=COleControl::AmbientLocaleID
+1602=COleControl::AmbientScaleUnits
+1603=COleControl::AmbientShowGrabHandles
+1604=COleControl::AmbientShowHatching
+1605=COleControl::AmbientTextAlign
+1606=COleControl::AmbientUIDead
+1607=COleControl::AmbientUserMode
+1608=CByteArray::Append
+1609=CDaoQueryDef::Append
+1610=CDaoTableDef::Append
+1611=CDaoWorkspace::Append
+1612=CDWordArray::Append
+1613=CObArray::Append
+1614=CPtrArray::Append
+1615=CStringArray::Append
+1616=CUIntArray::Append
+1617=CWordArray::Append
+1618=CRecordset::AppendFilterAndSortSQL
+1619=CRecordset::AppendNames
+1620=CRecordset::AppendNamesValues
+1621=CDaoFieldExchange::AppendParamType
+1622=CRecordset::AppendValues
+1623=COlePropertyPage::XPropertyPage::Apply
+1624=COleDocument::ApplyPrintDevice
+1625=COleDocument::ApplyPrintDevice
+1626=CDocObjectServer::XOleDocumentView::ApplyViewState
+1627=CDC::ArcTo
+1628=CObject::AssertValid
+1629=CString::AssignCopy
+1630=CThreadSlotData::AssignInstance
+1631=CAsyncSocket::AsyncSelect
+1632=CAsyncSocket::Attach
+1633=CDC::Attach
+1634=CGdiObject::Attach
+1635=CImageList::Attach
+1636=CMemFile::Attach
+1637=CMenu::Attach
+1638=CMonikerFile::Attach
+1639=CMonikerFile::Attach
+1640=COleDataObject::Attach
+1641=COleSafeArray::Attach
+1642=COleStreamFile::Attach
+1643=COleVariant::Attach
+1644=CWnd::Attach
+1645=COleDataObject::AttachClipboard
+1646=CWnd::AttachControlSite
+1647=CWnd::AttachControlSite
+1648=COleClientItem::AttachDataObject
+1649=COleDispatchDriver::AttachDispatch
+1650=CAsyncSocket::AttachHandle
+1651=CPrintDialog::AttachOnSetup
+1652=COleControlSite::AttachWindow
+1653=CBitmapButton::AutoLoad
+1654=CSocket::AuxQueueAdd
+1655=COleMessageFilter::BeginBusyState
+1656=CDragListBox::BeginDrag
+1657=COleDataObject::BeginEnumFormats
+1658=CFrameWnd::BeginModalState
+1659=CWnd::BeginModalState
+1660=CDaoWorkspace::BeginTrans
+1661=CDatabase::BeginTrans
+1662=CCmdTarget::BeginWaitCursor
+1663=CAsyncSocket::Bind
+1664=CDataSourceControl::BindColumns
+1665=COccManager::BindControls
+1666=COleControlSite::BindDefaultProperty
+1667=CWnd::BindDefaultProperty
+1668=CDaoRecordset::BindFields
+1669=CRecordset::BindFieldsForUpdate
+1670=CRecordset::BindFieldsToColumns
+1671=CDaoRecordset::BindParameters
+1672=CDatabase::BindParameters
+1673=CRecordset::BindParams
+1674=CDataSourceControl::BindProp
+1675=CDataSourceControl::BindProp
+1676=COleControlSite::BindProperty
+1677=CWnd::BindProperty
+1678=COleControl::BoundPropertyChanged
+1679=COleControl::BoundPropertyRequestEdit
+1680=CFrameWnd::BringToTop
+1681=CDBException::BuildErrorString
+1682=CDaoRecordset::BuildParameterList
+1683=CPropertySheet::BuildPropPageArray
+1684=CDaoRecordset::BuildSelectList
+1685=CRecordset::BuildSelectSQL
+1686=COleControl::BuildSharedMenu
+1687=COleDocIPFrameWnd::BuildSharedMenu
+1688=COleIPFrameWnd::BuildSharedMenu
+1689=CDaoRecordset::BuildSQL
+1690=CRecordset::BuildSQL
+1691=CRecordset::BuildUpdateSQL
+1692=COleControl::ButtonDblClk
+1693=COleControl::ButtonDown
+1694=COleControl::ButtonUp
+1695=_AFXCTL_AMBIENT_CACHE::Cache
+1696=CTypeLibCache::Cache
+1697=COleControl::XOleCache::Cache
+1698=COleDataSource::CacheData
+1699=COleDataSource::CacheGlobalData
+1700=CTypeLibCache::CacheTypeInfo
+1701=CMiniFrameWnd::CalcBorders
+1702=CControlBar::CalcDynamicLayout
+1703=CToolBar::CalcDynamicLayout
+1704=CControlBar::CalcFixedLayout
+1705=CDialogBar::CalcFixedLayout
+1706=CDockBar::CalcFixedLayout
+1707=CStatusBar::CalcFixedLayout
+1708=CToolBar::CalcFixedLayout
+1709=CControlBar::CalcInsideRect
+1710=CStatusBar::CalcInsideRect
+1711=CToolBar::CalcLayout
+1712=CCheckListBox::CalcMinimumItemHeight
+1713=CPreviewView::CalcPageDisplaySize
+1714=CPreviewView::CalcScaleRatio
+1715=CToolBar::CalcSize
+1716=CEditView::CalcWindowRect
+1717=CMiniFrameWnd::CalcWindowRect
+1718=CScrollView::CalcWindowRect
+1719=CView::CalcWindowRect
+1720=CWnd::CalcWindowRect
+1721=CCmdTarget::CallMemberFunc
+1722=COleClientItem::CanActivate
+1723=CRichEditCntrItem::CanActivate
+1724=CSplitterWnd::CanActivateNext
+1725=CDaoRecordset::CanAppend
+1726=CDaoRecordset::CanBookmark
+1727=CRecordset::CanBookmark
+1728=CDatabase::Cancel
+1729=CRecordset::Cancel
+1730=CSocket::CancelBlockingCall
+1731=CDragListBox::CancelDrag
+1732=COleControlSite::XNotifyDBEvents::Cancelled
+1733=COleUILinkInfo::CancelLink
+1734=CDockContext::CancelLoop
+1735=CPropertyPage::CancelToClose
+1736=CWnd::CancelToolTips
+1737=CDaoRecordset::CancelUpdate
+1738=CRecordset::CancelUpdate
+1739=CDocument::CanCloseFrame
+1740=COleServerDoc::CanCloseFrame
+1741=COleClientItem::CanCreateFromData
+1742=COleClientItem::CanCreateLinkFromData
+1743=CDockContext::CanDock
+1744=CFrameWnd::CanDock
+1745=CFrameWnd::CanEnterHelpMode
+1746=COleClientItem::XOleIPSite::CanInPlaceActivate
+1747=COleControlSite::XOleIPSite::CanInPlaceActivate
+1748=COleClientItem::CanPaste
+1749=CRichEditCtrl::CanPaste
+1750=CRichEditView::CanPaste
+1751=COleClientItem::CanPasteLink
+1752=CDaoRecordset::CanRestart
+1753=CDaoRecordset::CanScroll
+1754=CDaoDatabase::CanTransact
+1755=CDaoRecordset::CanTransact
+1756=CDaoDatabase::CanUpdate
+1757=CDaoQueryDef::CanUpdate
+1758=CDaoRecordset::CanUpdate
+1759=CDaoTableDef::CanUpdate
+1760=CScrollView::CenterOnPoint
+1761=CWnd::CenterWindow
+1762=CPicturePropPage::ChangePicture
+1763=COleVariant::ChangeType
+1764=CListBox::CharToItem
+1765=CDatabase::Check
+1766=CRecordset::Check
+1767=CDialog::CheckAutoCenter
+1768=CWnd::CheckAutoCenter
+1769=CArchive::CheckCount
+1770=COleControlContainer::CheckDlgButton
+1771=CWnd::CheckDlgButton
+1772=CCheckListBox::CheckFromPoint
+1773=COleClientItem::CheckGeneral
+1774=COleControlContainer::CheckRadioButton
+1775=CWnd::CheckRadioButton
+1776=COleDateTime::CheckRange
+1777=COleDateTimeSpan::CheckRange
+1778=CRecordset::CheckRowsetCurrencyStatus
+1779=CRecordset::CheckRowsetError
+1780=CRuntimeClassconstCAnimateCtrl::classCAnimateCtrl
+1781=CRuntimeClassconstCArchiveException::classCArchiveException
+1782=CRuntimeClassconstCAsyncMonikerFile::classCAsyncMonikerFile
+1783=CRuntimeClassconstCAsyncSocket::classCAsyncSocket
+1784=CRuntimeClassconstCBitmap::classCBitmap
+1785=CRuntimeClassconstCBitmapButton::classCBitmapButton
+1786=CRuntimeClassconstCBrush::classCBrush
+1787=CRuntimeClassconstCButton::classCButton
+1788=CRuntimeClassCByteArray::classCByteArray
+1789=CRuntimeClassconstCCheckListBox::classCCheckListBox
+1790=CRuntimeClassconstCClientDC::classCClientDC
+1791=CRuntimeClassconstCCmdTarget::classCCmdTarget
+1792=CRuntimeClassconstCColorDialog::classCColorDialog
+1793=CRuntimeClassconstCColorPropPage::classCColorPropPage
+1794=CRuntimeClassconstCComboBox::classCComboBox
+1795=CRuntimeClassconstCControlBar::classCControlBar
+1796=CRuntimeClassconstCCriticalSection::classCCriticalSection
+1797=CRuntimeClassconstCCtrlView::classCCtrlView
+1798=CRuntimeClassconstCDaoDatabase::classCDaoDatabase
+1799=CRuntimeClassconstCDaoException::classCDaoException
+1800=CRuntimeClassconstCDaoQueryDef::classCDaoQueryDef
+1801=CRuntimeClassconstCDaoRecordset::classCDaoRecordset
+1802=CRuntimeClassconstCDaoRecordView::classCDaoRecordView
+1803=CRuntimeClassconstCDaoTableDef::classCDaoTableDef
+1804=CRuntimeClassconstCDaoWorkspace::classCDaoWorkspace
+1805=CRuntimeClassconstCDatabase::classCDatabase
+1806=CRuntimeClassconstCDBException::classCDBException
+1807=CRuntimeClassconstCDC::classCDC
+1808=CRuntimeClassconstCDialog::classCDialog
+1809=CRuntimeClassconstCDialogBar::classCDialogBar
+1810=CRuntimeClassCDocItem::classCDocItem
+1811=CRuntimeClassconstCDockBar::classCDockBar
+1812=CRuntimeClassCDockState::classCDockState
+1813=CRuntimeClassconstCDocManager::classCDocManager
+1814=CRuntimeClassconstCDocObjectServer::classCDocObjectServer
+1815=CRuntimeClassconstCDocObjectServerItem::classCDocObjectServerItem
+1816=CRuntimeClassconstCDocTemplate::classCDocTemplate
+1817=CRuntimeClassconstCDocument::classCDocument
+1818=CRuntimeClassconstCDragListBox::classCDragListBox
+1819=CRuntimeClassCDWordArray::classCDWordArray
+1820=CRuntimeClassconstCDynLinkLibrary::classCDynLinkLibrary
+1821=CRuntimeClassconstCEdit::classCEdit
+1822=CRuntimeClassconstCEditView::classCEditView
+1823=CRuntimeClassconstCEvent::classCEvent
+1824=CRuntimeClassconstCException::classCException
+1825=CRuntimeClassconstCFile::classCFile
+1826=CRuntimeClassconstCFileDialog::classCFileDialog
+1827=CRuntimeClassconstCFileException::classCFileException
+1828=CRuntimeClassconstCFileFind::classCFileFind
+1829=CRuntimeClassconstCFindReplaceDialog::classCFindReplaceDialog
+1830=CRuntimeClassconstCFont::classCFont
+1831=CRuntimeClassconstCFontDialog::classCFontDialog
+1832=CRuntimeClassconstCFontPropPage::classCFontPropPage
+1833=CRuntimeClassconstCFormView::classCFormView
+1834=CRuntimeClassconstCFrameWnd::classCFrameWnd
+1835=CRuntimeClassconstCGdiObject::classCGdiObject
+1836=CRuntimeClassconstCHeaderCtrl::classCHeaderCtrl
+1837=CRuntimeClassconstCHotKeyCtrl::classCHotKeyCtrl
+1838=CRuntimeClassconstCImageList::classCImageList
+1839=CRuntimeClassconstCListBox::classCListBox
+1840=CRuntimeClassconstCListCtrl::classCListCtrl
+1841=CRuntimeClassconstCListView::classCListView
+1842=CRuntimeClassconstCLongBinary::classCLongBinary
+1843=CRuntimeClassconstCMapPtrToPtr::classCMapPtrToPtr
+1844=CRuntimeClassconstCMapPtrToWord::classCMapPtrToWord
+1845=CRuntimeClassCMapStringToOb::classCMapStringToOb
+1846=CRuntimeClassconstCMapStringToPtr::classCMapStringToPtr
+1847=CRuntimeClassCMapStringToString::classCMapStringToString
+1848=CRuntimeClassCMapWordToOb::classCMapWordToOb
+1849=CRuntimeClassconstCMapWordToPtr::classCMapWordToPtr
+1850=CRuntimeClassconstCMDIChildWnd::classCMDIChildWnd
+1851=CRuntimeClassconstCMDIFrameWnd::classCMDIFrameWnd
+1852=CRuntimeClassconstCMemFile::classCMemFile
+1853=CRuntimeClassconstCMemoryException::classCMemoryException
+1854=CRuntimeClassconstCMenu::classCMenu
+1855=CRuntimeClassconstCMetaFileDC::classCMetaFileDC
+1856=CRuntimeClassconstCMiniDockFrameWnd::classCMiniDockFrameWnd
+1857=CRuntimeClassconstCMiniFrameWnd::classCMiniFrameWnd
+1858=CRuntimeClassconstCMonikerFile::classCMonikerFile
+1859=CRuntimeClassconstCMultiDocTemplate::classCMultiDocTemplate
+1860=CRuntimeClassconstCMutex::classCMutex
+1861=CRuntimeClassconstCNotSupportedException::classCNotSupportedException
+1862=CRuntimeClassCObArray::classCObArray
+1863=CRuntimeClassconstCObject::classCObject
+1864=CRuntimeClassCObList::classCObList
+1865=CRuntimeClassconstCOleBusyDialog::classCOleBusyDialog
+1866=CRuntimeClassconstCOleChangeIconDialog::classCOleChangeIconDialog
+1867=CRuntimeClassconstCOleChangeSourceDialog::classCOleChangeSourceDialog
+1868=CRuntimeClassconstCOleClientItem::classCOleClientItem
+1869=CRuntimeClassconstCOleControl::classCOleControl
+1870=CRuntimeClassconstCOleControlModule::classCOleControlModule
+1871=CRuntimeClassconstCOleConvertDialog::classCOleConvertDialog
+1872=CRuntimeClassconstCOleDialog::classCOleDialog
+1873=CRuntimeClassconstCOleDispatchException::classCOleDispatchException
+1874=CRuntimeClassconstCOleDocIPFrameWnd::classCOleDocIPFrameWnd
+1875=CRuntimeClassconstCOleDocument::classCOleDocument
+1876=CRuntimeClassconstCOleException::classCOleException
+1877=CRuntimeClassconstCOleInsertDialog::classCOleInsertDialog
+1878=CRuntimeClassconstCOleIPFrameWnd::classCOleIPFrameWnd
+1879=CRuntimeClassconstCOleLinkingDoc::classCOleLinkingDoc
+1880=CRuntimeClassconstCOleLinksDialog::classCOleLinksDialog
+1881=CRuntimeClassconstCOleObjectFactory::classCOleObjectFactory
+1882=CRuntimeClassconstCOlePasteSpecialDialog::classCOlePasteSpecialDialog
+1883=CRuntimeClassconstCOlePropertiesDialog::classCOlePropertiesDialog
+1884=CRuntimeClassconstCOlePropertyPage::classCOlePropertyPage
+1885=CRuntimeClassconstCOleResizeBar::classCOleResizeBar
+1886=CRuntimeClassconstCOleServerDoc::classCOleServerDoc
+1887=CRuntimeClassconstCOleServerItem::classCOleServerItem
+1888=CRuntimeClassconstCOleStreamFile::classCOleStreamFile
+1889=CRuntimeClassconstCOleUpdateDialog::classCOleUpdateDialog
+1890=CRuntimeClassconstCPageSetupDialog::classCPageSetupDialog
+1891=CRuntimeClassconstCPaintDC::classCPaintDC
+1892=CRuntimeClassconstCPalette::classCPalette
+1893=CRuntimeClassconstCPen::classCPen
+1894=CRuntimeClassconstCPicturePropPage::classCPicturePropPage
+1895=CRuntimeClassconstCPreviewDC::classCPreviewDC
+1896=CRuntimeClassconstCPreviewView::classCPreviewView
+1897=CRuntimeClassconstCPrintDialog::classCPrintDialog
+1898=CRuntimeClassconstCProgressCtrl::classCProgressCtrl
+1899=CRuntimeClassconstCPropertyPage::classCPropertyPage
+1900=CRuntimeClassconstCPropertySheet::classCPropertySheet
+1901=CRuntimeClassconstCPtrArray::classCPtrArray
+1902=CRuntimeClassconstCPtrList::classCPtrList
+1903=CRuntimeClassconstCRecordset::classCRecordset
+1904=CRuntimeClassconstCRecordView::classCRecordView
+1905=CRuntimeClassconstCResourceException::classCResourceException
+1906=CRuntimeClassconstCRgn::classCRgn
+1907=CRuntimeClassCRichEditCntrItem::classCRichEditCntrItem
+1908=CRuntimeClassconstCRichEditCtrl::classCRichEditCtrl
+1909=CRuntimeClassconstCRichEditDoc::classCRichEditDoc
+1910=CRuntimeClassconstCRichEditView::classCRichEditView
+1911=CRuntimeClassconstCScrollBar::classCScrollBar
+1912=CRuntimeClassconstCScrollView::classCScrollView
+1913=CRuntimeClassconstCSemaphore::classCSemaphore
+1914=CRuntimeClassconstCSharedFile::classCSharedFile
+1915=CRuntimeClassconstCSingleDocTemplate::classCSingleDocTemplate
+1916=CRuntimeClassconstCSliderCtrl::classCSliderCtrl
+1917=CRuntimeClassconstCSocket::classCSocket
+1918=CRuntimeClassconstCSocketFile::classCSocketFile
+1919=CRuntimeClassconstCSpinButtonCtrl::classCSpinButtonCtrl
+1920=CRuntimeClassconstCSplitterWnd::classCSplitterWnd
+1921=CRuntimeClassconstCStatic::classCStatic
+1922=CRuntimeClassconstCStatusBar::classCStatusBar
+1923=CRuntimeClassconstCStatusBarCtrl::classCStatusBarCtrl
+1924=CRuntimeClassconstCStdioFile::classCStdioFile
+1925=CRuntimeClassconstCStockPropPage::classCStockPropPage
+1926=CRuntimeClassCStringArray::classCStringArray
+1927=CRuntimeClassCStringList::classCStringList
+1928=CRuntimeClassconstCSyncObject::classCSyncObject
+1929=CRuntimeClassconstCTabCtrl::classCTabCtrl
+1930=CRuntimeClassconstCToolBar::classCToolBar
+1931=CRuntimeClassconstCToolBarCtrl::classCToolBarCtrl
+1932=CRuntimeClassconstCToolTipCtrl::classCToolTipCtrl
+1933=CRuntimeClassconstCTreeCtrl::classCTreeCtrl
+1934=CRuntimeClassconstCTreeView::classCTreeView
+1935=CRuntimeClassconstCUIntArray::classCUIntArray
+1936=CRuntimeClassconstCUserException::classCUserException
+1937=CRuntimeClassconstCView::classCView
+1938=CRuntimeClassconstCWinApp::classCWinApp
+1939=CRuntimeClassconstCWindowDC::classCWindowDC
+1940=CRuntimeClassconstCWinThread::classCWinThread
+1941=CRuntimeClassconstCWnd::classCWnd
+1942=CRuntimeClassCWordArray::classCWordArray
+1943=CPropertyPage::Cleanup
+1944=COlePropertyPage::CleanupObjectArray
+1945=CDBVariant::Clear
+1946=CDockState::Clear
+1947=COleVariant::Clear
+1948=CDaoRecordset::ClearDirtyFieldStatus
+1949=CRecordset::ClearDirtyFieldStatus
+1950=CRecordset::ClearFieldStatus
+1951=CDaoRecordset::ClearFieldStatusFlags
+1952=CDaoRecordset::ClearNullFieldStatus
+1953=CRecordset::ClearNullFieldStatus
+1954=CRecordset::ClearNullParamStatus
+1955=COleControl::ClientToParent
+1956=COleControl::ClipCaretRect
+1957=CPreviewDC::ClipToPage
+1958=CArchiveStream::Clone
+1959=CEnumArray::XEnumVOID::Clone
+1960=CDocObjectServer::XOleDocumentView::Clone
+1961=CArchive::Close
+1962=CAsyncMonikerFile::Close
+1963=CAsyncSocket::Close
+1964=CCachedDataPathProperty::Close
+1965=CDaoDatabase::Close
+1966=CDaoQueryDef::Close
+1967=CDaoRecordset::Close
+1968=CDaoTableDef::Close
+1969=CDaoWorkspace::Close
+1970=CDatabase::Close
+1971=CFile::Close
+1972=CFileFind::Close
+1973=CFtpConnection::Close
+1974=CGopherConnection::Close
+1975=CGopherFile::Close
+1976=CHttpConnection::Close
+1977=CHttpFile::Close
+1978=CInternetConnection::Close
+1979=CInternetFile::Close
+1980=CInternetSession::Close
+1981=CMemFile::Close
+1982=CMirrorFile::Close
+1983=CMonikerFile::Close
+1984=COleClientItem::Close
+1985=COleStreamFile::Close
+1986=CRecordset::Close
+1987=CSocket::Close
+1988=CSocketFile::Close
+1989=CStdioFile::Close
+1990=CDocObjectServer::XOleObject::Close
+1991=COleControl::XOleObject::Close
+1992=COleServerDoc::XOleObject::Close
+1993=COleServerItem::XOleObject::Close
+1994=CDocManager::CloseAllDocuments
+1995=CDocTemplate::CloseAllDocuments
+1996=CWinApp::CloseAllDocuments
+1997=CFileFind::CloseContext
+1998=CFtpFileFind::CloseContext
+1999=CGopherFileFind::CloseContext
+2000=CDocObjectServer::XOleDocumentView::CloseView
+2001=CColorButton::colGetFaceColor
+2002=AFX_OLECMDMAPconstCCmdTarget::commandMap
+2003=CStatusBar::CommandToIndex
+2004=CToolBar::CommandToIndex
+2005=CArchiveStream::Commit
+2006=COleClientItem::CommitItem
+2007=COleDocument::CommitItems
+2008=CDaoWorkspace::CommitTrans
+2009=CDatabase::CommitTrans
+2010=CPropertyPage::CommonConstruct
+2011=CPropertySheet::CommonConstruct
+2012=CWinThread::CommonConstruct
+2013=CDaoWorkspace::CompactDatabase
+2014=CDaoWorkspace::CompactDatabase
+2015=CComboBox::CompareItem
+2016=CListBox::CompareItem
+2017=CDaoFieldExchange::CompareValue
+2018=CPreviewDC::ComputeDeltas
+2019=CString::ConcatCopy
+2020=CString::ConcatInPlace
+2021=CAsyncSocket::Connect
+2022=CDatabase::Connect
+2023=CAsyncSocket::ConnectHelper
+2024=CSocket::ConnectHelper
+2025=AFX_CONNECTIONMAPconstCCmdTarget::connectionMap
+2026=AFX_CONNECTIONMAPconstCOleControl::connectionMap
+2027=COleControlSite::ConnectSink
+2028=COleTemplateServer::ConnectTemplate
+2029=COleServerDoc::ConnectView
+2030=CPropertyPage::Construct
+2031=CPropertyPage::Construct
+2032=CPropertySheet::Construct
+2033=CPropertySheet::Construct
+2034=CRectTracker::Construct
+2035=ConstructElements
+2036=ConstructElements
+2037=COleControl::XOleInPlaceActiveObject::ContextSensitiveHelp
+2038=COleServerDoc::XOleInPlaceActiveObject::ContextSensitiveHelp
+2039=COleFrameHook::XOleInPlaceFrame::ContextSensitiveHelp
+2040=COleControl::XOleInPlaceObject::ContextSensitiveHelp
+2041=COleServerDoc::XOleInPlaceObject::ContextSensitiveHelp
+2042=COleControlContainer::XOleIPFrame::ContextSensitiveHelp
+2043=COleClientItem::XOleIPSite::ContextSensitiveHelp
+2044=COleControlSite::XOleIPSite::ContextSensitiveHelp
+2045=CRichEditView::XRichEditOleCallback::ContextSensitiveHelp
+2046=CPropertySheet::ContinueModal
+2047=CWnd::ContinueModal
+2048=COleControl::ControlInfoChanged
+2049=COlePropertiesDialog::XOleUIObjInfo::ConvertObject
+2050=COleClientItem::ConvertTo
+2051=CRichEditCntrItem::ConvertTo
+2052=CByteArray::Copy
+2053=CDWordArray::Copy
+2054=CObArray::Copy
+2055=COleSafeArray::Copy
+2056=CPtrArray::Copy
+2057=CStringArray::Copy
+2058=CUIntArray::Copy
+2059=CWordArray::Copy
+2060=CString::CopyBeforeWrite
+2061=CDataSourceControl::CopyColumnID
+2062=CopyElements
+2063=CopyElements
+2064=CArchiveStream::CopyTo
+2065=COleClientItem::CopyToClipboard
+2066=COleServerItem::CopyToClipboard
+2067=CDaoFieldExchange::CopyValue
+2068=CAnimateCtrl::Create
+2069=CAsyncSocket::Create
+2070=CButton::Create
+2071=CCheckListBox::Create
+2072=CComboBox::Create
+2073=CControlFrameWnd::Create
+2074=CDaoDatabase::Create
+2075=CDaoQueryDef::Create
+2076=CDaoTableDef::Create
+2077=CDaoWorkspace::Create
+2078=CDialog::Create
+2079=CDialogBar::Create
+2080=CDockBar::Create
+2081=CEdit::Create
+2082=CFindReplaceDialog::Create
+2083=CFormView::Create
+2084=CFrameWnd::Create
+2085=CHeaderCtrl::Create
+2086=CHotKeyCtrl::Create
+2087=CImageList::Create
+2088=CImageList::Create
+2089=CImageList::Create
+2090=CImageList::Create
+2091=CListBox::Create
+2092=CListCtrl::Create
+2093=CMDIChildWnd::Create
+2094=CMiniDockFrameWnd::Create
+2095=CMiniFrameWnd::Create
+2096=COleResizeBar::Create
+2097=COleSafeArray::Create
+2098=COleSafeArray::Create
+2099=CPlex::Create
+2100=CProgressCtrl::Create
+2101=CPropertySheet::Create
+2102=CReflectorWnd::Create
+2103=CRichEditCtrl::Create
+2104=CScrollBar::Create
+2105=CSliderCtrl::Create
+2106=CSpinButtonCtrl::Create
+2107=CSplitterWnd::Create
+2108=CStatic::Create
+2109=CStatusBar::Create
+2110=CStatusBarCtrl::Create
+2111=CTabCtrl::Create
+2112=CToolBar::Create
+2113=CToolBarCtrl::Create
+2114=CToolTipCtrl::Create
+2115=CTreeCtrl::Create
+2116=CWnd::Create
+2117=CMonikerFile::CreateBindContext
+2118=CMonikerFile::CreateBindHost
+2119=CMDIFrameWnd::CreateClient
+2120=CRichEditDoc::CreateClientItem
+2121=COleClientItem::CreateCloneFrom
+2122=CSplitterWnd::CreateCommon
+2123=CConnectionPoint::CreateConnectionArray
+2124=COccManager::CreateContainer
+2125=COleControlContainer::CreateControl
+2126=COleControlSite::CreateControl
+2127=CWnd::CreateControl
+2128=CWnd::CreateControl
+2129=COleControl::CreateControlWindow
+2130=CBrush::CreateDIBPatternBrush
+2131=CFtpConnection::CreateDirectoryW
+2132=COleDispatchDriver::CreateDispatch
+2133=COleDispatchDriver::CreateDispatch
+2134=CWnd::CreateDlg
+2135=COccManager::CreateDlgControl
+2136=COccManager::CreateDlgControls
+2137=COccManager::CreateDlgControls
+2138=CWnd::CreateDlgIndirect
+2139=CWnd::CreateDlgIndirect
+2140=CListCtrl::CreateDragImage
+2141=CTreeCtrl::CreateDragImage
+2142=CPictureHolder::CreateEmpty
+2143=CMiniFrameWnd::CreateEx
+2144=CWnd::CreateEx
+2145=CDaoTableDef::CreateField
+2146=CDaoTableDef::CreateField
+2147=CFrameWnd::CreateFloatingFrame
+2148=COleControl::CreateFrameWindow
+2149=CPictureHolder::CreateFromBitmap
+2150=CPictureHolder::CreateFromBitmap
+2151=CPictureHolder::CreateFromBitmap
+2152=COleClientItem::CreateFromClipboard
+2153=COleClientItem::CreateFromData
+2154=COleClientItem::CreateFromFile
+2155=CPictureHolder::CreateFromIcon
+2156=CPictureHolder::CreateFromIcon
+2157=CPictureHolder::CreateFromMetafile
+2158=CDaoTableDef::CreateIndex
+2159=CDialog::CreateIndirect
+2160=CDialog::CreateIndirect
+2161=CDialog::CreateIndirect
+2162=CDialog::CreateIndirect
+2163=COleServerDoc::CreateInPlaceFrame
+2164=AFX_COM::CreateInstance
+2165=COleObjectFactory::XClassFactory::CreateInstance
+2166=COleObjectFactory::XClassFactory::CreateInstanceLic
+2167=COleInsertDialog::CreateItem
+2168=COlePasteSpecialDialog::CreateItem
+2169=COleClientItem::CreateLinkFromClipboard
+2170=COleClientItem::CreateLinkFromData
+2171=COleClientItem::CreateLinkFromFile
+2172=CGopherConnection::CreateLocator
+2173=CGopherConnection::CreateLocator
+2174=CGopherConnection::CreateLocator
+2175=COleStreamFile::CreateMemoryStream
+2176=CDocTemplate::CreateNewDocument
+2177=CDocTemplate::CreateNewFrame
+2178=COleClientItem::CreateNewItem
+2179=CProcessLocal<_AFX_PROPPAGEFONTINFO>::CreateObject
+2180=CProcessLocal<_AFX_BASE_MODULE_STATE>::CreateObject
+2181=CProcessLocal<_AFX_CHECKLIST_STATE>::CreateObject
+2182=CProcessLocal<_AFX_COLOR_STATE>::CreateObject
+2183=CProcessLocal<_AFX_CTL3D_STATE>::CreateObject
+2184=CProcessLocal<_AFX_DB_STATE>::CreateObject
+2185=CProcessLocal<_AFX_EDIT_STATE>::CreateObject
+2186=??CreateObject@?$CProcessLocal@V_AFX_EXTDLL_STATE@@@@SGPAVCNoTrackObject@@XZ@@YAXXZ
+2187=CProcessLocal<_AFX_MAIL_STATE>::CreateObject
+2188=CProcessLocal<_AFX_OLE_STATE>::CreateObject
+2189=CProcessLocal<_AFX_RICHEDIT_STATE>::CreateObject
+2190=CProcessLocal<_AFX_SOCK_STATE>::CreateObject
+2191=CProcessLocal<_AFX_WIN_STATE>::CreateObject
+2192=CProcessLocal<COccManager>::CreateObject
+2193=CThreadLocal<_AFX_CTL3D_THREAD>::CreateObject
+2194=CThreadLocal<_AFX_THREAD_STATE>::CreateObject
+2195=CThreadLocal<_AFXCTL_AMBIENT_CACHE>::CreateObject
+2196=CThreadLocal<AFX_MODULE_THREAD_STATE>::CreateObject
+2197=CByteArray::CreateObject
+2198=CColorPropPage::CreateObject
+2199=CDC::CreateObject
+2200=CDocItem::CreateObject
+2201=CDockState::CreateObject
+2202=CDWordArray::CreateObject
+2203=CEditView::CreateObject
+2204=CFontPropPage::CreateObject
+2205=CFrameWnd::CreateObject
+2206=CGdiObject::CreateObject
+2207=CImageList::CreateObject
+2208=CListView::CreateObject
+2209=CMapStringToOb::CreateObject
+2210=CMapStringToString::CreateObject
+2211=CMapWordToOb::CreateObject
+2212=CMDIChildWnd::CreateObject
+2213=CMDIFrameWnd::CreateObject
+2214=CMenu::CreateObject
+2215=CMiniDockFrameWnd::CreateObject
+2216=CMiniFrameWnd::CreateObject
+2217=CObArray::CreateObject
+2218=CObList::CreateObject
+2219=COleDocIPFrameWnd::CreateObject
+2220=COleIPFrameWnd::CreateObject
+2221=CPicturePropPage::CreateObject
+2222=CPreviewView::CreateObject
+2223=CRichEditCntrItem::CreateObject
+2224=CRichEditView::CreateObject
+2225=CRuntimeClass::CreateObject
+2226=CStringArray::CreateObject
+2227=CStringList::CreateObject
+2228=CTreeView::CreateObject
+2229=CWnd::CreateObject
+2230=CWordArray::CreateObject
+2231=COleControlContainer::CreateOleFont
+2232=CDocTemplate::CreateOleFrame
+2233=COleSafeArray::CreateOneDim
+2234=COleControlSite::CreateOrLoad
+2235=CFont::CreatePointFont
+2236=CFont::CreatePointFontIndirect
+2237=CPageSetupDialog::CreatePrinterDC
+2238=CPrintDialog::CreatePrinterDC
+2239=CWinApp::CreatePrinterDC
+2240=CDaoDatabase::CreateRelation
+2241=CDaoDatabase::CreateRelation
+2242=CSplitterWnd::CreateScrollBarCtrl
+2243=COccManager::CreateSite
+2244=CSplitterWnd::CreateStatic
+2245=COleClientItem::CreateStaticFromClipboard
+2246=COleClientItem::CreateStaticFromData
+2247=COleStreamFile::CreateStream
+2248=CWinThread::CreateThread
+2249=COleControl::CreateTracker
+2250=CFrameWnd::CreateView
+2251=CSplitterWnd::CreateView
+2252=CDocObjectServer::XOleDocument::CreateView
+2253=COleControl::CreateWindowForSubclassedControl
+2254=COleControl::XDataObject::DAdvise
+2255=COleDataSource::XDataObject::DAdvise
+2256=COleServerDoc::XDataObject::DAdvise
+2257=COleServerItem::XDataObject::DAdvise
+2258=DDP_Check
+2259=DDP_EndCheck
+2260=DDP_EndRadio
+2261=DDP_EndText
+2262=DDP_EndText
+2263=DDP_EndText
+2264=DDP_EndText
+2265=DDP_EndText
+2266=DDP_EndText
+2267=DDP_EndText
+2268=DDP_EndText
+2269=DDP_EndText
+2270=DDP_PostProcessing
+2271=DDP_Radio
+2272=DDP_Text
+2273=DDP_Text
+2274=DDP_Text
+2275=DDP_Text
+2276=DDP_Text
+2277=DDP_Text
+2278=DDP_Text
+2279=DDP_Text
+2280=DDP_Text
+2281=DDV_MaxChars
+2282=DDV_MinMaxByte
+2283=DDV_MinMaxDouble
+2284=DDV_MinMaxDWord
+2285=DDV_MinMaxFloat
+2286=DDV_MinMaxInt
+2287=DDV_MinMaxLong
+2288=DDV_MinMaxShort
+2289=DDV_MinMaxUInt
+2290=DDX_CBIndex
+2291=DDX_CBString
+2292=DDX_CBStringExact
+2293=DDX_Check
+2294=DDX_Control
+2295=DDX_FieldCBIndex
+2296=DDX_FieldCBIndex
+2297=DDX_FieldCBString
+2298=DDX_FieldCBString
+2299=DDX_FieldCBStringExact
+2300=DDX_FieldCBStringExact
+2301=DDX_FieldCheck
+2302=DDX_FieldCheck
+2303=DDX_FieldLBIndex
+2304=DDX_FieldLBIndex
+2305=DDX_FieldLBString
+2306=DDX_FieldLBString
+2307=DDX_FieldLBStringExact
+2308=DDX_FieldLBStringExact
+2309=DDX_FieldRadio
+2310=DDX_FieldRadio
+2311=DDX_FieldScroll
+2312=DDX_FieldScroll
+2313=DDX_FieldText
+2314=DDX_FieldText
+2315=DDX_FieldText
+2316=DDX_FieldText
+2317=DDX_FieldText
+2318=DDX_FieldText
+2319=DDX_FieldText
+2320=DDX_FieldText
+2321=DDX_FieldText
+2322=DDX_FieldText
+2323=DDX_FieldText
+2324=DDX_FieldText
+2325=DDX_FieldText
+2326=DDX_FieldText
+2327=DDX_FieldText
+2328=DDX_FieldText
+2329=DDX_FieldText
+2330=DDX_FieldText
+2331=DDX_LBIndex
+2332=DDX_LBString
+2333=DDX_LBStringExact
+2334=DDX_OCBool
+2335=DDX_OCBoolRO
+2336=DDX_OCColor
+2337=DDX_OCColorRO
+2338=DDX_OCFloat
+2339=DDX_OCFloat
+2340=DDX_OCFloatRO
+2341=DDX_OCFloatRO
+2342=DDX_OCInt
+2343=DDX_OCInt
+2344=DDX_OCIntRO
+2345=DDX_OCIntRO
+2346=DDX_OCShort
+2347=DDX_OCShortRO
+2348=DDX_OCText
+2349=DDX_OCTextRO
+2350=DDX_Radio
+2351=DDX_Scroll
+2352=DDX_Text
+2353=DDX_Text
+2354=DDX_Text
+2355=DDX_Text
+2356=DDX_Text
+2357=DDX_Text
+2358=DDX_Text
+2359=DDX_Text
+2360=DDX_Text
+2361=DDX_Text
+2362=DDX_Text
+2363=COleClientItem::Deactivate
+2364=COlePropertyPage::XPropertyPage::Deactivate
+2365=COleServerDoc::DeactivateAndUndo
+2366=COleClientItem::XOleIPSite::DeactivateAndUndo
+2367=COleControlSite::XOleIPSite::DeactivateAndUndo
+2368=COleClientItem::DeactivateUI
+2369=CDaoFieldExchange::Default
+2370=CFieldExchange::Default
+2371=CWnd::Default
+2372=CRect::DeflateRect
+2373=CRect::DeflateRect
+2374=CMDIChildWnd::DefWindowProcW
+2375=CMDIFrameWnd::DefWindowProcW
+2376=COleControl::DefWindowProcW
+2377=CWnd::DefWindowProcW
+2378=COleDataSource::DelayRenderData
+2379=COleDataSource::DelayRenderFileData
+2380=COleDataSource::DelaySetData
+2381=CControlBar::DelayShow
+2382=CFrameWnd::DelayUpdateFrameMenu
+2383=CMDIFrameWnd::DelayUpdateFrameMenu
+2384=CDaoRecordset::Delete
+2385=CException::Delete
+2386=COleClientItem::Delete
+2387=CRecordset::Delete
+2388=CWinThread::Delete
+2389=CDaoFieldExchange::DeleteCacheValue
+2390=CSplitterWnd::DeleteColumn
+2391=CDocument::DeleteContents
+2392=CEditView::DeleteContents
+2393=COleDocument::DeleteContents
+2394=COleServerDoc::DeleteContents
+2395=CRichEditDoc::DeleteContents
+2396=CRichEditView::DeleteContents
+2397=CDC::DeleteDC
+2398=CDaoTableDef::DeleteField
+2399=CDaoTableDef::DeleteField
+2400=CImageList::DeleteImageList
+2401=CDaoTableDef::DeleteIndex
+2402=CDaoTableDef::DeleteIndex
+2403=CComboBox::DeleteItem
+2404=CFontComboBox::DeleteItem
+2405=CListBox::DeleteItem
+2406=CGdiObject::DeleteObject
+2407=CRichEditView::XRichEditOleCallback::DeleteObject
+2408=CDaoDatabase::DeleteQueryDef
+2409=CDaoDatabase::DeleteRelation
+2410=CSplitterWnd::DeleteRow
+2411=CDaoDatabase::DeleteTableDef
+2412=CHandleMap::DeleteTemp
+2413=CDC::DeleteTempMap
+2414=CGdiObject::DeleteTempMap
+2415=CImageList::DeleteTempMap
+2416=CMenu::DeleteTempMap
+2417=CWnd::DeleteTempMap
+2418=CRichEditDoc::DeleteUnmarkedItems
+2419=CThreadSlotData::DeleteValues
+2420=CThreadSlotData::DeleteValues
+2421=CSplitterWnd::DeleteView
+2422=CWinApp::DelRegTree
+2423=CToolTipCtrl::DelTool
+2424=COleSafeArray::Destroy
+2425=COleControlSite::DestroyControl
+2426=COleSafeArray::DestroyData
+2427=COleSafeArray::DestroyDescriptor
+2428=CFrameWnd::DestroyDockBars
+2429=COleServerDoc::DestroyInPlaceFrame
+2430=CMenu::DestroyMenu
+2431=COleControl::DestroySharedMenu
+2432=COleDocIPFrameWnd::DestroySharedMenu
+2433=COleIPFrameWnd::DestroySharedMenu
+2434=CToolTipCtrl::DestroyToolTipCtrl
+2435=COleControl::DestroyTracker
+2436=CControlBar::DestroyWindow
+2437=CMDIChildWnd::DestroyWindow
+2438=CWnd::DestroyWindow
+2439=DestructElements
+2440=DestructElements
+2441=CAsyncSocket::Detach
+2442=CDC::Detach
+2443=CDialogTemplate::Detach
+2444=CGdiObject::Detach
+2445=CImageList::Detach
+2446=CMemFile::Detach
+2447=CMenu::Detach
+2448=CMonikerFile::Detach
+2449=COleDataObject::Detach
+2450=COleSafeArray::Detach
+2451=COleStreamFile::Detach
+2452=COleVariant::Detach
+2453=CSharedFile::Detach
+2454=CWindowlessDC::Detach
+2455=CWnd::Detach
+2456=COleDispatchDriver::DetachDispatch
+2457=CAsyncSocket::DetachHandle
+2458=COleControlSite::DetachWindow
+2459=CWinApp::DevModeChange
+2460=DFX_Binary
+2461=DFX_Bool
+2462=DFX_Byte
+2463=DFX_Currency
+2464=DFX_DateTime
+2465=DFX_Double
+2466=DFX_Long
+2467=DFX_LongBinary
+2468=DFX_Short
+2469=DFX_Single
+2470=DFX_Text
+2471=COleControlSite::XNotifyDBEvents::DidEvent
+2472=COleServerDoc::DiscardUndoState
+2473=COleClientItem::XOleIPSite::DiscardUndoState
+2474=COleControlSite::XOleIPSite::DiscardUndoState
+2475=COleDispatchImpl::Disconnect
+2476=COleControlSite::DisconnectSink
+2477=CDocument::DisconnectViews
+2478=AFX_DISPMAPconstCCmdTarget::dispatchMap
+2479=CWinThread::DispatchThreadMessage
+2480=COleControl::DisplayError
+2481=CDocObjectServer::DoBeginPrinting
+2482=CRecordset::DoBulkFieldExchange
+2483=CAsyncSocket::DoCallBack
+2484=COleChangeIconDialog::DoChangeIcon
+2485=CDockBar::DockControlBar
+2486=CFrameWnd::DockControlBar
+2487=CFrameWnd::DockControlBar
+2488=COleControl::DoClick
+2489=COleFrameHook::DoContextSensitiveHelp
+2490=COleConvertDialog::DoConvert
+2491=CColorPropPage::DoDataExchange
+2492=CFontPropPage::DoDataExchange
+2493=CPicturePropPage::DoDataExchange
+2494=CWnd::DoDataExchange
+2495=COleClientItem::DoDragDrop
+2496=COleDataSource::DoDragDrop
+2497=COleServerItem::DoDragDrop
+2498=COleFrameHook::DoEnableModeless
+2499=CDocObjectServer::DoEndPrinting
+2500=CDaoRecordset::DoFieldExchange
+2501=CRecordset::DoFieldExchange
+2502=CDocument::DoFileSave
+2503=CSplitterWnd::DoKeyboardSplit
+2504=CWinApp::DoMessageBox
+2505=CColorDialog::DoModal
+2506=CDialog::DoModal
+2507=CFileDialog::DoModal
+2508=CFontDialog::DoModal
+2509=COleBusyDialog::DoModal
+2510=COleChangeIconDialog::DoModal
+2511=COleChangeSourceDialog::DoModal
+2512=COleConvertDialog::DoModal
+2513=COleInsertDialog::DoModal
+2514=COleLinksDialog::DoModal
+2515=COlePasteSpecialDialog::DoModal
+2516=COlePropertiesDialog::DoModal
+2517=COleUpdateDialog::DoModal
+2518=CPageSetupDialog::DoModal
+2519=CPrintDialog::DoModal
+2520=CPropertySheet::DoModal
+2521=CCmdTarget::DoOleVerb
+2522=CControlBar::DoPaint
+2523=CDockBar::DoPaint
+2524=CRichEditView::DoPaste
+2525=CDocObjectServer::DoPrepareDC
+2526=CDocObjectServer::DoPreparePrinting
+2527=CView::DoPreparePrinting
+2528=CDocObjectServer::DoPrint
+2529=CWinApp::DoPrintDialog
+2530=CView::DoPrintPreview
+2531=CDocManager::DoPromptFileName
+2532=CWinApp::DoPromptFileName
+2533=COleControl::DoPropExchange
+2534=CDocument::DoSave
+2535=CSplitterWnd::DoScroll
+2536=CSplitterWnd::DoScrollBy
+2537=COleControl::DoSuperclassPaint
+2538=CCmdUI::DoUpdate
+2539=COleCmdUI::DoUpdate
+2540=COleClientItem::DoVerb
+2541=COleControlSite::DoVerb
+2542=CDocObjectServer::XOleObject::DoVerb
+2543=COleControl::XOleObject::DoVerb
+2544=COleServerDoc::XOleObject::DoVerb
+2545=COleServerItem::XOleObject::DoVerb
+2546=CWinApp::DoWaitCursor
+2547=CPreviewView::DoZoom
+2548=CDC::DPtoHIMETRIC
+2549=CDC::DPtoLP
+2550=CWnd::DragAcceptFiles
+2551=COleDropTarget::XDropTarget::DragEnter
+2552=CDragListBox::Dragging
+2553=COleDropTarget::XDropTarget::DragLeave
+2554=COleDropTarget::XDropTarget::DragOver
+2555=COleClientItem::Draw
+2556=CRectTracker::Draw
+2557=COleControl::XViewObject::Draw
+2558=CDC::Draw3dRect
+2559=CDC::Draw3dRect
+2560=CSplitterWnd::DrawAllSplitBars
+2561=CControlBar::DrawBorders
+2562=COleControl::DrawContent
+2563=CDC::DrawDragRect
+2564=CDockContext::DrawFocusRect
+2565=CDragListBox::DrawInsert
+2566=CBitmapButton::DrawItem
+2567=CButton::DrawItem
+2568=CCheckListBox::DrawItem
+2569=CColorButton::DrawItem
+2570=CComboBox::DrawItem
+2571=CFontComboBox::DrawItem
+2572=CHeaderCtrl::DrawItem
+2573=CListBox::DrawItem
+2574=CListCtrl::DrawItem
+2575=CListView::DrawItem
+2576=CMenu::DrawItem
+2577=CStatusBar::DrawItem
+2578=CStatusBarCtrl::DrawItem
+2579=CTabCtrl::DrawItem
+2580=COleControl::DrawMetafile
+2581=CDragListBox::DrawSingle
+2582=CDC::DrawTextW
+2583=CMetaFileDC::DrawTextW
+2584=CPreviewDC::DrawTextW
+2585=CRectTracker::DrawTrackerRect
+2586=COleDropTarget::XDropTarget::Drop
+2587=CDragListBox::Dropped
+2588=CObject::Dump
+2589=COleControl::XDataObject::DUnadvise
+2590=COleDataSource::XDataObject::DUnadvise
+2591=COleServerDoc::XDataObject::DUnadvise
+2592=COleServerItem::XDataObject::DUnadvise
+2593=CFile::Duplicate
+2594=CInternetFile::Duplicate
+2595=CMemFile::Duplicate
+2596=COleStreamFile::Duplicate
+2597=CSocketFile::Duplicate
+2598=CStdioFile::Duplicate
+2599=ulongconstCEditView::dwStyleDefault
+2600=CDaoRecordset::Edit
+2601=CRecordset::Edit
+2602=COlePropertyPage::XPropertyPage::EditProperty
+2603=CRichEditView::EditStreamCallBack
+2604=CDBException::Empty
+2605=COleDataSource::Empty
+2606=CString::Empty
+2607=CCheckListBox::Enable
+2608=CCmdUI::Enable
+2609=COleCmdUI::Enable
+2610=CStatusCmdUI::Enable
+2611=CTestCmdUI::Enable
+2612=CToolCmdUI::Enable
+2613=CWinApp::Enable3dControls
+2614=CCmdTarget::EnableAggregation
+2615=CCmdTarget::EnableAutomation
+2616=CRecordset::EnableBookmarks
+2617=CCmdTarget::EnableConnections
+2618=CControlBar::EnableDocking
+2619=CFrameWnd::EnableDocking
+2620=COleControlSite::EnableDSC
+2621=CWinApp::EnableModeless
+2622=COleControl::XOleInPlaceActiveObject::EnableModeless
+2623=COleServerDoc::XOleInPlaceActiveObject::EnableModeless
+2624=COleFrameHook::XOleInPlaceFrame::EnableModeless
+2625=COleControlContainer::XOleIPFrame::EnableModeless
+2626=CWnd::EnableScrollBarCtrl
+2627=CWinApp::EnableShellOpen
+2628=COleControl::EnableSimpleFrame
+2629=CPropertySheet::EnableStackedTabs
+2630=CInternetSession::EnableStatusCallback
+2631=CWnd::EnableToolTips
+2632=CCmdTarget::EnableTypeLib
+2633=COleControlSite::EnableWindow
+2634=CWnd::EnableWindow
+2635=COleMessageFilter::EndBusyState
+2636=COleLinkingDoc::EndDeferErrors
+2637=CDialog::EndDialog
+2638=CPropertySheet::EndDialog
+2639=CDockContext::EndDrag
+2640=CWnd::EndModalLoop
+2641=CFrameWnd::EndModalState
+2642=CWnd::EndModalState
+2643=CDockContext::EndResize
+2644=CCmdTarget::EndWaitCursor
+2645=COleDataObject::EnsureClipboardObject
+2646=CDocObjectServer::XOleObject::EnumAdvise
+2647=COleControl::XOleObject::EnumAdvise
+2648=COleServerDoc::XOleObject::EnumAdvise
+2649=COleServerItem::XOleObject::EnumAdvise
+2650=COleControl::XOleCache::EnumCache
+2651=COlePropertyPage::EnumChildProc
+2652=COleConnPtContainer::EnumConnectionPoints
+2653=CConnectionPoint::XConnPt::EnumConnections
+2654=COlePropertyPage::EnumControls
+2655=COleControl::XDataObject::EnumDAdvise
+2656=COleDataSource::XDataObject::EnumDAdvise
+2657=COleServerDoc::XDataObject::EnumDAdvise
+2658=COleServerItem::XDataObject::EnumDAdvise
+2659=CFontPropPage::EnumFontFamiliesCallBack
+2660=CFontPropPage::EnumFontFamiliesCallBack2
+2661=COleControl::XDataObject::EnumFormatEtc
+2662=COleDataSource::XDataObject::EnumFormatEtc
+2663=COleServerDoc::XDataObject::EnumFormatEtc
+2664=COleServerItem::XDataObject::EnumFormatEtc
+2665=COleControlContainer::XOleContainer::EnumObjects
+2666=COleLinkingDoc::XOleItemContainer::EnumObjects
+2667=CCmdTarget::EnumOleVerbs
+2668=CDocObjectServer::XOleObject::EnumVerbs
+2669=COleControl::XOleObject::EnumVerbs
+2670=COleServerDoc::XOleObject::EnumVerbs
+2671=COleServerItem::XOleObject::EnumVerbs
+2672=CDocObjectServer::XOleDocument::EnumViews
+2673=CControlBar::EraseNonClient
+2674=CFileException::ErrnoToException
+2675=CHttpFile::ErrorDlg
+2676=CDC::Escape
+2677=CMetaFileDC::Escape
+2678=CPreviewDC::Escape
+2679=AFX_EVENTMAPconstCOleControl::eventMap
+2680=AFX_EVENTSINKMAPconstCCmdTarget::eventsinkMap
+2681=CArchivePropExchange::ExchangeBlobProp
+2682=CAsyncPropExchange::ExchangeBlobProp
+2683=CPropbagPropExchange::ExchangeBlobProp
+2684=CPropsetPropExchange::ExchangeBlobProp
+2685=CResetPropExchange::ExchangeBlobProp
+2686=COleControl::ExchangeExtent
+2687=CArchivePropExchange::ExchangeFontProp
+2688=CAsyncPropExchange::ExchangeFontProp
+2689=CPropbagPropExchange::ExchangeFontProp
+2690=CPropsetPropExchange::ExchangeFontProp
+2691=CResetPropExchange::ExchangeFontProp
+2692=CArchivePropExchange::ExchangePersistentProp
+2693=CAsyncPropExchange::ExchangePersistentProp
+2694=CPropbagPropExchange::ExchangePersistentProp
+2695=CPropsetPropExchange::ExchangePersistentProp
+2696=CResetPropExchange::ExchangePersistentProp
+2697=CArchivePropExchange::ExchangeProp
+2698=CAsyncPropExchange::ExchangeProp
+2699=CPropbagPropExchange::ExchangeProp
+2700=CPropsetPropExchange::ExchangeProp
+2701=CResetPropExchange::ExchangeProp
+2702=COleControl::ExchangeStockProps
+2703=CAsyncPropExchange::ExchangeVersion
+2704=CPropExchange::ExchangeVersion
+2705=CDC::ExcludeClipRect
+2706=CDC::ExcludeClipRect
+2707=CDocObjectServer::XOleCommandTarget::Exec
+2708=CDaoDatabase::Execute
+2709=CDaoQueryDef::Execute
+2710=CWnd::ExecuteDlgInit
+2711=CWnd::ExecuteDlgInit
+2712=CRecordset::ExecuteSetPosUpdate
+2713=CDatabase::ExecuteSQL
+2714=CRecordset::ExecuteUpdateSQL
+2715=CFrameWnd::ExitHelpMode
+2716=COleControlModule::ExitInstance
+2717=CWinApp::ExitInstance
+2718=CWinThread::ExitInstance
+2719=CCmdTarget::ExternalAddRef
+2720=CCmdTarget::ExternalDisconnect
+2721=CCmdTarget::ExternalQueryInterface
+2722=CCmdTarget::ExternalRelease
+2723=CDC::ExtTextOutW
+2724=CMetaFileDC::ExtTextOutW
+2725=CPreviewDC::ExtTextOutW
+2726=CColorPropPage::CColorPropPageFactoryCColorPropPage::factory
+2727=CFontPropPage::CFontPropPageFactoryCFontPropPage::factory
+2728=CPicturePropPage::CPicturePropPageFactoryCPicturePropPage::factory
+2729=CDataExchange::Fail
+2730=COleControlSite::XNotifyDBEvents::FailedToDo
+2731=CRecordset::FetchData
+2732=CArchive::FillBuffer
+2733=CDaoRecordset::FillCache
+2734=CDaoWorkspace::FillDatabaseInfo
+2735=CDaoException::FillErrorInfo
+2736=CFontPropPage::FillFacenameList
+2737=CFontDialog::FillInLogFont
+2738=CToolTipCtrl::FillInToolInfo
+2739=CScrollView::FillOutsideRect
+2740=CDaoQueryDef::FillParameterInfo
+2741=CStockPropPage::FillPropnameList
+2742=CDaoDatabase::FillQueryDefInfo
+2743=CDaoDatabase::FillRelationInfo
+2744=CFontPropPage::FillSizeList
+2745=CDC::FillSolidRect
+2746=CDC::FillSolidRect
+2747=CColorPropPage::FillSysColors
+2748=CDaoDatabase::FillTableDefInfo
+2749=CDaoFieldExchange::FillVariant
+2750=CDaoWorkspace::FillWorkspaceInfo
+2751=CWnd::FilterToolTipMessage
+2752=CDaoRecordset::Find
+2753=CObList::Find
+2754=CPtrList::Find
+2755=CString::Find
+2756=CString::Find
+2757=CStringList::Find
+2758=CRichEditView::FindAndSelect
+2759=CDockBar::FindBar
+2760=COleConnPtContainer::FindConnectionPoint
+2761=??FindDlgItem@@YAPAVCWnd@@PAV1@K@Z@@YAXXZ
+2762=CFileFind::FindFile
+2763=CFtpFileFind::FindFile
+2764=CGopherFileFind::FindFile
+2765=CGopherFileFind::FindFile
+2766=CDaoRecordset::FindFirst
+2767=CObList::FindIndex
+2768=CPtrList::FindIndex
+2769=CStringList::FindIndex
+2770=COleControlContainer::FindItem
+2771=CDaoRecordset::FindLast
+2772=CDaoRecordset::FindNext
+2773=CFileFind::FindNextFileW
+2774=CFtpFileFind::FindNextFileW
+2775=CGopherFileFind::FindNextFileW
+2776=CString::FindOneOf
+2777=CPreviewView::FindPageRect
+2778=CDaoRecordset::FindPrev
+2779=CRecordset::FindSQLToken
+2780=CRichEditView::FindTextSimple
+2781=CRichEditView::FindTextSimple
+2782=CEditView::FindTextW
+2783=CRichEditView::FindTextW
+2784=CRichEditView::FindTextW
+2785=COleClientItem::FinishCreate
+2786=COleControl::FireError
+2787=COleControl::FireEvent
+2788=COleControlSite::XNotifyDBEvents::FireEvent
+2789=COleControl::FireEventV
+2790=CDaoRecordset::Fixup
+2791=CRecordset::Fixups
+2792=CFrameWnd::FloatControlBar
+2793=CArchive::Flush
+2794=CDumpContext::Flush
+2795=CFile::Flush
+2796=CInternetFile::Flush
+2797=CMemFile::Flush
+2798=COleStreamFile::Flush
+2799=CSocketFile::Flush
+2800=CStdioFile::Flush
+2801=COleDataSource::FlushClipboard
+2802=CRecordset::FlushResultSet
+2803=COleCurrency::Format
+2804=COleDateTime::Format
+2805=COleDateTime::Format
+2806=COleDateTime::Format
+2807=COleDateTimeSpan::Format
+2808=COleDateTimeSpan::Format
+2809=CString::Format
+2810=CString::Format
+2811=CTime::Format
+2812=CTime::Format
+2813=CTime::Format
+2814=CTimeSpan::Format
+2815=CTimeSpan::Format
+2816=CTimeSpan::Format
+2817=CTime::FormatGmt
+2818=CTime::FormatGmt
+2819=CTime::FormatGmt
+2820=CString::FormatMessageW
+2821=CString::FormatMessageW
+2822=CString::FormatV
+2823=COleControl::ForwardActivationMsg
+2824=CDatabase::Free
+2825=CMemFile::Free
+2826=CSharedFile::Free
+2827=CMapPtrToPtr::FreeAssoc
+2828=CMapPtrToWord::FreeAssoc
+2829=CMapStringToOb::FreeAssoc
+2830=CMapStringToPtr::FreeAssoc
+2831=CMapStringToString::FreeAssoc
+2832=CMapWordToOb::FreeAssoc
+2833=CMapWordToPtr::FreeAssoc
+2834=CDaoRecordset::FreeCache
+2835=CRecordset::FreeDataCache
+2836=CPlex::FreeDataChain
+2837=CByteArray::FreeExtra
+2838=CDWordArray::FreeExtra
+2839=CObArray::FreeExtra
+2840=CPtrArray::FreeExtra
+2841=CString::FreeExtra
+2842=CStringArray::FreeExtra
+2843=CUIntArray::FreeExtra
+2844=CWordArray::FreeExtra
+2845=CObList::FreeNode
+2846=CPtrList::FreeNode
+2847=CStringList::FreeNode
+2848=CRecordset::FreeRowset
+2849=CThreadSlotData::FreeSlot
+2850=CProperty::FreeValue
+2851=COleControl::XViewObject::Freeze
+2852=COleControl::XOleControl::FreezeEvents
+2853=COleClientItem::FreezeLink
+2854=CDC::FromHandle
+2855=CGdiObject::FromHandle
+2856=CHandleMap::FromHandle
+2857=CImageList::FromHandle
+2858=CMenu::FromHandle
+2859=CWnd::FromHandle
+2860=CImageList::FromHandlePermanent
+2861=CMenu::FromHandlePermanent
+2862=CWnd::FromHandlePermanent
+2863=CCmdTarget::FromIDispatch
+2864=CProperty::Get
+2865=CProperty::Get
+2866=CPropertySection::Get
+2867=CPropertySection::Get
+2868=CPropertySet::Get
+2869=CPropertySet::Get
+2870=CDaoRecordset::GetAbsolutePosition
+2871=COleControl::GetActivationPolicy
+2872=COleControl::XPointerInactive::GetActivationPolicy
+2873=CFrameWnd::GetActiveDocument
+2874=CFrameWnd::GetActiveFrame
+2875=CMDIFrameWnd::GetActiveFrame
+2876=CPropertySheet::GetActiveIndex
+2877=CPropertySheet::GetActivePage
+2878=CSplitterWnd::GetActivePane
+2879=CFrameWnd::GetActiveView
+2880=COleControl::XViewObject::GetAdvise
+2881=COleControl::GetAmbientDispatchDriver
+2882=COleControlContainer::GetAmbientProp
+2883=COleControl::GetAmbientProperty
+2884=COleControl::GetAppearance
+2885=CWinApp::GetAppRegistryKey
+2886=CMapPtrToPtr::GetAssocAt
+2887=CMapPtrToWord::GetAssocAt
+2888=CMapStringToOb::GetAssocAt
+2889=CMapStringToPtr::GetAssocAt
+2890=CMapStringToString::GetAssocAt
+2891=CMapWordToOb::GetAssocAt
+2892=CMapWordToPtr::GetAssocAt
+2893=CStringArray::GetAt
+2894=CGopherConnection::GetAttribute
+2895=CDaoTableDef::GetAttributes
+2896=COleControl::GetBackColor
+2897=CControlBar::GetBarInfo
+2898=CDockBar::GetBarInfo
+2899=CAsyncMonikerFile::GetBindInfo
+2900=CBlobProperty::GetBlob
+2901=CDaoRecordset::GetBookmark
+2902=CRecordset::GetBookmark
+2903=COleFrameHook::XOleInPlaceFrame::GetBorder
+2904=COleControlContainer::XOleIPFrame::GetBorder
+2905=CStatusBarCtrl::GetBorders
+2906=COleControl::GetBorderStyle
+2907=CDataSourceControl::GetBoundClientRow
+2908=CRecordset::GetBoundFieldIndex
+2909=CRecordset::GetBoundParamIndex
+2910=CString::GetBuffer
+2911=CEditView::GetBufferLength
+2912=CFile::GetBufferPtr
+2913=CMemFile::GetBufferPtr
+2914=CString::GetBufferSetLength
+2915=CToolBar::GetButtonInfo
+2916=CToolBar::GetButtonStyle
+2917=CToolBar::GetButtonText
+2918=CToolBar::GetButtonText
+2919=CPropertySet::GetByteOrder
+2920=COleClientItem::GetCachedExtent
+2921=COleDataSource::GetCacheEntry
+2922=CDaoRecordset::GetCacheSize
+2923=CDaoRecordset::GetCacheStart
+2924=CDaoFieldExchange::GetCacheValue
+2925=COleControl::XDataObject::GetCanonicalFormatEtc
+2926=COleDataSource::XDataObject::GetCanonicalFormatEtc
+2927=COleServerDoc::XDataObject::GetCanonicalFormatEtc
+2928=COleServerItem::XDataObject::GetCanonicalFormatEtc
+2929=COleControl::GetCapture
+2930=CFontDialog::GetCharFormat
+2931=CRichEditView::GetCharFormatSelection
+2932=CCheckListBox::GetCheck
+2933=CWnd::GetCheckedRadioButton
+2934=CBlobProperty::GetClassID
+2935=CColorPropPage::GetClassID
+2936=CFontPropPage::GetClassID
+2937=COleClientItem::GetClassID
+2938=CPicturePropPage::GetClassID
+2939=CPropertySet::GetClassID
+2940=COleLinkingDoc::XPersistFile::GetClassID
+2941=COleControl::XPersistMemory::GetClassID
+2942=COleControl::XPersistPropertyBag::GetClassID
+2943=COleControl::XPersistStorage::GetClassID
+2944=COleServerDoc::XPersistStorage::GetClassID
+2945=COleControl::XPersistStreamInit::GetClassID
+2946=COleControl::XProvideClassInfo::GetClassInfoW
+2947=AFX_COM::GetClassObject
+2948=COleControl::GetClientOffset
+2949=COleControl::GetClientRect
+2950=COleClientItem::GetClientSite
+2951=COleControl::GetClientSite
+2952=CRichEditCntrItem::GetClientSite
+2953=CDocObjectServer::XOleObject::GetClientSite
+2954=COleControl::XOleObject::GetClientSite
+2955=COleServerDoc::XOleObject::GetClientSite
+2956=COleServerItem::XOleObject::GetClientSite
+2957=COleClientItem::GetClipboardData
+2958=COleServerItem::GetClipboardData
+2959=CRichEditView::GetClipboardData
+2960=CDocObjectServer::XOleObject::GetClipboardData
+2961=COleControl::XOleObject::GetClipboardData
+2962=COleServerDoc::XOleObject::GetClipboardData
+2963=COleServerItem::XOleObject::GetClipboardData
+2964=CRichEditView::XRichEditOleCallback::GetClipboardData
+2965=COleDataSource::GetClipboardOwner
+2966=CDC::GetClipBox
+2967=CMetaFileDC::GetClipBox
+2968=CColorPropPage::GetColorProp
+2969=COleControl::XViewObject::GetColorSet
+2970=CSplitterWnd::GetColumnInfo
+2971=CCmdTarget::GetCommandMap
+2972=CDaoDatabase::GetConnect
+2973=CDaoQueryDef::GetConnect
+2974=CDaoTableDef::GetConnect
+2975=CDatabase::GetConnectInfo
+2976=CConnectionPoint::GetConnectionCount
+2977=CCmdTarget::GetConnectionHook
+2978=COleControl::GetConnectionHook
+2979=CConnectionPoint::XConnPt::GetConnectionInterface
+2980=CCmdTarget::GetConnectionMap
+2981=COleControl::GetConnectionMap
+2982=CConnectionPoint::XConnPt::GetConnectionPointContainer
+2983=CConnectionPoint::GetConnections
+2984=CConnectionPoint::GetContainer
+2985=COleDocument::GetContainer
+2986=COleLinkingDoc::GetContainer
+2987=COleClientItem::XOleClientSite::GetContainer
+2988=COleControlSite::XOleClientSite::GetContainer
+2989=COleControl::XQuickActivate::GetContentExtent
+2990=CRichEditView::GetContextMenu
+2991=CRichEditView::XRichEditOleCallback::GetContextMenu
+2992=CFrameWnd::GetControlBar
+2993=COleControl::GetControlFlags
+2994=COleControlSite::GetControlInfo
+2995=COleControl::XOleControl::GetControlInfo
+2996=CDocObjectServer::GetControllingFrame
+2997=CCmdTarget::GetControllingUnknown
+2998=COleControl::GetControlSize
+2999=COlePropertyPage::GetControlStatus
+3000=CWnd::GetControlUnknown
+3001=COlePropertiesDialog::XOleUIObjInfo::GetConvertInfo
+3002=CPrintDialog::GetCopies
+3003=CPropertySection::GetCount
+3004=CPropertySet::GetCount
+3005=CFileFind::GetCreationTime
+3006=CFileFind::GetCreationTime
+3007=CGopherFileFind::GetCreationTime
+3008=CGopherFileFind::GetCreationTime
+3009=COleLinkingDoc::XPersistFile::GetCurFile
+3010=CFtpConnection::GetCurrentDirectoryAsURL
+3011=CFtpConnection::GetCurrentDirectoryAsURL
+3012=CFtpConnection::GetCurrentDirectoryW
+3013=CFtpConnection::GetCurrentDirectoryW
+3014=CFontDialog::GetCurrentFont
+3015=CDaoRecordset::GetCurrentIndex
+3016=CWnd::GetCurrentMessage
+3017=CFontComboBox::GetCurrentName
+3018=CDataBoundProperty::GetCursor
+3019=CDataSourceControl::GetCursor
+3020=COleControlSite::GetCursor
+3021=COleControlSite::XBoundObjectSite::GetCursor
+3022=COleDataObject::GetData
+3023=CProcessLocalObject::GetData
+3024=CRecordset::GetData
+3025=CThreadLocalObject::GetData
+3026=COleControl::XDataObject::GetData
+3027=COleDataSource::XDataObject::GetData
+3028=COleServerDoc::XDataObject::GetData
+3029=COleServerItem::XDataObject::GetData
+3030=CDaoRecordset::GetDataAndFixupNulls
+3031=CDaoWorkspace::GetDatabaseCount
+3032=CDaoWorkspace::GetDatabaseInfo
+3033=CDaoWorkspace::GetDatabaseInfo
+3034=CDatabase::GetDatabaseName
+3035=CRecordset::GetDataBuffer
+3036=COleControl::XDataObject::GetDataHere
+3037=COleDataSource::XDataObject::GetDataHere
+3038=COleServerDoc::XDataObject::GetDataHere
+3039=COleServerItem::XDataObject::GetDataHere
+3040=CThreadLocalObject::GetDataNA
+3041=COleServerItem::GetDataObject
+3042=COleControl::GetDataSource
+3043=CDaoQueryDef::GetDateCreated
+3044=CDaoRecordset::GetDateCreated
+3045=CDaoTableDef::GetDateCreated
+3046=CDaoQueryDef::GetDateLastUpdated
+3047=CDaoRecordset::GetDateLastUpdated
+3048=CDaoTableDef::GetDateLastUpdated
+3049=COleDateTime::GetDay
+3050=COleDateTime::GetDayOfWeek
+3051=COleDateTime::GetDayOfYear
+3052=COleControl::GetDC
+3053=CDocument::GetDefaultAccelerator
+3054=CFrameWnd::GetDefaultAccelerator
+3055=COleServerDoc::GetDefaultAccelerator
+3056=CRichEditCtrl::GetDefaultCharFormat
+3057=CRecordset::GetDefaultConnect
+3058=CDaoRecordset::GetDefaultDBName
+3059=CRecordset::GetDefaultFieldType
+3060=CDocument::GetDefaultMenu
+3061=COleServerDoc::GetDefaultMenu
+3062=CPrintDialog::GetDefaults
+3063=CDaoRecordset::GetDefaultSQL
+3064=CRecordset::GetDefaultSQL
+3065=COccManager::GetDefBtnCode
+3066=COleControlSite::GetDefBtnCode
+3067=CWnd::GetDescendantWindow
+3068=CPageSetupDialog::GetDeviceName
+3069=CPrintDialog::GetDeviceName
+3070=CScrollView::GetDeviceScrollPosition
+3071=CScrollView::GetDeviceScrollSizes
+3072=CPageSetupDialog::GetDevMode
+3073=CPrintDialog::GetDevMode
+3074=CCmdTarget::GetDispatchIID
+3075=COleControl::GetDispatchIID
+3076=CCmdTarget::GetDispatchMap
+3077=COleControlContainer::GetDispatchMap
+3078=CCmdTarget::GetDispEntry
+3079=CRecentFileList::GetDisplayName
+3080=CFontHolder::GetDisplayString
+3081=CPictureHolder::GetDisplayString
+3082=COleControl::XPerPropertyBrowsing::GetDisplayString
+3083=COleControlSite::GetDlgCtrlID
+3084=CWnd::GetDlgCtrlID
+3085=COleControlContainer::GetDlgItem
+3086=COleControlContainer::GetDlgItem
+3087=CWnd::GetDlgItem
+3088=CWnd::GetDlgItem
+3089=COleControlContainer::GetDlgItemInt
+3090=CWnd::GetDlgItemInt
+3091=COleControlContainer::GetDlgItemTextW
+3092=CWnd::GetDlgItemTextW
+3093=CWnd::GetDlgItemTextW
+3094=CDockContext::GetDockBar
+3095=CDockBar::GetDockedControlBar
+3096=CDockBar::GetDockedCount
+3097=CDockBar::GetDockedVisibleCount
+3098=CControlBar::GetDockingFrame
+3099=CFrameWnd::GetDockState
+3100=CDocObjectServer::XOleDocument::GetDocMiscStatus
+3101=COleServerDoc::GetDocObjectServer
+3102=CDocTemplate::GetDocString
+3103=CDocObjectServer::XOleDocumentView::GetDocument
+3104=CRichEditView::XRichEditOleCallback::GetDragDropEffect
+3105=CPageSetupDialog::GetDriverName
+3106=CPrintDialog::GetDriverName
+3107=COleControl::XOleInPlaceObject::GetDropTarget
+3108=CWnd::GetDSCCursor
+3109=CDaoRecordset::GetEditMode
+3110=COleSafeArray::GetElement
+3111=COleServerDoc::GetEmbeddedItem
+3112=COleClientItem::GetEmbeddedItemData
+3113=COleServerItem::GetEmbedSourceData
+3114=COleControl::GetEnabled
+3115=CCmdTarget::GetEntryCount
+3116=CDaoException::GetErrorCount
+3117=CDaoException::GetErrorInfo
+3118=CArchiveException::GetErrorMessage
+3119=CDaoException::GetErrorMessage
+3120=CDBException::GetErrorMessage
+3121=CException::GetErrorMessage
+3122=CFileException::GetErrorMessage
+3123=CInternetException::GetErrorMessage
+3124=COleDispatchException::GetErrorMessage
+3125=COleException::GetErrorMessage
+3126=CSimpleException::GetErrorMessage
+3127=COleControlSite::GetEventIID
+3128=COleControl::GetEventMap
+3129=COleControl::GetEventMapEntry
+3130=CCmdTarget::GetEventSinkEntry
+3131=CCmdTarget::GetEventSinkMap
+3132=COleControlSite::GetExStyle
+3133=CWnd::GetExStyle
+3134=COleControl::GetExtendedControl
+3135=COleControlSite::XOleControlSite::GetExtendedControl
+3136=COleClientItem::GetExtent
+3137=CDocObjectServer::XOleObject::GetExtent
+3138=COleControl::XOleObject::GetExtent
+3139=COleServerDoc::XOleObject::GetExtent
+3140=COleServerItem::XOleObject::GetExtent
+3141=COleControl::XViewObject::GetExtent
+3142=CCmdTarget::GetExtraConnectionPoints
+3143=COleControl::GetExtraConnectionPoints
+3144=CFontDialog::GetFaceName
+3145=CDaoQueryDef::GetFieldCount
+3146=CDaoRecordset::GetFieldCount
+3147=CDaoTableDef::GetFieldCount
+3148=CDaoRecordset::GetFieldIndex
+3149=CRecordset::GetFieldIndexByName
+3150=CDaoQueryDef::GetFieldInfo
+3151=CDaoQueryDef::GetFieldInfo
+3152=CDaoRecordset::GetFieldInfo
+3153=CDaoRecordset::GetFieldInfo
+3154=CDaoTableDef::GetFieldInfo
+3155=CDaoTableDef::GetFieldInfo
+3156=CDaoRecordset::GetFieldLength
+3157=CRecordset::GetFieldLengthBuffer
+3158=CRecordset::GetFieldStatus
+3159=CDaoRecordset::GetFieldValue
+3160=CDaoRecordset::GetFieldValue
+3161=CDaoRecordset::GetFieldValue
+3162=CDaoRecordset::GetFieldValue
+3163=CRecordset::GetFieldValue
+3164=CRecordset::GetFieldValue
+3165=CRecordset::GetFieldValue
+3166=CRecordset::GetFieldValue
+3167=CDocument::GetFile
+3168=CFtpConnection::GetFile
+3169=COleDataObject::GetFileData
+3170=CFileDialog::GetFileExt
+3171=CFile::GetFileName
+3172=CFileDialog::GetFileName
+3173=CFileFind::GetFileName
+3174=CGopherFileFind::GetFileName
+3175=CFile::GetFilePath
+3176=CFileFind::GetFilePath
+3177=CGopherFileFind::GetFilePath
+3178=CFile::GetFileTitle
+3179=CFileDialog::GetFileTitle
+3180=CFileFind::GetFileTitle
+3181=CGopherFileFind::GetFileTitle
+3182=COleServerDoc::GetFileTypeString
+3183=CFileFind::GetFileURL
+3184=CFtpFileFind::GetFileURL
+3185=CGopherFileFind::GetFileURL
+3186=CHttpFile::GetFileURL
+3187=CFindReplaceDialog::GetFindString
+3188=CMultiDocTemplate::GetFirstDocPosition
+3189=CSingleDocTemplate::GetFirstDocPosition
+3190=CDocManager::GetFirstDocTemplatePosition
+3191=CWinApp::GetFirstDocTemplatePosition
+3192=COleDocument::GetFirstFrame
+3193=CDocument::GetFirstViewPosition
+3194=COleControl::GetFocus
+3195=CFileDialog::GetFolderPath
+3196=CDialogTemplate::GetFont
+3197=CDialogTemplate::GetFont
+3198=COleControl::GetFont
+3199=CFontHolder::GetFontDispatch
+3200=CFontHolder::GetFontHandle
+3201=CFontHolder::GetFontHandle
+3202=CFontComboBox::GetFontItem
+3203=CFontPropPage::GetFontProps
+3204=CDialogTemplate::GetFontSizeField
+3205=COleControl::GetFontTextMetrics
+3206=CFontComboBox::GetFontType
+3207=COleControl::GetForeColor
+3208=CPropertySection::GetFormatID
+3209=CPropertySet::GetFormatVersion
+3210=CInternetSession::GetFtpConnection
+3211=COleDataObject::GetGlobalData
+3212=CTime::GetGmtTm
+3213=CInternetSession::GetGopherConnection
+3214=COleControl::XProvideClassInfo::GetGUID
+3215=CDC::GetHalftoneBrush
+3216=CRectTracker::GetHandleMask
+3217=CRectTracker::GetHandleRect
+3218=CRectTracker::GetHandleSize
+3219=CSizeComboBox::GetHeight
+3220=CSplitterWnd::GetHitRect
+3221=CHotKeyCtrl::GetHotKey
+3222=COleDateTime::GetHour
+3223=COleDateTimeSpan::GetHours
+3224=CInternetSession::GetHttpConnection
+3225=COleControl::GetHwnd
+3226=COleClientItem::GetIconicMetafile
+3227=CFrameWnd::GetIconWndClass
+3228=COleControlSite::GetID
+3229=CProperty::GetID
+3230=CPropertySection::GetID
+3231=COleDataObject::GetIDataObject
+3232=CCmdTarget::GetIDispatch
+3233=COleDispatchImpl::GetIDsOfNames
+3234=COleControlSite::XAmbientProps::GetIDsOfNames
+3235=COleControlSite::XEventSink::GetIDsOfNames
+3236=COleControl::XEventConnPt::GetIID
+3237=COleControl::XPropConnPt::GetIID
+3238=CDaoRecordset::GetIndexCount
+3239=CDaoTableDef::GetIndexCount
+3240=CDaoRecordset::GetIndexInfo
+3241=CDaoRecordset::GetIndexInfo
+3242=CDaoTableDef::GetIndexInfo
+3243=CDaoTableDef::GetIndexInfo
+3244=CDaoWorkspace::GetIniPath
+3245=COleDocument::GetInPlaceActiveItem
+3246=CRichEditDoc::GetInPlaceActiveItem
+3247=CRichEditView::GetInPlaceActiveItem
+3248=CRichEditView::XRichEditOleCallback::GetInPlaceContext
+3249=COleIPFrameWnd::GetInPlaceMenu
+3250=CDocObjectServer::XOleDocumentView::GetInPlaceSite
+3251=COleClientItem::GetInPlaceWindow
+3252=CSplitterWnd::GetInsideRect
+3253=CCmdTarget::GetInterface
+3254=CCmdTarget::GetInterfaceHook
+3255=COleControl::GetInterfaceHook
+3256=COleServerDoc::GetInterfaceHook
+3257=CCmdTarget::GetInterfaceMap
+3258=CDocObjectServer::GetInterfaceMap
+3259=CEnumConnPoints::GetInterfaceMap
+3260=CEnumFormatEtc::GetInterfaceMap
+3261=CEnumOleVerb::GetInterfaceMap
+3262=CEnumUnknown::GetInterfaceMap
+3263=COleClientItem::GetInterfaceMap
+3264=COleControl::GetInterfaceMap
+3265=COleControlContainer::GetInterfaceMap
+3266=COleControlSite::GetInterfaceMap
+3267=COleDataSource::GetInterfaceMap
+3268=COleDropSource::GetInterfaceMap
+3269=COleDropTarget::GetInterfaceMap
+3270=COleFrameHook::GetInterfaceMap
+3271=COleLinkingDoc::GetInterfaceMap
+3272=COleMessageFilter::GetInterfaceMap
+3273=COleObjectFactory::GetInterfaceMap
+3274=COlePropertyPage::GetInterfaceMap
+3275=COleServerDoc::GetInterfaceMap
+3276=COleServerItem::GetInterfaceMap
+3277=CRichEditView::GetInterfaceMap
+3278=CRichEditCtrl::GetIRichEditOle
+3279=CDaoWorkspace::GetIsolateODBCTrans
+3280=COleServerDoc::GetItemClipRect
+3281=CListCtrl::GetItemData
+3282=CTreeCtrl::GetItemData
+3283=CStatusBar::GetItemID
+3284=CToolBar::GetItemID
+3285=CTreeCtrl::GetItemImage
+3286=COleClientItem::GetItemName
+3287=COleServerDoc::GetItemPosition
+3288=CListCtrl::GetItemRect
+3289=CStatusBar::GetItemRect
+3290=CToolBar::GetItemRect
+3291=CTreeCtrl::GetItemRect
+3292=CTreeCtrl::GetItemState
+3293=COleClientItem::GetItemStorage
+3294=COleClientItem::GetItemStorageCompound
+3295=COleClientItem::GetItemStorageFlat
+3296=CListCtrl::GetItemText
+3297=CListCtrl::GetItemText
+3298=CTreeCtrl::GetItemText
+3299=CFileFind::GetLastAccessTime
+3300=CFileFind::GetLastAccessTime
+3301=CGopherFileFind::GetLastAccessTime
+3302=CGopherFileFind::GetLastAccessTime
+3303=CDaoRecordset::GetLastModifiedBookmark
+3304=COleUILinkInfo::GetLastUpdate
+3305=CFileFind::GetLastWriteTime
+3306=CFileFind::GetLastWriteTime
+3307=CGopherFileFind::GetLastWriteTime
+3308=CGopherFileFind::GetLastWriteTime
+3309=CRecordset::GetLBFetchSize
+3310=COleSafeArray::GetLBound
+3311=CRecordset::GetLBReallocSize
+3312=CComboBox::GetLBText
+3313=CFile::GetLength
+3314=CFileFind::GetLength
+3315=CGopherFileFind::GetLength
+3316=CInternetFile::GetLength
+3317=COleStreamFile::GetLength
+3318=CSocketFile::GetLength
+3319=CFileFind::GetLength64
+3320=CGopherFileFind::GetLength64
+3321=COleObjectFactory::GetLicenseKey
+3322=COleObjectFactory::XClassFactory::GetLicInfo
+3323=CRichEditCtrl::GetLine
+3324=CRichEditCtrl::GetLine
+3325=COleUILinkInfo::GetLinkSource
+3326=COleClientItem::GetLinkSourceData
+3327=COleServerItem::GetLinkSourceData
+3328=COleClientItem::GetLinkUpdateOptions
+3329=COleUILinkInfo::GetLinkUpdateOptions
+3330=CPropertySection::GetList
+3331=CPropertySet::GetList
+3332=CTime::GetLocalTm
+3333=CGopherFileFind::GetLocator
+3334=CDaoRecordset::GetLockingMode
+3335=CFontComboBox::GetLogFont
+3336=CDaoWorkspace::GetLoginTimeout
+3337=CFieldExchange::GetLongBinaryData
+3338=CRecordset::GetLongBinaryDataAndCleanup
+3339=CFieldExchange::GetLongBinarySize
+3340=CRecordset::GetLongCharDataAndCleanup
+3341=CWinThread::GetMainWnd
+3342=CPageSetupDialog::GetMargins
+3343=CConnectionPoint::GetMaxConnections
+3344=CMDIChildWnd::GetMDIFrame
+3345=CFrameWnd::GetMessageBar
+3346=CMDIChildWnd::GetMessageBar
+3347=CCheckListBox::GetMessageMap
+3348=CCmdTarget::GetMessageMap
+3349=CColorDialog::GetMessageMap
+3350=CColorPropPage::GetMessageMap
+3351=CCommonDialog::GetMessageMap
+3352=CControlBar::GetMessageMap
+3353=CControlFrameWnd::GetMessageMap
+3354=CCtrlView::GetMessageMap
+3355=CDaoRecordView::GetMessageMap
+3356=CDialog::GetMessageMap
+3357=CDialogBar::GetMessageMap
+3358=CDockBar::GetMessageMap
+3359=CDocObjectServer::GetMessageMap
+3360=CDocument::GetMessageMap
+3361=CEditView::GetMessageMap
+3362=CFontPropPage::GetMessageMap
+3363=CFormView::GetMessageMap
+3364=CFrameWnd::GetMessageMap
+3365=CListCtrl::GetMessageMap
+3366=CListView::GetMessageMap
+3367=CMDIChildWnd::GetMessageMap
+3368=CMDIFrameWnd::GetMessageMap
+3369=CMiniDockFrameWnd::GetMessageMap
+3370=CMiniFrameWnd::GetMessageMap
+3371=COleControl::GetMessageMap
+3372=COleDocIPFrameWnd::GetMessageMap
+3373=COleIPFrameWnd::GetMessageMap
+3374=COlePropertyPage::GetMessageMap
+3375=COleResizeBar::GetMessageMap
+3376=COleServerDoc::GetMessageMap
+3377=CPicturePropPage::GetMessageMap
+3378=CPreviewView::GetMessageMap
+3379=CPrintDialog::GetMessageMap
+3380=CPropertyPage::GetMessageMap
+3381=CPropertySheet::GetMessageMap
+3382=CRecordView::GetMessageMap
+3383=CRichEditView::GetMessageMap
+3384=CScrollView::GetMessageMap
+3385=CSocketWnd::GetMessageMap
+3386=CSplitterWnd::GetMessageMap
+3387=CStatusBar::GetMessageMap
+3388=CStockPropPage::GetMessageMap
+3389=CTabCtrl::GetMessageMap
+3390=CToolBar::GetMessageMap
+3391=CToolBarCtrl::GetMessageMap
+3392=CToolTipCtrl::GetMessageMap
+3393=CTreeCtrl::GetMessageMap
+3394=CTreeView::GetMessageMap
+3395=CView::GetMessageMap
+3396=CWinApp::GetMessageMap
+3397=CWnd::GetMessageMap
+3398=CFrameWnd::GetMessageString
+3399=COleControl::GetMessageString
+3400=CDataSourceControl::GetMetaData
+3401=COleControl::GetMetafileData
+3402=COleServerItem::GetMetafileData
+3403=COleDateTime::GetMinute
+3404=COleDateTimeSpan::GetMinutes
+3405=CDocObjectServer::XOleObject::GetMiscStatus
+3406=COleControl::XOleObject::GetMiscStatus
+3407=COleServerDoc::XOleObject::GetMiscStatus
+3408=COleServerItem::XOleObject::GetMiscStatus
+3409=CRectTracker::GetModifyPointers
+3410=COleDocument::GetMoniker
+3411=COleLinkingDoc::GetMoniker
+3412=COleServerDoc::GetMoniker
+3413=COleServerItem::GetMoniker
+3414=COleClientItem::XOleClientSite::GetMoniker
+3415=COleControlSite::XOleClientSite::GetMoniker
+3416=CDocObjectServer::XOleObject::GetMoniker
+3417=COleControl::XOleObject::GetMoniker
+3418=COleServerDoc::XOleObject::GetMoniker
+3419=COleServerItem::XOleObject::GetMoniker
+3420=COleDateTime::GetMonth
+3421=CDaoDatabase::GetName
+3422=CDaoQueryDef::GetName
+3423=CDaoRecordset::GetName
+3424=CDaoTableDef::GetName
+3425=CDaoWorkspace::GetName
+3426=COleControl::XViewObject::GetNaturalExtent
+3427=COleClientItem::GetNewItemNumber
+3428=CRichEditView::XRichEditOleCallback::GetNewStorage
+3429=CDataBoundProperty::GetNext
+3430=CMapPtrToPtr::GetNextAssoc
+3431=CMapPtrToWord::GetNextAssoc
+3432=CMapStringToOb::GetNextAssoc
+3433=CMapStringToPtr::GetNextAssoc
+3434=CMapStringToString::GetNextAssoc
+3435=CMapWordToOb::GetNextAssoc
+3436=CMapWordToPtr::GetNextAssoc
+3437=COleDocument::GetNextClientItem
+3438=CConnectionPoint::GetNextConnection
+3439=CMultiDocTemplate::GetNextDoc
+3440=CSingleDocTemplate::GetNextDoc
+3441=CDocManager::GetNextDocTemplate
+3442=CWinApp::GetNextDocTemplate
+3443=COleDataObject::GetNextFormat
+3444=COleDocument::GetNextItem
+3445=COleDocument::GetNextItemOfKind
+3446=COleUILinkInfo::GetNextLink
+3447=CFileDialog::GetNextPathName
+3448=COleDocument::GetNextServerItem
+3449=CDocument::GetNextView
+3450=CFindReplaceDialog::GetNotifier
+3451=CCmdTarget::GetNotSupported
+=COleControl::GetNotSupported
+3453=COlePropertyPage::GetObjectArray
+3454=COleClientItem::GetObjectDescriptorData
+3455=COleServerItem::GetObjectDescriptorData
+3456=COlePropertiesDialog::XOleUIObjInfo::GetObjectInfo
+3457=CArchive::GetObjectSchema
+3458=COleLinkingDoc::XOleItemContainer::GetObjectStorage
+3459=CHttpFile::GetObjectW
+3460=COleLinkingDoc::XOleItemContainer::GetObjectW
+3461=CRecordset::GetODBCFieldInfo
+3462=CRecordset::GetODBCFieldInfo
+3463=CDaoQueryDef::GetODBCTimeout
+3464=COleServerItem::GetOleObject
+3465=COleSafeArray::GetOneDimSize
+3466=CDocManager::GetOpenDocumentCount
+3467=CWinApp::GetOpenDocumentCount
+3468=CPropertySet::GetOSVersion
+3469=COleControl::GetOuterWindow
+3470=CPropertySheet::GetPageCount
+3471=CPropertySheet::GetPageIndex
+3472=CDocObjectServer::XPrint::GetPageInfo
+3473=COlePropertyPage::XPropertyPage::GetPageInfo
+3474=COleControl::XSpecifyPropertyPages::GetPages
+3475=COlePropertyPage::GetPageSite
+3476=CSplitterWnd::GetPane
+3477=CStatusBar::GetPaneInfo
+3478=CStatusBar::GetPaneStyle
+3479=CStatusBar::GetPaneText
+3480=CStatusBar::GetPaneText
+3481=CRichEditCtrl::GetParaFormat
+3482=CRichEditView::GetParaFormatSelection
+3483=CDaoQueryDef::GetParameterCount
+3484=CDaoQueryDef::GetParameterInfo
+3485=CDaoQueryDef::GetParameterInfo
+3486=CDaoQueryDef::GetParamValue
+3487=CDaoQueryDef::GetParamValue
+3488=CDaoRecordset::GetParamValue
+3489=CDaoRecordset::GetParamValue
+3490=CWnd::GetParentFrame
+3491=CWnd::GetParentOwner
+3492=CView::GetParentSplitter
+3493=CDataPathProperty::GetPath
+3494=CFileDialog::GetPathName
+3495=CAsyncSocket::GetPeerName
+3496=CDaoRecordset::GetPercentPosition
+3497=CPictureHolder::GetPictureDispatch
+3498=CPicturePropPage::GetPictureProp
+3499=CSizeComboBox::GetPointSize
+3500=CPageSetupDialog::GetPortName
+3501=CPrintDialog::GetPortName
+3502=CFile::GetPosition
+3503=CMemFile::GetPosition
+3504=COleStreamFile::GetPosition
+3505=CSocketFile::GetPosition
+3506=CStdioFile::GetPosition
+3507=COleControl::XPerPropertyBrowsing::GetPredefinedStrings
+3508=COleControl::XPerPropertyBrowsing::GetPredefinedValue
+3509=COleDocument::GetPrimarySelectedItem
+3510=CRichEditDoc::GetPrimarySelectedItem
+3511=COleClientItem::GetPrintDeviceInfo
+3512=CWinApp::GetPrinterDeviceDefaults
+3513=CEditView::GetPrinterFont
+3514=CAsyncMonikerFile::GetPriority
+3515=CWinApp::GetProfileBinary
+3516=CWinApp::GetProfileIntW
+3517=CWinApp::GetProfileStringW
+3518=COlePropertyPage::GetPropCheck
+3519=COleControlSite::GetProperty
+3520=COleDispatchDriver::GetProperty
+3521=CPropertySection::GetProperty
+3522=CPropertySet::GetProperty
+3523=CWnd::GetProperty
+3524=COlePropertyPage::GetPropIndex
+3525=COleControl::GetPropPageIDs
+3526=COlePropertyPage::GetPropRadio
+3527=COleControl::GetPropsetData
+3528=COlePropertyPage::GetPropText
+3529=COlePropertyPage::GetPropText
+3530=COlePropertyPage::GetPropText
+3531=COlePropertyPage::GetPropText
+3532=COlePropertyPage::GetPropText
+3533=COlePropertyPage::GetPropText
+3534=COlePropertyPage::GetPropText
+3535=COlePropertyPage::GetPropText
+3536=COlePropertyPage::GetPropText
+3537=CDaoDatabase::GetQueryDefCount
+3538=CDaoDatabase::GetQueryDefInfo
+3539=CDaoDatabase::GetQueryDefInfo
+3540=CDaoDatabase::GetQueryTimeout
+3541=CSliderCtrl::GetRange
+3542=CSpinButtonCtrl::GetRange
+3543=CProperty::GetRawValue
+3544=COleControl::GetReadyState
+3545=CDaoRecordset::GetRecordCount
+3546=CDaoTableDef::GetRecordCount
+3547=CDaoDatabase::GetRecordsAffected
+3548=CDaoQueryDef::GetRecordsAffected
+3549=CDocObjectServer::XOleDocumentView::GetRect
+3550=COleControl::XViewObject::GetRect
+3551=COleControl::GetRectInContainer
+3552=CDaoDatabase::GetRelationCount
+3553=CDaoDatabase::GetRelationInfo
+3554=CDaoDatabase::GetRelationInfo
+3555=CFindReplaceDialog::GetReplaceString
+3556=CDaoQueryDef::GetReturnsRecords
+3557=CFileFind::GetRoot
+3558=CGopherFileFind::GetRoot
+3559=CCmdTarget::GetRoutingFrame
+3560=CCmdTarget::GetRoutingView
+3561=CSplitterWnd::GetRowInfo
+3562=CAnimateCtrl::GetRuntimeClass
+3563=CArchiveException::GetRuntimeClass
+3564=CAsyncMonikerFile::GetRuntimeClass
+3565=CAsyncSocket::GetRuntimeClass
+3566=CBitmap::GetRuntimeClass
+3567=CBitmapButton::GetRuntimeClass
+3568=CBrush::GetRuntimeClass
+3569=CButton::GetRuntimeClass
+3570=CByteArray::GetRuntimeClass
+3571=CCachedDataPathProperty::GetRuntimeClass
+3572=CCheckListBox::GetRuntimeClass
+3573=CClientDC::GetRuntimeClass
+3574=CCmdTarget::GetRuntimeClass
+3575=CColorDialog::GetRuntimeClass
+3576=CColorPropPage::GetRuntimeClass
+3577=CComboBox::GetRuntimeClass
+3578=CControlBar::GetRuntimeClass
+3579=CCriticalSection::GetRuntimeClass
+3580=CCtrlView::GetRuntimeClass
+3581=CDaoDatabase::GetRuntimeClass
+3582=CDaoException::GetRuntimeClass
+3583=CDaoQueryDef::GetRuntimeClass
+3584=CDaoRecordset::GetRuntimeClass
+3585=CDaoRecordView::GetRuntimeClass
+3586=CDaoTableDef::GetRuntimeClass
+3587=CDaoWorkspace::GetRuntimeClass
+3588=CDatabase::GetRuntimeClass
+3589=CDataPathProperty::GetRuntimeClass
+3590=CDBException::GetRuntimeClass
+3591=CDC::GetRuntimeClass
+3592=CDialog::GetRuntimeClass
+3593=CDialogBar::GetRuntimeClass
+3594=CDocItem::GetRuntimeClass
+3595=CDockBar::GetRuntimeClass
+3596=CDockState::GetRuntimeClass
+3597=CDocManager::GetRuntimeClass
+3598=CDocObjectServer::GetRuntimeClass
+3599=CDocObjectServerItem::GetRuntimeClass
+3600=CDocTemplate::GetRuntimeClass
+3601=CDocument::GetRuntimeClass
+3602=CDragListBox::GetRuntimeClass
+3603=CDWordArray::GetRuntimeClass
+3604=CDynLinkLibrary::GetRuntimeClass
+3605=CEdit::GetRuntimeClass
+3606=CEditView::GetRuntimeClass
+3607=CEvent::GetRuntimeClass
+3608=CException::GetRuntimeClass
+3609=CFile::GetRuntimeClass
+3610=CFileDialog::GetRuntimeClass
+3611=CFileException::GetRuntimeClass
+3612=CFileFind::GetRuntimeClass
+3613=CFindReplaceDialog::GetRuntimeClass
+3614=CFont::GetRuntimeClass
+3615=CFontDialog::GetRuntimeClass
+3616=CFontPropPage::GetRuntimeClass
+3617=CFormView::GetRuntimeClass
+3618=CFrameWnd::GetRuntimeClass
+3619=CFtpConnection::GetRuntimeClass
+3620=CFtpFileFind::GetRuntimeClass
+3621=CGdiObject::GetRuntimeClass
+3622=CGopherConnection::GetRuntimeClass
+3623=CGopherFile::GetRuntimeClass
+3624=CGopherFileFind::GetRuntimeClass
+3625=CHeaderCtrl::GetRuntimeClass
+3626=CHotKeyCtrl::GetRuntimeClass
+3627=CHttpConnection::GetRuntimeClass
+3628=CHttpFile::GetRuntimeClass
+3629=CImageList::GetRuntimeClass
+3630=CInternetConnection::GetRuntimeClass
+3631=CInternetException::GetRuntimeClass
+3632=CInternetFile::GetRuntimeClass
+3633=CInternetSession::GetRuntimeClass
+3634=CListBox::GetRuntimeClass
+3635=CListCtrl::GetRuntimeClass
+3636=CListView::GetRuntimeClass
+3637=CLongBinary::GetRuntimeClass
+3638=CMapPtrToPtr::GetRuntimeClass
+3639=CMapPtrToWord::GetRuntimeClass
+3640=CMapStringToOb::GetRuntimeClass
+3641=CMapStringToPtr::GetRuntimeClass
+3642=CMapStringToString::GetRuntimeClass
+3643=CMapWordToOb::GetRuntimeClass
+3644=CMapWordToPtr::GetRuntimeClass
+3645=CMDIChildWnd::GetRuntimeClass
+3646=CMDIFrameWnd::GetRuntimeClass
+3647=CMemFile::GetRuntimeClass
+3648=CMemoryException::GetRuntimeClass
+3649=CMenu::GetRuntimeClass
+3650=CMetaFileDC::GetRuntimeClass
+3651=CMiniDockFrameWnd::GetRuntimeClass
+3652=CMiniFrameWnd::GetRuntimeClass
+3653=CMonikerFile::GetRuntimeClass
+3654=CMultiDocTemplate::GetRuntimeClass
+3655=CMutex::GetRuntimeClass
+3656=CNotSupportedException::GetRuntimeClass
+3657=CObArray::GetRuntimeClass
+3658=CObject::GetRuntimeClass
+3659=CObList::GetRuntimeClass
+3660=COleBusyDialog::GetRuntimeClass
+3661=COleChangeIconDialog::GetRuntimeClass
+3662=COleChangeSourceDialog::GetRuntimeClass
+3663=COleClientItem::GetRuntimeClass
+3664=COleControl::GetRuntimeClass
+3665=COleControlModule::GetRuntimeClass
+3666=COleConvertDialog::GetRuntimeClass
+3667=COleDialog::GetRuntimeClass
+3668=COleDispatchException::GetRuntimeClass
+3669=COleDocIPFrameWnd::GetRuntimeClass
+3670=COleDocument::GetRuntimeClass
+3671=COleException::GetRuntimeClass
+3672=COleInsertDialog::GetRuntimeClass
+3673=COleIPFrameWnd::GetRuntimeClass
+3674=COleLinkingDoc::GetRuntimeClass
+3675=COleLinksDialog::GetRuntimeClass
+3676=COleObjectFactory::GetRuntimeClass
+3677=COlePasteSpecialDialog::GetRuntimeClass
+3678=COlePropertiesDialog::GetRuntimeClass
+3679=COlePropertyPage::GetRuntimeClass
+3680=COleResizeBar::GetRuntimeClass
+3681=COleServerDoc::GetRuntimeClass
+3682=COleServerItem::GetRuntimeClass
+3683=COleStreamFile::GetRuntimeClass
+3684=COleUpdateDialog::GetRuntimeClass
+3685=CPageSetupDialog::GetRuntimeClass
+3686=CPaintDC::GetRuntimeClass
+3687=CPalette::GetRuntimeClass
+3688=CPen::GetRuntimeClass
+3689=CPicturePropPage::GetRuntimeClass
+3690=CPreviewDC::GetRuntimeClass
+3691=CPreviewView::GetRuntimeClass
+3692=CPrintDialog::GetRuntimeClass
+3693=CProgressCtrl::GetRuntimeClass
+3694=CPropertyPage::GetRuntimeClass
+3695=CPropertySheet::GetRuntimeClass
+3696=CPtrArray::GetRuntimeClass
+3697=CPtrList::GetRuntimeClass
+3698=CRecordset::GetRuntimeClass
+3699=CRecordView::GetRuntimeClass
+3700=CResourceException::GetRuntimeClass
+3701=CRgn::GetRuntimeClass
+3702=CRichEditCntrItem::GetRuntimeClass
+3703=CRichEditCtrl::GetRuntimeClass
+3704=CRichEditDoc::GetRuntimeClass
+3705=CRichEditView::GetRuntimeClass
+3706=CScrollBar::GetRuntimeClass
+3707=CScrollView::GetRuntimeClass
+3708=CSemaphore::GetRuntimeClass
+3709=CSharedFile::GetRuntimeClass
+3710=CSingleDocTemplate::GetRuntimeClass
+3711=CSliderCtrl::GetRuntimeClass
+3712=CSocket::GetRuntimeClass
+3713=CSocketFile::GetRuntimeClass
+3714=CSpinButtonCtrl::GetRuntimeClass
+3715=CSplitterWnd::GetRuntimeClass
+3716=CStatic::GetRuntimeClass
+3717=CStatusBar::GetRuntimeClass
+3718=CStatusBarCtrl::GetRuntimeClass
+3719=CStdioFile::GetRuntimeClass
+3720=CStockPropPage::GetRuntimeClass
+3721=CStringArray::GetRuntimeClass
+3722=CStringList::GetRuntimeClass
+3723=CSyncObject::GetRuntimeClass
+3724=CTabCtrl::GetRuntimeClass
+3725=CToolBar::GetRuntimeClass
+3726=CToolBarCtrl::GetRuntimeClass
+3727=CToolTipCtrl::GetRuntimeClass
+3728=CTreeCtrl::GetRuntimeClass
+3729=CTreeView::GetRuntimeClass
+3730=CUIntArray::GetRuntimeClass
+3731=CUserException::GetRuntimeClass
+3732=CView::GetRuntimeClass
+3733=CWinApp::GetRuntimeClass
+3734=CWindowDC::GetRuntimeClass
+3735=CWindowlessDC::GetRuntimeClass
+3736=CWinThread::GetRuntimeClass
+3737=CWnd::GetRuntimeClass
+3738=CWordArray::GetRuntimeClass
+3739=CWnd::GetSafeOwner
+3740=CColorDialog::GetSavedCustomColors
+3741=CGopherFileFind::GetScreenName
+3742=CDockState::GetScreenSize
+3743=CView::GetScrollBarCtrl
+3744=CWnd::GetScrollBarCtrl
+3745=CScrollView::GetScrollBarSizes
+3746=CScrollView::GetScrollBarState
+3747=CWnd::GetScrollInfo
+3748=CWnd::GetScrollLimit
+3749=CWnd::GetScrollPos
+3750=CScrollView::GetScrollPosition
+3751=CWnd::GetScrollRange
+3752=CSplitterWnd::GetScrollStyle
+3753=COleDateTime::GetSecond
+3754=COleDateTimeSpan::GetSeconds
+3755=CPropertySet::GetSection
+3756=CWinApp::GetSectionKey
+3757=CPropertySection::GetSectionName
+3758=CRichEditCtrl::GetSel
+3759=CRichEditView::GetSelectedItem
+3760=CEditView::GetSelectedText
+3761=CSliderCtrl::GetSelection
+3762=CRichEditCtrl::GetSelectionCharFormat
+3763=COleConvertDialog::GetSelectionType
+3764=COleInsertDialog::GetSelectionType
+3765=COlePasteSpecialDialog::GetSelectionType
+3766=CRichEditCtrl::GetSelText
+3767=CInternetConnection::GetServerName
+3768=CPropertySection::GetSize
+3769=CDialogTemplate::GetSizeInDialogUnits
+3770=CDialogTemplate::GetSizeInPixels
+3771=CBlobProperty::GetSizeMax
+3772=COleControl::XPersistMemory::GetSizeMax
+3773=COleControl::XPersistStreamInit::GetSizeMax
+3774=CSplitterWnd::GetSizingParent
+3775=CAsyncSocket::GetSockName
+3776=CDaoTableDef::GetSourceTableName
+3777=CDaoQueryDef::GetSQL
+3778=CDaoRecordset::GetSQL
+3779=CCmdTarget::GetStackSize
+3780=CCmdTarget::GetStandardProp
+3781=CConnectionPoint::GetStartPosition
+3782=COleDocument::GetStartPosition
+3783=CRichEditDoc::GetStartPosition
+3784=CFile::GetStatus
+3785=CFile::GetStatus
+3786=CMemFile::GetStatus
+3787=COleStreamFile::GetStatus
+3788=COleControl::GetStockTextMetrics
+3789=COleStreamFile::GetStorageName
+3790=COleStreamFile::GetStream
+3791=COleControlSite::GetStyle
+3792=CWnd::GetStyle
+3793=CWnd::GetSuperWndProcAddr
+3794=CDaoDatabase::GetTableDefCount
+3795=CDaoDatabase::GetTableDefInfo
+3796=CDaoDatabase::GetTableDefInfo
+3797=CDialogTemplate::GetTemplateSize
+3798=CListBox::GetText
+3799=COleControl::GetText
+3800=CStatusBarCtrl::GetText
+3801=CStatusBarCtrl::GetText
+3802=CToolTipCtrl::GetText
+3803=CRecordset::GetTextLen
+3804=CStatusBarCtrl::GetTextLength
+3805=COleDateTime::GetTickCount
+3806=CTime::GetTickCount
+3807=CToolTipCtrl::GetToolInfo
+3808=CWnd::GetTopLevelFrame
+3809=CWnd::GetTopLevelOwner
+3810=CWnd::GetTopLevelParent
+3811=CScrollView::GetTrueClientSize
+3812=CRectTracker::GetTrueRect
+3813=CDaoQueryDef::GetType
+3814=CDaoRecordset::GetType
+3815=CPictureHolder::GetType
+3816=CProperty::GetType
+3817=COleDispatchImpl::GetTypeInfo
+3818=COleControlSite::XAmbientProps::GetTypeInfo
+3819=COleControlSite::XEventSink::GetTypeInfo
+3820=CCmdTarget::GetTypeInfoCount
+3821=COleDispatchImpl::GetTypeInfoCount
+3822=COleControlSite::XAmbientProps::GetTypeInfoCount
+3823=COleControlSite::XEventSink::GetTypeInfoCount
+3824=CCmdTarget::GetTypeInfoOfGuid
+3825=CCmdTarget::GetTypeLib
+3826=CCmdTarget::GetTypeLibCache
+3827=COleSafeArray::GetUBound
+3828=CDocObjectServer::XOleObject::GetUserClassID
+3829=COleControl::XOleObject::GetUserClassID
+3830=COleServerDoc::XOleObject::GetUserClassID
+3831=COleServerItem::XOleObject::GetUserClassID
+3832=CDaoWorkspace::GetUserNameW
+3833=COleClientItem::GetUserType
+3834=COleControl::GetUserType
+3835=CDocObjectServer::XOleObject::GetUserType
+3836=COleControl::XOleObject::GetUserType
+3837=COleServerDoc::XOleObject::GetUserType
+3838=COleServerItem::XOleObject::GetUserType
+3839=CDaoRecordset::GetValidationRule
+3840=CDaoTableDef::GetValidationRule
+3841=CDaoRecordset::GetValidationText
+3842=CDaoTableDef::GetValidationText
+3843=CMapPtrToPtr::GetValueAt
+3844=CHttpFile::GetVerb
+3845=CDaoDatabase::GetVersion
+3846=CDaoWorkspace::GetVersion
+3847=CDockState::GetVersion
+3848=CRichEditDoc::GetView
+3849=COlePropertiesDialog::XOleUIObjInfo::GetViewInfo
+3850=COleControl::XViewObject::GetViewStatus
+3851=COleControl::XOleInPlaceActiveObject::GetWindow
+3852=COleServerDoc::XOleInPlaceActiveObject::GetWindow
+3853=COleFrameHook::XOleInPlaceFrame::GetWindow
+3854=COleControl::XOleInPlaceObject::GetWindow
+3855=COleServerDoc::XOleInPlaceObject::GetWindow
+3856=COleControlContainer::XOleIPFrame::GetWindow
+3857=COleClientItem::XOleIPSite::GetWindow
+3858=COleControlSite::XOleIPSite::GetWindow
+3859=CRichEditCntrItem::GetWindowContext
+3860=CRichEditView::GetWindowContext
+3861=COleClientItem::XOleIPSite::GetWindowContext
+3862=COleControlSite::XOleIPSite::GetWindowContext
+3863=COleControl::GetWindowlessDropTarget
+3864=CMDIFrameWnd::GetWindowMenuPopup
+3865=CWnd::GetWindowPlacement
+3866=COleControlSite::GetWindowTextLengthW
+3867=CWnd::GetWindowTextLengthW
+3868=COleControlSite::GetWindowTextW
+3869=COleControlSite::GetWindowTextW
+3870=CWnd::GetWindowTextW
+3871=CWnd::GetWindowTextW
+3872=CDaoWorkspace::GetWorkspaceCount
+3873=CDaoWorkspace::GetWorkspaceInfo
+3874=CDaoWorkspace::GetWorkspaceInfo
+3875=COleDateTime::GetYear
+3876=COleServerDoc::GetZoomFactor
+3877=COleDropSource::GiveFeedback
+3878=COleDropSource::XDropSource::GiveFeedback
+3879=CWnd::GrayCtlColor
+3880=CDC::GrayStringW
+3881=CPreviewDC::GrayStringW
+3882=CMemFile::GrowFile
+3883=_GUIDconstCColorPropPage::guid
+3884=_GUIDconstCFontPropPage::guid
+3885=_GUIDconstCPicturePropPage::guid
+3886=CWnd::HandleFloatingSysCommand
+3887=COleMessageFilter::XMessageFilter::HandleInComingCall
+3888=CDialog::HandleInitDialog
+3889=CDialogBar::HandleInitDialog
+3890=CFormView::HandleInitDialog
+3891=CPropertySheet::HandleInitDialog
+3892=CDialog::HandleSetFont
+3893=COleControl::XPersistStorage::HandsOffStorage
+3894=COleServerDoc::XPersistStorage::HandsOffStorage
+3895=COleDocument::HasBlankItems
+3896=CDialogTemplate::HasFont
+3897=HashKey
+3898=HashKey
+3899=COlePropertyPage::XPropertyPage::Help
+3900=CDumpContext::HexDump
+3901=CWinApp::HideApplication
+3902=CFileDialog::HideControl
+3903=CDC::HIMETRICtoDP
+3904=CDC::HIMETRICtoLP
+3905=CListCtrl::HitTest
+3906=CRectTracker::HitTest
+3907=CSplitterWnd::HitTest
+3908=CToolTipCtrl::HitTest
+3909=CTreeCtrl::HitTest
+3910=CRectTracker::HitTestHandles
+3911=CSplitterWnd::IdFromRowCol
+3912=CDaoWorkspace::Idle
+3913=COlePropertyPage::IgnoreApply
+3914=COleControl::IgnoreWindowMessage
+3915=CRect::InflateRect
+3916=CRect::InflateRect
+3917=CWinApp::InitApplication
+3918=COleControl::XOleCache::InitCache
+3919=CWnd::InitControlContainer
+3920=CDaoWorkspace::InitDatabasesCollection
+3921=CPropertyPage::InitDialogInfo
+3922=CDaoException::InitErrorsCollection
+3923=CDaoQueryDef::InitFieldsCollection
+3924=CDaoRecordset::InitFieldsCollection
+3925=CDaoTableDef::InitFieldsCollection
+3926=CDocObjectServer::XOleObject::InitFromData
+3927=COleControl::XOleObject::InitFromData
+3928=COleServerDoc::XOleObject::InitFromData
+3929=COleServerItem::XOleObject::InitFromData
+3930=CMapPtrToPtr::InitHashTable
+3931=CMapPtrToWord::InitHashTable
+3932=CMapStringToOb::InitHashTable
+3933=CMapStringToPtr::InitHashTable
+3934=CMapStringToString::InitHashTable
+3935=CMapWordToOb::InitHashTable
+3936=CMapWordToPtr::InitHashTable
+3937=CDataSourceControl::Initialize
+3938=CMiniFrameWnd::Initialize
+3939=CDaoWorkspace::InitializeEngine
+3940=CFontHolder::InitializeFont
+3941=COleControl::InitializeIIDs
+3942=CEditView::InitializeReplace
+3943=CDocTemplate::InitialUpdateFrame
+3944=CFrameWnd::InitialUpdateFrame
+3945=CDaoRecordset::InitIndexesCollection
+3946=CDaoTableDef::InitIndexesCollection
+3947=COleControlModule::InitInstance
+3948=CWinApp::InitInstance
+3949=CWinThread::InitInstance
+3950=CDockContext::InitLoop
+3951=CDialog::InitModalIndirect
+3952=CDialog::InitModalIndirect
+3953=COleControl::XPersistMemory::InitNew
+3954=COleControl::XPersistPropertyBag::InitNew
+3955=COleControl::XPersistStorage::InitNew
+3956=COleServerDoc::XPersistStorage::InitNew
+3957=COleControl::XPersistStreamInit::InitNew
+3958=CDaoQueryDef::InitParametersCollection
+3959=CDaoDatabase::InitQueryDefsCollection
+3960=CRecordset::InitRecord
+3961=CDaoDatabase::InitRelationsCollection
+3962=COleControl::InitStockEventMask
+3963=COleControl::InitStockPropMask
+3964=CSimpleException::InitString
+3965=CDaoDatabase::InitTableDefsCollection
+3966=CDaoDatabase::InitWorkspace
+3967=CDaoWorkspace::InitWorkspacesCollection
+3968=COleControl::XOleInPlaceObject::InPlaceDeactivate
+3969=COleServerDoc::XOleInPlaceObject::InPlaceDeactivate
+3970=CDockBar::Insert
+3971=CObList::InsertAfter
+3972=CPtrList::InsertAfter
+3973=CStringList::InsertAfter
+3974=CByteArray::InsertAt
+3975=CByteArray::InsertAt
+3976=CDWordArray::InsertAt
+3977=CDWordArray::InsertAt
+3978=CObArray::InsertAt
+3979=CObArray::InsertAt
+3980=CPtrArray::InsertAt
+3981=CPtrArray::InsertAt
+3982=CStringArray::InsertAt
+3983=CStringArray::InsertAt
+3984=CUIntArray::InsertAt
+3985=CUIntArray::InsertAt
+3986=CWordArray::InsertAt
+3987=CWordArray::InsertAt
+3988=CObList::InsertBefore
+3989=CPtrList::InsertBefore
+3990=CStringList::InsertBefore
+3991=CListCtrl::InsertColumn
+3992=CRichEditView::InsertFileAsObject
+3993=CListCtrl::InsertItem
+3994=CRichEditView::InsertItem
+3995=CTreeCtrl::InsertItem
+3996=COleFrameHook::XOleInPlaceFrame::InsertMenus
+3997=COleControlContainer::XOleIPFrame::InsertMenus
+3998=AFX_INTERFACEMAPconstCCmdTarget::interfaceMap
+3999=AFX_INTERFACEMAPconstCDocObjectServer::interfaceMap
+4000=AFX_INTERFACEMAPconstCOleClientItem::interfaceMap
+4001=AFX_INTERFACEMAPconstCOleControl::interfaceMap
+4002=AFX_INTERFACEMAPconstCOleDataSource::interfaceMap
+4003=AFX_INTERFACEMAPconstCOleDropSource::interfaceMap
+4004=AFX_INTERFACEMAPconstCOleDropTarget::interfaceMap
+4005=AFX_INTERFACEMAPconstCOleFrameHook::interfaceMap
+4006=AFX_INTERFACEMAPconstCOleLinkingDoc::interfaceMap
+4007=AFX_INTERFACEMAPconstCOleMessageFilter::interfaceMap
+4008=AFX_INTERFACEMAPconstCOleObjectFactory::interfaceMap
+4009=AFX_INTERFACEMAPconstCOlePropertyPage::interfaceMap
+4010=AFX_INTERFACEMAPconstCOleServerDoc::interfaceMap
+4011=AFX_INTERFACEMAPconstCOleServerItem::interfaceMap
+4012=AFX_INTERFACEMAPconstCRichEditView::interfaceMap
+4013=COleControl::InternalGetFont
+4014=COleControl::InternalGetText
+4015=CCmdTarget::InternalQueryInterface
+4016=CCmdTarget::InternalRelease
+4017=CDC::IntersectClipRect
+4018=CDC::IntersectClipRect
+4019=CCheckListBox::InvalidateCheck
+4020=COleControl::InvalidateControl
+4021=CCheckListBox::InvalidateItem
+4022=COleControl::InvalidateRgn
+4023=CMiniFrameWnd::InvertSysMenu
+4024=COleDispatchImpl::Invoke
+4025=COleControlSite::XAmbientProps::Invoke
+4026=COleControlSite::XEventSink::Invoke
+4027=COleControlSite::InvokeHelper
+4028=COleDispatchDriver::InvokeHelper
+4029=CWnd::InvokeHelper
+4030=COleControlSite::InvokeHelperV
+4031=COleDispatchDriver::InvokeHelperV
+4032=CDocItem::IsBlank
+4033=COleServerItem::IsBlank
+4034=CDaoRecordset::IsBOF
+4035=CSplitterWnd::IsChildPane
+4036=COleServerItem::IsConnected
+4037=COleDataObject::IsDataAvailable
+4038=COleControlSite::IsDefaultButton
+4039=CDaoRecordset::IsDeleted
+4040=CRuntimeClass::IsDerivedFrom
+4041=COccManager::IsDialogMessageW
+4042=CWnd::IsDialogMessageW
+4043=CBlobProperty::IsDirty
+4044=COleLinkingDoc::XPersistFile::IsDirty
+4045=COleControl::XPersistMemory::IsDirty
+4046=COleControl::XPersistStorage::IsDirty
+4047=COleServerDoc::XPersistStorage::IsDirty
+4048=COleControl::XPersistStreamInit::IsDirty
+4049=COleControlContainer::IsDlgButtonChecked
+4050=CWnd::IsDlgButtonChecked
+4051=CControlBar::IsDockBar
+4052=CDockBar::IsDockBar
+4053=CFileFind::IsDots
+4054=CGopherFileFind::IsDots
+4055=CCheckListBox::IsEnabled
+4056=CDaoRecordset::IsEOF
+4057=CDaoRecordset::IsFieldDirty
+4058=CRecordset::IsFieldDirty
+4059=CDaoRecordset::IsFieldNull
+4060=CRecordset::IsFieldNull
+4061=CDaoRecordset::IsFieldNullable
+4062=CRecordset::IsFieldNullable
+4063=CRecordset::IsFieldNullable
+4064=CDaoRecordset::IsFieldStatusDirty
+4065=CRecordset::IsFieldStatusDirty
+4066=CDaoRecordset::IsFieldStatusNull
+4067=CRecordset::IsFieldStatusNull
+4068=CDaoRecordset::IsFieldStatusNullable
+4069=CDaoRecordset::IsFieldStatusNullableKnown
+4070=CFieldExchange::IsFieldType
+4071=CControlBar::IsFloating
+4072=CFrameWnd::IsFrameWnd
+4073=CWnd::IsFrameWnd
+4074=CWinThread::IsIdleMessage
+4075=CCmdTarget::IsInvokeAllowed
+4076=COleControl::IsInvokeAllowed
+4077=CRecordset::IsJoin
+4078=CObject::IsKindOf
+4079=COccManager::IsLabelControl
+4080=COleObjectFactory::IsLicenseValid
+4081=CDaoRecordset::IsMatch
+4082=COccManager::IsMatchingMnemonic
+4083=COleControlSite::IsMatchingMnemonic
+4084=CDocument::IsModified
+4085=COleClientItem::IsModified
+4086=COleControl::IsModified
+4087=COlePropertyPage::IsModified
+4088=CRichEditDoc::IsModified
+4089=CDaoFieldExchange::IsNullValue
+4090=CDaoRecordView::IsOnFirstRecord
+4091=CRecordView::IsOnFirstRecord
+4092=CDaoRecordView::IsOnLastRecord
+4093=CRecordView::IsOnLastRecord
+4094=CRecordset::IsOpen
+4095=COlePropertyPage::XPropertyPage::IsPageDirty
+4096=CRecordset::IsParamStatusNull
+4097=CRecordset::IsRecordsetUpdatable
+4098=COleObjectFactory::IsRegistered
+4099=CCmdTarget::IsResultExpected
+4100=CRichEditView::IsRichEditFormat
+4101=COleLinkingDoc::XOleItemContainer::IsRunning
+4102=CRichEditView::IsSelected
+4103=CView::IsSelected
+4104=CRecordset::IsSelectQueryUpdatable
+4105=CObject::IsSerializable
+4106=COleMessageFilter::IsSignificantMessage
+4107=CRecordset::IsSQLUpdatable
+4108=COleControl::IsSubclassedControl
+4109=CWnd::IsTopParentActive
+4110=CFrameWnd::IsTracking
+4111=CDocObjectServer::XOleObject::IsUpToDate
+4112=COleControl::XOleObject::IsUpToDate
+4113=COleServerDoc::XOleObject::IsUpToDate
+4114=COleServerItem::XOleObject::IsUpToDate
+4115=CDaoFieldExchange::IsValidOperation
+4116=CControlBar::IsVisible
+4117=COleControlSite::IsWindowEnabled
+4118=CWnd::IsWindowEnabled
+4119=CListBox::ItemFromPoint
+4120=CTreeCtrl::ItemHasChildren
+4121=COleControl::KeyDown
+4122=COleControl::KeyUp
+4123=CAsyncSocket::KillSocket
+4124=CString::Left
+4125=CRichEditCtrl::LineIndex
+4126=CRichEditCtrl::LineLength
+4127=CRichEditCtrl::LineScroll
+4128=CDC::LineTo
+4129=ulongCRichEditView::lMaxSize
+4130=CBlobProperty::Load
+4131=CDialogTemplate::Load
+4132=COleControl::Load
+4133=CRuntimeClass::Load
+4134=COleLinkingDoc::XPersistFile::Load
+4135=COleControl::XPersistMemory::Load
+4136=COleControl::XPersistPropertyBag::Load
+4137=COleControl::XPersistStorage::Load
+4138=COleServerDoc::XPersistStorage::Load
+4139=COleControl::XPersistStreamInit::Load
+4140=CFrameWnd::LoadAccelTable
+4141=CFrameWnd::LoadBarState
+4142=CBitmapButton::LoadBitmaps
+4143=CToolBar::LoadBitmapW
+4144=CDaoRecordset::LoadFields
+4145=CRecordset::LoadFields
+4146=CFrameWnd::LoadFrame
+4147=CMDIChildWnd::LoadFrame
+4148=CMDIFrameWnd::LoadFrame
+4149=COleIPFrameWnd::LoadFrame
+4150=COleDocument::LoadFromStorage
+4151=CControlBarInfo::LoadState
+4152=CDockState::LoadState
+4153=COleControl::LoadState
+4154=CWinApp::LoadStdProfileSettings
+4155=CString::LoadStringW
+4156=CDocTemplate::LoadTemplate
+4157=CMultiDocTemplate::LoadTemplate
+4158=CToolBar::LoadToolBar
+4159=CCriticalSection::Lock
+4160=CMultiLock::Lock
+4161=COleSafeArray::Lock
+4162=CSingleLock::Lock
+4163=CSyncObject::Lock
+4164=CTypeLibCache::Lock
+4165=CEditView::LockBuffer
+4166=CString::LockBuffer
+4167=COleControlContainer::XOleContainer::LockContainer
+4168=COleLinkingDoc::XOleItemContainer::LockContainer
+4169=COleLinkingDoc::LockExternal
+4170=COleControl::LockInPlaceActive
+4171=COleControlSite::XOleControlSite::LockInPlaceActive
+4172=CFile::LockRange
+4173=CInternetFile::LockRange
+4174=CMemFile::LockRange
+4175=COleStreamFile::LockRange
+4176=CSocketFile::LockRange
+4177=CStdioFile::LockRange
+4178=CArchiveStream::LockRegion
+4179=COleObjectFactory::XClassFactory::LockServer
+4180=CMapPtrToPtr::Lookup
+4181=CMapPtrToWord::Lookup
+4182=CMapStringToOb::Lookup
+4183=CMapStringToPtr::Lookup
+4184=CMapStringToString::Lookup
+4185=CMapWordToOb::Lookup
+4186=CMapWordToPtr::Lookup
+4187=COleDataSource::Lookup
+4188=CTypeLibCache::Lookup
+4189=CAsyncSocket::LookupHandle
+4190=CRichEditDoc::LookupItem
+4191=CMapStringToOb::LookupKey
+4192=CMapStringToPtr::LookupKey
+4193=CMapStringToString::LookupKey
+4194=CTypeLibCache::LookupTypeInfo
+4195=CDC::LPtoDP
+4196=CDC::LPtoHIMETRIC
+4197=CString::MakeLower
+4198=CString::MakeReverse
+4199=CString::MakeUpper
+4200=CArchive::MapObject
+4201=COleControl::XPerPropertyBrowsing::MapPropertyToPage
+4202=COleDialog::MapResult
+4203=CPropertyPage::MapWizardResult
+4204=CDaoRecordset::MarkForAddNew
+4205=CRecordset::MarkForAddNew
+4206=CDaoRecordset::MarkForEdit
+4207=CRecordset::MarkForUpdate
+4208=CRichEditDoc::MarkItemsClear
+4209=CDocTemplate::MatchDocType
+4210=CFileFind::MatchesMask
+4211=CMDIFrameWnd::MDIGetActive
+4212=CCheckListBox::MeasureItem
+4213=CComboBox::MeasureItem
+4214=CListBox::MeasureItem
+4215=CMenu::MeasureItem
+4216=CCmdTarget::MemberIDFromName
+4217=CMemFile::Memcpy
+4218=COlePropertyPage::MessageBoxW
+4219=CWnd::MessageBoxW
+4220=AFX_MSGMAPconstCCheckListBox::messageMap
+4221=AFX_MSGMAPconstCCmdTarget::messageMap
+4222=AFX_MSGMAPconstCColorDialog::messageMap
+4223=AFX_MSGMAPconstCColorPropPage::messageMap
+4224=AFX_MSGMAPconstCCommonDialog::messageMap
+4225=AFX_MSGMAPconstCControlBar::messageMap
+4226=AFX_MSGMAPconstCControlFrameWnd::messageMap
+4227=AFX_MSGMAPconstCCtrlView::messageMap
+4228=AFX_MSGMAPconstCDaoRecordView::messageMap
+4229=AFX_MSGMAPconstCDialog::messageMap
+4230=AFX_MSGMAPconstCDialogBar::messageMap
+4231=AFX_MSGMAPconstCDockBar::messageMap
+4232=AFX_MSGMAPconstCDocObjectServer::messageMap
+4233=AFX_MSGMAPconstCDocument::messageMap
+4234=AFX_MSGMAPconstCEditView::messageMap
+4235=AFX_MSGMAPconstCFontPropPage::messageMap
+4236=AFX_MSGMAPconstCFormView::messageMap
+4237=AFX_MSGMAPconstCFrameWnd::messageMap
+4238=AFX_MSGMAPconstCListCtrl::messageMap
+4239=AFX_MSGMAPconstCListView::messageMap
+4240=AFX_MSGMAPconstCMDIChildWnd::messageMap
+4241=AFX_MSGMAPconstCMDIFrameWnd::messageMap
+4242=AFX_MSGMAPconstCMiniDockFrameWnd::messageMap
+4243=AFX_MSGMAPconstCMiniFrameWnd::messageMap
+4244=AFX_MSGMAPconstCOleControl::messageMap
+4245=AFX_MSGMAPconstCOleDocIPFrameWnd::messageMap
+4246=AFX_MSGMAPconstCOleIPFrameWnd::messageMap
+4247=AFX_MSGMAPconstCOlePropertyPage::messageMap
+4248=AFX_MSGMAPconstCOleResizeBar::messageMap
+4249=AFX_MSGMAPconstCOleServerDoc::messageMap
+4250=AFX_MSGMAPconstCPicturePropPage::messageMap
+4251=AFX_MSGMAPconstCPreviewView::messageMap
+4252=AFX_MSGMAPconstCPrintDialog::messageMap
+4253=AFX_MSGMAPconstCPropertyPage::messageMap
+4254=AFX_MSGMAPconstCPropertySheet::messageMap
+4255=AFX_MSGMAPconstCRecordView::messageMap
+4256=AFX_MSGMAPconstCRichEditView::messageMap
+4257=AFX_MSGMAPconstCScrollView::messageMap
+4258=AFX_MSGMAPconstCSocketWnd::messageMap
+4259=AFX_MSGMAPconstCSplitterWnd::messageMap
+4260=AFX_MSGMAPconstCStatusBar::messageMap
+4261=AFX_MSGMAPconstCStockPropPage::messageMap
+4262=AFX_MSGMAPconstCTabCtrl::messageMap
+4263=AFX_MSGMAPconstCToolBar::messageMap
+4264=AFX_MSGMAPconstCToolBarCtrl::messageMap
+4265=AFX_MSGMAPconstCToolTipCtrl::messageMap
+4266=AFX_MSGMAPconstCTreeCtrl::messageMap
+4267=AFX_MSGMAPconstCTreeView::messageMap
+4268=AFX_MSGMAPconstCView::messageMap
+4269=AFX_MSGMAPconstCWinApp::messageMap
+4270=AFX_MSGMAPconstCWnd::messageMap
+4271=COleMessageFilter::XMessageFilter::MessagePending
+4272=CString::Mid
+4273=CString::Mid
+4274=CPreviewDC::MirrorAttributes
+4275=CPreviewDC::MirrorFont
+4276=CPreviewDC::MirrorMappingMode
+4277=CPreviewDC::MirrorViewportOrg
+4278=COleControlSite::ModifyStyle
+4279=CWnd::ModifyStyle
+4280=CWnd::ModifyStyle
+4281=COleControlSite::ModifyStyleEx
+4282=CWnd::ModifyStyleEx
+4283=CWnd::ModifyStyleEx
+4284=CDaoRecordset::Move
+4285=CDockContext::Move
+4286=CRecordset::Move
+4287=COlePropertyPage::XPropertyPage::Move
+4288=CDaoRecordset::MoveFirst
+4289=CDaoRecordset::MoveLast
+4290=CDaoRecordset::MoveNext
+4291=CDaoRecordset::MovePrev
+4292=CDC::MoveTo
+4293=COleControlSite::MoveWindow
+4294=CWnd::MoveWindow
+4295=CRect::MulDiv
+4296=uintCOleDropSource::nDragDelay
+4297=uintCOleDropSource::nDragMinDist
+4298=CFrameWnd::NegotiateBorderSpace
+4299=CMapPtrToPtr::NewAssoc
+4300=CMapPtrToWord::NewAssoc
+4301=CMapStringToOb::NewAssoc
+4302=CMapStringToPtr::NewAssoc
+4303=CMapStringToString::NewAssoc
+4304=CMapWordToOb::NewAssoc
+4305=CMapWordToPtr::NewAssoc
+4306=CObList::NewNode
+4307=CPtrList::NewNode
+4308=CStringList::NewNode
+4309=CEnumArray::XEnumVOID::Next
+4310=uintconstCEditView::nMaxSize
+4311=CRectTracker::NormalizeHit
+4312=CRect::NormalizeRect
+4313=CDataBoundProperty::Notify
+4314=COleFrameHook::NotifyAllInPlace
+4315=COleServerDoc::NotifyAllItems
+4316=COleServerItem::NotifyClient
+4317=CFrameWnd::NotifyFloatingWindows
+4318=COleServerDoc::NotifyRename
+4319=uintCOleDropTarget::nScrollDelay
+4320=intCOleDropTarget::nScrollInset
+4321=uintCOleDropTarget::nScrollInterval
+4322=CDC::OffsetClipRgn
+4323=CDC::OffsetClipRgn
+4324=CDC::OffsetViewportOrg
+4325=CMetaFileDC::OffsetViewportOrg
+4326=CPreviewDC::OffsetViewportOrg
+4327=CDC::OffsetWindowOrg
+4328=COleControlSite::XNotifyDBEvents::OKToDo
+4329=CAsyncSocket::OnAccept
+4330=CControlFrameWnd::OnActivate
+4331=CFrameWnd::OnActivate
+4332=COleClientItem::OnActivate
+4333=COleFrameHook::OnActivate
+4334=CFormView::OnActivateFrame
+4335=CView::OnActivateFrame
+4336=COleControl::OnActivateInPlace
+4337=CFrameWnd::OnActivateTopLevel
+4338=CWnd::OnActivateTopLevel
+4339=COleClientItem::OnActivateUI
+4340=CDocObjectServer::OnActivateView
+4341=CFormView::OnActivateView
+4342=CPreviewView::OnActivateView
+4343=CView::OnActivateView
+4344=CToolTipCtrl::OnAddTool
+4345=CConnectionPoint::OnAdvise
+4346=COleControl::XEventConnPt::OnAdvise
+4347=CWnd::OnAmbientProperty
+4348=COleControl::OnAmbientPropertyChange
+4349=COleControl::XOleControl::OnAmbientPropertyChange
+4350=COleControl::OnAppearanceChanged
+4351=CWinApp::OnAppExit
+4352=CPropertyPage::OnApply
+4353=COlePropertiesDialog::OnApplyScale
+4354=CDocObjectServer::OnApplyViewState
+4355=COleControl::OnBackColorChanged
+4356=CFrameWnd::OnBarCheck
+4357=COleIPFrameWnd::OnBarCheck
+4358=CControlBar::OnBarStyleChange
+4359=CStatusBar::OnBarStyleChange
+4360=CToolBar::OnBarStyleChange
+4361=COleDropSource::OnBeginDrag
+4362=CEditView::OnBeginPrinting
+4363=CRichEditView::OnBeginPrinting
+4364=CView::OnBeginPrinting
+4365=COleControl::OnBorderStyleChanged
+4366=CPicturePropPage::OnBrowse
+4367=CRichEditView::OnBullet
+4368=COleMessageFilter::OnBusyDialog
+4369=CCommonDialog::OnCancel
+4370=CDialog::OnCancel
+4371=CPropertyPage::OnCancel
+4372=CRichEditView::OnCancelEditCntr
+4373=COleControl::OnCancelMode
+4374=CSplitterWnd::OnCancelMode
+4375=CWnd::OnCancelMode
+4376=COleClientItem::OnChange
+4377=COleControl::XFontNotification::OnChanged
+4378=COleControlSite::XPropertyNotifySink::OnChanged
+4379=COlePropertyPage::XPropNotifySink::OnChanged
+4380=CRectTracker::OnChangedRect
+4381=CDocument::OnChangedViewList
+4382=COleClientItem::OnChangeItemPosition
+4383=CRichEditCntrItem::OnChangeItemPosition
+4384=COleControl::OnChar
+4385=CRichEditView::OnCharBold
+4386=CRichEditView::OnCharEffect
+4387=CRichEditView::OnCharItalic
+4388=CWnd::OnCharToItem
+4389=CRichEditView::OnCharUnderline
+4390=CButton::OnChildNotify
+4391=CCheckListBox::OnChildNotify
+4392=CComboBox::OnChildNotify
+4393=CDragListBox::OnChildNotify
+4394=CHeaderCtrl::OnChildNotify
+4395=CListBox::OnChildNotify
+4396=CListCtrl::OnChildNotify
+4397=CListView::OnChildNotify
+4398=CStatusBar::OnChildNotify
+4399=CStatusBarCtrl::OnChildNotify
+4400=CTabCtrl::OnChildNotify
+4401=CWnd::OnChildNotify
+4402=CPicturePropPage::OnClear
+4403=COleControl::OnClick
+4404=CEnumArray::OnClone
+4405=CAsyncSocket::OnClose
+4406=CControlFrameWnd::OnClose
+4407=CFrameWnd::OnClose
+4408=CMiniDockFrameWnd::OnClose
+4409=COleControl::OnClose
+4410=COleServerDoc::OnClose
+4411=CPropertySheet::OnClose
+4412=COleClientItem::XAdviseSink::OnClose
+4413=CDocObjectServer::OnCloseDocument
+4414=CDocument::OnCloseDocument
+4415=COleDocument::OnCloseDocument
+4416=COleLinkingDoc::OnCloseDocument
+4417=COleServerDoc::OnCloseDocument
+4418=CCmdTarget::OnCmdMsg
+4419=CDialog::OnCmdMsg
+4420=CDocument::OnCmdMsg
+4421=CFrameWnd::OnCmdMsg
+4422=CMDIFrameWnd::OnCmdMsg
+4423=COleCntrFrameWnd::OnCmdMsg
+4424=COleDocument::OnCmdMsg
+4425=CPropertySheet::OnCmdMsg
+4426=CView::OnCmdMsg
+4427=CRichEditView::OnColorDefault
+4428=CColorDialog::OnColorOK
+4429=CRichEditView::OnColorPick
+4430=CFrameWnd::OnCommand
+4431=CMDIFrameWnd::OnCommand
+4432=COlePropertyPage::OnCommand
+4433=CPropertySheet::OnCommand
+4434=CSplitterWnd::OnCommand
+4435=CWnd::OnCommand
+4436=CDialog::OnCommandHelp
+4437=CFrameWnd::OnCommandHelp
+4438=CMDIFrameWnd::OnCommandHelp
+4439=CPropertySheet::OnCommandHelp
+4440=CWnd::OnCompareItem
+4441=CAsyncSocket::OnConnect
+4442=CFrameWnd::OnContextHelp
+4443=COleFrameHook::OnContextHelp
+4444=COleIPFrameWnd::OnContextHelp
+4445=CWinApp::OnContextHelp
+4446=COleControlSite::XOleControlSite::OnControlInfoChanged
+4447=CCheckListBox::OnCreate
+4448=CControlBar::OnCreate
+4449=CEditView::OnCreate
+4450=CFormView::OnCreate
+4451=CFrameWnd::OnCreate
+4452=CMDIChildWnd::OnCreate
+4453=COleControl::OnCreate
+4454=COleIPFrameWnd::OnCreate
+4455=CPreviewView::OnCreate
+4456=CRichEditView::OnCreate
+4457=CToolBarCtrl::OnCreate
+4458=CView::OnCreate
+4459=CCmdTarget::OnCreateAggregates
+4460=COleControl::OnCreateAggregates
+4461=CFrameWnd::OnCreateClient
+4462=CMDIFrameWnd::OnCreateClient
+4463=COleIPFrameWnd::OnCreateControlBars
+4464=COleIPFrameWnd::OnCreateControlBars
+4465=CFrameWnd::OnCreateHelper
+4466=COleObjectFactory::OnCreateObject
+4467=COleTemplateServer::OnCreateObject
+4468=CColorDialog::OnCtlColor
+4469=CControlBar::OnCtlColor
+4470=CDialog::OnCtlColor
+4471=COlePropertyPage::OnCtlColor
+4472=CPropertyPage::OnCtlColor
+4473=CPropertySheet::OnCtlColor
+4474=CWnd::OnCtlColor
+4475=CAsyncMonikerFile::OnDataAvailable
+4476=CCachedDataPathProperty::OnDataAvailable
+4477=COleClientItem::OnDataChange
+4478=COleClientItem::XAdviseSink::OnDataChange
+4479=CDocManager::OnDDECommand
+4480=CWinApp::OnDDECommand
+4481=CFrameWnd::OnDDEExecute
+4482=CFrameWnd::OnDDEInitiate
+4483=CFrameWnd::OnDDETerminate
+4484=COleClientItem::OnDeactivate
+4485=COleServerDoc::OnDeactivate
+4486=COleClientItem::OnDeactivateAndUndo
+4487=COleClientItem::OnDeactivateUI
+4488=COleServerDoc::OnDeactivateUI
+4489=CRichEditCntrItem::OnDeactivateUI
+4490=CWnd::OnDeleteItem
+4491=CControlBar::OnDestroy
+4492=CEditView::OnDestroy
+4493=CFrameWnd::OnDestroy
+4494=CMDIChildWnd::OnDestroy
+4495=CMDIFrameWnd::OnDestroy
+4496=COleControl::OnDestroy
+4497=COleIPFrameWnd::OnDestroy
+4498=CRichEditView::OnDestroy
+4499=CTabCtrl::OnDestroy
+4500=CTreeCtrl::OnDestroy
+4501=CTreeView::OnDestroy
+4502=CView::OnDestroy
+4503=CRichEditView::OnDevModeChange
+4504=CWnd::OnDevModeChange
+4505=CToolTipCtrl::OnDisableModal
+4506=COleClientItem::OnDiscardUndoState
+4507=CSplitterWnd::OnDisplayChange
+4508=CWnd::OnDisplayChange
+4509=CPreviewView::OnDisplayPageNumber
+4510=COleFrameHook::OnDocActivate
+4511=COleServerDoc::OnDocWindowActivate
+4512=COleControl::XOleInPlaceActiveObject::OnDocWindowActivate
+4513=COleServerDoc::XOleInPlaceActiveObject::OnDocWindowActivate
+4514=CDocObjectServerItem::OnDoVerb
+4515=COleControl::OnDoVerb
+4516=COleServerItem::OnDoVerb
+4517=COleDropTarget::OnDragEnter
+4518=CView::OnDragEnter
+4519=COleDropTarget::OnDragLeave
+4520=CView::OnDragLeave
+4521=CWnd::OnDragList
+4522=COleDropTarget::OnDragOver
+4523=CView::OnDragOver
+4524=COleDropTarget::OnDragScroll
+4525=CView::OnDragScroll
+4526=CCtrlView::OnDraw
+4527=CFormView::OnDraw
+4528=COleControl::OnDraw
+4529=CPreviewView::OnDraw
+4530=CView::OnDraw
+4531=COleServerItem::OnDrawEx
+4532=CWnd::OnDrawItem
+4533=COleControl::OnDrawMetafile
+4534=CPageSetupDialog::OnDrawPage
+4535=CSplitterWnd::OnDrawSplitter
+4536=COleDropTarget::OnDrop
+4537=CView::OnDrop
+4538=COleDropTarget::OnDropEx
+4539=CView::OnDropEx
+4540=CFrameWnd::OnDropFiles
+4541=CRichEditView::OnDropFiles
+4542=COleControl::OnEdit
+4543=CEditView::OnEditChange
+4544=CFontPropPage::OnEditchangeFontstyles
+4545=COleDocument::OnEditChangeIcon
+4546=CEditView::OnEditClear
+4547=CRichEditView::OnEditClear
+4548=COleDocument::OnEditConvert
+4549=CEditView::OnEditCopy
+4550=CRichEditView::OnEditCopy
+4551=CEditView::OnEditCut
+4552=CRichEditView::OnEditCut
+4553=CEditView::OnEditFind
+4554=CRichEditView::OnEditFind
+4555=CEditView::OnEditFindReplace
+4556=CRichEditView::OnEditFindReplace
+4557=COleDocument::OnEditLinks
+4558=CEditView::OnEditPaste
+4559=CRichEditView::OnEditPaste
+4560=CRichEditView::OnEditPasteSpecial
+4561=CRichEditView::OnEditProperties
+4562=CColorPropPage::OnEditProperty
+4563=CFontPropPage::OnEditProperty
+4564=COlePropertyPage::OnEditProperty
+4565=CPicturePropPage::OnEditProperty
+4566=CStockPropPage::OnEditProperty
+4567=CEditView::OnEditRepeat
+4568=CRichEditView::OnEditRepeat
+4569=CEditView::OnEditReplace
+4570=CRichEditView::OnEditReplace
+4571=CEditView::OnEditSelectAll
+4572=CRichEditView::OnEditSelectAll
+4573=CEditView::OnEditUndo
+4574=CRichEditView::OnEditUndo
+4575=CFontPropPage::OnEditupdateFontnames
+4576=CFontPropPage::OnEditupdateFontsizes
+4577=CFrameWnd::OnEnable
+4578=COleControl::OnEnabledChanged
+4579=COleFrameHook::OnEnableModeless
+4580=CEditView::OnEndPrinting
+4581=CRichEditView::OnEndPrinting
+4582=CView::OnEndPrinting
+4583=CView::OnEndPrintPreview
+4584=CFrameWnd::OnEndSession
+4585=CFrameWnd::OnEnterIdle
+4586=COleControl::OnEnterIdle
+4587=CWnd::OnEnterIdle
+4588=COleControl::OnEnumVerbs
+4589=CFrameWnd::OnEraseBkgnd
+4590=COleResizeBar::OnEraseBkgnd
+4591=CPreviewView::OnEraseBkgnd
+4592=CToolBar::OnEraseBkgnd
+4593=CWnd::OnEraseBkgnd
+4594=CCmdTarget::OnEvent
+4595=COccManager::OnEvent
+4596=COleControlSite::OnEvent
+4597=COleControl::OnEventAdvise
+4598=CDocObjectServer::OnExecOleCmd
+4599=COleServerDoc::OnExecOleCmd
+4600=CDocument::OnFileClose
+4601=CFileDialog::OnFileNameChange
+4602=CFileDialog::OnFileNameOK
+4603=CDocManager::OnFileNew
+4604=CWinApp::OnFileNew
+4605=CDocManager::OnFileOpen
+4606=CWinApp::OnFileOpen
+4607=CView::OnFilePrint
+4608=CView::OnFilePrintPreview
+4609=CWinApp::OnFilePrintSetup
+4610=CDocument::OnFileSave
+4611=CDocument::OnFileSaveAs
+4612=COleServerDoc::OnFileSaveCopyAs
+4613=CDocument::OnFileSendMail
+4614=COleDocument::OnFileSendMail
+4615=COleServerDoc::OnFileUpdate
+4616=CCmdTarget::OnFinalRelease
+4617=CDocument::OnFinalRelease
+4618=COleControl::OnFinalRelease
+4619=COlePropertyPage::OnFinalRelease
+4620=COleServerItem::OnFinalRelease
+4621=CWnd::OnFinalRelease
+4622=COleLinkingDoc::OnFindEmbeddedItem
+4623=CEditView::OnFindNext
+4624=CRichEditView::OnFindNext
+4625=CEditView::OnFindReplaceCmd
+4626=CRichEditView::OnFindReplaceCmd
+4627=CMiniFrameWnd::OnFloatStatus
+4628=COleControlSite::XOleControlSite::OnFocus
+4629=CFileDialog::OnFolderChange
+4630=COleControl::OnFontChanged
+4631=COleControl::OnForeColorChanged
+4632=CRichEditView::OnFormatFont
+4633=COleControl::OnFrameClose
+4634=COleServerDoc::OnFrameWindowActivate
+4635=COleControl::XOleInPlaceActiveObject::OnFrameWindowActivate
+4636=COleServerDoc::XOleInPlaceActiveObject::OnFrameWindowActivate
+4637=COleControl::OnFreezeEvents
+4638=CCheckListBox::OnGetCheckPosition
+4639=COleClientItem::OnGetClipboardData
+4640=COleServerItem::OnGetClipboardData
+4641=COleClientItem::OnGetClipRect
+4642=COleControl::OnGetColorSet
+4643=COleControl::OnGetControlInfo
+4644=COleControl::OnGetDisplayString
+4645=COleControl::OnGetDlgCode
+4646=CRichEditDoc::OnGetEmbeddedItem
+4647=COleServerItem::OnGetExtent
+4648=COleControl::OnGetInPlaceMenu
+4649=COleClientItem::OnGetItemPosition
+4650=COleLinkingDoc::OnGetLinkedItem
+4651=COleServerDoc::OnGetLinkedItem
+4652=CMiniFrameWnd::OnGetMinMaxInfo
+4653=COleControl::OnGetNaturalExtent
+4654=COleControl::OnGetPredefinedStrings
+4655=COleControl::OnGetPredefinedValue
+4656=CMiniFrameWnd::OnGetText
+4657=CStatusBar::OnGetText
+4658=CMiniFrameWnd::OnGetTextLength
+4659=CStatusBar::OnGetTextLength
+4660=COleControl::OnGetViewExtent
+4661=COleControl::OnGetViewRect
+4662=COleControl::OnGetViewStatus
+4663=COleClientItem::OnGetWindowContext
+4664=CWnd::OnGrayCtlColor
+4665=CFrameWnd::OnHelp
+4666=COlePropertyPage::OnHelp
+4667=CWinApp::OnHelp
+4668=CWnd::OnHelp
+4669=CWinApp::OnHelpFinder
+4670=CWnd::OnHelpFinder
+4671=CControlBar::OnHelpHitTest
+4672=CDialog::OnHelpHitTest
+4673=CFrameWnd::OnHelpHitTest
+4674=CWinApp::OnHelpIndex
+4675=CWnd::OnHelpIndex
+4676=CCommonDialog::OnHelpInfo
+4677=CWnd::OnHelpInfo
+4678=CWinApp::OnHelpUsing
+4679=CWnd::OnHelpUsing
+4680=CDocObjectServerItem::OnHide
+4681=COleControl::OnHide
+4682=COleServerItem::OnHide
+4683=COleControl::OnHideToolBars
+4684=CFrameWnd::OnHScroll
+4685=CPreviewView::OnHScroll
+4686=CScrollView::OnHScroll
+4687=CSplitterWnd::OnHScroll
+4688=CWnd::OnHScroll
+4689=CDocTemplate::OnIdle
+4690=CDocument::OnIdle
+4691=COleDocument::OnIdle
+4692=CWinApp::OnIdle
+4693=CWinThread::OnIdle
+4694=CControlBar::OnIdleUpdateCmdUI
+4695=CFrameWnd::OnIdleUpdateCmdUI
+4696=CMDIFrameWnd::OnIdleUpdateCmdUI
+4697=COleCntrFrameWnd::OnIdleUpdateCmdUI
+4698=COleIPFrameWnd::OnIdleUpdateCmdUI
+4699=COleControl::OnInactiveMouseMove
+4700=COleControl::XPointerInactive::OnInactiveMouseMove
+4701=COleControl::OnInactiveSetCursor
+4702=COleControl::XPointerInactive::OnInactiveSetCursor
+4703=CColorPropPage::OnInitDialog
+4704=CDialog::OnInitDialog
+4705=CFontPropPage::OnInitDialog
+4706=COlePropertiesDialog::OnInitDialog
+4707=COlePropertyPage::OnInitDialog
+4708=CPicturePropPage::OnInitDialog
+4709=CPropertySheet::OnInitDialog
+4710=CFileDialog::OnInitDone
+4711=COleServerItem::OnInitFromData
+4712=CControlBar::OnInitialUpdate
+4713=CDaoRecordView::OnInitialUpdate
+4714=CFormView::OnInitialUpdate
+4715=CRecordView::OnInitialUpdate
+4716=CRichEditView::OnInitialUpdate
+4717=CView::OnInitialUpdate
+4718=CFrameWnd::OnInitMenuPopup
+4719=COleControl::OnInitMenuPopup
+4720=COleClientItem::XOleIPSite::OnInPlaceActivate
+4721=COleControlSite::XOleIPSite::OnInPlaceActivate
+4722=COleClientItem::XOleIPSite::OnInPlaceDeactivate
+4723=COleControlSite::XOleIPSite::OnInPlaceDeactivate
+4724=COleClientItem::OnInsertMenus
+4725=CRichEditView::OnInsertObject
+4726=CSplitterWnd::OnInvertTracker
+4727=CDockContext::OnKey
+4728=CCheckListBox::OnKeyDown
+4729=COleControl::OnKeyDown
+4730=CRichEditView::OnKeyDown
+4731=CSplitterWnd::OnKeyDown
+4732=COleControl::OnKeyDownEvent
+4733=COleControl::OnKeyPressEvent
+4734=COleControl::OnKeyUp
+4735=COleControl::OnKeyUpEvent
+4736=CPropertyPage::OnKillActive
+4737=COleControl::OnKillFocus
+4738=CCheckListBox::OnLBAddString
+4739=CCheckListBox::OnLBFindString
+4740=CCheckListBox::OnLBFindStringExact
+4741=CCheckListBox::OnLBGetItemData
+4742=CCheckListBox::OnLBGetText
+4743=CCheckListBox::OnLBInsertString
+4744=CFileDialog::OnLBSelChangedNotify
+4745=CCheckListBox::OnLBSelectString
+4746=CCheckListBox::OnLBSetItemData
+4747=CCheckListBox::OnLBSetItemHeight
+4748=CCheckListBox::OnLButtonDblClk
+4749=CControlBar::OnLButtonDblClk
+4750=COleControl::OnLButtonDblClk
+4751=CSplitterWnd::OnLButtonDblClk
+4752=CCheckListBox::OnLButtonDown
+4753=CControlBar::OnLButtonDown
+4754=COleControl::OnLButtonDown
+4755=COleResizeBar::OnLButtonDown
+4756=CPreviewView::OnLButtonDown
+4757=CSplitterWnd::OnLButtonDown
+4758=CMiniFrameWnd::OnLButtonUp
+4759=COleControl::OnLButtonUp
+4760=CSplitterWnd::OnLButtonUp
+4761=CAsyncMonikerFile::OnLowResource
+4762=COleControl::OnMapPropertyToPage
+4763=COleControl::OnMButtonDblClk
+4764=COleControl::OnMButtonDown
+4765=COleControl::OnMButtonUp
+4766=CMDIChildWnd::OnMDIActivate
+4767=CMDIFrameWnd::OnMDIWindowCmd
+4768=CWnd::OnMeasureItem
+4769=CMDIFrameWnd::OnMenuChar
+4770=CFrameWnd::OnMenuSelect
+4771=COleControl::OnMenuSelect
+4772=COleMessageFilter::OnMessagePending
+4773=CSocket::OnMessagePending
+4774=COleControl::OnMnemonic
+4775=COleControl::XOleControl::OnMnemonic
+4776=CControlBar::OnMouseActivate
+4777=CMDIChildWnd::OnMouseActivate
+4778=CMiniDockFrameWnd::OnMouseActivate
+4779=COleControl::OnMouseActivate
+4780=CView::OnMouseActivate
+4781=CMiniFrameWnd::OnMouseMove
+4782=COleControl::OnMouseMove
+4783=CSplitterWnd::OnMouseMove
+4784=CDaoRecordView::OnMove
+4785=COleControl::OnMove
+4786=CRecordView::OnMove
+4787=CFrameWnd::OnNcActivate
+4788=CMDIChildWnd::OnNcActivate
+4789=CMiniFrameWnd::OnNcActivate
+4790=CDockBar::OnNcCalcSize
+4791=CMiniFrameWnd::OnNcCalcSize
+4792=COleControl::OnNcCalcSize
+4793=CStatusBar::OnNcCalcSize
+4794=CToolBar::OnNcCalcSize
+4795=CMDIChildWnd::OnNcCreate
+4796=CMiniFrameWnd::OnNcCreate
+4797=COleControl::OnNcCreate
+4798=CPropertySheet::OnNcCreate
+4799=CSplitterWnd::OnNcCreate
+4800=CToolBar::OnNcCreate
+4801=CListCtrl::OnNcDestroy
+4802=CListView::OnNcDestroy
+4803=CWnd::OnNcDestroy
+4804=CMiniFrameWnd::OnNcHitTest
+4805=COleControl::OnNcHitTest
+4806=CStatusBar::OnNcHitTest
+4807=CToolBar::OnNcHitTest
+4808=CMiniDockFrameWnd::OnNcLButtonDblClk
+4809=CMiniDockFrameWnd::OnNcLButtonDown
+4810=CMiniFrameWnd::OnNcLButtonDown
+4811=COleControl::OnNcLButtonDown
+4812=CDockBar::OnNcPaint
+4813=CMiniFrameWnd::OnNcPaint
+4814=COleControl::OnNcPaint
+4815=CStatusBar::OnNcPaint
+4816=CToolBar::OnNcPaint
+4817=CDocument::OnNewDocument
+4818=COleDocument::OnNewDocument
+4819=COleLinkingDoc::OnNewDocument
+4820=COleServerDoc::OnNewEmbedding
+4821=CEnumArray::OnNext
+4822=CEnumConnPoints::OnNext
+4823=CEnumFormatEtc::OnNext
+4824=CEnumOleVerb::OnNext
+4825=CEnumUnknown::OnNext
+4826=CPreviewView::OnNextPage
+4827=CView::OnNextPaneCmd
+4828=CFileDialog::OnNotify
+4829=CPropertyPage::OnNotify
+4830=CSplitterWnd::OnNotify
+4831=CWnd::OnNotify
+4832=COleMessageFilter::OnNotRespondingDialog
+4833=CWnd::OnNTCtlColor
+4834=CPreviewView::OnNumPageChange
+4835=CColorPropPage::OnObjectsChanged
+4836=CFontPropPage::OnObjectsChanged
+4837=COlePropertyPage::OnObjectsChanged
+4838=CPicturePropPage::OnObjectsChanged
+4839=COleControl::OnOcmCtlColorBtn
+4840=COleControl::OnOcmCtlColorDlg
+4841=COleControl::OnOcmCtlColorEdit
+4842=COleControl::OnOcmCtlColorListBox
+4843=COleControl::OnOcmCtlColorMsgBox
+4844=COleControl::OnOcmCtlColorScrollBar
+4845=COleControl::OnOcmCtlColorStatic
+4846=CCommonDialog::OnOK
+4847=CDialog::OnOK
+4848=CPropertyPage::OnOK
+4849=CDocObjectServerItem::OnOpen
+4850=COleControl::OnOpen
+4851=COleServerItem::OnOpen
+4852=CDocument::OnOpenDocument
+4853=COleDocument::OnOpenDocument
+4854=COleLinkingDoc::OnOpenDocument
+4855=COleServerDoc::OnOpenEmbedding
+4856=CWinApp::OnOpenRecentFile
+4857=CAsyncSocket::OnOutOfBandData
+4858=CControlBar::OnPaint
+4859=CCtrlView::OnPaint
+4860=CDockBar::OnPaint
+4861=CFontPropPage::OnPaint
+4862=COleControl::OnPaint
+4863=COleResizeBar::OnPaint
+4864=CPicturePropPage::OnPaint
+4865=CSplitterWnd::OnPaint
+4866=CStatusBar::OnPaint
+4867=CToolBar::OnPaint
+4868=CView::OnPaint
+4869=CFrameWnd::OnPaletteChanged
+4870=COleFrameHook::OnPaletteChanged
+4871=CRichEditView::OnParaAlign
+4872=CRichEditView::OnParaCenter
+4873=CRichEditView::OnParaLeft
+4874=CRichEditView::OnParaRight
+4875=CWnd::OnParentNotify
+4876=CRichEditView::OnPasteNativeObject
+4877=CFrameWnd::OnPopMessageString
+4878=COleClientItem::XOleIPSite::OnPosRectChange
+4879=COleControlSite::XOleIPSite::OnPosRectChange
+4880=CEditView::OnPrepareDC
+4881=CPreviewView::OnPrepareDC
+4882=CRichEditView::OnPrepareDC
+4883=CScrollView::OnPrepareDC
+4884=CView::OnPrepareDC
+4885=CEditView::OnPreparePrinting
+4886=CView::OnPreparePrinting
+4887=COleFrameHook::OnPreTranslateMessage
+4888=CPreviewView::OnPreviewClose
+4889=CPreviewView::OnPreviewPrint
+4890=CPreviewView::OnPrevPage
+4891=CEditView::OnPrint
+4892=CRichEditView::OnPrint
+4893=CView::OnPrint
+4894=CRichEditView::OnPrinterChanged
+4895=CPrintDialog::OnPrintSetup
+4896=CAsyncMonikerFile::OnProgress
+4897=COleControl::OnProperties
+4898=CWnd::OnQuery3dControls
+4899=CPropertyPage::OnQueryCancel
+4900=CMiniFrameWnd::OnQueryCenterWnd
+4901=CFrameWnd::OnQueryEndSession
+4902=COleControl::OnQueryHitPoint
+4903=COleControl::OnQueryHitRect
+4904=CFrameWnd::OnQueryNewPalette
+4905=COleFrameHook::OnQueryNewPalette
+4906=COleServerItem::OnQueryUpdateItems
+4907=COleControl::OnRButtonDblClk
+4908=COleControl::OnRButtonDown
+4909=COleControl::OnRButtonUp
+4910=COleServerDoc::OnReactivateAndUndo
+4911=COleFrameHook::OnRecalcLayout
+4912=COleIPFrameWnd::OnRecalcParent
+4913=CAsyncSocket::OnReceive
+4914=COleControl::OnReflectorDestroyed
+4915=COleClientItem::OnRemoveMenus
+4916=COleClientItem::XAdviseSink::OnRename
+4917=COleControl::CControlDataSource::OnRenderData
+4918=COleServerItem::CItemDataSource::OnRenderData
+4919=COleControl::OnRenderData
+4920=COleDataSource::OnRenderData
+4921=COleServerItem::OnRenderData
+4922=COleControl::CControlDataSource::OnRenderFileData
+4923=COleServerItem::CItemDataSource::OnRenderFileData
+4924=COleControl::OnRenderFileData
+4925=COleDataSource::OnRenderFileData
+4926=COleServerItem::OnRenderFileData
+4927=COleControl::CControlDataSource::OnRenderGlobalData
+4928=COleServerItem::CItemDataSource::OnRenderGlobalData
+4929=COleControl::OnRenderGlobalData
+4930=COleDataSource::OnRenderGlobalData
+4931=COleServerItem::OnRenderGlobalData
+4932=CEditView::OnReplaceAll
+4933=CRichEditView::OnReplaceAll
+4934=CEditView::OnReplaceSel
+4935=CRichEditView::OnReplaceSel
+4936=COleControl::XFontNotification::OnRequestEdit
+4937=COleControlSite::XPropertyNotifySink::OnRequestEdit
+4938=COlePropertyPage::XPropNotifySink::OnRequestEdit
+4939=COleDocIPFrameWnd::OnRequestPositionChange
+4940=COleIPFrameWnd::OnRequestPositionChange
+4941=CEnumArray::OnReset
+4942=CPropertyPage::OnReset
+4943=COleControl::OnResetState
+4944=COleServerDoc::OnResizeBorder
+4945=COleIPFrameWnd::OnResizeChild
+4946=COleClientItem::XAdviseSink::OnSave
+4947=CDocument::OnSaveDocument
+4948=COleDocument::OnSaveDocument
+4949=COleLinkingDoc::OnSaveDocument
+4950=COleServerDoc::OnSaveDocument
+4951=COleServerDoc::OnSaveEmbedding
+4952=COleServerItem::OnSaveEmbedding
+4953=CDocObjectServer::OnSaveViewState
+4954=CScrollView::OnScroll
+4955=CView::OnScroll
+4956=COleClientItem::OnScrollBy
+4957=CScrollView::OnScrollBy
+4958=CView::OnScrollBy
+4959=CRichEditView::OnSelChange
+4960=CColorPropPage::OnSelchangeColorprop
+4961=CFontPropPage::OnSelchangeFontnames
+4962=CFontPropPage::OnSelchangeFontprop
+4963=CFontPropPage::OnSelchangeFontsizes
+4964=CFontPropPage::OnSelchangeFontstyles
+4965=CPicturePropPage::OnSelchangePictProp
+4966=CStockPropPage::OnSelchangePropname
+4967=CColorPropPage::OnSelchangeSystemcolors
+4968=CColorPropPage::OnSelect
+4969=CAsyncSocket::OnSend
+4970=CPropertyPage::OnSetActive
+4971=CToolBar::OnSetBitmapSize
+4972=CToolBar::OnSetButtonSize
+4973=COleControl::OnSetClientSite
+4974=COleServerItem::OnSetColorScheme
+4975=CFrameWnd::OnSetCursor
+4976=COleControl::OnSetCursor
+4977=COleResizeBar::OnSetCursor
+4978=CPreviewView::OnSetCursor
+4979=CSplitterWnd::OnSetCursor
+4980=COleControl::CControlDataSource::OnSetData
+4981=COleServerItem::CItemDataSource::OnSetData
+4982=COleControl::OnSetData
+4983=COleDataSource::OnSetData
+4984=COleServerItem::OnSetData
+4985=CPropertySheet::OnSetDefID
+4986=COleControl::OnSetExtent
+4987=COleServerItem::OnSetExtent
+4988=CFormView::OnSetFocus
+4989=CFrameWnd::OnSetFocus
+4990=COleControl::OnSetFocus
+4991=CCheckListBox::OnSetFont
+4992=CDialog::OnSetFont
+4993=CEditView::OnSetFont
+4994=COleServerDoc::OnSetHostNames
+4995=CDocObjectServer::OnSetItemRects
+4996=COleServerDoc::OnSetItemRects
+4997=COleClientItem::OnSetMenu
+4998=CFrameWnd::OnSetMessageString
+4999=COleControl::OnSetMessageString
+5000=COleIPFrameWnd::OnSetMessageString
+5001=CStatusBar::OnSetMinHeight
+5002=COleControl::OnSetObjectRects
+5003=CDatabase::OnSetOptions
+5004=CRecordset::OnSetOptions
+5005=COlePropertyPage::OnSetPageSite
+5006=CFrameWnd::OnSetPreviewMode
+5007=CMiniFrameWnd::OnSetText
+5008=COleControl::OnSetText
+5009=CStatusBar::OnSetText
+5010=CFileDialog::OnShareViolation
+5011=CDocObjectServerItem::OnShow
+5012=COleServerItem::OnShow
+5013=COleClientItem::OnShowControlBars
+5014=COleServerDoc::OnShowControlBars
+5015=COleServerDoc::OnShowDocument
+5016=COleClientItem::OnShowItem
+5017=COleControl::OnShowToolBars
+5018=COleDocument::OnShowViews
+5019=COleLinkingDoc::OnShowViews
+5020=COleControl::OnShowWindow
+5021=CWnd::OnShowWindow
+5022=COleClientItem::XOleClientSite::OnShowWindow
+5023=COleControlSite::XOleClientSite::OnShowWindow
+5024=CFrameWnd::OnSize
+5025=CMDIChildWnd::OnSize
+5026=CMDIFrameWnd::OnSize
+5027=COleControl::OnSize
+5028=COleIPFrameWnd::OnSize
+5029=COleResizeBar::OnSize
+5030=CPreviewView::OnSize
+5031=CScrollView::OnSize
+5032=CSplitterWnd::OnSize
+5033=CStatusBar::OnSize
+5034=CWnd::OnSize
+5035=CControlBar::OnSizeParent
+5036=CDockBar::OnSizeParent
+5037=COleResizeBar::OnSizeParent
+5038=CEnumArray::OnSkip
+5039=CSocketWnd::OnSocketDead
+5040=CSocketWnd::OnSocketNotify
+5041=CView::OnSplitCmd
+5042=CAsyncMonikerFile::OnStartBinding
+5043=CInternetSession::OnStatusCallback
+5044=CAsyncMonikerFile::OnStopBinding
+5045=CFontPropPage::OnStrikeout
+5046=CToolBar::OnSysColorChange
+5047=CWnd::OnSysColorChange
+5048=CFrameWnd::OnSysCommand
+5049=CMiniFrameWnd::OnSysCommand
+5050=CPropertySheet::OnSysCommand
+5051=CSplitterWnd::OnSysCommand
+5052=COleControl::OnSysKeyDown
+5053=COleControl::OnSysKeyUp
+5054=COleControl::OnTextChanged
+5055=CEditView::OnTextNotFound
+5056=CRichEditView::OnTextNotFound
+5057=CControlBar::OnTimer
+5058=CToolBar::OnToolHitTest
+5059=CWnd::OnToolHitTest
+5060=CFrameWnd::OnToolTipText
+5061=CFileDialog::OnTypeChange
+5062=COleControlContainer::OnUIActivate
+5063=COleClientItem::XOleIPSite::OnUIActivate
+5064=COleControlSite::XOleIPSite::OnUIActivate
+5065=COleControlContainer::OnUIDeactivate
+5066=COleClientItem::XOleIPSite::OnUIDeactivate
+5067=COleControlSite::XOleIPSite::OnUIDeactivate
+5068=CFontPropPage::OnUnderline
+5069=COleServerItem::OnUpdate
+5070=CView::OnUpdate
+5071=CRichEditView::OnUpdateBullet
+5072=CRichEditView::OnUpdateCharBold
+5073=CRichEditView::OnUpdateCharEffect
+5074=CRichEditView::OnUpdateCharItalic
+5075=CRichEditView::OnUpdateCharUnderline
+5076=CDialogBar::OnUpdateCmdUI
+5077=CDockBar::OnUpdateCmdUI
+5078=COleResizeBar::OnUpdateCmdUI
+5079=CStatusBar::OnUpdateCmdUI
+5080=CToolBar::OnUpdateCmdUI
+5081=CFrameWnd::OnUpdateContextHelp
+5082=CFrameWnd::OnUpdateControlBarMenu
+5083=COleIPFrameWnd::OnUpdateControlBarMenu
+5084=COleServerDoc::OnUpdateDocument
+5085=COleDocument::OnUpdateEditChangeIcon
+5086=COleDocument::OnUpdateEditLinksMenu
+5087=CRichEditView::OnUpdateEditPasteSpecial
+5088=CRichEditView::OnUpdateEditProperties
+5089=CEditView::OnUpdateEditUndo
+5090=CRichEditView::OnUpdateEditUndo
+5091=COleServerDoc::OnUpdateFileExit
+5092=CDocument::OnUpdateFileSendMail
+5093=COleServerDoc::OnUpdateFileUpdate
+5094=CFrameWnd::OnUpdateFrameMenu
+5095=CMDIChildWnd::OnUpdateFrameMenu
+5096=CMDIFrameWnd::OnUpdateFrameMenu
+5097=CFrameWnd::OnUpdateFrameTitle
+5098=CMDIChildWnd::OnUpdateFrameTitle
+5099=CMDIFrameWnd::OnUpdateFrameTitle
+5100=COleClientItem::OnUpdateFrameTitle
+5101=COleFrameHook::OnUpdateFrameTitle
+5102=COleServerItem::OnUpdateItems
+5103=CFrameWnd::OnUpdateKeyIndicator
+5104=CMDIFrameWnd::OnUpdateMDIWindowCmd
+5105=CEditView::OnUpdateNeedClip
+5106=CRichEditView::OnUpdateNeedClip
+5107=CEditView::OnUpdateNeedFind
+5108=CRichEditView::OnUpdateNeedFind
+5109=CEditView::OnUpdateNeedSel
+5110=CRichEditView::OnUpdateNeedSel
+5111=CEditView::OnUpdateNeedText
+5112=CRichEditView::OnUpdateNeedText
+5113=CPreviewView::OnUpdateNextPage
+5114=CView::OnUpdateNextPaneMenu
+5115=CPreviewView::OnUpdateNumPageChange
+5116=COleDocument::OnUpdateObjectVerbMenu
+5117=CRichEditView::OnUpdateParaAlign
+5118=CRichEditView::OnUpdateParaCenter
+5119=CRichEditView::OnUpdateParaLeft
+5120=CRichEditView::OnUpdateParaRight
+5121=COleDocument::OnUpdatePasteLinkMenu
+5122=COleDocument::OnUpdatePasteMenu
+5123=CPreviewView::OnUpdatePrevPage
+5124=CWinApp::OnUpdateRecentFileMenu
+5125=CDaoRecordView::OnUpdateRecordFirst
+5126=CRecordView::OnUpdateRecordFirst
+5127=CDaoRecordView::OnUpdateRecordLast
+5128=CRecordView::OnUpdateRecordLast
+5129=CDaoRecordView::OnUpdateRecordNext
+5130=CRecordView::OnUpdateRecordNext
+5131=CDaoRecordView::OnUpdateRecordPrev
+5132=CRecordView::OnUpdateRecordPrev
+5133=CView::OnUpdateSplitCmd
+5134=CPreviewView::OnUpdateZoomIn
+5135=CPreviewView::OnUpdateZoomOut
+5136=COleClientItem::XAdviseSink::OnViewChange
+5137=CWnd::OnVKeyToItem
+5138=CFrameWnd::OnVScroll
+5139=CPreviewView::OnVScroll
+5140=CScrollView::OnVScroll
+5141=CSplitterWnd::OnVScroll
+5142=CWnd::OnVScroll
+5143=CToolTipCtrl::OnWindowFromPoint
+5144=COleControl::OnWindowlessMessage
+5145=COleControl::XOleInPlaceObject::OnWindowMessage
+5146=CMDIFrameWnd::OnWindowNew
+5147=CControlBar::OnWindowPosChanging
+5148=CDockBar::OnWindowPosChanging
+5149=CMDIChildWnd::OnWindowPosChanging
+5150=COleIPFrameWnd::OnWindowPosChanging
+5151=CStatusBar::OnWindowPosChanging
+5152=CToolBar::OnWindowPosChanging
+5153=CWnd::OnWinIniChange
+5154=CPropertyPage::OnWizardBack
+5155=CPropertyPage::OnWizardFinish
+5156=CPropertyPage::OnWizardNext
+5157=CWnd::OnWndMsg
+5158=CPreviewView::OnZoomIn
+5159=CPreviewView::OnZoomOut
+5160=CAsyncMonikerFile::Open
+5161=CAsyncMonikerFile::Open
+5162=CAsyncMonikerFile::Open
+5163=CAsyncMonikerFile::Open
+5164=CAsyncMonikerFile::Open
+5165=CAsyncMonikerFile::Open
+5166=CAsyncMonikerFile::Open
+5167=CAsyncMonikerFile::Open
+5168=CDaoDatabase::Open
+5169=CDaoQueryDef::Open
+5170=CDaoRecordset::Open
+5171=CDaoRecordset::Open
+5172=CDaoRecordset::Open
+5173=CDaoTableDef::Open
+5174=CDaoWorkspace::Open
+5175=CDatabase::Open
+5176=CDataPathProperty::Open
+5177=CDataPathProperty::Open
+5178=CDataPathProperty::Open
+5179=CDataPathProperty::Open
+5180=CFile::Open
+5181=CMirrorFile::Open
+5182=CMonikerFile::Open
+5183=CMonikerFile::Open
+5184=CMonikerFile::Open
+5185=CMonikerFile::Open
+5186=CRecordset::Open
+5187=CSocketFile::Open
+5188=CStdioFile::Open
+5189=CDocObjectServer::XOleDocumentView::Open
+5190=CDocManager::OpenDocumentFile
+5191=CMultiDocTemplate::OpenDocumentFile
+5192=CSingleDocTemplate::OpenDocumentFile
+5193=CWinApp::OpenDocumentFile
+5194=CDatabase::OpenEx
+5195=CFtpConnection::OpenFile
+5196=CGopherConnection::OpenFile
+5197=COleUILinkInfo::OpenLinkSource
+5198=CHttpConnection::OpenRequest
+5199=CHttpConnection::OpenRequest
+5200=COleStreamFile::OpenStream
+5201=CInternetSession::OpenURL
+5202=CFileException::OsErrorToException
+5203=CDumpContext::OutputString
+5204=CEditView::PaginateTo
+5205=CRichEditView::PaginateTo
+5206=CPageSetupDialog::PaintHookProc
+5207=COleControl::ParentToClient
+5208=CWinApp::ParseCommandLine
+5209=COleCurrency::ParseCurrency
+5210=COleDateTime::ParseDateTime
+5211=COleControlContainer::XOleContainer::ParseDisplayName
+5212=COleLinkingDoc::XOleItemContainer::ParseDisplayName
+5213=CCommandLineInfo::ParseLast
+5214=CCommandLineInfo::ParseParam
+5215=CCommandLineInfo::ParseParam
+5216=CCommandLineInfo::ParseParamFlag
+5217=CCommandLineInfo::ParseParamNotFlag
+5218=CCommandLineInfo::ParseParamNotFlag
+5219=CRichEditCtrl::PasteSpecial
+5220=CDC::PlayMetaFile
+5221=CDC::PolyBezierTo
+5222=CDC::PolyDraw
+5223=CDC::PolylineTo
+5224=CPreviewView::PositionPage
+5225=CAsyncMonikerFile::PostBindToStream
+5226=CMonikerFile::PostBindToStream
+5227=COccManager::PostCreateDialog
+5228=CDialog::PostModal
+5229=COleControl::PostModalDialog
+5230=CControlBar::PostNcDestroy
+5231=CControlFrameWnd::PostNcDestroy
+5232=CFindReplaceDialog::PostNcDestroy
+5233=CFrameWnd::PostNcDestroy
+5234=COleCntrFrameWnd::PostNcDestroy
+5235=CReflectorWnd::PostNcDestroy
+5236=CView::PostNcDestroy
+5237=CWnd::PostNcDestroy
+5238=CRecordset::PreBindFields
+5239=CDocument::PreCloseFrame
+5240=COleDocument::PreCloseFrame
+5241=CRichEditDoc::PreCloseFrame
+5242=CCheckListBox::PreCompareItem
+5243=COccManager::PreCreateDialog
+5244=CControlBar::PreCreateWindow
+5245=CControlFrameWnd::PreCreateWindow
+5246=CCtrlView::PreCreateWindow
+5247=CEditView::PreCreateWindow
+5248=CFrameWnd::PreCreateWindow
+5249=CListView::PreCreateWindow
+5250=CMDIChildWnd::PreCreateWindow
+5251=CMDIFrameWnd::PreCreateWindow
+5252=CMiniFrameWnd::PreCreateWindow
+5253=CRichEditView::PreCreateWindow
+5254=CStatusBar::PreCreateWindow
+5255=CTreeView::PreCreateWindow
+5256=CView::PreCreateWindow
+5257=CWnd::PreCreateWindow
+5258=CCheckListBox::PreDeleteItem
+5259=CCheckListBox::PreDrawItem
+5260=CPageSetupDialog::PreDrawPage
+5261=CDialog::PreInitDialog
+5262=COleChangeSourceDialog::PreInitDialog
+5263=CCheckListBox::PreMeasureItem
+5264=CDialog::PreModal
+5265=COleControl::PreModalDialog
+5266=CRecordset::PrepareAndExecute
+5267=CDataExchange::PrepareCtrl
+5268=CDataExchange::PrepareEditCtrl
+5269=CDataExchange::PrepareOleCtrl
+5270=CRecordset::PrepareUpdateHstmt
+5271=CPropertyPage::PreProcessPageTemplate
+5272=CDragListBox::PreSubclassWindow
+5273=CWnd::PreSubclassWindow
+5274=CWnd::PreTranslateInput
+5275=CControlBar::PreTranslateMessage
+5276=CDialog::PreTranslateMessage
+5277=CFormView::PreTranslateMessage
+5278=CFrameWnd::PreTranslateMessage
+5279=CMDIChildWnd::PreTranslateMessage
+5280=CMDIFrameWnd::PreTranslateMessage
+5281=COleIPFrameWnd::PreTranslateMessage
+5282=COlePropertyPage::PreTranslateMessage
+5283=CPropertyPage::PreTranslateMessage
+5284=CPropertySheet::PreTranslateMessage
+5285=CWinThread::PreTranslateMessage
+5286=CWnd::PreTranslateMessage
+5287=CDocObjectServer::XPrint::Print
+5288=CPreviewDC::PrinterDPtoScreenDP
+5289=CEditView::PrintInsideRect
+5290=CRichEditView::PrintInsideRect
+5291=CRichEditView::PrintPage
+5292=COleDispatchException::Process
+5293=COleException::Process
+5294=CSocket::ProcessAuxQueue
+5295=CFrameWnd::ProcessHelpMsg
+5296=CWinThread::ProcessMessageFilter
+5297=CWinApp::ProcessShellCommand
+5298=CWinApp::ProcessWndProcException
+5299=CWinThread::ProcessWndProcException
+5300=COleSafeArray::PtrOfIndex
+5301=CDC::PtVisible
+5302=CMetaFileDC::PtVisible
+5303=CWinThread::PumpMessage
+5304=CSocket::PumpMessages
+5305=CCmdTarget::PushStackArgs
+5306=COleSafeArray::PutElement
+5307=CFtpConnection::PutFile
+5308=PX_Blob
+5309=PX_Bool
+5310=PX_Bool
+5311=PX_Color
+5312=PX_Color
+5313=PX_Currency
+5314=PX_Currency
+5315=PX_DataPath
+5316=PX_DataPath
+5317=PX_Double
+5318=PX_Double
+5319=PX_Float
+5320=PX_Float
+5321=PX_Font
+5322=PX_IUnknown
+5323=PX_Long
+5324=PX_Long
+5325=PX_Picture
+5326=PX_Picture
+5327=PX_Short
+5328=PX_Short
+5329=PX_String
+5330=PX_String
+5331=PX_String
+5332=PX_ULong
+5333=PX_ULong
+5334=PX_UShort
+5335=PX_UShort
+5336=PX_VBXFontConvert
+5337=CRichEditView::QueryAcceptData
+5338=CRichEditView::XRichEditOleCallback::QueryAcceptData
+5339=CCmdTarget::QueryAggregates
+5340=COleDropSource::QueryContinueDrag
+5341=COleDropSource::XDropSource::QueryContinueDrag
+5342=COleControl::QueryDefHandler
+5343=COleControl::XDataObject::QueryGetData
+5344=COleDataSource::XDataObject::QueryGetData
+5345=COleServerDoc::XDataObject::QueryGetData
+5346=COleServerItem::XDataObject::QueryGetData
+5347=COleControl::XViewObject::QueryHitPoint
+5348=COleControl::XViewObject::QueryHitRect
+5349=CHttpFile::QueryInfo
+5350=CHttpFile::QueryInfo
+5351=CHttpFile::QueryInfo
+5352=CHttpFile::QueryInfoStatusCode
+5353=CRichEditView::XRichEditOleCallback::QueryInsertObject
+5354=_CIP<IBindHost
+5355=CArchiveStream::QueryInterface
+5356=CBlobProperty::QueryInterface
+5357=CInnerUnknown::QueryInterface
+5358=COleConnPtContainer::QueryInterface
+5359=COleDispatchImpl::QueryInterface
+5360=COleUILinkInfo::QueryInterface
+5361=COleClientItem::XAdviseSink::QueryInterface
+5362=COleControlSite::XAmbientProps::QueryInterface
+5363=COleControlSite::XBoundObjectSite::QueryInterface
+5364=COleObjectFactory::XClassFactory::QueryInterface
+5365=CConnectionPoint::XConnPt::QueryInterface
+5366=COleControl::XDataObject::QueryInterface
+5367=COleDataSource::XDataObject::QueryInterface
+5368=COleServerDoc::XDataObject::QueryInterface
+5369=COleServerItem::XDataObject::QueryInterface
+5370=COleDropSource::XDropSource::QueryInterface
+5371=COleDropTarget::XDropTarget::QueryInterface
+5372=CEnumArray::XEnumVOID::QueryInterface
+5373=COleControlSite::XEventSink::QueryInterface
+5374=COleControl::XFontNotification::QueryInterface
+5375=COleMessageFilter::XMessageFilter::QueryInterface
+5376=COleControlSite::XNotifyDBEvents::QueryInterface
+5377=COleControl::XOleCache::QueryInterface
+5378=COleClientItem::XOleClientSite::QueryInterface
+5379=COleControlSite::XOleClientSite::QueryInterface
+5380=CDocObjectServer::XOleCommandTarget::QueryInterface
+5381=COleControlContainer::XOleContainer::QueryInterface
+5382=COleControl::XOleControl::QueryInterface
+5383=COleControlSite::XOleControlSite::QueryInterface
+5384=CDocObjectServer::XOleDocument::QueryInterface
+5385=CDocObjectServer::XOleDocumentView::QueryInterface
+5386=COleControl::XOleInPlaceActiveObject::QueryInterface
+5387=COleServerDoc::XOleInPlaceActiveObject::QueryInterface
+5388=COleFrameHook::XOleInPlaceFrame::QueryInterface
+5389=COleControl::XOleInPlaceObject::QueryInterface
+5390=COleServerDoc::XOleInPlaceObject::QueryInterface
+5391=COleControlContainer::XOleIPFrame::QueryInterface
+5392=COleClientItem::XOleIPSite::QueryInterface
+5393=COleControlSite::XOleIPSite::QueryInterface
+5394=COleLinkingDoc::XOleItemContainer::QueryInterface
+5395=CDocObjectServer::XOleObject::QueryInterface
+5396=COleControl::XOleObject::QueryInterface
+5397=COleServerDoc::XOleObject::QueryInterface
+5398=COleServerItem::XOleObject::QueryInterface
+5399=COlePropertiesDialog::XOleUIObjInfo::QueryInterface
+5400=COleControl::XPerPropertyBrowsing::QueryInterface
+5401=COleLinkingDoc::XPersistFile::QueryInterface
+5402=COleControl::XPersistMemory::QueryInterface
+5403=COleControl::XPersistPropertyBag::QueryInterface
+5404=COleControl::XPersistStorage::QueryInterface
+5405=COleServerDoc::XPersistStorage::QueryInterface
+5406=COleControl::XPersistStreamInit::QueryInterface
+5407=COleControl::XPointerInactive::QueryInterface
+5408=CDocObjectServer::XPrint::QueryInterface
+5409=COleControlSite::XPropertyNotifySink::QueryInterface
+5410=COlePropertyPage::XPropertyPage::QueryInterface
+5411=COlePropertyPage::XPropNotifySink::QueryInterface
+5412=COleControl::XProvideClassInfo::QueryInterface
+5413=COleControl::XQuickActivate::QueryInterface
+5414=CRichEditView::XRichEditOleCallback::QueryInterface
+5415=COleControl::XSpecifyPropertyPages::QueryInterface
+5416=COleControl::XViewObject::QueryInterface
+5417=CInternetConnection::QueryOption
+5418=CInternetConnection::QueryOption
+5419=CInternetConnection::QueryOption
+5420=CInternetFile::QueryOption
+5421=CInternetFile::QueryOption
+5422=CInternetFile::QueryOption
+5423=CInternetSession::QueryOption
+5424=CInternetSession::QueryOption
+5425=CInternetSession::QueryOption
+5426=CPropertyPage::QuerySiblings
+5427=CConnectionPoint::QuerySinkInterface
+5428=COleControl::XEventConnPt::QuerySinkInterface
+5429=CDocObjectServer::XOleCommandTarget::QueryStatus
+5430=CFontHolder::QueryTextMetrics
+5431=COleControlSite::QuickActivate
+5432=COleControl::XQuickActivate::QuickActivate
+5433=COleClientItem::ReactivateAndUndo
+5434=COleControl::XOleInPlaceObject::ReactivateAndUndo
+5435=COleServerDoc::XOleInPlaceObject::ReactivateAndUndo
+5436=CArchive::Read
+5437=CArchiveStream::Read
+5438=CFile::Read
+5439=CImageList::Read
+5440=CInternetFile::Read
+5441=CMemFile::Read
+5442=COleStreamFile::Read
+5443=CSocketFile::Read
+5444=CStdioFile::Read
+5445=CArchive::ReadClass
+5446=CArchive::ReadCount
+5447=CEditView::ReadFromArchive
+5448=CProperty::ReadFromStream
+5449=CPropertySection::ReadFromStream
+5450=CPropertySet::ReadFromStream
+5451=COleClientItem::ReadItem
+5452=COleClientItem::ReadItemCompound
+5453=COleClientItem::ReadItemFlat
+5454=CRecentFileList::ReadList
+5455=CPropertySection::ReadNameDictFromStream
+5456=CArchive::ReadObject
+5457=CArchive::ReadString
+5458=CArchive::ReadString
+5459=CInternetFile::ReadString
+5460=CInternetFile::ReadString
+5461=CStdioFile::ReadString
+5462=CStdioFile::ReadString
+5463=CMemFile::Realloc
+5464=CSharedFile::Realloc
+5465=CFieldExchange::ReallocLongBinary
+5466=CRecordset::RebindParams
+5467=CControlBar::RecalcDelayShow
+5468=CFrameWnd::RecalcLayout
+5469=CMiniDockFrameWnd::RecalcLayout
+5470=COleCntrFrameWnd::RecalcLayout
+5471=COleDocIPFrameWnd::RecalcLayout
+5472=COleIPFrameWnd::RecalcLayout
+5473=CSplitterWnd::RecalcLayout
+5474=CAsyncSocket::Receive
+5475=CSocket::Receive
+5476=CAsyncSocket::ReceiveFrom
+5477=CAsyncSocket::ReceiveFromHelper
+5478=CSocket::ReceiveFromHelper
+5479=COleControl::RecreateControlWindow
+5480=CRectconstCFrameWnd::rectDefault
+5481=CDC::RectVisible
+5482=CMetaFileDC::RectVisible
+5483=COleSafeArray::Redim
+5484=CDockBar::ReDockControlBar
+5485=CFrameWnd::ReDockControlBar
+5486=CWnd::ReflectChildNotify
+5487=CWnd::ReflectLastMsg
+5488=COleControl::Refresh
+5489=CDaoTableDef::RefreshLink
+5490=CRecordset::RefreshRowset
+5491=COleDropTarget::Register
+5492=COleLinkingDoc::Register
+5493=COleMessageFilter::Register
+5494=COleObjectFactory::Register
+5495=COleTemplateServer::Register
+5496=COleObjectFactory::RegisterAll
+5497=COleLinkingDoc::RegisterIfServerAttached
+5498=CDocManager::RegisterShellFileTypes
+5499=CWinApp::RegisterShellFileTypes
+5500=CWinApp::RegisterShellFileTypesCompat
+5501=CArchiveStream::Release
+5502=CBlobProperty::Release
+5503=CInnerUnknown::Release
+5504=COleClientItem::Release
+5505=COleConnPtContainer::Release
+5506=COleDataObject::Release
+5507=COleDispatchImpl::Release
+5508=COleUILinkInfo::Release
+5509=CString::Release
+5510=CString::Release
+5511=COleClientItem::XAdviseSink::Release
+5512=COleControlSite::XAmbientProps::Release
+5513=COleControlSite::XBoundObjectSite::Release
+5514=COleObjectFactory::XClassFactory::Release
+5515=CConnectionPoint::XConnPt::Release
+5516=COleControl::XDataObject::Release
+5517=COleDataSource::XDataObject::Release
+5518=COleServerDoc::XDataObject::Release
+5519=COleServerItem::XDataObject::Release
+5520=COleDropSource::XDropSource::Release
+5521=COleDropTarget::XDropTarget::Release
+5522=CEnumArray::XEnumVOID::Release
+5523=COleControlSite::XEventSink::Release
+5524=COleControl::XFontNotification::Release
+5525=COleMessageFilter::XMessageFilter::Release
+5526=COleControlSite::XNotifyDBEvents::Release
+5527=COleControl::XOleCache::Release
+5528=COleClientItem::XOleClientSite::Release
+5529=COleControlSite::XOleClientSite::Release
+5530=CDocObjectServer::XOleCommandTarget::Release
+5531=COleControlContainer::XOleContainer::Release
+5532=COleControl::XOleControl::Release
+5533=COleControlSite::XOleControlSite::Release
+5534=CDocObjectServer::XOleDocument::Release
+5535=CDocObjectServer::XOleDocumentView::Release
+5536=COleControl::XOleInPlaceActiveObject::Release
+5537=COleServerDoc::XOleInPlaceActiveObject::Release
+5538=COleFrameHook::XOleInPlaceFrame::Release
+5539=COleControl::XOleInPlaceObject::Release
+5540=COleServerDoc::XOleInPlaceObject::Release
+5541=COleControlContainer::XOleIPFrame::Release
+5542=COleClientItem::XOleIPSite::Release
+5543=COleControlSite::XOleIPSite::Release
+5544=COleLinkingDoc::XOleItemContainer::Release
+5545=CDocObjectServer::XOleObject::Release
+5546=COleControl::XOleObject::Release
+5547=COleServerDoc::XOleObject::Release
+5548=COleServerItem::XOleObject::Release
+5549=COlePropertiesDialog::XOleUIObjInfo::Release
+5550=COleControl::XPerPropertyBrowsing::Release
+5551=COleLinkingDoc::XPersistFile::Release
+5552=COleControl::XPersistMemory::Release
+5553=COleControl::XPersistPropertyBag::Release
+5554=COleControl::XPersistStorage::Release
+5555=COleServerDoc::XPersistStorage::Release
+5556=COleControl::XPersistStreamInit::Release
+5557=COleControl::XPointerInactive::Release
+5558=CDocObjectServer::XPrint::Release
+5559=COleControlSite::XPropertyNotifySink::Release
+5560=COlePropertyPage::XPropertyPage::Release
+5561=COlePropertyPage::XPropNotifySink::Release
+5562=COleControl::XProvideClassInfo::Release
+5563=COleControl::XQuickActivate::Release
+5564=CRichEditView::XRichEditOleCallback::Release
+5565=COleControl::XSpecifyPropertyPages::Release
+5566=COleControl::XViewObject::Release
+5567=CDC::ReleaseAttribDC
+5568=CString::ReleaseBuffer
+5569=COleControl::ReleaseCapture
+5570=COleControl::ReleaseDC
+5571=COleDispatchDriver::ReleaseDispatch
+5572=CDocObjectServer::ReleaseDocSite
+5573=CDocument::ReleaseFile
+5574=CFontHolder::ReleaseFont
+5575=CDC::ReleaseOutputDC
+5576=CMetaFileDC::ReleaseOutputDC
+5577=CPreviewDC::ReleaseOutputDC
+5578=COleClientItem::Reload
+5579=CFile::Remove
+5580=CFtpConnection::Remove
+5581=CPropertySection::Remove
+5582=CPropertySet::Remove
+5583=CPropertySet::Remove
+5584=CRecentFileList::Remove
+5585=CSimpleList::Remove
+5586=CMapPtrToPtr::RemoveAll
+5587=CMapPtrToWord::RemoveAll
+5588=CMapStringToOb::RemoveAll
+5589=CMapStringToPtr::RemoveAll
+5590=CMapStringToString::RemoveAll
+5591=CMapWordToOb::RemoveAll
+5592=CMapWordToPtr::RemoveAll
+5593=CObList::RemoveAll
+5594=CPropertySection::RemoveAll
+5595=CPropertySet::RemoveAll
+5596=CPtrList::RemoveAll
+5597=CStringList::RemoveAll
+5598=CByteArray::RemoveAt
+5599=CDWordArray::RemoveAt
+5600=CObArray::RemoveAt
+5601=CObList::RemoveAt
+5602=CPtrArray::RemoveAt
+5603=CPtrList::RemoveAt
+5604=CStringArray::RemoveAt
+5605=CStringList::RemoveAt
+5606=CUIntArray::RemoveAt
+5607=CWordArray::RemoveAt
+5608=CDockBar::RemoveControlBar
+5609=CFrameWnd::RemoveControlBar
+5610=CFtpConnection::RemoveDirectoryW
+5611=CDocTemplate::RemoveDocument
+5612=CMultiDocTemplate::RemoveDocument
+5613=CSingleDocTemplate::RemoveDocument
+5614=COleControl::RemoveFrameLevelUI
+5615=CFrameWnd::RemoveFrameWnd
+5616=CObList::RemoveHead
+5617=CPtrList::RemoveHead
+5618=CStringList::RemoveHead
+5619=CListCtrl::RemoveImageList
+5620=CListView::RemoveImageList
+5621=CTreeCtrl::RemoveImageList
+5622=CTreeView::RemoveImageList
+5623=COleDocument::RemoveItem
+5624=CMapPtrToPtr::RemoveKey
+5625=CMapPtrToWord::RemoveKey
+5626=CMapStringToOb::RemoveKey
+5627=CMapStringToPtr::RemoveKey
+5628=CMapStringToString::RemoveKey
+5629=CMapWordToOb::RemoveKey
+5630=CMapWordToPtr::RemoveKey
+5631=COleFrameHook::XOleInPlaceFrame::RemoveMenus
+5632=COleControlContainer::XOleIPFrame::RemoveMenus
+5633=CPropertySheet::RemovePage
+5634=CPropertySheet::RemovePage
+5635=CDockBar::RemovePlaceHolder
+5636=CDataBoundProperty::RemoveSource
+5637=CObList::RemoveTail
+5638=CPtrList::RemoveTail
+5639=CStringList::RemoveTail
+5640=CDocument::RemoveView
+5641=CFile::Rename
+5642=CFtpConnection::Rename
+5643=CPictureHolder::Render
+5644=CDaoWorkspace::RepairDatabase
+5645=COleControl::ReparentControlWindow
+5646=CDatabase::ReplaceBrackets
+5647=CException::ReportError
+5648=COleClientItem::ReportError
+5649=CDocument::ReportSaveLoadException
+5650=COleLinkingDoc::ReportSaveLoadException
+5651=CWnd::RepositionBars
+5652=COleIPFrameWnd::RepositionFrame
+5653=CDaoRecordset::Requery
+5654=CRecordset::Requery
+5655=COleFrameHook::XOleInPlaceFrame::RequestBorderSpace
+5656=COleControlContainer::XOleIPFrame::RequestBorderSpace
+5657=COleObjectFactory::XClassFactory::RequestLicKey
+5658=COleClientItem::XOleClientSite::RequestNewObjectLayout
+5659=COleControlSite::XOleClientSite::RequestNewObjectLayout
+5660=COleServerDoc::RequestPositionChange
+5661=CEnumArray::XEnumVOID::Reset
+5662=CRecordset::ResetCursor
+5663=CCachedDataPathProperty::ResetData
+5664=CDataPathProperty::ResetData
+5665=COleControl::ResetStockProps
+5666=CControlBar::ResetTimer
+5667=COleControl::ResetVersion
+5668=COleControl::XOleInPlaceActiveObject::ResizeBorder
+5669=COleServerDoc::XOleInPlaceActiveObject::ResizeBorder
+5670=COleControl::ResizeFrameWindow
+5671=COleSafeArray::ResizeOneDim
+5672=COleControl::ResizeOpenControl
+5673=CScrollView::ResizeParentToFit
+5674=CDC::RestoreDC
+5675=CPreviewDC::RestoreDC
+5676=CToolBarCtrl::RestoreState
+5677=CCmdTarget::RestoreWaitCursor
+5678=COleMessageFilter::XMessageFilter::RetryRejectedCall
+5679=CString::ReverseFind
+5680=CArchiveStream::Revert
+5681=COleDropTarget::Revoke
+5682=COleLinkingDoc::Revoke
+5683=COleMessageFilter::Revoke
+5684=COleObjectFactory::Revoke
+5685=COleObjectFactory::RevokeAll
+5686=RFX_Binary
+5687=RFX_Binary_Bulk
+5688=RFX_Bool
+5689=RFX_Bool_Bulk
+5690=RFX_Byte
+5691=RFX_Byte_Bulk
+5692=RFX_Date
+5693=RFX_Date
+5694=RFX_Date_Bulk
+5695=RFX_Double
+5696=RFX_Double_Bulk
+5697=RFX_Int
+5698=RFX_Int_Bulk
+5699=RFX_Long
+5700=RFX_Long_Bulk
+5701=RFX_LongBinary
+5702=RFX_Single
+5703=RFX_Single_Bulk
+5704=RFX_Text
+5705=RFX_Text_Bulk
+5706=CString::Right
+5707=CDaoWorkspace::Rollback
+5708=CDatabase::Rollback
+5709=COleClientItem::Run
+5710=CWinApp::Run
+5711=CWinThread::Run
+5712=CWinApp::RunAutomated
+5713=CWinApp::RunEmbedded
+5714=CWnd::RunModalLoop
+5715=COleControlSite::SafeSetProperty
+5716=CEditView::SameAsSelected
+5717=CRichEditView::SameAsSelected
+5718=CBlobProperty::Save
+5719=COleLinkingDoc::XPersistFile::Save
+5720=COleControl::XPersistMemory::Save
+5721=COleControl::XPersistPropertyBag::Save
+5722=COleControl::XPersistStorage::Save
+5723=COleServerDoc::XPersistStorage::Save
+5724=COleControl::XPersistStreamInit::Save
+5725=CDocManager::SaveAllModified
+5726=CDocTemplate::SaveAllModified
+5727=CWinApp::SaveAllModified
+5728=CFrameWnd::SaveBarState
+5729=COleLinkingDoc::XPersistFile::SaveCompleted
+5730=COleControl::XPersistStorage::SaveCompleted
+5731=COleServerDoc::XPersistStorage::SaveCompleted
+5732=CDC::SaveDC
+5733=CPreviewDC::SaveDC
+5734=COleServerDoc::SaveEmbedding
+5735=CFormView::SaveFocusControl
+5736=CDocument::SaveModified
+5737=COleDocument::SaveModified
+5738=COleServerDoc::SaveModified
+5739=COleServerDoc::SaveModifiedPrompt
+5740=COleClientItem::XOleClientSite::SaveObject
+5741=COleControlSite::XOleClientSite::SaveObject
+5742=CControlBarInfo::SaveState
+5743=CDockState::SaveState
+5744=COleControl::SaveState
+5745=CToolBarCtrl::SaveState
+5746=CWinApp::SaveStdProfileSettings
+5747=COleDocument::SaveToStorage
+5748=COleLinkingDoc::SaveToStorage
+5749=CDocObjectServer::XOleDocumentView::SaveViewState
+5750=CDockState::ScalePoint
+5751=CDockState::ScaleRectPos
+5752=CDC::ScaleViewportExt
+5753=CMetaFileDC::ScaleViewportExt
+5754=CPreviewDC::ScaleViewportExt
+5755=CDC::ScaleWindowExt
+5756=CPreviewDC::ScaleWindowExt
+5757=COleClientItem::XOleIPSite::Scroll
+5758=COleControlSite::XOleIPSite::Scroll
+5759=COleControlContainer::ScrollChildren
+5760=COleServerDoc::ScrollContainerBy
+5761=CScrollView::ScrollToDevicePosition
+5762=CScrollView::ScrollToPosition
+5763=COleControl::ScrollWindow
+5764=CWnd::ScrollWindow
+5765=CWnd::ScrollWindowEx
+5766=CArchiveStream::Seek
+5767=CDaoRecordset::Seek
+5768=CDaoRecordset::Seek
+5769=CFile::Seek
+5770=CInternetFile::Seek
+5771=CMemFile::Seek
+5772=COleStreamFile::Seek
+5773=CSocketFile::Seek
+5774=CStdioFile::Seek
+5775=CFontHolder::Select
+5776=CDC::SelectClipPath
+5777=CDC::SelectClipRgn
+5778=CDC::SelectClipRgn
+5779=CFontPropPage::SelectFontFromList
+5780=COleControl::SelectFontObject
+5781=CDC::SelectGdiObject
+5782=CDC::SelectObject
+5783=CDC::SelectObject
+5784=CDC::SelectObject
+5785=CDC::SelectObject
+5786=CPreviewDC::SelectObject
+5787=CDC::SelectPalette
+5788=CWinApp::SelectPrinter
+5789=COleControl::SelectStockFont
+5790=CDC::SelectStockObject
+5791=CPreviewDC::SelectStockObject
+5792=CAsyncSocket::Send
+5793=CSocket::Send
+5794=COleControl::SendAdvise
+5795=CWnd::SendChildNotifyLastMsg
+5796=CSocket::SendChunk
+5797=COleControlContainer::SendDlgItemMessageW
+5798=CWnd::SendDlgItemMessageW
+5799=CDocument::SendInitialUpdate
+5800=CRecordset::SendLongBinaryData
+5801=CWnd::SendMessageToDescendants
+5802=COleControlSite::SendMnemonic
+5803=CHttpFile::SendRequest
+5804=CHttpFile::SendRequest
+5805=CAsyncSocket::SendTo
+5806=CAsyncSocket::SendToHelper
+5807=CSocket::SendToHelper
+5808=CByteArray::Serialize
+5809=CControlBarInfo::Serialize
+5810=CDocItem::Serialize
+5811=CDockState::Serialize
+5812=CDWordArray::Serialize
+5813=CEditView::Serialize
+5814=CMapStringToOb::Serialize
+5815=CMapStringToString::Serialize
+5816=CMapWordToOb::Serialize
+5817=CObArray::Serialize
+5818=CObject::Serialize
+5819=CObList::Serialize
+5820=COleClientItem::Serialize
+5821=COleControl::Serialize
+5822=COleDocument::Serialize
+5823=CRichEditDoc::Serialize
+5824=CRichEditView::Serialize
+5825=CStringArray::Serialize
+5826=CStringList::Serialize
+5827=CWordArray::Serialize
+5828=CArchive::SerializeClass
+5829=SerializeElements
+5830=SerializeElements
+5831=COleControl::SerializeExtent
+5832=CEditView::SerializeRaw
+5833=COleControl::SerializeStockProps
+5834=COleControl::SerializeVersion
+5835=CProperty::Set
+5836=CProperty::Set
+5837=CProperty::Set
+5838=CPropertySection::Set
+5839=CPropertySection::Set
+5840=CPropertySet::Set
+5841=CPropertySet::Set
+5842=CDaoRecordset::SetAbsolutePosition
+5843=COleFrameHook::XOleInPlaceFrame::SetActiveObject
+5844=COleControlContainer::XOleIPFrame::SetActiveObject
+5845=CPropertySheet::SetActivePage
+5846=CPropertySheet::SetActivePage
+5847=CSplitterWnd::SetActivePane
+5848=CFrameWnd::SetActiveView
+5849=COleControl::XViewObject::SetAdvise
+5850=COleControl::SetAppearance
+5851=CDC::SetArcDirection
+5852=CString::SetAt
+5853=CByteArray::SetAtGrow
+5854=CDWordArray::SetAtGrow
+5855=CObArray::SetAtGrow
+5856=CPtrArray::SetAtGrow
+5857=CStringArray::SetAtGrow
+5858=CUIntArray::SetAtGrow
+5859=CWordArray::SetAtGrow
+5860=CDC::SetAttribDC
+5861=CMetaFileDC::SetAttribDC
+5862=CPreviewDC::SetAttribDC
+5863=CDaoTableDef::SetAttributes
+5864=COleControl::SetBackColor
+5865=CControlBar::SetBarInfo
+5866=CDockBar::SetBarInfo
+5867=CControlBar::SetBarStyle
+5868=CToolBar::SetBitmap
+5869=CDC::SetBkColor
+5870=CPreviewDC::SetBkColor
+5871=CDC::SetBkMode
+5872=CDaoRecordset::SetBookmark
+5873=CRecordset::SetBookmark
+5874=COleFrameHook::XOleInPlaceFrame::SetBorderSpace
+5875=COleControlContainer::XOleIPFrame::SetBorderSpace
+5876=COleControl::SetBorderStyle
+5877=CColorPropPage::SetButton
+5878=CToolBar::SetButtonInfo
+5879=CToolBar::SetButtons
+5880=CToolBar::SetButtonStyle
+5881=CToolBar::SetButtonText
+5882=CDaoRecordset::SetCacheSize
+5883=CDaoRecordset::SetCacheStart
+5884=COleControl::SetCapture
+5885=CRichEditView::SetCharFormat
+5886=CCheckListBox::SetCheck
+5887=CCmdUI::SetCheck
+5888=COleCmdUI::SetCheck
+5889=CStatusCmdUI::SetCheck
+5890=CTestCmdUI::SetCheck
+5891=CToolCmdUI::SetCheck
+5892=CCheckListBox::SetCheckStyle
+5893=CPropertySet::SetClassID
+5894=CDataBoundProperty::SetClientSite
+5895=CDocObjectServer::XOleObject::SetClientSite
+5896=COleControl::XOleObject::SetClientSite
+5897=COleServerDoc::XOleObject::SetClientSite
+5898=COleServerItem::XOleObject::SetClientSite
+5899=COleDataSource::SetClipboard
+5900=CDC::SetColorAdjustment
+5901=CColorPropPage::SetColorProp
+5902=CDocObjectServer::XOleObject::SetColorScheme
+5903=COleControl::XOleObject::SetColorScheme
+5904=COleServerDoc::XOleObject::SetColorScheme
+5905=COleServerItem::XOleObject::SetColorScheme
+5906=CSplitterWnd::SetColumnInfo
+5907=CRecordset::SetConcurrencyAndCursorType
+5908=CDaoQueryDef::SetConnect
+5909=CDaoTableDef::SetConnect
+5910=CDocTemplate::SetContainerInfo
+5911=COleControl::XQuickActivate::SetContentExtent
+5912=CReflectorWnd::SetControl
+5913=COleControl::SetControlSize
+5914=COlePropertyPage::SetControlStatus
+5915=CFileDialog::SetControlText
+5916=COleCurrency::SetCurrency
+5917=CColorDialog::SetCurrentColor
+5918=CFtpConnection::SetCurrentDirectoryW
+5919=CWinApp::SetCurrentHandles
+5920=CDaoRecordset::SetCurrentIndex
+5921=CPreviewView::SetCurrentPage
+5922=CRectTracker::SetCursor
+5923=CDaoRecordset::SetCursorAttributes
+5924=COleControl::XDataObject::SetData
+5925=COleDataSource::XDataObject::SetData
+5926=COleServerDoc::XDataObject::SetData
+5927=COleServerItem::XDataObject::SetData
+5928=COleControl::XOleCache::SetData
+5929=COleDateTime::SetDateTime
+5930=COleDateTimeSpan::SetDateTimeSpan
+5931=COccManager::SetDefaultButton
+5932=COleControlSite::SetDefaultButton
+5933=CRichEditCtrl::SetDefaultCharFormat
+5934=CDaoWorkspace::SetDefaultPassword
+5935=CMultiDocTemplate::SetDefaultTitle
+5936=CSingleDocTemplate::SetDefaultTitle
+5937=CDaoWorkspace::SetDefaultUser
+5938=CFileDialog::SetDefExt
+5939=CWinApp::SetDialogBkColor
+5940=COlePropertyPage::SetDialogResource
+5941=CDaoRecordset::SetDirtyFields
+5942=CDaoRecordset::SetDirtyFieldStatus
+5943=CRecordset::SetDirtyFieldStatus
+5944=COleControlSite::SetDlgCtrlID
+5945=CWnd::SetDlgCtrlID
+5946=COleControlContainer::SetDlgItemInt
+5947=CWnd::SetDlgItemInt
+5948=COleControlContainer::SetDlgItemTextW
+5949=CWnd::SetDlgItemTextW
+5950=CFrameWnd::SetDockState
+5951=CDocObjectServer::SetDocSite
+5952=COleClientItem::SetDrawAspect
+5953=CRichEditCntrItem::SetDrawAspect
+5954=CDataBoundProperty::SetDSCSite
+5955=COleControl::SetEnabled
+5956=COleClientItem::SetExtent
+5957=COleControlSite::SetExtent
+5958=CDocObjectServer::XOleObject::SetExtent
+5959=COleControl::XOleObject::SetExtent
+5960=COleServerDoc::XOleObject::SetExtent
+5961=COleServerItem::XOleObject::SetExtent
+5962=CColorButton::SetFaceColor
+5963=CDaoRecordset::SetFieldDirty
+5964=CRecordset::SetFieldDirty
+5965=CDaoRecordset::SetFieldNull
+5966=CRecordset::SetFieldNull
+5967=CRecordset::SetFieldStatus
+5968=CDaoRecordset::SetFieldValue
+5969=CDaoRecordset::SetFieldValue
+5970=CDaoRecordset::SetFieldValue
+5971=CDaoRecordset::SetFieldValue
+5972=CDaoRecordset::SetFieldValueNull
+5973=CDaoRecordset::SetFieldValueNull
+5974=CFile::SetFilePath
+5975=COleControl::SetFocus
+5976=COleControlSite::SetFocus
+5977=CWnd::SetFocus
+5978=CDialogTemplate::SetFont
+5979=CFontHolder::SetFont
+5980=COleControl::SetFont
+5981=CFontPropPage::SetFontProps
+5982=COleControl::SetForeColor
+5983=CPropertySection::SetFormatID
+5984=CPropertySet::SetFormatVersion
+5985=CSharedFile::SetHandle
+5986=CToolBar::SetHeight
+5987=CFrameWnd::SetHelpCapture
+5988=COlePropertyPage::SetHelpInfo
+5989=COleClientItem::SetHostNames
+5990=CDocObjectServer::XOleObject::SetHostNames
+5991=COleControl::XOleObject::SetHostNames
+5992=COleServerDoc::XOleObject::SetHostNames
+5993=COleServerItem::XOleObject::SetHostNames
+5994=COleClientItem::SetIconicMetafile
+5995=CProperty::SetID
+5996=CStatusBar::SetIndicators
+5997=CDaoWorkspace::SetIniPath
+5998=COleControl::SetInitialDataFormats
+5999=CDocObjectServer::XPrint::SetInitialPageNum
+6000=COleControl::SetInitialSize
+6001=CDocObjectServer::XOleDocumentView::SetInPlaceSite
+6002=CDaoWorkspace::SetIsolateODBCTrans
+6003=CListCtrl::SetItem
+6004=CTreeCtrl::SetItem
+6005=COleClientItem::SetItemRects
+6006=CFile::SetLength
+6007=CInternetFile::SetLength
+6008=CMemFile::SetLength
+6009=COleStreamFile::SetLength
+6010=CSocketFile::SetLength
+6011=COleUILinkInfo::SetLinkSource
+6012=COleClientItem::SetLinkUpdateOptions
+6013=COleUILinkInfo::SetLinkUpdateOptions
+6014=CDaoRecordset::SetLockingMode
+6015=CRecordset::SetLockingMode
+6016=CDaoWorkspace::SetLoginTimeout
+6017=CDC::SetMapMode
+6018=CPreviewDC::SetMapMode
+6019=CDC::SetMapperFlags
+6020=COleFrameHook::XOleInPlaceFrame::SetMenu
+6021=COleControlContainer::XOleIPFrame::SetMenu
+6022=CFrameWnd::SetMessageText
+6023=CFrameWnd::SetMessageText
+6024=CPropertyPage::SetModified
+6025=CDocument::SetModifiedFlag
+6026=COleControl::SetModifiedFlag
+6027=COlePropertyPage::SetModifiedFlag
+6028=CRichEditDoc::SetModifiedFlag
+6029=CDocObjectServer::XOleObject::SetMoniker
+6030=COleControl::XOleObject::SetMoniker
+6031=COleServerDoc::XOleObject::SetMoniker
+6032=COleServerItem::XOleObject::SetMoniker
+6033=CDaoQueryDef::SetName
+6034=CDaoTableDef::SetName
+6035=CPropertySection::SetName
+6036=COleControl::SetNotPermitted
+6037=CCmdTarget::SetNotSupported
+6038=COleControl::SetNotSupported
+6039=CDaoRecordset::SetNullableFieldStatus
+6040=CDaoRecordset::SetNullableKnownFieldStatus
+6041=CDaoRecordset::SetNullFieldStatus
+6042=CRecordset::SetNullFieldStatus
+6043=CRecordset::SetNullParamStatus
+6044=CDaoFieldExchange::SetNullValue
+6045=COleControl::XOleInPlaceObject::SetObjectRects
+6046=COleServerDoc::XOleInPlaceObject::SetObjectRects
+6047=COlePropertyPage::XPropertyPage::SetObjects
+6048=CDialog::SetOccDialogInfo
+6049=CDialogBar::SetOccDialogInfo
+6050=CFormView::SetOccDialogInfo
+6051=CWnd::SetOccDialogInfo
+6052=CDaoQueryDef::SetODBCTimeout
+6053=CInternetConnection::SetOption
+6054=CInternetFile::SetOption
+6055=CInternetSession::SetOption
+6056=CPropertySet::SetOSVersion
+6057=CDC::SetOutputDC
+6058=CMetaFileDC::SetOutputDC
+6059=CPreviewDC::SetOutputDC
+6060=CToolBar::SetOwner
+6061=COlePropertyPage::SetPageName
+6062=COlePropertyPage::XPropertyPage::SetPageSite
+6063=CStatusBar::SetPaneInfo
+6064=CStatusBar::SetPaneStyle
+6065=CStatusBar::SetPaneText
+6066=CRichEditCtrl::SetParaFormat
+6067=CRichEditView::SetParaFormat
+6068=CDaoQueryDef::SetParamValue
+6069=CDaoQueryDef::SetParamValue
+6070=CDaoRecordset::SetParamValue
+6071=CDaoRecordset::SetParamValue
+6072=CDaoQueryDef::SetParamValueNull
+6073=CDaoQueryDef::SetParamValueNull
+6074=CDaoRecordset::SetParamValueNull
+6075=CDaoRecordset::SetParamValueNull
+6076=CDocument::SetPathName
+6077=COleDocument::SetPathName
+6078=CRichEditDoc::SetPathName
+6079=CDaoRecordset::SetPercentPosition
+6080=CPictureHolder::SetPictureDispatch
+6081=CPicturePropPage::SetPictureProp
+6082=CDC::SetPolyFillMode
+6083=COleClientItem::SetPrintDevice
+6084=COleClientItem::SetPrintDevice
+6085=CEditView::SetPrinterFont
+6086=CPreviewView::SetPrintView
+6087=COlePropertyPage::SetPropCheck
+6088=COleControlSite::SetProperty
+6089=COleDispatchDriver::SetProperty
+6090=CWnd::SetProperty
+6091=COleControlSite::SetPropertyV
+6092=COlePropertyPage::SetPropIndex
+6093=COlePropertyPage::SetPropRadio
+6094=COleControl::SetPropsetData
+6095=COlePropertyPage::SetPropText
+6096=COlePropertyPage::SetPropText
+6097=COlePropertyPage::SetPropText
+6098=COlePropertyPage::SetPropText
+6099=COlePropertyPage::SetPropText
+6100=COlePropertyPage::SetPropText
+6101=COlePropertyPage::SetPropText
+6102=COlePropertyPage::SetPropText
+6103=COlePropertyPage::SetPropText
+6104=CDaoDatabase::SetQueryTimeout
+6105=CCmdUI::SetRadio
+6106=CTestCmdUI::SetRadio
+6107=CSliderCtrl::SetRange
+6108=CInternetFile::SetReadBufferSize
+6109=CDocObjectServer::XOleDocumentView::SetRect
+6110=CDocObjectServer::XOleDocumentView::SetRectComplex
+6111=COleControl::SetRectInContainer
+6112=CWinApp::SetRegistryKey
+6113=CWinApp::SetRegistryKey
+6114=CDaoQueryDef::SetReturnsRecords
+6115=CDC::SetROP2
+6116=CSplitterWnd::SetRowInfo
+6117=CRecordset::SetRowsetCurrencyStatus
+6118=CRecordset::SetRowsetCursorPosition
+6119=CRecordset::SetRowsetSize
+6120=CPreviewView::SetScaledSize
+6121=CPreviewDC::SetScaleRatio
+6122=CScrollView::SetScaleToFitSize
+6123=CDockState::SetScreenSize
+6124=CWnd::SetScrollInfo
+6125=CWnd::SetScrollPos
+6126=CWnd::SetScrollRange
+6127=CScrollView::SetScrollSizes
+6128=CSplitterWnd::SetScrollStyle
+6129=CPropertySection::SetSectionName
+6130=CRichEditCtrl::SetSel
+6131=CSliderCtrl::SetSelection
+6132=CRichEditCtrl::SetSelectionCharFormat
+6133=CDocTemplate::SetServerInfo
+6134=CArchiveStream::SetSize
+6135=CByteArray::SetSize
+6136=CDWordArray::SetSize
+6137=CObArray::SetSize
+6138=CPtrArray::SetSize
+6139=CStringArray::SetSize
+6140=CUIntArray::SetSize
+6141=CWordArray::SetSize
+6142=CToolBar::SetSizes
+6143=CDaoTableDef::SetSourceTableName
+6144=CSplitterWnd::SetSplitCursor
+6145=CDaoQueryDef::SetSQL
+6146=CCmdTarget::SetStandardProp
+6147=CColorButton::SetState
+6148=CRecordset::SetState
+6149=CFile::SetStatus
+6150=CControlBar::SetStatusText
+6151=COleFrameHook::XOleInPlaceFrame::SetStatusText
+6152=COleControlContainer::XOleIPFrame::SetStatusText
+6153=CDC::SetStretchBltMode
+6154=COleVariant::SetString
+6155=CString::SetSysString
+6156=CDialogTemplate::SetSystemFont
+6157=CEditView::SetTabStops
+6158=CDialogTemplate::SetTemplate
+6159=CFileDialog::SetTemplate
+6160=CCmdUI::SetText
+6161=COleCmdUI::SetText
+6162=COleControl::SetText
+6163=CStatusCmdUI::SetText
+6164=CTestCmdUI::SetText
+6165=CToolCmdUI::SetText
+6166=CDC::SetTextAlign
+6167=CDC::SetTextCharacterExtra
+6168=CDC::SetTextColor
+6169=CPreviewDC::SetTextColor
+6170=CDC::SetTextJustification
+6171=CDocument::SetTitle
+6172=CPropertySheet::SetTitle
+6173=CRichEditDoc::SetTitle
+6174=CToolTipCtrl::SetToolRect
+6175=CPreviewDC::SetTopLeftOffset
+6176=CProperty::SetType
+6177=CRecordset::SetUpdateMethod
+6178=CDaoTableDef::SetValidationRule
+6179=CDaoTableDef::SetValidationText
+6180=CThreadSlotData::SetValue
+6181=COlePropertiesDialog::XOleUIObjInfo::SetViewInfo
+6182=CDC::SetViewportExt
+6183=CMetaFileDC::SetViewportExt
+6184=CPreviewDC::SetViewportExt
+6185=CDC::SetViewportOrg
+6186=CMetaFileDC::SetViewportOrg
+6187=CPreviewDC::SetViewportOrg
+6188=CDC::SetWindowExt
+6189=CPreviewDC::SetWindowExt
+6190=CDC::SetWindowOrg
+6191=CWnd::SetWindowPlacement
+6192=COleControlSite::SetWindowPos
+6193=CWnd::SetWindowPos
+6194=COleControlSite::SetWindowTextW
+6195=CWnd::SetWindowTextW
+6196=CRichEditCtrl::SetWordCharFormat
+6197=CInternetFile::SetWriteBufferSize
+6198=CPreviewView::SetZoomState
+6199=CDocObjectServer::XOleDocumentView::Show
+6200=COlePropertyPage::XPropertyPage::Show
+6201=CDockBar::ShowAll
+6202=CRichEditCntrItem::ShowContainerUI
+6203=CRichEditView::ShowContainerUI
+6204=CRichEditView::XRichEditOleCallback::ShowContainerUI
+6205=CFrameWnd::ShowControlBar
+6206=COleClientItem::XOleClientSite::ShowObject
+6207=COleControlSite::XOleClientSite::ShowObject
+6208=CFrameWnd::ShowOwnedWindows
+6209=COleControlSite::XOleControlSite::ShowPropertyFrame
+6210=COleControlSite::ShowWindow
+6211=CWnd::ShowWindow
+6212=tagSIZEconstCScrollView::sizeDefault
+6213=CBitmapButton::SizeToContent
+6214=CToolBar::SizeToolBar
+6215=CEnumArray::XEnumVOID::Skip
+6216=CRecordset::SkipDeletedRecords
+6217=CAsyncSocket::Socket
+6218=CString::SpanExcluding
+6219=CString::SpanIncluding
+6220=CSplitterWnd::SplitColumn
+6221=COccManager::SplitDialogTemplate
+6222=CSplitterWnd::SplitRow
+6223=CDC::StartDocW
+6224=CDockContext::StartDrag
+6225=CDockContext::StartResize
+6226=CSplitterWnd::StartTracking
+6227=CArchiveStream::Stat
+6228=CSplitterWnd::StopTracking
+6229=CRuntimeClass::Store
+6230=CDaoRecordset::StoreFields
+6231=CRecordset::StoreFields
+6232=CRichEditView::Stream
+6233=CDockContext::Stretch
+6234=CDaoRecordset::StripBrackets
+6235=CWnd::SubclassCtl3d
+6236=CWnd::SubclassDlg3d
+6237=CWnd::SubclassDlgItem
+6238=CWnd::SubclassWindow
+6239=COleControlSite::XNotifyDBEvents::SyncAfter
+6240=COleControlSite::XNotifyDBEvents::SyncBefore
+6241=CRichEditCntrItem::SyncToRichEditObject
+6242=CDC::TabbedTextOutW
+6243=CMetaFileDC::TabbedTextOutW
+6244=CPreviewDC::TabbedTextOutW
+6245=CRichEditView::TextNotFound
+6246=CDC::TextOutW
+6247=CMetaFileDC::TextOutW
+6248=CPreviewDC::TextOutW
+6249=CDaoDatabase::ThrowDaoException
+6250=CDaoQueryDef::ThrowDaoException
+6251=CDaoRecordset::ThrowDaoException
+6252=CDaoTableDef::ThrowDaoException
+6253=CDaoWorkspace::ThrowDaoException
+6254=CDatabase::ThrowDBException
+6255=CRecordset::ThrowDBException
+6256=CFileException::ThrowErrno
+6257=COleControl::ThrowError
+6258=COleControl::ThrowError
+6259=ThrowGetRowsDaoException
+6260=CFileException::ThrowOsError
+6261=CDockContext::ToggleDocking
+6262=CDockContext::Track
+6263=CRectTracker::Track
+6264=CSplitterWnd::TrackColumnSize
+6265=CRectTracker::TrackHandle
+6266=CMenu::TrackPopupMenu
+6267=CSplitterWnd::TrackRowSize
+6268=CRectTracker::TrackRubberBand
+6269=COleControl::TransformCoords
+6270=COleControlSite::XOleControlSite::TransformCoords
+6271=COleControlSite::XOleControlSite::TranslateAcceleratorW
+6272=COleControl::XOleInPlaceActiveObject::TranslateAcceleratorW
+6273=COleServerDoc::XOleInPlaceActiveObject::TranslateAcceleratorW
+6274=COleFrameHook::XOleInPlaceFrame::TranslateAcceleratorW
+6275=COleControlContainer::XOleIPFrame::TranslateAcceleratorW
+6276=COlePropertyPage::XPropertyPage::TranslateAcceleratorW
+6277=COleControl::TranslateColor
+6278=CString::TrimLeft
+6279=CString::TrimRight
+6280=CDocObjectServer::XOleDocumentView::UIActivate
+6281=COccManager::UIActivateControl
+6282=COleControl::XOleInPlaceObject::UIDeactivate
+6283=COleServerDoc::XOleInPlaceObject::UIDeactivate
+6284=COccManager::UIDeactivateIfNecessary
+6285=COleSafeArray::UnaccessData
+6286=CConnectionPoint::XConnPt::Unadvise
+6287=CDocObjectServer::XOleObject::Unadvise
+6288=COleControl::XOleObject::Unadvise
+6289=COleServerDoc::XOleObject::Unadvise
+6290=COleServerItem::XOleObject::Unadvise
+6291=CRecordset::UnbindFieldsForUpdate
+6292=COleControl::XOleCache::Uncache
+6293=COleControl::XViewObject::Unfreeze
+6294=CCriticalSection::Unlock
+6295=CEvent::Unlock
+6296=CMultiLock::Unlock
+6297=CMultiLock::Unlock
+6298=CMutex::Unlock
+6299=COleSafeArray::Unlock
+6300=CSemaphore::Unlock
+6301=CSemaphore::Unlock
+6302=CSingleLock::Unlock
+6303=CSingleLock::Unlock
+6304=CSyncObject::Unlock
+6305=CTypeLibCache::Unlock
+6306=CEditView::UnlockBuffer
+6307=CString::UnlockBuffer
+6308=CFile::UnlockRange
+6309=CInternetFile::UnlockRange
+6310=CMemFile::UnlockRange
+6311=COleStreamFile::UnlockRange
+6312=CSocketFile::UnlockRange
+6313=CStdioFile::UnlockRange
+6314=CArchiveStream::UnlockRegion
+6315=CWinApp::Unregister
+6316=CWnd::UnsubclassWindow
+6317=CDaoRecordset::Update
+6318=CRecordset::Update
+6319=CDocObjectServer::XOleObject::Update
+6320=COleControl::XOleObject::Update
+6321=COleServerDoc::XOleObject::Update
+6322=COleServerItem::XOleObject::Update
+6323=COleServerDoc::UpdateAllItems
+6324=CStatusBar::UpdateAllPanes
+6325=CDocument::UpdateAllViews
+6326=CScrollView::UpdateBars
+6327=CMDIChildWnd::UpdateClientEdge
+6328=CDataSourceControl::UpdateControls
+6329=CDataSourceControl::UpdateCursor
+6330=CWnd::UpdateData
+6331=CWnd::UpdateDialogControls
+6332=CDocument::UpdateFrameCounts
+6333=CFrameWnd::UpdateFrameTitleForDocument
+6334=CRecordset::UpdateInsertDelete
+6335=COleClientItem::UpdateItemType
+6336=COleClientItem::UpdateLink
+6337=COleUILinkInfo::UpdateLink
+6338=CSizeComboBox::UpdateLogFont
+6339=CRecentFileList::UpdateMenu
+6340=COleDocument::UpdateModifiedFlag
+6341=CRichEditDoc::UpdateModifiedFlag
+6342=CRichEditDoc::UpdateObjectCache
+6343=CWinApp::UpdatePrinterSelection
+6344=CColorPropPage::CColorPropPageFactory::UpdateRegistry
+6345=CFontPropPage::CFontPropPageFactory::UpdateRegistry
+6346=COleObjectFactory::UpdateRegistry
+6347=COleObjectFactory::UpdateRegistry
+6348=COleTemplateServer::UpdateRegistry
+6349=CPicturePropPage::CPicturePropPageFactory::UpdateRegistry
+6350=COleObjectFactory::UpdateRegistryAll
+6351=CFontPropPage::UpdateSampleFont
+6352=CDockContext::UpdateState
+6353=CToolTipCtrl::UpdateTipText
+6354=CToolTipCtrl::UpdateTipText
+6355=COleServerDoc::UpdateUsingHostObj
+6356=COleLinkingDoc::UpdateVisibleLock
+6357=CDatabase::VerifyConnect
+6358=CRecordset::VerifyCursorSupport
+6359=CRecordset::VerifyDriverBehavior
+6360=COleObjectFactory::VerifyLicenseKey
+6361=COleObjectFactory::VerifyUserLicense
+6362=CListBox::VKeyToItem
+6363=CWnd::WalkPreTranslateTree
+6364=COleControl::WillAmbientsBeValidDuringLoad
+6365=CControlBar::WindowProc
+6366=COleControl::WindowProc
+6367=COlePropertyPage::WindowProc
+6368=CParkingWnd::WindowProc
+6369=CReflectorWnd::WindowProc
+6370=CWnd::WindowProc
+6371=CWinApp::WinHelpW
+6372=CWnd::WinHelpW
+6373=CWndconstCWnd::wndBottom
+6374=CWndconstCWnd::wndNoTopMost
+6375=CWndconstCWnd::wndTop
+6376=CWndconstCWnd::wndTopMost
+6377=CRichEditView::WrapChanged
+6378=CToolBar::WrapToolBar
+6379=CArchive::Write
+6380=CArchiveStream::Write
+6381=CFile::Write
+6382=CGopherFile::Write
+6383=CImageList::Write
+6384=CInternetFile::Write
+6385=CMemFile::Write
+6386=COleStreamFile::Write
+6387=CSocketFile::Write
+6388=CStdioFile::Write
+6389=CArchive::WriteClass
+6390=CArchive::WriteCount
+6391=COleClientItem::WriteItem
+6392=COleClientItem::WriteItemCompound
+6393=COleClientItem::WriteItemFlat
+6394=CRecentFileList::WriteList
+6395=CPropertySection::WriteNameDictToStream
+6396=CArchive::WriteObject
+6397=CWinApp::WriteProfileBinary
+6398=CWinApp::WriteProfileInt
+6399=CWinApp::WriteProfileStringW
+6400=CArchive::WriteString
+6401=CGopherFile::WriteString
+6402=CInternetFile::WriteString
+6403=CStdioFile::WriteString
+6404=CEditView::WriteToArchive
+6405=CProperty::WriteToStream
+6406=CPropertySection::WriteToStream
+6407=CPropertySet::WriteToStream
+6408=ushortafxChNil
+6409=CHttpConnection::CHttpConnection
+6410=_CIP<IBindStatusCallback
+6411=_CIP<IUnknown
+6412=CIP<IBindStatusCallback
+6413=CIP<IUnknown
+6414=AfxParseURLEx
+6417=CRuntimeClassconstCInternetException::classCInternetException
+6418=CAsyncMonikerFile::CreateBindStatusCallback
+6419=CWinThread::DispatchThreadMessageEx
+6420=CAsyncMonikerFile::EndCallbacks
+6421=CMonikerFile::Flush
+6422=CInternetSession::GetHttpConnection
+6423=CAsyncMonikerFile::Read
+6424=CColorPropPage::CColorPropPageFactory::CColorPropPageFactory
+6425=CEnumConnections::CEnumConnections
+6426=CFontPropPage::CFontPropPageFactory::CFontPropPageFactory
+6427=CPicturePropPage::CPicturePropPageFactory::CPicturePropPageFactory
+6428=Duplicate1_??1?$CIP@UIStream@@$1?IID_IStream@@3U_GUID@@B@@QAE@XZ
+6429=CEnumConnections::~CEnumConnections
+6430=_AfxDeleteRegKey
+6431=CEnumConnections::AddConnection
+6432=AfxGetDefaultValue
+6433=AfxInitRichEdit
+6434=AfxOleUnregisterHelper
+6435=AfxOleUnregisterServerClass
+6436=AfxSetDefaultValue
+6437=CWnd::CreateEx
+6438=CScrollView::DoMouseWheel
+6439=Duplicate1_?FindAndSelect@CRichEditView@@QAEJKAAU_findtextexa@@@Z
+6440=COleControlContainer::FreezeAllEvents
+6441=COleControlSite::FreezeEvents
+6442=CEnumConnections::GetInterfaceMap
+6443=HashKey
+6444=AFX_INTERFACEMAPconstCOleControlContainer::interfaceMap
+6445=AFX_INTERFACEMAPconstCOleControlSite::interfaceMap
+6446=CBitmap::LoadBitmapW
+6447=OLE2CT
+6448=CEnumConnections::OnClone
+6449=CDocTemplate::OnCmdMsg
+6450=COleTemplateServer::OnCmdMsg
+6451=CWnd::OnDestroy
+6452=CScrollView::OnMouseWheel
+6453=CSplitterWnd::OnMouseWheel
+6454=CEnumConnections::OnNext
+6455=CFrameWnd::OnRegisteredMouseWheel
+6456=CWnd::OnSettingChange
+6457=CRecordset::SetParamNull
+6458=T2OLE
+6459=COleObjectFactory::Unregister
+6460=COleTemplateServer::Unregister
+6461=COleObjectFactory::UnregisterAll
+6462=CDocManager::UnregisterShellFileTypes
+6463=CWinApp::UnregisterShellFileTypes
+6464=AFX_CLASSINIT_COMPAT::AFX_CLASSINIT_COMPAT
+6465=AFX_EVENT::AFX_EVENT
+6466=AFX_MAINTAIN_STATE2::AFX_MAINTAIN_STATE2
+6467=CCachedDataPathProperty::CCachedDataPathProperty
+6468=CDaoErrorInfo::CDaoErrorInfo
+6469=CDaoFieldInfo::CDaoFieldInfo
+6470=CDataPathProperty::CDataPathProperty
+6471=CDynLinkLibrary::CDynLinkLibrary
+6472=CFileStatus::CFileStatus
+6473=CFixedAlloc::CFixedAlloc
+6474=CGopherLocator::CGopherLocator
+6475=CHtmlView::CHtmlView
+6476=CMemoryException::CMemoryException
+6477=CNotSupportedException::CNotSupportedException
+6478=COleDocObjectItem::COleDocObjectItem
+6479=COleVariant::COleVariant
+6480=CParkingWnd::CParkingWnd
+6481=CPropertyPageEx::CPropertyPageEx
+6482=CPropertyPageEx::CPropertyPageEx
+6483=CPropertyPageEx::CPropertyPageEx
+6484=CPropertySheetEx::CPropertySheetEx
+6485=CPropertySheetEx::CPropertySheetEx
+6486=CPropertySheetEx::CPropertySheetEx
+6487=CReBar::CReBar
+6488=CResourceException::CResourceException
+6489=CString::CString
+6490=CUserException::CUserException
+6491=CEmbeddedButActsLikePtr<CMapPtrToPtr>::~CEmbeddedButActsLikePtr<CMapPtrToPtr>
+6492=CEmbeddedButActsLikePtr<CPtrList>::~CEmbeddedButActsLikePtr<CPtrList>
+6493=AFX_MAINTAIN_STATE2::~AFX_MAINTAIN_STATE2
+6494=CArchiveException::~CArchiveException
+6495=CColorDialog::~CColorDialog
+6496=CColorPropPage::~CColorPropPage
+6497=CColorPropPage::CColorPropPageFactory::~CColorPropPageFactory
+6498=CComboBoxEx::~CComboBoxEx
+6499=CControlBarInfo::~CControlBarInfo
+6500=COleControl::CControlDataSource::~CControlDataSource
+6501=CControlFrameWnd::~CControlFrameWnd
+6502=CControlRectTracker::~CControlRectTracker
+6503=CDaoErrorInfo::~CDaoErrorInfo
+6504=CDateTimeCtrl::~CDateTimeCtrl
+6505=CFindReplaceDialog::~CFindReplaceDialog
+6506=CFixedAlloc::~CFixedAlloc
+6507=CFontPropPage::~CFontPropPage
+6508=CFontPropPage::CFontPropPageFactory::~CFontPropPageFactory
+6509=CHandleMap::~CHandleMap
+6510=CHtmlView::~CHtmlView
+6511=CIPAddressCtrl::~CIPAddressCtrl
+6512=CMDIChildWnd::~CMDIChildWnd
+6513=CMDIFrameWnd::~CMDIFrameWnd
+6514=CMemoryException::~CMemoryException
+6515=CMiniDockFrameWnd::~CMiniDockFrameWnd
+6516=CMonthCalCtrl::~CMonthCalCtrl
+6517=CNotSupportedException::~CNotSupportedException
+6518=COccManager::~COccManager
+6519=COleDocObjectItem::~COleDocObjectItem
+6520=COleException::~COleException
+6521=COleSafeArray::~COleSafeArray
+6522=CParkingWnd::~CParkingWnd
+6523=CPicturePropPage::CPicturePropPageFactory::~CPicturePropPageFactory
+6524=CPropertyPageEx::~CPropertyPageEx
+6525=CPropertySheetEx::~CPropertySheetEx
+6526=CPushRoutingFrame::~CPushRoutingFrame
+6527=CPushRoutingView::~CPushRoutingView
+6528=CReBar::~CReBar
+6529=CReflectorWnd::~CReflectorWnd
+6530=CResourceException::~CResourceException
+6531=CRichEditDoc::~CRichEditDoc
+6532=CSocketWnd::~CSocketWnd
+6533=CTempDC::~CTempDC
+6534=CTempGdiObject::~CTempGdiObject
+6535=CTempImageList::~CTempImageList
+6536=CTempMenu::~CTempMenu
+6537=CTempWnd::~CTempWnd
+6538=CThreadData::~CThreadData
+6539=CTypeLibCacheMap::~CTypeLibCacheMap
+6540=CUserException::~CUserException
+6541=CWindowlessDC::~CWindowlessDC
+6542=CTempWnd::operatordelete
+6543=CArchive::operator>>
+6544=CArchive::operator>>
+6545=CArchive::operator>>
+6546=CArchive::operator>>
+6547=CArchive::operator>>
+6548=CArchive::operator>>
+6549=CArchive::operator<<
+6550=CArchive::operator<<
+6551=CArchive::operator<<
+6552=CArchive::operator<<
+6553=CArchive::operator<<
+6554=CArchive::operator<<
+6555=operator==
+6556=CTime::operator<
+6557=CTime::operator>
+6558=COleDocObjectItem::ActivateAndShow
+6559=COleDocObjectItem::XOleDocumentSite::ActivateMe
+6560=CReBar::AddBar
+6561=CReBar::AddBar
+6562=COleInsertDialog::AddClassIDToList
+6563=CStringList::AddHead
+6564=CPropertySheetEx::AddPage
+6565=CStringList::AddTail
+6566=AfxCheckError
+6567=AfxClassInit
+6568=AfxDelRegTreeHelper
+6569=AfxEditviewTerm
+6570=AfxGetExceptionContext
+6571=AfxGetHENV
+6572=AfxGetMainWnd
+6573=afxMapHDC
+6574=afxMapHGDIOBJ
+6575=afxMapHIMAGELIST
+6576=afxMapHMENU
+6577=afxMapHWND
+6578=AfxOleRegisterServerClass
+6579=AfxTrackerTerm
+6580=AfxWingdixTerm
+6581=CFixedAlloc::Alloc
+6582=COleControlContainer::AttachControlSite
+6583=CHtmlView::BeforeNavigate2
+6584=CPropertySheetEx::BuildPropPageArray
+6585=CReBar::CalcDynamicLayout
+6586=CReBar::CalcFixedLayout
+6587=CDatabase::CheckHstmt
+6588=CRuntimeClassconstCComboBoxEx::classCComboBoxEx
+6589=CRuntimeClassconstCHtmlView::classCHtmlView
+6590=CRuntimeClassconstCIPAddressCtrl::classCIPAddressCtrl
+6591=CRuntimeClassconstCOleDBRecordView::classCOleDBRecordView
+6592=CRuntimeClassconstCOleDocObjectItem::classCOleDocObjectItem
+6593=CRuntimeClassconstCPropertyPageEx::classCPropertyPageEx
+6594=CRuntimeClassconstCPropertySheetEx::classCPropertySheetEx
+6595=CRuntimeClassconstCReBar::classCReBar
+6596=CRuntimeClassconstCReBarCtrl::classCReBarCtrl
+6597=CWnd::ClientToScreen
+6598=CPropertyPageEx::CommonConstruct
+6599=CPropertySheetEx::CommonConstruct
+6600=CPropertyPageEx::Construct
+6601=CPropertyPageEx::Construct
+6602=CPropertySheetEx::Construct
+6603=CPropertySheetEx::Construct
+6604=CComboBoxEx::Create
+6605=CDateTimeCtrl::Create
+6606=CHtmlView::Create
+6607=CImageList::Create
+6608=CIPAddressCtrl::Create
+6609=CMonthCalCtrl::Create
+6610=CMonthCalCtrl::Create
+6611=CReBar::Create
+6612=CReBarCtrl::Create
+6613=ColeControlContainer::CreateControl
+6614=COleControlSite::CreateControl
+6615=CWnd::CreateControl
+6616=CStatusBar::CreateEx
+6617=CToolBar::CreateEx
+6618=CMDIFrameWnd::CreateNewChild
+6619=CHtmlView::CreateObject
+6620=CTempDC::CreateObject
+6621=CTempGdiObject::CreateObject
+6622=CTempImageList::CreateObject
+6623=CTempMenu::CreateObject
+6624=CTempWnd::CreateObject
+6625=COleControl::CreateTracker
+6626=DDV_MinMaxDateTime
+6627=DDV_MinMaxDateTime
+6628=DDV_MinMaxMonth
+6629=DDV_MinMaxMonth
+6630=DDV_MinMaxSlider
+6631=DDX_DateTimeCtrl
+6632=DDX_DateTimeCtrl
+6633=DDX_FieldSlider
+6634=DDX_FieldText
+6635=DDX_FieldText
+6636=DDX_MonthCalCtrl
+6637=DDX_MonthCalCtrl
+6638=DDX_Slider
+6639=DDX_Text
+6640=CString::Delete
+6641=CComboBoxEx::DeleteItem
+6642=CHtmlView::DocumentComplete
+6643=COleInsertDialog::DoModal
+6644=CControlBar::DrawGripper
+6645=CImageList::DrawIndirect
+6646=CImageList::DrawIndirect
+6647=CWnd::EnableTrackingToolTips
+6648=CPropertyPage::EndDialog
+6649=CHttpFile::EndRequest
+6650=AFX_EVENTSINKMAPconstCHtmlView::eventsinkMap
+6651=COleFrameHook::XOleCommandTarget::Exec
+6652=COleDocObjectItem::ExecCommand
+6653=CHtmlView::ExecWB
+6654=CString::Find
+6655=CString::Find
+6656=FontAttrSize
+6657=CFixedAlloc::Free
+6658=CFixedAlloc::FreeAll
+6659=CString::FreeData
+6660=COleDocObjectItem::GetActiveView
+6661=CIPAddressCtrl::GetAddress
+6662=CHtmlView::GetAddressBar
+6663=CHtmlView::GetApplication
+6664=COleDateTime::GetAsSystemTime
+6665=CTime::GetAsSystemTime
+6666=CHtmlView::GetBusy
+6667=CListCtrl::GetCheck
+6668=CTreeCtrl::GetCheck
+6669=CReBarCtrl::GetColorScheme
+6670=CListCtrl::GetColumnOrderArray
+6671=CHtmlView::GetContainer
+6672=CInternetSession::GetCookie
+6673=CInternetSession::GetCookie
+6674=CInternetSession::GetCookieLength
+6675=CListBox::GetCurSel
+6676=CMonthCalCtrl::GetCurSel
+6677=CMonthCalCtrl::GetCurSel
+6678=CDataBoundProperty::GetCursor
+6679=CDataSourceControl::GetCursor
+6680=COleControlSite::GetCursor
+6681=CDocManager::GetDocumentCount
+6682=CToolBarCtrl::GetDropTarget
+6683=CHtmlView::GetEventSinkMap
+6684=CMonthCalCtrl::GetFirstDayOfWeek
+6685=CWnd::GetFont
+6686=CHtmlView::GetFullName
+6687=CHtmlView::GetFullScreen
+6688=CListCtrl::GetHeaderCtrl
+6689=CHtmlView::GetHeight
+6690=COleDocObjectItem::GetHelpMenu
+6691=CHtmlView::GetHtmlDocument
+6692=COleClientItem::GetIconFromRegistry
+6693=COleClientItem::GetIconFromRegistry
+6694=CReBarCtrl::GetImageList
+6695=COleFrameHook::GetInterfaceHook
+6696=COleDocObjectItem::GetInterfaceMap
+6697=CComboBoxEx::GetItem
+6698=CTabCtrl::GetItemState
+6699=CDC::GetLayout
+6700=CHtmlView::GetLeft
+6701=CHtmlView::GetLocationName
+6702=CHtmlView::GetLocationURL
+6703=CHtmlView::GetMenuBar
+6704=CHtmlView::GetMessageMap
+6705=COleDBRecordView::GetMessageMap
+6706=CReBar::GetMessageMap
+6707=CMonikerFile::GetMoniker
+6708=CMonthCalCtrl::GetMonthRange
+6709=CMonthCalCtrl::GetMonthRange
+6710=CMonthCalCtrl::GetMonthRange
+6711=CHtmlView::GetOffline
+6712=CHeaderCtrl::GetOrderArray
+6713=CWnd::GetOwner
+6714=COleDocObjectItem::GetPageCount
+6715=CRichEditView::GetPageRect
+6716=CHtmlView::GetParentBrowser
+6717=CRichEditView::GetPrintRect
+6718=CHtmlView::GetProperty
+6719=CHtmlView::GetProperty
+6720=CPropertySheet::GetPropSheetHeader
+6721=CDateTimeCtrl::GetRange
+6722=CDateTimeCtrl::GetRange
+6723=CMonthCalCtrl::GetRange
+6724=CMonthCalCtrl::GetRange
+6725=CMonthCalCtrl::GetRange
+6726=CProgressCtrl::GetRange
+6727=CHtmlView::GetReadyState
+6728=CHtmlView::GetRegisterAsBrowser
+6729=CHtmlView::GetRegisterAsDropTarget
+6730=CCmdTarget::GetRoutingFrame_
+6731=CCmdTarget::GetRoutingView_
+6732=CComboBoxEx::GetRuntimeClass
+6733=CDateTimeCtrl::GetRuntimeClass
+6734=CHtmlView::GetRuntimeClass
+6735=CIPAddressCtrl::GetRuntimeClass
+6736=CMonthCalCtrl::GetRuntimeClass
+6737=COleDBRecordView::GetRuntimeClass
+6738=COleDocObjectItem::GetRuntimeClass
+6739=CPropertyPageEx::GetRuntimeClass
+6740=CPropertySheetEx::GetRuntimeClass
+6741=CReBar::GetRuntimeClass
+6742=CReBarCtrl::GetRuntimeClass
+6743=CTempDC::GetRuntimeClass
+6744=CTempGdiObject::GetRuntimeClass
+6745=CTempImageList::GetRuntimeClass
+6746=CTempMenu::GetRuntimeClass
+6747=CTempWnd::GetRuntimeClass
+6748=CWnd::GetSafeOwner_
+6749=CMonthCalCtrl::GetSelRange
+6750=CMonthCalCtrl::GetSelRange
+6751=CMonthCalCtrl::GetSelRange
+6752=CHtmlView::GetSilent
+6753=CHtmlView::GetStatusBar
+6754=CListCtrl::GetSubItemRect
+6755=CPropertySheet::GetTabControl
+6756=CMirrorFile::GetTempName
+6757=CHtmlView::GetTheaterMode
+6758=CDateTimeCtrl::GetTime
+6759=CDateTimeCtrl::GetTime
+6760=CStatusBarCtrl::GetTipText
+6761=CFrameWnd::GetTitle
+6762=CMonthCalCtrl::GetToday
+6763=CMonthCalCtrl::GetToday
+6764=CHtmlView::GetToolBar
+6765=CHtmlView::GetTop
+6766=CHtmlView::GetTopLevelContainer
+6767=CHtmlView::GetType
+6768=CHtmlView::GetVisible
+6769=HasFont
+6770=CString::Insert
+6771=CString::Insert
+6772=CStringList::InsertAfter
+6773=CStringArray::InsertAt
+6774=CStringList::InsertBefore
+6775=CStringArray::InsertEmpty
+6776=CComboBoxEx::InsertItem
+6777=CTabCtrl::InsertItem
+6778=CTabCtrl::InsertItem
+6779=AFX_INTERFACEMAPconstCOleDocObjectItem::interfaceMap
+6780=CPropertyPage::IsButtonEnabled
+6781=IsButtonUp
+6782=IsDialogEx
+6783=IsDirSep
+6784=IsEnterKey
+6785=IsHelpKey
+6786=CToolBar::Layout
+6787=CHtmlView::LoadFromResource
+6788=CHtmlView::LoadFromResource
+6789=CMDIChildWnd::MDIActivate
+6790=CMDIChildWnd::MDIDestroy
+6791=AFX_MSGMAPconstCHtmlView::messageMap
+6792=AFX_MSGMAPconstCOleDBRecordView::messageMap
+6793=AFX_MSGMAPconstCReBar::messageMap
+6794=CHtmlView::Navigate
+6795=CHtmlView::Navigate2
+6796=CHtmlView::Navigate2
+6797=CHtmlView::Navigate2
+6798=CHtmlView::NavigateComplete2
+6799=CHtmlView::OnBeforeNavigate2
+6800=COleControl::OnButtonDblClk
+6801=COleControl::OnButtonDown
+6802=COleControl::OnButtonUp
+6803=CHtmlView::OnCommandStateChange
+6804=CHtmlView::OnDestroy
+6805=CHtmlView::OnDocumentComplete
+6806=CHtmlView::OnDownloadBegin
+6807=CHtmlView::OnDownloadComplete
+6808=CHtmlView::OnDraw
+6809=CToolTipCtrl::OnEnable
+6810=COleControl::OnEraseBkgnd
+6811=CReBar::OnEraseBkgnd
+6812=COleControlSite::XRowsetNotify::OnFieldChange
+6813=CHtmlView::OnFilePrint
+6814=CHtmlView::OnFullScreen
+6815=COleDocObjectItem::OnGetItemPosition
+6816=CReBar::OnHeightChange
+6817=CFrameWnd::OnHelpPromptAddr
+6818=COleDBRecordView::OnInitialUpdate
+6819=CFrameWnd::OnInitMenu
+6820=COleFrameHook::OnInitMenu
+6821=COleFrameHook::OnInitMenuPopup
+6822=COleDocObjectItem::OnInsertMenus
+6823=CHtmlView::OnMenuBar
+6824=COleFrameHook::OnMenuSelect
+6825=COleDBRecordView::OnMove
+6826=CHtmlView::OnNavigateComplete2
+6827=CReBar::OnNcCalcSize
+6828=CReBar::OnNcCreate
+6829=CReBar::OnNcPaint
+6830=CHtmlView::OnNewWindow2
+6831=CHtmlView::OnPaint
+6832=CReBar::OnPaint
+6833=COleDocObjectItem::OnPreparePrinting
+6834=CToolBar::OnPreserveZeroBorderHelper
+6835=COleDocObjectItem::OnPrint
+6836=CHtmlView::OnProgressChange
+6837=CHtmlView::OnPropertyChange
+6838=CHtmlView::OnQuit
+6839=CReBar::OnRecalcParent
+6840=COleDocObjectItem::OnRemoveMenus
+6841=COleControlSite::XRowsetNotify::OnRowChange
+6842=COleControlSite::XRowsetNotify::OnRowsetChange
+6843=CToolBar::OnSetSizeHelper
+6844=CReBar::OnShowBand
+6845=CHtmlView::OnSize
+6846=CHtmlView::OnStatusBar
+6847=CHtmlView::OnStatusTextChange
+6848=CHtmlView::OnTheaterMode
+6849=CHtmlView::OnTitleChange
+6850=CHtmlView::OnToolBar
+6851=CReBar::OnToolHitTest
+6852=CMDIChildWnd::OnToolTipText
+6853=CReBar::OnUpdateCmdUI
+6854=COleDBRecordView::OnUpdateRecordFirst
+6855=COleDBRecordView::OnUpdateRecordLast
+6856=COleDBRecordView::OnUpdateRecordNext
+6857=COleDBRecordView::OnUpdateRecordPrev
+6858=CHtmlView::OnVisible
+6859=CHtmlView::PutProperty
+6860=CHttpFile::QueryInfo
+6861=COleFrameHook::XOleCommandTarget::QueryStatus
+6862=CHtmlView::QueryStatusWB
+6863=COleDocObjectItem::Release
+6864=COleControl::ReleaseCaches
+6865=CString::Remove
+6866=CTypeLibCacheMap::RemoveAll
+6867=CString::Replace
+6868=CString::Replace
+6869=RFX_Date
+6870=RFX_Text
+6871=CWnd::ScreenToClient
+6872=CHttpFile::SendRequestEx
+6873=CHttpFile::SendRequestEx
+6874=CStringArray::SetAtGrow
+6875=CAsyncMonikerFile::SetBinding
+6876=CListCtrl::SetBkImage
+6877=CListCtrl::SetBkImage
+6878=CControlBar::SetBorders
+6879=CListCtrl::SetCheck
+6880=CTreeCtrl::SetCheck
+6881=CReBarCtrl::SetColorScheme
+6882=CListCtrl::SetColumnOrderArray
+6883=CInternetSession::SetCookie
+6884=CMonthCalCtrl::SetCurSel
+6885=CMonthCalCtrl::SetCurSel
+6886=CMonthCalCtrl::SetDayState
+6887=CMonthCalCtrl::SetFirstDayOfWeek
+6888=CFontHolder::SetFontNotifySink
+6889=CAsyncMonikerFile::SetFormatEtc
+6890=CMDIChildWnd::SetHandles
+6891=CListCtrl::SetIconSpacing
+6892=CListCtrl::SetIconSpacing
+6893=CReBarCtrl::SetImageList
+6894=CComboBoxEx::SetItem
+6895=CListCtrl::SetItemCountEx
+6896=CListCtrl::SetItemState
+6897=CTabCtrl::SetItemState
+6898=CListCtrl::SetItemText
+6899=CDC::SetLayout
+6900=CHeaderCtrl::SetOrderArray
+6901=CDateTimeCtrl::SetRange
+6902=CDateTimeCtrl::SetRange
+6903=CMonthCalCtrl::SetRange
+6904=CMonthCalCtrl::SetRange
+6905=CMonthCalCtrl::SetRange
+6906=CCheckListBox::SetSelectionCheck
+6907=CMonthCalCtrl::SetSelRange
+6908=CMonthCalCtrl::SetSelRange
+6909=CMonthCalCtrl::SetSelRange
+6910=CDateTimeCtrl::SetTime
+6911=CDateTimeCtrl::SetTime
+6912=CDateTimeCtrl::SetTime
+6913=CMonthCalCtrl::SetToday
+6914=CMonthCalCtrl::SetToday
+6915=CMonthCalCtrl::SizeMinReq
+6916=COleDocObjectItem::SupportsIPrint
+6917=CDataSourceControl::ToVariant
+6918=CString::TrimLeft
+6919=CString::TrimLeft
+6920=CString::TrimRight
+6921=CString::TrimRight
+6922=CReBar::WindowProc
+6923=CMenu::GetMenuStringW
+6924=CInvalidArgException::CInvalidArgException
+6925=CInvalidArgException::~CInvalidArgException
+6926=CInvalidArgException::GetRuntimeClass
+6927=CRuntimeClassconstCInvalidArgException::classCInvalidArgException
+6928=AfxThrowInvalidArgException
+6929=AtlA2WHelper
+6930=AtlW2AHelper
+6931=CTime::GetMonth
+6932=CThreadSlotData::GetThreadValue
+6933=CTime::GetYear
+6934=CMapStringToOb::HashKey
+6935=CMapStringToPtr::HashKey
+6936=CMapStringToString::HashKey
+6937=OLE2CT_EX
+6938=OLE2T
+6939=T2COLE
+6940=T2OLE_EX
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/mstlsapi.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/mstlsapi.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/mstlsapi.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/mstlsapi.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,106 +1,106 @@
-78=EnumerateAllLicenseServers
-5=EnumerateTlsServer
-27=FindEnterpriseServer
-28=GetAllEnterpriseServers
-49=GetLicenseServersFromReg
-32=LsCsp_DecryptEnvelopedData
-33=LsCsp_EncryptHwid
-31=LsCsp_GetServerData
-35=LsCsp_RetrieveSecret
-34=LsCsp_StoreSecret
-3=MIDL_user_allocate
-4=MIDL_user_free
-101=RequestToTlsRequest
-71=TLSAddLStoTSLSofDC
-13=TLSAllocateConcurrentLicense
-130=TLSAllocateInternetLicenseEx
-116=TLSAnnounceLicensePack
-114=TLSAnnounceServer
-70=TLSCanLSUpdateAD
-119=TLSChallengeServer
-66=TLSChangeRole
-42=TLSCheckLicenseMark
-25=TLSConnectToAnyLsServer
-50=TLSConnectToAnyLsServerNoCertInstall
-24=TLSConnectToLsServer
-75=TLSConnectToLsServerWithUserIdentity
-69=TLSCreateLocalGroupForGP
-73=TLSDatabasePath
-127=TLSDepositeServerSPK
-26=TLSDisconnectFromServer
-55=TLSFetchReportBegin
-57=TLSFetchReportEnd
-56=TLSFetchReportNext
-39=TLSFreeTSCertificate
-21=TLSGetAvailableLicenses
-108=TLSGetLSPKCS10CertRequest
-14=TLSGetLastError
-48=TLSGetLastErrorFixed
-106=TLSGetServerCertificate
-7=TLSGetServerName
-44=TLSGetServerNameEx
-46=TLSGetServerNameFixed
-124=TLSGetServerPID
-126=TLSGetServerSPK
-8=TLSGetServerScope
-47=TLSGetServerScopeFixed
-136=TLSGetSupportFlags
-30=TLSGetTSCertificate
-121=TLSGetTlsPrivateData
-2=TLSGetVersion
-134=TLSInDomain
-29=TLSInit
-105=TLSInstallCertificate
-132=TLSIsBetaNTServer
-61=TLSIsFreeKeyPackInstalled
-67=TLSIsGPEnabled
-63=TLSIsLSPubished
-72=TLSIsLSonDC
-133=TLSIsLicenseEnforceEnable
-68=TLSIsLocalGroupForGPPresent
-79=TLSIsPreventUpgGPEnabled
-62=TLSIsServerInDomain
-74=TLSIsUserAdmin
-11=TLSIssueNewLicense
-40=TLSIssueNewLicenseEx
-43=TLSIssueNewLicenseExEx
-51=TLSIssuePerUserLicense
-10=TLSIssuePlatformChallenge
-109=TLSKeyPackAdd
-15=TLSKeyPackEnumBegin
-17=TLSKeyPackEnumEnd
-16=TLSKeyPackEnumNext
-110=TLSKeyPackSetStatus
-18=TLSLicenseEnumBegin
-20=TLSLicenseEnumEnd
-19=TLSLicenseEnumNext
-45=TLSLicenseEnumNextEx
-115=TLSLookupServer
-138=TLSLookupServerFixed
-135=TLSMarkLicense
-64=TLSPublishLS
-107=TLSRegisterLicenseKeyPack
-76=TLSRemoveLSFromTSLSOfAD
-77=TLSRemoveLocalGroupForGP
-60=TLSReportDelete
-52=TLSReportEnumBegin
-54=TLSReportEnumEnd
-53=TLSReportEnumNext
-58=TLSReportGenerateBegin
-59=TLSReportGenerateCancel
-103=TLSRequestTermServCert
-120=TLSResponseServerChallenge
-104=TLSRetrieveTermServCert
-131=TLSReturnInternetLicenseEx
-113=TLSReturnLicense
-117=TLSReturnLicensedProduct
-80=TLSRevokeLicense
-6=TLSSendServerCertificate
-38=TLSShutdown
-36=TLSStartDiscovery
-37=TLSStopDiscovery
-118=TLSTelephoneRegisterLKP
-123=TLSTriggerReGenKey
-65=TLSUnpublishLS
-12=TLSUpgradeLicense
-41=TLSUpgradeLicenseEx
+78=EnumerateAllLicenseServers
+5=EnumerateTlsServer
+27=FindEnterpriseServer
+28=GetAllEnterpriseServers
+49=GetLicenseServersFromReg
+32=LsCsp_DecryptEnvelopedData
+33=LsCsp_EncryptHwid
+31=LsCsp_GetServerData
+35=LsCsp_RetrieveSecret
+34=LsCsp_StoreSecret
+3=MIDL_user_allocate
+4=MIDL_user_free
+101=RequestToTlsRequest
+71=TLSAddLStoTSLSofDC
+13=TLSAllocateConcurrentLicense
+130=TLSAllocateInternetLicenseEx
+116=TLSAnnounceLicensePack
+114=TLSAnnounceServer
+70=TLSCanLSUpdateAD
+119=TLSChallengeServer
+66=TLSChangeRole
+42=TLSCheckLicenseMark
+25=TLSConnectToAnyLsServer
+50=TLSConnectToAnyLsServerNoCertInstall
+24=TLSConnectToLsServer
+75=TLSConnectToLsServerWithUserIdentity
+69=TLSCreateLocalGroupForGP
+73=TLSDatabasePath
+127=TLSDepositeServerSPK
+26=TLSDisconnectFromServer
+55=TLSFetchReportBegin
+57=TLSFetchReportEnd
+56=TLSFetchReportNext
+39=TLSFreeTSCertificate
+21=TLSGetAvailableLicenses
+108=TLSGetLSPKCS10CertRequest
+14=TLSGetLastError
+48=TLSGetLastErrorFixed
+106=TLSGetServerCertificate
+7=TLSGetServerName
+44=TLSGetServerNameEx
+46=TLSGetServerNameFixed
+124=TLSGetServerPID
+126=TLSGetServerSPK
+8=TLSGetServerScope
+47=TLSGetServerScopeFixed
+136=TLSGetSupportFlags
+30=TLSGetTSCertificate
+121=TLSGetTlsPrivateData
+2=TLSGetVersion
+134=TLSInDomain
+29=TLSInit
+105=TLSInstallCertificate
+132=TLSIsBetaNTServer
+61=TLSIsFreeKeyPackInstalled
+67=TLSIsGPEnabled
+63=TLSIsLSPubished
+72=TLSIsLSonDC
+133=TLSIsLicenseEnforceEnable
+68=TLSIsLocalGroupForGPPresent
+79=TLSIsPreventUpgGPEnabled
+62=TLSIsServerInDomain
+74=TLSIsUserAdmin
+11=TLSIssueNewLicense
+40=TLSIssueNewLicenseEx
+43=TLSIssueNewLicenseExEx
+51=TLSIssuePerUserLicense
+10=TLSIssuePlatformChallenge
+109=TLSKeyPackAdd
+15=TLSKeyPackEnumBegin
+17=TLSKeyPackEnumEnd
+16=TLSKeyPackEnumNext
+110=TLSKeyPackSetStatus
+18=TLSLicenseEnumBegin
+20=TLSLicenseEnumEnd
+19=TLSLicenseEnumNext
+45=TLSLicenseEnumNextEx
+115=TLSLookupServer
+138=TLSLookupServerFixed
+135=TLSMarkLicense
+64=TLSPublishLS
+107=TLSRegisterLicenseKeyPack
+76=TLSRemoveLSFromTSLSOfAD
+77=TLSRemoveLocalGroupForGP
+60=TLSReportDelete
+52=TLSReportEnumBegin
+54=TLSReportEnumEnd
+53=TLSReportEnumNext
+58=TLSReportGenerateBegin
+59=TLSReportGenerateCancel
+103=TLSRequestTermServCert
+120=TLSResponseServerChallenge
+104=TLSRetrieveTermServCert
+131=TLSReturnInternetLicenseEx
+113=TLSReturnLicense
+117=TLSReturnLicensedProduct
+80=TLSRevokeLicense
+6=TLSSendServerCertificate
+38=TLSShutdown
+36=TLSStartDiscovery
+37=TLSStopDiscovery
+118=TLSTelephoneRegisterLKP
+123=TLSTriggerReGenKey
+65=TLSUnpublishLS
+12=TLSUpgradeLicense
+41=TLSUpgradeLicenseEx
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/msvbvm50.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/msvbvm50.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/msvbvm50.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/msvbvm50.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,600 +1,600 @@
-411=BASIC_CLASS_AddRef
-413=BASIC_CLASS_GetIDsOfNames
-414=BASIC_CLASS_Invoke
-410=BASIC_CLASS_QueryInterface
-412=BASIC_CLASS_Release
-420=BASIC_DISPINTERFACE_GetTICount
-421=BASIC_DISPINTERFACE_GetTypeInfo
-190=CopyRecord
-2000=CreateIExprSrvObj
-146=DLLGetDocumentation
-187=DllFunctionCall
-106=DllRegisterServer
-107=DllUnregisterServer
-440=EVENT_SINK2_AddRef
-441=EVENT_SINK2_Release
-401=EVENT_SINK_AddRef
-403=EVENT_SINK_GetIDsOfNames
-404=EVENT_SINK_Invoke
-400=EVENT_SINK_QueryInterface
-402=EVENT_SINK_Release
-274=EbCreateContext
-275=EbDestroyContext
-232=EbGetHandleOfExecutingProject
-1025=EbGetObjConnectionCounts
-2010=EbGetVBAObject
-298=EbIsProjectOnStack
-268=EbLibraryLoad
-269=EbLibraryUnload
-271=EbLoadRunTime
-231=EbResetProject
-265=EbResetProjectNormal
-276=EbSetContextWorkerThread
-317=GetMem1
-300=GetMem2
-301=GetMem4
-302=GetMem8
-319=GetMemEvent
-314=GetMemNewObj
-305=GetMemObj
-303=GetMemStr
-304=GetMemVar
-1024=IID_IVbaHost
-199=MethCallEngine
-186=ProcCallEngine
-318=PutMem1
-306=PutMem2
-307=PutMem4
-308=PutMem8
-320=PutMemEvent
-315=PutMemNewObj
-311=PutMemObj
-309=PutMemStr
-310=PutMemVar
-321=SetMemEvent
-316=SetMemNewObj
-313=SetMemObj
-312=SetMemVar
-100=ThunRTMain
-299=TipCreateInstanceEx
-230=TipCreateInstanceProject
-195=TipGetAddressOfPredeclaredInstance
-1016=TipInvokeMethod
-999=TipInvokeMethod2
-220=TipSetOption
-266=TipUnloadInstance
-227=TipUnloadProject
-105=UserDllMain
-102=VBDllCanUnloadNow
-104=VBDllGetClassObject
-103=VBDllRegisterServer
-101=VBDllUnRegisterServer
-644=VarPtr
-431=Zombie_AddRef
-435=Zombie_GetIDsOfNames
-434=Zombie_GetTypeInfo
-433=Zombie_GetTypeInfoCount
-436=Zombie_Invoke
-430=Zombie_QueryInterface
-432=Zombie_Release
-147=_CIatan
-148=_CIcos
-149=_CIexp
-150=_CIlog
-151=_CIsin
-152=_CIsqrt
-153=_CItan
-154=__vbaAptOffset
-155=__vbaAryConstruct
-156=__vbaAryCopy
-157=__vbaAryDestruct
-108=__vbaAryLock
-158=__vbaAryMove
-159=__vbaAryRebase1Var
-160=__vbaAryUnlock
-111=__vbaAryVarVarg
-109=__vbaBoolErrVar
-161=__vbaBoolStr
-162=__vbaBoolVar
-163=__vbaBoolVarNull
-164=__vbaCastObj
-165=__vbaCastObjVar
-166=__vbaCheckType
-167=__vbaCheckTypeVar
-168=__vbaChkstk
-169=__vbaCopyBytes
-170=__vbaCyAbs
-171=__vbaCyAdd
-172=__vbaCyErrVar
-173=__vbaCyFix
-174=__vbaCyForInit
-175=__vbaCyForNext
-176=__vbaCyI2
-177=__vbaCyI4
-178=__vbaCyInt
-179=__vbaCyMul
-180=__vbaCyMulI2
-181=__vbaCySgn
-182=__vbaCyStr
-183=__vbaCySub
-184=__vbaCyUI1
-185=__vbaCyVar
-191=__vbaDateR4
-192=__vbaDateR8
-193=__vbaDateStr
-194=__vbaDateVar
-196=__vbaDerefAry
-197=__vbaDerefAry1
-198=__vbaEnd
-200=__vbaErase
-201=__vbaEraseKeepData
-202=__vbaEraseNoPop
-203=__vbaError
-204=__vbaErrorOverflow
-205=__vbaExceptHandler
-206=__vbaExitEachAry
-207=__vbaExitEachColl
-208=__vbaExitEachVar
-209=__vbaExitProc
-210=__vbaFPException
-211=__vbaFPFix
-212=__vbaFPInt
-213=__vbaFailedFriend
-214=__vbaFileClose
-215=__vbaFileCloseAll
-216=__vbaFileLock
-217=__vbaFileOpen
-218=__vbaFileSeek
-219=__vbaFixstrConstruct
-221=__vbaForEachAry
-222=__vbaForEachCollAd
-223=__vbaForEachCollObj
-224=__vbaForEachCollVar
-225=__vbaForEachVar
-112=__vbaFpCDblR4
-113=__vbaFpCDblR8
-114=__vbaFpCSngR4
-115=__vbaFpCSngR8
-116=__vbaFpCmpCy
-117=__vbaFpCy
-118=__vbaFpI2
-119=__vbaFpI4
-120=__vbaFpR4
-121=__vbaFpR8
-122=__vbaFpUI1
-123=__vbaFreeObj
-226=__vbaFreeObjList
-124=__vbaFreeStr
-228=__vbaFreeStrList
-125=__vbaFreeVar
-229=__vbaFreeVarList
-126=__vbaFreeVarg
-233=__vbaGenerateBoundsError
-234=__vbaGet3
-235=__vbaGet4
-236=__vbaGetFxStr3
-237=__vbaGetFxStr4
-238=__vbaGetOwner3
-239=__vbaGetOwner4
-240=__vbaGosub
-241=__vbaGosubFree
-242=__vbaGosubReturn
-243=__vbaHresultCheck
-244=__vbaHresultCheckNonvirt
-245=__vbaHresultCheckObj
-127=__vbaI2Abs
-246=__vbaI2Cy
-247=__vbaI2ErrVar
-248=__vbaI2ForNextCheck
-128=__vbaI2I4
-129=__vbaI2Sgn
-249=__vbaI2Str
-250=__vbaI2Var
-130=__vbaI4Abs
-251=__vbaI4Cy
-252=__vbaI4ErrVar
-253=__vbaI4ForNextCheck
-131=__vbaI4Sgn
-254=__vbaI4Str
-255=__vbaI4Var
-256=__vbaInStr
-257=__vbaInStrB
-258=__vbaInStrVar
-259=__vbaInStrVarB
-260=__vbaInputFile
-261=__vbaLateIdCall
-262=__vbaLateIdCallLd
-263=__vbaLateIdCallSt
-264=__vbaLateIdNamedCall
-267=__vbaLateIdNamedCallLd
-270=__vbaLateIdNamedCallSt
-272=__vbaLateIdNamedStAd
-273=__vbaLateIdSt
-277=__vbaLateIdStAd
-278=__vbaLateMemCall
-279=__vbaLateMemCallLd
-280=__vbaLateMemCallSt
-281=__vbaLateMemNamedCall
-282=__vbaLateMemNamedCallLd
-283=__vbaLateMemNamedCallSt
-284=__vbaLateMemNamedStAd
-285=__vbaLateMemSt
-286=__vbaLateMemStAd
-287=__vbaLbound
-288=__vbaLenBstr
-289=__vbaLenBstrB
-290=__vbaLenVar
-291=__vbaLenVarB
-292=__vbaLineInputStr
-293=__vbaLineInputVar
-294=__vbaLsetFixstr
-295=__vbaLsetFixstrFree
-296=__vbaMidStmtBstr
-297=__vbaMidStmtBstrB
-322=__vbaMidStmtVar
-323=__vbaMidStmtVarB
-324=__vbaNameFile
-326=__vbaNew
-325=__vbaNew2
-327=__vbaNextEachAry
-328=__vbaNextEachCollAd
-329=__vbaNextEachCollObj
-330=__vbaNextEachCollVar
-331=__vbaNextEachVar
-332=__vbaObjAddref
-333=__vbaObjIs
-334=__vbaObjSet
-335=__vbaObjSetAddref
-336=__vbaObjVar
-337=__vbaOnError
-338=__vbaOnGoCheck
-339=__vbaPowerR8
-340=__vbaPrintFile
-341=__vbaPrintObj
-342=__vbaPut3
-343=__vbaPut4
-344=__vbaPutFxStr3
-345=__vbaPutFxStr4
-346=__vbaPutOwner3
-347=__vbaPutOwner4
-348=__vbaR4Cy
-349=__vbaR4ErrVar
-350=__vbaR4ForNextCheck
-351=__vbaR4Sgn
-352=__vbaR4Str
-353=__vbaR4Var
-354=__vbaR8Cy
-355=__vbaR8ErrVar
-356=__vbaR8FixI2
-357=__vbaR8FixI4
-358=__vbaR8ForNextCheck
-359=__vbaR8IntI2
-360=__vbaR8IntI4
-361=__vbaR8Sgn
-362=__vbaR8Str
-363=__vbaR8Var
-364=__vbaRaiseEvent
-365=__vbaRecAnsiToUni
-188=__vbaRecAssign
-189=__vbaRecDestruct
-366=__vbaRecDestructAnsi
-367=__vbaRecUniToAnsi
-368=__vbaRedim
-369=__vbaRedimPreserve
-370=__vbaRedimPreserveVar
-371=__vbaRedimVar
-372=__vbaRefVarAry
-373=__vbaResume
-374=__vbaRsetFixstr
-375=__vbaRsetFixstrFree
-376=__vbaSetSystemError
-377=__vbaStopExe
-378=__vbaStr2Vec
-379=__vbaStrAryToAnsi
-380=__vbaStrAryToUnicode
-381=__vbaStrBool
-382=__vbaStrCat
-383=__vbaStrCmp
-384=__vbaStrComp
-385=__vbaStrCompVar
-132=__vbaStrCopy
-386=__vbaStrCy
-387=__vbaStrDate
-110=__vbaStrErrVarCopy
-388=__vbaStrFixstr
-389=__vbaStrI2
-390=__vbaStrI4
-391=__vbaStrLike
-133=__vbaStrMove
-392=__vbaStrR4
-393=__vbaStrR8
-394=__vbaStrTextCmp
-395=__vbaStrTextLike
-396=__vbaStrToAnsi
-397=__vbaStrToUnicode
-398=__vbaStrUI1
-399=__vbaStrVarCopy
-405=__vbaStrVarMove
-406=__vbaStrVarVal
-407=__vbaUI1Cy
-408=__vbaUI1ErrVar
-134=__vbaUI1I2
-135=__vbaUI1I4
-136=__vbaUI1Sgn
-409=__vbaUI1Str
-415=__vbaUI1Var
-416=__vbaUbound
-417=__vbaUnkVar
-418=__vbaVar2Vec
-419=__vbaVarAbs
-422=__vbaVarAdd
-423=__vbaVarAnd
-424=__vbaVarCat
-425=__vbaVarCmpEq
-426=__vbaVarCmpGe
-427=__vbaVarCmpGt
-428=__vbaVarCmpLe
-429=__vbaVarCmpLt
-437=__vbaVarCmpNe
-137=__vbaVarCopy
-438=__vbaVarDateVar
-439=__vbaVarDiv
-138=__vbaVarDup
-442=__vbaVarEqv
-443=__vbaVarErrI4
-444=__vbaVarFix
-445=__vbaVarForInit
-446=__vbaVarForNext
-447=__vbaVarIdiv
-448=__vbaVarImp
-449=__vbaVarIndexLoad
-450=__vbaVarIndexLoadRef
-451=__vbaVarIndexLoadRefLock
-452=__vbaVarIndexStore
-453=__vbaVarIndexStoreObj
-454=__vbaVarInt
-455=__vbaVarLike
-456=__vbaVarLikeVar
-457=__vbaVarMod
-139=__vbaVarMove
-458=__vbaVarMul
-459=__vbaVarNeg
-460=__vbaVarNot
-461=__vbaVarOr
-462=__vbaVarPow
-463=__vbaVarSetObj
-464=__vbaVarSetObjAddref
-465=__vbaVarSetUnk
-466=__vbaVarSetUnkAddref
-467=__vbaVarSetVar
-468=__vbaVarSetVarAddref
-469=__vbaVarSub
-470=__vbaVarTextCmpEq
-471=__vbaVarTextCmpGe
-472=__vbaVarTextCmpGt
-473=__vbaVarTextCmpLe
-474=__vbaVarTextCmpLt
-475=__vbaVarTextCmpNe
-476=__vbaVarTextLike
-477=__vbaVarTextLikeVar
-478=__vbaVarTextTstEq
-479=__vbaVarTextTstGe
-480=__vbaVarTextTstGt
-481=__vbaVarTextTstLe
-482=__vbaVarTextTstLt
-483=__vbaVarTextTstNe
-484=__vbaVarTstEq
-485=__vbaVarTstGe
-486=__vbaVarTstGt
-487=__vbaVarTstLe
-488=__vbaVarTstLt
-489=__vbaVarTstNe
-140=__vbaVarVargNofree
-490=__vbaVarXor
-491=__vbaVargObj
-492=__vbaVargObjAddref
-141=__vbaVargParmRef
-493=__vbaVargUnk
-494=__vbaVargUnkAddref
-142=__vbaVargVar
-143=__vbaVargVarCopy
-144=__vbaVargVarMove
-145=__vbaVargVarRef
-495=__vbaVerifyVarObj
-496=__vbaWriteFile
-497=_adj_fdiv_m16i
-498=_adj_fdiv_m32
-499=_adj_fdiv_m32i
-500=_adj_fdiv_m64
-501=_adj_fdiv_r
-502=_adj_fdivr_m16i
-503=_adj_fdivr_m32
-504=_adj_fdivr_m32i
-505=_adj_fdivr_m64
-506=_adj_fpatan
-507=_adj_fprem
-508=_adj_fprem1
-509=_adj_fptan
-510=_allmul
-635=rtBoolFromErrVar
-634=rtBstrFromErrVar
-636=rtCyFromErrVar
-564=rtDecFromVar
-637=rtI2FromErrVar
-638=rtI4FromErrVar
-639=rtR4FromErrVar
-640=rtR8FromErrVar
-686=rtUI1FromErrVar
-656=rtcAbsVar
-516=rtcAnsiValueBstr
-597=rtcAppActivate
-627=rtcAppleScript
-601=rtcArray
-585=rtcAtn
-534=rtcBeep
-537=rtcBstrFromAnsi
-694=rtcBstrFromByte
-697=rtcBstrFromChar
-651=rtcBstrFromError
-650=rtcBstrFromFormatVar
-693=rtcByteValueBstr
-643=rtcCVErrFromVar
-530=rtcChangeDir
-533=rtcChangeDrive
-696=rtcCharValueBstr
-665=rtcChoose
-669=rtcCommandBstr
-670=rtcCommandVar
-649=rtcCompareBstr
-583=rtcCos
-625=rtcCreateObject
-647=rtcCurrentDir
-646=rtcCurrentDirBstr
-673=rtcDDB
-661=rtcDateAdd
-662=rtcDateDiff
-641=rtcDateFromVar
-663=rtcDatePart
-691=rtcDeleteSetting
-645=rtcDir
-598=rtcDoEvents
-571=rtcEndOfFile
-667=rtcEnvironBstr
-666=rtcEnvironVar
-685=rtcErrObj
-586=rtcExp
-678=rtcFV
-555=rtcFileAttributes
-576=rtcFileCopy
-577=rtcFileDateTime
-578=rtcFileLen
-570=rtcFileLength
-569=rtcFileLocation
-554=rtcFileReset
-568=rtcFileSeek
-565=rtcFileWidth
-655=rtcFixVar
-648=rtcFreeFile
-692=rtcGetAllSettings
-700=rtcGetCurrentCalendar
-609=rtcGetDateBstr
-540=rtcGetDateValue
-610=rtcGetDateVar
-542=rtcGetDayOfMonth
-552=rtcGetDayOfWeek
-605=rtcGetErl
-579=rtcGetFileAttr
-624=rtcGetHostLCID
-543=rtcGetHourOfDay
-544=rtcGetMinuteOfHour
-545=rtcGetMonthOfYear
-626=rtcGetObject
-546=rtcGetPresentDate
-547=rtcGetSecondOfMinute
-689=rtcGetSetting
-611=rtcGetTimeBstr
-541=rtcGetTimeValue
-612=rtcGetTimeVar
-535=rtcGetTimer
-553=rtcGetYear
-572=rtcHexBstrFromVar
-573=rtcHexVarFromVar
-615=rtcIMEStatus
-674=rtcIPMT
-682=rtcIRR
-681=rtcImmediateIf
-630=rtcInStr
-633=rtcInStrChar
-596=rtcInputBox
-620=rtcInputCharCount
-621=rtcInputCharCountVar
-566=rtcInputCount
-567=rtcInputCountVar
-657=rtcIntVar
-556=rtcIsArray
-557=rtcIsDate
-558=rtcIsEmpty
-559=rtcIsError
-592=rtcIsMissing
-560=rtcIsNull
-561=rtcIsNumeric
-562=rtcIsObject
-529=rtcKillFiles
-512=rtcLeftBstr
-616=rtcLeftCharBstr
-617=rtcLeftCharVar
-521=rtcLeftTrimBstr
-522=rtcLeftTrimVar
-513=rtcLeftVar
-653=rtcLenCharVar
-654=rtcLenVar
-587=rtcLog
-517=rtcLowerCaseBstr
-518=rtcLowerCaseVar
-683=rtcMIRR
-590=rtcMacId
-531=rtcMakeDir
-628=rtcMidBstr
-631=rtcMidCharBstr
-632=rtcMidCharVar
-629=rtcMidVar
-595=rtcMsgBox
-684=rtcNPV
-679=rtcNPer
-574=rtcOctBstrFromVar
-575=rtcOctVarFromVar
-676=rtcPMT
-675=rtcPPMT
-677=rtcPV
-538=rtcPackDate
-539=rtcPackTime
-664=rtcPartition
-589=rtcQBColor
-581=rtcR8ValFromBstr
-593=rtcRandomNext
-594=rtcRandomize
-680=rtcRate
-532=rtcRemoveDir
-588=rtcRgb
-514=rtcRightBstr
-618=rtcRightCharBstr
-619=rtcRightCharVar
-523=rtcRightTrimBstr
-524=rtcRightTrimVar
-515=rtcRightVar
-671=rtcSLN
-672=rtcSYD
-690=rtcSaveSetting
-599=rtcSendKeys
-699=rtcSetCurrentCalendar
-549=rtcSetDateBstr
-548=rtcSetDateVar
-580=rtcSetFileAttr
-551=rtcSetTimeBstr
-550=rtcSetTimeVar
-658=rtcSgnVar
-600=rtcShell
-582=rtcSin
-525=rtcSpaceBstr
-526=rtcSpaceVar
-614=rtcSqr
-622=rtcStrConvVar
-536=rtcStrFromVar
-606=rtcStringBstr
-607=rtcStringVar
-668=rtcSwitch
-584=rtcTan
-519=rtcTrimBstr
-520=rtcTrimVar
-591=rtcTypeName
-527=rtcUpperCaseBstr
-528=rtcUpperCaseVar
-608=rtcVarBstrFromAnsi
-695=rtcVarBstrFromByte
-698=rtcVarBstrFromChar
-687=rtcVarDateFromVar
-652=rtcVarFromError
-660=rtcVarFromFormatVar
-642=rtcVarFromVar
-613=rtcVarStrFromVar
+411=BASIC_CLASS_AddRef
+413=BASIC_CLASS_GetIDsOfNames
+414=BASIC_CLASS_Invoke
+410=BASIC_CLASS_QueryInterface
+412=BASIC_CLASS_Release
+420=BASIC_DISPINTERFACE_GetTICount
+421=BASIC_DISPINTERFACE_GetTypeInfo
+190=CopyRecord
+2000=CreateIExprSrvObj
+146=DLLGetDocumentation
+187=DllFunctionCall
+106=DllRegisterServer
+107=DllUnregisterServer
+440=EVENT_SINK2_AddRef
+441=EVENT_SINK2_Release
+401=EVENT_SINK_AddRef
+403=EVENT_SINK_GetIDsOfNames
+404=EVENT_SINK_Invoke
+400=EVENT_SINK_QueryInterface
+402=EVENT_SINK_Release
+274=EbCreateContext
+275=EbDestroyContext
+232=EbGetHandleOfExecutingProject
+1025=EbGetObjConnectionCounts
+2010=EbGetVBAObject
+298=EbIsProjectOnStack
+268=EbLibraryLoad
+269=EbLibraryUnload
+271=EbLoadRunTime
+231=EbResetProject
+265=EbResetProjectNormal
+276=EbSetContextWorkerThread
+317=GetMem1
+300=GetMem2
+301=GetMem4
+302=GetMem8
+319=GetMemEvent
+314=GetMemNewObj
+305=GetMemObj
+303=GetMemStr
+304=GetMemVar
+1024=IID_IVbaHost
+199=MethCallEngine
+186=ProcCallEngine
+318=PutMem1
+306=PutMem2
+307=PutMem4
+308=PutMem8
+320=PutMemEvent
+315=PutMemNewObj
+311=PutMemObj
+309=PutMemStr
+310=PutMemVar
+321=SetMemEvent
+316=SetMemNewObj
+313=SetMemObj
+312=SetMemVar
+100=ThunRTMain
+299=TipCreateInstanceEx
+230=TipCreateInstanceProject
+195=TipGetAddressOfPredeclaredInstance
+1016=TipInvokeMethod
+999=TipInvokeMethod2
+220=TipSetOption
+266=TipUnloadInstance
+227=TipUnloadProject
+105=UserDllMain
+102=VBDllCanUnloadNow
+104=VBDllGetClassObject
+103=VBDllRegisterServer
+101=VBDllUnRegisterServer
+644=VarPtr
+431=Zombie_AddRef
+435=Zombie_GetIDsOfNames
+434=Zombie_GetTypeInfo
+433=Zombie_GetTypeInfoCount
+436=Zombie_Invoke
+430=Zombie_QueryInterface
+432=Zombie_Release
+147=_CIatan
+148=_CIcos
+149=_CIexp
+150=_CIlog
+151=_CIsin
+152=_CIsqrt
+153=_CItan
+154=__vbaAptOffset
+155=__vbaAryConstruct
+156=__vbaAryCopy
+157=__vbaAryDestruct
+108=__vbaAryLock
+158=__vbaAryMove
+159=__vbaAryRebase1Var
+160=__vbaAryUnlock
+111=__vbaAryVarVarg
+109=__vbaBoolErrVar
+161=__vbaBoolStr
+162=__vbaBoolVar
+163=__vbaBoolVarNull
+164=__vbaCastObj
+165=__vbaCastObjVar
+166=__vbaCheckType
+167=__vbaCheckTypeVar
+168=__vbaChkstk
+169=__vbaCopyBytes
+170=__vbaCyAbs
+171=__vbaCyAdd
+172=__vbaCyErrVar
+173=__vbaCyFix
+174=__vbaCyForInit
+175=__vbaCyForNext
+176=__vbaCyI2
+177=__vbaCyI4
+178=__vbaCyInt
+179=__vbaCyMul
+180=__vbaCyMulI2
+181=__vbaCySgn
+182=__vbaCyStr
+183=__vbaCySub
+184=__vbaCyUI1
+185=__vbaCyVar
+191=__vbaDateR4
+192=__vbaDateR8
+193=__vbaDateStr
+194=__vbaDateVar
+196=__vbaDerefAry
+197=__vbaDerefAry1
+198=__vbaEnd
+200=__vbaErase
+201=__vbaEraseKeepData
+202=__vbaEraseNoPop
+203=__vbaError
+204=__vbaErrorOverflow
+205=__vbaExceptHandler
+206=__vbaExitEachAry
+207=__vbaExitEachColl
+208=__vbaExitEachVar
+209=__vbaExitProc
+210=__vbaFPException
+211=__vbaFPFix
+212=__vbaFPInt
+213=__vbaFailedFriend
+214=__vbaFileClose
+215=__vbaFileCloseAll
+216=__vbaFileLock
+217=__vbaFileOpen
+218=__vbaFileSeek
+219=__vbaFixstrConstruct
+221=__vbaForEachAry
+222=__vbaForEachCollAd
+223=__vbaForEachCollObj
+224=__vbaForEachCollVar
+225=__vbaForEachVar
+112=__vbaFpCDblR4
+113=__vbaFpCDblR8
+114=__vbaFpCSngR4
+115=__vbaFpCSngR8
+116=__vbaFpCmpCy
+117=__vbaFpCy
+118=__vbaFpI2
+119=__vbaFpI4
+120=__vbaFpR4
+121=__vbaFpR8
+122=__vbaFpUI1
+123=__vbaFreeObj
+226=__vbaFreeObjList
+124=__vbaFreeStr
+228=__vbaFreeStrList
+125=__vbaFreeVar
+229=__vbaFreeVarList
+126=__vbaFreeVarg
+233=__vbaGenerateBoundsError
+234=__vbaGet3
+235=__vbaGet4
+236=__vbaGetFxStr3
+237=__vbaGetFxStr4
+238=__vbaGetOwner3
+239=__vbaGetOwner4
+240=__vbaGosub
+241=__vbaGosubFree
+242=__vbaGosubReturn
+243=__vbaHresultCheck
+244=__vbaHresultCheckNonvirt
+245=__vbaHresultCheckObj
+127=__vbaI2Abs
+246=__vbaI2Cy
+247=__vbaI2ErrVar
+248=__vbaI2ForNextCheck
+128=__vbaI2I4
+129=__vbaI2Sgn
+249=__vbaI2Str
+250=__vbaI2Var
+130=__vbaI4Abs
+251=__vbaI4Cy
+252=__vbaI4ErrVar
+253=__vbaI4ForNextCheck
+131=__vbaI4Sgn
+254=__vbaI4Str
+255=__vbaI4Var
+256=__vbaInStr
+257=__vbaInStrB
+258=__vbaInStrVar
+259=__vbaInStrVarB
+260=__vbaInputFile
+261=__vbaLateIdCall
+262=__vbaLateIdCallLd
+263=__vbaLateIdCallSt
+264=__vbaLateIdNamedCall
+267=__vbaLateIdNamedCallLd
+270=__vbaLateIdNamedCallSt
+272=__vbaLateIdNamedStAd
+273=__vbaLateIdSt
+277=__vbaLateIdStAd
+278=__vbaLateMemCall
+279=__vbaLateMemCallLd
+280=__vbaLateMemCallSt
+281=__vbaLateMemNamedCall
+282=__vbaLateMemNamedCallLd
+283=__vbaLateMemNamedCallSt
+284=__vbaLateMemNamedStAd
+285=__vbaLateMemSt
+286=__vbaLateMemStAd
+287=__vbaLbound
+288=__vbaLenBstr
+289=__vbaLenBstrB
+290=__vbaLenVar
+291=__vbaLenVarB
+292=__vbaLineInputStr
+293=__vbaLineInputVar
+294=__vbaLsetFixstr
+295=__vbaLsetFixstrFree
+296=__vbaMidStmtBstr
+297=__vbaMidStmtBstrB
+322=__vbaMidStmtVar
+323=__vbaMidStmtVarB
+324=__vbaNameFile
+326=__vbaNew
+325=__vbaNew2
+327=__vbaNextEachAry
+328=__vbaNextEachCollAd
+329=__vbaNextEachCollObj
+330=__vbaNextEachCollVar
+331=__vbaNextEachVar
+332=__vbaObjAddref
+333=__vbaObjIs
+334=__vbaObjSet
+335=__vbaObjSetAddref
+336=__vbaObjVar
+337=__vbaOnError
+338=__vbaOnGoCheck
+339=__vbaPowerR8
+340=__vbaPrintFile
+341=__vbaPrintObj
+342=__vbaPut3
+343=__vbaPut4
+344=__vbaPutFxStr3
+345=__vbaPutFxStr4
+346=__vbaPutOwner3
+347=__vbaPutOwner4
+348=__vbaR4Cy
+349=__vbaR4ErrVar
+350=__vbaR4ForNextCheck
+351=__vbaR4Sgn
+352=__vbaR4Str
+353=__vbaR4Var
+354=__vbaR8Cy
+355=__vbaR8ErrVar
+356=__vbaR8FixI2
+357=__vbaR8FixI4
+358=__vbaR8ForNextCheck
+359=__vbaR8IntI2
+360=__vbaR8IntI4
+361=__vbaR8Sgn
+362=__vbaR8Str
+363=__vbaR8Var
+364=__vbaRaiseEvent
+365=__vbaRecAnsiToUni
+188=__vbaRecAssign
+189=__vbaRecDestruct
+366=__vbaRecDestructAnsi
+367=__vbaRecUniToAnsi
+368=__vbaRedim
+369=__vbaRedimPreserve
+370=__vbaRedimPreserveVar
+371=__vbaRedimVar
+372=__vbaRefVarAry
+373=__vbaResume
+374=__vbaRsetFixstr
+375=__vbaRsetFixstrFree
+376=__vbaSetSystemError
+377=__vbaStopExe
+378=__vbaStr2Vec
+379=__vbaStrAryToAnsi
+380=__vbaStrAryToUnicode
+381=__vbaStrBool
+382=__vbaStrCat
+383=__vbaStrCmp
+384=__vbaStrComp
+385=__vbaStrCompVar
+132=__vbaStrCopy
+386=__vbaStrCy
+387=__vbaStrDate
+110=__vbaStrErrVarCopy
+388=__vbaStrFixstr
+389=__vbaStrI2
+390=__vbaStrI4
+391=__vbaStrLike
+133=__vbaStrMove
+392=__vbaStrR4
+393=__vbaStrR8
+394=__vbaStrTextCmp
+395=__vbaStrTextLike
+396=__vbaStrToAnsi
+397=__vbaStrToUnicode
+398=__vbaStrUI1
+399=__vbaStrVarCopy
+405=__vbaStrVarMove
+406=__vbaStrVarVal
+407=__vbaUI1Cy
+408=__vbaUI1ErrVar
+134=__vbaUI1I2
+135=__vbaUI1I4
+136=__vbaUI1Sgn
+409=__vbaUI1Str
+415=__vbaUI1Var
+416=__vbaUbound
+417=__vbaUnkVar
+418=__vbaVar2Vec
+419=__vbaVarAbs
+422=__vbaVarAdd
+423=__vbaVarAnd
+424=__vbaVarCat
+425=__vbaVarCmpEq
+426=__vbaVarCmpGe
+427=__vbaVarCmpGt
+428=__vbaVarCmpLe
+429=__vbaVarCmpLt
+437=__vbaVarCmpNe
+137=__vbaVarCopy
+438=__vbaVarDateVar
+439=__vbaVarDiv
+138=__vbaVarDup
+442=__vbaVarEqv
+443=__vbaVarErrI4
+444=__vbaVarFix
+445=__vbaVarForInit
+446=__vbaVarForNext
+447=__vbaVarIdiv
+448=__vbaVarImp
+449=__vbaVarIndexLoad
+450=__vbaVarIndexLoadRef
+451=__vbaVarIndexLoadRefLock
+452=__vbaVarIndexStore
+453=__vbaVarIndexStoreObj
+454=__vbaVarInt
+455=__vbaVarLike
+456=__vbaVarLikeVar
+457=__vbaVarMod
+139=__vbaVarMove
+458=__vbaVarMul
+459=__vbaVarNeg
+460=__vbaVarNot
+461=__vbaVarOr
+462=__vbaVarPow
+463=__vbaVarSetObj
+464=__vbaVarSetObjAddref
+465=__vbaVarSetUnk
+466=__vbaVarSetUnkAddref
+467=__vbaVarSetVar
+468=__vbaVarSetVarAddref
+469=__vbaVarSub
+470=__vbaVarTextCmpEq
+471=__vbaVarTextCmpGe
+472=__vbaVarTextCmpGt
+473=__vbaVarTextCmpLe
+474=__vbaVarTextCmpLt
+475=__vbaVarTextCmpNe
+476=__vbaVarTextLike
+477=__vbaVarTextLikeVar
+478=__vbaVarTextTstEq
+479=__vbaVarTextTstGe
+480=__vbaVarTextTstGt
+481=__vbaVarTextTstLe
+482=__vbaVarTextTstLt
+483=__vbaVarTextTstNe
+484=__vbaVarTstEq
+485=__vbaVarTstGe
+486=__vbaVarTstGt
+487=__vbaVarTstLe
+488=__vbaVarTstLt
+489=__vbaVarTstNe
+140=__vbaVarVargNofree
+490=__vbaVarXor
+491=__vbaVargObj
+492=__vbaVargObjAddref
+141=__vbaVargParmRef
+493=__vbaVargUnk
+494=__vbaVargUnkAddref
+142=__vbaVargVar
+143=__vbaVargVarCopy
+144=__vbaVargVarMove
+145=__vbaVargVarRef
+495=__vbaVerifyVarObj
+496=__vbaWriteFile
+497=_adj_fdiv_m16i
+498=_adj_fdiv_m32
+499=_adj_fdiv_m32i
+500=_adj_fdiv_m64
+501=_adj_fdiv_r
+502=_adj_fdivr_m16i
+503=_adj_fdivr_m32
+504=_adj_fdivr_m32i
+505=_adj_fdivr_m64
+506=_adj_fpatan
+507=_adj_fprem
+508=_adj_fprem1
+509=_adj_fptan
+510=_allmul
+635=rtBoolFromErrVar
+634=rtBstrFromErrVar
+636=rtCyFromErrVar
+564=rtDecFromVar
+637=rtI2FromErrVar
+638=rtI4FromErrVar
+639=rtR4FromErrVar
+640=rtR8FromErrVar
+686=rtUI1FromErrVar
+656=rtcAbsVar
+516=rtcAnsiValueBstr
+597=rtcAppActivate
+627=rtcAppleScript
+601=rtcArray
+585=rtcAtn
+534=rtcBeep
+537=rtcBstrFromAnsi
+694=rtcBstrFromByte
+697=rtcBstrFromChar
+651=rtcBstrFromError
+650=rtcBstrFromFormatVar
+693=rtcByteValueBstr
+643=rtcCVErrFromVar
+530=rtcChangeDir
+533=rtcChangeDrive
+696=rtcCharValueBstr
+665=rtcChoose
+669=rtcCommandBstr
+670=rtcCommandVar
+649=rtcCompareBstr
+583=rtcCos
+625=rtcCreateObject
+647=rtcCurrentDir
+646=rtcCurrentDirBstr
+673=rtcDDB
+661=rtcDateAdd
+662=rtcDateDiff
+641=rtcDateFromVar
+663=rtcDatePart
+691=rtcDeleteSetting
+645=rtcDir
+598=rtcDoEvents
+571=rtcEndOfFile
+667=rtcEnvironBstr
+666=rtcEnvironVar
+685=rtcErrObj
+586=rtcExp
+678=rtcFV
+555=rtcFileAttributes
+576=rtcFileCopy
+577=rtcFileDateTime
+578=rtcFileLen
+570=rtcFileLength
+569=rtcFileLocation
+554=rtcFileReset
+568=rtcFileSeek
+565=rtcFileWidth
+655=rtcFixVar
+648=rtcFreeFile
+692=rtcGetAllSettings
+700=rtcGetCurrentCalendar
+609=rtcGetDateBstr
+540=rtcGetDateValue
+610=rtcGetDateVar
+542=rtcGetDayOfMonth
+552=rtcGetDayOfWeek
+605=rtcGetErl
+579=rtcGetFileAttr
+624=rtcGetHostLCID
+543=rtcGetHourOfDay
+544=rtcGetMinuteOfHour
+545=rtcGetMonthOfYear
+626=rtcGetObject
+546=rtcGetPresentDate
+547=rtcGetSecondOfMinute
+689=rtcGetSetting
+611=rtcGetTimeBstr
+541=rtcGetTimeValue
+612=rtcGetTimeVar
+535=rtcGetTimer
+553=rtcGetYear
+572=rtcHexBstrFromVar
+573=rtcHexVarFromVar
+615=rtcIMEStatus
+674=rtcIPMT
+682=rtcIRR
+681=rtcImmediateIf
+630=rtcInStr
+633=rtcInStrChar
+596=rtcInputBox
+620=rtcInputCharCount
+621=rtcInputCharCountVar
+566=rtcInputCount
+567=rtcInputCountVar
+657=rtcIntVar
+556=rtcIsArray
+557=rtcIsDate
+558=rtcIsEmpty
+559=rtcIsError
+592=rtcIsMissing
+560=rtcIsNull
+561=rtcIsNumeric
+562=rtcIsObject
+529=rtcKillFiles
+512=rtcLeftBstr
+616=rtcLeftCharBstr
+617=rtcLeftCharVar
+521=rtcLeftTrimBstr
+522=rtcLeftTrimVar
+513=rtcLeftVar
+653=rtcLenCharVar
+654=rtcLenVar
+587=rtcLog
+517=rtcLowerCaseBstr
+518=rtcLowerCaseVar
+683=rtcMIRR
+590=rtcMacId
+531=rtcMakeDir
+628=rtcMidBstr
+631=rtcMidCharBstr
+632=rtcMidCharVar
+629=rtcMidVar
+595=rtcMsgBox
+684=rtcNPV
+679=rtcNPer
+574=rtcOctBstrFromVar
+575=rtcOctVarFromVar
+676=rtcPMT
+675=rtcPPMT
+677=rtcPV
+538=rtcPackDate
+539=rtcPackTime
+664=rtcPartition
+589=rtcQBColor
+581=rtcR8ValFromBstr
+593=rtcRandomNext
+594=rtcRandomize
+680=rtcRate
+532=rtcRemoveDir
+588=rtcRgb
+514=rtcRightBstr
+618=rtcRightCharBstr
+619=rtcRightCharVar
+523=rtcRightTrimBstr
+524=rtcRightTrimVar
+515=rtcRightVar
+671=rtcSLN
+672=rtcSYD
+690=rtcSaveSetting
+599=rtcSendKeys
+699=rtcSetCurrentCalendar
+549=rtcSetDateBstr
+548=rtcSetDateVar
+580=rtcSetFileAttr
+551=rtcSetTimeBstr
+550=rtcSetTimeVar
+658=rtcSgnVar
+600=rtcShell
+582=rtcSin
+525=rtcSpaceBstr
+526=rtcSpaceVar
+614=rtcSqr
+622=rtcStrConvVar
+536=rtcStrFromVar
+606=rtcStringBstr
+607=rtcStringVar
+668=rtcSwitch
+584=rtcTan
+519=rtcTrimBstr
+520=rtcTrimVar
+591=rtcTypeName
+527=rtcUpperCaseBstr
+528=rtcUpperCaseVar
+608=rtcVarBstrFromAnsi
+695=rtcVarBstrFromByte
+698=rtcVarBstrFromChar
+687=rtcVarDateFromVar
+652=rtcVarFromError
+660=rtcVarFromFormatVar
+642=rtcVarFromVar
+613=rtcVarStrFromVar
 563=rtcVarType
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/odbc32.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/odbc32.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/odbc32.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/odbc32.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,176 +1,176 @@
-79=CloseODBCPerfData
-80=CollectODBCPerfData
-81=CursorLibLockDbc
-82=CursorLibLockDesc
-83=CursorLibLockStmt
-85=CursorLibTransact
-87=DllBidEntryPoint
-88=GetODBCSharedData
-89=LockHandle
-84=ODBCGetTryWaitValue
-90=ODBCInternalConnectW
-301=ODBCQualifyFileDSNW
-86=ODBCSetTryWaitValue
-91=OpenODBCPerfData
-92=PostComponentError
-93=PostODBCComponentError
-94=PostODBCError
-1=SQLAllocConnect
-2=SQLAllocEnv
-24=SQLAllocHandle
-77=SQLAllocHandleStd
-3=SQLAllocStmt
-4=SQLBindCol
-25=SQLBindParam
-72=SQLBindParameter
-55=SQLBrowseConnect
-255=SQLBrowseConnectA
-155=SQLBrowseConnectW
-78=SQLBulkOperations
-5=SQLCancel
-95=SQLCancelHandle
-26=SQLCloseCursor
-27=SQLColAttribute
-227=SQLColAttributeA
-127=SQLColAttributeW
-6=SQLColAttributes
-206=SQLColAttributesA
-106=SQLColAttributesW
-56=SQLColumnPrivileges
-256=SQLColumnPrivilegesA
-156=SQLColumnPrivilegesW
-40=SQLColumns
-240=SQLColumnsA
-140=SQLColumnsW
-96=SQLCompleteAsync
-7=SQLConnect
-207=SQLConnectA
-107=SQLConnectW
-28=SQLCopyDesc
-57=SQLDataSources
-257=SQLDataSourcesA
-157=SQLDataSourcesW
-8=SQLDescribeCol
-208=SQLDescribeColA
-108=SQLDescribeColW
-58=SQLDescribeParam
-9=SQLDisconnect
-41=SQLDriverConnect
-241=SQLDriverConnectA
-141=SQLDriverConnectW
-71=SQLDrivers
-271=SQLDriversA
-171=SQLDriversW
-29=SQLEndTran
-10=SQLError
-210=SQLErrorA
-110=SQLErrorW
-11=SQLExecDirect
-211=SQLExecDirectA
-111=SQLExecDirectW
-12=SQLExecute
-59=SQLExtendedFetch
-13=SQLFetch
-30=SQLFetchScroll
-60=SQLForeignKeys
-260=SQLForeignKeysA
-160=SQLForeignKeysW
-14=SQLFreeConnect
-15=SQLFreeEnv
-31=SQLFreeHandle
-16=SQLFreeStmt
-32=SQLGetConnectAttr
-232=SQLGetConnectAttrA
-132=SQLGetConnectAttrW
-42=SQLGetConnectOption
-242=SQLGetConnectOptionA
-142=SQLGetConnectOptionW
-17=SQLGetCursorName
-217=SQLGetCursorNameA
-117=SQLGetCursorNameW
-43=SQLGetData
-33=SQLGetDescField
-233=SQLGetDescFieldA
-133=SQLGetDescFieldW
-34=SQLGetDescRec
-234=SQLGetDescRecA
-134=SQLGetDescRecW
-35=SQLGetDiagField
-235=SQLGetDiagFieldA
-135=SQLGetDiagFieldW
-36=SQLGetDiagRec
-236=SQLGetDiagRecA
-136=SQLGetDiagRecW
-37=SQLGetEnvAttr
-44=SQLGetFunctions
-45=SQLGetInfo
-245=SQLGetInfoA
-145=SQLGetInfoW
-38=SQLGetStmtAttr
-238=SQLGetStmtAttrA
-138=SQLGetStmtAttrW
-46=SQLGetStmtOption
-47=SQLGetTypeInfo
-247=SQLGetTypeInfoA
-147=SQLGetTypeInfoW
-61=SQLMoreResults
-62=SQLNativeSql
-262=SQLNativeSqlA
-162=SQLNativeSqlW
-63=SQLNumParams
-18=SQLNumResultCols
-48=SQLParamData
-64=SQLParamOptions
-19=SQLPrepare
-219=SQLPrepareA
-119=SQLPrepareW
-65=SQLPrimaryKeys
-265=SQLPrimaryKeysA
-165=SQLPrimaryKeysW
-66=SQLProcedureColumns
-266=SQLProcedureColumnsA
-166=SQLProcedureColumnsW
-67=SQLProcedures
-267=SQLProceduresA
-167=SQLProceduresW
-49=SQLPutData
-20=SQLRowCount
-39=SQLSetConnectAttr
-239=SQLSetConnectAttrA
-139=SQLSetConnectAttrW
-50=SQLSetConnectOption
-250=SQLSetConnectOptionA
-150=SQLSetConnectOptionW
-21=SQLSetCursorName
-221=SQLSetCursorNameA
-121=SQLSetCursorNameW
-73=SQLSetDescField
-273=SQLSetDescFieldA
-173=SQLSetDescFieldW
-74=SQLSetDescRec
-75=SQLSetEnvAttr
-22=SQLSetParam
-68=SQLSetPos
-69=SQLSetScrollOptions
-76=SQLSetStmtAttr
-276=SQLSetStmtAttrA
-176=SQLSetStmtAttrW
-51=SQLSetStmtOption
-52=SQLSpecialColumns
-252=SQLSpecialColumnsA
-152=SQLSpecialColumnsW
-53=SQLStatistics
-253=SQLStatisticsA
-153=SQLStatisticsW
-70=SQLTablePrivileges
-270=SQLTablePrivilegesA
-170=SQLTablePrivilegesW
-54=SQLTables
-254=SQLTablesA
-154=SQLTablesW
-23=SQLTransact
-97=SearchStatusCode
-98=VFreeErrors
-99=VRetrieveDriverErrorsRowCol
-100=ValidateErrorQueue
+79=CloseODBCPerfData
+80=CollectODBCPerfData
+81=CursorLibLockDbc
+82=CursorLibLockDesc
+83=CursorLibLockStmt
+85=CursorLibTransact
+87=DllBidEntryPoint
+88=GetODBCSharedData
+89=LockHandle
+84=ODBCGetTryWaitValue
+90=ODBCInternalConnectW
+301=ODBCQualifyFileDSNW
+86=ODBCSetTryWaitValue
+91=OpenODBCPerfData
+92=PostComponentError
+93=PostODBCComponentError
+94=PostODBCError
+1=SQLAllocConnect
+2=SQLAllocEnv
+24=SQLAllocHandle
+77=SQLAllocHandleStd
+3=SQLAllocStmt
+4=SQLBindCol
+25=SQLBindParam
+72=SQLBindParameter
+55=SQLBrowseConnect
+255=SQLBrowseConnectA
+155=SQLBrowseConnectW
+78=SQLBulkOperations
+5=SQLCancel
+95=SQLCancelHandle
+26=SQLCloseCursor
+27=SQLColAttribute
+227=SQLColAttributeA
+127=SQLColAttributeW
+6=SQLColAttributes
+206=SQLColAttributesA
+106=SQLColAttributesW
+56=SQLColumnPrivileges
+256=SQLColumnPrivilegesA
+156=SQLColumnPrivilegesW
+40=SQLColumns
+240=SQLColumnsA
+140=SQLColumnsW
+96=SQLCompleteAsync
+7=SQLConnect
+207=SQLConnectA
+107=SQLConnectW
+28=SQLCopyDesc
+57=SQLDataSources
+257=SQLDataSourcesA
+157=SQLDataSourcesW
+8=SQLDescribeCol
+208=SQLDescribeColA
+108=SQLDescribeColW
+58=SQLDescribeParam
+9=SQLDisconnect
+41=SQLDriverConnect
+241=SQLDriverConnectA
+141=SQLDriverConnectW
+71=SQLDrivers
+271=SQLDriversA
+171=SQLDriversW
+29=SQLEndTran
+10=SQLError
+210=SQLErrorA
+110=SQLErrorW
+11=SQLExecDirect
+211=SQLExecDirectA
+111=SQLExecDirectW
+12=SQLExecute
+59=SQLExtendedFetch
+13=SQLFetch
+30=SQLFetchScroll
+60=SQLForeignKeys
+260=SQLForeignKeysA
+160=SQLForeignKeysW
+14=SQLFreeConnect
+15=SQLFreeEnv
+31=SQLFreeHandle
+16=SQLFreeStmt
+32=SQLGetConnectAttr
+232=SQLGetConnectAttrA
+132=SQLGetConnectAttrW
+42=SQLGetConnectOption
+242=SQLGetConnectOptionA
+142=SQLGetConnectOptionW
+17=SQLGetCursorName
+217=SQLGetCursorNameA
+117=SQLGetCursorNameW
+43=SQLGetData
+33=SQLGetDescField
+233=SQLGetDescFieldA
+133=SQLGetDescFieldW
+34=SQLGetDescRec
+234=SQLGetDescRecA
+134=SQLGetDescRecW
+35=SQLGetDiagField
+235=SQLGetDiagFieldA
+135=SQLGetDiagFieldW
+36=SQLGetDiagRec
+236=SQLGetDiagRecA
+136=SQLGetDiagRecW
+37=SQLGetEnvAttr
+44=SQLGetFunctions
+45=SQLGetInfo
+245=SQLGetInfoA
+145=SQLGetInfoW
+38=SQLGetStmtAttr
+238=SQLGetStmtAttrA
+138=SQLGetStmtAttrW
+46=SQLGetStmtOption
+47=SQLGetTypeInfo
+247=SQLGetTypeInfoA
+147=SQLGetTypeInfoW
+61=SQLMoreResults
+62=SQLNativeSql
+262=SQLNativeSqlA
+162=SQLNativeSqlW
+63=SQLNumParams
+18=SQLNumResultCols
+48=SQLParamData
+64=SQLParamOptions
+19=SQLPrepare
+219=SQLPrepareA
+119=SQLPrepareW
+65=SQLPrimaryKeys
+265=SQLPrimaryKeysA
+165=SQLPrimaryKeysW
+66=SQLProcedureColumns
+266=SQLProcedureColumnsA
+166=SQLProcedureColumnsW
+67=SQLProcedures
+267=SQLProceduresA
+167=SQLProceduresW
+49=SQLPutData
+20=SQLRowCount
+39=SQLSetConnectAttr
+239=SQLSetConnectAttrA
+139=SQLSetConnectAttrW
+50=SQLSetConnectOption
+250=SQLSetConnectOptionA
+150=SQLSetConnectOptionW
+21=SQLSetCursorName
+221=SQLSetCursorNameA
+121=SQLSetCursorNameW
+73=SQLSetDescField
+273=SQLSetDescFieldA
+173=SQLSetDescFieldW
+74=SQLSetDescRec
+75=SQLSetEnvAttr
+22=SQLSetParam
+68=SQLSetPos
+69=SQLSetScrollOptions
+76=SQLSetStmtAttr
+276=SQLSetStmtAttrA
+176=SQLSetStmtAttrW
+51=SQLSetStmtOption
+52=SQLSpecialColumns
+252=SQLSpecialColumnsA
+152=SQLSpecialColumnsW
+53=SQLStatistics
+253=SQLStatisticsA
+153=SQLStatisticsW
+70=SQLTablePrivileges
+270=SQLTablePrivilegesA
+170=SQLTablePrivilegesW
+54=SQLTables
+254=SQLTablesA
+154=SQLTablesW
+23=SQLTransact
+97=SearchStatusCode
+98=VFreeErrors
+99=VRetrieveDriverErrorsRowCol
+100=ValidateErrorQueue
 101=g_hHeapMalloc
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/olecli32.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/olecli32.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/olecli32.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/olecli32.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,178 +1,178 @@
-410=BmChangeData
-403=BmClone
-405=BmCopy
-408=BmDraw
-409=BmEnumFormat
-404=BmEqual
-401=BmGetData
-407=BmQueryBounds
-400=BmRelease
-402=BmSaveToStream
-952=CheckNetDrive
-950=ConnectDlgProc
-114=DefCreate
-111=DefCreateFromClip
-115=DefCreateFromFile
-113=DefCreateFromTemplate
-117=DefCreateInvisible
-112=DefCreateLinkFromClip
-116=DefCreateLinkFromFile
-110=DefLoadFromStream
-510=DibChangeData
-503=DibClone
-505=DibCopy
-508=DibDraw
-509=DibEnumFormat
-504=DibEqual
-501=DibGetData
-507=DibQueryBounds
-500=DibRelease
-502=DibSaveToStream
-100=DocWndProc
-708=ErrActivate
-709=ErrClose
-706=ErrCopyFromLink
-717=ErrExecute
-715=ErrGetUpdateOptions
-714=ErrObjectConvert
-718=ErrObjectLong
-707=ErrQueryOpen
-713=ErrQueryOutOfDate
-712=ErrQueryProtocol
-711=ErrReconnect
-705=ErrSetBounds
-702=ErrSetData
-703=ErrSetHostNames
-704=ErrSetTargetDevice
-716=ErrSetUpdateOptions
-701=ErrShow
-710=ErrUpdate
-611=GenChangeData
-604=GenClone
-606=GenCopy
-609=GenDraw
-610=GenEnumFormat
-605=GenEqual
-601=GenGetData
-608=GenQueryBounds
-600=GenRelease
-603=GenSaveToStream
-602=GenSetData
-954=GetTaskVisibleWindow
-216=LeActivate
-224=LeChangeData
-208=LeClone
-225=LeClose
-211=LeCopy
-209=LeCopyFromLink
-230=LeCreateInvisible
-214=LeDraw
-220=LeEnumFormat
-210=LeEqual
-228=LeExecute
-202=LeGetData
-226=LeGetUpdateOptions
-223=LeObjectConvert
-229=LeObjectLong
-213=LeQueryBounds
-215=LeQueryOpen
-222=LeQueryOutOfDate
-221=LeQueryProtocol
-212=LeQueryType
-219=LeReconnect
-200=LeRelease
-207=LeSaveToStream
-206=LeSetBounds
-203=LeSetData
-204=LeSetHostNames
-205=LeSetTargetDevice
-227=LeSetUpdateOptions
-201=LeShow
-218=LeUpdate
-102=MfCallbackFunc
-310=MfChangeData
-303=MfClone
-305=MfCopy
-308=MfDraw
-309=MfEnumFormat
-304=MfEqual
-301=MfGetData
-307=MfQueryBounds
-300=MfRelease
-302=MfSaveToStream
-910=ObjQueryName
-913=ObjQuerySize
-912=ObjQueryType
-911=ObjRename
-21=OleActivate
-6=OleClone
-27=OleClose
-7=OleCopyFromLink
-13=OleCopyToClipboard
-34=OleCreate
-12=OleCreateFromClip
-38=OleCreateFromFile
-33=OleCreateFromTemplate
-58=OleCreateInvisible
-11=OleCreateLinkFromClip
-39=OleCreateLinkFromFile
-2=OleDelete
-19=OleDraw
-26=OleEnumFormats
-47=OleEnumObjects
-8=OleEqual
-57=OleExecute
-28=OleGetData
-24=OleGetLinkUpdateOptions
-60=OleIsDcMeta
-4=OleLoadFromStream
-54=OleLockServer
-32=OleObjectConvert
-18=OleQueryBounds
-59=OleQueryClientVersion
-10=OleQueryCreateFromClip
-9=OleQueryLinkFromClip
-48=OleQueryName
-20=OleQueryOpen
-31=OleQueryOutOfDate
-30=OleQueryProtocol
-36=OleQueryReleaseError
-37=OleQueryReleaseMethod
-35=OleQueryReleaseStatus
-56=OleQuerySize
-14=OleQueryType
-23=OleReconnect
-41=OleRegisterClientDoc
-40=OleRelease
-46=OleRename
-43=OleRenameClientDoc
-50=OleRequestData
-44=OleRevertClientDoc
-42=OleRevokeClientDoc
-3=OleSaveToStream
-45=OleSavedClientDoc
-17=OleSetBounds
-49=OleSetColorScheme
-29=OleSetData
-15=OleSetHostNames
-25=OleSetLinkUpdateOptions
-16=OleSetTargetDevice
-55=OleUnlockServer
-22=OleUpdate
-807=PbCopyToClipboard
-804=PbCreate
-801=PbCreateFromClip
-808=PbCreateFromFile
-803=PbCreateFromTemplate
-812=PbCreateInvisible
-802=PbCreateLinkFromClip
-809=PbCreateLinkFromFile
-805=PbDraw
-810=PbEnumFormats
-811=PbGetData
-800=PbLoadFromStream
-806=PbQueryBounds
-951=SetNetName
-953=SetNextNetDrive
-101=SrvrWndProc
+410=BmChangeData
+403=BmClone
+405=BmCopy
+408=BmDraw
+409=BmEnumFormat
+404=BmEqual
+401=BmGetData
+407=BmQueryBounds
+400=BmRelease
+402=BmSaveToStream
+952=CheckNetDrive
+950=ConnectDlgProc
+114=DefCreate
+111=DefCreateFromClip
+115=DefCreateFromFile
+113=DefCreateFromTemplate
+117=DefCreateInvisible
+112=DefCreateLinkFromClip
+116=DefCreateLinkFromFile
+110=DefLoadFromStream
+510=DibChangeData
+503=DibClone
+505=DibCopy
+508=DibDraw
+509=DibEnumFormat
+504=DibEqual
+501=DibGetData
+507=DibQueryBounds
+500=DibRelease
+502=DibSaveToStream
+100=DocWndProc
+708=ErrActivate
+709=ErrClose
+706=ErrCopyFromLink
+717=ErrExecute
+715=ErrGetUpdateOptions
+714=ErrObjectConvert
+718=ErrObjectLong
+707=ErrQueryOpen
+713=ErrQueryOutOfDate
+712=ErrQueryProtocol
+711=ErrReconnect
+705=ErrSetBounds
+702=ErrSetData
+703=ErrSetHostNames
+704=ErrSetTargetDevice
+716=ErrSetUpdateOptions
+701=ErrShow
+710=ErrUpdate
+611=GenChangeData
+604=GenClone
+606=GenCopy
+609=GenDraw
+610=GenEnumFormat
+605=GenEqual
+601=GenGetData
+608=GenQueryBounds
+600=GenRelease
+603=GenSaveToStream
+602=GenSetData
+954=GetTaskVisibleWindow
+216=LeActivate
+224=LeChangeData
+208=LeClone
+225=LeClose
+211=LeCopy
+209=LeCopyFromLink
+230=LeCreateInvisible
+214=LeDraw
+220=LeEnumFormat
+210=LeEqual
+228=LeExecute
+202=LeGetData
+226=LeGetUpdateOptions
+223=LeObjectConvert
+229=LeObjectLong
+213=LeQueryBounds
+215=LeQueryOpen
+222=LeQueryOutOfDate
+221=LeQueryProtocol
+212=LeQueryType
+219=LeReconnect
+200=LeRelease
+207=LeSaveToStream
+206=LeSetBounds
+203=LeSetData
+204=LeSetHostNames
+205=LeSetTargetDevice
+227=LeSetUpdateOptions
+201=LeShow
+218=LeUpdate
+102=MfCallbackFunc
+310=MfChangeData
+303=MfClone
+305=MfCopy
+308=MfDraw
+309=MfEnumFormat
+304=MfEqual
+301=MfGetData
+307=MfQueryBounds
+300=MfRelease
+302=MfSaveToStream
+910=ObjQueryName
+913=ObjQuerySize
+912=ObjQueryType
+911=ObjRename
+21=OleActivate
+6=OleClone
+27=OleClose
+7=OleCopyFromLink
+13=OleCopyToClipboard
+34=OleCreate
+12=OleCreateFromClip
+38=OleCreateFromFile
+33=OleCreateFromTemplate
+58=OleCreateInvisible
+11=OleCreateLinkFromClip
+39=OleCreateLinkFromFile
+2=OleDelete
+19=OleDraw
+26=OleEnumFormats
+47=OleEnumObjects
+8=OleEqual
+57=OleExecute
+28=OleGetData
+24=OleGetLinkUpdateOptions
+60=OleIsDcMeta
+4=OleLoadFromStream
+54=OleLockServer
+32=OleObjectConvert
+18=OleQueryBounds
+59=OleQueryClientVersion
+10=OleQueryCreateFromClip
+9=OleQueryLinkFromClip
+48=OleQueryName
+20=OleQueryOpen
+31=OleQueryOutOfDate
+30=OleQueryProtocol
+36=OleQueryReleaseError
+37=OleQueryReleaseMethod
+35=OleQueryReleaseStatus
+56=OleQuerySize
+14=OleQueryType
+23=OleReconnect
+41=OleRegisterClientDoc
+40=OleRelease
+46=OleRename
+43=OleRenameClientDoc
+50=OleRequestData
+44=OleRevertClientDoc
+42=OleRevokeClientDoc
+3=OleSaveToStream
+45=OleSavedClientDoc
+17=OleSetBounds
+49=OleSetColorScheme
+29=OleSetData
+15=OleSetHostNames
+25=OleSetLinkUpdateOptions
+16=OleSetTargetDevice
+55=OleUnlockServer
+22=OleUpdate
+807=PbCopyToClipboard
+804=PbCreate
+801=PbCreateFromClip
+808=PbCreateFromFile
+803=PbCreateFromTemplate
+812=PbCreateInvisible
+802=PbCreateLinkFromClip
+809=PbCreateLinkFromFile
+805=PbDraw
+810=PbEnumFormats
+811=PbGetData
+800=PbLoadFromStream
+806=PbQueryBounds
+951=SetNetName
+953=SetNextNetDrive
+101=SrvrWndProc
 1=WEP
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/oledlg.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/oledlg.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/oledlg.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/oledlg.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,23 +1,23 @@
-1=OleUIAddVerbMenuA
-13=OleUIAddVerbMenuW
-8=OleUIBusyA
-14=OleUIBusyW
-2=OleUICanConvertOrActivateAs
-6=OleUIChangeIconA
-15=OleUIChangeIconW
-12=OleUIChangeSourceA
-16=OleUIChangeSourceW
-7=OleUIConvertA
-17=OleUIConvertW
-5=OleUIEditLinksA
-18=OleUIEditLinksW
-3=OleUIInsertObjectA
-19=OleUIInsertObjectW
-11=OleUIObjectPropertiesA
-20=OleUIObjectPropertiesW
-4=OleUIPasteSpecialA
-21=OleUIPasteSpecialW
-10=OleUIPromptUserA
-22=OleUIPromptUserW
-9=OleUIUpdateLinksA
-23=OleUIUpdateLinksW
+1=OleUIAddVerbMenuA
+13=OleUIAddVerbMenuW
+8=OleUIBusyA
+14=OleUIBusyW
+2=OleUICanConvertOrActivateAs
+6=OleUIChangeIconA
+15=OleUIChangeIconW
+12=OleUIChangeSourceA
+16=OleUIChangeSourceW
+7=OleUIConvertA
+17=OleUIConvertW
+5=OleUIEditLinksA
+18=OleUIEditLinksW
+3=OleUIInsertObjectA
+19=OleUIInsertObjectW
+11=OleUIObjectPropertiesA
+20=OleUIObjectPropertiesW
+4=OleUIPasteSpecialA
+21=OleUIPasteSpecialW
+10=OleUIPromptUserA
+22=OleUIPromptUserW
+9=OleUIUpdateLinksA
+23=OleUIUpdateLinksW
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/olepro32.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/olepro32.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/olepro32.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/olepro32.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,11 +1,11 @@
-255=DllCanUnloadNow
-256=DllGetClassObject
-257=DllRegisterServer
-258=DllUnregisterServer
-253=OleCreateFontIndirect
-252=OleCreatePictureIndirect
-250=OleCreatePropertyFrame
-249=OleCreatePropertyFrameIndirect
-248=OleIconToCursor
-251=OleLoadPicture
-254=OleTranslateColor
+255=DllCanUnloadNow
+256=DllGetClassObject
+257=DllRegisterServer
+258=DllUnregisterServer
+253=OleCreateFontIndirect
+252=OleCreatePictureIndirect
+250=OleCreatePropertyFrame
+249=OleCreatePropertyFrameIndirect
+248=OleIconToCursor
+251=OleLoadPicture
+254=OleTranslateColor
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/olesvr32.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/olesvr32.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/olesvr32.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/olesvr32.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,23 +1,23 @@
-29=DeleteClientInfo
-22=DocWndProc
-31=EnumForTerminate
-25=FindItemWnd
-26=ItemCallBack
-23=ItemWndProc
-4=OleBlockServer
-12=OleQueryServerVersion
-2=OleRegisterServer
-6=OleRegisterServerDoc
-8=OleRenameServerDoc
-9=OleRevertServerDoc
-11=OleRevokeObject
-3=OleRevokeServer
-7=OleRevokeServerDoc
-10=OleSavedServerDoc
-5=OleUnblockServer
-24=SendDataMsg
-30=SendRenameMsg
-21=SrvrWndProc
-27=TerminateClients
-28=TerminateDocClients
+29=DeleteClientInfo
+22=DocWndProc
+31=EnumForTerminate
+25=FindItemWnd
+26=ItemCallBack
+23=ItemWndProc
+4=OleBlockServer
+12=OleQueryServerVersion
+2=OleRegisterServer
+6=OleRegisterServerDoc
+8=OleRenameServerDoc
+9=OleRevertServerDoc
+11=OleRevokeObject
+3=OleRevokeServer
+7=OleRevokeServerDoc
+10=OleSavedServerDoc
+5=OleUnblockServer
+24=SendDataMsg
+30=SendRenameMsg
+21=SrvrWndProc
+27=TerminateClients
+28=TerminateDocClients
 1=WEP
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/shdocvw.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/shdocvw.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/shdocvw.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/shdocvw.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,24 +1,24 @@
-106=AddUrlToFavorites
-107=DllCanUnloadNow
-108=DllGetClassObject
-109=DllGetVersion
-112=DllRegisterWindowClasses
-113=DoAddToFavDlg
-114=DoAddToFavDlgW
-124=DoFileDownload
-126=DoFileDownloadEx
-127=DoOrganizeFavDlg
-128=DoOrganizeFavDlgW
-129=DoPrivacyDlg
-132=HlinkFindFrame
-133=HlinkFrameNavigate
-134=HlinkFrameNavigateNHL
-144=ImportPrivacySettings
-154=OpenURL
-163=SHAddSubscribeFavorite
-155=SHGetIDispatchForFolder
-156=SetQueryNetSessionCount
-157=SetShellOfflineState
-166=SoftwareUpdateMessageBox
-168=URLQualifyA
-182=URLQualifyW
+106=AddUrlToFavorites
+107=DllCanUnloadNow
+108=DllGetClassObject
+109=DllGetVersion
+112=DllRegisterWindowClasses
+113=DoAddToFavDlg
+114=DoAddToFavDlgW
+124=DoFileDownload
+126=DoFileDownloadEx
+127=DoOrganizeFavDlg
+128=DoOrganizeFavDlgW
+129=DoPrivacyDlg
+132=HlinkFindFrame
+133=HlinkFrameNavigate
+134=HlinkFrameNavigateNHL
+144=ImportPrivacySettings
+154=OpenURL
+163=SHAddSubscribeFavorite
+155=SHGetIDispatchForFolder
+156=SetQueryNetSessionCount
+157=SetShellOfflineState
+166=SoftwareUpdateMessageBox
+168=URLQualifyA
+182=URLQualifyW
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/shell32.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/shell32.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/shell32.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/shell32.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,482 +1,482 @@
-255=AppCompat_RunDLLW
-263=AssocCreateForClasses
-267=AssocGetDetailsOfPropKey
-701=CDefFolderMenu_Create2
-83=CIDLData_CreateFromIDArray
-937=CStorageItem_GetValidatedStorageItemObject
-268=CheckEscapesW
-269=CommandLineToArgvW
-272=Control_RunDLL
-273=Control_RunDLLA
-274=Control_RunDLLAsUserW
-275=Control_RunDLLW
-935=CreateStorageItemFromPath_FullTrustCaller
-936=CreateStorageItemFromPath_FullTrustCaller_ForPackage
-920=CreateStorageItemFromPath_PartialTrustCaller
-921=CreateStorageItemFromShellItem_FullTrustCaller
-925=CreateStorageItemFromShellItem_FullTrustCaller_ForPackage
-929=CreateStorageItemFromShellItem_FullTrustCaller_ForPackage_WithProcessHandle
-931=CreateStorageItemFromShellItem_FullTrustCaller_UseImplicitFlagsAndPackage
-129=DAD_AutoScroll
-131=DAD_DragEnterEx
-22=DAD_DragEnterEx2
-132=DAD_DragLeave
-134=DAD_DragMove
-136=DAD_SetDragImage
-137=DAD_ShowDragImage
-276=DllCanUnloadNow
-277=DllGetActivationFactory
-278=DllGetClassObject
-279=DllGetVersion
-280=DllInstall
-281=DllRegisterServer
-282=DllUnregisterServer
-283=DoEnvironmentSubstA
-284=DoEnvironmentSubstW
-285=DragAcceptFiles
-286=DragFinish
-287=DragQueryFile
-288=DragQueryFileA
-289=DragQueryFileAorW
-290=DragQueryFileW
-291=DragQueryPoint
-64=DriveType
-292=DuplicateIcon
-293=ExtractAssociatedIconA
-294=ExtractAssociatedIconExA
-295=ExtractAssociatedIconExW
-296=ExtractAssociatedIconW
-297=ExtractIconA
-298=ExtractIconEx
-299=ExtractIconExA
-300=ExtractIconExW
-301=ExtractIconW
-302=FindExecutableA
-303=FindExecutableW
-304=FreeIconList
-305=GetCurrentProcessExplicitAppUserModelID
-63=GetFileNameFromBrowse
-919=GetSystemPersistedStorageItemList
-154=ILAppendID
-18=ILClone
-19=ILCloneFirst
-25=ILCombine
-157=ILCreateFromPath
-189=ILCreateFromPathA
-190=ILCreateFromPathW
-24=ILFindChild
-16=ILFindLastID
-155=ILFree
-153=ILGetNext
-152=ILGetSize
-21=ILIsEqual
-23=ILIsParent
-846=ILLoadFromStreamEx
-17=ILRemoveLastID
-27=ILSaveToStream
-306=InitNetworkAddressControl
-307=InternalExtractIconListA
-308=InternalExtractIconListW
-942=IsDesktopExplorerProcess
-119=IsLFNDrive
-41=IsLFNDriveA
-42=IsLFNDriveW
-66=IsNetDrive
-941=IsProcessAnExplorer
-680=IsUserAnAdmin
-309=LaunchMSHelp_RunDLLW
-81=OpenAs_RunDLL
-125=OpenAs_RunDLLA
-133=OpenAs_RunDLLW
-85=OpenRegStream
-310=Options_RunDLL
-311=Options_RunDLLA
-312=Options_RunDLLW
-171=PathCleanupSpec
-92=PathGetShortPath
-43=PathIsExe
-240=PathIsSlowA
-239=PathIsSlowW
-47=PathMakeUniqueName
-49=PathQualify
-51=PathResolve
-75=PathYetAnotherMakeUniqueName
-62=PickIconDlg
-13=PifMgr_CloseProperties
-10=PifMgr_GetProperties
-9=PifMgr_OpenProperties
-11=PifMgr_SetProperties
-135=PrepareDiscForBurnRunDllW
-138=PrintersGetCommand_RunDLL
-139=PrintersGetCommand_RunDLLA
-150=PrintersGetCommand_RunDLLW
-654=ReadCabinetState
-524=RealDriveType
-199=RealShellExecuteA
-207=RealShellExecuteExA
-208=RealShellExecuteExW
-226=RealShellExecuteW
-313=RegenerateUserEnvironment
-59=RestartDialog
-730=RestartDialogEx
-314=RunAsNewUser_RunDLLW
-315=SHAddDefaultPropertiesByExt
-167=SHAddFromPropSheetExtArray
-316=SHAddToRecentDocs
-196=SHAlloc
-317=SHAppBarMessage
-318=SHAssocEnumHandlers
-319=SHAssocEnumHandlersForProtocolByApplication
-320=SHBindToFolderIDListParent
-321=SHBindToFolderIDListParentEx
-322=SHBindToObject
-323=SHBindToParent
-324=SHBrowseForFolder
-325=SHBrowseForFolderA
-326=SHBrowseForFolderW
-147=SHCLSIDFromString
-644=SHChangeNotification_Lock
-645=SHChangeNotification_Unlock
-327=SHChangeNotify
-4=SHChangeNotifyDeregister
-2=SHChangeNotifyRegister
-328=SHChangeNotifyRegisterThread
-329=SHChangeNotifySuspendResume
-89=SHCloneSpecialIDList
-102=SHCoCreateInstance
-330=SHCoCreateInstanceWorker
-331=SHCreateAssociationRegistration
-332=SHCreateCategoryEnum
-333=SHCreateDataObject
-334=SHCreateDefaultContextMenu
-335=SHCreateDefaultExtractIcon
-336=SHCreateDefaultPropertiesOp
-165=SHCreateDirectory
-337=SHCreateDirectoryExA
-338=SHCreateDirectoryExW
-339=SHCreateDrvExtIcon
-743=SHCreateFileExtractIconW
-340=SHCreateItemFromIDList
-341=SHCreateItemFromParsingName
-342=SHCreateItemFromRelativeName
-343=SHCreateItemInKnownFolder
-344=SHCreateItemWithParent
-345=SHCreateLocalServerRunDll
-346=SHCreateProcessAsUserW
-168=SHCreatePropSheetExtArray
-347=SHCreateQueryCancelAutoPlayMoniker
-256=SHCreateShellFolderView
-174=SHCreateShellFolderViewEx
-348=SHCreateShellItem
-349=SHCreateShellItemArray
-350=SHCreateShellItemArrayFromDataObject
-351=SHCreateShellItemArrayFromIDLists
-352=SHCreateShellItemArrayFromShellItem
-74=SHCreateStdEnumFmtEtc
-3=SHDefExtractIconA
-6=SHDefExtractIconW
-169=SHDestroyPropSheetExtArray
-88=SHDoDragDrop
-353=SHELL32_AddToBackIconTable
-354=SHELL32_AddToFrontIconTable
-355=SHELL32_AreAllItemsAvailable
-356=SHELL32_BindToFilePlaceholderHandler
-357=SHELL32_CCommonPlacesFolder_CreateInstance
-358=SHELL32_CDBurn_CloseSession
-359=SHELL32_CDBurn_DriveSupportedForDataBurn
-360=SHELL32_CDBurn_Erase
-361=SHELL32_CDBurn_GetCDInfo
-362=SHELL32_CDBurn_GetLiveFSDiscInfo
-363=SHELL32_CDBurn_GetStagingPathOrNormalPath
-364=SHELL32_CDBurn_GetTaskInfo
-366=SHELL32_CDBurn_IsBlankDisc
-365=SHELL32_CDBurn_IsBlankDisc2
-367=SHELL32_CDBurn_IsLiveFS
-368=SHELL32_CDBurn_OnDeviceChange
-369=SHELL32_CDBurn_OnEject
-370=SHELL32_CDBurn_OnMediaChange
-371=SHELL32_CDefFolderMenu_Create2
-372=SHELL32_CDefFolderMenu_Create2Ex
-373=SHELL32_CDefFolderMenu_MergeMenu
-374=SHELL32_CDrivesContextMenu_Create
-375=SHELL32_CDrivesDropTarget_Create
-376=SHELL32_CFSDropTarget_CreateInstance
-377=SHELL32_CFSFolderCallback_Create
-378=SHELL32_CFillPropertiesTask_CreateInstance
-379=SHELL32_CLibraryDropTarget_CreateInstance
-380=SHELL32_CLocationContextMenu_Create
-381=SHELL32_CMountPoint_DoAutorun
-382=SHELL32_CMountPoint_DoAutorunPrompt
-383=SHELL32_CMountPoint_IsAutoRunDriveAndEnabledByPolicy
-384=SHELL32_CMountPoint_ProcessAutoRunFile
-385=SHELL32_CMountPoint_WantAutorunUI
-386=SHELL32_CMountPoint_WantAutorunUIGetReady
-387=SHELL32_CPL_CategoryIdArrayFromVariant
-388=SHELL32_CPL_IsLegacyCanonicalNameListedUnderKey
-389=SHELL32_CPL_ModifyWowDisplayName
-390=SHELL32_CRecentDocsContextMenu_CreateInstance
-391=SHELL32_CSyncRootManager_CreateInstance
-392=SHELL32_CTransferConfirmation_CreateInstance
-393=SHELL32_CallFileCopyHooks
-394=SHELL32_CanDisplayWin8CopyDialog
-395=SHELL32_CloseAutoplayPrompt
-396=SHELL32_CommandLineFromMsiDescriptor
-397=SHELL32_CopyExtrinsicPropertyStore
-398=SHELL32_CopyFilePlaceholderToNewFile
-399=SHELL32_CopySecondaryTiles
-400=SHELL32_CreateAlternateStreamFileName
-401=SHELL32_CreateConfirmationInterrupt
-402=SHELL32_CreateConflictInterrupt
-403=SHELL32_CreateDefaultOperationDataProvider
-404=SHELL32_CreateExtrinsicPropertyStore
-405=SHELL32_CreateFileFolderContextMenu
-406=SHELL32_CreateLinkInfoW
-407=SHELL32_CreatePlaceholderFile
-408=SHELL32_CreateQosRecorder
-409=SHELL32_CreateSharePointView
-410=SHELL32_Create_IEnumUICommand
-411=SHELL32_DestroyLinkInfo
-412=SHELL32_EncryptDirectory
-413=SHELL32_EncryptedFileKeyInfo
-414=SHELL32_EnumCommonTasks
-415=SHELL32_FilePlaceholder_BindToPrimaryStream
-416=SHELL32_FilePlaceholder_CreateInstance
-417=SHELL32_FreeEncryptedFileKeyInfo
-418=SHELL32_GenerateAppID
-419=SHELL32_GetAppIDRoot
-420=SHELL32_GetCommandProviderForFolderType
-421=SHELL32_GetDPIAdjustedLogicalSize
-422=SHELL32_GetDiskCleanupPath
-423=SHELL32_GetFileNameFromBrowse
-424=SHELL32_GetIconOverlayManager
-425=SHELL32_GetLinkInfoData
-426=SHELL32_GetPlaceholderStatesFromFileAttributesAndReparsePointTag
-427=SHELL32_GetRatingBucket
-428=SHELL32_GetSkyDriveNetworkStates
-429=SHELL32_GetSqmableFileName
-431=SHELL32_GetThumbnailAdornerFromFactory
-430=SHELL32_GetThumbnailAdornerFromFactory2
-432=SHELL32_HandleUnrecognizedFileSystem
-433=SHELL32_IconCacheCreate
-434=SHELL32_IconCacheDestroy
-435=SHELL32_IconCacheHandleAssociationChanged
-436=SHELL32_IconCacheRestore
-437=SHELL32_IconCache_AboutToExtractIcons
-438=SHELL32_IconCache_DoneExtractingIcons
-439=SHELL32_IconCache_ExpandEnvAndSearchPath
-440=SHELL32_IconCache_RememberRecentlyExtractedIconsW
-441=SHELL32_IconOverlayManagerInit
-442=SHELL32_IsGetKeyboardLayoutPresent
-443=SHELL32_IsSystemUpgradeInProgress
-444=SHELL32_IsValidLinkInfo
-445=SHELL32_LegacyEnumSpecialTasksByType
-446=SHELL32_LegacyEnumTasks
-447=SHELL32_LookupBackIconIndex
-448=SHELL32_LookupFrontIconIndex
-449=SHELL32_NormalizeRating
-450=SHELL32_NotifyLinkTrackingServiceOfMove
-451=SHELL32_PifMgr_CloseProperties
-452=SHELL32_PifMgr_GetProperties
-453=SHELL32_PifMgr_OpenProperties
-454=SHELL32_PifMgr_SetProperties
-455=SHELL32_Printers_CreateBindInfo
-456=SHELL32_Printjob_GetPidl
-457=SHELL32_PurgeSystemIcon
-458=SHELL32_RefreshOverlayImages
-459=SHELL32_ResolveLinkInfoW
-460=SHELL32_SHAddSparseIcon
-461=SHELL32_SHCreateByValueOperationInterrupt
-462=SHELL32_SHCreateDefaultContextMenu
-463=SHELL32_SHCreateLocalServer
-464=SHELL32_SHCreateShellFolderView
-465=SHELL32_SHDuplicateEncryptionInfoFile
-466=SHELL32_SHEncryptFile
-467=SHELL32_SHFormatDriveAsync
-468=SHELL32_SHGetThreadUndoManager
-469=SHELL32_SHGetUserNameW
-470=SHELL32_SHIsVirtualDevice
-471=SHELL32_SHLaunchPropSheet
-472=SHELL32_SHLogILFromFSIL
-473=SHELL32_SHOpenWithDialog
-474=SHELL32_SHUICommandFromGUID
-475=SHELL32_SendToMenu_InvokeTargetedCommand
-476=SHELL32_SendToMenu_VerifyTargetedCommand
-478=SHELL32_SetPlaceholderReparsePointAttribute
-477=SHELL32_SetPlaceholderReparsePointAttribute2
-479=SHELL32_ShowHideIconOnlyOnDesktop
-480=SHELL32_SimpleRatingToFilterCondition
-481=SHELL32_StampIconForElevation
-482=SHELL32_SuspendUndo
-483=SHELL32_TryVirtualDiscImageDriveEject
-484=SHELL32_UpdateFilePlaceholderStates
-485=SHELL32_VerifySaferTrust
-486=SHEmptyRecycleBinA
-487=SHEmptyRecycleBinW
-488=SHEnableServiceObject
-489=SHEnumerateUnreadMailAccountsW
-490=SHEvaluateSystemCommandTemplate
-491=SHExtractIconsW
-492=SHFileOperation
-493=SHFileOperationA
-494=SHFileOperationW
-90=SHFindFiles
-149=SHFind_InitMenuPopup
-526=SHFlushSFCache
-495=SHFormatDrive
-195=SHFree
-496=SHFreeNameMappings
-750=SHGetAttributesFromDataObject
-497=SHGetDataFromIDListA
-498=SHGetDataFromIDListW
-499=SHGetDesktopFolder
-500=SHGetDiskFreeSpaceA
-501=SHGetDiskFreeSpaceExA
-502=SHGetDiskFreeSpaceExW
-503=SHGetDriveMedia
-504=SHGetFileInfo
-505=SHGetFileInfoA
-506=SHGetFileInfoW
-507=SHGetFolderLocation
-508=SHGetFolderPathA
-509=SHGetFolderPathAndSubDirA
-510=SHGetFolderPathAndSubDirW
-511=SHGetFolderPathEx
-512=SHGetFolderPathW
-513=SHGetIDListFromObject
-514=SHGetIconOverlayIndexA
-515=SHGetIconOverlayIndexW
-727=SHGetImageList
-516=SHGetInstanceExplorer
-517=SHGetItemFromDataObject
-518=SHGetItemFromObject
-519=SHGetKnownFolderIDList
-527=SHGetKnownFolderItem
-528=SHGetKnownFolderPath
-529=SHGetLocalizedName
-530=SHGetMalloc
-531=SHGetNameFromIDList
-532=SHGetNewLinkInfo
-179=SHGetNewLinkInfoA
-180=SHGetNewLinkInfoW
-533=SHGetPathFromIDList
-534=SHGetPathFromIDListA
-535=SHGetPathFromIDListEx
-536=SHGetPathFromIDListW
-537=SHGetPropertyStoreForWindow
-538=SHGetPropertyStoreFromIDList
-539=SHGetPropertyStoreFromParsingName
-98=SHGetRealIDL
-709=SHGetSetFolderCustomSettings
-68=SHGetSetSettings
-540=SHGetSettings
-541=SHGetSpecialFolderLocation
-542=SHGetSpecialFolderPathA
-543=SHGetSpecialFolderPathW
-544=SHGetStockIconInfo
-545=SHGetTemporaryPropertyForItem
-546=SHGetUnreadMailCountW
-193=SHHandleUpdateImage
-228=SHHelpShortcuts_RunDLL
-229=SHHelpShortcuts_RunDLLA
-238=SHHelpShortcuts_RunDLLW
-28=SHILCreateFromPath
-547=SHInvokePrinterCommandA
-548=SHInvokePrinterCommandW
-549=SHIsFileAvailableOffline
-747=SHLimitInputEdit
-550=SHLoadInProc
-551=SHLoadNonloadedIconOverlayIdentifiers
-77=SHMapPIDLToSystemImageListIndex
-716=SHMultiFileProperties
-178=SHObjectProperties
-552=SHOpenFolderAndSelectItems
-80=SHOpenPropSheetW
-553=SHOpenWithDialog
-554=SHParseDisplayName
-555=SHPathPrepareForWriteA
-556=SHPathPrepareForWriteW
-685=SHPropStgCreate
-688=SHPropStgReadMultiple
-689=SHPropStgWriteMultiple
-557=SHQueryRecycleBinA
-558=SHQueryRecycleBinW
-559=SHQueryUserNotificationState
-560=SHRemoveLocalizedName
-170=SHReplaceFromPropSheetExtArray
-561=SHResolveLibrary
-100=SHRestricted
-562=SHSetDefaultProperties
-231=SHSetFolderPathA
-232=SHSetFolderPathW
-176=SHSetInstanceExplorer
-563=SHSetKnownFolderPath
-564=SHSetLocalizedName
-565=SHSetTemporaryPropertyForItem
-566=SHSetUnreadMailCountW
-73=SHShellFolderView_Message
-567=SHShowManageLibraryUI
-162=SHSimpleIDListFromPath
-14=SHStartNetConnectionDialogW
-245=SHTestTokenMembership
-191=SHUpdateImageA
-192=SHUpdateImageW
-568=SHUpdateRecycleBinIcon
-173=SHValidateUNC
-569=SetCurrentProcessExplicitAppUserModelID
-570=SheChangeDirA
-571=SheChangeDirExW
-572=SheGetDirA
-573=SheSetCurDrive
-574=ShellAboutA
-575=ShellAboutW
-576=ShellExec_RunDLL
-577=ShellExec_RunDLLA
-578=ShellExec_RunDLLW
-579=ShellExecuteA
-580=ShellExecuteEx
-581=ShellExecuteExA
-582=ShellExecuteExW
-583=ShellExecuteW
-584=ShellHookProc
-183=ShellMessageBoxA
-182=ShellMessageBoxW
-72=Shell_GetCachedImageIndex
-585=Shell_GetCachedImageIndexA
-586=Shell_GetCachedImageIndexW
-71=Shell_GetImageLists
-67=Shell_MergeMenus
-587=Shell_NotifyIcon
-588=Shell_NotifyIconA
-589=Shell_NotifyIconGetRect
-590=Shell_NotifyIconW
-103=SignalFileOpen
-682=StgMakeUniqueName
-591=StrChrA
-592=StrChrIA
-593=StrChrIW
-594=StrChrW
-595=StrCmpNA
-596=StrCmpNIA
-597=StrCmpNIW
-598=StrCmpNW
-599=StrNCmpA
-600=StrNCmpIA
-601=StrNCmpIW
-602=StrNCmpW
-603=StrRChrA
-604=StrRChrIA
-605=StrRChrIW
-606=StrRChrW
-607=StrRStrA
-608=StrRStrIA
-609=StrRStrIW
-610=StrRStrW
-611=StrStrA
-612=StrStrIA
-613=StrStrIW
-614=StrStrW
-615=UsersLibrariesFolderUI_CreateInstance
-616=WOWShellExecute
-617=WaitForExplorerRestartW
-164=Win32DeleteFile
-652=WriteCabinetState
+255=AppCompat_RunDLLW
+263=AssocCreateForClasses
+267=AssocGetDetailsOfPropKey
+701=CDefFolderMenu_Create2
+83=CIDLData_CreateFromIDArray
+937=CStorageItem_GetValidatedStorageItemObject
+268=CheckEscapesW
+269=CommandLineToArgvW
+272=Control_RunDLL
+273=Control_RunDLLA
+274=Control_RunDLLAsUserW
+275=Control_RunDLLW
+935=CreateStorageItemFromPath_FullTrustCaller
+936=CreateStorageItemFromPath_FullTrustCaller_ForPackage
+920=CreateStorageItemFromPath_PartialTrustCaller
+921=CreateStorageItemFromShellItem_FullTrustCaller
+925=CreateStorageItemFromShellItem_FullTrustCaller_ForPackage
+929=CreateStorageItemFromShellItem_FullTrustCaller_ForPackage_WithProcessHandle
+931=CreateStorageItemFromShellItem_FullTrustCaller_UseImplicitFlagsAndPackage
+129=DAD_AutoScroll
+131=DAD_DragEnterEx
+22=DAD_DragEnterEx2
+132=DAD_DragLeave
+134=DAD_DragMove
+136=DAD_SetDragImage
+137=DAD_ShowDragImage
+276=DllCanUnloadNow
+277=DllGetActivationFactory
+278=DllGetClassObject
+279=DllGetVersion
+280=DllInstall
+281=DllRegisterServer
+282=DllUnregisterServer
+283=DoEnvironmentSubstA
+284=DoEnvironmentSubstW
+285=DragAcceptFiles
+286=DragFinish
+287=DragQueryFile
+288=DragQueryFileA
+289=DragQueryFileAorW
+290=DragQueryFileW
+291=DragQueryPoint
+64=DriveType
+292=DuplicateIcon
+293=ExtractAssociatedIconA
+294=ExtractAssociatedIconExA
+295=ExtractAssociatedIconExW
+296=ExtractAssociatedIconW
+297=ExtractIconA
+298=ExtractIconEx
+299=ExtractIconExA
+300=ExtractIconExW
+301=ExtractIconW
+302=FindExecutableA
+303=FindExecutableW
+304=FreeIconList
+305=GetCurrentProcessExplicitAppUserModelID
+63=GetFileNameFromBrowse
+919=GetSystemPersistedStorageItemList
+154=ILAppendID
+18=ILClone
+19=ILCloneFirst
+25=ILCombine
+157=ILCreateFromPath
+189=ILCreateFromPathA
+190=ILCreateFromPathW
+24=ILFindChild
+16=ILFindLastID
+155=ILFree
+153=ILGetNext
+152=ILGetSize
+21=ILIsEqual
+23=ILIsParent
+846=ILLoadFromStreamEx
+17=ILRemoveLastID
+27=ILSaveToStream
+306=InitNetworkAddressControl
+307=InternalExtractIconListA
+308=InternalExtractIconListW
+942=IsDesktopExplorerProcess
+119=IsLFNDrive
+41=IsLFNDriveA
+42=IsLFNDriveW
+66=IsNetDrive
+941=IsProcessAnExplorer
+680=IsUserAnAdmin
+309=LaunchMSHelp_RunDLLW
+81=OpenAs_RunDLL
+125=OpenAs_RunDLLA
+133=OpenAs_RunDLLW
+85=OpenRegStream
+310=Options_RunDLL
+311=Options_RunDLLA
+312=Options_RunDLLW
+171=PathCleanupSpec
+92=PathGetShortPath
+43=PathIsExe
+240=PathIsSlowA
+239=PathIsSlowW
+47=PathMakeUniqueName
+49=PathQualify
+51=PathResolve
+75=PathYetAnotherMakeUniqueName
+62=PickIconDlg
+13=PifMgr_CloseProperties
+10=PifMgr_GetProperties
+9=PifMgr_OpenProperties
+11=PifMgr_SetProperties
+135=PrepareDiscForBurnRunDllW
+138=PrintersGetCommand_RunDLL
+139=PrintersGetCommand_RunDLLA
+150=PrintersGetCommand_RunDLLW
+654=ReadCabinetState
+524=RealDriveType
+199=RealShellExecuteA
+207=RealShellExecuteExA
+208=RealShellExecuteExW
+226=RealShellExecuteW
+313=RegenerateUserEnvironment
+59=RestartDialog
+730=RestartDialogEx
+314=RunAsNewUser_RunDLLW
+315=SHAddDefaultPropertiesByExt
+167=SHAddFromPropSheetExtArray
+316=SHAddToRecentDocs
+196=SHAlloc
+317=SHAppBarMessage
+318=SHAssocEnumHandlers
+319=SHAssocEnumHandlersForProtocolByApplication
+320=SHBindToFolderIDListParent
+321=SHBindToFolderIDListParentEx
+322=SHBindToObject
+323=SHBindToParent
+324=SHBrowseForFolder
+325=SHBrowseForFolderA
+326=SHBrowseForFolderW
+147=SHCLSIDFromString
+644=SHChangeNotification_Lock
+645=SHChangeNotification_Unlock
+327=SHChangeNotify
+4=SHChangeNotifyDeregister
+2=SHChangeNotifyRegister
+328=SHChangeNotifyRegisterThread
+329=SHChangeNotifySuspendResume
+89=SHCloneSpecialIDList
+102=SHCoCreateInstance
+330=SHCoCreateInstanceWorker
+331=SHCreateAssociationRegistration
+332=SHCreateCategoryEnum
+333=SHCreateDataObject
+334=SHCreateDefaultContextMenu
+335=SHCreateDefaultExtractIcon
+336=SHCreateDefaultPropertiesOp
+165=SHCreateDirectory
+337=SHCreateDirectoryExA
+338=SHCreateDirectoryExW
+339=SHCreateDrvExtIcon
+743=SHCreateFileExtractIconW
+340=SHCreateItemFromIDList
+341=SHCreateItemFromParsingName
+342=SHCreateItemFromRelativeName
+343=SHCreateItemInKnownFolder
+344=SHCreateItemWithParent
+345=SHCreateLocalServerRunDll
+346=SHCreateProcessAsUserW
+168=SHCreatePropSheetExtArray
+347=SHCreateQueryCancelAutoPlayMoniker
+256=SHCreateShellFolderView
+174=SHCreateShellFolderViewEx
+348=SHCreateShellItem
+349=SHCreateShellItemArray
+350=SHCreateShellItemArrayFromDataObject
+351=SHCreateShellItemArrayFromIDLists
+352=SHCreateShellItemArrayFromShellItem
+74=SHCreateStdEnumFmtEtc
+3=SHDefExtractIconA
+6=SHDefExtractIconW
+169=SHDestroyPropSheetExtArray
+88=SHDoDragDrop
+353=SHELL32_AddToBackIconTable
+354=SHELL32_AddToFrontIconTable
+355=SHELL32_AreAllItemsAvailable
+356=SHELL32_BindToFilePlaceholderHandler
+357=SHELL32_CCommonPlacesFolder_CreateInstance
+358=SHELL32_CDBurn_CloseSession
+359=SHELL32_CDBurn_DriveSupportedForDataBurn
+360=SHELL32_CDBurn_Erase
+361=SHELL32_CDBurn_GetCDInfo
+362=SHELL32_CDBurn_GetLiveFSDiscInfo
+363=SHELL32_CDBurn_GetStagingPathOrNormalPath
+364=SHELL32_CDBurn_GetTaskInfo
+366=SHELL32_CDBurn_IsBlankDisc
+365=SHELL32_CDBurn_IsBlankDisc2
+367=SHELL32_CDBurn_IsLiveFS
+368=SHELL32_CDBurn_OnDeviceChange
+369=SHELL32_CDBurn_OnEject
+370=SHELL32_CDBurn_OnMediaChange
+371=SHELL32_CDefFolderMenu_Create2
+372=SHELL32_CDefFolderMenu_Create2Ex
+373=SHELL32_CDefFolderMenu_MergeMenu
+374=SHELL32_CDrivesContextMenu_Create
+375=SHELL32_CDrivesDropTarget_Create
+376=SHELL32_CFSDropTarget_CreateInstance
+377=SHELL32_CFSFolderCallback_Create
+378=SHELL32_CFillPropertiesTask_CreateInstance
+379=SHELL32_CLibraryDropTarget_CreateInstance
+380=SHELL32_CLocationContextMenu_Create
+381=SHELL32_CMountPoint_DoAutorun
+382=SHELL32_CMountPoint_DoAutorunPrompt
+383=SHELL32_CMountPoint_IsAutoRunDriveAndEnabledByPolicy
+384=SHELL32_CMountPoint_ProcessAutoRunFile
+385=SHELL32_CMountPoint_WantAutorunUI
+386=SHELL32_CMountPoint_WantAutorunUIGetReady
+387=SHELL32_CPL_CategoryIdArrayFromVariant
+388=SHELL32_CPL_IsLegacyCanonicalNameListedUnderKey
+389=SHELL32_CPL_ModifyWowDisplayName
+390=SHELL32_CRecentDocsContextMenu_CreateInstance
+391=SHELL32_CSyncRootManager_CreateInstance
+392=SHELL32_CTransferConfirmation_CreateInstance
+393=SHELL32_CallFileCopyHooks
+394=SHELL32_CanDisplayWin8CopyDialog
+395=SHELL32_CloseAutoplayPrompt
+396=SHELL32_CommandLineFromMsiDescriptor
+397=SHELL32_CopyExtrinsicPropertyStore
+398=SHELL32_CopyFilePlaceholderToNewFile
+399=SHELL32_CopySecondaryTiles
+400=SHELL32_CreateAlternateStreamFileName
+401=SHELL32_CreateConfirmationInterrupt
+402=SHELL32_CreateConflictInterrupt
+403=SHELL32_CreateDefaultOperationDataProvider
+404=SHELL32_CreateExtrinsicPropertyStore
+405=SHELL32_CreateFileFolderContextMenu
+406=SHELL32_CreateLinkInfoW
+407=SHELL32_CreatePlaceholderFile
+408=SHELL32_CreateQosRecorder
+409=SHELL32_CreateSharePointView
+410=SHELL32_Create_IEnumUICommand
+411=SHELL32_DestroyLinkInfo
+412=SHELL32_EncryptDirectory
+413=SHELL32_EncryptedFileKeyInfo
+414=SHELL32_EnumCommonTasks
+415=SHELL32_FilePlaceholder_BindToPrimaryStream
+416=SHELL32_FilePlaceholder_CreateInstance
+417=SHELL32_FreeEncryptedFileKeyInfo
+418=SHELL32_GenerateAppID
+419=SHELL32_GetAppIDRoot
+420=SHELL32_GetCommandProviderForFolderType
+421=SHELL32_GetDPIAdjustedLogicalSize
+422=SHELL32_GetDiskCleanupPath
+423=SHELL32_GetFileNameFromBrowse
+424=SHELL32_GetIconOverlayManager
+425=SHELL32_GetLinkInfoData
+426=SHELL32_GetPlaceholderStatesFromFileAttributesAndReparsePointTag
+427=SHELL32_GetRatingBucket
+428=SHELL32_GetSkyDriveNetworkStates
+429=SHELL32_GetSqmableFileName
+431=SHELL32_GetThumbnailAdornerFromFactory
+430=SHELL32_GetThumbnailAdornerFromFactory2
+432=SHELL32_HandleUnrecognizedFileSystem
+433=SHELL32_IconCacheCreate
+434=SHELL32_IconCacheDestroy
+435=SHELL32_IconCacheHandleAssociationChanged
+436=SHELL32_IconCacheRestore
+437=SHELL32_IconCache_AboutToExtractIcons
+438=SHELL32_IconCache_DoneExtractingIcons
+439=SHELL32_IconCache_ExpandEnvAndSearchPath
+440=SHELL32_IconCache_RememberRecentlyExtractedIconsW
+441=SHELL32_IconOverlayManagerInit
+442=SHELL32_IsGetKeyboardLayoutPresent
+443=SHELL32_IsSystemUpgradeInProgress
+444=SHELL32_IsValidLinkInfo
+445=SHELL32_LegacyEnumSpecialTasksByType
+446=SHELL32_LegacyEnumTasks
+447=SHELL32_LookupBackIconIndex
+448=SHELL32_LookupFrontIconIndex
+449=SHELL32_NormalizeRating
+450=SHELL32_NotifyLinkTrackingServiceOfMove
+451=SHELL32_PifMgr_CloseProperties
+452=SHELL32_PifMgr_GetProperties
+453=SHELL32_PifMgr_OpenProperties
+454=SHELL32_PifMgr_SetProperties
+455=SHELL32_Printers_CreateBindInfo
+456=SHELL32_Printjob_GetPidl
+457=SHELL32_PurgeSystemIcon
+458=SHELL32_RefreshOverlayImages
+459=SHELL32_ResolveLinkInfoW
+460=SHELL32_SHAddSparseIcon
+461=SHELL32_SHCreateByValueOperationInterrupt
+462=SHELL32_SHCreateDefaultContextMenu
+463=SHELL32_SHCreateLocalServer
+464=SHELL32_SHCreateShellFolderView
+465=SHELL32_SHDuplicateEncryptionInfoFile
+466=SHELL32_SHEncryptFile
+467=SHELL32_SHFormatDriveAsync
+468=SHELL32_SHGetThreadUndoManager
+469=SHELL32_SHGetUserNameW
+470=SHELL32_SHIsVirtualDevice
+471=SHELL32_SHLaunchPropSheet
+472=SHELL32_SHLogILFromFSIL
+473=SHELL32_SHOpenWithDialog
+474=SHELL32_SHUICommandFromGUID
+475=SHELL32_SendToMenu_InvokeTargetedCommand
+476=SHELL32_SendToMenu_VerifyTargetedCommand
+478=SHELL32_SetPlaceholderReparsePointAttribute
+477=SHELL32_SetPlaceholderReparsePointAttribute2
+479=SHELL32_ShowHideIconOnlyOnDesktop
+480=SHELL32_SimpleRatingToFilterCondition
+481=SHELL32_StampIconForElevation
+482=SHELL32_SuspendUndo
+483=SHELL32_TryVirtualDiscImageDriveEject
+484=SHELL32_UpdateFilePlaceholderStates
+485=SHELL32_VerifySaferTrust
+486=SHEmptyRecycleBinA
+487=SHEmptyRecycleBinW
+488=SHEnableServiceObject
+489=SHEnumerateUnreadMailAccountsW
+490=SHEvaluateSystemCommandTemplate
+491=SHExtractIconsW
+492=SHFileOperation
+493=SHFileOperationA
+494=SHFileOperationW
+90=SHFindFiles
+149=SHFind_InitMenuPopup
+526=SHFlushSFCache
+495=SHFormatDrive
+195=SHFree
+496=SHFreeNameMappings
+750=SHGetAttributesFromDataObject
+497=SHGetDataFromIDListA
+498=SHGetDataFromIDListW
+499=SHGetDesktopFolder
+500=SHGetDiskFreeSpaceA
+501=SHGetDiskFreeSpaceExA
+502=SHGetDiskFreeSpaceExW
+503=SHGetDriveMedia
+504=SHGetFileInfo
+505=SHGetFileInfoA
+506=SHGetFileInfoW
+507=SHGetFolderLocation
+508=SHGetFolderPathA
+509=SHGetFolderPathAndSubDirA
+510=SHGetFolderPathAndSubDirW
+511=SHGetFolderPathEx
+512=SHGetFolderPathW
+513=SHGetIDListFromObject
+514=SHGetIconOverlayIndexA
+515=SHGetIconOverlayIndexW
+727=SHGetImageList
+516=SHGetInstanceExplorer
+517=SHGetItemFromDataObject
+518=SHGetItemFromObject
+519=SHGetKnownFolderIDList
+527=SHGetKnownFolderItem
+528=SHGetKnownFolderPath
+529=SHGetLocalizedName
+530=SHGetMalloc
+531=SHGetNameFromIDList
+532=SHGetNewLinkInfo
+179=SHGetNewLinkInfoA
+180=SHGetNewLinkInfoW
+533=SHGetPathFromIDList
+534=SHGetPathFromIDListA
+535=SHGetPathFromIDListEx
+536=SHGetPathFromIDListW
+537=SHGetPropertyStoreForWindow
+538=SHGetPropertyStoreFromIDList
+539=SHGetPropertyStoreFromParsingName
+98=SHGetRealIDL
+709=SHGetSetFolderCustomSettings
+68=SHGetSetSettings
+540=SHGetSettings
+541=SHGetSpecialFolderLocation
+542=SHGetSpecialFolderPathA
+543=SHGetSpecialFolderPathW
+544=SHGetStockIconInfo
+545=SHGetTemporaryPropertyForItem
+546=SHGetUnreadMailCountW
+193=SHHandleUpdateImage
+228=SHHelpShortcuts_RunDLL
+229=SHHelpShortcuts_RunDLLA
+238=SHHelpShortcuts_RunDLLW
+28=SHILCreateFromPath
+547=SHInvokePrinterCommandA
+548=SHInvokePrinterCommandW
+549=SHIsFileAvailableOffline
+747=SHLimitInputEdit
+550=SHLoadInProc
+551=SHLoadNonloadedIconOverlayIdentifiers
+77=SHMapPIDLToSystemImageListIndex
+716=SHMultiFileProperties
+178=SHObjectProperties
+552=SHOpenFolderAndSelectItems
+80=SHOpenPropSheetW
+553=SHOpenWithDialog
+554=SHParseDisplayName
+555=SHPathPrepareForWriteA
+556=SHPathPrepareForWriteW
+685=SHPropStgCreate
+688=SHPropStgReadMultiple
+689=SHPropStgWriteMultiple
+557=SHQueryRecycleBinA
+558=SHQueryRecycleBinW
+559=SHQueryUserNotificationState
+560=SHRemoveLocalizedName
+170=SHReplaceFromPropSheetExtArray
+561=SHResolveLibrary
+100=SHRestricted
+562=SHSetDefaultProperties
+231=SHSetFolderPathA
+232=SHSetFolderPathW
+176=SHSetInstanceExplorer
+563=SHSetKnownFolderPath
+564=SHSetLocalizedName
+565=SHSetTemporaryPropertyForItem
+566=SHSetUnreadMailCountW
+73=SHShellFolderView_Message
+567=SHShowManageLibraryUI
+162=SHSimpleIDListFromPath
+14=SHStartNetConnectionDialogW
+245=SHTestTokenMembership
+191=SHUpdateImageA
+192=SHUpdateImageW
+568=SHUpdateRecycleBinIcon
+173=SHValidateUNC
+569=SetCurrentProcessExplicitAppUserModelID
+570=SheChangeDirA
+571=SheChangeDirExW
+572=SheGetDirA
+573=SheSetCurDrive
+574=ShellAboutA
+575=ShellAboutW
+576=ShellExec_RunDLL
+577=ShellExec_RunDLLA
+578=ShellExec_RunDLLW
+579=ShellExecuteA
+580=ShellExecuteEx
+581=ShellExecuteExA
+582=ShellExecuteExW
+583=ShellExecuteW
+584=ShellHookProc
+183=ShellMessageBoxA
+182=ShellMessageBoxW
+72=Shell_GetCachedImageIndex
+585=Shell_GetCachedImageIndexA
+586=Shell_GetCachedImageIndexW
+71=Shell_GetImageLists
+67=Shell_MergeMenus
+587=Shell_NotifyIcon
+588=Shell_NotifyIconA
+589=Shell_NotifyIconGetRect
+590=Shell_NotifyIconW
+103=SignalFileOpen
+682=StgMakeUniqueName
+591=StrChrA
+592=StrChrIA
+593=StrChrIW
+594=StrChrW
+595=StrCmpNA
+596=StrCmpNIA
+597=StrCmpNIW
+598=StrCmpNW
+599=StrNCmpA
+600=StrNCmpIA
+601=StrNCmpIW
+602=StrNCmpW
+603=StrRChrA
+604=StrRChrIA
+605=StrRChrIW
+606=StrRChrW
+607=StrRStrA
+608=StrRStrIA
+609=StrRStrIW
+610=StrRStrW
+611=StrStrA
+612=StrStrIA
+613=StrStrIW
+614=StrStrW
+615=UsersLibrariesFolderUI_CreateInstance
+616=WOWShellExecute
+617=WaitForExplorerRestartW
+164=Win32DeleteFile
+652=WriteCabinetState
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/shlwapi.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/shlwapi.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/shlwapi.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/shlwapi.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,379 +1,379 @@
-500=AssocCreate
-501=AssocGetPerceivedType
-502=AssocIsDangerous
-503=AssocQueryKeyA
-504=AssocQueryKeyW
-579=AssocQueryStringA
-584=AssocQueryStringByKeyA
-585=AssocQueryStringByKeyW
-586=AssocQueryStringW
-587=ChrCmpIA
-588=ChrCmpIW
-589=ColorAdjustLuma
-590=ColorHLSToRGB
-591=ColorRGBToHLS
-168=ConnectToConnectionPoint
-569=DelayLoadFailureHook
-592=DllGetClassObject
-593=DllGetVersion
-270=GUIDFromStringW
-14=GetAcceptLanguagesA
-15=GetAcceptLanguagesW
-594=GetMenuPosFromID
-595=HashData
-568=IStream_Copy
-184=IStream_Read
-512=IStream_ReadPidl
-596=IStream_ReadStr
-213=IStream_Reset
-214=IStream_Size
-212=IStream_Write
-513=IStream_WritePidl
-597=IStream_WriteStr
-169=IUnknown_AtomicRelease
-164=IUnknown_Exec
-256=IUnknown_GetSite
-172=IUnknown_GetWindow
-176=IUnknown_QueryService
-163=IUnknown_QueryStatus
-199=IUnknown_Set
-174=IUnknown_SetSite
-607=IntlStrEqWorkerA
-608=IntlStrEqWorkerW
-609=IsCharSpaceA
-29=IsCharSpaceW
-553=IsInternetESCEnabled
-437=IsOS
-377=MLLoadLibraryA
-378=MLLoadLibraryW
-1=ParseURLA
-2=ParseURLW
-610=PathAddBackslashA
-612=PathAddBackslashW
-620=PathAddExtensionA
-622=PathAddExtensionW
-623=PathAppendA
-624=PathAppendW
-625=PathBuildRootA
-649=PathBuildRootW
-650=PathCanonicalizeA
-651=PathCanonicalizeW
-652=PathCombineA
-653=PathCombineW
-654=PathCommonPrefixA
-655=PathCommonPrefixW
-656=PathCompactPathA
-657=PathCompactPathExA
-658=PathCompactPathExW
-659=PathCompactPathW
-660=PathCreateFromUrlA
-661=PathCreateFromUrlAlloc
-662=PathCreateFromUrlW
-663=PathFileExistsA
-446=PathFileExistsAndAttributesW
-664=PathFileExistsW
-665=PathFindExtensionA
-666=PathFindExtensionW
-667=PathFindFileNameA
-668=PathFindFileNameW
-669=PathFindNextComponentA
-670=PathFindNextComponentW
-671=PathFindOnPathA
-672=PathFindOnPathW
-673=PathFindSuffixArrayA
-674=PathFindSuffixArrayW
-675=PathGetArgsA
-676=PathGetArgsW
-677=PathGetCharTypeA
-678=PathGetCharTypeW
-679=PathGetDriveNumberA
-680=PathGetDriveNumberW
-681=PathIsContentTypeA
-682=PathIsContentTypeW
-683=PathIsDirectoryA
-684=PathIsDirectoryEmptyA
-685=PathIsDirectoryEmptyW
-686=PathIsDirectoryW
-687=PathIsFileSpecA
-688=PathIsFileSpecW
-689=PathIsLFNFileSpecA
-690=PathIsLFNFileSpecW
-691=PathIsNetworkPathA
-692=PathIsNetworkPathW
-693=PathIsPrefixA
-694=PathIsPrefixW
-695=PathIsRelativeA
-696=PathIsRelativeW
-697=PathIsRootA
-698=PathIsRootW
-699=PathIsSameRootA
-700=PathIsSameRootW
-701=PathIsSystemFolderA
-702=PathIsSystemFolderW
-703=PathIsUNCA
-704=PathIsUNCServerA
-705=PathIsUNCServerShareA
-706=PathIsUNCServerShareW
-707=PathIsUNCServerW
-708=PathIsUNCW
-709=PathIsURLA
-710=PathIsURLW
-711=PathMakePrettyA
-712=PathMakePrettyW
-713=PathMakeSystemFolderA
-714=PathMakeSystemFolderW
-715=PathMatchSpecA
-716=PathMatchSpecExA
-717=PathMatchSpecExW
-718=PathMatchSpecW
-719=PathParseIconLocationA
-720=PathParseIconLocationW
-721=PathQuoteSpacesA
-722=PathQuoteSpacesW
-723=PathRelativePathToA
-724=PathRelativePathToW
-725=PathRemoveArgsA
-726=PathRemoveArgsW
-727=PathRemoveBackslashA
-728=PathRemoveBackslashW
-729=PathRemoveBlanksA
-730=PathRemoveBlanksW
-731=PathRemoveExtensionA
-732=PathRemoveExtensionW
-733=PathRemoveFileSpecA
-734=PathRemoveFileSpecW
-735=PathRenameExtensionA
-736=PathRenameExtensionW
-737=PathSearchAndQualifyA
-738=PathSearchAndQualifyW
-739=PathSetDlgItemPathA
-740=PathSetDlgItemPathW
-741=PathSkipRootA
-742=PathSkipRootW
-743=PathStripPathA
-744=PathStripPathW
-745=PathStripToRootA
-746=PathStripToRootW
-747=PathUnExpandEnvStringsA
-748=PathUnExpandEnvStringsW
-749=PathUndecorateA
-750=PathUndecorateW
-751=PathUnmakeSystemFolderA
-752=PathUnmakeSystemFolderW
-753=PathUnquoteSpacesA
-754=PathUnquoteSpacesW
-219=QISearch
-7=SHAllocShared
-345=SHAnsiToAnsi
-215=SHAnsiToUnicode
-755=SHAutoComplete
-756=SHCopyKeyA
-757=SHCopyKeyW
-12=SHCreateMemStream
-758=SHCreateShellPalette
-759=SHCreateStreamOnFileA
-760=SHCreateStreamOnFileEx
-761=SHCreateStreamOnFileW
-762=SHCreateStreamWrapper
-16=SHCreateThread
-763=SHCreateThreadRef
-615=SHCreateThreadWithHandle
-278=SHCreateWorkerWindowW
-764=SHDeleteEmptyKeyA
-765=SHDeleteEmptyKeyW
-766=SHDeleteKeyA
-767=SHDeleteKeyW
-768=SHDeleteOrphanKeyA
-769=SHDeleteOrphanKeyW
-770=SHDeleteValueA
-771=SHDeleteValueW
-772=SHEnumKeyExA
-773=SHEnumKeyExW
-774=SHEnumValueA
-775=SHEnumValueW
-353=SHFormatDateTimeA
-354=SHFormatDateTimeW
-10=SHFreeShared
-776=SHGetInverseCMAP
-777=SHGetThreadRef
-778=SHGetValueA
-779=SHGetValueW
-515=SHGetViewStatePropertyBag
-204=SHIsChildOrSelf
-780=SHIsLowMemoryMachine
-487=SHLoadIndirectString
-8=SHLockShared
-185=SHMessageBoxCheckA
-191=SHMessageBoxCheckW
-781=SHOpenRegStream2A
-782=SHOpenRegStream2W
-783=SHOpenRegStreamA
-784=SHOpenRegStreamW
-281=SHPackDispParamsV
-236=SHPinDllOfCLSID
-567=SHPropertyBag_ReadStrAlloc
-570=SHPropertyBag_WriteBSTR
-785=SHQueryInfoKeyA
-786=SHQueryInfoKeyW
-787=SHQueryValueExA
-788=SHQueryValueExW
-789=SHRegCloseUSKey
-790=SHRegCreateUSKeyA
-791=SHRegCreateUSKeyW
-792=SHRegDeleteEmptyUSKeyA
-793=SHRegDeleteEmptyUSKeyW
-794=SHRegDeleteUSValueA
-795=SHRegDeleteUSValueW
-796=SHRegDuplicateHKey
-797=SHRegEnumUSKeyA
-798=SHRegEnumUSKeyW
-799=SHRegEnumUSValueA
-800=SHRegEnumUSValueW
-801=SHRegGetBoolUSValueA
-802=SHRegGetBoolUSValueW
-630=SHRegGetBoolValueFromHKCUHKLM
-280=SHRegGetIntW
-803=SHRegGetPathA
-804=SHRegGetPathW
-805=SHRegGetUSValueA
-806=SHRegGetUSValueW
-807=SHRegGetValueA
-629=SHRegGetValueFromHKCUHKLM
-808=SHRegGetValueW
-809=SHRegOpenUSKeyA
-810=SHRegOpenUSKeyW
-811=SHRegQueryInfoUSKeyA
-812=SHRegQueryInfoUSKeyW
-813=SHRegQueryUSValueA
-814=SHRegQueryUSValueW
-815=SHRegSetPathA
-816=SHRegSetPathW
-817=SHRegSetUSValueA
-818=SHRegSetUSValueW
-819=SHRegWriteUSValueA
-820=SHRegWriteUSValueW
-821=SHRegisterValidateTemplate
-822=SHReleaseThreadRef
-467=SHRunIndirectRegClientCommand
-432=SHSendMessageBroadcastA
-433=SHSendMessageBroadcastW
-823=SHSetThreadRef
-824=SHSetValueA
-825=SHSetValueW
-826=SHSkipJunction
-827=SHStrDupA
-828=SHStrDupW
-203=SHStripMneumonicA
-225=SHStripMneumonicW
-217=SHUnicodeToAnsi
-218=SHUnicodeToAnsiCP
-346=SHUnicodeToUnicode
-9=SHUnlockShared
-829=ShellMessageBoxA
-388=ShellMessageBoxW
-830=StrCSpnA
-831=StrCSpnIA
-832=StrCSpnIW
-833=StrCSpnW
-834=StrCatBuffA
-835=StrCatBuffW
-836=StrCatChainW
-837=StrCatW
-838=StrChrA
-839=StrChrIA
-840=StrChrIW
-841=StrChrNIW
-842=StrChrNW
-843=StrChrW
-155=StrCmpCA
-156=StrCmpCW
-157=StrCmpICA
-158=StrCmpICW
-844=StrCmpIW
-845=StrCmpLogicalW
-846=StrCmpNA
-151=StrCmpNCA
-152=StrCmpNCW
-847=StrCmpNIA
-153=StrCmpNICA
-154=StrCmpNICW
-848=StrCmpNIW
-849=StrCmpNW
-850=StrCmpW
-851=StrCpyNW
-852=StrCpyW
-853=StrDupA
-854=StrDupW
-855=StrFormatByteSize64A
-856=StrFormatByteSizeA
-857=StrFormatByteSizeEx
-858=StrFormatByteSizeW
-859=StrFormatKBSizeA
-860=StrFormatKBSizeW
-861=StrFromTimeIntervalA
-862=StrFromTimeIntervalW
-863=StrIsIntlEqualA
-864=StrIsIntlEqualW
-865=StrNCatA
-866=StrNCatW
-867=StrPBrkA
-868=StrPBrkW
-869=StrRChrA
-870=StrRChrIA
-871=StrRChrIW
-872=StrRChrW
-873=StrRStrIA
-874=StrRStrIW
-875=StrRetToBSTR
-876=StrRetToBufA
-877=StrRetToBufW
-878=StrRetToStrA
-879=StrRetToStrW
-880=StrSpnA
-881=StrSpnW
-882=StrStrA
-883=StrStrIA
-884=StrStrIW
-885=StrStrNIW
-886=StrStrNW
-887=StrStrW
-888=StrToInt64ExA
-889=StrToInt64ExW
-890=StrToIntA
-891=StrToIntExA
-892=StrToIntExW
-893=StrToIntW
-894=StrTrimA
-895=StrTrimW
-896=UrlApplySchemeA
-897=UrlApplySchemeW
-898=UrlCanonicalizeA
-899=UrlCanonicalizeW
-900=UrlCombineA
-901=UrlCombineW
-902=UrlCompareA
-903=UrlCompareW
-904=UrlCreateFromPathA
-905=UrlCreateFromPathW
-906=UrlEscapeA
-907=UrlEscapeW
-462=UrlFixupW
-908=UrlGetLocationA
-909=UrlGetLocationW
-910=UrlGetPartA
-911=UrlGetPartW
-912=UrlHashA
-913=UrlHashW
-914=UrlIsA
-915=UrlIsNoHistoryA
-916=UrlIsNoHistoryW
-917=UrlIsOpaqueA
-918=UrlIsOpaqueW
-919=UrlIsW
-920=UrlUnescapeA
-921=UrlUnescapeW
-276=WhichPlatform
-922=wnsprintfA
-923=wnsprintfW
-924=wvnsprintfA
-925=wvnsprintfW
+500=AssocCreate
+501=AssocGetPerceivedType
+502=AssocIsDangerous
+503=AssocQueryKeyA
+504=AssocQueryKeyW
+579=AssocQueryStringA
+584=AssocQueryStringByKeyA
+585=AssocQueryStringByKeyW
+586=AssocQueryStringW
+587=ChrCmpIA
+588=ChrCmpIW
+589=ColorAdjustLuma
+590=ColorHLSToRGB
+591=ColorRGBToHLS
+168=ConnectToConnectionPoint
+569=DelayLoadFailureHook
+592=DllGetClassObject
+593=DllGetVersion
+270=GUIDFromStringW
+14=GetAcceptLanguagesA
+15=GetAcceptLanguagesW
+594=GetMenuPosFromID
+595=HashData
+568=IStream_Copy
+184=IStream_Read
+512=IStream_ReadPidl
+596=IStream_ReadStr
+213=IStream_Reset
+214=IStream_Size
+212=IStream_Write
+513=IStream_WritePidl
+597=IStream_WriteStr
+169=IUnknown_AtomicRelease
+164=IUnknown_Exec
+256=IUnknown_GetSite
+172=IUnknown_GetWindow
+176=IUnknown_QueryService
+163=IUnknown_QueryStatus
+199=IUnknown_Set
+174=IUnknown_SetSite
+607=IntlStrEqWorkerA
+608=IntlStrEqWorkerW
+609=IsCharSpaceA
+29=IsCharSpaceW
+553=IsInternetESCEnabled
+437=IsOS
+377=MLLoadLibraryA
+378=MLLoadLibraryW
+1=ParseURLA
+2=ParseURLW
+610=PathAddBackslashA
+612=PathAddBackslashW
+620=PathAddExtensionA
+622=PathAddExtensionW
+623=PathAppendA
+624=PathAppendW
+625=PathBuildRootA
+649=PathBuildRootW
+650=PathCanonicalizeA
+651=PathCanonicalizeW
+652=PathCombineA
+653=PathCombineW
+654=PathCommonPrefixA
+655=PathCommonPrefixW
+656=PathCompactPathA
+657=PathCompactPathExA
+658=PathCompactPathExW
+659=PathCompactPathW
+660=PathCreateFromUrlA
+661=PathCreateFromUrlAlloc
+662=PathCreateFromUrlW
+663=PathFileExistsA
+446=PathFileExistsAndAttributesW
+664=PathFileExistsW
+665=PathFindExtensionA
+666=PathFindExtensionW
+667=PathFindFileNameA
+668=PathFindFileNameW
+669=PathFindNextComponentA
+670=PathFindNextComponentW
+671=PathFindOnPathA
+672=PathFindOnPathW
+673=PathFindSuffixArrayA
+674=PathFindSuffixArrayW
+675=PathGetArgsA
+676=PathGetArgsW
+677=PathGetCharTypeA
+678=PathGetCharTypeW
+679=PathGetDriveNumberA
+680=PathGetDriveNumberW
+681=PathIsContentTypeA
+682=PathIsContentTypeW
+683=PathIsDirectoryA
+684=PathIsDirectoryEmptyA
+685=PathIsDirectoryEmptyW
+686=PathIsDirectoryW
+687=PathIsFileSpecA
+688=PathIsFileSpecW
+689=PathIsLFNFileSpecA
+690=PathIsLFNFileSpecW
+691=PathIsNetworkPathA
+692=PathIsNetworkPathW
+693=PathIsPrefixA
+694=PathIsPrefixW
+695=PathIsRelativeA
+696=PathIsRelativeW
+697=PathIsRootA
+698=PathIsRootW
+699=PathIsSameRootA
+700=PathIsSameRootW
+701=PathIsSystemFolderA
+702=PathIsSystemFolderW
+703=PathIsUNCA
+704=PathIsUNCServerA
+705=PathIsUNCServerShareA
+706=PathIsUNCServerShareW
+707=PathIsUNCServerW
+708=PathIsUNCW
+709=PathIsURLA
+710=PathIsURLW
+711=PathMakePrettyA
+712=PathMakePrettyW
+713=PathMakeSystemFolderA
+714=PathMakeSystemFolderW
+715=PathMatchSpecA
+716=PathMatchSpecExA
+717=PathMatchSpecExW
+718=PathMatchSpecW
+719=PathParseIconLocationA
+720=PathParseIconLocationW
+721=PathQuoteSpacesA
+722=PathQuoteSpacesW
+723=PathRelativePathToA
+724=PathRelativePathToW
+725=PathRemoveArgsA
+726=PathRemoveArgsW
+727=PathRemoveBackslashA
+728=PathRemoveBackslashW
+729=PathRemoveBlanksA
+730=PathRemoveBlanksW
+731=PathRemoveExtensionA
+732=PathRemoveExtensionW
+733=PathRemoveFileSpecA
+734=PathRemoveFileSpecW
+735=PathRenameExtensionA
+736=PathRenameExtensionW
+737=PathSearchAndQualifyA
+738=PathSearchAndQualifyW
+739=PathSetDlgItemPathA
+740=PathSetDlgItemPathW
+741=PathSkipRootA
+742=PathSkipRootW
+743=PathStripPathA
+744=PathStripPathW
+745=PathStripToRootA
+746=PathStripToRootW
+747=PathUnExpandEnvStringsA
+748=PathUnExpandEnvStringsW
+749=PathUndecorateA
+750=PathUndecorateW
+751=PathUnmakeSystemFolderA
+752=PathUnmakeSystemFolderW
+753=PathUnquoteSpacesA
+754=PathUnquoteSpacesW
+219=QISearch
+7=SHAllocShared
+345=SHAnsiToAnsi
+215=SHAnsiToUnicode
+755=SHAutoComplete
+756=SHCopyKeyA
+757=SHCopyKeyW
+12=SHCreateMemStream
+758=SHCreateShellPalette
+759=SHCreateStreamOnFileA
+760=SHCreateStreamOnFileEx
+761=SHCreateStreamOnFileW
+762=SHCreateStreamWrapper
+16=SHCreateThread
+763=SHCreateThreadRef
+615=SHCreateThreadWithHandle
+278=SHCreateWorkerWindowW
+764=SHDeleteEmptyKeyA
+765=SHDeleteEmptyKeyW
+766=SHDeleteKeyA
+767=SHDeleteKeyW
+768=SHDeleteOrphanKeyA
+769=SHDeleteOrphanKeyW
+770=SHDeleteValueA
+771=SHDeleteValueW
+772=SHEnumKeyExA
+773=SHEnumKeyExW
+774=SHEnumValueA
+775=SHEnumValueW
+353=SHFormatDateTimeA
+354=SHFormatDateTimeW
+10=SHFreeShared
+776=SHGetInverseCMAP
+777=SHGetThreadRef
+778=SHGetValueA
+779=SHGetValueW
+515=SHGetViewStatePropertyBag
+204=SHIsChildOrSelf
+780=SHIsLowMemoryMachine
+487=SHLoadIndirectString
+8=SHLockShared
+185=SHMessageBoxCheckA
+191=SHMessageBoxCheckW
+781=SHOpenRegStream2A
+782=SHOpenRegStream2W
+783=SHOpenRegStreamA
+784=SHOpenRegStreamW
+281=SHPackDispParamsV
+236=SHPinDllOfCLSID
+567=SHPropertyBag_ReadStrAlloc
+570=SHPropertyBag_WriteBSTR
+785=SHQueryInfoKeyA
+786=SHQueryInfoKeyW
+787=SHQueryValueExA
+788=SHQueryValueExW
+789=SHRegCloseUSKey
+790=SHRegCreateUSKeyA
+791=SHRegCreateUSKeyW
+792=SHRegDeleteEmptyUSKeyA
+793=SHRegDeleteEmptyUSKeyW
+794=SHRegDeleteUSValueA
+795=SHRegDeleteUSValueW
+796=SHRegDuplicateHKey
+797=SHRegEnumUSKeyA
+798=SHRegEnumUSKeyW
+799=SHRegEnumUSValueA
+800=SHRegEnumUSValueW
+801=SHRegGetBoolUSValueA
+802=SHRegGetBoolUSValueW
+630=SHRegGetBoolValueFromHKCUHKLM
+280=SHRegGetIntW
+803=SHRegGetPathA
+804=SHRegGetPathW
+805=SHRegGetUSValueA
+806=SHRegGetUSValueW
+807=SHRegGetValueA
+629=SHRegGetValueFromHKCUHKLM
+808=SHRegGetValueW
+809=SHRegOpenUSKeyA
+810=SHRegOpenUSKeyW
+811=SHRegQueryInfoUSKeyA
+812=SHRegQueryInfoUSKeyW
+813=SHRegQueryUSValueA
+814=SHRegQueryUSValueW
+815=SHRegSetPathA
+816=SHRegSetPathW
+817=SHRegSetUSValueA
+818=SHRegSetUSValueW
+819=SHRegWriteUSValueA
+820=SHRegWriteUSValueW
+821=SHRegisterValidateTemplate
+822=SHReleaseThreadRef
+467=SHRunIndirectRegClientCommand
+432=SHSendMessageBroadcastA
+433=SHSendMessageBroadcastW
+823=SHSetThreadRef
+824=SHSetValueA
+825=SHSetValueW
+826=SHSkipJunction
+827=SHStrDupA
+828=SHStrDupW
+203=SHStripMneumonicA
+225=SHStripMneumonicW
+217=SHUnicodeToAnsi
+218=SHUnicodeToAnsiCP
+346=SHUnicodeToUnicode
+9=SHUnlockShared
+829=ShellMessageBoxA
+388=ShellMessageBoxW
+830=StrCSpnA
+831=StrCSpnIA
+832=StrCSpnIW
+833=StrCSpnW
+834=StrCatBuffA
+835=StrCatBuffW
+836=StrCatChainW
+837=StrCatW
+838=StrChrA
+839=StrChrIA
+840=StrChrIW
+841=StrChrNIW
+842=StrChrNW
+843=StrChrW
+155=StrCmpCA
+156=StrCmpCW
+157=StrCmpICA
+158=StrCmpICW
+844=StrCmpIW
+845=StrCmpLogicalW
+846=StrCmpNA
+151=StrCmpNCA
+152=StrCmpNCW
+847=StrCmpNIA
+153=StrCmpNICA
+154=StrCmpNICW
+848=StrCmpNIW
+849=StrCmpNW
+850=StrCmpW
+851=StrCpyNW
+852=StrCpyW
+853=StrDupA
+854=StrDupW
+855=StrFormatByteSize64A
+856=StrFormatByteSizeA
+857=StrFormatByteSizeEx
+858=StrFormatByteSizeW
+859=StrFormatKBSizeA
+860=StrFormatKBSizeW
+861=StrFromTimeIntervalA
+862=StrFromTimeIntervalW
+863=StrIsIntlEqualA
+864=StrIsIntlEqualW
+865=StrNCatA
+866=StrNCatW
+867=StrPBrkA
+868=StrPBrkW
+869=StrRChrA
+870=StrRChrIA
+871=StrRChrIW
+872=StrRChrW
+873=StrRStrIA
+874=StrRStrIW
+875=StrRetToBSTR
+876=StrRetToBufA
+877=StrRetToBufW
+878=StrRetToStrA
+879=StrRetToStrW
+880=StrSpnA
+881=StrSpnW
+882=StrStrA
+883=StrStrIA
+884=StrStrIW
+885=StrStrNIW
+886=StrStrNW
+887=StrStrW
+888=StrToInt64ExA
+889=StrToInt64ExW
+890=StrToIntA
+891=StrToIntExA
+892=StrToIntExW
+893=StrToIntW
+894=StrTrimA
+895=StrTrimW
+896=UrlApplySchemeA
+897=UrlApplySchemeW
+898=UrlCanonicalizeA
+899=UrlCanonicalizeW
+900=UrlCombineA
+901=UrlCombineW
+902=UrlCompareA
+903=UrlCompareW
+904=UrlCreateFromPathA
+905=UrlCreateFromPathW
+906=UrlEscapeA
+907=UrlEscapeW
+462=UrlFixupW
+908=UrlGetLocationA
+909=UrlGetLocationW
+910=UrlGetPartA
+911=UrlGetPartW
+912=UrlHashA
+913=UrlHashW
+914=UrlIsA
+915=UrlIsNoHistoryA
+916=UrlIsNoHistoryW
+917=UrlIsOpaqueA
+918=UrlIsOpaqueW
+919=UrlIsW
+920=UrlUnescapeA
+921=UrlUnescapeW
+276=WhichPlatform
+922=wnsprintfA
+923=wnsprintfW
+924=wvnsprintfA
+925=wvnsprintfW
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/uxtheme.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/uxtheme.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/uxtheme.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/uxtheme.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,84 +1,84 @@
-37=BeginBufferedAnimation
-38=BeginBufferedPaint
-5=BeginPanningFeedback
-39=BufferedPaintClear
-40=BufferedPaintInit
-41=BufferedPaintRenderAnimation
-42=BufferedPaintSetAlpha
-51=BufferedPaintStopAllAnimations
-52=BufferedPaintUnInit
-53=CloseThemeData
-54=DllCanUnloadNow
-55=DllGetActivationFactory
-56=DllGetClassObject
-57=DrawThemeBackground
-47=DrawThemeBackgroundEx
-58=DrawThemeEdge
-59=DrawThemeIcon
-70=DrawThemeParentBackground
-71=DrawThemeParentBackgroundEx
-89=DrawThemeText
-114=DrawThemeTextEx
-126=EnableThemeDialogTexture
-127=EnableTheming
-128=EndBufferedAnimation
-129=EndBufferedPaint
-6=EndPanningFeedback
-130=GetBufferedPaintBits
-131=GetBufferedPaintDC
-132=GetBufferedPaintTargetDC
-133=GetBufferedPaintTargetRect
-121=GetColorFromPreference
-134=GetCurrentThemeName
-95=GetImmersiveColorFromColorSetEx
-98=GetImmersiveUserColorSetPreference
-135=GetThemeAnimationProperty
-136=GetThemeAnimationTransform
-137=GetThemeAppProperties
-138=GetThemeBackgroundContentRect
-139=GetThemeBackgroundExtent
-140=GetThemeBackgroundRegion
-141=GetThemeBitmap
-142=GetThemeBool
-143=GetThemeColor
-144=GetThemeDocumentationProperty
-145=GetThemeEnumValue
-146=GetThemeFilename
-147=GetThemeFont
-148=GetThemeInt
-149=GetThemeIntList
-150=GetThemeMargins
-151=GetThemeMetric
-152=GetThemePartSize
-153=GetThemePosition
-154=GetThemePropertyOrigin
-155=GetThemeRect
-156=GetThemeStream
-157=GetThemeString
-158=GetThemeSysBool
-159=GetThemeSysColor
-160=GetThemeSysColorBrush
-161=GetThemeSysFont
-162=GetThemeSysInt
-163=GetThemeSysSize
-164=GetThemeSysString
-165=GetThemeTextExtent
-166=GetThemeTextMetrics
-167=GetThemeTimingFunction
-168=GetThemeTransitionDuration
-120=GetUserColorPreference
-169=GetWindowTheme
-170=HitTestThemeBackground
-171=IsAppThemed
-172=IsCompositionActive
-173=IsThemeActive
-174=IsThemeBackgroundPartiallyTransparent
-175=IsThemeDialogTextureEnabled
-176=IsThemePartDefined
-177=OpenThemeData
-61=OpenThemeDataEx
-178=SetThemeAppProperties
-179=SetWindowTheme
-180=SetWindowThemeAttribute
-181=ThemeInitApiHook
-12=UpdatePanningFeedback
+37=BeginBufferedAnimation
+38=BeginBufferedPaint
+5=BeginPanningFeedback
+39=BufferedPaintClear
+40=BufferedPaintInit
+41=BufferedPaintRenderAnimation
+42=BufferedPaintSetAlpha
+51=BufferedPaintStopAllAnimations
+52=BufferedPaintUnInit
+53=CloseThemeData
+54=DllCanUnloadNow
+55=DllGetActivationFactory
+56=DllGetClassObject
+57=DrawThemeBackground
+47=DrawThemeBackgroundEx
+58=DrawThemeEdge
+59=DrawThemeIcon
+70=DrawThemeParentBackground
+71=DrawThemeParentBackgroundEx
+89=DrawThemeText
+114=DrawThemeTextEx
+126=EnableThemeDialogTexture
+127=EnableTheming
+128=EndBufferedAnimation
+129=EndBufferedPaint
+6=EndPanningFeedback
+130=GetBufferedPaintBits
+131=GetBufferedPaintDC
+132=GetBufferedPaintTargetDC
+133=GetBufferedPaintTargetRect
+121=GetColorFromPreference
+134=GetCurrentThemeName
+95=GetImmersiveColorFromColorSetEx
+98=GetImmersiveUserColorSetPreference
+135=GetThemeAnimationProperty
+136=GetThemeAnimationTransform
+137=GetThemeAppProperties
+138=GetThemeBackgroundContentRect
+139=GetThemeBackgroundExtent
+140=GetThemeBackgroundRegion
+141=GetThemeBitmap
+142=GetThemeBool
+143=GetThemeColor
+144=GetThemeDocumentationProperty
+145=GetThemeEnumValue
+146=GetThemeFilename
+147=GetThemeFont
+148=GetThemeInt
+149=GetThemeIntList
+150=GetThemeMargins
+151=GetThemeMetric
+152=GetThemePartSize
+153=GetThemePosition
+154=GetThemePropertyOrigin
+155=GetThemeRect
+156=GetThemeStream
+157=GetThemeString
+158=GetThemeSysBool
+159=GetThemeSysColor
+160=GetThemeSysColorBrush
+161=GetThemeSysFont
+162=GetThemeSysInt
+163=GetThemeSysSize
+164=GetThemeSysString
+165=GetThemeTextExtent
+166=GetThemeTextMetrics
+167=GetThemeTimingFunction
+168=GetThemeTransitionDuration
+120=GetUserColorPreference
+169=GetWindowTheme
+170=HitTestThemeBackground
+171=IsAppThemed
+172=IsCompositionActive
+173=IsThemeActive
+174=IsThemeBackgroundPartiallyTransparent
+175=IsThemeDialogTextureEnabled
+176=IsThemePartDefined
+177=OpenThemeData
+61=OpenThemeDataEx
+178=SetThemeAppProperties
+179=SetWindowTheme
+180=SetWindowThemeAttribute
+181=ThemeInitApiHook
+12=UpdatePanningFeedback
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/vb40032.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/vb40032.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/vb40032.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/vb40032.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,223 +1,223 @@
-188=AssignRecord
-190=CopyRecord
-2000=CreateIExprSrvObj
-189=DestructRecord
-187=DllFunctionCall
-232=EbGetHandleOfExecutingProject
-1025=EbGetObjConnectionCounts
-2010=EbGetVBAObject
-231=EbResetProject
-239=EbResetProjectNormal
-317=GetMem1
-300=GetMem2
-301=GetMem4
-302=GetMem8
-314=GetMemNewObj
-305=GetMemObj
-303=GetMemStr
-304=GetMemVar
-1024=IID_IVbaHost
-106=IntlInitializeTable
-199=MethCallEngine
-186=ProcCallEngine
-318=PutMem1
-306=PutMem2
-307=PutMem4
-308=PutMem8
-315=PutMemNewObj
-311=PutMemObj
-309=PutMemStr
-310=PutMemVar
-316=SetMemNewObj
-313=SetMemObj
-312=SetMemVar
-100=ThunRTMain
-230=TipCreateInstanceProject
-195=TipGetAddressOfPredeclaredInstance
-1016=TipInvokeMethod
-227=TipUnloadProject
-105=UserDllMain
-102=VBDllCanUnloadNow
-101=VBDllGetClassObject
-103=VBDllRegisterServer
-104=VBDllUnRegisterServer
-644=VarPtr
-635=rtBoolFromErrVar
-634=rtBstrFromErrVar
-636=rtCyFromErrVar
-637=rtI2FromErrVar
-638=rtI4FromErrVar
-639=rtR4FromErrVar
-640=rtR8FromErrVar
-686=rtUI1FromErrVar
-656=rtcAbsVar
-516=rtcAnsiValueBstr
-597=rtcAppActivate
-627=rtcAppleScript
-601=rtcArray
-585=rtcAtn
-534=rtcBeep
-537=rtcBstrFromAnsi
-694=rtcBstrFromByte
-697=rtcBstrFromChar
-651=rtcBstrFromError
-650=rtcBstrFromFormatVar
-693=rtcByteValueBstr
-643=rtcCVErrFromVar
-530=rtcChangeDir
-533=rtcChangeDrive
-696=rtcCharValueBstr
-665=rtcChoose
-669=rtcCommandBstr
-670=rtcCommandVar
-649=rtcCompareBstr
-583=rtcCos
-625=rtcCreateObject
-647=rtcCurrentDir
-646=rtcCurrentDirBstr
-673=rtcDDB
-661=rtcDateAdd
-662=rtcDateDiff
-641=rtcDateFromVar
-663=rtcDatePart
-691=rtcDeleteSetting
-645=rtcDir
-598=rtcDoEvents
-571=rtcEndOfFile
-667=rtcEnvironBstr
-666=rtcEnvironVar
-685=rtcErrObj
-586=rtcExp
-678=rtcFV
-555=rtcFileAttributes
-576=rtcFileCopy
-577=rtcFileDateTime
-578=rtcFileLen
-570=rtcFileLength
-569=rtcFileLocation
-554=rtcFileReset
-568=rtcFileSeek
-565=rtcFileWidth
-655=rtcFixVar
-648=rtcFreeFile
-692=rtcGetAllSettings
-609=rtcGetDateBstr
-540=rtcGetDateValue
-610=rtcGetDateVar
-542=rtcGetDayOfMonth
-552=rtcGetDayOfWeek
-605=rtcGetErl
-579=rtcGetFileAttr
-543=rtcGetHourOfDay
-544=rtcGetMinuteOfHour
-545=rtcGetMonthOfYear
-626=rtcGetObject
-546=rtcGetPresentDate
-623=rtcGetProjectLCID
-547=rtcGetSecondOfMinute
-689=rtcGetSetting
-611=rtcGetTimeBstr
-541=rtcGetTimeValue
-612=rtcGetTimeVar
-535=rtcGetTimer
-553=rtcGetYear
-572=rtcHexBstrFromVar
-573=rtcHexVarFromVar
-615=rtcIMEStatus
-674=rtcIPMT
-682=rtcIRR
-681=rtcImmediateIf
-630=rtcInStr
-633=rtcInStrChar
-596=rtcInputBox
-620=rtcInputCharCount
-621=rtcInputCharCountVar
-566=rtcInputCount
-567=rtcInputCountVar
-657=rtcIntVar
-556=rtcIsArray
-557=rtcIsDate
-558=rtcIsEmpty
-559=rtcIsError
-592=rtcIsMissing
-560=rtcIsNull
-561=rtcIsNumeric
-562=rtcIsObject
-529=rtcKillFiles
-512=rtcLeftBstr
-616=rtcLeftCharBstr
-617=rtcLeftCharVar
-521=rtcLeftTrimBstr
-522=rtcLeftTrimVar
-513=rtcLeftVar
-653=rtcLenCharVar
-654=rtcLenVar
-587=rtcLog
-517=rtcLowerCaseBstr
-518=rtcLowerCaseVar
-683=rtcMIRR
-590=rtcMacId
-531=rtcMakeDir
-628=rtcMidBstr
-631=rtcMidCharBstr
-632=rtcMidCharVar
-629=rtcMidVar
-595=rtcMsgBox
-684=rtcNPV
-679=rtcNPer
-574=rtcOctBstrFromVar
-575=rtcOctVarFromVar
-676=rtcPMT
-675=rtcPPMT
-677=rtcPV
-538=rtcPackDate
-539=rtcPackTime
-664=rtcPartition
-589=rtcQBColor
-581=rtcR8ValFromBstr
-593=rtcRandomNext
-594=rtcRandomize
-680=rtcRate
-532=rtcRemoveDir
-588=rtcRgb
-514=rtcRightBstr
-618=rtcRightCharBstr
-619=rtcRightCharVar
-523=rtcRightTrimBstr
-524=rtcRightTrimVar
-515=rtcRightVar
-671=rtcSLN
-672=rtcSYD
-690=rtcSaveSetting
-599=rtcSendKeys
-549=rtcSetDateBstr
-548=rtcSetDateVar
-580=rtcSetFileAttr
-551=rtcSetTimeBstr
-550=rtcSetTimeVar
-658=rtcSgnVar
-600=rtcShell
-582=rtcSin
-525=rtcSpaceBstr
-526=rtcSpaceVar
-614=rtcSqr
-622=rtcStrConvVar
-536=rtcStrFromVar
-606=rtcStringBstr
-607=rtcStringVar
-668=rtcSwitch
-584=rtcTan
-519=rtcTrimBstr
-520=rtcTrimVar
-591=rtcTypeName
-527=rtcUpperCaseBstr
-528=rtcUpperCaseVar
-608=rtcVarBstrFromAnsi
-695=rtcVarBstrFromByte
-698=rtcVarBstrFromChar
-687=rtcVarDateFromVar
-652=rtcVarFromError
-660=rtcVarFromFormatVar
-642=rtcVarFromVar
-613=rtcVarStrFromVar
+188=AssignRecord
+190=CopyRecord
+2000=CreateIExprSrvObj
+189=DestructRecord
+187=DllFunctionCall
+232=EbGetHandleOfExecutingProject
+1025=EbGetObjConnectionCounts
+2010=EbGetVBAObject
+231=EbResetProject
+239=EbResetProjectNormal
+317=GetMem1
+300=GetMem2
+301=GetMem4
+302=GetMem8
+314=GetMemNewObj
+305=GetMemObj
+303=GetMemStr
+304=GetMemVar
+1024=IID_IVbaHost
+106=IntlInitializeTable
+199=MethCallEngine
+186=ProcCallEngine
+318=PutMem1
+306=PutMem2
+307=PutMem4
+308=PutMem8
+315=PutMemNewObj
+311=PutMemObj
+309=PutMemStr
+310=PutMemVar
+316=SetMemNewObj
+313=SetMemObj
+312=SetMemVar
+100=ThunRTMain
+230=TipCreateInstanceProject
+195=TipGetAddressOfPredeclaredInstance
+1016=TipInvokeMethod
+227=TipUnloadProject
+105=UserDllMain
+102=VBDllCanUnloadNow
+101=VBDllGetClassObject
+103=VBDllRegisterServer
+104=VBDllUnRegisterServer
+644=VarPtr
+635=rtBoolFromErrVar
+634=rtBstrFromErrVar
+636=rtCyFromErrVar
+637=rtI2FromErrVar
+638=rtI4FromErrVar
+639=rtR4FromErrVar
+640=rtR8FromErrVar
+686=rtUI1FromErrVar
+656=rtcAbsVar
+516=rtcAnsiValueBstr
+597=rtcAppActivate
+627=rtcAppleScript
+601=rtcArray
+585=rtcAtn
+534=rtcBeep
+537=rtcBstrFromAnsi
+694=rtcBstrFromByte
+697=rtcBstrFromChar
+651=rtcBstrFromError
+650=rtcBstrFromFormatVar
+693=rtcByteValueBstr
+643=rtcCVErrFromVar
+530=rtcChangeDir
+533=rtcChangeDrive
+696=rtcCharValueBstr
+665=rtcChoose
+669=rtcCommandBstr
+670=rtcCommandVar
+649=rtcCompareBstr
+583=rtcCos
+625=rtcCreateObject
+647=rtcCurrentDir
+646=rtcCurrentDirBstr
+673=rtcDDB
+661=rtcDateAdd
+662=rtcDateDiff
+641=rtcDateFromVar
+663=rtcDatePart
+691=rtcDeleteSetting
+645=rtcDir
+598=rtcDoEvents
+571=rtcEndOfFile
+667=rtcEnvironBstr
+666=rtcEnvironVar
+685=rtcErrObj
+586=rtcExp
+678=rtcFV
+555=rtcFileAttributes
+576=rtcFileCopy
+577=rtcFileDateTime
+578=rtcFileLen
+570=rtcFileLength
+569=rtcFileLocation
+554=rtcFileReset
+568=rtcFileSeek
+565=rtcFileWidth
+655=rtcFixVar
+648=rtcFreeFile
+692=rtcGetAllSettings
+609=rtcGetDateBstr
+540=rtcGetDateValue
+610=rtcGetDateVar
+542=rtcGetDayOfMonth
+552=rtcGetDayOfWeek
+605=rtcGetErl
+579=rtcGetFileAttr
+543=rtcGetHourOfDay
+544=rtcGetMinuteOfHour
+545=rtcGetMonthOfYear
+626=rtcGetObject
+546=rtcGetPresentDate
+623=rtcGetProjectLCID
+547=rtcGetSecondOfMinute
+689=rtcGetSetting
+611=rtcGetTimeBstr
+541=rtcGetTimeValue
+612=rtcGetTimeVar
+535=rtcGetTimer
+553=rtcGetYear
+572=rtcHexBstrFromVar
+573=rtcHexVarFromVar
+615=rtcIMEStatus
+674=rtcIPMT
+682=rtcIRR
+681=rtcImmediateIf
+630=rtcInStr
+633=rtcInStrChar
+596=rtcInputBox
+620=rtcInputCharCount
+621=rtcInputCharCountVar
+566=rtcInputCount
+567=rtcInputCountVar
+657=rtcIntVar
+556=rtcIsArray
+557=rtcIsDate
+558=rtcIsEmpty
+559=rtcIsError
+592=rtcIsMissing
+560=rtcIsNull
+561=rtcIsNumeric
+562=rtcIsObject
+529=rtcKillFiles
+512=rtcLeftBstr
+616=rtcLeftCharBstr
+617=rtcLeftCharVar
+521=rtcLeftTrimBstr
+522=rtcLeftTrimVar
+513=rtcLeftVar
+653=rtcLenCharVar
+654=rtcLenVar
+587=rtcLog
+517=rtcLowerCaseBstr
+518=rtcLowerCaseVar
+683=rtcMIRR
+590=rtcMacId
+531=rtcMakeDir
+628=rtcMidBstr
+631=rtcMidCharBstr
+632=rtcMidCharVar
+629=rtcMidVar
+595=rtcMsgBox
+684=rtcNPV
+679=rtcNPer
+574=rtcOctBstrFromVar
+575=rtcOctVarFromVar
+676=rtcPMT
+675=rtcPPMT
+677=rtcPV
+538=rtcPackDate
+539=rtcPackTime
+664=rtcPartition
+589=rtcQBColor
+581=rtcR8ValFromBstr
+593=rtcRandomNext
+594=rtcRandomize
+680=rtcRate
+532=rtcRemoveDir
+588=rtcRgb
+514=rtcRightBstr
+618=rtcRightCharBstr
+619=rtcRightCharVar
+523=rtcRightTrimBstr
+524=rtcRightTrimVar
+515=rtcRightVar
+671=rtcSLN
+672=rtcSYD
+690=rtcSaveSetting
+599=rtcSendKeys
+549=rtcSetDateBstr
+548=rtcSetDateVar
+580=rtcSetFileAttr
+551=rtcSetTimeBstr
+550=rtcSetTimeVar
+658=rtcSgnVar
+600=rtcShell
+582=rtcSin
+525=rtcSpaceBstr
+526=rtcSpaceVar
+614=rtcSqr
+622=rtcStrConvVar
+536=rtcStrFromVar
+606=rtcStringBstr
+607=rtcStringVar
+668=rtcSwitch
+584=rtcTan
+519=rtcTrimBstr
+520=rtcTrimVar
+591=rtcTypeName
+527=rtcUpperCaseBstr
+528=rtcUpperCaseVar
+608=rtcVarBstrFromAnsi
+695=rtcVarBstrFromByte
+698=rtcVarBstrFromChar
+687=rtcVarDateFromVar
+652=rtcVarFromError
+660=rtcVarFromFormatVar
+642=rtcVarFromVar
+613=rtcVarStrFromVar
 563=rtcVarType
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/vssapi.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/vssapi.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/vssapi.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/vssapi.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,84 +1,84 @@
-8=??0CVssJetWriter@@QAE@XZ
-9=??0CVssWriter@@QAE@XZ
-10=??1CVssJetWriter@@UAE@XZ
-11=??1CVssWriter@@UAE@XZ
-12=?AreComponentsSelected@CVssJetWriter@@IBG_NXZ
-13=?AreComponentsSelected@CVssWriter@@IBG_NXZ
-14=?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z
-15=?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z
-16=?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z
-17=?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ
-18=?GetBackupType@CVssWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ
-19=?GetContext@CVssJetWriter@@IBGJXZ
-20=?GetContext@CVssWriter@@IBGJXZ
-21=?GetCurrentLevel@CVssJetWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ
-22=?GetCurrentLevel@CVssWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ
-23=?GetCurrentSnapshotSetId@CVssJetWriter@@IBG?AU_GUID@@XZ
-24=?GetCurrentSnapshotSetId@CVssWriter@@IBG?AU_GUID@@XZ
-25=?GetCurrentVolumeArray@CVssJetWriter@@IBGPAPBGXZ
-26=?GetCurrentVolumeArray@CVssWriter@@IBGPAPBGXZ
-27=?GetCurrentVolumeCount@CVssJetWriter@@IBGIXZ
-28=?GetCurrentVolumeCount@CVssWriter@@IBGIXZ
-29=?GetRestoreType@CVssJetWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ
-30=?GetRestoreType@CVssWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ
-31=?GetSnapshotDeviceName@CVssJetWriter@@IBGJPBGPAPBG@Z
-32=?GetSnapshotDeviceName@CVssWriter@@IBGJPBGPAPBG@Z
-33=?Initialize@CVssJetWriter@@QAGJU_GUID@@PBG_N211K@Z
-34=?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N1@Z
-35=?InstallAlternateWriter@CVssWriter@@QAGJU_GUID@@0@Z
-36=?IsBootableSystemStateBackedUp@CVssJetWriter@@IBG_NXZ
-37=?IsBootableSystemStateBackedUp@CVssWriter@@IBG_NXZ
-38=?IsPartialFileSupportEnabled@CVssJetWriter@@IBG_NXZ
-39=?IsPartialFileSupportEnabled@CVssWriter@@IBG_NXZ
-40=?IsPathAffected@CVssJetWriter@@IBG_NPBG@Z
-41=?IsPathAffected@CVssWriter@@IBG_NPBG@Z
-42=?LoadVssSnapshotSetDescription@@YGJPBGPAPAVIVssSnapshotSetDescription@@U_GUID@@@Z
-43=?OnAbortBegin@CVssJetWriter@@UAGXXZ
-44=?OnAbortEnd@CVssJetWriter@@UAGXXZ
-45=?OnBackOffIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z
-46=?OnBackupComplete@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
-47=?OnBackupCompleteBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
-48=?OnBackupCompleteEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
-49=?OnBackupShutdown@CVssWriter@@UAG_NU_GUID@@@Z
-50=?OnContinueIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z
-51=?OnFreezeBegin@CVssJetWriter@@UAG_NXZ
-52=?OnFreezeEnd@CVssJetWriter@@UAG_N_N@Z
-53=?OnIdentify@CVssJetWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z
-54=?OnIdentify@CVssWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z
-55=?OnPostRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
-56=?OnPostRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
-57=?OnPostRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
-58=?OnPostSnapshot@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
-59=?OnPostSnapshot@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
-60=?OnPreRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
-61=?OnPreRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
-62=?OnPreRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
-63=?OnPrepareBackup@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
-64=?OnPrepareBackupBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
-65=?OnPrepareBackupEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
-66=?OnPrepareSnapshotBegin@CVssJetWriter@@UAG_NXZ
-67=?OnPrepareSnapshotEnd@CVssJetWriter@@UAG_N_N@Z
-68=?OnThawBegin@CVssJetWriter@@UAG_NXZ
-69=?OnThawEnd@CVssJetWriter@@UAG_N_N@Z
-70=?OnVSSApplicationStartup@CVssWriter@@UAG_NXZ
-71=?OnVSSShutdown@CVssWriter@@UAG_NXZ
-72=?SetWriterFailure@CVssJetWriter@@IAGJJ@Z
-73=?SetWriterFailure@CVssWriter@@IAGJJ@Z
-74=?Subscribe@CVssWriter@@QAGJK@Z
-75=?Uninitialize@CVssJetWriter@@QAGXXZ
-76=?Unsubscribe@CVssWriter@@QAGJXZ
-77=CreateVssBackupComponentsInternal
-78=CreateVssExamineWriterMetadataInternal
-79=CreateVssExpressWriterInternal
-80=CreateWriter
-81=CreateWriterEx
-82=DllCanUnloadNow
-83=DllGetClassObject
-84=GetProviderMgmtInterface
-85=GetProviderMgmtInterfaceInternal
-5=IsVolumeSnapshotted
-86=IsVolumeSnapshottedInternal
-7=ShouldBlockRevert
-87=ShouldBlockRevertInternal
-6=VssFreeSnapshotProperties
+8=??0CVssJetWriter@@QAE@XZ
+9=??0CVssWriter@@QAE@XZ
+10=??1CVssJetWriter@@UAE@XZ
+11=??1CVssWriter@@UAE@XZ
+12=?AreComponentsSelected@CVssJetWriter@@IBG_NXZ
+13=?AreComponentsSelected@CVssWriter@@IBG_NXZ
+14=?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z
+15=?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z
+16=?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z
+17=?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ
+18=?GetBackupType@CVssWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ
+19=?GetContext@CVssJetWriter@@IBGJXZ
+20=?GetContext@CVssWriter@@IBGJXZ
+21=?GetCurrentLevel@CVssJetWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ
+22=?GetCurrentLevel@CVssWriter@@IBG?AW4_VSS_APPLICATION_LEVEL@@XZ
+23=?GetCurrentSnapshotSetId@CVssJetWriter@@IBG?AU_GUID@@XZ
+24=?GetCurrentSnapshotSetId@CVssWriter@@IBG?AU_GUID@@XZ
+25=?GetCurrentVolumeArray@CVssJetWriter@@IBGPAPBGXZ
+26=?GetCurrentVolumeArray@CVssWriter@@IBGPAPBGXZ
+27=?GetCurrentVolumeCount@CVssJetWriter@@IBGIXZ
+28=?GetCurrentVolumeCount@CVssWriter@@IBGIXZ
+29=?GetRestoreType@CVssJetWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ
+30=?GetRestoreType@CVssWriter@@IBG?AW4_VSS_RESTORE_TYPE@@XZ
+31=?GetSnapshotDeviceName@CVssJetWriter@@IBGJPBGPAPBG@Z
+32=?GetSnapshotDeviceName@CVssWriter@@IBGJPBGPAPBG@Z
+33=?Initialize@CVssJetWriter@@QAGJU_GUID@@PBG_N211K@Z
+34=?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@@W4VSS_SOURCE_TYPE@@W4_VSS_APPLICATION_LEVEL@@KW4VSS_ALTERNATE_WRITER_STATE@@_N1@Z
+35=?InstallAlternateWriter@CVssWriter@@QAGJU_GUID@@0@Z
+36=?IsBootableSystemStateBackedUp@CVssJetWriter@@IBG_NXZ
+37=?IsBootableSystemStateBackedUp@CVssWriter@@IBG_NXZ
+38=?IsPartialFileSupportEnabled@CVssJetWriter@@IBG_NXZ
+39=?IsPartialFileSupportEnabled@CVssWriter@@IBG_NXZ
+40=?IsPathAffected@CVssJetWriter@@IBG_NPBG@Z
+41=?IsPathAffected@CVssWriter@@IBG_NPBG@Z
+42=?LoadVssSnapshotSetDescription@@YGJPBGPAPAVIVssSnapshotSetDescription@@U_GUID@@@Z
+43=?OnAbortBegin@CVssJetWriter@@UAGXXZ
+44=?OnAbortEnd@CVssJetWriter@@UAGXXZ
+45=?OnBackOffIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z
+46=?OnBackupComplete@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
+47=?OnBackupCompleteBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
+48=?OnBackupCompleteEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
+49=?OnBackupShutdown@CVssWriter@@UAG_NU_GUID@@@Z
+50=?OnContinueIOOnVolume@CVssWriter@@UAG_NPAGU_GUID@@1@Z
+51=?OnFreezeBegin@CVssJetWriter@@UAG_NXZ
+52=?OnFreezeEnd@CVssJetWriter@@UAG_N_N@Z
+53=?OnIdentify@CVssJetWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z
+54=?OnIdentify@CVssWriter@@UAG_NPAVIVssCreateWriterMetadata@@@Z
+55=?OnPostRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
+56=?OnPostRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
+57=?OnPostRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
+58=?OnPostSnapshot@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
+59=?OnPostSnapshot@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
+60=?OnPreRestore@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
+61=?OnPreRestoreBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
+62=?OnPreRestoreEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
+63=?OnPrepareBackup@CVssWriter@@UAG_NPAVIVssWriterComponents@@@Z
+64=?OnPrepareBackupBegin@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@@Z
+65=?OnPrepareBackupEnd@CVssJetWriter@@UAG_NPAVIVssWriterComponents@@_N@Z
+66=?OnPrepareSnapshotBegin@CVssJetWriter@@UAG_NXZ
+67=?OnPrepareSnapshotEnd@CVssJetWriter@@UAG_N_N@Z
+68=?OnThawBegin@CVssJetWriter@@UAG_NXZ
+69=?OnThawEnd@CVssJetWriter@@UAG_N_N@Z
+70=?OnVSSApplicationStartup@CVssWriter@@UAG_NXZ
+71=?OnVSSShutdown@CVssWriter@@UAG_NXZ
+72=?SetWriterFailure@CVssJetWriter@@IAGJJ@Z
+73=?SetWriterFailure@CVssWriter@@IAGJJ@Z
+74=?Subscribe@CVssWriter@@QAGJK@Z
+75=?Uninitialize@CVssJetWriter@@QAGXXZ
+76=?Unsubscribe@CVssWriter@@QAGJXZ
+77=CreateVssBackupComponentsInternal
+78=CreateVssExamineWriterMetadataInternal
+79=CreateVssExpressWriterInternal
+80=CreateWriter
+81=CreateWriterEx
+82=DllCanUnloadNow
+83=DllGetClassObject
+84=GetProviderMgmtInterface
+85=GetProviderMgmtInterfaceInternal
+5=IsVolumeSnapshotted
+86=IsVolumeSnapshottedInternal
+7=ShouldBlockRevert
+87=ShouldBlockRevertInternal
+6=VssFreeSnapshotProperties
 88=VssFreeSnapshotPropertiesInternal
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/dll/winmm.sdb.txt radare2-2.8.0+dfsg/libr/bin/d/dll/winmm.sdb.txt
--- radare2-2.3.0+dfsg/libr/bin/d/dll/winmm.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/dll/winmm.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,192 +1,192 @@
-4=CloseDriver
-5=DefDriverProc
-6=DriverCallback
-7=DrvGetModuleHandle
-8=GetDriverModuleHandle
-9=NotifyCallbackData
-10=OpenDriver
-11=PlaySound
-12=PlaySoundA
-13=PlaySoundW
-14=SendDriverMessage
-15=WOW32DriverCallback
-16=WOW32ResolveMultiMediaHandle
-17=WOWAppExit
-18=aux32Message
-19=auxGetDevCapsA
-20=auxGetDevCapsW
-21=auxGetNumDevs
-22=auxGetVolume
-23=auxOutMessage
-24=auxSetVolume
-25=joy32Message
-26=joyConfigChanged
-27=joyGetDevCapsA
-28=joyGetDevCapsW
-29=joyGetNumDevs
-30=joyGetPos
-31=joyGetPosEx
-32=joyGetThreshold
-33=joyReleaseCapture
-34=joySetCapture
-35=joySetThreshold
-36=mci32Message
-37=mciDriverNotify
-38=mciDriverYield
-3=mciExecute
-39=mciFreeCommandResource
-40=mciGetCreatorTask
-41=mciGetDeviceIDA
-42=mciGetDeviceIDFromElementIDA
-43=mciGetDeviceIDFromElementIDW
-44=mciGetDeviceIDW
-45=mciGetDriverData
-46=mciGetErrorStringA
-47=mciGetErrorStringW
-48=mciGetYieldProc
-49=mciLoadCommandResource
-50=mciSendCommandA
-51=mciSendCommandW
-52=mciSendStringA
-53=mciSendStringW
-54=mciSetDriverData
-55=mciSetYieldProc
-56=mid32Message
-57=midiConnect
-58=midiDisconnect
-59=midiInAddBuffer
-60=midiInClose
-61=midiInGetDevCapsA
-62=midiInGetDevCapsW
-63=midiInGetErrorTextA
-64=midiInGetErrorTextW
-65=midiInGetID
-66=midiInGetNumDevs
-67=midiInMessage
-68=midiInOpen
-69=midiInPrepareHeader
-70=midiInReset
-71=midiInStart
-72=midiInStop
-73=midiInUnprepareHeader
-74=midiOutCacheDrumPatches
-75=midiOutCachePatches
-76=midiOutClose
-77=midiOutGetDevCapsA
-78=midiOutGetDevCapsW
-79=midiOutGetErrorTextA
-80=midiOutGetErrorTextW
-81=midiOutGetID
-82=midiOutGetNumDevs
-83=midiOutGetVolume
-84=midiOutLongMsg
-85=midiOutMessage
-86=midiOutOpen
-87=midiOutPrepareHeader
-88=midiOutReset
-89=midiOutSetVolume
-90=midiOutShortMsg
-91=midiOutUnprepareHeader
-92=midiStreamClose
-93=midiStreamOpen
-94=midiStreamOut
-95=midiStreamPause
-96=midiStreamPosition
-97=midiStreamProperty
-98=midiStreamRestart
-99=midiStreamStop
-100=mixerClose
-101=mixerGetControlDetailsA
-102=mixerGetControlDetailsW
-103=mixerGetDevCapsA
-104=mixerGetDevCapsW
-105=mixerGetID
-106=mixerGetLineControlsA
-107=mixerGetLineControlsW
-108=mixerGetLineInfoA
-109=mixerGetLineInfoW
-110=mixerGetNumDevs
-111=mixerMessage
-112=mixerOpen
-113=mixerSetControlDetails
-114=mmDrvInstall
-115=mmGetCurrentTask
-116=mmTaskBlock
-117=mmTaskCreate
-118=mmTaskSignal
-119=mmTaskYield
-120=mmioAdvance
-121=mmioAscend
-122=mmioClose
-123=mmioCreateChunk
-124=mmioDescend
-125=mmioFlush
-126=mmioGetInfo
-127=mmioInstallIOProcA
-128=mmioInstallIOProcW
-129=mmioOpenA
-130=mmioOpenW
-131=mmioRead
-132=mmioRenameA
-133=mmioRenameW
-134=mmioSeek
-135=mmioSendMessage
-136=mmioSetBuffer
-137=mmioSetInfo
-138=mmioStringToFOURCCA
-139=mmioStringToFOURCCW
-140=mmioWrite
-141=mmsystemGetVersion
-142=mod32Message
-143=mxd32Message
-144=sndPlaySoundA
-145=sndPlaySoundW
-146=tid32Message
-147=timeBeginPeriod
-148=timeEndPeriod
-149=timeGetDevCaps
-150=timeGetSystemTime
-151=timeGetTime
-152=timeKillEvent
-153=timeSetEvent
-154=waveInAddBuffer
-155=waveInClose
-156=waveInGetDevCapsA
-157=waveInGetDevCapsW
-158=waveInGetErrorTextA
-159=waveInGetErrorTextW
-160=waveInGetID
-161=waveInGetNumDevs
-162=waveInGetPosition
-163=waveInMessage
-164=waveInOpen
-165=waveInPrepareHeader
-166=waveInReset
-167=waveInStart
-168=waveInStop
-169=waveInUnprepareHeader
-170=waveOutBreakLoop
-171=waveOutClose
-172=waveOutGetDevCapsA
-173=waveOutGetDevCapsW
-174=waveOutGetErrorTextA
-175=waveOutGetErrorTextW
-176=waveOutGetID
-177=waveOutGetNumDevs
-178=waveOutGetPitch
-179=waveOutGetPlaybackRate
-180=waveOutGetPosition
-181=waveOutGetVolume
-182=waveOutMessage
-183=waveOutOpen
-184=waveOutPause
-185=waveOutPrepareHeader
-186=waveOutReset
-187=waveOutRestart
-188=waveOutSetPitch
-189=waveOutSetPlaybackRate
-190=waveOutSetVolume
-191=waveOutUnprepareHeader
-192=waveOutWrite
-193=wid32Message
-194=wod32Message
+4=CloseDriver
+5=DefDriverProc
+6=DriverCallback
+7=DrvGetModuleHandle
+8=GetDriverModuleHandle
+9=NotifyCallbackData
+10=OpenDriver
+11=PlaySound
+12=PlaySoundA
+13=PlaySoundW
+14=SendDriverMessage
+15=WOW32DriverCallback
+16=WOW32ResolveMultiMediaHandle
+17=WOWAppExit
+18=aux32Message
+19=auxGetDevCapsA
+20=auxGetDevCapsW
+21=auxGetNumDevs
+22=auxGetVolume
+23=auxOutMessage
+24=auxSetVolume
+25=joy32Message
+26=joyConfigChanged
+27=joyGetDevCapsA
+28=joyGetDevCapsW
+29=joyGetNumDevs
+30=joyGetPos
+31=joyGetPosEx
+32=joyGetThreshold
+33=joyReleaseCapture
+34=joySetCapture
+35=joySetThreshold
+36=mci32Message
+37=mciDriverNotify
+38=mciDriverYield
+3=mciExecute
+39=mciFreeCommandResource
+40=mciGetCreatorTask
+41=mciGetDeviceIDA
+42=mciGetDeviceIDFromElementIDA
+43=mciGetDeviceIDFromElementIDW
+44=mciGetDeviceIDW
+45=mciGetDriverData
+46=mciGetErrorStringA
+47=mciGetErrorStringW
+48=mciGetYieldProc
+49=mciLoadCommandResource
+50=mciSendCommandA
+51=mciSendCommandW
+52=mciSendStringA
+53=mciSendStringW
+54=mciSetDriverData
+55=mciSetYieldProc
+56=mid32Message
+57=midiConnect
+58=midiDisconnect
+59=midiInAddBuffer
+60=midiInClose
+61=midiInGetDevCapsA
+62=midiInGetDevCapsW
+63=midiInGetErrorTextA
+64=midiInGetErrorTextW
+65=midiInGetID
+66=midiInGetNumDevs
+67=midiInMessage
+68=midiInOpen
+69=midiInPrepareHeader
+70=midiInReset
+71=midiInStart
+72=midiInStop
+73=midiInUnprepareHeader
+74=midiOutCacheDrumPatches
+75=midiOutCachePatches
+76=midiOutClose
+77=midiOutGetDevCapsA
+78=midiOutGetDevCapsW
+79=midiOutGetErrorTextA
+80=midiOutGetErrorTextW
+81=midiOutGetID
+82=midiOutGetNumDevs
+83=midiOutGetVolume
+84=midiOutLongMsg
+85=midiOutMessage
+86=midiOutOpen
+87=midiOutPrepareHeader
+88=midiOutReset
+89=midiOutSetVolume
+90=midiOutShortMsg
+91=midiOutUnprepareHeader
+92=midiStreamClose
+93=midiStreamOpen
+94=midiStreamOut
+95=midiStreamPause
+96=midiStreamPosition
+97=midiStreamProperty
+98=midiStreamRestart
+99=midiStreamStop
+100=mixerClose
+101=mixerGetControlDetailsA
+102=mixerGetControlDetailsW
+103=mixerGetDevCapsA
+104=mixerGetDevCapsW
+105=mixerGetID
+106=mixerGetLineControlsA
+107=mixerGetLineControlsW
+108=mixerGetLineInfoA
+109=mixerGetLineInfoW
+110=mixerGetNumDevs
+111=mixerMessage
+112=mixerOpen
+113=mixerSetControlDetails
+114=mmDrvInstall
+115=mmGetCurrentTask
+116=mmTaskBlock
+117=mmTaskCreate
+118=mmTaskSignal
+119=mmTaskYield
+120=mmioAdvance
+121=mmioAscend
+122=mmioClose
+123=mmioCreateChunk
+124=mmioDescend
+125=mmioFlush
+126=mmioGetInfo
+127=mmioInstallIOProcA
+128=mmioInstallIOProcW
+129=mmioOpenA
+130=mmioOpenW
+131=mmioRead
+132=mmioRenameA
+133=mmioRenameW
+134=mmioSeek
+135=mmioSendMessage
+136=mmioSetBuffer
+137=mmioSetInfo
+138=mmioStringToFOURCCA
+139=mmioStringToFOURCCW
+140=mmioWrite
+141=mmsystemGetVersion
+142=mod32Message
+143=mxd32Message
+144=sndPlaySoundA
+145=sndPlaySoundW
+146=tid32Message
+147=timeBeginPeriod
+148=timeEndPeriod
+149=timeGetDevCaps
+150=timeGetSystemTime
+151=timeGetTime
+152=timeKillEvent
+153=timeSetEvent
+154=waveInAddBuffer
+155=waveInClose
+156=waveInGetDevCapsA
+157=waveInGetDevCapsW
+158=waveInGetErrorTextA
+159=waveInGetErrorTextW
+160=waveInGetID
+161=waveInGetNumDevs
+162=waveInGetPosition
+163=waveInMessage
+164=waveInOpen
+165=waveInPrepareHeader
+166=waveInReset
+167=waveInStart
+168=waveInStop
+169=waveInUnprepareHeader
+170=waveOutBreakLoop
+171=waveOutClose
+172=waveOutGetDevCapsA
+173=waveOutGetDevCapsW
+174=waveOutGetErrorTextA
+175=waveOutGetErrorTextW
+176=waveOutGetID
+177=waveOutGetNumDevs
+178=waveOutGetPitch
+179=waveOutGetPlaybackRate
+180=waveOutGetPosition
+181=waveOutGetVolume
+182=waveOutMessage
+183=waveOutOpen
+184=waveOutPause
+185=waveOutPrepareHeader
+186=waveOutReset
+187=waveOutRestart
+188=waveOutSetPitch
+189=waveOutSetPlaybackRate
+190=waveOutSetVolume
+191=waveOutUnprepareHeader
+192=waveOutWrite
+193=wid32Message
+194=wod32Message
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/Makefile radare2-2.8.0+dfsg/libr/bin/d/Makefile
--- radare2-2.3.0+dfsg/libr/bin/d/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -12,6 +12,7 @@
 DLLS+=olepro32 olesvr32 shdocvw shell32 shlwapi uxtheme
 DLLS+=vb40032 vssapi winmm cabinet gsprop32 spr32d70 mfc90u
 DLLS+=wldap32 iertutil urlmon wsnmp32 mfc30 mfc40 mfc71 mfc71u
+DLLS+=mfc120
 DLL_SDB=$(addsuffix .sdb,$(addprefix dll/,$(DLLS)))
 #-include $(OBJS:.o=.d)
 
@@ -22,7 +23,7 @@
 
 .PHONY: all clean install install-symlink symstall
 
-FORMATS=elf32 elf64 elf_enums pe32 trx mz
+FORMATS=elf32 elf64 elf_enums pe32 trx mz zip
 
 install: ${F_SDB}
 	@echo "[i] Installing bin format files"
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/meson.build radare2-2.8.0+dfsg/libr/bin/d/meson.build
--- radare2-2.3.0+dfsg/libr/bin/d/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,73 @@
+sdb_files = [
+  'ws2_32',
+  'oleaut32',
+  'wsock32',
+  'msi',
+  'csmfpapi',
+  'csmtpapi',
+  'csncdapi',
+  'msvbvm60',
+  'kernel32',
+  'aclui',
+  'activeds',
+  'atl',
+  'borlndmm',
+  'browseui',
+  'comctl32',
+  'dsound',
+  'mfc42',
+  'mfc42u',
+  'mstlsapi',
+  'msvbvm50',
+  'odbc32',
+  'olecli32',
+  'oledlg',
+  'olepro32',
+  'olesvr32',
+  'shdocvw',
+  'shell32',
+  'shlwapi',
+  'uxtheme',
+  'vb40032',
+  'vssapi',
+  'winmm',
+  'cabinet',
+  'gsprop32',
+  'spr32d70',
+  'mfc90u',
+  'wldap32',
+  'iertutil',
+  'urlmon',
+  'wsnmp32',
+  'mfc30',
+  'mfc40',
+  'mfc71',
+  'mfc71u'
+]
+
+foreach file : sdb_files
+  outfile = '@0@.sdb'.format(file)
+  custom_target(outfile,
+    input: 'dll/@0@.sdb.txt'.format(file),
+    output: outfile,
+    command: sdb_gen_cmd,
+    depends: sdb_exe,
+    build_by_default: true,
+    install: true,
+    install_dir: join_paths(r2_sdb, 'format/dll')
+  )
+endforeach
+
+format_files = [
+  'elf32',
+  'elf64',
+  'elf_enums',
+  'pe32',
+  'trx',
+  'mz',
+  'zip'
+]
+
+install_data(format_files,
+  install_dir: join_paths(r2_sdb, 'format')
+)
diff -Nru radare2-2.3.0+dfsg/libr/bin/d/zip radare2-2.8.0+dfsg/libr/bin/d/zip
--- radare2-2.3.0+dfsg/libr/bin/d/zip	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/d/zip	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,6 @@
+pf.zip_local_file_hdr xwwwwwxxxww magic extract flags compression last_mod_time last_mod_date crc32 compressed_size uncompressed_size namlen extras
+pf.zip_data_desc xxx crc32 compressed_size uncompressed_size
+pf.zip_central_directory_hdr xwwwwwwxxxwwwwwxx magic encoder extract flags compression last_mod_time last_mod_date crc32 compressed_size uncompressed_size namlen extras comment diskstart filetype filemode offset
+pf.zip_end_central_dir xwwwwxxw magic disk finaldisk entries finalentries rootsize rootseek comment
+pf.zip64_end_central_dir xqwwxxqqqq magic size encoder extract disk finaldisk entries finalentries rootsize rootseek
+pf.zip64_end_central_dir_loc xxqx magic disk rootseek disks
\ No newline at end of file
diff -Nru radare2-2.3.0+dfsg/libr/bin/dwarf.c radare2-2.8.0+dfsg/libr/bin/dwarf.c
--- radare2-2.3.0+dfsg/libr/bin/dwarf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/dwarf.c	2018-08-07 14:12:36.000000000 +0000
@@ -973,15 +973,17 @@
 				"has children" : "no children");
 		fprintf (f, "Offset 0x%"PFMT64x"\n", da->decls[i].offset);
 
-		for (j = 0; j < da->decls[i].length; j++) {
-			attr_name = da->decls[i].specs[j].attr_name;
-			attr_form = da->decls[i].specs[j].attr_form;
-			if (attr_name && attr_form &&
-				attr_name <= DW_AT_vtable_elem_location &&
-				attr_form <= DW_FORM_indirect) {
+		if (da->decls[i].specs) {
+			for (j = 0; j < da->decls[i].length; j++) {
+				attr_name = da->decls[i].specs[j].attr_name;
+				attr_form = da->decls[i].specs[j].attr_form;
+				if (attr_name && attr_form &&
+					attr_name <= DW_AT_vtable_elem_location &&
+					attr_form <= DW_FORM_indirect) {
 					fprintf (f, "    %s %s\n",
-						dwarf_attr_encodings[attr_name],
-						dwarf_attr_form_encodings[attr_form]);
+							dwarf_attr_encodings[attr_name],
+							dwarf_attr_form_encodings[attr_form]);
+				}
 			}
 		}
 	}
@@ -1359,7 +1361,11 @@
 					&cu->hdr, debug_str, debug_str_len);
 			if (cu->dies[cu->length].attr_values[i].name == DW_AT_comp_dir) {
 				const char *name = cu->dies[cu->length].attr_values[i].encoding.str_struct.string;
-				sdb_set (s, "DW_AT_comp_dir", name, 0);
+				if ((size_t)name > 1024) { // solve some null derefs
+					sdb_set (s, "DW_AT_comp_dir", name, 0);
+				} else {
+					eprintf ("Invalid string pointer at %p\n", name);
+				}
 			}
 			cu->dies[cu->length].length++;
 		}
diff -Nru radare2-2.3.0+dfsg/libr/bin/file.c radare2-2.8.0+dfsg/libr/bin/file.c
--- radare2-2.3.0+dfsg/libr/bin/file.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/file.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,1027 @@
+/* radare2 - LGPL - Copyright 2009-2018 - pancake, nibble, dso */
+
+#include <r_bin.h>
+
+// maybe too big sometimes? 2KB of stack eaten here..
+#define R_STRING_SCAN_BUFFER_SIZE 2048
+#define R_STRING_MAX_UNI_BLOCKS 4
+
+static void print_string(RBinString *string, RBinFile *bf) {
+	if (!string || !bf) {
+		return;
+	}
+	int mode = bf->strmode;
+	ut64 addr , vaddr;
+	RBin *bin = bf->rbin;
+	const char *section_name, *type_string;
+	RIO *io = bin->iob.io;
+	if (!io) {
+		return;
+	}
+	RBinSection *s = r_bin_get_section_at (bf->o, string->paddr, false);
+	if (s) {
+		string->vaddr = s->vaddr + (string->paddr - s->paddr);
+	}
+	section_name = s ? s->name : "";
+	type_string = r_bin_string_type (string->type);
+	vaddr = addr = r_bin_get_vaddr (bin, string->paddr, string->vaddr);
+
+	switch (mode) {
+	case MODE_SIMPLE :
+		io->cb_printf ("0x%08" PFMT64x " %s\n", addr, string->string);
+		break;
+	case MODE_RADARE :
+		{
+		char *f_name, *nstr;
+		f_name = strdup (string->string);
+		r_name_filter (f_name, 512);
+		if (bin->prefix) {
+			nstr = r_str_newf ("%s.str.%s", bin->prefix, f_name);
+			io->cb_printf ("f %s.str.%s %"PFMT64d" @ 0x%08"PFMT64x"\n"
+					"Cs %"PFMT64d" @ 0x%08"PFMT64x"\n",
+					bin->prefix, f_name, string->size, addr,
+					string->size, addr);
+		} else {
+			nstr = r_str_newf ("str.%s", f_name);
+			io->cb_printf ("f str.%s %"PFMT64d" @ 0x%08"PFMT64x"\n"
+					"Cs %"PFMT64d" @ 0x%08"PFMT64x"\n",
+					f_name, string->size, addr,
+					string->size, addr);
+		}
+		free (nstr);
+		free (f_name);
+		break;
+		}
+	case MODE_PRINT :
+		io->cb_printf ("%03u 0x%08"PFMT64x" 0x%08"
+				PFMT64x" %3u %3u "
+				"(%s) %5s %s\n",
+				string->ordinal, string->paddr, vaddr,
+				string->length, string->size,
+				section_name, type_string, string->string);
+		break;
+	}
+}
+
+static int string_scan_range(RList *list, RBinFile *bf, int min,
+			      const ut64 from, const ut64 to, int type) {
+	ut8 tmp[R_STRING_SCAN_BUFFER_SIZE];
+	ut64 str_start, needle = from;
+	int count = 0, i, rc, runes;
+	int str_type = R_STRING_TYPE_DETECT;
+
+	if (type == -1) {
+		type = R_STRING_TYPE_DETECT;
+	}
+	if (from >= to) {
+		eprintf ("Invalid range to find strings 0x%"PFMT64x" .. 0x%"PFMT64x"\n", from, to);
+		return -1;
+	}
+	int len = to - from;
+	ut8 *buf = calloc (len, 1);
+	if (!buf || !min) {
+		free (buf);
+		return -1;
+	}
+	r_buf_read_at (bf->buf, from, buf, len);
+	// may oobread
+	while (needle < to) {
+		rc = r_utf8_decode (buf + needle - from, to - needle, NULL);
+		if (!rc) {
+			needle++;
+			continue;
+		}
+		if (type == R_STRING_TYPE_DETECT) {
+			char *w = (char *)buf + needle + rc - from;
+			if ((to - needle) > 5 + rc) {
+				bool is_wide32 = (needle + rc + 2 < to) && (!w[0] && !w[1] && !w[2] && w[3] && !w[4]);
+				if (is_wide32) {
+					str_type = R_STRING_TYPE_WIDE32;
+				} else {
+					bool is_wide = needle + rc + 2 < to && !w[0] && w[1] && !w[2];
+					str_type = is_wide? R_STRING_TYPE_WIDE: R_STRING_TYPE_ASCII;
+				}
+			} else {
+				str_type = R_STRING_TYPE_ASCII;
+			}
+		} else {
+			str_type = type;
+		}
+		runes = 0;
+		str_start = needle;
+
+		/* Eat a whole C string */
+		for (rc = i = 0; i < sizeof (tmp) - 3 && needle < to; i += rc) {
+			RRune r = {0};
+
+			if (str_type == R_STRING_TYPE_WIDE32) {
+				rc = r_utf32le_decode (buf + needle - from, to - needle, &r);
+				if (rc) {
+					rc = 4;
+				}
+			} else if (str_type == R_STRING_TYPE_WIDE) {
+				rc = r_utf16le_decode (buf + needle - from, to - needle, &r);
+				if (rc == 1) {
+					rc = 2;
+				}
+			} else {
+				rc = r_utf8_decode (buf + needle - from, to - needle, &r);
+				if (rc > 1) {
+					str_type = R_STRING_TYPE_UTF8;
+				}
+			}
+
+			/* Invalid sequence detected */
+			if (!rc) {
+				needle++;
+				break;
+			}
+
+			needle += rc;
+
+			if (r_isprint (r) && r != '\\') {
+				if (str_type == R_STRING_TYPE_WIDE32) {
+					if (r == 0xff) {
+						r = 0;
+					}
+				}
+				rc = r_utf8_encode (&tmp[i], r);
+				runes++;
+				/* Print the escape code */
+			} else if (r && r < 0x100 && strchr ("\b\v\f\n\r\t\a\033\\", (char)r)) {
+				if ((i + 32) < sizeof (tmp) && r < 93) {
+					tmp[i + 0] = '\\';
+					tmp[i + 1] = "       abtnvfr             e  "
+					             "                              "
+					             "                              "
+					             "  \\"[r];
+				} else {
+					// string too long
+					break;
+				}
+				rc = 2;
+				runes++;
+			} else {
+				/* \0 marks the end of C-strings */
+				break;
+			}
+		}
+
+		tmp[i++] = '\0';
+
+		if (runes >= min) {
+			// reduce false positives
+			int j, num_blocks, *block_list;
+			if (str_type == R_STRING_TYPE_ASCII) {
+				for (j = 0; j < i; j++) {
+					char ch = tmp[j];
+					if (ch != '\n' && ch != '\r' && ch != '\t') {
+						if (!IS_PRINTABLE (tmp[j])) {
+							continue;
+						}
+					}
+				}
+			}
+			switch (str_type) {
+			case R_STRING_TYPE_UTF8:
+			case R_STRING_TYPE_WIDE:
+			case R_STRING_TYPE_WIDE32:
+				num_blocks = 0;
+				block_list = r_utf_block_list ((const ut8*)tmp, i - 1);
+				if (block_list) {
+					for (j = 0; block_list[j] != -1; j++) {
+						num_blocks++;
+					}
+				}
+				free (block_list);
+				if (num_blocks > R_STRING_MAX_UNI_BLOCKS) {
+					continue;
+				}
+			}
+			RBinString *bs = R_NEW0 (RBinString);
+			if (!bs) {
+				break;
+			}
+			bs->type = str_type;
+			bs->length = runes;
+			bs->size = needle - str_start;
+			bs->ordinal = count++;
+			// TODO: move into adjust_offset
+			switch (str_type) {
+			case R_STRING_TYPE_WIDE:
+				if (str_start -from> 1) {
+					const ut8 *p = buf + str_start - 2 - from;
+					if (p[0] == 0xff && p[1] == 0xfe) {
+						str_start -= 2; // \xff\xfe
+					}
+				}
+				break;
+			case R_STRING_TYPE_WIDE32:
+				if (str_start -from> 3) {
+					const ut8 *p = buf + str_start - 4 - from;
+					if (p[0] == 0xff && p[1] == 0xfe) {
+						str_start -= 4; // \xff\xfe\x00\x00
+					}
+				}
+				break;
+			}
+			bs->paddr = bs->vaddr = str_start;
+			bs->string = r_str_ndup ((const char *)tmp, i);
+			if (list) {
+				r_list_append (list, bs);
+			} else {
+				print_string (bs, bf);
+				r_bin_string_free (bs);
+			}
+		}
+	}
+	free (buf);
+	return count;
+}
+
+static char *swiftField(const char *dn, const char *cn) {
+	char *p = strstr (dn, ".getter_");
+	if (!p) {
+		p = strstr (dn, ".setter_");
+		if (!p) {
+			p = strstr (dn, ".method_");
+		}
+	}
+	if (p) {
+		char *q = strstr (dn, cn);
+		if (q && q[strlen (cn)] == '.') {
+			q = strdup (q + strlen (cn) + 1);
+			char *r = strchr (q, '.');
+			if (r) {
+				*r = 0;
+			}
+			return q;
+		}
+	}
+	return NULL;
+}
+
+R_API RList *r_bin_classes_from_symbols (RBinFile *bf, RBinObject *o) {
+	RBinSymbol *sym;
+	RListIter *iter;
+	RList *symbols = o->symbols;
+	RList *classes = o->classes;
+	if (!classes) {
+		classes = r_list_newf ((RListFree)r_bin_class_free);
+	}
+	r_list_foreach (symbols, iter, sym) {
+		if (sym->name[0] != '_') {
+			continue;
+		}
+		const char *cn = sym->classname;
+		if (cn) {
+			RBinClass *c = r_bin_class_new (bf, sym->classname, NULL, 0);
+			if (!c) {
+				continue;
+			}
+			// swift specific
+			char *dn = sym->dname;
+			char *fn = swiftField (dn, cn);
+			if (fn) {
+				// eprintf ("FIELD %s  %s\n", cn, fn);
+				RBinField *f = r_bin_field_new (sym->paddr, sym->vaddr, sym->size, fn, NULL, NULL);
+				r_list_append (c->fields, f);
+				free (fn);
+			} else {
+				char *mn = strstr (dn, "..");
+				if (mn) {
+					// eprintf ("META %s  %s\n", sym->classname, mn);
+				} else {
+					char *mn = strstr (dn, cn);
+					if (mn && mn[strlen(cn)] == '.') {
+						mn += strlen (cn) + 1;
+						// eprintf ("METHOD %s  %s\n", sym->classname, mn);
+						r_list_append (c->methods, sym);
+					}
+				}
+			}
+		}
+	}
+	if (r_list_empty (classes)) {
+		r_list_free (classes);
+		return NULL;
+	}
+	return classes;
+}
+
+R_API RBinFile *r_bin_file_new(RBin *bin, const char *file, const ut8 *bytes, ut64 sz, ut64 file_sz, int rawstr, int fd, const char *xtrname, Sdb *sdb, bool steal_ptr) {
+	RBinFile *binfile = R_NEW0 (RBinFile);
+	if (!binfile) {
+		return NULL;
+	}
+	// TODO: use r_id_storage api
+	if (!r_id_pool_grab_id (bin->ids->pool, &binfile->id)) {
+		if (steal_ptr) { // we own the ptr, free on error
+			free ((void*) bytes);
+		}
+		free (binfile);		//no id means no binfile
+		return NULL;
+	}
+	int res = r_bin_file_set_bytes (binfile, bytes, sz, steal_ptr);
+	if (!res && steal_ptr) { // we own the ptr, free on error
+		free((void*) bytes);
+	}
+	binfile->rbin = bin;
+	binfile->file = file? strdup (file): NULL;
+	binfile->rawstr = rawstr;
+	binfile->fd = fd;
+	binfile->curxtr = r_bin_get_xtrplugin_by_name (bin, xtrname);
+	binfile->sdb = sdb;
+	binfile->size = file_sz;
+	binfile->xtr_data = r_list_newf ((RListFree)r_bin_xtrdata_free);
+	binfile->objs = r_list_newf ((RListFree)r_bin_object_free);
+	binfile->xtr_obj  = NULL;
+
+	if (!binfile->buf) {
+		//r_bin_file_free (binfile);
+		binfile->buf = r_buf_new ();
+		//	return NULL;
+	}
+
+	if (sdb) {
+		binfile->sdb = sdb_ns (sdb, sdb_fmt ("fd.%d", fd), 1);
+		sdb_set (binfile->sdb, "archs", "0:0:x86:32", 0); // x86??
+		/* NOTE */
+		/* Those refs++ are necessary because sdb_ns() doesnt rerefs all
+		 * sub-namespaces */
+		/* And if any namespace is referenced backwards it gets
+		 * double-freed */
+		binfile->sdb_addrinfo = sdb_ns (binfile->sdb, "addrinfo", 1);
+		binfile->sdb_addrinfo->refs++;
+		sdb_ns_set (sdb, "cur", binfile->sdb);
+		binfile->sdb->refs++;
+	}
+	return binfile;
+}
+
+R_API bool r_bin_file_object_new_from_xtr_data(RBin *bin, RBinFile *bf, ut64 baseaddr, ut64 loadaddr, RBinXtrData *data) {
+	RBinObject *o = NULL;
+	RBinPlugin *plugin = NULL;
+	ut8* bytes;
+	ut64 offset = data? data->offset: 0;
+	ut64 sz = data ? data->size : 0;
+	if (!data || !bf) {
+		return false;
+	}
+
+	// for right now the bytes used will just be the offest into the binfile
+	// buffer
+	// if the extraction requires some sort of transformation then this will
+	// need to be fixed
+	// here.
+	bytes = data->buffer;
+	if (!bytes) {
+		return false;
+	}
+	plugin = r_bin_get_binplugin_by_bytes (bin, (const ut8*)bytes, sz);
+	if (!plugin) {
+		plugin = r_bin_get_binplugin_any (bin);
+	}
+	r_buf_free (bf->buf);
+	bf->buf = r_buf_new_with_bytes ((const ut8*)bytes, data->size);
+	//r_bin_object_new append the new object into binfile
+	o = r_bin_object_new (bf, plugin, baseaddr, loadaddr, offset, sz);
+	// size is set here because the reported size of the object depends on
+	// if loaded from xtr plugin or partially read
+	if (!o) {
+		return false;
+	}
+	if (o && !o->size) {
+		o->size = sz;
+	}
+	bf->narch = data->file_count;
+	if (!o->info) {
+		o->info = R_NEW0 (RBinInfo);
+	}
+	free (o->info->file);
+	free (o->info->arch);
+	free (o->info->machine);
+	free (o->info->type);
+	o->info->file = strdup (bf->file);
+	o->info->arch = strdup (data->metadata->arch);
+	o->info->machine = strdup (data->metadata->machine);
+	o->info->type = strdup (data->metadata->type);
+	o->info->bits = data->metadata->bits;
+	o->info->has_crypto = bf->o->info->has_crypto;
+	data->loaded = true;
+	return true;
+}
+
+
+R_API RBinFile *r_bin_file_new_from_fd(RBin *bin, int fd, RBinFileOptions *options) {
+int file_sz = 0;
+	RBinPlugin *plugin = NULL;
+	RBinFile *bf = r_bin_file_create_append (bin, "-", NULL, 0, file_sz,
+				       0, fd, NULL, false);
+	if (!bf) {
+		return NULL;
+	}
+	int loadaddr = options? options->laddr: 0;
+	int baseaddr = options? options->baddr: 0;
+	// int loadaddr = options? options->laddr: 0;
+	bool binfile_created = true;
+	r_buf_free (bf->buf);
+	bf->buf = r_buf_new_with_io (&bin->iob, fd);
+	if (bin->force) {
+		plugin = r_bin_get_binplugin_by_name (bin, bin->force);
+	}
+	if (!plugin) {
+		if (options && options->plugname) {
+			plugin = r_bin_get_binplugin_by_name (bin, options->plugname);
+		}
+		if (!plugin) {
+			ut8 bytes[1024];
+			int sz = sizeof (bytes);
+			r_buf_read_at (bf->buf, 0, bytes, sz);
+			plugin = r_bin_get_binplugin_by_bytes (bin, bytes, sz);
+			if (!plugin) {
+				plugin = r_bin_get_binplugin_any (bin);
+			}
+		}
+	}
+
+	RBinObject *o = r_bin_object_new (bf, plugin, baseaddr, loadaddr, 0, r_buf_size (bf->buf));
+	// size is set here because the reported size of the object depends on
+	// if loaded from xtr plugin or partially read
+	if (o && !o->size) {
+		o->size = file_sz;
+	}
+
+	if (!o) {
+		if (bf && binfile_created) {
+			r_list_delete_data (bin->binfiles, bf);
+		}
+		return NULL;
+	}
+#if 0
+	/* WTF */
+	if (strcmp (plugin->name, "any")) {
+		bf->narch = 1;
+	}
+#endif
+	/* free unnecessary rbuffer (???) */
+	return bf;
+}
+
+R_API RBinFile *r_bin_file_new_from_bytes(RBin *bin, const char *file, const ut8 *bytes, ut64 sz, ut64 file_sz, int rawstr, ut64 baseaddr, ut64 loadaddr, int fd, const char *pluginname, const char *xtrname, ut64 offset, bool steal_ptr) {
+	ut8 binfile_created = false;
+	RBinPlugin *plugin = NULL;
+	RBinXtrPlugin *xtr = NULL;
+	RBinObject *o = NULL;
+	if (sz == UT64_MAX) {
+		return NULL;
+	}
+
+	if (xtrname) {
+		xtr = r_bin_get_xtrplugin_by_name (bin, xtrname);
+	}
+
+	if (xtr && xtr->check_bytes (bytes, sz)) {
+		return r_bin_file_xtr_load_bytes (bin, xtr, file,
+						bytes, sz, file_sz, baseaddr, loadaddr, 0,
+						fd, rawstr);
+	}
+
+	RBinFile *bf = r_bin_file_create_append (bin, file, bytes, sz, file_sz,
+				       rawstr, fd, xtrname, steal_ptr);
+	if (!bf) {
+		if (!steal_ptr) { // we own the ptr, free on error
+			free ((void*) bytes);
+		}
+		return NULL;
+	}
+	binfile_created = true;
+
+	if (bin->force) {
+		plugin = r_bin_get_binplugin_by_name (bin, bin->force);
+	}
+	if (!plugin) {
+		if (pluginname) {
+			plugin = r_bin_get_binplugin_by_name (bin, pluginname);
+		}
+		if (!plugin) {
+			plugin = r_bin_get_binplugin_by_bytes (bin, bytes, sz);
+			if (!plugin) {
+				plugin = r_bin_get_binplugin_any (bin);
+			}
+		}
+	}
+
+	o = r_bin_object_new (bf, plugin, baseaddr, loadaddr, 0, r_buf_size (bf->buf));
+	// size is set here because the reported size of the object depends on
+	// if loaded from xtr plugin or partially read
+	if (o && !o->size) {
+		o->size = file_sz;
+	}
+
+	if (!o) {
+		if (bf && binfile_created) {
+			r_list_delete_data (bin->binfiles, bf);
+		}
+		return NULL;
+	}
+#if 0
+	/* WTF */
+	if (strcmp (plugin->name, "any")) {
+		bf->narch = 1;
+	}
+#endif
+	/* free unnecessary rbuffer (???) */
+	return bf;
+}
+
+R_API RBinFile *r_bin_file_find_by_arch_bits(RBin *bin, const char *arch, int bits, const char *name) {
+	RListIter *iter;
+	RBinFile *binfile = NULL;
+	RBinXtrData *xtr_data;
+
+	if (!name || !arch) {
+		return NULL;
+	}
+	r_list_foreach (bin->binfiles, iter, binfile) {
+		RListIter *iter_xtr;
+		if (!binfile->xtr_data) {
+			continue;
+		}
+		// look for sub-bins in Xtr Data and Load if we need to
+		r_list_foreach (binfile->xtr_data, iter_xtr, xtr_data) {
+			if (xtr_data->metadata && xtr_data->metadata->arch) {
+				char *iter_arch = xtr_data->metadata->arch;
+				int iter_bits = xtr_data->metadata->bits;
+				if (bits == iter_bits && !strcmp (iter_arch, arch)) {
+					if (!xtr_data->loaded) {
+						if (!r_bin_file_object_new_from_xtr_data (
+							    bin, binfile, xtr_data->baddr,
+							    xtr_data->laddr, xtr_data)) {
+							return NULL;
+						}
+						return binfile;
+					}
+				}
+			}
+		}
+	}
+	return binfile;
+}
+
+R_API RBinObject *r_bin_file_object_find_by_id(RBinFile *binfile, ut32 binobj_id) {
+	RBinObject *obj;
+	RListIter *iter;
+	if (binfile)  {
+		r_list_foreach (binfile->objs, iter, obj) {
+			if (obj->id == binobj_id) {
+				return obj;
+			}
+		}
+	}
+	return NULL;
+}
+
+R_API RBinFile *r_bin_file_find_by_object_id(RBin *bin, ut32 binobj_id) {
+	RListIter *iter;
+	RBinFile *binfile;
+	r_list_foreach (bin->binfiles, iter, binfile) {
+		if (r_bin_file_object_find_by_id (binfile, binobj_id)) {
+			return binfile;
+		}
+	}
+	return NULL;
+}
+
+R_API RBinFile *r_bin_file_find_by_id(RBin *bin, ut32 binfile_id) {
+	RBinFile *binfile = NULL;
+	RListIter *iter = NULL;
+	r_list_foreach (bin->binfiles, iter, binfile) {
+		if (binfile->id == binfile_id) {
+			break;
+		}
+		binfile = NULL;
+	}
+	return binfile;
+}
+
+R_API int r_bin_file_object_add(RBinFile *binfile, RBinObject *o) {
+	if (!o) {
+		return false;
+	}
+	r_list_append (binfile->objs, o);
+	r_bin_file_set_cur_binfile_obj (binfile->rbin, binfile, o);
+	return true;
+}
+
+R_API int r_bin_file_delete_all(RBin *bin) {
+	int counter = 0;
+	if (bin) {
+		counter = r_list_length (bin->binfiles);
+		r_list_purge (bin->binfiles);
+		bin->cur = NULL;
+	}
+	return counter;
+}
+
+R_API int r_bin_file_delete(RBin *bin, ut32 bin_fd) {
+	RListIter *iter;
+	RBinFile *bf;
+	RBinFile *cur = r_bin_cur (bin);
+	if (bin && cur) {
+		r_list_foreach (bin->binfiles, iter, bf) {
+			if (bf && bf->fd == bin_fd) {
+				if (cur->fd == bin_fd) {
+					//avoiding UaF due to dead reference
+					bin->cur = NULL;
+				}
+				r_list_delete (bin->binfiles, iter);
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+R_API RBinFile *r_bin_file_find_by_fd(RBin *bin, ut32 bin_fd) {
+	RListIter *iter;
+	RBinFile *bf;
+	if (bin) {
+		r_list_foreach (bin->binfiles, iter, bf) {
+			if (bf && bf->fd == bin_fd) {
+				return bf;
+			}
+		}
+	}
+	return NULL;
+}
+
+R_API RBinFile *r_bin_file_find_by_name(RBin *bin, const char *name) {
+	RListIter *iter;
+	RBinFile *bf = NULL;
+	if (!bin || !name) {
+		return NULL;
+	}
+	r_list_foreach (bin->binfiles, iter, bf) {
+		if (bf && bf->file && !strcmp (bf->file, name)) {
+			break;
+		}
+		bf = NULL;
+	}
+	return bf;
+}
+
+R_API RBinFile *r_bin_file_find_by_name_n(RBin *bin, const char *name, int idx) {
+	RListIter *iter;
+	RBinFile *bf = NULL;
+	int i = 0;
+	if (!bin) {
+		return bf;
+	}
+
+	r_list_foreach (bin->binfiles, iter, bf) {
+		if (bf && bf->file && !strcmp (bf->file, name)) {
+			if (i == idx) {
+				break;
+			}
+			i++;
+		}
+		bf = NULL;
+	}
+	return bf;
+}
+
+R_API int r_bin_file_set_cur_by_fd(RBin *bin, ut32 bin_fd) {
+	RBinFile *bf = r_bin_file_find_by_fd (bin, bin_fd);
+	return r_bin_file_set_cur_binfile (bin, bf);
+}
+
+R_API bool r_bin_file_set_cur_binfile_obj(RBin *bin, RBinFile *bf, RBinObject *obj) {
+	RBinPlugin *plugin = NULL;
+	if (!bin || !bf || !obj) {
+		return false;
+	}
+	bin->file = bf->file;
+	bin->cur = bf;
+	bin->narch = bf->narch;
+	bf->o = obj;
+	plugin = r_bin_file_cur_plugin (bf);
+	if (bin->minstrlen < 1) {
+		bin->minstrlen = plugin? plugin->minstrlen: bin->minstrlen;
+	}
+	return true;
+}
+
+R_API int r_bin_file_set_cur_binfile(RBin *bin, RBinFile *bf) {
+	RBinObject *obj = bf? bf->o: NULL;
+	return r_bin_file_set_cur_binfile_obj (bin, bf, obj);
+}
+
+R_API int r_bin_file_set_cur_by_name(RBin *bin, const char *name) {
+	RBinFile *bf = r_bin_file_find_by_name (bin, name);
+	return r_bin_file_set_cur_binfile (bin, bf);
+}
+
+R_API RBinObject *r_bin_file_object_get_cur(RBinFile *binfile) {
+	return binfile? binfile->o: NULL;
+}
+
+R_API int r_bin_file_cur_set_plugin(RBinFile *binfile, RBinPlugin *plugin) {
+	if (binfile && binfile->o) {
+		binfile->o->plugin = plugin;
+		return true;
+	}
+	return false;
+}
+
+R_API int r_bin_file_deref_by_bind(RBinBind *binb) {
+	RBin *bin = binb? binb->bin: NULL;
+	RBinFile *a = r_bin_cur (bin);
+	return r_bin_file_deref (bin, a);
+}
+
+R_API int r_bin_file_deref(RBin *bin, RBinFile *a) {
+	RBinObject *o = r_bin_cur_object (bin);
+	int res = false;
+	if (a && !o) {
+		//r_list_delete_data (bin->binfiles, a);
+		res = true;
+	} else if (a && o->referenced - 1 < 1) {
+		//r_list_delete_data (bin->binfiles, a);
+		res = true;
+		// not thread safe
+	} else if (o) {
+		o->referenced--;
+	}
+	// it is possible for a file not
+	// to be bound to RBin and RBinFiles
+	// XXX - is this an ok assumption?
+	if (bin) {
+		bin->cur = NULL;
+	}
+	return res;
+}
+
+R_API int r_bin_file_ref_by_bind(RBinBind *binb) {
+	RBin *bin = binb? binb->bin: NULL;
+	RBinFile *a = r_bin_cur (bin);
+	return r_bin_file_ref (bin, a);
+}
+
+R_API int r_bin_file_ref(RBin *bin, RBinFile *a) {
+	RBinObject *o = r_bin_cur_object (bin);
+	if (a && o) {
+		o->referenced--;
+		return true;
+	}
+	return false;
+}
+
+R_API void r_bin_file_free(void /*RBinFile*/ *bf_) {
+	RBinFile *a = bf_;
+	RBinPlugin *plugin = r_bin_file_cur_plugin (a);
+	if (!a) {
+		return;
+	}
+	// Binary format objects are connected to the
+	// RBinObject, so the plugin must destroy the
+	// format data first
+	if (plugin && plugin->destroy) {
+		plugin->destroy (a);
+	}
+	if (a->curxtr && a->curxtr->destroy && a->xtr_obj) {
+		a->curxtr->free_xtr ((void *)(a->xtr_obj));
+	}
+	r_buf_free (a->buf);
+	// TODO: unset related sdb namespaces
+	if (a && a->sdb_addrinfo) {
+		sdb_free (a->sdb_addrinfo);
+		a->sdb_addrinfo = NULL;
+	}
+	free (a->file);
+	a->o = NULL;
+	r_list_free (a->objs);
+	r_list_free (a->xtr_data);
+	if (a->id != -1) {
+		// TODO: use r_storage api
+		r_id_pool_kick_id (a->rbin->ids->pool, a->id);
+	}
+	free (a);
+}
+
+// This is an unnecessary piece of overengineering
+R_API RBinFile *r_bin_file_create_append(RBin *bin, const char *file, const ut8 *bytes, ut64 sz, ut64 file_sz, int rawstr, int fd, const char *xtrname, bool steal_ptr) {
+	RBinFile *bf = r_bin_file_new (bin, file, bytes, sz, file_sz, rawstr,
+				       fd, xtrname, bin->sdb, steal_ptr);
+	if (bf) {
+		r_list_append (bin->binfiles, bf);
+	}
+	return bf;
+}
+
+// This function populate RBinFile->xtr_data, that information is enough to
+// create RBinObject when needed using r_bin_file_object_new_from_xtr_data
+R_API RBinFile *r_bin_file_xtr_load_bytes(RBin *bin, RBinXtrPlugin *xtr, const char *filename, const ut8 *bytes, ut64 sz, ut64 file_sz, ut64 baseaddr, ut64 loadaddr, int idx, int fd, int rawstr) {
+	if (!bin || !bytes) {
+		return NULL;
+	}
+	RBinFile *bf = r_bin_file_find_by_name (bin, filename);
+	if (!bf) {
+		bf = r_bin_file_create_append (bin, filename, bytes, sz,
+					       file_sz, rawstr, fd, xtr->name, false);
+		if (!bf) {
+			return NULL;
+		}
+		if (!bin->cur) {
+			bin->cur = bf;
+		}
+	}
+	if (bf->xtr_data) {
+		r_list_free (bf->xtr_data);
+	}
+	if (xtr && bytes) {
+		RList *xtr_data_list = xtr->extractall_from_bytes (bin, bytes, sz);
+		RListIter *iter;
+		RBinXtrData *xtr;
+		//populate xtr_data with baddr and laddr that will be used later on
+		//r_bin_file_object_new_from_xtr_data
+		r_list_foreach (xtr_data_list, iter, xtr) {
+			xtr->baddr = baseaddr? baseaddr : UT64_MAX;
+			xtr->laddr = loadaddr? loadaddr : UT64_MAX;
+		}
+		bf->loadaddr = loadaddr;
+		bf->xtr_data = xtr_data_list ? xtr_data_list : NULL;
+	}
+	return bf;
+}
+
+#define LIMIT_SIZE 0
+R_API bool r_bin_file_set_bytes(RBinFile *binfile, const ut8 *bytes, ut64 sz, bool steal_ptr) {
+	if (!binfile) {
+		return false;
+	}
+	if (!bytes) {
+		return false;
+	}
+	r_buf_free (binfile->buf);
+	binfile->buf = r_buf_new ();
+#if LIMIT_SIZE
+	if (sz > 1024 * 1024) {
+		eprintf ("Too big\n");
+		// TODO: use r_buf_io instead of setbytes all the time to save memory
+		return NULL;
+	}
+#else
+	if (steal_ptr) {
+		r_buf_set_bytes_steal (binfile->buf, bytes, sz);
+	} else {
+		r_buf_set_bytes (binfile->buf, bytes, sz);
+	}
+#endif
+	return binfile->buf != NULL;
+}
+
+R_API RBinPlugin *r_bin_file_cur_plugin(RBinFile *binfile) {
+	return binfile && binfile->o? binfile->o->plugin: NULL;
+}
+
+static int is_data_section(RBinFile *a, RBinSection *s) {
+	if (s->has_strings || s->is_data) {
+		return true;
+	}
+ 	// Rust
+	return strstr (s->name, "_const") != NULL;
+}
+
+R_API RList *r_bin_file_get_strings(RBinFile *a, int min, int dump, int raw) {
+	RListIter *iter;
+	RBinSection *section;
+	RBinObject *o = a? a->o: NULL;
+	RList *ret;
+
+	if (dump) {
+		/* dump to stdout, not stored in list */
+		ret = NULL;
+	} else {
+		ret = r_list_newf (r_bin_string_free);
+		if (!ret) {
+			return NULL;
+		}
+	}
+	if (!raw && o && o->sections && !r_list_empty (o->sections)) {
+		r_list_foreach (o->sections, iter, section) {
+			if (is_data_section (a, section)) {
+				r_bin_file_get_strings_range (a, ret, min, raw, section->paddr,
+						section->paddr + section->size);
+			}
+		}
+		r_list_foreach (o->sections, iter, section) {
+			RBinString *s;
+			RListIter *iter2;
+			/* load objc/swift strings */
+			const int bits = (a->o && a->o->info) ? a->o->info->bits : 32;
+			const int cfstr_size = (bits == 64) ? 32 : 16;
+			const int cfstr_offs = (bits == 64) ? 16 :  8;
+			if (strstr (section->name, "__cfstring")) {
+				int i;
+// XXX do not walk if bin.strings == 0
+				ut8 *p;
+				if (section->size > a->size) {
+					continue;
+				}
+				for (i = 0; i < section->size; i += cfstr_size) {
+					ut8 buf[32];
+					if (!r_buf_read_at (
+						    a->buf, section->paddr + i + cfstr_offs,
+						    buf, sizeof (buf))) {
+						break;
+					}
+					p = buf;
+					ut64 cfstr_vaddr = section->vaddr + i;
+					ut64 cstr_vaddr = (bits == 64)
+								   ? r_read_le64 (p)
+								   : r_read_le32 (p);
+					r_list_foreach (ret, iter2, s) {
+						if (s->vaddr == cstr_vaddr) {
+							RBinString *bs = R_NEW0 (RBinString);
+							if (bs) {
+								bs->type = s->type;
+								bs->length = s->length;
+								bs->size = s->size;
+								bs->ordinal = s->ordinal;
+								bs->paddr = bs->vaddr = cfstr_vaddr;
+								bs->string = r_str_newf ("cstr.%s", s->string);
+								r_list_append (ret, bs);
+							}
+							break;
+						}
+					}
+				}
+			}
+		}
+	} else {
+		if (a) {
+			r_bin_file_get_strings_range (a, ret, min, raw, 0, a->size);
+		}
+	}
+	return ret;
+}
+
+R_API void r_bin_file_get_strings_range(RBinFile *bf, RList *list, int min, int raw, ut64 from, ut64 to) {
+	RBinPlugin *plugin = r_bin_file_cur_plugin (bf);
+	RBinString *ptr;
+	RListIter *it;
+
+	if (!bf || !bf->buf) {
+		return;
+	}
+	if (!raw) {
+		if (!plugin || !plugin->info) {
+			return;
+		}
+	}
+	if (!min) {
+		min = plugin? plugin->minstrlen: 4;
+	}
+	/* Some plugins return zero, fix it up */
+	if (!min) {
+		min = 4;
+	}
+	if (min < 0) {
+		return;
+	}
+	if (!to || to > bf->buf->length) {
+		to = r_buf_size (bf->buf);
+	}
+	if (!to) {
+		return;
+	}
+	if (raw != 2) {
+		ut64 size = to - from;
+		// in case of dump ignore here
+		if (bf->rbin->maxstrbuf && size && size > bf->rbin->maxstrbuf) {
+			if (bf->rbin->verbose) {
+				eprintf ("WARNING: bin_strings buffer is too big "
+					"(0x%08" PFMT64x
+					")."
+					" Use -zzz or set bin.maxstrbuf "
+					"(RABIN2_MAXSTRBUF) in r2 (rabin2)\n",
+					size);
+			}
+			return;
+		}
+	}
+	if (string_scan_range (list, bf, min, from, to, -1) < 0) {
+		return;
+	}
+	r_list_foreach (list, it, ptr) {
+		RBinSection *s = r_bin_get_section_at (bf->o, ptr->paddr, false);
+		if (s) {
+			ptr->vaddr = s->vaddr + (ptr->paddr - s->paddr);
+		}
+	}
+}
+
+R_API ut64 r_bin_file_get_baddr(RBinFile *binfile) {
+	return binfile? r_bin_object_get_baddr (binfile->o): UT64_MAX;
+}
diff -Nru radare2-2.3.0+dfsg/libr/bin/filter.c radare2-2.8.0+dfsg/libr/bin/filter.c
--- radare2-2.3.0+dfsg/libr/bin/filter.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/filter.c	2018-08-07 14:12:36.000000000 +0000
@@ -25,22 +25,22 @@
 	ut32 vhash, hash;
 	int count;
 	if (!db || !name) return;
-	uname = sdb_fmt (0, "%" PFMT64x ".%s", vaddr, name);
+	uname = sdb_fmt ("%" PFMT64x ".%s", vaddr, name);
 	vhash = sdb_hash (uname); // vaddr hash - unique
 	hash = sdb_hash (name);   // name hash - if dupped and not in unique hash must insert
-	count = sdb_num_inc (db, sdb_fmt (0, "%x", hash), 1, 0);
-	if (sdb_exists (db, sdb_fmt (1, "%x", vhash))) {
+	count = sdb_num_inc (db, sdb_fmt ("%x", hash), 1, 0);
+	if (sdb_exists (db, sdb_fmt ("%x", vhash))) {
 		// TODO: symbol is dupped, so symbol can be removed!
 		return;
 	}
-	sdb_num_set (db, sdb_fmt (0, "%x", vhash), 1, 0);
+	sdb_num_set (db, sdb_fmt ("%x", vhash), 1, 0);
 	if (vaddr) {
 		hashify (name, vaddr);
 	}
 	if (count > 1) {
 		int namelen = strlen (name);
 		if (namelen > maxlen) name[maxlen] = 0;
-		strcat (name, sdb_fmt (2, "_%d", count - 1));
+		strcat (name, sdb_fmt ("_%d", count - 1));
 		// two symbols at different addresses and same name wtf
 		//	eprintf ("Symbol '%s' dupped!\n", sym->name);
 	}
@@ -54,15 +54,15 @@
 	if (!name) {
 		return;
 	}
-	const char *uname = sdb_fmt (0, "%" PFMT64x ".%s", vaddr, name);
+	const char *uname = sdb_fmt ("%" PFMT64x ".%s", vaddr, name);
 	ut32 vhash = sdb_hash (uname); // vaddr hash - unique
 	ut32 hash = sdb_hash (name);   // name hash - if dupped and not in unique hash must insert
-	int count = sdb_num_inc (db, sdb_fmt (0, "%x", hash), 1, 0);
-	if (sdb_exists (db, sdb_fmt (1, "%x", vhash))) {
+	int count = sdb_num_inc (db, sdb_fmt ("%x", hash), 1, 0);
+	if (sdb_exists (db, sdb_fmt ("%x", vhash))) {
 		// TODO: symbol is dupped, so symbol can be removed!
 		return;
 	}
-	sdb_num_set (db, sdb_fmt (0, "%x", vhash), 1, 0);
+	sdb_num_set (db, sdb_fmt ("%x", vhash), 1, 0);
 	if (vaddr) {
 		//hashify (name, vaddr);
 	}
@@ -102,7 +102,9 @@
 		r_list_foreach (list, iter, sec) {
 			r_bin_filter_name (db, sec->vaddr, sec->name, maxlen);
 		}
-	} else eprintf ("SectionName is not dynamic\n");
+	} else {
+		eprintf ("SectionName is not dynamic\n");
+	}
 	sdb_free (db);
 }
 
@@ -130,3 +132,221 @@
 	}
 	sdb_free (db);
 }
+
+static bool false_positive(const char *str) {
+	int i;
+	ut8 bo[0x100];
+	int up = 0;
+	int lo = 0;
+	int ot = 0;
+	int di = 0;
+	int ln = 0;
+	int sp = 0;
+	int nm = 0;
+	for (i = 0; i < 0x100; i++) {
+		bo[i] = 0;
+	}
+	for (i = 0; str[i]; i++) {
+		if (IS_DIGIT(str[i])) {
+			nm++;
+		} else if (str[i]>='a' && str[i]<='z') {
+			lo++;
+		} else if (str[i]>='A' && str[i]<='Z') {
+			up++;
+		} else {
+			ot++;
+		}
+		if (str[i]=='\\') {
+			ot++;
+		}
+		if (str[i]==' ') {
+			sp++;
+		}
+		bo[(ut8)str[i]] = 1;
+		ln++;
+	}
+	for (i = 0; i<0x100; i++) {
+		if (bo[i]) {
+			di++;
+		}
+	}
+	if (ln > 2 && str[0] != '_') {
+		if (ln < 10) {
+			return true;
+		}
+		if (ot >= (nm + up + lo)) {
+			return true;
+		}
+		if (lo < 3) {
+			return true;
+		}
+	}
+	return false;
+}
+
+R_API bool r_bin_strpurge(RBin *bin, const char *str, ut64 refaddr) {
+	bool purge = false;
+	if (bin->strpurge) {
+		char *addrs = strdup (bin->strpurge);
+		if (addrs) {
+			int splits = r_str_split (addrs, ',');
+			int i;
+			char *ptr;
+			char *range_sep;
+			ut64 addr, from, to;
+			for (i = 0, ptr = addrs; i < splits; i++, ptr += strlen (ptr) + 1) {
+				bool bang = false;
+				if (!strcmp (ptr, "true") && false_positive (str)) {
+					purge = true;
+					continue;
+				}
+				if (*ptr == '!') {
+					bang = true;
+					ptr++;
+				}
+				if (!strcmp (ptr, "all")) {
+					purge = !bang;
+					continue;
+				}
+				range_sep = strchr (ptr, '-');
+				if (range_sep) {
+					*range_sep = 0;
+					from = r_num_get (NULL, ptr);
+					ptr = range_sep + 1;
+					to = r_num_get (NULL, ptr);
+					if (refaddr >= from && refaddr <= to) {
+						purge = !bang;
+						continue;
+					}
+				}
+				addr = r_num_get (NULL, ptr);
+				if (addr != 0 || *ptr == '0') {
+					if (refaddr == addr) {
+						purge = !bang;
+						continue;
+					}
+				}
+			}
+			free (addrs);
+		}
+	}
+	return purge;
+}
+
+static bool bin_strfilter(RBin *bin, const char *str) {
+	int i;
+	switch (bin->strfilter) {
+	case 'U': // only uppercase strings
+		for (i = 0; str[i]; i++) {
+			char ch = str[i];
+			if (ch == ' ') {
+				continue;
+			}
+			if (ch < '@'|| ch > 'Z') {
+				return false;
+			}
+			if (ch < 0 || !IS_PRINTABLE (ch)) {
+				return false;
+			}
+		}
+		if (str[0] && str[1]) {
+			for (i = 2; i<6 && str[i]; i++) {
+				if (str[i] == str[0]) {
+					return false;
+				}
+				if (str[i] == str[1]) {
+					return false;
+				}
+			}
+		}
+		if (str[0] == str[2]) {
+			return false; // rm false positives
+		}
+		break;
+	case 'a': // only alphanumeric - plain ascii
+		for (i = 0; str[i]; i++) {
+			char ch = str[i];
+			if (ch < 1 || !IS_PRINTABLE (ch)) {
+				return false;
+			}
+		}
+		break;
+	case 'e': // emails
+		if (str && *str) {
+			if (!strstr (str + 1, "@")) {
+				return false;
+			}
+			if (!strstr (str + 1, ".")) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		break;
+	case 'f': // format-string
+		if (str && *str) {
+			if (!strstr (str + 1, "%")) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		break;
+	case 'u': // URLs
+		if (!strstr (str, "://")) {
+			return false;
+		}
+		break;
+        case 'i': //IPV4
+		{
+			int segment = 0;
+			int segmentsum = 0;
+			bool prevd = false;
+			for (i = 0; str[i]; i++) {
+				char ch = str[i];
+				if (IS_DIGIT (ch)) {
+					segmentsum = segmentsum*10 + (ch - '0');
+					if (segment == 3) {
+						return true;
+					}
+					prevd = true;
+				} else if (ch == '.') {
+					if (prevd == true && segmentsum < 256){
+						segment++;
+						segmentsum = 0;
+					} else {
+						segmentsum = 0;
+						segment = 0;
+					}
+					prevd = false;
+				} else {
+					segmentsum = 0;
+					prevd = false;
+					segment = 0;
+				}
+			}
+			return false;
+		}
+	case 'p': // path
+		if (str[0] != '/') {
+			return false;
+		}
+		break;
+	case '8': // utf8
+		for (i = 0; str[i]; i++) {
+			char ch = str[i];
+			if (ch < 0) {
+				return true;
+			}
+		}
+		return false;
+	}
+	return true;
+}
+
+R_API bool r_bin_string_filter(RBin *bin, const char *str, ut64 addr) {
+	if (r_bin_strpurge (bin, str, addr) || !bin_strfilter (bin, str)) {
+		return false;
+	}
+	return true;
+}
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/dex/dex.c radare2-2.8.0+dfsg/libr/bin/format/dex/dex.c
--- radare2-2.3.0+dfsg/libr/bin/format/dex/dex.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/dex/dex.c	2018-08-07 14:12:36.000000000 +0000
@@ -15,6 +15,9 @@
 
 #define FAIL(x) { eprintf(x"\n"); goto fail; }
 RBinDexObj *r_bin_dex_new_buf(RBuffer *buf) {
+	if (!buf) {
+		return NULL;
+	}
 	RBinDexObj *bin = R_NEW0 (RBinDexObj);
 	int i;
 	ut8 *bufptr;
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/elf/elf.c radare2-2.8.0+dfsg/libr/bin/format/elf/elf.c
--- radare2-2.3.0+dfsg/libr/bin/format/elf/elf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/elf/elf.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2008-2017 - nibble, pancake, alvaro_fe */
+/* radare - LGPL - Copyright 2008-2018 - nibble, pancake, alvaro_fe */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,8 +30,35 @@
 #define READ32(x, i) r_read_ble32(x + i, bin->endian); i += 4;
 #define READ64(x, i) r_read_ble64(x + i, bin->endian); i += 8;
 
+#define BREAD8(x, i) r_read_ble8(r_buf_get_at (x, (i), NULL)); i += 1;
+#define BREAD16(x, i) r_read_ble16(r_buf_get_at (x, (i), NULL), bin->endian); i += 2;
+#define BREAD32(x, i) r_read_ble32(r_buf_get_at (x, (i), NULL), bin->endian); i += 8;
+#define BREAD64(x, i) r_read_ble64(r_buf_get_at (x, (i), NULL), bin->endian); i += 8;
+
 #define GROWTH_FACTOR (1.5)
 
+#define round_up(a) ((((a) + (4) - (1)) / (4)) * (4))
+
+enum {
+	X86,
+	X86_64,
+	ARM,
+	AARCH64,
+	ARCH_LEN
+};
+
+typedef struct reginfo {
+	ut32 regsize;
+	ut32 regdelta;
+} reginfo_t;
+
+static reginfo_t reginf[ARCH_LEN] = {
+					{160, 0x5c},
+					{216, 0x84},
+					{72, 0x5c},
+					{272, 0x84}
+				};
+
 static inline int __strnlen(const char *str, int len) {
 	int l = 0;
 	while (IS_PRINTABLE (*str) && --len) {
@@ -161,10 +188,11 @@
 		return false;
 	}
 
+	bool phdr_found = false;
 	bool linux_kern_hack = false;
 	/* Enable this hack only for the X86 64bit ELFs */
-	if (bin->ehdr.e_machine == EM_X86_64 ||
-		bin->ehdr.e_machine == EM_386) {
+	const int _128K = 1024 * 128;
+	if (bin->b->length > _128K && (bin->ehdr.e_machine == EM_X86_64 || bin->ehdr.e_machine == EM_386)) {
 		linux_kern_hack = true;
 	}
 read_phdr:
@@ -177,6 +205,9 @@
 			return false;
 		}
 		bin->phdr[i].p_type = READ32 (phdr, j)
+		if (bin->phdr[i].p_type == PT_PHDR) {
+			phdr_found = true;
+		}
 #if R_BIN_ELF64
 		bin->phdr[i].p_flags = READ32 (phdr, j)
 		bin->phdr[i].p_offset = READ64 (phdr, j)
@@ -202,7 +233,7 @@
 	 *    NEW_AUX_ENT(AT_PHDR, load_addr + exec->e_phoff);
 	 * So after the first read, we fix the address and read it again
 	 */
-	if (linux_kern_hack) {
+	if (linux_kern_hack && phdr_found) {
 		ut64 load_addr = Elf_(r_bin_elf_get_baddr) (bin);
 		bin->ehdr.e_phoff = Elf_(r_bin_elf_v2p) (bin, load_addr + bin->ehdr.e_phoff);
 		linux_kern_hack = false;
@@ -506,12 +537,11 @@
 
 static RBinElfSection* get_section_by_name(ELFOBJ *bin, const char *section_name) {
 	int i;
-	if (!bin->g_sections) {
-		return NULL;
-	}
-	for (i = 0; !bin->g_sections[i].last; i++) {
-		if (!strncmp (bin->g_sections[i].name, section_name, ELF_STRING_LENGTH-1)) {
-			return &bin->g_sections[i];
+	if (bin->g_sections) {
+		for (i = 0; !bin->g_sections[i].last; i++) {
+			if (!strncmp (bin->g_sections[i].name, section_name, ELF_STRING_LENGTH-1)) {
+				return &bin->g_sections[i];
+			}
 		}
 	}
 	return NULL;
@@ -588,6 +618,7 @@
 		data[i] = r_read_ble16 (&edata[i * sizeof (ut16)], bin->endian);
 	}
 	R_FREE (edata);
+	char *tmp_val = NULL;
 	for (i = 0; i < num_entries; i += 4) {
 		int j;
 		int check_def;
@@ -595,7 +626,6 @@
 
 		for (j = 0; (j < 4) && (i + j) < num_entries; j++) {
 			int k;
-			char *tmp_val = NULL;
 			snprintf (key, sizeof (key), "entry%d", i + j);
 			switch (data[i + j]) {
 			case 0:
@@ -605,7 +635,8 @@
 				sdb_set (sdb, key, "1 (*global*)", 0);
 				break;
 			default:
-				tmp_val = sdb_fmt (0, "%x ", data[i+j] & 0x7FFF);
+				free (tmp_val);
+				tmp_val = strdup (sdb_fmt ("%x ", data[i+j] & 0x7FFF));
 				check_def = true;
 				if (bin->version_info[DT_VERSIONTAGIDX (DT_VERNEED)]) {
 					Elf_(Verneed) vn;
@@ -650,7 +681,7 @@
 							if (vna.vna_name > bin->strtab_size) {
 								goto beach;
 							}
-							sdb_set (sdb, key, sdb_fmt (0, "%s(%s)", tmp_val, bin->strtab + vna.vna_name), 0);
+							sdb_set (sdb, key, sdb_fmt ("%s(%s)", tmp_val, bin->strtab + vna.vna_name), 0);
 							check_def = false;
 							break;
 						}
@@ -700,13 +731,15 @@
 							goto beach;
 						}
 						const char *name = bin->strtab + vda.vda_name;
-						sdb_set (sdb, key, sdb_fmt (0,"%s(%s%-*s)", tmp_val, name, (int)(12 - strlen (name)),")") , 0);
+						sdb_set (sdb, key, sdb_fmt ("%s(%s%-*s)", tmp_val, name, (int)(12 - strlen (name)),")") , 0);
 					}
 				}
 			}
 		}
+		R_FREE (tmp_val);
 	}
 beach:
+	R_FREE (tmp_val);
 	free (data);
 	return sdb;
 }
@@ -952,7 +985,7 @@
 		ut32 vn_cnt = entry->vn_cnt;
 		for (j = 0, isum = i + entry->vn_aux; j < vn_cnt && vstart + sizeof (Elf_(Vernaux)) <= end; ++j) {
 			int k;
-			Elf_(Vernaux) * aux = NULL;
+			Elf_(Vernaux) *aux = NULL;
 			Elf_(Vernaux) vaux = {0};
 			aux = (Elf_(Vernaux)*)&vaux;
 			k = 0;
@@ -1123,18 +1156,20 @@
 	if (!init_phdr (bin)) {
 		bprintf ("Warning: Cannot initialize program headers\n");
 	}
-	if (!init_shdr (bin)) {
-		bprintf ("Warning: Cannot initialize section headers\n");
-	}
-	if (!init_strtab (bin)) {
-		bprintf ("Warning: Cannot initialize strings table\n");
+	if (bin->ehdr.e_type != ET_CORE) {
+		if (!init_shdr (bin)) {
+			bprintf ("Warning: Cannot initialize section headers\n");
+		}
+		if (!init_strtab (bin)) {
+			bprintf ("Warning: Cannot initialize strings table\n");
+		}
+		if (!init_dynstr (bin)) {
+			bprintf ("Warning: Cannot initialize dynamic strings\n");
+		}
+		bin->baddr = Elf_(r_bin_elf_get_baddr) (bin);
+		if (!init_dynamic_section (bin) && !Elf_(r_bin_elf_get_static)(bin))
+			bprintf ("Warning: Cannot initialize dynamic section\n");
 	}
-	if (!init_dynstr (bin)) {
-		bprintf ("Warning: Cannot initialize dynamic strings\n");
-	}
-	bin->baddr = Elf_(r_bin_elf_get_baddr) (bin);
-	if (!init_dynamic_section (bin) && !Elf_(r_bin_elf_get_static)(bin))
-		bprintf ("Warning: Cannot initialize dynamic section\n");
 
 	bin->imports_by_ord_size = 0;
 	bin->imports_by_ord = NULL;
@@ -1173,7 +1208,7 @@
 	ut8 rl[sizeof (Elf_(Rel))] = {0};
 	ut8 rla[sizeof (Elf_(Rela))] = {0};
 	RBinElfSection *rel_sec = NULL;
-	Elf_(Addr) plt_sym_addr = -1;
+	ut64 plt_sym_addr = -1;
 	ut64 got_addr, got_offset;
 	ut64 plt_addr;
 	int j, k, tsize, len, nrel;
@@ -1848,7 +1883,8 @@
 		return false;
 	}
 	for (i = 0; i < bin->ehdr.e_phnum; i++) {
-		if (bin->phdr[i].p_type == PT_INTERP) {
+		if (bin->phdr[i].p_type == PT_INTERP ||
+			bin->phdr[i].p_type == PT_DYNAMIC) {
 			return false;
 		}
 	}
@@ -2179,10 +2215,59 @@
 				continue;
 			}
 			int bits = Elf_(r_bin_elf_get_bits)(bin);
-			int regdelta = (bits == 64)? 0x84: 0x40; // x64 vs x32
-			int regsize = 160; // for x86-64
+			int elf_nhdr_size = (bits == 64) ? sizeof (Elf64_Nhdr) : sizeof (Elf32_Nhdr);
+			void *elf_nhdr = calloc (elf_nhdr_size, 1);
+			bool regs_found = false;
+			ut64 offset = 0;
+
+			while (!regs_found) {
+				ut32 n_descsz, n_namesz, n_type;
+				int ret;
+				ret = r_buf_read_at (bin->b, bin->phdr[i].p_offset + offset, elf_nhdr, elf_nhdr_size);
+				if (ret != elf_nhdr_size) {
+					bprintf ("Cannot read NOTES hdr from CORE file\n");
+					free (elf_nhdr);
+					return NULL;
+				}
+				if (bits == 64) {
+					n_descsz = round_up (((Elf64_Nhdr *)elf_nhdr)->n_descsz);
+					n_namesz = round_up (((Elf64_Nhdr *)elf_nhdr)->n_namesz);
+					n_type = ((Elf64_Nhdr *)elf_nhdr)->n_type;
+				} else {
+					n_descsz = round_up (((Elf32_Nhdr *)elf_nhdr)->n_descsz);
+					n_namesz = round_up (((Elf32_Nhdr *)elf_nhdr)->n_namesz);
+					n_type = ((Elf32_Nhdr *)elf_nhdr)->n_type;
+				}
+				if (n_type == NT_PRSTATUS) {
+					regs_found = true;
+					free (elf_nhdr);
+				} else {
+					offset += elf_nhdr_size + n_descsz + n_namesz;
+				}
+			}
+
+			int regdelta = 0;
+			int regsize = 0;
+			switch (bin->ehdr.e_machine) {
+				case EM_AARCH64:
+					regsize = reginf[AARCH64].regsize;
+					regdelta = reginf[AARCH64].regdelta;
+					break;
+				case EM_ARM:
+					regsize = reginf[ARM].regsize;
+					regdelta = reginf[ARM].regdelta;
+					break;
+				case EM_386:
+					regsize = reginf[X86].regsize;
+					regdelta = reginf[X86].regdelta;
+					break;
+				case EM_X86_64:
+					regsize = reginf[X86_64].regsize;
+					regdelta = reginf[X86_64].regdelta;
+					break;
+			}
 			ut8 *buf = malloc (regsize);
-			if (r_buf_read_at (bin->b, bin->phdr[i].p_offset + regdelta, buf, regsize) != regsize) {
+			if (r_buf_read_at (bin->b, bin->phdr[i].p_offset + offset + regdelta, buf, regsize) != regsize) {
 				free (buf);
 				bprintf ("Cannot read register state from CORE file\n");
 				return NULL;
@@ -2227,6 +2312,9 @@
 	return ret;
 }
 
+static bool sectionIsInvalid(ELFOBJ *bin, RBinElfSection *sect) {
+	return (sect->offset + sect->size > bin->size);
+}
 
 static size_t get_relocs_num(ELFOBJ *bin) {
 	size_t i, size, ret = 0;
@@ -2240,6 +2328,9 @@
 	}
 	size = bin->is_rela == DT_REL ? sizeof (Elf_(Rel)) : sizeof (Elf_(Rela));
 	for (i = 0; !bin->g_sections[i].last; i++) {
+		if (sectionIsInvalid (bin, &bin->g_sections[i])) {
+			continue;
+		}
 		if (!strncmp (bin->g_sections[i].name, ".rela.", strlen (".rela."))) {
 			if (!bin->is_rela) {
 				size = sizeof (Elf_(Rela));
@@ -2257,22 +2348,26 @@
 }
 
 static int read_reloc(ELFOBJ *bin, RBinElfReloc *r, int is_rela, ut64 offset) {
-	ut8 *buf = bin->b->buf;
-	int j = 0;
-	if (offset + sizeof (Elf_ (Rela)) >
-		    bin->size || offset + sizeof (Elf_(Rela)) < offset) {
+	if (offset + sizeof (Elf_ (Rela)) > bin->size || offset + sizeof (Elf_(Rela)) < offset) {
 		return -1;
 	}
+	ut8 buf[sizeof (Elf_(Rela))] = {0};
+	int res = r_buf_read_at (bin->b, offset, buf, sizeof (Elf_(Rela)));
+	if (res != sizeof (Elf_(Rela))) {
+		return -1;
+	}
+	// TODO make a single read and work with the buffer
+	size_t i = 0;
 	if (is_rela == DT_RELA) {
 		Elf_(Rela) rela;
 #if R_BIN_ELF64
-		rela.r_offset = READ64 (buf + offset, j)
-		rela.r_info = READ64 (buf + offset, j)
-		rela.r_addend = READ64 (buf + offset, j)
+		rela.r_offset = READ64 (buf, i)
+		rela.r_info = READ64 (buf, i)
+		rela.r_addend = READ64 (buf, i)
 #else
-		rela.r_offset = READ32 (buf + offset, j)
-		rela.r_info = READ32 (buf + offset, j)
-		rela.r_addend = READ32 (buf + offset, j)
+		rela.r_offset = READ32 (buf, i)
+		rela.r_info = READ32 (buf, i)
+		rela.r_addend = READ32 (buf, i)
 #endif
 		r->is_rela = is_rela;
 		r->offset = rela.r_offset;
@@ -2284,11 +2379,11 @@
 	} else {
 		Elf_(Rel) rel;
 #if R_BIN_ELF64
-		rel.r_offset = READ64 (buf + offset, j)
-		rel.r_info = READ64 (buf + offset, j)
+		rel.r_offset = READ64 (buf, i)
+		rel.r_info = READ64 (buf, i)
 #else
-		rel.r_offset = READ32 (buf + offset, j)
-		rel.r_info = READ32 (buf + offset, j)
+		rel.r_offset = READ32 (buf, i)
+		rel.r_info = READ32 (buf, i)
 #endif
 		r->is_rela = is_rela;
 		r->offset = rel.r_offset;
@@ -2301,27 +2396,20 @@
 
 RBinElfReloc* Elf_(r_bin_elf_get_relocs)(ELFOBJ *bin) {
 	int res, rel, rela, i, j;
-	size_t reloc_num = 0;
 	RBinElfReloc *ret = NULL;
 
 	if (!bin || !bin->g_sections) {
 		return NULL;
 	}
-	reloc_num = get_relocs_num (bin);
+	size_t reloc_num = get_relocs_num (bin);
 	if (!reloc_num)	{
 		return NULL;
 	}
 	bin->reloc_num = reloc_num;
-	ret = (RBinElfReloc*)calloc ((size_t)reloc_num + 1, sizeof(RBinElfReloc));
+	ret = (RBinElfReloc*)calloc ((size_t)reloc_num + 1, sizeof (RBinElfReloc));
 	if (!ret) {
 		return NULL;
 	}
-#if DEAD_CODE
-	ut64 section_text_offset = Elf_(r_bin_elf_get_section_offset) (bin, ".text");
-	if (section_text_offset == -1) {
-		section_text_offset = 0;
-	}
-#endif
 	for (i = 0, rel = 0; !bin->g_sections[i].last && rel < reloc_num ; i++) {
 		bool is_rela = 0 == strncmp (bin->g_sections[i].name, ".rela.", strlen (".rela."));
 		bool is_rel  = 0 == strncmp (bin->g_sections[i].name, ".rel.",  strlen (".rel."));
@@ -2414,8 +2502,9 @@
 	int i, num_sections = 0;
 	ut64 reldyn = 0, relava = 0, pltgotva = 0, relva = 0;
 	ut64 reldynsz = 0, relasz = 0, pltgotsz = 0;
-	if (!bin || !bin->phdr || !bin->ehdr.e_phnum)
+	if (!bin || !bin->phdr || !bin->ehdr.e_phnum) {
 		return NULL;
+	}
 
 	for (i = 0; i < bin->dyn_entries; i++) {
 		switch (bin->dyn_buf[i].d_tag) {
@@ -2548,37 +2637,43 @@
 	return ret;
 }
 
-static void fill_symbol_bind_and_type (struct r_bin_elf_symbol_t *ret, Elf_(Sym) *sym) {
-	#define s_bind(x) ret->bind = x
-	#define s_type(x) ret->type = x
+static const char *bind2str(Elf_(Sym) *sym) {
 	switch (ELF_ST_BIND(sym->st_info)) {
-	case STB_LOCAL:  s_bind ("LOCAL"); break;
-	case STB_GLOBAL: s_bind ("GLOBAL"); break;
-	case STB_WEAK:   s_bind ("WEAK"); break;
-	case STB_NUM:    s_bind ("NUM"); break;
-	case STB_LOOS:   s_bind ("LOOS"); break;
-	case STB_HIOS:   s_bind ("HIOS"); break;
-	case STB_LOPROC: s_bind ("LOPROC"); break;
-	case STB_HIPROC: s_bind ("HIPROC"); break;
-	default:         s_bind ("UNKNOWN");
+	case STB_LOCAL:  return R_BIN_BIND_LOCAL_STR;
+	case STB_GLOBAL: return R_BIN_BIND_GLOBAL_STR;
+	case STB_WEAK:   return R_BIN_BIND_WEAK_STR;
+	case STB_NUM:    return R_BIN_BIND_NUM_STR;
+	case STB_LOOS:   return R_BIN_BIND_LOOS_STR;
+	case STB_HIOS:   return R_BIN_BIND_HIOS_STR;
+	case STB_LOPROC: return R_BIN_BIND_LOPROC_STR;
+	case STB_HIPROC: return R_BIN_BIND_HIPROC_STR;
+	default:         return R_BIN_BIND_UNKNOWN_STR;
 	}
+}
+
+static const char *type2str(Elf_(Sym) *sym) {
 	switch (ELF_ST_TYPE (sym->st_info)) {
-	case STT_NOTYPE:  s_type ("NOTYPE"); break;
-	case STT_OBJECT:  s_type ("OBJECT"); break;
-	case STT_FUNC:    s_type ("FUNC"); break;
-	case STT_SECTION: s_type ("SECTION"); break;
-	case STT_FILE:    s_type ("FILE"); break;
-	case STT_COMMON:  s_type ("COMMON"); break;
-	case STT_TLS:     s_type ("TLS"); break;
-	case STT_NUM:     s_type ("NUM"); break;
-	case STT_LOOS:    s_type ("LOOS"); break;
-	case STT_HIOS:    s_type ("HIOS"); break;
-	case STT_LOPROC:  s_type ("LOPROC"); break;
-	case STT_HIPROC:  s_type ("HIPROC"); break;
-	default:          s_type ("UNKNOWN");
+	case STT_NOTYPE:  return R_BIN_TYPE_NOTYPE_STR;
+	case STT_OBJECT:  return R_BIN_TYPE_OBJECT_STR;
+	case STT_FUNC:    return R_BIN_TYPE_FUNC_STR;
+	case STT_SECTION: return R_BIN_TYPE_SECTION_STR;
+	case STT_FILE:    return R_BIN_TYPE_FILE_STR;
+	case STT_COMMON:  return R_BIN_TYPE_COMMON_STR;
+	case STT_TLS:     return R_BIN_TYPE_TLS_STR;
+	case STT_NUM:     return R_BIN_TYPE_NUM_STR;
+	case STT_LOOS:    return R_BIN_TYPE_LOOS_STR;
+	case STT_HIOS:    return R_BIN_TYPE_HIOS_STR;
+	case STT_LOPROC:  return R_BIN_TYPE_LOPROC_STR;
+	case STT_HIPROC:  return R_BIN_TYPE_HIPROC_STR;
+	default:          return R_BIN_TYPE_UNKNOWN_STR;
 	}
 }
 
+static void fill_symbol_bind_and_type (struct r_bin_elf_symbol_t *ret, Elf_(Sym) *sym) {
+	ret->bind = bind2str (sym);
+	ret->type = type2str (sym);
+}
+
 static RBinElfSymbol* get_symbols_from_phdr(ELFOBJ *bin, int type) {
 	Elf_(Sym) *sym = NULL;
 	Elf_(Addr) addr_sym_table = 0;
@@ -2670,24 +2765,29 @@
 		sym[i].st_other = READ8 (s, j);
 		sym[i].st_shndx = READ16 (s, j);
 #endif
+		bool is_sht_null = false;
 		// zero symbol is always empty
 		// Examine entry and maybe store
-		if (type == R_BIN_ELF_IMPORTS && sym[i].st_shndx == STN_UNDEF) {
+		if (type == R_BIN_ELF_IMPORTS && sym[i].st_shndx == SHT_NULL) {
 			if (sym[i].st_value) {
 				toffset = sym[i].st_value;
 			} else if ((toffset = get_import_addr (bin, i)) == -1){
 				toffset = 0;
 			}
 			tsize = 16;
-		} else if (type == R_BIN_ELF_SYMBOLS &&
-		           sym[i].st_shndx != STN_UNDEF &&
-		           ELF_ST_TYPE (sym[i].st_info) != STT_SECTION &&
-		           ELF_ST_TYPE (sym[i].st_info) != STT_FILE) {
+		} else if (type == R_BIN_ELF_SYMBOLS) {
 			tsize = sym[i].st_size;
 			toffset = (ut64) sym[i].st_value;
+			is_sht_null = sym[i].st_shndx == SHT_NULL;
 		} else {
 			continue;
 		}
+		// since we don't know the size of the sym table in this case,
+		// let's stop at the first invalid entry
+		if (!strcmp (bind2str (&sym[i]), R_BIN_BIND_UNKNOWN_STR) ||
+		    !strcmp (type2str (&sym[i]), R_BIN_TYPE_UNKNOWN_STR)) {
+			goto done;
+		}
 		tmp_offset = Elf_(r_bin_elf_v2p) (bin, toffset);
 		if (tmp_offset > bin->size) {
 			goto done;
@@ -2715,6 +2815,7 @@
 		ret[ret_ctr].in_shdr = false;
 		ret[ret_ctr].name[ELF_STRING_LENGTH - 2] = '\0';
 		fill_symbol_bind_and_type (&ret[ret_ctr], &sym[i]);
+		ret[ret_ctr].is_sht_null = is_sht_null;
 		ret[ret_ctr].last = 0;
 		ret_ctr++;
 	}
@@ -2748,7 +2849,7 @@
 		bin->symbols_by_ord_size = ret_ctr + 1;
 		if (ret_ctr > 0) {
 			bin->symbols_by_ord = (RBinSymbol * *) calloc (ret_ctr + 1, sizeof (RBinSymbol*));
-		}else {
+		} else {
 			bin->symbols_by_ord = NULL;
 		}
 	}
@@ -2782,12 +2883,16 @@
 	return bin->phdr_imports;
 }
 
+static RBinElfSymbol *Elf_(get_phdr_symbols)(ELFOBJ *bin, int type) {
+	return (type == R_BIN_ELF_SYMBOLS)
+		? Elf_(r_bin_elf_get_phdr_symbols) (bin)
+		: Elf_(r_bin_elf_get_phdr_imports) (bin);
+}
+
 static int Elf_(fix_symbols)(ELFOBJ *bin, int nsym, int type, RBinElfSymbol **sym) {
 	int count = 0;
 	RBinElfSymbol *ret = *sym;
-	RBinElfSymbol *phdr_symbols = (type == R_BIN_ELF_SYMBOLS)
-				? Elf_(r_bin_elf_get_phdr_symbols) (bin)
-				: Elf_(r_bin_elf_get_phdr_imports) (bin);
+	RBinElfSymbol *phdr_symbols = Elf_(get_phdr_symbols) (bin, type);
 	RBinElfSymbol *tmp, *p;
 	if (phdr_symbols) {
 		RBinElfSymbol *d = ret;
@@ -2849,9 +2954,7 @@
 	char *strtab = NULL;
 
 	if (!bin || !bin->shdr || !bin->ehdr.e_shnum || bin->ehdr.e_shnum == 0xffff) {
-		return (type == R_BIN_ELF_SYMBOLS)
-				? Elf_(r_bin_elf_get_phdr_symbols) (bin)
-				: Elf_(r_bin_elf_get_phdr_imports) (bin);
+		return Elf_(get_phdr_symbols) (bin, type);
 	}
 	if (!UT32_MUL (&shdr_size, bin->ehdr.e_shnum, sizeof (Elf_(Shdr)))) {
 		return false;
@@ -2903,6 +3006,17 @@
 			if (nsym < 0) {
 				goto beach;
 			}
+			{
+				ut64 sh_begin = bin->shdr[i].sh_offset;
+				ut64 sh_end = sh_begin + bin->shdr[i].sh_size;
+				if (sh_begin > bin->size) {
+					goto beach;
+				}
+				if (sh_end > bin->size) {
+					st64 newshsize = bin->size - sh_begin;
+					nsym = (int)(newshsize / sizeof (Elf_(Sym)));
+				}
+			}
 			if (!(sym = (Elf_(Sym) *)calloc (nsym, sizeof (Elf_(Sym))))) {
 				bprintf ("calloc (syms)");
 				goto beach;
@@ -2949,6 +3063,7 @@
 				goto beach;
 			}
 			for (k = 1, ret_ctr = 0; k < nsym; k++) {
+				bool is_sht_null = false;
 				if (type == R_BIN_ELF_IMPORTS && sym[k].st_shndx == STN_UNDEF) {
 					if (sym[k].st_value) {
 						toffset = sym[k].st_value;
@@ -2956,13 +3071,10 @@
 						toffset = 0;
 					}
 					tsize = 16;
-				} else if (type == R_BIN_ELF_SYMBOLS &&
-					   sym[k].st_shndx != STN_UNDEF &&
-					   ELF_ST_TYPE (sym[k].st_info) != STT_SECTION &&
-					   ELF_ST_TYPE (sym[k].st_info) != STT_FILE) {
-					//int idx = sym[k].st_shndx;
+				} else if (type == R_BIN_ELF_SYMBOLS) {
 					tsize = sym[k].st_size;
 					toffset = (ut64)sym[k].st_value; 
+					is_sht_null = sym[k].st_shndx == SHT_NULL;
 				} else {
 					continue;
 				}
@@ -2991,6 +3103,7 @@
 				ret[ret_ctr].ordinal = k;
 				ret[ret_ctr].name[ELF_STRING_LENGTH - 2] = '\0';
 				fill_symbol_bind_and_type (&ret[ret_ctr], &sym[k]);
+				ret[ret_ctr].is_sht_null = is_sht_null;
 				ret[ret_ctr].last = 0;
 				ret_ctr++;
 			}
@@ -3000,9 +3113,7 @@
 		}
 	}
 	if (!ret) {
-		return (type == R_BIN_ELF_SYMBOLS)
-				? Elf_(r_bin_elf_get_phdr_symbols) (bin)
-				: Elf_(r_bin_elf_get_phdr_imports) (bin);
+		return Elf_(get_phdr_symbols) (bin, type);
 	}
 	int max = -1;
 	RBinElfSymbol *aux = NULL;
@@ -3219,3 +3330,128 @@
 	}
 	return vaddr;
 }
+
+static bool get_nt_file_maps (ELFOBJ *bin, RList *core_maps) {
+	ut16 ph_num = bin->ehdr.e_phnum;
+	ut16 ph;
+
+	for (ph = 0; ph < ph_num; ph++) {
+		Elf_(Phdr) *p = &bin->phdr[ph];
+		if (p->p_type == PT_NOTE) {
+			int bits = Elf_(r_bin_elf_get_bits)(bin);
+			int elf_nhdr_size = (bits == 64) ? sizeof (Elf64_Nhdr) : sizeof (Elf32_Nhdr);
+			int size_of = (bits == 64) ? sizeof (ut64) : sizeof (ut32);
+			void *elf_nhdr = calloc (elf_nhdr_size, 1);
+			ut64 offset = 0;
+			bool found = false;
+
+			while (!found) {
+				int ret;
+				ut32 n_descsz, n_namesz, n_type;
+				ret = r_buf_read_at (bin->b,
+						bin->phdr[ph].p_offset + offset,
+						elf_nhdr, elf_nhdr_size);
+				if (ret != elf_nhdr_size) {
+					eprintf ("Cannot read more NOTES header from CORE\n");
+					free (elf_nhdr);
+					goto fail;
+				}
+				if (bits == 64) {
+					n_descsz = round_up (((Elf64_Nhdr *)elf_nhdr)->n_descsz);
+					n_namesz = round_up (((Elf64_Nhdr *)elf_nhdr)->n_namesz);
+					n_type = ((Elf64_Nhdr *)elf_nhdr)->n_type;
+				} else {
+					n_descsz = round_up (((Elf32_Nhdr *)elf_nhdr)->n_descsz);
+					n_namesz = round_up (((Elf32_Nhdr *)elf_nhdr)->n_namesz);
+					n_type = ((Elf32_Nhdr *)elf_nhdr)->n_type;
+				}
+
+				if (n_type == NT_FILE) {
+					found = true;
+					offset += elf_nhdr_size + n_namesz;
+					free (elf_nhdr);
+				} else {
+					offset += elf_nhdr_size + n_descsz + n_namesz;
+				}
+			}
+			ut64 i = bin->phdr[ph].p_offset + offset;
+			ut64 n_maps;
+			if (bits == 64) {
+				n_maps = BREAD64 (bin->b, i);
+				(void)BREAD64 (bin->b, i);
+			} else {
+				n_maps = BREAD32 (bin->b, i);
+				(void)BREAD32 (bin->b, i);
+			}
+			ut64 jump = ((size_of * 3) * n_maps) + i;
+			int len_str = 0;
+			while (n_maps > 0) {
+				ut64 addr;
+				char str[512] = {0};
+				if (bits == 64) {
+					addr = BREAD64 (bin->b, i);
+				} else {
+					addr = BREAD32 (bin->b, i);
+				}
+				if (addr == UT64_MAX) {
+					eprintf ("ffbreak\n");
+					break;
+				}
+				r_buf_read_at (bin->b, jump + len_str,
+					(ut8*)str, sizeof (str) -1);
+				str[sizeof(str) -1] = 0; // null terminate string
+				RListIter *iter;
+				RBinMap *p;
+				r_list_foreach (core_maps, iter, p) {
+					if (p->addr == addr) {
+						p->file = strdup (str);
+					 }
+				}
+				len_str += strlen (str) + 1;
+				n_maps--;
+				i += (size_of * 2);
+			}
+		}
+	}
+
+	return true;
+fail:
+	return false;
+}
+
+static void r_bin_elf_map_free (RBinMap *map) {
+	if (map) {
+		free (map->file);
+		free (map);
+	}
+}
+
+RList *Elf_(r_bin_elf_get_maps)(ELFOBJ *bin) {
+	ut16 ph, ph_num = bin->ehdr.e_phnum; //Skip PT_NOTE
+	if (!bin->phdr) {
+		return NULL;
+	}
+	RList *maps = r_list_newf ((RListFree)r_bin_elf_map_free);
+	for (ph = 0; ph < ph_num; ph++) {
+		Elf_(Phdr) *p = &bin->phdr[ph];
+		if (p->p_type == PT_LOAD) {
+			RBinMap *map = R_NEW0 (RBinMap);
+			if (map) {
+				map->addr = p->p_vaddr;
+				map->size = p->p_memsz;
+				map->perms = p->p_flags;
+				map->offset = p->p_offset;
+				map->file = NULL;
+				r_list_append (maps, map);
+			}
+		}
+	}
+
+	if (!r_list_empty (maps)) {
+		if (!get_nt_file_maps (bin, maps)) {
+			eprintf ("Could not retrieve the names of all maps from NT_FILE\n");
+		}
+	}
+
+	return maps;
+}
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/elf/elf.h radare2-2.8.0+dfsg/libr/bin/format/elf/elf.h
--- radare2-2.3.0+dfsg/libr/bin/format/elf/elf.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/elf/elf.h	2018-08-07 14:12:36.000000000 +0000
@@ -38,6 +38,7 @@
 	char name[ELF_STRING_LENGTH];
 	int last;
 	bool in_shdr;
+	bool is_sht_null;
 } RBinElfSymbol;
 
 typedef struct r_bin_elf_reloc_t {
@@ -155,5 +156,6 @@
 int Elf_(r_bin_elf_has_relro)(struct Elf_(r_bin_elf_obj_t) *bin);
 int Elf_(r_bin_elf_has_nx)(struct Elf_(r_bin_elf_obj_t) *bin);
 ut8 *Elf_(r_bin_elf_grab_regstate)(struct Elf_(r_bin_elf_obj_t) *bin, int *len);
+RList *Elf_(r_bin_elf_get_maps)(ELFOBJ *bin);
 
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/elf/elf_write.c radare2-2.8.0+dfsg/libr/bin/format/elf/elf_write.c
--- radare2-2.3.0+dfsg/libr/bin/format/elf/elf_write.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/elf/elf_write.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2017 pancake, nibble */
+/* radare - LGPL - Copyright 2010-2018 pancake, nibble */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -66,39 +66,39 @@
 				perror ("malloc");
 				return 0;
 			}
-			if (r_buf_read_at (bin->b, shdrp->sh_offset, (ut8*)rel, shdrp->sh_size) == -1)
+			if (r_buf_read_at (bin->b, shdrp->sh_offset, (ut8*)rel, shdrp->sh_size) == -1) {
 				perror("read (rel)");
-
+			}
 			for (j = 0, relp = rel; j < shdrp->sh_size; j += sizeof(Elf_(Rel)), relp++) {
 				/* rewrite relp->r_offset */
 				if (relp->r_offset - got_addr + got_offset >= rsz_offset + rsz_osize) {
 					relp->r_offset+=delta;
 					off = shdrp->sh_offset + j;
-					if (r_buf_write_at (bin->b, off, (ut8*)relp, sizeof (Elf_(Rel))) == -1)
+					if (r_buf_write_at (bin->b, off, (ut8*)relp, sizeof (Elf_(Rel))) == -1) {
 						perror("write (imports)");
+					}
 				}
 			}
 			free(rel);
 			break;
 		} else if (!strcmp (&strtab[shdrp->sh_name], ".rela.plt")) {
 			Elf_(Rela) *rel, *relp;
-			rel = (Elf_(Rela) *)malloc (1+shdrp->sh_size);
+			rel = (Elf_(Rela) *)malloc (shdrp->sh_size + 1);
 			if (!rel) {
 				perror("malloc");
 				return 0;
 			}
-
-			if (r_buf_read_at (bin->b, shdrp->sh_offset, (ut8*)rel, shdrp->sh_size) == -1)
+			if (r_buf_read_at (bin->b, shdrp->sh_offset, (ut8*)rel, shdrp->sh_size) == -1) {
 				perror("read (rel)");
-
+			}
 			for (j = 0, relp = rel; j < shdrp->sh_size; j += sizeof(Elf_(Rela)), relp++) {
 				/* rewrite relp->r_offset */
 				if (relp->r_offset - got_addr + got_offset >= rsz_offset + rsz_osize) {
 					relp->r_offset+=delta;
 					off = shdrp->sh_offset + j;
-
-					if (r_buf_write_at (bin->b, off, (ut8*)relp, sizeof (Elf_(Rela))) == -1)
+					if (r_buf_write_at (bin->b, off, (ut8*)relp, sizeof (Elf_(Rela))) == -1) {
 						perror("write (imports)");
+					}
 				}
 			}
 			free(rel);
@@ -113,12 +113,14 @@
 			done = 1;
 		} else if (shdrp->sh_offset >= rsz_offset + rsz_osize) {
 			shdrp->sh_offset += delta;
-			if (shdrp->sh_addr) shdrp->sh_addr += delta;
-
+			if (shdrp->sh_addr) {
+				shdrp->sh_addr += delta;
+			}
 		}
 		off = ehdr->e_shoff + i * sizeof (Elf_(Shdr));
-		if (r_buf_write_at (bin->b, off, (ut8*)shdrp, sizeof (Elf_(Shdr))) == -1)
+		if (r_buf_write_at (bin->b, off, (ut8*)shdrp, sizeof (Elf_(Shdr))) == -1) {
 			perror ("write (shdr)");
+		}
 		printf ("-> elf section (%s)\n", &strtab[shdrp->sh_name]);
 	}
 
@@ -142,14 +144,18 @@
 	}
 
 	/* rewrite other elf pointers (entrypoint, phoff, shoff) */
-	if (ehdr->e_entry - bin->baddr >= rsz_offset + rsz_osize)
+	if (ehdr->e_entry - bin->baddr >= rsz_offset + rsz_osize) {
 		ehdr->e_entry += delta;
-	if (ehdr->e_phoff >= rsz_offset + rsz_osize)
+	}
+	if (ehdr->e_phoff >= rsz_offset + rsz_osize) {
 		ehdr->e_phoff += delta;
-	if (ehdr->e_shoff >= rsz_offset + rsz_osize)
+	}
+	if (ehdr->e_shoff >= rsz_offset + rsz_osize) {
 		ehdr->e_shoff += delta;
-	if (r_buf_write_at (bin->b, 0, (ut8*)ehdr, sizeof (Elf_(Ehdr))) == -1)
+	}
+	if (r_buf_write_at (bin->b, 0, (ut8*)ehdr, sizeof (Elf_(Ehdr))) == -1) {
 		perror ("write (ehdr)");
+	}
 
 	/* inverse order to write bodies .. avoid overlapping here */
 	/* XXX Check when delta is negative */
@@ -179,36 +185,40 @@
 	if (!bin->phdr) {
 		return false;
 	}
-	for (i = 0; i < bin->ehdr.e_phnum; i++)
-		if (bin->phdr[i].p_type == PT_DYNAMIC) {
-			if (!(dyn = malloc (bin->phdr[i].p_filesz + 1))) {
-				perror ("malloc (dyn)");
-				return false;
-			}
-			if (r_buf_read_at (bin->b, bin->phdr[i].p_offset, (ut8*)dyn, bin->phdr[i].p_filesz) == -1) {
-				eprintf ("Error: read (dyn)\n");
-				free (dyn);
-				return false;
-			}
-			if ((ndyn = (int)(bin->phdr[i].p_filesz / sizeof (Elf_(Dyn)))) > 0) {
-				for (j = 0; j < ndyn; j++)
-					if (dyn[j].d_tag == DT_STRTAB) {
-						stroff = (ut64)(dyn[j].d_un.d_ptr - bin->baddr);
-						break;
-					}
-				for (j = 0; j < ndyn; j++)
-					if (dyn[j].d_tag == DT_RPATH || dyn[j].d_tag == DT_RUNPATH) {
-						if (r_buf_write_at (bin->b, stroff + dyn[j].d_un.d_val,
-									(ut8*)"", 1) == -1) {
-							eprintf ("Error: write (rpath)\n");
-							free (dyn);
-							return false;
-						}
+	for (i = 0; i < bin->ehdr.e_phnum; i++) {
+		if (bin->phdr[i].p_type != PT_DYNAMIC) {
+			continue;
+		}
+		if (!(dyn = malloc (bin->phdr[i].p_filesz + 1))) {
+			perror ("malloc (dyn)");
+			return false;
+		}
+		if (r_buf_read_at (bin->b, bin->phdr[i].p_offset, (ut8*)dyn, bin->phdr[i].p_filesz) == -1) {
+			eprintf ("Error: read (dyn)\n");
+			free (dyn);
+			return false;
+		}
+		if ((ndyn = (int)(bin->phdr[i].p_filesz / sizeof (Elf_(Dyn)))) > 0) {
+			for (j = 0; j < ndyn; j++) {
+				if (dyn[j].d_tag == DT_STRTAB) {
+					stroff = (ut64)(dyn[j].d_un.d_ptr - bin->baddr);
+					break;
+				}
+			}
+			for (j = 0; j < ndyn; j++) {
+				if (dyn[j].d_tag == DT_RPATH || dyn[j].d_tag == DT_RUNPATH) {
+					if (r_buf_write_at (bin->b, stroff + dyn[j].d_un.d_val,
+								(ut8*)"", 1) == -1) {
+						eprintf ("Error: write (rpath)\n");
+						free (dyn);
+						return false;
 					}
+				}
 			}
-			free (dyn);
-			break;
 		}
+		free (dyn);
+		break;
+	}
 	return true;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/mach0/mach0.c radare2-2.8.0+dfsg/libr/bin/format/mach0/mach0.c
--- radare2-2.3.0+dfsg/libr/bin/format/mach0/mach0.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/mach0/mach0.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,11 +1,11 @@
-/* radare - LGPL - Copyright 2010-2017 - nibble, pancake */
+/* radare - LGPL - Copyright 2010-2018 - nibble, pancake */
 
 #include <stdio.h>
 #include <r_types.h>
 #include <r_util.h>
 #include "mach0.h"
 
-#define bprintf if(bin->verbose)eprintf
+#define bprintf if (bin->verbose) eprintf
 
 typedef struct _ulebr {
 	ut8 *p;
@@ -92,7 +92,7 @@
 	ut8 machohdrbytes[sizeof (struct MACH0_(mach_header))] = {0};
 	int len;
 
-	if (r_buf_read_at (bin->b, 0, magicbytes, 4) < 1) {
+	if (r_buf_read_at (bin->b, 0 + bin->header_at, magicbytes, 4) < 1) {
 		return false;
 	}
 	if (r_read_le32 (magicbytes) == 0xfeedface) {
@@ -110,7 +110,7 @@
 	} else {
 		return false; // object files are magic == 0, but body is different :?
 	}
-	len = r_buf_read_at (bin->b, 0, machohdrbytes, sizeof (machohdrbytes));
+	len = r_buf_read_at (bin->b, 0 + bin->header_at, machohdrbytes, sizeof (machohdrbytes));
 	if (len != sizeof (machohdrbytes)) {
 		bprintf ("Error: read (hdr)\n");
 		return false;
@@ -209,7 +209,7 @@
 	i += sizeof (ut32);
 	bin->segs[j].flags = r_read_ble32 (&segcom[i], bin->big_endian);
 
-	sdb_num_set (bin->kv, sdb_fmt (0, "mach0_segment_%d.offset", j), off, 0);
+	sdb_num_set (bin->kv, sdb_fmt ("mach0_segment_%d.offset", j), off, 0);
 	sdb_num_set (bin->kv, "mach0_segments.count", 0, 0);
 	sdb_set (bin->kv, "mach0_segment.format",
 		"xd[16]zxxxxoodx "
@@ -270,7 +270,6 @@
 			memcpy (&bin->sects[k].sectname, &sec[i], 16);
 			i += 16;
 			memcpy (&bin->sects[k].segname, &sec[i], 16);
-			bin->sects[k].segname[15] = 0;
 			i += 16;
 #if R_BIN_MACH064
 			bin->sects[k].addr = r_read_ble64 (&sec[i], bin->big_endian);
@@ -618,16 +617,21 @@
 	ut8 *arw_ptr = NULL;
 	int arw_sz, len = 0;
 	ut8 thc[sizeof (struct thread_command)] = {0};
+	ut8 tmp[4];
 
 	if (off > bin->size || off + sizeof (struct thread_command) > bin->size)
 		return false;
 
 	len = r_buf_read_at (bin->b, off, thc, 8);
-	if (len < 1)
+	if (len < 1) {
 		goto wrong_read;
+	}
 	bin->thread.cmd = r_read_ble32 (&thc[0], bin->big_endian);
 	bin->thread.cmdsize = r_read_ble32 (&thc[4], bin->big_endian);
-	flavor = r_read_ble32 (bin->b->buf + off + sizeof (struct thread_command), bin->big_endian);
+	if (r_buf_read_at (bin->b, off + sizeof (struct thread_command), tmp, 4) < 4) {
+		goto wrong_read;
+	}
+	flavor = r_read_ble32 (tmp, bin->big_endian);
 	if (len == -1)
 		goto wrong_read;
 
@@ -636,8 +640,10 @@
 		return false;
 
 	// TODO: use count for checks
-	count = r_read_ble32 (bin->b->buf + off + sizeof (struct thread_command) + sizeof (flavor),
-				bin->big_endian);
+	if (r_buf_read_at (bin->b, off + sizeof (struct thread_command) + sizeof (flavor), tmp, 4) < 4) {
+		goto wrong_read;
+	}
+	count = r_read_ble32 (tmp, bin->big_endian);
 	ptr_thread = off + sizeof (struct thread_command) + sizeof (flavor) + sizeof (count);
 
 	if (ptr_thread > bin->size)
@@ -813,14 +819,17 @@
 	int lib, len;
 	ut8 sdl[sizeof (struct dylib_command)] = {0};
 
-	if (off > bin->size || off + sizeof (struct dylib_command) > bin->size)
+	if (off > bin->size || off + sizeof (struct dylib_command) > bin->size) {
 		return false;
+	}
 	lib = bin->nlibs - 1;
 
-	if (!(bin->libs = realloc (bin->libs, bin->nlibs * R_BIN_MACH0_STRING_LENGTH))) {
+	void *relibs = realloc (bin->libs, bin->nlibs * R_BIN_MACH0_STRING_LENGTH);
+	if (!relibs) {
 		perror ("realloc (libs)");
 		return false;
 	}
+	bin->libs = relibs;
 	len = r_buf_read_at (bin->b, off, sdl, sizeof (struct dylib_command));
 	if (len < 1) {
 		bprintf ("Error: read (dylib)\n");
@@ -834,10 +843,14 @@
 	dl.dylib.compatibility_version = r_read_ble32 (&sdl[20], bin->big_endian);
 
 	if (off + dl.dylib.name > bin->size ||\
-	  off + dl.dylib.name + R_BIN_MACH0_STRING_LENGTH > bin->size)
+	  off + dl.dylib.name + R_BIN_MACH0_STRING_LENGTH > bin->size) {
 		return false;
+	}
 
-	len = r_buf_read_at (bin->b, off+dl.dylib.name, (ut8*)bin->libs[lib], R_BIN_MACH0_STRING_LENGTH);
+	memset (bin->libs[lib], 0, R_BIN_MACH0_STRING_LENGTH);
+	len = r_buf_read_at (bin->b, off + dl.dylib.name,
+		(ut8*)bin->libs[lib], R_BIN_MACH0_STRING_LENGTH);
+	bin->libs[lib][R_BIN_MACH0_STRING_LENGTH - 1] = 0;
 	if (len < 1) {
 		bprintf ("Error: read (dylib str)");
 		return false;
@@ -921,7 +934,7 @@
 		//return false;
 	}
 	//bprintf ("Commands: %d\n", bin->hdr.ncmds);
-	for (i = 0, off = sizeof (struct MACH0_(mach_header)); \
+	for (i = 0, off = sizeof (struct MACH0_(mach_header)) + bin->header_at; \
 			i < bin->hdr.ncmds; i++, off += lc.cmdsize) {
 		if (off > bin->size || off + sizeof (struct load_command) > bin->size){
 			bprintf ("mach0: out of bounds command\n");
@@ -942,22 +955,22 @@
 		}
 
 		// TODO: a different format for each cmd
-		sdb_num_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.offset", i), off, 0);
-		sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.format", i), "xd cmd size", 0);
+		sdb_num_set (bin->kv, sdb_fmt ("mach0_cmd_%d.offset", i), off, 0);
+		sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.format", i), "xd cmd size", 0);
 
 		//bprintf ("%d\n", lc.cmd);
 		switch (lc.cmd) {
 		case LC_DATA_IN_CODE:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "data_in_code", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "data_in_code", 0);
 			// TODO table of non-instructions in __text
 			break;
 		case LC_RPATH:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "rpath", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "rpath", 0);
 			//bprintf ("--->\n");
 			break;
 		case LC_SEGMENT_64:
 		case LC_SEGMENT:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "segment", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "segment", 0);
 			bin->nsegs++;
 			if (!parse_segments (bin, off)) {
 				bprintf ("error parsing segment\n");
@@ -966,45 +979,45 @@
 			}
 			break;
 		case LC_SYMTAB:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "symtab", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "symtab", 0);
 			if (!parse_symtab (bin, off)) {
 				bprintf ("error parsing symtab\n");
 				return false;
 			}
 			break;
 		case LC_DYSYMTAB:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "dysymtab", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "dysymtab", 0);
 			if (!parse_dysymtab(bin, off)) {
 				bprintf ("error parsing dysymtab\n");
 				return false;
 			}
 			break;
 		case LC_DYLIB_CODE_SIGN_DRS:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "dylib_code_sign_drs", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "dylib_code_sign_drs", 0);
 			//bprintf ("[mach0] code is signed\n");
 			break;
 		case LC_VERSION_MIN_MACOSX:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "version_min_macosx", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "version_min_macosx", 0);
 			bin->os = 1;
 			// set OS = osx
 			//bprintf ("[mach0] Requires OSX >= x\n");
 			break;
 		case LC_VERSION_MIN_IPHONEOS:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "version_min_iphoneos", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "version_min_iphoneos", 0);
 			bin->os = 2;
 			// set OS = ios
 			//bprintf ("[mach0] Requires iOS >= x\n");
 			break;
 		case LC_VERSION_MIN_TVOS:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "version_min_tvos", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "version_min_tvos", 0);
 			bin->os = 4;
 			break;
 		case LC_VERSION_MIN_WATCHOS:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "version_min_watchos", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "version_min_watchos", 0);
 			bin->os = 3;
 			break;
 		case LC_UUID:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "uuid", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "uuid", 0);
 			{
 			struct uuid_command uc = {0};
 			if (off + sizeof (struct uuid_command) > bin->size) {
@@ -1024,7 +1037,7 @@
 		case LC_ENCRYPTION_INFO_64:
 			/* TODO: the struct is probably different here */
 		case LC_ENCRYPTION_INFO:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "encryption_info", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "encryption_info", 0);
 			{
 			struct MACH0_(encryption_info_command) eic = {0};
 			ut8 seic[sizeof (struct MACH0_(encryption_info_command))] = {0};
@@ -1049,7 +1062,7 @@
 			break;
 		case LC_LOAD_DYLINKER:
 			{
-				sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "dylinker", 0);
+				sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "dylinker", 0);
 				free (bin->intrp);
 				bin->intrp = NULL;
 				//bprintf ("[mach0] load dynamic linker\n");
@@ -1085,7 +1098,7 @@
 				ut64 ss;
 			} ep = {0};
 			ut8 sep[2 * sizeof (ut64)] = {0};
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "main", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "main", 0);
 
 			if (!is_first_thread) {
 				bprintf("Error: LC_MAIN with other threads\n");
@@ -1109,13 +1122,13 @@
 			}
 			break;
 		case LC_UNIXTHREAD:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "unixthread", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "unixthread", 0);
 			if (!is_first_thread) {
 				bprintf("Error: LC_UNIXTHREAD with other threads\n");
 				return false;
 			}
 		case LC_THREAD:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "thread", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "thread", 0);
 			if (!parse_thread (bin, &lc, off, is_first_thread)) {
 				bprintf ("Cannot parse thread\n");
 				return false;
@@ -1124,7 +1137,7 @@
 			break;
 		case LC_LOAD_DYLIB:
 		case LC_LOAD_WEAK_DYLIB:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "load_dylib", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "load_dylib", 0);
 			bin->nlibs++;
 			if (!parse_dylib (bin, off)){
 				bprintf ("Cannot parse dylib\n");
@@ -1136,7 +1149,7 @@
 		case LC_DYLD_INFO_ONLY:
 			{
 			ut8 dyldi[sizeof (struct dyld_info_command)] = {0};
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "dyld_info", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "dyld_info", 0);
 			bin->dyld_info = calloc (1, sizeof (struct dyld_info_command));
 			if (bin->dyld_info) {
 				if (off + sizeof (struct dyld_info_command) > bin->size){
@@ -1167,28 +1180,28 @@
 			break;
 		case LC_CODE_SIGNATURE:
 			parse_signature (bin, off);
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "signature", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "signature", 0);
 			/* ut32 dataoff
 			// ut32 datasize */
 			break;
 		case LC_SOURCE_VERSION:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "version", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "version", 0);
 			/* uint64_t  version;  */
 			/* A.B.C.D.E packed as a24.b10.c10.d10.e10 */
 			//bprintf ("mach0: TODO: Show source version\n");
 			break;
 		case LC_SEGMENT_SPLIT_INFO:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "split_info", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "split_info", 0);
 			/* TODO */
 			break;
 		case LC_FUNCTION_STARTS:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "function_starts", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "function_starts", 0);
 			if (!parse_function_starts (bin, off)) {
 				bprintf ("Cannot parse LC_FUNCTION_STARTS\n");
 			}
 			break;
 		case LC_REEXPORT_DYLIB:
-			sdb_set (bin->kv, sdb_fmt (0, "mach0_cmd_%d.cmd", i), "dylib", 0);
+			sdb_set (bin->kv, sdb_fmt ("mach0_cmd_%d.cmd", i), "dylib", 0);
 			/* TODO */
 			break;
 		default:
@@ -1237,14 +1250,30 @@
 	return NULL;
 }
 
-struct MACH0_(obj_t)* MACH0_(mach0_new)(const char* file, bool verbose) {
+void MACH0_(opts_set_default)(struct MACH0_(opts_t) *options, RBinFile * bf) {
+	if (!options) {
+		return;
+	}
+
+	options->header_at = 0;
+	if (bf && bf->rbin) {
+		options->verbose = bf->rbin->verbose;
+	} else {
+		options->verbose = false;
+	}
+}
+
+struct MACH0_(obj_t)* MACH0_(mach0_new)(const char* file, struct MACH0_(opts_t) *options) {
 	ut8 *buf;
 	struct MACH0_(obj_t) *bin;
 	if (!(bin = malloc (sizeof (struct MACH0_(obj_t))))) {
 		return NULL;
 	}
 	memset (bin, 0, sizeof (struct MACH0_(obj_t)));
-	bin->verbose = verbose;
+	if (options) {
+		bin->verbose = options->verbose;
+		bin->header_at = options->header_at;
+	}
 	bin->file = file;
 	if (!(buf = (ut8*)r_file_slurp (file, &bin->size))) {
 		return MACH0_(mach0_free)(bin);
@@ -1264,21 +1293,24 @@
 	return bin;
 }
 
-struct MACH0_(obj_t)* MACH0_(new_buf)(RBuffer *buf, bool verbose) {
+struct MACH0_(obj_t)* MACH0_(new_buf)(RBuffer *buf, struct MACH0_(opts_t) *options) {
+	if (!buf) {
+		return NULL;
+	}
+
+	RBuffer * buf_ref = r_buf_ref (buf);
+
 	struct MACH0_(obj_t) *bin = R_NEW0 (struct MACH0_(obj_t));
 	if (!bin) {
 		return NULL;
 	}
 	bin->kv = sdb_new (NULL, "bin.mach0", 0);
-	bin->size = buf->length;
-	bin->verbose = verbose;
-// 	bin->b = r_buf_ref (buf);
-#if 1
-	bin->b = r_buf_new ();
-	if (!r_buf_set_bytes (bin->b, buf->buf, bin->size)) {
-		return MACH0_(mach0_free) (bin);
+	bin->size = r_buf_size (buf_ref);
+	if (options) {
+		bin->verbose = options->verbose;
+		bin->header_at = options->header_at;
 	}
-#endif
+	bin->b = buf_ref;
 	if (!init (bin)) {
 		return MACH0_(mach0_free)(bin);
 	}
@@ -1297,7 +1329,7 @@
 
 struct section_t* MACH0_(get_sections)(struct MACH0_(obj_t)* bin) {
 	struct section_t *sections;
-	char segname[32], sectname[32];
+	char segname[32], sectname[32], raw_segname[17];
 	int i, j, to;
 
 	if (!bin) {
@@ -1317,7 +1349,8 @@
 			sections[i].vsize = seg->vmsize;
 			sections[i].align = 4096;
 			sections[i].flags = seg->flags;
-			r_str_ncpy (sectname, seg->segname, sizeof (sectname));
+			r_str_ncpy (sectname, seg->segname, 16);
+			sectname[16] = 0;
 			r_str_filter (sectname, -1);
 			// hack to support multiple sections with same name
 			sections[i].srwx = prot2perm (seg->initprot);
@@ -1344,11 +1377,13 @@
 		sections[i].vsize = (ut64)bin->sects[i].size;
 		sections[i].align = bin->sects[i].align;
 		sections[i].flags = bin->sects[i].flags;
-		r_str_ncpy (sectname, bin->sects[i].sectname, sizeof (sectname));
+		r_str_ncpy (sectname, bin->sects[i].sectname, 17);
 		r_str_filter (sectname, -1);
 		// hack to support multiple sections with same name
 		// snprintf (segname, sizeof (segname), "%d", i); // wtf
-		snprintf (segname, sizeof (segname), "%d.%s", i, bin->sects[i].segname);
+		memcpy (raw_segname, bin->sects[i].segname, 16);
+		raw_segname[16] = 0;
+		snprintf (segname, sizeof (segname), "%d.%s", i, raw_segname);
 		for (j = 0; j < bin->nsegs; j++) {
 			if (sections[i].addr >= bin->segs[j].vmaddr &&
 				sections[i].addr < (bin->segs[j].vmaddr + bin->segs[j].vmsize)) {
@@ -1382,10 +1417,17 @@
 	}
 	for (i = 0; i < bin->nsects; i++) {
 		if ((bin->sects[i].flags & SECTION_TYPE) == S_SYMBOL_STUBS && bin->sects[i].reserved2 > 0) {
-			nsyms = (int)(bin->sects[i].size / bin->sects[i].reserved2);
-			if (nsyms > bin->size) {
+			ut64 sect_size = bin->sects[i].size;
+			ut32 sect_fragment = bin->sects[i].reserved2;
+			if (bin->sects[i].offset > bin->size) {
+				bprintf ("mach0: section offset starts way beyond the end of the file\n");
+				continue;
+			}
+			if (sect_size > bin->size) {
 				bprintf ("mach0: Invalid symbol table size\n");
+				sect_size = bin->size - bin->sects[i].offset;
 			}
+			nsyms = (int)(sect_size / sect_fragment);
 			for (j = 0; j < nsyms; j++) {
 				if (bin->sects) {
 					if (bin->sects[i].reserved1 + j >= bin->nindirectsyms) {
@@ -1442,7 +1484,7 @@
 
 static int inSymtab(SdbHash *hash, struct symbol_t *symbols, const char *name, ut64 addr) {
 	bool found;
-	const char *key = sdb_fmt (0, "%s.%"PFMT64x, name, addr);
+	const char *key = sdb_fmt ("%s.%"PFMT64x, name, addr);
 	(void)sdb_ht_find (hash, key, &found);
 	if (found) {
 		return true;
@@ -1572,8 +1614,9 @@
 			bprintf ("mach0-get-symbols: error\n");
 			break;
 		}
-		if (parse_import_stub(bin, &symbols[j], i))
+		if (parse_import_stub(bin, &symbols[j], i)) {
 			symbols[j++].last = 0;
+		}
 	}
 
 #if 1
@@ -1648,12 +1691,16 @@
 
 	for (i = 0; i < bin->nsects; i++) {
 		if ((bin->sects[i].flags & SECTION_TYPE) == stype) {
-			for (j=0, sym=-1; bin->sects[i].reserved1+j < bin->nindirectsyms; j++)
-				if (idx == bin->indirectsyms[bin->sects[i].reserved1 + j]) {
+			for (j = 0, sym = -1; bin->sects[i].reserved1 + j < bin->nindirectsyms; j++) {
+				int indidx = bin->sects[i].reserved1 + j;
+				if (indidx < 0 || indidx >= bin->nindirectsyms) {
+					break;
+				}
+				if (idx == bin->indirectsyms[indidx]) {
 					sym = j;
 					break;
 				}
-
+			}
 			reloc->offset = sym == -1 ? 0 : bin->sects[i].offset + sym * wordsize;
 			reloc->addr = sym == -1 ? 0 : bin->sects[i].addr + sym * wordsize;
 			return true;
@@ -1667,8 +1714,9 @@
 	int i, j, idx, stridx;
 	const char *symstr;
 
-	if (!bin->symtab || !bin->symstr || !bin->sects || !bin->indirectsyms)
+	if (!bin->symtab || !bin->symstr || !bin->sects || !bin->indirectsyms) {
 		return NULL;
+	}
 	if (bin->dysymtab.nundefsym < 1 || bin->dysymtab.nundefsym > 0xfffff) {
 		return NULL;
 	}
@@ -1968,7 +2016,10 @@
 				sdb_num_set (bin->kv, "mach0.entry", entry->offset, 0);
 				entry->addr = (ut64)bin->sects[i].addr;
 				if (!entry->addr) { // workaround for object files
-					entry->addr = entry->offset;
+					eprintf ("entrypoint is 0...\n");
+					// XXX(lowlyw) there's technically not really entrypoints
+					// for .o files, so ignore this...
+					// entry->addr = entry->offset;
 				}
 				break;
 			}
@@ -1981,7 +2032,7 @@
 void MACH0_(kv_loadlibs)(struct MACH0_(obj_t)* bin) {
 	int i;
 	for (i = 0; i < bin->nlibs; i++) {
-		sdb_set (bin->kv, sdb_fmt (0, "libs.%d.name", i), bin->libs[i], 0);
+		sdb_set (bin->kv, sdb_fmt ("libs.%d.name", i), bin->libs[i], 0);
 	}
 }
 
@@ -1996,9 +2047,9 @@
 		return NULL;
 	}
 	for (i = 0; i < bin->nlibs; i++) {
-		sdb_set (bin->kv, sdb_fmt (0, "libs.%d.name", i), bin->libs[i], 0);
+		sdb_set (bin->kv, sdb_fmt ("libs.%d.name", i), bin->libs[i], 0);
 		strncpy (libs[i].name, bin->libs[i], R_BIN_MACH0_STRING_LENGTH);
-		libs[i].name[R_BIN_MACH0_STRING_LENGTH-1] = '\0';
+		libs[i].name[R_BIN_MACH0_STRING_LENGTH - 1] = '\0';
 		libs[i].last = 0;
 	}
 	libs[i].last = 1;
@@ -2372,13 +2423,13 @@
 	if (!mh) {
 		return;
 	}
-	eprintf ("0x00000000  Magic       0x%x\n", mh->magic);
-	eprintf ("0x00000004  CpuType     0x%x\n", mh->cputype);
-	eprintf ("0x00000008  CpuSubType  0x%x\n", mh->cpusubtype);
-	eprintf ("0x0000000c  FileType    0x%x\n", mh->filetype);
-	eprintf ("0x00000010  nCmds       %d\n", mh->ncmds);
-	eprintf ("0x00000014  sizeOfCmds  %d\n", mh->sizeofcmds);
-	eprintf ("0x00000018  Flags       0x%x\n", mh->flags);
+	printf ("0x00000000  Magic       0x%x\n", mh->magic);
+	printf ("0x00000004  CpuType     0x%x\n", mh->cputype);
+	printf ("0x00000008  CpuSubType  0x%x\n", mh->cpusubtype);
+	printf ("0x0000000c  FileType    0x%x\n", mh->filetype);
+	printf ("0x00000010  nCmds       %d\n", mh->ncmds);
+	printf ("0x00000014  sizeOfCmds  %d\n", mh->sizeofcmds);
+	printf ("0x00000018  Flags       0x%x\n", mh->flags);
 
 	ut64 addr = 0x20 - 4;
 	ut32 word = 0;
@@ -2391,7 +2442,7 @@
 		} \
 		word = r_read_le32 (wordbuf);
 	for (n = 0; n < mh->ncmds; n++) {
-		eprintf ("\n# Load Command %d\n", n);
+		printf ("\n# Load Command %d\n", n);
 		READWORD();
 		int lcType = word;
 		eprintf ("0x%08"PFMT64x"  cmd          0x%x %s\n",
@@ -2399,28 +2450,36 @@
 		READWORD();
 		int lcSize = word;
 		word &= 0xFFFFFF;
-		eprintf ("0x%08"PFMT64x"  cmdsize      %d\n", addr, word);
-		if ((int)(lcSize) < 1) {
-			eprintf ("Invalid size\n");
+		printf ("0x%08"PFMT64x"  cmdsize      %d\n", addr, word);
+		if (lcSize < 1) {
+			eprintf ("Invalid size for a load command\n");
 			break;
 		}
 		switch (lcType) {
 		case LC_ID_DYLIB: // install_name_tool
-			eprintf ("0x%08"PFMT64x"  id           %s\n",
+			printf ("0x%08"PFMT64x"  id           %s\n",
 				addr + 20, r_buf_get_at (buf, addr + 20, NULL));
 			break;
 		case LC_UUID:
-			eprintf ("0x%08"PFMT64x"  uuid         %s\n",
+			printf ("0x%08"PFMT64x"  uuid         %s\n",
 				addr + 20, r_buf_get_at (buf, addr + 32, NULL));
 			break;
 		case LC_LOAD_DYLIB:
-			eprintf ("0x%08"PFMT64x"  uuid         %s\n",
+			printf ("0x%08"PFMT64x"  uuid         %s\n",
 				addr + 20, r_buf_get_at (buf, addr + 20, NULL));
 			break;
 		case LC_RPATH:
-			eprintf ("0x%08"PFMT64x"  uuid         %s\n",
+			printf ("0x%08"PFMT64x"  uuid         %s\n",
 				addr + 8, r_buf_get_at (buf, addr + 8, NULL));
 			break;
+		case LC_CODE_SIGNATURE:
+			{
+			ut32 *words = (ut32*)r_buf_get_at (buf, addr + 4, NULL);
+			printf ("0x%08"PFMT64x"  dataoff      0x%08x\n", addr + 4, words[0]);
+			printf ("0x%08"PFMT64x"  datasize     %d\n", addr + 8, words[1]);
+			printf ("# wtf mach0.sign %d @ 0x%x\n", words[1], words[0]);
+			}
+			break;
 		}
 		addr += word - 8;
 	}
@@ -2440,14 +2499,14 @@
 	ut64 addr = 0;
 
 #define ROW(nam,siz,val,fmt) \
-	r_list_append (ret, r_bin_field_new (addr, addr, siz, nam, sdb_fmt (0, "0x%08x", val), fmt)); \
+	r_list_append (ret, r_bin_field_new (addr, addr, siz, nam, sdb_fmt ("0x%08x", val), fmt)); \
 	addr += 4;
-	ROW("hdr.magic", 4, mh->magic, "x");
-	ROW("hdr.cputype", 4, mh->cputype, NULL);
-	ROW("hdr.cpusubtype", 4, mh->cpusubtype, NULL);
-	ROW("hdr.filetype", 4, mh->filetype, NULL);
-	ROW("hdr.ncmds", 4, mh->ncmds, NULL);
-	ROW("hdr.sizeofcmds", 4, mh->sizeofcmds, NULL);
+	ROW ("hdr.magic", 4, mh->magic, "x");
+	ROW ("hdr.cputype", 4, mh->cputype, "x");
+	ROW ("hdr.cpusubtype", 4, mh->cpusubtype, "x");
+	ROW ("hdr.filetype", 4, mh->filetype, "x");
+	ROW ("hdr.nbcmds", 4, mh->ncmds, "x");
+	ROW ("hdr.sizeofcmds", 4, mh->sizeofcmds, "x");
 	free (mh);
 	return ret;
 }
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/mach0/mach0.h radare2-2.8.0+dfsg/libr/bin/format/mach0/mach0.h
--- radare2-2.3.0+dfsg/libr/bin/format/mach0/mach0.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/mach0/mach0.h	2018-08-07 14:12:36.000000000 +0000
@@ -82,6 +82,11 @@
 	struct blob_index_t index[];
 };
 
+struct MACH0_(opts_t) {
+	bool verbose;
+	ut64 header_at;
+};
+
 struct MACH0_(obj_t) {
 	struct MACH0_(mach_header) hdr;
 	struct MACH0_(segment_command)* segs;
@@ -134,10 +139,14 @@
 	int uuidn;
 	int func_size;
 	bool verbose;
+	ut64 header_at;
+	void * user;
+	ut64 (*va2pa)(ut64 p, ut32 *offset, ut32 *left, RBinFile *bf);
 };
 
-struct MACH0_(obj_t)* MACH0_(mach0_new)(const char* file, bool verbose);
-struct MACH0_(obj_t)* MACH0_(new_buf)(struct r_buf_t *buf, bool verbose);
+void MACH0_(opts_set_default)(struct MACH0_(opts_t) *options, RBinFile * bf);
+struct MACH0_(obj_t)* MACH0_(mach0_new)(const char* file, struct MACH0_(opts_t) *options);
+struct MACH0_(obj_t)* MACH0_(new_buf)(RBuffer *buf, struct MACH0_(opts_t) *options);
 void* MACH0_(mach0_free)(struct MACH0_(obj_t)* bin);
 struct section_t* MACH0_(get_sections)(struct MACH0_(obj_t)* bin);
 struct symbol_t* MACH0_(get_symbols)(struct MACH0_(obj_t)* bin);
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/mach0/mach0_specs.h radare2-2.8.0+dfsg/libr/bin/format/mach0/mach0_specs.h
--- radare2-2.3.0+dfsg/libr/bin/format/mach0/mach0_specs.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/mach0/mach0_specs.h	2018-08-07 14:12:36.000000000 +0000
@@ -243,4 +243,50 @@
 	uint32_t pad;
 } cache_img_t;
 
+typedef struct {
+	uint32_t version;
+	uint32_t page_size;
+	uint32_t page_starts_offset;
+	uint32_t page_starts_count;
+	uint32_t page_extras_offset;
+	uint32_t page_extras_count;
+	uint64_t delta_mask;
+	uint64_t value_add;
+} cache_slide2_t;
+
+typedef struct
+{
+	uint32_t version;
+	uint32_t imageExtrasCount;
+	uint32_t imagesExtrasOffset;
+	uint32_t bottomUpListOffset;
+	uint32_t dylibTrieOffset;
+	uint32_t dylibTrieSize;
+	uint32_t initializersOffset;
+	uint32_t initializersCount;
+	uint32_t dofSectionsOffset;
+	uint32_t dofSectionsCount;
+	uint32_t reExportListOffset;
+	uint32_t reExportCount;
+	uint32_t depListOffset;
+	uint32_t depListCount;
+	uint32_t rangeTableOffset;
+	uint32_t rangeTableCount;
+	uint64_t dyldSectionAddr;
+} cache_accel_t;
+
+typedef struct
+{
+	uint64_t exportsTrieAddr;
+	uint64_t weakBindingsAddr;
+	uint32_t exportsTrieSize;
+	uint32_t weakBindingsSize;
+	uint32_t dependentsStartArrayIndex;
+	uint32_t reExportsStartArrayIndex;
+} cache_imgxtr_t;
+
+#define DYLD_CACHE_SLIDE_PAGE_ATTRS 0xC000
+#define DYLD_CACHE_SLIDE_PAGE_ATTR_EXTRA 0x8000
+#define DYLD_CACHE_SLIDE_PAGE_ATTR_NO_REBASE 0x4000
+#define DYLD_CACHE_SLIDE_PAGE_ATTR_END 0x8000
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/mdmp/mdmp.c radare2-2.8.0+dfsg/libr/bin/format/mdmp/mdmp.c
--- radare2-2.3.0+dfsg/libr/bin/format/mdmp/mdmp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/mdmp/mdmp.c	2018-08-07 14:12:36.000000000 +0000
@@ -362,7 +362,7 @@
 	/* We could confirm data sizes but a malcious MDMP will always get around
 	** this! But we can ensure that the data is not outside of the file */
 	if (entry->location.rva + entry->location.data_size > obj->b->length) {
-		eprintf("[ERROR] Size Mismatch - Stream data is larger than file size!\n");
+		eprintf ("[ERROR] Size Mismatch - Stream data is larger than file size!\n");
 		return false;
 	}
 
@@ -377,7 +377,7 @@
 		sdb_num_set (obj->kv, "mdmp_thread_list.offset",
 			entry->location.rva, 0);
 		sdb_set (obj->kv, "mdmp_thread_list.format",
-			sdb_fmt (0, "d[%i]? "
+			sdb_fmt ("d[%i]? "
 				"NumberOfThreads (mdmp_thread)Threads",
 				thread_list->number_of_threads),
 			0);
@@ -401,7 +401,7 @@
 		sdb_num_set (obj->kv, "mdmp_module_list.offset",
 			entry->location.rva, 0);
 		sdb_set (obj->kv, "mdmp_module_list.format",
-			sdb_fmt (0, "d[%i]? "
+			sdb_fmt ("d[%i]? "
 				"NumberOfModule (mdmp_module)Modules",
 				module_list->number_of_modules,
 				0),
@@ -418,7 +418,7 @@
 		sdb_num_set (obj->kv, "mdmp_memory_list.offset",
 			entry->location.rva, 0);
 		sdb_set (obj->kv, "mdmp_memory_list.format",
-			sdb_fmt (0, "d[%i]? "
+			sdb_fmt ("d[%i]? "
 				"NumberOfMemoryRanges "
 				"(mdmp_memory_descriptor)MemoryRanges ",
 				memory_list->number_of_memory_ranges,
@@ -474,7 +474,7 @@
 		sdb_num_set (obj->kv, "mdmp_thread_ex_list.offset",
 			entry->location.rva, 0);
 		sdb_set (obj->kv, "mdmp_thread_ex_list.format",
-			sdb_fmt (0, "d[%i]? NumberOfThreads "
+			sdb_fmt ("d[%i]? NumberOfThreads "
 				"(mdmp_thread_ex)Threads",
 				thread_ex_list->number_of_threads, 0),
 			0);
@@ -490,7 +490,7 @@
 		sdb_num_set (obj->kv, "mdmp_memory64_list.offset",
 			entry->location.rva, 0);
 		sdb_set (obj->kv, "mdmp_memory64_list.format",
-			sdb_fmt (0, "qq[%i]? NumberOfMemoryRanges "
+			sdb_fmt ("qq[%i]? NumberOfMemoryRanges "
 				"BaseRva "
 				"(mdmp_memory_descriptor64)MemoryRanges",
 				memory64_list->number_of_memory_ranges),
@@ -586,7 +586,7 @@
 		sdb_num_set (obj->kv, "mdmp_memory_info_list.offset",
 			entry->location.rva, 0);
 		sdb_set (obj->kv, "mdmp_memory_info_list.format",
-			sdb_fmt (0, "ddq[%i]? SizeOfHeader SizeOfEntry "
+			sdb_fmt ("ddq[%i]? SizeOfHeader SizeOfEntry "
 				"NumberOfEntries (mdmp_memory_info)MemoryInfo",
 				memory_info_list->number_of_entries),
 			0);
@@ -646,10 +646,7 @@
 
 static bool r_bin_mdmp_init_directory(struct r_bin_mdmp_obj *obj) {
 	int i;
-	ut8 *directory_base;
-	struct minidump_directory *entry;
-
-	directory_base = obj->b->buf + obj->hdr->stream_directory_rva;
+	struct minidump_directory entry;
 
 	sdb_num_set (obj->kv, "mdmp_directory.offset",
 			obj->hdr->stream_directory_rva, 0);
@@ -658,9 +655,13 @@
 			"(mdmp_location_descriptor)Location", 0);
 
 	/* Parse each entry in the directory */
+	ut64 rvadir = obj->hdr->stream_directory_rva;
 	for (i = 0; i < (int)obj->hdr->number_of_streams; i++) {
-		entry = (struct minidump_directory *)(directory_base + (i * sizeof (struct minidump_directory)));
-		r_bin_mdmp_init_directory_entry (obj, entry);
+		ut32 delta = i * sizeof (struct minidump_directory);
+		int r = r_buf_read_at (obj->b, rvadir + delta, (ut8*) &entry, sizeof (struct minidump_directory));
+		if (r) {
+			r_bin_mdmp_init_directory_entry (obj, &entry);
+		}
 	}
 
 	return true;
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/mdmp/mdmp_pe.c radare2-2.8.0+dfsg/libr/bin/format/mdmp/mdmp_pe.c
--- radare2-2.3.0+dfsg/libr/bin/format/mdmp/mdmp_pe.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/mdmp/mdmp_pe.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2016 - Davis, Alex Kornitzer */
+/* radare2 - LGPL - Copyright 2016-2018 - Davis, Alex Kornitzer */
 
 #include <r_util.h>
 #include <r_list.h>
@@ -12,28 +12,28 @@
 	RBinAddr *ptr = NULL;
 
 	do {
-		key =  sdb_fmt (0, "pe.tls_callback%d_paddr", count);
+		key = sdb_fmt ("pe.tls_callback%d_paddr", count);
 		paddr = sdb_num_get (bin->kv, key, 0);
 		if (!paddr) {
 			break;
 		}
 
-		key =  sdb_fmt (0, "pe.tls_callback%d_vaddr", count);
+		key = sdb_fmt ("pe.tls_callback%d_vaddr", count);
 		vaddr = sdb_num_get (bin->kv, key, 0);
 		if (!vaddr) {
 			break;
 		}
 
-		key =  sdb_fmt (0, "pe.tls_callback%d_haddr", count);
+		key = sdb_fmt ("pe.tls_callback%d_haddr", count);
 		haddr = sdb_num_get (bin->kv, key, 0);
 		if (!haddr) {
 			break;
 		}
 		if ((ptr = R_NEW0 (RBinAddr))) {
-			ptr->paddr = paddr;
-			ptr->vaddr = vaddr;
-			ptr->haddr = haddr;
-			ptr->type  = R_BIN_ENTRY_TYPE_TLS;
+			ptr->paddr  = paddr;
+			ptr->vaddr  = vaddr;
+			ptr->hpaddr = haddr;
+			ptr->type   = R_BIN_ENTRY_TYPE_TLS;
 			r_list_append (list, ptr);
 		}
 		count++;
@@ -58,10 +58,10 @@
 		if (offset > pe_bin->vaddr) {
 			offset -= pe_bin->vaddr;
 		}
-		ptr->paddr = offset + pe_bin->paddr;
-		ptr->vaddr = offset + pe_bin->vaddr;
-		ptr->haddr = pe_bin->paddr + entry->haddr;
-		ptr->type  = R_BIN_ENTRY_TYPE_PROGRAM;
+		ptr->paddr  = offset + pe_bin->paddr;
+		ptr->vaddr  = offset + pe_bin->vaddr;
+		ptr->hpaddr = pe_bin->paddr + entry->haddr;
+		ptr->type   = R_BIN_ENTRY_TYPE_PROGRAM;
 
 		r_list_append (ret, ptr);
 	}
@@ -91,16 +91,17 @@
 	RBinReloc *rel;
 	RList *ret, *relocs;
 
-	if (!(imports = PE_(r_bin_pe_get_imports) (pe_bin->bin))) {
-		return NULL;
-	}
-	if (!(ret = r_list_new ())) {
-		return NULL;
-	}
-	if (!(relocs = r_list_newf (free))) {
+	imports = PE_(r_bin_pe_get_imports) (pe_bin->bin);
+	ret = r_list_new ();
+	relocs = r_list_newf (free);
+
+	if (!imports || !ret || !relocs) {
+		free (imports);
 		free (ret);
+		free (relocs);
 		return NULL;
 	}
+
 	pe_bin->bin->relocs = relocs;
 	for (i = 0; !imports[i].last; i++) {
 		if (!(ptr = R_NEW0 (RBinImport))) {
@@ -109,7 +110,7 @@
 		filter_import (imports[i].name);
 		ptr->name = strdup ((char*)imports[i].name);
 		ptr->bind = r_str_const ("NONE");
-		ptr->type = r_str_const ("FUNC");
+		ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 		ptr->ordinal = imports[i].ordinal;
 		r_list_append (ret, ptr);
 
@@ -148,7 +149,7 @@
 	if (!(ret = r_list_new ())) {
 		return NULL;
 	}
-	if (!(sections = PE_(r_bin_pe_get_sections) (pe_bin->bin))){
+	if (!pe_bin->bin || !(sections = pe_bin->bin->sections)){
 		r_list_free (ret);
 		return NULL;
 	}
@@ -176,7 +177,7 @@
 		ptr->paddr = sections[i].paddr + pe_bin->paddr;
 		ptr->vaddr = sections[i].vaddr + ba;
 		ptr->add = false;
-		ptr->srwx = R_BIN_SCN_MAP;
+		ptr->srwx = 0;
 		if (R_BIN_PE_SCN_IS_EXECUTABLE (sections[i].flags)) {
 			ptr->srwx |= R_BIN_SCN_EXECUTABLE;
 		}
@@ -200,7 +201,6 @@
 		}
 		r_list_append (ret, ptr);
 	}
-	free (sections);
 	return ret;
 }
 
@@ -228,8 +228,8 @@
 			}
 			ptr->name = strdup ((char *)symbols[i].name);
 			ptr->forwarder = r_str_const ((char *)symbols[i].forwarder);
-			ptr->bind = r_str_const ("GLOBAL");
-			ptr->type = r_str_const ("FUNC");
+			ptr->bind = r_str_const (R_BIN_BIND_GLOBAL_STR);
+			ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 			ptr->size = 0;
 			ptr->vaddr = offset + pe_bin->vaddr;
 			ptr->paddr = symbols[i].paddr + pe_bin->paddr;
@@ -251,7 +251,7 @@
 			}
 			ptr->name = r_str_newf ("imp.%s", imports[i].name);
 			ptr->bind = r_str_const ("NONE");
-			ptr->type = r_str_const ("FUNC");
+			ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 			ptr->size = 0;
 			ptr->vaddr = offset + pe_bin->vaddr;
 			ptr->paddr = imports[i].paddr + pe_bin->paddr;
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/mz/mz.c radare2-2.8.0+dfsg/libr/bin/format/mz/mz.c
--- radare2-2.3.0+dfsg/libr/bin/format/mz/mz.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/mz/mz.c	2018-08-07 14:12:36.000000000 +0000
@@ -36,7 +36,7 @@
 
 // This function reads from the file buffer,
 // thus using endian-agnostic functions
-void trv_segs (const void *seg, const void *segs) {
+static void trv_segs (const void *seg, const void *segs) {
 	const ut8 * const mseg = (const ut8 * const)seg;
 	ut16 ** const msegs = (ut16 **)segs;
 	if (mseg && msegs && *msegs) {
@@ -72,7 +72,7 @@
 #if 1
 	struct btree_node *tree;
 	struct r_bin_mz_segment_t *ret;
-	ut16 *segments, *curr_seg;
+	// ut16 *segments, 
 	int i, num_segs;
 	ut64 paddr;
 	const ut16 first_segment = 0;
@@ -86,21 +86,19 @@
 	for (i = 0; i < num_relocs; i++) {
 		paddr = r_bin_mz_seg_to_paddr (bin, relocs[i].segment) + relocs[i].offset;
 		if ((paddr + 2) < bin->dos_file_size) {
-			curr_seg = (ut16 *)(bin->b->buf + paddr);
+			int left;
+			ut16 *curr_seg = (ut16 *)r_buf_get_at (bin->b, paddr, &left);
 			/* Add segment only if it's located inside dos executable data */
-			if (r_read_le16 (curr_seg) <= last_parag) {
+			if (left >= 2 && r_read_le16 (curr_seg) <= last_parag) {
 				btree_add (&tree, curr_seg, cmp_segs);
 			}
 		}
 	}
 
 	/* Add segment address of first segment to make sure that it will be
-	added. If relocations empty or there isn't first segment in relocations.)
-	*/
+	added. If relocations empty or there isn't first segment in relocations.) */
 	btree_add (&tree, (void *)&first_segment, cmp_segs);
-	/* Add segment address of stack segment if it's resides inside dos
-	executable.
-	*/
+	/* Add segment address of stack segment if it's resides inside dos executable. */
 	if (r_bin_mz_seg_to_paddr (bin, stack_segment) < bin->dos_file_size) {
 		btree_add (&tree, (void *)&stack_segment, cmp_segs);
 	}
@@ -109,13 +107,13 @@
 		btree_cleartree (tree, NULL);
 		return NULL;
 	}
-	segments = calloc (1 + num_relocs, sizeof (*segments));
+	ut16 *segments = calloc (2 + num_relocs, sizeof (*segments));
 	if (!segments) {
 		eprintf ("Error: calloc (segments)\n");
 		btree_cleartree (tree, NULL);
 		return NULL;
 	}
-	curr_seg = segments;
+	ut16 *curr_seg = segments;
 	btree_traverse (tree, 0, &curr_seg, trv_segs);
 	num_segs = curr_seg - segments;
 	ret = calloc (num_segs + 1, sizeof (struct r_bin_mz_segment_t));
@@ -297,3 +295,36 @@
 	}
 	return r_bin_mz_init (bin) ? bin : r_bin_mz_free (bin);
 }
+
+ut64 r_bin_mz_get_main_vaddr(struct r_bin_mz_obj_t *bin) {
+	int entry;
+	int n;
+	ut8 b[512];
+	if (!bin || !bin->b) {
+		return 0LL;
+	}
+	entry = r_bin_mz_get_entrypoint (bin);
+	ZERO_FILL (b);
+	if (r_buf_read_at (bin->b, entry, b, sizeof (b)) < 0) {
+		eprintf ("Warning: Cannot read entry at 0x%08"PFMT32x "\n", (ut32) entry);
+		return 0LL;
+	}
+	// MSVC
+	if (b[0] == 0xb4 && b[1] == 0x30) {
+		// ff 36 XX XX			push	XXXX
+		// ff 36 XX XX			push	argv
+		// ff 36 XX XX			push	argc
+		// 9a XX XX XX XX		lcall	_main
+		// 50				push	ax
+		for (n = 0; n < sizeof (b) - 18; n++) {
+			if (b[n] == 0xff && b[n + 4] == 0xff && b[n + 8] == 0xff && b[n + 12] == 0x9a && b[n + 17] == 0x50) {
+				const ut16 call_addr = r_read_ble16 (b + n + 13, 0);;
+				const ut16 call_seg = r_read_ble16 (b + n + 15, 0);;
+				const ut64 call_dst = r_bin_mz_seg_to_paddr (bin, call_seg) + call_addr;
+				return call_dst;
+			}
+		}
+	}
+
+	return 0LL;
+}
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/mz/mz.h radare2-2.8.0+dfsg/libr/bin/format/mz/mz.h
--- radare2-2.3.0+dfsg/libr/bin/format/mz/mz.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/mz/mz.h	2018-08-07 14:12:36.000000000 +0000
@@ -37,3 +37,4 @@
 void *r_bin_mz_free(struct r_bin_mz_obj_t* bin);
 struct r_bin_mz_obj_t* r_bin_mz_new(const char* file);
 struct r_bin_mz_obj_t* r_bin_mz_new_buf(const struct r_buf_t *buf);
+ut64 r_bin_mz_get_main_vaddr(struct r_bin_mz_obj_t *bin);
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/nxo/nxo.c radare2-2.8.0+dfsg/libr/bin/format/nxo/nxo.c
--- radare2-2.3.0+dfsg/libr/bin/format/nxo/nxo.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/nxo/nxo.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,172 @@
+/* radare - LGPL - Copyright 2018 - rkx1209 */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <r_types.h>
+#include <r_util.h>
+#include <r_lib.h>
+#include <r_bin.h>
+#include "nxo.h"
+
+ut32 readLE32(RBuffer *buf, int off) {
+	int left = 0;
+	const ut8 *data = r_buf_get_at (buf, off, &left);
+	return left > 3? r_read_le32 (data): 0;
+}
+
+ut64 readLE64(RBuffer *buf, int off) {
+	int left = 0;
+	const ut8 *data = r_buf_get_at (buf, off, &left);
+	return left > 7? r_read_le64 (data): 0;
+}
+
+const char *readString(RBuffer *buf, int off) {
+	int left = 0;
+	const char *data = (const char *)r_buf_get_at (buf, off, &left);
+	return left > 0 ? data: NULL;
+}
+
+const char *fileType(const ut8 *buf) {
+	if (!memcmp (buf, "NRO0", 4)) {
+		return "nro0";
+	}
+	if (!memcmp (buf, "NRR0", 4)) {
+		return "nrr0";
+	}
+	if (!memcmp (buf, "MOD0", 4)) {
+		return "mod0";
+	}
+	if (!memcmp (buf, "NSO0", 4)) {
+		return "nso0";
+	}
+	return NULL;
+}
+
+static void walkSymbols (RBuffer *buf, RBinNXOObj *bin, ut64 symtab, ut64 strtab, ut64 strtab_size, ut64 relplt, ut64 baddr) {
+	int i, import = 0;
+	RBinSymbol *sym;
+	RBinImport *imp;
+	for (i = 8; i < 99999; i++) {
+		ut64 addr = readLE64 (buf, symtab + i);
+		ut64 size = readLE64 (buf, symtab + i + 8);
+		i += 16; // NULL, NULL
+		ut64 name = readLE32 (buf, symtab + i);
+		//ut64 type = readLE32 (buf, symtab + i + 4);
+		const char *symName = readString (buf, strtab + name);
+		if (!symName) {
+			break;
+		}
+		sym = R_NEW0 (RBinSymbol);
+		if (!sym) {
+			break;
+		}
+		sym->type = r_str_const (R_BIN_TYPE_FUNC_STR);
+		sym->bind = r_str_const ("NONE");
+		sym->size = size;
+
+		if (addr == 0) {
+			import ++;
+			ut64 pltSym = readLE64 (buf, relplt + (import * 24));
+			imp = R_NEW0 (RBinImport);
+			if (!imp) {
+				R_FREE (sym);
+				break;
+			}
+			imp->name  = strdup (symName);
+			if (!imp->name) {
+				goto out_walk_symbol;
+			}
+			imp->type = r_str_const ("FUNC");
+			if (!imp->type) {
+				goto out_walk_symbol;
+			}
+			imp->bind = r_str_const ("NONE");
+			if (!imp->bind) {
+				goto out_walk_symbol;
+			}
+			imp->ordinal = bin->imports_list->length;
+			r_list_append (bin->imports_list, imp);
+			sym->name = r_str_newf ("imp.%s", symName);
+			if (!sym->name) {
+				goto out_walk_symbol;
+			}
+			sym->paddr = pltSym - 8;
+			sym->vaddr = sym->paddr + baddr;
+			eprintf ("f sym.imp.%s = 0x%"PFMT64x"\n", symName, pltSym - 8);
+		} else {
+			sym->name = strdup (symName);
+			if (!sym->name) {
+				R_FREE (sym);
+				break;
+			}
+			sym->paddr = addr;
+			sym->vaddr = sym->paddr + baddr;
+			eprintf ("f sym.%s %"PFMT64u "0x%"PFMT64x"\n", symName, size, addr);
+		}
+		r_list_append (bin->methods_list, sym);
+		i += 8 - 1;
+	}
+    return;
+
+out_walk_symbol:
+	R_FREE (sym);
+	R_FREE (imp);
+	return;
+}
+
+void parseMod (RBuffer *buf, RBinNXOObj *bin, ut32 mod0, ut64 baddr) {
+	ut32 ptr = readLE32 (buf, mod0);
+	eprintf ("magic %x at 0x%x\n", ptr, mod0);
+	if (ptr == 0x30444f4d) { // MOD0
+		eprintf ("is mode0\n");
+		MODHeader mh = {
+			.magic = readLE32 (buf, mod0),
+			.dynamic = readLE32 (buf, mod0 + 4),
+			.bss_start = readLE32 (buf, mod0 + 8),
+			.bss_end = readLE32 (buf, mod0 + 12),
+			.unwind_start = readLE32 (buf, mod0 + 16),
+			.unwind_end = readLE32 (buf, mod0 + 20),
+			.mod_object = readLE32 (buf, mod0 + 24),
+		};
+		mh.mod_object += mod0;
+		eprintf ("magic 0x%x\n", mh.magic);
+		eprintf ("dynamic 0x%x\n", mh.dynamic);
+		eprintf ("bss 0x%x 0x%x\n", mh.bss_start, mh.bss_end);
+		eprintf ("unwind 0x%x 0x%x\n", mh.unwind_start, mh.unwind_end);
+		eprintf ("-------------\n");
+		eprintf ("mod 0x%x\n", mh.mod_object);
+#define MO_(x) readLE64(buf, mh.mod_object + r_offsetof(MODObject, x))
+		MODObject mo = {
+			.next = MO_(next),
+			.prev = MO_(prev),
+			.relplt = MO_(relplt),
+			.reldyn = MO_(reldyn),
+			.base = MO_(base),
+			.dynamic = MO_(dynamic),
+			.is_rela = MO_(is_rela),
+			.relplt_size = MO_(relplt_size),
+			.init = MO_(init),
+			.fini = MO_(fini),
+			.bucket = MO_(bucket),
+			.chain = MO_(chain),
+			.strtab = MO_(strtab),
+			.symtab = MO_(symtab),
+			.strtab_size = MO_(strtab_size)
+		};
+		eprintf ("next 0x%"PFMT64x"\n", mo.next);
+		eprintf ("prev 0x%"PFMT64x"\n", mo.prev);
+		eprintf ("base 0x%"PFMT64x"\n", mo.base);
+		eprintf ("init 0x%"PFMT64x"\n", mo.init);
+		eprintf ("fini 0x%"PFMT64x"\n", mo.fini);
+		eprintf ("relplt 0x%"PFMT64x"\n", mo.relplt - mo.base);
+		eprintf ("symtab = 0x%"PFMT64x"\n", mo.symtab - mo.base);
+		eprintf ("strtab = 0x%"PFMT64x"\n", mo.strtab - mo.base);
+		eprintf ("strtabsz = 0x%"PFMT64x"\n", mo.strtab_size);
+		//ut32 modo = mh.mod_object;
+		ut64 strtab = mo.strtab - mo.base;
+		ut64 symtab = mo.symtab - mo.base;
+		walkSymbols (buf, bin, symtab, strtab, mo.strtab_size, mo.relplt - mo.base, baddr);
+	}
+}
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/nxo/nxo.h radare2-2.8.0+dfsg/libr/bin/format/nxo/nxo.h
--- radare2-2.3.0+dfsg/libr/bin/format/nxo/nxo.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/nxo/nxo.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,72 @@
+/* radare - LGPL - 2018 - rkx1209 */
+
+#ifndef _NXO_H
+#define _NXO_H
+
+typedef struct {
+	ut32 unused;
+	ut32 mod_memoffset;
+	ut64 padding;
+} NXOStart;
+
+typedef struct {
+	ut32 magic;
+	ut32 dynamic;
+	ut32 bss_start;
+	ut32 bss_end;
+	ut32 unwind_start;
+	ut32 unwind_end;
+	ut32 mod_object;
+} MODHeader;
+
+typedef struct {
+	ut64 next;
+	ut64 prev;
+	ut64 relplt;
+	ut64 reldyn;
+	ut64 base;
+	ut64 dynamic;
+	ut64 is_rela;
+	ut64 relplt_size;
+	ut64 init;
+	ut64 fini;
+	ut64 bucket;
+	ut64 chain;
+	ut64 strtab;
+	ut64 symtab;
+	ut64 strtab_size;
+	ut64 got;
+	ut64 reladyn_size;
+	ut64 reldyn_size;
+	ut64 relcount;
+	ut64 relacount;
+	ut64 nchain;
+	ut64 nbucket;
+	ut64 got_value;
+} MODObject;
+
+typedef struct {
+	ut32 mod_offset;
+	ut32 text_offset;
+	ut32 text_size;
+	ut32 ro_offset;
+	ut32 ro_size;
+	ut32 data_offset;
+	ut32 data_size;
+	ut32 bss_size;
+} MODMeta;
+
+typedef struct {
+	ut32 *strings;
+	RList *methods_list;
+	RList *imports_list;
+	RList *classes_list;
+} RBinNXOObj;
+
+ut32 readLE32(RBuffer *buf, int off);
+ut64 readLE64(RBuffer *buf, int off);
+const char *readString(RBuffer *buf, int off);
+const char *fileType(const ut8 *buf);
+void parseMod (RBuffer *buf, RBinNXOObj *bin, ut32 mod0, ut64 baddr);
+
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/objc/mach0_classes.c radare2-2.8.0+dfsg/libr/bin/format/objc/mach0_classes.c
--- radare2-2.3.0+dfsg/libr/bin/format/objc/mach0_classes.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/objc/mach0_classes.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,8 +1,9 @@
-/* radare - LGPL - Copyright 2015-2016 - inisider */
+/* radare - LGPL - Copyright 2015-2018 - inisider */
 
 #include "mach0_classes.h"
 
 #define RO_META (1 << 0)
+#define MAX_CLASS_NAME_LEN 256
 
 struct MACH0_(SMethodList) {
 	ut32 entsize;
@@ -88,7 +89,6 @@
 static void get_method_list_t(mach0_ut p, RBinFile *bf, char *class_name, RBinClass *klass, bool is_static);
 static void get_protocol_list_t(mach0_ut p, RBinFile *bf, RBinClass *klass);
 static void get_class_ro_t(mach0_ut p, RBinFile *bf, ut32 *is_meta_class, RBinClass *klass);
-static void get_class_t(mach0_ut p, RBinFile *bf, RBinClass *klass, bool dupe);
 static bool is_thumb(RBinFile *bf) {
 	struct MACH0_(obj_t) *bin = (struct MACH0_(obj_t) *)bf->o->bin_obj;
 	if (bin->hdr.cputype == 12) {
@@ -110,6 +110,15 @@
 	if (!obj) {
 		return 0;
 	}
+	if (!obj->bin_obj) {
+		return 0;
+	}
+
+	struct MACH0_(obj_t) *bin = (struct MACH0_(obj_t)*) obj->bin_obj;
+	if (bin->va2pa) {
+		return bin->va2pa (p, offset, left, bf);
+	}
+
 	if (!sctns) {
 		sctns = r_bin_plugin_mach.sections (bf);
 		if (!sctns) {
@@ -278,14 +287,15 @@
 				name = strdup ("some_encrypted_data");
 				left = strlen (name) + 1;
 			} else {
-				name = malloc (left + 1);
-				len = r_buf_read_at (bf->buf, r, (ut8 *)name, left);
+				int name_len = R_MIN (MAX_CLASS_NAME_LEN, left);
+				name = malloc (name_len + 1);
+				len = r_buf_read_at (bf->buf, r, (ut8 *)name, name_len);
 				if (len < 1) {
 					eprintf ("Error reading\n");
 					R_FREE (name);
 					goto error;
 				}
-				name[left] = 0;
+				name[name_len] = 0;
 			}
 			field->name = r_str_newf ("%s::%s%s", klass->name, "(ivar)", name);
 			R_FREE (name);
@@ -305,8 +315,10 @@
 				type = strdup ("some_encrypted_data");
 			// 	left = strlen (name) + 1;
 			} else {
-				type = calloc (1, left);
-				r_buf_read_at (bf->buf, r, (ut8 *)type, left);
+				int type_len = R_MIN (MAX_CLASS_NAME_LEN, left);
+				type = calloc (1, type_len + 1);
+				r_buf_read_at (bf->buf, r, (ut8 *)type, type_len);
+				type[type_len] = 0;
 			}
       			field->type = strdup (type);
 			R_FREE (type);
@@ -419,11 +431,12 @@
 				name = strdup ("some_encrypted_data");
 				left = strlen (name) + 1;
 			} else {
-				name = calloc (1, left + 1);
+				int name_len = R_MIN (MAX_CLASS_NAME_LEN, left);
+				name = calloc (1, name_len + 1);
 				if (!name) {
 					goto error;
 				}
-				if (r_buf_read_at (bf->buf, r, (ut8 *)name, left) != left) {
+				if (r_buf_read_at (bf->buf, r, (ut8 *)name, name_len) != name_len) {
 					goto error;
 				}
 			}
@@ -561,9 +574,10 @@
 				name = strdup ("some_encrypted_data");
 				left = strlen (name) + 1;
 			} else {
-				name = malloc (left + 1);
-				len = r_buf_read_at (bf->buf, r, (ut8 *)name, left);
-				name[left] = 0;
+				int name_len = R_MIN (MAX_CLASS_NAME_LEN, left);
+				name = malloc (name_len + 1);
+				len = r_buf_read_at (bf->buf, r, (ut8 *)name, name_len);
+				name[name_len] = 0;
 				if (len < 1) {
 					goto error;
 				}
@@ -583,7 +597,7 @@
 				rtype = strdup ("some_encrypted_data");
 				left = strlen (rtype) + 1;
 			} else {
-        			left = 1;
+				left = 1;
 				rtype = malloc (left + 1);
 				if (!rtype) {
 					goto error;
@@ -599,7 +613,7 @@
 		}
 
 		method->vaddr = m.imp;
-		method->type = is_static ? "FUNC" : "METH";
+		method->type = is_static ? R_BIN_TYPE_FUNC_STR : "METH";
 		if (is_static) {
 			method->method_flags |= R_BIN_METH_CLASS;
 		}
@@ -743,15 +757,16 @@
 				name = strdup ("some_encrypted_data");
 				left = strlen (name) + 1;
 			} else {
-				name = malloc (left + 1);
+				int name_len = R_MIN (MAX_CLASS_NAME_LEN, left);
+				name = malloc (name_len + 1);
 				if (!name) {
 					return;
 				}
-				if (r_buf_read_at (bf->buf, r, (ut8 *)name, left) != left) {
+				if (r_buf_read_at (bf->buf, r, (ut8 *)name, name_len) != name_len) {
 					R_FREE (name);
 					return;
 				}
-				name[left] = 0;
+				name[name_len] = 0;
 			}
 			class_name = r_str_newf ("%s::%s%s", klass->name, "(protocol)", name);
 			R_FREE (name);
@@ -880,10 +895,11 @@
 			klass->name = strdup ("some_encrypted_data");
 			left = strlen (klass->name) + 1;
 		} else {
-			char *name = malloc (left + 1);
+			int name_len = R_MIN (MAX_CLASS_NAME_LEN, left);
+			char *name = malloc (name_len + 1);
 			if (name) {
-				int rc = r_buf_read_at (bf->buf, r, (ut8 *)name, left);
-				if (rc != left) {
+				int rc = r_buf_read_at (bf->buf, r, (ut8 *)name, name_len);
+				if (rc != name_len) {
 					rc = 0;
 				}
 				name[rc] = 0;
@@ -892,12 +908,12 @@
 			}
 		}
 		//eprintf ("0x%x  %s\n", s, klass->name);
-		sdb_num_set (bin->kv, sdb_fmt (0, "objc_class_%s.offset", klass->name), s, 0);
+		sdb_num_set (bin->kv, sdb_fmt ("objc_class_%s.offset", klass->name), s, 0);
 	}
 #ifdef R_BIN_MACH064
-	sdb_set (bin->kv, sdb_fmt (0, "objc_class.format", 0), "lllll isa super cache vtable data", 0);
+	sdb_set (bin->kv, sdb_fmt ("objc_class.format", 0), "lllll isa super cache vtable data", 0);
 #else
-	sdb_set (bin->kv, sdb_fmt (0, "objc_class.format", 0), "xxxxx isa super cache vtable data", 0);
+	sdb_set (bin->kv, sdb_fmt ("objc_class.format", 0), "xxxxx isa super cache vtable data", 0);
 #endif
 
 	if (cro.baseMethods > 0) {
@@ -926,7 +942,7 @@
 	return 0;
 }
 
-static void get_class_t(mach0_ut p, RBinFile *bf, RBinClass *klass, bool dupe) {
+void MACH0_(get_class_t)(mach0_ut p, RBinFile *bf, RBinClass *klass, bool dupe) {
 	struct MACH0_(SClass) c = { 0 };
 	const int size = sizeof (struct MACH0_(SClass));
 	mach0_ut r = 0;
@@ -984,7 +1000,7 @@
 	if (!is_meta_class && !dupe) {
 		mach0_ut isa_n_value = get_isa_value ();
 		ut64 tmp = klass->addr;
-		get_class_t (c.isa + isa_n_value, bf, klass, true);
+		MACH0_(get_class_t) (c.isa + isa_n_value, bf, klass, true);
 		klass->addr = tmp;
 	}
 }
@@ -1029,8 +1045,6 @@
 	RList /*<RBinClass>*/ *ret = NULL;
 	ut64 num_of_unnamed_class = 0;
 	RBinClass *klass = NULL;
-	RListIter *iter = NULL;
-	RBinSection *s = NULL;
 	RBinObject *obj = bf ? bf->o : NULL;
 	ut32 i = 0, size = 0;
 	RList *sctns = NULL;
@@ -1039,6 +1053,7 @@
 	ut32 left = 0;
 	int len;
 	ut64 paddr;
+	ut64 s_size;
 	bool bigendian;
 	ut8 pp[sizeof (mach0_ut)] = {0};
 
@@ -1051,19 +1066,23 @@
 	// ret = parse_swift_classes (bf);
 
 	// sebfing of section with name __objc_classlist
-	if (!(sctns = r_bin_plugin_mach.sections (bf))) {
-		// retain just for debug
-		// eprintf ("there is no sections\n");
+
+	struct section_t *sections = NULL;
+	if (!(sections = MACH0_(get_sections) (obj->bin_obj))) {
 		return ret;
 	}
 
-	r_list_foreach (sctns, iter, s) {
-		if (strstr (s->name, "__objc_classlist") != NULL) {
+	for (i = 0; !sections[i].last; i++) {
+		if (strstr (sections[i].name, "__objc_classlist")) {
 			is_found = true;
+			paddr = sections[i].offset;
+			s_size = sections[i].size;
 			break;
 		}
 	}
 
+	R_FREE (sections);
+
 	if (!is_found) {
 		// retain just for debug
 		// eprintf ("there is no section __objc_classlist\n");
@@ -1077,9 +1096,8 @@
 		goto get_classes_error;
 	}
 	// start of getting information about each class in file
-	paddr = s->paddr - obj->boffset;
-	for (i = 0; i < s->size; i += sizeof (mach0_ut)) {
-		left = s->size - i;
+	for (i = 0; i < s_size; i += sizeof (mach0_ut)) {
+		left = s_size - i;
 		if (left < sizeof (mach0_ut)) {
 			eprintf ("Chopped classlist data\n");
 			break;
@@ -1111,7 +1129,7 @@
 			goto get_classes_error;
 		}
 		p = r_read_ble (&pp[0], bigendian, 8 * sizeof (mach0_ut));
-		get_class_t (p, bf, klass, false);
+		MACH0_(get_class_t) (p, bf, klass, false);
 		if (!klass->name) {
 			klass->name = r_str_newf ("UnnamedClass%" PFMT64d, num_of_unnamed_class);
 			if (!klass->name) {
@@ -1121,7 +1139,6 @@
 		}
 		r_list_append (ret, klass);
 	}
-	r_list_free (sctns);
 	return ret;
 
 get_classes_error:
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/objc/mach0_classes.h radare2-2.8.0+dfsg/libr/bin/format/objc/mach0_classes.h
--- radare2-2.3.0+dfsg/libr/bin/format/objc/mach0_classes.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/objc/mach0_classes.h	2018-08-07 14:12:36.000000000 +0000
@@ -18,5 +18,6 @@
 #define MACH0_CLASSES_H
 
 R_API RList* MACH0_(parse_classes)(RBinFile *bf);
+R_API void MACH0_(get_class_t)(mach0_ut p, RBinFile *bf, RBinClass *klass, bool dupe);
 
 #endif // MACH0_CLASSES_H
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/omf/omf.c radare2-2.8.0+dfsg/libr/bin/format/omf/omf.c
--- radare2-2.3.0+dfsg/libr/bin/format/omf/omf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/omf/omf.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,7 +22,7 @@
 	return false;
 }
 
-int r_bin_checksum_omf_ok(const char *buf, ut64 buf_size) {
+int r_bin_checksum_omf_ok(const ut8 *buf, ut64 buf_size) {
 	ut16 size;
 	ut8 checksum = 0;
 
@@ -53,7 +53,10 @@
 	return !checksum ? true : false;
 }
 
-static ut16 omf_get_idx(const char *buf) {
+static ut16 omf_get_idx(const ut8 *buf, int buf_size) {
+	if (buf_size < 2) {
+		return 0;
+	}
 	if (*buf & 0x80) {
 		return (ut16)((*buf & 0x7f) * 0x100 + buf[1]);
 	}
@@ -71,7 +74,7 @@
 	R_FREE (lname);
 }
 
-static int load_omf_lnames(OMF_record *record, const char *buf, ut64 buf_size) {
+static int load_omf_lnames(OMF_record *record, const ut8 *buf, ut64 buf_size) {
 	ut32 tmp_size = 0;
 	ut32 ct_name = 0;
 	OMF_multi_datas *ret = NULL;
@@ -125,7 +128,7 @@
 	return true;
 }
 
-static int load_omf_segdef(OMF_record *record, const char *buf, ut64 buf_size) {
+static int load_omf_segdef(OMF_record *record, const ut8 *buf, ut64 buf_size) {
 	OMF_segment *ret = NULL;
 	int off_add;
 
@@ -145,7 +148,7 @@
 			eprintf ("Invalid Segdef record (bad size)\n");
 			return false;
 		}
-		ret->name_idx = omf_get_idx (buf + 8 + off_add);
+		ret->name_idx = omf_get_idx (buf + 8 + off_add, buf_size - 8 - off_add);
 		if (buf[3] & 2) {
 			ret->size = UT32_MAX;
 		} else {
@@ -156,18 +159,14 @@
 			eprintf ("Invalid Segdef record (bad size)\n");
 			return false;
 		}
-		ret->name_idx = omf_get_idx (buf + 6 + off_add);
+		ret->name_idx = omf_get_idx (buf + 6 + off_add, buf_size - 6 - off_add);
 		if (buf[3] & 2) {
 			ret->size = UT16_MAX;
 		}
 		ret->size = r_read_le16 (buf + 4 + off_add);
 	}
 
-	if (buf[3] & 1) {
-		ret->bits = 32;
-	} else {
-		ret->bits = 16;
-	}
+	ret->bits = (buf[3] & 1)? 32: 16;
 
 	// tricks to keep the save index when copying content from record
 	record->type = OMF_SEGDEF;
@@ -175,9 +174,8 @@
 	return true;
 }
 
-static ut32 omf_count_symb(ut16 total_size, ut32 ct, const char *buf, int bits) {
+static ut32 omf_count_symb(ut16 total_size, ut32 ct, const ut8 *buf, int bits) {
 	ut32 nb_symb = 0;
-
 	while (ct < total_size - 1) {
 		ct += buf[ct] + 1 + (bits == 32 ? 4 : 2);
 		if (ct > total_size - 1) {
@@ -193,7 +191,7 @@
 	return nb_symb;
 }
 
-static int load_omf_symb(OMF_record *record, ut32 ct, const char *buf, int bits, ut16 seg_idx) {
+static int load_omf_symb(OMF_record *record, ut32 ct, const ut8 *buf, int buf_size, int bits, ut16 seg_idx) {
 	ut32 nb_symb = 0;
 	ut8 str_size = 0;
 	OMF_symbol *symbol;
@@ -230,6 +228,9 @@
 		memcpy (symbol->name, buf + ct + 1, sizeof(char) * str_size);
 
 		ct += 1 + str_size + (bits == 32 ? 4 : 2);
+		if (ct >= buf_size) {
+			return false;
+		}
 		if (buf[ct] & 0x80) { //type index
 			ct += 2;
 		} else {
@@ -240,7 +241,7 @@
 	return true;
 }
 
-static int load_omf_pubdef(OMF_record *record, const char *buf) {
+static int load_omf_pubdef(OMF_record *record, const ut8 *buf, int buf_size) {
 	OMF_multi_datas *ret = NULL;
 	ut16 seg_idx;
 	ut16 ct = 0;
@@ -252,7 +253,7 @@
 	}
 
 	ct = 3;
-	base_grp = omf_get_idx (buf + ct);
+	base_grp = omf_get_idx (buf + ct, buf_size - ct);
 	if (buf[ct] & 0x80) { // sizeof base groups index
 		ct += 2;
 	} else {
@@ -264,7 +265,7 @@
 		return false;
 	}
 
-	seg_idx = omf_get_idx (buf + ct);
+	seg_idx = omf_get_idx (buf + ct, buf_size - ct);
 
 	if (buf[ct] & 0x80) { // sizeof base segment index
 		ct += 2;
@@ -292,7 +293,7 @@
 				return false;
 			}
 		}
-		if (!load_omf_symb (record, ct, buf, 16, seg_idx)) {
+		if (!load_omf_symb (record, ct, buf, buf_size, 16, seg_idx)) {
 			return false;
 		}
 	} else { // 32 bit addr
@@ -302,7 +303,7 @@
 				return false;
 			}
 		}
-		if (!load_omf_symb (record, ct, buf, 32, seg_idx)) {
+		if (!load_omf_symb (record, ct, buf, buf_size, 32, seg_idx)) {
 			return false;
 		}
 	}
@@ -312,7 +313,7 @@
 	return true;
 }
 
-static int load_omf_data(const char *buf, OMF_record *record, ut64 global_ct) {
+static int load_omf_data(const ut8 *buf, int buf_size, OMF_record *record, ut64 global_ct) {
 	ut16 seg_idx;
 	ut32 offset;
 	ut16 ct = 4;
@@ -322,7 +323,7 @@
 		eprintf ("Invalid Ledata record (bad size)\n");
 		return false;
 	}
-	seg_idx = omf_get_idx (buf + 3);
+	seg_idx = omf_get_idx (buf + 3, buf_size - 3);
 	if (seg_idx & 0xff00) {
 		if ((!(record->type & 1) && record->size < 5) || (record->size < 7)) {
 			eprintf ("Invalid Ledata record (bad size)\n");
@@ -352,28 +353,32 @@
 }
 
 
-static int load_omf_content(OMF_record *record, const char *buf, ut64 global_ct, ut64 buf_size) {
-	if (record->type == OMF_LNAMES)
+static int load_omf_content(OMF_record *record, const ut8 *buf, ut64 global_ct, ut64 buf_size) {
+	if (record->type == OMF_LNAMES) {
 		return load_omf_lnames (record, buf, buf_size);
-	else if (record->type == OMF_SEGDEF || record->type == OMF_SEGDEF32)
+	}
+	if (record->type == OMF_SEGDEF || record->type == OMF_SEGDEF32) {
 		return load_omf_segdef (record, buf, buf_size);
-	else if (record->type == OMF_PUBDEF || record->type == OMF_PUBDEF32 || record->type == OMF_LPUBDEF || record->type == OMF_LPUBDEF32)
-		return load_omf_pubdef (record, buf);
-	else if (record->type == OMF_LEDATA || record->type == OMF_LEDATA32)
-		return load_omf_data (buf, record, global_ct);
-
+	}
+	if (record->type == OMF_PUBDEF || record->type == OMF_PUBDEF32 || record->type == OMF_LPUBDEF || record->type == OMF_LPUBDEF32) {
+		return load_omf_pubdef (record, buf, buf_size);
+	}
+	if (record->type == OMF_LEDATA || record->type == OMF_LEDATA32) {
+		return load_omf_data (buf, buf_size, record, global_ct);
+	}
 	// generic loader just copy data from buf to content
 	if (!record->size) {
 		eprintf("Invalid record (size to short)\n");
 		return false;
 	}
-	if (!(record->content = R_NEWS0 (char, record->size)))
+	if (!(record->content = R_NEWS0 (char, record->size))) {
 		return false;
+	}
 	((char *)record->content)[record->size - 1] = 0;
 	return true;
 }
 
-static OMF_record_handler *load_record_omf(const char *buf, ut64 global_ct, ut64 buf_size){
+static OMF_record_handler *load_record_omf(const ut8 *buf, ut64 global_ct, ut64 buf_size){
 	OMF_record_handler *new = NULL;
 
 	if (is_valid_omf_type (*buf) && r_bin_checksum_omf_ok (buf, buf_size)) {
@@ -400,7 +405,7 @@
 	return new;
 }
 
-static int load_all_omf_records(r_bin_omf_obj *obj, const char *buf, ut64 size) {
+static int load_all_omf_records(r_bin_omf_obj *obj, const ut8 *buf, ut64 size) {
 	ut64 ct = 0;
 	OMF_record_handler *new_rec = NULL;
 	OMF_record_handler *tmp = NULL;
@@ -614,7 +619,7 @@
 			R_FREE(obj->sections[ct]->data);
 			obj->sections[ct]->data = data;
 		}
-		R_FREE(obj->sections[ct]);
+		R_FREE (obj->sections[ct]);
 		ct++;
 	}
 	R_FREE (obj->sections);
@@ -657,7 +662,7 @@
 	R_FREE(obj);
 }
 
-r_bin_omf_obj *r_bin_internal_omf_load(const char *buf, ut64 size) {
+r_bin_omf_obj *r_bin_internal_omf_load(const ut8 *buf, ut64 size) {
 	r_bin_omf_obj *ret = NULL;
 
 	if (!(ret = R_NEW0 (r_bin_omf_obj))) {
@@ -736,7 +741,7 @@
 		new->paddr = data->paddr;
 		new->vaddr = section->vaddr + data->offset + OMF_BASE_ADDR;
 		new->srwx = R_BIN_SCN_EXECUTABLE | R_BIN_SCN_WRITABLE |
-			R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+			R_BIN_SCN_READABLE;
 		new->add = true;
 		r_list_append (list, new);
 		data = data->next;
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/omf/omf.h radare2-2.8.0+dfsg/libr/bin/format/omf/omf.h
--- radare2-2.3.0+dfsg/libr/bin/format/omf/omf.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/omf/omf.h	2018-08-07 14:12:36.000000000 +0000
@@ -56,8 +56,8 @@
 // if someone want to implement rellocation for omf he has to remove this
 #define OMF_BASE_ADDR 0x1000
 
-int r_bin_checksum_omf_ok(const char *buf, ut64 buf_size);
-r_bin_omf_obj *r_bin_internal_omf_load(const char *buf, ut64 size);
+int r_bin_checksum_omf_ok(const ut8 *buf, ut64 buf_size);
+r_bin_omf_obj *r_bin_internal_omf_load(const ut8 *buf, ut64 size);
 void r_bin_free_all_omf_obj(r_bin_omf_obj *obj);
 int r_bin_omf_get_entry(r_bin_omf_obj *obj, RBinAddr *addr);
 int r_bin_omf_get_bits(r_bin_omf_obj *obj);
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/pe/pe.c radare2-2.8.0+dfsg/libr/bin/format/pe/pe.c
--- radare2-2.3.0+dfsg/libr/bin/format/pe/pe.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/pe/pe.c	2018-08-07 14:12:36.000000000 +0000
@@ -116,6 +116,19 @@
 					return entry;
 				}
 			}
+			//case4:
+			//50                                        push    eax
+			//57                                        push    edi
+			//FF 36                                     push    dword ptr[esi]
+			//E8 D9 FD FF FF                            call    _main
+			for (n = 0; n < sizeof (b) - 5; n++) {
+				if (b[n] == 0x50 && b[n + 1] == 0x57 && b[n + 2] == 0xff && b[n + 4] == 0xe8) {
+					const st32 call_dst = r_read_ble32 (b + n + 5, bin->big_endian);
+					entry->paddr += (n + 5 + 4 + call_dst);
+					entry->vaddr += (n + 5 + 4 + call_dst);
+					return entry;
+				}
+			}
 
 		}
 	}
@@ -310,10 +323,10 @@
 	PE_DWord section_base;
 	int i, section_size;
 	for (i = 0; i < bin->num_sections; i++) {
-		section_base = bin->section_header[i].VirtualAddress;
-		section_size = bin->section_header[i].Misc.VirtualSize;
+		section_base = bin->sections[i].vaddr;
+		section_size = bin->sections[i].vsize;
 		if (rva >= section_base && rva < section_base + section_size) {
-			return bin->section_header[i].PointerToRawData + (rva - section_base);
+			return bin->sections[i].paddr + (rva - section_base);
 		}
 	}
 	return rva;
@@ -348,7 +361,7 @@
 
 static char* resolveModuleOrdinal(Sdb* sdb, const char* module, int ordinal) {
 	Sdb* db = sdb;
-	char* foo = sdb_get (db, sdb_fmt (0, "%d", ordinal), 0);
+	char* foo = sdb_get (db, sdb_fmt ("%d", ordinal), 0);
 	if (foo && *foo) {
 		return foo;
 	} else {
@@ -416,21 +429,13 @@
 					db = NULL;
 					free (sdb_module);
 					sdb_module = strdup (symdllname);
-					filename = sdb_fmt (1, "%s.sdb", symdllname);
+					filename = sdb_fmt ("%s.sdb", symdllname);
 					if (r_file_exists (filename)) {
 						db = sdb_new (NULL, filename, 0);
 					} else {
-#if __WINDOWS__
-						char invoke_dir[MAX_PATH];
-						if (r_sys_get_src_dir_w32 (invoke_dir)) {
-							filename = sdb_fmt (1, "%s\\share\\radare2\\"R2_VERSION "\\format\\dll\\%s.sdb", invoke_dir, symdllname);
-						} else {
-							filename = sdb_fmt (1, "share/radare2/"R2_VERSION "/format/dll/%s.sdb", symdllname);
-						}
-#else
 						const char *dirPrefix = r_sys_prefix (NULL);
-						filename = sdb_fmt (1, "%s/share/radare2/" R2_VERSION "/format/dll/%s.sdb", dirPrefix, symdllname);
-#endif
+						filename = sdb_fmt (R_JOIN_4_PATHS ("%s", R2_SDB_FORMAT, "dll", "%s.sdb"),
+							dirPrefix, symdllname);
 						if (r_file_exists (filename)) {
 							db = sdb_new (NULL, filename, 0);
 						}
@@ -504,6 +509,14 @@
 }
 
 static char *_time_stamp_to_str(ut32 timeStamp) {
+#ifdef _MSC_VER
+	time_t rawtime;
+	struct tm *tminfo;
+	rawtime = (time_t)timeStamp;
+	tminfo = localtime (&rawtime);
+	//tminfo = gmtime (&rawtime);
+	return r_str_trim (strdup (asctime (tminfo)));
+#else
 	struct my_timezone {
 		int tz_minuteswest;     /* minutes west of Greenwich */
 		int tz_dsttime;         /* type of DST correction */
@@ -513,8 +526,9 @@
 	time_t ts = (time_t) timeStamp;
 	gettimeofday (&tv, (void*) &tz);
 	gmtoff = (int) (tz.tz_minuteswest * 60); // in seconds
-	ts += gmtoff;
+	ts += (time_t)gmtoff;
 	return r_str_trim (strdup (ctime (&ts)));
+#endif
 }
 
 static int bin_pe_init_hdr(struct PE_(r_bin_pe_obj_t)* bin) {
@@ -661,7 +675,7 @@
 		exp = exports;
 	}
 
-	sections = PE_(r_bin_pe_get_sections) (bin);
+	sections = bin->sections;
 	for (i = 0; i < bin->num_sections; i++) {
 		//XXX search by section with +x permission since the section can be left blank
 		if (!strcmp ((char*) sections[i].name, ".text")) {
@@ -670,7 +684,6 @@
 			textn = i + 1;
 		}
 	}
-	free (sections);
 	symctr = 0;
 	if (r_buf_read_at (bin->b, sym_tbl_off, (ut8*) buf, bufsz)) {
 		for (i = 0; i < shsz; i += srsz) {
@@ -710,6 +723,7 @@
 	return exports;
 }
 
+static struct r_bin_pe_section_t* PE_(r_bin_pe_get_sections)(struct PE_(r_bin_pe_obj_t)* bin);
 static int bin_pe_init_sections(struct PE_(r_bin_pe_obj_t)* bin) {
 	bin->num_sections = bin->nt_headers->file_header.NumberOfSections;
 	int sections_size;
@@ -865,8 +879,7 @@
 				&largest_size);
 	}
 
-	struct r_bin_pe_section_t *sects = NULL;
-	sects = PE_(r_bin_pe_get_sections) (bin);
+	struct r_bin_pe_section_t *sects = bin->sections;
 	for (i = 0; !sects[i].last; i++) {
 		computeOverlayOffset(
 				sects[i].paddr,
@@ -895,10 +908,8 @@
 
 	if ((ut64) bin->size > largest_offset + largest_size) {
 		*size = bin->size - largest_offset - largest_size;
-		free (sects);
 		return largest_offset + largest_size;
 	}
-	free (sects);
 	return 0;
 }
 
@@ -1279,12 +1290,12 @@
 				break;
 			}
 		}
-		key = sdb_fmt (0, "pe.tls_callback%d_vaddr", count);
+		key = sdb_fmt ("pe.tls_callback%d_vaddr", count);
 		sdb_num_set (bin->kv, key, addressOfTLSCallback, 0);
-		key = sdb_fmt (0, "pe.tls_callback%d_paddr", count);
+		key = sdb_fmt ("pe.tls_callback%d_paddr", count);
 		paddr = bin_pe_rva_to_paddr (bin, bin_pe_va_to_rva (bin, (PE_DWord) addressOfTLSCallback));
 		sdb_num_set (bin->kv, key, paddr,                0);
-		key = sdb_fmt (0, "pe.tls_callback%d_haddr", count);
+		key = sdb_fmt ("pe.tls_callback%d_haddr", count);
 		haddr = callbacks;
 		sdb_num_set (bin->kv, key, haddr,                0);
 		count++;
@@ -2174,30 +2185,74 @@
 }
 
 static char* _resource_type_str(int type) {
+	char * typeName;
 	switch (type) {
-	case 1: return "CURSOR";
-	case 2: return "BITMAP";
-	case 3: return "ICON";
-	case 4: return "MENU";
-	case 5: return "DIALOG";
-	case 6: return "STRING";
-	case 7: return "FONTDIR";
-	case 8: return "FONT";
-	case 9: return "ACCELERATOR";
-	case 10: return "RCDATA";
-	case 11: return "MESSAGETABLE";
-	case 12: return "GROUP_CURSOR";
-	case 14: return "GROUP_ICON";
-	case 16: return "VERSION";
-	case 17: return "DLGINCLUDE";
-	case 19: return "PLUGPLAY";
-	case 20: return "VXD";
-	case 21: return "ANICURSOR";
-	case 22: return "ANIICON";
-	case 23: return "HTML";
-	case 24: return "MANIFEST";
-	default: return "UNKNOWN";
+	case 1:
+		typeName = "CURSOR";
+		break;
+	case 2:
+		typeName = "BITMAP";
+		break;
+	case 3:
+		typeName = "ICON";
+		break;
+	case 4:
+		typeName = "MENU";
+		break;
+	case 5:
+		typeName = "DIALOG";
+		break;
+	case 6:
+		typeName = "STRING";
+		break;
+	case 7:
+		typeName = "FONTDIR";
+		break;
+	case 8:
+		typeName = "FONT";
+		break;
+	case 9:
+		typeName = "ACCELERATOR";
+		break;
+	case 10:
+		typeName = "RCDATA";
+		break;
+	case 11:
+		typeName = "MESSAGETABLE";
+		break;
+	case 12:
+		typeName = "GROUP_CURSOR";
+		break;
+	case 14:
+		typeName = "GROUP_ICON";
+		break;
+	case 16:
+		typeName = "VERSION";
+		break;
+	case 17:
+		typeName = "DLGINCLUDE";
+		break;
+	case 19:
+		typeName = "PLUGPLAY";
+		break;
+	case 20:
+		typeName = "VXD";
+		break;
+	case 21:
+		typeName = "ANICURSOR";
+		break;
+	case 22:
+		typeName = "ANIICON";
+		break;
+	case 23:
+		typeName = "HTML";
+		break;
+	case 24:
+		typeName = "MANIFEST";
+		break;
+	default: return r_str_newf ("UNKNOWN (%d)",type);
 	}
+	return strdup (typeName);
 }
 
 static void _parse_resource_directory(struct PE_(r_bin_pe_obj_t) *bin, Pe_image_resource_directory *dir, ut64 offDir, int type, int id, SdbHash *dirs) {
@@ -2211,7 +2266,7 @@
 	for (index = 0; index < totalRes; index++) {
 		Pe_image_resource_directory_entry entry;
 		off = rsrc_base + offDir + sizeof(*dir) + index * sizeof(entry);
-		char *key = sdb_fmt (0, "0x%08"PFMT64x, off);
+		char *key = sdb_fmt ("0x%08"PFMT64x, off);
 		if (sdb_ht_find (dirs, key, NULL)) {
 			break;
 		}
@@ -2297,7 +2352,7 @@
 			break;
 		}
 		rs->timestr = _time_stamp_to_str (dir->TimeDateStamp);
-		rs->type = strdup (_resource_type_str (type));
+		rs->type = _resource_type_str (type);
 		rs->language = strdup (_resource_lang_str (entry.u1.Name & 0x3ff));
 		rs->data = data;
 		rs->name = id;
@@ -2316,18 +2371,18 @@
 		return;
 	}
 	r_list_foreach (bin->resources, iter, rs) {
-		key = sdb_fmt (0, "resource.%d.timestr", index);
+		key = sdb_fmt ("resource.%d.timestr", index);
 		sdb_set (sdb, key, rs->timestr, 0);
-		key = sdb_fmt (0, "resource.%d.vaddr", index);
+		key = sdb_fmt ("resource.%d.vaddr", index);
 		vaddr = bin_pe_rva_to_va (bin, rs->data->OffsetToData);
 		sdb_num_set (sdb, key, vaddr, 0);
-		key = sdb_fmt (0, "resource.%d.name", index);
+		key = sdb_fmt ("resource.%d.name", index);
 		sdb_num_set (sdb, key, rs->name, 0);
-		key = sdb_fmt (0, "resource.%d.size", index);
+		key = sdb_fmt ("resource.%d.size", index);
 		sdb_num_set (sdb, key, rs->data->Size, 0);
-		key = sdb_fmt (0, "resource.%d.type", index);
+		key = sdb_fmt ("resource.%d.type", index);
 		sdb_set (sdb, key, rs->type, 0);
-		key = sdb_fmt (0, "resource.%d.language", index);
+		key = sdb_fmt ("resource.%d.language", index);
 		sdb_set (sdb, key, rs->language, 0);
 		index++;
 	}
@@ -2359,7 +2414,7 @@
 	for (index = 0; index < totalRes; index++) {
 		Pe_image_resource_directory_entry typeEntry;
 		off = rsrc_base + sizeof (*rs_directory) + index * sizeof (typeEntry);
-		sdb_ht_insert (dirs, sdb_fmt (0, "0x%08"PFMT64x, off), "1");
+		sdb_ht_insert (dirs, sdb_fmt ("0x%08"PFMT64x, off), "1");
 		if (off > bin->size || off + sizeof(typeEntry) > bin->size) {
 			break;
 		}
@@ -2430,6 +2485,7 @@
 		eprintf ("Warning: Cannot initialize sections\n");
 		return false;
 	}
+	bin->sections = PE_(r_bin_pe_get_sections) (bin);
 	bin_pe_init_imports (bin);
 	bin_pe_init_exports (bin);
 	bin_pe_init_resource (bin);
@@ -2506,7 +2562,7 @@
 	entry->haddr = bin->dos_header->e_lfanew + 4 + sizeof (PE_(image_file_header)) + 16;
 
 	if (entry->paddr >= bin->size) {
-		struct r_bin_pe_section_t* sections = PE_(r_bin_pe_get_sections) (bin);
+		struct r_bin_pe_section_t* sections = bin->sections;
 		ut64 paddr = 0;
 		if (!debug) {
 			bprintf ("Warning: Invalid entrypoint ... "
@@ -2539,14 +2595,12 @@
 				entry->vaddr = entry->paddr + base_addr;
 			}
 		}
-		free (sections);
-
 	}
 	if (!entry->paddr) {
 		if (!debug) {
 			bprintf ("Warning: NULL entrypoint\n");
 		}
-		struct r_bin_pe_section_t* sections = PE_(r_bin_pe_get_sections) (bin);
+		struct r_bin_pe_section_t* sections = bin->sections;
 		for (i = 0; i < bin->num_sections; i++) {
 			//If there is a section with x without w perm is a good candidate to be the entrypoint
 			if (sections[i].flags & PE_IMAGE_SCN_MEM_EXECUTE && !(sections[i].flags & PE_IMAGE_SCN_MEM_WRITE)) {
@@ -2556,7 +2610,6 @@
 			}
 
 		}
-		free (sections);
 	}
 
 	if (is_arm (bin) && entry->vaddr & 1) {
@@ -2708,8 +2761,11 @@
 	return true;
 }
 
-static void get_nb10(ut8* dbg_data, SCV_NB10_HEADER* res) {
+static void get_nb10(ut8* dbg_data, int dbg_data_len, SCV_NB10_HEADER* res) {
 	const int nb10sz = 16;
+	if (dbg_data_len < nb10sz) {
+		return;
+	}
 	memcpy (res, dbg_data, nb10sz);
 	res->file_name = (ut8*) strdup ((const char*) dbg_data + nb10sz);
 }
@@ -2717,6 +2773,7 @@
 static int get_debug_info(struct PE_(r_bin_pe_obj_t)* bin, PE_(image_debug_directory_entry)* dbg_dir_entry, ut8* dbg_data, int dbg_data_len, SDebugInfo* res) {
 	#define SIZEOF_FILE_NAME 255
 	int i = 0;
+	const char* basename;
 	if (!dbg_data) {
 		return 0;
 	}
@@ -2743,18 +2800,26 @@
 				rsds_hdr.guid.data4[6],
 				rsds_hdr.guid.data4[7],
 				rsds_hdr.age);
+			basename = r_file_basename ((char*) rsds_hdr.file_name);
 			strncpy (res->file_name, (const char*)
-				rsds_hdr.file_name, sizeof (res->file_name));
+				basename, sizeof (res->file_name));
 			res->file_name[sizeof (res->file_name) - 1] = 0;
 			rsds_hdr.free ((struct SCV_RSDS_HEADER*) &rsds_hdr);
 		} else if (strncmp ((const char*) dbg_data, "NB10", 4) == 0) {
-			SCV_NB10_HEADER nb10_hdr;
+			if (dbg_data_len < 20) {
+				eprintf ("Truncated NB10 entry, not enough data to parse\n");
+				return 0;
+			}
+			SCV_NB10_HEADER nb10_hdr = {{0}};
 			init_cv_nb10_header (&nb10_hdr);
-			get_nb10 (dbg_data, &nb10_hdr);
+			get_nb10 (dbg_data, dbg_data_len, &nb10_hdr);
 			snprintf (res->guidstr, sizeof (res->guidstr),
 				"%x%x", nb10_hdr.timestamp, nb10_hdr.age);
-			strncpy (res->file_name, (const char*)
-				nb10_hdr.file_name, sizeof(res->file_name) - 1);
+			res->file_name[0] = 0;
+			if (nb10_hdr.file_name) {
+				strncpy (res->file_name, (const char*)
+						nb10_hdr.file_name, sizeof (res->file_name) - 1);
+			}
 			res->file_name[sizeof (res->file_name) - 1] = 0;
 			nb10_hdr.free ((struct SCV_NB10_HEADER*) &nb10_hdr);
 		} else {
@@ -3247,7 +3312,7 @@
 
 }
 
-struct r_bin_pe_section_t* PE_(r_bin_pe_get_sections)(struct PE_(r_bin_pe_obj_t)* bin) {
+static struct r_bin_pe_section_t* PE_(r_bin_pe_get_sections)(struct PE_(r_bin_pe_obj_t)* bin) {
 	struct r_bin_pe_section_t* sections = NULL;
 	PE_(image_section_header) * shdr;
 	int i, j, section_count = 0;
@@ -3296,16 +3361,26 @@
 			}
 		} else {
 			memcpy (sections[j].name, shdr[i].Name, PE_IMAGE_SIZEOF_SHORT_NAME);
-			sections[j].name[PE_IMAGE_SIZEOF_SHORT_NAME - 1] = '\0';
+			sections[j].name[PE_IMAGE_SIZEOF_SHORT_NAME] = '\0';
 		}
 		sections[j].vaddr = shdr[i].VirtualAddress;
 		sections[j].size = shdr[i].SizeOfRawData;
-		sections[j].vsize = shdr[i].Misc.VirtualSize;
+		if (shdr[i].Misc.VirtualSize) {
+			sections[j].vsize = shdr[i].Misc.VirtualSize;
+		} else {
+			sections[j].vsize = shdr[i].SizeOfRawData;
+		}
 		if (bin->optional_header) {
-			int sa = R_MAX (bin->optional_header->SectionAlignment, 0x1000);
-			ut64 diff = sections[j].vsize % sa;
-			if (diff) {
-				sections[j].vsize += sa - diff;
+			ut32 sa = bin->optional_header->SectionAlignment;
+			if (sa) {
+				ut64 diff = sections[j].vsize % sa;
+				if (diff) {
+					sections[j].vsize += sa - diff;
+				}
+				if (sections[j].vaddr % sa) {
+					bprintf ("Warning: section %s not aligned to SectionAlignment.\n",
+							sections[j].name);
+				}
 			}
 		}
 		sections[j].paddr = shdr[i].PointerToRawData;
@@ -3411,7 +3486,6 @@
 	return HASCHR (PE_IMAGE_FILE_DEBUG_STRIPPED);
 }
 
-
 void* PE_(r_bin_pe_free)(struct PE_(r_bin_pe_obj_t)* bin) {
 	if (!bin) {
 		return NULL;
@@ -3424,6 +3498,9 @@
 	free (bin->resource_directory);
 	free (bin->delay_import_directory);
 	free (bin->tls_directory);
+	if (bin->sections) {
+		free (bin->sections);
+	}
 	r_list_free (bin->resources);
 	r_pkcs7_free_cms (bin->cms);
 	r_buf_free (bin->b);
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/pe/pe.h radare2-2.8.0+dfsg/libr/bin/format/pe/pe.h
--- radare2-2.3.0+dfsg/libr/bin/format/pe/pe.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/pe/pe.h	2018-08-07 14:12:36.000000000 +0000
@@ -100,6 +100,9 @@
 	PE_(image_metadata_header) * metadata_header;
 	PE_(image_metadata_stream) * *streams;
 
+	/* store the section information for future use */
+	struct r_bin_pe_section_t *sections;
+
 	// these values define the real offset into the untouched binary
 	ut64 nt_header_offset;
 	ut64 section_header_offset;
@@ -138,7 +141,6 @@
 char* PE_(r_bin_pe_get_class)(struct PE_(r_bin_pe_obj_t)* bin);
 int PE_(r_bin_pe_get_bits)(struct PE_(r_bin_pe_obj_t)* bin);
 int PE_(r_bin_pe_get_section_alignment)(struct PE_(r_bin_pe_obj_t)* bin);
-struct r_bin_pe_section_t* PE_(r_bin_pe_get_sections)(struct PE_(r_bin_pe_obj_t)* bin);
 char* PE_(r_bin_pe_get_subsystem)(struct PE_(r_bin_pe_obj_t)* bin);
 int PE_(r_bin_pe_is_dll)(struct PE_(r_bin_pe_obj_t)* bin);
 int PE_(r_bin_pe_is_big_endian)(struct PE_(r_bin_pe_obj_t)* bin);
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/pe/pemixed.c radare2-2.8.0+dfsg/libr/bin/format/pe/pemixed.c
--- radare2-2.3.0+dfsg/libr/bin/format/pe/pemixed.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/pe/pemixed.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,192 @@
+/* radare - LGPL - Copyright 2018 - JohnPeng47 */
+
+#include <stdio.h>
+#include "pemixed.h"
+
+static bool check_il_only(ut32 flags);
+
+static int r_bin_pemixed_init(struct r_bin_pemixed_obj_t* bin, struct PE_(r_bin_pe_obj_t)* pe_bin) {
+	struct PE_(r_bin_pe_obj_t)* sub_bin_dos;
+	struct PE_(r_bin_pe_obj_t)* sub_bin_native;
+	struct PE_(r_bin_pe_obj_t)* sub_bin_net;
+
+	sub_bin_dos = r_bin_pemixed_init_dos (pe_bin);
+	if (sub_bin_dos) {
+		bin->sub_bin_dos = sub_bin_dos;
+	}
+
+	sub_bin_native = r_bin_pemixed_init_native (pe_bin);
+	if (sub_bin_native) {
+		bin->sub_bin_native = sub_bin_native;
+	}
+	sub_bin_net = pe_bin;
+	bin->sub_bin_net = sub_bin_net;
+	return true;
+}
+
+//carves out dos from original pe
+//TODO: return mz file instead pe
+struct PE_(r_bin_pe_obj_t)* r_bin_pemixed_init_dos(struct PE_(r_bin_pe_obj_t)* pe_bin) {
+	struct PE_(r_bin_pe_obj_t)* sub_bin_dos = R_NEW0 (struct PE_(r_bin_pe_obj_t));
+	ut8 * tmp_buf;
+
+	ut64 pe_hdr_off = pe_bin->dos_header->e_lfanew;
+
+	//idk if this is the most efficient way but could not find a function to read
+	//RBuffer into another RBuffer
+	if (!(tmp_buf = malloc (pe_hdr_off))) {
+		return NULL;
+	}
+
+	if ((r_buf_read_at (pe_bin->b, 0, tmp_buf, pe_hdr_off)) == -1) {
+		eprintf ("Error reading to buffer\n");
+		return NULL;
+	}
+
+	if (!(sub_bin_dos->b = r_buf_new_with_bytes(tmp_buf, pe_hdr_off))) {
+		PE_(r_bin_pe_free) (sub_bin_dos);
+		return NULL;
+	}
+
+	sub_bin_dos->size = pe_hdr_off;
+	sub_bin_dos->dos_header = pe_bin->dos_header;
+
+	free (tmp_buf);
+	return sub_bin_dos;
+}
+
+struct PE_(r_bin_pe_obj_t)* r_bin_pemixed_init_native(struct PE_(r_bin_pe_obj_t)* pe_bin) {
+	ut8* zero_out;
+	ut64 b_size;
+
+	struct PE_(r_bin_pe_obj_t)* sub_bin_native = R_NEW0 (struct PE_(r_bin_pe_obj_t));
+	memcpy (sub_bin_native, pe_bin, sizeof(struct PE_(r_bin_pe_obj_t)));
+
+	b_size = pe_bin->b->length;
+
+	//copy pe_bin->b and assign to sub_bin_native
+
+	// if (!(tmp_buf = malloc (b_size))) {
+	// 	eprintf("wtf malloc\n");
+	// };
+
+	// if (!(r_buf_read_at (pe_bin->b, 0, tmp_buf, b_size))) {
+	// 	free (sub_bin_native);
+	// 	return NULL;
+	// }
+
+	if (!(sub_bin_native->b = r_buf_new_with_bytes(pe_bin->b->buf, b_size))) {
+		free (sub_bin_native);
+		eprintf ("failed\n");
+		return NULL;
+	}
+
+	//calculate the dotnet data directory offset
+	int dotnet_offset = pe_bin->dos_header->e_lfanew;
+	dotnet_offset += sizeof (PE_(image_nt_headers));
+	dotnet_offset -= sizeof (PE_(image_data_directory)) * 2;
+
+	if (!(zero_out = calloc (2, sizeof (ut32)))) {
+		// can't call PE_(r_bin_pe_free) since this will free the underlying pe_bin
+		// object which we may need for later
+		// PE_(r_bin_pe_free) (sub_bin_native);
+		r_buf_free (sub_bin_native->b);
+		free (sub_bin_native);
+		return NULL;
+	}
+
+	if (r_buf_write_at (sub_bin_native->b, dotnet_offset, zero_out, sizeof (PE_(image_data_directory))) < -1) {
+		eprintf ("Zeroing out dotnet offset failed\n");
+		r_buf_free (sub_bin_native->b);
+		free (sub_bin_native);
+		free (zero_out);
+		return NULL;
+	}
+
+	free (zero_out);
+	return sub_bin_native;
+}
+
+//this method should just return the original pe file
+// struct PE_(r_bin_pe_obj_t)* r_bin_pemixed_init_net(struct PE_(r_bin_pe_obj_t)* pe_bin) {
+//		return pe_bin;
+// }
+
+//not sure if this function is nessescary
+struct PE_(r_bin_pe_obj_t)* r_bin_pemixed_extract(struct r_bin_pemixed_obj_t* bin, int sub_bin) {
+	if (!bin) {
+		return NULL;
+	}
+
+	switch (sub_bin) {
+	case SUB_BIN_DOS:
+		return bin->sub_bin_dos;
+	case SUB_BIN_NATIVE:
+		return bin->sub_bin_native;
+	case SUB_BIN_NET:
+		return bin->sub_bin_net;
+	}
+	return NULL;
+}
+
+//if IL only bit is set; if true then it is pure .NET binary with no unmanaged code
+static bool check_il_only(ut32 flag) {
+	ut32 check_mask = 1;
+	return flag & check_mask;
+}
+
+void* r_bin_pemixed_free(struct r_bin_pemixed_obj_t* bin) {
+	if (!bin) {
+		return NULL;
+	}
+	//only one free is nessescary since they all point
+	//to the same original pe struct
+	//possible memleak here
+	PE_(r_bin_pe_free)(bin->sub_bin_net);
+	if (bin->sub_bin_dos) {
+		r_buf_free (bin->sub_bin_dos->b); //dos is the only one with its own buf
+	}
+	free (bin->sub_bin_dos);
+	free (bin->sub_bin_native);
+
+	// PE_(r_bin_pe_free)(bin->sub_bin_native);
+	// PE_(r_bin_pe_free)(bin->sub_bin_net);
+	r_buf_free (bin->b);
+	R_FREE(bin);
+	return NULL;
+}
+
+struct r_bin_pemixed_obj_t * r_bin_pemixed_from_bytes_new(const ut8* buf, ut64 size) {
+	struct r_bin_pemixed_obj_t* bin = R_NEW0 (struct r_bin_pemixed_obj_t);
+	struct PE_(r_bin_pe_obj_t)* pe_bin;
+	if (!bin || !buf) {
+		return r_bin_pemixed_free (bin);
+	}
+	bin->b = r_buf_new();
+	bin->size = size;
+	if (!r_buf_set_bytes (bin->b, buf, size)) { //copy buf to bin->b
+		return r_bin_pemixed_free (bin);
+	}
+	pe_bin = PE_(r_bin_pe_new_buf) (bin->b, true);
+	if (!pe_bin) {
+		PE_(r_bin_pe_free)(pe_bin);
+		return r_bin_pemixed_free (bin);
+	}
+	if (!pe_bin->clr_hdr) {
+		PE_(r_bin_pe_free) (pe_bin);
+		return r_bin_pemixed_free (bin);
+	}
+	//check if binary only contains managed code
+	//check implemented here cuz we need to intialize
+	//the pe header to access the clr hdr
+	if (check_il_only(pe_bin->clr_hdr->Flags)) {
+		PE_(r_bin_pe_free) (pe_bin);
+		return r_bin_pemixed_free (bin);
+	}
+	if (!r_bin_pemixed_init (bin, pe_bin)) {
+		PE_(r_bin_pe_free) (pe_bin);
+		return r_bin_pemixed_free (bin);
+	}
+	return bin;
+}
+
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/pe/pemixed.h radare2-2.8.0+dfsg/libr/bin/format/pe/pemixed.h
--- radare2-2.3.0+dfsg/libr/bin/format/pe/pemixed.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/pe/pemixed.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,29 @@
+#include <r_types.h>
+#include "pe.h"
+
+#define SUB_BIN_DOS 0
+#define SUB_BIN_NATIVE 1
+#define SUB_BIN_NET 2
+
+#ifndef _INCLUDE_R_BIN_PEMIXED_H_
+#define _INCLUDE_R_BIN_PEMIXED_H_
+
+struct r_bin_pemixed_obj_t {
+	const char* file;
+	int size;
+	struct PE_(r_bin_pe_obj_t)* sub_bin_dos;
+	struct PE_(r_bin_pe_obj_t)* sub_bin_native;
+	struct PE_(r_bin_pe_obj_t)* sub_bin_net;
+	
+	struct r_buf_t* b;
+};
+
+// static int r_bin_pemixed_init(struct r_bin_pemixed_obj_t* bin, struct PE_(r_bin_pe_obj_t)* pe_bin);
+struct PE_(r_bin_pe_obj_t)* r_bin_pemixed_init_dos(struct PE_(r_bin_pe_obj_t)* pe_bin);
+struct PE_(r_bin_pe_obj_t)* r_bin_pemixed_init_native(struct PE_(r_bin_pe_obj_t)* pe_bin);
+struct PE_(r_bin_pe_obj_t)* r_bin_pemixed_extract(struct r_bin_pemixed_obj_t* bin, int sub_bin);
+// static bool check_il_only(ut32 flags);
+void* r_bin_pemixed_free(struct r_bin_pemixed_obj_t* bin);
+struct r_bin_pemixed_obj_t * r_bin_pemixed_from_bytes_new(const ut8* buf, ut64 size);
+
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/format/zimg/zimg.c radare2-2.8.0+dfsg/libr/bin/format/zimg/zimg.c
--- radare2-2.3.0+dfsg/libr/bin/format/zimg/zimg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/format/zimg/zimg.c	2018-08-07 14:12:36.000000000 +0000
@@ -16,6 +16,9 @@
 		goto fail;
 	}
 
+	if (r_buf_size (bin->b) < sizeof (struct zimg_header_t)) {
+		goto fail;
+	}
 	bin->header = (*(struct zimg_header_t*)bin->b->buf);
 
 	return bin;
diff -Nru radare2-2.3.0+dfsg/libr/bin/Makefile radare2-2.8.0+dfsg/libr/bin/Makefile
--- radare2-2.3.0+dfsg/libr/bin/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -17,9 +17,10 @@
 include ${STATIC_BIN_LDR_PLUGINS}
 include $(SHLR)/java/deps.mk
 include $(SHLR)/ar/deps.mk
+include $(LIBR)/magic/deps.mk
 
 STATIC_OBJS=$(addprefix $(LTOP)/bin/p/, $(STATIC_OBJ))
-OBJS=bin.o dbginfo.o bin_ldr.o bin_write.o demangle.o dwarf.o filter.o
+OBJS=bin.o dbginfo.o bin_ldr.o bin_write.o demangle.o dwarf.o filter.o file.o obj.o open.o
 OBJS+=mangling/cxx/cp-demangle.o ${STATIC_OBJS}
 OBJS+=mangling/demangler.o
 OBJS+=mangling/microsoft_demangle.o
diff -Nru radare2-2.3.0+dfsg/libr/bin/mangling/microsoft_demangle.c radare2-2.8.0+dfsg/libr/bin/mangling/microsoft_demangle.c
--- radare2-2.3.0+dfsg/libr/bin/mangling/microsoft_demangle.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/mangling/microsoft_demangle.c	2018-08-07 14:12:36.000000000 +0000
@@ -123,7 +123,7 @@
 		return 0;
 	}
 	if (free_space > str_for_copy_len) {
-		int newlen = ((type_code_str->type_str_len + str_for_copy_len) << 1) + 1;
+		int newlen = type_code_str->type_str_len + (str_for_copy_len << 1) + 1;
 		if (newlen < 1) {
 			R_FREE (type_code_str->type_str);
 			goto copy_string_err;
@@ -1087,7 +1087,7 @@
 	char *ptr64 = 0;
 	char *storage_class = 0;
 
-	type_code_str.type_str = NULL;
+	memset(&type_code_str, 0, sizeof(type_code_str));
 
 	if (!init_type_code_str_struct (&func_str)) {
 		err = eDemanglerErrMemoryAllocation;
diff -Nru radare2-2.3.0+dfsg/libr/bin/mangling/swift-sd.c radare2-2.8.0+dfsg/libr/bin/mangling/swift-sd.c
--- radare2-2.3.0+dfsg/libr/bin/mangling/swift-sd.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/mangling/swift-sd.c	2018-08-07 14:12:36.000000000 +0000
@@ -175,6 +175,7 @@
 	const char *attr2 = NULL;
 	const char *q, *p = s;
 	const char *q_end = p + strlen (p);
+	const char *q_start = p;
 
 	if (strchr (s, '\'') || strchr (s, ' ')) {
 		return NULL;
@@ -351,7 +352,7 @@
 		} else {
 			/* parse function parameters here */
 			// type len value/
-			for (i = 0; q && q < q_end; i++) {
+			for (i = 0; q && q < q_end && q >= q_start; i++) {
 				if (*q == 'f') {
 					q++;
 				}
@@ -417,7 +418,7 @@
 					break;
 				case 'F':
 					strcat (out, " ()");
-					p = resolve (types, q + 3, &attr); // type
+					p = resolve (types, (strlen (q) > 2)? q + 3: "", &attr); // type
 					break;
 				case 'G':
 					q += 2;
@@ -442,8 +443,9 @@
 				if (p) {
 					q = p;
 					q = getnum (p, &len);
-					if (attr && !strcmp (attr, "generic"))
+					if (attr && !strcmp (attr, "generic")) {
 						is_generic = 1;
+					}
 					//printf ("TYPE: %s LEN %d VALUE %s\n",
 					//	attr, len, getstring (q, len));
 					if (!len) {
@@ -456,7 +458,7 @@
 								}
 								break;
 							}
-							p = resolve (types, q + 1, &attr); // type
+							p = resolve (types, *q? q + 1: q, &attr); // type
 							//printf ("RETURN TYPE %s\n", attr);
 		//					printf ("RET %s\n", attr);
 							if (attr) {
diff -Nru radare2-2.3.0+dfsg/libr/bin/meson.build radare2-2.8.0+dfsg/libr/bin/meson.build
--- radare2-2.3.0+dfsg/libr/bin/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,123 +1,152 @@
-files=[
-'bin.c',
-'bin_write.c',
-'dbginfo.c',
-'demangle.c',
-'dwarf.c',
-'filter.c',
-'p/bin_any.c',
-'p/bin_art.c',
-'p/bin_avr.c',
-'p/bin_bf.c',
-'p/bin_bflt.c',
-'p/bin_bios.c',
-'p/bin_bootimg.c',
-'p/bin_cgc.c',
-'p/bin_coff.c',
-'p/bin_dbginfo_dex.c',
-'p/bin_dbginfo_elf.c',
-'p/bin_dbginfo_elf64.c',
-'p/bin_dex.c',
-'p/bin_dol.c',
-'p/bin_dyldcache.c',
-'p/bin_elf.c',
-'p/bin_elf64.c',
-'p/bin_fs.c',
-'p/bin_java.c',
-'p/bin_mach0.c',
-'p/bin_mach064.c',
-'p/bin_mbn.c',
-'p/bin_menuet.c',
-'p/bin_mdmp.c',
-'p/bin_mz.c',
-'p/bin_nes.c',
-'p/bin_nin3ds.c',
-'p/bin_ninds.c',
-'p/bin_ningb.c',
-'p/bin_ningba.c',
-'p/bin_nro.c',
-'p/bin_omf.c',
-'p/bin_p9.c',
-'p/bin_pe.c',
-'p/bin_pe64.c',
-'p/bin_pebble.c',
-'p/bin_psxexe.c',
-'p/bin_sfc.c',
-'p/bin_smd.c',
-'p/bin_sms.c',
-'p/bin_spc700.c',
-'p/bin_te.c',
-'p/bin_vsf.c',
-'p/bin_wasm.c',
-'p/bin_write_elf.c',
-'p/bin_write_elf64.c',
-'p/bin_write_mach0.c',
-'p/bin_write_mach064.c',
-'p/bin_write_pe.c',
-'p/bin_write_pe64.c',
-'p/bin_xbe.c',
-'p/bin_xtr_dyldcache.c',
-'p/bin_xtr_fatmach0.c',
-'p/bin_zimg.c',
-'p/bin_z64.c',
-
-'format/bflt/bflt.c',
-'format/coff/coff.c',
-'format/dex/dex.c',
-'format/elf/elf.c',
-'format/elf/elf64.c',
-'format/elf/elf64_write.c',
-'format/elf/elf_write.c',
-'format/mach0/dyldcache.c',
-'format/mach0/fatmach0.c',
-'format/mach0/mach0.c',
-'format/mach0/mach064.c',
-'format/mdmp/mdmp.c',
-'format/mdmp/mdmp_pe.c',
-'format/mdmp/mdmp_pe64.c',
-'format/mz/mz.c',
-'format/objc/mach064_classes.c',
-'format/objc/mach0_classes.c',
-'format/omf/omf.c',
-'format/p9/p9bin.c',
-'format/pe/pe.c',
-'format/pe/pe64.c',
-'format/pe/pe64_write.c',
-'format/pe/pe_write.c',
-'format/te/te.c',
-'format/wasm/wasm.c',
-'format/zimg/zimg.c',
-
-'mangling/cxx.c',
-'mangling/cxx/cp-demangle.c',
-'mangling/demangler.c',
-'mangling/dlang.c',
-'mangling/microsoft_demangle.c',
-'mangling/msvc.c',
-'mangling/objc.c',
-'mangling/swift-sd.c',
-'mangling/swift.c',
-
-'pdb/dbi.c',
-'pdb/fpo.c',
-'pdb/gdata.c',
-'pdb/omap.c',
-'pdb/pdb.c',
-'pdb/pdb_downloader.c',
-'pdb/stream_file.c',
-'pdb/stream_pe.c',
-'pdb/tpi.c'
+files = [
+  'bin.c',
+  'bin_write.c',
+  'dbginfo.c',
+  'demangle.c',
+  'dwarf.c',
+  'filter.c',
+  'file.c',
+  'obj.c',
+  'open.c',
+  'p/bin_any.c',
+  'p/bin_art.c',
+  'p/bin_avr.c',
+  'p/bin_bf.c',
+  'p/bin_bflt.c',
+  'p/bin_bios.c',
+  'p/bin_bootimg.c',
+  'p/bin_cgc.c',
+  'p/bin_coff.c',
+  'p/bin_dbginfo_dex.c',
+  'p/bin_dbginfo_elf.c',
+  'p/bin_dbginfo_elf64.c',
+  'p/bin_dex.c',
+  'p/bin_dol.c',
+  'p/bin_dyldcache.c',
+  'p/bin_elf.c',
+  'p/bin_elf64.c',
+  'p/bin_fs.c',
+  'p/bin_java.c',
+  'p/bin_ldr_linux.c',
+  'p/bin_mach0.c',
+  'p/bin_mach064.c',
+  'p/bin_mbn.c',
+  'p/bin_mdmp.c',
+  'p/bin_menuet.c',
+  'p/bin_mz.c',
+  'p/bin_nes.c',
+  'p/bin_nin3ds.c',
+  'p/bin_ninds.c',
+  'p/bin_ningb.c',
+  'p/bin_ningba.c',
+  'p/bin_nro.c',
+  'p/bin_nso.c',
+  'p/bin_omf.c',
+  'p/bin_p9.c',
+  'p/bin_pe.c',
+  'p/bin_pe64.c',
+  'p/bin_pebble.c',
+  'p/bin_psxexe.c',
+  'p/bin_sfc.c',
+  'p/bin_smd.c',
+  'p/bin_sms.c',
+  'p/bin_spc700.c',
+  'p/bin_te.c',
+  'p/bin_vsf.c',
+  'p/bin_wasm.c',
+  'p/bin_write_elf.c',
+  'p/bin_write_elf64.c',
+  'p/bin_write_mach0.c',
+  'p/bin_write_mach064.c',
+  'p/bin_write_pe.c',
+  'p/bin_write_pe64.c',
+  'p/bin_xbe.c',
+  'p/bin_xtr_dyldcache.c',
+  'p/bin_xtr_fatmach0.c',
+  'p/bin_z64.c',
+  'p/bin_zimg.c',
+
+  'format/bflt/bflt.c',
+  'format/coff/coff.c',
+  'format/dex/dex.c',
+  'format/elf/elf.c',
+  'format/elf/elf64.c',
+  'format/elf/elf64_write.c',
+  'format/elf/elf_write.c',
+  'format/mach0/dyldcache.c',
+  'format/mach0/fatmach0.c',
+  'format/mach0/mach0.c',
+  'format/mach0/mach064.c',
+  'format/mdmp/mdmp.c',
+  'format/mdmp/mdmp_pe.c',
+  'format/mdmp/mdmp_pe64.c',
+  'format/mz/mz.c',
+  'format/nxo/nxo.c',
+  'format/objc/mach064_classes.c',
+  'format/objc/mach0_classes.c',
+  'format/omf/omf.c',
+  'format/p9/p9bin.c',
+  'format/pe/pe.c',
+  'format/pe/pe64.c',
+  'format/pe/pe64_write.c',
+  'format/pe/pe_write.c',
+  'format/te/te.c',
+  'format/wasm/wasm.c',
+  'format/zimg/zimg.c',
+
+  'mangling/cxx.c',
+  'mangling/cxx/cp-demangle.c',
+  'mangling/demangler.c',
+  'mangling/dlang.c',
+  'mangling/microsoft_demangle.c',
+  'mangling/msvc.c',
+  'mangling/objc.c',
+  'mangling/swift-sd.c',
+  'mangling/swift.c',
+
+  'pdb/dbi.c',
+  'pdb/fpo.c',
+  'pdb/gdata.c',
+  'pdb/omap.c',
+  'pdb/pdb.c',
+  'pdb/pdb_downloader.c',
+  'pdb/stream_file.c',
+  'pdb/stream_pe.c',
+  'pdb/tpi.c'
 ]
 
+r_bin_inc = [platform_inc, include_directories('mangling', 'format')]
+
 r_bin = library('r_bin', files,
-  include_directories: [platform_inc, include_directories([
-	'mangling',
-	'format'
-  ])],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_io, r_socket, r_magic, libr2java],
-  objects: [
-	libr2sdb.extract_all_objects()
+  include_directories: r_bin_inc,
+  c_args: ['-DCORELIB=1', '-DR_API_BIN_ONLY=1'],
+  dependencies: [
+    r_util_dep,
+    r_io_dep,
+    r_magic_dep,
+    r_socket_dep,
+    sdb_dep,
+    java_dep,
+    lz4_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_bin_dep = declare_dependency(link_with: r_bin,
+                               include_directories: r_bin_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_bin],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_bin',
+  filebase: 'r_bin',
+  requires: pkgconfig_magic_requires + [
+    'r_util',
+    'r_io',
+    'r_socket'
   ],
-  install: true
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/bin/obj.c radare2-2.8.0+dfsg/libr/bin/obj.c
--- radare2-2.3.0+dfsg/libr/bin/obj.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/obj.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,409 @@
+/* radare2 - LGPL - Copyright 2009-2018 - pancake, nibble, dso */
+
+#include <r_bin.h>
+#include <r_util.h>
+
+#define bprintf if(binfile->rbin->verbose)eprintf
+
+R_API void r_bin_object_free(void /*RBinObject*/ *o_) {
+	RBinObject *o = o_;
+	if (!o) {
+		return;
+	}
+	r_bin_info_free (o->info);
+	r_bin_object_delete_items (o);
+	R_FREE (o);
+}
+
+R_API RBinObject *r_bin_object_new(RBinFile *binfile, RBinPlugin *plugin, ut64 baseaddr, ut64 loadaddr, ut64 offset, ut64 sz) {
+	const ut8 *bytes = binfile? r_buf_buffer (binfile->buf): NULL;
+	ut64 bytes_sz = binfile? r_buf_size (binfile->buf): 0;
+	Sdb *sdb = binfile? binfile->sdb: NULL;
+	RBinObject *o = R_NEW0 (RBinObject);
+	if (!o) {
+		return NULL;
+	}
+	o->obj_size = bytes && (bytes_sz >= sz + offset)? sz: 0;
+	o->boffset = offset;
+	if (!r_id_pool_grab_id (binfile->rbin->ids->pool, &o->id)) {
+		free (o);
+		return NULL;
+	}
+	o->kv = sdb_new0 ();
+	o->baddr = baseaddr;
+	o->baddr_shift = 0;
+	o->plugin = plugin;
+	o->loadaddr = loadaddr != UT64_MAX ? loadaddr : 0;
+
+	if (bytes && plugin && plugin->load_buffer) {
+		o->bin_obj = plugin->load_buffer (binfile, binfile->buf, loadaddr, sdb); // bytes + offset, sz, loadaddr, sdb);
+		if (!o->bin_obj) {
+			bprintf (
+				"Error in r_bin_object_new: load_bytes failed "
+				"for %s plugin\n",
+				plugin->name);
+			sdb_free (o->kv);
+			free (o);
+			return NULL;
+		}
+	} else if (bytes && plugin && plugin->load_bytes && (bytes_sz >= sz + offset)) {
+		// XXX more checking will be needed here
+		// only use LoadBytes if buffer offset != 0
+		// if (offset != 0 && bytes && plugin && plugin->load_bytes && (bytes_sz
+		// >= sz + offset) ) {
+		ut64 bsz = bytes_sz - offset;
+		if (sz < bsz) {
+			bsz = sz;
+		}
+		o->bin_obj = plugin->load_bytes (binfile, bytes + offset, sz,
+						 loadaddr, sdb);
+		if (!o->bin_obj) {
+			bprintf (
+				"Error in r_bin_object_new: load_bytes failed "
+				"for %s plugin\n",
+				plugin->name);
+			sdb_free (o->kv);
+			free (o);
+			return NULL;
+		}
+	} else if (binfile && plugin && plugin->load) {
+		// XXX - haha, this is a hack.
+		// switching out the current object for the new
+		// one to be processed
+		RBinObject *old_o = binfile->o;
+		binfile->o = o;
+		if (plugin->load (binfile)) {
+			binfile->sdb_info = o->kv;
+			// mark as do not walk
+			sdb_ns_set (binfile->sdb, "info", o->kv);
+		} else {
+			binfile->o = old_o;
+		}
+		o->obj_size = sz;
+	} else {
+		sdb_free (o->kv);
+		free (o);
+		return NULL;
+	}
+
+	// XXX - binfile could be null here meaning an improper load
+	// XXX - object size cant be set here and needs to be set where
+	// where the object is created from.  The reason for this is to prevent
+	// mis-reporting when the file is loaded from impartial bytes or is
+	// extracted
+	// from a set of bytes in the file
+	r_bin_object_set_items (binfile, o);
+	r_bin_file_object_add (binfile, o);
+
+	// XXX this is a very hacky alternative to rewriting the
+	// RIO stuff, as discussed here:
+	return o;
+}
+
+R_API int r_bin_object_set_items(RBinFile *binfile, RBinObject *o) {
+	RBinObject *old_o;
+	RBinPlugin *cp;
+	int i, minlen;
+	// int type;
+
+	if (!binfile || !o || !o->plugin) {
+		return false;
+	}
+	RBin *bin = binfile->rbin;
+	old_o = binfile->o;
+	cp = o->plugin;
+	minlen = (binfile->rbin->minstrlen > 0) ? binfile->rbin->minstrlen : cp->minstrlen;
+	binfile->o = o;
+
+	if (cp->file_type) {
+		int type = cp->file_type (binfile);
+		if (type == R_BIN_TYPE_CORE) {
+			if (cp->regstate) {
+				o->regstate = cp->regstate (binfile);
+			}
+			if (cp->maps) {
+				o->maps = cp->maps (binfile);
+			}
+		}
+	}
+
+	if (cp->baddr) {
+		ut64 old_baddr = o->baddr;
+		o->baddr = cp->baddr (binfile);
+		r_bin_object_set_baddr (o, old_baddr);
+	}
+	if (cp->boffset) {
+		o->boffset = cp->boffset (binfile);
+	}
+	// XXX: no way to get info from xtr pluginz?
+	// Note, object size can not be set from here due to potential
+	// inconsistencies
+	if (cp->size) {
+		o->size = cp->size (binfile);
+	}
+	if (cp->binsym) {
+		for (i = 0; i < R_BIN_SYM_LAST; i++) {
+			o->binsym[i] = cp->binsym (binfile, i);
+			if (o->binsym[i]) {
+				o->binsym[i]->paddr += o->loadaddr;
+			}
+		}
+	}
+	if (cp->entries) {
+		o->entries = cp->entries (binfile);
+		REBASE_PADDR (o, o->entries, RBinAddr);
+	}
+	if (cp->fields) {
+		o->fields = cp->fields (binfile);
+		if (o->fields) {
+			o->fields->free = r_bin_field_free;
+			REBASE_PADDR (o, o->fields, RBinField);
+		}
+	}
+	if (cp->imports) {
+		r_list_free (o->imports);
+		o->imports = cp->imports (binfile);
+		if (o->imports) {
+			o->imports->free = r_bin_import_free;
+		}
+	}
+	//if (bin->filter_rules & (R_BIN_REQ_SYMBOLS | R_BIN_REQ_IMPORTS))
+	if (true) {
+		if (cp->symbols) {
+			o->symbols = cp->symbols (binfile);
+			if (o->symbols) {
+				o->symbols->free = r_bin_symbol_free;
+				REBASE_PADDR (o, o->symbols, RBinSymbol);
+				if (bin->filter) {
+					r_bin_filter_symbols (o->symbols);
+				}
+			}
+		}
+	}
+	o->info = cp->info? cp->info (binfile): NULL;
+	if (cp->libs) {
+		o->libs = cp->libs (binfile);
+	}
+	if (cp->sections) {
+		// XXX sections are populated by call to size
+		if (!o->sections) {
+			o->sections = cp->sections (binfile);
+		}
+		REBASE_PADDR (o, o->sections, RBinSection);
+		if (bin->filter) {
+			r_bin_filter_sections (o->sections);
+		}
+	}
+	if (bin->filter_rules & (R_BIN_REQ_RELOCS | R_BIN_REQ_IMPORTS)) {
+		if (cp->relocs) {
+			o->relocs = cp->relocs (binfile);
+			REBASE_PADDR (o, o->relocs, RBinReloc);
+		}
+	}
+	if (bin->filter_rules & R_BIN_REQ_STRINGS) {
+		if (cp->strings) {
+			o->strings = cp->strings (binfile);
+		} else {
+			o->strings = r_bin_file_get_strings (binfile, minlen, 0, binfile->rawstr);
+		}
+		if (bin->debase64) {
+			r_bin_object_filter_strings (o);
+		}
+		REBASE_PADDR (o, o->strings, RBinString);
+	}
+	if (bin->filter_rules & R_BIN_REQ_CLASSES) {
+		if (cp->classes) {
+			o->classes = cp->classes (binfile);
+			if (r_bin_lang_swift (binfile)) {
+				o->classes = r_bin_classes_from_symbols (binfile, o);
+			}
+		} else {
+			o->classes = r_bin_classes_from_symbols (binfile, o);
+		}
+		if (bin->filter) {
+			r_bin_filter_classes (o->classes);
+		}
+		// cache addr=class+method
+		if (o->classes) {
+			RList *klasses = o->classes;
+			RListIter *iter, *iter2;
+			RBinClass *klass;
+			RBinSymbol *method;
+			if (!o->addr2klassmethod) {
+				// this is slow. must be optimized, but at least its cached
+				o->addr2klassmethod = sdb_new0 ();
+				r_list_foreach (klasses, iter, klass) {
+					r_list_foreach (klass->methods, iter2, method) {
+						char *km = sdb_fmt ("method.%s.%s", klass->name, method->name);
+						char *at = sdb_fmt ("0x%08"PFMT64x, method->vaddr);
+						sdb_set (o->addr2klassmethod, at, km, 0);
+					}
+				}
+			}
+		}
+	}
+	if (cp->lines) {
+		o->lines = cp->lines (binfile);
+	}
+	if (cp->get_sdb) {
+		Sdb* new_kv = cp->get_sdb (binfile);
+		if (new_kv != o->kv) {
+			sdb_free (o->kv);
+		}
+		o->kv = new_kv;
+	}
+	if (cp->mem)  {
+		o->mem = cp->mem (binfile);
+	}
+	if (bin->filter_rules & (R_BIN_REQ_SYMBOLS | R_BIN_REQ_IMPORTS)) {
+		o->lang = r_bin_load_languages (binfile);
+	}
+	binfile->o = old_o;
+	return true;
+}
+
+R_API RBinObject *r_bin_object_get_cur(RBin *bin) {
+	return r_bin_file_object_get_cur (r_bin_cur (bin));
+}
+
+static void r_bin_mem_free(void *data) {
+	RBinMem *mem = (RBinMem *)data;
+	if (mem && mem->mirrors) {
+		mem->mirrors->free = r_bin_mem_free;
+		r_list_free (mem->mirrors);
+		mem->mirrors = NULL;
+	}
+	free (mem);
+}
+
+R_API void r_bin_object_delete_items(RBinObject *o) {
+	ut32 i = 0;
+	if (!o) {
+		return;
+	}
+	sdb_free (o->addr2klassmethod);
+	r_list_free (o->entries);
+	r_list_free (o->fields);
+	r_list_free (o->imports);
+	r_list_free (o->libs);
+	r_list_free (o->relocs);
+	r_list_free (o->sections);
+	r_list_free (o->strings);
+	r_list_free (o->symbols);
+	r_list_free (o->classes);
+	r_list_free (o->lines);
+	sdb_free (o->kv);
+	if (o->mem) {
+		o->mem->free = r_bin_mem_free;
+	}
+	r_list_free (o->mem);
+	o->mem = NULL;
+	o->entries = NULL;
+	o->fields = NULL;
+	o->imports = NULL;
+	o->libs = NULL;
+	o->relocs = NULL;
+	o->sections = NULL;
+	o->strings = NULL;
+	o->symbols = NULL;
+	o->classes = NULL;
+	o->lines = NULL;
+	o->info = NULL;
+	o->kv = NULL;
+	for (i = 0; i < R_BIN_SYM_LAST; i++) {
+		free (o->binsym[i]);
+		o->binsym[i] = NULL;
+	}
+}
+
+R_API RBinObject *r_bin_object_find_by_arch_bits(RBinFile *binfile, const char *arch, int bits, const char *name) {
+	RBinObject *obj = NULL;
+	RListIter *iter = NULL;
+	RBinInfo *info = NULL;
+	r_list_foreach (binfile->objs, iter, obj) {
+		info = obj->info;
+		if (info && info->arch && info->file &&
+		   (bits == info->bits) &&
+			!strcmp (info->arch, arch) &&
+			!strcmp (info->file, name)) {
+			break;
+		}
+		obj = NULL;
+	}
+	return obj;
+}
+
+R_API ut64 r_bin_object_get_baddr(RBinObject *o) {
+	return o? o->baddr + o->baddr_shift: UT64_MAX;
+}
+
+R_API int r_bin_object_delete(RBin *bin, ut32 binfile_id, ut32 binobj_id) {
+	RBinFile *binfile = NULL;
+	RBinObject *obj = NULL;
+	int res = false;
+
+	if (binfile_id == UT32_MAX) {
+		binfile = r_bin_file_find_by_object_id (bin, binobj_id);
+		obj = binfile? r_bin_file_object_find_by_id (binfile, binobj_id): NULL;
+	} else if (binobj_id == UT32_MAX) {
+		binfile = r_bin_file_find_by_id (bin, binfile_id);
+		obj = binfile? binfile->o: NULL;
+	} else {
+		binfile = r_bin_file_find_by_id (bin, binfile_id);
+		obj = binfile? r_bin_file_object_find_by_id (binfile, binobj_id): NULL;
+	}
+	if (binfile && bin->cur == binfile) {
+		bin->cur = NULL;
+	}
+
+	if (binfile) {
+		binfile->o = NULL;
+		r_list_delete_data (binfile->objs, obj);
+		RBinObject *newObj = (RBinObject *)r_list_get_n (binfile->objs, 0);
+		res = newObj && binfile &&
+		      r_bin_file_set_cur_binfile_obj (bin, binfile, newObj);
+	}
+	if (binfile && obj && r_list_length (binfile->objs) == 0) {
+		r_list_delete_data (bin->binfiles, binfile);
+	}
+	return res;
+}
+
+R_API void r_bin_object_set_baddr(RBinObject *o, ut64 baddr) {
+	if (!o || baddr == UT64_MAX) {
+		return;
+	}
+	o->baddr_shift = baddr - o->baddr;
+}
+
+R_API void r_bin_object_filter_strings (RBinObject *bo) {
+	RList *strings = bo->strings;
+	RBinString *ptr;
+	RListIter *iter;
+	r_list_foreach (strings, iter, ptr) {
+		char *dec = (char *)r_base64_decode_dyn (ptr->string, -1);
+		if (dec) {
+			char *s = ptr->string;
+			for (;;) {
+				char *dec2 = (char *)r_base64_decode_dyn (s, -1);
+				if (!dec2) {
+					break;
+				}
+				if (!r_str_is_printable (dec2)) {
+					free (dec2);
+					break;
+				}
+				free (dec);
+				s = dec = dec2;
+			}
+			if (r_str_is_printable (dec) && strlen (dec) > 3) {
+				free (ptr->string);
+				ptr->string = dec;
+				ptr->type = R_STRING_TYPE_BASE64;
+			} else {
+				free (dec);
+			}
+		}
+	}
+}
+
diff -Nru radare2-2.3.0+dfsg/libr/bin/open.c radare2-2.8.0+dfsg/libr/bin/open.c
--- radare2-2.3.0+dfsg/libr/bin/open.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/open.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,99 @@
+/* radare2 - LGPL - Copyright 2018 - pancake */
+
+#include <r_bin.h>
+
+R_API RBinOptions *r_bin_options_new (ut64 offset, ut64 baddr, int rawstr) {
+	RBinOptions *bo = R_NEW0 (RBinOptions);
+	if (bo) {
+		bo->loadaddr = UT64_MAX;
+		bo->offset = offset;
+		bo->baseaddr = baddr;
+		bo->rawstr = rawstr;
+		bo->iofd = -1;
+	}
+	return bo;
+}
+
+R_API void r_bin_options_free(RBinOptions *bo) {
+	free (bo->name);
+	free (bo);
+}
+
+R_API int r_bin_open(RBin *bin, const char *filename, RBinOptions *bo) {
+	ut64 baddr = 0LL, laddr = 0LL;
+	int iofd = -1, rawstr = 0, xtr_idx = 0;
+	if (bo) {
+		baddr = bo->baseaddr;
+		laddr = bo->loadaddr;
+		xtr_idx = bo->xtr_idx;
+		iofd = bo->iofd;
+		rawstr = bo->rawstr;
+	}
+	if (r_bin_load (bin, filename, baddr, laddr, xtr_idx, iofd, rawstr)) {
+		int id = bin->cur->id; // TODO rename to bd?
+		r_id_storage_set (bin->ids, bin->cur, id);
+		return id;
+	}
+	return -1;
+}
+
+R_API RBinFile *r_bin_get_file (RBin *bin, int bd) {
+	return r_id_storage_take (bin->ids, bd);
+}
+
+R_API bool r_bin_close(RBin *bin, int bd) {
+	RBinFile *bf = r_bin_get_file (bin, bd);
+	if (bf) {
+		// file_free removes the fd already.. maybe its unnecessary
+		r_id_storage_delete (bin->ids, bd);
+		r_bin_file_free (bf);
+	}
+	return false;
+}
+
+#if 0
+// usage example
+
+var bin = new RBin ();
+int fd = bin.open("/bin/ls", null);
+var binfile = bin.get_file(fd);
+binfile.symbols.foreach(sym => {
+  print(sym.name);
+});
+bin.close(fd);
+// binfile is invalid here
+
+int bd = bin->cur;
+r_list_foreach (r_bin_list (bin, bd, R_BIN_REQ_SYMBOLS), iter, sym) {
+	eprintf ("Symbol: %s\n", sym->name);
+}
+
+bool cb(void *user, void *data) {
+}
+r_bin_foreach (bin, bd, R_BIN_REQ_SYMBOLS, cb, user);
+#if 0
+// TODO: rename to r_bin_cmd() to match r2 commands ?
+// TODO: use this api in r2
+// TODO: add queryf api (or cmdf)
+R_API bool r_bin_query(RBin *bin, const char *query) {
+	bool ret = false;
+	char *q = strdup (query);
+	const char *at = strchr (q, '@');
+	if (at) {
+		*at++ = 0;
+	}
+	if (!strcmp (q, "s")) {
+		// symbols
+		ret = true;
+	} else {
+		eprintf ("Unknown command\n");
+	}
+	return ret;
+	// r_bin_query (bin, "o@0x8048080"); // return symbol at given address
+	// r_bin_query (bin, "s@0x8048080"); // return symbol at given address
+	// r_bin_query (bin, "z/str/"); // return list subset of strings matching
+	// r_bin_query (bin, "i\"printf\""); // imports
+}
+#endif
+
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bflt.mk radare2-2.8.0+dfsg/libr/bin/p/bflt.mk
--- radare2-2.3.0+dfsg/libr/bin/p/bflt.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bflt.mk	2018-08-07 14:12:36.000000000 +0000
@@ -6,19 +6,6 @@
 
 ALL_TARGETS+=${TARGET_BFLT}
 
-ifeq ($(WITHPIC),0)
-LINK+=../../io/libr_io.${EXT_AR}
-LINK+=../../util/libr_util.${EXT_AR}
-LINK+=../../magic/libr_magic.${EXT_AR}
-LINK+=../../socket/libr_socket.${EXT_AR}
-LINK+=../../../shlr/gdb/lib/libgdbr.${EXT_AR}
-LINK+=../../../shlr/windbg/libr_windbg.${EXT_AR}
-LINK+=../../../shlr/qnx/lib/libqnxr.${EXT_AR}
-LINK+=../../../shlr/bochs/lib/libbochs.${EXT_AR}
-LINK+=../../../shlr/java/libr_java.${EXT_AR}
-LINK+=../../../shlr/ar/libr_ar.${EXT_AR}
-endif
-
 ${TARGET_BFLT}: ${OBJ_BFLT}
 	${CC} $(call libname,bin_bflt) ${CFLAGS} \
 		$(OBJ_BFLT) $(LINK) $(LDFLAGS)
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_any.c radare2-2.8.0+dfsg/libr/bin/p/bin_any.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_any.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_any.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,8 +19,8 @@
 	if (ck && bf && bf->buf) {
 		const char *tmp = NULL;
 		// TODO: dir.magic not honored here
-		char *pfx = r_str_newf ("%s/%s", r_sys_prefix (NULL), R_MAGIC_PATH);
-		r_magic_load (ck, R_MAGIC_PATH);
+		char *pfx = r_str_newf (R_JOIN_2_PATHS ("%s", R2_SDB_MAGIC), r_sys_prefix (NULL));
+		r_magic_load (ck, R2_SDB_MAGIC);
 		r_buf_read_at (bf->buf, 0, buf, sizeof (buf));
 		tmp = r_magic_buffer (ck, buf, sizeof (buf));
 		if (tmp) {
@@ -42,6 +42,7 @@
 	ret->type = get_filetype (bf);
 	ret->has_pi = 0;
 	ret->has_canary = 0;
+	ret->has_retguard = -1;
 	if (R_SYS_BITS & R_SYS_BITS_64) {
 		ret->bits = 64;
 	} else {
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_art.c radare2-2.8.0+dfsg/libr/bin/p/bin_art.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_art.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_art.c	2018-08-07 14:12:36.000000000 +0000
@@ -39,18 +39,18 @@
 		return false;
 	}
 	(void) r_buf_fread_at (buf, 0, (ut8 *) art, "IIiiiiiiiiiiii", 1);
-	sdb_set (db, "img.base", sdb_fmt (0, "0x%x", art->image_base), 0);
-	sdb_set (db, "img.size", sdb_fmt (0, "0x%x", art->image_size), 0);
-	sdb_set (db, "art.checksum", sdb_fmt (0, "0x%x", art->checksum), 0);
-	sdb_set (db, "art.version", sdb_fmt (0, "%c%c%c",
+	sdb_set (db, "img.base", sdb_fmt ("0x%x", art->image_base), 0);
+	sdb_set (db, "img.size", sdb_fmt ("0x%x", art->image_size), 0);
+	sdb_set (db, "art.checksum", sdb_fmt ("0x%x", art->checksum), 0);
+	sdb_set (db, "art.version", sdb_fmt ("%c%c%c",
 			art->version[0], art->version[1], art->version[2]), 0);
-	sdb_set (db, "oat.begin", sdb_fmt (0, "0x%x", art->oat_file_begin), 0);
-	sdb_set (db, "oat.end", sdb_fmt (0, "0x%x", art->oat_file_end), 0);
-	sdb_set (db, "oat_data.begin", sdb_fmt (0, "0x%x", art->oat_data_begin), 0);
-	sdb_set (db, "oat_data.end", sdb_fmt (0, "0x%x", art->oat_data_end), 0);
-	sdb_set (db, "patch_delta", sdb_fmt (0, "0x%x", art->patch_delta), 0);
-	sdb_set (db, "image_roots", sdb_fmt (0, "0x%x", art->image_roots), 0);
-	sdb_set (db, "compile_pic", sdb_fmt (0, "0x%x", art->compile_pic), 0);
+	sdb_set (db, "oat.begin", sdb_fmt ("0x%x", art->oat_file_begin), 0);
+	sdb_set (db, "oat.end", sdb_fmt ("0x%x", art->oat_file_end), 0);
+	sdb_set (db, "oat_data.begin", sdb_fmt ("0x%x", art->oat_data_begin), 0);
+	sdb_set (db, "oat_data.end", sdb_fmt ("0x%x", art->oat_data_end), 0);
+	sdb_set (db, "patch_delta", sdb_fmt ("0x%x", art->patch_delta), 0);
+	sdb_set (db, "image_roots", sdb_fmt ("0x%x", art->image_roots), 0);
+	sdb_set (db, "compile_pic", sdb_fmt ("0x%x", art->compile_pic), 0);
 	return true;
 }
 
@@ -171,7 +171,7 @@
 	ptr->vsize = art.image_size; // TODO: align?
 	ptr->paddr = 0;
 	ptr->vaddr = art.image_base;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+	ptr->srwx = R_BIN_SCN_READABLE; // r--
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -183,7 +183,7 @@
 	ptr->vsize = art.bitmap_size;
 	ptr->paddr = art.bitmap_offset;
 	ptr->vaddr = art.image_base + art.bitmap_offset;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -195,7 +195,7 @@
 	ptr->vaddr = art.oat_file_begin;
 	ptr->size = art.oat_file_end - art.oat_file_begin;
 	ptr->vsize = ptr->size;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -207,7 +207,7 @@
 	ptr->vaddr = art.oat_data_begin;
 	ptr->size = art.oat_data_end - art.oat_data_begin;
 	ptr->vsize = ptr->size;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+	ptr->srwx = R_BIN_SCN_READABLE; // r--
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_avr.c radare2-2.8.0+dfsg/libr/bin/p/bin_avr.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_avr.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_avr.c	2018-08-07 14:12:36.000000000 +0000
@@ -121,9 +121,9 @@
 
 static void addptr(RList *ret, const char *name, ut64 addr, const ut8 *b, int len) {
 	if (b && rjmp (b)) {
-		addsym (ret, sdb_fmt (0, "vector.%s", name), addr);
+		addsym (ret, sdb_fmt ("vector.%s", name), addr);
 		ut64 ptr_addr = rjmp_dest (addr, b + addr);
-		addsym (ret, sdb_fmt (0, "syscall.%s", name), ptr_addr);
+		addsym (ret, sdb_fmt ("syscall.%s", name), ptr_addr);
 	}
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_bf.c radare2-2.8.0+dfsg/libr/bin/p/bin_bf.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_bf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_bf.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2013-2017 - pancake */
+/* radare - LGPL - Copyright 2013-2018 - pancake */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -59,6 +59,8 @@
 	eprintf ("ar ptr=data\n");
 	eprintf ("\"e cmd.vprompt=pxa 32@stack;pxa 32@screen;pxa 32@data\"\n");
 	eprintf ("s 0\n");
+	eprintf ("e asm.bits=32\n");
+	eprintf ("dL bf\n");
 	return ret;
 }
 
@@ -105,7 +107,7 @@
 	return ret;
 }
 
-struct r_bin_plugin_t r_bin_plugin_bf = {
+RBinPlugin r_bin_plugin_bf = {
 	.name = "bf",
 	.desc = "brainfuck",
 	.license = "LGPL3",
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_bios.c radare2-2.8.0+dfsg/libr/bin/p/bin_bios.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_bios.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_bios.c	2018-08-07 14:12:36.000000000 +0000
@@ -85,7 +85,7 @@
 	ptr->paddr = bf->buf->length - ptr->size;
 	ptr->vaddr = 0xf0000;
 	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE |
-	            R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+	            R_BIN_SCN_EXECUTABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 	return ret;
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_bootimg.c radare2-2.8.0+dfsg/libr/bin/p/bin_bootimg.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_bootimg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_bootimg.c	2018-08-07 14:12:36.000000000 +0000
@@ -13,6 +13,9 @@
 #define BOOT_ARGS_SIZE 512
 #define BOOT_EXTRA_ARGS_SIZE 1024
 
+#define ADD_REMAINDER(val, aln) ((val) + ((aln) != 0 ? ((val) % (aln)) : 0))
+#define ALIGN(val, aln) ((aln) != 0 ? (((val) / (aln)) * (aln)) : (val))
+
 R_PACKED (
 struct boot_img_hdr {
 	ut8 magic[BOOT_MAGIC_SIZE];
@@ -89,7 +92,10 @@
 		free (bio);
 		return NULL;
 	}
-	bootimg_header_load (&bio->bi, bf->buf, bio->kv);
+	if (!bootimg_header_load (&bio->bi, bf->buf, bio->kv)) {
+		free(bio);
+		return NULL;
+	}
 	sdb_ns_set (sdb, "info", bio->kv);
 	return bio;
 }
@@ -168,7 +174,6 @@
 }
 
 static RList *sections(RBinFile *bf) {
-	ut64 base;
 	BootImageObj *bio = bf->o->bin_obj;
 	if (!bio) {
 		return NULL;
@@ -190,49 +195,48 @@
 	ptr->vsize = bi->page_size;
 	ptr->paddr = 0;
 	ptr->vaddr = 0;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+	ptr->srwx = R_BIN_SCN_READABLE; // r--
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
 	if (!(ptr = R_NEW0 (RBinSection))) {
 		return ret;
 	}
-	base = bi->page_size;
 	strncpy (ptr->name, "kernel", R_BIN_SIZEOF_STRINGS);
 	ptr->size = bi->kernel_size;
-	ptr->vsize = ptr->size + (ptr->size % bi->page_size);
-	ptr->paddr = base;
+	ptr->vsize = ADD_REMAINDER (ptr->size, bi->page_size);
+	ptr->paddr = bi->page_size;
 	ptr->vaddr = bi->kernel_addr;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+	ptr->srwx = R_BIN_SCN_READABLE; // r--
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
 	if (bi->ramdisk_size > 0) {
-		base = ((bi->kernel_size + 2 * bi->page_size - 1) / bi->page_size) * bi->page_size;
+		ut64 base = bi->kernel_size + 2 * bi->page_size - 1;
 		if (!(ptr = R_NEW0 (RBinSection))) {
 			return ret;
 		}
 		strncpy (ptr->name, "ramdisk", R_BIN_SIZEOF_STRINGS);
 		ptr->size = bi->ramdisk_size;
-		ptr->vsize = bi->ramdisk_size + (bi->ramdisk_size % bi->page_size);
-		ptr->paddr = base;
+		ptr->vsize = ADD_REMAINDER (bi->ramdisk_size, bi->page_size);
+		ptr->paddr = ALIGN (base, bi->page_size);
 		ptr->vaddr = bi->ramdisk_addr;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
 
 	if (bi->second_size > 0) {
-		base = ((bi->kernel_size + bi->ramdisk_size + 2 * bi->page_size - 1) / bi->page_size) * bi->page_size;
+		ut64 base = bi->kernel_size + bi->ramdisk_size + 2 * bi->page_size - 1;
 		if (!(ptr = R_NEW0 (RBinSection))) {
 			return ret;
 		}
 		strncpy (ptr->name, "second", R_BIN_SIZEOF_STRINGS);
 		ptr->size = bi->second_size;
-		ptr->vsize = bi->second_size + (bi->second_size % bi->page_size);
-		ptr->paddr = base;
+		ptr->vsize = ADD_REMAINDER (bi->second_size, bi->page_size);
+		ptr->paddr = ALIGN (base, bi->page_size);
 		ptr->vaddr = bi->second_addr;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_coff.c radare2-2.8.0+dfsg/libr/bin/p/bin_coff.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_coff.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_coff.c	2018-08-07 14:12:36.000000000 +0000
@@ -75,13 +75,13 @@
 
 	switch (s->n_sclass) {
 	case COFF_SYM_CLASS_FUNCTION:
-		ptr->type = r_str_const ("FUNC");
+		ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 		break;
 	case COFF_SYM_CLASS_FILE:
 		ptr->type = r_str_const ("FILE");
 		break;
 	case COFF_SYM_CLASS_SECTION:
-		ptr->type = r_str_const ("SECTION");
+		ptr->type = r_str_const (R_BIN_TYPE_SECTION_STR);
 		break;
 	case COFF_SYM_CLASS_EXTERNAL:
 		ptr->type = r_str_const ("EXTERNAL");
@@ -90,7 +90,7 @@
 		ptr->type = r_str_const ("STATIC");
 		break;
 	default:
-		ptr->type = r_str_const (sdb_fmt (0, "%i", s->n_sclass));
+		ptr->type = r_str_const (sdb_fmt ("%i", s->n_sclass));
 		break;
 	}
 	if (bin->symbols[idx].n_scnum < bin->hdr.f_nscns &&
@@ -151,7 +151,7 @@
 			ptr->vsize = obj->scn_hdrs[i].s_size;
 			ptr->paddr = obj->scn_hdrs[i].s_scnptr;
 			ptr->add = true;
-			ptr->srwx = R_BIN_SCN_MAP;
+			ptr->srwx = 0;
 			if (obj->scn_hdrs[i].s_flags & COFF_SCN_MEM_READ) {
 				ptr->srwx |= R_BIN_SCN_READABLE;
 			}
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_dex.c radare2-2.8.0+dfsg/libr/bin/p/bin_dex.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_dex.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_dex.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2011-2017 - pancake, h4ng3r */
+/* radare - LGPL - Copyright 2011-2018 - pancake, h4ng3r */
 
 #include <r_cons.h>
 #include <r_types.h>
@@ -407,7 +407,7 @@
 		parameters_size--;
 	}
 
-	if (!p4) {
+	if (!p4 || p4 >= p4_end) {
 		free (debug_positions);
 		free (params);
 		free (debug_locals);
@@ -620,7 +620,8 @@
 #endif
 		RBinDwarfRow *rbindwardrow = R_NEW0 (RBinDwarfRow);
 		if (!rbindwardrow) {
-			return;
+			dexdump = false;
+			break;
 		}
 		if (line) {
 			rbindwardrow->file = strdup (line);
@@ -721,6 +722,10 @@
 	return res;
 }
 
+static void * load_buffer(RBinFile *bf, RBuffer *buf, ut64 loadaddr, Sdb *sdb) {
+	return r_bin_dex_new_buf (buf);
+}
+
 static bool load(RBinFile *bf) {
 	const ut8 *bytes = bf ? r_buf_buffer (bf->buf) : NULL;
 	ut64 sz = bf ? r_buf_size (bf->buf): 0;
@@ -1089,10 +1094,10 @@
 	int i, left;
 	ut64 omi = 0;
 	bool catchAll;
-	ut16 regsz, ins_size, outs_size, tries_size;
-	ut16 handler_off, start_addr, insn_count;
-	ut32 debug_info_off, insns_size;
-	const ut8 *encoded_method_addr;
+	ut16 regsz = 0, ins_size = 0, outs_size = 0, tries_size = 0;
+	ut16 handler_off, start_addr, insn_count = 0;
+	ut32 debug_info_off = 0, insns_size = 0;
+	const ut8 *encoded_method_addr = NULL;
 
 	if (DM > 4096) {
 		eprintf ("This DEX is probably corrupted. Chopping DM from %d to 4KB\n", (int)DM);
@@ -1128,7 +1133,7 @@
 		// TODO: check size
 		// ut64 prolog_size = 2 + 2 + 2 + 2 + 4 + 4;
 		ut64 v2, handler_type, handler_addr;
-		int t;
+		int t = 0;
 		if (MC > 0) {
 			// TODO: parse debug info
 			// XXX why binfile->buf->base???
@@ -1273,7 +1278,7 @@
 			// if method has code *addr points to code
 			// otherwise it points to the encoded method
 			if (MC > 0) {
-				sym->type = r_str_const ("FUNC");
+				sym->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 				sym->paddr = MC;// + 0x10;
 				sym->vaddr = MC;// + 0x10;
 			} else {
@@ -1282,9 +1287,9 @@
 				sym->vaddr = encoded_method_addr - binfile->buf->buf;
 			}
 			if ((MA & 0x1) == 0x1) {
-				sym->bind = r_str_const ("GLOBAL");
+				sym->bind = r_str_const (R_BIN_BIND_GLOBAL_STR);
 			} else {
-				sym->bind = r_str_const ("LOCAL");
+				sym->bind = r_str_const (R_BIN_BIND_LOCAL_STR);
 			}
 
 			sym->method_flags = get_method_flags (MA);
@@ -1328,7 +1333,7 @@
 				if (!mdb) {
 					mdb = sdb_new0 ();
 				}
-				sdb_num_set (mdb, sdb_fmt (0, "method.%d", MI), sym->paddr, 0);
+				sdb_num_set (mdb, sdb_fmt ("method.%d", MI), sym->paddr, 0);
 				// -----------------
 				// WORK IN PROGRESS
 				// -----------------
@@ -1338,7 +1343,7 @@
 						if (!cdb) {
 							cdb = sdb_new0 ();
 						}
-						sdb_num_set (cdb, sdb_fmt (0, "%d", c->class_id), sym->paddr, 0);
+						sdb_num_set (cdb, sdb_fmt ("%d", c->class_id), sym->paddr, 0);
 					}
 				}
 #endif
@@ -1480,13 +1485,20 @@
 	    bin->header.data_offset < c->interfaces_offset &&
 	    c->interfaces_offset <
 		    bin->header.data_offset + bin->header.data_size) {
-		p = r_buf_get_at (binfile->buf, c->interfaces_offset, NULL);
+		int left;
+		p = r_buf_get_at (binfile->buf, c->interfaces_offset, &left);
+		if (left < 4) {
+			return;
+		}
 		int types_list_size = r_read_le32 (p);
 		if (types_list_size < 0 || types_list_size >= bin->header.types_size ) {
 			return;
 		}
 		for (z = 0; z < types_list_size; z++) {
-			int t = r_read_le16 (p + 4 + z * 2);
+			ut16 le16;
+			ut32 off = c->interfaces_offset + 4 + (z * 2);
+			r_buf_read_at (binfile->buf, off, (ut8*)&le16, sizeof (le16));
+			int t = r_read_le16 (&le16);
 			if (t > 0 && t < bin->header.types_size ) {
 				int tid = bin->types[t].descriptor_id;
 				if (dexdump) {
@@ -1701,14 +1713,14 @@
 					return false;
 				}
 				sym->name = r_str_newf ("imp.%s", imp->name);
-				sym->type = r_str_const ("FUNC");
+				sym->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 				sym->bind = r_str_const ("NONE");
 				//XXX so damn unsafe check buffer boundaries!!!!
 				//XXX use r_buf API!!
 				sym->paddr = sym->vaddr = bin->b->base + bin->header.method_offset + (sizeof (struct dex_method_t) * i) ;
 				sym->ordinal = sym_count++;
 				r_list_append (bin->methods_list, sym);
-				sdb_num_set (mdb, sdb_fmt (0, "method.%d", i), sym->paddr, 0);
+				sdb_num_set (mdb, sdb_fmt ("method.%d", i), sym->paddr, 0);
 
 			}
 			free (signature);
@@ -1785,7 +1797,7 @@
 	// STEP 1. ".onCreate(Landroid/os/Bundle;)V"
 	r_list_foreach (bin->methods_list, iter, m) {
 		if (strlen (m->name) > 30 && m->bind &&
-			(!strcmp (m->bind, "LOCAL") || !strcmp (m->bind, "GLOBAL")) &&
+			(!strcmp (m->bind, R_BIN_BIND_LOCAL_STR) || !strcmp (m->bind, R_BIN_BIND_GLOBAL_STR)) &&
 		    !strcmp (m->name + strlen (m->name) - 31,
 			     ".onCreate(Landroid/os/Bundle;)V")) {
 			if (!already_entry (ret, m->paddr)) {
@@ -1828,7 +1840,7 @@
 
 static ut64 offset_of_method_idx(RBinFile *bf, struct r_bin_dex_obj_t *dex, int idx) {
 	// ut64 off = dex->header.method_offset + idx;
-	return sdb_num_get (mdb, sdb_fmt (0, "method.%d", idx), 0);
+	return sdb_num_get (mdb, sdb_fmt ("method.%d", idx), 0);
 }
 
 // TODO: change all return type for all getoffset
@@ -1902,7 +1914,7 @@
 		strcpy (ptr->name, "header");
 		ptr->size = ptr->vsize = sizeof (struct dex_header_t);
 		ptr->paddr= ptr->vaddr = 0;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+		ptr->srwx = R_BIN_SCN_READABLE;
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -1912,7 +1924,7 @@
 		ptr->paddr= ptr->vaddr = sizeof (struct dex_header_t);
 		ptr->size = bin->code_from - ptr->vaddr; // fix size
 		ptr->vsize = ptr->size;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+		ptr->srwx = R_BIN_SCN_READABLE;
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -1921,7 +1933,7 @@
 		ptr->vaddr = ptr->paddr = bin->code_from; //ptr->vaddr = fsym;
 		ptr->size = bin->code_to - ptr->paddr;
 		ptr->vsize = ptr->size;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -1937,7 +1949,7 @@
 			// hacky workaround
 			//ptr->size = ptr->vsize = 1024;
 		}
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; //|2;
+		ptr->srwx = R_BIN_SCN_READABLE; //|2;
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -2011,6 +2023,7 @@
 	.get_sdb = &get_sdb,
 	.load = &load,
 	.load_bytes = load_bytes,
+	.load_buffer = &load_buffer,
 	.check_bytes = check_bytes,
 	.baddr = baddr,
 	.entries = entries,
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_dol.c radare2-2.8.0+dfsg/libr/bin/p/bin_dol.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_dol.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_dol.c	2018-08-07 14:12:36.000000000 +0000
@@ -114,7 +114,7 @@
 		s->vaddr = dol->text_vaddr[i];
 		s->size = dol->text_size[i];
 		s->vsize = s->size;
-		s->srwx = r_str_rwx ("mr-x");
+		s->srwx = r_str_rwx ("r-x");
 		s->add = true;
 		r_list_append (ret, s);
 	}
@@ -129,7 +129,7 @@
 		s->vaddr = dol->data_vaddr[i];
 		s->size = dol->data_size[i];
 		s->vsize = s->size;
-		s->srwx = r_str_rwx ("mr--");
+		s->srwx = r_str_rwx ("r--");
 		s->add = true;
 		r_list_append (ret, s);
 	}
@@ -140,7 +140,7 @@
 	s->vaddr = dol->bss_addr;
 	s->size = dol->bss_size;
 	s->vsize = s->size;
-	s->srwx = r_str_rwx ("-rw-");
+	s->srwx = r_str_rwx ("rw-");
 	s->add = true;
 	r_list_append (ret, s);
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_dyldcache.c radare2-2.8.0+dfsg/libr/bin/p/bin_dyldcache.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_dyldcache.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_dyldcache.c	2018-08-07 14:12:36.000000000 +0000
@@ -4,35 +4,386 @@
 #include <r_util.h>
 #include <r_lib.h>
 #include <r_bin.h>
+#include <r_core.h>
+#include <r_io.h>
 // #include "../format/mach0/mach0_defines.h"
 #define R_BIN_MACH064 1
 #include "../format/mach0/mach0.h"
+#include "objc/mach0_classes.h"
 
-static void* addr2ptr(uint64_t addr, cache_hdr_t *hdr) {
+typedef struct {
+	ut64 start_of_data;
+	ut16 *page_starts;
+	ut32 page_starts_count;
+	ut16 *page_extras;
+	ut32 page_extras_count;
+	ut64 delta_mask;
+	ut64 value_mask;
+	ut32 delta_shift;
+	ut64 value_add;
+	ut32 page_size;
+	ut64 slide;
+	ut8 *one_page_buf;
+} RDyldRebaseInfo;
+
+typedef struct _r_dyldcache {
+	ut8 magic[8];
+	RList *bins;
+	RBuffer *buf;
+	int (*original_io_read)(RIO *io, RIODesc *fd, ut8 *buf, int count);
+	RDyldRebaseInfo *rebase_info;
+	cache_hdr_t *hdr;
+	cache_map_t *maps;
+	cache_accel_t *accel;
+} RDyldCache;
+
+typedef struct _r_bin_image {
+	char *file;
+	ut64 header_at;
+} RDyldBinImage;
+
+static void free_bin(RDyldBinImage *bin) {
+	if (!bin) {
+		return;
+	}
+
+	if (bin->file) {
+		free (bin->file);
+		bin->file = NULL;
+	}
+
+	R_FREE (bin);
+}
+
+static void rebase_info_free(RDyldRebaseInfo *rebase_info) {
+	if (!rebase_info) {
+		return;
+	}
+
+	if (rebase_info->page_starts) {
+		free (rebase_info->page_starts);
+		rebase_info->page_starts = NULL;
+	}
+
+	if (rebase_info->page_extras) {
+		free (rebase_info->page_extras);
+		rebase_info->page_extras = NULL;
+	}
+
+	if (rebase_info->one_page_buf) {
+		free (rebase_info->one_page_buf);
+		rebase_info->one_page_buf = NULL;
+	}
+
+	R_FREE (rebase_info);
+}
+
+static void r_dyldcache_free(RDyldCache *cache) {
+	if (!cache) {
+		return;
+	}
+
+	if (cache->bins) {
+		r_list_free (cache->bins);
+		cache->bins = NULL;
+	}
+
+	if (cache->buf) {
+		r_buf_free (cache->buf);
+		cache->buf = NULL;
+	}
+
+	if (cache->rebase_info) {
+		rebase_info_free (cache->rebase_info);
+		cache->rebase_info = NULL;
+	}
+
+	if (cache->hdr) {
+		free (cache->hdr);
+		cache->hdr = NULL;
+	}
+
+	if (cache->maps) {
+		free (cache->maps);
+		cache->maps = NULL;
+	}
+
+	if (cache->accel) {
+		free (cache->accel);
+		cache->accel = NULL;
+	}
+
+	R_FREE (cache);
+}
+
+static ut64 va2pa(uint64_t addr, cache_hdr_t *hdr, cache_map_t *maps, RBuffer *cache_buf, ut64 slide, ut32 *offset, ut32 *left) {
+	ut64 res = UT64_MAX;
 	uint32_t i;
-	cache_map_t *map = (cache_map_t*)((const ut8*)hdr + hdr->mappingOffset);
+
+	addr -= slide;
+
 	for (i = 0; i < hdr->mappingCount; ++i) {
-		if (addr >= map[i].address && addr < map[i].address + map[i].size) {
-			return (void*)((const ut8*)hdr + map[i].fileOffset + (addr - map[i].address));
+		if (addr >= maps[i].address && addr < maps[i].address + maps[i].size) {
+			res = maps[i].fileOffset + addr - maps[i].address;
+			if (offset) {
+				*offset = addr - maps[i].address;
+			}
+			if (left) {
+				*left = maps[i].size - (addr - maps[i].address);
+			}
+			break;
 		}
 	}
-	return NULL;
+
+	return res;
 }
 
-static ut64 va2pa(uint64_t addr, void *cache) {
-	uint32_t i;
-	cache_hdr_t *hdr = (cache_hdr_t*)cache;
-	cache_map_t *map = (cache_map_t*)((uintptr_t)cache + hdr->mappingOffset);
-	for (i = 0; i < hdr->mappingCount; ++i) {
-		if (addr >= map[i].address && addr < map[i].address + map[i].size) {
-			return map[i].fileOffset + addr - map[i].address;
-			// (void*)((uintptr_t)cache + map[i].fileOffset + (addr - map[i].address));
+static ut64 bin_obj_va2pa(ut64 p, ut32 *offset, ut32 *left, RBinFile *bf) {
+	if (!bf || !bf->o || !bf->o->bin_obj) {
+		return 0;
+	}
+
+	RDyldCache *cache = (RDyldCache*) ((struct MACH0_(obj_t)*)bf->o->bin_obj)->user;
+	if (!cache) {
+		return 0;
+	}
+
+	ut64 res = va2pa (p, cache->hdr, cache->maps, cache->buf, cache->rebase_info->slide, offset, left);
+	if (res == UT64_MAX) {
+		res = 0;
+	}
+	return res;
+}
+
+static struct MACH0_(obj_t) *bin_to_mach0(RBinFile *bf, RDyldBinImage *bin) {
+	if (!bin || !bf) {
+		return NULL;
+	}
+
+	RDyldCache *cache = (RDyldCache*) bf->o->bin_obj;
+	if (!cache) {
+		return NULL;
+	}
+
+	struct MACH0_(opts_t) opts;
+	MACH0_(opts_set_default) (&opts, bf);
+	opts.header_at = bin->header_at;
+	struct MACH0_(obj_t) *mach0 = MACH0_(new_buf) (cache->buf, &opts);
+	mach0->user = cache;
+	mach0->va2pa = &bin_obj_va2pa;
+	return mach0;
+}
+
+static int prot2perm(int x) {
+	int r = 0;
+	if (x&1) r |= 4;
+	if (x&2) r |= 2;
+	if (x&4) r |= 1;
+	return r;
+}
+
+static ut32 dumb_ctzll(ut64 x) {
+	ut64 result = 0;
+	int i,j;
+	for (i = 0; i < 64; i += 8) {
+		ut8 byte = (x >> i) & 0xff;
+		if (!byte) {
+			result += 8;
+		} else {
+			for (j = 0; j < 8; j++) {
+				if (!((byte >> j) & 1)) {
+					result++;
+				} else {
+					break;
+				}
+			}
+			break;
+		}
+	}
+	return result;
+}
+
+static ut64 estimate_slide(RBinFile *bf, RDyldCache *cache, ut64 value_mask) {
+	ut64 slide = 0;
+	ut64 *classlist = malloc (64);
+	if (!classlist) {
+		goto beach;
+	}
+
+	RListIter *iter;
+	RDyldBinImage *bin;
+	r_list_foreach (cache->bins, iter, bin) {
+		bool found_sample = false;
+
+		struct MACH0_(opts_t) opts;
+		opts.verbose = bf->rbin->verbose;
+		opts.header_at = bin->header_at;
+
+		struct MACH0_(obj_t) *mach0 = MACH0_(new_buf) (cache->buf, &opts);
+		if (!mach0) {
+			goto beach;
+		}
+
+		struct section_t *sections = NULL;
+		if (!(sections = MACH0_(get_sections) (mach0))) {
+			MACH0_(mach0_free) (mach0);
+			goto beach;
+		}
+
+		int i;
+		int incomplete = 2;
+		int classlist_idx, data_idx;
+		for (i = 0; !sections[i].last && incomplete; i++) {
+			if (sections[i].size == 0) {
+				continue;
+			}
+			if (strstr (sections[i].name, "__objc_classlist")) {
+				incomplete--;
+				classlist_idx = i;
+				continue;
+			}
+			if (strstr (sections[i].name, "__objc_data")) {
+				incomplete--;
+				data_idx = i;
+				continue;
+			}
+		}
+
+		if (incomplete) {
+			goto next_bin;
+		}
+
+		int classlist_sample_size = R_MIN (64, sections[classlist_idx].size);
+		int n_classes = classlist_sample_size / 8;
+
+		if (r_buf_fread_at (cache->buf, sections[classlist_idx].offset, (ut8*) classlist, "l", n_classes) < classlist_sample_size) {
+			goto next_bin;
+		}
+
+		ut64 data_addr = sections[data_idx].addr;
+		for (i = 0; i < n_classes; i++) {
+			if ((classlist[i] & 0xfff) == (data_addr & 0xfff)) {
+				slide = (classlist[i] & value_mask) - (data_addr & value_mask);
+				found_sample = true;
+				break;
+			}
+		}
+
+next_bin:
+		MACH0_(mach0_free) (mach0);
+		R_FREE (sections);
+
+		if (found_sample) {
+			break;
 		}
 	}
-	return UT64_MAX;
+
+beach:
+	R_FREE (classlist);
+	return slide;
 }
 
-static bool dyld64 = false;
+static RDyldRebaseInfo *get_rebase_info(RBinFile *bf, RDyldCache *cache) {
+	ut16 *page_starts = NULL;
+	ut16 *page_extras = NULL;
+	ut8 *one_page_buf = NULL;
+	RBuffer *cache_buf = cache->buf;
+
+	ut64 start_of_data = 0;
+
+	int i;
+	for (i = 0; i < cache->hdr->mappingCount; ++i) {
+		int perm = prot2perm (cache->maps[i].initProt);
+		if (!(perm & R_BIN_SCN_EXECUTABLE)) {
+			start_of_data = cache->maps[i].fileOffset;// + bf->o->boffset;
+			break;
+		}
+	}
+
+	if (!start_of_data) {
+		return NULL;
+	}
+
+	cache_slide2_t slide_info;
+	ut64 offset = cache->hdr->slideInfoOffset;
+	ut64 size = sizeof (cache_slide2_t);
+	if (r_buf_fread_at (cache_buf, offset, (ut8*) &slide_info, "6i2l", 1) != size) {
+		return NULL;
+	}
+
+	if (slide_info.version != 2) {
+		return NULL;
+	}
+
+	if (slide_info.page_starts_offset == 0 ||
+		slide_info.page_starts_offset > cache->hdr->slideInfoSize ||
+		slide_info.page_starts_offset + slide_info.page_starts_count * 2 > cache->hdr->slideInfoSize) {
+		return NULL;
+	}
+
+	if (slide_info.page_extras_offset == 0 ||
+		slide_info.page_extras_offset > cache->hdr->slideInfoSize ||
+		slide_info.page_extras_offset + slide_info.page_extras_count * 2 > cache->hdr->slideInfoSize) {
+		return NULL;
+	}
+
+	if (slide_info.page_starts_count > 0) {
+		ut64 size = slide_info.page_starts_count * 2;
+		ut64 at = cache->hdr->slideInfoOffset + slide_info.page_starts_offset;
+		page_starts = malloc (size);
+		if (r_buf_fread_at (cache_buf, at, (ut8*) page_starts, "s", slide_info.page_starts_count) != size) {
+			R_FREE (page_starts);
+			return NULL;
+		}
+	}
+
+	if (slide_info.page_extras_count > 0) {
+		ut64 size = slide_info.page_extras_count * 2;
+		ut64 at = cache->hdr->slideInfoOffset + slide_info.page_extras_offset;
+		page_extras = malloc (size);
+		if (r_buf_fread_at (cache_buf, at, (ut8*) page_extras, "s", slide_info.page_extras_count) != size) {
+			R_FREE (page_starts);
+			R_FREE (page_extras);
+			return NULL;
+		}
+	}
+
+	if (slide_info.page_size > 0) {
+		one_page_buf = malloc (slide_info.page_size);
+		if (!one_page_buf) {
+			goto beach;
+		}
+	}
+
+	RDyldRebaseInfo *rebase_info = R_NEW0 (RDyldRebaseInfo);
+	if (!rebase_info) {
+		goto beach;
+	}
+
+	rebase_info->start_of_data = start_of_data;
+	rebase_info->page_starts = page_starts;
+	rebase_info->page_starts_count = slide_info.page_starts_count;
+	rebase_info->page_extras = page_extras;
+	rebase_info->page_extras_count = slide_info.page_extras_count;
+	rebase_info->value_add = slide_info.value_add;
+	rebase_info->delta_mask = slide_info.delta_mask;
+	rebase_info->value_mask = ~rebase_info->delta_mask;
+	rebase_info->delta_shift = dumb_ctzll (rebase_info->delta_mask) - 2;
+	rebase_info->page_size = slide_info.page_size;
+	rebase_info->one_page_buf = one_page_buf;
+	rebase_info->slide = estimate_slide (bf, cache, rebase_info->value_mask);
+	if (rebase_info->slide) {
+		eprintf ("dyldcache is slid: 0x%"PFMT64x"\n", rebase_info->slide);
+	}
+
+	return rebase_info;
+
+beach:
+	R_FREE (page_starts);
+	R_FREE (page_extras);
+	R_FREE (one_page_buf);
+	return NULL;
+}
 
 static bool check_bytes(const ut8 *buf, ut64 length) {
 	bool rc = false;
@@ -41,15 +392,480 @@
 		strncpy (arch, (const char *) buf + 9, R_MIN (length, sizeof (arch) - 1));
 		rc = !memcmp (buf, "dyld", 4);
 		if (rc) {
-			dyld64 = strstr (arch, "64") != NULL;
 			if (*arch) {
 				eprintf ("Arch: %s\n", arch);
+				if (!strstr (arch, "arm64")) {
+					return false;
+				}
 			}
 		}
 	}
 	return rc;
 }
 
+static cache_img_t *read_cache_images(RBuffer *cache_buf, cache_hdr_t *hdr) {
+	if (!cache_buf || !hdr || !hdr->imagesCount || !hdr->imagesOffset) {
+		return NULL;
+	}
+
+	ut64 size = sizeof (cache_img_t) * hdr->imagesCount;
+	cache_img_t *images = R_NEWS0 (cache_img_t, hdr->imagesCount);
+	if (!images) {
+		return NULL;
+	}
+
+	if (r_buf_fread_at (cache_buf, hdr->imagesOffset, (ut8*) images, "3l2i", hdr->imagesCount) != size) {
+		R_FREE (images);
+		return NULL;
+	}
+
+	return images;
+}
+
+static cache_imgxtr_t *read_cache_imgextra(RBuffer *cache_buf, cache_hdr_t *hdr, cache_accel_t *accel) {
+	if (!cache_buf || !hdr || !hdr->imagesCount || !accel || !accel->imageExtrasCount || !accel->imagesExtrasOffset) {
+		return NULL;
+	}
+
+	ut64 size = sizeof (cache_imgxtr_t) * accel->imageExtrasCount;
+	cache_imgxtr_t *images = R_NEWS0 (cache_imgxtr_t, accel->imageExtrasCount);
+	if (!images) {
+		return NULL;
+	}
+
+	if (r_buf_fread_at (cache_buf, accel->imagesExtrasOffset, (ut8*) images, "ll4i", accel->imageExtrasCount) != size) {
+		R_FREE (images);
+		return NULL;
+	}
+
+	return images;
+}
+
+static char *get_lib_name(RBuffer *cache_buf, cache_img_t *img) {
+	char file[256];
+	char *lib_name = file;
+	if (r_buf_read_at (cache_buf, img->pathFileOffset, (ut8*) &file, sizeof (file)) == sizeof (file)) {
+		file[255] = 0;
+		/*char * last_slash = strrchr (file, '/');
+		if (last_slash && *last_slash) {
+			lib_name = last_slash + 1;
+		}*/
+		return strdup (lib_name);
+	}
+	return strdup ("FAIL");
+}
+
+static int string_contains(const void *a, const void *b) {
+	return !strstr ((const char*) a, (const char*) b);
+}
+
+static RList *create_cache_bins(RBinFile *bf, RBuffer *cache_buf, cache_hdr_t *hdr, cache_map_t *maps, cache_accel_t *accel) {
+	RList *bins = r_list_newf ((RListFree)free_bin);
+	if (!bins) {
+		return NULL;
+	}
+
+	cache_img_t *img = read_cache_images (cache_buf, hdr);
+	if (!img) {
+		r_list_free (bins);
+		return NULL;
+	}
+
+	int i;
+	int *deps = NULL;
+	char *target_libs = NULL;
+	target_libs = r_sys_getenv ("R_DYLDCACHE_FILTER");
+	if (target_libs) {
+		RList *target_lib_names = r_str_split_list (target_libs, ":");
+		if (!target_lib_names) {
+			R_FREE (target_libs);
+			r_list_free (bins);
+			R_FREE (img);
+			return NULL;
+		}
+
+		deps = R_NEWS0 (int, hdr->imagesCount);
+		if (!deps) {
+			r_list_free (target_lib_names);
+			R_FREE (target_libs);
+			r_list_free (bins);
+			R_FREE (img);
+			return NULL;
+		}
+
+		ut16 *depArray = R_NEWS0 (ut16, accel->depListCount);
+		if (!depArray) {
+			r_list_free (target_lib_names);
+			R_FREE (target_libs);
+			r_list_free (bins);
+			R_FREE (deps);
+			R_FREE (img);
+			return NULL;
+		}
+
+		if (r_buf_fread_at (cache_buf, accel->depListOffset, (ut8*) depArray, "s", accel->depListCount) != accel->depListCount * 2) {
+			r_list_free (target_lib_names);
+			R_FREE (target_libs);
+			r_list_free (bins);
+			R_FREE (deps);
+			R_FREE (depArray);
+			R_FREE (img);
+			return NULL;
+		}
+
+		cache_imgxtr_t *extras = read_cache_imgextra (cache_buf, hdr, accel);
+		if (!extras) {
+			r_list_free (target_lib_names);
+			R_FREE (target_libs);
+			r_list_free (bins);
+			R_FREE (deps);
+			R_FREE (depArray);
+			R_FREE (img);
+			return NULL;
+		}
+
+		for (i = 0; i < hdr->imagesCount; i++) {
+			char *lib_name = get_lib_name (cache_buf, &img[i]);
+			if (!r_list_find (target_lib_names, lib_name, string_contains)) {
+				R_FREE (lib_name);
+				continue;
+			}
+			eprintf ("FILTER: %s\n", lib_name);
+			R_FREE (lib_name);
+			deps[i]++;
+
+			ut32 j;
+			for (j = extras[i].dependentsStartArrayIndex; depArray[j] != 0xffff; j++) {
+				bool upward = depArray[j] & 0x8000;
+				ut16 dep_index = depArray[j] & 0x7fff;
+				if (!upward) {
+					deps[dep_index]++;
+
+					char *dep_name = get_lib_name (cache_buf, &img[dep_index]);
+					eprintf ("-> %s\n", dep_name);
+					R_FREE (dep_name);
+				}
+			}
+		}
+
+		R_FREE (depArray);
+		R_FREE (extras);
+		R_FREE (target_libs);
+		r_list_free (target_lib_names);
+	}
+
+	for (i = 0; i < hdr->imagesCount; i++) {
+		if (deps && !deps[i]) {
+			continue;
+		}
+		ut64 pa = va2pa (img[i].address, hdr, maps, cache_buf, 0, NULL, NULL);
+		if (pa == UT64_MAX) {
+			continue;
+		}
+		ut8 magicbytes[4];
+		r_buf_read_at (cache_buf, pa, magicbytes, 4);
+		int magic = r_read_le32 (magicbytes);
+		switch (magic) {
+		case MH_MAGIC:
+			// parse_mach0 (ret, *ptr, bf);
+			break;
+		case MH_MAGIC_64:
+		{
+			char file[256];
+			RDyldBinImage *bin = R_NEW0 (RDyldBinImage);
+			if (!bin) {
+				r_list_free (bins);
+				R_FREE (img);
+				return NULL;
+			}
+			bin->header_at = pa;
+			if (r_buf_read_at (cache_buf, img[i].pathFileOffset, (ut8*) &file, sizeof (file)) == sizeof (file)) {
+				file[255] = 0;
+				char *last_slash = strrchr (file, '/');
+				if (last_slash && *last_slash) {
+					if (last_slash > file) {
+						char *scan = last_slash - 1;
+						while (scan > file && *scan != '/') {
+							scan--;
+						}
+						if (*scan == '/') {
+							bin->file = strdup (scan + 1);
+						} else {
+							bin->file = strdup (last_slash + 1);
+						}
+					} else {
+						bin->file = strdup (last_slash + 1);
+					}
+				} else {
+					bin->file = strdup (file);
+				}
+			}
+			r_list_append (bins, bin);
+			break;
+		}
+		default:
+			eprintf ("Unknown sub-bin\n");
+			break;
+		}
+	}
+
+	R_FREE (deps);
+	R_FREE (img);
+	return bins;
+}
+
+static void rebase_bytes(RDyldRebaseInfo *rebase_info, ut8 *buf, ut64 offset, int count, ut64 start_of_write) {
+	if (!rebase_info || !buf) {
+		return;
+	}
+
+	int in_buf = 0;
+	while (in_buf < count) {
+		ut64 offset_in_data = offset - rebase_info->start_of_data;
+		ut64 page_index = offset_in_data / rebase_info->page_size;
+		ut64 page_offset = offset_in_data % rebase_info->page_size;
+		ut64 to_next_page = rebase_info->page_size - page_offset;
+
+		if (page_index >= rebase_info->page_starts_count) {
+			goto next_page;
+		}
+		ut16 page_flag = rebase_info->page_starts[page_index];
+
+		if (page_flag == DYLD_CACHE_SLIDE_PAGE_ATTR_NO_REBASE) {
+			goto next_page;
+		}
+
+		if (!(page_flag & DYLD_CACHE_SLIDE_PAGE_ATTR_EXTRA)) {
+			ut64 first_rebase_off = rebase_info->page_starts[page_index] * 4;
+			if (first_rebase_off >= page_offset && first_rebase_off < page_offset + count) {
+				ut32 delta = 1;
+				while (delta) {
+					ut64 position = in_buf + first_rebase_off - page_offset;
+					if (position >= count) {
+						break;
+					}
+					ut64 raw_value = r_read_le64 (buf + position);
+					delta = ((raw_value & rebase_info->delta_mask) >> rebase_info->delta_shift);
+					if (position >= start_of_write) {
+						ut64 new_value = raw_value & rebase_info->value_mask;
+						if (new_value != 0) {
+							new_value += rebase_info->value_add;
+							new_value += rebase_info->slide;
+						}
+						r_write_le64 (buf + position, new_value);
+					}
+					first_rebase_off += delta;
+				}
+			}
+		}
+next_page:
+		in_buf += to_next_page;
+		offset += to_next_page;
+	}
+}
+
+static int dyldcache_io_read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
+	if (!io) {
+		return -1;
+	}
+	RCore *core = (RCore*) io->user;
+
+	if (!core || !core->bin || !core->bin->binfiles) {
+		return -1;
+	}
+
+	RDyldCache *cache = NULL;
+	RListIter *iter;
+	RBinFile *bf;
+	r_list_foreach (core->bin->binfiles, iter, bf) {
+		if (bf->fd == fd->fd ) {
+			if (!strncmp ((char*) bf->o->bin_obj, "dyldcac", 7)) {
+				cache = bf->o->bin_obj;
+			} else {
+				cache = ((struct MACH0_(obj_t)*) bf->o->bin_obj)->user;
+			}
+			break;
+		}
+	}
+	if (!cache || !cache->original_io_read) {
+		return fd->plugin->read (io, fd, buf, count);
+	}
+
+	bool includes_data = io->off > cache->rebase_info->start_of_data ||
+		(io->off + count) > cache->rebase_info->start_of_data;
+
+	int result = 0;
+
+	if (includes_data && count > 0) {
+		RDyldRebaseInfo *rebase_info = cache->rebase_info;
+
+		ut64 offset_in_data = io->off - rebase_info->start_of_data;
+		ut64 page_offset = offset_in_data % rebase_info->page_size;
+
+		ut64 internal_offset = io->off & ~(rebase_info->page_size - 1);
+		ut64 internal_end = io->off + count;
+		int rounded_count = internal_end - internal_offset;
+
+		ut8 *internal_buf = rebase_info->one_page_buf;
+		if (rounded_count > rebase_info->page_size) {
+			internal_buf = malloc (rounded_count);
+		}
+
+		ut64 original_off = io->off;
+		io->off = internal_offset;
+
+		int internal_result = cache->original_io_read (io, fd, internal_buf, rounded_count);
+
+		io->off = original_off;
+
+		if (internal_result >= page_offset + count) {
+			rebase_bytes (cache->rebase_info, internal_buf, internal_offset, internal_result, page_offset);
+			result = R_MIN (count, internal_result);
+			memcpy (buf, internal_buf + page_offset, result);
+		} else {
+			eprintf ("ERROR rebasing\n");
+			result = cache->original_io_read (io, fd, buf, count);
+		}
+
+		if (internal_buf != rebase_info->one_page_buf) {
+			R_FREE (internal_buf);
+		}
+	} else {
+		result = cache->original_io_read (io, fd, buf, count);
+	}
+
+	return result;
+}
+
+static void swizzle_io_read(RDyldCache *cache, RIO *io) {
+	if (!io || !io->desc || !io->desc->plugin) {
+		return;
+	}
+
+	RIOPlugin *plugin = io->desc->plugin;
+	cache->original_io_read = plugin->read;
+	plugin->read = &dyldcache_io_read;
+}
+
+static cache_hdr_t *read_cache_header(RBuffer *cache_buf) {
+	if (!cache_buf) {
+		return NULL;
+	}
+
+	cache_hdr_t *hdr = R_NEW0 (cache_hdr_t);
+	if (!hdr) {
+		return NULL;
+	}
+
+	ut64 size = sizeof (cache_hdr_t);
+	if (r_buf_fread_at (cache_buf, 0, (ut8*) hdr, "16c4i7l16clii4l", 1) != size) {
+		R_FREE (hdr);
+		return NULL;
+	}
+
+	return hdr;
+}
+
+static cache_map_t *read_cache_maps(RBuffer *cache_buf, cache_hdr_t *hdr) {
+	if (!cache_buf || !hdr || !hdr->mappingCount || !hdr->mappingOffset) {
+		return NULL;
+	}
+
+	ut64 size = sizeof (cache_map_t) * hdr->mappingCount;
+	cache_map_t *maps = R_NEWS0 (cache_map_t, hdr->mappingCount);
+	if (!maps) {
+		return NULL;
+	}
+
+	if (r_buf_fread_at (cache_buf, hdr->mappingOffset, (ut8*) maps, "3l2i", hdr->mappingCount) != size) {
+		R_FREE (maps);
+		return NULL;
+	}
+
+	return maps;
+}
+
+static cache_accel_t *read_cache_accel(RBuffer *cache_buf, cache_hdr_t *hdr, cache_map_t *maps) {
+	if (!cache_buf || !hdr || !hdr->accelerateInfoSize || !hdr->accelerateInfoAddr) {
+		return NULL;
+	}
+
+	ut64 offset = va2pa (hdr->accelerateInfoAddr, hdr, maps, cache_buf, 0, NULL, NULL);
+	if (!offset) {
+		return NULL;
+	}
+
+	ut64 size = sizeof (cache_accel_t);
+	cache_accel_t *accel = R_NEW0 (cache_accel_t);
+	if (!accel) {
+		return NULL;
+	}
+
+	if (r_buf_fread_at (cache_buf, offset, (ut8*) accel, "16il", 1) != size) {
+		R_FREE (accel);
+		return NULL;
+	}
+
+	accel->imagesExtrasOffset += offset;
+	accel->bottomUpListOffset += offset;
+	accel->dylibTrieOffset += offset;
+	accel->initializersOffset += offset;
+	accel->dofSectionsOffset += offset;
+	accel->reExportListOffset += offset;
+	accel->depListOffset += offset;
+	accel->rangeTableOffset += offset;
+
+	return accel;
+}
+
+static void *load_buffer(RBinFile *bf, RBuffer *buf, ut64 loadaddr, Sdb *sdb) {
+	RBuffer *fbuf = r_buf_new_with_io (&bf->rbin->iob, bf->fd);
+	ut8 bytes_to_check[32];
+	r_buf_read_at (fbuf, 0, (ut8*)bytes_to_check, 32);
+	if (!check_bytes (bytes_to_check, 32)) {
+		r_buf_free (fbuf);
+		return NULL;
+	}
+
+	RDyldCache *cache = R_NEW0 (RDyldCache);
+	strncpy ((char*) cache->magic, "dyldcac", 7);
+	cache->buf = fbuf;
+	cache->hdr = read_cache_header (fbuf);
+	if (!cache->hdr) {
+		r_dyldcache_free (cache);
+		return NULL;
+	}
+
+	cache->maps = read_cache_maps (fbuf, cache->hdr);
+	if (!cache->maps) {
+		r_dyldcache_free (cache);
+		return NULL;
+	}
+
+	cache->accel = read_cache_accel (fbuf, cache->hdr, cache->maps);
+	if (!cache->accel) {
+		r_dyldcache_free (cache);
+		return NULL;
+	}
+
+	cache->bins = create_cache_bins (bf, fbuf, cache->hdr, cache->maps, cache->accel);
+	if (!cache->bins) {
+		r_dyldcache_free (cache);
+		return NULL;
+	}
+
+	cache->rebase_info = get_rebase_info (bf, cache);
+	if (!cache->rebase_info) {
+		r_dyldcache_free (cache);
+		return NULL;
+	}
+
+	if (!cache->rebase_info->slide) {
+		swizzle_io_read (cache, bf->rbin->iob.io);
+	}
+	return cache;
+}
+
 static void *load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb) {
 	return (void *) (size_t) check_bytes (buf, sz);
 }
@@ -75,6 +891,16 @@
 
 static RBinInfo *info(RBinFile *bf) {
 	RBinInfo *ret = NULL;
+
+	if (!bf || !bf->o) {
+		return NULL;
+	}
+
+	RDyldCache *cache = (RDyldCache*) bf->o->bin_obj;
+	if (!cache) {
+		return NULL;
+	}
+
 	bool big_endian = 0;
 	if (!(ret = R_NEW0 (RBinInfo))) {
 		return NULL;
@@ -87,6 +913,7 @@
 	ret->machine = strdup (ret->arch);
 	ret->subsystem = strdup ("xnu");
 	ret->type = strdup ("library-cache");
+	bool dyld64 = strstr(cache->hdr->magic, "arm64") != NULL;
 	ret->bits = dyld64? 64: 32;
 	ret->has_va = true;
 	ret->big_endian = big_endian;
@@ -94,144 +921,373 @@
 	return ret;
 }
 
+#if 0
 static void parse_mach0 (RList *ret, ut64 paddr, RBinFile *bf) {
 	// TODO
 }
+#endif
 
 static ut64 baddr(RBinFile *bf) {
 	// XXX hardcoded
 	return 0x180000000;
 }
 
-#define USE_R2_API 0
-
-void parse_mach064 (RList *ret, ut64 paddr, RBinFile *bf) {
-	// eprintf ("MACH0 AT 0x%"PFMT64x"\n", paddr);
-	int sz = 0;
-	void *ptr = r_buf_get_at (bf->buf, paddr, &sz);
-#if USE_R2_API
-	// XXX r2 api cannot load those mach0s because addresses are messed up
-	sz = 1024*1024*1; // 1MB limit file size to 1MB to avoid slow copies.. this is a nice place to optimize unnecessary r_buf_new_from_bytes
-	RBuffer *buf = r_buf_new_with_pointers (ptr, sz);
-	struct MACH0_(obj_t) *res = MACH0_(new_buf) (buf, bf->rbin->verbose);
-	if (!res) {
+void symbols_from_bin(RList *ret, RBinFile *bf, RDyldBinImage *bin) {
+	struct MACH0_(obj_t) *mach0 = bin_to_mach0 (bf, bin);
+	if (!mach0) {
 		return;
 	}
-	struct symbol_t *symbols = MACH0_(get_symbols) (res);
-	eprintf ("mach0-64: b:%p r:%p s:%p\n", buf, res, symbols);
+
+	struct symbol_t *symbols = MACH0_(get_symbols) (mach0);
 	if (!symbols) {
 		return;
 	}
+	int i;
 	for (i = 0; !symbols[i].last; i++) {
 		if (!symbols[i].name[0] || symbols[i].addr < 100) {
 			continue;
 		}
+		if (strstr (symbols[i].name, "<redacted>")) {
+			continue;
+		}
 		RBinSymbol *sym = R_NEW0 (RBinSymbol);
 		if (!sym) {
 			break;
 		}
 		sym->name = strdup (symbols[i].name);
 		sym->vaddr = symbols[i].addr;
+		if (sym->name[0] == '_') {
+			char *dn = r_bin_demangle (bf, sym->name, sym->name, sym->vaddr);
+			if (dn) {
+				sym->dname = dn;
+				char *p = strchr (dn, '.');
+				if (p) {
+					if (IS_UPPER (sym->name[0])) {
+						sym->classname = strdup (sym->name);
+						sym->classname[p - sym->name] = 0;
+					} else if (IS_UPPER (p[1])) {
+						sym->classname = strdup (p + 1);
+						p = strchr (sym->classname, '.');
+						if (p) {
+							*p = 0;
+						}
+					}
+				}
+			}
+		}
+		sym->forwarder = r_str_const ("NONE");
+		sym->bind = r_str_const ((symbols[i].type == R_BIN_MACH0_SYMBOL_TYPE_LOCAL)?
+			R_BIN_BIND_LOCAL_STR: R_BIN_BIND_GLOBAL_STR);
+		sym->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 		sym->paddr = symbols[i].offset + bf->o->boffset;
 		sym->size = symbols[i].size;
 		sym->ordinal = i;
 		r_list_append (ret, sym);
 	}
 	free (symbols);
-	r_buf_free (buf);
-	MACH0_(free)(res);
-#else
-	const ut8 * root = r_buf_get_at (bf->buf, 0, NULL);
-	//printf("f sym.imp.%s 0 0x%llx\n", &strs[syms[n].n_un.n_strx + 1], syms[n].n_value);
-	struct MACH0_(mach_header) *h64 = ptr;
-	struct load_command *cmd = (struct load_command*)((const ut8*)ptr + 0x20);
-	struct load_command *end = (struct load_command*)((const ut8*)cmd + h64->sizeofcmds);
-	for (; cmd < end; cmd = (void *)((const ut8*)cmd + cmd->cmdsize)) {
-		// eprintf ("%p  0x%x (%02x)\n", (void*)cmd - (void*)ptr + (void*)(size_t)paddr, cmd->cmd, LC_SYMTAB);
-		if (cmd->cmd == LC_SYMTAB) {
-			struct symtab_command *stab = (struct symtab_command*)(cmd);
-			struct MACH0_(nlist) *syms = (struct MACH0_(nlist)*)((uintptr_t)root + stab->symoff);
-			char *strs = (char*)((uintptr_t)root + stab->stroff);
-			size_t n;
-			for (n = 0; n < stab->nsyms; n++) {
-				if ((syms[n].n_type & N_TYPE) != N_UNDF && (syms[n].n_type & N_EXT)) {
-					if (false) { // strs[syms[n].n_un.n_strx] != '_')
-						// LOG("Not a C symbol: %s", &strs[syms[n].n_un.n_strx]);
-					} else {
-						RBinSymbol *sym = R_NEW0 (RBinSymbol);
-						if (sym) {
-							sym->name = strdup (&strs [ syms[n].n_strx + 1]);
-							// eprintf ("Sym 0x%llx %s\n", (ut64)(syms[n].n_value), sym->name);
-							sym->vaddr = syms[n].n_value;
-							sym->paddr = syms[n].n_value;
-							// XXX THIs is unnecessarily slow! must be enums
-							sym->bind = "PUBLIC";
-							sym->type = "SYM";
-							r_list_append (ret, sym);
-						}
-						//printf("f sym.imp.%s 0 0x%llx\n", &strs[syms[n].n_un.n_strx + 1], syms[n].n_value);
-					}
-				}
-			}
-		}
-		if ((int)cmd->cmdsize < 1) {
-			eprintf ("CMD Size FAIL %d\n", cmd->cmdsize);
+	MACH0_(mach0_free) (mach0);
+}
+
+static void handle_data_sections(RBinSection *sect) {
+	if (strstr (sect->name, "_cstring")) {
+		sect->is_data = true;
+	} else if (strstr (sect->name, "_os_log")) {
+		sect->is_data = true;
+	} else if (strstr (sect->name, "_objc_methname")) {
+		sect->is_data = true;
+	} else if (strstr (sect->name, "_objc_classname")) {
+		sect->is_data = true;
+	} else if (strstr (sect->name, "_objc_methtype")) {
+		sect->is_data = true;
+	}
+}
+
+static void sections_from_bin(RList *ret, RBinFile *bf, RDyldBinImage *bin) {
+	struct MACH0_(obj_t) *mach0 = bin_to_mach0 (bf, bin);
+	if (!mach0) {
+		return;
+	}
+
+	struct section_t *sections = NULL;
+	if (!(sections = MACH0_(get_sections) (mach0))) {
+		return;
+	}
+
+	int i;
+	for (i = 0; !sections[i].last; i++) {
+		RBinSection *ptr;
+		if (!(ptr = R_NEW0 (RBinSection))) {
 			break;
 		}
+		if (bin->file) {
+			r_snprintf (ptr->name, R_BIN_SIZEOF_STRINGS, "%s.%s", bin->file, (char*)sections[i].name);
+		} else {
+			r_snprintf (ptr->name, R_BIN_SIZEOF_STRINGS, "%s", (char*)sections[i].name);
+		}
+		if (strstr (ptr->name, "la_symbol_ptr")) {
+			int len = sections[i].size / 8;
+			ptr->format = r_str_newf ("Cd %d[%d]", 8, len);
+		}
+		ptr->name[R_BIN_SIZEOF_STRINGS] = 0;
+		handle_data_sections (ptr);
+		ptr->size = sections[i].size;
+		ptr->vsize = sections[i].vsize;
+		ptr->paddr = sections[i].offset + bf->o->boffset;
+		ptr->vaddr = sections[i].addr;
+		ptr->add = true;
+		if (!ptr->vaddr) {
+			ptr->vaddr = ptr->paddr;
+		}
+		ptr->srwx = sections[i].srwx;
+		r_list_append (ret, ptr);
 	}
-#endif
+	free (sections);
+	MACH0_(mach0_free) (mach0);
 }
 
-static RList* sections(RBinFile *bf) {
-	RList *ret = NULL;
+static RList *sections(RBinFile *bf) {
+	RDyldCache *cache = (RDyldCache*) bf->o->bin_obj;
+	if (!cache) {
+		return NULL;
+	}
+
+	RList *ret = r_list_newf (free);
+	if (!ret) {
+		return NULL;
+	}
+
+	RListIter *iter;
+	RDyldBinImage *bin;
+	r_list_foreach (cache->bins, iter, bin) {
+		sections_from_bin (ret, bf, bin);
+	}
+
 	RBinSection *ptr = NULL;
-	RBinObject *obj = bf ? bf->o : NULL;
+	int i;
+	for (i = 0; i < cache->hdr->mappingCount; ++i) {
+		if (!(ptr = R_NEW0 (RBinSection))) {
+			return NULL;
+		}
+		r_snprintf (ptr->name, R_BIN_SIZEOF_STRINGS, "cache_map.%d", i);
+		ptr->size = cache->maps[i].size;
+		ptr->vsize = ptr->size;
+		ptr->paddr = cache->maps[i].fileOffset;// + bf->o->boffset;
+		ptr->vaddr = cache->maps[i].address;
+		ptr->add = true;
+		ptr->srwx = prot2perm (cache->maps[i].initProt);
+		r_list_append (ret, ptr);
+	}
+
+	if (cache->rebase_info->slide > 0) {
+		RBinSection *section;
+		r_list_foreach (ret, iter, section) {
+			section->vaddr += cache->rebase_info->slide;
+		}
+	}
 
-	ut64 vaddr = 0x180000000;
-	if (!obj || !obj->bin_obj || !(ret = r_list_newf ((RListFree)free))) {
+	return ret;
+}
+
+static RList *symbols(RBinFile *bf) {
+	RDyldCache *cache = (RDyldCache*) bf->o->bin_obj;
+	if (!cache) {
 		return NULL;
 	}
-	if (!(ptr = R_NEW0 (RBinSection))) {
+
+	RList *ret = r_list_newf (free);
+	if (!ret) {
 		return NULL;
 	}
-	r_str_ncpy (ptr->name, (char*)"text", R_BIN_SIZEOF_STRINGS);
-	ptr->size = r_buf_size (bf->buf);
-	ptr->vsize = ptr->size;
-	ptr->paddr = 0;
-	ptr->vaddr = vaddr;
-	ptr->add = true;
-	if (!ptr->vaddr) {
-		ptr->vaddr = ptr->paddr;
+
+	RListIter *iter;
+	RDyldBinImage *bin;
+	r_list_foreach (cache->bins, iter, bin) {
+		symbols_from_bin (ret, bf, bin);
 	}
-	ut32 srwx = 1 | 2 | 4;
-	ptr->srwx = srwx | R_BIN_SCN_MAP;
-	r_list_append (ret, ptr);
+
+	if (cache->rebase_info->slide > 0) {
+		RBinSymbol *sym;
+		r_list_foreach (ret, iter, sym) {
+			sym->vaddr += cache->rebase_info->slide;
+		}
+	}
+
 	return ret;
 }
 
-static RList* symbols(RBinFile *bf) {
+/* static void unswizzle_io_read(RDyldCache *cache, RIO *io) {
+	if (!io || !io->desc || !io->desc->plugin || !cache->original_io_read) {
+		return;
+	}
+
+	RIOPlugin *plugin = io->desc->plugin;
+	plugin->read = cache->original_io_read;
+	cache->original_io_read = NULL;
+} */
+
+static int destroy(RBinFile *bf) {
+	RDyldCache *cache = (RDyldCache*) bf->o->bin_obj;
+	// unswizzle_io_read (cache, bf->rbin->iob.io); // XXX io may be dead here
+	r_dyldcache_free (cache);
+	return true;
+}
+
+static RList *classes(RBinFile *bf) {
+	RDyldCache *cache = (RDyldCache*) bf->o->bin_obj;
+	if (!cache) {
+		return NULL;
+	}
+
 	RList *ret = r_list_newf (free);
-	int cache_size = 0;
-	const ut8 *cache = r_buf_get_at (bf->buf, 0, &cache_size);
-	cache_hdr_t *hdr = (cache_hdr_t *)cache;
-	cache_img_t *img = (cache_img_t*)((uintptr_t)cache + hdr->imagesOffset);
-	int i;
-	for (i = 0; i < hdr->imagesCount; i++) {
-		ut32 *ptr = addr2ptr (img[i].address, (cache_hdr_t*)cache);
-		ut64 pa = va2pa (img[i].address, (cache_hdr_t*)cache);
-		switch (*(uint32_t*)ptr) {
-		case MH_MAGIC:
-			// parse_mach0 (ret, *ptr, bf);
-			break;
-		case MH_MAGIC_64:
-			parse_mach064 (ret, pa, bf);
-			break;
-		default:
-			eprintf ("Unknown sub-bin\n");
-			break;
+	if (!ret) {
+		return NULL;
+	}
+
+	RListIter *iter;
+	RDyldBinImage *bin;
+
+	RBuffer *orig_buf = bf->buf;
+	ut32 num_of_unnamed_class = 0;
+	r_list_foreach (cache->bins, iter, bin) {
+		struct MACH0_(obj_t) *mach0 = bin_to_mach0 (bf, bin);
+		if (!mach0) {
+			goto beach;
+		}
+
+		struct section_t *sections = NULL;
+		if (!(sections = MACH0_(get_sections) (mach0))) {
+			MACH0_(mach0_free) (mach0);
+			goto beach;
 		}
+
+		int i;
+		for (i = 0; !sections[i].last; i++) {
+			if (sections[i].size == 0) {
+				continue;
+			}
+			if (!strstr (sections[i].name, "__objc_classlist")) {
+				continue;
+			}
+
+			ut8 *pointers = malloc (sections[i].size);
+			if (r_buf_read_at (cache->buf, sections[i].offset, pointers, sections[i].size) < sections[i].size) {
+				R_FREE (pointers);
+				continue;
+			}
+			ut8 *cursor = pointers;
+			ut8 *pointers_end = pointers + sections[i].size;
+
+			for (; cursor < pointers_end; cursor += 8) {
+				ut64 pointer_to_class = r_read_le64 (cursor);
+
+				RBinClass *klass;
+				if (!(klass = R_NEW0 (RBinClass)) ||
+					!(klass->methods = r_list_new ()) ||
+					!(klass->fields = r_list_new ())) {
+					R_FREE (klass);
+					R_FREE (pointers);
+					R_FREE (sections);
+					MACH0_(mach0_free) (mach0);
+					goto beach;
+				}
+
+				bf->o->bin_obj = mach0;
+				bf->buf = cache->buf;
+				MACH0_(get_class_t) ((ut64) pointer_to_class, bf, klass, false);
+				bf->o->bin_obj = cache;
+				bf->buf = orig_buf;
+
+				if (!klass->name) {
+					klass->name = r_str_newf ("UnnamedClass%" PFMT64d, num_of_unnamed_class);
+					if (!klass->name) {
+						R_FREE (klass);
+						R_FREE (pointers);
+						R_FREE (sections);
+						MACH0_(mach0_free) (mach0);
+						goto beach;
+					}
+					num_of_unnamed_class++;
+				}
+				r_list_append (ret, klass);
+			}
+
+			R_FREE (pointers);
+		}
+
+		R_FREE (sections);
+		MACH0_(mach0_free) (mach0);
 	}
+
 	return ret;
+
+beach:
+	r_list_free (ret);
+	return NULL;
+}
+
+static void header(RBinFile *bf) {
+	if (!bf || !bf->o) {
+		return;
+	}
+
+	RDyldCache *cache = (RDyldCache*) bf->o->bin_obj;
+	if (!cache) {
+		return;
+	}
+
+	RBin *bin = bf->rbin;
+	ut64 slide = cache->rebase_info->slide;
+
+	bin->cb_printf ("dyld cache header:\n");
+	bin->cb_printf ("magic: %s\n", cache->hdr->magic);
+	bin->cb_printf ("mappingOffset: 0x%"PFMT64x"\n", cache->hdr->mappingOffset);
+	bin->cb_printf ("mappingCount: 0x%"PFMT64x"\n", cache->hdr->mappingCount);
+	bin->cb_printf ("imagesOffset: 0x%"PFMT64x"\n", cache->hdr->imagesOffset);
+	bin->cb_printf ("imagesCount: 0x%"PFMT64x"\n", cache->hdr->imagesCount);
+	bin->cb_printf ("dyldBaseAddress: 0x%"PFMT64x"\n", cache->hdr->dyldBaseAddress);
+	bin->cb_printf ("codeSignatureOffset: 0x%"PFMT64x"\n", cache->hdr->codeSignatureOffset);
+	bin->cb_printf ("codeSignatureSize: 0x%"PFMT64x"\n", cache->hdr->codeSignatureSize);
+	bin->cb_printf ("slideInfoOffset: 0x%"PFMT64x"\n", cache->hdr->slideInfoOffset);
+	bin->cb_printf ("slideInfoSize: 0x%"PFMT64x"\n", cache->hdr->slideInfoSize);
+	bin->cb_printf ("localSymbolsOffset: 0x%"PFMT64x"\n", cache->hdr->localSymbolsSize);
+	char uuidstr[128];
+	r_hex_bin2str ((ut8*)cache->hdr->uuid, 16, uuidstr);
+	bin->cb_printf ("uuid: %s\n", uuidstr);
+	bin->cb_printf ("cacheType: 0x%"PFMT64x"\n", cache->hdr->cacheType);
+	bin->cb_printf ("branchPoolsOffset: 0x%"PFMT64x"\n", cache->hdr->branchPoolsOffset);
+	bin->cb_printf ("branchPoolsCount: 0x%"PFMT64x"\n", cache->hdr->branchPoolsCount);
+	bin->cb_printf ("accelerateInfoAddr: 0x%"PFMT64x"\n", cache->hdr->accelerateInfoAddr + slide);
+	bin->cb_printf ("accelerateInfoSize: 0x%"PFMT64x"\n", cache->hdr->accelerateInfoSize);
+	bin->cb_printf ("imagesTextOffset: 0x%"PFMT64x"\n", cache->hdr->imagesTextOffset);
+	bin->cb_printf ("imagesTextCount: 0x%"PFMT64x"\n", cache->hdr->imagesTextCount);
+
+	bin->cb_printf ("\nacceleration info:\n");
+	bin->cb_printf ("version: 0x%"PFMT64x"\n", cache->accel->version);
+	bin->cb_printf ("imageExtrasCount: 0x%"PFMT64x"\n", cache->accel->imageExtrasCount);
+	bin->cb_printf ("imagesExtrasOffset: 0x%"PFMT64x"\n", cache->accel->imagesExtrasOffset);
+	bin->cb_printf ("bottomUpListOffset: 0x%"PFMT64x"\n", cache->accel->bottomUpListOffset);
+	bin->cb_printf ("dylibTrieOffset: 0x%"PFMT64x"\n", cache->accel->dylibTrieOffset);
+	bin->cb_printf ("dylibTrieSize: 0x%"PFMT64x"\n", cache->accel->dylibTrieSize);
+	bin->cb_printf ("initializersOffset: 0x%"PFMT64x"\n", cache->accel->initializersOffset);
+	bin->cb_printf ("initializersCount: 0x%"PFMT64x"\n", cache->accel->initializersCount);
+	bin->cb_printf ("dofSectionsOffset: 0x%"PFMT64x"\n", cache->accel->dofSectionsOffset);
+	bin->cb_printf ("dofSectionsCount: 0x%"PFMT64x"\n", cache->accel->dofSectionsCount);
+	bin->cb_printf ("reExportListOffset: 0x%"PFMT64x"\n", cache->accel->reExportListOffset);
+	bin->cb_printf ("reExportCount: 0x%"PFMT64x"\n", cache->accel->reExportCount);
+	bin->cb_printf ("depListOffset: 0x%"PFMT64x"\n", cache->accel->depListOffset);
+	bin->cb_printf ("depListCount: 0x%"PFMT64x"\n", cache->accel->depListCount);
+	bin->cb_printf ("rangeTableOffset: 0x%"PFMT64x"\n", cache->accel->rangeTableOffset);
+	bin->cb_printf ("rangeTableCount: 0x%"PFMT64x"\n", cache->accel->rangeTableCount);
+	bin->cb_printf ("dyldSectionAddr: 0x%"PFMT64x"\n", cache->accel->dyldSectionAddr + slide);
+
+	bin->cb_printf ("\nslide info:\n");
+	bin->cb_printf ("page_starts_count: 0x%"PFMT64x"\n", cache->rebase_info->page_starts_count);
+	bin->cb_printf ("page_extras_count: 0x%"PFMT64x"\n", cache->rebase_info->page_extras_count);
+	bin->cb_printf ("delta_mask: 0x%"PFMT64x"\n", cache->rebase_info->delta_mask);
+	bin->cb_printf ("value_mask: 0x%"PFMT64x"\n", cache->rebase_info->value_mask);
+	bin->cb_printf ("delta_shift: 0x%"PFMT64x"\n", cache->rebase_info->delta_shift);
+	bin->cb_printf ("page_size: 0x%"PFMT64x"\n", cache->rebase_info->page_size);
+	bin->cb_printf ("slide: 0x%"PFMT64x"\n", slide);
 }
 
 RBinPlugin r_bin_plugin_dyldcache = {
@@ -240,11 +1296,15 @@
 	.license = "LGPL3",
 	.load = &load,
 	.load_bytes = &load_bytes,
+	.load_buffer = &load_buffer,
 	.entries = &entries,
 	.baddr = &baddr,
 	.symbols = &symbols,
 	.sections = &sections,
 	.check_bytes = &check_bytes,
+	.destroy = &destroy,
+	.classes = &classes,
+	.header = &header,
 	.info = &info,
 };
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_elf64.c radare2-2.8.0+dfsg/libr/bin/p/bin_elf64.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_elf64.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_elf64.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,7 +19,6 @@
 	//NOTE(aaSSfxxx): since RVA is vaddr - "official" image base, we just need to add imagebase to vaddr
 	struct Elf_(r_bin_elf_obj_t)* obj = bf->o->bin_obj;
 	return obj->baddr - obj->boffset + vaddr;
-
 }
 
 static void headers64(RBinFile *bf) {
@@ -122,6 +121,7 @@
 	.get_sdb = &get_sdb,
 	.load = &load,
 	.load_bytes = &load_bytes,
+	.load_buffer= &load_buffer,
 	.destroy = &destroy,
 	.check_bytes = &check_bytes,
 	.baddr = &baddr,
@@ -143,6 +143,9 @@
 	.create = &create,
 	.write = &r_bin_write_elf64,
 	.get_vaddr = &get_elf_vaddr64,
+	.file_type = &get_file_type,
+	.regstate = &regstate,
+	.maps = &maps,
 };
 
 #ifndef CORELIB
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_elf.c radare2-2.8.0+dfsg/libr/bin/p/bin_elf.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_elf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_elf.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - nibble, pancake */
+/* radare - LGPL - Copyright 2009-2018 - nibble, pancake */
 
 #include <stdio.h>
 #include <r_types.h>
@@ -12,25 +12,55 @@
 static RBinInfo* info(RBinFile *bf);
 
 //TODO: implement r_bin_symbol_dup() and r_bin_symbol_free ?
+
+static int get_file_type(RBinFile *bf) {
+	struct Elf_(r_bin_elf_obj_t) *obj = bf->o->bin_obj;
+	char *type = Elf_(r_bin_elf_get_file_type (obj));
+	int res = type? ((!strncmp (type, "CORE", 4)) ? R_BIN_TYPE_CORE : R_BIN_TYPE_DEFAULT) : -1;
+	free (type);
+	return res;
+}
+
+static RList *maps(RBinFile *bf) {
+	if (bf && bf->o) {
+		return Elf_(r_bin_elf_get_maps)(bf->o->bin_obj);
+	}
+	return NULL;
+}
+
+static char* regstate(RBinFile *bf) {
+	struct Elf_(r_bin_elf_obj_t) *obj = bf->o->bin_obj;
+	if (obj->ehdr.e_machine != EM_AARCH64 &&
+		obj->ehdr.e_machine != EM_ARM &&
+		obj->ehdr.e_machine != EM_386 &&
+		obj->ehdr.e_machine != EM_X86_64) {
+		eprintf ("Cannot retrieve regstate on: %s (not yet supported)\n",
+					Elf_(r_bin_elf_get_machine_name)(obj));
+		return NULL;
+	}
+
+	int len = 0;
+	ut8 *regs = Elf_(r_bin_elf_grab_regstate) (obj, &len);
+	char *hexregs = (regs && len > 0) ? r_hex_bin2strdup (regs, len) : NULL;
+
+	free (regs);
+	return hexregs;
+}
+
 static void setsymord(ELFOBJ* eobj, ut32 ord, RBinSymbol *ptr) {
 	if (!eobj->symbols_by_ord || ord >= eobj->symbols_by_ord_size) {
 		return;
 	}
-	free (eobj->symbols_by_ord[ord]);
-	eobj->symbols_by_ord[ord] = r_mem_dup (ptr, sizeof (RBinSymbol));
+	r_bin_symbol_free (eobj->symbols_by_ord[ord]);
+	eobj->symbols_by_ord[ord] = r_bin_symbol_clone (ptr);
 }
 
-static inline bool setimpord(ELFOBJ* eobj, ut32 ord, RBinImport *ptr) {
+static void setimpord(ELFOBJ* eobj, ut32 ord, RBinImport *ptr) {
 	if (!eobj->imports_by_ord || ord >= eobj->imports_by_ord_size) {
-		return false;
-	}
-	if (eobj->imports_by_ord[ord]) {
-		free (eobj->imports_by_ord[ord]->name);
-		free (eobj->imports_by_ord[ord]);
+		return;
 	}
-	eobj->imports_by_ord[ord] = r_mem_dup (ptr, sizeof (RBinImport));
-	eobj->imports_by_ord[ord]->name = strdup (ptr->name);
-	return true;
+	r_bin_import_free (eobj->imports_by_ord[ord]);
+	eobj->imports_by_ord[ord] = r_bin_import_clone (ptr);
 }
 
 static Sdb* get_sdb(RBinFile *bf) {
@@ -42,33 +72,30 @@
 	return NULL;
 }
 
-static void * load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb) {
+static void * load_buffer(RBinFile *bf, RBuffer *buf, ut64 loadaddr, Sdb *sdb) {
 	struct Elf_(r_bin_elf_obj_t) *res;
-	char *elf_type;
-	RBuffer *tbuf;
+	if (!buf) {
+		return NULL;
+	}
+	res = Elf_(r_bin_elf_new_buf) (buf, bf->rbin->verbose);
+	if (res) {
+		sdb_ns_set (sdb, "info", res->kv);
+	}
+	return res;
+}
 
+static void * load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb) {
+	struct Elf_(r_bin_elf_obj_t) *res;
 	if (!buf || !sz || sz == UT64_MAX) {
 		return NULL;
 	}
-	tbuf = r_buf_new ();
+	RBuffer *tbuf = r_buf_new ();
+	// NOOOEES must use io!
 	r_buf_set_bytes (tbuf, buf, sz);
 	res = Elf_(r_bin_elf_new_buf) (tbuf, bf->rbin->verbose);
 	if (res) {
 		sdb_ns_set (sdb, "info", res->kv);
 	}
-
-	elf_type = Elf_(r_bin_elf_get_file_type (res));
-	if (elf_type && !strncmp (elf_type, "CORE", 4)) {
-		int len = 0;
-		ut8 *regs = Elf_(r_bin_elf_grab_regstate)(res, &len);
-		if (regs && len > 0) {
-			char *hexregs = r_hex_bin2strdup (regs, len);
-			eprintf ("arw %s\n", hexregs);
-			free (hexregs);
-		}
-		free (regs);
-	}
-	free (elf_type);
 	r_buf_free (tbuf);
 	return res;
 }
@@ -135,8 +162,8 @@
 		ret->vaddr = Elf_(r_bin_elf_p2v) (obj, addr);
 		if (is_arm && addr & 1) {
 			ret->bits = 16;
-			ret->vaddr--; 
-			ret->paddr--; 
+			ret->vaddr--;
+			ret->paddr--;
 		}
 	}
 	return ret;
@@ -178,9 +205,6 @@
 			}
 			if (R_BIN_ELF_SCN_IS_READABLE (section[i].flags)) {
 				ptr->srwx |= R_BIN_SCN_READABLE;
-				if (obj->ehdr.e_type == ET_REL) {
-					ptr->srwx |= R_BIN_SCN_MAP;
-				}
 			}
 			r_list_append (ret, ptr);
 		}
@@ -200,7 +224,8 @@
 			ptr->vsize = phdr[i].p_memsz;
 			ptr->paddr = phdr[i].p_offset;
 			ptr->vaddr = phdr[i].p_vaddr;
-			ptr->srwx = phdr[i].p_flags | R_BIN_SCN_MAP;
+			ptr->srwx = phdr[i].p_flags;
+			ptr->is_segment = true;
 			switch (phdr[i].p_type) {
 			case PT_DYNAMIC:
 				strncpy (ptr->name, "DYNAMIC", R_BIN_SIZEOF_STRINGS);
@@ -256,7 +281,7 @@
 			ptr->vaddr = 0x10000;
 			ptr->add = true;
 			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE |
-				R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+				R_BIN_SCN_EXECUTABLE;
 			r_list_append (ret, ptr);
 		}
 	}
@@ -276,18 +301,20 @@
 		if (obj->ehdr.e_type == ET_REL) {
 			ptr->add = true;
 		}
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_MAP;
+		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE;
+		ptr->is_segment = true;
 		r_list_append (ret, ptr);
 	}
 	return ret;
 }
 
-static RBinAddr* newEntry(ut64 haddr, ut64 paddr, int type, int bits) {
+static RBinAddr* newEntry(ut64 hpaddr, ut64 hvaddr, ut64 paddr, int type, int bits) {
 	RBinAddr *ptr = R_NEW0 (RBinAddr);
 	if (ptr) {
 		ptr->paddr = paddr;
 		ptr->vaddr = paddr;
-		ptr->haddr = haddr;
+		ptr->hpaddr = hpaddr;
+		ptr->hvaddr = hvaddr;
 		ptr->bits = bits;
 		ptr->type = type;
 		//realign due to thumb
@@ -307,9 +334,11 @@
 	r_list_foreach (secs, iter, sec) {
 		type = -1;
 		if (!strcmp (sec->name, ".fini_array")) {
-			type  = R_BIN_ENTRY_TYPE_FINI;
+			type = R_BIN_ENTRY_TYPE_FINI;
 		} else if (!strcmp (sec->name, ".init_array")) {
-			type  = R_BIN_ENTRY_TYPE_INIT;
+			type = R_BIN_ENTRY_TYPE_INIT;
+		} else if (!strcmp (sec->name, ".preinit_array")) {
+			type = R_BIN_ENTRY_TYPE_PREINIT;
 		}
 		if (type != -1) {
 			ut8 *buf = calloc (sec->size, 1);
@@ -318,18 +347,20 @@
 			}
 			(void)r_buf_read_at (bf->buf, sec->paddr, buf, sec->size);
 			if (bits == 32) {
-				for (i = 0; i < sec->size; i += 4) {
+				for (i = 0; (i + 3) < sec->size; i += 4) {
 					ut32 addr32 = r_read_le32 (buf + i);
 					if (addr32) {
-						RBinAddr *ba = newEntry (sec->paddr + i, (ut64)addr32, type, bits);
+						RBinAddr *ba = newEntry (sec->paddr + i, sec->vaddr + i,
+						                         (ut64)addr32, type, bits);
 						r_list_append (ret, ba);
 					}
 				}
 			} else {
-				for (i = 0; i < sec->size; i += 8) {
+				for (i = 0; (i + 7) < sec->size; i += 8) {
 					ut64 addr64 = r_read_le64 (buf + i);
 					if (addr64) {
-						RBinAddr *ba = newEntry (sec->paddr + i, addr64, type, bits);
+						RBinAddr *ba = newEntry (sec->paddr + i, sec->vaddr + i,
+						                         addr64, type, bits);
 						r_list_append (ret, ba);
 					}
 				}
@@ -359,7 +390,7 @@
 	}
 	ptr->paddr = Elf_(r_bin_elf_get_entry_offset) (obj);
 	ptr->vaddr = Elf_(r_bin_elf_p2v) (obj, ptr->paddr);
-	ptr->haddr = 0x18;
+	ptr->hpaddr = 0x18;
 
 	if (obj->ehdr.e_machine == EM_ARM) {
 		int bin_bits = Elf_(r_bin_elf_get_bits) (obj);
@@ -390,7 +421,7 @@
 				}
 				ptr->paddr = symbol[i].offset;
 				ptr->vaddr = Elf_(r_bin_elf_p2v) (obj, ptr->paddr);
-				ptr->haddr = UT64_MAX;
+				ptr->hpaddr = UT64_MAX;
 				ptr->type = R_BIN_ENTRY_TYPE_INIT;
 				r_list_append (ret, ptr);
 				break;
@@ -442,6 +473,46 @@
 	}
 }
 
+static RBinSymbol *convert_symbol(struct Elf_(r_bin_elf_obj_t) *bin,
+				  struct r_bin_elf_symbol_t *symbol,
+				  const char *namefmt) {
+	ut64 paddr = symbol->offset;
+	ut64 vaddr = Elf_(r_bin_elf_p2v) (bin, paddr);
+	RBinSymbol *ptr = NULL;
+
+	if (!(ptr = R_NEW0 (RBinSymbol))) {
+		return NULL;
+	}
+	ptr->name = symbol->name[0] ? r_str_newf (namefmt, &symbol->name[0]) : strdup("");
+	ptr->forwarder = r_str_const ("NONE");
+	ptr->bind = r_str_const (symbol->bind);
+	ptr->type = r_str_const (symbol->type);
+	ptr->paddr = paddr;
+	ptr->vaddr = vaddr;
+	ptr->size = symbol->size;
+	ptr->ordinal = symbol->ordinal;
+	// detect thumb
+	if (bin->ehdr.e_machine == EM_ARM && *ptr->name) {
+		_set_arm_thumb_bits (bin, &ptr);
+	}
+
+	return ptr;
+}
+
+static void insert_symbol(struct Elf_(r_bin_elf_obj_t) *bin,
+			  RBinSymbol *ptr,
+			  bool is_sht_null,
+			  RList *ret) {
+	// put the symbol in symbols_ord table
+	setsymord (bin, ptr->ordinal, ptr);
+	// add it to the list of symbols only if it doesn't point to SHT_NULL
+	if (is_sht_null) {
+		r_bin_symbol_free (ptr);
+	} else {
+		r_list_append (ret, ptr);
+	}
+}
+
 static RList* symbols(RBinFile *bf) {
 	struct Elf_(r_bin_elf_obj_t) *bin;
 	struct r_bin_elf_symbol_t *symbol = NULL;
@@ -458,63 +529,40 @@
 	if (!ret) {
 		return NULL;
 	}
+
+	// traverse symbols
 	if (!(symbol = Elf_(r_bin_elf_get_symbols) (bin))) {
 		return ret;
 	}
 	for (i = 0; !symbol[i].last; i++) {
-		ut64 paddr = symbol[i].offset;
-		ut64 vaddr = Elf_(r_bin_elf_p2v) (bin, paddr);
-		if (!(ptr = R_NEW0 (RBinSymbol))) {
+		ptr = convert_symbol (bin, &symbol[i], "%s");
+		if (!ptr) {
 			break;
 		}
-		ptr->name = strdup (symbol[i].name);
-		ptr->forwarder = r_str_const ("NONE");
-		ptr->bind = r_str_const (symbol[i].bind);
-		ptr->type = r_str_const (symbol[i].type);
-		ptr->paddr = paddr;
-		ptr->vaddr = vaddr;
-		ptr->size = symbol[i].size;
-		ptr->ordinal = symbol[i].ordinal;
-		setsymord (bin, ptr->ordinal, ptr);
-		if (bin->ehdr.e_machine == EM_ARM && *ptr->name) {
-			_set_arm_thumb_bits (bin, &ptr);
-		}
-		r_list_append (ret, ptr);
+		insert_symbol (bin, ptr, symbol[i].is_sht_null, ret);
 	}
+
+	// traverse imports
 	if (!(symbol = Elf_(r_bin_elf_get_imports) (bin))) {
 		return ret;
 	}
 	for (i = 0; !symbol[i].last; i++) {
-		ut64 paddr = symbol[i].offset;
-		ut64 vaddr = Elf_(r_bin_elf_p2v) (bin, paddr);
 		if (!symbol[i].size) {
 			continue;
 		}
-		if (!(ptr = R_NEW0 (RBinSymbol))) {
+
+		ptr = convert_symbol (bin, &symbol[i], "imp.%s");
+		if (!ptr) {
 			break;
 		}
-		// TODO(eddyb) make a better distinction between imports and other symbols.
-		//snprintf (ptr->name, R_BIN_SIZEOF_STRINGS-1, "imp.%s", symbol[i].name);
-		ptr->name = r_str_newf ("imp.%s", symbol[i].name);
-		ptr->forwarder = r_str_const ("NONE");
-		//strncpy (ptr->forwarder, "NONE", R_BIN_SIZEOF_STRINGS);
-		ptr->bind = r_str_const (symbol[i].bind);
-		ptr->type = r_str_const (symbol[i].type);
-		ptr->paddr = paddr;
-		ptr->vaddr = vaddr;
-		//special case where there is not entry in the plt for the import
+
+		// special case where there is not entry in the plt for the import
 		if (ptr->vaddr == UT32_MAX) {
 			ptr->paddr = 0;
 			ptr->vaddr = 0;
 		}
-		ptr->size = symbol[i].size;
-		ptr->ordinal = symbol[i].ordinal;
-		setsymord (bin, ptr->ordinal, ptr);
-		/* detect thumb */
-		if (bin->ehdr.e_machine == EM_ARM) {
-			_set_arm_thumb_bits (bin, &ptr);
-		}
-		r_list_append (ret, ptr);
+
+		insert_symbol (bin, ptr, symbol[i].is_sht_null, ret);
 	}
 	return ret;
 }
@@ -545,7 +593,7 @@
 		ptr->bind = r_str_const (import[i].bind);
 		ptr->type = r_str_const (import[i].type);
 		ptr->ordinal = import[i].ordinal;
-		(void)setimpord (bin, ptr->ordinal, ptr);
+		setimpord (bin, ptr->ordinal, ptr);
 		r_list_append (ret, ptr);
 	}
 	return ret;
@@ -852,6 +900,25 @@
 	}
 }
 
+static bool ht_insert_intu64(SdbHash* ht, int key, ut64 value) {
+	ut64 *mvalue = malloc (sizeof (ut64));
+	if (!mvalue) {
+		return false;
+	}
+	*mvalue = value;
+	return ht_insert (ht, sdb_fmt ("%d", key), (void *)mvalue);
+}
+
+static ut64 ht_find_intu64(SdbHash* ht, int key, bool* found) {
+	ut64 *mvalue = (ut64 *)ht_find (ht, sdb_fmt ("%d", key), found);
+	return *found ? *mvalue : 0;
+}
+
+static void relocs_by_sym_free(HtKv *kv) {
+	free (kv->key);
+	free (kv->value);
+}
+
 static RList* patch_relocs(RBin *b) {
 	RList *ret = NULL;
 	RBinReloc *ptr = NULL;
@@ -859,10 +926,14 @@
 	RBinObject *obj = NULL;
 	struct Elf_(r_bin_elf_obj_t) *bin = NULL;
 	RIOSection *g = NULL, *s = NULL;
+	SdbHash *relocs_by_sym;
 	SdbListIter *iter;
 	RBinElfReloc *relcs = NULL;
+	RBinInfo *info;
+	int cdsz;
 	int i;
-	ut64 n_off, n_vaddr, vaddr, size, sym_addr = 0, offset = 0;
+	ut64 n_off, n_vaddr, vaddr, size, offset = 0;
+
 	if (!b)
 		return NULL;
 	io = b->iob.io;
@@ -880,6 +951,10 @@
 	   	eprintf ("Warning: run r2 with -e io.cache=true to fix relocations in disassembly\n");
 		return relocs (r_bin_cur (b));
 	}
+
+	info = obj ? obj->info: NULL;
+	cdsz = info? (info->bits == 64? 8: info->bits == 32? 4: info->bits == 16 ? 4: 0): 0;
+
 	ls_foreach (io->sections, iter, s) {
 		if (s->paddr > offset) {
 			offset = s->paddr;
@@ -893,7 +968,7 @@
 	n_vaddr = g->vaddr + g->vsize;
 	//reserve at least that space
 	size = bin->reloc_num * 4;
-	if (!b->iob.section_add (io, n_off, n_vaddr, size, size, R_BIN_SCN_READABLE|R_BIN_SCN_MAP, ".got.r2", 0, io->desc->fd)) {
+	if (!b->iob.section_add (io, n_off, n_vaddr, size, size, R_BIN_SCN_READABLE, ".got.r2", 0, io->desc->fd)) {
 		return NULL;
 	}
 	if (!(relcs = Elf_(r_bin_elf_get_relocs) (bin))) {
@@ -903,11 +978,20 @@
 		free (relcs);
 		return NULL;
 	}
+	if (!(relocs_by_sym = ht_new (NULL, relocs_by_sym_free, NULL))) {
+		r_list_free (ret);
+		free (relcs);
+		return NULL;
+	}
 	vaddr = n_vaddr;
 	for (i = 0; !relcs[i].last; i++) {
+		ut64 sym_addr = 0;
+
 		if (relcs[i].sym) {
 			if (relcs[i].sym < bin->imports_by_ord_size && bin->imports_by_ord[relcs[i].sym]) {
-				sym_addr = 0;
+				bool found;
+
+				sym_addr = ht_find_intu64 (relocs_by_sym, relcs[i].sym, &found);
 			} else if (relcs[i].sym < bin->symbols_by_ord_size && bin->symbols_by_ord[relcs[i].sym]) {
 				sym_addr = bin->symbols_by_ord[relcs[i].sym]->vaddr;
 			}
@@ -917,13 +1001,17 @@
 		if (!(ptr = reloc_convert (bin, &relcs[i], n_vaddr))) {
 			continue;
 		}
-		ptr->vaddr = sym_addr ? sym_addr : vaddr;
-		if (!sym_addr) {
-			vaddr += 4;
+
+		if (sym_addr) {
+			ptr->vaddr = sym_addr;
+		} else {
+			ptr->vaddr = vaddr;
+			ht_insert_intu64 (relocs_by_sym, relcs[i].sym, vaddr);
+			vaddr += cdsz;
 		}
 		r_list_append (ret, ptr);
-		sym_addr = 0;
 	}
+	ht_free (relocs_by_sym);
 	free (relcs);
 	return ret;
 }
@@ -946,6 +1034,23 @@
 	return ret;
 }
 
+static int has_retguard(RBinFile *bf) {
+	int ret = -1;
+	RList* sections_list = sections (bf);
+	RListIter *iter;
+	RBinSection *section;
+	r_list_foreach (sections_list, iter, section) {
+		# define R_BIN_RANDOMDATA_RETGUARD_SZ 48
+		if (!strcmp (section->name, ".openbsd.randomdata")) {
+			// The retguard cookie adds 8 per return function inst.
+			ret = (section->size >= R_BIN_RANDOMDATA_RETGUARD_SZ);
+			break;
+		}
+	}
+	r_list_free (sections_list);
+	return ret;
+}
+
 static RBinInfo* info(RBinFile *bf) {
 	RBinInfo *ret = NULL;
 	char *str;
@@ -972,6 +1077,7 @@
 	ret->has_pi = (strstr (str, "DYN"))? 1: 0;
 	ret->has_lit = true;
 	ret->has_canary = has_canary (bf);
+	ret->has_retguard = has_retguard (bf);
 	if (!(str = Elf_(r_bin_elf_get_elf_class) (obj))) {
 		free (ret);
 		return NULL;
@@ -1030,29 +1136,58 @@
 }
 
 static RList* fields(RBinFile *bf) {
+	int left = 0;
 	RList *ret = NULL;
-	RBinField *ptr = NULL;
-	struct r_bin_elf_field_t *field = NULL;
-	int i;
+	const ut8 *buf = NULL;
 
 	if (!(ret = r_list_new ())) {
 		return NULL;
 	}
 	ret->free = free;
-	if (!(field = Elf_(r_bin_elf_get_fields) (bf->o->bin_obj))) {
+
+	if (!(buf = r_buf_get_at (bf->buf, 0, &left))) {
+		RBinField *ptr = NULL;
+		struct r_bin_elf_field_t *field = NULL;
+		int i;
+
+		if (!(field = Elf_(r_bin_elf_get_fields) (bf->o->bin_obj))) {
 		return ret;
-	}
-	for (i = 0; !field[i].last; i++) {
-		if (!(ptr = R_NEW0 (RBinField))) {
-			break;
 		}
-		ptr->name = strdup (field[i].name);
-		ptr->comment = NULL;
-		ptr->vaddr = field[i].offset;
-		ptr->paddr = field[i].offset;
-		r_list_append (ret, ptr);
+		for (i = 0; !field[i].last; i++) {
+			if (!(ptr = R_NEW0 (RBinField))) {
+				break;
+			}
+			ptr->name = strdup (field[i].name);
+			ptr->comment = NULL;
+			ptr->vaddr = field[i].offset;
+			ptr->paddr = field[i].offset;
+			r_list_append (ret, ptr);
+		}
+		free (field);
+
+	} else {
+		#define ROW(nam,siz,val,fmt) \
+			r_list_append (ret, r_bin_field_new (addr, addr, siz, nam, sdb_fmt ("0x%08x", val), fmt));
+		if (left < sizeof (Elf_(Ehdr))) {
+			return ret;
+		}
+		ut64 addr = 0;
+		ROW ("ELF", 4, r_read_le32 (buf), "x"); addr+=0x10;
+		ROW ("Type", 2, r_read_le16 (buf + addr), "x"); addr+=0x2;
+		ROW ("Machine", 2, r_read_le16 (buf + addr), "x"); addr+=0x2;
+		ROW ("Version", 4, r_read_le32 (buf + addr), "x"); addr+=0x4;
+
+		if (r_read_le8 (buf + 0x04) == 1) {
+			ROW ("Entry point", 4, r_read_le32 (buf + addr), "x"); addr+=0x4;
+			ROW ("PhOff", 4, r_read_le32 (buf + addr), "x"); addr+=0x4;
+			ROW ("ShOff", 4, r_read_le32 (buf + addr), "x");
+		} else {
+			ROW ("Entry point", 8, r_read_le64 (buf + addr), "x"); addr+=0x8;
+			ROW ("PhOff", 8, r_read_le64 (buf + addr), "x"); addr+=0x8;
+			ROW ("ShOff", 8, r_read_le64 (buf + addr), "x");
+		}
 	}
-	free (field);
+
 	return ret;
 }
 
@@ -1079,12 +1214,12 @@
 #define p bf->rbin->cb_printf
 	const ut8 *buf = r_buf_get_at (bf->buf, 0, NULL);
 	p ("0x00000000  ELF MAGIC   0x%08x\n", r_read_le32 (buf));
-	p ("0x00000004  Type        0x%04x\n", r_read_le16 (buf + 4));
-	p ("0x00000006  Machine     0x%04x\n", r_read_le16 (buf + 6));
-	p ("0x00000008  Version     0x%08x\n", r_read_le32 (buf + 8));
-	p ("0x0000000c  Entrypoint  0x%08x\n", r_read_le32 (buf + 12));
-	p ("0x00000010  PhOff       0x%08x\n", r_read_le32 (buf + 16));
-	p ("0x00000014  ShOff       0x%08x\n", r_read_le32 (buf + 20));
+	p ("0x00000010  Type        0x%04x\n", r_read_le16 (buf + 0x10));
+	p ("0x00000012  Machine     0x%04x\n", r_read_le16 (buf + 0x12));
+	p ("0x00000014  Version     0x%08x\n", r_read_le32 (buf + 0x14));
+	p ("0x00000018  Entrypoint  0x%08x\n", r_read_le32 (buf + 0x18));
+	p ("0x0000001c  PhOff       0x%08x\n", r_read_le32 (buf + 0x1c));
+	p ("0x00000020  ShOff       0x%08x\n", r_read_le32 (buf + 0x20));
 }
 
 static bool check_bytes(const ut8 *buf, ut64 length) {
@@ -1197,6 +1332,7 @@
 	.get_sdb = &get_sdb,
 	.load = &load,
 	.load_bytes = &load_bytes,
+	.load_buffer = &load_buffer,
 	.destroy = &destroy,
 	.check_bytes = &check_bytes,
 	.baddr = &baddr,
@@ -1217,6 +1353,9 @@
 	.dbginfo = &r_bin_dbginfo_elf,
 	.create = &create,
 	.write = &r_bin_write_elf,
+	.file_type = &get_file_type,
+	.regstate = &regstate,
+	.maps = &maps,
 };
 
 #ifndef CORELIB
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_mach064.c radare2-2.8.0+dfsg/libr/bin/p/bin_mach064.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_mach064.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_mach064.c	2018-08-07 14:12:36.000000000 +0000
@@ -278,6 +278,7 @@
 	.get_sdb = &get_sdb,
 	.load = &load,
 	.load_bytes = &load_bytes,
+	.load_buffer = &load_buffer,
 	.destroy = &destroy,
 	.check_bytes = &check_bytes,
 	.baddr = &baddr,
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_mach0.c radare2-2.8.0+dfsg/libr/bin/p/bin_mach0.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_mach0.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_mach0.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -34,13 +34,14 @@
 
 static void * load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb){
 	struct MACH0_(obj_t) *res = NULL;
-	RBuffer *tbuf = NULL;
 	if (!buf || !sz || sz == UT64_MAX) {
 		return NULL;
 	}
-	tbuf = r_buf_new ();
+	RBuffer *tbuf = r_buf_new ();
 	r_buf_set_bytes (tbuf, buf, sz);
-	res = MACH0_(new_buf) (tbuf, bf->rbin->verbose);
+	struct MACH0_(opts_t) opts;
+	MACH0_(opts_set_default) (&opts, bf);
+	res = MACH0_(new_buf) (tbuf, &opts);
 	if (res) {
 		sdb_ns_set (sdb, "info", res->kv);
 	}
@@ -48,6 +49,20 @@
 	return res;
 }
 
+static void * load_buffer(RBinFile *bf, RBuffer *buf, ut64 loadaddr, Sdb *sdb){
+	struct MACH0_(obj_t) *res = NULL;
+	if (!buf) {
+		return NULL;
+	}
+	struct MACH0_(opts_t) opts;
+	MACH0_(opts_set_default) (&opts, bf);
+	res = MACH0_(new_buf) (buf, &opts);
+	if (res) {
+		sdb_ns_set (sdb, "info", res->kv);
+	}
+	return res;
+}
+
 static bool load(RBinFile *bf) {
 	void *res;
 	const ut8 *bytes = bf ? r_buf_buffer (bf->buf) : NULL;
@@ -119,7 +134,9 @@
 			const int sz = 8;
 #endif
 			int len = sections[i].size / sz;
-			ptr->format = r_str_newf ("Cd %d[%d]", sz, len);
+			if (len < bf->size) {
+				ptr->format = r_str_newf ("Cd %d[%d]", sz, len);
+			}
 		}
 		ptr->name[R_BIN_SIZEOF_STRINGS] = 0;
 		handle_data_sections (ptr);
@@ -129,21 +146,24 @@
 		ptr->vaddr = sections[i].addr;
 		ptr->add = true;
 		if (!ptr->vaddr) {
-			ptr->vaddr = ptr->paddr;
+			// XXX(lowlyw) this is a valid macho, but rarely will anything
+			// be mapped at va = 0
+			eprintf ("mapping text to va = 0\n");
+			// ptr->vaddr = ptr->paddr;
 		}
-		ptr->srwx = sections[i].srwx | R_BIN_SCN_MAP;
+		ptr->srwx = sections[i].srwx;
 		r_list_append (ret, ptr);
 	}
 	free (sections);
 	return ret;
 }
 
-static RBinAddr* newEntry(ut64 haddr, ut64 paddr, int type, int bits) {
+static RBinAddr* newEntry(ut64 hpaddr, ut64 paddr, int type, int bits) {
 	RBinAddr *ptr = R_NEW0 (RBinAddr);
 	if (ptr) {
 		ptr->paddr = paddr;
 		ptr->vaddr = paddr;
-		ptr->haddr = haddr;
+		ptr->hpaddr = hpaddr;
 		ptr->bits = bits;
 		ptr->type = type;
 		//realign due to thumb
@@ -209,7 +229,7 @@
 	if ((ptr = R_NEW0 (RBinAddr))) {
 		ptr->paddr = entry->offset + obj->boffset;
 		ptr->vaddr = entry->addr;
-		ptr->haddr = entry->haddr;
+		ptr->hpaddr = entry->haddr;
 		ptr->bits = bits;
 		//realign due to thumb
 		if (bits == 16) {
@@ -291,8 +311,8 @@
 		}
 		ptr->forwarder = r_str_const ("NONE");
 		ptr->bind = r_str_const ((symbols[i].type == R_BIN_MACH0_SYMBOL_TYPE_LOCAL)?
-				"LOCAL": "GLOBAL");
-		ptr->type = r_str_const ("FUNC");
+				R_BIN_BIND_LOCAL_STR: R_BIN_BIND_GLOBAL_STR);
+		ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 		ptr->vaddr = symbols[i].addr;
 		ptr->paddr = symbols[i].offset + obj->boffset;
 		ptr->size = symbols[i].size;
@@ -301,7 +321,7 @@
 		}
 		ptr->ordinal = i;
 		bin->dbg_info = strncmp (ptr->name, "radr://", 7)? 0: 1;
-		sdb_set (symcache, sdb_fmt (0, "sym0x%"PFMT64x, ptr->vaddr), "found", 0);
+		sdb_set (symcache, sdb_fmt ("sym0x%"PFMT64x, ptr->vaddr), "found", 0);
 		if (!strncmp (ptr->name, "type.", 5)) {
 			lang = "go";
 		}
@@ -325,9 +345,9 @@
 			ptr->paddr = address;
 			ptr->size = 0;
 			ptr->name = r_str_newf ("func.%08"PFMT64x, ptr->vaddr);
-			ptr->type = "FUNC";
+			ptr->type = R_BIN_TYPE_FUNC_STR;
 			ptr->forwarder = "NONE";
-			ptr->bind = "LOCAL";
+			ptr->bind = R_BIN_BIND_LOCAL_STR;
 			ptr->ordinal = i++;
 			if (bin->hdr.cputype == CPU_TYPE_ARM && wordsize < 64) {
 				_handle_arm_thumb (bin, &ptr);
@@ -839,6 +859,7 @@
 	.get_sdb = &get_sdb,
 	.load = &load,
 	.load_bytes = &load_bytes,
+	.load_buffer = &load_buffer,
 	.destroy = &destroy,
 	.check_bytes = &check_bytes,
 	.baddr = &baddr,
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_mbn.c radare2-2.8.0+dfsg/libr/bin/p/bin_mbn.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_mbn.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_mbn.c	2018-08-07 14:12:36.000000000 +0000
@@ -122,7 +122,7 @@
 	ptr->vsize = sb.psize;
 	ptr->paddr = sb.paddr + 40;
 	ptr->vaddr = sb.vaddr;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 	ptr->add = true;
 	ptr->has_strings = true;
 	r_list_append (ret, ptr);
@@ -135,7 +135,7 @@
 	ptr->vsize = sb.sign_sz;
 	ptr->paddr = sb.sign_va - sb.vaddr;
 	ptr->vaddr = sb.sign_va;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+	ptr->srwx = R_BIN_SCN_READABLE; // r--
 	ptr->has_strings = true;
 	ptr->add = true;
 	r_list_append (ret, ptr);
@@ -149,7 +149,7 @@
 		ptr->vsize = sb.cert_sz;
 		ptr->paddr = sb.cert_va - sb.vaddr;
 		ptr->vaddr = sb.cert_va;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+		ptr->srwx = R_BIN_SCN_READABLE; // r--
 		ptr->has_strings = true;
 		ptr->add = true;
 		r_list_append (ret, ptr);
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_mdmp.c radare2-2.8.0+dfsg/libr/bin/p/bin_mdmp.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_mdmp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_mdmp.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2016-2017 - Davis, Alex Kornitzer */
+/* radare2 - LGPL - Copyright 2016-2018 - Davis, Alex Kornitzer */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -73,7 +73,7 @@
 	obj = (struct r_bin_mdmp_obj *)bf->o->bin_obj;
 
 	ret->big_endian = obj->endian;
-	ret->claimed_checksum = strdup (sdb_fmt (0, "0x%08x", obj->hdr->check_sum));  // FIXME: Leaks
+	ret->claimed_checksum = strdup (sdb_fmt ("0x%08x", obj->hdr->check_sum));  // FIXME: Leaks
 	ret->file = bf->file ? strdup (bf->file) : NULL;
 	ret->has_va = true;
 	ret->rclass = strdup ("mdmp");
@@ -83,7 +83,7 @@
 	// FIXME: Needed to fix issue with PLT resolving. Can we get away with setting this for all children bins?
 	ret->has_lit = true;
 
-	sdb_set (bf->sdb, "mdmp.flags", sdb_fmt (0, "0x%08x", obj->hdr->flags), 0);
+	sdb_set (bf->sdb, "mdmp.flags", sdb_fmt ("0x%08x", obj->hdr->flags), 0);
 	sdb_num_set (bf->sdb, "mdmp.streams", obj->hdr->number_of_streams, 0);
 
 	if (obj->streams.system_info) {
@@ -108,7 +108,8 @@
 			ret->bits = 64;
 			break;
 		default:
-			strncpy (ret->machine, "Unknown", R_BIN_SIZEOF_STRINGS);
+			ret->machine = strdup ("Unknown");
+			break;
 		}
 
 		switch (obj->streams.system_info->product_type) {
@@ -248,8 +249,7 @@
 		ptr->add = true;
 		ptr->has_strings = false;
 
-		ptr->srwx = R_BIN_SCN_MAP;
-		ptr->srwx |= r_bin_mdmp_get_srwx (obj, ptr->vaddr);
+		ptr->srwx = r_bin_mdmp_get_srwx (obj, ptr->vaddr);
 
 		r_list_append (ret, ptr);
 	}
@@ -268,8 +268,7 @@
 		ptr->add = true;
 		ptr->has_strings = false;
 
-		ptr->srwx = R_BIN_SCN_MAP;
-		ptr->srwx |= r_bin_mdmp_get_srwx (obj, ptr->vaddr);
+		ptr->srwx = r_bin_mdmp_get_srwx (obj, ptr->vaddr);
 
 		r_list_append (ret, ptr);
 
@@ -291,7 +290,7 @@
 		ptr->add = false;
 		ptr->has_strings = false;
 		/* As this is an encompassing section we will set the RWX to 0 */
-		ptr->srwx = R_BIN_SCN_MAP;
+		ptr->srwx = 0;
 
 		r_list_append (ret, ptr);
 
@@ -318,7 +317,7 @@
 }
 
 static RList *mem (RBinFile *bf) {
-	struct minidump_location_descriptor *location;
+	struct minidump_location_descriptor *location = NULL;
 	struct minidump_memory_descriptor *module;
 	struct minidump_memory_descriptor64 *module64;
 	struct minidump_memory_info *mem_info;
@@ -342,9 +341,8 @@
 			return ret;
 		}
 		ptr->addr = module->start_of_memory_range;
-		ptr->size = (location->data_size);
-		ptr->perms = R_BIN_SCN_MAP;
-		ptr->perms |= r_bin_mdmp_get_srwx (obj, ptr->addr);
+		ptr->size = location? location->data_size: 0;
+		ptr->perms = r_bin_mdmp_get_srwx (obj, ptr->addr);
 
 		/* [1] */
 		state = type = a_protect = 0;
@@ -354,7 +352,7 @@
 			a_protect = mem_info->allocation_protect;
 		}
 		location = &(module->memory);
-		ptr->name = strdup (sdb_fmt (0, "paddr=0x%08x state=0x%08x type=0x%08x allocation_protect=0x%08x Memory_Section", location->rva, state, type, a_protect));
+		ptr->name = strdup (sdb_fmt ("paddr=0x%08x state=0x%08x type=0x%08x allocation_protect=0x%08x Memory_Section", location->rva, state, type, a_protect));
 
 		r_list_append (ret, ptr);
 	}
@@ -366,8 +364,7 @@
 		}
 		ptr->addr = module64->start_of_memory_range;
 		ptr->size = module64->data_size;
-		ptr->perms = R_BIN_SCN_MAP;
-		ptr->perms |= r_bin_mdmp_get_srwx (obj, ptr->addr);
+		ptr->perms = r_bin_mdmp_get_srwx (obj, ptr->addr);
 
 		/* [1] */
 		state = type = a_protect = 0;
@@ -376,7 +373,7 @@
 			type = mem_info->type;
 			a_protect = mem_info->allocation_protect;
 		}
-		ptr->name = strdup (sdb_fmt (0, "paddr=0x%08x state=0x%08x type=0x%08x allocation_protect=0x%08x Memory_Section", index, state, type, a_protect));
+		ptr->name = strdup (sdb_fmt ("paddr=0x%08x state=0x%08x type=0x%08x allocation_protect=0x%08x Memory_Section", index, state, type, a_protect));
 
 		index += module64->data_size;
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_menuet.c radare2-2.8.0+dfsg/libr/bin/p/bin_menuet.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_menuet.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_menuet.c	2018-08-07 14:12:36.000000000 +0000
@@ -132,7 +132,7 @@
 	ptr->vsize = ptr->size + (ptr->size % 4096);
 	ptr->paddr = r_read_ble32 (buf + 12, false);
 	ptr->vaddr = ptr->paddr + baddr (bf);
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -148,7 +148,7 @@
 		ptr->vsize = ptr->size + (ptr->size % 4096);
 		ptr->paddr = r_read_ble32 (buf + 40, false);
 		ptr->vaddr = ptr->paddr + baddr (bf);
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+		ptr->srwx = R_BIN_SCN_READABLE; // r--
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_mz.c radare2-2.8.0+dfsg/libr/bin/p/bin_mz.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_mz.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_mz.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2015-2017 nodepad */
+/* radare - LGPL - Copyright 2015-2018 nodepad */
 
 #include <r_types.h>
 #include <r_bin.h>
@@ -28,7 +28,7 @@
 	pa &= 0xffff;
 	if (pa >= 0x20 && pa + 1 < length) {
 		ut16 pe = r_read_ble16 (buf + 0x3c, false);
-		if (pe < length && length > 0x104 && !memcmp (buf + pe, "PE", 2)) {
+		if (pe + 2 < length && length > 0x104 && !memcmp (buf + pe, "PE", 2)) {
 			return false;
 		}
 		return true;
@@ -109,6 +109,23 @@
 	return true;
 }
 
+static RBinAddr* binsym(RBinFile *bf, int type) {
+	ut64 mzaddr = 0;
+	RBinAddr *ret = NULL;
+	if (bf && bf->o && bf->o->bin_obj) {
+		switch(type) {
+		case R_BIN_SYM_MAIN:
+			mzaddr = r_bin_mz_get_main_vaddr (bf->o->bin_obj);
+			break;
+		}
+	}
+	if (mzaddr && (ret = R_NEW0 (RBinAddr))) {
+		ret->paddr = mzaddr;
+		ret->vaddr = mzaddr;
+	}
+	return ret;
+}
+
 static RList * entries(RBinFile *bf) {
 	RBinAddr *ptr = NULL;
 	RList *res = NULL;
@@ -151,7 +168,7 @@
 		ptr->vsize = segments[i].size;
 		ptr->paddr = segments[i].paddr;
 		ptr->vaddr = segments[i].paddr;
-		ptr->srwx = r_str_rwx ("mrwx");
+		ptr->srwx = r_str_rwx ("rwx");
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -177,6 +194,7 @@
 	ret->big_endian = false;
 	ret->has_crypto = false;
 	ret->has_canary = false;
+	ret->has_retguard = -1;
 	ret->has_nx = false;
 	ret->has_pi = false;
 	ret->has_va = false;
@@ -255,6 +273,7 @@
 	.load_bytes = &load_bytes,
 	.destroy = &destroy,
 	.check_bytes = &check_bytes,
+	.binsym = &binsym,
 	.entries = &entries,
 	.sections = &sections,
 	.info = &info,
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_nes.c radare2-2.8.0+dfsg/libr/bin/p/bin_nes.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_nes.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_nes.c	2018-08-07 14:12:36.000000000 +0000
@@ -99,7 +99,7 @@
 	ptr->size = ihdr.prg_page_count_16k * PRG_PAGE_SIZE;
 	ptr->vaddr = ROM_START_ADDRESS;
 	ptr->vsize = ROM_SIZE;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 	return ret;
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_nin3ds.c radare2-2.8.0+dfsg/libr/bin/p/bin_nin3ds.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_nin3ds.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_nin3ds.c	2018-08-07 14:12:36.000000000 +0000
@@ -66,7 +66,7 @@
 			sections[i]->vsize = loaded_header.sections[i].size;
 			sections[i]->paddr = loaded_header.sections[i].offset;
 			sections[i]->vaddr = loaded_header.sections[i].address;
-			sections[i]->srwx = r_str_rwx ("mrwx");
+			sections[i]->srwx = r_str_rwx ("rwx");
 			sections[i]->add = true;
 		}
 	}
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_ninds.c radare2-2.8.0+dfsg/libr/bin/p/bin_ninds.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_ninds.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_ninds.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - 2015-2017 - a0rtega */
+/* radare - LGPL - 2015-2018 - a0rtega */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -65,21 +65,21 @@
 		return NULL;
 	}
 
-	strncpy (ptr9->name, "arm9", 5);
+	strcpy (ptr9->name, "arm9");
 	ptr9->size = loaded_header.arm9_size;
 	ptr9->vsize = loaded_header.arm9_size;
 	ptr9->paddr = loaded_header.arm9_rom_offset;
 	ptr9->vaddr = loaded_header.arm9_ram_address;
-	ptr9->srwx = r_str_rwx ("mrwx");
+	ptr9->srwx = r_str_rwx ("rwx");
 	ptr9->add = true;
 	r_list_append (ret, ptr9);
 
-	strncpy (ptr7->name, "arm7", 5);
+	strcpy (ptr7->name, "arm7");
 	ptr7->size = loaded_header.arm7_size;
 	ptr7->vsize = loaded_header.arm7_size;
 	ptr7->paddr = loaded_header.arm7_rom_offset;
 	ptr7->vaddr = loaded_header.arm7_ram_address;
-	ptr7->srwx = r_str_rwx ("mrwx");
+	ptr7->srwx = r_str_rwx ("rwx");
 	ptr7->add = true;
 	r_list_append (ret, ptr7);
 
@@ -119,7 +119,6 @@
 }
 
 static RBinInfo *info(RBinFile *bf) {
-	char filepath[1024];
 	RBinInfo *ret = R_NEW0 (RBinInfo);
 	if (!ret) {
 		return NULL;
@@ -129,19 +128,15 @@
 		free (ret);
 		return NULL;
 	}
-
-	strncpy (filepath, (char *) loaded_header.title, 0xC);
-	strncat (filepath, " - ", 3);
-	strncat (filepath, (char *) loaded_header.gamecode, 0x4);
-
-	ret->file = strdup (filepath);
+	char *filepath = r_str_newf ("%.12s - %.4s",
+		loaded_header.title, loaded_header.gamecode);
+	ret->file = filepath;
 	ret->type = strdup ("ROM");
 	ret->machine = strdup ("Nintendo DS");
 	ret->os = strdup ("nds");
 	ret->arch = strdup ("arm");
 	ret->has_va = true;
 	ret->bits = 32;
-
 	return ret;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_ningba.c radare2-2.8.0+dfsg/libr/bin/p/bin_ningba.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_ningba.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_ningba.c	2018-08-07 14:12:36.000000000 +0000
@@ -90,7 +90,7 @@
 	s->vaddr = 0x8000000;
 	s->size = sz;
 	s->vsize = 0x2000000;
-	s->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+	s->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 	s->add = true;
 
 	r_list_append (ret, s);
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_ningb.c radare2-2.8.0+dfsg/libr/bin/p/bin_ningb.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_ningb.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_ningb.c	2018-08-07 14:12:36.000000000 +0000
@@ -66,7 +66,7 @@
 		ret->free = free;
 		if (!(ptr = R_NEW0 (RBinAddr)))
 			return ret;
-		ptr->paddr = ptr->vaddr = ptr->haddr = 0x100;
+		ptr->paddr = ptr->vaddr = ptr->hpaddr = 0x100;
 		r_list_append (ret, ptr);
 	}
 	return ret;
@@ -108,7 +108,7 @@
 	rombank[0]->size = 0x4000;
 	rombank[0]->vsize = 0x4000;
 	rombank[0]->vaddr = 0;
-	rombank[0]->srwx = r_str_rwx ("mrx");
+	rombank[0]->srwx = r_str_rwx ("rx");
 	rombank[0]->add = true;
 
 	r_list_append (ret, rombank[0]);
@@ -119,7 +119,7 @@
 		rombank[i]->paddr = i*0x4000;
 		rombank[i]->vaddr = i*0x10000-0xc000;			//spaaaaaaaaaaaaaaaace!!!
 		rombank[i]->size = rombank[i]->vsize = 0x4000;
-		rombank[i]->srwx = r_str_rwx ("mrx");
+		rombank[i]->srwx = r_str_rwx ("rx");
 		rombank[i]->add = true;
 		r_list_append (ret,rombank[i]);
 	}
@@ -284,7 +284,7 @@
 	return ret;
 }
 
-struct r_bin_plugin_t r_bin_plugin_ningb = {
+RBinPlugin r_bin_plugin_ningb = {
 	.name = "ningb",
 	.desc = "Gameboy format r_bin plugin",
 	.license = "LGPL3",
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_nro.c radare2-2.8.0+dfsg/libr/bin/p/bin_nro.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_nro.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_nro.c	2018-08-07 14:12:36.000000000 +0000
@@ -5,16 +5,10 @@
 #include <r_util.h>
 #include <r_lib.h>
 #include <r_bin.h>
+#include "nxo/nxo.h"
 
-// starting at 0
-typedef struct {
-	ut32 unused;
-	ut32 mod_memoffset;
-	ut64 padding;
-} NROStart;
-
-#define NRO_OFF(x) sizeof (NROStart) + r_offsetof (NROHeader, x)
-#define NRO_OFFSET_MODMEMOFF r_offsetof (NROStart, mod_memoffset)
+#define NRO_OFF(x) sizeof (NXOStart) + r_offsetof (NROHeader, x)
+#define NRO_OFFSET_MODMEMOFF r_offsetof (NXOStart, mod_memoffset)
 
 // starting at 0x10 (16th byte)
 typedef struct {
@@ -32,98 +26,10 @@
 	ut32 unknown3;
 } NROHeader;
 
-// ------------------------------
-typedef struct {
-	ut32 magic;
-	ut32 dynamic;
-	ut32 bss_start;
-	ut32 bss_end;
-	ut32 unwind_start;
-	ut32 unwind_end;
-	ut32 mod_object;
-} MODHeader;
-
-typedef struct {
-	ut64 next;
-	ut64 prev;
-	ut64 relplt;
-	ut64 reldyn;
-	ut64 base;
-	ut64 dynamic;
-	ut64 is_rela;
-	ut64 relplt_size;
-	ut64 init;
-	ut64 fini;
-	ut64 bucket;
-	ut64 chain;
-	ut64 strtab;
-	ut64 symtab;
-	ut64 strtab_size;
-	ut64 got;
-	ut64 reladyn_size;
-	ut64 reldyn_size;
-	ut64 relcount;
-	ut64 relacount;
-	ut64 nchain;
-	ut64 nbucket;
-	ut64 got_value;
-} MODObject;
-
-typedef struct {
-	ut32 mod_offset;
-	ut32 text_offset;
-	ut32 text_size;
-	ut32 ro_offset;
-	ut32 ro_size;
-	ut32 data_offset;
-	ut32 data_size;
-	ut32 bss_size;
-} MODMeta;
-
-typedef struct {
-	ut32 *strings;
-	RList *methods_list;
-	RList *imports_list;
-	RList *classes_list;
-} RBinNROObj;
-
-static void parseMod (RBinFile *bf, RBinNROObj *bin, ut32 mod0, ut64 baddr);
-
-static ut32 readLE32(RBuffer *buf, int off) {
-	int left = 0;
-	const ut8 *data = r_buf_get_at (buf, off, &left);
-	return left > 3? r_read_le32 (data): 0;
-}
-
-static ut64 readLE64(RBuffer *buf, int off) {
-	int left = 0;
-	const ut8 *data = r_buf_get_at (buf, off, &left);
-	return left > 7? r_read_le64 (data): 0;
-}
-
-static const char *readString(RBuffer *buf, int off) {
-	int left = 0;
-	const char *data = (const char *)r_buf_get_at (buf, off, &left);
-	return left > 0 ? data: NULL;
-}
-
 static ut64 baddr(RBinFile *bf) {
 	return bf? readLE32 (bf->buf, NRO_OFFSET_MODMEMOFF): 0;
 }
 
-static const char *fileType(const ut8 *buf) {
-	if (!memcmp (buf, "NRO0", 4)) {
-		return "nro0";
-	}
-	if (!memcmp (buf, "NRR0", 4)) {
-		return "nrr0";
-	}
-	if (!memcmp (buf, "MOD0", 4)) {
-		return "mod0";
-	}
-	return NULL;
-}
-
 static bool check_bytes(const ut8 *buf, ut64 length) {
 	if (buf && length >= 0x20) {
 		return fileType (buf + NRO_OFF (magic)) != NULL;
@@ -132,7 +38,7 @@
 }
 
 static void *load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb) {
-	RBinNROObj *bin = R_NEW0 (RBinNROObj);
+	RBinNXOObj *bin = R_NEW0 (RBinNXOObj);
 	if (!bin) {
 		return NULL;
 	}
@@ -141,7 +47,7 @@
 	bin->imports_list = r_list_newf ((RListFree)free);
 	bin->classes_list = r_list_newf ((RListFree)free);
 	ut32 mod0 = readLE32 (bf->buf, NRO_OFFSET_MODMEMOFF);
-	parseMod (bf, bin, mod0, ba);
+	parseMod (bf->buf, bin, mod0, ba);
 	return (void *) bin;//(size_t) check_bytes (buf, sz);
 }
 
@@ -191,133 +97,6 @@
 	return kv;
 }
 
-static void walkSymbols (RBinFile *bf, RBinNROObj *bin, ut64 symtab, ut64 strtab, ut64 strtab_size, ut64 relplt, ut64 baddr) {
-	int i, import = 0;
-	RBinSymbol *sym;
-	RBinImport *imp;
-	for (i = 8; i < 99999; i++) {
-		ut64 addr = readLE64 (bf->buf, symtab + i);
-		ut64 size = readLE64 (bf->buf, symtab + i + 8);
-		i += 16; // NULL, NULL
-		ut64 name = readLE32 (bf->buf, symtab + i);
-		//ut64 type = readLE32 (bf->buf, symtab + i + 4);
-		const char *symName = readString (bf->buf, strtab + name);
-		if (!symName) {
-			break;
-		}
-		sym = R_NEW0 (RBinSymbol);
-		if (!sym) {
-			break;
-		}
-		sym->type = r_str_const ("FUNC");
-		sym->bind = r_str_const ("NONE");
-		sym->size = size;
-
-		if (addr == 0) {
-			import ++;
-			ut64 pltSym = readLE64 (bf->buf, relplt + (import * 24));
-			imp = R_NEW0 (RBinImport);
-			if (!imp) {
-				R_FREE (sym);
-				break;
-			}
-			imp->name  = strdup (symName);
-			if (!imp->name) {
-				goto out_walk_symbol;
-			}
-			imp->type = r_str_const ("FUNC");
-			if (!imp->type) {
-				goto out_walk_symbol;
-			}
-			imp->bind = r_str_const ("NONE");
-			if (!imp->bind) {
-				goto out_walk_symbol;
-			}
-			imp->ordinal = bin->imports_list->length;
-			r_list_append (bin->imports_list, imp);
-			sym->name = r_str_newf ("imp.%s", symName);
-			if (!sym->name) {
-				goto out_walk_symbol;
-			}
-			sym->paddr = pltSym - 8;
-			sym->vaddr = sym->paddr + baddr;
-			//eprintf ("f sym.imp.%s = 0x%"PFMT64x"\n", symName, pltSym - 8);
-		} else {
-			sym->name = strdup (symName);
-			if (!sym->name) {
-				R_FREE (sym);
-				break;
-			}
-			sym->paddr = addr;
-			sym->vaddr = sym->paddr + baddr;
-			//eprintf ("f sym.%s %"PFMT64u "0x%"PFMT64x"\n", symName, size, addr);
-		}
-		r_list_append (bin->methods_list, sym);
-		i += 8 - 1;
-	}
-    return;
-
-out_walk_symbol:
-	R_FREE (sym);
-	R_FREE (imp);
-	return;
-}
-
-static void parseMod (RBinFile *bf, RBinNROObj *bin, ut32 mod0, ut64 baddr) {
-	ut32 ptr = readLE32 (bf->buf, mod0);
-	eprintf ("magic %x at 0x%x\n", ptr, mod0);
-	if (ptr == 0x30444f4d) { // MOD0
-		eprintf ("is mode0\n");
-		MODHeader mh = {
-			.magic = readLE32 (bf->buf, mod0),
-			.dynamic = readLE32 (bf->buf, mod0 + 4),
-			.bss_start = readLE32 (bf->buf, mod0 + 8),
-			.bss_end = readLE32 (bf->buf, mod0 + 12),
-			.unwind_start = readLE32 (bf->buf, mod0 + 16),
-			.unwind_end = readLE32 (bf->buf, mod0 + 20),
-			.mod_object = readLE32 (bf->buf, mod0 + 24),
-		};
-		mh.mod_object += mod0;
-		eprintf ("magic 0x%x\n", mh.magic);
-		eprintf ("dynamic 0x%x\n", mh.dynamic);
-		eprintf ("bss 0x%x 0x%x\n", mh.bss_start, mh.bss_end);
-		eprintf ("unwind 0x%x 0x%x\n", mh.unwind_start, mh.unwind_end);
-		eprintf ("-------------\n");
-		eprintf ("mod 0x%x\n", mh.mod_object);
-#define MO_(x) readLE64(bf->buf, mh.mod_object + r_offsetof(MODObject, x))
-		MODObject mo = {
-			.next = MO_(next),
-			.prev = MO_(prev),
-			.relplt = MO_(relplt),
-			.reldyn = MO_(reldyn),
-			.base = MO_(base),
-			.dynamic = MO_(dynamic),
-			.is_rela = MO_(is_rela),
-			.relplt_size = MO_(relplt_size),
-			.init = MO_(init),
-			.fini = MO_(fini),
-			.bucket = MO_(bucket),
-			.chain = MO_(chain),
-			.strtab = MO_(strtab),
-			.symtab = MO_(symtab),
-			.strtab_size = MO_(strtab_size)
-		};
-		eprintf ("next 0x%"PFMT64x"\n", mo.next);
-		eprintf ("prev 0x%"PFMT64x"\n", mo.prev);
-		eprintf ("base 0x%"PFMT64x"\n", mo.base);
-		eprintf ("init 0x%"PFMT64x"\n", mo.init);
-		eprintf ("fini 0x%"PFMT64x"\n", mo.fini);
-		eprintf ("relplt 0x%"PFMT64x"\n", mo.relplt - mo.base);
-		eprintf ("symtab = 0x%"PFMT64x"\n", mo.symtab - mo.base);
-		eprintf ("strtab = 0x%"PFMT64x"\n", mo.strtab - mo.base);
-		eprintf ("strtabsz = 0x%"PFMT64x"\n", mo.strtab_size);
-		//ut32 modo = mh.mod_object;
-		ut64 strtab = mo.strtab - mo.base;
-		ut64 symtab = mo.symtab - mo.base;
-		walkSymbols (bf, bin, symtab, strtab, mo.strtab_size, mo.relplt - mo.base, baddr);
-	}
-}
-
 static RList *sections(RBinFile *bf) {
 	RList *ret = NULL;
 	RBinSection *ptr = NULL;
@@ -375,7 +154,7 @@
 		ptr->vsize = sig0sz;
 		ptr->paddr = sig0;
 		ptr->vaddr = sig0 + ba;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+		ptr->srwx = R_BIN_SCN_READABLE; // r--
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	} else {
@@ -391,7 +170,7 @@
 	ptr->size = ptr->vsize;
 	ptr->paddr = readLE32 (b, NRO_OFF (text_memoffset));
 	ptr->vaddr = ptr->paddr + ba;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -404,7 +183,7 @@
 	ptr->size = ptr->vsize;
 	ptr->paddr = readLE32 (b, NRO_OFF (ro_memoffset));
 	ptr->vaddr = ptr->paddr + ba;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r-x
+	ptr->srwx = R_BIN_SCN_READABLE; // r-x
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -417,7 +196,7 @@
 	ptr->size = ptr->vsize;
 	ptr->paddr = readLE32 (b, NRO_OFF (data_memoffset));
 	ptr->vaddr = ptr->paddr + ba;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_MAP; // rw-
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE; // rw-
 	ptr->add = true;
 	eprintf ("Base Address 0x%08"PFMT64x "\n", ba);
 	eprintf ("BSS Size 0x%08"PFMT64x "\n", (ut64)
@@ -427,11 +206,11 @@
 }
 
 static RList *symbols(RBinFile *bf) {
-	RBinNROObj *bin;
+	RBinNXOObj *bin;
 	if (!bf || !bf->o || !bf->o->bin_obj) {
 		return NULL;
 	}
-	bin = (RBinNROObj*) bf->o->bin_obj;
+	bin = (RBinNXOObj*) bf->o->bin_obj;
 	if (!bin) {
 		return NULL;
 	}
@@ -439,11 +218,11 @@
 }
 
 static RList *imports(RBinFile *bf) {
-	RBinNROObj *bin;
+	RBinNXOObj *bin;
 	if (!bf || !bf->o || !bf->o->bin_obj) {
 		return NULL;
 	}
-	bin = (RBinNROObj*) bf->o->bin_obj;
+	bin = (RBinNXOObj*) bf->o->bin_obj;
 	if (!bin) {
 		return NULL;
 	}
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_nso.c radare2-2.8.0+dfsg/libr/bin/p/bin_nso.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_nso.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_nso.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2017 - rkx1209 */
+/* radare2 - LGPL - Copyright 2017-2018 - rkx1209 */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -6,10 +6,15 @@
 #include <r_bin.h>
 #include <r_io.h>
 #include <r_cons.h>
-// #include "../../../shlr/lz4/lz4.h"
+#include "nxo/nxo.h"
+#ifdef R_MESON_VERSION
+#include <lz4.h>
+#else
 #include "../../../shlr/lz4/lz4.c"
+#endif
 
 #define NSO_OFF(x) r_offsetof (NSOHeader, x)
+#define NSO_OFFSET_MODMEMOFF r_offsetof (NXOStart, mod_memoffset)
 
 // starting at 0
 typedef struct {
@@ -31,14 +36,8 @@
 	ut32 bss_size;	// 60
 } NSOHeader;
 
-static ut32 readLE32(RBuffer *buf, int off) {
-	int left = 0;
-	const ut8 *data = r_buf_get_at (buf, off, &left);
-	return left > 3? r_read_le32 (data): 0;
-}
-
 static uint32_t decompress(const ut8 *cbuf, ut8 *obuf, int32_t csize, int32_t usize) {
-	if (csize < 0 || usize < 0) {
+	if (csize < 0 || usize < 0 || !cbuf || !obuf) {
 		return -1;
 	}
 	return LZ4_decompress_safe ((const char*)cbuf, (char*)obuf, (uint32_t) csize, (uint32_t) usize);
@@ -48,13 +47,6 @@
 	return 0;	// XXX
 }
 
-static const char *fileType(const ut8 *buf) {
-	if (!memcmp (buf, "NSO0", 4)) {
-		return "nso0";
-	}
-	return NULL;
-}
-
 static bool check_bytes(const ut8 *buf, ut64 length) {
 	if (buf && length >= 0x20) {
 		return fileType (buf + NSO_OFF (magic)) != NULL;
@@ -64,6 +56,7 @@
 
 static void *load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb) {
 	RBin *rbin = bf->rbin;
+	RBinNXOObj *bin = R_NEW0 (RBinNXOObj);
 	ut32 toff = readLE32 (bf->buf, NSO_OFF (text_memoffset));
 	ut32 tsize = readLE32 (bf->buf, NSO_OFF (text_size));
 	ut32 rooff = readLE32 (bf->buf, NSO_OFF (ro_memoffset));
@@ -71,28 +64,35 @@
 	ut32 doff = readLE32 (bf->buf, NSO_OFF (data_memoffset));
 	ut32 dsize = readLE32 (bf->buf, NSO_OFF (data_size));
 	ut64 total_size = tsize + rosize + dsize;
-	ut8 *newbuf = calloc (total_size, sizeof (ut8));
+	RBuffer *newbuf = r_buf_new_empty (total_size);
 	ut64 ba = baddr (bf);
 
-        if (rbin->iob.io && !(rbin->iob.io->cached & R_IO_WRITE)) {
-                eprintf ("Please add \'-e io.cache=true\' option to r2 command\n");
-                goto fail;
-        }
+	if (rbin->iob.io && !(rbin->iob.io->cached & R_IO_WRITE)) {
+		eprintf ("Please add \'-e io.cache=true\' option to r2 command\n");
+		goto fail;
+	}
 	/* Decompress each sections */
-	if (decompress (buf + toff, newbuf, rooff - toff, tsize) != tsize) {
+	if (decompress (buf + toff, r_buf_get_at (newbuf, 0, NULL), rooff - toff, tsize) != tsize) {
 		goto fail;
 	}
-	if (decompress (buf + rooff, newbuf + tsize, doff - rooff, rosize) != rosize) {
+	if (decompress (buf + rooff, r_buf_get_at (newbuf, tsize, NULL), doff - rooff, rosize) != rosize) {
 		goto fail;
 	}
-	if (decompress (buf + doff, newbuf + tsize + rosize, r_buf_size (bf->buf) - doff, dsize) != dsize) {
+	if (decompress (buf + doff, r_buf_get_at (newbuf, tsize + rosize, NULL), r_buf_size (bf->buf) - doff, dsize) != dsize) {
 		goto fail;
 	}
 	/* Load unpacked binary */
-	r_io_write_at (rbin->iob.io, ba, newbuf, total_size);
-	return R_NOTNULL;
+	r_io_write_at (rbin->iob.io, ba, r_buf_get_at (newbuf, 0, NULL), total_size);
+	ut32 modoff = readLE32 (newbuf, NSO_OFFSET_MODMEMOFF);
+	bin->methods_list = r_list_newf ((RListFree)free);
+	bin->imports_list = r_list_newf ((RListFree)free);
+	bin->classes_list = r_list_newf ((RListFree)free);
+	eprintf ("MOD Offset = 0x%"PFMT64x"\n", (ut64)modoff);
+	parseMod (newbuf, bin, modoff, ba);
+	r_buf_free (newbuf);
+	return (void *) bin;
 fail:
-	R_FREE (newbuf);
+	r_buf_free (newbuf);
 	return NULL;
 }
 
@@ -178,7 +178,7 @@
 	ptr->size = ptr->vsize;
 	ptr->paddr = readLE32 (b, NSO_OFF (text_memoffset));
 	ptr->vaddr = readLE32 (b, NSO_OFF (text_loc)) + ba;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;	// r-x
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;	// r-x
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -191,7 +191,7 @@
 	ptr->size = ptr->vsize;
 	ptr->paddr = readLE32 (b, NSO_OFF (ro_memoffset));
 	ptr->vaddr = readLE32 (b, NSO_OFF (ro_loc)) + ba;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;	// r--
+	ptr->srwx = R_BIN_SCN_READABLE;	// r--
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -204,7 +204,7 @@
 	ptr->size = ptr->vsize;
 	ptr->paddr = readLE32 (b, NSO_OFF (data_memoffset));
 	ptr->vaddr = readLE32 (b, NSO_OFF (data_loc)) + ba;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_MAP;	// rw-
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE;	// rw-
 	ptr->add = true;
 	eprintf ("BSS Size 0x%08"PFMT64x "\n", (ut64)
 		readLE32 (bf->buf, NSO_OFF (bss_size)));
@@ -212,8 +212,28 @@
 	return ret;
 }
 
+static RList *symbols(RBinFile *bf) {
+	RBinNXOObj *bin;
+	if (!bf || !bf->o || !bf->o->bin_obj) {
+		return NULL;
+	}
+	bin = (RBinNXOObj*) bf->o->bin_obj;
+	if (!bin) {
+		return NULL;
+	}
+	return bin->methods_list;
+}
+
 static RList *imports(RBinFile *bf) {
-	return NULL;
+	RBinNXOObj *bin;
+	if (!bf || !bf->o || !bf->o->bin_obj) {
+		return NULL;
+	}
+	bin = (RBinNXOObj*) bf->o->bin_obj;
+	if (!bin) {
+		return NULL;
+	}
+	return bin->imports_list;
 }
 
 static RList *libs(RBinFile *bf) {
@@ -255,12 +275,12 @@
 	.load_bytes = &load_bytes,
 	.destroy = &destroy,
 	.check_bytes = &check_bytes,
-	.baddr = baddr,
+	.baddr = &baddr,
 	.binsym = &binsym,
 	.entries = &entries,
 	.sections = &sections,
 	.get_sdb = &get_sdb,
-	.symbols = NULL,
+	.symbols = &symbols,
 	.imports = &imports,
 	.info = &info,
 	.libs = &libs,
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_omf.c radare2-2.8.0+dfsg/libr/bin/p/bin_omf.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_omf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_omf.c	2018-08-07 14:12:36.000000000 +0000
@@ -10,7 +10,7 @@
 	if (!buf || !size || size == UT64_MAX) {
 		return NULL;
 	}
-	return r_bin_internal_omf_load ((char *) buf, size);
+	return r_bin_internal_omf_load (buf, size);
 }
 
 static bool load(RBinFile *bf) {
@@ -48,7 +48,7 @@
 			return false;
 		}
 	}
-	return r_bin_checksum_omf_ok ((char *) buf, length);
+	return r_bin_checksum_omf_ok (buf, length);
 }
 
 static ut64 baddr(RBinFile *bf) {
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_p9.c radare2-2.8.0+dfsg/libr/bin/p/bin_p9.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_p9.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_p9.c	2018-08-07 14:12:36.000000000 +0000
@@ -78,7 +78,7 @@
 	ptr->vsize = textsize + (textsize % 4096);
 	ptr->paddr = 8 * 4;
 	ptr->vaddr = ptr->paddr;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 	ptr->add = true;
 	r_list_append (ret, ptr);
 	// add data segment
@@ -92,7 +92,7 @@
 		ptr->vsize = datasize + (datasize % 4096);
 		ptr->paddr = textsize + (8 * 4);
 		ptr->vaddr = ptr->paddr;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_MAP; // rw-
+		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE; // rw-
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -108,7 +108,7 @@
 		ptr->vsize = symssize + (symssize % 4096);
 		ptr->paddr = datasize + textsize + (8 * 4);
 		ptr->vaddr = ptr->paddr;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+		ptr->srwx = R_BIN_SCN_READABLE; // r--
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -123,7 +123,7 @@
 		ptr->vsize = spszsize + (spszsize % 4096);
 		ptr->paddr = symssize + datasize + textsize + (8 * 4);
 		ptr->vaddr = ptr->paddr;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+		ptr->srwx = R_BIN_SCN_READABLE; // r--
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -138,7 +138,7 @@
 		ptr->vsize = pcszsize + (pcszsize % 4096);
 		ptr->paddr = spszsize + symssize + datasize + textsize + (8 * 4);
 		ptr->vaddr = ptr->paddr;
-		ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP; // r--
+		ptr->srwx = R_BIN_SCN_READABLE; // r--
 		ptr->add = true;
 		r_list_append (ret, ptr);
 	}
@@ -224,7 +224,7 @@
 	return buf;
 }
 
-struct r_bin_plugin_t r_bin_plugin_p9 = {
+RBinPlugin r_bin_plugin_p9 = {
 	.name = "p9",
 	.desc = "Plan9 bin plugin",
 	.license = "LGPL3",
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_pebble.c radare2-2.8.0+dfsg/libr/bin/p/bin_pebble.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_pebble.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_pebble.c	2018-08-07 14:12:36.000000000 +0000
@@ -111,7 +111,7 @@
 	strcpy (ptr->name, "relocs");
 	ptr->vsize = ptr->size = pai.num_reloc_entries * sizeof (ut32);
 	ptr->vaddr = ptr->paddr = pai.reloc_list_start;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 	if (ptr->vaddr<textsize)
@@ -123,7 +123,7 @@
 	strcpy (ptr->name, "symtab");
 	ptr->vsize = ptr->size = 0;
 	ptr->vaddr = ptr->paddr = pai.sym_table_addr;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 	if (ptr->vaddr<textsize)
@@ -135,7 +135,7 @@
 	ptr->vaddr = ptr->paddr = 0x80;
 	ptr->vsize = ptr->size = textsize - ptr->paddr;
 	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE |
-		R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+		R_BIN_SCN_EXECUTABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -144,7 +144,7 @@
 	strcpy (ptr->name, "header");
 	ptr->vsize = ptr->size = sizeof (PebbleAppInfo);
 	ptr->vaddr = ptr->paddr = 0;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -184,7 +184,7 @@
 	return ret;
 }
 
-struct r_bin_plugin_t r_bin_plugin_pebble = {
+RBinPlugin r_bin_plugin_pebble = {
 	.name = "pebble",
 	.desc = "Pebble Watch App",
 	.license = "LGPL",
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_pe.c radare2-2.8.0+dfsg/libr/bin/p/bin_pe.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_pe.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_pe.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - nibble, pancake, alvarofe */
+/* radare - LGPL - Copyright 2009-2018 - nibble, pancake, alvarofe */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -16,7 +16,7 @@
 	return bin? bin->kv: NULL;
 }
 
-static void * load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb){
+static void * load_bytes(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb) {
 	struct PE_(r_bin_pe_obj_t) *res = NULL;
 	RBuffer *tbuf = NULL;
 	if (!buf || !sz || sz == UT64_MAX) {
@@ -32,6 +32,18 @@
 	return res;
 }
 
+static void * load_buffer(RBinFile *bf, RBuffer *buf, ut64 loadaddr, Sdb *sdb) {
+	struct PE_(r_bin_pe_obj_t) *res;
+	if (!buf) {
+		return NULL;
+	}
+	res = PE_(r_bin_pe_new_buf) (buf, bf->rbin->verbose);
+	if (res) {
+		sdb_ns_set (sdb, "info", res->kv);
+	}
+	return res;
+}
+
 static bool load(RBinFile *bf) {
 	void *res;
 	const ut8 *bytes;
@@ -82,28 +94,28 @@
 	char *key;
 
 	do {
-		key =  sdb_fmt (0, "pe.tls_callback%d_paddr", count);
+		key =  sdb_fmt ("pe.tls_callback%d_paddr", count);
 		paddr = sdb_num_get (bin->kv, key, 0);
 		if (!paddr) {
 			break;
 		}
 
-		key =  sdb_fmt (0, "pe.tls_callback%d_vaddr", count);
+		key =  sdb_fmt ("pe.tls_callback%d_vaddr", count);
 		vaddr = sdb_num_get (bin->kv, key, 0);
 		if (!vaddr) {
 			break;
 		}
 
-		key =  sdb_fmt (0, "pe.tls_callback%d_haddr", count);
+		key =  sdb_fmt ("pe.tls_callback%d_haddr", count);
 		haddr = sdb_num_get (bin->kv, key, 0);
 		if (!haddr) {
 			break;
 		}
 		if ((ptr = R_NEW0 (RBinAddr))) {
-			ptr->paddr = paddr;
-			ptr->vaddr = vaddr;
-			ptr->haddr = haddr;
-			ptr->type  = R_BIN_ENTRY_TYPE_TLS;
+			ptr->paddr  = paddr;
+			ptr->vaddr  = vaddr;
+			ptr->hpaddr = haddr;
+			ptr->type   = R_BIN_ENTRY_TYPE_TLS;
 			r_list_append (list, ptr);
 		}
 		count++;
@@ -122,10 +134,10 @@
 		return ret;
 	}
 	if ((ptr = R_NEW0 (RBinAddr))) {
-		ptr->paddr = entry->paddr;
-		ptr->vaddr = entry->vaddr;
-		ptr->haddr = entry->haddr;
-		ptr->type  = R_BIN_ENTRY_TYPE_PROGRAM;
+		ptr->paddr  = entry->paddr;
+		ptr->vaddr  = entry->vaddr;
+		ptr->hpaddr = entry->haddr;
+		ptr->type   = R_BIN_ENTRY_TYPE_PROGRAM;
 		r_list_append (ret, ptr);
 	}
 	free (entry);
@@ -145,7 +157,7 @@
 	if (!(ret = r_list_newf ((RListFree)free))) {
 		return NULL;
 	}
-	if (!(sections = PE_(r_bin_pe_get_sections) (bin))){
+	if (!bin || !(sections = bin->sections)){
 		r_list_free (ret);
 		return NULL;
 	}
@@ -173,7 +185,7 @@
 		ptr->paddr = sections[i].paddr;
 		ptr->vaddr = sections[i].vaddr + ba;
 		ptr->add = true;
-		ptr->srwx = R_BIN_SCN_MAP;
+		ptr->srwx = 0;
 		if (R_BIN_PE_SCN_IS_EXECUTABLE (sections[i].flags)) {
 			ptr->srwx |= R_BIN_SCN_EXECUTABLE;
 		}
@@ -203,7 +215,6 @@
 		}
 		r_list_append (ret, ptr);
 	}
-	free (sections);
 	return ret;
 }
 
@@ -234,8 +245,8 @@
 			ptr->name = strdup ((char *)symbols[i].name);
 			ptr->forwarder = r_str_const ((char *)symbols[i].forwarder);
 			//strncpy (ptr->bind, "NONE", R_BIN_SIZEOF_STRINGS);
-			ptr->bind = r_str_const ("GLOBAL");
-			ptr->type = r_str_const ("FUNC");
+			ptr->bind = r_str_const (R_BIN_BIND_GLOBAL_STR);
+			ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 			ptr->size = 0;
 			ptr->vaddr = symbols[i].vaddr;
 			ptr->paddr = symbols[i].paddr;
@@ -255,7 +266,7 @@
 			ptr->name = r_str_newf ("imp.%s", imports[i].name);
 			//strncpy (ptr->forwarder, (char*)imports[i].forwarder, R_BIN_SIZEOF_STRINGS);
 			ptr->bind = r_str_const ("NONE");
-			ptr->type = r_str_const ("FUNC");
+			ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 			ptr->size = 0;
 			ptr->vaddr = imports[i].vaddr;
 			ptr->paddr = imports[i].paddr;
@@ -493,8 +504,8 @@
 	ret->has_canary = has_canary (bf);
 	ret->has_nx = haschr (bf, IMAGE_DLL_CHARACTERISTICS_NX_COMPAT);
 	ret->has_pi = haschr (bf, IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE);
-	ret->claimed_checksum = strdup (sdb_fmt (0, "0x%08x", claimed_checksum));
-	ret->actual_checksum  = strdup (sdb_fmt (1, "0x%08x", actual_checksum));
+	ret->claimed_checksum = strdup (sdb_fmt ("0x%08x", claimed_checksum));
+	ret->actual_checksum  = strdup (sdb_fmt ("0x%08x", actual_checksum));
 	ret->pe_overlay = pe_overlay > 0;
 	ret->signature = bin ? bin->is_signed : false;
 
@@ -664,31 +675,177 @@
 	return c;
 }
 
-static RBinField *newField(const char *name, ut64 addr) {
-	RBinField *bf = R_NEW0 (RBinField);
-	bf->name = strdup (name);
-	bf->vaddr = bf->paddr = addr;
-	return bf;
-}
-
 static RList *fields(RBinFile *bf) {
-	const ut8 *buf = bf ? r_buf_buffer (bf->buf) : NULL;
+	RList *ret = NULL;
+	const ut8 *buf = NULL;
 
-	if (!buf) {
+	buf = bf ? r_buf_buffer (bf->buf) : NULL;
+	ret  = r_list_new ();
+
+	if (!buf || !ret) {
 		return NULL;
 	}
-	RList *list = r_list_new ();
+
+	#define ROWL(nam,siz,val,fmt) \
+	r_list_append (ret, r_bin_field_new (addr, addr, siz, nam, sdb_fmt ("0x%08x", val), fmt));
+	ut64 addr = 128;
+
 	struct PE_(r_bin_pe_obj_t) * bin = bf->o->bin_obj;
+	ROWL ("Signature", 4, bin->nt_headers->Signature, "x"); addr += 4;
+	ROWL ("Machine", 2, bin->nt_headers->file_header.Machine, "x"); addr += 2;
+	ROWL ("NumberOfSections", 2, bin->nt_headers->file_header.NumberOfSections, "x"); addr += 2;
+	ROWL ("TimeDateStamp", 4, bin->nt_headers->file_header.TimeDateStamp, "x"); addr += 4;
+	ROWL ("PointerToSymbolTable", 4, bin->nt_headers->file_header.PointerToSymbolTable, "x"); addr += 4;
+	ROWL ("NumberOfSymbols ", 4, bin->nt_headers->file_header.NumberOfSymbols, "x"); addr += 4;
+	ROWL ("SizeOfOptionalHeader", 2, bin->nt_headers->file_header.SizeOfOptionalHeader, "x"); addr += 2;
+	ROWL ("Characteristics", 2, bin->nt_headers->file_header.Characteristics, "x"); addr += 2;
+	ROWL ("Magic", 2, bin->nt_headers->optional_header.Magic, "x"); addr += 2;
+	ROWL ("MajorLinkerVersion", 1, bin->nt_headers->optional_header.MajorLinkerVersion, "x"); addr += 1;
+	ROWL ("MinorLinkerVersion", 1, bin->nt_headers->optional_header.MinorLinkerVersion, "x"); addr += 1;
+	ROWL ("SizeOfCode", 4, bin->nt_headers->optional_header.SizeOfCode, "x"); addr += 4;
+	ROWL ("SizeOfInitializedData", 4, bin->nt_headers->optional_header.SizeOfInitializedData, "x"); addr += 4;
+	ROWL ("SizeOfUninitializedData", 4, bin->nt_headers->optional_header.SizeOfUninitializedData, "x"); addr += 4;
+	ROWL ("AddressOfEntryPoint", 4, bin->nt_headers->optional_header.AddressOfEntryPoint, "x"); addr += 4;
+	ROWL ("BaseOfCode", 4, bin->nt_headers->optional_header.BaseOfCode, "x"); addr += 4;
+	ROWL ("BaseOfData", 4, bin->nt_headers->optional_header.BaseOfData, "x"); addr += 4;
+	ROWL ("ImageBase", 4, bin->nt_headers->optional_header.ImageBase, "x"); addr += 4;
+	ROWL ("SectionAlignment", 4, bin->nt_headers->optional_header.SectionAlignment, "x"); addr += 4;
+	ROWL ("FileAlignment", 4, bin->nt_headers->optional_header.FileAlignment, "x"); addr += 4;
+	ROWL ("MajorOperatingSystemVersion", 2, bin->nt_headers->optional_header.MajorOperatingSystemVersion, "x"); addr += 2;
+	ROWL ("MinorOperatingSystemVersion", 2, bin->nt_headers->optional_header.MinorOperatingSystemVersion, "x"); addr += 2;
+	ROWL ("MajorImageVersion", 2, bin->nt_headers->optional_header.MajorImageVersion, "x"); addr += 2;
+	ROWL ("MinorImageVersion", 2, bin->nt_headers->optional_header.MinorImageVersion, "x"); addr += 2;
+	ROWL ("MajorSubsystemVersion", 2, bin->nt_headers->optional_header.MajorSubsystemVersion, "x"); addr += 2;
+	ROWL ("MinorSubsystemVersion", 2, bin->nt_headers->optional_header.MinorSubsystemVersion, "x"); addr += 2;
+	ROWL ("Win32VersionValue", 4, bin->nt_headers->optional_header.Win32VersionValue, "x"); addr += 4;
+	ROWL ("SizeOfImage", 4, bin->nt_headers->optional_header.SizeOfImage, "x"); addr += 4;
+	ROWL ("SizeOfHeaders", 4, bin->nt_headers->optional_header.SizeOfHeaders, "x"); addr += 4;
+	ROWL ("CheckSum", 4, bin->nt_headers->optional_header.CheckSum, "x"); addr += 4;
+	ROWL ("Subsystem",24, bin->nt_headers->optional_header.Subsystem, "x"); addr += 2;
+	ROWL ("DllCharacteristics", 2, bin->nt_headers->optional_header.DllCharacteristics, "x"); addr += 2;
+	ROWL ("SizeOfStackReserve", 4, bin->nt_headers->optional_header.SizeOfStackReserve, "x"); addr += 4;
+	ROWL ("SizeOfStackCommit", 4, bin->nt_headers->optional_header.SizeOfStackCommit, "x"); addr += 4;
+	ROWL ("SizeOfHeapReserve", 4, bin->nt_headers->optional_header.SizeOfHeapReserve, "x"); addr += 4;
+	ROWL ("SizeOfHeapCommit", 4, bin->nt_headers->optional_header.SizeOfHeapCommit, "x"); addr += 4;
+	ROWL ("LoaderFlags", 4, bin->nt_headers->optional_header.LoaderFlags, "x"); addr += 4;
+	ROWL ("NumberOfRvaAndSizes", 4, bin->nt_headers->optional_header.NumberOfRvaAndSizes, "x"); addr += 4;
 
-	// TODO: we should use pf*
-	ut64 at = r_offsetof (PE_(image_nt_headers), Signature);
-	r_list_append (list, newField ("signature", at));
-
-	at = r_offsetof (PE_(image_optional_header), AddressOfEntryPoint);
-	at += bin->dos_header->e_lfanew;
-	r_list_append (list, newField ("entrypoint", at));
+	int i;
+	ut64 tmp = addr;
+	for (i = 0; i < PE_IMAGE_DIRECTORY_ENTRIES - 1; i++) {
+		if (bin->nt_headers->optional_header.DataDirectory[i].Size > 0) {
+			addr = tmp + i*8;
+			switch (i) {
+			case PE_IMAGE_DIRECTORY_ENTRY_EXPORT:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_EXPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_EXPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_IMPORT:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_IMPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_IMPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_RESOURCE:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_RESOURCE", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_RESOURCE", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_EXCEPTION:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_EXCEPTION", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_EXCEPTION", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_SECURITY:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_SECURITY", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_SECURITY", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_BASERELOC:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_BASERELOC", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_BASERELOC", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_DEBUG:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_DEBUG", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_DEBUG", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_COPYRIGHT:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_COPYRIGHT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_COPYRIGHT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_GLOBALPTR:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_GLOBALPTR", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_GLOBALPTR", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_TLS:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_TLS", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_TLS", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_IAT:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_IAT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_IAT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			case PE_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR:
+				ROWL ("IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].VirtualAddress, "x");
+				addr += 4;
+				ROWL ("SIZE_IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR", 4, \
+				bin->nt_headers->optional_header.DataDirectory[i].Size, "x");
+				break;
+			}
+		}
+	}
 
-	return list;
+	return ret;
 }
 
 static void header(RBinFile *bf) {
@@ -801,6 +958,7 @@
 	.license = "LGPL3",
 	.get_sdb = &get_sdb,
 	.load = &load,
+	.load_buffer = &load_buffer,
 	.load_bytes = &load_bytes,
 	.destroy = &destroy,
 	.check_bytes = &check_bytes,
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_psxexe.c radare2-2.8.0+dfsg/libr/bin/p/bin_psxexe.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_psxexe.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_psxexe.c	2018-08-07 14:12:36.000000000 +0000
@@ -69,7 +69,7 @@
 	sect->size = sz - PSXEXE_TEXTSECTION_OFFSET;
 	sect->vaddr = psxheader.t_addr;
 	sect->vsize = psxheader.t_size;
-	sect->srwx = R_BIN_SCN_MAP | R_BIN_SCN_EXECUTABLE;
+	sect->srwx = R_BIN_SCN_EXECUTABLE;
 	sect->add = true;
 	sect->has_strings = true;
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_sfc.c radare2-2.8.0+dfsg/libr/bin/p/bin_sfc.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_sfc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_sfc.c	2018-08-07 14:12:36.000000000 +0000
@@ -90,7 +90,7 @@
 	ptr->paddr = paddr;
 	ptr->vaddr = vaddr;
 	ptr->size = ptr->vsize = size;
-	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 }
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_smd.c radare2-2.8.0+dfsg/libr/bin/p/bin_smd.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_smd.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_smd.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL3 - 2015-2017 - pancake */
+/* radare - LGPL3 - 2015-2018 - pancake */
 
 #include <r_bin.h>
 
@@ -138,97 +138,101 @@
 }
 
 static RList *symbols(RBinFile *bf) {
-	ut32 *vtable = (ut32 *) bf->buf->buf;
 	RList *ret = NULL;
-	const char *name;
-	SMD_Header *hdr;
+	const char *name = NULL;
 	int i;
 
-	if (!(ret = r_list_new ())) {
+	if (!(ret = r_list_newf (free))) {
+		return NULL;
+	}
+	SMD_Header hdr;
+	int left = r_buf_read_at (bf->buf, 0x100, (ut8*)&hdr, sizeof (hdr));
+	if (left < sizeof (SMD_Header)) {
 		return NULL;
 	}
-	ret->free = free;
 	// TODO: store all this stuff in SDB
-	hdr = (SMD_Header *) (bf->buf->buf + 0x100);
-	addsym (ret, "rom_start", hdr->RomStart);
-	addsym (ret, "rom_end", hdr->RomEnd);
-	addsym (ret, "ram_start", hdr->RamStart);
-	addsym (ret, "ram_end", hdr->RamEnd);
-	showstr ("Copyright", hdr->CopyRights, 32);
-	showstr ("DomesticName", hdr->DomesticName, 48);
-	showstr ("OverseasName", hdr->OverseasName, 48);
-	showstr ("ProductCode", hdr->ProductCode, 14);
-	eprintf ("Checksum: 0x%04x\n", (ut32) hdr->CheckSum);
-	showstr ("Peripherials", hdr->Peripherials, 16);
-	showstr ("SramCode", hdr->CountryCode, 12);
-	showstr ("ModemCode", hdr->CountryCode, 12);
-	showstr ("CountryCode", hdr->CountryCode, 16);
+	addsym (ret, "rom_start", r_read_be32 (&hdr.RomStart));
+	addsym (ret, "rom_end", r_read_be32 (&hdr.RomEnd));
+	addsym (ret, "ram_start", r_read_be32 (&hdr.RamStart));
+	addsym (ret, "ram_end", r_read_be32 (&hdr.RamEnd));
+	showstr ("Copyright", hdr.CopyRights, 32);
+	showstr ("DomesticName", hdr.DomesticName, 48);
+	showstr ("OverseasName", hdr.OverseasName, 48);
+	showstr ("ProductCode", hdr.ProductCode, 14);
+	eprintf ("Checksum: 0x%04x\n", (ut32) hdr.CheckSum);
+	showstr ("Peripherials", hdr.Peripherials, 16);
+	showstr ("SramCode", hdr.SramCode, 12);
+	showstr ("ModemCode", hdr.ModemCode, 12);
+	showstr ("CountryCode", hdr.CountryCode, 16);
+	ut32 vtable[64];
+	r_buf_read_at (bf->buf, 0, (ut8*)&vtable, sizeof (ut32) * 64);
 	/* parse vtable */
 	for (i = 0; i < 64; i++) {
 		switch (i) {
 		case 0: name = "SSP"; break;
 		case 1: name = "Reset"; break;
 		case 2: name = "BusErr"; break;
-		case 3: name = "InvOpCode"; break;
-		case 4: name = "DivBy0"; break;
-		case 5: name = "Check"; break;
-		case 6: name = "TrapV"; break;
-		case 7: name = "GPF"; break;
-		case 8: name = "Trace"; break;
-		case 9: name = "Reserv0"; break;
-		case 10: name = "Reserv1"; break;
-		case 11: name = "Reserv2"; break;
-		case 12: name = "Reserv3"; break;
-		case 13: name = "Reserv4"; break;
-		case 14: name = "BadInt"; break;
-		case 15: name = "Reserv10"; break;
-		case 16: name = "Reserv11"; break;
-		case 17: name = "Reserv12"; break;
-		case 18: name = "Reserv13"; break;
-		case 19: name = "Reserv14"; break;
-		case 20: name = "Reserv15"; break;
-		case 21: name = "Reserv16"; break;
-		case 22: name = "Reserv17"; break;
-		case 23: name = "BadIRQ"; break;
-		case 24: name = "IRQ1"; break;
-		case 25: name = "EXT"; break;
-		case 26: name = "IRQ3"; break;
-		case 27: name = "HBLANK"; break;
-		case 28: name = "IRQ5"; break;
-		case 29: name = "VBLANK"; break;
-		case 30: name = "IRQ7"; break;
-		case 31: name = "Trap0"; break;
-		case 32: name = "Trap1"; break;
-		case 33: name = "Trap2"; break;
-		case 34: name = "Trap3"; break;
-		case 35: name = "Trap4"; break;
-		case 36: name = "Trap5"; break;
-		case 37: name = "Trap6"; break;
-		case 38: name = "Trap7"; break;
-		case 39: name = "Trap8"; break;
-		case 40: name = "Trap9"; break;
-		case 41: name = "Trap10"; break;
-		case 42: name = "Trap11"; break;
-		case 43: name = "Trap12"; break;
-		case 44: name = "Trap13"; break;
-		case 45: name = "Trap14"; break;
-		case 46: name = "Trap15"; break;
-		case 47: name = "Reserv30"; break;
-		case 48: name = "Reserv31"; break;
-		case 49: name = "Reserv32"; break;
-		case 50: name = "Reserv33"; break;
-		case 51: name = "Reserv34"; break;
-		case 52: name = "Reserv35"; break;
-		case 53: name = "Reserv36"; break;
-		case 54: name = "Reserv37"; break;
-		case 55: name = "Reserv38"; break;
-		case 56: name = "Reserv39"; break;
-		case 57: name = "Reserv3A"; break;
-		case 58: name = "Reserv3B"; break;
-		case 59: name = "Reserv3C"; break;
-		case 60: name = "Reserv3D"; break;
-		case 61: name = "Reserv3E"; break;
-		case 62: name = "Reserv3F"; break;
+		case 3: name = "AdrErr"; break;
+		case 4: name = "InvOpCode"; break;
+		case 5: name = "DivBy0"; break;
+		case 6: name = "Check"; break;
+		case 7: name = "TrapV"; break;
+		case 8: name = "GPF"; break;
+		case 9: name = "Trace"; break;
+		case 10: name = "Reserv0"; break;
+		case 11: name = "Reserv1"; break;
+		case 12: name = "Reserv2"; break;
+		case 13: name = "Reserv3"; break;
+		case 14: name = "Reserv4"; break;
+		case 15: name = "BadInt"; break;
+		case 16: name = "Reserv10"; break;
+		case 17: name = "Reserv11"; break;
+		case 18: name = "Reserv12"; break;
+		case 19: name = "Reserv13"; break;
+		case 20: name = "Reserv14"; break;
+		case 21: name = "Reserv15"; break;
+		case 22: name = "Reserv16"; break;
+		case 23: name = "Reserv17"; break;
+		case 24: name = "BadIRQ"; break;
+		case 25: name = "IRQ1"; break;
+		case 26: name = "EXT"; break;
+		case 27: name = "IRQ3"; break;
+		case 28: name = "HBLANK"; break;
+		case 29: name = "IRQ5"; break;
+		case 30: name = "VBLANK"; break;
+		case 31: name = "IRQ7"; break;
+		case 32: name = "Trap0"; break;
+		case 33: name = "Trap1"; break;
+		case 34: name = "Trap2"; break;
+		case 35: name = "Trap3"; break;
+		case 36: name = "Trap4"; break;
+		case 37: name = "Trap5"; break;
+		case 38: name = "Trap6"; break;
+		case 39: name = "Trap7"; break;
+		case 40: name = "Trap8"; break;
+		case 41: name = "Trap9"; break;
+		case 42: name = "Trap10"; break;
+		case 43: name = "Trap11"; break;
+		case 44: name = "Trap12"; break;
+		case 45: name = "Trap13"; break;
+		case 46: name = "Trap14"; break;
+		case 47: name = "Trap15"; break;
+		case 48: name = "Reserv30"; break;
+		case 49: name = "Reserv31"; break;
+		case 50: name = "Reserv32"; break;
+		case 51: name = "Reserv33"; break;
+		case 52: name = "Reserv34"; break;
+		case 53: name = "Reserv35"; break;
+		case 54: name = "Reserv36"; break;
+		case 55: name = "Reserv37"; break;
+		case 56: name = "Reserv38"; break;
+		case 57: name = "Reserv39"; break;
+		case 58: name = "Reserv3A"; break;
+		case 59: name = "Reserv3B"; break;
+		case 60: name = "Reserv3C"; break;
+		case 61: name = "Reserv3D"; break;
+		case 62: name = "Reserv3E"; break;
+		case 63: name = "Reserv3F"; break;
 		default: name = NULL;
 		}
 		if (name && vtable[i]) {
@@ -251,7 +255,7 @@
 	strcpy (ptr->name, "vtable");
 	ptr->paddr = ptr->vaddr = 0;
 	ptr->size = ptr->vsize = 0x100;
-	ptr->srwx = R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -261,7 +265,7 @@
 	strcpy (ptr->name, "header");
 	ptr->paddr = ptr->vaddr = 0x100;
 	ptr->size = ptr->vsize = sizeof (SMD_Header);
-	ptr->srwx = R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 
@@ -271,12 +275,13 @@
 	strcpy (ptr->name, "text");
 	ptr->paddr = ptr->vaddr = 0x100 + sizeof (SMD_Header);
 	{
-		SMD_Header *hdr = (SMD_Header *) (bf->buf->buf + 0x100);
-		ut64 baddr = hdr->RamStart;
+		SMD_Header hdr = {{0}};
+		r_buf_read_at (bf->buf, 0x100, (ut8*)&hdr, sizeof (hdr));
+		ut64 baddr = r_read_be32 (&hdr.RomStart);
 		ptr->vaddr += baddr;
 	}
 	ptr->size = ptr->vsize = bf->buf->length - ptr->paddr;
-	ptr->srwx = R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 	return ret;
@@ -291,7 +296,13 @@
 	if (!(ptr = R_NEW0 (RBinAddr))) {
 		return ret;
 	}
-	ptr->paddr = ptr->vaddr = 0x100 + sizeof (SMD_Header); // vtable[1];
+#if 0
+	SMD_Header hdr = {{0}};
+	r_buf_read_at (bf->buf, 0, (ut8*)&hdr, sizeof (hdr));
+	ut64 baddr = 0; // r_read_be32 (&hdr.RomStart);
+	ptr->paddr = ptr->vaddr = baddr + 0x100 + sizeof (SMD_Header);
+#endif
+	ptr->paddr = ptr->vaddr = 0x100 + sizeof (SMD_Header);
 	r_list_append (ret, ptr);
 	return ret;
 }
@@ -303,7 +314,7 @@
 	.load_bytes = &load_bytes,
 	.check_bytes = &check_bytes,
 	.entries = &entries,
-	.sections = sections,
+	.sections = &sections,
 	.symbols = &symbols,
 	.info = &info,
 	.minstrlen = 10,
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_spc700.c radare2-2.8.0+dfsg/libr/bin/p/bin_spc700.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_spc700.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_spc700.c	2018-08-07 14:12:36.000000000 +0000
@@ -61,7 +61,7 @@
 	ptr->size = RAM_SIZE;
 	ptr->vaddr = 0x0;
 	ptr->vsize = RAM_SIZE;
-	ptr->srwx = R_BIN_SCN_MAP;
+	ptr->srwx = R_BIN_SCN_READABLE;
 	ptr->add = true;
 	r_list_append (ret, ptr);
 	return ret;
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_te.c radare2-2.8.0+dfsg/libr/bin/p/bin_te.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_te.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_te.c	2018-08-07 14:12:36.000000000 +0000
@@ -117,7 +117,7 @@
 		ptr->vsize = sections[i].vsize;
 		ptr->paddr = sections[i].paddr;
 		ptr->vaddr = sections[i].vaddr;
-		ptr->srwx = R_BIN_SCN_MAP;
+		ptr->srwx = 0;
 		ptr->add = true;
 		if (R_BIN_TE_SCN_IS_EXECUTABLE (sections[i].flags)) {
 			ptr->srwx |= R_BIN_SCN_EXECUTABLE;
@@ -126,7 +126,7 @@
 			ptr->srwx |= R_BIN_SCN_WRITABLE;
 		}
 		if (R_BIN_TE_SCN_IS_READABLE (sections[i].flags)) {
-			ptr->srwx |= R_BIN_SCN_SHAREABLE;
+			ptr->srwx |= R_BIN_SCN_READABLE;
 		}
 		if (R_BIN_TE_SCN_IS_SHAREABLE (sections[i].flags)) {
 			ptr->srwx |= R_BIN_SCN_SHAREABLE;
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_vsf.c radare2-2.8.0+dfsg/libr/bin/p/bin_vsf.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_vsf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_vsf.c	2018-08-07 14:12:36.000000000 +0000
@@ -65,7 +65,7 @@
 			}
 		}
 		if (i >= MACHINES_MAX) {
-			eprintf("Unsupported machine: %s\n", machine);
+			eprintf ("Unsupported machine type\n");
 			free (res);
 			return NULL;
 		}
@@ -122,7 +122,7 @@
 	m->name = strdup ("RAM");
 	m->addr = 0;	// start address
 	m->size = _machines[vsf_obj->machine_idx].ram_size;
-	m->perms = r_str_rwx ("mrwx");
+	m->perms = r_str_rwx ("rwx");
 	r_list_append (ret, m);
 	return ret;
 }
@@ -157,7 +157,7 @@
 			ptr->size = 1024 * 8; // (8k)
 			ptr->vaddr = 0xa000;
 			ptr->vsize = 1024 * 8;	// BASIC size (8k)
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 
@@ -172,7 +172,7 @@
 			ptr->size = 1024 * 8; // (8k)
 			ptr->vaddr = 0xe000;
 			ptr->vsize = 1024 * 8;	// KERNAL size (8k)
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 
@@ -190,7 +190,7 @@
 			ptr->size = 1024 * 28; // (28k)
 			ptr->vaddr = 0x4000;
 			ptr->vsize = 1024 * 28;	// BASIC size (28k)
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 
@@ -206,7 +206,7 @@
 			ptr->size = 1024 * 4; // (4k)
 			ptr->vaddr = 0xb000;
 			ptr->vsize = 1024 * 4;	// BASIC size (4k)
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 
@@ -221,7 +221,7 @@
 			ptr->size = 1024 * 4; // (4k)
 			ptr->vaddr = 0xc000;
 			ptr->vsize = 1024 * 4;	// BASIC size (4k)
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 
@@ -236,7 +236,7 @@
 			ptr->size = 1024 * 8; // (8k)
 			ptr->vaddr = 0xe000;
 			ptr->vsize = 1024 * 8;	// KERNAL size (8k)
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 
@@ -257,7 +257,7 @@
 			ptr->size = size;
 			ptr->vaddr = 0x0;
 			ptr->vsize = size;
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 		} else {
@@ -274,7 +274,7 @@
 			ptr->size = size;
 			ptr->vaddr = 0x0;
 			ptr->vsize = size;
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 
@@ -286,7 +286,7 @@
 			ptr->size = size;
 			ptr->vaddr = 0x0;
 			ptr->vsize = size;
-			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			ptr->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_WRITABLE | R_BIN_SCN_EXECUTABLE;
 			ptr->add = true;
 			r_list_append (ret, ptr);
 		}
@@ -538,7 +538,7 @@
 	return ret;
 }
 
-struct r_bin_plugin_t r_bin_plugin_vsf = {
+RBinPlugin r_bin_plugin_vsf = {
 	.name = "vsf",
 	.desc = "VICE Snapshot File",
 	.license = "LGPL3",
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_wasm.c radare2-2.8.0+dfsg/libr/bin/p/bin_wasm.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_wasm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_wasm.c	2018-08-07 14:12:36.000000000 +0000
@@ -137,10 +137,10 @@
 		ptr->forwarder = r_str_const ("NONE");
 		ptr->bind = r_str_const ("NONE");
 		switch (imp->kind) {
-		case 0: ptr->type = r_str_const ("FUNC"); break;
+		case 0: ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR); break;
 		case 1: ptr->type = r_str_const ("TABLE"); break;
 		case 2: ptr->type = r_str_const ("MEMORY"); break;
-		case 3: ptr->type = r_str_const ("GLOBAL"); break;
+		case 3: ptr->type = r_str_const (R_BIN_BIND_GLOBAL_STR); break;
 		}
 		ptr->size = 0;
 		ptr->vaddr = -1;
@@ -160,7 +160,7 @@
 		ptr->name = strdup(tmp);
 		ptr->forwarder = r_str_const ("NONE");
 		ptr->bind = r_str_const ("NONE");
-		ptr->type = r_str_const ("FUNC");
+		ptr->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 		ptr->size = func->len;
 		ptr->vaddr = (ut64)func->code;
 		ptr->paddr = (ut64)func->code;
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_xbe.c radare2-2.8.0+dfsg/libr/bin/p/bin_xbe.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_xbe.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_xbe.c	2018-08-07 14:12:36.000000000 +0000
@@ -152,7 +152,7 @@
 		item->vsize = sect[i].vsize;
 		item->add = true;
 
-		item->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+		item->srwx = R_BIN_SCN_READABLE;
 		if (sect[i].flags & SECT_FLAG_X) {
 			item->srwx |= R_BIN_SCN_EXECUTABLE;
 		}
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_xtr_fatmach0.c radare2-2.8.0+dfsg/libr/bin/p/bin_xtr_fatmach0.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_xtr_fatmach0.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_xtr_fatmach0.c	2018-08-07 14:12:36.000000000 +0000
@@ -13,12 +13,12 @@
 static RList * oneshotall(RBin *bin, const ut8 *buf, ut64 size );
 static int free_xtr (void *xtr_obj) ;
 
-static bool checkHeader(const ut8 *h, int sz) {
+static bool checkHeader(const ut8 *h, ut64 sz) {
 	ut8 buf[4];
 	if (sz >= 0x300 && !memcmp (h, "\xca\xfe\xba\xbe", 4)) {
 		// XXX assuming BE
-		int off = r_read_at_be32 (h, 4 * sizeof (int));
-		if (off > 0 && off < sz) {
+		ut64 off = (ut64)r_read_at_be32 (h, 4 * sizeof (ut32));
+		if (off > 0 && off + 4 < sz) {
 			memcpy (buf, h + off, 4);
 			if (!memcmp (buf, "\xce\xfa\xed\xfe", 4) ||
 				!memcmp (buf, "\xfe\xed\xfa\xce", 4) ||
@@ -63,6 +63,7 @@
 	meta->machine = MACH0_(get_cpusubtype_from_hdr) (hdr);
 	meta->type = MACH0_(get_filetype_from_hdr) (hdr);
 	meta->libname = NULL;
+	meta->xtr_type = "fat";
 }
 
 static RBinXtrData * extract(RBin* bin, int idx) {
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_xtr_pemixed.c radare2-2.8.0+dfsg/libr/bin/p/bin_xtr_pemixed.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_xtr_pemixed.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_xtr_pemixed.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,140 @@
+/* radare - LGPL - Copyright 2018 - JohnPeng47 */
+
+#include <r_types.h>
+#include <r_util.h>
+#include <r_lib.h>
+#include <r_bin.h>
+#include "pe/pemixed.h"
+
+static RList * oneshotall(RBin *bin, const ut8 *buf, ut64 size);
+static bool check_bytes(const ut8 *bytes, ut64 sz);
+static RBinXtrData * oneshot(RBin *bin, const ut8 *buf, ut64 size, int subbin_type);
+static int destroy(RBin *bin);
+static int free_xtr (void *xtr_obj);
+
+//copied from bin_pe
+//another check is used later to check for .NET only code
+static bool check_bytes(const ut8 *bytes, ut64 sz) {
+	// XXX pemixed is always loaded because it uses
+	// XXX the same signature for fat and non-fat
+	// XXX so we need to make that action implicit
+	return false;
+#if 0
+	if (!bytes) {
+		return false;
+	}
+	if (sz <= 0x3d) { //less than size of MS-DOS header which is 64bytes
+		return false;
+	}
+	ut32 idx = (bytes[0x3c] | (bytes[0x3d]<<8));
+	if (sz > idx + 0x18 + 2) {
+		/* Here PE signature for usual PE files
+		 * and PL signature for Phar Lap TNT DOS extender 32bit executables
+		 */
+		if (!memcmp (bytes, "MZ", 2)) {
+			if (!memcmp (bytes+idx, "PE", 2) &&
+				!memcmp (bytes+idx+0x18, "\x0b\x01", 2)) {
+				return true;
+			}
+			// TODO: Add one more indicator, to prevent false positives
+			if (!memcmp (bytes+idx, "PL", 2)) {
+				return true;
+			}
+		}
+	}
+	return false;
+#endif
+}
+
+static RList * oneshotall(RBin *bin, const ut8 *buf, ut64 size) {
+	//extract dos componenent first
+	RBinXtrData *data = oneshot (bin, buf, size, SUB_BIN_DOS); 
+
+	if (!data) {
+		return NULL;
+	}
+	// XXX - how do we validate a valid narch?
+	RList * res = r_list_newf (r_bin_xtrdata_free); 
+	r_list_append (res, data); 
+	
+	if ((data = oneshot (bin, buf, size, SUB_BIN_NATIVE))){
+		r_list_append (res, data);
+	}
+
+	if ((data = oneshot (bin, buf, size, SUB_BIN_NET))){
+		r_list_append (res, data);
+	}
+
+	return res;
+}
+
+//implement this later
+static void fill_metadata_info_from_hdr(RBinXtrMetadata *meta, void *foo) {// struct Pe_32_r_bin_pemixed_obj_t* pe_bin){
+	meta->arch = NULL;
+	meta->bits = 0;
+	meta->machine = NULL;
+	meta->type = NULL;
+	meta->libname = NULL;
+	meta->xtr_type = "net";
+	//strcpy (meta->xtr_type, "net");
+}
+
+static RBinXtrData * oneshot(RBin *bin, const ut8 *buf, ut64 size, int sub_bin_type) {
+	struct r_bin_pemixed_obj_t* fb;
+	struct PE_(r_bin_pe_obj_t)* pe;
+
+	if (!bin || !bin->cur) {
+		return NULL;
+	}
+
+	if (!bin->cur->xtr_obj){
+		bin->cur->xtr_obj = r_bin_pemixed_from_bytes_new(buf, size);
+	}
+	
+	fb = bin->cur->xtr_obj;
+
+	//this function is prolly not nessescary
+	pe = r_bin_pemixed_extract (fb, sub_bin_type);
+
+	if (!pe){
+		return NULL;
+	} 
+	
+	RBinXtrMetadata *metadata = R_NEW0 (RBinXtrMetadata);
+	if (!metadata) {
+		return NULL;
+	}
+
+	fill_metadata_info_from_hdr (metadata, pe);	
+	return r_bin_xtrdata_new (pe->b, 0, pe->size, 3, metadata);
+}
+
+static int destroy(RBin *bin) {
+	return free_xtr (bin->cur->xtr_obj);
+}
+
+static int free_xtr (void *xtr_obj) {
+	r_bin_pemixed_free ((struct r_bin_pemixed_obj_t*) xtr_obj);
+	return true;
+}
+
+RBinXtrPlugin r_bin_xtr_plugin_xtr_pemixed = {
+	.name = "xtr.pemixed",
+	.desc = "Extract sub-binaries in PE files",
+	.load = NULL, 		//not yet implemented
+	.extract = NULL, 	//not yet implemented
+	.extractall = NULL, //not yet implemented
+	.destroy = &destroy,
+	.extract_from_bytes = &oneshot,
+	.extractall_from_bytes = &oneshotall,
+	.free_xtr = &free_xtr,
+	.check_bytes = &check_bytes,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_BIN_XTR,
+	.data = &r_bin_xtr_plugin_pemixed,
+	.version = R2_VERSION
+};
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/bin_z64.c radare2-2.8.0+dfsg/libr/bin/p/bin_z64.c
--- radare2-2.3.0+dfsg/libr/bin/p/bin_z64.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/bin_z64.c	2018-08-07 14:12:36.000000000 +0000
@@ -127,7 +127,7 @@
 	text->vsize = text->size;
 	text->paddr = N64_ROM_START;
 	text->vaddr = baddr (bf);
-	text->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP; // r-x
+	text->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE; // r-x
 	text->add = true;
 	r_list_append (ret, text);
 	return ret;
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/java.mk radare2-2.8.0+dfsg/libr/bin/p/java.mk
--- radare2-2.3.0+dfsg/libr/bin/p/java.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/java.mk	2018-08-07 14:12:36.000000000 +0000
@@ -3,14 +3,11 @@
 SHARED2_JAVA=$(addprefix ../,${SHARED_JAVA})
 
 STATIC_OBJ+=${OBJ_JAVA}
-ifeq ($(WITHNONPIC),1)
 STATIC_OBJ+=${SHARED2_JAVA}
-endif
 
 SHARED_OBJ+=${SHARED_JAVA}
 TARGET_JAVA=bin_java.${EXT_SO}
 
-ifeq ($(WITHPIC),1)
 ALL_TARGETS+=${TARGET_JAVA}
 
 ${TARGET_JAVA}: ${OBJ_JAVA}
@@ -18,4 +15,3 @@
 		$(LINK) $(LDFLAGS) ${SHARED2_JAVA} \
 		${SHLR}/java/libr_java.${EXT_AR} \
 		${SHLR}/sdb/src/libsdb.${EXT_AR}
-endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/nso.mk radare2-2.8.0+dfsg/libr/bin/p/nso.mk
--- radare2-2.3.0+dfsg/libr/bin/p/nso.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/nso.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-OBJ_NSO=bin_nso.o
+OBJ_NSO=bin_nso.o ../format/nxo/nxo.o
 #include $(SHLR)/lz4/deps.mk
 
 STATIC_OBJ+=${OBJ_NSO}
diff -Nru radare2-2.3.0+dfsg/libr/bin/p/xtr_pemixed.mk radare2-2.8.0+dfsg/libr/bin/p/xtr_pemixed.mk
--- radare2-2.3.0+dfsg/libr/bin/p/xtr_pemixed.mk	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/p/xtr_pemixed.mk	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,12 @@
+OBJ_XTR_PEMIXED=bin_xtr_pemixed.o ../format/pe/pemixed.o
+
+STATIC_OBJ+=${OBJ_XTR_PEMIXED}
+TARGET_XTR_PEMIXED=bin_xtr_pemixed.${EXT_SO}
+
+ifeq (${WITHPIC},1)
+ALL_TARGETS+=${TARGET_XTR_PEMIXED}
+
+${TARGET_XTR_PEMIXED}: ${OBJ_XTR_PEMIXED}
+	-${CC} $(call libname,bin_xtr_pemixed) -shared ${CFLAGS} \
+		-o ${TARGET_XTR_PEMIXED} ${OBJ_XTR_PEMIXED} $(LINK) $(LDFLAGS)
+endif
diff -Nru radare2-2.3.0+dfsg/libr/bin/pdb/pdb.c radare2-2.8.0+dfsg/libr/bin/pdb/pdb.c
--- radare2-2.3.0+dfsg/libr/bin/pdb/pdb.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/pdb/pdb.c	2018-08-07 14:12:36.000000000 +0000
@@ -961,8 +961,8 @@
 					break;
 				case eLF_STRUCTURE:
 				case eLF_UNION:
-					pdb->cb_printf ("{\"type\":\"%s\",\"name\":\"%s\",\"%s\":[",
-						"structure", name, "members");
+					pdb->cb_printf ("{\"type\":\"%s\",\"name\":\"%s\",\"size\":%d,\"%s\":[",
+						"structure", name, val, "members");
 					break;
 				default:
 					continue;
@@ -1131,27 +1131,27 @@
 				if (!is_first) {
 					pdb->cb_printf (",");
 				}
-				pdb->cb_printf ("{\"%s\":%d,\"%s\":%d,\"%s\":\"%s\",\"%s\":\"%s\"}",
+				pdb->cb_printf ("{\"%s\":%d,\"%s\":%d,\"%s\":\"%.*s\",\"%s\":\"%s\"}",
 					"address", (ut64) (img_base + omap_remap ((omap)? (omap->stream): 0, gdata->offset + sctn_header->virtual_address)),
 					"symtype", gdata->symtype,
-					"section_name", sctn_header->name,
+					"section_name", PDB_SIZEOF_SECTION_NAME, sctn_header->name,
 					"gdata_name", name);
 				break;
 			case 1:
 			case '*':
 			case 'r':
-				pdb->cb_printf ("f pdb.%s = 0x%"PFMT64x " # %d %s\n",
+				pdb->cb_printf ("f pdb.%s = 0x%"PFMT64x " # %d %.*s\n",
 					name,
 					(ut64) (img_base + omap_remap ((omap)? (omap->stream): 0,
 							gdata->offset + sctn_header->virtual_address)),
-					gdata->symtype, sctn_header->name);
+					gdata->symtype, PDB_SIZEOF_SECTION_NAME, sctn_header->name);
 				break;
 			case 'd':
 			default:
-				pdb->cb_printf ("0x%08"PFMT64x "  %d  %s  %s\n",
+				pdb->cb_printf ("0x%08"PFMT64x "  %d  %.*s  %s\n",
 					(ut64) (img_base + omap_remap ((omap)? (omap->stream): 0,
 							gdata->offset + sctn_header->virtual_address)),
-					gdata->symtype, sctn_header->name, name);
+					gdata->symtype, PDB_SIZEOF_SECTION_NAME, sctn_header->name, name);
 				break;
 			}
 			free (name);
@@ -1179,6 +1179,10 @@
 		pdb->cb_printf = (PrintfCallback) printf;
 	}
 	pdb->buf = r_buf_new_slurp (filename);
+	if (!pdb->buf) {
+		eprintf ("File reading error/empty file\n");
+		goto error;
+	}
 // pdb->fp = r_sandbox_fopen (filename, "rb");
 // if (!pdb->fp) {
 // eprintf ("file %s can not be open\n", filename);
diff -Nru radare2-2.3.0+dfsg/libr/bin/pdb/pdb_downloader.c radare2-2.8.0+dfsg/libr/bin/pdb/pdb_downloader.c
--- radare2-2.3.0+dfsg/libr/bin/pdb/pdb_downloader.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/pdb/pdb_downloader.c	2018-08-07 14:12:36.000000000 +0000
@@ -19,11 +19,7 @@
 }
 
 static bool checkCurl() {
-#if __WINDOWS__ && !__CYGWIN__
-	const char nul[] = "nul";
-#else
-	const char nul[] = "/dev/null";
-#endif
+	const char nul[] = R_SYS_DEVNULL;
 	if (r_sys_cmdf ("curl --version > %s", nul) != 0) {
 		return false;
 	}
@@ -37,7 +33,13 @@
 	char *abspath_to_archive = NULL;
 	char *archive_name = NULL;
 	size_t archive_name_len = 0;
-	const char *basepath = ".";
+	char *symbol_store_path = NULL;
+	char *dbg_file = NULL;
+	char *guid = NULL;
+	char *archive_name_escaped  = NULL;
+	char *user_agent = NULL;
+	char *symbol_server = NULL;
+
 	int res = 0;
 	int cmd_ret;
 	if (!opt->dbg_file || !*opt->dbg_file) {
@@ -55,42 +57,49 @@
 	}
 	memcpy (archive_name, opt->dbg_file, archive_name_len + 1);
 	archive_name[archive_name_len - 1] = '_';
-	if (opt->path && *opt->path) {
-		basepath = opt->path;
-	}
+	symbol_store_path = r_str_escape (opt->symbol_store_path);
+	dbg_file = r_str_escape (opt->dbg_file);
+	guid = r_str_escape (opt->guid);
+	archive_name_escaped = r_str_escape (archive_name);
+	user_agent = r_str_escape (opt->user_agent);
+	symbol_server = r_str_escape (opt->symbol_server);
+
 	if (checkExtract () || opt->extract == 0) {
 		res = 1;
-		abspath_to_archive = r_str_newf ("%s%s%s", basepath,
-		                                 R_SYS_DIR, archive_name);
-		curl_cmd = r_str_newf ("curl -sfA \"%s\" \"%s/%s/%s/%s\" -o \"%s\"",
-		                       opt->user_agent,
-		                       opt->symbol_server,
-		                       opt->dbg_file,
-		                       opt->guid,
-		                       archive_name,
+		abspath_to_archive = r_str_newf ("%s%s%s%s%s%s%s",
+						    symbol_store_path, R_SYS_DIR,
+						    dbg_file, R_SYS_DIR,
+						    guid, R_SYS_DIR,
+						    archive_name_escaped);
+
+		curl_cmd = r_str_newf ("curl -sfLA \"%s\" \"%s/%s/%s/%s\" --create-dirs -o \"%s\"",
+		                       user_agent,
+		                       symbol_server,
+							   dbg_file,
+							   guid,
+		                       archive_name_escaped,
 		                       abspath_to_archive);
 #if __WINDOWS__ && !__CYGWIN__
 		const char *cabextractor = "expand";
 		const char *format = "%s %s %s";
 		char *abspath_to_file = strdup (abspath_to_archive);
-		if (abspath_to_file) {
-			int abspath_to_archive_len = archive_name_len + strlen (basepath) + 2;
-			abspath_to_file[abspath_to_archive_len - 2] = 'b';
-			// extractor_cmd -> %1 %2 %3
-			// %1 - 'expand'
-			// %2 - absolute path to archive
-			// %3 - absolute path to file that will be dearchive
-			extractor_cmd = r_str_newf (format, cabextractor,
-				abspath_to_archive, abspath_to_file);
-		}
+		abspath_to_file[strlen (abspath_to_file) - 1] = 'b';
+
+		// extractor_cmd -> %1 %2 %3
+		// %1 - 'expand'
+		// %2 - absolute path to archive
+		// %3 - absolute path to file that will be dearchive
+		extractor_cmd = r_str_newf (format, cabextractor,
+			abspath_to_archive, abspath_to_file);
 #else
 		const char *cabextractor = "cabextract";
 		const char *format = "%s -d \"%s\" \"%s\"";
+		char *abspath_to_dir = r_file_dirname (abspath_to_archive);
 		// cabextract -d %1 %2
 		// %1 - path to directory where to extract all files from cab archive
 		// %2 - absolute path to cab archive
-		extractor_cmd = r_str_newf (format,
-		                            cabextractor, basepath, abspath_to_archive);
+		extractor_cmd = r_str_newf (format, cabextractor, abspath_to_dir, abspath_to_archive);
+		R_FREE (abspath_to_dir);
 #endif
 		if ((cmd_ret = r_sys_cmd (curl_cmd) != 0)) {
 			eprintf("curl exited with error %d\n", cmd_ret);
@@ -110,14 +119,20 @@
 		eprintf ("Falling back to uncompressed pdb\n");
 		res = 1;
 		archive_name[archive_name_len - 1] = 'b';
-		abspath_to_archive = r_str_newf ("%s%s%s", basepath,
-		                                 R_SYS_DIR, archive_name);
-		curl_cmd = r_str_newf ("curl -sfA \"%s\" \"%s/%s/%s/%s\" -o \"%s\"",
+		R_FREE (archive_name_escaped);
+		archive_name_escaped = r_str_escape (archive_name);
+		abspath_to_archive = r_str_newf("%s%s%s%s%s%s%s",
+		    symbol_store_path, R_SYS_DIR,
+		    dbg_file, R_SYS_DIR,
+		    guid, R_SYS_DIR,
+		    archive_name_escaped);
+
+		curl_cmd = r_str_newf ("curl -sfLA \"%s\" \"%s/%s/%s/%s\" --create-dirs -o \"%s\"",
 		                       opt->user_agent,
 		                       opt->symbol_server,
 		                       opt->dbg_file,
 		                       opt->guid,
-		                       archive_name,
+		                       archive_name_escaped,
 		                       abspath_to_archive);
 		if ((cmd_ret = r_sys_cmd (curl_cmd) != 0)) {
 			eprintf("curl exited with error %d\n", cmd_ret);
@@ -128,6 +143,12 @@
 	}
 	R_FREE (archive_name);
 	R_FREE (extractor_cmd);
+	R_FREE (symbol_store_path);
+	R_FREE (dbg_file);
+	R_FREE (guid);
+	R_FREE (archive_name_escaped);
+	R_FREE (user_agent);
+	R_FREE (symbol_server);
 	return res;
 }
 
@@ -140,7 +161,7 @@
 	pd->opt->guid = strdup (opt->guid);
 	pd->opt->symbol_server = strdup (opt->symbol_server);
 	pd->opt->user_agent = strdup (opt->user_agent);
-	pd->opt->path = strdup (opt->path);
+	pd->opt->symbol_store_path = strdup (opt->symbol_store_path);
 	pd->opt->extract = opt->extract;
 	pd->download = download;
 }
@@ -150,14 +171,13 @@
 	R_FREE (pd->opt->guid);
 	R_FREE (pd->opt->symbol_server);
 	R_FREE (pd->opt->user_agent);
-	R_FREE (pd->opt->path);
+	R_FREE (pd->opt->symbol_store_path);
 	R_FREE (pd->opt);
 	pd->download = 0;
 }
 
 int r_bin_pdb_download(RCore *core, int isradjson, int *actions_done, SPDBOptions *options) {
 	int ret;
-	char *path;
 	SPDBDownloaderOpt opt;
 	SPDBDownloader pdb_downloader;
 	RBinInfo *info = r_bin_get_info (core->bin);
@@ -172,13 +192,11 @@
 		return 1;
 	}
 
-	path = info->file ? r_file_dirname (info->file) : strdup (".");
-
 	opt.dbg_file = info->debug_file_name;
 	opt.guid = info->guid;
 	opt.symbol_server = options->symbol_server;
 	opt.user_agent = options->user_agent;
-	opt.path = path;
+	opt.symbol_store_path = options->symbol_store_path;
 	opt.extract = options->extract;
 
 	init_pdb_downloader (&opt, &pdb_downloader);
@@ -195,6 +213,5 @@
 	}
 	deinit_pdb_downloader (&pdb_downloader);
 
-	free (path);
 	return 0;
 }
diff -Nru radare2-2.3.0+dfsg/libr/bin/pdb/pdb_downloader.h radare2-2.8.0+dfsg/libr/bin/pdb/pdb_downloader.h
--- radare2-2.3.0+dfsg/libr/bin/pdb/pdb_downloader.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/pdb/pdb_downloader.h	2018-08-07 14:12:36.000000000 +0000
@@ -11,6 +11,7 @@
 typedef struct SPDBOptions {
 	char *user_agent;
 	char *symbol_server;
+	char *symbol_store_path;
 	ut64 extract;
 } SPDBOptions;
 
@@ -19,7 +20,7 @@
 	char *symbol_server;
 	char *dbg_file;
 	char *guid;
-	char *path;
+	char *symbol_store_path;
 	ut64 extract;
 } SPDBDownloaderOpt;
 
diff -Nru radare2-2.3.0+dfsg/libr/bin/pdb/tpi.c radare2-2.8.0+dfsg/libr/bin/pdb/tpi.c
--- radare2-2.3.0+dfsg/libr/bin/pdb/tpi.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/pdb/tpi.c	2018-08-07 14:12:36.000000000 +0000
@@ -115,7 +115,7 @@
 		}
 		default:
 			*res_len = 0;
-			printf("get_sval_name::oops\n");
+			printf("get_sval_name_len: Skipping unsupported type (%d)\n", val->value_or_type);
 			break;
 		}
 	}
@@ -130,6 +130,20 @@
 //		strcpy(name, scstr->name);
 	} else {
 		switch (val->value_or_type) {
+		case eLF_UQUADWORD:
+		{
+			SVal_LF_UQUADWORD *lf_uquadword;
+			lf_uquadword = (SVal_LF_UQUADWORD *) val->name_or_val;
+			*name = lf_uquadword->name.name;
+			break;
+		}
+		case eLF_QUADWORD:
+		{
+			SVal_LF_QUADWORD *lf_quadword;
+			lf_quadword = (SVal_LF_QUADWORD *) val->name_or_val;
+			*name = lf_quadword->name.name;
+			break;
+		}
 		case eLF_CHAR:
 		{
 			SVal_LF_CHAR *lf_char;
@@ -162,9 +176,16 @@
 //			strcpy(name, lf_ushort->name.name);
 			break;
 		}
+		case eLF_SHORT:
+		{
+			SVal_LF_SHORT *lf_short;
+			lf_short = (SVal_LF_SHORT *) val->name_or_val;
+			*name = lf_short->name.name;
+			break;
+		}
 		default:
 			*name = 0;
-			printf("get_sval_name::oops\n");
+			printf("get_sval_name: Skipping unsupported type (%d)\n", val->value_or_type);
 			break;
 		}
 	}
@@ -551,6 +572,20 @@
 		*res = val->value_or_type;
 	} else {
 		switch (val->value_or_type) {
+		case eLF_UQUADWORD:
+		{
+			SVal_LF_UQUADWORD *lf_uqword;
+			lf_uqword = (SVal_LF_UQUADWORD *) val->name_or_val;
+			*res = lf_uqword->value;
+			break;
+		}
+		case eLF_QUADWORD:
+		{
+			SVal_LF_QUADWORD *lf_qword;
+			lf_qword = (SVal_LF_QUADWORD *) val->name_or_val;
+			*res = lf_qword->value;
+			break;
+		}
 		case eLF_ULONG:
 		{
 			SVal_LF_ULONG *lf_ulong;
@@ -572,6 +607,13 @@
 			*res = lf_ushort->value;
 			break;
 		}
+		case eLF_SHORT:
+		{
+			SVal_LF_SHORT *lf_short;
+			lf_short = (SVal_LF_SHORT *) val->name_or_val;
+			*res = lf_short->value;
+			break;
+		}
 		case eLF_CHAR:
 		{
 			SVal_LF_CHAR *lf_char;
@@ -582,7 +624,7 @@
 
 		default:
 			*res = 0;
-			printf("get_sval_val::oops\n");
+			printf("get_sval_val: Skipping unsupported type (%d)\n", val->value_or_type);
 			break;
 		}
 	}
@@ -1471,6 +1513,26 @@
 		val->name_or_val = sctr;
 	} else {
 		switch (val->value_or_type) {
+		case eLF_UQUADWORD:
+		{
+		    SVal_LF_UQUADWORD lf_uqword;
+		    READ8(*read_bytes, len, lf_uqword.value, leaf_data, st64);
+		    parse_sctring(&lf_uqword.name, leaf_data, read_bytes, len);
+		    val->name_or_val = malloc(sizeof(SVal_LF_UQUADWORD));
+		    if (!val->name_or_val) break;
+		    memcpy(val->name_or_val, &lf_uqword, sizeof(SVal_LF_UQUADWORD));
+		    break;
+		}
+		case eLF_QUADWORD:
+		{
+			SVal_LF_QUADWORD lf_qword;
+			READ8(*read_bytes, len, lf_qword.value, leaf_data, st64);
+			parse_sctring (&lf_qword.name, leaf_data, read_bytes, len);
+			val->name_or_val = malloc (sizeof (SVal_LF_QUADWORD));
+			if (!val->name_or_val) break;
+			memcpy (val->name_or_val, &lf_qword, sizeof (SVal_LF_QUADWORD));
+			break;
+		}
 		case eLF_CHAR:
 		{
 			SVal_LF_CHAR lf_char;
@@ -1480,7 +1542,6 @@
 			if (!val->name_or_val) break;
 			memcpy (val->name_or_val, &lf_char, sizeof (SVal_LF_CHAR));
 			break;
-
 		}
 		case eLF_LONG:
 		{
@@ -1531,7 +1592,7 @@
 			break;
 		}
 		default:
-			printf ("parse_sval()::oops\n");
+			printf ("parse_sval: Skipping unsupported type (%d)\n", val->value_or_type);
 			return 0;
 		}
 	}
diff -Nru radare2-2.3.0+dfsg/libr/bin/pdb/types.h radare2-2.8.0+dfsg/libr/bin/pdb/types.h
--- radare2-2.3.0+dfsg/libr/bin/pdb/types.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bin/pdb/types.h	2018-08-07 14:12:36.000000000 +0000
@@ -691,6 +691,16 @@
 } SVal_LF_ULONG;
 
 typedef struct {
+    int64_t value;
+    SCString name;
+} SVal_LF_QUADWORD;
+
+typedef struct {
+    uint64_t value;
+    SCString name;
+} SVal_LF_UQUADWORD;
+
+typedef struct {
 	unsigned short value_or_type;
 	void *name_or_val;
 } SVal;
@@ -1199,8 +1209,10 @@
 	unsigned int virtual_address;
 } UMISC;
 
+#define PDB_SIZEOF_SECTION_NAME 8
+
 typedef struct {
-	char name[8];
+	char name[PDB_SIZEOF_SECTION_NAME];
 	UMISC misc;
 	unsigned int virtual_address;
 	unsigned int size_of_raw_data;
diff -Nru radare2-2.3.0+dfsg/libr/bp/bp.c radare2-2.8.0+dfsg/libr/bp/bp.c
--- radare2-2.3.0+dfsg/libr/bp/bp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bp/bp.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2009-2017 - pancake */
+/* radare2 - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_bp.h>
 #include <config.h>
@@ -92,8 +92,9 @@
 	RListIter *iter;
 	RBreakpointItem *b;
 	r_list_foreach(bp->bps, iter, b) {
-		if (b->addr == addr)
+		if (b->addr == addr) {
 			return b;
+		}
 	}
 	return NULL;
 }
@@ -119,10 +120,11 @@
 	return NULL;
 }
 
-R_API RBreakpointItem *r_bp_enable(RBreakpoint *bp, ut64 addr, int set) {
+R_API RBreakpointItem *r_bp_enable(RBreakpoint *bp, ut64 addr, int set, int count) {
 	RBreakpointItem *b = r_bp_get_in (bp, addr, 0);
 	if (b) {
 		b->enabled = set;
+		b->togglehits = count;
 		return b;
 	}
 	return NULL;
@@ -142,6 +144,16 @@
 	return bp->stepcont;
 }
 
+static void unlinkBreakpoint(RBreakpoint *bp, RBreakpointItem *b) {
+	int i;
+	for (i = 0; i < bp->bps_idx_count; i++) {
+		if (bp->bps_idx[i] == b) {
+			bp->bps_idx[i] = NULL;
+		}
+	}
+	r_list_delete_data (bp->bps, b);
+}
+
 /* TODO: detect overlapping of breakpoints */
 static RBreakpointItem *r_bp_add(RBreakpoint *bp, const ut8 *obytes, ut64 addr, int size, int hw, int rwx) {
 	int ret;
@@ -162,8 +174,15 @@
 	// NOTE: for hw breakpoints there are no bytes to save/restore
 	if (!hw) {
 		b->bbytes = calloc (size + 16, 1);
+		if (!b->bbytes) {
+			return NULL;
+		}
 		if (obytes) {
 			b->obytes = malloc (size);
+			if (!b->obytes) {
+				free (b->bbytes);
+				return NULL;
+			}
 			memcpy (b->obytes, obytes, size);
 		} else {
 			b->obytes = NULL;
@@ -172,7 +191,7 @@
 		ret = r_bp_get_bytes (bp, b->bbytes, size, bp->endian, 0);
 		if (ret != size) {
 			eprintf ("Cannot get breakpoint bytes. No architecture selected?\n");
-			r_bp_item_free (b);
+			unlinkBreakpoint (bp, b);
 			return NULL;
 		}
 		b->recoil = ret;
@@ -223,7 +242,8 @@
 	/* No _safe loop necessary because we return immediately after the delete. */
 	r_list_foreach (bp->bps, iter, b) {
 		if (b->addr == addr) {
-			r_list_delete (bp->bps, iter);
+			unlinkBreakpoint (bp, b);
+			// r_list_delete (bp->bps, iter);
 			return true;
 		}
 	}
@@ -247,12 +267,15 @@
 	}
 	return true;
 }
+
 // TODO: deprecate
 R_API int r_bp_list(RBreakpoint *bp, int rad) {
 	int n = 0;
 	RBreakpointItem *b;
 	RListIter *iter;
-	if (rad == 'j') bp->cb_printf ("[");
+	if (rad == 'j') {
+		bp->cb_printf ("[");
+	}
 	//eprintf ("Breakpoint list:\n");
 	r_list_foreach (bp->bps, iter, b) {
 		switch (rad) {
@@ -261,8 +284,8 @@
 				" %d %c%c%c %s %s %s cmd=\"%s\" cond=\"%s\" " \
 				"name=\"%s\" module=\"%s\"\n",
 				b->addr, b->addr + b->size, b->size,
-				(b->rwx & R_BP_PROT_READ) ? 'r' : '-',
-				(b->rwx & R_BP_PROT_WRITE) ? 'w' : '-',
+				((b->rwx & R_BP_PROT_READ) | (b->rwx & R_BP_PROT_ACCESS)) ? 'r' : '-',
+				((b->rwx & R_BP_PROT_WRITE)| (b->rwx & R_BP_PROT_ACCESS)) ? 'w' : '-',
 				(b->rwx & R_BP_PROT_EXEC) ? 'x' : '-',
 				b->hw ? "hw": "sw",
 				b->trace ? "trace" : "break",
@@ -322,7 +345,12 @@
 	}
 	/* allocate new slot */
 	bp->bps_idx_count += 16; // alocate space for 16 more bps
-	bp->bps_idx = realloc (bp->bps_idx, bp->bps_idx_count * sizeof(RBreakpointItem*));
+	RBreakpointItem **newbps = realloc (bp->bps_idx, bp->bps_idx_count * sizeof (RBreakpointItem*));
+	if (newbps) {
+		bp->bps_idx = newbps;
+	} else {
+		bp->bps_idx_count -= 16; // alocate space for 16 more bps
+	}
 	for (j = i; j < bp->bps_idx_count; j++) {
 		bp->bps_idx[j] = NULL;
 	}
@@ -338,6 +366,16 @@
 	return NULL;
 }
 
+R_API int r_bp_get_index_at (RBreakpoint *bp, ut64 addr) {
+	int i;
+	for (i = 0; i< bp->bps_idx_count; i++) {
+		if (bp->bps_idx[i] && bp->bps_idx[i]->addr == addr) {
+			return i;
+		}
+	}
+	return -1;
+}
+
 R_API int r_bp_del_index(RBreakpoint *bp, int idx) {
 	if (idx >= 0 && idx < bp->bps_idx_count) {
 		r_list_delete_data (bp->bps, bp->bps_idx[idx]);
diff -Nru radare2-2.3.0+dfsg/libr/bp/bp_io.c radare2-2.8.0+dfsg/libr/bp/bp_io.c
--- radare2-2.3.0+dfsg/libr/bp/bp_io.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bp/bp_io.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2016 pancake */
+/* radare - LGPL - Copyright 2009-2018 pancake */
 
 #include <r_bp.h>
 #include <config.h>
@@ -25,7 +25,7 @@
  * reflect all r_bp stuff in the process using dbg->bp_write or ->breakpoint
  */
 R_API int r_bp_restore(RBreakpoint *bp, bool set) {
-	return r_bp_restore_except (bp, set, 0);
+	return r_bp_restore_except (bp, set, UT64_MAX);
 }
 
 /**
diff -Nru radare2-2.3.0+dfsg/libr/bp/meson.build radare2-2.8.0+dfsg/libr/bp/meson.build
--- radare2-2.3.0+dfsg/libr/bp/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bp/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,20 +1,37 @@
-files=[
-	'bp.c',
-	'bp_io.c',
-	'bp_plugin.c',
-	'bp_traptrace.c',
-	'bp_watch.c',
-	'p/bp_arm.c',
-	'p/bp_bf.c',
-	'p/bp_mips.c',
-	'p/bp_ppc.c',
-	'p/bp_sh.c',
-	'p/bp_x86.c'
+files = [
+  'bp.c',
+  'bp_io.c',
+  'bp_plugin.c',
+  'bp_traptrace.c',
+  'bp_watch.c',
+  'p/bp_arm.c',
+  'p/bp_bf.c',
+  'p/bp_mips.c',
+  'p/bp_ppc.c',
+  'p/bp_sh.c',
+  'p/bp_x86.c'
 ]
 
 r_bp = library('r_bp', files,
-	include_directories: [platform_inc],
-	c_args: ['-DCORELIB'],
-	link_with: [r_util],
-	install: true
+  include_directories: [platform_inc],
+  c_args: ['-DCORELIB=1'],
+  dependencies: [r_util_dep],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_bp_dep = declare_dependency(link_with: r_bp,
+                              include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_bp],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_bp',
+  filebase: 'r_bp',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/bp/p/bp_arm.c radare2-2.8.0+dfsg/libr/bp/p/bp_arm.c
--- radare2-2.3.0+dfsg/libr/bp/p/bp_arm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bp/p/bp_arm.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,22 +7,26 @@
 	{ 64, 4, 0, (const ut8*)"\x00\x00\x20\xd4" }, // le - arm64 brk0
 	{ 64, 4, 1, (const ut8*)"\xd4\x20\x00\x00" }, // be - arm64
 	//{ 64, 1, 0, (const ut8*)"\xfe\xde\xff\xe7" }, // le - arm64 // hacky fix
+
+	{32, 4, 0, (const ut8*)"\xf0\x01\xf0\xe7" }, // eabi-le - undefined instruction - for all kernels
+	{32, 4, 1, (const ut8*)"\xe7\xf0\x01\xf0" }, // eabi-be
+
 //	{ 32, 1, 0, (const ut8*)"\xff\xff\xff\xff" }, // le - linux only? (undefined instruction)
 //	{ 32, 1, 1, (const ut8*)"\xff\xff\xff\xff" }, // be - linux only? (undefined instruction)
-	{ 32, 4, 0, (const ut8*)"\x01\x00\x9f\xef" }, // le - linux only? (undefined instruction)
-	{ 32, 4, 1, (const ut8*)"\xef\x9f\x00\x01" }, // be
+//	{ 32, 4, 0, (const ut8*)"\x01\x00\x9f\xef" }, // le - linux only? (undefined instruction)
+//	{ 32, 4, 1, (const ut8*)"\xef\x9f\x00\x01" }, // be
 #if 0
 	{ 4, 0, (const ut8*)"\xfe\xde\xff\xe7" }, // arm-le - from a gdb patch
 	{ 4, 1, (const ut8*)"\xe7\xff\xde\xfe" }, // arm-be
         { 4, 0, (const ut8*)"\xf0\x01\xf0\xe7" }, // eabi-le - undefined instruction - for all kernels
 	{ 4, 1, (const ut8*)"\xe7\xf0\x01\xf0" }, // eabi-be
 #endif
-	{ 16, 2, 0, (const ut8*)"\xde\x01" },         // thumb-le
-	{ 16, 2, 1, (const ut8*)"\x01\xde" },         // thumb-be
+	{ 16, 2, 0, (const ut8*)"\x01\xbe" },         // thumb-le
+	{ 16, 2, 1, (const ut8*)"\xbe\x01" },         // thumb-be
 	{ 16, 2, 0, (const ut8*)"\xfe\xdf" },         // arm-thumb-le
 	{ 16, 2, 1, (const ut8*)"\xdf\xfe" },         // arm-thumb-be
+	{ 16, 4, 0, (const ut8*)"\xff\xff\xff\xff" },         // arm-thumb-le
 	{ 16, 4, 1, (const ut8*)"\xff\xff\xff\xff" },         // arm-thumb-be
-	{ 16, 1, 1, (const ut8*)"\xff\xff\xff\xff" },         // arm-thumb-be
 	{ 0, 0, 0, NULL }
 };
 
diff -Nru radare2-2.3.0+dfsg/libr/bp/p/bp_mips.c radare2-2.8.0+dfsg/libr/bp/p/bp_mips.c
--- radare2-2.3.0+dfsg/libr/bp/p/bp_mips.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/bp/p/bp_mips.c	2018-08-07 14:12:36.000000000 +0000
@@ -6,6 +6,8 @@
 static struct r_bp_arch_t r_bp_plugin_mips_bps[] = {
 	{ 32, 4, 0, (const ut8*)"\x0d\x00\x00\x00" },
 	{ 32, 4, 1, (const ut8*)"\x00\x00\x00\x0d" },
+	{ 64, 4, 0, (const ut8*)"\x0d\x00\x00\x00" },
+	{ 64, 4, 1, (const ut8*)"\x00\x00\x00\x0d" },
 	{ 0, 0, 0, NULL }
 };
 
diff -Nru radare2-2.3.0+dfsg/libr/config/config.c radare2-2.8.0+dfsg/libr/config/config.c
--- radare2-2.3.0+dfsg/libr/config/config.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/config/config.c	2018-08-07 14:12:36.000000000 +0000
@@ -2,15 +2,12 @@
 
 #include "r_config.h"
 #include "r_util.h" // r_str_hash, r_str_chop, ...
-#ifdef _MSC_VER
-#define strcasecmp stricmp
-#endif
+
 R_API RConfigNode* r_config_node_new(const char *name, const char *value) {
-	RConfigNode *node;
-	if (STRNULL (name)) {
+	if (IS_NULLSTR (name)) {
 		return NULL;
 	}
-	node = R_NEW0 (RConfigNode);
+	RConfigNode *node = R_NEW0 (RConfigNode);
 	if (!node) {
 		return NULL;
 	}
@@ -49,6 +46,19 @@
 	free (node);
 }
 
+static bool isBoolean(const char *val) {
+	if (!r_str_casecmp (val, "true") || !r_str_casecmp (val, "false")) {
+		return true;
+	}
+	if (!r_str_casecmp (val, "on") || !r_str_casecmp (val, "off")) {
+		return true;
+	}
+	if (!r_str_casecmp (val, "yes") || !r_str_casecmp (val, "no")) {
+		return true;
+	}
+	return false;
+}
+
 static void config_print_value_json(RConfig *cfg, RConfigNode *node) {
 	const char *val = node->value;
 	if (!val) {
@@ -59,7 +69,7 @@
 		if (!strncmp (val, "0x", 2)) {
 			ut64 n = r_num_get (NULL, val);
 			cfg->cb_printf ("%"PFMT64d, n);
-		} else if (r_str_isnumber (val) || !strcmp (val, "true") || !strcmp (val, "false")) {
+		} else if (r_str_isnumber (val) || isBoolean (val)) {
 			cfg->cb_printf ("%s", val);
 		} else {
 			cfg->cb_printf ("\"%s\"", sval);
@@ -148,7 +158,7 @@
 	bool json = false;
 	bool isFirst = false;
 
-	if (!STRNULL (str)) {
+	if (!IS_NULLSTR (str)) {
 		str = r_str_trim_ro (str);
 		len = strlen (str);
 		if (len > 0 && str[0] == 'j') {
@@ -271,7 +281,7 @@
 }
 
 R_API RConfigNode* r_config_node_get(RConfig *cfg, const char *name) {
-	if (STRNULL (name)) {
+	if (!cfg || IS_NULLSTR (name)) {
 		return NULL;
 	}
 	return ht_find (cfg->ht, name, NULL);
@@ -296,14 +306,17 @@
 }
 
 static bool is_true(const char *s) {
-	return !strcasecmp ("true", s) || !strcasecmp ("1", s);
+	return !r_str_casecmp ("yes", s) || !r_str_casecmp ("on", s) || !r_str_casecmp ("true", s) || !r_str_casecmp ("1", s);
 }
 
 static bool is_bool(const char *s) {
-	return !strcasecmp ("true", s) || !strcasecmp ("false", s);
+	return !r_str_casecmp ("true", s) || !r_str_casecmp ("false", s);
 }
 
 R_API const char* r_config_get(RConfig *cfg, const char *name) {
+	if (!cfg || !name) {
+		return NULL;
+	}
 	RConfigNode *node = r_config_node_get (cfg, name);
 	if (node) {
 		if (node->getter) {
@@ -339,6 +352,9 @@
 		if (node->i_value || !strcmp (node->value, "false")) {
 			return node->i_value;
 		}
+		if (!strcmp (node->value, "true")) {
+			return 1;
+		}
 		return (ut64) r_num_math (cfg->num, node->value);
 	}
 	return (ut64) 0LL;
@@ -388,7 +404,7 @@
 	RConfigNode *node = NULL;
 	char *ov = NULL;
 	ut64 oi;
-	if (!cfg || STRNULL (name)) {
+	if (!cfg || IS_NULLSTR (name)) {
 		return NULL;
 	}
 	node = r_config_node_get (cfg, name);
@@ -469,6 +485,8 @@
 			}
 			free (node->value);
 			node->value = strdup (ov? ov: "");
+free (ov);
+			return NULL;
 		}
 	}
 beach:
@@ -739,6 +757,9 @@
 R_API bool r_config_save_num(RConfigHold *h, ...) {
 	va_list ap;
 	char *key;
+	if (!h) {
+		return false;
+	}
 	if (!h->list_num) {
 		h->list_num = r_list_newf ((RListFree) free);
 		if (!h->list_num) {
diff -Nru radare2-2.3.0+dfsg/libr/config/meson.build radare2-2.8.0+dfsg/libr/config/meson.build
--- radare2-2.3.0+dfsg/libr/config/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/config/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,13 +1,30 @@
-files=[
-'callback.c',
-'config.c',
+files = [
+  'callback.c',
+  'config.c',
 ]
 
 r_config = library('r_config', files,
   include_directories: [platform_inc],
-  link_with: [r_util],
-  objects: [
-	libr2sdb.extract_all_objects()
+  dependencies: [
+    r_util_dep,
+    sdb_dep
   ],
-  install: true
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_config_dep = declare_dependency(link_with: r_config,
+                                  include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_config],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_config',
+  filebase: 'r_config',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/config.h.in radare2-2.8.0+dfsg/libr/config.h.in
--- radare2-2.3.0+dfsg/libr/config.h.in	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/config.h.in	2018-08-07 14:12:36.000000000 +0000
@@ -10,6 +10,8 @@
 
 #define R_EGG_STATIC_PLUGINS @plugins_egg@
 #define R_BIN_STATIC_PLUGINS @plugins_bin@
+#define R_BIN_LDR_STATIC_PLUGINS @plugins_bin_ldr@
+#define R_BIN_XTR_STATIC_PLUGINS @plugins_bin_xtr@
 #define R_FS_STATIC_PLUGINS @plugins_fs@
 #define R_IO_STATIC_PLUGINS @plugins_io@
 #define R_DEBUG_STATIC_PLUGINS @plugins_debug@
diff -Nru radare2-2.3.0+dfsg/libr/config.mk.tail radare2-2.8.0+dfsg/libr/config.mk.tail
--- radare2-2.3.0+dfsg/libr/config.mk.tail	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/config.mk.tail	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,10 @@
 # config.mk.tail
 
 LIBR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+# neat???!? trick to support path with spaces
+null:=
+SPACE:=$(null) $(null)
+
 ifeq ($(LIBR),)
 ifeq ($(R2DIR),)
 $(error ERROR: Cannot find R2DIR. Please define this variable)
@@ -9,6 +13,7 @@
 MSVC=$(R2DIR)/msvc
 endif
 endif
+
 SHLR:=$(LIBR)/../shlr
 
 #include $(LIBR)/../config-user.mk
@@ -18,7 +23,8 @@
 CFLAGS+=${CFLAGS_APPEND}
 CFLAGS+=${CPPFLAGS}
 
-ifeq ($(WITHPIC),1)
+ifeq (1,1)
+#$(WITHPIC),1)
 LINK+=$(subst r_,-L$(LIBR)/,$(DEPS))
 LINK+=$(subst r_,-lr_,$(DEPS))
 LINK+=$(subst r_,-L$(LIBR)/,$(BINDEPS))
diff -Nru radare2-2.3.0+dfsg/libr/cons/canvas.c radare2-2.8.0+dfsg/libr/cons/canvas.c
--- radare2-2.3.0+dfsg/libr/cons/canvas.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/canvas.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,119 +1,54 @@
-/* radare - LGPL - Copyright 2013-2017 - pancake */
+/* radare - LGPL - Copyright 2013-2018 - pancake */
 
 #include <r_cons.h>
 
-#define useUtf8 (r_cons_singleton()->use_utf8)
-#define useUtf8Curvy (r_cons_singleton()->use_utf8_curvy)
+#define useUtf8 (r_cons_singleton ()->use_utf8)
+#define useUtf8Curvy (r_cons_singleton ()->use_utf8_curvy)
 
 #define W(y) r_cons_canvas_write (c, y)
 #define G(x, y) r_cons_canvas_gotoxy (c, x, y)
 
 R_API void r_cons_canvas_free(RConsCanvas *c) {
-	free (c->b);
-	free (c->attrs);
-	free (c);
+	if (c) {
+		if (c->b) {
+			int y;
+			for (y = 0; y < c->h; y++) {
+				free (c->b[y]);
+			}
+			free (c->b);
+		}
+		free (c->bsize);
+		free (c->blen);
+		free (c->attrs);
+		free (c);
+	}
 }
 
 R_API void r_cons_canvas_clear(RConsCanvas *c) {
-	int y;
 	if (c && c->b) {
-		memset (c->b, '\n', c->blen);
-		c->b[c->blen] = 0;
+		int y;
 		for (y = 0; y < c->h; y++) {
-			c->b[y * c->w] = '\n';
+			memset (c->b[y], '\n', c->bsize[y]);
 		}
+
+		/*//XXX tofix*/
 		if (c->attrs) {
 			c->attrslen = 0;
-			memset (c->attrs, 0, sizeof (*c->attrs) * c->blen);
+			memset (c->attrs, 0, sizeof (*c->attrs) * (c->w + 1) * c->h);
 		}
 	}
 }
 
-R_API RConsCanvas *r_cons_canvas_new(int w, int h) {
-	RConsCanvas *c;
-	if (w < 1 || h < 1) {
-		return NULL;
-	}
-	c = R_NEW0 (RConsCanvas);
-	if (!c) return NULL;
-	c->color = 0;
-	c->sx = 0;
-	c->sy = 0;
-	c->blen = (w + 1) * h;
-	c->b = malloc (c->blen + 1);
-	if (!c->b) {
-		free (c);
-		return NULL;
-	}
-	c->attrslen = 0;
-	c->attrs = calloc (sizeof (*c->attrs), c->blen + 1);
-	if (!c->attrs) {
-		free (c->b);
-		free (c);
-		return NULL;
-	}
-	c->attr = Color_RESET;
-	c->w = w;
-	c->h = h;
-	c->x = c->y = 0;
-	r_cons_canvas_clear (c);
-	return c;
-}
-
-R_API bool r_cons_canvas_gotoxy(RConsCanvas *c, int x, int y) {
-	bool ret = true;
-	if (!c) {
-		return 0;
-	}
-	x += c->sx;
-	y += c->sy;
-	if (x > c->w * 2) {
-		return false;
-	}
-	if (y > c->h * 2) {
-		return false;
-	}
-	if (x >= c->w) {
-		c->x = c->w;
-		ret = false;
-	}
-	if (y >= c->h) {
-		c->y = c->h;
-		ret = false;
-	}
-	if (x < 0) {
-		//c->x = 0;
-		ret = false;
-	}
-	if (y < 0) {
-		c->y = 0;
-		ret = false;
-	}
-	if (x < c->w && x >= 0) {
-		c->x = x;
-	}
-	if (y < c->h && y >= 0) {
-		c->y = y;
-	}
-	return ret;
-}
-
-static int is_ansi_seq(const char *s) {
-#if 0
-	/* check utf8 length */
-	if (((*s & 0xc0) == 0x80)) {
-		return false;
-	}
-#endif
-	return s && *s == 0x1b && *(s + 1) == '[';
+static bool _is_ansi_seq(const char *s) {
+	return s && s[0] == 033 && s[1] == '[';
 }
 
-static int get_piece(const char *p, char *chr) {
+static int _get_piece(const char *p, char *chr) {
 	const char *q = p;
 	if (!p) {
 		return 0;
 	}
-	while (p && *p && *p != '\n' && !is_ansi_seq (p)) {
+	while (p && *p && *p != '\n' && ! _is_ansi_seq (p)) {
 		p++;
 	}
 	if (chr) {
@@ -122,30 +57,6 @@
 	return p - q;
 }
 
-static char *prefixline(RConsCanvas *c, int *left) {
-	if (!c) {
-		return NULL;
-	}
-	int x, len;
-	char *p;
-	int b_len = c->w * c->h;
-	int yxw = c->y * c->w;
-	if (b_len < yxw) {
-		return NULL;
-	}
-	p = c->b + yxw;
-	len = b_len - yxw - 1;
-	for (x = 0; (p[x] && x < c->x) && x < len; x++) {
-		if (p[x] == '\n') {
-			p[x] = ' ';
-		}
-	}
-	if (left) {
-		*left = c->w - c->x;
-	}
-	return p + x;
-}
-
 static const char **attr_at(RConsCanvas *c, int loc) {
 	int i, j, delta;
 	if (!c->color || c->attrslen == 0) {
@@ -194,14 +105,25 @@
 	}
 }
 
-static void stamp_attr(RConsCanvas *c, int length) {
+static void stamp_attr(RConsCanvas *c, int loc, int length) {
+	if (!c->color) {
+		return;
+	}
 	int i;
 	const char **s;
-	const int loc = c->x + (c->y * c->w);
 	s = attr_at (c, loc);
 
 	if (s) {
-		//If theres already an attr there, just replace it.
+		if (*s != 0 && strlen (*s) > 2 && *(*s + 2) == '0') {
+			if (strlen (c->attr) == 5 && *(c->attr + 2) != '0') {
+				char tmp[9];
+				memcpy (tmp, c->attr, 2);
+				strcpy (tmp + 2, "0;");
+				memcpy (tmp + 4, c->attr + 2, 3);
+				tmp[8] = 0;
+				c->attr = r_str_const (tmp);
+			}
+		}
 		*s = c->attr;
 	} else {
 		c->attrs[c->attrslen].loc = loc;
@@ -210,19 +132,22 @@
 		sort_attrs (c);
 	}
 
-	for (i = 0; i < length; i++) {
+	for (i = 1; i < length; i++) {
 		s = attr_at (c, loc + i);
 		if (s) {
-			*s = c->attr;
+			*s = 0;
 		}
 	}
 }
 
 /* check for ANSI sequences and use them as attr */
 static const char *set_attr(RConsCanvas *c, const char *s) {
+	if (!c || !s) {
+		return NULL;
+	}
 	const char *p = s;
 
-	while (is_ansi_seq (p)) {
+	while (_is_ansi_seq (p)) {
 		p += 2;
 		while (*p && *p != 'J' && *p != 'm' && *p != 'H') {
 			p++;
@@ -243,46 +168,234 @@
 	return p;
 }
 
-R_API void r_cons_canvas_write(RConsCanvas *c, const char *s) {
-	char *p, ch;
-	int orig_x, x;
-	int left, slen, attr_len, piece_len;
+R_API bool r_cons_canvas_gotoxy(RConsCanvas *c, int x, int y) {
+	bool ret = true;
+	if (!c) {
+		return 0;
+	}
+	y += c->sy;
+	x += c->sx;
 
-	if (!c || !s || !*s) {
+	if (y > c->h * 2) {
+		return false;
+	}
+	if (y >= c->h) {
+		y = c->h - 1;
+		ret = false;
+	}
+	if (y < 0) {
+		y = 0;
+		ret = false;
+	}
+	if (x < 0) {
+		//c->x = 0;
+		ret = false;
+	}
+	if (x > c->blen[y] * 2) {
+		return false;
+	}
+	if (x >= c->blen[y]) {
+		c->x = c->blen[y];
+		ret = false;
+	}
+	if (x < c->blen[y] && x >= 0) {
+		c->x = x;
+	}
+	if (y < c->h && y >= 0) {
+		c->y = y;
+	}
+	return ret;
+}
+
+R_API RConsCanvas *r_cons_canvas_new(int w, int h) {
+	if (w < 1 || h < 1) {
+		return NULL;
+	}
+	RConsCanvas *c = R_NEW0 (RConsCanvas);
+	if (!c) {
+		return NULL;
+	}
+	c->bsize = NULL;
+	c->blen = NULL;
+	int i = 0;
+	c->color = 0;
+	c->sx = 0;
+	c->sy = 0;
+	c->b = malloc (sizeof *c->b * h);
+	if (!c->b) {
+		goto beach;
+	}
+	c->blen = malloc (sizeof *c->blen * h);
+	if (!c->blen) {
+		goto beach;
+	}
+	c->bsize = malloc (sizeof *c->bsize * h);
+	if (!c->bsize) {
+		goto beach;
+	}
+	for (i = 0; i < h; i++) {
+		c->b[i] = malloc (w + 1);
+		c->blen[i] = w;
+		c->bsize[i] = w + 1;
+		if (!c->b[i]) {
+			goto beach;
+		}
+	}
+	c->w = w;
+	c->h = h;
+	c->x = c->y = 0;
+	c->attrslen = 0;
+	c->attrs = calloc (sizeof (*c->attrs), (c->w + 1) * c->h);
+	if (!c->attrs) {
+		goto beach;
+	}
+	c->attr = Color_RESET;
+	r_cons_canvas_clear (c);
+	return c;
+beach: {
+	int j;
+	for (j = 0; j < i; j++) {
+		free (c->b[j]);
+	}
+	free (c->bsize);
+	free (c->blen);
+	free (c->b);
+	free (c);
+	return NULL;
+       }
+}
+
+static int utf8len_fixed(const char *s, int n) {
+	int i = 0, j = 0, fullwidths = 0;
+	while (s[i] && n > 0) {
+		if ((s[i] & 0xc0) != 0x80) {
+			j++;
+			if (r_str_char_fullwidth (s + i, n)) {
+				fullwidths++;
+			}
+		}
+		n--;
+		i++;
+	}
+	return j + fullwidths;
+}
+
+static int bytes_utf8len(const char *s, int n, int left) {
+	int i = 0, fullwidths = 0;
+	while (n > -1 && i < left && s[i]) {
+		if (r_str_char_fullwidth (s + i, left - i)) {
+			fullwidths++;
+		}
+		if ((s[i] & 0xc0) != 0x80) {
+			n--;
+		}
+		i++;
+	}
+	i -= fullwidths;
+	return n == -1 ? i - 1 : i;
+}
+
+static int expand_line (RConsCanvas *c, int real_len, int utf8_len) {
+	if (real_len == 0) {
+		return true;
+	}
+	int buf_utf8_len = bytes_utf8len (c->b[c->y] + c->x, utf8_len, c->blen[c->y] - c->x);
+	int goback = R_MAX (0, (buf_utf8_len - utf8_len));
+	int padding = (real_len - utf8_len) - goback;
+
+	if (padding) {
+		if (padding > 0 && c->blen[c->y] + padding > c->bsize[c->y]) {
+			int newsize = R_MAX (c->bsize[c->y] * 1.5, c->blen[c->y] + padding);
+			char * newline = realloc (c->b[c->y], sizeof (*c->b[c->y])*(newsize)); 
+			if (!newline) {
+				return false;
+			}
+			memset (newline + c->bsize[c->y], 0, newsize - c->bsize[c->y]);
+			c->b[c->y] = newline;
+			c->bsize[c->y] = newsize;
+		}
+		int size = R_MAX (c->blen[c->y] - c->x - goback, 0);
+		char *start = c->b[c->y] + c->x + goback;
+		char *tmp = malloc (size);
+		if (!tmp) {
+			return false;
+		}
+		memcpy (tmp, start, size);
+		if (padding < 0) {
+			int lap = R_MAX (0, c->b[c->y] - (start + padding));
+			memcpy (start + padding + lap,  tmp + lap, size - lap);
+			free (tmp);
+			c->blen[c->y] += padding;
+			return true;
+		}
+		memcpy (start + padding, tmp, size);
+		free (tmp);
+		c->blen[c->y] += padding;
+	}
+	return true;
+}
+
+R_API void r_cons_canvas_write(RConsCanvas *c, const char *s) {
+	if (!c || !s || !*s || !R_BETWEEN (0, c->y, c->h - 1) || !R_BETWEEN (0, c->x, c->w - 1)) {
 		return;
 	}
+
+	char ch;
+	int left, slen, attr_len, piece_len;
+	int orig_x = c->x, attr_x = c->x;
+
+	c->x = bytes_utf8len (c->b[c->y], c->x, c->blen[c->y]);
+
 	/* split the string into pieces of non-ANSI chars and print them normally,
 	** using the ANSI chars to set the attr of the canvas */
-	orig_x = c->x;
 	r_cons_break_push (NULL, NULL);
 	do {
 		const char *s_part = set_attr (c, s);
 		ch = 0;
-		piece_len = get_piece (s_part, &ch);
+		piece_len = _get_piece (s_part, &ch);
 		if (piece_len == 0 && ch == '\0' && s_part == s) {
 			break;
 		}
-		left = 0;
-		p = prefixline (c, &left);
-		slen = R_MIN (left, piece_len);
-		attr_len = slen <= 0 && s_part != s? 1: slen;
-		if (attr_len > 0) {
-			stamp_attr (c, attr_len);
-		}
-		x = c->x - c->sx;
-		if (G (x, c->y - c->sy)) {
-			memcpy (p, s_part, slen);
+		left = c->blen[c->y] - c->x;
+		slen = piece_len;
+
+		if (piece_len > left) {
+			int utf8_piece_len = utf8len_fixed (s_part, piece_len);
+			if (utf8_piece_len > c->w - attr_x) {
+				slen = left;
+			}
+		}
+
+		int real_len = r_str_nlen (s_part, slen);
+		int utf8_len = utf8len_fixed (s_part, slen); 
+
+		if (!expand_line (c, real_len, utf8_len)) {
+			break;
+		}
+
+		if (G (c->x - c->sx, c->y - c->sy)) {
+			memcpy (c->b[c->y] + c->x, s_part, slen);
 		}
+
+		attr_len = slen <= 0 && s_part != s? 1: utf8_len;
+		if (attr_len > 0 && attr_x < c->blen[c->y]) {
+			stamp_attr (c, c->y*c->w + attr_x, attr_len);
+		}
+
 		s = s_part;
 		if (ch == '\n') {
+			c->attr = Color_RESET;
+			stamp_attr (c, c->y*c->w + attr_x, 0);
 			c->y++;
-			c->x = orig_x;
 			s++;
-			if (*s == '\0') {
+			if (*s == '\0' || c->y  >= c->h) {
 				break;
 			}
+			c->x = bytes_utf8len (c->b[c->y], orig_x, c->blen[c->y]);
+			attr_x = orig_x;
 		} else {
 			c->x += slen;
+			attr_x += utf8_len;
 		}
 		s += piece_len;
 	} while (*s && !r_cons_is_breaked ());
@@ -291,43 +404,58 @@
 }
 
 R_API char *r_cons_canvas_to_string(RConsCanvas *c) {
-	int x, y, olen = 0;
+	int x, y, olen = 0, attr_x = 0;
 	char *o;
-	const char *b;
 	const char **atr;
 	int is_first = true;
 
 	if (!c) {
 		return NULL;
 	}
-	b = c->b;
-	o = calloc (1, (c->w * (c->h + 1)) * (CONS_MAX_ATTR_SZ));
+
+	for (y = 0; y < c->h; y++) {
+		olen += c->blen[y] + 1;
+	}
+	o = calloc (1, olen * (CONS_MAX_ATTR_SZ));
 	if (!o) {
 		return NULL;
 	}
+
+	olen = 0;
 	for (y = 0; y < c->h; y++) {
 		if (!is_first) {
 			o[olen++] = '\n';
 		}
 		is_first = false;
-		for (x = 0; x < c->w; x++) {
-			const int p = x + (y * c->w);
-			atr = attr_at (c, p);
-			if (atr && *atr) {
-				strcat (o, *atr);
-				olen += strlen (*atr);
+		attr_x = 0;
+		for (x = 0; x < c->blen[y]; x++) {
+			if ((c->b[y][x] & 0xc0) != 0x80) {
+				atr = attr_at (c, y*c->w + attr_x);
+				if (atr && *atr) {
+					int len = strlen (*atr);
+					memcpy (o + olen, *atr, len);
+					olen += len;
+				}
+				attr_x++;
+				if (r_str_char_fullwidth (c->b[y] + x, c->blen[y] - x)) {
+					attr_x++;
+				}
 			}
-			if (!b[p] || b[p] == '\n') {
-				break;
+			if (!c->b[y][x] || c->b[y][x] == '\n') {
+				o[olen++] = ' ';
+				continue;
 			}
-			const char *rune = r_cons_get_rune((const ut8)b[p]);
+			const char *rune = r_cons_get_rune ((const ut8)c->b[y][x]);
 			if (rune) {
 				strcpy (o + olen, rune);
 				olen += strlen (rune);
 			} else {
-				o[olen++] = b[p];
+				o[olen++] = c->b[y][x];
 			}
 		}
+		while (olen > 0 && o[olen - 1] == ' ') {
+			o[--olen] = '\0';
+		}
 	}
 	o[olen] = '\0';
 	return o;
@@ -353,26 +481,58 @@
 }
 
 R_API int r_cons_canvas_resize(RConsCanvas *c, int w, int h) {
-	void *newbuf = NULL;
-	const int blen = (w + 1) * h;
-	char *b = NULL;
 	if (!c || w < 0) {
 		return false;
 	}
-	b = realloc (c->b, blen + 1);
-	if (!b) {
+	void *newattrs = NULL;
+	int *newblen = realloc (c->blen, sizeof *c->blen * h);
+	if (!newblen) {
+		r_cons_canvas_free (c);
 		return false;
 	}
-	c->b = b;
-	newbuf = realloc (c->attrs, sizeof (*c->attrs) * blen + 1);
-	if (!newbuf) {
-		free (c->b);
-		free (c->attrs);
+	c->blen = newblen;
+	int *newbsize = realloc (c->bsize, sizeof *c->bsize * h);
+	if (!newbsize) {
+		r_cons_canvas_free (c);
+		return false;
+	}
+	c->bsize = newbsize;
+	char **newb = realloc (c->b, sizeof *c->b * h);
+	if (!newb) {
+		r_cons_canvas_free (c);
 		return false;
 	}
-	c->attrs = newbuf;
-	c->blen = blen;
-	c->b = b;
+	c->b = newb;
+	int i;
+	char *newline = NULL;
+	for (i = 0; i < h; i++) {
+		if (i < c->h) {
+			newline = realloc (c->b[i], sizeof *c->b[i] * (w + 1));
+		} else {
+			newline = malloc ((w + 1));
+		}
+		c->blen[i] = w;
+		c->bsize[i] = w + 1;
+		if (!newline) {
+			int j;
+			for (j = 0; j <= i; j++) {
+				free (c->b[i]);
+			}
+			free (c->attrs);
+			free (c->blen);
+			free (c->bsize);
+			free (c->b);
+			free (c);
+			return false;
+		}
+		c->b[i] = newline;
+	}
+	newattrs = realloc (c->attrs, sizeof (*c->attrs) * (w + 1) * h);
+	if (!newattrs) {
+		r_cons_canvas_free (c);
+		return false;
+	}
+	c->attrs = newattrs;
 	c->w = w;
 	c->h = h;
 	c->x = 0;
@@ -398,10 +558,13 @@
 	if (color) {
 		c->attr = color;
 	}
-	if (!c->color) c->attr = Color_RESET;
+	if (!c->color) {
+		c->attr = Color_RESET;
+	}
 	row = malloc (w + 1);
-	if (!row)
+	if (!row) {
 		return;
+	}
 	row[0] = roundcorners? '.': tl_corner[0];
 	if (w > 2) {
 		memset (row + 1, hline[0], w - 2);
@@ -426,14 +589,20 @@
 		W (row_ptr);
 	}
 	for (i = 1; i < h - 1; i++) {
-		if (G (x, y + i)) W (vline);
-		if (G (x + w - 1, y + i)) W (vline);
+		if (G (x, y + i)) {
+			W (vline);
+		}
+		if (G (x + w - 1, y + i)) {
+			W (vline);
+		}
 	}
 	free (row);
-	if (color) c->attr = Color_RESET;
+	if (color) {
+		c->attr = Color_RESET;
+	}
 }
 
-R_API void r_cons_canvas_fill(RConsCanvas *c, int x, int y, int w, int h, char ch, int replace) {
+R_API void r_cons_canvas_fill(RConsCanvas *c, int x, int y, int w, int h, char ch) {
 	int i;
 	if (w < 0) {
 		return;
diff -Nru radare2-2.3.0+dfsg/libr/cons/canvas_line.c radare2-2.8.0+dfsg/libr/cons/canvas_line.c
--- radare2-2.3.0+dfsg/libr/cons/canvas_line.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/canvas_line.c	2018-08-07 14:12:36.000000000 +0000
@@ -4,8 +4,14 @@
 #define W(y) r_cons_canvas_write(c,y)
 #define G(x,y) r_cons_canvas_gotoxy(c,x,y)
 
-#define useUtf8 (r_cons_singleton()->use_utf8)
-#define useUtf8Curvy (r_cons_singleton()->use_utf8_curvy)
+#define useUtf8 (r_cons_singleton ()->use_utf8)
+#define useUtf8Curvy (r_cons_singleton ()->use_utf8_curvy)
+
+#define DOTTED_LINE_HORIZ "┄"
+#define DOTTED_LINE_VERT "┊"
+
+#define DASHED_LINE_VERT "╵"
+#define DASHED_LINE_HORIZ "╴"
 
 enum {
 	APEX_DOT = 0,
@@ -19,6 +25,28 @@
 	NRM_NRM
 };
 
+static char* utf8_line_vert (int dot_style) {
+	if (r_cons_singleton ()->dotted_lines) {
+		switch (dot_style) {
+		case DOT_STYLE_NORMAL:      return RUNECODESTR_LINE_VERT;
+		case DOT_STYLE_CONDITIONAL: return DOTTED_LINE_VERT;
+		case DOT_STYLE_BACKEDGE:    return DASHED_LINE_VERT;
+		}
+	}
+	return RUNECODESTR_LINE_VERT;
+}
+
+static char* utf8_line_horiz (int dot_style) {
+	if (r_cons_singleton ()->dotted_lines) {
+		switch (dot_style) {
+		case DOT_STYLE_NORMAL:      return RUNECODESTR_LINE_HORIZ;
+		case DOT_STYLE_CONDITIONAL: return DOTTED_LINE_HORIZ;
+		case DOT_STYLE_BACKEDGE:    return DASHED_LINE_HORIZ;
+		}
+	}
+	return RUNECODESTR_LINE_HORIZ;
+}
+
 static void apply_line_style(RConsCanvas *c, int x, int y, int x2, int y2,
 		RCanvasLineStyle *style, int isvert) {
 	RCons *cons = r_cons_singleton ();
@@ -62,12 +90,12 @@
 		break;
 	case LINE_NOSYM_VERT:
 		if (G (x, y)) {
-			W (useUtf8 ? RUNECODESTR_LINE_VERT : "|");
+			W (useUtf8 ? utf8_line_vert (style->dot_style) : "|");
 		}
 		break;
 	case LINE_NOSYM_HORIZ:
 		if (G (x, y)) {
-			W (useUtf8 ? RUNECODESTR_LINE_HORIZ : "-");
+			W (useUtf8 ? utf8_line_horiz (style->dot_style) : "-");
 		}
 		break;
 	case LINE_NONE:
@@ -78,6 +106,7 @@
 
 R_API void r_cons_canvas_line_diagonal (RConsCanvas *c, int x, int y, int x2, int y2, RCanvasLineStyle *style) {
 	if (x == x2 || y == y2) {
+		style->dot_style = DOT_STYLE_NORMAL;
 		r_cons_canvas_line_square (c, x, y +1, x2, y2, style);
 		return;
 	}
@@ -141,7 +170,7 @@
 	c->attr = Color_RESET;
 }
 
-static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int style) {
+static void draw_horizontal_line (RConsCanvas *c, int x, int y, int width, int style, int dot_style) {
 	const char *l_corner = "?", *r_corner = "?";
 	int i;
 
@@ -214,7 +243,7 @@
 		break;
 	case NRM_DOT:
 		if (useUtf8) {
-			l_corner = RUNECODESTR_LINE_HORIZ;
+			l_corner = utf8_line_horiz (dot_style);
 			if (useUtf8Curvy) {
 				r_corner = RUNECODESTR_CURVE_CORNER_TR;
 			} else {
@@ -227,7 +256,7 @@
 		break;
 	case NRM_APEX:
 		if (useUtf8) {
-			l_corner = RUNECODESTR_LINE_HORIZ;
+			l_corner = utf8_line_horiz (dot_style);
 			if (useUtf8Curvy) {
 				r_corner = RUNECODESTR_CURVE_CORNER_BR;
 			} else {
@@ -245,7 +274,7 @@
 			} else {
 				l_corner = RUNECODESTR_CORNER_TL;
 			}
-			r_corner = RUNECODESTR_LINE_HORIZ;
+			r_corner = utf8_line_horiz (dot_style);
 		} else {
 			l_corner = ".";
 			r_corner = "-";
@@ -258,7 +287,7 @@
 			} else {
 				l_corner = RUNECODESTR_CORNER_BL;
 			}
-			r_corner = RUNECODESTR_LINE_HORIZ;
+			r_corner = utf8_line_horiz (dot_style);
 		} else {
 			l_corner = "`";
 			r_corner = "-";
@@ -267,7 +296,7 @@
 	case NRM_NRM:
 	default:
 		if (useUtf8) {
-			l_corner = r_corner = RUNECODESTR_LINE_HORIZ;
+			l_corner = r_corner = utf8_line_horiz (dot_style);
 		} else {
 			l_corner = r_corner = "-";
 		}
@@ -278,7 +307,7 @@
 		W (l_corner);
 	}
 
-	const char *hline = useUtf8? RUNECODESTR_LINE_HORIZ : "-";
+	const char *hline = useUtf8 ? utf8_line_horiz (dot_style) : "-";
 	r_cons_break_push (NULL, NULL);
 	for (i = x + 1; i < x + width - 1; i++) {
 		if (r_cons_is_breaked ()) {
@@ -295,7 +324,7 @@
 	}
 }
 
-static void draw_vertical_line (RConsCanvas *c, int x, int y, int height) {
+static void draw_vertical_line (RConsCanvas *c, int x, int y, int height, int dot_style) {
 	int i;
 	/* do not render offscreen vertical lines */
 	if (x + c->sx < 0) {
@@ -304,7 +333,7 @@
 	if (x + c->sx > c->w) {
 		return;
 	}
-	const char *vline = useUtf8? RUNECODESTR_LINE_VERT : "|";
+	const char *vline = useUtf8 ? utf8_line_vert (dot_style) : "|";
 	r_cons_break_push (NULL, NULL);
 	for (i = y; i < y + height; i++) {
 		if (r_cons_is_breaked ()) {
@@ -330,18 +359,18 @@
 		int hl = diff_y / 2 - 1;
 		int hl2 = diff_y - hl;
 		int w = diff_x == 0 ? 0 : diff_x + 1;
-		int style = min_x == x ? APEX_DOT : DOT_APEX;
-		draw_vertical_line (c, x, y + 1, hl);
-		draw_vertical_line (c, x2, y + hl + 1, hl2);
-		draw_horizontal_line (c, min_x, y + hl + 1, w, style);
+		int apex_style = min_x == x ? APEX_DOT : DOT_APEX;
+		draw_vertical_line (c, x, y + 1, hl, style->dot_style);
+		draw_vertical_line (c, x2, y + hl + 1, hl2, style->dot_style);
+		draw_horizontal_line (c, min_x, y + hl + 1, w, apex_style, style->dot_style);
 	} else  {
 		if (y2 == y) {
-			draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT);
+			draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT, style->dot_style);
 		} else {
 			if (x != x2) {
-				draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX);
+				draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX, style->dot_style);
 			}
-			draw_vertical_line (c, x2, y2, diff_y);
+			draw_vertical_line (c, x2, y2, diff_y, style->dot_style);
 		}
 	}
 	c->attr = Color_RESET;
@@ -361,40 +390,40 @@
 
 	if (isvert) {
 		if (x2 == x) {
-			draw_vertical_line (c, x, y + 1, diff_y);
+			draw_vertical_line (c, x, y + 1, diff_y + 1, style->dot_style);
 		} else if (y2 - y > 1) {
 			int h1 = 1 + bendpoint;
 			int h2 = diff_y - h1;
 			int w = diff_x == 0 ? 0 : diff_x + 1;
-			int style = min_x == x ? APEX_DOT : DOT_APEX;
-			draw_vertical_line (c, x, y + 1, h1);
-			draw_horizontal_line (c, min_x, y + bendpoint + 2, w, style);
-			draw_vertical_line (c, x2, y + h1 + 1 + 1, h2);
+			int apex_style = min_x == x ? APEX_DOT : DOT_APEX;
+			draw_vertical_line (c, x, y + 1, h1, style->dot_style);
+			draw_horizontal_line (c, min_x, y + bendpoint + 2, w, apex_style, style->dot_style);
+			draw_vertical_line (c, x2, y + h1 + 1 + 1, h2, style->dot_style);
 		} else {
 			//TODO: currently copy-pasted
 			if (y2 == y) {
-				draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT);
+				draw_horizontal_line (c, min_x, y, diff_x + 1, DOT_DOT, style->dot_style);
 			} else {
 				if (x != x2) {
-					draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX);
+					draw_horizontal_line (c, min_x, y, diff_x + 1, REV_APEX_APEX, style->dot_style);
 				}
-				draw_vertical_line (c, x2, y2, diff_y-2);
+				draw_vertical_line (c, x2, y2, diff_y-2, style->dot_style);
 			}
 		}
 	} else {
 		if (y2 == y) {
-			draw_horizontal_line (c, min_x + 1, y, diff_x, NRM_NRM);
+			draw_horizontal_line (c, min_x + 1, y, diff_x, NRM_NRM, style->dot_style);
 		} else if (x2 - x > 1) {
 			int w1 = 1 + bendpoint;
 			int w2 = diff_x - w1;
 			//int h = diff_x;// == 0 ? 0 : diff_x + 1;
 			//int style = min_x == x ? APEX_DOT : DOT_APEX;
 			//draw_vertical_line (c, x, y + 1, h1);
-			draw_horizontal_line (c, x + 1, y, w1 + 1, y2 > y ? NRM_DOT : NRM_APEX);
+			draw_horizontal_line (c, x + 1, y, w1 + 1, y2 > y ? NRM_DOT : NRM_APEX, style->dot_style);
 			//draw_horizontal_line (c, min_x, y + bendpoint + 2, w, style);
-			draw_vertical_line (c, x + 1 + w1, min_y + 1, diff_y - 1);
+			draw_vertical_line (c, x + 1 + w1, min_y + 1, diff_y - 1, style->dot_style);
 			//draw_vertical_line (c, x2, y + h1 + 1 + 1, h2);
-			draw_horizontal_line (c, x + 1 + w1, y2, w2, y2 < y ? DOT_NRM : REV_APEX_NRM);
+			draw_horizontal_line (c, x + 1 + w1, y2, w2, y2 < y ? DOT_NRM : REV_APEX_NRM, style->dot_style);
 		}
 	}
 	c->attr = Color_RESET;
@@ -419,21 +448,21 @@
 	apply_line_style (c, x, y, x2, y2, style, isvert);
 
 	if (isvert) {
-		draw_vertical_line (c, x, y + 1, ybendpoint1 + 1);
-		draw_horizontal_line (c, min_x1, y + ybendpoint1 + 2, w1, REV_APEX_APEX);
-		draw_vertical_line (c, xbendpoint, y2 - ybendpoint2 + 1, diff_y - 1);
-		draw_horizontal_line (c, min_x2, y2 - ybendpoint2, w2, DOT_DOT);
-		draw_vertical_line (c, x2, y2 - ybendpoint2 + 1, ybendpoint2);
+		draw_vertical_line (c, x, y + 1, ybendpoint1 + 1, style->dot_style);
+		draw_horizontal_line (c, min_x1, y + ybendpoint1 + 2, w1, REV_APEX_APEX, style->dot_style);
+		draw_vertical_line (c, xbendpoint, y2 - ybendpoint2 + 1, diff_y - 1, style->dot_style);
+		draw_horizontal_line (c, min_x2, y2 - ybendpoint2, w2, DOT_DOT, style->dot_style);
+		draw_vertical_line (c, x2, y2 - ybendpoint2 + 1, ybendpoint2 + 1, style->dot_style);
 	} else {
 		int miny1 = R_MIN (y, xbendpoint);
 		int miny2 = R_MIN (y2, xbendpoint);
 		int diff_y1 = R_ABS (y - xbendpoint);
 		int diff_y2 = R_ABS (y2 - xbendpoint);
 
-		draw_horizontal_line (c, x + 1, y, 1 + ybendpoint1 + 1, xbendpoint > y ? NRM_DOT : NRM_APEX);
-		draw_vertical_line (c, x + 1 + ybendpoint1 + 1, miny1 + 1, diff_y1 - 1);
-		draw_horizontal_line (c, x2 - ybendpoint2, xbendpoint, (x + 1 + ybendpoint1 + 1) - (x2 - ybendpoint2) + 1, xbendpoint > y ? REV_APEX_APEX : DOT_DOT);
-		draw_vertical_line (c, x2 - ybendpoint2, miny2 + 1, diff_y2 - 1);
-		draw_horizontal_line (c, x2 - ybendpoint2, y2, ybendpoint2 + 1, xbendpoint > y ? DOT_NRM : REV_APEX_NRM);
+		draw_horizontal_line (c, x + 1, y, 1 + ybendpoint1 + 1, xbendpoint > y ? NRM_DOT : NRM_APEX, style->dot_style);
+		draw_vertical_line (c, x + 1 + ybendpoint1 + 1, miny1 + 1, diff_y1 - 1, style->dot_style);
+		draw_horizontal_line (c, x2 - ybendpoint2, xbendpoint, (x + 1 + ybendpoint1 + 1) - (x2 - ybendpoint2) + 1, xbendpoint > y ? REV_APEX_APEX : DOT_DOT, style->dot_style);
+		draw_vertical_line (c, x2 - ybendpoint2, miny2 + 1, diff_y2 - 1, style->dot_style);
+		draw_horizontal_line (c, x2 - ybendpoint2, y2, ybendpoint2 + 1, xbendpoint > y ? DOT_NRM : REV_APEX_NRM, style->dot_style);
 	}
 }
diff -Nru radare2-2.3.0+dfsg/libr/cons/cons.c radare2-2.8.0+dfsg/libr/cons/cons.c
--- radare2-2.3.0+dfsg/libr/cons/cons.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/cons.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2008-2017 - pancake, Jody Frankowski */
+/* radare2 - LGPL - Copyright 2008-2018 - pancake, Jody Frankowski */
 
 #include <r_cons.h>
 #include <r_print.h>
@@ -15,7 +15,8 @@
 
 R_LIB_VERSION (r_cons);
 
-static RCons r_cons_instance;
+static RConsContext r_cons_context_default = {{{{0}}}};
+static RCons r_cons_instance = {0};
 #define I r_cons_instance
 
 //this structure goes into cons_stack when r_cons_push/pop
@@ -28,8 +29,8 @@
 
 typedef struct {
 	bool breaked;
-	void *data;
 	RConsEvent event_interrupt;
+	void *event_interrupt_data;
 } RConsBreakStack;
 
 static void break_stack_free(void *ptr) {
@@ -40,18 +41,82 @@
 static void cons_stack_free(void *ptr) {
 	RConsStack *s = (RConsStack *)ptr;
 	free (s->buf);
+	if (s->grep) {
+		free (s->grep->str);
+	}
 	free (s->grep);
 	free (s);
 }
 
-static void break_signal(int sig) {
-	I.breaked = true;
-	r_print_set_interrupted (I.breaked);
-	if (I.event_interrupt) {
-		I.event_interrupt (I.data);
+static RConsStack *cons_stack_dump(bool recreate) {
+	RConsStack *data = R_NEW0 (RConsStack);
+	if (!data) {
+		return NULL;
+	}
+
+	if (I.context->buffer) {
+		data->buf = I.context->buffer;
+		data->buf_len = I.context->buffer_len;
+		data->buf_size = I.context->buffer_sz;
+	}
+
+	data->grep = R_NEW0 (RConsGrep);
+	if (data->grep) {
+		memcpy (data->grep, &I.context->grep, sizeof (RConsGrep));
+		if (I.context->grep.str) {
+			data->grep->str = strdup (I.context->grep.str);
+		}
+	}
+
+	if (recreate && I.context->buffer_sz > 0) {
+		I.context->buffer = malloc (I.context->buffer_sz);
+		if (!I.context->buffer) {
+			I.context->buffer = data->buf;
+			free (data);
+			return NULL;
+		}
+	} else {
+		I.context->buffer = NULL;
+	}
+
+	return data;
+}
+
+static void cons_stack_load(RConsStack *data, bool free_current) {
+	if (free_current) {
+		free (I.context->buffer);
+	}
+	I.context->buffer = data->buf;
+	data->buf = NULL;
+	I.context->buffer_len = data->buf_len;
+	I.context->buffer_sz = data->buf_size;
+
+	if (data->grep) {
+		free (I.context->grep.str);
+		memcpy (&I.context->grep, data->grep, sizeof (RConsGrep));
 	}
 }
 
+static void cons_context_init(RConsContext *context) {
+	context->breaked = false;
+	context->buffer = NULL;
+	context->buffer_sz = 0;
+	context->buffer_len = 0;
+	context->cons_stack = r_stack_newf (6, cons_stack_free);
+	context->break_stack = r_stack_newf (6, break_stack_free);
+	context->event_interrupt = NULL;
+	context->event_interrupt_data = NULL;
+}
+
+static void cons_context_deinit(RConsContext *context) {
+	r_stack_free (context->cons_stack);
+	r_stack_free (context->break_stack);
+}
+
+static void break_signal(int sig) {
+	r_cons_context_break (&r_cons_context_default);
+}
+
 static inline void r_cons_write(const char *buf, int len) {
 #if __WINDOWS__ && !__CYGWIN__
 	if (I.ansicon) {
@@ -71,67 +136,33 @@
 #endif
 }
 
-R_API char *r_cons_color_random_string(int bg) {
-	int r, g, b;
-	if (I.truecolor > 0) {
-		char out[32];
-		r = r_num_rand (0xff);
-		g = r_num_rand (0xff);
-		b = r_num_rand (0xff);
-		r_cons_rgb_str (out, r, g, b, bg);
-		return strdup (out);
-	}
-	// random ansi
-	const char *color = "white";
-	r = r_num_rand (8);
-	switch (r) {
-	case 0: color = "red"; break;
-	case 1: color = "white"; break;
-	case 2: color = "green"; break;
-	case 3: color = "magenta"; break;
-	case 4: color = "yellow"; break;
-	case 5: color = "cyan"; break;
-	case 6: color = "blue"; break;
-	case 7: color = "gray"; break;
-	}
-	return strdup (color);
-}
-
-R_API char *r_cons_color_random(int bg) {
-	int r, g, b;
-	if (I.truecolor > 0) {
-		char out[32];
-		r = r_num_rand (0xff);
-		g = r_num_rand (0xff);
-		b = r_num_rand (0xff);
-		r_cons_rgb_str (out, r, g, b, bg);
-		return strdup (out);
-	}
-	const char *color = Color_RESET;
-	// random ansi
-	r = r_num_rand (16);
+R_API RColor r_cons_color_random(ut8 alpha) {
+	RColor rcolor = {0};
+	if (I.color > COLOR_MODE_16) {
+		rcolor.r = r_num_rand (0xff);
+		rcolor.g = r_num_rand (0xff);
+		rcolor.b = r_num_rand (0xff);
+		rcolor.a = alpha;
+		return rcolor;
+	}
+	int r = r_num_rand (16);
 	switch (r) {
-	case 0: color = Color_RED; break;
-	case 1: color = Color_BRED; break;
-	case 2: color = Color_WHITE; break;
-	case 3: color = Color_BWHITE; break;
-	case 4: color = Color_GREEN; break;
-	case 5: color = Color_BGREEN; break;
-	case 6: color = Color_MAGENTA; break;
-	case 7: color = Color_BMAGENTA; break;
-	case 8: color = Color_YELLOW; break;
-	case 9: color = Color_BYELLOW; break;
-	case 10: color = Color_CYAN; break;
-	case 11: color = Color_BCYAN; break;
-	case 12: color = Color_BLUE; break;
-	case 13: color = Color_BBLUE; break;
-	case 14: color = Color_GRAY; break;
-	case 15: color = Color_BGRAY; break;
+	case 0: case 1: rcolor = (RColor) RColor_RED; break;
+	case 2: case 3: rcolor = (RColor) RColor_WHITE; break;
+	case 4: case 5: rcolor = (RColor) RColor_GREEN; break;
+	case 6: case 7: rcolor = (RColor) RColor_MAGENTA; break;
+	case 8: case 9: rcolor = (RColor) RColor_YELLOW; break;
+	case 10: case 11: rcolor = (RColor) RColor_CYAN; break;
+	case 12: case 13: rcolor = (RColor) RColor_BLUE; break;
+	case 14: case 15: rcolor = (RColor) RColor_GRAY; break;
+	}
+	if (r & 1) {
+		rcolor.attr = R_CONS_ATTR_BOLD;
 	}
-	return strdup (color);
+	return rcolor;
 }
 
-R_API void r_cons_color (int fg, int r, int g, int b) {
+R_API void r_cons_color(int fg, int r, int g, int b) {
 	int k;
 	r = R_DIM (r, 0, 255);
 	g = R_DIM (g, 0, 255);
@@ -155,7 +186,7 @@
 R_API void r_cons_strcat_justify(const char *str, int j, char c) {
 	int i, o, len;
 	for (o = i = len = 0; str[i]; i++, len++) {
-		if (str[i]=='\n') {
+		if (str[i] == '\n') {
 			r_cons_memset (' ', j);
 			if (c) {
 				r_cons_memset (c, 1);
@@ -174,64 +205,81 @@
 	}
 }
 
-R_API RCons *r_cons_singleton () {
+R_API RCons *r_cons_singleton() {
 	return &I;
 }
 
 R_API void r_cons_break_clear() {
-	I.breaked = false;
+	I.context->breaked = false;
 }
 
-R_API void r_cons_break_push(RConsBreak cb, void *user) {
-	if (I.break_stack) {
-		//if we don't have any element in the stack start the signal
-		RConsBreakStack *b = R_NEW0 (RConsBreakStack);
-		if (!b) return;
-		if (r_stack_is_empty (I.break_stack)) {
+R_API void r_cons_context_break_push(RConsContext *context, RConsBreak cb, void *user, bool sig) {
+	if (!context->break_stack) {
+		return;
+	}
+
+	//if we don't have any element in the stack start the signal
+	RConsBreakStack *b = R_NEW0 (RConsBreakStack);
+	if (!b) return;
+	if (r_stack_is_empty (context->break_stack)) {
 #if __UNIX__ || __CYGWIN__
+		if (sig && r_cons_context_is_main ()) {
 			signal (SIGINT, break_signal);
-#endif
-			I.breaked = false;
 		}
-		//save the actual state
-		b->event_interrupt = I.event_interrupt;
-		b->data = I.data;
-		r_stack_push (I.break_stack, b);
-		//configure break
-		I.event_interrupt = cb;
-		I.data = user;
+#endif
+		context->breaked = false;
 	}
+	//save the actual state
+	b->event_interrupt = context->event_interrupt;
+	b->event_interrupt_data = context->event_interrupt_data;
+	r_stack_push (context->break_stack, b);
+	//configure break
+	context->event_interrupt = cb;
+	context->event_interrupt_data = user;
 }
 
-R_API void r_cons_break_pop() {
+R_API void r_cons_context_break_pop(RConsContext *context, bool sig) {
+	if (!context->break_stack) {
+		return;
+	}
 	//restore old state
-	if (I.break_stack) {
-		RConsBreakStack *b = NULL;
-		r_print_set_interrupted (I.breaked);
-		b = r_stack_pop (I.break_stack);
-		if (b) {
-			I.event_interrupt = b->event_interrupt;
-			I.data = b->data;
-			break_stack_free (b);
-		} else {
-			//there is not more elements in the stack
+	RConsBreakStack *b = NULL;
+	b = r_stack_pop (context->break_stack);
+	if (b) {
+		context->event_interrupt = b->event_interrupt;
+		context->event_interrupt_data = b->event_interrupt_data;
+		break_stack_free (b);
+	} else {
+		//there is not more elements in the stack
 #if __UNIX__ || __CYGWIN__
+		if (sig && r_cons_context_is_main ()) {
 			signal (SIGINT, SIG_IGN);
-#endif
-			I.breaked = false;
 		}
+#endif
+		context->breaked = false;
 	}
 }
 
+R_API void r_cons_break_push(RConsBreak cb, void *user) {
+	r_cons_context_break_push (I.context, cb, user, true);
+}
+
+R_API void r_cons_break_pop() {
+	r_cons_context_break_pop (I.context, true);
+}
+
 R_API bool r_cons_is_breaked() {
+	if (I.cb_break) {
+		I.cb_break (I.user);
+	}
 	if (I.timeout) {
 		if (r_sys_now () > I.timeout) {
-			I.breaked = true;
+			I.context->breaked = true;
 			eprintf ("\nTimeout!\n");
 			I.timeout = 0;
 		}
 	}
-	return I.breaked;
+	return I.context->breaked;
 }
 
 R_API void r_cons_break_timeout(int timeout) {
@@ -247,20 +295,33 @@
 }
 
 R_API void r_cons_break_end() {
-	I.breaked = false;
+	I.context->breaked = false;
 	I.timeout = 0;
-	r_print_set_interrupted (I.breaked);
 #if __UNIX__ || __CYGWIN__
 	signal (SIGINT, SIG_IGN);
 #endif
-	if (!r_stack_is_empty (I.break_stack)) {
+	if (!r_stack_is_empty (I.context->break_stack)) {
 		//free all the stack
-		r_stack_free (I.break_stack);
+		r_stack_free (I.context->break_stack);
 		//create another one
-		I.break_stack = r_stack_newf (6, break_stack_free);
-		I.data = NULL;
-		I.event_interrupt = NULL;
+		I.context->break_stack = r_stack_newf (6, break_stack_free);
+		I.context->event_interrupt_data = NULL;
+		I.context->event_interrupt = NULL;
+	}
+}
+
+R_API void *r_cons_sleep_begin(void) {
+	if (!I.cb_sleep_begin) {
+		return NULL;
+	}
+	return I.cb_sleep_begin (I.user);
+}
+
+R_API void r_cons_sleep_end(void *user) {
+	if (!I.cb_sleep_end) {
+		return;
 	}
+	I.cb_sleep_end (I.user, user);
 }
 
 #if __WINDOWS__ && !__CYGWIN__
@@ -274,7 +335,7 @@
 	return false;
 }
 #elif __UNIX__ || __CYGWIN__
-static void resize (int sig) {
+static void resize(int sig) {
 	if (I.event_resize) {
 		I.event_resize (I.event_data);
 	}
@@ -295,14 +356,6 @@
 #endif
 }
 
-static void r_cons_pal_null() {
-	int i;
-	RCons *cons = r_cons_singleton ();
-	for (i = 0; i < R_CONS_PALETTE_LIST_SIZE; i++){
-		cons->pal.list[i] = NULL;
-	}
-}
-
 R_API RCons *r_cons_new() {
 	I.refcnt++;
 	if (I.refcnt != 1) {
@@ -311,10 +364,9 @@
 	I.rgbstr = r_cons_rgb_str_off;
 	I.line = r_line_new ();
 	I.highlight = NULL;
-	I.event_interrupt = NULL;
 	I.is_wine = -1;
 	I.fps = 0;
-	I.use_color = false;
+	I.color = COLOR_MODE_DISABLED;
 	I.blankline = true;
 	I.teefile = NULL;
 	I.fix_columns = 0;
@@ -323,19 +375,18 @@
 	I.force_rows = 0;
 	I.force_columns = 0;
 	I.event_resize = NULL;
-	I.data = NULL;
 	I.event_data = NULL;
 	I.is_interactive = true;
 	I.noflush = false;
 	I.linesleep = 0;
 	I.fdin = stdin;
 	I.fdout = 1;
-	I.breaked = false;
 	I.break_lines = false;
-	//I.lines = 0;
-	I.buffer = NULL;
-	I.buffer_sz = 0;
-	I.buffer_len = 0;
+	I.lines = 0;
+
+	I.context = &r_cons_context_default;
+	cons_context_init (I.context);
+
 	r_cons_get_size (&I.pagesize);
 	I.num = NULL;
 	I.null = 0;
@@ -362,14 +413,13 @@
 	}
 #endif
 	I.pager = NULL; /* no pager by default */
-	I.truecolor = 0;
 	I.mouse = 0;
-	I.cons_stack = r_stack_newf (6, cons_stack_free);
-	I.break_stack = r_stack_newf (6, break_stack_free);
-	r_cons_pal_null ();
-	r_cons_pal_init (NULL);
-	r_cons_rgb_init ();
 	r_cons_reset ();
+	r_cons_rgb_init ();
+	r_cons_pal_init ();
+
+	r_print_set_is_interrupted_cb (r_cons_is_breaked);
+
 	return &I;
 }
 
@@ -383,13 +433,12 @@
 		r_line_free ();
 		I.line = NULL;
 	}
-	if (I.buffer) {
-		free (I.buffer);
-		I.buffer = NULL;
+	if (I.context->buffer) {
+		free (I.context->buffer);
+		I.context->buffer = NULL;
 	}
 	R_FREE (I.break_word);
-	r_stack_free (I.cons_stack);
-	r_stack_free (I.break_stack);
+	cons_context_deinit (I.context);
 	return NULL;
 }
 
@@ -399,7 +448,7 @@
 	if (moar <= 0) {
 		return false;
 	}
-	if (!I.buffer) {
+	if (!I.context->buffer) {
 		int new_sz;
 		if ((INT_MAX - MOAR) < moar) {
 			return false;
@@ -407,22 +456,22 @@
 		new_sz = moar + MOAR;
 		temp = calloc (1, new_sz);
 		if (temp) {
-			I.buffer_sz = new_sz;
-			I.buffer = temp;
-			I.buffer[0] = '\0';
+			I.context->buffer_sz = new_sz;
+			I.context->buffer = temp;
+			I.context->buffer[0] = '\0';
 		}
-	} else if (moar + I.buffer_len > I.buffer_sz) {
+	} else if (moar + I.context->buffer_len > I.context->buffer_sz) {
 		char *new_buffer;
-		int old_buffer_sz = I.buffer_sz;
-		if ((INT_MAX - MOAR - moar) < I.buffer_sz) {
+		int old_buffer_sz = I.context->buffer_sz;
+		if ((INT_MAX - MOAR - moar) < I.context->buffer_sz) {
 			return false;
 		}
-		I.buffer_sz += moar + MOAR;
-		new_buffer = realloc (I.buffer, I.buffer_sz);
+		I.context->buffer_sz += moar + MOAR;
+		new_buffer = realloc (I.context->buffer, I.context->buffer_sz);
 		if (new_buffer) {
-			I.buffer = new_buffer;
+			I.context->buffer = new_buffer;
 		} else {
-			I.buffer_sz = old_buffer_sz;
+			I.context->buffer_sz = old_buffer_sz;
 			return false;
 		}
 	}
@@ -462,11 +511,11 @@
 R_API void r_cons_clear_line(int std_err) {
 #if __WINDOWS__
 	if (I.ansicon) {
-		fprintf (std_err? stderr: stdout,"\x1b[0K\r");
+		fprintf (std_err? stderr: stdout,"%s", R_CONS_CLEAR_LINE);
 	} else {
 		char white[1024];
 		memset (&white, ' ', sizeof (white));
-		if (I.columns > 0 && I.columns < sizeof(white)) {
+		if (I.columns > 0 && I.columns < sizeof (white)) {
 			white[I.columns - 1] = 0;
 		} else if (I.columns == 0) {
 			white[0] = 0;
@@ -476,7 +525,7 @@
 		fprintf (std_err? stderr: stdout, "\r%s\r", white);
 	}
 #else
-	fprintf (std_err? stderr: stdout,"\x1b[0K\r");
+	fprintf (std_err? stderr: stdout,"%s", R_CONS_CLEAR_LINE);
 #endif
 	fflush (std_err? stderr: stdout);
 }
@@ -495,101 +544,135 @@
 	I.lines = 0;
 }
 
+static void cons_grep_reset(RConsGrep *grep) {
+	grep->strings[0][0] = '\0';
+	grep->nstrings = 0; // XXX
+	grep->line = -1;
+	grep->sort = -1;
+	grep->sort_invert = false;
+	R_FREE (grep->str);
+	ZERO_FILL (grep->tokens);
+	grep->tokens_used = 0;
+}
+
 R_API void r_cons_reset() {
-	if (I.buffer) {
-		I.buffer[0] = '\0';
+	if (I.context->buffer) {
+		I.context->buffer[0] = '\0';
 	}
-	I.buffer_len = 0;
+	I.context->buffer_len = 0;
 	I.lines = 0;
-	I.lastline = I.buffer;
-	I.grep.strings[0][0] = '\0';
-	I.grep.nstrings = 0; // XXX
-	I.grep.line = -1;
-	I.grep.sort = -1;
-	I.grep.sort_invert = false;
-	R_FREE (I.grep.str);
-	ZERO_FILL (I.grep.tokens);
-	I.grep.tokens_used = 0;
+	I.lastline = I.context->buffer;
+	cons_grep_reset (&I.context->grep);
 }
 
 R_API const char *r_cons_get_buffer() {
 	//check len otherwise it will return trash
-	return I.buffer_len? I.buffer : NULL;
+	return I.context->buffer_len? I.context->buffer : NULL;
 }
 
 R_API void r_cons_filter() {
 	/* grep */
-	if (I.filter || I.grep.nstrings > 0 || I.grep.tokens_used || I.grep.less || I.grep.json) {
-		r_cons_grepbuf (I.buffer, I.buffer_len);
+	if (I.filter || I.context->grep.nstrings > 0 || I.context->grep.tokens_used || I.context->grep.less || I.context->grep.json) {
+		r_cons_grepbuf (I.context->buffer, I.context->buffer_len);
 		I.filter = false;
 	}
 	/* html */
 	if (I.is_html) {
 		int newlen = 0;
-		char *input = r_str_ndup (I.buffer, I.buffer_len);
+		char *input = r_str_ndup (I.context->buffer, I.context->buffer_len);
 		char *res = r_cons_html_filter (input, &newlen);
-		free (I.buffer);
+		free (I.context->buffer);
 		free (input);
-		I.buffer = res;
-		I.buffer_len = newlen;
-		I.buffer_sz = newlen;
+		I.context->buffer = res;
+		I.context->buffer_len = newlen;
+		I.context->buffer_sz = newlen;
 	}
 	/* TODO */
 }
 
 R_API void r_cons_push() {
-	if (I.cons_stack) {
-		RConsStack *data = R_NEW0 (RConsStack);
-		if (!data) {
-			return;
-		}
-		if (I.buffer) {
-			data->buf = malloc (I.buffer_sz);
-			if (!data->buf) {
-				free (data);
-				return;
-			}
-			memcpy (data->buf, I.buffer, I.buffer_sz);
-			data->buf_len = I.buffer_len;
-			data->buf_size = I.buffer_sz;
-		}
-		data->grep = R_NEW0 (RConsGrep);
-		if (data->grep) {
-			memcpy (data->grep, &I.grep, sizeof (RConsGrep));
-			if (I.grep.str) {
-				data->grep->str = strdup (I.grep.str);
-			}
-		}
-		r_stack_push (I.cons_stack, data);
-		I.buffer_len = 0;
-		if (I.buffer) {
-			memset (I.buffer, 0, I.buffer_sz);
-		}
+	if (!I.context->cons_stack) {
+		return;
+	}
+	RConsStack *data = cons_stack_dump (true);
+	if (!data) {
+		return;
+	}
+	r_stack_push (I.context->cons_stack, data);
+	I.context->buffer_len = 0;
+	if (I.context->buffer) {
+		memset (I.context->buffer, 0, I.context->buffer_sz);
 	}
 }
 
 R_API void r_cons_pop() {
-	if (I.cons_stack) {
-		RConsStack *data = (RConsStack *)r_stack_pop (I.cons_stack);
-		if (!data) {
-			return;
-		}
-		free (I.buffer);
-		I.buffer = data->buf ? malloc (data->buf_size) : NULL;
-		I.buffer_len = data->buf_len;
-		I.buffer_sz = data->buf_size;
-		if (I.buffer) {
-			memcpy (I.buffer, data->buf, data->buf_size);
-		}
-		if (data->grep) {
-			memcpy (&I.grep, data->grep, sizeof (RConsGrep));
-			if (data->grep->str) {
-				char *old = I.grep.str;
-				I.grep.str = strdup (data->grep->str);
-				R_FREE (old);
-			}
-		}
-		cons_stack_free ((void *)data);
+	if (!I.context->cons_stack) {
+		return;
+	}
+	RConsStack *data = (RConsStack *)r_stack_pop (I.context->cons_stack);
+	if (!data) {
+		return;
+	}
+	cons_stack_load (data, true);
+	cons_stack_free ((void *)data);
+}
+
+R_API RConsContext *r_cons_context_new(void) {
+	RConsContext *context = R_NEW0 (RConsContext);
+	if (!context) {
+		return NULL;
+	}
+	cons_context_init (context);
+	return context;
+	/*
+	RStack *stack = r_stack_newf (6, cons_stack_free);
+	if (!stack) {
+		return NULL;
+	}
+
+	RConsStack *data = R_NEW0 (RConsStack);
+	if (!data) {
+		r_stack_free (stack);
+		return NULL;
+	}
+
+	data->grep = R_NEW0 (RConsGrep);
+	if (!data->grep) {
+		R_FREE (data);
+		r_stack_free (stack);
+		return NULL;
+	}
+	cons_grep_reset (data->grep);
+
+	r_stack_push (stack, data);
+
+	return stack;*/
+}
+
+R_API void r_cons_context_free(RConsContext *context) {
+	if (!context) {
+		return;
+	}
+	cons_context_deinit (context);
+	free (context);
+}
+
+R_API void r_cons_context_load(RConsContext *context) {
+	I.context = context;
+}
+
+R_API void r_cons_context_reset() {
+	I.context = &r_cons_context_default;
+}
+
+R_API bool r_cons_context_is_main() {
+	return I.context == &r_cons_context_default;
+}
+
+R_API void r_cons_context_break(RConsContext *context) {
+	context->breaked = true;
+	if (context->event_interrupt) {
+		context->event_interrupt (context->event_interrupt_data);
 	}
 }
 
@@ -605,17 +688,17 @@
 	r_cons_filter ();
 	if (I.is_interactive && I.fdout == 1) {
 		/* Use a pager if the output doesn't fit on the terminal window. */
-		if (I.pager && *I.pager && I.buffer_len > 0
-				&& r_str_char_count (I.buffer, '\n') >= I.rows) {
-			I.buffer[I.buffer_len-1] = 0;
-			r_sys_cmd_str_full (I.pager, I.buffer, NULL, NULL, NULL);
+		if (I.pager && *I.pager && I.context->buffer_len > 0
+				&& r_str_char_count (I.context->buffer, '\n') >= I.rows) {
+			I.context->buffer[I.context->buffer_len-1] = 0;
+			r_sys_cmd_str_full (I.pager, I.context->buffer, NULL, NULL, NULL);
 			r_cons_reset ();
 
-		} else if (I.buffer_len > CONS_MAX_USER) {
+		} else if (I.context->buffer_len > CONS_MAX_USER) {
 #if COUNT_LINES
 			int i, lines = 0;
-			for (i = 0; I.buffer[i]; i++) {
-				if (I.buffer[i] == '\n') {
+			for (i = 0; I.context->buffer[i]; i++) {
+				if (I.context->buffer[i] == '\n') {
 					lines ++;
 				}
 			}
@@ -625,7 +708,7 @@
 			}
 #else
 			char buf[64];
-			char *buflen = r_num_units (buf, I.buffer_len);
+			char *buflen = r_num_units (buf, I.context->buffer_len);
 			if (buflen && !r_cons_yesno ('n',"Do you want to print %s chars? (y/N)", buflen)) {
 				r_cons_reset ();
 				return;
@@ -638,7 +721,7 @@
 	if (tee && *tee) {
 		FILE *d = r_sandbox_fopen (tee, "a+");
 		if (d) {
-			if (I.buffer_len != fwrite (I.buffer, 1, I.buffer_len, d)) {
+			if (I.context->buffer_len != fwrite (I.context->buffer, 1, I.context->buffer_len, d)) {
 				eprintf ("r_cons_flush: fwrite: error (%s)\n", tee);
 			}
 			fclose (d);
@@ -652,10 +735,10 @@
 		if (I.linesleep > 0 && I.linesleep < 1000) {
 			int i = 0;
 			int pagesize = R_MAX (1, I.pagesize);
-			char *ptr = I.buffer;
+			char *ptr = I.context->buffer;
 			char *nl = strchr (ptr, '\n');
-			int len = I.buffer_len;
-			I.buffer[I.buffer_len] = 0;
+			int len = I.context->buffer_len;
+			I.context->buffer[I.context->buffer_len] = 0;
 			r_cons_break_push (NULL, NULL);
 			while (nl && !r_cons_is_breaked ()) {
 				r_cons_write (ptr, nl - ptr + 1);
@@ -666,13 +749,13 @@
 				nl = strchr (ptr, '\n');
 				i++;
 			}
-			r_cons_write (ptr, I.buffer + len - ptr);
+			r_cons_write (ptr, I.context->buffer + len - ptr);
 			r_cons_break_pop ();
 		} else {
-			r_cons_write (I.buffer, I.buffer_len);
+			r_cons_write (I.context->buffer, I.context->buffer_len);
 		}
 	} else {
-		r_cons_write (I.buffer, I.buffer_len);
+		r_cons_write (I.context->buffer, I.context->buffer_len);
 	}
 
 	r_cons_reset ();
@@ -691,12 +774,12 @@
 /* TODO: this ifdef must go in the function body */
 #if __WINDOWS__ && !__CYGWIN__
 		if (I.ansicon) {
-			r_cons_visual_write (I.buffer);
+			r_cons_visual_write (I.context->buffer);
 		} else {
-			r_cons_w32_print ((const ut8*)I.buffer, I.buffer_len, 1);
+			r_cons_w32_print ((const ut8*)I.context->buffer, I.context->buffer_len, 1);
 		}
 #else
-		r_cons_visual_write (I.buffer);
+		r_cons_visual_write (I.context->buffer);
 #endif
 	}
 	r_cons_reset ();
@@ -730,7 +813,7 @@
 	return ansilen - diff;
 }
 
-R_API void r_cons_visual_write (char *buffer) {
+R_API void r_cons_visual_write(char *buffer) {
 	char white[1024];
 	int cols = I.columns;
 	int alen, plen, lines = I.rows;
@@ -817,16 +900,16 @@
 	if (strchr (format, '%')) {
 		palloc (MOAR + strlen (format) * 20);
 club:
-		size = I.buffer_sz - I.buffer_len - 1; /* remaining space in I.buffer */
-		written = vsnprintf (I.buffer + I.buffer_len, size, format, ap3);
+		size = I.context->buffer_sz - I.context->buffer_len - 1; /* remaining space in I.context->buffer */
+		written = vsnprintf (I.context->buffer + I.context->buffer_len, size, format, ap3);
 		if (written >= size) { /* not all bytes were written */
 			palloc (written);
 			va_end (ap3);
 			va_copy (ap3, ap2);
 			goto club;
 		}
-		I.buffer_len += written;
-		I.buffer[I.buffer_len] = 0;
+		I.context->buffer_len += written;
+		I.context->buffer[I.context->buffer_len] = 0;
 	} else {
 		r_cons_strcat (format);
 	}
@@ -845,17 +928,17 @@
 }
 
 R_API int r_cons_get_column() {
-	char *line = strrchr (I.buffer, '\n');
+	char *line = strrchr (I.context->buffer, '\n');
 	if (!line) {
-		line = I.buffer;
+		line = I.context->buffer;
 	}
-	I.buffer[I.buffer_len] = 0;
+	I.context->buffer[I.context->buffer_len] = 0;
 	return r_str_ansi_len (line);
 }
 
 /* final entrypoint for adding stuff in the buffer screen */
 R_API int r_cons_memcat(const char *str, int len) {
-	if (len < 0 || (I.buffer_len + len) < 0) {
+	if (len < 0 || (I.context->buffer_len + len) < 0) {
 		return -1;
 	}
 	if (I.echo) {
@@ -863,9 +946,9 @@
 	}
 	if (str && len > 0 && !I.null) {
 		if (palloc (len + 1)) {
-			memcpy (I.buffer + I.buffer_len, str, len);
-			I.buffer_len += len;
-			I.buffer[I.buffer_len] = 0;
+			memcpy (I.context->buffer + I.context->buffer_len, str, len);
+			I.context->buffer_len += len;
+			I.context->buffer[I.context->buffer_len] = 0;
 		}
 	}
 	if (I.flush) {
@@ -873,7 +956,7 @@
 	}
 	if (I.break_word && str && len > 0) {
 		if (r_mem_mem ((const ut8*)str, len, (const ut8*)I.break_word, I.break_word_len)) {
-			I.breaked = true;
+			I.context->breaked = true;
 		}
 	}
 	return len;
@@ -882,9 +965,9 @@
 R_API void r_cons_memset(char ch, int len) {
 	if (!I.null && len > 0) {
 		palloc (len + 1);
-		memset (I.buffer + I.buffer_len, ch, len);
-		I.buffer_len += len;
-		I.buffer[I.buffer_len] = 0;
+		memset (I.context->buffer + I.context->buffer_len, ch, len);
+		I.context->buffer_len += len;
+		I.context->buffer[I.context->buffer_len] = 0;
 	}
 }
 
@@ -914,15 +997,16 @@
 }
 
 /* return the aproximated x,y of cursor before flushing */
+// XXX this function is a huge bottleneck
 R_API int r_cons_get_cursor(int *rows) {
 	int i, col = 0;
 	int row = 0;
 	// TODO: we need to handle GOTOXY and CLRSCR ansi escape code too
-	for (i = 0; i < I.buffer_len; i++) {
+	for (i = 0; i < I.context->buffer_len; i++) {
 		// ignore ansi chars, copypasta from r_str_ansi_len
-		if (I.buffer[i] == 0x1b) {
-			char ch2 = I.buffer[i + 1];
-			char *str = I.buffer;
+		if (I.context->buffer[i] == 0x1b) {
+			char ch2 = I.context->buffer[i + 1];
+			char *str = I.context->buffer;
 			if (ch2 == '\\') {
 				i++;
 			} else if (ch2 == ']') {
@@ -931,7 +1015,7 @@
 			} else if (ch2 == '[') {
 				for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++);
 			}
-		} else if (I.buffer[i] == '\n') {
+		} else if (I.context->buffer[i] == '\n') {
 			row++;
 			col = 0;
 		} else {
@@ -1053,7 +1137,7 @@
 	return R_MAX (0, I.columns);
 }
 
-R_API void r_cons_show_cursor (int cursor) {
+R_API void r_cons_show_cursor(int cursor) {
 #if __WINDOWS__ && !__CYGWIN__
 	// TODO
 #else
@@ -1088,8 +1172,8 @@
 	/* do nothing here */
 #elif __UNIX__ || __CYGWIN__
 	// enforce echo off
-	I.term_raw.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
 	if (is_raw) {
+		I.term_raw.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
 		tcsetattr (0, TCSANOW, &I.term_raw);
 	} else {
 		tcsetattr (0, TCSANOW, &I.term_buf);
@@ -1151,12 +1235,12 @@
 }
 
 R_API void r_cons_column(int c) {
-	char *b = malloc (I.buffer_len + 1);
+	char *b = malloc (I.context->buffer_len + 1);
 	if (!b) {
 		return;
 	}
-	memcpy (b, I.buffer, I.buffer_len);
-	b[I.buffer_len] = 0;
+	memcpy (b, I.context->buffer, I.context->buffer_len);
+	b[I.context->buffer_len] = 0;
 	r_cons_reset ();
 	// align current buffer N chars right
 	r_cons_strcat_justify (b, c, 0);
@@ -1186,9 +1270,9 @@
 	write (1, "", 1);
 }
 
-R_API void r_cons_highlight (const char *word) {
-	int l, *cpos;
-	char *rword, *res, *clean;
+R_API void r_cons_highlight(const char *word) {
+	int l, *cpos = NULL;
+	char *rword = NULL, *res, *clean = NULL;
 	char *inv[2] = {
 		R_CONS_INVERT (true, true),
 		R_CONS_INVERT (false, true)
@@ -1198,12 +1282,12 @@
 		strlen (inv[1])
 	};
 
-	if (word && *word && I.buffer) {
+	if (word && *word && I.context->buffer) {
 		int word_len = strlen (word);
 		char *orig;
-		clean = I.buffer;
-		l = r_str_ansi_filter (clean, &orig, &cpos, 0);
-		I.buffer = orig;
+		clean = r_str_ndup (I.context->buffer, I.context->buffer_len);
+		l = r_str_ansi_filter (clean, &orig, &cpos, -1);
+		I.context->buffer = orig;
 		if (I.highlight) {
 			if (strcmp (word, I.highlight)) {
 				free (I.highlight);
@@ -1215,31 +1299,32 @@
 		rword = malloc (word_len + linv[0] + linv[1] + 1);
 		if (!rword) {
 			free (cpos);
+			free (clean);
 			return;
 		}
 		strcpy (rword, inv[0]);
 		strcpy (rword + linv[0], word);
 		strcpy (rword + linv[0] + word_len, inv[1]);
-		res = r_str_replace_thunked (I.buffer, clean, cpos,
+		res = r_str_replace_thunked (I.context->buffer, clean, cpos,
 					     l, word, rword, 1);
 		if (res) {
-			I.buffer = res;
-			I.buffer_len = I.buffer_sz = strlen (res);
+			I.context->buffer = res;
+			I.context->buffer_len = I.context->buffer_sz = strlen (res);
 		}
 		free (rword);
 		free (clean);
 		free (cpos);
 		/* don't free orig - it's assigned
-		 * to I.buffer and possibly realloc'd */
+		 * to I.context->buffer and possibly realloc'd */
 	} else {
 		free (I.highlight);
 		I.highlight = NULL;
 	}
 }
 
-R_API char *r_cons_lastline (int *len) {
-	char *b = I.buffer + I.buffer_len;
-	while (b > I.buffer) {
+R_API char *r_cons_lastline(int *len) {
+	char *b = I.context->buffer + I.context->buffer_len;
+	while (b > I.context->buffer) {
 		if (*b == '\n') {
 			b++;
 			break;
@@ -1247,9 +1332,50 @@
 		b--;
 	}
 	if (len) {
-		int delta = b - I.buffer;
-		*len = I.buffer_len - delta;
+		int delta = b - I.context->buffer;
+		*len = I.context->buffer_len - delta;
+	}
+	return b;
+}
+
+// same as r_cons_lastline(), but len will be the number of
+// utf-8 characters excluding ansi escape sequences as opposed to just bytes
+R_API char *r_cons_lastline_utf8_ansi_len(int *len) {
+	if (!len) {
+		return r_cons_lastline (0);
+	}
+
+	char *b = I.context->buffer + I.context->buffer_len;
+	int l = 0;
+	int last_possible_ansi_end = 0;
+	char ch = '\0';
+	char ch2;
+	while (b > I.context->buffer) {
+		ch2 = ch;
+		ch = *b;
+
+		if (ch == '\n') {
+			b++;
+			l--;
+			break;
+		}
+
+		// utf-8
+		if ((ch & 0xc0) != 0x80) {
+			l++;
+		}
+
+		// ansi
+		if (ch == 'J' || ch == 'm' || ch == 'H') {
+			last_possible_ansi_end = l - 1;
+		} else if (ch == '\x1b' && ch2 == '[') {
+			l = last_possible_ansi_end;
+		}
+
+		b--;
 	}
+
+	*len = l;
 	return b;
 }
 
@@ -1274,22 +1400,22 @@
 	return strdup (col);
 }
 
-R_API bool r_cons_drop (int n) {
-	if (n > I.buffer_len) {
-		I.buffer_len = 0;
+R_API bool r_cons_drop(int n) {
+	if (n > I.context->buffer_len) {
+		I.context->buffer_len = 0;
 		return false;
 	}
-	I.buffer_len -= n;
+	I.context->buffer_len -= n;
 	return true;
 }
 
-R_API void r_cons_chop () {
-	while (I.buffer_len > 0) {
-		char ch = I.buffer[I.buffer_len - 1];
+R_API void r_cons_chop() {
+	while (I.context->buffer_len > 0) {
+		char ch = I.context->buffer[I.context->buffer_len - 1];
 		if (ch != '\n' && !IS_WHITESPACE (ch)) {
 			break;
 		}
-		I.buffer_len--;
+		I.context->buffer_len--;
 	}
 }
 
@@ -1353,7 +1479,7 @@
 	for (i = 0; help[i]; i += 3) {
 		if (i) {
 			int padding = max_length - (strlen (help[i]) + strlen (help[i + 1]));
-			r_cons_printf("| %s%s%s%*s  %s%s%s\n",
+			r_cons_printf ("| %s%s%s%*s  %s%s%s\n",
 					help[i],
 					pal_args_color, help[i + 1],
 					padding, "",
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/ayu radare2-2.8.0+dfsg/libr/cons/d/ayu
--- radare2-2.3.0+dfsg/libr/cons/d/ayu	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/ayu	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,50 @@
+ec ai.exec rgb:6d6
+ec ai.read rgb:66d
+ec ai.write rgb:d66
+ec args rgb:2bc
+ec b0x00 rgb:738699             # 00 bytes
+ec b0x7f rgb:fff
+ec b0xff rgb:abb0b6             # ff bytes
+ec bin rgb:f07178               # operations like xor
+ec btext rgb:66737f             # text section opcode? first byte of opcode
+ec call rgb:5ccfe6              # call instructions
+ec cjmp rgb:c2d94c              # je, jg, etc
+ec cmp rgb:f07178               # cmp instructions
+ec comment rgb:95e6cb           # r2 renerated comments
+ec creg rgb:ff7733              # modified registries
+ec flag rgb:5ccfe6              # flags. usually apprears above the current seek
+ec fline rgb:55b4d4             # function line. the boundary of a function
+ec flow rgb:c2d94c              # lines that show jump destinations
+ec flow2 rgb:ddd
+ec fname rgb:ff6a00             # function name
+ec graph.box rgb:5c6773         # unselected boxes in visual graph mode
+ec graph.box2 rgb:ff6a00        # currently selected box in visual graph mode
+ec graph.box3 rgb:66d9ef
+ec graph.box4 rgb:66d9ef
+ec graph.current rgb:fff
+ec graph.false rgb:f07178       # false line on visual graph mode
+ec graph.true rgb:bae67e        # true line on visual graph mode
+ec graph.trufae rgb:55b4d4      # lines in graph that does not have true or false
+ec help rgb:c2d94c              # color of help explanation text
+ec input rgb:888
+ec jmp rgb:c2d94c               # jmp instructions
+ec label rgb:66d9ef
+ec linehl rgb:42505e            # highlight color when using asm.highlight
+ec math rgb:ffd580              # math instructions like sub, add
+ec mov rgb:d9d8d7               # mov instructions
+ec nop rgb:a37acc               # nop instructions
+ec num rgb:f28779               # numbers
+ec offset rgb:ed9366            # offset in visual mode
+ec other rgb:888
+ec pop rgb:ff7733               # pop instructions
+ec prompt rgb:fa6e32            # color for main r2 prompt
+ec push rgb:ff7733              # push instructions
+ec reg rgb:e6e1cf               # register names
+ec ret rgb:d66                  # ret opcode
+ec swi rgb:d66
+ec trap rgb:d66                 
+ec usrcmt rgb:fa6e32           # user comment
+
+ec func_var rgb:95e6cb
+ec func_var_type rgb:ffd580
+ec func_var_addr rgb:f28779
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/basic radare2-2.8.0+dfsg/libr/cons/d/basic
--- radare2-2.3.0+dfsg/libr/cons/d/basic	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/basic	2018-08-07 14:12:36.000000000 +0000
@@ -31,12 +31,11 @@
 ec invalid red
 ec swi cyan
 ec cmp yellow
-ec leave gray
 ec call cyan
 ec cjmp green
 ec jmp green
 ec pop yellow
-
+ec linehl rgb:004
 ec graph.true green
 ec graph.false red
 ec graph.trufae blue
@@ -46,3 +45,7 @@
 ec graph.box2 blue
 ec graph.box3 gray
 ec graph.box4 gray
+
+ec func_var white
+ec func_var_type blue
+ec func_var_addr cyan
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/behelit radare2-2.8.0+dfsg/libr/cons/d/behelit
--- radare2-2.3.0+dfsg/libr/cons/d/behelit	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/behelit	2018-08-07 14:12:36.000000000 +0000
@@ -49,7 +49,12 @@
 ec graph.trufae rgb:5f87ff
 ec graph.current rgb:5f87ff
 ec graph.traced rgb:ffff5f
+ec linehl rgb:1f1f1f
 
 # background of the terminal must be #121212
 # foreground of the terminal must be #5fff5f
 # xterm -bg rgb:12/12/12 -fg rgb:5f/ff/5f
+
+ec func_var rgb:ff005f
+ec func_var_type blue
+ec func_var_addr rgb:5f87ff
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/bold radare2-2.8.0+dfsg/libr/cons/d/bold
--- radare2-2.3.0+dfsg/libr/cons/d/bold	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/bold	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,68 @@
+ec b0x00 rgb:ccc
+ec b0x7f rgb:ccc
+ec b0xff red
+ec btext rgb:fff . bold
+
+ec args white
+ec bin white
+ec cmp white
+ec usrcmt black white bold
+ec reg green . bold
+ec creg rgb:f72
+ec flag white . bold
+ec fline white
+
+ec flow yellow
+ec flow2 white
+
+ec fname black green bold
+ec help yellow . bold
+ec input yellow . bold
+ec label white . bold
+ec math white
+ec mov white
+ec nop rgb:ccc
+
+ec comment yellow . bold
+ec call black green bold
+ec num rgb:fff . bold
+ec jmp yellow . bold
+ec cjmp rgb:f72 . bold
+
+ec offset white . bold
+ec other rgb:999
+ec pop rgb:999
+
+ec prompt black yellow bold
+
+ec graph.box white
+ec graph.box2 green
+ec graph.box3 rgb:000
+ec graph.box4 rgb:000
+
+ec graph.true green . bold
+ec graph.false red
+
+ec push white
+ec ret rgb:777
+ec swi black red bold
+ec trap red
+ec graph.trufae rgb:ddd
+ec graph.current rgb:f72
+ec graph.traced rgb:f00
+ec gui.cflow rgb:f72
+ec gui.dataoffset rgb:f72
+ec crypto rgb:f72
+ec floc rgb:777
+ec invalid red
+ec linehl rgb:008
+
+ec func_var yellow . bold
+ec func_var_type blue . bold
+ec func_var_addr cyan . bold
+
+ec ai.read white . bold
+ec ai.write white . bold
+ec ai.exec red . bold
+ec ai.seq green . bold
+ec ai.ascii yellow . bold
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/cga radare2-2.8.0+dfsg/libr/cons/d/cga
--- radare2-2.3.0+dfsg/libr/cons/d/cga	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/cga	2018-08-07 14:12:36.000000000 +0000
@@ -38,6 +38,7 @@
 ec num rgb:0ff
 ec help rgb:0ff
 ec trap rgb:000 rgb:f0f
+ec linehl rgb:008
 
 ec graph.box rgb:f0f
 ec graph.box2 rgb:f0f
@@ -60,3 +61,7 @@
 ec ai.exec rgb:f0f
 ec ai.seq rgb:f0f
 ec ai.ascii rgb:f0f
+
+ec func_var rgb:f0f
+ec func_var_type rgb:f0f
+ec func_var_addr rgb:0ff
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/consonance radare2-2.8.0+dfsg/libr/cons/d/consonance
--- radare2-2.3.0+dfsg/libr/cons/d/consonance	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/consonance	2018-08-07 14:12:36.000000000 +0000
@@ -36,6 +36,7 @@
 ec swi rgb:f2a
 ec creg rgb:789
 ec flag rgb:4cf
+ec linehl rgb:004
 
 ec graph.box rgb:789
 ec graph.box2 rgb:d41
@@ -46,3 +47,13 @@
 ec graph.trufae rgb:4cf
 ec graph.current rgb:af2
 ec graph.traced rgb:090
+
+ec func_var rgb:fcc
+ec func_var_type rgb:f2a
+ec func_var_addr white
+
+ec ai.read rgb:fcc
+ec ai.write rgb:f2a
+ec ai.exec rgb:f2a
+ec ai.seq rgb:f0f
+ec ai.ascii rgb:fff
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/cutter radare2-2.8.0+dfsg/libr/cons/d/cutter
--- radare2-2.3.0+dfsg/libr/cons/d/cutter	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/cutter	2018-08-07 14:12:36.000000000 +0000
@@ -32,6 +32,7 @@
 ec flow2 rgb:8d0
 ec mov black
 ec invalid rgb:e33
+ec linehl rgb:efefef
 ec graph.box rgb:28d
 ec graph.box2 rgb:8d0
 ec graph.box3 rgb:e33
@@ -41,3 +42,13 @@
 ec graph.trufae rgb:28d
 ec graph.current rgb:0ff
 ec graph.traced rgb:e33
+
+ec func_var rgb:d38
+ec func_var_type blue
+ec func_var_addr rgb:bbb
+
+ec ai.read rgb:18d
+ec ai.write rgb:28d
+ec ai.exec rgb:b80
+ec ai.seq rgb:d38
+ec ai.ascii black
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/dark radare2-2.8.0+dfsg/libr/cons/d/dark
--- radare2-2.3.0+dfsg/libr/cons/d/dark	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/dark	2018-08-07 14:12:36.000000000 +0000
@@ -33,6 +33,7 @@
 ec trap rgb:000 rgb:
 ec swi rgb:99a
 ec invalid rgb:rgb:44f rgb:123
+ec linehl rgb:004
 ec graph.box rgb:040
 ec graph.box2 rgb:040
 ec graph.box3 rgb:040
@@ -42,3 +43,13 @@
 ec graph.trufae rgb:06c
 ec graph.current rgb:99a
 ec graph.traced rgb:bbb
+
+ec func_var rgb:99a
+ec func_var_type rgb:636
+ec func_var_addr rgb:366
+
+ec ai.read rgb:266
+ec ai.write rgb:366
+ec ai.exec rgb:368
+ec ai.seq rgb:d38
+ec ai.ascii rgb:99a
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/darkda radare2-2.8.0+dfsg/libr/cons/d/darkda
--- radare2-2.3.0+dfsg/libr/cons/d/darkda	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/darkda	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,56 @@
+ec b0x00 rgb:7c7c61
+ec b0x7f rgb:aaff00
+ec b0xff rgb:aaff00
+ec other rgb:ff7f00
+ec bin rgb:ff5afd
+ec btext rgb:617c7c
+ec call rgb:ffd200
+ec cjmp rgb:9dd600
+ec jmp rgb:9dd600
+ec cmp rgb:00ffff
+ec comment rgb:82607e
+ec usrcmt rgb:f3c5ff
+ec ret rgb:ffaa7f
+ec num rgb:d25032
+ec fline rgb:2bc
+ec flow rgb:00b1ab
+ec flow2 rgb:ddd
+ec fname rgb:00ffff
+ec label rgb:66d9ef
+ec math rgb:ffffff
+ec mov rgb:ffffff
+ec nop rgb:FFE792
+ec offset rgb:ababab
+ec prompt rgb:ffcc00
+ec pop rgb:ef8d1a
+ec push rgb:df077e
+ec reg rgb:009d9d
+ec args rgb:ffd200
+ec help rgb:009d9d
+ec input rgb:888
+ec trap rgb:d66
+ec swi rgb:df077e
+ec creg rgb:69d200
+ec flag rgb:00b1ab
+ec linehl rgb:00007f
+ec ai.read rgb:66d
+ec ai.write rgb:d66
+ec ai.exec rgb:6d6
+ec graph.box rgb:5202f0
+ec graph.box2 rgb:ffcc00
+ec graph.box3 rgb:66d9ef
+ec graph.box4 rgb:66d9ef
+ec graph.true rgb:009100
+ec graph.false rgb:bc0000
+ec graph.trufae rgb:0043cb
+ec graph.current rgb:fff
+
+ec func_var rgb:99a
+ec func_var_type rgb:df077e
+ec func_var_addr rgb:ababab
+
+ec ai.read rgb:be077e
+ec ai.write rgb:df077e
+ec ai.exec rgb:9dd600
+ec ai.seq rgb:9dd600
+ec ai.ascii rgb:d25032
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/defragger radare2-2.8.0+dfsg/libr/cons/d/defragger
--- radare2-2.3.0+dfsg/libr/cons/d/defragger	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/defragger	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,66 @@
+ec call rgb:ffff00
+ec comment rgb:32302f
+ec usrcmt rgb:ffc5f3
+ec ret rgb:fb4934
+ec args rgb:a89984
+ec fname rgb:fad200
+ec fline rgb:458588
+ec floc rgb:00ffff
+ec flag rgb:d75f00
+ec label rgb:8787d7
+ec help rgb:ff5f87
+ec flow2 rgb:0000ff
+ec prompt rgb:d75f00
+ec offset rgb:afafaf
+ec input rgb:d75f00
+ec invalid rgb:001f00
+ec other rgb:5f8787
+ec b0x00 rgb:005f5f
+ec b0x7f rgb:005f5f
+ec b0xff rgb:5f8787
+ec math rgb:00afd7
+ec bin rgb:87afaf
+ec btext rgb:afafaf
+ec push rgb:ff5f87
+ec pop rgb:87afaf
+ec crypto rgb:0000ff
+ec jmp rgb:ff5f87
+ec cjmp rgb:afaf00
+ec nop rgb:5f8787
+ec trap rgb:ff0000
+ec swi rgb:ff0000
+ec cmp rgb:d75f00
+ec reg rgb:73adad
+ec creg rgb:73adad
+ec num rgb:d25032
+ec mov rgb:ebebeb
+ec linehl rgb:00003f
+ec ai.read rgb:00ff00
+ec ai.write rgb:0000ff
+ec ai.exec rgb:ff0000
+ec ai.seq rgb:ff00ff
+ec ai.ascii rgb:ffff00
+ec graph.box=rgb:9e9e9e
+ec graph.box2 rgb:5f87d7
+ec graph.box3 rgb:af5f87
+ec graph.box4 rgb:303030
+ec graph.trufae rgb:005fff
+ec graph.current rgb:c68e00
+ec graph.true rgb:009100
+ec graph.false rgb:bc0000
+ec graph.traced rgb:ffff00
+ec gui.cflow rgb:ffff00
+ec gui.dataoffset rgb:ffff00
+ec gui.background rgb:303030
+ec gui.alt_background rgb:ffffff
+ec gui.border rgb:5fd700
+
+ec func_var rgb:64604f
+ec func_var_type rgb:00afd7
+ec func_var_addr rgb:afafaf
+
+ec ai.read rgb:a55f00
+ec ai.write rgb:d75f00
+ec ai.exec rgb:ff5f87
+ec ai.seq rgb:9dd600
+ec ai.ascii rgb:d25032
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/focus radare2-2.8.0+dfsg/libr/cons/d/focus
--- radare2-2.3.0+dfsg/libr/cons/d/focus	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/focus	2018-08-07 14:12:36.000000000 +0000
@@ -19,7 +19,6 @@
 ec b0x7f cyan 
 ec b0xff red 
 ec btext yellow 
-ec text rgb:666
 ec other rgb:666
 ec num rgb:888
 ec reg rgb:6f0 rgb:000
@@ -29,6 +28,7 @@
 ec mov rgb:888
 ec swi rgb:000 rgb:fff
 ec floc rgb:af2
+ec linehl rgb:222
 ec ai.read green
 ec ai.write blue
 ec ai.exec red
@@ -44,3 +44,13 @@
 ec graph.trufae blue
 ec graph.current blue
 ec graph.traced red
+
+ec func_var cyan
+ec func_var_type rgb:f3f
+ec func_var_addr white
+
+ec ai.read rgb:8f0
+ec ai.write rgb:6f0
+ec ai.exec rgb:f3f
+ec ai.seq white
+ec ai.ascii yellow
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/lima radare2-2.8.0+dfsg/libr/cons/d/lima
--- radare2-2.3.0+dfsg/libr/cons/d/lima	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/lima	2018-08-07 14:12:36.000000000 +0000
@@ -37,13 +37,24 @@
 ec help rgb:af2
 ec invalid rgb:ef0
 ec trap rgb:000 rgb:af2
+ec linehl rgb:140
 
 ec graph.box rgb:af2
 ec graph.box2 rgb:0a0
-ec graph.box3 rgb:af2
-ec graph.box4 rgb:af2
+ec graph.box3 rgb:444
+ec graph.box4 rgb:444
 ec graph.true rgb:ef2
 ec graph.false rgb:5d5
 ec graph.trufae rgb:af2
 ec graph.current rgb:af2
 ec graph.traced rgb:090
+
+ec func_var yellow
+ec func_var_type green
+ec func_var_addr yellow
+
+ec ai.read rgb:8e2
+ec ai.write rgb:9e2
+ec ai.exec rgb:af2
+ec ai.seq rgb:ef0
+ec ai.ascii rgb:ef0
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/Makefile radare2-2.8.0+dfsg/libr/cons/d/Makefile
--- radare2-2.3.0+dfsg/libr/cons/d/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -5,16 +5,21 @@
 
 .PHONY: all clean install install-symlink symstall
 
+CWD=$(shell pwd)
+
 install: ${F_SDB}
 	rm -rf "$P"
 	mkdir -p "$P"
-	cp -af * "$P"
+	for FILE in * ; do \
+		if [ $$FILE != Makefile -a $$FILE != meson.build -a -f $$FILE ]; then \
+			cp -PRpf "${CWD}/$$FILE" "$P/$$FILE" ; \
+		fi ; \
+	done
 
-CWD=$(shell pwd)
 symstall install-symlink:
 	mkdir -p "$P"
 	for FILE in * ; do \
-		if [ $$FILE != Makefile -a -f $$FILE ]; then \
+		if [ $$FILE != Makefile -a $$FILE != meson.build -a -f $$FILE ]; then \
 			ln -fs "${CWD}/$$FILE" "$P/$$FILE" ; \
 		fi ; \
 	done
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/matrix radare2-2.8.0+dfsg/libr/cons/d/matrix
--- radare2-2.3.0+dfsg/libr/cons/d/matrix	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/matrix	2018-08-07 14:12:36.000000000 +0000
@@ -34,6 +34,7 @@
 ec swi rgb:0b0
 ec creg rgb:080
 ec flag rgb:0f0
+ec linehl rgb:020
 ec graph.box green
 ec graph.box2 rgb:060
 ec graph.box3 rgb:ff0000
@@ -43,3 +44,13 @@
 ec graph.trufae green
 ec graph.current green
 ec graph.traced rgb:060
+
+ec func_var rgb:060
+ec func_var_type rgb:383
+ec func_var_addr rgb:060
+
+ec ai.read rgb:0a1
+ec ai.write rgb:1a1
+ec ai.exec rgb:383
+ec ai.seq rgb:3f3
+ec ai.ascii rgb:3f3
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/meson.build radare2-2.8.0+dfsg/libr/cons/d/meson.build
--- radare2-2.3.0+dfsg/libr/cons/d/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,4 @@
+install_subdir('.',
+  install_dir: join_paths(get_option('prefix'), r2_themes),
+  exclude_files: ['Makefile', 'meson.build']
+)
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/monokai radare2-2.8.0+dfsg/libr/cons/d/monokai
--- radare2-2.3.0+dfsg/libr/cons/d/monokai	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/monokai	2018-08-07 14:12:36.000000000 +0000
@@ -1,15 +1,15 @@
-ec b0x00 rgb:222
+ec b0x00 rgb:555
 ec b0x7f rgb:fff
 ec b0xff rgb:eee
 ec other rgb:888
-ec bin rgb:888
-ec btext ef8d1a
-ec call rgb:000000 rgb:ef8d1a
+ec bin rgb:FFE792
+ec btext rgb:a398e5
+ec call rgb:f1c40f
 ec cjmp rgb:A6df2E
 ec jmp rgb:A6df2E
 ec cmp rgb:ef8d1a
 ec comment rgb:66d9ef
-ec usrcmt rgb:ffffff rgb:f92672
+ec usrcmt rgb:f92672
 ec ret rgb:d66
 ec num rgb:a398e5
 ec fline rgb:2bc
@@ -19,7 +19,7 @@
 ec label rgb:66d9ef
 ec math rgb:ddd
 ec mov rgb:ddd
-ec nop rgb:444
+ec nop rgb:FFE792
 ec offset rgb:f92672
 ec prompt rgb:ef8d1a
 ec pop rgb:ef8d1a
@@ -32,9 +32,11 @@
 ec swi rgb:d66
 ec creg rgb:df7
 ec flag rgb:ef8d1a
+ec linehl rgb:008
 ec ai.read rgb:66d
 ec ai.write rgb:d66
 ec ai.exec rgb:6d6
+ec ai.ascii rgb:a398e5
 ec graph.box rgb:66d9ef
 ec graph.box2 rgb:ef8d1a
 ec graph.box3 rgb:66d9ef
@@ -43,3 +45,7 @@
 ec graph.false rgb:f92672
 ec graph.trufae rgb:a398e5
 ec graph.current rgb:fff
+
+ec func_var cyan
+ec func_var_type rgb:a398e5
+ec func_var_addr rgb:f92672
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/ogray radare2-2.8.0+dfsg/libr/cons/d/ogray
--- radare2-2.3.0+dfsg/libr/cons/d/ogray	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/ogray	2018-08-07 14:12:36.000000000 +0000
@@ -37,11 +37,22 @@
 ec graph.trufae rgb:ddd
 ec graph.current rgb:f72
 ec graph.traced rgb:f00
-ec graph.box rgb:f72
+ec graph.box rgb:fff
 ec graph.box2 rgb:f72
-ec graph.box3 rgb:f00
-ec graph.box4 rgb:f00
+ec graph.box3 rgb:000
+ec graph.box4 rgb:000
 ec gui.cflow rgb:f72
 ec gui.dataoffset rgb:f72
 ec crypto rgb:f72
 ec floc rgb:777
+ec linehl rgb:111
+
+ec func_var rgb:f72
+ec func_var_type rgb:777
+ec func_var_addr rgb:555
+
+ec ai.read rgb:eee
+ec ai.write rgb:ddd
+ec ai.exec rgb:fff
+ec ai.seq rgb:f72
+ec ai.ascii rgb:f72
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/onedark radare2-2.8.0+dfsg/libr/cons/d/onedark
--- radare2-2.3.0+dfsg/libr/cons/d/onedark	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/onedark	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,62 @@
+#Inspired by onedark.vim
+# e scr.color = 3 // to enable 16m color
+ec func_var_type white
+ec func_var rgb:61afef
+ec func_var_addr rgb:4b5263
+ec b0x00 rgb:c678dd
+ec b0xff rgb:be5046
+ec prompt rgb:d19a66
+ec fname rgb:56b6c2
+ec label rgb:0f3
+ec math rgb:660
+ec bin rgb:e5c07b
+ec btext rgb:e5c07b
+ec call rgb:e06c75
+ec jmp rgb:c678dd
+ec cjmp rgb:c678dd
+ec offset rgb:366
+ec comment rgb:56b6c2
+ec usrcmt rgb:ff0
+ec push rgb:61afef
+ec pop rgb:61afef
+ec cmp rgb:060
+ec nop rgb:abb2bf
+ec num rgb:be5046
+ec reg rgb:e5c07b
+ec fline rgb:fc0
+ec flow rgb:98c379
+ec flow2 rgb:98c379
+ec args rgb:d19a66
+ec floc rgb:fc0
+ec flag rgb:56b6c2
+ec label rgb:56b6c2
+ec help rgb:98c379
+ec input white
+ec invalid rgb:e06c75
+ec crypto rgb:0000ff
+ec ret rgb:be5046
+ec trap rgb:e06c75
+ec swi rgb:e06c75
+ec mov rgb:98c379
+ec creg rgb:e5c07b
+ec ai.read rgb:98c379
+ec ai.write rgb:61afef
+ec ai.exec rgb:e06c75
+ec ai.seq rgb:ff00ff
+ec ai.ascii rgb:ffff00
+ec gui.cflow rgb:d19a66
+ec gui.dataoffset rgb:d19a66
+ec gui.background black
+ec gui.alt_background white
+ec gui.border black
+ec linehl rgb:61afef
+ec graph.box rgb:d19a66
+ec graph.box2 rgb:61afef
+ec graph.box3 rgb:c678dd
+ec graph.box4 rgb:000000
+ec graph.true rgb:98c379
+ec graph.false rgb:e06c75
+ec graph.trufae rgb:61afef
+ec graph.current rgb:61afef
+ec graph.traced rgb:d19a66
+ec linehl rgb:5c6370
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/pink radare2-2.8.0+dfsg/libr/cons/d/pink
--- radare2-2.3.0+dfsg/libr/cons/d/pink	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/pink	2018-08-07 14:12:36.000000000 +0000
@@ -32,6 +32,7 @@
 ec creg rgb:f5d
 ec num rgb:72d
 ec crypto rgb:75d
+ec linehl rgb:fdf
 ec graph.true rgb:f5d
 ec graph.false rgb:715
 ec graph.trufae rgb:f5d
@@ -44,10 +45,15 @@
 ec gui.cflow rgb:f5d
 ec gui.dataoffset rgb:f5d
 ec gui.background black
-##  ai.read
-##  ai.write
-##  ai.exec
-##  ai.seq
-##  ai.ascii
 ##  gui.alt_background
 ##  gui.border
+
+ec func_var rgb:72d
+ec func_var_type blue
+ec func_var_addr rgb:72d
+
+ec ai.read rgb:f6e
+ec ai.write rgb:f5d
+ec ai.exec rgb:75a
+ec ai.seq rgb:72d
+ec ai.ascii rgb:72d
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/rasta radare2-2.8.0+dfsg/libr/cons/d/rasta
--- radare2-2.3.0+dfsg/libr/cons/d/rasta	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/rasta	2018-08-07 14:12:36.000000000 +0000
@@ -38,6 +38,7 @@
 ec swi red
 ec creg green
 ec flag yellow
+ec linehl rgb:008
 ec graph.box yellow
 ec graph.box2 green
 ec graph.box3 red
@@ -47,3 +48,13 @@
 ec graph.trufae green
 ec graph.current green
 ec graph.traced yellow
+
+ec func_var green
+ec func_var_type red
+ec func_var_addr yellow
+
+ec ai.read green
+ec ai.write green
+ec ai.exec yellow
+ec ai.seq red
+ec ai.ascii red
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/sepia radare2-2.8.0+dfsg/libr/cons/d/sepia
--- radare2-2.3.0+dfsg/libr/cons/d/sepia	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/sepia	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,57 @@
+# requires e scr.color=3
+
+ec b0x00 rgb:431
+ec b0x7f rgb:fd9
+ec b0xff rgb:960
+ec bin rgb:fec
+ec other rgb:ba6
+ec btext rgb:fec
+ec call rgb:fec rgb:320
+ec cjmp rgb:fec
+ec jmp rgb:fec
+ec cmp rgb:ca6
+ec comment rgb:fd9
+ec usrcmt rgb:fff
+ec ret rgb:ab7
+ec fline rgb:ca6
+ec flow rgb:ca6
+ec flow2 rgb:fec
+ec fname rgb:bb7
+ec label rgb:788
+ec math rgb:db7
+ec invalid rgb:c64
+ec mov rgb:db7
+ec nop rgb:788
+ec num rgb:960
+ec offset rgb:960
+ec pop rgb:bb7
+ec prompt rgb:960
+ec push rgb:db7
+ec reg rgb:ca6
+ec args rgb:bb7
+ec help rgb:ab7
+ec input rgb:ca6
+ec trap rgb:431
+ec swi rgb:bb7
+ec creg rgb:960
+ec flag rgb:ffd
+ec linehl rgb:210
+ec graph.true rgb:fd9
+ec graph.false rgb:431
+ec graph.trufae rgb:fd9
+ec graph.current blue
+ec graph.traced blue
+ec graph.box rgb:431
+ec graph.box2 rgb:ca6
+ec graph.box3 rgb:ca6
+ec graph.box4 rgb:ca6
+
+ec func_var rgb:fd9
+ec func_var_type rgb:850
+ec func_var_addr rgb:960
+
+ec ai.read rgb:cb7
+ec ai.write rgb:ca6
+ec ai.exec rgb:db7
+ec ai.seq rgb:960
+ec ai.ascii rgb:fec
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/smyck radare2-2.8.0+dfsg/libr/cons/d/smyck
--- radare2-2.3.0+dfsg/libr/cons/d/smyck	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/smyck	2018-08-07 14:12:36.000000000 +0000
@@ -33,9 +33,12 @@
 ec swi rgb:d66
 ec creg rgb:df7
 ec flag rgb:9df
+ec linehl rgb:004
 ec ai.read rgb:66d
 ec ai.write rgb:d66
 ec ai.exec rgb:6d6
+ec ai.seq rgb:fd6
+ec ai.ascii white
 ec graph.box rgb:9df
 ec graph.box2 rgb:9df
 ec graph.box3 rgb:9df
@@ -44,3 +47,7 @@
 ec graph.false rgb:d66
 ec graph.trufae rgb:9c4
 ec graph.current rgb:fff
+
+ec func_var rgb:9df
+ec func_var_type rgb:fd6
+ec func_var_addr rgb:bb5
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/solarized radare2-2.8.0+dfsg/libr/cons/d/solarized
--- radare2-2.3.0+dfsg/libr/cons/d/solarized	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/solarized	2018-08-07 14:12:36.000000000 +0000
@@ -32,6 +32,7 @@
 ec swi rgb:f00
 ec creg rgb:de8
 ec flag rgb:c41
+ec linehl rgb:004
 
 ec graph.box rgb:033
 ec graph.box2 rgb:de8
@@ -43,5 +44,15 @@
 ec graph.current rgb:f00
 ec graph.traced red
 
+ec func_var rgb:28d
+ec func_var_type rgb:cc8
+ec func_var_addr rgb:9aa
+
+ec ai.read rgb:39e
+ec ai.write rgb:577
+ec ai.exec rgb:ab4
+ec ai.seq rgb:899
+ec ai.ascii rgb:899
+
 # background of the terminal must be 134 o 033
 # xterm -fn 10x20 -bg rgb:00/30/30 -fg rgb:e0/e0/e0 -e "r2 -c 'eco solarized' /bin/ls"
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/tango radare2-2.8.0+dfsg/libr/cons/d/tango
--- radare2-2.3.0+dfsg/libr/cons/d/tango	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/tango	2018-08-07 14:12:36.000000000 +0000
@@ -50,6 +50,7 @@
 ec swi rgb:950
 ec creg rgb:590
 ec flag rgb:950
+ec linehl rgb:004
 
 ec graph.true rgb:370
 ec graph.false rgb:a00
@@ -60,3 +61,13 @@
 ec graph.box2 rgb:7d1
 ec graph.box3 rgb:950
 ec graph.box4 rgb:950
+
+ec func_var rgb:370
+ec func_var_type rgb:a41
+ec func_var_addr rgb:aaa
+
+ec ai.read rgb:a81
+ec ai.write rgb:a41
+ec ai.exec rgb:c50
+ec ai.seq rgb:ca0
+ec ai.ascii rgb:ca0
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/twilight radare2-2.8.0+dfsg/libr/cons/d/twilight
--- radare2-2.3.0+dfsg/libr/cons/d/twilight	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/twilight	2018-08-07 14:12:36.000000000 +0000
@@ -37,6 +37,7 @@
 ec swi rgb:bb7
 ec creg rgb:788
 ec flag rgb:ffd
+ec linehl rgb:004
 ec graph.true rgb:9b7
 ec graph.false rgb:b97
 ec graph.trufae rgb:64c
@@ -46,3 +47,13 @@
 ec graph.box2 rgb:b97
 ec graph.box3 rgb:b97
 ec graph.box4 rgb:b97
+
+ec func_var rgb:c64
+ec func_var_type rgb:aa6
+ec func_var_addr rgb:788
+
+ec ai.read rgb:db7
+ec ai.write rgb:ca6
+ec ai.exec rgb:ffd
+ec ai.seq rgb:bb7
+ec ai.ascii rgb:bb7
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/white radare2-2.8.0+dfsg/libr/cons/d/white
--- radare2-2.3.0+dfsg/libr/cons/d/white	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/white	2018-08-07 14:12:36.000000000 +0000
@@ -28,10 +28,11 @@
 ec b0x00 rgb:777
 ec btext black
 ec offset black
-ec flow green
+ec flow blue
 ec flow2 green
 ec mov black
 ec invalid red
+ec linehl rgb:ff0
 ec graph.box blue
 ec graph.box2 green
 ec graph.box3 red
@@ -41,3 +42,13 @@
 ec graph.trufae blue
 ec graph.current rgb:0ff
 ec graph.traced red
+
+ec func_var magenta
+ec func_var_type blue
+ec func_var_addr magenta
+
+ec ai.read magenta
+ec ai.write magenta
+ec ai.exec blue
+ec ai.seq black
+ec ai.ascii black
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/xvilka radare2-2.8.0+dfsg/libr/cons/d/xvilka
--- radare2-2.3.0+dfsg/libr/cons/d/xvilka	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/xvilka	2018-08-07 14:12:36.000000000 +0000
@@ -36,6 +36,7 @@
 ec swi red
 ec mov white
 ec creg rgb:6f0
+ec linehl rgb:004
 ec ai.read green
 ec ai.write blue
 ec ai.exec red
@@ -55,3 +56,7 @@
 ec gui.background black
 ec gui.alt_background white
 ec gui.border black
+
+ec func_var rgb:0cf
+ec func_var_type rgb:0c0
+ec func_var_addr rgb:366
diff -Nru radare2-2.3.0+dfsg/libr/cons/d/zenburn radare2-2.8.0+dfsg/libr/cons/d/zenburn
--- radare2-2.3.0+dfsg/libr/cons/d/zenburn	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/d/zenburn	2018-08-07 14:12:36.000000000 +0000
@@ -36,13 +36,24 @@
 ec swi rgb:d22
 ec creg rgb:ccc
 ec flag rgb:d50
+ec linehl rgb:004
 
 ec graph.box rgb:aaa
 ec graph.box2 rgb:d52
 ec graph.box3 rgb:aaa
 ec graph.box4 rgb:aaa
-ec graph.true rgb:d52
-ec graph.false rgb:aaa
+ec graph.true rgb:aaa
+ec graph.false rgb:d52
 ec graph.trufae rgb:aaa
 ec graph.current blue
 ec graph.traced red
+
+ec func_var rgb:7a7
+ec func_var_type rgb:eec
+ec func_var_addr rgb:aaa
+
+ec ai.read rgb:f87
+ec ai.write rgb:c88
+ec ai.exec rgb:cd9
+ec ai.seq rgb:ddc
+ec ai.ascii rgb:ddc
diff -Nru radare2-2.3.0+dfsg/libr/cons/dietline.c radare2-2.8.0+dfsg/libr/cons/dietline.c
--- radare2-2.3.0+dfsg/libr/cons/dietline.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/dietline.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2007-2017 - pancake */
+/* radare - LGPL - Copyright 2007-2018 - pancake */
 /* dietline is a lightweight and portable library similar to GNU readline */
 
 #include <r_cons.h>
@@ -17,55 +17,30 @@
 #endif
 
 static char *r_line_nullstr = "";
-static const char dl_basic_word_break_characters[] =  " \t\n\"\\'`@$><=;|&{(";
-
-#define ONLY_VALID_CHARS 1
-
-#if ONLY_VALID_CHARS
-static inline int is_valid_char(unsigned char ch) {
-	if (ch >= 32 && ch <= 127) {
-		return true;
-	}
-	switch (ch) {
-	// case 0: // wat
-	case 1:	// ^a
-	case 2:	// ^b -> emacs left
-	case 4:	// ^d
-	case 5:	// ^e
-	case 6:	// ^f -> emacs right
-	case 8:	// backspace
-	case 9:	// tab
-	case 10:// newline
-	case 13:// carriage return
-	case 23:// ^w
-	case 27:// arrow
-		return true;
-	}
-	return false;
-}
-#endif
+static const char word_break_characters[] = "\t\n ~`!@#$%^&*()-_=+[]{}\\|;:\"'<>,./";
 
 static inline bool is_word_break_char(char ch) {
 	int i;
 	int len =
-		sizeof (dl_basic_word_break_characters) /
-		sizeof (dl_basic_word_break_characters[0]);
+		sizeof (word_break_characters) /
+		sizeof (word_break_characters[0]);
 	for (i = 0; i < len; ++i) {
-		if (ch == dl_basic_word_break_characters[i]) {
+		if (ch == word_break_characters[i]) {
 			return true;
 		}
 	}
 	return false;
 }
 
-static void unix_word_rubout() {
-	int i;
+/* https://www.gnu.org/software/bash/manual/html_node/Commands-For-Killing.html */
+static void backward_kill_word() {
+	int i, len;
 	if (I.buffer.index > 0) {
 		for (i = I.buffer.index - 1; i > 0 && is_word_break_char (I.buffer.data[i]); i--) {
-			/*nothing to see here*/
+			/* Move the cursor index back until we hit a non-word-break-character */
 		}
-		for (; i && !is_word_break_char (I.buffer.data[i]); i--) {
-			/*nothing to see here*/
+		for (; i > 0 && !is_word_break_char (I.buffer.data[i]); i--) {
+			/* Move the cursor index back until we hit a word-break-character */
 		}
 		if (i > 0) {
 			i++;
@@ -75,6 +50,9 @@
 		if (I.buffer.index > I.buffer.length) {
 			I.buffer.length = I.buffer.index;
 		}
+		len = I.buffer.index - i + 1;
+		free (I.clipboard);
+		I.clipboard = r_str_ndup (I.buffer.data + i, len);
 		memmove (I.buffer.data + i, I.buffer.data + I.buffer.index,
 				I.buffer.length - I.buffer.index + 1);
 		I.buffer.length = strlen (I.buffer.data);
@@ -82,6 +60,63 @@
 	}
 }
 
+static void kill_word() {
+	int i, len;
+	for (i = I.buffer.index + 1; i < I.buffer.length && is_word_break_char (I.buffer.data[i]); i++) {
+		/* Move the cursor index forward until we hit a non-word-break-character */
+	}
+	for (; i < I.buffer.length && !is_word_break_char (I.buffer.data[i]); i++) {
+		/* Move the cursor index forward we hit a word-break-character */
+	}
+	if (I.buffer.index >= I.buffer.length) {
+		I.buffer.length = I.buffer.index;
+	}
+	len = i - I.buffer.index + 1;
+	free (I.clipboard);
+	I.clipboard = r_str_ndup (I.buffer.data + I.buffer.index, len);
+	memmove (I.buffer.data + I.buffer.index, I.buffer.data + i, len);
+	I.buffer.length = strlen (I.buffer.data);
+}
+
+static void paste() {
+	if (I.clipboard) {
+		char *cursor = I.buffer.data + I.buffer.index;
+		int dist = (I.buffer.data + I.buffer.length) - cursor;
+		int len = strlen (I.clipboard);
+		I.buffer.length += len;
+		memmove (cursor + len, cursor, dist);
+		memcpy (cursor, I.clipboard, len);
+		I.buffer.index += len;
+	}
+}
+
+static void unix_word_rubout() {
+	int i;
+	if (I.buffer.index > 0) {
+		for (i = I.buffer.index - 1; i > 0 && I.buffer.data[i] == ' '; i--) {
+			/* Move cursor backwards until we hit a non-space character or EOL */
+			/* This removes any trailing spaces from the input */
+		}
+		for (; i > 0 && I.buffer.data[i] != ' '; i--) {
+			/* Move cursor backwards until we hit a space character or EOL */
+			/* This deletes everything back to the previous space character */
+		}
+		if (i > 0) {
+			i++;
+		} else if (i < 0) {
+			i = 0;
+		}
+		if (I.buffer.index > I.buffer.length) {
+			I.buffer.length = I.buffer.index;
+		}
+		memmove (I.buffer.data + i,
+			I.buffer.data + I.buffer.index,
+			I.buffer.length - I.buffer.index + 1);
+		I.buffer.length = strlen (I.buffer.data);
+		I.buffer.index = i;
+	}
+}
+
 static int inithist() {
 	ZERO_FILL (I.history);
 	if ((I.history.size + 1024) * sizeof (char *) < I.history.size) {
@@ -109,15 +144,22 @@
 /* read utf8 char into 's', return the length in bytes */
 static int r_line_readchar_utf8(ut8 *s, int slen) {
 	// TODO: add support for w32
-	ssize_t len, t, i;
+	ssize_t len, i;
 	if (slen < 1) {
 		return 0;
 	}
+	int ch = r_cons_readchar ();
+	if (ch == -1) {
+		return -1;
+	}
+	*s = ch;
+#if 0
 	if ((t = read (0, s, 1)) != 1) {
 		return t;
 	}
-	s[0] = r_cons_controlz (s[0]);
-	if (s[0] < 0x80) {
+#endif
+	*s = r_cons_controlz (*s);
+	if (*s < 0x80) {
 		len = 1;
 	} else if ((s[0] & 0xe0) == 0xc0) {
 		len = 2;
@@ -132,8 +174,9 @@
 		return -1;
 	}
 	for (i = 1; i < len; i++) {
-		if ((t = read (0, s + i, 1)) != 1) {
-			return t;
+		int ch = r_cons_readchar ();
+		if (ch != -1) {
+			s[i] = ch;
 		}
 		if ((s[i] & 0xc0) != 0x80) {
 			return -1;
@@ -145,122 +188,112 @@
 
 #if __WINDOWS__ && !__CYGWIN__
 static int r_line_readchar_win(int *vch) { // this function handle the input in console mode
-	INPUT_RECORD irInBuf[128];
+	INPUT_RECORD irInBuf;
 	BOOL ret, bCtrl = FALSE;
 	DWORD mode, out;
 	ut8 buf[2];
 	HANDLE h;
 	int i;
+	void *bed;
 
 	if (I.zerosep) {
 		*vch = 0;
 		buf[0] = 0;
-		read (0, buf, 1);
+		bed = r_cons_sleep_begin ();
+		int rsz = read (0, buf, 1);
+		r_cons_sleep_end (bed);
+		if (rsz != 1)
+			return -1;
 		return buf[0];
 	}
 
 	*buf = '\0';
-do_it_again:
+
 	h = GetStdHandle (STD_INPUT_HANDLE);
 	GetConsoleMode (h, &mode);
 	SetConsoleMode (h, 0);	// RAW
+do_it_again:
 	*vch = 0;
-	ret = ReadConsoleInput (h, irInBuf, 128, &out);
+	bed = r_cons_sleep_begin ();
+	ret = ReadConsoleInput (h, &irInBuf, 1, &out);
+	r_cons_sleep_end (bed);
 	if (ret < 1) {
 		return 0;
 	}
-	for (i = 0; i < out; i++) {
-		if (irInBuf[i].EventType != KEY_EVENT) {
-			continue;
-		}
-		if (!irInBuf[i].Event.KeyEvent.bKeyDown) {
-			continue;
-		}
-		*buf = irInBuf[i].Event.KeyEvent.uChar.AsciiChar;
-		bCtrl = irInBuf[i].Event.KeyEvent.dwControlKeyState & 8;
-		if (irInBuf[i].Event.KeyEvent.uChar.AsciiChar) {
-			continue;
-		}
-		switch (irInBuf[i].Event.KeyEvent.wVirtualKeyCode) {
-		case VK_DOWN: *vch = bCtrl? 140: 40; break;
-		case VK_UP: *vch = bCtrl? 138: 38; break;
-		case VK_RIGHT: *vch = bCtrl? 139: 39; break;
-		case VK_LEFT: *vch = bCtrl? 137: 37; break;
-		case 46: *vch = bCtrl? 146: 46; break;	// SUPR KEY
-		case VK_PRIOR: *vch = bCtrl? 136: 36; break;	// HOME KEY
-		case VK_NEXT: *vch = bCtrl? 135: 35; break;	// END KEY
-		default: *vch = *buf = 0; break;
+	if (irInBuf.EventType == KEY_EVENT) {
+		if (irInBuf.Event.KeyEvent.bKeyDown) {
+			if (irInBuf.Event.KeyEvent.uChar.AsciiChar) {
+				*buf = irInBuf.Event.KeyEvent.uChar.AsciiChar;
+				bCtrl = irInBuf.Event.KeyEvent.dwControlKeyState & 8;
+			}
+			else {
+				switch (irInBuf.Event.KeyEvent.wVirtualKeyCode) {
+				case VK_DOWN: *vch = bCtrl ? 140 : 40; break;
+				case VK_UP: *vch = bCtrl ? 138 : 38; break;
+				case VK_RIGHT: *vch = bCtrl ? 139 : 39; break;
+				case VK_LEFT: *vch = bCtrl ? 137 : 37; break;
+				case VK_DELETE: *vch = bCtrl ? 146 : 46; break;	// SUPR KEY
+				case VK_HOME: *vch = bCtrl ? 136 : 36; break;	// HOME KEY
+				case VK_END: *vch = bCtrl ? 135 : 35; break;	// END KEY
+				default: *vch = *buf = 0; break;
+				}
+			}
 		}
 	}
-	SetConsoleMode (h, mode);
 	if (buf[0] == 0 && *vch == 0) {
 		goto do_it_again;
 	}
+	SetConsoleMode (h, mode);
 	return buf[0];
 }
 #endif
-static int r_line_readchar() {
-	ut8 buf[2];
-	*buf = '\0';
-#if __WINDOWS__ && !__CYGWIN__
-#if 1		// new implementation for read input at windows by skuater. If something fail set this to 0
-	int dummy = 0;
-	return r_line_readchar_win (&dummy);
-#endif
-	BOOL ret;
-	DWORD mode, out;
-	HANDLE h;
-#else
-	int ret;
-#endif
 
-do_it_again:
-#if __WINDOWS__ && !__CYGWIN__
-	h = GetStdHandle (STD_INPUT_HANDLE);
-	GetConsoleMode (h, &mode);
-	SetConsoleMode (h, 0);	// RAW
-	ret = ReadConsole (h, buf, 1, &out, NULL);
-	// wine hack-around
-	if (!ret && read (0, buf, 1) != 1) {
-		return -1;
+R_API int r_line_set_hist_callback(RLine *line, RLineHistoryUpCb up, RLineHistoryDownCb down) {
+	line->cb_history_up = up;
+	line->cb_history_down = down;
+	line->offset_hist_index = 0;
+	line->file_hist_index = 0;
+	line->sdbshell_hist_iter = line->sdbshell_hist? r_list_head (line->sdbshell_hist): NULL;
+	return 1;
+}
+
+R_API int cmd_history_up(RLine *line) {
+	if (line->hist_up) {
+		return line->hist_up (line->user);
 	}
-	SetConsoleMode (h, mode);
-#else
-	do {
-		buf[0] = 0;
-		ret = read (0, buf, 1);
-		buf[0] = r_cons_controlz (buf[0]);
-		// VTE HOME/END support
-		if (buf[0] == 79) {
-			if (read (0, buf, 1) != 1) {
-				return -1;
-			}
-			if (buf[0] == 70) {
-				return 5;
-			} else if (buf[0] == 72) {
-				return 1;
-			}
-			return 0;
-		}
-		if (ret == -1) {
-			return 0;	// read no char
-		}
-		if (!buf[0] || !ret) {
-			return -1;	// eof
-		}
-		// TODO: add support for other invalid chars
-		if (*buf == 0xc2 || *buf == 0xc3) {
-			read (0, buf + 1, 1);
-			*buf = '\0';
-		}
-	} while (*buf == '\0');
-#endif
-#if ONLY_VALID_CHARS
-	if (!is_valid_char (buf[0])) {
-		goto do_it_again;
+	if (!line->history.data) {
+		inithist ();
 	}
-#endif
-	return buf[0];
+	if (line->history.index > 0 && line->history.data) {
+		strncpy (line->buffer.data, line->history.data[--line->history.index], R_LINE_BUFSIZE - 1);
+		line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+		return true;
+	}
+	return false;
+}
+
+R_API int cmd_history_down(RLine *line) {
+	if (line->hist_down) {
+		return line->hist_down (line->user);
+	}
+	line->buffer.index = 0;
+	if (!line->history.data) {
+		inithist ();
+	}
+	if (line->history.index == line->history.top) {
+		return false;
+	}
+	line->history.index++;
+	if (line->history.index == line->history.top) {
+		line->buffer.data[0] = '\0';
+		line->buffer.index = line->buffer.length = 0;
+		return false;
+	}
+	if (line->history.data && line->history.data[line->history.index]) {
+		strncpy (line->buffer.data, line->history.data[line->history.index], R_LINE_BUFSIZE - 1);
+		line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+	}
+	return true;
 }
 
 R_API int r_line_hist_add(const char *line) {
@@ -292,42 +325,17 @@
 }
 
 static int r_line_hist_up() {
-	if (I.hist_up) {
-		return I.hist_up (I.user);
-	}
-	if (!I.history.data) {
-		inithist ();
+	if (!I.cb_history_up) {
+		r_line_set_hist_callback (&I, &cmd_history_up, &cmd_history_down);
 	}
-	if (I.history.index > 0) {
-		strncpy (I.buffer.data, I.history.data[--I.history.index], R_LINE_BUFSIZE - 1);
-		I.buffer.index = I.buffer.length = strlen (I.buffer.data);
-		return true;
-	}
-	return false;
+	return I.cb_history_up (&I);
 }
 
 static int r_line_hist_down() {
-	if (I.hist_down) {
-		return I.hist_down (I.user);
+	if (!I.cb_history_down) {
+		r_line_set_hist_callback (&I, &cmd_history_up, &cmd_history_down);
 	}
-	I.buffer.index = 0;
-	if (!I.history.data) {
-		inithist ();
-	}
-	if (I.history.index == I.history.top) {
-		return false;
-	}
-	I.history.index++;
-	if (I.history.index == I.history.top) {
-		I.buffer.data[0] = '\0';
-		I.buffer.index = I.buffer.length = 0;
-		return false;
-	}
-	if (I.history.data[I.history.index]) {
-		strncpy (I.buffer.data, I.history.data[I.history.index], R_LINE_BUFSIZE - 1);
-		I.buffer.index = I.buffer.length = strlen (I.buffer.data);
-	}
-	return true;
+	return I.cb_history_down (&I);
 }
 
 R_API const char *r_line_hist_get(int n) {
@@ -335,6 +343,7 @@
 	if (!I.history.data) {
 		inithist ();
 	}
+	n--;
 	if (I.history.data) {
 		for (i = 0; i < I.history.size && I.history.data[i]; i++) {
 			if (n == i) {
@@ -368,6 +377,7 @@
 		}
 	}
 	R_FREE (I.history.data);
+	R_FREE (I.sdbshell_hist);
 	I.history.index = 0;
 }
 
@@ -402,7 +412,10 @@
 		p = (char *) r_str_lastbut (path, R_SYS_DIR[0], NULL);	// TODO: use fs
 		if (p) {
 			*p = 0;
-			r_sys_mkdirp (path);
+			if (!r_sys_mkdirp (path)) {
+				eprintf ("could not save history into %s\n", path);
+				goto end;
+			}
 			*p = R_SYS_DIR[0];
 		}
 		fd = fopen (path, "w");
@@ -419,6 +432,7 @@
 			}
 		}
 	}
+end:
 	free (path);
 	return ret;
 }
@@ -428,7 +442,122 @@
 	return 0;
 }
 
+static void selection_widget_draw() {
+	RCons *cons = r_cons_singleton ();
+	RSelWidget *sel_widget = I.sel_widget;
+	int y, pos_y = cons->rows, pos_x = r_str_ansi_len (I.prompt);
+
+	for (y = 0; y < sel_widget->options_len; y++) {
+		sel_widget->w = R_MAX (sel_widget->w, strlen (sel_widget->options[y]));
+	}
+	sel_widget->w = R_MIN (sel_widget->w, R_SELWIDGET_MAXW);
+
+	char *background_color = cons->color ? cons->pal.widget_bg : Color_INVERT_RESET;
+	char *selected_color = cons->color ? cons->pal.widget_sel : Color_INVERT;
+	bool scrollbar = sel_widget->options_len > R_SELWIDGET_MAXH;
+	int scrollbar_y = 0, scrollbar_l = 0;
+	if (scrollbar) {
+		scrollbar_y = (R_SELWIDGET_MAXH * (sel_widget->selection - sel_widget->scroll)) / sel_widget->options_len;
+		scrollbar_l = (R_SELWIDGET_MAXH * R_SELWIDGET_MAXH) / sel_widget->options_len;
+	}
+
+	for (y = 0; y < R_MIN (sel_widget->h, R_SELWIDGET_MAXH); y++) {
+		r_cons_gotoxy (pos_x + 1, pos_y - y - 1);
+		int scroll = R_MAX (0, sel_widget->selection - sel_widget->scroll);
+		const char *option = y < sel_widget->options_len ? sel_widget->options[y + scroll] : "";
+		r_cons_printf ("%s", sel_widget->selection == y + scroll ? selected_color : background_color);
+		r_cons_printf ("%-*.*s", sel_widget->w, sel_widget->w, option);
+		if (scrollbar && R_BETWEEN (scrollbar_y, y, scrollbar_y + scrollbar_l)) {
+			r_cons_memcat (Color_INVERT" "Color_INVERT_RESET, 10);
+		} else {
+			r_cons_memcat (" ", 1);
+		}
+	}
+
+	r_cons_gotoxy (pos_x + I.buffer.length, pos_y);
+	r_cons_memcat (Color_RESET_BG, 5);
+	r_cons_flush ();
+}
+
+static void selection_widget_up(int steps) {
+	RSelWidget *sel_widget = I.sel_widget;
+	if (sel_widget) {
+		int height = R_MIN (sel_widget->h, R_SELWIDGET_MAXH - 1);
+		sel_widget->selection = R_MIN (sel_widget->selection + steps, sel_widget->options_len - 1);
+		if (steps == 1) {
+			sel_widget->scroll = R_MIN (sel_widget->scroll + 1, R_SELWIDGET_MAXH - 1);
+		} else if (sel_widget->selection + (height - sel_widget->scroll) > sel_widget->options_len - 1) {
+			sel_widget->scroll = height - (sel_widget->options_len - 1 - sel_widget->selection);
+		}
+	}
+}
+
+static void selection_widget_down(int steps) {
+	RSelWidget *sel_widget = I.sel_widget;
+	if (sel_widget) {
+		sel_widget->selection = R_MAX (sel_widget->selection - steps, 0);
+		if (steps == 1) {
+			sel_widget->scroll = R_MAX (sel_widget->scroll - 1, 0);
+		} else if (sel_widget->selection - sel_widget->scroll <= 0) {
+			sel_widget->scroll = sel_widget->selection;
+		}
+	}
+}
+
+static void print_rline_task(void *core) {
+	r_cons_clear_line (0);
+	r_cons_printf ("%s%s%s", Color_RESET, I.prompt,  I.buffer.data); 
+	r_cons_flush ();
+}
+
+static void selection_widget_erase() {
+	RSelWidget *sel_widget = I.sel_widget;
+	if (sel_widget) {
+		sel_widget->options_len = 0;
+		sel_widget->selection = -1;
+		selection_widget_draw ();
+		R_FREE (I.sel_widget);
+		RCons *cons = r_cons_singleton ();
+		if (cons->event_resize && cons->event_data) {
+			cons->event_resize (cons->event_data);
+			cons->cb_task_oneshot (cons->user, print_rline_task, NULL);
+		}
+	}
+}
+
+static void selection_widget_select() {
+	RSelWidget *sel_widget = I.sel_widget;
+	if (sel_widget && sel_widget->selection < sel_widget->options_len) {
+		I.buffer.length = R_MIN (strlen (sel_widget->options[sel_widget->selection]), R_LINE_BUFSIZE - 1);
+		memcpy (I.buffer.data, sel_widget->options[sel_widget->selection], I.buffer.length);
+		I.buffer.data[I.buffer.length] = '\0';
+		I.buffer.index = I.buffer.length;
+		selection_widget_erase ();
+	}
+}
+
+static void selection_widget_update() {
+	if (I.completion.argc == 0 ||
+		(I.completion.argc == 1 && I.buffer.length >= strlen (I.completion.argv[0]))) {
+		selection_widget_erase ();
+		return;
+	}
+	if (!I.sel_widget) {
+		RSelWidget *sel_widget = R_NEW0 (RSelWidget);
+		I.sel_widget = sel_widget;
+	}
+	I.sel_widget->scroll = 0;
+	I.sel_widget->selection = 0;
+	I.sel_widget->options_len = I.completion.argc;
+	I.sel_widget->options = I.completion.argv;
+	I.sel_widget->h = R_MAX (I.sel_widget->h, I.completion.argc);
+	selection_widget_draw ();
+	r_cons_flush ();
+	return;
+}
+
 R_API void r_line_autocomplete() {
+
 	int argc = 0;
 	char *p;
 	const char **argv = NULL;
@@ -442,6 +571,11 @@
 		argv = I.completion.argv;
 	}
 
+	if (I.sel_widget && !I.sel_widget->complete_common) {
+		selection_widget_update ();
+		return;
+	}
+
 	p = (char *) r_sub_str_lchr (I.buffer.data, 0, I.buffer.index, ' ');
 	if (!p) {
 		p = (char *) r_sub_str_lchr (I.buffer.data, 0, I.buffer.index, '@');	// HACK FOR r2
@@ -516,6 +650,14 @@
 		}
 	}
 
+	if (I.offset_prompt || I.file_prompt) {
+		selection_widget_update ();
+		if (I.sel_widget) {
+			I.sel_widget->complete_common = false;
+		}
+		return;
+	}
+
 	/* show options */
 	if (opt > 1 && I.echo) {
 		const int sep = 3;
@@ -548,6 +690,7 @@
 R_API const char *r_line_readline() {
 	return r_line_readline_cb (NULL, NULL);
 }
+
 #if __WINDOWS__ && !__CYGWIN__
 R_API const char *r_line_readline_cb_win(RLineReadCallback cb, void *user) {
 	int columns = r_cons_get_size (NULL) - 2;
@@ -560,6 +703,7 @@
 	char *tmp_ed_cmd, prev = 0;
 	HANDLE hClipBoard;
 	char *clipText;
+	int prev_buflen = 0;
 
 	I.buffer.index = I.buffer.length = 0;
 	I.buffer.data[0] = '\0';
@@ -582,7 +726,7 @@
 
 	if (I.echo) {
 		r_cons_clear_line (0);
-		printf ("\x1b[0K\r%s%s", I.prompt, I.buffer.data);
+		printf ("%s%s%s", Color_RESET, I.prompt, I.buffer.data);
 		fflush (stdout);
 	}
 	r_cons_break_push (NULL, NULL);
@@ -617,7 +761,10 @@
 			I.buffer.index = I.buffer.index? I.buffer.index - 1: 0;
 			break;
 		case 38:	// up arrow
-			if (gcomp) {
+			if (I.sel_widget) {
+				selection_widget_up (1);
+				selection_widget_draw ();
+			} else if (gcomp) {
 				gcomp_idx++;
 			} else if (r_line_hist_up () == -1) {
 				r_cons_break_pop ();
@@ -629,7 +776,10 @@
 					 I.buffer.index + 1: I.buffer.length;
 			break;
 		case 40:// down arrow
-			if (gcomp) {
+			if (I.sel_widget) {
+				selection_widget_up (1);
+				selection_widget_draw ();
+			} else if (gcomp) {
 				if (gcomp_idx > 0) {
 					gcomp_idx--;
 				}
@@ -712,7 +862,7 @@
 		case 5:	// ^E
 			if (prev == 24) {	// ^X = 0x18
 				I.buffer.data[I.buffer.length] = 0;	// probably unnecessary
-				tmp_ed_cmd = I.editor_cb (I.user, I.buffer.data);
+				tmp_ed_cmd = I.cb_editor (I.user, I.buffer.data);
 				if (tmp_ed_cmd) {
 					/* copied from yank (case 25) */
 					I.buffer.length = strlen (tmp_ed_cmd);
@@ -813,19 +963,13 @@
 		case 24:// ^X -- do nothing but store in prev = *buf
 			break;
 		case 25:// ^Y - paste
-			if (I.clipboard != NULL) {
-				I.buffer.length += strlen (I.clipboard);
-				// TODO: support endless strings
-				if (I.buffer.length < R_LINE_BUFSIZE) {
-					I.buffer.index = I.buffer.length;
-					strcat (I.buffer.data, I.clipboard);
-				} else {
-					I.buffer.length -= strlen (I.clipboard);
-				}
-			}
+			paste ();
 			break;
 		case 14:// ^n
-			if (gcomp) {
+			if (I.sel_widget) {
+				selection_widget_down (1);
+				selection_widget_draw ();
+			} else if (gcomp) {
 				if (gcomp_idx > 0) {
 					gcomp_idx--;
 				}
@@ -834,7 +978,10 @@
 			}
 			break;
 		case 16:// ^p
-			if (gcomp) {
+			if (I.sel_widget) {
+				selection_widget_down (1);
+				selection_widget_draw ();
+			} else if (gcomp) {
 				gcomp_idx++;
 			} else {
 				r_line_hist_up ();
@@ -868,10 +1015,17 @@
 			break;
 		/* tab */
 		case 9:	// tab
+			if (I.sel_widget) {
+				I.sel_widget->complete_common = true;
+			}
 			r_line_autocomplete ();
 			break;
 		/* enter */
 		case 13:
+			if (I.sel_widget) {
+				selection_widget_select ();
+				break;
+			}
 			if (gcomp && I.buffer.length > 0) {
 				strncpy (I.buffer.data, gcomp_line, R_LINE_BUFSIZE - 1);
 				I.buffer.data[R_LINE_BUFSIZE - 1] = '\0';
@@ -899,6 +1053,10 @@
 			I.buffer.index++;
 			break;
 		}
+		if (I.sel_widget && I.buffer.length != prev_buflen) {
+			prev_buflen = I.buffer.length;
+			r_line_autocomplete ();
+		}
 		prev = buf[0];
 		if (I.echo) {
 			if (gcomp) {
@@ -921,7 +1079,7 @@
 				int chars = R_MAX (1, strlen (I.buffer.data));	// wtf?
 				int len, cols = R_MAX (1, columns - r_str_ansi_len (I.prompt) - 2);
 				/* print line */
-				printf ("\r%s", I.prompt);
+				printf ("\r%s%s", Color_RESET, I.prompt);
 				fwrite (I.buffer.data, 1, R_MIN (cols, chars), stdout);
 				/* place cursor */
 				printf ("\r%s", I.prompt);
@@ -950,6 +1108,8 @@
 		fflush (stdout);
 	}
 
+	R_FREE (I.sel_widget);
+
 	// should be here or not?
 	if (!memcmp (I.buffer.data, "!history", 8)) {
 		r_line_hist_list ();
@@ -961,10 +1121,9 @@
 
 R_API const char *r_line_readline_cb(RLineReadCallback cb, void *user) {
 #if __WINDOWS__ && !__CYGWIN__
-#if 1		// new implementation for read input at windows by skuater. If something fail set this to 0
+	// new implementation for read input at windows by skuater. If something fail set this to 0
 	return r_line_readline_cb_win (cb, user);
 #endif
-#endif
 	int columns = r_cons_get_size (NULL) - 2;
 	const char *gcomp_line = "";
 	static int gcomp_idx = 0;
@@ -975,6 +1134,7 @@
 #endif
 	int ch, i = 0;	/* grep completion */
 	char *tmp_ed_cmd, prev = 0;
+	int prev_buflen = -1;
 
 	I.buffer.index = I.buffer.length = 0;
 	I.buffer.data[0] = '\0';
@@ -997,13 +1157,12 @@
 
 	if (I.echo) {
 		r_cons_clear_line (0);
-		printf ("\x1b[0K\r%s%s", I.prompt, I.buffer.data);
+		printf ("%s%s%s", Color_RESET, I.prompt, I.buffer.data);
 		fflush (stdout);
 	}
 	r_cons_break_push (NULL, NULL);
 	for (;;) {
 		if (r_cons_is_breaked ()) {
-			eprintf ("CATCH\n");
 			break;
 		}
 		I.buffer.data[I.buffer.length] = '\0';
@@ -1019,7 +1178,7 @@
 		}
 		buf[utflen] = 0;
 #else
-		ch = r_line_readchar ();
+		ch = r_cons_readchar ();
 		if (ch == -1) {
 			r_cons_break_pop ();
 			return NULL;
@@ -1041,6 +1200,7 @@
 			printf ("\r\x1b[2K\r");	// %*c\r", columns, ' ');
 		}
 #endif
+
 		switch (*buf) {
 		case 0:	// control-space
 			/* ignore atm */
@@ -1081,7 +1241,7 @@
 				gcomp = false;
 			} else if (prev == 24) {// ^X = 0x18
 				I.buffer.data[I.buffer.length] = 0;	// probably unnecessary
-				tmp_ed_cmd = I.editor_cb (I.user, I.buffer.data);
+				tmp_ed_cmd = I.cb_editor (I.user, I.buffer.data);
 				if (tmp_ed_cmd) {
 					/* copied from yank (case 25) */
 					I.buffer.length = strlen (tmp_ed_cmd);
@@ -1183,50 +1343,19 @@
 			I.buffer.length = 0;
 			I.buffer.index = 0;
 			break;
-		case 23:// ^W ^w
-			if (I.buffer.index > 0) {
-				for (i = I.buffer.index - 1; i > 0 && I.buffer.data[i] == ' '; i--) {
-					/*nothing to see here*/
-				}
-				for (; i && I.buffer.data[i] != ' '; i--) {
-					/*nothing to see here*/
-				}
-				if (!i) {
-					for (; i > 0 && I.buffer.data[i] == ' '; i--) {
-						/*nothing to see here*/
-					}
-				}
-				if (i > 0) {
-					i++;
-				} else if (i < 0) {
-					i = 0;
-				}
-				if (I.buffer.index > I.buffer.length) {
-					I.buffer.length = I.buffer.index;
-				}
-				memmove (I.buffer.data + i,
-					I.buffer.data + I.buffer.index,
-					I.buffer.length - I.buffer.index + 1);
-				I.buffer.length = strlen (I.buffer.data);
-				I.buffer.index = i;
-			}
+		case 23:// ^W ^w unix-word-rubout
+			unix_word_rubout ();
 			break;
 		case 24:// ^X -- do nothing but store in prev = *buf
 			break;
 		case 25:// ^Y - paste
-			if (I.clipboard != NULL) {
-				I.buffer.length += strlen (I.clipboard);
-				// TODO: support endless strings
-				if (I.buffer.length < R_LINE_BUFSIZE) {
-					I.buffer.index = I.buffer.length;
-					strcat (I.buffer.data, I.clipboard);
-				} else {
-					I.buffer.length -= strlen (I.clipboard);
-				}
-			}
+			paste ();
 			break;
 		case 14:// ^n
-			if (gcomp) {
+			if (I.sel_widget) {
+				selection_widget_down (1);
+				selection_widget_draw ();
+			} else if (gcomp) {
 				if (gcomp_idx > 0) {
 					gcomp_idx--;
 				}
@@ -1235,17 +1364,20 @@
 			}
 			break;
 		case 16:// ^p
-			if (gcomp) {
+			if (I.sel_widget) {
+				selection_widget_up (1);
+				selection_widget_draw ();
+			} else if (gcomp) {
 				gcomp_idx++;
 			} else {
 				r_line_hist_up ();
 			}
 			break;
-		case 27:// esc-5b-41-00-00
-			buf[0] = r_line_readchar ();
+		case 27: // esc-5b-41-00-00 alt/meta key
+			buf[0] = r_cons_readchar ();
 			switch (buf[0]) {
 			case 127: // alt+bkspace
-				unix_word_rubout ();
+				backward_kill_word ();
 				break;
 			case -1:
 				r_cons_break_pop ();
@@ -1260,7 +1392,7 @@
 			case 'b':
 				// previous word
 				for (i = I.buffer.index - 2; i >= 0; i--) {
-					if (I.buffer.data[i] == ' ' && I.buffer.data[i + 1] != ' ') {
+					if (is_word_break_char (I.buffer.data[i]) && !is_word_break_char (I.buffer.data[i + 1])) {
 						I.buffer.index = i + 1;
 						break;
 					}
@@ -1269,11 +1401,15 @@
 					I.buffer.index = 0;
 				}
 				break;
+			case 'D':
+			case 'd':
+				kill_word ();
+				break;
 			case 'F':
 			case 'f':
 				// next word
 				for (i = I.buffer.index + 1; i < I.buffer.length; i++) {
-					if (I.buffer.data[i] != ' ' && I.buffer.data[i - 1] == ' ') {
+					if (!is_word_break_char (I.buffer.data[i]) && is_word_break_char (I.buffer.data[i - 1])) {
 						I.buffer.index = i;
 						break;
 					}
@@ -1283,7 +1419,7 @@
 				}
 				break;
 			default:
-				buf[1] = r_line_readchar ();
+				buf[1] = r_cons_readchar ();
 				if (buf[1] == -1) {
 					r_cons_break_pop ();
 					return NULL;
@@ -1296,15 +1432,32 @@
 								I.buffer.data + I.buffer.index + 1,
 								strlen (I.buffer.data + I.buffer.index + 1) + 1);
 						}
-						buf[1] = r_line_readchar ();
+						buf[1] = r_cons_readchar ();
 						if (buf[1] == -1) {
 							r_cons_break_pop ();
 							return NULL;
 						}
 						break;
+					case '5': // pag up
+						buf[1] = r_cons_readchar ();
+						if (I.sel_widget) {
+							selection_widget_up (R_MIN (I.sel_widget->h, R_SELWIDGET_MAXH));
+							selection_widget_draw ();
+						}
+						break;
+					case '6': // pag down
+						buf[1] = r_cons_readchar ();
+						if (I.sel_widget) {
+							selection_widget_down (R_MIN (I.sel_widget->h, R_SELWIDGET_MAXH));
+							selection_widget_draw ();
+						}
+						break;
 					/* arrows */
 					case 'A':	// up arrow
-						if (gcomp) {
+						if (I.sel_widget) {
+							selection_widget_up (1);
+							selection_widget_draw ();
+						} else if (gcomp) {
 							gcomp_idx++;
 						} else if (r_line_hist_up () == -1) {
 							r_cons_break_pop ();
@@ -1312,7 +1465,10 @@
 						}
 						break;
 					case 'B':	// down arrow
-						if (gcomp) {
+						if (I.sel_widget) {
+							selection_widget_down (1);
+							selection_widget_draw ();
+						} else if (gcomp) {
 							if (gcomp_idx > 0) {
 								gcomp_idx--;
 							}
@@ -1407,12 +1563,22 @@
 					case 0x37:	// HOME xrvt-unicode
 						r_cons_readchar ();
 					case 0x48:	// HOME
+						if (I.sel_widget) {
+							selection_widget_up (I.sel_widget->options_len - 1);
+							selection_widget_draw ();
+							break;
+						}
 						I.buffer.index = 0;
 						break;
 					case 0x34:	// END
 					case 0x38:	// END xrvt-unicode
 						r_cons_readchar ();
 					case 0x46:	// END
+						if (I.sel_widget) {
+							selection_widget_down (I.sel_widget->options_len - 1);
+							selection_widget_draw ();
+							break;
+						}
 						I.buffer.index = I.buffer.length;
 						break;
 					}
@@ -1476,9 +1642,16 @@
 				I.buffer.length++;
 				I.buffer.index++;
 			}
+			if (I.sel_widget) {
+				I.sel_widget->complete_common = true;
+			}
 			r_line_autocomplete ();
 			break;
-		case 13:
+		case 13: // enter
+			if (I.sel_widget) {
+				selection_widget_select ();
+				break;
+			}
 			if (gcomp && I.buffer.length > 0) {
 				strncpy (I.buffer.data, gcomp_line, R_LINE_BUFSIZE - 1);
 				I.buffer.data[R_LINE_BUFSIZE - 1] = '\0';
@@ -1532,6 +1705,10 @@
 #endif
 			break;
 		}
+		if (I.sel_widget && I.buffer.length != prev_buflen) {
+			prev_buflen = I.buffer.length;
+			r_line_autocomplete ();
+		}
 		prev = buf[0];
 		if (I.echo) {
 			if (gcomp) {
@@ -1554,7 +1731,7 @@
 				int chars = R_MAX (1, strlen (I.buffer.data));	// wtf?
 				int len, cols = R_MAX (1, columns - r_str_ansi_len (I.prompt) - 2);
 				/* print line */
-				printf ("\r%s", I.prompt);
+				printf ("\r%s%s", Color_RESET, I.prompt);
 				fwrite (I.buffer.data, 1, R_MIN (cols, chars), stdout);
 				/* place cursor */
 				printf ("\r%s", I.prompt);
@@ -1583,6 +1760,8 @@
 		fflush (stdout);
 	}
 
+	R_FREE (I.sel_widget);
+
 	// should be here or not?
 	if (!memcmp (I.buffer.data, "!history", 8)) {
 		// if (I.buffer.data[0]=='!' && I.buffer.data[1]=='\0') {
diff -Nru radare2-2.3.0+dfsg/libr/cons/editor.c radare2-2.8.0+dfsg/libr/cons/editor.c
--- radare2-2.3.0+dfsg/libr/cons/editor.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/editor.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2008-2016 - pancake */
+/* radare - LGPL - Copyright 2008-2018 - pancake */
 
 #include <r_cons.h>
 #define I r_cons_singleton ()
@@ -57,8 +57,9 @@
 	}
 	if (lines) {
 		for (i = 0; i < bytes; i++) {
-			if (lines[i] == '\0')
+			if (lines[i] == '\0') {
 				lines[i] = '\n';
+			}
 		}
 	}
 	if (r_file_dump (path, (const ut8 *)lines, bytes, 0)) {
@@ -72,8 +73,8 @@
 R_API char *r_cons_editor(const char *file, const char *str) {
 	const char *line;
 	_n = 0;
-	if (I->editor) {
-		return I->editor (I->user, file, str);
+	if (I->cb_editor) {
+		return I->cb_editor (I->user, file, str);
 	}
 	free (path);
 	if (file) {
diff -Nru radare2-2.3.0+dfsg/libr/cons/grep.c radare2-2.8.0+dfsg/libr/cons/grep.c
--- radare2-2.3.0+dfsg/libr/cons/grep.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/grep.c	2018-08-07 14:12:36.000000000 +0000
@@ -4,11 +4,6 @@
 #include <r_util.h>
 #include <r_print.h>
 #include <sdb.h>
-#undef SDB_API
-#define SDB_API static
-#include "../../shlr/sdb/src/json/rangstr.c"
-int js0n(const ut8 *js, RangstrType len, RangstrType *out);
-#include "../../shlr/sdb/src/json/path.c"
 
 #define I(x) r_cons_singleton ()->x
 
@@ -36,7 +31,7 @@
 	" ?",        "", "count number of matching lines",
 	" ?.",       "", "count number chars",
 	" ??",       "", "show this help message",
-	" :[s]-[e]", "", "show lines s-e",
+	" :s..e",    "", "show lines s-e",
 	" ..",       "", "internal 'less'",
 	" ...",      "", "internal 'hud' (like V_)",
 	" {}",       "", "json indentation",
@@ -51,7 +46,8 @@
 	" [i,j,k]",  "", "show the columns i, j and k",
 	"Examples:", "", "",
 	" i~:0",     "", "show first line of 'i' output",
-	" i~:-2",    "", "show first three lines of 'i' output",
+	" i~:-2",    "", "show the second to last line of 'i' output",
+	" i~:0..3",  "", "show first three lines of 'i' output",
 	" pd~mov",   "", "disasm and grep for mov",
 	" pi~[0]",   "", "show only opcode",
 	" i~0x400$", "", "show lines ending with 0x400",
@@ -72,27 +68,27 @@
 static void parse_grep_expression(const char *str) {
 	static char buf[R_CONS_GREP_BUFSIZE];
 	int wlen, len, is_range, num_is_parsed, fail = 0;
-	char *ptr, *optr, *ptr2, *ptr3;
+	char *ptr, *optr, *ptr2, *ptr3, *end_ptr = NULL, last;
 	ut64 range_begin, range_end;
-	RCons *cons;
 
 	if (!str || !*str) {
 		return;
 	}
-	cons = r_cons_singleton ();
-	memset (&(cons->grep), 0, sizeof (cons->grep));
+	RCons *cons = r_cons_singleton ();
+	RConsGrep *grep = &cons->context->grep;
+	memset (grep, 0, sizeof (RConsGrep));
 	sorted_column = 0;
-	cons->grep.sort = -1;
-	cons->grep.line = -1;
+	grep->sort = -1;
+	grep->line = -1;
 	bool first = true;
 	while (*str) {
 		switch (*str) {
 		case '.':
 			if (str[1] == '.') {
 				if (str[2] == '.') {
-					cons->grep.less = 2;
+					grep->less = 2;
 				} else {
-					cons->grep.less = 1;
+					grep->less = 1;
 				}
 				return;
 			}
@@ -100,18 +96,18 @@
 			break;
 		case '{':
 			if (str[1] == '}') {
-				cons->grep.json = 1;
+				grep->json = 1;
 				if (!strncmp (str, "{}..", 4)) {
-					cons->grep.less = 1;
+					grep->less = 1;
 				}
 			} else {
 				char *jsonPath = strdup (str + 1);
 				char *jsonPathEnd = strchr (jsonPath, '}');
 				if (jsonPathEnd) {
 					*jsonPathEnd = 0;
-					free (cons->grep.json_path);
-					cons->grep.json_path = jsonPath;
-					cons->grep.json = 1;
+					free (grep->json_path);
+					grep->json_path = jsonPath;
+					grep->json = 1;
 				} else {
 					free (jsonPath);
 				}
@@ -122,43 +118,45 @@
 		case '$':
 			str++;
 			if (*str == '!') {
-				cons->grep.sort_invert = true;
+				grep->sort_invert = true;
 				str++;
 			} else {
-				cons->grep.sort_invert = false;
+				grep->sort_invert = false;
 			}
-			cons->grep.sort = atoi (str);
+			grep->sort = atoi (str);
 			while (IS_DIGIT (*str)) {
 				str++;
 			}
 			if (*str == ':') {
-				cons->grep.sort_row = atoi (++str);
+				grep->sort_row = atoi (++str);
 				str++;
 			}
 			break;
 		case '&':
 			str++;
-			cons->grep.amp = 1;
+			grep->amp = 1;
 			break;
 		case '+':
 			if (first) {
 				str++;
-				cons->grep.icase = 1;
+				grep->icase = 1;
+			} else {
+				goto while_end;
 			}
 			break;
 		case '^':
 			str++;
-			cons->grep.begin = 1;
+			grep->begin = 1;
 			break;
 		case '!':
 			str++;
-			cons->grep.neg = 1;
+			grep->neg = 1;
 			break;
 		case '?':
 			str++;
-			cons->grep.counter = 1;
+			grep->counter = 1;
 			if (*str == '.') {
-				cons->grep.charCounter = true;
+				grep->charCounter = true;
 				str++;
 			} else if (*str == '?') {
 				cons->filter = true;
@@ -179,7 +177,7 @@
 		return;
 	}
 	if (len > 0 && str[len] == '?') {
-		cons->grep.counter = 1;
+		grep->counter = 1;
 		strncpy (buf, str, R_MIN (len, sizeof (buf) - 1));
 		buf[len] = 0;
 		len--;
@@ -188,7 +186,7 @@
 	}
 
 	if (len > 1 && buf[len] == '$' && buf[len - 1] != '\\') {
-		cons->grep.end = 1;
+		grep->end = 1;
 		buf[len] = 0;
 	}
 
@@ -201,12 +199,14 @@
 	range_begin = range_end = -1;
 
 	if (ptr2 && ptr3) {
-		ptr2[0] = '\0';
+		end_ptr = ptr2;
+		last = ptr3[1];
+		ptr3[1] = '\0';
 		ptr2++;
 		for (; ptr2 <= ptr3; ++ptr2) {
 			if (fail) {
-				ZERO_FILL (cons->grep.tokens);
-				cons->grep.tokens_used = 0;
+				ZERO_FILL (grep->tokens);
+				grep->tokens_used = 0;
 				fail = 0;
 				break;
 			}
@@ -223,8 +223,8 @@
 						fail = 1;
 						break;
 					}
-					cons->grep.tokens[range_begin] = 1;
-					cons->grep.tokens_used = 1;
+					grep->tokens[range_begin] = 1;
+					grep->tokens_used = 1;
 				}
 				// case of [n-]
 				if (*ptr2 == ']' && is_range && !num_is_parsed) {
@@ -250,35 +250,39 @@
 				}
 			}
 		}
+		ptr3[1] = last;
 	}
 
 	ptr2 = strchr_ns (ptr, ':'); // line number
-	cons->grep.range_line = 2; // there is not :
-	if (ptr2 && ptr2[1] != ':' && ptr2[1]) {
-		*ptr2 = '\0';
-		char *p, *token = ptr + 1;
+	grep->range_line = 2; // there is not :
+	if (ptr2 && ptr2[1] != ':' && ptr2[1] && (IS_DIGIT (ptr2[1]) || ptr2[1] == '-' || ptr2[1] == '.')) {
+		end_ptr = end_ptr ? R_MIN (end_ptr, ptr2) : ptr2;
+		char *p, *token = ptr2 + 1;
 		p = strstr (token, "..");
 		if (!p) {
-			cons->grep.line = r_num_get (cons->num, ptr2 + 1);
-			cons->grep.range_line = 0;
+			grep->line = r_num_get (cons->num, ptr2 + 1);
+			grep->range_line = 0;
 		} else {
 			*p = '\0';
-			cons->grep.range_line = 1;
+			grep->range_line = 1;
 			if (*token) {
-				cons->grep.f_line = r_num_get (cons->num, token);
+				grep->f_line = r_num_get (cons->num, token);
 			} else {
-				cons->grep.f_line = 0;
+				grep->f_line = 0;
 			}
 			if (p[2]) {
-				cons->grep.l_line = r_num_get (cons->num, p + 2);
+				grep->l_line = r_num_get (cons->num, p + 2);
 			} else {
-				cons->grep.l_line = -1;
+				grep->l_line = -1;
 			}
 		}
 	}
-	free (cons->grep.str);
+	if (end_ptr) {
+		*end_ptr = '\0';
+	}
+	free (grep->str);
 	if (*ptr) {
-		cons->grep.str = (char *) strdup (ptr);
+		grep->str = (char *) strdup (ptr);
 		do {
 			optr = ptr;
 			ptr = strchr (ptr, ','); // grep keywords
@@ -293,18 +297,18 @@
 				eprintf ("grep string too long\n");
 				continue;
 			}
-			strncpy (cons->grep.strings[cons->grep.nstrings],
+			strncpy (grep->strings[grep->nstrings],
 				optr, R_CONS_GREP_WORD_SIZE - 1);
-			cons->grep.nstrings++;
-			if (cons->grep.nstrings > R_CONS_GREP_WORDS - 1) {
+			grep->nstrings++;
+			if (grep->nstrings > R_CONS_GREP_WORDS - 1) {
 				eprintf ("too many grep strings\n");
 				break;
 			}
 		} while (ptr);
 	} else {
-		cons->grep.str = strdup (ptr);
-		cons->grep.nstrings++;
-		cons->grep.strings[0][0] = 0;
+		grep->str = strdup (ptr);
+		grep->nstrings++;
+		grep->strings[0][0] = 0;
 	}
 }
 
@@ -443,33 +447,33 @@
 
 R_API int r_cons_grepbuf(char *buf, int len) {
 	RCons *cons = r_cons_singleton ();
+	RConsGrep *grep = &cons->context->grep;
 	char *tline, *tbuf, *p, *out, *in = buf;
 	int ret, total_lines = 0, buffer_len = 0, l = 0, tl = 0;
 	bool show = false;
 	if (cons->filter) {
-		cons->buffer_len = 0;
-		R_FREE (cons->buffer);
+		cons->context->buffer_len = 0;
+		R_FREE (cons->context->buffer);
 		return 0;
 	}
 
 	if ((!len || !buf || buf[0] == '\0') &&
-	    (cons->grep.json || cons->grep.less)) {
-		cons->grep.json = 0;
-		cons->grep.less = 0;
+	    (grep->json || grep->less)) {
+		grep->json = 0;
+		grep->less = 0;
 		return 0;
 	}
-	if (cons->grep.json) {
-		if (cons->grep.json_path) {
-			Rangstr rs = json_get (cons->buffer, cons->grep.json_path);
-			char *u = rangstr_dup (&rs);
+	if (grep->json) {
+		if (grep->json_path) {
+			char *u = sdb_json_get_str (cons->context->buffer, grep->json_path);
 			if (u) {
-				cons->buffer = u;
-				cons->buffer_len = strlen (u);
-				cons->buffer_sz = cons->buffer_len + 1;
-				cons->grep.json = 0;
+				cons->context->buffer = u;
+				cons->context->buffer_len = strlen (u);
+				cons->context->buffer_sz = cons->context->buffer_len + 1;
+				grep->json = 0;
 				r_cons_newline ();
 			}
-			R_FREE (cons->grep.json_path);
+			R_FREE (grep->json_path);
 		} else {
 			const char *palette[] = {
 				cons->pal.graph_false, // f
@@ -479,25 +483,25 @@
 				Color_RESET,
 				NULL
 			};
-			char *out = r_print_json_indent (buf, I (use_color), "  ", palette);
+			char *out = r_print_json_indent (buf, I (color), "  ", palette);
 			if (!out) {
 				return 0;
 			}
-			free (cons->buffer);
-			cons->buffer = out;
-			cons->buffer_len = strlen (out);
-			cons->buffer_sz = cons->buffer_len + 1;
-			cons->grep.json = 0;
-			if (cons->grep.less) {
-				cons->grep.less = 0;
-				r_cons_less_str (cons->buffer, NULL);
+			free (cons->context->buffer);
+			cons->context->buffer = out;
+			cons->context->buffer_len = strlen (out);
+			cons->context->buffer_sz = cons->context->buffer_len + 1;
+			grep->json = 0;
+			if (grep->less) {
+				grep->less = 0;
+				r_cons_less_str (cons->context->buffer, NULL);
 			}
 		}
 		return 3;
 	}
-	if (cons->grep.less) {
-		int less = cons->grep.less;
-		cons->grep.less = 0;
+	if (grep->less) {
+		int less = grep->less;
+		grep->less = 0;
 		if (less == 2) {
 			char *res = r_cons_hud_string (buf);
 			r_cons_println (res);
@@ -505,18 +509,18 @@
 		} else {
 			r_cons_less_str (buf, NULL);
 			buf[0] = 0;
-			cons->buffer_len = 0;
-			if (cons->buffer) {
-				cons->buffer[0] = 0;
+			cons->context->buffer_len = 0;
+			if (cons->context->buffer) {
+				cons->context->buffer[0] = 0;
 			}
-			R_FREE (cons->buffer);
+			R_FREE (cons->context->buffer);
 		}
 		return 0;
 	}
-	if (!cons->buffer) {
-		cons->buffer_len = len + 20;
-		cons->buffer = malloc (cons->buffer_len);
-		cons->buffer[0] = 0;
+	if (!cons->context->buffer) {
+		cons->context->buffer_len = len + 20;
+		cons->context->buffer = malloc (cons->context->buffer_len);
+		cons->context->buffer[0] = 0;
 	}
 	out = tbuf = calloc (1, len);
 	if (!out) {
@@ -542,15 +546,15 @@
 		}
 		total_lines++;
 	}
-	if (!cons->grep.range_line && cons->grep.line < 0) {
-		cons->grep.line = total_lines + cons->grep.line;
+	if (!grep->range_line && grep->line < 0) {
+		grep->line = total_lines + grep->line;
 	}
-	if (cons->grep.range_line == 1) {
-		if (cons->grep.f_line < 0) {
-			cons->grep.f_line = total_lines + cons->grep.f_line;
+	if (grep->range_line == 1) {
+		if (grep->f_line < 0) {
+			grep->f_line = total_lines + grep->f_line;
 		}
-		if (cons->grep.l_line < 0) {
-			cons->grep.l_line = total_lines + cons->grep.l_line;
+		if (grep->l_line < 0) {
+			grep->l_line = total_lines + grep->l_line;
 		}
 	}
 	in = buf;
@@ -573,15 +577,15 @@
 				ret = -1;
 			} else {
 				ret = r_cons_grep_line (tline, tl);
-				if (!cons->grep.range_line) {
-					if (cons->grep.line == cons->lines) {
+				if (!grep->range_line) {
+					if (grep->line == cons->lines) {
 						show = true;
 					}
-				} else if (cons->grep.range_line == 1) {
-					if (cons->grep.f_line == cons->lines) {
+				} else if (grep->range_line == 1) {
+					if (grep->f_line == cons->lines) {
 						show = true;
 					}
-					if (cons->grep.l_line == cons->lines) {
+					if (grep->l_line == cons->lines) {
 						show = false;
 					}
 				} else {
@@ -595,7 +599,7 @@
 					out += ret + 1;
 					buffer_len += ret + 1;
 				}
-				if (!cons->grep.range_line) {
+				if (!grep->range_line) {
 					show = false;
 				}
 				cons->lines++;
@@ -610,19 +614,19 @@
 		}
 	}
 	memcpy (buf, tbuf, len);
-	cons->buffer_len = buffer_len;
+	cons->context->buffer_len = buffer_len;
 	free (tbuf);
 	free (tline);
-	if (cons->grep.counter) {
-		int cnt = cons->grep.charCounter? strlen (cons->buffer): cons->lines;
-		if (cons->buffer_len < 10) {
-			cons->buffer_len = 10; // HACK
+	if (grep->counter) {
+		int cnt = grep->charCounter? strlen (cons->context->buffer): cons->lines;
+		if (cons->context->buffer_len < 10) {
+			cons->context->buffer_len = 10; // HACK
 		}
-		snprintf (cons->buffer, cons->buffer_len, "%d\n", cnt);
-		cons->buffer_len = strlen (cons->buffer);
+		snprintf (cons->context->buffer, cons->context->buffer_len, "%d\n", cnt);
+		cons->context->buffer_len = strlen (cons->context->buffer);
 		cons->num->value = cons->lines;
 	}
-	if (cons->grep.sort != -1) {
+	if (grep->sort != -1) {
 #define INSERT_LINES(list)\
 	do {\
 		r_list_foreach (list, iter, str) {\
@@ -637,11 +641,11 @@
 
 		RListIter *iter;
 		int nl = 0;
-		char *ptr = cons->buffer;
+		char *ptr = cons->context->buffer;
 		char *str;
-		sorted_column = cons->grep.sort;
+		sorted_column = grep->sort;
 		r_list_sort (sorted_lines, cmp);
-		if (cons->grep.sort_invert) {
+		if (grep->sort_invert) {
 			r_list_reverse (sorted_lines);
 		}
 		INSERT_LINES (unsorted_lines);
@@ -657,9 +661,10 @@
 
 R_API int r_cons_grep_line(char *buf, int len) {
 	RCons *cons = r_cons_singleton ();
+	RConsGrep *grep = &cons->context->grep;
 	const char *delims = " |,;=\t";
 	char *in, *out, *tok = NULL;
-	int hit = cons->grep.neg;
+	int hit = grep->neg;
 	int outlen = 0;
 	bool use_tok = false;
 	size_t i;
@@ -675,35 +680,35 @@
 	}
 	memcpy (in, buf, len);
 
-	if (cons->grep.nstrings > 0) {
-		int ampfail = cons->grep.amp;
-		if (cons->grep.icase) {
+	if (grep->nstrings > 0) {
+		int ampfail = grep->amp;
+		if (grep->icase) {
 			r_str_case (in, false);
 		}
-		for (i = 0; i < cons->grep.nstrings; i++) {
-			char *str = cons->grep.strings[i];
-			if (cons->grep.icase) {
+		for (i = 0; i < grep->nstrings; i++) {
+			char *str = grep->strings[i];
+			if (grep->icase) {
 				r_str_case (str, false);
 			}
-			char *p = strstr (in, cons->grep.strings[i]);
+			char *p = strstr (in, grep->strings[i]);
 			if (!p) {
 				ampfail = 0;
 				continue;
 			}
-			if (cons->grep.begin) {
+			if (grep->begin) {
 				hit = (p == in)? 1: 0;
 			} else {
-				hit = !cons->grep.neg;
+				hit = !grep->neg;
 			}
 			// TODO: optimize without strlen without breaking t/feat_grep (grep end)
-			if (cons->grep.end && (strlen (cons->grep.strings[i]) != strlen (p))) {
+			if (grep->end && (strlen (grep->strings[i]) != strlen (p))) {
 				hit = 0;
 			}
-			if (!cons->grep.amp) {
+			if (!grep->amp) {
 				break;
 			}
 		}
-		if (cons->grep.amp) {
+		if (grep->amp) {
 			hit = ampfail;
 		}
 	} else {
@@ -711,26 +716,21 @@
 	}
 
 	if (hit) {
-		if (!cons->grep.range_line) {
-			if (cons->grep.line == cons->lines) {
+		if (!grep->range_line) {
+			if (grep->line == cons->lines) {
 				use_tok = true;
 			}
-		} else if (cons->grep.range_line == 1) {
-			if (cons->grep.f_line == cons->lines) {
-				use_tok = true;
-			}
-			if (cons->grep.l_line == cons->lines) {
-				use_tok = false;
-			}
+		} else if (grep->range_line == 1) {
+			use_tok = R_BETWEEN (grep->f_line, cons->lines, grep->l_line);
 		} else {
 			use_tok = true;
 		}
-		if (use_tok && cons->grep.tokens_used) {
+		if (use_tok && grep->tokens_used) {
 			for (i = 0; i < R_CONS_GREP_TOKENS; i++) {
 				tok = strtok (i? NULL: in, delims);
 
 				if (tok) {
-					if (cons->grep.tokens[i]) {
+					if (grep->tokens[i]) {
 						int toklen = strlen (tok);
 						memcpy (out + outlen, tok, toklen);
 						memcpy (out + outlen + toklen, " ", 2);
@@ -768,7 +768,7 @@
 	}
 	free (in);
 	free (out);
-	if (cons->grep.sort != -1) {
+	if (grep->sort != -1) {
 		char ch = buf[len];
 		buf[len] = 0;
 		if (!sorted_lines) {
@@ -777,7 +777,7 @@
 		if (!unsorted_lines) {
 			unsorted_lines = r_list_newf (free);
 		}
-		if (cons->lines > cons->grep.sort_row) {
+		if (cons->lines > grep->sort_row) {
 			r_list_append (sorted_lines, strdup (buf));
 		} else {
 			r_list_append (unsorted_lines, strdup (buf));
@@ -888,14 +888,14 @@
 				esc = 0;
 				str = ptr;
 				continue;
-			} else if (!strncmp (ptr, "48;5;", 5)) {
+			} else if (!strncmp (ptr, "48;5;", 5) || !strncmp (ptr, "48;2;", 5)) {
 				char *end = strchr (ptr, 'm');
 				r_strbuf_appendf (res, "<font style='background-color:%s'>", gethtmlrgb (ptr));
 				tag_font = true;
 				ptr = end;
 				str = ptr + 1;
 				esc = 0;
-			} else if (!strncmp (ptr, "38;5;", 5)) {
+			} else if (!strncmp (ptr, "38;5;", 5) || !strncmp (ptr, "38;2;", 5)) {
 				char *end = strchr (ptr, 'm');
 				r_strbuf_appendf (res, "<font color='%s'>", gethtmlrgb (ptr));
 				tag_font = true;
@@ -950,11 +950,3 @@
 	return r_strbuf_drain (res);
 }
 
-R_API int r_cons_html_print(const char *ptr) {
-	char *res = r_cons_html_filter (ptr, NULL);
-	int res_len = strlen (res);
-	printf ("%s", res);
-	fflush (stdout);
-	free (res);
-	return res_len;
-}
diff -Nru radare2-2.3.0+dfsg/libr/cons/hud.c radare2-2.8.0+dfsg/libr/cons/hud.c
--- radare2-2.3.0+dfsg/libr/cons/hud.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/hud.c	2018-08-07 14:12:36.000000000 +0000
@@ -149,7 +149,7 @@
 						r_cons_printf (" %c %s\n", first_line? '-': ' ', current_entry);
 					} else {
 						// otherwise we need to emphasize the matching part
-						if (I (use_color)) {
+						if (I (color)) {
 							last_color_change = 0;
 							last_mask = 0;
 							r_cons_printf (" %c ", first_line? '-': ' ');
diff -Nru radare2-2.3.0+dfsg/libr/cons/input.c radare2-2.8.0+dfsg/libr/cons/input.c
--- radare2-2.3.0+dfsg/libr/cons/input.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/input.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_cons.h>
 #include <string.h>
@@ -9,7 +9,7 @@
 /* experimental support for x/y click */
 #define USE_CLICK 0
 
-#define I r_cons_singleton()
+#define I r_cons_singleton ()
 
 #if 0
 //__UNIX__
@@ -275,7 +275,7 @@
 
 #if __WINDOWS__ && !__CYGWIN__
 static int readchar_win(ut32 usec) {
-	int ch=0;
+	int ch = 0;
 	BOOL ret;
 	BOOL bCtrl = FALSE;
 	DWORD mode, out;
@@ -286,12 +286,15 @@
 	h = GetStdHandle (STD_INPUT_HANDLE);
 	GetConsoleMode (h, &mode);
 	SetConsoleMode (h, 0 | ENABLE_MOUSE_INPUT); // RAW
+	void *bed = r_cons_sleep_begin ();
 	if (usec) {
 		if (WaitForSingleObject (h, usec) == WAIT_TIMEOUT) {
+			r_cons_sleep_end (bed);
 			return -1;
 		}
 	}
 	ret = ReadConsoleInput (h, irInBuf, 128, &out);
+	r_cons_sleep_end (bed);
 	if (ret) {
 		for (i = 0; i < out; i++) {
 			if (irInBuf[i].EventType==MOUSE_EVENT) {
@@ -342,28 +345,16 @@
 								ch='J';
 							break;
 						case VK_F1:
-							if (bCtrl)
-								ch=R_CONS_KEY_F1;
-							else
-								ch=R_CONS_KEY_F1;
+							ch = R_CONS_KEY_F1;
 							break;
 						case VK_F2:
-							if (bCtrl)
-								ch=R_CONS_KEY_F2;
-							else
-								ch=R_CONS_KEY_F2;
+							ch = R_CONS_KEY_F2;
 							break;
 						case VK_F3:
-							if (bCtrl)
-								ch=R_CONS_KEY_F3;
-							else
-								ch=R_CONS_KEY_F3;
+							ch = R_CONS_KEY_F3;
 							break;
 						case VK_F4:
-							if (bCtrl)
-								ch=R_CONS_KEY_F4;
-							else
-								ch=R_CONS_KEY_F4;
+							ch = R_CONS_KEY_F4;
 							break;
 						case VK_F5:
 							if (bCtrl)
@@ -372,49 +363,28 @@
 								ch=R_CONS_KEY_F5;
 							break;
 						case VK_F6:
-							if (bCtrl)
-								ch=R_CONS_KEY_F6;
-							else
-								ch=R_CONS_KEY_F6;
+							ch = R_CONS_KEY_F6;
 							break;
 						case VK_F7:
-							if (bCtrl)
-								ch=R_CONS_KEY_F7;
-							else
-								ch=R_CONS_KEY_F7;
+							ch = R_CONS_KEY_F7;
 							break;
 						case VK_F8:
-							if (bCtrl)
-								ch=R_CONS_KEY_F8;
-							else
-								ch=R_CONS_KEY_F8;
+							ch = R_CONS_KEY_F8;
 							break;
 						case VK_F9:
-							if (bCtrl)
-								ch=R_CONS_KEY_F9;
-							else
-								ch=R_CONS_KEY_F9;
+							ch = R_CONS_KEY_F9;
 							break;
 						case VK_F10:
-							if (bCtrl)
-								ch=R_CONS_KEY_F10;
-							else
-								ch=R_CONS_KEY_F10;
+							ch = R_CONS_KEY_F10;
 							break;
 						case VK_F11:
-							if (bCtrl)
-								ch=R_CONS_KEY_F11;
-							else
-								ch=R_CONS_KEY_F11;
+							ch = R_CONS_KEY_F11;
 							break;
 						case VK_F12:
-							if (bCtrl)
-								ch=R_CONS_KEY_F12;
-							else
-								ch=R_CONS_KEY_F12;
+							ch = R_CONS_KEY_F12;
 							break;
 						default:
-							ch=0;
+							ch = 0;
 							break;
 						}
 					}
@@ -422,7 +392,7 @@
 			}
 		}
 	}
-	FlushConsoleInputBuffer(h);
+	FlushConsoleInputBuffer (h);
 	SetConsoleMode (h, mode);
 	if (ch == 0) {
 		goto do_it_again;
@@ -458,9 +428,41 @@
 #endif
 }
 
+// TODO: support binary? buf+len
+static char *readbuffer = NULL;
+static int readbuffer_length = 0;
+static bool bufactive = true;
+
+R_API bool r_cons_readpush(const char *str, int len) {
+	char *res = (len + readbuffer_length > 0) ? realloc (readbuffer, len + readbuffer_length) : NULL;
+	if (res) {
+		readbuffer = res;
+		memmove (readbuffer + readbuffer_length, str, len);
+		readbuffer_length += len;
+		return true;
+	}
+	return false;
+}
+
+R_API void r_cons_readflush() {
+	R_FREE (readbuffer);
+	readbuffer_length = 0;
+}
+
+R_API void r_cons_switchbuf(bool active) {
+	bufactive = active;
+}
+
 R_API int r_cons_readchar() {
+	void *bed;
 	char buf[2];
 	buf[0] = -1;
+	if (readbuffer_length > 0) {
+		int ch = *readbuffer;
+		readbuffer_length--;
+		memmove (readbuffer, readbuffer + 1, readbuffer_length);
+		return ch;
+	}
 #if __WINDOWS__ && !__CYGWIN__ //&& !MINGW32
 	#if 1   // if something goes wrong set this to 0. skuater.....
 	return readchar_win(0);
@@ -471,7 +473,9 @@
 	HANDLE h = GetStdHandle (STD_INPUT_HANDLE);
 	GetConsoleMode (h, &mode);
 	SetConsoleMode (h, 0); // RAW
+	bed = r_cons_sleep_begin ();
 	ret = ReadConsole (h, buf, 1, &out, NULL);
+	r_cons_sleep_end (bed);
 	FlushConsoleInputBuffer (h);
 	if (!ret) {
 		return -1;
@@ -479,10 +483,15 @@
 	SetConsoleMode (h, mode);
 #else
 	r_cons_set_raw (1);
-	if (read (0, buf, 1) == -1) {
+	bed = r_cons_sleep_begin ();
+	ssize_t ret = read (0, buf, 1);
+	r_cons_sleep_end (bed);
+	if (ret != 1) {
 		return -1;
 	}
-	r_cons_set_raw (0);
+	if (bufactive) {
+		r_cons_set_raw (0);
+	}
 #endif
 	return r_cons_controlz (buf[0]);
 }
@@ -496,6 +505,8 @@
 	fflush (stderr);
 	r_cons_set_raw (true);
 	(void)read (0, &key, 1);
+	write (2, " ", 1);
+	write (2, &key, 1);
 	write (2, "\n", 1);
 	if (key == 'Y') {
 		key = 'y';
@@ -508,7 +519,7 @@
 }
 
 R_API char *r_cons_input(const char *msg) {
-	char *oprompt = r_line_get_prompt (); //r_cons_singleton()->line->prompt);
+	char *oprompt = r_line_get_prompt (); //r_cons_singleton ()->line->prompt);
 	if (!oprompt) {
 		return NULL;
 	}
diff -Nru radare2-2.3.0+dfsg/libr/cons/less.c radare2-2.8.0+dfsg/libr/cons/less.c
--- radare2-2.3.0+dfsg/libr/cons/less.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/less.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2014-2016 - pancake, Judge_Dredd */
+/* radare2 - LGPL - Copyright 2014-2018 - pancake, Judge_Dredd */
 
 #include <r_cons.h>
 #include <r_regex.h>
@@ -15,7 +15,7 @@
 	};
 	int linv[2] = {
 		strlen (inv[0]),
-		strlen(inv[1])
+		strlen (inv[1])
 	};
 	r_strpool_empty (p);
 	r_list_foreach (ml, it, m) {
@@ -23,7 +23,9 @@
 		r_strpool_memcat (p, line + offset, m->rm_so - offset);
 		r_strpool_memcat (p, inv[0], linv[0]);
 		m_len = m->rm_eo - m->rm_so;
-		if (m_len<0) m_len = 0;
+		if (m_len < 0) {
+			m_len = 0;
+		}
 		m_addr = r_str_ndup (line + m->rm_so, m_len);
 		if (m_addr) {
 			/* in case there's a CSI in the middle of this match*/
@@ -68,9 +70,13 @@
 	int i, row = 0;
 	int sidx = 0;
 
-	if (lines_size * sizeof(int) < lines_size) return NULL;
-	lines = malloc (lines_size * sizeof(int));
-	if (!lines) return NULL;
+	if (lines_size * sizeof (int) < lines_size) {
+		return NULL;
+	}
+	lines = malloc (lines_size * sizeof (int));
+	if (!lines) {
+		return NULL;
+	}
 	lines[row++] = 0;
 	for (i = 0; s[i]; i++) {
 		if (row >= lines_size) {
@@ -99,19 +105,27 @@
 
 static int next_match(int from, RList **mla, int lcount){
 	int l;
-	if(from > lcount - 2) return from;
-	for(l = from + 1; l < lcount; l++){
+	if (from > lcount - 2) {
+		return from;
+	}
+	for (l = from + 1; l < lcount; l++){
 		/* if there's at least one match on the line */
-		if(r_list_first(mla[l])) return l;
+		if (r_list_first(mla[l])) {
+			return l;
+		}
 	}
 	return from;
 }
 
 static int prev_match(int from, RList **mla){
 	int l;
-	if(from < 1) return from;
-	for(l = from - 1; l > 0; l--){
-		if(r_list_first(mla[l])) return l;
+	if (from < 1) {
+		return from;
+	}
+	for (l = from - 1; l > 0; l--) {
+		if (r_list_first(mla[l])) {
+			return l;
+		}
 	}
 	return from;
 }
@@ -126,14 +140,14 @@
 		char *clean = strdup (loff);
 		if (!clean) return 0;
 		int *cpos = NULL;
-		int ncpos = r_str_ansi_filter (clean, NULL, &cpos, 0);
+		int ncpos = r_str_ansi_filter (clean, NULL, &cpos, -1);
 		m.rm_eo = slen = strlen (clean);
 		r_list_purge (mla[l]);
 		while (!r_regex_exec (rx, clean, 1, &m, R_REGEX_STARTEND)) {
-			RRegexMatch *ms = R_NEW0 (RRegexMatch);
 			if (!cpos || m.rm_so >= ncpos) {
 				break;
 			}
+			RRegexMatch *ms = R_NEW0 (RRegexMatch);
 			ms->rm_so = cpos[m.rm_so];
 			ms->rm_eo = cpos[m.rm_eo];
 			r_list_append (mla[l], ms);
@@ -272,6 +286,7 @@
 				from = next_match (from, mla, lines_count);
 			}
 			break;
+		case 'N':
 		case 'p': 	/* previous match */
 			if (rx) {
 				from = prev_match(from, mla);
@@ -283,7 +298,7 @@
 		r_list_free (mla[i]);
 	}
 	free (mla);
-	if (rx) r_regex_free (rx);
+	r_regex_free (rx);
 	free (lines);
 	free (p);
 	r_cons_reset_colors ();
@@ -294,7 +309,7 @@
 }
 
 R_API void r_cons_less() {
-	r_cons_less_str (r_cons_singleton ()->buffer, NULL);
+	r_cons_less_str (r_cons_singleton ()->context->buffer, NULL);
 }
 
 #if 0
diff -Nru radare2-2.3.0+dfsg/libr/cons/meson.build radare2-2.8.0+dfsg/libr/cons/meson.build
--- radare2-2.3.0+dfsg/libr/cons/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,28 +1,41 @@
-
-files=[
-'2048.c',
-'canvas.c',
-'canvas_line.c',
-'cons.c',
-# 'dietline.c',
-'editor.c',
-'grep.c',
-'hud.c',
-'input.c',
-'less.c',
-'line.c',
-'output.c',
-'pal.c',
-'pipe.c',
-'rgb.c',
-'utf8.c'
+files = [
+  '2048.c',
+  'canvas.c',
+  'canvas_line.c',
+  'cons.c',
+  # 'dietline.c',
+  'editor.c',
+  'grep.c',
+  'hud.c',
+  'input.c',
+  'less.c',
+  'line.c',
+  'output.c',
+  'pal.c',
+  'pipe.c',
+  'rgb.c',
+  'utf8.c'
 ]
 
 r_cons = library('r_cons', files,
   include_directories: [platform_inc],
-  link_with: [r_util],
-  objects: [
-	libr2sdb.extract_all_objects()
+  dependencies: [r_util_dep, sdb_dep],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_cons_dep = declare_dependency(link_with: r_cons,
+                                include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_cons],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_cons',
+  filebase: 'r_cons',
+  requires: [
+    'r_util'
   ],
-  install: true
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/cons/output.c radare2-2.8.0+dfsg/libr/cons/output.c
--- radare2-2.3.0+dfsg/libr/cons/output.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/output.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,7 +1,7 @@
 /* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_cons.h>
-#define I r_cons_singleton()
+#define I r_cons_singleton ()
 
 #if __WINDOWS__
 static void fill_tail (int cols, int lines) {
diff -Nru radare2-2.3.0+dfsg/libr/cons/pal.c radare2-2.8.0+dfsg/libr/cons/pal.c
--- radare2-2.3.0+dfsg/libr/cons/pal.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/pal.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,299 +1,373 @@
-/* radare - LGPL - Copyright 2013-2017 - pancake, sghctoma */
+/* radare - LGPL - Copyright 2013-2018 - pancake, sghctoma, xarkes */
 
 #include <r_cons.h>
 
-R_API void r_cons_pal_free () {
-	int i;
-	RCons *cons = r_cons_singleton ();
-	for (i = 0; i < R_CONS_PALETTE_LIST_SIZE; i++) {
-		if (cons->pal.list[i]) R_FREE (cons->pal.list[i]);
-	}
-}
+#define RCOLOR_AT(i) (RColor *) (((ut8 *) &(r_cons_singleton ()->cpal)) + keys[i].coff)
+#define COLOR_AT(i) (char **) (((ut8 *) &(r_cons_singleton ()->pal)) + keys[i].off)
 
-R_API void r_cons_pal_init (const char *foo) {
-	RCons *cons = r_cons_singleton ();
-	memset (&cons->pal, 0, sizeof (cons->pal));
-	cons->pal.rainbow = NULL;
-	cons->pal.rainbow_sz = 0;
-	cons->pal.b0x00 = Color_GREEN;
-	cons->pal.b0x7f = Color_CYAN;
-	cons->pal.b0xff = Color_RED;
-	cons->pal.args = Color_YELLOW;
-	cons->pal.bin = Color_CYAN;
-	cons->pal.btext = Color_YELLOW;
-	cons->pal.call = Color_BGREEN;
-	cons->pal.cjmp = Color_GREEN;
-	cons->pal.cmp = Color_CYAN;
-	cons->pal.comment = Color_RED;
-	cons->pal.usercomment = Color_WHITE;
-	cons->pal.creg = Color_CYAN;
-	cons->pal.flag = Color_CYAN;
-	cons->pal.fline = Color_CYAN;
-	cons->pal.floc = Color_CYAN;
-	cons->pal.flow = Color_CYAN;
-	cons->pal.flow2 = Color_BLUE;
-	cons->pal.fname = Color_RED;
-	cons->pal.help = Color_GREEN;
-	cons->pal.input = Color_WHITE;
-	cons->pal.invalid = Color_BRED;
-	cons->pal.jmp = Color_GREEN;
-	cons->pal.label = Color_CYAN;
-	cons->pal.math = Color_YELLOW;
-	cons->pal.mov = Color_WHITE;
-	cons->pal.nop = Color_BLUE;
-	cons->pal.num = Color_YELLOW;
-	cons->pal.offset = Color_GREEN;
-	cons->pal.other = Color_WHITE;
-	cons->pal.pop = Color_BMAGENTA;
-	cons->pal.prompt = Color_YELLOW;
-	cons->pal.push = Color_MAGENTA;
-	cons->pal.crypto = Color_BGBLUE;
-	cons->pal.reg = Color_CYAN;
-	cons->pal.reset = Color_RESET;
-	cons->pal.ret = Color_RED;
-	cons->pal.swi = Color_MAGENTA;
-	cons->pal.trap = Color_BRED;
-
-	cons->pal.ai_read = Color_GREEN;
-	cons->pal.ai_write = Color_BLUE;
-	cons->pal.ai_exec = Color_RED;
-	cons->pal.ai_seq = Color_MAGENTA;
-	cons->pal.ai_ascii = Color_YELLOW;
-
-	cons->pal.gui_cflow = Color_YELLOW;
-	cons->pal.gui_dataoffset = Color_YELLOW;
-	cons->pal.gui_background = Color_BLACK;
-	cons->pal.gui_alt_background = Color_WHITE;
-	cons->pal.gui_border = Color_BLACK;
-	cons->pal.highlight = Color_BGRED;
-
-	cons->pal.graph_box = Color_RESET;
-	cons->pal.graph_box2 = Color_BLUE;
-	cons->pal.graph_box3 = Color_MAGENTA;
-	cons->pal.graph_box4 = Color_GRAY;
-	cons->pal.graph_true = Color_GREEN;
-	cons->pal.graph_false = Color_RED;
-	cons->pal.graph_trufae = Color_BLUE; // single jump
-	cons->pal.graph_traced = Color_YELLOW;
-	cons->pal.graph_current = Color_BLUE;
+static struct {
+	const char *name;
+	int off;  // RConsPrintablePalette offset
+	int coff; // RConsPalette offset
+} keys[] = {
+	{ "comment", r_offsetof (RConsPrintablePalette, comment), r_offsetof (RConsPalette, comment) },
+	{ "usrcmt", r_offsetof (RConsPrintablePalette, usercomment), r_offsetof (RConsPalette, usercomment) },
+	{ "args", r_offsetof (RConsPrintablePalette, args), r_offsetof (RConsPalette, args) },
+	{ "fname", r_offsetof (RConsPrintablePalette, fname), r_offsetof (RConsPalette, fname) },
+	{ "floc", r_offsetof (RConsPrintablePalette, floc), r_offsetof (RConsPalette, floc) },
+	{ "fline", r_offsetof (RConsPrintablePalette, fline), r_offsetof (RConsPalette, fline) },
+	{ "flag", r_offsetof (RConsPrintablePalette, flag), r_offsetof (RConsPalette, flag) },
+	{ "label", r_offsetof (RConsPrintablePalette, label), r_offsetof (RConsPalette, label) },
+	{ "help", r_offsetof (RConsPrintablePalette, help), r_offsetof (RConsPalette, help) },
+	{ "flow", r_offsetof (RConsPrintablePalette, flow), r_offsetof (RConsPalette, flow) },
+	{ "flow2", r_offsetof (RConsPrintablePalette, flow2), r_offsetof (RConsPalette, flow2) },
+	{ "prompt", r_offsetof (RConsPrintablePalette, prompt), r_offsetof (RConsPalette, prompt) },
+	{ "offset", r_offsetof (RConsPrintablePalette, offset), r_offsetof (RConsPalette, offset) },
+	{ "input", r_offsetof (RConsPrintablePalette, input), r_offsetof (RConsPalette, input) },
+	{ "invalid", r_offsetof (RConsPrintablePalette, invalid), r_offsetof (RConsPalette, invalid) },
+	{ "other", r_offsetof (RConsPrintablePalette, other), r_offsetof (RConsPalette, other) },
+	{ "b0x00", r_offsetof (RConsPrintablePalette, b0x00), r_offsetof (RConsPalette, b0x00) },
+	{ "b0x7f", r_offsetof (RConsPrintablePalette, b0x7f), r_offsetof (RConsPalette, b0x7f) },
+	{ "b0xff", r_offsetof (RConsPrintablePalette, b0xff), r_offsetof (RConsPalette, b0xff) },
+	{ "math", r_offsetof (RConsPrintablePalette, math), r_offsetof (RConsPalette, math) },
+	{ "bin", r_offsetof (RConsPrintablePalette, bin), r_offsetof (RConsPalette, bin) },
+	{ "btext", r_offsetof (RConsPrintablePalette, btext), r_offsetof (RConsPalette, btext) },
+	{ "push",  r_offsetof (RConsPrintablePalette, push), r_offsetof (RConsPalette, push) },
+	{ "pop", r_offsetof (RConsPrintablePalette, pop), r_offsetof (RConsPalette, pop) },
+	{ "crypto", r_offsetof (RConsPrintablePalette, crypto), r_offsetof (RConsPalette, crypto) },
+	{ "jmp", r_offsetof (RConsPrintablePalette, jmp), r_offsetof (RConsPalette, jmp) },
+	{ "cjmp", r_offsetof (RConsPrintablePalette, cjmp), r_offsetof (RConsPalette, cjmp) },
+	{ "call", r_offsetof (RConsPrintablePalette, call), r_offsetof (RConsPalette, call) },
+	{ "nop", r_offsetof (RConsPrintablePalette, nop), r_offsetof (RConsPalette, nop) },
+	{ "ret", r_offsetof (RConsPrintablePalette, ret), r_offsetof (RConsPalette, ret) },
+	{ "trap", r_offsetof (RConsPrintablePalette, trap), r_offsetof (RConsPalette, trap) },
+	{ "swi", r_offsetof (RConsPrintablePalette, swi), r_offsetof (RConsPalette, swi) },
+	{ "cmp", r_offsetof (RConsPrintablePalette, cmp), r_offsetof (RConsPalette, cmp) },
+	{ "reg", r_offsetof (RConsPrintablePalette, reg), r_offsetof (RConsPalette, reg) },
+	{ "creg", r_offsetof (RConsPrintablePalette, creg), r_offsetof (RConsPalette, creg) },
+	{ "num", r_offsetof (RConsPrintablePalette, num), r_offsetof (RConsPalette, num) },
+	{ "mov", r_offsetof (RConsPrintablePalette, mov), r_offsetof (RConsPalette, mov) },
+	{ "func_var", r_offsetof (RConsPrintablePalette, func_var), r_offsetof (RConsPalette, func_var) },
+	{ "func_var_type", r_offsetof (RConsPrintablePalette, func_var_type), r_offsetof (RConsPalette, func_var_type) },
+	{ "func_var_addr", r_offsetof (RConsPrintablePalette, func_var_addr), r_offsetof (RConsPalette, func_var_addr) },
+	{ "widget_bg", r_offsetof (RConsPrintablePalette, widget_bg), r_offsetof (RConsPalette, widget_bg) },
+	{ "widget_sel", r_offsetof (RConsPrintablePalette, widget_sel), r_offsetof (RConsPalette, widget_sel) },
+
+	{ "ai.read", r_offsetof (RConsPrintablePalette, ai_read), r_offsetof (RConsPalette, ai_read) },
+	{ "ai.write", r_offsetof (RConsPrintablePalette, ai_write), r_offsetof (RConsPalette, ai_write) },
+	{ "ai.exec", r_offsetof (RConsPrintablePalette, ai_exec), r_offsetof (RConsPalette, ai_exec) },
+	{ "ai.seq", r_offsetof (RConsPrintablePalette, ai_seq), r_offsetof (RConsPalette, ai_seq) },
+	{ "ai.ascii", r_offsetof (RConsPrintablePalette, ai_ascii), r_offsetof (RConsPalette, ai_ascii) },
+
+
+	{ "graph.box", r_offsetof (RConsPrintablePalette, graph_box), r_offsetof (RConsPalette, graph_box) },
+	{ "graph.box2", r_offsetof (RConsPrintablePalette, graph_box2), r_offsetof (RConsPalette, graph_box2) },
+	{ "graph.box3", r_offsetof (RConsPrintablePalette, graph_box3), r_offsetof (RConsPalette, graph_box3) },
+	{ "graph.box4", r_offsetof (RConsPrintablePalette, graph_box4), r_offsetof (RConsPalette, graph_box4) },
+	{ "graph.true", r_offsetof (RConsPrintablePalette, graph_true), r_offsetof (RConsPalette, graph_true) },
+	{ "graph.false", r_offsetof (RConsPrintablePalette, graph_false), r_offsetof (RConsPalette, graph_false) },
+	{ "graph.trufae", r_offsetof (RConsPrintablePalette, graph_trufae), r_offsetof (RConsPalette, graph_trufae) },
+	{ "graph.current", r_offsetof (RConsPrintablePalette, graph_current), r_offsetof (RConsPalette, graph_current) },
+	{ "graph.traced", r_offsetof (RConsPrintablePalette, graph_traced), r_offsetof (RConsPalette, graph_traced) },
+
+	{ "gui.cflow", r_offsetof (RConsPrintablePalette, gui_cflow), r_offsetof (RConsPalette, gui_cflow) },
+	{ "gui.dataoffset", r_offsetof (RConsPrintablePalette, gui_dataoffset), r_offsetof (RConsPalette, gui_dataoffset) },
+	{ "gui.background", r_offsetof (RConsPrintablePalette, gui_background), r_offsetof (RConsPalette, gui_background) },
+	{ "gui.alt_background", r_offsetof (RConsPrintablePalette, gui_alt_background), r_offsetof (RConsPalette, gui_alt_background) },
+	{ "gui.border", r_offsetof (RConsPrintablePalette, gui_border), r_offsetof (RConsPalette, gui_border) },
+	{ "wordhl", r_offsetof (RConsPrintablePalette, wordhl), r_offsetof (RConsPalette, wordhl) },
+	{ "linehl", r_offsetof (RConsPrintablePalette, linehl), r_offsetof (RConsPalette, linehl) },
 
-	r_cons_pal_free ();
-	cons->pal.list[0] = strdup (Color_RED);
-	cons->pal.list[1] = strdup (Color_YELLOW);
-	cons->pal.list[2] = strdup (Color_BGREEN);
-	cons->pal.list[3] = strdup (Color_CYAN);
-	cons->pal.list[4] = strdup (Color_MAGENTA);
-	cons->pal.list[5] = strdup (Color_GRAY);
-	cons->pal.list[6] = strdup (Color_BLUE);
-	cons->pal.list[7] = strdup (Color_GREEN);
 
-	r_cons_pal_update_event();
-}
+	{ NULL, 0, 0 }
+};
+static const int keys_len = sizeof (keys) / sizeof (keys[0]) - 1;
 
 struct {
 	const char *name;
+	RColor rcolor;
 	const char *code;
 	const char *bgcode;
 } colors[] = {
-	{ "black",    Color_BLACK,    Color_BGBLACK },
-	{ "red",      Color_RED,      Color_BGRED },
-	{ "bred",     Color_BRED,     Color_BGRED },
-	{ "white",    Color_WHITE,    Color_BGWHITE },
-	{ "green",    Color_GREEN,    Color_BGGREEN },
-	{ "bgreen",   Color_BGREEN,   Color_BGGREEN },
-	{ "magenta",  Color_MAGENTA,  Color_BGMAGENTA },
-	{ "bmagenta", Color_BMAGENTA, Color_BGMAGENTA },
-	{ "yellow",   Color_YELLOW,   Color_BGYELLOW },
-	{ "byellow",  Color_BYELLOW,  Color_BGBYELLOW },
-	{ "cyan",     Color_CYAN,     Color_BGCYAN },
-	{ "bcyan",    Color_BCYAN,    Color_BGCYAN },
-	{ "blue",     Color_BLUE,     Color_BGBLUE },
-	{ "bblue",    Color_BBLUE,    Color_BGBLUE },
-	{ "gray",     Color_GRAY,     Color_BGGRAY },
-	{ "bgray",    Color_BGRAY,    Color_BGGRAY },
-	{ "none",     Color_RESET,    Color_RESET },
-	{ NULL, NULL, NULL }
+	{ "black",    RColor_BLACK,    Color_BLACK,    Color_BGBLACK },
+	{ "red",      RColor_RED,      Color_RED,      Color_BGRED },
+	{ "white",    RColor_WHITE,    Color_WHITE,    Color_BGWHITE },
+	{ "green",    RColor_GREEN,    Color_GREEN,    Color_BGGREEN },
+	{ "magenta",  RColor_MAGENTA,  Color_MAGENTA,  Color_BGMAGENTA },
+	{ "yellow",   RColor_YELLOW,   Color_YELLOW,   Color_BGYELLOW },
+	{ "cyan",     RColor_CYAN,     Color_CYAN,     Color_BGCYAN },
+	{ "blue",     RColor_BLUE,     Color_BLUE,     Color_BGBLUE },
+	{ "gray",     RColor_GRAY,     Color_GRAY,     Color_BGGRAY },
+	{ "none",     RColor_NULL,     Color_RESET,    Color_RESET },
+	{ NULL, RColor_NULL, NULL, NULL }
 };
 
-static inline ut8 rgbnum (const char ch1, const char ch2) {
+static inline ut8 rgbnum(const char ch1, const char ch2) {
 	ut8 r = 0, r2 = 0;
 	r_hex_to_byte (&r, ch1);
 	r_hex_to_byte (&r2, ch2);
 	return r << 4 | r2;
 }
 
-R_API void r_cons_pal_random () {
+R_API void r_cons_pal_init() {
 	RCons *cons = r_cons_singleton ();
-	ut8 r, g, b;
-	char val[32];
-	const char *k;
+
+	memset (&cons->cpal, 0, sizeof (cons->cpal));
+	memset (&cons->pal, 0, sizeof (cons->pal));
+
+	cons->cpal.b0x00              = (RColor) RColor_GREEN;
+	cons->cpal.b0x7f              = (RColor) RColor_CYAN;
+	cons->cpal.b0xff              = (RColor) RColor_RED;
+	cons->cpal.args               = (RColor) RColor_YELLOW;
+	cons->cpal.bin                = (RColor) RColor_CYAN;
+	cons->cpal.btext              = (RColor) RColor_YELLOW;
+	cons->cpal.call               = (RColor) RColor_GREEN;
+	cons->cpal.call.attr          = R_CONS_ATTR_BOLD;
+	cons->cpal.cjmp               = (RColor) RColor_GREEN;
+	cons->cpal.cmp                = (RColor) RColor_CYAN;
+	cons->cpal.comment            = (RColor) RColor_RED;
+	cons->cpal.usercomment        = (RColor) RColor_WHITE;
+	cons->cpal.creg               = (RColor) RColor_CYAN;
+	cons->cpal.flag               = (RColor) RColor_CYAN;
+	cons->cpal.fline              = (RColor) RColor_CYAN;
+	cons->cpal.floc               = (RColor) RColor_CYAN;
+	cons->cpal.flow               = (RColor) RColor_CYAN;
+	cons->cpal.flow2              = (RColor) RColor_BLUE;
+	cons->cpal.fname              = (RColor) RColor_RED;
+	cons->cpal.help               = (RColor) RColor_GREEN;
+	cons->cpal.input              = (RColor) RColor_WHITE;
+	cons->cpal.invalid            = (RColor) RColor_RED;
+	cons->cpal.invalid.attr       = R_CONS_ATTR_BOLD;
+	cons->cpal.jmp                = (RColor) RColor_GREEN;
+	cons->cpal.label              = (RColor) RColor_CYAN;
+	cons->cpal.math               = (RColor) RColor_YELLOW;
+	cons->cpal.mov                = (RColor) RColor_WHITE;
+	cons->cpal.nop                = (RColor) RColor_BLUE;
+	cons->cpal.num                = (RColor) RColor_YELLOW;
+	cons->cpal.offset             = (RColor) RColor_GREEN;
+	cons->cpal.other              = (RColor) RColor_WHITE;
+	cons->cpal.pop                = (RColor) RColor_MAGENTA;
+	cons->cpal.pop.attr           = R_CONS_ATTR_BOLD;
+	cons->cpal.prompt             = (RColor) RColor_YELLOW;
+	cons->cpal.push               = (RColor) RColor_MAGENTA;
+	cons->cpal.crypto             = (RColor) RColor_BGBLUE;
+	cons->cpal.reg                = (RColor) RColor_CYAN;
+	cons->cpal.ret                = (RColor) RColor_RED;
+	cons->cpal.swi                = (RColor) RColor_MAGENTA;
+	cons->cpal.trap               = (RColor) RColor_RED;
+	cons->cpal.trap.attr          = R_CONS_ATTR_BOLD;
+
+	cons->cpal.ai_read            = (RColor) RColor_GREEN;
+	cons->cpal.ai_write           = (RColor) RColor_BLUE;
+	cons->cpal.ai_exec            = (RColor) RColor_RED;
+	cons->cpal.ai_seq             = (RColor) RColor_MAGENTA;
+	cons->cpal.ai_ascii           = (RColor) RColor_YELLOW;
+
+	cons->cpal.gui_cflow          = (RColor) RColor_YELLOW;
+	cons->cpal.gui_dataoffset     = (RColor) RColor_YELLOW;
+	cons->cpal.gui_background     = (RColor) RColor_BLACK;
+	cons->cpal.gui_alt_background = (RColor) RColor_WHITE;
+	cons->cpal.gui_border         = (RColor) RColor_BLACK;
+	cons->cpal.wordhl             = (RColor) RColor_BGRED;
+	cons->cpal.linehl             = (RColor) RCOLOR (ALPHA_BG, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00);
+
+	cons->cpal.func_var           = (RColor) RColor_WHITE;
+	cons->cpal.func_var_type      = (RColor) RColor_BLUE;
+	cons->cpal.func_var_addr      = (RColor) RColor_CYAN;
+
+	cons->cpal.widget_bg          = (RColor) RCOLOR (ALPHA_BG, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00);
+	cons->cpal.widget_sel         = (RColor) RColor_BGRED;
+
+	cons->cpal.graph_box          = (RColor) RColor_NULL;
+	cons->cpal.graph_box2         = (RColor) RColor_BLUE;
+	cons->cpal.graph_box3         = (RColor) RColor_MAGENTA;
+	cons->cpal.graph_box4         = (RColor) RColor_GRAY;
+	cons->cpal.graph_true         = (RColor) RColor_GREEN;
+	cons->cpal.graph_false        = (RColor) RColor_RED;
+	cons->cpal.graph_trufae       = (RColor) RColor_BLUE; // single jump
+	cons->cpal.graph_traced       = (RColor) RColor_YELLOW;
+	cons->cpal.graph_current      = (RColor) RColor_BLUE;
+
+	cons->pal.rainbow = NULL;
+	cons->pal.rainbow_sz = 0;
+	r_cons_pal_free ();
+	cons->pal.reset = Color_RESET; // reset is not user accessible, const char* is ok
+
+	r_cons_pal_update_event ();
+}
+
+R_API void r_cons_pal_free() {
 	int i;
-	for (i = 0; ; i++) {
-		k = r_cons_pal_get_i (i);
-		if (!k) break;
-		if (cons->truecolor > 0) {
-			r = r_num_rand (0xff);
-			g = r_num_rand (0xff);
-			b = r_num_rand (0xff);
-			sprintf (val, "rgb:%02x%02x%02x", r, g, b);
-			r_cons_pal_set (k, val);
-		} else {
-			char *s = r_cons_color_random_string (0);
-			if (s) {
-				r_cons_pal_set (k, s);
-				free (s);
-			} else {
-				r_cons_pal_set (k, "red");
-			}
+	for (i = 0; keys[i].name; i++) {
+		char **color = COLOR_AT (i);
+		if (color && *color) {
+			R_FREE (*color);
 		}
 	}
-	for (i = 0; i < R_CONS_PALETTE_LIST_SIZE; i++) {
-		if (cons->pal.list[i]) R_FREE (cons->pal.list[i]);
-		cons->pal.list[i] = r_cons_color_random (0);
+	r_cons_rainbow_free ();
+}
+
+R_API void r_cons_pal_random() {
+	int i;
+	RColor *rcolor;
+	for (i = 0; keys[i].name; i++) {
+		rcolor = RCOLOR_AT (i);
+		*rcolor = r_cons_color_random (ALPHA_FG);
 	}
-	r_cons_pal_update_event();
+	r_cons_pal_update_event ();
 }
 
-R_API char *r_cons_pal_parse (const char *str) {
+/* Return NULL if outcol is given */
+R_API char *r_cons_pal_parse(const char *str, RColor *outcol) {
 	int i;
-	ut8 r, g, b;
+	RColor rcolor = (RColor) RColor_BLACK;
+	char *fgcolor;
+	char *bgcolor;
+	char *attr = NULL;
 	char out[128];
-	char *s = strdup (str);
-	if (!s) {
+	if (!str) {
 		return NULL;
 	}
-	char *p = strchr (s + 1, ' ');
+	fgcolor = strdup (str);
+	if (!fgcolor) {
+		return NULL;
+	}
+	bgcolor = strchr (fgcolor + 1, ' ');
 	out[0] = 0;
-	if (p) *p++ = 0;
-	if (!strcmp (str, "random")) {
-		free (s);
-		return r_cons_color_random (0);
-	}
-	if (!strncmp (s, "#", 1)) {
-		if (strlen (s) == 7) {
-#define C(x) (x >> 4)
-			int R, G, B;
-			sscanf (s, "%02x%02x%02x", &R, &G, &B);
-			r_cons_rgb_str (out, C(R), C(G), C(B), 0);
+	if (bgcolor) {
+		*bgcolor++ = '\0';
+		attr = strchr (bgcolor, ' ');
+		if (attr) {
+			*attr++ = '\0';
+		}
+	}
+
+	// Handle first color (fgcolor)
+	if (!strcmp (fgcolor, "random")) {
+		rcolor = r_cons_color_random (ALPHA_FG);
+		if (!outcol) {
+			r_cons_rgb_str (out, sizeof (out), &rcolor);
+		}
+	} else if (!strncmp (fgcolor, "#", 1)) { // "#00ff00" HTML format
+		if (strlen (fgcolor) == 7) {
+			i = sscanf (fgcolor + 1, "%02hhx%02hhx%02hhx", &rcolor.r, &rcolor.g, &rcolor.b);
+			if (i != 3) {
+				eprintf ("Error while parsing HTML color: %s\n", fgcolor);
+			}
+			if (!outcol) {
+				r_cons_rgb_str (out, sizeof (out), &rcolor);
+			}
 		} else {
 			eprintf ("Invalid html color code\n");
 		}
-	} else if (!strncmp (s, "rgb:", 4)) {
-		if (strlen (s) == 7) {
-			r = rgbnum (s[4], '0');
-			g = rgbnum (s[5], '0');
-			b = rgbnum (s[6], '0');
-			r_cons_rgb_str (out, r, g, b, 0);
-		} else if (strlen (s) == 10) {
-			r = rgbnum (s[4], s[5]);
-			g = rgbnum (s[6], s[7]);
-			b = rgbnum (s[8], s[9]);
-			r_cons_rgb_str (out, r, g, b, 0);
-		}
-	}
-	if (p && !strncmp (p, "rgb:", 4)) {
-		if (strlen (p) == 7) {
-			r = rgbnum (p[4], '0');
-			g = rgbnum (p[5], '0');
-			b = rgbnum (p[6], '0');
-			r_cons_rgb_str (out + strlen (out), r, g, b, 1);
-		} else if (strlen (p) == 10) {
-			r = rgbnum (p[4], p[5]);
-			g = rgbnum (p[6], p[7]);
-			b = rgbnum (p[8], p[9]);
-			r_cons_rgb_str (out + strlen (out), r, g, b, 1);
+	} else if (!strncmp (fgcolor, "rgb:", 4)) { // "rgb:123" rgb format
+		if (strlen (fgcolor) == 7) {
+			rcolor.r = rgbnum (fgcolor[4], '0');
+			rcolor.g = rgbnum (fgcolor[5], '0');
+			rcolor.b = rgbnum (fgcolor[6], '0');
+			if (!outcol) {
+				r_cons_rgb_str (out, sizeof (out), &rcolor);
+			}
+		} else if (strlen (fgcolor) == 10) {
+			rcolor.r = rgbnum (fgcolor[4], fgcolor[5]);
+			rcolor.g = rgbnum (fgcolor[6], fgcolor[7]);
+			rcolor.b = rgbnum (fgcolor[8], fgcolor[9]);
+			if (!outcol) {
+				r_cons_rgb_str (out, sizeof (out), &rcolor);
+			}
+		}
+	}
+	// Handle second color (bgcolor)
+	if (bgcolor && !strncmp (bgcolor, "rgb:", 4)) { // "rgb:123" rgb format
+		if (strlen (bgcolor) == 7) {
+			rcolor.a |= ALPHA_BG;
+			rcolor.r2 = rgbnum (bgcolor[4], '0');
+			rcolor.g2 = rgbnum (bgcolor[5], '0');
+			rcolor.b2 = rgbnum (bgcolor[6], '0');
+			if (!outcol) {
+				size_t len = strlen (out);
+				r_cons_rgb_str (out + len, sizeof (out) - len, &rcolor);
+			}
+		} else if (strlen (bgcolor) == 10) {
+			rcolor.a |= ALPHA_BG;
+			rcolor.r2 = rgbnum (bgcolor[4], bgcolor[5]);
+			rcolor.g2 = rgbnum (bgcolor[6], bgcolor[7]);
+			rcolor.b2 = rgbnum (bgcolor[8], bgcolor[9]);
+			if (!outcol) {
+				size_t len = strlen (out);
+				r_cons_rgb_str (out + len, sizeof (out) - len, &rcolor);
+			}
 		}
 	}
+	// No suitable format, checking if colors are named
 	for (i = 0; colors[i].name; i++) {
-		if (!strcmp (s, colors[i].name)) {
-			strncat (out, colors[i].code,
-				sizeof (out) - strlen (out) - 1);
+		if (!strcmp (fgcolor, colors[i].name)) {
+			rcolor.r = colors[i].rcolor.r;
+			rcolor.g = colors[i].rcolor.g;
+			rcolor.b = colors[i].rcolor.b;
+			if (!outcol) {
+				strncat (out, colors[i].code,
+					sizeof (out) - strlen (out) - 1);
+			}
 		}
-		if (p && !strcmp (p, colors[i].name)) {
-			strncat (out, colors[i].bgcode,
-				sizeof (out) - strlen (out) - 1);
+		if (bgcolor && !strcmp (bgcolor, colors[i].name)) {
+			rcolor.a |= ALPHA_BG;
+			rcolor.r2 = colors[i].rcolor.r; // Initial color doesn't
+			rcolor.g2 = colors[i].rcolor.g; // have r2, g2, b2
+			rcolor.b2 = colors[i].rcolor.b;
+			if (!outcol) {
+				strncat (out, colors[i].bgcode,
+					sizeof (out) - strlen (out) - 1);
+			}
 		}
 	}
-	free (s);
-	return *out ? strdup (out) : NULL;
+	if (attr) {
+		// Parse extra attributes.
+		const char *p = attr;
+		while (p) {
+			if (!strncmp(p, "bold", 4)) {
+				rcolor.attr |= R_CONS_ATTR_BOLD;
+			} else if (!strncmp(p, "dim", 3)) {
+				rcolor.attr |= 1u << 2;
+			} else if (!strncmp(p, "italic", 6)) {
+				rcolor.attr |= 1u << 3;
+			} else if (!strncmp(p, "underline", 9)) {
+				rcolor.attr |= 1u << 4;
+			} else if (!strncmp(p, "blink", 5)) {
+				rcolor.attr |= 1u << 5;
+			} else {
+				eprintf ("Failed to parse terminal attributes: %s\n", p);
+				break;
+			}
+			p = strchr (p, ' ');
+			if (p) {
+				p++;
+			}
+		}
+	}
+	if (outcol) {
+		if (outcol->a == ALPHA_BG && !bgcolor) {
+			rcolor.a = ALPHA_BG;
+		}
+		*outcol = rcolor;
+	}
+	free (fgcolor);
+	return (*out && !outcol) ? strdup (out) : NULL;
 }
 
-static struct {
-	const char *name;
-	int off;
-} keys[] = {
-	{ "comment", r_offsetof (RConsPalette, comment) },
-	{ "usrcmt", r_offsetof (RConsPalette, usercomment) },
-	{ "args", r_offsetof (RConsPalette, args) },
-	{ "fname", r_offsetof (RConsPalette, fname) },
-	{ "floc", r_offsetof (RConsPalette, floc) },
-	{ "fline", r_offsetof (RConsPalette, fline) },
-	{ "flag", r_offsetof (RConsPalette, flag) },
-	{ "label", r_offsetof (RConsPalette, label) },
-	{ "help", r_offsetof (RConsPalette, help) },
-	{ "flow", r_offsetof (RConsPalette, flow) },
-	{ "flow2", r_offsetof (RConsPalette, flow2) },
-	{ "prompt", r_offsetof (RConsPalette, prompt) },
-	{ "offset", r_offsetof (RConsPalette, offset) },
-	{ "input", r_offsetof (RConsPalette, input) },
-	{ "invalid", r_offsetof (RConsPalette, invalid) },
-	{ "other", r_offsetof (RConsPalette, other) },
-	{ "b0x00", r_offsetof (RConsPalette, b0x00) },
-	{ "b0x7f", r_offsetof (RConsPalette, b0x7f) },
-	{ "b0xff", r_offsetof (RConsPalette, b0xff) },
-	{ "math", r_offsetof (RConsPalette, math) },
-	{ "bin", r_offsetof (RConsPalette, bin) },
-	{ "btext", r_offsetof (RConsPalette, btext) },
-	{ "push",  r_offsetof (RConsPalette, push) },
-	{ "pop", r_offsetof (RConsPalette, pop) },
-	{ "crypto", r_offsetof (RConsPalette, crypto) },
-	{ "jmp", r_offsetof (RConsPalette, jmp) },
-	{ "cjmp", r_offsetof (RConsPalette, cjmp) },
-	{ "call", r_offsetof (RConsPalette, call) },
-	{ "nop", r_offsetof (RConsPalette, nop) },
-	{ "ret", r_offsetof (RConsPalette, ret) },
-	{ "trap", r_offsetof (RConsPalette, trap) },
-	{ "swi", r_offsetof (RConsPalette, swi) },
-	{ "cmp", r_offsetof (RConsPalette, cmp) },
-	{ "reg", r_offsetof (RConsPalette, reg) },
-	{ "creg", r_offsetof (RConsPalette, creg) },
-	{ "num", r_offsetof (RConsPalette, num) },
-	{ "mov", r_offsetof (RConsPalette, mov) },
-
-	{ "ai.read", r_offsetof (RConsPalette, ai_read) },
-	{ "ai.write", r_offsetof (RConsPalette, ai_write) },
-	{ "ai.exec", r_offsetof (RConsPalette, ai_exec) },
-	{ "ai.seq", r_offsetof (RConsPalette, ai_seq) },
-	{ "ai.ascii", r_offsetof (RConsPalette, ai_ascii) },
-
-	{ "graph.box", r_offsetof (RConsPalette, graph_box) },
-	{ "graph.box2", r_offsetof (RConsPalette, graph_box2) },
-	{ "graph.box3", r_offsetof (RConsPalette, graph_box3) },
-	{ "graph.box4", r_offsetof (RConsPalette, graph_box4) },
-	{ "graph.true", r_offsetof (RConsPalette, graph_true) },
-	{ "graph.false", r_offsetof (RConsPalette, graph_false) },
-	{ "graph.trufae", r_offsetof (RConsPalette, graph_trufae) },
-	{ "graph.current", r_offsetof (RConsPalette, graph_current) },
-	{ "graph.traced", r_offsetof (RConsPalette, graph_traced) },
-
-	{ "gui.cflow", r_offsetof (RConsPalette, gui_cflow) },
-	{ "gui.dataoffset", r_offsetof (RConsPalette, gui_dataoffset) },
-	{ "gui.background", r_offsetof (RConsPalette, gui_background) },
-	{ "gui.alt_background", r_offsetof (RConsPalette, gui_alt_background) },
-	{ "gui.border", r_offsetof (RConsPalette, gui_border) },
-	{ "highlight", r_offsetof (RConsPalette, highlight) },
-	{ NULL, 0 }
-};
-
-static void r_cons_pal_show_gs () {
+static void r_cons_pal_show_gs() {
 	int i, n;
 	r_cons_print ("\nGreyscale:\n");
+	RColor rcolor = RColor_BLACK;
 	for (i = 0x08, n = 0;  i <= 0xee; i += 0xa) {
 		char fg[32], bg[32];
+		rcolor.r = i;
+		rcolor.g = i;
+		rcolor.b = i;
 
 		if (i < 0x76) strcpy (fg, Color_WHITE);
 		else strcpy (fg, Color_BLACK);
-		r_cons_rgb_str (bg, i, i, i, 1);
+		r_cons_rgb_str (bg, sizeof (bg), &rcolor);
 		r_cons_printf ("%s%s rgb:%02x%02x%02x "Color_RESET,
 			fg, bg, i, i, i);
 		if (n++ == 5) {
@@ -303,55 +377,55 @@
 	}
 }
 
-static void r_cons_pal_show_256 () {
-	int r, g, b;
+static void r_cons_pal_show_256() {
+	RColor rc = RColor_BLACK;
 	r_cons_print ("\n\nXTerm colors:\n");
+	int r = 0;
+	int g = 0;
+	int b = 0;
 	for (r = 0x00; r <= 0xff; r += 0x28) {
-		if (r == 0x28) {
-			r = 0x5f;
+		rc.r = r;
+		if (rc.r == 0x28) {
+			rc.r = 0x5f;
 		}
 		for (b = 0x00; b <= 0xff; b += 0x28) {
-			if (b == 0x28) {
-				b = 0x5f;
+			rc.b = b;
+			if (rc.b == 0x28) {
+				rc.b = 0x5f;
 			}
 			for (g = 0x00; g <= 0xff; g += 0x28) {
-				char fg[32], bg[32];
-				if (g == 0x28) {
-					g = 0x5f;
-				}
-				if ((r <= 0x5f) && (g <= 0x5f)) {
-					strcpy (fg, Color_WHITE);
-				} else {
-					strcpy (fg, Color_BLACK);
+				rc.g = g;
+				char bg[32];
+				if (rc.g == 0x28) {
+					rc.g = 0x5f;
 				}
-				r_cons_rgb_str (bg, r, g, b, 1);
+				const char *fg = ((rc.r <= 0x5f) && (rc.g <= 0x5f)) ? Color_WHITE: Color_BLACK;
+				r_cons_rgb_str (bg, sizeof (bg), &rc);
 				r_cons_printf ("%s%s rgb:%02x%02x%02x "
-					Color_RESET, fg, bg, r, g, b);
-				if (g == 0xff) {
-					r_cons_newline ();
-				}
+					Color_RESET, fg, bg, rc.r, rc.g, rc.b);
 			}
+			r_cons_newline ();
 		}
 	}
 }
 
-static void r_cons_pal_show_rgb () {
+static void r_cons_pal_show_rgb() {
 	const int inc = 3;
 	int i, j, k, n = 0;
+	RColor rc = RColor_BLACK;
 	r_cons_print ("\n\nRGB:\n");
 	for (i = n = 0; i <= 0xf; i += inc) {
 		for (k = 0; k <= 0xf; k += inc) {
 			for (j = 0; j <= 0xf; j += inc) {
 				char fg[32], bg[32];
-				int r = i * 16;
-				int g = j * 16;
-				int b = k * 16;
+				rc.r = i * 16;
+				rc.g = j * 16;
+				rc.b = k * 16;
 				strcpy (fg, ((i < 6) && (j < 5))
 					? Color_WHITE: Color_BLACK);
-				r_cons_rgb_str (bg, r, g, b, 1);
+				r_cons_rgb_str (bg, sizeof (bg), &rc);
 				r_cons_printf ("%s%s rgb:%02x%02x%02x "
-					Color_RESET, fg, bg, r, g, b);
-				//if (n++==7) {
+					Color_RESET, fg, bg, rc.r, rc.g, rc.b);
 				if (n ++== 5) {
 					n = 0;
 					r_cons_newline ();
@@ -361,7 +435,7 @@
 	}
 }
 
-R_API void r_cons_pal_show () {
+R_API void r_cons_pal_show() {
 	int i;
 	for (i = 0; colors[i].name; i++) {
 		r_cons_printf ("%s%s__"Color_RESET" %s\n",
@@ -369,61 +443,41 @@
 			colors[i].bgcode,
 			colors[i].name);
 	}
-	switch (r_cons_singleton ()->truecolor) {
-	case 1: // 256 color palette
+	switch (r_cons_singleton ()->color) {
+	case COLOR_MODE_256: // 256 color palette
 		r_cons_pal_show_gs ();
 		r_cons_pal_show_256 ();
 		break;
-	case 2: // 16M
+	case COLOR_MODE_16M: // 16M (truecolor)
 		r_cons_pal_show_gs ();
 		r_cons_pal_show_rgb ();
 		break;
 	}
 }
 
-R_API const char *r_cons_pal_get_color (int n) {
-	RConsPalette *pal = & (r_cons_singleton ()->pal);
-	ut8 *p = (ut8*)pal;
-	int i;
-	for (i = 0; keys[i].name; i++) {
-		if (i >= n) {
-			const char **color = (const char**) (p + keys[i].off);
-			color = (const char**)*color;
-			return (const char *)color;
-		}
-	}
-	return NULL;
-}
-
-R_API void r_cons_pal_list (int rad, const char *arg) {
-	RConsPalette *pal = & (r_cons_singleton ()->pal);
-	ut8 r, g, b, *p = (ut8*)pal;
-	char *name, **color, rgbstr[32];
+R_API void r_cons_pal_list(int rad, const char *arg) {
+	char *name, **color;
 	const char *hasnext;
 	int i;
 	if (rad == 'j') {
 		r_cons_print ("{");
 	}
 	for (i = 0; keys[i].name; i++) {
-		color = (char**) (p + keys[i].off);
+		RColor *rcolor = RCOLOR_AT (i);
+		color = COLOR_AT (i);
 		switch (rad) {
 		case 'j':
-			r = g = b = 0;
-			r_cons_rgb_parse (*color, &r, &g, &b, NULL);
 			hasnext = (keys[i + 1].name) ? "," : "";
 			r_cons_printf ("\"%s\":[%d,%d,%d]%s",
-				keys[i].name, r, g, b, hasnext);
+				keys[i].name, rcolor->r, rcolor->g, rcolor->b, hasnext);
 			break;
 		case 'c': {
 			const char *prefix = r_str_trim_ro (arg);
 			if (!prefix) {
 				prefix = "";
 			}
-			r = g = b = 0;
-			r_cons_rgb_parse (*color, &r, &g, &b, NULL);
 			hasnext = (keys[i + 1].name) ? "\n" : "";
-			//Need to replace the '.' char because this is not
-			//valid CSS
+			// TODO Need to replace the '.' char because this is not valid CSS
 			char *name = strdup (keys[i].name);
 			int j, len = strlen (name);
 			for (j = 0; j < len; j++) {
@@ -432,29 +486,22 @@
 				}
 			}
 			r_cons_printf (".%s%s { color: rgb(%d, %d, %d); }%s",
-				prefix, name, r, g, b, hasnext);
+				prefix, name, rcolor->r, rcolor->g, rcolor->b, hasnext);
 			free (name);
 			}
 			break;
 		case 'h':
-			r = g = b = 0;
-			r_cons_rgb_parse (*color, &r, &g, &b, NULL);
-			rgbstr[0] = 0;
 			name = strdup (keys[i].name);
 			r_str_replace_char (name, '.', '_');
 			r_cons_printf (".%s { color:#%02x%02x%02x }\n",
-				name, r, g, b);
+				name, rcolor->r, rcolor->g, rcolor->b);
 			free (name);
 			break;
 		case '*':
 		case 'r':
 		case 1:
-			r = g = b = 0;
-			r_cons_rgb_parse (*color, &r, &g, &b, NULL);
-			rgbstr[0] = 0;
-			r_cons_rgb_str (rgbstr, r, g, b, 0);
 			r_cons_printf ("ec %s rgb:%02x%02x%02x\n",
-				keys[i].name, r, g, b);
+				keys[i].name, rcolor->r, rcolor->g, rcolor->b);
 			break;
 		default:
 			r_cons_printf (" %s##"Color_RESET"  %s\n", *color,
@@ -466,54 +513,64 @@
 	}
 }
 
+/* Modify the palette to set a color value.
+ * r_cons_pal_update_event () must be called after this function
+ * so the changes take effect. */
 R_API int r_cons_pal_set(const char *key, const char *val) {
 	int i;
-	char **p;
+	RColor *rcolor;
 	for (i = 0; keys[i].name; i++) {
 		if (!strcmp (key, keys[i].name)) {
-			p = (char **) ((char *)& (r_cons_singleton ()->pal) + keys[i].off);
-			*p = r_cons_pal_parse (val);
+			rcolor = RCOLOR_AT (i);
+			r_cons_pal_parse (val, rcolor);
 			return true;
 		}
 	}
+	eprintf ("Invalid color %s\n", key);
 	return false;
 }
 
-R_API const char *r_cons_pal_get_i(int n) {
-	int i;
-	for (i = 0; i < n && keys[i].name; i++) {}
-	return (i == n) ? keys[n].name : NULL;
-}
-
-R_API const char *r_cons_pal_get (const char *key) {
+/* Get the named RColor */
+R_API RColor r_cons_pal_get(const char *key) {
 	int i;
+	RColor *rcolor;
 	for (i = 0; keys[i].name; i++) {
 		if (!strcmp (key, keys[i].name)) {
-			char **p = (char **) ((char *)& (r_cons_singleton ()->pal) + keys[i].off);
-			return p? *p: "";
+			rcolor = RCOLOR_AT (i);
+			return rcolor? *rcolor: (RColor) RColor_NULL;
 		}
 	}
-	return "";
+	return (RColor) RColor_NULL;
+}
+
+/* Get the RColor at specified index */
+R_API RColor r_cons_pal_get_i(int index) {
+	return *(RCOLOR_AT (index));
+}
+
+/* Get color name at index */
+R_API const char *r_cons_pal_get_name(int index) {
+	return (index >= 0 && index < keys_len) ? keys[index].name : NULL;
+}
+
+R_API int r_cons_pal_len() {
+	return keys_len;
 }
 
 R_API void r_cons_pal_update_event() {
-	RConsPalette *pal = & (r_cons_singleton ()->pal);
-	ut8 *p = (ut8*)pal;
 	Sdb *db = sdb_new0 ();
-	RCons *cons = r_cons_singleton ();
 	int i, n = 0;
+	char **color;
+	/* Compute cons->pal values */
 	for (i = 0; keys[i].name; i++) {
-		char **color = (char**) (p + keys[i].off);
-		ut8 r, g, b;
-		r = g = b = 0;
-		r_cons_rgb_parse (*color, &r, &g, &b, NULL);
-		if (r <= 0x50 && g <= 0x50 && b < 0x50) {
-			continue;
-		}
-		if (r >= 0xe0  && g >= 0xe0 && b >= 0xe0) {
-			continue;
+		RColor *rcolor = RCOLOR_AT (i);
+		color = COLOR_AT (i);
+		// Color is dynamically allocated, needs to be freed
+		if (*color) {
+			R_FREE (*color);
 		}
-		const char *rgb = sdb_fmt (0, "rgb:%02x%02x%02x", r, g, b);
+		*color = r_cons_rgb_str (NULL, 0, rcolor);
+		const char *rgb = sdb_fmt ("rgb:%02x%02x%02x", rcolor->r, rcolor->g, rcolor->b);
 		sdb_set (db, rgb, "1", 0);
 	}
 	SdbList *list = sdb_foreach_list (db, true);
@@ -522,9 +579,9 @@
 	r_cons_rainbow_free ();
 	r_cons_rainbow_new (list->length);
 	ls_foreach (list, iter, kv) {
-		cons->pal.rainbow[n++] = strdup (kv->key);
+		r_cons_singleton ()->pal.rainbow[n++] = strdup (kv->key);
 	}
-	cons->pal.rainbow_sz = n;
+	r_cons_singleton ()->pal.rainbow_sz = n;
 	ls_free (list);
 	sdb_free (db);
 }
@@ -561,9 +618,9 @@
 	const char *a = cons->pal.rainbow[x];
 	if (bg) {
 		char *dup = r_str_newf ("%s %s", a, a);
-		char *res = r_cons_pal_parse (dup);
+		char *res = r_cons_pal_parse (dup, NULL);
 		free (dup);
 		return res;
 	}
-	return r_cons_pal_parse (a);
+	return r_cons_pal_parse (a, NULL);
 }
diff -Nru radare2-2.3.0+dfsg/libr/cons/rgb.c radare2-2.8.0+dfsg/libr/cons/rgb.c
--- radare2-2.3.0+dfsg/libr/cons/rgb.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/rgb.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2013-2017 - pancake */
+/* radare - LGPL - Copyright 2013-2018 - pancake, xarkes */
 /* ansi 256 color extension for r_cons */
 /* https://en.wikipedia.org/wiki/ANSI_color */
 
@@ -7,7 +7,7 @@
 int color_table[256] = { 0 };
 int value_range[6] = { 0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff};
 
-static void init_color_table () {
+static void init_color_table() {
 	int i, r, g, b;
 	// ansi colors
 	color_table[0] = 0x000000;
@@ -42,7 +42,7 @@
 	}
 }
 
-static int lookup_rgb (int r, int g, int b) {
+static int lookup_rgb(int r, int g, int b) {
 	int i, color = (r << 16) + (g << 8) + b;
 	// lookup extended colors only, coz non-extended can be changed by users.
 	for (i = 16; i < 256; ++i) {
@@ -53,7 +53,7 @@
 	return -1;
 }
 
-static ut32 approximate_rgb (int r, int g, int b) {
+static ut32 approximate_rgb(int r, int g, int b) {
 	bool grey = (r > 0 && r < 255 && r == g && r == b);
 	if (grey) {
 		return 232 + (int)((double)r / (255 / 24.1));
@@ -82,7 +82,7 @@
 #endif
 }
 
-static int rgb (int r, int g, int b) {
+static int rgb(int r, int g, int b) {
 	int c = lookup_rgb (r, g, b);
 	if (c == -1) {
 		return approximate_rgb (r, g, b);
@@ -90,7 +90,7 @@
 	return c;
 }
 
-static void unrgb (int color, int *r, int *g, int *b) {
+static void unrgb(int color, int *r, int *g, int *b) {
 	if (color < 0 || color > 256) {
 		*r = *g = *b = 0;
 		return;
@@ -101,32 +101,18 @@
 	*b = rgb & 0xff;
 }
 
-static inline void rgbinit (int r, int g, int b) {
-#if __UNIX__ || __CYGWIN__
-	r_cons_printf ("\x1b]4;%d;rgb:%2.2x/%2.2x/%2.2x\x1b\\",
-			16 + (r * 36) + (g * 6) + b,
-			(r ? (r * 40 + 55) : 0),
-			(g ? (g * 40 + 55) : 0),
-			(b ? (b * 40 + 55) : 0));
-#endif
-}
-
-R_API void r_cons_rgb_init (void) {
-	if (color_table[255] == 0) init_color_table ();
-	int r, g, b;
-	for (r = 0; r < 6; r++)
-		for (g = 0; g < 6; g++)
-			for (b = 0; b < 6; b++)
-				rgbinit (r, g, b);
+R_API void r_cons_rgb_init(void) {
+	if (color_table[255] == 0) {
+		init_color_table ();
+	}
 }
 
-R_API int r_cons_rgb_parse(const char *p, ut8 *r, ut8 *g, ut8 *b, int *is_bg) {
+/* Parse an ANSI code string into RGB values -- Used by HTML filter only */
+R_API int r_cons_rgb_parse(const char *p, ut8 *r, ut8 *g, ut8 *b, ut8 *a) {
 	const char *q = 0;
-	int isbg = 0, bold = 127; // 255; // 127; // 255 ?
-	//const double k = (256/6);
+	ut8 isbg = 0, bold = 127;
 	if (!p) return 0;
 	if (*p == 0x1b) p++;
-	//if (*p!='[') return 0;
 	if (*p != '[') p--;
 	switch (p[1]) {
 	case '1': bold = 255; p += 2; break;
@@ -135,15 +121,15 @@
 	}
 #define SETRGB(x,y,z) if (r) *r = (x); if (g) *g = (y); if (b) *b = (z)
 	if (bold != 255 && strchr (p, ';')) {
-		if (p[4] == '5')  {
+		if (p[4] == '5')  { // \x1b[%d;5;%dm is 256 colors
 			int x, y, z;
 			int n = atoi (p + 6);
 			unrgb (n, &x, &y, &z);
 			SETRGB (x, y, z);
-		} else {
-			/* truecolor */
+		} else { // 16M colors (truecolor)
 			/* complex rgb */
-			if (r) *r = atoi (p + 6);
+			p += 6;
+			if (r) *r = atoi (p);
 			q = strchr (p, ';');
 			if (!q) return 0;
 			if (g) *g = atoi (q + 1);
@@ -154,7 +140,7 @@
 		return 1;
 	} else {
 		/* plain ansi escape codes */
-		if (is_bg) *is_bg = isbg;
+		if (a) *a = isbg;
 		switch (p[2]) {
 		case '0': SETRGB (0, 0, 0); break;
 		case '1': SETRGB (bold, 0, 0); break;
@@ -169,55 +155,99 @@
 	return 1;
 }
 
-R_API char *r_cons_rgb_str_off(char *outstr, ut64 off) {
-	const int r = (off >> 2) & 0xff;
-	const int g = (off >> 6) & 0xff;
-	const int b = (off >> 12) & 0xff;
-	return r_cons_rgb_str (outstr, r, g, b, false);
+R_API char *r_cons_rgb_str_off(char *outstr, size_t sz, ut64 off) {
+	RColor rc = RColor_BLACK;
+	rc.r = (off >> 2) & 0xff;
+	rc.g = (off >> 6) & 0xff;
+	rc.b = (off >> 12) & 0xff;
+	return r_cons_rgb_str (outstr, sz, &rc);
 }
 
-R_API char *r_cons_rgb_str(char *outstr, ut8 r, ut8 g, ut8 b, int is_bg) {
-	int fgbg = is_bg ? 48: 38;
-	if (!outstr) outstr = malloc (32);
-	if (!outstr) return NULL;
-
-	switch (r_cons_singleton ()->truecolor) {
-	case 1: // 256 color palette
-		sprintf (outstr, "\x1b[%d;5;%dm", fgbg, rgb (r, g, b));
+/* Compute color string depending on cons->color */
+static void r_cons_rgb_gen(char *outstr, size_t sz, ut8 attr, ut8 a, ut8 r, ut8 g, ut8 b) {
+	ut8 fgbg = (a == ALPHA_BG)? 48: 38; // ANSI codes for Background/Foreground
+
+	if (sz < 4) { // must have at least room for "<esc>[m\0"
+		if (sz > 0) {
+			outstr[0] = '\0';
+		}
+		return;
+	}
+
+	size_t i = 2;
+	outstr[0] = '\x1b';
+	outstr[1] = '[';
+	for (; attr; attr &= attr - 1) {
+		if (sz < i + 4) { // must have at least room for e.g. "1;m\0"
+			outstr[0] = '\0';
+			return;
+		}
+		switch (attr & -attr) {
+		case 1u << 1: outstr[i] = '1'; break;
+		case 1u << 2: outstr[i] = '2'; break;
+		case 1u << 3: outstr[i] = '3'; break;
+		case 1u << 4: outstr[i] = '4'; break;
+		case 1u << 5: outstr[i] = '5'; break;
+		}
+		outstr[i + 1] = ';';
+		i += 2;
+	}
+
+	int written = -1;
+	switch (r_cons_singleton ()->color) {
+	case COLOR_MODE_256: // 256 color palette
+		written = snprintf (outstr + i, sz - i, "%d;5;%dm", fgbg, rgb (r, g, b));
 		break;
-	case 2: // 16M - xterm only
-		sprintf (outstr, "\x1b[%d;2;%d;%d;%dm", fgbg, r, g, b);
+	case COLOR_MODE_16M: // 16M (truecolor)
+		written = snprintf (outstr + i, sz - i, "%d;2;%d;%d;%dm", fgbg, r, g, b);
 		break;
-	case 0: // ansi 16 colors
-	default: {
-		int k = (r + g + b) / 3;
-		r = (r > k) ? 1 : 0;
-		g = (g > k) ? 1 : 0;
-		b = (b > k) ? 1 : 0;
-		k = (r ? 1 : 0) + (g ? (b ? 6 : 2) : (b ? 4 : 0));
-		sprintf (outstr, "\x1b[%dm", 30 + k);
+	case COLOR_MODE_16: // ansi 16 colors
+		{
+		fgbg -= 8;
+		if (r == g && g == b) {
+			r = (r > 0x7f) ? 1 : 0;
+			g = (g > 0x7f) ? 1 : 0;
+			b = (b > 0x7f) ? 1 : 0;
+		} else {
+			ut8 k = (r + g + b) / 3;
+			r = (r >= k) ? 1 : 0;
+			g = (g >= k) ? 1 : 0;
+			b = (b >= k) ? 1 : 0;
+		}
+		ut8 c = (r ? 1 : 0) + (g ? (b ? 6 : 2) : (b ? 4 : 0));
+		written = snprintf (outstr + i, sz - i, "%dm", fgbg + c);
 		}
 		break;
 	}
-	return outstr;
-}
 
-R_API void r_cons_rgb (ut8 r, ut8 g, ut8 b, int is_bg) {
-#if __WINDOWS__ && !__CYGWIN__
-#ifdef _MSC_VER
-#pragma message ("r_cons_rgb not yet supported on windows")
-#else
-#warning r_cons_rgb not yet supported on windows
-#endif
-#else
-	char outstr[64];
-	r_cons_strcat (r_cons_rgb_str (outstr, r, g, b, is_bg));
-#endif
+	if (written < 0 || written >= sz - i) {
+		outstr[0] = '\0';
+	}
 }
 
-R_API void r_cons_rgb_fgbg (ut8 r, ut8 g, ut8 b, ut8 R, ut8 G, ut8 B) {
-	r_cons_rgb (r, g, b, 0);
-	r_cons_rgb (R, G, B, 1);
+/* Return the computed color string for the specified color */
+R_API char *r_cons_rgb_str(char *outstr, size_t sz, RColor *rcolor) {
+	if (!rcolor) {
+		return NULL;
+	}
+	if (!outstr) {
+		sz = 64;
+		outstr = calloc (sz, 1);
+	}
+	*outstr = 0;
+	if (rcolor->a == ALPHA_RESET) {
+		strcpy (outstr, Color_RESET);
+		return outstr;
+	}
+	// If the color handles both foreground and background, also add background
+	if (rcolor->a == ALPHA_FGBG) {
+		r_cons_rgb_gen (outstr, sz, 0, ALPHA_BG, rcolor->r2, rcolor->g2, rcolor->b2);
+	}
+	// APPEND
+	size_t len = strlen (outstr);
+	r_cons_rgb_gen (outstr + len, sz - len, rcolor->attr, rcolor->a, rcolor->r, rcolor->g, rcolor->b);
+
+	return outstr;
 }
 
 R_API char *r_cons_rgb_tostring(ut8 r, ut8 g, ut8 b) {
@@ -230,6 +260,5 @@
 	if (r == 0xff && g == 0xff && b == 0x00) str = "yellow";
 	if (r == 0x00 && g == 0xff && b == 0xff) str = "cyan";
 	if (r == 0xff && g == 0x00 && b == 0xff) str = "magenta";
-	if (str) return strdup (str);
-	return r_str_newf ("#%02x%02x%02x", r, g, b);
+	return str? strdup (str) : r_str_newf ("#%02x%02x%02x", r, g, b);
 }
diff -Nru radare2-2.3.0+dfsg/libr/cons/utf8.c radare2-2.8.0+dfsg/libr/cons/utf8.c
--- radare2-2.3.0+dfsg/libr/cons/utf8.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/cons/utf8.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2015 - pancake */
+/* radare - LGPL - Copyright 2015-2018 - pancake */
 
 // Copypasta from http://www.linuxquestions.org/questions/programming-9/get-cursor-position-in-c-947833/
 #include <r_cons.h>
@@ -226,7 +226,7 @@
 #include <locale.h>
 	const char *ctype = setlocale(LC_CTYPE, NULL);
 	if ( (ctype != NULL) && (ctype = strchr(ctype, '.')) && ctype++ &&
-		(strcasecmp(ctype, "UTF-8") == 0 || strcasecmp(ctype, "UTF8") == 0)) {
+		(r_str_casecmp(ctype, "UTF-8") == 0 || r_str_casecmp(ctype, "UTF8") == 0)) {
 		return 1;
 	}
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/core/anal_tp.c radare2-2.8.0+dfsg/libr/core/anal_tp.c
--- radare2-2.3.0+dfsg/libr/core/anal_tp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/anal_tp.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2016 - oddcoder */
+/* radare - LGPL - Copyright 2016-2018 - oddcoder, sivaramaaa */
 /* type matching - type propagation */
 
 #include <r_anal.h>
@@ -37,196 +37,328 @@
 	r_config_hold_free (hc);
 }
 
-static void type_match(RCore *core, ut64 addr, char *name) {
+#define SDB_CONTAINS(i,s) sdb_array_contains (trace, sdb_fmt ("%d.reg.write", i), s, 0)
+
+static bool type_pos_hit(RAnal *anal, Sdb *trace, bool in_stack, int idx, int size, const char *place) {
+	if (in_stack) {
+		const char *sp_name = r_reg_get_name (anal->reg, R_REG_NAME_SP);
+		ut64 sp = r_reg_getv (anal->reg, sp_name);
+		ut64 write_addr = sdb_num_get (trace, sdb_fmt ("%d.mem.write", idx), 0);
+		return (write_addr == sp + size);
+	} else {
+		return SDB_CONTAINS (idx, place);
+	}
+}
+
+static void var_rename(RAnal *anal, RAnalVar *v, const char *name, ut64 addr) {
+	if (!name || !v) {
+		return;
+	}
+	if (!*name || !strcmp (name , "...")) {
+		return;
+	}
+	bool is_default = (!strncmp (v->name, "local_", 6)
+			|| !strncmp (v->name, "arg_", 4))? true: false;
+	if (*name == '*') {
+		name++;
+	}
+	// longer name tends to be meaningful like "src" instead of "s1"
+	if (!is_default && (strlen (v->name) > strlen (name))) {
+		return;
+	}
+	RAnalFunction *fcn = r_anal_get_fcn_in (anal, addr, 0);
+	if (!fcn) {
+		return;
+	}
+	r_anal_var_rename (anal, fcn->addr, 1, v->kind, v->name, name, false);
+}
+
+static void var_retype(RAnal *anal, RAnalVar *var, const char *vname, char *type, ut64 addr, bool ref, bool pfx) {
+	if (!type || !var) {
+		return;
+	}
+	char *trim = r_str_trim (type);
+	if (!*trim) {
+		return;
+	}
+	bool is_ptr = (vname && *vname == '*')? true: false;
+	if (!strncmp (trim, "int", 3) || (!is_ptr && !strcmp (trim, "void"))) {
+		// default or void type
+		return;
+	}
+	const char *tmp = strstr (var->type, "int");
+	bool is_default = tmp? true: false;
+	if (!is_default && strncmp (var->type, "void", 4)) {
+		// return since type is already propgated
+		// except for "void *", since "void *" => "char *" is possible
+		return;
+	}
+	char ntype[256];
+	int len = sizeof (ntype) - 1;
+	if (pfx) {
+		if (is_default && strncmp (var->type, "signed", 6)) {
+			snprintf (ntype, len, "%s %s", type, tmp);
+		} else {
+			return;
+		}
+	} else {
+		strncpy (ntype, trim, len);
+	}
+	if (!strncmp (ntype, "const ", 6)) {
+		// Droping const from type
+		//TODO: Infering const type
+		snprintf (ntype, len, "%s", type + 6);
+	}
+	if (is_ptr) {
+		//type *ptr => type *
+		strncat (ntype, " *", len);
+	}
+	if (ref && r_str_endswith (ntype, "*")) {
+		// char * => char **
+		strncat (ntype, "*", len);
+	}
+	r_anal_var_retype (anal, addr, 1, var->delta, var->kind, ntype, var->size, var->isarg, var->name);
+}
+
+static void get_src_regname(RCore *core, ut64 addr, char *regname, int size) {
+	RAnal *anal = core->anal;
+	RAnalOp *op = r_core_anal_op (core, addr, R_ANAL_OP_MASK_ESIL);
+	if (!op) {
+		return;
+	}
+	char *op_esil = strdup (r_strbuf_get (&op->esil));
+	char *tmp = strchr (op_esil, ',');
+	if (tmp) {
+		*tmp = '\0';
+	}
+	memset (regname, 0, size);
+	RRegItem *ri = r_reg_get (anal->reg, op_esil, -1);
+	if (ri) {
+		if ((anal->bits == 64) && (ri->size == 32)) {
+			const char *reg = r_reg_32_to_64 (anal->reg, op_esil);
+			if (reg) {
+				free (op_esil);
+				op_esil = strdup (reg);
+			}
+		}
+		strncpy (regname, op_esil, size - 1);
+	}
+	free (op_esil);
+	r_anal_op_free (op);
+}
+
+static ut64 get_addr(Sdb *trace, const char *regname, int idx) {
+	if (!regname || !*regname) {
+		return UT64_MAX;
+	}
+	const char *query = sdb_fmt ("%d.reg.read.%s", idx, regname);
+	return r_num_math (NULL, sdb_const_get (trace, query, 0));
+}
+
+static RList *parse_format(RCore *core, char *fmt) {
+	RList *ret = r_list_new();
+	Sdb *s = core->anal->sdb_fmts;
+	const char *spec = r_config_get (core->config, "anal.types.spec");
+	char arr[10] = {0};
+	char *ptr = strchr (fmt, '%');
+	fmt[strlen(fmt) - 1] = '\0';
+	while (ptr) {
+		ptr += 1;
+		// strip [width] specifier
+		while (IS_DIGIT (*ptr)) { ptr++; }
+		r_str_ncpy (arr, ptr, sizeof (arr) - 1);
+		char *tmp = arr;
+		while (tmp && (IS_LOWER (*tmp) || IS_UPPER (*tmp))) { tmp++; }
+		*tmp = '\0';
+		const char *query = sdb_fmt ("spec.%s.%s", spec, arr);
+		char *type = (char *) sdb_const_get (s, query, 0);
+		if (type) {
+			r_list_append (ret, type);
+		}
+		ptr = strchr (ptr, '%');
+	}
+	return ret;
+}
+
+#define DEFAULT_MAX 3
+#define REG_SZ 10
+
+static void type_match(RCore *core, ut64 addr, char *fcn_name, ut64 baddr, const char* cc,
+		int prev_idx, bool userfnc, ut64 caddr) {
 	Sdb *trace = core->anal->esil->db_trace;
+	Sdb *TDB = core->anal->sdb_types;
 	RAnal *anal = core->anal;
-	RAnalVar *v;
-	char *fcn_name;
-	if (r_anal_type_func_exist (anal, name)) {
-		fcn_name = strdup (name);
-	} else if (!(fcn_name = r_anal_type_func_guess (anal, name))) {
-		//eprintf ("can't find function prototype for %s\n", name);
-		return;
-	}
-	const char* cc = r_anal_type_func_cc (anal, fcn_name);
-	if (!cc || !r_anal_cc_exist (anal, cc)) {
-		//eprintf ("can't find %s calling convention %s\n", fcn_name, cc);
-		return;
-	}
-	int i, j, max = r_anal_type_func_args_count (anal, fcn_name);
-	int size = 0, idx = sdb_num_get (trace, "idx", 0);
-	const char *sp_name = r_reg_get_name (anal->reg, R_REG_NAME_SP);
-	const char *bp_name = r_reg_get_name (anal->reg, R_REG_NAME_BP);
-	ut64 sp = r_reg_getv (anal->reg, sp_name);
-	ut64 bp = r_reg_getv (anal->reg, bp_name);
+	RList *types = NULL;
+	int idx = sdb_num_get (trace, "idx", 0);
+	bool verbose = r_config_get_i (core->config, "anal.types.verbose");
+	bool stack_rev = false, in_stack = false, format = false;
+
+	if (!fcn_name || !cc) {
+		return;
+	}
+	int i, j, pos = 0, size = 0, max = r_type_func_args_count (TDB, fcn_name);
+	const char *place = r_anal_cc_arg (anal, cc, 1);
 	r_cons_break_push (NULL, NULL);
+
+	if (!strcmp (place, "stack_rev")) {
+		stack_rev = true;
+	}
+	if (!strncmp (place, "stack", 5)) {
+		in_stack = true;
+	}
+	if (verbose && !strncmp (fcn_name, "sym.imp.", 8)) {
+		eprintf ("%s missing function definition\n", fcn_name + 8);
+	}
+	if (!max) {
+		if (!in_stack) {
+			max = r_anal_cc_max_arg(anal, cc);
+		} else {
+			max = DEFAULT_MAX;
+		}
+	}
 	for (i = 0; i < max; i++) {
-		if (r_cons_is_breaked ()) {
-			goto out_function;
+		int arg_num = stack_rev ? (max - 1 - i) : i;
+		char *type = NULL;
+		const char *name = NULL;
+		if (format) {
+			if (r_list_empty (types)) {
+				break;
+			}
+			type = r_str_new (r_list_get_n (types, pos++));
+		} else {
+			type = r_type_func_args_type (TDB, fcn_name, arg_num);
+			name = r_type_func_args_name (TDB, fcn_name, arg_num);
 		}
-		char *type = r_anal_type_func_args_type (anal, fcn_name, i);
-		const char *name = r_anal_type_func_args_name (anal, fcn_name, i);
-		const char *place = r_anal_cc_arg (anal, cc, i + 1);
-		if (!strcmp (place, "stack")) {
-			// type_match_stack ();
-			for (j = idx; j >= 0; j--) {
-				if (r_cons_is_breaked ()) {
-					goto out_function;
-				}
-				ut64 write_addr = sdb_num_get (trace, sdb_fmt (-1, "%d.mem.write", j), 0);
-				if (write_addr == sp + size) {
-					ut64 instr_addr = sdb_num_get (trace, sdb_fmt (-1, "%d.addr", j), 0);
-					r_meta_set_string (core->anal, R_META_TYPE_COMMENT, instr_addr,
-						sdb_fmt (-1, "%s %s", type, name));
-					char *tmp = sdb_fmt (-1, "%d.mem.read", j);
-					int i2, array_size = sdb_array_size (trace, tmp);
-					for (i2 = 0; i2 < array_size; i2++) {
-						if (bp_name) {
-							int bp_idx = sdb_array_get_num (trace, tmp, i2, 0) - bp;
-							if ((v = r_anal_var_get (anal, addr, R_ANAL_VAR_KIND_BPV, 1, bp_idx))) {
-								r_anal_var_retype (anal, addr, 1, bp_idx, R_ANAL_VAR_KIND_BPV, type, -1, v->name);
-								r_anal_var_free (v);
-							}
-						}
-						int sp_idx = sdb_array_get_num (trace, tmp, i2, 0) - sp;
-						if ((v = r_anal_var_get (anal, addr, R_ANAL_VAR_KIND_SPV, 1, sp_idx))) {
-							r_anal_var_retype (anal, addr, 1, sp_idx, R_ANAL_VAR_KIND_SPV, type, -1, v->name);
-							r_anal_var_free (v);
+		if (!type && !userfnc) {
+			continue;
+		}
+		if (!in_stack) {
+			//XXX: param arg_num must be fixed to support floating point register
+			place = r_anal_cc_arg (anal, cc, arg_num + 1);
+		}
+		char regname[REG_SZ] = {0};
+		ut64 xaddr = UT64_MAX;
+		bool memref = false;
+		bool cmt_set = false;
+		bool res = false;
+		// Backtrace instruction from source sink to prev source sink
+		for (j = idx; j >= prev_idx; j--) {
+			ut64 instr_addr = sdb_num_get (trace, sdb_fmt ("%d.addr", j), 0);
+			if (instr_addr < baddr) {
+				break;
+			}
+			RAnalOp *op = r_core_anal_op (core, instr_addr, R_ANAL_OP_MASK_BASIC);
+			if (!op) {
+				r_anal_op_free (op);
+				break;
+			}
+			RAnalOp *next_op = r_core_anal_op (core, instr_addr + op->size, R_ANAL_OP_MASK_BASIC);
+			if (!next_op || (j != idx && (next_op->type == R_ANAL_OP_TYPE_CALL
+							|| next_op->type == R_ANAL_OP_TYPE_JMP))) {
+				r_anal_op_free (op);
+				r_anal_op_free (next_op);
+				break;
+			}
+			char *key = NULL;
+			RAnalVar *var = op->var;
+			if (!in_stack) {
+				key = sdb_fmt ("fcn.0x%08"PFMT64x".arg.%s", caddr, place);
+			} else {
+				key = sdb_fmt ("fcn.0x%08"PFMT64x".arg.%d", caddr, size);
+			}
+			const char *query = sdb_fmt ("%d.mem.read", j);
+			if (op->type == R_ANAL_OP_TYPE_MOV && sdb_const_get (trace, query, 0)) {
+				memref = (!memref && var && (var->kind != R_ANAL_VAR_KIND_REG))? false: true;
+			}
+			// Match type from function param to instr
+			if (type_pos_hit (anal, trace, in_stack, j, size, place)) {
+				if (!cmt_set && type && name) {
+					r_meta_set_string (anal, R_META_TYPE_VARTYPE, instr_addr,
+							sdb_fmt ("%s%s%s", type, r_str_endswith (type, "*") ? "" : " ", name));
+					cmt_set = true;
+					if ((op->ptr && op->ptr != UT64_MAX) && !strcmp (name, "format")) {
+						RFlagItem *f = r_flag_get_i (core->flags, op->ptr);
+						if (f && !strncmp (f->name, "str", 3)) {
+							types = parse_format (core, f->realname);
+							max += r_list_length (types);
+							format = true;
 						}
 					}
-					break;
 				}
-			}
-			size += r_anal_type_get_size (anal, type) / 8;
-		} else if (!strcmp (place , "stack_rev")) {
-			// type_match_stack_rev ();
-			free (type);
-			int k;
-			for ( k = max -1; k >=i; k--) {
-				if (r_cons_is_breaked ()) {
-					goto out_function;
-				}
-				type = r_anal_type_func_args_type (anal, fcn_name, k);
-				name = r_anal_type_func_args_name (anal, fcn_name, k);
-				place = r_anal_cc_arg (anal, cc, k + 1);
-				if (strcmp (place ,"stack_rev")) {
-					break;
-				}
-				for (j = idx; j >= 0; j--) {
-					if (r_cons_is_breaked ()) {
-						goto out_function;
-					}
-					ut64 write_addr = sdb_num_get (trace, sdb_fmt (-1, "%d.mem.write", j), 0);
-					if (write_addr == sp + size) {
-						ut64 instr_addr = sdb_num_get (trace, sdb_fmt (-1, "%d.addr", j), 0);
-						r_meta_set_string (core->anal, R_META_TYPE_COMMENT, instr_addr,
-								sdb_fmt (-1, "%s%s%s", type, r_str_endswith (type, "*") ? "" : " ", name));
-						char *tmp = sdb_fmt (-1, "%d.mem.read", j);
-						int i2, array_size = sdb_array_size (trace, tmp);
-						for (i2 = 0; i2 < array_size; i2++) {
-							if (bp_name) {
-								int bp_idx = sdb_array_get_num (trace, tmp, i2, 0) - bp;
-								if ((v = r_anal_var_get (anal, addr, R_ANAL_VAR_KIND_BPV, 1, bp_idx))) {
-									r_anal_var_retype (anal, addr, 1, bp_idx, R_ANAL_VAR_KIND_BPV, type, -1, v->name);
-									r_anal_var_free (v);
-								}
-							}
-							int sp_idx = sdb_array_get_num (trace, tmp, i2, 0) - sp;
-							if ((v =r_anal_var_get (anal, addr, R_ANAL_VAR_KIND_SPV, 1, sp_idx))) {
-								r_anal_var_retype (anal, addr, 1, sp_idx, R_ANAL_VAR_KIND_SPV, type, -1, v->name);
-								r_anal_var_free (v);
-							}
-						}
-						break;
+				if (var) {
+					if (!userfnc) {
+						var_retype (anal, var, name, type, addr, memref, false);
+						var_rename (anal, var, name, addr);
+					} else {
+						// Set callee argument info
+						sdb_set (anal->sdb_fcns, key, var->type, 0);
 					}
-
+					res = true;
+				} else {
+					get_src_regname (core, instr_addr, regname, sizeof (regname));
+					xaddr = get_addr (trace, regname, j);
 				}
-				size += r_anal_type_get_size (anal, type) / 8;
 			}
-			break;
-		} else {
-			// type_match_reg ();
-			for (j = idx; j >= 0; j--) {
-				if (r_cons_is_breaked ()) {
-					goto out_function;
-				}
-				if (sdb_array_contains (trace, sdb_fmt (-1, "%d.reg.write", j), place, 0)) {
-					ut64 instr_addr = sdb_num_get (trace, sdb_fmt (-1, "%d.addr", j), 0);
-					r_meta_set_string (core->anal, R_META_TYPE_COMMENT, instr_addr,
-						sdb_fmt (-1, "%s %s", type, name));
-					char *tmp = sdb_fmt (-1, "%d.mem.read", j);
-					int i2, array_size = sdb_array_size (trace, tmp);
-					for (i2 = 0; i2 < array_size; i2++) {
-						if (r_cons_is_breaked ()) {
-							goto out_function;
-						}
-						if (bp_name) {
-							int bp_idx = sdb_array_get_num (trace, tmp, i2, 0) - bp;
-							if ((v = r_anal_var_get (anal, addr, R_ANAL_VAR_KIND_BPV, 1, bp_idx))) {
-								r_anal_var_retype (anal, addr, 1, bp_idx, R_ANAL_VAR_KIND_BPV, type, -1, v->name);
-								r_anal_var_free (v);
-							}
-						}
-						int sp_idx = sdb_array_get_num (trace, tmp, i2, 0) - sp;
-						if ((v = r_anal_var_get (anal, addr, R_ANAL_VAR_KIND_SPV, 1, sp_idx))) {
-							r_anal_var_retype (anal, addr, 1, sp_idx, R_ANAL_VAR_KIND_SPV, type, -1, v->name);
-							r_anal_var_free (v);
-						}
+			// Type propagate by following source reg
+			if (!res && *regname && SDB_CONTAINS (j, regname)) {
+				if (var) {
+					if (!userfnc) {
+						var_retype (anal, var, name, type, addr, memref, false);
+						var_rename (anal, var, name, addr);
+					} else {
+						sdb_set (anal->sdb_fcns, key, var->type, 0);
+					}
+					res = true;
+				} else {
+					switch (op->type) {
+					case R_ANAL_OP_TYPE_MOV:
+					case R_ANAL_OP_TYPE_PUSH:
+						get_src_regname (core, instr_addr, regname, sizeof (regname));
+						break;
+					case R_ANAL_OP_TYPE_LEA:
+					case R_ANAL_OP_TYPE_LOAD:
+					case R_ANAL_OP_TYPE_STORE:
+						res = true;
+						break;
 					}
-					break;
+				}
+			} else if (var && res && xaddr && (xaddr != UT64_MAX)) { // Type progation using value
+				char tmp[REG_SZ] = {0};
+				get_src_regname (core, instr_addr, tmp, sizeof (tmp));
+				ut64 ptr = get_addr (trace, tmp, j);
+				if (ptr == xaddr) {
+					var_retype (anal, var, name, type, addr, memref, false);
 				}
 			}
+			r_anal_op_free (op);
+			r_anal_op_free (next_op);
 		}
+		size += anal->bits / 8;
 		free (type);
 	}
-out_function:
+	r_list_free (types);
 	r_cons_break_pop ();
-	free (fcn_name);
-}
-
-static int stack_clean (RCore *core, ut64 addr, RAnalFunction *fcn) {
-	int offset, ret;
-	char *tmp, *str, *sig;
-	RAnalOp *op = r_core_anal_op (core, addr);
-	if (!op) {
-		return 0;
-	}
-	str = strdup (r_strbuf_get (&op->esil));
-	if (!str) {
-		return 0;
-	}
-	tmp = strchr (str, ',');
-	if (!tmp) {
-		free (str);
-		return 0;
-	}
-	*tmp++ = 0;
-
-	offset = r_num_math (core->num, str);
-	const char *sp = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
-	sig = sdb_fmt (-1, "%s,+=", sp);
-	ret = 0;
-	if (!strncmp (tmp, sig, strlen (sig))) {
-		const char *esil = sdb_fmt (-1, "%d,%s,-=", offset, sp);
-		r_anal_esil_parse (core->anal->esil, esil);
-		r_anal_esil_stack_free (core->anal->esil);
-		r_core_esil_step (core, UT64_MAX, NULL, NULL);
-		ret = op->size;
-	}
-	r_anal_op_free (op);
-	free (str);
-	return ret;
 }
 
 R_API void r_core_anal_type_match(RCore *core, RAnalFunction *fcn) {
-	RConfigHold *hc = NULL;
 	RAnalBlock *bb;
 	RListIter *it;
+	RAnalOp aop = {0};
+	RAnal *anal = core->anal;
+	Sdb *TDB = anal->sdb_types;
+	bool resolved = false;
 
 	if (!core|| !fcn) {
 		return;
 	}
-	hc = r_config_hold_new (core->config);
+	if (!core->anal->esil) {
+		return;
+	}
+	int ret, bsize = R_MAX (64, core->blocksize);
+	const int mininstrsz = r_anal_archinfo (anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
+	const int minopcode = R_MAX (1, mininstrsz);
+	int cur_idx , prev_idx = anal->esil->trace_idx;
+	RConfigHold *hc = r_config_hold_new (core->config);
 	if (!hc) {
 		return;
 	}
@@ -234,52 +366,237 @@
 		r_anal_emul_restore (core, hc);
 		return;
 	}
-	const char *pc = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
+	ut8 *buf = malloc (bsize);
+	if (!buf) {
+		free (buf);
+		r_anal_emul_restore (core, hc);
+		return;
+	}
+	char *fcn_name = NULL;
+	char *ret_type = NULL;
+	bool str_flag = false;
+	bool prop = false;
+	bool prev_var = false;
+	char prev_type[256] = {0};
+	const char *prev_dest = NULL;
+	const char *ret_reg = NULL;
+	const char *pc = r_reg_get_name (core->dbg->reg, R_REG_NAME_PC);
+	RRegItem *r = r_reg_get (core->dbg->reg, pc, -1);
+	r_cons_break_push (NULL, NULL);
 	r_list_foreach (fcn->bbs, it, bb) {
 		ut64 addr = bb->addr;
-		r_reg_setv (core->dbg->reg, pc, bb->addr);
-		r_debug_reg_sync (core->dbg, R_REG_TYPE_ALL, true);
-		r_cons_break_push (NULL, NULL);
-		while (!r_cons_is_breaked ()) {
-			RAnalOp *op = r_core_anal_op (core, addr);
-			int loop_count = sdb_num_get (core->anal->esil->db_trace, sdb_fmt (-1, "0x%"PFMT64x".count", addr), 0);
-			if (loop_count > LOOP_MAX || !op || op->type == R_ANAL_OP_TYPE_RET || addr >= bb->addr + bb->size || addr < bb->addr) {
-				r_anal_op_free (op);
+		int i = 0;
+		r_reg_set_value (core->dbg->reg, r, addr);
+		while (1) {
+			if (r_cons_is_breaked ()) {
+				goto out_function;
+			}
+			if (i >= (bsize - 32)) {
+				i = 0;
+			}
+			ut64 pcval = r_reg_getv (core->anal->reg, pc);
+			if ((addr >= bb->addr + bb->size) || (addr < bb->addr) || pcval != addr) {
 				break;
 			}
-			sdb_num_set (core->anal->esil->db_trace, sdb_fmt (-1, "0x%"PFMT64x".count", addr), loop_count + 1, 0);
-			switch (op->type) {
-			case R_ANAL_OP_TYPE_CALL:
-				{
-					RAnalFunction *fcn_call = r_anal_get_fcn_in (core->anal, op->jump, -1);
-					if (fcn_call) {
-						type_match (core, addr, fcn_call->name);
-					}
-					addr += op->size;
-					r_anal_op_free (op);
-					r_reg_setv (core->dbg->reg, pc, addr);
-					r_debug_reg_sync (core->dbg, R_REG_TYPE_ALL, true);
-					r_anal_esil_set_pc (core->anal->esil, addr);
-					addr += stack_clean (core, addr, fcn);
-					r_reg_setv (core->dbg->reg, pc, addr);
-					r_debug_reg_sync (core->dbg, R_REG_TYPE_ALL, true);
-					r_anal_esil_set_pc (core->anal->esil, addr);
-					break;
-				}
+			if (!i) {
+				r_io_read_at (core->io, addr, buf, bsize);
+			}
+			ret = r_anal_op (anal, &aop, addr, buf + i, bsize - i, R_ANAL_OP_MASK_BASIC);
+			if (ret <= 0) {
+				i += minopcode;
+				addr += minopcode;
+				r_anal_op_fini (&aop);
+				continue;
+			}
+			int loop_count = sdb_num_get (anal->esil->db_trace, sdb_fmt ("0x%"PFMT64x".count", addr), 0);
+			if (loop_count > LOOP_MAX || aop.type == R_ANAL_OP_TYPE_RET) {
+				r_anal_op_fini (&aop);
 				break;
-			default:
-				{
-				   r_core_esil_step (core, UT64_MAX, NULL, NULL);
-				   r_anal_op_free (op);
-				   r_core_cmd0 (core, ".ar*");
-				   addr = r_reg_getv (core->anal->reg, pc);
+			}
+			sdb_num_set (anal->esil->db_trace, sdb_fmt ("0x%"PFMT64x".count", addr), loop_count + 1, 0);
+			if (r_anal_op_nonlinear (aop.type)) {   // skip the instr
+				r_reg_set_value (core->dbg->reg, r, addr + ret);
+			} else {
+				r_core_esil_step (core, UT64_MAX, NULL, NULL);
+			}
+			bool userfnc = false;
+			Sdb *trace = anal->esil->db_trace;
+			cur_idx = sdb_num_get (trace, "idx", 0);
+			RAnalVar *var = aop.var;
+			RAnalOp *next_op = r_core_anal_op (core, addr + ret, R_ANAL_OP_MASK_BASIC);
+			ut32 type = aop.type & R_ANAL_OP_TYPE_MASK;
+			if (aop.type == R_ANAL_OP_TYPE_CALL) {
+				RAnalFunction *fcn_call = r_anal_get_fcn_in (anal, aop.jump, -1);
+				if (fcn_call) {
+					if (r_type_func_exist (TDB, fcn_call->name)) {
+						fcn_name = strdup (fcn_call->name);
+					} else {
+						fcn_name = r_type_func_guess (TDB, fcn_call->name);
+					}
+					if (!fcn_name) {
+						fcn_name = strdup (fcn_call->name);
+						userfnc = true;
+					}
+					const char* cc = r_anal_cc_func (anal, fcn_name);
+					if (cc && r_anal_cc_exist (anal, cc)) {
+						type_match (core, addr, fcn_name, bb->addr, cc, prev_idx,
+								userfnc, fcn_call->addr);
+						prev_idx = cur_idx;
+						ret_type = (char *) r_type_func_ret (TDB, fcn_name);
+						ret_reg = r_anal_cc_ret (anal, cc);
+						resolved = false;
+					}
+					if (!strcmp (fcn_name, "__stack_chk_fail")) {
+						const char *query = sdb_fmt ("%d.addr", cur_idx - 1);
+						ut64 mov_addr = sdb_num_get (trace, query, 0);
+						RAnalOp *mop = r_core_anal_op (core, mov_addr, R_ANAL_OP_MASK_BASIC);
+						if (mop && mop->var) {
+							ut32 type = mop->type & R_ANAL_OP_TYPE_MASK;
+							if (type == R_ANAL_OP_TYPE_MOV) {
+								var_rename (anal, mop->var, "canary", addr);
+							}
+						}
+						r_anal_op_free (mop);
+					}
+					free (fcn_name);
+				}
+			} else if (!resolved && ret_type && ret_reg) {
+				// Forward propgation of function return type
+				char src[REG_SZ] = {0};
+				const char *query = sdb_fmt ("%d.reg.write", cur_idx);
+				const char *cur_dest = sdb_const_get (trace, query, 0);
+				get_src_regname (core, aop.addr, src, sizeof (src));
+				if (ret_reg && *src && strstr (ret_reg, src)) {
+					if (var && aop.direction == R_ANAL_OP_DIR_WRITE) {
+						var_retype (anal, var, NULL, ret_type, addr, false, false);
+						resolved = true;
+					} else if (type == R_ANAL_OP_TYPE_MOV) {
+						ret_reg = cur_dest;
+					}
+				} else if (cur_dest) {
+					char *foo = r_str_new (cur_dest);
+					char *tmp = strchr (foo, ',');
+					if (tmp) {
+						*tmp = '\0';
+					}
+					if (strstr (ret_reg, foo) || (tmp && strstr (ret_reg, tmp + 1))) {
+						resolved = true;
+					}
+					free (foo);
+				}
+			}
+			// Type Propgation using intruction access pattern
+			if (var) {
+				bool sign = false;
+				if ((type == R_ANAL_OP_TYPE_CMP) && next_op) {
+					if (next_op->sign) {
+						sign = true;
+					} else {
+						// cmp [local_ch], rax ; jb
+						var_retype (anal, var, NULL, "unsigned", addr, false, true);
+					}
+				}
+				// cmp [local_ch], rax ; jge
+				if (sign || aop.sign) {
+					var_retype (anal, var, NULL, "signed", addr, false, true);
+				}
+				// lea rax , str.hello  ; mov [local_ch], rax;
+				// mov rdx , [local_4h] ; mov [local_8h], rdx;
+				if (prev_dest && (type == R_ANAL_OP_TYPE_MOV || type == R_ANAL_OP_TYPE_STORE)) {
+					char reg[REG_SZ] = {0};
+					get_src_regname (core, addr, reg, sizeof (reg));
+					bool match = strstr (prev_dest, reg)? true: false;
+					if (str_flag && match) {
+						var_retype (anal, var, NULL, "const char *", addr, false, false);
+					}
+					if (prop && match && prev_var) {
+						var_retype (anal, var, NULL, prev_type, addr, false, false);
+					}
 				}
-				break;
 			}
+			prev_var = (var && aop.direction == R_ANAL_OP_DIR_READ)? true: false;
+			str_flag = false;
+			prop = false;
+			prev_dest = NULL;
+			switch (type) {
+			case R_ANAL_OP_TYPE_MOV:
+			case R_ANAL_OP_TYPE_LEA:
+			case R_ANAL_OP_TYPE_LOAD:
+				if (aop.ptr && aop.refptr && aop.ptr != UT64_MAX) {
+					if (type == R_ANAL_OP_TYPE_LOAD) {
+						ut8 buf[256] = {0};
+						r_io_read_at (core->io, aop.ptr, buf, sizeof (buf) - 1);
+						ut64 ptr = r_read_ble (buf, core->print->big_endian, aop.refptr * 8);
+						if (ptr && ptr != UT64_MAX) {
+							RFlagItem *f = r_flag_get_i (core->flags, ptr);
+							if (f && !strncmp (f->name, "str", 3)) {
+								str_flag = true;
+							}
+						}
+					} else if (r_flag_exist_at (core->flags, "str", 3, aop.ptr)) {
+						str_flag = true;
+					}
+				}
+				const char *query = sdb_fmt ("%d.reg.write", cur_idx);
+				prev_dest = sdb_const_get (trace, query, 0);
+				if (var) {
+					strncpy (prev_type, var->type, sizeof (prev_type) - 1);
+					prop = true;
+				}
+			}
+			i += ret;
+			addr += ret;
+			r_anal_op_free (next_op);
+			r_anal_op_fini (&aop);
+
 		}
-		r_cons_break_pop();
 	}
-	r_cons_break_pop ();
+	const char *place = r_anal_cc_arg (anal, fcn->cc, 1);
+	// Type propgation for register based args
+	RList *list = r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_REG);
+	RAnalVar *rvar, *bp_var;
+	RListIter *iter , *iter2;
+	r_list_foreach (list, iter, rvar) {
+		RAnalVar *lvar = get_link_var (anal, fcn->addr, rvar);
+		RRegItem *i = r_reg_index_get (anal->reg, rvar->delta);
+		if (!i) {
+			continue;
+		}
+		bool res = true;
+		const char *query = sdb_fmt ("fcn.0x%08"PFMT64x".arg.%s", fcn->addr, i->name);
+		char *type = (char *) sdb_const_get (anal->sdb_fcns, query, NULL);
+		if (lvar) {
+			var_retype (anal, rvar, NULL, lvar->type, fcn->addr, false, false);
+			if (!strstr (lvar->type, "int")) {
+				res = false;
+			}
+		}
+		if (type && res) {
+			var_retype (anal, rvar, NULL, type, fcn->addr, false, false);
+			if (lvar) {
+				var_retype (anal, lvar, NULL, type, fcn->addr, false, false);
+			}
+		}
+		r_anal_var_free (lvar);
+	}
+	// Type propgation from caller to callee function for stack based arguments
+	if (place && !strncmp (place, "stack", 5)) {
+		RList *list2 = r_anal_var_list (anal, fcn, R_ANAL_VAR_KIND_BPV);
+		r_list_foreach (list2, iter2, bp_var) {
+			if (bp_var->isarg) {
+				const char *query = sdb_fmt ("fcn.0x%08"PFMT64x".arg.%d", fcn->addr, (bp_var->delta - 8));
+				char *type = (char *) sdb_const_get (anal->sdb_fcns, query, NULL);
+				if (type) {
+					var_retype (anal, bp_var, NULL, type, fcn->addr, false, false);
+				}
+			}
+		}
+		r_list_free (list2);
+	}
+	r_list_free (list);
+out_function:
+	free (buf);
+	r_cons_break_pop();
 	r_anal_emul_restore (core, hc);
-	sdb_reset (core->anal->esil->db_trace);
+	sdb_reset (anal->esil->db_trace);
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/anal_vt.c radare2-2.8.0+dfsg/libr/core/anal_vt.c
--- radare2-2.3.0+dfsg/libr/core/anal_vt.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/anal_vt.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,223 +0,0 @@
-#define VTABLE_BUFF_SIZE 10
-
-typedef struct vtable_info_t {
-	ut64 saddr; //starting address
-	int methods;
-	RList* funtions;
-} vtable_info;
-
-static RList* getVtableMethods(RCore *core, vtable_info *table) {
-	RList* vtableMethods = r_list_new ();
-	if (table && core && vtableMethods) {
-		int curMethod = 0;
-		int totalMethods = table->methods;
-		ut64 startAddress = table->saddr;
-		int bits = r_config_get_i (core->config, "asm.bits");
-		int wordSize = bits / 8;
-		while (curMethod < totalMethods) {
-			ut64 curAddressValue;
-			r_io_read_i (core->io, startAddress, &curAddressValue, 8, false);	//XXX
-			RAnalFunction *curFuntion = r_anal_get_fcn_in (core->anal, curAddressValue, 0);
-			r_list_append (vtableMethods, curFuntion);
-			startAddress += wordSize;
-			curMethod++;
-		}
-		table->funtions = vtableMethods;
-		return vtableMethods;
-	}
-	r_list_free (vtableMethods);
-	return NULL;
-}
-
-static int inTextSection(RCore *core, ut64 curAddress) {
-	//section of the curAddress
-	RBinSection* value = r_bin_get_section_at (core->bin->cur->o, curAddress, true);
-	//If the pointed value lies in .text section
-	return value && !strcmp (value->name, ".text");
-}
-
-static int valueInTextSection(RCore *core, ut64 curAddress) {
-	//value at the current address
-	ut64 curAddressValue;
-	r_io_read_i (core->io, curAddress, &curAddressValue, 8, false);	//XXX
-	//if the value is in text section
-	return inTextSection (core, curAddressValue);
-}
-
-static int isVtableStart(RCore *core, ut64 curAddress) {
-	RAsmOp asmop = R_EMPTY;
-	RAnalRef *xref;
-	RListIter *xrefIter;
-	ut8 buf[VTABLE_BUFF_SIZE];
-	if (!curAddress || curAddress == UT64_MAX) {
-		return false;
-	}
-	if (valueInTextSection (core, curAddress)) {
-		// total xref's to curAddress
-		RList *xrefs = r_anal_xrefs_get (core->anal, curAddress);
-		if (!r_list_empty (xrefs)) {
-			r_list_foreach (xrefs, xrefIter, xref) {
-				// section in which currenct xref lies
-				if (inTextSection (core, xref->addr)) {
-					r_io_read_at (core->io, xref->addr, buf, VTABLE_BUFF_SIZE);
-					if (r_asm_disassemble (core->assembler, &asmop, buf, VTABLE_BUFF_SIZE) > 0) {
-						if ((!strncmp (asmop.buf_asm, "mov", 3)) ||
-						    (!strncmp (asmop.buf_asm, "lea", 3))) {
-							return true;
-						}
-					}
-				}
-			}
-		}
-	}
-	return false;
-}
-
-RList* search_virtual_tables(RCore *core){
-	if (!core) {
-		return NULL;
-	}
-	ut64 startAddress;
-	ut64 endAddress;
-	RListIter * iter;
-	RBinSection *section;
-	RList *vtables = r_list_newf ((RListFree)free);
-	if (!vtables) {
-		return NULL;
-	}
-	RList *sections = r_bin_get_sections (core->bin);
-	if (!sections) {
-		r_list_free (vtables);
-		return NULL;
-	}
-	ut64 bits = r_config_get_i (core->config, "asm.bits");
-	int wordSize = bits / 8;
-	r_list_foreach (sections, iter, section) {
-		if (!strcmp (section->name, ".rodata")) {
-			ut8 *segBuff = calloc (1, section->size);
-			r_io_read_at (core->io, section->vaddr, segBuff, section->vsize);
-			startAddress = section->vaddr;
-			endAddress = startAddress + (section->vsize) - (bits/8);
-			while (startAddress <= endAddress) {
-				if (isVtableStart (core, startAddress)) {
-					vtable_info *vtable = calloc (1, sizeof(vtable_info));
-					vtable->saddr = startAddress;
-					int noOfMethods = 0;
-					while (valueInTextSection (core, startAddress)) {
-						noOfMethods++;
-						startAddress += wordSize;
-					}
-					vtable->methods = noOfMethods;
-					r_list_append (vtables, vtable);
-					continue;
-				}
-				startAddress += 1;
-			}
-		}
-	}
-	if (r_list_empty (vtables)) {
-		// stripped binary?
-		eprintf ("No virtual tables found\n");
-		r_list_free (vtables);
-		return NULL;
-	}
-	return vtables;
-}
-
-R_API void r_core_anal_list_vtables(void *core, bool printJson) {
-	ut64 bits = r_config_get_i (((RCore *)core)->config, "asm.bits");
-	RList* vtables = search_virtual_tables ((RCore *)core);
-	const char *noMethodName = "No Name found";
-	RListIter* vtableMethodNameIter;
-	RAnalFunction *curMethod;
-	int wordSize = bits / 8;
-	RListIter* vtableIter;
-	vtable_info* table;
-
-	if (!vtables) {
-		return;
-	}
-	if (printJson) {
-		bool isFirstElement = true;
-		r_cons_print ("[");
-		r_list_foreach (vtables, vtableIter, table) {
-			if (!isFirstElement) {
-				r_cons_print (",");
-			}
-			r_cons_printf ("{\"offset\":%"PFMT64d",\"methods\":%d}",
-			  		table->saddr, table->methods);
-			isFirstElement = false;
-		}
-		r_cons_println ("]");
-	} else {
-		r_list_foreach (vtables, vtableIter, table) {
-			ut64 vtableStartAddress = table->saddr;
-			RList *vtableMethods = getVtableMethods ((RCore *)core, table);
-			if (vtableMethods) {
-				r_cons_printf ("\nVtable Found at 0x%08"PFMT64x"\n", 
-				  		vtableStartAddress);
-				r_list_foreach (vtableMethods, vtableMethodNameIter, curMethod) {
-					if (curMethod->name) {
-						r_cons_printf ("0x%08"PFMT64x" : %s\n", 
-						  		vtableStartAddress, curMethod->name);
-					} else {
-						r_cons_printf ("0x%08"PFMT64x" : %s\n", 
-						  		vtableStartAddress, noMethodName);
-					}
-					vtableStartAddress += wordSize;
-				}
-				r_cons_newline ();
-			}
-		}
-	}
-	r_list_free (vtables);
-}
-
-static void r_core_anal_list_vtables_all(void *core) {
-	RList* vtables = search_virtual_tables ((RCore *)core);
-	RListIter* vtableIter;
-	RListIter* vtableMethodNameIter;
-	RAnalFunction* function;
-	vtable_info* table;
-
-	r_list_foreach (vtables, vtableIter, table) {
-		RList *vtableMethods = getVtableMethods ((RCore *)core, table);
-		r_list_foreach (vtableMethods, vtableMethodNameIter, function) {
-			// char *ret = r_str_newf ("vtable.%s", table->funtio);
-			r_cons_printf ("f %s=0x%08"PFMT64x"\n", function->name, function->addr);
-		}
-	}
-	r_list_free (vtables);
-}
-
-static rtti_struct* get_rtti_data (RCore *core, ut64 atAddress) {
-	ut64 bits = r_config_get_i (core->config, "asm.bits");
-	int wordSize = bits / 8;
-	ut64 BaseLocatorAddr;
-	r_io_read_i (core->io, atAddress - wordSize, &BaseLocatorAddr, wordSize, false);	//XXX
-	eprintf ("Trying to parse rtti at 0x%08"PFMT64x"\n", BaseLocatorAddr);
-	return NULL;
-}
-
-RList* r_core_anal_parse_rtti (void *core, bool printJson) {
-	RList* vtables = search_virtual_tables ((RCore *)core);
-	RListIter* vtableIter;
-	RList* rtti_structures = r_list_new ();
-	vtable_info* table;
-
-	if (vtables) {
-		r_list_foreach (vtables, vtableIter, table) {
-			rtti_struct* current_rtti = get_rtti_data ((RCore *)core, table->saddr);
-			if (current_rtti) {
-				current_rtti->vtable_start_addr = table->saddr;
-				r_list_append (rtti_structures, current_rtti);
-			}
-		}
-	}
-	r_list_free (vtables);
-	return rtti_structures;
-}
-
-R_API void r_core_anal_print_rtti (void *core) {
-	eprintf ("Work in progress\n");
-}
diff -Nru radare2-2.3.0+dfsg/libr/core/asm.c radare2-2.8.0+dfsg/libr/core/asm.c
--- radare2-2.3.0+dfsg/libr/core/asm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/asm.c	2018-08-07 14:12:36.000000000 +0000
@@ -76,7 +76,7 @@
 	int matches = 0;
 	const int addrbytes = core->io->addrbytes;
 
-	if (!*input) {
+	if (!input || !*input) {
 		return NULL;
 	}
 	if (core->blocksize <= OPSZ) {
@@ -120,7 +120,7 @@
 			r_asm_set_pc (core->assembler, addr);
 			if (mode == 'e') {
 				RAnalOp analop = {0};
-				if (r_anal_op (core->anal, &analop, addr, buf + idx, 15) < 1) {
+				if (r_anal_op (core->anal, &analop, addr, buf + idx, 15, R_ANAL_OP_MASK_ESIL) < 1) {
 					idx ++; // TODO: honor mininstrsz
 					continue;
 				}
@@ -145,7 +145,9 @@
 					matches = strstr (opst, tokens[matchcount]) != NULL;
 				} else {
 					rx = r_regex_new (tokens[matchcount], "");
-					matches = r_regex_exec (rx, opst, 0, 0, 0) == 0;
+					if (r_regex_comp (rx, tokens[matchcount], R_REGEX_EXTENDED|R_REGEX_NOSUB) == 0) {
+						matches = r_regex_exec (rx, opst, 0, 0, 0) == 0;
+					}
 					r_regex_free (rx);
 				}
 			}
@@ -442,7 +444,9 @@
 	}
 
 	for (idx = addrbytes; idx < len; idx += addrbytes) {
-		if (r_cons_singleton ()->breaked) break;
+		if (r_cons_is_breaked ()) {
+			break;
+		}
 		c = r_asm_mdisassemble (core->assembler, buf+(len-idx), idx);
 		if (strstr (c->buf_asm, "invalid") || strstr (c->buf_asm, ".byte")) {
 			r_asm_code_free(c);
@@ -504,7 +508,9 @@
 	}
 
 	do {
-		if (r_cons_singleton ()->breaked) break;
+		if (r_cons_is_breaked ()) {
+			break;
+		}
 		// reset assembler
 		r_asm_set_pc (core->assembler, current_instr_addr);
 		current_instr_len = len - current_buf_pos + extra_padding;
@@ -583,12 +589,13 @@
 	next_buf_pos = len + extra_padding - 1;
 	current_instr_addr = addr-1;
 	do {
-		if (r_cons_singleton ()->breaked) break;
+		if (r_cons_is_breaked ()) {
+			break;
+		}
 		// reset assembler
 		r_asm_set_pc (core->assembler, current_instr_addr);
 		current_instr_len = next_buf_pos - current_buf_pos;
 		current_instr_len = r_asm_disassemble (core->assembler, &op, buf+current_buf_pos, current_instr_len);
-
 		IFDBG {
 			ut32 byte_cnt =  current_instr_len ? current_instr_len : 1;
 			eprintf("current_instr_addr: 0x%"PFMT64x", current_buf_pos: 0x%"PFMT64x", current_instr_len: %d \n", current_instr_addr, current_buf_pos, current_instr_len);
@@ -596,12 +603,12 @@
 			ut8 *hex_str = (ut8*)r_hex_bin2strdup(buf+current_buf_pos, byte_cnt);
 			eprintf("==== current_instr_bytes: %s ",hex_str);
 
-			if (current_instr_len > 0)
+			if (current_instr_len > 0) {
 				eprintf("op.buf_asm: %s\n", op.buf_asm);
-			else
+			} else {
 				eprintf("op.buf_asm: <invalid>\n");
-
-			free(hex_str);
+			}
+			free (hex_str);
 		}
 
 		// disassembly invalid
diff -Nru radare2-2.3.0+dfsg/libr/core/blaze.c radare2-2.8.0+dfsg/libr/core/blaze.c
--- radare2-2.3.0+dfsg/libr/core/blaze.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/blaze.c	2018-08-07 14:12:36.000000000 +0000
@@ -190,20 +190,21 @@
 	f->addr = fcn->addr;
 	f->bits = core->anal->bits;
 	f->cc = r_str_const (r_anal_cc_default (core->anal));
-	r_anal_fcn_set_size (f, fcn->size);
+	r_anal_fcn_set_size (NULL, f, fcn->size);
 	f->type = R_ANAL_FCN_TYPE_FCN;
 
 	r_list_foreach (fcn->bbs, fcn_iter, cur) {
 		r_anal_fcn_add_bb (core->anal, f, cur->start, (cur->end - cur->start), cur->jump, cur->fail, 0, NULL);
 	}
 	if (!r_anal_fcn_insert (core->anal, f)) {
-		eprintf ("Failed to insert function\n");
+		// eprintf ("Failed to insert function\n");
+		r_anal_fcn_free (f);
 		//TODO free not added function
 		return;
 	}
 }
 
-#define Fhandled(x) sdb_fmt(0, "handled.%"PFMT64x"", x)
+#define Fhandled(x) sdb_fmt("handled.%"PFMT64x"", x)
 R_API bool core_anal_bbs(RCore *core, const char* input) {
 	if (!r_io_is_valid_offset (core->io, core->offset, false)) {
 		eprintf ("No valid offset given to analyze\n");
@@ -222,6 +223,7 @@
 	bb_t *block = NULL;
 	int invalid_instruction_barrier = -20000;
 	bool debug = r_config_get_i (core->config, "cfg.debug");
+	bool nopskip = r_config_get_i (core->config, "anal.nopskip");
 
 	block_list = r_list_new ();
 	if (!block_list) {
@@ -240,7 +242,7 @@
 		if (block_score < invalid_instruction_barrier) {
 			break;
 		}
-		op = r_core_anal_op (core, start + cur);
+		op = r_core_anal_op (core, start + cur, R_ANAL_OP_MASK_BASIC);
 
 		if (!op || !op->mnemonic) {
 			block_score -= 10;
@@ -257,6 +259,9 @@
 		}
 		switch (op->type) {
 		case R_ANAL_OP_TYPE_NOP:
+				if (nopskip && b_start == start + cur) {
+					b_start = start + cur + op->size;
+				}
 			break;
 		case R_ANAL_OP_TYPE_CALL:
 			if (r_anal_noreturn_at (core->anal, op->jump)) {
@@ -384,7 +389,7 @@
 			}
 		}
 
-		sdb_ptr_set (sdb, sdb_fmt (0, "bb.0x%08"PFMT64x, block->start), block, 0);
+		sdb_ptr_set (sdb, sdb_fmt ("bb.0x%08"PFMT64x, block->start), block, 0);
 		r_list_append (result, block);
 	}
 
@@ -429,7 +434,7 @@
 				fcnAddBB (current_function, cur);
 
 				if (cur->jump < UT64_MAX && !sdb_num_get (sdb, Fhandled(cur->jump), NULL)) {
-					jump = sdb_ptr_get (sdb, sdb_fmt (0, "bb.0x%08"PFMT64x, cur->jump), NULL);
+					jump = sdb_ptr_get (sdb, sdb_fmt ("bb.0x%08"PFMT64x, cur->jump), NULL);
 					if (!jump) {
 						eprintf ("Failed to get jump block at 0x%"PFMT64x"\n", cur->jump);
 						continue;
@@ -440,7 +445,7 @@
 				}
 
 				if (cur->fail < UT64_MAX && !sdb_num_get (sdb, Fhandled(cur->fail), NULL)) {
-					fail = sdb_ptr_get (sdb, sdb_fmt (0, "bb.0x%08" PFMT64x, cur->fail), NULL);
+					fail = sdb_ptr_get (sdb, sdb_fmt ("bb.0x%08" PFMT64x, cur->fail), NULL);
 					if (!fail) {
 						eprintf ("Failed to get fail block at 0x%"PFMT64x"\n", cur->fail);
 						continue;
@@ -466,6 +471,302 @@
 			r_stack_free (stack);
 		}
 	}
+
+	sdb_free (sdb);
+	r_list_free (result);
+	r_list_free (block_list);
+	return true;
+}
+
+R_API bool core_anal_bbs_range (RCore *core, const char* input) {
+	if (!r_io_is_valid_offset (core->io, core->offset, false)) {
+		eprintf ("No valid offset given to analyze\n");
+		return false;
+	}
+
+	Sdb *sdb = NULL;
+	ut64 cur = 0;
+	ut64 start = core->offset;
+	ut64 size = input[0] ? r_num_math (core->num, input + 1) : core->blocksize;
+	ut64 b_start = start;
+	RAnalOp *op;
+	RListIter *iter;
+	int block_score = 0;
+	RList *block_list;
+	bb_t *block = NULL;
+	int invalid_instruction_barrier = -20000;
+	bool debug = r_config_get_i (core->config, "cfg.debug");
+	ut64 lista[1024] = { 0 };
+	int idx = 0;
+	int x;
+
+	block_list = r_list_new ();
+	if (!block_list) {
+		eprintf ("Failed to create block_list\n");
+	}
+	if (debug) {
+		eprintf ("Analyzing [0x%08"PFMT64x"-0x%08"PFMT64x"]\n", start, start + size);
+		eprintf ("Creating basic blocks\b");
+	}
+	lista[idx++] = b_start;
+	for (x = 0; x < 1024; x++) {
+		if (lista[x] != 0) {
+			cur =0;
+			b_start = lista[x];
+			lista[x] = 0;
+			while (cur < size) {
+				if (r_cons_is_breaked ()) {
+					break;
+				}
+				// magic number to fix huge section of invalid code fuzz files
+				if (block_score < invalid_instruction_barrier) {
+					break;
+				}
+
+				bool bFound = false;
+				// check if offset dont have into block_list, to end branch analisys
+				r_list_foreach (block_list, iter, block) {
+					if ( (block->type == END || block->type == NORMAL) && b_start + cur == block->start ) {
+						bFound = true;
+						break;
+					}
+				}
+
+				if (!bFound) {
+					op = r_core_anal_op (core, b_start + cur, R_ANAL_OP_MASK_BASIC);
+
+					if (!op || !op->mnemonic) {
+						block_score -= 10;
+						cur++;
+						continue;
+					}
+
+					if (op->mnemonic[0] == '?') {
+						eprintf ("? Bad op at: 0x%08"PFMT64x"\n", cur + b_start);
+						eprintf ("Cannot analyze opcode at %"PFMT64x"\n", b_start + cur);
+						block_score -= 10;
+						cur++;
+						continue;
+					}
+					//eprintf ("0x%08"PFMT64x" %s\n", b_start + cur, op->mnemonic);
+					switch (op->type) {
+					case R_ANAL_OP_TYPE_RET:
+						addBB (block_list, b_start, b_start + cur + op->size, UT64_MAX, UT64_MAX, END, block_score);
+						cur = size;
+						break;
+					case R_ANAL_OP_TYPE_UJMP:
+					case R_ANAL_OP_TYPE_IRJMP:
+						addBB (block_list, b_start, b_start + cur + op->size, op->jump, UT64_MAX, END, block_score);
+						cur = size;
+						break;
+					case R_ANAL_OP_TYPE_JMP:
+						addBB (block_list, b_start, b_start + cur + op->size, op->jump, UT64_MAX, END, block_score);
+						b_start = op->jump;
+						cur = 0;
+						block_score = 0;
+						break;
+					case R_ANAL_OP_TYPE_CJMP:
+						//eprintf ("bb_b  0x%08"PFMT64x" - 0x%08"PFMT64x"\n", b_start, b_start + cur + op->size);
+						addBB (block_list, b_start, b_start + cur + op->size, op->jump, b_start + cur + op->size, NORMAL, block_score);
+						b_start = b_start + cur + op->size;
+						cur = 0;
+						if (idx < 1024) {
+							lista[idx++] = op->jump;
+						}
+						block_score = 0;
+						break;
+					case R_ANAL_OP_TYPE_TRAP:
+					case R_ANAL_OP_TYPE_UNK:
+					case R_ANAL_OP_TYPE_ILL:
+						block_score -= 10;
+						cur += op->size;
+						break;
+					default:
+						cur += op->size;
+						break;
+					}
+					r_anal_op_free (op);
+					op = NULL;
+				}
+				else {
+					// we have this offset into previous analized block, exit from this path flow.
+					break;
+				}
+			}
+		}
+	}
+	if (debug) {
+		eprintf ("Found %d basic blocks\n", block_list->length);
+	}
+
+	RList *result = r_list_newf (free);
+	if (!result) {
+		r_list_free (block_list);
+		eprintf ("Failed to create resulting list\n");
+		return false;
+	}
+
+	sdb = sdb_new0 ();
+	if (!sdb) {
+		eprintf ("Failed to initialize sdb db\n");
+		r_list_free (block_list);
+		r_list_free (result);
+		return false;
+	}
+
+	r_list_sort (block_list, (RListComparator)bbCMP);
+
+	if (debug) {
+		eprintf ("Sorting all blocks done\n");
+		eprintf ("Creating the complete graph\n");
+	}
+
+	while (block_list->length > 0) {
+		block = r_list_pop (block_list);
+		if (!block) {
+			eprintf ("Failed to get next block from list\n");
+			continue;
+		}
+		if (r_cons_is_breaked ()) {
+			break;
+		}
+
+		if (block_list->length > 0) {
+			bb_t *next_block = (bb_t*)r_list_iter_get_data (block_list->tail);
+			if (!next_block) {
+				eprintf ("No next block to compare with!\n");
+			}
+
+			// current block is just a split block
+			if (block->start == next_block->start && block->end == UT64_MAX) {
+				if (block->type != CALL && next_block->type != CALL) {
+					next_block->reached = block->reached + 1;
+				}
+				free (block);
+				continue;
+			}
+
+			// block and next_block share the same start so we copy the
+			// contenct of the block into the next_block and skip the current one
+			if (block->start == next_block->start && next_block->end == UT64_MAX) {
+				if (next_block->type != CALL) {
+					block->reached += 1;
+				}
+				*next_block = *block;
+				free (block);
+				continue;
+			}
+
+			if (block->end < UT64_MAX && next_block->start < block->end && next_block->start > block->start) {
+				if (next_block->jump == UT64_MAX) {
+					next_block->jump = block->jump;
+				}
+
+				if (next_block->fail == UT64_MAX) {
+					next_block->fail = block->fail;
+				}
+
+				next_block->end = block->end;
+				block->end = next_block->start;
+				block->jump = next_block->start;
+				block->fail = UT64_MAX;
+				next_block->type = block->type;
+				if (next_block->type != CALL) {
+					next_block->reached += 1;
+				}
+			}
+		}
+
+		sdb_ptr_set (sdb, sdb_fmt ("bb.0x%08"PFMT64x, block->start), block, 0);
+		r_list_append (result, block);
+	}
+
+	// finally add bb to fuction
+	// we simply assume that non reached blocks
+	// dont are part of the created function
+	if (debug) {
+		eprintf ("Trying to create functions\n");
+	}
+
+	r_list_foreach (result, iter, block) {
+		if (r_cons_is_breaked ()) {
+			break;
+		}
+		if (block && (block->reached == 0)) {
+			fcn_t* current_function = fcnNew (block);
+			RStack *stack = r_stack_new (100);
+			bb_t *jump = NULL;
+			bb_t *fail = NULL;
+			bb_t *cur = NULL;
+
+			if (!r_stack_push (stack, (void*)block)) {
+				eprintf ("Failed to push initial block\n");
+			}
+
+			while (!r_stack_is_empty (stack)) {
+				cur = (bb_t*)r_stack_pop (stack);
+				if (!cur) {
+					continue;
+				}
+				sdb_num_set (sdb, Fhandled (cur->start), 1, 0);
+				if (cur->score < 0) {
+					fcnFree (current_function);
+					current_function = NULL;
+					break;
+				}
+				// we ignore negative blocks
+				if ((st64)(cur->end - cur->start) < 0) {
+					break;
+				}
+
+				fcnAddBB (current_function, cur);
+
+				if (cur->jump < UT64_MAX && !sdb_num_get (sdb, Fhandled (cur->jump), NULL)) {
+					jump = sdb_ptr_get (sdb, sdb_fmt ("bb.0x%08"PFMT64x, cur->jump), NULL);
+					if (!jump) {
+						eprintf ("Failed to get jump block at 0x%"PFMT64x"\n", cur->jump);
+						continue;
+					}
+					if (!r_stack_push (stack, (void*)jump)) {
+						eprintf ("Failed to push jump block to stack\n");
+					}
+				}
+
+				if (cur->fail < UT64_MAX && !sdb_num_get (sdb, Fhandled (cur->fail), NULL)) {
+					fail = sdb_ptr_get (sdb, sdb_fmt ("bb.0x%08" PFMT64x, cur->fail), NULL);
+					if (!fail) {
+						eprintf ("Failed to get fail block at 0x%"PFMT64x"\n", cur->fail);
+						continue;
+					}
+					if (!r_stack_push (stack, (void*)fail)) {
+						eprintf ("Failed to push jump block to stack\n");
+					}
+				}
+			}
+
+			// function creation complete
+			if (current_function) {
+				// check for supply fuction address match with current block
+				if (current_function->addr == start) {
+					// set supply fuction size
+					current_function->size = size;
+					if (checkFunction (current_function)) {
+						if (input[0] == '*') {
+							printFunctionCommands (core, current_function, NULL);
+						}
+						else {
+							createFunction (core, current_function, NULL);
+						}
+						fcnFree (current_function);
+						r_stack_free (stack);
+						break;
+					}
+				}
+				fcnFree (current_function);
+			}
+			r_stack_free (stack);
+		}
+	}
 
 	sdb_free (sdb);
 	r_list_free (result);
diff -Nru radare2-2.3.0+dfsg/libr/core/canal.c radare2-2.8.0+dfsg/libr/core/canal.c
--- radare2-2.3.0+dfsg/libr/core/canal.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/canal.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake, nibble */
+/* radare - LGPL - Copyright 2009-2018 - pancake, nibble */
 
 #include <r_types.h>
 #include <r_list.h>
@@ -9,7 +9,6 @@
 #include <string.h>
 
 #define SLOW_IO 0
-#define HASNEXT_FOREVER 1
 
 #define HINTCMD_ADDR(hint,x,y) if(hint->x) \
 	r_cons_printf (y" @ 0x%"PFMT64x"\n", hint->x, hint->addr)
@@ -22,6 +21,12 @@
 	int count;
 } HintListState;
 
+// used to speedup strcmp with rconfig.get in loops
+enum {
+	R2_ARCH_ARM64
+} R2Arch;
+
+
 static void add_string_ref(RCore *core, ut64 xref_to);
 static int cmpfcn(const void *_a, const void *_b);
 
@@ -31,15 +36,14 @@
 }
 
 static char *getFunctionName(RCore *core, ut64 addr) {
-	RBinClass *klass;
-	RBinSymbol *method;
-	RListIter *iter, *iter2;
-        RList *klasses = r_bin_get_classes (core->bin);
-	r_list_foreach (klasses, iter, klass) {
-		r_list_foreach (klass->methods, iter2, method) {
-			if (method->vaddr == addr) {
-				return r_str_newf ("method.%s.%s", klass->name, method->name);
-			}
+	RBinFile *bf = r_bin_cur (core->bin);
+	RBinObject *bo = r_bin_file_object_get_cur (bf);
+	if (bo) {
+		Sdb *kv = bo->addr2klassmethod;
+		char *at = sdb_fmt ("0x%08"PFMT64x, addr);
+		char *res = sdb_get (kv, at, 0);
+		if (res) {
+			return strdup (res);
 		}
 	}
 	RFlagItem *fi = r_flag_get_at (core->flags, addr, false);
@@ -100,29 +104,78 @@
 #endif
 
 static char *is_string_at(RCore *core, ut64 addr, int *olen) {
+	ut8 rstr[128] = {0};
+	int ret = 0, len = 0;
 	ut8 *str;
-	int ret, len = 0;
 	//there can be strings in code section
 #if 0
 	if (iscodesection (core, addr)) {
 		return NULL;
 	}
 #endif
-	str = calloc (1024, 1);
+	str = calloc (256, 1);
 	if (!str) {
+		if (olen) {
+			*olen = 0;
+		}
 		return NULL;
 	}
-	r_io_read_at (core->io, addr, str, 1024);
-	str[1023] = 0;
+	r_io_read_at (core->io, addr, str, 255);
+
+	str[255] = 0;
+	if (is_string (str, 256, &len)) {
+		if (olen) {
+			*olen = len;
+		}
+		return (char*) str;
+	}
+	
+	ut64 *cstr = (ut64*)str;
+	ut64 lowptr = cstr[0];
+	if (lowptr >> 32) { // must be pa mode only
+		lowptr &= UT32_MAX;
+	}
+	// eprintf ("PTR %llx [ %llx %llx %llx ]\n", addr, cstr[0], cstr[1], cstr[2]);
+	// cstring
+	if (cstr[0] == 0 && cstr[1] < 0x1000) {
+		ut64 ptr = cstr[2];
+		if (ptr >> 32) { // must be pa mode only
+			ptr &= UT32_MAX;
+		}
+		if (ptr) {	
+			r_io_read_at (core->io, ptr, rstr, sizeof (rstr));
+			rstr[127] = 0;
+			ret = is_string (rstr, 128, &len);
+			if (ret) {
+				strcpy ((char*) str, (char*) rstr);
+				if (olen) {
+					*olen = len;
+				}
+				return (char*) str;
+			}
+		}
+	} else {
+		// pstring
+		r_io_read_at (core->io, lowptr, rstr, sizeof (rstr));
+		rstr[127] = 0;
+		ret = is_string (rstr, sizeof (rstr), &len);
+		if (ret) {
+			strcpy ((char*) str, (char*) rstr);
+			if (olen) {
+				*olen = len;
+			}
+			return (char*) str;
+		}
+	}
 	// check if current section have no exec bit
-	ret = is_string (str, 1024, &len);
-	if (!ret || len < 1) {
+	if (len < 1) {
 		ret = 0;
 		free (str);
 		len = -1;
 	} else if (olen) {
 		*olen = len;
 	}
+	// NOTE: coverity says that ret is always 0 here, so str is dead code
 	return ret? (char *)str: NULL;
 }
 
@@ -265,12 +318,92 @@
 	return types;
 }
 
+static bool blacklisted_word(char* name) {
+	const char * list[] = {
+		"__stack_chk_guard", "__stderrp", "__stdinp", "__stdoutp", "_DefaultRuneLocale"
+	};
+	int i;
+	for (i = 0; i < sizeof (list) / sizeof (list[0]); i++) {
+		if (strstr (name, list[i])) { return true; }
+	}
+	return false;
+}
+
+static char *anal_fcn_autoname(RCore *core, RAnalFunction *fcn, int dump) {
+	int use_getopt = 0;
+	int use_isatty = 0;
+	char *do_call = NULL;
+	RAnalRef *ref;
+	RListIter *iter;
+	RList *refs = r_anal_fcn_get_refs (core->anal, fcn);
+	r_list_foreach (refs, iter, ref) {
+		RFlagItem *f = r_flag_get_i (core->flags, ref->addr);
+		if (f) {
+			if (dump) {
+				r_cons_printf ("0x%08"PFMT64x" 0x%08"PFMT64x" %s\n", ref->at, ref->addr, f->name);
+			}
+			if (blacklisted_word (f->name)) {
+				break;
+			}
+			if (strstr (f->name, ".isatty")) {
+				use_isatty = 1;
+			}
+			if (strstr (f->name, ".getopt")) {
+				use_getopt = 1;
+			}
+			if (!strncmp (f->name, "method.", 7)) {
+				free (do_call);
+				do_call = strdup (f->name + 7);
+				break;
+			}
+			if (!strncmp (f->name, "str.", 4)) {
+				free (do_call);
+				do_call = strdup (f->name + 4);
+				break;
+			}
+			if (!strncmp (f->name, "sym.imp.", 8)) {
+				free (do_call);
+				do_call = strdup (f->name + 8);
+				break;
+			}
+			if (!strncmp (f->name, "reloc.", 6)) {
+				free (do_call);
+				do_call = strdup (f->name + 6);
+				break;
+			}
+		}
+	}
+	r_list_free (refs);
+	// TODO: append counter if name already exists
+	if (use_getopt) {
+		RFlagItem *item = r_flag_get (core->flags, "main");
+		free (do_call);
+		// if referenced from entrypoint. this should be main
+		if (item && item->offset == fcn->addr) {
+			return strdup ("main"); // main?
+		}
+		return strdup ("parse_args"); // main?
+	}
+	if (use_isatty) {
+		char *ret = r_str_newf ("sub.setup_tty_%s_%x", do_call, fcn->addr & 0xfff);
+		free (do_call);
+		return ret;
+	}
+	if (do_call) {
+		char *ret = r_str_newf ("sub.%s_%x", do_call, fcn->addr & 0xfff);
+		free (do_call);
+		return ret;
+	}
+	return NULL;
+}
+
 /*this only autoname those function that start with fcn.* or sym.func.* */
 R_API void r_core_anal_autoname_all_fcns(RCore *core) {
 	RListIter *it;
 	RAnalFunction *fcn;
+
 	r_list_foreach (core->anal->fcns, it, fcn) {
-		char *name = r_core_anal_fcn_autoname (core, fcn->addr, 0);
+		char *name = anal_fcn_autoname (core, fcn, 0);
 		if (name && (!strncmp (fcn->name, "fcn.", 4) || \
 				!strncmp (fcn->name, "sym.func.", 9))) {
 			r_flag_rename (core->flags, r_flag_get (core->flags, fcn->name), name);
@@ -282,86 +415,12 @@
 	}
 }
 
-static bool blacklisted_word(char* name) {
-	const char * list[] = {
-		"__stack_chk_guard", "__stderrp", "__stdinp", "__stdoutp", "_DefaultRuneLocale"
-	};
-	int i;
-	for (i = 0; i < sizeof (list) / sizeof (list[0]); i++) {
-        	if (strstr (name, list[i])) { return true; }
-	}
-	return false;
-}
-
 /* suggest a name for the function at the address 'addr'.
  * If dump is true, every strings associated with the function is printed */
 R_API char *r_core_anal_fcn_autoname(RCore *core, ut64 addr, int dump) {
-	int use_getopt = 0;
-	int use_isatty = 0;
-	char *do_call = NULL;
 	RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, 0);
 	if (fcn) {
-		RAnalRef *ref;
-		RListIter *iter;
-		RList *refs = r_anal_fcn_get_refs (core->anal, fcn);
-		r_list_foreach (refs, iter, ref) {
-			RFlagItem *f = r_flag_get_i (core->flags, ref->addr);
-			if (f) {
-				if (dump) {
-					r_cons_printf ("0x%08"PFMT64x" 0x%08"PFMT64x" %s\n", ref->at, ref->addr, f->name);
-				}
-				if (blacklisted_word (f->name)) {
-					break;
-				}
-				if (strstr (f->name, ".isatty")) {
-					use_isatty = 1;
-				}
-				if (strstr (f->name, ".getopt")) {
-					use_getopt = 1;
-				}
-				if (!strncmp (f->name, "method.", 7)) {
-					free (do_call);
-					do_call = strdup (f->name + 7);
-					break;
-				}
-				if (!strncmp (f->name, "str.", 4)) {
-					free (do_call);
-					do_call = strdup (f->name + 4);
-					break;
-				}
-				if (!strncmp (f->name, "sym.imp.", 8)) {
-					free (do_call);
-					do_call = strdup (f->name + 8);
-					break;
-				}
-				if (!strncmp (f->name, "reloc.", 6)) {
-					free (do_call);
-					do_call = strdup (f->name + 6);
-					break;
-				}
-			}
-		}
-		r_list_free (refs);
-		// TODO: append counter if name already exists
-		if (use_getopt) {
-			RFlagItem *item = r_flag_get (core->flags, "main");
-			free (do_call);
-			// if referenced from entrypoint. this should be main
-			if (item && item->offset == addr) {
-				return strdup ("main"); // main?
-			}
-			return strdup ("parse_args"); // main?
-		}
-		if (use_isatty) {
-			char *ret = r_str_newf ("sub.setup_tty_%s_%x", do_call, addr & 0xfff);
-			free (do_call);
-			return ret;
-		}
-		if (do_call) {
-			char *ret = r_str_newf ("sub.%s_%x", do_call, addr & 0xfff);
-			free (do_call);
-			return ret;
-		}
+		return anal_fcn_autoname (core, fcn, dump);
 	}
 	return NULL;
 }
@@ -384,7 +443,7 @@
 	r_list_foreach (refs, iter, ref) {
 		if (ref->type == R_ANAL_REF_TYPE_DATA &&
 		    r_bin_is_string (core->bin, ref->addr)) {
-			ref->type = R_ANAL_REF_TYPE_STRING;
+			r_anal_xrefs_set (core->anal, ref->at, ref->addr, R_ANAL_REF_TYPE_STRING);
 		}
 	}
 	r_list_free (refs);
@@ -456,35 +515,61 @@
 }
 
 static int r_anal_analyze_fcn_refs(RCore *core, RAnalFunction *fcn, int depth) {
-	RListIter *iter, *tmp;
+	RListIter *iter;
 	RAnalRef *ref;
 	RList *refs = r_anal_fcn_get_refs (core->anal, fcn);
 
-	r_list_foreach_safe (refs, iter, tmp, ref) {
-		if (ref->addr != UT64_MAX) {
-			switch (ref->type) {
-			case 'd':
-				if (core->anal->opt.followdatarefs) {
-					r_anal_try_get_fcn (core, ref, depth, 2);
-				}
-				break;
-			case R_ANAL_REF_TYPE_CODE:
-			case R_ANAL_REF_TYPE_CALL:
-				r_core_anal_fcn (core, ref->addr, ref->at, ref->type, depth-1);
-				break;
-			default:
-				break;
+	r_list_foreach (refs, iter, ref) {
+		if (ref->addr == UT64_MAX) {
+			continue;
+		}
+		switch (ref->type) {
+		case 'd':
+			if (core->anal->opt.followdatarefs) {
+				r_anal_try_get_fcn (core, ref, depth, 2);
 			}
-			// TODO: fix memleak here, fcn not freed even though it is
-			// added in core->anal->fcns which is freed in r_anal_free()
+			break;
+		case R_ANAL_REF_TYPE_CODE:
+		case R_ANAL_REF_TYPE_CALL:
+			r_core_anal_fcn (core, ref->addr, ref->at, ref->type, depth-1);
+			break;
+		default:
+			break;
 		}
+		// TODO: fix memleak here, fcn not freed even though it is
+		// added in core->anal->fcns which is freed in r_anal_free()
 	}
-
 	r_list_free (refs);
 	return 1;
 }
 
+static void function_rename(RFlag *flags, RAnalFunction *fcn) {
+	const char *locname = "loc.";
+	const size_t locsize = strlen (locname);
+	char *fcnname = fcn->name;
+
+	if (strncmp (fcn->name, locname, locsize) == 0) {
+		const char *fcnpfx, *restofname;
+		RFlagItem *f;
+
+		fcn->type = R_ANAL_FCN_TYPE_FCN;
+		fcnpfx = r_anal_fcn_type_tostring (fcn->type);
+		restofname = fcn->name + locsize;
+		fcn->name = r_str_newf ("%s.%s", fcnpfx, restofname);
+
+		f = r_flag_get_i (flags, fcn->addr);
+		r_flag_rename (flags, f, fcn->name);
+
+		free (fcnname);
+	}
+}
+
 static int core_anal_fcn(RCore *core, ut64 at, ut64 from, int reftype, int depth) {
+	if (depth < 0) {
+//		printf ("Too deep for 0x%08"PFMT64x"\n", at);
+//		r_sys_backtrace ();
+		return false;
+	}
 	int has_next = r_config_get_i (core->config, "anal.hasnext");
 	RAnalHint *hint;
 	ut8 *buf = NULL;
@@ -509,7 +594,7 @@
 		fcn->bits = core->anal->bits;
 	}
 	fcn->addr = at;
-	r_anal_fcn_set_size (fcn, 0);
+	r_anal_fcn_set_size (NULL, fcn, 0);
 	fcn->name = getFunctionName (core, at);
 
 	if (!fcn->name) {
@@ -523,7 +608,6 @@
 	}
 	do {
 		RFlagItem *f;
-		RAnalRef *ref;
 		int delta = r_anal_fcn_size (fcn);
 		// XXX hack slow check io error
 		if (core->io->va) {
@@ -632,13 +716,6 @@
 
 			/* New function: Add initial xref */
 			if (from != UT64_MAX) {
-				// We shuold not use fcn->xrefs .. because that should be only via api (on top of sdb)
-				// the concepts of refs and xrefs are a bit twisted in the old implementation
-				ref = r_anal_ref_new ();
-				if (!ref) {
-					eprintf ("Error: new (xref)\n");
-					goto error;
-				}
 				if (fcn->type == R_ANAL_FCN_TYPE_LOC) {
 					RAnalFunction *f = r_anal_get_fcn_in (core->anal, from, -1);
 					if (f) {
@@ -649,11 +726,7 @@
 						r_list_sort (f->fcn_locs, &cmpfcn);
 					}
 				}
-				ref->addr = from;
-				ref->at = fcn->addr;
-				ref->type = reftype;
-				// XXX this is creating dupped entries in the refs list with invalid reftypes, wtf?
-				r_anal_xrefs_set (core->anal, reftype, from, fcn->addr);
+				r_anal_xrefs_set (core->anal, from, fcn->addr, reftype);
 			}
 			// XXX: this is wrong. See CID 1134565
 			r_anal_fcn_insert (core->anal, fcn);
@@ -730,12 +803,10 @@
 			if (!sect || (sect && (sect->flags & 1))) {
 				next = next_append (next, &nexti, newaddr);
 				for (i = 0; i < nexti; i++) {
-					if (!next[i]) continue;
-#if HASNEXT_FOREVER
-					r_core_anal_fcn (core, next[i], next[i], 0, 9999);
-#else
+					if (!next[i]) {
+						continue;
+					}
 					r_core_anal_fcn (core, next[i], next[i], 0, depth - 1);
-#endif
 				}
 				free (next);
 			}
@@ -745,7 +816,7 @@
 }
 
 /* decode and return the RANalOp at the address addr */
-R_API RAnalOp* r_core_anal_op(RCore *core, ut64 addr) {
+R_API RAnalOp* r_core_anal_op(RCore *core, ut64 addr, int mask) {
 	int len;
 	RAnalOp *op;
 	ut8 buf[128];
@@ -773,7 +844,7 @@
 		ptr = buf;
 		len = sizeof (buf);
 	}
-	if (r_anal_op (core->anal, op, addr, ptr, len) < 1) {
+	if (r_anal_op (core->anal, op, addr, ptr, len, mask) < 1) {
 		goto err_op;
 	}
 
@@ -798,6 +869,12 @@
 	HINTCMD (hint, syntax, " syntax='%s'", false);
 	HINTCMD (hint, immbase, " immbase=%d", false);
 	HINTCMD (hint, esil, " esil='%s'", false);
+	if (hint->jump != UT64_MAX) {
+		r_cons_printf (" jump: 0x%"PFMT64x, hint->jump);
+	}
+	if (hint->ret != UT64_MAX) {
+		r_cons_printf (" ret: 0x%"PFMT64x, hint->ret);
+	}
 	r_cons_newline ();
 }
 
@@ -816,6 +893,9 @@
 		HINTCMD_ADDR (hint, syntax, "ahS %s");
 		HINTCMD_ADDR (hint, immbase, "ahi %d");
 		HINTCMD_ADDR (hint, esil, "ahe %s");
+		if (hint->jump != UT64_MAX) {
+			r_cons_printf ("ahc 0x%"PFMT64x" @ 0x%"PFMT64x"\n", hint->jump, hint->addr);
+		}
 		break;
 	case 'j':
 		r_cons_printf ("%s{\"from\":%"PFMT64d",\"to\":%"PFMT64d,
@@ -828,6 +908,9 @@
 		HINTCMD (hint, immbase, ",\"immbase\":%d", true);
 		HINTCMD (hint, esil, ",\"esil\":\"%s\"", true);
 		HINTCMD (hint, ptr, ",\"ptr\":\"0x%"PFMT64x"x\"", true);
+		if (hint->jump != UT64_MAX) {
+			r_cons_printf (",\"jump\":\"0x%"PFMT64x"\"", hint->jump);
+		}
 		r_cons_print ("}");
 		break;
 	default:
@@ -920,17 +1003,12 @@
 	} else if (opts & R_CORE_ANAL_GRAPHBODY) {
 		const bool scrColor = r_config_get (core->config, "scr.color");
 		const bool scrUtf8 = r_config_get (core->config, "scr.utf8");
-		const bool asmComments = r_config_get (core->config, "asm.comments");
-		r_config_set (core->config, "scr.color", "false");
+		r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 		r_config_set (core->config, "scr.utf8", "false");
-		r_config_set (core->config, "asm.comments", "false");
-		snprintf (cmd, sizeof (cmd),
-			  "pD %d @e:asm.comments=0 @ 0x%08" PFMT64x, bb->size,
-			  bb->addr);
+		snprintf (cmd, sizeof (cmd), "pD %d @ 0x%08" PFMT64x, bb->size, bb->addr);
 		cmdstr = r_core_cmd_str (core, cmd);
 		r_config_set_i (core->config, "scr.color", scrColor);
 		r_config_set_i (core->config, "scr.utf8", scrUtf8);
-		r_config_set_i (core->config, "asm.comments", asmComments);
 	}
 	if (cmdstr) {
 		str = r_str_escape_dot (cmdstr);
@@ -940,17 +1018,11 @@
 }
 
 static char *palColorFor(const char *k) {
-	RCons *cons = r_cons_singleton ();
-	if (!cons) {
+	if (!r_cons_singleton ()) {
 		return NULL;
 	}
-	const char *c = r_cons_pal_get (k);
-	if (c) {
-		ut8 r = 0, g = 0, b = 0;
-		r_cons_rgb_parse (c, &r, &g, &b, NULL);
-		return r_cons_rgb_tostring (r, g, b);
-	}
-	return NULL;
+	RColor rcolor = r_cons_pal_get (k);
+	return r_cons_rgb_tostring (rcolor.r, rcolor.g, rcolor.b);
 }
 
 static void core_anal_color_curr_node(RCore *core, RAnalBlock *bbi) {
@@ -968,6 +1040,7 @@
 static int core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
 	int is_html = r_cons_singleton ()->is_html;
 	int is_json = opts & R_CORE_ANAL_JSON;
+	int is_json_format_disasm = opts & R_CORE_ANAL_JSON_FORMAT_DISASM;
 	int is_keva = opts & R_CORE_ANAL_KEYVALUE;
 	RAnalBlock *bbi;
 	RListIter *iter;
@@ -1011,7 +1084,7 @@
 		// TODO: show vars, refs and xrefs
 		r_cons_printf ("{\"name\":\"%s\"", fcn->name);
 		r_cons_printf (",\"offset\":%"PFMT64d, fcn->addr);
-		r_cons_printf (",\"ninstr\":%"PFMT64d, fcn->ninstr);
+		r_cons_printf (",\"ninstr\":%"PFMT64d, (ut64)fcn->ninstr);
 		r_cons_printf (",\"nargs\":%d",
 			r_anal_var_count (core->anal, fcn, 'r', 1) +
 			r_anal_var_count (core->anal, fcn, 's', 1) +
@@ -1040,7 +1113,7 @@
 			if (count > 1) {
 				r_cons_printf (",");
 			}
-			r_cons_printf ("{\"offset\":%"PFMT64d",\"size\":%"PFMT64d, bbi->addr, bbi->size);
+			r_cons_printf ("{\"offset\":%"PFMT64d",\"size\":%"PFMT64d, bbi->addr, (ut64)bbi->size);
 			if (bbi->jump != UT64_MAX) {
 				r_cons_printf (",\"jump\":%"PFMT64d, bbi->jump);
 			}
@@ -1053,15 +1126,21 @@
 					"d}",
 					t->count, t->times);
 			}
-			r_cons_printf (",\"ops\":[");
+			r_cons_printf (",\"ops\":");
 			if (buf) {
 				r_io_read_at (core->io, bbi->addr, buf, bbi->size);
-				r_core_print_disasm_json (core, bbi->addr, buf, bbi->size, 0);
+				if (is_json_format_disasm) {
+					r_core_print_disasm (core->print, core, bbi->addr, buf, bbi->size, bbi->size, 0, 1, true, NULL);
+				} else {
+					r_cons_print ("[");
+					r_core_print_disasm_json (core, bbi->addr, buf, bbi->size, 0);
+					r_cons_print ("]");
+				}
 				free (buf);
 			} else {
 				eprintf ("cannot allocate %d byte(s)\n", bbi->size);
 			}
-			r_cons_printf ("]}");
+			r_cons_print ("}");
 			continue;
 		}
 		if (bbi->jump != UT64_MAX) {
@@ -1162,9 +1241,58 @@
 					//r_cons_printf (" \"0x%08"PFMT64x"_0x%08"PFMT64x"\" [color=\"%s\","
 					//	" label=\"%s\", URL=\"%s/0x%08"PFMT64x"\"]\n",
 					//	fcn->addr, bbi->addr, difftype, str, fcn->name, bbi->addr);
-					r_cons_printf (" \"0x%08"PFMT64x"\" [fillcolor=\"%s\","
-						" label=\"%s\", URL=\"%s/0x%08"PFMT64x"\"]\n",
-						bbi->addr, difftype, str, fcn->name, bbi->addr);
+					RConfigHold *hc = r_config_hold_new (core->config);
+					r_config_save_num (hc, "scr.color", "scr.utf8", "asm.offset", "asm.lines",
+							"asm.cmt.right", "asm.lines.fcn", "asm.bytes", NULL);
+					RDiff *d = r_diff_new ();
+					r_config_set_i (core->config, "scr.color", 0);
+					r_config_set_i (core->config, "scr.utf8", 0);
+					r_config_set_i (core->config, "asm.offset", 0);
+					r_config_set_i (core->config, "asm.lines", 0);
+					r_config_set_i (core->config, "asm.cmt.right", 0);
+					r_config_set_i (core->config, "asm.lines.fcn", 0);
+					r_config_set_i (core->config, "asm.bytes", 0);
+
+					if (bbi->diff && bbi->diff->type != R_ANAL_DIFF_TYPE_MATCH && core->c2) {
+						RCore *c = core->c2;
+						RConfig *oc = c->config;
+						char *str = r_core_cmd_strf (core, "pdb @ 0x%08"PFMT64x, bbi->addr);
+						c->config = core->config;
+						// XXX. the bbi->addr doesnt needs to be in the same address in core2
+						char *str2 = r_core_cmd_strf (c, "pdb @ 0x%08"PFMT64x, bbi->diff->addr);
+						char *diffstr = r_diff_buffers_to_string (d,
+							(const ut8*)str, strlen (str),
+							(const ut8*)str2, strlen(str2));
+						if (diffstr) {
+							char *nl = strchr (diffstr, '\n');
+							if (nl) {
+								nl = strchr (nl + 1, '\n');
+								if (nl) {
+									nl = strchr (nl + 1, '\n');
+									if (nl) {
+										r_str_cpy (diffstr, nl + 1);
+									}
+								}
+							}
+						}
+						diffstr = r_str_replace (diffstr, "\n", "\\l", 1);
+						diffstr = r_str_replace (diffstr, "\"", "'", 1);
+						// eprintf ("%s\n", diffstr? diffstr: "");
+						r_cons_printf (" \"0x%08"PFMT64x"\" [fillcolor=\"%s\","
+								"color=\"black\", fontname=\"Courier\","
+								" label=\"%s\", URL=\"%s/0x%08"PFMT64x"\"]\n",
+								bbi->addr, difftype, diffstr, fcn->name, bbi->addr);
+						free (diffstr);
+						c->config = oc;
+					} else {
+						r_cons_printf (" \"0x%08"PFMT64x"\" [fillcolor=\"%s\","
+								"color=\"black\", fontname=\"Courier\","
+								" label=\"%s\", URL=\"%s/0x%08"PFMT64x"\"]\n",
+								bbi->addr, difftype, str, fcn->name, bbi->addr);
+					}
+					r_diff_free (d);
+					r_config_set_i (core->config, "scr.color", 1);
+					r_config_hold_free (hc);
 				}
 			} else {
 				if (is_html) {
@@ -1213,8 +1341,7 @@
 
 /* analyze a RAnalBlock at the address at and add that to the fcn function. */
 R_API int r_core_anal_bb(RCore *core, RAnalFunction *fcn, ut64 at, int head) {
-	RAnalBlock *bb, *bbi;
-	RListIter *iter;
+	RAnalBlock *bb;
 	ut64 jump, fail;
 	ut8 *buf = NULL;
 	int buflen, bblen = 0, rc = true;
@@ -1229,15 +1356,7 @@
 		return false;
 	}
 
-	if (core->anal->split) {
-		ret = r_anal_fcn_split_bb (core->anal, fcn, bb, at);
-	} else {
-		r_list_foreach (fcn->bbs, iter, bbi) {
-			if (at == bbi->addr) {
-				ret = R_ANAL_RET_DUP;
-			}
-		}
-	}
+	ret = r_anal_fcn_split_bb (core->anal, fcn, bb, at);
 	if (ret == R_ANAL_RET_DUP) {
 		/* Dupped basic block */
 		goto error;
@@ -1254,7 +1373,7 @@
 			if (!r_io_read_at (core->io, at + bblen, buf, 4)) { // ETOOSLOW
 				goto error;
 			}
-			r_core_read_at (core, at + bblen, buf, core->anal->opt.bb_max_size);
+			r_io_read_at (core->io, at + bblen, buf, core->anal->opt.bb_max_size);
 #else
 			if (!r_io_read_at (core->io, at + bblen, buf, core->anal->opt.bb_max_size)) { // ETOOSLOW
 				goto error;
@@ -1269,9 +1388,7 @@
 				goto error;
 			}
 			if (bblen == R_ANAL_RET_END) { /* bb analysis complete */
-				if (core->anal->split) {
-					ret = r_anal_fcn_bb_overlaps (fcn, bb);
-				}
+				ret = r_anal_fcn_bb_overlaps (fcn, bb);
 				if (ret == R_ANAL_RET_NEW) {
 					r_anal_fcn_bbadd (fcn, bb);
 					fail = bb->fail;
@@ -1330,7 +1447,7 @@
 	eprintf ("TODO\n");
 	while (1) {
 		// TODO: Implement the proper logic for doing esil analysis
-		op = r_core_anal_op (core, at);
+		op = r_core_anal_op (core, at, R_ANAL_OP_MASK_ESIL);
 		if (!op) {
 			break;
 		}
@@ -1358,7 +1475,6 @@
 	bool use_esil = r_config_get_i (core->config, "anal.esil");
 	RAnalFunction *fcn;
 	RListIter *iter;
-	RList *xrefs = NULL;
 
 	//update bits based on the core->offset otherwise we could have the
 	//last value set and blow everything up
@@ -1404,43 +1520,33 @@
 	fcn = r_anal_get_fcn_in (core->anal, at, 0);
 	if (fcn) {
 		if (fcn->addr == at) {
+			// if the function was already analyzed as a "loc.",
+			// convert it to function and rename it to "fcn.",
+			// because we found a call to this address
+			if (reftype == R_ANAL_REF_TYPE_CALL && fcn->type == R_ANAL_FCN_TYPE_LOC) {
+				function_rename (core->flags, fcn);
+			}
+
 			return 0;  // already analyzed function
 		}
 		if (r_anal_fcn_is_in_offset (fcn, from)) { // inner function
-			RAnalRef *ref;
-
-			// XXX: use r_anal-xrefs api and sdb
-			// If the xref is new, add it
-			// avoid dupes
-			xrefs = r_anal_fcn_get_xrefs (core->anal, fcn);
-			r_list_foreach (xrefs, iter, ref) {
-				if (from == ref->addr) {
-					r_list_free (xrefs);
-					return true;
-				}
+			RList *l = r_anal_xrefs_get (core->anal, from);
+			if (l && !r_list_empty (l)) {
+				r_list_free (l);
+				return true;
 			}
-			r_list_free (xrefs);
+			r_list_free (l);
+
 			// we should analyze and add code ref otherwise aaa != aac
 			if (from != UT64_MAX) {
-				// We shuold not use fcn->xrefs .. because that should be only via api (on top of sdb)
-				// the concepts of refs and xrefs are a bit twisted in the old implementation
-				ref = r_anal_ref_new ();
-				if (ref) {
-					ref->addr = from;
-					ref->at = fcn->addr;
-					ref->type = reftype;
-					// XXX this is creating dupped entries in the refs list with invalid reftypes, wtf?
-					r_anal_xrefs_set (core->anal, reftype, from, fcn->addr);
-				} else {
-					eprintf ("Error: new (xref)\n");
-				}
+				r_anal_xrefs_set (core->anal, from, fcn->addr, reftype);
 			}
 			return true;
 		}
 		// split function if overlaps
-		r_anal_fcn_resize (fcn, at - fcn->addr);
+		r_anal_fcn_resize (core->anal, fcn, at - fcn->addr);
 	}
-	return core_anal_fcn (core, at, from, reftype, depth);
+	return core_anal_fcn (core, at, from, reftype, depth - 1);
 }
 
 /* if addr is 0, remove all functions
@@ -1465,40 +1571,229 @@
 	return true;
 }
 
-R_API void r_core_anal_codexrefs(RCore *core, ut64 addr, int fmt) {
+static char *get_title(ut64 addr) {
+	return r_str_newf ("0x%"PFMT64x, addr);
+}
+
+R_API int r_core_print_bb_custom(RCore *core, RAnalFunction *fcn) {
+	RAnalBlock *bb;
+	RListIter *iter;
+	if (!fcn) {
+		return false;
+	}
+
+	RConfigHold *hc = r_config_hold_new (core->config);
+	r_config_save_num (hc, "scr.color", "scr.utf8", "asm.marks", "asm.offset", "asm.lines",
+	  "asm.cmt.right", "asm.cmt.col", "asm.lines.fcn", "asm.bytes", NULL);
+	/*r_config_set_i (core->config, "scr.color", 0);*/
+	r_config_set_i (core->config, "scr.utf8", 0);
+	r_config_set_i (core->config, "asm.marks", 0);
+	r_config_set_i (core->config, "asm.offset", 0);
+	r_config_set_i (core->config, "asm.lines", 0);
+	r_config_set_i (core->config, "asm.cmt.right", 0);
+	r_config_set_i (core->config, "asm.cmt.col", 0);
+	r_config_set_i (core->config, "asm.lines.fcn", 0);
+	r_config_set_i (core->config, "asm.bytes", 0);
+
+	r_list_foreach (fcn->bbs, iter, bb) {
+		if (bb->addr == UT64_MAX) {
+			continue;
+		}
+		char *title = get_title (bb->addr);
+		char *body = r_core_cmd_strf (core, "pdb @ 0x%08"PFMT64x, bb->addr);
+		char *body_b64 = r_base64_encode_dyn (body, -1);
+
+		if (!title || !body || !body_b64) {
+			free (body_b64);
+			free (body);
+			free (title);
+			r_config_restore (hc);
+			r_config_hold_free (hc);
+			return false;
+		}
+		body_b64 = r_str_prefix (body_b64, "base64:");
+		r_cons_printf ("agn %s %s\n", title, body_b64);
+		free (body);
+		free (body_b64);
+		free (title);
+	}
+
+	r_config_restore (hc);
+	r_config_hold_free (hc);
+
+	r_list_foreach (fcn->bbs, iter, bb) {
+		if (bb->addr == UT64_MAX) {
+			continue;
+		}
+		char *u = get_title (bb->addr), *v = NULL;
+		if (bb->jump != UT64_MAX) {
+			v = get_title (bb->jump);
+			r_cons_printf ("age %s %s\n", u, v);
+			free (v);
+		}
+		if (bb->fail != UT64_MAX) {
+			v = get_title (bb->fail);
+			r_cons_printf ("age %s %s\n", u, v);
+			free (v);
+		}
+		if (bb->switch_op) {
+			RListIter *it;
+			RAnalCaseOp *cop;
+			r_list_foreach (bb->switch_op->cases, it, cop) {
+				v = get_title (cop->addr);
+				r_cons_printf ("age %s %s\n", u, v);
+				free (v);
+			}
+		}
+		free (u);
+	}
+	return true;
+}
+
+R_API int r_core_print_bb_gml(RCore *core, RAnalFunction *fcn) {
+	RAnalBlock *bb;
+	RListIter *iter;
+	if (!fcn) {
+		return false;
+	}
+
+	r_cons_printf ("graph\n[\n" "hierarchic 1\n" "label \"\"\n" "directed 1\n");
+
+	r_list_foreach (fcn->bbs, iter, bb) {
+		RFlagItem *flag = r_flag_get_i (core->flags, bb->addr);
+		char *msg = flag? strdup (flag->name): r_str_newf ("0x%08"PFMT64x, bb->addr);
+		r_cons_printf ("  node [\n"
+				"    id  %"PFMT64d"\n"
+				"    label  \"%s\"\n"
+				"  ]\n", bb->addr, msg);
+		free (msg);
+	}
+
+	r_list_foreach (fcn->bbs, iter, bb) {
+		if (bb->addr == UT64_MAX) {
+			continue;
+		}
+
+		if (bb->jump != UT64_MAX) {
+			r_cons_printf ("  edge [\n"
+				"    source  %"PFMT64d"\n"
+				"    target  %"PFMT64d"\n"
+				"  ]\n", bb->addr, bb->jump
+				);
+		}
+		if (bb->fail != UT64_MAX) {
+			r_cons_printf ("  edge [\n"
+				"    source  %"PFMT64d"\n"
+				"    target  %"PFMT64d"\n"
+				"  ]\n", bb->addr, bb->fail
+				);
+		}
+		if (bb->switch_op) {
+			RListIter *it;
+			RAnalCaseOp *cop;
+			r_list_foreach (bb->switch_op->cases, it, cop) {
+				r_cons_printf ("  edge [\n"
+					"    source  %"PFMT64d"\n"
+					"    target  %"PFMT64d"\n"
+					"  ]\n", bb->addr, cop->addr
+					);
+			}
+		}
+	}
+	r_cons_printf ("]\n");
+	return true;
+}
+
+R_API void r_core_anal_datarefs(RCore *core, ut64 addr) {
+	RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, -1);
+	if (fcn) {
+		bool found = false;
+		const char *me = fcn->name;
+		RListIter *iter;
+		RAnalRef *ref;
+		RList *refs = r_anal_fcn_get_refs (core->anal, fcn);
+		r_list_foreach (refs, iter, ref) {
+			RBinObject *obj = r_bin_cur_object (core->bin);
+			RBinSection *binsec = r_bin_get_section_at (obj, ref->addr, true);
+			if (binsec->is_data) {
+				if (!found) {
+					r_cons_printf ("agn %s\n", me);
+					found = true;
+				}
+				RFlagItem *item = r_flag_get_i (core->flags, ref->addr);
+				const char *dst = item? item->name: sdb_fmt ("0x%08"PFMT64x, ref->addr);
+				r_cons_printf ("agn %s\n", dst);
+				r_cons_printf ("age %s %s\n", me, dst);
+			}
+		}
+		r_list_free (refs);
+	} else {
+		eprintf ("Not in a function. Use 'df' to define it.\n");
+	}
+}
+
+R_API void r_core_anal_coderefs(RCore *core, ut64 addr) {
 	RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, -1);
 	if (fcn) {
 		const char *me = fcn->name;
 		RListIter *iter;
 		RAnalRef *ref;
 		RList *refs = r_anal_fcn_get_refs (core->anal, fcn);
-		r_cons_printf ("e graph.layout=1\n");
-		r_cons_printf ("ag-\n");
 		r_cons_printf ("agn %s\n", me);
 		r_list_foreach (refs, iter, ref) {
 			RFlagItem *item = r_flag_get_i (core->flags, ref->addr);
-			const char *dst = item? item->name: sdb_fmt (0, "0x%08"PFMT64x, ref->addr);
+			const char *dst = item? item->name: sdb_fmt ("0x%08"PFMT64x, ref->addr);
 			r_cons_printf ("agn %s\n", dst);
 			r_cons_printf ("age %s %s\n", me, dst);
 		}
 		r_list_free (refs);
-		RList *list = r_anal_xrefs_get (core->anal, addr);
-		r_list_foreach (list, iter, ref) {
-			RFlagItem *item = r_flag_get_i (core->flags, ref->addr);
-			const char *src = item? item->name: sdb_fmt (0, "0x%08"PFMT64x, ref->addr);
-			r_cons_printf ("agn %s\n", src);
-			r_cons_printf ("age %s %s\n", src, me);
+	} else {
+		eprintf("Not in a function. Use 'df' to define it.\n");
+	}
+}
+
+R_API void r_core_anal_importxrefs(RCore *core) {
+	RBinInfo *info = r_bin_get_info (core->bin);
+	RBinObject *obj = r_bin_cur_object (core->bin);
+	bool lit = info ? info->has_lit: false;
+	int va = core->io->va || core->io->debug;
+
+	RListIter *iter;
+	RBinImport *imp;
+	if (!obj) {
+		return;
+	}
+	r_list_foreach (obj->imports, iter, imp) {
+		ut64 addr = lit ? r_core_bin_impaddr (core->bin, va, imp->name): 0;
+		if (addr) {
+			r_core_anal_codexrefs (core, addr);
+		} else {
+			r_cons_printf ("agn %s\n", imp->name);
 		}
 	}
 }
 
-#define FMT_NO 0
-#define FMT_GV 1
-#define FMT_JS 2
-R_API void r_core_anal_coderefs(RCore *core, ut64 addr, int fmt) {
+R_API void r_core_anal_codexrefs(RCore *core, ut64 addr) {
+	RFlagItem *f = r_flag_get_at (core->flags, addr, false);
+	char *me = (f && f->offset == addr)
+		? r_str_new (f->name) : r_str_newf ("0x%"PFMT64x, addr);
+	r_cons_printf ("agn %s\n", me);
+	RListIter *iter;
+	RAnalRef *ref;
+	RList *list = r_anal_xrefs_get (core->anal, addr);
+	r_list_foreach (list, iter, ref) {
+		RFlagItem *item = r_flag_get_i (core->flags, ref->addr);
+		const char *src = item? item->name: sdb_fmt ("0x%08"PFMT64x, ref->addr);
+		r_cons_printf ("agn %s\n", src);
+		r_cons_printf ("age %s %s\n", src, me);
+	}
+	r_list_free (list);
+	free (me);
+}
+
+R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt) {
 	RAnalFunction fakefr = R_EMPTY;
 	const char *font = r_config_get (core->config, "graph.font");
-	const char *format = r_config_get (core->config, "graph.format");
 	int is_html = r_cons_singleton ()->is_html;
 	bool refgraph = r_config_get_i (core->config, "graph.refs");
 	int first, first2, showhdr = 0;
@@ -1507,24 +1802,18 @@
 	const int usenames = 1;
 	RAnalFunction *fcni;
 	RAnalRef *fcnr;
-	bool isGML = !strcmp (format, "gml");
 
-	bool gmlFcnGraph = false;
-	if (!strcmp (format, "gmlfcn")) {
-		isGML = true;
-		gmlFcnGraph = true;
-	}
 	ut64 from = r_config_get_i (core->config, "graph.from");
 	ut64 to = r_config_get_i (core->config, "graph.to");
 
-	if (fmt == 2) {
+	if (fmt == R_GRAPH_FORMAT_JSON) {
 		r_cons_printf ("[");
 	}
-	if (fmt == 1 && isGML) {
+	if (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN) {
 		r_cons_printf ("graph\n[\n"
-				"hierarchic\t1\n"
-				"label\t\"\"\n"
-				"directed\t1\n");
+				"hierarchic  1\n"
+				"label  \"\"\n"
+				"directed  1\n");
 	}
 	first = 0;
 	ut64 base = UT64_MAX;
@@ -1534,10 +1823,10 @@
 		if (base == UT64_MAX) {
 			base = fcni->addr;
 		}
-		if (from != UT64_MAX && addr < from) {
+		if (from != UT64_MAX && fcni->addr < from) {
 			continue;
 		}
-		if (to != UT64_MAX && addr > to) {
+		if (to != UT64_MAX && fcni->addr > to) {
 			continue;
 		}
 		if (addr != UT64_MAX && addr != fcni->addr) {
@@ -1546,17 +1835,17 @@
 		RList *refs = r_anal_fcn_get_refs (core->anal, fcni);
 		if (!fmt) {
 			r_cons_printf ("0x%08"PFMT64x"\n", fcni->addr);
-		} else if (fmt == 1 && isGML) {
+		} else if (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN) {
 			RFlagItem *flag = r_flag_get_i (core->flags, fcni->addr);
 			if (iteration == 0) {
 				char *msg = flag? strdup (flag->name): r_str_newf ("0x%08"PFMT64x, fcni->addr);
-				r_cons_printf ("\tnode [\n"
-						"\t\tid\t%"PFMT64d"\n"
-						"\t\tlabel\t\"%s\"\n"
-						"\t]\n", fcni->addr - base, msg);
+				r_cons_printf ("  node [\n"
+						"  id  %"PFMT64d"\n"
+						"    label  \"%s\"\n"
+						"  ]\n", fcni->addr - base, msg);
 				free (msg);
 			}
-		} else if (fmt == 2) {
+		} else if (fmt == R_GRAPH_FORMAT_JSON) {
 			if (hideempty && !r_list_length (refs)) {
 				r_list_free (refs);
 				continue;
@@ -1587,91 +1876,71 @@
 				}
 			}
 			if (!is_html && !showhdr) {
-				if (fmt == 1) {
-					if (isGML) {
-/*
-						r_cons_printf ("Creator \"radare2\"\n"
-							"Version \"2.14\"\n"
-							"graph\n[\n"
-							"hierarchic\t1\n"
-							"label\t\"\"\n"
-							"directed\t1\n");
-*/
-					} else {
-						const char * gv_edge = r_config_get (core->config, "graph.gv.edge");
-						const char * gv_node = r_config_get (core->config, "graph.gv.node");
-						const char * gv_grph = r_config_get (core->config, "graph.gv.graph");
-						const char * gv_spline = r_config_get (core->config, "graph.gv.spline");
-						if (!gv_edge || !*gv_edge) {
-							gv_edge = "arrowhead=\"normal\"";
-						}
-						if (!gv_node || !*gv_node) {
-							gv_node = "fillcolor=gray style=filled shape=box";
-						}
-						if (!gv_grph || !*gv_grph) {
-							gv_grph = "bgcolor=white";
-						}
-						if (!gv_spline || !*gv_spline) {
-							gv_spline = "splines=\"ortho\"";
-						}
-						r_cons_printf ("digraph code {\n"
-								"\tgraph [%s fontname=\"%s\" %s];\n"
-								"\tnode [%s];\n"
-								"\tedge [%s];\n", gv_grph, font, gv_spline,
-								gv_node, gv_edge);
-					}
+				if (fmt == R_GRAPH_FORMAT_DOT) {
+					const char * gv_edge = r_config_get (core->config, "graph.gv.edge");
+					const char * gv_node = r_config_get (core->config, "graph.gv.node");
+					const char * gv_grph = r_config_get (core->config, "graph.gv.graph");
+					const char * gv_spline = r_config_get (core->config, "graph.gv.spline");
+					if (!gv_edge || !*gv_edge) {
+						gv_edge = "arrowhead=\"normal\"";
+					}
+					if (!gv_node || !*gv_node) {
+						gv_node = "fillcolor=gray style=filled shape=box";
+					}
+					if (!gv_grph || !*gv_grph) {
+						gv_grph = "bgcolor=white";
+					}
+					if (!gv_spline || !*gv_spline) {
+						gv_spline = "splines=\"ortho\"";
+					}
+					r_cons_printf ("digraph code {\n"
+							"graph [%s fontname=\"%s\" %s];\n"
+							"node [%s];\n"
+							"edge [%s];\n", gv_grph, font, gv_spline,
+							gv_node, gv_edge);
 				}
 				showhdr = 1;
 			}
 			// TODO: display only code or data refs?
 			RFlagItem *flag = r_flag_get_i (core->flags, fcnr->addr);
-			if (fmt == 1) {
-				if (isGML) {
-					if (iteration == 0) {
-						if (gmlFcnGraph) {
-							char *msg = flag? strdup(flag->name): r_str_newf ("0x%08"PFMT64x, fcnr->addr);
-							r_cons_printf ("\tnode [\n"
-									"\t\tid\t%"PFMT64d"\n"
-									"\t\tlabel\t\"%s\"\n"
-									"\t]\n", fcnr->addr - base, msg
-								      );
-							r_cons_printf ("\tedge [\n"
-									"\t\tsource  %"PFMT64d"\n"
-									"\t\ttarget  %"PFMT64d"\n"
-									"\t]\n", fcni->addr-base, fcnr->addr-base
-								      );
-							free (msg);
-						}
-					} else {
-						r_cons_printf ("\tedge [\n"
-								"\t\tsource  %"PFMT64d"\n"
-								"\t\ttarget  %"PFMT64d"\n"
-								/*
-								   "graphics\n"
-								   "[\n"
-								   "	fill    \"%s\"\n"
-								   "	targetArrow     \"standard\"\n"
-								   "]\n"
-								 */
-								"\t]\n", fcni->addr-base, fcnr->addr-base //, "#000000"
+			if (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN) {
+				if (iteration == 0) {
+					if (fmt == R_GRAPH_FORMAT_GMLFCN) {
+						char *msg = flag? strdup (flag->name): r_str_newf ("0x%08"PFMT64x, fcnr->addr);
+						r_cons_printf ("  node [\n"
+								"    id  %"PFMT64d"\n"
+								"    label  \"%s\"\n"
+								"  ]\n", fcnr->addr - base, msg
+							      );
+						r_cons_printf ("  edge [\n"
+								"    source  %"PFMT64d"\n"
+								"    target  %"PFMT64d"\n"
+								"  ]\n", fcni->addr-base, fcnr->addr-base
 							      );
+						free (msg);
 					}
 				} else {
-					if (flag && flag->name) {
-						r_cons_printf ("\t\"0x%08"PFMT64x"\" -> \"0x%08"PFMT64x"\" "
-								"[label=\"%s\" color=\"%s\" URL=\"%s/0x%08"PFMT64x"\"];\n",
-								fcni->addr, fcnr->addr, flag->name,
-								(fcnr->type==R_ANAL_REF_TYPE_CODE ||
-								 fcnr->type==R_ANAL_REF_TYPE_CALL)?"green":"red",
-								flag->name, fcnr->addr);
-						r_cons_printf ("\t\"0x%08"PFMT64x"\" "
-								"[label=\"%s\""
-								" URL=\"%s/0x%08"PFMT64x"\"];\n",
-								fcnr->addr, flag->name,
-								flag->name, fcnr->addr);
-					}
+					r_cons_printf ("  edge [\n"
+							"    source  %"PFMT64d"\n"
+							"    target  %"PFMT64d"\n"
+							"  ]\n", fcni->addr-base, fcnr->addr-base //, "#000000"
+						      );
+				}
+			} else if (fmt == R_GRAPH_FORMAT_DOT) {
+				if (flag && flag->name) {
+					r_cons_printf ("  \"0x%08"PFMT64x"\" -> \"0x%08"PFMT64x"\" "
+							"[label=\"%s\" color=\"%s\" URL=\"%s/0x%08"PFMT64x"\"];\n",
+							fcni->addr, fcnr->addr, flag->name,
+							(fcnr->type==R_ANAL_REF_TYPE_CODE ||
+							 fcnr->type==R_ANAL_REF_TYPE_CALL)?"green":"red",
+							flag->name, fcnr->addr);
+					r_cons_printf ("  \"0x%08"PFMT64x"\" "
+							"[label=\"%s\""
+							" URL=\"%s/0x%08"PFMT64x"\"];\n",
+							fcnr->addr, flag->name,
+							flag->name, fcnr->addr);
 				}
-			} else if (fmt == 2) {
+			} else if (fmt == R_GRAPH_FORMAT_JSON) {
 				if (fr) {
 					RList *refs1 = r_anal_fcn_get_refs (core->anal, fr);
 					if (!hideempty || (hideempty && r_list_length (refs1) > 0)) {
@@ -1696,20 +1965,24 @@
 			}
 		}
 		r_list_free (refs);
-		if (fmt == 2) {
+		if (fmt == R_GRAPH_FORMAT_JSON) {
 			r_cons_printf ("]}");
 		}
 	}
-	if (iteration == 0 && fmt == 1 && isGML) {
+	if (iteration == 0 && fmt == R_GRAPH_FORMAT_GML) {
 		iteration++;
-		if (!gmlFcnGraph) {
-			goto repeat;
-		}
+		goto repeat;
+	}
+	if (iteration == 0 && fmt == R_GRAPH_FORMAT_GMLFCN) {
+		iteration++;
+	}
+	if (showhdr && (fmt == R_GRAPH_FORMAT_GML || fmt == R_GRAPH_FORMAT_GMLFCN)) {
+		r_cons_printf ("]\n");
 	}
-	if (showhdr && fmt == 1) {
-		r_cons_printf ("%s\n", isGML? "]": "}");
+	if (fmt == R_GRAPH_FORMAT_DOT) {
+		r_cons_printf ("}\n");
 	}
-	if (fmt == 2) {
+	if (fmt == R_GRAPH_FORMAT_JSON) {
 		r_cons_printf ("]\n");
 	}
 }
@@ -1786,10 +2059,10 @@
 				numcallrefs++;
 			}
 		}
+		r_list_free (refs);
 		fcn->meta.numcallrefs = numcallrefs;
 		xrefs = r_anal_xrefs_get (anal, fcn->addr);
 		fcn->meta.numrefs = xrefs? xrefs->length: 0;
-		r_list_free (refs);
 		r_list_free (xrefs);
 
 		// Determine the bounds of the functions address space
@@ -1830,10 +2103,11 @@
 	return name;
 }
 
-#define FCN_LIST_VERBOSE_ENTRY "%s0x%08"PFMT64x" %4d %5d %5d %5d %4d 0x%08"PFMT64x" %5d 0x%08"PFMT64x" %5d %4d %6d %4d %5d %s%s\n"
+#define FCN_LIST_VERBOSE_ENTRY "%s0x%0*"PFMT64x" %4d %5d %5d %5d %4d 0x%0*"PFMT64x" %5d 0x%0*"PFMT64x" %5d %4d %6d %4d %5d %s%s\n"
 static int fcn_print_verbose(RCore *core, RAnalFunction *fcn, bool use_color) {
 	char *name = get_fcn_name(core, fcn);
 	int ebbs = 0;
+	int addrwidth = 8;
 	const char *color = "";
 	const char *color_end = "";
 	if (use_color) {
@@ -1847,16 +2121,20 @@
 		}
 	}
 
+	if (core->anal->bits == 64) {
+		addrwidth = 16;
+	}
+
 	r_cons_printf (FCN_LIST_VERBOSE_ENTRY, color,
-			fcn->addr,
+			addrwidth, fcn->addr,
 			r_anal_fcn_realsize (fcn),
 			r_list_length (fcn->bbs),
 			r_anal_fcn_count_edges (fcn, &ebbs),
 			r_anal_fcn_cc (fcn),
 			r_anal_fcn_cost (core->anal, fcn),
-			fcn->meta.min,
+			addrwidth, fcn->meta.min,
 			r_anal_fcn_size (fcn),
-			fcn->meta.max,
+			addrwidth, fcn->meta.max,
 			fcn->meta.numcallrefs,
 			r_anal_var_count (core->anal, fcn, 's', 0) +
 			r_anal_var_count (core->anal, fcn, 'b', 0) +
@@ -1874,14 +2152,20 @@
 
 static int fcn_list_verbose(RCore *core, RList *fcns) {
 	bool use_color = r_config_get_i (core->config, "scr.color");
+	int headeraddr_width = 10;
+	char *headeraddr = "==========";
 
-	r_cons_printf ("%-11s %4s %5s %5s %5s %4s %11s range %-11s %s %s %s %s %s %s\n",
-			"address", "size", "nbbs", "edges", "cc", "cost", "min bound", "max bound",
-			"calls", "locals", "args", "xref", "frame", "name");
-	r_cons_printf ("%-11s %-4s %-5s %-5s %-5s %-4s %-11s ===== %-11s %s %s %s %s %s %s\n",
-			"===========", "====", "=====", "=====", "=====", "====", "===========", "===========",
-			"=====", "======", "====", "====", "=====", "====");
+	if (core->anal->bits == 64) {
+		headeraddr_width = 18;
+		headeraddr = "==================";
+	}
 
+	r_cons_printf ("%-*s %4s %5s %5s %5s %4s %*s range %-*s %s %s %s %s %s %s\n",
+			headeraddr_width, "address", "size", "nbbs", "edges", "cc", "cost",
+			headeraddr_width, "min bound", headeraddr_width, "max bound", "calls",
+			"locals", "args", "xref", "frame", "name");
+	r_cons_printf ("%s ==== ===== ===== ===== ==== %s ===== %s ===== ====== ==== ==== ===== ====\n",
+			headeraddr, headeraddr, headeraddr);
 	RListIter *iter;
 	RAnalFunction *fcn;
 	r_list_foreach (fcns, iter, fcn) {
@@ -1940,6 +2224,9 @@
 	r_cons_printf (",\"ebbs\":%d", ebbs);
 	r_cons_printf (",\"calltype\":\"%s\"", fcn->cc);
 	r_cons_printf (",\"type\":\"%s\"", r_anal_fcn_type_tostring (fcn->type));
+	r_cons_printf (",\"minbound\":\"%d\"", fcn->meta.min);
+	r_cons_printf (",\"maxbound\":\"%d\"", fcn->meta.max);
+	r_cons_printf (",\"range\":\"%d\"", r_anal_fcn_size(fcn));
 	if (fcn->type == R_ANAL_FCN_TYPE_FCN || fcn->type == R_ANAL_FCN_TYPE_SYM) {
 		r_cons_printf (",\"diff\":\"%s\"",
 				fcn->diff->type == R_ANAL_DIFF_TYPE_MATCH?"MATCH":
@@ -2045,7 +2332,7 @@
 			r_cons_printf (",");
 		}
 		if (quiet) {
-			r_cons_printf ("\"0x%08"PFMT64x"\"", fcn->addr);
+			r_cons_printf ("%d", fcn->addr);
 		} else {
 			fcn_print_json (core, fcn);
 		}
@@ -2054,6 +2341,10 @@
 	return 0;
 }
 
+static int fcn_list_verbose_json(RCore *core, RList *fcns) {
+	return fcn_list_json(core, fcns, false);
+}
+
 static int fcn_print_detail(RCore *core, RAnalFunction *fcn) {
 	const char *defaultCC = r_anal_cc_default (core->anal);
 	char *name = get_fcn_name (core, fcn);
@@ -2082,19 +2373,26 @@
 	r_list_foreach (refs, refiter, refi) {
 		switch (refi->type) {
 		case R_ANAL_REF_TYPE_CALL:
-			r_cons_printf ("afxC 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->at, refi->addr);
+			r_cons_printf ("axC 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->addr, refi->at);
 			break;
 		case R_ANAL_REF_TYPE_DATA:
-			r_cons_printf ("afxd 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->at, refi->addr);
+			r_cons_printf ("axd 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->addr, refi->at);
 			break;
 		case R_ANAL_REF_TYPE_CODE:
-			r_cons_printf ("afxc 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->at, refi->addr);
+			r_cons_printf ("axc 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->addr, refi->at);
+			break;
+		case R_ANAL_REF_TYPE_STRING:
+			r_cons_printf ("axs 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->addr, refi->at);
+			break;
+		case R_ANAL_REF_TYPE_NULL:
+		default:
+			r_cons_printf ("ax 0x%"PFMT64x" 0x%"PFMT64x"\n", refi->addr, refi->at);
 			break;
 		}
 	}
+	r_list_free (refs);
 	/*Saving Function stack frame*/
 	r_cons_printf ("afS %"PFMT64d" @ 0x%"PFMT64x"\n", fcn->maxstack, fcn->addr);
-	r_list_free (refs);
 	free (name);
 	return 0;
 }
@@ -2161,6 +2459,7 @@
 			r_cons_printf ("0x%08"PFMT64x" ", refi->addr);
 		}
 	}
+	r_list_free (xrefs);
 
 	if (fcn->type == R_ANAL_FCN_TYPE_FCN || fcn->type == R_ANAL_FCN_TYPE_SYM) {
 		int args_count = r_anal_var_count (core->anal, fcn, 'b', 1);
@@ -2184,7 +2483,6 @@
 			r_cons_printf ("function: %s", fcn->diff->name);
 		}
 	}
-	r_list_free (xrefs);
 	free (name);
 	return 0;
 }
@@ -2211,17 +2509,14 @@
 }
 
 R_API int r_core_anal_fcn_list(RCore *core, const char *input, const char *rad) {
-	RList *fcns = NULL;
-	if (!core || !core->anal) {
+	if (!core || !core->anal || r_list_empty (core->anal->fcns)) {
 		return 0;
 	}
 
-	if (r_list_empty (core->anal->fcns)) {
-		return 0;
+	if (rad && (*rad == 'l' || *rad == 'j')) {
+		fcnlist_gather_metadata (core->anal, core->anal->fcns);
 	}
 
-	fcnlist_gather_metadata (core->anal, core->anal->fcns);
-
 	const char *name = input;
 	ut64 addr;
 	addr = core->offset;
@@ -2230,7 +2525,7 @@
 		addr = r_num_math (core->num, name);
 	}
 
-	fcns = r_list_new ();
+	RList *fcns = r_list_new ();
 	if (!fcns) {
 		return -1;
 	}
@@ -2243,12 +2538,21 @@
 	}
 
 	r_list_sort (fcns, &cmpfcn);
+	if (!rad) {
+		fcn_list_default (core, fcns, false);
+		r_list_free (fcns);
+		return 0;
+	}
 	switch (*rad) {
-	case 's':
+	case '+':
 		r_core_anal_fcn_list_size (core);
 		break;
 	case 'l':
-		fcn_list_verbose (core, fcns);
+		if (rad[1] == 'j') {
+			fcn_list_verbose_json (core, fcns);
+		} else {
+			fcn_list_verbose (core, fcns);
+		}
 		break;
 	case 'q':
 		if (rad[1] == 'j') {
@@ -2298,11 +2602,13 @@
 	return NULL;
 }
 
-R_API void fcn_callconv(RCore *core, RAnalFunction *fcn) {
-	ut8 *tbuf, *buf;
+R_API void r_core_recover_vars(RCore *core, RAnalFunction *fcn, bool argonly) {
+	ut8 *buf;
 	RListIter *tmp = NULL;
 	RAnalBlock *bb = NULL;
 	RAnalOp *op = NULL;
+	int count = 0;
+	int reg_set[10] = {0};
 	ut64 pos;
 
 	if (!core || !core->anal || !fcn || core->anal->opt.bb_max_size < 1) {
@@ -2314,29 +2620,33 @@
 		return;
 	}
 	r_list_foreach (fcn->bbs, tmp, bb) {
+		if (r_cons_is_breaked ()) {
+			break;
+		}
 		if (bb->size < 1) {
 			continue;
 		}
 		if (bb->size > bb_size) {
-			tbuf = realloc (buf, bb->size);
-			if (!tbuf) {
-				break;
-			}
-			buf = tbuf;
-			bb_size = bb->size;
+			continue;
 		}
 		if (!r_io_read_at (core->io, bb->addr, buf, bb->size)) {
-	//		eprintf ("read error\n");
+			//eprintf ("read error\n");
 			break;
 		}
 		pos = bb->addr;
 		while (pos < bb->addr + bb->size) {
-			op = r_core_anal_op (core, pos);
+			if (r_cons_is_breaked ()) {
+				break;
+			}
+			op = r_core_anal_op (core, pos, R_ANAL_OP_MASK_ALL);
 			if (!op) {
-	//			eprintf ("Cannot get op\n");
+				//eprintf ("Cannot get op\n");
 				break;
 			}
-			r_anal_fcn_fill_args (core->anal, fcn, op);
+			extract_rarg (core->anal, op, fcn, reg_set, &count);
+			if (!argonly) {
+				extract_vars (core->anal, fcn, op);
+			}
 			int opsize = op->size;
 			r_anal_op_free (op);
 			if (opsize < 1) {
@@ -2345,7 +2655,6 @@
 			pos += opsize;
 		}
 	}
-
 	free (buf);
 	return;
 }
@@ -2391,6 +2700,7 @@
 	const char *font = r_config_get (core->config, "graph.font");
 	int is_html = r_cons_singleton ()->is_html;
 	int is_json = opts & R_CORE_ANAL_JSON;
+	int is_json_format_disasm = opts & R_CORE_ANAL_JSON_FORMAT_DISASM;
 	int is_keva = opts & R_CORE_ANAL_KEYVALUE;
 	RConfigHold *hc;
 	RAnalFunction *fcni;
@@ -2408,11 +2718,15 @@
 	if (!hc) {
 		return false;
 	}
+
 	r_config_save_num (hc, "asm.lines", "asm.bytes", "asm.dwarf", NULL);
 	//opts |= R_CORE_ANAL_GRAPHBODY;
 	r_config_set_i (core->config, "asm.lines", 0);
-	r_config_set_i (core->config, "asm.bytes", 0);
 	r_config_set_i (core->config, "asm.dwarf", 0);
+	if (!is_json_format_disasm) {
+		r_config_save_num (hc, "asm.bytes", NULL);
+		r_config_set_i (core->config, "asm.bytes", 0);
+	}
 	if (!is_html && !is_json && !is_keva) {
 		const char * gv_edge = r_config_get (core->config, "graph.gv.edge");
 		const char * gv_node = r_config_get (core->config, "graph.gv.node");
@@ -2437,8 +2751,8 @@
 	r_list_foreach (core->anal->fcns, iter, fcni) {
 		if (fcni->type & (R_ANAL_FCN_TYPE_SYM | R_ANAL_FCN_TYPE_FCN |
 		                  R_ANAL_FCN_TYPE_LOC) &&
-		    (!addr || r_anal_fcn_in (fcni, addr))) {
-			if (!addr && (from != UT64_MAX && to != UT64_MAX)) {
+		    (addr == UT64_MAX || r_anal_fcn_in (fcni, addr))) {
+			if (addr == UT64_MAX && (from != UT64_MAX && to != UT64_MAX)) {
 				if (fcni->addr < from || fcni->addr > to) {
 					continue;
 				}
@@ -2447,7 +2761,7 @@
 				r_cons_printf (",");
 			}
 			nodes += core_anal_graph_nodes (core, fcni, opts);
-			if (addr != 0) {
+			if (addr != UT64_MAX) {
 				break;
 			}
 		}
@@ -2470,24 +2784,20 @@
 }
 
 static int core_anal_followptr(RCore *core, int type, ut64 at, ut64 ptr, ut64 ref, int code, int depth) {
-	ut64 dataptr;
-	int wordsize;
 	// SLOW Operation try to reduce as much as possible -- eprintf ("READ %d %llx\n", wordsize, ptr);
 	if (!ptr) {
 		return false;
 	}
 	if (ref == UT64_MAX || ptr == ref) {
-		if (code) {
-			r_anal_ref_add (core->anal, ptr, at, type? type: 'c');
-		} else {
-			r_anal_ref_add (core->anal, ptr, at, 'd');
-		}
+		const RAnalRefType t = code? type? type: R_ANAL_REF_TYPE_CODE: R_ANAL_REF_TYPE_DATA;
+		r_anal_xrefs_set (core->anal, at, ptr, t);
 		return true;
 	}
 	if (depth < 1) {
 		return false;
 	}
-	wordsize = (int)(core->anal->bits / 8);
+	int wordsize = (int)(core->anal->bits / 8);
+	ut64 dataptr;
 	if (!r_io_read_i (core->io, ptr, &dataptr, wordsize, false)) {
 		// eprintf ("core_anal_followptr: Cannot read word at destination\n");
 		return false;
@@ -2495,10 +2805,6 @@
 	return core_anal_followptr (core, type, at, dataptr, ref, code, depth - 1);
 }
 
-enum {		//WTF
-	R2_ARCH_ARM64
-};
-
 static bool opiscall(RCore *core, RAnalOp *aop, ut64 addr, const ut8* buf, int len, int arch) {
 	switch (arch) {
 	case R2_ARCH_ARM64:
@@ -2511,14 +2817,14 @@
 		}
 		//if is not bl do not analyze
 		if (buf[3] == 0x94) {
-			if (r_anal_op (core->anal, aop, addr, buf, len)) {
+			if (r_anal_op (core->anal, aop, addr, buf, len, R_ANAL_OP_MASK_BASIC)) {
 				return true;
 			}
 		}
 		return false;
 	default:
 		aop->size = 1;
-		if (!r_anal_op (core->anal, aop, addr, buf, len)) {
+		if (!r_anal_op (core->anal, aop, addr, buf, len, R_ANAL_OP_MASK_BASIC)) {
 			switch (aop->type) {
 			case R_ANAL_OP_TYPE_CALL:
 			case R_ANAL_OP_TYPE_CCALL:
@@ -2601,7 +2907,7 @@
 				case 'x':
 					{
 						RAnalOp op ={0};
-						r_anal_op (core->anal, &op, at + i, buf + i, core->blocksize - i);
+						r_anal_op (core->anal, &op, at + i, buf + i, core->blocksize - i, R_ANAL_OP_MASK_BASIC);
 						int mask = mode=='r' ? 1 : mode == 'w' ? 2: mode == 'x' ? 4: 0;
 						if (op.direction == mask) {
 							i += op.size;
@@ -2611,7 +2917,7 @@
 					}
 					break;
 				default:
-					if (!r_anal_op (core->anal, &op, at + i, buf + i, core->blocksize - i)) {
+					if (!r_anal_op (core->anal, &op, at + i, buf + i, core->blocksize - i, R_ANAL_OP_MASK_BASIC)) {
 						r_anal_op_fini (&op);
 						continue;
 					}
@@ -2680,6 +2986,75 @@
 	return count;
 }
 
+static void found_xref(RCore *core, ut64 at, ut64 xref_to, RAnalRefType type, int count, int rad, int cfg_debug, bool cfg_anal_strings) {
+	// Validate the reference. If virtual addressing is enabled, we
+	// allow only references to virtual addresses in order to reduce
+	// the number of false positives. In debugger mode, the reference
+	// must point to a mapped memory region.
+	if (type == R_ANAL_REF_TYPE_NULL) {
+		return;
+	}
+	if (cfg_debug) {
+		if (!r_debug_map_get (core->dbg, xref_to)) {
+			return;
+		}
+	} else if (core->io->va) {
+		if (!r_io_is_valid_offset (core->io, xref_to, 0)) {
+			return;
+		}
+	}
+	if (!rad) {
+		if (cfg_anal_strings && type == R_ANAL_REF_TYPE_DATA) {
+			int len = 0;
+			char *str_string = is_string_at (core, xref_to, &len);
+			if (str_string) {
+				r_name_filter (str_string, -1);
+				char *str_flagname = r_str_newf ("str.%s", str_string);
+				r_flag_space_push (core->flags, "strings");
+				(void)r_flag_set (core->flags, str_flagname, xref_to, 1);
+				r_flag_space_pop (core->flags);
+			}
+			if (len > 0) {
+				r_meta_add (core->anal, R_META_TYPE_STRING, xref_to,
+						xref_to + len, (const char *)str_string);
+			}
+			free (str_string);
+		}
+		// Add to SDB
+		if (xref_to) {
+			r_anal_xrefs_set (core->anal, at, xref_to, type);
+		}	
+	} else if (rad == 'j') {
+		// Output JSON
+		if (count > 0) {
+			r_cons_printf (",");
+		}
+		r_cons_printf ("\"0x%"PFMT64x"\":\"0x%"PFMT64x"\"", xref_to, at);
+	} else {
+		int len = 0;
+		// Display in radare commands format
+		char *cmd;
+		switch (type) {
+		case R_ANAL_REF_TYPE_CODE: cmd = "axc"; break;
+		case R_ANAL_REF_TYPE_CALL: cmd = "axC"; break;
+		case R_ANAL_REF_TYPE_DATA: cmd = "axd"; break;
+		default: cmd = "ax"; break;
+		}
+		r_cons_printf ("%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n", cmd, xref_to, at);
+		if (cfg_anal_strings && type == R_ANAL_REF_TYPE_DATA) {
+			char *str_flagname = is_string_at (core, xref_to, &len);
+			if (str_flagname) {
+				ut64 str_addr = xref_to;
+				r_name_filter (str_flagname, -1);
+				r_cons_printf ("f str.%s=0x%"PFMT64x"\n", str_flagname, str_addr);
+				r_cons_printf ("Cs %d @ 0x%"PFMT64x"\n", len, str_addr);
+				free (str_flagname);
+			}
+		}
+	}
+
+}
+
 R_API int r_core_anal_search_xrefs(RCore *core, ut64 from, ut64 to, int rad) {
 	int cfg_debug = r_config_get_i (core->config, "cfg.debug");
 	bool cfg_anal_strings = r_config_get_i (core->config, "anal.strings");
@@ -2727,37 +3102,38 @@
 		(void)r_io_read_at (core->io, at, buf, bsz);
 		memset (block, -1, bsz);
 		if (!memcmp (buf, block, bsz)) {
-			//eprintf ("Error: skipping uninitialized block \n");
+		//	eprintf ("Error: skipping uninitialized block \n");
 			at += bsz;
 			continue;
 		}
 		memset (block, 0, bsz);
 		if (!memcmp (buf, block, bsz)) {
-			//eprintf ("Error: skipping uninitialized block \n");
+		//	eprintf ("Error: skipping uninitialized block \n");
 			at += bsz;
 			continue;
 		}
 		while (at < (at + bsz) && !r_cons_is_breaked ()) {
-			RAnalRefType type;
-			ut64 xref_to;
-			ret = r_anal_op (core->anal, &op, at, buf + i, bsz - i);
+			if (r_cons_is_breaked ()) {
+				break;
+			}
+			ret = r_anal_op (core->anal, &op, at, buf + i, bsz - i, 0);
 			ret = ret > 0 ? ret : 1;
 			i += ret;
 			if (ret <= 0 || i > bsz) {
 				break;
 			}
-			// Get reference type and target address
-			type = R_ANAL_REF_TYPE_NULL;
+			// find references
+			if (op.ptr && op.ptr != UT64_MAX && op.ptr != UT32_MAX) {
+				found_xref (core, op.addr, op.ptr, R_ANAL_REF_TYPE_DATA, count, rad, cfg_debug, cfg_anal_strings);
+			}
 			switch (op.type) {
 			case R_ANAL_OP_TYPE_JMP:
 			case R_ANAL_OP_TYPE_CJMP:
-				type = R_ANAL_REF_TYPE_CODE;
-				xref_to = op.jump;
+				found_xref(core, op.addr, op.jump, R_ANAL_REF_TYPE_CODE, count, rad, cfg_debug, cfg_anal_strings);
 				break;
 			case R_ANAL_OP_TYPE_CALL:
 			case R_ANAL_OP_TYPE_CCALL:
-				type = R_ANAL_REF_TYPE_CALL;
-				xref_to = op.jump;
+				found_xref(core, op.addr, op.jump, R_ANAL_REF_TYPE_CALL, count, rad, cfg_debug, cfg_anal_strings);
 				break;
 			case R_ANAL_OP_TYPE_UJMP:
 			case R_ANAL_OP_TYPE_IJMP:
@@ -2765,98 +3141,22 @@
 			case R_ANAL_OP_TYPE_IRJMP:
 			case R_ANAL_OP_TYPE_MJMP:
 			case R_ANAL_OP_TYPE_UCJMP:
-				type = R_ANAL_REF_TYPE_CODE;
-				xref_to = op.ptr;
+				found_xref(core, op.addr, op.ptr, R_ANAL_REF_TYPE_CODE, count, rad, cfg_debug, cfg_anal_strings);
 				break;
 			case R_ANAL_OP_TYPE_UCALL:
 			case R_ANAL_OP_TYPE_ICALL:
 			case R_ANAL_OP_TYPE_RCALL:
 			case R_ANAL_OP_TYPE_IRCALL:
 			case R_ANAL_OP_TYPE_UCCALL:
-				type = R_ANAL_REF_TYPE_CALL;
-				xref_to = op.ptr;
-				break;
-			case R_ANAL_OP_TYPE_LOAD:
-				type = R_ANAL_REF_TYPE_DATA;
-				xref_to = op.ptr;
+				found_xref(core, op.addr, op.ptr, R_ANAL_REF_TYPE_CALL, count, rad, cfg_debug, cfg_anal_strings);
 				break;
 			default:
-				if (op.ptr != -1) {
-					type = R_ANAL_REF_TYPE_DATA;
-					xref_to = op.ptr;
-				}
 				break;
 			}
 
-			// Validate the reference. If virtual addressing is enabled, we
-			// allow only references to virtual addresses in order to reduce
-			// the number of false positives. In debugger mode, the reference
-			// must point to a mapped memory region.
-			if (type == R_ANAL_REF_TYPE_NULL) {
-				goto beach;
-			}
-			if (cfg_debug) {
-				if (!r_debug_map_get (core->dbg, xref_to)) {
-					goto beach;
-				}
-			} else if (core->io->va) {
-				if (!r_io_is_valid_offset (core->io, xref_to, 0)) {
-					goto beach;
-				}
-			}
-			if (!rad) {
-				if (cfg_anal_strings && type == R_ANAL_REF_TYPE_DATA) {
-					int len = 0;
-					char *str_string = is_string_at (core, xref_to, &len);
-					if (str_string) {
-						r_name_filter (str_string, -1);
-						char *str_flagname = r_str_newf ("str.%s", str_string);
-						r_flag_space_push (core->flags, "strings");
-						(void)r_flag_set (core->flags, str_flagname, xref_to, 1);
-						r_flag_space_pop (core->flags);
-					}
-					if (len > 0) {
-						r_meta_add (core->anal, R_META_TYPE_STRING, xref_to,
-								xref_to + len, (const char *)str_string);
-					}
-					free (str_string);
-				}
-				// Add to SDB
-				if (xref_to) {
-					r_anal_xrefs_set (core->anal, type, at, xref_to);
-				}	
-			} else if (rad == 'j') {
-				// Output JSON
-				if (count > 0) {
-					r_cons_printf (",");
-				}
-				r_cons_printf ("\"0x%"PFMT64x"\":\"0x%"PFMT64x"\"", xref_to, at);
-			} else {
-				int len = 0;
-				// Display in radare commands format
-				char *cmd;
-				switch (type) {
-				case R_ANAL_REF_TYPE_CODE: cmd = "axc"; break;
-				case R_ANAL_REF_TYPE_CALL: cmd = "axC"; break;
-				case R_ANAL_REF_TYPE_DATA: cmd = "axd"; break;
-				default: cmd = "ax"; break;
-				}
-				r_cons_printf ("%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n", cmd, xref_to, at);
-				if (cfg_anal_strings && type == R_ANAL_REF_TYPE_DATA) {
-					char *str_flagname = is_string_at (core, xref_to, &len);
-					if (str_flagname) {
-						ut64 str_addr = xref_to;
-						r_name_filter (str_flagname, -1);
-						r_cons_printf ("f str.%s=0x%"PFMT64x"\n", str_flagname, str_addr);
-						r_cons_printf ("Cs %d @ 0x%"PFMT64x"\n", len, str_addr);
-						free (str_flagname);
-					}
-				}
-			}
-			beach :
-				count++;
-				at += ret;
-				r_anal_op_fini (&op);
+			count++;
+			at += ret;
+			r_anal_op_fini (&op);
 		}
 	}
 	r_cons_break_pop ();
@@ -2876,7 +3176,7 @@
 static bool isValidSymbol(RBinSymbol *symbol) {
 	if (symbol && symbol->type) {
 		const char *type = symbol->type;
-		return (!strcmp (type, "FUNC") || !strcmp (type, "METH"));
+		return (!strcmp (type, R_BIN_TYPE_FUNC_STR) || !strcmp (type, "METH"));
 	}
 	return false;
 }
@@ -2889,7 +3189,7 @@
 	RBinAddr *binmain;
 	RBinAddr *entry;
 	RBinSymbol *symbol;
-	int depth = r_config_get_i (core->config, "anal.depth");
+	int depth = core->anal->opt.depth;
 	bool anal_vars = r_config_get_i (core->config, "anal.vars");
 
 	/* Analyze Functions */
@@ -2909,6 +3209,9 @@
 			if (r_cons_is_breaked ()) {
 				break;
 			}
+			if (strstr (symbol->name, ".dll_")) { // Stop analyzing PE imports further
+				continue;
+			}
 			if (isValidSymbol (symbol)) {
 				ut64 addr = r_bin_get_vaddr (core->bin, symbol->paddr,
 					symbol->vaddr);
@@ -2934,12 +3237,7 @@
 			if (r_cons_is_breaked ()) {
 				break;
 			}
-			if (r_config_get_i (core->config, "anal.vars")) {
-				r_anal_var_delete_all (core->anal, fcni->addr, 'r');
-				r_anal_var_delete_all (core->anal, fcni->addr, 'b');
-				r_anal_var_delete_all (core->anal, fcni->addr, 's');
-				fcn_callconv (core, fcni);
-			}
+			r_core_recover_vars (core, fcni, true);
 			if (!strncmp (fcni->name, "sym.", 4) || !strncmp (fcni->name, "main", 4)) {
 				fcni->type = R_ANAL_FCN_TYPE_SYM;
 			}
@@ -2949,33 +3247,6 @@
 	return true;
 }
 
-R_API void r_core_anal_setup_enviroment (RCore *core) {
-	char key[128], *str = NULL;
-	RListIter *iter;
-	RConfigNode *kv;
-	r_list_foreach (core->config->nodes, iter, kv) {
-		int kvlen = strlen (kv->name);
-		if (kvlen >= sizeof (key)) {
-			return;
-		}
-		strcpy (key, kv->name);
-		r_str_case (key, 1);
-		r_str_replace_char (key, '.', '_');
-#define RANAL_PARSE_STRING_ONLY 1
-#if RANAL_PARSE_STRING_ONLY
-		r_anal_type_define (core->anal, key, kv->value);
-#else
-		if (kv->flags & CN_INT) {
-			r_anal_type_define_i (core->anal, key, kv->i_value);
-		} else if (kv->flags & CN_BOOL) {
-			r_anal_type_define (core->anal, key, kv->i_value? "": NULL);
-		} else r_anal_type_define (core->anal, key, kv->value);
-#endif
-	}
-	r_anal_type_header (core->anal, str);
-	free (str);
-}
-
 R_API int r_core_anal_data (RCore *core, ut64 addr, int count, int depth, int wordsize) {
 	RAnalData *d;
 	ut64 dstaddr = 0LL;
@@ -2994,7 +3265,7 @@
 	r_io_read_at (core->io, addr, buf, len);
 	buf[len - 1] = 0;
 
-	RConsPalette *pal = r_config_get_i (core->config, "scr.color")? &r_cons_singleton()->pal: NULL;
+	RConsPrintablePalette *pal = r_config_get_i (core->config, "scr.color")? &r_cons_singleton ()->pal: NULL;
 	for (i = j = 0; j < count; j++) {
 		if (i >= len) {
 			r_io_read_at (core->io, addr + i, buf, len);
@@ -3090,6 +3361,10 @@
 		}
 		piece = (F->addr - from) / step;
 		as->block[piece].functions++;
+		int last_piece = R_MIN ((F->addr + F->_size - 1) / step, blocks - 1);
+		for (; piece <= last_piece; piece++) {
+			as->block[piece].in_functions++;
+		}
 	}
 	// iter all symbols
 	r_list_foreach (r_bin_get_symbols (core->bin), iter, S) {
@@ -3137,7 +3412,7 @@
 	cf = r_anal_cycle_frame_new ();
 	r_cons_break_push (NULL, NULL);
 	while (cf && !r_cons_is_breaked ()) {
-		if ((op = r_core_anal_op (core, addr)) && (op->cycles) && (ccl > 0)) {
+		if ((op = r_core_anal_op (core, addr, R_ANAL_OP_MASK_BASIC)) && (op->cycles) && (ccl > 0)) {
 			r_cons_clear_line (1);
 			eprintf ("%i -- ", ccl);
 			addr += op->size;
@@ -3327,6 +3602,7 @@
 	RAnalBlock *bb;
 	RAnalFunction *f1 = r_anal_get_fcn_at (core->anal, addr, 0);
 	RAnalFunction *f2 = r_anal_get_fcn_at (core->anal, addr2, 0);
+	RAnalFunction *f3 = NULL;
 	if (!f1 || !f2) {
 		eprintf ("Cannot find function\n");
 		return;
@@ -3370,11 +3646,16 @@
 	// TODO: import data/code/refs
 	// update size
 	f1->addr = R_MIN (addr, addr2);
-	r_anal_fcn_set_size (f1, max - min);
+	r_anal_fcn_set_size (core->anal, f1, max - min);
 	// resize
 	f2->bbs = NULL;
 	r_anal_fcn_tree_delete (&core->anal->fcn_tree, f2);
-	r_list_delete_data (core->anal->fcns, f2);
+	r_list_foreach (core->anal->fcns, iter, f2) {
+		if (f2 == f3) {
+			r_list_delete (core->anal->fcns, iter);
+			f3->bbs = NULL;
+		}
+	}
 }
 
 R_API void r_core_anal_auto_merge (RCore *core, ut64 addr) {
@@ -3434,7 +3715,7 @@
 		bool validRef = false;
 		if (trace && myvalid (mycore->io, refptr)) {
 			if (ntarget == UT64_MAX || ntarget == refptr) {
-				r_anal_ref_add (mycore->anal, refptr, esil->address, 'd');
+				r_anal_xrefs_set (mycore->anal, esil->address, refptr, R_ANAL_REF_TYPE_DATA);
 				str[0] = 0;
 				if (r_io_read_at (mycore->io, refptr, str, sizeof (str)) < 1) {
 					eprintf ("Invalid read\n");
@@ -3449,7 +3730,7 @@
 
 		/** resolve ptr */
 		if (ntarget == UT64_MAX || ntarget == addr || (ntarget == UT64_MAX && !validRef)) {
-			r_anal_ref_add (mycore->anal, addr, esil->address, 'd');
+			r_anal_xrefs_set (mycore->anal, esil->address, addr, R_ANAL_REF_TYPE_DATA);
 		}
 	}
 	return 0; // fallback
@@ -3470,7 +3751,7 @@
 	str_flagname = is_string_at (core, xref_to, &len);
 	if (str_flagname) {
 		r_name_filter (str_flagname, -1);
-		char *flagname = sdb_fmt (0, "str.%s", str_flagname);
+		char *flagname = sdb_fmt ("str.%s", str_flagname);
 		r_flag_space_push (core->flags, "strings");
 		r_flag_set (core->flags, flagname, xref_to, len);
 		r_flag_space_pop (core->flags);
@@ -3559,7 +3840,7 @@
 
 	// TODO Hardcoding for 2 instructions (mov e_p,[esp];ret). More work needed
 	idx = 0;
-	if (r_anal_op (core->anal, &op, cur, buf + idx, size - idx) <= 0 ||
+	if (r_anal_op (core->anal, &op, cur, buf + idx, size - idx, R_ANAL_OP_MASK_ESIL) <= 0 ||
 			op.size <= 0 ||
 			(op.type != R_ANAL_OP_TYPE_MOV && op.type != R_ANAL_OP_TYPE_CMOV)) {
 		goto err_anal_op;
@@ -3598,7 +3879,7 @@
 
 	cur = addr + idx;
 	r_anal_op_fini (&op);
-	if (r_anal_op (core->anal, &op, cur, buf + idx, size - idx) <= 0 ||
+	if (r_anal_op (core->anal, &op, cur, buf + idx, size - idx, R_ANAL_OP_MASK_ESIL) <= 0 ||
 			op.size <= 0 ||
 			(op.type != R_ANAL_OP_TYPE_RET && op.type != R_ANAL_OP_TYPE_CRET)) {
 		goto err_anal_op;
@@ -3716,6 +3997,11 @@
 	esil_anal_stop = false;
 	r_cons_break_push (cccb, core);
 
+	int arch = -1;
+	if (core->anal->bits == 64 && !strcmp (core->anal->cur->arch, "arm")) {
+		arch = R2_ARCH_ARM64;
+	}
+
 	int opalign = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_ALIGN);
 	int in = r_syscall_get_swi (core->anal->syscall);
 	const char *sn = r_reg_get_name (core->anal->reg, R_REG_NAME_SN);
@@ -3730,7 +4016,8 @@
 			cur -= (cur % opalign);
 		}
 		r_anal_op_fini (&op);
-		if (!r_anal_op (core->anal, &op, cur, buf + i, iend - i)) {
+		r_asm_set_pc (core->assembler, cur);
+		if (!r_anal_op (core->anal, &op, cur, buf + i, iend - i, R_ANAL_OP_MASK_ALL)) {
 			i += minopsize - 1;
 		}
 		// if (op.type & 0x80000000 || op.type == 0) {
@@ -3738,7 +4025,6 @@
 			// i +=2;
 			continue;
 		}
-		r_asm_set_pc (core->assembler, cur);
 		//we need to check again i because buf+i may goes beyond its boundaries
 		//because of i+= minopsize - 1
 		if (i > iend) {
@@ -3757,10 +4043,10 @@
 					RSyscallItem *si = r_syscall_get (core->anal->syscall, snv, in);
 					if (si) {
 					//	eprintf ("0x%08"PFMT64x" SYSCALL %-4d %s\n", cur, snv, si->name);
-						r_flag_set_next (core->flags, sdb_fmt (0, "syscall.%s", si->name), cur, 1);
+						r_flag_set_next (core->flags, sdb_fmt ("syscall.%s", si->name), cur, 1);
 					} else {
 					//	eprintf ("0x%08"PFMT64x" SYSCALL %d\n", cur, snv);
-						r_flag_set_next (core->flags, sdb_fmt (0, "syscall.%d", snv), cur, 1);
+						r_flag_set_next (core->flags, sdb_fmt ("syscall.%d", snv), cur, 1);
 					}
 					r_flag_space_set (core->flags, NULL);
 				}
@@ -3769,39 +4055,49 @@
 		}
 		if (1) {
 			const char *esilstr = R_STRBUF_SAFEGET (&op.esil);
-			r_anal_esil_set_pc (ESIL, cur);
 			i += op.size - 1;
 			if (!esilstr || !*esilstr) {
 				continue;
 			}
+			r_anal_esil_set_pc (ESIL, cur);
 			(void)r_anal_esil_parse (ESIL, esilstr);
-			// r_anal_esil_set_pc (ESIL, cur);
 			// looks like ^C is handled by esil_parse !!!!
 			//r_anal_esil_dumpstack (ESIL);
 			//r_anal_esil_stack_free (ESIL);
 			switch (op.type) {
 			case R_ANAL_OP_TYPE_LEA:
-				if ((target && op.ptr == ntarget) || !target) {
-					if (core->anal->cur && strcmp (core->anal->cur->arch, "arm")) {
-						if (cfg_anal_strings) {
-							if (CHECKREF (ESIL->cur)) {
-								r_anal_ref_add (core->anal, ESIL->cur, cur, 's');
-							}
+				// arm64
+				if (core->anal->cur && arch == R2_ARCH_ARM64) {
+					if (CHECKREF (ESIL->cur)) {
+						r_anal_xrefs_set (core->anal, cur, ESIL->cur, R_ANAL_REF_TYPE_STRING);
+					}
+				} else if ((target && op.ptr == ntarget) || !target) {
+			//		if (core->anal->cur && strcmp (core->anal->cur->arch, "arm")) {
+					if (CHECKREF (ESIL->cur)) {
+						if (op.ptr && r_io_is_valid_offset (core->io, op.ptr, !core->anal->opt.noncode)) {
+							r_anal_xrefs_set (core->anal, cur, op.ptr, R_ANAL_REF_TYPE_STRING);
+						} else {
+							r_anal_xrefs_set (core->anal, cur, ESIL->cur, R_ANAL_REF_TYPE_STRING);
 						}
 					}
 				}
-				add_string_ref (core, op.ptr);
+				if (cfg_anal_strings) {
+					add_string_ref (core, op.ptr);
+				}
 				break;
 			case R_ANAL_OP_TYPE_ADD:
 				/* TODO: test if this is valid for other archs too */
-				if (core->anal->bits == 64 && core->anal->cur && !strcmp (core->anal->cur->arch, "arm")) {
+				if (core->anal->cur && !strcmp (core->anal->cur->arch, "arm")) {
+					/* This code is known to work on Thumb, ARM and ARM64 */
 					ut64 dst = ESIL->cur;
 					if ((target && dst == ntarget) || !target) {
 						if (CHECKREF (dst)) {
-							r_anal_ref_add (core->anal, dst, cur, 'd');
+							r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA);
 						}
 					}
-					add_string_ref (core, dst);
+				//	if (cfg_anal_strings) {
+						add_string_ref (core, dst);
+				//	}
 				} else if ((core->anal->bits == 32 && core->anal->cur && !strcmp (core->anal->cur->arch, "mips"))) {
 					ut64 dst = ESIL->cur;
 					if (!op.src[0] || !op.src[0]->reg || !op.src[0]->reg->name) {
@@ -3818,14 +4114,14 @@
 							RFlagItem *f;
 							char *str;
 							if (CHECKREF (dst) || CHECKREF (cur)) {
-								r_anal_ref_add (core->anal, dst, cur, 'd');
+								r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA);
 								if (cfg_anal_strings) {
 									add_string_ref (core, dst);
 								}
 								if ((f = r_flag_get_i2 (core->flags, dst))) {
 									r_meta_set_string (core->anal, R_META_TYPE_COMMENT, cur, f->name);
 								} else if ((str = is_string_at (mycore, dst, NULL))) {
-									char *str2 = sdb_fmt (2, "esilref: '%s'", str);
+									char *str2 = sdb_fmt ("esilref: '%s'", str);
 									// HACK avoid format string inside string used later as format
 									// string crashes disasm inside agf under some conditions.
 									// https://github.com/radare/radare2/issues/6937
@@ -3843,7 +4139,7 @@
 					ut64 dst = esilbreak_last_read;
 					if (dst != UT64_MAX && CHECKREF (dst)) {
 						if (myvalid (mycore->io, dst)) {
-							r_anal_ref_add (core->anal, dst, cur, 'd');
+							r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA);
 							if (cfg_anal_strings) {
 								add_string_ref (core, dst);
 							}
@@ -3852,7 +4148,7 @@
 					dst = esilbreak_last_data;
 					if (dst != UT64_MAX && CHECKREF (dst)) {
 						if (myvalid (mycore->io, dst)) {
-							r_anal_ref_add (core->anal, dst, cur, 'd');
+							r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_DATA);
 							if (cfg_anal_strings) {
 								add_string_ref (core, dst);
 							}
@@ -3865,7 +4161,7 @@
 					ut64 dst = op.jump;
 					if (CHECKREF (dst)) {
 						if (myvalid (core->io, dst)) {
-							r_anal_ref_add (core->anal, dst, cur, 'c');
+							r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_CODE);
 						}
 					}
 				}
@@ -3875,7 +4171,7 @@
 					ut64 dst = op.jump;
 					if (CHECKREF (dst)) {
 						if (myvalid (core->io, dst)) {
-							r_anal_ref_add (core->anal, dst, cur, 'C');
+							r_anal_xrefs_set (core->anal, cur, dst, R_ANAL_REF_TYPE_CALL);
 						}
 						ESIL->old = cur + op.size;
 						getpcfromstack (core, ESIL);
@@ -3899,7 +4195,7 @@
 								(op.type & R_ANAL_OP_TYPE_MASK) == R_ANAL_OP_TYPE_UCALL
 								? R_ANAL_REF_TYPE_CALL
 								: R_ANAL_REF_TYPE_CODE;
-							r_anal_ref_add (core->anal, dst, cur, ref);
+							r_anal_xrefs_set (core->anal, cur, dst, ref);
 						}
 					}
 				}
@@ -3914,3 +4210,114 @@
 	// restore register
 	r_reg_arena_pop (core->anal->reg);
 }
+
+typedef struct {
+	dict visited;
+	RList *path;
+	RCore *core;
+	ut64 from;
+	RAnalBlock *fromBB;
+	ut64 to;
+	RAnalBlock *toBB;
+	RAnalBlock *cur;
+	bool followCalls;
+	int followDepth;
+	int count; // max number of results
+} RCoreAnalPaths;
+
+static bool printAnalPaths(RCoreAnalPaths *p) {
+	RListIter *iter;
+	RAnalBlock *path;
+	r_cons_printf ("pdb @@= ");
+	r_list_foreach (p->path, iter, path) {
+		r_cons_printf ("0x%08"PFMT64x" ", path->addr);
+	}
+	r_cons_printf ("\n");
+	return (p->count < 1 || --p->count > 0);
+}
+static void analPaths (RCoreAnalPaths *p);
+
+static void analPathFollow(RCoreAnalPaths *p, ut64 addr) {
+	if (addr == UT64_MAX) {
+		return;
+	}
+	if (!dict_get (&p->visited, addr)) {
+		p->cur = r_anal_bb_from_offset (p->core->anal, addr);
+		analPaths (p);
+	}
+}
+
+static void analPaths (RCoreAnalPaths *p) {
+	RAnalBlock *cur = p->cur;
+	if (!cur) {
+		// eprintf ("eof\n");
+		return;
+	}
+	/* handle ^C */
+	if (r_cons_is_breaked ()) {
+		return;
+	}
+	dict_set (&p->visited, cur->addr, 1, NULL);
+	r_list_append (p->path, cur);
+	if (p->followDepth && --p->followDepth == 0) {
+		return;
+	}
+	if (p->toBB && cur->addr == p->toBB->addr) {
+		if (!printAnalPaths (p)) {
+			return;
+		}
+	} else {
+		RAnalBlock *c = cur;
+		ut64 j = cur->jump;
+		ut64 f = cur->fail;
+		analPathFollow (p, j);
+		cur = c;
+		analPathFollow (p, f);
+		if (p->followCalls) {
+			int i;
+			for (i = 0; i < cur->op_pos_size; i++) {
+				ut64 addr = cur->addr + cur->op_pos[i];
+				RAnalOp *op = r_core_anal_op (p->core, addr, R_ANAL_OP_MASK_BASIC);
+				if (op && op->type == R_ANAL_OP_TYPE_CALL) {
+					cur = c;
+					analPathFollow (p, op->jump);
+				}
+				cur = c;
+				r_anal_op_free (op);
+			}
+		}
+	}
+	p->cur = r_list_pop (p->path);
+	dict_del (&p->visited, cur->addr);
+	if (p->followDepth) {
+		p->followDepth++;
+	}
+}
+
+R_API void r_core_anal_paths(RCore *core, ut64 from, ut64 to, bool followCalls, int followDepth) {
+	RAnalBlock *b0 = r_anal_bb_from_offset (core->anal, from);
+	RAnalBlock *b1 = r_anal_bb_from_offset (core->anal, to);
+	if (!b0) {
+		eprintf ("Cannot find basic block for 0x%08"PFMT64x"\n", from);
+	}
+	if (!b1) {
+		eprintf ("Cannot find basic block for 0x%08"PFMT64x"\n", to);
+	}
+	RCoreAnalPaths rcap = {{0}};
+	dict_init (&rcap.visited, 32, free);
+	rcap.path = r_list_new ();
+	rcap.core = core;
+	rcap.from = from;
+	rcap.fromBB = b0;
+	rcap.to = to;
+	rcap.toBB = b1;
+	rcap.cur = b0;
+	rcap.count = r_config_get_i (core->config, "search.maxhits");;
+	rcap.followCalls = followCalls;
+	rcap.followDepth = followDepth;
+
+	analPaths (&rcap);
+
+        dict_fini (&rcap.visited);
+	r_list_free (rcap.path);
+}
diff -Nru radare2-2.3.0+dfsg/libr/core/carg.c radare2-2.8.0+dfsg/libr/core/carg.c
--- radare2-2.3.0+dfsg/libr/core/carg.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/carg.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,260 @@
+/* radare - LGPL - Copyright 2009-2018 - pancake */
+
+#include <r_core.h>
+
+#define MAXSTRLEN 50
+
+static void set_fcn_args_info(RAnalFuncArg *arg, RAnal *anal, const char *fcn_name, const char *cc, int arg_num) {
+	if (!fcn_name || !arg || !anal) {
+		return;
+	}
+	Sdb *TDB = anal->sdb_types;
+	arg->name = r_type_func_args_name (TDB, fcn_name, arg_num);
+	arg->orig_c_type = r_type_func_args_type (TDB, fcn_name, arg_num);
+	if (!strncmp ("const ", arg->orig_c_type, 6)) {
+		arg->c_type = arg->orig_c_type + 6;
+	} else {
+		arg->c_type = arg->orig_c_type;
+	}
+	const char *query = sdb_fmt ("type.%s", arg->c_type);
+	arg->fmt = sdb_const_get (TDB, query, 0);
+	const char *t_query = sdb_fmt ("type.%s.size", arg->c_type);
+	arg->size = sdb_num_get (TDB, t_query, 0) / 8;
+	arg->cc_source = r_anal_cc_arg (anal, cc, arg_num + 1);
+}
+
+R_API char *resolve_fcn_name(RAnal *anal, const char *func_name) {
+	const char *str = func_name;
+	const char *name = func_name;
+	if (r_type_func_exist (anal->sdb_types, func_name)) {
+		return strdup (func_name);
+	}
+	while ((str = strchr (str, '.'))) {
+		name = str + 1;
+		str++;
+	}
+	if (r_type_func_exist (anal->sdb_types, name)) {
+		return strdup (name);
+	}
+	return r_type_func_guess (anal->sdb_types, (char*)func_name);
+}
+
+static ut64 get_buf_val(ut8 *buf, int endian, int width) {
+	return (width == 8)? r_read_ble64 (buf, endian) : (ut64) r_read_ble32 (buf,endian);
+}
+
+static void print_arg_str(int argcnt, const char *name, bool color) {
+	if (color) {
+		r_cons_printf (Color_BYELLOW" arg [%d]"Color_RESET" -"Color_BCYAN" %s"Color_RESET" : ",
+				argcnt, name);
+	} else {
+		r_cons_printf (" arg [%d] -  %s : ", argcnt, name);
+	}
+}
+
+static void print_format_values(RCore *core, const char *fmt, bool onstack, ut64 src, bool color) {
+	char opt;
+	ut64 bval = src;
+	int i;
+	int endian = core->print->big_endian;
+	int width = (core->anal->bits == 64)? 8: 4;
+	int bsize = R_MIN (64, core->blocksize);
+
+	ut8 *buf = malloc (bsize);
+	if (!buf) {
+		eprintf ("Cannot allocate %d byte(s)\n", bsize);
+		free (buf);
+		return;
+	}
+	if (fmt) {
+		opt = *fmt;
+	} else {
+		opt = 'p'; // void *ptr
+	}
+	if (onstack || ((opt != 'd' && opt != 'x') && !onstack)) {
+		if (color) {
+			r_cons_printf (Color_BGREEN"0x%08"PFMT64x Color_RESET" --> ", bval);
+		} else {
+			r_cons_printf ("0x%08"PFMT64x" --> ", bval);
+		}
+		r_io_read_at (core->io, bval, buf, bsize);
+	}
+	if (onstack) { // Fetch value from stack
+		bval = get_buf_val (buf, endian, width);
+		if (opt != 'd' && opt != 'x') {
+			r_io_read_at (core->io, bval, buf, bsize); // update buf with val from stack
+		}
+	}
+	r_cons_print (color? Color_BGREEN: "");
+	switch (opt) {
+	case 'z' : // Null terminated string
+		r_cons_print (color ?Color_RESET Color_BWHITE:"");
+		r_cons_print ("\"");
+		for (i = 0; i < MAXSTRLEN; i++) {
+			if (buf[i] == '\0') {
+				break;
+			}
+			ut8 b = buf[i];
+			if (IS_PRINTABLE (b)) {
+				r_cons_printf ("%c", b);
+			} else {
+				r_cons_printf ("\\x%02x", b);
+			}
+			if (i == MAXSTRLEN - 1) {
+				 r_cons_print ("..."); // To show string is truncated
+			}
+		}
+		r_cons_print ("\"");
+		r_cons_newline ();
+		break;
+	case 'd' : // integer
+	case 'x' :
+		r_cons_printf ("0x%08" PFMT64x, bval);
+		r_cons_newline ();
+		break;
+	case 'c' : // char
+		r_cons_print ("\'");
+		ut8 ch = buf[0];
+		if (IS_PRINTABLE (ch)) {
+			r_cons_printf ("%c", ch);
+		} else {
+			r_cons_printf ("\\x%02x", ch);
+		}
+		r_cons_print ("\'");
+		r_cons_newline ();
+		break;
+	case 'p' : // pointer
+		{
+		// Try to deref the pointer once again
+		r_cons_printf ("0x%08"PFMT64x, get_buf_val (buf, endian, width));
+		r_cons_newline ();
+		break;
+		}
+	default:
+		//TODO: support types like structs and unions
+		r_cons_println ("unk_format");
+	}
+	r_cons_print (Color_RESET);
+	free (buf);
+}
+
+/* This functon display list of arg with some colors */
+
+R_API void r_core_print_func_args(RCore *core) {
+	RListIter *iter;
+	bool color = r_config_get_i (core->config, "scr.color");
+	if (!core->anal) {
+		return;
+	}
+	if (!core->anal->reg) {
+		return;
+	}
+	const char *pc = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
+	ut64 cur_addr = r_reg_getv (core->anal->reg, pc);
+	RAnalOp *op = r_core_anal_op (core, cur_addr, R_ANAL_OP_MASK_BASIC);
+	if (!op) {
+		return;
+	}
+	if (op->type == R_ANAL_OP_TYPE_CALL) {
+		RAnalFunction *fcn;
+		RAnalFuncArg *arg;
+		int i;
+		int nargs = 0;
+		bool onstack = false;
+		const char *fcn_name = NULL;
+		ut64 pcv = op->jump;
+		if (pcv == UT64_MAX) {
+			pcv = op->ptr;
+		}
+		fcn = r_anal_get_fcn_at (core->anal, pcv, 0);
+		if (fcn) {
+			fcn_name = fcn->name;
+		} else {
+			if (core->flags) {
+				RFlagItem *item = r_flag_get_i (core->flags, pcv);
+				if (item) {
+					fcn_name = item->name;
+				}
+			}
+		}
+		RList *list = r_core_get_func_args (core, fcn_name);
+		if (!r_list_empty (list)) {
+			int argcnt = 0;
+			r_list_foreach (list, iter, arg) {
+				if (arg->cc_source && !strncmp (arg->cc_source, "stack", 5)) {
+					onstack = true;
+				}
+				print_arg_str (argcnt, arg->name, color);
+				print_format_values (core, arg->fmt, onstack, arg->src, color);
+				argcnt++;
+			}
+		} else {
+			if (fcn) {
+				nargs = fcn->nargs;
+			}
+			if (nargs > 0) {
+				for (i = 0; i < nargs; i++) {
+					ut64 v = r_debug_arg_get (core->dbg, R_ANAL_CC_TYPE_STDCALL, i);
+					print_arg_str (i, "", color);
+					r_cons_printf ("0x%08" PFMT64x, v);
+					r_cons_newline ();
+				}
+			} else {
+				print_arg_str (0, "void", color);
+			}
+		}
+	}
+	r_anal_op_fini (op);
+}
+
+/* Returns a list of RAnalFuncArg */
+R_API RList *r_core_get_func_args(RCore *core, const char *fcn_name) {
+	if (!fcn_name || !core->anal) {
+		return NULL;
+	}
+	Sdb *TDB = core->anal->sdb_types;
+	RList *list = r_list_new ();
+	char *key = resolve_fcn_name (core->anal, fcn_name);
+	if (!key) {
+		return NULL;
+	}
+	const char *sp = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
+	int nargs = r_type_func_args_count (TDB, key);
+	const char *cc = r_anal_cc_func (core->anal, key);
+	const char *src = r_anal_cc_arg (core->anal, cc, 1); // src of first argument
+	if (!cc) {
+		// unsupported calling convention
+		return NULL;
+	}
+	int i;
+	ut64 spv = r_reg_getv (core->anal->reg, sp);
+	ut64 s_width = (core->anal->bits == 64)? 8: 4;
+	if (src && !strcmp (src, "stack_rev")) {
+		for (i = nargs - 1; i >= 0; i--) {
+			RAnalFuncArg *arg = R_NEW0 (RAnalFuncArg);
+			set_fcn_args_info (arg, core->anal, key, cc, i);
+			arg->src = spv;
+			spv += arg->size? arg->size : s_width;
+			r_list_append (list, arg);
+		}
+	} else {
+		for (i = 0; i < nargs; i++) {
+			RAnalFuncArg *arg = R_NEW0 (RAnalFuncArg);
+			if (!arg) {
+				return NULL;
+			}
+			set_fcn_args_info (arg, core->anal, key, cc, i);
+			if (src && !strncmp (src, "stack", 5)) {
+				arg->src = spv;
+				if (!arg->size) {
+					arg->size = s_width;
+				}
+				spv += arg->size;
+			} else {
+				arg->src = r_reg_getv (core->anal->reg, arg->cc_source);
+			}
+			r_list_append (list, arg);
+		}
+	}
+	return list;
+}
diff -Nru radare2-2.3.0+dfsg/libr/core/cbin.c radare2-2.8.0+dfsg/libr/core/cbin.c
--- radare2-2.3.0+dfsg/libr/core/cbin.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cbin.c	2018-08-07 14:12:36.000000000 +0000
@@ -3,13 +3,14 @@
 #include <r_core.h>
 #include "r_util.h"
 
-#define DBSPATH "/share/radare2/" R2_VERSION "/fcnsign"
 #define is_in_range(at, from, sz) ((at) >= (from) && (at) < ((from) + (sz)))
 
 #define VA_FALSE    0
 #define VA_TRUE     1
 #define VA_NOREBASE 2
 
+#define LOAD_BSS_MALLOC 0
+
 #define IS_MODE_SET(mode) (mode & R_CORE_BIN_SET)
 #define IS_MODE_SIMPLE(mode) (mode & R_CORE_BIN_SIMPLE)
 #define IS_MODE_SIMPLEST(mode) (mode & R_CORE_BIN_SIMPLEST)
@@ -30,14 +31,10 @@
 		r_cons_printf ("\"%s\":%s%s", a, b, lst);
 	} else {
 		char ws[16];
-		int al = strlen (a);
-		if (al > PAIR_WIDTH) {
-			al = 0;
-		} else {
-			al = PAIR_WIDTH - al;
-		}
-		memset (ws, ' ', al);
-		ws[al] = 0;
+		const int al = strlen (a);
+		const int wl = (al > PAIR_WIDTH)? 0: PAIR_WIDTH - al;
+		memset (ws, ' ', wl);
+		ws[wl] = 0;
 		r_cons_printf ("%s%s%s\n", a, ws, b);
 	}
 }
@@ -47,7 +44,11 @@
 }
 
 static void pair_int(const char *a, int n, int mode, bool last) {
-	pair (a, sdb_fmt (0, "%d", n), mode, last);
+	pair (a, sdb_fmt ("%d", n), mode, last);
+}
+
+static void pair_ut64(const char *a, ut64 n, int mode, bool last) {
+	pair (a, sdb_fmt ("%"PFMT64d, n), mode, last);
 }
 
 static void pair_str(const char *a, const char *b, int mode, int last) {
@@ -105,6 +106,7 @@
 		ut16 bits = info->bits;
 		ut64 baseaddr = r_bin_get_baddr (r->bin);
 		r_config_set_i (r->config, "bin.baddr", baseaddr);
+		sdb_num_add (r->sdb, "orig_baddr", baseaddr, 0);
 		r_config_set (r->config, "asm.arch", arch);
 		r_config_set_i (r->config, "asm.bits", bits);
 		r_config_set (r->config, "anal.arch", arch);
@@ -148,222 +150,6 @@
 	return binfile;
 }
 
-static bool false_positive(const char *str) {
-	int i;
-	ut8 bo[0x100];
-	int up = 0;
-	int lo = 0;
-	int ot = 0;
-	int di = 0;
-	int ln = 0;
-	int sp = 0;
-	int nm = 0;
-	for (i = 0; i < 0x100; i++) {
-		bo[i] = 0;
-	}
-	for (i = 0; str[i]; i++) {
-		if (IS_DIGIT(str[i])) {
-			nm++;
-		} else if (str[i]>='a' && str[i]<='z') {
-			lo++;
-		} else if (str[i]>='A' && str[i]<='Z') {
-			up++;
-		} else {
-			ot++;
-		}
-		if (str[i]=='\\') {
-			ot++;
-		}
-		if (str[i]==' ') {
-			sp++;
-		}
-		bo[(ut8)str[i]] = 1;
-		ln++;
-	}
-	for (i = 0; i<0x100; i++) {
-		if (bo[i]) {
-			di++;
-		}
-	}
-	if (ln > 2 && str[0] != '_') {
-		if (ln < 10) {
-			return true;
-		}
-		if (ot >= (nm + up + lo)) {
-			return true;
-		}
-		if (lo < 3) {
-			return true;
-		}
-	}
-	return false;
-}
-
-R_API bool r_core_bin_strpurge(RCore *core, const char *str, ut64 refaddr) {
-	bool purge = false;
-	if (core->bin->strpurge) {
-		char *addrs = strdup (core->bin->strpurge);
-		if (addrs) {
-			int splits = r_str_split (addrs, ',');
-			int i;
-			char *ptr;
-			char *range_sep;
-			ut64 addr, from, to;
-			for (i = 0, ptr = addrs; i < splits; i++, ptr += strlen (ptr) + 1) {
-				bool bang = false;
-				if (!strcmp (ptr, "true") && false_positive (str)) {
-					purge = true;
-					continue;
-				}
-				if (*ptr == '!') {
-					bang = true;
-					ptr++;
-				}
-				if (!strcmp (ptr, "all")) {
-					purge = !bang;
-					continue;
-				}
-				range_sep = strchr (ptr, '-');
-				if (range_sep) {
-					*range_sep = 0;
-					from = r_num_get (NULL, ptr);
-					ptr = range_sep + 1;
-					to = r_num_get (NULL, ptr);
-					if (refaddr >= from && refaddr <= to) {
-						purge = !bang;
-						continue;
-					}
-				}
-				addr = r_num_get (NULL, ptr);
-				if (addr != 0 || *ptr == '0') {
-					if (refaddr == addr) {
-						purge = !bang;
-						continue;
-					}
-				}
-			}
-			free (addrs);
-		}
-	}
-	return purge;
-}
-
-static bool string_filter(RCore *core, const char *str, ut64 addr) {
-	int i;
-	/* pointer/rawdata detection */
-	if (r_core_bin_strpurge (core, str, addr)) {
-		return false;
-	}
-
-	switch (core->bin->strfilter) {
-	case 'U': // only uppercase strings
-		for (i = 0; str[i]; i++) {
-			char ch = str[i];
-			if (ch == ' ') {
-				continue;
-			}
-			if (ch < '@'|| ch > 'Z') {
-				return false;
-			}
-			if (ch < 0 || !IS_PRINTABLE (ch)) {
-				return false;
-			}
-		}
-		if (str[0] && str[1]) {
-			for (i = 2; i<6 && str[i]; i++) {
-				if (str[i] == str[0]) {
-					return false;
-				}
-				if (str[i] == str[1]) {
-					return false;
-				}
-			}
-		}
-		if (str[0] == str[2]) {
-			return false; // rm false positives
-		}
-		break;
-	case 'a': // only alphanumeric - plain ascii
-		for (i = 0; str[i]; i++) {
-			char ch = str[i];
-			if (ch < 1 || !IS_PRINTABLE (ch)) {
-				return false;
-			}
-		}
-		break;
-	case 'e': // emails
-		if (str && *str) {
-			if (!strstr (str + 1, "@")) {
-				return false;
-			}
-			if (!strstr (str + 1, ".")) {
-				return false;
-			}
-		} else {
-			return false;
-		}
-		break;
-	case 'f': // format-string
-		if (str && *str) {
-			if (!strstr (str + 1, "%")) {
-				return false;
-			}
-		} else {
-			return false;
-		}
-		break;
-	case 'u': // URLs
-		if (!strstr (str, "://")) {
-			return false;
-		}
-		break;
-        case 'i': //IPV4
-		{
-			int segment = 0;
-			int segmentsum = 0;
-			bool prevd = false;
-			for (i = 0; str[i]; i++) {
-				char ch = str[i];
-				if (IS_DIGIT (ch)) {
-					segmentsum = segmentsum*10 + (ch - '0');
-					if (segment == 3) {
-						return true;
-					}
-					prevd = true;
-				} else if (ch == '.') {
-					if (prevd == true && segmentsum < 256){
-						segment++;
-						segmentsum = 0;
-					} else {
-						segmentsum = 0;
-						segment = 0;
-					}
-					prevd = false;
-				} else {
-					segmentsum = 0;
-					prevd = false;
-					segment = 0;
-				}
-			}
-			return false;
-		}
-	case 'p': // path
-		if (str[0] != '/') {
-			return false;
-		}
-		break;
-	case '8': // utf8
-		for (i = 0; str[i]; i++) {
-			char ch = str[i];
-			if (ch < 0) {
-				return true;
-			}
-		}
-		return false;
-	}
-	return true;
-}
-
 static void _print_strings(RCore *r, RList *list, int mode, int va) {
 	bool b64str = r_config_get_i (r->config, "bin.b64str");
 	int minstr = r_config_get_i (r->config, "bin.minstr");
@@ -371,6 +157,7 @@
 	RBin *bin = r->bin;
 	RBinObject *obj = r_bin_cur_object (bin);
 	RListIter *iter;
+	RListIter *last_processed = NULL;
 	RBinString *string;
 	RBinSection *section;
 	char *q;
@@ -394,7 +181,7 @@
 		paddr = string->paddr;
 		vaddr = r_bin_get_vaddr (bin, paddr, string->vaddr);
 		addr = va ? vaddr : paddr;
-		if (!string_filter (r, string->string, addr)) {
+		if (!r_bin_string_filter (bin, string->string, addr)) {
 			continue;
 		}
 		if (string->length < minstr) {
@@ -419,7 +206,7 @@
 			}
 		}
 		if (IS_MODE_SET (mode)) {
-			char *f_name, *str;
+			char *f_name, *f_realname, *str;
 			if (r_cons_is_breaked ()) {
 				break;
 			}
@@ -428,12 +215,16 @@
 			r_name_filter (f_name, -1);
 			if (r->bin->prefix) {
 				str = r_str_newf ("%s.str.%s", r->bin->prefix, f_name);
+				f_realname = r_str_newf ("%s.\"%s\"", r->bin->prefix, string->string);
 			} else {
 				str = r_str_newf ("str.%s", f_name);
+				f_realname = r_str_newf ("\"%s\"", string->string);
 			}
-			r_flag_set (r->flags, str, addr, string->size);
+			RFlagItem *flag = r_flag_set (r->flags, str, addr, string->size);
+			r_flag_item_set_realname (flag, f_realname);
 			free (str);
 			free (f_name);
+			free (f_realname);
 		} else if (IS_MODE_SIMPLE (mode)) {
 			r_cons_printf ("0x%"PFMT64x" %d %d %s\n", addr,
 				string->size, string->length, string->string);
@@ -442,18 +233,18 @@
 		} else if (IS_MODE_JSON (mode)) {
 			int *block_list;
 			q = r_base64_encode_dyn (string->string, -1);
-			r_cons_printf ("%s{\"vaddr\":%"PFMT64d
-				",\"paddr\":%"PFMT64d",\"ordinal\":%d"
+			r_cons_printf ("%s{\"vaddr\":%"PFMT64u
+				",\"paddr\":%"PFMT64u",\"ordinal\":%d"
 				",\"size\":%d,\"length\":%d,\"section\":\"%s\","
 				"\"type\":\"%s\",\"string\":\"%s\"",
-				iter->p ? ",": "",
+				last_processed ? ",": "",
 				vaddr, paddr, string->ordinal, string->size,
 				string->length, section_name, type_string, q);
 			switch (string->type) {
 			case R_STRING_TYPE_UTF8:
 			case R_STRING_TYPE_WIDE:
 			case R_STRING_TYPE_WIDE32:
-				block_list = r_utf_block_list ((const ut8*)string->string);
+				block_list = r_utf_block_list ((const ut8*)string->string, -1);
 				if (block_list) {
 					if (block_list[0] == 0 && block_list[1] == -1) {
 						/* Don't include block list if
@@ -540,7 +331,7 @@
 			case R_STRING_TYPE_UTF8:
 			case R_STRING_TYPE_WIDE:
 			case R_STRING_TYPE_WIDE32:
-				block_list = r_utf_block_list ((const ut8*)string->string);
+				block_list = r_utf_block_list ((const ut8*)string->string, -1);
 				if (block_list) {
 					if (block_list[0] == 0 && block_list[1] == -1) {
 						/* Don't show block list if
@@ -562,6 +353,7 @@
 			}
 			r_cons_printf ("\n");
 		}
+		last_processed = iter;
 	}
 	R_FREE (b64.string);
 	if (IS_MODE_JSON (mode)) {
@@ -574,23 +366,64 @@
 
 static bool bin_raw_strings(RCore *r, int mode, int va) {
 	RBinFile *bf = r_bin_cur (r->bin);
-	if (!bf && r->io && r->io->desc && r->io->desc->uri) {
-		const char *file = r->io->desc->uri;
-		r_sys_cmdf ("rabin2 -qzzz '%s'", file);
-		// eprintf ("Likely you used -nn \n");
-		// eprintf ("try: .!rabin2 -B <baddr> -zzr filename\n");
-		return false;
-	}
+	bool new_bf = false;
 	if (bf && strstr (bf->file, "malloc://")) {
 		//sync bf->buf to search string on it
 		r_io_read_at (r->io, 0, bf->buf->buf, bf->size);
 	}
 	if (!r->file) {
 		eprintf ("Core file not open\n");
+		if (IS_MODE_JSON (mode)) {
+			r_cons_print ("[]");
+		}
 		return false;
 	}
+	if (!bf) {
+		bf = R_NEW0 (RBinFile);
+		if (!bf) {
+			return false;
+		}
+		RIODesc *desc = r_io_desc_get (r->io, r->file->fd);
+		if (!desc) {
+			free (bf);
+			return false;
+		}
+		bf->file = strdup (desc->name);
+		bf->size = r_io_desc_size (desc);
+		if (bf->size == UT64_MAX) {
+			free (bf);
+			return false;
+		}
+		bf->buf = r_buf_new_with_io (&r->bin->iob, r->file->fd);
+#if 0
+		bf->buf = r_buf_new ();
+		if (!bf->buf) {
+			free (bf);
+			return false;
+		}
+		bf->buf->buf = malloc (bf->size);
+		if (!bf->buf->buf) {
+			free (bf->buf);
+			free (bf);
+			return false;
+		}
+		bf->buf->fd = r->file->fd;
+		bf->buf->length = bf->size;
+		r_io_read_at (r->io, 0, bf->buf->buf, bf->size);
+#endif
+		bf->o = NULL;
+		bf->rbin = r->bin;
+		new_bf = true;
+		va = false;
+	}
 	RList *l = r_bin_raw_strings (bf, 0);
 	_print_strings (r, l, mode, va);
+	if (new_bf) {
+		r_buf_free (bf->buf);
+		bf->buf = NULL;
+		bf->id = -1;
+		r_bin_file_free (bf);
+	}
 	return true;
 }
 
@@ -669,35 +502,42 @@
 	anal_arch = r_config_get (core->config, "anal.arch");
 	os = r_config_get (core->config, "asm.os");
 	// spaguetti ahead
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types.sdb", dir_prefix);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types.sdb"), dir_prefix);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types-%s.sdb", dir_prefix, anal_arch);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types-%s.sdb"),
+		dir_prefix, anal_arch);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types-%s.sdb", dir_prefix, os);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types-%s.sdb"),
+		dir_prefix, os);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types-%d.sdb", dir_prefix, bits);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types-%d.sdb"),
+		dir_prefix, bits);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types-%s-%d.sdb", dir_prefix, os, bits);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types-%s-%d.sdb"),
+		dir_prefix, os, bits);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types-%s-%d.sdb", dir_prefix, anal_arch, bits);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types-%s-%d.sdb"),
+		dir_prefix, anal_arch, bits);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types-%s-%s.sdb", dir_prefix, anal_arch, os);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types-%s-%s.sdb"),
+		dir_prefix, anal_arch, os);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
-	dbpath = sdb_fmt (-1, "%s/"DBSPATH"/types-%s-%s-%d.sdb", dir_prefix, anal_arch, os, bits);
+	dbpath = sdb_fmt (R_JOIN_3_PATHS ("%s", R2_SDB_FCNSIGN, "types-%s-%s-%d.sdb"),
+		dir_prefix, anal_arch, os, bits);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (types, dbpath);
 	}
@@ -708,8 +548,8 @@
 	sdbs[0] = ((Sdb**) p)[0];
 	sdbs[1] = ((Sdb**) p)[1];
 	if (!strncmp (v, "cc", strlen ("cc") + 1)) {
-		const char *x = sdb_const_get (sdbs[1], sdb_fmt (-1, "cc.%s.name", k), 0);
-		char *tmp = sdb_fmt (-1, "%p", x);
+		const char *x = sdb_const_get (sdbs[1], sdb_fmt ("cc.%s.name", k), 0);
+		char *tmp = sdb_fmt ("%p", x);
 		sdb_set (sdbs[0], tmp, x, 0);
 	}
 	return 1;
@@ -724,7 +564,7 @@
 	//save pointers and values stored inside them
 	//to recover from freeing heeps
 	const char *defaultcc = sdb_const_get (sdbs[1], "default.cc", 0);
-	sdb_set (sdbs[0], sdb_fmt (-1, "0x%08"PFMT64x, r_num_get (NULL, defaultcc)), defaultcc, 0);
+	sdb_set (sdbs[0], sdb_fmt ("0x%08"PFMT64x, r_num_get (NULL, defaultcc)), defaultcc, 0);
 	sdb_foreach (core->anal->sdb_cc, save_ptr, sdbs);
 	sdb_reset ( core->anal->sdb_cc);
 	const char *anal_arch = r_config_get (core->config, "anal.arch");
@@ -734,7 +574,7 @@
 		bits = 32;
 	}
 
-	char *dbpath = sdb_fmt (-1, "%s/"DBSPATH"/cc-%s-%d.sdb", dir_prefix, anal_arch, bits);
+	char *dbpath = sdb_fmt ("%s/"R2_SDB_FCNSIGN"/cc-%s-%d.sdb", dir_prefix, anal_arch, bits);
 	if (r_file_exists (dbpath)) {
 		sdb_concat_by_path (core->anal->sdb_cc, dbpath);
 	}
@@ -742,7 +582,7 @@
 	RListIter *it;
 	RAnalFunction *fcn;
 	r_list_foreach (core->anal->fcns, it, fcn) {
-		char *ptr = sdb_fmt (-1, "%p", fcn->cc);
+		char *ptr = sdb_fmt ("%p", fcn->cc);
 		const char *cc = sdb_const_get (sdbs[0], ptr, 0);
 		if (cc) {
 			fcn->cc = r_anal_cc_to_constant (core->anal, (char *)cc);
@@ -755,7 +595,6 @@
 	sdb_close (sdbs[0]);
 	sdb_free (sdbs[0]);
 }
-#undef DBSPATH
 
 static int bin_info(RCore *r, int mode) {
 	int i, j, v;
@@ -789,6 +628,11 @@
 				r_config_set (r->config, "bin.lang", info->lang);
 			}
 			r_config_set (r->config, "asm.os", info->os);
+			if (info->rclass && !strcmp (info->rclass, "pe")) {
+				r_config_set (r->config, "anal.cpp.abi", "msvc");
+			} else {
+				r_config_set (r->config, "anal.cpp.abi", "itanium");
+			}
 			r_config_set (r->config, "asm.arch", info->arch);
 			if (info->cpu && *info->cpu) {
 				r_config_set (r->config, "asm.cpu", info->cpu);
@@ -799,7 +643,9 @@
 			r_config_set (r->config, "asm.dwarf",
 				(R_BIN_DBG_STRIPPED & info->dbg_info) ? "false" : "true");
 			v = r_anal_archinfo (r->anal, R_ANAL_ARCHINFO_ALIGN);
-			if (v != -1) r_config_set_i (r->config, "asm.pcalign", v);
+			if (v != -1) {
+				r_config_set_i (r->config, "asm.pcalign", v);
+			}
 		}
 	} else if (IS_MODE_SIMPLE (mode)) {
 		r_cons_printf ("arch %s\n", info->arch);
@@ -849,7 +695,9 @@
 				r_cons_printf ("e asm.cpu=%s\n", info->cpu);
 			}
 			v = r_anal_archinfo (r->anal, R_ANAL_ARCHINFO_ALIGN);
-			if (v != -1) r_cons_printf ("e asm.pcalign=%d\n", v);
+			if (v != -1) {
+				r_cons_printf ("e asm.pcalign=%d\n", v);
+			}
 		}
 	} else {
 		// XXX: if type is 'fs' show something different?
@@ -861,10 +709,13 @@
 		if (info->cpu && *info->cpu) {
 			pair_str ("cpu", info->cpu, mode, false);
 		}
-		pair_int ("binsz", r_bin_get_size (r->bin), mode, false);
+		pair_ut64 ("binsz", r_bin_get_size (r->bin), mode, false);
 		pair_str ("bintype", info->rclass, mode, false);
 		pair_int ("bits", info->bits, mode, false);
 		pair_bool ("canary", info->has_canary, mode, false);
+		if (info->has_retguard != -1) {
+			pair_bool ("retguard", info->has_retguard, mode, false);
+		}
 		pair_str ("class", info->bclass, mode, false);
 		if (info->actual_checksum) {
 			/* computed checksum */
@@ -969,10 +820,17 @@
 				r_cons_newline ();
 			}
 		}
-		if (IS_MODE_JSON (mode)) r_cons_printf ("}");
+		if (IS_MODE_JSON (mode)) {
+			r_cons_printf ("}");
+		}
 	}
 	r_core_anal_type_init (r);
 	r_core_anal_cc_init (r);
+	const char *dir_prefix = r_config_get (r->config, "dir.prefix");
+	char *spath = sdb_fmt ("%s/"R2_SDB_FCNSIGN"/spec.sdb", dir_prefix);
+	if (r_file_exists (spath)) {
+		sdb_concat_by_path (r->anal->sdb_fmts, spath);
+	}
 	return true;
 }
 
@@ -1114,12 +972,11 @@
 	return true;
 }
 
-static int bin_pdb(RCore *core, int mode) {
+R_API int r_core_pdb_info(RCore *core, const char *file, ut64 baddr, int mode) {
 	R_PDB pdb = R_EMPTY;
-	ut64 baddr = r_bin_get_baddr (core->bin);
 
 	pdb.cb_printf = r_cons_printf;
-	if (!init_pdb_parser (&pdb, core->bin->file)) {
+	if (!init_pdb_parser (&pdb, file)) {
 		return false;
 	}
 	if (!pdb.pdb_parse (&pdb)) {
@@ -1128,7 +985,7 @@
 		return false;
 	}
 	if (mode == R_CORE_BIN_JSON) {
-		r_cons_printf("[");
+		r_cons_printf ("[");
 	}
 
 	switch (mode) {
@@ -1161,6 +1018,49 @@
 	return true;
 }
 
+static int bin_pdb(RCore *core, int mode) {
+	ut64 baddr = r_bin_get_baddr (core->bin);
+	return r_core_pdb_info (core, core->bin->file, baddr, mode);
+}
+
+static int srclineCmp(const void *a, const void *b) {
+	const char *fa = a;
+	const char *fb = b;
+	if (fa && fb) {
+		return !strcmp (fa, fb);
+	}
+	return (fa && fb && !strcmp (fa, fb));
+}
+
+static int bin_source(RCore *r, int mode) {
+	RList *final_list = r_list_new ();
+	RBinFile * binfile = r->bin->cur;
+	SdbListIter *iter;
+	RListIter *iter2;
+	char* srcline;
+	SdbKv *kv;
+	SdbList *ls = sdb_foreach_list (binfile->sdb_addrinfo, false);
+	ls_foreach (ls, iter, kv) {
+		char *v = kv->value;
+		RList *list = r_str_split_list (v, "|");
+		srcline = r_list_get_bottom (list);
+		if (srcline) {
+			if (!strstr (srcline, "0x")){
+				r_list_append (final_list, srcline);
+			}
+		}
+		r_list_free (list);
+	}
+	r_cons_printf ("[Source file]\n");
+	RList *uniqlist = r_list_uniq (final_list, srclineCmp);
+	r_list_foreach (uniqlist, iter2, srcline) {
+		r_cons_printf ("%s\n", srcline);
+	}
+	r_list_free (uniqlist);
+	r_list_free (final_list);
+	return true;
+}
+
 static int bin_main(RCore *r, int mode, int va) {
 	RBinAddr *binmain = r_bin_get_sym (r->bin, R_BIN_SYM_MAIN);
 	ut64 addr;
@@ -1188,10 +1088,22 @@
 	return true;
 }
 
+static inline bool is_initfini(RBinAddr *entry) {
+	switch (entry->type) {
+	case R_BIN_ENTRY_TYPE_INIT:
+	case R_BIN_ENTRY_TYPE_FINI:
+	case R_BIN_ENTRY_TYPE_PREINIT:
+		return true;
+	default:
+		return false;
+	}
+}
+
 static int bin_entry(RCore *r, int mode, ut64 laddr, int va, bool inifin) {
 	char str[R_FLAG_NAME_SIZE];
 	RList *entries = r_bin_get_entries (r->bin);
 	RListIter *iter;
+	RListIter *last_processed = NULL;
 	RBinAddr *entry = NULL;
 	int i = 0;
 	ut64 baddr = r_bin_get_baddr (r->bin);
@@ -1207,10 +1119,15 @@
 			r_cons_printf ("[Entrypoints]\n");
 		}
 	}
+	if (r_list_length (entries) > 1024) {
+		eprintf ("Too many entrypoints (%d)\n", r_list_length (entries));
+		return false;
+	}
 
 	r_list_foreach (entries, iter, entry) {
 		ut64 paddr = entry->paddr;
-		ut64 haddr = UT64_MAX;
+		ut64 hpaddr = UT64_MAX;
+		ut64 hvaddr = UT64_MAX;
 		if (mode != R_CORE_BIN_SET) {
 			if (inifin) {
 				if (entry->type == R_BIN_ENTRY_TYPE_PROGRAM) {
@@ -1222,8 +1139,17 @@
 				}
 			}
 		}
-		if (entry->haddr) {
-			haddr = entry->haddr;
+		if (is_initfini (entry) && r->io->va && entry->paddr == entry->vaddr) {
+			RIOMap *map = r_io_map_get (r->io, entry->vaddr);
+			if (map) {
+				paddr = entry->vaddr - map->itv.addr + map->delta;
+			}
+		}
+		if (entry->hpaddr) {
+			hpaddr = entry->hpaddr;
+		}
+		if (entry->hvaddr) {
+			hvaddr = entry->hvaddr;
 		}
 		ut64 at = rva (r->bin, paddr, entry->vaddr, va);
 		const char *type = r_bin_entry_type_string (entry->type);
@@ -1236,31 +1162,44 @@
 				snprintf (str, R_FLAG_NAME_SIZE, "entry%i.init", i);
 			} else if (entry->type == R_BIN_ENTRY_TYPE_FINI) {
 				snprintf (str, R_FLAG_NAME_SIZE, "entry%i.fini", i);
+			} else if (entry->type == R_BIN_ENTRY_TYPE_PREINIT) {
+				snprintf (str, R_FLAG_NAME_SIZE, "entry%i.preinit", i);
 			} else {
 				snprintf (str, R_FLAG_NAME_SIZE, "entry%i", i);
 			}
 			r_flag_set (r->flags, str, at, 1);
+			if (is_initfini (entry) && hpaddr != UT64_MAX && hvaddr != UT64_MAX) {
+				ut64 elem_addr = rva (r->bin, hpaddr, hvaddr, va);
+				r_meta_add (r->anal, R_META_TYPE_DATA, elem_addr,
+				            elem_addr + entry->bits / 8, NULL);
+			}
 		} else if (IS_MODE_SIMPLE (mode)) {
 			r_cons_printf ("0x%08"PFMT64x"\n", at);
 		} else if (IS_MODE_JSON (mode)) {
-			r_cons_printf ("%s{\"vaddr\":%" PFMT64d ","
-				"\"paddr\":%" PFMT64d ","
-				"\"baddr\":%" PFMT64d ","
-				"\"laddr\":%" PFMT64d ","
-				"\"haddr\":%" PFMT64d ","
+			r_cons_printf ("%s{\"vaddr\":%" PFMT64u ","
+				"\"paddr\":%" PFMT64u ","
+				"\"baddr\":%" PFMT64u ","
+				"\"laddr\":%" PFMT64u ",",
+				last_processed ? "," : "", at, paddr, baddr, laddr);
+			if (is_initfini (entry) && hvaddr != UT64_MAX) {
+				r_cons_printf ("\"hvaddr\":%" PFMT64u ",", hvaddr);
+			}
+			r_cons_printf ("\"hpaddr\":%" PFMT64u ","
 				"\"type\":\"%s\"}",
-				iter->p ? "," : "", at, paddr, baddr, laddr, haddr, type);
+				hpaddr, type);
 		} else if (IS_MODE_RAD (mode)) {
 			char *name = NULL;
 			if (entry->type == R_BIN_ENTRY_TYPE_INIT) {
 				name = r_str_newf ("entry%i.init", i);
 			} else if (entry->type == R_BIN_ENTRY_TYPE_FINI) {
 				name = r_str_newf ("entry%i.fini", i);
+			} else if (entry->type == R_BIN_ENTRY_TYPE_PREINIT) {
+				name = r_str_newf ("entry%i.preinit", i);
 			} else {
 				name = r_str_newf ("entry%i", i);
 			}
 			r_cons_printf ("f %s 1 @ 0x%08"PFMT64x"\n", name, at);
-			r_cons_printf ("f %s_haddr 1 @ 0x%08"PFMT64x"\n", name, haddr);
+			r_cons_printf ("f %s_hpaddr 1 @ 0x%08"PFMT64x"\n", name, hpaddr);
 			r_cons_printf ("s %s\n", name);
 			free (name);
 		} else {
@@ -1270,19 +1209,18 @@
 				" baddr=0x%08"PFMT64x
 				" laddr=0x%08"PFMT64x,
 				at, paddr, baddr, laddr);
-			if (haddr == UT64_MAX) {
-				r_cons_printf (
-					" haddr=%"PFMT64d
-					" type=%s\n",
-					haddr, type);
-			} else {
-				r_cons_printf (
-					" haddr=0x%08"PFMT64x
-					" type=%s\n",
-					haddr, type);
+			if (is_initfini (entry) && hvaddr != UT64_MAX) {
+				r_cons_printf (" hvaddr=0x%08"PFMT64x, hvaddr);
+			}
+			if (hpaddr == UT64_MAX) {
+				r_cons_printf (" hpaddr=%"PFMT64d, hpaddr);
+			} else {
+				r_cons_printf (" hpaddr=0x%08"PFMT64x, hpaddr);
 			}
+			r_cons_printf (" type=%s\n", type);
 		}
 		i++;
+		last_processed = iter;
 	}
 	if (IS_MODE_SET (mode)) {
 		if (entry) {
@@ -1324,28 +1262,28 @@
 
 static char *resolveModuleOrdinal(Sdb *sdb, const char *module, int ordinal) {
 	Sdb *db = sdb;
-	char *foo = sdb_get (db, sdb_fmt (0, "%d", ordinal), 0);
+	char *foo = sdb_get (db, sdb_fmt ("%d", ordinal), 0);
 	return (foo && *foo) ? foo : NULL;
 }
 
 static char *get_reloc_name(RBinReloc *reloc, ut64 addr) {
 	char *reloc_name = NULL;
 	if (reloc->import && reloc->import->name) {
-		reloc_name = sdb_fmt (-1, "reloc.%s_%d", reloc->import->name,
+		reloc_name = sdb_fmt ("reloc.%s_%d", reloc->import->name,
 				      (int)(addr & 0xff));
 		if (!reloc_name) {
 			return NULL;
 		}
 		r_str_replace_char (reloc_name, '$', '_');
 	} else if (reloc->symbol && reloc->symbol->name) {
-		reloc_name = sdb_fmt (-1, "reloc.%s_%d", reloc->symbol->name, (int)(addr & 0xff));
+		reloc_name = sdb_fmt ("reloc.%s_%d", reloc->symbol->name, (int)(addr & 0xff));
 		if (!reloc_name) {
 			return NULL;
 		}
 		r_str_replace_char (reloc_name, '$', '_');
 	} else if (reloc->is_ifunc) {
 		// addend is the function pointer for the resolving ifunc
-		reloc_name = sdb_fmt (-1, "reloc.ifunc_%"PFMT64x, reloc->addend);
+		reloc_name = sdb_fmt ("reloc.ifunc_%"PFMT64x, reloc->addend);
 	} else {
 		// TODO(eddyb) implement constant relocs.
 	}
@@ -1381,29 +1319,16 @@
 					free (*sdb_module);
 					*sdb_module = strdup (module);
 					/* always lowercase */
-					filename = sdb_fmt (1, "%s.sdb", module);
+					filename = sdb_fmt ("%s.sdb", module);
 					r_str_case (filename, false);
 					if (r_file_exists (filename)) {
 						*db = sdb_new (NULL, filename, 0);
 					} else {
-					// XXX. we have dir.prefix, windows shouldnt work different
-						filename = sdb_fmt (1, "%s/share/radare2/" R2_VERSION"/format/dll/%s.sdb", r_config_get (r->config, "dir.prefix"), module);
+						const char *dirPrefix = r_sys_prefix (NULL);
+						filename = sdb_fmt (R_JOIN_4_PATHS ("%s", R2_SDB_FORMAT, "dll", "%s.sdb"),
+							dirPrefix, module);
 						if (r_file_exists (filename)) {
 							*db = sdb_new (NULL, filename, 0);
-#if __WINDOWS__
-						} else {
-							char invoke_dir[MAX_PATH];
-							if (r_sys_get_src_dir_w32 (invoke_dir)) {
-								filename = sdb_fmt (1, "%s/share/radare2/"R2_VERSION "/format/dll/%s.sdb", invoke_dir, module);
-							} else {
-								filename = sdb_fmt (1, "share/radare2/"R2_VERSION"/format/dll/%s.sdb", module);
-							}
-#else
-							filename = sdb_fmt (1, "%s/share/radare2/" R2_VERSION"/format/dll/%s.sdb", r_config_get (r->config, "dir.prefix"), module);
-							if (r_file_exists (filename)) {
-								*db = sdb_new (NULL, filename, 0);
-							}
-#endif
 						}
 					}
 				}
@@ -1428,9 +1353,9 @@
 		}
 		reloc_name = reloc->import->name;
 		if (r->bin->prefix) {
-			snprintf (str, R_FLAG_NAME_SIZE, "%s.reloc.%s_%d", r->bin->prefix, reloc_name, (int)(addr&0xff));
+			snprintf (str, R_FLAG_NAME_SIZE, "%s.reloc.%s", r->bin->prefix, reloc_name);
 		} else {
-			snprintf (str, R_FLAG_NAME_SIZE, "reloc.%s_%d", reloc_name, (int)(addr&0xff));
+			snprintf (str, R_FLAG_NAME_SIZE, "reloc.%s", reloc_name);
 		}
 		if (bin_demangle) {
 			demname = r_bin_demangle (r->bin->cur, lang, str, addr);
@@ -1440,9 +1365,9 @@
 		if (demname) {
 			char *realname;
 			if (r->bin->prefix) {
-				realname = sdb_fmt (0, "%s.reloc.%s", r->bin->prefix, demname);
+				realname = sdb_fmt ("%s.reloc.%s", r->bin->prefix, demname);
 			} else {
-				realname = sdb_fmt (0, "reloc.%s", demname);
+				realname = sdb_fmt ("reloc.%s", demname);
 			}
 			r_flag_item_set_realname (fi, realname);
 		}
@@ -1452,6 +1377,52 @@
 	}
 }
 
+/* Define new data at relocation address if it's not in an executable section */
+static void add_metadata(RCore *r, RBinReloc *reloc, ut64 addr, int mode) {
+	RBinFile * binfile = r->bin->cur;
+	RBinObject *binobj = binfile ? binfile->o: NULL;
+	RBinInfo *info = binobj ? binobj->info: NULL;
+	RIOSection *section;
+	int cdsz;
+
+	cdsz = info? (info->bits == 64? 8: info->bits == 32? 4: info->bits == 16 ? 4: 0): 0;
+	if (cdsz == 0) {
+		return;
+	}
+
+	section = r_io_section_vget (r->io, addr);
+	if (!section || section->flags & R_IO_EXEC) {
+		return;
+	}
+
+	if (IS_MODE_SET(mode)) {
+		r_meta_add (r->anal, R_META_TYPE_DATA, reloc->vaddr, reloc->vaddr + cdsz, NULL);
+	} else if (IS_MODE_RAD (mode)) {
+		r_cons_printf ("f Cd %d @ 0x%08" PFMT64x "\n", cdsz, addr);
+	}
+}
+
+static bool is_section_symbol(RBinSymbol *s) {
+	/* workaround for some bin plugs (e.g. ELF) */
+	if (!s || *s->name) {
+		return false;
+	}
+	return (s->type && !strcmp (s->type, R_BIN_TYPE_SECTION_STR));
+}
+
+static bool is_section_reloc(RBinReloc *r) {
+	return is_section_symbol (r->symbol);
+}
+
+static bool is_file_symbol(RBinSymbol *s) {
+	/* workaround for some bin plugs (e.g. ELF) */
+	return (s && s->type && !strcmp (s->type, R_BIN_TYPE_FILE_STR));
+}
+
+static bool is_file_reloc(RBinReloc *r) {
+	return is_file_symbol (r->symbol);
+}
+
 static int bin_relocs(RCore *r, int mode, int va) {
 	bool bin_demangle = r_config_get_i (r->config, "bin.demangle");
 	RList *relocs;
@@ -1477,17 +1448,16 @@
 	} else if (IS_MODE_SET (mode)) {
 		r_flag_space_set (r->flags, "relocs");
 	}
-	RBinFile * binfile = r->bin->cur;
-	RBinObject *binobj = binfile ? binfile->o: NULL;
-	RBinInfo *info = binobj ? binobj->info: NULL;
-	int cdsz = info? (info->bits == 64? 8: info->bits == 32? 4: info->bits == 16 ? 4: 0): 0;
 	r_list_foreach (relocs, iter, reloc) {
 		ut64 addr = rva (r->bin, reloc->paddr, reloc->vaddr, va);
-		if (IS_MODE_SET (mode)) {
+		if (IS_MODE_SET (mode) && (is_section_reloc (reloc) || is_file_reloc (reloc))) {
+			/*
+			 * Skip section reloc because they will have their own flag.
+			 * Skip also file reloc because not useful for now.
+			 */
+		} else if (IS_MODE_SET (mode)) {
 			set_bin_relocs (r, reloc, addr, &db, &sdb_module);
-			if (cdsz) {
-				r_meta_add (r->anal, R_META_TYPE_DATA, reloc->vaddr, reloc->vaddr + cdsz, NULL);
-			}
+			add_metadata (r, reloc, addr, mode);
 		} else if (IS_MODE_SIMPLE (mode)) {
 			r_cons_printf ("0x%08"PFMT64x"  %s\n", addr, reloc->import ? reloc->import->name : "");
 		} else if (IS_MODE_RAD (mode)) {
@@ -1505,9 +1475,7 @@
 				r_cons_printf ("f %s%s%s @ 0x%08"PFMT64x"\n",
 					r->bin->prefix ? r->bin->prefix : "reloc.",
 					r->bin->prefix ? "." : "", name, addr);
-				if (cdsz) {
-					r_cons_printf ("f Cd %d @ 0x%08"PFMT64x"\n", cdsz, addr);
-				}
+				add_metadata (r, reloc, addr, mode);
 				free (name);
 			}
 		} else if (IS_MODE_JSON (mode)) {
@@ -1602,20 +1570,20 @@
 	if (mydb) {
 		if (name) {
 			res = (RBinSymbol*)(void*)(size_t)
-				sdb_num_get (mydb, sdb_fmt (0, "%x", sdb_hash (name)), NULL);
+				sdb_num_get (mydb, sdb_fmt ("%x", sdb_hash (name)), NULL);
 		} else {
 			res = (RBinSymbol*)(void*)(size_t)
-				sdb_num_get (mydb, sdb_fmt (0, "0x"PFMT64x, addr), NULL);
+				sdb_num_get (mydb, sdb_fmt ("0x"PFMT64x, addr), NULL);
 		}
 	} else {
 		mydb = sdb_new0 ();
 		r_list_foreach (symbols, iter, symbol) {
 			/* ${name}=${ptrToSymbol} */
-			if (!sdb_num_add (mydb, sdb_fmt (0, "%x", sdb_hash (symbol->name)), (ut64)(size_t)symbol, 0)) {
+			if (!sdb_num_add (mydb, sdb_fmt ("%x", sdb_hash (symbol->name)), (ut64)(size_t)symbol, 0)) {
 			//	eprintf ("DUP (%s)\n", symbol->name);
 			}
 			/* 0x${vaddr}=${ptrToSymbol} */
-			if (!sdb_num_add (mydb, sdb_fmt (0, "0x"PFMT64x, symbol->vaddr), (ut64)(size_t)symbol, 0)) {
+			if (!sdb_num_add (mydb, sdb_fmt ("0x"PFMT64x, symbol->vaddr), (ut64)(size_t)symbol, 0)) {
 			//	eprintf ("DUP (%s)\n", symbol->name);
 			}
 			if (name) {
@@ -1637,6 +1605,7 @@
 static RBinSymbol *get_symbol(RBin *bin, RList *symbols, const char *name, ut64 addr) {
 	RBinSymbol *symbol;
 	RListIter *iter;
+	// XXX this is slow, we should use a hashtable here
 	r_list_foreach (symbols, iter, symbol) {
 		if (name) {
 			if (!strcmp (symbol->name, name))
@@ -1653,7 +1622,7 @@
 
 /* XXX: This is a hack to get PLT references in rabin2 -i */
 /* imp. is a prefix that can be rewritten by the symbol table */
-static ut64 impaddr(RBin *bin, int va, const char *name) {
+R_API ut64 r_core_bin_impaddr(RBin *bin, int va, const char *name) {
 	RList *symbols;
 
 	if (!name || !*name) {
@@ -1662,15 +1631,12 @@
 	if (!(symbols = r_bin_get_symbols (bin))) {
 		return false;
 	}
-	char *impname = sdb_fmt (2, "imp.%s", name);
+	char *impname = r_str_newf ("imp.%s", name);
 	RBinSymbol *s = get_symbol (bin, symbols, impname, 0LL);
-	if (s) {
-		if (va) {
-			return r_bin_get_vaddr (bin, s->paddr, s->vaddr);
-		}
-		return s->paddr;
-	}
-	return 0LL;
+	// maybe ut64_MAX to indicate import not found?
+	ut64 addr = s? (va? r_bin_get_vaddr (bin, s->paddr, s->vaddr): s->paddr): 0LL;
+	free (impname);
+	return addr;
 }
 
 static int bin_imports(RCore *r, int mode, int va, const char *name) {
@@ -1683,6 +1649,7 @@
 	int i = 0;
 
 	RList *imports = r_bin_get_imports (r->bin);
+	int cdsz = info? (info->bits == 64? 8: info->bits == 32? 4: info->bits == 16 ? 4: 0): 0;
 	if (IS_MODE_JSON (mode)) {
 		r_cons_print ("[");
 	} else if (IS_MODE_RAD (mode)) {
@@ -1695,7 +1662,7 @@
 			continue;
 		}
 		char *symname = strdup (import->name);
-		ut64 addr = lit ? impaddr (r->bin, va, symname): 0;
+		ut64 addr = lit ? r_core_bin_impaddr (r->bin, va, symname): 0;
 		if (bin_demangle) {
 			char *dname = r_bin_demangle (r->bin->cur, NULL, symname, addr);
 			if (dname) {
@@ -1711,6 +1678,10 @@
 		}
 		if (IS_MODE_SET (mode)) {
 			// TODO(eddyb) symbols that are imports.
+			// Add a dword/qword for PE imports
+			if (strstr (symname, ".dll_") && cdsz) {
+				r_meta_add (r->anal, R_META_TYPE_DATA, addr, addr + cdsz, NULL);
+			}
 		} else if (IS_MODE_SIMPLE (mode)) {
 			r_cons_println (symname);
 		} else if (IS_MODE_JSON (mode)) {
@@ -1782,10 +1753,11 @@
 
 static const char *getPrefixFor(const char *s) {
 	if (s) {
-		if (!strcmp (s, "NOTYPE")) {
+		// workaround for ELF
+		if (!strcmp (s, R_BIN_TYPE_NOTYPE_STR)) {
 			return "loc";
 		}
-		if (!strcmp (s, "OBJECT")) {
+		if (!strcmp (s, R_BIN_TYPE_OBJECT_STR)) {
 			return "obj";
 		}
 	}
@@ -1808,7 +1780,9 @@
 #define MAXFLAG_LEN 128
 	int bin_demangle = lang != NULL;
 	const char *pfx;
-	if (!r || !sym || !sym->name) return;
+	if (!r || !sym || !sym->name) {
+		return;
+	}
 	pfx = getPrefixFor (sym->type);
 	sn->name = strdup (sym->name);
 	if (sym->dup_count) {
@@ -1859,7 +1833,7 @@
 	if (!strncmp (s->name, "imp.", 4)) {
 		return false;
 	}
-	return (s->bind && !strcmp (s->bind, "GLOBAL"));
+	return (s->bind && !strcmp (s->bind, R_BIN_BIND_GLOBAL_STR));
 }
 
 static int bin_symbols_internal(RCore *r, int mode, ut64 laddr, int va, ut64 at, const char *name, bool exponly, const char *args) {
@@ -1926,7 +1900,12 @@
 		}
 		snInit (r, &sn, symbol, lang);
 
-		if (IS_MODE_SET (mode)) {
+		if (IS_MODE_SET (mode) && (is_section_symbol (symbol) || is_file_symbol (symbol))) {
+			/*
+			 * Skip section symbols because they will have their own flag.
+			 * Skip also file symbols because not useful for now.
+			 */
+		} else if (IS_MODE_SET (mode)) {
 			if (is_arm && info->bits < 33) { // 16 or 32
 				int force_bits = 0;
 				if (symbol->paddr & 1 || symbol->bits == 16) {
@@ -2001,7 +1980,7 @@
 			}
 		} else if (IS_MODE_JSON (mode)) {
 			char *str = r_str_utf16_encode (symbol->name, -1);
-			str = r_str_replace (str, "\"", "\\\"", 1);
+			// str = r_str_replace (str, "\"", "\\\"", 1);
 			r_cons_printf ("%s{\"name\":\"%s\","
 				"\"demname\":\"%s\","
 				"\"flagname\":\"%s\","
@@ -2011,7 +1990,8 @@
 				"\"type\":\"%s\","
 				"\"vaddr\":%"PFMT64d","
 				"\"paddr\":%"PFMT64d"}",
-				((exponly && firstexp) || printHere) ? "" : (iter->p ? "," : ""), str,
+				((exponly && firstexp) || printHere) ? "" : (iter->p ? "," : ""),
+				str,
 				sn.demname? sn.demname: "",
 				sn.nameflag,
 				symbol->ordinal,
@@ -2052,12 +2032,16 @@
 						r->bin->prefix, name, symbol->size, addr);
 				}
 			} else {
-				if (symbol->dup_count) {
-					r_cons_printf ("f sym.%s_%d %u 0x%08"PFMT64x"\n",
-						name, symbol->dup_count, symbol->size, addr);
+				if (*name) {
+					if (symbol->dup_count) {
+						r_cons_printf ("f sym.%s_%d %u 0x%08"PFMT64x"\n",
+								name, symbol->dup_count, symbol->size, addr);
+					} else {
+						r_cons_printf ("f sym.%s %u 0x%08"PFMT64x"\n",
+								name, symbol->size, addr);
+					}
 				} else {
-					r_cons_printf ("f sym.%s %u 0x%08"PFMT64x"\n",
-						name, symbol->size, addr);
+					// we dont want unnamed symbol flags
 				}
 			}
 			binfile = r_core_bin_cur (r);
@@ -2081,19 +2065,15 @@
 				}
 			}
 		} else {
-			const char *bind = r_str_get (symbol->bind);
-			const char *type = r_str_get (symbol->type);
+			const char *bind = symbol->bind? symbol->bind: "NONE";
+			const char *type = symbol->type? symbol->type: "NONE";
 			const char *name = r_str_get (sn.demname? sn.demname: symbol->name);
 			// const char *fwd = r_str_get (symbol->forwarder);
 			r_cons_printf ("%03u 0x%08"PFMT64x" 0x%08"PFMT64x" "
-				"%6s %6s %4d %s\n",
+				"%6s %6s %4d%s%s\n",
 				symbol->ordinal,
 				symbol->paddr, addr, bind, type,
-				symbol->size, name);
-			// r_cons_printf ("vaddr=0x%08"PFMT64x" paddr=0x%08"PFMT64x" ord=%03u "
-			//	"fwd=%s sz=%u bind=%s type=%s name=%s\n",
-			//	addr, symbol->paddr, symbol->ordinal, fwd,
-			//	symbol->size, bind, type, name);
+				symbol->size, *name? " ": "", name);
 		}
 		snFini (&sn);
 		i++;
@@ -2126,12 +2106,9 @@
 			}
 		}
 	}
-	if (IS_MODE_JSON (mode) && !printHere) r_cons_printf ("]");
-#if 0
-	if (IS_MODE_NORMAL (mode) && !at) {
-		r_cons_printf ("\n%i %s\n", i, exponly ? "exports" : "symbols");
+	if (IS_MODE_JSON (mode) && !printHere) {
+		r_cons_printf ("]");
 	}
-#endif
 
 	r_space_set (&r->anal->meta_spaces, NULL);
 	return true;
@@ -2179,12 +2156,13 @@
 	return ret;
 }
 
-static int bin_sections(RCore *r, int mode, ut64 laddr, int va, ut64 at, const char *name, const char *chksum) {
+static int bin_sections(RCore *r, int mode, ut64 laddr, int va, ut64 at, const char *name, const char *chksum, bool print_segments) {
 	char *str = NULL;
 	RBinSection *section;
 	RBinInfo *info = NULL;
 	RList *sections;
 	RListIter *iter;
+	RListIter *last_processed = NULL;
 	int i = 0;
 	int fd = -1;
 	bool printHere = false;
@@ -2192,6 +2170,7 @@
 	bool inDebugger = r_config_get_i (r->config, "cfg.debug");
 	SdbHash *dup_chk_ht = ht_new (NULL, NULL, NULL);
 	bool ret = false;
+	const char *type = print_segments ? "segment" : "section";
 
 	if (!dup_chk_ht) {
 		return false;
@@ -2200,16 +2179,20 @@
 	if (chksum && *chksum == '.') {
 		printHere = true;
 	}
-	if (IS_MODE_JSON (mode) && !printHere) r_cons_printf ("[");
-	else if (IS_MODE_RAD (mode) && !at) r_cons_printf ("fs sections\n");
-	else if (IS_MODE_NORMAL (mode) && !at && !printHere) r_cons_printf ("[Sections]\n");
-	else if (IS_MODE_NORMAL (mode) && printHere) r_cons_printf("Current section\n");
-	else if (IS_MODE_SET (mode)) {
+	if (IS_MODE_JSON (mode) && !printHere) {
+		r_cons_printf ("[");
+	} else if (IS_MODE_RAD (mode) && !at) {
+		r_cons_printf ("fs %ss\n", type);
+	} else if (IS_MODE_NORMAL (mode) && !at && !printHere) {
+		r_cons_printf ("[%s]\n", print_segments ? "Segments" : "Sections");
+	} else if (IS_MODE_NORMAL (mode) && printHere) {
+		r_cons_printf ("Current section\n");
+	} else if (IS_MODE_SET (mode)) {
 		fd = r_core_file_cur_fd (r);
-		r_flag_space_set (r->flags, "sections");
+		r_flag_space_set (r->flags, print_segments ? "segments" : "sections");
 	}
 	r_list_foreach (sections, iter, section) {
-		char perms[] = "-----";
+		char perms[] = "----";
 		int va_sect = va;
 		ut64 addr;
 
@@ -2232,11 +2215,14 @@
 			continue;
 		}
 
-		if (section->srwx & R_BIN_SCN_MAP) perms[0] = 'm';
-		if (section->srwx & R_BIN_SCN_SHAREABLE) perms[1] = 's';
-		if (section->srwx & R_BIN_SCN_READABLE) perms[2] = 'r';
-		if (section->srwx & R_BIN_SCN_WRITABLE) perms[3] = 'w';
-		if (section->srwx & R_BIN_SCN_EXECUTABLE) perms[4] = 'x';
+		if (section->is_segment != print_segments) {
+			continue;
+		}
+
+		if (section->srwx & R_BIN_SCN_SHAREABLE) perms[0] = 's';
+		if (section->srwx & R_BIN_SCN_READABLE) perms[1] = 'r';
+		if (section->srwx & R_BIN_SCN_WRITABLE) perms[2] = 'w';
+		if (section->srwx & R_BIN_SCN_EXECUTABLE) perms[3] = 'x';
 
 		if (IS_MODE_SET (mode)) {
 #if LOAD_BSS_MALLOC
@@ -2264,18 +2250,18 @@
 				}
 			}
 			if (r->bin->prefix) {
-				str = r_str_newf ("%s.section.%s", r->bin->prefix, section->name);
+				str = r_str_newf ("%s.%s.%s", r->bin->prefix, type, section->name);
 			} else {
-				str = r_str_newf ("section.%s", section->name);
+				str = r_str_newf ("%s.%s", type, section->name);
 
 			}
 			r_flag_set (r->flags, str, addr, section->size);
 			R_FREE (str);
 
 			if (r->bin->prefix) {
-				str = r_str_newf ("%s.section_end.%s", r->bin->prefix, section->name);
+				str = r_str_newf ("%s.%s_end.%s", r->bin->prefix, type, section->name);
 			} else {
-				str = r_str_newf ("section_end.%s", section->name);
+				str = r_str_newf ("%s_end.%s", type, section->name);
 			}
 			r_flag_set (r->flags, str, addr + section->vsize, 0);
 			R_FREE (str);
@@ -2293,12 +2279,14 @@
 				}
 				//r_io_section_set_archbits (r->io, addr, arch, bits);
 			}
-			char *pfx = r->bin->prefix;
-			str = r_str_newf ("[%02d] %s section size %" PFMT64d" named %s%s%s",
-				i, perms, section->size,
-				pfx? pfx: "", pfx? ".": "", section->name);
-			r_meta_add (r->anal, R_META_TYPE_COMMENT, addr, addr, str);
-			R_FREE (str);
+			if (!section->is_segment) {
+				char *pfx = r->bin->prefix;
+				str = r_str_newf ("[%02d] %s %s size %" PFMT64d" named %s%s%s",
+				                  i, perms, type, section->size,
+				                  pfx? pfx: "", pfx? ".": "", section->name);
+				r_meta_add (r->anal, R_META_TYPE_COMMENT, addr, addr, str);
+				R_FREE (str);
+			}
 			if (section->add) {
 				str = r_str_newf ("%"PFMT64x".%"PFMT64x".%"PFMT64x".%"PFMT64x".%"PFMT32u".%s.%"PFMT32u".%d",
 					section->paddr, addr, section->size, section->vsize, section->srwx, section->name, r->bin->cur->id, fd);
@@ -2351,7 +2339,7 @@
 				"%s"
 				"\"paddr\":%"PFMT64d","
 				"\"vaddr\":%"PFMT64d"}",
-				(iter->p && !printHere)?",":"",
+				(last_processed && !printHere) ? "," : "",
 				section->name,
 				section->size,
 				section->vsize,
@@ -2391,23 +2379,23 @@
 					PFMT64x"\n", arch, bits, addr);
 			}
 			if (r->bin->prefix) {
-				r_cons_printf ("f %s.section.%s %"PFMT64d" 0x%08"PFMT64x"\n",
-						r->bin->prefix, section->name, section->size, addr);
-				r_cons_printf ("f %s.section_end.%s 1 0x%08"PFMT64x"\n",
-						r->bin->prefix, section->name, addr + section->vsize);
-				r_cons_printf ("CC section %i va=0x%08"PFMT64x" pa=0x%08"PFMT64x" sz=%"PFMT64d" vsz=%"PFMT64d" "
+				r_cons_printf ("f %s.%s.%s %"PFMT64d" 0x%08"PFMT64x"\n",
+						r->bin->prefix, type, section->name, section->size, addr);
+				r_cons_printf ("f %s.%s_end.%s 1 0x%08"PFMT64x"\n",
+						r->bin->prefix, type, section->name, addr + section->vsize);
+				r_cons_printf ("CC %s %i va=0x%08"PFMT64x" pa=0x%08"PFMT64x" sz=%"PFMT64d" vsz=%"PFMT64d" "
 						"rwx=%s %s.%s @ 0x%08"PFMT64x"\n",
-						i, addr, section->paddr, section->size, section->vsize,
+						type, i, addr, section->paddr, section->size, section->vsize,
 						perms, r->bin->prefix, section->name, addr);
 
 			} else {
-				r_cons_printf ("f section.%s %"PFMT64d" 0x%08"PFMT64x"\n",
-						section->name, section->size, addr);
-				r_cons_printf ("f section_end.%s 1 0x%08"PFMT64x"\n",
-						section->name, addr + section->vsize);
-				r_cons_printf ("CC section %i va=0x%08"PFMT64x" pa=0x%08"PFMT64x" sz=%"PFMT64d" vsz=%"PFMT64d" "
+				r_cons_printf ("f %s.%s %"PFMT64d" 0x%08"PFMT64x"\n",
+						type, section->name, section->size, addr);
+				r_cons_printf ("f %s_end.%s 1 0x%08"PFMT64x"\n",
+						type, section->name, addr + section->vsize);
+				r_cons_printf ("CC %s %i va=0x%08"PFMT64x" pa=0x%08"PFMT64x" sz=%"PFMT64d" vsz=%"PFMT64d" "
 						"rwx=%s %s @ 0x%08"PFMT64x"\n",
-						i, addr, section->paddr, section->size, section->vsize,
+						type, i, addr, section->paddr, section->size, section->vsize,
 						perms, section->name, addr);
 			}
 		} else {
@@ -2448,8 +2436,9 @@
 					i, addr, section->paddr, section->size, section->vsize,
 					perms, str, hashstr ?hashstr : "", r->bin->prefix, section->name);
 #endif
+				// r_cons_printf ("%02i 0x%08"PFMT64x" %10"PFMT64d" 0x%08"PFMT64x" %10"PFMT64d" "
 				r_cons_printf ("%02i 0x%08"PFMT64x" %5"PFMT64d" 0x%08"PFMT64x" %5"PFMT64d" "
-					"%s %s% %s.%s\n",
+					"%s %s%s%s.%s\n",
 					i, section->paddr, section->size, addr, section->vsize,
 					perms, str, hashstr ?hashstr : "", r->bin->prefix, section->name);
 			} else {
@@ -2459,6 +2448,7 @@
 					i, addr, section->paddr, section->size, section->vsize,
 					perms, str, hashstr ?hashstr : "", section->name);
 #endif
+				// r_cons_printf ("%02i 0x%08"PFMT64x" %10"PFMT64d" 0x%08"PFMT64x" %10"PFMT64d" "
 				r_cons_printf ("%02i 0x%08"PFMT64x" %5"PFMT64d" 0x%08"PFMT64x" %5"PFMT64d" "
 					"%s %s%s%s\n",
 					i, section->paddr, (ut64)section->size, addr, (ut64)section->vsize,
@@ -2467,6 +2457,7 @@
 			free (hashstr);
 		}
 		i++;
+		last_processed = iter;
 		if (printHere) {
 			break;
 		}
@@ -2676,11 +2667,11 @@
 		}
 
 		if (IS_MODE_SET (mode)) {
-			const char *classname = sdb_fmt (0, "class.%s", name);
+			const char *classname = sdb_fmt ("class.%s", name);
 			r_flag_set (r->flags, classname, c->addr, 1);
 			r_list_foreach (c->methods, iter2, sym) {
 				char *mflags = r_core_bin_method_flags_str (sym->method_flags, mode);
-				char *method = sdb_fmt (1, "method%s.%s.%s",
+				char *method = sdb_fmt ("method%s.%s.%s",
 					mflags, c->name, sym->name);
 				R_FREE (mflags);
 				r_name_filter (method, -1);
@@ -2862,7 +2853,7 @@
 			}
 			bin_mem_print (mem->mirrors, mem->perms & perms, depth + 1, mode);
 		}
-		if (IS_MODE_JSON(mode)) {
+		if (IS_MODE_JSON (mode)) {
 			if (iter->n) {
 				r_cons_printf (",");
 			}
@@ -2873,7 +2864,7 @@
 static int bin_mem(RCore *r, int mode) {
 	RList *mem = NULL;
 	if (!r)	return false;
-	if (!IS_MODE_JSON(mode)) {
+	if (!IS_MODE_JSON (mode)) {
 		if (!(IS_MODE_RAD (mode) || IS_MODE_SET (mode))) {
 			r_cons_println ("[Memory]\n");
 		}
@@ -2895,7 +2886,7 @@
 	return true;
 }
 
-static void bin_pe_versioninfo(RCore *r) {
+static void bin_pe_versioninfo(RCore *r, int mode) {
 	Sdb *sdb = NULL;
 	int num_version = 0;
 	int num_stringtable = 0;
@@ -2903,36 +2894,67 @@
 	const char *format_version = "bin/cur/info/vs_version_info/VS_VERSIONINFO%d";
 	const char *format_stringtable = "%s/string_file_info/stringtable%d";
 	const char *format_string = "%s/string%d";
-	r_cons_printf ("=== VS_VERSIONINFO ===\n\n");
+	if (!IS_MODE_JSON (mode)) {
+		r_cons_printf ("=== VS_VERSIONINFO ===\n\n");
+	}
+	bool firstit_dowhile = true;
 	do {
-		char path_version[256] = R_EMPTY;
-		snprintf (path_version, sizeof (path_version), format_version, num_version);
+		char *path_version = sdb_fmt (format_version, num_version);
 		if (!(sdb = sdb_ns_path (r->sdb, path_version, 0))) {
 			break;
 		}
-		r_cons_printf ("# VS_FIXEDFILEINFO\n\n");
-		char path_fixedfileinfo[256] = R_EMPTY;
-		snprintf (path_fixedfileinfo, sizeof (path_fixedfileinfo), "%s/fixed_file_info", path_version);
+		if (!firstit_dowhile && IS_MODE_JSON (mode)) {
+			r_cons_printf (",");
+		}
+		if (IS_MODE_JSON (mode)) {
+			r_cons_printf ("{\"VS_FIXEDFILEINFO\":{");
+		} else {
+			r_cons_printf ("# VS_FIXEDFILEINFO\n\n");
+		}
+		const char *path_fixedfileinfo = sdb_fmt ("%s/fixed_file_info", path_version);
 		if (!(sdb = sdb_ns_path (r->sdb, path_fixedfileinfo, 0))) {
+			r_cons_printf ("}");
 			break;
 		}
-		r_cons_printf ("  Signature: 0x%"PFMT64x"\n", sdb_num_get (sdb, "Signature", 0));
-		r_cons_printf ("  StrucVersion: 0x%"PFMT64x"\n", sdb_num_get (sdb, "StrucVersion", 0));
-		r_cons_printf ("  FileVersion: %"PFMT64d".%"PFMT64d".%"PFMT64d".%"PFMT64d"\n",
-			sdb_num_get (sdb, "FileVersionMS", 0) >> 16,
-			sdb_num_get (sdb, "FileVersionMS", 0) & 0xFFFF,
-			sdb_num_get (sdb, "FileVersionLS", 0) >> 16,
-			sdb_num_get (sdb, "FileVersionLS", 0) & 0xFFFF);
-		r_cons_printf ("  ProductVersion: %"PFMT64d".%"PFMT64d".%"PFMT64d".%"PFMT64d"\n",
-			sdb_num_get (sdb, "ProductVersionMS", 0) >> 16,
-			sdb_num_get (sdb, "ProductVersionMS", 0) & 0xFFFF,
-			sdb_num_get (sdb, "ProductVersionLS", 0) >> 16,
-			sdb_num_get (sdb, "ProductVersionLS", 0) & 0xFFFF);
-		r_cons_printf ("  FileFlagsMask: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileFlagsMask", 0));
-		r_cons_printf ("  FileFlags: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileFlags", 0));
-		r_cons_printf ("  FileOS: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileOS", 0));
-		r_cons_printf ("  FileType: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileType", 0));
-		r_cons_printf ("  FileSubType: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileSubType", 0));
+		if (IS_MODE_JSON (mode)) {
+			r_cons_printf ("\"Signature\":%"PFMT64u",", sdb_num_get (sdb, "Signature", 0));
+			r_cons_printf ("\"StrucVersion\":%"PFMT64u",", sdb_num_get (sdb, "StrucVersion", 0));
+			r_cons_printf ("\"FileVersion\":\"%"PFMT64d".%"PFMT64d".%"PFMT64d".%"PFMT64d"\",",
+				sdb_num_get (sdb, "FileVersionMS", 0) >> 16,
+				sdb_num_get (sdb, "FileVersionMS", 0) & 0xFFFF,
+				sdb_num_get (sdb, "FileVersionLS", 0) >> 16,
+				sdb_num_get (sdb, "FileVersionLS", 0) & 0xFFFF);
+			r_cons_printf ("\"ProductVersion\":\"%"PFMT64d".%"PFMT64d".%"PFMT64d".%"PFMT64d"\",",
+				sdb_num_get (sdb, "ProductVersionMS", 0) >> 16,
+				sdb_num_get (sdb, "ProductVersionMS", 0) & 0xFFFF,
+				sdb_num_get (sdb, "ProductVersionLS", 0) >> 16,
+				sdb_num_get (sdb, "ProductVersionLS", 0) & 0xFFFF);
+			r_cons_printf ("\"FileFlagsMask\":%"PFMT64u",", sdb_num_get (sdb, "FileFlagsMask", 0));
+			r_cons_printf ("\"FileFlags\":%"PFMT64u",", sdb_num_get (sdb, "FileFlags", 0));
+			r_cons_printf ("\"FileOS\":%"PFMT64u",", sdb_num_get (sdb, "FileOS", 0));
+			r_cons_printf ("\"FileType\":%"PFMT64u",", sdb_num_get (sdb, "FileType", 0));
+			r_cons_printf ("\"FileSubType\":%"PFMT64u, sdb_num_get (sdb, "FileSubType", 0));
+			r_cons_printf ("},");
+		} else {
+			r_cons_printf ("  Signature: 0x%"PFMT64x"\n", sdb_num_get (sdb, "Signature", 0));
+			r_cons_printf ("  StrucVersion: 0x%"PFMT64x"\n", sdb_num_get (sdb, "StrucVersion", 0));
+			r_cons_printf ("  FileVersion: %"PFMT64d".%"PFMT64d".%"PFMT64d".%"PFMT64d"\n",
+				sdb_num_get (sdb, "FileVersionMS", 0) >> 16,
+				sdb_num_get (sdb, "FileVersionMS", 0) & 0xFFFF,
+				sdb_num_get (sdb, "FileVersionLS", 0) >> 16,
+				sdb_num_get (sdb, "FileVersionLS", 0) & 0xFFFF);
+			r_cons_printf ("  ProductVersion: %"PFMT64d".%"PFMT64d".%"PFMT64d".%"PFMT64d"\n",
+				sdb_num_get (sdb, "ProductVersionMS", 0) >> 16,
+				sdb_num_get (sdb, "ProductVersionMS", 0) & 0xFFFF,
+				sdb_num_get (sdb, "ProductVersionLS", 0) >> 16,
+				sdb_num_get (sdb, "ProductVersionLS", 0) & 0xFFFF);
+			r_cons_printf ("  FileFlagsMask: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileFlagsMask", 0));
+			r_cons_printf ("  FileFlags: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileFlags", 0));
+			r_cons_printf ("  FileOS: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileOS", 0));
+			r_cons_printf ("  FileType: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileType", 0));
+			r_cons_printf ("  FileSubType: 0x%"PFMT64x"\n", sdb_num_get (sdb, "FileSubType", 0));
+			r_cons_newline ();
+		}
 #if 0
 		r_cons_printf ("  FileDate: %d.%d.%d.%d\n",
 			sdb_num_get (sdb, "FileDateMS", 0) >> 16,
@@ -2940,53 +2962,70 @@
 			sdb_num_get (sdb, "FileDateLS", 0) >> 16,
 			sdb_num_get (sdb, "FileDateLS", 0) & 0xFFFF);
 #endif
-		r_cons_newline ();
-		r_cons_println ("# StringTable\n");
+		if (IS_MODE_JSON (mode)) {
+			r_cons_printf ("\"StringTable\":{");
+		} else {
+			r_cons_printf ("# StringTable\n\n");
+		}
 		for (num_stringtable = 0; sdb; num_stringtable++) {
-			char path_stringtable[256] = R_EMPTY;
-			snprintf (path_stringtable, sizeof (path_stringtable), format_stringtable, path_version, num_stringtable);
+			char *path_stringtable = r_str_newf (format_stringtable, path_version, num_stringtable);
 			sdb = sdb_ns_path (r->sdb, path_stringtable, 0);
-			for (num_string = 0; sdb; ++num_string) {
-				char path_string[256] = R_EMPTY;
-				snprintf (path_string, sizeof (path_string), format_string, path_stringtable, num_string);
+			bool firstit_for = true;
+			for (num_string = 0; sdb; num_string++) {
+				char *path_string = r_str_newf (format_string, path_stringtable, num_string);
 				sdb = sdb_ns_path (r->sdb, path_string, 0);
 				if (sdb) {
+					if (!firstit_for && IS_MODE_JSON (mode)) { r_cons_printf (","); }
 					int lenkey = 0;
 					int lenval = 0;
 					ut8 *key_utf16 = sdb_decode (sdb_const_get (sdb, "key", 0), &lenkey);
 					ut8 *val_utf16 = sdb_decode (sdb_const_get (sdb, "value", 0), &lenval);
 					ut8 *key_utf8 = calloc (lenkey * 2, 1);
 					ut8 *val_utf8 = calloc (lenval * 2, 1);
-
 					if (r_str_utf16_to_utf8 (key_utf8, lenkey * 2, key_utf16, lenkey, true) < 0
 						|| r_str_utf16_to_utf8 (val_utf8, lenval * 2, val_utf16, lenval, true) < 0) {
 						eprintf ("Warning: Cannot decode utf16 to utf8\n");
+					} else if (IS_MODE_JSON (mode)) {
+						char *escaped_key_utf8 = r_str_escape ((char*)key_utf8);
+						char *escaped_val_utf8 = r_str_escape ((char*)val_utf8);
+						r_cons_printf ("\"%s\":\"%s\"", escaped_key_utf8, escaped_val_utf8);
+						free (escaped_key_utf8);
+						free (escaped_val_utf8);
 					} else {
 						r_cons_printf ("  %s: %s\n", (char*)key_utf8, (char*)val_utf8);
 					}
-
 					free (key_utf8);
 					free (val_utf8);
 					free (key_utf16);
 					free (val_utf16);
 				}
+				firstit_for = false;
+				free (path_string);
 			}
+			free (path_stringtable);
+		}
+		if (IS_MODE_JSON (mode)) {
+			r_cons_printf ("}}");
 		}
 		num_version++;
+		firstit_dowhile = false;
 	} while (sdb);
 }
 
-static void bin_elf_versioninfo(RCore *r) {
+static void bin_elf_versioninfo(RCore *r, int mode) {
 	const char *format = "bin/cur/info/versioninfo/%s%d";
-	char path[256] = {0};
-	int num_versym = 0;
+	int num_versym;
 	int num_verneed = 0;
 	int num_version = 0;
 	Sdb *sdb = NULL;
 	const char *oValue = NULL;
-	for (;; num_versym++) {
-		snprintf (path, sizeof (path), format, "versym", num_versym);
-		if (!(sdb = sdb_ns_path (r->sdb, path, 0))) {
+	bool firstit_for_versym = true;
+	if (IS_MODE_JSON (mode)) {
+		r_cons_printf ("{\"versym\":[");
+	}
+	for (num_versym = 0;; num_versym++) {
+		const char *versym_path = sdb_fmt (format, "versym", num_versym);
+		if (!(sdb = sdb_ns_path (r->sdb, versym_path, 0))) {
 			break;
 		}
 		ut64 addr = sdb_num_get (sdb, "addr", 0);
@@ -2996,69 +3035,142 @@
 		const char *section_name = sdb_const_get (sdb, "section_name", 0);
 		const char *link_section_name = sdb_const_get (sdb, "link_section_name", 0);
 
-		r_cons_printf ("Version symbols section '%s' contains %"PFMT64u" entries:\n", section_name, num_entries);
-		r_cons_printf (" Addr: 0x%08"PFMT64x"  Offset: 0x%08"PFMT64x"  Link: %x (%s)\n",
-			(ut64)addr, (ut64)offset, (ut32)link, link_section_name);
+		if (IS_MODE_JSON (mode)) {
+			if (!firstit_for_versym) { r_cons_printf (","); }
+			r_cons_printf ("{\"section_name\":\"%s\",\"address\":%"PFMT64u",\"offset\":%"PFMT64u",",
+					section_name, (ut64)addr, (ut64)offset);
+			r_cons_printf ("\"link\":%"PFMT64u",\"link_section_name\":\"%s\",\"entries\":[",
+					(ut32)link, link_section_name);
+		} else {
+			r_cons_printf ("Version symbols section '%s' contains %"PFMT64u" entries:\n", section_name, num_entries);
+			r_cons_printf (" Addr: 0x%08"PFMT64x"  Offset: 0x%08"PFMT64x"  Link: %x (%s)\n",
+				(ut64)addr, (ut64)offset, (ut32)link, link_section_name);
+		}
 		int i;
 		for (i = 0; i < num_entries; i++) {
-			char key[32] = R_EMPTY;
-			snprintf (key, sizeof (key), "entry%d", i);
+			const char *key = sdb_fmt ("entry%d", i);
 			const char *value = sdb_const_get (sdb, key, 0);
 			if (value) {
 				if (oValue && !strcmp (value, oValue)) {
 					continue;
 				}
-				r_cons_printf ("  0x%08"PFMT64x": ", (ut64) i);
-				r_cons_printf ("%s\n", value);
+				if (IS_MODE_JSON (mode)) {
+					if (i > 0) { r_cons_printf (","); }
+					char *escaped_value = r_str_escape (value);
+					r_cons_printf ("{\"idx\":%"PFMT64u",\"value\":\"%s\"}",
+							(ut64) i, escaped_value);
+					free (escaped_value);
+				} else {
+					r_cons_printf ("  0x%08"PFMT64x": ", (ut64) i);
+					r_cons_printf ("%s\n", value);
+				}
 				oValue = value;
 			}
 		}
-		r_cons_println ("\n");
+		if (IS_MODE_JSON (mode)) {
+			r_cons_printf ("]}");
+		} else {
+			r_cons_printf ("\n\n");
+		}
+		firstit_for_versym = false;
+	}
+	if (IS_MODE_JSON (mode)) {
+		r_cons_printf ("],\"verneed\":[");
 	}
 
+	bool firstit_dowhile_verneed = true;
 	do {
-		char path_version[256] = R_EMPTY;
-		snprintf (path, sizeof (path), format, "verneed", num_verneed++);
-		if (!(sdb = sdb_ns_path (r->sdb, path, 0))) {
+		char *verneed_path = r_str_newf (format, "verneed", num_verneed++);
+		if (!(sdb = sdb_ns_path (r->sdb, verneed_path, 0))) {
 			break;
 		}
+		if (IS_MODE_JSON (mode)) {
+			if (!firstit_dowhile_verneed) {
+				r_cons_printf (",");
+			}
+			r_cons_printf ("{\"section_name\":\"%s\",\"address\":%"PFMT64u",\"offset\":%"PFMT64u",",
+				sdb_const_get (sdb, "section_name", 0), sdb_num_get (sdb, "addr", 0), sdb_num_get (sdb, "offset", 0));
+			r_cons_printf ("\"link\":%"PFMT64u",\"link_section_name\":\"%s\",\"entries\":[",
+				sdb_num_get (sdb, "link", 0), sdb_const_get (sdb, "link_section_name", 0));
+		} else {
+			r_cons_printf ("Version need section '%s' contains %d entries:\n",
+				sdb_const_get (sdb, "section_name", 0), (int)sdb_num_get (sdb, "num_entries", 0));
 
-		r_cons_printf ("Version need section '%s' contains %d entries:\n",
-			sdb_const_get (sdb, "section_name", 0), (int)sdb_num_get (sdb, "num_entries", 0));
-
-		r_cons_printf (" Addr: 0x%08"PFMT64x, sdb_num_get (sdb, "addr", 0));
+			r_cons_printf (" Addr: 0x%08"PFMT64x, sdb_num_get (sdb, "addr", 0));
 
-		r_cons_printf ("  Offset: 0x%08"PFMT64x"  Link to section: %"PFMT64d" (%s)\n",
-			sdb_num_get (sdb, "offset", 0), sdb_num_get (sdb, "link", 0),
-			sdb_const_get (sdb, "link_section_name", 0));
+			r_cons_printf ("  Offset: 0x%08"PFMT64x"  Link to section: %"PFMT64d" (%s)\n",
+				sdb_num_get (sdb, "offset", 0), sdb_num_get (sdb, "link", 0),
+				sdb_const_get (sdb, "link_section_name", 0));
+		}
+		bool firstit_for_verneed = true;
 		for (num_version = 0;; num_version++) {
-			snprintf (path_version, sizeof (path_version), "%s/version%d", path, num_version);
 			const char *filename = NULL;
-			char path_vernaux[256] = R_EMPTY;
 			int num_vernaux = 0;
+
+			char *path_version = sdb_fmt ("%s/version%d", verneed_path, num_version);
 			if (!(sdb = sdb_ns_path (r->sdb, path_version, 0))) {
 				break;
 			}
-			r_cons_printf ("  0x%08"PFMT64x": Version: %d",
-				sdb_num_get (sdb, "idx", 0), (int)sdb_num_get (sdb, "vn_version", 0));
+			if (IS_MODE_JSON (mode)) {
+				if (!firstit_for_verneed) { r_cons_printf (","); }
+				r_cons_printf ("{\"idx\":%"PFMT64u",\"vn_version\":%d,",
+					sdb_num_get (sdb, "idx", 0), (int)sdb_num_get (sdb, "vn_version", 0));
+			} else {
+				r_cons_printf ("  0x%08"PFMT64x": Version: %d",
+					sdb_num_get (sdb, "idx", 0), (int)sdb_num_get (sdb, "vn_version", 0));
+			}
 
 			if ((filename = sdb_const_get (sdb, "file_name", 0))) {
-				r_cons_printf ("  File: %s", filename);
+				if (IS_MODE_JSON (mode)) {
+					char *escaped_filename = r_str_escape (filename);
+					r_cons_printf ("\"file_name\":\"%s\",", escaped_filename);
+					free (escaped_filename);
+				} else {
+					r_cons_printf ("  File: %s", filename);
+				}
+			}
+			if (IS_MODE_JSON (mode)) {
+				r_cons_printf ("\"cnt\":%d,", (int)sdb_num_get (sdb, "cnt", 0));
+			} else {
+				r_cons_printf ("  Cnt: %d\n", (int)sdb_num_get (sdb, "cnt", 0));
+			}
+			if (IS_MODE_JSON (mode)) {
+				r_cons_printf ("\"vernaux\":[");
 			}
-			r_cons_printf ("  Cnt: %d\n", (int)sdb_num_get (sdb, "cnt", 0));
+			bool firstit_dowhile_vernaux = true;
 			do {
-				snprintf (path_vernaux, sizeof (path_vernaux), "%s/vernaux%d",
-					path_version, num_vernaux++);
+				const char *path_vernaux = sdb_fmt ("%s/vernaux%d", path_version, num_vernaux++);
 				if (!(sdb = sdb_ns_path (r->sdb, path_vernaux, 0))) {
 					break;
 				}
-				r_cons_printf ("  0x%08"PFMT64x":   Name: %s",
-					sdb_num_get (sdb, "idx", 0), sdb_const_get (sdb, "name", 0));
-				r_cons_printf ("  Flags: %s Version: %d\n",
-					sdb_const_get (sdb, "flags", 0), (int)sdb_num_get (sdb, "version", 0));
+				if (IS_MODE_JSON (mode)) {
+					if (!firstit_dowhile_vernaux) { r_cons_printf (","); }
+					r_cons_printf ("{\"idx\":%"PFMT64u",\"name\":\"%s\",",
+						sdb_num_get (sdb, "idx", 0), sdb_const_get (sdb, "name", 0));
+					r_cons_printf ("\"flags\":\"%s\",\"version\":%d}",
+						sdb_const_get (sdb, "flags", 0), (int)sdb_num_get (sdb, "version", 0));
+				} else {
+					r_cons_printf ("  0x%08"PFMT64x":   Name: %s",
+						sdb_num_get (sdb, "idx", 0), sdb_const_get (sdb, "name", 0));
+					r_cons_printf ("  Flags: %s Version: %d\n",
+						sdb_const_get (sdb, "flags", 0), (int)sdb_num_get (sdb, "version", 0));
+				}
+				firstit_dowhile_vernaux = false;
 			} while (sdb);
+			if (IS_MODE_JSON (mode)) {
+				r_cons_printf ("]}");
+			}
+			firstit_for_verneed = false;
 		}
+		if (IS_MODE_JSON (mode)) {
+			r_cons_printf ("]}");
+		}
+		firstit_dowhile_verneed = false;
+		free (verneed_path);
 	} while (sdb);
+	if (IS_MODE_JSON (mode)) {
+		r_cons_printf ("]}");
+	}
 }
 
 static void bin_mach0_versioninfo(RCore *r) {
@@ -3080,12 +3192,12 @@
 		r_cons_printf ("[");
 	}
 	while (true) {
-		const char *timestrKey = sdb_fmt (0, "resource.%d.timestr", index);
-		const char *vaddrKey = sdb_fmt (1, "resource.%d.vaddr", index);
-		const char *sizeKey  = sdb_fmt (2, "resource.%d.size", index);
-		const char *typeKey  = sdb_fmt (3, "resource.%d.type", index);
-		const char *languageKey = sdb_fmt (4, "resource.%d.language", index);
-		const char *nameKey = sdb_fmt (5, "resource.%d.name", index);
+		const char *timestrKey = sdb_fmt ("resource.%d.timestr", index);
+		const char *vaddrKey = sdb_fmt ("resource.%d.vaddr", index);
+		const char *sizeKey  = sdb_fmt ("resource.%d.size", index);
+		const char *typeKey  = sdb_fmt ("resource.%d.type", index);
+		const char *languageKey = sdb_fmt ("resource.%d.language", index);
+		const char *nameKey = sdb_fmt ("resource.%d.name", index);
 		char *timestr = sdb_get (sdb, timestrKey, 0);
 		if (!timestr) {
 			break;
@@ -3097,23 +3209,25 @@
 		char *lang = sdb_get (sdb, languageKey, 0);
 
 		if (IS_MODE_SET (mode)) {
-			const char *name = sdb_fmt (4, "resource.%d", index);
+			const char *name = sdb_fmt ("resource.%d", index);
 			r_flag_set (r->flags, name, vaddr, size);
 		} else if (IS_MODE_RAD (mode)) {
 			r_cons_printf ("f resource.%d %d 0x%08"PFMT32x"\n", index, size, vaddr);
 		} else if (IS_MODE_JSON (mode)) {
-			r_cons_printf("%s{\"name\":%d,\"index\":%d, \"type\":\"%s\","
-					"\"vaddr\":%"PFMT32d", \"size\":%d, \"lang\":\"%s\"}",
+			r_cons_printf ("%s{\"name\":%d,\"index\":%d, \"type\":\"%s\","
+					"\"vaddr\":%"PFMT64d", \"size\":%d, \"lang\":\"%s\"}",
 					index? ",": "", name, index, type, vaddr, size, lang);
 		} else {
 			char *humanSize = r_num_units (NULL, size);
 			r_cons_printf ("Resource %d\n", index);
-			r_cons_printf ("\tname: %d\n", name);
-			r_cons_printf ("\ttimestamp: %s\n", timestr);
-			r_cons_printf ("\tvaddr: 0x%08"PFMT32x"\n", vaddr);
-			r_cons_printf ("\tsize: %s\n", humanSize);
-			r_cons_printf ("\ttype: %s\n", type);
-			r_cons_printf ("\tlanguage: %s\n", lang);
+			r_cons_printf ("  name: %d\n", name);
+			r_cons_printf ("  timestamp: %s\n", timestr);
+			r_cons_printf ("  vaddr: 0x%08"PFMT64x"\n", vaddr);
+			if (humanSize) {
+				r_cons_printf ("  size: %s\n", humanSize);
+			}
+			r_cons_printf ("  type: %s\n", type);
+			r_cons_printf ("  language: %s\n", lang);
 			free (humanSize);
 		}
 
@@ -3136,7 +3250,6 @@
 	}
 }
 
-
 static int bin_resources(RCore *r, int mode) {
 	const RBinInfo *info = r_bin_get_info (r->bin);
 	if (!info || !info->rclass) {
@@ -3156,9 +3269,9 @@
 		return false;
 	}
 	if (!strncmp ("pe", info->rclass, 2)) {
-		bin_pe_versioninfo (r);
+		bin_pe_versioninfo (r, mode);
 	} else if (!strncmp ("elf", info->rclass, 3)) {
-		bin_elf_versioninfo (r);
+		bin_elf_versioninfo (r, mode);
 	} else if (!strncmp ("mach0", info->rclass, 5)) {
 		bin_mach0_versioninfo (r);
 	} else {
@@ -3281,18 +3394,22 @@
 	
 	// use our internal values for va
 	va = va ? VA_TRUE : VA_FALSE;
+#if 0
 	if (r_config_get_i (core->config, "anal.strings")) {
 		r_core_cmd0 (core, "aar");
 	}
+#endif
 	if ((action & R_CORE_BIN_ACC_STRINGS)) ret &= bin_strings (core, mode, va);
 	if ((action & R_CORE_BIN_ACC_RAW_STRINGS)) ret &= bin_raw_strings (core, mode, va);
 	if ((action & R_CORE_BIN_ACC_INFO)) ret &= bin_info (core, mode);
 	if ((action & R_CORE_BIN_ACC_MAIN)) ret &= bin_main (core, mode, va);
 	if ((action & R_CORE_BIN_ACC_DWARF)) ret &= bin_dwarf (core, mode);
 	if ((action & R_CORE_BIN_ACC_PDB)) ret &= bin_pdb (core, mode);
+	if ((action & R_CORE_BIN_ACC_SOURCE)) ret &= bin_source (core, mode);
 	if ((action & R_CORE_BIN_ACC_ENTRIES)) ret &= bin_entry (core, mode, loadaddr, va, false);
 	if ((action & R_CORE_BIN_ACC_INITFINI)) ret &= bin_entry (core, mode, loadaddr, va, true);
-	if ((action & R_CORE_BIN_ACC_SECTIONS)) ret &= bin_sections (core, mode, loadaddr, va, at, name, chksum);
+	if ((action & R_CORE_BIN_ACC_SECTIONS)) ret &= bin_sections (core, mode, loadaddr, va, at, name, chksum, false);
+	if ((action & R_CORE_BIN_ACC_SEGMENTS)) ret &= bin_sections (core, mode, loadaddr, va, at, name, chksum, true);
 	if (r_config_get_i (core->config, "bin.relocs")) {
 		if ((action & R_CORE_BIN_ACC_RELOCS)) ret &= bin_relocs (core, mode, va);
 	}
@@ -3313,7 +3430,7 @@
 				ret &= bin_fields (core, 0, va);
 			}
 		} else {
-			if (IS_MODE_NORMAL(mode)) {
+			if (IS_MODE_NORMAL (mode)) {
 				ret &= bin_header (core, mode);
 			} else {
 				if ((action & R_CORE_BIN_ACC_HEADER) || action & R_CORE_BIN_ACC_FIELDS) {
@@ -3330,10 +3447,10 @@
 	RIODesc *desc = r_io_desc_get (r->io, fd);
 	RBinFile *curfile, *binfile = NULL;
 	if (!name) {
-		name = (desc) ? desc->name : NULL;
-	}
-	if (!name) {
-		return false;
+		if (!desc || !desc->name) {
+			return false;
+		}
+		name = desc->name;
 	}
 	/* Check if the arch name is a valid name */
 	if (!r_asm_is_valid (r->assembler, arch)) {
diff -Nru radare2-2.3.0+dfsg/libr/core/cconfig.c radare2-2.8.0+dfsg/libr/core/cconfig.c
--- radare2-2.3.0+dfsg/libr/core/cconfig.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cconfig.c	2018-08-07 14:12:36.000000000 +0000
@@ -191,6 +191,13 @@
 	return true;
 }
 
+static int cb_analdepth(void *user, void *data) {
+	RCore *core = (RCore*) user;
+	RConfigNode *node = (RConfigNode*) data;
+	core->anal->opt.depth = node->i_value;
+	return true;
+}
+
 static int cb_analafterjmp(void *user, void *data) {
 	RCore *core = (RCore*) user;
 	RConfigNode *node = (RConfigNode*) data;
@@ -198,6 +205,19 @@
 	return true;
 }
 
+static int cb_anal_endsize(void *user, void *data) {
+	RCore *core = (RCore*) user;
+	RConfigNode *node = (RConfigNode*) data;
+	core->anal->opt.endsize = node->i_value;
+	return true;
+}
+static int cb_analvars(void *user, void *data) {
+        RCore *core = (RCore*) user;
+        RConfigNode *node = (RConfigNode*) data;
+        core->anal->opt.vars = node->i_value;
+        return true;
+}
+
 static int cb_analstrings(void *user, void *data) {
 	RCore *core = (RCore*) user;
 	RConfigNode *node = (RConfigNode*) data;
@@ -235,13 +255,6 @@
 	return true;
 }
 
-static int cb_analbbsplit (void *user, void *data) {
-	RCore *core = (RCore*) user;
-	RConfigNode *node = (RConfigNode*) data;
-	core->anal->opt.bbsplit = node->i_value;
-	return true;
-}
-
 /* obey section permissions */
 static int cb_analnoncode(void *user, void *data) {
 	RCore *core = (RCore*) user;
@@ -288,24 +301,29 @@
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
 	r_anal_set_cpu (core->anal, node->value);
+	/* set pcalign */
+	{
+		int v = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_ALIGN);
+		r_config_set_i (core->config, "asm.pcalign", (v != -1)? v: 0);
+	}
 	return true;
 }
 
-static int cb_analsplit(void *user, void *data) {
+static int cb_analrecont(void *user, void *data) {
 	RCore *core = (RCore*) user;
 	RConfigNode *node = (RConfigNode*) data;
-	core->anal->split = node->i_value;
+	core->anal->opt.recont = node->i_value;
 	return true;
 }
 
-static int cb_analrecont(void *user, void *data) {
+static int cb_analijmp(void *user, void *data) {
 	RCore *core = (RCore*) user;
 	RConfigNode *node = (RConfigNode*) data;
-	core->anal->opt.recont = node->i_value;
+	core->anal->opt.ijmp = node->i_value;
 	return true;
 }
 
-static int cb_asmminvalsub(void *user, void *data) {
+static int cb_asmvarsubmin(void *user, void *data) {
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
 	core->parser->minval = node->i_value;
@@ -405,8 +423,8 @@
 		bits = core->anal->bits;
 	}
 	if (node->value[0] == '?') {
+		update_asmarch_options (core, node);
 		if (strlen (node->value) > 1 && node->value[1] == '?') {
-			update_asmarch_options (core, node);
 			/* print more verbose help instead of plain option values */
 			rasm2_list (core, NULL, node->value[1]);
 			return false;
@@ -474,14 +492,6 @@
 		}
 	}
 	// set pcalign
-	{
-		int v = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_ALIGN);
-		if (v != -1) {
-			r_config_set_i (core->config, "asm.pcalign", v);
-		} else {
-			r_config_set_i (core->config, "asm.pcalign", 0);
-		}
-	}
 	if (core->anal) {
 		const char *asmcpu = r_config_get (core->config, "asm.cpu");
 		if (!r_syscall_setup (core->anal->syscall, node->value, core->anal->bits, asmcpu, asmos)) {
@@ -496,22 +506,28 @@
 	// set a default endianness
 	int bigbin = r_bin_is_big_endian (core->bin);
 	if (bigbin == -1 /* error: no endianness detected in binary */) {
-		// try to set RAsm to LE
-		r_asm_set_big_endian (core->assembler, false);
-		// set endian of display to LE
-		core->print->big_endian = false;
-	} else {
-		// try to set endian of RAsm to match binary
-		r_asm_set_big_endian (core->assembler, bigbin);
-		// set endian of display to match binary
-		core->print->big_endian = bigbin;
+		bigbin = r_config_get_i (core->config, "cfg.bigendian");
 	}
+
+	// try to set endian of RAsm to match binary
+	r_asm_set_big_endian (core->assembler, bigbin);
+	// set endian of display to match binary
+	core->print->big_endian = bigbin;
+
 	r_asm_set_cpu (core->assembler, asm_cpu);
 	free (asm_cpu);
 	RConfigNode *asmcpu = r_config_node_get (core->config, "asm.cpu");
 	if (asmcpu) {
 		update_asmcpu_options (core, asmcpu);
 	}
+	{
+		int v = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_ALIGN);
+		if (v != -1) {
+			r_config_set_i (core->config, "asm.pcalign", v);
+		} else {
+			r_config_set_i (core->config, "asm.pcalign", 0);
+		}
+	}
 	/* reload types and cc info */
 	// changing asm.arch changes anal.arch
 	// changing anal.arch sets types db
@@ -549,17 +565,22 @@
 	}
 
 	bits = node->i_value;
-
+#if 0
+// TODO: pretty good optimization, but breaks many tests when arch is different i think
+	if (bits == core->assembler->bits && bits == core->anal->bits && bits == core->dbg->bits) {
+		// early optimization
+		return true;
+	}
+#endif
 	if (bits > 0) {
 		ret = r_asm_set_bits (core->assembler, bits);
 		if (!ret) {
 			RAsmPlugin *h = core->assembler->cur;
-			if (h) {
-				eprintf ("Cannot set bits %d to '%s'\n", bits, h->name);
-			} else {
+			if (!h) {
 				eprintf ("e asm.bits: Cannot set value, no plugins defined yet\n");
 				ret = true;
 			}
+			// else { eprintf ("Cannot set bits %d to '%s'\n", bits, h->name); }
 		}
 		if (!r_anal_set_bits (core->anal, bits)) {
 			eprintf ("asm.arch: Cannot setup '%d' bits analysis engine\n", bits);
@@ -588,7 +609,6 @@
 			(void)r_anal_set_reg_profile (core->anal);
 		}
 	}
-
 	asmos = r_config_get (core->config, "asm.os");
 	asmarch = r_config_get (core->config, "asm.arch");
 	asmcpu = r_config_get (core->config, "asm.cpu");
@@ -620,14 +640,22 @@
 			features = strdup (core->assembler->cur->features);
 			argc = r_str_split (features, ',');
 			for (i = 0; i < argc; i++) {
+				node->options->free = free;
 				const char *feature = r_str_word_get0 (features, i);
-				SETOPTIONS (node, feature, NULL);
+				r_list_append (node->options, strdup (feature));
 			}
 			free (features);
 		}
 	}
 }
 
+static int cb_flag_realnames(void *user, void *data) {
+	RCore *core = (RCore *) user;
+	RConfigNode *node = (RConfigNode *) data;
+	core->flags->realnames = node->i_value;
+	return true;
+}
+
 static int cb_asmfeatures(void *user, void *data) {
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
@@ -909,6 +937,7 @@
 		return false;
 	}
 	if (core->io) {
+		core->io->va = !node->i_value;
 		core->io->debug = node->i_value;
 	}
 	if (core->dbg && node->i_value) {
@@ -976,6 +1005,15 @@
 	return true;
 }
 
+static int cb_cmdpdc(void *user, void *data) {
+	RConfigNode *node = (RConfigNode *)data;
+	if (node->value[0] == '?') {
+		r_cons_printf ("pdc\n");
+		return false;
+	}
+	return true;
+}
+
 static int cb_cmdlog(void *user, void *data) {
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
@@ -1004,10 +1042,16 @@
 	if (node->i_value) {
 		core->print->flags |= R_PRINT_FLAGS_COLOR;
 	} else {
-		//c:core->print->flags ^= R_PRINT_FLAGS_COLOR;
 		core->print->flags &= (~R_PRINT_FLAGS_COLOR);
 	}
-	r_cons_singleton ()->use_color = node->i_value? 1: 0;
+	if (!strcmp (node->value, "true")) {
+		node->i_value = 1;
+	} else if (!strcmp (node->value, "false")) {
+		node->i_value = 0;
+	}
+	r_cons_singleton ()->color = (node->i_value > COLOR_MODE_16M)
+		? COLOR_MODE_16M: node->i_value;
+	r_cons_pal_update_event ();
 	r_print_set_flags (core->print, core->print->flags);
 	return true;
 }
@@ -1417,8 +1461,10 @@
 }
 
 static int cb_cmddepth(void *user, void *data) {
+	RCore *core = (RCore *)user;
 	int c = R_MAX (((RConfigNode*)data)->i_value, 0);
-	((RCore *)user)->cmd_depth = c;
+	core->max_cmd_depth = c;
+	core->cmd_depth = c;
 	return true;
 }
 
@@ -1514,6 +1560,16 @@
 	return true;
 }
 
+static int cb_io_pava(void *user, void *data) {
+	RCore *core = (RCore *) user;
+	RConfigNode *node = (RConfigNode *) data;
+	core->pava = node->i_value;
+	if (node->i_value && core->io->va) {
+		eprintf ("WARNING: You may probably want to disable io.va too\n");
+	}
+	return true;
+}
+
 static int cb_iova(void *user, void *data) {
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
@@ -1602,18 +1658,6 @@
 	return true;
 }
 
-static int cb_rgbcolors(void *user, void *data) {
-	RConfigNode *node = (RConfigNode *) data;
-	RCore *core = (RCore *) user;
-	if (node->i_value) {
-		r_cons_singleton()->truecolor =
-			(r_config_get_i (core->config, "scr.truecolor"))?2:1;
-	} else {
-		r_cons_singleton()->truecolor = 0;
-	}
-	return true;
-}
-
 static int cb_scrbreakword(void* user, void* data) {
 	RConfigNode *node = (RConfigNode*) data;
 	if (*node->value) {
@@ -1657,35 +1701,69 @@
 #if __WINDOWS__ && !__CYGWIN__
 static int scr_ansicon(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
-	r_cons_singleton()->ansicon = node->i_value;
+	r_cons_singleton ()->ansicon = node->i_value;
 	return true;
 }
 #endif
 
 static int cb_screcho(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
-	r_cons_singleton()->echo = node->i_value;
+	r_cons_singleton ()->echo = node->i_value;
 	return true;
 }
 
 static int cb_scrlinesleep(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
-	r_cons_singleton()->linesleep = node->i_value;
+	r_cons_singleton ()->linesleep = node->i_value;
 	return true;
 }
 
 static int cb_scrpagesize(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
-	r_cons_singleton()->pagesize= node->i_value;
+	r_cons_singleton ()->pagesize= node->i_value;
 	return true;
 }
 
 static int cb_scrflush(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
-	r_cons_singleton()->flush = node->i_value;
+	r_cons_singleton ()->flush = node->i_value;
+	return true;
+}
+
+static int cb_scrstrconv(void *user, void *data) {
+	RCore *core = (RCore*) user;
+	RConfigNode *node = (RConfigNode*) data;
+	if (node->value[0] == '?') {
+		if (strlen (node->value) > 1 && node->value[1] == '?') {
+			r_cons_printf ("Valid values for scr.strconv:\n"
+				"  asciiesc  convert to ascii with non-ascii chars escaped\n"
+				"  asciidot  convert to ascii with non-ascii chars turned into a dot (except control chars stated below)\n"
+				"\n"
+				"Ascii chars are in the range 0x20-0x7e. Always escaped control chars are alert (\\a),\n"
+				"backspace (\\b), formfeed (\\f), newline (\\n), carriage return (\\r), horizontal tab (\\t)\n"
+				"and vertical tab (\\v). Also, double quotes (\\\") are always escaped, but backslashes (\\\\)\n"
+				"are only escaped if str.escbslash = true.\n");
+		} else {
+			print_node_options (node);
+		}
+		return false;
+	} else {
+		free ((char *)core->print->strconv_mode);
+		core->print->strconv_mode = strdup (node->value);
+	}
+	return true;
+}
+
+static int cb_graphformat(void *user, void *data) {
+	RConfigNode *node = (RConfigNode *) data;
+	if (!strcmp (node->value, "?")) {
+		r_cons_printf ("png\njpg\npdf\nps\nsvg\njson\n");
+		return false;
+	}
 	return true;
 }
 
+
 static int cb_exectrap(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
 	RCore *core = (RCore*) user;
@@ -1709,7 +1787,7 @@
 	if (node->i_value && r_sandbox_enable (0)) {
 		return false;
 	}
-	r_cons_singleton()->is_interactive = node->i_value;
+	r_cons_singleton ()->is_interactive = node->i_value;
 	return true;
 }
 
@@ -1761,6 +1839,16 @@
 	return true;
 }
 
+static int cb_seggrn(void *user, void *data) {
+	RCore *core = (RCore *) user;
+	RConfigNode *node = (RConfigNode *) data;
+	core->assembler->seggrn = node->i_value;
+	core->anal->seggrn = node->i_value;
+	core->print->seggrn = node->i_value;
+	return true;
+}
+
+
 static int cb_stopthreads(void *user, void *data) {
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
@@ -1784,7 +1872,7 @@
 
 static int cb_teefile(void *user, void *data) {
 	RConfigNode *node = (RConfigNode *) data;
-	r_cons_singleton()->teefile = node->value;
+	r_cons_singleton ()->teefile = node->value;
 	return true;
 }
 
@@ -1802,13 +1890,6 @@
 	return true;
 }
 
-static int cb_truecolor(void *user, void *data) {
-	RConfigNode *node = (RConfigNode *) data;
-	if (r_cons_singleton()->truecolor)
-		r_cons_singleton()->truecolor = (node->i_value)? 2: 1;
-	return true;
-}
-
 static int cb_utf8(void *user, void *data) {
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
@@ -1823,18 +1904,25 @@
 	return true;
 }
 
+static int cb_dotted(void *user, void *data) {
+	RCore *core = (RCore *) user;
+	RConfigNode *node = (RConfigNode *) data;
+	core->cons->dotted_lines = node->i_value;
+	return true;
+}
+
 static int cb_zoombyte(void *user, void *data) {
 	RCore *core = (RCore *) user;
 	RConfigNode *node = (RConfigNode *) data;
 	switch (*node->value) {
-		case 'p': case 'f': case 's': case '0':
-		case 'F': case 'e': case 'h':
-			core->print->zoom->mode = *node->value;
-			break;
-		default:
-			r_cons_printf ("p\nf\ns\n0\nF\ne\nh\n");
-			// eprintf ("Invalid zoom.byte value. See pz? for help\n");
-			return false;
+	case 'p': case 'f': case 's': case '0':
+	case 'F': case 'e': case 'h':
+		core->print->zoom->mode = *node->value;
+		break;
+	default:
+		eprintf ("Invalid zoom.byte value. See pz? for help\n");
+		r_cons_printf ("pzp\npzf\npzs\npz0\npzF\npze\npzh\n");
+		return false;
 	}
 	return true;
 }
@@ -2095,6 +2183,28 @@
 	return true;
 }
 
+static int cb_anal_cpp_abi(void *user, void *data) {
+	RCore *core = (RCore*) user;
+	RConfigNode *node = (RConfigNode*) data;
+
+	if (*node->value == '?') {
+		print_node_options (node);
+		return false;
+	}
+
+	if (*node->value) {
+		if (strcmp (node->value, "itanium") == 0) {
+			core->anal->cpp_abi = R_ANAL_CPP_ABI_ITANIUM;
+			return true;
+		} else if (strcmp (node->value, "msvc") == 0) {
+			core->anal->cpp_abi = R_ANAL_CPP_ABI_MSVC;
+			return true;
+		}
+		eprintf ("anal.cpp.abi: cannot find '%s'\n", node->value);
+	}
+	return false;
+}
+
 static int cb_linesto(void *user, void *data) {
 	RCore *core = (RCore*) user;
 	RConfigNode *node = (RConfigNode*) data;
@@ -2161,26 +2271,6 @@
 	return true;
 }
 
-static char *getViewerPath() {
-	int i;
-	const char *viewers[] = {
-		"open",
-		"geeqie",
-		"gqview",
-		"eog",
-		"xdg-open",
-		NULL
-	};
-	for (i = 0; viewers[i]; i++) {
-		char *dotPath = r_file_path (viewers[i]);
-		if (dotPath && strcmp (dotPath, viewers[i])) {
-			return dotPath;
-		}
-		free (dotPath);
-	}
-	return NULL;
-}
-
 #define SLURP_LIMIT (10*1024*1024)
 R_API int r_core_config_init(RCore *core) {
 	int i;
@@ -2210,6 +2300,11 @@
 	/* pdb */
 	SETPREF ("pdb.useragent", "Microsoft-Symbol-Server/6.11.0001.402", "User agent for Microsoft symbol server");
 	SETPREF ("pdb.server", "https://msdl.microsoft.com/download/symbols", "Base URL for Microsoft symbol server");
+	{
+		char *pdb_path = r_str_home(R2_HOME_PDB);
+		SETPREF("pdb.symstore", pdb_path, "Path to downstream symbol store");
+		R_FREE(pdb_path);
+	}
 	SETI ("pdb.extract", 1, "Avoid extract of the pdb file, just download");
 	SETI ("pdb.autoload", false, "Automatically load the required pdb files for loaded DLLs");
 
@@ -2217,6 +2312,7 @@
 	SETPREF ("anal.fcnprefix", "fcn",  "Prefix new function names with this");
 	SETPREF ("anal.a2f", "false",  "Use the new WIP analysis algorithm (core/p/a2f), anal.depth ignored atm");
 	SETICB ("anal.gp", 0, (RConfigCallback)&cb_anal_gp, "Set the value of the GP register (MIPS)");
+	SETI ("anal.gp2", 0, "Set anal.gp before emulating each instruction (workaround)");
 	SETCB ("anal.limits", "false", (RConfigCallback)&cb_anal_limits, "Restrict analysis to address range [anal.from:anal.to]");
 	SETCB ("anal.rnr", "false", (RConfigCallback)&cb_anal_rnr, "Recursive no return checks (EXPERIMENTAL)");
 	SETCB ("anal.limits", "false", (RConfigCallback)&cb_anal_limits, "Restrict analysis to address range [anal.from:anal.to]");
@@ -2234,14 +2330,17 @@
 	SETCB ("anal.armthumb", "false", &cb_analarmthumb, "aae computes arm/thumb changes (lot of false positives ahead)");
 	SETCB ("anal.eobjmp", "false", &cb_analeobjmp, "jmp is end of block mode (option)");
 	SETCB ("anal.afterjmp", "true", &cb_analafterjmp, "Continue analysis after jmp/ujmp");
-	SETI ("anal.depth", 16, "Max depth at code analysis"); // XXX: warn if depth is > 50 .. can be problematic
+	SETCB ("anal.endsize", "true", &cb_anal_endsize, "Adjust function size at the end of the analysis (known to be buggy)");
+	SETICB ("anal.depth", 64, &cb_analdepth, "Max depth at code analysis"); // XXX: warn if depth is > 50 .. can be problematic
 	SETICB ("anal.sleep", 0, &cb_analsleep, "Sleep N usecs every so often during analysis. Avoid 100% CPU usage");
 	SETPREF ("anal.calls", "false", "Make basic af analysis walk into calls");
 	SETPREF ("anal.autoname", "true", "Automatically set a name for the functions, may result in some false positives");
 	SETPREF ("anal.hasnext", "false", "Continue analysis after each function");
 	SETPREF ("anal.esil", "false", "Use the new ESIL code analysis");
 	SETCB ("anal.strings", "false", &cb_analstrings, "Identify and register strings during analysis (aar only)");
-	SETPREF ("anal.vars", "true",  "Analyze local variables and arguments");
+	SETPREF ("anal.types.spec", "gcc",  "Set profile for specifying format chars used in type analysis");
+	SETPREF ("anal.types.verbose", "false", "Verbose output from type analysis");
+	SETCB ("anal.vars", "true", &cb_analvars, "Analyze local variables and arguments");
 	SETPREF ("anal.vinfun", "true",  "Search values in functions (aav) (false by default to only find on non-code)");
 	SETPREF ("anal.vinfunrange", "false",  "Search values outside function ranges (requires anal.vinfun=false)\n");
 	SETCB ("anal.nopskip", "true", &cb_analnopskip, "Skip nops at the beginning of functions");
@@ -2252,12 +2351,12 @@
 	update_analarch_options (core, n);
 	SETCB ("anal.cpu", R_SYS_ARCH, &cb_analcpu, "Specify the anal.cpu to use");
 	SETPREF ("anal.prelude", "", "Specify an hexpair to find preludes in code");
-	SETCB ("anal.split", "true", &cb_analsplit, "Split functions into basic blocks in analysis");
 	SETCB ("anal.recont", "false", &cb_analrecont, "End block after splitting a basic block instead of error"); // testing
+	SETCB ("anal.ijmp", "false", &cb_analijmp, "Follow the indirect jumps in function analysis"); // testing
 	SETI ("anal.ptrdepth", 3, "Maximum number of nested pointers to follow in analysis");
 	SETICB ("anal.maxreflines", 0, &cb_analmaxrefs, "Maximum number of reflines to be analyzed and displayed in asm.lines with pd");
 
-	SETCB ("anal.jmptbl", "false", &cb_anal_jmptbl, "Analyze jump tables in switch statements");
+	SETCB ("anal.jmptbl", "true", &cb_anal_jmptbl, "Analyze jump tables in switch statements");
 
 	SETCB ("anal.cjmpref", "false", &cb_anal_cjmpref, "Create references for conditional jumps");
 	SETCB ("anal.jmpref", "true", &cb_anal_jmpref, "Create references for unconditional jumps");
@@ -2267,11 +2366,14 @@
 	SETCB ("anal.brokenrefs", "false", &cb_anal_brokenrefs, "Follow function references as well if function analysis was failed");
 
 	SETCB ("anal.refstr", "false", &cb_anal_searchstringrefs, "Search string references in data references");
-	SETCB ("anal.bb.split", "true", &cb_analbbsplit, "Use the experimental basic block split for JMPs");
 	SETCB ("anal.bb.align", "0x10", &cb_anal_bbs_alignment, "Possible space between basic blocks");
 	SETCB ("anal.bb.maxsize", "1024", &cb_anal_bb_max_size, "Maximum basic block size");
 	SETCB ("anal.pushret", "false", &cb_anal_pushret, "Analyze push+ret as jmp");
 
+	n = NODECB ("anal.cpp.abi", "itanium", &cb_anal_cpp_abi);
+	SETDESC (n, "Select C++ ABI (Compiler)");
+	SETOPTIONS (n, "itanium", "msvc", NULL);
+
 #if __linux__ && __GNU_LIBRARY__ && __GLIBC__ && __GLIBC_MINOR__
  	SETCB("dbg.malloc", "glibc", &cb_malloc, "Choose malloc structure parser");
 #else
@@ -2286,26 +2388,25 @@
 	SETI ("esil.stack.size", 0xf0000, "Number of elements that can be pushed on the esilstack");
 	SETI ("esil.stack.addr", 0x100000, "Number of elements that can be pushed on the esilstack");
 	SETPREF ("esil.stack.pattern", "0", "Specify fill pattern to initialize the stack (0, w, d, i)");
+	SETI ("esil.addr.size", 64, "Maximum address size in accessed by the ESIL VM");
+	SETPREF ("esil.breakoninvalid", "false", "Break esil execution when instruction is invalid");
 
 	/* asm */
 	//asm.os needs to be first, since other asm.* depend on it
-	SETICB ("asm.armimm", false,  &cb_asm_armimm, "Display # for immediates in ARM");
 	n = NODECB ("asm.os", R_SYS_OS, &cb_asmos);
 	SETDESC (n, "Select operating system (kernel)");
 	SETOPTIONS (n, "ios", "dos", "darwin", "linux", "freebsd", "openbsd", "netbsd", "windows", NULL);
-	SETI ("asm.maxrefs", 5,  "Maximum number of xrefs to be displayed as list (use columns above)");
+	SETI ("asm.xrefs.fold", 5,  "Maximum number of xrefs to be displayed as list (use columns above)");
+	SETI ("asm.xrefs.max", 20,  "Maximum number of xrefs to be displayed without folding");
 	SETCB ("asm.invhex", "false", &cb_asm_invhex, "Show invalid instructions as hexadecimal numbers");
+	SETPREF ("asm.meta", "true", "Display the code/data/format conversions in disasm");
 	SETPREF ("asm.bytes", "true", "Display the bytes of each instruction");
-	SETPREF ("asm.flagsinbytes", "false",  "Display flags inside the bytes space");
-	n = NODEICB ("asm.midflags", 2, &cb_midflags);
-	SETDESC (n, "Realign disassembly if there is a flag in the middle of an instruction");
 	SETPREF ("asm.midcursor", "false", "Cursor in visual disasm mode breaks the instruction");
-	SETOPTIONS (n, "0 = do not show flag", "1 = show without realign", "2 = realign at middle flag",
-		"3 = realign at middle flag if sym.*", NULL);
-	SETPREF ("asm.cmtflgrefs", "true", "Show comment flags associated to branch reference");
-	SETPREF ("asm.cmtright", "true", "Show comments at right of disassembly if they fit in screen");
-	SETI ("asm.cmtcol", 71, "Column to align comments");
+	SETPREF ("asm.cmt.flgrefs", "true", "Show comment flags associated to branch reference");
+	SETPREF ("asm.cmt.right", "true", "Show comments at right of disassembly if they fit in screen");
+	SETI ("asm.cmt.col", 71, "Column to align comments");
 	SETICB ("asm.pcalign", 0, &cb_asm_pcalign, "Only recognize as valid instructions aligned to this value");
+	// maybe rename to asm.cmt.calls
 	SETPREF ("asm.calls", "true", "Show callee function related info as comments in disasm");
 	SETPREF ("asm.bbline", "false", "Show empty line after every basic block");
 	SETPREF ("asm.comments", "true", "Show comments in disassembly view");
@@ -2314,9 +2415,9 @@
 	SETPREF ("asm.leahints", "false", "Show LEA hints [numbers] in disasm");
 	SETPREF ("asm.slow", "true", "Perform slow analysis operations in disasm");
 	SETPREF ("asm.decode", "false", "Use code analysis as a disassembler");
-	SETPREF ("asm.flgoff", "false", "Show offset in flags");
-	SETPREF ("asm.immstr", "false", "Show immediates values as strings");
-	SETPREF ("asm.immtrim", "false", "Remove all offsets and constants from disassembly");
+	SETICB ("asm.imm.arm", false,  &cb_asm_armimm, "Display # for immediates in ARM");
+	SETPREF ("asm.imm.str", "true", "Show immediates values as strings");
+	SETPREF ("asm.imm.trim", "false", "Remove all offsets and constants from disassembly");
 	SETPREF ("asm.indent", "false", "Indent disassembly based on reflines depth");
 	SETI ("asm.indentspace", 2, "How many spaces to indent the code");
 	SETPREF ("asm.dwarf", "false", "Show dwarf comment at disassembly");
@@ -2325,25 +2426,37 @@
 	SETPREF ("asm.esil", "false", "Show ESIL instead of mnemonic");
 	SETPREF ("asm.nodup", "false", "Do not show dupped instructions (collapse disasm)");
 	SETPREF ("asm.emu", "false", "Run ESIL emulation analysis on disasm");
-	SETPREF ("asm.emustack", "false", "Create a temporary fake stack when emulating in disasm (asm.emu)");
-	SETCB ("asm.emustr", "false", &cb_emustr, "Show only strings if any in the asm.emu output");
-	SETPREF ("asm.emuwrite", "false", "Allow asm.emu to modify memory (WARNING)");
-	n = NODECB ("asm.emuskip", "ds", &cb_emuskip);
+	SETPREF ("emu.pre", "false", "Run ESIL emulation starting at the closest flag in pd");
+	SETPREF ("emu.stack", "false", "Create a temporary fake stack when emulating in disasm (asm.emu)");
+	SETCB ("emu.str", "false", &cb_emustr, "Show only strings if any in the asm.emu output");
+	SETPREF ("emu.stroff", "false", "Always show offset when printing asm.emu strings");
+	SETPREF ("emu.strinv", "true", "Color-invert asm.emu strings");
+	SETPREF ("emu.strflag", "true", "Also show flag (if any) for asm.emu string");
+	SETPREF ("emu.write", "false", "Allow asm.emu to modify memory (WARNING)");
+	n = NODECB ("emu.skip", "ds", &cb_emuskip);
 	SETDESC (n, "Skip metadata of given types in asm.emu");
 	SETOPTIONS (n, "d", "c", "s", "f", "m", "h", "C", "r", NULL);
 	SETPREF ("asm.filter", "true", "Replace numeric values by flags (e.g. 0x4003e0 -> sym.imp.printf)");
 	SETPREF ("asm.strip", "", "strip all instructions given comma separated types");
-	SETPREF ("asm.fcnlines", "true", "Show function boundary lines");
+	SETPREF ("asm.lines.fcn", "true", "Show function boundary lines");
 	SETPREF ("asm.flags", "true", "Show flags");
+	SETPREF ("asm.flags.offset", "false", "Show offset in flags");
+	SETPREF ("asm.flags.inbytes", "false",  "Display flags inside the bytes space");
+	n = NODEICB ("asm.flags.middle", 2, &cb_midflags);
+	SETOPTIONS (n, "0 = do not show flag", "1 = show without realign", "2 = realign at middle flag",
+		"3 = realign at middle flag if sym.*", NULL);
+	SETCB ("asm.flags.real", "false", &cb_flag_realnames, "Show flags unfiltered realnames instead of names");
+	SETDESC (n, "Realign disassembly if there is a flag in the middle of an instruction");
 	SETPREF ("asm.lbytes", "true", "Align disasm bytes to left");
 	SETPREF ("asm.lines", "true", "Show ASCII-art lines at disassembly");
+	SETPREF ("asm.lines.bb", "true", "Show flow lines at jumps");
 	SETPREF ("asm.lines.call", "false", "Enable call lines");
 	SETPREF ("asm.lines.ret", "false", "Show separator lines after ret");
-	SETPREF ("asm.linesout", "true", "Show out of block lines");
-	SETPREF ("asm.linesright", "false", "Show lines before opcode instead of offset");
-	SETPREF ("asm.lineswide", "false", "Put a space between lines");
-	SETICB ("asm.lineswidth", 7, &cb_asmlineswidth, "Number of columns for program flow arrows");
-	SETICB ("asm.minvalsub", 0x100, &cb_asmminvalsub, "Minimum value to substitute in instructions (asm.varsub)");
+	SETPREF ("asm.lines.out", "true", "Show out of block lines");
+	SETPREF ("asm.lines.right", "false", "Show lines before opcode instead of offset");
+	SETPREF ("asm.lines.wide", "false", "Put a space between lines");
+	SETICB ("asm.lines.width", 7, &cb_asmlineswidth, "Number of columns for program flow arrows");
+	SETICB ("asm.var.submin", 0x100, &cb_asmvarsubmin, "Minimum value to substitute in instructions (asm.var.sub)");
 	SETPREF ("asm.middle", "false", "Allow disassembling jumps in the middle of an instruction");
 	SETPREF ("asm.noisy", "true", "Show comments considered noisy but possibly useful");
 	SETPREF ("asm.offset", "true", "Show offsets at disassembly");
@@ -2359,19 +2472,19 @@
 	SETPREF ("asm.cyclespace", "false", "Indent instructions depending on CPU-cycles");
 	SETPREF ("asm.cycles", "false", "Show CPU-cycles taken by instruction at disassembly");
 	SETI ("asm.tabs", 0, "Use tabs in disassembly");
-	SETPREF ("asm.tabsonce", "false", "Only tabulate the opcode, not the arguments");
-	SETI ("asm.tabsoff", 0, "tabulate spaces after the offset");
+	SETPREF ("asm.tabs.once", "false", "Only tabulate the opcode, not the arguments");
+	SETI ("asm.tabs.off", 0, "tabulate spaces after the offset");
 	SETPREF ("asm.trace", "false", "Show execution traces for each opcode");
 	SETPREF ("asm.tracespace", "false", "Indent disassembly with trace.count information");
 	SETPREF ("asm.ucase", "false", "Use uppercase syntax at disassembly");
 	SETPREF ("asm.capitalize", "false", "Use camelcase at disassembly");
-	SETPREF ("asm.vars", "true", "Show local function variables in disassembly");
-	SETPREF ("asm.varxs", "false", "Show accesses of local variables");
-	SETPREF ("asm.varsub", "true", "Substitute variables in disassembly");
-	SETPREF ("asm.varsum", "false", "Show variables summary instead of full list in disasm");
-	SETPREF ("asm.varsub_only", "true", "Substitute the entire variable expression with the local variable name (e.g. [local10h] instead of [ebp+local10h])");
+	SETPREF ("asm.var", "true", "Show local function variables in disassembly");
+	SETPREF ("asm.var.access", "false", "Show accesses of local variables");
+	SETPREF ("asm.var.sub", "true", "Substitute variables in disassembly");
+	SETI ("asm.var.summary", 0, "Show variables summary instead of full list in disasm (0, 1, 2)");
+	SETPREF ("asm.var.subonly", "true", "Substitute the entire variable expression with the local variable name (e.g. [local10h] instead of [ebp+local10h])");
 	SETPREF ("asm.relsub", "true", "Substitute pc relative expressions in disasm");
-	SETPREF ("asm.cmtfold", "false", "Fold comments, toggle with Vz");
+	SETPREF ("asm.cmt.fold", "false", "Fold comments, toggle with Vz");
 	SETPREF ("asm.family", "false", "Show family name in disasm");
 	SETPREF ("asm.symbol", "false", "Show symbol+delta instead of absolute offset");
 	SETPREF ("asm.anal", "false", "Analyze code and refs while disassembling (see anal.strings)");
@@ -2392,6 +2505,7 @@
 	SETCB ("asm.parser", "x86.pseudo", &cb_asmparser, "Set the asm parser to use");
 	SETCB ("asm.segoff", "false", &cb_segoff, "Show segmented address in prompt (x86-16)");
 	SETCB ("asm.decoff", "false", &cb_decoff, "Show segmented address in prompt (x86-16)");
+	SETICB ("asm.seggrn", 4, &cb_seggrn, "Segment granularity in bits (x86-16)");
 	n = NODECB ("asm.syntax", "intel", &cb_asmsyntax);
 	SETDESC (n, "Select assembly syntax");
 	SETOPTIONS (n, "att", "intel", "masm", "jz", "regnum", NULL);
@@ -2403,21 +2517,21 @@
 	SETICB ("asm.bits", 32, &cb_asmbits, "Word size in bits at assembler");
 #endif
 	SETPREF ("asm.functions", "true", "Show functions in disassembly");
-	SETPREF ("asm.fcncalls", "true", "Show functions calls");
 	SETPREF ("asm.xrefs", "true", "Show xrefs in disassembly");
 	SETPREF ("asm.demangle", "true", "Show demangled symbols in disasm");
 	SETPREF ("asm.describe", "false", "Show opcode description");
 	SETPREF ("asm.hints", "false", "Show hints for magic numbers in disasm");
+	SETPREF ("asm.highlight", "", "Highlight current line");
 	SETPREF ("asm.marks", "true", "Show marks before the disassembly");
-	SETPREF ("asm.cmtrefs", "false", "Show flag and comments from refs in disasm");
-	SETPREF ("asm.cmtpatch", "false", "Show patch comments in disasm");
-	SETPREF ("asm.cmtoff", "nodup", "Show offset comment in disasm (true, false, nodup)");
+	SETPREF ("asm.cmt.refs", "false", "Show flag and comments from refs in disasm");
+	SETPREF ("asm.cmt.patch", "false", "Show patch comments in disasm");
+	SETPREF ("asm.cmt.off", "nodup", "Show offset comment in disasm (true, false, nodup)");
 	SETPREF ("asm.payloads", "false", "Show payload bytes in disasm");
-	SETPREF ("asm.asciidot", "false", "Enable a char filter for string comments that passes through chars in the "
-		 "range 0x20-0x7e and turns the rest into dots (except some control chars)");
 	n = NODECB ("asm.strenc", "guess", &cb_asmstrenc);
 	SETDESC (n, "Assumed string encoding for disasm");
 	SETOPTIONS (n, "latin1", "utf8", "utf16le", "utf32le", "guess", NULL);
+
+	/* bin */
 	SETCB ("bin.usextr", "true", &cb_usextr, "Use extract plugins when loading files");
 	SETCB ("bin.useldr", "true", &cb_useldr, "Use loader plugins when loading files");
 	SETCB ("bin.strpurge", "", &cb_strpurge, "Purge strings (e bin.strpurge=? provides more detail)");
@@ -2431,8 +2545,6 @@
 	SETPREF ("bin.lang", "", "Language for bin.demangle");
 	SETPREF ("bin.demangle", "true", "Import demangled symbols from RBin");
 	SETCB ("bin.demanglecmd", "false", &cb_bdc, "run xcrun swift-demangle and similar if available (SLOW)");
-
-	/* bin */
 	SETI ("bin.baddr", -1, "Base address of the binary");
 	SETI ("bin.laddr", 0, "Base address for loading library ('*.so')");
 	SETCB ("bin.dbginfo", "true", &cb_bindbginfo, "Load debug information at startup if available");
@@ -2490,7 +2602,7 @@
 	SETPREF ("zign.bytes", "true", "Use bytes patterns for matching");
 	SETPREF ("zign.offset", "true", "Use original offset for matching");
 	SETPREF ("zign.refs", "true", "Use references for matching");
-	SETPREF ("zign.autoload", "false", "Autoload all zignatures located in ~/.config/radare2/zigns");
+	SETPREF ("zign.autoload", "false", "Autoload all zignatures located in " R_JOIN_2_PATHS ("~", R2_HOME_ZIGNS));
 
 	/* diff */
 	SETCB ("diff.sort", "addr", &cb_diff_sort, "Specify function diff sorting column see (e diff.sort=?)");
@@ -2500,27 +2612,24 @@
 	SETPREF ("diff.levenstein", "false", "Use faster (and buggy) levenstein algorithm for buffer distance diffing");
 
 	/* dir */
+	SETI ("dir.depth", 10,  "Maximum depth when searching recursively for files");
 	SETCB ("dir.dbgsnap", ".", &cb_dbgsnap, "Path to session dump files");
 	{
-		char *path = r_str_newf ("%s/" R_MAGIC_PATH, r_config_get (core->config, "dir.prefix"));
+		char *path = r_str_newf (R_JOIN_2_PATHS ("%s", R2_SDB_MAGIC), r_config_get (core->config, "dir.prefix"));
 		SETPREF ("dir.magic", path, "Path to r_magic files");
 		free (path);
+		path = r_str_newf (R_JOIN_2_PATHS ("%s", R2_PLUGINS), r_config_get (core->config, "dir.prefix"));
+		SETPREF ("dir.plugins", path, "Path to plugin files to be loaded at startup");
+		free (path);
 	}
-#if __WINDOWS__
-	SETPREF ("dir.plugins", "plugins", "Path to plugin files to be loaded at startup");
-#else
-	SETPREF ("dir.plugins", R2_LIBDIR"/radare2/"R2_VERSION"/", "Path to plugin files to be loaded at startup");
-#endif
 	SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files");
 	SETPREF ("dir.types", "/usr/include", "Default path to look for cparse type files");
 #if __ANDROID__
 	SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects");
-#elif __WINDOWS__
-	SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
 #else
-	SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
+	SETPREF ("dir.projects", R_JOIN_2_PATHS ("~", R2_HOME_PROJECTS), "Default path for projects");
 #endif
-	SETCB ("dir.zigns", "~/"R2_HOMEDIR"/zigns", &cb_dirzigns, "Default path for zignatures (see zo command)");
+	SETCB ("dir.zigns", R_JOIN_2_PATHS ("~", R2_HOME_ZIGNS), &cb_dirzigns, "Default path for zignatures (see zo command)");
 	SETPREF ("stack.bytes", "true", "Show bytes instead of words in stack");
 	SETPREF ("stack.anotated", "false", "Show anotated hexdump in visual debug");
 	SETI ("stack.size", 64,  "Size in bytes of stack hexdump in visual debug");
@@ -2530,12 +2639,13 @@
 	SETI ("dbg.hwbp", 0, "Set HW or SW breakpoints");
 	SETCB ("dbg.unlibs", "", &cb_dbg_unlibs, "If set stop when unloading matching libname");
 	SETPREF ("dbg.slow", "false", "Show stack and regs in visual mode in a slow but verbose mode");
+	SETPREF ("dbg.funcarg", "false", "Display arguments to function call in visual mode");
 
 	SETPREF ("dbg.bpinmaps", "true", "Force breakpoints to be inside a valid map");
 	SETCB ("dbg.forks", "false", &cb_dbg_forks, "Stop execution if fork() is done (see dbg.threads)");
 	n = NODECB ("dbg.btalgo", "fuzzy", &cb_dbg_btalgo);
 	SETDESC (n, "Select backtrace algorithm");
-	SETOPTIONS (n, "default", "fuzzy", "anal", NULL);
+	SETOPTIONS (n, "default", "fuzzy", "anal", "trace", NULL);
 	SETCB ("dbg.threads", "false", &cb_stopthreads, "Stop all threads when debugger breaks (see dbg.forks)");
 	SETCB ("dbg.clone", "false", &cb_dbg_clone, "Stop execution if new thread is created");
 	SETCB ("dbg.aftersyscall", "true", &cb_dbg_aftersc, "Stop execution before the syscall is executed (see dcs)");
@@ -2581,30 +2691,8 @@
 	SETCB ("dbg.trace", "false", &cb_trace, "Trace program execution (see asm.trace)");
 	SETICB ("dbg.trace.tag", 0, &cb_tracetag, "Trace tag");
 
+
 	/* cmd */
-	char *xdotPath = r_file_path ("xdot");
-	if (r_file_exists (xdotPath)) {
-		r_config_set (cfg, "cmd.graph", "ag $$ > a.dot;!xdot a.dot");
-	} else {
-		char *dotPath = r_file_path ("dot");
-		if (r_file_exists (dotPath)) {
-			R_FREE (dotPath);
-			char *viewer = getViewerPath();
-			if (viewer) {
-				char *cmd = r_str_newf ("ag $$>a.dot;!dot -Tgif -oa.gif a.dot;!%s a.gif", viewer);
-				r_config_set (cfg, "cmd.graph", cmd);
-				free (viewer);
-				free (cmd);
-			} else {
-				r_config_set (cfg, "cmd.graph", "?e cannot find a valid picture viewer");
-			}
-		} else {
-			r_config_set (cfg, "cmd.graph", "agf");
-		}
-		free (dotPath);
-	}
-	free (xdotPath);
-	r_config_desc (cfg, "cmd.graph", "Command executed by 'agv' command to view graphs");
 	SETPREF ("cmd.xterm", "xterm -bg black -fg gray -e", "xterm command to spawn with V@");
 	SETICB ("cmd.depth", 10, &cb_cmddepth, "Maximum command depth");
 	SETPREF ("cmd.bp", "", "Run when a breakpoint is hit");
@@ -2615,6 +2703,7 @@
 	SETPREF ("cmd.gprompt", "", "Graph visual prompt commands");
 	SETPREF ("cmd.hit", "", "Run when a search hit is found");
 	SETPREF ("cmd.open", "", "Run when file is opened");
+	SETCB ("cmd.pdc", "", &cb_cmdpdc, "Select pseudo-decompiler command to run after pdc");
 	SETCB ("cmd.log", "", &cb_cmdlog, "Every time a new T log is added run this command");
 	SETPREF ("cmd.prompt", "", "Prompt commands");
 	SETCB ("cmd.repeat", "false", &cb_cmdrepeat, "Empty command an alias for '..' (repeat last command)");
@@ -2673,11 +2762,9 @@
 #endif
 	SETI ("http.maxsize", 0, "Maximum file size for upload");
 	SETPREF ("http.bind", "localhost", "Server address");
-	SETPREF ("http.homeroot", "~/.config/radare2/www", "http home root directory");
+	SETPREF ("http.homeroot", R_JOIN_2_PATHS ("~", R2_HOME_WWWROOT), "http home root directory");
 #if __ANDROID__
 	SETPREF ("http.root", "/data/data/org.radare.radare2installer/www", "http root directory");
-#elif __WINDOWS__
-	SETPREF ("http.root", "www", "http root directory");
 #else
 	SETPREF ("http.root", R2_WWWROOT, "http root directory");
 #endif
@@ -2696,10 +2783,13 @@
 	free (tmpdir);
 	r_config_desc (cfg, "http.uproot", "Path where files are uploaded");
 
+	/* tcp */
+	SETPREF ("tcp.islocal", "false", "Bind a loopback for tcp command server");
+
 	/* graph */
 	SETPREF ("graph.comments", "true", "Show disasm comments in graph");
 	SETPREF ("graph.cmtright", "false", "Show comments at right");
-	SETPREF ("graph.format", "dot", "Specify output format for graphs (dot, gml, gmlfcn)");
+	SETCB ("graph.gv.format", "gif", &cb_graphformat, "Graph image extension when using 'w' format (png, jpg, pdf, ps, svg, json)");
 	SETPREF ("graph.refs", "false", "Graph references in callgraphs (.agc*;aggi)");
 	SETI ("graph.edges", 2, "0=no edges, 1=simple edges, 2=avoid collisions");
 	SETI ("graph.layout", 0, "Graph layout (0=vertical, 1=horizontal)");
@@ -2707,8 +2797,8 @@
 	SETPREF ("graph.font", "Courier", "Font for dot graphs");
 	SETPREF ("graph.offset", "false", "Show offsets in graphs");
 	SETPREF ("graph.web", "false", "Display graph in web browser (VV)");
-	SETI ("graph.from", UT64_MAX, "");
-	SETI ("graph.to", UT64_MAX, "");
+	SETI ("graph.from", UT64_MAX, "Lower bound address when drawing global graphs");
+	SETI ("graph.to", UT64_MAX, "Upper bound address when drawing global graphs");
 	SETI ("graph.scroll", 5, "Scroll speed in ascii-art graph");
 	SETPREF ("graph.invscroll", "false", "Invert scroll direction in ascii-art graph");
 	SETPREF ("graph.title", "", "Title of the graph");
@@ -2718,6 +2808,9 @@
 	SETPREF ("graph.gv.graph", "", "Graphviz global style attributes. (bgcolor=white)");
 	SETPREF ("graph.gv.current", "false", "Highlight the current node in graphviz graph.");
 	SETPREF ("graph.nodejmps", "true", "Enables shortcuts for every node.");
+	SETPREF ("graph.hints", "true", "Show true (t) and false (f) hints for conditional edges in graph");
+	SETCB ("graph.dotted", "false", &cb_dotted, "Dotted lines for conditional jumps in graph");
+
 	/* hud */
 	SETPREF ("hud.path", "", "Set a custom path for the HUD file");
 
@@ -2741,10 +2834,12 @@
 	SETCB ("scr.flush", "false", &cb_scrflush, "Force flush to console in realtime (breaks scripting)");
 	/* TODO: rename to asm.color.ops ? */
 	SETPREF ("scr.zoneflags", "true", "Show zoneflags in visual mode before the title (see fz?)");
+	SETPREF ("scr.slow", "true", "Do slow stuff on visual mode like RFlag.get_at(true)");
 	SETPREF ("scr.color.ops", "true", "Colorize numbers and registers in opcodes");
+	SETPREF ("scr.color.args", "true", "Colorize arguments and variables of functions");
 	SETPREF ("scr.color.bytes", "true", "Colorize bytes that represent the opcodes of the instruction");
 #if __WINDOWS__ && !__CYGWIN__
-	SETCB ("scr.ansicon", r_str_bool (r_cons_singleton()->ansicon),
+	SETCB ("scr.ansicon", r_str_bool (r_cons_singleton ()->ansicon),
 		&scr_ansicon, "Use ANSICON mode or not on Windows");
 #endif
 #if __ANDROID__
@@ -2752,10 +2847,10 @@
 #else
 	SETPREF ("scr.responsive", "false", "Auto-adjust Visual depending on screen (e.g. unset asm.bytes)");
 #endif
-	SETPREF ("scr.wheelnkey", "false", "Use sn/sp and scr.nkey on wheel instead of scroll");
+	SETPREF ("scr.wheel.nkey", "false", "Use sn/sp and scr.nkey on wheel instead of scroll");
 	SETPREF ("scr.wheel", "true", "Mouse wheel in Visual; temporaryly disable/reenable by right click/Enter)");
 	SETPREF ("scr.atport", "false", "V@ starts a background http server and spawns an r2 -C");
-	SETI ("scr.wheelspeed", 4, "Mouse wheel speed");
+	SETI ("scr.wheel.speed", 4, "Mouse wheel speed");
 	// DEPRECATED: USES hex.cols now SETI ("scr.colpos", 80, "Column position of cmd.cprompt in visual");
 	SETCB ("scr.breakword", "", &cb_scrbreakword, "Emulate console break (^C) when a word is printed (useful for pD)");
 	SETCB ("scr.breaklines", "false", &cb_breaklines, "Break lines in Visual instead of truncating them");
@@ -2776,29 +2871,25 @@
 	SETPREF ("scr.randpal", "false", "Random color palete or just get the next one from 'eco'");
 	SETCB ("scr.color.grep", "false", &cb_scr_color_grep, "Enable colors when using ~grep");
 	SETPREF ("scr.pipecolor", "false", "Enable colors when using pipes");
-	SETPREF ("scr.promptfile", "false", "Show user prompt file (used by r2 -q)");
-	SETPREF ("scr.promptflag", "false", "Show flag name in the prompt");
-	SETPREF ("scr.promptsect", "false", "Show section name in the prompt");
+	SETPREF ("scr.prompt.file", "false", "Show user prompt file (used by r2 -q)");
+	SETPREF ("scr.prompt.flag", "false", "Show flag name in the prompt");
+	SETPREF ("scr.prompt.sect", "false", "Show section name in the prompt");
 	SETPREF ("scr.tts", "false", "Use tts if available by a command (see ic)");
 	SETCB ("scr.prompt", "true", &cb_scrprompt, "Show user prompt (used by r2 -q)");
 	SETCB ("scr.tee", "", &cb_teefile, "Pipe output to file of this name");
 	SETPREF ("scr.seek", "", "Seek to the specified address on startup");
-#if __WINDOWS__ && !__CYGWIN__
-	r_config_set_cb (cfg, "scr.rgbcolor", "false", &cb_rgbcolors);
-#else
-	r_config_set_cb (cfg, "scr.rgbcolor", "true", &cb_rgbcolors);
-#endif
-	r_config_desc (cfg, "scr.rgbcolor", "Use RGB colors (not available on Windows)");
-	SETCB ("scr.truecolor", "false", &cb_truecolor, "Manage color palette (0: ansi 16, 1: 256, 2: 16M)");
-	SETCB ("scr.color", (core->print->flags&R_PRINT_FLAGS_COLOR)?"true":"false", &cb_color, "Enable colors");
+	SETICB ("scr.color", (core->print->flags&R_PRINT_FLAGS_COLOR)?COLOR_MODE_16:COLOR_MODE_DISABLED, &cb_color, "Enable colors (0: none, 1: ansi, 2: 256 colors, 3: truecolor)");
 	SETCB ("scr.null", "false", &cb_scrnull, "Show no output");
 	SETCB ("scr.utf8", r_cons_is_utf8()?"true":"false",
 		&cb_utf8, "Show UTF-8 characters instead of ANSI");
 	SETCB ("scr.utf8.curvy", "false", &cb_utf8_curvy, "Show curved UTF-8 corners (requires scr.utf8)");
 	SETPREF ("scr.histsave", "true", "Always save history on exit");
+	n = NODECB ("scr.strconv", "asciiesc", &cb_scrstrconv);
+	SETDESC (n, "Convert string before display");
+	SETOPTIONS (n, "asciiesc", "asciidot", NULL);
 
 	/* str */
-	SETCB ("str.escbslash", "false", &cb_str_escbslash, "Escape the backslash (iz and Cs-based output only)");
+	SETCB ("str.escbslash", "false", &cb_str_escbslash, "Escape the backslash");
 
 	/* search */
 	SETCB ("search.contiguous", "true", &cb_contiguous, "Accept contiguous/adjacent search hits");
@@ -2824,7 +2915,8 @@
 
 	/* rop */
 	SETI ("rop.len", 5, "Maximum ROP gadget length");
-	SETPREF ("rop.db", "true", "Store rop search results in sdb");
+	SETPREF ("rop.sdb", "false", "Cache results in sdb (experimental)");
+	SETPREF ("rop.db", "true", "Categorize rop gadgets in sdb");
 	SETPREF ("rop.subchains", "false", "Display every length gadget from rop.len=X to 2 in /Rl");
 	SETPREF ("rop.conditional", "false", "Include conditional jump, calls and returns in ropsearch");
 	SETPREF ("rop.nx", "false", "Include NX/XN/XD sections in ropsearch");
@@ -2846,6 +2938,7 @@
 	SETICB ("io.0xff", 0xff, &cb_io_oxff, "Use this value instead of 0xff to fill unallocated areas");
 	SETCB ("io.aslr", "false", &cb_ioaslr, "Disable ASLR for spawn and such");
 	SETCB ("io.va", "true", &cb_iova, "Use virtual address layout");
+	SETCB ("io.pava", "false", &cb_io_pava, "Use EXPERIMENTAL paddr -> vaddr address mode");
 	SETCB ("io.autofd", "true", &cb_ioautofd, "Change fd when opening a new file");
 
 	/* file */
diff -Nru radare2-2.3.0+dfsg/libr/core/cio.c radare2-2.8.0+dfsg/libr/core/cio.c
--- radare2-2.3.0+dfsg/libr/core/cio.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cio.c	2018-08-07 14:12:36.000000000 +0000
@@ -269,14 +269,14 @@
 R_API void r_core_seek_archbits(RCore *core, ut64 addr) {
 	int bits = 0;
 	const char *arch = r_io_section_get_archbits (core->io, addr, &bits);
-	if (!bits) {
+	if (!bits && !core->fixedbits) {
 		//if we found bits related with anal hints pick it up
 		choose_bits_anal_hints (core, addr, &bits);
 	}
-	if (bits) {
+	if (bits && !core->fixedbits) {
 		r_config_set_i (core->config, "asm.bits", bits);
 	}
-	if (arch) {
+	if (arch && !core->fixedarch) {
 		r_config_set (core->config, "asm.arch", arch);
 	}
 }
@@ -321,7 +321,7 @@
 		return false;
 	}
 	ret = r_io_write_at (core->io, addr, buf, size);
-	if (addr >= core->offset && addr <= core->offset + core->blocksize) {
+	if (addr >= core->offset && addr <= core->offset + core->blocksize - 1) {
 		r_core_block_read (core);
 	}
 	return ret;
@@ -414,13 +414,6 @@
 	return -1;
 }
 
-R_API bool r_core_read_at(RCore *core, ut64 addr, ut8 *buf, int size) {
-	if (core) {
-		return r_io_read_at (core->io, addr, buf, size);
-	}
-	return false;
-}
-
 R_API int r_core_is_valid_offset (RCore *core, ut64 offset) {
 	if (!core) {
 		eprintf ("r_core_is_valid_offset: core is NULL\n");
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_anal.c radare2-2.8.0+dfsg/libr/core/cmd_anal.c
--- radare2-2.3.0+dfsg/libr/core/cmd_anal.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_anal.c	2018-08-07 14:12:36.000000000 +0000
@@ -3,23 +3,23 @@
 #include "r_util.h"
 #include "r_core.h"
 
-/* hacky inclusion */
-#include "anal_vt.c"
-
 static const char *help_msg_a[] = {
 	"Usage:", "a", "[abdefFghoprxstc] [...]",
 	"aa", "[?]", "analyze all (fcns + bbs) (aa0 to avoid sub renaming)",
-	"ab", " [hexpairs]", "analyze bytes",
+	"a8", " [hexpairs]", "analyze bytes",
+	"ab", "[b] [addr]", "analyze block at given address",
 	"abb", " [len]", "analyze N basic blocks in [len] (section.size by default)",
+	"abt", " [addr]", "find paths in the bb function graph from current offset to given address",
 	"ac", " [cycles]", "analyze which op could be executed in [cycles]",
 	"ad", "[?]", "analyze data trampoline (wip)",
 	"ad", " [from] [to]", "analyze data pointers to (from-to)",
 	"ae", "[?] [expr]", "analyze opcode eval expression (see ao)",
 	"af", "[?]", "analyze Functions",
 	"aF", "", "same as above, but using anal.depth=1",
-	"ag", "[?] [options]", "output Graphviz code",
+	"ag", "[?] [options]", "draw graphs in various formats",
 	"ah", "[?]", "analysis hints (force opcode size, ...)",
 	"ai", " [addr]", "address information (show perms, stack, heap, ...)",
+	"aL", "", "list all asm/anal plugins (e asm.arch=?)",
 	"an"," [name] [@addr]","show/rename/create whatever flag/function is used at addr",
 	"ao", "[?] [len]", "analyze Opcodes (or emulate it)",
 	"aO", "[?] [len]", "Analyze N instructions in M bytes",
@@ -42,6 +42,7 @@
 	"aad", " [len]", "analyze data references to code",
 	"aae", " [len] ([addr])", "analyze references with ESIL (optionally to address)",
 	"aaE", "", "run aef on all functions (same as aef @@f)",
+	"aaf", " ", "analyze all functions (e anal.hasnext=1;afr @@c:isq)",
 	"aai", "[j]", "show info of all analysis parameters",
 	"aan", "", "autoname functions that either start with fcn.* or sym.func.*",
 	"aap", "", "find and analyze function preludes",
@@ -64,9 +65,10 @@
 
 static const char *help_msg_ab[] = {
 	"Usage:", "ab", "",
-	"ab", " [hexpair-bytes]", "analyze N bytes",
-	"abj", " [hexpair-bytes]", "analyze N bytes (display in JSON)",
+	"ab", " [addr]", "show basic block information at given address",
 	"abb", " [length]", "analyze N bytes and extract basic blocks",
+	"abj", " [addr]", "display basic block information in JSON (alias to afbj)",
+	"abx", " [hexpair-bytes]", "analyze N bytes",
 	NULL
 };
 
@@ -89,7 +91,8 @@
 	"ae??", "", "show ESIL help",
 	"ae[aA]", "[f] [count]", "analyse esil accesses (regs, mem..)",
 	"aec", "[?]", "continue until ^C",
-	"aecs", " [sn]", "continue until syscall number",
+	"aecs", "", "continue until syscall",
+	"aecc", "", "continue until call",
 	"aecu", " [addr]", "continue until address",
 	"aecue", " [esil]", "continue until esil expression match",
 	"aef", " [addr]", "emulate function",
@@ -115,17 +118,17 @@
 
 static const char *help_detail_ae[] = {
 	"Examples:", "ESIL", " examples and documentation",
-	"+", "=", "A+=B => B,A,+=",
+	"+=", "", "A+=B => B,A,+=",
 	"+", "", "A=A+B => B,A,+,A,=",
 	"++", "", "increment, 2,A,++ == 3 (see rsi,--=[1], ... )",
 	"--", "", "decrement, 2,A,-- == 1",
-	"*", "=", "A*=B => B,A,*=",
-	"/", "=", "A/=B => B,A,/=",
-	"%", "=", "A%=B => B,A,%=",
-	"&", "=", "and ax, bx => bx,ax,&=",
+	"*=", "", "A*=B => B,A,*=",
+	"/=", "", "A/=B => B,A,/=",
+	"%=", "", "A%=B => B,A,%=",
+	"&=", "", "and ax, bx => bx,ax,&=",
 	"|", "", "or r0, r1, r2 => r2,r1,|,r0,=",
-	"!", "=", "negate all bits",
-	"^", "=", "xor ax, bx => bx,ax,^=",
+	"!=", "", "negate all bits",
+	"^=", "", "xor ax, bx => bx,ax,^=",
 	"", "[]", "mov eax,[eax] => eax,[],eax,=",
 	"=", "[]", "mov [eax+3], 1 => 1,3,eax,+,=[]",
 	"=", "[1]", "mov byte[eax],1 => 1,eax,=[1]",
@@ -137,13 +140,13 @@
 	"$$", "", "simulate a hardware trap",
 	"==", "", "pops twice, compare and update esil flags",
 	"<", "", "compare for smaller",
-	"<", "=", "compare for smaller or equal",
+	"<=", "", "compare for smaller or equal",
 	">", "", "compare for bigger",
-	">", "=", "compare bigger for or equal",
-	">>", "=", "shr ax, bx => bx,ax,>>=  # shift right",
-	"<<", "=", "shl ax, bx => bx,ax,<<=  # shift left",
-	">>>", "=", "ror ax, bx => bx,ax,>>>=  # rotate right",
-	"<<<", "=", "rol ax, bx => bx,ax,<<<=  # rotate left",
+	">=", "", "compare bigger for or equal",
+	">>=", "", "shr ax, bx => bx,ax,>>=  # shift right",
+	"<<=", "", "shl ax, bx => bx,ax,<<=  # shift left",
+	">>>=", "", "ror ax, bx => bx,ax,>>>=  # rotate right",
+	"<<<=", "", "rol ax, bx => bx,ax,<<<=  # rotate left",
 	"?{", "", "if popped value != 0 run the block until }",
 	"POP", "", "drops last element in the esil stack",
 	"DUP", "", "duplicate last value in stack",
@@ -164,7 +167,7 @@
 
 static const char *help_msg_aea[] = {
 	"Examples:", "aea", " show regs used in a range",
-	"aea", " [ops]", "Show regs used in N instructions",
+	"aea", " [ops]", "Show regs used in N instructions (all,read,{no,}written,memreads,memwrites)",
 	"aea*", " [ops]", "Create mem.* flags for memory accesses",
 	"aeaf", "", "Show regs used in current function",
 	"aear", " [ops]", "Show regs read in N instructions",
@@ -179,6 +182,7 @@
 	"Examples:", "aec", " continue until ^c",
 	"aec", "", "Continue until exception",
 	"aecs", "", "Continue until syscall",
+	"aecc", "", "Continue until call",
 	"aecu", "[addr]", "Continue until address",
 	"aecue", "[addr]", "Continue until esil expression",
 	NULL
@@ -212,21 +216,21 @@
 	"afC[lc]", " ([addr])@[addr]", "calculate the Cycles (afC) or Cyclomatic Complexity (afCc)",
 	"afc", "[?] type @[addr]", "set calling convention for function",
 	"afd", "[addr]","show function + delta for given offset",
-	"aft", "[?]", "type matching, type propagation",
 	"aff", "", "re-adjust function boundaries to fit",
 	"afF", "[1|0|]", "fold/unfold/toggle",
 	"afi", " [addr|fcn.name]", "show function(s) information (verbose afl)",
-	"afl", "[?] [l*] [fcn name]", "list functions (addr, size, bbs, name) (see afll)",
-	"afo", " [fcn.name]", "show address for the function named like this",
+	"afl", "[?] [ls*] [fcn name]", "list functions (addr, size, bbs, name) (see afll)",
 	"afm", " name", "merge two functions",
 	"afM", " name", "print functions map",
 	"afn", "[?] name [addr]", "rename name for function at address (change flag too)",
 	"afna", "", "suggest automatic name for current offset",
+	"afo", " [fcn.name]", "show address for the function named like this",
 	"afs", " [addr] [fcnsign]", "get/set function signature at current address",
 	"afS", "[stack_size]", "set stack frame size for function at current address",
+	"aft", "[?]", "type matching, type propagation",
 	"afu", " [addr]", "resize and analyze function from current address until addr",
 	"afv[bsra]", "?", "manipulate args, registers and variables in function",
-	"afx", "[cCd-] src dst", "add/remove code/Call/data/string reference",
+	"afx", "", "list function references",
 	NULL
 };
 
@@ -239,7 +243,7 @@
 	"afb+", " fcn_at bbat bbsz [jump] [fail] ([type] ([diff]))", "add basic block by hand",
 	"afbr", "", "Show addresses of instructions which leave the function",
 	"afbi", "", "print current basic block information",
-	"afbj", "", "show basic blocks information in json",
+	"afbj", " [addr]", "show basic blocks information in json",
 	"afbe", " bbfrom bbto", "add basic-block edge for switch-cases",
 	"afB", " [bits]", "define asm.bits for the given function",
 	NULL
@@ -251,6 +255,7 @@
 	"afc", "", "Show Calling convention for the Current function",
 	"afcr", "[j]", "Show register usage for the current function",
 	"afca", "", "Analyse function for finding the current calling convention",
+	"afcf", " name", "Prints return type function(arg1, arg2...)",
 	"afcl", "", "List all available calling conventions",
 	"afco", " path", "Open Calling Convention sdb profile from given path",
 	NULL
@@ -277,12 +282,14 @@
 static const char *help_msg_afl[] = {
 	"Usage:", "afl", " List all functions",
 	"afl", "", "list functions",
+	"afl+", "", "display sum all function sizes",
 	"aflc", "", "count of functions",
 	"aflj", "", "list functions in json",
 	"afll", "", "list functions in verbose mode",
+	"afllj", "", "list functions in verbose mode (alias to aflj)",
 	"aflq", "", "list functions in quiet mode",
 	"aflqj", "", "list functions in json quiet mode",
-	"afls", "", "print sum of sizes of all functions",
+	"afls", "", "sort function list by address",
 	NULL
 };
 
@@ -318,9 +325,9 @@
 };
 
 static const char *help_msg_aft[] = {
-	"Usage:", "aftm", "",
-	"afta", "", "Setup memory and analyse do type matching analysis for all functions",
-	"aftm", "", "type matching analysis",
+	"Usage:", "aft[a|m]", "",
+	"afta", "", "setup memory and analyse do type matching analysis for all functions",
+	"aftm", "", "type matching analysis for current function",
 	NULL
 };
 
@@ -329,8 +336,9 @@
 	"afvr", "[?]", "manipulate register based arguments",
 	"afvb", "[?]", "manipulate bp based arguments/locals",
 	"afvs", "[?]", "manipulate sp based arguments/locals",
-	"afvR", " [varname]", "list addresses where vars are accessed",
-	"afvW", " [varname]", "list addresses where vars are accessed",
+	"afv*", "", "output r2 command to add args/locals to flagspace",
+	"afvR", " [varname]", "list addresses where vars are accessed (READ)",
+	"afvW", " [varname]", "list addresses where vars are accessed (WRITE)",
 	"afva", "", "analyze function arguments/locals",
 	"afvd", " name", "output r2 command for displaying the value of args/locals in the debugger",
 	"afvn", " [old_name] [new_name]", "rename argument/local",
@@ -375,35 +383,34 @@
 	NULL
 };
 
-static const char *help_msg_afx[] = {
-	"Usage:", "afx[-cCd?] [src] [dst]", " manage function references (see also ar?)",
-	"afxc", " sym.main+0x38 sym.printf", "add code ref",
-	"afxC", " sym.main sym.puts", "add call ref",
-	"afxd", " sym.main str.helloworld", "add data ref",
-	"afx-", " sym.main str.helloworld", "remove reference",
-	NULL
-};
-
 static const char *help_msg_ag[] = {
-	"Usage:", "ag[?f]", " Graphviz/graph code",
-	"ag", " [addr]", "output graphviz code (bb at addr and children)",
-	"ag-", "", "Reset the current ASCII art graph (see agn, age, agg?)",
-	"aga", " [addr]", "idem, but only addresses",
-	"agr", "[j] [addr]", "output graphviz call graph of function",
-	"agg", "", "display current graph created with agn and age (see also ag-)",
-	"agc", "[*j] [addr]", "output graphviz call graph of function",
-	"agC", "[j]", "Same as agc -1. full program callgraph",
-	"agd", " [fcn name]", "output graphviz code of diffed function",
-	"age", "[?] title1 title2", "Add an edge to the current graph",
-	"agf", " [addr]", "Show ASCII art graph of given function",
-	"agg", "[?] [kdi*]", "Print graph in ASCII-Art, graphviz, k=v, r2 or visual",
-	"agj", " [addr]", "idem, but in JSON format",
-	"agk", " [addr]", "idem, but in SDB key-value format",
-	"agl", " [fcn name]", "output graphviz code using meta-data",
-	"agn", "[?] title body", "Add a node to the current graph",
-	"ags", " [addr]", "output simple graphviz call graph of function (only bb offset)",
-	"agt", " [addr]", "find paths from current offset to given address",
-	"agv", "", "Show function graph in web/png (see graph.web and cmd.graph) or agf for asciiart",
+	"Usage:", "ag<graphtype><format> [addr]", "",
+	"Graph commands:", "", "",
+	"aga", "[format]", "Data references graph",
+	"agA", "[format]", "Global data references graph",
+	"agc", "[format]", "Function callgraph",
+	"agC", "[format]", "Global callgraph",
+	"agd", "[format] [fcn addr]", "Diff graph",
+	"agf", "[format]", "Basic blocks function graph",
+	"agi", "[format]", "Imports graph",
+	"agr", "[format]", "References graph",
+	"agR", "[format]", "Global references graph",
+	"agx", "[format]", "Cross references graph",
+	"agg", "[format]", "Custom graph",
+	"ag-", "", "Clear the custom graph",
+	"agn", "[?] title body", "Add a node to the custom graph",
+	"age", "[?] title1 title2", "Add an edge to the custom graph",
+	"","","",
+	"Output formats:", "", "",
+	"<blank>", "", "Ascii art",
+	"*", "", "r2 commands",
+	"d", "", "Graphviz dot",
+	"g", "", "Graph Modelling Language (gml)",
+	"j", "", "json ('J' for formatted disassembly)",
+	"k", "", "SDB key-value",
+	"t", "", "Tiny ascii art",
+	"v", "", "Interactive ascii art",
+	"w", " [path]", "Write to path or display graph image (see graph.gv.format and graph.web)",
 	NULL
 };
 
@@ -417,17 +424,6 @@
 	NULL
 };
 
-static const char *help_msg_agg[] = {
-	"Usage:", "agg[kid?*]", "print graph",
-	"agg", "", "show current graph in ascii art",
-	"aggk", "", "show graph in key=value form",
-	"aggi", "", "enter interactive mode for the current graph",
-	"aggd", "", "print the current graph in GRAPHVIZ dot format",
-	"aggv", "", "run graphviz + viewer (see 'e cmd.graph')",
-	"agg*", "", "in r2 commands, to save in projects, etc",
-	NULL
-};
-
 static const char *help_msg_agn[] = {
 	"Usage:", "agn [title] [body]", "",
 	"Examples:", "", "",
@@ -458,6 +454,7 @@
 	"ahj", "", "list hints in JSON",
 	"aho", " foo a0,33", "replace opcode string",
 	"ahp", " addr", "set pointer hint",
+	"ahr", " val",  "set hint for return value of a function",
 	"ahs", " 4", "set opcode size=4",
 	"ahS", " jz", "set asm.syntax=jz for this opcode",
 	NULL
@@ -482,7 +479,9 @@
 	"aoj", " N", "display opcode analysis information in JSON for N opcodes",
 	"aoe", " N", "display esil form for N opcodes",
 	"aor", " N", "display reil form for N opcodes",
-	"aos", " [esil]", "show sdb representation of esil expression (TODO)",
+	"aos", " N", "display size of N opcodes",
+	"aod", "[mnemonic]", "describe opcode for asm.arch",
+	"aoda", "", "show all mnemonic descriptions",
 	"ao", " 5", "display opcode analysis of 5 opcodes",
 	"ao*", "", "display opcode in r commands",
 	NULL
@@ -499,7 +498,8 @@
 	"ar", " <type>", "Show all registers of given type",
 	"arC", "", "Display register profile comments",
 	"arr", "", "Show register references (telescoping)",
-	"ar=", "", "Show register values in columns",
+	"arrj", "", "Show register references (telescoping) in JSON format",
+	"ar=", "([size])(:[regs])", "Show register values in columns",
 	"ar?", " <reg>", "Show register value",
 	"arb", " <type>", "Display hexdump of the given arena",
 	"arc", " <name>", "Conditional flag registers",
@@ -544,22 +544,34 @@
 	NULL
 };
 
+static const char *help_msg_av[] = {
+	"Usage:", "av[?jr*]", " C++ vtables and RTTI",
+	"av", "", "search for vtables in data sections and show results",
+	"avj", "", "like av, but as json",
+	"av*", "", "like av, but as r2 commands",
+	"avr", "[j@addr]", "try to parse RTTI at vtable addr (see anal.cpp.abi)",
+	"avra", "[j]", "search for vtables and try to parse RTTI at each of them",
+	NULL
+};
+
 static const char *help_msg_ax[] = {
 	"Usage:", "ax[?d-l*]", " # see also 'afx?'",
 	"ax", "", "list refs",
+	"ax*", "", "output radare commands",
 	"ax", " addr [at]", "add code ref pointing to addr (from curseek)",
-	"ax-", " [at]", "clean all refs (or refs from addr)",
-	"axc", " addr [at]", "add code jmp ref // unused?",
+	"ax-", " [at]", "clean all refs/refs from addr",
+	"ax-*", "", "clean all refs/refs",
+	"axc", " addr [at]", "add generic code ref",
 	"axC", " addr [at]", "add code call ref",
 	"axg", " [addr]", "show xrefs graph to reach current function",
+	"axgj", " [addr]", "show xrefs graph to reach current function in json format",
 	"axd", " addr [at]", "add data ref",
 	"axq", "", "list refs in quiet/human-readable format",
 	"axj", "", "list refs in json format",
 	"axF", " [flg-glob]", "find data/code references of flags",
 	"axt", " [addr]", "find data/code references to this address",
 	"axf", " [addr]", "find data/code references from this address",
-	"axk", " [query]", "perform sdb query",
-	"ax*", "", "output radare commands",
+	"axs", " addr [at]", "add string ref",
 	NULL
 };
 
@@ -586,10 +598,8 @@
 	DEFINE_CMD_DESCRIPTOR (core, afvb);
 	DEFINE_CMD_DESCRIPTOR (core, afvr);
 	DEFINE_CMD_DESCRIPTOR (core, afvs);
-	DEFINE_CMD_DESCRIPTOR (core, afx);
 	DEFINE_CMD_DESCRIPTOR (core, ag);
 	DEFINE_CMD_DESCRIPTOR (core, age);
-	DEFINE_CMD_DESCRIPTOR (core, agg);
 	DEFINE_CMD_DESCRIPTOR (core, agn);
 	DEFINE_CMD_DESCRIPTOR (core, ah);
 	DEFINE_CMD_DESCRIPTOR (core, ahi);
@@ -601,6 +611,16 @@
 	DEFINE_CMD_DESCRIPTOR (core, ax);
 }
 
+static int cmpaddr (const void *_a, const void *_b) {
+	const RAnalFunction *a = _a, *b = _b;
+	return a->addr - b->addr;
+}
+
+static int listOpDescriptions(void *_core, const char *k, const char *v) {
+        r_cons_printf ("%s=%s\n", k, v);
+        return 1;
+}
+
 /* better aac for windows-x86-32 */
 #define JAYRO_03 0
 
@@ -637,45 +657,60 @@
 }
 #endif
 
+static bool type_cmd_afta (RCore *core, RAnalFunction *fcn) {
+	RListIter *it;
+	ut64 seek;
+	const char *io_cache_key = "io.pcache.write";
+	bool io_cache = r_config_get_i (core->config, io_cache_key);
+	if (!io_cache) {
+		// XXX. we shouldnt need this, but it breaks 'r2 -c aaa -w ls'
+		r_config_set_i (core->config, io_cache_key, true);
+	}
+	if (r_config_get_i (core->config, "cfg.debug")) {
+		eprintf ("TOFIX: afta can't run in debugger mode.\n");
+		return false;
+	}
+	seek = core->offset;
+	r_core_cmd0 (core, "aei");
+	r_core_cmd0 (core, "aeim");
+	r_reg_arena_push (core->anal->reg);
+	// Iterating Reverse so that we get function in top-bottom call order
+	r_list_foreach_prev (core->anal->fcns, it, fcn) {
+		int ret = r_core_seek (core, fcn->addr, true);
+		if (!ret) {
+			continue;
+		}
+		r_anal_esil_set_pc (core->anal->esil, fcn->addr);
+		r_core_anal_type_match (core, fcn);
+		if (r_cons_is_breaked ()) {
+			break;
+		}
+	}
+	r_core_cmd0 (core, "aeim-");
+	r_core_cmd0 (core, "aei-");
+	r_core_seek (core, seek, true);
+	r_reg_arena_pop (core->anal->reg);
+	r_config_set_i (core->config, io_cache_key, io_cache);
+	return true;
+}
+
 static void type_cmd(RCore *core, const char *input) {
 	RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, -1);
 	if (!fcn && *input != '?' && *input != 'a') {
 		eprintf ("cant find function here\n");
 		return;
 	}
-	RListIter *it;
 	ut64 seek;
-	bool io_cache =  r_config_get_i (core->config, "io.cache");
 	r_cons_break_push (NULL, NULL);
 	switch (*input) {
 	case 'a': // "afta"
-		seek = core->offset;
-		r_core_cmd0 (core, "aei");
-		r_core_cmd0 (core, "aeim");
-		r_reg_arena_push (core->anal->reg);	
-		r_list_foreach (core->anal->fcns, it, fcn) {
-			int ret = r_core_seek (core, fcn->addr, true);
-			if (!ret) {
-				continue;
-			}
-			r_anal_esil_set_pc (core->anal->esil, fcn->addr);
-			r_core_anal_type_match (core, fcn);
-			if (r_cons_is_breaked ()) {
-				break;
-			}
-		}
-		r_core_cmd0 (core, "aeim-");
-		r_core_cmd0 (core, "aei-");
-		r_core_seek (core, seek, true);
-		r_reg_arena_pop (core->anal->reg);
+		type_cmd_afta (core, fcn);
 		break;
 	case 'm': // "aftm"
-		r_config_set_i (core->config, "io.cache", true);
 		seek = core->offset;
 		r_anal_esil_set_pc (core->anal->esil, fcn? fcn->addr: core->offset);
 		r_core_anal_type_match (core, fcn);
 		r_core_seek (core, seek, true);
-		r_config_set_i (core->config, "io.cache", io_cache);
 		break;
 	case '?':
 		r_core_cmd_help (core, help_msg_aft);
@@ -742,7 +777,7 @@
 }
 
 static void var_accesses_list(RAnal *a, RAnalFunction *fcn, int delta, const char *typestr) {
-	const char *var_local = sdb_fmt (0, "var.0x%"PFMT64x".%d.%d.%s",
+	const char *var_local = sdb_fmt ("var.0x%"PFMT64x".%d.%d.%s",
 			fcn->addr, 1, delta, typestr);
 	const char *xss = sdb_const_get (a->sdb_fcns, var_local, 0);
 	if (xss && *xss) {
@@ -755,7 +790,7 @@
 static void list_vars(RCore *core, RAnalFunction *fcn, int type, const char *name) {
 	RAnalVar *var;
 	RListIter *iter;
-	RList *list = r_anal_var_list (core->anal, fcn, 0);
+	RList *list = r_anal_var_all_list (core->anal, fcn);
 	if (type == '*') {
 		const char *bp = r_reg_get_name (core->anal->reg, R_REG_NAME_BP);
 		r_cons_printf ("f-fcnvar*\n");
@@ -769,9 +804,17 @@
 		return;
 	}
 	const char *typestr = type == 'R'?"reads":"writes";
-	r_list_foreach (list, iter, var) {
-		r_cons_printf ("%10s  ", var->name);
-		var_accesses_list (core->anal, fcn, var->delta, typestr);
+	if (name && *name) {
+		var = r_anal_var_get_byname (core->anal, fcn->addr, name);
+		if (var) {
+			r_cons_printf ("%10s  ", var->name);
+			var_accesses_list (core->anal, fcn, var->delta, typestr);
+		}
+	} else {
+		r_list_foreach (list, iter, var) {
+			r_cons_printf ("%10s  ", var->name);
+			var_accesses_list (core->anal, fcn, var->delta, typestr);
+		}
 	}
 }
 
@@ -787,23 +830,17 @@
 	}
 
 	r_anal_op (core->anal, &op, off,
-			core->block + off - core->offset, 32);
+			core->block + off - core->offset, 32, R_ANAL_OP_MASK_BASIC);
 
 	tgt_addr = op.jump != UT64_MAX ? op.jump : op.ptr;
 	if (op.var) {
 		RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, off, 0);
 		if (fcn) {
-			RAnalVar *bar = r_anal_var_get_byname (core->anal, fcn, op.var->name);
-			if (!bar) {
-				bar = r_anal_var_get_byname (core->anal, fcn, op.var->name);
-				if (!bar) {
-					bar = r_anal_var_get_byname (core->anal, fcn, op.var->name);
-				}
-			}
+			RAnalVar *bar = r_anal_var_get_byname (core->anal, fcn->addr, op.var->name);
 			if (bar) {
 				if (name) {
 					r_anal_var_rename (core->anal, fcn->addr, bar->scope,
-									bar->kind, bar->name, name);
+									bar->kind, bar->name, name, true);
 				} else if (!use_json) {
 					r_cons_println (bar->name);
 				} else {
@@ -844,7 +881,7 @@
 				r_cons_printf ("0x%" PFMT64x "\n", tgt_addr);
 			} else {
 				r_cons_printf ("{\"type\":\"address\",\"offset\":"
-							   "%" PFMT64d "}", tgt_addr);
+							   "%" PFMT64u "}", tgt_addr);
 			}
 		}
 	}
@@ -917,13 +954,16 @@
 	case 'R': // "afvR"
 	case 'W': // "afvW"
 	case '*': // "afv*"
-		list_vars (core, fcn, str[0], str + 1);
-		break;
+		{
+			char *name = r_str_trim_head (strchr (ostr, ' '));
+			list_vars (core, fcn, str[0], name);
+			return true;
+		}
 	case 'a': // "afva"
 		r_anal_var_delete_all (core->anal, fcn->addr, R_ANAL_VAR_KIND_REG);
 		r_anal_var_delete_all (core->anal, fcn->addr, R_ANAL_VAR_KIND_BPV);
 		r_anal_var_delete_all (core->anal, fcn->addr, R_ANAL_VAR_KIND_SPV);
-		fcn_callconv (core, fcn);
+		r_core_recover_vars (core, fcn, false);
 		free (p);
 		return true;
 	case 'n':
@@ -940,10 +980,10 @@
 			}
 			*new_name++ = 0;
 			r_str_trim (new_name);
-			v1 = r_anal_var_get_byname (core->anal, fcn, old_name);
+			v1 = r_anal_var_get_byname (core->anal, fcn->addr, old_name);
 			if (v1) {
 				r_anal_var_rename (core->anal, fcn->addr, R_ANAL_VAR_SCOPE_LOCAL,
-						v1->kind, old_name, new_name);
+						v1->kind, old_name, new_name, true);
 				r_anal_var_free (v1);
 			} else {
 				eprintf ("Cant find var by name\n");
@@ -952,7 +992,7 @@
 		} else {
 			RListIter *iter;
 			RAnalVar *v;
-			RList *list = r_anal_var_list (core->anal, fcn, 0);
+			RList *list = r_anal_var_all_list (core->anal, fcn);
 			r_list_foreach (list, iter, v) {
 				r_cons_printf ("%s\n", v->name);
 			}
@@ -965,7 +1005,7 @@
 				free (ostr);
 				return false;
 			}
-			v1 = r_anal_var_get_byname (core->anal, fcn, p);
+			v1 = r_anal_var_get_byname (core->anal, fcn->addr, p);
 			if (!v1) {
 				free (ostr);
 				return false;
@@ -976,26 +1016,14 @@
 		} else {
 			RListIter *iter;
 			RAnalVar *p;
-			RList *list = r_anal_var_list (core->anal, fcn, 0);
-			r_list_foreach (list, iter, p) {
-				char *a = r_core_cmd_strf (core, ".afvd %s", p->name);
-				if ((a && !*a) || !a) {
-					free (a);
-					a = strdup ("\n");
-				}
-				r_cons_printf ("var %s = %s", p->name, a);
-				free (a);
-			}
-			r_list_free (list);
-			// args
-			list = r_anal_var_list (core->anal, fcn, 1);
+			RList *list = r_anal_var_all_list (core->anal, fcn);
 			r_list_foreach (list, iter, p) {
 				char *a = r_core_cmd_strf (core, ".afvd %s", p->name);
 				if ((a && !*a) || !a) {
 					free (a);
 					a = strdup ("\n");
 				}
-				r_cons_printf ("arg %s = %s", p->name, a);
+				r_cons_printf ("%s %s = %s", p->isarg ? "arg": "var", p->name, a);
 				free (a);
 			}
 			r_list_free (list);
@@ -1014,21 +1042,21 @@
 			return false;
 		}
 		*type++ = 0;
-		v1 = r_anal_var_get_byname (core->anal, fcn, p);
+		v1 = r_anal_var_get_byname (core->anal, fcn->addr, p);
 		if (!v1) {
 			eprintf ("Cant find get by name %s\n", p);
 			free (ostr);
 			return false;
 		}
 		r_anal_var_retype (core->anal, fcn->addr,
-			R_ANAL_VAR_SCOPE_LOCAL, -1, v1->kind, type, -1, p);
+			R_ANAL_VAR_SCOPE_LOCAL, -1, v1->kind, type, -1, v1->isarg, p);
 		r_anal_var_free (v1);
 		free (ostr);
 		return true;
 
 	}
 	}
-	switch (str[1]) {
+	switch (str[1]) { // afv[bsr]
 	case '\0':
 	case '*':
 	case 'j':
@@ -1061,20 +1089,28 @@
 	case 'g':
 		if (str[2] != '\0') {
 			int rw = 0; // 0 = read, 1 = write
+			int idx = r_num_math (core->num, str + 2);
+			char *vaddr;
+			char *p = r_str_trim (strchr (ostr, ' '));
+			if (!p) {
+				var_help (core, type);
+				break;
+			}
+			ut64 addr = core->offset;
+			if ((vaddr = strchr (p , ' '))) {
+				addr = r_num_math (core->num, vaddr);
+			}
 			RAnalVar *var = r_anal_var_get (core->anal, fcn->addr,
-							(char)type, atoi (str + 2), R_ANAL_VAR_SCOPE_LOCAL);
+							str[0], R_ANAL_VAR_SCOPE_LOCAL, idx);
 			if (!var) {
-				eprintf ("Cannot find variable in: '%s'\n", str);
+				eprintf ("Cannot find variable with delta %d\n", idx);
 				res = false;
 				break;
 			}
-			if (var != NULL) {
-				int scope = (str[1] == 'g')? 0: 1;
-				r_anal_var_access (core->anal, fcn->addr, (char)type,
-						scope, atoi (str + 2), rw, core->offset);
-				r_anal_var_free (var);
-				break;
-			}
+			rw = (str[1] == 'g')? 0: 1;
+			r_anal_var_access (core->anal, fcn->addr, str[0],
+					R_ANAL_VAR_SCOPE_LOCAL, idx, rw, addr);
+			r_anal_var_free (var);
 		} else {
 			eprintf ("Missing argument\n");
 		}
@@ -1082,9 +1118,10 @@
 	case ' ': {
 		const char *name;
 		char *vartype;
+		bool isarg = false;
 		int size = 4;
 		int scope = 1;
-			for (str++; *str == ' ';) str++;
+		for (str++; *str == ' ';) str++;
 		p = strchr (str, ' ');
 		if (!p) {
 			var_help (core, type);
@@ -1098,19 +1135,29 @@
 				break;
 			}
 			delta = i->index;
+			isarg = true;
 		} else {
 			delta = r_num_math (core->num, str);
 		}
 		name = p;
+		if (!name) {
+			eprintf ("Missing name\n");
+			break;
+		}
 		vartype = strchr (name, ' ');
-		if (vartype) {
-			*vartype++ = 0;
-			r_anal_var_add (core->anal, fcn->addr,
-					scope, delta, type,
-					vartype, size, name);
+		if (!vartype) {
+			vartype = "int";
 		} else {
-			eprintf ("Missing name\n");
+			*vartype++ = 0;
 		}
+		if ((type == 'b') && delta > 0) {
+			isarg = true;
+		} else if ((type == 's') && delta > fcn->maxstack) {
+			isarg = true;
+		}
+		r_anal_var_add (core->anal, fcn->addr,scope,
+				delta, type, vartype,
+				size, isarg, name);
 		}
 		break;
 	};
@@ -1191,7 +1238,7 @@
 				res = r_str_appendf (res, "0x%08" PFMT64x "", arg);
 				break;
 			case 'i':
-				res = r_str_appendf (res, "%" PFMT64d "", arg);
+				res = r_str_appendf (res, "%" PFMT64u "", arg);
 				break;
 			case 'z':
 				memset (str, 0, sizeof (str));
@@ -1250,9 +1297,11 @@
 	RAnalHint *hint;
 	RAnalEsil *esil = NULL;
 	RAsmOp asmop;
-	RAnalOp op;
+	RAnalOp op = {0};
 	ut64 addr;
 	bool isFirst = true;
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+	int totalsize = 0;
 
 	// Variables required for setting up ESIL to REIL conversion
 	if (use_color) {
@@ -1264,7 +1313,7 @@
 		break;
 	case 'r':
 		// Setup for ESIL to REIL conversion
-		esil = r_anal_esil_new (stacksize, iotrap);
+		esil = r_anal_esil_new (stacksize, iotrap, addrsize);
 		if (!esil) {
 			return;
 		}
@@ -1278,13 +1327,22 @@
 		hint = r_anal_hint_get (core->anal, addr);
 		r_asm_set_pc (core->assembler, addr);
 		ret = r_asm_disassemble (core->assembler, &asmop, buf + idx, len - idx);
-		ret = r_anal_op (core->anal, &op, core->offset + idx, buf + idx, len - idx);
+		ret = r_anal_op (core->anal, &op, core->offset + idx, buf + idx, len - idx, R_ANAL_OP_MASK_ESIL);
 		esilstr = R_STRBUF_SAFEGET (&op.esil);
 		opexstr = R_STRBUF_SAFEGET (&op.opex);
 		char *mnem = strdup (asmop.buf_asm);
 		char *sp = strchr (mnem, ' ');
 		if (sp) {
 			*sp = 0;
+			if (op.prefix) {
+				char *arg = strdup (sp + 1);
+				char *sp = strchr (arg, ' ');
+				if (sp) {
+					*sp = 0;
+				}
+				free (mnem);
+				mnem = arg;
+			}
 		}
 		if (ret < 1 && fmt != 'd') {
 			eprintf ("Oops at 0x%08" PFMT64x " (", core->offset + idx);
@@ -1292,6 +1350,7 @@
 				eprintf ("%02x ", buf[i]);
 			}
 			eprintf ("...)\n");
+			free (mnem);
 			break;
 		}
 		size = (hint && hint->size)? hint->size: op.size;
@@ -1314,6 +1373,8 @@
 					r_cons_printf ("0x%" PFMT64x " %s\n", core->offset + idx, esilstr);
 				}
 			}
+		} else if (fmt == 's') {
+			totalsize += op.size;
 		} else if (fmt == 'r') {
 			if (*esilstr) {
 				if (use_color) {
@@ -1333,7 +1394,7 @@
 			}
 			r_cons_printf ("{\"opcode\":\"%s\",", asmop.buf_asm);
 			{
-				char strsub[128];
+				char strsub[128] = { 0 };
 				// pc+33
 				r_parse_varsub (core->parser, NULL,
 					core->offset + idx,
@@ -1356,22 +1417,23 @@
 			if (hint && hint->opcode) {
 				r_cons_printf ("\"ophint\":\"%s\",", hint->opcode);
 			}
-			r_cons_printf ("\"prefix\":%" PFMT64d ",", op.prefix);
+			r_cons_printf ("\"sign\":%s,", r_str_bool (op.sign));
+			r_cons_printf ("\"prefix\":%" PFMT64u ",", op.prefix);
 			r_cons_printf ("\"id\":%d,", op.id);
 			if (opexstr && *opexstr) {
 				r_cons_printf ("\"opex\":%s,", opexstr);
 			}
-			r_cons_printf ("\"addr\":%" PFMT64d ",", core->offset + idx);
+			r_cons_printf ("\"addr\":%" PFMT64u ",", core->offset + idx);
 			r_cons_printf ("\"bytes\":\"");
 			for (j = 0; j < size; j++) {
 				r_cons_printf ("%02x", buf[j + idx]);
 			}
 			r_cons_printf ("\",");
 			if (op.val != UT64_MAX) {
-				r_cons_printf ("\"val\": %" PFMT64d ",", op.val);
+				r_cons_printf ("\"val\": %" PFMT64u ",", op.val);
 			}
 			if (op.ptr != UT64_MAX) {
-				r_cons_printf ("\"ptr\": %" PFMT64d ",", op.ptr);
+				r_cons_printf ("\"ptr\": %" PFMT64u ",", op.ptr);
 			}
 			r_cons_printf ("\"size\": %d,", size);
 			r_cons_printf ("\"type\": \"%s\",",
@@ -1379,6 +1441,12 @@
 			if (op.reg) {
 				r_cons_printf ("\"reg\": \"%s\",", op.reg);
 			}
+			if (op.ireg) {
+				r_cons_printf ("\"ireg\": \"%s\",", op.ireg);
+			}
+			if (op.scale) {
+				r_cons_printf ("\"scale\":%d,", op.scale);
+			}
 			if (hint && hint->esil) {
 				r_cons_printf ("\"esil\": \"%s\",", hint->esil);
 			} else if (*esilstr) {
@@ -1388,7 +1456,7 @@
 				op.jump = hint->jump;
 			}
 			if (op.jump != UT64_MAX) {
-				r_cons_printf ("\"jump\":%" PFMT64d ",", op.jump);
+				r_cons_printf ("\"jump\":%" PFMT64u ",", op.jump);
 			}
 			if (hint && hint->fail != UT64_MAX) {
 				op.fail = hint->fail;
@@ -1397,7 +1465,7 @@
 				r_cons_printf ("\"refptr\":%d,", op.refptr);
 			}
 			if (op.fail != UT64_MAX) {
-				r_cons_printf ("\"fail\":%" PFMT64d ",", op.fail);
+				r_cons_printf ("\"fail\":%" PFMT64u ",", op.fail);
 			}
 			r_cons_printf ("\"cycles\":%d,", op.cycles);
 			if (op.failcycles) {
@@ -1443,7 +1511,7 @@
 				}
 #endif
 			}
-			printline ("prefix", "%" PFMT64d "\n", op.prefix);
+			printline ("prefix", "%" PFMT64u "\n", op.prefix);
 			printline ("id", "%d\n", op.id);
 #if 0
 // no opex here to avoid lot of tests broken..and having json in here is not much useful imho
@@ -1463,7 +1531,12 @@
 			if (op.refptr != -1)
 				printline ("refptr", "%d\n", op.refptr);
 			printline ("size", "%d\n", size);
+			printline ("sign", "%s\n", r_str_bool (op.sign));
 			printline ("type", "%s\n", r_anal_optype_to_string (op.type));
+			printline ("cycles", "%d\n", op.cycles);
+			if (op.failcycles) {
+				printline ("failcycles", "%d\n", op.failcycles);
+			}
 			{
 				const char *t2 = r_anal_optype_to_string (op.type2);
 				if (t2 && strcmp (t2, "null")) {
@@ -1473,6 +1546,12 @@
 			if (op.reg) {
 				printline ("reg", "%s\n", op.reg);
 			}
+			if (op.ireg) {
+				printline ("ireg", "%s\n", op.ireg);
+			}
+			if (op.scale) {
+				printline ("scale", "%d\n", op.scale);
+			}
 			if (hint && hint->esil) {
 				printline ("esil", "%s\n", hint->esil);
 			} else if (*esilstr) {
@@ -1510,18 +1589,21 @@
 			printline ("family", "%s\n", r_anal_op_family_to_string (op.family));
 			printline ("stackop", "%s\n", r_anal_stackop_tostring (op.stackop));
 			if (op.stackptr) {
-				printline ("stackptr", "%"PFMT64d"\n", op.stackptr);
+				printline ("stackptr", "%"PFMT64u"\n", op.stackptr);
 			}
 		}
 		//r_cons_printf ("false: 0x%08"PFMT64x"\n", core->offset+idx);
 		//free (hint);
 		free (mnem);
 		r_anal_hint_free (hint);
+		r_anal_op_fini (&op);
 	}
-
+	r_anal_op_fini (&op);
 	if (fmt == 'j') {
 		r_cons_printf ("]");
 		r_cons_newline ();
+	} else if (fmt == 's') {
+		r_cons_printf ("%d\n", totalsize);
 	}
 	r_anal_esil_free (esil);
 }
@@ -1603,7 +1685,7 @@
 			r_cons_printf ("0x%08" PFMT64x "\n", b->addr);
 			break;
 		case 'j':
-			//r_cons_printf ("%" PFMT64d "%s", b->addr, iter->n? ",": "");
+			//r_cons_printf ("%" PFMT64u "%s", b->addr, iter->n? ",": "");
 			{
 			RListIter *iter2;
 			RAnalBlock *b2;
@@ -1626,12 +1708,12 @@
 			r_cons_printf ("%s{", firstItem? "": ",");
 			firstItem = false;
 			if (b->jump != UT64_MAX) {
-				r_cons_printf ("\"jump\":%"PFMT64d",", b->jump);
+				r_cons_printf ("\"jump\":%"PFMT64u",", b->jump);
 			}
 			if (b->fail != UT64_MAX) {
-				r_cons_printf ("\"fail\":%"PFMT64d",", b->fail);
+				r_cons_printf ("\"fail\":%"PFMT64u",", b->fail);
 			}
-			r_cons_printf ("\"addr\":%" PFMT64d ",\"size\":%d,\"inputs\":%d,\"outputs\":%d,\"ninstr\":%d,\"traced\":%s}",
+			r_cons_printf ("\"addr\":%" PFMT64u ",\"size\":%d,\"inputs\":%d,\"outputs\":%d,\"ninstr\":%d,\"traced\":%s}",
 				b->addr, b->size, inputs, outputs, b->ninstr, r_str_bool (b->traced));
 			}
 			break;
@@ -1929,12 +2011,14 @@
 			assigned++;
 		}
 		if (show_color) {
-			if (bitmap[i])
+			if (bitmap[i]) {
 				r_cons_printf ("%s%c\x1b[0m", Color_GREEN, bitmap[i]);
-			else
+			} else {
 				r_cons_printf (".");
-		} else
+			}
+		} else {
 			r_cons_printf ("%c", bitmap[i] ? bitmap[i] : '.' );
+		}
 	}
 	r_cons_printf ("\n%d / %d (%.2lf%%) bytes assigned to a function\n", assigned, code_size, 100.0*( (float) assigned) / code_size);
 	free(bitmap);
@@ -2020,16 +2104,24 @@
 	case 'f': // "aff"
 		r_anal_fcn_fit_overlaps (core->anal, NULL);
 		break;
+	case 'a':
+		if (input[2] == 'l') { // afal : list function call arguments
+			int show_args = r_config_get_i (core->config, "dbg.funcarg");
+			if (show_args) {
+				r_core_print_func_args (core);
+			}
+			break;
+		}
 	case 'd': // "afd"
 		{
-		ut64 addr = 0;	
+		ut64 addr = 0;
 		if (input[2] == '?') {
 			eprintf ("afd [offset]\n");
 		} else if (input[2] == ' ') {
-			addr = r_num_math (core->num, input + 2); 
+			addr = r_num_math (core->num, input + 2);
 		} else {
 			addr = core->offset;
-		}	
+		}
 		RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, 0);
 		if (fcn) {
 			if (fcn->addr != addr) {
@@ -2037,12 +2129,12 @@
 						(int)(addr - fcn->addr));
 			} else {
 				r_cons_println (fcn->name);
-			}	
+			}
 		} else {
 			eprintf ("Cannot find function\n");
 		}
 		}
-		break;	
+		break;
 	case '-': // "af-"
 		if (!input[2] || !strcmp (input + 2, "*")) {
 			r_anal_fcn_del_locs (core->anal, UT64_MAX);
@@ -2074,13 +2166,13 @@
 
 			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, 0);
 			if (fcn) {
-				r_anal_fcn_resize (fcn, addr_end - addr);
+				r_anal_fcn_resize (core->anal, fcn, addr_end - addr);
 			}
 			r_core_anal_fcn (core, addr, UT64_MAX,
 					R_ANAL_REF_TYPE_NULL, depth);
 			fcn = r_anal_get_fcn_in (core->anal, addr, 0);
 			if (fcn) {
-				r_anal_fcn_resize (fcn, addr_end - addr);
+				r_anal_fcn_resize (core->anal, fcn, addr_end - addr);
 			}
 			r_config_set_i (core->config, "anal.from", a);
 			r_config_set_i (core->config, "anal.to", b);
@@ -2197,6 +2289,9 @@
 		case '?':
 			r_core_cmd_help (core, help_msg_afl);
 			break;
+		case 's': // "afls"
+			r_list_sort (core->anal->fcns, cmpaddr);
+			break;
 		case 'l': // "afll"
 			if (input[3] == '?') {
 				// TODO #7967 help refactor
@@ -2207,7 +2302,7 @@
 			/* fallthrough */
 		case 'j': // "aflj"
 		case 'q': // "aflq"
-		case 's': // "afls"
+		case '+': // "afl+"
 		case '*': // "afl*"
 			r_core_anal_fcn_list (core, NULL, input + 2);
 			break;
@@ -2223,7 +2318,7 @@
 		{
 		ut64 addr;
 		RAnalFunction *f;
-		const char *arg = input + 3;
+		const char *arg = input + 2;
 		if (input[2] && (addr = r_num_math (core->num, arg))) {
 			arg = strchr (arg, ' ');
 			if (arg) {
@@ -2280,7 +2375,7 @@
 		break;
 	case 'c':{ // "afc"
 		RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
-		if (!fcn && !(input[2] == '?'|| input[2] == 'l' || input[2] == 'o')) {
+		if (!fcn && !(input[2] == '?'|| input[2] == 'l' || input[2] == 'o' || input[2] == 'f')) {
 			eprintf ("Cannot find function here\n");
 			break;
 		}
@@ -2298,9 +2393,48 @@
 			}
 			break;
 		}
-		case 'a': // "afca""
+		case 'a': // "afca"
 			eprintf ("Todo\n");
 			break;
+		case 'f': { // "afcf"
+			const char *fcn_name = r_str_trim (strdup (input + 3));
+			char *key = NULL;
+			RListIter *iter;
+			RAnalFuncArg *arg;
+			if (fcn && !*fcn_name) {
+				fcn_name = fcn->name;
+			}
+			if (fcn_name) {
+				key = resolve_fcn_name (core->anal, fcn_name);
+			}
+			if (key) {
+				const char *fcn_type = r_type_func_ret (core->anal->sdb_types, key);
+				int nargs = r_type_func_args_count (core->anal->sdb_types, key);
+				if (fcn_type) {
+					char *sp = " ";
+					if (*fcn_type && (fcn_type[strlen (fcn_type) - 1] == '*')) {
+						sp = "";
+					}
+					r_cons_printf ("%s%s%s(", r_str_get (fcn_type), sp, r_str_get (key));
+					if (!nargs) {
+						r_cons_println ("void)");
+						break;
+					}
+					RList *list = r_core_get_func_args (core, fcn_name);
+					r_list_foreach (list, iter, arg) {
+						RListIter *nextele = r_list_iter_get_next (iter);
+						char *type = arg->orig_c_type;
+						char *sp1 = " ";
+						if (*type && (type[strlen (type) - 1] == '*')) {
+							sp1 = "";
+						}
+						r_cons_printf ("%s%s%s%s", type, sp1, arg->name, nextele?", ":")");
+					}
+					r_cons_println ("");
+				}
+			}
+			break;
+		}
 		case 'l': // "afcl" list all function Calling conventions.
 			sdb_foreach (core->anal->sdb_cc, cc_print, NULL);
 			break;
@@ -2525,66 +2659,39 @@
 	case 'x': // "afx"
 		switch (input[2]) {
 		case '\0': // "afx"
+		case 'j': // "afxj"
 		case ' ': // "afx "
-#if FCN_OLD
-			// TODO: sdbize!
+			if (input[2] == 'j') {
+				r_cons_printf ("[");
+			}
 			// list xrefs from current address
 			{
-				ut64 addr = input[2]? r_num_math (core->num, input + 2): core->offset;
+				ut64 addr = input[2]==' '? r_num_math (core->num, input + 2): core->offset;
 				RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, R_ANAL_FCN_TYPE_NULL);
 				if (fcn) {
 					RAnalRef *ref;
 					RListIter *iter;
 					RList *refs = r_anal_fcn_get_refs (core->anal, fcn);
 					r_list_foreach (refs, iter, ref) {
-						r_cons_printf ("%c 0x%08" PFMT64x " -> 0x%08" PFMT64x "\n",
-							ref->type, ref->at, ref->addr);
+						if (input[2] == 'j') {
+							r_cons_printf ("{\"type\":\"%c\",\"from\":%"PFMT64u",\"to\":%"PFMT64u"}%s",
+									ref->type, ref->at, ref->addr, iter->n? ",": "");
+						} else {
+							r_cons_printf ("%c 0x%08" PFMT64x " -> 0x%08" PFMT64x "\n",
+									ref->type, ref->at, ref->addr);
+						}
 					}
 					r_list_free (refs);
-				} else eprintf ("Cannot find function\n");
-			}
-#else
-#warning TODO_ FCNOLD sdbize xrefs here
-			eprintf ("TODO\n");
-#endif
-			break;
-		case 'c': // "afxc" add code xref
-		case 'd': // "afxd"
-		case 's': // "afxs"
-		case 'C': { // "afxC"
-			char *p;
-			ut64 a, b;
-			char *mi = strdup (input);
-			if (mi && mi[3] == ' ' && (p = strchr (mi + 4, ' '))) {
-				*p = 0;
-				a = r_num_math (core->num, mi + 3);
-				b = r_num_math (core->num, p + 1);
-				r_anal_xrefs_set (core->anal, input[2], a, b);
-			} else {
-				r_core_cmd_help (core, help_msg_afx);
-			}
-			free (mi);
-			}
-			break;
-		case '-': // "afx-"
-			{
-			char *p;
-			ut64 a, b;
-			char *mi = strdup (input + 3);
-			if (mi && *mi == ' ' && (p = strchr (mi + 1, ' '))) {
-				*p = 0;
-				a = r_num_math (core->num, mi);
-				b = r_num_math (core->num, p + 1);
-				r_anal_xrefs_deln (core->anal, -1, a, b);
-			} else {
-				eprintf ("Usage: afx- [src] [dst]\n");
+				} else {
+					eprintf ("Cannot find function at 0x%08"PFMT64x"\n", addr);
+				}
 			}
-			free (mi);
+			if (input[2] == 'j') {
+				r_cons_printf ("]\n");
 			}
 			break;
 		default:
-		case '?': // "afx?"
-			r_core_cmd_help (core, help_msg_afx);
+			eprintf ("Wrong command. Look at af?\n");
 			break;
 		}
 		break;
@@ -2608,6 +2715,8 @@
 		int depth = r_config_get_i (core->config, "anal.depth");
 		bool analyze_recursively = r_config_get_i (core->config, "anal.calls");
 		RAnalFunction *fcn;
+		RAnalFunction *fcni;
+		RListIter *iter;
 		ut64 addr = core->offset;
 		if (input[1] == 'r') {
 			input++;
@@ -2629,9 +2738,6 @@
 		//r_core_anal_undefine (core, core->offset);
 		r_core_anal_fcn (core, addr, UT64_MAX, R_ANAL_REF_TYPE_NULL, depth);
 		fcn = r_anal_get_fcn_in (core->anal, addr, 0);
-		if (fcn && r_config_get_i (core->config, "anal.vars")) {
-			fcn_callconv (core, fcn);
-		}
 		if (fcn) {
 			/* ensure we use a proper name */
 			setFunctionName (core, addr, fcn->name, false);
@@ -2647,7 +2753,7 @@
 						//eprintf ("Warning: ignore 0x%08"PFMT64x" call 0x%08"PFMT64x"\n", ref->at, ref->addr);
 						continue;
 					}
-					if (ref->type != 'c' && ref->type != 'C') {
+					if (ref->type != R_ANAL_REF_TYPE_CODE && ref->type != R_ANAL_REF_TYPE_CALL) {
 						/* only follow code/call references */
 						continue;
 					}
@@ -2668,7 +2774,7 @@
 							}
 							if (ref->type != 'c' && ref->type != 'C') {
 								continue;
-							}	
+							}
 							r_core_anal_fcn (core, ref->addr, f->addr, R_ANAL_REF_TYPE_CALL, depth);
 							// recursively follow fcn->refs again and again
 						}
@@ -2677,7 +2783,7 @@
 						f = r_anal_get_fcn_in (core->anal, fcn->addr, 0);
 						if (f) {
 							/* cut function */
-							r_anal_fcn_resize (f, addr - fcn->addr);
+							r_anal_fcn_resize (core->anal, f, addr - fcn->addr);
 							r_core_anal_fcn (core, ref->addr, fcn->addr,
 									R_ANAL_REF_TYPE_CALL, depth);
 							f = r_anal_get_fcn_at (core->anal, fcn->addr, 0);
@@ -2691,13 +2797,20 @@
 				r_list_free (refs);
 			}
 		}
-
 		if (name) {
 			if (*name && !setFunctionName (core, addr, name, true)) {
 				eprintf ("Cannot find function '%s' at 0x%08" PFMT64x "\n", name, (ut64)addr);
 			}
 			free (name);
 		}
+		if (core->anal->opt.vars) {
+			r_list_foreach (core->anal->fcns, iter, fcni) {
+				if (r_cons_is_breaked ()) {
+					break;
+				}
+				r_core_recover_vars (core, fcni, true);
+			}
+		}
 		flag_every_function (core);
 	}
 	default:
@@ -2725,6 +2838,7 @@
 	} else if (!bits) {
 		bits = core->anal->bits;
 	}
+	int mode2 = mode;
 	if (core->anal) {
 		core->dbg->reg = core->anal->reg;
 		if (core->anal->cur && core->anal->cur->arch) {
@@ -2734,10 +2848,24 @@
 			}
 			/* workaround for 6502 */
 			if (!strcmp (core->anal->cur->arch, "6502") && bits == 8) {
-				r_debug_reg_list (core->dbg, R_REG_TYPE_GPR, 16, mode, use_color); // XXX detect which one is current usage
+				mode2 = mode == 'j' ? 'J' : mode;
+				if (mode == 'j') {
+					r_cons_printf ("{");
+				}
+				r_debug_reg_list (core->dbg, R_REG_TYPE_GPR, 16, mode2, use_color); // XXX detect which one is current usage
+				if (mode == 'j') {
+					r_cons_printf (",");
+				}
 			}
 			if (!strcmp (core->anal->cur->arch, "avr") && bits == 8) {
-				r_debug_reg_list (core->dbg, R_REG_TYPE_GPR, 16, mode, use_color); // XXX detect which one is current usage
+				mode2 = mode == 'j' ? 'J' : mode;
+				if (mode == 'j') {
+					r_cons_printf ("{");
+				}
+				r_debug_reg_list (core->dbg, R_REG_TYPE_GPR, 16, mode2, use_color); // XXX detect which one is current usage
+				if (mode == 'j') {
+					r_cons_printf (",");
+				}
 			}
 		}
 	}
@@ -2753,7 +2881,10 @@
 			r_debug_reg_list (core->dbg, R_REG_TYPE_GPR, pcbits, 2, use_color); // XXX detect which one is current usage
 		}
 	}
-	r_debug_reg_list (core->dbg, type, bits, mode, use_color);
+	r_debug_reg_list (core->dbg, type, bits, mode2, use_color);
+	if (mode2 == 'J') {
+		r_cons_print ("}\n");
+	}
 	core->dbg->reg = hack;
 }
 
@@ -2848,7 +2979,14 @@
 		}
 		break;
 	case 'r': // "arr"
-		r_core_debug_rr (core, core->anal->reg);
+		switch (str[1]) {
+		case 'j': // "arrj"
+			r_core_debug_rr (core, core->dbg->reg, 'j');
+			break;
+		default:
+			r_core_debug_rr (core, core->dbg->reg, 0);
+			break;
+		}
 		break;
 	case 'S': { // "arS"
 		int sz;
@@ -2980,13 +3118,44 @@
 		break;
 	case '=': // "ar="
 		{
+			char *p = NULL;
+			char *bits = NULL;
 			if (str[1]) {
-				st64 sz = r_num_math (core->num, str + 1);
-				if (sz > 0) {
-					size = sz;
+				p = strdup (str + 1);
+				if (str[1] != ':') {
+					// Bits were specified
+					bits = strtok (p, ":");
+					if (r_str_isnumber (bits)) {
+						st64 sz = r_num_math (core->num, bits);
+						if (sz > 0) {
+							size = sz;
+						}
+					} else {
+						r_core_cmd_help (core, help_msg_ar);
+						break;
+					}
+				}
+				int len = bits ? strlen (bits) : 0;
+				if (str[len + 1] == ':') {
+					// We have some regs
+					char *regs = bits ? strtok (NULL, ":") : strtok ((char *)str + 1, ":");
+					char *reg = strtok (regs, " ");
+					RList *q_regs = r_list_new ();
+					if (q_regs) {
+						while (reg) {
+							r_list_append (q_regs, reg);
+							reg = strtok (NULL, " ");
+						}
+						core->dbg->q_regs = q_regs;
+					}
 				}
 			}
 			__anal_reg_list (core, type, size, 2);
+			if (!r_list_empty (core->dbg->q_regs)) {
+				r_list_free (core->dbg->q_regs);
+			}
+			core->dbg->q_regs = NULL;
+			free (p);
 		}
 		break;
 	case '-': // "ar-"
@@ -3051,23 +3220,59 @@
 	}
 }
 
-R_API bool r_core_esil_cmd(RAnalEsil *esil, const char *cmd, ut64 a1, ut64 a2);
+static ut64 initializeEsil(RCore *core) {
+	const char *name = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
+	RAnalEsil *esil = core->anal->esil;
+	int romem = r_config_get_i (core->config, "esil.romem");
+	int stats = r_config_get_i (core->config, "esil.stats");
+	int iotrap = r_config_get_i (core->config, "esil.iotrap");
+	int exectrap = r_config_get_i (core->config, "esil.exectrap");
+	int stacksize = r_config_get_i (core->config, "esil.stack.depth");
+	int noNULL = r_config_get_i (core->config, "esil.noNULL");
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+	if (!(core->anal->esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
+		return UT64_MAX;
+	}
+	ut64 addr;
+	esil = core->anal->esil;
+	r_anal_esil_setup (esil, core->anal, romem, stats, noNULL); // setup io
+	esil->exectrap = exectrap;
+	RList *entries = r_bin_get_entries (core->bin);
+	RBinAddr *entry = NULL;
+	RBinInfo *info = NULL;
+	if (entries && !r_list_empty (entries)) {
+		entry = (RBinAddr *)r_list_pop (entries);
+		info = r_bin_get_info (core->bin);
+		addr = info->has_va? entry->vaddr: entry->paddr;
+		r_list_push (entries, entry);
+	} else {
+		addr = core->offset;
+	}
+	r_reg_setv (core->anal->reg, name, addr);
+	// set memory read only
+	return addr;
+}
 
 R_API int r_core_esil_step(RCore *core, ut64 until_addr, const char *until_expr, ut64 *prev_addr) {
-	// Stepping
+#define return_tail(x) { tail_return_value = x; goto tail_return; }
+	int tail_return_value = 0;
 	int ret;
-	ut8 code[256];
+	ut8 code[32];
 	RAnalOp op = {0};
 	RAnalEsil *esil = core->anal->esil;
 	const char *name = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
+	bool breakoninvalid = r_config_get_i (core->config, "esil.breakoninvalid");
 	if (!esil) {
+// TODO		inititalizeEsil (core);
+
 		int stacksize = r_config_get_i (core->config, "esil.stack.depth");
 		int iotrap = r_config_get_i (core->config, "esil.iotrap");
 		int romem = r_config_get_i (core->config, "esil.romem");
 		int stats = r_config_get_i (core->config, "esil.stats");
 		int noNULL = r_config_get_i (core->config, "esil.noNULL");
 		int verbose = r_config_get_i (core->config, "esil.verbose");
-		if (!(esil = r_anal_esil_new (stacksize, iotrap))) {
+		unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+		if (!(esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
 			return 0;
 		}
 		r_anal_esil_setup (esil, core->anal, romem, stats, noNULL); // setup io
@@ -3084,42 +3289,20 @@
 			}
 		}
 	}
-	if (esil) {
-		esil->cmd = r_core_esil_cmd;
-	}
+	esil->cmd = r_core_esil_cmd;
 	ut64 addr = r_reg_getv (core->anal->reg, name);
 	r_cons_break_push (NULL, NULL);
 repeat:
 	if (r_cons_is_breaked ()) {
 		eprintf ("[+] ESIL emulation interrupted at 0x%08" PFMT64x "\n", addr);
-		goto out_return_zero;
+		return_tail (0);
 	}
 	if (!esil) {
-		int romem = r_config_get_i (core->config, "esil.romem");
-		int stats = r_config_get_i (core->config, "esil.stats");
-		int iotrap = r_config_get_i (core->config, "esil.iotrap");
-		int exectrap = r_config_get_i (core->config, "esil.exectrap");
-		int stacksize = r_config_get_i (core->config, "esil.stack.depth");
-		int noNULL = r_config_get_i (core->config, "esil.noNULL");
-		if (!(core->anal->esil = r_anal_esil_new (stacksize, iotrap))) {
-			goto out_return_zero;
-		}
+		addr = initializeEsil (core);
 		esil = core->anal->esil;
-		r_anal_esil_setup (esil, core->anal, romem, stats, noNULL); // setup io
-		esil->exectrap = exectrap;
-		RList *entries = r_bin_get_entries (core->bin);
-		RBinAddr *entry = NULL;
-		RBinInfo *info = NULL;
-		if (entries && !r_list_empty (entries)) {
-			entry = (RBinAddr *)r_list_pop (entries);
-			info = r_bin_get_info (core->bin);
-			addr = info->has_va? entry->vaddr: entry->paddr;
-			r_list_push (entries, entry);
-		} else {
-			addr = core->offset;
+		if (!esil) {
+			return_tail (0);
 		}
-		r_reg_setv (core->anal->reg, name, addr);
-		// set memory read only
 	} else {
 		esil->trap = 0;
 		addr = r_reg_getv (core->anal->reg, name);
@@ -3133,8 +3316,7 @@
 			esil->trap = R_ANAL_TRAP_EXEC_ERR;
 			esil->trap_code = addr;
 			eprintf ("[ESIL] Trap, trying to execute on non-executable memory\n");
-// RUN cmd.esil.trap here
-			goto out_return_one;
+			return_tail (1);
 		}
 	}
 	r_asm_set_pc (core->assembler, addr);
@@ -3144,16 +3326,20 @@
 		r_core_cmd0 (core, pincmd);
 		ut64 pc = r_debug_reg_get (core->dbg, "PC");
 		if (addr != pc) {
-			goto out_return_one;
+			return_tail (1);
 		}
 	}
 	(void)r_io_read_at (core->io, addr, code, sizeof (code));
 	// TODO: sometimes this is dupe
-	ret = r_anal_op (core->anal, &op, addr, code, sizeof (code));
+	ret = r_anal_op (core->anal, &op, addr, code, sizeof (code), R_ANAL_OP_MASK_ESIL);
 // if type is JMP then we execute the next N instructions
 	// update the esil pointer because RAnal.op() can change it
 	esil = core->anal->esil;
 	if (op.size < 1 || ret < 0) {
+		if (breakoninvalid) {
+			r_cons_printf ("[ESIL] Stopped execution in an invalid instruction (see e??esil.breakoninvalid)\n");
+			return_tail (0);
+		}
 		if (esil->cmd && esil->cmd_todo) {
 			esil->cmd (esil, esil->cmd_todo, addr, 0);
 		}
@@ -3167,19 +3353,6 @@
 	}
 	r_reg_setv (core->anal->reg, name, addr + op.size);
 	if (ret) {
-		ut64 delay_slot = 0;
-		r_anal_esil_reg_read (esil, "$ds", &delay_slot, NULL);
-		if (delay_slot > 0) {
-			if (op.type >= R_ANAL_OP_TYPE_JMP &&
-			op.type <= R_ANAL_OP_TYPE_CRET) {
-				// branches are illegal in a delay slot
-				esil->trap = R_ANAL_TRAP_EXEC_ERR;
-				esil->trap_code = addr;
-				eprintf ("[ESIL] Trap, trying to execute a branch in a delay slot\n");
-				goto out_return_one;
-			}
-		}
-
 		r_anal_esil_set_pc (esil, addr);
 		if (core->dbg->trace->enabled) {
 			RReg *reg = core->dbg->reg;
@@ -3188,80 +3361,80 @@
 			core->dbg->reg = reg;
 		} else {
 			r_anal_esil_parse (esil, R_STRBUF_SAFEGET (&op.esil));
+
 			if (core->anal->cur && core->anal->cur->esil_post_loop) {
 				core->anal->cur->esil_post_loop (esil, &op);
 			}
-			//r_anal_esil_dumpstack (esil);
 			r_anal_esil_stack_free (esil);
-			delay_slot--;
-
-			if (((st64)delay_slot) <= 0) {
-				// no delay slot, or just consumed
-				ut64 jump_target_set = 0;
-				r_anal_esil_reg_read (esil, "$js", &jump_target_set, NULL);
-				if (jump_target_set) {
-					// perform the branch
-					ut64 jump_target = 0;
-					r_anal_esil_reg_read (esil, "$jt", &jump_target, NULL);
-					r_anal_esil_reg_write (esil, "$js", 0);
-					r_reg_setv (core->anal->reg, name, jump_target);
-				}
-			}
-
-			if (((st64)delay_slot) >= 0) {
-				// save decreased delay slot counter
-				r_anal_esil_reg_write (esil, "$ds", delay_slot);
-				if (!esil->trap) {
-					// emulate the instruction and its delay slots in the same 'aes' step
-					goto repeat;
-				}
+		}
+		// only support 1 slot for now
+		if (op.delay) {
+			ut8 code2[32];
+			ut64 naddr = addr + op.size;
+			RAnalOp op2 = {0};
+			// emulate only 1 instruction
+			r_anal_esil_set_pc (esil, naddr);
+			(void)r_io_read_at (core->io, naddr, code2, sizeof (code2));
+			// TODO: sometimes this is dupe
+			ret = r_anal_op (core->anal, &op2, naddr, code2, sizeof (code2), R_ANAL_OP_MASK_ESIL);
+			switch (op2.type) {
+			case R_ANAL_OP_TYPE_CJMP:
+			case R_ANAL_OP_TYPE_JMP:
+			case R_ANAL_OP_TYPE_CRET:
+			case R_ANAL_OP_TYPE_RET:
+				// branches are illegal in a delay slot
+				esil->trap = R_ANAL_TRAP_EXEC_ERR;
+				esil->trap_code = addr;
+				eprintf ("[ESIL] Trap, trying to execute a branch in a delay slot\n");
+				return_tail (1);
+				break;
 			}
+			r_anal_esil_parse (esil, R_STRBUF_SAFEGET (&op2.esil));
+			r_anal_op_fini (&op2);
 		}
+		tail_return_value = 1;
 	}
 
 	st64 follow = (st64)r_config_get_i (core->config, "dbg.follow");
-	ut64 pc = r_debug_reg_get (core->dbg, "PC");
 	if (follow > 0) {
+		ut64 pc = r_debug_reg_get (core->dbg, "PC");
 		if ((pc < core->offset) || (pc > (core->offset + follow))) {
 			r_core_cmd0 (core, "sr PC");
 		}
 	}
-
+	// check breakpoints
+	ut64 pc = r_reg_getv (core->anal->reg, name);
+	if (r_bp_get_at (core->dbg->bp, pc)) {
+		r_cons_printf ("[ESIL] hit breakpoint at 0x%"PFMT64x "\n", pc);
+		return_tail (0);
+	}
 	// check addr
 	if (until_addr != UT64_MAX) {
-		if (r_reg_getv (core->anal->reg, name) == until_addr) {
-			// eprintf ("ADDR BREAK\n");
-			goto out_return_zero;
-		} else {
-			goto repeat;
+		if (pc == until_addr) {
+			return_tail (0);
 		}
+		goto repeat;
 	}
 	// check esil
 	if (esil && esil->trap) {
 		if (core->anal->esil->verbose) {
 			eprintf ("TRAP\n");
 		}
-		goto out_return_zero;
+		return_tail (0);
 	}
 	if (until_expr) {
 		if (r_anal_esil_condition (core->anal->esil, until_expr)) {
 			if (core->anal->esil->verbose) {
 				eprintf ("ESIL BREAK!\n");
 			}
-			goto out_return_zero;
-		} else {
-			goto repeat;
+			return_tail (0);
 		}
+		goto repeat;
 	}
-out_return_one:
-	r_anal_op_fini (&op);
-	r_cons_break_pop ();
-	// if (must mips here
-	return 1;
-out_return_zero:
+tail_return:
 	r_anal_op_fini (&op);
 	r_cons_break_pop ();
-	return 0;
+	return tail_return_value;
 }
 
 R_API int r_core_esil_step_back(RCore *core) {
@@ -3385,13 +3558,13 @@
 		//	r_core_cmdf (core, "wx 10203040 @ 0x%llx", addr);
 			switch (*mode) {
 			case 'd': // "debrujn"
-				r_core_cmdf (core, "wopD %"PFMT64d" @ 0x%"PFMT64x, left, addr + i);
+				r_core_cmdf (core, "wopD %"PFMT64u" @ 0x%"PFMT64x, left, addr + i);
 				break;
 			case 's': // "seq"
 				r_core_cmdf (core, "woe 1 0xff 1 4 @ 0x%"PFMT64x"!0x%"PFMT64x, addr + i, left);
 				break;
 			case 'r': // "random"
-				r_core_cmdf (core, "woR %"PFMT64d" @ 0x%"PFMT64x"!0x%"PFMT64x, left, addr + i, left);
+				r_core_cmdf (core, "woR %"PFMT64u" @ 0x%"PFMT64x"!0x%"PFMT64x, left, addr + i, left);
 				break;
 			case 'z': // "zero"
 			case '0':
@@ -3424,7 +3597,8 @@
 		int stats = r_config_get_i (core->config, "esil.stats");
 		int noNULL = r_config_get_i (core->config, "esil.noNULL");
 		int verbose = r_config_get_i (core->config, "esil.verbose");
-		if (!(esil = r_anal_esil_new (stacksize, iotrap))) {
+		unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+		if (!(esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
 			return;
 		}
 		r_anal_esil_setup (esil, core->anal, romem, stats, noNULL); // setup io
@@ -3506,6 +3680,8 @@
 			eprintf ("Cannot deinitialize %s\n", name);
 		}
 		r_flag_unset_name (core->flags, name);
+		r_flag_unset_name (core->flags, "aeim.stack");
+		r_flag_unset_name (core->flags, "aeim.fd");
 		// eprintf ("Deinitialized %s\n", name);
 		return;
 	}
@@ -3579,7 +3755,8 @@
 	if (!core->anal->esil) {
 		int iotrap = r_config_get_i (core->config, "esil.iotrap");
 		ut64 stackSize = r_config_get_i (core->config, "esil.stack.size");
-		if (!(core->anal->esil = r_anal_esil_new (stackSize, iotrap))) {
+		unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+		if (!(core->anal->esil = r_anal_esil_new (stackSize, iotrap, addrsize))) {
 			R_FREE (regstate);
 			return;
 		}
@@ -3601,18 +3778,21 @@
 	RList *regs;
 	RList *regread;
 	RList *regwrite;
+	RList *inputregs;
 } AeaStats;
 
 static void aea_stats_init (AeaStats *stats) {
 	stats->regs = r_list_newf (free);
 	stats->regread = r_list_newf (free);
 	stats->regwrite = r_list_newf (free);
+	stats->inputregs = r_list_newf (free);
 }
 
 static void aea_stats_fini (AeaStats *stats) {
 	R_FREE (stats->regs);
 	R_FREE (stats->regread);
 	R_FREE (stats->regwrite);
+	R_FREE (stats->inputregs);
 }
 
 static bool contains(RList *list, const char *name) {
@@ -3643,6 +3823,9 @@
 			return len;
 		}
 	}
+	if (!r_io_is_valid_offset (esil->anal->iob.io, addr, 0)) {
+		return false;
+	}
 	n = R_NEW (AeaMemItem);
 	if (n) {
 		n->addr = addr;
@@ -3660,6 +3843,9 @@
 			return len;
 		}
 	}
+	if (!r_io_is_valid_offset (esil->anal->iob.io, addr, 0)) {
+		return false;
+	}
 	n = R_NEW (AeaMemItem);
 	if (n) {
 		n->addr = addr;
@@ -3689,6 +3875,11 @@
 static int myregread(RAnalEsil *esil, const char *name, ut64 *val, int *len) {
 	AeaStats *stats = esil->user;
 	if (!IS_DIGIT (*name)) {
+		if (!contains (stats->inputregs, name)) {
+			if (!contains (stats->regwrite, name)) {
+				r_list_push (stats->inputregs, strdup (name));
+			}
+		}
 		if (!contains (stats->regs, name)) {
 			r_list_push (stats->regs, strdup (name));
 		}
@@ -3737,8 +3928,9 @@
 	RAnalOp aop = R_EMPTY;
 	ut8 *buf;
 	RList* regnow;
-	if (!core)
+	if (!core) {
 		return false;
+	}
 	maxopsize = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MAX_OP_SIZE);
 	if (maxopsize < 1) {
 		maxopsize = 16;
@@ -3773,7 +3965,8 @@
 	int romem = r_config_get_i (core->config, "esil.romem");
 	int stats1 = r_config_get_i (core->config, "esil.stats");
 	int noNULL = r_config_get_i (core->config, "esil.noNULL");
-	esil = r_anal_esil_new (stacksize, iotrap);
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+	esil = r_anal_esil_new (stacksize, iotrap, addrsize);
 	r_anal_esil_setup (esil, core->anal, romem, stats1, noNULL); // setup io
 #	define hasNext(x) (x&1) ? (addr<addr_end) : (ops<ops_end)
 
@@ -3786,7 +3979,7 @@
 	esil->cb.hook_mem_read = mymemread;
 	esil->nowrite = true;
 	for (ops = ptr = 0; ptr < buf_sz && hasNext (mode); ops++, ptr += len) {
-		len = r_anal_op (core->anal, &aop, addr + ptr, buf + ptr, buf_sz - ptr);
+		len = r_anal_op (core->anal, &aop, addr + ptr, buf + ptr, buf_sz - ptr, R_ANAL_OP_MASK_ESIL);
 		esilstr = R_STRBUF_SAFEGET (&aop.esil);
 		if (len < 1) {
 			eprintf ("Invalid 0x%08"PFMT64x" instruction %02x %02x\n",
@@ -3836,6 +4029,8 @@
 	} else if ((mode >> 4) & 1) {
 		r_cons_printf ("{\"A\":");
 		showregs_json (stats.regs);
+		r_cons_printf (",\"I\":");
+		showregs_json (stats.inputregs);
 		r_cons_printf (",\"R\":");
 		showregs_json (stats.regread);
 		r_cons_printf (",\"W\":");
@@ -3847,13 +4042,15 @@
 	} else if ((mode >> 5) & 1) {
 		// nothing
 	} else {
-		r_cons_printf ("A: ");
+		r_cons_printf (" I: ");
+		showregs (stats.inputregs);
+		r_cons_printf (" A: ");
 		showregs (stats.regs);
-		r_cons_printf ("R: ");
+		r_cons_printf (" R: ");
 		showregs (stats.regread);
-		r_cons_printf ("W: ");
+		r_cons_printf (" W: ");
 		showregs (stats.regwrite);
-		r_cons_printf ("N: ");
+		r_cons_printf ("NW: ");
 		if (r_list_length (regnow)) {
 			showregs (regnow);
 		} else {
@@ -3861,13 +4058,19 @@
 		}
 		RListIter *iter;
 		ut64 *n;
-		int c = 0;
-		r_list_foreach (mymemxsr, iter, n) {
-			r_cons_printf ("L%d: 0x%08"PFMT64x"\n", c++, *n);
+		if (!r_list_empty (mymemxsr)) {
+			r_cons_printf ("@R:");
+			r_list_foreach (mymemxsr, iter, n) {
+				r_cons_printf (" 0x%08"PFMT64x, *n);
+			}
+			r_cons_newline ();
 		}
-		c = 0;
-		r_list_foreach (mymemxsw, iter, n) {
-			r_cons_printf ("L%d: 0x%08"PFMT64x"\n", c++, *n);
+		if (!r_list_empty (mymemxsw)) {
+			r_cons_printf ("@W:");
+			r_list_foreach (mymemxsw, iter, n) {
+				r_cons_printf (" 0x%08"PFMT64x, *n);
+			}
+			r_cons_newline ();
 		}
 	}
 	r_list_free (mymemxsr);
@@ -3890,14 +4093,15 @@
 	const int mininstrsz = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
 	const int minopcode = R_MAX (1, mininstrsz);
 	const char *pc = r_reg_get_name (core->dbg->reg, R_REG_NAME_PC);
-	RRegItem *r = r_reg_get (core->dbg->reg, pc, -1);	
+	RRegItem *r = r_reg_get (core->dbg->reg, pc, -1);
 	int stacksize = r_config_get_i (core->config, "esil.stack.depth");
 	int iotrap = r_config_get_i (core->config, "esil.iotrap");
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
 
 	if (!esil) {
-		if (!(esil = r_anal_esil_new (stacksize, iotrap))) {
+		if (!(esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
 			return;
-		}	
+		}
 	}
 	buf = malloc (bsize);
 	if (!buf) {
@@ -3908,7 +4112,7 @@
 	if (addr == -1) {
 		addr = r_debug_reg_get (core->dbg, pc);
 	}
-	ut64 curpc = addr;	
+	ut64 curpc = addr;
 	ut64 oldoff = core->offset;
 	for (i = 0, j = 0; j < off ; i++, j++) {
 		if (r_cons_is_breaked ()) {
@@ -3918,9 +4122,9 @@
 			i = 0;
 		}
 		if (!i) {
-			r_core_read_at (core, addr, buf, bsize);
+			r_io_read_at (core->io, addr, buf, bsize);
 		}
-		ret = r_anal_op (core->anal, &aop, addr, buf + i, bsize - i);
+		ret = r_anal_op (core->anal, &aop, addr, buf + i, bsize - i, R_ANAL_OP_MASK_BASIC);
 		instr_size += ret;
 		int inc = (core->search->align > 0)? core->search->align - 1: ret - 1;
 		if (inc < 0) {
@@ -3928,12 +4132,12 @@
 		}
 		i += inc;
 		addr += inc;
-		r_anal_op_fini (&aop);	
+		r_anal_op_fini (&aop);
 	}
-	r_reg_set_value (core->dbg->reg, r, curpc); 
+	r_reg_set_value (core->dbg->reg, r, curpc);
 	r_core_esil_step (core, curpc + instr_size, NULL, NULL);
 	r_core_seek (core, oldoff, 1);
-}	
+}
 
 static void cmd_anal_esil(RCore *core, const char *input) {
 	RAnalEsil *esil = core->anal->esil;
@@ -3947,6 +4151,8 @@
 	int stats = r_config_get_i (core->config, "esil.stats");
 	int noNULL = r_config_get_i (core->config, "esil.noNULL");
 	ut64 until_addr = UT64_MAX;
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+
 	const char *until_expr = NULL;
 	RAnalOp *op;
 
@@ -3994,7 +4200,7 @@
 	case ' ':
 		//r_anal_esil_eval (core->anal, input+1);
 		if (!esil) {
-			if (!(core->anal->esil = esil = r_anal_esil_new (stacksize, iotrap)))
+			if (!(core->anal->esil = esil = r_anal_esil_new (stacksize, iotrap, addrsize)))
 				return;
 		}
 		r_anal_esil_setup (esil, core->anal, romem, stats, noNULL); // setup io
@@ -4017,8 +4223,8 @@
 		case 'l': // "aesl"
 		{
 			ut64 pc = r_debug_reg_get (core->dbg, "PC");
-			RAnalOp *op = r_core_anal_op (core, pc);
-// TODO: honor hint
+			RAnalOp *op = r_core_anal_op (core, pc, R_ANAL_OP_MASK_BASIC);
+			// TODO: honor hint
 			if (!op) {
 				break;
 			}
@@ -4026,6 +4232,7 @@
 			r_debug_reg_set (core->dbg, "PC", pc + op->size);
 			r_anal_esil_set_pc (esil, pc + op->size);
 			r_core_cmd0 (core, ".ar*");
+			r_anal_op_free (op);
 		} break;
 		case 'b': // "aesb"
 			if (!r_core_esil_step_back (core)) {
@@ -4045,7 +4252,7 @@
 		case 'o': // "aeso"
 			// step over
 			op = r_core_anal_op (core, r_reg_getv (core->anal->reg,
-				r_reg_get_name (core->anal->reg, R_REG_NAME_PC)));
+				r_reg_get_name (core->anal->reg, R_REG_NAME_PC)), R_ANAL_OP_MASK_BASIC);
 			if (op && op->type == R_ANAL_OP_TYPE_CALL) {
 				until_addr = op->addr + op->size;
 			}
@@ -4055,9 +4262,9 @@
 			break;
 		case 'p': //"aesp"
 			n = strchr (input, ' ');
-			n1 = strchr (n + 1, ' ');
-			if (!(n + 1) || !(n1 + 1)){
-				eprintf ("aesp [offset] [num]");
+			n1 = n ? strchr (n + 1, ' ') : NULL;
+			if ((!n || !n1) || (!(n + 1) || !(n1 + 1))) {
+				eprintf ("aesp [offset] [num]\n");
 				break;
 			}
 			adr = r_num_math (core->num, n + 1);
@@ -4069,7 +4276,7 @@
 			if (!(n + 1)) {
 				r_core_esil_step (core, until_addr, until_expr, NULL);
 				break;
-			}	
+			}
 			off = r_num_math (core->num, n + 1);
 			cmd_aespc (core, -1, off);
 			break;
@@ -4084,36 +4291,52 @@
 			r_core_cmd_help (core, help_msg_aec);
 		} else if (input[1] == 's') { // "aecs"
 			const char *pc = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
-			ut64 newaddr;
-			int ret;
 			for (;;) {
-				op = r_core_anal_op (core, addr);
+				if (!r_core_esil_step (core, UT64_MAX, NULL, NULL)) {
+					break;
+				}
+				r_core_cmd0 (core, ".ar*");
+				addr = r_num_get (core->num, pc);
+				op = r_core_anal_op (core, addr, R_ANAL_OP_MASK_BASIC);
 				if (!op) {
 					break;
 				}
 				if (op->type == R_ANAL_OP_TYPE_SWI) {
 					eprintf ("syscall at 0x%08" PFMT64x "\n", addr);
 					break;
-				}
-				if (op->type == R_ANAL_OP_TYPE_TRAP) {
+				} else if (op->type == R_ANAL_OP_TYPE_TRAP) {
 					eprintf ("trap at 0x%08" PFMT64x "\n", addr);
 					break;
 				}
-				ret = r_core_esil_step (core, UT64_MAX, NULL, NULL);
 				r_anal_op_free (op);
 				op = NULL;
 				if (core->anal->esil->trap || core->anal->esil->trap_code) {
 					break;
 				}
-				if (!ret)
+			}
+			if (op) {
+				r_anal_op_free (op);
+			}
+		} else if (input[1] == 'c') { // "aecc"
+			const char *pc = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
+			for (;;) {
+				if (!r_core_esil_step (core, UT64_MAX, NULL, NULL)) {
 					break;
+				}
 				r_core_cmd0 (core, ".ar*");
-				newaddr = r_num_get (core->num, pc);
-				if (addr == newaddr) {
-					addr++;
+				addr = r_num_get (core->num, pc);
+				op = r_core_anal_op (core, addr, R_ANAL_OP_MASK_BASIC);
+				if (!op) {
+					break;
+				}
+				if (op->type == R_ANAL_OP_TYPE_CALL || op->type == R_ANAL_OP_TYPE_UCALL) {
+					eprintf ("call at 0x%08" PFMT64x "\n", addr);
+					break;
+				}
+				r_anal_op_free (op);
+				op = NULL;
+				if (core->anal->esil->trap || core->anal->esil->trap_code) {
 					break;
-				} else {
-					addr = newaddr;
 				}
 			}
 			if (op) {
@@ -4134,11 +4357,11 @@
 		break;
 	case 'i': // "aei"
 		switch (input[1]) {
-		case 's':
+		case 's': // "aeis"
 		case 'm': // "aeim"
 			cmd_esil_mem (core, input + 2);
 			break;
-		case 'p': // initialize pc = $$
+		case 'p': // "aeip" // initialize pc = $$
 			r_core_cmd0 (core, "ar PC=$$");
 			break;
 		case '?':
@@ -4160,7 +4383,7 @@
 					r_core_cmd0 (core, "ar PC=$$");
 				}
 			}
-			if (!(esil = core->anal->esil = r_anal_esil_new (stacksize, iotrap))) {
+			if (!(esil = core->anal->esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
 				return;
 			}
 			r_anal_esil_setup (esil, core->anal, romem, stats, noNULL); // setup io
@@ -4226,7 +4449,7 @@
 				while (pc < end) {
 					left = R_MIN (end - pc, 32);
 					r_asm_set_pc (core->assembler, pc);
-					ret = r_anal_op (core->anal, &op, addr, buf, left); // read overflow
+					ret = r_anal_op (core->anal, &op, addr, buf, left, R_ANAL_OP_MASK_ESIL); // read overflow
 					if (ret) {
 						r_reg_set_value_by_role (core->anal->reg, R_REG_NAME_PC, pc);
 						r_anal_esil_parse (esil, R_STRBUF_SAFEGET (&op.esil));
@@ -4247,9 +4470,10 @@
 		case 'r': // "aetr"
 		{
 			// anal ESIL to REIL.
-			RAnalEsil *esil = r_anal_esil_new (stacksize, iotrap);
-			if (!esil)
+			RAnalEsil *esil = r_anal_esil_new (stacksize, iotrap, addrsize);
+			if (!esil) {
 				return;
+			}
 			r_anal_esil_to_reil_setup (esil, core->anal, romem, stats);
 			r_anal_esil_set_pc (esil, core->offset);
 			r_anal_esil_parse (esil, input + 2);
@@ -4325,43 +4549,25 @@
 				break;
 			}
 		} else {
-			cmd_aea (core, 0, core->offset, r_num_math (core->num, input+2));
+			const char *arg = input[1]? input + 2: "";
+			ut64 len = r_num_math (core->num, arg);
+			cmd_aea (core, 0, core->offset, len);
 		}
 		break;
-	case 'x': { // "aex"	
-		ut32 new_bits = -1;
-		int segoff, old_bits, pos = 0;
-		char *new_arch = NULL, *old_arch = NULL, *hex = NULL;
-		old_arch = strdup (r_config_get (core->config, "asm.arch"));
-		old_bits = r_config_get_i (core->config, "asm.bits");
-		segoff = r_config_get_i (core->config, "asm.segoff");
-
-		if (input[0]) {
-			for (pos = 1; pos < R_BIN_SIZEOF_STRINGS && input[pos]; pos++)
-				if (input[pos] == ' ') {
-					break;
-				}
-		}
-
-		if (!r_core_process_input_pade (core, input+pos, &hex, &new_arch, &new_bits)) {
-			// XXX - print help message
-			//return false;
-		}
+	case 'x': { // "aex"
+		char *hex;
+		int ret, bufsz;
 
-		if (!new_arch) {
-			new_arch = strdup (old_arch);
-		}
-		if (new_bits == -1) {new_bits = old_bits;
+		input = r_str_trim_ro (input + 1);
+		hex = strdup (input);
+		if (!hex) {
+			break;
 		}
 
-		if (strcmp (new_arch, old_arch) || new_bits != old_bits) {
-			r_core_set_asm_configs (core, new_arch, new_bits, segoff);
-		}
-		int ret, bufsz;
 		RAnalOp aop = R_EMPTY;
 		bufsz = r_hex_str2bin (hex, (ut8*)hex);
 		ret = r_anal_op (core->anal, &aop, core->offset,
-			(const ut8*)hex, bufsz);
+			(const ut8*)hex, bufsz, R_ANAL_OP_MASK_ESIL);
 		if (ret>0) {
 			const char *str = R_STRBUF_SAFEGET (&aop.esil);
 			char *str2 = r_str_newf (" %s", str);
@@ -4369,9 +4575,8 @@
 			free (str2);
 		}
 		r_anal_op_fini (&aop);
-		free (old_arch);
-		}
 		break;
+	}
 	case '?': // "ae?"
 		if (input[1] == '?') {
 			r_core_cmd_help (core, help_detail_ae);
@@ -4404,50 +4609,76 @@
 	ut32 tbs = core->blocksize;
 
 	switch (input[0]) {
-	case '?':
-		r_core_cmd_help (core, help_msg_ao);
-		break;
+	case 's': // "aos"
 	case 'j': // "aoj"
 	case 'e': // "aoe"
 	case 'r': {
 		int count = 1;
+		int obs = core->blocksize;
 		if (input[1] && input[2]) {
 			l = (int)r_num_get (core->num, input + 1);
 			if (l > 0) {
 				count = l;
 			}
-			if (l > tbs) {
-				r_core_block_size (core, l * 4);
-				//len = l;
+			l *= 8;
+			if (l > obs) {
+				r_core_block_size (core, l);
 			}
 		} else {
-			len = l = core->blocksize;
 			count = 1;
 		}
-		core_anal_bytes (core, core->block, len, count, input[0]);
+		core_anal_bytes (core, core->block, core->blocksize, count, input[0]);
+		if (obs != core->blocksize) {
+			r_core_block_size (core, obs);
+		}
 		}
 		break;
+	case 'd': // "aod"
+                if (input[1] == 'a') { // "aoda"
+                        // list sdb database
+                        sdb_foreach (core->assembler->pair, listOpDescriptions, core);
+                } else if (input[1] == 0) {
+                        int cur = R_MAX (core->print->cur, 0);
+                        // XXX: we need cmd_xxx.h (cmd_anal.h)
+                        core_anal_bytes (core, core->block + cur, core->blocksize, 1, 'd');
+                } else if (input[1] == ' ') {
+                        char *d = r_asm_describe (core->assembler, input + 2);
+                        if (d && *d) {
+                                r_cons_println (d);
+                                free (d);
+                        } else {
+                                eprintf ("Unknown mnemonic\n");
+                        }
+                } else {
+                        eprintf ("Use: aod[?a] ([opcode])    describe current, [given] or all mnemonics\n");
+                }
+                break;
 	case '*':
 		r_core_anal_hint_list (core->anal, input[0]);
 		break;
-	default: {
-		int count = 0;
-		if (input[0]) {
-			l = (int)r_num_get (core->num, input + 1);
-			if (l > 0) {
-				count = l;
-			}
-			if (l > tbs) {
-				r_core_block_size (core, l * 4);
-				//len = l;
+	case 0:
+	case ' ': {
+			int count = 0;
+			if (input[0]) {
+				l = (int)r_num_get (core->num, input + 1);
+				if (l > 0) {
+					count = l;
+				}
+				if (l > tbs) {
+					r_core_block_size (core, l * 4);
+					//len = l;
+				}
+			} else {
+				len = l = core->blocksize;
+				count = 1;
 			}
-		} else {
-			len = l = core->blocksize;
-			count = 1;
+			core_anal_bytes (core, core->block, len, count, 0);
 		}
-		core_anal_bytes (core, core->block, len, count, 0);
 		break;
-	}
+	default:
+	case '?':
+		r_core_cmd_help (core, help_msg_ao);
+		break;
 	}
 }
 
@@ -4522,7 +4753,7 @@
 		if (!bufi) {
 			r_io_read_at (core->io, addr, buf, 4096);
 		}
-		if (r_anal_op (core->anal, &op, addr, buf + bufi, 4096 - bufi)) {
+		if (r_anal_op (core->anal, &op, addr, buf + bufi, 4096 - bufi, R_ANAL_OP_MASK_BASIC)) {
 			if (op.size < 1) {
 				// XXX must be +4 on arm/mips/.. like we do in disasm.c
 				op.size = minop;
@@ -4553,7 +4784,6 @@
 }
 
 static void cmd_anal_blocks(RCore *core, const char *input) {
-
 	ut64 from , to;
 	char *arg = strchr (input, ' ');
 	r_cons_break_push (NULL, NULL);
@@ -4607,84 +4837,88 @@
 
 static void _anal_calls(RCore *core, ut64 addr, ut64 addr_end) {
 	RAnalOp op;
-	int bufi, minop = 1; // 4
 	int depth = r_config_get_i (core->config, "anal.depth");
 	const int addrbytes = core->io->addrbytes;
 	const int bsz = 4096;
-	ut8 *buf;
-	ut8 *block;
-	bufi = 0;
+	int bufi = 0;
+	int bufi_max = bsz - 16;
 	if (addr_end - addr > UT32_MAX) {
 		return;
 	}
-	buf = malloc (bsz);
-	block = malloc (bsz);
-	if (!buf) {
-		eprintf ("Error: cannot allocate a block\n");
-		free (block);
-		return;
-	}
-	if (!block) {
-		eprintf ("Error: cannot allocate a temp block\n");
+	ut8 *buf = malloc (bsz);
+	ut8 *block0 = calloc (1, bsz);
+	ut8 *block1 = malloc (bsz);
+	if (!buf || !block0 || !block1) {
+		eprintf ("Error: cannot allocate buf or block\n");
 		free (buf);
+		free (block0);
+		free (block1);
 		return;
-	}	
+	}
+	memset (block1, -1, bsz);
+	int minop = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
+	if (minop < 1) {
+		minop = 1;
+	}
+	int setBits = r_config_get_i (core->config, "asm.bits");
+	r_cons_break_push (NULL, NULL);
 	while (addr < addr_end) {
 		if (r_cons_is_breaked ()) {
 			break;
 		}
 		// TODO: too many ioreads here
-		if (bufi > 4000) {
+		if (bufi > bufi_max) {
 			bufi = 0;
 		}
 		if (!bufi) {
-			r_io_read_at (core->io, addr, buf, bsz);
+			(void)r_io_read_at (core->io, addr, buf, bsz);
 		}
-		memset (block, -1, bsz);
-		if (!memcmp (buf, block, bsz)) {
+		if (!memcmp (buf, block0, bsz) || !memcmp (buf, block1, bsz)) {
 			//eprintf ("Error: skipping uninitialized block \n");
 			addr += bsz;
 			continue;
 		}
-		memset (block, 0, bsz);
-		if (!memcmp (buf, block, bsz)) {
-			//eprintf ("Error: skipping uninitialized block \n");
-			addr += bsz;
-			continue;
-		}	
-		if (r_anal_op (core->anal, &op, addr, buf + bufi, bsz - bufi)) {
+		RAnalHint *hint = r_anal_hint_get (core->anal, addr);
+		if (hint && hint->bits) {
+			setBits = hint->bits;
+		}
+		if (setBits != core->assembler->bits) {
+			r_config_set_i (core->config, "asm.bits", setBits);
+		}
+		if (r_anal_op (core->anal, &op, addr, buf + bufi, bsz - bufi, 0) > 0) {
 			if (op.size < 1) {
-				// XXX must be +4 on arm/mips/.. like we do in disasm.c
 				op.size = minop;
 			}
 			if (op.type == R_ANAL_OP_TYPE_CALL) {
 #if JAYRO_03
-#error FUCK
 				if (!anal_is_bad_call (core, from, to, addr, buf, bufi)) {
 					fcn = r_anal_get_fcn_in (core->anal, op.jump, R_ANAL_FCN_TYPE_ROOT);
 					if (!fcn) {
-						r_core_anal_fcn (core, op.jump, addr,
-						  R_ANAL_REF_TYPE_NULL, depth);
+						r_core_anal_fcn (core, op.jump, addr, R_ANAL_REF_TYPE_CALL, depth);
 					}
 				}
 #else
 				// add xref here
-				r_anal_xrefs_set (core->anal, R_ANAL_REF_TYPE_CALL, addr, op.jump);
+				r_anal_xrefs_set (core->anal, addr, op.jump, R_ANAL_REF_TYPE_CALL);
 				if (r_io_is_valid_offset (core->io, op.jump, 1)) {
-					r_core_anal_fcn (core, op.jump, addr, R_ANAL_REF_TYPE_NULL, depth);
+					r_core_anal_fcn (core, op.jump, addr, R_ANAL_REF_TYPE_CALL, depth);
 				}
 #endif
 			}
-
 		} else {
 			op.size = minop;
 		}
+		if ((int)op.size < 1) {
+			op.size = minop;
+		}
 		addr += op.size;
 		bufi += addrbytes * op.size;
 		r_anal_op_fini (&op);
 	}
+	r_cons_break_pop ();
 	free (buf);
-	free (block);
+	free (block0);
+	free (block1);
 }
 
 static void cmd_anal_calls(RCore *core, const char *input, bool only_print_flag) {
@@ -4733,7 +4967,7 @@
 				//binaries as well
 				if (r_cons_is_breaked ()) {
 					break;
-				}	
+				}
 				if (only_print_flag) {
 					r_cons_printf ("f fcn.0x%08"PFMT64x" %d 0x%08"PFMT64x"\n",
 						addr, r->itv.size, addr);
@@ -4882,12 +5116,13 @@
 	}
 }
 
-static void anal_axg (RCore *core, const char *input, int level, Sdb *db) {
+static void anal_axg (RCore *core, const char *input, int level, Sdb *db, int opts) {
 	char arg[32], pre[128];
 	RList *xrefs;
 	RListIter *iter;
 	RAnalRef *ref;
 	ut64 addr = core->offset;
+	int is_json = opts & R_CORE_ANAL_JSON;
 	if (input && *input) {
 		addr = r_num_math (core->num, input);
 	}
@@ -4902,31 +5137,78 @@
 	if (!r_list_empty (xrefs)) {
 		RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, addr, -1);
 		if (fcn) {
-			//if (sdb_add (db, fcn->name, "1", 0)) {
+			if (is_json) {
+				r_cons_printf ("{\"%"PFMT64u"\":{\"type\":\"fcn\","
+					"\"fcn_addr\":%"PFMT64u",\"name\":\"%s\",\"refs\":[",
+					addr, fcn->addr, fcn->name);
+			} else {
+				//if (sdb_add (db, fcn->name, "1", 0)) {
 				r_cons_printf ("%s0x%08"PFMT64x" fcn 0x%08"PFMT64x" %s\n",
 					pre + 2, addr, fcn->addr, fcn->name);
-			//}
+				//}
+			}
 		} else {
+			if (is_json) {
+				r_cons_printf ("{\"%"PFMT64u"\":{\"refs\":[", addr);
+			} else {
 			//snprintf (arg, sizeof (arg), "0x%08"PFMT64x, addr);
 			//if (sdb_add (db, arg, "1", 0)) {
 				r_cons_printf ("%s0x%08"PFMT64x"\n", pre+2, addr);
 			//}
+			}
 		}
 	}
 	r_list_foreach (xrefs, iter, ref) {
 		RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, ref->addr, -1);
 		if (fcn) {
-			r_cons_printf ("%s0x%08"PFMT64x" fcn 0x%08"PFMT64x" %s\n", pre, ref->addr, fcn->addr, fcn->name);
+			if (is_json) {
+				if (level == 0) {
+					r_cons_printf ("{\"%"PFMT64u"\":{\"type\":\"fcn\",\"fcn_addr\": %"PFMT64u",\"name\":\"%s\",\"refs\":[", ref->addr, fcn->addr, fcn->name);
+				} else {
+					r_cons_printf ("]}},{\"%"PFMT64u"\":{\"type\":\"fcn\",\"fcn_addr\": %"PFMT64u",\"name\":\"%s\",\"refs\":[", ref->addr, fcn->addr, fcn->name);
+
+				}
+			} else {
+				r_cons_printf ("%s0x%08"PFMT64x" fcn 0x%08"PFMT64x" %s\n", pre, ref->addr, fcn->addr, fcn->name);
+			}
 			if (sdb_add (db, fcn->name, "1", 0)) {
 				snprintf (arg, sizeof (arg), "0x%08"PFMT64x, fcn->addr);
-				anal_axg (core, arg, level+1, db);
+				anal_axg (core, arg, level+1, db, opts);
+			} else {
+				if (is_json) {
+					r_cons_printf("]}}");
+				}
+			}
+			if (is_json) {
+				if (iter->n) {
+					r_cons_printf (",");
+				}
 			}
 		} else {
-			r_cons_printf ("%s0x%08"PFMT64x" ???\n", pre, ref->addr);
+			if (is_json) {
+				r_cons_printf ("{\"%"PFMT64u"\":{\"type\":\"???\",\"refs\":[", ref->addr);
+			} else {
+				r_cons_printf ("%s0x%08"PFMT64x" ???\n", pre, ref->addr);
+			}
 			snprintf (arg, sizeof (arg), "0x%08"PFMT64x, ref->addr);
 			if (sdb_add (db, arg, "1", 0)) {
-				anal_axg (core, arg, level +1, db);
+				anal_axg (core, arg, level +1, db, opts);
+			} else {
+				if (is_json) {
+					r_cons_printf("]}}");
+				}
 			}
+			if (is_json) {
+				if (iter->n) {
+					r_cons_printf (",");
+				}
+			}
+		}
+	}
+	if (is_json) {
+		r_cons_printf("]}}");
+		if (level == 0) {
+			r_cons_printf("\n");
 		}
 	}
 	r_list_free (xrefs);
@@ -4950,7 +5232,7 @@
 		RAnalRef *ref;
 		char *cp_inp = strdup (input + 1);
 		char *ptr = r_str_trim_head (cp_inp);
-		if (!strcmp (ptr, "*")) {
+		if (!strcmp (ptr, "*")) { // "ax-*"
 			r_anal_xrefs_init (core->anal);
 		} else {
 			int n = r_str_word_set0 (ptr);
@@ -4970,33 +5252,28 @@
 			if (list) {
 				r_list_foreach (list, iter, ref) {
 					if (from != UT64_MAX && from == ref->addr) {
-						r_anal_ref_del (core->anal, ref->addr, ref->at);
+						r_anal_xref_del (core->anal, ref->addr, ref->at);
 					}
 					if (from == UT64_MAX) {
-						r_anal_ref_del (core->anal, ref->addr, ref->at);
+						r_anal_xref_del (core->anal, ref->addr, ref->at);
 					}
 				}
-				r_list_free (list);
 			}
+			r_list_free (list);
 		}
 		free (cp_inp);
 	} break;
 	case 'g': // "axg"
 		{
 			Sdb *db = sdb_new0 ();
-			anal_axg (core, input[1] ? input + 2 : NULL, 0, db);
+			if(input[1] == '\0') {
+				anal_axg (core, input[1] ? input + 2 : NULL, 0, db, 0);
+			} else if(input[1] == 'j') {
+				anal_axg (core, input[1] ? input + 2 : NULL, 0, db, R_CORE_ANAL_JSON);
+			}
 			sdb_free (db);
 		}
 		break;
-	case 'k': // "axk"
-		if (input[1] == '?') {
-			eprintf ("Usage: axk [query]\n");
-		} else if (input[1] == ' ') {
-			sdb_query (core->anal->sdb_xrefs, input + 2);
-		} else {
-			r_core_anal_ref_list (core, 'k');
-		}
-		break;
 	case '\0': // "ax"
 	case 'j': // "axj"
 	case 'q': // "axq"
@@ -5026,12 +5303,13 @@
 					r_cons_printf ("0x%" PFMT64x "\n", ref->addr);
 				}
 			} else if (input[1] == 'j') { // "axtj"
-				bool asm_varsub = r_config_get_i (core->config, "asm.varsub");
+				bool asm_varsub = r_config_get_i (core->config, "asm.var.sub");
+				core->parser->pseudo = r_config_get_i (core->config, "asm.pseudo");
 				core->parser->relsub = r_config_get_i (core->config, "asm.relsub");
-				core->parser->localvar_only = r_config_get_i (core->config, "asm.varsub_only");
+				core->parser->localvar_only = r_config_get_i (core->config, "asm.var.subonly");
 				r_cons_printf ("[");
 				r_list_foreach (list, iter, ref) {
-					r_core_read_at (core, ref->addr, buf, size);
+					r_io_read_at (core->io, ref->addr, buf, size);
 					r_asm_set_pc (core->assembler, ref->addr);
 					r_asm_disassemble (core->assembler, &asmop, buf, size);
 					char str[512];
@@ -5043,9 +5321,9 @@
 					r_parse_filter (core->parser, core->flags,
 							asmop.buf_asm, str, sizeof (str), core->print->big_endian);
 
-					r_cons_printf ("{\"from\":%" PFMT64u ",\"type\":\"%s\",\"opcode\":\"%s\"", ref->addr, r_anal_ref_to_string (ref->type), str);
+					r_cons_printf ("{\"from\":%" PFMT64u ",\"type\":\"%s\",\"opcode\":\"%s\"", ref->addr, r_anal_xrefs_type_tostring (ref->type), str);
 					if (fcn) {
-						r_cons_printf (",\"fcn_addr\":%"PFMT64d",\"fcn_name\":\"%s\"", fcn->addr, fcn->name);
+						r_cons_printf (",\"fcn_addr\":%"PFMT64u",\"fcn_name\":\"%s\"", fcn->addr, fcn->name);
 					}
 					RFlagItem *fi = r_flag_get_at (core->flags, fcn? fcn->addr: ref->addr, true);
 					if (fi) {
@@ -5087,14 +5365,15 @@
 				char str[512];
 				RAnalFunction *fcn;
 				char *comment;
-				bool asm_varsub = r_config_get_i (core->config, "asm.varsub");
+				bool asm_varsub = r_config_get_i (core->config, "asm.var.sub");
+				core->parser->pseudo = r_config_get_i (core->config, "asm.pseudo");
 				core->parser->relsub = r_config_get_i (core->config, "asm.relsub");
-				core->parser->localvar_only = r_config_get_i (core->config, "asm.varsub_only");
+				core->parser->localvar_only = r_config_get_i (core->config, "asm.var.subonly");
 				if (core->parser->relsub) {
 					core->parser->relsub_addr = addr;
 				}
 				r_list_foreach (list, iter, ref) {
-					r_core_read_at (core, ref->addr, buf, size);
+					r_io_read_at (core->io, ref->addr, buf, size);
 					r_asm_set_pc (core->assembler, ref->addr);
 					r_asm_disassemble (core->assembler, &asmop, buf, size);
 
@@ -5107,7 +5386,7 @@
 							asmop.buf_asm, str, sizeof (str), core->print->big_endian);
 					if (has_color) {
 						buf_asm = r_print_colorize_opcode (core->print, str,
-							core->cons->pal.reg, core->cons->pal.num, false);
+							core->cons->pal.reg, core->cons->pal.num, false, fcn ? fcn->addr : 0);
 					} else {
 						buf_asm = r_str_new (str);
 					}
@@ -5116,17 +5395,17 @@
 						? r_str_newf ("%s; %s", fcn ?  fcn->name : "(nofunc)", strtok (comment, "\n"))
 						: r_str_newf ("%s", fcn ? fcn->name : "(nofunc)");
 					r_cons_printf ("%s 0x%" PFMT64x " [%s] %s\n",
-						buf_fcn, ref->addr, r_anal_ref_to_string (ref->type), buf_asm);
+						buf_fcn, ref->addr, r_anal_xrefs_type_tostring (ref->type), buf_asm);
 					free (buf_asm);
 					free (buf_fcn);
 				}
 			}
-			r_list_free (list);
 		} else {
 			if (input[1] == 'j') { // "axtj"
 				r_cons_print ("[]\n");
 			}
 		}
+		r_list_free (list);
 	} break;
 	case 'f': { // "axf"
 		ut8 buf[12];
@@ -5136,6 +5415,7 @@
 		RAnalRef *ref;
 		RListIter *iter;
 		char *space = strchr (input, ' ');
+		RAnalFunction * fcn = r_anal_get_fcn_in (core->anal, addr, 0);
 
 		if (space) {
 			addr = r_num_math (core->num, space + 1);
@@ -5145,7 +5425,6 @@
 		if (input[1] == '.') { // axf.
 			list = list_ = r_anal_xrefs_get_from (core->anal, addr);
 			if (!list) {
-				RAnalFunction * fcn = r_anal_get_fcn_in (core->anal, addr, 0);
 				list = r_anal_fcn_get_refs (core->anal, fcn);
 			}
 		} else {
@@ -5160,11 +5439,11 @@
 			} else if (input[1] == 'j') { // axfj
 				r_cons_print ("[");
 				r_list_foreach (list, iter, ref) {
-					r_core_read_at (core, ref->at, buf, 12);
+					r_io_read_at (core->io, ref->at, buf, 12);
 					r_asm_set_pc (core->assembler, ref->at);
 					r_asm_disassemble (core->assembler, &asmop, buf, 12);
-					r_cons_printf ("{\"from\":%" PFMT64d ",\"to\":%" PFMT64d ",\"type\":\"%s\",\"opcode\":\"%s\"}%s",
-						ref->at, ref->addr, r_anal_ref_to_string (ref->type), asmop.buf_asm, iter->n? ",": "");
+					r_cons_printf ("{\"from\":%" PFMT64u ",\"to\":%" PFMT64u ",\"type\":\"%s\",\"opcode\":\"%s\"}%s",
+						ref->at, ref->addr, r_anal_xrefs_type_tostring (ref->type), asmop.buf_asm, iter->n? ",": "");
 				}
 				r_cons_print ("]\n");
 			} else if (input[1] == '*') { // axf*
@@ -5177,14 +5456,14 @@
 				char str[512];
 				int has_color = core->print->flags & R_PRINT_FLAGS_COLOR;
 				r_list_foreach (list, iter, ref) {
-					r_core_read_at (core, ref->at, buf, 12);
+					r_io_read_at (core->io, ref->at, buf, 12);
 					r_asm_set_pc (core->assembler, ref->at);
 					r_asm_disassemble (core->assembler, &asmop, buf, 12);
 					r_parse_filter (core->parser, core->flags,
 							asmop.buf_asm, str, sizeof (str), core->print->big_endian);
 					if (has_color) {
 						buf_asm = r_print_colorize_opcode (core->print, str,
-							core->cons->pal.reg, core->cons->pal.num, false);
+							core->cons->pal.reg, core->cons->pal.num, false, fcn ? fcn->addr : 0);
 					} else {
 						buf_asm = r_str_new (str);
 					}
@@ -5193,7 +5472,7 @@
 
 					if (ref->type == R_ANAL_REF_TYPE_CALL) {
 						RAnalOp aop;
-						r_anal_op (core->anal, &aop, ref->at, buf, 12);
+						r_anal_op (core->anal, &aop, ref->at, buf, 12, R_ANAL_OP_MASK_BASIC);
 						if (aop.type == R_ANAL_OP_TYPE_UCALL) {
 							cmd_anal_ucall_ref (core, ref->addr);
 						}
@@ -5202,13 +5481,12 @@
 					free (buf_asm);
 				}
 			}
-			r_list_free (list_);
-			r_list_free (list);
 		} else {
 			if (input[1] == 'j') { // axfj
 				r_cons_print ("[]\n");
 			}
 		}
+		r_list_free (list);
 	} break;
 	case 'F':
 		find_refs (core, input + 1);
@@ -5216,12 +5494,14 @@
 	case 'C': // "axC"
 	case 'c': // "axc"
 	case 'd': // "axd"
+	case 's': // "axs"
 	case ' ': // "ax "
 		{
 		char *ptr = strdup (r_str_trim_head ((char *)input + 1));
 		int n = r_str_word_set0 (ptr);
 		ut64 at = core->offset;
 		ut64 addr = UT64_MAX;
+		RAnalRefType reftype = r_anal_xrefs_type (input[0]);
 		switch (n) {
 		case 2: // get at
 			at = r_num_math (core->num, r_str_word_get0 (ptr, 1));
@@ -5233,7 +5513,7 @@
 			free (ptr);
 			return false;
 		}
-		r_anal_xrefs_set (core->anal, input[0], at, addr);
+		r_anal_xrefs_set (core->anal, at, addr, reftype);
 		free (ptr);
 		}
 	   	break;
@@ -5392,6 +5672,12 @@
 			r_anal_hint_unset_pointer (core->anal, core->offset);
 		}
 		break;
+	case 'r': // "ahr"
+		if (input[1] == ' ') {
+			r_anal_hint_set_ret (core->anal, core->offset, r_num_math (core->num, input + 1));
+		} else if (input[1] == '-') { // "ahr-"
+			r_anal_hint_unset_ret (core->anal, core->offset);
+		}
 	case '*': // "ah*"
 		if (input[1] == ' ') {
 			char *ptr = strdup (r_str_trim_ro (input + 2));
@@ -5434,6 +5720,21 @@
 	}
 }
 
+static void agraph_print_node_gml(RANode *n, void *user) {
+	r_cons_printf ("  node [\n"
+		"    id  %d\n"
+		"    label  \"%s\"\n"
+		"  ]\n", n->gnode->idx, n->title);
+}
+
+static void agraph_print_edge_gml(RANode *from, RANode *to, void *user) {
+	r_cons_printf ("  edge [\n"
+		"    source  %d\n"
+		"    target  %d\n"
+		"  ]\n", from->gnode->idx, to->gnode->idx
+		);
+}
+
 static void agraph_print_node_dot(RANode *n, void *user) {
 	char *label = strdup (n->body);
 	//label = r_str_replace (label, "\n", "\\l", 1);
@@ -5451,7 +5752,7 @@
 	char *encbody, *cmd;
 	int len = strlen (n->body);
 
-	if (n->body[len - 1] == '\n') {
+	if (len > 0 && n->body[len - 1] == '\n') {
 		len--;
 	}
 	encbody = r_base64_encode_dyn (n->body, len);
@@ -5461,6 +5762,57 @@
 	free (encbody);
 }
 
+static char *getViewerPath() {
+	int i;
+	const char *viewers[] = {
+#if __WINDOWS__
+		"explorer",
+#else
+		"open",
+		"geeqie",
+		"gqview",
+		"eog",
+		"xdg-open",
+#endif
+		NULL
+	};
+	for (i = 0; viewers[i]; i++) {
+		char *viewerPath = r_file_path (viewers[i]);
+		if (viewerPath && strcmp (viewerPath, viewers[i])) {
+			return viewerPath;
+		}
+		free (viewerPath);
+	}
+	return NULL;
+}
+
+static char* graph_cmd(RCore *core, char *r2_cmd, const char *save_path) {
+	char *cmd = NULL;
+	const char *ext = r_config_get (core->config, "graph.gv.format");
+	char *dotPath = r_file_path ("dot");
+	if (!r_file_exists (dotPath)) {
+		free (dotPath);
+		dotPath = r_file_path ("xdot");
+	}
+	if (r_file_exists (dotPath)) {
+		if (save_path && *save_path) {
+			cmd = r_str_newf ("%s > a.dot;!%s -T%s -o%s a.dot;", r2_cmd, dotPath, ext, save_path);
+		} else {
+			char *viewer = getViewerPath();
+			if (viewer) {
+				cmd = r_str_newf ("%s > a.dot;!%s -T%s -oa.%s a.dot;!%s a.%s", r2_cmd, dotPath, ext, ext, viewer, ext);
+				free (viewer);
+			} else {
+				eprintf ("Cannot find a valid picture viewer");
+			}
+		}
+	} else {
+		cmd = r_str_new ("agf");
+	}
+	free (dotPath);
+	return cmd;
+}
+
 static void agraph_print_edge_dot(RANode *from, RANode *to, void *user) {
 	r_cons_printf ("\"%s\" -> \"%s\"\n", from->title, to->title);
 }
@@ -5571,6 +5923,22 @@
 
 static void cmd_agraph_print(RCore *core, const char *input) {
 	switch (*input) {
+	case 0:
+		core->graph->can->linemode = r_config_get_i (core->config, "graph.linemode");
+		core->graph->can->color = r_config_get_i (core->config, "scr.color");
+		r_agraph_set_title (core->graph,
+			r_config_get (core->config, "graph.title"));
+		r_agraph_print (core->graph);
+		break;
+	case 't':{ // "aggt" - tiny graph
+		core->graph->is_tiny = true;
+		int e = r_config_get_i (core->config, "graph.edges");
+		r_config_set_i (core->config, "graph.edges", 0);
+		r_core_visual_graph (core, core->graph, NULL, false);
+		r_config_set_i (core->config, "graph.edges", e);
+		core->graph->is_tiny = false;
+		break;
+		}
 	case 'k': // "aggk"
 	{
 		Sdb *db = r_agraph_get_sdb (core->graph);
@@ -5580,20 +5948,6 @@
 		break;
 	}
 	case 'v': // "aggv"
-	{
-		const char *cmd = r_config_get (core->config, "cmd.graph");
-		if (cmd && *cmd) {
-			char *newCmd = strdup (cmd);
-			if (newCmd) {
-				newCmd = r_str_replace (newCmd, "ag $$", "aggd", 0);
-				r_core_cmd0 (core, newCmd);
-				free (newCmd);
-			}
-		} else {
-			r_core_cmd0 (core, "agf");
-		}
-		break;
-	}
 	case 'i': // "aggi" - open current core->graph in interactive mode
 	{
 		RANode *ran = r_agraph_get_first_node (core->graph);
@@ -5608,45 +5962,138 @@
 			r_core_visual_graph (core, core->graph, NULL, true);
 			r_config_set_i (core->config, "scr.interactive", ov);
 			r_cons_show_cursor (true);
+			r_cons_enable_mouse (false);
 		} else {
 			eprintf ("This graph contains no nodes\n");
 		}
 		break;
 	}
-	case 'd': // "aggd" - dot format
+	case 'd': { // "aggd" - dot format
+		const char *font = r_config_get (core->config, "graph.font");
 		r_cons_printf ("digraph code {\ngraph [bgcolor=white];\n"
 			"node [color=lightgray, style=filled shape=box "
-			"fontname=\"Courier\" fontsize=\"8\"];\n");
+			"fontname=\"%s\" fontsize=\"8\"];\n", font);
 		r_agraph_foreach (core->graph, agraph_print_node_dot, NULL);
 		r_agraph_foreach_edge (core->graph, agraph_print_edge_dot, NULL);
 		r_cons_printf ("}\n");
 		break;
+		}
 	case '*': // "agg*" -
 		r_agraph_foreach (core->graph, agraph_print_node, NULL);
 		r_agraph_foreach_edge (core->graph, agraph_print_edge, NULL);
 		break;
-	case '?':
-		r_core_cmd_help (core, help_msg_agg);
+	case 'J': 
+	case 'j': 
+		r_cons_printf ("{\"nodes\":[");
+		r_agraph_print_json (core->graph);
+		r_cons_printf ("]}\n");
 		break;
-	default:
-		core->graph->can->linemode = r_config_get_i (core->config, "graph.linemode");
-		core->graph->can->color = r_config_get_i (core->config, "scr.color");
-		r_agraph_set_title (core->graph,
-			r_config_get (core->config, "graph.title"));
-		r_agraph_print (core->graph);
+	case 'g':
+		r_cons_printf ("graph\n[\n" "hierarchic 1\n" "label \"\"\n" "directed 1\n");
+		r_agraph_foreach (core->graph, agraph_print_node_gml, NULL);
+		r_agraph_foreach_edge (core->graph, agraph_print_edge_gml, NULL);
+		r_cons_print ("]\n");
 		break;
+	case 'w':{ // "aggw"
+		if (r_config_get_i (core->config, "graph.web")) {
+			r_core_cmd0 (core, "=H /graph/");
+		} else {
+			char *cmd = graph_cmd (core, "aggd", input + 1);
+			if (cmd && *cmd) {
+				if (input[1]) {
+					r_cons_printf ("Saving to file %s ...\n", input + 1);
+					r_cons_flush ();
+				}
+				r_core_cmd0 (core, cmd);
+			}
+			free (cmd);
+		}
+		break;
+	}
+	default:
+		eprintf ("Usage: see ag?\n");
 	}
 }
 
 static void cmd_anal_graph(RCore *core, const char *input) {
-	RList *list;
-	const char *arg;
 	switch (input[0]) {
 	case 'f': // "agf"
-		if (input[1] == 't') { // "agft" - tiny graph
-			r_core_visual_graph (core, NULL, NULL, 2);
-		} else {
+		switch (input[1]) {
+		case 0: // "agf"
 			r_core_visual_graph (core, NULL, NULL, false);
+			break;
+		case ' ':{ // "agf "
+			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
+			r_core_visual_graph (core, NULL, fcn, false);
+			break;
+			}
+		case 'v': // "agfv"
+			eprintf ("\rRendering graph...");
+			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
+			if (fcn) {
+				r_core_visual_graph (core, NULL, fcn, 1);
+			}
+			r_cons_enable_mouse (false);
+			r_cons_show_cursor (true);
+			break;
+		case 't': { // "agft" - tiny graph
+			int e = r_config_get_i (core->config, "graph.edges");
+			r_config_set_i (core->config, "graph.edges", 0);
+			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
+			r_core_visual_graph (core, NULL, fcn, 2);
+			r_config_set_i (core->config, "graph.edges", e);
+			break;
+			}
+		case 'd': // "agfd"
+			if (input[2] == 'm') {
+				r_core_anal_graph (core, r_num_math (core->num, input + 3),
+					R_CORE_ANAL_GRAPHLINES);
+			} else {
+				r_core_anal_graph (core, r_num_math (core->num, input + 2),
+					R_CORE_ANAL_GRAPHBODY);
+			}
+			break;
+		case 'j': // "agfj"
+			r_core_anal_graph (core, r_num_math (core->num, input + 2), R_CORE_ANAL_JSON);
+			break;
+		case 'J': // "agfJ"
+			r_core_anal_graph (core, r_num_math (core->num, input + 2),
+				R_CORE_ANAL_JSON | R_CORE_ANAL_JSON_FORMAT_DISASM);
+			break;
+		case 'g':{ // "agfg"
+			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
+			r_core_print_bb_gml (core, fcn);
+			break;
+			}
+		case 'k':{ // "agfk"
+			r_core_cmdf (core, "ag-; .agf* @ %"PFMT64u"; aggk", core->offset);
+			break;
+			}
+		case '*':{// "agf*"
+			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
+			r_core_print_bb_custom (core, fcn);
+			break;
+			}
+		case 'w':// "agfw"
+			if (r_config_get_i (core->config, "graph.web")) {
+				r_core_cmd0 (core, "=H /graph/");
+			} else {
+				char *cmdargs = r_str_newf ("agfd @ 0x%"PFMT64x, core->offset);
+				char *cmd = graph_cmd (core, cmdargs, input + 2);
+				if (cmd && *cmd) {
+					if (*(input + 2)) {
+						r_cons_printf ("Saving to file %s ...\n", input + 2);
+						r_cons_flush ();
+					}
+					r_core_cmd0 (core, cmd);
+				}
+				free (cmd);
+				free (cmdargs);
+			}
+			break;
+		default:
+			eprintf ("Usage: see ag?\n");
+			break;
 		}
 		break;
 	case '-': // "ag-"
@@ -5664,95 +6111,309 @@
 	case 's': // "ags"
 		r_core_anal_graph (core, r_num_math (core->num, input + 1), 0);
 		break;
-	case 't': // "agt"
-		list = r_core_anal_graph_to (core, r_num_math (core->num, input + 1), 0);
-		if (list) {
-			RListIter *iter, *iter2;
-			RList *list2;
-			RAnalBlock *bb;
-			r_list_foreach (list, iter, list2) {
-				r_list_foreach (list2, iter2, bb) {
-					r_cons_printf ("-> 0x%08" PFMT64x "\n", bb->addr);
+	case 'C': // "agC"
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'k':
+		case 'w':
+		case ' ':
+		case 0: {
+			core->graph->is_callgraph = true;
+			r_core_cmdf (core, "ag-; .agC*; agg%s;", input + 1);
+			core->graph->is_callgraph = false;
+			break;
+			}
+		case 'J':
+		case 'j':
+			r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_JSON);
+			break;
+		case 'g':
+			r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_GML);
+			break;
+		case 'd':
+			r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_DOT);
+			break;
+		case '*':
+			r_core_anal_callgraph (core, UT64_MAX, R_GRAPH_FORMAT_CMD);
+			break;
+		default:
+			eprintf ("Usage: see ag?\n");
+			break;
+		}
+		break;
+	case 'r': // "agr" references graph
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'd':
+		case 'J':
+		case 'j':
+		case 'g':
+		case 'k':
+		case 'w':
+		case ' ': {
+			core->graph->is_callgraph = true;
+			r_core_cmdf (core, "ag-; .agr* @ %"PFMT64u"; agg%s;", core->offset, input + 1);
+			core->graph->is_callgraph = false;
+			break;
+			}
+		case '*': {
+			r_core_anal_coderefs (core, core->offset);
+			}
+			break;
+		case 0:
+			r_core_cmd0 (core, "ag-; .agr* $$; agg;");
+			break;
+		default:
+			eprintf ("Usage: see ag?\n");
+			break;
+		}
+		break;
+	case 'R': // "agR" global refs
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'd':
+		case 'J':
+		case 'j':
+		case 'g':
+		case 'k':
+		case 'w':
+		case ' ':
+		case 0: {
+			core->graph->is_callgraph = true;
+			r_core_cmdf (core, "ag-; .agR*; agg%s;", input + 1);
+			core->graph->is_callgraph = false;
+			break;
+			}
+		case '*': {
+			ut64 from = r_config_get_i (core->config, "graph.from");
+			ut64 to = r_config_get_i (core->config, "graph.to");
+			RListIter *it;
+			RAnalFunction *fcn;
+			r_list_foreach (core->anal->fcns, it, fcn) {
+				if ((from == UT64_MAX && to == UT64_MAX) || R_BETWEEN (from, fcn->addr, to)) {
+					r_core_anal_coderefs (core, fcn->addr);
 				}
 			}
-			r_list_purge (list);
-			free (list);
+			break;
+			}
+		default:
+			eprintf ("Usage: see ag?\n");
+			break;
 		}
 		break;
-	case 'C': // "agC"
-		r_core_anal_coderefs (core, UT64_MAX, input[1] == 'j'? 2: 1);
+	case 'x': // "agx" cross refs
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'd':
+		case 'J':
+		case 'j':
+		case 'g':
+		case 'k':
+		case 'w':
+		case ' ': {
+			r_core_cmdf (core, "ag-; .agx* @ %"PFMT64u"; agg%s;", core->offset, input + 1);
+			break;
+			}
+		case '*': {
+			r_core_anal_codexrefs (core, core->offset);
+			}
+			break;
+		case 0:
+			r_core_cmd0 (core, "ag-; .agx* $$; agg;");
+			break;
+		default:
+			eprintf ("Usage: see ag?\n");
+			break;
+		}
 		break;
-	case 'r': // "refs"
+	case 'i': // "agi" import graph
 		switch (input[1]) {
-		case '*':
+		case 'v':
+		case 't':
+		case 'd':
+		case 'J':
 		case 'j':
+		case 'g':
+		case 'k':
+		case 'w':
 		case ' ':
 		case 0:
-			{
-				ut64 addr = input[2]? r_num_math (core->num, input + 2): core->offset;
-				r_core_anal_codexrefs (core, addr, '*');
-			}
+			r_core_cmdf (core, "ag-; .agi*; agg%s;", input + 1);
+			break;
+		case '*':
+			r_core_anal_importxrefs (core);
 			break;
 		default:
-			eprintf ("|ERROR| Usage: agr[*j]\n");
+			eprintf ("Usage: see ag?\n");
 			break;
 		}
 		break;
 	case 'c': // "agc"
-		if (input[1] == '*') {
-			ut64 addr = input[2]? r_num_math (core->num, input + 2): UT64_MAX;
-			r_core_anal_coderefs (core, addr, '*');
-		} else if (input[1] == 'j') {
-			ut64 addr = input[2]? r_num_math (core->num, input + 2): UT64_MAX;
-			r_core_anal_coderefs (core, addr, 2);
-		} else if (input[1] == ' ') {
-			ut64 addr = input[2]? r_num_math (core->num, input + 1): UT64_MAX;
-			r_core_anal_coderefs (core, addr, 1);
-		} else {
-			eprintf ("|ERROR| Usage: agc[j*] ([addr])\n");
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'k':
+		case 'w':
+		case ' ': {
+			core->graph->is_callgraph = true;
+			r_core_cmdf (core, "ag-; .agc* @ %"PFMT64u"; agg%s;", core->offset, input + 1);
+			core->graph->is_callgraph = false;
+			break;
+			}
+		case 0:
+			core->graph->is_callgraph = true;
+			r_core_cmd0 (core, "ag-; .agc* $$; agg;");
+			core->graph->is_callgraph = false;
+			break;
+		case 'g': {
+			r_core_anal_callgraph (core, core->offset, R_GRAPH_FORMAT_GMLFCN);
+			break;
+		}
+		case 'd': {
+			r_core_anal_callgraph (core, core->offset, R_GRAPH_FORMAT_DOT);
+			break;
+		}
+		case 'J':
+		case 'j': {
+			r_core_anal_callgraph (core, core->offset, R_GRAPH_FORMAT_JSON);
+			break;
+		}
+		case '*': {
+			r_core_anal_callgraph (core, core->offset, R_GRAPH_FORMAT_CMD);
+			break;
+		}
+		default:
+			eprintf ("Usage: see ag?\n");
+			break;
 		}
 		break;
-	case 'j': // "agj"
-		r_core_anal_graph (core, r_num_math (core->num, input + 1), R_CORE_ANAL_JSON);
+	case 'j': // "agj" alias for agfj
+		r_core_cmdf (core, "agfj%s", input + 1);
 		break;
-	case 'k': // "agk"
-		r_core_anal_graph (core, r_num_math (core->num, input + 1), R_CORE_ANAL_KEYVALUE);
+	case 'J': // "agJ" alias for agfJ
+		r_core_cmdf (core, "agfJ%s", input + 1);
+		break;
+	case 'k': // "agk" alias for agfk
+		r_core_cmdf (core, "agfk%s", input + 1);
 		break;
 	case 'l': // "agl"
 		r_core_anal_graph (core, r_num_math (core->num, input + 1), R_CORE_ANAL_GRAPHLINES);
 		break;
 	case 'a': // "aga"
-		r_core_anal_graph (core, r_num_math (core->num, input + 1), 0);
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'k':
+		case 'w':
+		case 'g':
+		case 'j':
+		case 'J':
+		case 'd':
+		case ' ': {
+			r_core_cmdf (core, "ag-; .aga* @ %"PFMT64u"; agg%s;", core->offset, input + 1);
+			break;
+			}
+		case 0:
+			r_core_cmd0 (core, "ag-; .aga* $$; agg;");
+			break;
+		case '*': {
+			r_core_anal_datarefs (core, core->offset);
+			break;
+			}
+		default:
+			 eprintf ("Usage: see ag?\n");
+			 break;
+		}
+		break;
+	case 'A': // "agA" global data refs
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'd':
+		case 'J':
+		case 'j':
+		case 'g':
+		case 'k':
+		case 'w':
+		case ' ':
+		case 0: {
+			r_core_cmdf (core, "ag-; .agA*; agg%c;", input[1]);
+			break;
+			}
+		case '*': {
+			ut64 from = r_config_get_i (core->config, "graph.from");
+			ut64 to = r_config_get_i (core->config, "graph.to");
+			RListIter *it;
+			RAnalFunction *fcn;
+			r_list_foreach (core->anal->fcns, it, fcn) {
+				if ((from == UT64_MAX && to == UT64_MAX) || R_BETWEEN (from, fcn->addr, to)) {
+					r_core_anal_datarefs (core, fcn->addr);
+				}
+			}
+			break;
+			}
+		default:
+			eprintf ("Usage: see ag?\n");
+			break;
+		}
 		break;
 	case 'd': // "agd"
-		r_core_anal_graph (core, r_num_math (core->num, input + 1),
-				R_CORE_ANAL_GRAPHBODY | R_CORE_ANAL_GRAPHDIFF);
+		switch (input[1]) {
+		case 'v':
+		case 't':
+		case 'j':
+		case 'J':
+		case 'g':
+		case 'k':
+		case '*':
+		case ' ':
+		case 0:
+			eprintf ("Currently the only supported formats for the diff graph are 'agdd' and 'agdw'\n");
+			break;
+		case 'd': {
+			ut64 addr = input[2]? r_num_math (core->num, input + 2): core->offset;
+			r_core_gdiff_fcn (core, addr, core->offset);
+			r_core_anal_graph (core, addr, R_CORE_ANAL_GRAPHBODY | R_CORE_ANAL_GRAPHDIFF);
+			break;
+			}
+		case 'w': {
+			char *cmdargs = r_str_newf ("agdd 0x%"PFMT64x, core->offset);
+			char *cmd = graph_cmd (core, cmdargs, input + 2);
+			if (cmd && *cmd) {
+				r_core_cmd0 (core, cmd);
+			}
+			free (cmd);
+			free (cmdargs);
+			break;
+			}
+		}
+		break;
+	case 'v': // "agv" alias for "agfv"
+		r_core_cmdf (core, "agfv%s", input + 1);
 		break;
-	case 'v': // "agv"
+	case 'w':// "agw" 
 		if (r_config_get_i (core->config, "graph.web")) {
 			r_core_cmd0 (core, "=H /graph/");
 		} else {
-			const char *cmd = r_config_get (core->config, "cmd.graph");
+			char *cmdargs = r_str_newf ("agfd @ 0x%"PFMT64x, core->offset);
+			char *cmd = graph_cmd (core, cmdargs, input + 1);
 			if (cmd && *cmd) {
+				if (input[1]) {
+					r_cons_printf ("Saving to file %s ...\n", input + 1);
+					r_cons_flush ();
+				}
 				r_core_cmd0 (core, cmd);
-			} else {
-				r_core_cmd0 (core, "agf");
 			}
+			free (cmd);
+			free (cmdargs);
 		}
 		break;
-	case '?': // "ag?"
-		r_core_cmd_help (core, help_msg_ag);
-		break;
-	case ' ': // "ag"
-		arg = strchr (input, ' ');
-		r_core_anal_graph (core, r_num_math (core->num, arg? arg + 1: NULL),
-				R_CORE_ANAL_GRAPHBODY);
-		break;
-	case 0:
-		eprintf ("|ERROR| Usage: ag [addr]\n");
-		break;
 	default:
-		eprintf ("See ag?\n");
+		r_core_cmd_help (core, help_msg_ag);
 		break;
 	}
 }
@@ -5794,17 +6455,19 @@
 				to = r_itv_end (map->itv);
 				if (r_cons_is_breaked ()) {
 					break;
-				}	
+				}
 				if (!from && !to) {
 					eprintf ("Cannot determine xref search boundaries\n");
 				} else if (to - from > UT32_MAX) {
 					eprintf ("Skipping huge range\n");
 				} else {
 					r_core_anal_search_xrefs (core, from, to, rad);
-				}	
+				}
 			}
-			return 1;	
-		}	
+			free (ptr);
+			r_list_free (list);
+			return 1;
+		}
 	} else if (n == 1) {
 		from = core->offset;
 		to = core->offset + r_num_math (core->num, r_str_word_get0 (ptr, 0));
@@ -5892,9 +6555,9 @@
 		xrefs = r_anal_fcn_get_xrefs (core->anal, fcn);
 		if (xrefs) {
 			cov += r_list_length (xrefs);
-			r_list_free (xrefs);
 			xrefs = NULL;
 		}
+		r_list_free (xrefs);
 	}
 	return cov;
 }
@@ -5953,7 +6616,7 @@
 			return true;
 		}
 		if (r_str_startswith (as->cur->arch, "arm")) {
-			if (as->cur->bits < 64) {
+			if (as->bits < 64) {
 				return true;
 			}
 		}
@@ -5993,7 +6656,7 @@
 		r_cons_printf ("f+ aav.0x%08"PFMT64x "= 0x%08"PFMT64x, to, to);
 	} else {
 #if 1
-		r_anal_ref_add (core->anal, to, from, ' ');
+		r_anal_xrefs_set (core->anal, from, to, R_ANAL_REF_TYPE_NULL);
 		r_meta_add (core->anal, 'd', from, from + vsize, NULL);
 		if (!r_flag_get_at (core->flags, to, false)) {
 			char *name = r_str_newf ("aav.0x%08"PFMT64x, to);
@@ -6050,7 +6713,7 @@
 			if (r_cons_is_breaked ()) {
 				break;
 			}
-			//TODO: Reduce multiple hits for same addr 
+			//TODO: Reduce multiple hits for same addr
 			from = r_itv_begin (map2->itv);
 			to = r_itv_end (map2->itv);
 			eprintf ("Value from 0x%08"PFMT64x " to 0x%08" PFMT64x "\n", from, to);
@@ -6086,8 +6749,18 @@
 static int cmd_anal_all(RCore *core, const char *input) {
 	switch (*input) {
 	case '?': r_core_cmd_help (core, help_msg_aa); break;
-	case 'b': cmd_anal_blocks (core, input + 1); break; // "aab"
-	case 'c':
+	case 'b': // "aab"
+		cmd_anal_blocks (core, input + 1);
+		break; // "aab"
+	case 'f': // "aaf"
+		{
+			int analHasnext = r_config_get_i (core->config, "anal.hasnext");
+			r_config_set_i (core->config, "anal.hasnext", true);
+			r_core_cmd0 (core, "afr@@c:isq");
+			r_config_set_i (core->config, "anal.hasnext", analHasnext);
+		}
+		break;
+	case 'c': // "aac"
 		switch (input[1]) {
 		case '*':
 			cmd_anal_calls (core, input + 1, true); break; // "aac*"
@@ -6095,9 +6768,9 @@
 			cmd_anal_calls (core, input + 1, false); break; // "aac"
 		}
 	case 'j': cmd_anal_jumps (core, input + 1); break; // "aaj"
-	case '*':
+	case '*': // "aa*"
 		r_core_cmd0 (core, "af @@ sym.*");
-		r_core_cmd0 (core, "af @ entry0");
+		r_core_cmd0 (core, "af @@ entry*");
 		break;
 	case 'd': // "aad"
 		cmd_anal_aad (core, input);
@@ -6111,11 +6784,11 @@
 	case 'i': // "aai"
 		r_core_anal_info (core, input + 1);
 		break;
-	case 's':
+	case 's': // "aas"
 		r_core_cmd0 (core, "af @@= `isq~[0]`");
-		r_core_cmd0 (core, "af @ entry0");
+		r_core_cmd0 (core, "af @@ entry*");
 		break;
-	case 'n':
+	case 'n': // "aan"
 		r_core_anal_autoname_all_fcns (core);
 		break; //aan
 	case 'p': // "aap"
@@ -6131,13 +6804,24 @@
 		if (input[0] && (input[1] == '?' || (input[1] && input[2] == '?'))) {
 			r_cons_println ("Usage: See aa? for more help");
 		} else {
+			char *dh_orig = NULL;
+			if (!strncmp (input, "aaaaa", 5)) {
+				eprintf ("An r2 developer is coming to your place to manually analyze this program. Please wait for it\n");
+				if (r_config_get_i (core->config, "scr.interactive")) {
+					r_cons_any_key (NULL);
+				}
+				goto jacuzzi;
+			}
 			ut64 curseek = core->offset;
 			rowlog (core, "Analyze all flags starting with sym. and entry0 (aa)");
 			r_cons_break_push (NULL, NULL);
 			r_cons_break_timeout (r_config_get_i (core->config, "anal.timeout"));
 			r_core_anal_all (core);
 			rowlog_done (core);
-			char *dh_orig = core->dbg->h
+			// Run pending analysis immediately after analysis
+			// Usefull when running commands with ";" or via r2 -c,-i
+			run_pending_anal (core);
+			dh_orig = core->dbg->h
 					? strdup (core->dbg->h->name)
 					: strdup ("esil");
 			if (core->io && core->io->desc && core->io->desc->plugin && !core->io->desc->plugin->isdbg) {
@@ -6162,15 +6846,10 @@
 				}
 				r_config_set_i (core->config, "anal.calls", 1);
 				r_core_cmd0 (core, "s $S");
-				rowlog (core, "Analyze len bytes of instructions for references (aar)");
-				if (r_cons_is_breaked ()) {
-					goto jacuzzi;
-				}
-				(void)r_core_anal_refs (core, ""); // "aar"
-				rowlog_done (core);
 				if (r_cons_is_breaked ()) {
 					goto jacuzzi;
 				}
+
 				rowlog (core, "Analyze function calls (aac)");
 				(void) cmd_anal_calls (core, "", false); // "aac"
 				r_core_seek (core, curseek, 1);
@@ -6180,17 +6859,14 @@
 				if (r_cons_is_breaked ()) {
 					goto jacuzzi;
 				}
-				if (input[1] == 'a') { // "aaaa"
-					rowlog (core, "Emulate code to find computed references (aae)");
-					r_core_cmd0 (core, "aae $SS @ $S");
-					rowlog_done (core);
-					rowlog (core, "Analyze consecutive function (aat)");
-					r_core_cmd0 (core, "aat");
-					rowlog_done (core);
-				} else {
-					rowlog (core, "Use -AA or aaaa to perform additional experimental analysis.");
-					rowlog_done (core);
+
+				rowlog (core, "Analyze len bytes of instructions for references (aar)");
+				(void)r_core_anal_refs (core, ""); // "aar"
+				rowlog_done (core);
+				if (r_cons_is_breaked ()) {
+					goto jacuzzi;
 				}
+				run_pending_anal (core);
 				r_config_set_i (core->config, "anal.calls", c);
 				rowlog (core, "Constructing a function name for fcn.* and sym.func.* functions (aan)");
 				if (r_cons_is_breaked ()) {
@@ -6200,13 +6876,46 @@
 					r_core_anal_autoname_all_fcns (core);
 					rowlog_done (core);
 				}
+				if (core->anal->opt.vars) {
+					RAnalFunction *fcni;
+					RListIter *iter;
+					r_list_foreach (core->anal->fcns, iter, fcni) {
+						if (r_cons_is_breaked ()) {
+							break;
+						}
+						RList *list = r_anal_var_list (core->anal, fcni, 'r');
+						if (!r_list_empty (list)) {
+							r_list_free (list);
+							continue;
+						}
+						//extract only reg based var here
+						r_core_recover_vars (core, fcni, true);
+						r_list_free (list);
+					}
+				}
+				if (sdb_count (core->anal->sdb_zigns) > 0) {
+					rowlog (core, "Check for zignature from zigns folder (z/)");
+					r_core_cmd0 (core, "z/");
+				}
+				rowlog (core, "Type matching analysis for all functions (afta)");
+				r_core_cmd0 (core, "afta");
+				rowlog_done (core);
 				if (input[1] == 'a') { // "aaaa"
-					if (sdb_count (core->anal->sdb_zigns) > 0) {
-						rowlog (core, "Check for zignature from zigns folder (z/)");
-						r_core_cmd0 (core, "z/");
+					bool ioCache = r_config_get_i (core->config, "io.pcache");
+					r_config_set_i (core->config, "io.pcache", 1);
+					rowlog (core, "Emulate code to find computed references (aae)");
+					r_core_cmd0 (core, "aae $SS @ $S");
+					rowlog_done (core);
+					rowlog (core, "Analyze consecutive function (aat)");
+					r_core_cmd0 (core, "aat");
+					rowlog_done (core);
+					// drop cache writes is no cache was
+					if (!ioCache) {
+						r_core_cmd0 (core, "wc-*");
 					}
-					rowlog (core, "Type matching analysis for all functions (afta)");
-					r_core_cmd0 (core, "afta");
+					r_config_set_i (core->config, "io.pcache", ioCache);
+				} else {
+					rowlog (core, "Use -AA or aaaa to perform additional experimental analysis.");
 					rowlog_done (core);
 				}
 				r_core_cmd0 (core, "s-");
@@ -6221,7 +6930,7 @@
 			R_FREE (dh_orig);
 		}
 		break;
-	case 't': { // "aat"		
+	case 't': { // "aat"
 		ut64 cur = core->offset;
 		bool hasnext = r_config_get_i (core->config, "anal.hasnext");
 		RListIter *iter;
@@ -6232,7 +6941,7 @@
 			r_config_set_i (core->config, "anal.hasnext", 1);
 			r_core_cmd0 (core, "afr");
 			r_config_set_i (core->config, "anal.hasnext", hasnext);
-		}	
+		}
 		r_core_seek (core, cur, 1);
 		break;
 	}
@@ -6258,7 +6967,7 @@
 			r_list_foreach (list, iter, map) {
 				r_core_seek (core, map->itv.addr, 1);
 				r_core_anal_esil (core, "$SS", NULL);
-			}	
+			}
 			r_core_seek (core, at, 1);
 		}
 		break;
@@ -6319,11 +7028,6 @@
 	return false;
 }
 
-static int cmpaddr (const void *_a, const void *_b) {
-	const RAnalFunction *a = _a, *b = _b;
-	return a->addr - b->addr;
-}
-
 static bool anal_fcn_data_gaps (RCore *core, const char *input) {
 	ut64 end = UT64_MAX;
 	RAnalFunction *fcn;
@@ -6346,39 +7050,34 @@
 	return true;
 }
 
-static void r_anal_virtual_functions(void *core, const char* input) {
-	const char *curArch = NULL;
-	const char *curClass = NULL;
-	if (core) {
-		RCore *c = (RCore*)core;
-		if (c->bin && c->bin->cur && c->bin->cur->o && c->bin->cur->o->info) {
-			curArch = c->bin->cur->o->info->arch;
-			curClass = c->bin->cur->o->info->rclass;
-		}
-	}
-	if (curArch && !strcmp (curArch, "x86") && !strcmp (curClass, "elf")) {
-		const char * help_msg[] = {
-			"Usage:", "av[*j] ", "analyze the .rodata section and list virtual function present",
-			NULL};
-		switch (input[0]) {
-		case '*'://av*
-			r_core_anal_list_vtables_all (core);
-			break;
-		case 'j': //avj
-			r_core_anal_list_vtables (core, true);
-			break;
-		case 'r': //avr
-			r_core_anal_print_rtti (core);
-			break;
-		case '\0': //av
-			r_core_anal_list_vtables (core, false);
-			break;
-		default :
-			r_core_cmd_help (core, help_msg);
-			break;
-		}
-	} else {
-		eprintf ("Unsupported architecture to find vtables\n");
+static void cmd_anal_rtti(RCore *core, const char *input) {
+	switch (input[0]) {
+	case '\0': // "avr"
+	case 'j': // "avrj"
+		r_anal_rtti_print_at_vtable (core->anal, core->offset, input[0]);
+		break;
+	case 'a': // "avra"
+		r_anal_rtti_print_all (core->anal, input[1]);
+		break;
+	default :
+		r_core_cmd_help (core, help_msg_av);
+		break;
+	}
+}
+
+static void cmd_anal_virtual_functions(RCore *core, const char* input) {
+	switch (input[0]) {
+	case '\0': // "av"
+	case '*': // "av*"
+	case 'j': // "avj"
+		r_anal_list_vtables (core->anal, input[0]);
+		break;
+	case 'r': // "avr"
+		cmd_anal_rtti (core, input + 1);
+		break;
+	default :
+		r_core_cmd_help (core, help_msg_av);
+		break;
 	}
 }
 
@@ -6416,20 +7115,51 @@
 			free (buf);
 		}
 		break;
+	case '8':
+		{
+			ut8 *buf = malloc (strlen (input) + 1);
+			if (buf) {
+				int len = r_hex_str2bin (input + 1, buf);
+				if (len > 0) {
+					core_anal_bytes (core, buf, len, 0, input[1]);
+				}
+				free (buf);
+			}
+		}
+		break;
 	case 'b':
 		if (input[1] == 'b') { // "abb"
 			core_anal_bbs (core, input + 2);
-		} else if (input[1] == ' ' || input[1] == 'j') {
-			ut8 *buf = malloc (strlen (input) + 1);
-			int len = r_hex_str2bin (input + 2, buf);
-			if (len > 0) {
-				core_anal_bytes (core, buf, len, 0, input[1]);
+		} else if (input[1] == 'r') { // "abr"
+			core_anal_bbs_range (core, input + 2);
+		} else if (input[1] == 't') {
+			RList* list = r_core_anal_graph_to (core, r_num_math (core->num, input + 2), 0);
+			if (list) {
+				RListIter *iter, *iter2;
+				RList *list2;
+				RAnalBlock *bb;
+				r_list_foreach (list, iter, list2) {
+					r_list_foreach (list2, iter2, bb) {
+						r_cons_printf ("-> 0x%08" PFMT64x "\n", bb->addr);
+					}
+				}
+				r_list_purge (list);
+				free (list);
 			}
-			free (buf);
+		} else if (input[1] == 'j') { // "abj"
+			anal_fcn_list_bb (core, input + 1, false);
+		} else if (input[1] == ' ' || !input[1]) {
+			// find block
+			ut64 addr = core->offset;
+			if (input[1]) {
+				addr = r_num_math (core->num, input + 1);
+			}
+			r_core_cmdf (core, "afbi @ 0x%"PFMT64x, addr);
 		} else {
 			r_core_cmd_help (core, help_msg_ab);
 		}
 		break;
+	case 'L': return r_core_cmd0 (core, "e asm.arch=??"); break;
 	case 'i': cmd_anal_info (core, input + 1); break; // "ai"
 	case 'r': cmd_anal_reg (core, input + 1); break;  // "ar"
 	case 'e': cmd_anal_esil (core, input + 1); break; // "ae"
@@ -6480,7 +7210,7 @@
 		cmd_anal_syscall (core, input + 1);
 		break;
 	case 'v': // "av"
-		r_anal_virtual_functions (core, input + 1);
+		cmd_anal_virtual_functions (core, input + 1);
 		break;
 	case 'x': // "ax"
 		if (!cmd_anal_refs (core, input + 1)) {
@@ -6498,12 +7228,12 @@
 		RAnalCycleHook *hook;
 		char *instr_tmp = NULL;
 		int ccl = input[1]? r_num_math (core->num, &input[2]): 0; //get cycles to look for
-		int cr = r_config_get_i (core->config, "asm.cmtright");
+		int cr = r_config_get_i (core->config, "asm.cmt.right");
 		int fun = r_config_get_i (core->config, "asm.functions");
 		int li = r_config_get_i (core->config, "asm.lines");
 		int xr = r_config_get_i (core->config, "asm.xrefs");
 
-		r_config_set_i (core->config, "asm.cmtright", true);
+		r_config_set_i (core->config, "asm.cmt.right", true);
 		r_config_set_i (core->config, "asm.functions", false);
 		r_config_set_i (core->config, "asm.lines", false);
 		r_config_set_i (core->config, "asm.xrefs", false);
@@ -6518,7 +7248,7 @@
 		}
 		r_list_free (hooks);
 
-		r_config_set_i (core->config, "asm.cmtright", cr); //reset settings
+		r_config_set_i (core->config, "asm.cmt.right", cr); //reset settings
 		r_config_set_i (core->config, "asm.functions", fun);
 		r_config_set_i (core->config, "asm.lines", li);
 		r_config_set_i (core->config, "asm.xrefs", xr);
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_api.c radare2-2.8.0+dfsg/libr/core/cmd_api.c
--- radare2-2.3.0+dfsg/libr/core/cmd_api.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_api.c	2018-08-07 14:12:36.000000000 +0000
@@ -41,24 +41,28 @@
 	r_cmd_alias_free (cmd);
 	r_cmd_macro_free (&cmd->macro);
 	// dinitialize plugin commands
-	r_core_plugin_deinit(cmd);
+	r_core_plugin_fini (cmd);
 	r_list_free (cmd->plist);
 	r_list_free (cmd->lcmds);
-	for (i=0;i<NCMDS;i++)
-		if (cmd->cmds[i])
+	for (i = 0; i < NCMDS; i++) {
+		if (cmd->cmds[i]) {
 			R_FREE (cmd->cmds[i]);
+		}
+	}
 	free (cmd);
 	return NULL;
 }
 
 R_API char **r_cmd_alias_keys(RCmd *cmd, int *sz) {
-	if (sz) *sz = cmd->aliases.count;
+	if (sz) {
+		*sz = cmd->aliases.count;
+	}
 	return cmd->aliases.keys;
 }
 
 R_API void r_cmd_alias_free (RCmd *cmd) {
 	int i; // find
-	for (i=0; i<cmd->aliases.count; i++) {
+	for (i = 0; i < cmd->aliases.count; i++) {
 		free (cmd->aliases.keys[i]);
 		free (cmd->aliases.values[i]);
 	}
@@ -70,31 +74,31 @@
 	cmd->aliases.values = NULL;
 }
 
-R_API int r_cmd_alias_del (RCmd *cmd, const char *k) {
+R_API bool r_cmd_alias_del (RCmd *cmd, const char *k) {
 	int i; // find
-	for (i=0; i<cmd->aliases.count; i++) {
+	for (i = 0; i < cmd->aliases.count; i++) {
 		if (!k || !strcmp (k, cmd->aliases.keys[i])) {
 			free (cmd->aliases.values[i]);
 			cmd->aliases.values[i] = NULL;
 			cmd->aliases.count--;
-			if (cmd->aliases.count>0) {
-				if (i>0) {
+			if (cmd->aliases.count > 0) {
+				if (i > 0) {
 					free (cmd->aliases.keys[i]);
 					cmd->aliases.keys[i] = cmd->aliases.keys[0];
 					free (cmd->aliases.values[i]);
 					cmd->aliases.values[i] = cmd->aliases.values[0];
 				}
 				memmove (cmd->aliases.values,
-					cmd->aliases.values+1,
-					cmd->aliases.count*sizeof (void*));
+					cmd->aliases.values + 1,
+					cmd->aliases.count * sizeof (void*));
 				memmove (cmd->aliases.keys,
-					cmd->aliases.keys+1,
-					cmd->aliases.count*sizeof (void*));
+					cmd->aliases.keys + 1,
+					cmd->aliases.count * sizeof (void*));
 			}
-			return 1;
+			return true;
 		}
 	}
-	return 0;
+	return false;
 }
 
 R_API int r_cmd_alias_set (RCmd *cmd, const char *k, const char *v, int remote) {
@@ -229,9 +233,11 @@
 		}
 		c = cmd->cmds[((ut8)input[0]) & 0xff];
 		if (c && c->callback) {
-			const char *inp = (*input)? input+1: "";
+			const char *inp = (*input)? input + 1: "";
 			ret = c->callback (cmd->data, inp);
-		} else ret = -1;
+		} else {
+			ret = -1;
+		}
 		free (nstr);
 	}
 	return ret;
@@ -405,8 +411,9 @@
 		}
 	}
 #endif
-	if (macro_update == 0)
+	if (macro_update == 0) {
 		r_list_append (mac->macros, macro);
+	}
 	free (name);
 	return 0;
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd.c radare2-2.8.0+dfsg/libr/core/cmd.c
--- radare2-2.3.0+dfsg/libr/core/cmd.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - nibble, pancake */
+/* radare - LGPL - Copyright 2009-2018 - nibble, pancake */
 #if 0
 * Use RList
 * Support callback for null command (why?)
@@ -108,14 +108,6 @@
 	NULL
 };
 
-static const char *help_msg_percent[] = {
-	"Usage:", "%[name[=value]]", "Set each NAME to VALUE in the environment",
-	"%", "", "list all environment variables",
-	"%", "SHELL", "prints SHELL value",
-	"%", "TMPDIR=/tmp", "sets TMPDIR value to \"/tmp\"",
-	NULL
-};
-
 static const char *help_msg_star[] = {
 	"Usage:", "*<addr>[=[0x]value]", "Pointer read/write data/values",
 	"*", "entry0=cc", "write trap in entrypoint",
@@ -157,15 +149,40 @@
 	"=", ":port", "listen on given port using rap protocol (o rap://9999)",
 	"=&", ":port", "start rap server in background",
 	"=", ":host:port cmd", "run 'cmd' command on remote server",
-	"\nhttp server:", "", "",
+	"\nother servers:","","",
+	"=h", "[?]", "listen for http connections",
+	"=g", "[?]", "using gdbserver",
+	NULL
+};
+
+#if 0
+static const char *help_msg_equalh[] = {
+	"Usage:",  "=h[---*&] [port]", " # manage http connections",
+	"=h", " port", "listen for http connections (r2 -qc=H /bin/ls)",
+	"=h-", "", "stop background webserver",
+	"=h--", "", "stop foreground webserver",
+	"=h*", "", "restart current webserver",
+	"=h&", " port", "start http server in background",
+	NULL
+};
+#endif
+
+static const char *help_msg_equalh[] = {
+	"Usage:", " =[hH] [...]", " # http server",
+	"http server:", "", "",
 	"=h", " port", "listen for http connections (r2 -qc=H /bin/ls)",
 	"=h-", "", "stop background webserver",
 	"=h--", "", "stop foreground webserver",
 	"=h*", "", "restart current webserver",
-	"=h&", " port", "start http server in background)",
+	"=h&", " port", "start http server in background",
 	"=H", " port", "launch browser and listen for http",
 	"=H&", " port", "launch browser and listen for http in background",
-	"\ngdbserver:", "", "",
+	NULL
+};
+
+static const char *help_msg_equalg[] = {
+	"Usage:", " =[g] [...]", " # gdb server",
+	"gdbserver:", "", "",
 	"=g", " port file [args]", "listen on 'port' debugging 'file' using gdbserver",
 	"=g!", " port file [args]", "same as above, but debug protocol messages (like gdbserver --remote-debug)",
 	NULL
@@ -207,7 +224,7 @@
 	"r+", "num", "insert num bytes, move following data up",
 	"rm" ," [file]", "remove file",
 	"rh" ,"", "show size in human format",
-	"r2" ," [file]", "launch r2",
+	"r2" ," [file]", "launch r2 (same for rax2, rasm2, ...)",
 	NULL
 };
 
@@ -216,6 +233,7 @@
 	"u", "", "show system uname",
 	"uw", "", "alias for wc (requires: e io.cache=true)",
 	"us", "", "alias for s- (seek history)",
+	"uc", "", "undo core commands (uc?, ucl, uc*, ..)",
 	NULL
 };
 
@@ -225,21 +243,30 @@
 	"y", " 16", "copy 16 bytes into clipboard",
 	"y", " 16 0x200", "copy 16 bytes into clipboard from 0x200",
 	"y", " 16 @ 0x200", "copy 16 bytes into clipboard from 0x200",
-	"yz", "", "copy up to blocksize zero terminated string bytes into clipboard",
-	"yz", " 16", "copy up to 16 zero terminated string bytes into clipboard",
-	"yz", " @ 0x200", "copy up to blocksize zero terminated string bytes into clipboard from 0x200",
-	"yz", " 16 @ 0x200", "copy up to 16 zero terminated string bytes into clipboard from 0x200",
+	"yz", " [len]", "copy nul-terminated string (up to blocksize) into clipboard",
 	"yp", "", "print contents of clipboard",
 	"yx", "", "print contents of clipboard in hexadecimal",
 	"ys", "", "print contents of clipboard as string",
 	"yt", " 64 0x200", "copy 64 bytes from current seek to 0x200",
 	"ytf", " file", "dump the clipboard to given file",
-	"yf", " 64 0x200", "file copy 64 bytes from 0x200 from file (opens w/ io), use -1 for all bytes",
+	"yf", " 64 0x200", "copy file 64 bytes from 0x200 from file",
 	"yfa", " file copy", "copy all bytes from file (opens w/ io)",
 	"yy", " 0x3344", "paste clipboard",
 	NULL
 };
 
+static const char *help_msg_triple_exclamation[] = {
+	"Usage:", "!!![-*][cmd] [arg|$type...]", " # user-defined autocompletion for commands",
+	"!!!", "", "list all autocompletions",
+	"!!!?", "", "show this help",
+	"!!!", "-*", "remove all user-defined autocompletions",
+	"!!!", "-\\*", "remove autocompletions matching this glob expression",
+	"!!!", "-foo", "remove autocompletion named 'foo'",
+	"!!!", "foo", "add 'foo' for autocompletion",
+	"!!!", "bar $flag", "add 'bar' for autocompletion with $flag as argument",
+	NULL
+};
+
 R_API void r_core_cmd_help(const RCore *core, const char *help[]) {
 	r_cons_cmd_help (help, core->print->flags & R_PRINT_FLAGS_COLOR);
 }
@@ -276,8 +303,8 @@
 
 static int r_core_cmd_nullcallback(void *data) {
 	RCore *core = (RCore*) data;
-	if (core->cons->breaked) {
-		core->cons->breaked = false;
+	if (core->cons->context->breaked) {
+		core->cons->context->breaked = false;
 		return 0;
 	}
 	if (!core->cmdrepeat) {
@@ -295,14 +322,14 @@
 	RAsmOp *op;
 	if (!b) {
 		b = r_buf_new ();
-		if (!b || !r_core_read_at (core, addr, buf, sizeof (buf))) {
+		if (!b || !r_io_read_at (core->io, addr, buf, sizeof (buf))) {
 			return NULL;
 		}
 		b->base = addr;
 		r_buf_set_bytes (b, buf, sizeof (buf));
 	} else {
 		if ((addr < b->base) || addr > (b->base + b->length - 32)) {
-			if (!r_core_read_at (core, addr, buf, sizeof (buf))) {
+			if (!r_io_read_at (core->io, addr, buf, sizeof (buf))) {
 				return NULL;
 			}
 			b->base = addr;
@@ -320,10 +347,52 @@
 }
 
 static int cmd_uname(void *data, const char *input) {
+	RCore *core = data;
 	switch (input[0]) {
 	case '?': // "u?"
 		r_core_cmd_help (data, help_msg_u);
 		return 1;
+	case 'c': // "uc"
+		switch (input[1]) {
+		case ' ': {
+			char *cmd = strdup (input + 2);
+			char *rcmd = strchr (cmd, ',');
+			if (rcmd) {
+				*rcmd++ = 0;
+				RCoreUndo *undo = r_core_undo_new (core->offset, cmd, rcmd);
+				r_core_undo_push (core, undo);
+			} else {
+				eprintf ("Usage: uc [cmd] [revert-cmd]");
+			}
+			free (cmd);
+			}
+			break;
+		case '?':
+			eprintf ("Usage: uc [cmd],[revert-cmd]\n");
+			eprintf (" uc. - list all reverts in current\n");
+			eprintf (" uc* - list all core undos\n");
+			eprintf (" uc  - list all core undos\n");
+			eprintf (" uc- - undo last action\n");
+			break;
+		case '.': {
+			RCoreUndoCondition cond = {
+				.addr = core->offset,
+				.minstamp = 0,
+				.glob = NULL
+			};
+			r_core_undo_print (core, 1, &cond);
+			} break;
+		case '*':
+			r_core_undo_print (core, 1, NULL);
+			break;
+		case '-':
+			r_core_undo_pop (core);
+			break;
+		default:
+			r_core_undo_print (core, 0, NULL);
+			break;
+		}
+		return 1;
 	case 's': // "us"
 		r_core_cmdf (data, "s-%s", input + 1);
 		return 1;
@@ -500,16 +569,28 @@
 		r_core_rtr_session (core, input + 1);
 		break;
 	case 'g': // "=g"
-		r_core_rtr_gdb (core, getArg (input[1], 'g'), input + 1);
+		if (input[1] == '?') {
+			r_core_cmd_help (core, help_msg_equalg);
+		} else {
+			r_core_rtr_gdb (core, getArg (input[1], 'g'), input + 1);
+		}
 		break;
 	case 'h': // "=h"
-		r_core_rtr_http (core, getArg (input[1], 'h'), input + 1);
+		if (input[1] == '?') {
+			r_core_cmd_help (core, help_msg_equalh);
+		} else {
+			r_core_rtr_http (core, getArg (input[1], 'h'), 'h', input + 1);
+		}
 		break;
 	case 'H': // "=H"
-		while (input[1] == ' ') {
-			input++;
+		if (input[1] == '?') {
+			r_core_cmd_help (core, help_msg_equalh);
+		} else {
+			while (input[1] == ' ') {
+				input++;
+			}
+			r_core_rtr_http (core, getArg (input[1], 'H'), 'H', input + 1);
 		}
-		r_core_rtr_http (core, getArg (input[1], 'H'), input + 1);
 		break;
 	case '?': // "=?"
 		r_core_cmd_help (core, help_msg_equal);
@@ -673,6 +754,12 @@
 					r_lang_run_file (core->lang, cmd);
 					free (cmd);
 					ret = 1;
+				} else if (!strcmp (ext, "zig")) {
+					char *cmd = cmdstr ("zig run");
+					r_lang_use (core->lang, "pipe");
+					r_lang_run_file (core->lang, cmd);
+					free (cmd);
+					ret = 1;
 				} else if (!strcmp (ext, "d")) {
 					char *cmd = cmdstr ("dmd -run");
 					r_lang_use (core->lang, "pipe");
@@ -873,6 +960,26 @@
 	return 1;
 }
 
+R_API int sdbshell_history_up(RLine *line) {
+	if (!line->sdbshell_hist_iter || !line->sdbshell_hist_iter->n) {
+		return false;
+	}
+	line->sdbshell_hist_iter = line->sdbshell_hist_iter->n;
+	strncpy (line->buffer.data, line->sdbshell_hist_iter->data, R_LINE_BUFSIZE - 1);
+	line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+	return true;
+}
+
+R_API int sdbshell_history_down(RLine *line) {
+	if (!line->sdbshell_hist_iter || !line->sdbshell_hist_iter->p) {
+		return false;
+	}
+	line->sdbshell_hist_iter = line->sdbshell_hist_iter->p;
+	strncpy (line->buffer.data, line->sdbshell_hist_iter->data, R_LINE_BUFSIZE - 1);
+	line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+	return true;
+}
+
 static int cmd_kuery(void *data, const char *input) {
 	char buf[1024], *out;
 	RCore *core = (RCore*)data;
@@ -912,6 +1019,13 @@
 			free (p);
 		}
 		if (!s) s = core->sdb;
+		RLine *line = core->cons->line;
+		if (!line->sdbshell_hist) {
+			line->sdbshell_hist = r_list_newf (free);
+			r_list_append (line->sdbshell_hist, r_str_new ("\0"));
+		}
+		RList *sdb_hist = line->sdbshell_hist;
+		r_line_set_hist_callback (line, &sdbshell_history_up, &sdbshell_history_down);
 		for (;;) {
 			r_line_set_prompt (p);
 			if (r_cons_fgets (buf, buflen, 0, NULL) < 1) {
@@ -920,11 +1034,18 @@
 			if (!*buf) {
 				break;
 			}
+			if (sdb_hist) {
+				if ((r_list_length (sdb_hist) == 1) || (r_list_length (sdb_hist) > 1 && strcmp (r_list_get_n (sdb_hist, 1), buf))) {
+					r_list_insert (sdb_hist, 1, strdup (buf));
+				}
+				line->sdbshell_hist_iter = sdb_hist->head;
+			}
 			out = sdb_querys (s, NULL, 0, buf);
 			if (out) {
 				r_cons_println (out);
 			}
 		}
+		r_line_set_hist_callback (core->cons->line, &cmd_history_up, &cmd_history_down);
 		break;
 	case 'o':
 		if (r_sandbox_enable (0)) {
@@ -1049,12 +1170,31 @@
 	return 0;
 }
 
+static int cmd_r2cmd(RCore *core, const char *input) {
+	const char *r2cmds[] = {
+		"rax2", "r2pm", "rasm2", "rabin2", "rahash2", "rafind2", "rarun2", "ragg2",
+		NULL
+	};
+	int i;
+	for (i = 0; r2cmds[i]; i++) {
+		if (r_str_startswith (input, r2cmds[i])) {
+			r_sys_cmdf ("r%s", input);
+			return true;
+		}
+	}
+	return false;
+}
+
 static int cmd_resize(void *data, const char *input) {
 	RCore *core = (RCore *)data;
 	ut64 newsize = 0;
 	st64 delta = 0;
 	int grow, ret;
 
+	if (cmd_r2cmd (core, input)) {
+		return true;
+	}
+
 	ut64 oldsize = (core->file) ? r_io_fd_size (core->io, core->file->fd): 0;
 	switch (*input) {
 	case '2': // "r2"
@@ -1111,10 +1251,9 @@
 			eprintf ("r_io_resize: cannot resize\n");
 		}
 	}
-
-	if (delta && core->offset < newsize)
+	if (delta && core->offset < newsize) {
 		r_io_shift (core->io, core->offset, grow?newsize:oldsize, delta);
-
+	}
 	if (!grow) {
 		ret = r_io_resize (core->io, newsize);
 		if (ret < 1) {
@@ -1136,75 +1275,114 @@
 	if (!r_config_get_i (core->config, "scr.interactive")) {
 		return false;
 	}
+#if 0
+	char *buf = strdup (input);
+	int len = r_str_unescape (buf);
+	r_cons_readpush (buf, len);
+	free (buf);
+	int res = r_core_visual ((RCore *)data, ""); //input);
+	r_cons_readflush ();
+	return res;
+#else
 	return r_core_visual ((RCore *)data, input);
+#endif
 }
 
-static int task_finished(void *user, void *data) {
-	eprintf ("TASK FINISHED\n");
+static int cmd_pipein(void *user, const char *input) {
+	char *buf = strdup (input);
+	int len = r_str_unescape (buf);
+	r_cons_readpush (buf, len);
+	free (buf);
 	return 0;
 }
 
-static int taskbgrun(RThread *th) {
-	char *res;
-	RCoreTask *task = th->user;
-	RCore *core = task->core;
-	close (2); // no stderr
-	res = r_core_cmd_str (core, task->msg->text);
-	task->msg->res = res;
-	task->state = 'd';
-	eprintf ("Task %d finished\n", task->id);
-// TODO: run callback and pass result
-	return 0;
+static void task_test(RCore *core, int usecs) {
+	int i;
+	RCoreTask *task = r_core_task_self (core);
+	r_cons_break_push (NULL, NULL);
+	for (i = 0; i < 10; i++) {
+		if (r_cons_is_breaked()) {
+			r_cons_printf ("task %d was breaked!\n", task->id);
+			break;
+		}
+		r_cons_printf ("task %d doing work %d/%d\n", task->id, i, 10);
+		eprintf ("task %d doing work %d/%d\n", task->id, i, 10);
+		if (usecs > 0) {
+			void *bed = r_cons_sleep_begin ();
+			r_sys_usleep (usecs);
+			r_cons_sleep_end (bed);
+		}
+	}
+	r_cons_break_pop ();
+	r_cons_printf ("task %d is done!\n", task->id);
 }
 
 static int cmd_thread(void *data, const char *input) {
 	RCore *core = (RCore*) data;
-	if (r_sandbox_enable (0)) {
-		eprintf ("This command is disabled in sandbox mode\n");
-		return 0;
-	}
 	switch (input[0]) {
 	case '\0':
 	case 'j':
 		r_core_task_list (core, *input);
 		break;
-	case '&':
-		if (input[1] == '&') {
-			// wait until ^C
-		} else {
-			int tid = r_num_math (core->num, input + 1);
-			if (tid) {
-				RCoreTask *task = r_core_task_get (core, tid);
-				if (task) {
-					r_core_task_join (core, task);
-				} else {
-					eprintf ("Cannot find task\n");
-				}
+	case 't': { // "&t"
+		int usecs = 0;
+		if (input[1] == ' ') {
+			usecs = (int) r_num_math (core->num, input + 1);
+		}
+		task_test (core, usecs);
+		break;
+	}
+	case 'b': {
+		if (r_sandbox_enable (0)) {
+			eprintf ("This command is disabled in sandbox mode\n");
+			return 0;
+		}
+		int tid = r_num_math (core->num, input + 1);
+		if (tid) {
+			r_core_task_break (core, tid);
+		}
+		break;
+	}
+	case '&': { // "&&"
+		if (r_sandbox_enable (0)) {
+			eprintf ("This command is disabled in sandbox mode\n");
+			return 0;
+		}
+		int tid = r_num_math (core->num, input + 1);
+		if (tid) {
+			RCoreTask *task = r_core_task_get (core, tid);
+			if (task && task != core->main_task) {
+				r_core_task_join (core, core->current_task, task);
 			} else {
-				r_core_task_run (core, NULL);
+				eprintf ("Cannot find task\n");
 			}
+		} else {
+			r_core_task_join (core, core->current_task, NULL);
 		}
 		break;
-	case '=': {
+	}
+	case '=': { // "&="
+		// r_core_task_list (core, '=');
 		int tid = r_num_math (core->num, input + 1);
 		if (tid) {
 			RCoreTask *task = r_core_task_get (core, tid);
 			if (task) {
-				r_cons_printf ("Task %d Status %c Command %s\n",
-					task->id, task->state, task->msg->text);
-				if (task->msg->res)
-					r_cons_println (task->msg->res);
-			} else eprintf ("Cannot find task\n");
-		} else {
-			r_core_task_list (core, 1);
-		}}
-		break;
-	case '+':
-		r_core_task_add (core, r_core_task_new (core, input + 1, (RCoreTaskCallback)task_finished, core));
+				if (task->res) {
+					r_cons_println (task->res);
+				}
+			} else {
+				eprintf ("Cannot find task\n");
+			}
+		}
 		break;
+	}
 	case '-':
+		if (r_sandbox_enable (0)) {
+			eprintf ("This command is disabled in sandbox mode\n");
+			return 0;
+		}
 		if (input[1] == '*') {
-			r_core_task_del (core, -1);
+			r_core_task_del_all_done (core);
 		} else {
 			r_core_task_del (core, r_num_math (core->num, input + 1));
 		}
@@ -1213,24 +1391,11 @@
 		helpCmdTasks (core);
 		break;
 	case ' ':
-		{
-			int tid = r_num_math (core->num, input + 1);
-			if (tid) {
-				RCoreTask *task = r_core_task_get (core, tid);
-				if (task) {
-					r_core_task_join (core, task);
-				} else {
-					eprintf ("Cannot find task\n");
-				}
-			} else {
-				RCoreTask *task = r_core_task_add (core, r_core_task_new (
-							core, input + 1, (RCoreTaskCallback)task_finished, core));
-				RThread *th = r_th_new (taskbgrun, task, 0);
-				task->msg->th = th;
-			}
-			//r_core_cmd0 (core, task->msg->text);
-			//r_core_task_del (core, task->id);
+		if (r_sandbox_enable (0)) {
+			eprintf ("This command is disabled in sandbox mode\n");
+			return 0;
 		}
+		r_core_task_enqueue (core, r_core_task_new (core, true, input + 1, NULL, core));
 		break;
 	default:
 		eprintf ("&?\n");
@@ -1272,7 +1437,7 @@
 	int ret = true;
 	switch (*input) {
 	case '?':
-		r_core_cmd_help (core, help_msg_percent);
+		cmd_help_percent (core);
 		break;
 	default:
 		ret = r_core_cmdf (core, "env %s", input);
@@ -1280,20 +1445,152 @@
 	return ret;
 }
 
+static struct autocomplete_flag_map_t {
+	const char* name;
+	const char* desc;
+	int type;
+} autocomplete_flags [] = {
+	{ "$dflt", "default autocomplete flag", R_CORE_AUTOCMPLT_DFLT },
+	{ "$flag", "shows known flag hints", R_CORE_AUTOCMPLT_FLAG },
+	{ "$flsp", "shows known flag-spaces hints", R_CORE_AUTOCMPLT_FLSP },
+	{ "$zign", "shows known zignatures hints", R_CORE_AUTOCMPLT_ZIGN },
+	{ "$eval", "shows known evals hints", R_CORE_AUTOCMPLT_EVAL },
+	{ "$prjt", "shows known projects hints", R_CORE_AUTOCMPLT_PRJT },
+	{ "$mins", NULL, R_CORE_AUTOCMPLT_MINS },
+	{ "$brkp", "shows known breakpoints hints", R_CORE_AUTOCMPLT_BRKP },
+	{ "$macro", NULL, R_CORE_AUTOCMPLT_MACR },
+	{ "$file", "hints file paths", R_CORE_AUTOCMPLT_FILE },
+	{ "$thme", "shows known themes hints", R_CORE_AUTOCMPLT_THME },
+	{ "$optn", "allows the selection for multiple options", R_CORE_AUTOCMPLT_OPTN }
+};
+
+static inline void print_dict(RCoreAutocomplete* a, int sub) {
+	if (!a) {
+		return;
+	}
+	int i, j;
+	const char* name = "unknown";
+	for (i = 0; i < a->n_subcmds; ++i) {
+		RCoreAutocomplete* b = a->subcmds[i];
+		if (b->locked) {
+			continue;
+		}
+		for (j = 0; j < R_CORE_AUTOCMPLT_END; ++j) {
+			if (b->type == autocomplete_flags[j].type) {
+				name = autocomplete_flags[j].name;
+				break;
+			}
+		}
+		eprintf ("[%3d] %s: '%s'\n", sub, name, b->cmd);
+		print_dict (a->subcmds[i], sub + 1);
+	}
+}
+
+static int autocomplete_type(const char* strflag) {
+	int i;
+	for (i = 0; i < R_CORE_AUTOCMPLT_END; ++i) {
+		if (autocomplete_flags[i].desc && !strncmp (strflag, autocomplete_flags[i].name, 5)) {
+			return autocomplete_flags[i].type;
+		}
+	}
+	eprintf ("Invalid flag '%s'\n", strflag);
+	return R_CORE_AUTOCMPLT_END;
+}
+
+static void cmd_autocomplete(RCore *core, const char *input) {
+	RCoreAutocomplete* b = core->autocomplete;
+	input = r_str_trim_ro (input);
+	char arg[256];
+	if (!*input) {
+		print_dict (core->autocomplete, 0);
+		return;
+	}
+	if (*input == '?') {
+		r_core_cmd_help (core, help_msg_triple_exclamation);
+		int i;
+		r_cons_printf ("|Types:\n");
+		for (i = 0; i < R_CORE_AUTOCMPLT_END; ++i) {
+			if (autocomplete_flags[i].desc) {
+				r_cons_printf ("| %s     %s\n",
+					autocomplete_flags[i].name,
+					autocomplete_flags[i].desc);
+			}
+		}
+		return;
+	}
+	if (*input == '-') {
+		const char *arg = input + 1;
+		if (!*input) {
+			eprintf ("Use !!!-* or !!!-<cmd>\n");
+			return;
+		}
+		r_core_autocomplete_remove (b, arg);
+		return;
+	}
+	while (b) {
+		const char* end = r_str_trim_wp (input);
+		if (!end) {
+			break;
+		}
+		if ((end - input) >= sizeof (arg)) {
+			// wtf?
+			eprintf ("Exceeded the max arg length (255).\n");
+			return;
+		}
+		if (end == input) {
+			break;
+		}
+		memcpy (arg, input, end - input);
+		arg[end - input] = 0;
+		RCoreAutocomplete* a = r_core_autocomplete_find (b, arg, true);
+		input = r_str_trim_ro (end);
+		if (input && *input && !a) {
+			if (b->type == R_CORE_AUTOCMPLT_DFLT && !(b = r_core_autocomplete_add (b, arg, R_CORE_AUTOCMPLT_DFLT, false))) {
+				eprintf ("ENOMEM\n");
+				return;
+			} else if (b->type != R_CORE_AUTOCMPLT_DFLT) {
+				eprintf ("Cannot add autocomplete to '%s'. type not $dflt\n", b->cmd);
+				return;
+			}
+		} else if ((!input || !*input) && !a) {
+			if (arg[0] == '$') {
+				int type = autocomplete_type (arg);
+				if (type != R_CORE_AUTOCMPLT_END && !b->locked && !b->n_subcmds) {
+					b->type = type;
+				} else if (b->locked || b->n_subcmds) {
+					eprintf ("Changing type of '%s' is forbidden.\n", b->cmd);
+				}
+			} else {
+				if (!r_core_autocomplete_add (b, arg, R_CORE_AUTOCMPLT_DFLT, false)) {
+					eprintf ("ENOMEM\n");
+					return;
+				}
+			}
+			return;
+		} else if ((!input || !*input) && a) {
+			eprintf ("Cannot add '%s'. Already exists.\n", arg);
+			return;
+		} else {
+			b = a;
+		}
+	}
+	eprintf ("Invalid usage of !!!\n");
+}
+
 static int cmd_system(void *data, const char *input) {
 	RCore *core = (RCore*)data;
 	ut64 n;
 	int ret = 0;
 	switch (*input) {
-	case '-':
+	case '-': //!-
 		if (input[1]) {
 			r_line_hist_free();
-			r_line_hist_save (R2_HOMEDIR"/history");
+			r_line_hist_save (R2_HOME_HISTORY);
 		} else {
 			r_line_hist_free();
 		}
 		break;
-	case '=':
+	case '=': //!=
 		if (input[1] == '?') {
 			r_cons_printf ("Usage: !=[!]  - enable/disable remote commands\n");
 		} else {
@@ -1303,32 +1600,38 @@
 			}
 		}
 		break;
-	case '!':
-		if (r_sandbox_enable (0)) {
-			eprintf ("This command is disabled in sandbox mode\n");
-			return 0;
-		}
-		if (input[1]) {
-			int olen;
-			char *out = NULL;
-			char *cmd = r_core_sysenv_begin (core, input);
-			if (cmd) {
-				ret = r_sys_cmd_str_full (cmd + 1, NULL, &out, &olen, NULL);
-				r_core_sysenv_end (core, input);
-				r_cons_memcat (out, olen);
-				free (out);
-				free (cmd);
-			} //else eprintf ("Error setting up system environment\n");
+	case '!': //!!
+		if (input[1] == '!') { // !!! & !!!-
+			cmd_autocomplete (core, input + 2);
+		} else if (input[1] == '?') {
+			cmd_help_exclamation (core);
 		} else {
-			eprintf ("History saved to "R2_HOMEDIR"/history\n");
-			r_line_hist_save (R2_HOMEDIR"/history");
+			if (r_sandbox_enable (0)) {
+				eprintf ("This command is disabled in sandbox mode\n");
+				return 0;
+			}
+			if (input[1]) {
+				int olen;
+				char *out = NULL;
+				char *cmd = r_core_sysenv_begin (core, input);
+				if (cmd) {
+					ret = r_sys_cmd_str_full (cmd + 1, NULL, &out, &olen, NULL);
+					r_core_sysenv_end (core, input);
+					r_cons_memcat (out, olen);
+					free (out);
+					free (cmd);
+				} //else eprintf ("Error setting up system environment\n");
+			} else {
+				eprintf ("History saved to "R2_HOME_HISTORY"\n");
+				r_line_hist_save (R2_HOME_HISTORY);
+			}
 		}
 		break;
 	case '\0':
 		r_line_hist_list ();
 		break;
-	case '?':
-		r_core_sysenv_help (core);
+	case '?': //!?
+		cmd_help_exclamation (core);
 		break;
 	default:
 		n = atoi (input);
@@ -1439,7 +1742,7 @@
 	r_config_set_i (core->config, "scr.interactive", 0);
 	if (!r_config_get_i (core->config, "scr.pipecolor")) {
 		pipecolor = r_config_get_i (core->config, "scr.color");
-		r_config_set_i (core->config, "scr.color", 0);
+		r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 	}
 	if (*shell_cmd=='!') {
 		r_cons_grep_parsecmd (shell_cmd, "\"");
@@ -1539,14 +1842,20 @@
 	return res;
 }
 
-static int r_core_cmd_subst_i(RCore *core, char *cmd, char* colon);
+static int r_core_cmd_subst_i(RCore *core, char *cmd, char* colon, bool *tmpseek);
 static int r_core_cmd_subst(RCore *core, char *cmd) {
 	int ret = 0, rep = atoi (cmd), orep;
 	char *cmt, *colon = NULL, *icmd = strdup (cmd);
 	const char *cmdrep = NULL;
 	bool tmpseek = false;
-	ut64 orig_offset;
+	bool original_tmpseek = core->tmpseek;
+	/* must store a local orig_offset because there can be
+	 * nested call of this function */
+	ut64 orig_offset = core->offset;
 
+	if (core->max_cmd_depth - core->cmd_depth == 1) {
+		core->prompt_offset = core->offset;
+	}
 	cmd = r_str_trim_head_tail (icmd);
 	// lines starting with # are ignored (never reach cmd_hash()), except #! and #?
 	if (!*cmd) {
@@ -1605,7 +1914,6 @@
 	orep = rep;
 
 	int ocur_enabled = core->print && core->print->cur_enabled;
-	orig_offset = core->offset;
 	while (rep-- && *cmd) {
 		if (core->print) {
 			core->print->cur_enabled = false;
@@ -1617,14 +1925,7 @@
 		}
 		char *cr = strdup (cmdrep);
 		core->break_loop = false;
-		ret = r_core_cmd_subst_i (core, cmd, colon);
-		/*
-		 * r_core_cmd_subst_i will set core->tmpseek when run cmd the first time
-		 * if `@ tmpoff` is used, keep core->tmpseek in the remaining runs
-		 */
-		if (core->tmpseek) {
-			tmpseek = true;
-		}
+		ret = r_core_cmd_subst_i (core, cmd, colon, (rep == orep - 1) ? &tmpseek : NULL);
 		if (ret && *cmd == 'q') {
 			free (cr);
 			goto beach;
@@ -1645,6 +1946,7 @@
 	}
 	if (tmpseek) {
 		r_core_seek (core, orig_offset, 1);
+		core->tmpseek = original_tmpseek;
 	}
 	if (core->print) {
 		core->print->cur_enabled = ocur_enabled;
@@ -1682,7 +1984,35 @@
 	return strchr (p, '-');
 }
 
-static int r_core_cmd_subst_i(RCore *core, char *cmd, char *colon) {
+static void tmpenvs_free(void *item) {
+	r_sys_setenv (item, NULL);
+	free (item);
+}
+
+static bool set_tmp_arch(RCore *core, char *arch, char **tmparch) {
+	if (tmparch == NULL ) {
+		eprintf ("tmparch should be set\n");
+	}
+
+	*tmparch = strdup (r_config_get (core->config, "asm.arch"));
+	r_config_set (core->config, "asm.arch", arch);
+	core->fixedarch = true;
+	return true;
+}
+
+static bool set_tmp_bits(RCore *core, int bits, char **tmpbits) {
+	if (tmpbits == NULL) {
+		eprintf ("tmpbits should be set\n");
+	}
+
+	*tmpbits = strdup (r_config_get (core->config, "asm.bits"));
+	r_config_set_i (core->config, "asm.bits", bits);
+	core->fixedbits = true;
+	return true;
+}
+
+static int r_core_cmd_subst_i(RCore *core, char *cmd, char *colon, bool *tmpseek) {
+	RList *tmpenvs = r_list_newf (tmpenvs_free);
 	const char *quotestr = "`";
 	const char *tick = NULL;
 	char *ptr, *ptr2, *str;
@@ -1694,6 +2024,9 @@
 	int scr_color = -1;
 	bool eos = false;
 	bool haveQuote = false;
+	bool oldfixedarch = core->fixedarch;
+	bool oldfixedbits = core->fixedbits;
+	bool cmd_tmpseek = false;
 
 	if (!cmd) {
 		return 0;
@@ -1831,6 +2164,11 @@
 			return r_cmd_call (core->rcmd, cmd);
 		}
 		break;
+	case '?':
+		if (cmd[1] == '>') {
+			r_core_cmd_help (core, help_msg_greater_sign);
+			return true;
+		}
 	}
 
 // TODO must honor `
@@ -1866,6 +2204,13 @@
 	//ptr = strchr (cmd, '|');
 	ptr = (char *)r_str_lastbut (cmd, '|', quotestr);
 	if (ptr) {
+		if (ptr > cmd) {
+			char *ch = ptr - 1;
+			if (*ch == '\\') {
+				memmove (ch, ptr, strlen (ptr) + 1);
+				goto escape_pipe;
+			}
+		}
 		char *ptr2 = strchr (cmd, '`');
 		if (!ptr2 || (ptr2 && ptr2 > ptr)) {
 			if (!tick || (tick && tick > ptr)) {
@@ -1879,12 +2224,13 @@
 					eprintf (" pd|H   - enable scr.html, respect scr.color\n");
 					eprintf (" pi 1|T - use scr.tts to speak out the stdout\n");
 					return ret;
-				} else if (!strcmp (ptr + 1, "H")) { // "|H"
+				} else if (!strncmp (ptr + 1, "H", 1)) { // "|H"
 					scr_html = r_config_get_i (core->config, "scr.html");
 					r_config_set_i (core->config, "scr.html", true);
+					//r_config_set_i (core->config, "scr.pipecolor", true);
 				} else if (!strcmp (ptr + 1, "T")) { // "|T"
 					scr_color = r_config_get_i (core->config, "scr.color");
-					r_config_set_i (core->config, "scr.color", false);
+					r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 					core->cons->use_tts = true;
 				} else if (ptr[1]) { // "| grep .."
 					int value = core->num->value;
@@ -1904,17 +2250,18 @@
 					scr_html = r_config_get_i (core->config, "scr.html");
 					r_config_set_i (core->config, "scr.html", 0);
 					scr_color = r_config_get_i (core->config, "scr.color");
-					r_config_set_i (core->config, "scr.color", false);
+					r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 				}
 			}
 		}
 	}
+escape_pipe:
 
 	// TODO must honor " and `
 	/* bool conditions */
 	ptr = (char *)r_str_lastbut (cmd, '&', quotestr);
 	//ptr = strchr (cmd, '&');
-	while (ptr && ptr[1] == '&') {
+	while (ptr && *ptr && ptr[1] == '&') {
 		*ptr = '\0';
 		ret = r_cmd_call (core->rcmd, cmd);
 		if (ret == -1) {
@@ -1964,7 +2311,7 @@
 	ptr = strchr (cmd, '<');
 	if (ptr) {
 		ptr[0] = '\0';
-		if (r_cons_singleton()->is_interactive) {
+		if (r_cons_singleton ()->is_interactive) {
 			if (ptr[1] == '<') {
 				/* this is a bit mess */
 				//const char *oprompt = strdup (r_line_singleton ()->prompt);
@@ -2026,6 +2373,17 @@
 	ptr = (char *)r_str_firstbut (cmd, '>', "\"");
 	// TODO honor `
 	if (ptr) {
+		if (ptr > cmd) {
+			char *ch = ptr - 1;
+			if (*ch == '\\') {
+				memmove (ch, ptr, strlen (ptr) + 1);
+				goto escape_redir;
+			}
+		}
+		if (ptr[0] && ptr[1] == '?') {
+			r_core_cmd_help (core, help_msg_greater_sign);
+			return true;
+		}
 		int fdn = 1;
 		int pipecolor = r_config_get_i (core->config, "scr.pipecolor");
 		int use_editor = false;
@@ -2039,7 +2397,7 @@
 		/* r_cons_flush() handles interactive output (to the terminal)
 		 * differently (e.g. asking about too long output). This conflicts
 		 * with piping to a file. Disable it while piping. */
-		if (ptr > (cmd + 1) && ISWHITECHAR (ptr[-2])) {
+		if (ptr > (cmd + 1) && IS_WHITECHAR (ptr[-2])) {
 			char *fdnum = ptr - 1;
 			if (*fdnum == 'H') { // "H>"
 				scr_html = r_config_get_i (core->config, "scr.html");
@@ -2047,7 +2405,7 @@
 				pipecolor = true;
 				*fdnum = 0;
 			} else {
-				if (IS_DIGIT(*fdnum)) {
+				if (IS_DIGIT (*fdnum)) {
 					fdn = *fdnum - '0';
 				}
 				*fdnum = 0;
@@ -2057,13 +2415,13 @@
 		if (!strcmp (str, "-")) {
 			use_editor = true;
 			str = r_file_temp ("dumpedit");
-			r_config_set (core->config, "scr.color", "false");
+			r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 		}
 		if (fdn > 0) {
 			pipefd = r_cons_pipe_open (str, fdn, ptr[1] == '>');
 			if (pipefd != -1) {
 				if (!pipecolor) {
-					r_config_set_i (core->config, "scr.color", 0);
+					r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 				}
 				ret = r_core_cmd_subst (core, cmd);
 				r_cons_flush ();
@@ -2094,10 +2452,18 @@
 		core->cons->use_tts = false;
 		return ret;
 	}
+escape_redir:
 next2:
 	/* sub commands */
 	ptr = strchr (cmd, '`');
 	if (ptr) {
+		if (ptr > cmd) {
+			char *ch = ptr - 1;
+			if (*ch == '\\') {
+				memmove (ch, ptr, strlen (ptr) + 1);
+				goto escape_backtick;
+			}
+		}
 		bool empty = false;
 		int oneline = 1;
 		if (ptr[1] == '`') {
@@ -2148,6 +2514,7 @@
 			return ret;
 		}
 	}
+escape_backtick:
 	// TODO must honor " and `
 	core->fixedblock = false;
 
@@ -2170,7 +2537,7 @@
 		ptr = NULL;
 	}
 
-	core->tmpseek = ptr? true: false;
+	cmd_tmpseek = core->tmpseek = ptr ? true: false;
 	int rc = 0;
 	if (ptr) {
 		char *f, *ptr2 = strchr (ptr + 1, '!');
@@ -2179,6 +2546,8 @@
 		char *tmpbits = NULL;
 		const char *offstr = NULL;
 		ut64 tmpbsz = core->blocksize;
+		bool is_bits_set = false;
+		bool is_arch_set = false;
 		char *tmpeval = NULL;
 		char *tmpasm = NULL;
 		int flgspc = -123;
@@ -2207,6 +2576,14 @@
 
 		if (ptr[1] == '?') {
 			r_core_cmd_help (core, help_msg_at);
+		} else if (ptr[1] == '%') { // "@%"
+			char *k = strdup (ptr + 2);
+			char *v = strchr (k, '=');
+			if (v) {
+				*v++ = 0;
+				r_sys_setenv (k, v);
+				r_list_append (tmpenvs, k);
+			}
 		} else if (ptr[1] == '.') { // "@."
 			if (ptr[2] == '.') { // "@.."
 				if (ptr[3] == '.') { // "@..."
@@ -2216,7 +2593,7 @@
 				} else {
 					addr = r_num_tail (core->num, core->offset, ptr + 3);
 					r_core_seek (core, addr, 1);
-					core->tmpseek = true;
+					cmd_tmpseek = core->tmpseek = true;
 					goto fuji;
 				}
 			} else {
@@ -2224,12 +2601,35 @@
 				eprintf ("TODO: what do you expect for @. import offset from file maybe?\n");
 			}
 		} else if (ptr[0] && ptr[1] == ':' && ptr[2]) {
-			usemyblock = true;
 			switch (ptr[0]) {
 			case 'F': // "@F:" // temporary flag space
 				flgspc = r_flag_space_get (core->flags, ptr + 2);
 				r_flag_space_set (core->flags, ptr + 2);
 				break;
+			case 'B': // "@B:#" // seek to the last instruction in current bb
+				{
+					int index = (int)r_num_math (core->num, ptr + 2);
+					RAnalBlock *bb = r_anal_bb_from_offset (core->anal, core->offset);
+					if (bb) {
+						// handle negative indices
+						if (index < 0) {
+							index = bb->ninstr + index;
+						}
+
+						if (index >= 0 && index < bb->ninstr) {
+							ut16 inst_off = r_anal_bb_offset_inst (bb, index);
+							r_core_seek (core, bb->addr + inst_off, 1);
+							cmd_tmpseek = core->tmpseek = true;
+							usemyblock = true;
+						} else {
+							eprintf("The current basic block has %d instructions\n", bb->ninstr);
+						}
+					} else {
+						eprintf ("Can't find a basic block for 0x%08"PFMT64x"\n", core->offset);
+					}
+					break;
+				}
+				break;
 			case 'f': // "@f:" // slurp file in block
 				f = r_file_slurp (ptr + 2, &sz);
 				if (f) {
@@ -2239,6 +2639,7 @@
 						core->block = buf;
 						core->blocksize = sz;
 						memcpy (core->block, f, sz);
+						usemyblock = true;
 					} else {
 						eprintf ("cannot alloc %d", sz);
 					}
@@ -2265,18 +2666,18 @@
 					}
 					r_core_seek (core, regval, 1);
 					free (mander);
+					usemyblock = true;
 				}
 				break;
 			case 'b': // "@b:" // bits
-				tmpbits = strdup (r_config_get (core->config, "asm.bits"));
-				r_config_set_i (core->config, "asm.bits",
-					r_num_math (core->num, ptr + 2));
+				is_bits_set = set_tmp_bits (core, r_num_math (core->num, ptr + 2), &tmpbits);
 				break;
 			case 'i': // "@i:"
 				{
 					ut64 addr = r_num_math (core->num, ptr + 2);
 					if (addr) {
 						r_core_cmdf (core, "so %s", ptr + 2);
+						usemyblock = true;
 					}
 				}
 				break;
@@ -2299,6 +2700,7 @@
 						r_core_block_size (core, R_ABS(len));
 						memcpy (core->block, buf, core->blocksize);
 						core->fixedblock = true;
+						usemyblock = true;
 						free (buf);
 					} else {
 						eprintf ("cannot allocate\n");
@@ -2313,6 +2715,7 @@
 					if (out) {
 						r_core_seek (core, r_num_math (core->num, out), 1);
 						free (out);
+						usemyblock = true;
 					}
 				 }
 				break;
@@ -2325,14 +2728,12 @@
 			case 'a': // "@a:"
 				if (ptr[1] == ':') {
 					char *q = strchr (ptr + 2, ':');
-					tmpasm = strdup (r_config_get (core->config, "asm.arch"));
 					if (q) {
 						*q++ = 0;
-						tmpbits = strdup (r_config_get (core->config, "asm.bits"));
-						r_config_set (core->config, "asm.bits", q);
+						int bits = r_num_math (core->num, q);
+						is_bits_set = set_tmp_bits (core, bits, &tmpbits);
 					}
-					r_config_set (core->config, "asm.arch", ptr + 2);
-					// TODO: handle asm.bits
+					is_arch_set = set_tmp_arch (core, ptr + 2, &tmpasm);
 				} else {
 					eprintf ("Usage: pd 10 @a:arm:32\n");
 				}
@@ -2341,6 +2742,7 @@
 				len = strlen (ptr + 2);
 				r_core_block_size (core, len);
 				memcpy (core->block, ptr + 2, len);
+				usemyblock = true;
 				break;
 			default:
 				goto ignore;
@@ -2449,8 +2851,9 @@
 						r_core_seek (core, addr, 1);
 						r_core_block_read (core);
 					}
-					ret = r_cmd_call (core->rcmd, r_str_trim_head (cmd));
 				}
+				ret = r_cmd_call (core->rcmd, r_str_trim_head (cmd));
+
 			}
 			if (tmpseek) {
 				// restore ranges
@@ -2466,16 +2869,19 @@
 			*ptr2 = '!';
 			r_core_block_size (core, tmpbsz);
 		}
-		if (tmpasm) {
+		if (is_arch_set) {
+			core->fixedarch = oldfixedarch;
 			r_config_set (core->config, "asm.arch", tmpasm);
-			tmpasm = NULL;
+			R_FREE (tmpasm);
+			is_arch_set = false;
 		}
 		if (tmpfd != -1) {
 			r_io_use_fd (core->io, tmpfd);
 		}
-		if (tmpbits) {
+		if (is_bits_set) {
 			r_config_set (core->config, "asm.bits", tmpbits);
-			tmpbits = NULL;
+			is_bits_set = false;
+			core->fixedbits = oldfixedbits;
 		}
 		if (tmpeval) {
 			r_core_cmd0 (core, tmpeval);
@@ -2500,7 +2906,13 @@
 	if (scr_color != -1) {
 		r_config_set_i (core->config, "scr.color", scr_color);
 	}
+	r_list_free (tmpenvs);
 	core->fixedblock = false;
+	core->fixedarch = oldfixedarch;
+	core->fixedbits = oldfixedbits;
+	if (tmpseek) {
+		*tmpseek = cmd_tmpseek;
+	}
 	return rc;
 fail:
 	rc = -1;
@@ -2522,7 +2934,7 @@
 	return 1;
 }
 
-R_API int r_core_cmd_foreach3(RCore *core, const char *cmd, char *each) {
+R_API int r_core_cmd_foreach3(RCore *core, const char *cmd, char *each) { // "@@@"
 	RDebug *dbg = core->dbg;
 	RList *list, *head;
 	RListIter *iter;
@@ -2549,15 +2961,7 @@
 		}
 		break;
 	case '?':
-		r_cons_printf ("Usage: @@@ [type]     # types:\n"
-			" symbols\n"
-			" sections\n"
-			" imports\n"
-			" regs\n"
-			" threads\n"
-			" comments\n"
-			" functions\n"
-			" flags\n");
+		r_core_cmd_help (core, help_msg_at_at_at);
 		break;
 	case 'c':
 		switch (each[1]) {
@@ -2609,7 +3013,7 @@
 			r_core_seek (core, offorig, 1);
 		}
 		break;
-	case 'i':
+	case 'i': // @@@i
 		// imports
 		{
 			RBinImport *imp;
@@ -2626,8 +3030,8 @@
 			r_core_seek (core, offorig, 1);
 		}
 		break;
-	case 's':
-		if (each[1] == 'e') {
+	case 'S':
+		{
 			RBinObject *obj = r_bin_cur_object (core->bin);
 			if (obj) {
 				ut64 offorig = core->offset;
@@ -2642,7 +3046,29 @@
 				r_core_seek (core, offorig, 1);
 				r_core_block_size (core, bszorig);
 			}
-		} else {
+		}
+#if ATTIC
+		if (each[1] == 'S') {
+			RListIter *it;
+			RBinSection *sec;
+			RBinObject *obj = r_bin_cur_object (core->bin);
+			int cbsz = core->blocksize;
+			r_list_foreach (obj->sections, it, sec){
+				ut64 addr = sec->vaddr;
+				ut64 size = sec->vsize;
+				// TODO: 
+				//if (R_BIN_SCN_EXECUTABLE & sec->srwx) {
+				//	continue;
+				//}
+				r_core_seek_size (core, addr, size);
+				r_core_cmd (core, cmd, 0);
+			}
+			r_core_block_size (core, cbsz);
+		}
+#endif
+		break;
+	case 's':
+		{
 			// symbols
 			RBinSymbol *sym;
 			ut64 offorig = core->offset;
@@ -2655,26 +3081,33 @@
 		}
 		break;
 	case 'f':
-		switch (each[1]) {
-		case 'l': // flags
+		{
+			char *glob = r_str_trim (strdup (each + 1));
+			ut64 off = core->offset;
+			ut64 obs = core->blocksize;
 			r_list_foreach (core->flags->flags, iter, flg) {
-				r_core_seek (core, flg->offset, 1);
-				r_core_cmd0 (core, cmd);
-			}
-			break;
-		case 'u': // functions
-			{
-				ut64 offorig = core->offset;
-				RAnalFunction *fcn;
-				list = core->anal->fcns;
-				r_list_foreach (list, iter, fcn) {
-					r_cons_printf ("[0x%08"PFMT64x"  %s\n", fcn->addr, fcn->name);
-					r_core_seek (core, fcn->addr, 1);
+				if (r_str_glob (flg->name, glob)) {
+					r_core_seek (core, flg->offset, 1);
+					r_core_block_size (core, flg->size);
 					r_core_cmd0 (core, cmd);
 				}
-				r_core_seek (core, offorig, 1);
 			}
-			break;
+			r_core_seek (core, off, 0);
+			r_core_block_size (core, obs);
+			free (glob);
+		}
+		break;
+	case 'F':
+		{
+			ut64 offorig = core->offset;
+			RAnalFunction *fcn;
+			list = core->anal->fcns;
+			r_list_foreach (list, iter, fcn) {
+				r_cons_printf ("[0x%08"PFMT64x"  %s\n", fcn->addr, fcn->name);
+				r_core_seek (core, fcn->addr, 1);
+				r_core_cmd0 (core, cmd);
+			}
+			r_core_seek (core, offorig, 1);
 		}
 		break;
 	}
@@ -2850,7 +3283,7 @@
 			RAnalFunction *fcn;
 			RListIter *iter;
 			if (core->anal) {
-				RConsGrep grep = core->cons->grep;
+				RConsGrep grep = core->cons->context->grep;
 				r_list_foreach (core->anal->fcns, iter, fcn) {
 					char *buf;
 					r_core_seek (core, fcn->addr, 1);
@@ -2867,7 +3300,7 @@
 						break;
 					}
 				}
-				core->cons->grep = grep;
+				core->cons->context->grep = grep;
 			}
 			goto out_finish;
 		}
@@ -3022,29 +3455,49 @@
 			str[i] = ch;
 			{
 				int flagspace = core->flags->space_idx;
-				/* for all flags in current flagspace */
-				// XXX: dont ask why, but this only works with _prev..
+				RList *match_flag_items = r_list_newf ((RListFree)r_flag_item_free);
+				if (!match_flag_items) {
+					break;
+				}
+
+				/* duplicate flags that match word, to be sure
+				   the command is going to be executed on flags
+				   values at the moment the command is called
+				   (without side effects) */
 				r_list_foreach (core->flags->flags, iter, flag) {
-					if (r_cons_is_breaked ()) {
-						break;
-					}
 					/* filter per flag spaces */
 					if ((flagspace != -1) && (flag->space != flagspace)) {
 						continue;
 					}
+
 					if (r_str_glob (flag->name, word)) {
-						char *buf = NULL;
-						const char *tmp = NULL;
-						r_core_seek (core, flag->offset, 1);
-						r_cons_push ();
-						r_core_cmd (core, cmd, 0);
-						tmp = r_cons_get_buffer ();
-						buf = tmp? strdup (tmp): NULL;
-						r_cons_pop ();
-						r_cons_strcat (buf);
-						free (buf);
+						RFlagItem *cloned_item = r_flag_item_clone (flag);
+						if (!cloned_item) {
+							break;
+						}
+						r_list_append (match_flag_items, cloned_item);
 					}
 				}
+
+				/* for all flags that match */
+				r_list_foreach (match_flag_items, iter, flag) {
+					if (r_cons_is_breaked ()) {
+						break;
+					}
+
+					char *buf = NULL;
+					const char *tmp = NULL;
+					r_core_seek (core, flag->offset, 1);
+					r_cons_push ();
+					r_core_cmd (core, cmd, 0);
+					tmp = r_cons_get_buffer ();
+					buf = tmp? strdup (tmp): NULL;
+					r_cons_pop ();
+					r_cons_strcat (buf);
+					free (buf);
+				}
+
+				r_list_free (match_flag_items);
 				core->flags->space_idx = flagspace;
 				core->rcmd->macro.counter++ ;
 				free (word);
@@ -3065,11 +3518,19 @@
 	return false;
 }
 
+R_API void run_pending_anal(RCore *core) {
+	if (core && core->anal && core->anal->cmdtail) {
+		char *res = core->anal->cmdtail;
+		core->anal->cmdtail = NULL;
+		r_core_cmd_lines (core, res);
+		free (res);
+	}
+}
+
 R_API int r_core_cmd(RCore *core, const char *cstr, int log) {
 	char *cmd, *ocmd, *ptr, *rcmd;
 	int ret = false, i;
 
-	r_th_lock_enter (core->lock);
 	if (core->cmdfilter) {
 		const char *invalid_chars = ";|>`@";
 		for (i = 0; invalid_chars[i]; i++) {
@@ -3149,14 +3610,8 @@
 		}
 		rcmd = ptr + 1;
 	}
-	r_th_lock_leave (core->lock);
 	/* run pending analysis commands */
-	if (core && core->anal && core->anal->cmdtail) {
-		char *res = core->anal->cmdtail;
-		core->anal->cmdtail = NULL;
-		r_core_cmd_lines (core, res);
-		free (res);
-	}
+	run_pending_anal (core);
 	core->cmd_depth++;
 	free (ocmd);
 	free (core->oobi);
@@ -3164,14 +3619,17 @@
 	core->oobi_len = 0;
 	return ret;
 beach:
-	r_th_lock_leave (core->lock);
-	/* run pending analysis commands */
-	if (core->anal->cmdtail) {
-		char *res = core->anal->cmdtail;
-		core->anal->cmdtail = NULL;
-		r_core_cmd0 (core, res);
-		free (res);
+	if (r_list_empty (core->tasks)) {
+		r_th_lock_leave (core->lock);
+	} else {
+		RListIter *iter;
+		RCoreTask *task;
+		r_list_foreach (core->tasks, iter, task) {
+			r_th_pause (task->thread, false);
+		}
 	}
+	/* run pending analysis commands */
+	run_pending_anal (core);
 	return ret;
 }
 
@@ -3446,6 +3904,21 @@
 	}
 }
 
+/* run cmd in the main task synchronously */
+R_API int r_core_cmd_task_sync(RCore *core, const char *cmd, bool log) {
+	RCoreTask *task = core->main_task;
+	char *s = strdup (cmd);
+	if (!s) {
+		return 0;
+	}
+	task->cmd = s;
+	task->cmd_log = log;
+	task->state = R_CORE_TASK_STATE_BEFORE_START;
+	int res = r_core_task_run_sync (core, task);
+	free (s);
+	return res;
+}
+
 static int cmd_ox(void *data, const char *input) {
 	return r_core_cmdf ((RCore*)data, "s 0%s", input);
 }
@@ -3528,6 +4001,7 @@
 		{"Text",     "Text log utility", cmd_log, cmd_log_init},
 		{"u",        "uname/undo", cmd_uname},
 		{"visual",   "enter visual mode", cmd_visual},
+		{"<",        "pipe into RCons.readChar", cmd_pipein},
 		{"Visual",   "enter visual mode", cmd_visual},
 		{"write",    "write bytes", cmd_write, cmd_write_init},
 		{"x",        "alias for px", cmd_hexdump},
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_cmp.c radare2-2.8.0+dfsg/libr/core/cmd_cmp.c
--- radare2-2.3.0+dfsg/libr/core/cmd_cmp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_cmp.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,30 +1,32 @@
-/* radare - LGPL - Copyright 2009-2015 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include "r_core.h"
 
 static const char *help_msg_c[] = {
 	"Usage:", "c[?dfx] [argument]", " # Compare",
 	"c", " [string]", "Compare a plain with escaped chars string",
-	"c*", " [string]", "Compare a plain with escaped chars string (output r2 commands)",
+	"c*", " [string]", "Same as above, but printing r2 commands instead",
 	"c4", " [value]", "Compare a doubleword from a math expression",
 	"c8", " [value]", "Compare a quadword from a math expression",
 	"cat", " [file]", "Show contents of file (see pwd, ls)",
-	"cc", " [at] [(at)]", "Compares in two hexdump columns of block size",
-	"ccc", " [at] [(at)]", "Same as above, but only showing different lines",
-	"ccd", " [at] [(at)]", "Compares in two disasm columns of block size",
+	"cc", " [at]", "Compares in two hexdump columns of block size",
+	"ccc", " [at]", "Same as above, but only showing different lines",
+	"ccd", " [at]", "Compares in two disasm columns of block size",
 	// "cc", " [offset]", "code bindiff current block against offset"
 	// "cD", " [file]", "like above, but using radiff -b",
 	"cf", " [file]", "Compare contents of file at current seek",
 	"cg", "[?] [o] [file]", "Graphdiff current file and [file]",
-	"cl|cls|clear", "", "Clear screen, (clear0 to goto 0, 0 only)",
 	"cu", "[?] [addr] @at", "Compare memory hexdumps of $$ and dst in unified diff",
 	"cud", " [addr] @at", "Unified diff disasm from $$ and given address",
-	"cv", "[1248] [hexpairs] @at", "Compare 1,2,4,8-byte value",
-	"cV", "[1248] [addr] @at", "Compare 1,2,4,8-byte address contents",
+	"cv", "[1248] [hexpairs] @at", "Compare 1,2,4,8-byte (silent return in $?)",
+	"cV", "[1248] [addr] @at", "Compare 1,2,4,8-byte address contents (silent, return in $?)",
 	"cw", "[?] [us?] [...]", "Compare memory watchers",
 	"cx", " [hexpair]", "Compare hexpair string (use '.' as nibble wildcard)",
 	"cx*", " [hexpair]", "Compare hexpair string (output r2 commands)",
 	"cX", " [addr]", "Like 'cc' but using hexdiff output",
+	"", "", "",
+	"cd", " [dir]", "chdir",
+	"cl|cls|clear", "", "Clear screen, (clear0 to goto 0, 0 only)",
 	NULL
 };
 
@@ -148,6 +150,54 @@
 	return ret;
 }
 
+static int radare_compare_words(RCore *core, ut64 of, ut64 od, int len, int ws) {
+	int i;
+	bool useColor = r_config_get_i (core->config, "scr.color") != 0;
+	utAny v0, v1;
+	for (i = 0; i < len; i+=ws) {
+		memset (&v0, 0, sizeof (v0));
+		memset (&v1, 0, sizeof (v1));
+		r_io_read_at (core->io, of + i, (ut8*)&v0, ws);
+		r_io_read_at (core->io, od + i, (ut8*)&v1, ws);
+		char ch = (v0.v64 == v1.v64)? '=': '!';
+		const char *color = useColor? ch == '='? "": Color_RED: "";
+		const char *colorEnd = useColor? Color_RESET: "";
+
+		if (useColor) {
+			r_cons_printf (Color_YELLOW"0x%08" PFMT64x"  "Color_RESET, of + i);
+		} else {
+			r_cons_printf ("0x%08" PFMT64x"  ", of + i);
+		}
+		switch (ws) {
+		case 1:
+			r_cons_printf ("%s0x%02x %c 0x%02x%s\n", color,
+				(ut32)(v0.v8 & 0xff), ch, (ut32)(v1.v8 & 0xff), colorEnd);
+			break;
+		case 2:
+			r_cons_printf ("%s0x%04hx %c 0x%04hx%s\n", color,
+				v0.v16, ch, v1.v16, colorEnd);
+			break;
+		case 4:
+			r_cons_printf ("%s0x%08"PFMT32x" %c 0x%08"PFMT32x"%s\n", color,
+				v0.v32, ch, v1.v32, colorEnd);
+			//r_core_cmdf (core, "fd@0x%"PFMT64x, v0.v32);
+			if (v0.v32 != v1.v32) {
+			//	r_core_cmdf (core, "fd@0x%"PFMT64x, v1.v32);
+			}
+			break;
+		case 8:
+			r_cons_printf ("%s0x%016"PFMT64x" %c 0x%016"PFMT64x"%s\n",
+				color, v0.v64, ch, v1.v64, colorEnd);
+			//r_core_cmdf (core, "fd@0x%"PFMT64x, v0.v64);
+			if (v0.v64 != v1.v64) {
+			//	r_core_cmdf (core, "fd@0x%"PFMT64x, v1.v64);
+			}
+			break;
+		}
+	}
+	return 0;
+}
+
 static int radare_compare_unified(RCore *core, ut64 of, ut64 od, int len) {
 	int i, min, inc = 16;
 	ut8 *f, *d;
@@ -285,7 +335,7 @@
 	if (!buf) {
 		return false;
 	}
-	r_core_read_at (core, off, buf, core->blocksize + 32);
+	r_io_read_at (core->io, off, buf, core->blocksize + 32);
 	switch (mode) {
 	case 'c': // columns
 		for (i = j = 0; i < core->blocksize && j < core->blocksize;) {
@@ -374,15 +424,27 @@
 }
 
 static int cmd_cp(void *data, const char *input) {
-	char *src, *dst;
+	RCore *core = (RCore *)data;
+	if (input[1] == '.') {
+		char *file = r_core_cmd_strf (core, "ij~{core.file}");
+		r_str_trim (file);
+		char *newfile = r_str_newf ("%s.%s", file, input + 2);
+		r_file_copy (file, newfile);
+		free (file);
+		free (newfile);
+		return true;
+	}
 	if (strlen (input) < 3) {
 		eprintf ("Usage: cp src dst\n");
+		eprintf ("Usage: cp.orig  # cp $file $file.orig\n");
 		return false;
 	}
-	src = strdup (input + 2);
-	dst = strchr (src, ' ');
+	char *src = strdup (input + 2);
+	char *dst = strchr (src, ' ');
 	if (dst) {
 		*dst++ = 0;
+		r_str_trim (src);
+		r_str_trim (dst);
 		bool rc = r_file_copy (src, dst);
 		free (src);
 		return rc;
@@ -403,6 +465,7 @@
 	ut32 v32;
 	ut64 v64;
 	FILE *fd;
+	const ut8* block = core->block;
 
 	switch (*input) {
 	case 'p':
@@ -431,14 +494,14 @@
 			return 0;
 		}
 
-		val = radare_compare (core, core->block, (ut8 *) input + 2,
+		val = radare_compare (core, block, (ut8 *) input + 2,
 			strlen (input + 2) + 1, '*');
 		break;
 	case ' ':
 	{
 		char *str = strdup (input + 1);
 		int len = r_str_unescape (str);
-		val = radare_compare (core, core->block, (ut8 *) str, len, 0);
+		val = radare_compare (core, block, (ut8 *) str, len, 0);
 		free (str);
 	}
 	break;
@@ -468,7 +531,7 @@
 			free (filled);
 			return false;
 		}
-		ret = r_hex_bin2str (core->block, strlen (input) / 2, (char *) buf);
+		ret = r_hex_bin2str (block, strlen (input) / 2, (char *) buf);
 		for (i = 0; i < ret * 2; i++) {
 			if (filled[i] == '.') {
 				filled[i] = buf[i];
@@ -479,7 +542,7 @@
 		if (ret < 1) {
 			eprintf ("Cannot parse hexpair\n");
 		} else {
-			val = radare_compare (core, core->block, buf, ret, mode);
+			val = radare_compare (core, block, buf, ret, mode);
 		}
 		free (buf);
 		free (filled);
@@ -491,7 +554,7 @@
 					    input + 1), buf, core->blocksize)) {
 				eprintf ("Cannot read hexdump\n");
 			} else {
-				val = radare_compare (core, core->block, buf, ret, mode);
+				val = radare_compare (core, block, buf, ret, mode);
 			}
 			free (buf);
 		}
@@ -512,8 +575,7 @@
 			if (fread (buf, 1, core->blocksize, fd) < 1) {
 				eprintf ("Cannot read file %s\n", input + 2);
 			} else {
-				val = radare_compare (core, core->block,
-					buf, core->blocksize, 0);
+				val = radare_compare (core, block, buf, core->blocksize, 0);
 			}
 			fclose (fd);
 			free (buf);
@@ -522,7 +584,7 @@
 			return false;
 		}
 		break;
-	case 'd':
+	case 'd': // "cd"
 		while (input[1] == ' ') input++;
 		if (input[1]) {
 			if (!strcmp (input + 1, "-")) {
@@ -568,20 +630,20 @@
 			free (home);
 		}
 		break;
-	case '2':
+	case '2': // "c2"
 		v16 = (ut16) r_num_math (core->num, input + 1);
-		val = radare_compare (core, core->block, (ut8 *) &v16, sizeof (v16), 0);
+		val = radare_compare (core, block, (ut8 *) &v16, sizeof (v16), 0);
 		break;
-	case '4':
+	case '4': // "c4"
 		v32 = (ut32) r_num_math (core->num, input + 1);
-		val = radare_compare (core, core->block, (ut8 *) &v32, sizeof (v32), 0);
+		val = radare_compare (core, block, (ut8 *) &v32, sizeof (v32), 0);
 		break;
-	case '8':
+	case '8': // "c8"
 		v64 = (ut64) r_num_math (core->num, input + 1);
-		val = radare_compare (core, core->block, (ut8 *) &v64, sizeof (v64), 0);
+		val = radare_compare (core, block, (ut8 *) &v64, sizeof (v64), 0);
 		break;
 	case 'c': // "cc"
-		if (input[1] == 'd') {
+		if (input[1] == 'd') { // "ccd"
 			cmd_cmp_disasm (core, input + 2, 'c');
 		} else {
 			ut32 oflags = core->print->flags;
@@ -598,8 +660,8 @@
 			ut8 *b = malloc (core->blocksize);
 			if (b != NULL) {
 				memset (b, 0xff, core->blocksize);
-				r_core_read_at (core, addr, b, core->blocksize);
-				r_print_hexdiff (core->print, core->offset, core->block,
+				r_io_read_at (core->io, addr, b, core->blocksize);
+				r_print_hexdiff (core->print, core->offset, block,
 					addr, b, core->blocksize, col);
 				free (b);
 			}
@@ -650,15 +712,14 @@
 		}
 		r_core_loadlibs (core2, R_CORE_LOADLIBS_ALL, NULL);
 		core2->io->va = core->io->va;
-		core2->anal->split = core->anal->split;
 		if (!r_core_file_open (core2, file2, 0, 0LL)) {
 			eprintf ("Cannot open diff file '%s'\n", file2);
 			r_core_free (core2);
+			r_core_bind_cons (core);
 			return false;
 		}
 		// TODO: must replicate on core1 too
 		r_config_set_i (core2->config, "io.va", true);
-		r_config_set_i (core2->config, "anal.split", true);
 		r_anal_diff_setup (core->anal, diffops, -1, -1);
 		r_anal_diff_setup (core2->anal, diffops, -1, -1);
 
@@ -669,24 +730,38 @@
 		/* exchange a segfault with a memleak */
 		core2->config = NULL;
 		r_core_free (core2);
+		r_core_bind_cons (core);
 	}
 	break;
-	case 'u':
+	case 'u': // "cu"
 		switch (input[1]) {
+		case '.':
 		case ' ':
 			radare_compare_unified (core, core->offset,
-				r_num_math (core->num, input + 1),
+				r_num_math (core->num, input + 2),
 				core->blocksize);
 			break;
+		case '1':
+		case '2':
+		case '4':
+		case '8':
+			radare_compare_words (core, core->offset,
+				r_num_math (core->num, input + 2),
+				core->blocksize, input[1] - '0');
+			break;
 		case 'd':
 			cmd_cmp_disasm (core, input + 2, 'u');
 			break;
 		default: {
 			const char *help_msg[] = {
-				"Usage: cu", " [offset]", "# Creates a unified hex patch",
-				"cu", " $$+1 > p", "Compare current seek and +1",
+				"Usage: cu", " [offset]", "# Prints unified comparison to make hexpatches",
+				"cu", " $$+1 > p", "Compare hexpairs from  current seek and +1",
+				"cu1", " $$+1 > p", "Compare bytes from current seek and +1",
+				"cu2", " $$+1 > p", "Compare words (half, 16bit) from current seek and +1",
+				"cu4", " $$+1 > p", "Compare dwords from current seek and +1",
+				"cu8", " $$+1 > p", "Compare qwords from current seek and +1",
 				"cud", " $$+1 > p", "Compare disasm current seek and +1",
-				"wu", " p", "Apply unified hex patch",
+				"wu", " p", "Apply unified hex patch (see output of cu)",
 				NULL
 			};
 			r_core_cmd_help (core, help_msg);
@@ -696,8 +771,7 @@
 	case '?':
 		r_core_cmd_help (core, help_msg_c);
 		break;
-	case 'v': // "cv"
-	{
+	case 'v': { // "cv"
 		int sz = input[1];
 		if (sz == ' ') {
 			switch (r_config_get_i (core->config, "asm.bits")) {
@@ -710,38 +784,42 @@
 		}
 		// TODO: honor endian
 		switch (sz) {
-		case '1':
-		{
+		case '1': { // "cv1"
 			ut8 n = (ut8) r_num_math (core->num, input + 2);
-			if (core->block[0] == n) {
+			core->num->value = 1;
+			if (block[0] == n) {
 				r_cons_printf ("0x%08"PFMT64x "\n", core->offset);
+				core->num->value = 0;
 			}
+			break;
 		}
-		break;
-		case '2':
-		{
-			ut16 *b = (ut16 *) core->block, n = (ut16) r_num_math (core->num, input + 2);
-			if (*b == n) {
+		case '2': { // "cv2"
+			ut16 n = (ut16) r_num_math (core->num, input + 2);
+			core->num->value = 1;
+			if (core->blocksize >= 2 && *(ut16*)block == n) {
 				r_cons_printf ("0x%08"PFMT64x "\n", core->offset);
+				core->num->value = 0;
 			}
+			break;
 		}
-		break;
-		case '4':
-		{
-			ut32 *b = (ut32 *) core->block, n = (ut32) r_num_math (core->num, input + 2);
-			if (*b == n) {
+		case '4': { // "cv4"
+			ut32 n = (ut32) r_num_math (core->num, input + 2);
+			core->num->value = 1;
+			if (core->blocksize >= 4 && *(ut32*)block == n) {
 				r_cons_printf ("0x%08"PFMT64x "\n", core->offset);
+				core->num->value = 0;
 			}
+			break;
 		}
-		break;
-		case '8':
-		{
-			ut64 *b = (ut64 *) core->block, n = (ut64) r_num_math (core->num, input + 2);
-			if (*b == n) {
+		case '8': { // "cv8"
+			ut64 n = (ut64) r_num_math (core->num, input + 2);
+			core->num->value = 1;
+			if (core->blocksize >= 8 && *(ut64*)block == n) {
 				r_cons_printf ("0x%08"PFMT64x "\n", core->offset);
+				core->num->value = 0;
 			}
+			break;
 		}
-		break;
 		default:
 		case '?':
 			eprintf ("Usage: cv[1248] [num]\n"
@@ -754,8 +832,7 @@
 		}
 	}
 	break;
-	case 'V': // "cV"
-	{
+	case 'V': { // "cV"
 		int sz = input[1];
 		if (sz == ' ') {
 			switch (r_config_get_i (core->config, "asm.bits")) {
@@ -776,9 +853,9 @@
 			r_io_read_at (core->io, at, buf, sizeof (buf));
 			core->num->value = memcmp (buf, core->block, sz)? 1: 0;
 		}
-	}
 		break;
-	case 'l':
+	}
+	case 'l': // "cl"
 		if (strchr (input, 'f')) {
 			r_cons_flush ();
 		} else if (input[1] == 0) {
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_debug.c radare2-2.8.0+dfsg/libr/core/cmd_debug.c
--- radare2-2.3.0+dfsg/libr/core/cmd_debug.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_debug.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,9 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include "r_core.h"
 #include "r_util.h"
 #include "r_cons.h"
 #include "sdb/sdb.h"
-
 #define TN_KEY_LEN 32
 #define TN_KEY_FMT "%"PFMT64u
 
@@ -28,7 +27,7 @@
 	"dH", " [handler]", "Transplant process to a new handler",
 	"di", "[?]", "Show debugger backend information (See dh)",
 	"dk", "[?]", "List, send, get, set, signal handlers of child",
-	"dL", " [handler]", "List or set debugger handler",
+	"dL", "[?]", "List or set debugger handler",
 	"dm", "[?]", "Show memory maps",
 	"do", "[?]", "Open process (reload, alias for 'oo')",
 	"doo", "[args]", "Reopen in debugger mode with args (alias for 'ood')",
@@ -46,7 +45,8 @@
 	"db", "", "List breakpoints",
 	"db", " sym.main", "Add breakpoint into sym.main",
 	"db", " <addr>", "Add breakpoint",
-	"db", " -<addr>", "Remove breakpoint",
+	"db-", " <addr>", "Remove breakpoint",
+	"db-*", "", "Remove all the breakpoints",
 	"db.", "", "Show breakpoint info in current offset",
 	"dbj", "", "List breakpoints in JSON format",
 	// "dbi", " 0x848 ecx=3", "stop execution when condition matches",
@@ -57,30 +57,26 @@
 	"dbs", " <addr>", "Toggle breakpoint",
 	"dbf", "", "Put a breakpoint into every no-return function",
 	//
-	"dbt", "[?]", "Display backtrace based on dbg.btdepth and dbg.btalgo",
-	"dbt*", "", "Display backtrace in flags",
-	"dbt=", "", "Display backtrace in one line (see dbt=s and dbt=b for sp or bp)",
-	"dbtj", "", "Display backtrace in JSON",
-	"dbta", "", "Display ascii-art representation of the stack backtrace",
-	"dbtv", "", "Display backtrace with local vars if any",
-	"dbte", " <addr>", "Enable Breakpoint Trace",
-	"dbtd", " <addr>", "Disable Breakpoint Trace",
-	"dbts", " <addr>", "Swap Breakpoint Trace",
 	"dbm", " <module> <offset>", "Add a breakpoint at an offset from a module's base",
 	"dbn", " [<name>]", "Show or set name for current breakpoint",
 	//
 	"dbi", "", "List breakpoint indexes",
-	"dbic", " <index> <cmd>", "Run command at breakpoint index",
-	"dbie", " <index>", "Enable breakpoint by index",
-	"dbid", " <index>", "Disable breakpoint by index",
-	"dbis", " <index>", "Swap Nth breakpoint",
-	"dbite", " <index>", "Enable breakpoint Trace by index",
-	"dbitd", " <index>", "Disable breakpoint Trace by index",
-	"dbits", " <index>", "Swap Nth breakpoint trace",
+	"dbi", " <addr>", "Show breakpoint index in givengiven  offset",
+	"dbi.", "", "Show breakpoint index in current offset",
+	"dbix", " <idx> [expr]", "Set expression for bp at given index",
+	"dbic", " <idx> <cmd>", "Run command at breakpoint index",
+	"dbie", " <idx>", "Enable breakpoint by index",
+	"dbid", " <idx>", "Disable breakpoint by index",
+	"dbis", " <idx>", "Swap Nth breakpoint",
+	"dbite", " <idx>", "Enable breakpoint Trace by index",
+	"dbitd", " <idx>", "Disable breakpoint Trace by index",
+	"dbits", " <idx>", "Swap Nth breakpoint trace",
 	//
 	"dbh", " x86", "Set/list breakpoint plugin handlers",
 	"dbh-", " <name>", "Remove breakpoint plugin handler",
-	"dbw", " <addr> <rw>", "Add watchpoint",
+	"dbt", "[?]", "Show backtrace. See dbt? for more details",
+	"dbx", " [expr]", "Set expression for bp in current offset",
+	"dbw", " <addr> <r/w/rw>", "Add watchpoint",
 	"drx", " number addr len rwx", "Modify hardware breakpoint",
 	"drx-", "number", "Clear hardware breakpoint",
 	NULL
@@ -91,6 +87,7 @@
 	"dbt", "", "Display backtrace based on dbg.btdepth and dbg.btalgo",
 	"dbt*", "", "Display backtrace in flags",
 	"dbt=", "", "Display backtrace in one line (see dbt=s and dbt=b for sp or bp)",
+	"dbtv", "", "Display backtrace with local vars if any",
 	"dbtj", "", "Display backtrace in JSON",
 	"dbta", "", "Display ascii-art representation of the stack backtrace",
 	"dbte", " <addr>", "Enable Breakpoint Trace",
@@ -99,6 +96,11 @@
 	NULL
 };
 
+static const char *help_msg_dbw[] = {
+	"Usage: dbw", "<addr> <r/w/rw>"," # Add watchpoint",
+	NULL
+};
+
 static const char *help_msg_dc[] = {
 	"Usage: dc", "", "Execution continuation commands",
 	"dc", "", "Continue execution of all children",
@@ -177,6 +179,7 @@
 	"Usage: di", "", "Debugger target information",
 	"di", "", "Show debugger target information",
 	"di*", "", "Same as above, but in r2 commands",
+	"diq", "", "Same as above, but in one line",
 	"dij", "", "Same as above, but in JSON format",
 	NULL
 };
@@ -283,7 +286,9 @@
 	"Usage:", "dp", " # Process commands",
 	"dp", "", "List current pid and children",
 	"dp", " <pid>", "List children of pid",
-	"dp*", "", "List all attachable pids",
+	"dpj", " <pid>", "List children of pid in JSON format",
+	"dpl", "", "List all attachable pids",
+	"dplj", "", "List all attachable pids in JSON format",
 	"dp-", " <pid>", "Detach select pid",
 	"dp=", "<pid>", "Select pid",
 	"dpa", " <pid>", "Attach and select pid",
@@ -323,6 +328,7 @@
 	"drps", "", "Fake register profile size",
 	"drpj", "", "Show the current register profile (JSON)",
 	"drr", "", "Show registers references (telescoping)",
+	"drrj", "", "Show registers references (telescoping) in JSON format",
 	// TODO: 'drs' to swap register arenas and display old register valuez
 	"drs", "[?]", "Stack register states",
 	"drt", " 16", "Show 16 bit registers",
@@ -390,10 +396,17 @@
 	"dso", " <num>", "Step over <num> instructions",
 	"dsp", "", "Step into program (skip libs)",
 	"dss", " <num>", "Skip <num> step instructions",
-	"dsu", "[?]<address>", "Step until address",
-	"dsui", "[r] <instr>", "Step until an instruction that matches `instr`, use dsuir for regex match",
-	"dsue", " <esil>", "Step until esil expression matches",
-	"dsuf", " <flag>", "Step until pc == flag matching name",
+	"dsu", "[?] <address>", "Step until <address>. See 'dsu?' for other step until cmds.",
+	NULL
+};
+
+static const char *help_msg_dsu[] = {
+	"Usage: dsu", "", "Step until commands",
+	"dsu", " <address>", "Step until <address>",
+	"dsui", "[r] <instr>", "Step until an instruction that matches <instr>, use dsuir for regex match",
+	"dsuo", " <optype> [<optype> ...]", "Step until an instr matches one of the <optype>s.",
+	"dsue", " <esil>", "Step until <esil> expression matches",
+	"dsuf", " <flag>", "Step until pc == <flag> matching name",
 	NULL
 };
 
@@ -453,6 +466,15 @@
 	NULL
 };
 
+static const char *help_msg_dL[] = {
+	"Usage: dL", "", " # List or set debugger handler",
+	"dL", "", "List debugger handlers",
+	"dLq", "", "List debugger handlers in quiet mode",
+	"dLj", "", "List debugger handlers in json mode",
+	"dL", " <handler>", "Set debugger handler",
+	NULL
+};
+
 struct dot_trace_ght {
 	RGraph *graph;
 	Sdb *graphnodes;
@@ -792,6 +814,81 @@
 	return true;
 }
 
+static int step_until_optype(RCore *core, const char *_optypes) {
+	RAnalOp op;
+	ut8 buf[32];
+	ut64 pc;
+	int res = true;
+
+	RList *optypes_list = NULL;
+	RListIter *iter;
+	char *optype;
+	char *optypes = strdup (r_str_trim_head ((char *) _optypes));
+
+	if (!core || !core->dbg) {
+		eprint ("Wrong state");
+		res = false;
+		goto end;
+	}
+
+	if (!optypes || !*optypes) {
+		eprint ("Missing optypes. Usage example: 'dsuo ucall ujmp'");
+		res = false;
+		goto end;
+	}
+
+	optypes_list = r_str_split_list (optypes, " ");
+
+	r_cons_break_push (NULL, NULL);
+	for (;;) {
+		if (r_cons_is_breaked ()) {
+			core->break_loop = true;
+			break;
+		}
+		if (r_debug_is_dead (core->dbg)) {
+			core->break_loop = true;
+			break;
+		}
+		r_debug_step (core->dbg, 1);
+
+		pc = r_debug_reg_get (core->dbg, core->dbg->reg->name[R_REG_NAME_PC]);
+
+		// 'Copy' from r_debug_step_soft
+		if (!core->dbg->iob.read_at) {
+			eprint("ERROR\n");
+			res = false;
+			goto cleanup_after_push;
+		}
+		if (!core->dbg->iob.read_at (core->dbg->iob.io, pc, buf, sizeof (buf))) {
+			eprint("ERROR\n");
+			res = false;
+			goto cleanup_after_push;
+		}
+		if (!r_anal_op (core->dbg->anal, &op, pc, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC)) {
+			eprint("ERROR\n");
+			res = false;
+			goto cleanup_after_push;
+		}
+
+		// This is slow because we do lots of strcmp's.
+		// To improve this, the function r_anal_optype_string_to_int should be implemented
+		// I also don't check if the opcode type exists.
+		const char *optype_str = r_anal_optype_to_string (op.type);
+		r_list_foreach (optypes_list, iter, optype) {
+			if (!strcmp (optype_str, optype)) {
+				goto cleanup_after_push;
+			}
+		}
+	}
+
+cleanup_after_push:
+	r_cons_break_pop ();
+end:
+	free (optypes);
+	r_list_free (optypes_list);
+	return res;
+}
+
 static int step_until_flag(RCore *core, const char *instr) {
 	const RList *list;
 	RListIter *iter;
@@ -830,7 +927,7 @@
 
 /* until end of frame */
 static int step_until_eof(RCore *core) {
-	int maxLoops = 1024;
+	int maxLoops = 200000;
 	ut64 off, now = r_debug_reg_get (core->dbg, "SP");
 	r_cons_break_push (NULL, NULL);
 	do {
@@ -979,11 +1076,26 @@
 				(int) r_num_math (core->num, input + 2), core->dbg->tid);
 		core->dbg->main_pid = r_num_math (core->num, input + 2);
 		break;
-	case '*': // "dp*"
-		r_debug_pid_list (core->dbg, 0, 0);
+	case 'l': // "dpl"
+		switch (input[2]) {
+		case '\0': // "dpl"
+			r_debug_pid_list (core->dbg, 0, 0);
+			break;
+		case 'j': // "dplj"
+			r_debug_pid_list (core->dbg, 0, 'j');
+			break;
+		}
 		break;
 	case 'j': // "dpj"
-		r_debug_pid_list (core->dbg, core->dbg->pid, 'j');
+		switch (input[2]) {
+		case '\0': // "dpj"
+			r_debug_pid_list (core->dbg, core->dbg->pid, 'j');
+			break;
+		case ' ': // "dpj "
+			r_debug_pid_list (core->dbg,
+					(int) R_MAX (0, (int)r_num_math (core->num, input + 2)), 'j');
+			break;
+		}
 		break;
 	case 'e': // "dpe"
 		{
@@ -1034,8 +1146,8 @@
 			oaddr = addr;
 			/* XXX Bottleneck..we need to reuse the bytes read by traptrace */
 			// XXX Do asm.arch should define the max size of opcode?
-			r_core_read_at (core, addr, buf, 32); // XXX longer opcodes?
-			r_anal_op (core->anal, &analop, addr, buf, sizeof (buf));
+			r_io_read_at (core->io, addr, buf, 32); // XXX longer opcodes?
+			r_anal_op (core->anal, &analop, addr, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC);
 		} while (r_bp_traptrace_at (core->dbg->bp, addr, analop.size));
 		r_bp_traptrace_enable (core->dbg->bp, false);
 	}
@@ -1256,34 +1368,6 @@
 		case 0:
 			r_cons_printf ("0x%08"PFMT64x" %s\n", map->addr, map->file);
 			break;
-		case ':':
-			if (addr >= map->addr && addr < map->addr_end) {
-#if __WINDOWS__ && !__CYGWIN__
-				/* Escape backslashes in the file path on Windows */
-				char *escaped_path = r_str_escape (map->file);
-				char *escaped_name = r_str_escape (map->name);
-				if (escaped_path && escaped_name) {
-					r_name_filter (escaped_name, 0);
-					r_cons_printf ("f mod.%s = 0x%08"PFMT64x"\n",
-							escaped_name, map->addr);
-					r_cons_printf (".!rabin2 -rsB 0x%08"PFMT64x" \'%s\'\n",
-							map->addr, escaped_path);
-				}
-				free (escaped_path);
-				free (escaped_name);
-#else
-				char *fn = strdup (map->file);
-				r_name_filter (fn, 0);
-				//r_cons_printf ("fs+module_%s\n", fn);
-				r_cons_printf ("f mod.%s = 0x%08"PFMT64x"\n",
-						fn, map->addr);
-				r_cons_printf (".!rabin2 -rsB 0x%08"PFMT64x" '%s'\n",
-						map->addr, map->file);
-				//r_cons_printf ("fs-\n");
-				free (fn);
-#endif
-			}
-			break;
 		case '.':
 			if (addr >= map->addr && addr < map->addr_end) {
 				r_cons_printf ("0x%08"PFMT64x" %s\n", map->addr, map->file);
@@ -1291,50 +1375,30 @@
 			}
 			break;
 		case 'j':
-#if __WINDOWS__ && !__CYGWIN__
 			{
-				/* Single backslashes cause issues when parsing JSON output, so escape them */
+				/* Escape backslashes (e.g. for Windows). */
 				char *escaped_path = r_str_escape (map->file);
 				char *escaped_name = r_str_escape (map->name);
-				if (escaped_path && escaped_name) {
-					r_cons_printf ("{\"address\":%"PFMT64d",\"name\":\"%s\",\"file\":\"%s\"}%s",
-							map->addr, escaped_name, escaped_path, iter->n?",":"");
-				}
+				r_cons_printf ("{\"address\":%"PFMT64d",\"name\":\"%s\",\"file\":\"%s\"}%s",
+					map->addr, escaped_name, escaped_path, iter->n?",":"");
 				free (escaped_path);
 				free (escaped_name);
 			}
-#else
-			r_cons_printf ("{\"address\":%"PFMT64d",\"name\":\"%s\",\"file\":\"%s\"}%s",
-					map->addr, map->name, map->file, iter->n?",":"");
-#endif
 			break;
+		case ':':
 		case '*':
-			{
-#if __WINDOWS__ && !__CYGWIN__
-				/* Escape backslashes in the file path on Windows */
+			if (mode == '*' || (mode == ':' && \
+				addr>=map->addr && addr < map->addr_end)) {
+				/* Escape backslashes (e.g. for Windows). */
 				char *escaped_path = r_str_escape (map->file);
-				char *escaped_name = r_str_escape (map->name);
-				if (escaped_path && escaped_name) {
-					r_name_filter (escaped_name, 0);
-					r_cons_printf ("f mod.%s = 0x%08"PFMT64x"\n",
-							escaped_name, map->addr);
-					/* Use double quotes around the file path on Windows to generate valid commands */
-					r_cons_printf (".!rabin2 -rsB 0x%08"PFMT64x" \"%s\"\n",
-							map->addr, escaped_path);
-				}
-				free (escaped_path);
-				free (escaped_name);
-#else
-				char *fn = strdup (map->file);
-				r_name_filter (fn, 0);
-				//r_cons_printf ("fs+module_%s\n", fn);
+				char *filtered_name = strdup (map->name);
+				r_name_filter (filtered_name, 0);
 				r_cons_printf ("f mod.%s = 0x%08"PFMT64x"\n",
-						fn, map->addr);
-				r_cons_printf (".!rabin2 -rsB 0x%08"PFMT64x" '%s'\n",
-						map->addr, map->file);
-				//r_cons_printf ("fs-\n");
-				free (fn);
-#endif
+					filtered_name, map->addr);
+				r_cons_printf ("oba 0x%08"PFMT64x" %s\n", map->addr, escaped_path);
+				// r_cons_printf (".!rabin2 -rsB 0x%08"PFMT64x" \"%s\"\n", map->addr, escaped_path);
+				free (escaped_path);
+				free (filtered_name);
 			}
 			break;
 		default:
@@ -1355,30 +1419,42 @@
 static int cmd_dbg_map_heap_glibc_32 (RCore *core, const char *input);
 static int cmd_dbg_map_heap_glibc_64 (RCore *core, const char *input);
 
-static void get_hash_debug_file(const char *path, char *hash, int hash_len) {
+static void get_hash_debug_file(RCore *core, const char *path, char *hash, int hash_len) {
 	RListIter *iter;
-	RBinSection *s;
-	RCore *core = r_core_new ();
-	RList * sects = NULL;
 	char buf[20] = R_EMPTY;
-	int offset, err, i, j = 0;
+	int offset, i, j = 0;
+	int bd = -1;
+	RBinFile *old_cur = r_bin_cur (core->bin);
+
+	RBinOptions *bo = r_bin_options_new (0LL, 0LL, 0);
+	if (!bo) {
+		eprintf ("Could not create RBinOptions\n");
+		goto out_error;
+	}
+	bo->iofd = -1;
 
-	if (!core) {
-		return;
+	bd = r_bin_open (core->bin, path, bo);
+	if (bd < 0) {
+		eprintf ("Could not open binary\n");
+		goto out_error;
 	}
-	r_bin_load (core->bin, path, 0, 0, 0, -1, false);
-	sects = r_bin_get_sections (core->bin);
-	if (!sects) {
+
+	RBinFile *binfile = r_bin_file_find_by_id (core->bin, (unsigned int) bd);
+	if (!binfile || !binfile->o) {
 		goto out_error;
 	}
+
+	r_io_map_priorize_for_fd (core->io, binfile->fd);
+
+	RList *sects = binfile->o->sections;
+	RBinSection *s;
 	r_list_foreach (sects, iter, s) {
 		if (strstr (s->name, ".note.gnu.build-id")) {
-			err = r_io_read_at (core->io, s->vaddr + 16, (ut8 *) buf, 20);
-			if (!err) {
-				eprintf ("Unable to read from memory\n");
-				goto out_error;
+			if (r_buf_read_at (binfile->buf, s->vaddr + 16, buf, 20) == 20) {
+				break;
 			}
-			break;
+			eprintf ("Cannot read from buffer\n");
+			goto out_error;
 		}
 	}
 	for (i = 0; i < 20; i++) {
@@ -1391,7 +1467,11 @@
 	offset = j + 2 * i;
 	snprintf (hash + offset, hash_len - offset - strlen (".debug"), ".debug");
 out_error:
-	r_core_free (core);
+	if (bd >= 0) {
+		r_bin_file_delete (core->bin, (unsigned int) bd);
+		r_bin_file_set_cur_binfile (core->bin, old_cur);
+	}
+	r_bin_options_free (bo);
 }
 
 static int str_start_with(const char *ptr, const char *str) {
@@ -1478,12 +1558,7 @@
 		cmd_debug_map_snapshot (core, input + 1);
 		break;
 	case '.': // "dm."
-		r_list_foreach (core->dbg->maps, iter, map) {
-			if (addr >= map->addr && addr < map->addr_end) {
-				r_cons_println (map->name);
-				break;
-			}
-		}
+		r_debug_map_list (core->dbg, addr, input);
 		break;
 	case 'm': // "dmm"
 		if (!strcmp (input + 1, ".*")) {
@@ -1624,6 +1699,15 @@
 					if (libname) {
 						char *cmd, *res;
 						const char *file = map->file? map->file: map->name;
+						char *newfile = NULL;
+						if (!r_file_exists (file)) {
+							newfile = r_file_temp ("memlib");
+							if (newfile) {
+								file = newfile;
+								r_core_cmdf (core, "wtf %s 0x%"PFMT64x" @ 0x%"PFMT64x" 2> %s",
+								             file, map->size, baddr, R_SYS_DEVNULL);
+							}
+						}
 						if (symname) {
 							cmd = r_str_newf ("rabin2 %s-B 0x%08"PFMT64x" -s %s | grep %s", mode, baddr, file, symname);
 						} else {
@@ -1634,6 +1718,12 @@
 						r_cons_println (res);
 						free (res);
 						free (cmd);
+						if (newfile) {
+							if (!r_file_rm (newfile)) {
+								eprintf ("Error when removing %s\n", newfile);
+							}
+							free (newfile);
+						}
 					} else {
 						r_bin_set_baddr (core->bin, map->addr);
 						r_core_bin_info (core, R_CORE_BIN_ACC_SYMBOLS, (input[1]=='*'), true, &filter, NULL);
@@ -1780,13 +1870,12 @@
 	case 'j': // "dmj"
 	case 'q': // "dmq"
 		r_debug_map_sync (core->dbg); // update process memory maps
-		r_debug_map_list (core->dbg, core->offset, input[0]);
+		r_debug_map_list (core->dbg, core->offset, input);
 		break;
 	case '=': // "dm="
 		r_debug_map_sync (core->dbg);
-		r_debug_map_list_visual (core->dbg, core->offset,
-				r_config_get_i (core->config, "scr.color"),
-				r_cons_get_size (NULL));
+		r_debug_map_list_visual (core->dbg, core->offset, input,
+				r_config_get_i (core->config, "scr.color"));
 		break;
 	case 'h': // "dmh"
 		(void)r_debug_heap (core, input);
@@ -1799,7 +1888,7 @@
 #include "linux_heap_glibc.c"
 #endif
 
-R_API void r_core_debug_rr(RCore *core, RReg *reg) {
+R_API void r_core_debug_rr(RCore *core, RReg *reg, int mode) {
 	char *use_color, *color = "";
 	int use_colors = r_config_get_i (core->config, "scr.color");
 	int delta = 0;
@@ -1816,6 +1905,9 @@
 		use_color = NULL;
 	}
 	r_debug_map_sync (core->dbg);
+	if (mode == 'j') {
+		r_cons_printf("[");
+	}
 	r_list_foreach (list, iter, r) {
 		char *rrstr, *tmp = NULL;
 		if (r->size != bits) {
@@ -1836,29 +1928,48 @@
 		} else {
 			color = "";
 		}
-		if (bits == 64) {
+		switch (mode) {
+		case 'j':
 			if (r->flags) {
 				tmp = r_reg_get_bvalue (reg, r);
-				r_cons_printf ("%s%6s %018s%s", color, r->name, tmp, Color_RESET);
+				r_cons_printf ("%s{\"reg\":\"%s\",\"value\":\"%s\"", iter->p?",":"", r->name, tmp);
 			} else {
-				r_cons_printf ("%s%6s 0x%016"PFMT64x"%s", color, r->name, value, Color_RESET);
+				r_cons_printf ("%s{\"reg\":\"%s\",\"value\":\"0x%"PFMT64x"\"", iter->p?",":"", r->name, value);
 			}
-		} else {
-			if (r->flags) {
-				tmp = r_reg_get_bvalue (reg, r);
-				r_cons_printf ("%6s %010s", r->name, tmp);
+			break;
+		default:
+			if (bits == 64) {
+				if (r->flags) {
+					tmp = r_reg_get_bvalue (reg, r);
+					r_cons_printf ("%s%6s %-18s%s", color, r->name, tmp, Color_RESET);
+				} else {
+					r_cons_printf ("%s%6s 0x%-16"PFMT64x"%s", color, r->name, value, Color_RESET);
+				}
 			} else {
-				r_cons_printf ("%6s 0x%08"PFMT64x, r->name, value);
+				if (r->flags) {
+					tmp = r_reg_get_bvalue (reg, r);
+					r_cons_printf ("%s%6s %-10s%s", color, r->name, tmp, Color_RESET);
+				} else {
+					r_cons_printf ("%s%6s 0x%-8"PFMT64x"%s", color, r->name, value, Color_RESET);
+				}
 			}
+			break;
 		}
 		if (r->flags) {
 			free (tmp);
 		}
 		if (rrstr) {
-			r_cons_printf (" %s\n", rrstr);
+			if (mode == 'j') {
+				r_cons_printf (",\"ref\":\"%s\"}", rrstr);
+			} else {
+				r_cons_printf (" %s\n", rrstr);
+			}
 			free (rrstr);
 		}
 	}
+	if (mode == 'j') {
+		r_cons_printf("]\n");
+	}
 }
 
 static void show_drpi(RCore *core) {
@@ -2482,7 +2593,14 @@
 		}
 		break;
 	case 'r': // "drr"
-		r_core_debug_rr (core, core->dbg->reg);
+		switch (str[1]) {
+		case 'j': // "drrj"
+			r_core_debug_rr (core, core->dbg->reg, 'j');
+			break;
+		default:
+			r_core_debug_rr (core, core->dbg->reg, 0);
+			break;
+		}
 		break;
 	case 'j': // "drj"
 	case '\0': // "dr"
@@ -2687,17 +2805,202 @@
 	}
 }
 
+static void get_backtrace_info(RCore* core, RDebugFrame* frame, ut64 addr, char** flagdesc, char** flagdesc2, char** pcstr, char** spstr, bool hex_format) {
+	RFlagItem *f = r_flag_get_at (core->flags, frame->addr, true);
+	*flagdesc = NULL;
+	*flagdesc2 = NULL;
+	if (f) {
+		if (f->offset != addr) {
+			int delta = (int)(frame->addr - f->offset);
+			if (delta > 0) {
+				*flagdesc = r_str_newf ("%s+%d", f->name, delta);
+			} else if (delta < 0) {
+				*flagdesc = r_str_newf ("%s%d", f->name, delta);
+			} else {
+				*flagdesc = r_str_newf ("%s", f->name);
+			}
+		} else {
+			*flagdesc = r_str_newf ("%s", f->name);
+		}
+	}
+	f = r_flag_get_at (core->flags, frame->addr, true);
+	if (f && !strchr (f->name, '.')) {
+		f = r_flag_get_at (core->flags, frame->addr - 1, true);
+	}
+	if (f) {
+		if (f->offset != addr) {
+			int delta = (int)(frame->addr - 1 - f->offset);
+			if (delta > 0) {
+				*flagdesc2 = r_str_newf ("%s+%d", f->name, delta + 1);
+			} else if (delta < 0) {
+				*flagdesc2 = r_str_newf ("%s%d", f->name, delta + 1);
+			} else {
+				*flagdesc2 = r_str_newf ("%s+1", f->name);
+			}
+		} else {
+			*flagdesc2 = r_str_newf ("%s", f->name);
+		}
+	}
+	if (!r_str_cmp (*flagdesc, *flagdesc2, -1)) {
+		free (*flagdesc2);
+		*flagdesc2 = NULL;
+	}
+	if (hex_format) {
+		if (core->dbg->bits & R_SYS_BITS_64) {
+			*pcstr = r_str_newf ("0x%-16" PFMT64x, frame->addr);
+			*spstr = r_str_newf ("0x%-16" PFMT64x, frame->sp);
+		} else if (core->dbg->bits & R_SYS_BITS_32) {
+			*pcstr = r_str_newf ("0x%-8" PFMT64x, frame->addr);
+			*spstr = r_str_newf ("0x%-8" PFMT64x, frame->sp);
+		} else {
+			*pcstr = r_str_newf ("0x%" PFMT64x, frame->addr);
+			*spstr = r_str_newf ("0x%" PFMT64x, frame->sp);
+		}
+	} else {
+		if (core->dbg->bits & R_SYS_BITS_64) {
+			*pcstr = r_str_newf ("%" PFMT64d, frame->addr);
+			*spstr = r_str_newf ("%" PFMT64d, frame->sp);
+		} else if (core->dbg->bits & R_SYS_BITS_32) {
+			*pcstr = r_str_newf ("%" PFMT64d, frame->addr);
+			*spstr = r_str_newf ("%" PFMT64d, frame->sp);
+		} else {
+			*pcstr = r_str_newf ("%" PFMT64d, frame->addr);
+			*spstr = r_str_newf ("%" PFMT64d, frame->sp);
+		}
+	}
+}
+
 static void static_debug_stop(void *u) {
 	RDebug *dbg = (RDebug *)u;
 	r_debug_stop (dbg);
 }
 
+static void core_cmd_dbi (RCore *core, const char *input, ut64 addr) {
+	int i;
+	char *p;
+	RBreakpointItem *bpi;
+	switch (input[2]) {
+	case ' ': // "dbi."
+		{
+			int idx = r_bp_get_index_at (core->dbg->bp, addr);
+			if (idx != -1) {
+				r_cons_printf ("%d\n", idx);
+			}
+		}
+		break;
+	case '.': // "dbi."
+		{
+			int idx = r_bp_get_index_at (core->dbg->bp, core->offset);
+			if (idx != -1) {
+				r_cons_printf ("%d\n", idx);
+			}
+		}
+		break;
+	case 0: // "dbi"
+		for (i = 0; i < core->dbg->bp->bps_idx_count; i++) {
+			if ((bpi = core->dbg->bp->bps_idx[i])) {
+				r_cons_printf ("%d 0x%08"PFMT64x" E:%d T:%d\n",
+						i, bpi->addr, bpi->enabled, bpi->trace);
+			}
+		}
+		break;
+	case 'x': // "dbix"
+		if (input[3] == ' ') {
+			int idx = r_bp_get_index_at (core->dbg->bp, addr);
+			if (idx != -1) {
+				bpi = r_bp_get_index (core->dbg->bp, idx);
+				if (bpi) {
+					char *expr = strchr (input + 4, ' ');
+					if (expr) {
+						free (bpi->expr);
+						bpi->expr = strdup (expr);
+					}
+				}
+				r_cons_printf ("%d\n", idx);
+			}
+		} else {
+			for (i = 0; i < core->dbg->bp->bps_idx_count; i++) {
+				RBreakpointItem *bp = core->dbg->bp->bps_idx[i];
+				if (bp) {
+					r_cons_printf ("%d 0x%08"PFMT64x" %s\n", i, bp->addr, bp->expr);
+				}
+			}
+		}
+		break;
+	case 'c': // "dbic"
+		p = strchr (input + 3, ' ');
+		if (p) {
+			char *q = strchr (p + 1, ' ');
+			if (q) {
+				*q++ = 0;
+				ut64 addr = r_num_math (core->num, p);
+				bpi = r_bp_get_index (core->dbg->bp, addr);
+				if (bpi) {
+					bpi->data = strdup (q);
+				} else {
+					eprintf ("Cannot set command\n");
+				}
+			} else {
+				eprintf ("|Usage: dbic # cmd\n");
+			}
+		} else {
+			eprintf ("|Usage: dbic # cmd\n");
+		}
+		break;
+	case 'e': // "dbie"
+		if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
+			bpi->enabled = true;
+		} else {
+			eprintf ("Cannot unset tracepoint\n");
+		}
+		break;
+	case 'd': // "dbid"
+		if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
+			bpi->enabled = false;
+		} else {
+			eprintf ("Cannot unset tracepoint\n");
+		}
+		break;
+	case 's': // "dbis"
+		if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
+			bpi->enabled = !!!bpi->enabled;
+		} else {
+			eprintf ("Cannot unset tracepoint\n");
+		}
+		break;
+	case 't': // "dbite" "dbitd" ...
+		switch (input[3]) {
+		case 'e':
+			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
+				bpi->trace = true;
+			} else {
+				eprintf ("Cannot unset tracepoint\n");
+			}
+			break;
+		case 'd':
+			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
+				bpi->trace = false;
+			} else eprintf ("Cannot unset tracepoint\n");
+			break;
+		case 's':
+			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
+				bpi->trace = !!!bpi->trace;
+			} else {
+				eprintf ("Cannot unset tracepoint\n");
+			}
+			break;
+		}
+		break;
+	}
+}
+
 static void r_core_cmd_bp(RCore *core, const char *input) {
 	RBreakpointItem *bpi;
 	int i, hwbp = r_config_get_i (core->config, "dbg.hwbp");
 	RDebugFrame *frame;
 	RListIter *iter;
 	const char *p;
+	bool hex_format;
 	bool watch = false;
 	int rw = 0;
 	RList *list;
@@ -2735,7 +3038,7 @@
 		RList *symbols = r_bin_get_symbols (core->bin);
 		RBinSymbol *symbol;
 		r_list_foreach (symbols, iter, symbol) {
-			if (symbol->type && !strcmp (symbol->type, "FUNC")) {
+			if (symbol->type && !strcmp (symbol->type, R_BIN_TYPE_FUNC_STR)) {
 				if (r_anal_noreturn_at (core->anal, symbol->vaddr)) {
 					bpi = r_debug_bp_add (core->dbg, symbol->vaddr, hwbp, false, 0, NULL, 0);
 					if (bpi) {
@@ -2750,6 +3053,23 @@
 		}
 		}
 		break;
+	case 'x': // "dbx"
+		if (input[2] == ' ') {
+			if (addr == UT64_MAX) {
+				addr = core->offset;
+			}
+			bpi = r_bp_get_at (core->dbg->bp, addr);
+			if (bpi) {
+				free (bpi->expr);
+				bpi->expr = strdup (input + 3);
+			}
+		} else {
+			RBreakpointItem *bp;
+			r_list_foreach (core->dbg->bp->bps, iter, bp) {
+				r_cons_printf ("0x%08"PFMT64x" %s\n", bp->addr, r_str_get2 (bp->expr));
+			}
+		}
+		break;
 	case 't': // "dbt"
 		switch (input[2]) {
 		case 'v': // "dbtv"
@@ -2797,12 +3117,25 @@
 			}
 			i = 0;
 			list = r_debug_frames (core->dbg, addr);
+			hex_format = false;
 			r_cons_printf ("[");
 			r_list_foreach (list, iter, frame) {
-				r_cons_printf ("%s%08" PFMT64d,
-					       (i ? "," : ""),
-					       frame->addr);
+				char *flagdesc, *flagdesc2, *pcstr, *spstr;
+				get_backtrace_info (core, frame, addr, &flagdesc, &flagdesc2, &pcstr, &spstr, hex_format);
+				RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, frame->addr, 0);
+				r_cons_printf ("%s{\"idx\":%d,\"pc\":%s,\"sp\":%s,\"frame_size\":%d,"
+						"\"fname\":\"%s\",\"desc\":\"%s%s\"}", (i ? " ," : ""),
+						i,
+						pcstr, spstr,
+						(int)frame->size,
+						fcn ? fcn->name : "",
+						flagdesc ? flagdesc : "",
+						flagdesc2 ? flagdesc2 : "");
 				i++;
+				free (flagdesc);
+				free (flagdesc2);
+				free (pcstr);
+				free (spstr);
 			}
 			r_cons_printf ("]\n");
 			r_list_free (list);
@@ -2862,73 +3195,22 @@
 			}
 			i = 0;
 			list = r_debug_frames (core->dbg, addr);
+			hex_format = true;
 			r_list_foreach (list, iter, frame) {
-				char flagdesc[1024], flagdesc2[1024], pcstr[32], spstr[32];
-				RFlagItem *f = r_flag_get_at (core->flags, frame->addr, true);
-				flagdesc[0] = flagdesc2[0] = 0;
-				if (f) {
-					if (f->offset != addr) {
-						int delta = (int)(frame->addr - f->offset);
-						if (delta > 0) {
-							snprintf (flagdesc, sizeof (flagdesc),
-									"%s+%d", f->name, delta);
-						} else if (delta < 0) {
-							snprintf (flagdesc, sizeof (flagdesc),
-									"%s%d", f->name, delta);
-						} else {
-							snprintf (flagdesc, sizeof (flagdesc),
-									"%s", f->name);
-						}
-					} else {
-						snprintf (flagdesc, sizeof (flagdesc),
-								"%s", f->name);
-					}
-				}
-				f = r_flag_get_at (core->flags, frame->addr, true);
-				if (f && !strchr (f->name, '.')) {
-					f = r_flag_get_at (core->flags, frame->addr - 1, true);
-				}
-				if (f) {
-					if (f->offset != addr) {
-						int delta = (int)(frame->addr - 1 - f->offset);
-						if (delta > 0) {
-							snprintf (flagdesc2, sizeof (flagdesc2),
-									"%s+%d", f->name, delta + 1);
-						} else if (delta<0) {
-							snprintf (flagdesc2, sizeof (flagdesc2),
-									"%s%d", f->name, delta + 1);
-						} else {
-							snprintf (flagdesc2, sizeof (flagdesc2),
-									"%s+1", f->name);
-						}
-					} else {
-						snprintf (flagdesc2, sizeof (flagdesc2),
-								"%s", f->name);
-					}
-				}
-				if (!strcmp (flagdesc, flagdesc2)) {
-					flagdesc2[0] = 0;
-				}
-
-				if (core->dbg->bits & R_SYS_BITS_64) {
-					snprintf (pcstr, sizeof (pcstr), "0x%-16" PFMT64x, frame->addr);
-					snprintf (spstr, sizeof (spstr), "0x%-16" PFMT64x, frame->sp);
-				} else if (core->dbg->bits & R_SYS_BITS_32) {
-					snprintf (pcstr, sizeof (pcstr), "0x%-8" PFMT64x, frame->addr);
-					snprintf (spstr, sizeof (spstr), "0x%-8" PFMT64x, frame->sp);
-				} else {
-					snprintf (pcstr, sizeof (pcstr), "0x%" PFMT64x, frame->addr);
-					snprintf (spstr, sizeof (spstr), "0x%" PFMT64x, frame->sp);
-				}
-
+				char *flagdesc, *flagdesc2, *pcstr, *spstr;
+				get_backtrace_info (core, frame, addr, &flagdesc, &flagdesc2, &pcstr, &spstr, hex_format);
 				RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, frame->addr, 0);
 				r_cons_printf ("%d  %s sp: %s  %-5d"
 						"[%s]  %s %s\n", i++,
 						pcstr, spstr,
 						(int)frame->size,
 						fcn ? fcn->name : "??",
-						flagdesc,
-						flagdesc2);
+						flagdesc ? flagdesc : "",
+						flagdesc2 ? flagdesc2 : "");
+				free (flagdesc);
+				free (flagdesc2);
+				free (pcstr);
+				free (spstr);
 			}
 			r_list_free (list);
 			break;
@@ -3028,7 +3310,7 @@
 			bpi = r_debug_bp_add (core->dbg, addr, hwbp, false, 0, NULL, 0);
 			if (!bpi) eprintf ("Cannot set breakpoint (%s)\n", input + 2);
 		}
-		r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), true);
+		r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), true, 0);
 		break;
 	case 'n': // "dbn"
 		bpi = r_bp_get_at (core->dbg->bp, core->offset);
@@ -3049,12 +3331,18 @@
 	case 'e':
 		for (p = input + 2; *p == ' '; p++);
 		if (*p == '*') r_bp_enable_all (core->dbg->bp,true);
-		else r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), true);
+		else {
+			for (; *p && *p != ' '; p++);
+			r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), true, r_num_math (core->num, p));
+		}
 		break;
 	case 'd':
 		for (p = input + 2; *p == ' '; p++);
 		if (*p == '*') r_bp_enable_all (core->dbg->bp, false);
-		r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), false);
+		else {
+			for (; *p && *p != ' '; p++);
+			r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), false, r_num_math (core->num, p));
+		}
 		break;
 	case 'h':
 		switch (input[2]) {
@@ -3122,13 +3410,26 @@
 			int sl = r_str_word_set0 (str);
 			addr = r_num_math (core->num, DB_ARG(0));
 			if (watch) {
-					if (sl == 2) {
-						rw = (strcmp (DB_ARG(1), "r") == 0 ? R_BP_PROT_READ : R_BP_PROT_WRITE);
-					} else {
-						eprintf ("Usage: dbw <addr> <rw> # Add watchpoint\n");
+				if (sl == 2) {
+					if (!strcmp (DB_ARG(1), "r")){
+						rw = R_BP_PROT_READ;
+					}
+					else if (!strcmp (DB_ARG(1), "w")){
+						rw = R_BP_PROT_WRITE;
+					}
+					else if (!strcmp (DB_ARG(1), "rw")){
+						rw = R_BP_PROT_ACCESS;
+					}
+					else{
+						r_core_cmd_help (core, help_msg_dbw);
 						free (str);
 						break;
 					}
+				} else {
+					r_core_cmd_help (core, help_msg_dbw);
+					free (str);
+					break;
+				}
 			}
 			if (validAddress (core, addr)) {
 				bpi = r_debug_bp_add (core->dbg, addr, hwbp, watch, rw, NULL, 0);
@@ -3158,72 +3459,7 @@
 		}
 		break;
 	case 'i':
-		switch (input[2]) {
-		case 0: // "dbi"
-			for (i = 0;i < core->dbg->bp->bps_idx_count; i++) {
-				if ((bpi = core->dbg->bp->bps_idx[i])) {
-					r_cons_printf ("%d 0x%08"PFMT64x" E:%d T:%d\n",
-							i, bpi->addr, bpi->enabled, bpi->trace);
-				}
-			}
-			break;
-		case 'c': // "dbic"
-			p = strchr (input + 3, ' ');
-			if (p) {
-				char *q = strchr (p + 1, ' ');
-				if (q) {
-					*q++ = 0;
-					ut64 addr = r_num_math (core->num, p);
-					bpi = r_bp_get_index (core->dbg->bp, addr);
-					if (bpi) {
-						bpi->data = strdup (q);
-					} else {
-						eprintf ("Cannot set command\n");
-					}
-				} else {
-					eprintf ("|Usage: dbic # cmd\n");
-				}
-			} else {
-				eprintf ("|Usage: dbic # cmd\n");
-			}
-			break;
-		case 'e': // "dbie"
-			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-				bpi->enabled = true;
-			} else eprintf ("Cannot unset tracepoint\n");
-			break;
-		case 'd': // "dbid"
-			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-				bpi->enabled = false;
-			} else eprintf ("Cannot unset tracepoint\n");
-			break;
-		case 's': // "dbis"
-			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-				bpi->enabled = !!!bpi->enabled;
-			} else eprintf ("Cannot unset tracepoint\n");
-			break;
-		case 't': // "dbite" "dbitd" ...
-			switch (input[3]) {
-			case 'e':
-				if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-					bpi->trace = true;
-				} else eprintf ("Cannot unset tracepoint\n");
-				break;
-			case 'd':
-				if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-					bpi->trace = false;
-				} else eprintf ("Cannot unset tracepoint\n");
-				break;
-			case 's':
-				if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-					bpi->trace = !!!bpi->trace;
-				} else {
-					eprintf ("Cannot unset tracepoint\n");
-				}
-				break;
-			}
-			break;
-		}
+		core_cmd_dbi (core, input, addr);
 		break;
 	case '?':
 	default:
@@ -3328,7 +3564,7 @@
 		addr_in_range = addr >= from && addr < to;
 
 		r_io_read_at (core->io, addr, buf, sizeof (buf));
-		r_anal_op (core->anal, &aop, addr, buf, sizeof (buf));
+		r_anal_op (core->anal, &aop, addr, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC);
 		eprintf ("%d %"PFMT64x"\r", n++, addr);
 		switch (aop.type) {
 		case R_ANAL_OP_TYPE_UCALL:
@@ -3617,6 +3853,45 @@
 	}
 }
 
+static bool is_x86_call(RDebug *dbg, ut64 addr) {
+	ut8 buf[3];
+	ut8 *op = buf;
+	(void)dbg->iob.read_at (dbg->iob.io, addr, buf, R_ARRAY_SIZE (buf));
+	switch (buf[0]) {  /* Segment override prefixes */
+	case 0x65:
+	case 0x64:
+	case 0x26:
+	case 0x3e:
+	case 0x36:
+	case 0x2e:
+		op++;
+	}
+	if (op[0] == 0xe8) {
+		return true;
+	}
+	if (op[0] == 0xff  /* bits 4-5 (from right) of next byte must be 01 */
+	    && (op[1] & 0x30) == 0x10) {
+		return true;
+	}
+	/* ... */
+	return false;
+}
+
+static bool is_x86_ret(RDebug *dbg, ut64 addr) {
+	ut8 buf[1];
+	(void)dbg->iob.read_at (dbg->iob.io, addr, buf, R_ARRAY_SIZE (buf));
+	switch (buf[0]) {
+	case 0xc3:
+	case 0xcb:
+	case 0xc2:
+	case 0xca:
+		return true;
+	default:
+		return false;
+	}
+	/* Possibly incomplete with regard to instruction prefixes */
+}
+
 static bool cmd_dcu (RCore *core, const char *input) {
 	const char *ptr = NULL;
 	ut64 from, to, pc;
@@ -3655,8 +3930,8 @@
 			from = r_num_math (core->num, input + 3);
 		}
 	}
-	if (from == UT64_MAX) {
-		eprintf ("Cannot continue until address 0\n");
+	if (core->num->nc.errors && r_cons_singleton ()->is_interactive) {
+		eprintf ("Cannot continue until unknown address '%s'\n", core->num->nc.calc_buf);
 		return false;
 	}
 	if (to == UT64_MAX) {
@@ -3677,10 +3952,81 @@
 		r_cons_break_pop ();
 	} else {
 		ut64 addr = from;
+		if (!strcmp (core->dbg->btalgo, "trace") && core->dbg->arch
+		    && !strcmp (core->dbg->arch, "x86") && core->dbg->bits == 4) {
+			unsigned long steps = 0;
+			long level = 0;
+			const char *pc_name = core->dbg->reg->name[R_REG_NAME_PC];
+			ut64 prev_pc;
+			bool prev_call = false;
+			bool prev_ret = false;
+			const char *sp_name = core->dbg->reg->name[R_REG_NAME_SP];
+			ut64 old_sp, cur_sp;
+			r_cons_break_push (NULL, NULL);
+			r_list_free (core->dbg->call_frames);
+			core->dbg->call_frames = r_list_new ();
+			core->dbg->call_frames->free = free;
+			r_debug_reg_sync (core->dbg, R_REG_TYPE_GPR, false);
+			old_sp = r_debug_reg_get (core->dbg, sp_name);
+			while (true) {
+				r_debug_reg_sync (core->dbg, R_REG_TYPE_GPR, false);
+				pc = r_debug_reg_get (core->dbg, pc_name);
+				if (prev_call) {
+					ut32 ret_addr;
+					RDebugFrame *frame = R_NEW0 (RDebugFrame);
+					cur_sp = r_debug_reg_get (core->dbg, sp_name);
+					(void)core->dbg->iob.read_at (core->dbg->iob.io, cur_sp, (ut8 *)&ret_addr,
+					                              sizeof (ret_addr));
+					frame->addr = ret_addr;
+					frame->size = old_sp - cur_sp;
+					frame->sp = cur_sp;
+					frame->bp = old_sp;
+					r_list_prepend (core->dbg->call_frames, frame);
+					eprintf ("%ld Call from 0x%08"PFMT64x" to 0x%08"PFMT64x" ret 0x%08"PFMT32x"\n",
+					         level, prev_pc, pc, ret_addr);
+					level++;
+					old_sp = cur_sp;
+					prev_call = false;
+				} else if (prev_ret) {
+					RDebugFrame *head = r_list_get_bottom (core->dbg->call_frames);
+					if (head && head->addr != pc) {
+						eprintf ("*");
+					} else {
+						r_list_pop_head (core->dbg->call_frames);
+						eprintf ("%ld", level);
+						level--;
+					}
+					eprintf (" Ret from 0x%08"PFMT64x" to 0x%08"PFMT64x"\n",
+					         prev_pc, pc);
+					prev_ret = false;
+				}
+				if (steps % 500 == 0 || pc == addr) {
+					eprintf ("At 0x%08"PFMT64x" after %lu steps\n", pc, steps);
+				}
+				if (r_cons_is_breaked () || r_debug_is_dead (core->dbg) || pc == addr) {
+					break;
+				}
+				if (is_x86_call (core->dbg, pc)) {
+					prev_pc = pc;
+					prev_call = true;
+				} else if (is_x86_ret (core->dbg, pc)) {
+					prev_pc = pc;
+					prev_ret = true;
+				}
+				r_debug_step (core->dbg, 1);
+				steps++;
+			}
+			r_cons_break_pop ();
+			return true;
+		}
 		eprintf ("Continue until 0x%08"PFMT64x" using %d bpsize\n", addr, core->dbg->bpsize);
 		r_reg_arena_swap (core->dbg->reg, true);
 		if (r_bp_add_sw (core->dbg->bp, addr, core->dbg->bpsize, R_BP_PROT_EXEC)) {
-			r_debug_continue (core->dbg);
+			if (r_debug_is_dead (core->dbg)) {
+				eprintf ("Cannot continue, run ood?\n");
+			} else {
+				r_debug_continue (core->dbg);
+			}
 			r_bp_del (core->dbg->bp, addr);
 		} else {
 			eprintf ("Cannot set breakpoint of size %d at 0x%08"PFMT64x"\n",
@@ -3699,10 +4045,12 @@
 		r_reg_arena_swap (core->dbg->reg, true);
 #if __linux__
 		core->dbg->continue_all_threads = true;
-		r_debug_continue (core->dbg);
-#else
-		r_debug_continue (core->dbg);
 #endif
+		if (r_debug_is_dead (core->dbg)) {
+			eprintf ("Cannot continue, run ood?\n");
+			break;
+		}
+		r_debug_continue (core->dbg);
 		break;
 	case 'a': // "dca"
 		eprintf ("TODO: dca\n");
@@ -3885,10 +4233,10 @@
 		break;
 	case 'u': // "dsu"
 		switch (input[2]) {
-		case 'f':
+		case 'f': // dsuf
 			step_until_flag (core, input + 3);
 			break;
-		case 'i':
+		case 'i': // dsui
 			if (input[3] == 'r') {
 				step_until_inst (core, input + 4, true);
 			}
@@ -3896,16 +4244,18 @@
 				step_until_inst (core, input + 3, false);
 			}
 			break;
-		case 'e':
+		case 'e': // dsue
 			step_until_esil (core, input + 3);
 			break;
-		case ' ':
+		case 'o': // dsuo
+			step_until_optype (core, input + 3);
+			break;
+		case ' ': // dsu <address>
 			r_reg_arena_swap (core->dbg->reg, true);
 			step_until (core, r_num_math (core->num, input + 2)); // XXX dupped by times
 			break;
 		default:
-			r_cons_println ("Usage: dsu[fei] [arg]  . step until address ' ',"
-					" 'f'lag, 'e'sil or 'i'nstruction matching");
+			r_core_cmd_help (core, help_msg_dsu);
 			return 0;
 		}
 		break;
@@ -3918,7 +4268,7 @@
 			r_debug_reg_sync (core->dbg, R_REG_TYPE_GPR, false);
 			addr = r_debug_reg_get (core->dbg, "PC");
 			r_io_read_at (core->io, addr, buf, sizeof (buf));
-			r_anal_op (core->anal, &aop, addr, buf, sizeof (buf));
+			r_anal_op (core->anal, &aop, addr, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC);
 			if (aop.type == R_ANAL_OP_TYPE_CALL) {
 				RIOSection *s = r_io_section_vget (core->io, aop.jump);
 				if (!s) {
@@ -3939,7 +4289,7 @@
 			for (i = 0; i < times; i++) {
 				r_debug_reg_sync (core->dbg, R_REG_TYPE_GPR, false);
 				r_io_read_at (core->io, addr, buf, sizeof (buf));
-				r_anal_op (core->anal, &aop, addr, buf, sizeof (buf));
+				r_anal_op (core->anal, &aop, addr, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC);
 				if (aop.jump != UT64_MAX && aop.fail != UT64_MAX) {
 					eprintf ("Don't know how to skip this instruction\n");
 					if (bpi) r_core_cmd0 (core, delb);
@@ -4109,7 +4459,8 @@
 				int stats = r_config_get_i (core->config, "esil.stats");
 				int iotrap = r_config_get_i (core->config, "esil.iotrap");
 				int nonull = r_config_get_i (core->config, "esil.nonull");
-				if (!(core->anal->esil = r_anal_esil_new (stacksize, iotrap))) {
+				unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+				if (!(core->anal->esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
 					return 0;
 				}
 				r_anal_esil_setup (core->anal->esil,
@@ -4125,7 +4476,7 @@
 				if (!addr) {
 					addr = core->offset;
 				}
-				op = r_core_anal_op (core, addr);
+				op = r_core_anal_op (core, addr, R_ANAL_OP_MASK_ESIL);
 				if (op) {
 					r_anal_esil_trace (core->anal->esil, op);
 				}
@@ -4342,6 +4693,10 @@
 	case 'L': // "dL"
 		if (input[1]=='q') {
 			r_debug_plugin_list (core->dbg, 'q');
+		} else if (input[1]=='j') {
+			r_debug_plugin_list (core->dbg, 'j');
+		} else if (input[1]=='?') {
+			r_core_cmd_help (core, help_msg_dL);
 		} else if (input[1]==' ') {
 			char *str = r_str_trim (strdup (input + 2));
 			r_config_set (core->config, "dbg.backend", str);
@@ -4372,6 +4727,7 @@
 					P ("baddr=0x%"PFMT64x"\n", r_debug_get_baddr (core->dbg, NULL));
 					P ("pid=%d\n", rdi->pid);
 					P ("tid=%d\n", rdi->tid);
+					P ("stopaddr=0x%"PFMT64x"\n", core->dbg->stopaddr);
 					if (rdi->uid != -1) {
 						P ("uid=%d\n", rdi->uid);
 					}
@@ -4394,7 +4750,9 @@
 						P ("kernel_stack=\n%s\n", rdi->kernel_stack);
 					}
 				}
-				if (stop != -1) P ("stopreason=%d\n", stop);
+				if (stop != -1) {
+					P ("stopreason=%d\n", stop);
+				}
 				break;
 			case '*': // "di*"
 				if (rdi) {
@@ -4421,6 +4779,7 @@
 					P ("\"addr\":%"PFMT64d",", core->dbg->reason.addr);
 					P ("\"inbp\":%s,", r_str_bool (core->dbg->reason.bp_addr));
 					P ("\"baddr\":%"PFMT64d",", r_debug_get_baddr (core->dbg, NULL));
+					P ("\"stopaddr\":%"PFMT64d",", core->dbg->stopaddr);
 					P ("\"pid\":%d,", rdi->pid);
 					P ("\"tid\":%d,", rdi->tid);
 					P ("\"uid\":%d,", rdi->uid);
@@ -4442,6 +4801,15 @@
 				break;
 #undef P
 #undef PS
+			case 'q':
+				{
+					const char *r = r_debug_reason_to_string (core->dbg->reason.type);
+					if (!r) {
+						r = "none";
+					}
+					r_cons_printf ("%s at 0x%08"PFMT64x"\n", r, core->dbg->stopaddr);
+				}
+				break;
 			case '?': // "dij"
 			default:
 				r_core_cmd_help (core, help_msg_di);
@@ -4461,12 +4829,11 @@
 			char *corefile = get_corefile_name (input + 1, core->dbg->pid);
 			eprintf ("Writing to file '%s'\n", corefile);
 			r_file_rm (corefile);
-			RBuffer *dst = r_buf_new ();
+			RBuffer *dst = r_buf_new_file (corefile, true);
 			if (dst) {
 				if (!core->dbg->h->gcore (core->dbg, dst)) {
 					eprintf ("dg: coredump failed\n");
 				}
-				r_file_dump (corefile, dst->buf, dst->length, 1);
 				r_buf_free (dst);
 			} else {
 				perror ("r_buf_new_file");
@@ -4576,7 +4943,7 @@
 			if (input[2]) {
 				char *str;
 				r_cons_push ();
-				str = r_core_cmd_str (core, sdb_fmt (0, "gs %s", input + 2));
+				str = r_core_cmd_str (core, sdb_fmt ("gs %s", input + 2));
 				r_cons_pop ();
 				r_core_cmdf (core, "dx %s", str); //`gs %s`", input + 2);
 				free (str);
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_egg.c radare2-2.8.0+dfsg/libr/core/cmd_egg.c
--- radare2-2.3.0+dfsg/libr/core/cmd_egg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_egg.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,21 +22,8 @@
 	NULL
 };
 
-static RList *configList = NULL;
-
 static void cmd_egg_init(RCore *core) {
 	DEFINE_CMD_DESCRIPTOR (core, g);
-
-	if (!(configList = r_list_new ())) {
-		return;
-	}
-	r_list_append (configList, "egg.shellcode");
-	r_list_append (configList, "egg.encoder");
-	r_list_append (configList, "egg.padding");
-	r_list_append (configList, "key");
-	r_list_append (configList, "cmd");
-	r_list_append (configList, "suid");
-
 }
 
 static void cmd_egg_option(REgg *egg, const char *key, const char *input) {
@@ -60,10 +47,11 @@
 		for (i = 0; i < b->length; i++) {
 			r_cons_printf ("%02x", b->buf[i]);
 		}
-		r_cons_printf ("\n");
+		r_cons_newline ();
 	}
 }
 
+#if 0
 static int compileShellcode(REgg *egg, const char *input){
 	int i = 0;
 	RBuffer *b;
@@ -92,6 +80,7 @@
 	r_egg_reset (egg);
 	return 0;
 }
+#endif
 
 static int cmd_egg_compile(REgg *egg) {
 	RBuffer *b;
@@ -242,10 +231,19 @@
 	break;
 	case 'S': // "gS"
 	{
-		RListIter *iter;
-		char *p;
+		static const char *configList[] = {
+			"egg.shellcode",
+			"egg.encoder",
+			"egg.padding",
+			"key",
+			"cmd",
+			"suid",
+			NULL
+		};
 		r_cons_printf ("Configuration options\n");
-		r_list_foreach (configList, iter, p) {
+		int i;
+		for (i = 0; configList[i]; i++) {
+			const char *p = configList[i];
 			if (r_egg_option_get (egg, p)) {
 				r_cons_printf ("%s : %s\n", p, r_egg_option_get (egg, p));
 			} else {
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_eval.c radare2-2.8.0+dfsg/libr/core/cmd_eval.c
--- radare2-2.3.0+dfsg/libr/core/cmd_eval.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_eval.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2009-2017 - pancake */
+/* radare2 - LGPL - Copyright 2009-2018 - pancake */
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -17,6 +17,7 @@
 	"e!", "a", "invert the boolean value of 'a' var",
 	"ec", " [k] [color]", "set color for given key (prompt, offset, ...)",
 	"ee", "var", "open editor to change the value of var",
+	"ed", "", "open editor to change the ~/.radare2rc",
 	"ej", "", "list config vars in JSON",
 	"env", " [k[=v]]", "get/set environment variable",
 	"er", " [key]", "set config key as readonly. no way back",
@@ -27,11 +28,34 @@
 	NULL
 };
 
+static const char *help_msg_ec[] = {
+	"Usage ec[s?] [key][[=| ]fg] [bg]", "", "",
+	"ec", "", "list all color keys",
+	"ec*", "", "same as above, but using r2 commands",
+	"ecd", "", "set default palette",
+	"ecr", "", "set random palette (see also scr.randpal)",
+	"ecs", "", "show a colorful palette",
+	"ecj", "", "show palette in JSON",
+	"ecc", " [prefix]", "show palette in CSS",
+	"eco", " dark|white", "load white color scheme template",
+	"ecp", "", "load previous color theme",
+	"ecn", "", "load next color theme",
+	"ecH", "[?]", "highlight word or instruction",
+	"ec", " prompt red", "change color of prompt",
+	"ec", " prompt red blue", "change color and background of prompt",
+	"", " ", "",
+	"colors:", "", "rgb:000, red, green, blue, #ff0000, ...",
+	"e scr.color", "=0", "use more colors (0: no color 1: ansi 16, 2: 256, 3: 16M)",
+	"$DATADIR/radare2/cons", "", R_JOIN_2_PATHS ("~", R2_HOME_THEMES) " ./",
+	NULL
+};
+
 static char *curtheme = NULL;
 static bool getNext = false;
 
 static void cmd_eval_init(RCore *core) {
 	DEFINE_CMD_DESCRIPTOR (core, e);
+	DEFINE_CMD_DESCRIPTOR (core, ec);
 }
 
 static bool load_theme(RCore *core, const char *path) {
@@ -78,32 +102,34 @@
 	return true;
 }
 
-R_API RList *r_core_list_themes(RCore *core) {
-	RList *files = NULL;
+static void list_themes_in_path(RList *list, const char *path) {
 	RListIter *iter;
 	const char *fn;
-	char *home = r_str_home (".config/radare2/cons/");
-
-	RList *list = r_list_new ();
-	getNext = false;
-	if (home) {
-		files = r_sys_dir (home);
-		r_list_foreach (files, iter, fn) {
-			if (*fn && *fn != '.') {
-				r_list_append (list, strdup (fn));
-			}
-		}
-		r_list_free (files);
-		R_FREE (home);
-	}
-	files = r_sys_dir (R2_DATDIR"/radare2/"R2_VERSION"/cons/");
+	RList *files = r_sys_dir (path);
 	r_list_foreach (files, iter, fn) {
 		if (*fn && *fn != '.') {
 			r_list_append (list, strdup (fn));
 		}
 	}
 	r_list_free (files);
-	files = NULL;
+}
+
+R_API RList *r_core_list_themes(RCore *core) {
+	RList *list = r_list_newf (free);
+	getNext = false;
+
+	char *path = r_str_home (R2_HOME_THEMES R_SYS_DIR);
+	if (path) {
+		list_themes_in_path (list, path);
+		R_FREE (path);
+	}
+
+	path = r_str_r2_prefix (R2_THEMES R_SYS_DIR);
+	if (path) {
+		list_themes_in_path (list, path);
+		R_FREE (path);
+	}
+
 	return list;
 }
 
@@ -113,7 +139,7 @@
 	RListIter *iter;
 	const char *fn;
 	int ctr = 0;
-	char *home = r_str_home (".config/radare2/cons/");
+	char *home = r_str_home (R2_HOME_THEMES R_SYS_DIR);
 
 	getNext = false;
 	if (mode == 'j') {
@@ -152,29 +178,34 @@
 		r_list_free (files);
 		R_FREE (home);
 	}
-	files = r_sys_dir (R2_DATDIR"/radare2/"R2_VERSION"/cons/");
-	r_list_foreach (files, iter, fn) {
-		if (*fn && *fn != '.') {
-			if (mode == 'p') {
-				const char *nfn = iter->n? iter->n->data: NULL;
-				if (!curtheme) {
-					free (home);
-					r_list_free (files);
-					return;
-				}
-				eprintf ("%s %s %s\n", nfn, curtheme, fn);
-				if (nfn && !strcmp (nfn, curtheme)) {
-					free (curtheme);
-					curtheme = strdup (fn);
-					goto done;
-				}
-			} else {
-				if (!nextpal_item (core, mode, fn, ctr++)) {
-					goto done;
+
+	char *path = r_str_r2_prefix (R2_THEMES R_SYS_DIR);
+	if (path) {
+		files = r_sys_dir (path);
+		r_list_foreach (files, iter, fn) {
+			if (*fn && *fn != '.') {
+				if (mode == 'p') {
+					const char *nfn = iter->n? iter->n->data: NULL;
+					if (!curtheme) {
+						free (home);
+						r_list_free (files);
+						return;
+					}
+					eprintf ("%s %s %s\n", nfn, curtheme, fn);
+					if (nfn && !strcmp (nfn, curtheme)) {
+						free (curtheme);
+						curtheme = strdup (fn);
+						goto done;
+					}
+				} else {
+					if (!nextpal_item (core, mode, fn, ctr++)) {
+						goto done;
+					}
 				}
 			}
 		}
 	}
+
 done:
 	if (getNext) {
 		R_FREE (curtheme);
@@ -183,7 +214,7 @@
 	}
 	if (mode == 'l' && !curtheme && !r_list_empty (files)) {
 		//nextpal (core, mode);
-	} else {
+	} else if (mode == 'n' || mode == 'p') {
 		if (curtheme) {
 			r_core_cmdf (core, "eco %s", curtheme);
 		}
@@ -196,10 +227,20 @@
 }
 
 static int cmd_eval(void *data, const char *input) {
-	char *p;
 	RCore *core = (RCore *)data;
 	switch (input[0]) {
-	case 't': // env
+	case '\0': // "e"
+		r_config_list (core->config, NULL, 0);
+		break;
+	case '?': // "e?"
+	default:
+		switch (input[1]) {
+		case '\0': r_core_cmd_help (core, help_msg_e); break;
+		case '?': r_config_list (core->config, input + 2, 2); break;
+		default: r_config_list (core->config, input + 1, 2); break;
+		}
+		break;
+	case 't': // "et"
 		if (input[1] == 'a') {
 			r_cons_printf ("%s\n", (r_num_rand (10) % 2)? "wen": "son");
 		} else if (input[1]==' ' && input[2]) {
@@ -214,7 +255,7 @@
 			eprintf ("Usage: et [varname]  ; show type of eval var\n");
 		}
 		break;
-	case 'n': // env
+	case 'n': // "en"
 		if (!strchr (input, '=')) {
 			char *var, *p;
 			var = strchr (input, ' ');
@@ -253,49 +294,29 @@
 	case 'q': // quiet list of eval keys
 		r_config_list (core->config, NULL, 'q');
 		break;
-	case '\0': // "e"
-		r_config_list (core->config, NULL, 0);
-		break;
 	case 'c': // "ec"
 		switch (input[1]) {
-		case 'd':
-			r_cons_pal_init (NULL);
+		case 'd': // "ecd"
+			r_cons_pal_init ();
 			break;
-		case '?': {
-			const char *helpmsg[] = {
-			"Usage ec[s?] [key][[=| ]fg] [bg]","","",
-			"ec","","list all color keys",
-			"ec*","","same as above, but using r2 commands",
-			"ecd","","set default palette",
-			"ecr","","set random palette (see also scr.randpal)",
-			"ecs","","show a colorful palette",
-			"ecj","","show palette in JSON",
-			"ecc"," [prefix]","show palette in CSS",
-			"eco"," dark|white","load white color scheme template",
-			"ecp","","load previous color theme",
-			"ecn","","load next color theme",
-			"ecH","[?]","highlight word or instruction",
-			"ec"," prompt red","change color of prompt",
-			"ec"," prompt red blue","change color and background of prompt",
-			""," ","",
-			"colors:","","rgb:000, red, green, blue, ...",
-			"e scr.rgbcolor","=1|0","for 256 color cube (boolean)",
-			"e scr.truecolor","=1|0","for 256*256*256 colors (boolean)",
-			"$DATADIR/radare2/cons","","~/.config/radare2/cons ./",
-			NULL};
-			r_core_cmd_help (core, helpmsg);
-			}
+		case '?':
+			r_core_cmd_help (core, help_msg_ec);
 			break;
 		case 'o': // "eco"
 			if (input[2] == 'j') {
 				nextpal (core, 'j');
 			} else if (input[2] == ' ') {
 				bool failed = false;
-				char *home, path[512];
-				snprintf (path, sizeof (path), ".config/radare2/cons/%s", input + 3);
-				home = r_str_home (path);
-				snprintf (path, sizeof (path), R2_DATDIR"/radare2/"
-					R2_VERSION"/cons/%s", input + 3);
+				char *home, *path, *tmp;
+
+				tmp = r_str_newf (R_JOIN_2_PATHS (R2_HOME_THEMES, "%s"), input + 3);
+				home = tmp ? r_str_home (tmp) : NULL;
+				free (tmp);
+
+				tmp = r_str_newf (R_JOIN_2_PATHS (R2_THEMES, "%s"), input + 3);
+				path = tmp ? r_str_r2_prefix (tmp) : NULL;
+				free (tmp);
+
 				if (!load_theme (core, home)) {
 					if (load_theme (core, path)) {
 						//curtheme = r_str_dup (curtheme, path);
@@ -312,11 +333,14 @@
 					}
 				}
 				free (home);
+				free (path);
 				if (failed) {
 					eprintf ("Something went wrong\n");
 				}
 			} else if (input[2] == '?') {
-				eprintf ("Usage: eco [themename]  ;load theme from "R2_DATDIR"/radare2/"R2_VERSION"/cons/\n");
+				eprintf ("Usage: eco [themename]  ;load theme from "
+					R_JOIN_3_PATHS ("%s", R2_THEMES, "") " (see dir.prefix)\n",
+					r_sys_prefix (NULL));
 
 			} else {
 				nextpal (core, 'l');
@@ -325,11 +349,13 @@
 		case 's': r_cons_pal_show (); break; // "ecs"
 		case '*': r_cons_pal_list (1, NULL); break; // "ec*"
 		case 'h': // echo
-			if (( p = strchr (input, ' ') )) {
-				r_cons_strcat (p+1);
-				r_cons_newline ();
+			if (input[2] == 'o') {
+				char *p = strchr (input, ' ');
+				if (p) {
+					r_cons_strcat (p + 1);
+					r_cons_newline ();
+				}
 			} else {
-				// "ech"
 				r_cons_pal_list ('h', NULL);
 			}
 			break;
@@ -372,10 +398,10 @@
 				r_meta_set_string (core->anal, R_META_TYPE_HIGHLIGHT, core->offset, "");
 				return false;
 			case '\0':
-			case 'i': // "ecHi
+			case 'i': // "ecHi"
 				if (argc) {
 					char *dup = r_str_newf ("bgonly %s", argv[0]);
-					color_code = r_cons_pal_parse (dup);
+					color_code = r_cons_pal_parse (dup, NULL);
 					R_FREE (dup);
 				}
 				break;
@@ -388,7 +414,7 @@
 				word = strdup (argv[0]);
 				if (argc > 1) {
 					char *dup = r_str_newf ("bgonly %s", argv[1]);
-					color_code = r_cons_pal_parse (dup);
+					color_code = r_cons_pal_parse (dup, NULL);
 					if (!color_code) {
 						eprintf ("Unknown color %s\n", argv[1]);
 						r_str_argv_free (argv);
@@ -405,7 +431,7 @@
 				return true;
 			}
 			char *str = r_meta_get_string (core->anal, R_META_TYPE_HIGHLIGHT, core->offset);
-			char *dup = r_str_newf ("%s \"%s%s\"", str?str:"", word?word:"", color_code?color_code:r_cons_pal_get ("highlight"));
+			char *dup = r_str_newf ("%s \"%s%s\"", str?str:"", word?word:"", color_code?color_code:r_cons_singleton ()->pal.wordhl);
 			r_meta_set_string (core->anal, R_META_TYPE_HIGHLIGHT, core->offset, dup);
 			r_str_argv_free (argv);
 			R_FREE (word);
@@ -419,20 +445,49 @@
 				q = strchr (p, ' ');
 			}
 			if (q) {
-				// set
+				// Set color
 				*q++ = 0;
-				r_cons_pal_set (p, q);
-			} else {
-				const char *k = r_cons_pal_get (p);
-				if (k) {
-					eprintf ("(%s)(%sCOLOR"Color_RESET")\n", p, k);
+				if (r_cons_pal_set (p, q)) {
+					r_cons_pal_update_event ();
 				}
+			} else {
+				char color[32];
+				RColor rcolor = r_cons_pal_get (p);
+				r_cons_rgb_str (color, sizeof (color), &rcolor);
+				eprintf ("(%s)(%sCOLOR"Color_RESET")\n", p, color);
 			}
 			free (p);
 		}
 		}
 		break;
-	case 'e':
+	case 'd': // "ed"
+		if (input[1] == '?') {
+			eprintf ("Usage: ed[-][?] - edit ~/.radare2rc with cfg.editor\n");
+			eprintf ("NOTE: ~ is HOME and this can be changed with %%HOME=/tmp\n");
+			eprintf ("  ed    : ${cfg.editor} ~/.radare2rc\n");
+			eprintf ("  ed-   : rm ~/.radare2rc\n");
+		} else if (input[1] == '-') {
+			char *file = r_str_home (".radare2rc");
+			r_cons_printf ("rm %s\n", file);
+			// r_file_rm (file);
+			free (file);
+		} else {
+			char *file = r_str_home (".radare2rc");
+			if (r_config_get_i (core->config, "scr.interactive")) {
+				r_file_touch (file);
+				char * res = r_cons_editor (file, NULL);
+				if (res) {
+					if (r_cons_yesno ('y', "Reload? (Y/n)")) {
+						r_core_run_script (core, file);
+					}
+				}
+			} else {
+				r_core_run_script (core, file);
+			}
+			free (file);
+		}
+		break;
+	case 'e': // "ee"
 		if (input[1] == ' ') {
 			char *p;
 			const char *val, *input2 = strchr (input+2, ' ');
@@ -447,28 +502,22 @@
 			eprintf ("Usage: ee varname\n");
 		}
 		break;
-	case '!':
+	case '!': // "e!"
 		input = r_str_trim_ro (input+1);
 		if (!r_config_toggle (core->config, input))
 			eprintf ("r_config: '%s' is not a boolean variable.\n", input);
 		break;
-	case 's':
+	case 's': // "es"
 		r_config_list (core->config, (input[1])? input + 1: NULL, 's');
 		break;
-	case '-':
+	case '-': // "e-"
 		r_core_config_init (core);
 		//eprintf ("BUG: 'e-' command locks the eval hashtable. patches are welcome :)\n");
 		break;
-	case '*': r_config_list (core->config, NULL, 1); break;
-	case '?':
-		switch (input[1]) {
-		case '?': r_config_list (core->config, input+2, 2); break;
-		default: r_config_list (core->config, input+1, 2); break;
-		case 0:
-			r_core_cmd_help (core, help_msg_e);
-		}
+	case '*': // "e*"
+		r_config_list (core->config, NULL, 1);
 		break;
-	case 'r':
+	case 'r': // "er"
 		if (input[1]) {
 			const char *key = input+((input[1]==' ')?2:1);
 			if (!r_config_readonly (core->config, key)) {
@@ -479,7 +528,6 @@
 		}
 		break;
 	case ' ': r_config_eval (core->config, input+1); break;
-	default: r_config_eval (core->config, input); break;
 	}
 	return 0;
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_flag.c radare2-2.8.0+dfsg/libr/core/cmd_flag.c
--- radare2-2.3.0+dfsg/libr/core/cmd_flag.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_flag.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <stddef.h>
 #include "r_cons.h"
@@ -44,6 +44,7 @@
 	"fR","[?] [f] [t] [m]","relocate all flags matching f&~m 'f'rom, 't'o, 'm'ask",
 	"fs","[?]+-*","manage flagspaces",
 	"fS","[on]","sort flags by offset or name",
+	"ft","[?]*","flag tags, useful to find all flags matching some words",
 	"fV","[*-] [nkey] [offset]","dump/restore visual marks (mK/'K)",
 	"fx","[d]","show hexdump (or disasm) of flag:flagsize",
 	"fq","","list flags in quiet mode",
@@ -210,6 +211,57 @@
 	return 0;
 }
 
+static void cmd_flag_tags (RCore *core, const char *input) {
+	char mode = input[1];
+	for (; *input && !IS_WHITESPACE (*input); input++) {}
+	char *inp = strdup (input);
+	char *arg = r_str_trim (inp);
+	if (!*arg && !mode) {
+		const char *tag;
+		RListIter *iter;
+		RList *list = r_flag_tags_list (core->flags);
+		r_list_foreach (list, iter, tag) {
+			r_cons_printf ("%s\n", tag);
+		}
+		r_list_free (list);
+		free (inp);
+		return;
+	}
+	if (mode == '?') {
+		eprintf ("Usage: ft [k] [v ...]\n");
+		eprintf (" ft tag strcpy strlen ... # set words for the 'string' tag\n");
+		eprintf (" ft tag                   # get offsets of all matching flags\n");
+		eprintf (" ft                       # list all tags\n");
+		eprintf (" ftn tag                  # get matching flagnames fot given tag\n");
+		free (inp);
+		return;
+	}
+	char *arg1 = strchr (arg, ' ');
+	if (arg1) {
+		*arg1 = 0;
+		const char *a1 = r_str_trim_ro (arg1 + 1);
+		r_flag_tags_set (core->flags, arg, a1);
+	} else {
+		RListIter *iter;
+		RFlagItem *flag;
+		RList *flags = r_flag_tags_get (core->flags, arg);
+		switch (mode) {
+		case 'n':
+			r_list_foreach (flags, iter, flag) {
+				// r_cons_printf ("0x%08"PFMT64x"\n", flag->offset);
+				r_cons_printf ("0x%08"PFMT64x"  %s\n", flag->offset, flag->name);
+			}
+			break;
+		default:
+			r_list_foreach (flags, iter, flag) {
+				r_cons_printf ("0x%08"PFMT64x"\n", flag->offset);
+			}
+			break;
+		}
+	}
+	free (inp);
+}
+
 static void flag_ordinals(RCore *core, const char *str) {
 	RFlagItem *flag;
 	RListIter *iter;
@@ -455,7 +507,7 @@
 			while (*flagname==' ') {
 				flagname++;
 			}
-			if (*flagname=='.') {
+			if (*flagname == '.') {
 				RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, off, 0);
 				if (fcn) {
 					eprintf ("TODO: local_del_name has been deprecated\n");
@@ -501,14 +553,19 @@
 						} else {
 							r_anal_fcn_label_set (core->anal, fcn, name, off);
 						}
-					} else eprintf ("Cannot find function at 0x%08"PFMT64x"\n", off);
+					} else {
+						eprintf ("Cannot find function at 0x%08"PFMT64x"\n", off);
+					}
 					free (name);
 				}
 			}
 		} else {
 			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, off, 0);
-			if (fcn) r_anal_fcn_labels (core->anal, fcn, 0);
-			else eprintf ("Cannot find function at 0x%08"PFMT64x"\n", off);
+			if (fcn) {
+				r_anal_fcn_labels (core->anal, fcn, 0);
+			} else {
+				eprintf ("Local flags require a function to work.");
+			}
 		}
 		break;
 	case 'l': // "fl"
@@ -602,6 +659,9 @@
 			eprintf ("Missing arguments\n");
 		}
 		break;
+	case 't': // "ft"
+		cmd_flag_tags (core, input);
+		break;
 	case 'S':
 		r_flag_sort (core->flags, (input[1]=='n'));
 		break;
@@ -765,7 +825,7 @@
 		r_flag_list (core->flags, *input, input[0]? input + 1: "");
 		break;
 	case 'i': // "fi"
-		if (input[1] == ' ' || input[2] == ' ') {
+		if (input[1] == ' ' || (input[1] && input[2] == ' ')) {
 			char *arg = strdup (r_str_trim_ro (input + 2));
 			if (*arg) {
 				arg = strdup (r_str_trim_ro (input + 2));
@@ -819,13 +879,23 @@
 					addr = r_num_math (core->num, arg + 1);
 				}
 				break;
-			case '.':
-				strict_offset = true;
+			case '.': // list all flags at given offset
+				{
+				RFlagItem *flag;
+				RListIter *iter;
+				const RList *flaglist;
 				arg = strchr (input, ' ');
 				if (arg) {
 					addr = r_num_math (core->num, arg + 1);
 				}
-				break;
+				flaglist = r_flag_get_list (core->flags, addr);
+				r_list_foreach (flaglist, iter, flag) {
+					if (flag) {
+						r_cons_println (flag->name);
+					}
+				}
+				return 0;
+				}
 			case 'w':
 				{
 				arg = strchr (input, ' ');
@@ -837,7 +907,7 @@
 						ut64 loff = 0; 
 						ut64 uoff = 0;
 						ut64 curseek = core->offset;
-						char *lmatch , *umatch;
+						char *lmatch = NULL , *umatch = NULL;
 						RFlagItem *flag;
 						RListIter *iter;
 						r_list_foreach (f->flags, iter, flag) { // creating a local copy
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_hash.c radare2-2.8.0+dfsg/libr/core/cmd_hash.c
--- radare2-2.3.0+dfsg/libr/core/cmd_hash.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_hash.c	2018-08-07 14:12:36.000000000 +0000
@@ -489,28 +489,37 @@
 
 static int cmd_hash_bang (RCore *core, const char *input) {
 	char *p;
-	const char *lang = input+1;
+	const char *lang = input + 1;
 	if (r_sandbox_enable (0)) {
 		eprintf ("hashbang disabled in sandbox mode\n");
 		return false;
 	}
 	if (*lang=='/') {
-		const char *ptr = lang+1;
+		const char *ptr = lang + 1;
 		while (*lang) {
-			if (*lang=='/')
-				ptr = lang+1;
+			if (*lang=='/') {
+				ptr = lang + 1;
+			}
 			lang++;
 		}
 		RLangPlugin *p = r_lang_get_by_extension (core->lang, ptr);
-		if (p && p->name) lang = p->name;
+		if (p && p->name) {
+			lang = p->name;
+		}
 	}
-	if (*lang==' ') {
-		RLangPlugin *p = r_lang_get_by_extension (core->lang, input+2);
-		if (p && p->name) lang = p->name;
+	if (*lang == ' ') {
+		RLangPlugin *p = r_lang_get_by_extension (core->lang, input + 2);
+		if (p && p->name) {
+			lang = p->name;
+		}
 	} else if (input[1]=='?' || input[1]=='*' || input[1]=='\0') {
 		r_lang_list (core->lang);
 		return true;
 	}
+	if (lang && !*lang) {
+		// do nothing
+		return true;
+	}
 	p = strchr (input, ' ');
 	bool doEval = false;
 	if (p) {
@@ -534,7 +543,9 @@
 		} else {
 			if (r_config_get_i (core->config, "scr.interactive")) {
 				r_lang_prompt (core->lang);
-			} else eprintf ("Error: scr.interactive required to run the rlang prompt\n");
+			} else {
+				eprintf ("Error: scr.interactive required to run the rlang prompt\n");
+			}
 		}
 	} else {
 		eprintf ("Invalid hashbang. See '#!' for help.\n");
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_help.c radare2-2.8.0+dfsg/libr/core/cmd_help.c
--- radare2-2.3.0+dfsg/libr/core/cmd_help.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_help.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <stddef.h>
 #include "r_cons.h"
@@ -20,45 +20,96 @@
 	return res;
 }
 
+static const char *help_msg_percent[] = {
+	"Usage:", "%[name[=value]]", "Set each NAME to VALUE in the environment",
+	"%", "", "list all environment variables",
+	"%", "SHELL", "prints SHELL value",
+	"%", "TMPDIR=/tmp", "sets TMPDIR value to \"/tmp\"",
+	NULL
+};
+
+// NOTE: probably not all environment vars takes sesnse
+// because they can be replaced by commands in the given
+// command.. we should only expose the most essential and
+// unidirectional ones.
+static const char *help_msg_env[] = {
+		"\nEnvironment:", "", "",
+		"R2_FILE", "", "file name",
+		"R2_OFFSET", "", "10base offset 64bit value",
+		"R2_BYTES", "", "TODO: variable with bytes in curblock",
+		"R2_XOFFSET", "", "same as above, but in 16 base",
+		"R2_BSIZE", "", "block size",
+		"R2_ENDIAN", "", "'big' or 'little'",
+		"R2_IOVA", "", "is io.va true? virtual addressing (1,0)",
+		"R2_DEBUG", "", "debug mode enabled? (1,0)",
+		"R2_BLOCK", "", "TODO: dump current block to tmp file",
+		"R2_SIZE", "","file size",
+		"R2_ARCH", "", "value of asm.arch",
+		"R2_BITS", "", "arch reg size (8, 16, 32, 64)",
+		"RABIN2_LANG", "", "assume this lang to demangle",
+		"RABIN2_DEMANGLE", "", "demangle or not",
+		"RABIN2_PDBSERVER", "", "e pdb.server",
+		NULL
+};
+
+static const char *help_msg_exclamation[] = {
+		"Usage:", "!<cmd>", "  Run given command as in system(3)",
+		"!", "", "list all historic commands",
+		"!", "ls", "execute 'ls' in shell",
+		"!!", "", "save command history to hist file",
+		"!!", "ls~txt", "print output of 'ls' and grep for 'txt'",
+		"!!!", "cmd [args|$type]", "adds the autocomplete value",
+		"!!!-", "cmd [args]", "removes the autocomplete value",
+		".!", "rabin2 -rpsei ${FILE}", "run each output line as a r2 cmd",
+		"!", "echo $SIZE", "display file size",
+		"!-", "", "clear history in current session",
+		"!-*", "", "clear and save empty history log",
+		"!=!", "", "enable remotecmd mode",
+		"=!=", "", "disable remotecmd mode",
+		NULL
+	};
+
 static const char *help_msg_root[] = {
-	"%var", "=value", "Alias for 'env' command",
-	"*", "[?] off[=[0x]value]", "Pointer read/write data/values (see ?v, wx, wv)",
-	"(macro arg0 arg1)",  "", "Manage scripting macros",
+	"%var", "=value", "alias for 'env' command",
+	"*", "[?] off[=[0x]value]", "pointer read/write data/values (see ?v, wx, wv)",
+	"(macro arg0 arg1)",  "", "manage scripting macros",
 	".", "[?] [-|(m)|f|!sh|cmd]", "Define macro or load r2, cparse or rlang file",
-	"=","[?] [cmd]", "Send/Listen for Remote Commands (rap://, http://, <fd>)",
-	"/","[?]", "Search for bytes, regexps, patterns, ..",
-	"!","[?] [cmd]", "Run given command as in system(3)",
+	"=","[?] [cmd]", "send/listen for remote commands (rap://, http://, <fd>)",
+	"<","[...]", "push escaped string into the RCons.readChar buffer",
+	"/","[?]", "search for bytes, regexps, patterns, ..",
+	"!","[?] [cmd]", "run given command as in system(3)",
 	"#","[?] !lang [..]", "Hashbang to run an rlang script",
-	"a","[?]", "Analysis commands",
-	"b","[?]", "Display or change the block size",
-	"c","[?] [arg]", "Compare block with given data",
-	"C","[?]", "Code metadata (comments, format, hints, ..)",
-	"d","[?]", "Debugger commands",
-	"e","[?] [a[=b]]", "List/get/set config evaluable vars",
-	"f","[?] [name][sz][at]", "Add flag at current address",
-	"g","[?] [arg]", "Generate shellcodes with r_egg",
-	"i","[?] [file]", "Get info about opened file from r_bin",
-	"k","[?] [sdb-query]", "Run sdb-query. see k? for help, 'k *', 'k **' ...",
+	"a","[?]", "analysis commands",
+	"b","[?]", "display or change the block size",
+	"c","[?] [arg]", "compare block with given data",
+	"C","[?]", "code metadata (comments, format, hints, ..)",
+	"d","[?]", "debugger commands",
+	"e","[?] [a[=b]]", "list/get/set config evaluable vars",
+	"f","[?] [name][sz][at]", "add flag at current address",
+	"g","[?] [arg]", "generate shellcodes with r_egg",
+	"i","[?] [file]", "get info about opened file from r_bin",
+	"k","[?] [sdb-query]", "run sdb-query. see k? for help, 'k *', 'k **' ...",
 	"L","[?] [-] [plugin]", "list, unload load r2 plugins",
-	"m","[?]", "Mountpoints commands",
-	"o","[?] [file] ([offset])", "Open file at optional address",
-	"p","[?] [len]", "Print current block with format and length",
-	"P","[?]", "Project management utilities",
-	"q","[?] [ret]", "Quit program with a return value",
-	"r","[?] [len]", "Resize file",
-	"s","[?] [addr]", "Seek to address (also for '0x', '0x1' == 's 0x1')",
-	"S","[?]", "Io section manipulation information",
-	"t","[?]", "Types, noreturn, signatures, C parser and more",
+	"m","[?]", "mountpoints commands",
+	"o","[?] [file] ([offset])", "open file at optional address",
+	"p","[?] [len]", "print current block with format and length",
+	"P","[?]", "project management utilities",
+	"q","[?] [ret]", "quit program with a return value",
+	"r","[?] [len]", "resize file",
+	"s","[?] [addr]", "seek to address (also for '0x', '0x1' == 's 0x1')",
+	"S","[?]", "io section manipulation information",
+	"t","[?]", "types, noreturn, signatures, C parser and more",
 	"T","[?] [-] [num|msg]", "Text log utility",
 	"u","[?]", "uname/undo seek/write",
-	"V","", "Visual mode (V! = panels, VV = fcngraph, VVV = callgraph)",
-	"w","[?] [str]", "Multiple write operations",
-	"x","[?] [len]", "Alias for 'px' (print hexadecimal)",
+	"V","", "visual mode (V! = panels, VV = fcngraph, VVV = callgraph)",
+	"w","[?] [str]", "multiple write operations",
+	"x","[?] [len]", "alias for 'px' (print hexadecimal)",
 	"y","[?] [len] [[[@]addr", "Yank/paste bytes from/to memory",
-	"z", "[?]", "Zignatures management",
+	"z", "[?]", "zignatures management",
 	"?[??]","[expr]", "Help or evaluate math expression",
-	"?$?", "", "Show available '$' variables and aliases",
-	"?@?", "", "Misc help for '@' (seek), '~' (grep) (see ~?""?)",
+	"?$?", "", "show available '$' variables and aliases",
+	"?@?", "", "misc help for '@' (seek), '~' (grep) (see ~?""?)",
+	"?>?", "", "output redirection",
 	NULL
 };
 
@@ -66,7 +117,7 @@
 	"Usage: ?[?[?]] expression", "", "",
 	"?", " eip-0x804800", "show hex and dec result for this math expr",
 	"?:", "", "list core cmd plugins",
-	"[cmd]?*", "", "Recursive help for the given cmd",
+	"[cmd]?*", "", "recursive help for the given cmd",
 	"?!", " [cmd]", "run cmd if $? == 0",
 	"?$", "", "show value all the variables ($)",
 	"?+", " [cmd]", "run cmd if $? > 0",
@@ -75,11 +126,11 @@
 	"??", " [cmd]", "run cmd if $? != 0",
 	"??", "", "show value of operation",
 	"?_", " hudfile", "load hud menu with given file",
+	"?a", "", "show ascii table",
 	"?b", " [num]", "show binary value of number",
 	"?b64[-]", " [str]", "encode/decode in base64",
 	"?btw", " num|expr num|expr num|expr", "returns boolean value of a <= b <= c",
 	"?B", " [elem]", "show range boundaries like 'e?search.in",
-	"?d[.]", " opcode", "describe opcode for asm.arch",
 	"?e[nbgc]", " string", "echo string (nonl, gotoxy, column, bars)",
 	"?f", " [num] [str]", "map each bit of the number as flag string index",
 	"?F", "", "flush cons output",
@@ -89,11 +140,12 @@
 	"?im", " message", "show message centered in screen",
 	"?in", " prompt", "noyes input prompt",
 	"?iy", " prompt", "yesno input prompt",
-	"?l", " str", "returns the length of string",
+	"?l", "[q] str", "returns the length of string ('q' for quiet, just set $?)",
 	"?o", " num", "get octal value",
 	"?O", " [id]", "List mnemonics for current asm.arch / asm.bits",
 	"?p", " vaddr", "get physical address for given virtual address",
 	"?P", " paddr", "get virtual address for given physical one",
+	"?q", " eip-0x804800", "compute expression like ? or ?v but in quiet mode",
 	"?r", " [from] [to]", "generate random number between from-to",
 	"?s", " from to step", "sequence of numbers from to by steps",
 	"?S", " addr", "return section name of given address",
@@ -115,8 +167,9 @@
 static const char *help_msg_question_v[] = {
 	"Usage: ?v [$.]","","",
 	"$$", "", "here (current virtual seek)",
+	"$$$", "", "current non-temporary virtual seek",
 	"$?", "", "last comparison value",
-	"$alias", "=value", "Alias commands (simple macros)",
+	"$alias", "=value", "alias commands (simple macros)",
 	"$b", "", "block size",
 	"$B", "", "base address (aligned lowest map address)",
 	"$f", "", "jump fail address (e.g. jz 0x10 => next instruction)",
@@ -151,7 +204,9 @@
 	"$v", "", "opcode immediate value (e.g. lui a0,0x8010 => 0x8010)",
 	"$w", "", "get word size, 4 if asm.bits=32, 8 if 64, ...",
 	"${ev}", "", "get value of eval config variable",
+	"$r{reg}", "", "get value of named register",
 	"$k{kv}", "", "get value of an sdb query value",
+	"$s{flag}", "", "get size of flag",
 	"RNum", "", "$variables usable in math expressions",
 	NULL
 };
@@ -165,6 +220,25 @@
 	NULL
 };
 
+static const char *help_msg_greater_sign[] = {
+	"Usage:", "[cmd]>[file]", "redirects console from 'cmd' output to 'file'",
+	"[cmd] > [file]", "", "redirect STDOUT of 'cmd' to 'file'",
+	"[cmd] H> [file]", "", "redirect html output of 'cmd' to 'file'",
+	"[cmd] 2> [file]", "", "redirect STDERR of 'cmd' to 'file'",
+	"[cmd] 2> /dev/null", "", "omit the STDERR output of 'cmd'",
+	NULL
+};
+
+static void cmd_help_exclamation(RCore *core) {
+	r_core_cmd_help (core, help_msg_exclamation);
+	r_core_cmd_help (core, help_msg_env);
+}
+
+static void cmd_help_percent(RCore *core) {
+	r_core_cmd_help (core, help_msg_percent);
+	r_core_cmd_help (core, help_msg_env);
+}
+
 static void cmd_help_init(RCore *core) {
 	DEFINE_CMD_DESCRIPTOR_SPECIAL (core, ?, question);
 	DEFINE_CMD_DESCRIPTOR_SPECIAL (core, ?v, question_v);
@@ -223,18 +297,42 @@
 	return buf;
 }
 
-R_API void r_core_clippy(const char *msg) {
-	int msglen = strlen (msg);
-	char *l = strdup (r_str_pad ('-', msglen));
-	char *s = strdup (r_str_pad (' ', msglen));
-	r_cons_printf (
+static const char *getClippy() {
+	const int choose = r_num_rand (3);
+	switch (choose) {
+	case 0: return
 " .--.     .-%s-.\n"
 " | _|     | %s |\n"
 " | O O   <  %s |\n"
 " |  |  |  | %s |\n"
 " || | /   `-%s-'\n"
 " |`-'|\n"
-" `---'\n", l, s, msg, s, l);
+" `---'\n";
+	case 1: return
+" .--.     .-%s-.\n"
+" | __\\    | %s |\n"
+" | > <   <  %s |\n"
+" |  \\|    | %s |\n"
+" |/_//    `-%s-'\n"
+" |  / \n"
+" `-'\n";
+	case 2: return
+" .--.     .-%s-.\n"
+" | _|_    | %s |\n"
+" | O O   <  %s |\n"
+" |  ||    | %s |\n"
+" | _:|    `-%s-'\n"
+" |   |\n"
+" `---'\n";
+	}
+	return "";
+}
+
+R_API void r_core_clippy(const char *msg) {
+	int msglen = strlen (msg);
+	char *l = strdup (r_str_pad ('-', msglen));
+	char *s = strdup (r_str_pad (' ', msglen));
+	r_cons_printf (getClippy(), l, s, msg, s, l);
 	free (l);
 	free (s);
 }
@@ -283,6 +381,9 @@
 		r_cons_printf ("0x%"PFMT64x"\n", core->num->value);
 		}
 		break;
+	case 'a': // "?a"
+		r_cons_printf ("%s", ret_ascii_table());
+		break;
 	case 'b': // "?b"
 		if (input[1] == '6' && input[2] == '4') {
 			//b64 decoding takes at most strlen(str) * 4
@@ -316,26 +417,9 @@
 		}
 		r_list_free (tmp);
 		break;
-	case 'd': // "?d"
-		if (input[1]=='.') {
-			int cur = R_MAX (core->print->cur, 0);
-			// XXX: we need cmd_xxx.h (cmd_anal.h)
-			core_anal_bytes (core, core->block + cur, core->blocksize, 1, 'd');
-		} else if (input[1] == ' ') {
-			char *d = r_asm_describe (core->assembler, input+2);
-			if (d && *d) {
-				r_cons_println (d);
-				free (d);
-			} else {
-				eprintf ("Unknown opcode\n");
-			}
-		} else {
-			eprintf ("Use: ?d[.] [opcode]    to get the description of the opcode\n");
-		}
-		break;
 	case 'h': // "?h"
 		if (input[1] == ' ') {
-			r_cons_printf ("0x%08x\n", (ut32)r_str_hash (input+2));
+			r_cons_printf ("0x%08x\n", (ut32)r_str_hash (input + 2));
 		} else {
 			eprintf ("Usage: ?h [string-to-hash]\n");
 		}
@@ -444,7 +528,7 @@
 			const int list_len = r_list_length (list);
 			for (i = 0; i < list_len; i++) {
 				const char *str = r_list_pop_head (list);
-				if (*str == '\0') {
+				if (!*str) {
 					continue;
 				}
 				n = r_num_math (core->num, str);
@@ -456,33 +540,61 @@
 				s = n >> 16 << 12;
 				a = n & 0x0fff;
 				r_num_units (unit, n);
-				r_cons_printf ("%"PFMT64d" 0x%"PFMT64x" 0%"PFMT64o
-					" %s %04x:%04x ",
-					n, n, n, unit, s, a);
+				r_cons_printf ("hex     0x%"PFMT64x"\n", n);
+				r_cons_printf ("octal   0%"PFMT64o"\n", n);
+				r_cons_printf ("unit    %s\n", unit);
+				r_cons_printf ("segment %04x:%04x\n", s, a);
 				if (n >> 32) {
-					r_cons_printf ("%"PFMT64d" ", (st64)n);
+					r_cons_printf ("int64   %"PFMT64d"\n", (st64)n);
 				} else {
-					r_cons_printf ("%d ", (st32)n);
+					r_cons_printf ("int32   %d\n", (st32)n);
 				}
 				if (asnum) {
-					r_cons_printf ("\"%s\" ", asnum);
+					r_cons_printf ("string  \"%s\"\n", asnum);
 					free (asnum);
 				}
 				/* binary and floating point */
 				r_str_bits64 (out, n);
 				f = d = core->num->fvalue;
-				r_cons_printf ("0b%s %.01lf %ff %lf ", out, core->num->fvalue, f, d);
+				memcpy (&f, &n, sizeof (f));
+				memcpy (&d, &n, sizeof (d));
+				/* adjust sign for nan floats, different libcs are confused */
+				if (isnan (f) && signbit (f)) {
+					f = -f;
+				}
+				if (isnan (d) && signbit (d)) {
+					d = -d;
+				}
+				r_cons_printf ("binary  0b%s\n", out);
+				r_cons_printf ("fvalue: %.1lf\n", core->num->fvalue);
+				r_cons_printf ("float:  %ff\n", f);
+				r_cons_printf ("double: %lf\n", d);
 
 				/* ternary */
 				r_num_to_trits (out, n);
-				r_cons_printf ("0t%s", out);
-
-				r_cons_printf ("\n");
+				r_cons_printf ("trits   0t%s\n", out);
 			}
 			free (inputs);
 			r_list_free (list);
 		}
 		break;
+	case 'q': // "?q"
+		if (core->num->dbz) {
+			eprintf ("RNum ERROR: Division by Zero\n");
+		}
+		if (input[1] == '?') {
+			r_cons_printf ("|Usage: ?q [num]  # Update $? without printing anything\n"
+				"|?q 123; ?? x    # hexdump if 123 != 0");
+		} else {
+			const char *space = strchr (input, ' ');
+			if (space) {
+				n = r_num_math (core->num, space + 1);
+			} else {
+				n = r_num_math (core->num, "$?");
+			}
+			core->num->value = n; // redundant
+		}
+		break;
 	case 'v': // "?v"
 		{
 			const char *space = strchr (input, ' ');
@@ -498,6 +610,7 @@
 		switch (input[1]) {
 		case '?':
 			r_cons_printf ("|Usage: ?v[id][ num]  # Show value\n"
+				"|?vx number  -> show 8 digit padding in hex\n"
 				"|?vi1 200    -> 1 byte size value (char)\n"
 				"|?vi2 0xffff -> 2 byte size value (short)\n"
 				"|?vi4 0xffff -> 4 byte size value (int)\n"
@@ -508,6 +621,9 @@
 		case '\0':
 			r_cons_printf ("%d\n", (st32)n);
 			break;
+		case 'x': // "?vx"
+			r_cons_printf ("0x%08"PFMT64x"\n", n);
+			break;
 		case 'i': // "?vi"
 			switch (input[2]) {
 			case '1': // byte
@@ -566,7 +682,7 @@
 		if (input[1]) {
 			if (!core->num->value) {
 				if (input[1] == '?') {
-					r_core_sysenv_help (core);
+					cmd_help_exclamation (core);
 					return 0;
 				} else {
 					return core->num->value = r_core_cmd (core, input+1, 0);
@@ -578,7 +694,11 @@
 		break;
 	case '@': // "?@"
 		if (input[1] == '@') {
-			r_core_cmd_help (core, help_msg_at_at);
+			if (input[2] == '@') {
+				r_core_cmd_help (core, help_msg_at_at_at);
+			} else {
+				r_core_cmd_help (core, help_msg_at_at);
+			}
 		} else {
 			r_core_cmd_help (core, help_msg_at);
 		}
@@ -586,14 +706,19 @@
 	case '&': // "?&"
 		helpCmdTasks (core);
 		break;
+	case '%': // "?%"
+		if (input[1] == '?') {
+			cmd_help_percent (core);
+		}
+		break;
 	case '$': // "?$"
 		if (input[1] == '?') {
 			r_core_cmd_help (core, help_msg_question_v);
 		} else {
 			int i = 0;
 			const char *vars[] = {
-				"$$", "$?", "$b", "$B", "$F", "$Fj", "$Ff", "$FB", "$Fb", "$Fs", "$FE", "$FS", "$FI",
-				"$c", "$r", "$D", "$DD", "$e", "$f", "$j", "$Ja", "$l", "$m", "$M", "$o",
+				"$$", "$$$", "$?", "$b", "$B", "$F", "$Fj", "$Ff", "$FB", "$Fb", "$Fs", "$FE", "$FS",
+				"$FI", "$c", "$r", "$D", "$DD", "$e", "$f", "$j", "$Ja", "$l", "$m", "$M", "$o",
 				"$p", "$P", "$s", "$S", "$SS", "$v", "$w", NULL
 			};
 			while (vars[i]) {
@@ -637,8 +762,14 @@
 		}
 		break;
 	case 'l': // "?l"
-		for (input++; input[0] == ' '; input++);
-		core->num->value = strlen (input);
+		if (input[1] == 'q') {
+			for (input+=2; input[0] == ' '; input++);
+			core->num->value = strlen (input);
+		} else {
+			for (input++; input[0] == ' '; input++);
+			core->num->value = strlen (input);
+			r_cons_printf ("%d\n", core->num->value);
+		}
 		break;
 	case 'X': // "?X"
 		for (input++; input[0] == ' '; input++);
@@ -714,7 +845,22 @@
 			free (newmsg);
 			break;
 		}
-		default: {
+		case 'p':
+			  {
+			char *word, *str = strdup (input + 2);
+				  RList *list = r_str_split_list (str, " ");
+				  ut64 *nums = calloc (sizeof (ut64), r_list_length (list));
+				  int i = 0;
+				  r_list_foreach (list, iter, word) {
+					nums[i] = r_num_math (core->num, word);;
+					i++;
+				  }
+				  int size = r_config_get_i (core->config, "hex.cols");
+				  r_print_pie (core->print, nums, r_list_length (list), size);
+				  r_list_free (list);
+			  }
+			break;
+		case ' ': {
 			const char *msg = r_str_trim_ro (input+1);
 			// TODO: replace all ${flagname} by its value in hexa
 			char *newmsg = filterFlags (core, msg);
@@ -723,6 +869,18 @@
 			free (newmsg);
 			}
 			break;
+		case 0:
+			r_cons_newline ();
+			break;
+		default:
+			eprintf ("Usage: ?e[...]\n");
+			eprintf (" e msg       echo message\n");
+			eprintf (" ep N...     echo pie chart\n");
+			eprintf (" eb N...     echo portions bar\n");
+			eprintf (" en msg      echo without newline\n");
+			eprintf (" eg x y      gotoxy\n");
+			eprintf (" es msg      use text-to-speech technology\n");
+			break;
 		}
 		break;
 	case 's': { // "?s" sequence from to step
@@ -878,7 +1036,6 @@
 			r_cons_printf ("%"PFMT64d"\n", core->num->value);
 		}
 		break;
-
 	case '\0': // "?"
 	default:
 		// TODO #7967 help refactor
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_info.c radare2-2.8.0+dfsg/libr/core/cmd_info.c
--- radare2-2.3.0+dfsg/libr/core/cmd_info.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_info.c	2018-08-07 14:12:36.000000000 +0000
@@ -25,7 +25,7 @@
 	"idp", "", "Load pdb file information",
 	"iD", " lang sym", "demangle symbolname for given language",
 	"ie", "", "Entrypoint",
-	"iee", "", "Show Entry and Exit (init and fini)",
+	"iee", "", "Show Entry and Exit (preinit, init and fini)",
 	"iE", "", "Exports (global symbols)",
 	"iE.", "", "Current export",
 	"ih", "", "Headers (alias for iH)",
@@ -38,13 +38,16 @@
 	"im", "", "Show info about predefined memory allocation",
 	"iM", "", "Show main address",
 	"io", " [file]", "Load info from file (or last opened) use bin.baddr",
+	"iO", "[?]", "Perform binary operation (dump, resize, change sections, ...)",
 	"ir", "", "Relocs",
 	"iR", "", "Resources",
 	"is", "", "Symbols",
 	"is.", "", "Current symbol",
 	"iS ", "[entropy,sha1]", "Sections (choose which hash algorithm to use)",
 	"iS.", "", "Current section",
+	"iSS", " [entropy,sha1]", "Segments",
 	"iV", "", "Display file version info",
+	"iX", "", "Display source files used (via dwarf)",
 	"iz|izj", "", "Strings in data sections (in JSON/Base64)",
 	"izz", "", "Search for Strings in the whole binary",
 	"izzz", "", "Dump Strings from whole binary to r2 shell (for huge files)",
@@ -95,6 +98,7 @@
 	case R_BIN_NM_OBJC: res = r_bin_demangle_objc (NULL, s); break;
 	case R_BIN_NM_SWIFT: res = r_bin_demangle_swift (s, core->bin->demanglercmd); break;
 	case R_BIN_NM_DLANG: res = r_bin_demangle_plugin (core->bin, "dlang", s); break;
+	case R_BIN_NM_MSVC: res = r_bin_demangle_msvc (s); break;
 	default:
 		r_bin_demangle_list (core->bin);
 		return true;
@@ -150,7 +154,7 @@
 	if (info) {
 		fn = info->file;
 		if (mode == R_CORE_BIN_JSON) {
-			r_cons_printf ("\"type\":\"%s\"", STR (info->type));
+			r_cons_printf ("\"type\":\"%s\",", STR (info->type));
 		}
 	} else {
 		fn = desc ? desc->name: NULL;
@@ -166,7 +170,7 @@
 		}
 		{
 			char *escapedFile = r_str_utf16_encode (uri, -1);
-			r_cons_printf (",\"file\":\"%s\"", escapedFile);
+			r_cons_printf ("\"file\":\"%s\"", escapedFile);
 			free (escapedFile);
 		}
 		if (dbg) {
@@ -210,11 +214,11 @@
 			dbg = R_IO_WRITE | R_IO_EXEC;
 		}
 		if (desc) {
-			pair ("blksz", sdb_fmt (0, "0x%"PFMT64x, (ut64) core->io->desc->obsz));
+			pair ("blksz", sdb_fmt ("0x%"PFMT64x, (ut64) core->io->desc->obsz));
 		}
-		pair ("block", sdb_fmt (0, "0x%x", core->blocksize));
+		pair ("block", sdb_fmt ("0x%x", core->blocksize));
 		if (desc) {
-			pair ("fd", sdb_fmt (0, "%d", desc->fd));
+			pair ("fd", sdb_fmt ("%d", desc->fd));
 		}
 		if (fn || (desc && desc->uri)) {
 			pair ("file", fn? fn: desc->uri);
@@ -235,7 +239,7 @@
 		if (desc) {
 			ut64 fsz = r_io_desc_size (desc);
 			if (fsz != UT64_MAX) {
-				pair ("size", sdb_fmt (0,"0x%"PFMT64x, fsz));
+				pair ("size", sdb_itoca (fsz));
 				char *humansz = r_num_units (NULL, fsz);
 				if (humansz) {
 					pair ("humansz", humansz);
@@ -271,22 +275,22 @@
 	if (core->file) {
 		if ((mode & R_CORE_BIN_JSON) && !(mode & R_CORE_BIN_ARRAY)) {
 			mode = R_CORE_BIN_JSON;
-			r_cons_printf ("{\"core\":");
+			r_cons_strcat ("{\"core\":");
 		}
 		if ((mode & R_CORE_BIN_JSON) && (mode & R_CORE_BIN_ARRAY)) {
 			mode = R_CORE_BIN_JSON;
 			array = 1;
-			r_cons_printf (",\"core\":");
+			r_cons_strcat (",\"core\":");
 		}
 		r_core_file_info (core, mode);
 		if (bin_is_executable (obj)) {
 			if ((mode & R_CORE_BIN_JSON)) {
-				r_cons_printf (",\"bin\":");
+				r_cons_strcat (",\"bin\":");
 			}
 			r_core_bin_info (core, R_CORE_BIN_ACC_INFO, mode, va, NULL, NULL);
 		}
 		if (mode == R_CORE_BIN_JSON && array == 0) {
-			r_cons_printf ("}\n");
+			r_cons_strcat ("}\n");
 		}
 	} else {
 		eprintf ("No file selected\n");
@@ -327,9 +331,12 @@
 		case 'q': mode = R_CORE_BIN_SIMPLE; break;
 		}
 	}
-
 	if (mode == R_CORE_BIN_JSON) {
-		if (strlen (input + 1) > 1) {
+		int suffix_shift = 0;
+		if (!strncmp (input, "SS", 2) || !strncmp (input, "ee", 2)) {
+			suffix_shift = 1;
+		}
+		if (strlen (input + 1 + suffix_shift) > 1) {
 			is_array = 1;
 		}
 	}
@@ -360,7 +367,7 @@
 			newline = false;
 		}
 		break;
-		case 'k':
+		case 'k': // "ik"
 		{
 			RBinObject *o = r_bin_cur_object (core->bin);
 			db = o? o->kv: NULL;
@@ -405,7 +412,7 @@
 			goto done;
 		}
 		break;
-		case 'o':
+		case 'o': // "io"
 		{
 			if (!desc) {
 				eprintf ("Core file not open\n");
@@ -424,7 +431,7 @@
 				}\
 				if (z) { playMsg (core, n, z);}\
 				r_core_bin_info (core, x, mode, va, NULL, y);
-		case 'A':
+		case 'A': // "iA"
 			newline = false;
 			if (input[1] == 'j') {
 				r_cons_printf ("{");
@@ -434,9 +441,8 @@
 				r_bin_list_archs (core->bin, 1);
 			}
 			break;
-		case 'E': 
+		case 'E': // "iE"
 		{
-			// case for iEj.
 			if (input[1] == 'j' && input[2] == '.') {	
 				mode = R_CORE_BIN_JSON;
 				RBININFO ("exports", R_CORE_BIN_ACC_EXPORTS, input + 2, 0); 
@@ -447,45 +453,67 @@
 			input--;
 			break;
 		}
-		case 'Z': RBININFO ("size", R_CORE_BIN_ACC_SIZE, NULL, 0); break;
-		case 'S':
+		case 'Z': // "iZ"
+			RBININFO ("size", R_CORE_BIN_ACC_SIZE, NULL, 0);
+			break;
+		case 'O': // "iO"
+			switch (input[1]) {
+			case ' ':
+			        r_sys_cmdf ("rabin2 -O \"%s\" \"%s\"", r_str_trim_ro (input + 1), desc->name);
+			        break;
+			default:
+			        r_sys_cmdf ("rabin2 -O help");
+			        break;
+			}
+			return 0;
+		case 'S': // "iS"
 			//we comes from ia or iS
 			if ((input[1] == 'm' && input[2] == 'z') || !input[1]) {
 				RBININFO ("sections", R_CORE_BIN_ACC_SECTIONS, NULL, 0);
-			} else {  //iS entropy,sha1
+			} else if (input[1] == 'S' && !input[2]) {  // "iSS"
+				RBININFO ("segments", R_CORE_BIN_ACC_SEGMENTS, NULL, 0);
+			} else {  //iS/iSS entropy,sha1
+				const char *name = "sections";
+				int action = R_CORE_BIN_ACC_SECTIONS;
+				int param_shift = 0;
+				if (input[1] == 'S') {
+					name = "segments";
+					action = R_CORE_BIN_ACC_SEGMENTS;
+					param_shift = 1;
+				}
 				// case for iSj.
 				if (input[1] == 'j' && input[2] == '.') {
 					mode = R_CORE_BIN_JSON;
 				}
 				RBinObject *obj = r_bin_cur_object (core->bin);
 				if (mode == R_CORE_BIN_RADARE || mode == R_CORE_BIN_JSON || mode == R_CORE_BIN_SIMPLE) {
-					RBININFO ("sections", R_CORE_BIN_ACC_SECTIONS, input + 2,
+					RBININFO (name, action, input + 2 + param_shift,
 						obj? r_list_length (obj->sections): 0);
 				} else {
-					RBININFO ("sections", R_CORE_BIN_ACC_SECTIONS, input + 1,
+					RBININFO (name, action, input + 1 + param_shift,
 						obj? r_list_length (obj->sections): 0);
 				}
-				//we move input until get '\0'
-				while (*(++input)) ;
-				//input-- because we are inside a while that does input++
-				// oob read if not input--
-				input--;
 			}
+			//we move input until get '\0'
+			while (*(++input)) ;
+			//input-- because we are inside a while that does input++
+			// oob read if not input--
+			input--;
 			break;
-		case 'H':
+		case 'H': // "iH"
 			if (input[1] == 'H') { // "iHH"
 				RBININFO ("header", R_CORE_BIN_ACC_HEADER, NULL, -1);
 				break;
 			}
-		case 'h': RBININFO ("fields", R_CORE_BIN_ACC_FIELDS, NULL, 0); break;
-		case 'l':
-			  {
-				  RBinObject *obj = r_bin_cur_object (core->bin);
-				  RBININFO ("libs", R_CORE_BIN_ACC_LIBS, NULL, obj? r_list_length (obj->libs): 0);
-			  }
-			  break;
-		case 'L':
-		{
+		case 'h': // "ih"
+			RBININFO ("fields", R_CORE_BIN_ACC_FIELDS, NULL, 0);
+			break;
+		case 'l': { // "il"
+			RBinObject *obj = r_bin_cur_object (core->bin);
+			RBININFO ("libs", R_CORE_BIN_ACC_LIBS, NULL, obj? r_list_length (obj->libs): 0);
+			break;
+		}
+		case 'L': { // "iL"
 			char *ptr = strchr (input, ' ');
 			int json = input[1] == 'j'? 'j': 0;
 
@@ -498,27 +526,23 @@
 			} else {
 				r_bin_list (core->bin, json);
 			}
-
 			newline = false;
-
 			goto done;
 		}
-		break;
-		case 's':
-			{
-				RBinObject *obj = r_bin_cur_object (core->bin);
-  			// Case for isj.
-				if (input[1] == 'j' && input[2] == '.') {
-					mode = R_CORE_BIN_JSON;
-					RBININFO ("symbols", R_CORE_BIN_ACC_SYMBOLS, input + 2, obj? r_list_length (obj->symbols): 0);
-				} else {
-					RBININFO ("symbols", R_CORE_BIN_ACC_SYMBOLS, input + 1, obj? r_list_length (obj->symbols): 0);
-				}
-				while (*(++input)) ;
-				input--;
-				break;
+		case 's': { // "is"
+			RBinObject *obj = r_bin_cur_object (core->bin);
+			// Case for isj.
+			if (input[1] == 'j' && input[2] == '.') {
+				mode = R_CORE_BIN_JSON;
+				RBININFO ("symbols", R_CORE_BIN_ACC_SYMBOLS, input + 2, obj? r_list_length (obj->symbols): 0);
+			} else {
+				RBININFO ("symbols", R_CORE_BIN_ACC_SYMBOLS, input + 1, obj? r_list_length (obj->symbols): 0);
 			}
-		case 'R':
+			while (*(++input)) ;
+			input--;
+			break;
+		}
+		case 'R': // "iR"
 			if  (input[1] == '*') {
 				mode = R_CORE_BIN_RADARE;
 			} else if (input[1] == 'j') {
@@ -526,7 +550,12 @@
 			}
 			RBININFO ("resources", R_CORE_BIN_ACC_RESOURCES, NULL, 0);
 			break;
-		case 'r': RBININFO ("relocs", R_CORE_BIN_ACC_RELOCS, NULL, 0); break;
+		case 'r': // "ir"
+			RBININFO ("relocs", R_CORE_BIN_ACC_RELOCS, NULL, 0);
+			break;
+		case 'X': // "iX"
+			RBININFO ("source", R_CORE_BIN_ACC_SOURCE, NULL, 0);
+			break;
 		case 'd': // "id"
 			if (input[1] == 'p') { // "idp"
 				SPDBOptions pdbopts;
@@ -546,6 +575,7 @@
 					pdbopts.user_agent = (char*) r_config_get (core->config, "pdb.useragent");
 					pdbopts.symbol_server = (char*) r_config_get (core->config, "pdb.server");
 					pdbopts.extract = r_config_get_i (core->config, "pdb.extract");
+					pdbopts.symbol_store_path = (char*) r_config_get (core->config, "pdb.symstore");
 					int r = r_bin_pdb_download (core, 0, NULL, &pdbopts);
 					if (r > 0) {
 						eprintf ("Error while downloading pdb file");
@@ -584,10 +614,24 @@
 								filename = strdup (basename);
 							}
 						}
+
+						// Last chance: Check if file is in downstream symbol store
+						if (!file_found) {
+							const char* symstore_path = r_config_get (core->config, "pdb.symstore");
+							char* pdb_path = r_str_newf ("%s" R_SYS_DIR "%s" R_SYS_DIR "%s" R_SYS_DIR "%s",
+										     symstore_path, info->debug_file_name,
+										     info->guid, info->debug_file_name);
+							file_found = r_file_exists (pdb_path);
+							if (file_found) {
+								filename = pdb_path;
+							} else {
+								R_FREE(pdb_path);
+							}
+						}
 					}
 
 					if (!file_found) {
-						eprintf ("File '%s' not found", filename);
+						eprintf ("File '%s' not found in file directory or symbol store", info->debug_file_name);
 						free (filename);
 						break;
 					}
@@ -597,16 +641,7 @@
 					} else {
 						eprintf ("Warning: Cannot find base address, flags will probably be misplaced\n");
 					}
-					void *res = r_core_file_open (core, filename, R_IO_READ, baddr);
-					if (!res) {
-						eprintf ("Error while opening '%s'", filename);
-						break;
-					}
-					int fd = r_io_fd_get_current (core->io);
-					r_core_bin_load (core, filename, baddr);
-					RCoreBinFilter filter = { 0 };
-					r_core_bin_info (core, R_CORE_BIN_ACC_PDB, mode, true, &filter, NULL);
-					r_core_file_close_fd (core, fd);
+					r_core_pdb_info (core, filename, baddr, mode);
 					free (filename);
 					break;
 				case '?':
@@ -623,26 +658,36 @@
 				RBININFO ("dwarf", R_CORE_BIN_ACC_DWARF, NULL, -1);
 			}
 			break;
-		case 'i': {
-				  RBinObject *obj = r_bin_cur_object (core->bin);
-				  RBININFO ("imports", R_CORE_BIN_ACC_IMPORTS, NULL,
-						  obj? r_list_length (obj->imports): 0);
-			  }
-			  break;
-		case 'I': RBININFO ("info", R_CORE_BIN_ACC_INFO, NULL, 0); break;
-		case 'e':
-			  if (input[1] == 'e') {
-				  RBININFO ("entries", R_CORE_BIN_ACC_INITFINI, NULL, 0);
-				  input++;
-			  } else {
-				  RBININFO ("entries", R_CORE_BIN_ACC_ENTRIES, NULL, 0);
-			  }
-			break;
-		case 'M': RBININFO ("main", R_CORE_BIN_ACC_MAIN, NULL, 0); break;
-		case 'm': RBININFO ("memory", R_CORE_BIN_ACC_MEM, NULL, 0); break;
-		case 'V': RBININFO ("versioninfo", R_CORE_BIN_ACC_VERSIONINFO, NULL, 0); break;
-		case 'C': RBININFO ("signature", R_CORE_BIN_ACC_SIGNATURE, NULL, 0); break;
-		case 'z':
+		case 'i': { // "ii"
+			RBinObject *obj = r_bin_cur_object (core->bin);
+			RBININFO ("imports", R_CORE_BIN_ACC_IMPORTS, NULL,
+				obj? r_list_length (obj->imports): 0);
+			break;
+		}
+		case 'I': // "iI"
+			RBININFO ("info", R_CORE_BIN_ACC_INFO, NULL, 0);
+			break;
+		case 'e': // "ie"
+			if (input[1] == 'e') {
+				RBININFO ("initfini", R_CORE_BIN_ACC_INITFINI, NULL, 0);
+				input++;
+			} else {
+				RBININFO ("entries", R_CORE_BIN_ACC_ENTRIES, NULL, 0);
+			}
+			break;
+		case 'M': // "iM"
+			RBININFO ("main", R_CORE_BIN_ACC_MAIN, NULL, 0);
+			break;
+		case 'm': // "im"
+			RBININFO ("memory", R_CORE_BIN_ACC_MEM, NULL, 0);
+			break;
+		case 'V': // "iV"
+			RBININFO ("versioninfo", R_CORE_BIN_ACC_VERSIONINFO, NULL, 0);
+			break;
+		case 'C': // "iC"
+			RBININFO ("signature", R_CORE_BIN_ACC_SIGNATURE, NULL, 0);
+			break;
+		case 'z': // "iz"
 			if (input[1] == '-') { //iz-
 				char *strpurge = core->bin->strpurge;
 				ut64 addr = core->offset;
@@ -691,11 +736,8 @@
 					RBinFile *bf = r_core_bin_cur (core);
 					int min = r_config_get_i (core->config, "bin.minstr");
 					if (bf) {
-						int tmp = bf->rawstr;
-						bf->rawstr = 2;
 						bf->strmode = mode;
-						r_bin_dump_strings (bf, min);
-						bf->rawstr = tmp;
+						r_bin_dump_strings (bf, min, 2);
 					}
 					goto done;
 				}
@@ -714,7 +756,7 @@
 				}
 			}
 			break;
-		case 'c': // for r2 `ic`
+		case 'c': // "ic"
 			if (input[1] == '?') {
 				eprintf ("Usage: ic[ljqc*] [class-index or name]\n");
 			} else if (input[1] == ' ' || input[1] == 'q' || input[1] == 'j' || input[1] == 'l' || input[1] == 'c') {
@@ -816,12 +858,12 @@
 				RBININFO ("classes", R_CORE_BIN_ACC_CLASSES, NULL, len);
 			}
 			break;
-		case 'D':
+		case 'D': // "iD"
 			if (input[1] != ' ' || !demangle (core, input + 2)) {
 				eprintf ("|Usage: iD lang symbolname\n");
 			}
 			return 0;
-		case 'a':
+		case 'a': // "ia"
 			switch (mode) {
 			case R_CORE_BIN_RADARE: cmd_info (core, "IieEcsSmz*"); break;
 			case R_CORE_BIN_JSON: cmd_info (core, "IieEcsSmzj"); break;
@@ -829,17 +871,17 @@
 			default: cmd_info (core, "IiEecsSmz"); break;
 			}
 			break;
-		case '?':
+		case '?': // "i?"
 			r_core_cmd_help (core, help_msg_i);
-			goto done;
-		case '*':
+			goto redone;
+		case '*': // "i*"
 			mode = R_CORE_BIN_RADARE;
 			goto done;
-		case 'q':
+		case 'q': // "iq"
 			mode = R_CORE_BIN_SIMPLE;
 			cmd_info_bin (core, va, mode);
 			goto done;
-		case 'j':
+		case 'j': // "ij"
 			mode = R_CORE_BIN_JSON;
 			if (is_array > 1) {
 				mode |= R_CORE_BIN_ARRAY;
@@ -867,5 +909,6 @@
 	if (newline) {
 		r_cons_newline ();
 	}
+redone:
 	return 0;
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_log.c radare2-2.8.0+dfsg/libr/core/cmd_log.c
--- radare2-2.3.0+dfsg/libr/core/cmd_log.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_log.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,35 +1,39 @@
-/* radare - LGPL - Copyright 2009-2014 - pancake */
-#include <string.h>
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
+#include <string.h>
 #include "r_config.h"
 #include "r_cons.h"
 #include "r_core.h"
 
 // TODO #7967 help refactor: move to another place
 static const char *help_msg_L[] = {
-	"Usage:", "L", "[-name][ file] # see oL, iL, dL, ...",
-	"L", "", "List all plugins loaded by RCore.lib",
-	"L-", "duk", "Unload plugin matching in filename",
-	"L", " blah."R_LIB_EXT, "Load plugin file",
-	"Ls", "", "list RCore plugins",
-	"Ls", " java", "run RCore java plugin",
+	"Usage:", "L[acio]", "[-name][ file]",
+	"L",  "", "show this help",
+	"L", " blah."R_LIB_EXT, "load plugin file",
+	"L-", "duk", "unload core plugin by name",
+	"La", "", "list asm/anal plugins (aL, e asm.arch=" "??" ")",
+	"Lc", "", "list core plugins",
+	"Ld", "", "list debug plugins (same as dL)",
+	"Lh", "", "list hash plugins (same as ph)",
+	"Li", "", "list bin plugins (same as iL)",
+	"Lo", "", "list io plugins (same as oL)",
 	NULL
 };
 
 static const char *help_msg_T[] = {
 	"Usage:", "T", "[-][ num|msg]",
-	"T", "", "List all Text log messages",
-	"T", " message", "Add new log message",
-	"T", " 123", "List log from 123",
-	"T", " 10 3", "List 3 log messages starting from 10",
-	"T*", "", "List in radare commands",
-	"T-", "", "Delete all logs",
-	"T-", " 123", "Delete logs before 123",
-	"Tl", "", "Get last log message id",
-	"Tj", "", "List in json format",
-	"Tm", " [idx]", "Display log messages without index",
-	"Ts", "", "List files in current directory (see pwd, cd)",
-	"TT", "", "Enter into the text log chat console",
+	"T", "", "list all Text log messages",
+	"T", " message", "add new log message",
+	"T", " 123", "list log from 123",
+	"T", " 10 3", "list 3 log messages starting from 10",
+	"T*", "", "list in radare commands",
+	"T-", "", "delete all logs",
+	"T-", " 123", "delete logs before 123",
+	"Tl", "", "get last log message id",
+	"Tj", "", "list in json format",
+	"Tm", " [idx]", "display log messages without index",
+	"Ts", "", "list files in current directory (see pwd, cd)",
+	"TT", "", "enter into the text log chat console",
 	NULL
 };
 
@@ -44,7 +48,7 @@
 	char buf[1024];
 	int lastmsg = 0;
 	const char *me = r_config_get (core->config, "cfg.user");
-	char msg[1024];
+	char msg[2048];
 
 	eprintf ("Type '/help' for commands:\n");
 	snprintf (prompt, sizeof (prompt) - 1, "[%s]> ", me);
@@ -83,7 +87,7 @@
 		} else if (*buf == '/') {
 			eprintf ("Unknown command: %s\n", buf);
 		} else {
-			snprintf (msg, sizeof (msg) - 1, "[%s] %s", me, buf);
+			snprintf (msg, sizeof (msg), "[%s] %s", me, buf);
 			r_core_log_add (core, msg);
 		}
 	}
@@ -164,7 +168,8 @@
 	RCore *core = (RCore *) data;
 	switch (input[0]) {
 	case 0:
-		r_lib_list (core->lib);
+		r_core_cmd_help (core, help_msg_L);
+		// return r_core_cmd0 (core, "Lc");
 		break;
 	case '-':
 		r_lib_close (core->lib, input + 2);
@@ -175,17 +180,46 @@
 	case '?':
 		r_core_cmd_help (core, help_msg_L);
 		break;
-		case 's':
-		if (input[1]) {
-			return r_core_cmd0 (core, input + 2);
-		} else {
-			RListIter *iter;
-			RCorePlugin *cp;
+	case 'd': // "Ld"
+		r_core_cmd0 (core, "dL"); // rahash2 -L is more verbose
+		break;
+	case 'h': // "Lh"
+		r_core_cmd0 (core, "ph"); // rahash2 -L is more verbose
+		break;
+	case 'a': // "La"
+		r_core_cmd0 (core, "e asm.arch=??");
+		break;
+	case 'o': // "Lo"
+	case 'i': // "Li"
+		r_core_cmdf (core, "%cL", input[0]);
+		break;
+	case 'c': { // "Lc"
+		RListIter *iter;
+		RCorePlugin *cp;
+		switch (input[1]) {
+		case 'j': {
+			r_cons_printf ("[");
+			bool is_first_element = true;
+			r_list_foreach (core->rcmd->plist, iter, cp) {
+				r_cons_printf ("%s{\"Name\":\"%s\",\"Description\":\"%s\"}",
+					is_first_element? "" : ",", cp->name, cp->desc);
+				is_first_element = false;
+			}
+			r_cons_printf ("]\n");
+			break;
+			}
+		case 0:
+			r_lib_list (core->lib);
 			r_list_foreach (core->rcmd->plist, iter, cp) {
 				r_cons_printf ("%s: %s\n", cp->name, cp->desc);
 			}
-		}
 			break;
+		default:
+			eprintf ("oops\n");
+			break;
+		}
+		}
+		break;
 	}
 	return 0;
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_magic.c radare2-2.8.0+dfsg/libr/core/cmd_magic.c
--- radare2-2.3.0+dfsg/libr/core/cmd_magic.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_magic.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,18 +1,18 @@
-/* radare - LGPL - Copyright 2009-2015 - pancake */
-#include <stddef.h>
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
-#include "r_config.h"
-#include "r_cons.h"
 #include "r_core.h"
-#include "r_magic.h"
-#include "r_types.h"
 
 /* ugly global vars */
 static int magicdepth = 99; //XXX: do not use global var here
 static RMagic *ck = NULL; // XXX: Use RCore->magic
 static char *ofile = NULL;
+static int kw_count = 0;
 
-static int r_core_magic_at(RCore *core, const char *file, ut64 addr, int depth, int v) {
+static void r_core_magic_reset(RCore *core) {
+	kw_count = 0;
+}
+
+static int r_core_magic_at(RCore *core, const char *file, ut64 addr, int depth, int v, bool json) {
 	const char *fmt;
 	char *q, *p;
 	const char *str;
@@ -42,7 +42,9 @@
 		}
 	}
 	if (((addr&7)==0) && ((addr&(7<<8))==0))
-		eprintf ("0x%08"PFMT64x"\r", addr);
+		if (!json) {
+			eprintf ("0x%08"PFMT64x"\r", addr);
+		}
 	if (file) {
 		if (*file == ' ') file++;
 		if (!*file) file = NULL;
@@ -53,7 +55,7 @@
 			ck = NULL;
 		}
 	}
-	if (ck==NULL) {
+	if (!ck) {
 		// TODO: Move RMagic into RCore
 		r_magic_free (ck);
 		// allocate once
@@ -79,12 +81,12 @@
 	}
 //repeat:
 	//if (v) r_cons_printf ("  %d # pm %s @ 0x%"PFMT64x"\n", depth, file? file: "", addr);
-	if (delta+2>core->blocksize) {
+	if (delta + 2 > core->blocksize) {
 		eprintf ("EOB\n");
 		ret = -1;
 		goto seek_exit;
 	}
-	str = r_magic_buffer (ck, core->block+delta, core->blocksize-delta);
+	str = r_magic_buffer (ck, core->block+delta, core->blocksize - delta);
 	if (str) {
 		const char *cmdhit;
 #if USE_LIB_MAGIC
@@ -93,7 +95,9 @@
 		if (!v && (!strcmp (str, "data"))) {
 #endif
 			int mod = core->search->align;
-			if (mod<1) mod = 1;
+			if (mod < 1) {
+				mod = 1;
+			}
 			//r_magic_free (ck);
 			//ck = NULL;
 			//return -1;
@@ -106,33 +110,49 @@
 		for (q=p; *q; q++) {
 			if (q[0]=='\\' && q[1]=='n') {
 				*q = '\n';
-				strcpy (q+1, q+((q[2]==' ')? 3: 2));
+				strcpy (q + 1, q + ((q[2] == ' ')? 3: 2));
 			}
 		}
 		cmdhit = r_config_get (core->config, "cmd.hit");
 		if (cmdhit && *cmdhit) {
 			r_core_cmd0 (core, cmdhit);
 		}
+		{
+			const char *searchprefix = r_config_get (core->config, "search.prefix");
+			const char *flag = sdb_fmt ("%s%d_%d", searchprefix, 0, kw_count++);
+			r_flag_set (core->flags, flag, addr + adelta, 1);
+		}
 		// TODO: This must be a callback .. move this into RSearch?
-		r_cons_printf ("0x%08"PFMT64x" %d %s\n", addr + adelta, magicdepth-depth, p);
+		if (!json) {
+			r_cons_printf ("0x%08"PFMT64x" %d %s\n", addr + adelta, magicdepth-depth, p);
+		} else {
+			if (found >= 1) {
+				r_cons_printf (",");
+			}
+			r_cons_printf ("{\"offset\":%"PFMT64d ",\"depth\":%d,\"info\":\"%s\"}",
+					addr + adelta, magicdepth-depth, p);
+		}
 		r_cons_clear_line (1);
-		eprintf ("0x%08"PFMT64x" 0x%08"PFMT64x" %d %s\n",
-			addr+adelta, addr+adelta, magicdepth-depth, p);
+		//eprintf ("0x%08"PFMT64x" 0x%08"PFMT64x" %d %s\n", addr+adelta, addr+adelta, magicdepth-depth, p);
 		// walking children
-		for (q=p; *q; q++) {
+		for (q = p; *q; q++) {
 			switch (*q) {
 			case ' ':
-				fmt = q+1;
+				fmt = q + 1;
 				break;
 			case '@':
 				{
 					ut64 addr = 0LL;
 					*q = 0;
-					if (!memcmp (q+1, "0x", 2))
-						sscanf (q+3, "%"PFMT64x, &addr);
-					else sscanf (q+1, "%"PFMT64d, &addr);
-					if (!fmt || !*fmt) fmt = file;
-					r_core_magic_at (core, fmt, addr, depth, 1);
+					if (!strncmp (q + 1, "0x", 2)) {
+						sscanf (q + 3, "%"PFMT64x, &addr);
+					} else {
+						sscanf (q + 1, "%"PFMT64d, &addr);
+					}
+					if (!fmt || !*fmt) {
+						fmt = file;
+					}
+					r_core_magic_at (core, fmt, addr, depth, 1, json);
 					*q = '@';
 				}
 				break;
@@ -172,7 +192,8 @@
 static void r_core_magic(RCore *core, const char *file, int v) {
 	ut64 addr = core->offset;
 	magicdepth = r_config_get_i (core->config, "magic.depth"); // TODO: do not use global var here
-	r_core_magic_at (core, file, addr, magicdepth, v);
-	if (addr != core->offset)
+	r_core_magic_at (core, file, addr, magicdepth, v, false);
+	if (addr != core->offset) {
 		r_core_seek (core, addr, true);
+	}
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_meta.c radare2-2.8.0+dfsg/libr/core/cmd_meta.c
--- radare2-2.3.0+dfsg/libr/core/cmd_meta.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_meta.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2009-2017 - pancake */
+/* radare2 - LGPL - Copyright 2009-2018 - pancake */
 
 #include "r_anal.h"
 #include "r_bin.h"
@@ -12,12 +12,13 @@
 	"Usage:", "C[-LCvsdfm*?][*?] [...]", " # Metadata management",
 	"C", "", "list meta info in human friendly form",
 	"C*", "", "list meta info in r2 commands",
-	"C[Chsdmf]", "", "list comments/hidden/strings/data/magic/formatted in human friendly form",
-	"C[Chsdmf]*", "", "list comments/hidden/strings/data/magic/formatted in r2 commands",
+	"C[Cthsdmf]", "", "list comments/types/hidden/strings/data/magic/formatted in human friendly form",
+	"C[Cthsdmf]*", "", "list comments/types/hidden/strings/data/magic/formatted in r2 commands",
 	"C-", " [len] [[@]addr]", "delete metadata at given address range",
 	"CL", "[-][*] [file:line] [addr]", "show or add 'code line' information (bininfo)",
 	"CS", "[-][space]", "manage meta-spaces to filter comments, etc..",
 	"CC", "[?] [-] [comment-text] [@addr]", "add/remove comment",
+	"Ct", "[?] [-] [comment-text] [@addr]", "add/remove type analysis comment",
 	"CC.", "[addr]", "show comment in current address",
 	"CC!", " [@addr]", "edit comment with $EDITOR",
 	"CCa", "[-at]|[at] [text] [@addr]", "add/remove comment at given address",
@@ -27,6 +28,7 @@
 	"Cz", "[@addr]", "add string (see Cs?)",
 	"Ch", "[-] [size] [@addr]", "hide data",
 	"Cd", "[-] [size] [repeat] [@addr]", "hexdump data array (Cd 4 10 == dword [10])",
+	"Cd.", " [@addr]", "show size of data at current address",
 	"Cf", "[?][-] [sz] [0|cnt][fmt] [a0 a1...] [@addr]", "format memory (see pf?)",
 	"CF", "[sz] [fcn-sign..] [@addr]", "function signature",
 	"Cm", "[-] [sz] [fmt..] [@addr]", "magic parse (see pm?)",
@@ -517,7 +519,7 @@
 	return true;
 }
 
-static int cmd_meta_hsdmf(RCore *core, const char *input) {
+static int cmd_meta_others(RCore *core, const char *input) {
 	int n, type = input[0], subtype;
 	char *t = 0, *p, *p2, name[256];
 	int repeat = 1;
@@ -628,7 +630,7 @@
 			case 0:  /* temporary legacy workaround */
 				esc_bslash = false;
 			default:
-				esc_str = r_str_escape_latin1 (mi.str, false, esc_bslash);
+				esc_str = r_str_escape_latin1 (mi.str, false, esc_bslash, false);
 			}
 			if (esc_str) {
 				r_cons_printf ("\"%s\"\n", esc_str);
@@ -636,6 +638,8 @@
 			} else {
 				r_cons_println ("<oom>");
 			}
+		} else if (type == 'd') {
+			r_cons_printf ("%"PFMT64u"\n", mi.size);
 		} else {
 			r_cons_println (mi.str);
 		}
@@ -703,11 +707,11 @@
 					char tmp[256] = R_EMPTY;
 					int i, j, name_len = 0;
 					if (input[1] == 'a' || input[1] == '8') {
-						(void)r_core_read_at (core, addr, (ut8*)name, sizeof (name) - 1);
+						(void)r_io_read_at (core->io, addr, (ut8*)name, sizeof (name) - 1);
 						name[sizeof (name) - 1] = '\0';
 						name_len = strlen (name);
 					} else {
-						(void)r_core_read_at (core, addr, (ut8*)tmp, sizeof (tmp) - 3);
+						(void)r_io_read_at (core->io, addr, (ut8*)tmp, sizeof (tmp) - 3);
 						name_len = r_str_nlen_w (tmp, sizeof (tmp) - 3);
 						//handle wide strings
 						for (i = 0, j = 0; i < sizeof (name); i++, j++) {
@@ -852,7 +856,7 @@
 				comment = heap_comment;
 			}
 		}
-		var = r_anal_var_get_byname (core->anal, fcn, name);
+		var = r_anal_var_get_byname (core->anal, fcn->addr, name);
 		if (var) {
 			idx = var->delta;
 		} else if (!strncmp (name, "0x", 2))  {
@@ -885,7 +889,7 @@
 		}
 		break;
 	case '-':
-		var = r_anal_var_get_byname (core->anal,fcn, name);
+		var = r_anal_var_get_byname (core->anal, fcn->addr, name);
 		if (var) {
 			idx = var->delta;
 		} else if (!strncmp (name, "0x", 2)) {
@@ -906,7 +910,7 @@
 		break;
 	case '!': {
 		char *comment;
-		var = r_anal_var_get_byname (core->anal,fcn, name);
+		var = r_anal_var_get_byname (core->anal, fcn->addr, name);
 		if (!var) {
 			eprintf ("cant find variable named `%s`\n",name);
 			break;
@@ -953,7 +957,8 @@
 	case 'd': /* "Cd" data */
 	case 'm': /* Cm magic */
 	case 'f': /* Cf formatted */
-		cmd_meta_hsdmf (core, input);
+	case 't': /* Ct type analysis commnets */
+		cmd_meta_others (core, input);
 		break;
 	case '-':
 		if (input[1] != '*') {
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_mount.c radare2-2.8.0+dfsg/libr/core/cmd_mount.c
--- radare2-2.3.0+dfsg/libr/core/cmd_mount.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_mount.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,9 @@
-/* radare - LGPL - Copyright 2009-2017 // pancake */
+/* radare - LGPL - Copyright 2009-2018 // pancake */
+
+#define ms_argc (sizeof (ms_argv)/sizeof(const char*))
+static const char *ms_argv[] = {
+	"?", "!", "ls", "cd", "cat", "get", "mount", "help", "q", "exit", NULL
+};
 
 static const char *help_msg_m[] = {
 	"Usage:", "m[-?*dgy] [...] ", "Mountpoints management",
@@ -38,6 +43,97 @@
 	return r_syscmd_mv (input)? 1: 0;
 }
 
+static char *cwd = NULL;
+static char * av[1024] = {NULL};
+#define av_max 1024
+
+static char **getFilesFor(RLine *line, const char *path, int *ac) {
+	RCore *core = line->user;
+	RFS *fs = core->fs;
+	RListIter *iter;
+	RFSFile *file;
+	char *full_path;
+	char *lpath = strdup (path);
+	
+	if (!lpath) {
+		return NULL;
+	}
+
+	r_str_trim_head (lpath);
+	if (lpath[0] != '/') {
+		full_path = r_str_newf ("%s/%s", cwd, lpath);
+	} else {
+		full_path = strdup (lpath);
+	}
+	free (lpath);
+
+	//eprintf ("autocompleting for path '%s'\n", full_path);
+
+	RList *list = r_fs_dir (fs, full_path);
+	int count = 0;
+	if (list) {
+		r_list_foreach (list, iter, file) {
+			eprintf ("==> %c %s\n", file->type, file->name);
+			if (count >= av_max) {
+				break;
+			}
+			av[count++] = file->name;
+		}
+		r_list_free (list);
+	}
+	// autocomplete mountpoints
+	// mountpoints if any
+	RFSRoot *r;
+	char *me = strdup (full_path);
+	r_list_foreach (fs->roots, iter, r) {
+		char *base = strdup (r->path);
+		char *ls = (char *) r_str_lchr (base, '/');
+		if (ls) {
+			ls++;
+			*ls = 0;
+		}
+		// TODO: adjust contents between //
+		if (!strcmp (me, base)) {
+			//eprintf ("m %s\n", (r->path && r->path[0]) ? r->path + 1: "");
+			if (count >= av_max) {
+				break;
+			}
+			av[count++] = r->path;
+		}
+		free (base);
+	}
+	free (me);
+	free (full_path);
+	av[count] = NULL;
+	if (ac) {
+		*ac = count;
+	}
+	av[3] = NULL;
+	return av;
+}
+
+static int ms_autocomplete(RLine *line) {
+	const char *data = line->buffer.data;
+	line->completion.argc = ms_argc;
+	line->completion.argv = ms_argv;
+	if (!strncmp (data, "ls ", 3)
+		|| !strncmp (data, "cd ", 3)
+		|| !strncmp (data, "cat ", 4)
+	 	|| !strncmp (data, "get ", 4)) {
+		const char *file = strchr (data, ' ');
+		if (file++) {
+			//eprintf ("FILE (%s)\n", file);
+			int tmp_argc = 0;
+			// TODO: handle abs vs rel
+			char **tmp_argv = getFilesFor (line, file, &tmp_argc);
+			line->completion.argc = tmp_argc;
+			line->completion.argv = (const char **)tmp_argv;
+		}
+		return true;
+	}
+	return false;
+}
+
 static int cmd_mount(void *data, const char *_input) {
 	ut64 off = 0;
 	char *input, *oinput, *ptr, *ptr2;
@@ -101,7 +197,8 @@
 				root->p->name, root->delta, root->path);
 		}
 		break;
-	case 'l': // list of plugins
+	case 'L': // "ml" list of plugins .. should be mL
+	case 'l': // "ml" list of plugins .. should be mL
 		r_list_foreach (core->fs->plugins, iter, plug) {
 			r_cons_printf ("%10s  %s\n", plug->name, plug->desc);
 		}
@@ -260,10 +357,27 @@
 			return false;
 		}
 		input++;
-		if (input[0]==' ') {
+		if (input[0] == ' ') {
 			input++;
 		}
-		r_fs_prompt (core->fs, input);
+		r_cons_set_raw (false);
+		{
+			RFSShell shell = {
+				.cwd = &cwd,
+				.set_prompt = r_line_set_prompt,
+				.readline = r_line_readline,
+				.hist_add = r_line_hist_add
+			};
+			RLine *rli = r_line_singleton ();
+			RLineCompletion c;
+			memcpy (&c, &rli->completion, sizeof (c));
+			rli->completion.run = ms_autocomplete;
+			rli->completion.argc = ms_argc;
+			rli->completion.argv = ms_argv;
+			r_fs_shell_prompt (&shell, core->fs, input);
+			free (cwd);
+			memcpy (&rli->completion, &c, sizeof (c));
+		}
 		break;
 	case 'y':
 		eprintf ("TODO\n");
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_open.c radare2-2.8.0+dfsg/libr/core/cmd_open.c
--- radare2-2.3.0+dfsg/libr/core/cmd_open.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_open.c	2018-08-07 14:12:36.000000000 +0000
@@ -10,7 +10,6 @@
 static const char *help_msg_o[] = {
 	"Usage: o","[com- ] [file] ([offset])","",
 	"o","","list opened files",
-	"o"," 4","Switch to open file on fd 4",
 	"o","-1","close file descriptor 1",
 	"o-","!*","close all opened files",
 	"o--","","close all files, analysis, binfiles, flags, same as !r2 --",
@@ -63,16 +62,18 @@
 	"Usage:", "ob", " # List open binary files backed by fd",
 	"ob", "", "List opened binary files and objid",
 	"ob*", "", "List opened binary files and objid (r2 commands)",
+// those 3 commands are VERY SIMILAR, need love
 	"ob", " [fd objid]", "Switch to open binary file by fd number and objid",
+	"obo", " [objid]", "Switch to open binary file by objid",
+	"obb", " [fd]", "Switch to open binfile by fd number",
+
 	"oba", " [addr]", "Open bin info from the given address",
 	"oba", " [addr] [filename]", "Open file and load bin info at given address",
-	"obb", " [fd]", "Switch to open binfile by fd number",
 	"obf", " ([file])", "Load bininfo for current file (useful for r2 -n)",
 	"obj", "", "List opened binary files and objid (JSON format)",
 	"obr", " [baddr]", "Rebase current bin object",
 	"ob-", "[objid]", "Delete binfile by binobjid",
 	"ob-", "*", "Delete all binfiles",
-	"obo", " [objid]", "Switch to open binary file by objid",
 	NULL
 };
 
@@ -93,14 +94,17 @@
 	"om", " fd vaddr [size] [paddr] [rwx] [name]", "create new io map",
 	"omm"," [fd]", "create default map for given fd. (omm `oq`)",
 	"om.", "", "show map, that is mapped to current offset",
-	"omn", " mapid [name]", "set/delete name for map with mapid",
+	"omn", " mapaddr [name]", "set/delete name for map which spans mapaddr",
+	"omni", " mapid [name]", "set/delete name for map with mapid",
 	"omn.", "([-|name])", "show/set/delete name for current map",
 	"omf", " [mapid] rwx", "change flags/perms for current/given map",
 	"omfg", "[+-]rwx", "change flags/perms for all maps (global)",
 	"omb", " mapid addr", "relocate map with corresponding id",
 	"omb.", " addr", "relocate current map",
 	"omr", " mapid newsize", "resize map with corresponding id",
+	"omo", " fd", "map the given fd with lowest priority",
 	"omp", " mapid", "prioritize map with corresponding id",
+	"ompd", " mapid", "deprioritize map with corresponding id",
 	"ompf", "[fd]", "prioritize map by fd",
 	"ompb", " binid", "prioritize maps of mapped bin with binid",
 	"omps", " sectionid", "prioritize maps of mapped section with sectionid",
@@ -122,28 +126,28 @@
 };
 
 static const char *help_msg_oo_plus[] = {
-	"oo+", "", "reopen in read-write",
+	"Usage:", "oo+", " # reopen in read-write",
 	NULL
 };
 
 static const char *help_msg_oob[] = {
-	"oob", "", "reopen loading rbin info",
+	"Usage:", "oob", " # reopen loading rbin info",
 	NULL
 };
 
 static const char *help_msg_ood[] = {
-	"ood"," [args]","reopen in debugger mode (with args)",
+	"Usage:", "ood [args]", " # reopen in debugger mode (with args)",
 	"oodr"," [rarun2]","same as dor ..;ood",
 	NULL
 };
 
 static const char *help_msg_oon[] = {
-	"oon", "", "reopen without loading rbin info",
+	"Usage:", "oon", " # reopen without loading rbin info",
 	NULL
 };
 
 static const char *help_msg_oonn[] = {
-	"oonn", "", "reopen without loading rbin info, but with header flags",
+	"Usage:", "oonn", " # reopen without loading rbin info, but with header flags",
 	NULL
 };
 
@@ -321,7 +325,11 @@
 	case 'b': // "obb"
 		{
 			ut32 fd;
-			value = *(input + 3) ? input + 3 : NULL;
+			if (input[2] && input[3]) {
+				value = *(input + 3) ? input + 3 : NULL;
+			} else {
+				value = NULL;
+			}
 			if (!value) {
 				eprintf ("Invalid fd number.");
 				break;
@@ -374,10 +382,12 @@
 		r_core_cmd0 (core, ".is*");
 		break;
 	case 'f':
-		// TODO: specify path to file?
-		r_core_bin_load (core, NULL, UT64_MAX);
-		value = input[2] ? input + 2 : NULL;
-		// r2_obf (core, value);
+		if (input[2] == ' ') {
+			r_core_cmdf (core, "oba 0 %s", input + 3);
+		} else {
+			r_core_bin_load (core, NULL, UT64_MAX);
+			value = input[2] ? input + 2 : NULL;
+		}
 		break;
 	case 'o': // "obo"
 		value = input[2] ? input + 2 : NULL;
@@ -537,6 +547,7 @@
 static void cmd_open_map(RCore *core, const char *input) {
 	ut64 fd = 0LL;
 	ut32 id = 0;
+	ut64 addr = 0;
 	char *s = NULL, *p = NULL, *q = NULL;
 	ut64 new;
 	RIOMap *map = NULL;
@@ -582,8 +593,24 @@
 			}
 		}
 		break;
+	case 'o': // "omo"
+		if (input[2] == ' ') {
+			r_core_cmdf (core, "om %s 0x%08" PFMT64x " $s r omo", input + 2);
+		} else {
+			r_core_cmd0 (core, "om `oq.` $B $s r");
+		}
+		r_core_cmd0 (core, "ompd `omq.`");
+		break;
 	case 'p':
 		switch (input[2]) {
+		case 'd': // "ompf"
+			id = r_num_math (core->num, input + 3);		//mapid
+			if (r_io_map_exists_for_id (core->io, id)) {
+				r_io_map_depriorize (core->io, id);
+			} else {
+				eprintf ("Cannot find any map with mapid %d\n", id);
+			}
+			break;
 		case 'f': // "ompf"
 			fd = r_num_math (core->num, input + 3);
 			if (!r_io_map_priorize_for_fd (core->io, (int)fd)) {
@@ -678,10 +705,13 @@
 				}
 			}
 		} else {
-			if (!(s = strdup (&input[2]))) {
+			bool use_id = (input[2] == 'i') ? true : false;
+			s = strdup ( use_id ? &input[3] : &input[2]);
+			if (!s) {
 				break;
 			}
 			p = s;
+
 			while (*s == ' ') {
 				s++;
 			}
@@ -690,16 +720,26 @@
 				break;
 			}
 			if (!(q = strchr (s, ' '))) {
-				id = (ut32)r_num_math (core->num, s);
-				map = r_io_map_get (core->io, id);
+				if (use_id) {
+					id = (ut32)r_num_math (core->num, s);
+					map = r_io_map_resolve (core->io, id);
+				} else {
+					addr = r_num_math (core->num, s);
+					map = r_io_map_get (core->io, addr);
+				}
 				r_io_map_del_name (map);
 				s = p;
 				break;
 			}
 			*q = '\0';
 			q++;
-			id = (ut32)r_num_math (core->num, s);
-			map = r_io_map_get (core->io, id);
+			if (use_id) {
+				id = (ut32)r_num_math (core->num, s);
+				map = r_io_map_resolve (core->io, id);
+			} else {
+				addr = r_num_math (core->num, s);
+				map = r_io_map_get (core->io, addr);
+			}
 			if (*q) {
 				r_io_map_set_name (map, q);
 			} else {
@@ -710,12 +750,8 @@
 		break;
 	case 'm': // "omm"
 		{
-			ut64 fd = input[3]? r_num_math (core->num, input + 3): UT64_MAX;
+			ut32 fd = input[2]? r_num_math (core->num, input + 2): r_io_fd_get_current (core->io);
 			RIODesc *desc = r_io_desc_get (core->io, fd);
-			if (!desc) {
-				fd = r_io_fd_get_current (core->io);
-				desc = r_io_desc_get (core->io, fd);
-			}
 			if (desc) {
 				ut64 size = r_io_desc_size (desc);
 				map = r_io_map_add (core->io, fd, desc->flags, 0, 0, size, true);
@@ -749,7 +785,14 @@
 	case 'j': // "omj"
 	case '*': // "om*"
 	case 'q': // "omq"
-		map_list (core->io, input[1], core->print, -1);
+		if (input[1] && input[2] == '.') {
+			map = r_io_map_get (core->io, core->offset);
+			if (map) {
+				core->print->cb_printf ("%i\n", map->id);
+			}
+		} else {
+			map_list (core->io, input[1], core->print, -1);
+		}
 		break;
 	case '=': // "om="
 		list_maps_visual (core->io, core->offset, core->blocksize,
@@ -764,33 +807,51 @@
 	r_core_block_read (core);
 }
 
-R_API void r_core_file_reopen_in_malloc (RCore *core) {
-	RListIter *iter;
-	RList *files = r_id_storage_list (core->io->files);
-	RIODesc *desc;
-	r_list_foreach (files, iter, desc) {
-		if (strstr (desc->name, "://")) {
-			continue;
-		}
-		ut64 sz = r_io_desc_size (desc);
-		ut8 *buf = calloc (sz, 1);
-		if (!buf) {
-			eprintf ("Cannot allocate %d\n", (int)sz);
-			continue;
-		}
-		(void)r_io_pread_at (core->io, 0, buf, sz);
-		char *url = r_str_newf ("malloc://%d", (int)sz);
-		// use r_io_desc_exchange pls
-		RIODesc *newDesc = r_io_open (core->io, url, R_IO_READ | R_IO_WRITE, 0);
-		if (newDesc) {
-			r_io_desc_close (desc);
-			(void)r_io_write_at (core->io, 0, buf, sz);
-		} else {
-			eprintf ("Cannot open %s\n", url);
-		}
+static bool reopen_in_malloc_cb(void *user, void *data, ut32 id) {
+	RIO *io = (RIO *)user;
+	RIODesc *desc = (RIODesc *)data;
+
+	if (r_io_desc_is_blockdevice (desc) || r_io_desc_is_dbg (desc)) {
+		return true;
+	}
+
+	if (strstr (desc->uri, "://")) {
+		return true;
+	}
+
+	ut64 size = r_io_desc_size (desc);
+
+	char *uri = r_str_newf ("malloc://%"PFMT64u, size);
+	if (!uri) {
+		return false;
+	}
+
+	ut8 *buf = malloc (size);
+// if malloc fails, we can just abort the loop by returning false
+	if (!buf) {
+		free (uri);
+		return false;
+	}
+
+	RIODesc *ndesc = r_io_open_nomap (io, uri, R_IO_RW, 0);
+	free (uri);
+	if (!ndesc) {
 		free (buf);
-		free (url);
-		break;
+		return false;
+	}
+
+	r_io_desc_read_at (desc, 0LL, buf, (int)size);	//that cast o_O
+	r_io_desc_write_at (ndesc, 0LL, buf, (int)size);
+	free (buf);
+	r_io_desc_exchange (io, desc->fd, ndesc->fd);
+
+	r_io_desc_close (desc);
+	return true;
+}
+
+R_API void r_core_file_reopen_in_malloc (RCore *core) {
+	if (core && core->io && core->io->files) {
+		r_id_storage_foreach (core->io->files, reopen_in_malloc_cb, core->io);
 	}
 }
 
@@ -804,7 +865,7 @@
 		return;
 	}
 	bf = r_bin_file_find_by_fd (core->bin, ofile->fd);
-	binpath = bf ? strdup (bf->file) : NULL;
+	binpath = (bf && bf->file) ? strdup (bf->file) : NULL;
 	if (!binpath) {
 		if (r_file_exists (desc->name)) {
 			binpath = strdup (desc->name);
@@ -885,6 +946,13 @@
 	return true;
 }
 
+static bool desc_list_quiet2_cb(void *user, void *data, ut32 id) {
+	RPrint *p = (RPrint *)user;
+	RIODesc *desc = (RIODesc *)data;
+	p->cb_printf ("%d\n", desc->fd);
+	return false;
+}
+
 static bool desc_list_quiet_cb(void *user, void *data, ut32 id) {
 	RPrint *p = (RPrint *)user;
 	RIODesc *desc = (RIODesc *)data;
@@ -901,13 +969,27 @@
 	return true;
 }
 
+static bool desc_list_json_cb(void *user, void *data, ut32 id) {
+	RPrint *p = (RPrint *)user;
+	RIODesc *desc = (RIODesc *)data;
+	// TODO: from is always 0? See libr/core/file.c:945
+	ut64 from = 0LL;
+	p->cb_printf ("{\"raised\":%s,\"fd\":%d,\"uri\":\"%s\",\"from\":%"
+			PFMT64d ",\"writable\":%s,\"size\":%" PFMT64d "}%s",
+			(desc->io && (desc->io->desc == desc)) ? "true" : "false",
+			desc->fd, desc->uri, from,
+			(desc->flags & R_IO_WRITE ? "true": "false"),
+			r_io_desc_size (desc), (desc->io->files->top_id == id) ? "" : ",");
+	return true;
+}
+
 static int cmd_open(void *data, const char *input) {
 	RCore *core = (RCore*)data;
 	int perms = R_IO_READ;
-	ut64 baddr = r_config_get_i (core->config, "bin.baddr"),
-	     addr = 0LL;
-	int nowarn = r_config_get_i (core->config, "file.nowarn"),
-	    argc, fd;
+	ut64 baddr = r_config_get_i (core->config, "bin.baddr");
+	ut64 addr = 0LL;
+	int nowarn = r_config_get_i (core->config, "file.nowarn");
+	int argc, fd = -1;
 	RCoreFile *file;
 	bool silence = false;
 	bool write = false;
@@ -1088,18 +1170,20 @@
 #endif
 	case 'p': // "op"
 		/* handle prioritize */
-		{
+		if (input[1]) {
 			int fd = r_num_math (core->num, input + 1);
 			if (fd) {
 				RIODesc *desc = r_io_desc_get (core->io, fd);
 				if (desc) {
 					// only useful for io.va=0
-					core->io->desc = desc;
 					// load bininfo for given fd
-					r_core_cmdf (core, "ob %d", fd);
+					r_core_cmdf (core, "obb %d", fd);
+					core->io->desc = desc;
 				}
 			}
 			r_core_block_read (core);
+		} else {
+			r_cons_printf ("%d\n", core->io->desc->fd);
 		}
 		return 0;
 		break;
@@ -1160,7 +1244,11 @@
 		r_id_storage_foreach (core->io->files, desc_list_visual_cb, core->print);
 		break;
 	case 'q': // "oq"
-		r_id_storage_foreach (core->io->files, desc_list_quiet_cb, core->print);
+		if (input[1] == '.') {
+			r_id_storage_foreach (core->io->files, desc_list_quiet2_cb, core->print);
+		} else {
+			r_id_storage_foreach (core->io->files, desc_list_quiet_cb, core->print);
+		}
 		break;
 	case '\0': // "o"
 		r_id_storage_foreach (core->io->files, desc_list_cb, core->print);
@@ -1177,7 +1265,9 @@
 			r_core_cmd_help (core, help_msg_oj);
 			break;
 		}
-		r_core_file_list (core, (int)(*input));
+		core->print->cb_printf("[");
+		r_id_storage_foreach (core->io->files, desc_list_json_cb, core->print);
+		core->print->cb_printf("]\n");
 		break;
 	case 'L': // "oL"
 		if (r_sandbox_enable (0)) {
@@ -1194,7 +1284,6 @@
 			} else {
 				r_io_plugin_list (core->io);
 			}
-			eprintf ("Usage: op [r2plugin."R_LIB_EXT"]\n");
 		}
 		break;
 	case 'i': // "oi"
@@ -1292,7 +1381,6 @@
 		case 0:
 		case '?':
 			r_core_cmd_help (core, help_msg_o_);
-			eprintf ("Usage: o-#, o-! or o-*, where # is the filedescriptor number\n");
 		}
 		break;
 	case '.': // "o."
@@ -1303,7 +1391,7 @@
 			}
                         char *uri = r_str_newf ("malloc://%d", len);
 			ut8 *data = calloc (len, 1);
-			r_core_read_at (core, core->offset, data, len);
+			r_io_read_at (core->io, core->offset, data, len);
                         RIODesc *fd = r_io_open (core->io, uri, R_IO_READ | R_IO_WRITE, 0);
                         if (fd) {
                                 r_io_desc_write (fd, data, len);
@@ -1322,7 +1410,7 @@
 			break;
 		case 'd': // "ood" : reopen in debugger
 			if (input[2] == 'r') { // "oodr"
-				r_core_cmdf ("dor %s", input + 3);
+				r_core_cmdf (core, "dor %s", input + 3);
 				r_core_file_reopen_debug (core, "");
 			} else if ('?' == input[2]) {
 				r_core_cmd_help (core, help_msg_ood);
@@ -1363,17 +1451,20 @@
 				r_core_cmd_help (core, help_msg_oo_plus);
 			} else if (core && core->io && core->io->desc) {
 				int fd;
+				int perms = R_IO_READ | R_IO_WRITE;
 				if ((ptr = strrchr (input, ' ')) && ptr[1]) {
 					fd = (int)r_num_math (core->num, ptr + 1);
 				} else {
 					fd = core->io->desc->fd;
+					perms |= core->io->desc->flags;
 				}
-				if (r_io_reopen (core->io, fd, R_IO_READ | R_IO_WRITE, 644)) {
+				if (r_io_reopen (core->io, fd, perms, 644)) {
 					SdbListIter *iter;
 					RIOMap *map;
 					ls_foreach_prev (core->io->maps, iter, map) {
 						if (map->fd == fd) {
 							map->flags |= R_IO_WRITE;
+							map->flags |= R_IO_EXEC;
 						}
 					}
 				}
@@ -1388,7 +1479,25 @@
 				} else {
 					fd = core->io->desc->fd;
 				}
-				r_io_reopen (core->io, fd, R_IO_READ, 644);
+				if (r_config_get_i (core->config, "cfg.debug")) {
+					RBinFile *bf = r_core_bin_cur (core);
+					if (bf && r_file_exists (bf->file)) {
+						char *file = strdup (bf->file);
+						r_core_cmd0 (core, "ob-*");
+						r_io_close_all (core->io);
+						r_config_set (core->config, "cfg.debug", "false");
+						ut64 orig_baddr = sdb_num_get (core->sdb, "orig_baddr", 0);
+						r_bin_set_baddr (core->bin, orig_baddr);
+						r_config_set_i (core->config, "bin.baddr", orig_baddr);
+						r_core_bin_rebase (core, orig_baddr);
+						r_core_cmdf (core, "o %s", file);
+						free (file);
+					} else {
+						eprintf ("Nothing to do.\n");
+					}
+				} else {
+					r_io_reopen (core->io, fd, R_IO_READ, 644);
+				}
 			}
 			break;
 		case '?':
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_print.c radare2-2.8.0+dfsg/libr/core/cmd_print.c
--- radare2-2.3.0+dfsg/libr/core/cmd_print.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_print.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include "r_asm.h"
 #include "r_core.h"
@@ -12,21 +12,17 @@
 #define PF_USAGE_STR "pf[.k[.f[=v]]|[v]]|[n]|[0|cnt][fmt] [a0 a1 ...]"
 
 static const char *help_msg_amper[] = {
-	"Usage:", "&[-|<cmd>]", "Manage tasks ( XXX broken because of mutex in r_core_cmd )",
-	"&", "", "list all running threads",
-	"&=", "", "show output of all tasks",
+	"Usage:", "&[-|<cmd>]", "Manage tasks (WARNING: Experimental. Use with caution!)",
+	"&", " <cmd>", "run <cmd> in a new background task",
+	"&", "", "list all tasks",
+	"&j", "", "list all tasks (in JSON)",
 	"&=", " 3", "show output of task 3",
-	"&j", "", "list all running threads (in JSON)",
-	"&?", "", "show this help",
-	"&+", " aa", "push to the task list",
+	"&b", " 3", "break task 3",
 	"&-", " 1", "delete task #1",
-	"&", "-*", "delete all threads",
-	"&", " aa", "run analysis in background",
-	"&", " &&", "run all tasks in background",
-	"&&", "", "run all pendings tasks (and join threads)",
-	"&&&", "", "run all pendings tasks until ^C",
-	"", "", "TODO: last command should honor asm.bits",
-	"", "", "WARN: this feature is very experimental. Use it with caution",
+	"&", "-*", "delete all done tasks",
+	"&?", "", "show this help",
+	"&&", " 3", "wait until task 3 is finished",
+	"&&", "", "wait until all tasks are finished",
 	NULL
 };
 
@@ -57,11 +53,14 @@
 	"@(", "from to)", "temporary set from and to for commands supporting ranges",
 	"@a:", "arch[:bits]", "temporary set arch and bits",
 	"@b:", "bits", "temporary set asm.bits",
+	"@B:", "nth", "temporary seek to nth instruction in current bb (negative numbers too)",
 	"@e:", "k=v,k=v", "temporary change eval vars",
-	"@r:", "reg", "tmp seek to reg value (f.ex pd@r:PC)",
-	"@i:", "nth.op", "temporary seek to the Nth relative instruction",
 	"@f:", "file", "temporary replace block with file contents",
+	"@F:", "flagspace", "temporary change flag space",
+	"@i:", "nth.op", "temporary seek to the Nth relative instruction",
+	"@k:", "k", "temporary seek at value of sdb key `k`",
 	"@o:", "fd", "temporary switch to another fd",
+	"@r:", "reg", "tmp seek to reg value (f.ex pd@r:PC)",
 	"@s:", "string", "same as above but from a string",
 	"@x:", "909192", "from hex pairs string",
 	"@@=", "1 2 3", "run the previous command at offsets 1, 2 and 3",
@@ -88,6 +87,7 @@
 	"x", " @@t", "run 'x' on all threads (see dp)",
 	"x", " @@b", "run 'x' on all basic blocks of current function (see afb)",
 	"x", " @@i", "run 'x' on all instructions of the current function (see pdr)",
+	"x", " @@iS", "run 'x' on all sections adjusting blocksize",
 	"x", " @@f", "run 'x' on all functions (see aflq)",
 	"x", " @@f:write", "run 'x' on all functions matching write in the name",
 	"x", " @@s:from to step", "run 'x' on all offsets from, to incrementing by step",
@@ -97,17 +97,30 @@
 	NULL
 };
 
+static const char *help_msg_at_at_at[] = {
+	"@@@", "", " # foreach offset+size iterator command:",
+	"x", " @@@i", "imports",
+	"x", " @@@s", "symbols",
+	"x", " @@@S", "sections",
+	"x", " @@@f", "flags",
+	"x", " @@@F", "functions",
+	"x", " @@@t", "threads",
+	"x", " @@@r", "regs",
+	// TODO: Add @@k sdb-query-expression-here
+	NULL
+};
+
 static const char *help_msg_p[] = {
 	"Usage:", "p[=68abcdDfiImrstuxz] [arg|len] [@addr]", "",
 	"p-", "[?][jh] [mode]", "bar|json|histogram blocks (mode: e?search.in)",
-	"p=", "[?][bep] [blks] [len] [blk]", "show entropy/printable chars/chars bars",
+	"p=", "[?][bep] [N] [L] [b]", "show entropy/printable chars/chars bars",
 	"p2", " [len]", "8x8 2bpp-tiles",
 	"p3", " [file]", "print stereogram (3D)",
 	"p6", "[de] [len]", "base64 decode/encode",
 	"p8", "[?][j] [len]", "8bit hexpair list of bytes",
-	"pa", "[edD] [arg]", "pa:assemble  pa[dD]:disasm or pae: esil from hexpairs",
+	"pa", "[edD] [arg]", "pa:assemble  pa[dD]:disasm or pae: esil from hex",
 	"pA", "[n_ops]", "show n_ops address and type",
-	"p", "[b|B|xb] [len] ([skip])", "bindump N bits skipping M",
+	"p", "[b|B|xb] [len] ([S])", "bindump N bits skipping S bytes",
 	"pb", "[?] [n]", "bitstream of N bits",
 	"pB", "[?] [n]", "bitstream of N bytes",
 	"pc", "[?][p] [len]", "output C (or python) format",
@@ -119,7 +132,7 @@
 	"p", "[iI][df] [len]", "print N ops/bytes (f=func) (see pi? and pdi)",
 	"p", "[kK] [len]", "print key in randomart (K is for mosaic)",
 	"pm", "[?] [magic]", "print libmagic data (see pm? and /m?)",
-	"pq", "[?][iz] [len]", "print QR code with the first Nbytes of the current block",
+	"pq", "[?][iz] [len]", "print QR code with the first Nbytes",
 	"pr", "[?][glx] [len]", "print N raw bytes (in lines or hexblocks, 'g'unzip)",
 	"ps", "[?][pwz] [len]", "print pascal/wide/zero-terminated strings",
 	"pt", "[?][dn] [len]", "print different timestamps",
@@ -132,13 +145,13 @@
 };
 
 static const char *help_msg_p_equal[] = {
-	"Usage:", "p=[=bep?][qj] [nblocks] ([len]) ([offset]) ", "show entropy/printable chars/chars bars",
+	"Usage:", "p=[=bep?][qj] [N] ([len]) ([offset]) ", "show entropy/printable chars/chars bars",
 	"e ", "zoom.in", "specify range for zoom",
 	"p=", "", "print bytes of current block in bars",
-	"p==", "[..]", "same subcommands as p=, but using flame column graph instead of rows",
+	"p==", "[..]", "same subcommands as p=, using column bars instead of rows",
 	"p=", "b", "same as above",
 	"p=", "c", "print number of calls per block",
-	"p=", "d", "print different bytes from block",
+	"p=", "d", "print min/max/number of unique bytes in block",
 	"p=", "e", "print entropy for each filesize/blocksize",
 	"p=", "F", "print number of 0xFF bytes for each filesize/blocksize",
 	"p=", "i", "print number of invalid instructions per block",
@@ -160,17 +173,33 @@
 };
 
 static const char *help_msg_p_minus[] = {
-	"Usage:", "p-[hj] [pieces]", "bar|json|histogram blocks",
+	"Usage:", "p-[hj] [nblocks] ", "bar|json|histogram blocks",
 	"p-", "", "show ascii-art bar of metadata in file boundaries",
 	"p-h", "", "show histogram analysis of metadata per block",
 	"p-j", "", "show json format",
 	NULL
 };
 
+static const char *help_msg_pc[] = {
+	"Usage:", "pc", " # Print in code",
+	"pc",  "", "C",
+	"pc*", "", "print 'wx' r2 commands",
+	"pca", "", "GAS .byte blob",
+	"pcA", "", ".bytes with instructions in comments",
+	"pcd", "", "C dwords (8 byte)",
+	"pch", "", "C half-words (2 byte)",
+	"pcj", "", "json",
+	"pcJ", "", "javascript",
+	"pcp", "", "python",
+	"pcs", "", "string",
+	"pcS", "", "shellscript that reconstructs the bin",
+	"pcw", "", "C words (4 byte)",
+};
+
 static const char *help_msg_pd[] = {
 	"Usage:", "p[dD][ajbrfils] [sz] [arch] [bits]", " # Print Disassembly",
 	"NOTE: ", "len", "parameter can be negative",
-	"NOTE: ", "", "Pressing ENTER on empty command will repeat last pd command and also seek to end of disassembled range.",
+	"NOTE: ", "", "Pressing ENTER on empty command will repeat last print command in next page",
 	"pd", " N", "disassemble N instructions",
 	"pd", " -N", "disassemble N instructions backward",
 	"pD", " N", "disassemble N bytes",
@@ -184,6 +213,7 @@
 	"pdJ", "", "formatted disassembly like pd as json",
 	"pdk", "", "disassemble all methods of a class",
 	"pdl", "", "show instruction sizes",
+	"pdp", "", "disassemble by following pointers to read ropchains",
 	"pdr", "", "recursive disassemble across the function graph",
 	"pdr.", "", "recursive disassemble across the function graph (from current basic block)",
 	"pdR", "", "recursive disassemble block size bytes without analyzing functions",
@@ -222,15 +252,17 @@
 	" ", "b", "byte (unsigned)",
 	" ", "B", "resolve enum bitfield (see t?)",
 	" ", "c", "char (signed byte)",
-	" ", "d", "0x%%08x hexadecimal value (4 bytes) (see %%i and %%x)",
+	" ", "C", "byte in decimal",
+	" ", "d", "0xHEX value (4 bytes) (see 'i' and 'x')",
 	" ", "D", "disassemble one opcode",
 	" ", "e", "temporally swap endian",
 	" ", "E", "resolve enum name (see t?)",
 	" ", "f", "float value (4 bytes)",
-	" ", "i", "%%i signed integer value (4 bytes) (see %%d and %%x)",
+	" ", "F", "double value (8 bytes)",
+	" ", "i", "signed integer value (4 bytes) (see 'd' and 'x')",
 	" ", "n", "next char specifies size of signed value (1, 2, 4 or 8 byte(s))",
 	" ", "N", "next char specifies size of unsigned value (1, 2, 4 or 8 byte(s))",
-	" ", "o", "0x%%08o octal value (4 byte)",
+	" ", "o", "octal value (4 byte)",
 	" ", "p", "pointer reference (2, 4 or 8 bytes)",
 	" ", "q", "quadword (8 bytes)",
 	" ", "r", "CPU register `pf r (eax)plop`",
@@ -240,10 +272,10 @@
 	" ", "T", "show Ten first bytes of buffer",
 	" ", "u", "uleb128 (variable length)",
 	" ", "w", "word (2 bytes unsigned short in hex)",
-	" ", "x", "0x%%08x hex value and flag (fd @ addr) (see %%d and %%i)",
+	" ", "x", "0xHEX value and flag (fd @ addr) (see 'd' and 'i')",
 	" ", "X", "show formatted hexpairs",
-	" ", "z", "\\0 terminated string",
-	" ", "Z", "\\0 terminated wide string",
+	" ", "z", "null terminated string",
+	" ", "Z", "null terminated wide string",
 	" ", "?", "data structure `pf ? (struct_name)example_name`",
 	" ", "*", "next char is pointer (honors asm.bits)",
 	" ", "+", "toggle show flags for each offset",
@@ -302,10 +334,10 @@
 
 static const char *help_msg_pt[] = {
 	"Usage: pt", "[dn]", "print timestamps",
-	"pt", "", "print UNIX time (32 bit `cfg.bigendian`)  Since January 1, 1970",
-	"ptd", "", "print DOS time (32 bit `cfg.bigendian`)   Since January 1, 1980",
-	"pth", "", "print HFS time (32 bit `cfg.bigendian`)   Since January 1, 1904",
-	"ptn", "", "print NTFS time (64 bit `cfg.bigendian`)  Since January 1, 1601",
+	"pt", "", "print UNIX time (32 bit `cfg.bigendian`) Since January 1, 1970",
+	"ptd", "", "print DOS time (32 bit `cfg.bigendian`) Since January 1, 1980",
+	"pth", "", "print HFS time (32 bit `cfg.bigendian`) Since January 1, 1904",
+	"ptn", "", "print NTFS time (64 bit `cfg.bigendian`) Since January 1, 1601",
 	NULL
 };
 
@@ -338,12 +370,12 @@
 	"pxl", "", "display N lines (rows) of hexdump",
 	"pxo", "", "show octal dump",
 	"pxq", "", "show hexadecimal quad-words dump (64bit)",
-	"pxQ", "", "same as above, but one per line",
-	"pxr", "[j]", "show words with references to flags and code",
+	"pxQ", "[q]", "same as above, but one per line",
+	"pxr", "[j]", "show words with references to flags and code (q=quiet)",
 	"pxs", "", "show hexadecimal in sparse mode",
 	"pxt", "[*.] [origin]", "show delta pointer table in r2 commands",
 	"pxw", "", "show hexadecimal words dump (32bit)",
-	"pxW", "", "same as above, but one per line",
+	"pxW", "[q]", "same as above, but one per line (q=quiet)",
 	"pxx", "", "show N bytes of hex-less hexdump",
 	"pxX", "", "show N words of hex-less hexdump",
 	NULL
@@ -366,23 +398,23 @@
 	NULL
 };
 
-static ut32 colormap[256] = {
+static const ut32 colormap[256] = {
 	0x000000, 0x560000, 0x640000, 0x750000, 0x870000, 0x9b0000, 0xb00000, 0xc60000, 0xdd0000, 0xf50000, 0xff0f0f, 0xff2828, 0xff4343, 0xff5e5e, 0xff7979, 0xfe9595,
-  0x4c1600, 0x561900, 0x641e00, 0x752300, 0x872800, 0x9b2e00, 0xb03400, 0xc63b00, 0xdd4200, 0xf54900, 0xff570f, 0xff6928, 0xff7b43, 0xff8e5e, 0xffa179, 0xfeb595,
-  0x4c3900, 0x564000, 0x644b00, 0x755700, 0x876500, 0x9b7400, 0xb08400, 0xc69400, 0xdda600, 0xf5b800, 0xffc30f, 0xffc928, 0xffd043, 0xffd65e, 0xffdd79, 0xfee495,
-  0x4c4c00, 0x565600, 0x646400, 0x757500, 0x878700, 0x9b9b00, 0xb0b000, 0xc6c600, 0xdddd00, 0xf5f500, 0xffff0f, 0xffff28, 0xffff43, 0xffff5e, 0xffff79, 0xfffe95,
-  0x324c00, 0x395600, 0x426400, 0x4e7500, 0x5a8700, 0x679b00, 0x75b000, 0x84c600, 0x93dd00, 0xa3f500, 0xafff0f, 0xb7ff28, 0xc0ff43, 0xc9ff5e, 0xd2ff79, 0xdbfe95,
-  0x1f4c00, 0x235600, 0x296400, 0x307500, 0x388700, 0x409b00, 0x49b000, 0x52c600, 0x5cdd00, 0x66f500, 0x73ff0f, 0x82ff28, 0x91ff43, 0xa1ff5e, 0xb1ff79, 0xc1fe95,
-  0x004c00, 0x005600, 0x006400, 0x007500, 0x008700, 0x009b00, 0x00b000, 0x00c600, 0x00dd00, 0x00f500, 0x0fff0f, 0x28ff28, 0x43ff43, 0x5eff5e, 0x79ff79, 0x95fe95,
-  0x004c19, 0x00561c, 0x006421, 0x007527, 0x00872d, 0x009b33, 0x00b03a, 0x00c642, 0x00dd49, 0x00f551, 0x0fff5f, 0x28ff70, 0x43ff81, 0x5eff93, 0x79ffa6, 0x95feb8,
-  0x004c4c, 0x005656, 0x006464, 0x007575, 0x008787, 0x009b9b, 0x00b0b0, 0x00c6c6, 0x00dddd, 0x00f5f5, 0x0ffffe, 0x28fffe, 0x43fffe, 0x5efffe, 0x79ffff, 0x95fffe,
-  0x00394c, 0x004056, 0x004b64, 0x005775, 0x006587, 0x00749b, 0x0084b0, 0x0094c6, 0x00a6dd, 0x00b8f5, 0x0fc3ff, 0x28c9ff, 0x43d0ff, 0x5ed6ff, 0x79ddff, 0x95e4fe,
-  0x00264c, 0x002b56, 0x003264, 0x003a75, 0x004387, 0x004d9b, 0x0058b0, 0x0063c6, 0x006edd, 0x007af5, 0x0f87ff, 0x2893ff, 0x43a1ff, 0x5eaeff, 0x79bcff, 0x95cafe,
-  0x00134c, 0x001556, 0x001964, 0x001d75, 0x002187, 0x00269b, 0x002cb0, 0x0031c6, 0x0037dd, 0x003df5, 0x0f4bff, 0x285eff, 0x4372ff, 0x5e86ff, 0x799aff, 0x95b0fe,
-  0x19004c, 0x1c0056, 0x210064, 0x270075, 0x2d0087, 0x33009b, 0x3a00b0, 0x4200c6, 0x4900dd, 0x5100f5, 0x5f0fff, 0x7028ff, 0x8143ff, 0x935eff, 0xa679ff, 0xb895fe,
-  0x33004c, 0x390056, 0x420064, 0x4e0075, 0x5a0087, 0x67009b, 0x7500b0, 0x8400c6, 0x9300dd, 0xa300f5, 0xaf0fff, 0xb728ff, 0xc043ff, 0xc95eff, 0xd279ff, 0xdb95fe,
-  0x4c004c, 0x560056, 0x640064, 0x750075, 0x870087, 0x9b009b, 0xb000b0, 0xc600c6, 0xdd00dd, 0xf500f5, 0xfe0fff, 0xfe28ff, 0xfe43ff, 0xfe5eff, 0xfe79ff, 0xfe95fe,
-  0x4c0032, 0x560039, 0x640042, 0x75004e, 0x87005a, 0x9b0067, 0xb00075, 0xc60084, 0xdd0093, 0xf500a3, 0xff0faf, 0xff28b7, 0xff43c0, 0xff5ec9, 0xff79d2, 0xffffff,
+	0x4c1600, 0x561900, 0x641e00, 0x752300, 0x872800, 0x9b2e00, 0xb03400, 0xc63b00, 0xdd4200, 0xf54900, 0xff570f, 0xff6928, 0xff7b43, 0xff8e5e, 0xffa179, 0xfeb595,
+	0x4c3900, 0x564000, 0x644b00, 0x755700, 0x876500, 0x9b7400, 0xb08400, 0xc69400, 0xdda600, 0xf5b800, 0xffc30f, 0xffc928, 0xffd043, 0xffd65e, 0xffdd79, 0xfee495,
+	0x4c4c00, 0x565600, 0x646400, 0x757500, 0x878700, 0x9b9b00, 0xb0b000, 0xc6c600, 0xdddd00, 0xf5f500, 0xffff0f, 0xffff28, 0xffff43, 0xffff5e, 0xffff79, 0xfffe95,
+	0x324c00, 0x395600, 0x426400, 0x4e7500, 0x5a8700, 0x679b00, 0x75b000, 0x84c600, 0x93dd00, 0xa3f500, 0xafff0f, 0xb7ff28, 0xc0ff43, 0xc9ff5e, 0xd2ff79, 0xdbfe95,
+	0x1f4c00, 0x235600, 0x296400, 0x307500, 0x388700, 0x409b00, 0x49b000, 0x52c600, 0x5cdd00, 0x66f500, 0x73ff0f, 0x82ff28, 0x91ff43, 0xa1ff5e, 0xb1ff79, 0xc1fe95,
+	0x004c00, 0x005600, 0x006400, 0x007500, 0x008700, 0x009b00, 0x00b000, 0x00c600, 0x00dd00, 0x00f500, 0x0fff0f, 0x28ff28, 0x43ff43, 0x5eff5e, 0x79ff79, 0x95fe95,
+	0x004c19, 0x00561c, 0x006421, 0x007527, 0x00872d, 0x009b33, 0x00b03a, 0x00c642, 0x00dd49, 0x00f551, 0x0fff5f, 0x28ff70, 0x43ff81, 0x5eff93, 0x79ffa6, 0x95feb8,
+	0x004c4c, 0x005656, 0x006464, 0x007575, 0x008787, 0x009b9b, 0x00b0b0, 0x00c6c6, 0x00dddd, 0x00f5f5, 0x0ffffe, 0x28fffe, 0x43fffe, 0x5efffe, 0x79ffff, 0x95fffe,
+	0x00394c, 0x004056, 0x004b64, 0x005775, 0x006587, 0x00749b, 0x0084b0, 0x0094c6, 0x00a6dd, 0x00b8f5, 0x0fc3ff, 0x28c9ff, 0x43d0ff, 0x5ed6ff, 0x79ddff, 0x95e4fe,
+	0x00264c, 0x002b56, 0x003264, 0x003a75, 0x004387, 0x004d9b, 0x0058b0, 0x0063c6, 0x006edd, 0x007af5, 0x0f87ff, 0x2893ff, 0x43a1ff, 0x5eaeff, 0x79bcff, 0x95cafe,
+	0x00134c, 0x001556, 0x001964, 0x001d75, 0x002187, 0x00269b, 0x002cb0, 0x0031c6, 0x0037dd, 0x003df5, 0x0f4bff, 0x285eff, 0x4372ff, 0x5e86ff, 0x799aff, 0x95b0fe,
+	0x19004c, 0x1c0056, 0x210064, 0x270075, 0x2d0087, 0x33009b, 0x3a00b0, 0x4200c6, 0x4900dd, 0x5100f5, 0x5f0fff, 0x7028ff, 0x8143ff, 0x935eff, 0xa679ff, 0xb895fe,
+	0x33004c, 0x390056, 0x420064, 0x4e0075, 0x5a0087, 0x67009b, 0x7500b0, 0x8400c6, 0x9300dd, 0xa300f5, 0xaf0fff, 0xb728ff, 0xc043ff, 0xc95eff, 0xd279ff, 0xdb95fe,
+	0x4c004c, 0x560056, 0x640064, 0x750075, 0x870087, 0x9b009b, 0xb000b0, 0xc600c6, 0xdd00dd, 0xf500f5, 0xfe0fff, 0xfe28ff, 0xfe43ff, 0xfe5eff, 0xfe79ff, 0xfe95fe,
+	0x4c0032, 0x560039, 0x640042, 0x75004e, 0x87005a, 0x9b0067, 0xb00075, 0xc60084, 0xdd0093, 0xf500a3, 0xff0faf, 0xff28b7, 0xff43c0, 0xff5ec9, 0xff79d2, 0xffffff,
 };
 
 static void cmd_print_init(RCore *core) {
@@ -392,6 +424,7 @@
 	DEFINE_CMD_DESCRIPTOR (core, p);
 	DEFINE_CMD_DESCRIPTOR_SPECIAL (core, p=, p_equal);
 	DEFINE_CMD_DESCRIPTOR_SPECIAL (core, p-, p_minus);
+	DEFINE_CMD_DESCRIPTOR (core, pc);
 	DEFINE_CMD_DESCRIPTOR (core, pd);
 	DEFINE_CMD_DESCRIPTOR_WITH_DETAIL2 (core, pf);
 	DEFINE_CMD_DESCRIPTOR (core, pi);
@@ -403,7 +436,7 @@
 }
 
 // colordump
-static void cmd_prc (RCore *core, int len) {
+static void cmd_prc (RCore *core, const ut8* block, int len) {
 	const char *chars = " .,:;!O@#";
 	bool square = true; //false;
 	int i, j;
@@ -419,13 +452,12 @@
 	for (i = 0; i < len; i += cols) {
 		r_print_addr (core->print, core->offset + i);
 		for (j = i; j < i + cols; j ++) {
-			ut8 *p = (ut8 *) core->block + j;
 			if (j >= len) {
 				break;
 			}
 			if (show_color) {
-				char *str = r_str_newf ("rgb:fff rgb:%06x", colormap[*p]);
-				color = r_cons_pal_parse (str);
+				char *str = r_str_newf ("rgb:fff rgb:%06x", colormap[block[j]]);
+				color = r_cons_pal_parse (str, NULL);
 				free (str);
 				if (show_cursor && core->print->cur == j) {
 					ch = '_';
@@ -437,7 +469,7 @@
 				if (show_cursor && core->print->cur == j) {
 					ch = '_';
 				} else {
-					const int idx = ((float)*p / 255) * (strlen (chars) - 1);
+					const int idx = ((float)block[j] / 255) * (strlen (chars) - 1);
 					ch = chars[idx];
 				}
 			}
@@ -633,6 +665,11 @@
 	}
 	r_cons_push ();
 	RConsCanvas *c = r_cons_canvas_new (w, rows);
+	if (!c) {
+		eprintf ("Couldn't allocate a canvas with %d rows\n", rows);
+		goto err;
+	}
+
 	ut64 tsek = core->offset;
 	c->color = r_config_get_i (core->config, "scr.color");
 	int bsize = hex_cols * rows;
@@ -649,9 +686,10 @@
 		tsek += bsize - 32;
 	}
 
-	r_cons_pop ();
 	r_cons_canvas_print (c);
 	r_cons_canvas_free (c);
+ err:
+	r_cons_pop ();
 	r_config_set_i (core->config, "hex.cols", hex_cols);
 }
 
@@ -705,7 +743,7 @@
 
 static void cmd_print_eq_dict(RCore *core, const ut8 *block, int bsz) {
 	int i;
-	int min = 0;
+	int min = -1;
 	int max = 0;
 	int dict = 0;
 	int range = 0;
@@ -715,7 +753,7 @@
 	}
 	for (i = 0; i < 256; i++) {
 		if (histogram[i]) {
-			if (min == 0) {
+			if (min == -1) {
 				min = i;
 			}
 			max = i;
@@ -723,11 +761,11 @@
 		}
 	}
 	range = max - min;
-	r_cons_printf ("min:   %d  0x%x\n", min, min);
-	r_cons_printf ("max:   %d  0x%x\n", max, max);
-	r_cons_printf ("dict:  %d  0x%x\n", dict, dict);
-	r_cons_printf ("range: %d  0x%x\n", range, range);
-	r_cons_printf ("size:  %d  0x%x\n", bsz, bsz);
+	r_cons_printf ("min:              %d  0x%x\n", min, min);
+	r_cons_printf ("max:              %d  0x%x\n", max, max);
+	r_cons_printf ("unique (count):   %d  0x%x\n", dict, dict);
+	r_cons_printf ("range (max-min):  %d  0x%x\n", range, range);
+	r_cons_printf ("size (of block):  %d  0x%x\n", bsz, bsz);
 }
 
 R_API void r_core_set_asm_configs(RCore *core, char *arch, ut32 bits, int segoff){
@@ -744,197 +782,24 @@
 		bsize = -bsize;
 	}
 	r_cons_print ("[");
-	if (bsize <= core->blocksize) {
-		r_core_print_disasm_json (core, core->offset, core->block,
-			bsize, 0);
+	ut8 *buf = malloc (bsize);
+	if (buf) {
+		r_io_read_at (core->io, core->offset, buf, bsize);
+		r_core_print_disasm_json (core, core->offset, buf, bsize, 0);
+		free (buf);
 	} else {
-		ut8 *buf = malloc (bsize);
-		if (buf) {
-			r_io_read_at (core->io, core->offset, buf, bsize);
-			r_core_print_disasm_json (core, core->offset, buf, bsize, 0);
-			free (buf);
-		} else {
-			eprintf ("cannot allocate %d byte(s)\n", bsize);
-		}
+		eprintf ("cannot allocate %d byte(s)\n", bsize);
 	}
 	r_cons_print ("]");
 }
 
-static void cmd_pdj(RCore *core, const char *arg) {
+static void cmd_pdj(RCore *core, const char *arg, ut8* block) {
 	int nblines = r_num_math (core->num, arg);
 	r_cons_print ("[");
-	r_core_print_disasm_json (core, core->offset, core->block, core->blocksize, nblines);
+	r_core_print_disasm_json (core, core->offset, block, core->blocksize, nblines);
 	r_cons_print ("]\n");
 }
 
-static int process_input(RCore *core, const char *input, ut64 *blocksize, char **asm_arch, ut32 *bits) {
-	// input: start of the input string e.g. after the command symbols have been consumed
-	// size: blocksize if present, otherwise -1
-	// asm_arch: asm_arch to interpret as if present and valid, otherwise NULL;
-	// bits: bits to use if present, otherwise -1
-
-	int result = false;
-	char *input_one = NULL, *input_two = NULL, *input_three = NULL;
-	char *str_clone = NULL, *ptr_str_clone = NULL, *trimmed_clone = NULL;
-
-	if (!input || !blocksize || !asm_arch || !bits) {
-		return false;
-	}
-
-	str_clone = strdup (input);
-	trimmed_clone = r_str_trim_head_tail (str_clone);
-	input_one = trimmed_clone;
-
-	ptr_str_clone = strchr (trimmed_clone, ' ');
-	// terminate input_one
-	if (ptr_str_clone) {
-		*ptr_str_clone = '\0';
-		input_two = (++ptr_str_clone);
-		ptr_str_clone = strchr (input_two, ' ');
-	}
-
-	// terminate input_two
-	if (ptr_str_clone && input_two) {
-		*ptr_str_clone = '\0';
-		input_three = (++ptr_str_clone);
-		ptr_str_clone = strchr (input_three, ' ');
-	}
-
-	// terminate input_three
-	if (ptr_str_clone && input_three) {
-		*ptr_str_clone = '\0';
-		ptr_str_clone = strchr (input_three, ' ');
-	}
-
-	// command formats
-	// <size> <arch> <bits>
-	// <size> <arch>
-	// <size> <bits>
-	// <arch> <bits>
-	// <arch>
-
-	// initialize
-	*asm_arch = NULL;
-	*blocksize = *bits = -1;
-
-	if (input_one && input_two && input_three) {
-		// <size> <arch> <bits>
-		*blocksize = r_num_is_valid_input (core->num, input_one)? r_num_get_input_value (core->num, input_one): 0;
-		*asm_arch = r_asm_is_valid (core->assembler, input_two)? strdup (input_two): NULL;
-		*bits = r_num_get_input_value (core->num, input_three);
-		result = true;
-
-	} else if (input_one && input_two) {
-
-		*blocksize = r_num_is_valid_input (core->num, input_one)? r_num_get_input_value (core->num, input_one): 0;
-
-		if (!r_num_is_valid_input (core->num, input_one)) {
-			// input_one can only be one other thing
-			*asm_arch = r_asm_is_valid (core->assembler, input_one)? strdup (input_one): NULL;
-			*bits = r_num_is_valid_input (core->num, input_two)? r_num_get_input_value (core->num, input_two): -1;
-		} else {
-			if (r_str_contains_macro (input_two)) {
-				r_str_truncate_cmd (input_two);
-			}
-			*bits = r_num_is_valid_input (core->num, input_two)? r_num_get_input_value (core->num, input_two): -1;
-			*asm_arch = r_asm_is_valid (core->assembler, input_two)? strdup (input_two): NULL;
-		}
-
-		result = true;
-	} else if (input_one) {
-		*blocksize = r_num_is_valid_input (core->num, input_one)? r_num_get_input_value (core->num, input_one): 0;
-		if (!r_num_is_valid_input (core->num, input_one)) {
-			// input_one can only be one other thing
-			if (r_str_contains_macro (input_one)) {
-				r_str_truncate_cmd (input_one);
-			}
-			*asm_arch = r_asm_is_valid (core->assembler, input_one)? strdup (input_one): NULL;
-		}
-		result = true;
-	}
-	free (str_clone);
-	return result;
-}
-
-/* This function is not necessary anymore, but it's kept for discussion */
-R_API int r_core_process_input_pade(RCore *core, const char *input, char **hex, char **asm_arch, ut32 *bits) {
-	// input: start of the input string e.g. after the command symbols have been consumed
-	// size: hex if present, otherwise -1
-	// asm_arch: asm_arch to interpret as if present and valid, otherwise NULL;
-	// bits: bits to use if present, otherwise -1
-
-	int result = false;
-	char *input_one = NULL, *input_two = NULL, *input_three = NULL;
-	char *str_clone = NULL,
-	*trimmed_clone = NULL;
-
-	if (!input || !hex || !asm_arch || !bits) {
-		return false;
-	}
-
-	str_clone = strdup (input);
-	trimmed_clone = r_str_trim_head_tail (str_clone);
-
-	input_one = trimmed_clone;
-
-#if 0
-	char *ptr_str_clone = NULL;
-	ptr_str_clone = strchr (trimmed_clone, ' ');
-	// terminate input_one
-	if (ptr_str_clone) {
-		*ptr_str_clone = '\0';
-		input_two = (++ptr_str_clone);
-		ptr_str_clone = strchr (input_two, ' ');
-	}
-
-	// terminate input_two
-	if (ptr_str_clone && input_two) {
-		*ptr_str_clone = '\0';
-		input_three = (++ptr_str_clone);
-		ptr_str_clone = strchr (input_three, ' ');
-	}
-
-	// terminate input_three
-	if (ptr_str_clone && input_three) {
-		*ptr_str_clone = '\0';
-		ptr_str_clone = strchr (input_three, ' ');
-	}
-#endif
-
-	// command formats
-	// <hex> <arch> <bits>
-	// <hex> <arch>
-	// <hex> <bits>
-	// <hex>
-
-	// initialize
-	*hex = *asm_arch = NULL;
-	*bits = -1;
-
-	if (input_one && input_two && input_three) {
-		// <size> <arch> <bits>
-		*hex = input_one;
-		*asm_arch = r_asm_is_valid (core->assembler, input_two)? strdup (input_two): NULL;
-		*bits = r_num_get_input_value (core->num, input_three);
-		result = true;
-
-	} else if (input_one && input_two) {
-		*hex = input_one;
-		if (r_str_contains_macro (input_two)) {
-			r_str_truncate_cmd (input_two);
-		}
-		*bits = r_num_is_valid_input (core->num, input_two)? r_num_get_input_value (core->num, input_two): -1;
-		*asm_arch = r_asm_is_valid (core->assembler, input_two)? strdup (input_two): NULL;
-		result = true;
-	} else if (input_one) {
-		*hex = input_one;
-		result = true;
-	} else {
-		free (input_one);
-	}
-	return result;
-}
-
 static void helpCmdTasks(RCore *core) {
 	// TODO: integrate with =h& and bg anal/string/searchs/..
 	r_core_cmd_help (core, help_msg_amper);
@@ -948,28 +813,27 @@
 	r_core_cmd_help (core, help_msg);
 }
 
-static void cmd_print_format(RCore *core, const char *_input, int len) {
+static void cmd_print_format(RCore *core, const char *_input, const ut8* block, int len) {
 	char *input;
 	int mode = R_PRINT_MUSTSEE;
 	switch (_input[1]) {
-	case '*':
+	case '*': // "pf*"
 		_input++;
 		mode = R_PRINT_SEEFLAGS;
 		break;
-	case 'd':
+	case 'd': // "pfd"
 		_input++;
 		mode = R_PRINT_DOT;
 		break;
-	case 'j':
+	case 'j': // "pfj"
 		_input++;
 		mode = R_PRINT_JSON;
 		break;
-	case 'v':
+	case 'v': // "pfv"
 		_input++;
 		mode = R_PRINT_VALUE | R_PRINT_MUSTSEE;
 		break;
-	case 's':
-	{
+	case 's': { // "pfs"
 		const char *val = NULL;
 		_input += 2;
 		if (*_input == '.') {
@@ -994,7 +858,7 @@
 		}
 	}
 		return;
-	case '?':
+	case '?': // "pf?"
 		_input += 2;
 		if (*_input) {
 			if (*_input == '?') {
@@ -1029,26 +893,28 @@
 	if (input[1] == 'o') { // "pfo"
 		if (input[2] == '?') {
 			eprintf ("|Usage: pfo [format-file]\n"
-				" ~/.config/radare2/format\n"
-				" "R2_DATDIR "/radare2/"R2_VERSION "/format/\n");
+				" " R_JOIN_3_PATHS ("~", R2_HOME_SDB_FORMAT, "") "\n"
+				" " R_JOIN_3_PATHS ("%s", R2_SDB_FORMAT, "") "\n",
+				r_sys_prefix (NULL));
 		} else if (input[2] == ' ') {
-			char *home, path[512];
-			// XXX hardcoded path here
-			snprintf (path, sizeof (path), ".config/radare2/format/%s", input + 3);
-			home = r_str_home (path);
-			snprintf (path, sizeof (path), R2_DATDIR "/radare2/"
-				R2_VERSION "/format/%s", input + 3);
+			char *home, *path, tmp[512];
+			snprintf (tmp, sizeof (tmp),
+				R_JOIN_2_PATHS (R2_HOME_SDB_FORMAT, "%s"), input + 3);
+			home = r_str_home (tmp);
+			snprintf (tmp, sizeof (tmp), R_JOIN_2_PATHS (R2_SDB_FORMAT, "%s"), input + 3);
+			path = r_str_r2_prefix (tmp);
 			if (!r_core_cmd_file (core, home) && !r_core_cmd_file (core, path)) {
 				if (!r_core_cmd_file (core, input + 3)) {
 					eprintf ("ecf: cannot open colorscheme profile (%s)\n", path);
 				}
 			}
 			free (home);
+			free (path);
 		} else {
 			RList *files;
 			RListIter *iter;
 			const char *fn;
-			char *home = r_str_home (".config/radare2/format/");
+			char *home = r_str_home (R2_HOME_SDB_FORMAT R_SYS_DIR);
 			if (home) {
 				files = r_sys_dir (home);
 				r_list_foreach (files, iter, fn) {
@@ -1059,13 +925,17 @@
 				r_list_free (files);
 				free (home);
 			}
-			files = r_sys_dir (R2_DATDIR "/radare2/"R2_VERSION "/format/");
-			r_list_foreach (files, iter, fn) {
-				if (*fn && *fn != '.') {
-					r_cons_println (fn);
+			char *path = r_str_r2_prefix (R2_SDB_FORMAT R_SYS_DIR);
+			if (path) {
+				files = r_sys_dir (path);
+				r_list_foreach (files, iter, fn) {
+					if (*fn && *fn != '.') {
+						r_cons_println (fn);
+					}
 				}
+				r_list_free (files);
+				free (path);
 			}
-			r_list_free (files);
 		}
 		free (input);
 		return;
@@ -1178,11 +1048,20 @@
 	} else {
 		/* This make sure the structure will be printed entirely */
 		char *fmt = input + 1;
-		while (*fmt && ISWHITECHAR (*fmt)) fmt++;
-		int size = r_print_format_struct_size (fmt, core->print, mode, 0) + 10;
-		if (size > core->blocksize) {
-			r_core_block_size (core, size);
+		while (*fmt && IS_WHITECHAR (*fmt)) {
+			fmt++;
+		}
+		int struct_sz = r_print_format_struct_size (fmt, core->print, mode, 0) + 10;
+		int size = R_MAX (core->blocksize, struct_sz);
+		ut8 *buf = calloc (1, size);
+		if (!buf) {
+			eprintf ("cannot allocate %d byte(s)\n", size);
+			goto stage_left;
 		}
+		if ((struct_sz > core->blocksize) && !core->fixedblock) {
+			r_core_block_size (core, struct_sz);
+		}
+		memcpy (buf, core->block, core->blocksize);
 		/* check if fmt is '\d+ \d+<...>', common mistake due to usage string*/
 		bool syntax_ok = true;
 		char *args = strdup (fmt);
@@ -1199,8 +1078,9 @@
 		free (args);
 		if (syntax_ok) {
 			r_print_format (core->print, core->offset,
-				core->block, core->blocksize, fmt, mode, NULL, NULL);
+				buf, size, fmt, mode, NULL, NULL);
 		}
+		free (buf);
 	}
 stage_left:
 	free (input);
@@ -1243,7 +1123,7 @@
 	}
 	char *format = compact ? " %X %X" : " %X %X ";
 	int step = compact ? 4 : 5;
-	
+
 	// Adjust the number of columns
 	if (nb_cols < 1) {
 		nb_cols = 16;
@@ -1261,7 +1141,7 @@
 	bytes = calloc (nb_cons_cols * 20, sizeof (char));
 	if (!bytes) goto err_bytes;
 #if 1
-	int addrpadlen = strlen (sdb_fmt (0, "%08"PFMT64x, addr)) - 8;
+	int addrpadlen = strlen (sdb_fmt ("%08"PFMT64x, addr)) - 8;
 	char addrpad[32];
 	if (addrpadlen > 0) {
 		memset (addrpad, ' ', addrpadlen);
@@ -1352,7 +1232,7 @@
 				hascolor = true;
 				if (usecolor) {
 					if (current_flag && current_flag->color) {
-						char *ansicolor = r_cons_pal_parse (current_flag->color);
+						char *ansicolor = r_cons_pal_parse (current_flag->color, NULL);
 						append (ebytes, ansicolor);
 						append (echars, ansicolor);
 						free (ansicolor);
@@ -1590,49 +1470,49 @@
 	RFlagItem *flag;
 
 	switch (mode) {
-	case 'p':
+	case '0': // "pz0"
 		for (j = 0; j < size; j++) {
-			if (IS_PRINTABLE (bufz[j])) {
+			if (bufz[j] == 0) {
 				ret++;
 			}
 		}
 		break;
-	case 'f':
+	case 'e': // "pze"
+		ret = (ut8) (r_hash_entropy_fraction (bufz, size) * 255);
+		break;
+	case 'f': // "pzf"
 		r_list_foreach (core->flags->flags, iter, flag)
 		if (flag->offset <= addr && addr < flag->offset + flag->size) {
 			ret++;
 		}
 		break;
-	case 's':
-		j = r_flag_space_get (core->flags, "strings");
-		r_list_foreach (core->flags->flags, iter, flag) {
-			if (flag->space == j &&
-			    ((addr <= flag->offset &&
-			      flag->offset < addr + size) ||
-			     (addr <= flag->offset + flag->size &&
-			      flag->offset + flag->size < addr + size))) {
+	case 'F': // "pzF"
+		for (j = 0; j < size; j++) {
+			if (bufz[j] == 0xff) {
 				ret++;
 			}
 		}
 		break;
-	case '0': // 0x00
+	case 'p': // "pzp"
 		for (j = 0; j < size; j++) {
-			if (bufz[j] == 0) {
+			if (IS_PRINTABLE (bufz[j])) {
 				ret++;
 			}
 		}
 		break;
-	case 'F': // 0xFF
-		for (j = 0; j < size; j++) {
-			if (bufz[j] == 0xff) {
+	case 's': // "pzs"
+		j = r_flag_space_get (core->flags, "strings");
+		r_list_foreach (core->flags->flags, iter, flag) {
+			if (flag->space == j &&
+			    ((addr <= flag->offset &&
+			      flag->offset < addr + size) ||
+			     (addr <= flag->offset + flag->size &&
+			      flag->offset + flag->size < addr + size))) {
 				ret++;
 			}
 		}
 		break;
-	case 'e': // entropy
-		ret = (ut8) (r_hash_entropy_fraction (bufz, size) * 255);
-		break;
-	case 'h': // head
+	case 'h': // "pzh" head
 	default:
 		ret = *bufz;
 	}
@@ -1646,7 +1526,7 @@
 	ut64 addr = core->offset;
 	memset (b, 0xff, core->blocksize);
 	delta = addr - from;
-	r_core_read_at (core, to + delta, b, core->blocksize);
+	r_io_read_at (core->io, to + delta, b, core->blocksize);
 	r_print_hexdiff (core->print, core->offset, core->block,
 		to + delta, b, core->blocksize, col);
 	free (b);
@@ -1657,7 +1537,7 @@
 }
 
 static int cmd_print_pxA(RCore *core, int len, const char *data) {
-	RConsPalette *pal = &core->cons->pal;
+	RConsPrintablePalette *pal = &core->cons->pal;
 	int show_offset = true;
 	int cols = r_config_get_i (core->config, "hex.cols");
 	int show_color = r_config_get_i (core->config, "scr.color");
@@ -1703,7 +1583,7 @@
 		bgcolor = Color_BGBLACK;
 		fgcolor = Color_WHITE;
 		text = NULL;
-		if (r_anal_op (core->anal, &op, core->offset + i, core->block + i, len - i) <= 0) {
+		if (r_anal_op (core->anal, &op, core->offset + i, core->block + i, len - i, R_ANAL_OP_MASK_BASIC) <= 0) {
 			op.type = 0;
 			bgcolor = Color_BGRED;
 			op.size = 1;
@@ -1962,34 +1842,46 @@
 	bool show_offset = r_config_get_i (core->config, "asm.offset");
 	bool asm_tabs = r_config_get_i (core->config, "asm.tabs");
 	bool asm_flags = r_config_get_i (core->config, "asm.flags");
-	RConsPalette *pal = &core->cons->pal;
+	bool asm_cmt_right = r_config_get_i (core->config, "asm.cmt.right");
+	bool asm_emu = r_config_get_i (core->config, "asm.emu");
+	bool emu_str = r_config_get_i (core->config, "emu.str");
+	r_config_set_i (core->config, "emu.str", true);
+	RConsPrintablePalette *pal = &core->cons->pal;
 	// force defaults
 	r_config_set_i (core->config, "asm.offset", true);
-	r_config_set_i (core->config, "scr.color", 0);
+	r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 	r_config_set_i (core->config, "asm.tabs", 0);
+	r_config_set_i (core->config, "asm.cmt.right", true);
 r_cons_push();
-	if (!strncmp (input, "dsf", 3) || !strncmp (input, "dsr", 3)) {
+line = NULL;
+	s = NULL;
+	if (!strncmp (input, "dsb", 3)) {
+		RAnalBlock *bb = r_anal_bb_from_offset (core->anal, core->offset);
+		if (bb) {
+			line = s = r_core_cmd_strf (core, "pD %"PFMT64d" @ 0x%08"PFMT64x, bb->size, bb->addr);
+		}
+	} else if (!strncmp (input, "dsf", 3) || !strncmp (input, "dsr", 3)) {
 		RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
 		if (fcn) {
 			line = s = r_core_cmd_str (core, "pdr");
 		} else {
 			eprintf ("Cannot find function.\n");
 			r_config_set_i (core->config, "scr.color", use_color);
-			return;
+			r_config_set_i (core->config, "asm.cmt.right", asm_cmt_right);
+			goto restore_conf;
 		}
 	} else if (!strncmp (input, "ds ", 3)) {
-		char *cmd = r_str_newf ("pD %s", input + 3);
-		line = s = r_core_cmd_strf (core, cmd);
-		free (cmd);
+		line = s = r_core_cmd_strf (core, "pD %s", input + 3);
 	} else {
 		line = s = r_core_cmd_str (core, "pd");
 	}
 r_cons_pop();
 	r_config_set_i (core->config, "scr.color", use_color);
+	r_config_set_i (core->config, "asm.cmt.right", asm_cmt_right);
 	count = r_str_split (s, '\n');
 	if (!line || !*line || count < 1) {
-		free (s);
-		return;
+	//	R_FREE (s);
+		goto restore_conf;
 	}
 	for (i = 0; i < count; i++) {
 		ut64 addr = UT64_MAX;
@@ -2181,6 +2073,8 @@
 				if (string) {
 					string = r_str_trim (string);
 					string2 = r_str_trim (string2);
+					//// TODO implememnt avoid duplicated strings
+					// eprintf ("---> %s\n", string);
 					if (use_color) {
 						if (show_offset) {
 							r_cons_printf ("%s0x%08"PFMT64x" "Color_RESET, use_color? pal->offset: "", addr);
@@ -2193,7 +2087,7 @@
 						if (show_offset) {
 							r_cons_printf ("0x%08"PFMT64x" ", addr);
 						}
-						r_cons_printf ("%s%s%s%s%s\n", 
+						r_cons_printf ("%s%s%s%s%s\n",
 							string2? string2: "", string2? " ": "", string,
 							flag? " ": "", flag? flag->name: "");
 					}
@@ -2203,12 +2097,15 @@
 		line += strlen (line) + 1;
 	}
 	// r_cons_printf ("%s", s);
-	r_config_set_i (core->config, "asm.offset", show_offset);
-	r_config_set_i (core->config, "asm.tabs", asm_tabs);
 	free (string2);
 	free (string);
 	free (s);
 	free (str);
+restore_conf:
+	r_config_set_i (core->config, "asm.offset", show_offset);
+	r_config_set_i (core->config, "asm.tabs", asm_tabs);
+	r_config_set_i (core->config, "asm.emu", asm_emu);
+	r_config_set_i (core->config, "emu.str", emu_str);
 }
 
 static void algolist(int mode) {
@@ -2279,7 +2176,7 @@
 	return handled_cmd;
 }
 
-static void cmd_print_pv(RCore *core, const char *input) {
+static void cmd_print_pv(RCore *core, const char *input, const ut8* block) {
 	const char *stack[] = {
 		"ret", "arg0", "arg1", "arg2", "arg3", "arg4", NULL
 	};
@@ -2287,19 +2184,19 @@
 	int type = 'v';
 	bool fixed_size = true;
 	switch (input[0]) {
-	case '1':
+	case '1': // "pv1"
 		n = 1;
 		input++;
 		break;
-	case '2':
+	case '2': // "pv2"
 		n = 2;
 		input++;
 		break;
-	case '4':
+	case '4': // "pv4"
 		n = 4;
 		input++;
 		break;
-	case '8':
+	case '8': // "pv8"
 		n = 8;
 		input++;
 		break;
@@ -2318,7 +2215,7 @@
 			break;
 		}
 	/* fallthrough */
-	case ' ':
+	case ' ': // "pv "
 		for (i = 0; stack[i]; i++) {
 			if (!strcmp (input + 1, stack[i])) {
 				if (type == 'z') {
@@ -2329,8 +2226,7 @@
 			}
 		}
 		break;
-	case 'j':
-	{
+	case 'j': { // "pvj"
 		char *str = r_str_trim (r_core_cmd_str (core, "ps @ [$$]"));
 		char *p = str;
 		if (p) {
@@ -2348,9 +2244,9 @@
 			str
 			);
 		free (str);
+		break;
 	}
-	break;
-	case '?':
+	case '?': // "pv?"
 		r_core_cmd_help (core, help_msg_pv);
 		break;
 	default:
@@ -2361,23 +2257,23 @@
 		}
 		switch (n) {
 		case 1:
-			v = r_read_ble8 (core->block);
+			v = r_read_ble8 (block);
 			r_cons_printf ("0x%02" PFMT64x "\n", v);
 			break;
 		case 2:
-			v = r_read_ble16 (core->block, core->print->big_endian);
+			v = r_read_ble16 (block, core->print->big_endian);
 			r_cons_printf ("0x%04" PFMT64x "\n", v);
 			break;
 		case 4:
-			v = r_read_ble32 (core->block, core->print->big_endian);
+			v = r_read_ble32 (block, core->print->big_endian);
 			r_cons_printf ("0x%08" PFMT64x "\n", v);
 			break;
 		case 8:
-			v = r_read_ble64 (core->block, core->print->big_endian);
+			v = r_read_ble64 (block, core->print->big_endian);
 			r_cons_printf ("0x%016" PFMT64x "\n", v);
 			break;
 		default:
-			v = r_read_ble64 (core->block, core->print->big_endian);
+			v = r_read_ble64 (block, core->print->big_endian);
 			switch (core->assembler->bits / 8) {
 			case 1: r_cons_printf ("0x%02" PFMT64x "\n", v & UT8_MAX); break;
 			case 2: r_cons_printf ("0x%04" PFMT64x "\n", v & UT16_MAX); break;
@@ -2394,6 +2290,175 @@
 }
 
 
+static int cmd_print_blocks(RCore *core, const char *input) {
+	char mode = input[0];
+	if (mode == '?') {
+		r_core_cmd_help (core, help_msg_p_minus);
+		return 0;
+	}
+
+	if (mode && mode != ' ') {
+		input++;
+	}
+
+	int w;
+	if (input[0] == ' ') {
+		w = (int)r_num_math (core->num, input + 1);
+	} else {
+		w = (int)(core->print->cols * 2.7);
+	}
+
+	ut64 off = core->offset;
+	ut64 from = 0;
+	ut64 to = 0;
+	{
+		RList *list = r_core_get_boundaries_prot (core, -1, NULL, "search");
+		RIOMap *map = r_list_first (list);
+		if (map) {
+			from = map->itv.addr;
+			to = r_itv_end (map->itv);
+		}
+		r_list_free (list);
+	}
+	ut64 piece = R_MAX ((to - from) / w, 1);
+	RCoreAnalStats *as = r_core_anal_get_stats (core, from, to, piece);
+	if (!as) {
+		return 0;
+	}
+
+	switch (mode) {
+		case 'j': // "p-j"
+			r_cons_printf (
+					"{\"from\":%"PFMT64d ","
+					"\"to\":%"PFMT64d ","
+					"\"blocksize\":%d,"
+					"\"blocks\":[", from, to, piece);
+			break;
+		case 'h': // "p-h"
+			r_cons_printf (".-------------.----------------------------.\n");
+			r_cons_printf ("|   offset    | flags funcs cmts syms str  |\n");
+			r_cons_printf ("|-------------)----------------------------|\n");
+			break;
+		default:
+			r_cons_printf ("0x%"PFMT64x " [", from);
+	}
+
+	bool use_color = r_config_get_i (core->config, "scr.color");
+	int len = 0;
+	int i;
+	int l;
+	RCoreAnalStatsItem total = {0};
+	for (i = 0; i < ((to-from)/piece); i++) {
+		ut64 at = from + (piece * i);
+		ut64 ate = at + piece;
+		ut64 p = (at - from) / piece;
+		switch (mode) {
+			case 'j':
+				r_cons_printf ("%s{", len? ",": "");
+				if ((as->block[p].flags)
+					|| (as->block[p].functions)
+					|| (as->block[p].comments)
+					|| (as->block[p].symbols)
+					|| (as->block[p].rwx)
+					|| (as->block[p].strings)) {
+					r_cons_printf ("\"offset\":%"PFMT64d ",", at), l++;
+					r_cons_printf ("\"size\":%"PFMT64d ",", piece), l++;
+				}
+				l = 0;
+#define PRINT_VALUE(name, cond, v) { \
+				if (cond) { \
+					r_cons_printf ("%s\"" name "\":%d", l? ",": "", (v)); \
+					l++; \
+				}}
+#define PRINT_VALUE2(name, v) PRINT_VALUE(name, v, v)
+				PRINT_VALUE2 ("flags", as->block[p].flags);
+				PRINT_VALUE2 ("functions", as->block[p].functions);
+				PRINT_VALUE2 ("in_functions", as->block[p].in_functions);
+				PRINT_VALUE2 ("comments", as->block[p].comments);
+				PRINT_VALUE2 ("symbols", as->block[p].symbols);
+				PRINT_VALUE2 ("strings", as->block[p].strings);
+				PRINT_VALUE ("rwx", as->block[p].rwx, r_str_rwx_i (as->block[p].rwx));
+#undef PRINT_VALUE
+#undef PRINT_VALUE2
+				r_cons_strcat ("}");
+				len++;
+				break;
+			case 'h':
+				total.flags += as->block[p].flags;
+				total.functions += as->block[p].functions;
+				total.comments += as->block[p].comments;
+				total.symbols += as->block[p].symbols;
+				total.strings += as->block[p].strings;
+				if ((as->block[p].flags)
+					|| (as->block[p].functions)
+					|| (as->block[p].comments)
+					|| (as->block[p].symbols)
+					|| (as->block[p].strings)) {
+					r_cons_printf ("| 0x%09"PFMT64x " | %4d %4d %4d %4d %4d   |\n", at,
+								   as->block[p].flags,
+								   as->block[p].functions,
+								   as->block[p].comments,
+								   as->block[p].symbols,
+								   as->block[p].strings);
+				}
+				break;
+			default:
+				if (off >= at && off < ate) {
+					r_cons_memcat ("^", 1);
+				} else {
+					RIOSection *s = r_io_section_vget (core->io, at);
+					if (use_color) {
+						if (s) {
+							if (s->flags & 1) {
+								r_cons_print (Color_BGBLUE);
+							} else {
+								r_cons_print (Color_BGGREEN);
+							}
+						} else {
+							r_cons_print (Color_BGRED);
+						}
+					}
+					if (as->block[p].strings > 0) {
+						r_cons_memcat ("z", 1);
+					} else if (as->block[p].symbols > 0) {
+						r_cons_memcat ("s", 1);
+					} else if (as->block[p].functions > 0) {
+						r_cons_memcat ("F", 1);
+					} else if (as->block[p].comments > 0) {
+						r_cons_memcat ("c", 1);
+					} else if (as->block[p].flags > 0) {
+						r_cons_memcat (".", 1);
+					} else if (as->block[p].in_functions > 0) {
+						r_cons_memcat ("f", 1);
+					} else {
+						r_cons_memcat ("_", 1);
+					}
+				}
+				break;
+		}
+	}
+	switch (mode) {
+		case 'j':
+			r_cons_strcat ("]}\n");
+			break;
+		case 'h':
+			// r_cons_printf ("  total    | flags funcs cmts syms str  |\n");
+			r_cons_printf ("|-------------)----------------------------|\n");
+			r_cons_printf ("|    total    | %4d %4d %4d %4d %4d   |\n",
+						   total.flags, total.functions, total.comments, total.symbols, total.strings);
+			r_cons_printf ("`-------------'----------------------------'\n");
+			break;
+		default:
+			if (use_color) {
+				r_cons_print (Color_RESET);
+			}
+			r_cons_printf ("] 0x%"PFMT64x "\n", to);
+	}
+	r_core_anal_stats_free (as);
+	return len;
+}
+
+
 static bool checkAnalType(RAnalOp *op, int t) {
 	if (t == 'c') {
 		switch (op->type) {
@@ -2454,7 +2519,7 @@
 		}
 		ut64 off = from + (i + skipblocks) * blocksize;
 		for (j = 0; j < blocksize ; j++) {
-			RAnalOp *op = r_core_anal_op (core, off + j);
+			RAnalOp *op = r_core_anal_op (core, off + j, R_ANAL_OP_MASK_BASIC);
 			if (op) {
 				if (op->size < 1) {
 					// do nothing
@@ -2495,7 +2560,7 @@
 	ut64 blocksize = 0;
 	int mode = 'b'; // e, p, b, ...
 	int submode = 0; // q, j, ...
-	
+
 	if (input[0]) {
 		char *spc = strchr (input, ' ');
 		if (spc) {
@@ -2545,7 +2610,7 @@
 		r_list_foreach (list, iter, map) {
 			to = r_itv_end (map->itv);
 		}
-		totalsize = to - from;	
+		totalsize = to - from;
 	} else {
 		from = core->offset;
 	}
@@ -2553,6 +2618,10 @@
 		nblocks = totalsize / blocksize;
 	} else {
 		blocksize = totalsize / nblocks;
+		 if (blocksize < 1) {
+			eprintf ("Invalid block size: %d\n", (int)blocksize);
+			return;
+		}
 	}
 	switch (mode) {
 	case '?': // bars
@@ -2585,7 +2654,7 @@
 				int len = 0;
 				for (i = 0; i < nblocks; i++) {
 					ut64 off = from + blocksize * (i + skipblocks);
-					r_core_read_at (core, off, p, blocksize);
+					r_io_read_at (core->io, off, p, blocksize);
 					for (j = k = 0; j < blocksize; j++) {
 						switch (submode) {
 						case '0':
@@ -2641,8 +2710,8 @@
 			}
 			for (i = 0; i < nblocks; i++) {
 				ut64 off = from + (blocksize * (i + skipblocks));
-				r_core_read_at (core, off, p, blocksize);
-				ptr[i] = (ut8) (256 * r_hash_entropy_fraction (p, blocksize));
+				r_io_read_at (core->io, off, p, blocksize);
+				ptr[i] = (ut8) (255 * r_hash_entropy_fraction (p, blocksize));
 			}
 			free (p);
 			r_print_columns (core->print, ptr, nblocks, 14);
@@ -2737,8 +2806,8 @@
 		}
 		for (i = 0; i < nblocks; i++) {
 			ut64 off = from + (blocksize * (i + skipblocks));
-			r_core_read_at (core, off, p, blocksize);
-			ptr[i] = (ut8) (256 * r_hash_entropy_fraction (p, blocksize));
+			r_io_read_at (core->io, off, p, blocksize);
+			ptr[i] = (ut8) (255 * r_hash_entropy_fraction (p, blocksize));
 		}
 		free (p);
 		print_bars = true;
@@ -2765,7 +2834,7 @@
 		int len = 0;
 		for (i = 0; i < nblocks; i++) {
 			ut64 off = from + blocksize * (i + skipblocks);
-			r_core_read_at (core, off, p, blocksize);
+			r_io_read_at (core->io, off, p, blocksize);
 			for (j = k = 0; j < blocksize; j++) {
 				switch (mode) {
 				case '0':
@@ -2809,7 +2878,7 @@
 	case 'b': // bytes
 	case '\0':
 		ptr = calloc (1, nblocks);
-		r_core_read_at (core, from, ptr, nblocks);
+		r_io_read_at (core->io, from, ptr, nblocks);
 		// TODO: support print_bars
 		r_print_fill (core->print, ptr, nblocks, from, blocksize);
 		R_FREE (ptr);
@@ -2898,10 +2967,15 @@
 		delta = (st32 *) (buf + i);
 		addr = offset + *delta;
 		if (!r_io_is_valid_offset (core->io, addr, 0)) {
-			break;
+			// Lets check for jmptbl with not relative addresses
+			// Like: jmp dword [eax*4 + jmptbl.0x5435345]
+			if (!r_io_is_valid_offset (core->io, *delta, 0)) {
+				break;
+			}
+			addr = *delta;
 		}
 		if (mode == '*') {
-			r_cons_printf ("af case.%d.0x%"PFMT64x " 0x%08"PFMT64x "\n", i, offset, addr);
+			r_cons_printf ("af case.%d.0x%"PFMT64x " 0x%08"PFMT64x "\n", n, offset, addr);
 			r_cons_printf ("ax 0x%"PFMT64x " 0x%08"PFMT64x "\n", offset, addr);
 			r_cons_printf ("ax 0x%"PFMT64x " 0x%08"PFMT64x "\n", addr, offset); // wrong, but useful because forward xrefs dont work :?
 			r_cons_printf ("aho case 0x%"PFMT64x " 0x%08"PFMT64x " @ 0x%08"PFMT64x "\n", (ut64)i, addr, offset + i); // wrong, but useful because forward xrefs dont work :?
@@ -3003,7 +3077,8 @@
 #endif
 
 #define P(x) (core->cons && core->cons->pal.x)? core->cons->pal.x
-static void disasm_recursive(RCore *core, ut64 addr, char type_print) {
+#if 0
+static void disasm_recursive_old(RCore *core, ut64 addr, char type_print) {
 	bool push[512];
 	int pushes = 0;
 	RAnalOp aop = {0};
@@ -3014,6 +3089,7 @@
 	}
 	ut8 *raw = calloc (core->blocksize, 1); // instruction coverage
 	if (!raw) {
+		free (buf);
 		return;
 	}
 	int count = 64;
@@ -3059,7 +3135,7 @@
 r_cons_printf ("base:\n");
 		r_core_cmdf (core, "pD %d @ 0x%08"PFMT64x, i - base, addr + base); //+ aop.size - base, addr + base);
 r_cons_printf ("base:\n");
-		
+
 	}
 #endif
 	// unlikely
@@ -3105,7 +3181,7 @@
 		}
 	}
 #if 0
-	// linear disasm 
+	// linear disasm
 	for (i = 0; i< core->blocksize; i++) {
 		if (!buf[i]) {
 			continue;
@@ -3117,12 +3193,101 @@
 	}
 #endif
 }
+#endif
+
+static void disasm_until_ret(RCore *core, ut64 addr, char type_print) {
+	int p = 0;
+	ut8 *buf = calloc (core->blocksize, 1);
+	if (!buf) {
+		return;
+	}
+	(void)r_io_read_at (core->io, addr, buf, core->blocksize);
+	while (p + 4 < core->blocksize) {
+		RAnalOp *op = r_core_anal_op (core, addr + p, R_ANAL_OP_MASK_BASIC);
+		if (op) {
+			r_cons_printf ("0x%08"PFMT64x"  %10s %s\n", addr + p, "", op->mnemonic);
+			if (op->type == R_ANAL_OP_TYPE_RET) {
+				break;
+			}
+			p += op->size;
+		} else {
+			eprintf ("[pdp] Cannot get op at 0x%08"PFMT64x"\n", addr + p);
+			r_anal_op_free (op);
+			break;
+		}
+		//r_io_read_at (core->io, n, rbuf, 512);
+		r_anal_op_free (op);
+	}
+	free (buf);
+}
+
+static void disasm_ropchain(RCore *core, ut64 addr, char type_print) {
+	int p = 0;
+	ut64 n = 0;
+	ut8 *buf = calloc (core->blocksize, 1);
+	(void)r_io_read_at (core->io, addr, buf, core->blocksize);
+	while (p + 4 < core->blocksize) {
+		if (core->assembler->bits == 64) {
+			n = r_read_ble64 (buf + p, core->print->big_endian);
+		} else {
+			n = r_read_ble32 (buf + p, core->print->big_endian);
+		}
+		r_cons_printf ("[0x%08"PFMT64x"] 0x%08"PFMT64x"\n", addr + p, n);
+		disasm_until_ret (core, n, type_print);
+		if (core->assembler->bits == 64) {
+			p += 8;
+		} else {
+			p += 4;
+		}
+	}
+	free (buf);
+}
 
+static void disasm_recursive(RCore *core, ut64 addr, int count, char type_print) {
+	RAnalOp aop = {0};
+	int ret;
+	ut8 buf[128];
+	if (type_print == 'j') {
+		r_cons_print ("[");
+	}
+	while (count-- > 0) {
+		r_io_read_at (core->io, addr, buf, sizeof (buf));
+		r_anal_op_fini (&aop);
+		ret = r_anal_op (core->anal, &aop, addr, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC);
+		if (ret < 0 || aop.size < 1) {
+			addr++;
+			continue;
+		}
+	//	r_core_cmdf (core, "pD %d @ 0x%08"PFMT64x, aop.size, addr);
+		if (type_print == 'j') {
+			r_core_print_disasm_json (core, addr, buf, sizeof (buf), 1);
+			if (count) {
+				r_cons_print (",");
+			}
+		} else {
+			r_core_cmdf (core, "pd 1 @ 0x%08"PFMT64x, addr);
+		}
+		switch (aop.type) {
+		case R_ANAL_OP_TYPE_JMP:
+			addr = aop.jump;
+			continue;
+			break;
+		case R_ANAL_OP_TYPE_UCJMP:
+			break;
+		}
+		addr += aop.size;
+	}
+	if (type_print == 'j') {
+		r_cons_print ("]\n");
+	}
+}
+
+#if 0
 static void _disasm_recursive(RCore *core, ut64 addr, char type_print) {
 	bool show_flags = r_config_get_i (core->config, "asm.flags");
 	bool show_bytes = r_config_get_i (core->config, "asm.bytes");
 	bool show_offset = r_config_get_i (core->config, "asm.offset");
-	bool show_imtrim = r_config_get_i (core->config, "asm.immtrim");
+	bool show_imtrim = r_config_get_i (core->config, "asm.imm.trim");
 	Sdb *db = sdb_new0 ();
 	RAsmOp asmop = {0};
 	RAnalOp aop = {0};
@@ -3150,7 +3315,7 @@
 			}
 			if (loop > 0) {
 				if (show_flags) {
-					const char *x = sdb_const_get (db, sdb_fmt (-1, "label.0x%"PFMT64x, addr + i), NULL);
+					const char *x = sdb_const_get (db, sdb_fmt ("label.0x%"PFMT64x, addr + i), NULL);
 					if (x) {
 						r_cons_printf ("%s:\n", x);
 					}
@@ -3179,8 +3344,8 @@
 				break;
 			case R_ANAL_OP_TYPE_CALL:
 			case R_ANAL_OP_TYPE_CJMP:
-				sdb_set (db, sdb_fmt (-1, "label.0x%"PFMT64x, aop.jump),
-					sdb_fmt (-1, "from.0x%"PFMT64x, addr + i), 0);
+				sdb_set (db, sdb_fmt ("label.0x%"PFMT64x, aop.jump),
+					sdb_fmt ("from.0x%"PFMT64x, addr + i), 0);
 				break;
 			}
 			if (aop.size < 1) {
@@ -3191,10 +3356,11 @@
 	r_anal_op_fini (&aop);
 	sdb_free (db);
 }
+#endif
 
 static void func_walk_blocks(RCore *core, RAnalFunction *f, char input, char type_print, bool fromHere) {
 	RListIter *iter;
-	RAnalBlock *b;
+	RAnalBlock *b = NULL;
 	RAnalFunction *tmp_func;
 	RListIter *locs_it = NULL;
 
@@ -3202,15 +3368,17 @@
 		locs_it = f->fcn_locs->head;
 	}
 	// XXX: hack must be reviewed/fixed in code analysis
-	if (r_list_length (f->bbs) == 1) {
-		ut32 fcn_size = r_anal_fcn_realsize (f);
-		b = r_list_get_top (f->bbs);
-		if (b->size > fcn_size) {
-			b->size = fcn_size;
+	if (b) {
+		if (r_list_length (f->bbs) == 1) {
+			ut32 fcn_size = r_anal_fcn_realsize (f);
+			b = r_list_get_top (f->bbs);
+			if (b->size > fcn_size) {
+				b->size = fcn_size;
+			}
 		}
 	}
 	r_list_sort (f->bbs, (RListComparator) bbcmp);
-	if (input == 'j') {
+	if (input == 'j' && b) {
 		r_cons_print ("[");
 		bool isFirst = true;
 		for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {
@@ -3305,7 +3473,7 @@
 		}
 		r_cons_print ("]");
 	} else {
-		bool asm_lines = r_config_get_i (core->config, "asm.lines");
+		bool asm_lines = r_config_get_i (core->config, "asm.lines.bb");
 		bool emu = r_config_get_i (core->config, "asm.emu");
 		ut64 saved_gp = 0;
 		ut8 *saved_arena = NULL;
@@ -3314,7 +3482,7 @@
 			saved_gp = core->anal->gp;
 			saved_arena = r_reg_arena_peek (core->anal->reg);
 		}
-		r_config_set_i (core->config, "asm.lines", 0);
+		r_config_set_i (core->config, "asm.lines.bb", 0);
 		for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {
 			if (tmp_func->addr >= f->addr) {
 				break;
@@ -3343,7 +3511,7 @@
 			}
 		}
 		core->anal->stackptr = saved_stackptr;
-		r_config_set_i (core->config, "asm.lines", asm_lines);
+		r_config_set_i (core->config, "asm.lines.bb", asm_lines);
 	}
 }
 
@@ -3408,19 +3576,7 @@
 	}
 	switch (lang) {
 	case '?':
-		r_cons_println ("Valid print code formats are: JSON, C, Python, Cstring (pcj, pc, pcp, pcs) \n"
-		"  pc     C\n"
-		"  pc*    print 'wx' r2 commands\n"
-		"  pch    C half-words (2 byte)\n"
-		"  pcw    C words (4 byte)\n"
-		"  pcd    C dwords (8 byte)\n"
-		"  pca    GAS .byte blob\n"
-		"  pcA    .bytes with instructions in comments\n"
-		"  pcs    string\n"
-		"  pcS    shellscript that reconstructs the bin\n"
-		"  pcj    json\n"
-		"  pcJ    javascript\n"
-		"  pcp    python");
+		r_core_cmd_help ((RCore *)p->user, help_msg_pc);
 		break;
 	case '*':
 		p->cb_printf ("wx ");
@@ -3523,14 +3679,13 @@
 
 static int cmd_print(void *data, const char *input) {
 	RCore *core = (RCore *) data;
-	RCoreAnalStats *as;
-	RCoreAnalStatsItem total = {0};
-	int mode, w, p, i, l, len, ret;
+	int i, l, len, ret;
+	ut8* block;
 	ut32 tbs = core->blocksize;
 	ut64 n, off, from, to, at, ate, piece;
 	ut64 tmpseek = UT64_MAX;
 	const int addrbytes = core->io->addrbytes;
-	mode = w = p = i = l = len = ret = 0;
+	i = l = len = ret = 0;
 	n = off = from = to = at = ate = piece = 0;
 
 	r_print_init_rowoffsets (core->print);
@@ -3617,6 +3772,8 @@
 		r_core_seek (core, off, SEEK_SET);
 		r_core_block_read (core);
 	}
+	// TODO After core->block is removed, this should be changed to a block read.
+	block = core->block;
 	switch (*input) {
 	case 'w': // "pw"
 		if (input[1] == 'n') {
@@ -3641,7 +3798,7 @@
 				ut8 *data = calloc (core->offset + 1, 1);
 				if (data) {
 					data[core->offset] = 0;
-					(void)r_core_read_at (core, 0, data, core->offset);
+					(void)r_io_read_at (core->io, 0, data, core->offset);
 					char *res = r_print_json_path ((const char *)data, core->offset);
 					if (res) {
 						eprintf ("-> res(%s)\n", res);
@@ -3658,14 +3815,12 @@
 				r_core_cmdf (core, "pj %"PFMT64d" @ 0", core->offset);
 			}
 		} else {
-			char *str = r_str_ndup ((const char *)core->block, core->blocksize);
-			if (!memcmp (str, "\xff\xff\xff\xff", 4)) {
+			if (core->blocksize < 4 || !memcmp (core->block, "\xff\xff\xff\xff", 4)) {
 				eprintf ("Cannot read\n");
 			} else {
-				char *res = r_print_json_indent (str, true, "  ", NULL);
+				char *res = r_print_json_indent ((const char *)core->block, true, "  ", NULL);
 				r_cons_printf ("%s\n", res);
 				free (res);
-				free (str);
 			}
 		}
 		break;
@@ -3673,162 +3828,10 @@
 		cmd_print_ph (core, input + 1);
 		break;
 	case 'v': // "pv"
-		cmd_print_pv (core, input + 1);
+		cmd_print_pv (core, input + 1, block);
 		break;
 	case '-': // "p-"
-		mode = input[1];
-		w = (int)(core->print->cols * 2.7);
-		if (mode == 'j') {
-			r_cons_strcat ("{");
-		}
-		off = core->offset;
-		{
-			RList *list = r_core_get_boundaries_prot (core, -1, NULL, "search");
-			RIOMap *map = r_list_first (list);
-			if (map) {
-				from = map->itv.addr;
-				to = r_itv_end (map->itv);
-			}
-			r_list_free (list);
-		}
-		piece = R_MAX ((to - from) / w, 1);
-		as = r_core_anal_get_stats (core, from, to, piece);
-		if (!as && mode != '?') {
-			return 0;
-		}
-		// eprintf ("RANGE = %llx %llx\n", from, to);
-		switch (mode) {
-		case '?':
-			r_core_cmd_help (core, help_msg_p_minus);
-			return 0;
-		case 'j': // "p-j"
-			r_cons_printf (
-				"\"from\":%"PFMT64d ","
-				"\"to\":%"PFMT64d ","
-				"\"blocksize\":%d,"
-				"\"blocks\":[", from, to, piece);
-			break;
-		case 'h': // "p-h"
-			r_cons_printf (".-------------.----------------------------.\n");
-			r_cons_printf ("|   offset    | flags funcs cmts syms str  |\n");
-			r_cons_printf ("|-------------)----------------------------|\n");
-			break;
-		default:
-			r_cons_printf ("0x%"PFMT64x " [", from);
-		}
-
-		bool use_color = r_config_get_i (core->config, "scr.color");
-		len = 0;
-		for (i = 0; i < ((to-from)/piece); i++) {
-			at = from + (piece * i);
-			ate = at + piece;
-			p = (at - from) / piece;
-			switch (mode) {
-			case 'j':
-				r_cons_printf ("%s{", len? ",": "");
-				if ((as->block[p].flags)
-				|| (as->block[p].functions)
-				|| (as->block[p].comments)
-				|| (as->block[p].symbols)
-				|| (as->block[p].rwx)
-				|| (as->block[p].strings)) {
-					r_cons_printf ("\"offset\":%"PFMT64d ",", at), l++;
-					r_cons_printf ("\"size\":%"PFMT64d ",", piece), l++;
-				}
-				// TODO: simplify with macro
-				l = 0;
-				if (as->block[p].flags) {
-					r_cons_printf ("%s\"flags\":%d", l? ",": "", as->block[p].flags), l++;
-				}
-				if (as->block[p].functions) {
-					r_cons_printf ("%s\"functions\":%d", l? ",": "", as->block[p].functions), l++;
-				}
-				if (as->block[p].comments) {
-					r_cons_printf ("%s\"comments\":%d", l? ",": "", as->block[p].comments), l++;
-				}
-				if (as->block[p].symbols) {
-					r_cons_printf ("%s\"symbols\":%d", l? ",": "", as->block[p].symbols), l++;
-				}
-				if (as->block[p].strings) {
-					r_cons_printf ("%s\"strings\":%d", l? ",": "", as->block[p].strings), l++;
-				}
-				if (as->block[p].rwx) {
-					r_cons_printf ("%s\"rwx\":\"%s\"", l? ",": "", r_str_rwx_i (as->block[p].rwx)), l++;
-				}
-				r_cons_strcat ("}");
-				len++;
-				break;
-			case 'h':
-				total.flags += as->block[p].flags;
-				total.functions += as->block[p].functions;
-				total.comments += as->block[p].comments;
-				total.symbols += as->block[p].symbols;
-				total.strings += as->block[p].strings;
-				if ((as->block[p].flags)
-				|| (as->block[p].functions)
-				|| (as->block[p].comments)
-				|| (as->block[p].symbols)
-				|| (as->block[p].strings)) {
-					r_cons_printf ("| 0x%09"PFMT64x " | %4d %4d %4d %4d %4d   |\n", at,
-						as->block[p].flags,
-						as->block[p].functions,
-						as->block[p].comments,
-						as->block[p].symbols,
-						as->block[p].strings);
-				}
-				break;
-			default:
-				if (off >= at && off < ate) {
-					r_cons_memcat ("^", 1);
-				} else {
-					RIOSection *s = r_io_section_vget (core->io, at);
-					if (use_color) {
-						if (s) {
-							if (s->flags & 1) {
-								r_cons_print (Color_BGBLUE);
-							} else {
-								r_cons_print (Color_BGGREEN);
-							}
-						} else {
-							r_cons_print (Color_BGRED);
-						}
-					}
-					if (as->block[p].strings > 0) {
-						r_cons_memcat ("z", 1);
-					} else if (as->block[p].symbols > 0) {
-						r_cons_memcat ("s", 1);
-					} else if (as->block[p].functions > 0) {
-						r_cons_memcat ("F", 1);
-					} else if (as->block[p].comments > 0) {
-						r_cons_memcat ("c", 1);
-					} else if (as->block[p].flags > 0) {
-						r_cons_memcat (".", 1);
-					} else {
-						r_cons_memcat ("_", 1);
-					}
-				}
-				break;
-			}
-		}
-		switch (mode) {
-		case 'j':
-			r_cons_strcat ("]}\n");
-			break;
-		case 'h':
-			// r_cons_printf ("  total    | flags funcs cmts syms str  |\n");
-			r_cons_printf ("|-------------)----------------------------|\n");
-			r_cons_printf ("|    total    | %4d %4d %4d %4d %4d   |\n",
-				total.flags, total.functions, total.comments, total.symbols, total.strings);
-			r_cons_printf ("`-------------'----------------------------'\n");
-			break;
-		default:
-			if (use_color) {
-				r_cons_print (Color_RESET);
-			}
-			r_cons_printf ("] 0x%"PFMT64x "\n", to);
-		}
-		r_core_anal_stats_free (as);
-		break;
+		return cmd_print_blocks (core, input + 1);
 	case '=': // "p="
 		cmd_print_bars (core, input);
 		break;
@@ -3854,40 +3857,12 @@
 	break;
 	case 'a': // "pa"
 	{
-		ut32 new_bits = -1;
-		int segoff, old_bits, pos = 0;
-		ut8 settings_changed = false;
-		char *new_arch = NULL, *old_arch = NULL, *hex = NULL;
-		old_arch = strdup (r_config_get (core->config, "asm.arch"));
-		old_bits = r_config_get_i (core->config, "asm.bits");
-		segoff = r_config_get_i (core->config, "asm.segoff");
-		if (input[1] != ' ') {
-			if (input[0]) {
-				for (pos = 1; pos < R_BIN_SIZEOF_STRINGS && input[pos]; pos++) {
-					if (input[pos] == ' ') {
-						break;
-					}
-				}
-			}
+		const char *arg = NULL;
 
-			if (!r_core_process_input_pade (core, input + pos, &hex, &new_arch, &new_bits)) {
-				// XXX - print help message
-				// return false;
-			}
-
-			if (!new_arch) {
-				new_arch = strdup (old_arch);
-			}
-			if (new_bits == -1) {
-				new_bits = old_bits;
-			}
-
-			if (strcmp (new_arch, old_arch) != 0 || new_bits != old_bits) {
-				r_core_set_asm_configs (core, new_arch, new_bits, segoff);
-				r_anal_hint_set_bits (core->anal, core->offset, new_bits);
-				settings_changed = true;
-			}
+		if (input[1] != '\0') {
+			arg = r_str_trim_ro (input + 2);
 		}
+
 		if (input[1] == 'e') { // "pae"
 			if (input[2] == '?') {
 				r_cons_printf ("|Usage: pae [hex]       assemble esil from hexpairs\n");
@@ -3897,15 +3872,17 @@
 					0
 				};
 				const char *str;
-// char *buf = strdup (input+2);
-				bufsz = r_hex_str2bin (hex, (ut8 *) hex);
+				char *hex_arg = malloc (strlen (arg));
+
+				bufsz = r_hex_str2bin (arg, (ut8 *) hex_arg);
 				ret = r_anal_op (core->anal, &aop, core->offset,
-					(const ut8 *) hex, bufsz);
+					(const ut8 *) hex_arg, bufsz, R_ANAL_OP_MASK_ESIL);
 				if (ret > 0) {
 					str = R_STRBUF_SAFEGET (&aop.esil);
 					r_cons_println (str);
 				}
 				r_anal_op_fini (&aop);
+				free (hex_arg);
 			}
 		} else if (input[1] == 'D') {
 			if (input[2] == '?') {
@@ -3919,7 +3896,7 @@
 			} else {
 				RAsmCode *c;
 				r_asm_set_pc (core->assembler, core->offset);
-				c = r_asm_mdisassemble_hexstr (core->assembler, hex);
+				c = r_asm_mdisassemble_hexstr (core->assembler, arg);
 				if (c) {
 					r_cons_print (c->buf_asm);
 					r_asm_code_free (c);
@@ -3928,7 +3905,7 @@
 				}
 			}
 		} else if (input[1] == '?') {
-			r_cons_printf ("|Usage: pa[ed] [hex|asm]  assemble (pa) disasm (pad)"
+			r_cons_printf ("|Usage: pa[edD] [asm|hex]  assemble (pa), disasm (pa[dD]),"
 				" esil (pae) from hexpairs\n");
 		} else {
 			RAsmCode *acode;
@@ -3946,16 +3923,6 @@
 				r_asm_code_free (acode);
 			}
 		}
-		if (settings_changed) {
-			r_core_set_asm_configs (core, old_arch, old_bits, segoff);
-			r_anal_hint_set_bits (core->anal, core->offset, old_bits);
-			r_anal_build_range_on_hints (core->anal);
-			r_core_seek_archbits (core, core->offset);
-			// r_anal_hint_set_bits (core->anal, core->offset, oldbits);
-		}
-		free (hex);
-		free (old_arch);
-		free (new_arch);
 	}
 	break;
 	case 'b': { // "pb"
@@ -3984,15 +3951,20 @@
 			}
 			if (buf) {
 				int buf_len;
-				r_str_bits (buf, core->block, size, NULL);
+				r_str_bits (buf, block, size, NULL);
 				buf_len = strlen (buf);
-				if (from >= buf_len) {
-					from = buf_len;
-				}
-				if (to < buf_len) {
-					buf[to] = 0;
+				if (from < 0 || to < 0) {
+					// do nothing
+				} else {
+					if (from >= buf_len) {
+						from = buf_len;
+					}
+					if (to >= 0 && to < buf_len) {
+						buf[to] = 0;
+						//buf[buf_len - 1] = 0;
+					}
+					r_cons_println (buf + from);
 				}
-				r_cons_println (buf + from);
 				free (buf);
 			} else {
 				eprintf ("ERROR: Cannot malloc %d byte(s)\n", size);
@@ -4028,7 +4000,7 @@
 				if (input[2]) {
 					cmd_pDj (core, input + 2);
 				} else {
-					cmd_pDj (core, sdb_fmt (0, "%d", core->blocksize));
+					cmd_pDj (core, sdb_fmt ("%d", core->blocksize));
 				}
 			}
 			break;
@@ -4071,7 +4043,7 @@
 			break;
 		case 'j': // pij is the same as pdj
 			if (l != 0) {
-				cmd_pdj (core, input + 2);
+				cmd_pdj (core, input + 2, block);
 			}
 			break;
 		case 'd': // "pid" is the same as pdi
@@ -4134,16 +4106,9 @@
 	case 'D': // "pD"
 	case 'd': // "pd"
 	{
-		ut64 current_offset = core->offset;
-		ut32 new_bits = -1;
 		ut64 use_blocksize = core->blocksize;
-		int segoff, old_bits, pos = 0;
-		ut8 settings_changed = false, bw_disassemble = false;
-		char *new_arch = NULL, *old_arch = NULL;
+		ut8 bw_disassemble = false;
 		ut32 pd_result = false, processed_cmd = false;
-		old_arch = strdup (r_config_get (core->config, "asm.arch"));
-		segoff = r_config_get_i (core->config, "asm.segoff");
-		old_bits = r_config_get_i (core->config, "asm.bits");
 		bool formatted_json = false;
 
 		if (input[1] && input[2]) {
@@ -4153,33 +4118,13 @@
 				if (len == 0) {
 					break;
 				}
+				use_blocksize = len;
 			}
 		}
-		// XXX - this is necessay b/c radare will automatically
-		// swap flags if arch is x86 and bits == 16 see: __setsegoff in config.c
-
-		// get to the space
-		if (input[0]) {
-			for (pos = 1; pos < R_BIN_SIZEOF_STRINGS && input[pos]; pos++) {
-				if (input[pos] == ' ') {
-					break;
-				}
-			}
-		}
-
-		if (!process_input (core, input + pos, &use_blocksize, &new_arch, &new_bits)) {
-			// XXX - print help message
-			// return false;
-		}
-		if (!use_blocksize) {
-			use_blocksize = core->blocksize;
-		}
 
 		if (core->blocksize_max < use_blocksize && (int) use_blocksize < -core->blocksize_max) {
 			eprintf ("This block size is too big (%"PFMT64d "<%"PFMT64d "). Did you mean 'p%c @ 0x%08"PFMT64x "' instead?\n",
 				(ut64) core->blocksize_max, (ut64) use_blocksize, input[0], (ut64) use_blocksize);
-			free (old_arch);
-			free (new_arch);
 			goto beach;
 		} else if (core->blocksize_max < use_blocksize && (int) use_blocksize > -(int)core->blocksize_max) {
 			bw_disassemble = true;
@@ -4189,20 +4134,6 @@
 			l = use_blocksize;
 		}
 
-		if (!new_arch) {
-			new_arch = strdup (old_arch);
-		}
-		if (new_bits == -1) {
-			new_bits = old_bits;
-		}
-
-		if (strcmp (new_arch, old_arch) != 0 || new_bits != old_bits) {
-			r_core_set_asm_configs (core, new_arch, new_bits, segoff);
-			// hints handy for arm
-			r_anal_hint_set_bits (core->anal, core->offset, new_bits);
-			settings_changed = true;
-		}
-
 		switch (input[1]) {
 		case 'C': // "pdC"
 			r_core_disasm_pdi (core, l, 0, 'C');
@@ -4236,7 +4167,11 @@
 			break;
 		case 'R': // "pdR"
 			processed_cmd = true;
-			disasm_recursive (core, core->offset, 'D');
+			if (input[2] == 'j') {
+				disasm_recursive (core, core->offset, use_blocksize, 'j');
+			} else {
+				disasm_recursive (core, core->offset, use_blocksize, 'D');
+			}
 			pd_result = true;
 			break;
 		case 'r': // "pdr"
@@ -4254,15 +4189,24 @@
 			break;
 		case 'b': // "pdb"
 			processed_cmd = true;
-			{
+			if (input[2] == '?') {
+				r_cons_printf ("Usage: pdb[j]  - disassemble basic block\n");
+			} else {
 				RAnalBlock *b = r_anal_bb_from_offset (core->anal, core->offset);
 				if (b) {
 					ut8 *block = malloc (b->size + 1);
 					if (block) {
-						r_core_read_at (core, b->addr, block, b->size);
-						core->num->value = r_core_print_disasm (
-							core->print, core, b->addr, block,
-							b->size, 9999, 0, 2, input[2] == 'J');
+						r_io_read_at (core->io, b->addr, block, b->size);
+
+						if (input[2] == 'j') {
+							r_cons_print ("[");
+							r_core_print_disasm_json (core, b->addr, block, b->size, 0);
+							r_cons_print ("]\n");
+						} else {
+							core->num->value = r_core_print_disasm (
+								core->print, core, b->addr, block,
+								b->size, 9999, 0, 2, input[2] == 'J', NULL);
+						}
 						free (block);
 						pd_result = 0;
 					}
@@ -4275,7 +4219,7 @@
 		case 's': // "pds" and "pdsf"
 			processed_cmd = true;
 			if (input[2] == '?') {
-				r_cons_printf ("Usage: pds[f]  - sumarize N bytes or function (pdfs)\n");
+				r_cons_printf ("Usage: pds[bf]  - sumarize N bytes or function (pdfs)\n");
 			} else {
 				disasm_strings (core, input, NULL);
 			}
@@ -4307,7 +4251,8 @@
 					locs_it = f->fcn_locs->head;
 				}
 				if (f && input[2] == 'j') { // "pdfj"
-					ut8 *func_buf = NULL, *loc_buf = NULL;
+					ut8 *loc_buf = NULL;
+					RAnalBlock *b;
 					ut32 fcn_size = r_anal_fcn_realsize (f);
 					cont_size = tmp_get_contsize (f);
 					r_cons_printf ("{");
@@ -4316,47 +4261,54 @@
 					r_cons_printf (",\"addr\":%"PFMT64d, f->addr);
 					r_cons_printf (",\"ops\":[");
 					// instructions are all outputted as a json list
-					func_buf = calloc (cont_size, 1);
+					cont_size = f->_size > 0 ? f->_size : r_anal_fcn_realsize (f);
 					bool first = true;
-					if (func_buf) {
-						// TODO: can loc jump to another locs?
-						for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {
-							if (tmp_func->addr > f->addr) {
-								break;
-							}
-							cont_size = tmp_get_contsize (tmp_func);
-							loc_buf = calloc (cont_size, 1);
-							r_io_read_at (core->io, tmp_func->addr, loc_buf, cont_size);
-							if (!first) {
-								r_cons_print (",");
-							}
-							r_core_print_disasm_json (core, tmp_func->addr, loc_buf, cont_size, 0);
-							first = false;
-							free (loc_buf);
+					bool prev_result = true;
+					// TODO: can loc jump to another locs?
+					for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {
+						if (tmp_func->addr > f->addr) {
+							break;
 						}
-						cont_size = tmp_get_contsize (f);
-						r_io_read_at (core->io, f->addr, func_buf, cont_size);
-						if (!first) {
+						cont_size = tmp_get_contsize (tmp_func);
+						loc_buf = calloc (cont_size, 1);
+						r_io_read_at (core->io, tmp_func->addr, loc_buf, cont_size);
+						if (!first && prev_result) {
 							r_cons_print (",");
 						}
-						r_core_print_disasm_json (core, f->addr, func_buf, cont_size, 0);
+						prev_result = r_core_print_disasm_json (core, tmp_func->addr, loc_buf, cont_size, 0);
 						first = false;
-						free (func_buf);
-						for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {
-							cont_size = tmp_get_contsize (tmp_func);
-							loc_buf = calloc (cont_size, 1);
-							if (loc_buf) {
-								r_io_read_at (core->io, tmp_func->addr, loc_buf, cont_size);
-								if (!first) {
-									r_cons_print (",");
-								}
-								r_core_print_disasm_json (core, tmp_func->addr, loc_buf, cont_size, 0);
+						free (loc_buf);
+					}
+					prev_result = true;
+					r_list_foreach (f->bbs, locs_it, b) {
+
+						ut8 *buf = malloc (b->size);
+						if (buf) {
+							if (first) {
 								first = false;
-								free (loc_buf);
+							} else if (!first && prev_result) {
+								r_cons_print (",");
 							}
+							r_io_read_at (core->io, b->addr, buf, b->size);
+							prev_result = r_core_print_disasm_json (core, b->addr, buf, b->size, 0);
+							free (buf);
+						} else {
+							eprintf ("cannot allocate %d byte(s)\n", b->size);
+						}
+					}
+					prev_result = true;
+					for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {
+						cont_size = tmp_get_contsize (tmp_func);
+						loc_buf = calloc (cont_size, 1);
+						if (loc_buf) {
+							r_io_read_at (core->io, tmp_func->addr, loc_buf, cont_size);
+							if (!first && prev_result) {
+								r_cons_print (",");
+							}
+							prev_result = r_core_print_disasm_json (core, tmp_func->addr, loc_buf, cont_size, 0);
+							first = false;
+							free (loc_buf);
 						}
-					} else {
-						eprintf ("cannot allocate %d byte(s)\n", fcn_size);
 					}
 					r_cons_printf ("]}\n");
 					pd_result = 0;
@@ -4376,8 +4328,13 @@
 					if (bbsum + 4096 < linear) {
 						eprintf ("Linear size differs too much from the bbsum, please use pdr instead.\n");
 					} else {
-						r_core_cmdf (core, "pD %d @ 0x%08" PFMT64x,
-							f->_size > 0 ? f->_size: r_anal_fcn_realsize (f), f->addr);
+						ut64 at = f->addr;
+						ut64 sz = f->_size > 0 ? f->_size : r_anal_fcn_realsize (f);
+						ut8 *buf = calloc (sz, 1);
+						(void)r_io_read_at (core->io, at, buf, sz);
+						core->num->value = r_core_print_disasm (core->print, core, at, buf, sz, sz, 0, 1, 0, f);
+						free (buf);
+						// r_core_cmdf (core, "pD %d @ 0x%08" PFMT64x, f->_size > 0 ? f->_size: r_anal_fcn_realsize (f), f->addr);
 					}
 #if 0
 					for (; locs_it && (tmp_func = locs_it->data); locs_it = locs_it->n) {
@@ -4397,18 +4354,22 @@
 			}
 			l = 0;
 			break;
-		case 'l': // pdl
+		case 'p': // "pdp"
+			processed_cmd = true;
+			disasm_ropchain (core, core->offset, 'D');
+			pd_result = true;
+			break;
+		case 'l': // "pdl"
 			processed_cmd = true;
 			{
 				RAsmOp asmop;
 				int j, ret;
-				const ut8 *buf = core->block;
 				if (!l) {
 					l = len;
 				}
 				r_cons_break_push (NULL, NULL);
 				for (i = j = 0; i < core->blocksize && j < l; i += ret, j++) {
-					ret = r_asm_disassemble (core->assembler, &asmop, buf + i, len - i);
+					ret = r_asm_disassemble (core->assembler, &asmop, block + i, len - i);
 					if (r_cons_is_breaked ()) {
 						break;
 					}
@@ -4426,7 +4387,7 @@
 			if (*input == 'D') {
 				cmd_pDj (core, input + 2);
 			} else {
-				cmd_pdj (core, input + 2);
+				cmd_pdj (core, input + 2, block);
 			}
 			r_cons_newline ();
 			pd_result = 0;
@@ -4447,20 +4408,22 @@
 		}
 		if (!processed_cmd) {
 			ut64 addr = core->offset;
-			ut8 *block = NULL;
+			ut8 *block1 = NULL;
 			ut64 start;
 
 			if (bw_disassemble) {
-				block = malloc (core->blocksize);
+				block1 = malloc (core->blocksize);
 				if (l < 0) {
 					l = -l;
 				}
-				if (block) {
+				if (block1) {
 					if (*input == 'D') { // pD
-						free (block);
-						block = malloc (l);
-						r_core_read_at (core, addr - l, block, l); // core->blocksize);
-						core->num->value = r_core_print_disasm (core->print, core, addr - l, block, l, l, 0, 1, formatted_json);
+						free (block1);
+						if (!(block1 = malloc (l))) {
+							break;
+						}
+						r_io_read_at (core->io, addr - l, block1, l); // core->blocksize);
+						core->num->value = r_core_print_disasm (core->print, core, addr - l, block1, l, l, 0, 1, formatted_json, NULL);
 					} else { // pd
 						int instr_len;
 						if (r_core_prevop_addr (core, core->offset, l, &start)) {
@@ -4473,17 +4436,17 @@
 						ut64 prevaddr = core->offset;
 						int bs = core->blocksize, bs1 = addrbytes * instr_len;
 						if (bs1 > bs) {
-							block = realloc (block, bs1);
+							block1 = realloc (block1, bs1);
 						}
 						r_core_seek (core, prevaddr - instr_len, true);
-						memcpy (block, core->block, bs);
+						memcpy (block1, block, bs);
 						if (bs1 > bs) {
-							r_core_read_at (core, addr + bs / addrbytes, block + (bs - bs % addrbytes),
-															bs1 - (bs - bs % addrbytes));
+							r_io_read_at (core->io, addr + bs / addrbytes,
+								block1 + (bs - bs % addrbytes),
+								bs1 - (bs - bs % addrbytes));
 						}
-
 						core->num->value = r_core_print_disasm (core->print,
-							core, core->offset, block, bs1, l, 0, 1, formatted_json);
+							core, core->offset, block1, bs1, l, 0, 1, formatted_json, NULL);
 						r_core_seek (core, prevaddr, true);
 					}
 				}
@@ -4499,42 +4462,37 @@
 						eprintf ("Block size too big\n");
 						return 1;
 					}
-					block = malloc (addrbytes * l);
-					if (block) {
+					block1 = malloc (addrbytes * l);
+					if (block1) {
 						if (addrbytes * l > core->blocksize) {
-							r_core_read_at (core, addr, block, addrbytes * l); // core->blocksize);
+							r_io_read_at (core->io, addr, block1, addrbytes * l); // core->blocksize);
 						} else {
-							memcpy (block, core->block, addrbytes * l);
+							memcpy (block1, block, addrbytes * l);
 						}
 						core->num->value = r_core_print_disasm (core->print,
-							core, addr, block, addrbytes * l, l, 0, 1, formatted_json);
+							core, addr, block1, addrbytes * l, l, 0, 1, formatted_json, NULL);
 					} else {
 						eprintf ("Cannot allocate %d byte(s)\n", addrbytes * l);
 					}
 				} else {
 					int bs1 = l * 16;
-					block = malloc (R_MAX (bs, bs1));
-					memcpy (block, core->block, bs);
-					if (bs1 > bs) {
-						r_core_read_at (core, addr + bs / addrbytes, block + (bs - bs % addrbytes),
-													  bs1 - (bs - bs % addrbytes));
-					}
-					core->num->value = r_core_print_disasm (core->print,
-						core, addr, block, bs1, l, 0, 0, formatted_json);
-				}
-			}
-			free (block);
-		}
-		core->offset = current_offset;
-		// change back asm setting if they were changed
-		if (settings_changed) {
-			r_core_set_asm_configs (core, old_arch, old_bits, segoff);
-			r_anal_hint_set_bits (core->anal, core->offset, old_bits);
-			r_anal_build_range_on_hints (core->anal);
-			r_core_seek_archbits (core, core->offset);
+					block1 = malloc (R_MAX (bs, bs1));
+					if (block1) {
+						memcpy (block1, block, bs);
+						if (bs1 > bs) {
+							r_io_read_at (core->io, addr + bs / addrbytes, block1 + (bs - bs % addrbytes),
+									bs1 - (bs - bs % addrbytes));
+						}
+						core->num->value = r_core_print_disasm (core->print,
+								core, addr, block1, bs1, l, 0, 0, formatted_json, NULL);
+					}
+				}
+			}
+			free (block1);
+			if (formatted_json) {
+				r_cons_print ("\n");
+			}
 		}
-		free (old_arch);
-		free (new_arch);
 		if (processed_cmd) {
 			ret = pd_result;
 			goto beach;
@@ -4594,7 +4552,7 @@
 					delta = core->offset;
 				}
 				p = buf + delta;
-				r_core_read_at (core, core->offset - delta, buf, 1024);
+				r_io_read_at (core->io, core->offset - delta, buf, 1024);
 				for (b = p; b > buf; b--) {
 					if (!IS_PRINTABLE (*b)) {
 						b++;
@@ -4617,7 +4575,7 @@
 			break;
 		case 'x': // "psx"
 			if (l > 0) {
-				r_print_string (core->print, core->offset, core->block, len, 0);
+				r_print_string (core->print, core->offset, block, len, R_PRINT_STRING_ESC_NL);
 			}
 			break;
 		case 'b': // "psb"
@@ -4632,7 +4590,7 @@
 					}
 					// TODO: filter more chars?
 					for (i = j = 0; i < core->blocksize; i++) {
-						char ch = (char) core->block[i];
+						char ch = (char) block[i];
 						if (!ch) {
 							if (!hasnl) {
 								s[j] = 0;
@@ -4766,7 +4724,7 @@
 				"|   foo@0x40   # use 'foo' magic file on address 0x40\n"
 				"|   @0x40      # use current magic file on address 0x40\n"
 				"|   \\n         # append newline\n"
-				"| e dir.magic  # defaults to "R_MAGIC_PATH "\n"
+				"| e dir.magic  # defaults to " R_JOIN_2_PATHS ("{R2_PREFIX}", R2_SDB_MAGIC) "\n"
 				"| /m           # search for magic signatures\n"
 				);
 		} else {
@@ -4851,7 +4809,7 @@
 	case 'r': // "pr"
 		switch (input[1]) {
 		case 'c': // "prc" // color raw dump
-			cmd_prc (core, len);
+			cmd_prc (core, block, len);
 			break;
 		case '?':
 			r_cons_printf ("|Usage: pr[glx] [size]\n"
@@ -4871,34 +4829,28 @@
 				break;
 			case 'i': // "prgi"
 			{
-				int sz, outlen = 0;
+				int outlen = 0;
 				int inConsumed = 0;
-				ut8 *in, *out;
-				in = core->block;
-				sz = core->blocksize;
-				out = r_inflate (in, sz, &inConsumed, &outlen);
+				ut8 *out;
+				out = r_inflate (block, core->blocksize, &inConsumed, &outlen);
 				r_cons_printf ("%d\n", inConsumed);
 				free (out);
 			}
 			break;
 			case 'o': // "prgo"
 			{
-				int sz, outlen = 0;
-				ut8 *in, *out;
-				in = core->block;
-				sz = core->blocksize;
-				out = r_inflate (in, sz, NULL, &outlen);
+				int outlen = 0;
+				ut8 *out;
+				out = r_inflate (block, core->blocksize, NULL, &outlen);
 				r_cons_printf ("%d\n", outlen);
 				free (out);
 			}
 			break;
 			default:
 			{
-				int sz, outlen = 0;
-				ut8 *in, *out;
-				in = core->block;
-				sz = core->blocksize;
-				out = r_inflate (in, sz, NULL, &outlen);
+				int outlen = 0;
+				ut8 *out;
+				out = r_inflate (block, core->blocksize, NULL, &outlen);
 				if (out) {
 					r_cons_memcat ((const char *) out, outlen);
 				}
@@ -4932,7 +4884,7 @@
 	case '3': // "p3" [file]
 		if (input[1] == '?') {
 			eprintf ("Usage: p3 [file] - print 3D stereogram image of current block\n");
-		} else if (input[1] == ' ')          {
+		} else if (input[1] == ' ') {
 			char *data = r_file_slurp (input + 2, NULL);
 			char *res = r_print_stereogram (data, 78, 20);
 			r_print_stereogram_print (core->print, res);
@@ -4940,7 +4892,7 @@
 			free (res);
 			free (data);
 		} else {
-			char *res = r_print_stereogram_bytes (core->block, core->blocksize);
+			char *res = r_print_stereogram_bytes (block, core->blocksize);
 			r_print_stereogram_print (core->print, res);
 			free (res);
 		}
@@ -5066,11 +5018,10 @@
 				ut64 from = r_config_get_i (core->config, "diff.from");
 				ut64 to = r_config_get_i (core->config, "diff.to");
 				if (from == to && !from) {
-					if (!r_core_block_size (core, len)) {
-						len = core->blocksize;
-					}
+					r_core_block_size (core, len);
+					len = core->blocksize;
 					r_print_hexdump (core->print, core->offset,
-						core->block, len, 16, 1, 1);
+						core->block, core->blocksize, 16, 1, 1);
 				} else {
 					r_core_print_cmp (core, from, to);
 				}
@@ -5147,6 +5098,7 @@
 			break;
 		case 'W': // "pxW"
 			if (l) {
+				bool printOffset = (input[2] != 'q' && r_config_get_i (core->config, "asm.offset"));
 				len = len - (len % 4);
 				for (i = 0; i < len; i += 4) {
 					const char *a, *b;
@@ -5177,11 +5129,13 @@
 							}
 						}
 					}
-					r_cons_printf ("0x%08"PFMT64x " %s0x%08"PFMT64x "%s%s%s\n",
-						(ut64) core->offset + i, a, (ut64) v,
-						b,
-						fn? " ": "",
-						fn? fn: "");
+					if (printOffset) {
+						r_cons_printf ("0x%08"PFMT64x " %s0x%08"PFMT64x "%s%s%s\n",
+								(ut64) core->offset + i, a, (ut64) v,
+								b, fn? " ": "", fn? fn: "");
+					} else {
+						r_cons_printf ("%s0x%08"PFMT64x "%s\n", a, (ut64) v, b);
+					}
 					free (fn);
 				}
 			}
@@ -5194,7 +5148,8 @@
 					const char *comma = "";
 					const ut8 *buf = core->block;
 					int withref = 0;
-					for (i = 0; i < core->blocksize; i += (base / 4)) {
+					const int wordsize = base / 8;
+					for (i = 0; i < core->blocksize; i += wordsize) {
 						ut64 addr = core->offset + i;
 						ut64 *foo = (ut64 *) (buf + i);
 						ut64 val = *foo;
@@ -5299,6 +5254,7 @@
 		case 'Q': // "pxQ"
 			// TODO. show if flag name, or inside function
 			if (l) {
+				bool printOffset = (input[2] != 'q' && r_config_get_i (core->config, "asm.offset"));
 				len = len - (len % 8);
 				for (i = 0; i < len; i += 8) {
 					const char *a, *b;
@@ -5328,8 +5284,12 @@
 							}
 						}
 					}
-					r_cons_printf ("0x%08"PFMT64x " %s0x%016"PFMT64x "%s %s\n",
-						(ut64) core->offset + i, a, v, b, fn? fn: "");
+					if (printOffset) {
+						r_cons_printf ("0x%08"PFMT64x " %s0x%016"PFMT64x "%s %s\n",
+								(ut64) core->offset + i, a, v, b, fn? fn: "");
+					} else {
+						r_cons_printf ("%s0x%016"PFMT64x "%s\n", a, v, b);
+					}
 					free (fn);
 				}
 			}
@@ -5444,7 +5404,7 @@
 					if (!r_core_block_size (core, len)) {
 						len = core->blocksize;
 					}
-					r_print_hexdump (core->print, core->offset,
+					r_print_hexdump (core->print, r_core_pava (core, core->offset),
 						core->block, len, 16, 1, 1);
 				} else {
 					r_core_print_cmp (core, from, to);
@@ -5477,7 +5437,7 @@
 			case 'd': // "p6d"
 				if (input[2] == '?') {
 					r_cons_printf ("|Usage: p6d [len]    base 64 decode\n");
-				} else if (r_base64_decode (buf, (const char *) core->block, len)) {
+				} else if (r_base64_decode (buf, (const char *) block, len)) {
 					r_cons_println ((const char *) buf);
 				} else {
 					eprintf ("r_base64_decode: invalid stream\n");
@@ -5489,7 +5449,7 @@
 					break;
 				} else {
 					len = len > core->blocksize? core->blocksize: len;
-					r_base64_encode ((char *) buf, core->block, len);
+					r_base64_encode ((char *) buf, block, len);
 					r_cons_println ((const char *) buf);
 				}
 				break;
@@ -5508,17 +5468,18 @@
 			if (!r_core_block_size (core, len)) {
 				len = core->blocksize;
 			}
+			block = core->block;
 			if (input[1] == 'j') { // "p8j"
 				r_core_cmdf (core, "pcj %s", input + 2);
 			} else if (input[1] == 'f') { // "p8f"
 				r_core_cmdf (core, "p8 $F @ $B");
 			} else {
-				r_print_bytes (core->print, core->block, len, "%02x");
+				r_print_bytes (core->print, block, len, "%02x");
 			}
 		}
 		break;
 	case 'f': // "pf"
-		cmd_print_format (core, input, len);
+		cmd_print_format (core, input, block, len);
 		break;
 	case 'k': // "pk"
 		if (input[1] == '?') {
@@ -5541,7 +5502,7 @@
 			r_list_free (pids);
 		} else if (l > 0) {
 			len = len > core->blocksize? core->blocksize: len;
-			char *s = r_print_randomart (core->block, len, core->offset);
+			char *s = r_print_randomart (block, len, core->offset);
 			r_cons_println (s);
 			free (s);
 		}
@@ -5567,7 +5528,7 @@
 				for (j = 0; j < cols; j++) {
 					r_cons_canvas_gotoxy (c, j * 20, i * 11);
 					core->offset += len;
-					r_core_read_at (core, core->offset, core->block, len);
+					r_io_read_at (core->io, core->offset, core->block, len);
 					s = r_print_randomart (core->block, len, core->offset);
 					r_cons_canvas_write (c, s);
 					free (s);
@@ -5575,7 +5536,7 @@
 			}
 			r_cons_canvas_print (c);
 			r_cons_canvas_free (c);
-			r_core_read_at (core, offset0, core->block, len);
+			r_io_read_at (core->io, offset0, core->block, len);
 			core->offset = offset0;
 			r_cons_printf ("\n");
 		}
@@ -5595,7 +5556,7 @@
 				len = len - (len % sizeof (ut32));
 			}
 			for (l = 0; l < len; l += sizeof (ut32)) {
-				r_print_date_unix (core->print, core->block + l, sizeof (ut32));
+				r_print_date_unix (core->print, block + l, sizeof (ut32));
 			}
 			break;
 		case 'h': // "pth"
@@ -5607,7 +5568,7 @@
 				len = len - (len % sizeof (ut32));
 			}
 			for (l = 0; l < len; l += sizeof (ut32)) {
-				r_print_date_hfs (core->print, core->block + l, sizeof (ut32));
+				r_print_date_hfs (core->print, block + l, sizeof (ut32));
 			}
 			break;
 		case 'd': // "ptd"
@@ -5620,7 +5581,7 @@
 				len = len - (len % sizeof (ut32));
 			}
 			for (l = 0; l < len; l += sizeof (ut32)) {
-				r_print_date_dos (core->print, core->block + l, sizeof (ut32));
+				r_print_date_dos (core->print, block + l, sizeof (ut32));
 			}
 			break;
 		case 'n': // "ptn"
@@ -5631,7 +5592,7 @@
 				len = len - (len % sizeof (ut64));
 			}
 			for (l = 0; l < len; l += sizeof (ut64)) {
-				r_print_date_w32 (core->print, core->block + l, sizeof (ut64));
+				r_print_date_w32 (core->print, block + l, sizeof (ut64));
 			}
 			break;
 		case '?':
@@ -5645,7 +5606,7 @@
 			break;
 		}
 		if (input[1] == 'z') { // "pqz"
-			len = r_str_nlen ((const char*)core->block, core->blocksize);
+			len = r_str_nlen ((const char *)block, core->blocksize);
 		} else {
 			if (len < 1) {
 				len = 0;
@@ -5655,7 +5616,7 @@
 			}
 		}
 		bool inverted = (input[1] == 'i'); // pqi -- inverted colors
-		char *res = r_qrcode_gen (core->block, len, r_config_get_i (core->config, "scr.utf8"), inverted);
+		char *res = r_qrcode_gen (block, len, r_config_get_i (core->config, "scr.utf8"), inverted);
 		if (res) {
 			r_cons_printf ("%s\n", res);
 			free (res);
@@ -5668,11 +5629,16 @@
 			RIOMap* map;
 			RListIter *iter;
 			RList *list = r_core_get_boundaries_prot (core, -1, NULL, "zoom");
-			RListIter *iter1 = list->head;
-			RIOMap* map1 = iter1->data;
-			from = map1->itv.addr;
-			r_list_foreach (list, iter, map) {
-				to = r_itv_end (map->itv);
+			if (list) {
+				RListIter *iter1 = list->head;
+				RIOMap* map1 = iter1->data;
+				from = map1->itv.addr;
+				r_list_foreach (list, iter, map) {
+					to = r_itv_end (map->itv);
+				}
+			} else {
+				from = core->offset;
+				to = from + core->blocksize;
 			}
 			ut64 maxsize = r_config_get_i (core->config, "zoom.maxsz");
 			int oldva = core->io->va;
@@ -5683,7 +5649,6 @@
 			if (input[1] && input[1] != ' ') {
 				oldmode = strdup (r_config_get (core->config, "zoom.byte"));
 				if (!r_config_set (core->config, "zoom.byte", input + 1)) {
-					eprintf ("Invalid zoom.byte mode (%s)\n", input + 1);
 					do_zoom = false;
 				}
 			}
@@ -5729,19 +5694,18 @@
 	return strlen (buf);
 }
 
-// TODO : move to r_util? .. depends on r_cons...
-// XXX: dupe of r_print_addr
-R_API void r_print_offset(RPrint *p, ut64 off, int invert, int offseg, int offdec, int delta, const char *label) {
+R_API void r_print_offset_sg(RPrint *p, ut64 off, int invert, int offseg, int seggrn, int offdec, int delta, const char *label) {
 	char space[32] = {
 		0
 	};
 	const char *white;
+	const char *reset = p->resetbg? Color_RESET: Color_RESET_NOBG;
 	bool show_color = p->flags & R_PRINT_FLAGS_COLOR;
 	if (show_color) {
 		char rgbstr[32];
 		const char *k = r_cons_singleton ()->pal.offset; // TODO etooslow. must cache
 		if (p->flags & R_PRINT_FLAGS_RAINBOW) {
-			k = r_cons_rgb_str_off (rgbstr, off);
+			k = r_cons_rgb_str_off (rgbstr, sizeof (rgbstr), off);
 		}
 		if (invert) {
 			r_cons_invert (true, true);
@@ -5749,14 +5713,13 @@
 		if (offseg) {
 			ut32 s, a;
 			a = off & 0xffff;
-			s = (off - a) >> 4;
+			s = (off - a) >> seggrn;
 			if (offdec) {
 				snprintf (space, sizeof (space), "%d:%d", s & 0xffff, a & 0xffff);
 				white = r_str_pad (' ', 9 - strlen (space));
-				r_cons_printf ("%s%s%s"Color_RESET, k, white, space);
+				r_cons_printf ("%s%s%s%s", k, white, space, reset);
 			} else {
-				r_cons_printf ("%s%04x:%04x"Color_RESET,
-					k, s & 0xFFFF, a & 0xFFFF);
+				r_cons_printf ("%s%04x:%04x%s", k, s & 0xFFFF, a & 0xFFFF, reset);
 			}
 		} else {
 			int sz = lenof (off, 0);
@@ -5767,30 +5730,30 @@
 					if (delta > 0) {
 						if (offdec) {
 							const char *pad = r_str_pad (' ', sz - sz2 + label_padding);
-							r_cons_printf ("%s%s"Color_RESET "+%d%s", k, label, delta, pad);
+							r_cons_printf ("%s%s%s+%d%s", k, label, reset, delta, pad);
 						} else {
 							const char *pad = r_str_pad (' ', sz - sz2 + label_padding);
-							r_cons_printf ("%s%s"Color_RESET "+0x%x%s", k, label, delta, pad);
+							r_cons_printf ("%s%s%s+0x%x%s", k, label, reset, delta, pad);
 						}
 					} else {
 						const char *pad = r_str_pad (' ', sz + label_padding);
-						r_cons_printf ("%s%s"Color_RESET "%s", k, label, pad);
+						r_cons_printf ("%s%s%s%s", k, label, reset, pad);
 					}
 				} else {
 					const char *pad = r_str_pad (' ', sz - sz2);
 					if (offdec) {
-						r_cons_printf ("%s+%d"Color_RESET, pad, delta);
+						r_cons_printf ("%s+%d%s", pad, delta, reset);
 					} else {
-						r_cons_printf ("%s+0x%x"Color_RESET, pad, delta);
+						r_cons_printf ("%s+0x%x%s", pad, delta, reset);
 					}
 				}
 			} else {
 				if (offdec) {
 					snprintf (space, sizeof (space), "%"PFMT64d, off);
 					white = r_str_pad (' ', 10 - strlen (space));
-					r_cons_printf ("%s%s%s"Color_RESET, k, white, space, off);
+					r_cons_printf ("%s%s%s%s", k, white, space, off, reset);
 				} else {
-					r_cons_printf ("%s0x%08"PFMT64x ""Color_RESET, k, off);
+					r_cons_printf ("%s0x%08"PFMT64x "%s", k, off, reset);
 				}
 			}
 		}
@@ -5799,11 +5762,11 @@
 		if (offseg) {
 			ut32 s, a;
 			a = off & 0xffff;
-			s = (off - a) >> 4;
+			s = (off - a) >> seggrn;
 			if (offdec) {
 				snprintf (space, sizeof (space), "%d:%d", s & 0xffff, a & 0xffff);
 				white = r_str_pad (' ', 9 - strlen (space));
-				r_cons_printf ("%s%s"Color_RESET, white, space);
+				r_cons_printf ("%s%s%s", white, space, reset);
 			} else {
 				r_cons_printf ("%04x:%04x", s & 0xFFFF, a & 0xFFFF);
 			}
@@ -5813,9 +5776,9 @@
 			const char *pad = r_str_pad (' ', sz - 5 - sz2 - 3);
 			if (delta > 0) {
 				if (offdec) {
-					r_cons_printf ("%s+%d"Color_RESET, pad, delta);
+					r_cons_printf ("%s+%d%s", pad, delta, reset);
 				} else {
-					r_cons_printf ("%s+0x%x"Color_RESET, pad, delta);
+					r_cons_printf ("%s+0x%x%s", pad, delta, reset);
 				}
 			} else {
 				if (offdec) {
@@ -5829,3 +5792,9 @@
 		}
 	}
 }
+
+// TODO : move to r_util? .. depends on r_cons...
+// XXX: dupe of r_print_addr
+R_API void r_print_offset(RPrint *p, ut64 off, int invert, int offseg, int offdec, int delta, const char *label) {
+	r_print_offset_sg(p, off, invert, offseg, 4, offdec, delta, label);
+}
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_project.c radare2-2.8.0+dfsg/libr/core/cmd_project.c
--- radare2-2.3.0+dfsg/libr/core/cmd_project.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_project.c	2018-08-07 14:12:36.000000000 +0000
@@ -6,10 +6,10 @@
 
 static const char *help_msg_P[] = {
 	"Usage:", "P[?osi] [file]", "Project management",
+	"P", "", "list all projects",
 	"Pc", " [file]", "show project script to console",
 	"Pd", " [file]", "delete project",
 	"Pi", " [file]", "show project information",
-	"Pl", "", "list all projects",
 	"Pn", "[j]", "show project notes (Pnj for json)",
 	"Pn", " [base64]", "set notes text",
 	"Pn", " -", "edit notes with cfg.editor",
@@ -18,7 +18,7 @@
 	"PS", " [file]", "save script file",
 	"P-", " [file]", "delete project (alias for Pd)",
 	"NOTE:", "", "See 'e??prj.'",
-	"NOTE:", "", "project are stored in ~/.config/radare2/projects",
+	"NOTE:", "", "project are stored in " R_JOIN_2_PATHS ("~", R2_HOME_PROJECTS),
 	NULL
 };
 
@@ -82,9 +82,6 @@
 			}
 		}
 		break;
-	case 'l':
-		r_core_project_list (core, input[1]);
-		break;
 	case 'd':
 	case '-':
 		r_core_project_delete (core, file);
@@ -234,6 +231,10 @@
 			free (prjName);
 		}
 		break;
+	case 0:
+	case 'j':
+		r_core_project_list (core, input[0]);
+		break;
 	default:
 		r_core_cmd_help (core, help_msg_P);
 		break;
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_search.c radare2-2.8.0+dfsg/libr/core/cmd_search.c
--- radare2-2.3.0+dfsg/libr/core/cmd_search.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_search.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,4 @@
-/* radare - LGPL - Copyright 2010-2017 - pancake */
-
-#include <stddef.h>
+/* radare - LGPL - Copyright 2010-2018 - pancake */
 
 #include "r_core.h"
 #include "r_io.h"
@@ -19,6 +17,7 @@
 	"//", "", "repeat last search",
 	"/a", " jmp eax", "assemble opcode and search its bytes",
 	"/A", " jmp", "find analyzed instructions of this type (/A? for help)",
+	"/Af", " [family]", "find opcodes of given family",
 	"/b", "", "search backwards, command modifier, followed by other command",
 	"/B", "", "search recognized RBin headers",
 	"/c", " jmp [esp]", "search for asm code matching the given string",
@@ -27,9 +26,11 @@
 	"/d", " 101112", "search for a deltified sequence of bytes",
 	"/e", " /E.F/i", "match regular expression",
 	"/E", " esil-expr", "offset matching given esil expressions %%= here",
-	"/f", "", "search forwards, command modifier, followed by other command",
+	"/f", "", "search forwards, (command modifier)",
 	"/F", " file [off] [sz]", "search contents of file with offset and size",
-	"/h", "[t] [hash] [len]", "find block matching this hash. See /#?",
+	// TODO: add subcommands to find paths between functions and filter only function names instead of offsets, etc
+	"/g", "[g] [from]", "find all graph paths A to B (/gg follow jumps, see search.count and anal.depth)",
+	"/h", "[t] [hash] [len]", "find block matching this hash. See ph",
 	"/i", " foo", "search for string 'foo' ignoring case",
 	"/m", " magicfile", "search for matching magic file (use blocksize)",
 	"/M", " ", "search for known filesystems and mount them automatically",
@@ -382,8 +383,12 @@
 		eprintf ("done\n");
 	}
 	fc1 = count_functions (core);
+	if (list) {
+		eprintf ("Analyzed %d functions based on preludes\n", fc1 - fc0);
+	} else {
+		eprintf ("No executable section found, cannot analyze anything. Use 'S' to change or define permissions of sections\n");
+	}
 	r_list_free (list);
-	eprintf ("Analyzed %d functions based on preludes\n", fc1 - fc0);
 	return ret;
 }
 
@@ -430,7 +435,7 @@
 			const int len = keyword_len;
 			char *buf = calloc (1, len + 32 + ctx * 2);
 			type = "string";
-			r_core_read_at (core, addr - prectx, (ut8 *) buf, len + (ctx * 2));
+			r_io_read_at (core->io, addr - prectx, (ut8 *) buf, len + (ctx * 2));
 			pre = getstring (buf, prectx);
 			wrd = r_str_utf16_encode (buf + prectx, len);
 			pos = getstring (buf + prectx + len, ctx);
@@ -464,7 +469,7 @@
 			if (str) {
 				p = str;
 				memset (str, 0, len);
-				r_core_read_at (core, base_addr + addr, buf, keyword_len);
+				r_io_read_at (core->io, base_addr + addr, buf, keyword_len);
 				if (json) {
 					p = str;
 				}
@@ -520,7 +525,7 @@
 		}
 	}
 	if (searchflags && kw) {
-		const char *flag = sdb_fmt (0, "%s%d_%d", searchprefix, kw->kwidx, kw->count);
+		const char *flag = sdb_fmt ("%s%d_%d", searchprefix, kw->kwidx, kw->count);
 		r_flag_set (core->flags, flag, base_addr + addr, keyword_len);
 	}
 	if (*param->cmd_hit) {
@@ -553,7 +558,7 @@
 		return;
 	}
 	if (io && io->desc) {
-		map->fd = io->desc->fd;
+		map->fd = r_io_fd_get_current (io);
 	}
 	RInterval itv = {from, size};
 	// TODO UT64_MAX is a valid address. search.from and search.to are not specified
@@ -597,6 +602,7 @@
 		protection = R_IO_RWX;
 	}
 	if (!core) {
+		r_list_free (list);
 		return NULL;
 	}
 	if (!core->io->va) {
@@ -609,12 +615,12 @@
 			append_bound (list, core->io, search_itv, m->itv.addr, m->itv.size);
 		}
 	} else if (!strcmp (mode, "io.maps")) { // Non-overlapping RIOMap parts not overriden by others (skyline)
-		const RVector *skyline = &core->io->map_skyline;
+		const RPVector *skyline = &core->io->map_skyline;
 		ut64 begin = UT64_MAX;
 		ut64 end = UT64_MAX;
-		int i;
-		for (i = 0; i < skyline->len; i++) {
-			const RIOMapSkyline *part = skyline->a[i];
+		size_t i;
+		for (i = 0; i < r_pvector_len (skyline); i++) {
+			const RIOMapSkyline *part = r_pvector_at (skyline, i);
 			ut64 from = part->itv.addr;
 			ut64 to = part->itv.addr + part->itv.size;
 			// eprintf ("--------- %llx %llx    (%llx %llx)\n", from, to, begin, end);
@@ -935,8 +941,8 @@
 			opsz = asmop.size;
 			opst = asmop.buf_asm;
 		}
-		if (!strncasecmp (opst, "invalid", strlen ("invalid")) ||
-		    !strncasecmp (opst, ".byte", strlen (".byte"))) {
+		if (!r_str_ncasecmp (opst, "invalid", strlen ("invalid")) ||
+		    !r_str_ncasecmp (opst, ".byte", strlen (".byte"))) {
 			valid = false;
 			goto ret;
 		}
@@ -1039,10 +1045,10 @@
 		r_cons_printf ("{\"opcodes\":[");
 		r_list_foreach (hitlist, iter, hit) {
 			ut8 *buf = malloc (hit->len);
-			r_core_read_at (core, hit->addr, buf, hit->len);
+			r_io_read_at (core->io, hit->addr, buf, hit->len);
 			r_asm_set_pc (core->assembler, hit->addr);
 			r_asm_disassemble (core->assembler, &asmop, buf, hit->len);
-			r_anal_op (core->anal, &analop, hit->addr, buf, hit->len);
+			r_anal_op (core->anal, &analop, hit->addr, buf, hit->len, R_ANAL_OP_MASK_ESIL);
 			size += hit->len;
 			if (analop.type != R_ANAL_OP_TYPE_RET) {
 				char *opstr_n = r_str_newf (" %s", R_STRBUF_SAFEGET (&analop.esil));
@@ -1058,7 +1064,7 @@
 		if (db && hit) {
 			const ut64 addr = ((RCoreAsmHit *) hitlist->head->data)->addr;
 			// r_cons_printf ("Gadget size: %d\n", (int)size);
-			const char *key = sdb_fmt (0, "0x%08"PFMT64x, addr);
+			const char *key = sdb_fmt ("0x%08"PFMT64x, addr);
 			rop_classify (core, db, ropList, key, size);
 			r_cons_printf ("],\"retaddr\":%"PFMT64d ",\"size\":%d}", hit->addr, size);
 		} else if (hit) {
@@ -1072,10 +1078,10 @@
 			((RCoreAsmHit *) hitlist->head->data)->addr);
 		r_list_foreach (hitlist, iter, hit) {
 			ut8 *buf = malloc (hit->len);
-			r_core_read_at (core, hit->addr, buf, hit->len);
+			r_io_read_at (core->io, hit->addr, buf, hit->len);
 			r_asm_set_pc (core->assembler, hit->addr);
 			r_asm_disassemble (core->assembler, &asmop, buf, hit->len);
-			r_anal_op (core->anal, &analop, hit->addr, buf, hit->len);
+			r_anal_op (core->anal, &analop, hit->addr, buf, hit->len, R_ANAL_OP_MASK_BASIC);
 			size += hit->len;
 			const char *opstr = R_STRBUF_SAFEGET (&analop.esil);
 			if (analop.type != R_ANAL_OP_TYPE_RET) {
@@ -1086,7 +1092,7 @@
 				r_cons_printf ("%s\n", opstr);
 			} else if (colorize) {
 				buf_asm = r_print_colorize_opcode (core->print, asmop.buf_asm,
-					core->cons->pal.reg, core->cons->pal.num, false);
+					core->cons->pal.reg, core->cons->pal.num, false, 0);
 				r_cons_printf (" %s%s;", buf_asm, Color_RESET);
 				free (buf_asm);
 			} else {
@@ -1097,7 +1103,7 @@
 		if (db && hit) {
 			const ut64 addr = ((RCoreAsmHit *) hitlist->head->data)->addr;
 			// r_cons_printf ("Gadget size: %d\n", (int)size);
-			const char *key = sdb_fmt (0, "0x%08"PFMT64x, addr);
+			const char *key = sdb_fmt ("0x%08"PFMT64x, addr);
 			rop_classify (core, db, ropList, key, size);
 		}
 		break;
@@ -1112,10 +1118,10 @@
 			}
 			ut8 *buf = malloc (1 + hit->len);
 			buf[hit->len] = 0;
-			r_core_read_at (core, hit->addr, buf, hit->len);
+			r_io_read_at (core->io, hit->addr, buf, hit->len);
 			r_asm_set_pc (core->assembler, hit->addr);
 			r_asm_disassemble (core->assembler, &asmop, buf, hit->len);
-			r_anal_op (core->anal, &analop, hit->addr, buf, hit->len);
+			r_anal_op (core->anal, &analop, hit->addr, buf, hit->len, R_ANAL_OP_MASK_ESIL);
 			size += hit->len;
 			if (analop.type != R_ANAL_OP_TYPE_RET) {
 				char *opstr_n = r_str_newf (" %s", R_STRBUF_SAFEGET (&analop.esil));
@@ -1123,7 +1129,7 @@
 			}
 			if (colorize) {
 				buf_asm = r_print_colorize_opcode (core->print, asmop.buf_asm,
-					core->cons->pal.reg, core->cons->pal.num, false);
+					core->cons->pal.reg, core->cons->pal.num, false, 0);
 				otype = r_print_color_op_type (core->print, analop.type);
 				if (comment) {
 					r_cons_printf ("  0x%08"PFMT64x " %18s%s  %s%s ; %s\n",
@@ -1147,7 +1153,7 @@
 		if (db && hit) {
 			const ut64 addr = ((RCoreAsmHit *) hitlist->head->data)->addr;
 			// r_cons_printf ("Gadget size: %d\n", (int)size);
-			const char *key = sdb_fmt (0, "0x%08"PFMT64x, addr);
+			const char *key = sdb_fmt ("0x%08"PFMT64x, addr);
 			rop_classify (core, db, ropList, key, size);
 		}
 	}
@@ -1215,7 +1221,7 @@
 	const char *arch = r_config_get (core->config, "asm.arch");
 	ut64 from = search_itv.addr, to = r_itv_end (search_itv);
 	int max_count = r_config_get_i (core->config, "search.maxhits");
-	int i = 0, end = 0, mode = 0, increment = 1, ret;
+	int i = 0, end = 0, mode = 0, increment = 1, ret, result = true;
 	RList /*<endlist_pair>*/ *end_list = r_list_newf (free);
 	RList /*<intptr_t>*/ *badstart = r_list_new ();
 	RList /*<RRegex>*/ *rx_list = NULL;
@@ -1231,6 +1237,13 @@
 	RIOMap *map;
 	RAsmOp asmop;
 
+	Sdb *gadgetSdb = NULL;
+	if (r_config_get_i (core->config, "rop.sdb")) {
+		if (!(gadgetSdb = sdb_ns (core->sdb, "gadget_sdb", false))) {
+			gadgetSdb = sdb_ns (core->sdb, "gadget_sdb", true);
+		}
+	}
+
 	if (max_count == 0) {
 		max_count = -1;
 	}
@@ -1258,12 +1271,16 @@
 	if (*grep) {
 		if (grep_arg) {
 			mode = *(grep_arg - 1);
-			grep = grep_arg;
 		} else {
 			mode = *grep;
 			++grep;
 		}
 	}
+	if (grep_arg) {
+		grep_arg = strdup (grep_arg);
+		grep_arg = r_str_replace (grep_arg, ",,", ";", true);
+		grep = grep_arg;
+	}
 
 	if (*grep == ' ') { // grep mode
 		for (++grep; *grep == ' '; grep++) {
@@ -1299,14 +1316,10 @@
 		map = R_NEW0 (RIOMap);
 		if (!map) {
 			eprintf ("Cannot allocate map\n");
-			free (gregexp);
-			r_list_free (rx_list);
-			r_list_free (end_list);
-			r_list_free (badstart);
-			r_list_free (list);
-			return false;
+			result = false;
+			goto bad;
 		}
-		map->fd = core->io->desc->fd;
+		map->fd = r_io_fd_get_current (core->io);
 		map->itv.addr = from;
 		map->itv.size = to - from;
 		list = r_list_newf (free);
@@ -1331,12 +1344,8 @@
 		delta = to - from;
 		buf = calloc (1, delta);
 		if (!buf) {
-			free (gregexp);
-			r_list_free (rx_list);
-			r_list_free (end_list);
-			r_list_free (badstart);
-			r_list_free (list);
-			return -1;
+			result = false;
+			goto bad;
 		}
 		(void) r_io_read_at (core->io, from, buf, delta);
 
@@ -1345,7 +1354,7 @@
 			RAnalOp end_gadget = R_EMPTY;
 			// Disassemble one.
 			if (r_anal_op (core->anal, &end_gadget, from + i, buf + i,
-				    delta - i) <= 0) {
+				    delta - i, R_ANAL_OP_MASK_BASIC) <= 0) {
 				r_anal_op_fini (&end_gadget);
 				continue;
 			}
@@ -1363,12 +1372,11 @@
 				if (end_gadget.delay) {
 					epair->instr_offset = i + increment;
 					epair->delay_size = end_gadget.delay;
-					r_list_append (end_list, (void *) (intptr_t) epair);
 				} else {
 					epair->instr_offset = (intptr_t) i;
 					epair->delay_size = end_gadget.delay;
-					r_list_append (end_list, (void *) epair);
 				}
+				r_list_append (end_list, (void *) (intptr_t) epair);
 			}
 			r_anal_op_fini (&end_gadget);
 			if (r_cons_is_breaked ()) {
@@ -1415,9 +1423,9 @@
 				if (i >= next) {
 					// We've exhausted the first end-gadget section,
 					// move to the next one.
+					free (end_gadget);
 					if (r_list_get_n (end_list, 0)) {
 						prev = i;
-						free (end_gadget);
 						end_gadget = (struct endlist_pair *) r_list_pop (end_list);
 						next = end_gadget->instr_offset;
 						i = next - ropdepth;
@@ -1429,7 +1437,7 @@
 					}
 				}
 				if (i >= end) { // read by chunk of 4k
-					r_core_read_at (core, from + i, buf + i,
+					r_io_read_at (core->io, from + i, buf + i,
 						R_MIN ((delta - i), 4096));
 					end = i + 2048;
 				}
@@ -1446,6 +1454,30 @@
 					if (align && (0 != ((from + i) % align))) {
 						continue;
 					}
+
+					if (gadgetSdb) {
+						RListIter *iter;
+
+						RCoreAsmHit *hit = (RCoreAsmHit *) hitlist->head->data;
+						char *headAddr = r_str_newf ("%"PFMT64x, hit->addr);
+						if (!headAddr) {
+							result = false;
+							goto bad;
+						}
+
+						r_list_foreach (hitlist, iter, hit) {
+							char *addr = r_str_newf ("%"PFMT64x"(%"PFMT32d")", hit->addr, hit->len);
+							if (!addr) {
+								free (headAddr);
+								result = false;
+								goto bad;
+							}
+							sdb_concat (gadgetSdb, headAddr, addr, 0);
+							free (addr);
+						}
+						free (headAddr);
+					}
+
 					if (json) {
 						mode = 'j';
 					}
@@ -1457,6 +1489,7 @@
 					} else {
 						print_rop (core, hitlist, mode, &json_first);
 					}
+					r_list_free (hitlist);
 					if (max_count > 0) {
 						max_count--;
 						if (max_count < 1) {
@@ -1480,13 +1513,14 @@
 	if (json) {
 		r_cons_printf ("]\n");
 	}
+bad:
 	r_list_free (list);
 	r_list_free (rx_list);
 	r_list_free (end_list);
 	r_list_free (badstart);
+	free (grep_arg);
 	free (gregexp);
-
-	return true;
+	return result;
 }
 
 static int esil_addrinfo(RAnalEsil *esil) {
@@ -1533,8 +1567,9 @@
 		ut64 nres, addr;
 		ut64 from = map->itv.addr;
 		ut64 to = r_itv_end (map->itv);
+		unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
 		if (!core->anal->esil) {
-			core->anal->esil = r_anal_esil_new (stacksize, iotrap);
+			core->anal->esil = r_anal_esil_new (stacksize, iotrap, addrsize);
 		}
 		/* hook addrinfo */
 		core->anal->esil->cb.user = core;
@@ -1619,11 +1654,6 @@
 #define MAXINSTR 8
 #define SUMARRAY(arr, size, res) do (res) += (arr)[--(size)]; while ((size))
 
-static inline bool isnonlinear(int optype) {
-	return (optype ==  R_ANAL_OP_TYPE_CALL || optype ==  R_ANAL_OP_TYPE_JMP || optype ==  R_ANAL_OP_TYPE_CJMP ||
-			optype == R_ANAL_OP_TYPE_RET);
-}	
-
 static int emulateSyscallPrelude(RCore *core, ut64 at, ut64 curpc) {
 	int i, inslen, bsize = R_MIN (64, core->blocksize);
 	ut8 *arr;
@@ -1647,9 +1677,9 @@
 			i = 0;
 		}
 		if (!i) {
-			r_core_read_at (core, curpc, arr, bsize);
+			r_io_read_at (core->io, curpc, arr, bsize);
 		}
-		inslen = r_anal_op (core->anal, &aop, curpc, arr + i, bsize - i);
+		inslen = r_anal_op (core->anal, &aop, curpc, arr + i, bsize - i, R_ANAL_OP_MASK_BASIC);
 		if (inslen) {	
  			int incr = (core->search->align > 0)? core->search->align - 1:  inslen - 1;
 			if (incr < 0) {
@@ -1657,7 +1687,7 @@
 			}	
 			i += incr;
 			curpc += incr;
-			if (isnonlinear (aop.type)) {	// skip the instr
+			if (r_anal_op_nonlinear (aop.type)) {	// skip the instr
 				r_reg_set_value (core->dbg->reg, r, curpc + 1);
 			} else {	// step instr
 				r_core_esil_step (core, UT64_MAX, NULL, NULL);
@@ -1687,8 +1717,9 @@
 	int align = core->search->align;
 	int stacksize = r_config_get_i (core->config, "esil.stack.depth");
 	int iotrap = r_config_get_i (core->config, "esil.iotrap");
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
 
-	if (!(esil = r_anal_esil_new (stacksize, iotrap))) {
+	if (!(esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
 		return;
 	}
 	int *previnstr = calloc (MAXINSTR + 1, sizeof (int));
@@ -1727,9 +1758,9 @@
 				continue;
 			}	
 			if (!i) {
-				r_core_read_at (core, at, buf, bsize);
+				r_io_read_at (core->io, at, buf, bsize);
 			}
-			ret = r_anal_op (core->anal, &aop, at, buf + i, bsize - i);
+			ret = r_anal_op (core->anal, &aop, at, buf + i, bsize - i, R_ANAL_OP_MASK_BASIC);
 			curpos = idx++ % (MAXINSTR + 1);
 			previnstr[curpos] = ret; // This array holds prev n instr size + cur instr size
 			if ((aop.type == R_ANAL_OP_TYPE_SWI) && ret && (aop.val > 10)) {
@@ -1788,7 +1819,7 @@
 	RList *list = r_anal_xrefs_get (core->anal, addr);
 	if (list) {
 		r_list_foreach (list, iter, ref) {
-			r_core_read_at (core, ref->addr, buf, size);
+			r_io_read_at (core->io, ref->addr, buf, size);
 			r_asm_set_pc (core->assembler, ref->addr);
 			r_asm_disassemble (core->assembler, &asmop, buf, size);
 			fcn = r_anal_get_fcn_in (core->anal, ref->addr, 0);
@@ -1800,7 +1831,7 @@
 				: r_str_newf ("%s", fcn ? fcn->name : "(nofunc)");
 			if (from <= ref->addr && to >= ref->addr) {
 				r_cons_printf ("%s 0x%" PFMT64x " [%s] %s\n",
-						buf_fcn, ref->addr, r_anal_ref_to_string (ref->type), str);
+						buf_fcn, ref->addr, r_anal_xrefs_type_tostring (ref->type), str);
 				if (*param->cmd_hit) {
 					ut64 here = core->offset;
 					r_core_seek (core, ref->addr, true);
@@ -1819,7 +1850,7 @@
 	ut64 at;
 	ut8 *buf;
 	RAnalOp aop;
-	int chk_family = 0;
+	bool chk_family = false;
 	int mode = 0;
 	int i, ret, bsize = R_MIN (64, core->blocksize);
 	int kwidx = core->search->n_kws;
@@ -1827,7 +1858,7 @@
 	bool firstItem = true;
 
 	if (*input == 'f') {
-		chk_family = 1;
+		chk_family = true;
 		input++;
 	}
 	switch (*input) {
@@ -1841,28 +1872,35 @@
 		input++;
 		break;
 	case 0:
-		r_cons_printf (
-			"Usage: /A[f][?jq] [op.type | op.family]\n"
-			" /A?      - list all opcode types\n"
-			" /Af?     - list all opcode families\n"
-			" /A ucall - find calls with unknown destination\n"
-			" /Af sse  - find SSE instructions\n");
-		return;
+	case 'f':
 	case '?':
-		for (i = 0; i < 64; i++) {
-			const char *str = chk_family
-				? r_anal_op_family_to_string (i)
-				: r_anal_optype_to_string (i);
-			if (chk_family && atoi (str)) {
-				break;
-			}
-			if (!str || !*str) {
-				break;
-			}
-			if (!strcmp (str, "undefined")) {
-				continue;
+		if (input[0] && input[1] == '?') {
+			for (i = 0; i < 64; i++) {
+				const char *str = chk_family
+					? r_anal_op_family_to_string (i)
+					: r_anal_optype_to_string (i);
+				if (chk_family && atoi (str)) {
+					break;
+				}
+				if (!str || !*str) {
+					break;
+				}
+				if (!strcmp (str, "undefined")) {
+					continue;
+				}
+				r_cons_println (str);
 			}
-			r_cons_println (str);
+		} else {
+			r_cons_printf (
+				"Usage: /A[f][?jq] [op.type | op.family]\n"
+				" /A?      - get this help\n"
+				" /A??     - list all opcode types\n"
+				" /Af?     - get this help\n"
+				" /Af??    - list all opcode families\n"
+				" /A ucall - find calls with unknown destination\n"
+				" /Af sse  - find SSE instructions\n"
+				" /Aj swi  - search all syscalls, show results in JSON\n"
+				" /Afj fpu - search all fpu instructions, show in JSON\n");
 		}
 		return;
 	}
@@ -1886,9 +1924,9 @@
 				i = 0;
 			}
 			if (!i) {
-				r_core_read_at (core, at, buf, bsize);
+				r_io_read_at (core->io, at, buf, bsize);
 			}
-			ret = r_anal_op (core->anal, &aop, at, buf + i, bsize - i);
+			ret = r_anal_op (core->anal, &aop, at, buf + i, bsize - i, R_ANAL_OP_MASK_BASIC);
 			if (ret) {
 				bool match = false;
 				if (chk_family) {
@@ -1896,7 +1934,9 @@
 					if (fam) {
 						if (!*input || !strcmp (input, fam)) {
 							match = true;
-							r_cons_printf ("0x%08"PFMT64x " - %d %s\n", at, ret, fam);
+							if (mode == 0) {
+								r_cons_printf ("0x%08"PFMT64x " - %d %s\n", at, ret, fam);
+							}
 						}
 					}
 				} else {
@@ -1973,6 +2013,9 @@
 	if (!regexp && input[1] == 'a') {
 		everyByte = true;
 	}
+	if (regexp && input[2] == 'j') {
+		json = true;
+	}
 	if (!end_cmd) {
 		outmode = input[1];
 	} else {
@@ -1989,11 +2032,13 @@
 
 	if (!param->boundaries) {
 		map = R_NEW0 (RIOMap);
-		map->fd = core->io->desc->fd;
-		map->itv.addr = r_config_get_i (core->config, "search.from");
-		map->itv.size = r_config_get_i (core->config, "search.to") - map->itv.addr;
-		param->boundaries = r_list_newf (free);
-		r_list_append (param->boundaries, map);
+		if (map) {
+			map->fd = r_io_fd_get_current (core->io);
+			map->itv.addr = r_config_get_i (core->config, "search.from");
+			map->itv.size = r_config_get_i (core->config, "search.to") - map->itv.addr;
+			param->boundaries = r_list_newf (free);
+			r_list_append (param->boundaries, map);
+		}
 	}
 
 	if (json) {
@@ -2015,7 +2060,7 @@
 		if (!outmode) {
 			hits = NULL;
 		} else {
-			hits = r_core_asm_strsearch (core, input + 2,
+			hits = r_core_asm_strsearch (core, end_cmd,
 				from, to, maxhits, regexp, everyByte, mode);
 		}
 		if (hits) {
@@ -2045,7 +2090,8 @@
 						char tmp[128] = {
 							0
 						};
-						r_parse_filter (core->parser, core->flags, hit->code, tmp, sizeof (tmp), core->print->big_endian);
+						r_parse_filter (core->parser, core->flags, hit->code, tmp, sizeof (tmp),
+								core->print->big_endian);
 						r_cons_printf ("0x%08"PFMT64x "   # %i: %s\n",
 							hit->addr, hit->len, tmp);
 					} else {
@@ -2055,7 +2101,7 @@
 					break;
 				}
 				if (searchflags) {
-					const char *flagname = sdb_fmt (0, "%s%d_%d", searchprefix, kwidx, count);
+					const char *flagname = sdb_fmt ("%s%d_%d", searchprefix, kwidx, count);
 					r_flag_set (core->flags, flagname, hit->addr, hit->len);
 				}
 				count++;
@@ -2178,7 +2224,9 @@
 			print_search_progress (at, to1, search->nhits);
 			r_cons_clear_line (1);
 			core->num->value = search->nhits;
-			eprintf ("hits: %" PFMT64d "\n", search->nhits - saved_nhits);
+			if (!json) {
+				eprintf ("hits: %" PFMT64d "\n", search->nhits - saved_nhits);
+			}
 		}
 done:
 		r_cons_break_pop ();
@@ -2363,8 +2411,17 @@
 			to--;
 		}
 	}
-	r_cons_printf ("0x%"PFMT64x ": 0x%"PFMT64x"\n", from, to);
-	r_core_cmdf (core, "f %s.0x%08"PFMT64x" %d = 0x%08"PFMT64x "# from 0x%"PFMT64x "\n", prefix, to, vsize, to, from);
+	if (!json) {
+		r_cons_printf ("0x%"PFMT64x ": 0x%"PFMT64x"\n", from, to);
+	} else {
+		if (count >= 1) {
+			r_cons_printf (",");
+		}
+		r_cons_printf ("{\"offset\":%"PFMT64d ",\"value\":%"PFMT64d "}",
+				from, to);
+	}
+	r_core_cmdf (core, "f %s.value.0x%08"PFMT64x" %d = 0x%08"PFMT64x" \n", prefix, to, vsize, to); // flag at value of hit
+	r_core_cmdf (core, "f %s.offset.0x%08"PFMT64x" %d = 0x%08"PFMT64x " \n", prefix, from, vsize, from); // flag at offset of hit
 	const char *cmdHit = r_config_get (core->config, "cmd.hit");
 	if (cmdHit && *cmdHit) {
 		ut64 addr = core->offset;
@@ -2438,7 +2495,7 @@
 	int ignorecase = false;
 	int param_offset = 2;
 	char *inp;
-	if (!core || !core->io || !core->io->desc) {
+	if (!core || !core->io) {
 		eprintf ("Can't search if we don't have an open file.\n");
 		return false;
 	}
@@ -2582,11 +2639,11 @@
 		}
 		break;
 	}
-	case 'R':
+	case 'R': // "/R"
 		if (input[1] == '?') {
 			r_core_cmd_help (core, help_msg_slash_R);
 		} else if (input[1] == '/') {
-// TODO search on boundaries
+			// TODO search on boundaries
 			r_core_search_rop (core, search_itv, 0, input + 1, 1);
 		} else if (input[1] == 'k') {
 			if (input[2] == '?') {
@@ -2595,7 +2652,48 @@
 				rop_kuery (core, input + 2);
 			}
 		} else {
-			r_core_search_rop (core, search_itv, 0, input + 1, 0);
+			Sdb *gadgetSdb = sdb_ns (core->sdb, "gadget_sdb", false);
+
+			if (!gadgetSdb) {
+				r_core_search_rop (core, search_itv, 0, input + 1, 0);
+			} else {
+				SdbKv *kv;
+				SdbListIter *sdb_iter;
+				SdbList *sdb_list = sdb_foreach_list (gadgetSdb, true);
+
+				ls_foreach (sdb_list, sdb_iter, kv) {
+					RList *hitlist = r_core_asm_hit_list_new ();
+					if (!hitlist) {
+						goto beach;
+					}
+
+					char *s = kv->value;
+					ut64 addr;
+					int opsz;
+					int mode = 0;
+					bool json_first = true;
+
+					// Options, like JSON, linear, ...
+					if (input + 1) {
+						mode = *(input + 1);
+					}
+
+					do {
+						RCoreAsmHit *hit = r_core_asm_hit_new ();
+						if (!hit) {
+							r_list_free (hitlist);
+							goto beach;
+						}
+						sscanf (s, "%"PFMT64x"(%"PFMT32d")", &addr, &opsz);
+						hit->addr = addr;
+						hit->len = opsz;
+						r_list_append (hitlist, hit);
+					} while (*(s = strchr (s, ')') + 1) != '\0');
+
+					print_rop (core, hitlist, mode, &json_first);
+					r_list_free (hitlist);
+				}
+			}
 		}
 		goto beach;
 	case 'r': // "/r" and "/re"
@@ -2760,20 +2858,26 @@
 		dosearch = false;
 		if (input[1] == 'e') { // "/me"
 			r_cons_printf ("* r2 thinks%s\n", input + 2);
-		} else if (input[1] == ' ' || input[1] == '\0') {
+		} else if (input[1] == ' ' || input[1] == '\0' || json) {
 			int ret;
-			const char *file = input[1]? input + 2: NULL;
+			const char *file = input[param_offset - 1]? input + param_offset: NULL;
 			ut64 addr = search_itv.addr;
 			RListIter *iter;
 			RIOMap *map;
+			if (json) {
+				r_cons_printf ("[");
+			}
+			r_core_magic_reset (core);
 			r_list_foreach (param.boundaries, iter, map) {
-				eprintf ("-- %llx %llx\n", map->itv.addr, r_itv_end (map->itv));
+				if (!json) {
+					eprintf ("-- %llx %llx\n", map->itv.addr, r_itv_end (map->itv));
+				}
 				r_cons_break_push (NULL, NULL);
 				for (addr = map->itv.addr; addr < r_itv_end (map->itv); addr++) {
 					if (r_cons_is_breaked ()) {
 						break;
 					}
-					ret = r_core_magic_at (core, file, addr, 99, false);
+					ret = r_core_magic_at (core, file, addr, 99, false, json);
 					if (ret == -1) {
 						// something went terribly wrong.
 						break;
@@ -2783,6 +2887,9 @@
 				r_cons_clear_line (1);
 				r_cons_break_pop ();
 			}
+			if (json) {
+				r_cons_printf ("]");
+			}
 		} else {
 			eprintf ("Usage: /m [file]\n");
 		}
@@ -2816,15 +2923,22 @@
 		dosearch = false;
 		break;
 	case 'V': // "/V"
-		// TODO: add support for json
 		{
+			if (input[2] == 'j') {
+				json = true;
+				param_offset++;
+			}
 			int err = 1, vsize = atoi (input + 1);
 			bool asterisk = strchr (input + 1, '*');
-			if (vsize && input[2] && input[3]) {
-				char *w = strchr (input + 3, ' ');
+			const char *num_str = input + param_offset + 1;
+			if (vsize && input[2] && num_str) {
+				if (json) {
+					r_cons_printf ("[");
+				}
+				char *w = strchr (num_str, ' ');
 				if (w) {
 					*w++ = 0;
-					ut64 vmin = r_num_math (core->num, input + 3);
+					ut64 vmin = r_num_math (core->num, num_str);
 					ut64 vmax = r_num_math (core->num, w);
 					if (vsize > 0) {
 						RIOMap *map;
@@ -2835,10 +2949,15 @@
 							int hits = r_core_search_value_in_range (core, map->itv,
 									vmin, vmax, vsize, asterisk,
 									_CbInRangeSearchV);
-							eprintf ("hits: %d\n", hits);
+							if (!json) {
+								eprintf ("hits: %d\n", hits);
+							}
 						}
 					}
 				}
+				if (json) {
+					r_cons_printf ("]");
+				}
 			}
 			if (err) {
 				eprintf ("Usage: /V[1|2|4|8] [minval] [maxval]\n");
@@ -2860,7 +2979,7 @@
 		r_search_reset (core->search, R_SEARCH_KEYWORD);
 		r_search_set_distance (core->search, (int)
 			r_config_get_i (core->config, "search.distance"));
-		char *v_str = (char *)r_str_trim_ro (input + 2);
+		char *v_str = (char *)r_str_trim_ro (input + param_offset);
 		RList *nums = r_num_str_split_list (v_str);
 		int len = r_list_length (nums);
 		int bsize = 0;
@@ -3077,6 +3196,26 @@
 			}
 		}
 		break;
+	case 'g': // "/g" graph search
+		if (input[1] == '?') {
+			r_cons_printf ("Usage: /g[g] [fromaddr] @ [toaddr]\n");
+			r_cons_printf ("(find all graph paths A to B (/gg follow jumps, see search.count and anal.depth)");
+		} else {
+			ut64 addr = UT64_MAX;
+			if (input[1]) {
+				addr = r_num_math (core->num, input + 2);
+			} else {
+				RAnalFunction *fcn = r_anal_get_fcn_at (core->anal, addr, 0);
+				if (fcn) {
+					addr = fcn->addr;
+				} else {
+					addr = core->offset;
+				}
+			}
+			const int depth = r_config_get_i (core->config, "anal.depth");
+			r_core_anal_paths (core, addr, core->offset, input[1] == 'g', depth);
+		}
+		break;
 	case 'F': // "/F" search file /F [file] ([offset] ([sz]))
 		if (input[param_offset - 1] == ' ') {
 			int n_args;
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_search_rop.c radare2-2.8.0+dfsg/libr/core/cmd_search_rop.c
--- radare2-2.3.0+dfsg/libr/core/cmd_search_rop.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_search_rop.c	2018-08-07 14:12:36.000000000 +0000
@@ -23,6 +23,7 @@
 	}
 	line = strtok (str_n, "\n");
 	data = strchr (line, '=');
+	// TODO: use r_str_split()
 	p = strtok (data + 1, ",");
 
 	while (p) {
@@ -65,7 +66,6 @@
 // binary op
 static bool simulate_op (const char *op, ut64 src1, ut64 src2, ut64 old_src1, ut64 old_src2, ut64 *result, int size) {
 	ut64 limit;
-
 	if (size == 64) {
 		limit = UT64_MAX;
 	} else {
@@ -661,7 +661,7 @@
 	const bool stats = r_config_get_i (core->config, "esil.stats");
 
 	if (!romem || !stats) {
-		// eprintf ("Error: esil.romem and esil.stats must be set TRUE");
+		// eprintf ("Error: esil.romem and esil.stats must be set TRUE\n");
 		return -2;
 	}
 
@@ -684,14 +684,13 @@
 }
 
 static void rop_classify (RCore *core, Sdb *db, RList *ropList, const char *key, unsigned int size) {
-	Sdb *db_nop = NULL, *db_mov = NULL, *db_ct = NULL, *db_aritm = NULL, *db_aritm_ct = NULL;
 	int nop = 0;  rop_classify_nops (core, ropList);
 	char *mov, *ct, *arithm, *arithm_ct, *str;
-	db_nop = sdb_ns (db, "nop", true);
-	db_mov = sdb_ns (db, "mov", true);
-	db_ct = sdb_ns (db, "const", true);
-	db_aritm = sdb_ns (db, "arithm", true);
-	db_aritm_ct = sdb_ns (db, "arithm_ct", true);
+	Sdb *db_nop = sdb_ns (db, "nop", true);
+	Sdb *db_mov = sdb_ns (db, "mov", true);
+	Sdb *db_ct = sdb_ns (db, "const", true);
+	Sdb *db_aritm = sdb_ns (db, "arithm", true);
+	Sdb *db_aritm_ct = sdb_ns (db, "arithm_ct", true);
 
 	if (!db_nop || !db_mov || !db_ct || !db_aritm || !db_aritm_ct) {
 		eprintf ("Error: Could not create SDB 'rop' sub-namespaces\n");
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_section.c radare2-2.8.0+dfsg/libr/core/cmd_section.c
--- radare2-2.3.0+dfsg/libr/core/cmd_section.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_section.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include "r_cons.h"
 #include "r_core.h"
@@ -17,7 +17,7 @@
 	"S=","","list sections (ascii-art bars) (io.va to display paddr or vaddr)",
 	"Sa","[-] [A] [B] [[off]]","Specify arch and bits for given section",
 	"Sd[a]"," [file]","dump current (all) section to a file (see dmd)",
-	"Sf"," [baddr]","Alias for S 0 0 $s $s foo mrwx",
+	"Sf"," [baddr]","Alias for S 0 0 $s $s foo rwx",
 	"Sj","","list sections in JSON (alias for iSj)",
 	"Sl"," [file]","load contents of file into current section (see dml)",
 	"Sr"," [name]","rename section on current seek",
@@ -255,7 +255,7 @@
 	int len = 0;
 	char *secname = NULL;
 	list = r_flag_get_list (flags, s->vaddr);
-	secname = sdb_fmt (-1, "section.%s", oldname);
+	secname = sdb_fmt ("section.%s", oldname);
 	len = strlen (secname);
 	r_list_foreach (list, iter, item) {
 		if (!item->name)  {
@@ -263,7 +263,7 @@
 		}
 		if (!strncmp (item->name, secname, R_MIN (strlen (item->name), len))) {
 			free (item->realname);
-			item->name = strdup (sdb_fmt (-1, "section.%s", s->name));
+			item->name = strdup (sdb_fmt ("section.%s", s->name));
 			r_str_trim (item->name);
 			r_name_filter (item->name, 0);
 			item->realname = item->name;
@@ -271,7 +271,7 @@
 		}
 	}
 	list = r_flag_get_list (flags, s->vaddr + s->size);
-	secname = sdb_fmt (-1, "section_end.%s", oldname);
+	secname = sdb_fmt ("section_end.%s", oldname);
 	len = strlen (secname);
 	r_list_foreach (list, iter, item) {
 		if (!item->name)  {
@@ -279,7 +279,7 @@
 		}
 		if (!strncmp (item->name, secname, R_MIN (strlen (item->name), len))) {
 			free (item->realname);
-			item->name = strdup (sdb_fmt (-1, "section_end.%s", s->name));
+			item->name = strdup (sdb_fmt ("section_end.%s", s->name));
 			r_str_trim (item->name);
 			r_name_filter (item->name, 0);
 			item->realname = item->name;
@@ -342,9 +342,9 @@
 	case 'f': // "Sf"
 		if (input[1] == ' ') {
 			ut64 n = r_num_math (core->num, input + 1);
-			r_core_cmdf (core, "S 0x%"PFMT64x" 0x%"PFMT64x" $s $s foo mrwx", n, n);
+			r_core_cmdf (core, "S 0x%"PFMT64x" 0x%"PFMT64x" $s $s foo rwx", n, n);
 		} else {
-			r_core_cmd0 (core, "S 0 0 $s $s foo mrwx");
+			r_core_cmd0 (core, "S 0 0 $s $s foo rwx");
 		}
 		break;
 	case 'j': // "Sj"
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_seek.c radare2-2.8.0+dfsg/libr/core/cmd_seek.c
--- radare2-2.3.0+dfsg/libr/core/cmd_seek.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_seek.c	2018-08-07 14:12:36.000000000 +0000
@@ -68,6 +68,56 @@
 	DEFINE_CMD_DESCRIPTOR (core, ss);
 }
 
+#define OPDELTA 32
+static ut64 prevop_addr(RCore *core, ut64 addr) {
+	ut8 buf[OPDELTA * 2];
+	ut64 target, base;
+	RAnalBlock *bb;
+	RAnalOp op;
+	int len, ret, i;
+	int minop = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
+	int maxop = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MAX_OP_SIZE);
+
+	if (minop == maxop) {
+		if (minop == -1) {
+			return addr - 4;
+		}
+		return addr - minop;
+	}
+
+	// let's see if we can use anal info to get the previous instruction
+	// TODO: look in the current basicblock, then in the current function
+	// and search in all functions only as a last chance, to try to speed
+	// up the process.
+	bb = r_anal_bb_from_offset (core->anal, addr - minop);
+	if (bb) {
+		ut64 res = r_anal_bb_opaddr_at (bb, addr - minop);
+		if (res != UT64_MAX) {
+			return res;
+		}
+	}
+	// if we anal info didn't help then fallback to the dumb solution.
+	target = addr;
+	base = target - OPDELTA;
+	r_io_read_at (core->io, base, buf, sizeof (buf));
+	for (i = 0; i < sizeof (buf); i++) {
+		ret = r_anal_op (core->anal, &op, base + i,
+			buf + i, sizeof (buf) - i, R_ANAL_OP_MASK_BASIC);
+		if (!ret) {
+			continue;
+		}
+		len = op.size;
+		r_anal_op_fini (&op); // XXX
+		if (len < 1) {
+			continue;
+		}
+		if (target == base + i + len) {
+			return base + i;
+		}
+		i += len - 1;
+	}
+	return target - 4;
+}
 static void __init_seek_line(RCore *core) {
 	ut64 from, to;
 
@@ -222,6 +272,71 @@
 	}
 }
 
+static int cmd_seek_opcode_backward(RCore *core, int n) {
+	int val = 0;
+	// N previous instructions
+	ut64 addr = core->offset;
+	int ret = 0;
+	int numinstr = n * -1;
+	if (r_core_prevop_addr (core, core->offset, numinstr, &addr)) {
+		ret = core->offset - addr;
+	} else {
+#if 0
+		// core_asm_bwdis_len is buggy as hell we should kill it. seems like prevop_addr
+		// works as expected, because is the one used from visual
+		ret = r_core_asm_bwdis_len (core, &instr_len, &addr, numinstr);
+#endif
+		ut64 prev_addr = prevop_addr (core, core->offset);
+		if (prev_addr <= core->offset) {
+			RAsmOp op;
+			r_core_seek (core, prev_addr, 1);
+			r_asm_disassemble (core->assembler, &op,
+					core->block, 32);
+			val += op.size;
+			return val;
+		}
+	}
+	r_core_seek (core, addr, true);
+	val += ret;
+	return val;
+}
+
+static int cmd_seek_opcode_forward (RCore *core, int n) {
+	// N forward instructions
+	int i, ret, val = 0;
+	for (val = i = 0; i < n; i++) {
+		RAnalOp op;
+
+		ret = r_anal_op (core->anal, &op,
+				core->offset, core->block, core->blocksize, R_ANAL_OP_MASK_BASIC);
+		if (ret < 1) {
+			ret = 1;
+		}
+		r_core_seek_delta (core, ret);
+		r_anal_op_fini (&op);
+		val += ret;
+	}
+	return val;
+}
+
+static void cmd_seek_opcode(RCore *core, const char *input) {
+	if (input[0] == '?') {
+		eprintf ("Usage: so [-][n]\n");
+		return;
+	}
+	if (!strcmp (input, "-")) {
+		input = "-1";
+	}
+	int n = r_num_math (core->num, input);
+	if (n == 0) {
+		n = 1;
+	}
+	int val = (n < 0)
+		? cmd_seek_opcode_backward (core, n)
+		: cmd_seek_opcode_forward (core, n);
+	core->num->value = val;
+}
+
 static int cmd_seek(void *data, const char *input) {
 	RCore *core = (RCore *) data;
 	char *cmd, *p;
@@ -247,17 +362,19 @@
 			off = -(st64)off;
 		}
 	}
-	int sign = 1;
+#if 1
+//	int sign = 1;
 	if (input[0] == ' ') {
 		switch (input[1]) {
 		case '-':
-			sign = -1;
+//			sign = -1;
 			/* pass thru */
 		case '+':
 			input++;
 			break;
 		}
 	}
+#endif
 	bool silent = false;
 	if (*input == 's') {
 		silent = true;
@@ -345,12 +462,19 @@
 		}
 		break;
 	case ' ': // "s "
+	{
+		ut64 addr = r_num_math (core->num, input + 1);
+		if (core->num->nc.errors && r_cons_singleton ()->is_interactive) {
+			eprintf ("Cannot seek to unknown address '%s'\n", core->num->nc.calc_buf);
+			break;
+		}
 		if (!silent) {
 			r_io_sundo_push (core->io, core->offset, r_print_get_cursor (core->print));
 		}
-		r_core_seek (core, r_num_math (core->num, input + 1), 1);
+		r_core_seek (core, addr, 1);
 		r_core_block_read (core);
-		break;
+	}
+	break;
 	case '/': // "s/"
 	{
 		const char *pfx = r_config_get (core->config, "search.prefix");
@@ -395,11 +519,12 @@
 		}
 	}
 	break;
-	case '.': // "s."
+	case '.': // "s." "s.."
 		for (input++; *input == '.'; input++) {
 			;
 		}
 		r_core_seek_base (core, input);
+		r_io_sundo_push (core->io, core->offset, r_print_get_cursor (core->print));
 		break;
 	case 'j':  // "sj"
 		{
@@ -635,41 +760,8 @@
 		break;
 	}
 	case 'o': // "so"
-	if (input[1] == '?') {
-		eprintf ("Usage: so [n-instructions]\n");
-	} else {
-		int val = 0, ret, i, n = r_num_math (core->num, input + 1);
-		if (n == 0) {
-			n = 1;
-		}
-		if (n < 0) {
-			int instr_len;
-			ut64 addr = core->offset;
-			int numinstr = n * -1;
-			if (r_core_prevop_addr (core, core->offset, numinstr, &addr)) {
-				ret = core->offset - addr;
-			} else {
-				ret = r_core_asm_bwdis_len (core, &instr_len, &addr, numinstr);
-			}
-			r_core_seek (core, addr, true);
-			val += ret;
-		} else {
-			for (val = i = 0; i < n; i++) {
-				RAnalOp op;
-
-				ret = r_anal_op (core->anal, &op,
-					core->offset, core->block, core->blocksize);
-				if (ret < 1) {
-					ret = 1;
-				}
-				r_core_seek_delta (core, ret);
-				r_anal_op_fini (&op);
-				val += ret;
-			}
-		}
-		core->num->value = val;
-	}
-	break;
+		cmd_seek_opcode (core, input + 1);
+		break;
 	case 'g': // "sg"
 	{
 		RIOSection *s = r_io_section_vget (core->io, core->offset);
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_type.c radare2-2.8.0+dfsg/libr/core/cmd_type.c
--- radare2-2.3.0+dfsg/libr/core/cmd_type.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_type.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake, oddcoder, Anton Kochkov, Jody Frankowski */
+/* radare - LGPL - Copyright 2009-2018 - pancake, oddcoder, Anton Kochkov, Jody Frankowski */
 
 #include <string.h>
 #include "r_anal.h"
@@ -9,29 +9,27 @@
 static const char *help_msg_t[] = {
 	"Usage: t", "", "# cparse types commands",
 	"t", "", "List all loaded types",
+	"tj", "", "List all loaded types as json",
 	"t", " <type>", "Show type in 'pf' syntax",
 	"t*", "", "List types info in r2 commands",
 	"t-", " <name>", "Delete types by its name",
 	"t-*", "", "Remove all types",
-	//"t-!", "",          "Use to open $EDITOR",
 	"ta", " <type>", "Mark immediate as a type offset",
-	"tb", " <enum> <value>", "Show matching enum bitfield for given number",
 	"tc", " ([cctype])", "calling conventions listing and manipulations",
 	"te", "[?]", "List all loaded enums",
-	"te", " <enum> <value>", "Show name for given enum number",
 	"td", "[?] <string>", "Load types from string",
 	"tf", "", "List all loaded functions signatures",
 	"tk", " <sdb-query>", "Perform sdb query",
 	"tl", "[?]", "Show/Link type to an address",
-	//"to",  "",         "List opened files",
 	"tn", "[?] [-][addr]", "manage noreturn function attributes and marks",
 	"to", " -", "Open cfg.editor to load types",
 	"to", " <path>", "Load types from C header file",
 	"tos", " <path>", "Load types from parsed Sdb database",
-	"tp", " <type>  = <address>", "cast data at <address> to <type> and print it",
+	"tp", "  <type> [addr|varname]", "cast data at <address> to <type> and print it",
+	"tpx", " <type> <hexpairs>", "Show value for type with specified byte sequence",
 	"ts", "[?]", "print loaded struct types",
 	"tu", "[?]", "print loaded union types",
-	//"| ts k=v k=v @ link.addr set fields at given linked type\n"
+	"tt", "[?]", "List all loaded typedefs",
 	NULL
 };
 
@@ -41,16 +39,32 @@
 };
 
 static const char *help_msg_ta[] = {
-	"USAGE ta[...]", "", "",
+	"Usage: ta[...]", "", "",
 	"tas", " <offset>", "List all matching structure offsets",
 	"ta", " <struct member>", "Change immediate to structure offset",
+	"taa", " [fcn]", "Analyze all/given function to convert immediate to linked structure offsets (see tl?)",
 	"ta?", "", "show this help",
 	NULL
 };
 
+static const char *help_msg_tf[] = {
+	"Usage: tf[...]", "", "",
+	"tf", "", "List all function definitions loaded",
+	"tf", " <name>", "Show function signature",
+	NULL
+};
+
+static const char *help_msg_to[] = {
+	"Usage: to[...]", "", "",
+	"to", " -", "Open cfg.editor to load types",
+	"to", " <path>", "Load types from C header file",
+	"tos", " <path>", "Load types from parsed Sdb database",
+	NULL
+};
+
 static const char *help_msg_tc[] = {
-	"USAGE tc[...]", " [cctype]", "",
-	"tc", "", "List all loaded structs",
+	"Usage: tc[...]", " [cctype]", "",
+	"tc", "", "List all loaded calling convention",
 	"tc", " [cctype]", "Show convention rules for this type",
 	"tc=", "([cctype])", "Select (or show) default calling convention",
 	"tc-", "[cctype]", "TODO: remove given calling convention",
@@ -69,13 +83,24 @@
 };
 
 static const char *help_msg_te[] = {
-	"USAGE te[...]", "", "",
+	"Usage: te[...]", "", "",
 	"te", "", "List all loaded enums",
+	"te", " <enum>", "Print all values of enum for given name",
 	"te", " <enum> <value>", "Show name for given enum number",
+	"teb", " <enum> <name>", "Show matching enum bitfield for given name",
 	"te?", "", "show this help",
 	NULL
 };
 
+
+static const char *help_msg_tt[] = {
+	"Usage: tt[...]", "", "",
+	"tt", "", "List all loaded typedefs",
+	"tt", " <typename>", "Show name for given type alias",
+	"tt?", "", "show this help",
+	NULL
+};
+
 static const char *help_msg_tl[] = {
 	"Usage:", "", "",
 	"tl", "", "list all links in readable format",
@@ -99,16 +124,20 @@
 };
 
 static const char *help_msg_ts[] = {
-	"USAGE ts[...]", " [type]", "",
+	"Usage: ts[...]", " [type]", "",
 	"ts", "", "List all loaded structs",
 	"ts", " [type]", "Show pf format string for given struct",
+	"ts*", " [type]", "Show pf.<name> format string for given struct",
+	"tss", " [type]", "Display size of struct",
 	"ts?", "", "show this help",
 	NULL
 };
 
 static const char *help_msg_tu[] = {
-	"USAGE tu[...]", "", "",
+	"Usage: tu[...]", "", "",
 	"tu", "", "List all loaded unions",
+	"tu", " [type]", "Show pf format string for given union",
+	"tu*", " [type]", "Show pf.<name> format string for given union",
 	"tu?", "", "show this help",
 	NULL
 };
@@ -124,21 +153,26 @@
 	DEFINE_CMD_DESCRIPTOR (core, tn);
 	DEFINE_CMD_DESCRIPTOR (core, ts);
 	DEFINE_CMD_DESCRIPTOR (core, tu);
+	DEFINE_CMD_DESCRIPTOR (core, tt);
 }
 
 static void show_help(RCore *core) {
 	r_core_cmd_help (core, help_msg_t);
 }
 
-static void showFormat(RCore *core, const char *name) {
+static void showFormat(RCore *core, const char *name, int mode) {
 	const char *isenum = sdb_const_get (core->anal->sdb_types, name, 0);
 	if (isenum && !strcmp (isenum, "enum")) {
 		eprintf ("IS ENUM\n");
 	} else {
-		char *fmt = r_anal_type_format (core->anal, name);
+		char *fmt = r_type_format (core->anal->sdb_types, name);
 		if (fmt) {
 			r_str_trim (fmt);
-			r_cons_printf ("pf %s\n", fmt);
+			if (mode) {
+				r_cons_printf ("pf.%s %s\n", name, fmt);
+			} else {
+				r_cons_printf ("pf %s\n", fmt);
+			}
 			free (fmt);
 		} else {
 			eprintf ("Cannot find '%s' type\n", name);
@@ -198,7 +232,7 @@
 	if (type) {
 		char *name = NULL;
 		if ((name = strstr (type, "=type")) || (name = strstr (type, "=struct")) || (name = strstr (type, "=union")) ||
-			(name = strstr (type, "=enum")) || (name = strstr (type, "=func"))) {
+			(name = strstr (type, "=enum")) || (name = strstr (type, "=typedef")) ||(name = strstr (type, "=func"))) {
 			*name = 0;
 			while (name - 1 >= type && *(name - 1) != '\n') {
 				name--;
@@ -239,7 +273,7 @@
 static int sdbdeletelink (void *p, const char *k, const char *v) {
 	RCore *core = (RCore *)p;
 	if (!strncmp (k, "link.", strlen ("link."))) {
-		r_anal_type_del (core->anal, k);
+		r_type_del (core->anal->sdb_types, k);
 	}
 	return 1;
 }
@@ -253,7 +287,7 @@
 static int linklist_readable (void *p, const char *k, const char *v) {
 	RCore *core = (RCore *)p;
 	if (!strncmp (k, "link.", strlen ("link."))) {
-		char *fmt = r_anal_type_format (core->anal, v);
+		char *fmt = r_type_format (core->anal->sdb_types, v);
 		if (!fmt) {
 			eprintf("Cant fint type %s", v);
 			return 1;
@@ -264,85 +298,284 @@
 	return 1;
 
 }
-static int typelist(void *p, const char *k, const char *v) {
+static int typelist_cb(void *p, const char *k, const char *v) {
 	r_cons_printf ("tk %s=%s\n", k, v);
-#if 0
-	if (!strcmp (v, "func")) {
-		const char *rv = sdb_const_get (DB,
-						sdb_fmt (0, "func.%s.ret", k), 0);
-		r_cons_printf ("# %s %s(", rv, k);
-		for (i = 0; i < 16; i++) {
-			char *av = sdb_get (DB,
-					sdb_fmt (0, "func.%s.arg.%d", k, i), 0);
-			if (!av) break;
-			r_str_replace_char (av, ',', ' ');
-			r_cons_printf ("%s%s", i? ", ": "", av);
-			free (av);
-		}
-		r_cons_printf (");\n");
-		// signature in pf for asf
-		r_cons_printf ("asf %s=", k);
-		// formats
-		for (i = 0; i < 16; i++) {
-			const char *fmt;
-			char *comma, *av = sdb_get (DB,
-						sdb_fmt (0, "func.%s.arg.%d", k, i), 0);
-			if (!av) break;
-			comma = strchr (av, ',');
-			if (comma) *comma = 0;
-			fmt = sdb_const_get (DB, sdb_fmt (0, "type.%s", av), 0);
-			r_cons_printf ("%s", fmt);
-			if (comma) *comma = ',';
-			free (av);
-		}
-		// names
-		for (i = 0; i < 16; i++) {
-			char *comma, *av = sdb_get (DB,
-						sdb_fmt (0, "func.%s.arg.%d", k, i), 0);
-			if (!av) break;
-			comma = strchr (av, ',');
-			if (comma) *comma++ = 0;
-			r_cons_printf (" %s", comma);
-			free (av);
-		}
-		r_cons_newline ();
-	}
-#endif
 	return 1;
 }
 
-static int sdbforcb (void *p, const char *k, const char *v) {
-	if (!strncmp (v, "type", strlen ("type") + 1)) {
-		r_cons_println (k);
-	}
+static int sdbforcb_default (void *p, const char *k, const char *v) {
+	r_cons_println (k);
+	return 1;
+}
+
+static int sdbforcb_json (void *p, const char *k, const char *v) {
+	Sdb *sdb = (Sdb *)p;
+	char *sizecmd = r_str_newf ("type.%s.size", k);
+	char *size_s = sdb_querys (sdb, NULL, -1, sizecmd);
+	char *formatcmd = r_str_newf ("type.%s", k);
+	r_cons_printf ("{\"type\":\"%s\",\"size\":%d,\"format\":\"%s\"}", k,
+			size_s ? atoi (size_s) : -1,
+			r_str_trim (sdb_querys (sdb, NULL, -1, formatcmd)));
+	free (sizecmd);
+	free (formatcmd);
 	return 1;
 }
 
 static void typesList(RCore *core, int mode) {
 	switch (mode) {
-	case 'j':
-		eprintf ("TODO\n");
-		break;
 	case 1:
 	case '*':
-		sdb_foreach (core->anal->sdb_types, typelist, core);
+		sdb_foreach (core->anal->sdb_types, typelist_cb, core);
 		break;
+	case 'j':
 	default:
 		{
 		SdbList *ls = sdb_foreach_list (core->anal->sdb_types, true);
+		SdbList *filtls = ls_new ();
 		SdbListIter *it;
 		SdbKv *kv;
 		ls_foreach (ls, it, kv) {
-			sdbforcb ((void *)core, kv->key, kv->value);
+			if (!strncmp (kv->value, "type", strlen ("type") + 1)) {
+				ls_append (filtls, kv);
+			}
+		}
+		if (mode == 'j') {
+			r_cons_print ("[");
+			ls_foreach (filtls, it, kv) {
+				sdbforcb_json ((void *)core->anal->sdb_types, kv->key, kv->value);
+				if (it->n) { r_cons_print (","); }
+			}
+			r_cons_println ("]");
+		} else {
+			ls_foreach (filtls, it, kv) {
+				sdbforcb_default ((void *)core->anal->sdb_types, kv->key, kv->value);
+			}
 		}
 		ls_free (ls);
+		ls_free (filtls);
 		}
 		break;
 	}
 }
 
+static void set_offset_hint(RCore *core, RAnalOp op, const char *type, ut64 laddr, ut64 at, int offimm) {
+	char *res = r_type_get_struct_memb (core->anal->sdb_types, type, offimm);
+	const char *cmt = ((offimm == 0) && res)? res: type;
+	if (offimm > 0) {
+		// set hint only if link is present
+		char* query = sdb_fmt ("link.%08"PFMT64x, laddr);
+		if (res && sdb_const_get (core->anal->sdb_types, query, 0)) {
+			r_anal_hint_set_offset (core->anal, at, res);
+		}
+	} else if (cmt && r_anal_op_ismemref (op.type)) {
+			r_meta_set_string (core->anal, R_META_TYPE_VARTYPE, at, cmt);
+	}
+}
+
+R_API int r_core_get_stacksz (RCore *core, ut64 from, ut64 to) {
+	int stack = 0, maxstack = 0;
+	ut64 at = from;
+
+	if (from >= to) {
+		return 0;
+	}
+	const int mininstrsz = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
+	const int minopcode = R_MAX (1, mininstrsz);
+	while (at < to) {
+		RAnalOp *op = r_core_anal_op (core, at, R_ANAL_OP_MASK_BASIC);
+		if (!op || op->size <= 0) {
+			at += minopcode;
+			continue;
+		}
+		if ((op->stackop == R_ANAL_STACK_INC) && R_ABS (op->stackptr) < 8096) {
+			stack += op->stackptr;
+			if (stack > maxstack) {
+				maxstack = stack;
+			}
+		}
+		at += op->size;
+		r_anal_op_free (op);
+	}
+	return maxstack;
+}
+
+static void set_retval (RCore *core, ut64 at) {
+	RAnal *anal = core->anal;
+	RAnalHint *hint = r_anal_hint_get (anal, at);
+	RAnalFunction *fcn = r_anal_get_fcn_in (anal, at, 0);
+
+	if (!hint || !fcn || !fcn->name) {
+		goto beach;
+	}
+	if (hint->ret == UT64_MAX) {
+		goto beach;
+	}
+	const char *cc = r_anal_cc_func (core->anal, fcn->name);
+	const char *regname = r_anal_cc_ret (anal, cc);
+	if (regname) {
+		RRegItem *reg = r_reg_get (anal->reg, regname, -1);
+		if (reg) {
+			r_reg_set_value (anal->reg, reg, hint->ret);
+		}
+	}
+beach:
+	r_anal_hint_free (hint);
+	return;
+}
+
+static void link_struct_offset(RCore *core, RAnalFunction *fcn) {
+	RAnalBlock *bb;
+	RListIter *it;
+	RAnalOp aop = {0};
+	bool ioCache = r_config_get_i (core->config, "io.cache");
+	bool stack_set = false;
+	bool resolved = false;
+	const char *varpfx;
+	int dbg_follow = r_config_get_i (core->config, "dbg.follow");
+	Sdb *TDB = core->anal->sdb_types;
+	RAnalEsil *esil = core->anal->esil;
+	int iotrap = r_config_get_i (core->config, "esil.iotrap");
+	int stacksize = r_config_get_i (core->config, "esil.stack.depth");
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+	const char *pc_name = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
+	const char *sp_name = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
+	RRegItem *pc = r_reg_get (core->anal->reg, pc_name, -1);
+
+	if (!fcn) {
+		return;
+	}
+	if (!(esil = r_anal_esil_new (stacksize, iotrap, addrsize))) {
+		return;
+	}
+	r_anal_esil_setup (esil, core->anal, 0, 0, 0);
+	int i, ret, bsize = R_MAX (64, core->blocksize);
+	const int mininstrsz = r_anal_archinfo (core->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
+	const int minopcode = R_MAX (1, mininstrsz);
+	ut8 *buf = malloc (bsize);
+	if (!buf) {
+		free (buf);
+		r_anal_esil_free (esil);
+		return;
+	}
+	r_reg_arena_push (core->anal->reg);
+	r_debug_reg_sync (core->dbg, R_REG_TYPE_ALL, true);
+	ut64 spval = r_reg_getv (esil->anal->reg, sp_name);
+	if (spval) {
+		// reset stack pointer to intial value
+		RRegItem *sp = r_reg_get (esil->anal->reg, sp_name, -1);
+		ut64 curpc = r_reg_getv (esil->anal->reg, pc_name);
+		int stacksz = r_core_get_stacksz (core, fcn->addr, curpc);
+		if (stacksz > 0) {
+			r_reg_arena_zero (esil->anal->reg); // clear prev reg values
+			r_reg_set_value (esil->anal->reg, sp, spval + stacksz);
+		}
+	} else {
+		// intialize stack
+		r_core_cmd0 (core, "aeim");
+		stack_set = true;
+	}
+	r_config_set_i (core->config, "io.cache", 1);
+	r_config_set_i (core->config, "dbg.follow", 0);
+	ut64 oldoff = core->offset;
+	r_cons_break_push (NULL, NULL);
+	r_list_foreach (fcn->bbs, it, bb) {
+		ut64 at = bb->addr;
+		ut64 to = bb->addr + bb->size;
+		r_reg_set_value (esil->anal->reg, pc, at);
+		for (i = 0; at < to; i++) {
+			if (r_cons_is_breaked ()) {
+				goto beach;
+			}
+			if (at < bb->addr) {
+				break;
+			}
+			if (i >= (bsize - 32)) {
+				i = 0;
+			}
+			if (!i) {
+				r_io_read_at (core->io, at, buf, bsize);
+			}
+			ret = r_anal_op (core->anal, &aop, at, buf + i, bsize - i, R_ANAL_OP_MASK_VAL);
+			if (ret <= 0) {
+				i += minopcode;
+				at += minopcode;
+				r_anal_op_fini (&aop);
+				continue;
+			}
+			i += ret - 1;
+			at += ret;
+			int index = 0;
+			if (aop.ireg) {
+				index = r_reg_getv (esil->anal->reg, aop.ireg) * aop.scale;
+			}
+			int j, src_imm = -1, dst_imm = -1;
+			ut64 src_addr = UT64_MAX;
+			ut64 dst_addr = UT64_MAX;
+			for (j = 0; j < 3; j++) {
+				if (aop.src[j] && aop.src[j]->reg && aop.src[j]->reg->name) {
+					src_addr = r_reg_getv (esil->anal->reg, aop.src[j]->reg->name) + index;
+					src_imm = aop.src[j]->delta;
+				}
+			}
+			if (aop.dst && aop.dst->reg && aop.dst->reg->name) {
+				dst_addr = r_reg_getv (esil->anal->reg, aop.dst->reg->name) + index;
+				dst_imm = aop.dst->delta;
+			}
+			RAnalVar *var = aop.var;
+			char *slink = r_type_link_at (TDB, src_addr);
+			char *vlink = r_type_link_at (TDB, src_addr + src_imm);
+			char *dlink = r_type_link_at (TDB, dst_addr);
+			//TODO: Handle register based arg for struct offset propgation
+			if (vlink && var && var->kind != 'r') {
+				if (r_type_kind (TDB, vlink) == R_TYPE_UNION) {
+					varpfx = "union";
+				} else {
+					varpfx = "struct";
+				}
+				// if a var addr matches with struct , change it's type and name
+				// var int local_e0h --> var struct foo
+				if (strcmp (var->name , vlink) && !resolved) {
+					resolved = true;
+					r_anal_var_retype (core->anal, fcn->addr, R_ANAL_VAR_SCOPE_LOCAL,
+							-1, var->kind, varpfx, -1, var->isarg, var->name);
+					r_anal_var_rename (core->anal, fcn->addr, R_ANAL_VAR_SCOPE_LOCAL,
+							var->kind, var->name, vlink, false);
+				}
+			} else if (slink) {
+				set_offset_hint (core, aop, slink, src_addr, at - ret, src_imm);
+			} else if (dlink) {
+				set_offset_hint (core, aop, dlink, dst_addr, at - ret, dst_imm);
+			}
+			if (r_anal_op_nonlinear (aop.type)) {
+				r_reg_set_value (esil->anal->reg, pc, at);
+				set_retval (core, at - ret);
+			} else {
+				r_core_esil_step (core, UT64_MAX, NULL, NULL);
+			}
+			free (dlink);
+			free (vlink);
+			free (slink);
+			r_anal_op_fini (&aop);
+		}
+	}
+beach:
+	r_core_cmd0 (core, "wc-*"); // drop cache writes
+	r_config_set_i (core->config, "io.cache", ioCache);
+	r_config_set_i (core->config, "dbg.follow", dbg_follow);
+	if (stack_set) {
+		r_core_cmd0 (core, "aeim-");
+	}
+	r_core_seek (core, oldoff, 1);
+	r_anal_esil_free (esil);
+	r_reg_arena_pop (core->anal->reg);
+	r_core_cmd0 (core, ".ar*");
+	r_cons_break_pop ();
+	free (buf);
+}
+
 static int cmd_type(void *data, const char *input) {
 	RCore *core = (RCore *)data;
+	Sdb *TDB = core->anal->sdb_types;
 	char *res;
 
 	switch (input[0]) {
@@ -350,20 +583,28 @@
 		cmd_type_noreturn (core, input + 1);
 		break;
 	// t [typename] - show given type in C syntax
-	case 'u': // "tu"
+	case 'u': { // "tu"
 		switch (input[1]) {
 		case '?':
 			r_core_cmd_help (core, help_msg_tu);
 			break;
+		case '*':
+			if (input[2] == ' ') {
+				showFormat (core, r_str_trim_ro (input + 2), 1);
+			}
+			break;
+		case ' ':
+			showFormat (core, r_str_trim_ro (input + 1), 0);
+			break;
 		case 0:
-			sdb_foreach (core->anal->sdb_types, stdprintifunion, core);
+			sdb_foreach (TDB, stdprintifunion, core);
 			break;
 		}
-		break;
+	} break;
 	case 'k': // "tk"
 		res = (input[1] == ' ')
-			? sdb_querys (core->anal->sdb_types, NULL, -1, input + 2)
-			: sdb_querys (core->anal->sdb_types, NULL, -1, "*");
+			? sdb_querys (TDB, NULL, -1, input + 2)
+			: sdb_querys (TDB, NULL, -1, "*");
 		if (res) {
 			r_cons_print (res);
 		}
@@ -412,47 +653,68 @@
 			break;
 		}
 		break;
-	case 's': // "ts"
+	case 's': { // "ts"
 		switch (input[1]) {
-		case '?': {
+		case '?':
 			r_core_cmd_help (core, help_msg_ts);
-		} break;
+			break;
+		case '*':
+			if (input[2] == ' ') {
+				showFormat (core, r_str_trim_ro (input + 2), 1);
+			}
+			break;
 		case ' ':
-			showFormat (core, input + 2);
+			showFormat (core, r_str_trim_ro (input + 1), 0);
+			break;
+		case 's':
+			if (input[2] == ' ') {
+				r_cons_printf ("%d\n", (r_type_get_bitsize (TDB, input + 3) / 8));
+			} else {
+				r_core_cmd_help (core, help_msg_ts);
+			}
 			break;
 		case 0:
-			sdb_foreach (core->anal->sdb_types, stdprintifstruct, core);
+			sdb_foreach (TDB, stdprintifstruct, core);
 			break;
 		}
-		break;
-	case 'b': {
-		char *p, *s = (strlen (input) > 1)? strdup (input + 2): NULL;
-		const char *isenum;
-		p = s? strchr (s, ' '): NULL;
-		if (p) {
-			*p++ = 0;
-			// dupp in core.c (see getbitfield())
-			isenum = sdb_const_get (core->anal->sdb_types, s, 0);
-			if (isenum && !strcmp (isenum, "enum")) {
-				*--p = '.';
-				const char *res = sdb_const_get (core->anal->sdb_types, s, 0);
-				if (res)
-					r_cons_println (res);
-				else eprintf ("Invalid enum member\n");
+	} break;
+	case 'e': { // "te"
+		char *res = NULL, *temp = strchr(input, ' ');
+		Sdb *TDB = core->anal->sdb_types;
+		char *name = temp ? strdup (temp + 1): NULL;
+		char *member_name = name ? strchr (name, ' '): NULL;
+
+		if (member_name) {
+			*member_name++ = 0;
+		}
+		if (name && (r_type_kind (TDB, name) != R_TYPE_ENUM)) {
+			eprintf ("%s is not an enum\n", name);
+			break;
+		}
+		switch (input[1]) {
+		case '?' :
+			r_core_cmd_help (core, help_msg_te);
+			break;
+		case 'b' :
+			res = r_type_enum_member (TDB, name, member_name, 0);
+			break;
+		case ' ' : {
+			RListIter *iter;
+			RTypeEnum *member = R_NEW0 (RTypeEnum);
+			if (member_name) {
+				res = r_type_enum_member (TDB, name, NULL, r_num_math (core->num, member_name));
 			} else {
-				eprintf ("This is not an enum\n");
+				RList *list = r_type_get_enum (TDB, name);
+				r_list_foreach (list, iter, member) {
+					r_cons_printf ("%s = %s\n", member->name, member->val);
+				}
 			}
-		} else {
-			eprintf ("Missing value\n");
-		}
-		free (s);
-	} break;
-	case 'e': {
-		if (!input[1]) {
+		} break;
+		case '\0' : {
 			char *name = NULL;
 			SdbKv *kv;
 			SdbListIter *iter;
-			SdbList *l = sdb_foreach_list (core->anal->sdb_types, true);
+			SdbList *l = sdb_foreach_list (TDB, true);
 			ls_foreach (l, iter, kv) {
 				if (!strcmp (kv->value, "enum")) {
 					if (!name || strcmp (kv->value, name)) {
@@ -462,36 +724,18 @@
 					}
 				}
 			}
-			free (name);
 			ls_free (l);
-			break;
-		}
-		if (input[1] == '?') {
-			r_core_cmd_help (core, help_msg_te);
-			break;
+		} break;
 		}
-		char *p, *s = strdup (input + 2);
-		const char *isenum;
-		p = strchr (s, ' ');
-		if (p) {
-			*p++ = 0;
-			isenum = sdb_const_get (core->anal->sdb_types, s, 0);
-			if (isenum && !strncmp (isenum, "enum", 4)) {
-				const char *q = sdb_fmt (0, "%s.0x%x", s, (ut32)r_num_math (core->num, p));
-				const char *res = sdb_const_get (core->anal->sdb_types, q, 0);
-				if (res)
-					r_cons_println (res);
-			} else {
-				eprintf ("This is not an enum\n");
-			}
-		} else {
-			//eprintf ("Missing value\n");
-			r_core_cmdf (core, "t~&%s,=0x", s);
+		free (name);
+		if (res) {
+			r_cons_println (res);
+		} else if (member_name) {
+			eprintf ("Invalid enum member\n");
 		}
-		free (s);
 	} break;
 	case ' ':
-		showFormat (core, input + 1);
+		showFormat (core, input + 1, 0);
 		break;
 	// t* - list all types in 'pf' syntax
 	case 'j': // "tj"
@@ -500,7 +744,9 @@
 		typesList (core, input[0]);
 		break;
 	case 'o': // "to"
-		if (!r_sandbox_enable (0)) {
+		if (input[1] == '?') {
+			r_core_cmd_help (core, help_msg_to);
+		} else if (!r_sandbox_enable (0)) {
 			if (input[1] == ' ') {
 				const char *filename = input + 2;
 				char *homefile = NULL;
@@ -511,10 +757,9 @@
 					}
 				}
 				if (!strcmp (filename, "-")) {
-					char *out, *tmp;
-					tmp = r_core_editor (core, NULL, "");
+					char *tmp = r_core_editor (core, "*.h", "");
 					if (tmp) {
-						out = r_parse_c_string (core->anal, tmp);
+						char *out = r_parse_c_string (core->anal, tmp);
 						if (out) {
 							//		r_cons_strcat (out);
 							save_parsed_type (core, out);
@@ -529,14 +774,13 @@
 						save_parsed_type (core, out);
 						free (out);
 					}
-					//r_anal_type_loadfile (core->anal, filename);
 				}
 				free (homefile);
 			} else if (input[1] == 's') {
 				const char *dbpath = input + 3;
 				if (r_file_exists (dbpath)) {
 					Sdb *db_tmp = sdb_new (0, dbpath, 0);
-					sdb_merge (core->anal->sdb_types, db_tmp);
+					sdb_merge (TDB, db_tmp);
 					sdb_close (db_tmp);
 					sdb_free (db_tmp);
 				}
@@ -551,17 +795,14 @@
 			// TODO #7967 help refactor: move to detail
 			r_core_cmd_help (core, help_msg_td);
 			r_cons_printf ("Note: The td command should be put between double quotes\n"
-				"Example: \" td struct foo {int bar;int cow};\""
+				"Example: \"td struct foo {int bar;int cow;};\""
 				"\nt");
 
 		} else if (input[1] == ' ') {
 			char tmp[8192];
 			snprintf (tmp, sizeof (tmp) - 1, "%s;", input + 2);
-			//const char *string = input + 2;
-			//r_anal_str_to_type (core->anal, string);
 			char *out = r_parse_c_string (core->anal, tmp);
 			if (out) {
-				//r_cons_strcat (out);
 				save_parsed_type (core, out);
 				free (out);
 			}
@@ -572,20 +813,47 @@
 	// ta - link immediate type offset to an address
 	case 'a': // "ta"
 		switch (input[1]) {
-		case 's': {
+		case 's': { // "tas"
 			char *off = strdup (input + 2);
 			r_str_trim (off);
 			int toff = r_num_math (NULL, off);
 			if (toff) {
-				RList *typeoffs = r_anal_type_get_by_offset (core->anal, toff);
+				RList *typeoffs = r_type_get_by_offset (TDB, toff);
 				RListIter *iter;
 				char *ty;
 				r_list_foreach (typeoffs, iter, ty) {
 					r_cons_printf ("%s\n", ty);
 				}
 			}
+			free (off);
 			break;
 		}
+		case 'a': { // "taa"
+			char *off = r_str_trim (strdup (input + 2));
+			RAnalFunction *fcn;
+			RListIter *it;
+			if (off && *off) {
+				ut64 addr = r_num_math (NULL, off);
+				fcn = r_anal_get_fcn_at (core->anal, core->offset, 0);
+				if (fcn) {
+					link_struct_offset (core, fcn);
+				} else {
+					eprintf ("cannot find function at %08"PFMT64x"\n", addr);
+				}
+			} else {
+				if (r_list_length (core->anal->fcns) == 0) {
+					eprintf ("couldn't find any functions\n");
+					break;
+				}
+				r_list_foreach (core->anal->fcns, it, fcn) {
+					if (r_cons_is_breaked ()) {
+						break;
+					}
+					link_struct_offset (core, fcn);
+				}
+			}
+			free (off);
+		} break;
 		case ' ': {
 			char *type = strdup (input + 2);
 			char *ptr = strchr (type, '=');
@@ -608,12 +876,12 @@
 			}
 			r_str_trim (type);
 			RAsmOp asmop;
-			RAnalOp op;
+			RAnalOp op = {0};
 			ut8 code[128] = {0};
 			(void)r_io_read_at (core->io, core->offset, code, sizeof (code));
 			r_asm_set_pc (core->assembler, addr);
 			int ret = r_asm_disassemble (core->assembler, &asmop, code, core->blocksize);
-			ret = r_anal_op (core->anal, &op, core->offset, code, core->blocksize);
+			ret = r_anal_op (core->anal, &op, core->offset, code, core->blocksize, R_ANAL_OP_MASK_VAL);
 			if (ret >= 0) {
 				// HACK: Just convert only the first imm seen
 				for (i = 0; i < 3; i++) {
@@ -625,15 +893,22 @@
 						}
 					}
 				}
+				if (!offimm && op.dst) {
+					if (op.dst->imm) {
+						offimm = op.dst->imm;
+					} else if (op.dst->delta) {
+						offimm = op.dst->delta;
+					}
+				}
 				if (offimm != 0) {
 					// TODO: Allow to select from multiple choices
-					RList* otypes = r_anal_type_get_by_offset (core->anal, offimm);
+					RList* otypes = r_type_get_by_offset (TDB, offimm);
 					RListIter *iter;
 					char *otype = NULL;
 					r_list_foreach (otypes, iter, otype) {
 						if (!strcmp(type, otype)) {
 							//eprintf ("Adding type offset %s\n", type);
-							r_anal_type_link_offset (core->anal, type, addr);
+							r_type_link_offset (TDB, type, addr);
 							r_anal_hint_set_offset (core->anal, addr, otype);
 							break;
 						}
@@ -643,6 +918,7 @@
 					}
 				}
 			}
+			r_anal_op_fini (&op);
 			free (type);
 		}
 		break;
@@ -676,9 +952,13 @@
 				addr = core->offset;
 			}
 			r_str_trim (type);
-			char *tmp = sdb_get (core->anal->sdb_types, type, 0);
+			char *tmp = sdb_get (TDB, type, 0);
 			if (tmp && *tmp) {
-				r_anal_type_link (core->anal, type, addr);
+				r_type_set_link (TDB, type, addr);
+				RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
+				if (fcn) {
+					link_struct_offset (core, fcn);
+				}
 				free (tmp);
 			} else {
 				eprintf ("unknown type %s\n", type);
@@ -687,94 +967,94 @@
 			}
 			break;
 		case 's': {
-			int ptr;
-			char *addr = strdup (input + 2);
-			SdbKv *kv;
-			SdbListIter *sdb_iter;
-			SdbList *sdb_list = sdb_foreach_list (core->anal->sdb_types, true);
-			r_str_trim (addr);
-			ptr = r_num_math (NULL, addr);
-			//r_core_cmdf (core, "tl~0x%08"PFMT64x" = ", addr);
-			ls_foreach (sdb_list, sdb_iter, kv) {
-				char *linkptr;
-				if (strncmp (kv->key, "link.", strlen ("link."))) {
-					continue;
-				}
-				linkptr = sdb_fmt (-1,"0x%s", kv->key + strlen ("link."));
-				if (ptr == r_num_math (NULL, linkptr)) {
-					linklist_readable (core, kv->key, kv->value);
-				}
+			char *ptr = r_str_trim (strdup (input + 2));
+			ut64 addr = r_num_math (NULL, ptr);
+			const char* query = sdb_fmt ("link.%08"PFMT64x, addr);
+			const char *link = sdb_const_get (TDB, query, 0);
+			if (link) {
+				linklist_readable (core, query, link);
 			}
-			free (addr);
-			ls_free (sdb_list);
+			free (ptr);
 			}
 			break;
 		case '-':
 			switch (input[2]) {
 			case '*':
-				sdb_foreach (core->anal->sdb_types, sdbdeletelink, core);
+				sdb_foreach (TDB, sdbdeletelink, core);
 				break;
 			case ' ': {
 				const char *ptr = input + 3;
 				ut64 addr = r_num_math (core->num, ptr);
-				r_anal_type_unlink (core->anal, addr);
+				r_type_unlink (TDB, addr);
 				}
 				break;
 			}
 			break;
 		case '*':
-			sdb_foreach (core->anal->sdb_types, linklist, core);
+			sdb_foreach (TDB, linklist, core);
 			break;
 		case '\0':
-			sdb_foreach (core->anal->sdb_types, linklist_readable, core);
+			sdb_foreach (TDB, linklist_readable, core);
 			break;
 		}
 		break;
-	case 'p':
-		if (input[2]) {
-			ut64 addr = core->offset;
-			const char *type = input + 2;
-			char *ptr = strchr (type, '=');
-			if (ptr) {
-				char *tmp = ptr-1;
-				*ptr++ = 0;
-				while(isspace (*ptr)) ptr++;
-				while(isspace (*tmp)) *tmp-- = 0;
-				addr = r_num_math (core->num, ptr);
-			}
-			char *fmt = r_anal_type_format (core->anal, type);
-			if (fmt) {
-				r_core_cmdf (core, "pf %s @ 0x%08" PFMT64x "\n", fmt, addr);
-				free (fmt);
-			} else eprintf ("Cannot find '%s' type\n", input + 1);
+	case 'p': { // "tp"
+		char *tmp = strdup (input);
+		char *ptr = r_str_trim (strchr (tmp , ' '));
+		if (!ptr) {
+			break;
+		}
+		int nargs = r_str_word_set0 (ptr);
+		if (nargs > 0) {
+			const char *type = r_str_word_get0 (ptr, 0);
+			const char *arg = nargs > 1? r_str_word_get0 (ptr, 1): NULL;
+			char *fmt = r_type_format (TDB, type);
+			if (!fmt) {
+				eprintf ("Cannot find '%s' type\n", type);
+				break;
+			}
+			if (input[1] == 'x' && arg) {
+				r_core_cmdf (core, "pf %s @x: %s", fmt, arg);
+			} else {
+				ut64 addr = arg ? r_num_math (core->num, arg): core->offset;
+				if (!addr && arg) {
+					RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, -1);
+					addr = r_anal_var_addr (core->anal, fcn, arg);
+				}
+				if (addr != UT64_MAX) {
+					r_core_cmdf (core, "pf %s @ 0x%08" PFMT64x "\n", fmt, addr);
+				}
+			}
+			free (fmt);
 		} else {
 			eprintf ("see t?\n");
 			break;
 		}
-		break;
+		free (tmp);
+	} break;
 	case '-':
 		if (input[1] == '?') {
 			r_core_cmd_help (core, help_msg_t_minus);
 		} else if (input[1] == '*') {
-			sdb_reset (core->anal->sdb_types);
+			sdb_reset (TDB);
 		} else {
 			const char *name = input + 1;
 			while (IS_WHITESPACE (*name)) name++;
 			if (*name) {
 				SdbKv *kv;
 				SdbListIter *iter;
-				const char *type = sdb_const_get (core->anal->sdb_types, name, 0);
+				const char *type = sdb_const_get (TDB, name, 0);
 				if (!type)
 					break;
 				int tmp_len = strlen (name) + strlen (type);
 				char *tmp = malloc (tmp_len + 1);
-				r_anal_type_del (core->anal, name);
+				r_type_del (TDB, name);
 				if (tmp) {
 					snprintf (tmp, tmp_len + 1, "%s.%s.", type, name);
-					SdbList *l = sdb_foreach_list (core->anal->sdb_types, true);
+					SdbList *l = sdb_foreach_list (TDB, true);
 					ls_foreach (l, iter, kv) {
 						if (!strncmp (kv->key, tmp, tmp_len)) {
-							r_anal_type_del (core->anal, kv->key);
+							r_type_del (TDB, kv->key);
 						}
 					}
 					ls_free (l);
@@ -785,8 +1065,54 @@
 		break;
 	// tv - get/set type value linked to a given address
 	case 'f':
-		sdb_foreach (core->anal->sdb_types, stdprintiffunc, core);
+		switch (input[1]) {
+		case 0:
+			sdb_foreach (TDB, stdprintiffunc, core);
+			break;
+		case ' ':
+			r_core_cmdf (core, "tk~func.%s.", input + 2);
+			break;
+		default:
+			r_core_cmd_help (core, help_msg_tf);
+			break;
+		}
 		break;
+	case 't': {
+		if (!input[1]) {
+			char *name = NULL;
+			SdbKv *kv;
+			SdbListIter *iter;
+			SdbList *l = sdb_foreach_list (TDB, true);
+			ls_foreach (l, iter, kv) {
+				if (!strcmp (kv->value, "typedef")) {
+					if (!name || strcmp (kv->value, name)) {
+						free (name);
+						name = strdup (kv->key);
+						r_cons_println (name);
+					}
+				}
+			}
+			free (name);
+			ls_free (l);
+			break;
+		}
+		if (input[1] == '?') {
+			r_core_cmd_help (core, help_msg_tt);
+			break;
+		}
+		char *s = strdup (input + 2);
+		const char *istypedef;
+		istypedef = sdb_const_get (TDB, s, 0);
+		if (istypedef && !strncmp (istypedef, "typedef", 7)) {
+			const char *q = sdb_fmt ("typedef.%s", s);
+			const char *res = sdb_const_get (TDB, q, 0);
+			if (res)
+				r_cons_println (res);
+		} else {
+			eprintf ("This is not an typedef\n");
+		}
+		free (s);
+	} break;
 	case '?':
 		show_help (core);
 		break;
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_write.c radare2-2.8.0+dfsg/libr/core/cmd_write.c
--- radare2-2.3.0+dfsg/libr/core/cmd_write.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_write.c	2018-08-07 14:12:36.000000000 +0000
@@ -13,16 +13,16 @@
 	"w0"," [len]","write 'len' bytes with value 0x00",
 	"w6","[de] base64/hex","write base64 [d]ecoded or [e]ncoded string",
 	"wa","[?] push ebp","write opcode, separated by ';' (use '\"' around the command)",
-	"waf"," file","assemble file and write bytes",
+	"waf"," f.asm","assemble file and write bytes",
 	"wao","[?] op","modify opcode (change conditional of jump. nop, etc)",
 	"wA","[?] r 0","alter/modify opcode at current seek (see wA?)",
 	"wb"," 010203","fill current block with cyclic hexpairs",
 	"wB","[-]0xVALUE","set or unset bits with given value",
 	"wc","","list all write changes",
-	"wc","[?][ir*?]","write cache undo/commit/reset/list (io.cache)",
+	"wc","[?][jir+-*?]","write cache undo/commit/reset/list (io.cache)",
 	"wd"," [off] [n]","duplicate N bytes from offset at current seek (memcpy) (see y?)",
 	"we","[?] [nNsxX] [arg]","extend write operations (insert instead of replace)",
-	"wf"," -|file","write contents of file at current offset",
+	"wf","[fs] -|file","write contents of file at current offset",
 	"wh"," r2","whereis/which shell command",
 	"wm"," f0ff","set binary mask hexpair to be used as cyclic write mask",
 	"wo","[?] hex","write in block with operation. 'wo?' fmi",
@@ -43,7 +43,7 @@
 	"wa", " nop", "write nopcode using asm.arch and asm.bits",
 	"wa*", " mov eax, 33", "show 'wx' op with hexpair bytes of assembled opcode",
 	"\"wa nop;nop\"", "" , "assemble more than one instruction (note the quotes)",
-	"waf", "foo.asm" , "assemble file and write bytes",
+	"waf", " f.asm" , "assemble file and write bytes",
 	"wao?", "", "show help for assembler operation on current opcode (hack)",
 	NULL
 };
@@ -61,10 +61,11 @@
 };
 
 static const char *help_msg_wc[] = {
-	"Usage:", "wc[ir+-*?]","  # NOTE: Uses io.cache=true",
+	"Usage:", "wc[jir+-*?]","  # NOTE: Uses io.cache=true",
 	"wc","","list all write changes",
+	"wcj","","list all write changes in JSON",
 	"wc-"," [from] [to]","remove write op at curseek or given addr",
-	"wc+"," [addr]","commit change from cache to io",
+	"wc+"," [from] [to]","commit change from cache to io",
 	"wc*","","\"\" in radare commands",
 	"wcr","","reset all write changes in cache",
 	"wci","","commit write cache",
@@ -134,11 +135,21 @@
 	"wta", " [filename]", "append to 'filename'",
 	"wtf", " [filename] [size]", "write to file (see also 'wxf' and 'wf?')",
 	"wtf!", " [filename]", "write to file from current address to eof",
+	"wtff", " [prefix]", "write block from current seek to [prefix]-[offset]",
+	"wts"," host:port [sz]", "send data to remote host:port via tcp://",
+	NULL
+};
+
+static const char *help_msg_wf[] = {
+	"Usage:", "wf[fs] [-|args ..]", " Write from (file, swap, offset)",
+	"wf", " 10 20", "write 20 bytes from offset 10 into current seek",
+	"wff", " file [len]", "write contents of file into current offset",
+	"wfs", " 10 20", "swap 20 bytes betweet current offset and 10",
 	NULL
 };
 
 static const char *help_msg_wv[] = {
-	"Usage:", "wv[size] [value]", "write value of given size",
+	"Usage:", "wv[size] [value]", " Write value of given size",
 	"wv", " 0x834002", "write dword with this value",
 	"wv1", " 234", "write one byte with this value",
 	"Supported sizes are:", "1, 2, 4, 8", "",
@@ -167,6 +178,10 @@
 	DEFINE_CMD_DESCRIPTOR (core, wx);
 }
 
+static void cmd_write_fail() {
+	eprintf ("Failed to write\n");
+}
+
 R_API int cmd_write_hexpair(RCore* core, const char* pairs) {
 	ut8 *buf = malloc (strlen (pairs) + 1);
 	int len = r_hex_str2bin (pairs, buf);
@@ -177,7 +192,9 @@
 				buf[len-1] |= core->block[len-1] & 0xf;
 			}
 		}
-		r_core_write_at (core, core->offset, buf, len);
+		if (!r_core_write_at (core, core->offset, buf, len)) {
+			cmd_write_fail ();
+		}
 		if (r_config_get_i (core->config, "cfg.wseek")) {
 			r_core_seek_delta (core, len);
 		}
@@ -251,13 +268,15 @@
 static void cmd_write_bits(RCore *core, int set, ut64 val) {
 	ut64 ret, orig;
 	// used to set/unset bit in current address
-	r_core_read_at (core, core->offset, (ut8*)&orig, sizeof (orig));
+	r_io_read_at (core->io, core->offset, (ut8*)&orig, sizeof (orig));
 	if (set) {
 		ret = orig | val;
 	} else {
 		ret = orig & (~(val));
 	}
-	r_core_write_at (core, core->offset, (const ut8*)&ret, sizeof (ret));
+	if (!r_core_write_at (core, core->offset, (const ut8*)&ret, sizeof (ret))) {
+		cmd_write_fail ();
+	}
 }
 
 static void cmd_write_inc(RCore *core, int size, st64 num) {
@@ -278,6 +297,7 @@
 static void cmd_write_op (RCore *core, const char *input) {
 	ut8 *buf;
 	int len;
+	int value;
 	if (!input[0])
 		return;
 	switch (input[1]) {
@@ -333,7 +353,7 @@
 				}
 			}
 			algo = args;
-			if (algo && *algo) {
+			if (algo && *algo && key) {
 				encrypt_or_decrypt_block (core, algo, key, direction, iv);
 			} else {
 				eprintf ("Usage: wo%c [algo] [key] [IV]\n", ((!direction)?'E':'D'));
@@ -401,11 +421,13 @@
 			}
 			break;
 		case 'O': // "wopO"
-			len = (int)(input[3]==' ')
-				? r_num_math (core->num, input + 3)
-				: core->blocksize;
-			core->num->value = r_debruijn_offset (len, r_config_get_i (core->config, "cfg.bigendian"));
-			r_cons_printf ("%"PFMT64d"\n", core->num->value);
+			if (strlen (input) > 4 && strncmp (input + 4, "0x", 2)) {
+				eprintf ("Need hex value with `0x' prefix e.g. 0x41414142\n");
+			} else if (input[3] == ' ') {
+				value = r_num_get (core->num, input + 4);
+				core->num->value = r_debruijn_offset (value, r_config_get_i (core->config, "cfg.bigendian"));
+				r_cons_printf ("%"PFMT64d"\n", core->num->value);
+			}
 			break;
 		case '\0':
 		case '?':
@@ -456,37 +478,51 @@
 	switch (type) {
 	case 1:
 		r_write_ble8 (buf, (ut8)(off & UT8_MAX));
-		r_io_write (core->io, buf, 1);
-		WSEEK (core, 1);
+		if (!r_io_write (core->io, buf, 1)) {
+			cmd_write_fail ();
+		} else {
+			WSEEK (core, 1);
+		}
 		break;
 	case 2:
 		r_write_ble16 (buf, (ut16)(off & UT16_MAX), be);
-		r_io_write (core->io, buf, 2);
-		WSEEK (core, 2);
+		if (!r_io_write (core->io, buf, 2)) {
+			cmd_write_fail ();
+		} else {
+			WSEEK (core, 2);
+		}
 		break;
 	case 4:
 		r_write_ble32 (buf, (ut32)(off & UT32_MAX), be);
-		r_io_write (core->io, buf, 4);
-		WSEEK (core, 4);
+		if (!r_io_write (core->io, buf, 4)) {
+			cmd_write_fail ();
+		} else {
+			WSEEK (core, 4);
+		}
 		break;
 	case 8:
 		r_write_ble64 (buf, off, be);
-		r_io_write (core->io, buf, 8);
-		WSEEK (core, 8);
+		if (!r_io_write (core->io, buf, 8)) {
+			cmd_write_fail ();
+		} else {
+			WSEEK (core, 8);
+		}
 		break;
 	}
 	r_core_block_read (core);
 }
 
-static bool cmd_wf(RCore *core, const char *input) {
+static bool cmd_wff(RCore *core, const char *input) {
 	ut8 *buf;
 	int size;
+	// XXX: file names cannot contain spaces
 	const char *arg = input + ((input[1] == ' ') ? 2 : 1);
 	int wseek = r_config_get_i (core->config, "cfg.wseek");
 	char *p, *a = r_str_trim (strdup (arg));
-	// XXX: file names cannot contain spaces
 	p = strchr (a, ' ');
-	if (p) *p++ = 0;
+	if (p) {
+		*p++ = 0;
+	}
 
 	if (*arg =='?' || !*arg) {
 		eprintf ("Usage: wf [file] ([size] ([offset]))\n");
@@ -525,6 +561,87 @@
 	return true;
 }
 
+static bool ioMemcpy (RCore *core, ut64 dst, ut64 src, int len) {
+	bool ret = false;
+	if (len > 0) {
+		ut8 * buf = calloc (1, len);
+		if (buf) {
+			if (r_io_read_at (core->io, src, buf, len)) {
+				if (r_io_write_at (core->io, dst, buf, len)) {
+					r_core_block_read (core);
+					ret = true;
+				} else {
+					eprintf ("r_io_write_at failed at 0x%08"PFMT64x"\n", dst);
+				}
+			} else {
+				eprintf ("r_io_read_at failed at 0x%08"PFMT64x"\n", src);
+			}
+			free (buf);
+		}
+	}
+	return ret;
+}
+
+static bool cmd_wfs(RCore *core, const char *input) {
+	char * args = r_str_trim (strdup (input + 1));
+	char *arg = strchr (args, ' ');
+	int len = core->blocksize;
+	if (arg) {
+		*arg = 0;
+		len = r_num_math (core->num, arg + 1);
+	}
+	ut64 dst = core->offset;
+	ut64 src = r_num_math (core->num, args);
+	if (len > 0) {
+		// cache dest, memcpy, write cache
+		ut8 *buf = calloc (1, len);
+		if (buf) {
+			if (r_io_read_at (core->io, dst, buf, len)) {
+				ioMemcpy (core, core->offset, src, len);
+				if (r_io_write_at (core->io, src, buf, len)) {
+					r_core_block_read (core);
+				} else {
+					eprintf ("Failed to write at 0x%08"PFMT64x"\n", src);
+				}
+			} else {
+				eprintf ("cmd_wfs: failed to read at 0x%08"PFMT64x"\n", dst);
+			}
+			free (buf);
+		}
+	}
+	free (args);
+	return true;
+}
+
+static bool cmd_wf(RCore *core, const char *input) {
+	if (!core || !*input) {
+		return false;
+	}
+	if (input[1] == '?') {
+		eprintf ("Usage: wf [file] ([size] ([offset]))\n");
+		r_core_cmd_help (core, help_msg_wf);
+		return false;
+	}
+	if (input[1] == 's') { // "wfs"
+		return cmd_wfs (core, input + 1);
+	}
+	if (input[1] == 'f') { // "wff"
+		return cmd_wff (core, input + 1);
+	}
+	char *args = r_str_trim (strdup (input + 1));
+	char *arg = strchr (args, ' ');
+	int len = core->blocksize;
+	if (arg) {
+		*arg++ = 0;
+		len = r_num_math (core->num, arg);
+	}
+	ut64 addr = r_num_math (core->num, args);
+	ioMemcpy (core, core->offset, addr, len);
+	free (args);
+	r_core_block_read (core);
+	return true;
+}
+
 static void cmd_write_pcache(RCore *core, const char *input) {
 	RIODesc *desc;
 	RIOCache *c;
@@ -558,17 +675,17 @@
 					core->print->cb_printf ("e io.va = false\n");
 					r_list_foreach (caches, iter, c) {
 						core->print->cb_printf ("wx %02x", c->data[0]);
-						const int cacheSize = R_ITV_SIZE (c);
+						const int cacheSize = r_itv_size (c->itv);
 						for (i = 1; i < cacheSize; i++) {
 							core->print->cb_printf ("%02x", c->data[i]);
 						}
-						core->print->cb_printf (" @ 0x%08"PFMT64x" \n", R_ITV_BEGIN (c));
+						core->print->cb_printf (" @ 0x%08"PFMT64x" \n", r_itv_begin (c->itv));
 					}
 				} else {
 					r_list_foreach (caches, iter, c) {
 						core->print->cb_printf ("0x%08"PFMT64x": %02x",
-							R_ITV_BEGIN (c), c->odata[0]);
-						const int cacheSize = R_ITV_SIZE (c);
+							r_itv_begin (c->itv), c->odata[0]);
+						const int cacheSize = r_itv_size (c->itv);
 						for (i = 1; i < cacheSize; i++) {
 							core->print->cb_printf ("%02x", c->odata[i]);
 						}
@@ -678,7 +795,7 @@
 					eprintf ("Error: failed to malloc memory");
 					break;
 				}
-				len = r_base64_decode (buf, str, 0);
+				len = r_base64_decode (buf, str, -1);
 				if (len < 0) {
 					free (buf);
 					fail = 1;
@@ -732,8 +849,7 @@
 		}
 		}
 		break;
-	case 'e': // "we"
-		{
+	case 'e': { // "we"
 		ut64 addr = 0, len = 0, b_size = 0;
 		st64 dist = 0;
 		ut8* bytes = NULL;
@@ -788,28 +904,7 @@
 				free (bytes);
 			}
 			break;
-		case 'X':
-			if (input[2] == ' ') {
-				addr = r_num_math (core->num, input+3);
-				input += 3;
-				while (*input && *input != ' ') input++;
-				input++;
-				len = *input ? strlen (input) : 0;
-				bytes = len > 1? malloc (len+1) : NULL;
-				len = bytes ? r_hex_str2bin (input, bytes) : 0;
-				if (len > 0) {
-					//ut64 cur_off = core->offset;
-					cmd_suc = r_core_extend_at (core, addr, len);
-					if (cmd_suc) {
-						r_core_write_at (core, addr, bytes, len);
-					}
-					core->offset = addr;
-					r_core_block_read (core);
-				}
-				free (bytes);
-			}
-			break;
-		case 's':
+		case 's': // "wes"
 			input +=  3;
 			while (*input && *input == ' ') input++;
 			len = strlen (input);
@@ -836,7 +931,28 @@
 			}
 			free (input_shadow);
 			break;
-		case '?':
+		case 'X': // "weX"
+			if (input[2] == ' ') {
+				addr = r_num_math (core->num, input+3);
+				input += 3;
+				while (*input && *input != ' ') input++;
+				input++;
+				len = *input ? strlen (input) : 0;
+				bytes = len > 1? malloc (len+1) : NULL;
+				len = bytes ? r_hex_str2bin (input, bytes) : 0;
+				if (len > 0) {
+					//ut64 cur_off = core->offset;
+					cmd_suc = r_core_extend_at (core, addr, len);
+					if (cmd_suc) {
+						r_core_write_at (core, addr, bytes, len);
+					}
+					core->offset = addr;
+					r_core_block_read (core);
+				}
+				free (bytes);
+			}
+			break;
+		case '?': // "we?"
 		default:
 			cmd_suc = false;
 			break;
@@ -846,7 +962,7 @@
 		}
 		}
 		break;
-	case 'p':
+	case 'p': // "wp"
 		if (input[1]=='-' || (input[1]==' ' && input[2]=='-')) {
 			char *out = r_core_editor (core, NULL, NULL);
 			if (out) {
@@ -865,7 +981,7 @@
 			}
 		}
 		break;
-	case 'u':
+	case 'u': // "wu"
 		// TODO: implement it in an API RCore.write_unified_hexpatch() is ETOOLONG
 		if (input[1]==' ') {
 			char *data = r_file_slurp (input+2, NULL);
@@ -919,7 +1035,7 @@
 			eprintf ("|Usage: wu [unified-diff-patch]    # see 'cu'\n");
 		}
 		break;
-	case 'r': //wr
+	case 'r': // "wr"
 		off = r_num_math (core->num, input+1);
 		len = (int)off;
 		if (len > 0) {
@@ -934,7 +1050,7 @@
 			} else eprintf ("Cannot allocate %d byte(s)\n", len);
 		}
 		break;
-	case 'A':
+	case 'A': // "wA"
 		switch (input[1]) {
 		case ' ':
 			if (input[2] && input[3]==' ') {
@@ -955,25 +1071,24 @@
 			break;
 		}
 		break;
-	case 'c':
+	case 'c': // "wc"
 		switch (input[1]) {
-		case 'i':
-			r_io_cache_commit (core->io, 0, UT64_MAX);
-			r_core_block_read (core);
+		case '\0': // "wc"
+			//if (!r_config_get_i (core->config, "io.cache"))
+			//	eprintf ("[warning] e io.cache must be true\n");
+			r_io_cache_list (core->io, 0);
 			break;
-		case 'r':
-			r_io_cache_reset (core->io, true);
-			/* Before loading the core block we have to make sure that if
-			 * the cache wrote past the original EOF these changes are no
-			 * longer displayed. */
-			memset (core->block, 0xff, core->blocksize);
-			r_core_block_read (core);
+		case '?': // "wc?"
+			r_core_cmd_help (core, help_msg_wc);
 			break;
-		case '+':
-			if (input[2]=='*') {
+		case '*': // "wc*"
+			r_io_cache_list (core->io, 1);
+			break;
+		case '+': // "wc+"
+			if (input[2]=='*') { // "wc+*"
 				//r_io_cache_reset (core->io, true);
 				eprintf ("TODO\n");
-			} else if (input[2]==' ') {
+			} else if (input[2]==' ') { // "wc+ "
 				char *p = strchr (input+3, ' ');
 				ut64 to, from;
 				from = r_num_math (core->num, input+3);
@@ -993,10 +1108,10 @@
 				r_io_cache_commit (core->io, core->offset, core->offset+1);
 			}
 			break;
-		case '-':
-			if (input[2]=='*') {
+		case '-': // "wc-"
+			if (input[2]=='*') { // "wc-*"
 				r_io_cache_reset (core->io, true);
-			} else if (input[2]==' ') {
+			} else if (input[2]==' ') { // "wc- "
 				char *p = strchr (input+3, ' ');
 				ut64 to, from;
 				if (p) {
@@ -1020,22 +1135,23 @@
 			memset (core->block, 0xff, core->blocksize);
 			r_core_block_read (core);
 			break;
-		case 'p':
-			cmd_write_pcache (core, &input[2]);
-			break;
-		case '?':
-			r_core_cmd_help (core, help_msg_wc);
-			break;
-		case '*':
-			r_io_cache_list (core->io, 1);
+		case 'i': // "wci"
+			r_io_cache_commit (core->io, 0, UT64_MAX);
+			r_core_block_read (core);
 			break;
-		case 'j':
+		case 'j': // "wcj"
 			r_io_cache_list (core->io, 2);
 			break;
-		case '\0':
-			//if (!r_config_get_i (core->config, "io.cache"))
-			//	eprintf ("[warning] e io.cache must be true\n");
-			r_io_cache_list (core->io, 0);
+		case 'p': // "wcp"
+			cmd_write_pcache (core, &input[2]);
+			break;
+		case 'r': // "wcr"
+			r_io_cache_reset (core->io, true);
+			/* Before loading the core block we have to make sure that if
+			 * the cache wrote past the original EOF these changes are no
+			 * longer displayed. */
+			memset (core->block, 0xff, core->blocksize);
+			r_core_block_read (core);
 			break;
 		}
 		break;
@@ -1132,10 +1248,18 @@
 					poff =  s ? poff - s->vaddr + s->paddr : poff;
 					str++;
 				}
-				if (*str) {
-					filename = str + ((*str == ' ')? 1: 0);
+				if (*str == 'f') {
+					const char *prefix = r_str_trim_ro (str + 1);
+					if (!*prefix) {
+						prefix = "dump";
+					}
+					filename = r_str_newf ("%s-0x%08"PFMT64x, prefix, core->offset);
 				} else {
-					filename = "";
+					if (*str) {
+						filename = str + ((*str == ' ')? 1: 0);
+					} else {
+						filename = "";
+					}
 				}
 			} else if (*str == 'a') { // "wta"
 				append = 1;
@@ -1197,10 +1321,10 @@
 			}
 		}
 		break;
-	case 'f':
+	case 'f': // "wf"
 		cmd_wf (core, input);
 		break;
-	case 'w':
+	case 'w': // "ww"
 		str++;
 		len = (len - 1) << 1;
 		tmp = (len > 0) ? malloc (len + 1) : NULL;
@@ -1221,6 +1345,9 @@
 		break;
 	case 'x': // "wx"
 		switch (input[1]) {
+		case ' ': // "wx "
+			cmd_write_hexpair (core, input + 1);
+			break;
 		case 'f': // "wxf"
 			arg = (const char *)(input + ((input[2]==' ')? 3: 2));
 			if (!strcmp (arg, "-")) {
@@ -1268,9 +1395,6 @@
 				}
 			}
 			break;
-		case ' ': // "wx ..."
-			cmd_write_hexpair (core, input + 1);
-			break;
 		default:
 			r_core_cmd_help (core, help_msg_wx);
 			break;
@@ -1280,14 +1404,16 @@
 		switch (input[1]) {
 		case 'o': // "wao"
 			if (input[2] == ' ') {
-				r_core_hack (core, input + 3);
+				char *op = r_str_trim (strdup (input + 3));
+				r_core_hack (core, op);
+				free (op);
 			} else {
 				r_core_hack_help (core);
 			}
 			break;
 		case ' ':
-		case '*':
-			{ const char *file = input[1]=='*'? input+2: input+1;
+		case '*': {
+			const char *file = input[1]=='*'? input+2: input+1;
 			RAsmCode *acode;
 			r_asm_set_pc (core->assembler, core->offset);
 			acode = r_asm_massemble (core->assembler, file);
@@ -1295,15 +1421,20 @@
 				if (input[1]=='*') {
 					cmd_write_hexpair(core, acode->buf_hex);
 				} else {
-					if (r_config_get_i (core->config, "scr.prompt"))
-						eprintf ("Written %d byte(s) (%s) = wx %s\n", acode->len, input+2, acode->buf_hex);
-					r_core_write_at (core, core->offset, acode->buf, acode->len);
-					WSEEK (core, acode->len);
+					if (!r_core_write_at (core, core->offset, acode->buf, acode->len)) {
+						cmd_write_fail ();
+					} else {
+						if (r_config_get_i (core->config, "scr.prompt")) {
+							eprintf ("Written %d byte(s) (%s) = wx %s\n", acode->len, input+2, acode->buf_hex);
+						}
+						WSEEK (core, acode->len);
+					}
 					r_core_block_read (core);
 				}
 				r_asm_code_free (acode);
 			}
-			} break;
+			break;
+		}
 		case 'f': // "waf"
 			if ((input[2]==' '||input[2]=='*')) {
 				const char *file = input[2]=='*'? input+4: input+3;
@@ -1314,10 +1445,14 @@
 					if (input[2]=='*') {
 						cmd_write_hexpair(core, acode->buf_hex);
 					} else {
-						if (r_config_get_i (core->config, "scr.prompt"))
-						eprintf ("Written %d byte(s) (%s)=wx %s\n", acode->len, input+1, acode->buf_hex);
-						r_core_write_at (core, core->offset, acode->buf, acode->len);
-						WSEEK (core, acode->len);
+						if (r_config_get_i (core->config, "scr.prompt")) {
+							eprintf ("Written %d byte(s) (%s)=wx %s\n", acode->len, input+1, acode->buf_hex);
+						}
+						if (!r_core_write_at (core, core->offset, acode->buf, acode->len)) {
+							cmd_write_fail ();
+						} else {
+							WSEEK (core, acode->len);
+						}
 						r_core_block_read (core);
 					}
 					r_asm_code_free (acode);
@@ -1329,23 +1464,25 @@
 			break;
 		}
 		break;
-	case 'b': // "wb"
-		{
+	case 'b': { // "wb"
 		int len = strlen (input);
 		ut8 *buf = malloc (len+1);
 		if (buf) {
 			len = r_hex_str2bin (input+1, buf);
 			if (len > 0) {
 				r_mem_copyloop (core->block, buf, core->blocksize, len);
-				r_core_write_at (core, core->offset, core->block, core->blocksize);
-				WSEEK (core, core->blocksize);
+				if (!r_core_write_at (core, core->offset, core->block, core->blocksize)) {
+					cmd_write_fail ();
+				} else {
+					WSEEK (core, core->blocksize);
+				}
 				r_core_block_read (core);
 			} else eprintf ("Wrong argument\n");
 			free (buf);
 		} else eprintf ("Cannot malloc %d\n", len+1);
-		}
 		break;
-	case 'm':
+	}
+	case 'm': // "wm"
 		size = r_hex_str2bin (input+1, (ut8*)str);
 		switch (input[1]) {
 		case '\0':
@@ -1371,13 +1508,13 @@
 			break;
 		}
 		break;
-	case 'v':
+	case 'v': // "wv"
 		cmd_write_value (core, input);
 		break;
-	case 'o':
+	case 'o': // "wo"
 		cmd_write_op (core, input);
 		break;
-	case 'd':
+	case 'd': // "wd"
 		if (input[1] && input[1]==' ') {
 			char *arg, *inp = strdup (input+2);
 			arg = strchr (inp, ' ');
@@ -1393,22 +1530,25 @@
 			free (inp);
 		} else eprintf ("Usage: wd [source-offset] [length] @ [dest-offset]\n");
 		break;
-	case 's':
+	case 's': // "ws"
 		if (str && *str && str[1]) {
 			len = r_str_unescape (str+1);
 			if (len>255) {
 				eprintf ("Too large\n");
 			} else {
 				ut8 ulen = (ut8)len;
-				r_core_write_at (core, core->offset, &ulen, 1);
-				r_core_write_at (core, core->offset+1, (const ut8*)str+1, len);
-				WSEEK (core, len);
+				if (!r_core_write_at (core, core->offset, &ulen, 1) ||
+						!r_core_write_at (core, core->offset+1, (const ut8*)str+1, len)) {
+					cmd_write_fail ();
+				} else {
+					WSEEK (core, len);
+				}
 				r_core_block_read (core);
 			}
 		} else eprintf ("Too short.\n");
 		break;
 	default:
-	case '?':
+	case '?': // "w?"
 		if (core->oobi) {
 			eprintf ("Writing oobi buffer!\n");
 			r_io_use_fd (core->io, core->file->fd);
diff -Nru radare2-2.3.0+dfsg/libr/core/cmd_zign.c radare2-2.8.0+dfsg/libr/core/cmd_zign.c
--- radare2-2.3.0+dfsg/libr/core/cmd_zign.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cmd_zign.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake, nibble */
+/* radare - LGPL - Copyright 2009-2018 - pancake, nibble */
 
 #include <r_core.h>
 #include <r_anal.h>
@@ -45,6 +45,7 @@
 	"Usage:", "zf[dsz] filename ", "# Manage FLIRT signatures",
 	"zfd ", "filename", "open FLIRT file and dump",
 	"zfs ", "filename", "open FLIRT file and scan",
+	"zfs ", "/path/**.sig", "recursively search for FLIRT files and scan them (see dir.depth)",
 	"zfz ", "filename", "open FLIRT file and get sig commands (zfz flirt_file > zignatures.sig)",
 	NULL
 };
@@ -507,7 +508,14 @@
 			eprintf ("usage: zfs filename\n");
 			return false;
 		}
-		r_sign_flirt_scan (core->anal, input + 2);
+		int depth = r_config_get_i (core->config, "dir.depth");
+		char *file;
+		RListIter *iter;
+		RList *files = r_file_globsearch (input + 2, depth);
+		r_list_foreach (files, iter, file) {
+			r_sign_flirt_scan (core->anal, file);
+		}
+		r_list_free (files);
 		break;
 	case 'z':
 		// TODO
diff -Nru radare2-2.3.0+dfsg/libr/core/core.c radare2-2.8.0+dfsg/libr/core/core.c
--- radare2-2.3.0+dfsg/libr/core/core.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/core.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2009-2017 - pancake */
+/* radare2 - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_core.h>
 #include <r_socket.h>
@@ -24,6 +24,7 @@
 static bool tmp_argv_heap = false;
 
 extern int r_is_heap (void *p);
+extern bool r_core_is_project (RCore *core, const char *name);
 
 static void r_line_free_autocomplete(RLine *line) {
 	int i;
@@ -248,6 +249,10 @@
 	return r_config_get (core->config, k);
 }
 
+static ut64 numget(RCore *core, const char *k) {
+	return r_num_math (core->num, k);
+}
+
 R_API int r_core_bind(RCore *core, RCoreBind *bnd) {
 	bnd->core = core;
 	bnd->bphit = (RCoreDebugBpHit)r_core_debug_breakpoint_hit;
@@ -262,6 +267,7 @@
 	bnd->archbits = (RCoreSeekArchBits)archbits;
 	bnd->cfggeti = (RCoreConfigGetI)cfggeti;
 	bnd->cfgGet = (RCoreConfigGet)cfgget;
+	bnd->numGet = (RCoreNumGet)numget;
 	return true;
 }
 
@@ -278,7 +284,7 @@
 	RIOSection *sec;
 	ut64 vaddr;
 
-	if (!r_config_get_i (core->config, "asm.cmtpatch")) {
+	if (!r_config_get_i (core->config, "asm.cmt.patch")) {
 		return;
 	}
 
@@ -411,7 +417,7 @@
 static ut64 num_callback(RNum *userptr, const char *str, int *ok) {
 	RCore *core = (RCore *)userptr; // XXX ?
 	RAnalFunction *fcn;
-	char *ptr, *bptr, *out;
+	char *ptr, *bptr, *out = NULL;
 	RFlagItem *flag;
 	RIOSection *s;
 	RAnalOp op;
@@ -496,7 +502,7 @@
 			*ok = 1;
 		}
 		// TODO: group analop-dependant vars after a char, so i can filter
-		r_anal_op (core->anal, &op, core->offset, core->block, core->blocksize);
+		r_anal_op (core->anal, &op, core->offset, core->block, core->blocksize, R_ANAL_OP_MASK_BASIC);
 		r_anal_op_fini (&op); // we dont need strings or pointers, just values, which are not nullified in fini
 		switch (str[1]) {
 		case '.': // can use pc, sp, a0, a1, ...
@@ -539,11 +545,27 @@
 			free (bptr);
 			break;
 		case 'c': return r_cons_get_size (NULL);
-		case 'r': {
-			int rows;
-			(void)r_cons_get_size (&rows);
-			return rows;
+		case 'r': 
+			if (str[2] == '{') {
+				bptr = strdup (str + 3);
+				ptr = strchr (bptr, '}');
+				if (!ptr) {
+					break;
+				}
+				*ptr = 0;
+				if (r_debug_reg_sync (core->dbg, R_REG_TYPE_GPR, false)) {
+					RRegItem *r = r_reg_get (core->dbg->reg, bptr, -1);
+					if (r) {
+						return r_reg_get_value (core->dbg->reg, r);
+					}
+				}
+				return 0; // UT64_MAX;
+			} else {
+				int rows;
+				(void)r_cons_get_size (&rows);
+				return rows;
 			}
+			break;
 		case 'e': return r_anal_op_is_eob (&op);
 		case 'j': return op.jump;
 		case 'p': return r_sys_getpid ();
@@ -582,7 +604,22 @@
 		case 'l': return op.size;
 		case 'b': return core->blocksize;
 		case 's':
-			if (core->file) {
+			// flag size $s{}
+			if (str[2] == '{') {
+				bptr = strdup (str + 3);
+				ptr = strchr (bptr, '}');
+				if (!ptr) {
+					// invalid json
+					free (bptr);
+					break;
+				}
+				*ptr = '\0';
+				RFlagItem *flag = r_flag_get (core->flags, bptr);
+				ret = flag? flag->size: 0LL; // flag 
+				free (bptr);
+				free (out);
+				return ret;
+			} else if (core->file) {
 				return r_io_fd_size (core->io, core->file->fd);
 			}
 			return 0LL;
@@ -607,7 +644,7 @@
 			}
 			return 0LL; // maybe // return UT64_MAX;
 		case '?': return core->num->value;
-		case '$': return core->offset;
+		case '$': return str[2] == '$' ? core->prompt_offset : core->offset;
 		case 'o':
 			{
 				RIOSection *s;
@@ -638,7 +675,7 @@
 		}
 		break;
 	default:
-		if (*str > 'A') {
+		if (*str >= 'A') {
 			// NOTE: functions override flags
 			RAnalFunction *fcn = r_anal_fcn_find_name (core->anal, str);
 			if (fcn) {
@@ -695,36 +732,40 @@
 }
 
 /*-----------------------------------*/
-#define CMDS (sizeof (radare_argv)/sizeof(const char*))
+#define radare_argc (sizeof (radare_argv)/sizeof(const char*))
 static const char *radare_argv[] = {
 	"?", "?v", "whereis", "which", "ls", "rm", "mkdir", "pwd", "cat", "less",
-	"dH", "ds", "dso", "dsl", "dc", "dd", "dm", "db ", "db-",
-        "dp", "dr", "dcu", "dmd", "dmp", "dml",
+	"dH", "ds", "dso", "dsl", "dc", "dd", "dm",
+	"db ", "db-", "dbd", "dbe", "dbs", "dbte", "dbtd", "dbts",
+	"dp", "dr", "dcu", "dmd", "dmp", "dml",
 	"ec","ecs", "eco",
 	"S", "S.", "S*", "S-", "S=", "Sa", "Sa-", "Sd", "Sl", "SSj", "Sr",
 	"s", "s+", "s++", "s-", "s--", "s*", "sa", "sb", "sr",
-	"!", "!!",
+	"!", "!!", "!!!", "!!!-",
 	"#sha1", "#crc32", "#pcprint", "#sha256", "#sha512", "#md4", "#md5",
 	"#!python", "#!perl", "#!vala",
 	"V", "v",
 	"aa", "ab", "af", "ar", "ag", "at", "a?", "ax", "ad",
-	"ae", "aec", "aex", "aep", "aea", "aeA", "aes", "aeso", "aesu", "aesue", "aer", "aei", "aeim", "aef",
+	"ae", "aec", "aex", "aep", "aepc", "aea", "aeA", "aes", "aeso", "aesu", "aesue", "aer", "aei", "aeim", "aef",
 	"aaa", "aac","aae", "aai", "aar", "aan", "aas", "aat", "aap", "aav",
 	"af", "afa", "afan", "afc", "afC", "afi", "afb", "afbb", "afn", "afr", "afs", "af*", "afv", "afvn",
 	"aga", "agc", "agd", "agl", "agfl",
 	"e", "et", "e-", "e*", "e!", "e?", "env ",
 	"i", "ii", "iI", "is", "iS", "iz",
-	"q", "q!",
+	"q", "q!", "q!!", "q!!!",
 	"f", "fl", "fr", "f-", "f*", "fs", "fS", "fr", "fo", "f?",
 	"m", "m*", "ml", "m-", "my", "mg", "md", "mp", "m?",
-	"o", "o+", "oc", "on", "op", "o-", "x", "wf", "wF", "wta", "wtf", "wp",
+	"o", "o+", "oc", "on", "op", "o-", "x", "wf", "wF", "wt", "wta", "wtf", "wp", "obf",
+	"L", "La", "Li", "Lo", "Lc", "Lh", "Ld", "L-",
 	"t", "to", "t-", "tf", "td", "td-", "tb", "tn", "te", "tl", "tk", "ts", "tu",
 	"(", "(*", "(-", "()", ".", ".!", ".(", "./",
 	"r", "r+", "r-",
 	"b", "bf", "b?",
 	"/", "//", "/a", "/c", "/h", "/m", "/x", "/v", "/v2", "/v4", "/v8", "/r", "/re",
 	"y", "yy", "y?",
-	"wx", "ww", "w?", "wxf",
+	"wa", "waf", "wao", 
+	"wv", "wv1", "wv2",  "wv4", "wv8",
+	"wx", "wxf", "ww", "w?",
 	"p6d", "p6e", "p8", "pb", "pc",
 	"pd", "pda", "pdb", "pdc", "pdj", "pdr", "pdf", "pdi", "pdl", "pds", "pdt",
 	"pD", "px", "pX", "po", "pf", "pf.", "pf*", "pf*.", "pfd", "pfd.", "pv", "p=", "p-",
@@ -741,7 +782,9 @@
 	NULL
 };
 
-static int autocompleteProcessPath(RLine *line, const char *path, int argv_idx) {
+
+
+static int autocomplete_process_path(RLine* line, const char* str, const char *path, int argv_idx) {
 	char *lpath = NULL, *dirname = NULL , *basename = NULL;
 	char *home = NULL, *filename = NULL, *p = NULL;
 	int n = 0, i = argv_idx;
@@ -783,7 +826,7 @@
 
 	list= r_sys_dir (dirname);
 	n = strlen (basename);
-	bool chgdir = !strncmp (line->buffer.data, "cd ", 3);
+	bool chgdir = !strncmp (str, "cd ", 3);
 	if (list) {
 		r_list_foreach (list, iter, filename) {
 			if (*filename == '.') {
@@ -825,8 +868,12 @@
 static void autocompleteFilename(RLine *line, char **extra_paths, int narg) {
 	char *args = NULL, *input = NULL;
 	int n = 0, i = 0;
-
-	args = r_str_new (line->buffer.data);
+	char *pipe = strchr (line->buffer.data, '>');
+	if (pipe) {
+		args = r_str_new (pipe + 1);
+	} else {
+		args = r_str_new (line->buffer.data);
+	}
 	if (!args) {
 		goto out;
 	}
@@ -842,7 +889,7 @@
 	}
 	const char *tinput = r_str_trim_ro (input);
 
-	int argv_idx = autocompleteProcessPath (line, tinput, 0);
+	int argv_idx = autocomplete_process_path (line, line->buffer.data, tinput, 0);
 
 	if (input[0] == '/' || input[0] == '.' || !extra_paths) {
 		goto out;
@@ -853,7 +900,7 @@
 		if (!buf) {
 			break;
 		}
-		argv_idx += autocompleteProcessPath (line, buf, argv_idx);
+		argv_idx += autocomplete_process_path (line, line->buffer.data, buf, argv_idx);
 		free (buf);
 	}
 
@@ -862,18 +909,421 @@
 	free (input);
 }
 
+//TODO: make it recursive to handle nested struct
+static int autocomplete_pfele (RCore *core, char *key, char *pfx, int idx, char *ptr) {
+	int i, ret = 0;
+	int len = strlen (ptr);
+	char* fmt = sdb_get (core->print->formats, key, NULL);
+	if (fmt) {
+		int nargs = r_str_word_set0_stack (fmt);
+		if (nargs > 1) {
+			for (i = 1; i < nargs; i++) {
+				const char *arg = r_str_word_get0 (fmt, i);
+				char *p = strchr (arg, '(');
+				char *p2 = strchr (arg, ')');
+				// remove '(' and ')' from fmt
+				if (p && p2) {
+					arg = p + 1;
+					*p2 = '\0';
+				}
+				if (!len || !strncmp (ptr, arg, len)) {
+					tmp_argv[ret++] = r_str_newf ("pf%s.%s.%s", pfx, key, arg);
+				}
+			}
+		}
+	}
+	free (fmt);
+	return ret;
+}
+
 #define ADDARG(x) if (!strncmp (line->buffer.data+chr, x, strlen (line->buffer.data+chr))) { tmp_argv[j++] = x; }
 
+static void autocomplete_default(RLine *line) {
+	RCore *core = line->user;
+	if (!core) {
+		return;
+	}
+	RCoreAutocomplete *a = core->autocomplete;
+	int i, j;
+	j = 0;
+	if (a) {
+		for (i = 0; j < (TMP_ARGV_SZ - 1) && i < a->n_subcmds; i++) {
+			if (line->buffer.data[0] == 0 || !strncmp (a->subcmds[i]->cmd, line->buffer.data, a->subcmds[i]->length)) {
+				tmp_argv[j++] = a->subcmds[i]->cmd;
+			}
+		}
+	} else {
+		for (i = 0; j < (TMP_ARGV_SZ - 1) && i < radare_argc && radare_argv[i]; i++) {
+			int length = strlen (radare_argv[i]);
+			if (!strncmp (radare_argv[i], line->buffer.data, length)) {
+				tmp_argv[j++] = radare_argv[i];
+			}
+		}
+	}
+	tmp_argv[j] = NULL;
+	line->completion.argc = j;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_evals(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	int i = 0, n = strlen (str);
+	RConfigNode *bt;
+	RListIter *iter;
+	r_list_foreach (core->config->nodes, iter, bt) {
+		if (!strncmp (bt->name, str, n)) {
+			tmp_argv[i++] = bt->name;
+			if (i == TMP_ARGV_SZ - 1) {
+				break;
+			}
+		}
+	}
+	tmp_argv[R_MIN(i, TMP_ARGV_SZ - 1)] = NULL;
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_project(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	char *foo, *projects_path = r_file_abspath (r_config_get (core->config, "dir.projects"));
+	RList *list = r_sys_dir (projects_path);
+	RListIter *iter;
+	int n = strlen (str);
+	int i = 0;
+	if (projects_path) {
+		r_list_foreach (list, iter, foo) {
+			if (r_core_is_project (core, foo)) {
+				if (!strncmp (foo, str, n)) {
+					tmp_argv[i++] = r_str_newf ("%s", foo);
+					if (i == TMP_ARGV_SZ - 1) {
+						break;
+					}
+				}
+			}
+		}
+		free (projects_path);
+		r_list_free (list);
+	}
+	tmp_argv[R_MIN(i, TMP_ARGV_SZ - 1)] = NULL;
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_minus(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	int count;
+	int length = strlen (str);
+	char **keys = r_cmd_alias_keys(core->rcmd, &count);
+	if (keys) {
+		int i, j;
+		for (i=j=0; i<count; i++) {
+			if (!strncmp (keys[i], str, length)) {
+				tmp_argv[j++] = keys[i];
+			}
+		}
+		tmp_argv[j] = NULL;
+		line->completion.argc = j;
+		line->completion.argv = tmp_argv;
+	} else {
+		line->completion.argc = 0;
+		line->completion.argv = NULL;
+	}
+}
+
+static void autocomplete_breakpoints(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	RListIter *iter;
+	RBreakpoint *bp = core->dbg->bp;
+	RBreakpointItem *b;
+	int n, i = 0;
+	n = strlen (str);
+	r_list_foreach (bp->bps, iter, b) {
+		char *addr = r_str_newf ("0x%"PFMT64x"", b->addr);
+		if (!strncmp (addr, str, n)) {
+			tmp_argv[i++] = addr;
+		} else {
+			free (addr);
+		}
+	}
+	tmp_argv[i] = NULL;
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_flags(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	RListIter *iter;
+	RFlagItem *flag;
+	int n, i = 0;
+	n = strlen (str);
+	r_list_foreach (core->flags->flags, iter, flag) {
+		if (!strncmp (flag->name, str, n)) {
+			tmp_argv[i++] = flag->name;
+			if (i == (TMP_ARGV_SZ - 1)) {
+				break;
+			}
+		}
+	}
+	tmp_argv[i] = NULL;
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_zignatures(RLine* line, const char* msg) {
+	RCore *core = line->user;
+	if (!core || !msg) {
+		return;
+	}
+	int length = strlen (msg);
+	RSpaces zs = core->anal->zign_spaces;
+	int j, i = 0;
+	for (j = 0; j < R_SPACES_MAX; j++) {
+		if (zs.spaces[j]) {
+			if (i == TMP_ARGV_SZ - 1) {
+				break;
+			}
+			if (!strncmp (msg, zs.spaces[j], length)) {
+				if (i + 1 < TMP_ARGV_SZ) {
+					tmp_argv[i++] = zs.spaces[j];
+				}
+			}
+		}
+	}
+	if (strlen (msg) == 0 && i + 1 < TMP_ARGV_SZ) {
+		tmp_argv[i++] = "*";
+	}
+	tmp_argv[i] = NULL;
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_flagspaces(RLine* line, const char* msg) {
+	RCore *core = line->user;
+	if (!core || !msg) {
+		return;
+	}
+	int length = strlen (msg);
+	RFlag *flag = core->flags;
+	int j, i = 0;
+	for (j = 0; j < R_FLAG_SPACES_MAX - 1; j++) {
+		if (flag->spaces[j] && flag->spaces[j][0]) {
+			if (i == TMP_ARGV_SZ - 1) {
+				break;
+			}
+			if (!strncmp (msg, flag->spaces[j], length)) {
+				if (i + 1 < TMP_ARGV_SZ) {
+					tmp_argv[i++] = flag->spaces[j];
+				}
+			}
+		}
+	}
+	if (flag->spaces[j] && !strncmp (msg, flag->spaces[j], strlen (msg))) {
+		if (i + 1 < TMP_ARGV_SZ) {
+			tmp_argv[i++] = "*";
+		}
+	}
+	tmp_argv[i] = NULL;
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_macro(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	RCmdMacroItem *item;
+	RListIter *iter;
+	char buf[1024];
+	int n, i = 0;
+	n = strlen(str);
+	r_list_foreach (core->rcmd->macro.macros, iter, item) {
+		char *p = item->name;
+		if (!*str || !strncmp (str, p, n)) {
+			snprintf (buf, sizeof (buf), "%s%s)", str, p);
+			// eprintf ("------ %p (%s) = %s\n", tmp_argv[i], buf, p);
+			if (r_is_heap ((void*)tmp_argv[i])) {
+				free ((char *)tmp_argv[i]);
+			}
+			tmp_argv[i] = strdup (buf); // LEAKS
+			i++;
+			if (i == TMP_ARGV_SZ - 1) {
+				break;
+			}
+		}
+	}
+	//tmp_argv[(i-1>0)?i-1:0] = NULL;
+	tmp_argv[i] = NULL;
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static void autocomplete_file(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	char *pipe = strchr (str, '>');
+
+	if (pipe) {
+		str = r_str_trim_ro (pipe + 1);
+	}
+	if (str && !*str) {
+		autocomplete_process_path (line, str, "./", 0);
+	} else {
+		autocomplete_process_path (line, str, str, 0);
+	}
+
+}
+
+static void autocomplete_theme(RLine* line, const char* str) {
+	RCore *core = line->user;
+	if (!core || !str) {
+		return;
+	}
+	int i = 0;
+	int len = strlen (str);
+	char *theme;
+	RListIter *iter;
+	RList *themes = r_core_list_themes (core);
+	r_list_foreach (themes, iter, theme) {
+		if (!len || !strncmp (str, theme, len)) {
+			tmp_argv[i++] = strdup (theme);
+		}
+	}
+	tmp_argv[i] = NULL;
+	r_list_free (themes);
+	line->completion.argc = i;
+	line->completion.argv = tmp_argv;
+}
+
+static bool find_autocomplete(RLine *line) {
+	RCore *core = line->user;
+	if (!core) {
+		return false;
+	}
+	RCoreAutocomplete* child = NULL;
+	RCoreAutocomplete* parent = core->autocomplete;
+	const char* p = line->buffer.data;
+	if (!p || !*p) {
+		return false;
+	}
+	char arg[256];
+	arg[0] = 0;
+	while (*p) {
+		const char* e = r_str_trim_wp (p);
+		if (!e || (e - p) >= 256 || e == p) {
+			return false;
+		}
+		memcpy (arg, p, e - p);
+		arg[e - p] = 0;
+		child = r_core_autocomplete_find (parent, arg, false);
+		if (child && child->length < line->buffer.length && p[child->length] == ' ') {
+			// if is spaced then i can provide the
+			// next subtree as suggestion..
+			p = r_str_trim_ro (p + child->length);
+			if (child->type == R_CORE_AUTOCMPLT_OPTN) {
+				continue;
+			}
+			parent = child;
+		} else {
+			break;
+		}
+	}
+	int i;
+	/* if something went wrong this will prevent bad behavior */
+	tmp_argv[0] = NULL;
+	line->completion.argc = 0;
+	line->completion.argv = tmp_argv;
+	switch (parent->type) {
+	case R_CORE_AUTOCMPLT_FLAG:
+		autocomplete_flags (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_FLSP:
+		autocomplete_flagspaces (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_ZIGN:
+		autocomplete_zignatures (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_EVAL:
+		autocomplete_evals (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_PRJT:
+		autocomplete_project (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_MINS:
+		autocomplete_minus (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_BRKP:
+		autocomplete_breakpoints (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_MACR:
+		autocomplete_macro (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_FILE:
+		autocomplete_file (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_THME:
+		autocomplete_theme (line, p);
+		break;
+	case R_CORE_AUTOCMPLT_OPTN:
+		// handled before
+		break;
+	default:
+		if (r_config_get_i (core->config, "cfg.newtab")) {
+			RCmdDescriptor *desc = &core->root_cmd_descriptor;
+			for (i = 0; arg[i] && desc; i++) {
+				ut8 c = arg[i];
+				desc = c < R_ARRAY_SIZE (desc->sub) ? desc->sub[c] : NULL;
+			}
+			if (desc && desc->help_msg) {
+				r_core_cmd_help (core, desc->help_msg);
+				r_cons_flush ();
+				return true;
+			}
+			// fallback to command listing
+		}
+		int length = strlen (arg), j = 0;
+		for (i = 0; j < (TMP_ARGV_SZ - 1) && i < parent->n_subcmds; i++) {
+			if (!strncmp (arg, parent->subcmds[i]->cmd, length)) {
+				tmp_argv[j++] = parent->subcmds[i]->cmd;
+			}
+		}
+		tmp_argv[j] = NULL;
+		line->completion.argc = j;
+		break;
+	}
+	return true;
+}
+
 static int autocomplete(RLine *line) {
 	RCore *core = line->user;
 	RListIter *iter;
 	RFlagItem *flag;
 	if (core) {
 		r_core_free_autocomplete (core);
+		char *pipe = strchr (line->buffer.data, '>');
 		char *ptr = strchr (line->buffer.data, '@');
-		if (ptr && strchr (ptr + 1, ' ') && line->buffer.data+line->buffer.index >= ptr) {
+		if (pipe && strchr (pipe + 1, ' ') && line->buffer.data+line->buffer.index >= pipe) {
+			autocompleteFilename (line, NULL, 1);
+		} else if (ptr && strchr (ptr + 1, ' ') && line->buffer.data + line->buffer.index >= ptr) {
 			int sdelta, n, i = 0;
-			ptr = (char *)r_str_trim_ro (ptr+1);
+			ptr = (char *)r_str_trim_ro (ptr + 1);
 			n = strlen (ptr);//(line->buffer.data+sdelta);
 			sdelta = (int)(size_t)(ptr - line->buffer.data);
 			r_list_foreach (core->flags->flags, iter, flag) {
@@ -914,6 +1364,7 @@
 
 				tmp_argv_heap = false;
 				ADDARG("comment")
+				ADDARG("usrcmt")
 				ADDARG("args")
 				ADDARG("fname")
 				ADDARG("floc")
@@ -948,11 +1399,17 @@
 				ADDARG("creg")
 				ADDARG("num")
 				ADDARG("mov")
+				ADDARG("func_var")
+				ADDARG("func_var_type")
+				ADDARG("func_var_addr")
+				ADDARG("widget_bg")
+				ADDARG("widget_sel")
 				ADDARG("ai.read")
 				ADDARG("ai.write")
 				ADDARG("ai.exec")
 				ADDARG("ai.seq")
 				ADDARG("ai.ascii")
+				ADDARG("ai.unmap")
 				ADDARG("graph.box")
 				ADDARG("graph.box2")
 				ADDARG("graph.box3")
@@ -971,11 +1428,11 @@
 				line->completion.argc = j;
 				line->completion.argv = tmp_argv;
 			}
-		} else if ((!strncmp (line->buffer.data, "pf.", 3))
-		||  (!strncmp (line->buffer.data, "pf*.", 4))
-		||  (!strncmp (line->buffer.data, "pfd.", 4))
-		||  (!strncmp (line->buffer.data, "pfv.", 4))
-		||  (!strncmp (line->buffer.data, "pfj.", 4))) {
+		} else if (!strncmp (line->buffer.data, "pf.", 3)
+		|| !strncmp (line->buffer.data, "pf*.", 4)
+		|| !strncmp (line->buffer.data, "pfd.", 4)
+		|| !strncmp (line->buffer.data, "pfv.", 4)
+		|| !strncmp (line->buffer.data, "pfj.", 4)) {
 			char pfx[2];
 			int chr = (line->buffer.data[2]=='.')? 3: 4;
 			if (chr == 4) {
@@ -990,8 +1447,15 @@
 			int j = 0;
 			ls_foreach (sls, iter, kv) {
 				int len = strlen (line->buffer.data + chr);
-				if (!len || !strncmp (line->buffer.data + chr, kv->key, len)) {
-					tmp_argv[j++] = r_str_newf ("pf%s.%s", pfx, kv->key);
+				int minlen = R_MIN (len,  strlen (kv->key));
+				if (!len || !strncmp (line->buffer.data + chr, kv->key, minlen)) {
+					char *p = strchr (line->buffer.data + chr, '.');
+					if (p) {
+						j += autocomplete_pfele (core, kv->key, pfx, j, p + 1);
+						break;
+					} else {
+						tmp_argv[j++] = r_str_newf ("pf%s.%s", pfx, kv->key);
+					}
 				}
 			}
 			if (j > 0) tmp_argv_heap = true;
@@ -1025,18 +1489,25 @@
 			tmp_argv[j] = NULL;
 			line->completion.argc = j;
 			line->completion.argv = tmp_argv;
-		} else if ((!strncmp (line->buffer.data, "eco ", 4))) {
+		} else if (!strncmp (line->buffer.data, "t ", 2)
+		|| !strncmp (line->buffer.data, "t- ", 3)) {
 			int i = 0;
-			int len = strlen (line->buffer.data + 4);
-			char *theme;
-			RList *themes = r_core_list_themes (core);
-			r_list_foreach (themes, iter, theme) {
-				if (!len || !strncmp (line->buffer.data + 4, theme, len)) {
-					tmp_argv[i++] = strdup (theme);
+			SdbList *l = sdb_foreach_list (core->anal->sdb_types, true);
+			SdbListIter *iter;
+			SdbKv *kv;
+			int chr = (line->buffer.data[1] == ' ')? 2: 3;
+			ls_foreach (l, iter, kv) {
+				int len = strlen (line->buffer.data + chr);
+				if (!len || !strncmp (line->buffer.data + chr, kv->key, len)) {
+					if (!strcmp (kv->value, "type") || !strcmp (kv->value, "enum")
+					|| !strcmp (kv->value, "struct")) {
+						tmp_argv[i++] = strdup (kv->key);
+					}
 				}
 			}
+			if (i > 0) tmp_argv_heap = true;
 			tmp_argv[i] = NULL;
-			r_list_free (themes);
+			ls_free (l);
 			line->completion.argc = i;
 			line->completion.argv = tmp_argv;
 		} else if ((!strncmp (line->buffer.data, "te ", 3))) {
@@ -1048,7 +1519,32 @@
 			ls_foreach (l, iter, kv) {
 				int len = strlen (line->buffer.data + chr);
 				if (!len || !strncmp (line->buffer.data + chr, kv->key, len)) {
-					if (!strncmp (kv->value, "0x", 2)) {
+					if (!strcmp (kv->value, "enum")) {
+						tmp_argv[i++] = strdup (kv->key);
+					}
+				}
+			}
+			if (i > 0) tmp_argv_heap = true;
+			tmp_argv[i] = NULL;
+			ls_free (l);
+			line->completion.argc = i;
+			line->completion.argv = tmp_argv;
+		} else if (!strncmp (line->buffer.data, "ts ", 3)
+		|| !strncmp (line->buffer.data, "ta ", 3)
+		|| !strncmp (line->buffer.data, "tp ", 3)
+		|| !strncmp (line->buffer.data, "tl ", 3)
+		|| !strncmp (line->buffer.data, "tpx ", 4)
+		|| !strncmp (line->buffer.data, "tss ", 4)
+		|| !strncmp (line->buffer.data, "ts* ", 4)) {
+			int i = 0;
+			SdbList *l = sdb_foreach_list (core->anal->sdb_types, true);
+			SdbListIter *iter;
+			SdbKv *kv;
+			int chr = (line->buffer.data[2] == ' ')? 3: 4;
+			ls_foreach (l, iter, kv) {
+				int len = strlen (line->buffer.data + chr);
+				if (!len || !strncmp (line->buffer.data + chr, kv->key, len)) {
+					if (!strncmp (kv->value, "struct", strlen ("struct") + 1)) {
 						tmp_argv[i++] = strdup (kv->key);
 					}
 				}
@@ -1058,36 +1554,6 @@
 			ls_free (l);
 			line->completion.argc = i;
 			line->completion.argv = tmp_argv;
-		} else if (!strncmp (line->buffer.data, "o ", 2)
-		|| !strncmp (line->buffer.data, "o+ ", 3)
-		|| !strncmp (line->buffer.data, "oc ", 3)
-		|| !strncmp (line->buffer.data, "r2 ", 3)
-		|| !strncmp (line->buffer.data, "cd ", 3)
-		|| !strncmp (line->buffer.data, "zos ", 4)
-		|| !strncmp (line->buffer.data, "zfd ", 4)
-		|| !strncmp (line->buffer.data, "zfs ", 4)
-		|| !strncmp (line->buffer.data, "zfz ", 4)
-		|| !strncmp (line->buffer.data, "on ", 3)
-		|| !strncmp (line->buffer.data, "op ", 3)
-		|| !strncmp (line->buffer.data, ". ", 2)
-		|| !strncmp (line->buffer.data, "wf ", 3)
-		|| !strncmp (line->buffer.data, "rm ", 3)
-		|| !strncmp (line->buffer.data, "ls ", 3)
-		|| !strncmp (line->buffer.data, "ls -l ", 5)
-		|| !strncmp (line->buffer.data, "wF ", 3)
-		|| !strncmp (line->buffer.data, "cat ", 4)
-		|| !strncmp (line->buffer.data, "less ", 5)
-		|| !strncmp (line->buffer.data, "wta ", 4)
-		|| !strncmp (line->buffer.data, "wtf ", 4)
-		|| !strncmp (line->buffer.data, "wxf ", 4)
-		|| !strncmp (line->buffer.data, "wp ", 3)
-		|| !strncmp (line->buffer.data, "Sd ", 3)
-		|| !strncmp (line->buffer.data, "Sl ", 3)
-		|| !strncmp (line->buffer.data, "to ", 3)
-		|| !strncmp (line->buffer.data, "pm ", 3)
-		|| !strncmp (line->buffer.data, "dml ", 4)
-		|| !strncmp (line->buffer.data, "/m ", 3)) {
-			autocompleteFilename (line, NULL, 1);
 		} else if (!strncmp (line->buffer.data, "zo ", 3)
 		|| !strncmp (line->buffer.data, "zoz ", 4)) {
 			if (core->anal->zign_path && core->anal->zign_path[0]) {
@@ -1098,223 +1564,15 @@
 			} else {
 				autocompleteFilename (line, NULL, 1);
 			}
-		} else if ((!strncmp (line->buffer.data, ".(", 2))  ||
-		   (!strncmp (line->buffer.data, "(-", 2))) {
-			const char *str = line->buffer.data;
-			RCmdMacroItem *item;
-			char buf[1024];
-			int n, i = 0;
-
-			n = line->buffer.length-2;
-			if (str && !strchr (str+2, ' ')) {
-				str += 2;
-				r_list_foreach (core->rcmd->macro.macros, iter, item) {
-					char *p = item->name;
-					if (!str || !*str || !strncmp (str, p, n)) {
-						snprintf (buf, sizeof (buf), "%c%c%s)",
-							line->buffer.data[0],
-							line->buffer.data[1],
-							p);
-						// eprintf ("------ %p (%s) = %s\n", tmp_argv[i], buf, p);
-						if (r_is_heap ((void*)tmp_argv[i])) {
-							free ((char *)tmp_argv[i]);
-						}
-						tmp_argv[i] = strdup (buf); // LEAKS
-						i++;
-						if (i == TMP_ARGV_SZ - 1) {
-							break;
-						}
-					}
-				}
-			}
-			//tmp_argv[(i-1>0)?i-1:0] = NULL;
-			tmp_argv[i] = NULL;
-			line->completion.argc = i;
-			line->completion.argv = tmp_argv;
-		} else if (!strncmp (line->buffer.data, "fs ", 3)) {
-			const char *msg = line->buffer.data + 3;
-			RFlag *flag = core->flags;
-			int j, i = 0;
-			for (j = 0; j < R_FLAG_SPACES_MAX - 1; j++) {
-				if (flag->spaces[j] && flag->spaces[j][0]) {
-					if (i == TMP_ARGV_SZ - 1) {
-						break;
-					}
-					if (!strncmp (msg, flag->spaces[j], strlen (msg))) {
-						if (i + 1 < TMP_ARGV_SZ) {
-							tmp_argv[i++] = flag->spaces[j];
-						}
-					}
-				}
-			}
-			if (flag->spaces[j] && !strncmp (msg, flag->spaces[j], strlen (msg))) {
-				if (i + 1 < TMP_ARGV_SZ) {
-					tmp_argv[i++] = "*";
-				}
-			}
-			tmp_argv[i] = NULL;
-			line->completion.argc = i;
-			line->completion.argv = tmp_argv;
-		} else if (!strncmp (line->buffer.data, "zs ", 3)) {
-			const char *msg = line->buffer.data + 3;
-			RSpaces zs = core->anal->zign_spaces;
-			int j, i = 0;
-			for (j = 0; j < R_SPACES_MAX; j++) {
-				if (zs.spaces[j]) {
-					if (i == TMP_ARGV_SZ - 1) {
-						break;
-					}
-					if (!strncmp (msg, zs.spaces[j], strlen (msg))) {
-						if (i + 1 < TMP_ARGV_SZ) {
-							tmp_argv[i++] = zs.spaces[j];
-						}
-					}
-				}
-			}
-			if (strlen (msg) == 0 && i + 1 < TMP_ARGV_SZ) {
-				tmp_argv[i++] = "*";
-			}
-			tmp_argv[i] = NULL;
-			line->completion.argc = i;
-			line->completion.argv = tmp_argv;
-		} else if ((!strncmp (line->buffer.data, "afC ", 4))) {
-			// autocomplete afC
-			SdbList *ccs = sdb_foreach_list (core->anal->sdb_cc, true);
-			SdbKv *kv;
-			SdbListIter *iter;
-			int sdelta = 4;
-			int i = 0;
-			int n = strlen (line->buffer.data + sdelta);
-			ls_foreach (ccs, iter, kv) {
-				if (!strchr (kv->key, '.')) {
-					if (!strncmp (kv->key, line->buffer.data + sdelta, n)) {
-						tmp_argv[i++] = kv->key;
-					}
-				}
-			}
-			ls_free (ccs);
-			line->completion.argc = i;
-			line->completion.argv = tmp_argv;
-		} else if ((!strncmp (line->buffer.data, "s ", 2)) ||
-		    (!strncmp (line->buffer.data, "ad ", 3)) ||
-		    (!strncmp (line->buffer.data, "bf ", 3)) ||
-		    (!strncmp (line->buffer.data, "ag ", 3)) ||
-		    (!strncmp (line->buffer.data, "aav ", 4)) ||
-		    (!strncmp (line->buffer.data, "afi ", 4)) ||
-		    (!strncmp (line->buffer.data, "aep ", 4)) ||
-		    (!strncmp (line->buffer.data, "aef ", 4)) ||
-		    (!strncmp (line->buffer.data, "aecu ", 5)) ||
-		    (!strncmp (line->buffer.data, "aesu ", 5)) ||
-		    (!strncmp (line->buffer.data, "aeim ", 5)) ||
-		    (!strncmp (line->buffer.data, "afb ", 4)) ||
-		    (!strncmp (line->buffer.data, "afc ", 4)) ||
-		    (!strncmp (line->buffer.data, "axt ", 4)) ||
-		    (!strncmp (line->buffer.data, "axf ", 4)) ||
-		    (!strncmp (line->buffer.data, "aga ", 5)) ||
-		    (!strncmp (line->buffer.data, "agc ", 4)) ||
-		    (!strncmp (line->buffer.data, "agl ", 4)) ||
-		    (!strncmp (line->buffer.data, "agd ", 4)) ||
-		    (!strncmp (line->buffer.data, "agfl ", 5)) ||
-		    (!strncmp (line->buffer.data, "b ", 2)) ||
-		    (!strncmp (line->buffer.data, "dcu ", 4)) ||
-		    (!strncmp (line->buffer.data, "/v ", 3)) ||
-		    (!strncmp (line->buffer.data, "/r ", 3)) ||
-		    (!strncmp (line->buffer.data, "/re ", 4)) ||
-		    (!strncmp (line->buffer.data, "db ", 3)) ||
-		    (!strncmp (line->buffer.data, "db- ", 4)) ||
-		    (!strncmp (line->buffer.data, "f ", 2)) ||
-		    (!strncmp (line->buffer.data, "f- ", 3)) ||
-		    (!strncmp (line->buffer.data, "fr ", 3)) ||
-		    (!strncmp (line->buffer.data, "tf ", 3)) ||
-		    (!strncmp (line->buffer.data, "/a ", 3)) ||
-		    (!strncmp (line->buffer.data, "?v ", 3)) ||
-		    (!strncmp (line->buffer.data, "? ", 2))) {
-			int n, i = 0;
-			int sdelta = (line->buffer.data[1] == ' ')
-				? 2 : (line->buffer.data[2] == ' ')
-				? 3 : 4;
-			n = strlen (line->buffer.data + sdelta);
-			r_list_foreach (core->flags->flags, iter, flag) {
-				if (!strncmp (flag->name, line->buffer.data + sdelta, n)) {
-					tmp_argv[i++] = flag->name;
-					if (i == TMP_ARGV_SZ - 1) {
-						break;
-					}
-				}
-			}
-			tmp_argv[i>255?255:i] = NULL;
-			line->completion.argc = i;
-			line->completion.argv = tmp_argv;
-		} else if (!strncmp (line->buffer.data, "-", 1)) {
-			int count;
-			char **keys = r_cmd_alias_keys(core->rcmd, &count);
-			char *data = line->buffer.data;
-			if (keys) {
-				int i, j;
-				for (i=j=0; i<count; i++) {
-					if (!strncmp (keys[i], data, line->buffer.index)) {
-						tmp_argv[j++] = keys[i];
-					}
-				}
-				tmp_argv[j] = NULL;
-				line->completion.argc = j;
-				line->completion.argv = tmp_argv;
-			} else {
-				line->completion.argc = 0;
-				line->completion.argv = NULL;
-			}
-		} else if ( (!strncmp (line->buffer.data, "e ", 2))
-		   || (!strncmp (line->buffer.data, "et ", 3))
-		   || (!strncmp (line->buffer.data, "e? ", 3))
-		   || (!strncmp (line->buffer.data, "e! ", 3))) {
-			const char p = line->buffer.data[1];
-			int m = (p == '?' || p == '!' || p == 't') ? 3 : 2;
-			int i = 0, n = strlen (line->buffer.data+m);
-			RConfigNode *bt;
-			RListIter *iter;
-			r_list_foreach (core->config->nodes, iter, bt) {
-				if (!strncmp (bt->name, line->buffer.data+m, n)) {
-					tmp_argv[i++] = bt->name;
-					if (i == TMP_ARGV_SZ - 1) {
-						break;
-					}
-				}
-			}
-			tmp_argv[R_MIN(i, TMP_ARGV_SZ - 1)] = NULL;
-			line->completion.argc = i;
-			line->completion.argv = tmp_argv;
-		} else {
-			int i, j, cfg_newtab = r_config_get_i (core->config, "cfg.newtab");
-			if (cfg_newtab) {
-				RCmdDescriptor *desc = &core->root_cmd_descriptor;
-				for (i = 0; i < line->buffer.index && desc; i++) {
-					ut8 c = line->buffer.data[i];
-					desc = c < R_ARRAY_SIZE (desc->sub) ? desc->sub[c] : NULL;
-				}
-				if (desc && desc->help_msg) {
-					r_core_cmd_help (core, desc->help_msg);
-					r_cons_flush ();
-					return true;
-				}
-				// fallback to old command completion
-			}
-			for (i = j = 0; i < CMDS && radare_argv[i]; i++)
-				if (!strncmp (radare_argv[i], line->buffer.data, line->buffer.index))
-					tmp_argv[j++] = radare_argv[i];
-			tmp_argv[j] = NULL;
-			line->completion.argc = j;
-			line->completion.argv = tmp_argv;
+		} else if (line->offset_prompt) {
+			autocomplete_flags (line, line->buffer.data);
+		} else if (line->file_prompt) {
+			autocomplete_file (line, line->buffer.data);
+		} else if (!find_autocomplete (line)) {
+			autocomplete_default (line);
 		}
 	} else {
-			int i, j;
-			for (i=j=0; i<CMDS && radare_argv[i]; i++) {
-				if (!strncmp (radare_argv[i], line->buffer.data, line->buffer.index)) {
-					tmp_argv[j++] = radare_argv[i];
-				}
-			}
-			tmp_argv[j] = NULL;
-			line->completion.argc = j;
-			line->completion.argv = tmp_argv;
+		autocomplete_default (line);
 	}
 	return true;
 }
@@ -1326,9 +1584,9 @@
 	if (rli->completion.argv != radare_argv) {
 		r_line_free_autocomplete (rli);
 	}
-	rli->completion.argc = CMDS;
+	rli->completion.argc = radare_argc;
 	rli->completion.argv = radare_argv;
-	rli->completion.run = autocomplete;
+ 	rli->completion.run = autocomplete;
 	ptr = r_line_readline ();
 	if (!ptr) {
 		return -1;
@@ -1392,55 +1650,6 @@
 	}
 }
 
-// dupped in cmd_type.c
-static char *getenumname(void *_core, const char *name, ut64 val) {
-	const char *isenum;
-	RCore *core = (RCore*)_core;
-
-	isenum = sdb_const_get (core->anal->sdb_types, name, 0);
-	if (isenum && !strncmp (isenum, "enum", 4)) {
-		const char *q = sdb_fmt (0, "%s.0x%x", name, val);
-		return sdb_get (core->anal->sdb_types, q, 0);
-	} else {
-		eprintf ("This is not an enum (%s)\n", name);
-	}
-	return NULL;
-}
-
-// TODO: dupped in cmd_type.c
-static char *getbitfield(void *_core, const char *name, ut64 val) {
-	const char *isenum, *q, *res;
-	RCore *core = (RCore*)_core;
-	char *ret = NULL;
-	int i;
-
-	isenum = sdb_const_get (core->anal->sdb_types, name, 0);
-	if (isenum && !strcmp (isenum, "enum")) {
-		int isFirst = true;
-		ret = r_str_appendf (ret, "0x%08"PFMT64x" : ", val);
-		for (i = 0; i < 32; i++) {
-			if (!(val & (1 << i))) {
-				continue;
-			}
-			q = sdb_fmt (0, "%s.0x%x", name, (1<<i));
-			res = sdb_const_get (core->anal->sdb_types, q, 0);
-			if (isFirst) {
-				isFirst = false;
-			} else {
-				ret = r_str_append (ret, " | ");
-			}
-			if (res) {
-				ret = r_str_append (ret, res);
-			} else {
-				ret = r_str_appendf (ret, "0x%x", (1<<i));
-			}
-		}
-	} else {
-		eprintf ("This is not an enum\n");
-	}
-	return ret;
-}
-
 #define MINLEN 1
 static int is_string (const ut8 *buf, int size, int *len) {
 	int i;
@@ -1488,7 +1697,7 @@
 	RStrBuf *s = r_strbuf_new (NULL);
 	ut64 type;
 	RIOSection *sect;
-	char *mapname;
+	char *mapname = NULL;
 	RAnalFunction *fcn;
 	RFlagItem *fi = r_flag_get_i (core->flags, value);
 	type = r_core_anal_address (core, value);
@@ -1497,11 +1706,7 @@
 		RDebugMap *map = r_debug_map_get (core->dbg, value);
 		if (map && map->name && map->name[0]) {
 			mapname = strdup (map->name);
-		} else {
-			mapname = NULL;
 		}
-	} else {
-		mapname = NULL;
 	}
 	sect = value? r_io_section_vget (core->io, value): NULL;
 	if(! ((type&R_ANAL_ADDR_TYPE_HEAP)||(type&R_ANAL_ADDR_TYPE_STACK)) ) {
@@ -1511,7 +1716,7 @@
 		}
 		if (mapname) {
 			r_strbuf_appendf (s, " (%s)", mapname);
-			free (mapname);
+			R_FREE (mapname);
 		}
 	}
 	if (fi) r_strbuf_appendf (s, " %s", fi->name);
@@ -1610,11 +1815,26 @@
 			}
 		}
 	}
+	free (mapname);
 	return r_strbuf_drain (s);
 }
 
 R_API char *r_core_anal_get_comments(RCore *core, ut64 addr) {
-	return core? r_meta_get_string (core->anal, R_META_TYPE_COMMENT, addr): NULL;
+	if (core) {
+		char *type = r_meta_get_string (core->anal, R_META_TYPE_VARTYPE, addr);
+		char *cmt = r_meta_get_string (core->anal, R_META_TYPE_COMMENT, addr);
+		if (type && cmt) {
+			char *ret = r_str_newf ("%s %s", type, cmt);
+			free (type);
+			free (cmt);
+			return ret;
+		} else if (type) {
+			return type;
+		} else if (cmt) {
+			return cmt;
+		}
+	}
+	return NULL;
 }
 
 R_API const char *r_core_anal_optype_colorfor(RCore *core, ut64 addr, bool verbose) {
@@ -1646,11 +1866,7 @@
 
 static void r_core_setenv (RCore *core) {
 	char *e = r_sys_getenv ("PATH");
-#if __WINDOWS__ && !__CYGWIN__
-	char *h = r_str_home (".config\\radare2\\prefix\\bin;");
-#else
-	char *h = r_str_home (".config/radare2/prefix/bin:");
-#endif
+	char *h = r_str_home (R2_HOME_BIN R_SYS_ENVSEP);
 	char *n = r_str_newf ("%s%s", h, e);
 	r_sys_setenv ("PATH", n);
 	free (n);
@@ -1662,6 +1878,14 @@
 	return r_cons_memcat ((const char *)buf, len);
 }
 
+static bool exists_var(RPrint *print, ut64 func_addr, char *str) {
+	char *name_key = sdb_fmt ("var.0x%"PFMT64x ".%d.%s", func_addr, 1, str);
+	if (sdb_const_get_len (((RCore*)(print->user))->anal->sdb_fcns, name_key, NULL, 0)) {
+		return true;
+	}
+	return false;
+}
+
 static bool r_core_anal_log(struct r_anal_t *anal, const char *msg) {
 	RCore *core = anal->user;
 	if (core->cfglog) {
@@ -1670,6 +1894,133 @@
 	return true;
 }
 
+static bool r_core_anal_read_at(struct r_anal_t *anal, ut64 addr, ut8 *buf, int len) {
+	return r_io_read_at (anal->iob.io, addr, buf, len);
+}
+
+static void r_core_break (RCore *core) {
+	// if we are not in the main thread we hold in a lock
+	RCoreTask *task = r_core_task_self (core);
+	r_core_task_continue (task);
+}
+
+static void *r_core_sleep_begin (RCore *core) {
+	RCoreTask *task = r_core_task_self (core);
+	r_core_task_sleep_begin (task);
+	return task;
+}
+
+static void r_core_sleep_end (RCore *core, void *user) {
+	RCoreTask *task = (RCoreTask *)user;
+	r_core_task_sleep_end (task);
+}
+
+static void init_autocomplete (RCore* core) {
+	core->autocomplete = R_NEW0 (RCoreAutocomplete);
+	/* flags */
+	r_core_autocomplete_add (core->autocomplete, "s", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "s+", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "b", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "f", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "?", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "?v", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "ad", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "bf", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "ag", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "db", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "f-", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "fr", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "tf", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "/a", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "/v", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "/r", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "/re", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "aav", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "afi", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "aep", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "aef", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "afb", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "afc", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "axt", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "axf", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "dcu", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "ag", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "agfl", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "aecu", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "aesu", R_CORE_AUTOCMPLT_FLAG, true);
+	r_core_autocomplete_add (core->autocomplete, "aeim", R_CORE_AUTOCMPLT_FLAG, true);
+	/* evars */
+	r_core_autocomplete_add (core->autocomplete, "e", R_CORE_AUTOCMPLT_EVAL, true);
+	r_core_autocomplete_add (core->autocomplete, "et", R_CORE_AUTOCMPLT_EVAL, true);
+	r_core_autocomplete_add (core->autocomplete, "e?", R_CORE_AUTOCMPLT_EVAL, true);
+	r_core_autocomplete_add (core->autocomplete, "e!", R_CORE_AUTOCMPLT_EVAL, true);
+	/* cfg.editor */
+	r_core_autocomplete_add (core->autocomplete, "-", R_CORE_AUTOCMPLT_MINS, true);
+	/* breakpoints */
+	r_core_autocomplete_add (core->autocomplete, "db-", R_CORE_AUTOCMPLT_BRKP, true);
+	r_core_autocomplete_add (core->autocomplete, "dbd", R_CORE_AUTOCMPLT_BRKP, true);
+	r_core_autocomplete_add (core->autocomplete, "dbe", R_CORE_AUTOCMPLT_BRKP, true);
+	r_core_autocomplete_add (core->autocomplete, "dbs", R_CORE_AUTOCMPLT_BRKP, true);
+	r_core_autocomplete_add (core->autocomplete, "dbte", R_CORE_AUTOCMPLT_BRKP, true);
+	r_core_autocomplete_add (core->autocomplete, "dbtd", R_CORE_AUTOCMPLT_BRKP, true);
+	r_core_autocomplete_add (core->autocomplete, "dbts", R_CORE_AUTOCMPLT_BRKP, true);
+	/* Project */
+	r_core_autocomplete_add (core->autocomplete, "Po", R_CORE_AUTOCMPLT_PRJT, true);
+	/* zignatures */
+	r_core_autocomplete_add (core->autocomplete, "zs", R_CORE_AUTOCMPLT_ZIGN, true);
+	/* flag spaces */
+	r_core_autocomplete_add (core->autocomplete, "fs", R_CORE_AUTOCMPLT_FLSP, true);
+	/* macros */
+	r_core_autocomplete_add (core->autocomplete, ".(", R_CORE_AUTOCMPLT_MACR, true);
+	r_core_autocomplete_add (core->autocomplete, "(-", R_CORE_AUTOCMPLT_MACR, true);
+	/* file path */
+	r_core_autocomplete_add (core->autocomplete, "o", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "L", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "obf", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, ".", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "o+", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "oc", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "r2", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "rabin2", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "rasm2", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "rahash2", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "rax2", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "rafind2", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "cd", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "on", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "op", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "wf", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "rm", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "wF", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "wp", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "Sd", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "Sl", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "to", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "pm", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "/m", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "zos", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "zfd", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "zfs", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "zfz", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "cat", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "wta", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "wtf", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "wxf", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "dml", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "vim", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (core->autocomplete, "less", R_CORE_AUTOCMPLT_FILE, true);
+	r_core_autocomplete_add (r_core_autocomplete_add (core->autocomplete, "ls", R_CORE_AUTOCMPLT_DFLT, true), "-l", R_CORE_AUTOCMPLT_FILE, true);
+	/* theme */
+	r_core_autocomplete_add (core->autocomplete, "eco", R_CORE_AUTOCMPLT_THME, true);
+	/* just for hints */
+	int i;
+	for (i = 0; i < radare_argc && radare_argv[i]; i++) {
+		if (!r_core_autocomplete_find (core->autocomplete, radare_argv[i], true)) {
+			r_core_autocomplete_add (core->autocomplete, radare_argv[i], R_CORE_AUTOCMPLT_DFLT, true);
+		}
+	}
+}
+
 R_API bool r_core_init(RCore *core) {
 	core->blocksize = R_CORE_BLOCKSIZE;
 	core->block = (ut8*)calloc (R_CORE_BLOCKSIZE + 1, 1);
@@ -1680,7 +2031,8 @@
 	}
 	r_core_setenv (core);
 	core->lock = r_th_lock_new (true);
-	core->cmd_depth = R_CORE_CMD_DEPTH + 1;
+	core->max_cmd_depth = R_CORE_CMD_DEPTH + 1;
+	core->cmd_depth = core->max_cmd_depth;
 	core->sdb = sdb_new (NULL, "r2kv.sdb", 0); // XXX: path must be in home?
 	core->lastsearch = NULL;
 	core->cmdfilter = NULL;
@@ -1693,12 +2045,11 @@
 	core->print = r_print_new ();
 	core->print->user = core;
 	core->print->num = core->num;
-	core->print->get_enumname = getenumname;
-	core->print->get_bitfield = getbitfield;
 	core->print->offname = r_core_print_offname;
 	core->print->cb_printf = r_cons_printf;
 	core->print->cb_color = r_cons_rainbow_get;
 	core->print->write = mywrite;
+	core->print->exists_var = exists_var;
 	core->print->disasm = __disasm;
 	core->print->colorfor = (RPrintColorFor)r_core_anal_optype_colorfor;
 	core->print->hasrefs = (RPrintColorFor)r_core_anal_hasrefs;
@@ -1706,7 +2057,17 @@
 	core->print->use_comments = false;
 	core->rtr_n = 0;
 	core->blocksize_max = R_CORE_BLOCKSIZE_MAX;
-	core->tasks = r_list_new ();
+	core->task_id_next = 0;
+	core->tasks = r_list_newf ((RListFree)r_core_task_free);
+	core->tasks_queue = r_list_new ();
+	core->oneshot_queue = r_list_newf (free);
+	core->oneshots_enqueued = 0;
+	core->tasks_lock = r_th_lock_new (true);
+	core->tasks_running = 0;
+	core->oneshot_running = false;
+	core->main_task = r_core_task_new (core, false, NULL, NULL, NULL);
+	r_list_append (core->tasks, core->main_task);
+	core->current_task = NULL;
 	core->watchers = r_list_new ();
 	core->watchers->free = (RListFree)r_core_cmpwatch_free;
 	core->scriptstack = r_list_new ();
@@ -1727,13 +2088,17 @@
 	core->egg = r_egg_new ();
 	r_egg_setup (core->egg, R_SYS_ARCH, R_SYS_BITS, 0, R_SYS_OS);
 
+	core->undos = r_list_newf ((RListFree)r_core_undo_free);
+	core->fixedarch = false;
+	core->fixedbits = false;
+
 	/* initialize libraries */
 	core->cons = r_cons_new ();
 	if (core->cons->refcnt == 1) {
 		core->cons = r_cons_singleton ();
 		if (core->cons->line) {
 			core->cons->line->user = core;
-			core->cons->line->editor_cb = \
+			core->cons->line->cb_editor = \
 				(RLineEditorCb)&r_core_editor;
 		}
 #if __EMSCRIPTEN__
@@ -1742,19 +2107,16 @@
 		core->cons->user_fgets = (void *)r_core_fgets;
 #endif
 		//r_line_singleton()->user = (void *)core;
-		r_line_hist_load (R2_HOMEDIR"/history");
+		r_line_hist_load (R2_HOME_HISTORY);
 	}
 	core->print->cons = core->cons;
 	r_cons_bind (&core->print->consbind);
 
-	// We save the old num, in order to restore it after free
-	core->old_num = core->cons->num;
-	core->cons->num = core->num;
+	// We save the old num ad user, in order to restore it after free
 	core->lang = r_lang_new ();
 	core->lang->cmd_str = (char *(*)(void *, const char *))r_core_cmd_str;
 	core->lang->cmdf = (int (*)(void *, const char *, ...))r_core_cmdf;
-	core->cons->editor = (RConsEditorCallback)r_core_editor;
-	core->cons->user = (void*)core;
+	r_core_bind_cons (core);
 	core->lang->cb_printf = r_cons_printf;
 	r_lang_define (core->lang, "RCore", "core", core);
 	r_lang_set_user_ptr (core->lang, core);
@@ -1763,11 +2125,13 @@
 	r_asm_set_user_ptr (core->assembler, core);
 	core->anal = r_anal_new ();
 	core->anal->log = r_core_anal_log;
+	core->anal->read_at = r_core_anal_read_at;
 	core->anal->meta_spaces.cb_printf = r_cons_printf;
 	core->anal->cb.on_fcn_new = on_fcn_new;
 	core->anal->cb.on_fcn_delete = on_fcn_delete;
 	core->anal->cb.on_fcn_rename = on_fcn_rename;
-	core->assembler->syscall = core->anal->syscall; // BIND syscall anal/asm
+	core->print->sdb_types = core->anal->sdb_types;
+	core->assembler->syscall = r_syscall_ref (core->anal->syscall); // BIND syscall anal/asm
 	r_anal_set_user_ptr (core->anal, core);
 	core->anal->cb_printf = (void *) r_cons_printf;
 	core->parser = r_parse_new ();
@@ -1816,6 +2180,7 @@
 	core->file = NULL;
 	core->files = r_list_newf ((RListFree)r_core_file_free);
 	core->offset = 0LL;
+	core->prompt_offset = 0LL;
 	r_core_cmd_init (core);
 	core->dbg = r_debug_new (true);
 
@@ -1849,31 +2214,50 @@
 	r_config_set (core->config, "asm.arch", R_SYS_ARCH);
 	r_bp_use (core->dbg->bp, R_SYS_ARCH, core->anal->bits);
 	update_sdb (core);
+	{
+		char *a = r_str_r2_prefix (R2_FLAGS);
+		if (a) {
+			char *file = r_str_newf ("%s/tags.r2", a);
+			(void)r_core_run_script (core, file);
+			free (file);
+			free (a);
+		}
+	}
+	init_autocomplete (core);
 	return 0;
 }
 
+R_API void r_core_bind_cons(RCore *core) {
+	core->cons->num = core->num;
+	core->cons->cb_editor = (RConsEditorCallback)r_core_editor;
+	core->cons->cb_break = (RConsBreakCallback)r_core_break;
+	core->cons->cb_sleep_begin = (RConsSleepBeginCallback)r_core_sleep_begin;
+	core->cons->cb_sleep_end = (RConsSleepEndCallback)r_core_sleep_end;
+	core->cons->cb_task_oneshot = (RConsQueueTaskOneshot) r_core_task_enqueue_oneshot;
+	core->cons->user = (void*)core;
+}
+
 R_API RCore *r_core_fini(RCore *c) {
 	if (!c) {
 		return NULL;
 	}
+	r_core_task_join (c, NULL, NULL);
 	r_core_wait (c);
 	/* TODO: it leaks as shit */
 	//update_sdb (c);
 	// avoid double free
 	r_core_free_autocomplete (c);
+	R_FREE (c->cmdlog);
+	r_th_lock_free (c->lock);
 	R_FREE (c->lastsearch);
 	c->cons->pager = NULL;
-	r_core_task_join (c, NULL);
 	free (c->cmdqueue);
 	free (c->lastcmd);
-	free (c->block);
 	r_io_free (c->io);
+	free (c->block);
+	r_core_autocomplete_free (c->autocomplete);
 
-	// Check if the old num is saved. If yes, we restore it.
-	if (c->cons && c->old_num) {
-		c->cons->num = c->old_num;
-		c->old_num = NULL;
-	}
+	r_list_free (c->undos);
 	r_num_free (c->num);
 	// TODO: sync or not? sdb_sync (c->sdb);
 	// TODO: sync all dbs?
@@ -1883,6 +2267,9 @@
 	r_list_free (c->watchers);
 	r_list_free (c->scriptstack);
 	r_list_free (c->tasks);
+	r_list_free (c->tasks_queue);
+	r_list_free (c->oneshot_queue);
+	r_th_lock_free (c->tasks_lock);
 	c->rcmd = r_cmd_free (c->rcmd);
 	r_list_free (c->cmd_descriptors);
 	c->anal = r_anal_free (c->anal);
@@ -1896,7 +2283,7 @@
 	/* rconfig doesnt knows how to deinitialize vars, so we
 	should probably need to add a r_config_free_payload callback */
 	r_cons_free ();
-	r_cons_singleton()->teefile = NULL; // HACK
+	r_cons_singleton ()->teefile = NULL; // HACK
 	r_search_free (c->search);
 	r_flag_free (c->flags);
 	r_fs_free (c->fs);
@@ -1990,7 +2377,6 @@
 
 static void set_prompt (RCore *r) {
 	char tmp[128];
-	char *prompt = NULL;
 	char *filename = strdup ("");
 	const char *cmdprompt = r_config_get (r->config, "cmd.prompt");
 	const char *BEGIN = "";
@@ -2000,7 +2386,7 @@
 	if (cmdprompt && *cmdprompt)
 		r_core_cmd (r, cmdprompt, 0);
 
-	if (r_config_get_i (r->config, "scr.promptfile")) {
+	if (r_config_get_i (r->config, "scr.prompt.file")) {
 		free (filename);
 		filename = r_str_newf ("\"%s\"",
 			r_file_basename (r->io->desc->name));
@@ -2020,8 +2406,9 @@
 	// TODO: also in visual prompt and disasm/hexdump ?
 	if (r_config_get_i (r->config, "asm.segoff")) {
 		ut32 a, b;
+		unsigned int seggrn = r_config_get_i (r->config, "asm.seggrn");
 
-		a = ((r->offset >> 16) << 12);
+		a = ((r->offset >> 16) << (16 - seggrn));
 		b = (r->offset & 0xffff);
 		snprintf (tmp, 128, "%04x:%04x", a, b);
 	} else {
@@ -2029,10 +2416,10 @@
 		int promptset = false;
 
 		sec[0] = '\0';
-		if (r_config_get_i (r->config, "scr.promptflag")) {
+		if (r_config_get_i (r->config, "scr.prompt.flag")) {
 			promptset = prompt_flag (r, p, sizeof (p));
 		}
-		if (r_config_get_i (r->config, "scr.promptsect")) {
+		if (r_config_get_i (r->config, "scr.prompt.sect")) {
 			prompt_sec (r, sec, sizeof (sec));
 		}
 
@@ -2043,7 +2430,7 @@
 	}
 
 	chop_prompt (filename, tmp, 128);
-	prompt = r_str_newf ("%s%s[%s%s]>%s ", filename, BEGIN, remote,
+	char *prompt = r_str_newf ("%s%s[%s%s]>%s ", filename, BEGIN, remote,
 		tmp, END);
 	r_line_set_prompt (prompt ? prompt : "");
 
@@ -2075,6 +2462,7 @@
 
 R_API int r_core_prompt_exec(RCore *r) {
 	int ret = r_core_cmd (r, r->cmdqueue, true);
+	//int ret = r_core_cmd (r, r->cmdqueue, true);
 	if (r->cons && r->cons->use_tts) {
 		const char *buf = r_cons_get_buffer();
 		r_sys_tts (buf, true);
@@ -2087,7 +2475,7 @@
 	return ret;
 }
 
-R_API int r_core_block_size(RCore *core, int bsize) {
+R_API int r_core_seek_size(RCore *core, ut64 addr, int bsize) {
 	ut8 *bump;
 	int ret = false;
 	if (bsize < 0) {
@@ -2107,6 +2495,7 @@
 		eprintf ("Block size %d is too big\n", bsize);
 		return false;
 	}
+	core->offset = addr;
 	if (bsize < 1) {
 		bsize = 1;
 	} else if (core->blocksize_max && bsize>core->blocksize_max) {
@@ -2128,6 +2517,10 @@
 	return ret;
 }
 
+R_API int r_core_block_size(RCore *core, int bsize) {
+	return r_core_seek_size (core, core->offset, bsize);
+}
+
 R_API int r_core_seek_align(RCore *core, ut64 align, int times) {
 	int diff, inc = (times >= 0)? 1: -1;
 	ut64 seek = core->offset;
@@ -2162,7 +2555,7 @@
 	ut8 buf[64];
 	int ret;
 	r_asm_set_pc (core->assembler, addr);
-	r_core_read_at (core, addr, buf, sizeof (buf));
+	r_io_read_at (core->io, addr, buf, sizeof (buf));
 	ret = r_asm_disassemble (core->assembler, &op, buf, sizeof (buf));
 	return (ret > 0)? strdup (op.buf_asm): NULL;
 }
@@ -2170,8 +2563,8 @@
 R_API RAnalOp *r_core_op_anal(RCore *core, ut64 addr) {
 	ut8 buf[64];
 	RAnalOp *op = R_NEW (RAnalOp);
-	r_core_read_at (core, addr, buf, sizeof (buf));
-	r_anal_op (core->anal, op, addr, buf, sizeof (buf));
+	r_io_read_at (core->io, addr, buf, sizeof (buf));
+	r_anal_op (core->anal, op, addr, buf, sizeof (buf), R_ANAL_OP_MASK_ALL);
 	return op;
 }
 
@@ -2460,19 +2853,19 @@
 }
 
 R_API char *r_core_editor (const RCore *core, const char *file, const char *str) {
+	const bool interactive = r_config_get_i (core->config, "scr.interactive");
 	const char *editor = r_config_get (core->config, "cfg.editor");
-	char *name, *ret = NULL;
+	char *name = NULL, *ret = NULL;
 	int len, fd;
 
-	if (!editor || !*editor) {
+	if (!interactive || !editor || !*editor) {
 		return NULL;
 	}
-	if (file) {
+	if (file && *file != '*') {
 		name = strdup (file);
 		fd = r_sandbox_open (file, O_RDWR, 0644);
 	} else {
-		name = NULL;
-		fd = r_file_mkstemp ("r2ed", &name);
+		fd = r_file_mkstemp (file, &name);
 	}
 	if (fd == -1) {
 		free (name);
@@ -2485,10 +2878,10 @@
 
 	if (name && (!editor || !*editor || !strcmp (editor, "-"))) {
 		RCons *cons = r_cons_singleton ();
-		void *tmp = cons->editor;
-		cons->editor = NULL;
+		void *tmp = cons->cb_editor;
+		cons->cb_editor = NULL;
 		r_cons_editor (name, NULL);
-		cons->editor = tmp;
+		cons->cb_editor = tmp;
 	} else {
 		if (editor && name) {
 			r_sys_cmdf ("%s '%s'", editor, name);
@@ -2508,9 +2901,17 @@
 }
 
 /* weak getters */
-R_API RCons *r_core_get_cons (RCore *core) { return core->cons; }
-R_API RConfig *r_core_get_config (RCore *core) { return core->config; }
-R_API RBin *r_core_get_bin (RCore *core) { return core->bin; }
+R_API RCons *r_core_get_cons (RCore *core) {
+	return core->cons;
+}
+
+R_API RConfig *r_core_get_config (RCore *core) {
+	return core->config;
+}
+
+R_API RBin *r_core_get_bin (RCore *core) {
+	return core->bin;
+}
 
 R_API RBuffer *r_core_syscallf (RCore *core, const char *name, const char *fmt, ...) {
 	char str[1024];
@@ -2585,13 +2986,35 @@
 	return b;
 }
 
+static bool isValidAddress (RCore *core, ut64 addr) {
+	// check if address is mapped
+	RIOMap* map = r_io_map_get (core->io, addr);
+	if (!map) {
+		return false;
+	}
+	st64 fdsz = (st64)r_io_fd_size (core->io, map->fd);
+	if (fdsz > 0 && map->delta > fdsz) {
+		return false;
+	}
+	// check if associated file is opened
+	RIODesc *desc = r_io_desc_get (core->io, map->fd);
+	if (!desc) {
+		return false;
+	}
+	// check if current map->fd is null://
+	if (!strncmp (desc->name, "null://", 7)) {
+		return false;
+	}
+	return true;
+}
+
 R_API int r_core_search_value_in_range(RCore *core, RInterval search_itv, ut64 vmin,
 				     ut64 vmax, int vsize, bool asterisk, inRangeCb cb) {
 	int i, match, align = core->search->align, hitctr = 0;
 	bool vinfun = r_config_get_i (core->config, "anal.vinfun");
 	bool vinfunr = r_config_get_i (core->config, "anal.vinfunrange");
 	ut8 buf[4096];
-	ut64 v64, value = 0;
+	ut64 v64, value = 0, size;
 	ut64 from = search_itv.addr, to = r_itv_end (search_itv);
 	ut32 v32;
 	ut16 v16;
@@ -2617,16 +3040,24 @@
 	r_cons_break_push (NULL, NULL);
 
 	while (from < to) {
+		size = R_MIN (to - from, sizeof (buf));
 		memset (buf, 0xff, sizeof (buf)); // probably unnecessary
 		if (r_cons_is_breaked ()) {
 			goto beach;
 		}
-		bool res = r_io_read_at (core->io, from, buf, sizeof (buf));
-		if (!res || !memcmp (buf, "\xff\xff\xff\xff", 4)) {
-			from += sizeof (buf);
-			continue;
+		bool res = r_io_read_at_mapped (core->io, from, buf, size);
+		if (!res || !memcmp (buf, "\xff\xff\xff\xff", 4) || !memcmp (buf, "\x00\x00\x00\x00", 4)) {
+			if (!isValidAddress (core, from)) {
+				ut64 next = r_io_map_next_address (core->io, from);
+				if (next == UT64_MAX) {
+					from += sizeof (buf);
+				} else {
+					from += (next - from);
+				}
+				continue;
+			}
 		}
-		for (i = 0; i < sizeof (buf) - vsize; i++) {
+		for (i = 0; i <= size - vsize; i++) {
 			void *v = (buf + i);
 			ut64 addr = from + i;
 			if (r_cons_is_breaked ()) {
@@ -2637,10 +3068,10 @@
 			}
 			match = false;
 			switch (vsize) {
-			case 1: value = *(ut8 *) (v); match = (buf[i] >= vmin && buf[i] <= vmax); break;
-			case 2: v16 = *((ut16 *) (v)); match = (v16 >= vmin && v16 <= vmax); value = v16; break;
-			case 4: v32 = *((ut32 *) (v)); match = (v32 >= vmin && v32 <= vmax); value = v32; break;
-			case 8: v64 = *((ut64 *) (v)); match = (v64 >= vmin && v64 <= vmax); value = v64; break;
+			case 1: value = *(ut8 *)v; match = (buf[i] >= vmin && buf[i] <= vmax); break;
+			case 2: v16 = *(uut16 *)v; match = (v16 >= vmin && v16 <= vmax); value = v16; break;
+			case 4: v32 = *(uut32 *)v; match = (v32 >= vmin && v32 <= vmax); value = v32; break;
+			case 8: v64 = *(uut64 *)v; match = (v64 >= vmin && v64 <= vmax); value = v64; break;
 			default: eprintf ("Unknown vsize %d\n", vsize); return -1;
 			}
 			if (match && !vinfun) {
@@ -2669,9 +3100,94 @@
 				}
 			}
 		}
-		from += sizeof (buf);
+		if (size == to-from) {
+			break;
+		}
+		from += size-vsize+1;
 	}
 beach:
 	r_cons_break_pop ();
 	return hitctr;
 }
+
+R_API RCoreAutocomplete *r_core_autocomplete_add(RCoreAutocomplete *parent, const char* cmd, int type, bool lock) {
+	if (!parent || !cmd || type < 0 || type >= R_CORE_AUTOCMPLT_END) {
+		return NULL;
+	}
+	RCoreAutocomplete *autocmpl = R_NEW0 (RCoreAutocomplete);
+	if (!autocmpl) {
+		return NULL;
+	}
+	RCoreAutocomplete **updated = realloc (parent->subcmds, (parent->n_subcmds + 1) * sizeof(RCoreAutocomplete**));
+	if (!updated) {
+		free (autocmpl);
+		return NULL;
+	}
+	parent->subcmds = updated;
+	parent->subcmds[parent->n_subcmds] = autocmpl;
+	parent->n_subcmds++;
+	autocmpl->cmd = strdup (cmd);
+	autocmpl->locked = lock;
+	autocmpl->type = type;
+	autocmpl->length = strlen (cmd);
+	return autocmpl;
+}
+
+R_API void r_core_autocomplete_free(RCoreAutocomplete *obj) {
+	if (!obj) {
+		return;
+	}
+	int i;
+	for (i = 0; i < obj->n_subcmds; ++i) {
+		r_core_autocomplete_free (obj->subcmds[i]);
+		obj->subcmds[i] = NULL;
+	}
+	free ((char*) obj->cmd);
+	free (obj);
+}
+
+R_API RCoreAutocomplete *r_core_autocomplete_find(RCoreAutocomplete *parent, const char* cmd, bool exact) {
+	if (!parent || !cmd) {
+		return false;
+	}
+	int len = strlen (cmd);
+	int i;
+	for (i = 0; i < parent->n_subcmds; ++i) {
+		if (exact && len == parent->subcmds[i]->length && !strncmp (cmd, parent->subcmds[i]->cmd, len)) {
+			return parent->subcmds[i];
+		} else if (!exact && !strncmp (cmd, parent->subcmds[i]->cmd, len)) {
+			return parent->subcmds[i];
+		}
+	}
+	return NULL;
+}
+
+R_API bool r_core_autocomplete_remove(RCoreAutocomplete *parent, const char* cmd) {
+	if (!parent || !cmd) {
+		return false;
+	}
+	int i, j;
+	for (i = 0; i < parent->n_subcmds; i++) {
+		RCoreAutocomplete *ac = parent->subcmds[i];
+		if (ac->locked) {
+			continue;
+		}
+		// if (!strncmp (parent->subcmds[i]->cmd, cmd, parent->subcmds[i]->length)) {
+		if (r_str_glob (ac->cmd, cmd)) {
+			for (j = i + 1; j < parent->n_subcmds; ++j) {
+				parent->subcmds[j - 1] = parent->subcmds[j];
+				parent->subcmds[j] = NULL;
+			}
+			r_core_autocomplete_free (ac);
+			RCoreAutocomplete **updated = realloc (parent->subcmds, (parent->n_subcmds - 1) * sizeof (RCoreAutocomplete*));
+			if (!updated && (parent->n_subcmds - 1) > 0) {
+				eprintf ("Something really bad has happen.. this should never ever happen..\n");
+				return false;
+			}
+			parent->subcmds = updated;
+			parent->n_subcmds--;
+			i--;
+		}
+	}
+	return false;
+}
diff -Nru radare2-2.3.0+dfsg/libr/core/cundo.c radare2-2.8.0+dfsg/libr/core/cundo.c
--- radare2-2.3.0+dfsg/libr/core/cundo.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/cundo.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,73 @@
+/* radare2 - LGPL - Copyright 2018 - pancake */
+
+#include <r_core.h>
+
+#if 0
+
+TODO:
+
+- add more methods to "undo according to some conditions"
+- undo all comments in current offfset
+#endif
+
+R_API RCoreUndo *r_core_undo_new(ut64 offset, const char *action, const char *revert) {
+	RCoreUndo *cu = R_NEW (RCoreUndo);
+	cu->action = strdup (action);
+	cu->revert = strdup (revert);
+	cu->tstamp = r_sys_now ();
+	cu->offset = offset;
+	return cu;
+}
+
+R_API void *r_core_undo_free(RCoreUndo *cu) {
+	free (cu->action);
+	free (cu->revert);
+	free (cu);
+	return NULL;
+}
+
+R_API void r_core_undo_push(RCore *core, RCoreUndo *cu) {
+	r_list_append (core->undos, cu);
+}
+
+R_API void r_core_undo_pop(RCore *core) {
+	RCoreUndo *undo = r_list_pop (core->undos);
+	if (undo) {
+		r_core_cmd0 (core, undo->revert);
+		r_core_undo_free (undo);
+	}
+}
+
+R_API bool r_core_undo_condition(RCoreUndo *cu, RCoreUndoCondition *cond) {
+	if (!cond) {
+		return true;
+	}
+	bool mustPrint = false;
+	if (cond->addr != UT64_MAX) {
+		mustPrint = (cu->offset == cond->addr);
+	}
+	if (cond->minstamp) {
+		mustPrint = (cu->tstamp >= cond->minstamp);
+	}
+	if (cond->glob) {
+		mustPrint = r_str_glob (cu->action, cond->glob);
+	}
+	return mustPrint;
+}
+
+R_API void r_core_undo_print(RCore *core, int mode, RCoreUndoCondition *cond) {
+	RCoreUndo *cu;
+	RListIter *iter;
+	if (mode) {
+		r_list_foreach (core->undos, iter, cu) {
+			if (r_core_undo_condition (cu, cond)) {
+				r_cons_printf ("%s @ 0x%"PFMT64x"\n", cu->revert, cu->offset);
+			}
+		}
+	} else {
+		r_list_foreach (core->undos, iter, cu) {
+			r_cons_printf ("0x%08"PFMT64x" %"PFMT64d"  %s (revert: %s)\n",
+				cu->offset, cu->tstamp, cu->action, cu->revert);
+		}
+	}
+}
diff -Nru radare2-2.3.0+dfsg/libr/core/disasm.c radare2-2.8.0+dfsg/libr/core/disasm.c
--- radare2-2.3.0+dfsg/libr/core/disasm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/disasm.c	2018-08-07 14:12:36.000000000 +0000
@@ -12,6 +12,7 @@
 #define R_MIDFLAGS_SYMALIGN 3
 
 #define COLOR(ds, field) (ds->show_color ? ds->field : "")
+#define COLOR_ARG(ds, field) (ds->show_color && ds->show_color_args ? ds->field : "")
 #define COLOR_CONST(ds, color) (ds->show_color ? Color_ ## color : "")
 #define COLOR_RESET(ds) COLOR_CONST(ds, RESET)
 
@@ -51,7 +52,9 @@
 	"│", // LINE_VERT
 	"├", // LINE_CROSS
 	"─", // LINE_HORIZ
-	"↑", // LINE_UP
+	// "↑", // LINE_UP
+	"⋮", // LINE_UP
+	// "≀", // LINE_UP
 	//"┌", // LUP_CORNER
 	"╯", // LUP_CORNER
 	"╰", // RDWN_CORNER
@@ -61,6 +64,13 @@
 	"<", // ARROW_LEFT
 };
 
+
+#define DS_PRE_NONE         0
+#define DS_PRE_EMPTY        1
+#define DS_PRE_FCN_HEAD     2
+#define DS_PRE_FCN_MIDDLE   3
+#define DS_PRE_FCN_TAIL     4
+
 // TODO: what about using bit shifting and enum for keys? see libr/util/bitmap.c
 // the problem of this is that the fields will be more opaque to bindings, but we will earn some bits
 typedef struct {
@@ -71,6 +81,7 @@
 	bool use_esil;
 	bool show_color;
 	bool show_color_bytes;
+	bool show_color_args;
 	int colorop;
 	int acase;
 	bool capitalize;
@@ -86,6 +97,7 @@
 	bool jmpsub;
 	bool varsub;
 	bool show_lines;
+	bool show_lines_bb;
 	bool show_lines_ret;
 	bool show_lines_call;
 	int linesright;
@@ -96,17 +108,21 @@
 	bool show_dwarf;
 	bool show_size;
 	bool show_trace;
-	bool highlight;
 	bool show_family;
 	bool asm_describe;
 	int linesout;
 	int adistrick;
+	bool asm_meta;
 	int asm_demangle;
 	bool show_offset;
 	bool show_offdec; // dupe for r_print->flags
 	bool show_bbline;
 	bool show_emu;
+	bool pre_emu;
 	bool show_emu_str;
+	bool show_emu_stroff;
+	bool show_emu_strinv;
+	bool show_emu_strflag;
 	bool show_emu_stack;
 	bool show_emu_write;
 	bool show_section;
@@ -124,7 +140,7 @@
 	bool show_leahints;
 	bool show_slow;
 	int cmtcol;
-	bool show_fcnlines;
+	bool show_lines_fcn;
 	bool show_calls;
 	bool show_cmtflgrefs;
 	bool show_cycles;
@@ -134,7 +150,6 @@
 	bool show_cmtrefs;
 	const char *show_cmtoff;
 	bool show_functions;
-	bool show_fcncalls;
 	bool show_hints;
 	bool show_marks;
 	bool show_asciidot;
@@ -145,7 +160,7 @@
 	int show_flag_in_bytes;
 	int lbytes;
 	int show_comment_right;
-	char *pre;
+	int pre;
 	char *ocomment;
 	int linesopts;
 	int lastfail;
@@ -155,12 +170,13 @@
 	int show_utf8;
 	int lines;
 	int oplen;
-	bool show_varxs;
+	bool show_varaccess;
 	bool show_vars;
-	bool show_varsum;
+	int show_varsum;
 	int midflags;
 	bool midcursor;
 	bool show_noisy_comments;
+	ut64 asm_highlight;
 	const char *pal_comment;
 	const char *color_comment;
 	const char *color_usrcmt;
@@ -194,6 +210,10 @@
 	const char *color_gui_background;
 	const char *color_gui_alt_background;
 	const char *color_gui_border;
+	const char *color_linehl;
+	const char *color_func_var;
+	const char *color_func_var_type;
+	const char *color_func_var_addr;
 
 	RFlagItem *lastflag;
 	RAnalHint *hint;
@@ -222,9 +242,11 @@
 	RAsmOp asmop;
 	RAnalOp analop;
 	RAnalFunction *fcn;
+	RAnalFunction *pdf;
 	const ut8 *buf;
 	int len;
 	int maxrefs;
+	int foldxrefs;
 	char *prev_ins;
 	bool prev_ins_eq;
 	int prev_ins_count;
@@ -240,6 +262,9 @@
 	int cmtcount;
 	int shortcut_pos;
 	bool asm_anal;
+	ut64 printed_str_addr;
+	ut64 printed_flag_addr;
+	ut64 min_ref_addr;
 
 	bool use_json;
 	bool first_line;
@@ -249,16 +274,15 @@
 static void ds_setup_print_pre(RDisasmState *ds, bool tail, bool middle);
 static void ds_setup_pre(RDisasmState *ds, bool tail, bool middle);
 static void ds_print_pre(RDisasmState *ds);
-static void ds_beginline(RDisasmState *ds, RAnalFunction *f, bool nopre);
+static void ds_beginline(RDisasmState *ds);
 static void ds_begin_json_line(RDisasmState *ds);
 static void ds_newline(RDisasmState *ds);
 static void ds_print_esil_anal(RDisasmState *ds);
 static void ds_reflines_init(RDisasmState *ds);
 static void ds_align_comment(RDisasmState *ds);
 static RDisasmState * ds_init(RCore * core);
-static void ds_set_pre(RDisasmState *ds, const char * str);
-static void ds_build_op_str(RDisasmState *ds);
-static void ds_pre_xrefs(RDisasmState *ds);
+static void ds_build_op_str(RDisasmState *ds, bool print_color);
+static void ds_pre_xrefs(RDisasmState *ds, bool no_fcnlines);
 static void ds_show_xrefs(RDisasmState *ds);
 static void ds_atabs_option(RDisasmState *ds);
 static void ds_show_functions(RDisasmState *ds);
@@ -288,23 +312,22 @@
 static void ds_print_core_vmode(RDisasmState *ds, int pos);
 static void ds_print_dwarf(RDisasmState *ds);
 static void ds_print_asmop_payload(RDisasmState *ds, const ut8 *buf);
-static char *ds_esc_str(RDisasmState *ds, const char *str, int len, const char **prefix_out);
+static char *ds_esc_str(RDisasmState *ds, const char *str, int len, const char **prefix_out, bool is_comment);
 static void ds_print_comments_right(RDisasmState *ds);
 static void ds_print_ptr(RDisasmState *ds, int len, int idx);
 static void ds_print_str(RDisasmState *ds, const char *str, int len, ut64 refaddr);
 static char *ds_sub_jumps(RDisasmState *ds, char *str);
-
-static ut64 p2v(RDisasmState *ds, ut64 addr) {
-#if 0
-	if (ds->core->io->pava) {
-		ut64 at = r_io_section_get_vaddr (ds->core->io, addr);
-		if (at == UT64_MAX || (!at && ds->at)) {
-			addr = ds->at;
-		} else {
-			addr = at + addr;
+static void ds_start_line_highlight(RDisasmState *ds);
+static void ds_end_line_highlight(RDisasmState *ds);
+static bool line_highlighted(RDisasmState *ds);
+
+R_API ut64 r_core_pava (RCore *core, ut64 addr) {
+	if (core->pava) {
+		RIOMap *map = r_io_map_get_paddr (core->io, addr);
+		if (map) {
+			return addr - map->delta + map->itv.addr;
 		}
 	}
-#endif
 	return addr;
 }
 
@@ -386,9 +409,9 @@
 	// }
 	sn = ds->show_section ? get_section_name (ds->core, ds->at) : "";
 	ds_align_comment (ds);
-	r_cons_printf ("%s%s%s%s%s%s%s%s%s  %s %s", nl? "\n": "",
-			COLOR_RESET (ds),
-			COLOR (ds, color_fline), ds->pre, COLOR_RESET(ds), sn,
+	r_cons_print (COLOR_RESET (ds));
+	ds_print_pre (ds);
+	r_cons_printf ("%s%s%s%s%s  %s %s", nl? "\n": "", sn,
 			COLOR (ds, color_flow),ds->refline, COLOR_RESET (ds),
 			up? "": ".-", COLOR (ds, color_comment));
 #if 0
@@ -415,22 +438,33 @@
 #endif
 #endif
 }
-#define ALIGN _ds_comment_align_ (ds, true, false)
+#define _ALIGN _ds_comment_align_ (ds, true, false)
 
 static void ds_comment_lineup(RDisasmState *ds) {
-	_ds_comment_align_ (ds, true, false);
+	_ALIGN;
+}
+
+static void ds_begin_comment(RDisasmState *ds) {
+	if (ds->show_comment_right) {
+		_ALIGN;
+	} else {
+		if (ds->use_json) {
+			ds_begin_json_line (ds);
+		}
+		ds_pre_xrefs (ds, false);
+	}
 }
 
 static void ds_comment(RDisasmState *ds, bool align, const char *format, ...) {
 	va_list ap;
 	va_start (ap, format);
 
-	if (!ds->show_comment_right && align) {
-		ds_begin_json_line (ds);
-	}
-
-	if (ds->show_comments && ds->show_comment_right && align) {
-		ds_align_comment (ds);
+	if (ds->show_comments) {
+		if (ds->show_comment_right && align) {
+			ds_align_comment (ds);
+		} else if (!ds->use_json) {
+			r_cons_printf ("%s", COLOR (ds, color_comment));
+		}
 	}
 
 	if (!ds->use_json) {
@@ -438,7 +472,7 @@
 	} else {
 		char buffer[4096];
 		vsnprintf (buffer, sizeof(buffer), format, ap);
-		char *escstr = ds_esc_str (ds, (const char *)buffer, (int)strlen (buffer), NULL);
+		char *escstr = r_str_escape_latin1 (buffer, false, true, true);
 		if (escstr) {
 			r_cons_printf ("%s", escstr);
 			free (escstr);
@@ -468,6 +502,22 @@
 	}
 }
 
+static void ds_print_esil_anal_fini(RDisasmState *ds) {
+	RCore *core = ds->core;
+	if (ds->show_emu && ds->esil_regstate) {
+		RCore* core = ds->core;
+		core->anal->last_disasm_reg = r_reg_arena_peek (core->anal->reg);
+		const char *pc = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
+		r_reg_arena_poke (core->anal->reg, ds->esil_regstate);
+		r_reg_setv (core->anal->reg, pc, ds->esil_old_pc);
+		R_FREE (ds->esil_regstate);
+	}
+	if (core && core->anal && core->anal->esil) {
+		// make sure to remove reference to ds to avoid UAF
+		core->anal->esil->user = NULL;
+	}
+}
+
 static RDisasmState * ds_init(RCore *core) {
 	RDisasmState *ds = R_NEW0 (RDisasmState);
 	if (!ds) {
@@ -510,42 +560,54 @@
 	ds->color_gui_background = P(gui_background): Color_BLACK;
 	ds->color_gui_alt_background = P(gui_alt_background): Color_GRAY;
 	ds->color_gui_border = P(gui_border): Color_BGGRAY;
+	ds->color_linehl = P(linehl): Color_BGBLUE;
+	ds->color_func_var = P(func_var): Color_WHITE;
+	ds->color_func_var_type = P(func_var_type): Color_BLUE;
+	ds->color_func_var_addr = P(func_var_addr): Color_CYAN;
 
-	ds->immstr = r_config_get_i (core->config, "asm.immstr");
-	ds->immtrim = r_config_get_i (core->config, "asm.immtrim");
+	ds->immstr = r_config_get_i (core->config, "asm.imm.str");
+	ds->immtrim = r_config_get_i (core->config, "asm.imm.trim");
 	ds->use_esil = r_config_get_i (core->config, "asm.esil");
-	ds->show_flgoff = r_config_get_i (core->config, "asm.flgoff");
+	ds->pre_emu = r_config_get_i (core->config, "emu.pre");
+	ds->show_flgoff = r_config_get_i (core->config, "asm.flags.offset");
 	ds->show_nodup = r_config_get_i (core->config, "asm.nodup");
+	{
+		const char *ah = r_config_get (core->config, "asm.highlight");
+		ds->asm_highlight = (ah && *ah)? r_num_math (core->num, ah): UT64_MAX;
+	}
 	ds->asm_anal = r_config_get_i (core->config, "asm.anal");
 	ds->show_color = r_config_get_i (core->config, "scr.color");
 	ds->show_color_bytes = r_config_get_i (core->config, "scr.color.bytes"); // maybe rename to asm.color.bytes
+	ds->show_color_args = r_config_get_i (core->config, "scr.color.args");
 	ds->colorop = r_config_get_i (core->config, "scr.color.ops"); // XXX confusing name // asm.color.inst (mnemonic + operands) ?
 	ds->show_utf8 = r_config_get_i (core->config, "scr.utf8");
 	ds->acase = r_config_get_i (core->config, "asm.ucase");
 	ds->capitalize = r_config_get_i (core->config, "asm.capitalize");
 	ds->atabs = r_config_get_i (core->config, "asm.tabs");
-	ds->atabsonce = r_config_get_i (core->config, "asm.tabsonce");
-	ds->atabsoff = r_config_get_i (core->config, "asm.tabsoff");
-	ds->midflags = r_config_get_i (core->config, "asm.midflags");
+	ds->atabsonce = r_config_get_i (core->config, "asm.tabs.once");
+	ds->atabsoff = r_config_get_i (core->config, "asm.tabs.off");
+	ds->midflags = r_config_get_i (core->config, "asm.flags.middle");
 	ds->midcursor = r_config_get_i (core->config, "asm.midcursor");
 	ds->decode = r_config_get_i (core->config, "asm.decode");
-	ds->pseudo = r_config_get_i (core->config, "asm.pseudo");
+	core->parser->pseudo = ds->pseudo = r_config_get_i (core->config, "asm.pseudo");
 	if (ds->pseudo) {
 		ds->atabs = 0;
 	}
 	ds->filter = r_config_get_i (core->config, "asm.filter");
 	ds->interactive = r_config_get_i (core->config, "scr.interactive");
 	ds->jmpsub = r_config_get_i (core->config, "asm.jmpsub");
-	ds->varsub = r_config_get_i (core->config, "asm.varsub");
+	ds->varsub = r_config_get_i (core->config, "asm.var.sub");
 	core->parser->relsub = r_config_get_i (core->config, "asm.relsub");
-	core->parser->localvar_only = r_config_get_i (core->config, "asm.varsub_only");
+	core->parser->localvar_only = r_config_get_i (core->config, "asm.var.subonly");
 	core->parser->retleave_asm = NULL;
-	ds->show_vars = r_config_get_i (core->config, "asm.vars");
-	ds->show_varsum = r_config_get_i (core->config, "asm.varsum");
-	ds->show_varxs = r_config_get_i (core->config, "asm.varxs");
-	ds->maxrefs = r_config_get_i (core->config, "asm.maxrefs");
+	ds->show_vars = r_config_get_i (core->config, "asm.var");
+	ds->show_varsum = r_config_get_i (core->config, "asm.var.summary");
+	ds->show_varaccess = r_config_get_i (core->config, "asm.var.access");
+	ds->maxrefs = r_config_get_i (core->config, "asm.xrefs.max");
+	ds->foldxrefs = r_config_get_i (core->config, "asm.xrefs.fold");
 	ds->show_lines = r_config_get_i (core->config, "asm.lines");
-	ds->linesright = r_config_get_i (core->config, "asm.linesright");
+	ds->show_lines_bb = ds->show_lines ? r_config_get_i (core->config, "asm.lines.bb") : false;
+	ds->linesright = r_config_get_i (core->config, "asm.lines.right");
 	ds->show_indent = r_config_get_i (core->config, "asm.indent");
 	ds->indent_space = r_config_get_i (core->config, "asm.indentspace");
 	ds->tracespace = r_config_get_i (core->config, "asm.tracespace");
@@ -553,11 +615,11 @@
 	ds->show_dwarf = r_config_get_i (core->config, "asm.dwarf");
 	ds->dwarfFile = r_config_get_i (ds->core->config, "asm.dwarf.file");
 	ds->dwarfAbspath = r_config_get_i (ds->core->config, "asm.dwarf.abspath");
-	ds->show_lines_call = r_config_get_i (core->config, "asm.lines.call");
-	ds->show_lines_ret = r_config_get_i (core->config, "asm.lines.ret");
+	ds->show_lines_call = ds->show_lines ? r_config_get_i (core->config, "asm.lines.call") : false;
+	ds->show_lines_ret = ds->show_lines ? r_config_get_i (core->config, "asm.lines.ret") : false;
 	ds->show_size = r_config_get_i (core->config, "asm.size");
 	ds->show_trace = r_config_get_i (core->config, "asm.trace");
-	ds->linesout = r_config_get_i (core->config, "asm.linesout");
+	ds->linesout = r_config_get_i (core->config, "asm.lines.out");
 	ds->adistrick = r_config_get_i (core->config, "asm.middle"); // TODO: find better name
 	ds->asm_demangle = r_config_get_i (core->config, "asm.demangle");
 	ds->asm_describe = r_config_get_i (core->config, "asm.describe");
@@ -569,9 +631,12 @@
 	ds->show_symbols = r_config_get_i (core->config, "asm.symbol");
 	ds->show_symbols_col = r_config_get_i (core->config, "asm.symbol.col");
 	ds->show_emu = r_config_get_i (core->config, "asm.emu");
-	ds->show_emu_str = r_config_get_i (core->config, "asm.emustr");
-	ds->show_emu_write = r_config_get_i (core->config, "asm.emuwrite");
-	ds->show_emu_stack = r_config_get_i (core->config, "asm.emustack");
+	ds->show_emu_str = r_config_get_i (core->config, "emu.str");
+	ds->show_emu_stroff = r_config_get_i (core->config, "emu.stroff");
+	ds->show_emu_strinv = r_config_get_i (core->config, "emu.strinv");
+	ds->show_emu_strflag = r_config_get_i (core->config, "emu.strflag");
+	ds->show_emu_write = r_config_get_i (core->config, "emu.write");
+	ds->show_emu_stack = r_config_get_i (core->config, "emu.stack");
 	ds->stackFd = -1;
 	if (ds->show_emu_stack) {
 		// TODO: initialize fake stack in here
@@ -589,32 +654,32 @@
 		} else {
 			r_io_map_set_name (map, "fake.stack");
 		}
-eprintf ("Make fake stack\n");
 	}
+	ds->stackptr = core->anal->stackptr;
 	ds->show_offseg = r_config_get_i (core->config, "asm.segoff");
 	ds->show_flags = r_config_get_i (core->config, "asm.flags");
 	ds->show_bytes = r_config_get_i (core->config, "asm.bytes");
+	ds->asm_meta = r_config_get_i (core->config, "asm.meta");
 	ds->show_reloff = r_config_get_i (core->config, "asm.reloff");
 	ds->show_reloff_flags = r_config_get_i (core->config, "asm.reloff.flags");
-	ds->show_fcnlines = r_config_get_i (core->config, "asm.fcnlines");
+	ds->show_lines_fcn = ds->show_lines ? r_config_get_i (core->config, "asm.lines.fcn") : false;
 	ds->show_comments = r_config_get_i (core->config, "asm.comments");
 	ds->show_jmphints = r_config_get_i (core->config, "asm.jmphints");
 	ds->show_leahints = r_config_get_i (core->config, "asm.leahints");
 	ds->show_slow = r_config_get_i (core->config, "asm.slow");
 	ds->show_calls = r_config_get_i (core->config, "asm.calls");
 	ds->show_family = r_config_get_i (core->config, "asm.family");
-	ds->cmtcol = r_config_get_i (core->config, "asm.cmtcol");
-	ds->show_cmtflgrefs = r_config_get_i (core->config, "asm.cmtflgrefs");
+	ds->cmtcol = r_config_get_i (core->config, "asm.cmt.col");
+	ds->show_cmtflgrefs = r_config_get_i (core->config, "asm.cmt.flgrefs");
 	ds->show_cycles = r_config_get_i (core->config, "asm.cycles");
 	ds->show_stackptr = r_config_get_i (core->config, "asm.stackptr");
 	ds->show_xrefs = r_config_get_i (core->config, "asm.xrefs");
-	ds->show_cmtrefs = r_config_get_i (core->config, "asm.cmtrefs");
-	ds->cmtfold = r_config_get_i (core->config, "asm.cmtfold");
-	ds->show_cmtoff = r_config_get (core->config, "asm.cmtoff");
+	ds->show_cmtrefs = r_config_get_i (core->config, "asm.cmt.refs");
+	ds->cmtfold = r_config_get_i (core->config, "asm.cmt.fold");
+	ds->show_cmtoff = r_config_get (core->config, "asm.cmt.off");
 	ds->show_functions = r_config_get_i (core->config, "asm.functions");
-	ds->show_fcncalls = r_config_get_i (core->config, "asm.fcncalls");
 	ds->nbytes = r_config_get_i (core->config, "asm.nbytes");
-	ds->show_asciidot = r_config_get_i (core->config, "asm.asciidot");
+	ds->show_asciidot = !strcmp (core->print->strconv_mode, "asciidot");
 	const char *strenc_str = r_config_get (core->config, "asm.strenc");
 	if (!strcmp (strenc_str, "latin1")) {
 		ds->strenc = R_STRING_ENC_LATIN1;
@@ -632,18 +697,20 @@
 	ds->nb = 0;
 	ds->flagspace_ports = r_flag_space_get (core->flags, "ports");
 	ds->lbytes = r_config_get_i (core->config, "asm.lbytes");
-	ds->show_comment_right_default = r_config_get_i (core->config, "asm.cmtright");
+	ds->show_comment_right_default = r_config_get_i (core->config, "asm.cmt.right");
 	ds->show_comment_right = ds->show_comment_right_default;
-	ds->show_flag_in_bytes = r_config_get_i (core->config, "asm.flagsinbytes");
+	ds->show_flag_in_bytes = r_config_get_i (core->config, "asm.flags.inbytes");
 	ds->show_hints = r_config_get_i (core->config, "asm.hints");
 	ds->show_marks = r_config_get_i (core->config, "asm.marks");
 	ds->show_noisy_comments = r_config_get_i (core->config, "asm.noisy");
-	ds->pre = strdup ("  ");
+	ds->pre = DS_PRE_NONE;
 	ds->ocomment = NULL;
 	ds->linesopts = 0;
 	ds->lastfail = 0;
 	ds->ocols = 0;
 	ds->lcols = 0;
+	ds->printed_str_addr = UT64_MAX;
+	ds->printed_flag_addr = UT64_MAX;
 
 	ds->esil_old_pc = UT64_MAX;
 	ds->esil_regstate = NULL;
@@ -651,11 +718,12 @@
 
 	ds->showpayloads = r_config_get_i (ds->core->config, "asm.payloads");
 	ds->showrelocs = r_config_get_i (core->config, "bin.relocs");
+	ds->min_ref_addr = r_config_get_i (core->config, "asm.var.submin");
 
 	if (ds->show_flag_in_bytes) {
 		ds->show_flags = 0;
 	}
-	if (r_config_get_i (core->config, "asm.lineswide")) {
+	if (r_config_get_i (core->config, "asm.lines.wide")) {
 		ds->linesopts |= R_ANAL_REFLINE_TYPE_WIDE;
 	}
 	if (core->cons->vline) {
@@ -663,7 +731,7 @@
 			ds->linesopts |= R_ANAL_REFLINE_TYPE_UTF8;
 		}
 	}
-	if (ds->show_lines) {
+	if (ds->show_lines_bb) {
 		ds->ocols += 10; // XXX
 	}
 	if (ds->show_offset) {
@@ -690,7 +758,7 @@
 	} else {
 		ds->cursor = -1;
 	}
-	if (r_config_get_i (core->config, "asm.lineswide")) {
+	if (r_config_get_i (core->config, "asm.lines.wide")) {
 		ds->linesopts |= R_ANAL_REFLINE_TYPE_WIDE;
 	}
 	if (core->cons->vline) {
@@ -718,7 +786,7 @@
 
 	lastaddr = UT64_MAX;
 
-	if (ds->show_lines) {
+	if (ds->show_lines_bb) {
 		ds_reflines_fini (ds);
 		anal->reflines = r_anal_reflines_get (anal,
 			ds->addr, ds->buf, ds->len, ds->l,
@@ -736,7 +804,7 @@
 static void ds_reflines_fcn_init(RDisasmState *ds,  RAnalFunction *fcn, const ut8* buf) {
 	RCore *core = ds->core;
 	RAnal *anal = core->anal;
-	if (ds->show_lines) {
+	if (ds->show_lines_bb) {
 		// TODO: make anal->reflines implicit
 		free (anal->reflines); // TODO: leak
 		anal->reflines = r_anal_reflines_fcn_get (anal, fcn, -1, ds->linesout, ds->show_lines_call);
@@ -762,8 +830,10 @@
 	}
 	r_anal_op_fini (&ds->analop);
 	r_anal_hint_free (ds->hint);
+	ds_print_esil_anal_fini (ds);
+	ds_reflines_fini (ds);
+	ds_print_esil_anal_fini (ds);
 	free (ds->comment);
-	free (ds->pre);
 	free (ds->line);
 	free (ds->refline);
 	free (ds->refline2);
@@ -774,40 +844,30 @@
 	R_FREE (ds);
 }
 
-static void ds_set_pre(RDisasmState *ds, const char * str) {
-	if (!ds->show_fcnlines) {
-		if (ds->pre && !*ds->pre) {
-			return;
-		}
-		str = "";
-	}
-	free (ds->pre);
-	ds->pre = strdup (str);
-}
-
 /* XXX move to r_print */
-static char *colorize_asm_string(RCore *core, RDisasmState *ds) {
+static char *colorize_asm_string(RCore *core, RDisasmState *ds, bool print_color) {
 	char *spacer = NULL;
 	char *source = ds->opstr? ds->opstr: ds->asmop.buf_asm;
 	char *hlstr = r_meta_get_string (ds->core->anal, R_META_TYPE_HIGHLIGHT, ds->at);
-	bool partial_reset = hlstr ? (*hlstr?true:false):false;
+	bool partial_reset = line_highlighted (ds) ? true : ((hlstr && *hlstr) ? true : false);
+	RAnalFunction *f = ds->show_color_args ? fcnIn (ds, ds->vat, R_ANAL_FCN_TYPE_NULL) : NULL;
 
 	if (!ds->show_color || !ds->colorop) {
 		return strdup (source);
 	}
 
-	r_cons_strcat (r_print_color_op_type (core->print, ds->analop.type));
-
+	if (print_color) {
+		r_cons_strcat (r_print_color_op_type (core->print, ds->analop.type));
+	}
 	// workaround dummy colorizer in case of paired commands (tms320 & friends)
-
 	spacer = strstr (source, "||");
 	if (spacer) {
 		char *scol1, *s1 = r_str_ndup (source, spacer - source);
 		char *scol2, *s2 = strdup (spacer + 2);
 
-		scol1 = r_print_colorize_opcode (ds->core->print, s1, ds->color_reg, ds->color_num, partial_reset);
+		scol1 = r_print_colorize_opcode (ds->core->print, s1, ds->color_reg, ds->color_num, partial_reset, f ? f->addr : 0);
 		free (s1);
-		scol2 = r_print_colorize_opcode (ds->core->print, s2, ds->color_reg, ds->color_num, partial_reset);
+		scol2 = r_print_colorize_opcode (ds->core->print, s2, ds->color_reg, ds->color_num, partial_reset, f ? f->addr : 0);
 		free (s2);
 		if (!scol1) {
 			scol1 = strdup ("");
@@ -822,7 +882,8 @@
 		free (scol2);
 		return source;
 	}
-	return r_print_colorize_opcode (ds->core->print, source, ds->color_reg, ds->color_num, partial_reset);
+
+	return r_print_colorize_opcode (ds->core->print, source, ds->color_reg, ds->color_num, partial_reset, f ? f->addr : 0);
 }
 
 static bool ds_must_strip(RDisasmState *ds) {
@@ -837,11 +898,12 @@
 
 static void ds_highlight_word(RDisasmState * ds, char *word, char *color) {
 	char *source = ds->opstr? ds->opstr: ds->asmop.buf_asm;
-	char * asm_str = r_str_highlight (source, word, color);
-	ds->opstr = asm_str? asm_str:source;
+	const char *color_reset = line_highlighted (ds) ? ds->color_linehl : Color_RESET_BG;
+	char *asm_str = r_str_highlight (source, word, color, color_reset);
+	ds->opstr = asm_str? asm_str: source;
 }
 
-static void ds_build_op_str(RDisasmState *ds) {
+static void ds_build_op_str(RDisasmState *ds, bool print_color) {
 	RCore *core = ds->core;
 	if (!ds->opstr) {
 		ds->opstr = strdup (ds->asmop.buf_asm);
@@ -875,7 +937,7 @@
 			r_list_free (list);
 		}
 	}
-	char *asm_str = colorize_asm_string (core, ds);
+	char *asm_str = colorize_asm_string (core, ds, print_color);
 	asm_str = ds_sub_jumps (ds, asm_str);
 	if (ds->immtrim) {
 		r_parse_immtrim (ds->opstr);
@@ -972,13 +1034,13 @@
 	}
 	if (hint) {
 		/* arch */
-		if (hint->arch) {
+		if (hint->arch && !core->fixedarch) {
 			if (!hint_arch) {
 				hint_arch = strdup (r_config_get (core->config, "asm.arch"));
 			}
 			r_config_set (core->config, "asm.arch", hint->arch);
 		}
-		/* arch */
+		/* syntax */
 		if (hint->syntax) {
 			if (!hint_syntax) {
 				hint_syntax = strdup (r_config_get (core->config, "asm.syntax"));
@@ -986,25 +1048,15 @@
 			r_config_set (core->config, "asm.syntax", hint->syntax);
 		}
 		if (hint->high) {
+			/* TODO: do something here */
 		}
 	}
 	return hint;
 }
 
-static void ds_beginline(RDisasmState *ds, RAnalFunction *f, bool nopre) {
+static void ds_beginline(RDisasmState *ds) {
 	ds_setup_pre (ds, false, false);
-	const char *pre = ds->pre;
-	if (nopre) {
-		if (*pre == '/' || *pre == '\\') {
-			pre = "  ";
-		}
-	}
-	if (ds->show_functions && ds->show_fcnlines) {
-		if (*pre == '\\') {
-			ds_set_pre (ds, ds->core->cons->vline[LINE_VERT]);
-		}
-		ds_print_pre (ds);
-	}
+	ds_print_pre (ds);
 	char *tmp = ds->line;
 	ds->line = ds->refline2;
 	ds_print_lines_left (ds);
@@ -1030,14 +1082,10 @@
 	}
 }
 
-static void ds_pre_xrefs(RDisasmState *ds) {
-	RCore *core = ds->core;
-	if (ds->show_fcnlines) {
-		ds_setup_pre (ds, false, false);
-		if (*ds->pre != ' ') {
-			ds_set_pre (ds, core->cons->vline[LINE_VERT]);
-			ds->pre = r_str_append (ds->pre, " ");
-		}
+static void ds_pre_xrefs(RDisasmState *ds, bool no_fcnlines) {
+	ds_setup_pre (ds, false, false);
+	if (ds->pre != DS_PRE_NONE && ds->pre != DS_PRE_EMPTY) {
+		ds->pre = no_fcnlines ? DS_PRE_EMPTY : DS_PRE_FCN_MIDDLE;
 	}
 	ds_print_pre (ds);
 	char *tmp = ds->line;
@@ -1047,18 +1095,17 @@
 }
 
 static void ds_show_refs(RDisasmState *ds) {
-	RList *list;
 	RAnalRef *ref;
 	RListIter *iter;
 	RFlagItem *flagi, *flagat;
-	char *cmt;
 
 	if (!ds->show_cmtrefs) {
 		return;
 	}
-	list = r_anal_xrefs_get_from (ds->core->anal, ds->at);
+	RList *list = r_anal_xrefs_get_from (ds->core->anal, ds->at);
+
 	r_list_foreach (list, iter, ref) {
-		cmt = r_meta_get_string (ds->core->anal, R_META_TYPE_COMMENT, ref->addr);
+		char *cmt = r_meta_get_string (ds->core->anal, R_META_TYPE_COMMENT, ref->addr);
 		flagi = r_flag_get_i (ds->core->flags, ref->addr);
 		flagat = r_flag_get_at (ds->core->flags, ref->addr, false);
 		// ds_align_comment (ds);
@@ -1076,8 +1123,8 @@
 		if (ref->type & R_ANAL_REF_TYPE_CALL) {
 			RAnalOp aop;
 			ut8 buf[12];
-			r_core_read_at (ds->core, ref->at, buf, sizeof (buf));
-			r_anal_op (ds->core->anal, &aop, ref->at, buf, sizeof (buf));
+			r_io_read_at (ds->core->io, ref->at, buf, sizeof (buf));
+			r_anal_op (ds->core->anal, &aop, ref->at, buf, sizeof (buf), R_ANAL_OP_MASK_ALL);
 			if ((aop.type & R_ANAL_OP_TYPE_MASK) == R_ANAL_OP_TYPE_UCALL) {
 				RAnalFunction * fcn = r_anal_get_fcn_at (ds->core->anal,
 					ref->addr, R_ANAL_FCN_TYPE_NULL);
@@ -1091,11 +1138,12 @@
 		}
 		ds_print_color_reset (ds);
 	}
+	r_list_free (list);
 }
 
 static void ds_show_xrefs(RDisasmState *ds) {
 	RAnalRef *refi;
-	RListIter *iter;
+	RListIter *iter, *it;
 	RCore *core = ds->core;
 	bool demangle = r_config_get_i (core->config, "bin.demangle");
 	const char *lang = demangle ? r_config_get (core->config, "bin.lang") : NULL;
@@ -1105,24 +1153,24 @@
 		return;
 	}
 	/* show xrefs */
-	RList *xrefs = r_anal_xref_get (core->anal, ds->at);
+	RList *xrefs = r_anal_xrefs_get (core->anal, ds->at);
 	if (!xrefs) {
 		return;
 	}
-	if (ds->maxrefs < 1) {
-		ds_pre_xrefs (ds);
-		ds_comment (ds, false, "   %s; XREFS(%d)\n",
+	if (r_list_length (xrefs) > ds->maxrefs) {
+		ds_pre_xrefs (ds, false);
+		ds_comment (ds, false, "%s; XREFS(%d)\n",
 			ds->show_color? ds->pal_comment: "",
 			r_list_length (xrefs));
 		r_list_free (xrefs);
 		return;
-	}
-	if (r_list_length (xrefs) > ds->maxrefs) {
+	} else if (r_list_length (xrefs) > ds->foldxrefs) {
 		int cols = r_cons_get_size (NULL);
 		cols -= 15;
 		cols /= 23;
-		ds_pre_xrefs (ds);
-		ds_comment (ds, false, "   %s; XREFS: ", ds->show_color? ds->pal_comment: "");
+		cols = cols > 5 ? 5 : cols;
+		ds_pre_xrefs (ds, false);
+		ds_comment (ds, false, "%s; XREFS: ", ds->show_color? ds->pal_comment: "");
 		r_list_foreach (xrefs, iter, refi) {
 			ds_comment (ds, false, "%s 0x%08"PFMT64x"  ",
 				r_anal_xrefs_type_tostring (refi->type), refi->addr);
@@ -1130,8 +1178,8 @@
 				if (iter->n) {
 					ds_print_color_reset (ds);
 					ds_newline (ds);
-					ds_pre_xrefs (ds);
-					ds_comment (ds, false, "   %s; XREFS: ", ds->show_color? ds->pal_comment: "");
+					ds_pre_xrefs (ds, false);
+					ds_comment (ds, false, "%s; XREFS: ", ds->show_color? ds->pal_comment: "");
 				}
 				count = 0;
 			} else {
@@ -1144,15 +1192,36 @@
 		return;
 	}
 
+	RList *addrs = r_list_newf (free);
+	RAnalFunction *fun, *next_fun;
+	RFlagItem *f, *next_f;
 	r_list_foreach (xrefs, iter, refi) {
 		if (refi->at == ds->at) {
-			RAnalFunction *fun = fcnIn (ds, refi->addr, -1); //r_anal_get_fcn_in (core->anal, refi->addr, -1);
+			fun = fcnIn (ds, refi->addr, -1);
 			if (fun) {
+				if (iter != xrefs->tail) {
+					ut64 next_addr = ((RAnalRef *)(iter->n->data))->addr;
+					next_fun = r_anal_get_fcn_in (core->anal, next_addr, -1);
+					if (next_fun && next_fun->addr == fun->addr) {
+						r_list_append (addrs, r_num_dup (refi->addr));
+						continue;
+					}
+				}
 				name = strdup (fun->name);
+				r_list_append (addrs, r_num_dup (refi->addr));
 			} else {
-				RFlagItem *f = r_flag_get_at (core->flags, refi->addr, true);
+				f = r_flag_get_at (core->flags, refi->addr, true);
 				if (f) {
-					name = r_str_newf ("%s + %d", f->name, refi->addr - f->offset);
+					if (iter != xrefs->tail) {
+						ut64 next_addr = ((RAnalRef *)(iter->n->data))->addr;
+						next_f = r_flag_get_at (core->flags, next_addr, true);
+						if (next_f && f->offset == next_f->offset) {
+							r_list_append (addrs, r_num_dup (refi->addr - f->offset));
+							continue;
+						}
+					}
+					name = strdup (f->name);
+					r_list_append (addrs, r_num_dup (refi->addr - f->offset));
 				} else {
 					name = strdup ("unk");
 				}
@@ -1165,17 +1234,26 @@
 				}
 			}
 			ds_begin_json_line (ds);
-			ds_pre_xrefs (ds);
-			//those extra space to align
-			ds_comment (ds, false, "   %s; %s XREF from 0x%08"PFMT64x" (%s)%s",
-				COLOR (ds, pal_comment), r_anal_xrefs_type_tostring (refi->type),
-				refi->addr, name, COLOR_RESET (ds));
+			ds_pre_xrefs (ds, false);
+			char* plural = r_list_length (addrs) > 1 ? "S" : "";
+			char* plus = fun ? "" : "+";
+			ds_comment (ds, false, "%s; %s XREF%s from %s (",
+				COLOR (ds, pal_comment), r_anal_xrefs_type_tostring (refi->type), plural, name);
+			ut64 *addrptr;
+			r_list_foreach (addrs, it, addrptr) {
+				if (addrptr && *addrptr) {
+					ds_comment (ds, false, "%s%s0x%"PFMT64x, it == addrs->head ? "" : ", ", plus, *addrptr);
+				}
+			}
+			ds_comment (ds, false, ")%s", COLOR_RESET (ds));
 			ds_newline (ds);
+			r_list_purge (addrs);
 			R_FREE (name);
 		} else {
 			eprintf ("Corrupted database?\n");
 		}
 	}
+	r_list_free (addrs);
 	r_list_free (xrefs);
 }
 
@@ -1321,25 +1399,100 @@
 
 static void ds_show_functions_argvar(RDisasmState *ds, RAnalVar *var, const char *base, bool is_var, char sign) {
 	int delta = sign == '+' ? var->delta : -var->delta;
-	const char *arg_or_var = is_var ? "var" : "arg";
-	r_cons_printf ("%s %s %s @ %s%c0x%x", arg_or_var, var->type, var->name,
-		base, sign, delta);
+	const char *pfx = is_var ? "var" : "arg";
+	r_cons_printf ("%s%s %s%s%s%s %s@ %s%c0x%x", COLOR_ARG (ds, color_func_var), pfx,
+			COLOR_ARG (ds, color_func_var_type), var->type,
+			r_str_endswith (var->type, "*") ? "" : " ",
+			var->name, COLOR_ARG (ds, color_func_var_addr), base, sign, delta);
 }
 
-static void printVarSummary(RDisasmState *ds, RList *list, const char *name) {
+static void printVarSummary(RDisasmState *ds, RList *list) {
+	const char *numColor = ds->core->cons->pal.num;
 	RAnalVar *var;
 	RListIter *iter;
-	int vars = 0;
-	int args = 0;
+	int bp_vars = 0;
+	int sp_vars = 0;
+	int rg_vars = 0;
+	int bp_args = 0;
+	int sp_args = 0;
+	int rg_args = 0;
+	const char *bp_vars_color = COLOR_RESET (ds);
+	const char *sp_vars_color = COLOR_RESET (ds);
+	const char *rg_vars_color = COLOR_RESET (ds);
+	const char *bp_args_color = COLOR_RESET (ds);
+	const char *sp_args_color = COLOR_RESET (ds);
+	const char *rg_args_color = COLOR_RESET (ds);
 	r_list_foreach (list, iter, var) {
-		if (var->delta > 0) {
-			args++;
+		if (var->isarg) {
+			switch (var->kind) {
+			case 'b':
+				bp_args++;
+				break;
+			case 's':
+				sp_args++;
+				break;
+			case 'r':
+				rg_args++;
+				break;
+			}
 		} else {
-			vars++;
+			switch (var->kind) {
+			case 'b':
+				bp_vars++;
+				break;
+			case 's':
+				sp_vars++;
+				break;
+			case 'r':
+				rg_vars++;
+				break;
+			}
 		}
 	}
-	r_cons_printf ("%s%s%s", COLOR (ds, color_fline), ds->pre, COLOR_RESET (ds));
-	r_cons_printf ("%s: %d (vars %d, args %d)\n", name, vars + args, vars, args);
+	if (bp_vars) { bp_vars_color = numColor; }
+	if (sp_vars) { sp_vars_color = numColor; }
+	if (rg_vars) { rg_vars_color = numColor; }
+	if (bp_args) { bp_args_color = numColor; }
+	if (sp_args) { sp_args_color = numColor; }
+	if (rg_args) { rg_args_color = numColor; }
+	if (ds->show_varsum == 2) {
+		ds_begin_json_line (ds);
+		ds_print_pre (ds);
+		r_cons_printf ("vars: %s%d%s %s%d%s %s%d%s",
+				bp_vars_color, bp_vars, COLOR_RESET (ds),
+				sp_vars_color, sp_vars, COLOR_RESET (ds),
+				rg_vars_color, rg_vars, COLOR_RESET (ds));
+		ds_newline (ds);
+		ds_begin_json_line (ds);
+		ds_print_pre (ds);
+		r_cons_printf ("args: %s%d%s %s%d%s %s%d%s",
+				bp_args_color, bp_args, COLOR_RESET (ds),
+				sp_args_color, sp_args, COLOR_RESET (ds),
+				rg_args_color, rg_args, COLOR_RESET (ds));
+		ds_newline (ds);
+		return;
+	}
+	ds_begin_json_line (ds);
+	ds_print_pre (ds);
+	r_cons_printf ("bp: %s%d%s (vars %s%d%s, args %s%d%s)",
+			bp_args || bp_vars ? numColor : COLOR_RESET (ds), bp_args + bp_vars, COLOR_RESET (ds),
+			bp_vars_color, bp_vars, COLOR_RESET (ds),
+			bp_args_color, bp_args, COLOR_RESET (ds));
+	ds_newline (ds);
+	ds_begin_json_line (ds);
+	ds_print_pre (ds);
+	r_cons_printf ("sp: %s%d%s (vars %s%d%s, args %s%d%s)",
+			sp_args || sp_vars ? numColor : COLOR_RESET (ds), sp_args+sp_vars, COLOR_RESET (ds),
+			sp_vars_color, sp_vars, COLOR_RESET (ds),
+			sp_args_color, sp_args, COLOR_RESET (ds));
+	ds_newline (ds);
+	ds_begin_json_line (ds);
+	ds_print_pre (ds);
+	r_cons_printf ("rg: %s%d%s (vars %s%d%s, args %s%d%s)",
+			rg_args || rg_vars ? numColor : COLOR_RESET (ds), rg_args+rg_vars, COLOR_RESET (ds),
+			rg_vars_color, rg_vars, COLOR_RESET (ds),
+			rg_args_color, rg_args, COLOR_RESET (ds));
+	ds_newline (ds);
 }
 
 static void ds_show_functions(RDisasmState *ds) {
@@ -1376,7 +1529,6 @@
 		r_cons_printf ("%s%s%s %d", COLOR (ds, color_floc),
 			fcn_name, COLOR_RESET (ds), r_anal_fcn_size (f));
 	} else {
-		const char *space = ds->show_fcnlines ? " " : "";
 		const char *fcntype;
 		char cmt[32];
 		get_bits_comment (core, f, cmt, sizeof (cmt));
@@ -1399,23 +1551,17 @@
 			corner = 0;
 		}
 #endif
-		ds_set_pre (ds, core->cons->vline[CORNER_TL]);
+		//ds_set_pre (ds, core->cons->vline[CORNER_TL]);
+		if (ds->show_lines_fcn) {
+			ds->pre = DS_PRE_FCN_HEAD;
+		}
+		ds_print_pre (ds);
 		if (ds->show_flgoff) {
-			r_cons_printf ("%s%s", COLOR (ds, color_fline), ds->pre);
-			if (ds->show_fcnlines) {
-				r_cons_printf (" ");
-			}
 			ds_print_lines_left (ds);
 			ds_print_offset (ds);
-			r_cons_printf ("%s%s%s(%s) %s%s%s %d",
-					space, COLOR_RESET (ds), COLOR (ds, color_fname),
-					fcntype, fcn_name, cmt, COLOR_RESET (ds), tmp_get_realsize (f));
-		} else {
-			r_cons_printf ("%s%s%s%s%s(%s) %s%s%s %d",
-					COLOR (ds, color_fline), ds->pre,
-					space, COLOR_RESET (ds), COLOR (ds, color_fname),
-					fcntype, fcn_name, cmt, COLOR_RESET (ds), tmp_get_realsize (f));
 		}
+		r_cons_printf ("%s(%s) %s%s%s %d", COLOR (ds, color_fname),
+			fcntype, fcn_name, cmt, COLOR_RESET (ds), tmp_get_realsize (f));
 	}
 	ds_newline (ds);
 	if (sign) {
@@ -1424,21 +1570,16 @@
 		ds_newline (ds);
 	}
 	R_FREE (sign);
-	ds_set_pre (ds, core->cons->vline[LINE_VERT]);
-	if (ds->show_fcnlines) {
-		ds->pre = r_str_append (ds->pre, " ");
+	if (ds->show_lines_fcn) {
+		ds->pre = DS_PRE_FCN_MIDDLE;
 	}
 	ds->stackptr = core->anal->stackptr;
 	if (ds->show_vars && ds->show_varsum) {
-		RList *bp_vars = r_anal_var_list (core->anal, f, 'b');
-		RList *rg_vars = r_anal_var_list (core->anal, f, 'r');
-		RList *sp_vars = r_anal_var_list (core->anal, f, 's');
-		printVarSummary (ds, bp_vars, "bp");
-		printVarSummary (ds, sp_vars, "sp");
-		printVarSummary (ds, rg_vars, "rg");
-		r_list_free (bp_vars);
-		r_list_free (rg_vars);
-		r_list_free (sp_vars);
+		RList *vars = r_anal_var_list (core->anal, f, 'b');
+		r_list_join(vars, r_anal_var_list (core->anal, f, 'r'));
+		r_list_join(vars, r_anal_var_list (core->anal, f, 's'));
+		printVarSummary(ds, vars);
+		r_list_free (vars);
 	} else if (ds->show_vars) {
 		char spaces[32];
 		RAnalVar *var;
@@ -1451,8 +1592,9 @@
 		r_list_sort (sp_vars, (RListComparator)var_comparator);
 		if (call) {
 			ds_begin_json_line (ds);
-			r_cons_printf ("%s%s%s %s %s%s (",
-				COLOR (ds, color_fline), ds->pre,
+			r_cons_print (COLOR (ds, color_fline));
+			ds_print_pre (ds);
+			r_cons_printf ("%s %s %s%s (",
 				COLOR_RESET (ds), COLOR (ds, color_fname),
 				fcn_name, COLOR_RESET (ds));
 			bool comma = true;
@@ -1479,7 +1621,7 @@
 			}
 			comma = true;
 			r_list_foreach (sp_vars, iter, var) {
-				if (var->delta > f->maxstack) {
+				if (var->isarg) {
 					if ((arg_bp || !r_list_empty (regs)) && comma) {
 						comma = false;
 						r_cons_printf (", ");
@@ -1496,6 +1638,9 @@
 		r_list_join (args, sp_vars);
 		r_list_join (args, regs);
 		r_list_foreach (args, iter, var) {
+			if ((var->kind == 'r') && get_link_var (ds->core->anal, f->addr, var)) {
+				continue;
+			}
 			ds_begin_json_line (ds);
 			char *tmp;
 			int idx;
@@ -1517,7 +1662,7 @@
 				ds_print_offset (ds);
 				r_cons_printf ("     ");
 			}
-			r_cons_printf ("%s; ", COLOR (ds, color_other));
+			r_cons_printf ("%s; ", COLOR_ARG (ds, color_func_var));
 			switch (var->kind) {
 			case 'b': {
 				char sign = var->delta > 0 ? '+' : '-';
@@ -1532,12 +1677,14 @@
 					eprintf("Register not found");
 					break;
 				}
-				r_cons_printf ("reg %s %s @ %s",
-					var->type, var->name, i->name);
+				r_cons_printf ("%sarg %s%s%s%s %s@ %s", COLOR_ARG (ds, color_func_var),
+					COLOR_ARG (ds, color_func_var_type),
+					var->type, r_str_endswith (var->type, "*") ? "" : " ",
+					var->name, COLOR_ARG (ds, color_func_var_addr), i->name);
 				}
 				break;
 			case 's': {
-				bool is_var = var->delta < f->maxstack;
+				bool is_var = !var->isarg;
 				ds_show_functions_argvar (ds, var,
 					anal->reg->name[R_REG_NAME_SP],
 					is_var, '+');
@@ -1548,7 +1695,7 @@
 			if (comment) {
 				char *comment_esc = NULL;
 				if (ds->use_json) {
-					comment = comment_esc = ds_esc_str (ds, comment, (int)strlen (comment), NULL);
+					comment = comment_esc = ds_esc_str (ds, comment, (int)strlen (comment), NULL, true);
 				}
 
 				if (comment) {
@@ -1577,57 +1724,70 @@
 }
 
 static void ds_setup_pre(RDisasmState *ds, bool tail, bool middle) {
-	RCore *core = ds->core;
-	RAnalFunction *f;
-
 	ds->cmtcount = 0;
-	if (!ds->show_functions) {
+	if (!ds->show_functions || !ds->show_lines_fcn) {
+		ds->pre = DS_PRE_NONE;
 		return;
 	}
-	f = fcnIn (ds, ds->at, R_ANAL_FCN_TYPE_NULL);
+	ds->pre = DS_PRE_EMPTY;
+	RAnalFunction *f = fcnIn (ds, ds->at, R_ANAL_FCN_TYPE_NULL);
 	if (f) {
 		if (f->addr == ds->at) {
 			if (ds->analop.size == r_anal_fcn_size (f) && !middle) {
-				ds_set_pre (ds, core->cons->vline[CORNER_BL]);
+				ds->pre = DS_PRE_FCN_TAIL;
 			} else {
-				ds_set_pre (ds, core->cons->vline[LINE_VERT]);
+				ds->pre = DS_PRE_FCN_MIDDLE;
 			}
 		} else if (f->addr + r_anal_fcn_size (f) - ds->analop.size == ds->at) {
-			ds_set_pre (ds, core->cons->vline[CORNER_BL]);
+			ds->pre = DS_PRE_FCN_TAIL;
 		} else if (r_anal_fcn_is_in_offset (f, ds->at)) {
-			ds_set_pre (ds, core->cons->vline[LINE_VERT]);
-		}
-		if (ds->show_fcnlines) {
-			ds->pre = r_str_append (ds->pre, " ");
+			ds->pre = DS_PRE_FCN_MIDDLE;
 		}
 		if (tail) {
-			r_str_replace_char (ds->pre, '\\', ' ');
-			r_str_replace_char (ds->pre, '|', '\\');
+			if (ds->pre == DS_PRE_FCN_TAIL) {
+				ds->pre = DS_PRE_EMPTY;
+			}
+			if (ds->pre == DS_PRE_FCN_MIDDLE) {
+				ds->pre = DS_PRE_FCN_TAIL;
+			}
 		}
 	}
 }
 
 static void ds_print_pre(RDisasmState *ds) {
-	if (!ds->show_functions) {
+	RCore *core = ds->core;
+
+	const char *c = NULL;
+	switch(ds->pre) {
+	case DS_PRE_FCN_HEAD:
+		c = core->cons->vline[CORNER_TL];
+		break;
+	case DS_PRE_FCN_MIDDLE:
+		c = core->cons->vline[LINE_VERT];
+		break;
+	case DS_PRE_FCN_TAIL:
+		c = core->cons->vline[CORNER_BL];
+		break;
+	case DS_PRE_EMPTY:
+		r_cons_print ("  ");
+	case DS_PRE_NONE:
+	default:
 		return;
 	}
-	// f = r_anal_get_fcn_in (core->anal, ds->at, R_ANAL_FCN_TYPE_NULL);
-	RAnalFunction *f = fcnIn (ds, ds->at, R_ANAL_FCN_TYPE_NULL);
-	if (f) {
-		r_cons_printf ("%s%s%s", COLOR (ds, color_fline),
-			ds->pre, COLOR_RESET (ds));
-	} else {
-		if (ds->show_lines) {
-			r_cons_printf ("  ");
-		} else if (ds->show_fcnlines) {
-			r_cons_printf (" ");
-		}
+
+	char *c_esc = NULL;
+	if (ds->use_json) {
+		c = c_esc = r_str_escape (c);
 	}
+	r_cons_printf ("%s%s%s ",
+		COLOR (ds, color_fline), c,
+		COLOR_RESET (ds));
+	free (c_esc);
 }
 
-//XXX review this with asm.cmtright
+//XXX review this with asm.cmt.right
 static void ds_show_comments_right(RDisasmState *ds) {
-	int linelen, maxclen ;
+	int linelen;
 	RCore *core = ds->core;
 	RFlagItem *item;
 	/* show comment at right? */
@@ -1637,22 +1797,31 @@
 	}
 	//RAnalFunction *f = r_anal_get_fcn_in (core->anal, ds->at, R_ANAL_FCN_TYPE_NULL);
 	item = r_flag_get_i (core->flags, ds->at);
-	ds->comment = r_meta_get_string (core->anal, R_META_TYPE_COMMENT, ds->at);
-	if (!ds->comment && item && item->comment && *item->comment) {
-		ds->ocomment = item->comment;
-		ds->comment = strdup (item->comment);
+	char *comment = r_meta_get_string (core->anal, R_META_TYPE_COMMENT, ds->at);
+	char *vartype = r_meta_get_string (core->anal, R_META_TYPE_VARTYPE, ds->at);
+	if (!comment) {
+		if (vartype) {
+			ds->comment = r_str_newf ("%s; %s", COLOR_ARG (ds, color_func_var_type), vartype);
+			free (vartype);
+		} else if (item && item->comment && *item->comment) {
+			ds->ocomment = item->comment;
+			ds->comment = strdup (item->comment);
+		}
+	} else if (vartype) {
+		ds->comment = r_str_newf ("%s; %s %s%s; %s", COLOR_ARG (ds, color_func_var_type), vartype, Color_RESET, COLOR (ds, color_usrcmt), comment);
+		free (vartype);
+		free (comment);
+	} else {
+		ds->comment = r_str_newf ("%s; %s", COLOR_ARG (ds, color_usrcmt), comment);
 	}
-	if (!ds->comment) {
+	if (!ds->comment || !*ds->comment) {
 		return;
 	}
-	maxclen = strlen (ds->comment) + 5;
-	linelen = maxclen;
+	linelen = strlen (ds->comment) + 5;
 	if (ds->show_comment_right_default) {
-		if (ds->ocols + maxclen < core->cons->columns) {
-			if (ds->comment && *ds->comment && strlen (ds->comment) < maxclen) {
-				if (!strchr (ds->comment, '\n')) { // more than one line?
-					ds->show_comment_right = 1;
-				}
+		if (ds->ocols + linelen < core->cons->columns) {
+			if (!strchr (ds->comment, '\n')) { // more than one line?
+				ds->show_comment_right = 1;
 			}
 		}
 	}
@@ -1677,11 +1846,10 @@
 			}
 			free (p);
 		} else {
-			ds->comment = r_str_prefix_all (ds->comment, "; ");
 			if (ds->show_comment_right) {
-				ALIGN;
+				_ALIGN;
 			} else {
-				ds_pre_xrefs (ds);
+				ds_pre_xrefs (ds, false);
 			}
 			if (ds->show_color) {
 				r_cons_strcat (ds->color_usrcmt);
@@ -1712,6 +1880,15 @@
 	ds->show_comment_right = scr;
 }
 
+static int flagCmp(const void *a, const void *b) {
+	const RFlagItem *fa = a;
+	const RFlagItem *fb = b;
+	if (fa->realname && fb->realname) {
+		return !strcmp (fa->realname, fb->realname);
+	}
+	return !strcmp (fa->name, fb->name);
+}
+
 static void ds_show_flags(RDisasmState *ds) {
 	//const char *beginch;
 	RFlagItem *flag;
@@ -1723,40 +1900,47 @@
 	}
 	RCore *core = ds->core;
 	// f = r_anal_get_fcn_in (core->anal, ds->at, R_ANAL_FCN_TYPE_NULL);
+	char addr[64];
+	ut64 switch_addr;
+	int case_start = -1, case_prev = 0, case_current = 0;
 	f = fcnIn (ds, ds->at, R_ANAL_FCN_TYPE_NULL);
 	flaglist = r_flag_get_list (core->flags, ds->at);
-	r_list_foreach (flaglist, iter, flag) {
+	RList *uniqlist = r_list_uniq (flaglist, flagCmp);
+	r_list_foreach (uniqlist, iter, flag) {
 		if (f && f->addr == flag->offset && !strcmp (flag->name, f->name)) {
 			// do not show flags that have the same name as the function
 			continue;
 		}
-		ds_begin_json_line (ds);
-		if (ds->show_flgoff) {
-			if (f) {
-				ds_beginline (ds, f, false);
-			} else {
-	//			ds_print_lines_left (ds);
-				if (ds->show_fcnlines) {
-					r_cons_printf ("  ");
+		if (!strncmp (flag->name, "case.", 5)) {
+			sscanf (flag->name + 5, "%63[^.].%d", addr, &case_current);
+			ut64 saddr = r_num_math (core->num, addr);
+			if (case_start == -1) {
+				switch_addr = saddr;
+				case_prev = case_current;
+				case_start = case_current;
+				if (iter != uniqlist->tail) {
+					continue;
 				}
 			}
+			if (case_current == case_prev + 1 && switch_addr == saddr) {
+				case_prev = case_current;
+				continue;
+			}
+		}
+		ds_begin_json_line (ds);
+
+		if (ds->show_flgoff) {
+			ds_beginline (ds);
 			ds_print_offset (ds);
 			r_cons_printf (" ");
 		} else {
-			bool fl = ds->show_fcnlines;
-			if (f && f->addr == ds->at) {
-				ds->show_fcnlines = false;
-				ds_pre_xrefs (ds);
-				ds->show_fcnlines = fl;
-			} else {
-				ds_pre_xrefs (ds);
-			}
-			r_cons_printf (";-- ");
+			ds_pre_xrefs (ds, false);
 		}
+
 		if (ds->show_color) {
 			bool hasColor = false;
 			if (flag->color) {
-				char *color = r_cons_pal_parse (flag->color);
+				char *color = r_cons_pal_parse (flag->color, NULL);
 				if (color) {
 					r_cons_strcat (color);
 					free (color);
@@ -1768,11 +1952,41 @@
 				r_cons_strcat (ds->color_flag);
 			}
 		}
+
+		if (!ds->show_flgoff) {
+			r_cons_printf (";-- ");
+		}
+
 		if (ds->asm_demangle && flag->realname) {
-			const char *lang = r_config_get (core->config, "bin.lang");
-			char *name = r_bin_demangle (core->bin->cur, lang, flag->realname, flag->offset);
-			r_cons_printf ("%s:", name? name: flag->realname);
-			R_FREE (name);
+			if (!strncmp (flag->name, "case.", 5)) {
+				if (!strncmp (flag->name + 5, "default", 7)) {
+					r_cons_printf ("%s:", flag->name);
+				} else if (case_prev != case_start) {
+					r_cons_printf ("cases %d...%d (%s):", case_start, case_prev, addr);
+					if (iter != uniqlist->head) {
+						iter = iter->p;
+					}
+					case_start = case_current;
+				} else {
+					r_cons_printf ("case %d (%s):", case_prev, addr);
+					case_start = -1;
+				}
+				case_prev = case_current;
+			} else {
+				const char *lang = r_config_get (core->config, "bin.lang");
+				char *name = r_bin_demangle (core->bin->cur, lang, flag->realname, flag->offset);
+				if (name || !ds->use_json) {
+					r_cons_print (name ? name : flag->realname);
+				} else {
+					char *name_out = r_str_escape (flag->realname);
+					if (name_out) {
+						r_cons_print (name_out);
+						free (name_out);
+					}
+				}
+				r_cons_print (":");
+				R_FREE (name);
+			}
 		} else {
 			r_cons_printf ("%s:", flag->name);
 		}
@@ -1781,19 +1995,12 @@
 		}
 		ds_newline (ds);
 	}
+	r_list_free (uniqlist);
 }
 
 static void ds_update_ref_lines(RDisasmState *ds) {
-	if (ds->show_lines) {
+	if (ds->show_lines_bb) {
 		ds->line = r_anal_reflines_str (ds->core, ds->at, ds->linesopts);
-		{
-			const char *col = ds->show_utf8? r_vline_u[LINE_UP] : r_vline_a[LINE_UP];
-			char *newstr = ds->show_color
-				? r_str_newf ("%s%s%s", ds->color_flow, col, ds->color_flow)
-				: strdup (col);
-			ds->line = r_str_replace (ds->line, r_vline_a[LINE_UP], newstr, true);
-			free (newstr);
-		}
 		free (ds->refline);
 		ds->refline = ds->line? strdup (ds->line): NULL;
 		free (ds->refline2);
@@ -1859,6 +2066,66 @@
 	if (ds->asmop.size < 1) {
 		ds->asmop.size = 1;
 	}
+	// handle meta here //
+	if (!ds->asm_meta) {
+		int i = 0;
+		// TODO: do in range
+#if 0
+		RAnalMetaItem *meta = r_meta_find (core->anal, ds->at,
+				R_META_TYPE_ANY, R_META_WHERE_HERE);
+#else
+		RAnalMetaItem *meta = r_meta_find_in (core->anal, ds->at,
+				R_META_TYPE_ANY, R_META_WHERE_HERE);
+#endif
+		if (meta && meta->size > 0) {
+			// XXX this is just noise. should be rewritten
+			switch (meta->type) {
+			case R_META_TYPE_DATA:
+				if (meta->str) {
+					r_cons_printf (".data: %s\n", meta->str);
+				}
+				i += meta->size;
+				// continue;
+				break;
+			case R_META_TYPE_STRING:
+				i += meta->size;
+				// continue;
+				break;
+			case R_META_TYPE_FORMAT:
+				r_cons_printf (".format : %s\n", meta->str);
+				i += meta->size;
+				// continue;
+				break;
+			case R_META_TYPE_MAGIC:
+				r_cons_printf (".magic : %s\n", meta->str);
+				i += meta->size;
+				break;
+			case R_META_TYPE_RUN:
+				r_core_cmd0 (core, meta->str);
+				break;
+			}
+			int sz = R_MIN (16, meta->size - (ds->at - meta->from));
+			ds->asmop.size = sz;
+			r_hex_bin2str (buf, sz, ds->asmop.buf_hex);
+			switch (meta->type) {
+			case R_META_TYPE_STRING:
+				snprintf (ds->asmop.buf_asm, sizeof (ds->asmop.buf_asm) - 11,
+					".string \"%s\"", meta->str);
+				break;
+			// case R_META_TYPE_DATA:
+			//	break;
+			default:
+				snprintf (ds->asmop.buf_asm, sizeof (ds->asmop.buf_asm),
+				          ".hex %.*s", (int)sizeof (ds->asmop.buf_asm) - 6, ds->asmop.buf_hex);
+				break;
+			}
+			ds->asmop.buf_asm[sizeof (ds->asmop.buf_asm) - 1] = 0;
+			// strcpy (ds->asmop.buf_hex, "0102030405060708");
+			//return i;
+			ds->oplen = sz; //ds->asmop.size;
+			return i;
+		}
+	}
 
 	if (ds->show_nodup) {
 		const char *opname = (ret < 1)? "invalid": ds->asmop.buf_asm;
@@ -1951,7 +2218,7 @@
 }
 
 static void ds_print_lines_right(RDisasmState *ds){
-	if (ds->linesright && ds->show_lines && ds->line) {
+	if (ds->linesright && ds->show_lines_bb && ds->line) {
 		r_cons_printf ("%s%s%s", COLOR (ds, color_flow), ds->line, COLOR_RESET (ds));
 	}
 }
@@ -2025,7 +2292,7 @@
 	}
 	if (ds->line) {
 		if (ds->show_color) {
-			if (!ds->linesright && ds->show_lines) {
+			if (!ds->linesright && ds->show_lines_bb) {
 				r_cons_printf ("%s%s%s", COLOR (ds, color_flow), ds->line, COLOR_RESET (ds));
 			}
 		} else {
@@ -2058,6 +2325,32 @@
 	}
 }
 
+static void ds_update_stackptr(RDisasmState *ds, RAnalOp *op) {
+	//ds->stackptr = ds->core->anal->stackptr;
+	ds->ostackptr = ds->stackptr;
+	switch (op->stackop) {
+	case R_ANAL_STACK_RESET:
+		ds->stackptr = 0;
+		break;
+	case R_ANAL_STACK_SET:
+		ds->stackptr = op->stackptr;
+		break;
+	case R_ANAL_STACK_INC:
+		ds->stackptr += op->stackptr;
+		break;
+	default:
+		/* nothing to do here */
+		break;
+	}
+	/* XXX if we reset the stackptr 'ret 0x4' has not effect.
+	 * Use RAnalFunction->RAnalOp->stackptr? */
+	if (op->type == R_ANAL_OP_TYPE_RET) {
+		ds->stackptr = 0;
+	}
+//	ds->ostackptr = ds->stackptr;
+	//ds->core->anal->stackptr = ds->stackptr;
+}
+
 static void ds_print_stackptr(RDisasmState *ds) {
 	if (ds->show_stackptr) {
 		r_cons_printf ("%5d%s", ds->stackptr,
@@ -2065,20 +2358,7 @@
 			ds->analop.stackop == R_ANAL_STACK_ALIGN? "=":
 			ds->stackptr > ds->ostackptr? "+":
 			ds->stackptr < ds->ostackptr? "-": " ");
-		ds->ostackptr = ds->stackptr;
-		switch (ds->analop.stackop) {
-		case R_ANAL_STACK_RESET:
-			ds->stackptr = 0;
-			break;
-		case R_ANAL_STACK_INC:
-			ds->stackptr += ds->analop.stackptr;
-			break;
-		}
-		/* XXX if we reset the stackptr 'ret 0x4' has not effect.
-		 * Use RAnalFunction->RAnalOp->stackptr? */
-		if (ds->analop.type == R_ANAL_OP_TYPE_RET) {
-			ds->stackptr = 0;
-		}
+		ds_update_stackptr (ds, &ds->analop);
 	}
 }
 
@@ -2094,7 +2374,7 @@
 		if (ds->at >= f->offset && ds->at < f->offset + f->size) {
 		//	if (r_itv_inrange (f->itv, ds->at))
 			if (color && *color) {
-				char *k = r_cons_pal_parse (f->color);
+				char *k = r_cons_pal_parse (f->color, NULL);
 				if (k) {
 					r_cons_printf ("%s", k);
 					hasCustomColor = true;
@@ -2110,6 +2390,8 @@
 		RFlagItem *fi;
 		int delta = -1;
 		bool show_trace = false;
+		unsigned int seggrn = r_config_get_i (core->config, "asm.seggrn");
+
 		if (ds->show_reloff) {
 			RAnalFunction *f = r_anal_get_fcn_at (core->anal, at, R_ANAL_FCN_TYPE_NULL);
 			if (!f) {
@@ -2156,13 +2438,13 @@
 		if (hasCustomColor) {
 			int of = core->print->flags;
 			core->print->flags = 0;
-			r_print_offset (core->print, at, (at == ds->dest) || show_trace,
-					ds->show_offseg, ds->show_offdec, delta, label);
+			r_print_offset_sg (core->print, at, (at == ds->dest) || show_trace,
+					ds->show_offseg, seggrn, ds->show_offdec, delta, label);
 			core->print->flags = of;
 			r_cons_strcat (Color_RESET);
 		} else {
-			r_print_offset (core->print, at, (at == ds->dest) || show_trace,
-					ds->show_offseg, ds->show_offdec, delta, label);
+			r_print_offset_sg (core->print, at, (at == ds->dest) || show_trace,
+					ds->show_offseg, seggrn, ds->show_offdec, delta, label);
 		}
 	}
 	if (ds->atabsoff > 0) {
@@ -2249,6 +2531,7 @@
 		}
 	}
 
+	r_cons_strcat (ds->color_mov);
 	switch (ib) {
 	case 1:
 		r_str_bits (msg, buf, size * 8, NULL);
@@ -2292,11 +2575,13 @@
 				}
 			}
 		}
-		const RList *flags = r_flag_get_list (core->flags, n);
-		RListIter *iter;
-		RFlagItem *fi;
-		r_list_foreach (flags, iter, fi) {
-			r_cons_printf (" ; %s", fi->name);
+		if (n >= ds->min_ref_addr) {
+			const RList *flags = r_flag_get_list (core->flags, n);
+			RListIter *iter;
+			RFlagItem *fi;
+			r_list_foreach (flags, iter, fi) {
+				r_cons_printf (" ; %s", fi->name);
+			}
 		}
 	}
 	return true;
@@ -2309,6 +2594,9 @@
 	RAnalMetaItem MI, *mi = &MI;
 	RCore *core = ds->core;
 	Sdb *s = core->anal->sdb_meta;
+	if (!ds->asm_meta) {
+		return 0;
+	}
 
 	snprintf (key, sizeof (key), "meta.0x%" PFMT64x, ds->at);
 	infos = sdb_const_get (s, key, 0);
@@ -2346,7 +2634,7 @@
 						esc_bslash = false;
 						/* fallthrough */
 					default:
-						out = r_str_escape_latin1 (mi->str, false, esc_bslash);
+						out = r_str_escape_latin1 (mi->str, false, esc_bslash, false);
 					}
 					if (!out) {
 						break;
@@ -2440,7 +2728,7 @@
 	case R_ANAL_OP_TYPE_CMOV:
 	case R_ANAL_OP_TYPE_MOV:
 		src = ds->analop.src[0];
-		if (src && src->memref>0 && src->reg && core->anal->reg) {
+		if (src && src->memref > 0 && src->reg && core->anal->reg) {
 			const char *pc = core->anal->reg->name[R_REG_NAME_PC];
 			RAnalValue *dst = ds->analop.dst;
 			if (dst && dst->reg && dst->reg->name) {
@@ -2449,7 +2737,7 @@
 					ut8 b[8];
 					ut64 ptr = addrbytes * idx + ds->addr + src->delta + ds->analop.size;
 					ut64 off = 0LL;
-					r_core_read_at (core, ptr, b, src->memref);
+					r_io_read_at (core->io, ptr, b, src->memref);
 					off = r_mem_get_num (b, src->memref);
 					item = r_flag_get_i (core->flags, off);
 					//TODO: introduce env for this print?
@@ -2457,7 +2745,7 @@
 							dst->reg->name, ptr, off, item?item->name: "");
 					if (ds->asm_anal) {
 						if (r_io_is_valid_offset (core->io, off, 0)) {
-							r_anal_ref_add (core->anal, ds->addr, off, 'd');
+							r_anal_xrefs_set (core->anal, off, ds->addr, R_ANAL_REF_TYPE_DATA);
 						}
 					}
 				}
@@ -2477,23 +2765,19 @@
 				ut8 b[64];
 				ut64 ptr = index + ds->addr + src->delta + ds->analop.size;
 				ut64 off = 0LL;
-				r_core_read_at (core, ptr, b, sizeof (b)); //memref);
+				r_io_read_at (core->io, ptr, b, sizeof (b)); //memref);
 				off = r_mem_get_num (b, memref);
 				item = r_flag_get_i (core->flags, off);
 				if (ds->show_leahints) {
 					char s[64];
 					r_str_ncpy (s, (const char *)b, sizeof (s));
 					r_str_filter (s, -1);
-					if (ds->show_comment_right) {
-						ALIGN;
-					} else {
-						ds_pre_xrefs (ds);
-					}
+					ds_begin_comment (ds);
 					ds_comment (ds, true, "; LEA %s = [0x%"PFMT64x"] = 0x%"PFMT64x" \"%s\"",
 					            dst->reg->name, ptr, off, item?item->name: s);
 					if (ds->asm_anal) {
 						if (r_io_is_valid_offset (core->io, off, 0)) {
-							r_anal_ref_add (core->anal, ds->addr, ptr, 'd');
+							r_anal_xrefs_set (core->anal, ptr, ds->addr, R_ANAL_REF_TYPE_DATA);
 						}
 					}
 				}
@@ -2578,7 +2862,7 @@
 	if (flagstr) {
 		str = flagstr;
 		if (ds->nb > 0) {
-			k = ds->nb-strlen (flagstr) - 1;
+			k = ds->nb - strlen (flagstr) - 1;
 			if (k < 0 || k > sizeof(pad)) k = 0;
 			for (j = 0; j < k; j++) {
 				pad[j] = ' ';
@@ -2659,11 +2943,11 @@
 static void ds_print_opstr(RDisasmState *ds) {
 	ds_print_indent (ds);
 	if (ds->use_json) {
-		char *escaped_str = r_str_escape(ds->opstr);
+		char *escaped_str = r_str_escape (ds->opstr);
 		if (escaped_str) {
-			r_cons_strcat(escaped_str);
+			r_cons_strcat (escaped_str);
 		}
-		free(escaped_str);
+		free (escaped_str);
 	} else {
 		r_cons_strcat (ds->opstr);
 	}
@@ -2751,7 +3035,7 @@
 			RSyscall *sc = core->anal->syscall;
 			const char *ioname = r_syscall_get_io (sc, imm);
 			if (ioname && *ioname) {
-				ALIGN;
+				_ALIGN;
 				ds_comment (ds, true, "; IO %s", ioname);
 				ds->has_description = true;
 			}
@@ -2766,7 +3050,7 @@
 			const int imm = (int)ds->analop.ptr;
 			const char *sr = r_syscall_sysreg (core->anal->syscall, "reg", imm);
 			if (sr) {
-				ALIGN;
+				_ALIGN;
 				ds_comment (ds, true, "; REG %s - %s", sr, "");
 				// TODO: add register description description
 				ds->has_description = true;
@@ -2795,13 +3079,16 @@
 			// print label
 			delta = ds->analop.jump - f->addr;
 			label = r_anal_fcn_label_at (core->anal, f, ds->analop.jump);
+			if (!ds->show_comment_right) {
+				ds_begin_json_line (ds);
+			}
 			if (label) {
-				ALIGN;
+				_ALIGN;
 				ds_comment (ds, true, "; %s.%s", f->name, label);
 			} else {
 				RAnalFunction *f2 = fcnIn (ds, ds->at, 0); //r_anal_get_fcn_in (core->anal, ds->at, 0);
 				if (f != f2) {
-					ALIGN;
+					_ALIGN;
 					if (delta > 0) {
 						ds_comment (ds, true, "; %s+0x%x", f->name, delta);
 					} else if (delta < 0) {
@@ -2840,7 +3127,39 @@
 		r_cons_printf ("%s[?]", ch);
 	}
 	if (ds->show_color) {
-		r_cons_strcat (Color_RESET);
+		if (ds->core->print->resetbg) {
+			r_cons_strcat (Color_RESET);
+		} else {
+			r_cons_strcat (Color_RESET_NOBG);
+		}
+	}
+}
+
+static bool ds_print_core_vmode_jump_hit(RDisasmState *ds, int pos) {
+	RCore *core = ds->core;
+	RAnal *a = core->anal;
+	RAnalHint *hint = r_anal_hint_get (a, ds->at);
+
+	if (hint) {
+		if (hint->jump != UT64_MAX) {
+			ds_print_shortcut (ds, hint->jump, pos);
+			r_anal_hint_free (hint);
+			return true;
+		}
+		r_anal_hint_free (hint);
+	}
+	return false;
+}
+
+static void getPtr(RDisasmState *ds, ut64 addr, int pos) {
+	ut8 buf[sizeof(ut64)] = {0};
+	r_io_read_at (ds->core->io, addr, buf, sizeof (buf));
+	if (ds->core->assembler->bits == 64) {
+		ut64 n64 = r_read_ble64 (buf, 0);
+		ds_print_shortcut (ds, n64, pos);
+	} else {
+		ut32 n32 = r_read_ble32 (buf, 0);
+		ds_print_shortcut (ds, n32, pos);
 	}
 }
 
@@ -2848,53 +3167,73 @@
 	RCore *core = ds->core;
 	bool gotShortcut = false;
 
-	if (!ds->show_jmphints) {
+	if (!core->vmode) {
 		return;
 	}
-	if (core->vmode) {
-		switch (ds->analop.type) {
-		case R_ANAL_OP_TYPE_LEA:
-			if (ds->show_leahints) {
+	switch (ds->analop.type) {
+	case R_ANAL_OP_TYPE_UJMP:
+	case R_ANAL_OP_TYPE_UJMP | R_ANAL_OP_TYPE_IND:
+	case R_ANAL_OP_TYPE_UJMP | R_ANAL_OP_TYPE_IND | R_ANAL_OP_TYPE_COND:
+	case R_ANAL_OP_TYPE_UJMP | R_ANAL_OP_TYPE_IND | R_ANAL_OP_TYPE_REG:
+		if (ds->show_leahints) {
+			getPtr (ds, ds->analop.ptr, pos);
+			gotShortcut = true;
+		}
+		break;
+	case R_ANAL_OP_TYPE_MOV:
+	case R_ANAL_OP_TYPE_LEA:
+	case R_ANAL_OP_TYPE_LOAD:
+		if (ds->show_leahints) {
+			if (ds->analop.ptr != UT64_MAX && ds->analop.ptr > 256) {
 				ds_print_shortcut (ds, ds->analop.ptr, pos);
 				gotShortcut = true;
 			}
-			break;
-		case R_ANAL_OP_TYPE_UCALL:
-		case R_ANAL_OP_TYPE_UCALL | R_ANAL_OP_TYPE_REG | R_ANAL_OP_TYPE_IND:
-		case R_ANAL_OP_TYPE_UCALL | R_ANAL_OP_TYPE_IND:
+		}
+		break;
+	case R_ANAL_OP_TYPE_UCALL:
+	case R_ANAL_OP_TYPE_UCALL | R_ANAL_OP_TYPE_REG | R_ANAL_OP_TYPE_IND:
+	case R_ANAL_OP_TYPE_UCALL | R_ANAL_OP_TYPE_IND:
 #if 0
-			if (ds->analop.jump == 0 && ds->analop.ptr) {
-				ut8 buf[sizeof(ut64)] = {0};
-				r_io_read_at (core->io, ds->analop.ptr, buf, sizeof (buf));
-				ut32 n32 = r_read_ble32 (buf, 0);
-				// is valid address
-				// ut32 n64 = r_read_ble32 (buf, 0);
-				ds_print_shortcut (ds, n32, pos);
-			} else {
-				// ds_print_shortcut (ds, ds->analop.jump, pos);
-				ds_print_shortcut (ds, ds->analop.ptr, pos);
-			}
+		if (ds->analop.jump == 0 && ds->analop.ptr) {
+			ut8 buf[sizeof(ut64)] = {0};
+			r_io_read_at (core->io, ds->analop.ptr, buf, sizeof (buf));
+			ut32 n32 = r_read_ble32 (buf, 0);
+			// is valid address
+			// ut32 n64 = r_read_ble32 (buf, 0);
+			ds_print_shortcut (ds, n32, pos);
+		} else {
+			// ds_print_shortcut (ds, ds->analop.jump, pos);
+			ds_print_shortcut (ds, ds->analop.ptr, pos);
+		}
 #endif
+		if (ds->show_jmphints) {
 			if (ds->analop.jump != UT64_MAX) {
 				ds_print_shortcut (ds, ds->analop.jump, pos);
 			} else {
 				ds_print_shortcut (ds, ds->analop.ptr, pos);
 			}
 			gotShortcut = true;
-			break;
-		case R_ANAL_OP_TYPE_RCALL:
-			break;
-		case R_ANAL_OP_TYPE_JMP:
-		case R_ANAL_OP_TYPE_CJMP:
-		case R_ANAL_OP_TYPE_CALL:
-		case R_ANAL_OP_TYPE_COND | R_ANAL_OP_TYPE_CALL:
+		}
+		break;
+	case R_ANAL_OP_TYPE_RCALL:
+		break;
+	case R_ANAL_OP_TYPE_JMP:
+	case R_ANAL_OP_TYPE_CJMP:
+	case R_ANAL_OP_TYPE_CALL:
+	case R_ANAL_OP_TYPE_COND | R_ANAL_OP_TYPE_CALL:
+		if (ds->show_jmphints) {
 			ds_print_shortcut (ds, ds->analop.jump, pos);
 			gotShortcut = true;
-			break;
 		}
-		if (!gotShortcut) {
-			r_cons_strcat ("   ");
+		break;
+	default:
+		if (ds_print_core_vmode_jump_hit (ds, pos)) {
+			gotShortcut = true;
 		}
+		break;
+	}
+	if (!gotShortcut) {
+		r_cons_strcat ("   ");
 	}
 }
 
@@ -2902,16 +3241,22 @@
 static void ds_align_comment(RDisasmState *ds) {
 	if (ds->show_comment_right_default) {
 		const int cmtcol = ds->cmtcol - 1;
-		int cstrlen = 0;
-		char *ll = r_cons_lastline (&cstrlen);
+		int cells = 0;
+		const char *ll = r_cons_lastline_utf8_ansi_len (&cells);
+		if (ds->use_json) {
+			// for json thats wrong, so we adjust the offset here
+			const int delta = 3;
+			const char *llq = r_str_last (ll, "\":\"");
+			if (llq) {
+				ll = llq + delta;
+				cells = r_str_ansi_len (ll);
+			}
+		}
 		if (ll) {
-			int cols, ansilen = r_str_ansi_len (ll);
-			int utf8len = r_utf8_strlen ((const ut8*)ll);
-			int cells = utf8len - (cstrlen - ansilen);
-			if (cstrlen < 20) {
+			if (cells < 20) {
 				ds_print_pre (ds);
 			}
-			cols = ds->interactive ? ds->core->cons->columns : 1024;
+			int cols = ds->interactive ? ds->core->cons->columns : 1024;
 			if (cells < cmtcol) {
 				int len = cmtcol - cells;
 				if (len < cols && len > 0) {
@@ -2950,6 +3295,9 @@
 				}
 				// handle_set_pre (ds, "  ");
 				ds_align_comment (ds);
+				if (ds->use_json) {
+					chopstr = r_str_escape (chopstr);
+				}
 				if (ds->show_color) {
 					r_cons_printf ("%s; %s"Color_RESET, ds->pal_comment, chopstr);
 				} else {
@@ -2965,7 +3313,7 @@
 }
 
 static void ds_print_asmop_payload(RDisasmState *ds, const ut8 *buf) {
-	if (ds->show_varxs) {
+	if (ds->show_varaccess) {
 		// XXX asume analop is filled
 		//r_anal_op (core->anal, &ds->analop, ds->at, core->block+i, core->blocksize-i);
 		int v = ds->analop.ptr;
@@ -3001,30 +3349,32 @@
 	}
 }
 
-static char *ds_esc_str(RDisasmState *ds, const char *str, int len, const char **prefix_out) {
+/* Do not use this function for escaping JSON! */
+static char *ds_esc_str(RDisasmState *ds, const char *str, int len, const char **prefix_out, bool is_comment) {
 	int str_len;
 	char *escstr = NULL;
 	const char *prefix = "";
+	bool esc_bslash = ds->core->print->esc_bslash;
 	switch (ds->strenc) {
 	case R_STRING_ENC_LATIN1:
-		escstr = r_str_escape_latin1 (str, ds->show_asciidot, true);
+		escstr = r_str_escape_latin1 (str, ds->show_asciidot, esc_bslash, is_comment);
 		break;
 	case R_STRING_ENC_UTF8:
-		escstr = r_str_escape_utf8 (str, ds->show_asciidot, true);
+		escstr = r_str_escape_utf8 (str, ds->show_asciidot, esc_bslash);
 		break;
 	case R_STRING_ENC_UTF16LE:
-		escstr = r_str_escape_utf16le (str, len, ds->show_asciidot);
+		escstr = r_str_escape_utf16le (str, len, ds->show_asciidot, esc_bslash);
 		prefix = "u";
 		break;
 	case R_STRING_ENC_UTF32LE:
-		escstr = r_str_escape_utf32le (str, len, ds->show_asciidot);
+		escstr = r_str_escape_utf32le (str, len, ds->show_asciidot, esc_bslash);
 		prefix = "U";
 		break;
 	default:
 		str_len = strlen (str);
 		if ((str_len == 1 && len > 3 && str[2] && !str[3])
 		    || (str_len == 3 && len > 5 && !memcmp (str, "\xff\xfe", 2) && str[4] && !str[5])) {
-			escstr = r_str_escape_utf16le (str, len, ds->show_asciidot);
+			escstr = r_str_escape_utf16le (str, len, ds->show_asciidot, esc_bslash);
 			prefix = "u";
 		} else if (str_len == 1 && len > 7 && !str[2] && !str[3] && str[4] && !str[5]) {
 			RStrEnc enc = R_STRING_ENC_UTF32LE;
@@ -3041,10 +3391,10 @@
 				}
 			}
 			if (enc == R_STRING_ENC_UTF32LE) {
-				escstr = r_str_escape_utf32le (str, len, ds->show_asciidot);
+				escstr = r_str_escape_utf32le (str, len, ds->show_asciidot, esc_bslash);
 				prefix = "U";
 			} else {
-				escstr = r_str_escape_latin1 (str, ds->show_asciidot, true);
+				escstr = r_str_escape_latin1 (str, ds->show_asciidot, esc_bslash, is_comment);
 			}
 		} else {
 			RStrEnc enc = R_STRING_ENC_LATIN1;
@@ -3056,8 +3406,8 @@
 				}
 			}
 			escstr = (enc == R_STRING_ENC_UTF8 ?
-			          r_str_escape_utf8 (str, ds->show_asciidot, true) :
-			          r_str_escape_latin1 (str, ds->show_asciidot, true));
+				r_str_escape_utf8 (str, ds->show_asciidot, esc_bslash) :
+				r_str_escape_latin1 (str, ds->show_asciidot, esc_bslash, is_comment));
 		}
 	}
 	if (prefix_out) {
@@ -3067,18 +3417,17 @@
 }
 
 static void ds_print_str(RDisasmState *ds, const char *str, int len, ut64 refaddr) {
-	const char *prefix;
-	if (r_core_bin_strpurge (ds->core, str, refaddr)) {
+	if (ds->core->flags->realnames || !r_bin_string_filter (ds->core->bin, str, refaddr)) {
 		return;
 	}
-	char *escstr = ds_esc_str (ds, str, len, &prefix);
+	const char *prefix;
+	char *escstr = ds_esc_str (ds, str, len, &prefix, false);
 	if (escstr) {
-		if (ds->show_comment_right) {
-			ALIGN;
-		} else {
-			ds_pre_xrefs (ds);
-		}
-		ds_comment (ds, true, "; %s\"%s\"", prefix, escstr);
+		bool inv = ds->show_color && !ds->show_emu_strinv;
+		ds_begin_comment (ds);
+		ds_comment (ds, true, "; %s%s\"%s\"%s", inv ? Color_INVERT : "", prefix, escstr,
+		            inv ? Color_INVERT_RESET : "");
+		ds->printed_str_addr = refaddr;
 		free (escstr);
 	}
 }
@@ -3122,17 +3471,26 @@
 		if (ds->immstr) {
 			char *str = r_str_from_ut64 (r_read_ble64 (&v, core->print->big_endian));
 			if (str && *str) {
-				ALIGN;
-				ds_comment (ds, true, "; '%s'", str);
+				const char *ptr = str;
+				bool printable = true;
+				for (; *ptr; ptr++) {
+					if (!IS_PRINTABLE (*ptr)) {
+						printable = false;
+						break;
+					}
+				}
+				if (r_flag_get_i (core->flags, v)) {
+					printable = false;
+				}
+				if (printable) {
+					ds_begin_comment (ds);
+					ds_comment (ds, true, "; '%s'", str);
+				}
 			}
 			free (str);
 		} else {
 			if ((char)v > 0 && v >= '!' && v <= '~') {
-				if (ds->show_comment_right) {
-					ALIGN;
-				} else {
-					ds_pre_xrefs (ds);
-				}
+				ds_begin_comment (ds);
 				aligned = true;
 				ds_comment (ds, true, "; '%c'", (char)v);
 			}
@@ -3163,7 +3521,7 @@
 	bool flag_printed = false;
 	bool refaddr_printed = false;
 	bool string_printed = false;
-	if (p == UT64_MAX) {
+	if (refaddr == UT64_MAX) {
 		/* do nothing */
 	} else if (((st64)p) > 0 || ((st64)refaddr) > 0) {
 		const char *kind;
@@ -3174,12 +3532,9 @@
 				refaddr = p;
 				if (!flag_printed && !is_filtered_flag (ds, f->name)
 				    && (!ds->opstr || !strstr (ds->opstr, f->name))) {
-					if (ds->show_comment_right) {
-						ALIGN;
-					} else {
-						ds_pre_xrefs (ds);
-					}
+					ds_begin_comment (ds);
 					ds_comment (ds, true, "; %s", f->name);
+					ds->printed_flag_addr = p;
 					flag_printed = true;
 				}
 			}
@@ -3204,19 +3559,11 @@
 			} else {
 				f = NULL;
 				if (n == UT32_MAX || n == UT64_MAX) {
-					if (ds->show_comment_right) {
-						ALIGN;
-					} else {
-						ds_pre_xrefs (ds);
-					}
+					ds_begin_comment (ds);
 					ds_comment (ds, true, "; [0x%" PFMT64x":%d]=-1",
 							refaddr, refptr);
 				} else if (n == n32 && (n32 > -512 && n32 < 512)) {
-					if (ds->show_comment_right) {
-						ALIGN;
-					} else {
-						ds_pre_xrefs (ds);
-					}
+					ds_begin_comment (ds);
 					ds_comment (ds, true, "; [0x%" PFMT64x
 							  ":%d]=%"PFMT64d, refaddr, refptr, n);
 				} else {
@@ -3239,11 +3586,7 @@
 							}
 						}
 					}
-					if (ds->show_comment_right) {
-						ALIGN;
-					} else {
-						ds_pre_xrefs (ds);
-					}
+					ds_begin_comment (ds);
 					{
 						const char *refptrstr = "";
 						if (core->print->flags & R_PRINT_FLAGS_SECSUB) {
@@ -3262,15 +3605,11 @@
 			}
 		}
 		if (!strcmp (ds->show_cmtoff, "true")) {
-			if (ds->show_comment_right) {
-				ALIGN;
-			} else {
-				ds_pre_xrefs (ds);
-			}
+			ds_begin_comment (ds);
 			ds_comment (ds, true, "; 0x%" PFMT64x, refaddr);
 			refaddr_printed = true;
 		} else if (!refaddr_printed && strcmp (ds->show_cmtoff, "false")) {
-			char addrstr[sizeof (refaddr) * 2 + 3];
+			char addrstr[32] = {0};
 			snprintf (addrstr, sizeof (addrstr), "0x%" PFMT64x, refaddr);
 			if (!ds->opstr || !strstr (ds->opstr, addrstr)) {
 				snprintf (addrstr, sizeof (addrstr), "0x%08" PFMT64x, refaddr);
@@ -3284,11 +3623,7 @@
 					}
 					if (print_refaddr) {
 						if (!aligned) {
-							if (ds->show_comment_right) {
-								ALIGN;
-							} else {
-								ds_pre_xrefs (ds);
-							}
+							ds_begin_comment (ds);
 						}
 						ds_comment (ds, true, "; 0x%" PFMT64x, refaddr);
 						refaddr_printed = true;
@@ -3297,7 +3632,7 @@
 			}
 		}
 #if 1
-		if (!(IS_PRINTABLE (*msg) || ISWHITECHAR (*msg)
+		if (!(IS_PRINTABLE (*msg) || IS_WHITECHAR (*msg)
 		      || (len > 1 && !memcmp (msg, "\xff\xfe", 2)))) {
 			*msg = 0;
 		} else {
@@ -3322,29 +3657,18 @@
 					string_printed = true;
 				}
 			} else if (!flag_printed && (!ds->opstr || !strstr (ds->opstr, f->name))) {
-				if (ds->show_comment_right) {
-					ALIGN;
-				} else {
-					ds_pre_xrefs (ds);
-				}
+				ds_begin_comment (ds);
 				ds_comment (ds, true, "; %s", f->name);
+				ds->printed_flag_addr = refaddr;
 				flag_printed = true;
 			}
 		} else {
 			if (refaddr == UT64_MAX || refaddr == UT32_MAX) {
-				if (ds->show_comment_right) {
-					ALIGN;
-				} else {
-					ds_pre_xrefs (ds);
-				}
+				ds_begin_comment (ds);
 				ds_comment (ds, true, "; -1");
 			} else if (((char)refaddr > 0) && refaddr >= '!' && refaddr <= '~') {
 				char ch = refaddr;
-				if (ds->show_comment_right) {
-					ALIGN;
-				} else {
-					ds_pre_xrefs (ds);
-				}
+				ds_begin_comment (ds);
 				if (ch != ds->chref) {
 					ds_comment (ds, true, "; '%c'", ch);
 				}
@@ -3352,11 +3676,7 @@
 				if ((st64)refaddr < 0) {
 					// resolve local var if possible
 					RAnalVar *v = r_anal_var_get (core->anal, ds->at, 'v', 1, (int)refaddr);
-					if (ds->show_comment_right) {
-						ALIGN;
-					} else {
-						ds_pre_xrefs (ds);
-					}
+					ds_begin_comment (ds);
 					if (v) {
 						ds_comment (ds, true, "; var %s", v->name);
 						r_anal_var_free (v);
@@ -3390,11 +3710,7 @@
 					if (p != UT64_MAX && p != UT32_MAX) {
 						if (*n > -0xfff && *n < 0xfff) {
 							if (!aligned) {
-								if (ds->show_comment_right) {
-									ALIGN;
-								} else {
-									ds_pre_xrefs (ds);
-								}
+								ds_begin_comment (ds);
 							}
 							ds_comment (ds, true, "; %"PFMT64d, p);
 						}
@@ -3445,22 +3761,22 @@
 	}
 	RCore *core = ds->core;
 	RBinReloc *rel = getreloc (core, ds->at, ds->analop.size);
-
 	if (rel) {
-		const int cmtcol = ds->cmtcol;
 		int cstrlen = 0;
 		char *ll = r_cons_lastline (&cstrlen);
 		int ansilen = r_str_ansi_len (ll);
 		int utf8len = r_utf8_strlen ((const ut8*)ll);
 		int cells = utf8len - (cstrlen - ansilen);
-		int len = cmtcol - cells;
+		int len = ds->cmtcol - cells;
 		r_cons_memset (' ', len);
 		if (rel->import) {
-			r_cons_printf ("  ; RELOC %d %s", rel->type, rel->import->name);
+			r_cons_printf ("; RELOC %d %s", rel->type, rel->import->name);
 		} else if (rel->symbol) {
-			r_cons_printf ("  ; RELOC %d %s", rel->type, rel->symbol->name);
+			r_cons_printf ("; RELOC %d %s @ 0x%08" PFMT64x " + 0x%" PFMT64x,
+					rel->type, rel->symbol->name,
+					rel->symbol->vaddr, rel->addend);
 		} else {
-			r_cons_printf ("  ; RELOC %d ", rel->type);
+			r_cons_printf ("; RELOC %d ", rel->type);
 		}
 	}
 }
@@ -3486,18 +3802,49 @@
 		return 0;
 	}
 	ds = esil->user;
-	if (ds) {
-		ds->esil_likely = true;
-		if (!ds->show_slow) {
-			return 0;
-		}
+	if (!ds) {
+		return 0;
+	}
+	ds->esil_likely = true;
+	if (!ds->show_slow) {
+		return 0;
 	}
 	memset (str, 0, sizeof (str));
 	if (*val) {
+		bool emu_str_printed = false;
+		char *type = NULL;
 		(void)r_io_read_at (esil->anal->iob.io, *val, (ut8*)str, sizeof (str)-1);
 		str[sizeof (str)-1] = 0;
-		if (ds && *str && r_str_is_printable (str)) {
+		// support cstring here
+		{
+			ut64 *cstr = (ut64*) str;
+			ut64 addr = cstr[0];
+			if (!(*val >> 32)) {
+				addr = addr & UT32_MAX;
+			}
+			if (cstr[0] == 0 && cstr[1] < 0x1000) {
+				ut64 addr = cstr[2];
+				if (!(*val >> 32)) {
+					addr = addr & UT32_MAX;
+				}
+				(void)r_io_read_at (esil->anal->iob.io, addr,
+					(ut8*)str, sizeof (str)-1);
+			//	eprintf ("IS CSTRING 0x%llx %s\n", addr, str);
+				type = r_str_newf ("(cstr 0x%08"PFMT64x") ", addr);
+				ds->printed_str_addr = cstr[2];
+			} else if (r_io_is_valid_offset (esil->anal->iob.io, addr, 0)) {
+				ds->printed_str_addr = cstr[0];
+				type = r_str_newf ("(pstr 0x%08"PFMT64x") ", addr);
+				(void)r_io_read_at (esil->anal->iob.io, addr,
+					(ut8*)str, sizeof (str)-1);
+			//	eprintf ("IS PSTRING 0x%llx %s\n", addr, str);
+			}
+		}
+
+		if (*str && !r_bin_strpurge (ds->core->bin, str, *val) && r_str_is_printable_incl_newlines (str)
+		    && (ds->printed_str_addr == UT64_MAX || *val != ds->printed_str_addr)) {
 			bool jump_op = false;
+			bool ignored = false;
 			switch (ds->analop.type) {
 			case R_ANAL_OP_TYPE_JMP:
 			case R_ANAL_OP_TYPE_UJMP:
@@ -3508,10 +3855,14 @@
 			case R_ANAL_OP_TYPE_MJMP:
 			case R_ANAL_OP_TYPE_UCJMP:
 				jump_op = true;
+				break;
+			case R_ANAL_OP_TYPE_TRAP:
+			case R_ANAL_OP_TYPE_RET:
+				ignored = true;
+				break;
 			}
-			if (!jump_op) {
+			if (!jump_op && !ignored) {
 				const char *prefix;
-				char *escstr;
 				ut32 len = sizeof (str) -1;
 #if 0
 				RCore *core = ds->core;
@@ -3520,52 +3871,103 @@
 					len = R_DISASM_MAX_STR;
 				}
 #endif
-				escstr = ds_esc_str (ds, str, (int)len, &prefix);
+				char *escstr = ds_esc_str (ds, str, (int)len, &prefix, false);
+				const char *escquote = ds->use_json ? "\\\"" : "\"";
 				if (escstr) {
-					msg = r_str_newf ("%s\"%s\"", prefix, escstr);
+					if (ds->show_color) {
+						bool inv = ds->show_emu_strinv;
+						msg = r_str_newf ("%s%s%s%s%s%s%s",
+						                  prefix, type ? type : "", inv ? Color_INVERT : "",
+						                  escquote, escstr, escquote, inv ? Color_INVERT_RESET : "");
+					} else {
+						msg = r_str_newf ("%s%s%s%s%s", prefix, type? type: "", escquote, escstr, escquote);
+					}
+					emu_str_printed = true;
 					free (escstr);
 				}
 			}
 		} else {
-			str[0] = 0;
 			if (!*n32) {
 				// msg = strdup ("NULL");
 			} else if (*n32 == UT32_MAX) {
 				/* nothing */
 			} else {
-				if (ds && !ds->show_emu_str) {
+				if (!ds->show_emu_str) {
 					msg = r_str_newf ("-> 0x%x", *n32);
 				}
 			}
 		}
-		RFlagItem *fi = r_flag_get_i (esil->anal->flb.f, *val);
-		if (fi) {
-			msg = r_str_appendf (msg, "%s%s", msg && *msg ? " " : "", fi->name);
+		R_FREE (type);
+		if ((ds->printed_flag_addr == UT64_MAX || *val != ds->printed_flag_addr)
+		    && (ds->show_emu_strflag || !emu_str_printed)) {
+			RFlagItem *fi = r_flag_get_i (esil->anal->flb.f, *val);
+			if (fi && (!ds->opstr || !strstr (ds->opstr, fi->name))) {
+				msg = r_str_appendf (msg, "%s%s", msg && *msg ? " " : "", fi->name);
+			}
 		}
 	}
-	if (ds) {
-		if (ds->show_emu_str) {
-			if (msg && *msg) {
-				ds_comment_esil (ds, true, false, "; %s", msg);
-				if (ds->show_comments && !ds->show_comment_right) {
-					ds_newline (ds);
-				}
-			}
-		} else {
-			if (msg && *msg) {
-				ds_comment_esil (ds, true, false, "; %s=0x%"PFMT64x" %s", name, *val, msg);
+	if (ds->show_emu_str) {
+		if (msg && *msg) {
+			if (ds->show_emu_stroff && *msg == '"') {
+				ds_comment_esil (ds, true, false, "; 0x%"PFMT64x" %s", *val, msg);
 			} else {
-				ds_comment_esil (ds, true, false, "; %s=0x%"PFMT64x, name, *val);
+				ds_comment_esil (ds, true, false, "; %s", msg);
 			}
 			if (ds->show_comments && !ds->show_comment_right) {
 				ds_newline (ds);
 			}
 		}
+	} else {
+		if (msg && *msg) {
+			ds_comment_esil (ds, true, false, "; %s=0x%"PFMT64x" %s", name, *val, msg);
+		} else {
+			ds_comment_esil (ds, true, false, "; %s=0x%"PFMT64x, name, *val);
+		}
+		if (ds->show_comments && !ds->show_comment_right) {
+			ds_newline (ds);
+		}
 	}
 	free (msg);
 	return 0;
 }
 
+static void ds_pre_emulation(RDisasmState *ds) {
+	bool do_esil = ds->show_emu;
+	if (!ds->pre_emu) {
+		return;
+	}
+	RFlagItem *f = r_flag_get_at (ds->core->flags, ds->core->offset, true);
+	if (!f) {
+		return;
+	}
+	ut64 base = f->offset;
+	RAnalEsil *esil = ds->core->anal->esil;
+	int i, end = ds->core->offset - base;
+	int maxemu = 1024 * 1024;
+	RAnalEsilHookRegWriteCB orig_cb = esil->cb.hook_reg_write;
+	if (end < 0 || end > maxemu) {
+		return;
+	}
+	ds->stackptr = ds->core->anal->stackptr;
+	esil->cb.hook_reg_write = NULL;
+	for (i = 0; i < end; i++) {
+		ut64 addr = base + i;
+		RAnalOp* op = r_core_anal_op (ds->core, addr, R_ANAL_OP_MASK_ESIL);
+		if (op) {
+			if (do_esil) {
+				r_anal_esil_set_pc (esil, addr);
+				r_anal_esil_parse (esil, R_STRBUF_SAFEGET (&op->esil));
+				if (op->size > 0) {
+					i += op->size - 1;
+				}
+			}
+			ds_update_stackptr (ds, op);
+			r_anal_op_free (op);
+		}
+	}
+	esil->cb.hook_reg_write = orig_cb;
+}
+
 static void ds_print_esil_anal_init(RDisasmState *ds) {
 	RCore *core = ds->core;
 	const char *pc = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
@@ -3574,12 +3976,15 @@
 		ds->esil_old_pc = core->offset;
 	}
 	if (!ds->show_emu) {
+		// XXX. stackptr not computed without asm.emu, when its not required
 		return;
 	}
 	if (!core->anal->esil) {
 		int iotrap = r_config_get_i (core->config, "esil.iotrap");
 		int esd = r_config_get_i (core->config, "esil.stack.depth");
-		if (!(core->anal->esil = r_anal_esil_new (esd, iotrap))) {
+		unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
+
+		if (!(core->anal->esil = r_anal_esil_new (esd, iotrap, addrsize))) {
 			R_FREE (ds->esil_regstate);
 			return;
 		}
@@ -3592,51 +3997,26 @@
 		r_reg_setv (core->anal->reg, "gp", core->anal->gp);
 	}
 	ds->esil_regstate = r_reg_arena_peek (core->anal->reg);
-}
 
-static void ds_print_esil_anal_fini(RDisasmState *ds) {
-	RCore *core = ds->core;
-	if (ds->show_emu && ds->esil_regstate) {
-		RCore* core = ds->core;
-		core->anal->last_disasm_reg = r_reg_arena_peek (core->anal->reg);
-		const char *pc = r_reg_get_name (core->anal->reg, R_REG_NAME_PC);
-		r_reg_arena_poke (core->anal->reg, ds->esil_regstate);
-		r_reg_setv (core->anal->reg, pc, ds->esil_old_pc);
-		R_FREE (ds->esil_regstate);
-	}
-	if (core && core->anal && core->anal->esil) {
-		//make sure to remove reference to ds to avoid UAF
-		core->anal->esil->user = NULL;
-	}
+	// TODO: emulate N instructions BEFORE the current offset to get proper full function emulation
+	ds_pre_emulation (ds);
 }
 
 static void ds_print_bbline(RDisasmState *ds, bool force) {
-	if (ds->show_bbline && (force || (ds->fcn && r_anal_fcn_bbget (ds->fcn, ds->at)))) {
-		ds_begin_json_line (ds);
-		ds_setup_print_pre (ds, false, false);
-		ds_update_ref_lines (ds);
-		if (!ds->linesright && ds->show_lines && ds->line) {
-			r_cons_printf ("%s%s%s", COLOR (ds, color_flow),
-				ds->refline2, COLOR_RESET (ds));
+	if (ds->show_bbline) {
+		RAnalBlock *bb = r_anal_fcn_bbget_at (ds->fcn, ds->at);
+		if (force || (ds->fcn && bb)) {
+			ds_begin_json_line (ds);
+			ds_setup_print_pre (ds, false, false);
+			ds_update_ref_lines (ds);
+			if (!ds->linesright && ds->show_lines_bb && ds->line) {
+				r_cons_printf ("%s%s%s", COLOR (ds, color_flow),
+						ds->refline2, COLOR_RESET (ds));
+			}
+			r_cons_printf("|");
+			ds_newline (ds);
 		}
-		ds_newline (ds);
-	}
-}
-
-static void get_fcn_args_info(RAnal *anal, const char *fcn_name, int arg_num, const char * cc, const char **name,
-		char **orig_c_type, char **c_type, const char **fmt, ut64 *size, const char **source) {
-	*name = r_anal_type_func_args_name (anal, fcn_name, arg_num);
-	*orig_c_type = r_anal_type_func_args_type (anal, fcn_name, arg_num);
-	if (!strncmp ("const ", *orig_c_type, 6)) {
-		*c_type = *orig_c_type+6;
-	} else {
-		*c_type = *orig_c_type;
 	}
-	const char *query = sdb_fmt (-1, "type.%s", *c_type);
-	*fmt = sdb_const_get (anal->sdb_types, query, 0);
-	const char *t_query = sdb_fmt (-1, "type.%s.size", *c_type);
-	*size = sdb_num_get (anal->sdb_types, t_query, 0) / 8;
-	*source = r_anal_cc_arg (anal, cc, arg_num+1);
 }
 
 static void print_fcn_arg(RCore *core, const char *type, const char *name,
@@ -3659,32 +4039,21 @@
 			if (begin) {
 				// const int cstrlen = begin + len - ll;
 				// r_cons_drop (cstrlen - (int)(begin - ll));
-				r_cons_newline();
+				ds_newline (ds);
+				if (ds->use_json) {
+					ds_begin_json_line (ds);
+				} else {
+					ds_setup_print_pre (ds, false, false);
+					ds_print_lines_left (ds);
+				}
 			}
 		}
 	}
 }
 
-static char * resolve_fcn_name(RAnal *anal, const char * func_name) {
-	const char * name = NULL;
-	const char * str = func_name;
-	if (r_anal_type_func_exist (anal, func_name)) {
-		return strdup (func_name);
-	}
-	name = func_name;
-	while ((str = strchr (str, '.'))) {
-		name = str + 1;
-		str++;
-	}
-	if (r_anal_type_func_exist (anal, name)) {
-		return strdup (name);
-	}
-	return r_anal_type_func_guess (anal, (char*)func_name);
-}
-
 static bool can_emulate_metadata(RCore * core, ut64 at) {
 	const char *infos;
-	const char *emuskipmeta = r_config_get (core->config, "asm.emuskip");
+	const char *emuskipmeta = r_config_get (core->config, "emu.skip");
 	char key[32];
 	Sdb *s = core->anal->sdb_meta;
 	snprintf (key, sizeof (key)-1, "meta.0x%"PFMT64x, at);
@@ -3705,6 +4074,17 @@
 	return true;
 }
 
+static void mipsTweak(RDisasmState *ds) {
+	RCore *core = ds->core;
+	//const char *asm_arch = r_config_get (core->config, "asm.arch");
+	//if (asm_arch && *asm_arch && strstr (asm_arch, "mips")) {
+		ut64 gp = r_config_get_i (core->config, "anal.gp2");
+		if (gp && gp !=UT64_MAX) {
+			r_reg_setv (core->anal->reg, "gp", gp);
+		}
+	//}
+}
+
 // modifies anal register state
 static void ds_print_esil_anal(RDisasmState *ds) {
 	RCore *core = ds->core;
@@ -3712,8 +4092,12 @@
 	const char *pc;
 	int (*hook_mem_write)(RAnalEsil *esil, ut64 addr, const ut8 *buf, int len) = NULL;
 	int i, nargs;
-	ut64 at = p2v (ds, ds->at);
+	ut64 at = r_core_pava (core, ds->at);
 	RConfigHold *hc = r_config_hold_new (core->config);
+	/* apply hint */
+	RAnalHint *hint = r_anal_hint_get (core->anal, at);
+	r_anal_op_hint (&ds->analop, hint);
+	r_anal_hint_free (hint);
 	if (!hc) {
 		return;
 	}
@@ -3746,6 +4130,7 @@
 		}
 	}
 	ds->esil_likely = 0;
+	mipsTweak (ds);
 	r_anal_esil_set_pc (esil, at);
 	r_anal_esil_parse (esil, R_STRBUF_SAFEGET (&ds->analop.esil));
 	r_anal_esil_stack_free (esil);
@@ -3772,7 +4157,11 @@
 	case R_ANAL_OP_TYPE_CALL:
 		{
 			RAnalFunction *fcn;
+			RAnalFuncArg *arg;
+			RListIter *iter;
+			RListIter *nextele;
 			const char *fcn_name = NULL;
+			char *key = NULL;
 			ut64 pcv = ds->analop.jump;
 			if (pcv == UT64_MAX) {
 				pcv = ds->analop.ptr; // call [reloc-addr] // windows style
@@ -3793,118 +4182,62 @@
 				}
 			}
 			if (fcn_name) {
-				char * key = resolve_fcn_name (core->anal, fcn_name);
-				if (key) {
-					const char *sp = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
-					const char *fcn_type = r_anal_type_func_ret (core->anal, key);
-					const char * cc;
-					nargs = r_anal_type_func_args_count (core->anal, key);
-					// HACK: remove other comments
-					delete_last_comment (ds);
-					if (ds->show_color) {
-						ds_comment_esil (ds, true, false, ds->pal_comment);
-					}
+				key = resolve_fcn_name (core->anal, fcn_name);
+			}
+			if (key) {
+				const char *fcn_type = r_type_func_ret (core->anal->sdb_types, key);
+				int nargs = r_type_func_args_count (core->anal->sdb_types, key);
+				// remove other comments
+				delete_last_comment (ds);
+				if (ds->show_color) {
+					ds_comment_esil (ds, true, false, ds->pal_comment);
+				}
+				if (fcn_type) {
 					ds_comment_esil (ds, ds->show_color? false : true, false,
-							"; %s%s%s(", r_str_get (fcn_type), (fcn_type && *fcn_type &&
+							"; %s%s%s(", r_str_get (fcn_type), (*fcn_type &&
 							fcn_type[strlen (fcn_type) - 1] == '*') ? "" : " ",
 							r_str_get (key));
 					if (!nargs) {
 						ds_comment_esil (ds, false, true, "void)");
 						break;
 					}
-					cc = r_anal_type_func_cc (core->anal, key);
-					if (!cc) {
-						// unsupported calling convention
-						break;
-					}
-					ut64 spv = r_reg_getv (core->anal->reg, sp);
-					ut64 s_width = (core->anal->bits == 64)? 8: 4;
-					spv += s_width;
-					ut64 arg_addr = UT64_MAX;
-					//this should be taken out on its own function
-					for (i = 0; i < nargs; i++) {
-						const char *arg_name, *fmt, *cc_source = NULL;
-						char *arg_orig_c_type, *arg_c_type;
-						ut64 arg_size;
-						int on_stack = 0, warning = 0;
-						get_fcn_args_info (core->anal, key, i, cc, &arg_name,
-							&arg_orig_c_type, &arg_c_type, &fmt,
-							&arg_size, &cc_source);
-						if (cc_source && !strcmp (cc_source, "stack_rev")) {
-							int j;
-							free (arg_orig_c_type);
-							on_stack = 1;
-							for (j = nargs - 1; j >= i; j--) {
-								warning = 0;
-								get_fcn_args_info (core->anal, key, j, cc,
-									&arg_name, &arg_orig_c_type, &arg_c_type,
-									&fmt, &arg_size, &cc_source);
-								arg_addr = spv;
-								if (!arg_size) {
-									ds_comment_esil (ds, false, "%s: unk_size", arg_c_type);
-									warning = 1;
-									arg_size = s_width;
-								}
-								spv += arg_size;
-								if (!fmt) {
-									if (!warning) {
-										ds_comment_esil (ds, false, false, "%s : unk_format", arg_c_type);
-									} else {
-										ds_comment_esil (ds, false, false, "_format");
-									}
-									ds_comment_esil (ds, false, false, j!=i?", ":")");
-									free (arg_orig_c_type);
-									continue;
-								}
-								if (fmt) {
-									//print_fcn_arg may need ds_comment_esil
-									print_fcn_arg (core, arg_orig_c_type,
-										arg_name, fmt, arg_addr, on_stack);
-									ds_comment_esil (ds, false, false, j!=i?", ":")");
-								}
-								free (arg_orig_c_type);
-							}
-							break;
-						}
-						if (cc_source && !strncmp (cc_source, "stack", 5)) {
-							arg_addr = spv;
-							if (!arg_size) {
-								ds_comment_esil (ds, false, false, "%s: unk_size", arg_c_type);
-								warning = 1;
-								arg_size = s_width;
-							}
-							spv += arg_size;
-							on_stack = 1;
+				}
+			}
+			ut64 s_width = (core->anal->bits == 64)? 8: 4;
+			const char *sp = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
+			ut64 spv = r_reg_getv (core->anal->reg, sp);
+			r_reg_setv (core->anal->reg, sp, spv + s_width); // temporarily set stack ptr to sync with carg.c
+			RList *list = r_core_get_func_args (core, fcn_name);
+			if (!r_list_empty (list)) {
+				bool warning = false;
+				bool on_stack = false;
+				r_list_foreach (list, iter, arg) {
+					if (r_str_startswith (arg->cc_source, "stack")) {
+						on_stack = true;
+					}
+					if (!arg->size) {
+						ds_comment_esil (ds, false, false, "%s: unk_size", arg->c_type);
+						warning = true;
+					}
+					nextele = r_list_iter_get_next (iter);
+					if (!arg->fmt) {
+						if (!warning) {
+							ds_comment_esil (ds, false, false, "%s : unk_format", arg->c_type);
 						} else {
-							arg_addr = r_reg_getv (core->anal->reg, cc_source);
-						}
-						if (!fmt) {
-							if (!warning) {
-								ds_comment_esil (ds, false, false, "%s : unk_format", arg_c_type);
-							} else {
-								ds_comment_esil (ds, false, false, "_format");
-							}
-							ds_comment_esil (ds, false, false, i!=(nargs-1)?", ":")");
-							free (arg_orig_c_type);
-							continue;
+							ds_comment_esil (ds, false, false, "_format");
 						}
-						if (fmt) {
-							//it may need ds_comment_esil
-							print_fcn_arg (core, arg_orig_c_type, arg_name,
-								fmt, arg_addr, on_stack);
-							ds_comment_esil (ds, false, false, i!=(nargs - 1)?", ":")");
-						}
-						free (arg_orig_c_type);
+						ds_comment_esil (ds, false, false, nextele?", ":")");
+					} else {
+						//print_fcn_arg may need ds_comment_esil
+						print_fcn_arg (core, arg->orig_c_type,
+								arg->name, arg->fmt, arg->src, on_stack);
+						ds_comment_esil (ds, false, false, nextele?", ":")");
 					}
-					ds_comment_esil (ds, false, true, "");
-					free (key);
-				} else {
-					// function not in sdb
-					goto callfallback;
 				}
+				// ds_comment_esil (ds, false, true, "");
+				break;
 			} else {
 				// function name not resolved
-callfallback:
 				nargs = DEFAULT_NARGS;
 				if (fcn) {
 					nargs = fcn->nargs;
@@ -3918,9 +4251,11 @@
 					ds_comment_esil (ds, false, true, "");
 				}
 			}
+			r_reg_setv (core->anal->reg, sp, spv); // reset stack ptr
 		}
 		break;
 	}
+	ds_print_color_reset (ds);
 beach:
 	if (esil) {
 		esil->cb.hook_mem_write = hook_mem_write;
@@ -3931,7 +4266,7 @@
 
 static void ds_print_calls_hints(RDisasmState *ds) {
 	int emu = r_config_get_i (ds->core->config, "asm.emu");
-	int emuwrite = r_config_get_i (ds->core->config, "asm.emuwrite");
+	int emuwrite = r_config_get_i (ds->core->config, "emu.write");
 	if (emu && emuwrite) {
 		// this is done by ESIL
 		return;
@@ -3939,41 +4274,46 @@
 	RAnal *anal = ds->core->anal;
 	// RAnalFunction *fcn = r_anal_get_fcn_in (anal, ds->analop.jump, -1);
 	RAnalFunction *fcn = fcnIn (ds, ds->analop.jump, -1);
+	Sdb *TDB = anal->sdb_types;
 	char *name;
 	if (!fcn) {
 		return;
 	}
-	if (r_anal_type_func_exist (anal, fcn->name)) {
+	if (r_type_func_exist (TDB, fcn->name)) {
 		name = strdup (fcn->name);
-	} else if (!(name = r_anal_type_func_guess (anal, fcn->name))) {
+	} else if (!(name = r_type_func_guess (TDB, fcn->name))) {
 		return;
 	}
 	if (ds->show_color) {
 		r_cons_strcat (ds->pal_comment);
 	}
 	ds_align_comment (ds);
-	const char *fcn_type = r_anal_type_func_ret (anal, name);
+	const char *fcn_type = r_type_func_ret (TDB, name);
 	if (fcn_type && *fcn_type) {
 		r_cons_printf (
 			"; %s%s%s(", fcn_type,
 			fcn_type[strlen (fcn_type) - 1] == '*' ? "" : " ",
 			name);
 	}
-	int i, arg_max = r_anal_type_func_args_count (anal, name);
+	int i, arg_max = r_type_func_args_count (TDB, name);
 	if (!arg_max) {
 		r_cons_printf ("void)");
 	} else {
 		for (i = 0; i < arg_max; i++) {
-			char *type = r_anal_type_func_args_type (anal, name, i);
+			char *type = r_type_func_args_type (TDB, name, i);
+			char *tname = r_type_func_args_name (TDB, name, i);
 			if (type && *type) {
 				r_cons_printf ("%s%s%s%s%s", i == 0 ? "": " ", type,
 						type[strlen (type) -1] == '*' ? "": " ",
-						r_anal_type_func_args_name (anal, name, i),
-						i == arg_max - 1 ? ")": ",");
+						tname, i == arg_max - 1 ? ")": ",");
+			} else if (tname && !strcmp (tname, "...")) {
+				r_cons_printf ("%s%s%s", i == 0 ? "": " ",
+						tname, i == arg_max - 1 ? ")": ",");
 			}
 			free (type);
 		}
 	}
+	ds_print_color_reset (ds);
 	free (name);
 }
 
@@ -4010,50 +4350,43 @@
 				if (!desc) {
 					ds_align_comment (ds);
 				}
-				if (ds->show_color) {
-					// r_cons_strcat (ds->color_comment);
-					r_cons_strcat (ds->color_usrcmt);
-				}
 				if (strchr (comment, '\n')) {
-					char *align = r_str_newf ("%s  ;^ ", ds->pre);
 					comment = strdup (comment);
-					if (align && comment) {
+					if (comment) {
 						ds_newline (ds);
 						ds_begin_json_line (ds);
-						if (ds->use_json) {
-							int lines_count;
-							int *line_indexes = r_str_split_lines (comment, &lines_count);
-							if (line_indexes) {
-								int i;
-								for (i = 0; i < lines_count; i++) {
-									char *c = comment + line_indexes[i];
-									char *escstr = ds_esc_str (ds, c, (int)strlen (c), NULL);
-									if (escstr) {
-										r_cons_printf ("; %s", escstr);
-										ds_newline (ds);
-										ds_begin_json_line (ds);
-										free (escstr);
-									}
+						int lines_count;
+						int *line_indexes = r_str_split_lines (comment, &lines_count);
+						if (line_indexes) {
+							int i;
+							for (i = 0; i < lines_count; i++) {
+								char *c = comment + line_indexes[i];
+								char *escstr = NULL;
+								if (ds->use_json) {
+									c = escstr = ds_esc_str (ds, c, (int)strlen (c), NULL, true);
 								}
-							}
-							free (line_indexes);
-						} else {
-							char *c = r_str_prefix_all (comment, align);
-							if (c) {
-								r_cons_strcat (c);
-								free (c);
+								ds_print_pre (ds);
+								if (ds->show_color) {
+									r_cons_strcat (ds->color_usrcmt);
+								}
+								r_cons_printf (i == 0 ? "%s" : "; %s", c);
+								if (i < lines_count - 1) {
+									ds_newline (ds);
+									ds_begin_json_line (ds);
+								}
+								free (escstr);
 							}
 						}
+						free (line_indexes);
 					}
 					free (comment);
-					free (align);
 				} else {
 					char *escstr = NULL;
 					if (ds->use_json) {
-						comment = escstr = ds_esc_str (ds, comment, (int)strlen (comment), NULL);
+						comment = escstr = ds_esc_str (ds, comment, (int)strlen (comment), NULL, true);
 					}
 					if (comment) {
-						r_cons_printf ("; %s", comment);
+						r_cons_strcat (comment);
 					}
 					free (escstr);
 				}
@@ -4083,15 +4416,15 @@
 	if (p) {
 		while (*p) {
 			// look for start of next separator or ANSI sequence
-			while (*p && !ISSEPARATOR (*p) && *p != 0x1b) p++;
+			while (*p && !IS_SEPARATOR (*p) && *p != 0x1b) p++;
 			if (*p == 0x1b) {
 				// skip to end of ANSI sequence (lower or uppercase char)
 				while (*p && !(*p >= 'A' && *p <= 'Z') && !(*p >= 'a' && *p <= 'z')) p++;
 				if (*p) p++;
 			}
-			if (ISSEPARATOR (*p)) {
+			if (IS_SEPARATOR (*p)) {
 				// skip to end of separator
-				while (*p && ISSEPARATOR (*p)) p++;
+				while (*p && IS_SEPARATOR (*p)) p++;
 			}
 			if (IS_DIGIT (*p)) {
 				// we found the start of the next number
@@ -4105,23 +4438,19 @@
 static char *ds_sub_jumps(RDisasmState *ds, char *str) {
 	RAnal *anal = ds->core->anal;
 	RFlag *f = ds->core->flags;
-	int optype;
-	RAnalFunction *fcn;
 	RFlagItem *flag;
-	ut64 addr;
-	const char *name = 0;
+	const char *name = NULL;
 
 	if (!ds->jmpsub || !anal) {
 		return str;
 	}
-
-	optype = ds->analop.type & 0xFFFF;
+	int optype = ds->analop.type & 0xFFFF;
 	if (optype < R_ANAL_OP_TYPE_JMP || optype >= R_ANAL_OP_TYPE_RET) {
 		return str;
 	}
-	addr = ds->analop.jump;
+	ut64 addr = ds->analop.jump;
 
-	fcn = r_anal_get_fcn_in (anal, addr, 0);
+	RAnalFunction *fcn = r_anal_get_fcn_at (anal, addr, 0);
 	if (fcn) {
 		name = fcn->name;
 	} else if (f) {
@@ -4130,7 +4459,6 @@
 			name = flag->name;
 		}
 	}
-
 	if (name) {
 		char *nptr, *ptr;
 		ut64 numval;
@@ -4139,23 +4467,43 @@
 			ptr = nptr;
 			numval = r_num_get (NULL, ptr);
 			if (numval == addr) {
-				while (*nptr && !ISSEPARATOR (*nptr) && *nptr != 0x1b) nptr++;
+				while (*nptr && !IS_SEPARATOR (*nptr) && *nptr != 0x1b) {
+					nptr++;
+				}
 				char* numstr = r_str_ndup (ptr, nptr-ptr);
-				str = r_str_replace (str, numstr, name, 0);
-				free (numstr);
+				if (numstr) {
+					str = r_str_replace (str, numstr, name, 0);
+					free (numstr);
+				}
 				break;
 			}
 		}
 	}
-
 	return str;
 }
 
+static bool line_highlighted(RDisasmState *ds) {
+	return ds->asm_highlight != UT64_MAX && ds->vat == ds->asm_highlight;
+}
+
+static void ds_start_line_highlight(RDisasmState *ds) {
+	if (ds->show_color && line_highlighted (ds)) {
+		r_cons_strcat (ds->color_linehl);
+	}
+}
+
+static void ds_end_line_highlight(RDisasmState *ds) {
+	if (ds->show_color && line_highlighted (ds)) {
+		r_cons_strcat (Color_RESET);
+	}
+}
+
 // int l is for lines
-R_API int r_core_print_disasm(RPrint *p, RCore *core, ut64 addr, ut8 *buf, int len, int l, int invbreak, int cbytes, bool json) {
+R_API int r_core_print_disasm(RPrint *p, RCore *core, ut64 addr, ut8 *buf, int len, int l, int invbreak, int cbytes, bool json, RAnalFunction *pdf) {
 	int continueoninvbreak = (len == l) && invbreak;
 	RAnalFunction *of = NULL;
 	RAnalFunction *f = NULL;
+	bool calc_row_offsets = p->calc_row_offsets;
 	int ret, i, inc, skip_bytes = 0, idx = 0;
 	int dorepeat = 1;
 	ut8 *nbuf = NULL;
@@ -4172,6 +4520,11 @@
 	ds->hint = NULL;
 	ds->use_json = json;
 	ds->first_line = true;
+	ds->pdf = pdf;
+
+	// disable row_offsets to prevent other commands to overwrite computed info
+	p->calc_row_offsets = false;
+
 	//r_cons_printf ("len =%d l=%d ib=%d limit=%d\n", len, l, invbreak, p->limit);
 	// TODO: import values from debugger is possible
 	// TODO: allow to get those register snapshots from traces
@@ -4190,9 +4543,10 @@
 	/* reset jmp table if not asked to keep it */
 	if (!core->keep_asmqjmps) { // hack
 		core->asmqjmps_count = 0;
-		core->asmqjmps_size = R_CORE_ASMQJMPS_NUM;
-		core->asmqjmps = realloc (core->asmqjmps, core->asmqjmps_size * sizeof (ut64));
-		if (core->asmqjmps) {
+		ut64 *p = realloc (core->asmqjmps, R_CORE_ASMQJMPS_NUM * sizeof (ut64));
+		if (p) {
+			core->asmqjmps_size = R_CORE_ASMQJMPS_NUM;
+			core->asmqjmps = p;
 			for (i = 0; i < R_CORE_ASMQJMPS_NUM; i++) {
 				core->asmqjmps[i] = UT64_MAX;
 			}
@@ -4203,14 +4557,14 @@
 	}
 toro:
 	// uhm... is this necesary? imho can be removed
-	r_asm_set_pc (core->assembler, p2v (ds, ds->addr + idx));
+	r_asm_set_pc (core->assembler, r_core_pava (core, ds->addr + idx));
 	core->cons->vline = r_config_get_i (core->config, "scr.utf8") ? (r_config_get_i (core->config, "scr.utf8.curvy") ? r_vline_uc : r_vline_u) : r_vline_a;
 
 	if (core->print->cur_enabled) {
 		// TODO: support in-the-middle-of-instruction too
 		r_anal_op_fini (&ds->analop);
 		if (r_anal_op (core->anal, &ds->analop, core->offset + core->print->cur,
-			buf + core->print->cur, (int)(len - core->print->cur))) {
+			buf + core->print->cur, (int)(len - core->print->cur), R_ANAL_OP_MASK_ALL)) {
 			// TODO: check for ds->analop.type and ret
 			ds->dest = ds->analop.jump;
 		}
@@ -4229,31 +4583,33 @@
 		len = ds->l = core->blocksize;
 	}
 
-	ds->stackptr = core->anal->stackptr;
 	r_cons_break_push (NULL, NULL);
 	r_anal_build_range_on_hints (core->anal);
 	for (i = idx = ret = 0; addrbytes * idx < len && ds->lines < ds->l; idx += inc, i++, ds->index += inc, ds->lines++) {
 		ds->at = ds->addr + idx;
-		ds->vat = p2v (ds, ds->at);
+		ds->vat = r_core_pava (core, ds->at);
 		if (r_cons_is_breaked ()) {
 			dorepeat = 0;
 			R_FREE (nbuf);
 			r_cons_break_pop ();
+			ds_free (ds);
 			return 0; //break;
 		}
 		r_core_seek_archbits (core, ds->at); // slow but safe
 		ds->has_description = false;
 		ds->hint = r_core_hint_begin (core, ds->hint, ds->at);
+		ds->printed_str_addr = UT64_MAX;
+		ds->printed_flag_addr = UT64_MAX;
 		// XXX. this must be done in ds_update_pc()
 		// ds_update_pc (ds, ds->at);
-		{
 			r_asm_set_pc (core->assembler, ds->at);
 			ds_update_ref_lines (ds);
-			r_anal_op (core->anal, &ds->analop, ds->at, buf + addrbytes * idx, (int)(len - addrbytes * idx));
-		}
+			r_anal_op_fini (&ds->analop);
+			r_anal_op (core->anal, &ds->analop, ds->at, buf + addrbytes * idx, (int)(len - addrbytes * idx), R_ANAL_OP_MASK_ALL);
 		if (ds_must_strip (ds)) {
 			inc = ds->analop.size;
 			// inc = ds->asmop.payload + (ds->asmop.payload % ds->core->assembler->dataalign);
+			r_anal_op_fini (&ds->analop);
 			continue;
 		}
 		// f = r_anal_get_fcn_in (core->anal, ds->at, R_ANAL_FCN_TYPE_NULL);
@@ -4280,6 +4636,7 @@
 				inc = 0; //delta;
 				idx = 0;
 				of = f;
+				r_anal_op_fini (&ds->analop);
 				if (len == l) {
 					break;
 				}
@@ -4290,20 +4647,22 @@
 				r_io_read_at (core->io, ds->addr, buf, len);
 				inc = 0; //delta;
 				idx = 0;
+				r_anal_op_fini (&ds->analop);
 				continue;
 			}
 		}
 		ds_show_comments_right (ds);
 		// TRY adding here
-		char *link_key = sdb_fmt (-1, "link.%08"PFMT64x, ds->addr + idx);
+		char *link_key = sdb_fmt ("link.%08"PFMT64x, ds->addr + idx);
 		const char *link_type = sdb_const_get (core->anal->sdb_types, link_key, 0);
 		if (link_type) {
-			char *fmt = r_anal_type_format (core->anal, link_type);
+			char *fmt = r_type_format (core->anal->sdb_types, link_type);
 			if (fmt) {
 				r_cons_printf ("(%s)\n", link_type);
 				r_core_cmdf (core, "pf %s @ 0x%08"PFMT64x"\n", fmt, ds->addr + idx);
-				inc += r_anal_type_get_size (core->anal, link_type) / 8;
+				inc += r_type_get_bitsize (core->anal->sdb_types, link_type) / 8;
 				free (fmt);
+				r_anal_op_fini (&ds->analop);
 				continue;
 			}
 		} else {
@@ -4311,6 +4670,7 @@
 				ret = ds_disassemble (ds, buf + addrbytes * idx, len - addrbytes * idx);
 				if (ret == -31337) {
 					inc = ds->oplen;
+					r_anal_op_fini (&ds->analop);
 					continue;
 				}
 			}
@@ -4318,6 +4678,7 @@
 		if (ds->retry) {
 			ds->retry = false;
 			r_cons_break_pop ();
+			r_anal_op_fini (&ds->analop);
 			goto retry;
 		}
 		ds_atabs_option (ds);
@@ -4336,10 +4697,11 @@
 #else
 		if (ds->analop.addr != ds->at) {
 			r_anal_op_fini (&ds->analop);
-			r_anal_op (core->anal, &ds->analop, ds->at, buf + addrbytes * idx, (int)(len - addrbytes * idx));
+			r_anal_op (core->anal, &ds->analop, ds->at, buf + addrbytes * idx, (int)(len - addrbytes * idx), R_ANAL_OP_MASK_ALL);
 		}
 #endif
 		if (ret < 1) {
+			r_strbuf_fini (&ds->analop.esil);
 			r_strbuf_init (&ds->analop.esil);
 			ds->analop.type = R_ANAL_OP_TYPE_ILL;
 		}
@@ -4353,7 +4715,7 @@
 		}
 		ds_print_bbline (ds, false);
 		if (ds->at >= addr) {
-			r_print_set_rowoff (core->print, ds->lines, ds->at - addr);
+			r_print_set_rowoff (core->print, ds->lines, ds->at - addr, calc_row_offsets);
 		}
 		if (ds->midflags) {
 			skip_bytes = handleMidFlags (core, ds, true);
@@ -4365,6 +4727,19 @@
 		if (skip_bytes && ds->midflags == R_MIDFLAGS_SHOW) {
 			ds->at -= skip_bytes;
 		}
+		if (ds->pdf) {
+			static bool sparse = false;
+			if (!r_anal_fcn_bbget_in (ds->pdf, ds->at)) {
+				inc = ds->oplen;
+				r_anal_op_fini (&ds->analop);
+				if (!sparse) {
+					r_cons_printf ("..\n");
+					sparse = true;
+				}
+				continue;
+			}
+			sparse = false;
+		}
 		ds_control_flow_comments (ds);
 		ds_adistrick_comments (ds);
 		/* XXX: This is really cpu consuming.. need to be fixed */
@@ -4374,7 +4749,7 @@
 		if (ds->show_comments && !ds->show_comment_right) {
 			ds_instruction_mov_lea (ds, idx);
 			ds_show_refs (ds);
-			ds_build_op_str (ds);
+			ds_build_op_str (ds, false);
 			ds_print_ptr (ds, len + 256, idx);
 			if (!ds->pseudo) {
 				R_FREE (ds->opstr);
@@ -4387,8 +4762,7 @@
 			}
 		}
 
-		ds_begin_json_line (ds); // TODO: correct position or rather before the if above?
-
+		ds_begin_json_line (ds);
 		ds_setup_print_pre (ds, false, false);
 		ds_print_lines_left (ds);
 		// f = r_anal_get_fcn_in (core->anal, ds->addr, 0);
@@ -4399,6 +4773,8 @@
 			ds_setup_print_pre (ds, false, false);
 			ds_print_lines_left (ds);
 		}
+		core->print->resetbg = (ds->asm_highlight == UT64_MAX);
+		ds_start_line_highlight (ds);
 		ds_print_offset (ds);
 		if (ds->shortcut_pos == 0) {
 			ds_print_core_vmode (ds, ds->shortcut_pos);
@@ -4414,8 +4790,9 @@
 			ds_print_show_cursor (ds);
 			ds_print_show_bytes (ds);
 			ds_print_lines_right (ds);
-			ds_build_op_str (ds);
+			ds_build_op_str (ds, true);
 			ds_print_opstr (ds);
+			ds_end_line_highlight (ds);
 			ds_print_dwarf (ds);
 			ret = ds_print_middle (ds, ret);
 
@@ -4424,7 +4801,8 @@
 				RAsmOp ao; /* disassemble for the vm .. */
 				int os = core->assembler->syntax;
 				r_asm_set_syntax (core->assembler, R_ASM_SYNTAX_INTEL);
-				r_asm_disassemble (core->assembler, &ao, buf + addrbytes * idx, len - addrbytes * idx + 5);
+				r_asm_disassemble (core->assembler, &ao, buf + addrbytes * idx,
+					len - addrbytes * idx + 5);
 				r_asm_set_syntax (core->assembler, os);
 			}
 			if (ds->shortcut_pos > 0) {
@@ -4444,6 +4822,7 @@
 				ds_show_refs (ds);
 			}
 		} else {
+			ds_end_line_highlight (ds);
 			if (ds->show_comments && ds->show_comment_right) {
 				ds_print_color_reset (ds);
 				ds_print_comments_right (ds);
@@ -4451,6 +4830,7 @@
 			ds->mi_found = false;
 		}
 
+		core->print->resetbg = true;
 		ds_newline (ds);
 		if (ds->show_bbline && !ds->bblined && !ds->fcn) {
 			switch (ds->analop.type) {
@@ -4471,8 +4851,9 @@
 				if (strchr (ds->line, '>')) {
 					memset (ds->line, ' ', r_str_len_utf8 (ds->line));
 				}
-				r_cons_printf ("%s%s%s%s; --------------------------------------\n",
-					ds->pre, COLOR (ds, color_flow), ds->line, COLOR_RESET (ds));
+				ds_print_pre (ds);
+				r_cons_printf ("%s%s%s; --------------------------------------\n",
+					COLOR (ds, color_flow), ds->line, COLOR_RESET (ds));
 			}
 			R_FREE (ds->line);
 			R_FREE (ds->refline);
@@ -4489,6 +4870,7 @@
 		}
 		inc += ds->asmop.payload + (ds->asmop.payload % ds->core->assembler->dataalign);
 	}
+	r_anal_op_fini (&ds->analop);
 
 	R_FREE (nbuf);
 	r_cons_break_pop ();
@@ -4505,13 +4887,13 @@
 		}
 		buf = nbuf = malloc (len);
 		if (ds->tries > 0) {
-			if (r_core_read_at (core, ds->addr, buf, len)) {
+			if (r_io_read_at (core->io, ds->addr, buf, len)) {
 				goto toro;
 			}
 		}
 		if (ds->lines < ds->l) {
 			//ds->addr += idx;
-			if (!r_core_read_at (core, ds->addr, buf, len)) {
+			if (!r_io_read_at (core->io, ds->addr, buf, len)) {
 				//ds->tries = -1;
 			}
 			goto toro;
@@ -4523,15 +4905,16 @@
 	}
 #endif
 	if (ds->use_json) {
-		r_cons_print ("]\n");
+		r_cons_print ("]");
 	}
-	r_print_set_rowoff (core->print, ds->lines, ds->at - addr);
-	r_print_set_rowoff (core->print, ds->lines + 1, UT32_MAX);
+	r_print_set_rowoff (core->print, ds->lines, ds->at - addr, calc_row_offsets);
+	r_print_set_rowoff (core->print, ds->lines + 1, UT32_MAX, calc_row_offsets);
 	// TODO: this too (must review)
 	ds_print_esil_anal_fini (ds);
 	ds_reflines_fini (ds);
 	ds_free (ds);
 	R_FREE (nbuf);
+	p->calc_row_offsets = calc_row_offsets;
 	/* used by asm.emu */
 	r_reg_arena_pop (core->anal->reg);
 	return addrbytes * idx; //-ds->lastfail;
@@ -4569,7 +4952,7 @@
 			if (nbytes > core->blocksize) {
 				r_core_block_size (core, nbytes);
 			}
-			r_core_read_at (core, core->offset, core->block, nbytes);
+			r_io_read_at (core->io, core->offset, core->block, nbytes);
 		}
 	} else {
 		if (nb_bytes < 0) { // Disassemble backward `nb_bytes` bytes
@@ -4579,19 +4962,21 @@
 				ut64 obsz = core->blocksize;
 				r_core_block_size (core, nb_bytes);
 				if (core->blocksize == nb_bytes) {
-					r_core_read_at (core, core->offset, core->block, nb_bytes);
+					r_io_read_at (core->io, core->offset, core->block, nb_bytes);
 				} else {
 					eprintf ("Cannot read that much!\n");
-					memset (core->block, 0xff, nb_bytes);
+					r_core_block_size (core, obsz);
+					len = -1;
+					goto err_offset;
 				}
 				r_core_block_size (core, obsz);
 			} else {
-				r_core_read_at (core, core->offset, core->block, nb_bytes);
+				r_io_read_at (core->io, core->offset, core->block, nb_bytes);
 			}
 		} else {
 			if (nb_bytes > core->blocksize) {
 				r_core_block_size (core, nb_bytes);
-				r_core_read_at (core, core->offset, core->block, nb_bytes);
+				r_io_read_at (core->io, core->offset, core->block, nb_bytes);
 			}
 		}
 	}
@@ -4622,8 +5007,8 @@
 	r_anal_build_range_on_hints (core->anal);
 #define isNotTheEnd (nb_opcodes ? j < nb_opcodes: addrbytes * i < nb_bytes)
 	for (i = j = 0; isNotTheEnd; i += ret, j++) {
-		ds->at = core->offset +i;
-		ds->vat = p2v (ds, ds->at);
+		ds->at = core->offset + i;
+		ds->vat = r_core_pava (core, ds->at);
 		hasanal = false;
 		r_core_seek_archbits (core, ds->at);
 		if (r_cons_is_breaked ()) {
@@ -4645,13 +5030,13 @@
 		}
 		r_anal_op_fini (&ds->analop);
 		if (ds->show_color && !hasanal) {
-			r_anal_op (core->anal, &ds->analop, ds->at, core->block + addrbytes * i, core->blocksize - addrbytes * i);
+			r_anal_op (core->anal, &ds->analop, ds->at, core->block + addrbytes * i, core->blocksize - addrbytes * i, R_ANAL_OP_MASK_ALL);
 			hasanal = true;
 		}
 		if (ds_must_strip (ds)) {
 			continue;
 		}
-		
+
 		// r_conf = s_printf ("0x%08"PFMT64x"  ", core->offset+i);
 		if (ds->hint && ds->hint->size) {
 			ret = ds->hint->size;
@@ -4671,7 +5056,7 @@
 			if (ds->decode && !ds->immtrim) {
 				free (ds->opstr);
 				if (!hasanal) {
-					r_anal_op (core->anal, &ds->analop, ds->at, core->block+i, core->blocksize-i);
+					r_anal_op (core->anal, &ds->analop, ds->at, core->block+i, core->blocksize-i, R_ANAL_OP_MASK_ALL);
 					hasanal = true;
 				}
 				tmpopstr = r_anal_op_to_string (core->anal, &ds->analop);
@@ -4683,7 +5068,7 @@
 				if (!hasanal) {
 					r_anal_op (core->anal, &ds->analop,
 						ds->at, core->block + i,
-						core->blocksize - i);
+						core->blocksize - i, R_ANAL_OP_MASK_ESIL);
 					hasanal = true;
 				}
 				if (*R_STRBUF_SAFEGET (&ds->analop.esil)) {
@@ -4710,7 +5095,7 @@
 				r_parse_filter (core->parser, core->flags, ds->asmop.buf_asm, ds->str,
 						sizeof (ds->str), core->print->big_endian);
 				ds->opstr = strdup (ds->str);
-				asm_str = colorize_asm_string (core, ds);
+				asm_str = colorize_asm_string (core, ds, true);
 				core->parser->flagspace = ofs;
 				free (ds->opstr);
 				ds->opstr = asm_str;
@@ -4740,6 +5125,7 @@
 	}
 	r_cons_break_pop ();
 	ds_free (ds);
+ err_offset:
 	core->offset = old_offset;
 	r_reg_arena_pop (core->anal->reg);
 
@@ -4772,7 +5158,7 @@
 
 			if (nb_opcodes > 0xffff) {
 				eprintf ("Too many backward instructions\n");
-				return 0;
+				return false;
 			}
 
 			if (r_core_prevop_addr (core, core->offset, nb_opcodes, &addr)) {
@@ -4793,8 +5179,8 @@
 			}
 			count = R_MIN (nb_bytes, nbytes);
 			if (count > 0) {
-				r_core_read_at (core, addr, buf, count);
-				r_core_read_at (core, addr+count, buf+count, nb_bytes-count);
+				r_io_read_at (core->io, addr, buf, count);
+				r_io_read_at (core->io, addr+count, buf+count, nb_bytes-count);
 			} else {
 				if (nb_bytes > 0) {
 					memset (buf, 0xff, nb_bytes);
@@ -4807,14 +5193,14 @@
 			// the equivalent addr and nb_size and scan a positive number of BYTES
 			// so keep dis_opcodes = 0;
 			dis_opcodes = 1;
-			r_core_read_at (core, addr, buf, nb_bytes);
+			r_io_read_at (core->io, addr, buf, nb_bytes);
 		}
 	} else { // Disassemble `nb_bytes` bytes
 		if (nb_bytes < 0) {
 			//Backward disassembly of `nb_bytes` bytes
 			nb_bytes = -nb_bytes;
 			addr -= nb_bytes;
-			r_core_read_at (core, addr, buf, nb_bytes);
+			r_io_read_at (core->io, addr, buf, nb_bytes);
 		}
 	}
 	core->offset = addr;
@@ -4833,6 +5219,8 @@
 	// j = number of instructions
 	// k = delta from addr
 	ds = ds_init (core);
+	bool result = false;
+
 	for (;;) {
 		bool end_nbopcodes, end_nbbytes;
 
@@ -4843,7 +5231,7 @@
 		// Make sure we have room for it
 		if (dis_opcodes == 1 && i >= nb_bytes - 32) {
 			// Read another nb_bytes bytes into buf from current offset
-			r_core_read_at (core, at, buf, nb_bytes);
+			r_io_read_at (core->io, at, buf, nb_bytes);
 			i = 0;
 		}
 
@@ -4862,19 +5250,20 @@
 			i++;
 			k++;
 			j++;
+			result = true;
 			continue;
 		}
 		char *opstr = strdup (asmop.buf_asm);
 
 		ds->has_description = false;
 		r_anal_op_fini (&ds->analop);
-		r_anal_op (core->anal, &ds->analop, at, buf + i, nb_bytes - i);
+		r_anal_op (core->anal, &ds->analop, at, buf + i, nb_bytes - i, R_ANAL_OP_MASK_ALL);
 
 		if (ds->pseudo) {
 			r_parse_parse (core->parser, asmop.buf_asm, asmop.buf_asm);
 		}
 
-		// f = r_anal_get_fcn_in (core->anal, at, 
+		// f = r_anal_get_fcn_in (core->anal, at,
 		f = fcnIn (ds, at, R_ANAL_FCN_TYPE_FCN | R_ANAL_FCN_TYPE_SYM);
 		if (ds->varsub && f) {
 			core->parser->varlist = r_anal_var_list_dynamic;
@@ -4994,7 +5383,7 @@
 		{
 			RAnalRef *ref;
 			RListIter *iter;
-			RList *xrefs = r_anal_xref_get (core->anal, at);
+			RList *xrefs = r_anal_xrefs_get (core->anal, at);
 			if (xrefs && !r_list_empty (xrefs)) {
 				r_cons_printf (",\"xrefs\":[");
 				r_list_foreach (xrefs, iter, ref) {
@@ -5016,6 +5405,7 @@
 		free (opstr);
 		end_nbopcodes = dis_opcodes == 1 && nb_opcodes > 0 && line>=nb_opcodes;
 		end_nbbytes = dis_opcodes == 0 && nb_bytes > 0 && i>=nb_bytes;
+		result = true;
 		if (end_nbopcodes || end_nbbytes) {
 			break;
 		}
@@ -5024,7 +5414,11 @@
 	core->offset = old_offset;
 	r_anal_op_fini (&ds->analop);
 	ds_free (ds);
-	return true;
+	if (!result) {
+		r_cons_printf ("{}");
+		result = true;
+	}
+	return result;
 }
 
 R_API int r_core_print_disasm_all(RCore *core, ut64 addr, int l, int len, int mode) {
@@ -5039,15 +5433,15 @@
 	RDisasmState *ds = ds_init (core);
 	if (l > core->blocksize || addr != core->offset) {
 		buf = malloc (l + 1);
-		r_core_read_at (core, addr, buf, l);
+		r_io_read_at (core->io, addr, buf, l);
 	}
 	if (mode == 'j') {
-		r_cons_printf ("[");
+		r_cons_print ("[");
 	}
 	r_cons_break_push (NULL, NULL);
 	for (i = 0; i < l; i++) {
 		ds->at = addr + i;
-		ds->vat = p2v (ds, ds->at);
+		ds->vat = r_core_pava (core, ds->at);
 		r_asm_set_pc (core->assembler, ds->vat);
 		if (r_cons_is_breaked ()) {
 			break;
@@ -5075,9 +5469,10 @@
 				if (scr_color) {
 					char *buf_asm;
 					RAnalOp aop;
-					r_anal_op (core->anal, &aop, addr, buf+i, l-i);
+					RAnalFunction *f = fcnIn (ds, ds->vat, R_ANAL_FCN_TYPE_NULL);
+					r_anal_op (core->anal, &aop, addr, buf+i, l-i, R_ANAL_OP_MASK_ALL);
 					buf_asm = r_print_colorize_opcode (core->print, str,
-							core->cons->pal.reg, core->cons->pal.num, false);
+							core->cons->pal.reg, core->cons->pal.num, false, f ? f->addr : 0);
 					r_cons_printf ("%s%s\n",
 							r_print_color_op_type (core->print, aop.type),
 							buf_asm);
@@ -5187,7 +5582,7 @@
 		if (idx >= cur_buf_sz) {
 			break;
 		}
-		r_core_read_at (core, bb->addr, buf+idx, bb->size);
+		r_io_read_at (core->io, bb->addr, buf+idx, bb->size);
 		//ret = r_asm_disassemble (core->assembler, &ds->asmop, buf+idx, bb->size);
 		//if (ret > 0) eprintf ("%s\n",ds->asmop.buf_asm);
 		idx += bb->size;
@@ -5206,7 +5601,7 @@
 		ut32 bb_size_consumed = 0;
 		// internal loop to consume bb that contain case-like operations
 		ds->at = bb->addr;
-		ds->vat = p2v (ds, ds->at);
+		ds->vat = r_core_pava (core, ds->at);
 		ds->addr = bb->addr;
 		len = bb->size;
 
@@ -5221,6 +5616,8 @@
 			}
 		}
 		do {
+			ds->printed_str_addr = UT64_MAX;
+			ds->printed_flag_addr = UT64_MAX;
 			// XXX - why is it necessary to set this everytime?
 			r_asm_set_pc (core->assembler, ds->at);
 			if (ds->lines >= ds->l) {
@@ -5235,7 +5632,7 @@
 			r_core_cmdf (core, "tf 0x%08"PFMT64x, ds->at);
 
 			ds_show_comments_right (ds);
-			ret = ds_disassemble (ds, buf+idx, len - bb_size_consumed);
+			ret = ds_disassemble (ds, buf + idx, len - bb_size_consumed);
 			ds_atabs_option (ds);
 			// TODO: store previous oplen in core->dec
 			if (!core->inc) {
@@ -5245,7 +5642,7 @@
 			if (!ds->lastfail) {
 				r_anal_op (core->anal, &ds->analop,
 					ds->at+bb_size_consumed, buf+idx,
-					len-bb_size_consumed);
+					len-bb_size_consumed, R_ANAL_OP_MASK_ALL);
 			}
 			if (ret < 1) {
 				r_strbuf_init (&ds->analop.esil);
@@ -5278,7 +5675,7 @@
 			ds_print_show_cursor (ds);
 			ds_print_show_bytes (ds);
 			ds_print_lines_right (ds);
-			ds_build_op_str (ds);
+			ds_build_op_str (ds, true);
 			ds_print_opstr (ds);
 			ds_print_sysregs (ds);
 			ds_print_fcn_name (ds);
@@ -5359,7 +5756,7 @@
 	bool asm_ucase = r_config_get_i (core->config, "asm.ucase");
 	int esil = r_config_get_i (core->config, "asm.esil");
 	int flags = r_config_get_i (core->config, "asm.flags");
-	bool asm_immtrim = r_config_get_i (core->config, "asm.immtrim");
+	bool asm_immtrim = r_config_get_i (core->config, "asm.imm.trim");
 	int i = 0, j, ret, err = 0;
 	ut64 old_offset = core->offset;
 	RAsmOp asmop;
@@ -5380,7 +5777,7 @@
 			// Backward disasm `nb_bytes` bytes
 			nb_bytes = -nb_bytes;
 			core->offset -= nb_bytes;
-			r_core_read_at (core, core->offset, core->block, nb_bytes);
+			r_io_read_at (core->io, core->offset, core->block, nb_bytes);
 		}
 	} else if (!nb_bytes) {
 		if (nb_opcodes < 0) {
@@ -5401,7 +5798,7 @@
 			if (nb_bytes > core->blocksize) {
 				r_core_block_size (core, nb_bytes);
 			}
-			r_core_read_at (core, core->offset, core->block, nb_bytes);
+			r_io_read_at (core->io, core->offset, core->block, nb_bytes);
 		} else {
 			// workaround for the `for` loop below
 			nb_bytes = core->blocksize;
@@ -5425,7 +5822,7 @@
 	}
 	r_cons_break_push (NULL, NULL);
 
-	int midflags = r_config_get_i (core->config, "asm.midflags");
+	int midflags = r_config_get_i (core->config, "asm.flags.middle");
 	i = 0;
 	j = 0;
 toro:
@@ -5499,7 +5896,9 @@
 		if (show_offset) {
 			const int show_offseg = (core->print->flags & R_PRINT_FLAGS_SEGOFF) != 0;
 			const int show_offdec = (core->print->flags & R_PRINT_FLAGS_ADDRDEC) != 0;
-			r_print_offset (core->print, at, 0, show_offseg, show_offdec, 0, NULL);
+			unsigned int seggrn = r_config_get_i (core->config, "asm.seggrn");
+
+			r_print_offset_sg (core->print, at, 0, show_offseg, seggrn, show_offdec, 0, NULL);
 		}
 		// r_cons_printf ("0x%08"PFMT64x"  ", core->offset+i);
 		if (ret < 1) {
@@ -5523,7 +5922,7 @@
 				};
 				char *tmpopstr, *opstr = NULL;
 				r_anal_op (core->anal, &analop, core->offset + i,
-					core->block + addrbytes * i, core->blocksize - addrbytes * i);
+					core->block + addrbytes * i, core->blocksize - addrbytes * i, R_ANAL_OP_MASK_ALL);
 				tmpopstr = r_anal_op_to_string (core->anal, &analop);
 				if (fmt == 'e') { // pie
 					char *esil = (R_STRBUF_SAFEGET (&analop.esil));
@@ -5560,9 +5959,10 @@
 					RAnalOp aop = {
 						0
 					};
+					RAnalFunction *f = r_anal_get_fcn_in (core->anal, core->offset + i, R_ANAL_FCN_TYPE_NULL);
 					r_anal_op (core->anal, &aop, core->offset + i,
-						core->block + addrbytes * i, core->blocksize - addrbytes * i);
-					asm_str = r_print_colorize_opcode (core->print, asm_str, color_reg, color_num, false);
+						core->block + addrbytes * i, core->blocksize - addrbytes * i, R_ANAL_OP_MASK_BASIC);
+					asm_str = r_print_colorize_opcode (core->print, asm_str, color_reg, color_num, false, f ? f->addr : 0);
 					r_cons_printf ("%s%s"Color_RESET "\n",
 						r_print_color_op_type (core->print, aop.type),
 						asm_str);
diff -Nru radare2-2.3.0+dfsg/libr/core/file.c radare2-2.8.0+dfsg/libr/core/file.c
--- radare2-2.3.0+dfsg/libr/core/file.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/file.c	2018-08-07 14:12:36.000000000 +0000
@@ -18,7 +18,7 @@
 	RBinFile *bf = ofile ? r_bin_file_find_by_fd (core->bin, ofile->fd)
 		: NULL;
 	RIODesc *odesc = (core->io && ofile) ? r_io_desc_get (core->io, ofile->fd) : NULL;
-	char *ofilepath = NULL, *obinfilepath = bf? strdup (bf->file): NULL;
+	char *ofilepath = NULL, *obinfilepath = (bf && bf->file)? strdup (bf->file): NULL;
 	int ret = false;
 	ut64 origoff = core->offset;
 	if (odesc) {
@@ -160,44 +160,6 @@
 	return ret;
 }
 
-// NOTE: probably not all environment vars takes sesnse
-// because they can be replaced by commands in the given
-// command.. we should only expose the most essential and
-// unidirectional ones.
-R_API void r_core_sysenv_help(const RCore *core) {
-	const char *help_msg[] = {
-		"Usage:", "!<cmd>", "  Run given command as in system(3)",
-		"!", "", "list all historic commands",
-		"!", "ls", "execute 'ls' in shell",
-		"!!", "", "save command history to hist file",
-		"!!", "ls~txt", "print output of 'ls' and grep for 'txt'",
-		".!", "rabin2 -rpsei ${FILE}", "run each output line as a r2 cmd",
-		"!", "echo $SIZE", "display file size",
-		"!-", "", "clear history in current session",
-		"!-*", "", "clear and save empty history log",
-		"!=!", "", "enable remotecmd mode",
-		"=!=", "", "disable remotecmd mode",
-		"\nEnvironment:", "", "",
-		"R2_FILE", "", "file name",
-		"R2_OFFSET", "", "10base offset 64bit value",
-		"R2_BYTES", "", "TODO: variable with bytes in curblock",
-		"R2_XOFFSET", "", "same as above, but in 16 base",
-		"R2_BSIZE", "", "block size",
-		"R2_ENDIAN", "", "'big' or 'little'",
-		"R2_IOVA", "", "is io.va true? virtual addressing (1,0)",
-		"R2_DEBUG", "", "debug mode enabled? (1,0)",
-		"R2_BLOCK", "", "TODO: dump current block to tmp file",
-		"R2_SIZE", "","file size",
-		"R2_ARCH", "", "value of asm.arch",
-		"R2_BITS", "", "arch reg size (8, 16, 32, 64)",
-		"RABIN2_LANG", "", "assume this lang to demangle",
-		"RABIN2_DEMANGLE", "", "demangle or not",
-		"RABIN2_PDBSERVER", "", "e pdb.server",
-		NULL
-	};
-	r_core_cmd_help (core, help_msg);
-}
-
 R_API void r_core_sysenv_end(RCore *core, const char *cmd) {
 	// TODO: remove tmpfilez
 	if (strstr (cmd, "R2_BLOCK")) {
@@ -231,7 +193,7 @@
 	r_sys_setenv ("RABIN2_PDBSERVER", r_config_get (core->config, "pdb.server"));
 	if (desc && desc->name) {
 		r_sys_setenv ("R2_FILE", desc->name);
-		r_sys_setenv ("R2_SIZE", sdb_fmt (0, "%"PFMT64d, r_io_desc_size (desc)));
+		r_sys_setenv ("R2_SIZE", sdb_fmt ("%"PFMT64d, r_io_desc_size (desc)));
 		if (cmd && strstr (cmd, "R2_BLOCK")) {
 			// replace BLOCK in RET string
 			if ((f = r_file_temp ("r2block"))) {
@@ -244,12 +206,12 @@
 	}
 	r_sys_setenv ("RABIN2_LANG", r_config_get (core->config, "bin.lang"));
 	r_sys_setenv ("RABIN2_DEMANGLE", r_config_get (core->config, "bin.demangle"));
-	r_sys_setenv ("R2_OFFSET", sdb_fmt (0, "%"PFMT64d, core->offset));
-	r_sys_setenv ("R2_XOFFSET", sdb_fmt (0, "0x%08"PFMT64x, core->offset));
+	r_sys_setenv ("R2_OFFSET", sdb_fmt ("%"PFMT64d, core->offset));
+	r_sys_setenv ("R2_XOFFSET", sdb_fmt ("0x%08"PFMT64x, core->offset));
 	r_sys_setenv ("R2_ENDIAN", core->assembler->big_endian? "big": "little");
-	r_sys_setenv ("R2_BSIZE", sdb_fmt (0, "%d", core->blocksize));
+	r_sys_setenv ("R2_BSIZE", sdb_fmt ("%d", core->blocksize));
 	r_sys_setenv ("R2_ARCH", r_config_get (core->config, "asm.arch"));
-	r_sys_setenv ("R2_BITS", sdb_fmt (0, "%d", r_config_get_i (core->config, "asm.bits")));
+	r_sys_setenv ("R2_BITS", sdb_fmt ("%d", r_config_get_i (core->config, "asm.bits")));
 	r_sys_setenv ("R2_COLOR", r_config_get_i (core->config, "scr.color")? "1": "0");
 	r_sys_setenv ("R2_DEBUG", r_config_get_i (core->config, "cfg.debug")? "1": "0");
 	r_sys_setenv ("R2_IOVA", r_config_get_i (core->config, "io.va")? "1": "0");
@@ -329,9 +291,10 @@
 	RIODesc *desc = cf ? r_io_desc_get (r->io, cf->fd) : NULL;
 	RBinFile *binfile = NULL;
 	RBinPlugin *plugin;
+	RBinOptions *bo = NULL;
 	int xtr_idx = 0; // if 0, load all if xtr is used
-	int treat_as_rawstr = false;
 
+	// TODO : Honor file.path eval var too?
 	if (!strncmp ("dbg://", filenameuri, 6)) {
 		filenameuri += 6;
 	}
@@ -351,11 +314,21 @@
 	}
 #endif
 	int fd = cf ? cf->fd : -1;
-	if (!r_bin_load (r->bin, filenameuri, baseaddr, UT64_MAX, xtr_idx, fd, treat_as_rawstr)) {
+
+	bo = r_bin_options_new (0LL, baseaddr, false);
+	if (!bo) {
+		eprintf ("Failed to create bin options\n");
+		return false;
+	}
+
+	bo->xtr_idx = xtr_idx;
+	bo->iofd = fd;
+	if (r_bin_open (r->bin, filenameuri, bo) == -1) {
 		eprintf ("RBinLoad: Cannot open %s\n", filenameuri);
 		if (r_config_get_i (r->config, "bin.rawstr")) {
-			treat_as_rawstr = true;
-			if (!r_bin_load (r->bin, filenameuri, baseaddr, UT64_MAX, xtr_idx, fd, treat_as_rawstr)) {
+			bo->rawstr = true;
+			if (r_bin_open (r->bin, filenameuri, bo) == -1) {
+				r_bin_options_free (bo);
 				return false;
 			}
 		}
@@ -393,6 +366,8 @@
 	if (plugin && !strcmp (plugin->name, "dex")) {
 		r_core_cmd0 (r, "\"(fix-dex,wx `ph sha1 $s-32 @32` @12 ; wx `ph adler32 $s-12 @12` @8)\"\n");
 	}
+
+	r_bin_options_free (bo);
 	return true;
 }
 
@@ -455,6 +430,7 @@
 
 R_API bool r_core_file_loadlib(RCore *core, const char *lib, ut64 libaddr) {
 	const char *ldlibrarypath[] = {
+		R2_LIBDIR,
 		"/usr/local/lib",
 		"/usr/lib",
 		"/lib",
@@ -502,7 +478,7 @@
 	// TODO: 
 	char *file;
 	RListIter *iter;
-	char *hdir = r_str_newf (R2_HOMEDIR "/rc.d/bin-%s", name);
+	char *hdir = r_str_newf (R_JOIN_2_PATHS (R2_HOME_BINRC, "bin-%s"), name);
 	char *path = r_str_home (hdir);
 	RList *files = r_sys_dir (path);
 	if (!r_list_empty (files)) {
@@ -612,7 +588,7 @@
 					r_config_get_i (r->config, "asm.bits"));
 		}
 	}
-	if (r_config_get_i (r->config, "io.exec")) {
+	if (desc && r_config_get_i (r->config, "io.exec")) {
 		desc->flags |= R_IO_EXEC;
 	}
 	if (plugin && plugin->name && !strcmp (plugin->name, "dex")) {
@@ -644,10 +620,61 @@
 	if (!va) {
 		r_config_set_i (r->config, "io.va", 0);
 	}
+
+	//If type == R_BIN_TYPE_CORE, we need to create all the maps
+	if (plugin && binfile && plugin->file_type
+		 && plugin->file_type (binfile) == R_BIN_TYPE_CORE) {
+		ut64 sp_addr = (ut64)-1;
+		RIOMap *stack_map = NULL;
+
+		// Setting the right arch and bits, so regstate will be shown correctly
+		if (plugin->info) {
+			RBinInfo *inf = plugin->info (binfile);
+			eprintf ("Setting up coredump: asm.arch <-> %s and asm.bits <-> %d\n",
+									inf->arch,
+									inf->bits);
+			r_config_set (r->config, "asm.arch", inf->arch);
+			r_config_set_i (r->config, "asm.bits", inf->bits);
+                }
+		if (binfile->o->regstate) {
+			if (r_reg_arena_set_bytes (r->anal->reg, binfile->o->regstate)) {
+				eprintf ("Setting up coredump: Problem while setting the registers\n");
+			} else {
+				eprintf ("Setting up coredump: Registers have been set\n");
+				const char *regname = r_reg_get_name (r->anal->reg, R_REG_NAME_SP);
+				RRegItem *reg = r_reg_get (r->anal->reg, regname, -1);
+				sp_addr = r_reg_get_value (r->anal->reg, reg);
+				stack_map = r_io_map_get (r->io, sp_addr);
+			}
+			free (binfile->o->regstate);
+                }
+
+		RBinObject *o = binfile->o;
+		int map = 0;
+		if (o && o->maps) {
+			RList *maps = o->maps;
+			RListIter *iter;
+			RBinMap *mapcore;
+
+			r_list_foreach (maps, iter, mapcore) {
+				RIOMap *iomap = r_io_map_get (r->io, mapcore->addr);
+				if (iomap && (mapcore->file || stack_map == iomap)) {
+					r_io_map_set_name (iomap, mapcore->file ? mapcore->file : "[stack]");
+				}
+				map++;
+			}
+			r_list_free (maps);
+			o->maps = NULL;
+		}
+		eprintf ("Setting up coredump: %d maps have been found and created\n", map);
+		goto beach;
+	}
+
 	//workaround to map correctly malloc:// and raw binaries
 	if (!plugin || !strcmp (plugin->name, "any") || r_io_desc_is_dbg (desc) || (obj && (!obj->sections || !va))) {
 		r_io_map_new (r->io, desc->fd, desc->flags, 0LL, laddr, r_io_desc_size (desc), true);
 	}
+beach:
 	return true;
 }
 
@@ -792,7 +819,11 @@
 
 R_API void r_core_file_free(RCoreFile *cf) {
 	int res = 1;
-	if (!cf || !cf->core) {
+	if (!cf) {
+		return;
+	}
+	if (!cf->core) {
+		free (cf);
 		return;
 	}
 	res = r_core_files_free (cf->core, cf);
@@ -856,6 +887,7 @@
 		}
 	}
 	r_io_desc_close (desc);
+	r_core_file_free (fh);
 	return ret;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/core/fortune.c radare2-2.8.0+dfsg/libr/core/fortune.c
--- radare2-2.3.0+dfsg/libr/core/fortune.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/fortune.c	2018-08-07 14:12:36.000000000 +0000
@@ -5,8 +5,8 @@
 };
 
 static char *getFortuneFile(RCore *core, const char *type) {
-	return r_str_newf ("%s/share/doc/radare2/fortunes.%s",
-		r_config_get (core->config, "dir.prefix"), type);
+	return r_str_newf (R_JOIN_3_PATHS ("%s", R2_FORTUNES, "fortunes.%s"),
+		r_sys_prefix (NULL), type);
 }
 
 R_API void r_core_fortune_list_types(void) {
diff -Nru radare2-2.3.0+dfsg/libr/core/gdiff.c radare2-2.8.0+dfsg/libr/core/gdiff.c
--- radare2-2.3.0+dfsg/libr/core/gdiff.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/gdiff.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2016 - nibble, pancake */
+/* radare - LGPL - Copyright 2010-2018 - nibble, pancake */
 
 #include <stdio.h>
 #include <string.h>
@@ -11,6 +11,17 @@
 	RList *la, *lb;
 	RAnalFunction *fa = r_anal_get_fcn_at (c->anal, addr, 0);
 	RAnalFunction *fb = r_anal_get_fcn_at (c->anal, addr2, 0);
+	if (!fa || !fb) {
+		return false;
+	}
+	RAnalBlock *bb;
+	RListIter *iter;
+	r_list_foreach (fa->bbs, iter, bb) {
+		r_anal_diff_fingerprint_bb (c->anal, bb);
+	}
+	r_list_foreach (fb->bbs, iter, bb) {
+		r_anal_diff_fingerprint_bb (c->anal, bb);
+	}
 	la = r_list_new ();
 	r_list_append (la, fa);
 	lb = r_list_new ();
@@ -18,7 +29,7 @@
 	r_anal_diff_fcn (c->anal, la, lb);
 	r_list_free (la);
 	r_list_free (lb);
-	return false;
+	return true;
 }
 
 /* Fingerprint functions and blocks, then diff. */
@@ -49,7 +60,7 @@
 		/* Fingerprint fcn */
 		r_list_foreach (cores[i]->anal->fcns, iter, fcn) {
 			int newsize = r_anal_diff_fingerprint_fcn (cores[i]->anal, fcn);
-			r_anal_fcn_set_size (fcn, newsize);
+			r_anal_fcn_set_size (cores[i]->anal, fcn, newsize);
 		}
 	}
 	/* Diff functions */
@@ -91,7 +102,6 @@
         int digits = 1;
         int len;
 
-
         r_list_foreach (fcns, iter, f) {
                 if (f->name && (len = strlen (f->name)) > maxnamelen) {
                         maxnamelen = len;
diff -Nru radare2-2.3.0+dfsg/libr/core/graph.c radare2-2.8.0+dfsg/libr/core/graph.c
--- radare2-2.3.0+dfsg/libr/core/graph.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/graph.c	2018-08-07 14:12:36.000000000 +0000
@@ -32,7 +32,7 @@
 #define PAGEKEY_SPEED (h / 2)
 /* 15 */
 #define MINIGRAPH_NODE_TEXT_CUR "<@@@@@@>"
-#define MINIGRAPH_NODE_MIN_WIDTH 8
+#define MINIGRAPH_NODE_MIN_WIDTH 12
 #define MINIGRAPH_NODE_TITLE_LEN 4
 #define MINIGRAPH_NODE_CENTER_X 3
 #define MININODE_MIN_WIDTH 16
@@ -43,8 +43,10 @@
 #define BODY_OFFSETS    0x1
 #define BODY_SUMMARY    0x2
 
-#define hash_set(sdb, k, v) (sdb_num_set (sdb, sdb_fmt (0, "%"PFMT64u, (ut64) (size_t) k), (ut64) (size_t) v, 0))
-#define hash_get(sdb, k) (sdb_num_get (sdb, sdb_fmt (0, "%"PFMT64u, (ut64) (size_t) k), NULL))
+#define NORMALIZE_MOV(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))
+
+#define hash_set(sdb, k, v) (sdb_num_set (sdb, sdb_fmt ("%"PFMT64u, (ut64) (size_t) k), (ut64) (size_t) v, 0))
+#define hash_get(sdb, k) (sdb_num_get (sdb, sdb_fmt ("%"PFMT64u, (ut64) (size_t) k), NULL))
 #define hash_get_rnode(sdb, k) ((RGraphNode *) (size_t) hash_get (sdb, k))
 #define hash_get_rlist(sdb, k) ((RList *) (size_t) hash_get (sdb, k))
 #define hash_get_int(sdb, k) ((int) hash_get (sdb, k))
@@ -92,15 +94,13 @@
 	RCore *core;
 	RAGraph *g;
 	RAnalFunction **fcn;
+	bool follow_offset;
 	int fs;
 };
 
 #define G(x, y) r_cons_canvas_gotoxy (g->can, x, y)
 #define W(x) r_cons_canvas_write (g->can, x)
-#define B(x, y, w, h) r_cons_canvas_box (g->can, x, y, w, h, g->color_box)
-#define B1(x, y, w, h) r_cons_canvas_box (g->can, x, y, w, h, g->color_box2)
-#define B2(x, y, w, h) r_cons_canvas_box (g->can, x, y, w, h, g->color_box3)
-#define F(x, y, x2, y2, c) r_cons_canvas_fill (g->can, x, y, x2, y2, c, 0)
+#define F(x, y, x2, y2, c) r_cons_canvas_fill (g->can, x, y, x2, y2, c)
 
 static bool is_offset(const RAGraph *g) {
 	return g->mode == R_AGRAPH_MODE_OFFSET;
@@ -157,18 +157,44 @@
 	return opts;
 }
 
+// duplicated from visual.c
+static void rotateAsmemu(RCore *core) {
+	const bool isEmuStr = r_config_get_i (core->config, "emu.str");
+	const bool isEmu = r_config_get_i (core->config, "asm.emu");
+	if (isEmu) {
+		if (isEmuStr) {
+			r_config_set (core->config, "emu.str", "false");
+		} else {
+			r_config_set (core->config, "asm.emu", "false");
+		}
+	} else {
+		r_config_set (core->config, "emu.str", "true");
+	}
+}
+
+static void showcursor(RCore *core, int x) {
+	if (!x) {
+		int wheel = r_config_get_i (core->config, "scr.wheel");
+		if (wheel) {
+			r_cons_enable_mouse (true);
+		}
+	} else {
+		r_cons_enable_mouse (false);
+	}
+	r_cons_show_cursor (x);
+}
+
 static char *get_title(ut64 addr) {
 	return r_str_newf ("0x%"PFMT64x, addr);
 }
 
 static int agraph_refresh(struct agraph_refresh_data *grd);
 
-static void update_node_dimension(const RGraph *g, int is_mini, int zoom) {
+static void update_node_dimension(const RGraph *g, int is_mini, int zoom, int edgemode, bool callgraph, int layout) {
 	const RList *nodes = r_graph_get_nodes (g);
 	RGraphNode *gn;
 	RListIter *it;
 	RANode *n;
-
 	graph_foreach_anode (nodes, it, gn, n) {
 		if (is_mini) {
 			n->h = 1;
@@ -191,10 +217,32 @@
 			/* scale node by zoom */
 			n->w = R_MAX (MIN_NODE_WIDTH, (n->w * zoom) / 100);
 			n->h = R_MAX (MIN_NODE_HEIGHT, (n->h * zoom) / 100);
+
+			if (edgemode == 2 && !callgraph) {
+				if (!layout) {
+					n->w = R_MAX (n->w, (r_list_length (n->gnode->out_nodes)*2  + 1) + R_EDGES_X_INC * 2);
+					n->w = R_MAX (n->w, (r_list_length (n->gnode->in_nodes)*2 + 1) + R_EDGES_X_INC * 2);
+				} else {
+					n->h = R_MAX (n->h, (r_list_length (n->gnode->out_nodes)  + 1) + R_EDGES_X_INC);
+					n->h = R_MAX (n->h, (r_list_length (n->gnode->in_nodes) + 1) + R_EDGES_X_INC);
+				}
+			}
 		}
 	}
 }
 
+static void append_shortcut (const RAGraph *g, char *title, char *nodetitle, int left) {
+	char *shortcut = sdb_get (g->db, sdb_fmt ("agraph.nodes.%s.shortcut", nodetitle), 0);
+	if (shortcut) {
+		if (g->can->color) {
+			strncat (title, sdb_fmt ("\x1b[33m[g%s]",  shortcut), left);
+		} else {
+			strncat (title, sdb_fmt ("[g%s]", shortcut), left);
+		}
+		free (shortcut);
+	}
+}
+
 static void mini_RANode_print(const RAGraph *g, const RANode *n, int cur, bool details) {
 	char title[TITLE_LEN];
 	int x, delta_x = 0;
@@ -237,8 +285,13 @@
 					str += l - MINIGRAPH_NODE_TITLE_LEN;
 				}
 			}
-			snprintf (title, sizeof (title) - 1, "__%s__", str);
-			W (title + delta_x);
+			if (g->can->color) {
+				snprintf (title, sizeof (title) - 1, "%s__%s__", Color_RESET, str);
+			} else {
+				snprintf (title, sizeof (title) - 1, "__%s__", str);
+			}
+			append_shortcut (g, title, n->title, sizeof (title) - strlen (title) - 1);
+			W (r_str_ansi_crop (title, delta_x, 0, 20, 1));
 		}
 	} else {
 		snprintf (title, sizeof (title) - 1,
@@ -264,7 +317,6 @@
 	char title[TITLE_LEN];
 	char *body;
 	int x, y;
-	char *shortcut;
 
 	x = n->x + g->can->sx;
 	y = n->y + g->can->sy;
@@ -277,19 +329,18 @@
 	if (y < -1) {
 		delta_y = R_MIN (n->h - BORDER_HEIGHT - 1, -y - MARGIN_TEXT_Y);
 	}
-	shortcut = sdb_get (g->db, sdb_fmt (2, "agraph.nodes.%s.shortcut", n->title), 0);
 	/* print the title */
 	if (cur) {
 		snprintf (title, sizeof (title) - 1, "[%s]", n->title);
 	} else {
-		snprintf (title, sizeof (title) - 1, " %s", n->title);
-	}
-	if (shortcut) {
-		strncat (title, sdb_fmt (2, " ;[g%s]", shortcut), sizeof (title) - strlen (title) - 1);
-		free (shortcut);
+		char *color = g->can->color ? Color_RESET : "";
+		snprintf (title, sizeof (title) - 1, " %s%s ", color, n->title);
+		append_shortcut (g, title, n->title, sizeof (title) - strlen (title) - 1);
 	}
 	if ((delta_x < strlen (title)) && G (n->x + MARGIN_TEXT_X + delta_x, n->y + 1)) {
-		W (title + delta_x);
+		char *res = r_str_ansi_crop (title, delta_x, 0, n->w - BORDER_WIDTH, 1);
+		W (res);
+		free (res);
 	}
 
 	/* print the body */
@@ -336,10 +387,11 @@
 
 	// TODO: check if node is traced or not and show proper color
 	// This info must be stored inside RANode* from RCore*
+	RCons *cons = r_cons_singleton ();
 	if (cur) {
-		B1 (n->x, n->y, n->w, n->h);
+		r_cons_canvas_box (g->can, n->x, n->y, n->w, n->h, cons->pal.graph_box2);
 	} else {
-		B (n->x, n->y, n->w, n->h);
+		r_cons_canvas_box (g->can, n->x, n->y, n->w, n->h, cons->pal.graph_box);
 	}
 }
 
@@ -389,10 +441,13 @@
 						at = get_anode (gt);
 						if (ak->layer != i || at->layer != i) {
 							// this should never happen
+							// but it happens if we do graph.dummy = false, so better hide it for now
+#if 0
 							eprintf ("(WARNING) \"%s\" (%d) or \"%s\" (%d) are not on the right layer (%d)\n",
 								ak->title, ak->layer,
 								at->title, at->layer,
 								i);
+#endif
 							continue;
 						}
 						m[ak->pos_in_layer][at->pos_in_layer]++;
@@ -604,7 +659,7 @@
 	const RListIter *it;
 	const RGraphEdge *e;
 
-	g->long_edges = r_list_new ();
+	g->long_edges = r_list_newf ((RListFree)free);
 	dummy_vis.data = g->long_edges;
 	dummy_vis.tree_edge = (RGraphEdgeCallback) view_dummy;
 	dummy_vis.fcross_edge = (RGraphEdgeCallback) view_dummy;
@@ -1665,7 +1720,7 @@
 				}
 
 				int nth = get_nth (g, a, b);
-				int xinc = 4 + 2 * (nth + 1);
+				int xinc = R_EDGES_X_INC + 2 * (nth + 1);
 
 				int ax = g->layout == 0 ? a->x + xinc : a->y + (a->h / 2) + nth;
 				int bx = g->layout == 0 ? b->x + xinc : b->y + (b->h / 2) + nth;
@@ -1920,31 +1975,36 @@
 	if (!hc) {
 		return NULL;
 	}
-	r_config_save_num (hc, "asm.fcnlines", "asm.lines", "asm.bytes",
-		"asm.cmtcol", "asm.marks", "asm.marks", "asm.offset",
-		"asm.comments", "asm.cmtright", NULL);
+	r_config_save_num (hc, "asm.lines", "asm.bytes",
+		"asm.cmt.col", "asm.marks", "asm.marks", "asm.offset",
+		"asm.comments", "asm.cmt.right", NULL);
 	const bool o_comments = r_config_get_i (core->config, "graph.comments");
 	const bool o_cmtright = r_config_get_i (core->config, "graph.cmtright");
+	const bool o_graph_offset = r_config_get_i (core->config, "graph.offset");
 	int o_cursor = core->print->cur_enabled;
 
 	const char *cmd = (opts & BODY_SUMMARY)? "pds": "pD";
 
 	// configure options
-	r_config_set_i (core->config, "asm.fcnlines", false);
 	r_config_set_i (core->config, "asm.lines", false);
-	r_config_set_i (core->config, "asm.cmtcol", 0);
+	r_config_set_i (core->config, "asm.cmt.col", 0);
 	r_config_set_i (core->config, "asm.marks", false);
-	r_config_set_i (core->config, "asm.cmtright", (opts & BODY_SUMMARY) || o_cmtright);
+	r_config_set_i (core->config, "asm.cmt.right", (opts & BODY_SUMMARY) || o_cmtright);
 	r_config_set_i (core->config, "asm.comments", (opts & BODY_SUMMARY) || o_comments);
 	core->print->cur_enabled = false;
 
-	if (opts & BODY_OFFSETS || opts & BODY_SUMMARY) {
+	if (opts & BODY_OFFSETS || opts & BODY_SUMMARY || o_graph_offset) {
 		r_config_set_i (core->config, "asm.offset", true);
+	} else {
+		r_config_set_i (core->config, "asm.offset", false);
+	}
+
+	if (opts & BODY_OFFSETS || opts & BODY_SUMMARY) {
 		r_config_set_i (core->config, "asm.bytes", true);
 	} else {
 		r_config_set_i (core->config, "asm.bytes", false);
-		r_config_set_i (core->config, "asm.offset", false);
 	}
+
 	bool html = r_config_get_i (core->config, "scr.html");
 	r_config_set_i (core->config, "scr.html", 0);
 	body = r_core_cmd_strf (core,
@@ -2020,13 +2080,6 @@
 	int shortcuts = 0;
 	core->keep_asmqjmps = false;
 
-	/* update colors from palette */
-	g->color_box = core->cons->pal.graph_box;
-	g->color_box2 = core->cons->pal.graph_box2;
-	g->color_box3 = core->cons->pal.graph_box3;
-	g->color_true = core->cons->pal.graph_true;
-	g->color_false = core->cons->pal.graph_false;
-
 	if (emu) {
 		saved_arena = r_reg_arena_peek (core->anal->reg);
 	}
@@ -2047,7 +2100,7 @@
 		if (shortcuts) {
 			shortcut = r_core_add_asmqjmp (core, bb->addr);
 			if (shortcut) {
-				sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.shortcut", title), shortcut, 0);
+				sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.shortcut", title), shortcut, 0);
 				free (shortcut);
 			}
 		}
@@ -2072,6 +2125,24 @@
 	core->anal->stackptr = saved_stackptr;
 }
 
+static void delete_dup_edges (RAGraph *g) {
+	RListIter *it, *in_it, *in_it2, *in_it2_tmp;
+	RGraphNode *n, *a, *b;
+	r_list_foreach (g->graph->nodes, it, n) {
+		r_list_foreach (n->out_nodes, in_it, a) {
+			for (in_it2 = in_it->n; in_it2 && (b = in_it2->data, in_it2_tmp = in_it2->n, 1); in_it2 = in_it2_tmp) {
+				if (a->idx == b->idx) {
+					r_list_delete (n->out_nodes, in_it2);
+					r_list_delete_data (n->all_neighbours, b);
+					r_list_delete_data (b->in_nodes, n);
+					r_list_delete_data (b->all_neighbours, n);
+					g->graph->n_edges--;
+				}
+			}
+		}
+	}
+}
+
 /* build the RGraph inside the RAGraph g, starting from the Basic Blocks */
 static int get_bbnodes(RAGraph *g, RCore *core, RAnalFunction *fcn) {
 	RAnalBlock *bb;
@@ -2102,12 +2173,12 @@
 		char *title = get_title (bb->addr);
 
 		RANode *node = r_agraph_add_node (g, title, body);
-		shortcuts = r_config_get_i (core->config, "graph.nodejmps");
+		shortcuts = g->is_interactive ? r_config_get_i (core->config, "graph.nodejmps") : false;
 
 		if (shortcuts) {
 			shortcut = r_core_add_asmqjmp (core, bb->addr);
 			if (shortcut) {
-				sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.shortcut", title), shortcut, 0);
+				sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.shortcut", title), shortcut, 0);
 				free (shortcut);
 			}
 		}
@@ -2154,6 +2225,7 @@
 		}
 	}
 
+	delete_dup_edges (g);
 	ret = true;
 
 cleanup:
@@ -2199,9 +2271,6 @@
 
 	refs = r_anal_fcn_get_refs (core->anal, fcn);
 	r_list_foreach (refs, iter, ref) {
-		/* XXX: something is broken, why there are duplicated
-		 *      nodes here?! goto check fcn->refs!! */
-		/* avoid dups wtf */
 		title = get_title (ref->addr);
 		if (r_agraph_get_node (g, title) != NULL) {
 			continue;
@@ -2447,7 +2516,7 @@
 	return g->x < 0? -g->x + v: v;
 }
 
-static void agraph_set_layout(RAGraph *g, bool is_interactive) {
+static void agraph_set_layout(RAGraph *g) {
 	RListIter *it;
 	RGraphNode *n;
 	RANode *a;
@@ -2460,13 +2529,13 @@
 			continue;
 		}
 		const char *k;
-		k = sdb_fmt (1, "agraph.nodes.%s.x", a->title);
+		k = sdb_fmt ("agraph.nodes.%s.x", a->title);
 		sdb_num_set (g->db, k, rebase (g, a->x), 0);
-		k = sdb_fmt (1, "agraph.nodes.%s.y", a->title);
+		k = sdb_fmt ("agraph.nodes.%s.y", a->title);
 		sdb_num_set (g->db, k, rebase (g, a->y), 0);
-		k = sdb_fmt (1, "agraph.nodes.%s.w", a->title);
+		k = sdb_fmt ("agraph.nodes.%s.w", a->title);
 		sdb_num_set (g->db, k, a->w, 0);
-		k = sdb_fmt (1, "agraph.nodes.%s.h", a->title);
+		k = sdb_fmt ("agraph.nodes.%s.h", a->title);
 		sdb_num_set (g->db, k, a->h, 0);
 	}
 }
@@ -2516,18 +2585,20 @@
 }
 #endif
 
-static int get_nth (const RAGraph *g, RANode *src, RANode *dst) {
+static int get_edge_number (const RAGraph *g, RANode *src, RANode *dst, bool outgoing) {
 	RListIter *itn;
 	RGraphNode *gv;
 	int cur_nth = 0;
 	int nth = 0;
 	RANode *v;
 
-	if (src->is_dummy) {
+	if (outgoing && src->is_dummy) {
 		RANode *in = (RANode *) (((RGraphNode *)r_list_first ((src->gnode)->in_nodes))->data);
-		cur_nth = get_nth (g, in, src);
+		cur_nth = get_edge_number (g, in, src, outgoing);
 	} else {
-		const RList *neighbours = r_graph_get_neighbours (g->graph, src->gnode);
+		const RList *neighbours = outgoing
+			? r_graph_get_neighbours (g->graph, src->gnode)
+			: r_graph_innodes (g->graph, dst->gnode);
 		const int exit_edges = r_list_length (neighbours);
 		graph_foreach_anode (neighbours, itn, gv, v) {
 			cur_nth = nth;
@@ -2536,7 +2607,9 @@
 			} else if (exit_edges == 1) {
 				cur_nth = -1;
 			}
-			if (gv->idx == (dst->gnode)->idx) {
+			if (outgoing && gv->idx == (dst->gnode)->idx) {
+				break;
+			} else if (!outgoing && gv->idx == (src->gnode)->idx) {
 				break;
 			}
 			nth++;
@@ -2545,6 +2618,10 @@
 	return cur_nth;
 }
 
+static int get_nth (const RAGraph *g, RANode *src, RANode *dst) {
+	return get_edge_number (g, src, dst, true);
+}
+
 struct tmplayer {
 	int layer;
 	int edgectr;
@@ -2588,10 +2665,36 @@
 			r_cons_canvas_line (g->can,
 				n->x + sx, n->y + sy,
 				n2->x + sx2, n2->y, &style);
+
+			if (n2->is_dummy) {
+				r_cons_canvas_line (g->can,
+					n2->x + sx2, n2->y - 1,
+					n2->x + sx2, n2->y + n2->h, &style);
+			}
 		}
 	}
 }
 
+static int first_x_cmp (const void *_a, const void *_b) {
+	RGraphNode *ga = (RGraphNode *)_a;
+	RGraphNode *gb = (RGraphNode *)_b;
+	RANode *a = (RANode*) ga->data;
+	RANode *b = (RANode*) gb->data;
+	if (b->y < a->y) {
+		return -1;
+	}
+	if (b->y > a->y) {
+		return 1;
+	}
+	if (a->x < b->x) {
+		return 1;
+	}
+	if (a->x > b->x) {
+		return -1;
+	}
+	return 0;
+}
+
 static void agraph_print_edges(RAGraph *g) {
 	if (!g->edgemode) {
 		return;
@@ -2600,7 +2703,7 @@
 		agraph_print_edges_simple (g);
 		return;
 	}
-	int nth;
+	int out_nth, in_nth, bendpoint;
 	RListIter *itn, *itm, *ito;
 	RCanvasLineStyle style = {0};
 	const RList *nodes = r_graph_get_nodes (g->graph);
@@ -2614,8 +2717,8 @@
 	graph_foreach_anode (nodes, itm, ga, a) {
 		const RGraphNode *gb;
 		RANode *b;
-		const RList *neighbours = r_graph_get_neighbours (g->graph, ga);
-		int ax, ay, bx, by, xinc;
+		RList *neighbours = (RList *)r_graph_get_neighbours (g->graph, ga);
+		int ax, ay, bx, by, a_x_inc, b_x_inc;
 		tl = tm = NULL;
 
 		r_list_foreach (lyr, ito, tl) {
@@ -2641,7 +2744,7 @@
 		}
 
 		if (!tm) {
-			tm = calloc (1, sizeof (struct tmplayer));
+			tm = R_NEW0 (struct tmplayer);
 			if (tm) {
 				tm->layer = a->layer;
 				tm->edgectr = 0;
@@ -2658,23 +2761,41 @@
 		}
 
 		bool many = r_list_length (neighbours) > 2;
+
+		if (many && !g->is_callgraph) {
+			ga->out_nodes->sorted = false;
+			r_list_sort (neighbours, first_x_cmp);
+		}
+
 		graph_foreach_anode (neighbours, itn, gb, b) {
-			int is_first = true;
+			out_nth = get_edge_number (g, a, b, true);
+			in_nth = get_edge_number (g, a, b, false);
+
+			bool parent_many = false;
 			if (a->is_dummy) {
 				RANode *in = (RANode *) (((RGraphNode *)r_list_first (ga->in_nodes))->data);
-				nth = get_nth (g, in, a);
-			} else {
-				nth = get_nth (g, a, b);
+				while (in && in->is_dummy) {
+					in = (RANode *) (((RGraphNode *)r_list_first ((in->gnode)->in_nodes))->data);
+				}
+				if (in && in->gnode) {
+					parent_many = r_list_length (in->gnode->out_nodes) > 2;
+				} else {
+					parent_many = false;
+				}
 			}
-			if (many) {
+
+			style.dot_style = DOT_STYLE_NORMAL;
+			if (many || parent_many) {
 				style.color = LINE_UNCJMP;
 			} else {
-				switch (nth) {
+				switch (out_nth) {
 				case 0:
 					style.color = LINE_TRUE;
+					style.dot_style = DOT_STYLE_CONDITIONAL;
 					break;
 				case 1:
 					style.color = LINE_FALSE;
+					style.dot_style = DOT_STYLE_CONDITIONAL;
 					break;
 				case -1:
 					style.color = LINE_UNCJMP;
@@ -2685,22 +2806,32 @@
 				}
 			}
 
-			xinc = 4 + 2 * (nth + 1);
-
-			ax = a->is_dummy ? a->x : (a->x + xinc);
-			ay = a->y + a->h;
-
-			bx = b->is_dummy ? b->x : (b->x + xinc);
-			by = b->y - 1;
-
 			switch (g->layout) {
 			case 0:
 			default:
-				style.symbol = a->is_dummy ? LINE_NOSYM_VERT : style.color;
+				style.symbol = (!g->hints || a->is_dummy) ? LINE_NOSYM_VERT : style.color;
+				if (a->y + a->h > b->y) {
+					style.dot_style = DOT_STYLE_BACKEDGE;
+				}
+
+				a_x_inc = R_EDGES_X_INC + 2 * (out_nth + 1);
+				b_x_inc = R_EDGES_X_INC + 2 * (in_nth + 1);
+
+				bx = b->is_dummy ? b->x : (b->x + b_x_inc);
+				ay = a->y + a->h;
+				by = b->y - 1;
+
+				if (many && !g->is_callgraph) {
+					int t = R_EDGES_X_INC + 2 * (neighbours->length + 1);
+					ax = a->is_dummy ? a->x : (a->x + a->w/2 + (t/2 - a_x_inc));
+					bendpoint = bx < ax ? neighbours->length - out_nth :  out_nth;
+				} else {
+					ax = a->is_dummy ? a->x : (a->x + a_x_inc);
+					bendpoint = tm->edgectr;
+				}
 
-				if (!a->is_dummy && is_first && nth == 0 && bx > ax) {
-					xinc += 4;
-					ax += 4;
+				if (!a->is_dummy && itn == neighbours->head && out_nth == 0 && bx > ax) {
+					ax += (many && !g->is_callgraph) ? 0 : 4;
 				}
 				if (a->h < a->layer_height) {
 					r_cons_canvas_line (g->can, ax, ay, ax, ay + a->layer_height - a->h, &style);
@@ -2708,14 +2839,14 @@
 					style.symbol = LINE_NOSYM_VERT;
 				}
 				if (by >= ay) {
-					r_cons_canvas_line_square_defined (g->can, ax, ay, bx, by, &style, tm->edgectr, true);
+					r_cons_canvas_line_square_defined (g->can, ax, ay, bx, by, &style, bendpoint, true);
 				} else {
 					struct tmpbackedgeinfo *tmp = calloc (1, sizeof (struct tmpbackedgeinfo));
 					tmp->ax = ax;
 					tmp->bx = bx;
 					tmp->ay = ay;
 					tmp->by = by;
-					tmp->edgectr = tm->edgectr;
+					tmp->edgectr = bendpoint;
 					tmp->fromlayer = a->layer;
 					tmp->tolayer = b->layer;
 					tmp->style = style;
@@ -2730,11 +2861,17 @@
 				}
 				break;
 			case 1:
-				style.symbol = a->is_dummy ? LINE_NOSYM_HORIZ : style.color;
+				style.symbol = (!g->hints || a->is_dummy) ? LINE_NOSYM_HORIZ : style.color;
+				if (a->x + a->w > b->x) {
+					style.dot_style = DOT_STYLE_BACKEDGE;
+				}
+
 				ax = a->x + a->w;
-				ay = a->is_dummy ? a->y : a->y + (a->h / 2) + nth;
+				ay = a->is_dummy ? a->y : a->y + R_EDGES_X_INC + out_nth;
 				bx = b->x - 1;
-				by = b->is_dummy ? b->y : b->y + (b->h / 2) + nth;
+				by = b->is_dummy ? b->y : b->y + R_EDGES_X_INC + out_nth;
+
+
 				if (a->w < a->layer_width) {
 					r_cons_canvas_line_square_defined (g->can, ax, ay, a->x + a->layer_width, ay, &style, 0, false);
 					ax = a->x + a->layer_width;
@@ -2840,18 +2977,27 @@
 }
 
 static void agraph_set_zoom(RAGraph *g, int v) {
-	g->is_tiny = false;
-	if (v == 0) {
-		g->mode = R_AGRAPH_MODE_MINI;
-	} else if (v < 0) {
-		g->mode = R_AGRAPH_MODE_TINY;
-		g->is_tiny = true;
-	} else {
-		g->mode = R_AGRAPH_MODE_NORMAL;
+	if (v >= -10) {
+		g->is_tiny = false;
+		if (v == 0) {
+			g->mode = R_AGRAPH_MODE_MINI;
+		} else if (v < 0) {
+			g->mode = R_AGRAPH_MODE_TINY;
+			g->is_tiny = true;
+		} else {
+			g->mode = R_AGRAPH_MODE_NORMAL;
+		}
+		const int K = 920;
+		if (g->zoom < v) {
+			g->can->sy = (g->can->sy * K) / 1000;
+		}
+		else {
+			g->can->sy = (g->can->sy * 1000) / K;
+		}
+		g->zoom = v;
+		g->need_update_dim = true;
+		g->need_set_layout = true;
 	}
-	g->zoom = R_MAX (-10, v);
-	g->need_update_dim = true;
-	g->need_set_layout = true;
 }
 
 /* reload all the info in the nodes, depending on the type of the graph
@@ -2864,13 +3010,32 @@
 
 static void follow_nth(RAGraph *g, int nth) {
 	const RGraphNode *cn = r_graph_nth_neighbour (g->graph, g->curnode, nth);
-	if (cn) {
-		r_agraph_set_curnode (g, get_anode (cn));
+	RANode *a = get_anode (cn);
+
+	while (a && a->is_dummy) {
+		cn = r_graph_nth_neighbour (g->graph, a->gnode, 0);
+		a = get_anode (cn);
+	}
+	if (a) {
+		r_agraph_set_curnode (g, a);
+	}
+}
+
+static void move_current_node(RAGraph *g, int xdiff, int ydiff) {
+	RANode *n = get_anode (g->curnode);
+	if (n) {
+		if (is_tiny (g)) {
+			xdiff = NORMALIZE_MOV (xdiff);
+			ydiff = NORMALIZE_MOV (ydiff);
+		}
+
+		n->x += xdiff;
+		n->y += ydiff;
 	}
 }
 
 #if GRAPH_MERGE_FEATURE
-#define K_NEIGHBOURS(x) (sdb_fmt (2, "agraph.nodes.%s.neighbours", x->title))
+#define K_NEIGHBOURS(x) (sdb_fmt ("agraph.nodes.%s.neighbours", x->title))
 static void agraph_merge_child(RAGraph *g, int idx) {
 	const RGraphNode *nn = r_graph_nth_neighbour (g->graph, g->curnode, idx);
 	const RGraphNode *cn = g->curnode;
@@ -2903,7 +3068,7 @@
 	g->is_tiny = !g->is_tiny;
 	g->need_update_dim = 1;
 	agraph_refresh (r_cons_singleton ()->event_data);
-	agraph_set_layout ((RAGraph *) g, r_cons_singleton ()->is_interactive);
+	agraph_set_layout ((RAGraph *) g);
 	//remove_dummy_nodes (g);
 }
 
@@ -2914,7 +3079,7 @@
 	}
 	g->need_update_dim = 1;
 	agraph_refresh (r_cons_singleton ()->event_data);
-	agraph_set_layout ((RAGraph *) g, r_cons_singleton ()->is_interactive);
+	agraph_set_layout ((RAGraph *) g);
 	//remove_dummy_nodes (g);
 }
 
@@ -2979,10 +3144,10 @@
 		agraph_update_title (g, fcn);
 	}
 	if (g->need_update_dim || g->need_reload_nodes || !is_interactive) {
-		update_node_dimension (g->graph, is_mini (g), g->zoom);
+		update_node_dimension (g->graph, is_mini (g), g->zoom, g->edgemode, g->is_callgraph, g->layout);
 	}
 	if (g->need_set_layout || g->need_reload_nodes || !is_interactive) {
-		agraph_set_layout (g, is_interactive);
+		agraph_set_layout (g);
 	}
 	if (core) {
 		ut64 off = r_core_anal_get_bbaddr (core, core->offset);
@@ -2997,6 +3162,7 @@
 		}
 		free (title);
 		g->can->color = r_config_get_i (core->config, "scr.color");
+		g->hints = r_config_get_i (core->config, "graph.hints");
 	}
 	if (g->update_seek_on || g->force_update_seek) {
 		RANode *n = g->update_seek_on;
@@ -3035,8 +3201,10 @@
 	}
 
 	h = is_interactive? h: g->h + 1;
-	w = is_interactive? w: g->w;
-	r_cons_canvas_resize (g->can, w, h);
+	w = is_interactive? w: g->w + 2;
+	if (!r_cons_canvas_resize (g->can, w, h)) {
+		return false;
+	}
 	// r_cons_canvas_clear (g->can);
 	if (!is_interactive) {
 		g->can->sx = -g->x;
@@ -3046,42 +3214,41 @@
 		(void) G (-g->can->sx + 1, -g->can->sy + 2);
 		int scr_utf8 = r_config_get_i (core->config, "scr.utf8");
 		int asm_bytes = r_config_get_i (core->config, "asm.bytes");
-		int asm_cmtright = r_config_get_i (core->config, "asm.cmtright");
+		int asm_cmt_right = r_config_get_i (core->config, "asm.cmt.right");
 		r_config_set_i (core->config, "scr.utf8", 0);
 		r_config_set_i (core->config, "asm.bytes", 0);
-		r_config_set_i (core->config, "asm.cmtright", 0);
+		r_config_set_i (core->config, "asm.cmt.right", 0);
 		char *str = r_core_cmd_str (core, "pd $r");
 		//r_cons_canvas_fill (g->can, -g->can->sx + title_len, -g->can->sy,
-		//		w - title_len, 1, ' ', true);
+		//		w - title_len, 1, ' ');
 		W (str);
 		free (str);
 		r_config_set_i (core->config, "scr.utf8", scr_utf8);
 		r_config_set_i (core->config, "asm.bytes", asm_bytes);
-		r_config_set_i (core->config, "asm.cmtright", asm_cmtright);
-	}
-	if (preEdges) {
-		agraph_print_edges (g);
+		r_config_set_i (core->config, "asm.cmt.right", asm_cmt_right);
 	}
 	if (g->title && *g->title) {
 		g->can->sy ++;
-		agraph_print_nodes (g);
-		g->can->sy --;
-	} else {
-		agraph_print_nodes (g);
 	}
+	if (preEdges) {
+		agraph_print_edges (g);
+	}
+	agraph_print_nodes (g);
 	if (!preEdges) {
 		agraph_print_edges (g);
 	}
+	if (g->title && *g->title) {
+		g->can->sy --;
+	}
 	/* print the graph title */
 	(void) G (-g->can->sx, -g->can->sy);
 	W (g->title);
 	if (is_interactive && g->title) {
 		int title_len = strlen (g->title);
 		r_cons_canvas_fill (g->can, -g->can->sx + title_len, -g->can->sy,
-			w - title_len, 1, ' ', true);
+			w - title_len, 1, ' ');
 	}
 
-
 	r_cons_canvas_print_region (g->can);
 	if (is_interactive) {
 		r_cons_newline ();
@@ -3105,9 +3272,15 @@
 	if (!grd) {
 		return 0;
 	}
+	r_cons_singleton ()->event_data = grd;
 	RCore *core = grd->core;
 	RAGraph *g = grd->g;
-	RAnalFunction *f, **fcn = grd->fcn;
+	RAnalFunction *f = NULL;
+	RAnalFunction **fcn = grd->fcn;
+
+	if (!fcn) {
+		return agraph_print (g, grd->fs, core, NULL);
+	}
 
 	// allow to change the current function during debugging
 	if (g->is_instep && core->io->debug) {
@@ -3127,28 +3300,36 @@
 		g->is_instep = false;
 	}
 
-	if (fcn) {
-		f = r_anal_get_fcn_in (core->anal, core->offset, 0);
-		if (!f) {
-			// r_cons_message ("Not in a function. Type 'df' to define it here");
-			r_cons_flush ();
-			if (!g->is_dis) {
-				if (!r_cons_yesno ('y', "\rNo function at 0x%08"PFMT64x". Define it here (Y/n)? ", core->offset)) {
-					return 0;
+	if (grd->follow_offset) {
+		if (r_io_is_valid_offset (core->io, core->offset, 0)) {
+			f = r_anal_get_fcn_in (core->anal, core->offset, 0);
+			if (!f) {
+				if (!g->is_dis) {
+					if (!r_cons_yesno ('y', "\rNo function at 0x%08"PFMT64x". Define it here (Y/n)? ", core->offset)) {
+						return 0;
+					}
+					r_core_cmd0 (core, "af");
 				}
-				r_core_cmd0 (core, "af");
+				f = r_anal_get_fcn_in (core->anal, core->offset, 0);
+				g->need_reload_nodes = true;
 			}
-			f = r_anal_get_fcn_in (core->anal, core->offset, 0);
-			g->need_reload_nodes = true;
-		}
-		if (f && f != *fcn) {
-			*fcn = f;
-			g->need_reload_nodes = true;
-			g->force_update_seek = true;
+			if (f && fcn && f != *fcn) {
+				*fcn = f;
+				g->need_reload_nodes = true;
+				g->force_update_seek = true;
+			}
+		} else {
+			// TODO: maybe go back to avoid seeking from graph view to an scary place?
+			r_cons_message ("This is not a valid offset\n");
+			r_cons_flush ();
 		}
 	}
 
-	return agraph_print (g, grd->fs, core, fcn != NULL? *fcn: NULL);
+	return agraph_print (g, grd->fs, core, *fcn);
+}
+
+static void agraph_refresh_oneshot(struct agraph_refresh_data *grd) {
+	r_core_task_enqueue_oneshot (grd->core, (RCoreTaskOneShot) agraph_refresh, grd);
 }
 
 static void agraph_toggle_speed(RAGraph *g, RCore *core) {
@@ -3161,13 +3342,11 @@
 	g->is_instep = false;
 	g->need_reload_nodes = true;
 	g->force_update_seek = true;
-	g->color_box = Color_RESET;
-	g->color_box2 = Color_BLUE; // selected node
-	g->color_box3 = Color_MAGENTA;
 	g->graph = r_graph_new ();
-	g->nodes = sdb_new0 (); // XXX leak
+	g->nodes = sdb_new0 ();
 	g->edgemode = 2;
 	g->zoom = ZOOM_DEFAULT;
+	g->hints = 1;
 	g->movspeed = DEFAULT_SPEED; // r_config_get_i (g->core->config, "graph.scroll");
 	g->db = sdb_new0 ();
 }
@@ -3178,17 +3357,15 @@
 	free (n);
 }
 
-static int free_anode_cb(void *user UNUSED, const char *k UNUSED, const char *v) {
-	RANode *n = (RANode *) (size_t) sdb_atoi (v);
-	if (!n) {
-		return 0;
+static void agraph_free_nodes(const RAGraph *g) {
+	RListIter *it;
+	RGraphNode *n;
+	RANode *a;
+
+	graph_foreach_anode (r_graph_get_nodes (g->graph), it, n, a) {
+		free_anode (a);
 	}
-	free_anode (n);
-	return 1;
-}
 
-static void agraph_free_nodes(const RAGraph *g) {
-	sdb_foreach (g->nodes, (SdbForeachCallback) free_anode_cb, NULL);
 	sdb_free (g->nodes);
 }
 
@@ -3200,11 +3377,12 @@
 
 static void agraph_sdb_init(const RAGraph *g) {
 	sdb_bool_set (g->db, "agraph.is_callgraph", g->is_callgraph, 0);
-	sdb_set_enc (g->db, "agraph.color_box", g->color_box, 0);
-	sdb_set_enc (g->db, "agraph.color_box2", g->color_box2, 0);
-	sdb_set_enc (g->db, "agraph.color_box3", g->color_box3, 0);
-	sdb_set_enc (g->db, "agraph.color_true", g->color_true, 0);
-	sdb_set_enc (g->db, "agraph.color_false", g->color_false, 0);
+	RCons *cons = r_cons_singleton ();
+	sdb_set_enc (g->db, "agraph.color_box", cons->pal.graph_box, 0);
+	sdb_set_enc (g->db, "agraph.color_box2", cons->pal.graph_box2, 0);
+	sdb_set_enc (g->db, "agraph.color_box3", cons->pal.graph_box3, 0);
+	sdb_set_enc (g->db, "agraph.color_true", cons->pal.graph_true, 0);
+	sdb_set_enc (g->db, "agraph.color_false", cons->pal.graph_false, 0);
 }
 
 R_API Sdb *r_agraph_get_sdb(RAGraph *g) {
@@ -3222,6 +3400,24 @@
 	}
 }
 
+R_API void r_agraph_print_json(RAGraph *g) {
+	RList *nodes = g->graph->nodes, *neighbours = NULL;
+	RListIter *it, *itt;
+	RGraphNode *node = NULL, *neighbour = NULL;
+	r_list_foreach (nodes, it, node) {
+		RANode *anode = (RANode *) node->data;
+		char *label = strdup (anode->body);
+		r_cons_printf ("%s{\"id\":%d,\"title\":\"%s\",\"body\":\"%s\",\"out_nodes\":[",
+			it == nodes->head ? "" : ",", anode->gnode->idx, anode->title, label);
+		neighbours = anode->gnode->out_nodes;
+		r_list_foreach (neighbours, itt, neighbour) {
+			r_cons_printf ("%s%d", itt == neighbours->head ? "" : ",", neighbour->idx);
+		}
+		r_cons_printf ("]}");
+		free (label);
+	}
+}
+
 R_API void r_agraph_set_title(RAGraph *g, const char *title) {
 	free (g->title);
 	g->title = title? strdup (title): NULL;
@@ -3237,7 +3433,8 @@
 	if (!res) {
 		return NULL;
 	}
-	res->title = title? strdup (title): strdup ("");
+
+	res->title = title? r_str_trunc_ellipsis (title, 255) : strdup ("");
 	res->body = body? strdup (body): strdup ("");
 	res->layer = -1;
 	res->pos_in_layer = -1;
@@ -3245,7 +3442,7 @@
 	res->is_reversed = false;
 	res->klass = -1;
 	res->gnode = r_graph_add_node (g->graph, res);
-	sdb_num_set (g->nodes, title, (ut64) (size_t) res, 0);
+	sdb_num_set (g->nodes, res->title, (ut64) (size_t) res, 0);
 	if (res->title) {
 		char *s, *estr, *b;
 		size_t len;
@@ -3256,16 +3453,18 @@
 			b[len - 1] = '\0';
 		}
 		estr = sdb_encode ((const void *) b, -1);
-		s = sdb_fmt (1, "base64:%s", estr);
+		s = sdb_fmt ("base64:%s", estr);
 		free (estr);
 		free (b);
-		sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.body", res->title), s, 0);
+		sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.body", res->title), s, 0);
 	}
 	return res;
 }
 
 R_API bool r_agraph_del_node(const RAGraph *g, const char *title) {
-	RANode *an, *res = r_agraph_get_node (g, title);
+	char *title_trunc = r_str_trunc_ellipsis (title, 255);
+	RANode *an, *res = r_agraph_get_node (g, title_trunc);
+	free (title_trunc);
 	const RList *innodes;
 	RGraphNode *gn;
 	RListIter *it;
@@ -3273,19 +3472,19 @@
 	if (!res) {
 		return false;
 	}
-	sdb_set (g->nodes, title, NULL, 0);
+	sdb_set (g->nodes, res->title, NULL, 0);
 	sdb_array_remove (g->db, "agraph.nodes", res->title, 0);
-	sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s", res->title), NULL, 0);
-	sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.body", res->title), 0, 0);
-	sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.x", res->title), NULL, 0);
-	sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.y", res->title), NULL, 0);
-	sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.w", res->title), NULL, 0);
-	sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.h", res->title), NULL, 0);
-	sdb_set (g->db, sdb_fmt (2, "agraph.nodes.%s.neighbours", res->title), NULL, 0);
+	sdb_set (g->db, sdb_fmt ("agraph.nodes.%s", res->title), NULL, 0);
+	sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.body", res->title), 0, 0);
+	sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.x", res->title), NULL, 0);
+	sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.y", res->title), NULL, 0);
+	sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.w", res->title), NULL, 0);
+	sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.h", res->title), NULL, 0);
+	sdb_set (g->db, sdb_fmt ("agraph.nodes.%s.neighbours", res->title), NULL, 0);
 
 	innodes = r_graph_innodes (g->graph, res->gnode);
 	graph_foreach_anode (innodes, it, gn, an) {
-		const char *key = sdb_fmt (2, "agraph.nodes.%s.neighbours", an->title);
+		const char *key = sdb_fmt ("agraph.nodes.%s.neighbours", an->title);
 		sdb_array_remove (g->db, key, res->title, 0);
 	}
 
@@ -3346,7 +3545,10 @@
 }
 
 R_API RANode *r_agraph_get_node(const RAGraph *g, const char *title) {
-	return (RANode *) (size_t) sdb_num_get (g->nodes, title, NULL);
+	char *title_trunc = title ? r_str_trunc_ellipsis (title, 255) : NULL;
+	RANode *node = (RANode *) (size_t) sdb_num_get (g->nodes, title_trunc, NULL);
+	free (title_trunc);
+	return node;
 }
 
 R_API void r_agraph_add_edge(const RAGraph *g, RANode *a, RANode *b) {
@@ -3355,7 +3557,7 @@
 	}
 	r_graph_add_edge (g->graph, a->gnode, b->gnode);
 	if (a->title && b->title) {
-		char *k = sdb_fmt (1, "agraph.nodes.%s.neighbours", a->title);
+		char *k = sdb_fmt ("agraph.nodes.%s.neighbours", a->title);
 		sdb_array_add (g->db, k, b->title, 0);
 	}
 }
@@ -3365,7 +3567,7 @@
 		return;
 	}
 	if (a->title && b->title) {
-		char *k = sdb_fmt (1, "agraph.nodes.%s.neighbours", a->title);
+		char *k = sdb_fmt ("agraph.nodes.%s.neighbours", a->title);
 		sdb_array_insert (g->db, k, nth, b->title, 0);
 	}
 	r_graph_add_edge_at (g->graph, a->gnode, b->gnode, nth);
@@ -3376,15 +3578,15 @@
 		return;
 	}
 	if (a->title && b->title) {
-		char *k = sdb_fmt (1, "agraph.nodes.%s.neighbours", a->title);
+		char *k = sdb_fmt ("agraph.nodes.%s.neighbours", a->title);
 		sdb_array_remove (g->db, k, b->title, 0);
 	}
 	r_graph_del_edge (g->graph, a->gnode, b->gnode);
 }
 
 R_API void r_agraph_reset(RAGraph *g) {
-	r_graph_reset (g->graph);
 	agraph_free_nodes (g);
+	r_graph_reset (g->graph);
 	r_agraph_set_title (g, NULL);
 	sdb_reset (g->db);
 	r_list_purge (g->edges);
@@ -3398,9 +3600,9 @@
 
 R_API void r_agraph_free(RAGraph *g) {
 	if (g) {
+		agraph_free_nodes (g);
 		r_graph_free (g->graph);
 		r_list_free (g->edges);
-		agraph_free_nodes (g);
 		r_agraph_set_title (g, NULL);
 		sdb_free (g->db);
 		r_cons_canvas_free (g->can);
@@ -3425,6 +3627,8 @@
 	r_cons_get_size (&rows);
 	r_cons_gotoxy (0, rows);
 	r_cons_flush ();
+	core->cons->line->offset_prompt = true;
+	r_line_set_hist_callback (core->cons->line, &offset_history_up, &offset_history_down);
 	r_line_set_prompt ("[offset]> ");
 	strcpy (buf, "s ");
 	if (r_cons_fgets (buf + 2, sizeof (buf) - 3, 0, NULL) > 0) {
@@ -3432,6 +3636,8 @@
 			buf[1] = '.';
 		}
 		r_core_cmd0 (core, buf);
+		r_line_set_hist_callback (core->cons->line, &cmd_history_up, &cmd_history_down);
+		core->cons->line->offset_prompt = false;
 	}
 }
 
@@ -3443,11 +3649,10 @@
 
 	r_cons_get_size (&rows);
 	r_cons_gotoxy (0, rows);
+	r_cons_clear_line (0);
 	r_cons_printf (Color_RESET);
 	r_cons_printf (h);
 	r_cons_flush ();
-	r_cons_clear_line (0);
-	r_cons_gotoxy (strlen (h) + 1, rows);
 
 	do {
 		char ch = r_cons_readchar ();
@@ -3464,6 +3669,7 @@
 		RANode *addr_node = r_agraph_get_node (g, title);
 		if (addr_node) {
 			r_agraph_set_curnode (g, addr_node);
+			r_core_seek (core, addr, 0);
 			agraph_update_seek (g, addr_node, true);
 		} else {
 			r_io_sundo_push (core->io, core->offset, 0);
@@ -3544,13 +3750,21 @@
 	}
 }
 
+static void rotateColor(RCore *core) {
+	int color = r_config_get_i (core->config, "scr.color");
+	if (++color > 2) {
+		color = 0;
+	}
+	r_config_set_i (core->config, "scr.color", color);
+}
+
 R_API int r_core_visual_graph(RCore *core, RAGraph *g, RAnalFunction *_fcn, int is_interactive) {
 	int o_asmqjmps_letter = core->is_asmqjmps_letter;
 	int o_scrinteractive = r_config_get_i (core->config, "scr.interactive");
 	int o_vmode = core->vmode;
 	int exit_graph = false, is_error = false;
 	struct agraph_refresh_data *grd;
-	int okey, key, wheel;
+	int okey, key;
 	RAnalFunction *fcn = NULL;
 	const char *key_s;
 	RConsCanvas *can, *o_can = NULL;
@@ -3561,6 +3775,7 @@
 	if (!hc) {
 		return false;
 	}
+	r_config_save_num (hc, "asm.pseudo", "asm.esil", "asm.cmt.right", NULL);
 
 	int h, w = r_cons_get_size (&h);
 	can = r_cons_canvas_new (w, h);
@@ -3569,8 +3784,7 @@
 		h = 25;
 		can = r_cons_canvas_new (w, h);
 		if (!can) {
-			eprintf (
-					"Cannot create RCons.canvas context. Invalid screen "
+			eprintf ("Cannot create RCons.canvas context. Invalid screen "
 					"size? See scr.columns + scr.rows\n");
 			r_config_hold_free (hc);
 			return false;
@@ -3579,7 +3793,6 @@
 	can->linemode = r_config_get_i (core->config, "graph.linemode");
 	can->color = r_config_get_i (core->config, "scr.color");
 
-	r_config_save_num (hc, "asm.cmtright", NULL);
 	if (!g) {
 		graph_allocated = true;
 		fcn = _fcn? _fcn: r_anal_get_fcn_in (core->anal, core->offset, 0);
@@ -3597,11 +3810,6 @@
 			r_config_hold_free (hc);
 			return false;
 		}
-		g->color_box = core->cons->pal.graph_box;
-		g->color_box2 = core->cons->pal.graph_box2;
-		g->color_box3 = core->cons->pal.graph_box3;
-		g->color_true = core->cons->pal.graph_true;
-		g->color_false = core->cons->pal.graph_false;
 		g->is_tiny = is_interactive == 2;
 		g->layout = r_config_get_i (core->config, "graph.layout");
 	} else {
@@ -3612,6 +3820,9 @@
 	g->movspeed = r_config_get_i (core->config, "graph.scroll");
 	g->on_curnode_change = (RANodeCallback) seek_to_node;
 	g->on_curnode_change_data = core;
+	g->edgemode = r_config_get_i (core->config, "graph.edges");
+	g->hints = r_config_get_i (core->config, "graph.hints");
+	g->is_interactive = is_interactive;
 	bool asm_comments = r_config_get_i (core->config, "asm.comments");
 	r_config_set (core->config, "asm.comments",
 		r_str_bool (r_config_get_i (core->config, "graph.comments")));
@@ -3631,6 +3842,7 @@
 	grd->g = g;
 	grd->fs = is_interactive == 1;
 	grd->core = core;
+	grd->follow_offset = _fcn ? false : true;
 	grd->fcn = fcn != NULL? &fcn: NULL;
 	ret = agraph_refresh (grd);
 	if (!ret || is_interactive != 1) {
@@ -3639,30 +3851,29 @@
 		is_error = !ret;
 	}
 
+	core->cons->event_resize = NULL; // avoid running old event with new data
 	core->cons->event_data = grd;
-	core->cons->event_resize = (RConsEvent) agraph_refresh;
+	core->cons->event_resize = (RConsEvent) agraph_refresh_oneshot;
+
 	r_cons_break_push (NULL, NULL);
 
 	while (!exit_graph && !is_error && !r_cons_is_breaked ()) {
 		w = r_cons_get_size (&h);
 		invscroll = r_config_get_i (core->config, "graph.invscroll");
 		ret = agraph_refresh (grd);
+
 		if (!ret) {
 			is_error = true;
 			break;
 		}
-		r_cons_show_cursor (false);
-		wheel = r_config_get_i (core->config, "scr.wheel");
-		if (wheel) {
-			r_cons_enable_mouse (true);
-		}
+		showcursor (core, false);
 
 		// r_core_graph_inputhandle()
 		okey = r_cons_readchar ();
 		key = r_cons_arrow_to_hjkl (okey);
 
 		if (core->cons->mouse_event) {
-			movspeed = r_config_get_i (core->config, "scr.wheelspeed");
+			movspeed = r_config_get_i (core->config, "scr.wheel.speed");
 			switch (key) {
 			case 'j':
 			case 'k':
@@ -3681,18 +3892,23 @@
 		switch (key) {
 		case '-':
 			agraph_set_zoom (g, g->zoom - ZOOM_STEP);
-			agraph_update_seek (g, get_anode (g->curnode), true);
+			// agraph_update_seek (g, get_anode (g->curnode), true);
+			// agraph_refresh (r_cons_singleton ()->event_data);
+			// agraph_update_seek (g, get_anode (g->curnode), false);
 			break;
 		case '+':
 			agraph_set_zoom (g, g->zoom + ZOOM_STEP);
-			agraph_update_seek (g, get_anode (g->curnode), true);
+			// agraph_update_seek (g, get_anode (g->curnode), false);
+			// agraph_update_seek (g, get_anode (g->curnode), true);
 			break;
 		case '0':
 			agraph_set_zoom (g, ZOOM_DEFAULT);
 			agraph_update_seek (g, get_anode (g->curnode), true);
+// update scroll (with minor shift)
 			break;
 		case '|':
 		{         // TODO: edit
+			showcursor (core, true);
 			const char *buf = NULL;
 			const char *cmd = r_config_get (core->config, "cmd.gprompt");
 			r_line_set_prompt ("cmd.gprompt> ");
@@ -3700,6 +3916,7 @@
 			buf = r_line_readline ();
 			core->cons->line->contents = NULL;
 			r_config_set (core->config, "cmd.gprompt", buf);
+			showcursor (core, false);
 		}
 		break;
 		case '=':
@@ -3710,8 +3927,8 @@
 				}
 				r_config_set_i (core->config, "graph.layout", e);
 				g->layout = r_config_get_i (core->config, "graph.layout");
-				g->need_reload_nodes = true;
-				get_bbupdate (g, core, fcn);
+				g->need_update_dim = true;
+				g->need_set_layout = true;
 			}
 			break;
 		case 'e':
@@ -3723,6 +3940,7 @@
 				}
 				r_config_set_i (core->config, "graph.edges", e);
 				g->edgemode = e;
+				g->need_update_dim = true;
 				get_bbupdate (g, core, fcn);
 			}
 			break;
@@ -3741,13 +3959,15 @@
 #if 1
 // disabled for now, ultraslow in most situations
 		case '>':
-			if (r_cons_yesno ('y', "Compute function callgraph? (Y/n)")) {
+			if (fcn && r_cons_yesno ('y', "Compute function callgraph? (Y/n)")) {
 				r_core_cmd0 (core, "ag-;.agc* $$;.axtg $$;aggi");
 			}
 			break;
 		case '<':
 			// r_core_visual_refs (core, true);
-			r_core_cmd0 (core, "ag-;.axtg $$;aggi");
+			if (fcn) {
+				r_core_cmd0 (core, "ag-;.axtg $$;aggi");
+			}
 			break;
 #endif
 		case 'G':
@@ -3764,6 +3984,9 @@
 			}
 			break;
 		case 's':
+			if (!fcn) {
+				break;
+			}
 			key_s = r_config_get (core->config, "key.s");
 			if (key_s && *key_s) {
 				r_core_cmd0 (core, key_s);
@@ -3772,7 +3995,9 @@
 			}
 			break;
 		case 'S':
-			graph_single_step_over (core, g);
+			if (fcn) {
+				graph_single_step_over (core, g);
+			}
 			break;
 		case 'x':
 		case 'X':
@@ -3805,11 +4030,14 @@
 				" :cmd         - run radare command\n"
 				" '            - toggle graph.comments\n"
 				" \"            - toggle graph.refs\n"
+				" #            - toggle graph.hints\n"
 				" /            - highlight text\n"
 				" |            - set cmd.gprompt\n"
 				" _            - enter hud selector\n"
 				" >            - show function callgraph (see graph.refs)\n"
 				" <            - show program callgraph (see graph.refs)\n"
+				" (            - reverse conditional branch of last instruction in bb\n"
+				" )            - rotate asm.emu and emu.str\n"
 				" Home/End     - go to the top/bottom of the canvas\n"
 				" Page-UP/DOWN - scroll canvas up/down\n"
 				" C            - toggle scr.colors\n"
@@ -3847,6 +4075,9 @@
 		case '"':
 			r_config_toggle (core->config, "graph.refs");
 			break;
+		case '#':
+			r_config_toggle (core->config, "graph.hints");
+			break;
 		case 'p':
 			if (!fcn) {
 				break;
@@ -3865,19 +4096,16 @@
 			goto_asmqjmps (g, core);
 			break;
 		case 'o':
+			showcursor (core, true);
 			visual_offset (g, core);
+			showcursor (core, false);
 			break;
 		case 'O':
-			disMode++;
-			if (disMode > 3) {
-				disMode = 0;
+			if (!fcn) {
+				break;
 			}
+			disMode = (disMode + 1) % 3;
 			applyDisMode (core);
-			if (disMode == 3) {
-				g->mode = R_AGRAPH_MODE_SUMMARY;
-			} else {
-				g->mode = 0;
-			}
 			g->need_reload_nodes = true;
 			get_bbupdate (g, core, fcn);
 			break;	
@@ -3917,24 +4145,19 @@
 			r_core_cmd (core, "sr PC", 0);
 			break;
 		case 'R':
-			if (!fcn) {
-				break;
-			}
 			if (r_config_get_i (core->config, "scr.randpal")) {
 				r_core_cmd0 (core, "ecr");
 			} else {
 				r_core_cmd0 (core, "ecn");
 			}
+			if (!fcn) {
+				break;
+			}
 			g->edgemode = r_config_get_i (core->config, "graph.edges");
-			g->color_box = core->cons->pal.graph_box;
-			g->color_box2 = core->cons->pal.graph_box2;
-			g->color_box3 = core->cons->pal.graph_box3;
-			g->color_true = core->cons->pal.graph_true;
-			g->color_false = core->cons->pal.graph_false;
 			get_bbupdate (g, core, fcn);
 			break;
 		case '!':
-			r_core_visual_panels (core);
+			r_core_visual_panels (core, NULL);
 			break;
 		case '\'':
 			if (fcn) {
@@ -3944,16 +4167,18 @@
 			break;
 		case ';':
 			if (fcn) {
+				showcursor (core, true);
 				char buf[256];
 				r_line_set_prompt ("[comment]> ");
 				if (r_cons_fgets (buf, sizeof (buf) - 1, 0, NULL) > 0) {
 					r_core_cmdf (core, "\"CC %s\"", buf);
 				}
 				g->need_reload_nodes = true;
+				showcursor (core, false);
 			}
 			break;
 		case 'C':
-			r_config_toggle (core->config, "scr.color");
+			rotateColor (core);
 			break;
 		case 'm':
 			mousemode++;
@@ -3967,19 +4192,26 @@
 				mousemode = 3;
 			}
 			break;
+		case '(':
+			if (fcn) {
+				r_core_cmd0 (core, "wao recj@B:-1");
+				g->need_reload_nodes = true;
+			}
+			break;
+		case ')':
+			if (fcn) {
+				rotateAsmemu (core);
+				g->need_reload_nodes = true;
+			}
+			break;
 		case 'd':
 			{
-				int wheel = r_config_get_i (core->config, "scr.wheel");
-				if (wheel) {
-					r_cons_enable_mouse (false);
-				}
+				showcursor (core, true);
 				// WTF?
 				r_config_set_i (core->config, "scr.interactive", true);
 				r_core_visual_define (core, "");
 				get_bbupdate (g, core, fcn);
-				if (wheel) {
-					r_cons_enable_mouse (true);
-				}
+				showcursor (core, false);
 			}
 			break;
 		case 'D':
@@ -4003,20 +4235,11 @@
 				discroll ++;
 			} else if (g->is_dis) {
 				r_core_cmd0 (core, "so 4");
+			} else if (okey == 27) {
+				// handle page down key
+				can->sy -= PAGEKEY_SPEED * (invscroll? -1: 1);
 			} else {
-				if (okey == 27) { // && r_cons_readchar () == 126) {
-					// handle page down key
-					can->sy -= PAGEKEY_SPEED * (invscroll? -1: 1);
-				} else {
-					RANode *n = get_anode (g->curnode);
-					if (n) {
-						if (g->is_tiny) {
-							n->y++;
-						} else {
-							n->y += movspeed;
-						}
-					}
-				}
+				move_current_node (g, 0, movspeed);
 			}
 			break;
 		case 'K':
@@ -4027,20 +4250,11 @@
 				}
 			} else if (g->is_dis) {
 				r_core_cmd0 (core, "so -4");
+			} else if (okey == 27) {
+				// handle page up key
+				can->sy += PAGEKEY_SPEED * (invscroll? -1: 1);
 			} else {
-				if (okey == 27) { // && r_cons_readchar () == 126) {
-					// handle page up key
-					can->sy += PAGEKEY_SPEED * (invscroll? -1: 1);
-				} else {
-					RANode *n = get_anode (g->curnode);
-					if (n) {
-						if (g->is_tiny) {
-							n->y --;
-						} else {
-							n->y -= movspeed;
-						}
-					}
-				}
+				move_current_node (g, 0, -movspeed);
 			}
 			break;
 		case 'H':
@@ -4051,14 +4265,7 @@
 				const RGraphNode *gn = find_near_of (g, NULL, true);
 				g->update_seek_on = get_anode (gn);
 			} else {
-				RANode *n = get_anode (g->curnode);
-				if (n) {
-					if (g->is_tiny) {
-						n->x --;
-					} else {
-						n->x -= movspeed;
-					}
-				}
+				move_current_node (g, -movspeed, 0);
 			}
 			break;
 		case 'v':
@@ -4068,16 +4275,9 @@
 			if (is_mini (g)) {
 				discroll = 0;
 			} else {
-				RANode *n = get_anode (g->curnode);
-				if (n) {
-					if (g->is_tiny) {
-						n->x++;
-					} else {
-						n->x += movspeed;
-					}
-				}
-				break;
+				move_current_node (g, movspeed, 0);
 			}
+			break;
 		case 'j':
 			if (g->is_dis) {
 				r_core_cmd0 (core, "so 1");
@@ -4127,9 +4327,11 @@
 			}
 			break;
 		case '/':
+			showcursor (core, true);
 			r_config_set_i (core->config, "scr.interactive", true);
 			r_core_cmd0 (core, "?i highlight;e scr.highlight=`?y`");
 			r_config_set_i (core->config, "scr.interactive", false);
+			showcursor (core, false);
 			break;
 		case ':':
 			r_core_visual_prompt_input (core);
@@ -4244,8 +4446,8 @@
 	}
 	r_cons_break_pop ();
 	r_config_set (core->config, "asm.comments", r_str_bool (asm_comments));
-	core->cons->event_data = NULL;
 	core->cons->event_resize = NULL;
+	core->cons->event_data = NULL;
 	core->vmode = o_vmode;
 	core->is_asmqjmps_letter = o_asmqjmps_letter;
 	core->keep_asmqjmps = false;
diff -Nru radare2-2.3.0+dfsg/libr/core/hack.c radare2-2.8.0+dfsg/libr/core/hack.c
--- radare2-2.3.0+dfsg/libr/core/hack.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/hack.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,9 +22,40 @@
 		"NOTE:", "", "those operations are only implemented for x86 and arm atm.", //TODO
 		NULL
 	};
-	r_core_cmd_help(core, help_msg);
+	r_core_cmd_help (core, help_msg);
 }
 
+R_API bool r_core_hack_arm64(RCore *core, const char *op, const RAnalOp *analop) {
+	if (!strcmp (op, "nop")) {
+		r_core_cmdf (core, "wx 1f2003d5");
+	} else if (!strcmp (op, "ret")) {
+		r_core_cmdf (core, "wx c0035fd6t");
+	} else if (!strcmp (op, "trap")) {
+		r_core_cmdf (core, "wx 000020d4");
+	} else if (!strcmp (op, "jz")) {
+		eprintf ("ARM jz hack not supported\n");
+		return false;
+	} else if (!strcmp (op, "jnz")) {
+		eprintf ("ARM jnz hack not supported\n");
+		return false;
+	} else if (!strcmp (op, "nocj")) {
+		eprintf ("ARM jnz hack not supported\n");
+		return false;
+	} else if (!strcmp (op, "recj")) {
+		eprintf ("TODO: use jnz or jz\n");
+		return false;
+	} else if (!strcmp (op, "ret1")) {
+		r_core_cmdf (core, "wa mov x0, 1,,ret");
+	} else if (!strcmp (op, "ret0")) {
+		r_core_cmdf (core, "wa mov x0, 0,,ret");
+	} else if (!strcmp (op, "retn")) {
+		r_core_cmdf (core, "wa mov x0, -1,,ret");
+	} else {
+		eprintf ("Invalid operation '%s'\n", op);
+		return false;
+	}
+	return true;
+}
 R_API bool r_core_hack_arm(RCore *core, const char *op, const RAnalOp *analop) {
 	const int bits = core->assembler->bits;
 	const ut8 *b = core->block;
@@ -149,10 +180,10 @@
 			return false;
 		}
 		for (i = 0; i < size; i++)
-			memcpy(str + (i * 2), "90", 2);
+			memcpy (str + (i * 2), "90", 2);
 		str[size*2] = '\0';
-		r_core_cmdf(core, "wx %s\n", str);
-		free(str);
+		r_core_cmdf (core, "wx %s\n", str);
+		free (str);
 	} else if (!strcmp (op, "trap")) {
 		r_core_cmd0 (core, "wx cc\n");
 	} else if (!strcmp (op, "jz")) {
@@ -179,15 +210,13 @@
 			return false;
 		}
 	} else if (!strcmp (op, "recj")) {
-		int of = *b == 0xf;
-		if (b[of] < 0x80 && b[of] >= 0x70) { // jo, jno, jb, jae, je, jne, jbe, ja, js, jns
-			if (of) {
-				r_core_cmdf (core, "wx 0f%x\n", (b[1]%2)? b[1] - 1: b[1] + 1);
-			} else {
+		int is_near = (*b == 0xf);
+		if (b[0] < 0x80 && b[0] >= 0x70) { // short jmps: jo, jno, jb, jae, je, jne, jbe, ja, js, jns
 				r_core_cmdf (core, "wx %x\n", (b[0]%2)? b[0] - 1: b[0] + 1);
-			}
+		} else if (is_near && b[1] < 0x90 && b[1] >= 0x80) { // near jmps: jo, jno, jb, jae, je, jne, jbe, ja, js, jns
+				r_core_cmdf (core, "wx 0f%x\n", (b[1]%2)? b[1] - 1: b[1] + 1);
 		} else {
-			eprintf ("Invalid opcode\n");
+			eprintf ("Invalid conditional jump opcode\n");
 			return false;
 		}
 	} else if (!strcmp (op, "ret1")) {
@@ -197,7 +226,7 @@
 	} else if (!strcmp (op, "retn")) {
 		r_core_cmd0 (core, "wx c2ffff\n");
 	} else {
-		eprintf ("Invalid operation\n");
+		eprintf ("Invalid operation '%s'\n", op);
 		return false;
 	}
 	return true;
@@ -206,7 +235,7 @@
 R_API int r_core_hack(RCore *core, const char *op) {
 	bool (*hack)(RCore *core, const char *op, const RAnalOp *analop) = NULL;
 	const char *asmarch = r_config_get (core->config, "asm.arch");
-	RAnalOp analop;
+	const int asmbits = core->assembler->bits;
 
 	if (!asmarch) {
 		return false;
@@ -214,12 +243,17 @@
 	if (strstr (asmarch, "x86")) {
 		hack = r_core_hack_x86;
 	} else if (strstr (asmarch, "arm")) {
-		hack = r_core_hack_arm;
+		if (asmbits == 64) {
+			hack = r_core_hack_arm64;
+		} else {
+			hack = r_core_hack_arm;
+		}
 	} else {
 		eprintf ("TODO: write hacks are only for x86\n");
 	}
 	if (hack) {
-		if (!r_anal_op (core->anal, &analop, core->offset, core->block, core->blocksize)) {
+		RAnalOp analop;
+		if (!r_anal_op (core->anal, &analop, core->offset, core->block, core->blocksize, R_ANAL_OP_MASK_BASIC)) {
 			eprintf ("anal op fail\n");
 			return false;
 		}
diff -Nru radare2-2.3.0+dfsg/libr/core/libs.c radare2-2.8.0+dfsg/libr/core/libs.c
--- radare2-2.3.0+dfsg/libr/core/libs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/libs.c	2018-08-07 14:12:36.000000000 +0000
@@ -86,24 +86,25 @@
 		free (p);
 	}
 	if (where & R_CORE_LOADLIBS_HOME) {
-		char *homeplugindir = r_str_home (R2_HOMEDIR "/plugins");
+		char *homeplugindir = r_str_home (R2_HOME_PLUGINS);
 		// eprintf ("OPENDIR (%s)\n", homeplugindir);
 		r_lib_opendir (core->lib, homeplugindir);
 		free (homeplugindir);
 	}
 	if (where & R_CORE_LOADLIBS_SYSTEM) {
-#if __WINDOWS__
-		r_lib_opendir (core->lib, "plugins");
-		r_lib_opendir (core->lib, "share/radare2/"R2_VERSION "/plugins");
-#else
-		r_lib_opendir (core->lib, R2_LIBDIR "/radare2/"R2_VERSION);
-		r_lib_opendir (core->lib, R2_LIBDIR "/radare2-extras/"R2_VERSION);
-		r_lib_opendir (core->lib, R2_LIBDIR "/radare2-bindings/"R2_VERSION);
-#endif
+		char *plugindir = r_str_r2_prefix (R2_PLUGINS);
+		char *extrasdir = r_str_r2_prefix (R2_EXTRAS);
+		char *bindingsdir = r_str_r2_prefix (R2_BINDINGS);
+		r_lib_opendir (core->lib, plugindir);
+		r_lib_opendir (core->lib, extrasdir);
+		r_lib_opendir (core->lib, bindingsdir);
+		free (plugindir);
+		free (extrasdir);
+		free (bindingsdir);
 	}
 #endif
 	// load script plugins
-	char *homeplugindir = r_str_home (R2_HOMEDIR "/plugins");
+	char *homeplugindir = r_str_home (R2_HOME_PLUGINS);
         RList *files = r_sys_dir (homeplugindir);
 	RListIter *iter;
 	char *file;
diff -Nru radare2-2.3.0+dfsg/libr/core/linux_heap_glibc.c radare2-2.8.0+dfsg/libr/core/linux_heap_glibc.c
--- radare2-2.3.0+dfsg/libr/core/linux_heap_glibc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/linux_heap_glibc.c	2018-08-07 14:12:36.000000000 +0000
@@ -21,12 +21,12 @@
 #define GHT_MAX UT64_MAX
 #endif
 
-static void GH(update_main_arena)(RCore *core, GHT m_arena, GH(RHeap_MallocState) *main_arena) {
-	(void)r_core_read_at (core, m_arena, (ut8 *)main_arena, sizeof (GH(RHeap_MallocState)));
+static void GH(update_main_arena)(RCore *core, GHT m_arena, MallocState *main_arena) {
+	(void)r_io_read_at (core->io, m_arena, (ut8 *)main_arena, sizeof (MallocState));
 }
 
 static void GH(update_global_max_fast)(RCore *core, GHT g_max_fast, GHT *global_max_fast) {
-	(void)r_core_read_at (core, g_max_fast, (ut8 *)global_max_fast, sizeof (GHT));
+	(void)r_io_read_at (core->io, g_max_fast, (ut8 *)global_max_fast, sizeof (GHT));
 }
 
 static void GH(get_brks)(RCore *core, GHT *brk_start, GHT *brk_end) {
@@ -42,8 +42,15 @@
 	}
 }
 
-static void GH(print_main_arena)(RCore *core, GHT m_arena, GH(RHeap_MallocState) *main_arena, GHT global_max_fast, int format) {
-	int i, j, k, start, offset = SZ * 12 + sizeof (int) * 2;
+static void GH(print_main_arena)(RCore *core, GHT m_arena, MallocState *main_arena, GHT global_max_fast, int format) {
+	int i, j, k, start; 
+
+#if __GLIBC_MINOR__ > 25
+	GHT offset = 16;
+#else
+	GHT offset = 12 * SZ + sizeof (int) * 2;
+#endif
+
 	GHT apart[NSMALLBINS + 1] = { 0LL };
 	if (format == '*') {
 		for (i = 0; i < NBINS * 2 - 2; i += 2) {
@@ -185,28 +192,35 @@
 	PRINT_GA ("}\n\n");
 }
 
-static GHT GH(get_vaddr_symbol)(const char *path, const char *symname) {
+static GHT GH(get_vaddr_symbol)(RCore *core, const char *path, const char *symname) {
 	RListIter *iter;
 	RBinSymbol *s;
-	RCore *core = r_core_new ();
-	RList * syms = NULL;
-	GHT vaddr = 0LL;
+	RBinOptions *bo = r_bin_options_new (0LL, 0LL, false);
+	if (!bo) {
+		eprintf ("Failed to create bin options\n");
+		return (GHT) -1;
+	}
 
-	if (!core) {
+	// TODO: avoid loading twice?
+	if (r_bin_open (core->bin, path, bo) == -1) {
+		eprintf ("Failed to open binary\n");
+		r_bin_options_free (bo);
 		return (GHT) -1;
 	}
-	r_bin_load (core->bin, path, 0, 0, 0, -1, false);
-	syms = r_bin_get_symbols (core->bin);
+
+	RList *syms = r_bin_get_symbols (core->bin);
 	if (!syms) {
+		r_bin_options_free (bo);
 		return (GHT) -1;
 	}
+	GHT vaddr = 0LL;
 	r_list_foreach (syms, iter, s) {
 		if (strstr (s->name, symname)) {
 			vaddr = s->vaddr;
 			break;
 		}
 	}
-	r_core_free (core);
+	r_bin_options_free (bo);
 	return vaddr;
 }
 
@@ -275,7 +289,7 @@
 
 	if ((is_debug_file[3] || is_debug_file[4] || is_debug_file[5]) && \
 	r_file_is_directory ("/usr/lib/debug/.build-id")) {
-		get_hash_debug_file (libc_ver_end, hash, sizeof (hash) - 1);
+		get_hash_debug_file (core, libc_ver_end, hash, sizeof (hash) - 1);
 		libc_ver_end = hash;
 		free (path);
 		path = r_str_newf ("%s%s%s", dir_dbg, dir_build_id, libc_ver_end);
@@ -286,7 +300,7 @@
 
 	goto not_found;
 found:
-	vaddr = GH(get_vaddr_symbol) (path, symname);
+	vaddr = GH(get_vaddr_symbol) (core, path, symname);
 	if (libc_addr != GHT_MAX && vaddr && vaddr != GHT_MAX) {
 		*symbol = libc_addr + vaddr;
 		free (path);
@@ -318,7 +332,7 @@
 	return true;
 }
 
-static bool GH(r_resolve_main_arena)(RCore *core, GHT *m_arena, GH(RHeap_MallocState) *main_arena) {
+static bool GH(r_resolve_main_arena)(RCore *core, GHT *m_arena, MallocState *main_arena) {
 	if (!core || !core->dbg || !core->dbg->maps) {
 		return false;
 	}
@@ -344,7 +358,7 @@
 		return;
 	}
 
-	(void) r_core_read_at (core, chunk, (ut8 *)cnk, sizeof (*cnk));
+	(void) r_io_read_at (core->io, chunk, (ut8 *)cnk, sizeof (*cnk));
 
 	PRINT_GA ("struct malloc_chunk @ ");
 	PRINTF_BA ("0x%"PFMT64x, (ut64)chunk);
@@ -381,7 +395,7 @@
 
 	char *data = calloc (1, size);
 	if (data) {
-		r_core_read_at (core, chunk + SZ * 2, (ut8 *)data, size);
+		r_io_read_at (core->io, chunk + SZ * 2, (ut8 *)data, size);
 		PRINT_GA ("chunk data = \n");
 		r_print_hexdump (core->print, chunk + SZ * 2, (ut8 *)data, size, SZ * 8, SZ, 1);
 		free (data);
@@ -389,7 +403,7 @@
 	free (cnk);
 }
 
-static int GH(print_double_linked_list_bin_simple)(RCore *core, GHT bin, GH(RHeap_MallocState) *main_arena, GHT brk_start) {
+static int GH(print_double_linked_list_bin_simple)(RCore *core, GHT bin, MallocState *main_arena, GHT brk_start) {
 	GHT next = GHT_MAX;
 	GH(RHeapChunk) *cnk = R_NEW0 (GH(RHeapChunk));
 
@@ -397,7 +411,7 @@
 		return -1;
 	}
 
-	r_core_read_at (core, bin, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+	r_io_read_at (core->io, bin, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 
 	PRINTF_GA ("    0x%"PFMT64x, (ut64)bin);
 	while (cnk->fd != bin) {
@@ -408,7 +422,7 @@
 			free (cnk);
 			return -1;
 		}
-		r_core_read_at (core, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 	}
 
 	PRINTF_GA ("->fd = 0x%"PFMT64x, (ut64)cnk->fd);
@@ -419,7 +433,7 @@
 		free (cnk);
 		return -1;
 	}
-	(void)r_core_read_at (core, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+	(void)r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 	PRINTF_GA ("\n    0x%"PFMT64x, (ut64)bin);
 
 	while (cnk->bk != bin) {
@@ -430,7 +444,7 @@
 			free (cnk);
 			return -1;
 		}
-		(void)r_core_read_at (core, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		(void)r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 	}
 
 	PRINTF_GA ("->bk = 0x%"PFMT64x, (ut64)cnk->bk);
@@ -438,7 +452,7 @@
 	return 0;
 }
 
-static int GH(print_double_linked_list_bin_graph)(RCore *core, GHT bin, GH(RHeap_MallocState) *main_arena, GHT brk_start) {
+static int GH(print_double_linked_list_bin_graph)(RCore *core, GHT bin, MallocState *main_arena, GHT brk_start) {
 	RAGraph *g = r_agraph_new (r_cons_canvas_new (1, 1));
 	GHT next = GHT_MAX;
 	char title[256], chunk[256];
@@ -452,7 +466,7 @@
 	}
 	g->can->color = r_config_get_i (core->config, "scr.color");
 
-	(void)r_core_read_at (core, bin, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+	(void)r_io_read_at (core->io, bin, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 	snprintf (title, sizeof (title) - 1, "bin @ 0x%"PFMT64x"\n", (ut64)bin);
 	snprintf (chunk, sizeof (chunk) - 1, "fd: 0x%"PFMT64x"\nbk: 0x%"PFMT64x"\n",
 		(ut64)cnk->fd, (ut64)cnk->bk);
@@ -468,7 +482,7 @@
 			return -1;
 		}
 
-		r_core_read_at (core, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 		snprintf (title, sizeof (title) - 1, "Chunk @ 0x%"PFMT64x"\n", (ut64)next);
 		snprintf (chunk, sizeof (chunk) - 1, "fd: 0x%"PFMT64x"\nbk: 0x%"PFMT64x"\n",
 			(ut64)cnk->fd, (ut64)cnk->bk);
@@ -487,13 +501,13 @@
 	return 0;
 }
 
-static int GH(print_double_linked_list_bin)(RCore *core, GH(RHeap_MallocState)*main_arena, GHT m_arena, GHT offset, GHT num_bin, int graph) {
+static int GH(print_double_linked_list_bin)(RCore *core, MallocState *main_arena, GHT m_arena, GHT offset, GHT num_bin, int graph) {
 	if (!core || !core->dbg || !core->dbg->maps) {
                 return -1;
 	}
 	int ret = 0;
 	GHT brk_start = GHT_MAX, brk_end = GHT_MAX;
-	if (num_bin < 0 || num_bin > 126) {
+	if (num_bin > 126) {
 		return -1;
 	}
 	GHT bin = main_arena->bins[num_bin];
@@ -508,7 +522,11 @@
 		return -1;
 	}
 
+#if __GLIBC_MINOR__ > 25
+	bin = m_arena + offset + SZ * num_bin * 2 + 10 * SZ;
+#else
 	bin = m_arena + offset + SZ * num_bin * 2 - SZ * 2;
+#endif
 
 	switch (num_bin) {
 	case 0:
@@ -531,10 +549,15 @@
 	return ret;
 }
 
-static void GH(print_heap_bin)(RCore *core, GHT m_arena, GH(RHeap_MallocState) *main_arena, const char *input) {
+static void GH(print_heap_bin)(RCore *core, GHT m_arena, MallocState *main_arena, const char *input) {
 	int i, j = 2;
 	GHT num_bin = GHT_MAX;
+
+#if __GLIBC_MINOR__ > 25
+	GHT offset = 16;
+#else
 	GHT offset = 12 * SZ + sizeof (int) * 2;
+#endif
 
 	switch (input[0]) {
 	case '\0': // dmhb
@@ -566,7 +589,7 @@
 	}
 }
 
-static int GH(print_single_linked_list_bin)(RCore *core, GH(RHeap_MallocState) *main_arena, GHT m_arena, GHT offset, GHT bin_num) {
+static int GH(print_single_linked_list_bin)(RCore *core, MallocState *main_arena, GHT m_arena, GHT offset, GHT bin_num) {
 	if (!core || !core->dbg || !core->dbg->maps) {
                 return -1;
 	}
@@ -581,7 +604,7 @@
 		return 0;
 	}
 	bin = m_arena + offset + SZ * bin_num;
-	r_core_read_at (core, bin, (ut8 *)&next, SZ);
+	r_io_read_at (core->io, bin, (ut8 *)&next, SZ);
 
         GH(get_brks)(core, &brk_start, &brk_end);
 	if (brk_start == GHT_MAX || brk_end == GHT_MAX) {
@@ -594,11 +617,12 @@
 	PRINTF_GA ("0x%"PFMT64x" {\n   ", (ut64)bin);
 
 	GHT size = main_arena->top - brk_start;
+
 	GHT next_root = next, next_tmp = next, double_free = GHT_MAX;
 	while (next && next >= brk_start && next < main_arena->top) {
 		PRINTF_BA ("0x%"PFMT64x, (ut64)next);
 		while (double_free == GHT_MAX && next_tmp && next_tmp >= brk_start && next_tmp <= main_arena->top) {
-			r_core_read_at (core, next_tmp, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+			r_io_read_at (core->io, next_tmp, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 			next_tmp = cnk->fd;
 			if (cnk->prev_size > size || ((cnk->size >> 3) << 3) > size) {
 				break;
@@ -608,7 +632,7 @@
 				break;
 			}
 		}
-		r_core_read_at (core, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 		next = cnk->fd;
 		PRINTF_BA ("%s", next ? "->fd = " : "");
 		if (cnk->prev_size > size || ((cnk->size >> 3) << 3) > size) {
@@ -642,10 +666,15 @@
 	return 0;
 }
 
-void GH(print_heap_fastbin)(RCore *core, GHT m_arena, GH(RHeap_MallocState) *main_arena, GHT global_max_fast, const char *input) {
+void GH(print_heap_fastbin)(RCore *core, GHT m_arena, MallocState *main_arena, GHT global_max_fast, const char *input) {
 	int i;
 	GHT num_bin = GHT_MAX;
+
+#if __GLIBC_MINOR__ > 25
+	GHT offset = 16;
+#else
 	GHT offset = sizeof (int) * 2;
+#endif
 
 	switch (input[0]) {
 	case '\0': // dmhf
@@ -677,7 +706,7 @@
 	}
 }
 
-static void GH(print_mmap_graph)(RCore *core, GH(RHeap_MallocState) *malloc_state, GHT m_state) {
+static void GH(print_mmap_graph)(RCore *core, MallocState *malloc_state, GHT m_state) {
 	int w, h;
 	GHT top_size = GHT_MAX, min_size = SZ * 4;
 
@@ -726,8 +755,8 @@
 	r_agraph_set_title (g, "Mmmaped Heap");
 	top_title = r_str_newf ("Top chunk @ 0x%"PFMT64x"\n", (ut64)malloc_state->top);
 
-	GHT start_mmap = m_state + sizeof (GH (RHeap_MallocState)); //0x8b0;
-	r_core_read_at (core, malloc_state->top, (ut8*)cnk, sizeof (GH(RHeapChunk)));
+	GHT start_mmap = m_state + sizeof (MallocState); //0x8b0;
+	r_io_read_at (core->io, malloc_state->top, (ut8*)cnk, sizeof (GH(RHeapChunk)));
 	GHT end_mmap = malloc_state->top;
 
 	top_data = r_str_newf ("[mmap_start:0x%"PFMT64x", mmap_end:0x%"PFMT64x"]\n",
@@ -736,7 +765,7 @@
 	top_size = (cnk->size >> 3) << 3;
 
 	while (next_chunk_ref != malloc_state->top && next_chunk_ref != end_mmap) {
-		r_core_read_at (core, next_chunk_ref, (ut8 *)prev_c, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next_chunk_ref, (ut8 *)prev_c, sizeof (GH(RHeapChunk)));
 	       	node_title = r_str_newf ("  Malloc chunk @ 0x%"PFMT64x" ", (ut64)prev_chunk_ref);
 		size_tmp = (prev_c->size >> 3) << 3;
 		if (size_tmp < min_size || size_tmp > top_size  || next_chunk_ref + size_tmp > malloc_state->top) {
@@ -750,7 +779,7 @@
 		}
 		next_chunk_ref += size_tmp;
 		prev_chunk_ref = next_chunk_ref;
-		r_core_read_at (core, next_chunk_ref, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next_chunk_ref, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 		node_data = r_str_newf ("size: 0x%"PFMT64x"\n fd: 0x%"PFMT64x", bk: 0x%"PFMT64x"\n",
 			(ut64)prev_c->size, (ut64)prev_c->fd, (ut64)prev_c->bk) ;
 		chunk_node = r_agraph_add_node (g, node_title, node_data);
@@ -778,7 +807,7 @@
 	free (top_title);
 }
 
-static void GH(print_heap_graph)(RCore *core, GH(RHeap_MallocState) *main_arena, GHT *initial_brk) {
+static void GH(print_heap_graph)(RCore *core, MallocState *main_arena, GHT *initial_brk) {
 	int w, h;
 	GHT top_size = GHT_MAX, min_size = SZ * 4;
 
@@ -847,7 +876,7 @@
 	top_size = main_arena->top - brk_start;
 
 	while (next_chunk_ref != main_arena->top && next_chunk_ref != brk_end) {
-		r_core_read_at (core, next_chunk_ref, (ut8 *)prev_c, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next_chunk_ref, (ut8 *)prev_c, sizeof (GH(RHeapChunk)));
 	       	node_title = r_str_newf ("  Malloc chunk @ 0x%"PFMT64x" ", (ut64)prev_chunk_ref);
 		size_tmp = (prev_c->size >> 3) << 3;
 		if (top_size < min_size || size_tmp > top_size  || next_chunk_ref + size_tmp > main_arena->top) {
@@ -862,7 +891,7 @@
 		}
 		next_chunk_ref += size_tmp;
 		prev_chunk_ref = next_chunk_ref;
-		r_core_read_at (core, next_chunk_ref, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next_chunk_ref, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 		node_data = r_str_newf ("size: 0x%"PFMT64x"\n fd: 0x%"PFMT64x", bk: 0x%"PFMT64x"\n",
 			(ut64)prev_c->size, (ut64)prev_c->fd, (ut64)prev_c->bk) ;
 		chunk_node = r_agraph_add_node (g, node_title, node_data);
@@ -890,33 +919,88 @@
 	free (top_title);
 }
 
-static void GH(print_heap_segment)(RCore *core, GH(RHeap_MallocState) *main_arena, GHT *initial_brk, GHT global_max_fast) {
-	if (!core || !core->dbg || !core->dbg->maps) {
+
+#if __GLIBC_MINOR__ > 25
+static void GH(print_tcache_instance)(RCore *core, MallocState *main_arena, GHT *initial_brk) {
+        if (!core || !core->dbg || !core->dbg->maps) {
+                return;
+        }
+
+	GHT brk_start = GHT_MAX, brk_end = GHT_MAX, tcache_fd = GHT_MAX;
+	GH(get_brks) (core, &brk_start, &brk_end);
+	GHT tcache_tmp = GHT_MAX;
+
+	*initial_brk = ( (brk_start >> 12) << 12 ) + sizeof(GH(RHeapTcache)) + MALLOC_ALIGNMENT;
+
+	if (brk_start == GHT_MAX || brk_end == GHT_MAX || *initial_brk == GHT_MAX) {
+		eprintf ("No heap section\n");
 		return;
 	}
 
-	GHT brk_start = GHT_MAX, brk_end = GHT_MAX, size_tmp, top_size = GHT_MAX, min_size = SZ * 4;
-	GH(RHeapChunk) *cnk = R_NEW0 (GH(RHeapChunk));
+	GH(RHeapTcache) *tcache = R_NEW0 (GH(RHeapTcache));
 
-	if (!cnk) {
+	(void)r_io_read_at (core->io, brk_start + MALLOC_ALIGNMENT, (ut8 *)tcache, sizeof ( GH(RHeapTcache) ));
+
+	PRINT_GA("Thread cache @\n");
+	for (int i = 0; i < TCACHE_MAX_BINS; i++) {
+		if (tcache->counts[i] > 0) {
+			PRINT_GA("bin :");
+			PRINTF_BA("%2d",i);
+			PRINT_GA(", items :");
+			PRINTF_BA("%2d",tcache->counts[i]);
+			PRINT_GA(", fd :");
+			PRINTF_BA("0x%"PFMT64x,(ut64)tcache->entries[i]-MALLOC_ALIGNMENT);
+			if (tcache->counts[i] > 1) {
+				tcache_fd = (ut64)tcache->entries[i];
+				for(int n=1; n < tcache->counts[i]; n++) {
+					(void)r_io_read_at (core->io, tcache_fd, &tcache_tmp, sizeof ( GHT ) );
+					PRINTF_BA("->0x%"PFMT64x, tcache_tmp - MALLOC_ALIGNMENT);
+					tcache_fd = tcache_tmp;
+				}
+			}
+			PRINT_BA("\n");
+		}
+	}
+}
+#endif
+
+static void GH(print_heap_segment)(RCore *core, MallocState *main_arena, GHT *initial_brk, GHT global_max_fast) {
+	if (!core || !core->dbg || !core->dbg->maps) {
 		return;
 	}
 
+	GHT brk_start = GHT_MAX, brk_end = GHT_MAX, size_tmp, top_size = GHT_MAX, min_size = SZ * 4; 
+
 	GH(get_brks) (core, &brk_start, &brk_end);
+
+#if __GLIBC_MINOR__ > 25
+	GHT tcache_fd = GHT_MAX, tcache_tmp = GHT_MAX;
+#if HEAP32
+	*initial_brk = ( (brk_start >> 12) << 12 ) + sizeof (GH(RHeapTcache)) + MALLOC_ALIGNMENT + 0x418;
+#else
+	*initial_brk = ( (brk_start >> 12) << 12 ) + sizeof (GH(RHeapTcache)) + MALLOC_ALIGNMENT;
+#endif
+#else
 	*initial_brk = (brk_start >> 12) << 12;
+#endif
 
 	if (brk_start == GHT_MAX || brk_end == GHT_MAX || *initial_brk == GHT_MAX) {
-		eprintf ("No Heap section\n");
-		free (cnk);
+		eprintf ("No heap section\n");
 		return;
 	}
 
 	GHT next_chunk = *initial_brk, prev_chunk = next_chunk;
 	top_size = main_arena->top - brk_start;
+	GH(RHeapChunk) *cnk = R_NEW0 (GH(RHeapChunk));
+	GH(RHeapChunk) *cnk_next = R_NEW0 (GH(RHeapChunk));
+	if (!cnk || !cnk_next) {
+		return;
+	}
+
+	(void)r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+	size_tmp = (cnk->size >> 3) << 3;
 
 	while (next_chunk && next_chunk >= brk_start && next_chunk < main_arena->top) {
-		(void)r_core_read_at (core, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
-		size_tmp = (cnk->size >> 3) << 3;
 		if (size_tmp < min_size || size_tmp > top_size || next_chunk + size_tmp > main_arena->top) {
 			PRINT_YA ("\n  Malloc chunk @ ");
 			PRINTF_BA ("0x%"PFMT64x" ", (ut64)next_chunk);
@@ -927,8 +1011,153 @@
 		}
 
 		PRINT_YA ("\n  Malloc chunk @ ");
-		PRINTF_BA ("0x%"PFMT64x" ", (ut64)prev_chunk);
+		PRINTF_BA ("0x%"PFMT64x" ", (ut64)next_chunk);
 
+		PRINT_GA ("[size: ");
+		PRINTF_BA ("0x%"PFMT64x, (ut64)cnk->size);
+		PRINT_GA ("]");
+
+		bool fastbin = size_tmp >= SZ * 4 && size_tmp <= global_max_fast;
+		bool is_free = false, double_free = false;
+		if (fastbin) {
+			int i = (size_tmp / (SZ * 2)) - 2;
+			GHT idx = (GHT)main_arena->fastbinsY[i];
+			(void)r_io_read_at (core->io, idx, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+			GHT next = cnk->fd;
+			if (prev_chunk == idx && idx && !next) {
+				is_free = true;
+			}
+			while (next && next >= brk_start && next < main_arena->top) {
+				if (prev_chunk == idx || prev_chunk == next || idx == next) {
+					is_free = true;
+					if (idx == next) {
+						double_free = true;
+						break;
+					}
+					(void)r_io_read_at (core->io, next, (ut8 *)cnk_next, sizeof (GH(RHeapChunk)));
+					GHT next_node = cnk_next->fd;
+					// avoid triple while?
+					while (next_node && next_node >= brk_start && next_node < main_arena->top) {
+						if (prev_chunk == next_node) {
+							double_free = true;
+							break;
+						}
+						(void)r_io_read_at (core->io, next_node, (ut8 *)cnk_next, sizeof (GH(RHeapChunk)));
+						next_node = cnk_next->fd;
+					}
+					if (double_free) {
+						break;
+					}
+				}
+				(void)r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+				next = cnk->fd;
+			}
+			if (double_free) {
+				PRINT_RA (" Double free in simple-linked list detected ");
+				break;
+			}
+		}
+
+#if __GLIBC_MINOR__ > 25
+		GH(RHeapTcache) *tcache = R_NEW0 (GH(RHeapTcache));
+		(void)r_io_read_at (core->io, brk_start + MALLOC_ALIGNMENT, (ut8 *)tcache, sizeof ( GH(RHeapTcache) ));
+		for (int i=0; i < TCACHE_MAX_BINS; i++){
+			if( tcache->counts[i] > 0 ) {
+				if ( (ut64)tcache->entries[i] - SZ * 2 == (ut64)prev_chunk ){
+					is_free = true;
+					break;
+				}
+				if( tcache->counts[i] > 1 ) {
+					tcache_fd = (ut64)tcache->entries[i];
+					for (int n = 1; n < tcache->counts[i]; n++) {
+						(void)r_io_read_at (core->io, tcache_fd, (ut8*)&tcache_tmp, sizeof ( GHT ) );
+						if ( (ut64)tcache_tmp - SZ * 2 == (ut64)prev_chunk ) {
+							is_free = true;
+							break;
+						}
+						tcache_fd = (ut64)tcache_tmp;
+					}
+				}
+			}
+		}
+#endif
+		next_chunk += size_tmp;
+		prev_chunk = next_chunk;
+		r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		size_tmp = (cnk->size >> 3) << 3;
+
+		if (fastbin) {
+			if (is_free) {
+				PRINT_GA ("[free]");
+			} else {
+				PRINT_GA ("[allocated]");
+			}
+		} else {
+			if (!(cnk->size & 1)) {
+				PRINT_GA ("[free]");
+			} else {
+#if __GLIBC_MINOR__ > 25
+				if (is_free) {
+					PRINT_GA ("[free]");
+				} else {
+					PRINT_GA ("[allocated]");
+				}
+#else
+				PRINT_GA ("[allocated]");
+#endif
+			}
+		}
+	}
+
+	PRINT_YA ("\n  Top chunk @ ");
+	PRINTF_BA ("0x%"PFMT64x, (ut64)main_arena->top);
+	PRINT_GA (" - [brk_start: ");
+	PRINTF_BA ("0x%"PFMT64x, (ut64)brk_start);
+	PRINT_GA (", brk_end: ");
+	PRINTF_BA ("0x%"PFMT64x, (ut64)brk_end);
+	PRINT_GA ("]\n");
+	//r_cons_println (); giving me a compile error
+	r_cons_printf ("\n");
+	free (cnk);
+	free (cnk_next);
+}
+
+static void GH(print_heap_segment_json)(RCore *core, MallocState *main_arena, GHT *initial_brk, GHT global_max_fast) {
+	if (!core || !core->dbg || !core->dbg->maps) {
+		return;
+	}
+
+	GHT brk_start = GHT_MAX, brk_end = GHT_MAX, size_tmp, top_size = GHT_MAX, min_size = SZ * 4;
+	GH(RHeapChunk) *cnk = R_NEW0 (GH(RHeapChunk));
+
+	if (!cnk) {
+		return;
+	}
+
+	GH(get_brks) (core, &brk_start, &brk_end);
+	*initial_brk = (brk_start >> 12) << 12;
+
+	if (brk_start == GHT_MAX || brk_end == GHT_MAX || *initial_brk == GHT_MAX) {
+		eprintf ("No heap section\n");
+		free (cnk);
+		return;
+	}
+
+	GHT next_chunk = *initial_brk, prev_chunk = next_chunk;
+	top_size = main_arena->top - brk_start;
+
+	r_cons_printf ("{\"chunks\":[");
+	const char *comma = "";
+	while (next_chunk && next_chunk >= brk_start && next_chunk < main_arena->top) {
+		(void)r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		size_tmp = (cnk->size >> 3) << 3;
+		if (size_tmp < min_size || size_tmp > top_size || next_chunk + size_tmp > main_arena->top) {
+			const char *status = "corrupted";
+			r_cons_printf ("%s{\"addr\":%"PFMT64d",\"size\":%"PFMT64d",\"status\":\"%s\",\"fd\":"PFMT64d",\"bk\":"PFMT64d"}",
+					comma, (ut64)next_chunk, (ut64)cnk->size, status, (ut64)cnk->fd, (ut64)cnk->bk);
+			comma = ",";
+			break;
+		}
 		bool is_free = false;
 		GHT double_free = GHT_MAX;
 		if (size_tmp >= SZ * 4 && size_tmp <= global_max_fast) {
@@ -937,9 +1166,9 @@
 			double_free = next;
 			while (next && next >= brk_start && next < main_arena->top) {
 				if (prev_chunk == next) {
-					 is_free = true;
+					is_free = true;
 				}
-				(void)r_core_read_at (core, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+				(void)r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 				next = cnk->fd;
 				if (double_free == next) {
 					if (prev_chunk <= double_free) {
@@ -950,33 +1179,99 @@
 			}
 		}
 
-		PRINT_GA ("[size: ");
-		PRINTF_BA ("0x%"PFMT64x, (ut64)cnk->size);
-		PRINT_GA ("]");
+		const char *status = "allocated";
+		if (is_free || (cnk->size % 2) == 0) {
+			status = "free";
+		}
+		r_cons_printf ("%s{\"addr\":%"PFMT64d",\"size\":%"PFMT64d",\"status\":\"%s\"}",
+				comma, (ut64)prev_chunk, (ut64)cnk->size, status);
+		comma = ",";
 
-		if (is_free) {
-			PRINT_GA ("[free]");
-		} else  {
-			if (cnk->size % 2 == 0) {
-				PRINT_GA ("[free]");
-			} else {
-				PRINT_GA ("[allocated]");
+		next_chunk += size_tmp;
+		prev_chunk = next_chunk;
+		r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+	}
+	r_cons_printf ("],");
+	r_cons_printf ("\"top\":%"PFMT64d",", (ut64)main_arena->top);
+	r_cons_printf ("\"brk\":%"PFMT64d",", (ut64)brk_start);
+	r_cons_printf ("\"end\":%"PFMT64d",", (ut64)brk_end);
+	r_cons_printf ("\"hdr\":16");
+	r_cons_printf ("}");
+	free (cnk);
+}
+
+static void GH(print_heap_segment_r2)(RCore *core, MallocState *main_arena, GHT *initial_brk, GHT global_max_fast) {
+	if (!core || !core->dbg || !core->dbg->maps) {
+		return;
+	}
+
+	GHT brk_start = GHT_MAX, brk_end = GHT_MAX, size_tmp, top_size = GHT_MAX, min_size = SZ * 4;
+
+	GH(get_brks) (core, &brk_start, &brk_end);
+	*initial_brk = (brk_start >> 12) << 12;
+
+	if (brk_start == GHT_MAX || brk_end == GHT_MAX || *initial_brk == GHT_MAX) {
+		eprintf ("No heap section\n");
+		return;
+	}
+
+	GH(RHeapChunk) *cnk = R_NEW0 (GH(RHeapChunk));
+	if (!cnk) {
+		return;
+	}
+	GHT next_chunk = *initial_brk, prev_chunk = next_chunk;
+	top_size = main_arena->top - brk_start;
+
+	r_cons_printf ("fs+heap.allocated\n");
+	while (next_chunk && next_chunk >= brk_start && next_chunk < main_arena->top) {
+		(void)r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		size_tmp = (cnk->size >> 3) << 3;
+		if (size_tmp < min_size || size_tmp > top_size || next_chunk + size_tmp > main_arena->top) {
+			r_cons_printf ("fs heap.corrupted\n");
+			char *name = r_str_newf ("chunk.corrupted.%06x", ((prev_chunk>>4) & 0xffff));
+			r_cons_printf ("f %s %d 0x%"PFMT64x"\n", name, (int)cnk->size, prev_chunk);
+			free (name);
+			break;
+		}
+		bool is_free = false;
+		GHT double_free = GHT_MAX;
+		if (size_tmp >= SZ * 4 && size_tmp <= global_max_fast) {
+			int i = (size_tmp / (SZ * 2)) - 2;
+			GHT next = (GHT)main_arena->fastbinsY[i];
+			double_free = next;
+			while (next && next >= brk_start && next < main_arena->top) {
+				if (prev_chunk == next) {
+					is_free = true;
+				}
+				(void)r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+				next = cnk->fd;
+				if (double_free == next) {
+					if (prev_chunk <= double_free) {
+						PRINT_RA ("Double free detected ");
+					}
+					break;
+				}
 			}
 		}
 
+		const char *status = "allocated";
+		if (is_free || (cnk->size % 2) == 0) {
+			status = "free";
+		}
+		r_cons_printf ("fs heap.%s\n", status);
+		char *name = r_str_newf ("chunk.%06x", ((prev_chunk>>4) & 0xffff));
+		r_cons_printf ("f %s %d 0x%"PFMT64x"\n", name, (int)cnk->size, prev_chunk);
+		free (name);
+
 		next_chunk += size_tmp;
 		prev_chunk = next_chunk;
-		r_core_read_at (core, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 	}
-	PRINT_YA ("\n  Top chunk @ ");
-	PRINTF_BA ("0x%"PFMT64x, (ut64)main_arena->top);
-	PRINT_GA (" - [brk_start: ");
-	PRINTF_BA ("0x%"PFMT64x, (ut64)brk_start);
-	PRINT_GA (", brk_end: ");
-	PRINTF_BA ("0x%"PFMT64x, (ut64)brk_end);
-	PRINT_GA ("]\n");
-	//r_cons_println (); giving me a compile error
-	r_cons_printf("\n");
+	r_cons_printf ("fs-\n");
+	r_cons_printf ("f heap.top = 0x%08"PFMT64x"\n", (ut64)main_arena->top);
+	r_cons_printf ("f heap.brk = 0x%08"PFMT64x"\n", (ut64)brk_start);
+	r_cons_printf ("f heap.end = 0x%08"PFMT64x"\n", (ut64)brk_end);
+	r_cons_printf ("f heap.hdr = 16\n");
 	free (cnk);
 }
 
@@ -988,7 +1283,7 @@
 	GHT mmap_start = GHT_MAX, mmap_end = GHT_MAX, size_tmp;
 	GHT top_size = GHT_MAX, min_size = SZ * 4;
 	GH(RHeapChunk) *cnk = R_NEW0 (GH(RHeapChunk));
-	GH(RHeap_MallocState) *ms = R_NEW0 (GH(RHeap_MallocState));
+	MallocState *ms = R_NEW0 (MallocState);
 
 	if (!cnk || !ms) {
 		free (cnk);
@@ -996,17 +1291,17 @@
 		return;
 	}
 
-	mmap_start = ((malloc_state >> 16) << 16) + sizeof (GH(RHeapInfo)) + sizeof(GH(RHeap_MallocState)); //0x460;
-	r_core_read_at (core, malloc_state, (ut8*)ms, sizeof (GH(RHeap_MallocState)));
+	mmap_start = ((malloc_state >> 16) << 16) + sizeof (GH(RHeapInfo)) + sizeof(MallocState); //0x460;
+	r_io_read_at (core->io, malloc_state, (ut8*)ms, sizeof (MallocState));
 	mmap_end = ms->top;
 
 	GHT next_chunk = mmap_start, prev_chunk = next_chunk;
-	(void)r_core_read_at (core, malloc_state, (ut8*)ms, sizeof (GH(RHeap_MallocState)));
-	(void)r_core_read_at (core, ms->top, (ut8*)cnk, sizeof (GH(RHeapChunk)));
+	(void)r_io_read_at (core->io, malloc_state, (ut8*)ms, sizeof (MallocState));
+	(void)r_io_read_at (core->io, ms->top, (ut8*)cnk, sizeof (GH(RHeapChunk)));
 	top_size = (cnk->size >> 3) << 3;
 
 	while (next_chunk && next_chunk >= mmap_start && next_chunk < ms->top) {
-		r_core_read_at (core, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 		size_tmp = (cnk->size >> 3) << 3;
 		if (top_size < min_size || size_tmp > top_size) {
 			PRINT_YA ("\n  Malloc chunk @ ");
@@ -1029,7 +1324,7 @@
 				if (prev_chunk == next) {
 					 is_free = true;
 				}
-				r_core_read_at (core, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+				r_io_read_at (core->io, next, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 				next = cnk->fd;
 
 				if (double_free == next) {
@@ -1057,7 +1352,7 @@
 
 		next_chunk += size_tmp;
 		prev_chunk = next_chunk;
-		r_core_read_at (core, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
+		r_io_read_at (core->io, next_chunk, (ut8 *)cnk, sizeof (GH(RHeapChunk)));
 	}
 
 	PRINT_YA ("\n  Top chunk @ ");
@@ -1065,7 +1360,7 @@
 	PRINT_GA (" - [mmap_start: ");
 	PRINTF_BA ("0x%"PFMT64x, (ut64)mmap_start);
 	PRINT_GA (", mmap_end: ");
-	r_core_read_at (core, ms->top, (ut8*)cnk, sizeof(GH(RHeapChunk)));
+	r_io_read_at (core->io, ms->top, (ut8*)cnk, sizeof(GH(RHeapChunk)));
 	PRINTF_BA ("0x%"PFMT64x, (ut64) mmap_end + ((cnk->size >> 3) << 3));
 	PRINT_GA ("]\n");
 	// r_cons_println (); gives me a compile error
@@ -1074,8 +1369,8 @@
 	free (ms);
 }
 
-void GH(print_malloc_states)( RCore *core, GHT m_arena, GH(RHeap_MallocState) *main_arena) {
-	GH(RHeap_MallocState) *ta = R_NEW0 (GH(RHeap_MallocState));
+void GH(print_malloc_states)( RCore *core, GHT m_arena, MallocState *main_arena) {
+	MallocState *ta = R_NEW0 (MallocState);
 	if (!ta) {
 		return;
 	}
@@ -1086,7 +1381,7 @@
 		while (ta->next != GHT_MAX && ta->next != m_arena) {
 			PRINT_YA ("thread arena @ ");
 			PRINTF_BA ("0x%"PFMT64x"\n", (ut64)ta->next);
-			r_core_read_at (core, ta->next, (ut8 *)ta, sizeof (GH(RHeap_MallocState)));
+			r_io_read_at (core->io, ta->next, (ut8 *)ta, sizeof (MallocState));
 		}
 	}
 	free(ta);
@@ -1094,7 +1389,7 @@
 void GH(print_inst_minfo)(GH(RHeapInfo) *heap_info, GHT hinfo) {
 	PRINT_YA ("malloc_info @ ");
 	PRINTF_BA ("0x%"PFMT64x, (ut64)hinfo);
-	PRINT_YA ("{\n  ar_ptr = " );
+	PRINT_YA (" {\n  ar_ptr = " );
 	PRINTF_BA ("0x%"PFMT64x"\n", (ut64)heap_info->ar_ptr);
 	PRINT_YA ("  prev = ");
 	PRINTF_BA ("0x%"PFMT64x"\n", (ut64)heap_info->prev);
@@ -1113,22 +1408,21 @@
 	} else {
 		h_info = (malloc_state >> 16) << 16;
 		GH(RHeapInfo) *heap_info = R_NEW0 (GH(RHeapInfo));
-		r_core_read_at (core, h_info, (ut8*)heap_info, sizeof (GH(RHeapInfo)));
+		r_io_read_at (core->io, h_info, (ut8*)heap_info, sizeof (GH(RHeapInfo)));
 		GH(print_inst_minfo) (heap_info, h_info);
-		GH(RHeap_MallocState) *ms = R_NEW0 (GH(RHeap_MallocState));
+		MallocState *ms = R_NEW0 (MallocState);
 
 		while (heap_info->prev != 0x0 && heap_info->prev != GHT_MAX) {
-			r_core_read_at (core, h_info, (ut8*)ms, sizeof (GH(RHeap_MallocState)));
+			r_io_read_at (core->io, h_info, (ut8*)ms, sizeof (MallocState));
 			if ((ms->top >> 16) << 16 != h_info) {
 				h_info = (ms->top >> 16) << 16;
-				r_core_read_at (core, h_info, (ut8*)heap_info, sizeof (GH(RHeapInfo)));
+				r_io_read_at (core->io, h_info, (ut8*)heap_info, sizeof (GH(RHeapInfo)));
 				GH(print_inst_minfo) (heap_info, h_info);
 			}
 		}
 		free (heap_info);
 		free (ms);
 	}
-	return;
 }
 
 static const char* GH(help_msg)[] = {
@@ -1147,13 +1441,16 @@
 	"dmhi", " @[malloc_state]", "Display heap_info structure/structures for a given arena",
 	"dmhm", "", "List all elements of struct malloc_state of main thread (main_arena)",
 	"dmhm", " [malloc_state]", "List all malloc_state instance of a particular arena",
+#if __GLIBC_MINOR__ > 25
+	"dmht", "", "Display all parsed thead cache bins of main_arena's tcache instance",
+#endif
 	"dmh?", "", "Show map heap help",
 	NULL
 };
 
 static int GH(cmd_dbg_map_heap_glibc)(RCore *core, const char *input) {
 	static GHT m_arena = GHT_MAX, g_max_fast = GHT_MAX, initial_brk = GHT_MAX;
-	GH(RHeap_MallocState) *main_arena = R_NEW0 (GH(RHeap_MallocState));
+	MallocState *main_arena = R_NEW0 (MallocState);
 	GHT global_max_fast = GHT_MAX;
 	if (!main_arena) {
 		return false;
@@ -1166,11 +1463,11 @@
 		break;
 	case ' ' : // dmh [malloc_state]
 		if (GH(r_resolve_main_arena) (core, &m_arena, main_arena)) {
-			GHT m_state = strstr (input, "0x")
+			GHT m_state = strstr (input, "0x") // TODO: use r_num_get (NULL, input);
 				? (GHT)strtol (input, NULL, 0)
 				: (GHT)strtol (input, NULL, 16);
-			if (m_state == m_arena) {			
-				GH(r_resolve_global_max_fast) (core, &g_max_fast, &global_max_fast);	
+			if (m_state == m_arena) {
+				GH(r_resolve_global_max_fast) (core, &g_max_fast, &global_max_fast);
 				GH(print_heap_segment) (core, main_arena, &initial_brk, global_max_fast);
 			} else {
 				global_max_fast = GH(r_resolve_global_max_fast) (core, &g_max_fast, &global_max_fast)
@@ -1191,6 +1488,10 @@
 		}
 		break;
 	case '*':
+		if (GH(r_resolve_main_arena) (core, &m_arena, main_arena) && GH(r_resolve_global_max_fast) (core, &g_max_fast, &global_max_fast)) {
+			GH(print_heap_segment_r2) (core, main_arena, &initial_brk, global_max_fast);
+		}
+        break;
 	case 'm': // "dmhm"
 		if (GH(r_resolve_main_arena) (core, &m_arena, main_arena) &&
 			GH(r_resolve_global_max_fast) (core, &g_max_fast, &global_max_fast)) {
@@ -1201,8 +1502,8 @@
 				GHT m_state = strstr (input, "0x")
 					? (GHT)strtol (input, NULL, 0)
 					: (GHT)strtol (input, NULL, 16);
-				GH(RHeap_MallocState) *malloc_state = R_NEW0 (GH(RHeap_MallocState));
-				(void) r_core_read_at (core, m_state, (ut8*)malloc_state, sizeof (GH(RHeap_MallocState)));
+				MallocState *malloc_state = R_NEW0 (MallocState);
+				(void) r_io_read_at (core->io, m_state, (ut8*)malloc_state, sizeof (MallocState));
 				GH(print_main_arena) (core, m_state, malloc_state, global_max_fast, *input);
 				free (malloc_state);
 			}
@@ -1220,8 +1521,8 @@
 				GHT m_state = strstr (m_state_str, "0x")
 					? (GHT) strtol (m_state_str, NULL, 0)
 					: (GHT)strtol (m_state_str, NULL, 16);
-				GH (RHeap_MallocState) *malloc_state = R_NEW0 (GH (RHeap_MallocState));
-				(void)r_core_read_at (core, m_state, (ut8*)malloc_state, sizeof (GH(RHeap_MallocState)));
+				MallocState *malloc_state = R_NEW0 (MallocState);
+				(void)r_io_read_at (core->io, m_state, (ut8*)malloc_state, sizeof (MallocState));
 				GH (print_heap_bin) (core, m_state, malloc_state, bin);
 				free (malloc_state);
 				free (dup);
@@ -1246,8 +1547,8 @@
 				GHT m_state = strstr (m_state_str, "0x")
 					? (GHT)strtol (m_state_str, NULL, 0)
 					: (GHT)strtol (m_state_str, NULL, 16);
-				GH(RHeap_MallocState) *malloc_state = R_NEW0 (GH(RHeap_MallocState));
-				r_core_read_at (core, m_state, (ut8*)malloc_state, sizeof (GH(RHeap_MallocState)));
+				MallocState *malloc_state = R_NEW0 (MallocState);
+				r_io_read_at (core->io, m_state, (ut8*)malloc_state, sizeof (MallocState));
 				GH(print_heap_fastbin) (core, m_state, malloc_state, global_max_fast, bin);
 				free (malloc_state);
 				free (dup);
@@ -1266,8 +1567,8 @@
 				if (m_state == m_arena) {
 					GH (print_heap_graph) (core, main_arena, &initial_brk);
 				} else {
-					GH(RHeap_MallocState) *malloc_state = R_NEW0 (GH (RHeap_MallocState));
-					(void)r_core_read_at (core, m_state, (ut8*)malloc_state, sizeof (GH(RHeap_MallocState)));
+					MallocState *malloc_state = R_NEW0 (MallocState);
+					(void)r_io_read_at (core->io, m_state, (ut8*)malloc_state, sizeof (MallocState));
 					GH (print_mmap_graph) (core, malloc_state, m_state);
 					free (malloc_state);
 				}
@@ -1275,8 +1576,18 @@
 		}
 		break;
 	case 'j': // "dmhj"
-		eprintf ("TODO: JSON output for dmh is not yet implemented\n");
+		if (GH(r_resolve_main_arena) (core, &m_arena, main_arena) && GH(r_resolve_global_max_fast) (core, &g_max_fast, &global_max_fast)) {
+			GH(print_heap_segment_json) (core, main_arena, &initial_brk, global_max_fast);
+		}
+		break;
+
+#if __GLIBC_MINOR__ > 25
+	case 't':
+		if (GH(r_resolve_main_arena) (core, &m_arena, main_arena) && GH(r_resolve_global_max_fast) (core, &g_max_fast, &global_max_fast)) {
+			GH(print_tcache_instance) (core, main_arena, &initial_brk);
+		}
 		break;
+#endif
 	case '?':
 		r_core_cmd_help (core, GH(help_msg));
 		break;
diff -Nru radare2-2.3.0+dfsg/libr/core/linux_heap_jemalloc.c radare2-2.8.0+dfsg/libr/core/linux_heap_jemalloc.c
--- radare2-2.3.0+dfsg/libr/core/linux_heap_jemalloc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/linux_heap_jemalloc.c	2018-08-07 14:12:36.000000000 +0000
@@ -118,7 +118,7 @@
 		eprintf ("Fail at read symbol je_chunksize\n");
 		return;
 	}
-	r_core_read_at (core, cnksz, (ut8 *)&cnksz, sizeof (GHT));
+	r_io_read_at (core->io, cnksz, (ut8 *)&cnksz, sizeof (GHT));
  
 	switch (input[0]) {
 	case '\0':
@@ -133,24 +133,24 @@
 			arena = r_num_math (core->num, input);
 
 			if (arena) {
-				r_core_read_at (core, arena, (ut8 *)ar, sizeof (arena_t));
-				r_core_read_at (core, (GHT)(size_t)ar->achunks.qlh_first, (ut8 *)head, sizeof (extent_node_t));
+				r_io_read_at (core->io, arena, (ut8 *)ar, sizeof (arena_t));
+				r_io_read_at (core->io, (GHT)(size_t)ar->achunks.qlh_first, (ut8 *)head, sizeof (extent_node_t));
 				if (head->en_addr) {
 					PRINT_YA ("   Chunk - start: ");
 					PRINTF_BA ("0x%08"PFMT64x, (ut64)(size_t)head->en_addr);
 					PRINT_YA (", end: ");
-					PRINTF_BA ("0x%08"PFMT64x, (ut64)(size_t)(head->en_addr + cnksz));
+					PRINTF_BA ("0x%08"PFMT64x, (ut64)(size_t)((char *)head->en_addr + cnksz));
 					PRINT_YA (", size: ");
 					PRINTF_BA ("0x%08"PFMT64x"\n", (ut64)cnksz); 
-					r_core_read_at (core, (ut64)(size_t)head->ql_link.qre_next, (ut8 *)node, sizeof (extent_node_t));
+					r_io_read_at (core->io, (ut64)(size_t)head->ql_link.qre_next, (ut8 *)node, sizeof (extent_node_t));
 					while (node && node->en_addr != head->en_addr) {
 						PRINT_YA ("   Chunk - start: ");
 						PRINTF_BA ("0x%08"PFMT64x, (ut64)(size_t)node->en_addr); 
 						PRINT_YA (", end: ");
-						PRINTF_BA ("0x%"PFMTx, (node->en_addr + cnksz));
+						PRINTF_BA ("0x%"PFMTx, ((char *)node->en_addr + cnksz));
 						PRINT_YA (", size: ");
 						PRINTF_BA ("0x%08"PFMTx"\n", cnksz); 
-						r_core_read_at (core, (ut64)(size_t)node->ql_link.qre_next, (ut8 *)node, sizeof (extent_node_t));
+						r_io_read_at (core->io, (ut64)(size_t)node->ql_link.qre_next, (ut8 *)node, sizeof (extent_node_t));
 					}
 				}
 			}
@@ -179,32 +179,32 @@
 			input += 1;
 
 			if (GH(r_resolve_jemalloc) (core, "je_arenas", &sym)) {
-				r_core_read_at (core, sym, (ut8 *)&arenas, sizeof (GHT));
+				r_io_read_at (core->io, sym, (ut8 *)&arenas, sizeof (GHT));
 				for (;;) {
-					r_core_read_at (core, arenas + i * sizeof (GHT), (ut8 *)&arena, sizeof (GHT));
+					r_io_read_at (core->io, arenas + i * sizeof (GHT), (ut8 *)&arena, sizeof (GHT));
 					if (!arena) {
 						break;
 					}
 					PRINTF_GA ("arenas[%d]: @ 0x%"PFMTx" { \n", i++, (GHT)arena);
-					r_core_read_at (core, arena, (ut8 *)ar, sizeof (arena_t));
-					r_core_read_at (core, (GHT)(size_t)ar->achunks.qlh_first, (ut8 *)head, sizeof (extent_node_t));
+					r_io_read_at (core->io, arena, (ut8 *)ar, sizeof (arena_t));
+					r_io_read_at (core->io, (GHT)(size_t)ar->achunks.qlh_first, (ut8 *)head, sizeof (extent_node_t));
 					if (head->en_addr != 0) {
 						PRINT_YA ("   Chunk - start: ");
 						PRINTF_BA ("0x%08"PFMT64x, (ut64)(size_t)head->en_addr);
 						PRINT_YA (", end: ");
-						PRINTF_BA ("0x%"PFMTx, (head->en_addr + cnksz));
+						PRINTF_BA ("0x%"PFMTx, ((char *)head->en_addr + cnksz));
 						PRINT_YA (", size: ");
 						PRINTF_BA ("0x%08"PFMT64x"\n", (ut64)cnksz); 
 						ut64 addr = (ut64) (size_t)head->ql_link.qre_next;
-						r_core_read_at (core, addr, (ut8 *)node, sizeof (extent_node_t));
+						r_io_read_at (core->io, addr, (ut8 *)node, sizeof (extent_node_t));
 						while (node && head && node->en_addr != head->en_addr) {
 							PRINT_YA ("   Chunk - start: ");
 							PRINTF_BA ("0x%08"PFMT64x, (ut64)(size_t)node->en_addr);
 							PRINT_YA (", end: ");
-							PRINTF_BA ("0x%"PFMT64x, (ut64)(size_t)(node->en_addr + cnksz));
+							PRINTF_BA ("0x%"PFMT64x, (ut64)(size_t)((char *)node->en_addr + cnksz));
 							PRINT_YA (", size: ");
 							PRINTF_BA ("0x%"PFMT64x"\n", cnksz);
-							r_core_read_at (core, (GHT)(size_t)node->ql_link.qre_next, (ut8 *)node, sizeof (extent_node_t));
+							r_io_read_at (core->io, (GHT)(size_t)node->ql_link.qre_next, (ut8 *)node, sizeof (extent_node_t));
 						}
 					}
 					PRINT_GA ("}\n");
@@ -237,7 +237,7 @@
 	switch (input[0]) {
 	case '\0':
 		if (GH(r_resolve_jemalloc)(core, "narenas_total", &symaddr)) {
-			r_core_read_at (core, symaddr, (ut8 *)&narenas, sizeof (GHT));
+			r_io_read_at (core->io, symaddr, (ut8 *)&narenas, sizeof (GHT));
 			PRINTF_GA ("narenas : %d\n", narenas);
 		}
 		if (narenas == 0) {
@@ -254,11 +254,11 @@
 		}
 
 		if (GH(r_resolve_jemalloc)(core, "je_arenas", &arenas)) {
-			r_core_read_at (core, arenas, (ut8 *)&arenas, sizeof (GHT));
+			r_io_read_at (core->io, arenas, (ut8 *)&arenas, sizeof (GHT));
 			PRINTF_GA ("arenas[%d] @ 0x%"PFMTx" {\n", narenas, (GHT)arenas);
 			for (i = 0; i < narenas; i++) {
 				ut64 at = arenas + (i * sizeof (GHT));
-				r_core_read_at (core, at, (ut8 *)&arena, sizeof (GHT));
+				r_io_read_at (core->io, at, (ut8 *)&arena, sizeof (GHT));
 				if (!arena) {
 					PRINTF_YA ("  arenas[%d]: (empty)\n", i);
 					continue;
@@ -271,7 +271,7 @@
 		break;
 	case ' ':
 		arena = r_num_math (core->num, input + 1);
-		r_core_read_at (core, (GHT)arena, (ut8 *)ar, sizeof (arena_t));
+		r_io_read_at (core->io, (GHT)arena, (ut8 *)ar, sizeof (arena_t));
 
 		PRINT_GA ("struct arena_s {\n");
 #define OO(x) arena + r_offsetof (arena_t, x)
@@ -338,10 +338,10 @@
 			break;
 		}
 		if (GH(r_resolve_jemalloc)(core, "je_arenas", &arenas)) {
-			r_core_read_at (core, arenas, (ut8 *)&arenas, sizeof (GHT));
+			r_io_read_at (core->io, arenas, (ut8 *)&arenas, sizeof (GHT));
 			PRINTF_GA ("arenas @ 0x%"PFMTx" {\n", (GHT)arenas);
 			for (;;) {
-				r_core_read_at (core, arenas + i * sizeof (GHT), (ut8 *)&arena, sizeof (GHT));
+				r_io_read_at (core->io, arenas + i * sizeof (GHT), (ut8 *)&arena, sizeof (GHT));
 				if (!arena) {
 					R_FREE (b);
 					break;
@@ -349,9 +349,9 @@
 				PRINTF_YA ("   arenas[%d]: ", i++);
 				PRINTF_BA ("@ 0x%"PFMTx, (GHT)arena);
 				PRINT_YA (" {\n");
-				r_core_read_at (core, arena, (ut8 *)ar, sizeof (arena_t));
+				r_io_read_at (core->io, arena, (ut8 *)ar, sizeof (arena_t));
 				for (j = 0; j < JM_NBINS; j++) {
-					r_core_read_at (core, (GHT)(bin_info + j * sizeof (arena_bin_info_t)),
+					r_io_read_at (core->io, (GHT)(bin_info + j * sizeof (arena_bin_info_t)),
 						(ut8*)b, sizeof (arena_bin_info_t));
 					PRINT_YA ("    {\n");
 					PRINT_YA ("       regsize : ");
@@ -423,21 +423,21 @@
 				return;
 			}
 
-			r_core_read_at (core, npages, (ut8*)&npages, sizeof (GHT));
-			r_core_read_at (core, chunksize_mask, (ut8*)&chunksize_mask, sizeof (GHT));
-			r_core_read_at (core, map_bias, (ut8*)&map_bias, sizeof (GHT));
-			r_core_read_at (core, map_misc_offset, (ut8*)&map_misc_offset, sizeof (GHT));
+			r_io_read_at (core->io, npages, (ut8*)&npages, sizeof (GHT));
+			r_io_read_at (core->io, chunksize_mask, (ut8*)&chunksize_mask, sizeof (GHT));
+			r_io_read_at (core->io, map_bias, (ut8*)&map_bias, sizeof (GHT));
+			r_io_read_at (core->io, map_misc_offset, (ut8*)&map_misc_offset, sizeof (GHT));
 
 			eprintf ("map_misc_offset 0x%08"PFMT64x"\n", (ut64)map_misc_offset);
 
-			r_core_read_at (core, chunk, (ut8 *)c, sizeof (arena_chunk_t));
+			r_io_read_at (core->io, chunk, (ut8 *)c, sizeof (arena_chunk_t));
 			mapbits = *(GHT *)&c->map_bits;
 			eprintf ("map_bits: 0x%08"PFMT64x"\n", (ut64)mapbits);
 
 			uint32_t offset = r_offsetof (arena_chunk_t, map_bits);
 
 			arena_chunk_map_bits_t *dwords = (void *)calloc (sizeof (arena_chunk_map_bits_t), npages);
-			r_core_read_at (core, chunk + offset, (ut8*)dwords, sizeof (arena_chunk_map_bits_t) * npages);
+			r_io_read_at (core->io, chunk + offset, (ut8*)dwords, sizeof (arena_chunk_map_bits_t) * npages);
 			eprintf ("map_bits @ 0x%08"PFMT64x"\n", (ut64)(chunk + offset));
 
 			arena_run_t *r = R_NEW0 (arena_run_t);
@@ -454,9 +454,9 @@
 					arena_chunk_map_misc_t *m = R_NEW0 (arena_chunk_map_misc_t);
 					if (m) {
 						ut64 run = elm + r_offsetof (arena_chunk_map_misc_t, run);
-						r_core_read_at (core, elm, (ut8*)m, sizeof (arena_chunk_map_misc_t));
+						r_io_read_at (core->io, elm, (ut8*)m, sizeof (arena_chunk_map_misc_t));
 						eprintf ("Small run @ 0x%08"PFMT64x"\n", (ut64)elm);
-						r_core_read_at (core, run, (ut8*)r, sizeof (arena_run_t));
+						r_io_read_at (core->io, run, (ut8*)r, sizeof (arena_run_t));
 						eprintf ("binind: 0x%08"PFMT64x"\n", (ut64)r->binind);
 						eprintf ("nfree: 0x%08"PFMT64x"\n", (ut64)r->nfree);
 						eprintf ("bitmap: 0x%08"PFMT64x"\n\n", (ut64)*(GHT*)r->bitmap);
@@ -465,7 +465,7 @@
 				} else if (mapelm.bits & CHUNK_MAP_LARGE) {
 					ut64 run = (ut64) (size_t) chunk + (pageind << LG_PAGE);
 					eprintf ("Large run @ 0x%08"PFMT64x"\n", run);
-					r_core_read_at (core, run, (ut8*)r, sizeof (arena_run_t));
+					r_io_read_at (core->io, run, (ut8*)r, sizeof (arena_run_t));
 					eprintf ("binind: 0x%08"PFMT64x"\n", (ut64)r->binind);
 					eprintf ("nfree: 0x%08"PFMT64x"\n", (ut64)r->nfree);
 					eprintf ("bitmap: 0x%08"PFMT64x"\n\n", (ut64)*(GHT*)r->bitmap);
diff -Nru radare2-2.3.0+dfsg/libr/core/Makefile radare2-2.8.0+dfsg/libr/core/Makefile
--- radare2-2.3.0+dfsg/libr/core/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -10,8 +10,8 @@
 
 OBJS=core.o cmd.o file.o cconfig.o visual.o cio.o yank.o libs.o graph.o
 OBJS+=fortune.o hack.o vasm.o patch.o cbin.o log.o rtr.o cmd_api.o
-OBJS+=canal.o project.o gdiff.o asm.o vmenus.o disasm.o plugin.o
-OBJS+=task.o panels.o pseudo.o vmarks.o anal_tp.o blaze.o
+OBJS+=carg.o canal.o project.o gdiff.o asm.o vmenus.o disasm.o plugin.o
+OBJS+=task.o panels.o pseudo.o vmarks.o anal_tp.o blaze.o cundo.o
 
 CFLAGS+=-I../../shlr/heap/include
 CFLAGS+=-DCORELIB -I../../shlr
diff -Nru radare2-2.3.0+dfsg/libr/core/meson.build radare2-2.8.0+dfsg/libr/core/meson.build
--- radare2-2.3.0+dfsg/libr/core/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,78 +1,138 @@
-files=[
-'anal_tp.c',
-#'anal_vt.c',
-'asm.c',
-'p/core_anal.c',
-'blaze.c',
-'canal.c',
-'cbin.c',
-'cconfig.c',
-'cio.c',
-'cmd.c',
-#'cmd_anal.c',
-'cmd_api.c',
-#'cmd_cmp.c',
-#'cmd_debug.c',
-#'cmd_egg.c',
-#'cmd_eval.c',
-#'cmd_flag.c',
-#'cmd_hash.c',
-#'cmd_help.c',
-#'cmd_info.c',
-#'cmd_log.c',
-'cmd_macro.c',
-'cmd_magic.c',
-#'cmd_meta.c',
-#'cmd_mount.c',
-#'cmd_open.c',
-#'cmd_print.c',
-#'cmd_project.c',
-#'cmd_quit.c',
-#'cmd_search.c',
-#'cmd_search_rop.c',
-#'cmd_section.c',
-#'cmd_seek.c',
-#'cmd_type.c',
-#'cmd_write.c',
-#'cmd_zign.c',
-'core.c',
-'disasm.c',
-'file.c',
-'fortune.c',
-'gdiff.c',
-'graph.c',
-'hack.c',
-'libs.c',
-#'linux_heap_glibc.c',
-'log.c',
-'panels.c',
-'patch.c',
-'plugin.c',
-'project.c',
-'pseudo.c',
-'rtr.c',
-'task.c',
-'vasm.c',
-'visual.c',
-'vmarks.c',
-'vmenus.c',
-'yank.c'
+files = [
+  'anal_tp.c',
+  'asm.c',
+  'blaze.c',
+  'canal.c',
+  'carg.c',
+  'cbin.c',
+  'cconfig.c',
+  'cio.c',
+  'cmd.c',
+  #'cmd_anal.c',
+  'cmd_api.c',
+  #'cmd_cmp.c',
+  #'cmd_debug.c',
+  #'cmd_egg.c',
+  #'cmd_eval.c',
+  #'cmd_flag.c',
+  #'cmd_hash.c',
+  #'cmd_help.c',
+  #'cmd_info.c',
+  #'cmd_log.c',
+  #'cmd_macro.c',
+  #'cmd_magic.c',
+  #'cmd_meta.c',
+  #'cmd_mount.c',
+  #'cmd_open.c',
+  #'cmd_print.c',
+  #'cmd_project.c',
+  #'cmd_quit.c',
+  #'cmd_search.c',
+  #'cmd_search_rop.c',
+  #'cmd_section.c',
+  #'cmd_seek.c',
+  #'cmd_type.c',
+  #'cmd_write.c',
+  #'cmd_zign.c',
+  'core.c',
+  'cundo.c',
+  'disasm.c',
+  'file.c',
+  'fortune.c',
+  'gdiff.c',
+  'graph.c',
+  'hack.c',
+  'libs.c',
+  #'linux_heap_glibc.c',
+  'log.c',
+  'panels.c',
+  'patch.c',
+  'plugin.c',
+  'project.c',
+  'pseudo.c',
+  'rtr.c',
+  'task.c',
+  'vasm.c',
+  'visual.c',
+  'vmarks.c',
+  'vmenus.c',
+  'yank.c',
+  'p/core_a2f.c',
+  'p/core_java.c',
 ]
 
-includes =  ['../../shlr']
+r_core_inc = []
 if host_machine.system() != 'windows'
-  includes += ['../../shlr/heap/include']
+  r_core_inc += ['../../shlr/heap/include']
 endif
+r_core_inc = [platform_inc, include_directories(r_core_inc)]
 
 r_core = library('r_core', files,
-  include_directories: [platform_inc, include_directories(includes)],
-  c_args: ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_reg, r_syscall, r_search, r_cons, r_anal, r_socket, r_io, r_fs, r_lang, r_hash, r_flag, r_parse, r_egg, r_debug, r_magic, r_crypto, r_config, r_bin, r_asm, r_bp],
-  objects: [
-	libr2sdb.extract_all_objects(),
-	libr2spp.extract_all_objects(),
-	libr2gdb.extract_all_objects(),
+  include_directories: r_core_inc,
+  c_args: ['-DCORELIB=1'],
+  dependencies: [
+    r_util_dep,
+    r_reg_dep,
+    r_syscall_dep,
+    r_search_dep,
+    r_cons_dep,
+    r_anal_dep,
+    r_socket_dep,
+    r_io_dep,
+    r_fs_dep,
+    r_lang_dep,
+    r_magic_dep,
+    r_hash_dep,
+    r_flag_dep,
+    r_parse_dep,
+    r_egg_dep,
+    r_debug_dep,
+    r_crypto_dep,
+    r_config_dep,
+    r_bin_dep,
+    r_asm_dep,
+    r_bp_dep,
+    platform_deps,
+    sdb_dep,
+    spp_dep,
+    gdb_dep,
+    java_dep
   ],
-  dependencies: [platform_deps],
-  install: true
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_core_dep = declare_dependency(link_with: r_core,
+                                include_directories: r_core_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_core],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_core',
+  filebase: 'r_core',
+  requires: pkgconfig_magic_requires + [
+    'r_util',
+    'r_reg',
+    'r_syscall',
+    'r_search',
+    'r_cons',
+    'r_anal',
+    'r_socket',
+    'r_io',
+    'r_fs',
+    'r_lang',
+    'r_hash',
+    'r_flag',
+    'r_parse',
+    'r_egg',
+    'r_debug',
+    'r_crypto',
+    'r_config',
+    'r_bin',
+    'r_asm',
+    'r_bp'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/core/p/a2f.mk radare2-2.8.0+dfsg/libr/core/p/a2f.mk
--- radare2-2.3.0+dfsg/libr/core/p/a2f.mk	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/p/a2f.mk	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,15 @@
+CORE_OBJ_A2F=core_a2f.o
+
+STATIC_OBJ+=${CORE_OBJ_A2F}
+CORE_TARGET_A2F=core_a2f.${EXT_SO}
+
+ifeq ($(WITHPIC),1)
+ALL_TARGETS+=${CORE_TARGET_A2F}
+
+${CORE_TARGET_A2F}: ${CORE_OBJ_A2F}
+	${CC} $(call libname,core_anal) ${CFLAGS} \
+		-o core_a2f.${EXT_SO} \
+		$(SHLR)/sdb/src/libsdb.a \
+		-L$(LIBR)/crypto -lr_crypto \
+		${CORE_OBJ_A2F}
+endif
diff -Nru radare2-2.3.0+dfsg/libr/core/p/anal.mk radare2-2.8.0+dfsg/libr/core/p/anal.mk
--- radare2-2.3.0+dfsg/libr/core/p/anal.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/p/anal.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-CORE_OBJ_ANAL=core_anal.o
-
-STATIC_OBJ+=${CORE_OBJ_ANAL}
-CORE_TARGET_ANAL=core_anal.${EXT_SO}
-
-ifeq ($(WITHPIC),1)
-ALL_TARGETS+=${CORE_TARGET_ANAL}
-
-${CORE_TARGET_ANAL}: ${CORE_OBJ_ANAL}
-	${CC} $(call libname,core_anal) ${CFLAGS} \
-		-o core_anal.${EXT_SO} \
-		$(SHLR)/sdb/src/libsdb.a \
-		-L$(LIBR)/crypto -lr_crypto \
-		${CORE_OBJ_ANAL}
-endif
diff -Nru radare2-2.3.0+dfsg/libr/core/p/core_a2f.c radare2-2.8.0+dfsg/libr/core/p/core_a2f.c
--- radare2-2.3.0+dfsg/libr/core/p/core_a2f.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/p/core_a2f.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,406 @@
+/* radare - Copyright 2014-2018 pancake, defragger */
+
+#include <r_types.h>
+#include <r_core.h>
+#include <r_io.h>
+
+#define MAXFCNSIZE 4096
+
+#define Fbb(x) sdb_fmt("bb.%"PFMT64x,x)
+#define Fhandled(x) sdb_fmt("handled.%"PFMT64x,x)
+#define FbbTo(x) sdb_fmt("bb.%"PFMT64x".to",x)
+
+static ut64 getCrossingBlock(Sdb *db, const char *key, ut64 start, ut64 end) {
+	ut64 block_start, block_end;
+	ut64 nearest_start = UT64_MAX;
+	const char *s = sdb_const_get (db, key, NULL);
+	const char *next = NULL;
+	const char *ptr = NULL;
+	if (!s) {
+		return UT64_MAX;
+	}
+	ptr = s;
+	do {
+		const char *str = sdb_const_anext (ptr, &next);
+		block_start = sdb_atoi (str);
+
+		if (start == block_start) { // case 5
+			return start;
+		}
+
+		block_end = sdb_num_get (db, Fbb(block_start), NULL);
+		if (block_end) {
+			if (start > block_start && start < block_end) { // case 2
+				// start is inside the block
+				return block_start;
+			}
+			if (start < block_start && end >= block_end) {
+				// crossing the start of the block
+				if (nearest_start > block_start) {
+					nearest_start = block_start;
+				}
+			}
+		}
+		ptr = next;
+	} while (next);
+
+	return nearest_start;
+}
+
+/*
+ bb.<addr-of-basic-block>=<end-address-of-basic-block>
+ bb.<addr-of-basic-block>.to=array,of,destination,addresses
+*/
+
+static int bbAdd(Sdb *db, ut64 from, ut64 to, ut64 jump, ut64 fail) {
+	ut64 block_start = getCrossingBlock (db, "bbs", from, to);
+	int add = 1;
+	if (block_start == UT64_MAX) {
+		// add = 1;
+	} else if (block_start == from) {
+		// check if size is the same,
+		add = 0;
+	} else {
+		/*
+		   from = start address of new basic block
+		   to = end address of new basic block
+		   jump = destination basic block
+		   fail = fallback jump of basic block
+		   addr = previous closer basic block start address
+		   addr_end = previous closer basic block start address
+		 */
+		// found a possible block
+		if (from > block_start) {
+			// from inside
+			// RESIZE this
+			sdb_num_set (db, Fbb(block_start), from, 0);
+			sdb_num_set (db, FbbTo(block_start), from, 0);
+			sdb_array_set_num (db, FbbTo(block_start), 0, from, 0);
+			sdb_array_set_num (db, FbbTo(block_start), 1, UT64_MAX, 0);
+		} else {
+			// < the current runs into a known block
+			to = block_start;
+			jump = block_start;
+			fail = UT64_MAX;
+		}
+	}
+	if (add) {
+		sdb_array_add_num (db, "bbs", from, 0);
+		sdb_num_set (db, Fbb(from), to, 0);
+		sdb_array_set_num (db, FbbTo(from), 0, jump, 0);
+		sdb_array_set_num (db, FbbTo(from), 1, fail, 0);
+		sdb_num_min (db, "min", from, 0);
+		sdb_num_max (db, "max", to, 0);
+	}
+	return 0;
+}
+
+void addTarget(RCore *core, RStack *stack, Sdb *db, ut64 addr) {
+	if (!sdb_num_get (db, Fhandled(addr), NULL)) {
+		ut64* value = (ut64*) malloc (1 * sizeof(ut64));
+		if (!value) {
+			eprintf ("Failed to allocate memory for address stack\n");
+			return;
+		}
+		*value = addr;
+		if (!r_stack_push (stack, (void*)value)) {
+			eprintf ("Failed to push address on stack\n");
+			free (value);
+			return;
+		}
+		sdb_num_set (db, Fhandled(addr), 1, 0);
+	}
+}
+
+ut64 analyzeStackBased(RCore *core, Sdb *db, ut64 addr, RList *delayed_commands) {
+#define addCall(x) sdb_array_add_num (db, "calls", x, 0);
+#define addUcall(x) sdb_array_add_num (db, "ucalls", x, 0);
+#define addUjmp(x) sdb_array_add_num (db, "ujmps", x, 0);
+#define addCjmp(x) sdb_array_add_num (db, "cjmps", x, 0);
+#define addRet(x) sdb_array_add_num (db, "rets", x, 0);
+#define bbAddOpcode(x) sdb_array_insert_num (db, sdb_fmt ("bb.%"PFMT64x, addr+cur), -1, x, 0);
+	ut64 oaddr = addr;
+	ut64 *value = NULL;
+	RAnalOp *op;
+	int cur = 0;
+	bool block_end = false;
+	RStack *stack = r_stack_newf (10, free);
+	addTarget (core, stack, db, addr);
+
+	while (!r_stack_is_empty (stack)) {
+		block_end = false;
+		value = (ut64*) r_stack_pop (stack);
+		if (!value) {
+			eprintf ("Failed to pop next address from stack\n");
+			break;
+		}
+
+		addr = *value;
+		free (value);
+		cur = 0;
+		while (!block_end) {
+			op = r_core_anal_op (core, addr + cur, R_ANAL_OP_MASK_BASIC);
+			if (!op || !op->mnemonic) {
+				eprintf ("Cannot analyze opcode at %"PFMT64d"\n", addr+cur);
+				oaddr = UT64_MAX;
+				break;
+			}
+			if (op->mnemonic[0] == '?') {
+				eprintf ("Cannot analyze opcode at %"PFMT64d"\n", addr+cur);
+				oaddr = UT64_MAX;
+				break;
+			}
+
+			bbAddOpcode (addr+cur);
+			switch (op->type) {
+			case R_ANAL_OP_TYPE_NOP:
+				// skip nops
+				if (cur == 0) {
+					cur -= op->size;
+					addr += op->size;
+					oaddr += op->size;
+				}
+				break;
+			case R_ANAL_OP_TYPE_CALL:
+				/* A call instruction implies that the destination
+				 * is a new function unless the address is inside
+				 * the same range than the current function */
+				addCall (op->jump);
+				r_list_append (delayed_commands, r_str_newf ("axC %"PFMT64d" %"PFMT64d, op->jump, addr + cur));
+				break;
+			case R_ANAL_OP_TYPE_UCALL:
+			case R_ANAL_OP_TYPE_ICALL:
+			case R_ANAL_OP_TYPE_RCALL:
+			case R_ANAL_OP_TYPE_IRCALL:
+				/* unknown calls depend on ESIL or DEBUG tracing
+				 * information to know the destination, we can mark
+				 * those 'calls' for later adding tracepoints in
+				 * there to record all possible destinations */
+				addUcall (addr+cur);
+				if (op->ptr != UT64_MAX) {
+					r_list_append (delayed_commands, r_str_newf ("axC %"PFMT64d" %"PFMT64d, op->ptr, addr + cur));
+				}
+				break;
+			case R_ANAL_OP_TYPE_UJMP:
+			case R_ANAL_OP_TYPE_RJMP:
+			case R_ANAL_OP_TYPE_IJMP:
+			case R_ANAL_OP_TYPE_IRJMP:
+				/* an unknown jump use to go into computed destinations
+				 * outside the current function, but it may result
+				 * on an antidisasm trick */
+				addUjmp (addr + cur);
+				/* An unknown jump breaks the basic blocks */
+				block_end = true; // XXX more investigation here
+				break;
+			case R_ANAL_OP_TYPE_TRAP:
+				if (cur == 0) {
+					// skip leading int3
+					cur -= op->size;
+					addr += op->size;
+					oaddr += op->size;
+				} else {
+					block_end = true;
+				}
+				break;
+			case R_ANAL_OP_TYPE_RET:
+				addRet (addr + cur);
+				bbAdd (db, addr, addr + cur + op->size, UT64_MAX, UT64_MAX);
+				block_end = true;
+				break;
+			case R_ANAL_OP_TYPE_CJMP:
+				addCjmp (addr+cur);
+				bbAdd (db, addr, addr + cur + op->size, op->jump, addr + cur + op->size);
+				addTarget (core, stack, db, op->jump);
+				addTarget (core, stack, db, addr + cur + op->size);
+				block_end = true;
+				r_list_append (delayed_commands, r_str_newf ("axc %"PFMT64d" %"PFMT64d, op->jump, addr + cur));
+				break;
+			case R_ANAL_OP_TYPE_JMP:
+				addUjmp (addr+cur);
+				bbAdd (db, addr, addr + cur + op->size, op->jump, UT64_MAX);
+				addTarget (core, stack, db, op->jump);
+				block_end = true;
+				r_list_append (delayed_commands, r_str_newf ("axc %"PFMT64d" %"PFMT64d, op->jump, addr + cur));
+				break;
+			case R_ANAL_OP_TYPE_UNK:
+			case R_ANAL_OP_TYPE_ILL:
+				eprintf ("a2f: Invalid instruction\n");
+				block_end = true;
+				break;
+			default:
+				if (op->ptr != UT64_MAX) {
+					r_list_append (delayed_commands, r_str_newf ("axd %"PFMT64d" %"PFMT64d, op->ptr, addr + cur));
+				}
+				break;
+			}
+			cur += op->size;
+			r_anal_op_free (op);
+			op = NULL;
+		}
+	}
+
+	r_stack_free (stack);
+	return oaddr;
+}
+
+static ut64 getFunctionSize(Sdb *db) {
+	ut64 min = UT64_MAX, max = 0;
+	char *c, *bbs = sdb_get (db, "bbs", NULL);
+	bool first = true;
+	sdb_aforeach (c, bbs) {
+		ut64 addr = sdb_atoi (c);
+		ut64 addr_end = sdb_num_get (db, Fbb (addr), NULL);
+		if (first) {
+			min = addr;
+			max = addr_end;
+			first = false;
+		} else {
+			if (addr < min) {
+				min = addr;
+			}
+			if (addr_end > max) {
+				max = addr_end;
+			}
+		}
+		sdb_aforeach_next (c);
+	}
+	free (bbs);
+	return max - min;
+}
+
+static int analyzeFunction(RCore *core, ut64 addr) {
+	Sdb *db = sdb_new0 ();
+	RFlagItem *fi;
+	RList *delayed_commands = NULL;
+	RListIter *iter;
+	ut64 loc_addr = 0;
+	char *command = NULL;
+	char *function_label;
+	bool vars = r_config_get_i (core->config, "anal.vars");
+	if (!db) {
+		eprintf ("Cannot create db\n");
+		return false;
+	}
+
+	delayed_commands = r_list_newf (free);
+	if (!delayed_commands) {
+		eprintf ("Failed to initialize the delayed command list\n");
+		sdb_free (db);
+		return false;
+	}
+
+	ut64 a = analyzeStackBased (core, db, addr, delayed_commands);
+	if (addr == UT64_MAX) {
+		eprintf ("Initial analysis failed\n");
+		return false;
+	}
+	if (a != UT64_MAX) {
+		addr = a;
+	}
+	sdb_num_set (db, "addr", addr, 0);
+
+	//TODO add the possible addresses to the analysis stack
+	//TODO add xrefs
+	//eprintf ("addr: %s\n", sdb_const_get (db, "addr", NULL));
+	//eprintf ("calls: %s\n", sdb_const_get (db, "calls", NULL));
+	//eprintf ("ucalls: %s\n", sdb_const_get (db, "ucalls", NULL));
+	//eprintf ("cjmps: %s\n", sdb_const_get (db, "cjmps", NULL));
+	//eprintf ("ujmps: %s\n", sdb_const_get (db, "ujmps", NULL));
+	//eprintf ("rets: %s\n", sdb_const_get (db, "rets", NULL));
+	//eprintf ("bbs: %s\n", sdb_const_get (db, "bbs", NULL));
+
+	// fcnfit to get fcn size
+	sdb_num_set (db, "size", getFunctionSize (db), 0);
+
+	// receiving a possible flag to label the new function
+	fi = r_flag_get_at (core->flags, addr, false);
+	if (fi && fi->name && strncmp (fi->name, "sect", 4)) {
+		function_label = strdup (fi->name);
+	} else {
+		function_label = r_str_newf ("fcn2.%08"PFMT64x, addr);
+	}
+	// loc_addr = core->offset; // sdb_num_get (db, "addr", NULL);
+	loc_addr = sdb_num_get (db, "addr", NULL);
+	// r_cons_printf ("af+ 0x%08"PFMT64x" %s\n", loc_addr, function_label);
+	r_core_cmdf (core, "af+ 0x%08"PFMT64x" %s", loc_addr, function_label);
+	{
+		char *c, *bbs = sdb_get (db, "bbs", NULL);
+		sdb_aforeach (c, bbs) {
+			ut64 addr = sdb_atoi (c);
+			ut64 addr_end = sdb_num_get (db, Fbb (addr), NULL);
+			// check if call destination is inside the function boundaries
+			ut64 jump = sdb_array_get_num (db, FbbTo (addr), 0, NULL);
+			ut64 fail = sdb_array_get_num (db, FbbTo (addr), 1, NULL);
+
+			// r_cons_printf ("afb+ 0x%"PFMT64x" 0x%"PFMT64x" %d 0x%"PFMT64x" 0x%"PFMT64x"\n",
+			// 	loc_addr, addr, (int)(addr_end - addr), jump, fail);
+			r_core_cmdf (core, "afb+ 0x%"PFMT64x" 0x%"PFMT64x" %d 0x%"PFMT64x" 0x%"PFMT64x,
+			  	loc_addr, addr, (int)(addr_end - addr), jump, fail);
+			sdb_aforeach_next (c);
+		}
+
+		if (vars) {
+			// handling arguments
+			r_core_cmdf (core, "afva @ 0x%"PFMT64x, addr);
+		}
+		free (bbs);
+		free (function_label);
+	}
+	r_list_foreach (delayed_commands, iter, command) {
+		if (command) {
+			r_core_cmd0 (core, command);
+			command = NULL;
+		}
+	}
+	// TODO
+	// xrefs are added but are not mentioned in afi
+	// analyze next calls
+	//	{
+	//		char *c, *calls = sdb_get (db, "calls", NULL);
+	//		sdb_aforeach (c, calls) {
+	//			ut64 addr = sdb_atoi (c);
+	//			r_cons_printf ("a2f @ 0x%"PFMT64x"\n", addr);
+	//			sdb_aforeach_next (c);
+	//		}
+	//		free (calls);
+	//	}
+	r_list_free (delayed_commands);
+	sdb_free (db);
+	return true;
+}
+
+static int r_cmd_anal_call(void *user, const char *input) {
+	RCore *core = (RCore *) user;
+	if (!strncmp (input, "a2", 2)) {
+		switch (input[2]) {
+		case 'f':
+			if (!analyzeFunction (core, core->offset)) {
+				eprintf ("a2f: Failed to analyze function.\n");
+			}
+			break;
+		default:
+			eprintf ("Usage: a2f\n");
+			eprintf ("a2f is the new (experimental) analysis engine\n");
+			eprintf ("Use with caution.\n");
+			break;
+		}
+		return true;
+	}
+	return false;
+}
+
+// PLUGIN Definition Info
+RCorePlugin r_core_plugin_a2f = {
+	.name = "a2f",
+	.desc = "The reworked analysis from scratch thing",
+	.license = "LGPL3",
+	.call = r_cmd_anal_call,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_CORE,
+	.data = &r_core_plugin_a2f,
+	.version = R2_VERSION
+};
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/core/p/core_anal.c radare2-2.8.0+dfsg/libr/core/p/core_anal.c
--- radare2-2.3.0+dfsg/libr/core/p/core_anal.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/p/core_anal.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,404 +0,0 @@
-/* radare - Copyright 2014-2016 pancake, defragger */
-
-#include <r_types.h>
-#include <r_core.h>
-#include <r_io.h>
-
-#define MAXFCNSIZE 4096
-
-#define Fbb(x) sdb_fmt(0,"bb.%"PFMT64x,x)
-#define Fhandled(x) sdb_fmt(0, "handled.%"PFMT64x,x)
-#define FbbTo(x) sdb_fmt(0,"bb.%"PFMT64x".to",x)
-
-static ut64 getCrossingBlock(Sdb *db, const char *key, ut64 start, ut64 end) {
-	ut64 block_start, block_end;
-	ut64 nearest_start = UT64_MAX;
-	const char *s = sdb_const_get (db, key, NULL);
-	const char *next = NULL;
-	const char *ptr = NULL;
-	if (!s) {
-		return UT64_MAX;
-	}
-	ptr = s;
-	do {
-		const char *str = sdb_const_anext (ptr, &next);
-		block_start = sdb_atoi (str);
-
-		if (start == block_start) { // case 5
-			return start;
-		}
-
-		block_end = sdb_num_get (db, Fbb(block_start), NULL);
-		if (block_end) {
-			if (start > block_start && start < block_end) { // case 2
-				// start is inside the block
-				return block_start;
-			}
-			if (start < block_start && end >= block_end) {
-				// crossing the start of the block
-				if (nearest_start > block_start) {
-					nearest_start = block_start;
-				}
-			}
-		}
-		ptr = next;
-	} while (next);
-
-	return nearest_start;
-}
-
-/*
- bb.<addr-of-basic-block>=<end-address-of-basic-block>
- bb.<addr-of-basic-block>.to=array,of,destination,addresses
-*/
-
-static int bbAdd(Sdb *db, ut64 from, ut64 to, ut64 jump, ut64 fail) {
-	ut64 block_start = getCrossingBlock (db, "bbs", from, to);
-	int add = 1;
-	if (block_start == UT64_MAX) {
-		// add = 1;
-	} else if (block_start == from) {
-		// check if size is the same,
-		add = 0;
-	} else {
-		/*
-		   from = start address of new basic block
-		   to = end address of new basic block
-		   jump = destination basic block
-		   fail = fallback jump of basic block
-		   addr = previous closer basic block start address
-		   addr_end = previous closer basic block start address
-		 */
-		// found a possible block
-		if (from > block_start) {
-			// from inside
-			// RESIZE this
-			sdb_num_set (db, Fbb(block_start), from, 0);
-			sdb_num_set (db, FbbTo(block_start), from, 0);
-			sdb_array_set_num (db, FbbTo(block_start), 0, from, 0);
-			sdb_array_set_num (db, FbbTo(block_start), 1, UT64_MAX, 0);
-		} else {
-			// < the current runs into a known block
-			to = block_start;
-			jump = block_start;
-			fail = UT64_MAX;
-		}
-	}
-	if (add) {
-		sdb_array_add_num (db, "bbs", from, 0);
-		sdb_num_set (db, Fbb(from), to, 0);
-		sdb_array_set_num (db, FbbTo(from), 0, jump, 0);
-		sdb_array_set_num (db, FbbTo(from), 1, fail, 0);
-		sdb_num_min (db, "min", from, 0);
-		sdb_num_max (db, "max", to, 0);
-	}
-	return 0;
-}
-
-void addTarget(RCore *core, RStack *stack, Sdb *db, ut64 addr) {
-	if (!sdb_num_get (db, Fhandled(addr), NULL)) {
-		ut64* value = (ut64*) malloc (1 * sizeof(ut64));
-		if (!value) {
-			eprintf ("Failed to allocate memory for address stack\n");
-			return;
-		}
-		*value = addr;
-		if (!r_stack_push (stack, (void*)value)) {
-			eprintf ("Failed to push address on stack\n");
-			free (value);
-			return;
-		}
-		sdb_num_set (db, Fhandled(addr), 1, 0);
-	}
-}
-
-ut64 analyzeStackBased(RCore *core, Sdb *db, ut64 addr, RList *delayed_commands) {
-#define addCall(x) sdb_array_add_num (db, "calls", x, 0);
-#define addUcall(x) sdb_array_add_num (db, "ucalls", x, 0);
-#define addUjmp(x) sdb_array_add_num (db, "ujmps", x, 0);
-#define addCjmp(x) sdb_array_add_num (db, "cjmps", x, 0);
-#define addRet(x) sdb_array_add_num (db, "rets", x, 0);
-#define bbAddOpcode(x) sdb_array_insert_num (db, sdb_fmt (0, "bb.%"PFMT64x, addr+cur), -1, x, 0);
-	ut64 oaddr = addr;
-	ut64 *value = NULL;
-	RAnalOp *op;
-	int cur = 0;
-	bool block_end = false;
-	RStack *stack = r_stack_newf (10, free);
-	addTarget (core, stack, db, addr);
-
-	while (!r_stack_is_empty (stack)) {
-		block_end = false;
-		value = (ut64*) r_stack_pop (stack);
-		if (!value) {
-			eprintf ("Failed to pop next address from stack\n");
-			break;
-		}
-
-		addr = *value;
-		free (value);
-		cur = 0;
-		while (!block_end) {
-			op = r_core_anal_op (core, addr + cur);
-			if (!op || !op->mnemonic) {
-				eprintf ("Cannot analyze opcode at %"PFMT64d"\n", addr+cur);
-				oaddr = UT64_MAX;
-				break;
-			}
-			if (op->mnemonic[0] == '?') {
-				eprintf ("Cannot analyze opcode at %"PFMT64d"\n", addr+cur);
-				oaddr = UT64_MAX;
-				break;
-			}
-
-			bbAddOpcode (addr+cur);
-			switch (op->type) {
-			case R_ANAL_OP_TYPE_NOP:
-				// skip nops
-				if (cur == 0) {
-					cur -= op->size;
-					addr += op->size;
-					oaddr += op->size;
-				}
-				break;
-			case R_ANAL_OP_TYPE_CALL:
-				/* A call instruction implies that the destination
-				 * is a new function unless the address is inside
-				 * the same range than the current function */
-				addCall (op->jump);
-				r_list_append (delayed_commands, r_str_newf ("axC %"PFMT64d" %"PFMT64d, op->jump, addr + cur));
-				break;
-			case R_ANAL_OP_TYPE_UCALL:
-			case R_ANAL_OP_TYPE_ICALL:
-			case R_ANAL_OP_TYPE_RCALL:
-			case R_ANAL_OP_TYPE_IRCALL:
-				/* unknown calls depend on ESIL or DEBUG tracing
-				 * information to know the destination, we can mark
-				 * those 'calls' for later adding tracepoints in
-				 * there to record all possible destinations */
-				addUcall (addr+cur);
-				if (op->ptr != UT64_MAX) {
-					r_list_append (delayed_commands, r_str_newf ("axC %"PFMT64d" %"PFMT64d, op->ptr, addr + cur));
-				}
-				break;
-			case R_ANAL_OP_TYPE_UJMP:
-			case R_ANAL_OP_TYPE_RJMP:
-			case R_ANAL_OP_TYPE_IJMP:
-			case R_ANAL_OP_TYPE_IRJMP:
-				/* an unknown jump use to go into computed destinations
-				 * outside the current function, but it may result
-				 * on an antidisasm trick */
-				addUjmp (addr + cur);
-				/* An unknown jump breaks the basic blocks */
-				block_end = true; // XXX more investigation here
-				break;
-			case R_ANAL_OP_TYPE_TRAP:
-				if (cur == 0) {
-					// skip leading int3
-					cur -= op->size;
-					addr += op->size;
-					oaddr += op->size;
-				} else {
-					block_end = true;
-				}
-				break;
-			case R_ANAL_OP_TYPE_RET:
-				addRet (addr + cur);
-				bbAdd (db, addr, addr + cur + op->size, UT64_MAX, UT64_MAX);
-				block_end = true;
-				break;
-			case R_ANAL_OP_TYPE_CJMP:
-				addCjmp (addr+cur);
-				bbAdd (db, addr, addr + cur + op->size, op->jump, addr + cur + op->size);
-				addTarget (core, stack, db, op->jump);
-				addTarget (core, stack, db, addr + cur + op->size);
-				block_end = true;
-				r_list_append (delayed_commands, r_str_newf ("axc %"PFMT64d" %"PFMT64d, op->jump, addr + cur));
-				break;
-			case R_ANAL_OP_TYPE_JMP:
-				addUjmp (addr+cur);
-				bbAdd (db, addr, addr + cur + op->size, op->jump, UT64_MAX);
-				addTarget (core, stack, db, op->jump);
-				block_end = true;
-				r_list_append (delayed_commands, r_str_newf ("axc %"PFMT64d" %"PFMT64d, op->jump, addr + cur));
-				break;
-			case R_ANAL_OP_TYPE_UNK:
-			case R_ANAL_OP_TYPE_ILL:
-				eprintf ("a2f: Invalid instruction\n");
-				block_end = true;
-				break;
-			default:
-				if (op->ptr != UT64_MAX) {
-					r_list_append (delayed_commands, r_str_newf ("axd %"PFMT64d" %"PFMT64d, op->ptr, addr + cur));
-				}
-				break;
-			}
-			cur += op->size;
-			r_anal_op_free (op);
-			op = NULL;
-		}
-	}
-
-	r_stack_free (stack);
-	return oaddr;
-}
-
-static ut64 getFunctionSize(Sdb *db) {
-	ut64 min = UT64_MAX, max = 0;
-	char *c, *bbs = sdb_get (db, "bbs", NULL);
-	bool first = true;
-	sdb_aforeach (c, bbs) {
-		ut64 addr = sdb_atoi (c);
-		ut64 addr_end = sdb_num_get (db, Fbb (addr), NULL);
-		if (first) {
-			min = addr;
-			max = addr_end;
-			first = false;
-		} else {
-			if (addr < min) {
-				min = addr;
-			}
-			if (addr_end > max) {
-				max = addr_end;
-			}
-		}
-		sdb_aforeach_next (c);
-	}
-	free (bbs);
-	return max - min;
-}
-
-static int analyzeFunction(RCore *core, ut64 addr) {
-	Sdb *db = sdb_new0 ();
-	RFlagItem *fi;
-	RList *delayed_commands = NULL;
-	RListIter *iter;
-	ut64 loc_addr = 0;
-	char *command = NULL;
-	char *function_label;
-	bool vars = r_config_get_i (core->config, "anal.vars");
-	if (!db) {
-		eprintf ("Cannot create db\n");
-		return false;
-	}
-
-	delayed_commands = r_list_newf (free);
-	if (!delayed_commands) {
-		eprintf ("Failed to initialize the delayed command list\n");
-		sdb_free (db);
-		return false;
-	}
-
-	ut64 a = analyzeStackBased (core, db, addr, delayed_commands);
-	if (addr == UT64_MAX) {
-		eprintf ("Initial analysis failed\n");
-		return false;
-	}
-	addr = a;
-	sdb_num_set (db, "addr", addr, 0);
-
-	//TODO add the possible addresses to the analysis stack
-	//TODO add xrefs
-	//eprintf ("addr: %s\n", sdb_const_get (db, "addr", NULL));
-	//eprintf ("calls: %s\n", sdb_const_get (db, "calls", NULL));
-	//eprintf ("ucalls: %s\n", sdb_const_get (db, "ucalls", NULL));
-	//eprintf ("cjmps: %s\n", sdb_const_get (db, "cjmps", NULL));
-	//eprintf ("ujmps: %s\n", sdb_const_get (db, "ujmps", NULL));
-	//eprintf ("rets: %s\n", sdb_const_get (db, "rets", NULL));
-	//eprintf ("bbs: %s\n", sdb_const_get (db, "bbs", NULL));
-
-	// fcnfit to get fcn size
-	sdb_num_set (db, "size", getFunctionSize (db), 0);
-
-	// receiving a possible flag to label the new function
-	fi = r_flag_get_at (core->flags, addr, false);
-	if (fi && fi->name && strncmp (fi->name, "sect", 4)) {
-		function_label = strdup (fi->name);
-	} else {
-		function_label = r_str_newf ("fcn2.%08"PFMT64x, addr);
-	}
-	loc_addr = sdb_num_get (db, "addr", NULL);
-	r_core_cmdf (core, "af+ 0x%08"PFMT64x" %s\n",
-		loc_addr, function_label);
-	{
-		char *c, *bbs = sdb_get (db, "bbs", NULL);
-		sdb_aforeach (c, bbs) {
-			ut64 jump, fail;
-			ut64 addr = sdb_atoi (c);
-			ut64 addr_end = sdb_num_get (db, Fbb(addr), NULL);
-			// check if call destination is inside the function boundaries
-			jump = sdb_array_get_num (db, FbbTo(addr), 0, NULL);
-			fail = sdb_array_get_num (db, FbbTo(addr), 1, NULL);
-
-			r_core_cmdf (core, "afb+ 0x%"PFMT64x" 0x%"PFMT64x" %d 0x%"PFMT64x" 0x%"PFMT64x,
-			  	loc_addr, addr, (int)(addr_end - addr), jump, fail);
-			sdb_aforeach_next (c);
-		}
-
-		if (vars) {
-			// handling arguments
-			r_core_cmdf (core, "afva @ 0x%"PFMT64x, addr);
-		}
-		free (bbs);
-		free (function_label);
-	}
-	r_list_foreach (delayed_commands, iter, command) {
-		if (command) {
-			r_core_cmd0 (core, command);
-			command = NULL;
-		}
-	}
-	// TODO
-	// xrefs are added but are not mentioned in afi
-	// analyze next calls
-	//	{
-	//		char *c, *calls = sdb_get (db, "calls", NULL);
-	//		sdb_aforeach (c, calls) {
-	//			ut64 addr = sdb_atoi (c);
-	//			r_cons_printf ("a2f @ 0x%"PFMT64x"\n", addr);
-	//			sdb_aforeach_next (c);
-	//		}
-	//		free (calls);
-	//	}
-	r_list_free (delayed_commands);
-	sdb_free (db);
-	return true;
-}
-
-static int r_cmd_anal_call(void *user, const char *input) {
-	RCore *core = (RCore *) user;
-	if (!strncmp (input, "a2", 2)) {
-		switch (input[2]) {
-		case 'f':
-			if (!analyzeFunction (core, core->offset)) {
-				eprintf ("a2f: Failed to analyze function.\n");
-			}
-			break;
-		default:
-			eprintf ("Usage: a2f\n");
-			eprintf ("a2f is the new (experimental) analysis engine\n");
-			eprintf ("Use with caution.\n");
-			break;
-		}
-		return true;
-	}
-	return false;
-}
-
-// PLUGIN Definition Info
-RCorePlugin r_core_plugin_anal = {
-	.name = "anal",
-	.desc = "The reworked analysis from scratch thing",
-	.license = "LGPL3",
-	.call = r_cmd_anal_call,
-	.deinit = NULL,
-	.init = NULL,
-};
-
-#ifndef CORELIB
-RLibStruct radare_plugin = {
-	.type = R_LIB_TYPE_CORE,
-	.data = &r_core_plugin_anal,
-	.version = R2_VERSION
-};
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/core/p/core_java.c radare2-2.8.0+dfsg/libr/core/p/core_java.c
--- radare2-2.3.0+dfsg/libr/core/p/core_java.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/p/core_java.c	2018-08-07 14:12:36.000000000 +0000
@@ -1049,7 +1049,7 @@
 		sz = cur_fsz < init_size ? cur_fsz : init_size;
 		while (sz <= cur_fsz) {
 			buf = realloc (buf, sz);
-			ut64 r_sz = r_core_read_at (core, addr, buf, sz) ? sz : 0LL;
+			ut64 r_sz = r_io_read_at (core->io, addr, buf, sz) ? sz : 0LL;
 			// check the return read on the read
 			if (r_sz == 0) break;
 			res_size = r_bin_java_calc_class_size (buf, sz);
@@ -1096,7 +1096,7 @@
 
 		while (sz <= cur_fsz) {
 			buf = realloc (buf, sz);
-			ut64 r_sz = r_core_read_at (core, addr, buf, sz) ? sz : 0LL;
+			ut64 r_sz = r_io_read_at (core->io, addr, buf, sz) ? sz : 0LL;
 			// check the return read on the read
 			if (r_sz == 0) break;
 			res_size = r_bin_java_calc_class_size (buf, sz);
@@ -1277,7 +1277,7 @@
 		flag_value = 0;
 		ut64 cur_offset = core->offset;
 		flag_value_addr = r_cmd_java_is_valid_input_num_value(core, p) ? r_cmd_java_get_input_num_value (core, p) : -1;
-		r_core_read_at (core, flag_value_addr, (ut8 *) &flag_value, 2);
+		r_io_read_at (core->io, flag_value_addr, (ut8 *) &flag_value, 2);
 		IFDBG r_cons_printf ("r_cmd_java_handle_flags_str_at: read = 0x%04x\n", flag_value);
 		if (cur_offset != core->offset) r_core_seek (core, cur_offset-2, 1);
 		flag_value = R_BIN_JAVA_USHORT (((ut8 *) &flag_value), 0);
diff -Nru radare2-2.3.0+dfsg/libr/core/p/Makefile radare2-2.8.0+dfsg/libr/core/p/Makefile
--- radare2-2.3.0+dfsg/libr/core/p/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/p/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -26,7 +26,7 @@
 all: ${ALL_TARGETS}
 
 ALL_TARGETS=
-PLUGS=java.mk anal.mk
+PLUGS=java.mk a2f.mk
 include $(PLUGS)
 
 clean:
diff -Nru radare2-2.3.0+dfsg/libr/core/panels.c radare2-2.8.0+dfsg/libr/core/panels.c
--- radare2-2.3.0+dfsg/libr/core/panels.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/panels.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,53 +1,88 @@
-/* Copyright radare2 2014-2017 - Author: pancake */
+/* Copyright radare2 2014-2018 - Author: pancake, vane11ope */
 
 // pls move the typedefs into roons and rename it -> RConsPanel
 
 #include <r_core.h>
 
-typedef struct {
-	int x;
-	int y;
-	int w;
-	int h;
-	int depth;
-	int type;
-	int sx; // scroll-x
-	int sy; // scroll-y
-	ut64 addr;
-	char *cmd;
-	char *text;
-} Panel;
+#define PANEL_NUM_LIMIT 256
+#define PANEL_MENU_LIMIT 10
 
-#define PANEL_TYPE_FRAME 0
-#define PANEL_TYPE_DIALOG 1
-#define PANEL_TYPE_FLOAT 2
-
-static int COLW = 80;
-static const int layoutCount = 2;
-static int layout = 0;
-static RCore *_core;
-static int n_panels = 0;
-static void reloadPanels(RCore *core);
-static int menu_pos = 0;
-#define LIMIT 256
-struct {
-	int panels[LIMIT];
-	int size;
-} ostack;
-
-static RConsCanvas *can;
-static Panel *panels = NULL;
-static int callgraph = 0;
-static int menu_x = 0;
-static int menu_y = 0;
+#define PANEL_TITLE_SYMBOLS      "Symbols"
+#define PANEL_TITLE_STACK        "Stack"
+#define PANEL_TITLE_LOCALS       "Locals"
+#define PANEL_TITLE_STACKREFS    "StackRefs"
+#define PANEL_TITLE_REGISTERS    "Registers"
+#define PANEL_TITLE_REGISTERREFS "RegisterRefs"
+#define PANEL_TITLE_DISASSEMBLY  "Disassembly"
+#define PANEL_TITLE_PSEUDO       "Pseudo"
+#define PANEL_TITLE_NEWFILES     "New files"
+#define PANEL_TITLE_INFO         "Info"
+#define PANEL_TITLE_DATABASE     "Database"
+#define PANEL_TITLE_HEXDUMP      "Hexdump"
+#define PANEL_TITLE_FUNCTIONS    "Functions"
+#define PANEL_TITLE_COMMENTS     "Comments"
+#define PANEL_TITLE_ENTROPY      "Entropy"
+#define PANEL_TITLE_DRX          "DRX"
+#define PANEL_TITLE_SECTIONS     "Sections"
+#define PANEL_TITLE_STRINGS      "Strings"
+#define PANEL_TITLE_MAPS         "Maps"
+#define PANEL_TITLE_MODULES      "Modules"
+#define PANEL_TITLE_BACKTRACE    "Backtrace"
+#define PANEL_TITLE_BREAKPOINTS  "Breakpoints"
+#define PANEL_TITLE_IMPORTS      "Imports"
+#define PANEL_TITLE_CLIPBOARD    "Clipboard"
+#define PANEL_TITLE_FCNINFO      "FcnInfo"
+#define PANEL_TITLE_GRAPH        "Graph"
+
+#define PANEL_CMD_SYMBOLS        "isq"
+#define PANEL_CMD_STACK          "px 256@r:SP"
+#define PANEL_CMD_STACKREFS      "pxr 256@r:SP"
+#define PANEL_CMD_LOCALS         "afvd"
+#define PANEL_CMD_REGISTERS      "dr="
+#define PANEL_CMD_REGISTERREFS   "drr"
+#define PANEL_CMD_DISASSEMBLY    "pd $r"
+#define PANEL_CMD_PSEUDO         "pdc"
+#define PANEL_CMD_GRAPH          "agf"
+#define PANEL_CMD_INFO           "i"
+#define PANEL_CMD_DATABASE       "k ***"
+#define PANEL_CMD_HEXDUMP        "px 512"
+#define PANEL_CMD_FUNCTIONS      "afl"
+#define PANEL_CMD_COMMENTS       "CC"
+#define PANEL_CMD_ENTROPY        "p=e"
+#define PANEL_CMD_DRX            "drx"
+#define PANEL_CMD_SECTIONS       "iSq"
+#define PANEL_CMD_STRINGS        "izq"
+#define PANEL_CMD_MAPS           "dm"
+#define PANEL_CMD_MODULES        "dmm"
+#define PANEL_CMD_BACKTRACE      "dbt"
+#define PANEL_CMD_BREAKPOINTS    "db"
+#define PANEL_CMD_IMPORTS        "iiq"
+#define PANEL_CMD_CLIPBOARD      "yx"
+#define PANEL_CMD_FCNINFO        "afi"
+
+#define PANEL_CONFIG_PAGE        10
+#define PANEL_CONFIG_SIDEPANEL_W 60
+
+static const int layoutMaxCount = 2;
+
+enum {
+	LAYOUT_DEFAULT = 0,
+	LAYOUT_BALANCE = 1
+};
 
 static const char *menus[] = {
 	"File", "Edit", "View", "Tools", "Search", "Debug", "Analyze", "Help",
 	NULL
 };
+static const int menuNum = ((int)sizeof (menus) / (int)sizeof (const char*)) - 1;
 
 static const char *menus_File[] = {
-	"New", "Open", "Close", ".", "Sections", "Strings", "Symbols", "Imports", "Info", "Database", ".", "Quit",
+	"New", "Open", "ReOpen", "Close", "Sections", "Strings", "Symbols", "Imports", "Info", "Database",  "Quit",
+	NULL
+};
+
+static const char *menus_ReOpen[] = {
+	"In RW", "In Debugger",
 	NULL
 };
 
@@ -58,6 +93,7 @@
 
 static const char *menus_View[] = {
 	"Hexdump", "Disassembly", "Graph", "FcnInfo", "Functions", "Comments", "Entropy", "Colors",
+	"Stack", "StackRefs", "Pseudo",
 	NULL
 };
 
@@ -74,15 +110,15 @@
 static const char *menus_Debug[] = {
 	"Registers", "RegisterRefs", "DRX", "Breakpoints",
 	"Watchpoints", "Maps", "Modules",
-	"Backtrace",
-	".",
+	"Backtrace", "Locals",
 	"Continue", "Cont until.",
 	"Step", "Step Over",
+	"Reload",
 	NULL
 };
 
 static const char *menus_Analyze[] = {
-	"Function", "Program", "Calls", "References",
+	"Function", "Symbols", "Program", "BasicBlocks", "Calls", "References",
 	NULL
 };
 
@@ -91,267 +127,860 @@
 	NULL
 };
 
-static const char **menus_sub[] = {
-	menus_File,
-	menus_Edit,
-	menus_View,
-	menus_Tools,
-	menus_Search,
-	menus_Debug,
-	menus_Analyze,
-	menus_Help,
-	NULL
-};
-
-// TODO: handle mouse wheel
-static int curnode = 0;
-
-#define G(x, y) r_cons_canvas_gotoxy (can, x, y)
-#define W(x) r_cons_canvas_write (can, x)
-#define B(x, y, w, h) r_cons_canvas_box (can, x, y, w, h, NULL)
-#define B1(x, y, w, h) r_cons_canvas_box (can, x, y, w, h, Color_BLUE)
-#define B2(x, y, w, h) r_cons_canvas_box (can, x, y, w, h, Color_MAGENTA)
-#define L(x, y, x2, y2) r_cons_canvas_line (can, x, y, x2, y2, 0)
-#define L1(x, y, x2, y2) r_cons_canvas_line (can, x, y, x2, y2, 1)
-#define L2(x, y, x2, y2) r_cons_canvas_line (can, x, y, x2, y2, 2)
-#define F(x, y, x2, y2, c) r_cons_canvas_fill (can, x, y, x2, y2, c, 0)
+static void layoutMenu(RPanel *panel);
+static void layoutSubMenu(RPanels *panels, int w);
+static void layoutDefault(RPanels *panels);
+static void layoutBalance(RPanels *panels);
+static void layoutSidePanel(RCore *core, const char *title, const char *cmd);
+static void changePanelNum(RPanels *panels, int now, int after);
+static void splitPanelVertical(RCore *core);
+static void splitPanelHorizontal(RCore *core);
+static void panelPrint(RCore *core, RConsCanvas *can, RPanel *panel, int color);
+static void panelAllClear(RPanels *panels);
+static void addPanelFrame(RCore* core, RPanels* panels, const char *title, const char *cmd);
+static RPanel createMenuPanel(int x, int y, char *title);
+static bool checkFunc(RCore *core);
+static void cursorLeft(RCore *core);
+static void cursorRight(RCore *core);
+static void delPanel(RPanels *panels, int delPanelNum);
+static void delCurPanel(RPanels *panels);
+static void delInvalidPanels(RPanels *panels);
+static void dismantlePanel(RPanels *panels);
+static void doPanelsRefresh(RCore *core);
+static void doPanelsRefreshOneShot(RCore *core);
+static bool handleCursorMode(RCore *core, const int key);
+static void handleUpKey(RCore *core);
+static void handleDownKey(RCore *core);
+static void handleLeftKey(RCore *core);
+static void handleRightKey(RCore *core);
+static void handleTabKey(RCore *core, bool shift);
+static bool init(RCore *core, RPanels *panels, int w, int h);
+static bool initPanels(RCore *core, RPanels *panels);
+static void freePanel(RPanel *panel);
+static void panelBreakpoint(RCore *core);
+static void panelContinue(RCore *core);
+static void panelPrompt(const char *prompt, char *buf, int len);
+static void panelSingleStepIn(RCore *core);
+static void panelSingleStepOver(RCore *core);
+static void setRefreshAll(RPanels *panels);
+static void setCursor(RCore *core, bool cur);
+static void replaceCmd(RPanels* panels, char *title, char *cmd);
+static void handleMenu(RCore *core, const int key, int *exit);
+static void onMenu(RCore *core, const char *menu, int *exit);
+static void changeMenu(RPanels *panels, const char **dstMenu);
+static RConsCanvas *createNewCanvas(RCore *core, int w, int h);
 
-static void Panel_print(RConsCanvas *can, Panel *n, int cur) {
-	char title[128];
-	int delta_x, delta_y;
-	if (!n || !can) {
+static void panelPrint(RCore *core, RConsCanvas *can, RPanel *panel, int color) {
+	if (!can || !panel|| !panel->refresh) {
 		return;
 	}
-	delta_x = n->sx;
-	delta_y = n->sy;
-	// clear
-	F (n->x, n->y, n->w, n->h, ' ');
-	if (n->type == PANEL_TYPE_FRAME) {
-		if (cur) {
-			// F (n->x,n->y, n->w, n->h, '.');
+	panel->refresh = false;
+	char *text;
+	char title[128];
+	int delta_x, delta_y, graph_pad = 0;
+	delta_x = panel->sx;
+	delta_y = panel->sy;
+	r_cons_canvas_fill (can, panel->x, panel->y, panel->w, panel->h, ' ');
+	if (panel->type == PANEL_TYPE_MENU) {
+		(void) r_cons_canvas_gotoxy (can, panel->x + 2, panel->y + 2);
+		text = r_str_ansi_crop (panel->title,
+				delta_x, delta_y, panel->w + 5, panel->h - delta_y);
+		if (text) {
+			r_cons_canvas_write (can, text);
+			free (text);
+		} else {
+			r_cons_canvas_write (can, panel->title);
+		}
+	} else {
+		if (color) {
 			snprintf (title, sizeof (title) - 1,
-				Color_BGREEN "[x] %s"Color_RESET, n->text);
+				"%s[x] %s"Color_RESET, core->cons->pal.graph_box2, panel->title);
 		} else {
 			snprintf (title, sizeof (title) - 1,
-				"   %s   ", n->text);
+				"   %s   ", panel->title);
 		}
-		if (G (n->x + 1, n->y + 1)) {
-			W (title); // delta_x
+		if (r_cons_canvas_gotoxy (can, panel->x + 1, panel->y + 1)) {
+			r_cons_canvas_write (can, title); // delta_x
+		}
+		(void) r_cons_canvas_gotoxy (can, panel->x + 2, panel->y + 2);
+		char *cmdStr;
+		bool ce = core->print->cur_enabled;
+		if (!strcmp (panel->cmd, PANEL_CMD_DISASSEMBLY)) {
+			core->offset = panel->addr;
+			r_core_seek (core, panel->addr, 1);
+			r_core_block_read (core);
+			core->print->cur_enabled = false;
+			cmdStr = r_core_cmd_str (core, panel->cmd);
+		} else if (!strcmp (panel->cmd, PANEL_CMD_STACK)) {
+			const int delta = r_config_get_i (core->config, "stack.delta");
+			const char sign = (delta < 0)? '+': '-';
+			const int absdelta = R_ABS (delta);
+			cmdStr = r_core_cmd_strf (core, "%s%c%d", PANEL_CMD_STACK, sign, absdelta);
+		} else if (!strcmp (panel->cmd, PANEL_CMD_GRAPH)) {
+			if (panel->cmdStrCache) {
+				cmdStr = panel->cmdStrCache;
+			} else {
+				cmdStr = r_core_cmd_str (core, panel->cmd);
+				panel->cmdStrCache = cmdStr;
+			}
+			graph_pad = 1;
+			core->cons->event_resize = NULL; // avoid running old event with new data
+			core->cons->event_data = core;
+			core->cons->event_resize = (RConsEvent) doPanelsRefreshOneShot;
+		} else if (!strcmp (panel->cmd, PANEL_CMD_PSEUDO)) {
+			if (panel->cmdStrCache) {
+				cmdStr = panel->cmdStrCache;
+			} else {
+				cmdStr = r_core_cmd_str (core, panel->cmd);
+				panel->cmdStrCache = cmdStr;
+			}
+		} else {
+			cmdStr = r_core_cmd_str (core, panel->cmd);
 		}
-	}
-	(void) G (n->x + 2, n->y + 2);
-	// if (
-// TODO: only refresh if n->refresh is set
-// TODO: temporary crop depending on out of screen offsets
-	if (n->cmd && *n->cmd) {
-		char *foo = r_core_cmd_str (_core, n->cmd);
-		char *text;
 		if (delta_y < 0) {
 			delta_y = 0;
 		}
 		if (delta_x < 0) {
-			char white[128];
+			char *white = (char*)r_str_pad (' ', 128);
 			int idx = -delta_x;
-			memset (white, ' ', sizeof(white));
 			if (idx >= sizeof (white)) {
 				idx = sizeof (white) - 1;
 			}
 			white[idx] = 0;
-			text = r_str_ansi_crop (foo,
-				0, delta_y, n->w + delta_x - 2, n->h - 2 + delta_y);
+			text = r_str_ansi_crop (cmdStr,
+					0, delta_y + graph_pad, panel->w + delta_x - 3, panel->h - 2 + delta_y);
 			char *newText = r_str_prefix_all (text, white);
 			if (newText) {
 				free (text);
 				text = newText;
 			}
 		} else {
-			text = r_str_ansi_crop (foo,
-				delta_x, delta_y, n->w + delta_x - 2, n->h - 2 + delta_y);
+			text = r_str_ansi_crop (cmdStr,
+					delta_x, delta_y + graph_pad, panel->w + delta_x - 3, panel->h - 2 + delta_y);
 		}
 		if (text) {
-			W (text);
+			r_cons_canvas_write (can, text);
 			free (text);
 		} else {
-			W (n->text);
+			r_cons_canvas_write (can, panel->title);
+		}
+		if (!panel->cmdStrCache) {
+			free (cmdStr);
 		}
-		free (foo);
+		core->print->cur_enabled = ce;
+	}
+	if (color) {
+		r_cons_canvas_box (can, panel->x, panel->y, panel->w, panel->h, core->cons->pal.graph_box2);
 	} else {
-		char *text = r_str_ansi_crop (n->text,
-			delta_x, delta_y, n->w + 5, n->h - delta_y);
-		if (text) {
-			W (text);
-			free (text);
+		r_cons_canvas_box (can, panel->x, panel->y, panel->w, panel->h, core->cons->pal.graph_box);
+	}
+}
+
+static void panelAllClear(RPanels *panels) {
+	if (!panels) {
+		return;
+	}
+	int i;
+	RPanel *panel = NULL;
+	for (i = 0; i < panels->n_panels; i++) {
+		panel = &panels->panel[i];
+		r_cons_canvas_fill (panels->can, panel->x, panel->y, panel->w, panel->h, ' ');
+	}
+	r_cons_canvas_print (panels->can);
+	r_cons_flush ();
+}
+
+static void layoutMenu(RPanel *panel) {
+	panel->w = r_str_bounds (panel->title, &panel->h);
+	panel->h += 4;
+}
+
+static void layoutSubMenu(RPanels *panels, int w) {
+	int i, j;
+	RPanel panel;
+	int x = panels->menuIndexStack[0] * 6;
+	int y = 1;
+	const char **currentMenu;
+	int currentMenuIndex;
+	char *title;
+	for (i = 0; i < panels->menuStackDepth; i++) {
+		if (i == 0) {
+			continue;
+		}
+		currentMenu = panels->menuStack[i];
+		currentMenuIndex = panels->menuIndexStack[i];
+		title = calloc (1, 1024);
+		for (j = 0; currentMenu[j]; j++) {
+			if (currentMenuIndex == j) {
+				strcat (title, "> ");
+			} else {
+				strcat (title, "  ");
+			}
+			strcat (title, currentMenu[j]);
+			strcat (title, "          \n");
+		}
+		panel = createMenuPanel (x, y, title);
+		layoutMenu (&panel);
+		panels->menuPanel[i] = panel;
+		x += panel.w - 1;
+		y = panels->menuIndexStack[i] + 2;
+	}
+	title = calloc (1, 1024);
+	for (i = 0; panels->currentMenu[i]; i++) {
+		if (panels->currentMenuIndex == i) {
+			strcat (title, "> ");
+		} else {
+			strcat (title, "  ");
+		}
+		strcat (title, panels->currentMenu[i]);
+		strcat (title, "          \n");
+	}
+	panel = createMenuPanel (x, y, title);
+	layoutMenu (&panel);
+	panels->menuPanel[panels->menuStackDepth] = panel;
+}
+
+R_API void r_core_panels_layout (RPanels *panels) {
+	panels->can->sx = 0;
+	panels->can->sy = 0;
+	switch (panels->layout) {
+		case LAYOUT_DEFAULT:
+			layoutDefault (panels);
+			break;
+		case LAYOUT_BALANCE:
+			layoutBalance (panels);
+			break;
+	}
+}
+
+static void layoutDefault(RPanels *panels) {
+	int h, w = r_cons_get_size (&h);
+	int ph = (h - 1) / (panels->n_panels - 1);
+	int i;
+	int colpos = w - panels->columnWidth;
+	RPanel *panel = panels->panel;
+	panel[0].x = 0;
+	panel[0].y = 1;
+	if (panels->n_panels > 1) {
+		panel[0].w = colpos + 1;
+	} else {
+		panel[0].w = w;
+	}
+	panel[0].h = h - 1;
+	for (i = 1; i < panels->n_panels; i++) {
+		panel[i].x = colpos;
+		panel[i].y = 2 + (ph * (i - 1));
+		panel[i].w = w - colpos;
+		if (panel[i].w < 0) {
+			panel[i].w = 0;
+		}
+		if ((i + 1) == panels->n_panels) {
+			panel[i].h = h - panel[i].y;
 		} else {
-			W (n->text);
+			panel[i].h = ph;
 		}
+		panel[i].y--;
+		panel[i].h++;
 	}
+}
+
+static void layoutBalance(RPanels *panels) {
+	int h, w = r_cons_get_size (&h);
+	int i, ii;
+	int panelNum = panels->n_panels;
+	int leftCol = panelNum / 2;
+	int rightCol = panelNum - leftCol;
+	int pw = w / 2;
+	RPanel *panel = panels->panel;
+	for (i = 0; i < leftCol; i++) {
+		panel[i].x = 0;
+		panel[i].y = 1 + i * (h / leftCol - 1);
+		panel[i].w = pw + 2;
+		panel[i].h = h / leftCol;
+		if (i == leftCol - 1) {
+			panel[i].h = h - panel[i].y;
+		} else {
+			panel[i].h = h / leftCol;
+		}
+	}
+	for (i = 0; i < rightCol; i++) {
+		ii = i + leftCol;
+		panel[ii].x = pw + 1;
+		panel[ii].y = 1 + i * (h / rightCol - 1);
+		panel[ii].w = pw - 1;
+		if (i == rightCol - 1) {
+			panel[ii].h = h - panel[ii].y;
+		} else {
+			panel[ii].h = h / rightCol;
+		}
+	}
+}
+
+static void layoutSidePanel(RCore *core, const char *title, const char *cmd) {
+	RPanels *panels = core->panels;
+	RPanel *panel = panels->panel;
+	int h;
+	r_cons_get_size (&h);
+	int i;
+	(void)r_cons_get_size (&h);
+
+	for (i = 0; i < panels->n_panels; i++) {
+		RPanel *p = &panel[i];
+		if (p->x == 0) {
+			if (p->w >= PANEL_CONFIG_SIDEPANEL_W) {
+				p->x += PANEL_CONFIG_SIDEPANEL_W - 1;
+				p->w -= PANEL_CONFIG_SIDEPANEL_W - 1;
+			}
+		}
+	}
+
+	addPanelFrame (core, panels, title, cmd);
+	changePanelNum (panels, panels->n_panels - 1, 0);
+	panel[0].x = 0;
+	panel[0].y = 1;
+	panel[0].w = PANEL_CONFIG_SIDEPANEL_W;
+	panel[0].h = h - 1;
+	panels->curnode = 0;
+	setRefreshAll (panels);
+}
+
+static void splitPanelVertical(RCore *core) {
+	RPanels *panels = core->panels;
+	RPanel *panel = panels->panel;
+	const int curnode = panels->curnode;
+	const int owidth = panel[curnode].w;
+
+	addPanelFrame (core, panels, panel[curnode].title, panel[curnode].cmd);
+
+	changePanelNum (panels, panels->n_panels - 1, panels->curnode + 1);
+
+	panel[curnode].w = owidth / 2 + 1;
+	panel[curnode + 1].x = panel[curnode].x + panel[curnode].w - 1;
+	panel[curnode + 1].y = panel[curnode].y;
+	panel[curnode + 1].w = owidth - panel[curnode].w + 1;
+	panel[curnode + 1].h = panel[curnode].h;
+	setRefreshAll (panels);
+}
+
+static void splitPanelHorizontal(RCore *core) {
+	RPanels *panels = core->panels;
+	RPanel *panel = panels->panel;
+	const int curnode = panels->curnode;
+	const int oheight = panel[curnode].h;
+
+	addPanelFrame (core, panels, panel[curnode].title, panel[curnode].cmd);
+
+    changePanelNum (panels, panels->n_panels - 1, panels->curnode + 1);
+
+	panel[curnode].h = oheight / 2 + 1;
+	panel[curnode + 1].x = panel[curnode].x;
+	panel[curnode + 1].y = panel[curnode].y + panel[curnode].h - 1;
+	panel[curnode + 1].w = panel[curnode].w;
+	panel[curnode + 1].h = oheight - panel[curnode].h + 1;
+	setRefreshAll (panels);
+}
+
+R_API void r_core_panels_layout_refresh(RCore *core) {
+	delInvalidPanels (core->panels);
+	r_core_panels_check_stackbase (core);
+	r_core_panels_refresh (core);
+}
+
+static void changePanelNum(RPanels *panels, int now, int after) {
+	RPanel *panel = panels->panel;
+	const int n_panels = panels->n_panels;
+	int i;
+	RPanel tmpPanel = panel[now];
+	for (i = n_panels - 1; i > after; i--) {
+		panel[i] = panel[i - 1];
+	}
+	panel[after] = tmpPanel;
+}
+
+static void setCursor(RCore *core, bool cur) {
+	core->print->cur_enabled = cur;
 	if (cur) {
-		B1 (n->x, n->y, n->w, n->h);
+		core->print->cur = core->panels->panel[core->panels->curnode].curpos;
 	} else {
-		B (n->x, n->y, n->w, n->h);
+		core->panels->panel[core->panels->curnode].curpos = core->print->cur;
 	}
+	core->print->col = core->print->cur_enabled ? 1: 0;
 }
 
-static void Layout_run(Panel *panels) {
-	int h, w = r_cons_get_size (&h);
-	int i, j;
-	int colpos = w - COLW;
-	if (colpos < 0) {
-		COLW = w;
-		colpos = 0;
-	}
-	if (layout < 0) {
-		layout = layoutCount - 1;
-	}
-	if (layout >= layoutCount) {
-		layout = 0;
-	}
-
-	can->sx = 0;
-	can->sy = 0;
-	for (i = j = 0; panels[i].text; i++) {
-		switch (panels[i].type) {
-		case PANEL_TYPE_FLOAT:
-			panels[i].w = r_str_bounds (
-				panels[i].text,
-				&panels[i].h);
-			panels[i].h += 4;
-			break;
-		case PANEL_TYPE_FRAME:
-			switch (layout) {
-			case 0:
-				if (j == 0) {
-					panels[i].x = 0;
-					panels[i].y = 1;
-					if (panels[j + 1].text) {
-						panels[i].w = colpos + 1;
-					} else {
-						panels[i].w = w;
-					}
-					panels[i].h = h - 1;
-				} else {
-					int ph = ((h - 1) / (n_panels - 2));
-					panels[i].x = colpos;
-					panels[i].y = 1 + (ph * (j - 1));
-					panels[i].w = w - colpos;
-					if (panels[i].w < 0) {
-						panels[i].w = 0;
-					}
-					panels[i].h = ph;
-					if (!panels[i + 1].text) {
-						panels[i].h = h - panels[i].y;
-					}
-					if (j != 1) {
-						panels[i].y--;
-						panels[i].h++;
-					}
-				}
-				break;
-			case 1:
-				if (j == 0) {
-					panels[i].x = 0;
-					panels[i].y = 1;
-					if (panels[j + 1].text) {
-						panels[i].w = colpos + 1;
-					} else {
-						panels[i].w = w;
-					}
-					panels[i].h = (h / 2) + 1;
-				} else if (j == 1) {
-					panels[i].x = 0;
-					panels[i].y = (h / 2) + 1;
-					if (panels[j + 1].text) {
-						panels[i].w = colpos + 1;
-					} else {
-						panels[i].w = w;
-					}
-					panels[i].h = (h - 1) / 2;
-				} else {
-					int ph = ((h - 1) / (n_panels - 3));
-					panels[i].x = colpos;
-					panels[i].y = 1 + (ph * (j - 2));
-					panels[i].w = w - colpos;
-					if (panels[i].w < 0) {
-						panels[i].w = 0;
-					}
-					panels[i].h = ph;
-					if (!panels[i + 1].text) {
-						panels[i].h = h - panels[i].y;
-					}
-					if (j != 2) {
-						panels[i].y--;
-						panels[i].h++;
-					}
+static void cursorRight(RCore *core) {
+	if (!strcmp (core->panels->panel[core->panels->curnode].cmd, PANEL_CMD_STACK) && core->print->cur >= 15) {
+		return;
+	}
+	core->print->cur++;
+	core->panels->panel[core->panels->curnode].addr++;
+	return;
+}
+
+static void cursorLeft(RCore *core) {
+	if (core->print->cur > 0) {
+		core->print->cur--;
+		core->panels->panel[core->panels->curnode].addr--;
+	}
+	return;
+}
+
+static void handleUpKey(RCore *core) {
+	RPanels *panels = core->panels;
+
+	r_cons_switchbuf (false);
+	if (panels->curnode == panels->menu_pos) {
+		if (panels->menuStackDepth == 0) {
+			return;
+		} else if (panels->menuStackDepth == 1) {
+			if (!panels->currentMenuIndex) {
+				panels->menuStackDepth = 0;
+				panels->currentMenuIndex = panels->menuIndexStack[0];
+				panels->currentMenu = panels->menuStack[0];
+				setRefreshAll (panels);
+			} else {
+				panels->currentMenuIndex--;
+			}
+		} else {
+			if (panels->currentMenuIndex) {
+				panels->currentMenuIndex--;
+			}
+		}
+	} else {
+		panels->panel[panels->curnode].refresh = true;
+		if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_DISASSEMBLY)) {
+			int cols = core->print->cols;
+			core->offset = panels->panel[panels->curnode].addr;
+			r_core_visual_disasm_up (core, &cols);
+			r_core_seek_delta (core, -cols);
+			panels->panel[panels->curnode].addr = core->offset;
+		} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_STACK)) {
+			int width = r_config_get_i (core->config, "hex.cols");
+			if (width < 1) {
+				width = 16;
+			}
+			r_config_set_i (core->config, "stack.delta",
+					r_config_get_i (core->config, "stack.delta") + width);
+			panels->panel[panels->curnode].addr -= width;
+		} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_REGISTERS)) {
+			if (core->print->cur_enabled) {
+				int cur = core->print->cur;
+				int cols = core->dbg->regcols;
+				cols = cols > 0 ? cols : 3;
+				cur -= cols;
+				if (cur >= 0) {
+					core->print->cur = cur;
 				}
-				break;
-				break;
+			}
+		} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_GRAPH)) {
+			if (panels->panel[panels->curnode].sy > 0) {
+				panels->panel[panels->curnode].sy -= r_config_get_i (core->config, "graph.scroll");
+			}
+		} else {
+			if (panels->panel[panels->curnode].sy > 0) {
+				panels->panel[panels->curnode].sy--;
+			}
+		}
+	}
+}
+
+static void handleDownKey(RCore *core) {
+	RPanels *panels = core->panels;
+	r_cons_switchbuf (false);
+	if (panels->curnode == panels->menu_pos) {
+		if (!panels->menuStackDepth) {
+			int exit = 0;
+			onMenu (core, panels->currentMenu[panels->currentMenuIndex], &exit);
+		} else {
+			if (panels->currentMenu[panels->currentMenuIndex + 1]) {
+				panels->currentMenuIndex++;
+			}
+		}
+	} else {
+		panels->panel[panels->curnode].refresh = true;
+		if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_DISASSEMBLY)) {
+			core->offset = panels->panel[panels->curnode].addr;
+			RAsmOp op;
+			int cols = core->print->cols;
+			r_core_visual_disasm_down (core, &op, &cols);
+			r_core_seek (core, core->offset + cols, 1);
+			r_core_block_read (core);
+			panels->panel[panels->curnode].addr = core->offset;
+		} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_STACK)) {
+			int width = r_config_get_i (core->config, "hex.cols");
+			if (width < 1) {
+				width = 16;
+			}
+			r_config_set_i (core->config, "stack.delta",
+					r_config_get_i (core->config, "stack.delta") - width);
+			panels->panel[panels->curnode].addr += width;
+		} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_REGISTERS)) {
+			if (core->print->cur_enabled) {
+				const int cols = core->dbg->regcols;
+				core->print->cur += cols > 0 ? cols : 3;
+			}
+		} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_GRAPH)) {
+			panels->panel[panels->curnode].sy += r_config_get_i (core->config, "graph.scroll");
+		} else {
+			panels->panel[panels->curnode].sy++;
+		}
+	}
+}
 
+static void handleLeftKey(RCore *core) {
+	RPanels *panels = core->panels;
+	r_cons_switchbuf (false);
+	if (panels->curnode == panels->menu_pos) {
+		if (!panels->menuStackDepth) {
+			if (panels->currentMenuIndex) {
+				panels->currentMenuIndex--;
+			} else  {
+				panels->currentMenuIndex = menuNum - 1;
+			}
+		} else if (panels->menuStackDepth > 0) {
+			panels->menuStackDepth = 0;
+			panels->currentMenu = panels->menuStack[0];
+			if (panels->menuIndexStack[0]) {
+				panels->currentMenuIndex = panels->menuIndexStack[0] - 1;
+			} else {
+				panels->currentMenuIndex = menuNum - 1;
 			}
-			j++;
+			setRefreshAll (panels);
+		}
+	} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_GRAPH)) {
+		if (panels->panel[panels->curnode].sx > 0) {
+			panels->panel[panels->curnode].sx -= r_config_get_i (core->config, "graph.scroll");
+			panels->panel[panels->curnode].refresh = true;
+		}
+	} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_REGISTERS)
+			|| !strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_STACK)) {
+		if (core->print->cur_enabled) {
+			cursorLeft (core);
+			panels->panel[panels->curnode].refresh = true;
+		}
+	} else {
+		if (panels->panel[panels->curnode].sx > 0) {
+			panels->panel[panels->curnode].sx--;
+			panels->panel[panels->curnode].refresh = true;
 		}
 	}
 }
 
-static void delcurpanel() {
-	int i;
-	if (curnode > 0 && n_panels > 3) {
-		for (i = curnode; i < (n_panels - 1); i++) {
-			panels[i] = panels[i + 1];
+static void handleRightKey(RCore *core) {
+	RPanels *panels = core->panels;
+	r_cons_switchbuf (false);
+	if (panels->curnode ==  panels->menu_pos) {
+		if (!panels->menuStackDepth) {
+			panels->currentMenuIndex++;
+			panels->currentMenuIndex %= menuNum;
+		} else if (panels->menuStackDepth > 0) {
+			panels->menuStackDepth = 0;
+			panels->currentMenu = panels->menuStack[0];
+			panels->currentMenuIndex = panels->menuIndexStack[0] + 1;
+			panels->currentMenuIndex %= menuNum;
+			setRefreshAll (panels);
+		}
+	} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_GRAPH)) {
+		panels->panel[panels->curnode].sx += r_config_get_i (core->config, "graph.scroll");
+		panels->panel[panels->curnode].refresh = true;
+	} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_REGISTERS)
+			|| !strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_STACK)) {
+		if (core->print->cur_enabled) {
+			cursorRight (core);
+			panels->panel[panels->curnode].refresh = true;
 		}
-		panels[i].text = 0;
-		n_panels--;
-		if (curnode >= n_panels) {
-			curnode = n_panels - 1;
+	} else {
+		panels->panel[panels->curnode].sx++;
+		panels->panel[panels->curnode].refresh = true;
+	}
+}
+
+static bool handleCursorMode(RCore *core, const int key) {
+	const char *creg;
+	const RPanels *panels = core->panels;
+	char buf[128];
+	if (!core->print->cur_enabled) {
+		return false;
+	}
+	if (core->print->cur_enabled) {
+		switch (key) {
+		case 'h':
+			handleLeftKey (core);
+			break;
+		case 'j':
+			handleDownKey (core);
+			break;
+		case 'k':
+			handleUpKey (core);
+			break;
+		case 'l':
+			handleRightKey (core);
+			break;
+		case 'Q':
+		case 'q':
+			setCursor (core, !core->print->cur_enabled);
+			panels->panel[panels->curnode].refresh = true;
+			break;
+		case 'i':
+			if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_STACK)) {
+				// insert mode
+				const char *prompt = "insert hex: ";
+				panelPrompt (prompt, buf, sizeof (buf));
+				r_core_cmdf (core, "wx %s @ 0x%08" PFMT64x, buf, panels->panel[panels->curnode].addr);
+				panels->panel[panels->curnode].refresh = true;
+			} else if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_REGISTERS)) {
+				creg = core->dbg->creg;
+				if (creg) {
+					const char *prompt = "new-reg-value> ";
+					panelPrompt (prompt, buf, sizeof (buf));
+					r_core_cmdf (core, "dr %s = %s", creg, buf);
+					panels->panel[panels->curnode].refresh = true;
+				}
+			}
 		}
 	}
+	return true;
+}
+
+static void delPanel(RPanels *panels, int delPanelNum) {
+	int i;
+	for (i = delPanelNum; i < (panels->n_panels - 1); i++) {
+		panels->panel[i] = panels->panel[i + 1];
+	}
+	panels->panel[i].title = 0;
+	panels->n_panels--;
+	if (panels->curnode >= panels->n_panels) {
+		panels->curnode = panels->n_panels - 1;
+	}
+}
+
+static void delCurPanel(RPanels *panels) {
+	dismantlePanel (panels);
+	if (panels->curnode >= 0 && panels->n_panels > 2) {
+		delPanel (panels, panels->curnode);
+	}
 }
 
-static void zoom() {
-	if (n_panels > 2) {
-		if (curnode < 2) {
-			curnode = 2;
+static void delInvalidPanels(RPanels *panels) {
+	int i;
+	for (i = 1; i < panels->n_panels; i++) {
+		RPanel *panel = &panels->panel[i];
+		if (panel->w < 2) {
+			delPanel (panels, i);
+			delInvalidPanels (panels);
+			break;
 		}
-		Panel ocurnode = panels[curnode];
-		panels[curnode] = panels[1];
-		panels[1] = ocurnode;
-		curnode = 1;
 	}
 }
 
-static void addPanelFrame(const char *title, const char *cmd, ut64 addr) {
-	int i = n_panels;
-	if (!panels) {
-		panels = calloc (sizeof (Panel), LIMIT);
-		if (!panels) {
-			return;
+static void dismantlePanel(RPanels *panels) {
+	RPanel *justLeftPanel = NULL, *justRightPanel = NULL, *justUpPanel = NULL, *justDownPanel = NULL;
+	RPanel *tmpPanel = NULL;
+	bool leftUpValid = false, leftDownValid = false, rightUpValid = false, rightDownValid = false,
+		 upLeftValid = false, upRightValid = false, downLeftValid = false, downRightValid = false;
+	int left[PANEL_NUM_LIMIT], right[PANEL_NUM_LIMIT], up[PANEL_NUM_LIMIT], down[PANEL_NUM_LIMIT];
+	memset (left, -1, sizeof (left));
+	memset (right, -1, sizeof (right));
+	memset (up, -1, sizeof (up));
+	memset (down, -1, sizeof (down));
+	int i, ox, oy, ow, oh;
+	ox = panels->panel[panels->curnode].x;
+	oy = panels->panel[panels->curnode].y;
+	ow = panels->panel[panels->curnode].w;
+	oh = panels->panel[panels->curnode].h;
+	for (i = 0; i < panels->n_panels; i++) {
+		tmpPanel = &panels->panel[i];
+		if (tmpPanel->x + tmpPanel->w - 1 == ox) {
+			left[i] = 1;
+			if (oy == tmpPanel->y) {
+				leftUpValid = true;
+				if (oh == tmpPanel->h) {
+					justLeftPanel = tmpPanel;
+					break;
+				}
+			}
+			if (oy + oh == tmpPanel->y + tmpPanel->h) {
+				leftDownValid = true;
+			}
+		}
+		if (tmpPanel->x == ox + ow - 1) {
+			right[i] = 1;
+			if (oy == tmpPanel->y) {
+				rightUpValid = true;
+				if (oh == tmpPanel->h) {
+					rightDownValid = true;
+					justRightPanel = tmpPanel;
+				}
+			}
+			if (oy + oh == tmpPanel->y + tmpPanel->h) {
+				rightDownValid = true;
+			}
+		}
+		if (tmpPanel->y + tmpPanel->h - 1 == oy) {
+			up[i] = 1;
+			if (ox == tmpPanel->x) {
+				upLeftValid = true;
+				if (ow == tmpPanel->w) {
+					upRightValid = true;
+					justUpPanel = tmpPanel;
+				}
+			}
+			if (ox + ow == tmpPanel->x + tmpPanel->w) {
+				upRightValid = true;
+			}
+		}
+		if (tmpPanel->y == oy + oh - 1) {
+			down[i] = 1;
+			if (ox == tmpPanel->x) {
+				downLeftValid = true;
+				if (ow == tmpPanel->w) {
+					downRightValid = true;
+					justDownPanel = tmpPanel;
+				}
+			}
+			if (ox + ow == tmpPanel->x + tmpPanel->w) {
+				downRightValid = true;
+			}
+		}
+	}
+	if (justLeftPanel) {
+		justLeftPanel->w += ox + ow - (justLeftPanel->x + justLeftPanel->w);
+	} else if (justRightPanel) {
+		justRightPanel->w = justRightPanel->x + justRightPanel->w - ox;
+		justRightPanel->x = ox;
+	} else if (justUpPanel) {
+		justUpPanel->h += oy + oh - (justUpPanel->y + justUpPanel->h);
+	} else if (justDownPanel) {
+		justDownPanel->h = oh + justDownPanel->y + justDownPanel->h - (oy + oh);
+		justDownPanel->y = oy;
+	} else if (leftUpValid && leftDownValid) {
+		for (i = 0; i < panels->n_panels; i++) {
+			if (left[i] != -1) {
+				tmpPanel = &panels->panel[i];
+				tmpPanel->w += ox + ow - (tmpPanel->x + tmpPanel->w);
+			}
+		}
+	} else if (rightUpValid && rightDownValid) {
+		for (i = 0; i < panels->n_panels; i++) {
+			if (right[i] != -1) {
+				tmpPanel = &panels->panel[i];
+				tmpPanel->w = tmpPanel->x + tmpPanel->w - ox;
+				tmpPanel->x = ox;
+			}
 		}
-		panels[0].text = strdup ("");
-		panels[0].addr = addr;
-		panels[0].type = PANEL_TYPE_FLOAT;
-		i = n_panels = 1;
-		menu_pos = 0;
-	}
-	panels[i].text = strdup (title);
-	panels[i].cmd = r_str_newf (cmd);
-	panels[i].addr = addr;
-	panels[i].type = PANEL_TYPE_FRAME;
-	panels[i + 1].text = NULL;
-	n_panels++;
-	curnode = n_panels - 1;
-	zoom ();
-	menu_y = 0;
-}
-
-static int bbPanels(RCore *core, Panel **n) {
-	// panels = NULL;
-	addPanelFrame ("Symbols", "isq", 0);
-	addPanelFrame ("Stack", "px 256@r:SP", 0);
-	addPanelFrame ("Registers", "dr=", 0);
-	addPanelFrame ("RegisterRefs", "drr", 0);
-	addPanelFrame ("Disassembly", "pd 128", 0);
-	curnode = 1;
-	Layout_run (panels);
-	return n_panels;
+	} else if (upLeftValid && upRightValid) {
+		for (i = 0; i < panels->n_panels; i++) {
+			if (up[i] != -1) {
+				tmpPanel = &panels->panel[i];
+				tmpPanel->h += oy + oh - (tmpPanel->y + tmpPanel->h);
+			}
+		}
+	} else if (downLeftValid && downRightValid) {
+		for (i = 0; i < panels->n_panels; i++) {
+			if (down[i] != -1) {
+				tmpPanel = &panels->panel[i];
+				tmpPanel->h = oh + tmpPanel->y + tmpPanel->h - (oy + oh);
+				tmpPanel->y = oy;
+			}
+		}
+	}
+}
+
+static void replaceCmd(RPanels* panels, char *title, char *cmd) {
+	freePanel (&panels->panel[panels->curnode]);
+	panels->panel[panels->curnode].title = strdup (title);
+	panels->panel[panels->curnode].cmd = r_str_newf (cmd);
+	panels->panel[panels->curnode].cmdStrCache = NULL;
+	setRefreshAll (panels);
+}
+
+static bool checkFunc(RCore *core) {
+	RAnalFunction *fun = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
+	if (!fun) {
+		r_cons_message ("Not in a function. Type 'df' to define it here");
+		return false;
+	}
+	if (r_list_empty (fun->bbs)) {
+		r_cons_message ("No basic blocks in this function. You may want to use 'afb+'.");
+		return false;
+	}
+	return true;
+}
+
+static void setRefreshAll(RPanels *panels) {
+	int i;
+	for (i = 0; i < panels->n_panels; i++) {
+		panels->panel[i].refresh = true;
+	}
+}
+
+static RConsCanvas *createNewCanvas(RCore *core, int w, int h) {
+	RConsCanvas *can = r_cons_canvas_new (w, h);
+	if (!can) {
+		eprintf ("Cannot create RCons.canvas context\n");
+		return false;
+	}
+	r_cons_canvas_fill (can, 0, 0, w, h, ' ');
+	can->linemode = r_config_get_i (core->config, "graph.linemode");
+	can->color = r_config_get_i (core->config, "scr.color");
+	return can;
+}
+
+static void addPanelFrame(RCore *core, RPanels* panels, const char *title, const char *cmd) {
+	RPanel* panel = panels->panel;
+	const int n_panels = panels->n_panels;
+	if (title) {
+		panel[n_panels].title = strdup (title);
+		panel[n_panels].cmd = r_str_newf (cmd);
+	} else {
+		panel[n_panels].title = r_core_cmd_str (core, cmd);
+		panel[n_panels].cmd = NULL;
+	}
+	panel[n_panels].type = PANEL_TYPE_FRAME;
+	panel[n_panels].refresh = true;
+	panel[n_panels].curpos = 0;
+	panel[n_panels].cmdStrCache = NULL;
+	if (!strcmp (panel[n_panels].cmd, PANEL_CMD_DISASSEMBLY)) {
+		panel[n_panels].addr = core->offset;
+	}
+	if (!strcmp (panel[n_panels].cmd, PANEL_CMD_STACK)) {
+		const char *sp = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
+		const ut64 stackbase = r_reg_getv (core->anal->reg, sp);
+		panel[n_panels].baseAddr = stackbase;
+		panel[n_panels].addr = stackbase - r_config_get_i (core->config, "stack.delta");
+	}
+	panels->n_panels++;
+}
+
+static RPanel createMenuPanel(int x, int y, char *title) {
+	RPanel panel = {0};
+	panel.x = x;
+	panel.y = y;
+	panel.title = title;
+	panel.refresh = true;
+	panel.type = PANEL_TYPE_MENU;
+	return panel;
+}
+
+static bool initPanels(RCore *core, RPanels *panels) {
+	panels->panel = calloc (sizeof (RPanel), PANEL_NUM_LIMIT);
+	if (!panels->panel) {
+		return false;
+	}
+	panels->n_panels = 0;
+	addPanelFrame (core, panels, PANEL_TITLE_DISASSEMBLY, PANEL_CMD_DISASSEMBLY);
+	addPanelFrame (core, panels, PANEL_TITLE_SYMBOLS, PANEL_CMD_SYMBOLS);
+	//addPanelFrame (core, panels, PANEL_TITLE_STACK, PANEL_CMD_STACK);
+	addPanelFrame (core, panels, PANEL_TITLE_STACKREFS, PANEL_CMD_STACKREFS);
+	addPanelFrame (core, panels, PANEL_TITLE_REGISTERS, PANEL_CMD_REGISTERS);
+	addPanelFrame (core, panels, PANEL_TITLE_REGISTERREFS, PANEL_CMD_REGISTERREFS);
+	panels->curnode = 0;
+	return true;
+}
+
+static void freePanel(RPanel *panel) {
+	free (panel->title);
+	free (panel->cmd);
+	free (panel->cmdStrCache);
 }
 
 // damn singletons.. there should be only one screen and therefor
@@ -359,115 +988,107 @@
 // into a struct makes the code to reference pointers unnecesarily
 // we can look for a non-global solution here in the future if
 // necessary
-static void r_core_panels_refresh(RCore *core) {
-	char title[1024];
-	const char *color = curnode? Color_BLUE: Color_BGREEN;
-	char str[1024];
-	int i, j, h, w = r_cons_get_size (&h);
-	r_cons_clear00 ();
+R_API void r_core_panels_refresh(RCore *core) {
+	RPanels *panels = core->panels;
+	if (!panels) {
+		return;
+	}
+	RPanel *panel = panels->panel;
+	if (!panel) {
+		return;
+	}
+	RConsCanvas *can = panels->can;
 	if (!can) {
 		return;
 	}
-	r_cons_canvas_resize (can, w, h);
-#if 0
-	/* avoid flickering */
-	r_cons_canvas_clear (can);
-	r_cons_flush ();
-#endif
-	if (panels) {
-		if (menu_y > 0) {
-			panels[menu_pos].x = menu_x * 6;
-		} else {
-			panels[menu_pos].x = w;
-		}
-		panels[menu_pos].y = 1;
-		free (panels[menu_pos].text);
-		panels[menu_pos].text = calloc (1, 1024); // r_str_newf ("%d", menu_y);
-		int maxsub = 0;
-		for (i = 0; menus_sub[i]; i++) {
-			maxsub = i;
-		}
-		if (menu_x >= 0 && menu_x <= maxsub && menus_sub[menu_x]) {
-			for (j = 0; menus_sub[menu_x][j]; j++) {
-				if (menu_y - 1 == j) {
-					strcat (panels[menu_pos].text, "> ");
-				} else {
-					strcat (panels[menu_pos].text, "  ");
-				}
-				strcat (panels[menu_pos].text,
-					menus_sub[menu_x][j]);
-				strcat (panels[menu_pos].text, "          \n");
-			}
+	if (panels->curnode > panels->menu_pos) {
+		panels->menuStackDepth = 0;
+		panels->currentMenu = NULL;
+		panels->currentMenuIndex = 0;
+	}
+	char title[1024];
+	char str[1024];
+	int i, h, w = r_cons_get_size (&h);
+	r_cons_gotoxy (0, 0);
+	if (panels->isResizing) {
+		panels->isResizing = false;
+		if (!r_cons_canvas_resize (can, w, h)) {
+			return;
 		}
-		for (i = 0; panels[i].text; i++) {
-			if (i != curnode) {
-				Panel_print (can, &panels[i], i == curnode);
-			}
+		setRefreshAll (panels);
+	}
+	for (i = 0; i < panels->n_panels; i++) {
+		if (i != panels->curnode) {
+			panelPrint (core, can, &panel[i], 0);
 		}
 	}
-
-	if (menu_y) {
-		curnode = menu_pos;
+	if (panels->curnode > panels->menu_pos) {
+		panelPrint (core, can, &panel[panels->curnode], 1);
 	}
-	// redraw current node to make it appear on top
-	if (panels) {
-		if (curnode >= 0) {
-			Panel_print (can, &panels[curnode], 1);
+	if (panels->curnode == panels->menu_pos && panels->menuStackDepth > 0) {
+		layoutSubMenu (panels, w);
+		for (i = 0; i <= panels->menuStackDepth; i++) {
+			panelPrint (core, can, &panels->menuPanel[i], 1);
 		}
-		Panel_print (can, &panels[menu_pos], menu_y);
 	}
-
-	(void) G (-can->sx, -can->sy);
+	(void) r_cons_canvas_gotoxy (can, -can->sx, -can->sy);
+	r_cons_canvas_fill (can, -can->sx, -can->sy, panel->w, 1, ' ');
 	title[0] = 0;
-	if (curnode == 0) {
+	if (panels->curnode == panels->menu_pos) {
 		strcpy (title, "> ");
 	}
+	const char *color = panels->curnode == panels->menu_pos ? core->cons->pal.graph_box : core->cons->pal.graph_box2;
 	for (i = 0; menus[i]; i++) {
-		if (menu_x == i) {
-			snprintf (str, sizeof (title) - 1, "%s[%s]"Color_RESET, color, menus[i]);
+		if (panels->curnode == panels->menu_pos) {
+			if (panels->menuStackDepth > 0) {
+				if (i == panels->menuIndexStack[0]) {
+					snprintf (str, sizeof (title) - 1, "%s[%s]"Color_RESET, color, menus[i]);
+				} else {
+					snprintf (str, sizeof (title) - 1, "%s %s "Color_RESET, color, menus[i]);
+				}
+			} else {
+				if (i == panels->currentMenuIndex) {
+					snprintf (str, sizeof (title) - 1, "%s[%s]"Color_RESET, color, menus[i]);
+				} else {
+					snprintf (str, sizeof (title) - 1, "%s %s "Color_RESET, color, menus[i]);
+				}
+			}
 		} else {
 			snprintf (str, sizeof (title) - 1, "%s %s "Color_RESET, color, menus[i]);
 		}
 		strcat (title, str);
 	}
-	if (curnode == 0) {
-		W (Color_BLUE);
-		W (title);
-		W (Color_RESET);
+	if (panels->curnode == panels->menu_pos) {
+		r_cons_canvas_write (can, Color_BLUE);
+		r_cons_canvas_write (can, title);
+		r_cons_canvas_write (can, Color_RESET);
 	} else {
-		W (Color_RESET);
-		W (title);
+		r_cons_canvas_write (can, Color_RESET);
+		r_cons_canvas_write (can, title);
 	}
 
 	snprintf (title, sizeof (title) - 1,
 		"[0x%08"PFMT64x "]", core->offset);
-	(void) G (-can->sx + w - strlen (title), -can->sy);
-	W (title);
-
+	(void) r_cons_canvas_gotoxy (can, -can->sx + w - strlen (title), -can->sy);
+	r_cons_canvas_write (can, title);
 	r_cons_canvas_print (can);
 	r_cons_flush ();
 }
 
-static void reloadPanels(RCore *core) {
-	// W("HELLO WORLD");
-	Layout_run (panels);
+static void doPanelsRefresh(RCore *core) {
+	if (!core->panels) {
+		return;
+	}
+	core->panels->isResizing = true;
+	panelAllClear (core->panels);
+	r_core_panels_refresh (core);
 }
 
-static int havePanel(const char *s) {
-	int i;
-	if (!panels || !panels[0].text) {
-		return 0;
-	}
-	// add new panel for testing
-	for (i = 1; panels[i].text; i++) {
-		if (!strcmp (panels[i].text, s)) {
-			return 1;
-		}
-	}
-	return 0;
+static void doPanelsRefreshOneShot(RCore *core) {
+	r_core_task_enqueue_oneshot (core, (RCoreTaskOneShot) doPanelsRefresh, core);
 }
 
-static void panel_single_step_in(RCore *core) {
+static void panelSingleStepIn(RCore *core) {
 	if (r_config_get_i (core->config, "cfg.debug")) {
 		if (core->print->cur_enabled) {
 			// dcu 0xaddr
@@ -481,92 +1102,523 @@
 		r_core_cmd (core, "aes", 0);
 		r_core_cmd (core, ".ar*", 0);
 	}
+	if (!strcmp (core->panels->panel[core->panels->curnode].cmd, PANEL_CMD_DISASSEMBLY)) {
+		core->panels->panel[core->panels->curnode].addr = core->offset;
+	}
 }
 
-static void panel_single_step_over(RCore *core) {
+static void panelSingleStepOver(RCore *core) {
+	bool io_cache = r_config_get_i (core->config, "io.cache");
+	r_config_set_i (core->config, "io.cache", false);
 	if (r_config_get_i (core->config, "cfg.debug")) {
-		if (core->print->cur_enabled) {
-			r_core_cmd (core, "dcr", 0);
-			core->print->cur_enabled = 0;
-		} else {
-			r_core_cmd (core, "dso", 0);
-			r_core_cmd (core, ".dr*", 0);
-		}
+		r_core_cmd (core, "dso", 0);
+		r_core_cmd (core, ".dr*", 0);
 	} else {
 		r_core_cmd (core, "aeso", 0);
 		r_core_cmd (core, ".ar*", 0);
 	}
+	r_config_set_i (core->config, "io.cache", io_cache);
+	if (!strcmp (core->panels->panel[core->panels->curnode].cmd, PANEL_CMD_DISASSEMBLY)) {
+		core->panels->panel[core->panels->curnode].addr = core->offset;
+	}
 }
 
-static void panel_breakpoint(RCore *core) {
+static void panelBreakpoint(RCore *core) {
 	r_core_cmd (core, "dbs $$", 0);
 }
 
-static void panel_continue(RCore *core) {
+static void panelContinue(RCore *core) {
 	r_core_cmd (core, "dc", 0);
 }
 
-R_API int r_core_visual_panels(RCore *core) {
-#define OS_INIT() ostack.size = 0; ostack.panels[0] = 0;
-#define OS_PUSH(x) if (ostack.size < LIMIT) { ostack.panels[++ostack.size] = x; }
-#define OS_POP() ((ostack.size > 0)? ostack.panels[--ostack.size]: 0)
-	int okey, key, wheel;
-	int w, h;
-	int asm_comments = 0;
-	int asm_bytes = 0;
-	int have_utf8 = 0;
-	n_panels = 0;
-	panels = NULL;
-	callgraph = 0;
-	_core = core;
+R_API void r_core_panels_check_stackbase(RCore *core) {
+	if (!core || !core->panels) {
+		return;
+	}
+	int i;
+	const char *sp = r_reg_get_name (core->anal->reg, R_REG_NAME_SP);
+	const ut64 stackbase = r_reg_getv (core->anal->reg, sp);
+	RPanels *panels = core->panels;
+	for (i = 1; i < panels->n_panels; i++) {
+		RPanel *panel = &panels->panel[i];
+		if (!strcmp (panel->cmd, PANEL_CMD_STACK) && panel->baseAddr != stackbase) {
+			panel->baseAddr = stackbase;
+			panel->addr = stackbase - r_config_get_i (core->config, "stack.delta") + core->print->cur;
+			panel->refresh = true;
+		}
+	}
+}
 
-	OS_INIT ();
-	w = r_cons_get_size (&h);
-	can = r_cons_canvas_new (w, h);
-	if (!can) {
+static void panelPrompt(const char *prompt, char *buf, int len) {
+	r_line_set_prompt (prompt);
+	*buf = 0;
+	r_cons_fgets (buf, len, 0, NULL);
+}
+
+static bool init (RCore *core, RPanels *panels, int w, int h) {
+	panels->panel = NULL;
+	panels->n_panels = 0;
+	panels->columnWidth = 80;
+	panels->layout = 0;
+	panels->menu_pos = -1;
+	panels->menuStack = malloc (sizeof (char **) * PANEL_MENU_LIMIT);
+	panels->menuIndexStack = malloc (sizeof (int) * PANEL_MENU_LIMIT);
+	panels->menuStackDepth = 0;
+	panels->currentMenu = NULL;
+	panels->currentMenuIndex = 0;
+	panels->menuPanel = malloc (sizeof (RPanel) * PANEL_MENU_LIMIT);
+	panels->callgraph = 0;
+	panels->isResizing = false;
+	panels->can = createNewCanvas (core, w, h);
+	if (w < 140) {
+		panels->columnWidth = w / 3;
+	}
+	return true;
+}
+
+R_API int file_history_up(RLine *line) {
+	RCore *core = line->user;
+	RList *files = r_id_storage_list (core->io->files);
+	int num_files = r_list_length (files);
+	if (line->file_hist_index >= num_files || line->file_hist_index < 0) {
 		return false;
 	}
-	can->linemode = r_config_get_i (core->config, "graph.linemode");
-	can->color = r_config_get_i (core->config, "scr.color");
-	if (!can) {
-		eprintf ("Cannot create RCons.canvas context\n");
+	line->file_hist_index++;
+	RIODesc *desc = r_list_get_n (files, num_files - line->file_hist_index);
+	strncpy (line->buffer.data, desc->name, R_LINE_BUFSIZE - 1);
+	line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+	r_list_free (files);
+	return true;
+}
+
+R_API int file_history_down(RLine *line) {
+	RCore *core = line->user;
+	RList *files = r_id_storage_list (core->io->files);
+	int num_files = r_list_length (files);
+	if (line->file_hist_index <= 0 || line->file_hist_index > num_files) {
 		return false;
 	}
-	n_panels = bbPanels (core, NULL);
-	if (!panels) {
-		r_config_set_i (core->config, "scr.color", can->color);
-		free (can);
+	line->file_hist_index--;
+	if (line->file_hist_index <= 0) {
+		line->buffer.data[0] = '\0';
+		line->buffer.index = line->buffer.length = 0;
 		return false;
 	}
+	RIODesc *desc = r_list_get_n (files, num_files - line->file_hist_index);
+	strncpy (line->buffer.data, desc->name, R_LINE_BUFSIZE - 1);
+	line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+	r_list_free (files);
+	return true;
+}
 
-	if (w < 140) {
-		COLW = w / 3;
+static void handleMenu(RCore *core, const int key, int *exit) {
+	RPanels *panels = core->panels;
+	switch (key) {
+		case 'h':
+			handleLeftKey (core);
+			break;
+		case 'j':
+			handleDownKey (core);
+			break;
+		case 'k':
+			handleUpKey (core);
+			break;
+		case 'l':
+			handleRightKey (core);
+			break;
+		case 'q':
+		case -1:
+			if (panels->menuStackDepth == 0) {
+				*exit = 1;
+				return;
+			}
+			panels->menuStackDepth--;
+			panels->currentMenu = panels->menuStack[panels->menuStackDepth];
+			panels->currentMenuIndex = panels->menuIndexStack[panels->menuStackDepth];
+			setRefreshAll (core->panels);
+			break;
+		case ' ':
+		case '\r':
+		case '\n':
+			onMenu (core, panels->currentMenu[panels->currentMenuIndex], exit);
+			break;
+		case 9:
+			handleTabKey (core, false);
+			break;
+		case 'Z':
+			handleTabKey (core, true);
 	}
+}
 
-	reloadPanels (core);
+static void onMenu(RCore *core, const char *menu, int *exit) {
+	RPanels *panels = core->panels;
+	if (!strcmp (menu, "File")) {
+		changeMenu (panels, menus_File);
+	} else if (!strcmp (menu, "Edit")) {
+		changeMenu (panels, menus_Edit);
+	} else if (!strcmp (menu, "View")) {
+		changeMenu (panels, menus_View);
+	} else if (!strcmp (menu, "Tools")) {
+		changeMenu (panels, menus_Tools);
+	} else if (!strcmp (menu, "Search")) {
+		changeMenu (panels, menus_Search);
+	} else if (!strcmp (menu, "Debug")) {
+		changeMenu (panels, menus_Debug);
+	} else if (!strcmp (menu, "Analyze")) {
+		changeMenu (panels, menus_Analyze);
+	} else if (!strcmp (menu, "Help")) {
+		changeMenu (panels, menus_Help);
+	} else if (!strcmp (menu, "New")) {
+		addPanelFrame (core, panels, PANEL_TITLE_NEWFILES, "o");
+	} else if (!strcmp (menu, "Open")) {
+		r_cons_enable_mouse (false);
+		core->cons->line->file_prompt = true;
+		r_line_set_hist_callback (core->cons->line, &file_history_up, &file_history_down);
+		char *res = r_cons_input ("open file: ");
+		if (res) {
+			if (*res) {
+				r_core_cmdf (core, "o %s", res);
+			}
+			free (res);
+		}
+		core->cons->line->file_prompt = false;
+		r_line_set_hist_callback (core->cons->line, &cmd_history_up, &cmd_history_down);
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "RegisterRefs")) {
+		layoutSidePanel (core, PANEL_TITLE_REGISTERREFS, PANEL_CMD_REGISTERREFS);
+	} else if (!strcmp (menu, "Registers")) {
+		layoutSidePanel (core, PANEL_TITLE_REGISTERS, PANEL_CMD_REGISTERS);
+	} else if (!strcmp (menu, "Info")) {
+		layoutSidePanel (core, PANEL_TITLE_INFO, PANEL_CMD_INFO);
+	} else if (!strcmp (menu, "Database")) {
+		layoutSidePanel (core, PANEL_TITLE_DATABASE, PANEL_CMD_DATABASE);
+	} else if (!strcmp (menu, "About")) {
+		char *s = r_core_cmd_str (core, "?V");
+		r_cons_message (s);
+		free (s);
+	} else if (!strcmp (menu, "Hexdump")) {
+		layoutSidePanel (core, PANEL_TITLE_HEXDUMP, PANEL_CMD_HEXDUMP);
+	} else if (!strcmp (menu, "Disassembly")) {
+		layoutSidePanel (core, PANEL_TITLE_DISASSEMBLY, PANEL_CMD_DISASSEMBLY);
+	} else if (!strcmp (menu, "Functions")) {
+		layoutSidePanel (core, PANEL_TITLE_FUNCTIONS, PANEL_CMD_FUNCTIONS);
+	} else if (!strcmp (menu, "Comments")) {
+		layoutSidePanel (core, PANEL_TITLE_COMMENTS, PANEL_CMD_COMMENTS);
+	} else if (!strcmp (menu, "Entropy")) {
+		layoutSidePanel (core, PANEL_TITLE_ENTROPY, PANEL_CMD_ENTROPY);
+	} else if (!strcmp (menu, "Pseudo")) {
+		layoutSidePanel (core, PANEL_TITLE_PSEUDO, PANEL_CMD_PSEUDO);
+	} else if (!strcmp (menu, "Symbols")) {
+		r_core_cmdf (core, "aa");
+	} else if (!strcmp (menu, "BasicBlocks")) {
+		r_core_cmdf (core, "aab");
+	} else if (!strcmp (menu, "Function")) {
+		r_core_cmdf (core, "af");
+	} else if (!strcmp (menu, "DRX")) {
+		layoutSidePanel (core, PANEL_TITLE_DRX, PANEL_CMD_DRX);
+	} else if (!strcmp (menu, "Program")) {
+		r_core_cmdf (core, "aaa");
+	} else if (!strcmp (menu, "Calls")) {
+		r_core_cmdf (core, "aac");
+	} else if (!strcmp (menu, "ROP")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("rop grep: ");
+		if (res) {
+			r_core_cmdf (core, "\"/R %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "String")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("search string: ");
+		if (res) {
+			r_core_cmdf (core, "\"/ %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Hexpairs")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("search hexpairs: ");
+		if (res) {
+			r_core_cmdf (core, "\"/x %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Code")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("search code: ");
+		if (res) {
+			r_core_cmdf (core, "\"/c %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Copy")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("How many bytes? ");
+		if (res) {
+			r_core_cmdf (core, "\"y %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Write String")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("insert string: ");
+		if (res) {
+			r_core_cmdf (core, "\"w %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Write Value")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("insert number: ");
+		if (res) {
+			r_core_cmdf (core, "\"wv %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Write Hex")) {
+		r_cons_enable_mouse (false);
+		char *res = r_cons_input ("insert hexpairs: ");
+		if (res) {
+			r_core_cmdf (core, "\"wx %s\"", res);
+			free (res);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Calculator")) {
+		r_cons_enable_mouse (false);
+		for (;;) {
+			char *s = r_cons_input ("> ");
+			if (!s || !*s) {
+				free (s);
+				break;
+			}
+			r_core_cmdf (core, "? %s", s);
+			r_cons_flush ();
+			free (s);
+		}
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "Assemble")) {
+		r_core_visual_asm (core, core->offset);
+	} else if (!strcmp (menu, "Sections")) {
+		layoutSidePanel (core, PANEL_TITLE_SECTIONS, PANEL_CMD_SECTIONS);
+	} else if (!strcmp (menu, "Close")) {
+		r_core_cmd0 (core, "o-*");
+	} else if (!strcmp (menu, "Strings")) {
+		layoutSidePanel (core, PANEL_TITLE_STRINGS, PANEL_CMD_STRINGS);
+	} else if (!strcmp (menu, "Maps")) {
+		layoutSidePanel (core, PANEL_TITLE_MAPS, PANEL_CMD_MAPS);
+	} else if (!strcmp (menu, "Modules")) {
+		layoutSidePanel (core, PANEL_TITLE_MODULES, PANEL_CMD_MODULES);
+	} else if (!strcmp (menu, "Backtrace")) {
+		layoutSidePanel (core, PANEL_TITLE_BACKTRACE, PANEL_CMD_BACKTRACE);
+	} else if (!strcmp (menu, "Step")) {
+		r_core_cmd (core, "ds", 0);
+		r_cons_flush ();
+	} else if (!strcmp (menu, "ReOpen")) {
+		panels->menuStack[panels->menuStackDepth] = panels->currentMenu;
+		panels->menuIndexStack[panels->menuStackDepth] = panels->currentMenuIndex;
+		panels->menuStackDepth++;
+		panels->currentMenu = menus_ReOpen;
+		panels->currentMenuIndex = 0;
+	} else if (!strcmp (menu, "In RW")) {
+		r_core_cmd (core, "oo+", 0);
+		r_cons_flush ();
+	} else if (!strcmp (menu, "In Debugger")) {
+		r_core_cmd (core, "oo", 0);
+		r_cons_flush ();
+	} else if (!strcmp (menu, "Reload")) {
+		r_core_cmd (core, "ood", 0);
+		r_cons_flush ();
+	} else if (!strcmp (menu, "Step Over")) {
+		r_core_cmd (core, "dso", 0);
+		r_cons_flush ();
+	} else if (!strcmp (menu, "StackRefs")) {
+		layoutSidePanel (core, PANEL_TITLE_STACKREFS, PANEL_CMD_STACKREFS);
+	} else if (!strcmp (menu, "Stack")) {
+		layoutSidePanel (core, PANEL_TITLE_STACK, PANEL_CMD_STACK);
+	} else if (!strcmp (menu, "Continue")) {
+		r_core_cmd (core, "dc", 0);
+		r_cons_flush ();
+	} else if (!strcmp (menu, "Breakpoints")) {
+		layoutSidePanel (core, PANEL_TITLE_BREAKPOINTS, PANEL_CMD_BREAKPOINTS);
+	} else if (!strcmp (menu, "Symbols")) {
+		layoutSidePanel (core, PANEL_TITLE_SYMBOLS, PANEL_CMD_SYMBOLS);
+	} else if (!strcmp (menu, "Imports")) {
+		layoutSidePanel (core, PANEL_TITLE_IMPORTS, PANEL_CMD_IMPORTS);
+	} else if (!strcmp (menu, "Paste")) {
+		r_core_cmd0 (core, "yy");
+	} else if (!strcmp (menu, "Clipboard")) {
+		layoutSidePanel (core, PANEL_TITLE_CLIPBOARD, PANEL_CMD_CLIPBOARD);
+	} else if (!strcmp (menu, "io.cache")) {
+		r_core_cmd0 (core, "e!io.cache");
+	} else if (!strcmp (menu, "Fill")) {
+		r_cons_enable_mouse (false);
+		char *s = r_cons_input ("Fill with: ");
+		r_core_cmdf (core, "wow %s", s);
+		free (s);
+		r_cons_enable_mouse (true);
+	} else if (!strcmp (menu, "References")) {
+		r_core_cmdf (core, "aar");
+	} else if (!strcmp (menu, "FcnInfo")) {
+		layoutSidePanel (core, PANEL_TITLE_FCNINFO, PANEL_CMD_FCNINFO);
+	} else if (!strcmp (menu, "Graph")) {
+		r_core_visual_graph (core, NULL, NULL, true);
+		// addPanelFrame ("Graph", "agf");
+	} else if (!strcmp (menu, "System Shell")) {
+		r_cons_set_raw (0);
+		r_cons_flush ();
+		r_sys_cmd ("$SHELL");
+	} else if (!strcmp (menu, "R2 Shell")) {
+		core->vmode = false;
+		r_core_visual_prompt_input (core);
+		core->vmode = true;
+	} else if (!strcmp (menu, "2048")) {
+		r_cons_2048 (panels->can->color);
+	} else if (!strcmp (menu, "License")) {
+		r_cons_message ("Copyright 2006-2016 - pancake - LGPL");
+	} else if (!strcmp (menu, "Fortune")) {
+		char *s = r_core_cmd_str (core, "fo");
+		r_cons_message (s);
+		free (s);
+	} else if (!strcmp (menu, "Commands")) {
+		r_core_cmd0 (core, "?;?@?;?$?;???");
+		r_cons_any_key (NULL);
+	} else if (!strcmp (menu, "Colors")) {
+		r_core_cmd0 (core, "e!scr.color");
+	} else if (!strcmp (menu, "Quit")) {
+		*exit = 1;
+		return;
+	}
+	doPanelsRefresh (core);
+}
 
-	asm_comments = r_config_get_i (core->config, "asm.comments");
-	have_utf8 = r_config_get_i (core->config, "scr.utf8");
-	r_config_set_i (core->config, "asm.comments", 0);
-	asm_bytes = r_config_get_i (core->config, "asm.bytes");
-	r_config_set_i (core->config, "asm.bytes", 0);
-	r_config_set_i (core->config, "scr.utf8", 0);
+static void changeMenu(RPanels *panels, const char **dstMenu) {
+	panels->menuStack[panels->menuStackDepth] = panels->currentMenu;
+	panels->menuIndexStack[panels->menuStackDepth] = panels->currentMenuIndex;
+	panels->menuStackDepth++;
+	panels->currentMenu = dstMenu;
+	panels->currentMenuIndex = 0;
+}
 
+static void handleTabKey(RCore *core, bool shift) {
+	RPanels *panels = core->panels;
+	r_cons_switchbuf (false);
+	if (panels->curnode != panels->menu_pos) {
+		panels->panel[panels->curnode].refresh = true;
+	}
+	if (!shift) {
+		panels->curnode++;
+		if (panels->curnode == panels->n_panels) {
+			panels->curnode = panels->menu_pos;
+		}
+	} else {
+		if (panels->curnode > panels->menu_pos) {
+			panels->curnode--;
+		} else {
+			panels->curnode = panels->n_panels - 1;
+		}
+	}
+	if (panels->curnode == panels->menu_pos) {
+		panels->currentMenu = menus;
+		panels->currentMenuIndex = 0;
+	} else {
+		panels->panel[panels->curnode].refresh = true;
+	}
+}
+
+R_API RPanels *r_core_panels_new(RCore *core) {
+	int w, h;
+	RPanels *panels = R_NEW0 (RPanels);
+
+	if (!panels) {
+		return NULL;
+	}
+	w = r_cons_get_size (&h);
+	if (!init (core, panels, w, h)) {
+		free (panels);
+		return NULL;
+	}
+	return panels;
+}
+
+R_API void r_core_panels_free(RPanels *panels) {
+	int i;
+	r_cons_switchbuf (true);
+	if (panels) {
+		for (i = 0; i < panels->n_panels; i++) {
+			freePanel (&panels->panel[i]);
+		}
+		free (panels->panel);
+		if (panels->can) {
+			r_cons_canvas_free (panels->can);
+		}
+		free (panels);
+	}
+}
+
+R_API int r_core_visual_panels(RCore *core, RPanels *panels) {
+	int i, okey, key, wheel;
+
+	if (!panels) {
+		panels = r_core_panels_new (core);
+		if (!panels) {
+			r_core_panels_free (panels);
+			return false;
+		}
+	}
+
+	if (!initPanels (core, panels)) {
+		r_core_panels_free (panels);
+		return false;
+	}
+
+	r_cons_switchbuf (false);
+	int originCursor = core->print->cur;
+	core->print->cur = 0;
+	core->print->cur_enabled = false;
+	core->print->col = 0;
+	bool originVmode = core->vmode;
+	core->vmode = true;
+
+	r_core_panels_layout (panels);
 repeat:
+	core->panels = panels;
+	core->cons->event_resize = NULL; // avoid running old event with new data
 	core->cons->event_data = core;
-	core->cons->event_resize =\
-		(RConsEvent) r_core_panels_refresh;
-	w = r_cons_get_size (&h);
-	Layout_run (panels);
-	r_core_panels_refresh (core);
+	core->cons->event_resize = (RConsEvent) doPanelsRefreshOneShot;
+	r_core_panels_layout_refresh (core);
 	wheel = r_config_get_i (core->config, "scr.wheel");
 	if (wheel) {
 		r_cons_enable_mouse (true);
 	}
-	// r_core_graph_inputhandle()
 	okey = r_cons_readchar ();
 	key = r_cons_arrow_to_hjkl (okey);
+	r_cons_switchbuf (true);
+
+	if (panels->curnode == panels->menu_pos) {
+		int exit = 0;
+		handleMenu (core, key, &exit);
+		if (exit) {
+			goto exit;
+		}
+		goto repeat;
+	}
+
+	if (handleCursorMode (core, key)) {
+		goto repeat;
+	}
+
+	if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_DISASSEMBLY)
+			&& '0' < key && key <= '9') {
+		ut8 ch = key;
+		r_core_visual_jump (core, ch);
+		panels->panel[panels->curnode].addr = core->offset;
+		panels->panel[panels->curnode].refresh = true;
+		goto repeat;
+	}
+
 	const char *cmd;
+	RConsCanvas *can = panels->can;
 	switch (key) {
 	case 'u':
 		r_core_cmd0 (core, "s-");
@@ -575,262 +1627,107 @@
 		r_core_cmd0 (core, "s+");
 		break;
 	case 'n':
-		r_core_cmd0 (core, "sn");
+		{
+			r_cons_enable_mouse (false);
+			char *res = r_cons_input ("New panel with command: ");
+			if (res) {
+				if (*res) {
+					addPanelFrame (core, panels, res, res);
+					// do not refresh stuff 
+				}
+				free (res);
+			}
+			r_cons_enable_mouse (true);
+		}
+		break;
+	case 'N':
+		{
+			r_cons_enable_mouse (false);
+			char *res = r_cons_input ("New panel with command: ");
+			if (res) {
+				if (*res) {
+					addPanelFrame (core, panels, NULL, res);
+				}
+				free (res);
+			}
+			r_cons_enable_mouse (true);
+		}
 		break;
 	case 'p':
 		r_core_cmd0 (core, "sp");
 		break;
+	case 'P':
+		r_core_cmd0 (core, "sn");
+		break;
 	case '.':
-		if (r_config_get_i (core->config, "cfg.debug")) {
-			r_core_cmd0 (core, "sr PC");
-			// r_core_seek (core, r_num_math (core->num, "entry0"), 1);
-		} else {
-			r_core_cmd0 (core, "s entry0; px");
-		}
-		break;
-	case ' ':
-	case '\r':
-	case '\n':
-		if (curnode == 0 && menu_y) {
-			const char *action = menus_sub[menu_x][menu_y - 1];
-			if (strstr (action, "New")) {
-				addPanelFrame ("New files", "o", 0);
-			} else if (strstr (action, "Open")) {
-				/* XXX doesnt autocompletes filenames */
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("open file: ");
-				if (res) {
-					if (*res) {
-						r_core_cmdf (core, "o %s", res);
-					}
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Info")) {
-				addPanelFrame ("Info", "i", 0);
-			} else if (strstr (action, "Database")) {
-				addPanelFrame ("Database", "k ***", 0);
-			} else if (strstr (action, "Registers")) {
-				if (!havePanel ("Registers")) {
-					addPanelFrame ("Registers", "dr=", core->offset);
-				}
-			} else if (strstr (action, "About")) {
-				char *s = r_core_cmd_str (core, "?V");
-				r_cons_message (s);
-				free (s);
-			} else if (strstr (action, "Hexdump")) {
-				addPanelFrame ("Hexdump", "px 512", core->offset);
-			} else if (strstr (action, "Disassembly")) {
-				addPanelFrame ("Disassembly", "pd 128", core->offset);
-			} else if (strstr (action, "Functions")) {
-				addPanelFrame ("Functions", "afl", core->offset);
-			} else if (strstr (action, "Comments")) {
-				addPanelFrame ("Comments", "CC", core->offset);
-			} else if (strstr (action, "Entropy")) {
-				addPanelFrame ("Entropy", "p=e", core->offset);
-			} else if (strstr (action, "Function")) {
-				r_core_cmdf (core, "af");
-			} else if (strstr (action, "DRX")) {
-				addPanelFrame ("DRX", "drx", core->offset);
-			} else if (strstr (action, "Program")) {
-				r_core_cmdf (core, "aaa");
-			} else if (strstr (action, "Calls")) {
-				r_core_cmdf (core, "aac");
-			} else if (strstr (action, "ROP")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("rop grep: ");
-				if (res) {
-					r_core_cmdf (core, "\"/R %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "String")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("search string: ");
-				if (res) {
-					r_core_cmdf (core, "\"/ %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Hexpairs")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("search hexpairs: ");
-				if (res) {
-					r_core_cmdf (core, "\"/x %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Code")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("search code: ");
-				if (res) {
-					r_core_cmdf (core, "\"/c %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Copy")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("How many bytes? ");
-				if (res) {
-					r_core_cmdf (core, "\"y %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Write String")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("insert string: ");
-				if (res) {
-					r_core_cmdf (core, "\"w %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Write Value")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("insert number: ");
-				if (res) {
-					r_core_cmdf (core, "\"wv %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Write Hex")) {
-				r_cons_enable_mouse (false);
-				char *res = r_cons_input ("insert hexpairs: ");
-				if (res) {
-					r_core_cmdf (core, "\"wx %s\"", res);
-					free (res);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Calculator")) {
-				r_cons_enable_mouse (false);
-				for (;;) {
-					char *s = r_cons_input ("> ");
-					if (!s || !*s) {
-						free (s);
-						break;
-					}
-					r_core_cmdf (core, "? %s", s);
-					r_cons_flush ();
-					free (s);
-				}
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "Assemble")) {
-				r_core_visual_asm (core, core->offset);
-			} else if (strstr (action, "Sections")) {
-				addPanelFrame ("Sections", "iSq", 0);
-			} else if (strstr (action, "Close")) {
-				r_core_cmd0 (core, "o-*");
-			} else if (strstr (action, "Strings")) {
-				addPanelFrame ("Strings", "izq", 0);
-			} else if (strstr (action, "Maps")) {
-				addPanelFrame ("Maps", "dm", 0);
-			} else if (strstr (action, "Modules")) {
-				addPanelFrame ("Modules", "dmm", 0);
-			} else if (strstr (action, "Backtrace")) {
-				addPanelFrame ("Backtrace", "dbt", 0);
-			} else if (strstr (action, "Step")) {
-				r_core_cmd (core, "ds", 0);
-				r_cons_flush ();
-			} else if (strstr (action, "Step Over")) {
-				r_core_cmd (core, "dso", 0);
-				r_cons_flush ();
-			} else if (strstr (action, "Continue")) {
-				r_core_cmd (core, "dc", 0);
-				r_cons_flush ();
-			} else if (strstr (action, "Breakpoints")) {
-				addPanelFrame ("Breakpoints", "db", 0);
-			} else if (strstr (action, "Symbols")) {
-				addPanelFrame ("Symbols", "isq", 0);
-			} else if (strstr (action, "Imports")) {
-				addPanelFrame ("Imports", "iiq", 0);
-			} else if (strstr (action, "Paste")) {
-				r_core_cmd0 (core, "yy");
-			} else if (strstr (action, "Clipboard")) {
-				addPanelFrame ("Clipboard", "yx", 0);
-			} else if (strstr (action, "io.cache")) {
-				r_core_cmd0 (core, "e!io.cache");
-			} else if (strstr (action, "Fill")) {
-				r_cons_enable_mouse (false);
-				char *s = r_cons_input ("Fill with: ");
-				r_core_cmdf (core, "wow %s", s);
-				free (s);
-				r_cons_enable_mouse (true);
-			} else if (strstr (action, "References")) {
-				r_core_cmdf (core, "aar");
-			} else if (strstr (action, "FcnInfo")) {
-				addPanelFrame ("FcnInfo", "afi", 0);
-			} else if (strstr (action, "Graph")) {
-				r_core_visual_graph (core, NULL, NULL, true);
-				// addPanelFrame ("Graph", "agf", 0);
-			} else if (strstr (action, "System Shell")) {
-				r_cons_set_raw (0);
-				r_cons_flush ();
-				r_sys_cmd ("$SHELL");
-			} else if (strstr (action, "R2 Shell")) {
-				core->vmode = false;
-				r_core_visual_prompt_input (core);
-				core->vmode = true;
-			} else if (!strcmp (action, "2048")) {
-				r_cons_2048 (can->color);
-			} else if (strstr (action, "License")) {
-				r_cons_message ("Copyright 2006-2016 - pancake - LGPL");
-			} else if (strstr (action, "Fortune")) {
-				char *s = r_core_cmd_str (core, "fo");
-				r_cons_message (s);
-				free (s);
-			} else if (strstr (action, "Commands")) {
-				r_core_cmd0 (core, "?;?@?;?$?;???");
-				r_cons_any_key (NULL);
-			} else if (strstr (action, "Colors")) {
-				r_core_cmd0 (core, "e!scr.color");
-			} else if (strstr (action, "Quit")) {
-				goto beach;
-			}
-		} else {
-			if (curnode > 0) {
-				zoom ();
+		if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_DISASSEMBLY)) {
+			if (r_config_get_i (core->config, "cfg.debug")) {
+				r_core_cmd0 (core, "sr PC");
 			} else {
-				menu_y = 1;
+				r_core_cmd0 (core, "s entry0; px");
 			}
+			panels->panel[panels->curnode].addr = core->offset;
+			panels->panel[panels->curnode].refresh = true;
 		}
 		break;
 	case '?':
 		r_cons_clear00 ();
 		r_cons_printf ("Visual Ascii Art Panels:\n"
-			" !    - run r2048 game\n"
-			" .    - seek to PC or entrypoint\n"
-			":    - run r2 command in prompt\n"
-			" _    - start the hud input mode\n"
-			"?    - show this help\n"
-			" x    - close current panel\n"
-			" m    - open menubar\n"
-			" V    - view graph\n"
-			" C    - toggle color\n"
-			" M    - open new custom frame\n"
-			" hl   - toggle scr.color\n"
-			" HL   - move vertical column split\n"
-			" jk   - scroll/select menu\n"
-			" JK   - select prev/next panels (same as TAB)\n"
-			" sS   - step in / step over\n"
-			" uU   - undo / redo seek\n"
-			" np   - seek to next or previous scr.nkey\n"
-			" q    - quit, back to visual mode\n"
+			" ?      - show this help\n"
+			" !      - run r2048 game\n"
+			" .      - seek to PC or entrypoint\n"
+			" :      - run r2 command in prompt\n"
+			" _      - start the hud input mode\n"
+			" |      - split the current panel vertically\n"
+			" -      - split the current panel horizontally\n"
+			" *      - show pseudo code/r2dec in the current panel\n"
+			" [1-9]  - follow jmp/call identified by shortcut (like ;[1])\n"
+			" b      - browse symbols, flags, configurations, classes, ...\n"
+			" c      - toggle cursor\n"
+			" C      - toggle color\n"
+			" d      - define in the current address. Same as Vd\n"
+			" D      - show disassembly in the current panel\n"
+			" e      - change title and command of current panel\n"
+			" g      - show graph in the current panel\n"
+			" hjkl   - move around (left-down-up-right)\n"
+			" HL     - resize panels horizontally\n"
+			" JK     - scroll panels vertically by page\n"
+			" i      - insert hex\n"
+			" m      - move to the menu\n"
+			" M      - open new custom frame\n"
+			" nN     - create new panel with given command\n"
+			" r      - toggle jmphints/leahints\n"
+			" o      - go/seek to given offset\n"
+			" pP     - seek to next or previous scr.nkey\n"
+			" q      - quit, back to visual mode\n"
+			" sS     - step in / step over\n"
+			" uU     - undo / redo seek\n"
+			" V      - go to the graph mode\n"
+			" w      - change the current layout of the panels\n"
+			" X      - close current panel\n"
 			);
 		r_cons_flush ();
 		r_cons_any_key (NULL);
 		break;
-	case 's':
-		if (r_config_get_i (core->config, "cfg.debug")) {
-			r_core_cmd0 (core, "ds;.dr*"); // ;sr PC");
-		} else {
-			panel_single_step_in (core);
+	case 'b':
+		r_core_visual_browse (core);
+		break;
+	case 'o':
+		if (!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_DISASSEMBLY)) {
+			r_core_visual_showcursor (core, true);
+			r_core_visual_offset (core);
+			r_core_visual_showcursor (core, false);
+			panels->panel[panels->curnode].addr = core->offset;
+			panels->panel[panels->curnode].refresh = true;
 		}
 		break;
+	case 's':
+		panelSingleStepIn (core);
+		setRefreshAll (panels);
+		break;
 	case 'S':
-		if (r_config_get_i (core->config, "cfg.debug")) {
-			r_core_cmd0 (core, "dso;.dr*"); // ;sr PC");
-		} else {
-			panel_single_step_over (core);
-		}
+		panelSingleStepOver (core);
+		setRefreshAll (panels);
 		break;
 	case ':':
 		core->vmode = false;
@@ -840,12 +1737,25 @@
 		// FIX: Issue with visual mode instruction highlighter
 		// not updating after 'ds' or 'dcu' commands.
 		r_core_cmd0 (core, ".dr*");
+		setRefreshAll (panels);
+		break;
+	case 'c':
+		if ((!strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_STACK)
+					|| !strcmp (panels->panel[panels->curnode].cmd, PANEL_CMD_REGISTERS))) {
+			setCursor (core, !core->print->cur_enabled);
+			panels->panel[panels->curnode].refresh = true;
+		}
 		break;
 	case 'C':
-		can->color = !can->color;                               // WTF
+		can->color = !can->color;
 		// r_config_toggle (core->config, "scr.color");
 		// refresh graph
-		// reloadPanels (core);
+		setRefreshAll (panels);
+		break;
+	case 'r':
+		r_core_cmd0 (core, "e!asm.jmphints");
+		r_core_cmd0 (core, "e!asm.leahints");
+		setRefreshAll (panels);
 		break;
 	case 'R':
 		if (r_config_get_i (core->config, "scr.randpal")) {
@@ -853,65 +1763,46 @@
 		} else {
 			r_core_cmd0 (core, "ecn");
 		}
+		doPanelsRefresh (core);
 		break;
-	case 'j':
-		if (curnode == 0) {
-			if (panels[curnode].type == PANEL_TYPE_FLOAT) {
-				if (menus_sub[menu_x][menu_y]) {
-					menu_y++;
-				}
-			}
-		} else {
-			if (curnode == 1) {
-				r_core_cmd0 (core, "s+$l");
-			} else {
-				panels[curnode].sy++;
-			}
+	case 'A':
+		r_core_visual_asm (core, core->offset);
+		break;
+	case 'd':
+		r_core_visual_define (core, "");
+		setRefreshAll (panels);
+		break;
+	case 'D':
+		replaceCmd (panels, PANEL_TITLE_DISASSEMBLY, PANEL_CMD_DISASSEMBLY);
+		break;
+	case 'J':
+		for (i = 0; i < PANEL_CONFIG_PAGE; i++) {
+			handleDownKey (core);
 		}
 		break;
-	case 'k':
-		if (curnode == 0) {
-			if (panels[curnode].type == PANEL_TYPE_FLOAT) {
-				menu_y--;
-				if (menu_y < 0) {
-					menu_y = 0;
-				}
-			}
-		} else {
-			if (curnode == 1) {
-				r_core_cmd0 (core, "s-8");
-			} else {
-				panels[curnode].sy--;
-			}
+	case 'K':
+		for (i = 0; i < PANEL_CONFIG_PAGE; i++) {
+			handleUpKey (core);
 		}
 		break;
+	case 'j':
+		handleDownKey (core);
+		break;
+	case 'k':
+		handleUpKey (core);
+		break;
 	case '_':
 		r_core_visual_hud (core);
 		break;
-	case 'x':
-		delcurpanel ();
+	case 'X':
+		delCurPanel (panels);
+		setRefreshAll (panels);
 		break;
 	case 9: // TAB
-	case 'J':
-		menu_y = 0;
-		menu_x = -1;
-		curnode++;
-		if (!panels[curnode].text) {
-			curnode = 0;
-			menu_x = 0;
-		}
+		handleTabKey (core, false);
 		break;
 	case 'Z': // SHIFT-TAB
-	case 'K':
-		menu_y = 0;
-		menu_x = -1;
-		curnode--;
-		if (curnode < 0) {
-			curnode = n_panels - 1;
-		}
-		if (!curnode) {
-			menu_x = 0;
-		}
+		handleTabKey (core, true);
 		break;
 	case 'M':
 	{
@@ -919,70 +1810,69 @@
 		char *name = r_cons_input ("Name: ");
 		char *cmd = r_cons_input ("Command: ");
 		if (name && *name && cmd && *cmd) {
-			addPanelFrame (name, cmd, 0);
+			addPanelFrame (core, panels, name, cmd);
 		}
 		free (name);
 		free (cmd);
 		r_cons_enable_mouse (true);
 	}
 	break;
-	case 'm':
-		curnode = 0;
-		if (menu_x < 0) {
-			menu_x = 0;
-			r_core_panels_refresh (core);
+	case 'e':
+	{
+		r_cons_enable_mouse (false);
+		char *new_name = r_cons_input ("New name: ");
+		char *new_cmd = r_cons_input ("New command: ");
+		if (new_name && *new_name && new_cmd && *new_cmd) {
+			replaceCmd (panels, new_name, new_cmd);
 		}
-		menu_y = 1;
+		free (new_name);
+		free (new_cmd);
+		r_cons_enable_mouse (true);
+	}
+	break;
+	case 'm':
+		panels->curnode = panels->menu_pos;
+		panels->currentMenu = menus;
+		panels->currentMenuIndex = 0;
 		break;
 	case 'H':
-		COLW += 4;
+		r_cons_switchbuf (false);
+		panels->isResizing = true;
+		if (panels->columnWidth + 4 < panels->can->w) {
+			panels->columnWidth += 4;
+		}
+		r_core_panels_layout (panels);
 		break;
 	case 'L':
-		COLW -= 4;
-		if (COLW < 0) {
-			COLW = 0;
+		r_cons_switchbuf (false);
+		panels->isResizing = true;
+		if (panels->columnWidth - 4 > 0) {
+			panels->columnWidth -= 4;
+		}
+		r_core_panels_layout (panels);
+		break;
+	case 'g':
+		if (checkFunc (core)) {
+			replaceCmd (panels, PANEL_TITLE_GRAPH, PANEL_CMD_GRAPH);
 		}
 		break;
 	case 'h':
-		if (curnode == 0) {
-			if (menu_x) {
-				menu_x--;
-				menu_y = menu_y? 1: 0;
-				r_core_panels_refresh (core);
-			}
-		} else {
-			panels[curnode].sx--;
-		}
+		handleLeftKey (core);
 		break;
 	case 'l':
-		if (curnode == 0) {
-			if (menus[menu_x + 1]) {
-				menu_x++;
-				menu_y = menu_y? 1: 0;
-				r_core_panels_refresh (core);
-			}
-		} else {
-			panels[curnode].sx++;
-		}
+		handleRightKey (core);
 		break;
 	case 'V':
-		/* copypasta from visual.c */
 		if (r_config_get_i (core->config, "graph.web")) {
 			r_core_cmd0 (core, "agv $$");
 		} else {
-			RAnalFunction *fun = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
-			int ocolor;
-
-			if (!fun) {
-				r_cons_message ("Not in a function. Type 'df' to define it here");
-				break;
-			} else if (r_list_empty (fun->bbs)) {
-				r_cons_message ("No basic blocks in this function. You may want to use 'afb+'.");
-				break;
+			if (checkFunc (core)) {
+				int ocolor = r_config_get_i (core->config, "scr.color");
+				r_core_visual_graph (core, NULL, NULL, true);
+				r_config_set_i (core->config, "scr.color", ocolor);
+				core->panels->can = createNewCanvas (core, core->panels->can->w, core->panels->can->h);
+				setRefreshAll (panels);
 			}
-			ocolor = r_config_get_i (core->config, "scr.color");
-			r_core_visual_graph (core, NULL, NULL, true);
-			r_config_set_i (core->config, "scr.color", ocolor);
 		}
 		break;
 	case ']':
@@ -992,11 +1882,24 @@
 		r_config_set_i (core->config, "hex.cols", r_config_get_i (core->config, "hex.cols") - 1);
 		break;
 	case 'w':
-		layout++;
-		Layout_run (panels);
-		r_core_panels_refresh (core);
-		r_cons_canvas_print (can);
-		r_cons_flush ();
+		panels->layout++;
+		if (panels->layout >= layoutMaxCount) {
+			panels->layout = 0;
+		}
+		r_core_panels_layout (panels);
+		setRefreshAll (panels);
+		break;
+	case '|':
+		splitPanelVertical (core);
+		break;
+	case '-':
+		splitPanelHorizontal (core);
+		break;
+	case '*':
+		if (checkFunc (core)) {
+			replaceCmd (panels, PANEL_TITLE_PSEUDO, PANEL_CMD_PSEUDO);
+			core->panels->can = createNewCanvas (core, core->panels->can->w, core->panels->can->h);
+		}
 		break;
 	case R_CONS_KEY_F1:
 		cmd = r_config_get (core->config, "key.f1");
@@ -1009,7 +1912,7 @@
 		if (cmd && *cmd) {
 			key = r_core_cmd0 (core, cmd);
 		} else {
-			panel_breakpoint (core);
+			panelBreakpoint (core);
 		}
 		break;
 	case R_CONS_KEY_F3:
@@ -1041,7 +1944,8 @@
 		if (cmd && *cmd) {
 			key = r_core_cmd0 (core, cmd);
 		} else {
-			panel_single_step_in (core);
+			panelSingleStepIn (core);
+			setRefreshAll (panels);
 		}
 		break;
 	case R_CONS_KEY_F8:
@@ -1049,7 +1953,8 @@
 		if (cmd && *cmd) {
 			key = r_core_cmd0 (core, cmd);
 		} else {
-			panel_single_step_over (core);
+			panelSingleStepOver (core);
+			setRefreshAll (panels);
 		}
 		break;
 	case R_CONS_KEY_F9:
@@ -1057,7 +1962,7 @@
 		if (cmd && *cmd) {
 			key = r_core_cmd0 (core, cmd);
 		} else {
-			panel_continue (core);
+			panelContinue (core);
 		}
 		break;
 	case R_CONS_KEY_F10:
@@ -1079,14 +1984,11 @@
 		}
 		break;
 	case '!':
+		r_cons_2048 (core->panels->can->color);
+		break;
 	case 'q':
 	case -1: // EOF
-		if (menu_y > 0) {
-			menu_y = 0;
-		} else {
-			goto beach;
-		}
-		break;
+		goto exit;
 #if 0
 	case 27: // ESC
 		if (r_cons_readchar () == 91) {
@@ -1100,12 +2002,15 @@
 		break;
 	}
 	goto repeat;
-beach:
-	free (panels);
-	r_config_set_i (core->config, "scr.color", can->color);
-	free (can);
-	r_config_set_i (core->config, "asm.comments", asm_comments);
-	r_config_set_i (core->config, "asm.bytes", asm_bytes);
-	r_config_set_i (core->config, "scr.utf8", have_utf8);
+exit:
+	core->cons->event_resize = NULL;
+	core->cons->event_data = NULL;
+	core->print->cur = originCursor;
+	core->print->cur_enabled = false;
+	core->print->col = 0;
+	core->vmode = originVmode;
+
+	r_core_panels_free (panels);
+	core->panels = NULL;
 	return true;
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/plugin.c radare2-2.8.0+dfsg/libr/core/plugin.c
--- radare2-2.3.0+dfsg/libr/core/plugin.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/plugin.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2017 - pancake */
+/* radare - LGPL - Copyright 2010-2018 - pancake */
 
 /* covardly copied from r_cmd */
 
@@ -12,15 +12,15 @@
 	R_CORE_STATIC_PLUGINS
 };
 
-R_API int r_core_plugin_deinit(RCmd *cmd) {
+R_API int r_core_plugin_fini(RCmd *cmd) {
 	RListIter *iter;
 	RCorePlugin *plugin;
 	if (!cmd->plist) {
 		return false;
 	}
 	r_list_foreach (cmd->plist, iter, plugin) {
-		if (plugin && plugin->deinit) {
-			plugin->deinit (cmd, NULL);
+		if (plugin && plugin->fini) {
+			plugin->fini (cmd, NULL);
 		}
 	}
 	/* empty the list */
diff -Nru radare2-2.3.0+dfsg/libr/core/project.c radare2-2.8.0+dfsg/libr/core/project.c
--- radare2-2.3.0+dfsg/libr/core/project.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/project.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2017 - pancake, maijin */
+/* radare - LGPL - Copyright 2010-2018 - pancake, maijin */
 
 #include <r_types.h>
 #include <r_list.h>
@@ -15,7 +15,7 @@
 	if (!io || !io->sections || !print || !print->cb_printf) {
 		return;
 	}
-	ls_foreach (io->sections, iter, s) {	
+	ls_foreach (io->sections, iter, s) {
 		print->cb_printf ("[%02d] 0x%08"PFMT64x" %s va=0x%08"PFMT64x
 			" sz=0x%04"PFMT64x" vsz=0x%04"PFMT64x" %s",
 			i, s->paddr, r_str_rwx_i (s->flags), s->vaddr,
@@ -94,7 +94,7 @@
 	return ret;
 }
 
-static bool r_core_is_project(RCore *core, const char *name) {
+R_API bool r_core_is_project(RCore *core, const char *name) {
 	bool ret = false;
 	if (name && *name && *name != '.') {
 		char *path = projectScriptPath (core, name);
@@ -164,27 +164,44 @@
 }
 
 R_API int r_core_project_delete(RCore *core, const char *prjfile) {
-	char *path;
 	if (r_sandbox_enable (0)) {
 		eprintf ("Cannot delete project in sandbox mode\n");
 		return 0;
 	}
-	path = projectScriptPath (core, prjfile);
+	char *path = projectScriptPath (core, prjfile);
 	if (!path) {
 		eprintf ("Invalid project name '%s'\n", prjfile);
 		return false;
 	}
 	if (r_core_is_project (core, prjfile)) {
+		char *prjDir = r_file_dirname (path);
+		if (!prjDir) {
+			eprintf ("Cannot resolve directory\n");
+			free (path);
+			return false;
+		}
 		// rm project file
-		r_file_rm (path);
-		eprintf ("rm %s\n", path);
-		path = r_str_append (path, ".d");
-		if (r_file_is_directory (path)) {
+		if (r_file_exists (path)) {
+			r_file_rm (path);
+			eprintf ("rm %s\n", path);
+		}
+
+		//rm notes.txt file
+		char *notes_txt = r_str_newf ("%s%s%s", prjDir, R_SYS_DIR, "notes.txt");
+		if (r_file_exists (notes_txt)) {
+			r_file_rm (notes_txt);
+			eprintf ("rm %s\n", notes_txt);
+		}
+		free(notes_txt);
+
+		char *rop_d = r_str_newf ("%s%s%s", prjDir, R_SYS_DIR, "rop.d");
+
+		if (r_file_is_directory (rop_d)) {
 			char *f;
 			RListIter *iter;
-			RList *files = r_sys_dir (path);
+			RList *files = r_sys_dir (rop_d);
 			r_list_foreach (files, iter, f) {
-				char *filepath = r_str_append (strdup (path), R_SYS_DIR);
+				char *filepath = r_str_append (strdup (rop_d), R_SYS_DIR);
 				filepath = r_str_append (filepath, f);
 				if (!r_file_is_directory (filepath)) {
 					eprintf ("rm %s\n", filepath);
@@ -192,12 +209,14 @@
 				}
 				free (filepath);
 			}
-			r_file_rm (path);
-			eprintf ("rm %s\n", path);
+			r_file_rm (rop_d);
+			eprintf ("rm %s\n", rop_d);
 			r_list_free (files);
 		}
-		// TODO: remove .d directory (BEWARE OF ROOT RIMRAFS!)
-		// TODO: r_file_rmrf (path);
+		free (rop_d);
+		// remove directory only if it's empty
+		r_file_rm (prjDir);
+		free (prjDir);
 	}
 	free (path);
 	return 0;
@@ -783,8 +802,6 @@
 	}
 	projectInit (core);
 
-	r_anal_project_save (core->anal, prjDir);
-
 	Sdb *rop_db = sdb_ns (core->sdb, "rop", false);
 	if (rop_db) {
 		/* set filepath for all the rop sub-dbs */
@@ -802,12 +819,12 @@
 	}
 	r_config_set (core->config, "prj.name", prjName);
 	if (r_config_get_i (core->config, "prj.simple")) {
-		if (!simpleProjectSaveScript (core, scriptPath, R_CORE_PRJ_ALL ^ R_CORE_PRJ_XREFS)) {
+		if (!simpleProjectSaveScript (core, scriptPath, R_CORE_PRJ_ALL)) {
 			eprintf ("Cannot open '%s' for writing\n", prjName);
 			ret = false;
 		}
 	} else {
-		if (!projectSaveScript (core, scriptPath, R_CORE_PRJ_ALL ^ R_CORE_PRJ_XREFS)) {
+		if (!projectSaveScript (core, scriptPath, R_CORE_PRJ_ALL)) {
 			eprintf ("Cannot open '%s' for writing\n", prjName);
 			ret = false;
 		}
@@ -864,7 +881,7 @@
 	if (scr_null) {
 		r_config_set_i (core->config, "scr.null", true);
 	}
-	if (!ret) {
+	if (!ret && oldPrjName) {
 		// reset prj.name on fail
 		r_config_set (core->config, "prj.name", oldPrjName);
 	}
@@ -882,62 +899,11 @@
 	return notes_txt;
 }
 
-#define DB core->anal->sdb_xrefs
-
-static bool projectLoadXrefs(RCore *core, const char *prjName) {
-	char *path, *db;
-
-	if (!prjName || !*prjName) {
-		return false;
-	}
-	const char *prjdir = r_config_get (core->config, "dir.projects");
-
-	if (prjName[0] == R_SYS_DIR[0]) {
-		db = r_str_newf ("%s", prjName);
-		if (!db) {
-			return false;
-		}
-		path = strdup (db);
-	} else {
-		db = r_str_newf ("%s" R_SYS_DIR "%s", prjdir, prjName);
-		if (!db) {
-			return false;
-		}
-		path = r_file_abspath (db);
-	}
-
-	if (!path) {
-		free (db);
-		return false;
-	}
-	if (!r_file_is_directory (db)) {
-		db = r_str_append (db, ".d");
-	}
-
-	if (!sdb_ns_unset (core->anal->sdb, NULL, DB)) {
-		sdb_free (DB);
-	}
-	const char *xrefs_path = r_file_fexists ("%s" R_SYS_DIR "xrefs.sdb", path)
-	                         ? "xrefs.sdb": "xrefs";
-	DB = sdb_new (path, xrefs_path, 0);
-	if (!DB) {
-		free (db);
-		free (path);
-		return false;
-	}
-	sdb_ns_set (core->anal->sdb, "xrefs", DB);
-	free (path);
-
-	free (db);
-	return true;
-}
-
 R_API bool r_core_project_load(RCore *core, const char *prjName, const char *rcpath) {
 	const bool cfg_fortunes = r_config_get_i (core->config, "cfg.fortunes");
 	const bool scr_interactive = r_config_get_i (core->config, "scr.interactive");
 	const bool scr_prompt = r_config_get_i (core->config, "scr.prompt");
 	(void) projectLoadRop (core, prjName);
-	(void) projectLoadXrefs (core, prjName);
 	bool ret = r_core_cmd_file (core, rcpath);
 	r_config_set_i (core->config, "cfg.fortunes", cfg_fortunes);
 	r_config_set_i (core->config, "scr.interactive", scr_interactive);
@@ -945,4 +911,3 @@
 	r_config_bump (core->config, "asm.arch");
 	return ret;
 }
-
diff -Nru radare2-2.3.0+dfsg/libr/core/pseudo.c radare2-2.8.0+dfsg/libr/core/pseudo.c
--- radare2-2.3.0+dfsg/libr/core/pseudo.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/pseudo.c	2018-08-07 14:12:36.000000000 +0000
@@ -162,6 +162,11 @@
 }
 
 R_API int r_core_pseudo_code(RCore *core, const char *input) {
+	const char *cmdPdc = r_config_get (core->config, "cmd.pdc");
+	if (cmdPdc && *cmdPdc && !strstr (cmdPdc, "pdc")) {
+		return r_core_cmdf (core, "%s%s", cmdPdc, input);
+	}
+
 	Sdb *db;
 	ut64 queuegoto = 0LL;
 	const char *blocktype = "else";
@@ -171,9 +176,9 @@
 		return false;
 	}
 	r_config_save_num (hc, "asm.pseudo", "asm.decode", "asm.lines", "asm.bytes", NULL);
-	r_config_save_num (hc, "asm.offset", "asm.flags", "asm.fcnlines", "asm.comments", NULL);
-	r_config_save_num (hc, "asm.functions", "asm.section", "asm.cmtcol", "asm.filter", NULL);
-	r_config_save_num (hc, "scr.color", "asm.emustr", "asm.emu", "asm.emuwrite", NULL);
+	r_config_save_num (hc, "asm.offset", "asm.flags", "asm.lines.fcn", "asm.comments", NULL);
+	r_config_save_num (hc, "asm.functions", "asm.section", "asm.cmt.col", "asm.filter", NULL);
+	r_config_save_num (hc, "scr.color", "emu.str", "asm.emu", "emu.write", NULL);
 	r_config_save_num (hc, "io.cache", NULL);
 	if (!fcn) {
 		eprintf ("Cannot find function in 0x%08"PFMT64x"\n", core->offset);
@@ -189,14 +194,14 @@
 	r_config_set_i (core->config, "asm.offset", 0);
 	r_config_set_i (core->config, "asm.flags", 0);
 	r_config_set_i (core->config, "asm.emu", 1);
-	r_config_set_i (core->config, "asm.emustr", 1);
-	r_config_set_i (core->config, "asm.emuwrite", 1);
-	r_config_set_i (core->config, "asm.fcnlines", 0);
+	r_config_set_i (core->config, "emu.str", 1);
+	r_config_set_i (core->config, "emu.write", 1);
+	r_config_set_i (core->config, "asm.lines.fcn", 0);
 	r_config_set_i (core->config, "asm.comments", 1);
 	r_config_set_i (core->config, "asm.functions", 0);
 	r_config_set_i (core->config, "asm.tabs", 0);
 	r_config_set_i (core->config, "asm.section", 0);
-	r_config_set_i (core->config, "asm.cmtcol", 30);
+	r_config_set_i (core->config, "asm.cmt.col", 30);
 	r_config_set_i (core->config, "io.cache", 1);
 	r_core_cmd0 (core, "aeim");
 
@@ -216,9 +221,9 @@
 	r_cons_printf ("\n    //  %d basic blocks\n", n_bb);
 	do {
 #define I_TAB 4
-#define K_MARK(x) sdb_fmt(0,"mark.%"PFMT64x,x)
-#define K_ELSE(x) sdb_fmt(0,"else.%"PFMT64x,x)
-#define K_INDENT(x) sdb_fmt(0,"loc.%"PFMT64x,x)
+#define K_MARK(x) sdb_fmt("mark.%"PFMT64x,x)
+#define K_ELSE(x) sdb_fmt("else.%"PFMT64x,x)
+#define K_INDENT(x) sdb_fmt("loc.%"PFMT64x,x)
 #define SET_INDENT(x) { x = x>0?x:1; memset (indentstr, ' ', x*I_TAB); indentstr [(x*I_TAB)-2] = 0; }
 		if (!bb) {
 			break;
@@ -227,7 +232,7 @@
 		r_cons_push ();
 		bool html = r_config_get_i (core->config, "scr.html");
 		r_config_set_i (core->config, "scr.html", 0);
-		char *code = r_core_cmd_str (core, sdb_fmt (0, "pD %d @ 0x%08"PFMT64x"\n", bb->size, bb->addr));
+		char *code = r_core_cmd_str (core, sdb_fmt ("pD %d @ 0x%08"PFMT64x"\n", bb->size, bb->addr));
 		r_cons_pop ();
 		r_config_set_i (core->config, "scr.html", html);
 		if (indent * I_TAB + 2 >= sizeof (indentstr)) {
diff -Nru radare2-2.3.0+dfsg/libr/core/rtr.c radare2-2.8.0+dfsg/libr/core/rtr.c
--- radare2-2.3.0+dfsg/libr/core/rtr.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/rtr.c	2018-08-07 14:12:36.000000000 +0000
@@ -34,6 +34,7 @@
 typedef struct {
 	RCore *core;
 	int launch;
+	int browse;
 	char *path;
 } HttpThread;
 
@@ -43,7 +44,7 @@
 } RapThread;
 
 R_API void r_core_wait(RCore *core) {
-	r_cons_singleton () -> breaked = true;
+	r_cons_singleton ()->context->breaked = true;
 	r_th_kill (httpthread, true);
 	r_th_kill (rapthread, true);
 	r_th_wait (httpthread);
@@ -342,7 +343,7 @@
 	RSocket* sock;
 
 #if __WINDOWS__
-	r_socket_http_server_set_breaked (&r_cons_singleton()->breaked);
+	r_socket_http_server_set_breaked (&r_cons_singleton ()->context->breaked);
 #endif
 	if (((size_t)u) > 0xff) {
 		port = listenport? listenport: r_config_get (
@@ -393,7 +394,7 @@
 }
 
 // return 1 on error
-static int r_core_rtr_http_run(RCore *core, int launch, const char *path) {
+static int r_core_rtr_http_run(RCore *core, int launch, int browse, const char *path) {
 	RConfig *newcfg = NULL, *origcfg = NULL;
 	char headers[128] = R_EMPTY;
 	RSocketHTTPRequest *rs;
@@ -416,7 +417,10 @@
 		}
 		return false;
 	}
-
+	char *arg = strchr (path, ' ');
+	if (arg) {
+		path = arg + 1;
+	}
 	if (path && atoi (path)) {
 		port = path;
 		path = NULL;
@@ -466,7 +470,8 @@
 		eprintf ("Cannot listen on http.port\n");
 		return 1;
 	}
-	if (launch=='H') {
+
+	if (browse == 'H') {
 		const char *browser = r_config_get (core->config, "http.browser");
 		r_sys_cmdf ("%s http://%s:%d/%s &",
 			browser, host, atoi (port), path? path:"");
@@ -476,12 +481,12 @@
 	newcfg = r_config_clone (core->config);
 	core->config = newcfg;
 
-	r_config_set (core->config, "asm.cmtright", "false");
+	r_config_set (core->config, "asm.cmt.right", "false");
 #if 0
 	// WHY
 	r_config_set (core->config, "scr.html", "true");
 #endif
-	r_config_set (core->config, "scr.color", "false");
+	r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
 	r_config_set (core->config, "asm.bytes", "false");
 	r_config_set (core->config, "scr.interactive", "false");
 	bool restoreSandbox = false;
@@ -509,7 +514,7 @@
 		/* restore environment */
 		core->config = origcfg;
 		r_config_set (origcfg, "scr.html", r_config_get (origcfg, "scr.html"));
-		r_config_set (origcfg, "scr.color", r_config_get (origcfg, "scr.color"));
+		r_config_set_i (origcfg, "scr.color", r_config_get_i (origcfg, "scr.color"));
 		r_config_set (origcfg, "scr.interactive", r_config_get (origcfg, "scr.interactive"));
 		core->http_up = 0; // DAT IS NOT TRUE AT ALL.. but its the way to enable visual
 
@@ -525,7 +530,8 @@
 
 		/* this is blocking */
 		activateDieTime (core);
-		rs = r_socket_http_accept (s, timeout);
+
+		rs = r_socket_http_accept (s, 1, timeout);
 
 		origoff = core->offset;
 		origblk = core->block;
@@ -538,7 +544,7 @@
 		core->http_up = 1;
 		core->config = newcfg;
 		r_config_set (newcfg, "scr.html", r_config_get (newcfg, "scr.html"));
-		r_config_set (newcfg, "scr.color", r_config_get (newcfg, "scr.color"));
+		r_config_set_i (newcfg, "scr.color", r_config_get_i (newcfg, "scr.color"));
 		r_config_set (newcfg, "scr.interactive", r_config_get (newcfg, "scr.interactive"));
 
 
@@ -836,7 +842,7 @@
 	}
 	/* refresh settings - run callbacks */
 	r_config_set (origcfg, "scr.html", r_config_get (origcfg, "scr.html"));
-	r_config_set (origcfg, "scr.color", r_config_get (origcfg, "scr.color"));
+	r_config_set_i (origcfg, "scr.color", r_config_get_i (origcfg, "scr.color"));
 	r_config_set (origcfg, "scr.interactive", r_config_get (origcfg, "scr.interactive"));
 	return ret;
 }
@@ -849,7 +855,8 @@
 	if (!ht || !ht->core) {
 		return false;
 	}
-	int ret = r_core_rtr_http_run (ht->core, ht->launch, ht->path);
+	eprintf ("WARNING: Background webserver requires http.sandbox=false to run properly\n");
+	int ret = r_core_rtr_http_run (ht->core, ht->launch, ht->browse, ht->path);
 	R_FREE (ht->path);
 	if (ret) {
 		int p = r_config_get_i (ht->core->config, "http.port");
@@ -861,7 +868,7 @@
 	return ret;
 }
 
-R_API int r_core_rtr_http(RCore *core, int launch, const char *path) {
+R_API int r_core_rtr_http(RCore *core, int launch, int browse, const char *path) {
 	int ret;
 	if (r_sandbox_enable (0)) {
 		eprintf ("sandbox: connect disabled\n");
@@ -893,6 +900,7 @@
 			HttpThread *ht = calloc (sizeof (HttpThread), 1);
 			ht->core = core;
 			ht->launch = launch;
+			ht->browse = browse;
 			ht->path = strdup (tpath);
 			httpthread = r_th_new (r_core_rtr_http_thread, ht, false);
 			r_th_start (httpthread, true);
@@ -901,7 +909,7 @@
 		return 0;
 	}
 	do {
-		ret = r_core_rtr_http_run (core, launch, path);
+		ret = r_core_rtr_http_run (core, launch, browse, path);
 	} while (ret == -2);
 	return ret;
 }
@@ -1400,7 +1408,7 @@
 		proto = RTR_PROT_RAP;
 		host = input;
 	}
-	while (*host && ISWHITECHAR (*host))
+	while (*host && IS_WHITECHAR (*host))
 		host++;
 
 	if (!(ptr = strchr (host, ':'))) {
@@ -1572,7 +1580,7 @@
 			continue;
 		}
 		rtr_host[i].proto = proto;
-		strncpy (rtr_host[i].host, host, sizeof (rtr_host[i].proto)-1);
+		strncpy (rtr_host[i].host, host, sizeof (rtr_host[i].host)-1);
 		rtr_host[i].port = r_num_get (core->num, port);
 		strncpy (rtr_host[i].file, file, sizeof (rtr_host[i].file)-1);
 		rtr_host[i].fd = fd;
@@ -1668,14 +1676,14 @@
 	if (fd) {
 		if (r_io_is_listener (core->io)) {
 			if (!r_core_serve (core, fd)) {
-				r_cons_singleton() -> breaked = true;
+				r_cons_singleton () ->context->breaked = true;
 			}
 			r_io_desc_free (fd);
 		}
 	} else {
-		r_cons_singleton()->breaked = true;
+		r_cons_singleton ()->context->breaked = true;
 	}
-	return !r_cons_singleton ()->breaked;
+	return !r_cons_singleton ()->context->breaked;
 	// r_core_cmdf (core, "o rap://%s", input);
 }
 
@@ -1796,7 +1804,7 @@
 		eprintf ("Error: Allocating cmd output\n");
 		return;
 	}
-	r_socket_read (fh, (ut8*)cmd_output, cmd_len);
+	r_socket_read_block (fh, (ut8*)cmd_output, cmd_len);
 	//ensure the termination
 	cmd_output[cmd_len] = 0;
 	r_cons_println (cmd_output);
@@ -1847,6 +1855,8 @@
 	}
 
 	s = r_socket_new (0);
+	s->local = r_config_get_i(core->config, "tcp.islocal");
+
 	if (!r_socket_listen (s, port, NULL)) {
 		eprintf ("Error listening on port %s\n", port);
 		r_socket_free (s);
diff -Nru radare2-2.3.0+dfsg/libr/core/task.c radare2-2.8.0+dfsg/libr/core/task.c
--- radare2-2.3.0+dfsg/libr/core/task.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/task.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,146 +1,483 @@
-/* radare - LGPL - Copyright 2014-2016 - pancake */
+/* radare - LGPL - Copyright 2014-2018 - pancake, thestr4ng3r */
 
 #include <r_core.h>
 
-R_API void r_core_task_list (RCore *core, int mode) {
+#if HAVE_PTHREAD
+#define TASK_SIGSET_T sigset_t
+static void tasks_lock_block_signals(sigset_t *old_sigset) {
+	sigset_t block_sigset;
+	sigemptyset (&block_sigset);
+	sigaddset (&block_sigset, SIGWINCH);
+	r_signal_sigmask (SIG_BLOCK, &block_sigset, old_sigset);
+}
+
+static void tasks_lock_block_signals_reset(sigset_t *old_sigset) {
+	r_signal_sigmask (SIG_SETMASK, old_sigset, NULL);
+}
+#else
+#define TASK_SIGSET_T void *
+static void tasks_lock_block_signals(TASK_SIGSET_T *old_sigset) { (void)old_sigset; }
+static void tasks_lock_block_signals_reset(TASK_SIGSET_T *old_sigset) { (void)old_sigset; }
+#endif
+
+static void tasks_lock_enter(RCore *core, TASK_SIGSET_T *old_sigset) {
+	tasks_lock_block_signals (old_sigset);
+	r_th_lock_enter (core->tasks_lock);
+}
+
+static void tasks_lock_leave(RCore *core, TASK_SIGSET_T *old_sigset) {
+	r_th_lock_leave (core->tasks_lock);
+	tasks_lock_block_signals_reset (old_sigset);
+}
+
+typedef struct oneshot_t {
+	RCoreTaskOneShot func;
+	void *user;
+} OneShot;
+
+R_API void r_core_task_print (RCore *core, RCoreTask *task, int mode) {
+	switch (mode) {
+	case 'j':
+		r_cons_printf ("{\"id\":%d,\"state\":\"", task->id);
+		switch (task->state) {
+			case R_CORE_TASK_STATE_BEFORE_START:
+				r_cons_print ("before_start");
+				break;
+			case R_CORE_TASK_STATE_RUNNING:
+				r_cons_print ("running");
+				break;
+			case R_CORE_TASK_STATE_SLEEPING:
+				r_cons_print ("sleeping");
+				break;
+			case R_CORE_TASK_STATE_DONE:
+				r_cons_print ("done");
+				break;
+		}
+		r_cons_print ("\",\"cmd\":");
+		if (task->cmd) {
+			r_cons_printf ("\"%s\"}", task->cmd);
+		} else {
+			r_cons_printf ("null}");
+		}
+		break;
+	default: {
+		const char *info = task->cmd;
+		if (task == core->main_task) {
+			info = "-- MAIN TASK --";
+		}
+		r_cons_printf ("%2d  %12s  %s\n",
+					   task->id,
+					   r_core_task_status (task),
+					   info ? info : "");
+		break;
+	}
+	}
+}
+
+R_API void r_core_task_list(RCore *core, int mode) {
 	RListIter *iter;
 	RCoreTask *task;
 	if (mode == 'j') {
 		r_cons_printf ("[");
 	}
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
 	r_list_foreach (core->tasks, iter, task) {
-		switch (mode) {
-		case 'j':
-			r_cons_printf ("{\"id\":%d,\"status\":\"%c\",\"text\":\"%s\"}%s",
-				task->id, task->state, task->msg->text, iter->n?",":"");
-			break;
-		default:
-			r_cons_printf ("Task %d Status %c Command %s\n",
-					task->id, task->state, task->msg->text);
-			if (mode == 1) {
-				if (task->msg->res) {
-					r_cons_println (task->msg->res);
-				} else {
-					r_cons_newline ();
-				}
-			}
-			break;
+		r_core_task_print (core, task, mode);
+		if (mode == 'j' && iter->n) {
+			r_cons_printf (",");
 		}
 	}
 	if (mode == 'j') {
 		r_cons_printf ("]\n");
+	} else {
+		r_cons_printf ("--\ntotal running: %d\n", core->tasks_running);
 	}
+	tasks_lock_leave (core, &old_sigset);
 }
 
-R_API void r_core_task_join (RCore *core, RCoreTask *task) {
+static void task_join(RCoreTask *task) {
+	RThreadSemaphore *sem = task->running_sem;
+	if (!sem) {
+		return;
+	}
+	r_th_sem_wait (sem);
+	r_th_sem_post (sem);
+}
+
+R_API void r_core_task_join(RCore *core, RCoreTask *current, RCoreTask *task) {
 	RListIter *iter;
-	if( task) {
-		r_cons_break_push (NULL, NULL);
-		r_th_wait (task->msg->th);
-		r_cons_break_pop ();
+	if (current && task == current) {
+		return;
+	}
+	if (task) {
+		if (current) {
+			r_core_task_sleep_begin (current);
+		}
+		task_join (task);
+		if (current) {
+			r_core_task_sleep_end (current);
+		}
 	} else {
 		r_list_foreach_prev (core->tasks, iter, task) {
-			r_th_wait (task->msg->th);
+			if (current == task) {
+				continue;
+			}
+			if (current) {
+				r_core_task_sleep_begin (current);
+			}
+			task_join (task);
+			if (current) {
+				r_core_task_sleep_end (current);
+			}
 		}
 	}
 }
 
-static int r_core_task_thread(RCore *core, RCoreTask *task) {
-	// TODO
-	return 0;
-}
-
-R_API RCoreTask *r_core_task_new (RCore *core, const char *cmd, RCoreTaskCallback cb, void *user) {
+R_API RCoreTask *r_core_task_new(RCore *core, bool create_cons, const char *cmd, RCoreTaskCallback cb, void *user) {
+	if (cmd && *cmd == '=') {
+		eprintf ("=* commands disabled in tasks\n");
+		return NULL;
+	}
 	RCoreTask *task = R_NEW0 (RCoreTask);
-	if (task) {
-		task->msg = r_th_msg_new (cmd, r_core_task_thread);
-		task->id = r_list_length (core->tasks)+1;
-		task->state = 's'; // stopped
-		task->core = core;
-		task->user = user;
-		task->cb = cb;
+	if (!task) {
+		goto hell;
+	}
+
+	task->thread = NULL;
+	task->cmd = cmd ? strdup (cmd) : NULL;
+	task->cmd_log = false;
+	task->res = NULL;
+	task->running_sem = NULL;
+	task->dispatch_cond = r_th_cond_new ();
+	task->dispatch_lock = r_th_lock_new (false);
+	if (!task->dispatch_cond || !task->dispatch_lock) {
+		goto hell;
 	}
+
+	if (create_cons) {
+		task->cons_context = r_cons_context_new ();
+		if (!task->cons_context) {
+			goto hell;
+		}
+	}
+
+	task->id = core->task_id_next++;
+	task->state = R_CORE_TASK_STATE_BEFORE_START;
+	task->core = core;
+	task->user = user;
+	task->cb = cb;
+
 	return task;
+
+hell:
+	r_core_task_free (task);
+	return NULL;
 }
 
-R_API void r_core_task_run(RCore *core, RCoreTask *_task) {
-	RCoreTask *task;
-	RListIter *iter;
-	char *str;
-	r_list_foreach_prev (core->tasks, iter, task) {
-		if (_task && task != _task) {
-			continue;
-		}
-		if (task->state != 's') {
-			continue;
+R_API void r_core_task_free (RCoreTask *task) {
+	if (!task) {
+		return;
+	}
+	free (task->cmd);
+	free (task->res);
+	r_th_free (task->thread);
+	r_th_sem_free (task->running_sem);
+	r_th_cond_free (task->dispatch_cond);
+	r_th_lock_free (task->dispatch_lock);
+	r_cons_context_free (task->cons_context);
+	free (task);
+}
+
+R_API void r_core_task_schedule(RCoreTask *current, RTaskState next_state) {
+	RCore *core = current->core;
+	bool stop = next_state != R_CORE_TASK_STATE_RUNNING;
+
+	if (core->oneshot_running || (!stop && core->tasks_running == 1 && core->oneshots_enqueued == 0)) {
+		return;
+	}
+
+	core->current_task = NULL;
+
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
+
+	current->state = next_state;
+
+	if (stop) {
+		core->tasks_running--;
+		r_th_lock_leave (current->dispatch_lock);
+	}
+
+	// oneshots always have priority.
+	// if there are any queued, run them immediately.
+	OneShot *oneshot;
+	while ((oneshot = r_list_pop_head (core->oneshot_queue))) {
+		core->oneshots_enqueued--;
+		core->oneshot_running = true;
+		oneshot->func (oneshot->user);
+		core->oneshot_running = false;
+		free (oneshot);
+	}
+
+	RCoreTask *next = r_list_pop_head (core->tasks_queue);
+
+	if (next && !stop) {
+		r_list_append (core->tasks_queue, current);
+	}
+
+	tasks_lock_leave (core, &old_sigset);
+
+	if (next) {
+		r_cons_context_reset ();
+		r_th_lock_enter (next->dispatch_lock);
+		r_th_cond_signal (next->dispatch_cond);
+		r_th_lock_leave (next->dispatch_lock);
+		if (!stop) {
+			r_th_cond_wait (current->dispatch_cond, current->dispatch_lock);
 		}
-		task->state = 'r'; // running
-		str = r_core_cmd_str (core, task->msg->text);
-		eprintf ("Task %d finished width %d byte(s): %s\n%s\n",
-				task->id, (int)strlen (str), task->msg->text, str);
-		task->state = 'd'; // done
-		task->msg->done = 1; // done DUP!!
-		task->msg->res = str;
-		if (task->cb) {
-			task->cb (task->user, str);
+	}
+
+	if (!stop) {
+		core->current_task = current;
+		if (current->cons_context) {
+			r_cons_context_load (current->cons_context);
+		} else {
+			r_cons_context_reset ();
 		}
+	} else {
+		r_cons_context_reset ();
 	}
 }
 
-R_API void r_core_task_run_bg(RCore *core, RCoreTask *_task) {
-	RCoreTask *task;
-	RListIter *iter;
-	char *str;
-	r_list_foreach_prev (core->tasks, iter, task) {
-		if (_task && task != _task) {
-			continue;
-		}
-		task->state = 'r'; // running
-		str = r_core_cmd_str (core, task->msg->text);
-		eprintf ("Task %d finished width %d byte(s): %s\n%s\n",
-				task->id, (int)strlen (str), task->msg->text, str);
-		task->state = 'd'; // done
-		task->msg->done = 1; // done DUP!!
-		task->msg->res = str;
+static void task_wakeup(RCoreTask *current) {
+	RCore *core = current->core;
+
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
+
+	core->tasks_running++;
+	current->state = R_CORE_TASK_STATE_RUNNING;
+
+	// check if there are other tasks running
+	bool single = core->tasks_running == 1;
+
+	r_th_lock_enter (current->dispatch_lock);
+
+	// if we are not the only task, we must wait until another task signals us.
+
+	if (!single) {
+		r_list_append (current->core->tasks_queue, current);
+	}
+
+	tasks_lock_leave (core, &old_sigset);
+
+	if(!single) {
+		r_th_cond_wait (current->dispatch_cond, current->dispatch_lock);
+	}
+
+	core->current_task = current;
+
+	if (current->cons_context) {
+		r_cons_context_load (current->cons_context);
+	} else {
+		r_cons_context_reset ();
+	}
+}
+
+R_API void r_core_task_continue(RCoreTask *t) {
+	r_core_task_schedule (t, R_CORE_TASK_STATE_RUNNING);
+}
+
+static void task_end(RCoreTask *t) {
+	r_core_task_schedule (t, R_CORE_TASK_STATE_DONE);
+}
+
+static int task_run(RCoreTask *task) {
+	RCore *core = task->core;
+
+	task_wakeup (task);
+
+	char *res_str;
+	int res;
+	if (task == task->core->main_task) {
+		res = r_core_cmd (core, task->cmd, task->cmd_log);
+		res_str = NULL;
+	} else {
+		res = 0;
+		res_str = r_core_cmd_str (core, task->cmd);
 	}
+
+	if (task->res) {
+		free (task->res);
+	}
+	task->res = res_str;
+
+	if (task != core->main_task) {
+		eprintf ("\nTask %d finished\n", task->id);
+	}
+
+	task_end (task);
+
+	if (task->cb) {
+		task->cb (task->user, task->res);
+	}
+
+	if (task->running_sem) {
+		r_th_sem_post (task->running_sem);
+	}
+
+	return res;
 }
 
-R_API RCoreTask *r_core_task_add (RCore *core, RCoreTask *task) {
-	//r_th_pipe_push (core->pipe, task->cb, task);
-	if (core->tasks) {
-		r_list_append (core->tasks, task);
-		return task;
+static int task_run_thread(RThread *th) {
+	RCoreTask *task = (RCoreTask *)th->user;
+	int ret = task_run (task);
+	if (task->cons_context && task->cons_context->break_stack) {
+		r_cons_context_break_pop (task->cons_context, false);
 	}
-	return NULL;
+	return ret;
 }
 
-R_API void r_core_task_add_bg (RCore *core, RCoreTask *task) {
-	//r_th_pipe_push (core->pipe, task->cb, task);
+R_API void r_core_task_enqueue(RCore *core, RCoreTask *task) {
+	if (!core || !task) {
+		return;
+	}
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
+	if (!task->running_sem) {
+		task->running_sem = r_th_sem_new (1);
+	}
+	if (task->running_sem) {
+		r_th_sem_wait (task->running_sem);
+	}
+	if (task->cons_context) {
+		r_cons_context_break_push (task->cons_context, NULL, NULL, false);
+	}
 	r_list_append (core->tasks, task);
+	task->thread = r_th_new (task_run_thread, task, 0);
+	tasks_lock_leave (core, &old_sigset);
+}
+
+R_API void r_core_task_enqueue_oneshot(RCore *core, RCoreTaskOneShot func, void *user) {
+	if (!core || !func) {
+		return;
+	}
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
+	if (core->tasks_running == 0) {
+		// nothing is running right now and no other task can be scheduled
+		// while core->tasks_lock is locked => just run it
+		core->oneshot_running = true;
+		func (user);
+		core->oneshot_running = false;
+	} else {
+		OneShot *oneshot = R_NEW (OneShot);
+		if (oneshot) {
+			oneshot->func = func;
+			oneshot->user = user;
+			r_list_append (core->oneshot_queue, oneshot);
+			core->oneshots_enqueued++;
+		}
+	}
+	tasks_lock_leave (core, &old_sigset);
+}
+
+R_API int r_core_task_run_sync(RCore *core, RCoreTask *task) {
+	task->thread = NULL;
+	return task_run (task);
+}
+
+/* begin running stuff synchronously on the main task */
+R_API void r_core_task_sync_begin(RCore *core) {
+	RCoreTask *task = core->main_task;
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
+	task->thread = NULL;
+	task->cmd = NULL;
+	task->cmd_log = false;
+	task->state = R_CORE_TASK_STATE_BEFORE_START;
+	tasks_lock_leave (core, &old_sigset);
+	task_wakeup (task);
+}
+
+/* end running stuff synchronously, initially started with r_core_task_sync_begin() */
+R_API void r_core_task_sync_end(RCore *core) {
+	task_end (core->main_task);
+}
+
+/* To be called from within a task.
+ * Begin sleeping and schedule other tasks until r_core_task_sleep_end() is called. */
+R_API void r_core_task_sleep_begin(RCoreTask *task) {
+	r_core_task_schedule (task, R_CORE_TASK_STATE_SLEEPING);
+}
+
+R_API void r_core_task_sleep_end(RCoreTask *task) {
+	task_wakeup (task);
 }
 
-R_API int r_core_task_cat (RCore *core, int id) {
+R_API const char *r_core_task_status (RCoreTask *task) {
+	switch (task->state) {
+	case R_CORE_TASK_STATE_RUNNING:
+		return "running";
+	case R_CORE_TASK_STATE_SLEEPING:
+		return "sleeping";
+	case R_CORE_TASK_STATE_DONE:
+		return "done";
+	case R_CORE_TASK_STATE_BEFORE_START:
+		return "before start";
+	default:
+		return "unknown";
+	}
+}
+
+R_API RCoreTask *r_core_task_self (RCore *core) {
+	return core->current_task ? core->current_task : core->main_task;
+}
+
+R_API void r_core_task_break(RCore *core, int id) {
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
 	RCoreTask *task = r_core_task_get (core, id);
-	r_cons_println (task->msg->res);
-	r_core_task_del (core, id);
-	return true;
+	if (!task || task->state == R_CORE_TASK_STATE_DONE) {
+		r_th_lock_leave (core->tasks_lock);
+		return;
+	}
+	if (task->cons_context) {
+		r_cons_context_break (task->cons_context);
+	}
+	tasks_lock_leave (core, &old_sigset);
 }
 
 R_API int r_core_task_del (RCore *core, int id) {
 	RCoreTask *task;
 	RListIter *iter;
-	if (id == -1) {
-		r_list_free (core->tasks);
-		core->tasks = r_list_new ();
-		return true;
-	}
+	bool ret = false;
+	TASK_SIGSET_T old_sigset;
+	tasks_lock_enter (core, &old_sigset);
 	r_list_foreach (core->tasks, iter, task) {
 		if (task->id == id) {
+			if (task == core->main_task
+				|| task->state != R_CORE_TASK_STATE_DONE) {
+				break;
+			}
+			r_list_delete (core->tasks, iter);
+			ret = true;
+			break;
+		}
+	}
+	tasks_lock_leave (core, &old_sigset);
+	return ret;
+}
+
+R_API void r_core_task_del_all_done (RCore *core) {
+	RCoreTask *task;
+	RListIter *iter, *iter2;
+	r_list_foreach_safe (core->tasks, iter, iter2, task) {
+		if (task != core->main_task && task->state == R_CORE_TASK_STATE_DONE) {
 			r_list_delete (core->tasks, iter);
-			return true;
 		}
 	}
-	return false;
 }
 
 R_API RCoreTask *r_core_task_get (RCore *core, int id) {
diff -Nru radare2-2.3.0+dfsg/libr/core/vasm.c radare2-2.8.0+dfsg/libr/core/vasm.c
--- radare2-2.3.0+dfsg/libr/core/vasm.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/vasm.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,11 +1,13 @@
-/* radare - LGPL - Copyright 2009-2016 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_core.h>
 
+#define R_VISUAL_ASM_BUFSIZE 1024
+
 typedef struct {
 	RCore *core;
-	char blockbuf[1024];
-	char codebuf[1024];
+	char blockbuf[R_VISUAL_ASM_BUFSIZE];
+	char codebuf[R_VISUAL_ASM_BUFSIZE];
 	int oplen;
 	ut8 buf[128];
 	RAsmCode *acode;
@@ -15,6 +17,7 @@
 
 static int readline_callback(void *_a, const char *str) {
 	RCoreVisualAsm *a = _a;
+	RCore *core = a->core;
 	int xlen;
 	r_cons_clear00 ();
 	r_cons_printf ("Write some %s-%d assembly...\n\n",
@@ -30,21 +33,27 @@
 		r_asm_code_free (a->acode);
 		r_asm_set_pc (a->core->assembler, a->off);
 		a->acode = r_asm_massemble (a->core->assembler, str);
-		r_cons_printf ("%d> %s\n", a->acode? a->acode->len: 0, str);
+		r_cons_printf ("[VA:%d]> %s\n", a->acode? a->acode->len: 0, str);
 		if (a->acode && a->acode->len) {
 			r_cons_printf ("* %s\n\n", a->acode->buf_hex);
 		} else {
 			r_cons_print ("\n\n");
 		}
 		if (a->acode) {
-			xlen = strlen (a->acode->buf_hex);
+			xlen = R_MIN (strlen (a->acode->buf_hex), R_VISUAL_ASM_BUFSIZE - 2);
 			strcpy (a->codebuf, a->blockbuf);
 			memcpy (a->codebuf, a->acode->buf_hex, xlen);
+			if (xlen >= strlen (a->blockbuf)) {
+				a->codebuf[xlen] = '\0';
+			}
 		}
 		{
 			int rows = 0;
 			int cols = r_cons_get_size (&rows);
-			char *cmd = r_str_newf ("pd %d @x:%s @0x%"PFMT64x, rows - 10, a->codebuf, a->off);
+			core->print->cur_enabled = 1;
+			core->print->ocur = 0;
+			core->print->cur = (a->acode && a->acode->len) ? a->acode->len - 1: 0;
+			char *cmd = r_str_newf ("pd %d @x:%s @0x%"PFMT64x, rows - 11, a->codebuf, a->off);
 			char *res = r_core_cmd_str (a->core, cmd);
 			char *msg = r_str_ansi_crop (res, 0,0, cols - 2, rows - 5);
 			r_cons_printf ("%s\n", msg);
diff -Nru radare2-2.3.0+dfsg/libr/core/visual.c radare2-2.8.0+dfsg/libr/core/visual.c
--- radare2-2.3.0+dfsg/libr/core/visual.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/visual.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,7 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_core.h>
+#include <r_cons.h>
 
 static int obs = 0;
 static int blocksize = 0;
@@ -8,7 +9,6 @@
 static int disMode = 0;
 static void visual_refresh(RCore *core);
 
-
 static bool snowMode = false;
 static RList *snows = NULL;
 typedef struct {
@@ -21,13 +21,81 @@
 static const char *printfmtSingle[] = {
 	"xc", "pd $r",
 	"pxw 64@r:SP;dr=;pd $r",
-	"pxw", "pxx", "pxA", "pss", "prc", "pxa"
+	"pxw", "pxx", "pxA", "pss", "prc", "pxa", "pxr"
 };
 
 static const char *printfmtColumns[] = {
 	"pCx", "pCd $r-1",
 	"pCD",
-	"pCw", "pCc", "pCA", "pss", "prc", "pCa"
+	"pCw", "pCc", "pCA", "pss", "prc", "pCa", "pxr"
+};
+
+static const char *help_msg_visual[] = {
+	"?", "show this help",
+	"??", "show the user-friendly hud",
+	"%", "in cursor mode finds matching pair, otherwise toggle autoblocksz",
+	"@", "redraw screen every 1s (multi-user view), in cursor set position",
+	"^", "seek to the begining of the function",
+	"!", "enter into the visual panels mode",
+	"_", "enter the flag/comment/functions/.. hud (same as VF_)",
+	"=", "set cmd.vprompt (top row)",
+	"|", "set cmd.cprompt (right column)",
+	".", "seek to program counter",
+	"#", "toggle bytes in disasm view",
+	"\\", "toggle visual split mode",
+	"\"", "toggle the column mode (uses pC..)",
+	"/", "in cursor mode search in current block",
+	"(", "toggle snow",
+	")", "toggle emu.str",
+	":cmd", "run radare command",
+	";[-]cmt", "add/remove comment",
+	"0", "seek to beginning of current function",
+	"[1-9]", "follow jmp/call identified by shortcut (like ;[1])",
+	",file", "add a link to the text file",
+	"/*+-[]", "change block size, [] = resize hex.cols",
+	"</>", "seek aligned to block size (seek cursor in cursor mode)",
+	"a/A", "(a)ssemble code, visual (A)ssembler",
+	"b", "browse symbols, flags, configurations, classes, ...",
+	"B", "toggle breakpoint",
+	"c/C", "toggle (c)ursor and (C)olors",
+	"d[f?]", "define function, data, code, ..",
+	"D", "enter visual diff mode (set diff.from/to)",
+	"e", "edit eval configuration variables",
+	"f/F", "set/unset or browse flags. f- to unset, F to browse, ..",
+	"gG", "go seek to begin and end of file (0-$s)",
+	"hjkl", "move around (or HJKL) (left-down-up-right)",
+	"i", "insert hex or string (in hexdump) use tab to toggle",
+	"I", "insert hexpair block ",
+	"mK/'K", "mark/go to Key (any key)",
+	"M", "walk the mounted filesystems",
+	"n/N", "seek next/prev function/flag/hit (scr.nkey)",
+	"o", "go/seek to given offset",
+	"O", "toggle asm.pseudo and asm.esil",
+	"p/P", "rotate print modes (hex, disasm, debug, words, buf)",
+	"q", "back to radare shell",
+	"r", "toggle jmphints/leahints",
+	"R", "randomize color palette (ecr)",
+	"sS", "step / step over",
+	"T", "enter textlog chat console (TT)",
+	"uU", "undo/redo seek",
+	"v", "visual function/vars code analysis menu",
+	"V", "(V)iew interactive ascii art graph (agfv)",
+	"wW", "seek cursor to next/prev word",
+	"xX", "show xrefs/refs of current function from/to data/code",
+	"yY", "copy and paste selection",
+	"z", "fold/unfold comments in disassembly",
+	"Z", "toggle zoom mode",
+	"Enter", "follow address of jump/call",
+	NULL
+};
+
+static const char *help_msg_visual_fn[] = {
+	"F2", "toggle breakpoint",
+	"F4", "run to cursor",
+	"F7", "single step",
+	"F8", "step over",
+	"F9", "continue",
+	NULL
 };
 
 static const char **printfmt = printfmtSingle;
@@ -43,7 +111,7 @@
 	RCore *core = th->user;
 	r_cons_any_key (NULL);
 	eprintf ("^C  \n");
-	core->cons->breaked = true;
+	core->cons->context->breaked = true;
 	return 0;
 }
 
@@ -63,7 +131,7 @@
 		r_sys_sleep (1);
 	}
 	r_cons_break_pop ();
-	core->cons->breaked = true;
+	core->cons->context->breaked = true;
 	r_th_wait (th);
 	return 0;
 }
@@ -87,6 +155,20 @@
 	}
 }
 
+static void rotateAsmemu(RCore *core) {
+	const bool isEmuStr = r_config_get_i (core->config, "emu.str");
+	const bool isEmu = r_config_get_i (core->config, "asm.emu");
+	if (isEmu) {
+		if (isEmuStr) {
+			r_config_set (core->config, "emu.str", "false");
+		} else {
+			r_config_set (core->config, "asm.emu", "false");
+		}
+	} else {
+		r_config_set (core->config, "emu.str", "true");
+	}
+}
+
 static void printSnow(RCore *core) {
 	if (!snows) {
 		snows = r_list_newf (free);
@@ -128,7 +210,7 @@
 #if __UNIX__ && !__APPLE__
 // TODO: Add support for iterm2 and terminal for mac, see rarop source for more info
 		int port = r_config_get_i (core->config, "http.port");
-		if (!r_core_rtr_http (core, '&', NULL)) {
+		if (!r_core_rtr_http (core, '&', 'H', NULL)) {
 			const char *xterm = r_config_get (core->config, "cmd.xterm");
 			// TODO: this must be configurable
 			r_sys_cmdf ("%s 'r2 -C http://localhost:%d/cmd/V;sleep 1' &", xterm, port);
@@ -157,10 +239,10 @@
 }
 #endif
 
-static void showcursor(RCore *core, int x) {
+R_API void r_core_visual_showcursor(RCore *core, int x) {
 	if (core && core->vmode) {
 		r_cons_show_cursor (x);
-		if (x) {
+		if (!x) {
 			// TODO: cache this
 			int wheel = r_config_get_i (core->config, "scr.wheel");
 			if (wheel) {
@@ -183,15 +265,15 @@
 
 R_API int r_core_visual_hud(RCore *core) {
 	const char *c = r_config_get (core->config, "hud.path");
-	char *f = r_str_newf ("%s/share/radare2/" R2_VERSION "/hud/main",
-		r_config_get (core->config, "dir.prefix"));
+	char *f = r_str_newf (R_JOIN_3_PATHS ("%s", R2_HUD, "main"),
+		r_sys_prefix (NULL));
 	int use_color = core->print->flags & R_PRINT_FLAGS_COLOR;
-	char *homehud = r_str_home (R2_HOMEDIR "/hud");
+	char *homehud = r_str_home (R2_HOME_HUD);
 	char *res = NULL;
 	char *p = 0;
-	r_cons_singleton ()->use_color = use_color;
+	r_cons_singleton ()->color = use_color;
 
-	showcursor (core, true);
+	r_core_visual_showcursor (core, true);
 	if (c && *c && r_file_exists (c)) {
 		res = r_cons_hud_file (c);
 	}
@@ -215,76 +297,63 @@
 		}
 		free (res);
 	}
-	showcursor (core, false);
+	r_core_visual_showcursor (core, false);
 	r_cons_flush ();
 	free (homehud);
 	free (f);
 	return (int) (size_t) p;
 }
 
+R_API void r_core_visual_jump(RCore *core, ut8 ch) {
+	char chbuf[2];
+	ut64 off;
+	chbuf[0] = ch;
+	chbuf[1] = '\0';
+	off = r_core_get_asmqjmps (core, chbuf);
+	if (off != UT64_MAX) {
+		int delta = R_ABS ((st64) off - (st64) core->offset);
+		r_io_sundo_push (core->io, core->offset, r_print_get_cursor (core->print));
+		if (core->print->cur_enabled && delta < 100) {
+			core->print->cur = delta;
+		} else {
+			r_core_visual_seek_animation (core, off);
+			core->print->cur = 0;
+		}
+		r_core_block_read (core);
+	}
+}
+
+static void append_help(RStrBuf *p, const char *title, const char **help) {
+	int i, max_length = 0, padding = 0;
+	RCons *cons = r_cons_singleton ();
+	const char *pal_args_color = cons->color ? cons->pal.args : "",
+		   *pal_help_color = cons->color ? cons->pal.help : "",
+		   *pal_reset = cons->color ? cons->pal.reset : "";
+	for (i = 0; help[i]; i += 2) {
+		max_length = R_MAX (max_length, strlen (help[i]));
+	}
+	r_strbuf_appendf (p, "|%s:\n", title);
+
+	for (i = 0; help[i]; i += 2) {
+		padding = max_length - (strlen (help[i]));
+		r_strbuf_appendf (p, "| %s%s%*s  %s%s%s\n",
+			 pal_args_color, help[i],
+			 padding, "",
+			 pal_help_color, help[i + 1], pal_reset);
+	}
+}
+
 static int visual_help() {
+	RStrBuf *p = r_strbuf_new (NULL);
+	if (!p) {
+		return 0;
+	}
 	r_cons_clear00 ();
-	return r_cons_less_str (
-		"Visual mode help:\n"
-		" ?        show this help\n"
-		" ??       show the user-friendly hud\n"
-		" %        in cursor mode finds matching pair, otherwise toggle autoblocksz\n"
-		" @        redraw screen every 1s (multi-user view), in cursor set position\n"
-		" ^        seek to the begining of the function\n"
-		" !        enter into the visual panels mode\n"
-		" _        enter the flag/comment/functions/.. hud (same as VF_)\n"
-		" =        set cmd.vprompt (top row)\n"
-		" |        set cmd.cprompt (right column)\n"
-		" .        seek to program counter\n"
-		" \\        toggle visual split mode\n"
-		" \"        toggle the column mode (uses pC..)\n"
-		" /        in cursor mode search in current block\n"
-		" :cmd     run radare command\n"
-		" ;[-]cmt  add/remove comment\n"
-		" 0        seek to beginning of current function\n"
-		" [1-9]    follow jmp/call identified by shortcut (like ;[1])\n"
-		" ,file    add a link to the text file\n"
-		" /*+-[]   change block size, [] = resize hex.cols\n"
-		" </>      seek aligned to block size (seek cursor in cursor mode)\n"
-		" a/A      (a)ssemble code, visual (A)ssembler\n"
-		" b        browse symbols, flags, configurations, classes, ...\n"
-		" B        toggle breakpoint\n"
-		" c/C      toggle (c)ursor and (C)olors\n"
-		" d[f?]    define function, data, code, ..\n"
-		" D        enter visual diff mode (set diff.from/to)\n"
-		" e        edit eval configuration variables\n"
-		" f/F      set/unset or browse flags. f- to unset, F to browse, ..\n"
-		" gG       go seek to begin and end of file (0-$s)\n"
-		" hjkl     move around (or HJKL) (left-down-up-right)\n"
-		" i        insert hex or string (in hexdump) use tab to toggle\n"
-		" mK/'K    mark/go to Key (any key)\n"
-		" M        walk the mounted filesystems\n"
-		" n/N      seek next/prev function/flag/hit (scr.nkey)\n"
-		" o        go/seek to given offset\n"
-		" O        toggle asm.pseudo and asm.esil\n"
-		" p/P      rotate print modes (hex, disasm, debug, words, buf)\n"
-		" q        back to radare shell\n"
-		" r        refresh screen / in cursor mode browse comments\n" // browse anal info and comments / in cursor mode = remove byte\n"
-		" R        randomize color palette (ecr)\n"
-		" sS       step / step over\n"
-		" t        browse types\n"
-		" T        enter textlog chat console (TT)\n"
-		" uU       undo/redo seek\n"
-		" v        visual function/vars code analysis menu\n"
-		" V        (V)iew graph using cmd.graph (agv?)\n"
-		" wW       seek cursor to next/prev word\n"
-		" xX       show xrefs/refs of current function from/to data/code\n"
-		" yY       copy and paste selection\n"
-		" z        fold/unfold comments in disassembly\n"
-		" Z        toggle zoom mode\n"
-		" Enter    follow address of jump/call\n"
-		"Function Keys: (See 'e key.'), defaults to:\n"
-		"  F2      toggle breakpoint\n"
-		"  F4      run to cursor\n"
-		"  F7      single step\n"
-		"  F8      step over\n"
-		"  F9      continue\n",
-		"?");
+	append_help (p, "Visual mode help", help_msg_visual);
+	append_help (p, "Function Keys: (See 'e key.'), defaults to", help_msg_visual_fn);
+	int ret = r_cons_less_str (r_strbuf_get (p), "?");
+	r_strbuf_free (p);
+	return ret;
 }
 
 static void prompt_read(const char *p, char *buf, int buflen) {
@@ -293,47 +362,77 @@
 	}
 	*buf = 0;
 	r_line_set_prompt (p);
-	showcursor (NULL, true);
+	r_core_visual_showcursor (NULL, true);
 	r_cons_fgets (buf, buflen, 0, NULL);
-	showcursor (NULL, false);
+	r_core_visual_showcursor (NULL, false);
 }
 
-R_API void r_core_visual_prompt_input(RCore *core) {
-	int ret;
-	ut64 addr = core->offset;
-	ut64 bsze = core->blocksize;
-	int h;
-	(void) r_cons_get_size (&h);
-	r_cons_enable_mouse (false);
-	r_cons_gotoxy (0, h - 2);
-	r_cons_reset_colors ();
-	r_cons_printf ("\nPress <enter> to return to Visual mode.\n");
-	r_cons_show_cursor (true);
-	core->vmode = false;
-	ut64 newaddr = addr;
+static void reset_print_cur(RPrint *p) {
+	p->cur = 0;
+	p->ocur = -1;
+}
+
+static void backup_current_addr(RCore *core, ut64 *addr, ut64 *bsze, ut64 *newaddr) {
+	*addr = core->offset;
+	*bsze = core->blocksize;
 	if (core->print->cur_enabled) {
 		if (core->print->ocur != -1) {
 			int newsz = core->print->cur - core->print->ocur;
-			newaddr = core->offset + core->print->ocur;
+			*newaddr = core->offset + core->print->ocur;
 			r_core_block_size (core, newsz);
 		} else {
-			newaddr = core->offset + core->print->cur;
+			*newaddr = core->offset + core->print->cur;
 		}
-		r_core_seek (core, newaddr, 1);
+		r_core_seek (core, *newaddr, 1);
 	}
-	do {
-		ret = r_core_visual_prompt (core);
-		if (core->offset != newaddr) {
-			// do not restore seek anymore
-			newaddr = addr;
+}
+
+static void restore_current_addr(RCore *core, ut64 addr, ut64 bsze, ut64 newaddr) {
+	bool restore_seek = true;
+	if (core->offset != newaddr) {
+		bool cursor_moved = false;
+		// when new address is in the screen bounds, just move
+		// the cursor if enabled and restore seek
+		if (core->print->cur != -1 && core->print->screen_bounds > 1) {
+			if (core->offset >= addr &&
+			    core->offset < core->print->screen_bounds) {
+				core->print->ocur = -1;
+				core->print->cur = core->offset - addr;
+				cursor_moved = true;
+			}
 		}
-	} while (ret);
+
+		if (!cursor_moved) {
+			restore_seek = false;
+			reset_print_cur (core->print);
+		}
+	}
+
 	if (core->print->cur_enabled) {
-		if (addr != newaddr) {
+		if (restore_seek) {
 			r_core_seek (core, addr, 1);
 			r_core_block_size (core, bsze);
 		}
 	}
+}
+
+R_API void r_core_visual_prompt_input(RCore *core) {
+	ut64 addr, bsze, newaddr;
+	int ret, h;
+	(void) r_cons_get_size (&h);
+	r_cons_enable_mouse (false);
+	r_cons_gotoxy (0, h - 2);
+	r_cons_reset_colors ();
+	r_cons_printf ("\nPress <enter> to return to Visual mode.\n");
+	r_cons_show_cursor (true);
+	core->vmode = false;
+
+	backup_current_addr (core, &addr, &bsze, &newaddr);
+	do {
+		ret = r_core_visual_prompt (core);
+	} while (ret);
+	restore_current_addr (core, addr, bsze, newaddr);
+
 	r_cons_show_cursor (false);
 	core->vmode = true;
 	r_cons_enable_mouse (true);
@@ -350,7 +449,7 @@
 #else
 	r_line_set_prompt (":> ");
 #endif
-	showcursor (core, true);
+	r_core_visual_showcursor (core, true);
 	r_cons_fgets (buf, sizeof (buf), 0, NULL);
 	if (!strcmp (buf, "q")) {
 		ret = false;
@@ -363,7 +462,7 @@
 		ret = false;
 		//r_cons_any_key (NULL);
 		r_cons_clear00 ();
-		showcursor (core, false);
+		r_core_visual_showcursor (core, false);
 	}
 	return ret;
 }
@@ -385,6 +484,8 @@
 }
 
 static void visual_single_step_over(RCore *core) {
+	bool io_cache = r_config_get_i (core->config, "io.cache");
+	r_config_set_i (core->config, "io.cache", false);
 	if (r_config_get_i (core->config, "cfg.debug")) {
 		if (core->print->cur_enabled) {
 			r_core_cmd (core, "dcr", 0);
@@ -397,6 +498,7 @@
 		r_core_cmd (core, "aeso", 0);
 		r_core_cmd (core, ".ar*", 0);
 	}
+	r_config_set_i (core->config, "io.cache", io_cache);
 }
 
 static void visual_breakpoint(RCore *core) {
@@ -572,7 +674,7 @@
 	if (q) {
 		core->print->cur = (int) (size_t) (q - core->block);
 		core->print->ocur = -1;
-		showcursor (core, true);
+		r_core_visual_showcursor (core, true);
 	}
 }
 
@@ -587,7 +689,7 @@
 			if (core->print->cur_enabled) {
 				core->print->cur = i + 1;
 				core->print->ocur = -1;
-				showcursor (core, true);
+				r_core_visual_showcursor (core, true);
 			} else {
 				r_core_seek (core, core->offset + i + 1, 1);
 			}
@@ -624,7 +726,7 @@
 			if (core->print->cur_enabled) {
 				core->print->cur = i + 1;
 				core->print->ocur = -1;
-				showcursor (core, true);
+				r_core_visual_showcursor (core, true);
 			} else {
 				// r_core_seek (core, core->offset + i + 1, 1);
 			}
@@ -664,7 +766,7 @@
 		} else {
 			core->print->ocur = -1;
 		}
-		showcursor (core, true);
+		r_core_visual_showcursor (core, true);
 		eprintf ("Found in offset 0x%08"PFMT64x" + %d\n", core->offset, core->print->cur);
 		r_cons_any_key (NULL);
 	} else {
@@ -768,10 +870,10 @@
 	// if we anal info didn't help then fallback to the dumb solution.
 	target = addr;
 	base = target - OPDELTA;
-	r_core_read_at (core, base, buf, sizeof (buf));
+	r_io_read_at (core->io, base, buf, sizeof (buf));
 	for (i = 0; i < sizeof (buf); i++) {
 		ret = r_anal_op (core->anal, &op, base + i,
-			buf + i, sizeof (buf) - i);
+			buf + i, sizeof (buf) - i, R_ANAL_OP_MASK_BASIC);
 		if (!ret) {
 			continue;
 		}
@@ -821,13 +923,60 @@
 	return start_addr;
 }
 
-static void reset_print_cur(RPrint *p) {
-	p->cur = 0;
-	p->ocur = -1;
+R_API int offset_history_up(RLine *line) {
+	RCore *core = line->user;
+	RIOUndo *undo = &core->io->undo;
+	if (line->offset_hist_index <= -undo->undos) {
+		return false;
+	}
+	line->offset_hist_index--;
+	ut64 off = undo->seek[undo->idx + line->offset_hist_index].off;
+	RFlagItem *f = r_flag_get_at (core->flags, off, false);
+	char *command;
+	if (f && f->offset == off && f->offset > 0) {
+		command = r_str_newf ("%s", f->name);
+	} else {
+		command = r_str_newf ("0x%"PFMT64x, off);
+	}
+	strncpy (line->buffer.data, command, R_LINE_BUFSIZE - 1);
+	line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+	free (command);
+	return true;
+}
+
+R_API int offset_history_down(RLine *line) {
+	RCore *core = line->user;
+	RIOUndo *undo = &core->io->undo;
+	if (line->offset_hist_index >= undo->redos) {
+		return false;
+	}
+	line->offset_hist_index++;
+	if (line->offset_hist_index == undo->redos) {
+		line->buffer.data[0] = '\0';
+		line->buffer.index = line->buffer.length = 0;
+		return false;
+	}
+	ut64 off = undo->seek[undo->idx + line->offset_hist_index].off;
+	RFlagItem *f = r_flag_get_at (core->flags, off, false);
+	char *command;
+	if (f && f->offset == off && f->offset > 0) {
+		command = r_str_newf ("%s", f->name);
+	} else {
+		command = r_str_newf ("0x%"PFMT64x, off);
+	}
+	strncpy (line->buffer.data, command, R_LINE_BUFSIZE - 1);
+	line->buffer.index = line->buffer.length = strlen (line->buffer.data);
+	free (command);
+	return true;
 }
 
-static void visual_offset(RCore *core) {
+R_API void r_core_visual_offset(RCore *core) {
+	ut64 addr, bsze, newaddr;
 	char buf[256];
+
+	backup_current_addr (core, &addr, &bsze, &newaddr);
+	core->cons->line->offset_prompt = true;
+	r_line_set_hist_callback (core->cons->line, &offset_history_up, &offset_history_down);
 	r_line_set_prompt ("[offset]> ");
 	strcpy (buf, "s ");
 	if (r_cons_fgets (buf + 2, sizeof (buf) - 3, 0, NULL) > 0) {
@@ -835,8 +984,10 @@
 			buf[1] = '.';
 		}
 		r_core_cmd0 (core, buf);
-		reset_print_cur (core->print);
+		restore_current_addr (core, addr, bsze, newaddr);
 	}
+	r_line_set_hist_callback (core->cons->line, &cmd_history_up, &cmd_history_down);
+	core->cons->line->offset_prompt = false;
 }
 
 static int prevopsz(RCore *core, ut64 addr) {
@@ -918,10 +1069,8 @@
 					}
 					r_cons_printf (" %d [%s] 0x%08"PFMT64x " %s %cREF (%s)\n",
 						idx, cstr, refi->addr,
-						refi->type == R_ANAL_REF_TYPE_CODE? "CODE (JMP)" :
-						refi->type == R_ANAL_REF_TYPE_CALL? "CODE (CALL)": "DATA",
-						xref ? 'X':' ',
-						name);
+						r_anal_xrefs_type_tostring (refi->type),
+						xref ? 'X':' ', name);
 					free (name);
 					if (idx == skip) {
 						free (dis);
@@ -987,6 +1136,7 @@
 	}
 	r_cons_flush ();
 	ch = r_cons_readchar ();
+	ch = r_cons_arrow_to_hjkl (ch);
 	if (ch == ':') {
 		r_core_visual_prompt_input (core);
 	} else if (ch == '?') {
@@ -1012,10 +1162,10 @@
 			printMode = lastPrintMode;
 		}
 		goto repeat;
-	} else if (r_cons_arrow_to_hjkl (ch) == 'j') {
+	} else if (ch == 'j') {
 		skip++;
 		goto repeat;
-	} else if (r_cons_arrow_to_hjkl (ch) == 'k') {
+	} else if (ch == 'k') {
 		skip--;
 		if (skip < 0) {
 			skip = 0;
@@ -1033,6 +1183,8 @@
 			r_core_cmdf (core, "s 0x%"PFMT64x, refi->addr);
 			ret = 1;
 		}
+	} else if (ch != 'q' && ch != 'Q') {
+		goto repeat;
 	}
 	r_list_free (xrefs);
 #else
@@ -1084,9 +1236,9 @@
 	cwd = getcommapath (core);
 	if (!cmtfile) {
 		char *fn;
-		showcursor (core, true);
+		r_core_visual_showcursor (core, true);
 		fn = r_cons_input ("<comment-file> ");
-		showcursor (core, false);
+		r_core_visual_showcursor (core, false);
 		if (fn && *fn) {
 			cmtfile = strdup (fn);
 			if (!comment || !*comment) {
@@ -1154,12 +1306,7 @@
 		}
 		return;
 	}
-	if (PIDX == 2 && core->seltab == 1) {
-		const int cols = core->dbg->regcols;
-		p->cur += cols > 0? cols: 3;
-		return;
-	}
-	if (core->seltab == 0 && core->printidx == R_CORE_VISUAL_MODE_PDDBG) {
+	if (PIDX == R_CORE_VISUAL_MODE_PDDBG && core->seltab == 0) {
 		int w = r_config_get_i (core->config, "hex.cols");
 		if (w < 1) {
 			w = 16;
@@ -1168,7 +1315,11 @@
 			r_config_get_i (core->config, "stack.delta") - w);
 		return;
 	}
-
+	if (PIDX == R_CORE_VISUAL_MODE_PDDBG && core->seltab == 1) {
+		const int cols = core->dbg->regcols;
+		p->cur += cols > 0? cols: 3;
+		return;
+	}
 	if (p->row_offsets) {
 		// FIXME: cache the current row
 		row = r_print_row_at_off (p, p->cur);
@@ -1209,13 +1360,7 @@
 		p->cur -= R_MAX (cols, 0);
 		return;
 	}
-	if (PIDX == 2 && core->seltab == 1) {
-		const int cols = core->dbg->regcols;
-		p->cur -= cols > 0? cols: 4;
-		return;
-	}
 	cursor_ocur (core, use_ocur);
-
 	if (splitView) {
 		int w = r_config_get_i (core->config, "hex.cols");
 		if (w < 1) {
@@ -1228,7 +1373,7 @@
 		}
 		return;
 	}
-	if (core->seltab == 0 && core->printidx == R_CORE_VISUAL_MODE_PDDBG) {
+	if (PIDX == R_CORE_VISUAL_MODE_PDDBG && core->seltab == 0) {
 		int w = r_config_get_i (core->config, "hex.cols");
 		if (w < 1) {
 			w = 16;
@@ -1237,7 +1382,11 @@
 			r_config_get_i (core->config, "stack.delta") + w);
 		return;
 	}
-
+	if (PIDX == R_CORE_VISUAL_MODE_PDDBG && core->seltab == 1) {
+		const int cols = core->dbg->regcols;
+		p->cur -= cols > 0? cols: 4;
+		return;
+	}
 	if (p->row_offsets != NULL) {
 		int delta, prev_sz;
 
@@ -1470,24 +1619,29 @@
 	return true;
 }
 
-static void visual_browse(RCore *core) {
+R_API void r_core_visual_browse(RCore *core) {
 	const char *browsemsg = \
 		"Browse stuff:\n"
 		"-------------\n"
-		" f  flags\n"
-		" e  eval var configurations\n"
+		" _  hud mode (V_)\n"
 		" b  blocks\n"
 		" c  classes\n"
-		" _  hud mode (V_)\n"
-		" i  imports\n"
-		" t  types\n"
-		" s  symbols\n"
+		" C  comments\n"
+		" e  eval var configurations\n"
+		" f  flags\n"
+		" F  functions\n"
 		" h  history\n"
+		" i  imports\n"
 		" m  maps\n"
+		" p  pids/threads\n"
+		" q  quit\n"
+		" s  symbols\n"
+		" t  types\n"
+		" T  themes\n"
+		" v  vars\n"
 		" x  xrefs\n"
 		" X  refs\n"
-		" v  vars\n"
-		" q  quit\n"
+		" :  run command\n"
 	;
 	for (;;) {
 		r_cons_clear00 ();
@@ -1498,15 +1652,29 @@
 		case 'f':
 			r_core_visual_trackflags (core);
 			break;
+		case 'F':
+			r_core_visual_anal (core);
+			// r_core_cmd0 (core, "s $(afl~...)");
+			break;
 		case 'c':
 			r_core_visual_classes (core);
 			break;
+		case 'C':
+			r_core_visual_comments (core);
+			//r_core_cmd0 (core, "s $(CC~...)");
+			break;
 		case 't':
 			r_core_visual_types (core);
 			break;
+		case 'T':
+			r_core_cmd0 (core, "eco $(eco~...)");
+			break;
 		case 'e':
 			r_core_visual_config (core);
 			break;
+		case 'p':
+			r_core_cmd0 (core, "dpt=$(dpt~[1-])");
+			break;
 		case 'b':
 			r_core_cmd0 (core, "s $(afb~...)");
 			break;
@@ -1535,6 +1703,10 @@
 		case '_':
 			r_core_visual_hudstuff (core);
 			break;
+		case ':':
+			r_core_visual_prompt_input (core);
+			break;
+		case 127: // backspace
 		case 'q':
 			return;
 		}
@@ -1576,7 +1748,7 @@
 		return 1;
 	}
 	if (r_cons_singleton ()->mouse_event) {
-		wheelspeed = r_config_get_i (core->config, "scr.wheelspeed");
+		wheelspeed = r_config_get_i (core->config, "scr.wheel.speed");
 	} else {
 		wheelspeed = 1;
 	}
@@ -1584,23 +1756,7 @@
 	// do we need hotkeys for data references? not only calls?
 	// '0' is handled to seek at the beginning of the function
 	if (ch > '0' && ch <= '9') {
-		char chbuf[2];
-		ut64 off;
-
-		chbuf[0] = ch;
-		chbuf[1] = '\0';
-		off = r_core_get_asmqjmps (core, chbuf);
-		if (off != UT64_MAX) {
-			int delta = R_ABS ((st64) off - (st64) offset);
-			r_io_sundo_push (core->io, offset, r_print_get_cursor (core->print));
-			if (core->print->cur_enabled && delta < 100) {
-				core->print->cur = delta;
-			} else {
-				r_core_visual_seek_animation (core, off);
-				core->print->cur = 0;
-			}
-			r_core_block_read (core);
-		}
+		r_core_visual_jump (core, ch);
 	} else {
 		switch (ch) {
 #if __WINDOWS__ && !__CYGWIN__
@@ -1619,7 +1775,7 @@
 				r_cons_enable_mouse (true);
 			}
 			do {
-				op = r_core_anal_op (core, core->offset + core->print->cur);
+				op = r_core_anal_op (core, core->offset + core->print->cur, R_ANAL_OP_MASK_BASIC);
 				if (op) {
 					if (op->type == R_ANAL_OP_TYPE_JMP ||
 					op->type == R_ANAL_OP_TYPE_CJMP ||
@@ -1687,7 +1843,7 @@
 				return true;
 			}
 			r_cons_printf ("Enter assembler opcodes separated with ';':\n");
-			showcursor (core, true);
+			r_core_visual_showcursor (core, true);
 			r_cons_flush ();
 			r_cons_set_raw (false);
 			strcpy (buf, "wa ");
@@ -1711,12 +1867,13 @@
 					r_core_seek (core, t, 1);
 				}
 			}
-			showcursor (core, false);
+			r_core_visual_showcursor (core, false);
 			r_cons_set_raw (true);
 		}
 		break;
 		case '=':
 		{ // TODO: edit
+			r_core_visual_showcursor (core, true);
 			const char *buf = NULL;
 			#define I core->cons
 			const char *cmd = r_config_get (core->config, "cmd.vprompt");
@@ -1726,10 +1883,12 @@
 //		if (r_cons_fgets (buf, sizeof (buf)-4, 0, NULL) <0) buf[0]='\0';
 			I->line->contents = NULL;
 			(void)r_config_set (core->config, "cmd.vprompt", buf);
+			r_core_visual_showcursor (core, false);
 		}
 		break;
 		case '|':
 		{ // TODO: edit
+			r_core_visual_showcursor (core, true);
 			const char *buf = NULL;
 			#define I core->cons
 			const char *cmd = r_config_get (core->config, "cmd.cprompt");
@@ -1746,29 +1905,31 @@
 				R_FREE (I->line->contents);
 				(void)r_config_set (core->config, "cmd.cprompt", buf? buf: "");
 			}
+			r_core_visual_showcursor (core, false);
 		}
 		break;
 		case '!':
-			r_core_visual_panels (core);
+			r_core_visual_panels (core, NULL);
 			break;
 		case 'o':
 		{
-			r_cons_enable_mouse (false);
-			visual_offset (core);
-			int wheel = r_config_get_i (core->config, "scr.wheel");
-			if (wheel) {
-				r_cons_enable_mouse (true);
-			}
+			r_core_visual_showcursor (core, true);
+			r_core_visual_offset (core);
+			r_core_visual_showcursor (core, false);
 		}
 		break;
 		case 'A':
 		{
-			int oc = core->print->cur_enabled;
-			ut64 off = oc? core->offset + core->print->cur: core->offset;
+			int oce = core->print->cur_enabled;
+			int oco = core->print->ocur;
+			int occ = core->print->cur;
+			ut64 off = oce? core->offset + core->print->cur: core->offset;
 			core->print->cur_enabled = 0;
 			r_cons_enable_mouse (false);
 			r_core_visual_asm (core, off);
-			core->print->cur_enabled = oc;
+			core->print->cur_enabled = oce;
+			core->print->cur = occ;
+			core->print->ocur = oco;
 			int wheel = r_config_get_i (core->config, "scr.wheel");
 			if (wheel) {
 				r_cons_enable_mouse (true);
@@ -1795,21 +1956,18 @@
 			}
 			break;
 		case 'C':
-			color = color? 0: 1;
+			if (++color > 2) {
+				color = 0;
+			}
 			r_config_set_i (core->config, "scr.color", color);
 			break;
 		case 'd':
 			if (r_config_get_i (core->config, "asm.esil")) {
 				r_core_visual_esil (core);
 			} else {
-				int wheel = r_config_get_i (core->config, "scr.wheel");
-				if (wheel) {
-					r_cons_enable_mouse (false);
-				}
+				r_core_visual_showcursor (core, true);
 				r_core_visual_define (core, arg + 1);
-				if (wheel) {
-					r_cons_enable_mouse (true);
-				}
+				r_core_visual_showcursor (core, false);
 			}
 			break;
 		case 'D':
@@ -1820,7 +1978,7 @@
 			int range, min, max;
 			char name[256], *n;
 			r_line_set_prompt ("flag name: ");
-			showcursor (core, true);
+			r_core_visual_showcursor (core, true);
 			if (r_cons_fgets (name, sizeof (name), 0, NULL) >= 0 && *name) {
 				n = r_str_trim (name);
 				if (core->print->ocur != -1) {
@@ -1854,7 +2012,7 @@
 				}
 			}
 		}
-			showcursor (core, false);
+			r_core_visual_showcursor (core, false);
 			break;
 		case ',':
 			visual_comma (core);
@@ -1882,8 +2040,7 @@
 					core->print->cur_enabled = true;
 					return true;
 				}
-			}
-			if (PIDX == 2 && core->seltab == 1) {
+			} else if (PIDX == 2 && core->seltab == 1) {
 				char buf[128];
 				prompt_read ("new-reg-value> ", buf, sizeof (buf));
 				if (*buf) {
@@ -1899,7 +2056,7 @@
 				r_cons_any_key (NULL);
 				return true;
 			}
-			showcursor (core, true);
+			r_core_visual_showcursor (core, true);
 			r_cons_flush ();
 			r_cons_set_raw (0);
 			if (ch == 'I') {
@@ -1948,7 +2105,7 @@
 				r_core_seek (core, offset, 1);
 			}
 			r_cons_set_raw (1);
-			showcursor (core, false);
+			r_core_visual_showcursor (core, false);
 			break;
 		case 'R':
 			if (r_config_get_i (core->config, "scr.randpal")) {
@@ -1983,11 +2140,10 @@
 			r_core_visual_refs (core, false);
 			break;
 		case 'r':
-			if (core->print->ocur != -1) {
-				r_core_visual_comments (core);
-			} else {
-				visual_refresh (core);
-			}
+			// TODO: toggle shortcut hotkeys
+			r_core_cmd0 (core, "e!asm.jmphints");
+			r_core_cmd0 (core, "e!asm.leahints");
+			visual_refresh (core);
 			break;
 		case ' ':
 		case 'V':
@@ -2084,7 +2240,7 @@
 			if (core->print->cur_enabled) {
 				cursor_nextrow (core, false);
 			} else {
-				if (r_config_get_i (core->config, "scr.wheelnkey")) {
+				if (r_config_get_i (core->config, "scr.wheel.nkey")) {
 					r_core_cmd0 (core, "sn");
 				} else {
 					int times = R_MAX (1, wheelspeed);
@@ -2102,24 +2258,7 @@
 					} else {
 						while (times--) {
 							if (isDisasmPrint (core->printidx)) {
-								RAnalFunction *f = NULL;
-								if (true) {
-									f = r_anal_get_fcn_in (core->anal, core->offset, 0);
-								}
-								op.size = 1;
-								if (f && f->folded) {
-									cols = core->offset - f->addr + r_anal_fcn_size (f);
-								} else {
-									r_asm_set_pc (core->assembler, core->offset);
-									cols = r_asm_disassemble (core->assembler,
-											&op, core->block, 32);
-								}
-								if (cols < 1) {
-									cols = op.size;
-								}
-								if (cols < 1) {
-									cols = 1;
-								}
+								r_core_visual_disasm_down (core, &op, &cols);
 							}
 							r_core_seek (core, core->offset + cols, 1);
 						}
@@ -2146,7 +2285,7 @@
 			if (core->print->cur_enabled) {
 				cursor_prevrow (core, false);
 			} else {
-				if (r_config_get_i (core->config, "scr.wheelnkey")) {
+				if (r_config_get_i (core->config, "scr.wheel.nkey")) {
 					r_core_cmd0 (core, "sp");
 				} else {
 					int times = wheelspeed;
@@ -2155,15 +2294,7 @@
 					}
 					while (times--) {
 						if (isDisasmPrint (core->printidx)) {
-							RAnalFunction *f = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
-							if (f && f->folded) {
-								cols = core->offset - f->addr; // + f->size;
-								if (cols < 1) {
-									cols = 4;
-								}
-							} else {
-								cols = prevopsz (core, core->offset);
-							}
+							r_core_visual_disasm_up (core, &cols);
 						}
 						r_core_seek_delta (core, -cols);
 					}
@@ -2196,9 +2327,9 @@
 			if (core->print->cur_enabled &&
 				(core->printidx == R_CORE_VISUAL_MODE_PD ||
 				(core->printidx == R_CORE_VISUAL_MODE_PDDBG && core->seltab == 2))) {
-				int cmtcol = r_config_get_i (core->config, "asm.cmtcol");
+				int cmtcol = r_config_get_i (core->config, "asm.cmt.col");
 				if (cmtcol > 2) {
-					r_config_set_i (core->config, "asm.cmtcol", cmtcol - 2);
+					r_config_set_i (core->config, "asm.cmt.col", cmtcol - 2);
 				}
 			}
 			// hex column
@@ -2215,8 +2346,8 @@
 			if (core->print->cur_enabled &&
 				(core->printidx == R_CORE_VISUAL_MODE_PD ||
 				(core->printidx == R_CORE_VISUAL_MODE_PDDBG && core->seltab == 2))) {
-				int cmtcol = r_config_get_i (core->config, "asm.cmtcol");
-				r_config_set_i (core->config, "asm.cmtcol", cmtcol + 2);
+				int cmtcol = r_config_get_i (core->config, "asm.cmt.col");
+				r_config_set_i (core->config, "asm.cmt.col", cmtcol + 2);
 			}
 			// hex column
 			if ((core->printidx != R_CORE_VISUAL_MODE_PD && core->printidx != R_CORE_VISUAL_MODE_PDDBG) ||
@@ -2379,6 +2510,12 @@
 				snows = NULL;
 			}
 			break;
+		case ')':
+			rotateAsmemu (core);
+			break;
+		case '#':
+			r_config_toggle (core->config, "asm.bytes");
+			break;
 		case '*':
 			if (core->print->cur_enabled) {
 				r_core_cmdf (core, "dr PC=0x%08"PFMT64x, core->offset + core->print->cur);
@@ -2451,9 +2588,10 @@
 			r_core_visual_hudstuff (core);
 			break;
 		case ';':
+			r_cons_enable_mouse (false);
 			r_cons_gotoxy (0, 0);
 			r_cons_printf ("Enter a comment: ('-' to remove, '!' to use $EDITOR)\n");
-			showcursor (core, true);
+			r_core_visual_showcursor (core, true);
 			r_cons_flush ();
 			r_cons_set_raw (false);
 			r_line_set_prompt ("comment: ");
@@ -2506,10 +2644,10 @@
 				}
 			}
 			r_cons_set_raw (true);
-			showcursor (core, false);
+			r_core_visual_showcursor (core, false);
 			break;
 		case 'b':
-			visual_browse (core);
+			r_core_visual_browse (core);
 			break;
 		case 'B':
 			{
@@ -2558,7 +2696,7 @@
 			if (fcn) {
 				fcn->folded = !fcn->folded;
 			} else {
-				r_config_toggle (core->config, "asm.cmtfold");
+				r_config_toggle (core->config, "asm.cmt.fold");
 			}
 		}
 		break;
@@ -2587,10 +2725,11 @@
 }
 
 R_API void r_core_visual_title(RCore *core, int color) {
+	bool showDelta = r_config_get_i (core->config, "scr.slow");
 	static ut64 oldpc = 0;
 	const char *BEGIN = core->cons->pal.prompt;
 	const char *filename;
-	char pos[512], foo[512], bar[512], pcs[32];
+	char pos[512], bar[512], pcs[32];
 	if (!oldpc) {
 		oldpc = r_debug_reg_get (core->dbg, "PC");
 	}
@@ -2598,6 +2737,7 @@
 	int pc, hexcols = r_config_get_i (core->config, "hex.cols");
 	if (autoblocksize) {
 		switch (core->printidx) {
+		case R_CORE_VISUAL_MODE_PXR: // prc
 		case R_CORE_VISUAL_MODE_PRC: // prc
 			r_core_block_size (core, (int)(core->cons->rows * hexcols * 3.5));
 			break;
@@ -2651,7 +2791,8 @@
 		}
 	}
 
-	filename = (core->file && core->io) ? r_io_desc_get (core->io, core->file->fd)->name : "";
+	RIODesc *desc = core->file? r_io_desc_get (core->io, core->file->fd): NULL;
+	filename = desc? desc->name: "";
 	{ /* get flag with delta */
 		ut64 addr = core->offset + (core->print->cur_enabled? core->print->cur: 0);
 #if 1
@@ -2662,12 +2803,12 @@
 		core->flags->space_strict = true;
 		core->anal->flb.set_fs (core->flags, "symbols");
 		if (core->flags->space_idx != -1) {
-			f = core->anal->flb.get_at (core->flags, addr, false);
+			f = core->anal->flb.get_at (core->flags, addr, showDelta);
 		}
 		core->flags->space_strict = oss;
 		core->flags->space_idx = osi;
 		if (!f) {
-			f = r_flag_get_at (core->flags, addr, false);
+			f = r_flag_get_at (core->flags, addr, showDelta);
 		}
 #else
 		RFlagItem *f = r_flag_get_at (core->flags, addr, false);
@@ -2720,7 +2861,7 @@
 		ut64 sz = r_io_size (core->io);
 		ut64 pa;
 		{
-			RIOSection *s = r_io_section_vget (core->io, core->offset); 
+			RIOSection *s = r_io_section_vget (core->io, core->offset);
 			pa =  s ? core->offset - s->vaddr + s->paddr : core->offset;
 		}
 		if (sz == UT64_MAX) {
@@ -2734,22 +2875,26 @@
 			sprintf (pcs, "%d%% ", pc);
 		}
 	}
-	if (__ime) {
-		snprintf (foo, sizeof (foo), "[0x%08"PFMT64x " + %d> * INSERT MODE *\n",
-			core->offset, core->print->cur);
-	} else {
-		if (core->print->cur_enabled) {
-			snprintf (foo, sizeof (foo), "[0x%08"PFMT64x " %s%d (0x%x:%d=%d)]> %s %s\n",
-				core->offset, pcs, core->blocksize,
-				core->print->cur, core->print->ocur, core->print->ocur == -1 ?
-				1: R_ABS (core->print->cur - core->print->ocur) + 1,
-				bar, pos);
+	{
+		char *title;
+		if (__ime) {
+			title = r_str_newf ("[0x%08"PFMT64x " + %d> * INSERT MODE *\n",
+				core->offset, core->print->cur);
 		} else {
-			snprintf (foo, sizeof (foo), "[0x%08"PFMT64x " %s%d %s]> %s %s\n",
-				core->offset, pcs, core->blocksize, filename, bar, pos);
+			if (core->print->cur_enabled) {
+				title = r_str_newf ("[0x%08"PFMT64x " %s%d (0x%x:%d=%d)]> %s %s\n",
+					core->offset, pcs, core->blocksize,
+					core->print->cur, core->print->ocur, core->print->ocur == -1 ?
+					1: R_ABS (core->print->cur - core->print->ocur) + 1,
+					bar, pos);
+			} else {
+				title = r_str_newf ("[0x%08"PFMT64x " %s%d %s]> %s %s\n",
+					core->offset, pcs, core->blocksize, filename, bar, pos);
+			}
 		}
+		r_cons_print (title);
+		free (title);
 	}
-	r_cons_print (foo);
 	if (color) {
 		r_cons_strcat (Color_RESET);
 	}
@@ -2759,9 +2904,9 @@
 	int h, w = r_cons_get_size (&h);
 	if (r_config_get_i (core->config, "scr.responsive")) {
 		if (w < 110) {
-			r_config_set_i (core->config, "asm.cmtright", 0);
+			r_config_set_i (core->config, "asm.cmt.right", 0);
 		} else {
-			r_config_set_i (core->config, "asm.cmtright", 1);
+			r_config_set_i (core->config, "asm.cmt.right", 1);
 		}
 		if (w < 68) {
 			r_config_set_i (core->config, "hex.cols", w / 5.2);
@@ -2774,14 +2919,14 @@
 			r_config_set_i (core->config, "asm.offset", 1);
 		}
 		if (w > 80) {
-			r_config_set_i (core->config, "asm.lineswidth", 14);
-			r_config_set_i (core->config, "asm.lineswidth", w - (w / 1.2));
-			r_config_set_i (core->config, "asm.cmtcol", w - (w / 2.5));
+			r_config_set_i (core->config, "asm.lines.width", 14);
+			r_config_set_i (core->config, "asm.lines.width", w - (w / 1.2));
+			r_config_set_i (core->config, "asm.cmt.col", w - (w / 2.5));
 		} else {
-			r_config_set_i (core->config, "asm.lineswidth", 7);
+			r_config_set_i (core->config, "asm.lines.width", 7);
 		}
 		if (w < 70) {
-			r_config_set_i (core->config, "asm.lineswidth", 1);
+			r_config_set_i (core->config, "asm.lines.width", 1);
 			r_config_set_i (core->config, "asm.bytes", 0);
 		} else {
 			r_config_set_i (core->config, "asm.bytes", 1);
@@ -2919,6 +3064,38 @@
 	}
 }
 
+static void visual_refresh_oneshot(RCore *core) {
+	r_core_task_enqueue_oneshot (core, (RCoreTaskOneShot) visual_refresh, core);
+}
+
+R_API void r_core_visual_disasm_up(RCore *core, int *cols) {
+	RAnalFunction *f = r_anal_get_fcn_in (core->anal, core->offset, R_ANAL_FCN_TYPE_NULL);
+	if (f && f->folded) {
+		*cols = core->offset - f->addr; // + f->size;
+		if (*cols < 1) {
+			*cols = 4;
+		}
+	} else {
+		*cols = prevopsz (core, core->offset);
+	}
+}
+
+R_API void r_core_visual_disasm_down(RCore *core, RAsmOp *op, int *cols) {
+	RAnalFunction *f = NULL;
+	f = r_anal_get_fcn_in (core->anal, core->offset, 0);
+	op->size = 1;
+	if (f && f->folded) {
+		*cols = core->offset - f->addr + r_anal_fcn_size (f);
+	} else {
+		r_asm_set_pc (core->assembler, core->offset);
+		*cols = r_asm_disassemble (core->assembler,
+				op, core->block, 32);
+	}
+	if (*cols < 1) {
+		*cols = op->size > 1 ? op->size : 1;
+	}
+}
+
 R_API int r_core_visual(RCore *core, const char *input) {
 	const char *cmdprompt, *teefile;
 	ut64 scrseek;
@@ -2996,9 +3173,9 @@
 				const char sign = (delta < 0)? '+': '-';
 				const int absdelta = R_ABS (delta);
 				snprintf (debugstr, sizeof (debugstr),
-					"?0;f tmp;ssr SP;%s %d@$$%c%d;"
+					"diq;?0;f tmp;ssr SP;%s %d@$$%c%d;"
 					"?1;%s;"
-					"?1;ss tmp;f-tmp;pd $r",
+					"?1;ss tmp;f-tmp;afal;pd $r",
 					pxa? "pxa": pxw, size, sign, absdelta,
 					ref? "drr": "dr=");
 			}
@@ -3009,8 +3186,9 @@
 		if (wheel) {
 			r_cons_enable_mouse (true);
 		}
+		core->cons->event_resize = NULL; // avoid running old event with new data
 		core->cons->event_data = core;
-		core->cons->event_resize = (RConsEvent) visual_refresh;
+		core->cons->event_resize = (RConsEvent) visual_refresh_oneshot;
 		flags = core->print->flags;
 		color = r_config_get_i (core->config, "scr.color");
 		if (color) {
diff -Nru radare2-2.3.0+dfsg/libr/core/vmenus.c radare2-2.8.0+dfsg/libr/core/vmenus.c
--- radare2-2.3.0+dfsg/libr/core/vmenus.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/vmenus.c	2018-08-07 14:12:36.000000000 +0000
@@ -28,7 +28,7 @@
 static char *prompt(const char *str, const char *txt) {
 	char cmd[1024];
 	char *res = NULL;
-	char *oprompt = strdup (r_cons_singleton()->line->prompt);
+	char *oprompt = strdup (r_cons_singleton ()->line->prompt);
 	r_cons_show_cursor (true);
 	if (txt && *txt) {
 		free (r_cons_singleton ()->line->contents);
@@ -55,15 +55,16 @@
 
 static inline char *getformat (RCoreVisualTypes *vt, const char *k) {
 	return sdb_get (vt->core->anal->sdb_types,
-		sdb_fmt (0, "type.%s", k), 0);
+		sdb_fmt ("type.%s", k), 0);
 }
 
-static char *colorize_asm_string(RCore *core, const char *buf_asm, int optype) {
+static char *colorize_asm_string(RCore *core, const char *buf_asm, int optype, ut64 addr) {
 	char *tmp, *spacer = NULL;
 	char *source = (char*)buf_asm;
 	bool use_color = core->print->flags & R_PRINT_FLAGS_COLOR;
 	const char *color_num = core->cons->pal.num;
 	const char *color_reg = core->cons->pal.reg;
+	RAnalFunction* fcn = r_anal_get_fcn_in (core->anal, addr, R_ANAL_FCN_TYPE_NULL);
 
 	if (!use_color) {
 		return strdup (source);
@@ -71,27 +72,20 @@
 	// workaround dummy colorizer in case of paired commands (tms320 & friends)
 	spacer = strstr (source, "||");
 	if (spacer) {
-		char *scol1, *s1 = r_str_ndup (source, spacer - source);
-		char *scol2, *s2 = strdup (spacer + 2);
-		scol1 = r_print_colorize_opcode (core->print, s1, color_reg, color_num, false);
-		free (s1);
-		scol2 = r_print_colorize_opcode (core->print, s2, color_reg, color_num, false);
-		free (s2);
-		if (!scol1) {
-			scol1 = strdup ("");
-		}
-		if (!scol2) {
-			scol2 = strdup ("");
-		}
-		source = malloc (strlen(scol1) + strlen(scol2) + 2 + 1); // reuse source variable
-		sprintf (source, "%s||%s", scol1, scol2);
+		char *s1 = r_str_ndup (source, spacer - source);
+		char *s2 = strdup (spacer + 2);
+		char *scol1 = r_print_colorize_opcode (core->print, s1, color_reg, color_num, false, fcn ? fcn->addr : 0);
+		char *scol2 = r_print_colorize_opcode (core->print, s2, color_reg, color_num, false, fcn ? fcn->addr : 0);
+		char *source = r_str_newf ("%s||%s", r_str_get2 (scol1), r_str_get2 (scol2));
 		free (scol1);
 		free (scol2);
+		free (s1);
+		free (s2);
 		return source;
 	}
-	char *res = strdup("");
+	char *res = strdup ("");
 	res = r_str_append (res, r_print_color_op_type (core->print, optype));
-	tmp = r_print_colorize_opcode (core->print, source, color_reg, color_num, false);
+	tmp = r_print_colorize_opcode (core->print, source, color_reg, color_num, false, fcn ? fcn->addr : 0);
 	res = r_str_append (res, tmp);
 	free (tmp);
 	return res;
@@ -139,12 +133,13 @@
 	RAsmOp asmop;
 	RAnalOp analop;
 	ut8 buf[sizeof (ut64)];
+	unsigned int addrsize = r_config_get_i (core->config, "esil.addr.size");
 
 	if (core->blocksize < sizeof (ut64)) {
 		return false;
 	}
 	memcpy (buf, core->block, sizeof (ut64));
-	esil = r_anal_esil_new (20, 0);
+	esil = r_anal_esil_new (20, 0, addrsize);
 	esil->anal = core->anal;
 	r_anal_esil_set_pc (esil, core->offset);
 	for (;;) {
@@ -152,7 +147,7 @@
 		// bool use_color = core->print->flags & R_PRINT_FLAGS_COLOR;
 		(void) r_asm_disassemble (core->assembler, &asmop, buf, sizeof (ut64));
 		analop.type = -1;
-		(void)r_anal_op (core->anal, &analop, core->offset, buf, sizeof (ut64));
+		(void)r_anal_op (core->anal, &analop, core->offset, buf, sizeof (ut64), R_ANAL_OP_MASK_ESIL);
 		analopType = analop.type & R_ANAL_OP_TYPE_MASK;
 		r_cons_printf ("r2's esil debugger:\n\n");
 		r_cons_printf ("pos: %d\n", x);
@@ -162,7 +157,7 @@
 			free (res);
 		}
 		{
-			char *op = colorize_asm_string (core, asmop.buf_asm, analopType);
+			char *op = colorize_asm_string (core, asmop.buf_asm, analopType, core->offset);
 			r_cons_printf (Color_RESET"asm: %s\n"Color_RESET, op);
 			free (op);
 		}
@@ -256,7 +251,7 @@
 			if (r_cons_fgets (cmd, sizeof (cmd)-1, 0, NULL) < 0) {
 				cmd[0] = '\0';
 			}
-			r_core_cmd (core, cmd, 1);
+			r_core_cmd_task_sync (core, cmd, 1);
 			r_cons_set_raw (1);
 			r_cons_show_cursor (false);
 			if (cmd[0]) {
@@ -291,7 +286,7 @@
 		bool use_color = core->print->flags & R_PRINT_FLAGS_COLOR;
 		(void) r_asm_disassemble (core->assembler, &asmop, buf, sizeof (ut64));
 		analop.type = -1;
-		(void)r_anal_op (core->anal, &analop, core->offset, buf, sizeof (ut64));
+		(void)r_anal_op (core->anal, &analop, core->offset, buf, sizeof (ut64), R_ANAL_OP_MASK_ESIL);
 		analopType = analop.type & R_ANAL_OP_TYPE_MASK;
 		r_cons_printf ("r2's bit editor:\n\n");
 		{
@@ -305,7 +300,7 @@
 			r_cons_printf ("shift: >> %d << %d\n", word, (asmop.size * 8) - word - 1);
 		}
 		{
-			char *op = colorize_asm_string (core, asmop.buf_asm, analopType);
+			char *op = colorize_asm_string (core, asmop.buf_asm, analopType, core->offset);
 			r_cons_printf (Color_RESET"asm: %s\n"Color_RESET, op);
 			free (op);
 		}
@@ -486,6 +481,7 @@
 	const char *pre = " ";
 	RCoreVisualTypes *vt = (RCoreVisualTypes*)p;
 	bool use_color = vt->core->print->flags & R_PRINT_FLAGS_COLOR;
+	char *color_sel = vt->core->cons->pal.prompt;
 	if (vt->optword) {
 		if (!strcmp (vt->type, "struct")) {
 			char *s = r_str_newf ("struct.%s.", vt->optword);
@@ -499,7 +495,7 @@
 					pre = ">";
 				}
 				if (use_color && *pre=='>')
-					r_cons_printf (Color_YELLOW" %s %s  %s\n"
+					r_cons_printf ("%s %s %s  %s\n", color_sel,
 						Color_RESET, pre, k+strlen (s), v);
 				else
 					r_cons_printf (" %s %s  %s\n",
@@ -520,7 +516,7 @@
 						pre = ">";
 					}
 					if (use_color && *pre=='>') {
-						r_cons_printf (Color_YELLOW" %s %s  %s\n"
+						r_cons_printf ("%s %s %s  %s\n", color_sel,
 							Color_RESET, pre, k, v);
 					} else {
 						r_cons_printf (" %s %s  %s\n",
@@ -542,8 +538,8 @@
 				pre = ">";
 			}
 			if (use_color && *pre=='>') {
-				r_cons_printf (Color_YELLOW" %s pf %3s   %s\n"
-					Color_RESET,pre, fmt, k);
+				r_cons_printf ("%s %s pf %3s   %s\n"Color_RESET,
+					color_sel, pre, fmt, k);
 			} else {
 				r_cons_printf (" %s pf %3s   %s\n",
 					pre, fmt, k);
@@ -558,7 +554,7 @@
 				pre = ">";
 			}
 			if (use_color && *pre == '>') {
-				r_cons_printf (Color_YELLOW" %s %s\n"Color_RESET,
+				r_cons_printf ("%s %s %s\n"Color_RESET, color_sel,
 					(vt->t_idx == vt->t_ctr)?
 					">":" ", k);
 			} else {
@@ -602,14 +598,17 @@
 	for (;;) {
 		r_cons_clear00 ();
 		for (i = 0; opts[i]; i++) {
-			const char *fmt = use_color
-				? (h_opt == i)
-					? Color_BGREEN"[%s] "Color_RESET
-					: Color_GREEN" %s  "Color_RESET
-				: (h_opt == i)
-					? "[%s] "
-					: " %s  ";
-			r_cons_printf (fmt, opts[i]);
+			if (use_color) {
+				if (h_opt == i) {
+					r_cons_printf ("%s[%s]%s ", core->cons->pal.call, 
+						opts[i], Color_RESET);
+				} else {
+					r_cons_printf ("%s%s%s  ", core->cons->pal.other, 
+						opts[i], Color_RESET);
+				}
+			} else {
+				r_cons_printf (h_opt == i ? "[%s] " : " %s  ", opts[i]);
+			}
 		}
 		r_cons_newline ();
 		if (optword) {
@@ -1198,6 +1197,7 @@
 		menu = 1;
 	}
 	for (;;) {
+		bool hasColor = r_config_get_i (core->config, "scr.color");
 		r_cons_clear00 ();
 
 		if (menu) {
@@ -1216,9 +1216,15 @@
 					hit = 1;
 				}
 				if ((i>=option-delta) && ((i<option+delta)||((option<delta)&&(i<(delta<<1))))) {
+					bool cur = option == i;
+					if (cur && hasColor) {
+						r_cons_printf (Color_INVERT);
+					}
 					r_cons_printf (" %c  %03d 0x%08"PFMT64x" %4"PFMT64d" %s\n",
-						(option==i)?'>':' ',
-						i, flag->offset, flag->size, flag->name);
+							cur?'>':' ', i, flag->offset, flag->size, flag->name);
+					if (cur && hasColor) {
+						r_cons_printf (Color_RESET);
+					}
 					j++;
 				}
 				i++;
@@ -1255,7 +1261,7 @@
 					}
 					if ((i >= option - delta) && ((i < option + delta)|| \
 							((option < delta) && (i < (delta << 1))))) {
-						r_cons_printf(" %c %02d %c %s\n",
+						r_cons_printf (" %c %02d %c %s\n",
 							(option==i)?'>':' ', j,
 							(i==core->flags->space_idx)?'*':' ',
 							core->flags->spaces[i]);
@@ -1303,10 +1309,13 @@
 		case 'b': // back
 		case 'Q':
 		case 'q':
-			if (menu <= 0) return true;
+			if (menu <= 0) {
+				return true;
+			}
 			menu--;
 			option = _option;
 			if (menu == 0) {
+				r_flag_space_set (core->flags, NULL);
 				// if no flagspaces, just quit
 				for (j=i=0;i<R_FLAG_SPACES_MAX;i++) {
 					if (core->flags->spaces[i]) {
@@ -1443,16 +1452,18 @@
 		case ':':
 			r_cons_show_cursor (true);
 			r_cons_set_raw (0);
-			cmd[0]='\0';
+			*cmd = 0;
 			r_line_set_prompt (":> ");
-			if (r_cons_fgets (cmd, sizeof (cmd)-1, 0, NULL) <0)
-				cmd[0]='\0';
-			//line[strlen(line)-1]='\0';
-			r_core_cmd (core, cmd, 1);
+			if (r_cons_fgets (cmd, sizeof (cmd) - 1, 0, NULL) <0) {
+				*cmd = 0;
+			}
+			cmd[sizeof (cmd) - 1] = 0;
+			r_core_cmd_task_sync (core, cmd, 1);
 			r_cons_set_raw (1);
 			r_cons_show_cursor (false);
-			if (cmd[0])
+			if (*cmd) {
 				r_cons_any_key (NULL);
+			}
 			//cons_gotoxy(0,0);
 			r_cons_clear ();
 			continue;
@@ -1460,57 +1471,72 @@
 	}
 	return true;
 }
+static bool meta_deserialize(RAnalMetaItem *it, const char *k, const char *v) {
+	if (strlen (k) < 8) {
+		return false;
+	}
+	if (memcmp (k + 6, ".0x", 3)) {
+		return false;
+	}
+	return r_meta_deserialize_val (it, k[5], sdb_atoi (k + 7), v);
+}
+
+static int meta_enumerate_cb(void *user, const char *k, const char *v) {
+	RAnalMetaUserItem *ui = user;
+	RList *list = ui->user;
+	RAnalMetaItem *it = R_NEW0 (RAnalMetaItem);
+	if (!it) {
+		return 0;
+	}
+	if (!meta_deserialize (it, k, v)) {
+		free (it);
+		goto beach;
+	}
+	if (!it->str) {
+		free (it);
+		goto beach;
+	}
+	r_list_append (list, it);
+beach:
+	return 1;
+}
 
 R_API int r_core_visual_comments (RCore *core) {
-#undef DB
-#define DB core->anal->sdb_meta
-	const char *val, *comma = NULL;
-	char *list = sdb_get (DB, "meta.C", 0);
-	char *str, *next, *cur = list;
-	char key[128], cmd[512], *p = NULL;
-	int i, ch, option = 0, delta = 7;
+	char *str;
+	char cmd[512], *p = NULL;
+	int ch, option = 0;
 	int format = 0, found = 0;
 	ut64 addr, from = 0, size = 0;
 
 	for (;;) {
 		r_cons_clear00 ();
 		r_cons_strcat ("Comments:\n");
-		i = 0;
 		found = 0;
-		if (list) {
-			for (i=0; ;i++) {
-				cur = sdb_anext (cur, &next);
-				addr = sdb_atoi (cur);
-				snprintf (key, sizeof (key)-1, "meta.C.0x%08"PFMT64x, addr);
-				val = sdb_const_get (DB, key, 0);
-				if (val)
-					comma = strchr (val, ',');
-				if (comma) {
-					str = (char *)sdb_decode (comma+1, 0);
-					if ((i>=option-delta) && ((i<option+delta)||((option<delta)&&(i<(delta<<1))))) {
-						r_str_sanitize (str);
-						if (option==i) {
-							found = 1;
-							from = addr;
-							size = 1; // XXX: remove this thing size for comments is useless d->size;
-							free (p);
-							p = str;
-							r_cons_printf ("  >  %s\n", str);
-						} else {
-							r_cons_printf ("     %s\n", str);
-							free (str);
-						}
-					} else free (str);
-				}
-				if (!next) {
-					break;
-				}
-				cur = next;
+		RList *items = r_list_newf (free);
+		RAnalMetaItem *item;
+		RListIter *iter;
+		r_meta_list_cb (core->anal, R_META_TYPE_COMMENT, 0, meta_enumerate_cb, items, UT64_MAX);
+		int i = 0;
+		r_list_foreach (items, iter, item) {
+			str = item->str;
+			addr = item->from;
+			if (option==i) {
+				found = 1;
+				from = addr;
+				size = 1; // XXX: remove this thing size for comments is useless d->size;
+				free (p);
+				p = str;
+				r_cons_printf ("  >  %s\n", str);
+			} else {
+				r_cons_printf ("     %s\n", str);
+				free (str);
 			}
+			i ++;
+			found = true;
 		}
-
 		if (!found) {
 			if (--option < 0) {
+				r_cons_any_key ("No comments");
 				break;
 			}
 			continue;
@@ -1674,7 +1700,7 @@
 				if (show) {
 					if (option == i) hit = 1;
 					if ( (i >=option-delta) && ((i<option+delta)||((option<delta)&&(i<(delta<<1))))) {
-						r_cons_printf(" %c  %s\n", (option==i)?'>':' ', old);
+						r_cons_printf (" %c  %s\n", (option == i)?'>':' ', old);
 						j++;
 					}
 					i++;
@@ -1788,7 +1814,7 @@
 			break;
 		case ':':
 			r_cons_show_cursor (true);
-			r_cons_set_raw(0);
+			r_cons_set_raw (0);
 			 {
 				char *cmd = prompt (":> ", NULL);
 				r_core_cmd (core, cmd, 1);
@@ -1845,7 +1871,7 @@
 			} else r_cons_printf ("Cannot read partition\n");
 		} else if (mode == 1) {
 			r_cons_printf ("Types:\n\n");
-			for(i=0;;i++) {
+			for (i=0;;i++) {
 				n = r_fs_partition_type_get (i);
 				if (!n) break;
 				r_cons_printf ("%s%s\n", (i==partition)?" > ":"   ", n);
@@ -2172,11 +2198,7 @@
 	ut64 a_tmp = core->offset;
 	int i = 0;
 	RListIter *iter;
-	// arguments.
-	RList* list2 = r_anal_var_list (core->anal, fcn, true);
-	// variables.
-	RList* list = r_anal_var_list (core->anal, fcn, false);
-	r_list_join (list, list2);
+	RList *list = r_anal_var_all_list (core->anal, fcn);
 	RAnalVar* var;
 
 	r_list_foreach (list, iter, var) {
@@ -2189,7 +2211,6 @@
 		++i;
 	}
 	r_list_free (list);
-	r_list_free (list2);
 }
 
 // In visual mode, display function list
@@ -2204,6 +2225,9 @@
 	// Adjust the windows size automaticaly
 	(void)r_cons_get_size (&window);
 	window -= 8; // Size of printed things
+	bool color = r_config_get_i (core->config, "scr.color");
+	const char *color_addr = core->cons->pal.offset;
+	const char *color_fcn = core->cons->pal.fname;
 
 	r_list_foreach (core->anal->fcns, iter, fcn) {
 		if (i >= wdelta) {
@@ -2214,11 +2238,20 @@
 			if (idx == i) {
 				addr = fcn->addr;
 			}
-			if (show)
-				r_cons_printf ("%c%c 0x%08"PFMT64x" %4d %s\n",
-					(seek == fcn->addr)?'>':' ',
-					(idx==i)?'*':' ',
-					fcn->addr, r_anal_fcn_realsize (fcn), fcn->name);
+			if (show) {
+				if (color) {
+					r_cons_printf ("%c%c %s0x%08"PFMT64x"" Color_RESET" %4d %s%s"Color_RESET"\n",
+							(seek == fcn->addr)?'>':' ',
+							(idx==i)?'*':' ',
+							color_addr, fcn->addr, r_anal_fcn_realsize (fcn),
+							color_fcn, fcn->name);
+				} else {
+					r_cons_printf ("%c%c 0x%08"PFMT64x" %4d %s\n",
+							(seek == fcn->addr)?'>':' ',
+							(idx==i)?'*':' ',
+							fcn->addr, r_anal_fcn_realsize (fcn), fcn->name);
+				}
+			}
 		}
 		i++;
 	}
@@ -2233,11 +2266,7 @@
 	int window;
 	int wdelta = (idx > 5) ? idx - 5 : 0;
 	RListIter *iter;
-	// arguments.
-	RList* list2 = r_anal_var_list (core->anal, fcn, true);
-	// variables.
-	RList* list = r_anal_var_list (core->anal, fcn, false);
-	r_list_join (list, list2);
+	RList *list = r_anal_var_all_list (core->anal, fcn);
 	RAnalVar* var;
 	// Adjust the window size automatically.
 	(void)r_cons_get_size (&window);
@@ -2259,7 +2288,7 @@
 			}
 			if (show) {
 				r_cons_printf ("%s%s %s %s @ %s%s0x%x\n",
-						i == *vindex ? "* ":"",
+						i == *vindex ? "* ":"  ",
 						var->kind=='v'?"var":"arg",
 						var->type, var->name,
 						core->anal->reg->name[R_REG_NAME_BP],
@@ -2270,16 +2299,20 @@
 		++i;
 	}
 	r_list_free (list);
-	r_list_free (list2);
 	return addr;
 }
 
 static int level = 0;
 static ut64 addr = 0;
+static st64 delta = 0;
 static int option = 0;
 static int variable_option = 0;
 static int printMode = 0;
-#define lastPrintMode 5
+static bool selectPanel = false;
+#define lastPrintMode 6
+static const char *cmd, *printCmds[lastPrintMode] = {
+	"pdf", "pd $r", "afi", "pdsf", "pdc", "pdr"
+};
 
 static void r_core_visual_anal_refresh_column (RCore *core, int colpos) {
 	const ut64 addr = (level != 0 && level != 1)
@@ -2289,15 +2322,12 @@
 	int h, w = r_cons_get_size (&h);
 	// int sz = (fcn)? R_MIN (r_anal_fcn_size (fcn), h * 15) : 16; // max instr is 15 bytes.
 
-	const char *cmd, *printCmds[lastPrintMode] = {
-		"pdf", "afi", "pds", "pdc", "pdr"
-	};
 	if (printMode > 0 && printMode < lastPrintMode) {
 		cmd = printCmds[printMode];
 	} else {
 		cmd = printCmds[printMode = 0];
 	}
-	char *cmdf = r_str_newf ("%s @ 0x%"PFMT64x, cmd, addr);
+	char *cmdf = r_str_newf ("%s @ 0x%"PFMT64x, cmd, addr + delta);
 	if (!cmdf) {
 		return;
 	}
@@ -2305,7 +2335,7 @@
 	if (output) {
 		// 'h - 2' because we have two new lines in r_cons_printf
 		char *out = r_str_ansi_crop (output, 0, 0, w - colpos, h - 2);
-		r_cons_printf ("Visual code review (%s)\n%s\n", cmd, out);
+		r_cons_printf ("\n%s\n", out);
 		free (out);
 		R_FREE (output);
 	}
@@ -2313,12 +2343,14 @@
 }
 
 static ut64 r_core_visual_anal_refresh (RCore *core) {
-	ut64 addr;
-	char old[1024];
-	int cols = r_cons_get_size (NULL);
+	eprintf("r_core_visual_anal_refresh\n");
 	if (!core) {
 		return 0LL;
 	}
+	ut64 addr;
+	char old[1024];
+	bool color = r_config_get_i (core->config, "scr.color");
+	int cols = r_cons_get_size (NULL);
 	old[0] = '\0';
 	addr = core->offset;
 	cols -= 50;
@@ -2327,7 +2359,6 @@
 	}
 
 	r_cons_clear00 ();
-	r_cons_flush ();
 	r_core_visual_anal_refresh_column (core, cols);
 	if (cols > 30) {
 		r_cons_column (cols);
@@ -2335,10 +2366,21 @@
 	switch (level) {
 	// Show functions list help in visual mode
 	case 0:
-		r_cons_printf ("-[ functions ]---------------- \n"
-			"(a) add     (x)xrefs     (q)quit \n"
-			"(r) rename  (c)calls     (g)go \n"
-			"(d) delete  (v)variables (?)help \n");
+		if (color) {
+			r_cons_strcat (core->cons->pal.prompt);
+		}
+		if (selectPanel) {
+			r_cons_printf ("-- functions -----------------[ %s ]-->>", printCmds[printMode]);
+		} else {
+			r_cons_printf ("-[ functions ]----------------- %s ---", printCmds[printMode]);
+		}
+		if (color) {
+			r_cons_strcat ("\n" Color_RESET);
+		}
+		r_cons_printf (
+			"(a) add     (x) xrefs  (q) quit  (jk) next/prev\n"
+			"(r) rename  (c) calls  (g) go    (tab) column\n"
+			"(d) delete  (v) vars   (?) help  (:)  enter cmd\n");
 		addr = var_functions_show (core, option, 1);
 		break;
 	case 1:
@@ -2354,7 +2396,7 @@
 		r_cons_printf ("Press 'q' to quit call refs\n");
 		r_cons_printf ("-[ calls ]----------------------- 0x%08"PFMT64x" (TODO)\n", addr);
 		// TODO: filter only the callrefs. but we cant grep here
-		sprintf(old, "afi @ 0x%08"PFMT64x, addr);
+		sprintf (old, "afi @ 0x%08"PFMT64x, addr);
 		r_core_cmd0 (core, old);
 		break;
 	case 3:
@@ -2369,20 +2411,29 @@
 	return addr;
 }
 
+static void r_core_visual_anal_refresh_oneshot (RCore *core) {
+	r_core_task_enqueue_oneshot (core, (RCoreTaskOneShot) r_core_visual_anal_refresh, core);
+}
+
 /* Like emenu but for real */
 R_API void r_core_visual_anal(RCore *core) {
 	char old[218];
-	int ch, _option = 0;
-	int nfcns = r_list_length (core->anal->fcns);
+	int nfcns, ch, _option = 0;
+
 	RConsEvent olde = core->cons->event_resize;
-	core->cons->event_resize = (RConsEvent) r_core_visual_anal_refresh;
-	core->cons->event_data = (void *) core;
+	void *olde_user = core->cons->event_data;
+
+	core->cons->event_resize = NULL; // avoid running old event with new data
+	core->cons->event_data = core;
+	core->cons->event_resize = (RConsEvent) r_core_visual_anal_refresh_oneshot;
+
 	level = 0;
 	addr = core->offset;
 
 	int asmbytes = r_config_get_i (core->config, "asm.bytes");
 	r_config_set_i (core->config, "asm.bytes", 0);
 	for (;;) {
+		nfcns = r_list_length (core->anal->fcns);
 		addr = r_core_visual_anal_refresh (core);
 		ch = r_cons_readchar ();
 		if (ch == 4 || ch == -1) {
@@ -2395,22 +2446,36 @@
 		ch = r_cons_arrow_to_hjkl (ch); // get ESC+char, return 'hjkl' char
 		switch (ch) {
 		case '?':
-			r_cons_clear ();
+			r_cons_clear00 ();
 			r_cons_printf (
-				"Usage: Vv [\n"
+				"Usage: vv\n"
 				"Actions supported:\n"
 				" functions: Add, Modify, Delete, Xrefs Calls Vars\n"
 				" variables: Add, Modify, Delete\n"
-				"Moving:\n"
-				" j,k     select next/prev item\n"
-				" J,K     scroll next/prev page\n"
+				"Keys:\n"
+				" j,k     select next/prev item or scroll if tab pressed\n"
+				" J,K     scroll next/prev page \"\"\n"
 				" h,q     go back, quit\n"
 				" p,P     switch next/prev print mode\n"
-				" l,ret   enter, function\n"
+				" v       view selected function arguments and variables\n"
+				" x       see xrefs to the selected function\n"
+				" tab     toggle disasm column selection (to scroll in code)\n"
+				" !       run 'afls' to sort all functions by address\n"
+				" .       seek to current function address\n"
+				" :       run r2 commands\n"
+				" _       hud mode. same as: s $(afl~...)\n"
+				" enter   enter function view (variables), xrefs\n"
 			);
 			r_cons_flush ();
 			r_cons_any_key (NULL);
 			break;
+		case 9:
+			selectPanel = !selectPanel;
+			if (!selectPanel) {
+				delta = 0;
+				printMode = 0;
+			}
+			break;
 		case ':':
 			r_core_visual_prompt (core);
 			r_cons_any_key (NULL);
@@ -2474,6 +2539,12 @@
 				r_cons_show_cursor (false);
 			}
 			break;
+		case '.':
+			delta = 0;
+			break;
+		case 'R':
+			r_core_cmd0 (core, "ecn");
+			break;
 		case 'p':
 			printMode ++;
 			break;
@@ -2487,43 +2558,58 @@
 		case 'd':
 			switch (level) {
 			case 0:
-				eprintf ("TODO\n");
-				//data_del(addr, DATA_FUN, 0);
-				// XXX correcly remove all the data contained inside the size of the function
-				//flag_remove_at(addr);
+				r_core_cmdf (core, "af-0x%"PFMT64x, addr);
 				break;
 			}
 			break;
 		case 'x': level = 3; break;
 		case 'c': level = 2; break;
 		case 'v': level = 1; variable_option = 0; break;
+		case '_':
+			r_core_cmd0 (core, "s $(afl~...)");
+			break;
 		case 'j':
-			{
+			if (selectPanel) {
+				printMode = 1;
+				delta += 16;
+			} else {
+				delta = 0;
 				switch (level) {
-					case 1:
-						variable_option++;
-						break;
-					default:
-						option++;
-						if (option >= nfcns) --option;
+				case 1:
+					variable_option++;
+					break;
+				default:
+					option++;
+					if (option >= nfcns) --option;
+					break;
 				}
 			}
 			break;
+		case '!':
+			r_core_cmd0 (core, "afls");
+			break;
 		case 'k':
-			{
+			if (selectPanel) {
+				printMode = 1;
+				delta -= 16;
+			} else {
+				delta = 0;
 				switch (level) {
-					case 1:
-						variable_option = (variable_option<=0)? 0: variable_option-1;
-						break;
-					default:
-						option = (option<=0)? 0: option-1;
-						break;
+				case 1:
+					variable_option = (variable_option<=0)? 0: variable_option-1;
+					break;
+				default:
+					option = (option<=0)? 0: option-1;
+					break;
 				}
 			}
 
 			break;
 		case 'J':
-			{
+			if (selectPanel) {
+				printMode = 1;
+				delta += 40;
+			} else {
 				int rows = 0;
 				r_cons_get_size (&rows);
 				option += (rows - 5);
@@ -2533,7 +2619,10 @@
 			}
 			break;
 		case 'K':
-			{
+			if (selectPanel) {
+				printMode = 1;
+				delta -= 40;
+			} else {
 				int rows = 0;
 				r_cons_get_size (&rows);
 				option -= (rows - 5);
@@ -2546,6 +2635,12 @@
 			r_core_seek (core, addr, SEEK_SET);
 			goto beach;
 		case ' ':
+		case '\r':
+		case '\n':
+			level = 0;
+			r_core_seek (core, addr, SEEK_SET);
+			goto beach;
+			break;
 		case 'l':
 			level = 1;
 			_option = option;
@@ -2565,6 +2660,8 @@
 		}
 	}
 beach:
+	core->cons->event_resize = NULL; // avoid running old event with new data
+	core->cons->event_data = olde_user;
 	core->cons->event_resize = olde;
 	level = 0;
 	r_config_set_i (core->config, "asm.bytes", asmbytes);
@@ -2575,21 +2672,19 @@
 	ut64 next = UT64_MAX;
 	if (strstr (type, "opc")) {
 		RAnalOp aop;
-		if (r_anal_op (core->anal, &aop, core->offset, core->block, core->blocksize)) {
+		if (r_anal_op (core->anal, &aop, core->offset, core->block, core->blocksize, R_ANAL_OP_MASK_BASIC)) {
 			next = core->offset + aop.size;
 		} else {
 			eprintf ("Invalid opcode\n");
 		}
-	} else
-	if (strstr (type, "fun")) {
+	} else if (strstr (type, "fun")) {
 		RAnalFunction *fcni;
 		r_list_foreach (core->anal->fcns, iter, fcni) {
 			if (fcni->addr < next && fcni->addr > core->offset) {
 				next = fcni->addr;
 			}
 		}
-	} else
-	if (strstr (type, "hit")) {
+	} else if (strstr (type, "hit")) {
 		const char *pfx = r_config_get (core->config, "search.prefix");
 		RFlagItem *flag;
 		r_list_foreach (core->flags->flags, iter, flag) {
@@ -2714,7 +2809,7 @@
 		h = 0;
 		r_cons_clear00 ();
 	} else {
-		r_cons_gotoxy (0, h);
+		r_cons_gotoxy (0, 3);
 	}
 	const char *lines[] = { ""
 		,"[Vd]- Define current block as:"
@@ -2739,6 +2834,7 @@
 		," s    set string"
 		," S    set strings in current block"
 		," u    undefine metadata here"
+		," v    rename variable at offset that matches some hex digits"
 		," x    find xrefs to current address (./r)"
 		," w    set as 32bit word"
 		," W    set as 64bit word"
@@ -2819,7 +2915,7 @@
 		{
 			char *man = NULL;
 			/* check for manpage */
-			RAnalOp *op = r_core_anal_op (core, off);
+			RAnalOp *op = r_core_anal_op (core, off, R_ANAL_OP_MASK_BASIC);
 			if (op) {
 				if (op->jump != UT64_MAX) {
 					RFlagItem *item = r_flag_get_i (core->flags, op->jump);
@@ -2834,8 +2930,8 @@
 			if (man) {
 				char *p = strstr (man, "INODE");
 				if (p) *p = 0;
-				r_cons_clear();
-				r_cons_flush();
+				r_cons_clear ();
+				r_cons_flush ();
 				r_sys_cmdf ("man %s", man);
 				free (man);
 			}
@@ -2852,27 +2948,19 @@
 		}
 		// TODO: get the aligned instruction even if the cursor is in the middle of it.
 		r_anal_op (core->anal, &op, off,
-			core->block + off - core->offset, 32);
+			core->block + off - core->offset, 32, R_ANAL_OP_MASK_BASIC);
 
 		tgt_addr = op.jump != UT64_MAX ? op.jump : op.ptr;
 		if (op.var) {
 //			q = r_str_newf ("?i Rename variable %s to;afvn %s `?y`", op.var->name, op.var->name);
 			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, off, 0);
 			if (fcn) {
-				RAnalVar *bar = r_anal_var_get_byname (core->anal, fcn, op.var->name);
-				if (!bar) {
-					bar = r_anal_var_get_byname (core->anal, fcn, op.var->name);
-					if (!bar) {
-						bar = r_anal_var_get_byname (core->anal, fcn, op.var->name);
-					}
-				}
+				RAnalVar *bar = r_anal_var_get_byname (core->anal, fcn->addr, op.var->name);
 				if (bar) {
-					char *newname = r_cons_input (sdb_fmt (0, "New variable name for '%s': ", bar->name));
-					if (newname) {
-						if (*newname) {
-							r_anal_var_rename (core->anal, fcn->addr, bar->scope,
-								bar->kind, bar->name, newname);
-						}
+					char *newname = r_cons_input (sdb_fmt ("New variable name for '%s': ", bar->name));
+					if (newname && *newname) {
+						r_anal_var_rename (core->anal, fcn->addr, bar->scope,
+								bar->kind, bar->name, newname, true);
 						free (newname);
 					}
 				} else {
@@ -2955,9 +3043,9 @@
 			RAnalOp op;
 			ut64 size;
 			if (r_anal_op (core->anal, &op, off, core->block+delta,
-					core->blocksize-delta)) {
+					core->blocksize-delta, R_ANAL_OP_MASK_BASIC)) {
 				size = off - fcn->addr + op.size;
-				r_anal_fcn_resize (fcn, size);
+				r_anal_fcn_resize (core->anal, fcn, size);
 			}
 		}
 		}
@@ -3020,7 +3108,7 @@
 						   (const char *)name + 4);
 			}
 			r_name_filter (name, n + 10);
-			r_flag_set (core->flags, name, off+ntotal, n);
+			r_flag_set (core->flags, name, off + ntotal, n);
 			free (name);
 			if (is_wide) {
 				ntotal += n * 2 - 1;
@@ -3090,7 +3178,7 @@
 			int funsize = 0;
 			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, core->offset, 0);
 			if (fcn) {
-				r_anal_fcn_resize (fcn, core->offset - fcn->addr);
+				r_anal_fcn_resize (core->anal, fcn, core->offset - fcn->addr);
 			}
 			//int depth = r_config_get_i (core->config, "anal.depth");
 			if (core->print->cur_enabled) {
@@ -3104,10 +3192,80 @@
 			r_cons_break_pop ();
 			if (funsize) {
 				RAnalFunction *f = r_anal_get_fcn_in (core->anal, off, -1);
-				r_anal_fcn_set_size (f, funsize);
+				r_anal_fcn_set_size (core->anal, f, funsize);
 			}
 		}
 		break;
+        case 'v':
+        {
+		RAnalOp op;
+		ut64 N;
+		char *endptr = NULL;
+		char *end_off = r_cons_input ("Last hexadecimal digits of instruction: ");
+		if (end_off) {
+			N = strtoull (end_off, &endptr, 16);
+		}
+		if (!end_off || end_off == endptr) {
+			eprintf ("Invalid numeric input\n");
+			r_cons_any_key (NULL);
+			free (end_off);
+			break;
+		}
+		free (end_off);
+
+		ut64 incr = 0x10;
+		ut64 tmp_N = N >> 4;
+		while (tmp_N > 0) {
+			tmp_N = tmp_N >> 4;
+			incr = incr << 4;
+		}
+		ut64 mask = incr - 1;
+
+		ut64 start_off;
+		if ((off & mask) <= N) {
+			start_off = (off & ~mask) ^ N;
+		} else {
+			start_off = ((off & ~mask) ^ incr) ^ N;
+		}
+
+		ut64 try_off;
+		bool found = false;
+		for (try_off = start_off; try_off < start_off + incr*16; try_off += incr) {
+			r_anal_op (core->anal, &op, try_off,
+				core->block + try_off - core->offset, 32, R_ANAL_OP_MASK_ALL);
+			if (op.var) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found) {
+			RAnalFunction *fcn = r_anal_get_fcn_in (core->anal, off, 0);
+			if (fcn) {
+				RAnalVar *bar = r_anal_var_get_byname (core->anal, fcn->addr, op.var->name);
+				if (bar) {
+					char *newname = r_cons_input (sdb_fmt ("New variable name for '%s': ", bar->name));
+					if (newname && *newname) {
+						r_anal_var_rename (core->anal, fcn->addr, bar->scope,
+								bar->kind, bar->name, newname, true);
+						free (newname);
+					}
+				} else {
+					eprintf ("Cannot find variable\n");
+					r_cons_any_key (NULL);
+				}
+			} else {
+				eprintf ("Cannot find function\n");
+				r_cons_any_key (NULL);
+			}
+		} else {
+			eprintf ("Cannot find instruction with a variable\n");
+			r_cons_any_key (NULL);
+		}
+
+		r_anal_op_fini (&op);
+		break;
+        }
 	case 'Q':
 	case 'q':
 	default:
@@ -3124,62 +3282,75 @@
 
 R_API void r_core_visual_colors(RCore *core) {
 	char color[32], cstr[32];
-	const char *k, *kol;
 	int ch, opt = 0, oopt = -1;
-	ut8 r, g, b;
+	const char *k;
+	RColor rcolor;
 
-	r = g = b = 0;
-	kol = r_cons_pal_get_color (opt);
-	r_cons_rgb_parse (kol, &r, &g, &b, NULL);
+	rcolor = r_cons_pal_get_i (opt);
 	for (;;) {
 		r_cons_clear ();
-		k = r_cons_pal_get_i (opt);
+		k = r_cons_pal_get_name (opt);
 		if (!k) {
 			opt = 0;
-			k = r_cons_pal_get_i (opt);
+			k = r_cons_pal_get_name (opt);
 		}
 		r_cons_gotoxy (0, 0);
-		r_cons_rgb_str (cstr, r, g, b, 0);
-		r&=0xf;
-		g&=0xf;
-		b&=0xf;
-		sprintf (color, "rgb:%x%x%x", r, g, b);
-//r_cons_printf ("COLOR%s(%sXXX)"Color_RESET"\n", kol, kol?kol+1:"");
-		r_cons_printf ("# Colorscheme %d - Use '.' and ':' to randomize palette\n"
-			"# Press 'rRgGbB', 'jk' or 'q'\nec %s %s   # %d (%s)\n",
+		r_cons_rgb_str (cstr, sizeof (cstr), &rcolor);
+		if (r_cons_singleton ()->color < COLOR_MODE_16M) {
+			rcolor.r &= 0xf;
+			rcolor.g &= 0xf;
+			rcolor.b &= 0xf;
+		}
+		sprintf (color, "rgb:%x%x%x", rcolor.r, rcolor.g, rcolor.b);
+		r_cons_printf ("# Colorscheme %d - Use '.' to randomize current color and ':' to randomize palette\n"
+			"# Press 'rRgGbB', 'jk' or 'q'\nec %s %s   # %d (\\x1b%s)\n",
 			opt, k, color, atoi (cstr+7), cstr+1);
 		r_core_cmdf (core, "ec %s %s", k, color);
 		char * res = r_core_cmd_str (core, "pd $r");
 		int h, w = r_cons_get_size (&h);
 		char *body = r_str_ansi_crop (res, 0, 0, w, h - 4);
-		r_cons_printf("%s", body);
+		if (body) {
+			r_cons_printf ("%s", body);
+		}
 		r_cons_flush ();
 		ch = r_cons_readchar ();
 		ch = r_cons_arrow_to_hjkl (ch);
 		switch (ch) {
 #define CASE_RGB(x,X,y) \
-	case x:y--;if(y>0x7f)y=0;break;\
-	case X:y++;if(y>15)y=15;break;
-		CASE_RGB ('R','r',r);
-		CASE_RGB ('G','g',g);
-		CASE_RGB ('B','b',b);
+	case x:if (y > 0x00) { y--; } break;\
+	case X:if (y < 0xff) { y++; } break;
+		CASE_RGB ('R','r',rcolor.r);
+		CASE_RGB ('G','g',rcolor.g);
+		CASE_RGB ('B','b',rcolor.b);
 		case 'Q':
-		case 'q': return;
-		case 'k': opt--; break;
-		case 'j': opt++; break;
-		case 'K': opt=0; break;
-		case 'J': opt=0; break; // XXX must go to end
-		case ':': r_cons_pal_random (); break;
+		case 'q':
+			free (body);
+			return;
+		case 'k':
+			opt--;
+			break;
+		case 'j':
+			opt++;
+			break;
+		case 'K':
+			opt = 0;
+			break;
+		case 'J':
+			opt = r_cons_pal_len () - 1;
+			break;
+		case ':':
+			r_cons_pal_random ();
+			break;
 		case '.':
-			r = r_num_rand (0xf);
-			g = r_num_rand (0xf);
-			b = r_num_rand (0xf);
+			rcolor.r = r_num_rand (0xff);
+			rcolor.g = r_num_rand (0xff);
+			rcolor.b = r_num_rand (0xff);
 			break;
 		}
 		if (opt != oopt) {
-			kol = r_cons_pal_get_color (opt);
-			r_cons_rgb_parse (kol, &r, &g, &b, NULL);
+			rcolor = r_cons_pal_get_i (opt);
 			oopt = opt;
 		}
+		free (body);
 	}
 }
diff -Nru radare2-2.3.0+dfsg/libr/core/yank.c radare2-2.8.0+dfsg/libr/core/yank.c
--- radare2-2.3.0+dfsg/libr/core/yank.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/core/yank.c	2018-08-07 14:12:36.000000000 +0000
@@ -143,7 +143,7 @@
 	if (addr != core->offset) {
 		r_core_seek (core, addr, 1);
 	}
-	r_core_read_at (core, addr, buf, len);
+	r_io_read_at (core->io, addr, buf, len);
 	r_core_yank_set (core, addr, buf, len);
 	if (curseek != addr) {
 		r_core_seek (core, curseek, 1);
@@ -169,7 +169,7 @@
 		return false;
 	}
 	buf[core->blocksize] = 0;
-	r_core_read_at (core, addr, buf, core->blocksize);
+	r_io_read_at (core->io, addr, buf, core->blocksize);
 	if (maxlen == 0) {
 		// Don't use strnlen, see: http://sourceforge.net/p/mingw/bugs/1912/
 		maxlen = r_str_nlen ((const char *) buf, core->blocksize);
diff -Nru radare2-2.3.0+dfsg/libr/crypto/meson.build radare2-2.8.0+dfsg/libr/crypto/meson.build
--- radare2-2.3.0+dfsg/libr/crypto/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/crypto/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,28 +1,45 @@
-files=[
-	'crypto.c',
-	'p/crypto_aes.c',
-	'p/crypto_aes_algo.c',
-	'p/crypto_aes_cbc.c',
-	'p/crypto_base64.c',
-	'p/crypto_base91.c',
-	'p/crypto_blowfish.c',
-	'p/crypto_cps2.c',
-	'p/crypto_des.c',
-	'p/crypto_punycode.c',
-	'p/crypto_rc2.c',
-	'p/crypto_rc4.c',
-	'p/crypto_rc6.c',
-	'p/crypto_rol.c',
-	'p/crypto_ror.c',
-	'p/crypto_rot.c',
-	'p/crypto_xor.c',
-	'p/crypto_serpent.c',
-	'p/crypto_serpent_algo.c',
+files = [
+  'crypto.c',
+  'p/crypto_aes.c',
+  'p/crypto_aes_algo.c',
+  'p/crypto_aes_cbc.c',
+  'p/crypto_base64.c',
+  'p/crypto_base91.c',
+  'p/crypto_blowfish.c',
+  'p/crypto_cps2.c',
+  'p/crypto_des.c',
+  'p/crypto_punycode.c',
+  'p/crypto_rc2.c',
+  'p/crypto_rc4.c',
+  'p/crypto_rc6.c',
+  'p/crypto_rol.c',
+  'p/crypto_ror.c',
+  'p/crypto_rot.c',
+  'p/crypto_serpent.c',
+  'p/crypto_serpent_algo.c',
+  'p/crypto_xor.c',
 ]
 
 r_crypto = library('r_crypto', files,
-	include_directories: [platform_inc],
-	link_with: [r_util],
-	c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-	install: true
+  include_directories: [platform_inc],
+  dependencies: [r_util_dep],
+  c_args: ['-DCORELIB=1'],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_crypto_dep = declare_dependency(link_with: r_crypto,
+                                  include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_crypto],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_crypto',
+  filebase: 'r_crypto',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/crypto/p/crypto_ror.c radare2-2.8.0+dfsg/libr/crypto/p/crypto_ror.c
--- radare2-2.3.0+dfsg/libr/crypto/p/crypto_ror.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/crypto/p/crypto_ror.c	2018-08-07 14:12:36.000000000 +0000
@@ -49,7 +49,9 @@
 		return false;
 	}
 	ut8 *obuf = calloc (1, len);
-	if (!obuf) return false;
+	if (!obuf) {
+		return false;
+	}
 	ror_crypt (&st, buf, obuf, len);
 	r_crypto_append (cry, obuf, len);
 	free (obuf);
diff -Nru radare2-2.3.0+dfsg/libr/debug/debug.c radare2-2.8.0+dfsg/libr/debug/debug.c
--- radare2-2.3.0+dfsg/libr/debug/debug.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/debug.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake, jduck, TheLemonMan, saucec0de */
+/* radare - LGPL - Copyright 2009-2018 - pancake, jduck, TheLemonMan, saucec0de */
 
 #include <r_debug.h>
 #include <r_core.h>
@@ -20,15 +20,26 @@
 	return dbg->h->info (dbg, arg);
 }
 
-R_API void r_debug_info_free (RDebugInfo *rdi) {
+R_API void r_debug_info_free(RDebugInfo *rdi) {
 	if (rdi) {
 		free (rdi->cwd);
 		free (rdi->exe);
 		free (rdi->cmdline);
 		free (rdi->libname);
 		free (rdi->usr);
+		free (rdi);
+	}
+}
+
+R_API void r_debug_bp_update(RDebug *dbg) {
+	/* update all bp->addr if they are named bps */
+	RBreakpointItem *bp;
+	RListIter *iter;
+	r_list_foreach (dbg->bp->bps, iter, bp) {
+		if (bp->expr) {
+			bp->addr = dbg->corebind.numGet (dbg->corebind.core, bp->expr);
+		}
 	}
-	free (rdi);
 }
 
 /*
@@ -60,6 +71,7 @@
 	 * this is necessary because while stopped we don't want any breakpoints in
 	 * the code messing up our analysis.
 	 */
+	r_debug_bp_update (dbg);
 	if (!r_bp_restore (dbg->bp, false)) { // unset sw breakpoints
 		return false;
 	}
@@ -81,6 +93,40 @@
 # else
 	int pc_off = dbg->bpsize;
 	/* see if we really have a breakpoint here... */
+	if (!dbg->pc_at_bp_set) {
+		b = r_bp_get_at (dbg->bp, pc - dbg->bpsize);
+		if (!b) { /* we don't. nothing left to do */
+			/* Some targets set pc to breakpoint */
+			b = r_bp_get_at (dbg->bp, pc);
+			if (!b) {
+				/* Couldn't find the break point. Nothing more to do... */
+				return true;
+			}
+			else {
+				dbg->pc_at_bp_set = true;
+				dbg->pc_at_bp = true;
+			}
+		} else {
+			dbg->pc_at_bp_set = true;
+			dbg->pc_at_bp = false;
+		}
+	}
+
+	if (!dbg->pc_at_bp_set) {
+		eprintf ("failed to determine position of pc after breakpoint");
+	}
+
+	if (dbg->pc_at_bp) {
+		pc_off = 0;
+		b = r_bp_get_at (dbg->bp, pc);
+	} else {
+		b = r_bp_get_at (dbg->bp, pc - dbg->bpsize);
+	}
+
+	if (!b) {
+		return true;
+	}
+
 	b = r_bp_get_at (dbg->bp, pc - dbg->bpsize);
 	if (!b) { /* we don't. nothing left to do */
 		/* Some targets set pc to breakpoint */
@@ -118,8 +164,10 @@
 
 	/* inform the user of what happened */
 	if (dbg->hitinfo) {
-		eprintf ("hit %spoint at: %"PFMT64x "\n",
-				b->trace ? "trace" : "break", pc);
+		//eprintf ("hit %spoint at: %"PFMT64x "\n",
+		//		b->trace ? "trace" : "break", pc);
+		r_cons_printf ("hit %spoint at: %"PFMT64x "\n",
+			b->trace ? "trace" : "break", pc);
 	}
 
 	/* now that we've cleaned up after the breakpoint, call the other
@@ -135,9 +183,9 @@
 static int r_debug_bps_enable(RDebug *dbg) {
 	/* restore all sw breakpoints. we are about to step/continue so these need
 	 * to be in place. */
-	if (!r_bp_restore (dbg->bp, true))
+	if (!r_bp_restore (dbg->bp, true)) {
 		return false;
-
+	}
 	/* done recoiling... */
 	dbg->recoil_mode = R_DBG_RECOIL_NONE;
 	return true;
@@ -207,7 +255,6 @@
 	const char *module_name = module;
 	RListIter *iter;
 	RDebugMap *map;
-
 	if (!addr && module) {
 		bool detect_module, valid = false;
 		int perm;
@@ -323,6 +370,8 @@
 	/* TODO: needs a redesign? */
 	dbg->maps = r_debug_map_list_new ();
 	dbg->maps_user = r_debug_map_list_new ();
+	dbg->q_regs = NULL;
+	dbg->call_frames = NULL;
 	r_debug_signal_init (dbg);
 	if (hard) {
 		dbg->bp = r_bp_new ();
@@ -332,13 +381,13 @@
 	return dbg;
 }
 
-static int free_tracenodes_entry (RDebug *dbg, const char *k, const char *v) {
+static int free_tracenodes_entry(RDebug *dbg, const char *k, const char *v) {
 	ut64 v_num = r_num_get (NULL, v);
 	free((void *)(size_t)v_num);
 	return true;
 }
 
-R_API void r_debug_tracenodes_reset (RDebug *dbg) {
+R_API void r_debug_tracenodes_reset(RDebug *dbg) {
 	sdb_foreach (dbg->tracenodes, (SdbForeachCallback)free_tracenodes_entry, dbg);
 	sdb_reset (dbg->tracenodes);
 }
@@ -360,6 +409,7 @@
 		sdb_foreach (dbg->tracenodes, (SdbForeachCallback)free_tracenodes_entry, dbg);
 		sdb_free (dbg->tracenodes);
 		r_list_free (dbg->plugins);
+		r_list_free (dbg->call_frames);
 		free (dbg->btalgo);
 		r_debug_trace_free (dbg->trace);
 		dbg->trace = NULL;
@@ -535,7 +585,7 @@
 	if (dbg->h && dbg->h->select && !dbg->h->select (pid, tid))
 		return false;
 
-	r_io_system (dbg->iob.io, sdb_fmt (0, "pid %d", pid));
+	r_io_system (dbg->iob.io, sdb_fmt ("pid %d", pid));
 
 	dbg->pid = pid;
 	dbg->tid = tid;
@@ -638,6 +688,7 @@
 			/* get the program coounter */
 			pc_ri = r_reg_get (dbg->reg, dbg->reg->name[R_REG_NAME_PC], -1);
 			if (!pc_ri) { /* couldn't find PC?! */
+				eprintf ("Couldn't find PC!\n");
 				return R_DEBUG_REASON_ERROR;
 			}
 
@@ -708,7 +759,7 @@
 	if (!dbg->iob.read_at (dbg->iob.io, pc, buf, sizeof (buf))) {
 		return false;
 	}
-	if (!r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf))) {
+	if (!r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC)) {
 		return false;
 	}
 	if (op.type == R_ANAL_OP_TYPE_ILL) {
@@ -892,7 +943,7 @@
 			dbg->iob.read_at (dbg->iob.io, buf_pc, buf, sizeof (buf));
 		}
 		// Analyze the opcode
-		if (!r_anal_op (dbg->anal, &op, pc, buf + (pc - buf_pc), sizeof (buf) - (pc - buf_pc))) {
+		if (!r_anal_op (dbg->anal, &op, pc, buf + (pc - buf_pc), sizeof (buf) - (pc - buf_pc), R_ANAL_OP_MASK_BASIC)) {
 			eprintf ("Decode error at %"PFMT64x"\n", pc);
 			return steps_taken;
 		}
@@ -923,9 +974,44 @@
 	return steps_taken;
 }
 
+static ut64 get_prev_instr(RDebug *dbg, ut64 from, ut64 to) {
+	int i, ret, bsize = 256;
+	int inc;
+	ut64 prev, at;
+	RAnalOp aop = {0};
+	const int mininstrsz = r_anal_archinfo (dbg->anal, R_ANAL_ARCHINFO_MIN_OP_SIZE);
+	const int minopcode = R_MAX (1, mininstrsz);
+	ut8 *buf = malloc (bsize);
+
+	if (!buf) {
+		eprintf ("Cannot allocate %d byte(s)\n", bsize);
+		free (buf);
+		return 0;
+	}
+	for (i = 0, at = from; at < to; at++, i++) {
+		if (i >= (bsize - 32)) {
+			i = 0;
+		}
+		if (!i) {
+			dbg->iob.read_at (dbg->iob.io, at, buf, bsize);
+		}
+		ret = r_anal_op (dbg->anal, &aop, at, buf + i, bsize - i, R_ANAL_OP_MASK_BASIC);
+		inc = ret - 1;
+		if (inc < 0) {
+			inc = minopcode;
+		}
+		prev = at;
+		i += inc;
+		at += inc;
+		r_anal_op_fini (&aop);
+	}
+	free (buf);
+	return prev;
+}
+
 // TODO: add <int steps> parameter for repetition like step() and step_over() do and change return type to int
 R_API bool r_debug_step_back(RDebug *dbg) {
-	ut64 pc, prev = 0, end, cnt = 0;
+	ut64 pc, prev = 0, end;
 	RDebugSession *before;
 
 	if (r_debug_is_dead (dbg)) {
@@ -944,6 +1030,8 @@
 	if (!before) {
 		return false;
 	}
+#if 0
+	ut64 cnt = 0;
 	//eprintf ("before session (%d) 0x%08"PFMT64x"\n", before->key.id, before->key.addr);
 
 	/* Rollback to previous state */
@@ -975,9 +1063,11 @@
 		}
 		cnt++;
 	}
-
-	/* Finally, run to the desired point */
+#endif
+	/* Rollback to previous state and then run to the desired point */
 	r_debug_session_set (dbg, before);
+	pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
+	prev = get_prev_instr (dbg, pc, end);
 	if (prev) {
 		eprintf ("continue until 0x%08"PFMT64x"\n", prev);
 		r_debug_continue_until_nonblock (dbg, prev);
@@ -1068,10 +1158,15 @@
 			reason == R_DEBUG_REASON_EXIT_TID ) {
 			goto repeat;
 		}
+#endif
 		if (reason == R_DEBUG_REASON_EXIT_PID) {
+#if __WINDOWS__
 			dbg->pid = -1;
-		}
+#elif __linux__
+			r_debug_bp_update (dbg);
+			r_bp_restore (dbg->bp, false); // (vdf) there has got to be a better way
 #endif
+		}
 
 		/* if continuing killed the inferior, we won't be able to get
 		 * the registers.. */
@@ -1108,7 +1203,7 @@
 				RAnalOp op = {0};
 				ut64 pc = r_debug_reg_get (dbg, "PC");
 				dbg->iob.read_at (dbg->iob.io, pc, buf, sizeof (buf));
-				r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf));
+				r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf), R_ANAL_OP_MASK_BASIC);
 				if (op.size > 0) {
 					const char *signame = r_signal_to_string (dbg->reason.signum);
 					r_debug_reg_set (dbg, "PC", pc+op.size);
@@ -1178,7 +1273,7 @@
 			dbg->iob.read_at (dbg->iob.io, buf_pc, buf, sizeof (buf));
 		}
 		// Analyze the opcode
-		if (!r_anal_op (dbg->anal, &op, pc, buf + (pc - buf_pc), sizeof (buf) - (pc - buf_pc))) {
+		if (!r_anal_op (dbg->anal, &op, pc, buf + (pc - buf_pc), sizeof (buf) - (pc - buf_pc), R_ANAL_OP_MASK_BASIC)) {
 			eprintf ("Decode error at %"PFMT64x"\n", pc);
 			return false;
 		}
@@ -1364,7 +1459,7 @@
 	for (;;) {
 		RDebugReasonType reason;
 
-		if (r_cons_singleton()->breaked)
+		if (r_cons_singleton ()->context->breaked)
 			break;
 #if __linux__
 		// step is needed to avoid dupped contsc results
@@ -1426,7 +1521,10 @@
 		return false;
 	}
 	if (dbg->h && dbg->h->kill) {
-		return dbg->h->kill (dbg, pid, tid, sig);
+		if (pid > 0 && tid > 0) {
+			return dbg->h->kill (dbg, pid, tid, sig);
+		}
+		return -1;
 	}
 	eprintf ("Backend does not implement kill()\n");
 	return false;
@@ -1452,7 +1550,7 @@
 	return 0;
 }
 
-R_API bool r_debug_is_dead (RDebug *dbg) {
+R_API bool r_debug_is_dead(RDebug *dbg) {
 	if (!dbg->h) {
 		return false;
 	}
@@ -1461,7 +1559,7 @@
 		return false;
 	}
 	bool is_dead = (dbg->pid == -1 && strncmp (dbg->h->name, "gdb", 3)) || (dbg->reason.type == R_DEBUG_REASON_DEAD);
-	if (dbg->pid > 0) {
+	if (dbg->pid > 0 && dbg->h && dbg->h->kill) {
 		is_dead = !dbg->h->kill (dbg, dbg->pid, false, 0);
 	}
 #if 0
diff -Nru radare2-2.3.0+dfsg/libr/debug/dreg.c radare2-2.8.0+dfsg/libr/debug/dreg.c
--- radare2-2.3.0+dfsg/libr/debug/dreg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/dreg.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_core.h> // just to get the RPrint instance
 #include <r_debug.h>
@@ -146,6 +146,28 @@
 					continue;
 				}
 			}
+			// Is this register being asked?
+			if (dbg->q_regs) {
+				if (!r_list_empty (dbg->q_regs)) {
+					RListIter *iterreg;
+					RList *q_reg = dbg->q_regs;
+					char *q_name;
+					bool found = false;
+					r_list_foreach (q_reg, iterreg, q_name) {
+						if (!strcmp (item->name, q_name)) {
+							found = true;
+							break;
+						}
+					}
+					if (!found) {
+					        continue;
+					}
+					r_list_delete (q_reg, iterreg);
+				} else {
+					// List is empty, all requested regs were taken, no need to go further
+					goto beach;
+				}
+			}
 			int regSize = item->size;
 			if (regSize < 80) {
 				value = r_reg_get_value (dbg->reg, item);
@@ -153,7 +175,7 @@
 				diff = r_reg_get_value (dbg->reg, item);
 				r_reg_arena_swap (dbg->reg, false);
 				delta = value-diff;
-				if (rad == 'j') {
+				if (tolower (rad) == 'j') {
 					snprintf (strvalue, sizeof (strvalue),"%"PFMT64d, value);
 				} else {
 					snprintf (strvalue, sizeof (strvalue),"0x%08"PFMT64x, value);
@@ -178,6 +200,7 @@
 			itmidx++;
 
 			switch (rad) {
+			case 'J':
 			case 'j':
 				dbg->cb_printf ("%s\"%s\":%s",
 					n?",":"", item->name, strvalue);
@@ -253,8 +276,11 @@
 			n++;
 		}
 	}
+beach:
 	if (rad == 'j') {
 		dbg->cb_printf ("}\n");
+	} else if (rad == 'J') {
+		// do nothing
 	} else if (n > 0 && rad == 2 && ((n%cols))) {
 		dbg->cb_printf ("\n");
 	}
diff -Nru radare2-2.3.0+dfsg/libr/debug/esil.c radare2-2.8.0+dfsg/libr/debug/esil.c
--- radare2-2.3.0+dfsg/libr/debug/esil.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/esil.c	2018-08-07 14:12:36.000000000 +0000
@@ -212,7 +212,7 @@
 	int ret = 1;
 	dbg = d;
 	if (!ESIL) {
-		ESIL = r_anal_esil_new (32, true);
+		ESIL = r_anal_esil_new (32, true, 64);
 		// TODO setup something?
 		if (!ESIL) {
 			return 0;
@@ -242,7 +242,7 @@
 		//	npc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
 	}
 
-	if (r_anal_op (dbg->anal, &op, opc, obuf, sizeof (obuf))) {
+	if (r_anal_op (dbg->anal, &op, opc, obuf, sizeof (obuf), R_ANAL_OP_MASK_ESIL)) {
 		if (esilbreak_check_pc (dbg, opc)) {
 			eprintf ("STOP AT 0x%08"PFMT64x"\n", opc);
 			ret = 0;
diff -Nru radare2-2.3.0+dfsg/libr/debug/map.c radare2-2.8.0+dfsg/libr/debug/map.c
--- radare2-2.3.0+dfsg/libr/debug/map.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/map.c	2018-08-07 14:12:36.000000000 +0000
@@ -3,125 +3,139 @@
 #include <r_debug.h>
 #include <r_list.h>
 
-R_API void r_debug_map_list(RDebug *dbg, ut64 addr, int rad) {
-	const char *fmtstr;
-	char buf[128];
+/* Print out the JSON body for memory maps in the passed map region */
+static void print_debug_map_json(RDebug *dbg, RDebugMap *map, bool prefix_comma) {
+	dbg->cb_printf ("%s{", prefix_comma ? ",": "");
+	if (map->name && *map->name) {
+		char *escaped_name = r_str_escape (map->name);
+		dbg->cb_printf ("\"name\":\"%s\",", escaped_name);
+		free (escaped_name);
+	}
+	if (map->file && *map->file) {
+		char *escaped_path = r_str_escape (map->file);
+		dbg->cb_printf ("\"file\":\"%s\",", escaped_path);
+		free (escaped_path);
+	}
+	dbg->cb_printf ("\"addr\":%"PFMT64u",", map->addr);
+	dbg->cb_printf ("\"addr_end\":%"PFMT64u",", map->addr_end);
+	dbg->cb_printf ("\"type\":\"%c\",", map->user?'u':'s');
+	dbg->cb_printf ("\"perm\":\"%s\"", r_str_rwx_i (map->perm));
+	dbg->cb_printf ("}");
+}
+
+/* Write the memory map header describing the line columns */
+static void print_debug_map_line_header(RDebug *dbg, const char *input) {
+	// TODO: Write header to console based on which command is being ran
+}
+
+/* Write a single memory map line to the console */
+static void print_debug_map_line(RDebug *dbg, RDebugMap *map, ut64 addr, const char *input) {
+	if (input[0] == 'q') { // "dmq"
+		char buf[128];
+		char *name = (map->name && *map->name)
+			? r_str_newf ("%s.%s", map->name, r_str_rwx_i (map->perm))
+			: r_str_newf ("%08"PFMT64x".%s", map->addr, r_str_rwx_i (map->perm));
+		r_name_filter (name, 0);
+		dbg->cb_printf ("0x%016"PFMT64x" - 0x%016"PFMT64x" %6s %5s %s\n",
+			map->addr, map->addr_end,
+			r_num_units (buf, map->addr_end - map->addr),
+			r_str_rwx_i (map->perm), name);
+		free (name);
+	} else {
+		char sizebuf[128];
+		const char *fmtstr = dbg->bits & R_SYS_BITS_64
+			? "0x%016"PFMT64x" # 0x%016"PFMT64x" %c %s %6s %c %s %s %s%s%s\n"
+			: "0x%08"PFMT64x" # 0x%08"PFMT64x" %c %s %6s %c %s %s %s%s%s\n";
+		const char *type = map->shared? "sys": "usr";
+		const char *flagname = dbg->corebind.getName
+			? dbg->corebind.getName (dbg->corebind.core, map->addr) : NULL;
+		if (!flagname) {
+			flagname = "";
+		} else if (map->name) {
+			char *filtered_name = strdup (map->name);
+			r_name_filter (filtered_name, 0);
+			if (!strncmp (flagname, "map.", 4) && \
+				!strcmp (flagname + 4, filtered_name)) {
+				flagname = "";
+			}
+			free (filtered_name);
+		}
+		dbg->cb_printf (fmtstr,
+			map->addr,
+			map->addr_end,
+			(addr>=map->addr && addr<map->addr_end)?'*':'-',
+			type, r_num_units (sizebuf, map->size),
+			map->user?'u':'s',
+			r_str_rwx_i (map->perm),
+			map->name?map->name:"?",
+			map->file?map->file:"?",
+			*flagname? " ; ": "",
+			flagname);
+	}
+}
+
+R_API void r_debug_map_list(RDebug *dbg, ut64 addr, const char *input) {
+	int i;
 	bool notfirst = false;
 	RListIter *iter;
 	RDebugMap *map;
 	if (!dbg) {
 		return;
 	}
-	switch (rad) {
-	case 'j':
-		dbg->cb_printf ("[");
-		r_list_foreach (dbg->maps, iter, map) {
-			if (notfirst) dbg->cb_printf (",");
-			dbg->cb_printf ("{\"name\":\"%s\",",map->name);
-			if (map->file && *map->file)
-				dbg->cb_printf ("\"file\":\"%s\",", map->file);
-			dbg->cb_printf ("\"addr\":%"PFMT64u",", map->addr);
-			dbg->cb_printf ("\"addr_end\":%"PFMT64u",", map->addr_end);
-			dbg->cb_printf ("\"type\":\"%c\",", map->user?'u':'s');
-			dbg->cb_printf ("\"perm\":\"%s\"}", r_str_rwx_i (map->perm));
-			notfirst = true;
-		}
-		r_list_foreach (dbg->maps_user, iter, map) {
-			if (notfirst) dbg->cb_printf (",");
-			dbg->cb_printf ("{\"name\":\"%s\",", map->name);
-			if (map->file && *map->file)
-				dbg->cb_printf ("\"file\":\"%s\",", map->file);
-			dbg->cb_printf ("\"addr\":%"PFMT64u",", map->addr);
-			dbg->cb_printf ("\"addr_end\":%"PFMT64u",", map->addr_end);
-			dbg->cb_printf ("\"type\":\"%c\",", map->user?'u':'s');
-			dbg->cb_printf ("\"perm\":\"%s\"}", r_str_rwx_i (map->perm));
-			notfirst = true;
-		}
-		dbg->cb_printf ("]\n");
-		break;
-	case '*':
-		r_list_foreach (dbg->maps, iter, map) {
-			char *name = (map->name && *map->name)
-				? r_str_newf ("%s.%s", map->name, r_str_rwx_i (map->perm))
-				: r_str_newf ("%08"PFMT64x".%s", map->addr, r_str_rwx_i (map->perm));
-			r_name_filter (name, 0);
-			dbg->cb_printf ("f map.%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n",
-				name, map->addr_end - map->addr + 1, map->addr);
-			free (name);
-		}
-		r_list_foreach (dbg->maps_user, iter, map) {
-			char *name = r_str_newf ("%s.%s", map->name,
-				r_str_rwx_i (map->perm));
-			r_name_filter (name, 0);
-			dbg->cb_printf ("f map.%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n",
-				name, map->addr_end - map->addr, map->addr);
-			free (name);
-		}
-		break;
-	case 'q':
-		r_list_foreach (dbg->maps, iter, map) {
-			char *name = r_str_newf ("%s.%s", map->name,
-				r_str_rwx_i (map->perm));
-			r_name_filter (name, 0);
-			dbg->cb_printf ("0x%016"PFMT64x" - 0x%016"PFMT64x" %6s %5s %s\n",
-				map->addr, map->addr_end,
-				r_num_units (buf, map->addr_end - map->addr),
-				r_str_rwx_i (map->perm), name);
-			free (name);
-		}
-		r_list_foreach (dbg->maps_user, iter, map) {
-			char *name = r_str_newf ("%s.%s", map->name,
-				r_str_rwx_i (map->perm));
-			r_name_filter (name, 0);
-			dbg->cb_printf ("f map.%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n",
-				name, map->addr_end - map->addr, map->addr);
-			free (name);
-		}
-		break;
-	default:
-		fmtstr = dbg->bits & R_SYS_BITS_64
-			? "0x%016"PFMT64x" # 0x%016"PFMT64x" %c %s %6s %c %s %s %s%s%s\n"
-			: "0x%08"PFMT64x" # 0x%08"PFMT64x" %c %s %6s %c %s %s %s%s%s\n";
-		r_list_foreach (dbg->maps, iter, map) {
-			const char *type = map->shared? "sys": "usr";
-			const char *flagname = dbg->corebind.getName
-				? dbg->corebind.getName (dbg->corebind.core, map->addr) : NULL;
-			if (!flagname || !*flagname) {
-				flagname = "";
-			} else {
-				if (!strncmp (flagname, "map.", 4)) {
-					if (!strncmp (flagname + 4, map->name, 4)) {
-						flagname = "";
+
+	switch (input[0]) {
+		case 'j': // "dmj" add JSON opening array brace
+			dbg->cb_printf ("[");
+			break;
+		case '*': // "dm*" dont print a header for r2 commands output
+			break;
+		default:
+			// TODO: Find a way to only print headers if output isn't being grepped
+			print_debug_map_line_header (dbg, input);
+	}
+
+	for (i = 0; i < 2; i++) { // Iterate over dbg::maps and dbg::maps_user
+		RList *maps = (i == 0) ? dbg->maps : dbg->maps_user;
+		r_list_foreach (maps, iter, map) {
+			switch (input[0]) {
+			case 'j': // "dmj"
+				print_debug_map_json (dbg, map, notfirst);
+				notfirst = true;
+				break;
+			case '*': // "dm*"
+				{
+					char *name = (map->name && *map->name)
+						? r_str_newf ("%s.%s", map->name, r_str_rwx_i (map->perm))
+						: r_str_newf ("%08"PFMT64x".%s", map->addr, r_str_rwx_i (map->perm));
+					r_name_filter (name, 0);
+					dbg->cb_printf ("f map.%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n",
+						name, map->addr_end - map->addr + 1, map->addr);
+					free (name);
+				}
+				break;
+			case 'q': // "dmq"
+				if (input[1] == '.') { // "dmq."
+					if (addr >= map->addr && addr < map->addr_end) {
+						print_debug_map_line (dbg, map, addr, input);
 					}
+					break;
+				}
+				print_debug_map_line (dbg, map, addr, input);
+				break;
+			case '.':
+				if (addr >= map->addr && addr < map->addr_end) {
+					print_debug_map_line (dbg, map, addr, input);
 				}
+				break;
+			default:
+				print_debug_map_line (dbg, map, addr, input);
+				break;
 			}
-			r_num_units (buf, map->size);
-			dbg->cb_printf (fmtstr,
-				map->addr,
-				map->addr_end, 
-				(addr>=map->addr && addr<map->addr_end)?'*':'-',
-				type, buf,
-				map->user?'u':'s',
-				r_str_rwx_i (map->perm),
-				map->name,
-				map->file?map->file:"?",
-				*flagname? " ; ": "",
-				flagname);
-		}
-		fmtstr = dbg->bits & R_SYS_BITS_64?
-			"0x%016"PFMT64x" # 0x%016"PFMT64x" %s %04s %c %x %s %s\n":
-			"0x%08"PFMT64x" # 0x%08"PFMT64x" %s %04s %c %x %s %s\n";
-		r_list_foreach (dbg->maps_user, iter, map) {
-			const char *type = map->shared? "sys": "usr";
-			r_num_units (buf, map->size);
-			dbg->cb_printf (
-				buf, map->addr, map->addr_end,
-				fmtstr, type, 
-				map->user?'u':'s', (ut32)map->perm,
-				map->name,
-				map->file?map->file:"?");
 		}
-		break;
+	}
+
+	if (input[0] == 'j') { // "dmj" add JSON closing array brace
+		dbg->cb_printf ("]\n");
 	}
 }
 
@@ -131,6 +145,18 @@
 	return ma->addr - mb->addr;
 }
 
+/**
+ * \brief Find the min and max addresses in an RList of maps.
+ * \param maps RList of maps that will be searched through
+ * \param min Pointer to a ut64 that the min will be stored in
+ * \param max Pointer to a ut64 that the max will be stored in
+ * \param skip How many maps to skip at the start of iteration
+ * \param width Divisor for the return value
+ * \return (max-min)/width
+ *
+ * Used to determine the min & max addresses of maps and
+ * scale the ascii bar to the width of the terminal
+ */
 static int findMinMax(RList *maps, ut64 *min, ut64 *max, int skip, int width) {
 	RDebugMap *map;
 	RListIter *iter;
@@ -151,9 +177,10 @@
 	return (*max - *min) / width;
 }
 
-static void print_debug_map_ascii_art(RList *maps, ut64 addr, int use_color, PrintfCallback cb_printf, int bits, int cons_width) {
-	ut64 mul, min = -1, max = 0;
-	int width = cons_width - 90;
+static void print_debug_maps_ascii_art(RDebug *dbg, RList *maps, ut64 addr, int colors) {
+	ut64 mul; // The amount of address space a single console column will represent in bar graph
+	ut64 min = -1, max = 0;
+	int width = r_cons_get_size (NULL) - 90;
 	RListIter *iter;
 	RDebugMap *map;
 	if (width < 1) {
@@ -163,68 +190,77 @@
 	mul = findMinMax (maps, &min, &max, 0, width);
 	ut64 last = min;
 	if (min != -1 && mul != 0) {
-		const char *c = "", *c_end = "";
+		const char *color_prefix = ""; // Color escape code prefixed to string (address coloring)
+		const char *color_suffix = ""; // Color escape code appended to end of string
 		const char *fmtstr;
-		char buf[56];
-		int j;
-		int count = 0;
+		char size_buf[56]; // Holds the human formatted size string [124K]
+		int skip = 0; // Number of maps to skip when re-calculating the minmax
 		r_list_foreach (maps, iter, map) {
-			r_num_units (buf, map->size);
-			if (use_color) {
-				c_end = Color_RESET;
-				if (map->perm & 2) {
-					c = Color_RED;
-				} else if (map->perm & 1) {
-					c = Color_GREEN;
+			r_num_units (size_buf, map->size); // Convert map size to human readable string
+			if (colors) {
+				color_suffix = Color_RESET;
+				if (map->perm & 2) { // Writable maps are red
+					color_prefix = Color_RED;
+				} else if (map->perm & 1) { // Executable maps are green
+					color_prefix = Color_GREEN;
 				} else {
-					c = "";
-					c_end = "";
+					color_prefix = "";
+					color_suffix = "";
 				}
 			} else {
-				c = "";
-				c_end = "";
+				color_prefix = "";
+				color_suffix = "";
 			}
-			if ((map->addr - last) > UT32_MAX) {
-				mul = findMinMax (maps, &min, &max, count, width);
+			if ((map->addr - last) > UT32_MAX) { // TODO: Comment what this is for
+				mul = findMinMax (maps, &min, &max, skip, width); //  Recalculate minmax
 			}
-			count++;
-			fmtstr = bits & R_SYS_BITS_64 ?
-				"map %.8s %c %s0x%016"PFMT64x"%s |" :
-				"map %.8s %c %s0x%08"PFMT64x"%s |";
-			cb_printf (fmtstr, buf,
+			skip++;
+			fmtstr = dbg->bits & R_SYS_BITS_64 ? // Prefix formatting string (before bar)
+				"map %4.8s %c %s0x%016"PFMT64x"%s |" :
+				"map %4.8s %c %s0x%08"PFMT64x"%s |";
+			dbg->cb_printf (fmtstr, size_buf,
 				(addr >= map->addr && \
 				addr < map->addr_end) ? '*' : '-',
-				c, map->addr, c_end);
-			for (j = 0; j < width; j++) {
-				ut64 pos = min + (j * mul);
-				ut64 npos = min + ((j + 1) * mul);
+				color_prefix, map->addr, color_suffix); // * indicates map is within our current seeked offset
+			int col;
+			for (col = 0; col < width; col++) { // Iterate over the available width/columns for bar graph
+				ut64 pos = min + (col * mul); // Current address space to check
+				ut64 npos = min + ((col + 1) * mul); // Next address space to check
 				if (map->addr < npos && map->addr_end > pos) {
-					cb_printf ("#");
+					dbg->cb_printf ("#"); // TODO: Comment what a # represents
 				} else {
-					cb_printf ("-");
+					dbg->cb_printf ("-");
 				}
 			}
-			fmtstr = bits & R_SYS_BITS_64 ?
+			fmtstr = dbg->bits & R_SYS_BITS_64 ? // Suffix formatting string (after bar)
 				"| %s0x%016"PFMT64x"%s %s %s\n" :
 				"| %s0x%08"PFMT64x"%s %s %s\n";
-			cb_printf (fmtstr, c, map->addr_end, c_end,
+			dbg->cb_printf (fmtstr, color_prefix, map->addr_end, color_suffix,
 				r_str_rwx_i (map->perm), map->name);
 			last = map->addr;
 		}
 	}
 }
 
-R_API void r_debug_map_list_visual(RDebug *dbg, ut64 addr, int use_color, int cons_cols) {
+R_API void r_debug_map_list_visual(RDebug *dbg, ut64 addr, const char *input, int colors) {
 	if (dbg) {
-		if (dbg->maps) {
-			print_debug_map_ascii_art (dbg->maps, addr,
-				use_color, dbg->cb_printf,
-				dbg->bits, cons_cols);
-		}
-		if (dbg->maps_user) {
-			print_debug_map_ascii_art (dbg->maps_user,
-				addr, use_color, dbg->cb_printf,
-				dbg->bits, cons_cols);
+		int i;
+		for (i = 0; i < 2; i++) { // Iterate over dbg::maps and dbg::maps_user
+			RList *maps = (i == 0) ? dbg->maps : dbg->maps_user;
+			if (maps) {
+				RListIter *iter;
+				RDebugMap *map;
+				if (input[1] == '.') { // "dm=." Only show map overlapping current offset
+					dbg->cb_printf ("TODO:\n");
+					r_list_foreach (maps, iter, map) {
+						if (addr >= map->addr && addr < map->addr_end) {
+							// print_debug_map_ascii_art (dbg, map);
+						}
+					}
+				} else { // "dm=" Show all maps with a graph
+					print_debug_maps_ascii_art (dbg, maps, addr, colors);
+				}
+			}
 		}
 	}
 }
diff -Nru radare2-2.3.0+dfsg/libr/debug/meson.build radare2-2.8.0+dfsg/libr/debug/meson.build
--- radare2-2.3.0+dfsg/libr/debug/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,70 +1,118 @@
-files=[
-'arg.c',
-'ddesc.c',
-'debug.c',
-'dreg.c',
-'esil.c',
-'map.c',
-'p/bfvm.c',
-'p/debug_bf.c',
-#'p/debug_bochs.c',
-'p/debug_esil.c',
-'p/debug_gdb.c',
-'p/debug_io.c',
-'p/debug_native.c',
-#'p/debug_qnx.c',
-'p/debug_rap.c',
-'p/debug_windbg.c',
-#'p/native/arm.c',
-#'p/native/bt/fuzzy-all.c',
-#'p/native/bt/generic-x64.c',
-#'p/native/bt/generic-x86.c',
-#'p/native/bt.c',
-#'p/native/darwin.c',
-#'p/native/drx.c',
-#'p/native/maps/darwin.c',
-'pid.c',
-'plugin.c',
-'session.c',
-'signal.c',
-'snap.c',
-'trace.c',
+files = [
+  'arg.c',
+  'ddesc.c',
+  'debug.c',
+  'dreg.c',
+  'esil.c',
+  'map.c',
+  'pid.c',
+  'plugin.c',
+  'session.c',
+  'signal.c',
+  'snap.c',
+  'trace.c',
+  'p/bfvm.c',
+  'p/debug_bf.c',
+  'p/debug_bochs.c',
+  'p/debug_esil.c',
+  'p/debug_gdb.c',
+  'p/debug_io.c',
+  'p/debug_native.c',
+  'p/debug_null.c',
+  'p/debug_qnx.c',
+  'p/debug_rap.c',
+  'p/debug_windbg.c',
+  #'p/native/arm.c',
+  #'p/native/bt/fuzzy-all.c',
+  #'p/native/bt/generic-x64.c',
+  #'p/native/bt/generic-x86.c',
+  #'p/native/bt.c',
+  #'p/native/darwin.c',
+  #'p/native/drx.c',
+  #'p/native/maps/darwin.c',
 ]
 
-if host_os == 'linux'
+if host_machine.system() == 'linux'
   files += [
     'p/native/linux/linux_debug.c',
     'p/native/linux/linux_coredump.c'
   ]
 endif
-if host_os != 'windows'
+
+if host_machine.system() != 'windows'
  files += [
   'p/native/procfs.c'
  ]
 endif
 
-if host_os == 'darwin'
+if host_machine.system() == 'darwin'
   files += [
     'p/native/xnu/xnu_debug.c',
-#'p/native/xnu/trap_arm.c',
-#'p/native/xnu/trap_x86.c',
-#'p/native/xnu/xnu_excthreads.c',
-#'p/native/xnu/xnu_threads.c',
+    #'p/native/xnu/trap_arm.c',
+    #'p/native/xnu/trap_x86.c',
+    #'p/native/xnu/xnu_excthreads.c',
+    #'p/native/xnu/xnu_threads.c',
   ]
 endif
 
+r_debug_inc = [
+  platform_inc,
+  include_directories(
+    '../bin/format/elf'
+  )
+]
+
 r_debug = library('r_debug', files,
-  include_directories: [platform_inc, include_directories([
-	'../bin/format/elf',
-	'../../shlr/gdb/include',
-	'../../shlr/windbg'
-  ])],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_hash, r_reg, r_syscall, r_anal, r_flag, r_io, r_bp, r_search, r_cons, r_lang, r_egg, r_socket],
-  objects: [
-	libr2sdb.extract_all_objects(),
-	libr2gdb.extract_all_objects(),
-	libr2windbg.extract_all_objects()
+  include_directories: r_debug_inc,
+  c_args: ['-DCORELIB=1'],
+  dependencies: [
+    r_util_dep,
+    r_hash_dep,
+    r_reg_dep,
+    r_syscall_dep,
+    r_anal_dep,
+    r_flag_dep,
+    r_io_dep,
+    r_bp_dep,
+    r_search_dep,
+    r_cons_dep,
+    r_lang_dep,
+    r_egg_dep,
+    r_socket_dep,
+    windbg_dep,
+    qnx_dep,
+    gdb_dep,
+    bochs_dep,
+    sdb_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_debug_dep = declare_dependency(link_with: r_debug,
+                                 include_directories: r_debug_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_debug],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_debug',
+  filebase: 'r_debug',
+  requires: [
+    'r_util',
+    'r_hash',
+    'r_reg',
+    'r_syscall',
+    'r_anal',
+    'r_flag',
+    'r_io',
+    'r_bp',
+    'r_search',
+    'r_cons',
+    'r_lang',
+    'r_egg',
+    'r_socket'
   ],
-  install: true
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_bochs.c radare2-2.8.0+dfsg/libr/debug/p/debug_bochs.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_bochs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_bochs.c	2018-08-07 14:12:36.000000000 +0000
@@ -528,7 +528,7 @@
 	.stop = &r_debug_bochs_stop,
 	.wait = &r_debug_bochs_wait,
 	.map_get = r_debug_bochs_map_get,
-	.breakpoint = (RBreakpointCallback)&r_debug_bochs_breakpoint,
+	.breakpoint = r_debug_bochs_breakpoint,
 	.reg_read = &r_debug_bochs_reg_read,
 	.reg_write = &r_debug_bochs_reg_write,
 	.reg_profile = (void *)r_debug_bochs_reg_profile,
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_esil.c radare2-2.8.0+dfsg/libr/debug/p/debug_esil.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_esil.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_esil.c	2018-08-07 14:12:36.000000000 +0000
@@ -23,7 +23,7 @@
 	int oplen;
 	ut8 buf[64];
 	ut64 pc = 0LL; // getreg("pc")
-	RAnalOp op;
+	RAnalOp op = {0};
 
 	pc = r_debug_reg_sync(dbg, R_REG_TYPE_GPR, false);
 	pc = r_debug_reg_get (dbg, "PC");
@@ -33,13 +33,14 @@
 	//memset (buf, 0, sizeof (buf));
 	dbg->iob.read_at (dbg->iob.io, pc, buf, 64);
 	eprintf ("READ 0x%08"PFMT64x" %02x %02x %02x\n", pc, buf[0], buf[1], buf[2]);
-	oplen = r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf));
+	oplen = r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf), R_ANAL_OP_MASK_ESIL);
 	if (oplen > 0) {
 		if (*R_STRBUF_SAFEGET (&op.esil)) {
 			eprintf ("ESIL: %s\n", R_STRBUF_SAFEGET (&op.esil));
 			r_anal_esil_parse (dbg->anal->esil, R_STRBUF_SAFEGET (&op.esil));
 		}
 	}
+	r_anal_op_fini (&op);
 	eprintf ("TODO: ESIL STEP\n");
 	return true;
 }
@@ -148,7 +149,7 @@
 	.wait = &__esil_wait,
 	.stop = __esil_stop,
 	.kill = __esil_kill,
-	.breakpoint = (RBreakpointCallback)&__esil_breakpoint,
+	.breakpoint = __esil_breakpoint,
 	.reg_profile = __esil_reg_profile,
 	.reg_read = __reg_read,
 };
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_gdb.c radare2-2.8.0+dfsg/libr/debug/p/debug_gdb.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_gdb.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_gdb.c	2018-08-07 14:12:36.000000000 +0000
@@ -45,7 +45,7 @@
 	int buflen = 0;
 	check_connection (dbg);
 	gdbr_read_registers (desc);
-	if (!desc) {
+	if (!desc || !desc->data) {
 		return -1;
 	}
 	// read the len of the current area
@@ -394,6 +394,9 @@
 			case R_SYS_ARCH_AVR:
 				gdbr_set_architecture (desc, "avr", 16);
 				break;
+			case R_SYS_ARCH_V850:
+				gdbr_set_architecture (desc, "v850", 32);
+				break;
 			}
 		} else {
 			eprintf ("ERROR: Underlaying IO descriptor is not a GDB one..\n");
@@ -659,8 +662,8 @@
 			"gpr	fps	.96	160	0\n"
 			"gpr	cpsr	.32	172	0\n"
 #else
-			"=PC	r15\n"
-			"=SP	r14\n" // XXX
+			"=PC	pc\n"
+			"=SP	sp\n"
 			"=A0	r0\n"
 			"=A1	r1\n"
 			"=A2	r2\n"
@@ -918,24 +921,98 @@
 			"gpr	pc	.32	35	0\n"
 	/*		"gpr	pc	.32	39	0\n" */
 	);
+	case R_SYS_ARCH_V850:
+		return strdup (
+			"=PC    pc\n"
+			"=SP    sp\n"
+			"gpr	r0	.32	0	0\n"
+			"gpr	r1	.32	4	0\n"
+			"gpr	r2	.32	8	0\n"
+			"gpr	sp	.32	12	0\n" // r3
+			"gpr	gp	.32	16	0\n" // r4
+			"gpr	r5	.32	20	0\n"
+			"gpr	r6	.32	24	0\n"
+			"gpr	r7	.32	28	0\n"
+			"gpr	r8	.32	32	0\n"
+			"gpr	r9	.32	36	0\n"
+			"gpr	r10	.32	40	0\n"
+			"gpr	r11	.32	44	0\n"
+			"gpr	r12	.32	48	0\n"
+			"gpr	r13	.32	52	0\n"
+			"gpr	r14	.32	56	0\n"
+			"gpr	r15	.32	60	0\n"
+			"gpr	r16	.32	64	0\n"
+			"gpr	r17	.32	68	0\n"
+			"gpr	r18	.32	72	0\n"
+			"gpr	r19	.32	76	0\n"
+			"gpr	r20	.32	80	0\n"
+			"gpr	r21	.32	84	0\n"
+			"gpr	r22	.32	88	0\n"
+			"gpr	r23	.32	92	0\n"
+			"gpr	r24	.32	96	0\n"
+			"gpr	r25	.32	100	0\n"
+			"gpr	r26	.32	104	0\n"
+			"gpr	r27	.32	108	0\n"
+			"gpr	r28	.32	112	0\n"
+			"gpr	r29	.32	116	0\n"
+			"gpr	ep	.32	120	0\n" // r30
+			"gpr	lp	.32	124	0\n" // r31
+			"gpr	eipc	.32	128	0\n"
+			"gpr	eipsw	.32	132	0\n"
+			"gpr	fepc	.32	136	0\n"
+			"gpr	fepsw	.32	140	0\n"
+			"gpr	ecr	.32	144	0\n"
+			"gpr	psw	.32	148	0\n"
+			// 5x reserved, sccfg, scbp, eiic, feic, dbic, ctpc, ctpsw, dbpc, dbpsw, ctbp
+			// debug stuff, eiwr, fewr, dbwr, bsel
+			"gpr	pc	.32	256	0\n"
+	);
 	}
 	return NULL;
 }
 
-static int r_debug_gdb_breakpoint (void *bp, RBreakpointItem *b, bool set) {
-	int ret;
+static int r_debug_gdb_breakpoint (RBreakpoint *bp, RBreakpointItem *b, bool set) {
+	int ret, bpsize;
 	if (!b) {
 		return false;
 	}
-	// TODO handle rwx and conditions
-	if (set)
-		ret = b->hw?
-			gdbr_set_hwbp (desc, b->addr, ""):
-			gdbr_set_bp (desc, b->addr, "");
-	else
-		ret = b->hw?
-			gdbr_remove_hwbp (desc, b->addr):
-			gdbr_remove_bp (desc, b->addr);
+	bpsize = b->size;
+        // TODO handle conditions
+	switch (b->rwx){
+	case R_BP_PROT_EXEC : {
+		if (set)
+			ret = b->hw?
+					gdbr_set_hwbp (desc, b->addr, "", bpsize):
+					gdbr_set_bp (desc, b->addr, "", bpsize);
+		else
+			ret = b->hw?
+					gdbr_remove_hwbp (desc, b->addr, bpsize):
+					gdbr_remove_bp (desc, b->addr, bpsize);
+		break;
+	}
+	// TODO handle size (area of watch in upper layer and then bpsize. For the moment watches are set on exact on byte
+	case R_BP_PROT_WRITE : {
+		if (set)
+			gdbr_set_hww (desc, b->addr, "", 1);
+		else
+			gdbr_remove_hwbp (desc, b->addr, 1);
+		break;
+	}
+	case R_BP_PROT_READ : {
+		if (set)
+			gdbr_set_hwr (desc, b->addr, "", 1);
+		else
+			gdbr_remove_hwr (desc, b->addr, 1);
+		break;
+	}
+	case R_BP_PROT_ACCESS : {
+		if (set)
+			gdbr_set_hwa (desc, b->addr, "", 1);
+		else
+			gdbr_remove_hwa (desc, b->addr, 1);            
+		break;
+	}
+	}
 	return !ret;
 }
 
@@ -1002,7 +1079,7 @@
 	.name = "gdb",
 	/* TODO: Add support for more architectures here */
 	.license = "LGPL3",
-	.arch = "x86,arm,sh,mips,avr,lm32",
+	.arch = "x86,arm,sh,mips,avr,lm32,v850",
 	.bits = R_SYS_BITS_16 | R_SYS_BITS_32 | R_SYS_BITS_64,
 	.step = r_debug_gdb_step,
 	.cont = r_debug_gdb_continue,
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_io.c radare2-2.8.0+dfsg/libr/debug/p/debug_io.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_io.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_io.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2016-2017 pancake */
+/* radare - LGPL - Copyright 2016-2018 pancake */
 
 #include <r_io.h>
 #include <r_asm.h>
@@ -132,7 +132,7 @@
 
 // "dk" send kill signal
 static bool __io_kill(RDebug *dbg, int pid, int tid, int sig) {
-	const char *cmd = sdb_fmt (-1, "dk %d", sig);
+	const char *cmd = sdb_fmt ("dk %d", sig);
 	dbg->iob.system (dbg->iob.io, cmd);
 	r_cons_flush ();
 	return true;
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_native.c radare2-2.8.0+dfsg/libr/debug/p/debug_native.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_native.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_native.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_userconf.h>
 #include <r_debug.h>
@@ -134,7 +134,7 @@
 	regs.EFlags |= 0x100;
 	r_debug_native_reg_write (dbg, R_REG_TYPE_GPR, (ut8 *)&regs, sizeof (regs));
 	r_debug_native_continue (dbg, dbg->pid, dbg->tid, dbg->reason.signum);
-	r_debug_handle_signals (dbg);
+	(void)r_debug_handle_signals (dbg);
 	return true;
 }
 #endif
@@ -249,8 +249,7 @@
 	}
 	return tid;
 #elif __APPLE__
-	bool ret;
-	ret = xnu_continue (dbg, pid, tid, sig);
+	bool ret = xnu_continue (dbg, pid, tid, sig);
 	if (!ret) {
 		return -1;
 	}
@@ -316,8 +315,11 @@
 		case 'u': needle = dbg->glob_unlibs; break;
 		}
 	}
-	eprintf ("(%d) %sing library at %p (%s) %s\n", item->pid, mode,
+	//eprintf ("(%d) %sing library at %p (%s) %s\n", item->pid, mode,
+		//item->BaseOfDll, item->Path, item->Name);
+	r_cons_printf ("(%d) %sing library at %p (%s) %s\n", item->pid, mode,
 		item->BaseOfDll, item->Path, item->Name);
+	r_cons_flush ();
 	if (needle && strlen (needle)) {
 		tmp = r_str_glob (item->Name, needle);
 	}
@@ -365,7 +367,9 @@
 				dbg->corebind.cmdf (core, "o-%d", fd);
 			}
 		} else {
-			eprintf ("Loading unknown library.\n");
+			//eprintf ("Loading unknown library.\n");
+			r_cons_printf ("Loading unknown library.\n");
+			r_cons_flush ();
 		}
 	} else if (reason == R_DEBUG_REASON_EXIT_LIB) {
 		RDebugInfo *r = r_debug_native_info (dbg, "");
@@ -375,13 +379,19 @@
 			}
 			r_debug_info_free (r);
 		} else {
-			eprintf ("Unloading unknown library.\n");
+			//eprintf ("Unloading unknown library.\n");
+			r_cons_printf ("Unloading unknown library.\n");
+			r_cons_flush ();
+
 		}
 	} else if (reason == R_DEBUG_REASON_NEW_TID) {
 		RDebugInfo *r = r_debug_native_info (dbg, "");
 		if (r && r->thread) {
 			PTHREAD_ITEM item = r->thread;
-			eprintf ("(%d) Created thread %d (start @ %p)\n", item->pid, item->tid, item->lpStartAddress);
+			//eprintf ("(%d) Created thread %d (start @ %p)\n", item->pid, item->tid, item->lpStartAddress);
+			r_cons_printf ("(%d) Created thread %d (start @ %p)\n", item->pid, item->tid, item->lpStartAddress);
+			r_cons_flush ();
+
 			r_debug_info_free (r);
 		}
 
@@ -389,7 +399,10 @@
 		RDebugInfo *r = r_debug_native_info (dbg, "");
 		if (r && r->thread) {
 			PTHREAD_ITEM item = r->thread;
-			eprintf ("(%d) Finished thread %d Exit code %d\n", (ut32)item->pid, (ut32)item->tid, (ut32)item->dwExitCode);
+			//eprintf ("(%d) Finished thread %d Exit code %d\n", (ut32)item->pid, (ut32)item->tid, (ut32)item->dwExitCode);
+			r_cons_printf ("(%d) Finished thread %d Exit code %d\n", (ut32)item->pid, (ut32)item->tid, (ut32)item->dwExitCode);
+			r_cons_flush ();
+
 			r_debug_info_free (r);
 		}
 	}
@@ -440,7 +453,10 @@
 #ifdef WAIT_ON_ALL_CHILDREN
 	int ret = waitpid (-1, &status, WAITPID_FLAGS);
 #else
-	int ret = waitpid (pid, &status, WAITPID_FLAGS);
+	int ret = waitpid (-1, &status, 0);
+	if (ret != -1) {
+		reason = R_DEBUG_REASON_TRAP;
+	}
 #endif // WAIT_ON_ALL_CHILDREN
 	if (ret == -1) {
 		r_sys_perror ("waitpid");
@@ -453,10 +469,9 @@
 	if (ret != pid) {
 		reason = R_DEBUG_REASON_NEW_PID;
 		eprintf ("switching to pid %d\n", ret);
-		r_debug_select(dbg, ret, ret);
+		r_debug_select (dbg, ret, ret);
 	}
 #endif // WAIT_ON_ALL_CHILDREN
-
 	// TODO: switch status and handle reasons here
 #if __linux__ && defined(PT_GETEVENTMSG)
 	reason = linux_ptrace_event (dbg, pid, status);
@@ -556,92 +571,76 @@
 		}
 	}
 #elif __linux__
-	int i;
-	char *ptr, buf[1024];
-
 	list->free = (RListFree)&r_debug_pid_free;
+	DIR *dh;
+	struct dirent *de;
+	char *ptr, st, buf[1024];
+	int i, uid;
 	if (pid) {
-		DIR *dh;
-		struct dirent *de;
-
 		/* add the requested pid. should we do this? we don't even know if it's valid still.. */
 		r_list_append (list, r_debug_pid_new ("(current)", pid, 0, 's', 0));
-
-		/* list parents */
-		dh = opendir ("/proc");
-		if (!dh) {
-			r_sys_perror ("opendir /proc");
-			r_list_free (list);
-			return NULL;
+	}
+	dh = opendir ("/proc");
+	if (!dh) {
+		r_sys_perror ("opendir /proc");
+		r_list_free (list);
+		list = NULL;
+	}
+	while ((de = readdir (dh))) {
+		uid = 0;
+		st = ' ';
+		/* for each existing pid file... */
+		i = atoi (de->d_name);
+		if (i <= 0) {
+			continue;
 		}
-		while ((de = readdir (dh))) {
-			int uid = 0;
-			int gid = 0; // unused
-			/* for each existing pid file... */
-			i = atoi (de->d_name);
-			if (i <= 0) {
-				continue;
-			}
-
-			/* try to read the status */
-			buf[0] = 0;
-			if (procfs_pid_slurp (i, "status", buf, sizeof (buf)) == -1) {
-				continue;
-			}
-			buf[sizeof (buf) - 1] = 0;
 
-			ptr = strstr (buf, "Uid:");
-			if (ptr) {
-				uid = atoi (ptr + 4);
-			}
+		/* try to read the status */
+		buf[0] = 0;
+		if (procfs_pid_slurp (i, "status", buf, sizeof (buf)) == -1) {
+			continue;
+		}
+		buf[sizeof (buf) - 1] = 0;
 
-			ptr = strstr (buf, "Gid:");
-			if (ptr) {
-				gid = atoi (ptr + 4);
+		// get process State
+		ptr = strstr (buf, "State:");
+		if (ptr) {
+			st = ptr[7];
+		}
+		/* look for the parent process id */
+		ptr = strstr (buf, "PPid:");
+		if (pid && ptr) {
+			int ppid = atoi (ptr + 5);
+
+			/* if this is the requested process... */
+			if (i == pid) {
+				// append it to the list with parent
+				r_list_append (list, r_debug_pid_new (
+					"(ppid)", ppid, uid, st, 0));
 			}
 
-			/* look for the parent process id */
-			ptr = strstr (buf, "PPid:");
-			if (ptr) {
-				int ppid = atoi (ptr + 5);
-
-				/* if this is the requested process... */
-				if (i == pid) {
-					// eprintf ("PPid: %d\n", ppid);
-					// append it to the list with parent
-					r_list_append (list, r_debug_pid_new (
-						"(ppid)", ppid, uid, 's', 0));
-				}
-
-				/* ignore it if it is not one of our children */
-				if (ppid != pid) {
-					continue;
-				}
-
-				/* it's a child of the requested pid, read it's command line and add it */
-				if (procfs_pid_slurp (ppid, "cmdline", buf, sizeof (buf)) == -1) {
-					continue;
-				}
-				// TODO: add support for gid in RDebugPid.new()
-				r_list_append (list, r_debug_pid_new (buf, i, uid, 's', 0));
-			}
-		}
-		closedir (dh);
-	} else {
-		/* try to bruteforce the processes
-		 * XXX(jjd): wouldn't listing the processes like before work better?
-		 */
-		for (i = 2; i < MAXPID; i++) {
-			/* try to send signal 0, if it fails it must not be valid */
-			if (r_sandbox_kill (i, 0) == -1) {
-				continue;
-			}
-			if (procfs_pid_slurp (i, "cmdline", buf, sizeof (buf)) == -1) {
+			/* ignore it if it is not one of our children */
+			if (ppid != pid) {
 				continue;
 			}
-			r_list_append (list, r_debug_pid_new (buf, i, 0, 's', 0));
 		}
+
+		// get process Uid
+		ptr = strstr (buf, "Uid:");
+		if (ptr) {
+			uid = atoi (ptr + 4);
+		}
+		// TODO: add support for gid in RDebugPid.new()
+		// ptr = strstr (buf, "Gid:");
+		// if (ptr) {
+		// 	gid = atoi (ptr + 4);
+		// }
+		if (procfs_pid_slurp (i, "cmdline", buf, sizeof (buf)) == -1) {
+			continue;
+		}
+		r_list_append (list, r_debug_pid_new (buf, i, uid, st, 0));
 	}
+	closedir (dh);
 #else /* rest is BSD */
 #ifdef __NetBSD__
 # define KVM_OPEN_FLAG KVM_NO_FILES
@@ -969,6 +968,9 @@
 		sc_name = "mmap";
 	}
 	num = r_syscall_get_num (dbg->anal->syscall, sc_name);
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS 0x20
+#endif
 	snprintf (code, sizeof (code),
 		"sc_mmap@syscall(%d);\n"
 		"main@naked(0) { .rarg0 = sc_mmap(0x%08"PFMT64x",%d,%d,%d,%d,%d);break;\n"
@@ -1173,7 +1175,7 @@
 #endif
 	fd = fopen (path, "r");
 	if (!fd) {
-		perror (sdb_fmt (0, "Cannot open '%s'", path));
+		perror (sdb_fmt ("Cannot open '%s'", path));
 		return NULL;
 	}
 
@@ -1521,8 +1523,7 @@
  * we only handle the case for hardware breakpoints here. otherwise,
  * we let the caller handle the work.
  */
-static int r_debug_native_bp (void *bp_, RBreakpointItem *b, bool set) {
-	RBreakpoint *bp = (RBreakpoint *)bp_;
+static int r_debug_native_bp (RBreakpoint *bp, RBreakpointItem *b, bool set) {
 	RDebug *dbg = bp->user;
 	if (b && b->hw) {
 #if __i386__ || __x86_64__
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_qnx.c radare2-2.8.0+dfsg/libr/debug/p/debug_qnx.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_qnx.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_qnx.c	2018-08-07 14:12:36.000000000 +0000
@@ -342,7 +342,7 @@
 	.canstep = 1,
 	.wait = &r_debug_qnx_wait,
 	.map_get = r_debug_qnx_map_get,
-	.breakpoint = (RBreakpointCallback)&r_debug_qnx_breakpoint,
+	.breakpoint = r_debug_qnx_breakpoint,
 	.reg_read = &r_debug_qnx_reg_read,
 	.reg_write = &r_debug_qnx_reg_write,
 	.reg_profile = (void *)r_debug_qnx_reg_profile,
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_rap.c radare2-2.8.0+dfsg/libr/debug/p/debug_rap.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_rap.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_rap.c	2018-08-07 14:12:36.000000000 +0000
@@ -49,7 +49,7 @@
 }
 
 static char *r_debug_rap_reg_profile(RDebug *dbg) {
-	char *out, *tf = r_file_temp ("/tmp/rap.XXXXXX");
+	char *out, *tf = r_file_temp ("rap.XXXXXX");
 	int fd = r_cons_pipe_open (tf, 1, 0);
 	r_io_system (dbg->iob.io, "drp");
 	r_cons_pipe_close (fd);
@@ -74,7 +74,7 @@
 	.attach = &r_debug_rap_attach,
 	.detach = &r_debug_rap_detach,
 	.wait = &r_debug_rap_wait,
-	.breakpoint = (RBreakpointCallback)&r_debug_rap_breakpoint,
+	.breakpoint = r_debug_rap_breakpoint,
 	.reg_read = &r_debug_rap_reg_read,
 	.reg_write = &r_debug_rap_reg_write,
 	.reg_profile = (void *)r_debug_rap_reg_profile,
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/debug_windbg.c radare2-2.8.0+dfsg/libr/debug/p/debug_windbg.c
--- radare2-2.3.0+dfsg/libr/debug/p/debug_windbg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/debug_windbg.c	2018-08-07 14:12:36.000000000 +0000
@@ -200,6 +200,36 @@
 	return true;
 }
 
+static RList *r_debug_windbg_threads(RDebug *dbg, int pid) {
+	RListIter *it;
+	WindThread *t;
+
+	RList *ret = r_list_newf (free);
+	if (!ret) {
+		return NULL;
+	}
+
+	RList *threads = windbg_list_threads (wctx);
+	if (!threads) {
+		r_list_free (ret);
+		return NULL;
+	}
+
+	r_list_foreach (threads, it, t) {
+		RDebugPid *newpid = R_NEW0 (RDebugPid);
+		if (!newpid) {
+			r_list_free (ret);
+			return NULL;
+		}
+		newpid->pid = t->uniqueid;
+		newpid->status = t->status;
+		newpid->runnable = t->runnable;
+		r_list_append (ret, newpid);
+	}
+
+	return ret;
+}
+
 RDebugPlugin r_debug_plugin_windbg = {
 	.name = "windbg",
 	.license = "LGPL3",
@@ -213,10 +243,11 @@
 	.pids = &r_debug_windbg_pids,
 	.wait = &r_debug_windbg_wait,
 	.select = &r_debug_windbg_select,
-	.breakpoint = (RBreakpointCallback)&r_debug_windbg_breakpoint,
+	.breakpoint = r_debug_windbg_breakpoint,
 	.reg_read = &r_debug_windbg_reg_read,
 	.reg_write = &r_debug_windbg_reg_write,
-	.reg_profile = &r_debug_windbg_reg_profile
+	.reg_profile = &r_debug_windbg_reg_profile,
+	.threads = &r_debug_windbg_threads
 };
 
 #ifndef CORELIB
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/bt/fuzzy-all.c radare2-2.8.0+dfsg/libr/debug/p/native/bt/fuzzy-all.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/bt/fuzzy-all.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/bt/fuzzy-all.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,18 +9,25 @@
 	/* if x86 expect CALL to be 5 byte length */
 	if (dbg->arch && !strcmp (dbg->arch, "x86")) {
 		(void)dbg->iob.read_at (dbg->iob.io, addr-5, buf, 5);
-		if (buf[0] == 0xe8) return 1;
-		if (buf[3] == 0xff && (buf[4] & 0xf0)==0xd0) return 1;
+		if (buf[0] == 0xe8) {
+			return 1;
+		}
+		if (buf[3] == 0xff  /* bits 4-5 (from right) of next byte must be 01 */
+		    && ((buf[4] & 0xf0) == 0xd0  /* Mod is 11 */
+		        || ((buf[4] & 0xf0) == 0x10  /* Mod is 00 */
+		            && (buf[4] & 0x06) != 0x04))) {  /* R/M not 10x */
+			return 1;
+		}
 		// IMMAMISSINGANYOP
 	} else {
 		RAnalOp op;
 		(void) dbg->iob.read_at (dbg->iob.io, addr-8, buf, 8);
-		(void) r_anal_op (dbg->anal, &op, addr-8, buf, 8);
+		(void) r_anal_op (dbg->anal, &op, addr-8, buf, 8, R_ANAL_OP_MASK_BASIC);
 		if (op.type == R_ANAL_OP_TYPE_CALL || op.type == R_ANAL_OP_TYPE_UCALL) {
 			return 1;
 		}
 		/* delay slot */
-		(void) r_anal_op (dbg->anal, &op, addr-4, buf, 4);
+		(void) r_anal_op (dbg->anal, &op, addr-4, buf, 4, R_ANAL_OP_MASK_BASIC);
 		if (op.type == R_ANAL_OP_TYPE_CALL || op.type == R_ANAL_OP_TYPE_UCALL) {
 			return 1;
 		}
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/bt.c radare2-2.8.0+dfsg/libr/debug/p/native/bt.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/bt.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/bt.c	2018-08-07 14:12:36.000000000 +0000
@@ -22,7 +22,6 @@
 }
 
 static RList *r_debug_native_frames(RDebug *dbg, ut64 at) {
-	RList *list;
 	RDebugFrameCallback cb = NULL;
 	if (dbg->btalgo) {
 		if (!strcmp (dbg->btalgo, "fuzzy")) {
@@ -43,8 +42,7 @@
 		}
 	}
 
-	list = cb (dbg, at);
+	RList *list = (dbg->btalgo && !strcmp (dbg->btalgo, "trace")) ? r_list_clone (dbg->call_frames) : cb (dbg, at);
 	prepend_current_pc (dbg, list);
-
 	return list;
 }
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/drx.c radare2-2.8.0+dfsg/libr/debug/p/native/drx.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/drx.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/drx.c	2018-08-07 14:12:36.000000000 +0000
@@ -129,7 +129,7 @@
 		*global = I386_DR_IS_LOCAL_ENABLED (drx[7], n);
 	}
 	if (len) {
-		switch ((ret & 3) << 2) {
+		switch (ret & 0xA) {
 		case DR_LEN_1: *len = 1; break;
 		case DR_LEN_2: *len = 2; break;
 		case DR_LEN_4: *len = 4; break;
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/linux/linux_coredump.c radare2-2.8.0+dfsg/libr/debug/p/native/linux/linux_coredump.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/linux/linux_coredump.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/linux/linux_coredump.c	2018-08-07 14:12:36.000000000 +0000
@@ -88,7 +88,7 @@
 
 	p->pr_pid = mypid = dbg->pid;
 	/* Start filling pr_fname and pr_psargs */
-	file = sdb_fmt (0, "/proc/%d/cmdline", mypid);
+	file = sdb_fmt ("/proc/%d/cmdline", mypid);
 	buffer = r_file_slurp (file, &len);
 	if (!buffer) {
 		eprintf ("buffer NULL\n");
@@ -134,7 +134,7 @@
 static proc_per_thread_t *get_proc_thread_content(int pid, int tid) {
 	char *temp_p_sigpend, *temp_p_sighold, *p_sigpend, *p_sighold;
 	int size;
-	const char * file = sdb_fmt (0, "/proc/%d/task/%d/stat", pid, tid);
+	const char * file = sdb_fmt ("/proc/%d/task/%d/stat", pid, tid);
 
 	char *buff = r_file_slurp (file, &size);
 	if (!buff) {
@@ -161,7 +161,7 @@
 	}
 
         /* /proc/[pid]/status for uid, gid, sigpend and sighold */
-	file = sdb_fmt (0, "/proc/%d/task/%d/status", pid, tid);
+	file = sdb_fmt ("/proc/%d/task/%d/status", pid, tid);
 	buff = r_file_slurp (file, &size);
 	if (!buff) {
 		free (t);
@@ -565,7 +565,7 @@
 	int auxv_entries;
 	int size;
 
-	const char *file = sdb_fmt (0, "/proc/%d/auxv", dbg->pid);
+	const char *file = sdb_fmt ("/proc/%d/auxv", dbg->pid);
 	buff = r_file_slurp (file, &size);
 	if (!buff) {
 		return NULL;
@@ -648,12 +648,11 @@
 	linux_map_entry_t *p;
 	int n_entries;
 	for (n_entries = 0, p = me_head; p; p = p->n) {
-		if (p->dumpeable) {
-			*maps_size += p->end_addr - p->start_addr;
-		}
 		/* We don't count maps which does not have r/w perms */
-		if ((p->perms & R_IO_READ) || (p->perms & R_IO_WRITE))
+		if (((p->perms & R_IO_READ) || (p->perms & R_IO_WRITE)) && p->dumpeable) {
+			*maps_size += p->end_addr - p->start_addr;
 			n_entries++;
+		}
 	}
 	return n_entries;
 }
@@ -724,7 +723,7 @@
 
 	/* write program headers */
 	for (me_p = maps; me_p; me_p = me_p->n) {
-		if (!(me_p->perms & R_IO_READ) && !(me_p->perms & R_IO_WRITE)) {
+		if ((!(me_p->perms & R_IO_READ) && !(me_p->perms & R_IO_WRITE)) || !me_p->dumpeable) {
 			continue;
 		}
 		phdr.p_type = PT_LOAD;
@@ -755,7 +754,6 @@
 	linux_map_entry_t *p;
 	ut8 *map_content;
 	size_t size;
-	size_t rbytes;
 	bool ret;
 
 	eprintf ("dump_elf_map_content starting\n\n");
@@ -769,17 +767,13 @@
 		if (!map_content) {
 			return false;
 		}
-		rbytes = dbg->iob.read_at (dbg->iob.io, p->start_addr, map_content, size);
-		if (rbytes != size) {
-			eprintf ("dump_elf_map_content: size not equal\n");
+		ret = dbg->iob.read_at (dbg->iob.io, p->start_addr, map_content, size);
+		if (!ret) {
+			eprintf ("Problems reading %"PFMTSZd" bytes at %"PFMT64x"\n", size, (ut64)p->start_addr);
 		} else {
 			ret = r_buf_append_bytes (dest, (const ut8*)map_content, size);
 			if (!ret) {
 				eprintf ("r_buf_append_bytes - failed\n");
-				/* Huge map files can be a problem here:
-					Because sometimes r_buf_append_bytes fails reallocing new size due to a high memory usage.
-					Little trick for freeing some mem would be flush everything to disk and start from scratch. */
-				/* We need a trick */
 			}
 		}
 		free (map_content);
@@ -793,7 +787,7 @@
 	char *temp_p_uid, *temp_p_gid, *p_uid, *p_gid;
 	ut16 filter_flags, default_filter_flags = 0x33;
 	char *buff;
-	const char *file = sdb_fmt (0, "/proc/%d/stat", dbg->pid);
+	const char *file = sdb_fmt ("/proc/%d/stat", dbg->pid);
 	int size;
 
 	buff = r_file_slurp (file, &size);
@@ -827,7 +821,7 @@
 		eprintf ("Warning: number of threads is < 1\n");
 		return NULL;
 	}
-	file = sdb_fmt (0, "/proc/%d/status", dbg->pid);
+	file = sdb_fmt ("/proc/%d/status", dbg->pid);
 	buff = r_file_slurp (file, &size);
 	if (!buff) {
 		free (p);
@@ -867,7 +861,7 @@
 
 	free (buff);
 	/* Check the coredump_filter value if we have*/
-	file = sdb_fmt (0, "/proc/%d/coredump_filter", dbg->pid);
+	file = sdb_fmt ("/proc/%d/coredump_filter", dbg->pid);
 	buff = r_file_slurp (file, &size);
 	if (buff) {
 		sscanf (buff, "%hx", &filter_flags);
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/linux/linux_coredump.h radare2-2.8.0+dfsg/libr/debug/p/native/linux/linux_coredump.h
--- radare2-2.3.0+dfsg/libr/debug/p/native/linux/linux_coredump.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/linux/linux_coredump.h	2018-08-07 14:12:36.000000000 +0000
@@ -47,7 +47,7 @@
 
 #define XSTATE_SSE_MASK         (X87_BIT|SSE_BIT)
 #define XSTATE_AVX_MASK         (XSTATE_SSE_MASK|AVX_BIT)
-#define XSTATE_MPX_MASK         MPX_BIT
+#define XSTATE_MPX_MASK         (MPX_BIT|XSTATE_AVX_MASK|XSTATE_SSE_MASK)
 #define XSTATE_AVX512_MASK      (XSTATE_AVX_MASK|AVX512_FULL_BIT)
 /*********************************/
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/linux/linux_debug.c radare2-2.8.0+dfsg/libr/debug/p/native/linux/linux_debug.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/linux/linux_debug.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/linux/linux_debug.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2016 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_userconf.h>
 
@@ -75,7 +75,7 @@
 		//ptrace (PTRACE_SETSIGINFO, dbg->pid, 0, &siginfo);
 		dbg->reason.type = R_DEBUG_REASON_SIGNAL;
 		dbg->reason.signum = siginfo.si_signo;
-		//dbg->stopaddr = siginfo.si_addr;
+		dbg->stopaddr = (ut64)siginfo.si_addr;
 		//dbg->errno = siginfo.si_errno;
 		// siginfo.si_code -> HWBKPT, USER, KERNEL or WHAT
 #warning DO MORE RDEBUGREASON HERE
@@ -105,7 +105,7 @@
 				}
 				if (dbg->reason.type != R_DEBUG_REASON_NEW_LIB &&
 					dbg->reason.type != R_DEBUG_REASON_EXIT_LIB) {
-					dbg->reason.bp_addr = (ut64)siginfo.si_addr;
+					dbg->reason.bp_addr = (ut64)(size_t)siginfo.si_addr;
 					dbg->reason.type = R_DEBUG_REASON_BREAKPOINT;
 				}
 			}
@@ -125,7 +125,7 @@
 			eprintf ("[+] SIGNAL %d errno=%d addr=0x%08"PFMT64x
 				" code=%d ret=%d\n",
 				siginfo.si_signo, siginfo.si_errno,
-				(ut64)siginfo.si_addr, siginfo.si_code, ret);
+				(ut64)(size_t)siginfo.si_addr, siginfo.si_code, ret);
 		}
 		return true;
 	}
@@ -295,28 +295,6 @@
 	r_debug_select (dbg, dbg->forked_pid, dbg->forked_pid);
 }
 
-static RDebugPid *find_rdebug_pid (RDebug *dbg, int pid) {
-	RList *list = dbg->threads;
-	if (list) {
-		RDebugPid *th;
-		RListIter *it;
-		r_list_foreach (list, it, th) {
-			if (th->pid == pid) {
-				return th;
-			}
-		}
-	}
-	return NULL;
-}
-
-static bool get_pid_signalled_status (RDebug *dbg, int pid) {
-	RDebugPid *th = find_rdebug_pid (dbg, pid);
-	if (th) {
-		return th->signalled;
-	}
-	return false;
-}
-
 RDebugReasonType linux_dbg_wait(RDebug *dbg, int my_pid) {
 	RDebugReasonType reason = R_DEBUG_REASON_UNKNOWN;
 	int pid = (dbg->continue_all_threads && dbg->n_threads) ? -1 : dbg->main_pid;
@@ -780,7 +758,7 @@
 	}
 #endif
 #else
-#warning not implemented for this platform
+#warning print_fpu not implemented for this platform
 #endif
 }
 
@@ -875,7 +853,7 @@
 		}
 		}
 #else
-	#warning not implemented for this platform
+	#warning getfpregs not implemented for this platform
 #endif
 		break;
 	case R_REG_TYPE_SEG:
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/linux/reg/linux-arm64.h radare2-2.8.0+dfsg/libr/debug/p/native/linux/reg/linux-arm64.h
--- radare2-2.3.0+dfsg/libr/debug/p/native/linux/reg/linux-arm64.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/linux/reg/linux-arm64.h	2018-08-07 14:12:36.000000000 +0000
@@ -8,11 +8,11 @@
 "=A1	x1\n"
 "=A2	x2\n"
 "=A3	x3\n"
-#if 0
 "=ZF	zf\n"
 "=SF	nf\n"
 "=OF	vf\n"
 "=CF	cf\n"
+#if 0
 "=SN	ox8\n"
 #endif
 "gpr	x0	.64	0	0\n"
@@ -48,7 +48,151 @@
 "gpr	x30	.64	240	0\n"
 "gpr	sp	.64	248	0\n"
 "gpr	pc	.64	256	0\n"
+
+// 8 bit
+
+"gpr	b0	.8	0	0\n"
+"gpr	b1	.8	8	0\n"
+"gpr	b2	.8	16	0\n"
+"gpr	b3	.8	24	0\n"
+"gpr	b4	.8	32	0\n"
+"gpr	b5	.8	40	0\n"
+"gpr	b6	.8	48	0\n"
+"gpr	b7	.8	56	0\n"
+"gpr	b8	.8	64	0\n"
+"gpr	b9	.8	72	0\n"
+"gpr	b10	.8	80	0\n"
+"gpr	b11	.8	88	0\n"
+"gpr	b12	.8	96	0\n"
+"gpr	b13	.8	104	0\n"
+"gpr	b14	.8	112	0\n"
+"gpr	b15	.8	120	0\n"
+"gpr	b16	.8	128	0\n"
+"gpr	b17	.8	136	0\n"
+"gpr	b18	.8	144	0\n"
+"gpr	b19	.8	152	0\n"
+"gpr	b20	.8	160	0\n"
+"gpr	b21	.8	168	0\n"
+"gpr	b22	.8	176	0\n"
+"gpr	b23	.8	184	0\n"
+"gpr	b24	.8	192	0\n"
+"gpr	b25	.8	200	0\n"
+"gpr	b26	.8	208	0\n"
+"gpr	b27	.8	216	0\n"
+"gpr	b28	.8	224	0\n"
+"gpr	b29	.8	232	0\n"
+"gpr	b30	.8	240	0\n"
+"gpr	bsp	.8	248	0\n"
+
+// 16 bit
+
+"gpr	h0	.16	0	0\n"
+"gpr	h1	.16	8	0\n"
+"gpr	h2	.16	16	0\n"
+"gpr	h3	.16	24	0\n"
+"gpr	h4	.16	32	0\n"
+"gpr	h5	.16	40	0\n"
+"gpr	h6	.16	48	0\n"
+"gpr	h7	.16	56	0\n"
+"gpr	h8	.16	64	0\n"
+"gpr	h9	.16	72	0\n"
+"gpr	h10	.16	80	0\n"
+"gpr	h11	.16	88	0\n"
+"gpr	h12	.16	96	0\n"
+"gpr	h13	.16	104	0\n"
+"gpr	h14	.16	112	0\n"
+"gpr	h15	.16	120	0\n"
+"gpr	h16	.16	128	0\n"
+"gpr	h17	.16	136	0\n"
+"gpr	h18	.16	144	0\n"
+"gpr	h19	.16	152	0\n"
+"gpr	h20	.16	160	0\n"
+"gpr	h21	.16	168	0\n"
+"gpr	h22	.16	176	0\n"
+"gpr	h23	.16	184	0\n"
+"gpr	h24	.16	192	0\n"
+"gpr	h25	.16	200	0\n"
+"gpr	h26	.16	208	0\n"
+"gpr	h27	.16	216	0\n"
+"gpr	h28	.16	224	0\n"
+"gpr	h29	.16	232	0\n"
+"gpr	h30	.16	240	0\n"
+
+// 32 bit
+
+"gpr	w0	.32	0	0\n"
+"gpr	w1	.32	8	0\n"
+"gpr	w2	.32	16	0\n"
+"gpr	w3	.32	24	0\n"
+"gpr	w4	.32	32	0\n"
+"gpr	w5	.32	40	0\n"
+"gpr	w6	.32	48	0\n"
+"gpr	w7	.32	56	0\n"
+"gpr	w8	.32	64	0\n"
+"gpr	w9	.32	72	0\n"
+"gpr	w10	.32	80	0\n"
+"gpr	w11	.32	88	0\n"
+"gpr	w12	.32	96	0\n"
+"gpr	w13	.32	104	0\n"
+"gpr	w14	.32	112	0\n"
+"gpr	w15	.32	120	0\n"
+"gpr	w16	.32	128	0\n"
+"gpr	w17	.32	136	0\n"
+"gpr	w18	.32	144	0\n"
+"gpr	w19	.32	152	0\n"
+"gpr	w20	.32	160	0\n"
+"gpr	w21	.32	168	0\n"
+"gpr	w22	.32	176	0\n"
+"gpr	w23	.32	184	0\n"
+"gpr	w24	.32	192	0\n"
+"gpr	w25	.32	200	0\n"
+"gpr	w26	.32	208	0\n"
+"gpr	w27	.32	216	0\n"
+"gpr	w28	.32	224	0\n"
+"gpr	w29	.32	232	0\n"
+"gpr	w30	.32	240	0\n"
+"gpr	wsp	.32	248	0\n"
+"gpr	wzr	.32	272	0\n"
+
+"gpr	d0	.64	0	0\n"
+"gpr	d1	.64	8	0\n"
+"gpr	d2	.64	16	0\n"
+"gpr	d3	.64	24	0\n"
+"gpr	d4	.64	32	0\n"
+"gpr	d5	.64	40	0\n"
+"gpr	d6	.64	48	0\n"
+"gpr	d7	.64	56	0\n"
+"gpr	d8	.64	64	0\n"
+"gpr	d9	.64	72	0\n"
+"gpr	d10	.64	80	0\n"
+"gpr	d11	.64	88	0\n"
+"gpr	d12	.64	96	0\n"
+"gpr	d13	.64	104	0\n"
+"gpr	d14	.64	112	0\n"
+"gpr	d15	.64	120	0\n"
+"gpr	d16	.64	128	0\n"
+"gpr	d17	.64	136	0\n"
+"gpr	d18	.64	144	0\n"
+"gpr	d19	.64	152	0\n"
+"gpr	d20	.64	160	0\n"
+"gpr	d21	.64	168	0\n"
+"gpr	d22	.64	176	0\n"
+"gpr	d23	.64	184	0\n"
+"gpr	d24	.64	192	0\n"
+"gpr	d25	.64	200	0\n"
+"gpr	d26	.64	208	0\n"
+"gpr	d27	.64	216	0\n"
+"gpr	d28	.64	224	0\n"
+"gpr	d29	.64	232	0\n"
+"gpr	d30	.64	240	0\n"
+"gpr	dsp	.64	248	0\n"
+
 "gpr	pstate	.64	264	0\n"
+"flg	fstate	.64	264	0   _____tfiae_____________j__qvczn\n"
+"flg	vf	.1	264.28	0	overflow\n"
+"flg	cf	.1	264.29	0	carry\n"
+"flg	zf	.1	264.30	0	zero\n"
+"flg	nf	.1	264.31	0	sign\n"
 // extra linux regs in struct
 //"gpr	ox0	.64	272	0\n"
 //"gpr	sysno	.64	280	0\n"
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/linux/reg/linux-mips64.h radare2-2.8.0+dfsg/libr/debug/p/native/linux/reg/linux-mips64.h
--- radare2-2.3.0+dfsg/libr/debug/p/native/linux/reg/linux-mips64.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/linux/reg/linux-mips64.h	2018-08-07 14:12:36.000000000 +0000
@@ -64,8 +64,9 @@
 	"gpr	s5	.64	168	0\n"
 	"gpr	s6	.64	176	0\n"
 	"gpr	s7	.64	184	0\n"
-	"gpr	s8	.64	192	0\n"
-	"gpr	s9	.64	200	0\n"
+	/* tmp */
+	"gpr	t8	.64	192	0\n"
+	"gpr	t9	.64	200	0\n"
 	/* special */
 	"gpr	k0	.64	208	0\n"
 	"gpr	k1	.64	216	0\n"
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/linux/reg/linux-mips.h radare2-2.8.0+dfsg/libr/debug/p/native/linux/reg/linux-mips.h
--- radare2-2.3.0+dfsg/libr/debug/p/native/linux/reg/linux-mips.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/linux/reg/linux-mips.h	2018-08-07 14:12:36.000000000 +0000
@@ -78,8 +78,9 @@
         "gpr    s5      .32     172     0\n"
         "gpr    s6      .32     180     0\n"
         "gpr    s7      .32     188     0\n"
-        "gpr    s8      .32     196     0\n"
-        "gpr    s9      .32     204     0\n"
+	/* tmp */
+        "gpr    t8      .32     196     0\n"
+        "gpr    t9      .32     204     0\n"
         /* special */
         "gpr    k0      .32     212     0\n"
         "gpr    k1      .32     220     0\n"
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/procfs.c radare2-2.8.0+dfsg/libr/debug/p/native/procfs.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/procfs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/procfs.c	2018-08-07 14:12:36.000000000 +0000
@@ -23,8 +23,6 @@
 		ret = 0;
 	} else if (nr < 0) {
 		r_sys_perror ("read");
-	} else {
-		eprintf ("proc_pid_slurp: got EOF reading from \"%s\"\n", filename);
 	}
 	close (fd);
 	free (filename);
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/w32.c radare2-2.8.0+dfsg/libr/debug/p/native/w32.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/w32.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/w32.c	2018-08-07 14:12:36.000000000 +0000
@@ -641,8 +641,11 @@
 			ret = R_DEBUG_REASON_NEW_PID;
 			break;
 		case EXIT_PROCESS_DEBUG_EVENT:
-			eprintf ("(%d) Process %d exited with exit code %d\n", (int)de.dwProcessId, (int)de.dwProcessId,
+			//eprintf ("(%d) Process %d exited with exit code %d\n", (int)de.dwProcessId, (int)de.dwProcessId,
+			//	(int)de.u.ExitProcess.dwExitCode);
+			r_cons_printf ("(%d) Process %d exited with exit code %d\n", (int)de.dwProcessId, (int)de.dwProcessId,
 				(int)de.u.ExitProcess.dwExitCode);
+			r_cons_flush ();
 			//debug_load();
 			next_event = 0;
 			exited_already = pid;
@@ -692,12 +695,17 @@
 			ret = R_DEBUG_REASON_EXIT_LIB;
 			break;
 		case OUTPUT_DEBUG_STRING_EVENT:
-			eprintf ("(%d) Debug string\n", pid);
+			//eprintf ("(%d) Debug string\n", pid);
+			r_cons_printf ("(%d) Debug string\n", pid);
+			r_cons_flush ();
+
 			r_debug_native_continue (dbg, pid, tid, -1);
 			next_event = 1;
 			break;
 		case RIP_EVENT:
-			eprintf ("(%d) RIP event\n", pid);
+			//eprintf ("(%d) RIP event\n", pid);
+			r_cons_printf ("(%d) RIP event\n", pid);
+			r_cons_flush ();
 			r_debug_native_continue (dbg, pid, tid, -1);
 			next_event = 1;
 			// XXX unknown ret = R_DEBUG_REASON_TRAP;
@@ -911,7 +919,7 @@
 	}
 }
 
-static int GetAVX (HANDLE hThread, ut128 * xmm, ut128 * ymm) {
+static int GetAVX (HANDLE hThread, ut128 xmm[16], ut128 ymm[16]) {
 	BOOL Success;
 	int nRegs = 0, Index = 0;
 	DWORD ContextSize = 0;
@@ -1051,7 +1059,7 @@
 		eprintf ("XMM%i %016"PFMT64x" %016"PFMT64x"\n", x, xmm[x].High, xmm[x].Low);
 	}
 	// show Ymm regs
-	nymm = GetAVX (hThread, &xmm, &ymm);
+	nymm = GetAVX (hThread, xmm, ymm);
 	if (nymm) {
 		for (x = 0; x < nymm; x++) {
 			eprintf ("Ymm%d: %016"PFMT64x" %016"PFMT64x" %016"PFMT64x" %016"PFMT64x"\n", x, ymm[x].High, ymm[x].Low, xmm[x].High, xmm[x].Low );
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/xnu/xnu_debug.c radare2-2.8.0+dfsg/libr/debug/p/native/xnu/xnu_debug.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/xnu/xnu_debug.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/xnu/xnu_debug.c	2018-08-07 14:12:36.000000000 +0000
@@ -1170,7 +1170,7 @@
 	ut64 info_array_address;
 	void *info_array = NULL;
 	//void *header_data = NULL;
-	char file_path[MAXPATHLEN];
+	char file_path[MAXPATHLEN] = {0};
 	count = TASK_DYLD_INFO_COUNT;
 	task_t task = pid_to_task (dbg->tid);
 	ut64 addr, file_path_address;
@@ -1232,8 +1232,9 @@
 			addr = info->image_load_address;
 			file_path_address = info->image_file_path;
 		}
+		memset (file_path, 0, MAXPATHLEN);
 		dbg->iob.read_at (dbg->iob.io, file_path_address,
-				(ut8*)file_path, MAXPATHLEN);
+				(ut8*)file_path, MAXPATHLEN - 1);
 		//eprintf ("--> %d 0x%08"PFMT64x" %s\n", i, addr, file_path);
 		size = mach0_size (dbg, addr);
 		mr = r_debug_map_new (file_path, addr, addr + size, 7, 0);
diff -Nru radare2-2.3.0+dfsg/libr/debug/p/native/xnu/xnu_excthreads.c radare2-2.8.0+dfsg/libr/debug/p/native/xnu/xnu_excthreads.c
--- radare2-2.3.0+dfsg/libr/debug/p/native/xnu/xnu_excthreads.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/p/native/xnu/xnu_excthreads.c	2018-08-07 14:12:36.000000000 +0000
@@ -304,16 +304,18 @@
 		ret = R_DEBUG_REASON_SEGFAULT;
 		*ret_code = KERN_FAILURE;
 		kr = task_suspend (msg->task.name);
-		if (kr != KERN_SUCCESS)
+		if (kr != KERN_SUCCESS) {
 			eprintf ("failed to suspend task bad access\n");
+		}
 		eprintf ("EXC_BAD_ACCESS\n");
 		break;
 	case EXC_BAD_INSTRUCTION:
 		ret = R_DEBUG_REASON_ILLEGAL;
 		*ret_code = KERN_FAILURE;
 		kr = task_suspend (msg->task.name);
-		if (kr != KERN_SUCCESS)
+		if (kr != KERN_SUCCESS) {
 			eprintf ("failed to suspend task bad instruction\n");
+		}
 		eprintf ("EXC_BAD_INSTRUCTION\n");
 		break;
 	case EXC_ARITHMETIC:
@@ -327,8 +329,9 @@
 		break;
 	case EXC_BREAKPOINT:
 		kr = task_suspend (msg->task.name);
-		if (kr != KERN_SUCCESS)
+		if (kr != KERN_SUCCESS) {
 			eprintf ("failed to suspend task breakpoint\n");
+		}
 		ret = R_DEBUG_REASON_BREAKPOINT;
 		break;
 	default:
@@ -388,8 +391,9 @@
 					MACH_PORT_NULL);
 			if (reply.Head.msgh_remote_port != 0 && kr != MACH_MSG_SUCCESS) {
 				kr = mach_port_deallocate(mach_task_self (), reply.Head.msgh_remote_port);
-				if (kr != KERN_SUCCESS)
+				if (kr != KERN_SUCCESS) {
 					eprintf ("failed to deallocate reply port\n");
+				}
 			}
 			continue;
 		}
@@ -407,6 +411,7 @@
 		}
 		break; // to avoid infinite loops
 	}
+	dbg->stopaddr = r_debug_reg_get (dbg, "PC");
 	return reason;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/debug/plugin.c radare2-2.8.0+dfsg/libr/debug/plugin.c
--- radare2-2.3.0+dfsg/libr/debug/plugin.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/plugin.c	2018-08-07 14:12:36.000000000 +0000
@@ -57,11 +57,19 @@
 	spaces[15] = 0;
 	RDebugPlugin *h;
 	RListIter *iter;
+	if (mode == 'j') {
+		dbg->cb_printf ("[");
+	}
 	r_list_foreach (dbg->plugins, iter, h) {
 		int sp = 8-strlen (h->name);
 		spaces[sp] = 0;
 		if (mode == 'q') {
 			dbg->cb_printf ("%s\n", h->name);
+		} else if (mode == 'j') {
+			dbg->cb_printf ("%s{\"name\":\"%s\",\"license\":\"%s\"}",
+							(count ? "," : ""),
+							h->name,
+							h->license);
 		} else {
 			dbg->cb_printf ("%d  %s  %s %s%s\n",
 					count, (h == dbg->h)? "dbg": "---",
@@ -70,6 +78,9 @@
 		spaces[sp] = ' ';
 		count++;
 	}
+	if (mode == 'j') {
+		dbg->cb_printf ("]");
+	}
 	return false;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/debug/snap.c radare2-2.8.0+dfsg/libr/debug/snap.c
--- radare2-2.3.0+dfsg/libr/debug/snap.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/snap.c	2018-08-07 14:12:36.000000000 +0000
@@ -24,14 +24,13 @@
 
 R_API int r_debug_snap_delete(RDebug *dbg, int idx) {
 	ut32 count = 0;
-	RDebugSnap *snap;
 	RListIter *iter;
 	if (idx == -1) {
 		r_list_free (dbg->snaps);
 		dbg->snaps = r_list_newf (r_debug_snap_free);
 		return 1;
 	}
-	r_list_foreach (dbg->snaps, iter, snap) {
+	r_list_foreach_iter (dbg->snaps, iter) {
 		if (idx != -1) {
 			if (idx != count) {
 				continue;
diff -Nru radare2-2.3.0+dfsg/libr/debug/trace.c radare2-2.8.0+dfsg/libr/debug/trace.c
--- radare2-2.3.0+dfsg/libr/debug/trace.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/debug/trace.c	2018-08-07 14:12:36.000000000 +0000
@@ -54,7 +54,7 @@
 		return false;
 	}
 	(void)dbg->iob.read_at (dbg->iob.io, pc, buf, sizeof (buf));
-	if (r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf)) < 1) {
+	if (r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf), R_ANAL_OP_MASK_ESIL) < 1) {
 		eprintf ("trace_pc: cannot get opcode size at 0x%"PFMT64x"\n", pc);
 		return false;
 	}
@@ -81,7 +81,7 @@
 	RDebugTracepoint *trace;
 #if R_DEBUG_SDB_TRACES
 	trace = (RDebugTracepoint*)(void*)(size_t)sdb_num_get (db,
-		sdb_fmt (0, "trace.%d.%"PFMT64x, tag, addr), NULL);
+		sdb_fmt ("trace.%d.%"PFMT64x, tag, addr), NULL);
 	return trace;
 #else
 	RListIter *iter;
@@ -144,10 +144,12 @@
 		tp->times = 1;
 		r_list_append (dbg->trace->traces, tp);
 #if R_DEBUG_SDB_TRACES
-		sdb_num_set (dbg->trace->db, sdb_fmt (0, "trace.%d.%"PFMT64x, tag, addr),
+		sdb_num_set (dbg->trace->db, sdb_fmt ("trace.%d.%"PFMT64x, tag, addr),
 			(ut64)(size_t)tp, 0);
 #endif
-	} else tp->times++;
+	} else {
+		tp->times++;
+	}
 	return tp;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/egg/egg.c radare2-2.8.0+dfsg/libr/egg/egg.c
--- radare2-2.3.0+dfsg/libr/egg/egg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/egg/egg.c	2018-08-07 14:12:36.000000000 +0000
@@ -53,10 +53,9 @@
 	RListIter *iter;
 	RAsmPlugin *h;
 	// TODO: cache foo->name length and use memcmp instead of strcmp
-	if (!foo->name)
+	if (!foo->name) {
 		return false;
-	//if (foo->init)
-	//	foo->init (a->user);
+	}
 	r_list_foreach (a->plugins, iter, h) {
 		if (!strcmp (h->name, foo->name)) {
 			return false;
@@ -71,18 +70,19 @@
 }
 
 R_API void r_egg_free (REgg *egg) {
-	if (!egg) return;
-	r_buf_free (egg->src);
-	r_buf_free (egg->buf);
-	r_buf_free (egg->bin);
-	r_list_free (egg->list);
-	r_asm_free (egg->rasm);
-	r_syscall_free (egg->syscall);
-	sdb_free (egg->db);
-	r_list_free (egg->plugins);
-	r_list_free (egg->patches);
-	r_egg_lang_free (egg);
-	free (egg);
+	if (egg) {
+		r_buf_free (egg->src);
+		r_buf_free (egg->buf);
+		r_buf_free (egg->bin);
+		r_list_free (egg->list);
+		r_asm_free (egg->rasm);
+		r_syscall_free (egg->syscall);
+		sdb_free (egg->db);
+		r_list_free (egg->plugins);
+		r_list_free (egg->patches);
+		r_egg_lang_free (egg);
+		free (egg);
+	}
 }
 
 R_API void r_egg_reset (REgg *egg) {
diff -Nru radare2-2.3.0+dfsg/libr/egg/egg_Cfile.c radare2-2.8.0+dfsg/libr/egg/egg_Cfile.c
--- radare2-2.3.0+dfsg/libr/egg/egg_Cfile.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/egg/egg_Cfile.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,344 @@
+/* radare - LGPL - Copyright 2011-2018 - pancake */
+
+#include <r_egg.h>
+
+// compilation environment
+struct cEnv_t {
+	char *SFLIBPATH;
+	char *CC;
+	const char *OBJCOPY;
+	char *CFLAGS;
+	char *LDFLAGS;
+	const char *JMP;
+	const char *FMT;
+	char *SHDR;
+	char *TRIPLET;
+	const char *TEXT;
+};
+
+static char* r_egg_Cfile_getCompiler(void) {
+	size_t i;
+	const char *compilers[] = {"llvm-gcc", "clang", "gcc"};
+	char *output = r_sys_getenv ("CC");
+
+	if (output) {
+		return output;
+	}
+
+	for (i = 0; i < 3; i++) { 
+		output = r_file_path (compilers[i]);
+		if (strcmp (output, compilers[i])) {
+			free (output);
+			return strdup (compilers[i]);
+		}
+		free (output);
+	}
+
+	eprintf ("Couldn't find a compiler ! Please, set CC.\n");
+	return NULL;
+}
+
+static inline bool r_egg_Cfile_armOrMips(const char *arch) {
+	return (!strcmp (arch, "arm") || !strcmp (arch, "arm64") || !strcmp (arch, "aarch64")
+	  	|| !strcmp (arch, "thumb") || !strcmp (arch, "arm32") || !strcmp (arch, "mips")
+		|| !strcmp (arch, "mips32") || !strcmp (arch, "mips64"));
+}
+
+static void r_egg_Cfile_free_cEnv(struct cEnv_t *cEnv) {
+	if (cEnv) {
+		free (cEnv->SFLIBPATH);
+		free (cEnv->CC);
+		free (cEnv->CFLAGS);
+		free (cEnv->LDFLAGS);
+		free (cEnv->SHDR);
+		free (cEnv->TRIPLET);
+	}
+	free (cEnv);
+}
+
+static inline bool r_egg_Cfile_check_cEnv(struct cEnv_t *cEnv) {
+	return (!cEnv->SFLIBPATH || !cEnv->CC || !cEnv->CFLAGS || !cEnv->LDFLAGS
+		|| !cEnv->SHDR || !cEnv->TRIPLET);
+}
+
+static struct cEnv_t* r_egg_Cfile_set_cEnv(const char *arch, const char *os, int bits) {
+	struct cEnv_t *cEnv = calloc (1, sizeof (struct cEnv_t));
+	bool use_clang;
+	char *buffer = NULL;
+	char *output = NULL;
+
+	if (!cEnv) {
+		return NULL;
+	}
+
+	if (!(cEnv->CC = r_egg_Cfile_getCompiler())) {
+		goto fail;
+	}
+
+	cEnv->SFLIBPATH = r_sys_getenv ("SFLIBPATH");
+	if (!cEnv->SFLIBPATH) {
+		output = r_sys_cmd_strf ("r2 -hh | grep INCDIR | awk '{print $2}'");
+		if (!output || (output[0] == '\0')) {
+			eprintf ("Cannot find SFLIBPATH env var.\n"
+		  		 "Please define it, or fix r2 installation.\n");
+			goto fail;
+		}
+    
+		output[strlen (output) - 1] = '\0'; // strip the ending '\n'
+		if (!(cEnv->SFLIBPATH = r_str_newf ("%s/sflib", output))) {
+			goto fail;
+		}
+	}
+
+	cEnv->JMP = r_egg_Cfile_armOrMips (arch) ? "b" : "jmp";
+
+	if (!strcmp (os, "darwin")) {
+		cEnv->OBJCOPY = "gobjcopy";
+		cEnv->FMT = "mach0";
+		if (!strcmp (arch, "x86")) {
+			if (bits == 32) {
+				cEnv->CFLAGS = strdup ("-arch i386");
+				cEnv->LDFLAGS = strdup ("-arch i386 -shared -c");
+			} else {
+				cEnv->CFLAGS = strdup ("-arch x86_64");
+				cEnv->LDFLAGS = strdup ("-arch x86_64 -shared -c");
+			}
+		} else {
+			cEnv->LDFLAGS = strdup ("-shared -c");
+		}
+		cEnv->SHDR = r_str_newf ("\n.text\n%s _main\n", cEnv->JMP);
+
+	} else {
+		cEnv->OBJCOPY = "objcopy";
+		cEnv->FMT = "elf";
+		cEnv->SHDR = r_str_newf ("\n.section .text\n.globl  main\n"
+				   "// .type   main, @function\n%s main\n", cEnv->JMP);
+		if (!strcmp (arch, "x86")) {
+			if (bits == 32) {
+				cEnv->CFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m32");
+				cEnv->LDFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m32");
+			} else {
+				cEnv->CFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m64");
+				cEnv->LDFLAGS = strdup ("-fPIC -fPIE -pie -fpic -m64");
+			}
+		} else {
+			cEnv->CFLAGS = strdup ("-fPIC -fPIE -pie -fpic -nostartfiles");
+			cEnv->LDFLAGS = strdup ("-fPIC -fPIE -pie -fpic -nostartfiles");
+		}
+	}
+
+	cEnv->TRIPLET = r_str_newf ("%s-%s-%d", os, arch, bits);
+
+	if (!strcmp (os, "windows")) {
+		cEnv->TEXT = ".text";
+		cEnv->FMT = "pe";
+	} else if (!strcmp (os, "darwin")) {
+		cEnv->TEXT = "0.__TEXT.__text";
+	} else {
+		cEnv->TEXT = ".text";
+	}
+		
+	use_clang = false;
+	if (!strcmp (cEnv->TRIPLET, "darwin-arm-64")) {
+		free (cEnv->CC);
+		cEnv->CC = strdup ("xcrun --sdk iphoneos gcc -arch arm64 -miphoneos-version-min=0.0");
+		use_clang = true;
+		cEnv->TEXT = "0.__TEXT.__text";
+	} else if (!strcmp (cEnv->TRIPLET, "darwin-arm-32")) {
+		free (cEnv->CC);
+		cEnv->CC = strdup ("xcrun --sdk iphoneos gcc -arch armv7 -miphoneos-version-min=0.0");
+		use_clang = true;
+		cEnv->TEXT = "0.__TEXT.__text";
+	}
+
+	buffer = r_str_newf ("%s -fno-stack-protector -nostdinc -include '%s'/'%s'/sflib.h",
+	  		cEnv->CFLAGS, cEnv->SFLIBPATH, cEnv->TRIPLET);
+	if (!buffer) {
+		goto fail;
+	}
+	free (cEnv->CFLAGS);
+	cEnv->CFLAGS = strdup (buffer);
+
+	if (use_clang) {
+		free (buffer);
+		buffer = r_str_newf ("%s -fomit-frame-pointer"
+		  		" -fno-zero-initialized-in-bss", cEnv->CFLAGS);
+		if (!buffer) {
+			goto fail;
+		}
+		free (cEnv->CFLAGS);
+		cEnv->CFLAGS = strdup (buffer);
+	} else { 
+		free (buffer);
+		buffer = r_str_newf ("%s -z execstack -fomit-frame-pointer"
+				" -finline-functions -fno-zero-initialized-in-bss", cEnv->CFLAGS);
+		if (!buffer) {
+			goto fail;
+		}
+		free (cEnv->CFLAGS);
+		cEnv->CFLAGS = strdup (buffer);
+	}
+	free (buffer);
+	buffer = r_str_newf ("%s -nostdlib", cEnv->LDFLAGS);
+	if (!buffer) {
+		goto fail;
+	}
+	free (cEnv->LDFLAGS);
+	cEnv->LDFLAGS = strdup (buffer);
+
+	if (r_egg_Cfile_check_cEnv (cEnv)) {
+		eprintf ("Error with cEnv allocation!\n");
+		goto fail;
+	}
+
+	free (buffer);
+	free (output);
+	return cEnv;
+
+fail:
+	free (buffer);
+	free (output);
+	r_egg_Cfile_free_cEnv (cEnv);
+	return NULL;
+}
+
+static bool r_egg_Cfile_parseCompiled(const char *file) {
+	char *fileExt = r_str_newf ("%s.tmp", file);
+	char *buffer = r_file_slurp (fileExt, NULL);
+
+	buffer = r_str_replace (buffer, "rdata", "text", false);
+	buffer = r_str_replace (buffer, "rodata", "text", false);
+	buffer = r_str_replace (buffer, "get_pc_thunk.bx", "__getesp__", true);
+
+	const char *words[] = {".cstring", "size", "___main", "section", "__alloca", "zero", "cfi"};
+	size_t i;
+	for (i = 0; i < 7; i++) {
+		r_str_stripLine (buffer, words[i]);
+	}
+
+	free (fileExt);
+	fileExt = r_str_newf ("%s.s", file);
+	if (!r_file_dump (fileExt, (const ut8*) buffer, strlen (buffer), true)) {
+		eprintf ("Error while opening %s.s\n", file);
+		goto fail;
+	}
+
+	free (buffer);
+	free (fileExt);
+	return true;
+
+fail:
+	free (buffer);
+	free (fileExt);
+	return false;
+}
+
+R_API char* r_egg_Cfile_parser(const char *file, const char *arch, const char *os, int bits) {
+	char *output = NULL;
+	char *fileExt = NULL; // "file" with extension (.s, .text, ...)
+	struct cEnv_t *cEnv = r_egg_Cfile_set_cEnv (arch, os, bits);
+
+	if (!cEnv) {
+		goto fail;
+	}
+
+	r_str_sanitize (cEnv->CC);
+
+	//printf ("==> Compile\n");
+	printf ("'%s' %s -o '%s.tmp' -S -Os '%s'\n", cEnv->CC, cEnv->CFLAGS, file, file);
+
+	output = r_sys_cmd_strf ("('%s' %s -o '%s.tmp' -S -Os '%s') 2>&1",
+	  			cEnv->CC, cEnv->CFLAGS, file, file);
+	if (output == NULL) {
+		eprintf ("Compilation failed!\n");
+		goto fail;
+	}
+	printf ("%s", output);
+
+	if (!(fileExt = r_str_newf ("%s.s", file))) {
+		goto fail;
+	}
+
+	if (!r_file_dump (fileExt, (const ut8*) cEnv->SHDR, strlen (cEnv->SHDR), false)) {
+		eprintf ("Error while opening %s.s\n", file);
+		goto fail;
+	}
+
+	if (!r_egg_Cfile_parseCompiled (file)) {
+		goto fail;
+	}
+
+	//printf ("==> Assemble\n");
+	printf ("'%s' %s -Os -o '%s.o' '%s.s'\n", cEnv->CC, cEnv->LDFLAGS, file, file);
+
+	free (output);
+	output = r_sys_cmd_strf ("'%s' %s -Os -o '%s.o' '%s.s'",
+		   		cEnv->CC, cEnv->LDFLAGS, file, file);
+	if (!output) {
+		eprintf ("Assembly failed!\n");
+		goto fail;
+	}
+	printf ("%s", output);
+
+	//printf ("==> Link\n");
+	printf ("rabin2 -o '%s.text' -O d/S/'%s' '%s.o'\n", file, cEnv->TEXT, file);
+
+	free (output);
+	output = r_sys_cmd_strf ("rabin2 -o '%s.text' -O d/S/'%s' '%s'.o",
+		   		file, cEnv->TEXT, file);
+	if (!output) {
+		eprintf ("Linkage failed!\n");
+		goto fail;
+	}
+
+	free (fileExt);
+	if (!(fileExt = r_str_newf ("%s.o", file))) {
+		goto fail;
+	}
+
+	if (!r_file_exists (fileExt)) {
+		eprintf ("Cannot find %s.o\n", file);
+		goto fail;
+	}
+
+	free (fileExt);
+	if (!(fileExt = r_str_newf ("%s.text", file))) {
+		goto fail;
+	}
+	if (r_file_size (fileExt) == 0) {
+		printf ("FALLBACK: Using objcopy instead of rabin2");
+
+		free (output);
+		output = r_sys_cmd_strf ("'%s' -j .text -O binary '%s.o' '%s.text'", 
+		  		cEnv->OBJCOPY, file, file);
+		if (!output) {
+			eprintf ("objcopy failed!\n");
+			goto fail;
+		}
+	}
+
+	size_t i;
+	const char *extArray[] = {"bin", "tmp", "s", "o"};
+	for (i = 0; i < 4; i++) {
+		free (fileExt);
+		if (!(fileExt = r_str_newf ("%s.%s", file, extArray[i]))) {
+			goto fail;
+		}
+		r_file_rm (fileExt);
+	}
+
+	free (fileExt);
+	if ((fileExt = r_str_newf ("%s.text", file)) == NULL) {
+		goto fail;
+	}
+
+	free (output);
+	r_egg_Cfile_free_cEnv (cEnv);
+	return fileExt;
+
+fail:
+	free (fileExt);
+	free (output);
+	r_egg_Cfile_free_cEnv (cEnv);
+	return NULL;
+}
diff -Nru radare2-2.3.0+dfsg/libr/egg/emit_x86.c radare2-2.8.0+dfsg/libr/egg/emit_x86.c
--- radare2-2.3.0+dfsg/libr/egg/emit_x86.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/egg/emit_x86.c	2018-08-07 14:12:36.000000000 +0000
@@ -141,14 +141,16 @@
 }
 
 static void emit_string(REgg *egg, const char *dstvar, const char *str, int j) {
-	char *p, *s, str2[64];
-	int i, len, oj = j;
+	char *p, str2[64];
+	int i, oj = j;
 
-	len = strlen (str);
-	s = malloc (len+4);
-	if (!s) return;
+	int len = strlen (str);
+	char *s = calloc (1, len + 8);
+	if (!s) {
+		return;
+	}
 	memcpy (s, str, len);
-	memset (s+len, 0, 4);
+	memset (s + len, 0, 4);
 
 	/* XXX: Hack: Adjust offset in R_BP correctly for 64b addresses */
 #define BPOFF R_SZ-4
@@ -159,7 +161,7 @@
 		ut32 *n = (ut32 *)(s+i-4);
 		p = r_egg_mkvar (egg, str2, dstvar, i+BPOFF);
 		if (attsyntax) r_egg_printf (egg, "  movl $0x%x, %s\n", M32(*n), p);
-		else r_egg_printf (egg, "  mov %s, 0x%x\n", p, M32(*n));
+		else r_egg_printf (egg, "  mov dword %s, 0x%x\n", p, M32(*n));
 		free (p);
 		j -= 4;
 	}
@@ -168,7 +170,7 @@
 	/* zero */
 	p = r_egg_mkvar (egg, str2, dstvar, i+BPOFF);
 	if (attsyntax) r_egg_printf (egg, "  movl $0, %s\n", p);
-	else r_egg_printf (egg, "  mov %s, 0\n", p);
+	else r_egg_printf (egg, "  mov dword %s, 0\n", p);
 	free (p);
 
 	/* store pointer */
diff -Nru radare2-2.3.0+dfsg/libr/egg/Makefile radare2-2.8.0+dfsg/libr/egg/Makefile
--- radare2-2.3.0+dfsg/libr/egg/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/egg/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -9,6 +9,7 @@
 OBJS+=emit_arm.o
 OBJS+=emit_x64.o
 OBJS+=emit_trace.o
+OBJS+=egg_Cfile.o
 
 all: ${LIBSO} ${LIBAR}
 
diff -Nru radare2-2.3.0+dfsg/libr/egg/meson.build radare2-2.8.0+dfsg/libr/egg/meson.build
--- radare2-2.3.0+dfsg/libr/egg/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/egg/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,24 +1,46 @@
-files=[
-'egg.c',
-'egg_lang.c',
-'emit_arm.c',
-'emit_trace.c',
-'emit_x64.c',
-'emit_x86.c',
-
-#'p/egg_bind.c',
-#'p/egg_cb.c',
-'p/egg_exec.c',
-#'p/egg_reverse.c',
-#'p/egg_shya.c',
-'p/egg_xor.c'
+files = [
+  'egg.c',
+  'egg_Cfile.c',
+  'egg_lang.c',
+  'emit_arm.c',
+  'emit_trace.c',
+  'emit_x64.c',
+  'emit_x86.c',
+  #'p/egg_bind.c',
+  #'p/egg_cb.c',
+  'p/egg_exec.c',
+  #'p/egg_reverse.c',
+  #'p/egg_shya.c',
+  'p/egg_xor.c'
 ]
+
 r_egg = library('r_egg', files,
   include_directories: [platform_inc],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_asm, r_syscall],
-  objects: [
-	libr2sdb.extract_all_objects(),
+  c_args: ['-DCORELIB=1'],
+  dependencies: [
+    r_util_dep,
+    r_asm_dep,
+    r_syscall_dep,
+    sdb_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_egg_dep = declare_dependency(link_with: r_egg,
+                               include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_egg],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_egg',
+  filebase: 'r_egg',
+  requires: [
+    'r_util',
+    'r_asm',
+    'r_syscall'
   ],
-  install: true
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/egg/rlcc/mpc/mpc.c radare2-2.8.0+dfsg/libr/egg/rlcc/mpc/mpc.c
--- radare2-2.3.0+dfsg/libr/egg/rlcc/mpc/mpc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/egg/rlcc/mpc/mpc.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,3617 +1,3617 @@
-#include "mpc.h"
-
-/*
-** State Type
-*/
-
-static mpc_state_t mpc_state_invalid(void) {
-  mpc_state_t s;
-  s.pos = -1;
-  s.row = -1;
-  s.col = -1;
-  return s;
-}
-
-static mpc_state_t mpc_state_new(void) {
-  mpc_state_t s;
-  s.pos = 0;
-  s.row = 0;
-  s.col = 0;
-  return s;
-}
-
-/*
-** Input Type
-*/
-
-/*
-** In mpc the input type has three modes of 
-** operation: String, File and Pipe.
-**
-** String is easy. The whole contents are 
-** loaded into a buffer and scanned through.
-** The cursor can jump around at will making 
-** backtracking easy.
-**
-** The second is a File which is also somewhat
-** easy. The contents are never loaded into 
-** memory but backtracking can still be achieved
-** by seeking in the file at different positions.
-**
-** The final mode is Pipe. This is the difficult
-** one. As we assume pipes cannot be seeked - and 
-** only support a single character lookahead at 
-** any point, when the input is marked for a 
-** potential backtracking we start buffering any 
-** input.
-**
-** This means that if we are requested to seek
-** back we can simply start reading from the
-** buffer instead of the input.
-**
-** Of course using `mpc_predictive` will disable
-** backtracking and make LL(1) grammars easy
-** to parse for all input methods.
-**
-*/
-
-enum {
-  MPC_INPUT_STRING = 0,
-  MPC_INPUT_FILE   = 1,
-  MPC_INPUT_PIPE   = 2
-};
-
-enum {
-  MPC_INPUT_MARKS_MIN = 32
-};
-
-enum {
-  MPC_INPUT_MEM_NUM = 512
-};
-
-typedef struct {
-  char mem[64];
-} mpc_mem_t;
-
-typedef struct {
-
-  int type;
-  char *filename;  
-  mpc_state_t state;
-  
-  char *string;
-  char *buffer;
-  FILE *file;
-  
-  int suppress;
-  int backtrack;
-  int marks_slots;
-  int marks_num;
-  mpc_state_t *marks;
-  
-  char *lasts;
-  char last;
-  
-  size_t mem_index;
-  char mem_full[MPC_INPUT_MEM_NUM];
-  mpc_mem_t mem[MPC_INPUT_MEM_NUM];
-  
-} mpc_input_t;
-
-static mpc_input_t *mpc_input_new_string(const char *filename, const char *string) {
-
-  mpc_input_t *i = malloc(sizeof(mpc_input_t));
-  
-  i->filename = malloc(strlen(filename) + 1);
-  strcpy(i->filename, filename);
-  i->type = MPC_INPUT_STRING;
-  
-  i->state = mpc_state_new();
-  
-  i->string = malloc(strlen(string) + 1);
-  strcpy(i->string, string);
-  i->buffer = NULL;
-  i->file = NULL;
-  
-  i->suppress = 0;
-  i->backtrack = 1;
-  i->marks_num = 0;
-  i->marks_slots = MPC_INPUT_MARKS_MIN;
-  i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
-  i->lasts = malloc(sizeof(char) * i->marks_slots);
-  i->last = '\0';
-  
-  i->mem_index = 0;
-  memset(i->mem_full, 0, sizeof(char) * MPC_INPUT_MEM_NUM);
-  
-  return i;
-}
-
-static mpc_input_t *mpc_input_new_pipe(const char *filename, FILE *pipe) {
-
-  mpc_input_t *i = malloc(sizeof(mpc_input_t));
-  
-  i->filename = malloc(strlen(filename) + 1);
-  strcpy(i->filename, filename);
-  
-  i->type = MPC_INPUT_PIPE;
-  i->state = mpc_state_new();
-  
-  i->string = NULL;
-  i->buffer = NULL;
-  i->file = pipe;
-  
-  i->suppress = 0;
-  i->backtrack = 1;
-  i->marks_num = 0;
-  i->marks_slots = MPC_INPUT_MARKS_MIN;
-  i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
-  i->lasts = malloc(sizeof(char) * i->marks_slots);
-  i->last = '\0';
-  
-  i->mem_index = 0;
-  memset(i->mem_full, 0, sizeof(char) * MPC_INPUT_MEM_NUM);
-  
-  return i;
-  
-}
-
-static mpc_input_t *mpc_input_new_file(const char *filename, FILE *file) {
-  
-  mpc_input_t *i = malloc(sizeof(mpc_input_t));
-  
-  i->filename = malloc(strlen(filename) + 1);
-  strcpy(i->filename, filename);
-  i->type = MPC_INPUT_FILE;
-  i->state = mpc_state_new();
-  
-  i->string = NULL;
-  i->buffer = NULL;
-  i->file = file;
-  
-  i->suppress = 0;
-  i->backtrack = 1;
-  i->marks_num = 0;
-  i->marks_slots = MPC_INPUT_MARKS_MIN;
-  i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
-  i->lasts = malloc(sizeof(char) * i->marks_slots);
-  i->last = '\0';
-  
-  i->mem_index = 0;
-  memset(i->mem_full, 0, sizeof(char) * MPC_INPUT_MEM_NUM);
-  
-  return i;
-}
-
-static void mpc_input_delete(mpc_input_t *i) {
-  
-  free(i->filename);
-  
-  if (i->type == MPC_INPUT_STRING) { free(i->string); }
-  if (i->type == MPC_INPUT_PIPE) { free(i->buffer); }
-  
-  free(i->marks);
-  free(i->lasts);
-  free(i);
-}
-
-static int mpc_mem_ptr(mpc_input_t *i, void *p) {
-  return
-    (char*)p >= (char*)(i->mem) &&
-    (char*)p <  (char*)(i->mem) + (MPC_INPUT_MEM_NUM * sizeof(mpc_mem_t));
-}
-
-static void *mpc_malloc(mpc_input_t *i, size_t n) {
-  size_t j;
-  char *p;
-  
-  if (n > sizeof(mpc_mem_t)) { return malloc(n); }
-  
-  j = i->mem_index;
-  do {
-    if (!i->mem_full[i->mem_index]) {
-      p = (void*)(i->mem + i->mem_index);
-      i->mem_full[i->mem_index] = 1;
-      i->mem_index = (i->mem_index+1) % MPC_INPUT_MEM_NUM;
-      return p;
-    }
-    i->mem_index = (i->mem_index+1) % MPC_INPUT_MEM_NUM;
-  } while (j != i->mem_index);
-  
-  return malloc(n);
-}
-
-static void *mpc_calloc(mpc_input_t *i, size_t n, size_t m) {
-  char *x = mpc_malloc(i, n * m);
-  memset(x, 0, n * m);
-  return x;
-}
-
-static void mpc_free(mpc_input_t *i, void *p) {
-  size_t j;
-  if (!mpc_mem_ptr(i, p)) { free(p); return; }
-  j = ((size_t)(((char*)p) - ((char*)i->mem))) / sizeof(mpc_mem_t);
-  i->mem_full[j] = 0;
-}
-
-static void *mpc_realloc(mpc_input_t *i, void *p, size_t n) {
-  
-  char *q = NULL;
-  
-  if (!mpc_mem_ptr(i, p)) { return realloc(p, n); }
-  
-  if (n > sizeof(mpc_mem_t)) {
-    q = malloc(n);
-    memcpy(q, p, sizeof(mpc_mem_t));
-    mpc_free(i, p);
-    return q;
-  }
-  
-  return p;
-}
-
-static void *mpc_export(mpc_input_t *i, void *p) {
-  char *q = NULL;
-  if (!mpc_mem_ptr(i, p)) { return p; }
-  q = malloc(sizeof(mpc_mem_t));
-  memcpy(q, p, sizeof(mpc_mem_t));
-  mpc_free(i, p);
-  return q; 
-}
-
-static void mpc_input_backtrack_disable(mpc_input_t *i) { i->backtrack--; }
-static void mpc_input_backtrack_enable(mpc_input_t *i) { i->backtrack++; }
-
-static void mpc_input_suppress_disable(mpc_input_t *i) { i->suppress--; }
-static void mpc_input_suppress_enable(mpc_input_t *i) { i->suppress++; }
-
-static void mpc_input_mark(mpc_input_t *i) {
-  
-  if (i->backtrack < 1) { return; }
-  
-  i->marks_num++;
-  
-  if (i->marks_num > i->marks_slots) {
-    i->marks_slots = i->marks_num + i->marks_num / 2;
-    i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_slots);
-    i->lasts = realloc(i->lasts, sizeof(char) * i->marks_slots);
-  }
-
-  i->marks[i->marks_num-1] = i->state;
-  i->lasts[i->marks_num-1] = i->last;
-  
-  if (i->type == MPC_INPUT_PIPE && i->marks_num == 1) {
-    i->buffer = calloc(1, 1);
-  }
-  
-}
-
-static void mpc_input_unmark(mpc_input_t *i) {
-  
-  if (i->backtrack < 1) { return; }
-  
-  i->marks_num--;
-  
-  if (i->marks_slots > i->marks_num + i->marks_num / 2
-  &&  i->marks_slots > MPC_INPUT_MARKS_MIN) {
-    i->marks_slots = 
-      i->marks_num > MPC_INPUT_MARKS_MIN ?
-      i->marks_num : MPC_INPUT_MARKS_MIN;
-    i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_slots);
-    i->lasts = realloc(i->lasts, sizeof(char) * i->marks_slots);      
-  }
-  
-  if (i->type == MPC_INPUT_PIPE && i->marks_num == 0) {
-    free(i->buffer);
-    i->buffer = NULL;
-  }
-  
-}
-
-static void mpc_input_rewind(mpc_input_t *i) {
-  
-  if (i->backtrack < 1) { return; }
-  
-  i->state = i->marks[i->marks_num-1];
-  i->last  = i->lasts[i->marks_num-1];
-  
-  if (i->type == MPC_INPUT_FILE) {
-    fseek(i->file, i->state.pos, SEEK_SET);
-  }
-  
-  mpc_input_unmark(i);
-}
-
-static int mpc_input_buffer_in_range(mpc_input_t *i) {
-  return i->state.pos < (long)(strlen(i->buffer) + i->marks[0].pos);
-}
-
-static char mpc_input_buffer_get(mpc_input_t *i) {
-  return i->buffer[i->state.pos - i->marks[0].pos];
-}
-
-static int mpc_input_terminated(mpc_input_t *i) {
-  if (i->type == MPC_INPUT_STRING && i->state.pos == (long)strlen(i->string)) { return 1; }
-  if (i->type == MPC_INPUT_FILE && feof(i->file)) { return 1; }
-  if (i->type == MPC_INPUT_PIPE && feof(i->file)) { return 1; }
-  return 0;
-}
-
-static char mpc_input_getc(mpc_input_t *i) {
-  
-  char c = '\0';
-  
-  switch (i->type) {
-    
-    case MPC_INPUT_STRING: return i->string[i->state.pos];
-    case MPC_INPUT_FILE: c = fgetc(i->file); return c;
-    case MPC_INPUT_PIPE:
-    
-      if (!i->buffer) { c = getc(i->file); return c; }
-      
-      if (i->buffer && mpc_input_buffer_in_range(i)) {
-        c = mpc_input_buffer_get(i);
-        return c;
-      } else {
-        c = getc(i->file);
-        return c;
-      }
-    
-    default: return c;
-  }
-}
-
-static char mpc_input_peekc(mpc_input_t *i) {
-  
-  char c = '\0';
-  
-  switch (i->type) {
-    case MPC_INPUT_STRING: return i->string[i->state.pos];
-    case MPC_INPUT_FILE: 
-      
-      c = fgetc(i->file);
-      if (feof(i->file)) { return '\0'; }
-      
-      fseek(i->file, -1, SEEK_CUR);
-      return c;
-    
-    case MPC_INPUT_PIPE:
-      
-      if (!i->buffer) {
-        c = getc(i->file);
-        if (feof(i->file)) { return '\0'; }
-        ungetc(c, i->file);
-        return c;
-      }
-      
-      if (i->buffer && mpc_input_buffer_in_range(i)) {
-        return mpc_input_buffer_get(i);
-      } else {
-        c = getc(i->file);
-        if (feof(i->file)) { return '\0'; }
-        ungetc(c, i->file);
-        return c;
-      }
-    
-    default: return c;
-  }
-  
-}
-
-static int mpc_input_failure(mpc_input_t *i, char c) {
-
-  switch (i->type) {
-    case MPC_INPUT_STRING: { break; }
-    case MPC_INPUT_FILE: fseek(i->file, -1, SEEK_CUR); { break; }
-    case MPC_INPUT_PIPE: {
-      
-      if (!i->buffer) { ungetc(c, i->file); break; }
-      
-      if (i->buffer && mpc_input_buffer_in_range(i)) {
-        break;
-      } else {
-        ungetc(c, i->file); 
-      }
-    }
-    default: { break; }
-  }
-  return 0;
-}
-
-static int mpc_input_success(mpc_input_t *i, char c, char **o) {
-  
-  if (i->type == MPC_INPUT_PIPE
-  &&  i->buffer && !mpc_input_buffer_in_range(i)) {
-    i->buffer = realloc(i->buffer, strlen(i->buffer) + 2);
-    i->buffer[strlen(i->buffer) + 1] = '\0';
-    i->buffer[strlen(i->buffer) + 0] = c;
-  }
-  
-  i->last = c;
-  i->state.pos++;
-  i->state.col++;
-  
-  if (c == '\n') {
-    i->state.col = 0;
-    i->state.row++;
-  }
-  
-  if (o) {
-    (*o) = mpc_malloc(i, 2);
-    (*o)[0] = c;
-    (*o)[1] = '\0';
-  }
-  
-  return 1;
-}
-
-static int mpc_input_any(mpc_input_t *i, char **o) {
-  char x = mpc_input_getc(i);
-  if (mpc_input_terminated(i)) { return 0; }
-  return mpc_input_success(i, x, o);
-}
-
-static int mpc_input_char(mpc_input_t *i, char c, char **o) {
-  char x = mpc_input_getc(i);
-  if (mpc_input_terminated(i)) { return 0; }
-  return x == c ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);
-}
-
-static int mpc_input_range(mpc_input_t *i, char c, char d, char **o) {
-  char x = mpc_input_getc(i);
-  if (mpc_input_terminated(i)) { return 0; }
-  return x >= c && x <= d ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
-}
-
-static int mpc_input_oneof(mpc_input_t *i, const char *c, char **o) {
-  char x = mpc_input_getc(i);
-  if (mpc_input_terminated(i)) { return 0; }
-  return strchr(c, x) != 0 ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
-}
-
-static int mpc_input_noneof(mpc_input_t *i, const char *c, char **o) {
-  char x = mpc_input_getc(i);
-  if (mpc_input_terminated(i)) { return 0; }
-  return strchr(c, x) == 0 ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
-}
-
-static int mpc_input_satisfy(mpc_input_t *i, int(*cond)(char), char **o) {
-  char x = mpc_input_getc(i);
-  if (mpc_input_terminated(i)) { return 0; }
-  return cond(x) ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
-}
-
-static int mpc_input_string(mpc_input_t *i, const char *c, char **o) {
-  
-  const char *x = c;
-
-  mpc_input_mark(i);
-  while (*x) {
-    if (!mpc_input_char(i, *x, NULL)) {
-      mpc_input_rewind(i);
-      return 0;
-    }
-    x++;
-  }
-  mpc_input_unmark(i);
-  
-  *o = mpc_malloc(i, strlen(c) + 1);
-  strcpy(*o, c);
-  return 1;
-}
-
-static int mpc_input_anchor(mpc_input_t* i, int(*f)(char,char), char **o) {
-  *o = NULL;
-  return f(i->last, mpc_input_peekc(i));
-}
-
-static mpc_state_t *mpc_input_state_copy(mpc_input_t *i) {
-  mpc_state_t *r = mpc_malloc(i, sizeof(mpc_state_t));
-  memcpy(r, &i->state, sizeof(mpc_state_t));
-  return r;
-}
-
-/*
-** Error Type
-*/
-
-void mpc_err_delete(mpc_err_t *x) {
-  int i;
-  for (i = 0; i < x->expected_num; i++) { free(x->expected[i]); }
-  free(x->expected);
-  free(x->filename);
-  free(x->failure);
-  free(x);
-}
-
-void mpc_err_print(mpc_err_t *x) {
-  mpc_err_print_to(x, stdout);
-}
-
-void mpc_err_print_to(mpc_err_t *x, FILE *f) {
-  char *str = mpc_err_string(x);
-  fprintf(f, "%s", str);
-  free(str);
-}
-
-static void mpc_err_string_cat(char *buffer, int *pos, int *max, char const *fmt, ...) {
-  /* TODO: Error Checking on Length */
-  int left = ((*max) - (*pos));
-  va_list va;
-  va_start(va, fmt);
-  if (left < 0) { left = 0;}
-  (*pos) += vsprintf(buffer + (*pos), fmt, va);
-  va_end(va);
-}
-
-static char char_unescape_buffer[4];
-
-static const char *mpc_err_char_unescape(char c) {
-  
-  char_unescape_buffer[0] = '\'';
-  char_unescape_buffer[1] = ' ';
-  char_unescape_buffer[2] = '\'';
-  char_unescape_buffer[3] = '\0';
-  
-  switch (c) {
-    case '\a': return "bell";
-    case '\b': return "backspace";
-    case '\f': return "formfeed";
-    case '\r': return "carriage return";
-    case '\v': return "vertical tab";
-    case '\0': return "end of input";
-    case '\n': return "newline";
-    case '\t': return "tab";
-    case ' ' : return "space";
-    default:
-      char_unescape_buffer[1] = c;
-      return char_unescape_buffer;
-  }
-  
-}
-
-char *mpc_err_string(mpc_err_t *x) {
-
-  int i;  
-  int pos = 0; 
-  int max = 1023;
-  char *buffer = calloc(1, 1024);
-  
-  if (x->failure) {
-    mpc_err_string_cat(buffer, &pos, &max,
-    "%s: error: %s\n", x->filename, x->failure);
-    return buffer;
-  }
-  
-  mpc_err_string_cat(buffer, &pos, &max, 
-    "%s:%i:%i: error: expected ", x->filename, x->state.row+1, x->state.col+1);
-  
-  if (x->expected_num == 0) { mpc_err_string_cat(buffer, &pos, &max, "ERROR: NOTHING EXPECTED"); }
-  if (x->expected_num == 1) { mpc_err_string_cat(buffer, &pos, &max, "%s", x->expected[0]); }
-  if (x->expected_num >= 2) {
-  
-    for (i = 0; i < x->expected_num-2; i++) {
-      mpc_err_string_cat(buffer, &pos, &max, "%s, ", x->expected[i]);
-    } 
-    
-    mpc_err_string_cat(buffer, &pos, &max, "%s or %s", 
-      x->expected[x->expected_num-2], 
-      x->expected[x->expected_num-1]);
-  }
-  
-  mpc_err_string_cat(buffer, &pos, &max, " at ");
-  mpc_err_string_cat(buffer, &pos, &max, mpc_err_char_unescape(x->recieved));
-  mpc_err_string_cat(buffer, &pos, &max, "\n");
-  
-  return realloc(buffer, strlen(buffer) + 1);
-}
-
-static mpc_err_t *mpc_err_new(mpc_input_t *i, const char *expected) {
-  mpc_err_t *x;
-  if (i->suppress) { return NULL; }
-  x = mpc_malloc(i, sizeof(mpc_err_t));
-  x->filename = mpc_malloc(i, strlen(i->filename) + 1);
-  strcpy(x->filename, i->filename);
-  x->state = i->state;
-  x->expected_num = 1;
-  x->expected = mpc_malloc(i, sizeof(char*));
-  x->expected[0] = mpc_malloc(i, strlen(expected) + 1);
-  strcpy(x->expected[0], expected);
-  x->failure = NULL;
-  x->recieved = mpc_input_peekc(i);
-  return x;
-}
-
-static mpc_err_t *mpc_err_fail(mpc_input_t *i, const char *failure) {
-  mpc_err_t *x;
-  if (i->suppress) { return NULL; }
-  x = mpc_malloc(i, sizeof(mpc_err_t));
-  x->filename = mpc_malloc(i, strlen(i->filename) + 1);
-  strcpy(x->filename, i->filename);
-  x->state = i->state;
-  x->expected_num = 0;
-  x->expected = NULL;
-  x->failure = mpc_malloc(i, strlen(failure) + 1);
-  strcpy(x->failure, failure);
-  x->recieved = ' ';
-  return x;
-}
-
-static mpc_err_t *mpc_err_file(const char *filename, const char *failure) {
-  mpc_err_t *x;
-  x = malloc(sizeof(mpc_err_t));
-  x->filename = malloc(strlen(filename) + 1);
-  strcpy(x->filename, filename);
-  x->state = mpc_state_new();
-  x->expected_num = 0;
-  x->expected = NULL;
-  x->failure = malloc(strlen(failure) + 1);
-  strcpy(x->failure, failure);
-  x->recieved = ' ';
-  return x;
-}
-
-static void mpc_err_delete_internal(mpc_input_t *i, mpc_err_t *x) {
-  int j;
-  if (!x) { return; }
-  for (j = 0; j < x->expected_num; j++) { mpc_free(i, x->expected[j]); }
-  mpc_free(i, x->expected);
-  mpc_free(i, x->filename);
-  mpc_free(i, x->failure);
-  mpc_free(i, x);
-}
-
-static mpc_err_t *mpc_err_export(mpc_input_t *i, mpc_err_t *x) {
-  int j;
-  for (j = 0; j < x->expected_num; j++) {
-    x->expected[j] = mpc_export(i, x->expected[j]);
-  }
-  x->expected = mpc_export(i, x->expected);
-  x->filename = mpc_export(i, x->filename);
-  x->failure = mpc_export(i, x->failure);
-  return mpc_export(i, x);
-}
-
-static int mpc_err_contains_expected(mpc_input_t *i, mpc_err_t *x, char *expected) {
-  int j;
-  (void)i;
-  for (j = 0; j < x->expected_num; j++) {
-    if (strcmp(x->expected[j], expected) == 0) { return 1; }
-  }
-  return 0;
-}
-
-static void mpc_err_add_expected(mpc_input_t *i, mpc_err_t *x, char *expected) {
-  (void)i;
-  x->expected_num++;
-  x->expected = mpc_realloc(i, x->expected, sizeof(char*) * x->expected_num);
-  x->expected[x->expected_num-1] = mpc_malloc(i, strlen(expected) + 1);
-  strcpy(x->expected[x->expected_num-1], expected);
-}
-
-static mpc_err_t *mpc_err_or(mpc_input_t *i, mpc_err_t** x, int n) {
-  
-  int j, k, fst;
-  mpc_err_t *e;
-  
-  fst = -1;
-  for (j = 0; j < n; j++) {
-    if (x[j] != NULL) { fst = j; }
-  }
-  
-  if (fst == -1) { return NULL; }
-  
-  e = mpc_malloc(i, sizeof(mpc_err_t));
-  e->state = mpc_state_invalid();
-  e->expected_num = 0;
-  e->expected = NULL;
-  e->failure = NULL;
-  e->filename = mpc_malloc(i, strlen(x[fst]->filename)+1);
-  strcpy(e->filename, x[fst]->filename);
-  
-  for (j = 0; j < n; j++) {
-    if (!x[j]) { continue; }
-    if (x[j]->state.pos > e->state.pos) { e->state = x[j]->state; }
-  }
-  
-  for (j = 0; j < n; j++) {
-    if (!x[j]) { continue; }
-    if (x[j]->state.pos < e->state.pos) { continue; }
-    
-    if (x[j]->failure) {
-      e->failure = mpc_malloc(i, strlen(x[j]->failure)+1);
-      strcpy(e->failure, x[j]->failure);
-      break;
-    }
-    
-    e->recieved = x[j]->recieved;
-    
-    for (k = 0; k < x[j]->expected_num; k++) {
-      if (!mpc_err_contains_expected(i, e, x[j]->expected[k])) {
-        mpc_err_add_expected(i, e, x[j]->expected[k]);
-      }
-    }
-  }
-  
-  for (j = 0; j < n; j++) {
-    if (!x[j]) { continue; }
-    mpc_err_delete_internal(i, x[j]);
-  }
-  
-  return e;
-}
-
-static mpc_err_t *mpc_err_repeat(mpc_input_t *i, mpc_err_t *x, const char *prefix) {
-
-  int j = 0;
-  size_t l = 0;
-  char *expect = NULL;
-  
-  if (!x) { return NULL; }
-  
-  if (x->expected_num == 0) {
-    expect = mpc_calloc(i, 1, 1);
-    x->expected_num = 1;
-    x->expected = mpc_realloc(i, x->expected, sizeof(char*) * x->expected_num);
-    x->expected[0] = expect;
-    return x;
-  }
-  
-  else if (x->expected_num == 1) {
-    expect = mpc_malloc(i, strlen(prefix) + strlen(x->expected[0]) + 1);
-    strcpy(expect, prefix);
-    strcat(expect, x->expected[0]);
-    mpc_free(i, x->expected[0]);
-    x->expected[0] = expect;
-    return x;
-  }
-  
-  else if (x->expected_num > 1) {
-    
-    l += strlen(prefix);
-    for (j = 0; j < x->expected_num-2; j++) {
-      l += strlen(x->expected[j]) + strlen(", ");
-    }
-    l += strlen(x->expected[x->expected_num-2]);
-    l += strlen(" or ");
-    l += strlen(x->expected[x->expected_num-1]);
-    
-    expect = mpc_malloc(i, l + 1);
-    
-    strcpy(expect, prefix);
-    for (j = 0; j < x->expected_num-2; j++) {
-      strcat(expect, x->expected[j]); strcat(expect, ", ");
-    }
-    strcat(expect, x->expected[x->expected_num-2]);
-    strcat(expect, " or ");
-    strcat(expect, x->expected[x->expected_num-1]);
-
-    for (j = 0; j < x->expected_num; j++) { mpc_free(i, x->expected[j]); }
-    
-    x->expected_num = 1;
-    x->expected = mpc_realloc(i, x->expected, sizeof(char*) * x->expected_num);
-    x->expected[0] = expect;
-    return x;
-  }
-  
-  return NULL;
-}
-
-static mpc_err_t *mpc_err_many1(mpc_input_t *i, mpc_err_t *x) {
-  return mpc_err_repeat(i, x, "one or more of ");
-}
-
-static mpc_err_t *mpc_err_count(mpc_input_t *i, mpc_err_t *x, int n) {
-  mpc_err_t *y;
-  int digits = n/10 + 1;
-  char *prefix;
-  prefix = mpc_malloc(i, digits + strlen(" of ") + 1);
-  sprintf(prefix, "%i of ", n);
-  y = mpc_err_repeat(i, x, prefix);
-  mpc_free(i, prefix);
-  return y;
-}
-
-static mpc_err_t *mpc_err_merge(mpc_input_t *i, mpc_err_t *x, mpc_err_t *y) {
-  mpc_err_t *errs[2];
-  errs[0] = x;
-  errs[1] = y;
-  return mpc_err_or(i, errs, 2);
-}
-
-/*
-** Parser Type
-*/
-
-enum {
-  MPC_TYPE_UNDEFINED = 0,
-  MPC_TYPE_PASS      = 1,
-  MPC_TYPE_FAIL      = 2,
-  MPC_TYPE_LIFT      = 3,
-  MPC_TYPE_LIFT_VAL  = 4,
-  MPC_TYPE_EXPECT    = 5,
-  MPC_TYPE_ANCHOR    = 6,
-  MPC_TYPE_STATE     = 7,
-  
-  MPC_TYPE_ANY       = 8,
-  MPC_TYPE_SINGLE    = 9,
-  MPC_TYPE_ONEOF     = 10,
-  MPC_TYPE_NONEOF    = 11,
-  MPC_TYPE_RANGE     = 12,
-  MPC_TYPE_SATISFY   = 13,
-  MPC_TYPE_STRING    = 14,
-  
-  MPC_TYPE_APPLY     = 15,
-  MPC_TYPE_APPLY_TO  = 16,
-  MPC_TYPE_PREDICT   = 17,
-  MPC_TYPE_NOT       = 18,
-  MPC_TYPE_MAYBE     = 19,
-  MPC_TYPE_MANY      = 20,
-  MPC_TYPE_MANY1     = 21,
-  MPC_TYPE_COUNT     = 22,
-  
-  MPC_TYPE_OR        = 23,
-  MPC_TYPE_AND       = 24
-};
-
-typedef struct { char *m; } mpc_pdata_fail_t;
-typedef struct { mpc_ctor_t lf; void *x; } mpc_pdata_lift_t;
-typedef struct { mpc_parser_t *x; char *m; } mpc_pdata_expect_t;
-typedef struct { int(*f)(char,char); } mpc_pdata_anchor_t;
-typedef struct { char x; } mpc_pdata_single_t;
-typedef struct { char x; char y; } mpc_pdata_range_t;
-typedef struct { int(*f)(char); } mpc_pdata_satisfy_t;
-typedef struct { char *x; } mpc_pdata_string_t;
-typedef struct { mpc_parser_t *x; mpc_apply_t f; } mpc_pdata_apply_t;
-typedef struct { mpc_parser_t *x; mpc_apply_to_t f; void *d; } mpc_pdata_apply_to_t;
-typedef struct { mpc_parser_t *x; } mpc_pdata_predict_t;
-typedef struct { mpc_parser_t *x; mpc_dtor_t dx; mpc_ctor_t lf; } mpc_pdata_not_t;
-typedef struct { int n; mpc_fold_t f; mpc_parser_t *x; mpc_dtor_t dx; } mpc_pdata_repeat_t;
-typedef struct { int n; mpc_parser_t **xs; } mpc_pdata_or_t;
-typedef struct { int n; mpc_fold_t f; mpc_parser_t **xs; mpc_dtor_t *dxs;  } mpc_pdata_and_t;
-
-typedef union {
-  mpc_pdata_fail_t fail;
-  mpc_pdata_lift_t lift;
-  mpc_pdata_expect_t expect;
-  mpc_pdata_anchor_t anchor;
-  mpc_pdata_single_t single;
-  mpc_pdata_range_t range;
-  mpc_pdata_satisfy_t satisfy;
-  mpc_pdata_string_t string;
-  mpc_pdata_apply_t apply;
-  mpc_pdata_apply_to_t apply_to;
-  mpc_pdata_predict_t predict;
-  mpc_pdata_not_t not;
-  mpc_pdata_repeat_t repeat;
-  mpc_pdata_and_t and;
-  mpc_pdata_or_t or;
-} mpc_pdata_t;
-
-struct mpc_parser_t {
-  char retained;
-  char *name;
-  char type;
-  mpc_pdata_t data;
-};
-
-static mpc_val_t *mpcf_input_nth_free(mpc_input_t *i, int n, mpc_val_t **xs, int x) {
-  int j;
-  for (j = 0; j < n; j++) { if (j != x) { mpc_free(i, xs[j]); } }
-  return xs[x];
-}
- 
-static mpc_val_t *mpcf_input_fst_free(mpc_input_t *i, int n, mpc_val_t **xs) { return mpcf_input_nth_free(i, n, xs, 0); }
-static mpc_val_t *mpcf_input_snd_free(mpc_input_t *i, int n, mpc_val_t **xs) { return mpcf_input_nth_free(i, n, xs, 1); }
-static mpc_val_t *mpcf_input_trd_free(mpc_input_t *i, int n, mpc_val_t **xs) { return mpcf_input_nth_free(i, n, xs, 2); }
-
-static mpc_val_t *mpcf_input_strfold(mpc_input_t *i, int n, mpc_val_t **xs) {
-  int j;
-  size_t l = 0;
-  if (n == 0) { return mpc_calloc(i, 1, 1); }
-  for (j = 0; j < n; j++) { l += strlen(xs[j]); }
-  xs[0] = mpc_realloc(i, xs[0], l + 1);
-  for (j = 1; j < n; j++) { strcat(xs[0], xs[j]); mpc_free(i, xs[j]); }
-  return xs[0];
-}
-
-static mpc_val_t *mpcf_input_state_ast(mpc_input_t *i, int n, mpc_val_t **xs) {
-  mpc_state_t *s = ((mpc_state_t**)xs)[0];
-  mpc_ast_t *a = ((mpc_ast_t**)xs)[1];
-  a = mpc_ast_state(a, *s);
-  mpc_free(i, s);
-  (void) n;
-  return a;
-}
-
-static mpc_val_t *mpc_parse_fold(mpc_input_t *i, mpc_fold_t f, int n, mpc_val_t **xs) {
-  int j;
-  if (f == mpcf_null)      { return mpcf_null(n, xs); }
-  if (f == mpcf_fst)       { return mpcf_fst(n, xs); }
-  if (f == mpcf_snd)       { return mpcf_snd(n, xs); }
-  if (f == mpcf_trd)       { return mpcf_trd(n, xs); }
-  if (f == mpcf_fst_free)  { return mpcf_input_fst_free(i, n, xs); }
-  if (f == mpcf_snd_free)  { return mpcf_input_snd_free(i, n, xs); }
-  if (f == mpcf_trd_free)  { return mpcf_input_trd_free(i, n, xs); }
-  if (f == mpcf_strfold)   { return mpcf_input_strfold(i, n, xs); }
-  if (f == mpcf_state_ast) { return mpcf_input_state_ast(i, n, xs); }
-  for (j = 0; j < n; j++) { xs[j] = mpc_export(i, xs[j]); }
-  return f(j, xs);
-}
-
-static mpc_val_t *mpcf_input_free(mpc_input_t *i, mpc_val_t *x) {
-  mpc_free(i, x);
-  return NULL;
-}
-
-static mpc_val_t *mpcf_input_str_ast(mpc_input_t *i, mpc_val_t *c) {
-  mpc_ast_t *a = mpc_ast_new("", c);
-  mpc_free(i, c);
-  return a;
-}
-
-static mpc_val_t *mpc_parse_apply(mpc_input_t *i, mpc_apply_t f, mpc_val_t *x) {
-  if (f == mpcf_free)     { return mpcf_input_free(i, x); }
-  if (f == mpcf_str_ast)  { return mpcf_input_str_ast(i, x); }
-  return f(mpc_export(i, x));
-}
-
-static mpc_val_t *mpc_parse_apply_to(mpc_input_t *i, mpc_apply_to_t f, mpc_val_t *x, mpc_val_t *d) {
-  return f(mpc_export(i, x), d);
-}
-
-static void mpc_parse_dtor(mpc_input_t *i, mpc_dtor_t d, mpc_val_t *x) {
-  if (d == free) { mpc_free(i, x); return; }
-  d(mpc_export(i, x));
-}
-
-enum {
-  MPC_PARSE_STACK_MIN = 4
-};
-
-#define MPC_SUCCESS(x) r->output = x; return 1
-#define MPC_FAILURE(x) r->error = x; return 0
-#define MPC_PRIMITIVE(x) \
-  if (x) { MPC_SUCCESS(r->output); } \
-  else { MPC_FAILURE(NULL); }
-
-static int mpc_parse_run(mpc_input_t *i, mpc_parser_t *p, mpc_result_t *r, mpc_err_t **e) {
-  
-  int j = 0, k = 0;
-  mpc_result_t results_stk[MPC_PARSE_STACK_MIN];
-  mpc_result_t *results;
-  int results_slots = MPC_PARSE_STACK_MIN;
-  
-  switch (p->type) {
-      
-    /* Basic Parsers */
-
-    case MPC_TYPE_ANY:     MPC_PRIMITIVE(mpc_input_any(i, (char**)&r->output));
-    case MPC_TYPE_SINGLE:  MPC_PRIMITIVE(mpc_input_char(i, p->data.single.x, (char**)&r->output));
-    case MPC_TYPE_RANGE:   MPC_PRIMITIVE(mpc_input_range(i, p->data.range.x, p->data.range.y, (char**)&r->output));
-    case MPC_TYPE_ONEOF:   MPC_PRIMITIVE(mpc_input_oneof(i, p->data.string.x, (char**)&r->output));
-    case MPC_TYPE_NONEOF:  MPC_PRIMITIVE(mpc_input_noneof(i, p->data.string.x, (char**)&r->output));
-    case MPC_TYPE_SATISFY: MPC_PRIMITIVE(mpc_input_satisfy(i, p->data.satisfy.f, (char**)&r->output));
-    case MPC_TYPE_STRING:  MPC_PRIMITIVE(mpc_input_string(i, p->data.string.x, (char**)&r->output));
-    case MPC_TYPE_ANCHOR:  MPC_PRIMITIVE(mpc_input_anchor(i, p->data.anchor.f, (char**)&r->output));
-    
-    /* Other parsers */
-    
-    case MPC_TYPE_UNDEFINED: MPC_FAILURE(mpc_err_fail(i, "Parser Undefined!"));
-    case MPC_TYPE_PASS:      MPC_SUCCESS(NULL);
-    case MPC_TYPE_FAIL:      MPC_FAILURE(mpc_err_fail(i, p->data.fail.m));
-    case MPC_TYPE_LIFT:      MPC_SUCCESS(p->data.lift.lf());
-    case MPC_TYPE_LIFT_VAL:  MPC_SUCCESS(p->data.lift.x);
-    case MPC_TYPE_STATE:     MPC_SUCCESS(mpc_input_state_copy(i));
-    
-    /* Application Parsers */
-    
-    case MPC_TYPE_APPLY:
-      if (mpc_parse_run(i, p->data.apply.x, r, e)) {
-        MPC_SUCCESS(mpc_parse_apply(i, p->data.apply.f, r->output));
-      } else {
-        MPC_FAILURE(r->output);
-      }
-    
-    case MPC_TYPE_APPLY_TO:
-      if (mpc_parse_run(i, p->data.apply_to.x, r, e)) {
-        MPC_SUCCESS(mpc_parse_apply_to(i, p->data.apply_to.f, r->output, p->data.apply_to.d));
-      } else {
-        MPC_FAILURE(r->error);
-      }
-    
-    case MPC_TYPE_EXPECT:
-      mpc_input_suppress_enable(i);
-      if (mpc_parse_run(i, p->data.expect.x, r, e)) {
-        mpc_input_suppress_disable(i);
-        MPC_SUCCESS(r->output);
-      } else {
-        mpc_input_suppress_disable(i);
-        MPC_FAILURE(mpc_err_new(i, p->data.expect.m));
-      }
-    
-    case MPC_TYPE_PREDICT:
-      mpc_input_backtrack_disable(i);
-      if (mpc_parse_run(i, p->data.predict.x, r, e)) {      
-        mpc_input_backtrack_enable(i);
-        MPC_SUCCESS(r->output);
-      } else {
-        mpc_input_backtrack_enable(i);
-        MPC_FAILURE(r->error);
-      }
-    
-    /* Optional Parsers */
-    
-    /* TODO: Update Not Error Message */
-    
-    case MPC_TYPE_NOT:
-      mpc_input_mark(i);
-      mpc_input_suppress_enable(i);
-      if (mpc_parse_run(i, p->data.not.x, r, e)) {
-        mpc_input_rewind(i);
-        mpc_input_suppress_disable(i);
-        mpc_parse_dtor(i, p->data.not.dx, r->output);
-        MPC_FAILURE(mpc_err_new(i, "opposite"));
-      } else {
-        mpc_input_unmark(i);
-        mpc_input_suppress_disable(i);
-        MPC_SUCCESS(p->data.not.lf());
-      }
-    
-    case MPC_TYPE_MAYBE:
-      if (mpc_parse_run(i, p->data.not.x, r, e)) {
-        MPC_SUCCESS(r->output);
-      } else {
-        *e = mpc_err_merge(i, *e, r->error);
-        MPC_SUCCESS(p->data.not.lf());
-      }
-    
-    /* Repeat Parsers */
-    
-    case MPC_TYPE_MANY:
-      
-      results = results_stk;
-      
-      while (mpc_parse_run(i, p->data.repeat.x, &results[j], e)) {
-        j++;
-        if (j == MPC_PARSE_STACK_MIN) {
-          results_slots = j + j / 2;
-          results = mpc_malloc(i, sizeof(mpc_result_t) * results_slots);
-          memcpy(results, results_stk, sizeof(mpc_result_t) * MPC_PARSE_STACK_MIN);
-        } else if (j >= results_slots) {
-          results_slots = j + j / 2;
-          results = mpc_realloc(i, results, sizeof(mpc_result_t) * results_slots);
-        }
-      }
-      
-      *e = mpc_err_merge(i, *e, results[j].error);
-      MPC_SUCCESS(
-        mpc_parse_fold(i, p->data.repeat.f, j, (mpc_val_t**)results);
-        if (j >= MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-    
-    case MPC_TYPE_MANY1:
-      
-      results = results_stk;
-      
-      while (mpc_parse_run(i, p->data.repeat.x, &results[j], e)) {
-        j++;
-        if (j == MPC_PARSE_STACK_MIN) {
-          results_slots = j + j / 2;
-          results = mpc_malloc(i, sizeof(mpc_result_t) * results_slots);
-          memcpy(results, results_stk, sizeof(mpc_result_t) * MPC_PARSE_STACK_MIN);
-        } else if (j >= results_slots) {
-          results_slots = j + j / 2;
-          results = mpc_realloc(i, results, sizeof(mpc_result_t) * results_slots);
-        }
-      }
-      
-      if (j == 0) {
-        MPC_FAILURE(
-          mpc_err_many1(i, results[j].error);
-          if (j >= MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-      } else {
-        *e = mpc_err_merge(i, *e, results[j].error);
-        MPC_SUCCESS(
-          mpc_parse_fold(i, p->data.repeat.f, j, (mpc_val_t**)results);
-          if (j >= MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-      }
-    
-    case MPC_TYPE_COUNT:
-      
-      results = p->data.repeat.n > MPC_PARSE_STACK_MIN
-        ? mpc_malloc(i, sizeof(mpc_result_t) * p->data.repeat.n)
-        : results_stk;
-      
-      while (mpc_parse_run(i, p->data.repeat.x, &results[j], e)) {
-        j++;
-        if (j == p->data.repeat.n) { break; }
-      }
-      
-      if (j == p->data.repeat.n) {
-        MPC_SUCCESS(
-          mpc_parse_fold(i, p->data.repeat.f, j, (mpc_val_t**)results);
-          if (p->data.repeat.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-      } else {
-        for (k = 0; k < j; k++) {
-          mpc_parse_dtor(i, p->data.repeat.dx, results[k].output);
-        }
-        MPC_FAILURE(
-          mpc_err_count(i, results[j].error, p->data.repeat.n);
-          if (p->data.repeat.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });  
-      }
-      
-    /* Combinatory Parsers */
-    
-    case MPC_TYPE_OR:
-      
-      if (p->data.or.n == 0) { MPC_SUCCESS(NULL); }
-      
-      results = p->data.or.n > MPC_PARSE_STACK_MIN
-        ? mpc_malloc(i, sizeof(mpc_result_t) * p->data.or.n)
-        : results_stk;
-      
-      for (j = 0; j < p->data.or.n; j++) {
-        if (mpc_parse_run(i, p->data.or.xs[j], &results[j], e)) {
-          MPC_SUCCESS(results[j].output;
-            if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-        } else {
-          *e = mpc_err_merge(i, *e, results[j].error);
-        } 
-      }
-      
-      MPC_FAILURE(NULL;
-        if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-    
-    case MPC_TYPE_AND:
-      
-      if (p->data.and.n == 0) { MPC_SUCCESS(NULL); }
-      
-      results = p->data.or.n > MPC_PARSE_STACK_MIN
-        ? mpc_malloc(i, sizeof(mpc_result_t) * p->data.or.n)
-        : results_stk;
-      
-      mpc_input_mark(i);
-      for (j = 0; j < p->data.and.n; j++) {
-        if (!mpc_parse_run(i, p->data.and.xs[j], &results[j], e)) {
-          mpc_input_rewind(i);
-          for (k = 0; k < j; k++) {
-            mpc_parse_dtor(i, p->data.and.dxs[k], results[k].output);
-          }
-          MPC_FAILURE(results[j].error;
-            if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-        }
-      }
-      mpc_input_unmark(i); 
-      MPC_SUCCESS(
-        mpc_parse_fold(i, p->data.and.f, j, (mpc_val_t**)results);
-        if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
-    
-    /* End */
-    
-    default:
-      
-      MPC_FAILURE(mpc_err_fail(i, "Unknown Parser Type Id!"));
-  }
-  
-  return 0;
-  
-}
-
-#undef MPC_SUCCESS
-#undef MPC_FAILURE
-#undef MPC_PRIMITIVE
-
-int mpc_parse_input(mpc_input_t *i, mpc_parser_t *p, mpc_result_t *r) {
-  int x;
-  mpc_err_t *e = mpc_err_fail(i, "Unknown Error");
-  e->state = mpc_state_invalid();
-  x = mpc_parse_run(i, p, r, &e);
-  if (x) {
-    mpc_err_delete_internal(i, e);
-    r->output = mpc_export(i, r->output);
-  } else {
-    r->error = mpc_err_export(i, mpc_err_merge(i, e, r->error));
-  }
-  return x;
-}
-
-int mpc_parse(const char *filename, const char *string, mpc_parser_t *p, mpc_result_t *r) {
-  int x;
-  mpc_input_t *i = mpc_input_new_string(filename, string);
-  x = mpc_parse_input(i, p, r);
-  mpc_input_delete(i);
-  return x;
-}
-
-int mpc_parse_file(const char *filename, FILE *file, mpc_parser_t *p, mpc_result_t *r) {
-  int x;
-  mpc_input_t *i = mpc_input_new_file(filename, file);
-  x = mpc_parse_input(i, p, r);
-  mpc_input_delete(i);
-  return x;
-}
-
-int mpc_parse_pipe(const char *filename, FILE *pipe, mpc_parser_t *p, mpc_result_t *r) {
-  int x;
-  mpc_input_t *i = mpc_input_new_pipe(filename, pipe);
-  x = mpc_parse_input(i, p, r);
-  mpc_input_delete(i);
-  return x;
-}
-
-int mpc_parse_contents(const char *filename, mpc_parser_t *p, mpc_result_t *r) {
-  
-  FILE *f = fopen(filename, "rb");
-  int res;
-  
-  if (!f) {
-    r->output = NULL;
-    r->error = mpc_err_file(filename, "Unable to open file!");
-    return 0;
-  }
-  
-  res = mpc_parse_file(filename, f, p, r);
-  fclose(f);
-  return res;
-}
-
-/*
-** Building a Parser
-*/
-
-static void mpc_undefine_unretained(mpc_parser_t *p, int force);
-
-static void mpc_undefine_or(mpc_parser_t *p) {
-  
-  int i;
-  for (i = 0; i < p->data.or.n; i++) {
-    mpc_undefine_unretained(p->data.or.xs[i], 0);
-  }
-  free(p->data.or.xs);
-  
-}
-
-static void mpc_undefine_and(mpc_parser_t *p) {
-  
-  int i;
-  for (i = 0; i < p->data.and.n; i++) {
-    mpc_undefine_unretained(p->data.and.xs[i], 0);
-  }
-  free(p->data.and.xs);
-  free(p->data.and.dxs);
-  
-}
-
-static void mpc_undefine_unretained(mpc_parser_t *p, int force) {
-  
-  if (p->retained && !force) { return; }
-  
-  switch (p->type) {
-    
-    case MPC_TYPE_FAIL: free(p->data.fail.m); break;
-    
-    case MPC_TYPE_ONEOF: 
-    case MPC_TYPE_NONEOF:
-    case MPC_TYPE_STRING:
-      free(p->data.string.x); 
-      break;
-    
-    case MPC_TYPE_APPLY:    mpc_undefine_unretained(p->data.apply.x, 0);    break;
-    case MPC_TYPE_APPLY_TO: mpc_undefine_unretained(p->data.apply_to.x, 0); break;
-    case MPC_TYPE_PREDICT:  mpc_undefine_unretained(p->data.predict.x, 0);  break;
-    
-    case MPC_TYPE_MAYBE:
-    case MPC_TYPE_NOT:
-      mpc_undefine_unretained(p->data.not.x, 0);
-      break;
-    
-    case MPC_TYPE_EXPECT:
-      mpc_undefine_unretained(p->data.expect.x, 0);
-      free(p->data.expect.m);
-      break;
-      
-    case MPC_TYPE_MANY:
-    case MPC_TYPE_MANY1:
-    case MPC_TYPE_COUNT:
-      mpc_undefine_unretained(p->data.repeat.x, 0);
-      break;
-    
-    case MPC_TYPE_OR:  mpc_undefine_or(p);  break;
-    case MPC_TYPE_AND: mpc_undefine_and(p); break;
-    
-    default: break;
-  }
-  
-  if (!force) {
-    free(p->name);
-    free(p);
-  }
-  
-}
-
-void mpc_delete(mpc_parser_t *p) {
-  if (p->retained) {
-
-    if (p->type != MPC_TYPE_UNDEFINED) {
-      mpc_undefine_unretained(p, 0);
-    } 
-    
-    free(p->name);
-    free(p);
-  
-  } else {
-    mpc_undefine_unretained(p, 0);  
-  }
-}
-
-static void mpc_soft_delete(mpc_val_t *x) {
-  mpc_undefine_unretained(x, 0);
-}
-
-static mpc_parser_t *mpc_undefined(void) {
-  mpc_parser_t *p = calloc(1, sizeof(mpc_parser_t));
-  p->retained = 0;
-  p->type = MPC_TYPE_UNDEFINED;
-  p->name = NULL;
-  return p;
-}
-
-mpc_parser_t *mpc_new(const char *name) {
-  mpc_parser_t *p = mpc_undefined();
-  p->retained = 1;
-  p->name = realloc(p->name, strlen(name) + 1);
-  strcpy(p->name, name);
-  return p;
-}
-
-mpc_parser_t *mpc_copy(mpc_parser_t *a) {
-  int i = 0;
-  mpc_parser_t *p;
-  
-  if (a->retained) { return a; }
-  
-  p = mpc_undefined();
-  p->retained = a->retained;
-  p->type = a->type;
-  p->data = a->data;
-  
-  if (a->name) {
-    p->name = malloc(strlen(a->name)+1);
-    strcpy(p->name, a->name);
-  }
-  
-  switch (a->type) {
-    
-    case MPC_TYPE_FAIL:
-      p->data.fail.m = malloc(strlen(a->data.fail.m)+1);
-      strcpy(p->data.fail.m, a->data.fail.m);
-    break;
-    
-    case MPC_TYPE_ONEOF: 
-    case MPC_TYPE_NONEOF:
-    case MPC_TYPE_STRING:
-      p->data.string.x = malloc(strlen(a->data.string.x)+1);
-      strcpy(p->data.string.x, a->data.string.x);
-      break;
-    
-    case MPC_TYPE_APPLY:    p->data.apply.x    = mpc_copy(a->data.apply.x);    break;
-    case MPC_TYPE_APPLY_TO: p->data.apply_to.x = mpc_copy(a->data.apply_to.x); break;
-    case MPC_TYPE_PREDICT:  p->data.predict.x  = mpc_copy(a->data.predict.x);  break;
-    
-    case MPC_TYPE_MAYBE:
-    case MPC_TYPE_NOT:
-      p->data.not.x = mpc_copy(a->data.not.x);
-      break;
-    
-    case MPC_TYPE_EXPECT:
-      p->data.expect.x = mpc_copy(a->data.expect.x);
-      p->data.expect.m = malloc(strlen(a->data.expect.m)+1);
-      strcpy(p->data.expect.m, a->data.expect.m);
-      break;
-      
-    case MPC_TYPE_MANY:
-    case MPC_TYPE_MANY1:
-    case MPC_TYPE_COUNT:
-      p->data.repeat.x = mpc_copy(a->data.repeat.x);
-      break;
-    
-    case MPC_TYPE_OR:
-      p->data.or.xs = malloc(a->data.or.n * sizeof(mpc_parser_t*));
-      for (i = 0; i < a->data.or.n; i++) {
-        p->data.or.xs[i] = mpc_copy(a->data.or.xs[i]);
-      }
-    break;
-    case MPC_TYPE_AND:
-      p->data.and.xs = malloc(a->data.and.n * sizeof(mpc_parser_t*));
-      for (i = 0; i < a->data.and.n; i++) {
-        p->data.and.xs[i] = mpc_copy(a->data.and.xs[i]);
-      }
-      p->data.and.dxs = malloc((a->data.and.n-1) * sizeof(mpc_dtor_t));
-      for (i = 0; i < a->data.and.n-1; i++) {
-        p->data.and.dxs[i] = a->data.and.dxs[i];
-      }
-    break;
-    
-    default: break;
-  }
-
-  
-  return p;
-}
-
-mpc_parser_t *mpc_undefine(mpc_parser_t *p) {
-  mpc_undefine_unretained(p, 1);
-  p->type = MPC_TYPE_UNDEFINED;
-  return p;
-}
-
-mpc_parser_t *mpc_define(mpc_parser_t *p, mpc_parser_t *a) {
-  
-  if (p->retained) {
-    p->type = a->type;
-    p->data = a->data;
-  } else {
-    mpc_parser_t *a2 = mpc_failf("Attempt to assign to Unretained Parser!");
-    p->type = a2->type;
-    p->data = a2->data;
-    free(a2);
-  }
-  
-  free(a);
-  return p;  
-}
-
-void mpc_cleanup(int n, ...) {
-  int i;
-  mpc_parser_t **list = malloc(sizeof(mpc_parser_t*) * n);
-  
-  va_list va;
-  va_start(va, n);
-  for (i = 0; i < n; i++) { list[i] = va_arg(va, mpc_parser_t*); }
-  for (i = 0; i < n; i++) { mpc_undefine(list[i]); }
-  for (i = 0; i < n; i++) { mpc_delete(list[i]); }  
-  va_end(va);  
-
-  free(list);
-}
-
-mpc_parser_t *mpc_pass(void) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_PASS;
-  return p;
-}
-
-mpc_parser_t *mpc_fail(const char *m) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_FAIL;
-  p->data.fail.m = malloc(strlen(m) + 1);
-  strcpy(p->data.fail.m, m);
-  return p;
-}
-
-/*
-** As `snprintf` is not ANSI standard this 
-** function `mpc_failf` should be considered
-** unsafe.
-**
-** You have a few options if this is going to be
-** trouble.
-**
-** - Ensure the format string does not exceed
-**   the buffer length using precision specifiers
-**   such as `%.512s`.
-**
-** - Patch this function in your code base to 
-**   use `snprintf` or whatever variant your
-**   system supports.
-**
-** - Avoid it altogether.
-**
-*/
-
-mpc_parser_t *mpc_failf(const char *fmt, ...) {
-  
-  va_list va;
-  char *buffer;
-
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_FAIL;
-  
-  va_start(va, fmt);
-  buffer = malloc(2048);
-  vsprintf(buffer, fmt, va);
-  va_end(va);
-  
-  buffer = realloc(buffer, strlen(buffer) + 1);
-  p->data.fail.m = buffer;
-  return p;
-
-}
-
-mpc_parser_t *mpc_lift_val(mpc_val_t *x) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_LIFT_VAL;
-  p->data.lift.x = x;
-  return p;
-}
-
-mpc_parser_t *mpc_lift(mpc_ctor_t lf) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_LIFT;
-  p->data.lift.lf = lf;
-  return p;
-}
-
-mpc_parser_t *mpc_anchor(int(*f)(char,char)) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_ANCHOR;
-  p->data.anchor.f = f;
-  return mpc_expect(p, "anchor");
-}
-
-mpc_parser_t *mpc_state(void) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_STATE;
-  return p;
-}
-
-mpc_parser_t *mpc_expect(mpc_parser_t *a, const char *expected) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_EXPECT;
-  p->data.expect.x = a;
-  p->data.expect.m = malloc(strlen(expected) + 1);
-  strcpy(p->data.expect.m, expected);
-  return p;
-}
-
-/*
-** As `snprintf` is not ANSI standard this 
-** function `mpc_expectf` should be considered
-** unsafe.
-**
-** You have a few options if this is going to be
-** trouble.
-**
-** - Ensure the format string does not exceed
-**   the buffer length using precision specifiers
-**   such as `%.512s`.
-**
-** - Patch this function in your code base to 
-**   use `snprintf` or whatever variant your
-**   system supports.
-**
-** - Avoid it altogether.
-**
-*/
-
-mpc_parser_t *mpc_expectf(mpc_parser_t *a, const char *fmt, ...) {
-  va_list va;
-  char *buffer;
-
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_EXPECT;
-  
-  va_start(va, fmt);
-  buffer = malloc(2048);
-  vsprintf(buffer, fmt, va);
-  va_end(va);
-  
-  buffer = realloc(buffer, strlen(buffer) + 1);
-  p->data.expect.x = a;
-  p->data.expect.m = buffer;
-  return p;
-}
-
-/*
-** Basic Parsers
-*/
-
-mpc_parser_t *mpc_any(void) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_ANY;
-  return mpc_expect(p, "any character");
-}
-
-mpc_parser_t *mpc_char(char c) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_SINGLE;
-  p->data.single.x = c;
-  return mpc_expectf(p, "'%c'", c);
-}
-
-mpc_parser_t *mpc_range(char s, char e) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_RANGE;
-  p->data.range.x = s;
-  p->data.range.y = e;
-  return mpc_expectf(p, "character between '%c' and '%c'", s, e);
-}
-
-mpc_parser_t *mpc_oneof(const char *s) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_ONEOF;
-  p->data.string.x = malloc(strlen(s) + 1);
-  strcpy(p->data.string.x, s);
-  return mpc_expectf(p, "one of '%s'", s);
-}
-
-mpc_parser_t *mpc_noneof(const char *s) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_NONEOF;
-  p->data.string.x = malloc(strlen(s) + 1);
-  strcpy(p->data.string.x, s);
-  return mpc_expectf(p, "none of '%s'", s);
-
-}
-
-mpc_parser_t *mpc_satisfy(int(*f)(char)) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_SATISFY;
-  p->data.satisfy.f = f;
-  return mpc_expectf(p, "character satisfying function %p", f);
-}
-
-mpc_parser_t *mpc_string(const char *s) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_STRING;
-  p->data.string.x = malloc(strlen(s) + 1);
-  strcpy(p->data.string.x, s);
-  return mpc_expectf(p, "\"%s\"", s);
-}
-
-/*
-** Core Parsers
-*/
-
-mpc_parser_t *mpc_apply(mpc_parser_t *a, mpc_apply_t f) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_APPLY;
-  p->data.apply.x = a;
-  p->data.apply.f = f;
-  return p;
-}
-
-mpc_parser_t *mpc_apply_to(mpc_parser_t *a, mpc_apply_to_t f, void *x) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_APPLY_TO;
-  p->data.apply_to.x = a;
-  p->data.apply_to.f = f;
-  p->data.apply_to.d = x;
-  return p;
-}
-
-mpc_parser_t *mpc_predictive(mpc_parser_t *a) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_PREDICT;
-  p->data.predict.x = a;
-  return p;
-}
-
-mpc_parser_t *mpc_not_lift(mpc_parser_t *a, mpc_dtor_t da, mpc_ctor_t lf) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_NOT;
-  p->data.not.x = a;
-  p->data.not.dx = da;
-  p->data.not.lf = lf;
-  return p;
-}
-
-mpc_parser_t *mpc_not(mpc_parser_t *a, mpc_dtor_t da) {
-  return mpc_not_lift(a, da, mpcf_ctor_null);
-}
-
-mpc_parser_t *mpc_maybe_lift(mpc_parser_t *a, mpc_ctor_t lf) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_MAYBE;
-  p->data.not.x = a;
-  p->data.not.lf = lf;
-  return p;
-}
-
-mpc_parser_t *mpc_maybe(mpc_parser_t *a) {
-  return mpc_maybe_lift(a, mpcf_ctor_null);
-}
-
-mpc_parser_t *mpc_many(mpc_fold_t f, mpc_parser_t *a) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_MANY;
-  p->data.repeat.x = a;
-  p->data.repeat.f = f;
-  return p;
-}
-
-mpc_parser_t *mpc_many1(mpc_fold_t f, mpc_parser_t *a) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_MANY1;
-  p->data.repeat.x = a;
-  p->data.repeat.f = f;
-  return p;
-}
-
-mpc_parser_t *mpc_count(int n, mpc_fold_t f, mpc_parser_t *a, mpc_dtor_t da) {
-  mpc_parser_t *p = mpc_undefined();
-  p->type = MPC_TYPE_COUNT;
-  p->data.repeat.n = n;
-  p->data.repeat.f = f;
-  p->data.repeat.x = a;
-  p->data.repeat.dx = da;
-  return p;
-}
-
-mpc_parser_t *mpc_or(int n, ...) {
-
-  int i;
-  va_list va;
-
-  mpc_parser_t *p = mpc_undefined();
-  
-  p->type = MPC_TYPE_OR;
-  p->data.or.n = n;
-  p->data.or.xs = malloc(sizeof(mpc_parser_t*) * n);
-  
-  va_start(va, n);  
-  for (i = 0; i < n; i++) {
-    p->data.or.xs[i] = va_arg(va, mpc_parser_t*);
-  }
-  va_end(va);
-  
-  return p;
-}
-
-mpc_parser_t *mpc_and(int n, mpc_fold_t f, ...) {
-
-  int i;
-  va_list va;
-
-  mpc_parser_t *p = mpc_undefined();
-  
-  p->type = MPC_TYPE_AND;
-  p->data.and.n = n;
-  p->data.and.f = f;
-  p->data.and.xs = malloc(sizeof(mpc_parser_t*) * n);
-  p->data.and.dxs = malloc(sizeof(mpc_dtor_t) * (n-1));
-
-  va_start(va, f);  
-  for (i = 0; i < n; i++) {
-    p->data.and.xs[i] = va_arg(va, mpc_parser_t*);
-  }
-  for (i = 0; i < (n-1); i++) {
-    p->data.and.dxs[i] = va_arg(va, mpc_dtor_t);
-  }  
-  va_end(va);
-  
-  return p;
-}
-
-/*
-** Common Parsers
-*/
-
-static int mpc_soi_anchor(char prev, char next) { (void) next; return (prev == '\0'); }
-static int mpc_eoi_anchor(char prev, char next) { (void) prev; return (next == '\0'); }
-
-mpc_parser_t *mpc_soi(void) { return mpc_expect(mpc_anchor(mpc_soi_anchor), "start of input"); }
-mpc_parser_t *mpc_eoi(void) { return mpc_expect(mpc_anchor(mpc_eoi_anchor), "end of input"); }
-
-static int mpc_boundary_anchor(char prev, char next) {
-  const char* word = "abcdefghijklmnopqrstuvwxyz"
-                     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                     "0123456789_";
-  if ( strchr(word, next) &&  prev == '\0') { return 1; }
-  if ( strchr(word, prev) &&  next == '\0') { return 1; }
-  if ( strchr(word, next) && !strchr(word, prev)) { return 1; }
-  if (!strchr(word, next) &&  strchr(word, prev)) { return 1; }
-  return 0;
-}
-
-mpc_parser_t *mpc_boundary(void) { return mpc_expect(mpc_anchor(mpc_boundary_anchor), "boundary"); }
-
-mpc_parser_t *mpc_whitespace(void) { return mpc_expect(mpc_oneof(" \f\n\r\t\v"), "whitespace"); }
-mpc_parser_t *mpc_whitespaces(void) { return mpc_expect(mpc_many(mpcf_strfold, mpc_whitespace()), "spaces"); }
-mpc_parser_t *mpc_blank(void) { return mpc_expect(mpc_apply(mpc_whitespaces(), mpcf_free), "whitespace"); }
-
-mpc_parser_t *mpc_newline(void) { return mpc_expect(mpc_char('\n'), "newline"); }
-mpc_parser_t *mpc_tab(void) { return mpc_expect(mpc_char('\t'), "tab"); }
-mpc_parser_t *mpc_escape(void) { return mpc_and(2, mpcf_strfold, mpc_char('\\'), mpc_any(), free); }
-
-mpc_parser_t *mpc_digit(void) { return mpc_expect(mpc_oneof("0123456789"), "digit"); }
-mpc_parser_t *mpc_hexdigit(void) { return mpc_expect(mpc_oneof("0123456789ABCDEFabcdef"), "hex digit"); }
-mpc_parser_t *mpc_octdigit(void) { return mpc_expect(mpc_oneof("01234567"), "oct digit"); }
-mpc_parser_t *mpc_digits(void) { return mpc_expect(mpc_many1(mpcf_strfold, mpc_digit()), "digits"); }
-mpc_parser_t *mpc_hexdigits(void) { return mpc_expect(mpc_many1(mpcf_strfold, mpc_hexdigit()), "hex digits"); }
-mpc_parser_t *mpc_octdigits(void) { return mpc_expect(mpc_many1(mpcf_strfold, mpc_octdigit()), "oct digits"); }
-
-mpc_parser_t *mpc_lower(void) { return mpc_expect(mpc_oneof("abcdefghijklmnopqrstuvwxyz"), "lowercase letter"); }
-mpc_parser_t *mpc_upper(void) { return mpc_expect(mpc_oneof("ABCDEFGHIJKLMNOPQRSTUVWXYZ"), "uppercase letter"); }
-mpc_parser_t *mpc_alpha(void) { return mpc_expect(mpc_oneof("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), "letter"); }
-mpc_parser_t *mpc_underscore(void) { return mpc_expect(mpc_char('_'), "underscore"); }
-mpc_parser_t *mpc_alphanum(void) { return mpc_expect(mpc_or(3, mpc_alpha(), mpc_digit(), mpc_underscore()), "alphanumeric"); }
-
-mpc_parser_t *mpc_int(void) { return mpc_expect(mpc_apply(mpc_digits(), mpcf_int), "integer"); }
-mpc_parser_t *mpc_hex(void) { return mpc_expect(mpc_apply(mpc_hexdigits(), mpcf_hex), "hexadecimal"); }
-mpc_parser_t *mpc_oct(void) { return mpc_expect(mpc_apply(mpc_octdigits(), mpcf_oct), "octadecimal"); }
-mpc_parser_t *mpc_number(void) { return mpc_expect(mpc_or(3, mpc_int(), mpc_hex(), mpc_oct()), "number"); }
-
-mpc_parser_t *mpc_real(void) {
-
-  /* [+-]?\d+(\.\d+)?([eE][+-]?[0-9]+)? */
-  
-  mpc_parser_t *p0, *p1, *p2, *p30, *p31, *p32, *p3;
-  
-  p0 = mpc_maybe_lift(mpc_oneof("+-"), mpcf_ctor_str);
-  p1 = mpc_digits();
-  p2 = mpc_maybe_lift(mpc_and(2, mpcf_strfold, mpc_char('.'), mpc_digits(), free), mpcf_ctor_str);
-  p30 = mpc_oneof("eE");
-  p31 = mpc_maybe_lift(mpc_oneof("+-"), mpcf_ctor_str);
-  p32 = mpc_digits();
-  p3 = mpc_maybe_lift(mpc_and(3, mpcf_strfold, p30, p31, p32, free, free), mpcf_ctor_str);
-  
-  return mpc_expect(mpc_and(4, mpcf_strfold, p0, p1, p2, p3, free, free, free), "real");
-
-}
-
-mpc_parser_t *mpc_float(void) {
-  return mpc_expect(mpc_apply(mpc_real(), mpcf_float), "float");
-}
-
-mpc_parser_t *mpc_char_lit(void) {
-  return mpc_expect(mpc_between(mpc_or(2, mpc_escape(), mpc_any()), free, "'", "'"), "char");
-}
-
-mpc_parser_t *mpc_string_lit(void) {
-  mpc_parser_t *strchar = mpc_or(2, mpc_escape(), mpc_noneof("\""));
-  return mpc_expect(mpc_between(mpc_many(mpcf_strfold, strchar), free, "\"", "\""), "string");
-}
-
-mpc_parser_t *mpc_regex_lit(void) {  
-  mpc_parser_t *regexchar = mpc_or(2, mpc_escape(), mpc_noneof("/"));
-  return mpc_expect(mpc_between(mpc_many(mpcf_strfold, regexchar), free, "/", "/"), "regex");
-}
-
-mpc_parser_t *mpc_ident(void) {
-  mpc_parser_t *p0, *p1; 
-  p0 = mpc_or(2, mpc_alpha(), mpc_underscore());
-  p1 = mpc_many(mpcf_strfold, mpc_alphanum()); 
-  return mpc_and(2, mpcf_strfold, p0, p1, free);
-}
-
-/*
-** Useful Parsers
-*/
-
-mpc_parser_t *mpc_startwith(mpc_parser_t *a) { return mpc_and(2, mpcf_snd, mpc_soi(), a, mpcf_dtor_null); }
-mpc_parser_t *mpc_endwith(mpc_parser_t *a, mpc_dtor_t da) { return mpc_and(2, mpcf_fst, a, mpc_eoi(), da); }
-mpc_parser_t *mpc_whole(mpc_parser_t *a, mpc_dtor_t da) { return mpc_and(3, mpcf_snd, mpc_soi(), a, mpc_eoi(), mpcf_dtor_null, da); }
-
-mpc_parser_t *mpc_stripl(mpc_parser_t *a) { return mpc_and(2, mpcf_snd, mpc_blank(), a, mpcf_dtor_null); }
-mpc_parser_t *mpc_stripr(mpc_parser_t *a) { return mpc_and(2, mpcf_fst, a, mpc_blank(), mpcf_dtor_null); }
-mpc_parser_t *mpc_strip(mpc_parser_t *a) { return mpc_and(3, mpcf_snd, mpc_blank(), a, mpc_blank(), mpcf_dtor_null, mpcf_dtor_null); }
-mpc_parser_t *mpc_tok(mpc_parser_t *a) { return mpc_and(2, mpcf_fst, a, mpc_blank(), mpcf_dtor_null); }
-mpc_parser_t *mpc_sym(const char *s) { return mpc_tok(mpc_string(s)); }
-
-mpc_parser_t *mpc_total(mpc_parser_t *a, mpc_dtor_t da) { return mpc_whole(mpc_strip(a), da); }
-
-mpc_parser_t *mpc_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c) {
-  return mpc_and(3, mpcf_snd_free,
-    mpc_string(o), a, mpc_string(c),
-    free, ad);
-}
-
-mpc_parser_t *mpc_parens(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_between(a, ad, "(", ")"); }
-mpc_parser_t *mpc_braces(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_between(a, ad, "<", ">"); }
-mpc_parser_t *mpc_brackets(mpc_parser_t *a, mpc_dtor_t ad) { return mpc_between(a, ad, "{", "}"); }
-mpc_parser_t *mpc_squares(mpc_parser_t *a, mpc_dtor_t ad)  { return mpc_between(a, ad, "[", "]"); }
-
-mpc_parser_t *mpc_tok_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c) {
-  return mpc_and(3, mpcf_snd_free,
-    mpc_sym(o), mpc_tok(a), mpc_sym(c),
-    free, ad);
-}
-
-mpc_parser_t *mpc_tok_parens(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_tok_between(a, ad, "(", ")"); }
-mpc_parser_t *mpc_tok_braces(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_tok_between(a, ad, "<", ">"); }
-mpc_parser_t *mpc_tok_brackets(mpc_parser_t *a, mpc_dtor_t ad) { return mpc_tok_between(a, ad, "{", "}"); }
-mpc_parser_t *mpc_tok_squares(mpc_parser_t *a, mpc_dtor_t ad)  { return mpc_tok_between(a, ad, "[", "]"); }
-
-/*
-** Regular Expression Parsers
-*/
-
-/*
-** So here is a cute bootstrapping.
-**
-** I'm using the previously defined
-** mpc constructs and functions to
-** parse the user regex string and
-** construct a parser from it.
-**
-** As it turns out lots of the standard
-** mpc functions look a lot like `fold`
-** functions and so can be used indirectly
-** by many of the parsing functions to build
-** a parser directly - as we are parsing.
-**
-** This is certainly something that
-** would be less elegant/interesting 
-** in a two-phase parser which first
-** builds an AST and then traverses it
-** to generate the object.
-**
-** This whole thing acts as a great
-** case study for how trivial it can be
-** to write a great parser in a few
-** lines of code using mpc.
-*/
-
-/*
-**
-**  ### Regular Expression Grammar
-**
-**      <regex> : <term> | (<term> "|" <regex>)
-**     
-**      <term> : <factor>*
-**
-**      <factor> : <base>
-**               | <base> "*"
-**               | <base> "+"
-**               | <base> "?"
-**               | <base> "{" <digits> "}"
-**           
-**      <base> : <char>
-**             | "\" <char>
-**             | "(" <regex> ")"
-**             | "[" <range> "]"
-*/
-
-static mpc_val_t *mpcf_re_or(int n, mpc_val_t **xs) {
-  (void) n;
-  if (!xs[1]) { return xs[0]; }
-  else { return mpc_or(2, xs[0], xs[1]); }
-}
-
-static mpc_val_t *mpcf_re_and(int n, mpc_val_t **xs) {
-  int i;
-  mpc_parser_t *p = mpc_lift(mpcf_ctor_str);
-  for (i = 0; i < n; i++) {
-    p = mpc_and(2, mpcf_strfold, p, xs[i], free);
-  }
-  return p;
-}
-
-static mpc_val_t *mpcf_re_repeat(int n, mpc_val_t **xs) {
-  int num;
-  (void) n;
-  if (!xs[1]) { return xs[0]; }
-  if (strcmp(xs[1], "*") == 0) { free(xs[1]); return mpc_many(mpcf_strfold, xs[0]); }
-  if (strcmp(xs[1], "+") == 0) { free(xs[1]); return mpc_many1(mpcf_strfold, xs[0]); }
-  if (strcmp(xs[1], "?") == 0) { free(xs[1]); return mpc_maybe_lift(xs[0], mpcf_ctor_str); }
-  num = *(int*)xs[1];
-  free(xs[1]);
-  
-  return mpc_count(num, mpcf_strfold, xs[0], free);
-}
-
-static mpc_parser_t *mpc_re_escape_char(char c) {
-  switch (c) {
-    case 'a': return mpc_char('\a');
-    case 'f': return mpc_char('\f');
-    case 'n': return mpc_char('\n');
-    case 'r': return mpc_char('\r');
-    case 't': return mpc_char('\t');
-    case 'v': return mpc_char('\v');
-    case 'b': return mpc_and(2, mpcf_snd, mpc_boundary(), mpc_lift(mpcf_ctor_str), free);
-    case 'B': return mpc_not_lift(mpc_boundary(), free, mpcf_ctor_str);
-    case 'A': return mpc_and(2, mpcf_snd, mpc_soi(), mpc_lift(mpcf_ctor_str), free);
-    case 'Z': return mpc_and(2, mpcf_snd, mpc_eoi(), mpc_lift(mpcf_ctor_str), free);
-    case 'd': return mpc_digit();
-    case 'D': return mpc_not_lift(mpc_digit(), free, mpcf_ctor_str);
-    case 's': return mpc_whitespace();
-    case 'S': return mpc_not_lift(mpc_whitespace(), free, mpcf_ctor_str);
-    case 'w': return mpc_alphanum();
-    case 'W': return mpc_not_lift(mpc_alphanum(), free, mpcf_ctor_str);
-    default: return NULL;
-  }
-}
-
-static mpc_val_t *mpcf_re_escape(mpc_val_t *x) {
-  
-  char *s = x;
-  mpc_parser_t *p;
-  
-  /* Regex Special Characters */
-  if (s[0] == '.') { free(s); return mpc_any(); }
-  if (s[0] == '^') { free(s); return mpc_and(2, mpcf_snd, mpc_soi(), mpc_lift(mpcf_ctor_str), free); }
-  if (s[0] == '$') { free(s); return mpc_and(2, mpcf_snd, mpc_eoi(), mpc_lift(mpcf_ctor_str), free); }
-  
-  /* Regex Escape */
-  if (s[0] == '\\') {
-    p = mpc_re_escape_char(s[1]);
-    p = (!p) ? mpc_char(s[1]) : p;
-    free(s);
-    return p;
-  }
-  
-  /* Regex Standard */
-  p = mpc_char(s[0]);
-  free(s);
-  return p;
-}
-
-static const char *mpc_re_range_escape_char(char c) {
-  switch (c) {
-    case '-': return "-";
-    case 'a': return "\a";
-    case 'f': return "\f";
-    case 'n': return "\n";
-    case 'r': return "\r";
-    case 't': return "\t";
-    case 'v': return "\v";
-    case 'b': return "\b";
-    case 'd': return "0123456789";
-    case 's': return " \f\n\r\t\v";
-    case 'w': return "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
-    default: return NULL;
-  }
-}
-
-static mpc_val_t *mpcf_re_range(mpc_val_t *x) {
-  
-  mpc_parser_t *out;
-  size_t i, j;
-  size_t start, end;
-  const char *tmp = NULL;
-  const char *s = x;
-  int comp = s[0] == '^' ? 1 : 0;
-  char *range;
-  
-  if (s[0] == '\0') { free(x); return mpc_fail("Invalid Regex Range Expression"); } 
-  if (s[0] == '^' && 
-      s[1] == '\0') { free(x); return mpc_fail("Invalid Regex Range Expression"); }
-  
-  range = calloc(1,1);
-
-  for (i = comp; i < strlen(s); i++){
-    
-    /* Regex Range Escape */
-    if (s[i] == '\\') {
-      tmp = mpc_re_range_escape_char(s[i+1]);
-      if (tmp != NULL) {
-        range = realloc(range, strlen(range) + strlen(tmp) + 1);
-        strcat(range, tmp);
-      } else {
-        range = realloc(range, strlen(range) + 1 + 1);
-        range[strlen(range) + 1] = '\0';
-        range[strlen(range) + 0] = s[i+1];      
-      }
-      i++;
-    }
-    
-    /* Regex Range...Range */
-    else if (s[i] == '-') {
-      if (s[i+1] == '\0' || i == 0) {
-          range = realloc(range, strlen(range) + strlen("-") + 1);
-          strcat(range, "-");
-      } else {
-        start = s[i-1]+1;
-        end = s[i+1]-1;
-        for (j = start; j <= end; j++) {
-          range = realloc(range, strlen(range) + 1 + 1 + 1);
-          range[strlen(range) + 1] = '\0';
-          range[strlen(range) + 0] = j;
-        }        
-      }
-    }
-    
-    /* Regex Range Normal */
-    else {
-      range = realloc(range, strlen(range) + 1 + 1);
-      range[strlen(range) + 1] = '\0';
-      range[strlen(range) + 0] = s[i];
-    }
-  
-  }
-  
-  out = comp == 1 ? mpc_noneof(range) : mpc_oneof(range);
-  
-  free(x);
-  free(range);
-  
-  return out;
-}
-
-mpc_parser_t *mpc_re(const char *re) {
-  
-  char *err_msg;
-  mpc_parser_t *err_out;
-  mpc_result_t r;
-  mpc_parser_t *Regex, *Term, *Factor, *Base, *Range, *RegexEnclose; 
-  
-  Regex  = mpc_new("regex");
-  Term   = mpc_new("term");
-  Factor = mpc_new("factor");
-  Base   = mpc_new("base");
-  Range  = mpc_new("range");
-  
-  mpc_define(Regex, mpc_and(2, mpcf_re_or,
-    Term, 
-    mpc_maybe(mpc_and(2, mpcf_snd_free, mpc_char('|'), Regex, free)),
-    (mpc_dtor_t)mpc_delete
-  ));
-  
-  mpc_define(Term, mpc_many(mpcf_re_and, Factor));
-  
-  mpc_define(Factor, mpc_and(2, mpcf_re_repeat,
-    Base,
-    mpc_or(5,
-      mpc_char('*'), mpc_char('+'), mpc_char('?'),
-      mpc_brackets(mpc_int(), free),
-      mpc_pass()),
-    (mpc_dtor_t)mpc_delete
-  ));
-  
-  mpc_define(Base, mpc_or(4,
-    mpc_parens(Regex, (mpc_dtor_t)mpc_delete),
-    mpc_squares(Range, (mpc_dtor_t)mpc_delete),
-    mpc_apply(mpc_escape(), mpcf_re_escape),
-    mpc_apply(mpc_noneof(")|"), mpcf_re_escape)
-  ));
-  
-  mpc_define(Range, mpc_apply(
-    mpc_many(mpcf_strfold, mpc_or(2, mpc_escape(), mpc_noneof("]"))),
-    mpcf_re_range
-  ));
-  
-  RegexEnclose = mpc_whole(mpc_predictive(Regex), (mpc_dtor_t)mpc_delete);
-  
-  mpc_optimise(RegexEnclose);
-  mpc_optimise(Regex);
-  mpc_optimise(Term);
-  mpc_optimise(Factor);
-  mpc_optimise(Base);
-  mpc_optimise(Range);
-  
-  if(!mpc_parse("<mpc_re_compiler>", re, RegexEnclose, &r)) {
-    err_msg = mpc_err_string(r.error);
-    err_out = mpc_failf("Invalid Regex: %s", err_msg);
-    mpc_err_delete(r.error);  
-    free(err_msg);
-    r.output = err_out;
-  }
-  
-  mpc_cleanup(6, RegexEnclose, Regex, Term, Factor, Base, Range);
-  
-  mpc_optimise(r.output);
-  
-  return r.output;
-  
-}
-
-/*
-** Common Fold Functions
-*/
-
-void mpcf_dtor_null(mpc_val_t *x) { (void) x; return; }
-
-mpc_val_t *mpcf_ctor_null(void) { return NULL; }
-mpc_val_t *mpcf_ctor_str(void) { return calloc(1, 1); }
-mpc_val_t *mpcf_free(mpc_val_t *x) { free(x); return NULL; }
-
-mpc_val_t *mpcf_int(mpc_val_t *x) {
-  int *y = malloc(sizeof(int));
-  *y = strtol(x, NULL, 10);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_hex(mpc_val_t *x) {
-  int *y = malloc(sizeof(int));
-  *y = strtol(x, NULL, 16);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_oct(mpc_val_t *x) {
-  int *y = malloc(sizeof(int));
-  *y = strtol(x, NULL, 8);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_float(mpc_val_t *x) {
-  float *y = malloc(sizeof(float));
-  *y = strtod(x, NULL);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_strtriml(mpc_val_t *x) {
-  char *s = x;
-  while (isspace(*s)) {
-    memmove(s, s+1, strlen(s));
-  }
-  return s;
-}
-
-mpc_val_t *mpcf_strtrimr(mpc_val_t *x) {
-  char *s = x;
-  size_t l = strlen(s);
-  while (isspace(s[l-1])) {
-    s[l-1] = '\0'; l--;
-  }
-  return s;
-}
-
-mpc_val_t *mpcf_strtrim(mpc_val_t *x) {
-  return mpcf_strtriml(mpcf_strtrimr(x));
-}
-
-static const char mpc_escape_input_c[]  = {
-  '\a', '\b', '\f', '\n', '\r',
-  '\t', '\v', '\\', '\'', '\"', '\0'};
-    
-static const char *mpc_escape_output_c[] = {
-  "\\a", "\\b", "\\f", "\\n", "\\r", "\\t", 
-  "\\v", "\\\\", "\\'", "\\\"", "\\0", NULL};
-
-static const char mpc_escape_input_raw_re[] = { '/' };
-static const char *mpc_escape_output_raw_re[] = { "\\/", NULL };
-
-static const char mpc_escape_input_raw_cstr[] = { '"' };
-static const char *mpc_escape_output_raw_cstr[] = { "\\\"", NULL };
-
-static const char mpc_escape_input_raw_cchar[] = { '\'' };
-static const char *mpc_escape_output_raw_cchar[] = { "\\'", NULL };
-
-static mpc_val_t *mpcf_escape_new(mpc_val_t *x, const char *input, const char **output) {
-  
-  int i;
-  int found;
-  char buff[2];
-  char *s = x;
-  char *y = calloc(1, 1);
-  
-  while (*s) {
-    
-    i = 0;
-    found = 0;
-
-    while (output[i]) {
-      if (*s == input[i]) {
-        y = realloc(y, strlen(y) + strlen(output[i]) + 1);
-        strcat(y, output[i]);
-        found = 1;
-        break;
-      }
-      i++;
-    }
-    
-    if (!found) {
-      y = realloc(y, strlen(y) + 2);
-      buff[0] = *s; buff[1] = '\0';
-      strcat(y, buff);
-    }
-    
-    s++;
-  }
-  
-  
-  return y;
-}
-
-static mpc_val_t *mpcf_unescape_new(mpc_val_t *x, const char *input, const char **output) {
-  
-  int i;
-  int found = 0;
-  char buff[2];
-  char *s = x;
-  char *y = calloc(1, 1);
-  
-  while (*s) {
-    
-    i = 0;
-    found = 0;
-    
-    while (output[i]) {
-      if ((*(s+0)) == output[i][0] &&
-          (*(s+1)) == output[i][1]) {
-        y = realloc(y, strlen(y) + 1 + 1);
-        buff[0] = input[i]; buff[1] = '\0';
-        strcat(y, buff);
-        found = 1;
-        s++;
-        break;
-      }
-      i++;
-    }
-    
-    if (!found) {
-      y = realloc(y, strlen(y) + 1 + 1);
-      buff[0] = *s; buff[1] = '\0';
-      strcat(y, buff);
-    }
-    
-    if (*s == '\0') { break; }
-    else { s++; }
-  }
-  
-  return y;
-  
-}
-
-mpc_val_t *mpcf_escape(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_c, mpc_escape_output_c);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_unescape(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_c, mpc_escape_output_c);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_escape_regex(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_raw_re, mpc_escape_output_raw_re);
-  free(x);
-  return y;  
-}
-
-mpc_val_t *mpcf_unescape_regex(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_raw_re, mpc_escape_output_raw_re);
-  free(x);
-  return y;  
-}
-
-mpc_val_t *mpcf_escape_string_raw(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_raw_cstr, mpc_escape_output_raw_cstr);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_unescape_string_raw(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_raw_cstr, mpc_escape_output_raw_cstr);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_escape_char_raw(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_raw_cchar, mpc_escape_output_raw_cchar);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_unescape_char_raw(mpc_val_t *x) {
-  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_raw_cchar, mpc_escape_output_raw_cchar);
-  free(x);
-  return y;
-}
-
-mpc_val_t *mpcf_null(int n, mpc_val_t** xs) { (void) n; (void) xs; return NULL; }
-mpc_val_t *mpcf_fst(int n, mpc_val_t **xs) { (void) n; return xs[0]; }
-mpc_val_t *mpcf_snd(int n, mpc_val_t **xs) { (void) n; return xs[1]; }
-mpc_val_t *mpcf_trd(int n, mpc_val_t **xs) { (void) n; return xs[2]; }
-
-static mpc_val_t *mpcf_nth_free(int n, mpc_val_t **xs, int x) {
-  int i;
-  for (i = 0; i < n; i++) {
-    if (i != x) { free(xs[i]); }
-  }
-  return xs[x];
-}
- 
-mpc_val_t *mpcf_fst_free(int n, mpc_val_t **xs) { return mpcf_nth_free(n, xs, 0); }
-mpc_val_t *mpcf_snd_free(int n, mpc_val_t **xs) { return mpcf_nth_free(n, xs, 1); }
-mpc_val_t *mpcf_trd_free(int n, mpc_val_t **xs) { return mpcf_nth_free(n, xs, 2); }
-
-mpc_val_t *mpcf_strfold(int n, mpc_val_t **xs) {
-  int i;
-  size_t l = 0;
-  
-  if (n == 0) { return calloc(1, 1); }
-  
-  for (i = 0; i < n; i++) { l += strlen(xs[i]); }
-  
-  xs[0] = realloc(xs[0], l + 1);
-  
-  for (i = 1; i < n; i++) {
-    strcat(xs[0], xs[i]); free(xs[i]);
-  }
-  
-  return xs[0];
-}
-
-mpc_val_t *mpcf_maths(int n, mpc_val_t **xs) {
-  int **vs = (int**)xs;
-  (void) n;
-  
-  if (strcmp(xs[1], "*") == 0) { *vs[0] *= *vs[2]; }
-  if (strcmp(xs[1], "/") == 0) { *vs[0] /= *vs[2]; }
-  if (strcmp(xs[1], "%") == 0) { *vs[0] %= *vs[2]; }
-  if (strcmp(xs[1], "+") == 0) { *vs[0] += *vs[2]; }
-  if (strcmp(xs[1], "-") == 0) { *vs[0] -= *vs[2]; }
-  
-  free(xs[1]); free(xs[2]);
-  
-  return xs[0];
-}
-
-/*
-** Printing
-*/
-
-static void mpc_print_unretained(mpc_parser_t *p, int force) {
-  
-  /* TODO: Print Everything Escaped */
-  
-  int i;
-  char *s, *e;
-  char buff[2];
-  
-  if (p->retained && !force) {;
-    if (p->name) { printf("<%s>", p->name); }
-    else { printf("<anon>"); }
-    return;
-  }
-  
-  if (p->type == MPC_TYPE_UNDEFINED) { printf("<?>"); }
-  if (p->type == MPC_TYPE_PASS)   { printf("<:>"); }
-  if (p->type == MPC_TYPE_FAIL)   { printf("<!>"); }
-  if (p->type == MPC_TYPE_LIFT)   { printf("<#>"); }
-  if (p->type == MPC_TYPE_STATE)  { printf("<S>"); }
-  if (p->type == MPC_TYPE_ANCHOR) { printf("<@>"); }
-  if (p->type == MPC_TYPE_EXPECT) {
-    printf("%s", p->data.expect.m);
-    /*mpc_print_unretained(p->data.expect.x, 0);*/
-  }
-  
-  if (p->type == MPC_TYPE_ANY) { printf("<.>"); }
-  if (p->type == MPC_TYPE_SATISFY) { printf("<f>"); }
-
-  if (p->type == MPC_TYPE_SINGLE) {
-    buff[0] = p->data.single.x; buff[1] = '\0';
-    s = mpcf_escape_new(
-      buff,
-      mpc_escape_input_c,
-      mpc_escape_output_c);
-    printf("'%s'", s);
-    free(s);
-  }
-  
-  if (p->type == MPC_TYPE_RANGE) {
-    buff[0] = p->data.range.x; buff[1] = '\0';
-    s = mpcf_escape_new(
-      buff,
-      mpc_escape_input_c,
-      mpc_escape_output_c);
-    buff[0] = p->data.range.y; buff[1] = '\0';
-    e = mpcf_escape_new(
-      buff,
-      mpc_escape_input_c,
-      mpc_escape_output_c);
-    printf("[%s-%s]", s, e);
-    free(s);
-    free(e);
-  }
-  
-  if (p->type == MPC_TYPE_ONEOF) {
-    s = mpcf_escape_new(
-      p->data.string.x,
-      mpc_escape_input_c,
-      mpc_escape_output_c);
-    printf("[%s]", s);
-    free(s);
-  }
-  
-  if (p->type == MPC_TYPE_NONEOF) {
-    s = mpcf_escape_new(
-      p->data.string.x,
-      mpc_escape_input_c,
-      mpc_escape_output_c);
-    printf("[^%s]", s);
-    free(s);
-  }
-  
-  if (p->type == MPC_TYPE_STRING) {
-    s = mpcf_escape_new(
-      p->data.string.x,
-      mpc_escape_input_c,
-      mpc_escape_output_c);
-    printf("\"%s\"", s);
-    free(s);
-  }
-  
-  if (p->type == MPC_TYPE_APPLY)    { mpc_print_unretained(p->data.apply.x, 0); }
-  if (p->type == MPC_TYPE_APPLY_TO) { mpc_print_unretained(p->data.apply_to.x, 0); }
-  if (p->type == MPC_TYPE_PREDICT)  { mpc_print_unretained(p->data.predict.x, 0); }
-
-  if (p->type == MPC_TYPE_NOT)   { mpc_print_unretained(p->data.not.x, 0); printf("!"); }
-  if (p->type == MPC_TYPE_MAYBE) { mpc_print_unretained(p->data.not.x, 0); printf("?"); }
-
-  if (p->type == MPC_TYPE_MANY)  { mpc_print_unretained(p->data.repeat.x, 0); printf("*"); }
-  if (p->type == MPC_TYPE_MANY1) { mpc_print_unretained(p->data.repeat.x, 0); printf("+"); }
-  if (p->type == MPC_TYPE_COUNT) { mpc_print_unretained(p->data.repeat.x, 0); printf("{%i}", p->data.repeat.n); }
-  
-  if (p->type == MPC_TYPE_OR) {
-    printf("(");
-    for(i = 0; i < p->data.or.n-1; i++) {
-      mpc_print_unretained(p->data.or.xs[i], 0);
-      printf(" | ");
-    }
-    mpc_print_unretained(p->data.or.xs[p->data.or.n-1], 0);
-    printf(")");
-  }
-  
-  if (p->type == MPC_TYPE_AND) {
-    printf("(");
-    for(i = 0; i < p->data.and.n-1; i++) {
-      mpc_print_unretained(p->data.and.xs[i], 0);
-      printf(" ");
-    }
-    mpc_print_unretained(p->data.and.xs[p->data.and.n-1], 0);
-    printf(")");
-  }
-  
-}
-
-void mpc_print(mpc_parser_t *p) {
-  mpc_print_unretained(p, 1);
-  printf("\n");
-}
-
-/*
-** Testing
-*/
-
-/*
-** These functions are slightly unwieldy and
-** also the whole of the testing suite for mpc
-** mpc is pretty shaky.
-**
-** It could do with a lot more tests and more
-** precision. Currently I am only really testing
-** changes off of the examples.
-**
-*/
-
-int mpc_test_fail(mpc_parser_t *p, const char *s, const void *d,
-  int(*tester)(const void*, const void*),
-  mpc_dtor_t destructor,
-  void(*printer)(const void*)) {
-  mpc_result_t r;
-  (void) printer;
-  if (mpc_parse("<test>", s, p, &r)) {
-
-    if (tester(r.output, d)) {
-      destructor(r.output);
-      return 0;
-    } else {
-      destructor(r.output);
-      return 1;
-    }
-  
-  } else {
-    mpc_err_delete(r.error);
-    return 1;
-  }
-  
-}
-
-int mpc_test_pass(mpc_parser_t *p, const char *s, const void *d,
-  int(*tester)(const void*, const void*), 
-  mpc_dtor_t destructor, 
-  void(*printer)(const void*)) {
-
-  mpc_result_t r;  
-  if (mpc_parse("<test>", s, p, &r)) {
-    
-    if (tester(r.output, d)) {
-      destructor(r.output);
-      return 1;
-    } else {
-      printf("Got "); printer(r.output); printf("\n");
-      printf("Expected "); printer(d); printf("\n");
-      destructor(r.output);
-      return 0;
-    }
-    
-  } else {    
-    mpc_err_print(r.error);
-    mpc_err_delete(r.error);
-    return 0;
-    
-  }
-  
-}
-
-
-/*
-** AST
-*/
-
-void mpc_ast_delete(mpc_ast_t *a) {
-  
-  int i;
-  
-  if (!a) { return; }
-  
-  for (i = 0; i < a->children_num; i++) {
-    mpc_ast_delete(a->children[i]);
-  }
-  
-  free(a->children);
-  free(a->tag);
-  free(a->contents);
-  free(a);
-  
-}
-
-static void mpc_ast_delete_no_children(mpc_ast_t *a) {
-  free(a->children);
-  free(a->tag);
-  free(a->contents);
-  free(a);
-}
-
-mpc_ast_t *mpc_ast_new(const char *tag, const char *contents) {
-  
-  mpc_ast_t *a = malloc(sizeof(mpc_ast_t));
-  
-  a->tag = malloc(strlen(tag) + 1);
-  strcpy(a->tag, tag);
-  
-  a->contents = malloc(strlen(contents) + 1);
-  strcpy(a->contents, contents);
-  
-  a->state = mpc_state_new();
-  
-  a->children_num = 0;
-  a->children = NULL;
-  return a;
-  
-}
-
-mpc_ast_t *mpc_ast_build(int n, const char *tag, ...) {
-  
-  mpc_ast_t *a = mpc_ast_new(tag, "");
-  
-  int i;
-  va_list va;
-  va_start(va, tag);
-  
-  for (i = 0; i < n; i++) {
-    mpc_ast_add_child(a, va_arg(va, mpc_ast_t*));
-  }
-  
-  va_end(va);
-  
-  return a;
-  
-}
-
-mpc_ast_t *mpc_ast_add_root(mpc_ast_t *a) {
-
-  mpc_ast_t *r;
-
-  if (!a) { return a; }
-  if (a->children_num == 0) { return a; }
-  if (a->children_num == 1) { return a; }
-
-  r = mpc_ast_new(">", "");
-  mpc_ast_add_child(r, a);
-  return r;
-}
-
-int mpc_ast_eq(mpc_ast_t *a, mpc_ast_t *b) {
-  
-  int i;
-
-  if (strcmp(a->tag, b->tag) != 0) { return 0; }
-  if (strcmp(a->contents, b->contents) != 0) { return 0; }
-  if (a->children_num != b->children_num) { return 0; }
-  
-  for (i = 0; i < a->children_num; i++) {
-    if (!mpc_ast_eq(a->children[i], b->children[i])) { return 0; }
-  }
-  
-  return 1;
-}
-
-mpc_ast_t *mpc_ast_add_child(mpc_ast_t *r, mpc_ast_t *a) {
-  r->children_num++;
-  r->children = realloc(r->children, sizeof(mpc_ast_t*) * r->children_num);
-  r->children[r->children_num-1] = a;
-  return r;
-}
-
-mpc_ast_t *mpc_ast_add_tag(mpc_ast_t *a, const char *t) {
-  if (!a) { return a; }
-  a->tag = realloc(a->tag, strlen(t) + 1 + strlen(a->tag) + 1);
-  memmove(a->tag + strlen(t) + 1, a->tag, strlen(a->tag)+1);
-  memmove(a->tag, t, strlen(t));
-  memmove(a->tag + strlen(t), "|", 1);
-  return a;
-}
-
-mpc_ast_t *mpc_ast_tag(mpc_ast_t *a, const char *t) {
-  a->tag = realloc(a->tag, strlen(t) + 1);
-  strcpy(a->tag, t);
-  return a;
-}
-
-mpc_ast_t *mpc_ast_state(mpc_ast_t *a, mpc_state_t s) {
-  if (!a) { return a; }
-  a->state = s;
-  return a;
-}
-
-static void mpc_ast_print_depth(mpc_ast_t *a, int d, FILE *fp) {
-  
-  int i;
-  
-  if (!a) {
-    fprintf(fp, "NULL\n");
-    return;
-  }
-  
-  for (i = 0; i < d; i++) { fprintf(fp, "  "); }
-  
-  if (strlen(a->contents)) {
-    fprintf(fp, "%s:%lu:%lu '%s'\n", a->tag, 
-      (long unsigned int)(a->state.row+1),
-      (long unsigned int)(a->state.col+1),
-      a->contents);
-  } else {
-    fprintf(fp, "%s \n", a->tag);
-  }
-  
-  for (i = 0; i < a->children_num; i++) {
-    mpc_ast_print_depth(a->children[i], d+1, fp);
-  }
-  
-}
-
-void mpc_ast_print(mpc_ast_t *a) {
-  mpc_ast_print_depth(a, 0, stdout);
-}
-
-void mpc_ast_print_to(mpc_ast_t *a, FILE *fp) {
-  mpc_ast_print_depth(a, 0, fp);
-}
-
-mpc_val_t *mpcf_fold_ast(int n, mpc_val_t **xs) {
-  
-  int i, j;
-  mpc_ast_t** as = (mpc_ast_t**)xs;
-  mpc_ast_t *r;
-  
-  if (n == 0) { return NULL; }
-  if (n == 1) { return xs[0]; }
-  if (n == 2 && !xs[1]) { return xs[0]; }
-  if (n == 2 && !xs[0]) { return xs[1]; }
-  
-  r = mpc_ast_new(">", "");
-  
-  for (i = 0; i < n; i++) {
-    
-    if (!as[i]) { continue; }
-    
-    if (as[i] && as[i]->children_num > 0) {
-      
-      for (j = 0; j < as[i]->children_num; j++) {
-        mpc_ast_add_child(r, as[i]->children[j]);
-      }
-      
-      mpc_ast_delete_no_children(as[i]);
-      
-    } else if (as[i] && as[i]->children_num == 0) {
-      mpc_ast_add_child(r, as[i]);
-    }
-  
-  }
-  
-  if (r->children_num) {
-    r->state = r->children[0]->state;
-  }
-  
-  return r;
-}
-
-mpc_val_t *mpcf_str_ast(mpc_val_t *c) {
-  mpc_ast_t *a = mpc_ast_new("", c);
-  free(c);
-  return a;
-}
-
-mpc_val_t *mpcf_state_ast(int n, mpc_val_t **xs) {
-  mpc_state_t *s = ((mpc_state_t**)xs)[0];
-  mpc_ast_t *a = ((mpc_ast_t**)xs)[1];
-  (void)n;
-  a = mpc_ast_state(a, *s);
-  free(s);
-  return a;
-}
-
-mpc_parser_t *mpca_state(mpc_parser_t *a) {
-  return mpc_and(2, mpcf_state_ast, mpc_state(), a, free);
-}
-
-mpc_parser_t *mpca_tag(mpc_parser_t *a, const char *t) {
-  return mpc_apply_to(a, (mpc_apply_to_t)mpc_ast_tag, (void*)t);
-}
-
-mpc_parser_t *mpca_add_tag(mpc_parser_t *a, const char *t) {
-  return mpc_apply_to(a, (mpc_apply_to_t)mpc_ast_add_tag, (void*)t);
-}
-
-mpc_parser_t *mpca_root(mpc_parser_t *a) {
-  return mpc_apply(a, (mpc_apply_t)mpc_ast_add_root);
-}
-
-mpc_parser_t *mpca_not(mpc_parser_t *a) { return mpc_not(a, (mpc_dtor_t)mpc_ast_delete); }
-mpc_parser_t *mpca_maybe(mpc_parser_t *a) { return mpc_maybe(a); }
-mpc_parser_t *mpca_many(mpc_parser_t *a) { return mpc_many(mpcf_fold_ast, a); }
-mpc_parser_t *mpca_many1(mpc_parser_t *a) { return mpc_many1(mpcf_fold_ast, a); }
-mpc_parser_t *mpca_count(int n, mpc_parser_t *a) { return mpc_count(n, mpcf_fold_ast, a, (mpc_dtor_t)mpc_ast_delete); }
-
-mpc_parser_t *mpca_or(int n, ...) {
-
-  int i;
-  va_list va;
-
-  mpc_parser_t *p = mpc_undefined();
-  
-  p->type = MPC_TYPE_OR;
-  p->data.or.n = n;
-  p->data.or.xs = malloc(sizeof(mpc_parser_t*) * n);
-  
-  va_start(va, n);  
-  for (i = 0; i < n; i++) {
-    p->data.or.xs[i] = va_arg(va, mpc_parser_t*);
-  }
-  va_end(va);
-  
-  return p;
-  
-}
-
-mpc_parser_t *mpca_and(int n, ...) {
-  
-  int i;
-  va_list va;
-  
-  mpc_parser_t *p = mpc_undefined();
-  
-  p->type = MPC_TYPE_AND;
-  p->data.and.n = n;
-  p->data.and.f = mpcf_fold_ast;
-  p->data.and.xs = malloc(sizeof(mpc_parser_t*) * n);
-  p->data.and.dxs = malloc(sizeof(mpc_dtor_t) * (n-1));
-  
-  va_start(va, n);
-  for (i = 0; i < n; i++) {
-    p->data.and.xs[i] = va_arg(va, mpc_parser_t*);
-  }
-  for (i = 0; i < (n-1); i++) {
-    p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete;
-  }    
-  va_end(va);
-  
-  return p;  
-}
-
-mpc_parser_t *mpca_total(mpc_parser_t *a) { return mpc_total(a, (mpc_dtor_t)mpc_ast_delete); }
-
-/*
-** Grammar Parser
-*/
-
-/*
-** This is another interesting bootstrapping.
-**
-** Having a general purpose AST type allows
-** users to specify the grammar alone and
-** let all fold rules be automatically taken
-** care of by existing functions.
-**
-** You don't get to control the type spat
-** out but this means you can make a nice
-** parser to take in some grammar in nice
-** syntax and spit out a parser that works.
-**
-** The grammar for this looks surprisingly
-** like regex but the main difference is that
-** it is now whitespace insensitive and the
-** base type takes literals of some form.
-*/
-
-/*
-**
-**  ### Grammar Grammar
-**
-**      <grammar> : (<term> "|" <grammar>) | <term>
-**     
-**      <term> : <factor>*
-**
-**      <factor> : <base>
-**               | <base> "*"
-**               | <base> "+"
-**               | <base> "?"
-**               | <base> "{" <digits> "}"
-**           
-**      <base> : "<" (<digits> | <ident>) ">"
-**             | <string_lit>
-**             | <char_lit>
-**             | <regex_lit>
-**             | "(" <grammar> ")"
-*/
-
-typedef struct {
-  va_list *va;
-  int parsers_num;
-  mpc_parser_t **parsers;
-  int flags;
-} mpca_grammar_st_t;
-
-static mpc_val_t *mpcaf_grammar_or(int n, mpc_val_t **xs) {
-  (void) n;
-  if (!xs[1]) { return xs[0]; }
-  else { return mpca_or(2, xs[0], xs[1]); }
-}
-
-static mpc_val_t *mpcaf_grammar_and(int n, mpc_val_t **xs) {
-  int i;
-  mpc_parser_t *p = mpc_pass();  
-  for (i = 0; i < n; i++) {
-    if (xs[i] != NULL) { p = mpca_and(2, p, xs[i]); }
-  }
-  return p;
-}
-
-static mpc_val_t *mpcaf_grammar_repeat(int n, mpc_val_t **xs) { 
-  int num;
-  (void) n;
-  if (!xs[1]) { return xs[0]; }  
-  if (strcmp(xs[1], "*") == 0) { free(xs[1]); return mpca_many(xs[0]); }
-  if (strcmp(xs[1], "+") == 0) { free(xs[1]); return mpca_many1(xs[0]); }
-  if (strcmp(xs[1], "?") == 0) { free(xs[1]); return mpca_maybe(xs[0]); }
-  if (strcmp(xs[1], "!") == 0) { free(xs[1]); return mpca_not(xs[0]); }
-  num = *((int*)xs[1]);
-  free(xs[1]);
-  return mpca_count(num, xs[0]);
-}
-
-static mpc_val_t *mpcaf_grammar_string(mpc_val_t *x, void *s) {
-  mpca_grammar_st_t *st = s;
-  char *y = mpcf_unescape(x);
-  mpc_parser_t *p = (st->flags & MPCA_LANG_WHITESPACE_SENSITIVE) ? mpc_string(y) : mpc_tok(mpc_string(y));
-  free(y);
-  return mpca_state(mpca_tag(mpc_apply(p, mpcf_str_ast), "string"));
-}
-
-static mpc_val_t *mpcaf_grammar_char(mpc_val_t *x, void *s) {
-  mpca_grammar_st_t *st = s;
-  char *y = mpcf_unescape(x);
-  mpc_parser_t *p = (st->flags & MPCA_LANG_WHITESPACE_SENSITIVE) ? mpc_char(y[0]) : mpc_tok(mpc_char(y[0]));
-  free(y);
-  return mpca_state(mpca_tag(mpc_apply(p, mpcf_str_ast), "char"));
-}
-
-static mpc_val_t *mpcaf_grammar_regex(mpc_val_t *x, void *s) {
-  mpca_grammar_st_t *st = s;
-  char *y = mpcf_unescape_regex(x);
-  mpc_parser_t *p = (st->flags & MPCA_LANG_WHITESPACE_SENSITIVE) ? mpc_re(y) : mpc_tok(mpc_re(y));
-  free(y);
-  return mpca_state(mpca_tag(mpc_apply(p, mpcf_str_ast), "regex"));
-}
-
-/* Should this just use `isdigit` instead? */
-static int is_number(const char* s) {
-  size_t i;
-  for (i = 0; i < strlen(s); i++) { if (!strchr("0123456789", s[i])) { return 0; } }
-  return 1;
-}
-
-static mpc_parser_t *mpca_grammar_find_parser(char *x, mpca_grammar_st_t *st) {
-  
-  int i;
-  mpc_parser_t *p;
-  
-  /* Case of Number */
-  if (is_number(x)) {
-
-    i = strtol(x, NULL, 10);
-    
-    while (st->parsers_num <= i) {
-      st->parsers_num++;
-      st->parsers = realloc(st->parsers, sizeof(mpc_parser_t*) * st->parsers_num);
-      st->parsers[st->parsers_num-1] = va_arg(*st->va, mpc_parser_t*);
-      if (!st->parsers[st->parsers_num-1]) {
-        return mpc_failf("No Parser in position %i! Only supplied %i Parsers!", i, st->parsers_num);
-      }
-    }
-    
-    return st->parsers[st->parsers_num-1];
-  
-  /* Case of Identifier */
-  } else {
-    
-    /* Search Existing Parsers */
-    for (i = 0; i < st->parsers_num; i++) {
-      mpc_parser_t *q = st->parsers[i];
-      if (!q) { return mpc_failf("Unknown Parser '%s'!", x); }
-      if (q->name && strcmp(q->name, x) == 0) { return q; }
-    }
-    
-    /* Search New Parsers */
-    while (1) {
-    
-      p = va_arg(*st->va, mpc_parser_t*);
-      
-      st->parsers_num++;
-      st->parsers = realloc(st->parsers, sizeof(mpc_parser_t*) * st->parsers_num);
-      st->parsers[st->parsers_num-1] = p;
-      
-      if (!p) { return mpc_failf("Unknown Parser '%s'!", x); }
-      if (p->name && strcmp(p->name, x) == 0) { return p; }
-      
-    }
-  
-  }  
-  
-}
-
-static mpc_val_t *mpcaf_grammar_id(mpc_val_t *x, void *s) {
-  
-  mpca_grammar_st_t *st = s;
-  mpc_parser_t *p = mpca_grammar_find_parser(x, st);
-  free(x);
-
-  if (p->name) {
-    return mpca_state(mpca_root(mpca_add_tag(p, p->name)));
-  } else {
-    return mpca_state(mpca_root(p));
-  }
-}
-
-mpc_parser_t *mpca_grammar_st(const char *grammar, mpca_grammar_st_t *st) {
-  
-  char *err_msg;
-  mpc_parser_t *err_out;
-  mpc_result_t r;
-  mpc_parser_t *GrammarTotal, *Grammar, *Term, *Factor, *Base;
-  
-  GrammarTotal = mpc_new("grammar_total");
-  Grammar = mpc_new("grammar");
-  Term = mpc_new("term");
-  Factor = mpc_new("factor");
-  Base = mpc_new("base");
-  
-  mpc_define(GrammarTotal,
-    mpc_predictive(mpc_total(Grammar, mpc_soft_delete))
-  );
-  
-  mpc_define(Grammar, mpc_and(2, mpcaf_grammar_or,
-    Term,
-    mpc_maybe(mpc_and(2, mpcf_snd_free, mpc_sym("|"), Grammar, free)),
-    mpc_soft_delete
-  ));
-  
-  mpc_define(Term, mpc_many1(mpcaf_grammar_and, Factor));
-  
-  mpc_define(Factor, mpc_and(2, mpcaf_grammar_repeat,
-    Base,
-      mpc_or(6,
-        mpc_sym("*"),
-        mpc_sym("+"),
-        mpc_sym("?"),
-        mpc_sym("!"),
-        mpc_tok_brackets(mpc_int(), free),
-        mpc_pass()),
-    mpc_soft_delete
-  ));
-  
-  mpc_define(Base, mpc_or(5,
-    mpc_apply_to(mpc_tok(mpc_string_lit()), mpcaf_grammar_string, st),
-    mpc_apply_to(mpc_tok(mpc_char_lit()),   mpcaf_grammar_char, st),
-    mpc_apply_to(mpc_tok(mpc_regex_lit()),  mpcaf_grammar_regex, st),
-    mpc_apply_to(mpc_tok_braces(mpc_or(2, mpc_digits(), mpc_ident()), free), mpcaf_grammar_id, st),
-    mpc_tok_parens(Grammar, mpc_soft_delete)
-  ));
-  
-  mpc_optimise(GrammarTotal);
-  mpc_optimise(Grammar);
-  mpc_optimise(Factor);
-  mpc_optimise(Term);
-  mpc_optimise(Base);
-  
-  if(!mpc_parse("<mpc_grammar_compiler>", grammar, GrammarTotal, &r)) {
-    err_msg = mpc_err_string(r.error);
-    err_out = mpc_failf("Invalid Grammar: %s", err_msg);
-    mpc_err_delete(r.error);
-    free(err_msg);
-    r.output = err_out;
-  }
-  
-  mpc_cleanup(5, GrammarTotal, Grammar, Term, Factor, Base);
-  
-  mpc_optimise(r.output);
-  
-  return (st->flags & MPCA_LANG_PREDICTIVE) ? mpc_predictive(r.output) : r.output;
-  
-}
-
-mpc_parser_t *mpca_grammar(int flags, const char *grammar, ...) {
-  mpca_grammar_st_t st;
-  mpc_parser_t *res;
-  va_list va;
-  va_start(va, grammar);
-  
-  st.va = &va;
-  st.parsers_num = 0;
-  st.parsers = NULL;
-  st.flags = flags;
-  
-  res = mpca_grammar_st(grammar, &st);  
-  free(st.parsers);
-  va_end(va);
-  return res;
-}
-
-typedef struct {
-  char *ident;
-  char *name;
-  mpc_parser_t *grammar;
-} mpca_stmt_t;
-
-static mpc_val_t *mpca_stmt_afold(int n, mpc_val_t **xs) {
-  mpca_stmt_t *stmt = malloc(sizeof(mpca_stmt_t));
-  stmt->ident = ((char**)xs)[0];
-  stmt->name = ((char**)xs)[1];
-  stmt->grammar = ((mpc_parser_t**)xs)[3];
-  (void) n;
-  free(((char**)xs)[2]);
-  free(((char**)xs)[4]);
-  
-  return stmt;
-}
-
-static mpc_val_t *mpca_stmt_fold(int n, mpc_val_t **xs) {
-  
-  int i;
-  mpca_stmt_t **stmts = malloc(sizeof(mpca_stmt_t*) * (n+1));
-  
-  for (i = 0; i < n; i++) {
-    stmts[i] = xs[i];
-  }
-  stmts[n] = NULL;  
-  
-  return stmts;
-}
-
-static void mpca_stmt_list_delete(mpc_val_t *x) {
-
-  mpca_stmt_t **stmts = x;
-
-  while(*stmts) {
-    mpca_stmt_t *stmt = *stmts; 
-    free(stmt->ident);
-    free(stmt->name);
-    mpc_soft_delete(stmt->grammar);
-    free(stmt);  
-    stmts++;
-  }
-  free(x);
-
-}
-
-static mpc_val_t *mpca_stmt_list_apply_to(mpc_val_t *x, void *s) {
-
-  mpca_grammar_st_t *st = s;
-  mpca_stmt_t *stmt;
-  mpca_stmt_t **stmts = x;
-  mpc_parser_t *left;
-
-  while(*stmts) {
-    stmt = *stmts;
-    left = mpca_grammar_find_parser(stmt->ident, st);
-    if (st->flags & MPCA_LANG_PREDICTIVE) { stmt->grammar = mpc_predictive(stmt->grammar); }
-    if (stmt->name) { stmt->grammar = mpc_expect(stmt->grammar, stmt->name); }
-    mpc_optimise(stmt->grammar);
-    mpc_define(left, stmt->grammar);
-    free(stmt->ident);
-    free(stmt->name);
-    free(stmt);
-    stmts++;
-  }
-  
-  free(x);
-  
-  return NULL;
-}
-
-static mpc_err_t *mpca_lang_st(mpc_input_t *i, mpca_grammar_st_t *st) {
-  
-  mpc_result_t r;
-  mpc_err_t *e;
-  mpc_parser_t *Lang, *Stmt, *Grammar, *Term, *Factor, *Base; 
-  
-  Lang    = mpc_new("lang");
-  Stmt    = mpc_new("stmt");
-  Grammar = mpc_new("grammar");
-  Term    = mpc_new("term");
-  Factor  = mpc_new("factor");
-  Base    = mpc_new("base");
-  
-  mpc_define(Lang, mpc_apply_to(
-    mpc_total(mpc_predictive(mpc_many(mpca_stmt_fold, Stmt)), mpca_stmt_list_delete),
-    mpca_stmt_list_apply_to, st
-  ));
-  
-  mpc_define(Stmt, mpc_and(5, mpca_stmt_afold,
-    mpc_tok(mpc_ident()), mpc_maybe(mpc_tok(mpc_string_lit())), mpc_sym(":"), Grammar, mpc_sym(";"),
-    free, free, free, mpc_soft_delete
-  ));
-  
-  mpc_define(Grammar, mpc_and(2, mpcaf_grammar_or,
-      Term,
-      mpc_maybe(mpc_and(2, mpcf_snd_free, mpc_sym("|"), Grammar, free)),
-      mpc_soft_delete
-  ));
-  
-  mpc_define(Term, mpc_many1(mpcaf_grammar_and, Factor));
-  
-  mpc_define(Factor, mpc_and(2, mpcaf_grammar_repeat,
-    Base,
-      mpc_or(6,
-        mpc_sym("*"),
-        mpc_sym("+"),
-        mpc_sym("?"),
-        mpc_sym("!"),
-        mpc_tok_brackets(mpc_int(), free),
-        mpc_pass()),
-    mpc_soft_delete
-  ));
-  
-  mpc_define(Base, mpc_or(5,
-    mpc_apply_to(mpc_tok(mpc_string_lit()), mpcaf_grammar_string, st),
-    mpc_apply_to(mpc_tok(mpc_char_lit()),   mpcaf_grammar_char, st),
-    mpc_apply_to(mpc_tok(mpc_regex_lit()),  mpcaf_grammar_regex, st),
-    mpc_apply_to(mpc_tok_braces(mpc_or(2, mpc_digits(), mpc_ident()), free), mpcaf_grammar_id, st),
-    mpc_tok_parens(Grammar, mpc_soft_delete)
-  ));
-  
-  mpc_optimise(Lang);
-  mpc_optimise(Stmt);
-  mpc_optimise(Grammar);
-  mpc_optimise(Term);
-  mpc_optimise(Factor);
-  mpc_optimise(Base);
-  
-  if (!mpc_parse_input(i, Lang, &r)) {
-    e = r.error;
-  } else {
-    e = NULL;
-  }
-  
-  mpc_cleanup(6, Lang, Stmt, Grammar, Term, Factor, Base);
-  
-  return e;
-}
-
-mpc_err_t *mpca_lang_file(int flags, FILE *f, ...) {
-  mpca_grammar_st_t st;
-  mpc_input_t *i;
-  mpc_err_t *err;
-
-  va_list va;  
-  va_start(va, f);
-  
-  st.va = &va;
-  st.parsers_num = 0;
-  st.parsers = NULL;
-  st.flags = flags;
-  
-  i = mpc_input_new_file("<mpca_lang_file>", f);
-  err = mpca_lang_st(i, &st);
-  mpc_input_delete(i);
-  
-  free(st.parsers);
-  va_end(va);
-  return err;
-}
-
-mpc_err_t *mpca_lang_pipe(int flags, FILE *p, ...) {
-  mpca_grammar_st_t st;
-  mpc_input_t *i;
-  mpc_err_t *err;
-
-  va_list va;  
-  va_start(va, p);
-  
-  st.va = &va;
-  st.parsers_num = 0;
-  st.parsers = NULL;
-  st.flags = flags;
-  
-  i = mpc_input_new_pipe("<mpca_lang_pipe>", p);
-  err = mpca_lang_st(i, &st);
-  mpc_input_delete(i);
-  
-  free(st.parsers);
-  va_end(va);
-  return err;
-}
-
-mpc_err_t *mpca_lang(int flags, const char *language, ...) {
-  
-  mpca_grammar_st_t st;
-  mpc_input_t *i;
-  mpc_err_t *err;
-  
-  va_list va;  
-  va_start(va, language);
-  
-  st.va = &va;
-  st.parsers_num = 0;
-  st.parsers = NULL;
-  st.flags = flags;
-  
-  i = mpc_input_new_string("<mpca_lang>", language);
-  err = mpca_lang_st(i, &st);
-  mpc_input_delete(i);
-  
-  free(st.parsers);
-  va_end(va);
-  return err;
-}
-
-mpc_err_t *mpca_lang_contents(int flags, const char *filename, ...) {
-  
-  mpca_grammar_st_t st;
-  mpc_input_t *i;
-  mpc_err_t *err;
-  
-  va_list va;
-
-  FILE *f = fopen(filename, "rb");
-  
-  if (!f) {
-    err = mpc_err_file(filename, "Unable to open file!");
-    return err;
-  }
-  
-  va_start(va, filename);
-  
-  st.va = &va;
-  st.parsers_num = 0;
-  st.parsers = NULL;
-  st.flags = flags;
-  
-  i = mpc_input_new_file(filename, f);
-  err = mpca_lang_st(i, &st);
-  mpc_input_delete(i);
-  
-  free(st.parsers);
-  va_end(va);  
-  
-  fclose(f);
-  
-  return err;
-}
-
-static int mpc_nodecount_unretained(mpc_parser_t* p, int force) {
-
-  int i, total;
-
-  if (p->retained && !force) { return 0; }
-
-  if (p->type == MPC_TYPE_EXPECT) { return 1 + mpc_nodecount_unretained(p->data.expect.x, 0); }
-
-  if (p->type == MPC_TYPE_APPLY)    { return 1 + mpc_nodecount_unretained(p->data.apply.x, 0); }
-  if (p->type == MPC_TYPE_APPLY_TO) { return 1 + mpc_nodecount_unretained(p->data.apply_to.x, 0); }
-  if (p->type == MPC_TYPE_PREDICT)  { return 1 + mpc_nodecount_unretained(p->data.predict.x, 0); }
-
-  if (p->type == MPC_TYPE_NOT)   { return 1 + mpc_nodecount_unretained(p->data.not.x, 0); }
-  if (p->type == MPC_TYPE_MAYBE) { return 1 + mpc_nodecount_unretained(p->data.not.x, 0); }
-
-  if (p->type == MPC_TYPE_MANY)  { return 1 + mpc_nodecount_unretained(p->data.repeat.x, 0); }
-  if (p->type == MPC_TYPE_MANY1) { return 1 + mpc_nodecount_unretained(p->data.repeat.x, 0); }
-  if (p->type == MPC_TYPE_COUNT) { return 1 + mpc_nodecount_unretained(p->data.repeat.x, 0); }
-
-  if (p->type == MPC_TYPE_OR) { 
-    total = 0;
-    for(i = 0; i < p->data.or.n; i++) {
-      total += mpc_nodecount_unretained(p->data.or.xs[i], 0);
-    }
-    return total;
-  }
-  
-  if (p->type == MPC_TYPE_AND) {
-    total = 0;
-    for(i = 0; i < p->data.and.n; i++) {
-      total += mpc_nodecount_unretained(p->data.and.xs[i], 0);
-    }
-    return total;
-  }
-
-  return 1;
-  
-}
-
-void mpc_stats(mpc_parser_t* p) {
-  printf("Stats\n");
-  printf("=====\n");
-  printf("Node Count: %i\n", mpc_nodecount_unretained(p, 1));
-}
-
-static void mpc_optimise_unretained(mpc_parser_t *p, int force) {
-  
-  int i, n, m;
-  mpc_parser_t *t;
-  
-  if (p->retained && !force) { return; }
-  
-  /* Optimise Subexpressions */
-  
-  if (p->type == MPC_TYPE_EXPECT)   { mpc_optimise_unretained(p->data.expect.x, 0); }
-  if (p->type == MPC_TYPE_APPLY)    { mpc_optimise_unretained(p->data.apply.x, 0); }
-  if (p->type == MPC_TYPE_APPLY_TO) { mpc_optimise_unretained(p->data.apply_to.x, 0); }
-  if (p->type == MPC_TYPE_PREDICT)  { mpc_optimise_unretained(p->data.predict.x, 0); }
-  if (p->type == MPC_TYPE_NOT)      { mpc_optimise_unretained(p->data.not.x, 0); }
-  if (p->type == MPC_TYPE_MAYBE)    { mpc_optimise_unretained(p->data.not.x, 0); }
-  if (p->type == MPC_TYPE_MANY)     { mpc_optimise_unretained(p->data.repeat.x, 0); }
-  if (p->type == MPC_TYPE_MANY1)    { mpc_optimise_unretained(p->data.repeat.x, 0); }
-  if (p->type == MPC_TYPE_COUNT)    { mpc_optimise_unretained(p->data.repeat.x, 0); }
-  
-  if (p->type == MPC_TYPE_OR) { 
-    for(i = 0; i < p->data.or.n; i++) {
-      mpc_optimise_unretained(p->data.or.xs[i], 0);
-    }
-  }
-  
-  if (p->type == MPC_TYPE_AND) {
-    for(i = 0; i < p->data.and.n; i++) {
-      mpc_optimise_unretained(p->data.and.xs[i], 0);
-    }
-  }  
-  
-  /* Perform optimisations */
-  
-  while (1) {
-    
-    /* Merge rhs `or` */
-    if (p->type == MPC_TYPE_OR
-    &&  p->data.or.xs[p->data.or.n-1]->type == MPC_TYPE_OR
-    && !p->data.or.xs[p->data.or.n-1]->retained) {
-      t = p->data.or.xs[p->data.or.n-1];
-      n = p->data.or.n; m = t->data.or.n;
-      p->data.or.n = n + m - 1;
-      p->data.or.xs = realloc(p->data.or.xs, sizeof(mpc_parser_t*) * (n + m -1));
-      memmove(p->data.or.xs + n - 1, t->data.or.xs, m * sizeof(mpc_parser_t*));
-      free(t->data.or.xs); free(t->name); free(t);
-      continue;
-    }
-
-    /* Merge lhs `or` */
-    if (p->type == MPC_TYPE_OR
-    &&  p->data.or.xs[0]->type == MPC_TYPE_OR
-    && !p->data.or.xs[0]->retained) {
-      t = p->data.or.xs[0];
-      n = p->data.or.n; m = t->data.or.n;
-      p->data.or.n = n + m - 1;
-      p->data.or.xs = realloc(p->data.or.xs, sizeof(mpc_parser_t*) * (n + m -1));
-      memmove(p->data.or.xs + m, t->data.or.xs + 1, n * sizeof(mpc_parser_t*));
-      memmove(p->data.or.xs, t->data.or.xs, m * sizeof(mpc_parser_t*));
-      free(t->data.or.xs); free(t->name); free(t);
-      continue;
-    }
-    
-    /* Remove ast `pass` */
-    if (p->type == MPC_TYPE_AND
-    &&  p->data.and.n == 2
-    &&  p->data.and.xs[0]->type == MPC_TYPE_PASS
-    && !p->data.and.xs[0]->retained
-    &&  p->data.and.f == mpcf_fold_ast) {
-      t = p->data.and.xs[1];
-      mpc_delete(p->data.and.xs[0]);
-      free(p->data.and.xs); free(p->data.and.dxs); free(p->name);
-      memcpy(p, t, sizeof(mpc_parser_t));
-      free(t);
-      continue;
-    }
-    
-    /* Merge ast lhs `and` */
-    if (p->type == MPC_TYPE_AND
-    &&  p->data.and.f == mpcf_fold_ast
-    &&  p->data.and.xs[0]->type == MPC_TYPE_AND
-    && !p->data.and.xs[0]->retained
-    &&  p->data.and.xs[0]->data.and.f == mpcf_fold_ast) {
-      t = p->data.and.xs[0];
-      n = p->data.and.n; m = t->data.and.n;
-      p->data.and.n = n + m - 1;
-      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m - 1));
-      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
-      memmove(p->data.and.xs + m, p->data.and.xs + 1, (n - 1) * sizeof(mpc_parser_t*));
-      memmove(p->data.and.xs, t->data.and.xs, m * sizeof(mpc_parser_t*));
-      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete; }
-      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
-      continue;
-    }
-    
-    /* Merge ast rhs `and` */
-    if (p->type == MPC_TYPE_AND
-    &&  p->data.and.f == mpcf_fold_ast
-    &&  p->data.and.xs[p->data.and.n-1]->type == MPC_TYPE_AND
-    && !p->data.and.xs[p->data.and.n-1]->retained
-    &&  p->data.and.xs[p->data.and.n-1]->data.and.f == mpcf_fold_ast) {
-      t = p->data.and.xs[p->data.and.n-1];
-      n = p->data.and.n; m = t->data.and.n;
-      p->data.and.n = n + m - 1;
-      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
-      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
-      memmove(p->data.and.xs + n - 1, t->data.and.xs, m * sizeof(mpc_parser_t*));
-      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete; }
-      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
-      continue;
-    }
-
-    /* Remove re `lift` */
-    if (p->type == MPC_TYPE_AND
-    &&  p->data.and.n == 2
-    &&  p->data.and.xs[0]->type == MPC_TYPE_LIFT
-    &&  p->data.and.xs[0]->data.lift.lf == mpcf_ctor_str
-    && !p->data.and.xs[0]->retained
-    &&  p->data.and.f == mpcf_strfold) {
-      t = p->data.and.xs[1];
-      mpc_delete(p->data.and.xs[0]);
-      free(p->data.and.xs); free(p->data.and.dxs); free(p->name);
-      memcpy(p, t, sizeof(mpc_parser_t));
-      free(t);
-      continue;
-    }
-
-    /* Merge re lhs `and` */
-    if (p->type == MPC_TYPE_AND
-    &&  p->data.and.f == mpcf_strfold
-    &&  p->data.and.xs[0]->type == MPC_TYPE_AND
-    && !p->data.and.xs[0]->retained
-    &&  p->data.and.xs[0]->data.and.f == mpcf_strfold) {
-      t = p->data.and.xs[0];
-      n = p->data.and.n; m = t->data.and.n;
-      p->data.and.n = n + m - 1;
-      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m - 1));
-      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
-      memmove(p->data.and.xs + m, p->data.and.xs + 1, (n - 1) * sizeof(mpc_parser_t*));
-      memmove(p->data.and.xs, t->data.and.xs, m * sizeof(mpc_parser_t*));
-      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = free; }
-      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
-      continue;
-    }
-    
-    /* Merge re rhs `and` */
-    if (p->type == MPC_TYPE_AND
-    &&  p->data.and.f == mpcf_strfold
-    &&  p->data.and.xs[p->data.and.n-1]->type == MPC_TYPE_AND
-    && !p->data.and.xs[p->data.and.n-1]->retained
-    &&  p->data.and.xs[p->data.and.n-1]->data.and.f == mpcf_strfold) {
-      t = p->data.and.xs[p->data.and.n-1];
-      n = p->data.and.n; m = t->data.and.n;
-      p->data.and.n = n + m - 1;
-      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
-      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
-      memmove(p->data.and.xs + n - 1, t->data.and.xs, m * sizeof(mpc_parser_t*));
-      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = free; }
-      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
-      continue;
-    }
-    
-    return;
-    
-  }
-  
-}
-
-void mpc_optimise(mpc_parser_t *p) {
-  mpc_optimise_unretained(p, 1);
-}
-
+#include "mpc.h"
+
+/*
+** State Type
+*/
+
+static mpc_state_t mpc_state_invalid(void) {
+  mpc_state_t s;
+  s.pos = -1;
+  s.row = -1;
+  s.col = -1;
+  return s;
+}
+
+static mpc_state_t mpc_state_new(void) {
+  mpc_state_t s;
+  s.pos = 0;
+  s.row = 0;
+  s.col = 0;
+  return s;
+}
+
+/*
+** Input Type
+*/
+
+/*
+** In mpc the input type has three modes of 
+** operation: String, File and Pipe.
+**
+** String is easy. The whole contents are 
+** loaded into a buffer and scanned through.
+** The cursor can jump around at will making 
+** backtracking easy.
+**
+** The second is a File which is also somewhat
+** easy. The contents are never loaded into 
+** memory but backtracking can still be achieved
+** by seeking in the file at different positions.
+**
+** The final mode is Pipe. This is the difficult
+** one. As we assume pipes cannot be seeked - and 
+** only support a single character lookahead at 
+** any point, when the input is marked for a 
+** potential backtracking we start buffering any 
+** input.
+**
+** This means that if we are requested to seek
+** back we can simply start reading from the
+** buffer instead of the input.
+**
+** Of course using `mpc_predictive` will disable
+** backtracking and make LL(1) grammars easy
+** to parse for all input methods.
+**
+*/
+
+enum {
+  MPC_INPUT_STRING = 0,
+  MPC_INPUT_FILE   = 1,
+  MPC_INPUT_PIPE   = 2
+};
+
+enum {
+  MPC_INPUT_MARKS_MIN = 32
+};
+
+enum {
+  MPC_INPUT_MEM_NUM = 512
+};
+
+typedef struct {
+  char mem[64];
+} mpc_mem_t;
+
+typedef struct {
+
+  int type;
+  char *filename;  
+  mpc_state_t state;
+  
+  char *string;
+  char *buffer;
+  FILE *file;
+  
+  int suppress;
+  int backtrack;
+  int marks_slots;
+  int marks_num;
+  mpc_state_t *marks;
+  
+  char *lasts;
+  char last;
+  
+  size_t mem_index;
+  char mem_full[MPC_INPUT_MEM_NUM];
+  mpc_mem_t mem[MPC_INPUT_MEM_NUM];
+  
+} mpc_input_t;
+
+static mpc_input_t *mpc_input_new_string(const char *filename, const char *string) {
+
+  mpc_input_t *i = malloc(sizeof(mpc_input_t));
+  
+  i->filename = malloc(strlen(filename) + 1);
+  strcpy(i->filename, filename);
+  i->type = MPC_INPUT_STRING;
+  
+  i->state = mpc_state_new();
+  
+  i->string = malloc(strlen(string) + 1);
+  strcpy(i->string, string);
+  i->buffer = NULL;
+  i->file = NULL;
+  
+  i->suppress = 0;
+  i->backtrack = 1;
+  i->marks_num = 0;
+  i->marks_slots = MPC_INPUT_MARKS_MIN;
+  i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
+  i->lasts = malloc(sizeof(char) * i->marks_slots);
+  i->last = '\0';
+  
+  i->mem_index = 0;
+  memset(i->mem_full, 0, sizeof(char) * MPC_INPUT_MEM_NUM);
+  
+  return i;
+}
+
+static mpc_input_t *mpc_input_new_pipe(const char *filename, FILE *pipe) {
+
+  mpc_input_t *i = malloc(sizeof(mpc_input_t));
+  
+  i->filename = malloc(strlen(filename) + 1);
+  strcpy(i->filename, filename);
+  
+  i->type = MPC_INPUT_PIPE;
+  i->state = mpc_state_new();
+  
+  i->string = NULL;
+  i->buffer = NULL;
+  i->file = pipe;
+  
+  i->suppress = 0;
+  i->backtrack = 1;
+  i->marks_num = 0;
+  i->marks_slots = MPC_INPUT_MARKS_MIN;
+  i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
+  i->lasts = malloc(sizeof(char) * i->marks_slots);
+  i->last = '\0';
+  
+  i->mem_index = 0;
+  memset(i->mem_full, 0, sizeof(char) * MPC_INPUT_MEM_NUM);
+  
+  return i;
+  
+}
+
+static mpc_input_t *mpc_input_new_file(const char *filename, FILE *file) {
+  
+  mpc_input_t *i = malloc(sizeof(mpc_input_t));
+  
+  i->filename = malloc(strlen(filename) + 1);
+  strcpy(i->filename, filename);
+  i->type = MPC_INPUT_FILE;
+  i->state = mpc_state_new();
+  
+  i->string = NULL;
+  i->buffer = NULL;
+  i->file = file;
+  
+  i->suppress = 0;
+  i->backtrack = 1;
+  i->marks_num = 0;
+  i->marks_slots = MPC_INPUT_MARKS_MIN;
+  i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
+  i->lasts = malloc(sizeof(char) * i->marks_slots);
+  i->last = '\0';
+  
+  i->mem_index = 0;
+  memset(i->mem_full, 0, sizeof(char) * MPC_INPUT_MEM_NUM);
+  
+  return i;
+}
+
+static void mpc_input_delete(mpc_input_t *i) {
+  
+  free(i->filename);
+  
+  if (i->type == MPC_INPUT_STRING) { free(i->string); }
+  if (i->type == MPC_INPUT_PIPE) { free(i->buffer); }
+  
+  free(i->marks);
+  free(i->lasts);
+  free(i);
+}
+
+static int mpc_mem_ptr(mpc_input_t *i, void *p) {
+  return
+    (char*)p >= (char*)(i->mem) &&
+    (char*)p <  (char*)(i->mem) + (MPC_INPUT_MEM_NUM * sizeof(mpc_mem_t));
+}
+
+static void *mpc_malloc(mpc_input_t *i, size_t n) {
+  size_t j;
+  char *p;
+  
+  if (n > sizeof(mpc_mem_t)) { return malloc(n); }
+  
+  j = i->mem_index;
+  do {
+    if (!i->mem_full[i->mem_index]) {
+      p = (void*)(i->mem + i->mem_index);
+      i->mem_full[i->mem_index] = 1;
+      i->mem_index = (i->mem_index+1) % MPC_INPUT_MEM_NUM;
+      return p;
+    }
+    i->mem_index = (i->mem_index+1) % MPC_INPUT_MEM_NUM;
+  } while (j != i->mem_index);
+  
+  return malloc(n);
+}
+
+static void *mpc_calloc(mpc_input_t *i, size_t n, size_t m) {
+  char *x = mpc_malloc(i, n * m);
+  memset(x, 0, n * m);
+  return x;
+}
+
+static void mpc_free(mpc_input_t *i, void *p) {
+  size_t j;
+  if (!mpc_mem_ptr(i, p)) { free(p); return; }
+  j = ((size_t)(((char*)p) - ((char*)i->mem))) / sizeof(mpc_mem_t);
+  i->mem_full[j] = 0;
+}
+
+static void *mpc_realloc(mpc_input_t *i, void *p, size_t n) {
+  
+  char *q = NULL;
+  
+  if (!mpc_mem_ptr(i, p)) { return realloc(p, n); }
+  
+  if (n > sizeof(mpc_mem_t)) {
+    q = malloc(n);
+    memcpy(q, p, sizeof(mpc_mem_t));
+    mpc_free(i, p);
+    return q;
+  }
+  
+  return p;
+}
+
+static void *mpc_export(mpc_input_t *i, void *p) {
+  char *q = NULL;
+  if (!mpc_mem_ptr(i, p)) { return p; }
+  q = malloc(sizeof(mpc_mem_t));
+  memcpy(q, p, sizeof(mpc_mem_t));
+  mpc_free(i, p);
+  return q; 
+}
+
+static void mpc_input_backtrack_disable(mpc_input_t *i) { i->backtrack--; }
+static void mpc_input_backtrack_enable(mpc_input_t *i) { i->backtrack++; }
+
+static void mpc_input_suppress_disable(mpc_input_t *i) { i->suppress--; }
+static void mpc_input_suppress_enable(mpc_input_t *i) { i->suppress++; }
+
+static void mpc_input_mark(mpc_input_t *i) {
+  
+  if (i->backtrack < 1) { return; }
+  
+  i->marks_num++;
+  
+  if (i->marks_num > i->marks_slots) {
+    i->marks_slots = i->marks_num + i->marks_num / 2;
+    i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_slots);
+    i->lasts = realloc(i->lasts, sizeof(char) * i->marks_slots);
+  }
+
+  i->marks[i->marks_num-1] = i->state;
+  i->lasts[i->marks_num-1] = i->last;
+  
+  if (i->type == MPC_INPUT_PIPE && i->marks_num == 1) {
+    i->buffer = calloc(1, 1);
+  }
+  
+}
+
+static void mpc_input_unmark(mpc_input_t *i) {
+  
+  if (i->backtrack < 1) { return; }
+  
+  i->marks_num--;
+  
+  if (i->marks_slots > i->marks_num + i->marks_num / 2
+  &&  i->marks_slots > MPC_INPUT_MARKS_MIN) {
+    i->marks_slots = 
+      i->marks_num > MPC_INPUT_MARKS_MIN ?
+      i->marks_num : MPC_INPUT_MARKS_MIN;
+    i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_slots);
+    i->lasts = realloc(i->lasts, sizeof(char) * i->marks_slots);      
+  }
+  
+  if (i->type == MPC_INPUT_PIPE && i->marks_num == 0) {
+    free(i->buffer);
+    i->buffer = NULL;
+  }
+  
+}
+
+static void mpc_input_rewind(mpc_input_t *i) {
+  
+  if (i->backtrack < 1) { return; }
+  
+  i->state = i->marks[i->marks_num-1];
+  i->last  = i->lasts[i->marks_num-1];
+  
+  if (i->type == MPC_INPUT_FILE) {
+    fseek(i->file, i->state.pos, SEEK_SET);
+  }
+  
+  mpc_input_unmark(i);
+}
+
+static int mpc_input_buffer_in_range(mpc_input_t *i) {
+  return i->state.pos < (long)(strlen(i->buffer) + i->marks[0].pos);
+}
+
+static char mpc_input_buffer_get(mpc_input_t *i) {
+  return i->buffer[i->state.pos - i->marks[0].pos];
+}
+
+static int mpc_input_terminated(mpc_input_t *i) {
+  if (i->type == MPC_INPUT_STRING && i->state.pos == (long)strlen(i->string)) { return 1; }
+  if (i->type == MPC_INPUT_FILE && feof(i->file)) { return 1; }
+  if (i->type == MPC_INPUT_PIPE && feof(i->file)) { return 1; }
+  return 0;
+}
+
+static char mpc_input_getc(mpc_input_t *i) {
+  
+  char c = '\0';
+  
+  switch (i->type) {
+    
+    case MPC_INPUT_STRING: return i->string[i->state.pos];
+    case MPC_INPUT_FILE: c = fgetc(i->file); return c;
+    case MPC_INPUT_PIPE:
+    
+      if (!i->buffer) { c = getc(i->file); return c; }
+      
+      if (i->buffer && mpc_input_buffer_in_range(i)) {
+        c = mpc_input_buffer_get(i);
+        return c;
+      } else {
+        c = getc(i->file);
+        return c;
+      }
+    
+    default: return c;
+  }
+}
+
+static char mpc_input_peekc(mpc_input_t *i) {
+  
+  char c = '\0';
+  
+  switch (i->type) {
+    case MPC_INPUT_STRING: return i->string[i->state.pos];
+    case MPC_INPUT_FILE: 
+      
+      c = fgetc(i->file);
+      if (feof(i->file)) { return '\0'; }
+      
+      fseek(i->file, -1, SEEK_CUR);
+      return c;
+    
+    case MPC_INPUT_PIPE:
+      
+      if (!i->buffer) {
+        c = getc(i->file);
+        if (feof(i->file)) { return '\0'; }
+        ungetc(c, i->file);
+        return c;
+      }
+      
+      if (i->buffer && mpc_input_buffer_in_range(i)) {
+        return mpc_input_buffer_get(i);
+      } else {
+        c = getc(i->file);
+        if (feof(i->file)) { return '\0'; }
+        ungetc(c, i->file);
+        return c;
+      }
+    
+    default: return c;
+  }
+  
+}
+
+static int mpc_input_failure(mpc_input_t *i, char c) {
+
+  switch (i->type) {
+    case MPC_INPUT_STRING: { break; }
+    case MPC_INPUT_FILE: fseek(i->file, -1, SEEK_CUR); { break; }
+    case MPC_INPUT_PIPE: {
+      
+      if (!i->buffer) { ungetc(c, i->file); break; }
+      
+      if (i->buffer && mpc_input_buffer_in_range(i)) {
+        break;
+      } else {
+        ungetc(c, i->file); 
+      }
+    }
+    default: { break; }
+  }
+  return 0;
+}
+
+static int mpc_input_success(mpc_input_t *i, char c, char **o) {
+  
+  if (i->type == MPC_INPUT_PIPE
+  &&  i->buffer && !mpc_input_buffer_in_range(i)) {
+    i->buffer = realloc(i->buffer, strlen(i->buffer) + 2);
+    i->buffer[strlen(i->buffer) + 1] = '\0';
+    i->buffer[strlen(i->buffer) + 0] = c;
+  }
+  
+  i->last = c;
+  i->state.pos++;
+  i->state.col++;
+  
+  if (c == '\n') {
+    i->state.col = 0;
+    i->state.row++;
+  }
+  
+  if (o) {
+    (*o) = mpc_malloc(i, 2);
+    (*o)[0] = c;
+    (*o)[1] = '\0';
+  }
+  
+  return 1;
+}
+
+static int mpc_input_any(mpc_input_t *i, char **o) {
+  char x = mpc_input_getc(i);
+  if (mpc_input_terminated(i)) { return 0; }
+  return mpc_input_success(i, x, o);
+}
+
+static int mpc_input_char(mpc_input_t *i, char c, char **o) {
+  char x = mpc_input_getc(i);
+  if (mpc_input_terminated(i)) { return 0; }
+  return x == c ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);
+}
+
+static int mpc_input_range(mpc_input_t *i, char c, char d, char **o) {
+  char x = mpc_input_getc(i);
+  if (mpc_input_terminated(i)) { return 0; }
+  return x >= c && x <= d ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
+}
+
+static int mpc_input_oneof(mpc_input_t *i, const char *c, char **o) {
+  char x = mpc_input_getc(i);
+  if (mpc_input_terminated(i)) { return 0; }
+  return strchr(c, x) != 0 ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
+}
+
+static int mpc_input_noneof(mpc_input_t *i, const char *c, char **o) {
+  char x = mpc_input_getc(i);
+  if (mpc_input_terminated(i)) { return 0; }
+  return strchr(c, x) == 0 ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
+}
+
+static int mpc_input_satisfy(mpc_input_t *i, int(*cond)(char), char **o) {
+  char x = mpc_input_getc(i);
+  if (mpc_input_terminated(i)) { return 0; }
+  return cond(x) ? mpc_input_success(i, x, o) : mpc_input_failure(i, x);  
+}
+
+static int mpc_input_string(mpc_input_t *i, const char *c, char **o) {
+  
+  const char *x = c;
+
+  mpc_input_mark(i);
+  while (*x) {
+    if (!mpc_input_char(i, *x, NULL)) {
+      mpc_input_rewind(i);
+      return 0;
+    }
+    x++;
+  }
+  mpc_input_unmark(i);
+  
+  *o = mpc_malloc(i, strlen(c) + 1);
+  strcpy(*o, c);
+  return 1;
+}
+
+static int mpc_input_anchor(mpc_input_t* i, int(*f)(char,char), char **o) {
+  *o = NULL;
+  return f(i->last, mpc_input_peekc(i));
+}
+
+static mpc_state_t *mpc_input_state_copy(mpc_input_t *i) {
+  mpc_state_t *r = mpc_malloc(i, sizeof(mpc_state_t));
+  memcpy(r, &i->state, sizeof(mpc_state_t));
+  return r;
+}
+
+/*
+** Error Type
+*/
+
+void mpc_err_delete(mpc_err_t *x) {
+  int i;
+  for (i = 0; i < x->expected_num; i++) { free(x->expected[i]); }
+  free(x->expected);
+  free(x->filename);
+  free(x->failure);
+  free(x);
+}
+
+void mpc_err_print(mpc_err_t *x) {
+  mpc_err_print_to(x, stdout);
+}
+
+void mpc_err_print_to(mpc_err_t *x, FILE *f) {
+  char *str = mpc_err_string(x);
+  fprintf(f, "%s", str);
+  free(str);
+}
+
+static void mpc_err_string_cat(char *buffer, int *pos, int *max, char const *fmt, ...) {
+  /* TODO: Error Checking on Length */
+  int left = ((*max) - (*pos));
+  va_list va;
+  va_start(va, fmt);
+  if (left < 0) { left = 0;}
+  (*pos) += vsprintf(buffer + (*pos), fmt, va);
+  va_end(va);
+}
+
+static char char_unescape_buffer[4];
+
+static const char *mpc_err_char_unescape(char c) {
+  
+  char_unescape_buffer[0] = '\'';
+  char_unescape_buffer[1] = ' ';
+  char_unescape_buffer[2] = '\'';
+  char_unescape_buffer[3] = '\0';
+  
+  switch (c) {
+    case '\a': return "bell";
+    case '\b': return "backspace";
+    case '\f': return "formfeed";
+    case '\r': return "carriage return";
+    case '\v': return "vertical tab";
+    case '\0': return "end of input";
+    case '\n': return "newline";
+    case '\t': return "tab";
+    case ' ' : return "space";
+    default:
+      char_unescape_buffer[1] = c;
+      return char_unescape_buffer;
+  }
+  
+}
+
+char *mpc_err_string(mpc_err_t *x) {
+
+  int i;  
+  int pos = 0; 
+  int max = 1023;
+  char *buffer = calloc(1, 1024);
+  
+  if (x->failure) {
+    mpc_err_string_cat(buffer, &pos, &max,
+    "%s: error: %s\n", x->filename, x->failure);
+    return buffer;
+  }
+  
+  mpc_err_string_cat(buffer, &pos, &max, 
+    "%s:%i:%i: error: expected ", x->filename, x->state.row+1, x->state.col+1);
+  
+  if (x->expected_num == 0) { mpc_err_string_cat(buffer, &pos, &max, "ERROR: NOTHING EXPECTED"); }
+  if (x->expected_num == 1) { mpc_err_string_cat(buffer, &pos, &max, "%s", x->expected[0]); }
+  if (x->expected_num >= 2) {
+  
+    for (i = 0; i < x->expected_num-2; i++) {
+      mpc_err_string_cat(buffer, &pos, &max, "%s, ", x->expected[i]);
+    } 
+    
+    mpc_err_string_cat(buffer, &pos, &max, "%s or %s", 
+      x->expected[x->expected_num-2], 
+      x->expected[x->expected_num-1]);
+  }
+  
+  mpc_err_string_cat(buffer, &pos, &max, " at ");
+  mpc_err_string_cat(buffer, &pos, &max, mpc_err_char_unescape(x->recieved));
+  mpc_err_string_cat(buffer, &pos, &max, "\n");
+  
+  return realloc(buffer, strlen(buffer) + 1);
+}
+
+static mpc_err_t *mpc_err_new(mpc_input_t *i, const char *expected) {
+  mpc_err_t *x;
+  if (i->suppress) { return NULL; }
+  x = mpc_malloc(i, sizeof(mpc_err_t));
+  x->filename = mpc_malloc(i, strlen(i->filename) + 1);
+  strcpy(x->filename, i->filename);
+  x->state = i->state;
+  x->expected_num = 1;
+  x->expected = mpc_malloc(i, sizeof(char*));
+  x->expected[0] = mpc_malloc(i, strlen(expected) + 1);
+  strcpy(x->expected[0], expected);
+  x->failure = NULL;
+  x->recieved = mpc_input_peekc(i);
+  return x;
+}
+
+static mpc_err_t *mpc_err_fail(mpc_input_t *i, const char *failure) {
+  mpc_err_t *x;
+  if (i->suppress) { return NULL; }
+  x = mpc_malloc(i, sizeof(mpc_err_t));
+  x->filename = mpc_malloc(i, strlen(i->filename) + 1);
+  strcpy(x->filename, i->filename);
+  x->state = i->state;
+  x->expected_num = 0;
+  x->expected = NULL;
+  x->failure = mpc_malloc(i, strlen(failure) + 1);
+  strcpy(x->failure, failure);
+  x->recieved = ' ';
+  return x;
+}
+
+static mpc_err_t *mpc_err_file(const char *filename, const char *failure) {
+  mpc_err_t *x;
+  x = malloc(sizeof(mpc_err_t));
+  x->filename = malloc(strlen(filename) + 1);
+  strcpy(x->filename, filename);
+  x->state = mpc_state_new();
+  x->expected_num = 0;
+  x->expected = NULL;
+  x->failure = malloc(strlen(failure) + 1);
+  strcpy(x->failure, failure);
+  x->recieved = ' ';
+  return x;
+}
+
+static void mpc_err_delete_internal(mpc_input_t *i, mpc_err_t *x) {
+  int j;
+  if (!x) { return; }
+  for (j = 0; j < x->expected_num; j++) { mpc_free(i, x->expected[j]); }
+  mpc_free(i, x->expected);
+  mpc_free(i, x->filename);
+  mpc_free(i, x->failure);
+  mpc_free(i, x);
+}
+
+static mpc_err_t *mpc_err_export(mpc_input_t *i, mpc_err_t *x) {
+  int j;
+  for (j = 0; j < x->expected_num; j++) {
+    x->expected[j] = mpc_export(i, x->expected[j]);
+  }
+  x->expected = mpc_export(i, x->expected);
+  x->filename = mpc_export(i, x->filename);
+  x->failure = mpc_export(i, x->failure);
+  return mpc_export(i, x);
+}
+
+static int mpc_err_contains_expected(mpc_input_t *i, mpc_err_t *x, char *expected) {
+  int j;
+  (void)i;
+  for (j = 0; j < x->expected_num; j++) {
+    if (strcmp(x->expected[j], expected) == 0) { return 1; }
+  }
+  return 0;
+}
+
+static void mpc_err_add_expected(mpc_input_t *i, mpc_err_t *x, char *expected) {
+  (void)i;
+  x->expected_num++;
+  x->expected = mpc_realloc(i, x->expected, sizeof(char*) * x->expected_num);
+  x->expected[x->expected_num-1] = mpc_malloc(i, strlen(expected) + 1);
+  strcpy(x->expected[x->expected_num-1], expected);
+}
+
+static mpc_err_t *mpc_err_or(mpc_input_t *i, mpc_err_t** x, int n) {
+  
+  int j, k, fst;
+  mpc_err_t *e;
+  
+  fst = -1;
+  for (j = 0; j < n; j++) {
+    if (x[j] != NULL) { fst = j; }
+  }
+  
+  if (fst == -1) { return NULL; }
+  
+  e = mpc_malloc(i, sizeof(mpc_err_t));
+  e->state = mpc_state_invalid();
+  e->expected_num = 0;
+  e->expected = NULL;
+  e->failure = NULL;
+  e->filename = mpc_malloc(i, strlen(x[fst]->filename)+1);
+  strcpy(e->filename, x[fst]->filename);
+  
+  for (j = 0; j < n; j++) {
+    if (!x[j]) { continue; }
+    if (x[j]->state.pos > e->state.pos) { e->state = x[j]->state; }
+  }
+  
+  for (j = 0; j < n; j++) {
+    if (!x[j]) { continue; }
+    if (x[j]->state.pos < e->state.pos) { continue; }
+    
+    if (x[j]->failure) {
+      e->failure = mpc_malloc(i, strlen(x[j]->failure)+1);
+      strcpy(e->failure, x[j]->failure);
+      break;
+    }
+    
+    e->recieved = x[j]->recieved;
+    
+    for (k = 0; k < x[j]->expected_num; k++) {
+      if (!mpc_err_contains_expected(i, e, x[j]->expected[k])) {
+        mpc_err_add_expected(i, e, x[j]->expected[k]);
+      }
+    }
+  }
+  
+  for (j = 0; j < n; j++) {
+    if (!x[j]) { continue; }
+    mpc_err_delete_internal(i, x[j]);
+  }
+  
+  return e;
+}
+
+static mpc_err_t *mpc_err_repeat(mpc_input_t *i, mpc_err_t *x, const char *prefix) {
+
+  int j = 0;
+  size_t l = 0;
+  char *expect = NULL;
+  
+  if (!x) { return NULL; }
+  
+  if (x->expected_num == 0) {
+    expect = mpc_calloc(i, 1, 1);
+    x->expected_num = 1;
+    x->expected = mpc_realloc(i, x->expected, sizeof(char*) * x->expected_num);
+    x->expected[0] = expect;
+    return x;
+  }
+  
+  else if (x->expected_num == 1) {
+    expect = mpc_malloc(i, strlen(prefix) + strlen(x->expected[0]) + 1);
+    strcpy(expect, prefix);
+    strcat(expect, x->expected[0]);
+    mpc_free(i, x->expected[0]);
+    x->expected[0] = expect;
+    return x;
+  }
+  
+  else if (x->expected_num > 1) {
+    
+    l += strlen(prefix);
+    for (j = 0; j < x->expected_num-2; j++) {
+      l += strlen(x->expected[j]) + strlen(", ");
+    }
+    l += strlen(x->expected[x->expected_num-2]);
+    l += strlen(" or ");
+    l += strlen(x->expected[x->expected_num-1]);
+    
+    expect = mpc_malloc(i, l + 1);
+    
+    strcpy(expect, prefix);
+    for (j = 0; j < x->expected_num-2; j++) {
+      strcat(expect, x->expected[j]); strcat(expect, ", ");
+    }
+    strcat(expect, x->expected[x->expected_num-2]);
+    strcat(expect, " or ");
+    strcat(expect, x->expected[x->expected_num-1]);
+
+    for (j = 0; j < x->expected_num; j++) { mpc_free(i, x->expected[j]); }
+    
+    x->expected_num = 1;
+    x->expected = mpc_realloc(i, x->expected, sizeof(char*) * x->expected_num);
+    x->expected[0] = expect;
+    return x;
+  }
+  
+  return NULL;
+}
+
+static mpc_err_t *mpc_err_many1(mpc_input_t *i, mpc_err_t *x) {
+  return mpc_err_repeat(i, x, "one or more of ");
+}
+
+static mpc_err_t *mpc_err_count(mpc_input_t *i, mpc_err_t *x, int n) {
+  mpc_err_t *y;
+  int digits = n/10 + 1;
+  char *prefix;
+  prefix = mpc_malloc(i, digits + strlen(" of ") + 1);
+  sprintf(prefix, "%i of ", n);
+  y = mpc_err_repeat(i, x, prefix);
+  mpc_free(i, prefix);
+  return y;
+}
+
+static mpc_err_t *mpc_err_merge(mpc_input_t *i, mpc_err_t *x, mpc_err_t *y) {
+  mpc_err_t *errs[2];
+  errs[0] = x;
+  errs[1] = y;
+  return mpc_err_or(i, errs, 2);
+}
+
+/*
+** Parser Type
+*/
+
+enum {
+  MPC_TYPE_UNDEFINED = 0,
+  MPC_TYPE_PASS      = 1,
+  MPC_TYPE_FAIL      = 2,
+  MPC_TYPE_LIFT      = 3,
+  MPC_TYPE_LIFT_VAL  = 4,
+  MPC_TYPE_EXPECT    = 5,
+  MPC_TYPE_ANCHOR    = 6,
+  MPC_TYPE_STATE     = 7,
+  
+  MPC_TYPE_ANY       = 8,
+  MPC_TYPE_SINGLE    = 9,
+  MPC_TYPE_ONEOF     = 10,
+  MPC_TYPE_NONEOF    = 11,
+  MPC_TYPE_RANGE     = 12,
+  MPC_TYPE_SATISFY   = 13,
+  MPC_TYPE_STRING    = 14,
+  
+  MPC_TYPE_APPLY     = 15,
+  MPC_TYPE_APPLY_TO  = 16,
+  MPC_TYPE_PREDICT   = 17,
+  MPC_TYPE_NOT       = 18,
+  MPC_TYPE_MAYBE     = 19,
+  MPC_TYPE_MANY      = 20,
+  MPC_TYPE_MANY1     = 21,
+  MPC_TYPE_COUNT     = 22,
+  
+  MPC_TYPE_OR        = 23,
+  MPC_TYPE_AND       = 24
+};
+
+typedef struct { char *m; } mpc_pdata_fail_t;
+typedef struct { mpc_ctor_t lf; void *x; } mpc_pdata_lift_t;
+typedef struct { mpc_parser_t *x; char *m; } mpc_pdata_expect_t;
+typedef struct { int(*f)(char,char); } mpc_pdata_anchor_t;
+typedef struct { char x; } mpc_pdata_single_t;
+typedef struct { char x; char y; } mpc_pdata_range_t;
+typedef struct { int(*f)(char); } mpc_pdata_satisfy_t;
+typedef struct { char *x; } mpc_pdata_string_t;
+typedef struct { mpc_parser_t *x; mpc_apply_t f; } mpc_pdata_apply_t;
+typedef struct { mpc_parser_t *x; mpc_apply_to_t f; void *d; } mpc_pdata_apply_to_t;
+typedef struct { mpc_parser_t *x; } mpc_pdata_predict_t;
+typedef struct { mpc_parser_t *x; mpc_dtor_t dx; mpc_ctor_t lf; } mpc_pdata_not_t;
+typedef struct { int n; mpc_fold_t f; mpc_parser_t *x; mpc_dtor_t dx; } mpc_pdata_repeat_t;
+typedef struct { int n; mpc_parser_t **xs; } mpc_pdata_or_t;
+typedef struct { int n; mpc_fold_t f; mpc_parser_t **xs; mpc_dtor_t *dxs;  } mpc_pdata_and_t;
+
+typedef union {
+  mpc_pdata_fail_t fail;
+  mpc_pdata_lift_t lift;
+  mpc_pdata_expect_t expect;
+  mpc_pdata_anchor_t anchor;
+  mpc_pdata_single_t single;
+  mpc_pdata_range_t range;
+  mpc_pdata_satisfy_t satisfy;
+  mpc_pdata_string_t string;
+  mpc_pdata_apply_t apply;
+  mpc_pdata_apply_to_t apply_to;
+  mpc_pdata_predict_t predict;
+  mpc_pdata_not_t not;
+  mpc_pdata_repeat_t repeat;
+  mpc_pdata_and_t and;
+  mpc_pdata_or_t or;
+} mpc_pdata_t;
+
+struct mpc_parser_t {
+  char retained;
+  char *name;
+  char type;
+  mpc_pdata_t data;
+};
+
+static mpc_val_t *mpcf_input_nth_free(mpc_input_t *i, int n, mpc_val_t **xs, int x) {
+  int j;
+  for (j = 0; j < n; j++) { if (j != x) { mpc_free(i, xs[j]); } }
+  return xs[x];
+}
+ 
+static mpc_val_t *mpcf_input_fst_free(mpc_input_t *i, int n, mpc_val_t **xs) { return mpcf_input_nth_free(i, n, xs, 0); }
+static mpc_val_t *mpcf_input_snd_free(mpc_input_t *i, int n, mpc_val_t **xs) { return mpcf_input_nth_free(i, n, xs, 1); }
+static mpc_val_t *mpcf_input_trd_free(mpc_input_t *i, int n, mpc_val_t **xs) { return mpcf_input_nth_free(i, n, xs, 2); }
+
+static mpc_val_t *mpcf_input_strfold(mpc_input_t *i, int n, mpc_val_t **xs) {
+  int j;
+  size_t l = 0;
+  if (n == 0) { return mpc_calloc(i, 1, 1); }
+  for (j = 0; j < n; j++) { l += strlen(xs[j]); }
+  xs[0] = mpc_realloc(i, xs[0], l + 1);
+  for (j = 1; j < n; j++) { strcat(xs[0], xs[j]); mpc_free(i, xs[j]); }
+  return xs[0];
+}
+
+static mpc_val_t *mpcf_input_state_ast(mpc_input_t *i, int n, mpc_val_t **xs) {
+  mpc_state_t *s = ((mpc_state_t**)xs)[0];
+  mpc_ast_t *a = ((mpc_ast_t**)xs)[1];
+  a = mpc_ast_state(a, *s);
+  mpc_free(i, s);
+  (void) n;
+  return a;
+}
+
+static mpc_val_t *mpc_parse_fold(mpc_input_t *i, mpc_fold_t f, int n, mpc_val_t **xs) {
+  int j;
+  if (f == mpcf_null)      { return mpcf_null(n, xs); }
+  if (f == mpcf_fst)       { return mpcf_fst(n, xs); }
+  if (f == mpcf_snd)       { return mpcf_snd(n, xs); }
+  if (f == mpcf_trd)       { return mpcf_trd(n, xs); }
+  if (f == mpcf_fst_free)  { return mpcf_input_fst_free(i, n, xs); }
+  if (f == mpcf_snd_free)  { return mpcf_input_snd_free(i, n, xs); }
+  if (f == mpcf_trd_free)  { return mpcf_input_trd_free(i, n, xs); }
+  if (f == mpcf_strfold)   { return mpcf_input_strfold(i, n, xs); }
+  if (f == mpcf_state_ast) { return mpcf_input_state_ast(i, n, xs); }
+  for (j = 0; j < n; j++) { xs[j] = mpc_export(i, xs[j]); }
+  return f(j, xs);
+}
+
+static mpc_val_t *mpcf_input_free(mpc_input_t *i, mpc_val_t *x) {
+  mpc_free(i, x);
+  return NULL;
+}
+
+static mpc_val_t *mpcf_input_str_ast(mpc_input_t *i, mpc_val_t *c) {
+  mpc_ast_t *a = mpc_ast_new("", c);
+  mpc_free(i, c);
+  return a;
+}
+
+static mpc_val_t *mpc_parse_apply(mpc_input_t *i, mpc_apply_t f, mpc_val_t *x) {
+  if (f == mpcf_free)     { return mpcf_input_free(i, x); }
+  if (f == mpcf_str_ast)  { return mpcf_input_str_ast(i, x); }
+  return f(mpc_export(i, x));
+}
+
+static mpc_val_t *mpc_parse_apply_to(mpc_input_t *i, mpc_apply_to_t f, mpc_val_t *x, mpc_val_t *d) {
+  return f(mpc_export(i, x), d);
+}
+
+static void mpc_parse_dtor(mpc_input_t *i, mpc_dtor_t d, mpc_val_t *x) {
+  if (d == free) { mpc_free(i, x); return; }
+  d(mpc_export(i, x));
+}
+
+enum {
+  MPC_PARSE_STACK_MIN = 4
+};
+
+#define MPC_SUCCESS(x) r->output = x; return 1
+#define MPC_FAILURE(x) r->error = x; return 0
+#define MPC_PRIMITIVE(x) \
+  if (x) { MPC_SUCCESS(r->output); } \
+  else { MPC_FAILURE(NULL); }
+
+static int mpc_parse_run(mpc_input_t *i, mpc_parser_t *p, mpc_result_t *r, mpc_err_t **e) {
+  
+  int j = 0, k = 0;
+  mpc_result_t results_stk[MPC_PARSE_STACK_MIN];
+  mpc_result_t *results;
+  int results_slots = MPC_PARSE_STACK_MIN;
+  
+  switch (p->type) {
+      
+    /* Basic Parsers */
+
+    case MPC_TYPE_ANY:     MPC_PRIMITIVE(mpc_input_any(i, (char**)&r->output));
+    case MPC_TYPE_SINGLE:  MPC_PRIMITIVE(mpc_input_char(i, p->data.single.x, (char**)&r->output));
+    case MPC_TYPE_RANGE:   MPC_PRIMITIVE(mpc_input_range(i, p->data.range.x, p->data.range.y, (char**)&r->output));
+    case MPC_TYPE_ONEOF:   MPC_PRIMITIVE(mpc_input_oneof(i, p->data.string.x, (char**)&r->output));
+    case MPC_TYPE_NONEOF:  MPC_PRIMITIVE(mpc_input_noneof(i, p->data.string.x, (char**)&r->output));
+    case MPC_TYPE_SATISFY: MPC_PRIMITIVE(mpc_input_satisfy(i, p->data.satisfy.f, (char**)&r->output));
+    case MPC_TYPE_STRING:  MPC_PRIMITIVE(mpc_input_string(i, p->data.string.x, (char**)&r->output));
+    case MPC_TYPE_ANCHOR:  MPC_PRIMITIVE(mpc_input_anchor(i, p->data.anchor.f, (char**)&r->output));
+    
+    /* Other parsers */
+    
+    case MPC_TYPE_UNDEFINED: MPC_FAILURE(mpc_err_fail(i, "Parser Undefined!"));
+    case MPC_TYPE_PASS:      MPC_SUCCESS(NULL);
+    case MPC_TYPE_FAIL:      MPC_FAILURE(mpc_err_fail(i, p->data.fail.m));
+    case MPC_TYPE_LIFT:      MPC_SUCCESS(p->data.lift.lf());
+    case MPC_TYPE_LIFT_VAL:  MPC_SUCCESS(p->data.lift.x);
+    case MPC_TYPE_STATE:     MPC_SUCCESS(mpc_input_state_copy(i));
+    
+    /* Application Parsers */
+    
+    case MPC_TYPE_APPLY:
+      if (mpc_parse_run(i, p->data.apply.x, r, e)) {
+        MPC_SUCCESS(mpc_parse_apply(i, p->data.apply.f, r->output));
+      } else {
+        MPC_FAILURE(r->output);
+      }
+    
+    case MPC_TYPE_APPLY_TO:
+      if (mpc_parse_run(i, p->data.apply_to.x, r, e)) {
+        MPC_SUCCESS(mpc_parse_apply_to(i, p->data.apply_to.f, r->output, p->data.apply_to.d));
+      } else {
+        MPC_FAILURE(r->error);
+      }
+    
+    case MPC_TYPE_EXPECT:
+      mpc_input_suppress_enable(i);
+      if (mpc_parse_run(i, p->data.expect.x, r, e)) {
+        mpc_input_suppress_disable(i);
+        MPC_SUCCESS(r->output);
+      } else {
+        mpc_input_suppress_disable(i);
+        MPC_FAILURE(mpc_err_new(i, p->data.expect.m));
+      }
+    
+    case MPC_TYPE_PREDICT:
+      mpc_input_backtrack_disable(i);
+      if (mpc_parse_run(i, p->data.predict.x, r, e)) {      
+        mpc_input_backtrack_enable(i);
+        MPC_SUCCESS(r->output);
+      } else {
+        mpc_input_backtrack_enable(i);
+        MPC_FAILURE(r->error);
+      }
+    
+    /* Optional Parsers */
+    
+    /* TODO: Update Not Error Message */
+    
+    case MPC_TYPE_NOT:
+      mpc_input_mark(i);
+      mpc_input_suppress_enable(i);
+      if (mpc_parse_run(i, p->data.not.x, r, e)) {
+        mpc_input_rewind(i);
+        mpc_input_suppress_disable(i);
+        mpc_parse_dtor(i, p->data.not.dx, r->output);
+        MPC_FAILURE(mpc_err_new(i, "opposite"));
+      } else {
+        mpc_input_unmark(i);
+        mpc_input_suppress_disable(i);
+        MPC_SUCCESS(p->data.not.lf());
+      }
+    
+    case MPC_TYPE_MAYBE:
+      if (mpc_parse_run(i, p->data.not.x, r, e)) {
+        MPC_SUCCESS(r->output);
+      } else {
+        *e = mpc_err_merge(i, *e, r->error);
+        MPC_SUCCESS(p->data.not.lf());
+      }
+    
+    /* Repeat Parsers */
+    
+    case MPC_TYPE_MANY:
+      
+      results = results_stk;
+      
+      while (mpc_parse_run(i, p->data.repeat.x, &results[j], e)) {
+        j++;
+        if (j == MPC_PARSE_STACK_MIN) {
+          results_slots = j + j / 2;
+          results = mpc_malloc(i, sizeof(mpc_result_t) * results_slots);
+          memcpy(results, results_stk, sizeof(mpc_result_t) * MPC_PARSE_STACK_MIN);
+        } else if (j >= results_slots) {
+          results_slots = j + j / 2;
+          results = mpc_realloc(i, results, sizeof(mpc_result_t) * results_slots);
+        }
+      }
+      
+      *e = mpc_err_merge(i, *e, results[j].error);
+      MPC_SUCCESS(
+        mpc_parse_fold(i, p->data.repeat.f, j, (mpc_val_t**)results);
+        if (j >= MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+    
+    case MPC_TYPE_MANY1:
+      
+      results = results_stk;
+      
+      while (mpc_parse_run(i, p->data.repeat.x, &results[j], e)) {
+        j++;
+        if (j == MPC_PARSE_STACK_MIN) {
+          results_slots = j + j / 2;
+          results = mpc_malloc(i, sizeof(mpc_result_t) * results_slots);
+          memcpy(results, results_stk, sizeof(mpc_result_t) * MPC_PARSE_STACK_MIN);
+        } else if (j >= results_slots) {
+          results_slots = j + j / 2;
+          results = mpc_realloc(i, results, sizeof(mpc_result_t) * results_slots);
+        }
+      }
+      
+      if (j == 0) {
+        MPC_FAILURE(
+          mpc_err_many1(i, results[j].error);
+          if (j >= MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+      } else {
+        *e = mpc_err_merge(i, *e, results[j].error);
+        MPC_SUCCESS(
+          mpc_parse_fold(i, p->data.repeat.f, j, (mpc_val_t**)results);
+          if (j >= MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+      }
+    
+    case MPC_TYPE_COUNT:
+      
+      results = p->data.repeat.n > MPC_PARSE_STACK_MIN
+        ? mpc_malloc(i, sizeof(mpc_result_t) * p->data.repeat.n)
+        : results_stk;
+      
+      while (mpc_parse_run(i, p->data.repeat.x, &results[j], e)) {
+        j++;
+        if (j == p->data.repeat.n) { break; }
+      }
+      
+      if (j == p->data.repeat.n) {
+        MPC_SUCCESS(
+          mpc_parse_fold(i, p->data.repeat.f, j, (mpc_val_t**)results);
+          if (p->data.repeat.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+      } else {
+        for (k = 0; k < j; k++) {
+          mpc_parse_dtor(i, p->data.repeat.dx, results[k].output);
+        }
+        MPC_FAILURE(
+          mpc_err_count(i, results[j].error, p->data.repeat.n);
+          if (p->data.repeat.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });  
+      }
+      
+    /* Combinatory Parsers */
+    
+    case MPC_TYPE_OR:
+      
+      if (p->data.or.n == 0) { MPC_SUCCESS(NULL); }
+      
+      results = p->data.or.n > MPC_PARSE_STACK_MIN
+        ? mpc_malloc(i, sizeof(mpc_result_t) * p->data.or.n)
+        : results_stk;
+      
+      for (j = 0; j < p->data.or.n; j++) {
+        if (mpc_parse_run(i, p->data.or.xs[j], &results[j], e)) {
+          MPC_SUCCESS(results[j].output;
+            if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+        } else {
+          *e = mpc_err_merge(i, *e, results[j].error);
+        } 
+      }
+      
+      MPC_FAILURE(NULL;
+        if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+    
+    case MPC_TYPE_AND:
+      
+      if (p->data.and.n == 0) { MPC_SUCCESS(NULL); }
+      
+      results = p->data.or.n > MPC_PARSE_STACK_MIN
+        ? mpc_malloc(i, sizeof(mpc_result_t) * p->data.or.n)
+        : results_stk;
+      
+      mpc_input_mark(i);
+      for (j = 0; j < p->data.and.n; j++) {
+        if (!mpc_parse_run(i, p->data.and.xs[j], &results[j], e)) {
+          mpc_input_rewind(i);
+          for (k = 0; k < j; k++) {
+            mpc_parse_dtor(i, p->data.and.dxs[k], results[k].output);
+          }
+          MPC_FAILURE(results[j].error;
+            if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+        }
+      }
+      mpc_input_unmark(i); 
+      MPC_SUCCESS(
+        mpc_parse_fold(i, p->data.and.f, j, (mpc_val_t**)results);
+        if (p->data.or.n > MPC_PARSE_STACK_MIN) { mpc_free(i, results); });
+    
+    /* End */
+    
+    default:
+      
+      MPC_FAILURE(mpc_err_fail(i, "Unknown Parser Type Id!"));
+  }
+  
+  return 0;
+  
+}
+
+#undef MPC_SUCCESS
+#undef MPC_FAILURE
+#undef MPC_PRIMITIVE
+
+int mpc_parse_input(mpc_input_t *i, mpc_parser_t *p, mpc_result_t *r) {
+  int x;
+  mpc_err_t *e = mpc_err_fail(i, "Unknown Error");
+  e->state = mpc_state_invalid();
+  x = mpc_parse_run(i, p, r, &e);
+  if (x) {
+    mpc_err_delete_internal(i, e);
+    r->output = mpc_export(i, r->output);
+  } else {
+    r->error = mpc_err_export(i, mpc_err_merge(i, e, r->error));
+  }
+  return x;
+}
+
+int mpc_parse(const char *filename, const char *string, mpc_parser_t *p, mpc_result_t *r) {
+  int x;
+  mpc_input_t *i = mpc_input_new_string(filename, string);
+  x = mpc_parse_input(i, p, r);
+  mpc_input_delete(i);
+  return x;
+}
+
+int mpc_parse_file(const char *filename, FILE *file, mpc_parser_t *p, mpc_result_t *r) {
+  int x;
+  mpc_input_t *i = mpc_input_new_file(filename, file);
+  x = mpc_parse_input(i, p, r);
+  mpc_input_delete(i);
+  return x;
+}
+
+int mpc_parse_pipe(const char *filename, FILE *pipe, mpc_parser_t *p, mpc_result_t *r) {
+  int x;
+  mpc_input_t *i = mpc_input_new_pipe(filename, pipe);
+  x = mpc_parse_input(i, p, r);
+  mpc_input_delete(i);
+  return x;
+}
+
+int mpc_parse_contents(const char *filename, mpc_parser_t *p, mpc_result_t *r) {
+  
+  FILE *f = fopen(filename, "rb");
+  int res;
+  
+  if (!f) {
+    r->output = NULL;
+    r->error = mpc_err_file(filename, "Unable to open file!");
+    return 0;
+  }
+  
+  res = mpc_parse_file(filename, f, p, r);
+  fclose(f);
+  return res;
+}
+
+/*
+** Building a Parser
+*/
+
+static void mpc_undefine_unretained(mpc_parser_t *p, int force);
+
+static void mpc_undefine_or(mpc_parser_t *p) {
+  
+  int i;
+  for (i = 0; i < p->data.or.n; i++) {
+    mpc_undefine_unretained(p->data.or.xs[i], 0);
+  }
+  free(p->data.or.xs);
+  
+}
+
+static void mpc_undefine_and(mpc_parser_t *p) {
+  
+  int i;
+  for (i = 0; i < p->data.and.n; i++) {
+    mpc_undefine_unretained(p->data.and.xs[i], 0);
+  }
+  free(p->data.and.xs);
+  free(p->data.and.dxs);
+  
+}
+
+static void mpc_undefine_unretained(mpc_parser_t *p, int force) {
+  
+  if (p->retained && !force) { return; }
+  
+  switch (p->type) {
+    
+    case MPC_TYPE_FAIL: free(p->data.fail.m); break;
+    
+    case MPC_TYPE_ONEOF: 
+    case MPC_TYPE_NONEOF:
+    case MPC_TYPE_STRING:
+      free(p->data.string.x); 
+      break;
+    
+    case MPC_TYPE_APPLY:    mpc_undefine_unretained(p->data.apply.x, 0);    break;
+    case MPC_TYPE_APPLY_TO: mpc_undefine_unretained(p->data.apply_to.x, 0); break;
+    case MPC_TYPE_PREDICT:  mpc_undefine_unretained(p->data.predict.x, 0);  break;
+    
+    case MPC_TYPE_MAYBE:
+    case MPC_TYPE_NOT:
+      mpc_undefine_unretained(p->data.not.x, 0);
+      break;
+    
+    case MPC_TYPE_EXPECT:
+      mpc_undefine_unretained(p->data.expect.x, 0);
+      free(p->data.expect.m);
+      break;
+      
+    case MPC_TYPE_MANY:
+    case MPC_TYPE_MANY1:
+    case MPC_TYPE_COUNT:
+      mpc_undefine_unretained(p->data.repeat.x, 0);
+      break;
+    
+    case MPC_TYPE_OR:  mpc_undefine_or(p);  break;
+    case MPC_TYPE_AND: mpc_undefine_and(p); break;
+    
+    default: break;
+  }
+  
+  if (!force) {
+    free(p->name);
+    free(p);
+  }
+  
+}
+
+void mpc_delete(mpc_parser_t *p) {
+  if (p->retained) {
+
+    if (p->type != MPC_TYPE_UNDEFINED) {
+      mpc_undefine_unretained(p, 0);
+    } 
+    
+    free(p->name);
+    free(p);
+  
+  } else {
+    mpc_undefine_unretained(p, 0);  
+  }
+}
+
+static void mpc_soft_delete(mpc_val_t *x) {
+  mpc_undefine_unretained(x, 0);
+}
+
+static mpc_parser_t *mpc_undefined(void) {
+  mpc_parser_t *p = calloc(1, sizeof(mpc_parser_t));
+  p->retained = 0;
+  p->type = MPC_TYPE_UNDEFINED;
+  p->name = NULL;
+  return p;
+}
+
+mpc_parser_t *mpc_new(const char *name) {
+  mpc_parser_t *p = mpc_undefined();
+  p->retained = 1;
+  p->name = realloc(p->name, strlen(name) + 1);
+  strcpy(p->name, name);
+  return p;
+}
+
+mpc_parser_t *mpc_copy(mpc_parser_t *a) {
+  int i = 0;
+  mpc_parser_t *p;
+  
+  if (a->retained) { return a; }
+  
+  p = mpc_undefined();
+  p->retained = a->retained;
+  p->type = a->type;
+  p->data = a->data;
+  
+  if (a->name) {
+    p->name = malloc(strlen(a->name)+1);
+    strcpy(p->name, a->name);
+  }
+  
+  switch (a->type) {
+    
+    case MPC_TYPE_FAIL:
+      p->data.fail.m = malloc(strlen(a->data.fail.m)+1);
+      strcpy(p->data.fail.m, a->data.fail.m);
+    break;
+    
+    case MPC_TYPE_ONEOF: 
+    case MPC_TYPE_NONEOF:
+    case MPC_TYPE_STRING:
+      p->data.string.x = malloc(strlen(a->data.string.x)+1);
+      strcpy(p->data.string.x, a->data.string.x);
+      break;
+    
+    case MPC_TYPE_APPLY:    p->data.apply.x    = mpc_copy(a->data.apply.x);    break;
+    case MPC_TYPE_APPLY_TO: p->data.apply_to.x = mpc_copy(a->data.apply_to.x); break;
+    case MPC_TYPE_PREDICT:  p->data.predict.x  = mpc_copy(a->data.predict.x);  break;
+    
+    case MPC_TYPE_MAYBE:
+    case MPC_TYPE_NOT:
+      p->data.not.x = mpc_copy(a->data.not.x);
+      break;
+    
+    case MPC_TYPE_EXPECT:
+      p->data.expect.x = mpc_copy(a->data.expect.x);
+      p->data.expect.m = malloc(strlen(a->data.expect.m)+1);
+      strcpy(p->data.expect.m, a->data.expect.m);
+      break;
+      
+    case MPC_TYPE_MANY:
+    case MPC_TYPE_MANY1:
+    case MPC_TYPE_COUNT:
+      p->data.repeat.x = mpc_copy(a->data.repeat.x);
+      break;
+    
+    case MPC_TYPE_OR:
+      p->data.or.xs = malloc(a->data.or.n * sizeof(mpc_parser_t*));
+      for (i = 0; i < a->data.or.n; i++) {
+        p->data.or.xs[i] = mpc_copy(a->data.or.xs[i]);
+      }
+    break;
+    case MPC_TYPE_AND:
+      p->data.and.xs = malloc(a->data.and.n * sizeof(mpc_parser_t*));
+      for (i = 0; i < a->data.and.n; i++) {
+        p->data.and.xs[i] = mpc_copy(a->data.and.xs[i]);
+      }
+      p->data.and.dxs = malloc((a->data.and.n-1) * sizeof(mpc_dtor_t));
+      for (i = 0; i < a->data.and.n-1; i++) {
+        p->data.and.dxs[i] = a->data.and.dxs[i];
+      }
+    break;
+    
+    default: break;
+  }
+
+  
+  return p;
+}
+
+mpc_parser_t *mpc_undefine(mpc_parser_t *p) {
+  mpc_undefine_unretained(p, 1);
+  p->type = MPC_TYPE_UNDEFINED;
+  return p;
+}
+
+mpc_parser_t *mpc_define(mpc_parser_t *p, mpc_parser_t *a) {
+  
+  if (p->retained) {
+    p->type = a->type;
+    p->data = a->data;
+  } else {
+    mpc_parser_t *a2 = mpc_failf("Attempt to assign to Unretained Parser!");
+    p->type = a2->type;
+    p->data = a2->data;
+    free(a2);
+  }
+  
+  free(a);
+  return p;  
+}
+
+void mpc_cleanup(int n, ...) {
+  int i;
+  mpc_parser_t **list = malloc(sizeof(mpc_parser_t*) * n);
+  
+  va_list va;
+  va_start(va, n);
+  for (i = 0; i < n; i++) { list[i] = va_arg(va, mpc_parser_t*); }
+  for (i = 0; i < n; i++) { mpc_undefine(list[i]); }
+  for (i = 0; i < n; i++) { mpc_delete(list[i]); }  
+  va_end(va);  
+
+  free(list);
+}
+
+mpc_parser_t *mpc_pass(void) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_PASS;
+  return p;
+}
+
+mpc_parser_t *mpc_fail(const char *m) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_FAIL;
+  p->data.fail.m = malloc(strlen(m) + 1);
+  strcpy(p->data.fail.m, m);
+  return p;
+}
+
+/*
+** As `snprintf` is not ANSI standard this 
+** function `mpc_failf` should be considered
+** unsafe.
+**
+** You have a few options if this is going to be
+** trouble.
+**
+** - Ensure the format string does not exceed
+**   the buffer length using precision specifiers
+**   such as `%.512s`.
+**
+** - Patch this function in your code base to 
+**   use `snprintf` or whatever variant your
+**   system supports.
+**
+** - Avoid it altogether.
+**
+*/
+
+mpc_parser_t *mpc_failf(const char *fmt, ...) {
+  
+  va_list va;
+  char *buffer;
+
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_FAIL;
+  
+  va_start(va, fmt);
+  buffer = malloc(2048);
+  vsprintf(buffer, fmt, va);
+  va_end(va);
+  
+  buffer = realloc(buffer, strlen(buffer) + 1);
+  p->data.fail.m = buffer;
+  return p;
+
+}
+
+mpc_parser_t *mpc_lift_val(mpc_val_t *x) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_LIFT_VAL;
+  p->data.lift.x = x;
+  return p;
+}
+
+mpc_parser_t *mpc_lift(mpc_ctor_t lf) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_LIFT;
+  p->data.lift.lf = lf;
+  return p;
+}
+
+mpc_parser_t *mpc_anchor(int(*f)(char,char)) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_ANCHOR;
+  p->data.anchor.f = f;
+  return mpc_expect(p, "anchor");
+}
+
+mpc_parser_t *mpc_state(void) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_STATE;
+  return p;
+}
+
+mpc_parser_t *mpc_expect(mpc_parser_t *a, const char *expected) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_EXPECT;
+  p->data.expect.x = a;
+  p->data.expect.m = malloc(strlen(expected) + 1);
+  strcpy(p->data.expect.m, expected);
+  return p;
+}
+
+/*
+** As `snprintf` is not ANSI standard this 
+** function `mpc_expectf` should be considered
+** unsafe.
+**
+** You have a few options if this is going to be
+** trouble.
+**
+** - Ensure the format string does not exceed
+**   the buffer length using precision specifiers
+**   such as `%.512s`.
+**
+** - Patch this function in your code base to 
+**   use `snprintf` or whatever variant your
+**   system supports.
+**
+** - Avoid it altogether.
+**
+*/
+
+mpc_parser_t *mpc_expectf(mpc_parser_t *a, const char *fmt, ...) {
+  va_list va;
+  char *buffer;
+
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_EXPECT;
+  
+  va_start(va, fmt);
+  buffer = malloc(2048);
+  vsprintf(buffer, fmt, va);
+  va_end(va);
+  
+  buffer = realloc(buffer, strlen(buffer) + 1);
+  p->data.expect.x = a;
+  p->data.expect.m = buffer;
+  return p;
+}
+
+/*
+** Basic Parsers
+*/
+
+mpc_parser_t *mpc_any(void) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_ANY;
+  return mpc_expect(p, "any character");
+}
+
+mpc_parser_t *mpc_char(char c) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_SINGLE;
+  p->data.single.x = c;
+  return mpc_expectf(p, "'%c'", c);
+}
+
+mpc_parser_t *mpc_range(char s, char e) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_RANGE;
+  p->data.range.x = s;
+  p->data.range.y = e;
+  return mpc_expectf(p, "character between '%c' and '%c'", s, e);
+}
+
+mpc_parser_t *mpc_oneof(const char *s) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_ONEOF;
+  p->data.string.x = malloc(strlen(s) + 1);
+  strcpy(p->data.string.x, s);
+  return mpc_expectf(p, "one of '%s'", s);
+}
+
+mpc_parser_t *mpc_noneof(const char *s) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_NONEOF;
+  p->data.string.x = malloc(strlen(s) + 1);
+  strcpy(p->data.string.x, s);
+  return mpc_expectf(p, "none of '%s'", s);
+
+}
+
+mpc_parser_t *mpc_satisfy(int(*f)(char)) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_SATISFY;
+  p->data.satisfy.f = f;
+  return mpc_expectf(p, "character satisfying function %p", f);
+}
+
+mpc_parser_t *mpc_string(const char *s) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_STRING;
+  p->data.string.x = malloc(strlen(s) + 1);
+  strcpy(p->data.string.x, s);
+  return mpc_expectf(p, "\"%s\"", s);
+}
+
+/*
+** Core Parsers
+*/
+
+mpc_parser_t *mpc_apply(mpc_parser_t *a, mpc_apply_t f) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_APPLY;
+  p->data.apply.x = a;
+  p->data.apply.f = f;
+  return p;
+}
+
+mpc_parser_t *mpc_apply_to(mpc_parser_t *a, mpc_apply_to_t f, void *x) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_APPLY_TO;
+  p->data.apply_to.x = a;
+  p->data.apply_to.f = f;
+  p->data.apply_to.d = x;
+  return p;
+}
+
+mpc_parser_t *mpc_predictive(mpc_parser_t *a) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_PREDICT;
+  p->data.predict.x = a;
+  return p;
+}
+
+mpc_parser_t *mpc_not_lift(mpc_parser_t *a, mpc_dtor_t da, mpc_ctor_t lf) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_NOT;
+  p->data.not.x = a;
+  p->data.not.dx = da;
+  p->data.not.lf = lf;
+  return p;
+}
+
+mpc_parser_t *mpc_not(mpc_parser_t *a, mpc_dtor_t da) {
+  return mpc_not_lift(a, da, mpcf_ctor_null);
+}
+
+mpc_parser_t *mpc_maybe_lift(mpc_parser_t *a, mpc_ctor_t lf) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_MAYBE;
+  p->data.not.x = a;
+  p->data.not.lf = lf;
+  return p;
+}
+
+mpc_parser_t *mpc_maybe(mpc_parser_t *a) {
+  return mpc_maybe_lift(a, mpcf_ctor_null);
+}
+
+mpc_parser_t *mpc_many(mpc_fold_t f, mpc_parser_t *a) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_MANY;
+  p->data.repeat.x = a;
+  p->data.repeat.f = f;
+  return p;
+}
+
+mpc_parser_t *mpc_many1(mpc_fold_t f, mpc_parser_t *a) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_MANY1;
+  p->data.repeat.x = a;
+  p->data.repeat.f = f;
+  return p;
+}
+
+mpc_parser_t *mpc_count(int n, mpc_fold_t f, mpc_parser_t *a, mpc_dtor_t da) {
+  mpc_parser_t *p = mpc_undefined();
+  p->type = MPC_TYPE_COUNT;
+  p->data.repeat.n = n;
+  p->data.repeat.f = f;
+  p->data.repeat.x = a;
+  p->data.repeat.dx = da;
+  return p;
+}
+
+mpc_parser_t *mpc_or(int n, ...) {
+
+  int i;
+  va_list va;
+
+  mpc_parser_t *p = mpc_undefined();
+  
+  p->type = MPC_TYPE_OR;
+  p->data.or.n = n;
+  p->data.or.xs = malloc(sizeof(mpc_parser_t*) * n);
+  
+  va_start(va, n);  
+  for (i = 0; i < n; i++) {
+    p->data.or.xs[i] = va_arg(va, mpc_parser_t*);
+  }
+  va_end(va);
+  
+  return p;
+}
+
+mpc_parser_t *mpc_and(int n, mpc_fold_t f, ...) {
+
+  int i;
+  va_list va;
+
+  mpc_parser_t *p = mpc_undefined();
+  
+  p->type = MPC_TYPE_AND;
+  p->data.and.n = n;
+  p->data.and.f = f;
+  p->data.and.xs = malloc(sizeof(mpc_parser_t*) * n);
+  p->data.and.dxs = malloc(sizeof(mpc_dtor_t) * (n-1));
+
+  va_start(va, f);  
+  for (i = 0; i < n; i++) {
+    p->data.and.xs[i] = va_arg(va, mpc_parser_t*);
+  }
+  for (i = 0; i < (n-1); i++) {
+    p->data.and.dxs[i] = va_arg(va, mpc_dtor_t);
+  }  
+  va_end(va);
+  
+  return p;
+}
+
+/*
+** Common Parsers
+*/
+
+static int mpc_soi_anchor(char prev, char next) { (void) next; return (prev == '\0'); }
+static int mpc_eoi_anchor(char prev, char next) { (void) prev; return (next == '\0'); }
+
+mpc_parser_t *mpc_soi(void) { return mpc_expect(mpc_anchor(mpc_soi_anchor), "start of input"); }
+mpc_parser_t *mpc_eoi(void) { return mpc_expect(mpc_anchor(mpc_eoi_anchor), "end of input"); }
+
+static int mpc_boundary_anchor(char prev, char next) {
+  const char* word = "abcdefghijklmnopqrstuvwxyz"
+                     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                     "0123456789_";
+  if ( strchr(word, next) &&  prev == '\0') { return 1; }
+  if ( strchr(word, prev) &&  next == '\0') { return 1; }
+  if ( strchr(word, next) && !strchr(word, prev)) { return 1; }
+  if (!strchr(word, next) &&  strchr(word, prev)) { return 1; }
+  return 0;
+}
+
+mpc_parser_t *mpc_boundary(void) { return mpc_expect(mpc_anchor(mpc_boundary_anchor), "boundary"); }
+
+mpc_parser_t *mpc_whitespace(void) { return mpc_expect(mpc_oneof(" \f\n\r\t\v"), "whitespace"); }
+mpc_parser_t *mpc_whitespaces(void) { return mpc_expect(mpc_many(mpcf_strfold, mpc_whitespace()), "spaces"); }
+mpc_parser_t *mpc_blank(void) { return mpc_expect(mpc_apply(mpc_whitespaces(), mpcf_free), "whitespace"); }
+
+mpc_parser_t *mpc_newline(void) { return mpc_expect(mpc_char('\n'), "newline"); }
+mpc_parser_t *mpc_tab(void) { return mpc_expect(mpc_char('\t'), "tab"); }
+mpc_parser_t *mpc_escape(void) { return mpc_and(2, mpcf_strfold, mpc_char('\\'), mpc_any(), free); }
+
+mpc_parser_t *mpc_digit(void) { return mpc_expect(mpc_oneof("0123456789"), "digit"); }
+mpc_parser_t *mpc_hexdigit(void) { return mpc_expect(mpc_oneof("0123456789ABCDEFabcdef"), "hex digit"); }
+mpc_parser_t *mpc_octdigit(void) { return mpc_expect(mpc_oneof("01234567"), "oct digit"); }
+mpc_parser_t *mpc_digits(void) { return mpc_expect(mpc_many1(mpcf_strfold, mpc_digit()), "digits"); }
+mpc_parser_t *mpc_hexdigits(void) { return mpc_expect(mpc_many1(mpcf_strfold, mpc_hexdigit()), "hex digits"); }
+mpc_parser_t *mpc_octdigits(void) { return mpc_expect(mpc_many1(mpcf_strfold, mpc_octdigit()), "oct digits"); }
+
+mpc_parser_t *mpc_lower(void) { return mpc_expect(mpc_oneof("abcdefghijklmnopqrstuvwxyz"), "lowercase letter"); }
+mpc_parser_t *mpc_upper(void) { return mpc_expect(mpc_oneof("ABCDEFGHIJKLMNOPQRSTUVWXYZ"), "uppercase letter"); }
+mpc_parser_t *mpc_alpha(void) { return mpc_expect(mpc_oneof("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), "letter"); }
+mpc_parser_t *mpc_underscore(void) { return mpc_expect(mpc_char('_'), "underscore"); }
+mpc_parser_t *mpc_alphanum(void) { return mpc_expect(mpc_or(3, mpc_alpha(), mpc_digit(), mpc_underscore()), "alphanumeric"); }
+
+mpc_parser_t *mpc_int(void) { return mpc_expect(mpc_apply(mpc_digits(), mpcf_int), "integer"); }
+mpc_parser_t *mpc_hex(void) { return mpc_expect(mpc_apply(mpc_hexdigits(), mpcf_hex), "hexadecimal"); }
+mpc_parser_t *mpc_oct(void) { return mpc_expect(mpc_apply(mpc_octdigits(), mpcf_oct), "octadecimal"); }
+mpc_parser_t *mpc_number(void) { return mpc_expect(mpc_or(3, mpc_int(), mpc_hex(), mpc_oct()), "number"); }
+
+mpc_parser_t *mpc_real(void) {
+
+  /* [+-]?\d+(\.\d+)?([eE][+-]?[0-9]+)? */
+  
+  mpc_parser_t *p0, *p1, *p2, *p30, *p31, *p32, *p3;
+  
+  p0 = mpc_maybe_lift(mpc_oneof("+-"), mpcf_ctor_str);
+  p1 = mpc_digits();
+  p2 = mpc_maybe_lift(mpc_and(2, mpcf_strfold, mpc_char('.'), mpc_digits(), free), mpcf_ctor_str);
+  p30 = mpc_oneof("eE");
+  p31 = mpc_maybe_lift(mpc_oneof("+-"), mpcf_ctor_str);
+  p32 = mpc_digits();
+  p3 = mpc_maybe_lift(mpc_and(3, mpcf_strfold, p30, p31, p32, free, free), mpcf_ctor_str);
+  
+  return mpc_expect(mpc_and(4, mpcf_strfold, p0, p1, p2, p3, free, free, free), "real");
+
+}
+
+mpc_parser_t *mpc_float(void) {
+  return mpc_expect(mpc_apply(mpc_real(), mpcf_float), "float");
+}
+
+mpc_parser_t *mpc_char_lit(void) {
+  return mpc_expect(mpc_between(mpc_or(2, mpc_escape(), mpc_any()), free, "'", "'"), "char");
+}
+
+mpc_parser_t *mpc_string_lit(void) {
+  mpc_parser_t *strchar = mpc_or(2, mpc_escape(), mpc_noneof("\""));
+  return mpc_expect(mpc_between(mpc_many(mpcf_strfold, strchar), free, "\"", "\""), "string");
+}
+
+mpc_parser_t *mpc_regex_lit(void) {  
+  mpc_parser_t *regexchar = mpc_or(2, mpc_escape(), mpc_noneof("/"));
+  return mpc_expect(mpc_between(mpc_many(mpcf_strfold, regexchar), free, "/", "/"), "regex");
+}
+
+mpc_parser_t *mpc_ident(void) {
+  mpc_parser_t *p0, *p1; 
+  p0 = mpc_or(2, mpc_alpha(), mpc_underscore());
+  p1 = mpc_many(mpcf_strfold, mpc_alphanum()); 
+  return mpc_and(2, mpcf_strfold, p0, p1, free);
+}
+
+/*
+** Useful Parsers
+*/
+
+mpc_parser_t *mpc_startwith(mpc_parser_t *a) { return mpc_and(2, mpcf_snd, mpc_soi(), a, mpcf_dtor_null); }
+mpc_parser_t *mpc_endwith(mpc_parser_t *a, mpc_dtor_t da) { return mpc_and(2, mpcf_fst, a, mpc_eoi(), da); }
+mpc_parser_t *mpc_whole(mpc_parser_t *a, mpc_dtor_t da) { return mpc_and(3, mpcf_snd, mpc_soi(), a, mpc_eoi(), mpcf_dtor_null, da); }
+
+mpc_parser_t *mpc_stripl(mpc_parser_t *a) { return mpc_and(2, mpcf_snd, mpc_blank(), a, mpcf_dtor_null); }
+mpc_parser_t *mpc_stripr(mpc_parser_t *a) { return mpc_and(2, mpcf_fst, a, mpc_blank(), mpcf_dtor_null); }
+mpc_parser_t *mpc_strip(mpc_parser_t *a) { return mpc_and(3, mpcf_snd, mpc_blank(), a, mpc_blank(), mpcf_dtor_null, mpcf_dtor_null); }
+mpc_parser_t *mpc_tok(mpc_parser_t *a) { return mpc_and(2, mpcf_fst, a, mpc_blank(), mpcf_dtor_null); }
+mpc_parser_t *mpc_sym(const char *s) { return mpc_tok(mpc_string(s)); }
+
+mpc_parser_t *mpc_total(mpc_parser_t *a, mpc_dtor_t da) { return mpc_whole(mpc_strip(a), da); }
+
+mpc_parser_t *mpc_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c) {
+  return mpc_and(3, mpcf_snd_free,
+    mpc_string(o), a, mpc_string(c),
+    free, ad);
+}
+
+mpc_parser_t *mpc_parens(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_between(a, ad, "(", ")"); }
+mpc_parser_t *mpc_braces(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_between(a, ad, "<", ">"); }
+mpc_parser_t *mpc_brackets(mpc_parser_t *a, mpc_dtor_t ad) { return mpc_between(a, ad, "{", "}"); }
+mpc_parser_t *mpc_squares(mpc_parser_t *a, mpc_dtor_t ad)  { return mpc_between(a, ad, "[", "]"); }
+
+mpc_parser_t *mpc_tok_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c) {
+  return mpc_and(3, mpcf_snd_free,
+    mpc_sym(o), mpc_tok(a), mpc_sym(c),
+    free, ad);
+}
+
+mpc_parser_t *mpc_tok_parens(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_tok_between(a, ad, "(", ")"); }
+mpc_parser_t *mpc_tok_braces(mpc_parser_t *a, mpc_dtor_t ad)   { return mpc_tok_between(a, ad, "<", ">"); }
+mpc_parser_t *mpc_tok_brackets(mpc_parser_t *a, mpc_dtor_t ad) { return mpc_tok_between(a, ad, "{", "}"); }
+mpc_parser_t *mpc_tok_squares(mpc_parser_t *a, mpc_dtor_t ad)  { return mpc_tok_between(a, ad, "[", "]"); }
+
+/*
+** Regular Expression Parsers
+*/
+
+/*
+** So here is a cute bootstrapping.
+**
+** I'm using the previously defined
+** mpc constructs and functions to
+** parse the user regex string and
+** construct a parser from it.
+**
+** As it turns out lots of the standard
+** mpc functions look a lot like `fold`
+** functions and so can be used indirectly
+** by many of the parsing functions to build
+** a parser directly - as we are parsing.
+**
+** This is certainly something that
+** would be less elegant/interesting 
+** in a two-phase parser which first
+** builds an AST and then traverses it
+** to generate the object.
+**
+** This whole thing acts as a great
+** case study for how trivial it can be
+** to write a great parser in a few
+** lines of code using mpc.
+*/
+
+/*
+**
+**  ### Regular Expression Grammar
+**
+**      <regex> : <term> | (<term> "|" <regex>)
+**     
+**      <term> : <factor>*
+**
+**      <factor> : <base>
+**               | <base> "*"
+**               | <base> "+"
+**               | <base> "?"
+**               | <base> "{" <digits> "}"
+**           
+**      <base> : <char>
+**             | "\" <char>
+**             | "(" <regex> ")"
+**             | "[" <range> "]"
+*/
+
+static mpc_val_t *mpcf_re_or(int n, mpc_val_t **xs) {
+  (void) n;
+  if (!xs[1]) { return xs[0]; }
+  else { return mpc_or(2, xs[0], xs[1]); }
+}
+
+static mpc_val_t *mpcf_re_and(int n, mpc_val_t **xs) {
+  int i;
+  mpc_parser_t *p = mpc_lift(mpcf_ctor_str);
+  for (i = 0; i < n; i++) {
+    p = mpc_and(2, mpcf_strfold, p, xs[i], free);
+  }
+  return p;
+}
+
+static mpc_val_t *mpcf_re_repeat(int n, mpc_val_t **xs) {
+  int num;
+  (void) n;
+  if (!xs[1]) { return xs[0]; }
+  if (strcmp(xs[1], "*") == 0) { free(xs[1]); return mpc_many(mpcf_strfold, xs[0]); }
+  if (strcmp(xs[1], "+") == 0) { free(xs[1]); return mpc_many1(mpcf_strfold, xs[0]); }
+  if (strcmp(xs[1], "?") == 0) { free(xs[1]); return mpc_maybe_lift(xs[0], mpcf_ctor_str); }
+  num = *(int*)xs[1];
+  free(xs[1]);
+  
+  return mpc_count(num, mpcf_strfold, xs[0], free);
+}
+
+static mpc_parser_t *mpc_re_escape_char(char c) {
+  switch (c) {
+    case 'a': return mpc_char('\a');
+    case 'f': return mpc_char('\f');
+    case 'n': return mpc_char('\n');
+    case 'r': return mpc_char('\r');
+    case 't': return mpc_char('\t');
+    case 'v': return mpc_char('\v');
+    case 'b': return mpc_and(2, mpcf_snd, mpc_boundary(), mpc_lift(mpcf_ctor_str), free);
+    case 'B': return mpc_not_lift(mpc_boundary(), free, mpcf_ctor_str);
+    case 'A': return mpc_and(2, mpcf_snd, mpc_soi(), mpc_lift(mpcf_ctor_str), free);
+    case 'Z': return mpc_and(2, mpcf_snd, mpc_eoi(), mpc_lift(mpcf_ctor_str), free);
+    case 'd': return mpc_digit();
+    case 'D': return mpc_not_lift(mpc_digit(), free, mpcf_ctor_str);
+    case 's': return mpc_whitespace();
+    case 'S': return mpc_not_lift(mpc_whitespace(), free, mpcf_ctor_str);
+    case 'w': return mpc_alphanum();
+    case 'W': return mpc_not_lift(mpc_alphanum(), free, mpcf_ctor_str);
+    default: return NULL;
+  }
+}
+
+static mpc_val_t *mpcf_re_escape(mpc_val_t *x) {
+  
+  char *s = x;
+  mpc_parser_t *p;
+  
+  /* Regex Special Characters */
+  if (s[0] == '.') { free(s); return mpc_any(); }
+  if (s[0] == '^') { free(s); return mpc_and(2, mpcf_snd, mpc_soi(), mpc_lift(mpcf_ctor_str), free); }
+  if (s[0] == '$') { free(s); return mpc_and(2, mpcf_snd, mpc_eoi(), mpc_lift(mpcf_ctor_str), free); }
+  
+  /* Regex Escape */
+  if (s[0] == '\\') {
+    p = mpc_re_escape_char(s[1]);
+    p = (!p) ? mpc_char(s[1]) : p;
+    free(s);
+    return p;
+  }
+  
+  /* Regex Standard */
+  p = mpc_char(s[0]);
+  free(s);
+  return p;
+}
+
+static const char *mpc_re_range_escape_char(char c) {
+  switch (c) {
+    case '-': return "-";
+    case 'a': return "\a";
+    case 'f': return "\f";
+    case 'n': return "\n";
+    case 'r': return "\r";
+    case 't': return "\t";
+    case 'v': return "\v";
+    case 'b': return "\b";
+    case 'd': return "0123456789";
+    case 's': return " \f\n\r\t\v";
+    case 'w': return "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
+    default: return NULL;
+  }
+}
+
+static mpc_val_t *mpcf_re_range(mpc_val_t *x) {
+  
+  mpc_parser_t *out;
+  size_t i, j;
+  size_t start, end;
+  const char *tmp = NULL;
+  const char *s = x;
+  int comp = s[0] == '^' ? 1 : 0;
+  char *range;
+  
+  if (s[0] == '\0') { free(x); return mpc_fail("Invalid Regex Range Expression"); } 
+  if (s[0] == '^' && 
+      s[1] == '\0') { free(x); return mpc_fail("Invalid Regex Range Expression"); }
+  
+  range = calloc(1,1);
+
+  for (i = comp; i < strlen(s); i++){
+    
+    /* Regex Range Escape */
+    if (s[i] == '\\') {
+      tmp = mpc_re_range_escape_char(s[i+1]);
+      if (tmp != NULL) {
+        range = realloc(range, strlen(range) + strlen(tmp) + 1);
+        strcat(range, tmp);
+      } else {
+        range = realloc(range, strlen(range) + 1 + 1);
+        range[strlen(range) + 1] = '\0';
+        range[strlen(range) + 0] = s[i+1];      
+      }
+      i++;
+    }
+    
+    /* Regex Range...Range */
+    else if (s[i] == '-') {
+      if (s[i+1] == '\0' || i == 0) {
+          range = realloc(range, strlen(range) + strlen("-") + 1);
+          strcat(range, "-");
+      } else {
+        start = s[i-1]+1;
+        end = s[i+1]-1;
+        for (j = start; j <= end; j++) {
+          range = realloc(range, strlen(range) + 1 + 1 + 1);
+          range[strlen(range) + 1] = '\0';
+          range[strlen(range) + 0] = j;
+        }        
+      }
+    }
+    
+    /* Regex Range Normal */
+    else {
+      range = realloc(range, strlen(range) + 1 + 1);
+      range[strlen(range) + 1] = '\0';
+      range[strlen(range) + 0] = s[i];
+    }
+  
+  }
+  
+  out = comp == 1 ? mpc_noneof(range) : mpc_oneof(range);
+  
+  free(x);
+  free(range);
+  
+  return out;
+}
+
+mpc_parser_t *mpc_re(const char *re) {
+  
+  char *err_msg;
+  mpc_parser_t *err_out;
+  mpc_result_t r;
+  mpc_parser_t *Regex, *Term, *Factor, *Base, *Range, *RegexEnclose; 
+  
+  Regex  = mpc_new("regex");
+  Term   = mpc_new("term");
+  Factor = mpc_new("factor");
+  Base   = mpc_new("base");
+  Range  = mpc_new("range");
+  
+  mpc_define(Regex, mpc_and(2, mpcf_re_or,
+    Term, 
+    mpc_maybe(mpc_and(2, mpcf_snd_free, mpc_char('|'), Regex, free)),
+    (mpc_dtor_t)mpc_delete
+  ));
+  
+  mpc_define(Term, mpc_many(mpcf_re_and, Factor));
+  
+  mpc_define(Factor, mpc_and(2, mpcf_re_repeat,
+    Base,
+    mpc_or(5,
+      mpc_char('*'), mpc_char('+'), mpc_char('?'),
+      mpc_brackets(mpc_int(), free),
+      mpc_pass()),
+    (mpc_dtor_t)mpc_delete
+  ));
+  
+  mpc_define(Base, mpc_or(4,
+    mpc_parens(Regex, (mpc_dtor_t)mpc_delete),
+    mpc_squares(Range, (mpc_dtor_t)mpc_delete),
+    mpc_apply(mpc_escape(), mpcf_re_escape),
+    mpc_apply(mpc_noneof(")|"), mpcf_re_escape)
+  ));
+  
+  mpc_define(Range, mpc_apply(
+    mpc_many(mpcf_strfold, mpc_or(2, mpc_escape(), mpc_noneof("]"))),
+    mpcf_re_range
+  ));
+  
+  RegexEnclose = mpc_whole(mpc_predictive(Regex), (mpc_dtor_t)mpc_delete);
+  
+  mpc_optimise(RegexEnclose);
+  mpc_optimise(Regex);
+  mpc_optimise(Term);
+  mpc_optimise(Factor);
+  mpc_optimise(Base);
+  mpc_optimise(Range);
+  
+  if(!mpc_parse("<mpc_re_compiler>", re, RegexEnclose, &r)) {
+    err_msg = mpc_err_string(r.error);
+    err_out = mpc_failf("Invalid Regex: %s", err_msg);
+    mpc_err_delete(r.error);  
+    free(err_msg);
+    r.output = err_out;
+  }
+  
+  mpc_cleanup(6, RegexEnclose, Regex, Term, Factor, Base, Range);
+  
+  mpc_optimise(r.output);
+  
+  return r.output;
+  
+}
+
+/*
+** Common Fold Functions
+*/
+
+void mpcf_dtor_null(mpc_val_t *x) { (void) x; return; }
+
+mpc_val_t *mpcf_ctor_null(void) { return NULL; }
+mpc_val_t *mpcf_ctor_str(void) { return calloc(1, 1); }
+mpc_val_t *mpcf_free(mpc_val_t *x) { free(x); return NULL; }
+
+mpc_val_t *mpcf_int(mpc_val_t *x) {
+  int *y = malloc(sizeof(int));
+  *y = strtol(x, NULL, 10);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_hex(mpc_val_t *x) {
+  int *y = malloc(sizeof(int));
+  *y = strtol(x, NULL, 16);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_oct(mpc_val_t *x) {
+  int *y = malloc(sizeof(int));
+  *y = strtol(x, NULL, 8);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_float(mpc_val_t *x) {
+  float *y = malloc(sizeof(float));
+  *y = strtod(x, NULL);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_strtriml(mpc_val_t *x) {
+  char *s = x;
+  while (isspace(*s)) {
+    memmove(s, s+1, strlen(s));
+  }
+  return s;
+}
+
+mpc_val_t *mpcf_strtrimr(mpc_val_t *x) {
+  char *s = x;
+  size_t l = strlen(s);
+  while (isspace(s[l-1])) {
+    s[l-1] = '\0'; l--;
+  }
+  return s;
+}
+
+mpc_val_t *mpcf_strtrim(mpc_val_t *x) {
+  return mpcf_strtriml(mpcf_strtrimr(x));
+}
+
+static const char mpc_escape_input_c[]  = {
+  '\a', '\b', '\f', '\n', '\r',
+  '\t', '\v', '\\', '\'', '\"', '\0'};
+    
+static const char *mpc_escape_output_c[] = {
+  "\\a", "\\b", "\\f", "\\n", "\\r", "\\t", 
+  "\\v", "\\\\", "\\'", "\\\"", "\\0", NULL};
+
+static const char mpc_escape_input_raw_re[] = { '/' };
+static const char *mpc_escape_output_raw_re[] = { "\\/", NULL };
+
+static const char mpc_escape_input_raw_cstr[] = { '"' };
+static const char *mpc_escape_output_raw_cstr[] = { "\\\"", NULL };
+
+static const char mpc_escape_input_raw_cchar[] = { '\'' };
+static const char *mpc_escape_output_raw_cchar[] = { "\\'", NULL };
+
+static mpc_val_t *mpcf_escape_new(mpc_val_t *x, const char *input, const char **output) {
+  
+  int i;
+  int found;
+  char buff[2];
+  char *s = x;
+  char *y = calloc(1, 1);
+  
+  while (*s) {
+    
+    i = 0;
+    found = 0;
+
+    while (output[i]) {
+      if (*s == input[i]) {
+        y = realloc(y, strlen(y) + strlen(output[i]) + 1);
+        strcat(y, output[i]);
+        found = 1;
+        break;
+      }
+      i++;
+    }
+    
+    if (!found) {
+      y = realloc(y, strlen(y) + 2);
+      buff[0] = *s; buff[1] = '\0';
+      strcat(y, buff);
+    }
+    
+    s++;
+  }
+  
+  
+  return y;
+}
+
+static mpc_val_t *mpcf_unescape_new(mpc_val_t *x, const char *input, const char **output) {
+  
+  int i;
+  int found = 0;
+  char buff[2];
+  char *s = x;
+  char *y = calloc(1, 1);
+  
+  while (*s) {
+    
+    i = 0;
+    found = 0;
+    
+    while (output[i]) {
+      if ((*(s+0)) == output[i][0] &&
+          (*(s+1)) == output[i][1]) {
+        y = realloc(y, strlen(y) + 1 + 1);
+        buff[0] = input[i]; buff[1] = '\0';
+        strcat(y, buff);
+        found = 1;
+        s++;
+        break;
+      }
+      i++;
+    }
+    
+    if (!found) {
+      y = realloc(y, strlen(y) + 1 + 1);
+      buff[0] = *s; buff[1] = '\0';
+      strcat(y, buff);
+    }
+    
+    if (*s == '\0') { break; }
+    else { s++; }
+  }
+  
+  return y;
+  
+}
+
+mpc_val_t *mpcf_escape(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_c, mpc_escape_output_c);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_unescape(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_c, mpc_escape_output_c);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_escape_regex(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_raw_re, mpc_escape_output_raw_re);
+  free(x);
+  return y;  
+}
+
+mpc_val_t *mpcf_unescape_regex(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_raw_re, mpc_escape_output_raw_re);
+  free(x);
+  return y;  
+}
+
+mpc_val_t *mpcf_escape_string_raw(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_raw_cstr, mpc_escape_output_raw_cstr);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_unescape_string_raw(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_raw_cstr, mpc_escape_output_raw_cstr);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_escape_char_raw(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_escape_new(x, mpc_escape_input_raw_cchar, mpc_escape_output_raw_cchar);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_unescape_char_raw(mpc_val_t *x) {
+  mpc_val_t *y = mpcf_unescape_new(x, mpc_escape_input_raw_cchar, mpc_escape_output_raw_cchar);
+  free(x);
+  return y;
+}
+
+mpc_val_t *mpcf_null(int n, mpc_val_t** xs) { (void) n; (void) xs; return NULL; }
+mpc_val_t *mpcf_fst(int n, mpc_val_t **xs) { (void) n; return xs[0]; }
+mpc_val_t *mpcf_snd(int n, mpc_val_t **xs) { (void) n; return xs[1]; }
+mpc_val_t *mpcf_trd(int n, mpc_val_t **xs) { (void) n; return xs[2]; }
+
+static mpc_val_t *mpcf_nth_free(int n, mpc_val_t **xs, int x) {
+  int i;
+  for (i = 0; i < n; i++) {
+    if (i != x) { free(xs[i]); }
+  }
+  return xs[x];
+}
+ 
+mpc_val_t *mpcf_fst_free(int n, mpc_val_t **xs) { return mpcf_nth_free(n, xs, 0); }
+mpc_val_t *mpcf_snd_free(int n, mpc_val_t **xs) { return mpcf_nth_free(n, xs, 1); }
+mpc_val_t *mpcf_trd_free(int n, mpc_val_t **xs) { return mpcf_nth_free(n, xs, 2); }
+
+mpc_val_t *mpcf_strfold(int n, mpc_val_t **xs) {
+  int i;
+  size_t l = 0;
+  
+  if (n == 0) { return calloc(1, 1); }
+  
+  for (i = 0; i < n; i++) { l += strlen(xs[i]); }
+  
+  xs[0] = realloc(xs[0], l + 1);
+  
+  for (i = 1; i < n; i++) {
+    strcat(xs[0], xs[i]); free(xs[i]);
+  }
+  
+  return xs[0];
+}
+
+mpc_val_t *mpcf_maths(int n, mpc_val_t **xs) {
+  int **vs = (int**)xs;
+  (void) n;
+  
+  if (strcmp(xs[1], "*") == 0) { *vs[0] *= *vs[2]; }
+  if (strcmp(xs[1], "/") == 0) { *vs[0] /= *vs[2]; }
+  if (strcmp(xs[1], "%") == 0) { *vs[0] %= *vs[2]; }
+  if (strcmp(xs[1], "+") == 0) { *vs[0] += *vs[2]; }
+  if (strcmp(xs[1], "-") == 0) { *vs[0] -= *vs[2]; }
+  
+  free(xs[1]); free(xs[2]);
+  
+  return xs[0];
+}
+
+/*
+** Printing
+*/
+
+static void mpc_print_unretained(mpc_parser_t *p, int force) {
+  
+  /* TODO: Print Everything Escaped */
+  
+  int i;
+  char *s, *e;
+  char buff[2];
+  
+  if (p->retained && !force) {;
+    if (p->name) { printf("<%s>", p->name); }
+    else { printf("<anon>"); }
+    return;
+  }
+  
+  if (p->type == MPC_TYPE_UNDEFINED) { printf("<?>"); }
+  if (p->type == MPC_TYPE_PASS)   { printf("<:>"); }
+  if (p->type == MPC_TYPE_FAIL)   { printf("<!>"); }
+  if (p->type == MPC_TYPE_LIFT)   { printf("<#>"); }
+  if (p->type == MPC_TYPE_STATE)  { printf("<S>"); }
+  if (p->type == MPC_TYPE_ANCHOR) { printf("<@>"); }
+  if (p->type == MPC_TYPE_EXPECT) {
+    printf("%s", p->data.expect.m);
+    /*mpc_print_unretained(p->data.expect.x, 0);*/
+  }
+  
+  if (p->type == MPC_TYPE_ANY) { printf("<.>"); }
+  if (p->type == MPC_TYPE_SATISFY) { printf("<f>"); }
+
+  if (p->type == MPC_TYPE_SINGLE) {
+    buff[0] = p->data.single.x; buff[1] = '\0';
+    s = mpcf_escape_new(
+      buff,
+      mpc_escape_input_c,
+      mpc_escape_output_c);
+    printf("'%s'", s);
+    free(s);
+  }
+  
+  if (p->type == MPC_TYPE_RANGE) {
+    buff[0] = p->data.range.x; buff[1] = '\0';
+    s = mpcf_escape_new(
+      buff,
+      mpc_escape_input_c,
+      mpc_escape_output_c);
+    buff[0] = p->data.range.y; buff[1] = '\0';
+    e = mpcf_escape_new(
+      buff,
+      mpc_escape_input_c,
+      mpc_escape_output_c);
+    printf("[%s-%s]", s, e);
+    free(s);
+    free(e);
+  }
+  
+  if (p->type == MPC_TYPE_ONEOF) {
+    s = mpcf_escape_new(
+      p->data.string.x,
+      mpc_escape_input_c,
+      mpc_escape_output_c);
+    printf("[%s]", s);
+    free(s);
+  }
+  
+  if (p->type == MPC_TYPE_NONEOF) {
+    s = mpcf_escape_new(
+      p->data.string.x,
+      mpc_escape_input_c,
+      mpc_escape_output_c);
+    printf("[^%s]", s);
+    free(s);
+  }
+  
+  if (p->type == MPC_TYPE_STRING) {
+    s = mpcf_escape_new(
+      p->data.string.x,
+      mpc_escape_input_c,
+      mpc_escape_output_c);
+    printf("\"%s\"", s);
+    free(s);
+  }
+  
+  if (p->type == MPC_TYPE_APPLY)    { mpc_print_unretained(p->data.apply.x, 0); }
+  if (p->type == MPC_TYPE_APPLY_TO) { mpc_print_unretained(p->data.apply_to.x, 0); }
+  if (p->type == MPC_TYPE_PREDICT)  { mpc_print_unretained(p->data.predict.x, 0); }
+
+  if (p->type == MPC_TYPE_NOT)   { mpc_print_unretained(p->data.not.x, 0); printf("!"); }
+  if (p->type == MPC_TYPE_MAYBE) { mpc_print_unretained(p->data.not.x, 0); printf("?"); }
+
+  if (p->type == MPC_TYPE_MANY)  { mpc_print_unretained(p->data.repeat.x, 0); printf("*"); }
+  if (p->type == MPC_TYPE_MANY1) { mpc_print_unretained(p->data.repeat.x, 0); printf("+"); }
+  if (p->type == MPC_TYPE_COUNT) { mpc_print_unretained(p->data.repeat.x, 0); printf("{%i}", p->data.repeat.n); }
+  
+  if (p->type == MPC_TYPE_OR) {
+    printf("(");
+    for(i = 0; i < p->data.or.n-1; i++) {
+      mpc_print_unretained(p->data.or.xs[i], 0);
+      printf(" | ");
+    }
+    mpc_print_unretained(p->data.or.xs[p->data.or.n-1], 0);
+    printf(")");
+  }
+  
+  if (p->type == MPC_TYPE_AND) {
+    printf("(");
+    for(i = 0; i < p->data.and.n-1; i++) {
+      mpc_print_unretained(p->data.and.xs[i], 0);
+      printf(" ");
+    }
+    mpc_print_unretained(p->data.and.xs[p->data.and.n-1], 0);
+    printf(")");
+  }
+  
+}
+
+void mpc_print(mpc_parser_t *p) {
+  mpc_print_unretained(p, 1);
+  printf("\n");
+}
+
+/*
+** Testing
+*/
+
+/*
+** These functions are slightly unwieldy and
+** also the whole of the testing suite for mpc
+** mpc is pretty shaky.
+**
+** It could do with a lot more tests and more
+** precision. Currently I am only really testing
+** changes off of the examples.
+**
+*/
+
+int mpc_test_fail(mpc_parser_t *p, const char *s, const void *d,
+  int(*tester)(const void*, const void*),
+  mpc_dtor_t destructor,
+  void(*printer)(const void*)) {
+  mpc_result_t r;
+  (void) printer;
+  if (mpc_parse("<test>", s, p, &r)) {
+
+    if (tester(r.output, d)) {
+      destructor(r.output);
+      return 0;
+    } else {
+      destructor(r.output);
+      return 1;
+    }
+  
+  } else {
+    mpc_err_delete(r.error);
+    return 1;
+  }
+  
+}
+
+int mpc_test_pass(mpc_parser_t *p, const char *s, const void *d,
+  int(*tester)(const void*, const void*), 
+  mpc_dtor_t destructor, 
+  void(*printer)(const void*)) {
+
+  mpc_result_t r;  
+  if (mpc_parse("<test>", s, p, &r)) {
+    
+    if (tester(r.output, d)) {
+      destructor(r.output);
+      return 1;
+    } else {
+      printf("Got "); printer(r.output); printf("\n");
+      printf("Expected "); printer(d); printf("\n");
+      destructor(r.output);
+      return 0;
+    }
+    
+  } else {    
+    mpc_err_print(r.error);
+    mpc_err_delete(r.error);
+    return 0;
+    
+  }
+  
+}
+
+
+/*
+** AST
+*/
+
+void mpc_ast_delete(mpc_ast_t *a) {
+  
+  int i;
+  
+  if (!a) { return; }
+  
+  for (i = 0; i < a->children_num; i++) {
+    mpc_ast_delete(a->children[i]);
+  }
+  
+  free(a->children);
+  free(a->tag);
+  free(a->contents);
+  free(a);
+  
+}
+
+static void mpc_ast_delete_no_children(mpc_ast_t *a) {
+  free(a->children);
+  free(a->tag);
+  free(a->contents);
+  free(a);
+}
+
+mpc_ast_t *mpc_ast_new(const char *tag, const char *contents) {
+  
+  mpc_ast_t *a = malloc(sizeof(mpc_ast_t));
+  
+  a->tag = malloc(strlen(tag) + 1);
+  strcpy(a->tag, tag);
+  
+  a->contents = malloc(strlen(contents) + 1);
+  strcpy(a->contents, contents);
+  
+  a->state = mpc_state_new();
+  
+  a->children_num = 0;
+  a->children = NULL;
+  return a;
+  
+}
+
+mpc_ast_t *mpc_ast_build(int n, const char *tag, ...) {
+  
+  mpc_ast_t *a = mpc_ast_new(tag, "");
+  
+  int i;
+  va_list va;
+  va_start(va, tag);
+  
+  for (i = 0; i < n; i++) {
+    mpc_ast_add_child(a, va_arg(va, mpc_ast_t*));
+  }
+  
+  va_end(va);
+  
+  return a;
+  
+}
+
+mpc_ast_t *mpc_ast_add_root(mpc_ast_t *a) {
+
+  mpc_ast_t *r;
+
+  if (!a) { return a; }
+  if (a->children_num == 0) { return a; }
+  if (a->children_num == 1) { return a; }
+
+  r = mpc_ast_new(">", "");
+  mpc_ast_add_child(r, a);
+  return r;
+}
+
+int mpc_ast_eq(mpc_ast_t *a, mpc_ast_t *b) {
+  
+  int i;
+
+  if (strcmp(a->tag, b->tag) != 0) { return 0; }
+  if (strcmp(a->contents, b->contents) != 0) { return 0; }
+  if (a->children_num != b->children_num) { return 0; }
+  
+  for (i = 0; i < a->children_num; i++) {
+    if (!mpc_ast_eq(a->children[i], b->children[i])) { return 0; }
+  }
+  
+  return 1;
+}
+
+mpc_ast_t *mpc_ast_add_child(mpc_ast_t *r, mpc_ast_t *a) {
+  r->children_num++;
+  r->children = realloc(r->children, sizeof(mpc_ast_t*) * r->children_num);
+  r->children[r->children_num-1] = a;
+  return r;
+}
+
+mpc_ast_t *mpc_ast_add_tag(mpc_ast_t *a, const char *t) {
+  if (!a) { return a; }
+  a->tag = realloc(a->tag, strlen(t) + 1 + strlen(a->tag) + 1);
+  memmove(a->tag + strlen(t) + 1, a->tag, strlen(a->tag)+1);
+  memmove(a->tag, t, strlen(t));
+  memmove(a->tag + strlen(t), "|", 1);
+  return a;
+}
+
+mpc_ast_t *mpc_ast_tag(mpc_ast_t *a, const char *t) {
+  a->tag = realloc(a->tag, strlen(t) + 1);
+  strcpy(a->tag, t);
+  return a;
+}
+
+mpc_ast_t *mpc_ast_state(mpc_ast_t *a, mpc_state_t s) {
+  if (!a) { return a; }
+  a->state = s;
+  return a;
+}
+
+static void mpc_ast_print_depth(mpc_ast_t *a, int d, FILE *fp) {
+  
+  int i;
+  
+  if (!a) {
+    fprintf(fp, "NULL\n");
+    return;
+  }
+  
+  for (i = 0; i < d; i++) { fprintf(fp, "  "); }
+  
+  if (strlen(a->contents)) {
+    fprintf(fp, "%s:%lu:%lu '%s'\n", a->tag, 
+      (long unsigned int)(a->state.row+1),
+      (long unsigned int)(a->state.col+1),
+      a->contents);
+  } else {
+    fprintf(fp, "%s \n", a->tag);
+  }
+  
+  for (i = 0; i < a->children_num; i++) {
+    mpc_ast_print_depth(a->children[i], d+1, fp);
+  }
+  
+}
+
+void mpc_ast_print(mpc_ast_t *a) {
+  mpc_ast_print_depth(a, 0, stdout);
+}
+
+void mpc_ast_print_to(mpc_ast_t *a, FILE *fp) {
+  mpc_ast_print_depth(a, 0, fp);
+}
+
+mpc_val_t *mpcf_fold_ast(int n, mpc_val_t **xs) {
+  
+  int i, j;
+  mpc_ast_t** as = (mpc_ast_t**)xs;
+  mpc_ast_t *r;
+  
+  if (n == 0) { return NULL; }
+  if (n == 1) { return xs[0]; }
+  if (n == 2 && !xs[1]) { return xs[0]; }
+  if (n == 2 && !xs[0]) { return xs[1]; }
+  
+  r = mpc_ast_new(">", "");
+  
+  for (i = 0; i < n; i++) {
+    
+    if (!as[i]) { continue; }
+    
+    if (as[i] && as[i]->children_num > 0) {
+      
+      for (j = 0; j < as[i]->children_num; j++) {
+        mpc_ast_add_child(r, as[i]->children[j]);
+      }
+      
+      mpc_ast_delete_no_children(as[i]);
+      
+    } else if (as[i] && as[i]->children_num == 0) {
+      mpc_ast_add_child(r, as[i]);
+    }
+  
+  }
+  
+  if (r->children_num) {
+    r->state = r->children[0]->state;
+  }
+  
+  return r;
+}
+
+mpc_val_t *mpcf_str_ast(mpc_val_t *c) {
+  mpc_ast_t *a = mpc_ast_new("", c);
+  free(c);
+  return a;
+}
+
+mpc_val_t *mpcf_state_ast(int n, mpc_val_t **xs) {
+  mpc_state_t *s = ((mpc_state_t**)xs)[0];
+  mpc_ast_t *a = ((mpc_ast_t**)xs)[1];
+  (void)n;
+  a = mpc_ast_state(a, *s);
+  free(s);
+  return a;
+}
+
+mpc_parser_t *mpca_state(mpc_parser_t *a) {
+  return mpc_and(2, mpcf_state_ast, mpc_state(), a, free);
+}
+
+mpc_parser_t *mpca_tag(mpc_parser_t *a, const char *t) {
+  return mpc_apply_to(a, (mpc_apply_to_t)mpc_ast_tag, (void*)t);
+}
+
+mpc_parser_t *mpca_add_tag(mpc_parser_t *a, const char *t) {
+  return mpc_apply_to(a, (mpc_apply_to_t)mpc_ast_add_tag, (void*)t);
+}
+
+mpc_parser_t *mpca_root(mpc_parser_t *a) {
+  return mpc_apply(a, (mpc_apply_t)mpc_ast_add_root);
+}
+
+mpc_parser_t *mpca_not(mpc_parser_t *a) { return mpc_not(a, (mpc_dtor_t)mpc_ast_delete); }
+mpc_parser_t *mpca_maybe(mpc_parser_t *a) { return mpc_maybe(a); }
+mpc_parser_t *mpca_many(mpc_parser_t *a) { return mpc_many(mpcf_fold_ast, a); }
+mpc_parser_t *mpca_many1(mpc_parser_t *a) { return mpc_many1(mpcf_fold_ast, a); }
+mpc_parser_t *mpca_count(int n, mpc_parser_t *a) { return mpc_count(n, mpcf_fold_ast, a, (mpc_dtor_t)mpc_ast_delete); }
+
+mpc_parser_t *mpca_or(int n, ...) {
+
+  int i;
+  va_list va;
+
+  mpc_parser_t *p = mpc_undefined();
+  
+  p->type = MPC_TYPE_OR;
+  p->data.or.n = n;
+  p->data.or.xs = malloc(sizeof(mpc_parser_t*) * n);
+  
+  va_start(va, n);  
+  for (i = 0; i < n; i++) {
+    p->data.or.xs[i] = va_arg(va, mpc_parser_t*);
+  }
+  va_end(va);
+  
+  return p;
+  
+}
+
+mpc_parser_t *mpca_and(int n, ...) {
+  
+  int i;
+  va_list va;
+  
+  mpc_parser_t *p = mpc_undefined();
+  
+  p->type = MPC_TYPE_AND;
+  p->data.and.n = n;
+  p->data.and.f = mpcf_fold_ast;
+  p->data.and.xs = malloc(sizeof(mpc_parser_t*) * n);
+  p->data.and.dxs = malloc(sizeof(mpc_dtor_t) * (n-1));
+  
+  va_start(va, n);
+  for (i = 0; i < n; i++) {
+    p->data.and.xs[i] = va_arg(va, mpc_parser_t*);
+  }
+  for (i = 0; i < (n-1); i++) {
+    p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete;
+  }    
+  va_end(va);
+  
+  return p;  
+}
+
+mpc_parser_t *mpca_total(mpc_parser_t *a) { return mpc_total(a, (mpc_dtor_t)mpc_ast_delete); }
+
+/*
+** Grammar Parser
+*/
+
+/*
+** This is another interesting bootstrapping.
+**
+** Having a general purpose AST type allows
+** users to specify the grammar alone and
+** let all fold rules be automatically taken
+** care of by existing functions.
+**
+** You don't get to control the type spat
+** out but this means you can make a nice
+** parser to take in some grammar in nice
+** syntax and spit out a parser that works.
+**
+** The grammar for this looks surprisingly
+** like regex but the main difference is that
+** it is now whitespace insensitive and the
+** base type takes literals of some form.
+*/
+
+/*
+**
+**  ### Grammar Grammar
+**
+**      <grammar> : (<term> "|" <grammar>) | <term>
+**     
+**      <term> : <factor>*
+**
+**      <factor> : <base>
+**               | <base> "*"
+**               | <base> "+"
+**               | <base> "?"
+**               | <base> "{" <digits> "}"
+**           
+**      <base> : "<" (<digits> | <ident>) ">"
+**             | <string_lit>
+**             | <char_lit>
+**             | <regex_lit>
+**             | "(" <grammar> ")"
+*/
+
+typedef struct {
+  va_list *va;
+  int parsers_num;
+  mpc_parser_t **parsers;
+  int flags;
+} mpca_grammar_st_t;
+
+static mpc_val_t *mpcaf_grammar_or(int n, mpc_val_t **xs) {
+  (void) n;
+  if (!xs[1]) { return xs[0]; }
+  else { return mpca_or(2, xs[0], xs[1]); }
+}
+
+static mpc_val_t *mpcaf_grammar_and(int n, mpc_val_t **xs) {
+  int i;
+  mpc_parser_t *p = mpc_pass();  
+  for (i = 0; i < n; i++) {
+    if (xs[i] != NULL) { p = mpca_and(2, p, xs[i]); }
+  }
+  return p;
+}
+
+static mpc_val_t *mpcaf_grammar_repeat(int n, mpc_val_t **xs) { 
+  int num;
+  (void) n;
+  if (!xs[1]) { return xs[0]; }  
+  if (strcmp(xs[1], "*") == 0) { free(xs[1]); return mpca_many(xs[0]); }
+  if (strcmp(xs[1], "+") == 0) { free(xs[1]); return mpca_many1(xs[0]); }
+  if (strcmp(xs[1], "?") == 0) { free(xs[1]); return mpca_maybe(xs[0]); }
+  if (strcmp(xs[1], "!") == 0) { free(xs[1]); return mpca_not(xs[0]); }
+  num = *((int*)xs[1]);
+  free(xs[1]);
+  return mpca_count(num, xs[0]);
+}
+
+static mpc_val_t *mpcaf_grammar_string(mpc_val_t *x, void *s) {
+  mpca_grammar_st_t *st = s;
+  char *y = mpcf_unescape(x);
+  mpc_parser_t *p = (st->flags & MPCA_LANG_WHITESPACE_SENSITIVE) ? mpc_string(y) : mpc_tok(mpc_string(y));
+  free(y);
+  return mpca_state(mpca_tag(mpc_apply(p, mpcf_str_ast), "string"));
+}
+
+static mpc_val_t *mpcaf_grammar_char(mpc_val_t *x, void *s) {
+  mpca_grammar_st_t *st = s;
+  char *y = mpcf_unescape(x);
+  mpc_parser_t *p = (st->flags & MPCA_LANG_WHITESPACE_SENSITIVE) ? mpc_char(y[0]) : mpc_tok(mpc_char(y[0]));
+  free(y);
+  return mpca_state(mpca_tag(mpc_apply(p, mpcf_str_ast), "char"));
+}
+
+static mpc_val_t *mpcaf_grammar_regex(mpc_val_t *x, void *s) {
+  mpca_grammar_st_t *st = s;
+  char *y = mpcf_unescape_regex(x);
+  mpc_parser_t *p = (st->flags & MPCA_LANG_WHITESPACE_SENSITIVE) ? mpc_re(y) : mpc_tok(mpc_re(y));
+  free(y);
+  return mpca_state(mpca_tag(mpc_apply(p, mpcf_str_ast), "regex"));
+}
+
+/* Should this just use `isdigit` instead? */
+static int is_number(const char* s) {
+  size_t i;
+  for (i = 0; i < strlen(s); i++) { if (!strchr("0123456789", s[i])) { return 0; } }
+  return 1;
+}
+
+static mpc_parser_t *mpca_grammar_find_parser(char *x, mpca_grammar_st_t *st) {
+  
+  int i;
+  mpc_parser_t *p;
+  
+  /* Case of Number */
+  if (is_number(x)) {
+
+    i = strtol(x, NULL, 10);
+    
+    while (st->parsers_num <= i) {
+      st->parsers_num++;
+      st->parsers = realloc(st->parsers, sizeof(mpc_parser_t*) * st->parsers_num);
+      st->parsers[st->parsers_num-1] = va_arg(*st->va, mpc_parser_t*);
+      if (!st->parsers[st->parsers_num-1]) {
+        return mpc_failf("No Parser in position %i! Only supplied %i Parsers!", i, st->parsers_num);
+      }
+    }
+    
+    return st->parsers[st->parsers_num-1];
+  
+  /* Case of Identifier */
+  } else {
+    
+    /* Search Existing Parsers */
+    for (i = 0; i < st->parsers_num; i++) {
+      mpc_parser_t *q = st->parsers[i];
+      if (!q) { return mpc_failf("Unknown Parser '%s'!", x); }
+      if (q->name && strcmp(q->name, x) == 0) { return q; }
+    }
+    
+    /* Search New Parsers */
+    while (1) {
+    
+      p = va_arg(*st->va, mpc_parser_t*);
+      
+      st->parsers_num++;
+      st->parsers = realloc(st->parsers, sizeof(mpc_parser_t*) * st->parsers_num);
+      st->parsers[st->parsers_num-1] = p;
+      
+      if (!p) { return mpc_failf("Unknown Parser '%s'!", x); }
+      if (p->name && strcmp(p->name, x) == 0) { return p; }
+      
+    }
+  
+  }  
+  
+}
+
+static mpc_val_t *mpcaf_grammar_id(mpc_val_t *x, void *s) {
+  
+  mpca_grammar_st_t *st = s;
+  mpc_parser_t *p = mpca_grammar_find_parser(x, st);
+  free(x);
+
+  if (p->name) {
+    return mpca_state(mpca_root(mpca_add_tag(p, p->name)));
+  } else {
+    return mpca_state(mpca_root(p));
+  }
+}
+
+mpc_parser_t *mpca_grammar_st(const char *grammar, mpca_grammar_st_t *st) {
+  
+  char *err_msg;
+  mpc_parser_t *err_out;
+  mpc_result_t r;
+  mpc_parser_t *GrammarTotal, *Grammar, *Term, *Factor, *Base;
+  
+  GrammarTotal = mpc_new("grammar_total");
+  Grammar = mpc_new("grammar");
+  Term = mpc_new("term");
+  Factor = mpc_new("factor");
+  Base = mpc_new("base");
+  
+  mpc_define(GrammarTotal,
+    mpc_predictive(mpc_total(Grammar, mpc_soft_delete))
+  );
+  
+  mpc_define(Grammar, mpc_and(2, mpcaf_grammar_or,
+    Term,
+    mpc_maybe(mpc_and(2, mpcf_snd_free, mpc_sym("|"), Grammar, free)),
+    mpc_soft_delete
+  ));
+  
+  mpc_define(Term, mpc_many1(mpcaf_grammar_and, Factor));
+  
+  mpc_define(Factor, mpc_and(2, mpcaf_grammar_repeat,
+    Base,
+      mpc_or(6,
+        mpc_sym("*"),
+        mpc_sym("+"),
+        mpc_sym("?"),
+        mpc_sym("!"),
+        mpc_tok_brackets(mpc_int(), free),
+        mpc_pass()),
+    mpc_soft_delete
+  ));
+  
+  mpc_define(Base, mpc_or(5,
+    mpc_apply_to(mpc_tok(mpc_string_lit()), mpcaf_grammar_string, st),
+    mpc_apply_to(mpc_tok(mpc_char_lit()),   mpcaf_grammar_char, st),
+    mpc_apply_to(mpc_tok(mpc_regex_lit()),  mpcaf_grammar_regex, st),
+    mpc_apply_to(mpc_tok_braces(mpc_or(2, mpc_digits(), mpc_ident()), free), mpcaf_grammar_id, st),
+    mpc_tok_parens(Grammar, mpc_soft_delete)
+  ));
+  
+  mpc_optimise(GrammarTotal);
+  mpc_optimise(Grammar);
+  mpc_optimise(Factor);
+  mpc_optimise(Term);
+  mpc_optimise(Base);
+  
+  if(!mpc_parse("<mpc_grammar_compiler>", grammar, GrammarTotal, &r)) {
+    err_msg = mpc_err_string(r.error);
+    err_out = mpc_failf("Invalid Grammar: %s", err_msg);
+    mpc_err_delete(r.error);
+    free(err_msg);
+    r.output = err_out;
+  }
+  
+  mpc_cleanup(5, GrammarTotal, Grammar, Term, Factor, Base);
+  
+  mpc_optimise(r.output);
+  
+  return (st->flags & MPCA_LANG_PREDICTIVE) ? mpc_predictive(r.output) : r.output;
+  
+}
+
+mpc_parser_t *mpca_grammar(int flags, const char *grammar, ...) {
+  mpca_grammar_st_t st;
+  mpc_parser_t *res;
+  va_list va;
+  va_start(va, grammar);
+  
+  st.va = &va;
+  st.parsers_num = 0;
+  st.parsers = NULL;
+  st.flags = flags;
+  
+  res = mpca_grammar_st(grammar, &st);  
+  free(st.parsers);
+  va_end(va);
+  return res;
+}
+
+typedef struct {
+  char *ident;
+  char *name;
+  mpc_parser_t *grammar;
+} mpca_stmt_t;
+
+static mpc_val_t *mpca_stmt_afold(int n, mpc_val_t **xs) {
+  mpca_stmt_t *stmt = malloc(sizeof(mpca_stmt_t));
+  stmt->ident = ((char**)xs)[0];
+  stmt->name = ((char**)xs)[1];
+  stmt->grammar = ((mpc_parser_t**)xs)[3];
+  (void) n;
+  free(((char**)xs)[2]);
+  free(((char**)xs)[4]);
+  
+  return stmt;
+}
+
+static mpc_val_t *mpca_stmt_fold(int n, mpc_val_t **xs) {
+  
+  int i;
+  mpca_stmt_t **stmts = malloc(sizeof(mpca_stmt_t*) * (n+1));
+  
+  for (i = 0; i < n; i++) {
+    stmts[i] = xs[i];
+  }
+  stmts[n] = NULL;  
+  
+  return stmts;
+}
+
+static void mpca_stmt_list_delete(mpc_val_t *x) {
+
+  mpca_stmt_t **stmts = x;
+
+  while(*stmts) {
+    mpca_stmt_t *stmt = *stmts; 
+    free(stmt->ident);
+    free(stmt->name);
+    mpc_soft_delete(stmt->grammar);
+    free(stmt);  
+    stmts++;
+  }
+  free(x);
+
+}
+
+static mpc_val_t *mpca_stmt_list_apply_to(mpc_val_t *x, void *s) {
+
+  mpca_grammar_st_t *st = s;
+  mpca_stmt_t *stmt;
+  mpca_stmt_t **stmts = x;
+  mpc_parser_t *left;
+
+  while(*stmts) {
+    stmt = *stmts;
+    left = mpca_grammar_find_parser(stmt->ident, st);
+    if (st->flags & MPCA_LANG_PREDICTIVE) { stmt->grammar = mpc_predictive(stmt->grammar); }
+    if (stmt->name) { stmt->grammar = mpc_expect(stmt->grammar, stmt->name); }
+    mpc_optimise(stmt->grammar);
+    mpc_define(left, stmt->grammar);
+    free(stmt->ident);
+    free(stmt->name);
+    free(stmt);
+    stmts++;
+  }
+  
+  free(x);
+  
+  return NULL;
+}
+
+static mpc_err_t *mpca_lang_st(mpc_input_t *i, mpca_grammar_st_t *st) {
+  
+  mpc_result_t r;
+  mpc_err_t *e;
+  mpc_parser_t *Lang, *Stmt, *Grammar, *Term, *Factor, *Base; 
+  
+  Lang    = mpc_new("lang");
+  Stmt    = mpc_new("stmt");
+  Grammar = mpc_new("grammar");
+  Term    = mpc_new("term");
+  Factor  = mpc_new("factor");
+  Base    = mpc_new("base");
+  
+  mpc_define(Lang, mpc_apply_to(
+    mpc_total(mpc_predictive(mpc_many(mpca_stmt_fold, Stmt)), mpca_stmt_list_delete),
+    mpca_stmt_list_apply_to, st
+  ));
+  
+  mpc_define(Stmt, mpc_and(5, mpca_stmt_afold,
+    mpc_tok(mpc_ident()), mpc_maybe(mpc_tok(mpc_string_lit())), mpc_sym(":"), Grammar, mpc_sym(";"),
+    free, free, free, mpc_soft_delete
+  ));
+  
+  mpc_define(Grammar, mpc_and(2, mpcaf_grammar_or,
+      Term,
+      mpc_maybe(mpc_and(2, mpcf_snd_free, mpc_sym("|"), Grammar, free)),
+      mpc_soft_delete
+  ));
+  
+  mpc_define(Term, mpc_many1(mpcaf_grammar_and, Factor));
+  
+  mpc_define(Factor, mpc_and(2, mpcaf_grammar_repeat,
+    Base,
+      mpc_or(6,
+        mpc_sym("*"),
+        mpc_sym("+"),
+        mpc_sym("?"),
+        mpc_sym("!"),
+        mpc_tok_brackets(mpc_int(), free),
+        mpc_pass()),
+    mpc_soft_delete
+  ));
+  
+  mpc_define(Base, mpc_or(5,
+    mpc_apply_to(mpc_tok(mpc_string_lit()), mpcaf_grammar_string, st),
+    mpc_apply_to(mpc_tok(mpc_char_lit()),   mpcaf_grammar_char, st),
+    mpc_apply_to(mpc_tok(mpc_regex_lit()),  mpcaf_grammar_regex, st),
+    mpc_apply_to(mpc_tok_braces(mpc_or(2, mpc_digits(), mpc_ident()), free), mpcaf_grammar_id, st),
+    mpc_tok_parens(Grammar, mpc_soft_delete)
+  ));
+  
+  mpc_optimise(Lang);
+  mpc_optimise(Stmt);
+  mpc_optimise(Grammar);
+  mpc_optimise(Term);
+  mpc_optimise(Factor);
+  mpc_optimise(Base);
+  
+  if (!mpc_parse_input(i, Lang, &r)) {
+    e = r.error;
+  } else {
+    e = NULL;
+  }
+  
+  mpc_cleanup(6, Lang, Stmt, Grammar, Term, Factor, Base);
+  
+  return e;
+}
+
+mpc_err_t *mpca_lang_file(int flags, FILE *f, ...) {
+  mpca_grammar_st_t st;
+  mpc_input_t *i;
+  mpc_err_t *err;
+
+  va_list va;  
+  va_start(va, f);
+  
+  st.va = &va;
+  st.parsers_num = 0;
+  st.parsers = NULL;
+  st.flags = flags;
+  
+  i = mpc_input_new_file("<mpca_lang_file>", f);
+  err = mpca_lang_st(i, &st);
+  mpc_input_delete(i);
+  
+  free(st.parsers);
+  va_end(va);
+  return err;
+}
+
+mpc_err_t *mpca_lang_pipe(int flags, FILE *p, ...) {
+  mpca_grammar_st_t st;
+  mpc_input_t *i;
+  mpc_err_t *err;
+
+  va_list va;  
+  va_start(va, p);
+  
+  st.va = &va;
+  st.parsers_num = 0;
+  st.parsers = NULL;
+  st.flags = flags;
+  
+  i = mpc_input_new_pipe("<mpca_lang_pipe>", p);
+  err = mpca_lang_st(i, &st);
+  mpc_input_delete(i);
+  
+  free(st.parsers);
+  va_end(va);
+  return err;
+}
+
+mpc_err_t *mpca_lang(int flags, const char *language, ...) {
+  
+  mpca_grammar_st_t st;
+  mpc_input_t *i;
+  mpc_err_t *err;
+  
+  va_list va;  
+  va_start(va, language);
+  
+  st.va = &va;
+  st.parsers_num = 0;
+  st.parsers = NULL;
+  st.flags = flags;
+  
+  i = mpc_input_new_string("<mpca_lang>", language);
+  err = mpca_lang_st(i, &st);
+  mpc_input_delete(i);
+  
+  free(st.parsers);
+  va_end(va);
+  return err;
+}
+
+mpc_err_t *mpca_lang_contents(int flags, const char *filename, ...) {
+  
+  mpca_grammar_st_t st;
+  mpc_input_t *i;
+  mpc_err_t *err;
+  
+  va_list va;
+
+  FILE *f = fopen(filename, "rb");
+  
+  if (!f) {
+    err = mpc_err_file(filename, "Unable to open file!");
+    return err;
+  }
+  
+  va_start(va, filename);
+  
+  st.va = &va;
+  st.parsers_num = 0;
+  st.parsers = NULL;
+  st.flags = flags;
+  
+  i = mpc_input_new_file(filename, f);
+  err = mpca_lang_st(i, &st);
+  mpc_input_delete(i);
+  
+  free(st.parsers);
+  va_end(va);  
+  
+  fclose(f);
+  
+  return err;
+}
+
+static int mpc_nodecount_unretained(mpc_parser_t* p, int force) {
+
+  int i, total;
+
+  if (p->retained && !force) { return 0; }
+
+  if (p->type == MPC_TYPE_EXPECT) { return 1 + mpc_nodecount_unretained(p->data.expect.x, 0); }
+
+  if (p->type == MPC_TYPE_APPLY)    { return 1 + mpc_nodecount_unretained(p->data.apply.x, 0); }
+  if (p->type == MPC_TYPE_APPLY_TO) { return 1 + mpc_nodecount_unretained(p->data.apply_to.x, 0); }
+  if (p->type == MPC_TYPE_PREDICT)  { return 1 + mpc_nodecount_unretained(p->data.predict.x, 0); }
+
+  if (p->type == MPC_TYPE_NOT)   { return 1 + mpc_nodecount_unretained(p->data.not.x, 0); }
+  if (p->type == MPC_TYPE_MAYBE) { return 1 + mpc_nodecount_unretained(p->data.not.x, 0); }
+
+  if (p->type == MPC_TYPE_MANY)  { return 1 + mpc_nodecount_unretained(p->data.repeat.x, 0); }
+  if (p->type == MPC_TYPE_MANY1) { return 1 + mpc_nodecount_unretained(p->data.repeat.x, 0); }
+  if (p->type == MPC_TYPE_COUNT) { return 1 + mpc_nodecount_unretained(p->data.repeat.x, 0); }
+
+  if (p->type == MPC_TYPE_OR) { 
+    total = 0;
+    for(i = 0; i < p->data.or.n; i++) {
+      total += mpc_nodecount_unretained(p->data.or.xs[i], 0);
+    }
+    return total;
+  }
+  
+  if (p->type == MPC_TYPE_AND) {
+    total = 0;
+    for(i = 0; i < p->data.and.n; i++) {
+      total += mpc_nodecount_unretained(p->data.and.xs[i], 0);
+    }
+    return total;
+  }
+
+  return 1;
+  
+}
+
+void mpc_stats(mpc_parser_t* p) {
+  printf("Stats\n");
+  printf("=====\n");
+  printf("Node Count: %i\n", mpc_nodecount_unretained(p, 1));
+}
+
+static void mpc_optimise_unretained(mpc_parser_t *p, int force) {
+  
+  int i, n, m;
+  mpc_parser_t *t;
+  
+  if (p->retained && !force) { return; }
+  
+  /* Optimise Subexpressions */
+  
+  if (p->type == MPC_TYPE_EXPECT)   { mpc_optimise_unretained(p->data.expect.x, 0); }
+  if (p->type == MPC_TYPE_APPLY)    { mpc_optimise_unretained(p->data.apply.x, 0); }
+  if (p->type == MPC_TYPE_APPLY_TO) { mpc_optimise_unretained(p->data.apply_to.x, 0); }
+  if (p->type == MPC_TYPE_PREDICT)  { mpc_optimise_unretained(p->data.predict.x, 0); }
+  if (p->type == MPC_TYPE_NOT)      { mpc_optimise_unretained(p->data.not.x, 0); }
+  if (p->type == MPC_TYPE_MAYBE)    { mpc_optimise_unretained(p->data.not.x, 0); }
+  if (p->type == MPC_TYPE_MANY)     { mpc_optimise_unretained(p->data.repeat.x, 0); }
+  if (p->type == MPC_TYPE_MANY1)    { mpc_optimise_unretained(p->data.repeat.x, 0); }
+  if (p->type == MPC_TYPE_COUNT)    { mpc_optimise_unretained(p->data.repeat.x, 0); }
+  
+  if (p->type == MPC_TYPE_OR) { 
+    for(i = 0; i < p->data.or.n; i++) {
+      mpc_optimise_unretained(p->data.or.xs[i], 0);
+    }
+  }
+  
+  if (p->type == MPC_TYPE_AND) {
+    for(i = 0; i < p->data.and.n; i++) {
+      mpc_optimise_unretained(p->data.and.xs[i], 0);
+    }
+  }  
+  
+  /* Perform optimisations */
+  
+  while (1) {
+    
+    /* Merge rhs `or` */
+    if (p->type == MPC_TYPE_OR
+    &&  p->data.or.xs[p->data.or.n-1]->type == MPC_TYPE_OR
+    && !p->data.or.xs[p->data.or.n-1]->retained) {
+      t = p->data.or.xs[p->data.or.n-1];
+      n = p->data.or.n; m = t->data.or.n;
+      p->data.or.n = n + m - 1;
+      p->data.or.xs = realloc(p->data.or.xs, sizeof(mpc_parser_t*) * (n + m -1));
+      memmove(p->data.or.xs + n - 1, t->data.or.xs, m * sizeof(mpc_parser_t*));
+      free(t->data.or.xs); free(t->name); free(t);
+      continue;
+    }
+
+    /* Merge lhs `or` */
+    if (p->type == MPC_TYPE_OR
+    &&  p->data.or.xs[0]->type == MPC_TYPE_OR
+    && !p->data.or.xs[0]->retained) {
+      t = p->data.or.xs[0];
+      n = p->data.or.n; m = t->data.or.n;
+      p->data.or.n = n + m - 1;
+      p->data.or.xs = realloc(p->data.or.xs, sizeof(mpc_parser_t*) * (n + m -1));
+      memmove(p->data.or.xs + m, t->data.or.xs + 1, n * sizeof(mpc_parser_t*));
+      memmove(p->data.or.xs, t->data.or.xs, m * sizeof(mpc_parser_t*));
+      free(t->data.or.xs); free(t->name); free(t);
+      continue;
+    }
+    
+    /* Remove ast `pass` */
+    if (p->type == MPC_TYPE_AND
+    &&  p->data.and.n == 2
+    &&  p->data.and.xs[0]->type == MPC_TYPE_PASS
+    && !p->data.and.xs[0]->retained
+    &&  p->data.and.f == mpcf_fold_ast) {
+      t = p->data.and.xs[1];
+      mpc_delete(p->data.and.xs[0]);
+      free(p->data.and.xs); free(p->data.and.dxs); free(p->name);
+      memcpy(p, t, sizeof(mpc_parser_t));
+      free(t);
+      continue;
+    }
+    
+    /* Merge ast lhs `and` */
+    if (p->type == MPC_TYPE_AND
+    &&  p->data.and.f == mpcf_fold_ast
+    &&  p->data.and.xs[0]->type == MPC_TYPE_AND
+    && !p->data.and.xs[0]->retained
+    &&  p->data.and.xs[0]->data.and.f == mpcf_fold_ast) {
+      t = p->data.and.xs[0];
+      n = p->data.and.n; m = t->data.and.n;
+      p->data.and.n = n + m - 1;
+      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m - 1));
+      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
+      memmove(p->data.and.xs + m, p->data.and.xs + 1, (n - 1) * sizeof(mpc_parser_t*));
+      memmove(p->data.and.xs, t->data.and.xs, m * sizeof(mpc_parser_t*));
+      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete; }
+      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
+      continue;
+    }
+    
+    /* Merge ast rhs `and` */
+    if (p->type == MPC_TYPE_AND
+    &&  p->data.and.f == mpcf_fold_ast
+    &&  p->data.and.xs[p->data.and.n-1]->type == MPC_TYPE_AND
+    && !p->data.and.xs[p->data.and.n-1]->retained
+    &&  p->data.and.xs[p->data.and.n-1]->data.and.f == mpcf_fold_ast) {
+      t = p->data.and.xs[p->data.and.n-1];
+      n = p->data.and.n; m = t->data.and.n;
+      p->data.and.n = n + m - 1;
+      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
+      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
+      memmove(p->data.and.xs + n - 1, t->data.and.xs, m * sizeof(mpc_parser_t*));
+      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = (mpc_dtor_t)mpc_ast_delete; }
+      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
+      continue;
+    }
+
+    /* Remove re `lift` */
+    if (p->type == MPC_TYPE_AND
+    &&  p->data.and.n == 2
+    &&  p->data.and.xs[0]->type == MPC_TYPE_LIFT
+    &&  p->data.and.xs[0]->data.lift.lf == mpcf_ctor_str
+    && !p->data.and.xs[0]->retained
+    &&  p->data.and.f == mpcf_strfold) {
+      t = p->data.and.xs[1];
+      mpc_delete(p->data.and.xs[0]);
+      free(p->data.and.xs); free(p->data.and.dxs); free(p->name);
+      memcpy(p, t, sizeof(mpc_parser_t));
+      free(t);
+      continue;
+    }
+
+    /* Merge re lhs `and` */
+    if (p->type == MPC_TYPE_AND
+    &&  p->data.and.f == mpcf_strfold
+    &&  p->data.and.xs[0]->type == MPC_TYPE_AND
+    && !p->data.and.xs[0]->retained
+    &&  p->data.and.xs[0]->data.and.f == mpcf_strfold) {
+      t = p->data.and.xs[0];
+      n = p->data.and.n; m = t->data.and.n;
+      p->data.and.n = n + m - 1;
+      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m - 1));
+      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
+      memmove(p->data.and.xs + m, p->data.and.xs + 1, (n - 1) * sizeof(mpc_parser_t*));
+      memmove(p->data.and.xs, t->data.and.xs, m * sizeof(mpc_parser_t*));
+      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = free; }
+      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
+      continue;
+    }
+    
+    /* Merge re rhs `and` */
+    if (p->type == MPC_TYPE_AND
+    &&  p->data.and.f == mpcf_strfold
+    &&  p->data.and.xs[p->data.and.n-1]->type == MPC_TYPE_AND
+    && !p->data.and.xs[p->data.and.n-1]->retained
+    &&  p->data.and.xs[p->data.and.n-1]->data.and.f == mpcf_strfold) {
+      t = p->data.and.xs[p->data.and.n-1];
+      n = p->data.and.n; m = t->data.and.n;
+      p->data.and.n = n + m - 1;
+      p->data.and.xs = realloc(p->data.and.xs, sizeof(mpc_parser_t*) * (n + m -1));
+      p->data.and.dxs = realloc(p->data.and.dxs, sizeof(mpc_dtor_t) * (n + m - 1 - 1));
+      memmove(p->data.and.xs + n - 1, t->data.and.xs, m * sizeof(mpc_parser_t*));
+      for (i = 0; i < p->data.and.n-1; i++) { p->data.and.dxs[i] = free; }
+      free(t->data.and.xs); free(t->data.and.dxs); free(t->name); free(t); 
+      continue;
+    }
+    
+    return;
+    
+  }
+  
+}
+
+void mpc_optimise(mpc_parser_t *p) {
+  mpc_optimise_unretained(p, 1);
+}
+
diff -Nru radare2-2.3.0+dfsg/libr/egg/rlcc/mpc/mpc.h radare2-2.8.0+dfsg/libr/egg/rlcc/mpc/mpc.h
--- radare2-2.3.0+dfsg/libr/egg/rlcc/mpc/mpc.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/egg/rlcc/mpc/mpc.h	2018-08-07 14:12:36.000000000 +0000
@@ -1,338 +1,338 @@
-/*
-** mpc - Micro Parser Combinator library for C
-**
-** https://github.com/orangeduck/mpc
-**
-** Daniel Holden - contact@daniel-holden.com
-** Licensed under BSD3
-*/
-
-#ifndef mpc_h
-#define mpc_h
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-#include <ctype.h>
-
-/*
-** State Type
-*/
-
-typedef struct {
-  long pos;
-  long row;
-  long col;
-} mpc_state_t;
-
-/*
-** Error Type
-*/
-
-typedef struct {
-  mpc_state_t state;
-  int expected_num;
-  char *filename;
-  char *failure;
-  char **expected;
-  char recieved;
-} mpc_err_t;
-
-void mpc_err_delete(mpc_err_t *e);
-char *mpc_err_string(mpc_err_t *e);
-void mpc_err_print(mpc_err_t *e);
-void mpc_err_print_to(mpc_err_t *e, FILE *f);
-
-/*
-** Parsing
-*/
-
-typedef void mpc_val_t;
-
-typedef union {
-  mpc_err_t *error;
-  mpc_val_t *output;
-} mpc_result_t;
-
-struct mpc_parser_t;
-typedef struct mpc_parser_t mpc_parser_t;
-
-int mpc_parse(const char *filename, const char *string, mpc_parser_t *p, mpc_result_t *r);
-int mpc_parse_file(const char *filename, FILE *file, mpc_parser_t *p, mpc_result_t *r);
-int mpc_parse_pipe(const char *filename, FILE *pipe, mpc_parser_t *p, mpc_result_t *r);
-int mpc_parse_contents(const char *filename, mpc_parser_t *p, mpc_result_t *r);
-
-/*
-** Function Types
-*/
-
-typedef void(*mpc_dtor_t)(mpc_val_t*);
-typedef mpc_val_t*(*mpc_ctor_t)(void);
-
-typedef mpc_val_t*(*mpc_apply_t)(mpc_val_t*);
-typedef mpc_val_t*(*mpc_apply_to_t)(mpc_val_t*,void*);
-typedef mpc_val_t*(*mpc_fold_t)(int,mpc_val_t**);
-
-/*
-** Building a Parser
-*/
-
-mpc_parser_t *mpc_new(const char *name);
-mpc_parser_t *mpc_copy(mpc_parser_t *a);
-mpc_parser_t *mpc_define(mpc_parser_t *p, mpc_parser_t *a);
-mpc_parser_t *mpc_undefine(mpc_parser_t *p);
-
-void mpc_delete(mpc_parser_t *p);
-void mpc_cleanup(int n, ...);
-
-/*
-** Basic Parsers
-*/
-
-mpc_parser_t *mpc_any(void);
-mpc_parser_t *mpc_char(char c);
-mpc_parser_t *mpc_range(char s, char e);
-mpc_parser_t *mpc_oneof(const char *s);
-mpc_parser_t *mpc_noneof(const char *s);
-mpc_parser_t *mpc_satisfy(int(*f)(char));
-mpc_parser_t *mpc_string(const char *s);
-
-/*
-** Other Parsers
-*/
-
-mpc_parser_t *mpc_pass(void);
-mpc_parser_t *mpc_fail(const char *m);
-mpc_parser_t *mpc_failf(const char *fmt, ...);
-mpc_parser_t *mpc_lift(mpc_ctor_t f);
-mpc_parser_t *mpc_lift_val(mpc_val_t *x);
-mpc_parser_t *mpc_anchor(int(*f)(char,char));
-mpc_parser_t *mpc_state(void);
-
-/*
-** Combinator Parsers
-*/
-
-mpc_parser_t *mpc_expect(mpc_parser_t *a, const char *e);
-mpc_parser_t *mpc_expectf(mpc_parser_t *a, const char *fmt, ...);
-mpc_parser_t *mpc_apply(mpc_parser_t *a, mpc_apply_t f);
-mpc_parser_t *mpc_apply_to(mpc_parser_t *a, mpc_apply_to_t f, void *x);
-
-mpc_parser_t *mpc_not(mpc_parser_t *a, mpc_dtor_t da);
-mpc_parser_t *mpc_not_lift(mpc_parser_t *a, mpc_dtor_t da, mpc_ctor_t lf);
-mpc_parser_t *mpc_maybe(mpc_parser_t *a);
-mpc_parser_t *mpc_maybe_lift(mpc_parser_t *a, mpc_ctor_t lf);
-
-mpc_parser_t *mpc_many(mpc_fold_t f, mpc_parser_t *a);
-mpc_parser_t *mpc_many1(mpc_fold_t f, mpc_parser_t *a);
-mpc_parser_t *mpc_count(int n, mpc_fold_t f, mpc_parser_t *a, mpc_dtor_t da);
-
-mpc_parser_t *mpc_or(int n, ...);
-mpc_parser_t *mpc_and(int n, mpc_fold_t f, ...);
-
-mpc_parser_t *mpc_predictive(mpc_parser_t *a);
-
-/*
-** Common Parsers
-*/
-
-mpc_parser_t *mpc_eoi(void);
-mpc_parser_t *mpc_soi(void);
-
-mpc_parser_t *mpc_boundary(void);
-
-mpc_parser_t *mpc_whitespace(void);
-mpc_parser_t *mpc_whitespaces(void);
-mpc_parser_t *mpc_blank(void);
-
-mpc_parser_t *mpc_newline(void);
-mpc_parser_t *mpc_tab(void);
-mpc_parser_t *mpc_escape(void);
-
-mpc_parser_t *mpc_digit(void);
-mpc_parser_t *mpc_hexdigit(void);
-mpc_parser_t *mpc_octdigit(void);
-mpc_parser_t *mpc_digits(void);
-mpc_parser_t *mpc_hexdigits(void);
-mpc_parser_t *mpc_octdigits(void);
-
-mpc_parser_t *mpc_lower(void);
-mpc_parser_t *mpc_upper(void);
-mpc_parser_t *mpc_alpha(void);
-mpc_parser_t *mpc_underscore(void);
-mpc_parser_t *mpc_alphanum(void);
-
-mpc_parser_t *mpc_int(void);
-mpc_parser_t *mpc_hex(void);
-mpc_parser_t *mpc_oct(void);
-mpc_parser_t *mpc_number(void);
-
-mpc_parser_t *mpc_real(void);
-mpc_parser_t *mpc_float(void);
-
-mpc_parser_t *mpc_char_lit(void);
-mpc_parser_t *mpc_string_lit(void);
-mpc_parser_t *mpc_regex_lit(void);
-
-mpc_parser_t *mpc_ident(void);
-
-/*
-** Useful Parsers
-*/
-
-mpc_parser_t *mpc_startwith(mpc_parser_t *a);
-mpc_parser_t *mpc_endwith(mpc_parser_t *a, mpc_dtor_t da);
-mpc_parser_t *mpc_whole(mpc_parser_t *a, mpc_dtor_t da);
-
-mpc_parser_t *mpc_stripl(mpc_parser_t *a);
-mpc_parser_t *mpc_stripr(mpc_parser_t *a);
-mpc_parser_t *mpc_strip(mpc_parser_t *a);
-mpc_parser_t *mpc_tok(mpc_parser_t *a); 
-mpc_parser_t *mpc_sym(const char *s);
-mpc_parser_t *mpc_total(mpc_parser_t *a, mpc_dtor_t da);
-
-mpc_parser_t *mpc_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c);
-mpc_parser_t *mpc_parens(mpc_parser_t *a, mpc_dtor_t ad);
-mpc_parser_t *mpc_braces(mpc_parser_t *a, mpc_dtor_t ad);
-mpc_parser_t *mpc_brackets(mpc_parser_t *a, mpc_dtor_t ad);
-mpc_parser_t *mpc_squares(mpc_parser_t *a, mpc_dtor_t ad);
-
-mpc_parser_t *mpc_tok_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c);
-mpc_parser_t *mpc_tok_parens(mpc_parser_t *a, mpc_dtor_t ad);
-mpc_parser_t *mpc_tok_braces(mpc_parser_t *a, mpc_dtor_t ad);
-mpc_parser_t *mpc_tok_brackets(mpc_parser_t *a, mpc_dtor_t ad);
-mpc_parser_t *mpc_tok_squares(mpc_parser_t *a, mpc_dtor_t ad);
-
-/*
-** Common Function Parameters
-*/
-
-void mpcf_dtor_null(mpc_val_t *x);
-
-mpc_val_t *mpcf_ctor_null(void);
-mpc_val_t *mpcf_ctor_str(void);
-
-mpc_val_t *mpcf_free(mpc_val_t *x);
-mpc_val_t *mpcf_int(mpc_val_t *x);
-mpc_val_t *mpcf_hex(mpc_val_t *x);
-mpc_val_t *mpcf_oct(mpc_val_t *x);
-mpc_val_t *mpcf_float(mpc_val_t *x);
-mpc_val_t *mpcf_strtriml(mpc_val_t *x);
-mpc_val_t *mpcf_strtrimr(mpc_val_t *x);
-mpc_val_t *mpcf_strtrim(mpc_val_t *x);
-
-mpc_val_t *mpcf_escape(mpc_val_t *x);
-mpc_val_t *mpcf_escape_regex(mpc_val_t *x);
-mpc_val_t *mpcf_escape_string_raw(mpc_val_t *x);
-mpc_val_t *mpcf_escape_char_raw(mpc_val_t *x);
-
-mpc_val_t *mpcf_unescape(mpc_val_t *x);
-mpc_val_t *mpcf_unescape_regex(mpc_val_t *x);
-mpc_val_t *mpcf_unescape_string_raw(mpc_val_t *x);
-mpc_val_t *mpcf_unescape_char_raw(mpc_val_t *x);
-
-mpc_val_t *mpcf_null(int n, mpc_val_t** xs);
-mpc_val_t *mpcf_fst(int n, mpc_val_t** xs);
-mpc_val_t *mpcf_snd(int n, mpc_val_t** xs);
-mpc_val_t *mpcf_trd(int n, mpc_val_t** xs);
-
-mpc_val_t *mpcf_fst_free(int n, mpc_val_t** xs);
-mpc_val_t *mpcf_snd_free(int n, mpc_val_t** xs);
-mpc_val_t *mpcf_trd_free(int n, mpc_val_t** xs);
-
-mpc_val_t *mpcf_strfold(int n, mpc_val_t** xs);
-mpc_val_t *mpcf_maths(int n, mpc_val_t** xs);
-
-/*
-** Regular Expression Parsers
-*/
-
-mpc_parser_t *mpc_re(const char *re);
-  
-/*
-** AST
-*/
-
-typedef struct mpc_ast_t {
-  char *tag;
-  char *contents;
-  mpc_state_t state;
-  int children_num;
-  struct mpc_ast_t** children;
-} mpc_ast_t;
-
-mpc_ast_t *mpc_ast_new(const char *tag, const char *contents);
-mpc_ast_t *mpc_ast_build(int n, const char *tag, ...);
-mpc_ast_t *mpc_ast_add_root(mpc_ast_t *a);
-mpc_ast_t *mpc_ast_add_child(mpc_ast_t *r, mpc_ast_t *a);
-mpc_ast_t *mpc_ast_add_tag(mpc_ast_t *a, const char *t);
-mpc_ast_t *mpc_ast_tag(mpc_ast_t *a, const char *t);
-mpc_ast_t *mpc_ast_state(mpc_ast_t *a, mpc_state_t s);
-
-void mpc_ast_delete(mpc_ast_t *a);
-void mpc_ast_print(mpc_ast_t *a);
-void mpc_ast_print_to(mpc_ast_t *a, FILE *fp);
-
-/*
-** Warning: This function currently doesn't test for equality of the `state` member!
-*/
-int mpc_ast_eq(mpc_ast_t *a, mpc_ast_t *b);
-
-mpc_val_t *mpcf_fold_ast(int n, mpc_val_t **as);
-mpc_val_t *mpcf_str_ast(mpc_val_t *c);
-mpc_val_t *mpcf_state_ast(int n, mpc_val_t **xs);
-
-mpc_parser_t *mpca_tag(mpc_parser_t *a, const char *t);
-mpc_parser_t *mpca_add_tag(mpc_parser_t *a, const char *t);
-mpc_parser_t *mpca_root(mpc_parser_t *a);
-mpc_parser_t *mpca_state(mpc_parser_t *a);
-mpc_parser_t *mpca_total(mpc_parser_t *a);
-
-mpc_parser_t *mpca_not(mpc_parser_t *a);
-mpc_parser_t *mpca_maybe(mpc_parser_t *a);
-
-mpc_parser_t *mpca_many(mpc_parser_t *a);
-mpc_parser_t *mpca_many1(mpc_parser_t *a);
-mpc_parser_t *mpca_count(int n, mpc_parser_t *a);
-
-mpc_parser_t *mpca_or(int n, ...);
-mpc_parser_t *mpca_and(int n, ...);
-
-enum {
-  MPCA_LANG_DEFAULT              = 0,
-  MPCA_LANG_PREDICTIVE           = 1,
-  MPCA_LANG_WHITESPACE_SENSITIVE = 2
-};
-
-mpc_parser_t *mpca_grammar(int flags, const char *grammar, ...);
-
-mpc_err_t *mpca_lang(int flags, const char *language, ...);
-mpc_err_t *mpca_lang_file(int flags, FILE *f, ...);
-mpc_err_t *mpca_lang_pipe(int flags, FILE *f, ...);
-mpc_err_t *mpca_lang_contents(int flags, const char *filename, ...);
-
-/*
-** Misc
-*/
-
-
-void mpc_print(mpc_parser_t *p);
-void mpc_optimise(mpc_parser_t *p);
-void mpc_stats(mpc_parser_t *p);
-
-int mpc_test_pass(mpc_parser_t *p, const char *s, const void *d,
-  int(*tester)(const void*, const void*), 
-  mpc_dtor_t destructor, 
-  void(*printer)(const void*));
-
-int mpc_test_fail(mpc_parser_t *p, const char *s, const void *d,
-  int(*tester)(const void*, const void*),
-  mpc_dtor_t destructor,
-  void(*printer)(const void*));
-
-
-
-#endif
+/*
+** mpc - Micro Parser Combinator library for C
+**
+** https://github.com/orangeduck/mpc
+**
+** Daniel Holden - contact@daniel-holden.com
+** Licensed under BSD3
+*/
+
+#ifndef mpc_h
+#define mpc_h
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <math.h>
+#include <errno.h>
+#include <ctype.h>
+
+/*
+** State Type
+*/
+
+typedef struct {
+  long pos;
+  long row;
+  long col;
+} mpc_state_t;
+
+/*
+** Error Type
+*/
+
+typedef struct {
+  mpc_state_t state;
+  int expected_num;
+  char *filename;
+  char *failure;
+  char **expected;
+  char recieved;
+} mpc_err_t;
+
+void mpc_err_delete(mpc_err_t *e);
+char *mpc_err_string(mpc_err_t *e);
+void mpc_err_print(mpc_err_t *e);
+void mpc_err_print_to(mpc_err_t *e, FILE *f);
+
+/*
+** Parsing
+*/
+
+typedef void mpc_val_t;
+
+typedef union {
+  mpc_err_t *error;
+  mpc_val_t *output;
+} mpc_result_t;
+
+struct mpc_parser_t;
+typedef struct mpc_parser_t mpc_parser_t;
+
+int mpc_parse(const char *filename, const char *string, mpc_parser_t *p, mpc_result_t *r);
+int mpc_parse_file(const char *filename, FILE *file, mpc_parser_t *p, mpc_result_t *r);
+int mpc_parse_pipe(const char *filename, FILE *pipe, mpc_parser_t *p, mpc_result_t *r);
+int mpc_parse_contents(const char *filename, mpc_parser_t *p, mpc_result_t *r);
+
+/*
+** Function Types
+*/
+
+typedef void(*mpc_dtor_t)(mpc_val_t*);
+typedef mpc_val_t*(*mpc_ctor_t)(void);
+
+typedef mpc_val_t*(*mpc_apply_t)(mpc_val_t*);
+typedef mpc_val_t*(*mpc_apply_to_t)(mpc_val_t*,void*);
+typedef mpc_val_t*(*mpc_fold_t)(int,mpc_val_t**);
+
+/*
+** Building a Parser
+*/
+
+mpc_parser_t *mpc_new(const char *name);
+mpc_parser_t *mpc_copy(mpc_parser_t *a);
+mpc_parser_t *mpc_define(mpc_parser_t *p, mpc_parser_t *a);
+mpc_parser_t *mpc_undefine(mpc_parser_t *p);
+
+void mpc_delete(mpc_parser_t *p);
+void mpc_cleanup(int n, ...);
+
+/*
+** Basic Parsers
+*/
+
+mpc_parser_t *mpc_any(void);
+mpc_parser_t *mpc_char(char c);
+mpc_parser_t *mpc_range(char s, char e);
+mpc_parser_t *mpc_oneof(const char *s);
+mpc_parser_t *mpc_noneof(const char *s);
+mpc_parser_t *mpc_satisfy(int(*f)(char));
+mpc_parser_t *mpc_string(const char *s);
+
+/*
+** Other Parsers
+*/
+
+mpc_parser_t *mpc_pass(void);
+mpc_parser_t *mpc_fail(const char *m);
+mpc_parser_t *mpc_failf(const char *fmt, ...);
+mpc_parser_t *mpc_lift(mpc_ctor_t f);
+mpc_parser_t *mpc_lift_val(mpc_val_t *x);
+mpc_parser_t *mpc_anchor(int(*f)(char,char));
+mpc_parser_t *mpc_state(void);
+
+/*
+** Combinator Parsers
+*/
+
+mpc_parser_t *mpc_expect(mpc_parser_t *a, const char *e);
+mpc_parser_t *mpc_expectf(mpc_parser_t *a, const char *fmt, ...);
+mpc_parser_t *mpc_apply(mpc_parser_t *a, mpc_apply_t f);
+mpc_parser_t *mpc_apply_to(mpc_parser_t *a, mpc_apply_to_t f, void *x);
+
+mpc_parser_t *mpc_not(mpc_parser_t *a, mpc_dtor_t da);
+mpc_parser_t *mpc_not_lift(mpc_parser_t *a, mpc_dtor_t da, mpc_ctor_t lf);
+mpc_parser_t *mpc_maybe(mpc_parser_t *a);
+mpc_parser_t *mpc_maybe_lift(mpc_parser_t *a, mpc_ctor_t lf);
+
+mpc_parser_t *mpc_many(mpc_fold_t f, mpc_parser_t *a);
+mpc_parser_t *mpc_many1(mpc_fold_t f, mpc_parser_t *a);
+mpc_parser_t *mpc_count(int n, mpc_fold_t f, mpc_parser_t *a, mpc_dtor_t da);
+
+mpc_parser_t *mpc_or(int n, ...);
+mpc_parser_t *mpc_and(int n, mpc_fold_t f, ...);
+
+mpc_parser_t *mpc_predictive(mpc_parser_t *a);
+
+/*
+** Common Parsers
+*/
+
+mpc_parser_t *mpc_eoi(void);
+mpc_parser_t *mpc_soi(void);
+
+mpc_parser_t *mpc_boundary(void);
+
+mpc_parser_t *mpc_whitespace(void);
+mpc_parser_t *mpc_whitespaces(void);
+mpc_parser_t *mpc_blank(void);
+
+mpc_parser_t *mpc_newline(void);
+mpc_parser_t *mpc_tab(void);
+mpc_parser_t *mpc_escape(void);
+
+mpc_parser_t *mpc_digit(void);
+mpc_parser_t *mpc_hexdigit(void);
+mpc_parser_t *mpc_octdigit(void);
+mpc_parser_t *mpc_digits(void);
+mpc_parser_t *mpc_hexdigits(void);
+mpc_parser_t *mpc_octdigits(void);
+
+mpc_parser_t *mpc_lower(void);
+mpc_parser_t *mpc_upper(void);
+mpc_parser_t *mpc_alpha(void);
+mpc_parser_t *mpc_underscore(void);
+mpc_parser_t *mpc_alphanum(void);
+
+mpc_parser_t *mpc_int(void);
+mpc_parser_t *mpc_hex(void);
+mpc_parser_t *mpc_oct(void);
+mpc_parser_t *mpc_number(void);
+
+mpc_parser_t *mpc_real(void);
+mpc_parser_t *mpc_float(void);
+
+mpc_parser_t *mpc_char_lit(void);
+mpc_parser_t *mpc_string_lit(void);
+mpc_parser_t *mpc_regex_lit(void);
+
+mpc_parser_t *mpc_ident(void);
+
+/*
+** Useful Parsers
+*/
+
+mpc_parser_t *mpc_startwith(mpc_parser_t *a);
+mpc_parser_t *mpc_endwith(mpc_parser_t *a, mpc_dtor_t da);
+mpc_parser_t *mpc_whole(mpc_parser_t *a, mpc_dtor_t da);
+
+mpc_parser_t *mpc_stripl(mpc_parser_t *a);
+mpc_parser_t *mpc_stripr(mpc_parser_t *a);
+mpc_parser_t *mpc_strip(mpc_parser_t *a);
+mpc_parser_t *mpc_tok(mpc_parser_t *a); 
+mpc_parser_t *mpc_sym(const char *s);
+mpc_parser_t *mpc_total(mpc_parser_t *a, mpc_dtor_t da);
+
+mpc_parser_t *mpc_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c);
+mpc_parser_t *mpc_parens(mpc_parser_t *a, mpc_dtor_t ad);
+mpc_parser_t *mpc_braces(mpc_parser_t *a, mpc_dtor_t ad);
+mpc_parser_t *mpc_brackets(mpc_parser_t *a, mpc_dtor_t ad);
+mpc_parser_t *mpc_squares(mpc_parser_t *a, mpc_dtor_t ad);
+
+mpc_parser_t *mpc_tok_between(mpc_parser_t *a, mpc_dtor_t ad, const char *o, const char *c);
+mpc_parser_t *mpc_tok_parens(mpc_parser_t *a, mpc_dtor_t ad);
+mpc_parser_t *mpc_tok_braces(mpc_parser_t *a, mpc_dtor_t ad);
+mpc_parser_t *mpc_tok_brackets(mpc_parser_t *a, mpc_dtor_t ad);
+mpc_parser_t *mpc_tok_squares(mpc_parser_t *a, mpc_dtor_t ad);
+
+/*
+** Common Function Parameters
+*/
+
+void mpcf_dtor_null(mpc_val_t *x);
+
+mpc_val_t *mpcf_ctor_null(void);
+mpc_val_t *mpcf_ctor_str(void);
+
+mpc_val_t *mpcf_free(mpc_val_t *x);
+mpc_val_t *mpcf_int(mpc_val_t *x);
+mpc_val_t *mpcf_hex(mpc_val_t *x);
+mpc_val_t *mpcf_oct(mpc_val_t *x);
+mpc_val_t *mpcf_float(mpc_val_t *x);
+mpc_val_t *mpcf_strtriml(mpc_val_t *x);
+mpc_val_t *mpcf_strtrimr(mpc_val_t *x);
+mpc_val_t *mpcf_strtrim(mpc_val_t *x);
+
+mpc_val_t *mpcf_escape(mpc_val_t *x);
+mpc_val_t *mpcf_escape_regex(mpc_val_t *x);
+mpc_val_t *mpcf_escape_string_raw(mpc_val_t *x);
+mpc_val_t *mpcf_escape_char_raw(mpc_val_t *x);
+
+mpc_val_t *mpcf_unescape(mpc_val_t *x);
+mpc_val_t *mpcf_unescape_regex(mpc_val_t *x);
+mpc_val_t *mpcf_unescape_string_raw(mpc_val_t *x);
+mpc_val_t *mpcf_unescape_char_raw(mpc_val_t *x);
+
+mpc_val_t *mpcf_null(int n, mpc_val_t** xs);
+mpc_val_t *mpcf_fst(int n, mpc_val_t** xs);
+mpc_val_t *mpcf_snd(int n, mpc_val_t** xs);
+mpc_val_t *mpcf_trd(int n, mpc_val_t** xs);
+
+mpc_val_t *mpcf_fst_free(int n, mpc_val_t** xs);
+mpc_val_t *mpcf_snd_free(int n, mpc_val_t** xs);
+mpc_val_t *mpcf_trd_free(int n, mpc_val_t** xs);
+
+mpc_val_t *mpcf_strfold(int n, mpc_val_t** xs);
+mpc_val_t *mpcf_maths(int n, mpc_val_t** xs);
+
+/*
+** Regular Expression Parsers
+*/
+
+mpc_parser_t *mpc_re(const char *re);
+  
+/*
+** AST
+*/
+
+typedef struct mpc_ast_t {
+  char *tag;
+  char *contents;
+  mpc_state_t state;
+  int children_num;
+  struct mpc_ast_t** children;
+} mpc_ast_t;
+
+mpc_ast_t *mpc_ast_new(const char *tag, const char *contents);
+mpc_ast_t *mpc_ast_build(int n, const char *tag, ...);
+mpc_ast_t *mpc_ast_add_root(mpc_ast_t *a);
+mpc_ast_t *mpc_ast_add_child(mpc_ast_t *r, mpc_ast_t *a);
+mpc_ast_t *mpc_ast_add_tag(mpc_ast_t *a, const char *t);
+mpc_ast_t *mpc_ast_tag(mpc_ast_t *a, const char *t);
+mpc_ast_t *mpc_ast_state(mpc_ast_t *a, mpc_state_t s);
+
+void mpc_ast_delete(mpc_ast_t *a);
+void mpc_ast_print(mpc_ast_t *a);
+void mpc_ast_print_to(mpc_ast_t *a, FILE *fp);
+
+/*
+** Warning: This function currently doesn't test for equality of the `state` member!
+*/
+int mpc_ast_eq(mpc_ast_t *a, mpc_ast_t *b);
+
+mpc_val_t *mpcf_fold_ast(int n, mpc_val_t **as);
+mpc_val_t *mpcf_str_ast(mpc_val_t *c);
+mpc_val_t *mpcf_state_ast(int n, mpc_val_t **xs);
+
+mpc_parser_t *mpca_tag(mpc_parser_t *a, const char *t);
+mpc_parser_t *mpca_add_tag(mpc_parser_t *a, const char *t);
+mpc_parser_t *mpca_root(mpc_parser_t *a);
+mpc_parser_t *mpca_state(mpc_parser_t *a);
+mpc_parser_t *mpca_total(mpc_parser_t *a);
+
+mpc_parser_t *mpca_not(mpc_parser_t *a);
+mpc_parser_t *mpca_maybe(mpc_parser_t *a);
+
+mpc_parser_t *mpca_many(mpc_parser_t *a);
+mpc_parser_t *mpca_many1(mpc_parser_t *a);
+mpc_parser_t *mpca_count(int n, mpc_parser_t *a);
+
+mpc_parser_t *mpca_or(int n, ...);
+mpc_parser_t *mpca_and(int n, ...);
+
+enum {
+  MPCA_LANG_DEFAULT              = 0,
+  MPCA_LANG_PREDICTIVE           = 1,
+  MPCA_LANG_WHITESPACE_SENSITIVE = 2
+};
+
+mpc_parser_t *mpca_grammar(int flags, const char *grammar, ...);
+
+mpc_err_t *mpca_lang(int flags, const char *language, ...);
+mpc_err_t *mpca_lang_file(int flags, FILE *f, ...);
+mpc_err_t *mpca_lang_pipe(int flags, FILE *f, ...);
+mpc_err_t *mpca_lang_contents(int flags, const char *filename, ...);
+
+/*
+** Misc
+*/
+
+
+void mpc_print(mpc_parser_t *p);
+void mpc_optimise(mpc_parser_t *p);
+void mpc_stats(mpc_parser_t *p);
+
+int mpc_test_pass(mpc_parser_t *p, const char *s, const void *d,
+  int(*tester)(const void*, const void*), 
+  mpc_dtor_t destructor, 
+  void(*printer)(const void*));
+
+int mpc_test_fail(mpc_parser_t *p, const char *s, const void *d,
+  int(*tester)(const void*, const void*),
+  mpc_dtor_t destructor,
+  void(*printer)(const void*));
+
+
+
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/alloc radare2-2.8.0+dfsg/libr/flag/d/alloc
--- radare2-2.3.0+dfsg/libr/flag/d/alloc	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/alloc	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,5 @@
+malloc
+free
+calloc
+kalloc
+realloc
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/env radare2-2.8.0+dfsg/libr/flag/d/env
--- radare2-2.3.0+dfsg/libr/flag/d/env	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/env	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,7 @@
+getenv
+putenv
+unsetenv
+setenv
+GetEnvironmentVariable
+SetEnvironmentVariable
+ExpandEnvironmentStrings
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/fs radare2-2.8.0+dfsg/libr/flag/d/fs
--- radare2-2.3.0+dfsg/libr/flag/d/fs	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/fs	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,4 @@
+open
+close
+read$
+write
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/Makefile radare2-2.8.0+dfsg/libr/flag/d/Makefile
--- radare2-2.3.0+dfsg/libr/flag/d/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,23 @@
+include ../../../global.mk
+TARGET:=tags.r2
+
+R2_FLAGS=$(DESTDIR)$(DATADIR)/radare2/$(VERSION)/flag
+FILES:=$(filter-out $(TARGET),$(filter-out Makefile,$(filter-out meson.build,$(shell ls))))
+
+all: $(TARGET)
+
+$(TARGET): $(FILES)
+	rm -f *.r2
+	for a in $(FILES) ; do b=$$(echo `cat $$a`); echo "ft $$a $$b" ; done > $(TARGET)
+
+install: $(TARGET)
+	rm -rf "${R2_FLAGS}"
+	mkdir -p "${R2_FLAGS}"
+	cp -f *.r2 "${R2_FLAGS}"
+
+symstall install-symlink: ${TARGET}
+	mkdir -p "$(R2_FLAGS)"
+	-ln -fs $(shell pwd)/tags.r2 $(R2_FLAGS)/tags.r2
+
+uninstall:
+	rm -rf "$(R2_FLAGS)"
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/meson.build radare2-2.8.0+dfsg/libr/flag/d/meson.build
--- radare2-2.3.0+dfsg/libr/flag/d/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,22 @@
+files = run_command(glob_cmd + ['*']).stdout().strip().split(';')
+
+script = '''#script
+import os
+from sys import argv
+for fname in argv[1:]:
+    if any(ex in fname for ex in ('meson.build', 'Makefile')):
+        continue
+    with open(fname) as f:
+        text = ' '.join(f.read().splitlines())
+    print('ft %s %s' % (os.path.basename(fname), text))
+'''
+
+custom_target('tags.r2',
+  input: files,
+  output: 'tags.r2',
+  command: [py3_exe, '-c', script, '@INPUT@'],
+  capture: true,
+  build_by_default: true,
+  install: true,
+  install_dir: r2_flags
+)
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/network radare2-2.8.0+dfsg/libr/flag/d/network
--- radare2-2.3.0+dfsg/libr/flag/d/network	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/network	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,10 @@
+socket
+connect
+bind$
+listen
+accept
+sendto
+recvfrom
+gethostbyname
+htons
+ntohs
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/process radare2-2.8.0+dfsg/libr/flag/d/process
--- radare2-2.3.0+dfsg/libr/flag/d/process	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/process	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2 @@
+getpid
+kill
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/stdout radare2-2.8.0+dfsg/libr/flag/d/stdout
--- radare2-2.3.0+dfsg/libr/flag/d/stdout	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/stdout	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2 @@
+printf
+puts
diff -Nru radare2-2.3.0+dfsg/libr/flag/d/string radare2-2.8.0+dfsg/libr/flag/d/string
--- radare2-2.3.0+dfsg/libr/flag/d/string	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/d/string	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,7 @@
+strcat
+strcpy
+strncpy
+strlen
+strtok
+strstr
+strlcpy
diff -Nru radare2-2.3.0+dfsg/libr/flag/flag.c radare2-2.8.0+dfsg/libr/flag/flag.c
--- radare2-2.3.0+dfsg/libr/flag/flag.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/flag.c	2018-08-07 14:12:36.000000000 +0000
@@ -130,6 +130,7 @@
 #else
 	f->zones = NULL;
 #endif
+	f->tags = sdb_new0 ();
 	f->flags = r_list_new ();
 	if (!f->flags) {
 		r_flag_free (f);
@@ -155,6 +156,27 @@
 	return f;
 }
 
+R_API RFlagItem *r_flag_item_clone(RFlagItem *item) {
+	if (!item) {
+		return NULL;
+	}
+
+	RFlagItem *n = R_NEW0 (RFlagItem);
+	if (!n) {
+		return NULL;
+	}
+
+	n->color = item->color ? strdup (item->color) : NULL;
+	n->comment = item->comment ? strdup (item->comment) : NULL;
+	n->alias = item->alias ? strdup (item->alias) : NULL;
+	n->name = item->name ? strdup (item->name) : NULL;
+	n->realname = item->realname ? strdup (item->realname) : NULL;
+	n->offset = item->offset;
+	n->size = item->size;
+	n->space = item->space;
+	return n;
+}
+
 R_API void r_flag_item_free(RFlagItem *item) {
 	if (item) {
 		free (item->color);
@@ -178,6 +200,7 @@
 	ht_free (f->ht_name);
 
 	r_list_free (f->flags);
+	sdb_free (f->tags);
 	r_list_free (f->spacestack);
 	r_num_free (f->num);
 	free (f);
@@ -308,7 +331,7 @@
 					flag->alias, flag->size, flag->name);
 			} else {
 				f->cb_printf ("0x%08"PFMT64x" %"PFMT64d" %s\n",
-					flag->offset, flag->size, flag->name);
+					flag->offset, flag->size, f->realnames ? flag->realname : flag->name);
 			}
 		}
 		break;
diff -Nru radare2-2.3.0+dfsg/libr/flag/Makefile radare2-2.8.0+dfsg/libr/flag/Makefile
--- radare2-2.3.0+dfsg/libr/flag/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -2,6 +2,6 @@
 
 NAME=r_flag
 DEPS=r_util
-OBJS=flag.o sort.o spaces.o zones.o
+OBJS=flag.o sort.o spaces.o zones.o tags.o
 
 include ../rules.mk
diff -Nru radare2-2.3.0+dfsg/libr/flag/meson.build radare2-2.8.0+dfsg/libr/flag/meson.build
--- radare2-2.3.0+dfsg/libr/flag/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,16 +1,33 @@
-
-files=[
-'flag.c',
-'sort.c',
-'spaces.c',
-'zones.c'
+files = [
+  'flag.c',
+  'sort.c',
+  'tags.c',
+  'spaces.c',
+  'zones.c'
 ]
 
 r_flag = library('r_flag', files,
   include_directories: [platform_inc],
-  link_with: [r_util],
-  objects: [
-	libr2sdb.extract_all_objects()
-  ],  
-  install: true
+  dependencies: [
+    r_util_dep,
+    sdb_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_flag_dep = declare_dependency(link_with: r_flag,
+                                include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_flag],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_flag',
+  filebase: 'r_flag',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/flag/spaces.c radare2-2.8.0+dfsg/libr/flag/spaces.c
--- radare2-2.3.0+dfsg/libr/flag/spaces.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/spaces.c	2018-08-07 14:12:36.000000000 +0000
@@ -64,7 +64,7 @@
 
 R_API int r_flag_space_set(RFlag *f, const char *name) {
 	int i;
-	if (!name || *name == '*') {
+	if (!name || !*name || *name == '*') {
 		f->space_idx = -1;
 		return f->space_idx;
 	}
diff -Nru radare2-2.3.0+dfsg/libr/flag/tags.c radare2-2.8.0+dfsg/libr/flag/tags.c
--- radare2-2.3.0+dfsg/libr/flag/tags.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/tags.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,48 @@
+/* radare - LGPL - Copyright 2018 - pancake */
+
+#include <r_flag.h>
+
+R_API RList *r_flag_tags_set(RFlag *f, const char *name, const char *words) {
+	const char *k = sdb_fmt ("tag.%s", name);
+	sdb_set (f->tags, k, words, -1);
+	return NULL;
+}
+
+R_API RList *r_flag_tags_list(RFlag *f) {
+	RList *res = r_list_newf (free);
+	SdbList *o = sdb_foreach_list (f->tags, false);
+	SdbListIter *iter;
+	SdbKv *kv;
+	ls_foreach (o, iter, kv) {
+		const char *tag = kv->key;
+		if (strlen (tag) < 5) {
+			continue;
+		}
+		r_list_append (res, (void *)strdup (tag + 4));
+	}
+	ls_free (o);
+	return res;
+}
+
+R_API void r_flag_tags_reset(RFlag *f, const char *name) {
+	sdb_reset (f->tags);
+}
+
+R_API RList *r_flag_tags_get(RFlag *f, const char *name) {
+	const char *k = sdb_fmt ("tag.%s", name);
+	RListIter *iter, *iter2;
+	const char *word;
+	RFlagItem *flag;
+	char *words = sdb_get (f->tags, k, NULL);
+	RList *res = r_list_newf (NULL);
+	RList *list = r_str_split_list (words, " ");
+	r_list_foreach (f->flags, iter2, flag) {
+		r_list_foreach (list, iter, word) {
+			if (r_str_glob (flag->name, word)) {
+				r_list_append (res, flag);
+			}
+		}
+	}
+	r_list_free (list);
+	return res;
+}
diff -Nru radare2-2.3.0+dfsg/libr/flag/zones.c radare2-2.8.0+dfsg/libr/flag/zones.c
--- radare2-2.3.0+dfsg/libr/flag/zones.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/flag/zones.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2016 - pancake */
+/* radare - LGPL - Copyright 2016-2018 - pancake */
 
 #include <r_flag.h>
 #include <r_util.h>
@@ -43,7 +43,7 @@
 		sdb_set (DB, name, newBounds, 0);
 		free (newBounds);
 	} else {
-		sdb_set (DB, name, sdb_fmt (0, "%"PFMT64d",%"PFMT64d, addr, addr), 0);
+		sdb_set (DB, name, sdb_fmt ("%"PFMT64d",%"PFMT64d, addr, addr), 0);
 	}
 #else
 	RFlagZoneItem *zi = r_flag_zone_get (f, name);
diff -Nru radare2-2.3.0+dfsg/libr/fs/fs.c radare2-2.8.0+dfsg/libr/fs/fs.c
--- radare2-2.3.0+dfsg/libr/fs/fs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/fs/fs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2011-2017 - pancake */
+/* radare2 - LGPL - Copyright 2011-2018 - pancake */
 
 #include <r_fs.h>
 #include "config.h"
@@ -414,7 +414,6 @@
 				if (file->off == offset) {
 					r_list_append (list, found);
 				}
-				free (file->data);
 				r_fs_close (fs, file);
 			}
 		}
@@ -675,222 +674,6 @@
 	return NULL;
 }
 
-#define PROMT_PATH_BUFSIZE 1024
-
-R_API int r_fs_prompt(RFS* fs, const char* root) {
-	char buf[PROMT_PATH_BUFSIZE];
-	char path[PROMT_PATH_BUFSIZE];
-	char str[2048];
-	char* input;
-	RList* list = NULL;
-	RListIter* iter;
-	RFSFile* file = NULL;
-
-	if (root && *root) {
-		strncpy (buf, root, sizeof (buf) - 1);
-		r_str_trim_path (buf);
-		list = r_fs_root (fs, buf);
-		if (r_list_empty (list)) {
-			printf ("Unknown root\n");
-			r_list_free (list);
-			return false;
-		}
-		strncpy (path, buf, sizeof (path) - 1);
-	} else {
-		strcpy (path, "/");
-	}
-
-	for (;;) {
-		printf ("[%s]> ", path);
-		fflush (stdout);
-		fgets (buf, sizeof (buf) - 1, stdin);
-		if (feof (stdin)) {
-			break;
-		}
-		buf[strlen (buf) - 1] = '\0';
-		if (!strcmp (buf, "q") || !strcmp (buf, "exit")) {
-			r_list_free (list);
-			return true;
-		}
-		if (buf[0] == '!') {
-			r_sandbox_system (buf + 1, 1);
-		} else if (!memcmp (buf, "ls", 2)) {
-			char *ptr = str;
-			if (buf[2] == ' ') {
-				if (buf[3] != '/') {
-					strncpy (str, path, sizeof (str) - 1);
-					strcat (str, "/");
-					strncat (str, buf + 3, sizeof (buf) - 1);
-					list = r_fs_dir (fs, str);
-				} else {
-					list = r_fs_dir (fs, buf + 3);
-					ptr = buf + 3;
-				}
-			} else {
-				ptr = path;
-				list = r_fs_dir (fs, path);
-			}
-			if (list) {
-				r_list_foreach (list, iter, file) {
-					printf ("%c %s\n", file->type, file->name);
-				}
-			}
-			// mountpoints if any
-			RFSRoot *r;
-			char *me = strdup (ptr);
-			r_list_foreach (fs->roots, iter, r) {
-				char *base = strdup (r->path);
-				char *ls = (char *)r_str_lchr (base, '/');
-				if (ls) {
-					ls++;
-					*ls = 0;
-				}
-				// TODO: adjust contents between //
-				if (!strcmp (me, base)) {
-					printf ("m %s\n", (r->path && r->path[0]) ? r->path + 1: "");
-				}
-				free (base);
-			}
-			free (me);
-		} else if (!strncmp (buf, "pwd", 3)) {
-			eprintf ("%s\n", path);
-		} else if (!memcmp (buf, "cd ", 3)) {
-			char opath[PROMT_PATH_BUFSIZE];
-			strncpy (opath, path, sizeof (opath) - 1);
-			input = buf + 3;
-			while (*input == ' ') {
-				input++;
-			}
-			if (!strcmp (input, "..")) {
-				char* p = (char*) r_str_lchr (path, '/');
-				if (p) {
-					p[(p == path)? 1: 0] = 0;
-				}
-			} else {
-				strcat (path, "/");
-				if (*input == '/') {
-					strncpy (path, input, sizeof (opath) - 1);
-				} else {
-					if ((strlen (path) + strlen (input)) >= sizeof (path)) {
-						// overflow
-						path[0] = 0;
-					} else {
-						strcat (path, input);
-					}
-				}
-				path[sizeof (path) - 1] = 0;
-			}
-			r_str_trim_path (path);
-			list = r_fs_dir (fs, path);
-			if (r_list_empty (list)) {
-				RFSRoot *root;
-				bool found = false;
-				RListIter *iter;
-				r_list_foreach (fs->roots, iter, root) {
-					if (!strcmp (path, root->path)) {
-						r_list_append (list, root->path);
-						found = true;
-					}
-				}
-				if (!found) {
-					strcpy (path, opath);
-				}
-			}
-		} else if (!memcmp (buf, "cat ", 4)) {
-			input = buf + 3;
-			while (input[0] == ' ')
-				input++;
-			if (input[0] == '/') {
-				if (root) {
-					strncpy (str, root, sizeof (str) - 1);
-				} else {
-					str[0] = 0;
-				}
-			} else {
-				strncpy (str, path, sizeof (str) - 1);
-			}
-			strncat (str, "/",   sizeof (str) - strlen (str) - 1);
-			strncat (str, input, sizeof (str) - strlen (str) - 1);
-			file = r_fs_open (fs, str);
-			if (file) {
-				r_fs_read (fs, file, 0, file->size);
-				write (1, file->data, file->size);
-				free (file->data);
-				r_fs_close (fs, file);
-			} else {
-				eprintf ("Cannot open file\n");
-			}
-		} else if (!memcmp (buf, "mount", 5)) {
-			RFSRoot* r;
-			r_list_foreach (fs->roots, iter, r) {
-				eprintf ("%s %s\n", r->path, r->p->name);
-			}
-		} else if (!memcmp (buf, "get ", 4)) {
-			char* s = 0;
-			input = buf + 3;
-			while (input[0] == ' ')
-				input++;
-			if (input[0] == '/') {
-				if (root) {
-					s = malloc (strlen (root) + strlen (input) + 2);
-					if (!s) {
-						goto beach;
-					}
-					strcpy (s, root);
-				}
-			} else {
-				s = malloc (strlen (path) + strlen (input) + 2);
-				if (!s) {
-					goto beach;
-				}
-				strcpy (s, path);
-			}
-			if (!s) {
-				s = malloc (strlen (input) + 32);
-				if (!s) {
-					goto beach;
-				}
-			}
-			strcat (s, "/");
-			strcat (s, input);
-			file = r_fs_open (fs, s);
-			if (file) {
-				r_fs_read (fs, file, 0, file->size);
-				r_file_dump (input, file->data, file->size, 0);
-				free (file->data);
-				r_fs_close (fs, file);
-			} else {
-				input -= 2; //OMFG!!!! O_O
-				memcpy (input, "./", 2);
-				if (!r_fs_dir_dump (fs, s, input)) {
-					printf ("Cannot open file\n");
-				}
-			}
-			free (s);
-		} else if (!memcmp (buf, "help", 4) || !strcmp (buf, "?")) {
-			eprintf (
-				"Commands:\n"
-				" !cmd        ; escape to system\n"
-				" ls [path]   ; list current directory\n"
-				" cd path     ; change current directory\n"
-				" cat file    ; print contents of file\n"
-				" get file    ; dump file to disk\n"
-				" mount       ; list mount points\n"
-				" q/exit      ; leave prompt mode\n"
-				" ?/help      ; show this help\n");
-		} else {
-			if (*buf) {
-				eprintf ("Unknown command %s\n", buf);
-			}
-		}
-	}
-beach:
-	clearerr (stdin);
-	printf ("\n");
-	r_list_free (list);
-	return true;
-}
-
 R_API void r_fs_view(RFS* fs, int view) {
 	fs->view = view;
 }
diff -Nru radare2-2.3.0+dfsg/libr/fs/Makefile radare2-2.8.0+dfsg/libr/fs/Makefile
--- radare2-2.3.0+dfsg/libr/fs/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/fs/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -14,7 +14,7 @@
 
 include ${STATIC_FS_PLUGINS}
 STATIC_OBJS=$(subst ..,p/..,$(subst fs_,p/fs_,$(STATIC_OBJ)))
-OBJS=${STATIC_OBJS} fs.o file.o 
+OBJS=${STATIC_OBJS} fs.o file.o shell.o
 #p/grub/main.o
 
 #p/grub/libgrubfs.a:
diff -Nru radare2-2.3.0+dfsg/libr/fs/meson.build radare2-2.8.0+dfsg/libr/fs/meson.build
--- radare2-2.3.0+dfsg/libr/fs/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/fs/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,33 +1,54 @@
-files=[
-'file.c',
-'fs.c',
-#'p/fs_cpio.c',
-'p/fs_ext2.c',
-'p/fs_fat.c',
-'p/fs_fb.c',
-#'p/fs_grub_base.c',
-'p/fs_hfs.c',
-'p/fs_hfsplus.c',
-'p/fs_iso9660.c',
-'p/fs_jfs.c',
-'p/fs_minix.c',
-'p/fs_ntfs.c',
-'p/fs_posix.c',
-'p/fs_reiserfs.c',
-'p/fs_sfs.c',
-'p/fs_tar.c',
-'p/fs_udf.c',
-'p/fs_ufs.c',
-'p/fs_ufs2.c',
-'p/fs_xfs.c',
-'p/part_dos.c'
+files = [
+  'file.c',
+  'fs.c',
+  'shell.c',
+  'p/fs_cpio.c',
+  'p/fs_ext2.c',
+  'p/fs_fat.c',
+  'p/fs_fb.c',
+  #'p/fs_grub_base.c',
+  'p/fs_hfs.c',
+  'p/fs_hfsplus.c',
+  'p/fs_io.c',
+  'p/fs_iso9660.c',
+  'p/fs_jfs.c',
+  'p/fs_minix.c',
+  'p/fs_ntfs.c',
+  'p/fs_posix.c',
+  'p/fs_r2.c',
+  'p/fs_reiserfs.c',
+  'p/fs_sfs.c',
+  'p/fs_tar.c',
+  'p/fs_udf.c',
+  'p/fs_ufs.c',
+  'p/fs_ufs2.c',
+  'p/fs_xfs.c',
+  'p/part_dos.c'
 ]
 
 r_fs = library('r_fs', files,
-  include_directories: [platform_inc, include_directories([
-	'../../shlr/grub/include'
-  ])],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, libr2grub],
-  install: true
+  include_directories: platform_inc,
+  c_args: ['-DCORELIB=1'],
+  dependencies: [
+    r_util_dep,
+    grub_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_fs_dep = declare_dependency(link_with: r_fs,
+                              include_directories: platform_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_fs],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_fs',
+  filebase: 'r_fs',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/fs/shell.c radare2-2.8.0+dfsg/libr/fs/shell.c
--- radare2-2.3.0+dfsg/libr/fs/shell.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/fs/shell.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,252 @@
+/* radare2 - LGPL - Copyright 2018 - pancake */
+
+#include <r_fs.h>
+
+#define PROMPT_PATH_BUFSIZE 1024
+
+R_API int r_fs_shell_prompt(RFSShell* shell, RFS* fs, const char* root) {
+	char buf[PROMPT_PATH_BUFSIZE];
+	char path[PROMPT_PATH_BUFSIZE];
+	char prompt[PROMPT_PATH_BUFSIZE];
+	char str[2048];
+	char* input;
+	const char* ptr;
+	RList* list = NULL;
+	RListIter* iter;
+	RFSFile* file = NULL;
+
+	if (root && *root) {
+		strncpy (buf, root, sizeof (buf) - 1);
+		r_str_trim_path (buf);
+		list = r_fs_root (fs, buf);
+		if (r_list_empty (list)) {
+			printf ("Unknown root\n");
+			r_list_free (list);
+			return false;
+		}
+		strncpy (path, buf, sizeof (path) - 1);
+	} else {
+		strcpy (path, "/");
+	}
+
+	for (;;) {
+		snprintf (prompt, sizeof (prompt), "[%.*s]> ", (int)sizeof (prompt) - 5, path);
+		if (shell) {
+			*shell->cwd = strdup (path);
+			if (shell->set_prompt) {
+				shell->set_prompt (prompt);
+			}
+			if (shell->readline) {
+				ptr = shell->readline ();
+			} else {
+				fgets (buf, sizeof (buf) - 1, stdin);
+				if (feof (stdin)) {
+					break;
+				}
+				buf[strlen (buf) - 1] = '\0';
+				ptr = buf;
+			}
+			if (!ptr) {
+				break;
+			}
+			ptr = r_str_trim ((char *)ptr);
+			if (shell->hist_add) {
+				shell->hist_add (ptr);
+			}
+			if (ptr != buf) {
+				r_str_ncpy (buf, ptr, sizeof (buf) - 1);
+			}
+		} else {
+			printf ("%s", prompt);
+			fgets (buf, sizeof (buf) - 1, stdin);
+			if (feof (stdin)) {
+				break;
+			}
+			buf[strlen (buf) - 1] = '\0';
+		}
+
+		if (!strcmp (buf, "q") || !strcmp (buf, "exit")) {
+			r_list_free (list);
+			return true;
+		}
+		if (buf[0] == '!') {
+			r_sandbox_system (buf + 1, 1);
+		} else if (!strncmp (buf, "ls", 2)) {
+			char *ptr = str;
+			r_list_free (list);
+			if (buf[2] == ' ') {
+				if (buf[3] != '/') {
+					strncpy (str, path, sizeof (str) - 1);
+					strcat (str, "/");
+					strncat (str, buf + 3, sizeof (buf) - 1);
+					list = r_fs_dir (fs, str);
+				} else {
+					list = r_fs_dir (fs, buf + 3);
+					ptr = buf + 3;
+				}
+			} else {
+				ptr = path;
+				list = r_fs_dir (fs, path);
+			}
+			if (list) {
+				r_list_foreach (list, iter, file) {
+					printf ("%c %s\n", file->type, file->name);
+				}
+			}
+			// mountpoints if any
+			RFSRoot *r;
+			char *me = strdup (ptr);
+			r_list_foreach (fs->roots, iter, r) {
+				char *base = strdup (r->path);
+				char *ls = (char *)r_str_lchr (base, '/');
+				if (ls) {
+					ls++;
+					*ls = 0;
+				}
+				// TODO: adjust contents between //
+				if (!strcmp (me, base)) {
+					printf ("m %s\n", (r->path && r->path[0]) ? r->path + 1: "");
+				}
+				free (base);
+			}
+			free (me);
+		} else if (!strncmp (buf, "pwd", 3)) {
+			eprintf ("%s\n", path);
+		} else if (!memcmp (buf, "cd ", 3)) {
+			char opath[PROMPT_PATH_BUFSIZE];
+			strncpy (opath, path, sizeof (opath) - 1);
+			input = buf + 3;
+			while (*input == ' ') {
+				input++;
+			}
+			if (!strcmp (input, "..")) {
+				char* p = (char*) r_str_lchr (path, '/');
+				if (p) {
+					p[(p == path)? 1: 0] = 0;
+				}
+			} else {
+				strcat (path, "/");
+				if (*input == '/') {
+					strncpy (path, input, sizeof (opath) - 1);
+				} else {
+					if ((strlen (path) + strlen (input)) >= sizeof (path)) {
+						// overflow
+						path[0] = 0;
+					} else {
+						strcat (path, input);
+					}
+				}
+				path[sizeof (path) - 1] = 0;
+			}
+			r_str_trim_path (path);
+			r_list_free (list);
+			list = r_fs_dir (fs, path);
+			if (r_list_empty (list)) {
+				RFSRoot *root;
+				bool found = false;
+				RListIter *iter;
+				r_list_foreach (fs->roots, iter, root) {
+					if (!strcmp (path, root->path)) {
+						r_list_append (list, root->path);
+						found = true;
+					}
+				}
+				if (!found) {
+					strcpy (path, opath);
+				}
+			}
+		} else if (!memcmp (buf, "cat ", 4)) {
+			input = buf + 3;
+			while (input[0] == ' ')
+				input++;
+			if (input[0] == '/') {
+				if (root) {
+					strncpy (str, root, sizeof (str) - 1);
+				} else {
+					str[0] = 0;
+				}
+			} else {
+				strncpy (str, path, sizeof (str) - 1);
+			}
+			strncat (str, "/",   sizeof (str) - strlen (str) - 1);
+			strncat (str, input, sizeof (str) - strlen (str) - 1);
+			file = r_fs_open (fs, str);
+			if (file) {
+				r_fs_read (fs, file, 0, file->size);
+				write (1, file->data, file->size);
+				free (file->data);
+				r_fs_close (fs, file);
+			} else {
+				eprintf ("Cannot open file\n");
+			}
+		} else if (!memcmp (buf, "mount", 5)) {
+			RFSRoot* r;
+			r_list_foreach (fs->roots, iter, r) {
+				eprintf ("%s %s\n", r->path, r->p->name);
+			}
+		} else if (!memcmp (buf, "get ", 4)) {
+			char* s = 0;
+			input = buf + 3;
+			while (input[0] == ' ')
+				input++;
+			if (input[0] == '/') {
+				if (root) {
+					s = malloc (strlen (root) + strlen (input) + 2);
+					if (!s) {
+						goto beach;
+					}
+					strcpy (s, root);
+				}
+			} else {
+				s = malloc (strlen (path) + strlen (input) + 2);
+				if (!s) {
+					goto beach;
+				}
+				strcpy (s, path);
+			}
+			if (!s) {
+				s = calloc (strlen (input) + 32, 1);
+				if (!s) {
+					goto beach;
+				}
+			}
+			strcat (s, "/");
+			strcat (s, input);
+			file = r_fs_open (fs, s);
+			if (file) {
+				r_fs_read (fs, file, 0, file->size);
+				r_file_dump (input, file->data, file->size, 0);
+				free (file->data);
+				r_fs_close (fs, file);
+			} else {
+				input -= 2; //OMFG!!!! O_O
+				memcpy (input, "./", 2);
+				if (!r_fs_dir_dump (fs, s, input)) {
+					printf ("Cannot open file\n");
+				}
+			}
+			free (s);
+		} else if (!memcmp (buf, "help", 4) || !strcmp (buf, "?")) {
+			eprintf (
+				"Commands:\n"
+				" !cmd        ; escape to system\n"
+				" ls [path]   ; list current directory\n"
+				" cd path     ; change current directory\n"
+				" cat file    ; print contents of file\n"
+				" get file    ; dump file to disk\n"
+				" mount       ; list mount points\n"
+				" q/exit      ; leave prompt mode\n"
+				" ?/help      ; show this help\n");
+		} else {
+			if (*buf) {
+				eprintf ("Unknown command %s\n", buf);
+			}
+		}
+	}
+beach:
+	clearerr (stdin);
+	printf ("\n");
+	r_list_free (list);
+	return true;
+}
+
diff -Nru radare2-2.3.0+dfsg/libr/hash/calc.c radare2-2.8.0+dfsg/libr/hash/calc.c
--- radare2-2.3.0+dfsg/libr/hash/calc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/calc.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2009-2017 pancake */
+/* radare2 - LGPL - Copyright 2009-2018 pancake */
 
 #include "r_hash.h"
 
@@ -64,8 +64,8 @@
 		return R_HASH_SIZE_PARITY;
 	}
 	if (algobit & R_HASH_ENTROPY) {
-		memset (ctx->digest, 0, R_HASH_SIZE_ENTROPY);
-		*ctx->digest = (ut8) r_hash_entropy (buf, len);
+		r_mem_memzero (ctx->digest, sizeof (ctx->entropy));
+		ctx->entropy = r_hash_entropy (buf, len);
 		return R_HASH_SIZE_ENTROPY;
 	}
 	if (algobit & R_HASH_XOR) {
diff -Nru radare2-2.3.0+dfsg/libr/hash/hash.c radare2-2.8.0+dfsg/libr/hash/hash.c
--- radare2-2.3.0+dfsg/libr/hash/hash.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/hash.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,13 @@
-/* radare - LGPL - Copyright 2007-2017 pancake */
+/* radare - LGPL - Copyright 2007-2018 pancake */
 
 #include <r_hash.h>
-#ifdef _MSC_VER
-#define strcasecmp stricmp
+#include "r_util.h"
+#if USE_LIB_XXHASH
+#include <xxhash.h>
+#else
+#include "xxhash.h"
 #endif
+
 R_LIB_VERSION (r_hash);
 
 struct {
@@ -158,6 +162,10 @@
 	return c % 255;
 }
 
+R_API ut32 r_hash_xxhash(const ut8 *buf, ut64 len) {
+	return XXH32 (buf, (size_t)len, 0);
+}
+
 R_API ut8 r_hash_deviation(const ut8 *b, ut64 len) {
 	int i, c;
 	for (c = i = 0, len--; i < len; i++) {
@@ -286,14 +294,14 @@
 	do {
 		/* Eat everything up to the comma */
 		for (i = 0; *ptr && *ptr != ',' && i < sizeof (tmp) - 1; i++) {
-			tmp[i] = *ptr++;
+			tmp[i] = tolower (*ptr++);
 		}
 
 		/* Safety net */
 		tmp[i] = '\0';
 
 		for (i = 0; hash_name_bytes[i].name; i++) {
-			if (!strcasecmp (tmp, hash_name_bytes[i].name)) {
+			if (!strcmp (tmp, hash_name_bytes[i].name)) {
 				ret |= hash_name_bytes[i].bit;
 				break;
 			}
@@ -343,7 +351,10 @@
 	r_hash_do_begin (ctx, algo);
 	digest_size = r_hash_calculate (ctx, algo, data, len);
 	r_hash_do_end (ctx, algo);
-	if (digest_size > 0) {
+	if (digest_size == 0) {
+		digest_hex = calloc (16, 1);
+		snprintf (digest_hex, 15, "%02.8f", ctx->entropy);
+	} else if (digest_size > 0) {
 		if (digest_size * 2 < digest_size) {
 			digest_hex = NULL;
 		} else {
diff -Nru radare2-2.3.0+dfsg/libr/hash/Makefile radare2-2.8.0+dfsg/libr/hash/Makefile
--- radare2-2.3.0+dfsg/libr/hash/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,7 @@
 include ../config.mk
 
 NAME=r_hash
+PCLIBS=@LIBXXHASH@
 # HACK
 ifneq ($(OSTYPE),darwin)
 ifneq ($(OSTYPE),haiku)
@@ -9,7 +10,15 @@
 endif
 endif
 
+DEPS=r_util
 OBJS=state.o md5.o sha1.o hash.o md4.o hamdist.o crca.o
-OBJS+=entropy.o sha2.o calc.o xxhash.o adler32.o luhn.o
+OBJS+=entropy.o sha2.o calc.o adler32.o luhn.o
+
+ifeq ($(USE_LIB_XXHASH),1)
+LDFLAGS+=${LIB_XXHASH}
+LINK+=${LIBXXHASH}
+else
+OBJS+=xxhash.o
+endif
 
 include ../rules.mk
diff -Nru radare2-2.3.0+dfsg/libr/hash/md5.c radare2-2.8.0+dfsg/libr/hash/md5.c
--- radare2-2.3.0+dfsg/libr/hash/md5.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/md5.c	2018-08-07 14:12:36.000000000 +0000
@@ -165,7 +165,7 @@
 	state[3] += d;
 
 	/* Zeroize sensitive information. check if compiler optimizes out this */
-	memset ((void*)x, 0, sizeof (x));
+	r_mem_memzero ((void*)x, sizeof (x));
 }
 
 static const ut8 PADDING[64] = {
@@ -234,7 +234,7 @@
 	Encode (digest, context->state, 16);
 
 	/* Zeroize sensitive information.  */
-	memset ((void*)context, 0, sizeof (*context));
+	r_mem_memzero ((void*)context, sizeof (*context));
 }
 
 R_API ut8 *r_hash_do_md5(RHash *ctx, const ut8 *input, int len) {
diff -Nru radare2-2.3.0+dfsg/libr/hash/meson.build radare2-2.8.0+dfsg/libr/hash/meson.build
--- radare2-2.3.0+dfsg/libr/hash/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,23 +1,45 @@
-
-files=[
-'adler32.c',
-'calc.c',
-'crca.c',
-'entropy.c',
-'hamdist.c',
-'hash.c',
-'luhn.c',
-'md4.c',
-'md5.c',
-'sha1.c',
-'sha2.c',
-'state.c',
-'xxhash.c'
+files = [
+  'adler32.c',
+  'calc.c',
+  'crca.c',
+  'entropy.c',
+  'hamdist.c',
+  'hash.c',
+  'luhn.c',
+  'md4.c',
+  'md5.c',
+  'sha1.c',
+  'sha2.c',
+  'state.c'
 ]
 
+dependencies = [mth, r_util_dep]
+
+if use_sys_xxhash
+  dependencies += [sys_xxhash]
+else
+  files += ['xxhash.c']
+endif
+
 r_hash = library('r_hash', files,
   include_directories: [platform_inc],
-  dependencies: [mth],
-  link_with: [r_util],
-  install: true
+  dependencies: dependencies,
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_hash_dep = declare_dependency(link_with: r_hash,
+                                include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_hash],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_hash',
+  filebase: 'r_hash',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/hash/sha2.c radare2-2.8.0+dfsg/libr/hash/sha2.c
--- radare2-2.3.0+dfsg/libr/hash/sha2.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/sha2.c	2018-08-07 14:12:36.000000000 +0000
@@ -286,7 +286,7 @@
 		return;
 	}
 	memcpy (context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH);
-	memset (context->buffer, 0, SHA256_BLOCK_LENGTH);
+	r_mem_memzero (context->buffer, SHA256_BLOCK_LENGTH);
 	context->bitcount = 0;
 }
 
@@ -578,7 +578,7 @@
 	}
 
 	/* Clean up state data: */
-	memset (context, 0, sizeof(*context));
+	r_mem_memzero (context, sizeof(*context));
 	usedspace = 0;
 }
 
@@ -600,9 +600,9 @@
 		}
 		*buffer = (char) 0;
 	} else {
-		memset (context, 0, sizeof(*context));
+		r_mem_memzero (context, sizeof(*context));
 	}
-	memset (digest, 0, SHA256_DIGEST_LENGTH);
+	r_mem_memzero (digest, SHA256_DIGEST_LENGTH);
 	return buffer;
 }
 
@@ -621,7 +621,7 @@
 		return;
 	}
 	memcpy (context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
-	memset (context->buffer, 0, SHA512_BLOCK_LENGTH);
+	r_mem_memzero (context->buffer, SHA512_BLOCK_LENGTH);
 	context->bitcount[0] = context->bitcount[1] = 0;
 }
 
@@ -922,7 +922,7 @@
 	}
 
 	/* Zero out state data */
-	memset (context, 0, sizeof(*context));
+	r_mem_memzero (context, sizeof(*context));
 }
 
 char *SHA512_End(R_SHA512_CTX *context, char buffer[]) {
@@ -944,9 +944,9 @@
 		}
 		*buffer = (char) 0;
 	} else {
-		memset (context, 0, sizeof(*context));
+		r_mem_memzero (context, sizeof(*context));
 	}
-	memset (digest, 0, SHA512_DIGEST_LENGTH);
+	r_mem_memzero (digest, SHA512_DIGEST_LENGTH);
 	return buffer;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/hash/xxhash.c radare2-2.8.0+dfsg/libr/hash/xxhash.c
--- radare2-2.3.0+dfsg/libr/hash/xxhash.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/xxhash.c	2018-08-07 14:12:36.000000000 +0000
@@ -47,13 +47,7 @@
 #define PRIME32_4    668265263U
 #define PRIME32_5    374761393U
 
-R_API ut32 r_hash_xxhash(const ut8 *buf, ut64 len) {
-	void *s = XXH32_init (0);
-	XXH32_feed (s, buf, (int) len);
-	return XXH32_result (s);
-}
-
-ut32 XXH32(const void *input, int len, ut32 seed) {
+ut32 XXH32(const void *input, size_t len, ut32 seed) {
 	const ut8 *p = (const ut8 *) input;
 	const ut8 *const bEnd = p + len;
 	ut32 h32;
diff -Nru radare2-2.3.0+dfsg/libr/hash/xxhash.h radare2-2.8.0+dfsg/libr/hash/xxhash.h
--- radare2-2.3.0+dfsg/libr/hash/xxhash.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/hash/xxhash.h	2018-08-07 14:12:36.000000000 +0000
@@ -68,7 +68,7 @@
 // Simple Hash Functions
 //****************************
 
-unsigned int XXH32 (const void* input, int len, unsigned int seed);
+unsigned int XXH32 (const void* input, size_t len, unsigned int seed);
 
 /*
 XXH32() :
diff -Nru radare2-2.3.0+dfsg/libr/include/msvc/unistd.h radare2-2.8.0+dfsg/libr/include/msvc/unistd.h
--- radare2-2.3.0+dfsg/libr/include/msvc/unistd.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/msvc/unistd.h	2018-08-07 14:12:36.000000000 +0000
@@ -1,2 +1,2 @@
-//fake include file to avoid error on windows compilation.
-#include <io.h>
+//fake include file to avoid error on windows compilation.
+#include <io.h>
diff -Nru radare2-2.3.0+dfsg/libr/include/r_anal.h radare2-2.8.0+dfsg/libr/include/r_anal.h
--- radare2-2.3.0+dfsg/libr/include/r_anal.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_anal.h	2018-08-07 14:12:36.000000000 +0000
@@ -3,7 +3,7 @@
 #ifndef R2_ANAL_H
 #define R2_ANAL_H
 
-#define USE_DICT 0
+#define USE_DICT 1
 
 /* use sdb function storage */
 #define FCN_SDB 1
@@ -22,6 +22,8 @@
 #include <r_flag.h>
 #include <r_bin.h>
 
+#define esilprintf(op, fmt, ...) r_strbuf_setf (&op->esil, fmt, ##__VA_ARGS__)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -35,8 +37,6 @@
    bb_has_ops=1 -> 600M
    bb_has_ops=0 -> 350MB
  */
-/* TODO: work in progress */
-#define USE_NEW_FCN_STORE 0
 
 // TODO: Remove this define? /cc @nibble_ds
 #define VERBOSE_ANAL if(0)
@@ -296,15 +296,21 @@
 	RList *fcn_locs; //sorted list of a function *.loc refs
 	//RList *locals; // list of local labels -> moved to anal->sdb_fcns
 	RList *bbs;
-#if FCN_OLD
-	RList *refs;
-	RList *xrefs;
-#endif
 	RAnalFcnMeta meta;
 	RRangeTiny bbr;
 	RBNode rb;
 } RAnalFunction;
 
+typedef struct r_anal_func_arg_t {
+	const char *name;
+	const char *fmt;
+	const char *cc_source;
+	char *orig_c_type;
+	char *c_type;
+	ut64 size;
+	ut64 src; //Function-call argument value or pointer to it
+} RAnalFuncArg;
+
 struct r_anal_type_t {
 	char *name;
 	ut32 type;
@@ -329,6 +335,7 @@
 	R_META_TYPE_COMMENT = 'C',
 	R_META_TYPE_RUN = 'r',
 	R_META_TYPE_HIGHLIGHT = 'H',
+	R_META_TYPE_VARTYPE = 't',
 };
 
 // anal
@@ -340,6 +347,7 @@
 	R_ANAL_OP_FAMILY_SSE,    /* extended multimedia instruction (packed data) */
 	R_ANAL_OP_FAMILY_PRIV,   /* priviledged instruction */
 	R_ANAL_OP_FAMILY_CRYPTO, /* cryptographic instructions */
+	R_ANAL_OP_FAMILY_THREAD, /* thread/lock/sync instructions */
 	R_ANAL_OP_FAMILY_VIRT,   /* virtualization instructions */
 	R_ANAL_OP_FAMILY_IO,     /* IO instructions (i.e. IN/OUT) */
 	R_ANAL_OP_FAMILY_LAST
@@ -453,6 +461,13 @@
 #endif
 } _RAnalOpType;
 
+typedef enum {
+	R_ANAL_OP_MASK_BASIC      = 0, // Just fills basic op info , it's fast
+	R_ANAL_OP_MASK_ESIL       = 1, // It fills RAnalop->esil info
+	R_ANAL_OP_MASK_VAL        = 2, // It fills RAnalop->dst/src info
+	R_ANAL_OP_MASK_ALL        = R_ANAL_OP_MASK_ESIL | R_ANAL_OP_MASK_VAL
+} RAnalOpMask;
+
 /* TODO: what to do with signed/unsigned conditionals? */
 typedef enum {
 	R_ANAL_COND_AL = 0,        // Always executed (no condition)
@@ -573,9 +588,12 @@
 #define R_ANAL_ESIL_GOTO_LIMIT 4096
 
 typedef struct r_anal_options_t {
+	int depth;
+	bool vars; //analyze local var and arguments
 	int cjmpref;
 	int jmpref;
 	int jmpabove;
+	bool ijmp;
 	int followdatarefs;
 	int searchstringrefs;
 	int followbrokenfcnsrefs;
@@ -584,23 +602,28 @@
 	int afterjmp; // continue analysis after jmp eax or forward jmp // option
 	int recont; // continue on recurse analysis mode
 	int eobjmp; // option
-	int bbsplit;
 	int noncode;
 	int nopskip; // skip nops at the beginning of functions
 	int hpskip; // skip `mov reg,reg` and `lea reg,[reg]`
 	int jmptbl; // analyze jump tables
 	bool pushret; // analyze push+ret as jmp
 	bool armthumb; //
+	bool endsize; // chop function size which is known to be buggy but goodie too
 } RAnalOptions;
 
+typedef enum {
+	R_ANAL_CPP_ABI_ITANIUM = 0,
+	R_ANAL_CPP_ABI_MSVC
+} RAnalCPPABI;
+
 typedef struct r_anal_t {
 	char *cpu;
 	char *os;
 	int bits;
 	int lineswidth; // wtf
 	int big_endian;
-	int split; // used only from core
 	int sleep; // sleep some usecs before analyzing more (avoid 100% cpu usages)
+	RAnalCPPABI cpp_abi;
 	void *user;
 	ut64 gp; // global pointer. used for mips. but can be used by other arches too in the future
 	RList *fcns;
@@ -625,20 +648,19 @@
 	int esil_goto_limit;
 	int pcalign;
 	int bitshift;
-	RList *types;
 	//struct r_anal_ctx_t *ctx;
 	struct r_anal_esil_t *esil;
 	struct r_anal_plugin_t *cur;
 	RAnalRange *limit;
 	RList *plugins;
-	Sdb *sdb_xrefs;
 	Sdb *sdb_types;
+	Sdb *sdb_fmts;
 	Sdb *sdb_meta; // TODO: Future r_meta api
 	Sdb *sdb_zigns;
 
 #if USE_DICT
-	dict *dict_refs;
-	dict *dict_xrefs;
+	SdbHash *dict_refs;
+	SdbHash *dict_xrefs;
 #endif
 	bool recursive_noreturn;
 	RSpaces meta_spaces;
@@ -668,8 +690,11 @@
 	RList /*RAnalRange*/ *bits_ranges;
 	RListComparator columnSort;
 	int stackptr;
+	bool fillval;
 	bool (*log)(struct r_anal_t *anal, const char *msg);
+	bool (*read_at)(struct r_anal_t *anal, ut64 addr, ut8 *buf, int len);
 	char *cmdtail;
+	int seggrn;
 } RAnal;
 
 typedef RAnalFunction *(* RAnalGetFcnIn)(RAnal *anal, ut64 addr, int type);
@@ -684,6 +709,7 @@
 	ut64 ptr;
 	ut64 jump;
 	ut64 fail;
+	ut64 ret; // hint for function ret values
 	char *arch;
 	char *opcode;
 	char *syntax;
@@ -691,6 +717,11 @@
 	char *offset;
 	int size;
 	int bits;
+	int new_bits; // change asm.bits after evaluating this instruction
+#if 0
+	int new_endian; // change the endianness
+	int new_bank; // select bank switch
+#endif
 	int immbase;
 	bool high; // highlight hint
 } RAnalHint;
@@ -710,10 +741,11 @@
 typedef struct r_anal_var_t {
 	char *name;  /* name of the variable */
 	char *type;  // cparse type of the variable
-	char kind;   // 'a'rg, 'v'ar ..
+	char kind;   // reg , stack ...
 	ut64 addr;   // not used correctly?
 	ut64 eaddr;  // not used correctly?
 	int size;
+	bool isarg;
 	int delta;   /* delta offset inside stack frame */
 	int scope;   /* global, local... | in, out... */
 	/* probably dupped or so */
@@ -757,6 +789,7 @@
 	int family;     /* family of opcode */
 	int id;         /* instruction id */
 	bool eob;       /* end of block (boolean) */
+	bool sign;      /* operates on signed values, false by default */
 	/* Run N instructions before executing the current one */
 	int delay;      /* delay N slots (mips, ..)*/
 	ut64 jump;      /* true jmp */
@@ -778,6 +811,7 @@
 	int scale;
 	ut64 disp;
 	RAnalSwitchOp *switch_op;
+	RAnalHint hint;
 } RAnalOp;
 
 #define R_ANAL_COND_SINGLE(x) (!x->arg[1] || x->arg[0]==x->arg[1])
@@ -836,7 +870,7 @@
 } RAnalRefType;
 
 typedef struct r_anal_ref_t {
-	int type;
+	RAnalRefType type;
 	ut64 addr;
 	ut64 at;
 } RAnalRef;
@@ -999,6 +1033,8 @@
 	RListIter *reg[R_REG_TYPE_LAST];
 } RAnalEsilSession;
 
+typedef int (*RAnalEsilHookRegWriteCB)(ESIL *esil, const char *name, ut64 *val);
+
 typedef struct r_anal_esil_callbacks_t {
 	void *user;
 	/* callbacks */
@@ -1010,13 +1046,14 @@
 	int (*mem_write)(ESIL *esil, ut64 addr, const ut8 *buf, int len);
 	int (*hook_reg_read)(ESIL *esil, const char *name, ut64 *res, int *size);
 	int (*reg_read)(ESIL *esil, const char *name, ut64 *res, int *size);
-	int (*hook_reg_write)(ESIL *esil, const char *name, ut64 *val);
+	RAnalEsilHookRegWriteCB hook_reg_write;
 	int (*reg_write)(ESIL *esil, const char *name, ut64 val);
 } RAnalEsilCallbacks;
 
 typedef struct r_anal_esil_t {
 	RAnal *anal;
 	char **stack;
+	ut64 addrmask;
 	int stacksize;
 	int stackptr;
 	int skip;
@@ -1194,37 +1231,20 @@
 R_API RAnalFunction *r_listrange_find_root(RListRange* s, ut64 addr);
 /* --------- */ /* REFACTOR */ /* ---------- */
 /* type.c */
-R_API int r_anal_type_get_size (RAnal *anal, const char *type);
-R_API RList* r_anal_type_get_by_offset(RAnal *anal, ut64 offset);
 R_API RAnalType *r_anal_type_new(void);
 R_API void r_anal_type_add(RAnal *l, RAnalType *t);
-R_API void r_anal_type_del(RAnal *l, const char *name);
-R_API RList *r_anal_type_list_new(void);
 R_API RAnalType *r_anal_type_find(RAnal *a, const char* name);
 R_API void r_anal_type_list(RAnal *a, short category, short enabled);
 R_API RAnalType *r_anal_str_to_type(RAnal *a, const char* s);
-R_API char *r_anal_type_to_str(RAnal *a, const char *name);
+R_API bool r_anal_op_nonlinear(int t);
+R_API bool r_anal_op_ismemref(int t);
 R_API const char *r_anal_optype_to_string(int t);
 R_API const char *r_anal_op_family_to_string (int n);
 R_API int r_anal_op_family_from_string(const char *f);
 R_API int r_anal_op_hint(RAnalOp *op, RAnalHint *hint);
 R_API RAnalType *r_anal_type_free(RAnalType *t);
 R_API RAnalType *r_anal_type_loadfile(RAnal *a, const char *path);
-R_API void r_anal_type_define (RAnal *anal, const char *key, const char *value);
-R_API void r_anal_type_header (RAnal *anal, const char *hdr);
 
-R_API int r_anal_type_link (RAnal *anal, const char *val, ut64 addr);
-R_API int r_anal_type_unlink(RAnal *anal, ut64 addr);
-R_API int r_anal_type_link_offset (RAnal *anal, const char *val, ut64 addr);
-R_API char *r_anal_type_format (RAnal *anal, const char *t);
-R_API int r_anal_type_set(RAnal *anal, ut64 at, const char *field, ut64 val);
-R_API int r_anal_type_func_exist(RAnal *anal, const char *func_name);
-R_API const char *r_anal_type_func_cc(RAnal *anal, const char *func_name);
- R_API const char *r_anal_type_func_ret(RAnal *anal, const char *func_name);
-R_API int r_anal_type_func_args_count(RAnal *anal, const char *func_name);
-R_API char *r_anal_type_func_args_type(RAnal *anal, const char *func_name, int i);
-R_API char *r_anal_type_func_args_name(RAnal *anal, const char *func_name, int i);
-R_API char *r_anal_type_func_guess(RAnal *anal, char *func_name);
 /* anal.c */
 R_API RAnal *r_anal_new(void);
 R_API int r_anal_purge (RAnal *anal);
@@ -1269,15 +1289,16 @@
 R_API RAnalOp *r_anal_op_new(void);
 R_API void r_anal_op_free(void *op);
 R_API bool r_anal_op_fini(RAnalOp *op);
+R_API RAnalVar *get_link_var(RAnal *anal, ut64 faddr, RAnalVar *var);
 R_API bool r_anal_op_is_eob (RAnalOp *op);
 R_API RList *r_anal_op_list_new(void);
 R_API int r_anal_op(RAnal *anal, RAnalOp *op, ut64 addr,
-		const ut8 *data, int len);
+		const ut8 *data, int len, int mask);
 R_API RAnalOp *r_anal_op_hexstr(RAnal *anal, ut64 addr,
 		const char *hexstr);
 R_API char *r_anal_op_to_string(RAnal *anal, RAnalOp *op);
 
-R_API RAnalEsil *r_anal_esil_new (int stacksize, int iotrap);
+R_API RAnalEsil *r_anal_esil_new (int stacksize, int iotrap, unsigned int addrsize);
 R_API void r_anal_esil_trace (RAnalEsil *esil, RAnalOp *op);
 R_API void r_anal_esil_trace_list (RAnalEsil *esil);
 R_API void r_anal_esil_trace_show (RAnalEsil *esil, int idx);
@@ -1334,7 +1355,6 @@
 R_API RList *r_anal_fcn_list_new(void);
 R_API int r_anal_fcn_insert(RAnal *anal, RAnalFunction *fcn);
 R_API void r_anal_fcn_free(void *fcn);
-R_API void r_anal_fcn_fill_args (RAnal *anal, RAnalFunction *fcn, RAnalOp *op);
 R_API int r_anal_fcn(RAnal *anal, RAnalFunction *fcn, ut64 addr,
 		ut8 *buf, ut64 len, int reftype);
 R_API int r_anal_fcn_add(RAnal *anal, ut64 addr, ut64 size,
@@ -1347,6 +1367,7 @@
 R_API bool r_anal_check_fcn(RAnal *anal, ut8 *buf, ut16 bufsz, ut64 addr, ut64 low, ut64 high);
 R_API void r_anal_fcn_update_tinyrange_bbs(RAnalFunction *fcn);
 
+
 /* locals */
 #if 0
 R_API int r_anal_fcn_local_add(RAnal *anal, RAnalFunction *fcn, int index, const char *name, const char *type);
@@ -1364,15 +1385,14 @@
 
 
 R_API int r_anal_fcn_var_del_bydelta (RAnal *a, ut64 fna, const char kind, int scope, ut32 delta);
-R_API int r_anal_fcn_var_del_byindex (RAnal *a, ut64 fna, const char kind,
-		int scope, ut32 idx);
+R_API int r_anal_fcn_var_del_byindex (RAnal *a, ut64 fna, const char kind, int scope, ut32 idx);
 /* args */
 R_API int r_anal_var_count(RAnal *a, RAnalFunction *fcn, int kind, int type);
 
 /* vars // globals. not here  */
 R_API bool r_anal_var_display(RAnal *anal, int delta, char kind, const char *type);
 R_API ut32 r_anal_fcn_size(const RAnalFunction *fcn);
-R_API void r_anal_fcn_set_size(RAnalFunction *fcn, ut32 size);
+R_API void r_anal_fcn_set_size(const RAnal *anal, RAnalFunction *fcn, ut32 size);
 R_API ut32 r_anal_fcn_contsize(const RAnalFunction *fcn);
 R_API ut32 r_anal_fcn_realsize(const RAnalFunction *fcn);
 R_API int r_anal_fcn_cc(RAnalFunction *fcn);
@@ -1381,76 +1401,69 @@
 R_API int r_anal_fcn_bb_overlaps(RAnalFunction *fcn, RAnalBlock *bb);
 R_API RAnalVar *r_anal_fcn_get_var(RAnalFunction *fs, int num, int dir);
 R_API void r_anal_fcn_fit_overlaps (RAnal *anal, RAnalFunction *fcn);
-R_API void r_anal_trim_jmprefs(RAnalFunction *fcn);
+R_API void r_anal_trim_jmprefs(RAnal *anal, RAnalFunction *fcn);
 R_API RAnalFunction *r_anal_fcn_next(RAnal *anal, ut64 addr);
 R_API char *r_anal_fcn_to_string(RAnal *a, RAnalFunction* fs);
 R_API int r_anal_str_to_fcn(RAnal *a, RAnalFunction *f, const char *_str);
 R_API int r_anal_fcn_count (RAnal *a, ut64 from, ut64 to);
-R_API RAnalBlock *r_anal_fcn_bbget(RAnalFunction *fcn, ut64 addr);
+R_API RAnalBlock *r_anal_fcn_bbget_in(RAnalFunction *fcn, ut64 addr);
+R_API RAnalBlock *r_anal_fcn_bbget_at(RAnalFunction *fcn, ut64 addr);
+R_API bool r_anal_fcn_contains(RAnalFunction *fcn, ut64 addr);
 R_API bool r_anal_fcn_bbadd(RAnalFunction *fcn, RAnalBlock *bb);
-R_API int r_anal_fcn_resize (RAnalFunction *fcn, int newsize);
+R_API int r_anal_fcn_resize (const RAnal *anal, RAnalFunction *fcn, int newsize);
 
-#if 0
-#define r_anal_fcn_get_refs(x) x->refs
-#define r_anal_fcn_get_xrefs(x) x->xrefs
-#define r_anal_fcn_get_vars(x) x->vars
-#define r_anal_fcn_get_bbs(x) x->bbs
-#else
+typedef bool (* RAnalRefCmp)(RAnalRef *ref, void *data);
+R_API RAnalRef *r_anal_ref_new(void);
+R_API RList *r_anal_ref_list_new(void);
+R_API void r_anal_ref_free(void *ref);
 R_API int r_anal_xrefs_count(RAnal *anal);
-R_API const char *r_anal_xrefs_type_tostring (char type);
-R_API RList *r_anal_xrefs_get (RAnal *anal, ut64 to);
-R_API RList *r_anal_refs_get (RAnal *anal, ut64 to);
-R_API RList *r_anal_xrefs_get_from (RAnal *anal, ut64 from);
+R_API const char *r_anal_xrefs_type_tostring(RAnalRefType type);
+R_API RAnalRefType r_anal_xrefs_type(char ch);
+R_API RList *r_anal_xrefs_get(RAnal *anal, ut64 to);
+R_API RList *r_anal_refs_get(RAnal *anal, ut64 to);
+R_API RList *r_anal_xrefs_get_from(RAnal *anal, ut64 from);
 R_API void r_anal_xrefs_list(RAnal *anal, int rad);
 R_API RList *r_anal_fcn_get_refs(RAnal *anal, RAnalFunction *fcn);
 R_API RList *r_anal_fcn_get_xrefs(RAnal *anal, RAnalFunction *fcn);
-R_API int r_anal_xrefs_from (RAnal *anal, RList *list, const char *kind, const RAnalRefType type, ut64 addr);
-R_API int r_anal_xrefs_set (RAnal *anal, const RAnalRefType type, ut64 from, ut64 to);
-R_API int r_anal_xrefs_deln (RAnal *anal, const RAnalRefType type, ut64 from, ut64 to);
-R_API bool r_anal_xrefs_save(RAnal *anal, const char *prjfile);
+R_API int r_anal_xrefs_from(RAnal *anal, RList *list, const char *kind, const RAnalRefType type, ut64 addr);
+R_API int r_anal_xrefs_set(RAnal *anal, ut64 from, ut64 to, const RAnalRefType type);
+R_API int r_anal_xrefs_deln(RAnal *anal, ut64 from, ut64 to, const RAnalRefType type);
+R_API int r_anal_xref_del(RAnal *anal, ut64 at, ut64 addr);
+
 R_API RList* r_anal_fcn_get_vars (RAnalFunction *anal);
 R_API RList* r_anal_fcn_get_bbs (RAnalFunction *anal);
 R_API RList* r_anal_get_fcns (RAnal *anal);
-#endif
-
-/* ref.c */
-R_API RAnalRef *r_anal_ref_new(void);
-R_API RList *r_anal_ref_list_new(void);
-R_API void r_anal_ref_free(void *ref);
-R_API const char *r_anal_ref_to_string(int type);
-R_API int r_anal_ref_add(RAnal *anal, ut64 addr, ut64 at, int type);
-R_API int r_anal_ref_del(RAnal *anal, ut64 at, ut64 addr);
-R_API RList *r_anal_xref_get(RAnal *anal, ut64 addr);
-R_API RList *r_anal_ref_get(RAnal *anal, ut64 addr);
 
 /* var.c */
 R_API void r_anal_var_access_clear (RAnal *a, ut64 var_addr, int scope, int index);
 R_API int r_anal_var_access (RAnal *a, ut64 var_addr, char kind, int scope, int index, int xs_type, ut64 xs_addr);
-
 R_API RAnalVar *r_anal_var_new(void);
-R_API int r_anal_var_rename (RAnal *a, ut64 var_addr, int scope, char kind, const char *old_name, const char *new_name);
-R_API int r_anal_var_retype (RAnal *a, ut64 addr, int scope, int delta, char kind, const char *type, int size, const char *name);
+R_API int r_anal_var_rename (RAnal *a, ut64 var_addr, int scope, char kind,
+		const char *old_name, const char *new_name, bool verbose);
+R_API int r_anal_var_retype (RAnal *a, ut64 addr, int scope, int delta, char kind,
+		const char *type, int size, bool isarg, const char *name);
 R_API RAnalVarAccess *r_anal_var_access_new(void);
 R_API RList *r_anal_var_list_new(void);
 R_API RList *r_anal_var_access_list_new(void);
 R_API void r_anal_var_free(RAnalVar *var);
 R_API void r_anal_var_access_free(void *access);
-//R_API int r_anal_var_add(RAnal *anal, RAnalFunction *fcn, ut64 from, int delta, int scope,
-//		RAnalType *type, const char *name, int set);
 R_API int r_anal_var_delete_all (RAnal *a, ut64 addr, const char kind);
 R_API int r_anal_var_delete (RAnal *a, ut64 var_addr, const char kind, int scope, int delta);
 R_API bool r_anal_var_delete_byname (RAnal *a, RAnalFunction *fcn, int type, const char *name);
-R_API bool r_anal_var_add (RAnal *a, ut64 addr, int scope, int delta, char kind, const char *type, int size, const char *name);
+R_API bool r_anal_var_add (RAnal *a, ut64 addr, int scope, int delta, char kind,
+		const char *type, int size, bool isarg, const char *name);
 R_API int r_anal_var_del(RAnal *anal, RAnalFunction *fcn, int delta, int scope);
+R_API ut64 r_anal_var_addr(RAnal *a, RAnalFunction *fcn, const char *name);
 R_API RAnalVar *r_anal_var_get (RAnal *a, ut64 addr, char kind, int scope, int index);
 R_API const char *r_anal_var_scope_to_str(RAnal *anal, int scope);
 R_API int r_anal_var_access_add(RAnal *anal, RAnalVar *var, ut64 from, int set);
 R_API int r_anal_var_access_del(RAnal *anal, RAnalVar *var, ut64 from);
+R_API void extract_vars(RAnal *anal, RAnalFunction *fcn, RAnalOp *op);
+R_API void extract_rarg(RAnal *anal, RAnalOp *op, RAnalFunction *fcn, int *reg_set, int *count);
 R_API RAnalVarAccess *r_anal_var_access_get(RAnal *anal, RAnalVar *var, ut64 from);
-R_API RAnalVar *r_anal_var_get_byname (RAnal *anal, RAnalFunction *fcn, const char* name);
+R_API RAnalVar *r_anal_var_get_byname (RAnal *anal, ut64 addr, const char* name);
 
 /* project */
-R_API bool r_anal_project_save(RAnal *anal, const char *prjfile);
 R_API bool r_anal_xrefs_init (RAnal *anal);
 
 #define R_ANAL_THRESHOLDFCN 0.7F
@@ -1501,8 +1514,10 @@
 // calling conventions API
 R_API int r_anal_cc_exist (RAnal *anal, const char *convention);
 R_API const char *r_anal_cc_arg(RAnal *anal, const char *convention, int n);
+R_API int r_anal_cc_max_arg(RAnal *anal, const char *cc);
 R_API const char *r_anal_cc_ret(RAnal *anal, const char *convention);
 R_API const char *r_anal_cc_default(RAnal *anal);
+R_API const char *r_anal_cc_func(RAnal *anal, const char *func_name);
 R_API const char *r_anal_cc_to_constant(RAnal *anal, char *convention);
 R_API bool r_anal_noreturn_at(RAnal *anal, ut64 addr);
 
@@ -1522,7 +1537,7 @@
 R_API RAnalData *r_anal_data_new (ut64 addr, int type, ut64 n, const ut8 *buf, int len);
 R_API void r_anal_data_free (RAnalData *d);
 #include <r_cons.h>
-R_API char *r_anal_data_to_string(RAnalData *d, RConsPalette *pal);
+R_API char *r_anal_data_to_string(RAnalData *d, RConsPrintablePalette *pal);
 
 R_API void r_meta_free(RAnal *m);
 R_API void r_meta_space_unset_for(RAnal *a, int type);
@@ -1538,6 +1553,7 @@
 R_API int r_meta_add(RAnal *m, int type, ut64 from, ut64 size, const char *str);
 R_API int r_meta_add_with_subtype(RAnal *m, int type, int subtype, ut64 from, ut64 size, const char *str);
 R_API RAnalMetaItem *r_meta_find(RAnal *m, ut64 off, int type, int where);
+R_API RAnalMetaItem *r_meta_find_in(RAnal *m, ut64 off, int type, int where);
 R_API int r_meta_cleanup(RAnal *m, ut64 from, ut64 to);
 R_API const char *r_meta_type_to_string(int type);
 R_API RList *r_meta_enumerate(RAnal *a, int type);
@@ -1549,9 +1565,6 @@
 R_API bool r_meta_deserialize_val(RAnalMetaItem *it, int type, ut64 from, const char *v);
 R_API void r_meta_print(RAnal *a, RAnalMetaItem *d, int rad, bool show_full);
 
-R_API int r_anal_fcn_xref_add (RAnal *anal, RAnalFunction *fcn, ut64 at, ut64 addr, int type);
-R_API int r_anal_fcn_xref_del (RAnal *anal, RAnalFunction *fcn, ut64 at, ut64 addr, int type);
-
 /* hints */
 
 R_API void r_anal_build_range_on_hints (RAnal *a);
@@ -1575,6 +1588,7 @@
 R_API void r_anal_hint_set_opcode (RAnal *a, ut64 addr, const char *str);
 R_API void r_anal_hint_set_esil (RAnal *a, ut64 addr, const char *str);
 R_API void r_anal_hint_set_pointer (RAnal *a, ut64 addr, ut64 jump);
+R_API void r_anal_hint_set_ret(RAnal *a, ut64 addr, ut64 val);
 R_API void r_anal_hint_set_high(RAnal *a, ut64 addr);
 R_API void r_anal_hint_unset_high(RAnal *a, ut64 addr);
 R_API void r_anal_hint_unset_size(RAnal *a, ut64 addr);
@@ -1584,6 +1598,7 @@
 R_API void r_anal_hint_unset_arch(RAnal *a, ut64 addr);
 R_API void r_anal_hint_unset_syntax(RAnal *a, ut64 addr);
 R_API void r_anal_hint_unset_pointer(RAnal *a, ut64 addr);
+R_API void r_anal_hint_unset_ret(RAnal *a, ut64 addr);
 R_API void r_anal_hint_unset_offset(RAnal *a, ut64 addr);
 R_API void r_anal_hint_unset_jump(RAnal *a, ut64 addr);
 R_API void r_anal_hint_unset_fail(RAnal *a, ut64 addr);
@@ -1640,6 +1655,47 @@
 R_API void r_sign_space_unset_for(RAnal *a, int idx);
 R_API void r_sign_space_rename_for(RAnal *a, int idx, const char *oname, const char *nname);
 
+/* vtables */
+typedef struct {
+	RAnal *anal;
+	RAnalCPPABI abi;
+	ut8 word_size;
+	bool (*read_addr) (RAnal *anal, ut64 addr, ut64 *buf);
+} RVTableContext;
+
+typedef struct vtable_info_t {
+	ut64 saddr; //starting address
+	int method_count;
+	RList* methods;
+} RVTableInfo;
+
+typedef struct vtable_method_info_t {
+	ut64 addr;           // addr of the function
+	ut64 vtable_offset;  // offset inside the vtable
+} RVTableMethodInfo;
+
+R_API void r_anal_vtable_info_fini(RVTableInfo *vtable);
+R_API ut64 r_anal_vtable_info_get_size(RVTableContext *context, RVTableInfo *vtable);
+R_API bool r_anal_vtable_begin(RAnal *anal, RVTableContext *context);
+R_API RList *r_anal_vtable_search(RVTableContext *context);
+R_API RList *r_anal_vtable_get_methods(RVTableContext *context, RVTableInfo *table);
+R_API void r_anal_list_vtables(RAnal *anal, int rad);
+
+/* rtti */
+R_API void r_anal_rtti_msvc_print_complete_object_locator(RVTableContext *context, ut64 addr, int mode);
+R_API void r_anal_rtti_msvc_print_type_descriptor(RVTableContext *context, ut64 addr, int mode);
+R_API void r_anal_rtti_msvc_print_class_hierarchy_descriptor(RVTableContext *context, ut64 addr, int mode);
+R_API void r_anal_rtti_msvc_print_base_class_descriptor(RVTableContext *context, ut64 addr, int mode);
+R_API bool r_anal_rtti_msvc_print_at_vtable(RVTableContext *context, ut64 addr, int mode, bool strict);
+
+R_API void r_anal_rtti_itanium_print_class_type_info(RVTableContext *context, ut64 addr, int mode);
+R_API void r_anal_rtti_itanium_print_si_class_type_info(RVTableContext *context, ut64 addr, int mode);
+R_API void r_anal_rtti_itanium_print_vmi_class_type_info(RVTableContext *context, ut64 addr, int mode);
+R_API void r_anal_rtti_itanium_print_at_vtable(RVTableContext *context, ut64 addr, int mode);
+
+R_API void r_anal_rtti_print_at_vtable(RAnal *anal, ut64 addr, int mode);
+R_API void r_anal_rtti_print_all(RAnal *anal, int mode);
+
 /* plugin pointers */
 extern RAnalPlugin r_anal_plugin_null;
 extern RAnalPlugin r_anal_plugin_xap;
@@ -1662,7 +1718,6 @@
 extern RAnalPlugin r_anal_plugin_sh;
 extern RAnalPlugin r_anal_plugin_sparc_gnu;
 extern RAnalPlugin r_anal_plugin_bf;
-extern RAnalPlugin r_anal_plugin_m68k;
 extern RAnalPlugin r_anal_plugin_m68k_cs;
 extern RAnalPlugin r_anal_plugin_z80;
 extern RAnalPlugin r_anal_plugin_i8080;
@@ -1672,6 +1727,7 @@
 extern RAnalPlugin r_anal_plugin_gb;
 extern RAnalPlugin r_anal_plugin_nios2;
 extern RAnalPlugin r_anal_plugin_malbolge;
+extern RAnalPlugin r_anal_plugin_hexagon;
 extern RAnalPlugin r_anal_plugin_wasm;
 extern RAnalPlugin r_anal_plugin_ws;
 extern RAnalPlugin r_anal_plugin_h8300;
diff -Nru radare2-2.3.0+dfsg/libr/include/r_asm.h radare2-2.8.0+dfsg/libr/include/r_asm.h
--- radare2-2.3.0+dfsg/libr/include/r_asm.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_asm.h	2018-08-07 14:12:36.000000000 +0000
@@ -73,6 +73,7 @@
 	ut8  buf[R_ASM_BUFSIZE + 1];
 	char buf_asm[R_ASM_BUFSIZE + 1];
 	char buf_hex[R_ASM_BUFSIZE + 1];
+	RBuffer *buf_inc;
 } RAsmOp;
 
 typedef struct r_asm_code_t {
@@ -116,6 +117,7 @@
 	int bitshift;
 	bool immdisp; // Display immediates with # symbol (for arm stuff).
 	SdbHash *flags;
+	int seggrn;
 } RAsm;
 
 typedef int (*RAsmModifyCallback)(RAsm *a, ut8 *buf, int field, ut64 val);
@@ -195,7 +197,6 @@
 extern RAsmPlugin r_asm_plugin_java;
 extern RAsmPlugin r_asm_plugin_mips_gnu;
 extern RAsmPlugin r_asm_plugin_mips_cs;
-extern RAsmPlugin r_asm_plugin_x86_udis;
 extern RAsmPlugin r_asm_plugin_x86_as;
 extern RAsmPlugin r_asm_plugin_x86_nz;
 extern RAsmPlugin r_asm_plugin_x86_nasm;
@@ -203,7 +204,6 @@
 extern RAsmPlugin r_asm_plugin_arm_gnu;
 extern RAsmPlugin r_asm_plugin_arm_cs;
 extern RAsmPlugin r_asm_plugin_arm_as;
-extern RAsmPlugin r_asm_plugin_armthumb;
 extern RAsmPlugin r_asm_plugin_arm_winedbg;
 extern RAsmPlugin r_asm_plugin_xap;
 extern RAsmPlugin r_asm_plugin_ppc_gnu;
@@ -214,7 +214,6 @@
 extern RAsmPlugin r_asm_plugin_sh;
 extern RAsmPlugin r_asm_plugin_z80;
 extern RAsmPlugin r_asm_plugin_i8080;
-extern RAsmPlugin r_asm_plugin_m68k;
 extern RAsmPlugin r_asm_plugin_m68k_cs;
 extern RAsmPlugin r_asm_plugin_arc;
 extern RAsmPlugin r_asm_plugin_dcpu16;
@@ -251,10 +250,10 @@
 extern RAsmPlugin r_asm_plugin_tricore;
 extern RAsmPlugin r_asm_plugin_pic;
 extern RAsmPlugin r_asm_plugin_rsp;
+extern RAsmPlugin r_asm_plugin_hexagon;
 extern RAsmPlugin r_asm_plugin_hexagon_gnu;
 extern RAsmPlugin r_asm_plugin_wasm;
 extern RAsmPlugin r_asm_plugin_tms320c64x;
-extern RAsmPlugin r_asm_plugin_evm;
 
 #endif
 
diff -Nru radare2-2.3.0+dfsg/libr/include/r_bind.h radare2-2.8.0+dfsg/libr/include/r_bind.h
--- radare2-2.3.0+dfsg/libr/include/r_bind.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_bind.h	2018-08-07 14:12:36.000000000 +0000
@@ -18,6 +18,7 @@
 typedef void (*RCoreSeekArchBits)(void *core, ut64 addr); 
 typedef int (*RCoreConfigGetI)(void *core, const char *key);
 typedef const char *(*RCoreConfigGet)(void *core, const char *key);
+typedef ut64 (*RCoreNumGet)(void *core, const char *str);
 
 typedef struct r_core_bind_t {
 	void *core;
@@ -33,6 +34,7 @@
 	RCoreSeekArchBits archbits;
 	RCoreConfigGetI cfggeti;
 	RCoreConfigGet cfgGet;
+	RCoreNumGet numGet;
 } RCoreBind;
 
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_bin.h radare2-2.8.0+dfsg/libr/include/r_bin.h
--- radare2-2.3.0+dfsg/libr/include/r_bin.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_bin.h	2018-08-07 14:12:36.000000000 +0000
@@ -18,7 +18,6 @@
 #define R_BIN_SCN_WRITABLE   (1 << 1)
 #define R_BIN_SCN_READABLE   (1 << 2)
 #define R_BIN_SCN_SHAREABLE  (1 << 3)
-#define R_BIN_SCN_MAP        (1 << 4)
 
 #define R_BIN_DBG_STRIPPED 0x01
 #define R_BIN_DBG_STATIC   0x02
@@ -31,6 +30,7 @@
 #define R_BIN_ENTRY_TYPE_INIT    2
 #define R_BIN_ENTRY_TYPE_FINI    3
 #define R_BIN_ENTRY_TYPE_TLS     4
+#define R_BIN_ENTRY_TYPE_PREINIT 5
 
 #define R_BIN_SIZEOF_STRINGS 512
 #define R_BIN_MAX_ARCH 1024
@@ -66,6 +66,7 @@
 #define R_BIN_REQ_LISTPLUGINS 0x4000000
 #define R_BIN_REQ_RESOURCES 0x8000000
 #define R_BIN_REQ_INITFINI 0x10000000
+#define R_BIN_REQ_SEGMENTS 0x20000000
 
 /* RBinSymbol->method_flags : */
 #define R_BIN_METH_CLASS 0x0000000000000001L
@@ -91,6 +92,30 @@
 #define R_BIN_METH_CONSTRUCTOR 0x0000000000100000L
 #define R_BIN_METH_DECLARED_SYNCHRONIZED 0x0000000000200000L
 
+#define R_BIN_BIND_LOCAL_STR "LOCAL"
+#define R_BIN_BIND_GLOBAL_STR "GLOBAL"
+#define R_BIN_BIND_WEAK_STR "WEAK"
+#define R_BIN_BIND_NUM_STR "NUM"
+#define R_BIN_BIND_LOOS_STR "LOOS"
+#define R_BIN_BIND_HIOS_STR "HIOS"
+#define R_BIN_BIND_LOPROC_STR "LOPROC"
+#define R_BIN_BIND_HIPROC_STR "HIPROC"
+#define R_BIN_BIND_UNKNOWN_STR "UNKNOWN"
+
+#define R_BIN_TYPE_NOTYPE_STR "NOTYPE"
+#define R_BIN_TYPE_OBJECT_STR "OBJ"
+#define R_BIN_TYPE_FUNC_STR "FUNC"
+#define R_BIN_TYPE_SECTION_STR "SECT"
+#define R_BIN_TYPE_FILE_STR "FILE"
+#define R_BIN_TYPE_COMMON_STR "COMMON"
+#define R_BIN_TYPE_TLS_STR "TLS"
+#define R_BIN_TYPE_NUM_STR "NUM"
+#define R_BIN_TYPE_LOOS_STR "LOOS"
+#define R_BIN_TYPE_HIOS_STR "HIOS"
+#define R_BIN_TYPE_LOPROC_STR "LOPROC"
+#define R_BIN_TYPE_HIPROC_STR "HIPROC"
+#define R_BIN_TYPE_UNKNOWN_STR "UNK"
+
 enum {
 	R_BIN_SYM_ENTRY,
 	R_BIN_SYM_INIT,
@@ -136,10 +161,16 @@
 	R_BIN_RELOC_64 = 64
 };
 
+enum {
+	R_BIN_TYPE_DEFAULT = 0,
+	R_BIN_TYPE_CORE = 1
+};
+
 typedef struct r_bin_addr_t {
 	ut64 vaddr;
 	ut64 paddr;
-	ut64 haddr;
+	ut64 hvaddr;
+	ut64 hpaddr;
 	int type;
 	int bits;
 } RBinAddr;
@@ -172,6 +203,7 @@
 	int has_va;
 	int has_pi; // pic/pie
 	int has_canary;
+	int has_retguard;
 	int has_crypto;
 	int has_nx;
 	int big_endian;
@@ -212,16 +244,20 @@
 	RList/*<RBinClass>*/ *classes;
 	RList/*<RBinDwarfRow>*/ *lines;
 	RList/*<??>*/ *mem;	//RBinMem maybe?
+	RList/*<BinMap*/ *maps;
+	char *regstate;
 	RBinInfo *info;
 	RBinAddr *binsym[R_BIN_SYM_LAST];
 	struct r_bin_plugin_t *plugin;
 	int referenced;
 	int lang;
 	Sdb *kv;
+	Sdb *addr2klassmethod;
 	void *bin_obj; // internal pointer used by formats
 } RBinObject;
 
-// XXX: this is a copy of RBinObject
+// XXX: RbinFile may hold more than one RBinObject
+/// XX curplugin == o->plugin
 typedef struct r_bin_file_t {
 	char *file;
 	int fd;
@@ -248,6 +284,15 @@
 	struct r_bin_t *rbin;
 } RBinFile;
 
+typedef struct RBinFileOptions {
+	int rawstr;
+	ut64 baddr; // base address
+	ut64 laddr; // load address
+	ut64 paddr; // offset
+	const char *plugname; // force a plugin? why do i need this?
+	// const char *xtrname;
+} RBinFileOptions;
+
 typedef struct r_bin_t {
 	const char *file;
 	RBinFile *cur;
@@ -260,7 +305,7 @@
 	ut64 maxstrbuf;
 	int rawstr;
 	Sdb *sdb;
-	RIDPool *file_ids;
+	RIDStorage *ids;
 	RList/*<RBinPlugin>*/ *plugins;
 	RList/*<RBinXtrPlugin>*/ *binxtrs;
 	RList/*<RBinLdrPlugin>*/ *binldrs;
@@ -290,6 +335,7 @@
 	char *libname;
 	char *machine;
 	char *type;
+	const char *xtr_type;
 } RBinXtrMetadata;
 
 typedef int (*FREE_XTR)(void *xtr_obj);
@@ -352,7 +398,8 @@
 	int (*fini)(void *user);
 	Sdb * (*get_sdb)(RBinFile *obj);
 	bool (*load)(RBinFile *arch);
-	void *(*load_bytes)(RBinFile *arch, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb);
+	void *(*load_bytes)(RBinFile *bf, const ut8 *buf, ut64 sz, ut64 loadaddr, Sdb *sdb);
+	void *(*load_buffer)(RBinFile *bf, RBuffer *buf, ut64 loadaddr, Sdb *sdb);
 	ut64 (*size)(RBinFile *bin); // return ut64 maybe? meh
 	int (*destroy)(RBinFile *arch);
 	bool (*check_bytes)(const ut8 *buf, ut64 length);
@@ -372,6 +419,7 @@
 	RList/*<RBinClass>*/* (*classes)(RBinFile *arch);
 	RList/*<RBinMem>*/* (*mem)(RBinFile *arch);
 	RList/*<RBinReloc>*/* (*patch_relocs)(RBin *bin);
+	RList/*<RBinMap>*/* (*maps)(RBinFile *arch);
 	void (*header)(RBinFile *arch);
 	char* (*signature)(RBinFile *arch, bool json);
 	int (*demangle_type)(const char *str);
@@ -382,6 +430,8 @@
 	ut64 (*get_vaddr)(RBinFile *arch, ut64 baddr, ut64 paddr, ut64 vaddr);
 	RBuffer* (*create)(RBin *bin, const ut8 *code, int codelen, const ut8 *data, int datalen);
 	char* (*demangle)(const char *str);
+	char* (*regstate)(RBinFile *arch);
+	int (*file_type)(RBinFile *arch);
 	/* default value if not specified by user */
 	int minstrlen;
 	char strfilter;
@@ -402,6 +452,7 @@
 	bool has_strings;
 	bool add; // indicates when you want to add the section to io `S` command
 	bool is_data;
+	bool is_segment;
 } RBinSection;
 
 typedef struct r_bin_class_t {
@@ -418,9 +469,16 @@
 
 #define RBinSectionName r_offsetof(RBinSection, name)
 #define RBinSectionOffset r_offsetof(RBinSection, offset)
-// usage:
-// r_list_get_by_name(bin->sections, RBinSectionName, ".text");
-// bin.sections.get_by_name(SectionName, ".text");
+
+#define REBASE_PADDR(o, l, type_t)\
+	do { \
+		RListIter *_it;\
+		type_t *_el;\
+		r_list_foreach ((l), _it, _el) { \
+			_el->paddr += (o)->loadaddr;\
+		}\
+	} while (0)
+
 
 typedef struct r_bin_symbol_t {
 	/* heap-allocated */
@@ -508,6 +566,14 @@
 	RList *mirrors;		//for mirror access; stuff here should only create new maps not new fds
 } RBinMem;
 
+typedef struct r_bin_map_t {
+	ut64 addr;
+	ut64 offset;
+	int size;
+	int perms;
+	char *file;
+} RBinMap;
+
 typedef struct r_bin_dbginfo_t {
 	int (*get_line)(RBinFile *arch, ut64 addr, char *file, int len, int *line);
 } RBinDbgInfo;
@@ -539,32 +605,103 @@
 
 #ifdef R_API
 
-/* bin.c */
-R_API void r_bin_load_filter(RBin *bin, ut64 rules);
+/* fd api */
+
+typedef struct r_bin_options_t {
+	ut64 offset; // starting physical address to read from the target file
+	ut64 baseaddr; // where the linker maps the binary in memory
+	ut64 loadaddr; // the desired offset where the binary should be loaded
+	ut64 size; // restrict the size of the target fd
+	int xtr_idx; // load Nth binary
+	int rawstr;
+	int iofd;
+	char *name; // or comment :?
+} RBinOptions;
+
+R_API RBinImport *r_bin_import_clone(RBinImport *o);
+R_API RBinSymbol *r_bin_symbol_clone(RBinSymbol *o);
+
+R_API RBinOptions *r_bin_options_new (ut64 offset, ut64 baddr, int rawstr);
+R_API void r_bin_options_free(RBinOptions *bo);
+R_API int r_bin_open(RBin *bin, const char *filename, RBinOptions *bo);
+R_API RBinFile *r_bin_get_file (RBin *bin, int bd);
+R_API bool r_bin_close(RBin *bin, int bd);
+R_API bool r_bin_query(RBin *bin, const char *query);
+
+/* load */
 R_API int r_bin_load(RBin *bin, const char *file, ut64 baseaddr, ut64 loadaddr, int xtr_idx, int fd, int rawstr);
-R_API int r_bin_reload(RBin *bin, int fd, ut64 baseaddr);
 R_API int r_bin_load_as(RBin *bin, const char *file, ut64 baseaddr, ut64 loadaddr, int xtr_idx, int fd, int rawstr, int fileoffset, const char *name);
 R_API int r_bin_load_io(RBin *bin, int fd, ut64 baseaddr, ut64 loadaddr, int xtr_idx);
-R_API bool r_bin_load_io_at_offset_as(RBin *bin, int fd, ut64 baseaddr, ut64 loadaddr, int xtr_idx, ut64 offset, const char *name);
 R_API int r_bin_load_io_at_offset_as_sz(RBin *bin, int fd, ut64 baseaddr, ut64 loadaddr, int xtr_idx, ut64 offset, const char *name, ut64 sz);
+
+/* bin.c */
+R_API void r_bin_load_filter(RBin *bin, ut64 rules);
+R_API int r_bin_load_languages(RBinFile *binfile);
+
+R_API int r_bin_reload(RBin *bin, int fd, ut64 baseaddr);
 R_API void r_bin_bind(RBin *b, RBinBind *bnd);
 R_API bool r_bin_add(RBin *bin, RBinPlugin *foo);
 R_API bool r_bin_xtr_add(RBin *bin, RBinXtrPlugin *foo);
 R_API bool r_bin_ldr_add(RBin *bin, RBinLdrPlugin *foo);
 R_API void* r_bin_free(RBin *bin);
-R_API int r_bin_load_languages(RBinFile *binfile);
-R_API int r_bin_dump_strings(RBinFile *a, int min);
-R_API RList* r_bin_raw_strings(RBinFile *a, int min);
+R_API RList *r_bin_raw_strings(RBinFile *a, int min);
+R_API int r_bin_dump_strings(RBinFile *a, int min, int raw);
 //io-wrappers
 R_API int r_bin_read_at (RBin *bin, ut64 addr, ut8 *buf, int size);
 R_API int r_bin_write_at (RBin *bin, ut64 addr, const ut8 *buf, int size);
 
+/* file.c */
+R_API RBinFile *r_bin_file_new(RBin *bin, const char *file, const ut8 *bytes, ut64 sz, ut64 file_sz, int rawstr, int fd, const char *xtrname, Sdb *sdb, bool steal_ptr);
+R_API bool r_bin_file_object_new_from_xtr_data(RBin *bin, RBinFile *bf, ut64 baseaddr, ut64 loadaddr, RBinXtrData *data);
+R_API RBinFile *r_bin_file_new_from_bytes(RBin *bin, const char *file, const ut8 *bytes, ut64 sz, ut64 file_sz, int rawstr, ut64 baseaddr, ut64 loadaddr, int fd, const char *pluginname, const char *xtrname, ut64 offset, bool steal_ptr);
+R_API RBinFile *r_bin_file_new_from_fd(RBin *bin, int fd, RBinFileOptions *options);
+R_API RBinFile *r_bin_file_find_by_arch_bits(RBin *bin, const char *arch, int bits, const char *name);
+R_API RBinObject *r_bin_file_object_find_by_id(RBinFile *binfile, ut32 binobj_id);
+R_API RList *r_bin_file_get_strings(RBinFile *a, int min, int dump, int raw);
+R_API void r_bin_file_get_strings_range(RBinFile *bf, RList *list, int min, int raw, ut64 from, ut64 to);
+R_API RBinFile *r_bin_file_find_by_object_id(RBin *bin, ut32 binobj_id);
+R_API RBinFile *r_bin_file_find_by_id(RBin *bin, ut32 binfile_id);
+R_API int r_bin_file_object_add(RBinFile *binfile, RBinObject *o);
+R_API int r_bin_file_delete_all(RBin *bin);
+R_API int r_bin_file_delete(RBin *bin, ut32 bin_fd);
+R_API RBinFile *r_bin_file_find_by_fd(RBin *bin, ut32 bin_fd);
+R_API RBinFile *r_bin_file_find_by_name(RBin *bin, const char *name);
+R_API RBinFile *r_bin_file_find_by_name_n(RBin *bin, const char *name, int idx);
+R_API bool r_bin_file_set_cur_binfile_obj(RBin *bin, RBinFile *bf, RBinObject *obj);
+R_API int r_bin_file_set_cur_binfile(RBin *bin, RBinFile *bf);
+R_API int r_bin_file_set_cur_by_name(RBin *bin, const char *name);
+R_API RBinObject *r_bin_file_object_get_cur(RBinFile *binfile);
+R_API int r_bin_file_cur_set_plugin(RBinFile *binfile, RBinPlugin *plugin);
+R_API int r_bin_file_ref(RBin *bin, RBinFile *a);
+R_API void r_bin_file_free(void /*RBinFile*/ *bf_);
+R_API RBinFile *r_bin_file_create_append(RBin *bin, const char *file, const ut8 *bytes, ut64 sz, ut64 file_sz, int rawstr, int fd, const char *xtrname, bool steal_ptr);
+R_API RBinFile *r_bin_file_xtr_load_bytes(RBin *bin, RBinXtrPlugin *xtr, const char *filename, const ut8 *bytes, ut64 sz, ut64 file_sz, ut64 baseaddr, ut64 loadaddr, int idx, int fd, int rawstr);
+R_API bool r_bin_file_set_bytes(RBinFile *binfile, const ut8 *bytes, ut64 sz, bool steal_ptr);
+R_API RBinPlugin *r_bin_file_cur_plugin(RBinFile *binfile);
+
+/* obj.c */
+R_API void r_bin_object_free(void /*RBinObject*/ *o_);
+R_API ut64 r_bin_object_get_baddr(RBinObject *o);
+R_API void r_bin_object_filter_strings (RBinObject *bo);
+R_API void r_bin_object_set_baddr(RBinObject *o, ut64 baddr);
+R_API RBinObject *r_bin_object_new(RBinFile *binfile, RBinPlugin *plugin, ut64 baseaddr, ut64 loadaddr, ut64 offset, ut64 sz);
+R_API int r_bin_object_set_items(RBinFile *binfile, RBinObject *o);
+R_API RBinObject *r_bin_object_get_cur(RBin *bin);
+R_API RBinObject *r_bin_object_find_by_arch_bits(RBinFile *binfile, const char *arch, int bits, const char *name);
+R_API int r_bin_object_delete(RBin *bin, ut32 binfile_id, ut32 binobj_id);
+R_API void r_bin_object_delete_items(RBinObject *o);
+
 // ref
 R_API int r_bin_file_deref_by_bind (RBinBind * binb);
 R_API int r_bin_file_deref (RBin *bin, RBinFile * a);
 R_API int r_bin_file_ref_by_bind (RBinBind * binb);
 R_API int r_bin_file_ref (RBin *bin, RBinFile * a);
 R_API bool r_bin_file_object_new_from_xtr_data(RBin *bin, RBinFile *bf, ut64 baseaddr, ut64 loadaddr,
+
+#define MODE_PRINT 0x000
+#define MODE_RADARE 0x001
+#define MODE_SIMPLE 0x004
+
 						RBinXtrData *xtr_data);
 R_API int r_bin_list(RBin *bin, int json);
 R_API int r_bin_list_plugin(RBin *bin, const char* name, int json);
@@ -577,6 +714,10 @@
 R_API RBinAddr* r_bin_get_sym(RBin *bin, int sym);
 R_API const char *r_bin_entry_type_string(int etype);
 
+R_API RBinXtrPlugin *r_bin_get_xtrplugin_by_name(RBin *bin, const char *name);
+R_API RBinPlugin *r_bin_get_binplugin_by_name(RBin *bin, const char *name);
+R_API RBinPlugin *r_bin_get_binplugin_any(RBin *bin);
+
 R_API char* r_bin_demangle(RBinFile *binfile, const char *lang, const char *str, ut64 vaddr);
 R_API int r_bin_demangle_type (const char *str);
 R_API char *r_bin_demangle_java(const char *str);
@@ -605,11 +746,13 @@
 R_API RList* r_bin_get_sections(RBin *bin);
 R_API RList* /*<RBinClass>*/r_bin_get_classes(RBin *bin);
 
+// TODO: rename to r_bin_file_get_class() etc
 R_API RBinClass *r_bin_class_get (RBinFile *binfile, const char *name);
 R_API RBinClass *r_bin_class_new (RBinFile *binfile, const char *name, const char *super, int view);
 R_API void r_bin_class_free(RBinClass *c);
 R_API RBinSymbol *r_bin_class_add_method (RBinFile *binfile, const char *classname, const char *name, int nargs);
 R_API void r_bin_class_add_field (RBinFile *binfile, const char *classname, const char *name);
+R_API RList *r_bin_classes_from_symbols (RBinFile *bf, RBinObject *o);
 
 R_API RBinSection* r_bin_get_section_at(RBinObject *o, ut64 off, int va);
 R_API RList* r_bin_get_strings(RBin *bin);
@@ -628,17 +771,13 @@
 R_API void r_bin_iobind(RBin *bin, RIO *io);
 R_API RBinFile * r_bin_cur(RBin *bin);
 R_API RBinObject * r_bin_cur_object(RBin *bin);
-R_API int r_bin_file_set_cur_binfile_obj(RBin * bin, RBinFile *bf, RBinObject *obj);
 R_API int r_bin_io_load(RBin *bin, RIO *io, int fd, ut64 baseaddr, ut64 loadaddr, int dummy);
 
 R_API int r_bin_select(RBin *bin, const char *arch, int bits, const char *name);
 R_API int r_bin_select_idx(RBin *bin, const char *name, int idx);
-R_API int r_bin_select_by_ids(RBin *bin, ut32 binfile_id, ut32 binobj_id );
-R_API int r_bin_object_delete (RBin *bin, ut32 binfile_id, ut32 binobj_id);
-R_API int r_bin_object_set_items(RBinFile *binfile, RBinObject *o);
+R_API int r_bin_select_by_ids(RBin *bin, ut32 binfile_id, ut32 binobj_id);
 R_API int r_bin_use_arch(RBin *bin, const char *arch, int bits, const char *name);
 R_API RBinFile * r_bin_file_find_by_arch_bits(RBin *bin, const char *arch, int bits, const char *name);
-R_API RBinObject * r_bin_object_find_by_arch_bits (RBinFile *binfile, const char *arch, int bits, const char *name);
 R_API void r_bin_list_archs(RBin *bin, int mode);
 R_API void r_bin_set_user_ptr(RBin *bin, void *user);
 R_API RBuffer *r_bin_create (RBin *bin, const ut8 *code, int codelen, const ut8 *data, int datalen);
@@ -648,11 +787,9 @@
 R_API int r_bin_file_delete(RBin *bin, ut32 bin_fd);
 R_API int r_bin_file_delete_all(RBin *bin);
 R_API int r_bin_file_set_cur_by_fd (RBin *bin, ut32 bin_fd);
-R_API int r_bin_file_set_cur_by_name (RBin * bin, const char * name);
 R_API RBinFile * r_bin_file_find_by_fd (RBin *bin, ut32 bin_fd);
 R_API RBinFile * r_bin_file_find_by_name (RBin * bin, const char * name);
 R_API RBinFile * r_bin_file_find_by_name_n (RBin * bin, const char * name, int idx);
-R_API int r_bin_file_set_cur_binfile (RBin * bin, RBinFile *bf);
 R_API RBinPlugin * r_bin_file_cur_plugin (RBinFile *binfile);
 R_API void r_bin_force_plugin (RBin *bin, const char *pname);
 R_API const char *r_bin_string_type (int type);
@@ -685,6 +822,8 @@
 R_API void r_bin_filter_symbols (RList *list);
 R_API void r_bin_filter_sections (RList *list);
 R_API void r_bin_filter_classes (RList *list);
+R_API bool r_bin_strpurge(RBin *bin, const char *str, ut64 addr);
+R_API bool r_bin_string_filter(RBin *bin, const char *str, ut64 addr);
 
 /* plugin pointers */
 extern RBinPlugin r_bin_plugin_any;
@@ -705,7 +844,6 @@
 extern RBinPlugin r_bin_plugin_mdmp;
 extern RBinPlugin r_bin_plugin_java;
 extern RBinPlugin r_bin_plugin_dex;
-extern RBinPlugin r_bin_plugin_dummy;
 extern RBinPlugin r_bin_plugin_coff;
 extern RBinPlugin r_bin_plugin_ningb;
 extern RBinPlugin r_bin_plugin_ningba;
@@ -715,6 +853,7 @@
 extern RBinPlugin r_bin_plugin_bflt;
 extern RBinXtrPlugin r_bin_xtr_plugin_xtr_fatmach0;
 extern RBinXtrPlugin r_bin_xtr_plugin_xtr_dyldcache;
+extern RBinXtrPlugin r_bin_xtr_plugin_xtr_pemixed; 
 extern RBinLdrPlugin r_bin_ldr_plugin_ldr_linux;
 extern RBinPlugin r_bin_plugin_zimg;
 extern RBinPlugin r_bin_plugin_omf;
diff -Nru radare2-2.3.0+dfsg/libr/include/r_binheap.h radare2-2.8.0+dfsg/libr/include/r_binheap.h
--- radare2-2.3.0+dfsg/libr/include/r_binheap.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_binheap.h	2018-08-07 14:12:36.000000000 +0000
@@ -7,17 +7,17 @@
 #endif
 
 typedef struct r_binheap_t {
-	RVector a;
-	RVectorComparator cmp;
+	RPVector a;
+	RPVectorComparator cmp;
 } RBinHeap;
 
-R_API void r_binheap_clear(RBinHeap *h, void (*elem_free)(void *));
-#define r_binheap_empty(h) (!(h)->a.len)
-R_API void r_binheap_init(RBinHeap *h, RVectorComparator cmp);
-R_API RBinHeap *r_binheap_new(RVectorComparator cmp);
+R_API void r_binheap_clear(RBinHeap *h);
+#define r_binheap_empty(h) (r_pvector_empty (&(h)->a))
+R_API void r_binheap_init(RBinHeap *h, RPVectorComparator cmp);
+R_API RBinHeap *r_binheap_new(RPVectorComparator cmp);
 R_API bool r_binheap_push(RBinHeap *h, void *x);
 R_API void *r_binheap_pop(RBinHeap *h);
-#define r_binheap_top(h) ((h)->a.a[0])
+#define r_binheap_top(h) (r_pvector_at(&((h)->a), 0))
 
 #ifdef __cplusplus
 }
diff -Nru radare2-2.3.0+dfsg/libr/include/r_bp.h radare2-2.8.0+dfsg/libr/include/r_bp.h
--- radare2-2.3.0+dfsg/libr/include/r_bp.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_bp.h	2018-08-07 14:12:36.000000000 +0000
@@ -52,12 +52,14 @@
 	int trace;
 	int internal; /* used for internal purposes */
 	int enabled;
+	int togglehits; /* counter that toggles breakpoint on reaching 0 */
 	int hits;
 	ut8 *obytes; /* original bytes */
 	ut8 *bbytes; /* breakpoint bytes */
 	int pids[R_BP_MAXPIDS];
 	char *data;
 	char *cond; /* used for conditional breakpoints */
+	char *expr; /* to be used for named breakpoints (see r_debug_bp_update) */
 } RBreakpointItem;
 
 typedef int (*RBreakpointCallback)(void *bp, RBreakpointItem *b, bool set);
@@ -86,6 +88,7 @@
 	R_BP_PROT_EXEC = 1,
 	R_BP_PROT_WRITE = 2,
 	R_BP_PROT_READ = 4,
+	R_BP_PROT_ACCESS = 8,
 };
 
 typedef struct r_bp_trace_t {
@@ -119,12 +122,13 @@
 R_API int r_bp_get_bytes(RBreakpoint *bp, ut8 *buf, int len, int endian, int idx);
 R_API int r_bp_set_trace(RBreakpoint *bp, ut64 addr, int set);
 R_API int r_bp_set_trace_all(RBreakpoint *bp, int set);
-R_API RBreakpointItem *r_bp_enable(RBreakpoint *bp, ut64 addr, int set);
+R_API RBreakpointItem *r_bp_enable(RBreakpoint *bp, ut64 addr, int set, int count);
 R_API int r_bp_enable_all(RBreakpoint *bp, int set);
 
 /* index api */
 R_API int r_bp_del_index(RBreakpoint *bp, int idx);
 R_API RBreakpointItem *r_bp_get_index(RBreakpoint *bp, int idx);
+R_API int r_bp_get_index_at (RBreakpoint *bp, ut64 addr);
 R_API RBreakpointItem *r_bp_item_new (RBreakpoint *bp);
 
 R_API RBreakpointItem *r_bp_get_at (RBreakpoint *bp, ut64 addr);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_cmd.h radare2-2.8.0+dfsg/libr/include/r_cmd.h
--- radare2-2.3.0+dfsg/libr/include/r_cmd.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_cmd.h	2018-08-07 14:12:36.000000000 +0000
@@ -93,14 +93,14 @@
 	const char *version;
 	RCmdCallback call;
 	RCmdCallback init;
-	RCmdCallback deinit;
+	RCmdCallback fini;
 } RCorePlugin;
 
 #ifdef R_API
 R_API int r_core_plugin_init(RCmd *cmd);
 R_API int r_core_plugin_add(RCmd *cmd, RCorePlugin *plugin);
 R_API int r_core_plugin_check(RCmd *cmd, const char *a0);
-R_API int r_core_plugin_deinit(RCmd *cmd);
+R_API int r_core_plugin_fini(RCmd *cmd);
 
 /* review api */
 R_API RCmd *r_cmd_new(void);
@@ -122,7 +122,7 @@
 R_API int r_cmd_macro_call(RCmdMacro *mac, const char *name);
 R_API int r_cmd_macro_break(RCmdMacro *mac, const char *value);
 
-R_API int r_cmd_alias_del (RCmd *cmd, const char *k);
+R_API bool r_cmd_alias_del (RCmd *cmd, const char *k);
 R_API char **r_cmd_alias_keys(RCmd *cmd, int *sz);
 R_API int r_cmd_alias_set (RCmd *cmd, const char *k, const char *v, int remote);
 R_API char *r_cmd_alias_get (RCmd *cmd, const char *k, int remote);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_cons.h radare2-2.8.0+dfsg/libr/include/r_cons.h
--- radare2-2.3.0+dfsg/libr/include/r_cons.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_cons.h	2018-08-07 14:12:36.000000000 +0000
@@ -1,8 +1,6 @@
 #ifndef R2_CONS_H
 #define R2_CONS_H
 
-#define HAVE_DIETLINE 1
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -28,7 +26,6 @@
 #include <unistd.h>
 
 /* constants */
-#define ENUM_FOR_PAL 0
 #define CONS_MAX_USER 102400
 #define CONS_BUFSZ 0x4f00
 #define STR_IS_NULL(x) (!x || !x[0])
@@ -76,14 +73,16 @@
 	int icase;
 } RConsGrep;
 
-#if ENUM_FOR_PAL
+#if 0
+// TODO Might be better than using r_cons_pal_get_i
+// And have smaller RConsPrintablePalette and RConsPalette
 enum {
 	R_CONS_PAL_0x00 = 0,
 	R_CONS_PAL_0x7f,
 	R_CONS_PAL_0xff,
-	R_CONS_PAL_args,
-	R_CONS_PAL_bin,
-	R_CONS_PAL_btext,
+	R_CONS_PAL_ARGS,
+	R_CONS_PAL_BIN,
+	R_CONS_PAL_BTEXT,
 	R_CONS_PAL_CALL,
 	R_CONS_PAL_CJMP,
 	R_CONS_PAL_CMP,
@@ -94,9 +93,9 @@
 	R_CONS_PAL_FLOC,
 	R_CONS_PAL_FLOW,
 	R_CONS_PAL_FLOW2,
-	R_CONS_PAL_fname,
-	R_CONS_PAL_help,
-	R_CONS_PAL_input,
+	R_CONS_PAL_FNAME,
+	R_CONS_PAL_HELP,
+	R_CONS_PAL_INPUT,
 	R_CONS_PAL_INVALID,
 	R_CONS_PAL_JMP,
 	R_CONS_PAL_LABEL,
@@ -120,11 +119,13 @@
 	R_CONS_PAL_AI_EXEC,
 	R_CONS_PAL_AI_SEQ,
 	R_CONS_PAL_AI_ASCII,
+	R_CONS_PAL_AI_UNMAP,
 	R_CONS_PAL_GUI_CFLOW,
 	R_CONS_PAL_GUI_DATAOFFSET,
 	R_CONS_PAL_GUI_BACKGROUND,
 	R_CONS_PAL_GUI_ALT_BACKGROUND,
 	R_CONS_PAL_GUI_BORDER,
+	R_CONS_PAL_LINEHL,
 	R_CONS_PAL_GRAPH_BOX,
 	R_CONS_PAL_GRAPH_BOX2,
 	R_CONS_PAL_GRAPH_BOX3,
@@ -135,14 +136,96 @@
 	R_CONS_PAL_GRAPH_TRACED,
 	R_CONS_PAL_GRAPH_CURRENT,
 	R_CONS_PAL_LAST
-}
+};
 #endif
 
+enum { COLOR_MODE_DISABLED = 0, COLOR_MODE_16, COLOR_MODE_256, COLOR_MODE_16M };
+
+enum { ALPHA_RESET = 0x00, ALPHA_FG = 0x01, ALPHA_BG = 0x02, ALPHA_FGBG = 0x03 };
+enum { R_CONS_ATTR_BOLD = 1 << 1 };
+
+typedef struct rcolor_t {
+	// bold, italic, underline, ...
+	ut8 attr;
+	ut8 a;
+	ut8 r;
+	ut8 g;
+	ut8 b;
+	ut8 r2; // Background color
+	ut8 g2; // Only used when a &= ALPHA_FGBG
+	ut8 b2;
+} RColor;
+
 typedef struct r_cons_palette_t {
-// TODO: this must be an array of char *
-#if ENUM_FOR_PAL
-	char *color[R_CONS_PAL_LAST];
-#else
+	RColor b0x00;
+	RColor b0x7f;
+	RColor b0xff;
+	RColor args;
+	RColor bin;
+	RColor btext;
+	RColor call;
+	RColor cjmp;
+	RColor cmp;
+	RColor comment;
+	RColor usercomment;
+	RColor creg;
+	RColor flag;
+	RColor fline;
+	RColor floc;
+	RColor flow;
+	RColor flow2;
+	RColor fname;
+	RColor help;
+	RColor input;
+	RColor invalid;
+	RColor jmp;
+	RColor label;
+	RColor math;
+	RColor mov;
+	RColor nop;
+	RColor num;
+	RColor offset;
+	RColor other;
+	RColor pop;
+	RColor prompt;
+	RColor push;
+	RColor crypto;
+	RColor reg;
+	RColor reset;
+	RColor ret;
+	RColor swi;
+	RColor trap;
+	RColor ai_read;
+	RColor ai_write;
+	RColor ai_exec;
+	RColor ai_seq;
+	RColor ai_ascii;
+	RColor gui_cflow;
+	RColor gui_dataoffset;
+	RColor gui_background;
+	RColor gui_alt_background;
+	RColor gui_border;
+	RColor wordhl;
+	RColor linehl;
+	RColor func_var;
+	RColor func_var_type;
+	RColor func_var_addr;
+	RColor widget_bg;
+	RColor widget_sel;
+
+	/* Graph colors */
+	RColor graph_box;
+	RColor graph_box2;
+	RColor graph_box3;
+	RColor graph_box4;
+	RColor graph_true;
+	RColor graph_false;
+	RColor graph_trufae;
+	RColor graph_traced;
+	RColor graph_current;
+} RConsPalette;
+
+typedef struct r_cons_printable_palette_t {
 	char *b0x00;
 	char *b0x7f;
 	char *b0xff;
@@ -186,12 +269,19 @@
 	char *ai_exec;
 	char *ai_seq;
 	char *ai_ascii;
+	char *ai_unmap;
 	char *gui_cflow;
 	char *gui_dataoffset;
 	char *gui_background;
 	char *gui_alt_background;
 	char *gui_border;
-	char *highlight;
+	char *wordhl;
+	char *linehl;
+	char *func_var;
+	char *func_var_type;
+	char *func_var_addr;
+	char *widget_bg;
+	char *widget_sel;
 
 	/* graph colors */
 	char *graph_box;
@@ -203,12 +293,9 @@
 	char *graph_trufae;
 	char *graph_traced;
 	char *graph_current;
-#endif
-#define R_CONS_PALETTE_LIST_SIZE 8
-	char *list[R_CONS_PALETTE_LIST_SIZE];
 	char **rainbow; // rainbow
 	int rainbow_sz; // size of rainbow
-} RConsPalette;
+} RConsPrintablePalette;
 
 R_API char *r_cons_rainbow_get(int idx, int last, bool bg);
 R_API void r_cons_rainbow_free(void);
@@ -228,8 +315,9 @@
 	int h;
 	int x;
 	int y;
-	char *b;
-	int blen;
+	char **b;
+	int *blen;
+	int *bsize;
 	const char * attr;//The current attr (inserted on each write)
 	RConsCanvasAttr * attrs;// all the different attributes
 	int attrslen;
@@ -290,15 +378,26 @@
 
 typedef char *(*RConsEditorCallback)(void *core, const char *file, const char *str);
 typedef int (*RConsClickCallback)(void *core, int x, int y);
+typedef void (*RConsBreakCallback)(void *core);
+typedef void *(*RConsSleepBeginCallback)(void *core);
+typedef void (*RConsSleepEndCallback)(void *core, void *user);
+typedef void (*RConsQueueTaskOneshot)(void *core, void *task, void *user);
 
-typedef struct r_cons_t {
+typedef struct r_cons_context_t {
 	RConsGrep grep;
 	RStack *cons_stack;
-	RStack *break_stack;
 	char *buffer;
-	//int line;
 	int buffer_len;
 	int buffer_sz;
+
+	bool breaked;
+	RStack *break_stack;
+	RConsEvent event_interrupt;
+	void *event_interrupt_data;
+} RConsContext;
+
+typedef struct r_cons_t {
+	RConsContext *context;
 	char *lastline;
 	int is_html;
 	int is_interactive;
@@ -311,20 +410,23 @@
 	int force_columns;
 	int fix_rows;
 	int fix_columns;
-	bool breaked;
 	bool break_lines;
 	int noflush;
 	FILE *fdin; // FILE? and then int ??
 	int fdout; // only used in pipe.c :?? remove?
 	const char *teefile;
 	int (*user_fgets)(char *buf, int len);
-	RConsEvent event_interrupt;
 	RConsEvent event_resize;
-	void *data;
 	void *event_data;
 	int mouse_event;
 
-	RConsEditorCallback editor;
+	RConsEditorCallback cb_editor;
+	RConsBreakCallback cb_break;
+	RConsSleepBeginCallback cb_sleep_begin;
+	RConsSleepEndCallback cb_sleep_end;
+	RConsClickCallback cb_click;
+	RConsQueueTaskOneshot cb_task_oneshot;
+
 	void *user; // Used by <RCore*>
 #if __UNIX__ || __CYGWIN__ && !defined(MINGW32)
 	struct termios term_raw, term_buf;
@@ -336,16 +438,16 @@
 	 * current window. If NULL or "" no pager is used. */
 	char *pager;
 	int blankline;
-	int truecolor; // 0 = ansi, 1 = rgb 256), 2 = truecolor (16M)
+	int color; // 0 = none, 1 = ansi (16), 2 = palette (256), 3 = truecolor (16M)
 	char *highlight;
 	int null; // if set, does not show anything
 	int mouse;
 	int is_wine;
-	RConsPalette pal;
+	RConsPalette cpal;
+	RConsPrintablePalette pal;
 	struct r_line_t *line;
 	const char **vline;
 	int refcnt;
-	RConsClickCallback onclick;
 	bool newline;
 #if __WINDOWS__ && !__CYGWIN__
 	bool ansicon;
@@ -353,16 +455,16 @@
 	bool flush;
 	bool use_utf8; // use utf8 features
 	bool use_utf8_curvy; // use utf8 curved corners
+	bool dotted_lines;
 	int linesleep;
 	int pagesize;
 	char *break_word;
 	int break_word_len;
 	ut64 timeout;
-	bool use_color;
 	bool grep_color;
 	bool use_tts;
 	bool filter;
-	char* (*rgbstr)(char *str, ut64 addr);
+	char* (*rgbstr)(char *str, size_t sz, ut64 addr);
 } RCons;
 
 // XXX THIS MUST BE A SINGLETON AND WRAPPED INTO RCons */
@@ -391,13 +493,15 @@
 
 #define R_CONS_KEY_ESC 0x1b
 
+#define R_CONS_CLEAR_LINE "\x1b[2K\r"
+
 #define Color_BLINK        "\x1b[5m"
 #define Color_INVERT       "\x1b[7m"
 #define Color_INVERT_RESET "\x1b[27m"
 /* plain colors */
-#define Color_RESET      "\x1b[0m"
-#define Color_NOBGRESET  "\x1b[22;24;25;27;28;39m"
-#define Color_BGRESET    "\x1b[49m"
+#define Color_RESET      "\x1b[0m" /* reset all */
+#define Color_RESET_NOBG "\x1b[22;24;25;27;28;39m"  /* Reset everything except background */
+#define Color_RESET_BG   "\x1b[49m"
 #define Color_BLACK      "\x1b[30m"
 #define Color_BGBLACK    "\x1b[40m"
 #define Color_RED        "\x1b[31m"
@@ -410,7 +514,6 @@
 #define Color_BGMAGENTA  "\x1b[45m"
 #define Color_YELLOW     "\x1b[33m"
 #define Color_BGYELLOW   "\x1b[43m"
-#define Color_BGBYELLOW  "\x1b[1;43m"
 #define Color_CYAN       "\x1b[36m"
 #define Color_BGCYAN     "\x1b[46m"
 #define Color_BLUE       "\x1b[34m"
@@ -429,6 +532,30 @@
 #define Color_BBLUE     "\x1b[1;34m"
 #define Color_BGRAY     "\x1b[1;38m"
 
+#ifdef _MSC_VER
+#define RCOLOR(a, r, g, b, bgr, bgg, bgb) {0, a, r, g, b, bgr, bgg, bgb}
+#else
+#define RCOLOR(a, r, g, b, bgr, bgg, bgb) (RColor) {0, a, r, g, b, bgr, bgg, bgb}
+#endif
+#define RColor_NULL      RCOLOR(0x00,     0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+#define RColor_BLACK     RCOLOR(ALPHA_FG, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+#define RColor_BGBLACK   RCOLOR(ALPHA_BG, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+#define RColor_RED       RCOLOR(ALPHA_FG, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00)
+#define RColor_BGRED     RCOLOR(ALPHA_BG, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00)
+#define RColor_WHITE     RCOLOR(ALPHA_FG, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
+#define RColor_BGWHITE   RCOLOR(ALPHA_BG, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
+#define RColor_GREEN     RCOLOR(ALPHA_FG, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00)
+#define RColor_BGGREEN   RCOLOR(ALPHA_BG, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00)
+#define RColor_MAGENTA   RCOLOR(ALPHA_FG, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00)
+#define RColor_BGMAGENTA RCOLOR(ALPHA_BG, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00)
+#define RColor_YELLOW    RCOLOR(ALPHA_FG, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00)
+#define RColor_BGYELLOW  RCOLOR(ALPHA_BG, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00)
+#define RColor_CYAN      RCOLOR(ALPHA_FG, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00)
+#define RColor_BGCYAN    RCOLOR(ALPHA_BG, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00)
+#define RColor_BLUE      RCOLOR(ALPHA_FG, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00)
+#define RColor_BGBLUE    RCOLOR(ALPHA_BG, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00)
+#define RColor_GRAY      RCOLOR(ALPHA_FG, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00)
+#define RColor_BGGRAY    RCOLOR(ALPHA_BG, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00)
 
 #define Colors_PLAIN { \
 	Color_BLACK, Color_RED, Color_WHITE, \
@@ -468,9 +595,14 @@
 	LINE_NOSYM_HORIZ
 };
 
+#define DOT_STYLE_NORMAL 0
+#define DOT_STYLE_CONDITIONAL 1
+#define DOT_STYLE_BACKEDGE 2
+
 typedef struct r_cons_canvas_line_style_t {
 	int color;
 	int symbol;
+	int dot_style;
 } RCanvasLineStyle;
 
 // UTF-8 symbols indexes
@@ -516,7 +648,7 @@
 R_API void r_cons_canvas_line_diagonal(RConsCanvas *c, int x, int y, int x2, int y2, RCanvasLineStyle *style);
 R_API void r_cons_canvas_line_square(RConsCanvas *c, int x, int y, int x2, int y2, RCanvasLineStyle *style);
 R_API int r_cons_canvas_resize(RConsCanvas *c, int w, int h);
-R_API void r_cons_canvas_fill(RConsCanvas *c, int x, int y, int w, int h, char ch, int replace);
+R_API void r_cons_canvas_fill(RConsCanvas *c, int x, int y, int w, int h, char ch);
 R_API void r_cons_canvas_line_square_defined (RConsCanvas *c, int x, int y, int x2, int y2, RCanvasLineStyle *style, int bendpoint, int isvert);
 R_API void r_cons_canvas_line_back_edge (RConsCanvas *c, int x, int y, int x2, int y2, RCanvasLineStyle *style, int ybendpoint1, int xbendpoint, int ybendpoint2, int isvert);
 
@@ -524,12 +656,15 @@
 R_API RCons *r_cons_singleton(void);
 R_API RCons *r_cons_free(void);
 R_API char *r_cons_lastline(int *size);
+R_API char *r_cons_lastline_utf8_ansi_len(int *len);
 
 typedef void (*RConsBreak)(void *);
 R_API void r_cons_break_end(void);
 R_API bool r_cons_is_breaked(void);
 R_API void r_cons_break_timeout(int timeout);
 R_API void r_cons_breakword(const char *s);
+R_API void *r_cons_sleep_begin(void);
+R_API void r_cons_sleep_end(void *user);
 
 /* pipe */
 R_API int r_cons_pipe_open(const char *file, int fdn, int append);
@@ -541,8 +676,16 @@
 
 R_API void r_cons_push(void);
 R_API void r_cons_pop(void);
+R_API RConsContext *r_cons_context_new(void);
+R_API void r_cons_context_free(RConsContext *context);
+R_API void r_cons_context_load(RConsContext *context);
+R_API void r_cons_context_reset();
+R_API bool r_cons_context_is_main();
+R_API void r_cons_context_break(RConsContext *context);
+R_API void r_cons_context_break_push(RConsContext *context, RConsBreak cb, void *user, bool sig);
+R_API void r_cons_context_break_pop(RConsContext *context, bool sig);
+R_API void r_cons_break_push(RConsBreak cb, void *user);
 R_API void r_cons_break_pop(void);
-R_API void r_cons_break_push(RConsBreak cb, void*user);
 R_API void r_cons_break_clear(void);
 
 /* control */
@@ -591,6 +734,9 @@
 //R_API int  r_cons_fgets(char *buf, int len, int argc, const char **argv);
 R_API int r_cons_controlz(int ch);
 R_API int r_cons_readchar(void);
+R_API bool r_cons_readpush(const char *str, int len);
+R_API void r_cons_readflush();
+R_API void r_cons_switchbuf(bool active);
 R_API int r_cons_readchar_timeout(ut32 usec);
 R_API int r_cons_any_key(const char *msg);
 R_API int r_cons_eof(void);
@@ -599,13 +745,14 @@
 R_API int r_cons_pal_set(const char *key, const char *val);
 R_API void r_cons_pal_update_event(void);
 R_API void r_cons_pal_free(void);
-R_API void r_cons_pal_init(const char *foo);
-R_API char *r_cons_pal_parse(const char *str);
+R_API void r_cons_pal_init();
+R_API char *r_cons_pal_parse(const char *str, RColor *outcol);
 R_API void r_cons_pal_random(void);
-R_API const char *r_cons_pal_get(const char *key);
-R_API const char *r_cons_pal_get_i(int n);
-R_API const char *r_cons_pal_get_color(int n);
-R_API int r_cons_rgb_parse(const char *p, ut8 *r, ut8 *g, ut8 *b, int *is_bg);
+R_API RColor r_cons_pal_get(const char *key);
+R_API RColor r_cons_pal_get_i(int index);
+R_API const char *r_cons_pal_get_name(int index);
+R_API int r_cons_pal_len();
+R_API int r_cons_rgb_parse(const char *p, ut8 *r, ut8 *g, ut8 *b, ut8 *a);
 R_API char *r_cons_rgb_tostring(ut8 r, ut8 g, ut8 b);
 R_API void r_cons_pal_list(int rad, const char *arg);
 R_API void r_cons_pal_show(void);
@@ -613,7 +760,6 @@
 R_API bool r_cons_isatty(void);
 R_API int r_cons_get_cursor(int *rows);
 R_API int r_cons_arrow_to_hjkl(int ch);
-R_API int r_cons_html_print(const char *ptr);
 R_API char *r_cons_html_filter(const char *ptr, int *newlen);
 
 // TODO: use gets() .. MUST BE DEPRECATED
@@ -631,14 +777,13 @@
 R_API int r_cons_grep_line(char *buf, int len); // must be static
 R_API int r_cons_grepbuf(char *buf, int len);
 
-R_API void r_cons_rgb(ut8 r, ut8 g, ut8 b, int is_bg);
+R_API void r_cons_rgb(ut8 r, ut8 g, ut8 b, ut8 a);
 R_API void r_cons_rgb_fgbg(ut8 r, ut8 g, ut8 b, ut8 R, ut8 G, ut8 B);
 R_API void r_cons_rgb_init(void);
-R_API char *r_cons_rgb_str(char *outstr, ut8 r, ut8 g, ut8 b, int is_bg);
-R_API char *r_cons_rgb_str_off(char *outstr, ut64 off);
+R_API char *r_cons_rgb_str(char *outstr, size_t sz, RColor *rcolor);
+R_API char *r_cons_rgb_str_off(char *outstr, size_t sz, ut64 off);
 R_API void r_cons_color(int fg, int r, int g, int b);
-R_API char *r_cons_color_random(int bg);
-R_API char *r_cons_color_random_string(int bg);
+R_API RColor r_cons_color_random(ut8 alpha);
 R_API void r_cons_invert(int set, int color);
 R_API int r_cons_yesno(int def, const char *fmt, ...);
 R_API char *r_cons_input(const char *msg);
@@ -656,6 +801,20 @@
 #define R_LINE_BUFSIZE 4096
 #define R_LINE_HISTSIZE 256
 
+#define R_EDGES_X_INC 4
+
+#define R_SELWIDGET_MAXH 15
+#define R_SELWIDGET_MAXW 30
+
+typedef struct r_selection_widget_t {
+	const char **options;
+	int options_len;
+	int selection;
+	int w, h;
+	int scroll;
+	bool complete_common;
+} RSelWidget;
+
 typedef struct r_line_hist_t {
 	char **data;
 	int size;
@@ -681,12 +840,19 @@
 } RLineCompletion;
 
 typedef char* (*RLineEditorCb)(void *core, const char *str);
+typedef int (*RLineHistoryUpCb)(RLine* line);
+typedef int (*RLineHistoryDownCb)(RLine* line);
 
 struct r_line_t {
 	RLineCompletion completion;
-	RLineHistory history;
 	RLineBuffer buffer;
-	RLineEditorCb editor_cb;
+	RLineHistory history;
+	RSelWidget *sel_widget;
+	/* callbacks */
+	RLineHistoryUpCb cb_history_up;
+	RLineHistoryDownCb cb_history_down;
+	RLineEditorCb cb_editor;
+	/* state , TODO: use more bool */
 	int echo;
 	int has_echo;
 	char *prompt;
@@ -697,6 +863,12 @@
 	int (*hist_down)(void *user);
 	char *contents;
 	bool zerosep;
+	bool offset_prompt;
+	int offset_hist_index;
+	bool file_prompt;
+	int file_hist_index;
+	RList *sdbshell_hist;
+	RListIter *sdbshell_hist_iter;
 }; /* RLine */
 
 #ifdef R_API
@@ -721,6 +893,10 @@
 R_API int r_line_hist_list(void);
 R_API const char *r_line_hist_get(int n);
 
+R_API int r_line_set_hist_callback(RLine *line, RLineHistoryUpCb cb_up, RLineHistoryDownCb cb_down);
+R_API int cmd_history_up(RLine *line);
+R_API int cmd_history_down(RLine *line);
+
 #define R_CONS_INVERT(x,y) (y? (x?Color_INVERT: Color_INVERT_RESET): (x?"[":"]"))
 
 #endif
@@ -772,8 +948,10 @@
 	int edgemode;
 	int mode;
 	bool is_callgraph;
+	bool is_interactive;
 	int zoom;
 	int movspeed;
+	bool hints;
 
 	RANode *update_seek_on;
 	bool need_reload_nodes;
@@ -795,13 +973,6 @@
 	int n_layers;
 	RList *dists; /* RList<struct dist_t> */
 	RList *edges; /* RList<AEdge> */
-
-	/* colors */
-	const char *color_box;
-	const char *color_box2;
-	const char *color_box3;
-	const char *color_true;
-	const char *color_false;
 } RAGraph;
 
 #ifdef R_API
@@ -817,12 +988,31 @@
 R_API void r_agraph_add_edge_at(const RAGraph *g, RANode *a, RANode *b, int nth);
 R_API void r_agraph_del_edge(const RAGraph *g, RANode *a, RANode *b);
 R_API void r_agraph_print(RAGraph *g);
+R_API void r_agraph_print_json(RAGraph *g);
 R_API Sdb *r_agraph_get_sdb(RAGraph *g);
 R_API void r_agraph_foreach(RAGraph *g, RANodeCallback cb, void *user);
 R_API void r_agraph_foreach_edge(RAGraph *g, RAEdgeCallback cb, void *user);
 R_API void r_agraph_set_curnode(RAGraph *g, RANode *node);
 #endif
 
+typedef struct r_panels_t {
+	RConsCanvas *can;
+	RPanel *panel;
+	int n_panels;
+	int columnWidth;
+	int layout;
+	int menu_pos;
+	int callgraph;
+	int curnode;
+	bool isResizing;
+	const char ***menuStack;
+	int *menuIndexStack;
+	int menuStackDepth;
+	const char **currentMenu;
+	int currentMenuIndex;
+	RPanel *menuPanel;
+} RPanels;
+
 #ifdef __cplusplus
 }
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_core.h radare2-2.8.0+dfsg/libr/include/r_core.h
--- radare2-2.3.0+dfsg/libr/include/r_core.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_core.h	2018-08-07 14:12:36.000000000 +0000
@@ -38,11 +38,19 @@
 #define R_CORE_BLOCKSIZE 0x100
 #define R_CORE_BLOCKSIZE_MAX 0x3200000 /* 32MB */
 
-#define R_CORE_ANAL_GRAPHLINES 1
-#define R_CORE_ANAL_GRAPHBODY  2
-#define R_CORE_ANAL_GRAPHDIFF  4
-#define R_CORE_ANAL_JSON       8
-#define R_CORE_ANAL_KEYVALUE  16
+#define R_CORE_ANAL_GRAPHLINES          1
+#define R_CORE_ANAL_GRAPHBODY           2
+#define R_CORE_ANAL_GRAPHDIFF           4
+#define R_CORE_ANAL_JSON                8
+#define R_CORE_ANAL_KEYVALUE            16
+#define R_CORE_ANAL_JSON_FORMAT_DISASM  32
+
+#define R_GRAPH_FORMAT_NO           0
+#define R_GRAPH_FORMAT_GMLFCN       1
+#define R_GRAPH_FORMAT_JSON         2
+#define R_GRAPH_FORMAT_GML          3
+#define R_GRAPH_FORMAT_DOT          4
+#define R_GRAPH_FORMAT_CMD          5
 
 ///
 #define R_CONS_COLOR_DEF(x, def) ((core->cons && core->cons->pal.x)? core->cons->pal.x: def)
@@ -63,7 +71,7 @@
 #define R_CORE_CMD_DEPTH 100
 
 /* visual mode */
-#define NPF 9
+#define NPF 10
 #define PIDX (R_ABS (core->printidx % NPF))
 #define R_CORE_VISUAL_MODE_PX    0
 #define R_CORE_VISUAL_MODE_PD    1
@@ -74,6 +82,7 @@
 #define R_CORE_VISUAL_MODE_PSS   6
 #define R_CORE_VISUAL_MODE_PRC   7
 #define R_CORE_VISUAL_MODE_PXa   8
+#define R_CORE_VISUAL_MODE_PXR   9
 
 typedef struct r_core_rtr_host_t {
 	int proto;
@@ -83,6 +92,19 @@
 	RSocket *fd;
 } RCoreRtrHost;
 
+typedef struct r_core_undo_t {
+	char *action;
+	char *revert;
+	ut64 tstamp;
+	ut64 offset;
+} RCoreUndo;
+
+typedef struct {
+	ut64 addr;
+	const char *glob;
+	ut64 minstamp;
+} RCoreUndoCondition;
+
 typedef struct r_core_log_t {
 	int first;
 	int last;
@@ -113,17 +135,44 @@
 	int cols;
 } RCoreAsmsteps;
 
+typedef enum r_core_autocomplete_types_t {
+	R_CORE_AUTOCMPLT_DFLT = 0,
+	R_CORE_AUTOCMPLT_FLAG,
+	R_CORE_AUTOCMPLT_FLSP,
+	R_CORE_AUTOCMPLT_ZIGN,
+	R_CORE_AUTOCMPLT_EVAL,
+	R_CORE_AUTOCMPLT_PRJT,
+	R_CORE_AUTOCMPLT_MINS,
+	R_CORE_AUTOCMPLT_BRKP,
+	R_CORE_AUTOCMPLT_MACR,
+	R_CORE_AUTOCMPLT_FILE,
+	R_CORE_AUTOCMPLT_THME,
+	R_CORE_AUTOCMPLT_OPTN,
+// --- left as last always
+	R_CORE_AUTOCMPLT_END,
+} RCoreAutocompleteType;
+
+typedef struct r_core_autocomplete_t {
+	const char* cmd;
+	int length;
+	int n_subcmds;
+	bool locked;
+	int type;
+	struct r_core_autocomplete_t** subcmds;
+} RCoreAutocomplete;
+
 typedef struct r_core_t {
 	RBin *bin;
 	RConfig *config;
 	ut64 offset;
+	ut64 prompt_offset;
 	ut32 blocksize;
 	ut32 blocksize_max;
 	ut8 *block;
 	ut8 *oobi; /* out of band input ; used for multiline or file input */
 	int oobi_len;
 	RBuffer *yank_buf;
-	int tmpseek;
+	bool tmpseek;
 	bool vmode;
 	int interrupted; // XXX IS THIS DUPPED SOMEWHERE?
 	/* files */
@@ -132,7 +181,6 @@
 	RCoreFile *file;
 	RList *files;
 	RNum *num;
-	RNum *old_num;
 	RLib *lib;
 	RCmd *rcmd;
 	RCmdDescriptor root_cmd_descriptor;
@@ -152,6 +200,7 @@
 	REgg *egg;
 	RCoreLog *log;
 	RAGraph *graph;
+	RPanels* panels;
 	char *cmdqueue;
 	char *lastcmd;
 	char *cmdlog;
@@ -175,8 +224,18 @@
 	bool in_search;
 	RList *watchers;
 	RList *scriptstack;
+	int task_id_next;
 	RList *tasks;
+	RList *tasks_queue;
+	RList *oneshot_queue;
+	int oneshots_enqueued;
+	struct r_core_task_t *current_task;
+	struct r_core_task_t *main_task;
+	RThreadLock *tasks_lock;
+	int tasks_running;
+	bool oneshot_running;
 	int cmd_depth;
+	int max_cmd_depth;
 	ut8 switch_file_view;
 	Sdb *sdb;
 	int incomment;
@@ -188,6 +247,12 @@
 	char *cmdfilter;
 	bool break_loop;
 	RThreadLock *lock;
+	RList *undos;
+	bool fixedbits;
+	bool fixedarch;
+	bool pava;
+	struct r_core_t *c2;
+	RCoreAutocomplete *autocomplete;
 } RCore;
 
 R_API int r_core_bind(RCore *core, RCoreBind *bnd);
@@ -210,6 +275,7 @@
 R_API RConfig *r_core_get_config (RCore *core);
 R_API RAsmOp *r_core_disassemble (RCore *core, ut64 addr);
 R_API bool r_core_init(RCore *core);
+R_API void r_core_bind_cons(RCore *core); // to restore pointers in cons
 R_API RCore *r_core_new(void);
 R_API RCore *r_core_free(RCore *core);
 R_API RCore *r_core_fini(RCore *c);
@@ -222,8 +288,11 @@
 R_API int r_core_lines_initcache (RCore *core, ut64 start_addr, ut64 end_addr);
 R_API int r_core_lines_currline (RCore *core);
 R_API void r_core_prompt_loop(RCore *core);
+R_API ut64 r_core_pava(RCore *core, ut64 addr);
+R_API void run_pending_anal(RCore *core);
 R_API int r_core_cmd(RCore *core, const char *cmd, int log);
 R_API void r_core_cmd_repeat(RCore *core, int next);
+R_API int r_core_cmd_task_sync(RCore *core, const char *cmd, bool log);
 R_API char *r_core_editor (const RCore *core, const char *file, const char *str);
 R_API int r_core_fgets(char *buf, int len);
 // FIXME: change (void *user) to (RCore *core)
@@ -247,7 +316,7 @@
 R_API void r_core_seek_archbits (RCore *core, ut64 addr);
 R_API int r_core_block_read(RCore *core);
 R_API int r_core_block_size(RCore *core, int bsize);
-R_API bool r_core_read_at(RCore *core, ut64 addr, ut8 *buf, int size);
+R_API int r_core_seek_size(RCore *core, ut64 addr, int bsize);
 R_API int r_core_is_valid_offset (RCore *core, ut64 offset);
 R_API int r_core_shift_block(RCore *core, ut64 addr, ut64 b_size, st64 dist);
 R_API void r_core_visual_prompt_input (RCore *core);
@@ -259,21 +328,33 @@
 R_API int r_core_visual_types(RCore *core);
 R_API int r_core_visual(RCore *core, const char *input);
 R_API int r_core_visual_graph(RCore *core, RAGraph *g, RAnalFunction *_fcn, int is_interactive);
-R_API int r_core_fcn_graph(RCore *core, RAnalFunction *_fcn);
-R_API int r_core_visual_panels(RCore *core);
+R_API int r_core_visual_panels(RCore *core, RPanels *panels);
+R_API RPanels *r_core_panels_new(RCore *core);
+R_API void r_core_panels_refresh(RCore *core);
+R_API void r_core_panels_check_stackbase(RCore *core);
+R_API void r_core_panels_free(RPanels *panels);
+R_API void r_core_panels_layout(RPanels *panels);
+R_API void r_core_panels_layout_refresh(RCore *core);
+R_API void r_core_visual_browse(RCore *core);
 R_API int r_core_visual_cmd(RCore *core, const char *arg);
 R_API void r_core_visual_seek_animation (RCore *core, ut64 addr);
 R_API void r_core_visual_asm(RCore *core, ut64 addr);
 R_API void r_core_visual_colors(RCore *core);
 R_API int r_core_visual_xrefs_x(RCore *core);
 R_API int r_core_visual_xrefs_X(RCore *core);
+R_API void r_core_visual_showcursor(RCore *core, int x);
+R_API void r_core_visual_offset(RCore *core);
 R_API int r_core_visual_hud(RCore *core);
+R_API void r_core_visual_jump(RCore *core, ut8 ch);
+R_API void r_core_visual_disasm_up(RCore *core, int *cols);
+R_API void r_core_visual_disasm_down(RCore *core, RAsmOp *op, int *cols);
 R_API ut64 r_core_get_asmqjmps(RCore *core, const char *str);
 R_API void r_core_set_asmqjmps(RCore *core, char *str, size_t len, int i);
 R_API char* r_core_add_asmqjmp(RCore *core, ut64 addr);
 
 R_API void r_core_anal_type_init(RCore *core);
 R_API void r_core_anal_cc_init(RCore *core);
+R_API void r_core_anal_paths(RCore *core, ut64 from, ut64 to, bool followCalls, int followDepth);
 
 R_API void r_core_list_io(RCore *core);
 /* visual marks */
@@ -315,7 +396,7 @@
 R_API RBinFile * r_core_bin_cur (RCore *core);
 R_API ut32 r_core_file_cur_fd (RCore *core);
 
-R_API void r_core_debug_rr (RCore *core, RReg *reg);
+R_API void r_core_debug_rr (RCore *core, RReg *reg, int mode);
 
 /* fortune */
 R_API void r_core_fortune_list_types(void);
@@ -363,10 +444,15 @@
 R_API char *r_core_disassemble_instr(RCore *core, ut64 addr, int l);
 R_API char *r_core_disassemble_bytes(RCore *core, ut64 addr, int b);
 
-R_API int r_core_process_input_pade(RCore *core, const char *input, char** hex, char **asm_arch, ut32 *bits);
+/* carg.c */
+R_API RList *r_core_get_func_args(RCore *core, const char *func_name);
+R_API void r_core_print_func_args(RCore *core);
+R_API char *resolve_fcn_name(RAnal *anal, const char * func_name);
+
+R_API int r_core_get_stacksz (RCore *core, ut64 from, ut64 to);
 
 /* anal.c */
-R_API RAnalOp* r_core_anal_op(RCore *core, ut64 addr);
+R_API RAnalOp* r_core_anal_op(RCore *core, ut64 addr, int mask);
 R_API void r_core_anal_esil(RCore *core, const char *str, const char *addr);
 R_API void r_core_anal_fcn_merge (RCore *core, ut64 addr, ut64 addr2);
 R_API const char *r_core_anal_optype_colorfor(RCore *core, ut64 addr, bool verbose);
@@ -377,10 +463,14 @@
 R_API int r_core_anal_search(RCore *core, ut64 from, ut64 to, ut64 ref, int mode);
 R_API int r_core_anal_search_xrefs(RCore *core, ut64 from, ut64 to, int rad);
 R_API int r_core_anal_data (RCore *core, ut64 addr, int count, int depth, int wordsize);
-R_API void r_core_anal_coderefs(RCore *core, ut64 addr, int gv);
-R_API void r_core_anal_codexrefs(RCore *core, ut64 addr, int fmt);
+R_API void r_core_anal_datarefs(RCore *core, ut64 addr);
+R_API void r_core_anal_coderefs(RCore *core, ut64 addr);
+R_API void r_core_anal_codexrefs(RCore *core, ut64 addr);
+R_API void r_core_anal_importxrefs(RCore *core);
+R_API void r_core_anal_callgraph(RCore *core, ut64 addr, int fmt);
 R_API int r_core_anal_refs(RCore *core, const char *input);
 R_API int r_core_esil_step(RCore *core, ut64 until_addr, const char *until_expr, ut64 *prev_addr);
+R_API bool r_core_esil_cmd(RAnalEsil *esil, const char *cmd, ut64 a1, ut64 a2);
 R_API int r_core_esil_step_back(RCore *core);
 R_API int r_core_anal_bb(RCore *core, RAnalFunction *fcn, ut64 at, int head);
 R_API ut64 r_core_anal_get_bbaddr(RCore *core, ut64 addr);
@@ -392,6 +482,8 @@
 R_API int r_core_anal_fcn_list_size(RCore *core);
 R_API void r_core_anal_fcn_labels(RCore *core, RAnalFunction *fcn, int rad);
 R_API int r_core_anal_fcn_clean(RCore *core, ut64 addr);
+R_API int r_core_print_bb_custom(RCore *core, RAnalFunction *fcn);
+R_API int r_core_print_bb_gml(RCore *core, RAnalFunction *fcn);
 R_API int r_core_anal_graph(RCore *core, ut64 addr, int opts);
 R_API int r_core_anal_graph_fcn(RCore *core, char *input, int opts);
 R_API RList* r_core_anal_graph_to(RCore *core, ut64 addr, int n);
@@ -422,7 +514,7 @@
 R_API RList *r_core_asm_back_disassemble_instr (RCore *core, ut64 addr, int len, ut32 hit_count, ut32 extra_padding);
 R_API RList *r_core_asm_back_disassemble_byte (RCore *core, ut64 addr, int len, ut32 hit_count, ut32 extra_padding);
 R_API ut32 r_core_asm_bwdis_len (RCore* core, int* len, ut64* start_addr, ut32 l);
-R_API int r_core_print_disasm(RPrint *p, RCore *core, ut64 addr, ut8 *buf, int len, int lines, int invbreak, int nbytes, bool json);
+R_API int r_core_print_disasm(RPrint *p, RCore *core, ut64 addr, ut8 *buf, int len, int lines, int invbreak, int nbytes, bool json, RAnalFunction *pdf);
 R_API int r_core_print_disasm_json(RCore *core, ut64 addr, ut8 *buf, int len, int lines);
 R_API int r_core_print_disasm_instructions (RCore *core, int len, int l);
 R_API int r_core_print_disasm_all (RCore *core, ut64 addr, int l, int len, int mode);
@@ -441,11 +533,11 @@
 R_API int r_core_bin_list(RCore *core, int mode);
 R_API int r_core_bin_raise (RCore *core, ut32 binfile_idx, ut32 obj_idx);
 R_API bool r_core_bin_delete (RCore *core, ut32 binfile_idx, ut32 binobj_idx);
+R_API ut64 r_core_bin_impaddr(RBin *bin, int va, const char *name);
 
 // XXX - this is kinda hacky, maybe there should be a way to
 // refresh the bin environment without specific calls?
 R_API int r_core_bin_refresh_strings(RCore *core);
-R_API bool r_core_bin_strpurge(RCore *core, const char *str, ut64 addr);
 R_API int r_core_pseudo_code (RCore *core, const char *input);
 
 /* gdiff.c */
@@ -463,9 +555,8 @@
 
 R_API char *r_core_sysenv_begin(RCore *core, const char *cmd);
 R_API void r_core_sysenv_end(RCore *core, const char *cmd);
-R_API void r_core_sysenv_help(const RCore* core);
 
-R_API void fcn_callconv (RCore *core, RAnalFunction *fcn);
+R_API void r_core_recover_vars(RCore *core, RAnalFunction *fcn, bool argonly);
 /* bin.c */
 #define R_CORE_BIN_PRINT	0x000 
 #define R_CORE_BIN_RADARE	0x001
@@ -498,7 +589,9 @@
 #define R_CORE_BIN_ACC_HEADER 0x80000
 #define R_CORE_BIN_ACC_RESOURCES 0x100000
 #define R_CORE_BIN_ACC_INITFINI 0x200000
-#define R_CORE_BIN_ACC_ALL	0x104FFF
+#define R_CORE_BIN_ACC_SEGMENTS 0x400000
+#define R_CORE_BIN_ACC_SOURCE 0x800000
+#define R_CORE_BIN_ACC_ALL	0x504FFF
 
 #define R_CORE_PRJ_FLAGS	0x0001
 #define R_CORE_PRJ_EVAL		0x0002
@@ -523,6 +616,7 @@
 R_API int r_core_bin_set_arch_bits (RCore *r, const char *name, const char * arch, ut16 bits);
 R_API int r_core_bin_update_arch_bits (RCore *r);
 R_API char *r_core_bin_method_flags_str(ut64 flags, int mode);
+R_API int r_core_pdb_info(RCore *core, const char *file, ut64 baddr, int mode);
 
 /* rtr */
 R_API int r_core_rtr_cmds (RCore *core, const char *port);
@@ -534,7 +628,7 @@
 R_API void r_core_rtr_remove(RCore *core, const char *input);
 R_API void r_core_rtr_session(RCore *core, const char *input);
 R_API void r_core_rtr_cmd(RCore *core, const char *input);
-R_API int r_core_rtr_http(RCore *core, int launch, const char *path);
+R_API int r_core_rtr_http(RCore *core, int launch, int browse, const char *path);
 R_API int r_core_rtr_http_stop(RCore *u);
 R_API int r_core_rtr_gdb(RCore *core, int launch, const char *path);
 
@@ -569,6 +663,13 @@
 R_API int r_core_cmpwatch_show (RCore *core, ut64 addr, int mode);
 R_API int r_core_cmpwatch_revert (RCore *core, ut64 addr);
 
+/* undo */
+R_API RCoreUndo *r_core_undo_new(ut64 offset, const char *action, const char *revert);
+R_API void r_core_undo_print(RCore *core, int mode, RCoreUndoCondition *cond);
+R_API void *r_core_undo_free(RCoreUndo *cu);
+R_API void r_core_undo_push(RCore *core, RCoreUndo *cu);
+R_API void r_core_undo_pop(RCore *core);
+
 /* logs */
 R_API void r_core_log_free(RCoreLog *log);
 R_API void r_core_log_init (RCoreLog *log);
@@ -587,6 +688,7 @@
 	ut32 flags;
 	ut32 comments;
 	ut32 functions;
+	ut32 in_functions;
 	ut32 symbols;
 	ut32 strings;
 	ut32 rwx;
@@ -596,125 +698,85 @@
 } RCoreAnalStats;
 
 R_API bool core_anal_bbs(RCore *core, const char* input);
+R_API bool core_anal_bbs_range (RCore *core, const char* input);
 R_API char *r_core_anal_hasrefs(RCore *core, ut64 value, bool verbose);
 R_API char *r_core_anal_get_comments(RCore *core, ut64 addr);
 R_API RCoreAnalStats* r_core_anal_get_stats (RCore *a, ut64 from, ut64 to, ut64 step);
 R_API void r_core_anal_stats_free (RCoreAnalStats *s);
-R_API void r_core_anal_list_vtables (void *core, bool printJson);
-R_API void r_core_anal_print_rtti (void *core);
 
 R_API void r_core_syscmd_ls(const char *input);
 R_API void r_core_syscmd_cat(const char *file);
 R_API void r_core_syscmd_mkdir(const char *dir);
 
+R_API int offset_history_up(RLine *line);
+R_API int offset_history_down(RLine *line);
+
 // TODO : move into debug or syscall++
 R_API char *cmd_syscall_dostr(RCore *core, int num);
 /* tasks */
 
 typedef void (*RCoreTaskCallback)(void *user, char *out);
 
+typedef enum {
+	R_CORE_TASK_STATE_BEFORE_START,
+	R_CORE_TASK_STATE_RUNNING,
+	R_CORE_TASK_STATE_SLEEPING,
+	R_CORE_TASK_STATE_DONE
+} RTaskState;
+
 typedef struct r_core_task_t {
 	int id;
-	char state;
+	RTaskState state;
+	RThreadSemaphore *running_sem;
 	void *user;
 	RCore *core;
-	RThreadMsg *msg;
+	RThreadCond *dispatch_cond;
+	RThreadLock *dispatch_lock;
+	RThread *thread;
+	char *cmd;
+	char *res;
+	bool cmd_log;
+	RConsContext *cons_context;
 	RCoreTaskCallback cb;
 } RCoreTask;
 
-R_API RCoreTask *r_core_task_get (RCore *core, int id);
-R_API void r_core_task_list (RCore *core, int mode);
-R_API RCoreTask *r_core_task_new (RCore *core, const char *cmd, RCoreTaskCallback cb, void *user);
-R_API void r_core_task_run(RCore *core, RCoreTask *_task);
-R_API void r_core_task_run_bg(RCore *core, RCoreTask *_task);
-R_API RCoreTask *r_core_task_add (RCore *core, RCoreTask *task);
-R_API void r_core_task_add_bg (RCore *core, RCoreTask *task);
-R_API int r_core_task_del (RCore *core, int id);
-R_API void r_core_task_join (RCore *core, RCoreTask *task);
+typedef void (*RCoreTaskOneShot)(void *);
+
+R_API RCoreTask *r_core_task_get(RCore *core, int id);
+R_API void r_core_task_print(RCore *core, RCoreTask *task, int mode);
+R_API void r_core_task_list(RCore *core, int mode);
+R_API const char *r_core_task_status(RCoreTask *task);
+R_API RCoreTask *r_core_task_new(RCore *core, bool create_cons, const char *cmd, RCoreTaskCallback cb, void *user);
+R_API void r_core_task_free(RCoreTask *task);
+R_API void r_core_task_enqueue(RCore *core, RCoreTask *task);
+R_API void r_core_task_enqueue_oneshot(RCore *core, RCoreTaskOneShot func, void *user);
+R_API int r_core_task_run_sync(RCore *core, RCoreTask *task);
+R_API void r_core_task_sync_begin(RCore *core);
+R_API void r_core_task_sync_end(RCore *core);
+R_API void r_core_task_continue(RCoreTask *t);
+R_API void r_core_task_sleep_begin(RCoreTask *task);
+R_API void r_core_task_sleep_end(RCoreTask *task);
+R_API void r_core_task_break(RCore *core, int id);
+R_API int r_core_task_del(RCore *core, int id);
+R_API void r_core_task_del_all_done(RCore *core);
+R_API RCoreTask *r_core_task_self(RCore *core);
+R_API void r_core_task_join(RCore *core, RCoreTask *current, RCoreTask *task);
 typedef void (*inRangeCb) (RCore *core, ut64 from, ut64 to, int vsize,
 			   bool asterisk, int count);
 R_API int r_core_search_value_in_range (RCore *core, RInterval search_itv,
 		ut64 vmin, ut64 vmax, int vsize, bool asterisk, inRangeCb cb);
 
+R_API RCoreAutocomplete *r_core_autocomplete_add(RCoreAutocomplete *parent, const char* cmd, int type, bool lock);
+R_API void r_core_autocomplete_free(RCoreAutocomplete *obj);
+R_API RCoreAutocomplete *r_core_autocomplete_find(RCoreAutocomplete *parent, const char* cmd, bool exact);
+R_API bool r_core_autocomplete_remove(RCoreAutocomplete *parent, const char* cmd);
+
 /* PLUGINS */
 extern RCorePlugin r_core_plugin_java;
-extern RCorePlugin r_core_plugin_anal;
+extern RCorePlugin r_core_plugin_a2f;
 
 #endif
 
-/*
-	RTTI Parsing Information
-	MSVC(Microsoft visual studio compiler) rtti structure
-	information:
-*/
-
-typedef struct type_descriptor_t {
-	ut64 pVFTable;//Always point to type_info's vftable
-	int spare;
-	char* className;
-} type_descriptor;
-
-typedef struct class_hierarchy_descriptor_t {
-	int signature;//always 0
-
-	//bit 0 --> Multiple inheritance
-	//bit 1 --> Virtual inheritance
-	int attributes;
-
-	//total no of base classes
-	// including itself
-	int numBaseClasses;
-
-	//Array of base class descriptor's
-	RList* baseClassArray;
-} class_hierarchy_descriptor;
-
-typedef struct base_class_descriptor_t {
-	//Type descriptor of current base class
-	type_descriptor* typeDescriptor;
-
-	//Number of direct bases
-	//of this base class
-	int numContainedBases;
-
-	//vftable offset
-	int mdisp;
-
-	// vbtable offset
-	int pdisp;
-
-	//displacement of the base class
-	//vftable pointer inside the vbtable
-	int vdisp;
-
-	//don't know what's this
-	int attributes;
-
-	//class hierarchy descriptor
-	//of this base class
-	class_hierarchy_descriptor* classDescriptor;
-} base_class_descriptor;
-
-typedef struct rtti_complete_object_locator_t {
-	int signature;
-
-	//within class offset
-	int vftableOffset;
-
-	//don't know what's this
-	int cdOffset;
-
-	//type descriptor for the current class
-	type_descriptor* typeDescriptor;
-
-	//hierarchy descriptor for current class
-	class_hierarchy_descriptor* hierarchyDescriptor;
-} rtti_complete_object_locator;
-
-typedef struct run_time_type_information_t {
-	ut64 vtable_start_addr;
-	ut64 rtti_addr;
-} rtti_struct;
 
 #ifdef __cplusplus
 }
diff -Nru radare2-2.3.0+dfsg/libr/include/r_debug.h radare2-2.8.0+dfsg/libr/include/r_debug.h
--- radare2-2.3.0+dfsg/libr/include/r_debug.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_debug.h	2018-08-07 14:12:36.000000000 +0000
@@ -277,13 +277,16 @@
 	int steps; /* counter of steps done */
 	RDebugReason reason; /* stop reason */
 	RDebugRecoilMode recoil_mode; /* what did the user want to do? */
+	ut64 stopaddr;  /* stop address  */
 
 	/* tracing vars */
 	RDebugTrace *trace;
 	Sdb *tracenodes;
 	RTree *tree;
+	RList *call_frames;
 
 	RReg *reg;
+	RList *q_regs;
 	const char *creg; // current register value
 	RBreakpoint *bp;
 	void *user; // XXX(jjd): unused?? meant for caller's use??
@@ -296,6 +299,9 @@
 	struct r_debug_plugin_t *h;
 	RList *plugins;
 
+	bool pc_at_bp; /* after a breakpoint, is the pc at the bp? */
+	bool pc_at_bp_set; /* is the pc_at_bp variable set already? */
+
 	RAnal *anal;
 	RList *maps; // <RDebugMap>
 	RList *maps_user; // <RDebugMap>
@@ -485,8 +491,8 @@
 R_API RDebugMap *r_debug_map_get(RDebug *dbg, ut64 addr);
 R_API RDebugMap *r_debug_map_new (char *name, ut64 addr, ut64 addr_end, int perm, int user);
 R_API void r_debug_map_free(RDebugMap *map);
-R_API void r_debug_map_list(RDebug *dbg, ut64 addr, int rad);
-R_API void r_debug_map_list_visual(RDebug *dbg, ut64 addr, int use_color, int cons_cols);
+R_API void r_debug_map_list(RDebug *dbg, ut64 addr, const char *input);
+R_API void r_debug_map_list_visual(RDebug *dbg, ut64 addr, const char *input, int colors);
 
 /* descriptors */
 R_API RDebugDesc *r_debug_desc_new (int fd, char* path, int perm, int type, int off);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_diff.h radare2-2.8.0+dfsg/libr/include/r_diff.h
--- radare2-2.3.0+dfsg/libr/include/r_diff.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_diff.h	2018-08-07 14:12:36.000000000 +0000
@@ -47,11 +47,12 @@
 R_API int r_diff_buffers_radiff(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb);
 R_API int r_diff_buffers_delta(RDiff *diff, const ut8 *sa, int la, const ut8 *sb, int lb);
 R_API int r_diff_buffers(RDiff *d, const ut8 *a, ut32 la, const ut8 *b, ut32 lb);
+R_API char *r_diff_buffers_to_string(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb);
 R_API int r_diff_set_callback(RDiff *d, RDiffCallback callback, void *user);
 R_API bool r_diff_buffers_distance(RDiff *d, const ut8 *a, ut32 la, const ut8 *b, ut32 lb, ut32 *distance, double *similarity);
 R_API bool r_diff_buffers_distance_myers(RDiff *diff, const ut8 *a, ut32 la, const ut8 *b, ut32 lb, ut32 *distance, double *similarity);
 R_API bool r_diff_buffers_distance_levenstein(RDiff *d, const ut8 *a, ut32 la, const ut8 *b, ut32 lb, ut32 *distance, double *similarity);
-R_API int r_diff_buffers_unified(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb);
+R_API char *r_diff_buffers_unified(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb);
 /* static method !??! */
 R_API int r_diff_lines(const char *file1, const char *sa, int la, const char *file2, const char *sb, int lb);
 R_API int r_diff_set_delta(RDiff *d, int delta);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_egg.h radare2-2.8.0+dfsg/libr/include/r_egg.h
--- radare2-2.3.0+dfsg/libr/include/r_egg.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_egg.h	2018-08-07 14:12:36.000000000 +0000
@@ -217,6 +217,9 @@
 R_API int r_egg_patch(REgg *egg, int off, const ut8 *b, int l);
 R_API void r_egg_finalize(REgg *egg);
 
+/* r_egg_Cfile.c */
+R_API char* r_egg_Cfile_parser(const char *file, const char *arch, const char *os, int bits);
+
 /* lang.c */
 R_API char *r_egg_mkvar(REgg *egg, char *out, const char *_str, int delta);
 R_API int r_egg_lang_parsechar(REgg *egg, char c);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_flag.h radare2-2.8.0+dfsg/libr/include/r_flag.h
--- radare2-2.3.0+dfsg/libr/include/r_flag.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_flag.h	2018-08-07 14:12:36.000000000 +0000
@@ -52,7 +52,9 @@
 	st64 base;         /* base address for all flag items */
 	int space_idx;     /* index of the selected space in spaces array */
 	bool space_strict; /* when true returned flag items must belong to the selected space */
+	bool realnames;
 	char *spaces[R_FLAG_SPACES_MAX]; /* array of flag spaces */
+	Sdb *tags;
 	RNum *num;
 	RSkipList *by_off; /* flags sorted by offset, value=RFlagsAtOffset */
 	SdbHash *ht_name; /* hashmap key=item name, value=RList of items */
@@ -109,6 +111,7 @@
 R_API void r_flag_item_free (RFlagItem *item);
 R_API void r_flag_item_set_comment(RFlagItem *item, const char *comment);
 R_API void r_flag_item_set_realname(RFlagItem *item, const char *realname);
+R_API RFlagItem *r_flag_item_clone(RFlagItem *item);
 R_API int r_flag_unset_glob(RFlag *f, const char *name);
 R_API int r_flag_rename(RFlag *f, RFlagItem *item, const char *name);
 R_API int r_flag_relocate (RFlag *f, ut64 off, ut64 off_mask, ut64 to);
@@ -129,6 +132,12 @@
 R_API int r_flag_space_push(RFlag *f, const char *name);
 R_API int r_flag_space_stack_list(RFlag *f, int mode);
 
+/* tags */
+R_API RList *r_flag_tags_list(RFlag *f);
+R_API RList *r_flag_tags_set(RFlag *f, const char *name, const char *words);
+R_API void r_flag_tags_reset(RFlag *f, const char *name);
+R_API RList *r_flag_tags_get(RFlag *f, const char *name);
+
 /* zones */
 
 R_API void r_flag_zone_item_free(void *a);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_fs.h radare2-2.8.0+dfsg/libr/include/r_fs.h
--- radare2-2.3.0+dfsg/libr/include/r_fs.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_fs.h	2018-08-07 14:12:36.000000000 +0000
@@ -75,6 +75,13 @@
 	int type;
 } RFSPartition;
 
+typedef struct r_fs_shell_t {
+	char **cwd;
+	void (*set_prompt)(const char *prompt);
+	const char* (*readline)(void);
+	int (*hist_add)(const char *line);
+} RFSShell;
+
 #define R_FS_FILE_TYPE_MOUNTPOINT 'm'
 #define R_FS_FILE_TYPE_DIRECTORY 'd'
 #define R_FS_FILE_TYPE_REGULAR 'r'
@@ -119,6 +126,7 @@
 R_API char *r_fs_name(RFS *fs, ut64 offset);
 R_API int r_fs_prompt(RFS *fs, const char *root);
 R_API bool r_fs_check(RFS *fs, const char *p);
+R_API int r_fs_shell_prompt(RFSShell *shell, RFS *fs, const char *root); 
 
 /* file.c */
 R_API RFSFile *r_fs_file_new(RFSRoot *root, const char *path);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_hash.h radare2-2.8.0+dfsg/libr/include/r_hash.h
--- radare2-2.3.0+dfsg/libr/include/r_hash.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_hash.h	2018-08-07 14:12:36.000000000 +0000
@@ -2,6 +2,7 @@
 #define R2_HASH_H
 
 #include "r_types.h"
+#include "r_util/r_mem.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -161,6 +162,7 @@
 	R_SHA512_CTX sha512;
 	bool rst;
 	ut8 digest[128];
+	double entropy;
 };
 
 typedef struct r_hash_seed_t {
@@ -248,8 +250,8 @@
 #define R_HASH_SIZE_SHA384 48
 #define R_HASH_SIZE_SHA512 64
 #define R_HASH_SIZE_ADLER32 4
-/* entropy is double !! fail with size 4 */
-#define R_HASH_SIZE_ENTROPY 4
+/* entropy is double !! size 0 for test in r_hash_to_string */
+#define R_HASH_SIZE_ENTROPY 0
 #define R_HASH_SIZE_PCPRINT 1
 #define R_HASH_SIZE_MOD255 1
 #define R_HASH_SIZE_PARITY 1
@@ -461,7 +463,6 @@
 R_API ut8 *r_hash_do_sha256(RHash *ctx, const ut8 *input, int len);
 R_API ut8 *r_hash_do_sha384(RHash *ctx, const ut8 *input, int len);
 R_API ut8 *r_hash_do_sha512(RHash *ctx, const ut8 *input, int len);
-R_API ut8 *r_hash_do_xxhash(RHash *ctx, const ut8 *input, int len);
 
 R_API char *r_hash_to_string(RHash *ctx, const char *name, const ut8 *data, int len);
 
diff -Nru radare2-2.3.0+dfsg/libr/include/r_heap_glibc.h radare2-2.8.0+dfsg/libr/include/r_heap_glibc.h
--- radare2-2.3.0+dfsg/libr/include/r_heap_glibc.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_heap_glibc.h	2018-08-07 14:12:36.000000000 +0000
@@ -32,10 +32,52 @@
 #define BITSPERMAP (1U << BINMAPSHIFT)
 #define BINMAPSIZE (NBINS / BITSPERMAP)
 #define MAX(a,b) (((a)>(b))?(a):(b))
+
+#if __GLIBC_MINOR__ > 25
+#define MALLOC_ALIGNMENT 16
+#else
 #define MALLOC_ALIGNMENT MAX (2 * SZ,  __alignof__ (long double))
+#endif
+
 #define MALLOC_ALIGN_MASK (MALLOC_ALIGNMENT - 1)
 #define NPAD -6
 
+
+#if __GLIBC_MINOR__ > 25
+#define MallocState GH(RHeap_MallocState_tcache)
+#define SIZE_SZ (sizeof (size_t))
+#define MIN_CHUNK_SIZE SZ*4
+#define MINSIZE  \
+  (unsigned long)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK))
+#define request2size(req)                                         \
+  (((req) + SIZE_SZ + MALLOC_ALIGN_MASK < MINSIZE)  ?             \
+   MINSIZE :                                                      \
+   ((req) + SIZE_SZ + MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK)
+
+# define TCACHE_MAX_BINS        	64
+# define MAX_TCACHE_SIZE        	tidx2usize (TCACHE_MAX_BINS-1)
+/* Only used to pre-fill the tunables.  */
+# define tidx2usize(idx)        (((size_t) idx) * MALLOC_ALIGNMENT + MINSIZE - SIZE_SZ)
+
+/* When "x" is from chunksize().  */
+# define csize2tidx(x) (((x) - MINSIZE + MALLOC_ALIGNMENT - 1) / MALLOC_ALIGNMENT)
+/* When "x" is a user-provided size.  */
+# define usize2tidx(x) csize2tidx (request2size (x))
+
+/* With rounding and alignment, the bins are...
+   idx 0   bytes 0..24 (64-bit) or 0..12 (32-bit)
+   idx 1   bytes 25..40 or 13..20
+   idx 2   bytes 41..56 or 21..28
+   etc.  */
+ 
+/* This is another arbitrary limit, which tunables can change.  Each
+tcache bin will hold at most this number of chunks.  */
+# define TCACHE_FILL_COUNT 7
+
+#else
+#define MallocState GH(RHeap_MallocState)
+#endif
+
 #define largebin_index_32(size)				       \
 (((((ut32)(size)) >>  6) <= 38)?  56 + (((ut32)(size)) >>  6): \
  ((((ut32)(size)) >>  9) <= 20)?  91 + (((ut32)(size)) >>  9): \
@@ -128,10 +170,63 @@
 	ut64 next; 				/* double linked list of chunks */
 	ut64 next_free; 			/* double linked list of free chunks */
 
-	ut64 system_mem;	 		/* current allocated memory of current arena */
+	ut64 system_mem; 			/* current allocated memory of current arena */
 	ut64 max_system_mem;  			/* maximum system memory */
 } RHeap_MallocState_64; 
 
+#if __GLIBC_MINOR__ > 25
+typedef struct r_tcache_perthread_struct_32 {
+	ut8 counts[TCACHE_MAX_BINS];
+	unsigned int *entries[TCACHE_MAX_BINS];
+} RHeapTcache_32;
+
+typedef struct r_tcache_perthread_struct_64 {
+	ut8 counts[TCACHE_MAX_BINS];
+	unsigned int *entries[TCACHE_MAX_BINS];
+} RHeapTcache_64;
+
+typedef struct r_malloc_state_tcache_32 {
+	int mutex; 				/* serialized access */
+	int flags; 				/* flags */
+
+	int have_fast_chunks;                   /* have fast chunks */
+
+	ut32 fastbinsY[NFASTBINS + 1];		/* array of fastchunks */
+	ut32 top; 				/* top chunk's base addr */
+	ut32 last_remainder;			/* remainder top chunk's addr */
+	ut32 bins[NBINS * 2 - 2];   		/* array of remainder free chunks */
+	unsigned int binmap[BINMAPSIZE]; 	/* bitmap of bins */
+
+	ut32 next; 				/* double linked list of chunks */
+	ut32 next_free; 			/* double linked list of free chunks */
+	unsigned int attached_threads;          /* threads attached */
+
+	ut32 system_mem;	 		/* current allocated memory of current arena */
+	ut32 max_system_mem;  			/* maximum system memory */
+} RHeap_MallocState_tcache_32;
+
+
+typedef struct r_malloc_state_tcache_64 {
+	int mutex; 				/* serialized access */
+	int flags; 				/* flags */
+
+	int have_fast_chunks;                   /* have fast chunks */
+
+	ut64 fastbinsY[NFASTBINS];		/* array of fastchunks */
+	ut64 top; 				/* top chunk's base addr */
+	ut64 last_remainder;			/* remainder top chunk's addr */
+	ut64 bins[NBINS * 2 - 2];   		/* array of remainder free chunks */
+	unsigned int binmap[BINMAPSIZE]; 	/* bitmap of bins */
+
+	ut64 next; 				/* double linked list of chunks */
+	ut64 next_free; 			/* double linked list of free chunks */
+	unsigned int attached_threads;          /* threads attached */
+
+	ut64 system_mem;	 		/* current allocated memory of current arena */
+	ut64 max_system_mem;  			/* maximum system memory */
+} RHeap_MallocState_tcache_64;
+#endif
+
 typedef struct r_heap_info_32 {
 	ut32 ar_ptr;			/* Arena for this heap. */
 	ut32 prev;		 	/* Previous heap. */
diff -Nru radare2-2.3.0+dfsg/libr/include/r_io.h radare2-2.8.0+dfsg/libr/include/r_io.h
--- radare2-2.3.0+dfsg/libr/include/r_io.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_io.h	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,12 @@
-/* radare2 - LGPL - Copyright 2017 - condret, pancake, alvaro */
+/* radare2 - LGPL - Copyright 2017-2018 - condret, pancake, alvaro */
 
 #ifndef R2_IO_H
 #define R2_IO_H
 
 #include "r_list.h"
+#include <r_util/r_idpool.h>
+#include <r_util/r_cache.h>
+#include <r_util/r_buf.h>
 #include "r_socket.h"
 #include "r_util.h"
 #include "r_vector.h"
@@ -57,7 +60,6 @@
 
 typedef struct r_io_t {
 	struct r_io_desc_t *desc;
-	int ret; // number of bytes read or written
 	ut64 off;
 	int bits;
 	int va;		//all of this config stuff must be in 1 int
@@ -75,7 +77,7 @@
 	RIDPool *sec_ids;
 	RIDPool *map_ids;
 	SdbList *maps; //from tail backwards maps with higher priority are found
-	RVector map_skyline; // map parts that are not covered by others
+	RPVector map_skyline; // map parts that are not covered by others
 	SdbList *sections;
 	RIDStorage *files;
 	RCache *buffer;
@@ -249,10 +251,13 @@
 typedef int (*RIOFdWriteAt) (RIO *io, int fd, ut64 addr, const ut8 *buf, int len);
 typedef bool (*RIOFdIsDbg) (RIO *io, int fd);
 typedef const char *(*RIOFdGetName) (RIO *io, int fd);
+typedef RList *(*RIOFdGetMap) (RIO *io, int fd);
+typedef bool (*RIOFdRemap) (RIO *io, int fd, ut64 addr);
 typedef void (*RIOAlSort) (RIOAccessLog *log);
 typedef void (*RIOAlFree) (RIOAccessLog *log);
 typedef ut8 *(*RIOAlGetFbufByflags) (RIOAccessLog *log, int flags, ut64 *addr, int *len);
 typedef bool (*RIOIsValidOff) (RIO *io, ut64 addr, int hasperm);
+typedef bool (*RIOAddrIsMapped) (RIO *io, ut64 addr);
 typedef SdbList *(*RIOSectionVgetSecsAt) (RIO *io, ut64 vaddr);
 typedef RIOSection *(*RIOSectionVgetSec) (RIO *io, ut64 vaddr);
 typedef RIOSection *(*RIOSectionAdd) (RIO *io, ut64 addr, ut64 vaddr, ut64 size, ut64 vsize, int rwx, const char *name, ut32 bin_id, int fd);
@@ -280,10 +285,13 @@
 	RIOFdWriteAt fd_write_at;
 	RIOFdIsDbg fd_is_dbg;
 	RIOFdGetName fd_get_name;
+	RIOFdGetMap fd_get_map;
+	RIOFdRemap fd_remap;
 	RIOAlSort al_sort;	//needed for esil
 	RIOAlFree al_free;	//needed for esil
 	RIOAlGetFbufByflags al_buf_byflags;	//needed for esil
 	RIOIsValidOff is_valid_offset;
+	RIOAddrIsMapped addr_is_mapped;
 	RIOSectionVgetSecsAt sections_vget;
 	RIOSectionVgetSec sect_vget;
 	RIOSectionAdd section_add;
@@ -291,8 +299,10 @@
 
 //map.c
 R_API RIOMap *r_io_map_new (RIO *io, int fd, int flags, ut64 delta, ut64 addr, ut64 size, bool do_skyline);
+R_API ut64 r_io_map_next_address(RIO* io, ut64 addr);
 R_API void r_io_map_init (RIO *io);
 R_API bool r_io_map_remap (RIO *io, ut32 id, ut64 addr);
+R_API bool r_io_map_remap_fd (RIO *io, int fd, ut64 addr);
 R_API bool r_io_map_exists (RIO *io, RIOMap *map);
 R_API bool r_io_map_exists_for_id (RIO *io, ut32 id);
 R_API RIOMap *r_io_map_resolve (RIO *io, ut32 id);
@@ -302,6 +312,7 @@
 R_API void r_io_map_reset(RIO* io);
 R_API bool r_io_map_del (RIO *io, ut32 id);
 R_API bool r_io_map_del_for_fd (RIO *io, int fd);
+R_API bool r_io_map_depriorize(RIO* io, ut32 id);
 R_API bool r_io_map_priorize (RIO *io, ut32 id);
 R_API bool r_io_map_priorize_for_fd (RIO *io, int fd);
 R_API void r_io_map_cleanup (RIO *io);
@@ -327,11 +338,12 @@
 R_API int r_io_close_all (RIO *io);
 R_API int r_io_pread_at (RIO *io, ut64 paddr, ut8 *buf, int len);
 R_API int r_io_pwrite_at (RIO *io, ut64 paddr, const ut8 *buf, int len);
-R_API bool r_io_vread_at (RIO *io, ut64 vaddr, ut8 *buf, int len);
-R_API bool r_io_vwrite_at (RIO *io, ut64 vaddr, const ut8 *buf, int len);
+R_API bool r_io_vread_at_mapped(RIO* io, ut64 vaddr, ut8* buf, int len);
 R_API RIOAccessLog *r_io_al_vread_at (RIO *io, ut64 vaddr, ut8 *buf, int len);
 R_API RIOAccessLog *r_io_al_vwrite_at (RIO *io, ut64 vaddr, const ut8 *buf, int len);
 R_API bool r_io_read_at (RIO *io, ut64 addr, ut8 *buf, int len);
+R_API bool r_io_read_at_mapped(RIO *io, ut64 addr, ut8 *buf, int len);
+R_API int r_io_nread_at (RIO *io, ut64 addr, ut8 *buf, int len);
 R_API RIOAccessLog *r_io_al_read_at (RIO *io, ut64 addr, ut8 *buf, int len);
 R_API void r_io_alprint(RList *ls);
 R_API bool r_io_write_at (RIO *io, ut64 addr, const ut8 *buf, int len);
@@ -358,6 +370,10 @@
 R_API bool r_io_plugin_add(RIO *io, RIOPlugin *plugin);
 R_API int r_io_plugin_list(RIO *io);
 R_API int r_io_plugin_list_json(RIO *io);
+R_API int r_io_plugin_read(RIODesc *desc, ut8 *buf, int len);
+R_API int r_io_plugin_write(RIODesc *desc, const ut8 *buf, int len);
+R_API int r_io_plugin_read_at(RIODesc *desc, ut64 addr, ut8 *buf, int len);
+R_API int r_io_plugin_write_at(RIODesc *desc, ut64 addr, const ut8 *buf, int len);
 R_API RIOPlugin *r_io_plugin_resolve(RIO *io, const char *filename, bool many);
 R_API RIOPlugin *r_io_plugin_resolve_fd(RIO *io, int fd);
 R_API RIOPlugin *r_io_plugin_get_default(RIO *io, const char *filename, bool many);
@@ -529,6 +545,7 @@
 extern RIOPlugin r_io_plugin_ar;
 extern RIOPlugin r_io_plugin_rbuf;
 extern RIOPlugin r_io_plugin_winedbg;
+extern RIOPlugin r_io_plugin_gprobe;
 
 #if __cplusplus
 }
diff -Nru radare2-2.3.0+dfsg/libr/include/r_list.h radare2-2.8.0+dfsg/libr/include/r_list.h
--- radare2-2.3.0+dfsg/libr/include/r_list.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_list.h	2018-08-07 14:12:36.000000000 +0000
@@ -45,6 +45,9 @@
 #define r_list_foreach(list, it, pos)\
 	if (list)\
 		for (it = list->head; it && (pos = it->data, 1); it = it->n)
+#define r_list_foreach_iter(list, it)\
+	if (list)\
+		for (it = list->head; it; it = it->n)
 /* Safe when calling r_list_delete() while iterating over the list. */
 #define r_list_foreach_safe(list, it, tmp, pos)\
 	if (list)\
@@ -55,7 +58,8 @@
 #ifndef _R_LIST_C_
 #define r_list_push(x, y) r_list_append (x, y)
 #define r_list_iterator(x) (x)? (x)->head: NULL
-#define r_list_empty(x) (!x || (!(x->head) && !(x->tail)))
+// #define r_list_empty(x) (!x || (!(x->head) && !(x->tail)))
+#define r_list_empty(x) (!(x) || !(x)->length)
 #define r_list_head(x) x->head
 #define r_list_tail(x) x->tail
 
@@ -79,6 +83,7 @@
 R_API void *r_list_first(const RList *list);
 R_API RListIter *r_list_add_sorted(RList *list, void *data, RListComparator cmp);
 R_API void r_list_sort(RList *list, RListComparator cmp);
+R_API RList *r_list_uniq(const RList *list, RListComparator cmp);
 R_API void r_list_merge_sort(RList *list, RListComparator cmp);
 R_API void r_list_insertion_sort(RList *list, RListComparator cmp);
 
diff -Nru radare2-2.3.0+dfsg/libr/include/r_magic.h radare2-2.8.0+dfsg/libr/include/r_magic.h
--- radare2-2.3.0+dfsg/libr/include/r_magic.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_magic.h	2018-08-07 14:12:36.000000000 +0000
@@ -15,8 +15,6 @@
 #define MAGICFILE "/etc/magic"
 #endif
 
-#define R_MAGIC_PATH "/share/radare2/" R2_VERSION "/magic"
-
 #if USE_LIB_MAGIC
 
 #include <magic.h>
diff -Nru radare2-2.3.0+dfsg/libr/include/r_parse.h radare2-2.8.0+dfsg/libr/include/r_parse.h
--- radare2-2.3.0+dfsg/libr/include/r_parse.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_parse.h	2018-08-07 14:12:36.000000000 +0000
@@ -22,6 +22,7 @@
 	void *user;
 	int flagspace;
 	int notin_flagspace;
+	bool pseudo;
 	bool relsub; // replace rip relative expressions in instruction
 	bool localvar_only; // if true use only the local variable name (e.g. [local_10h] instead of [ebp + local10h])
 	int relsub_addr;
diff -Nru radare2-2.3.0+dfsg/libr/include/r_print.h radare2-2.8.0+dfsg/libr/include/r_print.h
--- radare2-2.3.0+dfsg/libr/include/r_print.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_print.h	2018-08-07 14:12:36.000000000 +0000
@@ -50,8 +50,6 @@
 	char *(*cb_color)(int idx, int last, bool bg);
 	int (*disasm)(void *p, ut64 addr);
 	void (*oprintf)(const char *str, ...);
-	char* (*get_bitfield)(void *user, const char *name, ut64 value);
-	char* (*get_enumname)(void *user, const char *name, ut64 value);
 	int interrupt;
 	int big_endian;
 	int width;
@@ -66,29 +64,37 @@
 	int ocur;
 	int cols;
 	int flags;
+	int seggrn;
 	bool use_comments;
 	int addrmod;
 	int col;
 	int stride;
 	int bytespace;
 	int pairs;
+	bool resetbg;
 	RPrintZoom *zoom;
 	RPrintNameCallback offname;
 	RPrintColorFor colorfor;
 	RPrintColorFor hasrefs;
 	RPrintCommentCallback get_comments;
 	Sdb *formats;
+	Sdb *sdb_types;
 	RCons *cons;
 	RConsBind consbind;
 	RNum *num;
 	RReg *reg;
 	RRegItem* (*get_register)(RReg *reg, const char *name, int type);
 	ut64 (*get_register_value)(RReg *reg, RRegItem *item);
+	bool (*exists_var)(struct r_print_t *print, ut64 func_addr, char *str);
 	ut64* lines_cache;
 	int lines_cache_sz;
 	int lines_abs;
 	bool esc_bslash;
+	const char *strconv_mode;
+	RList *vars;
 
+	// when true it uses row_offsets
+	bool calc_row_offsets;
 	// offset of the first byte of each printed row.
 	// Last elements is marked with a UT32_MAX.
 	ut32 *row_offsets;
@@ -102,9 +108,12 @@
 } RPrint;
 
 #ifdef R_API
+
 /* RConsBreak handlers */
-R_API int r_print_is_interrupted(void);
-R_API void r_print_set_interrupt(int i);
+typedef bool (*RPrintIsInterruptedCallback)();
+
+R_API bool r_print_is_interrupted(void);
+R_API void r_print_set_is_interrupted_cb(RPrintIsInterruptedCallback cb);
 
 /* ... */
 R_API char *r_print_hexpair(RPrint *p, const char *str, int idx);
@@ -147,13 +156,15 @@
 R_API int r_print_format(RPrint *p, ut64 seek, const ut8* buf, const int len, const char *fmt, int elem, const char *setval, char *field);
 R_API int r_print_format_length(const char *fmt);
 R_API void r_print_offset(RPrint *p, ut64 off, int invert, int opt, int dec, int delta, const char *label);
+R_API void r_print_offset_sg(RPrint *p, ut64 off, int invert, int offseg, int seggrn, int offdec, int delta, const char *label);
 #define R_PRINT_STRING_WIDE 1
 #define R_PRINT_STRING_ZEROEND 2
 #define R_PRINT_STRING_URLENCODE 4
 #define R_PRINT_STRING_WRAP 8
 #define R_PRINT_STRING_WIDE32 16
+#define R_PRINT_STRING_ESC_NL 32
 R_API int r_print_string(RPrint *p, ut64 seek, const ut8 *str, int len, int options);
-R_API int r_print_date_dos(RPrint *p, ut8 *buf, int len);
+R_API int r_print_date_dos(RPrint *p, const ut8 *buf, int len);
 R_API int r_print_date_hfs(RPrint *p, const ut8 *buf, int len);
 R_API int r_print_date_w32(RPrint *p, const ut8 *buf, int len);
 R_API int r_print_date_unix(RPrint *p, const ut8 *buf, int len);
@@ -165,13 +176,15 @@
 R_API char * r_print_randomart(const ut8 *dgst_raw, ut32 dgst_raw_len, ut64 addr);
 R_API void r_print_2bpp_row(RPrint *p, ut8 *buf);
 R_API void r_print_2bpp_tiles(RPrint *p, ut8 *buf, ut32 tiles);
-R_API char * r_print_colorize_opcode(RPrint *print, char *p, const char *reg, const char *num, bool partial_reset);
+R_API char * r_print_colorize_opcode(RPrint *print, char *p, const char *reg, const char *num, bool partial_reset, ut64 func_addr);
 R_API const char * r_print_color_op_type(RPrint *p, ut64 anal_type);
 R_API void r_print_set_interrupted(int i);
 R_API void r_print_init_rowoffsets(RPrint *p);
 R_API ut32 r_print_rowoff(RPrint *p, int i);
-R_API void r_print_set_rowoff(RPrint *p, int i, ut32 offset);
+R_API void r_print_set_rowoff(RPrint *p, int i, ut32 offset, bool overwrite);
 R_API int r_print_row_at_off(RPrint *p, ut32 offset);
+R_API int r_print_pie(RPrint *p, ut64 *values, int nvalues, int size);
+
 // WIP
 R_API int r_print_unpack7bit(const char *src, char *dest);
 R_API int r_print_pack7bit(const char *src, char *dest);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_search.h radare2-2.8.0+dfsg/libr/include/r_search.h
--- radare2-2.3.0+dfsg/libr/include/r_search.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_search.h	2018-08-07 14:12:36.000000000 +0000
@@ -13,6 +13,7 @@
 R_LIB_VERSION_HEADER(r_search);
 
 enum {
+	R_SEARCH_ESIL,
 	R_SEARCH_KEYWORD,
 	R_SEARCH_REGEXP,
 	R_SEARCH_PATTERN,
diff -Nru radare2-2.3.0+dfsg/libr/include/r_socket.h radare2-2.8.0+dfsg/libr/include/r_socket.h
--- radare2-2.3.0+dfsg/libr/include/r_socket.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_socket.h	2018-08-07 14:12:36.000000000 +0000
@@ -78,7 +78,7 @@
 R_API RSocket *r_socket_new_from_fd(int fd);
 R_API RSocket *r_socket_new(int is_ssl);
 R_API bool r_socket_connect(RSocket *s, const char *host, const char *port, int proto, unsigned int timeout);
-R_API int r_socket_spawn (RSocket *s, const char *cmd, unsigned int timeout);
+R_API bool r_socket_spawn (RSocket *s, const char *cmd, unsigned int timeout);
 R_API int r_socket_connect_serial(RSocket *sock, const char *path, int speed, int parity);
 #define r_socket_connect_tcp(a, b, c, d) r_socket_connect (a, b, c, R_SOCKET_PROTO_TCP, d)
 #define r_socket_connect_udp(a, b, c, d) r_socket_connect (a, b, c, R_SOCKET_PROTO_UDP, d)
@@ -92,6 +92,7 @@
 R_API int r_socket_free(RSocket *s);
 R_API bool r_socket_listen(RSocket *s, const char *port, const char *certfile);
 R_API RSocket *r_socket_accept(RSocket *s);
+R_API RSocket *r_socket_accept_timeout(RSocket *s, unsigned int timeout);
 R_API int r_socket_block_time(RSocket *s, int block, int sec);
 R_API int r_socket_flush(RSocket *s);
 R_API int r_socket_ready(RSocket *s, int secs, int usecs);
@@ -136,7 +137,7 @@
 	int data_length;
 } RSocketHTTPRequest;
 
-R_API RSocketHTTPRequest *r_socket_http_accept(RSocket *s, int timeout);
+R_API RSocketHTTPRequest *r_socket_http_accept(RSocket *s, int accept_timeout, int timeout);
 R_API void r_socket_http_response(RSocketHTTPRequest *rs, int code, const char *out, int x, const char *headers);
 R_API void r_socket_http_close(RSocketHTTPRequest *rs);
 R_API ut8 *r_socket_http_handle_upload(const ut8 *str, int len, int *olen);
@@ -154,7 +155,7 @@
 	RAP_RMT_WRITE,
 	RAP_RMT_SEEK,
 	RAP_RMT_CLOSE,
-	RAP_RMT_CMD,
+	RAP_RMT_CMD = 0x07,
 	RAP_RMT_REPLY = 0x80,
 	RAP_RMT_MAX = 4096
 };
diff -Nru radare2-2.3.0+dfsg/libr/include/r_syscall.h radare2-2.8.0+dfsg/libr/include/r_syscall.h
--- radare2-2.3.0+dfsg/libr/include/r_syscall.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_syscall.h	2018-08-07 14:12:36.000000000 +0000
@@ -44,6 +44,7 @@
 	RSyscallPort *sysport;
 	Sdb *db;
 	Sdb *srdb;
+	int refs;
 } RSyscall;
 
 #if 0
@@ -91,6 +92,7 @@
 
 R_API RSyscall *r_syscall_new(void);
 R_API void r_syscall_free(RSyscall *ctx);
+R_API RSyscall* r_syscall_ref(RSyscall *sc);
 R_API bool r_syscall_setup(RSyscall *s, const char *arch, int bits, const char *cpu, const char *os);
 R_API RSyscallItem *r_syscall_get(RSyscall *ctx, int num, int swi);
 R_API int r_syscall_get_num(RSyscall *ctx, const char *str);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_th.h radare2-2.8.0+dfsg/libr/include/r_th.h
--- radare2-2.3.0+dfsg/libr/include/r_th.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_th.h	2018-08-07 14:12:36.000000000 +0000
@@ -10,13 +10,18 @@
 #define HAVE_PTHREAD 0
 #define R_TH_TID HANDLE
 #define R_TH_LOCK_T CRITICAL_SECTION
+#define R_TH_COND_T CONDITION_VARIABLE
+#define R_TH_SEM_T HANDLE
 //HANDLE
 
 #elif HAVE_PTHREAD
 #define __GNU
+#include <semaphore.h>
 #include <pthread.h>
 #define R_TH_TID pthread_t
 #define R_TH_LOCK_T pthread_mutex_t
+#define R_TH_COND_T pthread_cond_t
+#define R_TH_SEM_T sem_t *
 
 #else
 #error Threading library only supported for pthread and w32
@@ -28,13 +33,25 @@
 extern "C" {
 #endif
 
+typedef struct r_th_sem_t {
+	R_TH_SEM_T sem;
+} RThreadSemaphore;
+
 typedef struct r_th_lock_t {
 	int refs;
 	R_TH_LOCK_T lock;
 } RThreadLock;
 
+typedef struct r_th_cond_t {
+	R_TH_COND_T cond;
+} RThreadCond;
+
 typedef struct r_th_t {
 	R_TH_TID tid;
+#if HAVE_PTHREAD
+	pthread_mutex_t _mutex;
+	pthread_cond_t _cond;
+#endif
 	RThreadLock *lock;
 	R_TH_FUNCTION(fun);
 	void *user;    // user pointer
@@ -56,7 +73,15 @@
 R_API int r_th_wait_async(RThread *th);
 R_API void r_th_break(RThread *th);
 R_API void *r_th_free(RThread *th);
-R_API int r_th_kill(RThread *th, int force);
+R_API bool r_th_kill(RThread *th, bool force);
+R_API bool r_th_pause(RThread *th, bool enable);
+R_API bool r_th_try_pause(RThread *th);
+R_API R_TH_TID r_th_self(void);
+
+R_API RThreadSemaphore *r_th_sem_new(unsigned int initial);
+R_API void r_th_sem_free(RThreadSemaphore *sem);
+R_API void r_th_sem_post(RThreadSemaphore *sem);
+R_API void r_th_sem_wait(RThreadSemaphore *sem);
 
 R_API RThreadLock *r_th_lock_new(bool recursive);
 R_API int r_th_lock_wait(RThreadLock *th);
@@ -65,15 +90,11 @@
 R_API int r_th_lock_leave(RThreadLock *thl);
 R_API void *r_th_lock_free(RThreadLock *thl);
 
-typedef struct r_thread_msg_t {
-	char *text;
-	char done;
-	char *res;
-	RThread *th;
-} RThreadMsg;
-
-R_API RThreadMsg* r_th_msg_new (const char *cmd, void *cb);
-R_API void r_th_msg_free (RThreadMsg* msg);
+R_API RThreadCond *r_th_cond_new();
+R_API void r_th_cond_signal(RThreadCond *cond);
+R_API void r_th_cond_signal_all(RThreadCond *cond);
+R_API void r_th_cond_wait(RThreadCond *cond, RThreadLock *lock);
+R_API void r_th_cond_free(RThreadCond *cond);
 
 #endif
 
diff -Nru radare2-2.3.0+dfsg/libr/include/r_types_base.h radare2-2.8.0+dfsg/libr/include/r_types_base.h
--- radare2-2.3.0+dfsg/libr/include/r_types_base.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_types_base.h	2018-08-07 14:12:36.000000000 +0000
@@ -14,6 +14,26 @@
 #define st8 signed char
 #define boolt int
 
+#if defined(_MSC_VER)
+# define R_ALIGNED(x) __declspec(align(x))
+#else
+# define R_ALIGNED(x) __attribute__((aligned(x)))
+#endif
+
+typedef R_ALIGNED(1) ut16 uut16;
+typedef R_ALIGNED(1) ut32 uut32;
+typedef R_ALIGNED(1) ut64 uut64;
+typedef R_ALIGNED(1) st16 ust16;
+typedef R_ALIGNED(1) st32 ust32;
+typedef R_ALIGNED(1) st64 ust64;
+
+typedef union {
+	ut8 v8;
+	ut16 v16;
+	ut32 v32;
+	ut64 v64;
+} utAny;
+
 typedef struct _ut80 {
 	ut64 Low;
 	ut16 High;
@@ -118,6 +138,8 @@
 #define B0100 4
 #define B0011 3
 #define B0010 2
+#define B0001 1
+#define B0000 0
 #undef B
 #define B4(a,b,c,d) ((a<<12)|(b<<8)|(c<<4)|(d))
 
diff -Nru radare2-2.3.0+dfsg/libr/include/r_types.h radare2-2.8.0+dfsg/libr/include/r_types.h
--- radare2-2.3.0+dfsg/libr/include/r_types.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_types.h	2018-08-07 14:12:36.000000000 +0000
@@ -4,6 +4,7 @@
 // defines like IS_DIGIT, etc'
 #include "r_util/r_str_util.h"
 #include "r_userconf.h"
+#include <stddef.h>
 
 // TODO: fix this to make it crosscompile-friendly: R_SYS_OSTYPE ?
 /* operating system */
@@ -98,7 +99,7 @@
   #define __BSD__ 0
   #define __UNIX__ 1
 #endif
-#if __KFBSD__ || defined(__NetBSD__) || defined(__OpenBSD__)
+#if __KFBSD__ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
   #define __BSD__ 1
   #define __UNIX__ 1
 #endif
@@ -132,6 +133,7 @@
   #define FUNC_ATTR_ALLOC_ALIGN(x) __attribute__((alloc_align(x)))
   #define FUNC_ATTR_PURE __attribute__ ((pure))
   #define FUNC_ATTR_CONST __attribute__((const))
+  #define FUNC_ATTR_USED __attribute__((used))
   #define FUNC_ATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
   #define FUNC_ATTR_ALWAYS_INLINE __attribute__((always_inline))
 
@@ -149,6 +151,7 @@
   #define FUNC_ATTR_ALLOC_ALIGN(x)
   #define FUNC_ATTR_PURE
   #define FUNC_ATTR_CONST
+  #define FUNC_ATTR_USED
   #define FUNC_ATTR_WARN_UNUSED_RESULT
   #define FUNC_ATTR_ALWAYS_INLINE
 #endif
@@ -179,15 +182,20 @@
 #if __WINDOWS__
 #define FS "\\"
 #define R_SYS_DIR "\\"
+#define R_SYS_ENVSEP ";"
 #define R_SYS_HOME "USERPROFILE"
-#define R2_HOMEDIR ".config\\radare2"
 #else
 #define FS "/"
 #define R_SYS_DIR "/"
+#define R_SYS_ENVSEP ":"
 #define R_SYS_HOME "HOME"
-#define R2_HOMEDIR ".config/radare2"
 #endif
 
+#define R_JOIN_2_PATHS(p1, p2) p1 R_SYS_DIR p2
+#define R_JOIN_3_PATHS(p1, p2, p3) p1 R_SYS_DIR p2 R_SYS_DIR p3
+#define R_JOIN_4_PATHS(p1, p2, p3, p4) p1 R_SYS_DIR p2 R_SYS_DIR p3 R_SYS_DIR p4
+#define R_JOIN_5_PATHS(p1, p2, p3, p4, p5) p1 R_SYS_DIR p2 R_SYS_DIR p3 R_SYS_DIR p4 R_SYS_DIR p5
+
 #ifndef __packed
 #define __packed __attribute__((__packed__))
 #endif
@@ -249,7 +257,7 @@
 #define BITS2BYTES(x) (((x)/8)+(((x)%8)?1:0))
 #define ZERO_FILL(x) memset (&x, 0, sizeof (x))
 #define R_NEWS0(x,y) (x*)calloc(y,sizeof(x))
-#define R_NEWS(x,y) (x*)malloc(sizeof(x)*y)
+#define R_NEWS(x,y) (x*)malloc(sizeof(x)*(y))
 #define R_NEW0(x) (x*)calloc(1,sizeof(x))
 #define R_NEW(x) (x*)malloc(sizeof(x))
 #define R_NEWCOPY(x,y) (x*)r_new_copy(sizeof(x), y)
@@ -323,7 +331,7 @@
 #endif
 
 #undef r_offsetof
-#define r_offsetof(type, member) ((unsigned long) &((type*)0)->member)
+#define r_offsetof(type, member) offsetof(type, member)
 
 #define R_BETWEEN(x,y,z) (((y)>=(x)) && ((y)<=(z)))
 #define R_ROUND(x,y) ((x)%(y))?(x)+((y)-((x)%(y))):(x)
@@ -339,7 +347,7 @@
 #define R_ABS(x) (((x)<0)?-(x):(x))
 #define R_BTW(x,y,z) (((x)>=(y))&&((y)<=(z)))?y:x
 
-#define R_FREE(x) { free(x); x = NULL; }
+#define R_FREE(x) { free((void *)x); x = NULL; }
 
 #if __WINDOWS__
 #define HAVE_REGEXP 0
@@ -352,6 +360,10 @@
 #define PFMT64d "I64d"
 #define PFMT64u "I64u"
 #define PFMT64o "I64o"
+#define PFMTSZx "Ix"
+#define PFMTSZd "Id"
+#define PFMTSZu "Iu"
+#define PFMTSZo "Io"
 #define LDBLFMT "f"
 #define HHXFMT  "x"
 #else
@@ -359,6 +371,10 @@
 #define PFMT64d "lld"
 #define PFMT64u "llu"
 #define PFMT64o "llo"
+#define PFMTSZx "zx"
+#define PFMTSZd "zd"
+#define PFMTSZu "zu"
+#define PFMTSZo "zo"
 #define LDBLFMT "Lf"
 #define HHXFMT  "hhx"
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_userconf.h.acr radare2-2.8.0+dfsg/libr/include/r_userconf.h.acr
--- radare2-2.3.0+dfsg/libr/include/r_userconf.h.acr	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_userconf.h.acr	2018-08-07 14:12:36.000000000 +0000
@@ -4,21 +4,82 @@
 #include "r_version.h"
 
 #define DEBUGGER @DEBUGGER@
+#define HAVE_DECL_ADDR_NO_RANDOMIZE @HAVE_DECL_ADDR_NO_RANDOMIZE@
+#define HAVE_ARC4RANDOM_UNIFORM @HAVE_ARC4RANDOM_UNIFORM@
+#define HAVE_EXPLICIT_BZERO @HAVE_EXPLICIT_BZERO@
 
+#ifdef R_MESON_VERSION
+#define R2_PREFIX "@PREFIX@"
+#define R2_LIBDIR "@LIBDIR@"
+#define R2_INCDIR "@INCLUDEDIR@"
+#define R2_DATDIR "@DATADIR@"
+#define R2_WWWROOT "@WWWROOT@"
+#define R2_PLUGINS "@PLUGINS@"
+#define R2_EXTRAS "@EXTRAS@"
+#define R2_BINDINGS "@BINDINGS@"
+#define R2_SDB "@SDB@"
+#define R2_ZIGNS "@ZIGNS@"
+#define R2_THEMES "@THEMES@"
+#define R2_FORTUNES "@FORTUNES@"
+#define R2_FLAGS "@FLAGS@"
+#define R2_HUD "@HUD@"
+#else
 #if __WINDOWS__ || __CYGWIN__ || MINGW32 || _MSC_VER || CUTTER
 #define R2_PREFIX "."
-#define R2_LIBDIR "./lib"
-#define R2_INCDIR "./include/libr"
-#define R2_DATDIR "./share"
+#define R2_LIBDIR "lib"
+#define R2_INCDIR "include\\libr"
+#define R2_DATDIR "share"
+#define R2_WWWROOT "www"
+#define R2_PLUGINS "lib\\plugins"
+#define R2_EXTRAS "lib\\extras"
+#define R2_BINDINGS "lib\\bindings"
 #else
 #define R2_PREFIX "@PREFIX@"
 #define R2_LIBDIR "@LIBDIR@"
 #define R2_INCDIR "@INCLUDEDIR@/libr"
 #define R2_DATDIR "@DATADIR@"
+#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
+#define R2_PLUGINS "lib/radare2/" R2_VERSION
+#define R2_EXTRAS "lib/radare2-extras/" R2_VERSION
+#define R2_BINDINGS "lib/radare2-bindings/" R2_VERSION
+#endif
+#define R2_SDB              R_JOIN_3_PATHS ("share", "radare2", R2_VERSION)
+#define R2_ZIGNS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "zigns")
+#define R2_THEMES           R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "cons")
+#define R2_FLAGS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "flag")
+#define R2_FORTUNES         R_JOIN_3_PATHS ("share", "doc", "radare2")
+#define R2_HUD              R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "hud")
 #endif
 
+#define R2_SDB_FCNSIGN      R_JOIN_2_PATHS (R2_SDB, "fcnsign")
+#define R2_SDB_OPCODES      R_JOIN_2_PATHS (R2_SDB, "opcodes")
+#define R2_SDB_MAGIC        R_JOIN_2_PATHS (R2_SDB, "magic")
+#define R2_SDB_FORMAT       R_JOIN_2_PATHS (R2_SDB, "format")
+
+#define R2_HOME_CONFIGDIR   R_JOIN_2_PATHS (".config", "radare2")
+#define R2_HOME_DATADIR     R_JOIN_3_PATHS (".local", "share", "radare2")
+#define R2_HOME_CACHEDIR    R_JOIN_2_PATHS (".cache", "radare2")
+
+#define R2_HOME_THEMES      R_JOIN_2_PATHS (R2_HOME_DATADIR, "cons")
+#define R2_HOME_PLUGINS     R_JOIN_2_PATHS (R2_HOME_DATADIR, "plugins")
+#define R2_HOME_ZIGNS       R_JOIN_2_PATHS (R2_HOME_DATADIR, "zigns")
+#define R2_HOME_PDB         R_JOIN_2_PATHS (R2_HOME_DATADIR, "pdb")
+#define R2_HOME_PROJECTS    R_JOIN_2_PATHS (R2_HOME_DATADIR, "projects")
+#define R2_HOME_WWWROOT     R_JOIN_2_PATHS (R2_HOME_DATADIR, "www")
+#define R2_HOME_SDB_FORMAT  R_JOIN_2_PATHS (R2_HOME_DATADIR, "format")
+#define R2_HOME_HUD         R_JOIN_2_PATHS (R2_HOME_DATADIR, "hud")
+#define R2_HOME_BINRC       R_JOIN_2_PATHS (R2_HOME_DATADIR, "rc.d")
+#define R2_HOME_BIN         R_JOIN_3_PATHS (R2_HOME_DATADIR, "prefix", "bin")
+
+#define R2_HOME_RC          R_JOIN_2_PATHS (R2_HOME_CONFIGDIR, "radare2rc")
+#define R2_HOME_RC_DIR      R_JOIN_2_PATHS (R2_HOME_CONFIGDIR, "radare2rc.d")
+
+#define R2_HOME_HISTORY     R_JOIN_2_PATHS (R2_HOME_CACHEDIR, "history")
+
 #define HAVE_LIB_MAGIC @HAVE_LIB_MAGIC@
 #define USE_LIB_MAGIC @USE_LIB_MAGIC@
+#define HAVE_LIB_XXHASH @HAVE_LIB_XXHASH@
+#define USE_LIB_XXHASH @USE_LIB_XXHASH@
 #ifndef HAVE_LIB_SSL
 #define HAVE_LIB_SSL @HAVE_OPENSSL@
 #endif
@@ -27,8 +88,6 @@
 
 #define WITH_GPL @WITH_GPL@
 
-#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
-
 #if __APPLE__ && __POWERPC__
 #define HAVE_JEMALLOC 0
 #else
diff -Nru radare2-2.3.0+dfsg/libr/include/r_userconf.h.in radare2-2.8.0+dfsg/libr/include/r_userconf.h.in
--- radare2-2.3.0+dfsg/libr/include/r_userconf.h.in	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_userconf.h.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#ifndef R2_CONFIGURE_H
-#define R2_CONFIGURE_H
-
-#include "r_version.h"
-
-#define DEBUGGER @DEBUGGER@
-
-#if __WINDOWS__ || __CYGWIN__ || MINGW32 || _MSC_VER || CUTTER
-#define R2_PREFIX "."
-#define R2_LIBDIR "./lib"
-#define R2_INCDIR "./include/libr"
-#define R2_DATDIR "./share"
-#else
-#define R2_PREFIX "@PREFIX@"
-#define R2_LIBDIR "@LIBDIR@"
-#define R2_INCDIR "@INCLUDEDIR@/libr"
-#define R2_DATDIR "@DATADIR@"
-#endif
-
-#define HAVE_LIB_MAGIC @HAVE_LIB_MAGIC@
-#define USE_LIB_MAGIC @USE_LIB_MAGIC@
-#ifndef HAVE_LIB_SSL
-#define HAVE_LIB_SSL @HAVE_OPENSSL@
-#endif
-
-#define HAVE_FORK @HAVE_FORK@
-
-#define WITH_GPL @WITH_GPL@
-
-#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
-
-#define HAVE_JEMALLOC @HAVE_JEMALLOC@
-
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_ascii_table.h radare2-2.8.0+dfsg/libr/include/r_util/r_ascii_table.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_ascii_table.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_ascii_table.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,16 @@
+/* radare - LGPL - Copyright 2008-2016 - pancake, r00tus3r */
+
+#ifndef R_ASCII_TABLE_H
+#define R_ASCII_TABLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+R_API const char *ret_ascii_table();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_asn1.h radare2-2.8.0+dfsg/libr/include/r_util/r_asn1.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_asn1.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_asn1.h	2018-08-07 14:12:36.000000000 +0000
@@ -84,9 +84,7 @@
 } RASN1Object;
 
 R_API RASN1Object *r_asn1_create_object (const ut8 *buffer, ut32 length);
-
 R_API RASN1Binary *r_asn1_create_binary (const ut8 *buffer, ut32 length);
-
 R_API RASN1String *r_asn1_stringify_bits (const ut8 *buffer, ut32 length);
 R_API RASN1String *r_asn1_stringify_utctime (const ut8 *buffer, ut32 length);
 R_API RASN1String *r_asn1_stringify_time (const ut8 *buffer, ut32 length);
@@ -98,10 +96,9 @@
 R_API RASN1String *r_asn1_stringify_tag (RASN1Object *object);
 R_API RASN1String *r_asn1_stringify_object (RASN1Object *object);
 
-void r_asn1_free_object (RASN1Object *object);
-void r_asn1_free_string (RASN1String *string);
-void r_asn1_free_binary (RASN1Binary *string);
-
+R_API void r_asn1_free_object (RASN1Object *object);
+R_API void r_asn1_free_string (RASN1String *string);
+R_API void r_asn1_free_binary (RASN1Binary *string);
 
 #ifdef __cplusplus
 }
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_buf.h radare2-2.8.0+dfsg/libr/include/r_util/r_buf.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_buf.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_buf.h	2018-08-07 14:12:36.000000000 +0000
@@ -20,6 +20,12 @@
 	int Oxff;
 	RList *sparse;
 	int refctr;
+	// RIOBind *iob;
+	// forward declaration
+	void *iob;
+	ut64 offset;
+	ut64 limit;
+	struct r_buf_t * parent;
 } RBuffer;
 
 typedef struct r_buf_cache_t {
@@ -33,6 +39,7 @@
 
 /* constructors */
 R_API RBuffer *r_buf_new(void);
+R_API RBuffer *r_buf_new_with_io(void *iob, int fd);
 R_API RBuffer *r_buf_new_with_bytes(const ut8* bytes, ut64 len);
 R_API RBuffer *r_buf_new_with_string (const char *msg);
 R_API RBuffer *r_buf_new_with_pointers(const ut8 *bytes, ut64 len);
@@ -42,6 +49,7 @@
 R_API RBuffer *r_buf_new_empty (ut64 len);
 R_API RBuffer *r_buf_mmap(const char *file, int flags);
 R_API RBuffer *r_buf_new_sparse(ut8 Oxff);
+R_API RBuffer *r_buf_new_slice(RBuffer *b, ut64 offset, ut64 size);
 R_API bool r_buf_dump (RBuffer *buf, const char *file);
 R_API RBuffer *r_buf_ref(RBuffer *b);
 /* methods */
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_cache.h radare2-2.8.0+dfsg/libr/include/r_util/r_cache.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_cache.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_cache.h	2018-08-07 14:12:36.000000000 +0000
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <sys/time.h>
+
 typedef struct r_cache_t {
 	ut64 base;
 	ut8 *buf;
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_ctypes.h radare2-2.8.0+dfsg/libr/include/r_util/r_ctypes.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_ctypes.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_ctypes.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,49 @@
+#ifndef R_CTYPES_H
+#define R_CTYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct r_type_enum {
+	const char *name;
+	const char *val;
+}RTypeEnum;
+
+enum RTypeKind {
+	R_TYPE_BASIC = 0,
+	R_TYPE_ENUM = 1,
+	R_TYPE_STRUCT = 2,
+	R_TYPE_UNION = 3,
+};
+
+R_API int r_type_set(Sdb *TDB, ut64 at, const char *field, ut64 val);
+R_API void r_type_del(Sdb *TDB, const char *name);
+R_API int r_type_kind(Sdb *TDB, const char *name);
+R_API char *r_type_enum_member(Sdb *TDB, const char *name, const char *member, ut64 val);
+R_API char *r_type_enum_getbitfield(Sdb *TDB, const char *name, ut64 val);
+R_API RList* r_type_get_enum (Sdb *TDB, const char *name);
+R_API int r_type_get_bitsize (Sdb *TDB, const char *type);
+R_API RList* r_type_get_by_offset(Sdb *TDB, ut64 offset);
+R_API char *r_type_get_struct_memb(Sdb *TDB, const char *type, int offset);
+R_API char *r_type_link_at (Sdb *TDB, ut64 addr);
+R_API int r_type_set_link (Sdb *TDB, const char *val, ut64 addr);
+R_API int r_type_unlink(Sdb *TDB, ut64 addr);
+R_API int r_type_link_offset (Sdb *TDB, const char *val, ut64 addr);
+R_API char *r_type_format(Sdb *TDB, const char *t);
+
+// Function prototypes api
+R_API int r_type_func_exist(Sdb *TDB, const char *func_name);
+R_API const char *r_type_func_cc(Sdb *TDB, const char *func_name);
+R_API const char *r_type_func_ret(Sdb *TDB, const char *func_name);
+R_API int r_type_func_args_count(Sdb *TDB, const char *func_name);
+R_API char *r_type_func_args_type(Sdb *TDB, const char *func_name, int i);
+R_API char *r_type_func_args_name(Sdb *TDB, const char *func_name, int i);
+R_API char *r_type_func_guess(Sdb *TDB, char *func_name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //  R_CTYPES_H
+
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_file.h radare2-2.8.0+dfsg/libr/include/r_util/r_file.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_file.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_file.h	2018-08-07 14:12:36.000000000 +0000
@@ -32,7 +32,8 @@
 R_API char *r_file_slurp_random_line(const char *file);
 R_API char *r_file_slurp_random_line_count(const char *file, int *linecount);
 R_API ut8 *r_file_slurp_hexpairs(const char *str, int *usz);
-R_API bool r_file_dump(const char *file, const ut8 *buf, int len, int append);
+R_API bool r_file_dump(const char *file, const ut8 *buf, int len, bool append);
+R_API bool r_file_touch(const char *file);
 R_API bool r_file_hexdump(const char *file, const ut8 *buf, int len, int append);
 R_API bool r_file_rm(const char *file);
 R_API bool r_file_exists(const char *str);
@@ -42,6 +43,7 @@
 R_API char *r_file_tmpdir(void);
 R_API char *r_file_readlink(const char *path);
 R_API bool r_file_copy (const char *src, const char *dst);
+R_API RList* r_file_globsearch (const char *globbed_path, int maxdepth);
 
 #ifdef __cplusplus
 }
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_graph.h radare2-2.8.0+dfsg/libr/include/r_util/r_graph.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_graph.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_graph.h	2018-08-07 14:12:36.000000000 +0000
@@ -8,34 +8,34 @@
 #endif
 
 typedef struct r_graph_node_t {
-    unsigned int idx;
-    void *data;
-    RList *out_nodes;
-    RList *in_nodes;
-    RList *all_neighbours;
-    RListFree free;
+	unsigned int idx;
+	void *data;
+	RList *out_nodes;
+	RList *in_nodes;
+	RList *all_neighbours;
+	RListFree free;
 } RGraphNode;
 
 typedef struct r_graph_edge_t {
-    RGraphNode *from;
-    RGraphNode *to;
-    int nth;
+	RGraphNode *from;
+	RGraphNode *to;
+	int nth;
 } RGraphEdge;
 
 typedef struct r_graph_t {
-    unsigned int n_nodes;
-    unsigned int n_edges;
-    int last_index;
-    RList *nodes; /* RGraphNode */
+	unsigned int n_nodes;
+	unsigned int n_edges;
+	int last_index;
+	RList *nodes; /* RGraphNode */
 } RGraph;
 
 typedef struct r_graph_visitor_t {
-    void (*discover_node)(RGraphNode *n, struct r_graph_visitor_t *vis);
-    void (*finish_node)(RGraphNode *n, struct r_graph_visitor_t *vis);
-    void (*tree_edge)(const RGraphEdge *e, struct r_graph_visitor_t *vis);
-    void (*back_edge)(const RGraphEdge *e, struct r_graph_visitor_t *vis);
-    void (*fcross_edge)(const RGraphEdge *e, struct r_graph_visitor_t *vis);
-    void *data;
+	void (*discover_node)(RGraphNode *n, struct r_graph_visitor_t *vis);
+	void (*finish_node)(RGraphNode *n, struct r_graph_visitor_t *vis);
+	void (*tree_edge)(const RGraphEdge *e, struct r_graph_visitor_t *vis);
+	void (*back_edge)(const RGraphEdge *e, struct r_graph_visitor_t *vis);
+	void (*fcross_edge)(const RGraphEdge *e, struct r_graph_visitor_t *vis);
+	void *data;
 } RGraphVisitor;
 typedef void (*RGraphNodeCallback)(RGraphNode *n, RGraphVisitor *vis);
 typedef void (*RGraphEdgeCallback)(const RGraphEdge *e, RGraphVisitor *vis);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_idpool.h radare2-2.8.0+dfsg/libr/include/r_util/r_idpool.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_idpool.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_idpool.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,80 @@
+/* radare2 - LGPL - Copyright 2017-2018 - condret */
+
+#ifndef R_ID_STORAGE_H
+#define R_ID_STORAGE_H
+
+#include <r_util/r_pool.h>
+#include <r_util/r_queue.h>
+#include <r_util.h>
+#include <r_types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct r_id_pool_t {
+	ut32 start_id;
+	ut32 last_id;
+	ut32 next_id;
+	RQueue *freed_ids;
+} RIDPool;
+
+R_API RIDPool *r_id_pool_new(ut32 start_id, ut32 last_id);
+R_API bool r_id_pool_grab_id(RIDPool *pool, ut32 *grabber);
+R_API bool r_id_pool_kick_id(RIDPool *pool, ut32 kick);
+R_API void r_id_pool_free(RIDPool *pool);
+
+typedef struct r_id_storage_t {
+	RIDPool *pool;
+	void **data;
+	ut32 top_id;
+	ut32 size;
+} RIDStorage;
+
+typedef bool (*RIDStorageForeachCb)(void *user, void *data, ut32 id);
+typedef bool (*ROIDStorageCompareCb)(void *in, void *incoming, void *user, int *cmp_res);
+
+R_API RIDStorage *r_id_storage_new(ut32 start_id, ut32 last_id);
+R_API bool r_id_storage_set(RIDStorage *storage, void *data, ut32 id);
+R_API bool r_id_storage_add(RIDStorage *storage, void *data, ut32 *id);
+R_API void *r_id_storage_get(RIDStorage *storage, ut32 id);
+R_API void r_id_storage_delete(RIDStorage *storage, ut32 id);
+R_API void *r_id_storage_take(RIDStorage *storage, ut32 id);
+R_API bool r_id_storage_foreach(RIDStorage *storage, RIDStorageForeachCb cb, void *user);
+R_API void r_id_storage_free(RIDStorage *storage);
+R_API RList *r_id_storage_list(RIDStorage *s);
+
+typedef struct r_ordered_id_storage_t {
+	ut32 *permutation;
+	ut32 psize;
+	ut32 ptop;
+	RIDStorage *data;
+	ROIDStorageCompareCb cmp;
+} ROIDStorage;
+
+R_API ROIDStorage *r_oids_new(ut32 start_id, ut32 last_id);
+R_API void *r_oids_get(ROIDStorage *storage, ut32 id);
+R_API void *r_oids_oget(ROIDStorage *storage, ut32 od);
+R_API bool r_oids_get_id(ROIDStorage *storage, ut32 od, ut32 *id);
+R_API bool r_oids_get_od(ROIDStorage *storage, ut32 id, ut32 *od);
+R_API bool r_oids_to_front(ROIDStorage *storage, const ut32 id);
+R_API bool r_oids_to_rear(ROIDStorage *storage, const ut32 id);
+R_API void r_oids_delete(ROIDStorage *storage, ut32 id);
+R_API void r_oids_odelete(ROIDStorage *st, ut32 od);
+R_API void r_oids_free(ROIDStorage *storage);
+R_API bool r_oids_add(ROIDStorage *storage, void *data, ut32 *id, ut32 *od);
+R_API void *r_oids_take(ROIDStorage *storage, ut32 id);
+R_API void *r_oids_otake(ROIDStorage *st, ut32 od);
+R_API bool r_oids_foreach(ROIDStorage* storage, RIDStorageForeachCb cb, void* user);
+R_API bool r_oids_foreach_prev(ROIDStorage* storage, RIDStorageForeachCb cb, void* user);
+R_API bool r_oids_insert(ROIDStorage *storage, void *data, ut32 *id, ut32 *od, void *user); 
+R_API bool r_oids_sort(ROIDStorage *storage, void *user);
+R_API ut32 r_oids_find (ROIDStorage *storage, void *incoming, void *user);
+R_API void *r_oids_last(ROIDStorage *storage);
+R_API void *r_oids_first(ROIDStorage *storage);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_id_storage.h radare2-2.8.0+dfsg/libr/include/r_util/r_id_storage.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_id_storage.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_id_storage.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* radare2 - LGPL - Copyright 2017 - condret */
-
-#ifndef R_ID_STORAGE_H
-#define R_ID_STORAGE_H
-
-#include <r_util.h>
-#include <r_types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct r_id_pool_t {
-	ut32 start_id;
-	ut32 last_id;
-	ut32 next_id;
-	RQueue *freed_ids;
-} RIDPool;
-
-R_API RIDPool *r_id_pool_new(ut32 start_id, ut32 last_id);
-R_API bool r_id_pool_grab_id(RIDPool *pool, ut32 *grabber);
-R_API bool r_id_pool_kick_id(RIDPool *pool, ut32 kick);
-R_API void r_id_pool_free(RIDPool *pool);
-
-typedef struct r_id_storage_t {
-	RIDPool *pool;
-	void **data;
-	ut32 top_id;
-	ut32 size;
-} RIDStorage;
-
-typedef bool (*RIDStorageForeachCb)(void *user, void *data, ut32 id);
-
-R_API RIDStorage *r_id_storage_new(ut32 start_id, ut32 last_id);
-R_API bool r_id_storage_set(RIDStorage *storage, void *data, ut32 id);
-R_API bool r_id_storage_add(RIDStorage *storage, void *data, ut32 *id);
-R_API void *r_id_storage_get(RIDStorage *storage, ut32 id);
-R_API void r_id_storage_delete(RIDStorage *storage, ut32 id);
-R_API void *r_id_storage_take(RIDStorage *storage, ut32 id);
-R_API bool r_id_storage_foreach(RIDStorage *storage, RIDStorageForeachCb cb, void *user);
-R_API void r_id_storage_free(RIDStorage *storage);
-R_API RList *r_id_storage_list(RIDStorage *s);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_itv.h radare2-2.8.0+dfsg/libr/include/r_util/r_itv.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_itv.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_itv.h	2018-08-07 14:12:36.000000000 +0000
@@ -9,6 +9,7 @@
 
 // An interval in 64-bit address space which is aware of address space wraparound
 // Precondition: 0 <= size < 2**64 and addr + size <= 2**64
+// range is [], [10, 5) => 10 <= x < (10 + 5)
 typedef struct r_interval_t {
 	// public:
 	ut64 addr;
@@ -17,44 +18,36 @@
 
 typedef RInterval r_itv_t;
 
-#define R_ITV_BEGIN(x) r_itv_begin(x->itv)
 static inline ut64 r_itv_begin(RInterval itv) {
 	return itv.addr;
 }
 
-#define R_ITV_SIZE(x) r_itv_size(x->itv)
 static inline ut64 r_itv_size(RInterval itv) {
 	return itv.size;
 }
 
-// Returns the right endpoint address (not included)
-#define R_ITV_END(x) r_itv_end(x->itv)
 static inline ut64 r_itv_end(RInterval itv) {
 	return itv.addr + itv.size;
 }
 
 // Returns true if itv contained addr
-#define R_ITV_CONTAIN(x,y) r_itv_contain(x->itv, y)
 static inline bool r_itv_contain(RInterval itv, ut64 addr) {
-	ut64 end = itv.addr + itv.size;
+	const ut64 end = itv.addr + itv.size;
 	return itv.addr <= addr && (!end || addr < end);
 }
 
 // Returns true if x is a subset of itv
-#define R_ITV_INCLUDE(x,y) r_itv_include(x->itv, y)
 static inline bool r_itv_include(RInterval itv, RInterval x) {
-	ut64 end = itv.addr + itv.size;
+	const ut64 end = itv.addr + itv.size;
 	return itv.addr <= x.addr && (!end || (x.addr + x.size && x.addr + x.size <= end));
 }
 
 // Returns true if itv and x overlap (implying they are non-empty)
-#define R_ITV_OVERLAP(x,y) r_itv_overlap(x->itv, y)
 static inline bool r_itv_overlap(RInterval itv, RInterval x) {
-	ut64 end = itv.addr + itv.size, end1 = x.addr + x.size;
+	const ut64 end = itv.addr + itv.size, end1 = x.addr + x.size;
 	return (!end1 || itv.addr < end1) && (!end || x.addr < end);
 }
 
-#define R_ITV_OVERLAP2(x,y,z) r_itv_overlap2(x->itv, y, z)
 static inline bool r_itv_overlap2(RInterval itv, ut64 addr, ut64 size) {
 	RInterval rai = {addr, size};
 	return r_itv_overlap (itv, rai);
@@ -62,10 +55,9 @@
 
 // Precondition: itv and x overlap
 // Returns the intersection of itv and x
-#define R_ITV_INTERSECT(x,y) r_itv_intersect((RInterval)x->itv, (RInterval)y)
 static inline RInterval r_itv_intersect(RInterval itv, RInterval x) {
-	ut64 addr = R_MAX (itv.addr, x.addr);
-	ut64 end = R_MIN (itv.addr + itv.size - 1, x.addr + x.size - 1) + 1;
+	const ut64 addr = R_MAX (itv.addr, x.addr);
+	const ut64 end = R_MIN (itv.addr + itv.size - 1, x.addr + x.size - 1) + 1;
 	RInterval rai = {addr, end - addr};
 	return rai;
 }
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_mem.h radare2-2.8.0+dfsg/libr/include/r_util/r_mem.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_mem.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_mem.h	2018-08-07 14:12:36.000000000 +0000
@@ -37,6 +37,7 @@
 R_API void *r_mem_dup(void *s, int l);
 R_API void *r_mem_alloc(int sz);
 R_API void r_mem_free(void *);
+R_API void r_mem_memzero(void *, size_t);
 R_API void r_mem_reverse(ut8 *b, int l);
 R_API int r_mem_protect(void *ptr, int size, const char *prot);
 R_API int r_mem_set_num(ut8 *dest, int dest_size, ut64 num);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_num.h radare2-2.8.0+dfsg/libr/include/r_util/r_num.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_num.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_num.h	2018-08-07 14:12:36.000000000 +0000
@@ -19,8 +19,7 @@
 	//RNCXOR='^', RNCOR='|', RNCAND='&',
 	RNCNEG='~', RNCAND='&', RNCORR='|', RNCXOR='^',
 	RNCPRINT=';', RNCASSIGN='=', RNCLEFTP='(', RNCRIGHTP=')',
-	RNCSHL='<', RNCSHR = '>'
-
+	RNCSHL='<', RNCSHR = '>', RNCROL = '#', RNCROR = '$'
 } RNumCalcToken;
 
 typedef struct r_num_calc_t {
@@ -33,6 +32,7 @@
 	int calc_i;
 	const char *calc_buf;
 	int calc_len;
+	bool under_calc;
 } RNumCalc;
 
 typedef struct r_num_t {
@@ -49,6 +49,9 @@
 typedef ut64 (*RNumCallback)(struct r_num_t *self, const char *str, int *ok);
 typedef const char *(*RNumCallback2)(struct r_num_t *self, ut64, int *ok);
 
+void r_srand(int seed);
+int r_rand(int mod);
+
 R_API RNum *r_num_new(RNumCallback cb, RNumCallback2 cb2, void *ptr);
 R_API void r_num_free(RNum *num);
 R_API char *r_num_units(char *buf, ut64 num);
@@ -77,6 +80,7 @@
 R_API int r_num_str_len(const char *str);
 R_API int r_num_str_split(char *str);
 R_API RList *r_num_str_split_list(char *str);
+R_API void *r_num_dup(ut64 n);
 
 #ifdef __cplusplus
 }
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_panels.h radare2-2.8.0+dfsg/libr/include/r_util/r_panels.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_panels.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_panels.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef R_PANELS_H
+#define R_PANELS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+	PANEL_TYPE_FRAME = 0,
+	PANEL_TYPE_MENU = 1
+} PanelType;
+
+typedef struct r_panel_t {
+	int x;
+	int y;
+	int w;
+	int h;
+	int depth;
+	int sx; // scroll-x
+	int sy; // scroll-y
+	int curpos;
+	char *cmd;
+	char *title;
+	bool refresh;
+	PanelType type;
+	ut64 baseAddr;
+	ut64 addr;
+	char *cmdStrCache;
+} RPanel;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //  R_PANELS_H
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_rbtree.h radare2-2.8.0+dfsg/libr/include/r_util/r_rbtree.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_rbtree.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_rbtree.h	2018-08-07 14:12:36.000000000 +0000
@@ -42,6 +42,7 @@
 // to calculate extra information such as size, sum, ...
 R_API bool r_rbtree_aug_delete(RBNode **root, void *data, RBComparator cmp, RBNodeFree freefn, RBNodeSum sum);
 R_API void r_rbtree_aug_insert(RBNode **root, void *data, RBNode *node, RBComparator cmp, RBNodeSum sum);
+R_API bool r_rbtree_aug_update_sum(RBNode *root, void *data, RBNode *node, RBComparator cmp, RBNodeSum sum);
 
 R_API bool r_rbtree_delete(RBNode **root, void *data, RBComparator cmp, RBNodeFree freefn);
 R_API RBNode *r_rbtree_find(RBNode *root, void *data, RBComparator cmp);
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_sandbox.h radare2-2.8.0+dfsg/libr/include/r_util/r_sandbox.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_sandbox.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_sandbox.h	2018-08-07 14:12:36.000000000 +0000
@@ -4,6 +4,18 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#ifdef __FreeBSD__
+#include <sys/param.h>
+
+#if __FreeBSD_version >= 1000000
+#define HAVE_CAPSICUM 1
+#else
+#define HAVE_CAPSICUM 0
+#endif
+#else
+#define HAVE_CAPSICUM 0
+#endif
 /**
  * This function verifies that the given path is allowed. Paths are allowed only if they don't
  * contain .. components (which would indicate directory traversal) and they are relative.
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_signal.h radare2-2.8.0+dfsg/libr/include/r_util/r_signal.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_signal.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_signal.h	2018-08-07 14:12:36.000000000 +0000
@@ -11,6 +11,10 @@
 /* Return NULL if signal with `code` not found. */
 R_API const char* r_signal_to_string (int code);
 
+#if HAVE_PTHREAD
+R_API void r_signal_sigmask(int how, const sigset_t *newmask, sigset_t *oldmask);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_str.h radare2-2.8.0+dfsg/libr/include/r_util/r_str.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_str.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_str.h	2018-08-07 14:12:36.000000000 +0000
@@ -25,6 +25,8 @@
 			memmove (s, s+1, strlen (s));
 	}
 }
+
+#define R_STR_DUP(x) ((x) ? strdup ((x)) : NULL)
 #define r_str_array(x,y) ((y>=0 && y<(sizeof(x)/sizeof(*x)))?x[y]:"")
 R_API const char *r_str_pad(const char ch, int len);
 R_API const char *r_str_rstr(const char *base, const char *p);
@@ -36,6 +38,8 @@
 R_API int r_str_len_utf8(const char *s);
 R_API int r_str_len_utf8char(const char *s, int left);
 R_API void r_str_filter_zeroline(char *str, int len);
+R_API int r_str_utf8_codepoint (const char* s, int left);
+R_API bool r_str_char_fullwidth (const char* s, int left);
 R_API int r_str_write(int fd, const char *b);
 R_API void r_str_ncpy(char *dst, const char *src, int n);
 R_API void r_str_sanitize(char *c);
@@ -43,7 +47,7 @@
 R_API const char *r_str_firstbut(const char *s, char ch, const char *but);
 R_API const char *r_str_lastbut(const char *s, char ch, const char *but);
 R_API int r_str_split(char *str, char ch);
-R_API RList *r_str_split_list(char *str);
+R_API RList *r_str_split_list(char *str, const char *c);
 R_API int *r_str_split_lines(char *str, int *count);
 R_API char* r_str_replace(char *str, const char *key, const char *val, int g);
 R_API char *r_str_replace_in(char *str, ut32 sz, const char *key, const char *val, int g);
@@ -52,6 +56,7 @@
 R_API int r_str_bits64(char *strout, ut64 in);
 R_API ut64 r_str_bits_from_string(const char *buf, const char *bitz);
 R_API int r_str_rwx(const char *str);
+R_API int r_str_replace_ch(char *s, char a, char b, bool g);
 R_API int r_str_replace_char(char *s, int a, int b);
 R_API int r_str_replace_char_once(char *s, int a, int b);
 R_API const char *r_str_rwx_i(int rwx);
@@ -67,6 +72,7 @@
 R_API char *r_str_appendlen(char *ptr, const char *string, int slen);
 R_API char *r_str_newf(const char *fmt, ...);
 R_API char *r_str_newlen(const char *str, int len);
+R_API char *r_str_trunc_ellipsis(const char *str, int len);
 R_API const char *r_str_bool(int b);
 R_API const char *r_str_ansi_chrn(const char *str, int n);
 R_API int r_str_ansi_len(const char *str);
@@ -83,6 +89,7 @@
 R_API char *r_str_trim(char *str);
 R_API char *r_str_trim_head(char *str);
 R_API const char *r_str_trim_ro(const char *str);
+R_API const char *r_str_trim_wp(const char *str);
 R_API char *r_str_trim_tail(char *str);
 R_API char *r_str_trim_head_tail(char *str);
 R_API ut32 r_str_hash(const char *str);
@@ -95,6 +102,8 @@
 R_API char *r_str_ichr(char *str, char chr);
 R_API int r_str_ccmp(const char *dst, const char *orig, int ch);
 R_API int r_str_cmp(const char *dst, const char *orig, int len);
+R_API int r_str_casecmp(const char *dst, const char *orig);
+R_API int r_str_ncasecmp(const char *dst, const char *orig, size_t n);
 R_API int r_str_ccpy(char *dst, char *orig, int ch);
 R_API const char *r_str_get(const char *str);
 R_API const char *r_str_get2(const char *str);
@@ -124,16 +133,17 @@
 R_API int r_str_unescape(char *buf);
 R_API char *r_str_escape(const char *buf);
 R_API char *r_str_escape_dot(const char *buf);
-R_API char *r_str_escape_latin1(const char *buf, bool show_asciidot, bool esc_bslash);
+R_API char *r_str_escape_latin1(const char *buf, bool show_asciidot, bool esc_bslash, bool colors);
 R_API char *r_str_escape_utf8(const char *buf, bool show_asciidot, bool esc_bslash);
-R_API char *r_str_escape_utf16le(const char *buf, int buf_size, bool show_asciidot);
-R_API char *r_str_escape_utf32le(const char *buf, int buf_size, bool show_asciidot);
+R_API char *r_str_escape_utf16le(const char *buf, int buf_size, bool show_asciidot, bool esc_bslash);
+R_API char *r_str_escape_utf32le(const char *buf, int buf_size, bool show_asciidot, bool esc_bslash);
 R_API void r_str_uri_decode(char *buf);
 R_API char *r_str_uri_encode(const char *buf);
 R_API char *r_str_utf16_decode(const ut8 *s, int len);
 R_API int r_str_utf16_to_utf8(ut8 *dst, int len_dst, const ut8 *src, int len_src, int little_endian);
 R_API char *r_str_utf16_encode(const char *s, int len);
 R_API char *r_str_home(const char *str);
+R_API char *r_str_r2_prefix(const char *str);
 R_API int r_str_nlen(const char *s, int n);
 R_API int r_str_nlen_w(const char *s, int n);
 R_API int r_wstr_clen(const char *s);
@@ -155,9 +165,10 @@
 R_API bool r_str_endswith(const char *str, const char *needle);
 R_API bool r_str_isnumber (const char *str);
 R_API const char *r_str_last (const char *in, const char *ch);
-R_API char* r_str_highlight(char *str, const char *word, const char *color);
+R_API char* r_str_highlight(char *str, const char *word, const char *color, const char *color_reset);
 R_API char *r_qrcode_gen(const ut8 *text, int len, bool utf8, bool inverted);
 R_API char *r_str_from_ut64(ut64 val);
+R_API void r_str_stripLine(char *str, const char *key);
 #ifdef __cplusplus
 }
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_str_util.h radare2-2.8.0+dfsg/libr/include/r_util/r_str_util.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_str_util.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_str_util.h	2018-08-07 14:12:36.000000000 +0000
@@ -1,17 +1,16 @@
 #ifndef R_STR_UTIL_H
 #define R_STR_UTIL_H
  
-#define STRNULL(x) (!x||!*x)
-#define ISWHITECHAR(x) ((x)==' '||(x)=='\t'||(x)=='\n'||(x)=='\r')
-#define ISWHITESPACE(x) ((x)==' '||(x)=='\t')
-#define ISSEPARATOR(x) ((x)==' '||(x)=='\t'||(x)=='\n'||(x)=='\r'||(x)==' '|| \
+#define IS_NULLSTR(x) (!x||!*x)
+#define IS_WHITECHAR(x) ((x)==' '||(x)=='\t'||(x)=='\n'||(x)=='\r')
+#define IS_SEPARATOR(x) ((x)==' '||(x)=='\t'||(x)=='\n'||(x)=='\r'||(x)==' '|| \
 		(x)==','||(x)==';'||(x)==':'||(x)=='['||(x)==']'|| \
 		(x)=='('||(x)==')'||(x)=='{'||(x)=='}')
-#define ISHEXCHAR(x) ((x>='0'&&x<='9') ||  (x>='a'&&x<='f') ||  (x>='A'&&x<='F'))
+#define IS_HEXCHAR(x) ((x>='0'&&x<='9') ||  (x>='a'&&x<='f') ||  (x>='A'&&x<='F'))
 #define IS_PRINTABLE(x) (x>=' '&&x<='~')
 #define IS_DIGIT(x) (x>='0'&&x<='9')
 #define IS_OCTAL(x) ((x) >= '0' && (x) <= '7')
-#define IS_WHITESPACE(x) (x==' '||x=='\t')
+#define IS_WHITESPACE(x) ((x)==' '||(x)=='\t')
 #define IS_UPPER(c) ((c) >= 'A' && (c) <= 'Z')
 #define IS_LOWER(c) ((c) >= 'a' && (c) <= 'z')
 
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_sys.h radare2-2.8.0+dfsg/libr/include/r_util/r_sys.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_sys.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_sys.h	2018-08-07 14:12:36.000000000 +0000
@@ -3,6 +3,12 @@
 
 #include <r_list.h>
 
+#if __WINDOWS__ && !__CYGWIN__
+#define R_SYS_DEVNULL "nul"
+#else
+#define R_SYS_DEVNULL "/dev/null"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_trie.h radare2-2.8.0+dfsg/libr/include/r_util/r_trie.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_trie.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_trie.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef R_TRIE_H
+#define R_TRIE_H
+#include "r_types.h"
+
+#define ALPHABET_SIZE 63 // A-Z, a-z, 0-9 and _
+
+typedef struct r_trie_node {
+	struct r_trie_node * child[ALPHABET_SIZE];
+	int is_leaf;
+	void * data;
+} RTrieNode;
+
+typedef struct r_trie {
+	RTrieNode *root;
+} RTrie;
+
+R_API RTrie *r_trie_new(void);
+R_API bool r_trie_insert(RTrie * t, char * name, void * f);
+R_API bool r_trie_update(RTrie * t, char * name, void * f);
+R_API bool r_trie_delete(RTrie * t, char * name);
+R_API bool r_trie_erase(RTrie ** t, char * name);
+R_API void *r_trie_find(RTrie * t, char * name);
+R_API void r_trie_free(RTrie ** t);
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util/r_utf8.h radare2-2.8.0+dfsg/libr/include/r_util/r_utf8.h
--- radare2-2.3.0+dfsg/libr/include/r_util/r_utf8.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util/r_utf8.h	2018-08-07 14:12:36.000000000 +0000
@@ -15,5 +15,5 @@
 R_API const char *r_utf_block_name(int idx);
 R_API wchar_t *r_utf8_to_utf16(const char *cstring);
 R_API int r_utf_block_idx (RRune ch);
-R_API int *r_utf_block_list (const ut8 *str);
+R_API int *r_utf_block_list (const ut8 *str, int len);
 #endif //  R_UTF8_H
diff -Nru radare2-2.3.0+dfsg/libr/include/r_util.h radare2-2.8.0+dfsg/libr/include/r_util.h
--- radare2-2.3.0+dfsg/libr/include/r_util.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_util.h	2018-08-07 14:12:36.000000000 +0000
@@ -36,6 +36,7 @@
 #include "r_util/r_constr.h"
 #include "r_util/r_debruijn.h"
 #include "r_util/r_cache.h"
+#include "r_util/r_ctypes.h"
 #include "r_util/r_des.h"
 #include "r_util/r_file.h"
 #include "r_util/r_hex.h"
@@ -45,6 +46,7 @@
 #include "r_util/r_name.h"
 #include "r_util/r_num.h"
 #include "r_util/r_graph.h"
+#include "r_util/r_panels.h"
 #include "r_util/r_pool.h"
 #include "r_util/r_punycode.h"
 #include "r_util/r_queue.h"
@@ -54,6 +56,7 @@
 #include "r_util/r_spaces.h"
 #include "r_util/r_stack.h"
 #include "r_util/r_str.h"
+#include "r_util/r_ascii_table.h"
 #include "r_util/r_strbuf.h"
 #include "r_util/r_strpool.h"
 #include "r_util/r_sys.h"
@@ -62,7 +65,7 @@
 #include "r_util/r_utf8.h"
 #include "r_util/r_utf16.h"
 #include "r_util/r_utf32.h"
-#include "r_util/r_id_storage.h"
+#include "r_util/r_idpool.h"
 #include "r_util/r_asn1.h"
 #include "r_util/r_json.h"
 #include "r_util/r_x509.h"
diff -Nru radare2-2.3.0+dfsg/libr/include/r_vector.h radare2-2.8.0+dfsg/libr/include/r_vector.h
--- radare2-2.3.0+dfsg/libr/include/r_vector.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_vector.h	2018-08-07 14:12:36.000000000 +0000
@@ -7,79 +7,210 @@
 #endif
 
 /*
-  Insert functions returns NULL if reallocation happens and fails,
-  returns the address of newly inserted element if succeeded.
-
-  Delete functions returns the deleted element.
-  Callers should destruct it if necessary.
-
-  Usage:
-  int i;
-  void **it;
-
-  // heap allocated RVector
-  RVector *v = r_vector_new ();
-  if (!v) goto err_new;
-  if (!r_vector_push (v, a)) goto err_push;
-  if (!r_vector_insert (v, 0, b)) goto err_insert;
-  for (i = 0; i < v->len; i++) {
-    (void)v->a[i]; // Public members a and len are encouraged to access
-  }
-  r_vector_foreach (v, it) {
-    (void)*it;
-  }
-  // pass function pointer `elem_free`
-  r_vector_free (v, NULL);
-
-  // stack allocated RVector
-  RVector v = {0};
-  // r_vector_init (&v); // v.a = NULL; v.len = v.capacity = 0;
-  r_vector_push (&v, (void *)1);
-  assert (v.len == 1 && v.capacity == 10);
-  // for stack allocated RVector, use r_vector_clear instead of r_vector_free
-  r_vector_clear (&v, NULL);
+ * RVector can contain arbitrarily sized elements.
+ * RPVector uses RVector internally and always contains void *s
+ *
+ * Thus, for storing pointers it is highly encouraged to always use RPVector
+ * as it is specifically made for this purpose and is more consistent with RList,
+ * while RVector can be used as, for example, a flat array of a struct.
+ *
+ * Notable differences between RVector and RPVector:
+ * -------------------------------------------------
+ * When RVector expects an element to be inserted, for example in r_vector_push(..., void *x),
+ * this void * value is interpreted as a pointer to the actual data for the element.
+ * => If you use RVector as a dynamic replacement for (struct SomeStruct)[], you will
+ * pass a struct SomeStruct * to these functions.
+ *
+ * Because RPVector only handles pointers, the given void * is directly interpreted as the
+ * actual pointer to be inserted.
+ * => If you use RPVector as a dynamic replacement for (SomeType *)[], you will pass
+ * SomeType * directly to these functions.
+ *
+ * The same differentiation goes for the free functions:
+ * - The element parameter in RVectorFree is a pointer to the element inside the array.
+ * - The element parameter in RPVectorFree is the actual pointer stored in the array.
+ *
+ * General Hint:
+ * -------------
+ * remove/pop functions do not reduce the capacity.
+ * Call r_(p)vector_shrink explicitly if desired.
  */
 
+typedef int (*RPVectorComparator)(const void *a, const void *b);
+typedef void (*RVectorFree)(void *e, void *user);
+typedef void (*RPVectorFree)(void *e);
+
 typedef struct r_vector_t {
-	void **a;
-	int len;
-	int capacity;
+	void *a;
+	size_t len;
+	size_t capacity;
+	size_t elem_size;
+	RVectorFree free;
+	void *free_user;
 } RVector;
 
-typedef int (*RVectorComparator)(const void *a, const void *b);
+// RPVector directly wraps RVector for type safety
+typedef struct r_pvector_t { RVector v; } RPVector;
+
+
+// RVector
+
+R_API void r_vector_init(RVector *vec, size_t elem_size, RVectorFree free, void *free_user);
 
-R_API void r_vector_clear(RVector *vec, void (*elem_free)(void *));
+R_API RVector *r_vector_new(size_t elem_size, RVectorFree free, void *free_user);
+
+// clears the vector and calls vec->free on every element if set.
+R_API void r_vector_clear(RVector *vec);
+
+// frees the vector and calls vec->free on every element if set.
+R_API void r_vector_free(RVector *vec);
+
+// the returned vector will have the same capacity as vec.
 R_API RVector *r_vector_clone(RVector *vec);
-R_API void **r_vector_contains(RVector *vec, void *x);
-R_API void *r_vector_delete_at(RVector *vec, int n);
-R_API bool r_vector_empty(RVector *vec);
-R_API void r_vector_fini(RVector *vec);
-R_API void r_vector_free(RVector *vec, void (*elem_free)(void *));
-R_API void r_vector_init(RVector *vec);
-R_API void **r_vector_insert(RVector *vec, int n, void *x);
-R_API void **r_vector_insert_range(RVector *vec, int n, void **first, void **last);
-R_API RVector *r_vector_new(void);
-R_API void *r_vector_pop(RVector *vec);
-R_API void *r_vector_pop_front(RVector *vec);
-R_API void **r_vector_push(RVector *vec, void *x);
-R_API void **r_vector_push_front(RVector *vec, void *x);
-R_API void **r_vector_reserve(RVector *vec, int capacity);
-/* shrink capacity to len, NB. delete operations do not shrink space */
-R_API void **r_vector_shrink(RVector *vec);
-R_API void r_vector_sort(RVector *vec, RVectorComparator cmp);
 
-#define r_vector_find(vec, it, cmp_eq) \
-	for (it = (vec)->a; it != (vec)->a + (vec)->len && !(cmp_eq (*it, x)); it++);
+static inline bool r_vector_empty(RVector *vec) {
+	return vec->len == 0;
+}
+
+// returns a pointer to the offset inside the array where the element of the index lies.
+R_API void *r_vector_index_ptr(RVector *vec, size_t index);
+
+// helper function to assign an element of size vec->elem_size from elem to p.
+// elem is a pointer to the actual data to assign!
+R_API void r_vector_assign(RVector *vec, void *p, void *elem);
+
+// assign the value of size vec->elem_size at elem to vec at the given index.
+// elem is a pointer to the actual data to assign!
+R_API void *r_vector_assign_at(RVector *vec, size_t index, void *elem);
+
+// remove the element at the given index and write the content to into.
+// It is the caller's responsibility to free potential resources associated with the element.
+R_API void r_vector_remove_at(RVector *vec, size_t index, void *into);
+
+// insert the value of size vec->elem_size at x at the given index.
+// x is a pointer to the actual data to assign!
+R_API void *r_vector_insert(RVector *vec, size_t index, void *x);
+
+// insert count values of size vec->elem_size into vec starting at the given index.
+R_API void *r_vector_insert_range(RVector *vec, size_t index, void *first, size_t count);
+
+// like r_vector_remove_at for the last element
+R_API void r_vector_pop(RVector *vec, void *into);
+
+// like r_vector_remove_at for the first element
+R_API void r_vector_pop_front(RVector *vec, void *into);
+
+// like r_vector_insert for the end of vec
+R_API void *r_vector_push(RVector *vec, void *x);
+
+// like r_vector_insert for the beginning of vec
+R_API void *r_vector_push_front(RVector *vec, void *x);
+
+// make sure the capacity is at least capacity.
+R_API void *r_vector_reserve(RVector *vec, size_t capacity);
+
+// shrink capacity to len.
+R_API void *r_vector_shrink(RVector *vec);
+
+
+// RPVector
 
-#define r_vector_foreach(vec, it) \
-	for (it = (vec)->a; it != (vec)->a + (vec)->len; it++)
+R_API void r_pvector_init(RPVector *vec, RPVectorFree free);
 
-#define r_vector_lower_bound(vec, x, i, cmp) \
+R_API RPVector *r_pvector_new(RPVectorFree free);
+
+// clear the vector and call vec->v.free on every element.
+R_API void r_pvector_clear(RPVector *vec);
+
+// free the vector and call vec->v.free on every element.
+R_API void r_pvector_free(RPVector *vec);
+
+static inline size_t r_pvector_len(const RPVector *vec) {
+	return vec->v.len;
+}
+
+static inline void *r_pvector_at(const RPVector *vec, size_t index) {
+	return ((void **)vec->v.a)[index];
+}
+
+static inline void r_pvector_set(RPVector *vec, size_t index, void *e) {
+	((void **)vec->v.a)[index] = e;
+}
+
+static inline bool r_pvector_empty(RPVector *vec) {
+	return r_pvector_len (vec) == 0;
+}
+
+// returns the respective pointer inside the vector if x is found or NULL otherwise.
+R_API void **r_pvector_contains(RPVector *vec, void *x);
+
+// removes and returns the pointer at the given index. Does not call free.
+R_API void *r_pvector_remove_at(RPVector *vec, size_t index);
+
+// like r_vector_insert, but the pointer x is the actual data to be inserted.
+static inline void **r_pvector_insert(RPVector *vec, size_t index, void *x) {
+	return (void **)r_vector_insert (&vec->v, index, &x); }
+
+// like r_vector_insert_range.
+static inline void **r_pvector_insert_range(RPVector *vec, size_t index, void **first, size_t count) {
+	return (void **)r_vector_insert_range (&vec->v, index, first, count);
+}
+
+// like r_vector_pop, but returns the pointer directly.
+R_API void *r_pvector_pop(RPVector *vec);
+
+// like r_vector_pop_front, but returns the pointer directly.
+R_API void *r_pvector_pop_front(RPVector *vec);
+
+// like r_vector_push, but the pointer x is the actual data to be inserted.
+static inline void **r_pvector_push(RPVector *vec, void *x) {
+	return (void **)r_vector_push (&vec->v, &x);
+}
+
+// like r_vector_push_front, but the pointer x is the actual data to be inserted.
+static inline void **r_pvector_push_front(RPVector *vec, void *x) {
+	return (void **)r_vector_push_front (&vec->v, &x);
+}
+
+// sort vec using quick sort.
+R_API void r_pvector_sort(RPVector *vec, RPVectorComparator cmp);
+
+static inline void **r_pvector_reserve(RPVector *vec, size_t capacity) {
+	return (void **)r_vector_reserve (&vec->v, capacity);
+}
+
+static inline void **r_pvector_shrink(RPVector *vec) {
+	return (void **)r_vector_shrink (&vec->v);
+}
+
+/*
+ * example:
+ *
+ * RVector *v = ...;
+ * void **it;
+ * r_pvector_foreach (v, it) {
+ *     void *p = *it;
+ *     // Do something with p
+ * }
+ */
+#define r_pvector_foreach(vec, it) \
+	for (it = (void **)(vec)->v.a; it != (void **)(vec)->v.a + (vec)->v.len; it++)
+
+/*
+ * example:
+ *
+ * RPVector *v = ...; // contains {(void*)0, (void*)2, (void*)4, (void*)6, (void*)8};
+ * size_t l;
+ * #define CMP(x, y) x - y
+ * r_pvector_lower_bound (v, (void *)3, l, CMP);
+ * // l == 2
+ */
+#define r_pvector_lower_bound(vec, x, i, cmp) \
 	do { \
-		int h = (vec)->len, m; \
+		int h = (vec)->v.len, m; \
 		for (i = 0; i < h; ) { \
 			m = i + ((h - i) >> 1); \
-			if ((cmp (x, (vec)->a[m])) > 0) { \
+			if ((cmp (x, ((void **)(vec)->v.a)[m])) > 0) { \
 				i = m + 1; \
 			} else { \
 				h = m; \
@@ -87,12 +218,13 @@
 		} \
 	} while (0) \
 
-#define r_vector_upper_bound(vec, x, i, cmp) \
+// see r_pvector_lower_bound
+#define r_pvector_upper_bound(vec, x, i, cmp) \
 	do { \
-		int h = (vec)->len, m; \
+		int h = (vec)->v.len, m; \
 		for (i = 0; i < h; ) { \
 			m = i + ((h - i) >> 1); \
-			if (!((cmp (x, (vec)->a[m])) < 0)) { \
+			if (!((cmp (x, ((void **)(vec)->v.a)[m])) < 0)) { \
 				i = m + 1; \
 			} else { \
 				h = m; \
diff -Nru radare2-2.3.0+dfsg/libr/include/r_version.h.in radare2-2.8.0+dfsg/libr/include/r_version.h.in
--- radare2-2.3.0+dfsg/libr/include/r_version.h.in	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/r_version.h.in	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,6 @@
 #ifndef R_VERSION_H
 #define R_VERSION_H 1
+#define R_MESON_VERSION "@MESON_VERSION@"
 #define R2_VERSION_COMMIT @VERSIONCOMMIT@
 #define R2_VERSION "@R2_VERSION@"
 #define R2_GITTAP "@R2_GITTAP@"
diff -Nru radare2-2.3.0+dfsg/libr/include/sdb/dict.h radare2-2.8.0+dfsg/libr/include/sdb/dict.h
--- radare2-2.3.0+dfsg/libr/include/sdb/dict.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/sdb/dict.h	2018-08-07 14:12:36.000000000 +0000
@@ -23,6 +23,7 @@
 // 4 + 4 + 8 = 16 .. lgtm
 
 typedef void (*dict_freecb)(void *);
+typedef int (*dictkv_cb)(dictkv *, void *);
 
 typedef struct {
 	void **table; //[MHTSZ];
@@ -46,3 +47,4 @@
 SDB_API void *dict_getu(dict *m, dicti k);
 SDB_API bool dict_add(dict *m, dicti k, dicti v, void *u);
 SDB_API bool dict_del(dict *m, dicti k);
+SDB_API void dict_foreach(dict *m, dictkv_cb cb, void *u);
diff -Nru radare2-2.3.0+dfsg/libr/include/sdb/ht.h radare2-2.8.0+dfsg/libr/include/sdb/ht.h
--- radare2-2.3.0+dfsg/libr/include/sdb/ht.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/sdb/ht.h	2018-08-07 14:12:36.000000000 +0000
@@ -52,21 +52,22 @@
 // If hashfunction is NULL it will be used sdb_hash internally
 // If keydup or valdup are null it will be used an assignment
 // If keySize or valueSize are null it will be used strlen internally
-SdbHash* ht_new(DupValue valdup, HtKvFreeFunc pair_free, CalcSize valueSize);
+SDB_API SdbHash* ht_new(DupValue valdup, HtKvFreeFunc pair_free, CalcSize valueSize);
 // Destroy a hashtable and all of its entries.
-void ht_free(SdbHash* ht);
-void ht_free_deleted(SdbHash* ht);
+SDB_API void ht_free(SdbHash* ht);
+SDB_API void ht_free_deleted(SdbHash* ht);
 // Insert a new Key-Value pair into the hashtable. If the key already exists, returns false.
-bool ht_insert(SdbHash* ht, const char* key, void* value);
+SDB_API bool ht_insert(SdbHash* ht, const char* key, void* value);
 //Insert a new HtKv in the hashtable
-bool ht_insert_kv(SdbHash *ht, HtKv *kv, bool update);
+SDB_API bool ht_insert_kv(SdbHash *ht, HtKv *kv, bool update);
 // Insert a new Key-Value pair into the hashtable, or updates the value if the key already exists.
-bool ht_update(SdbHash* ht, const char* key, void* value);
+SDB_API bool ht_update(SdbHash* ht, const char* key, void* value);
 // Delete a key from the hashtable.
-bool ht_delete(SdbHash* ht, const char* key);
+SDB_API bool ht_delete(SdbHash* ht, const char* key);
 // Find the value corresponding to the matching key.
-void* ht_find(SdbHash* ht, const char* key, bool* found);
+SDB_API void* ht_find(SdbHash* ht, const char* key, bool* found);
 HtKv* ht_find_kv(SdbHash* ht, const char* key, bool* found);
-void ht_foreach(SdbHash *ht, HtForeachCallback cb, void *user);
-SdbList* ht_foreach_list(SdbHash *ht, bool sorted);
+SDB_API void ht_foreach(SdbHash *ht, HtForeachCallback cb, void *user);
+SDB_API SdbList* ht_foreach_list(SdbHash *ht, bool sorted);
+
 #endif // __HT_H
diff -Nru radare2-2.3.0+dfsg/libr/include/sdb/ls.h radare2-2.8.0+dfsg/libr/include/sdb/ls.h
--- radare2-2.3.0+dfsg/libr/include/sdb/ls.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/sdb/ls.h	2018-08-07 14:12:36.000000000 +0000
@@ -33,7 +33,8 @@
 		for (it = list->tail; it && (pos = it->data); it = it->p)
 
 #define ls_iterator(x) (x)?(x)->head:NULL
-#define ls_empty(x) (!x || (!x->head && !x->tail))
+// #define ls_empty(x) (!x || (!x->head && !x->tail))
+#define ls_empty(x) (!x || !x->length)
 #define ls_head(x) x->head
 #define ls_tail(x) x->tail
 #define ls_unref(x) x
diff -Nru radare2-2.3.0+dfsg/libr/include/sdb/sdb.h radare2-2.8.0+dfsg/libr/include/sdb/sdb.h
--- radare2-2.3.0+dfsg/libr/include/sdb/sdb.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/sdb/sdb.h	2018-08-07 14:12:36.000000000 +0000
@@ -200,8 +200,9 @@
 SDB_API bool sdb_journal_unlink(Sdb *s);
 
 /* numeric */
-char *sdb_itoa(ut64 n, char *s, int base);
-ut64  sdb_atoi(const char *s);
+SDB_API char *sdb_itoa(ut64 n, char *s, int base);
+SDB_API ut64  sdb_atoi(const char *s);
+SDB_API const char *sdb_itoca(ut64 n);
 
 /* locking */
 SDB_API bool sdb_lock(const char *s);
@@ -220,7 +221,10 @@
 SDB_API ut8 sdb_hash_byte(const char *s);
 
 /* json api */
+// SDB_API int sdb_js0n(const unsigned char *js, RangstrType len, RangstrType *out);
 SDB_API bool sdb_isjson(const char *k);
+SDB_API char *sdb_json_get_str (const char *json, const char *path);
+
 SDB_API char *sdb_json_get(Sdb* s, const char *key, const char *p, ut32 *cas);
 SDB_API bool sdb_json_set(Sdb* s, const char *k, const char *p, const char *v, ut32 cas);
 SDB_API int sdb_json_num_get(Sdb* s, const char *k, const char *p, ut32 *cas);
@@ -251,15 +255,15 @@
 bool sdb_ns_unset(Sdb *s, const char *name, Sdb *r);
 
 // array
-int sdb_array_contains(Sdb* s, const char *key, const char *val, ut32 *cas);
-int sdb_array_contains_num(Sdb *s, const char *key, ut64 val, ut32 *cas);
+bool sdb_array_contains(Sdb* s, const char *key, const char *val, ut32 *cas);
+bool sdb_array_contains_num(Sdb *s, const char *key, ut64 val, ut32 *cas);
 int sdb_array_indexof(Sdb *s, const char *key, const char *val, ut32 cas);
 int sdb_array_set(Sdb* s, const char *key, int idx, const char *val, ut32 cas);
 int sdb_array_set_num(Sdb* s, const char *key, int idx, ut64 val, ut32 cas);
 bool sdb_array_append(Sdb *s, const char *key, const char *val, ut32 cas);
 bool sdb_array_append_num(Sdb *s, const char *key, ut64 val, ut32 cas);
-int sdb_array_prepend(Sdb *s, const char *key, const char *val, ut32 cas);
-int sdb_array_prepend_num(Sdb *s, const char *key, ut64 val, ut32 cas);
+bool sdb_array_prepend(Sdb *s, const char *key, const char *val, ut32 cas);
+bool sdb_array_prepend_num(Sdb *s, const char *key, ut64 val, ut32 cas);
 char *sdb_array_get(Sdb* s, const char *key, int idx, ut32 *cas);
 ut64 sdb_array_get_num(Sdb* s, const char *key, int idx, ut32 *cas);
 int sdb_array_get_idx(Sdb *s, const char *key, const char *val, ut32 cas); // agetv
@@ -300,7 +304,7 @@
 int sdb_array_list(Sdb* s, const char *key);
 
 // Adds the string `val` to the start of array `key`.
-int sdb_array_push(Sdb *s, const char *key, const char *val, ut32 cas);
+SDB_API bool sdb_array_push(Sdb *s, const char *key, const char *val, ut32 cas);
 
 // Returns the string at the start of array `key` or
 // NULL if there are no elements.
@@ -337,7 +341,7 @@
 int sdb_decode_raw(ut8 *bout, const char *bin, int len);
 
 // binfmt
-char *sdb_fmt(int n, const char *fmt, ...);
+char *sdb_fmt(const char *fmt, ...);
 int sdb_fmt_init(void *p, const char *fmt);
 void sdb_fmt_free(void *p, const char *fmt);
 int sdb_fmt_tobin(const char *_str, const char *fmt, void *stru);
diff -Nru radare2-2.3.0+dfsg/libr/include/sdb/sdbht.h radare2-2.8.0+dfsg/libr/include/sdb/sdbht.h
--- radare2-2.3.0+dfsg/libr/include/sdb/sdbht.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/sdb/sdbht.h	2018-08-07 14:12:36.000000000 +0000
@@ -19,21 +19,21 @@
 extern ut32 sdb_hash(const char *key);
 extern void sdb_kv_free(SdbKv *kv);
 
-SdbHash* sdb_ht_new(void);
+SDB_API SdbHash* sdb_ht_new(void);
 // Destroy a hashtable and all of its entries.
-void sdb_ht_free(SdbHash* ht);
-void sdb_ht_free_deleted(SdbHash* ht);
+SDB_API void sdb_ht_free(SdbHash* ht);
+SDB_API void sdb_ht_free_deleted(SdbHash* ht);
 // Insert a new Key-Value pair into the hashtable. If the key already exists, returns false.
-bool sdb_ht_insert(SdbHash* ht, const char* key, const char* value);
+SDB_API bool sdb_ht_insert(SdbHash* ht, const char* key, const char* value);
 // Insert a new Key-Value pair into the hashtable, or updates the value if the key already exists.
-bool sdb_ht_insert_kvp(SdbHash* ht, SdbKv *kvp, bool update);
+SDB_API bool sdb_ht_insert_kvp(SdbHash* ht, SdbKv *kvp, bool update);
 // Insert a new Key-Value pair into the hashtable, or updates the value if the key already exists.
-bool sdb_ht_update(SdbHash* ht, const char* key, const char* value);
+SDB_API bool sdb_ht_update(SdbHash* ht, const char* key, const char* value);
 // Delete a key from the hashtable.
-bool sdb_ht_delete(SdbHash* ht, const char* key);
+SDB_API bool sdb_ht_delete(SdbHash* ht, const char* key);
 // Find the value corresponding to the matching key.
-char* sdb_ht_find(SdbHash* ht, const char* key, bool* found);
+SDB_API char* sdb_ht_find(SdbHash* ht, const char* key, bool* found);
 // Find the KeyValuePair corresponding to the matching key.
-SdbKv* sdb_ht_find_kvp(SdbHash* ht, const char* key, bool* found);
+SDB_API SdbKv* sdb_ht_find_kvp(SdbHash* ht, const char* key, bool* found);
 
 #endif // __SDB_HT_H
diff -Nru radare2-2.3.0+dfsg/libr/include/sdb/sdb_version.h radare2-2.8.0+dfsg/libr/include/sdb/sdb_version.h
--- radare2-2.3.0+dfsg/libr/include/sdb/sdb_version.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/include/sdb/sdb_version.h	2018-08-07 14:12:36.000000000 +0000
@@ -1 +1 @@
-#define SDB_VERSION "1.0.0"
+#define SDB_VERSION "1.2.0"
diff -Nru radare2-2.3.0+dfsg/libr/io/cache.c radare2-2.8.0+dfsg/libr/io/cache.c
--- radare2-2.3.0+dfsg/libr/io/cache.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/cache.c	2018-08-07 14:12:36.000000000 +0000
@@ -43,13 +43,13 @@
 	RInterval range = (RInterval){from, to - from};
 	r_list_foreach (io->cache, iter, c) {
 		// if (from <= c->to - 1 && c->from <= to - 1) {
-		if (R_ITV_OVERLAP (c, range)) {
+		if (r_itv_overlap (c->itv, range)) {
 			int cached = io->cached;
 			io->cached = 0;
 			if (r_io_write_at (io, r_itv_begin (c->itv), c->data, r_itv_size (c->itv))) {
 				c->written = true;
 			} else {
-				eprintf ("Error writing change at 0x%08"PFMT64x"\n", R_ITV_BEGIN (c));
+				eprintf ("Error writing change at 0x%08"PFMT64x"\n", r_itv_begin (c->itv));
 			}
 			io->cached = cached;
 			break; // XXX old behavior, revisit this
@@ -69,16 +69,16 @@
 
 	if (from < to) {
 		RInterval range = (RInterval){from, to - from};
-		r_list_foreach (io->cache, iter, c) {
-			if (R_ITV_OVERLAP (c, range)) {
+		r_list_foreach_prev (io->cache, iter, c) {
+			if (r_itv_overlap (c->itv, range)) {
 				int cached = io->cached;
 				io->cached = 0;
-				r_io_write_at (io, R_ITV_BEGIN (c), c->odata, R_ITV_SIZE (c));
+				r_io_write_at (io, r_itv_begin (c->itv), c->odata, r_itv_size (c->itv));
 				io->cached = cached;
+				c->written = false;
 				if (!c->written) {
 					r_list_delete (io->cache, iter);
 				}
-				c->written = false;
 				done = true;
 				break;
 			}
@@ -95,13 +95,13 @@
 		io->cb_printf ("[");
 	}
 	r_list_foreach (io->cache, iter, c) {
-		const int dataSize = R_ITV_SIZE (c);
+		const int dataSize = r_itv_size (c->itv);
 		if (rad == 1) {
 			io->cb_printf ("wx ");
 			for (i = 0; i < dataSize; i++) {
 				io->cb_printf ("%02x", (ut8)(c->data[i] & 0xff));
 			}
-			io->cb_printf (" @ 0x%08"PFMT64x, R_ITV_BEGIN (c));
+			io->cb_printf (" @ 0x%08"PFMT64x, r_itv_begin (c->itv));
 			io->cb_printf (" # replaces: ");
 		  	for (i = 0; i < dataSize; i++) {
 				io->cb_printf ("%02x", (ut8)(c->odata[i] & 0xff));
@@ -109,7 +109,7 @@
 			io->cb_printf ("\n");
 		} else if (rad == 2) {
 			io->cb_printf ("{\"idx\":%"PFMT64d",\"addr\":%"PFMT64d",\"size\":%d,",
-				j, R_ITV_BEGIN (c), dataSize);
+				j, r_itv_begin (c->itv), dataSize);
 			io->cb_printf ("\"before\":\"");
 		  	for (i = 0; i < dataSize; i++) {
 				io->cb_printf ("%02x", c->odata[i]);
@@ -121,7 +121,7 @@
 			io->cb_printf ("\",\"written\":%s}%s", c->written
 				? "true": "false", iter->n? ",": "");
 		} else if (rad == 0) {
-			io->cb_printf ("idx=%d addr=0x%08"PFMT64x" size=%d ", j, R_ITV_BEGIN (c), dataSize);
+			io->cb_printf ("idx=%d addr=0x%08"PFMT64x" size=%d ", j, r_itv_begin (c->itv), dataSize);
 			for (i = 0; i < dataSize; i++) {
 				io->cb_printf ("%02x", c->odata[i]);
 			}
@@ -134,7 +134,7 @@
 		j++;
 	}
 	if (rad == 2) {
-		io->cb_printf ("]");
+		io->cb_printf ("]\n");
 	}
 	return false;
 }
@@ -175,13 +175,13 @@
 	RIOCache *c;
 	RInterval range = (RInterval){ addr, len };
 	r_list_foreach (io->cache, iter, c) {
-		if (R_ITV_OVERLAP (c, range)) {
-			const ut64 begin = R_ITV_BEGIN (c);
+		if (r_itv_overlap (c->itv, range)) {
+			const ut64 begin = r_itv_begin (c->itv);
 			if (addr < begin) {
-				l = R_MIN (addr + len - begin, R_ITV_SIZE (c));
+				l = R_MIN (addr + len - begin, r_itv_size (c->itv));
 				memcpy (buf + begin - addr, c->data, l);
 			} else {
-				l = R_MIN (R_ITV_END (c) - addr, len);
+				l = R_MIN (r_itv_end (c->itv) - addr, len);
 				memcpy (buf, c->data + addr - begin, l);
 			}
 			covered += l;
diff -Nru radare2-2.3.0+dfsg/libr/io/desc.c radare2-2.8.0+dfsg/libr/io/desc.c
--- radare2-2.3.0+dfsg/libr/io/desc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/desc.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2017 - condret, pancake, alvaro */
+/* radare2 - LGPL - Copyright 2017-2018 - condret, pancake, alvaro */
 
 #include <r_io.h>
 #include <sdb.h>
@@ -148,20 +148,12 @@
 		return r_io_desc_cache_write (desc,
 				r_io_desc_seek (desc, 0LL, R_IO_SEEK_CUR), buf, len);
 	}
-	//check permissions
-	if (!(desc->flags & R_IO_WRITE)) {
-		return 0;
-	}
-	if (desc->plugin->write) {
-		return desc->plugin->write (desc->io, desc, buf, len);
-	}
-	return 0;
+	return r_io_plugin_write (desc, buf, len);
 }
 
 // returns length of read bytes
 R_API int r_io_desc_read(RIODesc *desc, ut8 *buf, int len) {
 	ut64 seek;
-	int ret = -1;
 	// check pointers and permissions
 	if (!buf || !desc || !desc->plugin || len < 1 || !(desc->flags & R_IO_READ)) {
 		return 0;
@@ -172,9 +164,7 @@
 			return r_io_cache_read (desc->io, seek, buf, len);
 		}
 	}
-	if (desc->plugin->read) {
-		ret = desc->plugin->read (desc->io, desc, buf, len);
-	}
+	int ret = r_io_plugin_read (desc, buf, len);
 	if (ret > 0 && desc->io->cachemode) {
 		r_io_cache_write (desc->io, seek, buf, len);
 	} else if ((ret > 0) && desc->io && (desc->io->p_cache & 1)) {
diff -Nru radare2-2.3.0+dfsg/libr/io/io.c radare2-2.8.0+dfsg/libr/io/io.c
--- radare2-2.3.0+dfsg/libr/io/io.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/io.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2008-2017 - condret, pancake, alvaro_fe */
+/* radare2 - LGPL - Copyright 2008-2018 - condret, pancake, alvaro_fe */
 
 #include <r_io.h>
 #include <sdb.h>
@@ -59,30 +59,30 @@
 // If prefix_mode is true, returns the number of bytes of operated prefix; returns < 0 on error.
 // If prefix_mode is false, operates in non-stop mode and returns true iff all IO operations on overlapped maps are complete.
 static st64 on_map_skyline(RIO *io, ut64 vaddr, ut8 *buf, int len, int match_flg, cbOnIterMap op, bool prefix_mode) {
-	const RVector *skyline = &io->map_skyline;
+	const RPVector *skyline = &io->map_skyline;
 	ut64 addr = vaddr;
-	int i;
+	size_t i;
 	bool ret = true, wrap = !prefix_mode && vaddr + len < vaddr;
 #define CMP(addr, part) (addr < r_itv_end (((RIOMapSkyline *)part)->itv) - 1 ? -1 : \
 			addr > r_itv_end (((RIOMapSkyline *)part)->itv) - 1 ? 1 : 0)
 	// Let i be the first skyline part whose right endpoint > addr
 	if (!len) {
-		i = skyline->len;
+		i = r_pvector_len (skyline);
 	} else {
-		r_vector_lower_bound (skyline, addr, i, CMP);
-		if (i == skyline->len && wrap) {
+		r_pvector_lower_bound (skyline, addr, i, CMP);
+		if (i == r_pvector_len (skyline) && wrap) {
 			wrap = false;
 			i = 0;
 			addr = 0;
 		}
 	}
 #undef CMP
-	while (i < skyline->len) {
-		const RIOMapSkyline *part = skyline->a[i];
+	while (i < r_pvector_len (skyline)) {
+		const RIOMapSkyline *part = r_pvector_at (skyline, i);
 		// Right endpoint <= addr
 		if (r_itv_end (part->itv) - 1 < addr) {
 			i++;
-			if (wrap && i == skyline->len) {
+			if (wrap && i == r_pvector_len (skyline)) {
 				wrap = false;
 				i = 0;
 				addr = 0;
@@ -120,6 +120,7 @@
 			break;
 		} else {
 			addr += len1;
+			ret = false;
 		}
 		// Reaches the end
 		if (addr == vaddr + len) {
@@ -207,6 +208,7 @@
 	}
 	io->addrbytes = 1;
 	r_io_desc_init (io);
+	r_pvector_init (&io->map_skyline, free);
 	r_io_map_init (io);
 	r_io_section_init (io);
 	r_io_cache_init (io);
@@ -343,11 +345,22 @@
 	}
 	//does this really work, or do we have to handler debuggers ugly
 	uri = old->referer? old->referer: old->uri;
+#if __WINDOWS__ //TODO: workaround, see https://github.com/radare/radare2/issues/8840
+	if (!r_io_desc_close (old)) {
+		return false; // TODO: this is an unrecoverable scenario
+	}
+	if (!(new = r_io_open_nomap (io, uri, flags, mode))) {
+		return false;
+	}
+	r_io_desc_exchange (io, old->fd, new->fd);
+	return true;
+#else
 	if (!(new = r_io_open_nomap (io, uri, flags, mode))) {
 		return false;
 	}
 	r_io_desc_exchange (io, old->fd, new->fd);
 	return r_io_desc_close (old); // magic
+#endif // __WINDOWS__
 }
 
 R_API int r_io_close_all(RIO* io) { // what about undo?
@@ -384,7 +397,8 @@
 	return r_io_desc_write_at (io->desc, paddr, buf, len);
 }
 
-R_API bool r_io_vread_at(RIO* io, ut64 vaddr, ut8* buf, int len) {
+// Returns true iff all reads on mapped regions are successful and complete.
+R_API bool r_io_vread_at_mapped(RIO* io, ut64 vaddr, ut8* buf, int len) {
 	if (!io || !buf || (len < 1)) {
 		return false;
 	}
@@ -398,7 +412,7 @@
 	return onIterMap_wrap (io->maps->tail, io, vaddr, buf, len, R_IO_READ, fd_read_at_wrap, NULL);
 }
 
-R_API bool r_io_vwrite_at(RIO* io, ut64 vaddr, const ut8* buf, int len) {
+static bool r_io_vwrite_at(RIO* io, ut64 vaddr, const ut8* buf, int len) {
 	if (!io || !buf || (len < 1)) {
 		return false;
 	}
@@ -440,23 +454,77 @@
 	return log;
 }
 
-R_API bool r_io_read_at(RIO* io, ut64 addr, ut8* buf, int len) {
+// Deprecated, use either r_io_read_at_mapped or r_io_nread_at instead.
+// For virtual mode, returns true if all reads on mapped regions are successful
+// and complete.
+// For physical mode, the interface is broken because the actual read bytes are
+// not available. This requires fixes in all call sites.
+R_API bool r_io_read_at(RIO *io, ut64 addr, ut8 *buf, int len) {
 	bool ret;
 	if (!io || !buf || len < 1) {
 		return false;
 	}
 	if (io->buffer_enabled) {
-		return !!r_io_buffer_read (io, addr, buf, len);
+		return !!r_io_buffer_read(io, addr, buf, len);
 	}
 	if (io->va) {
-		ret = r_io_vread_at (io, addr, buf, len);
-		io->ret = ret? len: -1;
+		ret = r_io_vread_at_mapped(io, addr, buf, len);
 	} else {
-		io->ret = r_io_pread_at (io, addr, buf, len);
-		ret = io->ret > 0;
+		ret = r_io_pread_at(io, addr, buf, len) > 0;
 	}
 	if (io->cached & R_IO_READ) {
-		(void)r_io_cache_read (io, addr, buf, len);
+		(void)r_io_cache_read(io, addr, buf, len);
+	}
+	return ret;
+}
+
+// Returns true iff all reads on mapped regions are successful and complete.
+// Unmapped regions are filled with io->Oxff in both physical and virtual modes.
+// Use this function if you want to ignore gaps or do not care about the number
+// of read bytes.
+R_API bool r_io_read_at_mapped(RIO *io, ut64 addr, ut8 *buf, int len) {
+	bool ret;
+	if (!io || !buf) {
+		return false;
+	}
+	if (io->buffer_enabled) {
+		return !!r_io_buffer_read(io, addr, buf, len);
+	}
+	if (io->ff) {
+		memset(buf, io->Oxff, len);
+	}
+	if (io->va) {
+		ret = on_map_skyline(io, addr, buf, len, R_IO_READ, fd_read_at_wrap, false);
+	} else {
+		ret = r_io_pread_at(io, addr, buf, len) > 0;
+	}
+	if (io->cached & R_IO_READ) {
+		(void)r_io_cache_read(io, addr, buf, len);
+	}
+	return ret;
+}
+
+// For both virtual and physical mode, returns the number of bytes of read
+// prefix.
+// Returns -1 on error.
+R_API int r_io_nread_at(RIO *io, ut64 addr, ut8 *buf, int len) {
+	int ret;
+	if (!io || !buf) {
+		return -1;
+	}
+	if (io->buffer_enabled) {
+		return r_io_buffer_read(io, addr, buf, len);
+	}
+	if (io->va) {
+		if (io->ff) {
+			memset(buf, io->Oxff, len);
+		}
+		ret = on_map_skyline(io, addr, buf, len, R_IO_READ, fd_read_at_wrap, true);
+	} else {
+		ret = r_io_pread_at(io, addr, buf, len);
+	}
+	if (ret > 0 && io->cached & R_IO_READ) {
+		(void)r_io_cache_read(io, addr, buf, len);
 	}
 	return ret;
 }
@@ -511,13 +579,10 @@
 	}
 	if (io->cached & R_IO_WRITE) {
 		ret = r_io_cache_write (io, addr, mybuf, len);
-		io->ret = ret? len: -1;
 	} else if (io->va) {
 		ret = r_io_vwrite_at (io, addr, mybuf, len);
-		io->ret = ret? len: -1;
 	} else {
-		io->ret = r_io_pwrite_at (io, addr, mybuf, len);
-		ret = io->ret > 0;
+		ret = r_io_pwrite_at (io, addr, mybuf, len) > 0;
 	}
 	if (buf != mybuf) {
 		free (mybuf);
@@ -676,10 +741,13 @@
 	bnd->fd_write_at = r_io_fd_write_at;
 	bnd->fd_is_dbg = r_io_fd_is_dbg;
 	bnd->fd_get_name = r_io_fd_get_name;
+	bnd->fd_get_map = r_io_map_get_for_fd;
+	bnd->fd_remap = r_io_map_remap_fd;
 	bnd->al_sort = r_io_accesslog_sort;
 	bnd->al_free = r_io_accesslog_free;
 	bnd->al_buf_byflags = r_io_accesslog_getf_buf_byflags;
 	bnd->is_valid_offset = r_io_is_valid_offset;
+	bnd->addr_is_mapped = r_io_addr_is_mapped;
 	bnd->sections_vget = r_io_sections_vget;
 	bnd->section_add = r_io_section_add;
 	bnd->sect_vget = r_io_section_vget;
diff -Nru radare2-2.3.0+dfsg/libr/io/ioutils.c radare2-2.8.0+dfsg/libr/io/ioutils.c
--- radare2-2.3.0+dfsg/libr/io/ioutils.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/ioutils.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,29 +1,79 @@
-/* radare - LGPL - Copyright 2017 - condret */
+/* radare - LGPL - Copyright 2017-2018 - condret */
 
 #include <r_io.h>
 #include <r_util.h>
 #include <r_types.h>
 
+// TODO: we may probably take care of this when the binfiles have an associated list of fds
+#define REUSE_NULL_MAPS 1
+
 static int __access_log_e_cmp (const void *a, const void *b) {
 	RIOAccessLogElement *A = (RIOAccessLogElement *)a;
 	RIOAccessLogElement *B = (RIOAccessLogElement *)b;
 	return (A->buf_idx > B->buf_idx);
 }
 
+typedef struct {
+	const char *uri;
+	int flags;
+	RIODesc *desc;
+} FindFile;
+
+#if REUSE_NULL_MAPS
+
+static bool findFile(void *user, void *data, ut32 id) {
+	FindFile *res = (FindFile*)user;
+	RIODesc *desc = (RIODesc*)data;
+	if (desc->flags && res->flags && !strcmp (desc->uri, res->uri)) {
+		res->desc = desc;
+		return false;
+	}
+	return true;
+}
+
+static RIODesc *findReusableFile(RIO *io, const char *uri, int flags) {
+	FindFile arg = {
+		.uri = uri,
+		.flags = flags,
+		.desc = NULL,
+	};
+	r_id_storage_foreach (io->files, findFile, &arg);
+	return arg.desc;
+}
+
+#else
+
+static RIODesc *findReusableFile(RIO *io, const char *uri, int flags) {
+	return NULL;
+}
+
+#endif
+
 R_API bool r_io_create_mem_map(RIO *io, RIOSection *sec, ut64 at, bool null, bool do_skyline) {
-	RIOMap *map = NULL;
 	RIODesc *desc = NULL;
 	char *uri = NULL;
+	bool reused = false;
 
 	if (!io || !sec) {
 		return false;
 	}
+	ut64 gap = sec->vsize - sec->size;
 	if (null) {
-		uri = r_str_newf ("null://%"PFMT64u "", sec->vsize - sec->size);
+		uri = r_str_newf ("null://%"PFMT64u, gap);
+		desc = findReusableFile (io, uri, sec->flags);
+		if (desc) {
+			RIOMap *map = r_io_map_get (io, at);
+			if (!map) {
+				r_io_map_new (io, desc->fd, desc->flags, 0LL, at, gap, false);
+			}
+			reused = true;
+		}
 	} else {
-		uri = r_str_newf ("malloc://%"PFMT64u "", sec->vsize - sec->size);
+		uri = r_str_newf ("malloc://%"PFMT64u, gap);
+	}
+	if (!desc) {
+		desc = r_io_open_at (io, uri, sec->flags, 664, at);
 	}
-	desc = r_io_open_at (io, uri, sec->flags, 664, at);
 	free (uri);
 	if (!desc) {
 		return false;
@@ -32,10 +82,12 @@
 		r_io_map_calculate_skyline (io);
 	}
 	// this works, because new maps are allways born on the top
-	map = r_io_map_get (io, at);
+	RIOMap *map = r_io_map_get (io, at);
 	// check if the mapping failed
 	if (!map) {
-		r_io_desc_close (desc);
+		if (!reused) {
+			r_io_desc_close (desc);
+		}
 		return false;
 	}
 	// let the section refere to the map as a memory-map
@@ -82,7 +134,7 @@
 			return false;
 		}
 		RIOMap *map = r_io_map_get (io, at);
-		r_io_map_set_name (map, sdb_fmt (0, "mem.%s", sec->name));
+		r_io_map_set_name (map, sdb_fmt ("mem.%s", sec->name));
 			
 	}
 	if (sec->size) {
@@ -90,7 +142,7 @@
 			return false;
 		}
 		RIOMap *map = r_io_map_get (io, sec->vaddr);
-		r_io_map_set_name (map, sdb_fmt (1, "fmap.%s", sec->name));
+		r_io_map_set_name (map, sdb_fmt ("fmap.%s", sec->name));
 	}
 	return true;
 }
diff -Nru radare2-2.3.0+dfsg/libr/io/map.c radare2-2.8.0+dfsg/libr/io/map.c
--- radare2-2.3.0+dfsg/libr/io/map.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/map.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2017 - condret, MaskRay */
+/* radare2 - LGPL - Copyright 2017-2018 - condret, MaskRay */
 
 #include <r_io.h>
 #include <stdlib.h>
@@ -7,7 +7,7 @@
 #include "r_util.h"
 #include "r_vector.h"
 
-#define END_OF_MAP_IDS  0xffffffff
+#define END_OF_MAP_IDS UT32_MAX
 
 #define MAP_USE_HALF_CLOSED 0
 
@@ -34,7 +34,7 @@
 }
 
 // Precondition: from == 0 && to == 0 (full address) or from < to
-static bool _map_skyline_push(RVector *map_skyline, ut64 from, ut64 to, RIOMap *map) {
+static bool _map_skyline_push(RPVector *map_skyline, ut64 from, ut64 to, RIOMap *map) {
 	RIOMapSkyline *part = R_NEW (RIOMapSkyline), *part1;
 	if (!part) {
 		return false;
@@ -49,11 +49,11 @@
 		}
 		part1->map = map;
 		part1->itv = (RInterval){ UT64_MAX, 1 };
-		if (!r_vector_push (map_skyline, part1)) {
+		if (!r_pvector_push (map_skyline, part1)) {
 			free (part1);
 		}
 	}
-	if (!r_vector_push (map_skyline, part)) {
+	if (!r_pvector_push (map_skyline, part)) {
 		free (part);
 		return false;
 	}
@@ -64,12 +64,13 @@
 R_API void r_io_map_calculate_skyline(RIO *io) {
 	SdbListIter *iter;
 	RIOMap *map;
-	RVector events = {0};
+	RPVector events;
 	RBinHeap heap;
 	struct map_event_t *ev;
 	bool *deleted = NULL;
-	r_vector_clear (&io->map_skyline, free);
-	if (!r_vector_reserve (&events, ls_length (io->maps) * 2) ||
+	r_pvector_clear (&io->map_skyline);
+	r_pvector_init (&events, free);
+	if (!r_pvector_reserve (&events, ls_length (io->maps) * 2) ||
 			!(deleted = calloc (ls_length (io->maps), 1))) {
 		goto out;
 	}
@@ -83,7 +84,7 @@
 		ev->addr = map->itv.addr;
 		ev->is_to = false;
 		ev->id = i;
-		r_vector_push (&events, ev);
+		r_pvector_push (&events, ev);
 		if (!(ev = R_NEW (struct map_event_t))) {
 			goto out;
 		}
@@ -91,16 +92,16 @@
 		ev->addr = r_itv_end (map->itv);
 		ev->is_to = true;
 		ev->id = i;
-		r_vector_push (&events, ev);
+		r_pvector_push (&events, ev);
 		i++;
 	}
-	r_vector_sort (&events, _cmp_map_event);
+	r_pvector_sort (&events, _cmp_map_event);
 
 	r_binheap_init (&heap, _cmp_map_event_by_id);
 	ut64 last;
 	RIOMap *last_map = NULL;
-	for (i = 0; i < events.len; i++) {
-		ev = events.a[i];
+	for (i = 0; i < r_pvector_len (&events); i++) {
+		ev = r_pvector_at (&events, i);
 		if (ev->is_to) {
 			deleted[ev->id] = true;
 		} else {
@@ -134,9 +135,9 @@
 		}
 	}
 
-	r_binheap_clear (&heap, NULL);
+	r_binheap_clear (&heap);
 out:
-	r_vector_clear (&events, free);
+	r_pvector_clear (&events);
 	free (deleted);
 }
 
@@ -152,6 +153,7 @@
 	map->fd = fd;
 	map->delta = delta;
 	if ((UT64_MAX - size + 1) < addr) {
+		/// XXX: this is leaking a map!!!
 		r_io_map_new (io, fd, flags, delta - addr, 0LL, size + addr, do_skyline);
 		size = -(st64)addr;
 	}
@@ -183,6 +185,21 @@
 	return false;
 }
 
+R_API bool r_io_map_remap_fd (RIO *io, int fd, ut64 addr) {
+	RList *maps;
+	RIOMap *map;
+	bool retval = false;
+	maps = r_io_map_get_for_fd (io, fd);
+	if (maps) {
+		map = r_list_get_n (maps, 0);
+		if (map) {
+			retval = r_io_map_remap (io, map->id, addr);
+		}
+		r_list_free (maps);
+	}
+	return retval;
+}
+
 static void _map_free(void* p) {
 	RIOMap* map = (RIOMap*) p;
 	if (map) {
@@ -340,6 +357,23 @@
 	return false;
 }
 
+R_API bool r_io_map_depriorize(RIO* io, ut32 id) {
+	if (io) {
+		RIOMap* map;
+		SdbListIter* iter;
+		ls_foreach (io->maps, iter, map) {
+			// search for iter with the correct map
+			if (map->id == id) {
+				ls_split_iter (io->maps, iter);
+				ls_prepend (io->maps, map);
+				r_io_map_calculate_skyline (io);
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 R_API bool r_io_map_priorize_for_fd(RIO* io, int fd) {
 	SdbListIter* iter, * ator;
 	RIOMap *map;
@@ -406,7 +440,7 @@
 	io->maps = NULL;
 	r_id_pool_free (io->map_ids);
 	io->map_ids = NULL;
-	r_vector_clear (&io->map_skyline, free);
+	r_pvector_clear (&io->map_skyline);
 }
 
 R_API void r_io_map_set_name(RIOMap* map, const char* name) {
@@ -448,6 +482,24 @@
 	return r_io_map_new (io, fd, flags, delta, next_addr, size, true);
 }
 
+R_API ut64 r_io_map_next_address(RIO* io, ut64 addr) {
+	RIOMap* map;
+	SdbListIter* iter;
+	ut64 lowest = UT64_MAX;
+
+	ls_foreach (io->maps, iter, map) {
+		ut64 from = r_itv_begin (map->itv);
+		if (from > addr && addr < lowest) {
+			lowest = from;
+		}
+		ut64 to = r_itv_end (map->itv);
+		if (to > addr && to < lowest) {
+			lowest = to;
+		}
+	}
+	return lowest;
+}
+
 R_API RList* r_io_map_get_for_fd(RIO* io, int fd) {
 	RList* map_list = r_list_newf (NULL);
 	SdbListIter* iter;
diff -Nru radare2-2.3.0+dfsg/libr/io/meson.build radare2-2.8.0+dfsg/libr/io/meson.build
--- radare2-2.3.0+dfsg/libr/io/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,72 +1,91 @@
-files=[
-'iobuf.c',
-'cache.c',
-'desc.c',
-'fd.c',
-'io.c',
-'ioutils.c',
-'map.c',
-'plugin.c',
-'section.c',
-'undo.c',
-'p_cache.c',
-'p/io_rbuf.c',
-'p/io_ar.c',
-'p/io_bfdbg.c',
-'p/io_bochs.c',
-'p/io_debug.c',
-'p/io_default.c',
-'p/io_gdb.c',
-'p/io_gzip.c',
-'p/io_http.c',
-'p/io_ihex.c',
-'p/io_mach.c',
-'p/io_malloc.c',
-'p/io_mmap.c',
-'p/io_null.c',
-'p/io_procpid.c',
-'p/io_ptrace.c',
-'p/io_qnx.c',
-'p/io_r2k.c',
-'p/io_r2pipe.c',
-'p/io_r2web.c',
-'p/io_rap.c',
-'p/io_self.c',
-'p/io_shm.c',
-'p/io_sparse.c',
-'p/io_tcp.c',
-'p/io_windbg.c',
-'p/io_winedbg.c',
-'p/io_zip.c',
+files = [
+  'iobuf.c',
+  'cache.c',
+  'desc.c',
+  'fd.c',
+  'io.c',
+  'ioutils.c',
+  'map.c',
+  'plugin.c',
+  'section.c',
+  'undo.c',
+  'p_cache.c',
+  'p/io_ar.c',
+  'p/io_bfdbg.c',
+  'p/io_bochs.c',
+  'p/io_debug.c',
+  'p/io_default.c',
+  'p/io_gdb.c',
+  'p/io_gprobe.c',
+  'p/io_gzip.c',
+  'p/io_http.c',
+  'p/io_ihex.c',
+  'p/io_mach.c',
+  'p/io_malloc.c',
+  'p/io_mmap.c',
+  'p/io_null.c',
+  'p/io_procpid.c',
+  'p/io_ptrace.c',
+  'p/io_qnx.c',
+  'p/io_r2k.c',
+  'p/io_r2pipe.c',
+  'p/io_r2web.c',
+  'p/io_rap.c',
+  'p/io_rbuf.c',
+  'p/io_self.c',
+  'p/io_shm.c',
+  'p/io_sparse.c',
+  'p/io_tcp.c',
+  'p/io_windbg.c',
+  'p/io_winedbg.c',
+  'p/io_zip.c',
 ]
 
-if host_os == 'linux'
-files += [
-  'p/io_r2k_linux.c',
-]
+if host_machine.system() == 'linux'
+  files += [
+    'p/io_r2k_linux.c',
+  ]
 endif
 
-if host_os == 'windows'
-files += [
-  'p/io_r2k_windows.c',
-  'p/io_w32.c',
-  'p/io_w32dbg.c',
-]
+if host_machine.system() == 'windows'
+  files += [
+    'p/io_r2k_windows.c',
+    'p/io_w32.c',
+    'p/io_w32dbg.c',
+  ]
 endif
 
 r_io = library('r_io', files,
-  include_directories: [platform_inc, include_directories([
-	'../../shlr/bochs/include',
-	'../../shlr/gdb/include',
-	'../../shlr/qnx/include',
-	'../../shlr/windbg',
-	'../../shlr/ar',
-	'../../shlr/zip/include']
-  )],
-  link_with: [r_util, r_socket, libr2qnx, libr2bochs, libr2windbg, libr2gdb, libr2zip, libr2ar],
-  objects: [
-	libr2sdb.extract_all_objects(),
+  include_directories: platform_inc,
+  dependencies: [
+    r_util_dep,
+    r_socket_dep,
+    sdb_dep,
+    bochs_dep,
+    gdb_dep,
+    windbg_dep,
+    qnx_dep,
+    zip_dep,
+    ar_dep
+  ],
+  c_args: ['-DCORELIB=1'],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_io_dep = declare_dependency(link_with: r_io,
+                              include_directories: platform_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_io],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_io',
+  filebase: 'r_io',
+  requires: [
+    'r_util',
+    'r_socket'
   ],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  install: true
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/io/p/gprobe.mk radare2-2.8.0+dfsg/libr/io/p/gprobe.mk
--- radare2-2.3.0+dfsg/libr/io/p/gprobe.mk	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/gprobe.mk	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,16 @@
+OBJ_GPROBE=io_gprobe.o
+
+STATIC_OBJ+=${OBJ_GPROBE}
+TARGET_GPROBE=io_gprobe.${EXT_SO}
+ALL_TARGETS+=${TARGET_GPROBE}
+
+ifeq (${WITHPIC},0)
+LINKFLAGS+=../../util/libr_util.a
+LINKFLAGS+=../../io/libr_io.a
+else
+LINKFLAGS+=-L../../util -lr_util
+LINKFLAGS+=-L.. -lr_io
+endif
+
+${TARGET_GPROBE}: ${OBJ_GPROBE}
+	${CC_LIB} $(call libname,io_gprobe) ${CFLAGS} -o ${TARGET_GPROBE} ${OBJ_GPROBE} ${LINKFLAGS}
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_debug.c radare2-2.8.0+dfsg/libr/io/p/io_debug.c
--- radare2-2.3.0+dfsg/libr/io/p/io_debug.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_debug.c	2018-08-07 14:12:36.000000000 +0000
@@ -417,6 +417,51 @@
 }
 #endif
 
+#if __APPLE__ && !__POWERPC__
+// wat
+#else
+static char *get_and_escape_path (char *str) {
+	char *path_bin = strdup (str);
+	char *final = NULL;
+
+	if (!path_bin) {
+		return NULL;
+	}
+	char *p = (char*) r_str_lchr (str, '/');
+	char *pp = (char*) r_str_tok (p, ' ', -1);
+	char *args;
+
+	if (!pp) {
+		// There is nothing more to parse
+		free (path_bin);
+		return str;
+	}
+
+	path_bin[pp - str] = '\0';
+	if (strstr (path_bin, "\\ ")) {
+		path_bin = r_str_replace (path_bin, "\\ ", " ", true);
+	}
+	args = path_bin + (pp - str) + 1;
+
+	char *path_bin_escaped = r_str_arg_escape (path_bin);
+	int len = strlen (path_bin_escaped);
+
+	char *pbe = realloc (path_bin_escaped, len + 2);
+	if (pbe) {
+		path_bin_escaped = pbe;
+		path_bin_escaped[len] = ' ';
+		path_bin_escaped[len + 1] = '\0';
+		final = r_str_append (path_bin_escaped, args);
+	} else {
+		free (path_bin_escaped);
+		final = NULL;
+	}
+	free (path_bin);
+
+	return final;
+}
+#endif
+
 static int fork_and_ptraceme(RIO *io, int bits, const char *cmd) {
 #if __APPLE__ && !__POWERPC__
 	return fork_and_ptraceme_for_mac(io, bits, cmd);
@@ -449,10 +494,14 @@
 			char *_cmd = io->args ?
 				r_str_appendf (strdup (cmd), " %s", io->args) :
 				strdup (cmd);
-
+			char *path_escaped = get_and_escape_path (_cmd);
 			trace_me ();
-			argv = r_str_argv (_cmd, NULL);
+			argv = r_str_argv (path_escaped, NULL);
+			if (argv && strstr (argv[0], "\\ ")) {
+				argv[0] = r_str_replace (argv[0], "\\ ", " ", true);
+			}
 			if (!argv) {
+				free (path_escaped);
 				free (_cmd);
 				return -1;
 			}
@@ -469,6 +518,7 @@
 				eprintf ("Invalid execvp\n");
 			}
 			r_str_argv_free (argv);
+			free (path_escaped);
 			free (_cmd);
 		}
 		perror ("fork_and_attach: execv");
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_default.c radare2-2.8.0+dfsg/libr/io/p/io_default.c
--- radare2-2.3.0+dfsg/libr/io/p/io_default.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_default.c	2018-08-07 14:12:36.000000000 +0000
@@ -226,10 +226,14 @@
 			free (a_buf);
 			return count;
 		}
+		if (lseek (mmo->fd, io->off, SEEK_SET) < 0) {
+			return -1;
+		}
 		return read (mmo->fd, buf, count);
 	}
-	if (mmo->buf->length < io->off)
+	if (mmo->buf->length < io->off) {
 		io->off = mmo->buf->length;
+	}
 	return r_buf_read_at (mmo->buf, io->off, buf, count);
 }
 
@@ -337,14 +341,13 @@
 
 // default open should permit opening
 static RIODesc *__open_default(RIO *io, const char *file, int flags, int mode) {
-	RIODesc *iod;
 	if (r_str_startswith (file, "file://")) {
 		file += strlen ("file://");
 	}
 	if (!r_io_def_mmap_check_default (file)) {
 		return NULL;
 	}
-	iod = r_io_def_mmap_open (io, file, flags, mode);
+	RIODesc *iod = r_io_def_mmap_open (io, file, flags, mode);
 	return iod;
 // NTOE: uncomment this line to support loading files in ro as fallback is rw fails
 //	return iod? iod: r_io_def_mmap_open (io, file, R_IO_READ, mode);
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_gdb.c radare2-2.8.0+dfsg/libr/io/p/io_gdb.c
--- radare2-2.3.0+dfsg/libr/io/p/io_gdb.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_gdb.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2010-2017 pancake */
+/* radare - LGPL - Copyright 2010-2018 pancake */
 
 #include <r_io.h>
 #include <r_lib.h>
@@ -15,6 +15,7 @@
 
 #define R_GDB_MAGIC r_str_hash ("gdb")
 
+static int __close(RIODesc *fd);
 static libgdbr_t *desc = NULL;
 static RIODesc *riogdb = NULL;
 
@@ -114,6 +115,8 @@
 	gdbr_init (&riog->desc, false);
 
 	if (gdbr_connect (&riog->desc, host, i_port) == 0) {
+		__close (NULL);
+		// R_FREE (desc);
 		desc = &riog->desc;
 		if (pid > 0) { // FIXME this is here for now because RDebug's pid and libgdbr's aren't properly synced.
 			desc->pid = i_pid;
@@ -138,8 +141,10 @@
 
 static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
 	ut64 addr = io->off;
-	if (!desc || !desc->data) return -1;
-	return debug_gdb_write_at(buf, count, addr);
+	if (!desc || !desc->data) {
+		return -1;
+	}
+	return debug_gdb_write_at (buf, count, addr);
 }
 
 static ut64 __lseek(RIO *io, RIODesc *fd, ut64 offset, int whence) {
@@ -174,11 +179,12 @@
 	}
 	gdbr_disconnect (desc);
 	gdbr_cleanup (desc);
-	free (desc);
+	R_FREE (desc);
 	return -1;
 }
 
 static int __getpid(RIODesc *fd) {
+	// XXX dont use globals
 	return desc ? desc->pid : -1;
 #if 0
 	// dupe for ? r_io_desc_get_pid (desc);
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_gprobe.c radare2-2.8.0+dfsg/libr/io/p/io_gprobe.c
--- radare2-2.3.0+dfsg/libr/io/p/io_gprobe.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_gprobe.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,1236 @@
+/* radare - LGPL - Copyright 2018 - Dirk Eibach, Guntermann & Drunck GmbH */
+
+#include <r_io.h>
+#include <r_lib.h>
+#include <r_print.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#define USE_OWNTIMER 1
+#if USE_OWNTIMER
+#include "io_gprobe.h"
+#else
+#define Timersub timersub
+#define Timeradd timeradd
+#define Timercmp timercmp
+#endif
+
+#if __WINDOWS__
+#include <cfgmgr32.h>
+#include <setupapi.h>
+#include <tchar.h>
+#include <windows.h>
+#else
+#if !__linux__ && !__APPLE__ && !__OpenBSD__ && !__FreeBSD__
+#include <stropts.h>
+#endif
+#include <termios.h>
+#endif
+
+#define GPROBE_SIZE (1LL << 32)
+#define GPROBE_I2C_ADDR 0x6e
+
+#define I2C_SLAVE 0x0703
+
+/* serial port code adapted from git://sigrok.org/libserialport */
+struct gport {
+	const char *name;
+#if __WINDOWS__
+	HANDLE hdl;
+	COMMTIMEOUTS timeouts;
+	OVERLAPPED write_ovl;
+	OVERLAPPED read_ovl;
+	OVERLAPPED wait_ovl;
+	DWORD events;
+	BYTE pending_byte;
+	BOOL writing;
+	BOOL wait_running;
+#else
+	int fd;
+#endif
+	int (*send_request) (struct gport *port, RBuffer *request);
+	int (*get_reply) (struct gport *port, ut8 cmd, RBuffer *reply);
+	void (*frame) (RBuffer *frame);
+
+	ut32 max_rx_size;
+	ut32 max_tx_size;
+};
+
+typedef struct {
+	struct gport gport;
+	ut64 offset;
+} RIOGprobe;
+
+enum {
+	GPROBE_DEBUGON = 0x09,
+	GPROBE_DEBUGOFF = 0x0a,
+	GPROBE_ACK = 0x0c,
+	GPROBE_RESET = 0x20,
+	GPROBE_GET_DEVICE_ID = 0x30,
+	GPROBE_GET_INFORMATION = 0x40,
+	GPROBE_RAM_READ_2 = 0x52,
+	GPROBE_RAM_WRITE_2 = 0x53,
+	GPROBE_RUN_CODE_2 = 0x54,
+};
+
+#if __UNIX__
+static ut8 gprobe_checksum_i2c (const ut8 *p, unsigned int size, ut8 initial) {
+	ut8 res = initial;
+	unsigned int k;
+
+	for (k = 0; k < size; ++k)
+		res ^= p[k];
+
+	return res;
+}
+
+static void gprobe_frame_i2c (RBuffer *frame) {
+	ut8 size = r_buf_size (frame) + 1;
+	ut8 header[] = {0x51, 0x80 + size + 3, 0xc2, 0x00, 0x00};
+	ut8 checksum;
+
+	r_buf_prepend_bytes (frame, &size, 1);
+	r_buf_prepend_bytes (frame, header, sizeof (header));
+
+	checksum = gprobe_checksum_i2c (r_buf_buffer (frame), r_buf_size (frame), GPROBE_I2C_ADDR);
+
+	r_buf_append_bytes (frame, &checksum, 1);
+}
+
+static int gprobe_get_reply_i2c (struct gport *port, ut8 cmd, RBuffer *reply) {
+	ut8 buf[131];
+	int count;
+	int ddc2bi3_len;
+	ut8 addr = 0x50;
+	ut8 checksum;
+
+	r_sys_usleep (40000);
+
+	count = read (port->fd, buf, sizeof (buf));
+
+	if (count != sizeof (buf)) {
+		return -1;
+	}
+
+	ddc2bi3_len = buf[1] & ~0x80;
+
+	if (((buf[0] & 0xfe) != GPROBE_I2C_ADDR)
+	    || !(buf[1] & 0x80)
+	    || (buf[2] != 0xc2)
+	    || (buf[3] != 0x00)
+	    || (buf[4] != 0x00)
+	    || (cmd != buf[6])
+	    || !(buf[5] - 2)
+	    || (buf[5] != ddc2bi3_len - 2)) {
+		return -1;
+	}
+
+	checksum = gprobe_checksum_i2c (&addr, 1, 0);
+
+	if (gprobe_checksum_i2c (buf, ddc2bi3_len + 2, checksum) != buf[ddc2bi3_len + 2]) {
+		eprintf ("gprobe rx checksum error\n");
+	}
+
+	r_buf_append_bytes (reply, buf + 7, buf[5] - 3);
+
+	return 0;
+}
+
+static int gprobe_send_request_i2c (struct gport *port, RBuffer *request) {
+	if (write (port->fd, r_buf_buffer (request), r_buf_size (request)) != r_buf_size (request)) {
+		return -1;
+	}
+	return 0;
+}
+
+static int i2c_open (struct gport *port) {
+	char *end, filename[32];
+	int i2cbus = strtol (port->name + 4, &end, 0);
+
+	if (*end) {
+		return -1;
+	}
+
+	snprintf (filename, sizeof (filename), "/dev/i2c/%d", i2cbus);
+	filename[sizeof (filename) - 1] = '\0';
+	int file = r_sandbox_open (filename, O_RDWR, 0);
+
+	if (file < 0 && (errno == ENOENT || errno == ENOTDIR)) {
+		sprintf (filename, "/dev/i2c-%d", i2cbus);
+		file = r_sandbox_open (filename, O_RDWR, 0);
+	}
+	if (file < 0) {
+		return -1;
+	}
+	if (ioctl (file, I2C_SLAVE, GPROBE_I2C_ADDR >> 1) < 0) {
+		r_sandbox_close (file);
+		port->fd = -1;
+		return -1;
+	}
+	port->fd = file;
+	return 0;
+}
+#endif
+
+static int sp_close (struct gport *port) {
+#if __WINDOWS__
+	/* Returns non-zero upon success, 0 upon failure. */
+	if (CloseHandle (port->hdl) == 0){
+		return -1;
+	}
+	port->hdl = INVALID_HANDLE_VALUE;
+
+	/* Close event handles for overlapped structures. */
+#define CLOSE_OVERLAPPED(ovl)                                   \
+	do {                                                    \
+		if (port->ovl.hEvent != INVALID_HANDLE_VALUE && \
+		    CloseHandle (port->ovl.hEvent) == 0)        \
+			return -1;                              \
+	} while (0)
+	CLOSE_OVERLAPPED (read_ovl);
+	CLOSE_OVERLAPPED (write_ovl);
+	CLOSE_OVERLAPPED (wait_ovl);
+#else
+	if (close (port->fd) == -1) {
+		return -1;
+	}
+
+	port->fd = -1;
+#endif
+	return 0;
+}
+
+#if __WINDOWS__
+/* To be called after port receive buffer is emptied. */
+static int restart_wait (struct gport *port) {
+	DWORD wait_result;
+
+	if (port->wait_running) {
+		/* Check status of running wait operation. */
+		if (GetOverlappedResult (port->hdl, &port->wait_ovl,
+					 &wait_result, FALSE)) {
+			port->wait_running = FALSE;
+		} else if (GetLastError () == ERROR_IO_INCOMPLETE) {
+			return 0;
+		}
+		return -1;
+	}
+	if (!port->wait_running) {
+		/* Start new wait operation. */
+		if (WaitCommEvent (port->hdl, &port->events,
+				   &port->wait_ovl)) {
+		} else if (GetLastError () == ERROR_IO_PENDING) {
+			port->wait_running = TRUE;
+		}
+		return -1;
+	}
+	return 0;
+}
+#endif
+
+static int sp_open (struct gport *port) {
+#if __WINDOWS__
+	int ret;
+	DWORD errors;
+	char *escaped_port_name;
+	COMSTAT status;
+	DCB dcb;
+	LPTSTR filename_;
+
+	/* Prefix port name with '\\.\' to work with ports above COM9. */
+	if (!(escaped_port_name = malloc (strlen (port->name) + 5))) {
+		return -1;
+	}
+	sprintf (escaped_port_name, "\\\\.\\%s", port->name);
+
+	filename_ = r_sys_conv_utf8_to_utf16 (escaped_port_name);
+
+	port->hdl = CreateFile (filename_, GENERIC_READ | GENERIC_WRITE, 0, 0,
+				OPEN_EXISTING,
+				FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, 0);
+
+	free (escaped_port_name);
+
+	if (port->hdl == INVALID_HANDLE_VALUE) {
+		return -1;
+	}
+
+	/* All timeouts initially disabled. */
+	port->timeouts.ReadIntervalTimeout = 0;
+	port->timeouts.ReadTotalTimeoutMultiplier = 0;
+	port->timeouts.ReadTotalTimeoutConstant = 0;
+	port->timeouts.WriteTotalTimeoutMultiplier = 0;
+	port->timeouts.WriteTotalTimeoutConstant = 0;
+
+	if (SetCommTimeouts (port->hdl, &port->timeouts) == 0) {
+		sp_close (port);
+		return -1;
+	}
+
+	/* Prepare OVERLAPPED structures. */
+#define INIT_OVERLAPPED(ovl)                                                                             \
+	do {                                                                                             \
+		memset (&port->ovl, 0, sizeof (port->ovl));                                              \
+		port->ovl.hEvent = INVALID_HANDLE_VALUE;                                                 \
+		if ((port->ovl.hEvent = CreateEvent (NULL, TRUE, TRUE, NULL)) == INVALID_HANDLE_VALUE) { \
+			sp_close (port);                                                                 \
+			return -1;                                                                       \
+		}                                                                                        \
+	} while (0)
+
+	INIT_OVERLAPPED (read_ovl);
+	INIT_OVERLAPPED (write_ovl);
+	INIT_OVERLAPPED (wait_ovl);
+
+	/* Set event mask for RX and error events. */
+	if (SetCommMask (port->hdl, EV_RXCHAR | EV_ERR) == 0) {
+		sp_close (port);
+		return -1;
+	}
+
+	port->writing = FALSE;
+	port->wait_running = FALSE;
+
+	ret = restart_wait (port);
+
+	if (ret < 0) {
+		sp_close (port);
+		return -1;
+	}
+
+	dcb.fBinary = TRUE;
+	dcb.fDsrSensitivity = FALSE;
+	dcb.fErrorChar = FALSE;
+	dcb.fNull = FALSE;
+	dcb.fAbortOnError = FALSE;
+
+	if (ClearCommError (port->hdl, &errors, &status) == 0) {
+		return -1;
+	}
+
+	dcb.BaudRate = CBR_115200;
+
+	dcb.ByteSize = 8;
+	dcb.Parity = NOPARITY;
+	dcb.StopBits = ONESTOPBIT;
+	dcb.fRtsControl = RTS_CONTROL_DISABLE;
+	dcb.fOutxCtsFlow = FALSE;
+	dcb.fDtrControl = DTR_CONTROL_DISABLE;
+	dcb.fOutxDsrFlow = FALSE;
+	dcb.fInX = FALSE;
+	dcb.fOutX = FALSE;
+
+	if (!SetCommState (port->hdl, &dcb)) {
+		return -1;
+	}
+
+	return 0;
+#else
+	struct termios tty = {0};
+
+	if ((port->fd = r_sandbox_open (port->name, O_NONBLOCK | O_NOCTTY | O_RDWR, 0)) < 0) {
+		return -1;
+	}
+
+	if (tcgetattr (port->fd, &tty) != 0) {
+		sp_close (port);
+		return -1;
+	}
+
+	cfsetospeed (&tty, B115200);
+	cfsetispeed (&tty, B115200);
+
+	tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS8;
+	tty.c_iflag &= ~IGNBRK;
+	tty.c_lflag = 0;
+	tty.c_oflag = 0;
+	tty.c_cc[VMIN] = 0;
+	tty.c_cc[VTIME] = 0;
+	tty.c_iflag &= ~(IXON | IXOFF | IXANY);
+
+	tty.c_cflag |= (CLOCAL | CREAD);
+	tty.c_cflag &= ~(PARENB | PARODD);
+	tty.c_cflag &= ~CSTOPB;
+#ifdef CRTSCTS
+	tty.c_cflag &= ~CRTSCTS;
+#else
+	tty.c_cflag &= ~020000000000;
+#endif
+
+	if (tcsetattr (port->fd, TCSANOW, &tty) != 0) {
+		return -1;
+	}
+
+	return 0;
+#endif
+}
+
+#if __WINDOWS__
+/* Restart wait operation if buffer was emptied. */
+static int restart_wait_if_needed (struct gport *port, unsigned int bytes_read) {
+	DWORD errors;
+	COMSTAT comstat;
+
+	if (bytes_read == 0) {
+		return 0;
+	}
+
+	if (ClearCommError (port->hdl, &errors, &comstat) == 0) {
+		return -1;
+	}
+
+	if (comstat.cbInQue == 0) {
+		if (restart_wait (port)) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+#endif
+
+static int sp_blocking_read (struct gport *port, void *buf,
+			     size_t count, unsigned int timeout_ms) {
+#if __WINDOWS__
+	DWORD bytes_read = 0;
+
+	/* Set timeout. */
+	if (port->timeouts.ReadIntervalTimeout != 0 ||
+	    port->timeouts.ReadTotalTimeoutMultiplier != 0 ||
+	    port->timeouts.ReadTotalTimeoutConstant != timeout_ms) {
+		port->timeouts.ReadIntervalTimeout = 0;
+		port->timeouts.ReadTotalTimeoutMultiplier = 0;
+		port->timeouts.ReadTotalTimeoutConstant = timeout_ms;
+		if (SetCommTimeouts (port->hdl, &port->timeouts) == 0) {
+			return -1;
+		}
+	}
+
+	/* Start read. */
+	if (ReadFile (port->hdl, buf, count, NULL, &port->read_ovl)) {
+		bytes_read = count;
+	} else if (GetLastError () == ERROR_IO_PENDING) {
+		if (GetOverlappedResult (port->hdl, &port->read_ovl, &bytes_read, TRUE) == 0)
+			return -1;
+	} else {
+		return -1;
+	}
+
+	if (restart_wait_if_needed (port, bytes_read)) {
+		return -1;
+	}
+
+	return bytes_read;
+#else
+	size_t bytes_read = 0;
+	unsigned char *ptr = (unsigned char *)buf;
+	struct timeval start, delta, now, end = {0, 0};
+	int started = 0;
+	fd_set fds;
+	int result;
+
+	if (timeout_ms) {
+		/* Get time at start of operation. */
+		gettimeofday (&start, NULL);
+		/* Define duration of timeout. */
+		delta.tv_sec = timeout_ms / 1000;
+		delta.tv_usec = (timeout_ms % 1000) * 1000;
+		/* Calculate time at which we should give up. */
+		Timeradd (&start, &delta, &end);
+	}
+
+	FD_ZERO (&fds);
+	FD_SET (port->fd, &fds);
+
+	/* Loop until we have the requested number of bytes. */
+	while (bytes_read < count) {
+		/*
+		 * Check timeout only if we have run select() at least once,
+		 * to avoid any issues if a short timeout is reached before
+		 * select() is even run.
+		 */
+		if (timeout_ms && started) {
+			gettimeofday (&now, NULL);
+			if (Timercmp (&now, &end, >)) {
+				/* Timeout has expired. */
+				break;
+			}
+			Timersub (&end, &now, &delta);
+		}
+		result = select (port->fd + 1, &fds, NULL, NULL, timeout_ms ? &delta : NULL);
+		started = 1;
+		if (result < 0) {
+			if (errno == EINTR) {
+				continue;
+			} else {
+				return -1;
+			}
+		} else if (result == 0) {
+			/* Timeout has expired. */
+			break;
+		}
+
+		/* Do read. */
+		result = read (port->fd, ptr, count - bytes_read);
+
+		if (result < 0) {
+			if (errno == EAGAIN) {
+				/*
+				 * This shouldn't happen because we did a
+				 * select() first, but handle anyway.
+				 */
+				continue;
+			} else {
+				/* This is an actual failure. */
+				return -1;
+			}
+		}
+
+		bytes_read += result;
+		ptr += result;
+	}
+
+	return bytes_read;
+#endif
+}
+
+static int sp_flush (struct gport *port) {
+#if __WINDOWS__
+	/* Returns non-zero upon success, 0 upon failure. */
+	if (PurgeComm (port->hdl, PURGE_RXCLEAR) == 0) {
+		return -1;
+	}
+
+	if (restart_wait (port)) {
+		return -1;
+	}
+#else
+	if (tcflush (port->fd, TCIFLUSH) < 0) {
+		return -1;
+	}
+#endif
+
+	return 0;
+}
+
+#if __WINDOWS__
+static int await_write_completion (struct gport *port) {
+	DWORD bytes_written;
+	BOOL result;
+
+	/* Wait for previous non-blocking write to complete, if any. */
+	if (port->writing) {
+		result = GetOverlappedResult (port->hdl, &port->write_ovl, &bytes_written, TRUE);
+		port->writing = 0;
+		if (!result) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+#endif
+
+static int sp_blocking_write (struct gport *port, const void *buf,
+			      size_t count, unsigned int timeout_ms) {
+#if __WINDOWS__
+	DWORD bytes_written = 0;
+
+	if (await_write_completion (port)) {
+		return -1;
+	}
+
+	/* Set timeout. */
+	if (port->timeouts.WriteTotalTimeoutConstant != timeout_ms) {
+		port->timeouts.WriteTotalTimeoutConstant = timeout_ms;
+		if (SetCommTimeouts (port->hdl, &port->timeouts) == 0) {
+			return -1;
+		}
+	}
+
+	/* Start write. */
+	if (WriteFile (port->hdl, buf, count, NULL, &port->write_ovl)) {
+		return count;
+	} else if (GetLastError () == ERROR_IO_PENDING) {
+		if (GetOverlappedResult (port->hdl, &port->write_ovl, &bytes_written, TRUE) == 0) {
+			if (GetLastError () == ERROR_SEM_TIMEOUT)
+				return 0;
+			else
+				return -1;
+		}
+		return bytes_written;
+	} else {
+		return -1;
+	}
+#else
+	size_t bytes_written = 0;
+	unsigned char *ptr = (unsigned char *)buf;
+	struct timeval start, delta, now, end = {0, 0};
+	int started = 0;
+	fd_set fds;
+	int result;
+
+	if (timeout_ms) {
+		/* Get time at start of operation. */
+		gettimeofday (&start, NULL);
+		/* Define duration of timeout. */
+		delta.tv_sec = timeout_ms / 1000;
+		delta.tv_usec = (timeout_ms % 1000) * 1000;
+		/* Calculate time at which we should give up. */
+		Timeradd (&start, &delta, &end);
+	}
+
+	FD_ZERO (&fds);
+	FD_SET (port->fd, &fds);
+
+	/* Loop until we have written the requested number of bytes. */
+	while (bytes_written < count) {
+		/*
+		 * Check timeout only if we have run select() at least once,
+		 * to avoid any issues if a short timeout is reached before
+		 * select() is even run.
+		 */
+		if (timeout_ms && started) {
+			gettimeofday (&now, NULL);
+			if (Timercmp (&now, &end, >)) {
+				/* Timeout has expired. */
+				break;
+			}
+			Timersub (&end, &now, &delta);
+		}
+		result = select (port->fd + 1, NULL, &fds, NULL, timeout_ms ? &delta : NULL);
+		started = 1;
+		if (result < 0) {
+			if (errno == EINTR) {
+				continue;
+			} else {
+				return -1;
+			}
+		} else if (result == 0) {
+			/* Timeout has expired. */
+			break;
+		}
+
+		/* Do write. */
+		result = write (port->fd, ptr, count - bytes_written);
+
+		if (result < 0) {
+			if (errno == EAGAIN) {
+				/* This shouldn't happen because we did a select() first, but handle anyway. */
+				continue;
+			} else {
+				/* This is an actual failure. */
+				return -1;
+			}
+		}
+
+		bytes_written += result;
+		ptr += result;
+	}
+
+	return bytes_written;
+#endif
+}
+
+static ut8 gprobe_checksum (const ut8 *p, unsigned int size) {
+	ut8 res = 0;
+	unsigned int k;
+
+	for (k = 0; k < size; ++k) {
+		res += p[k];
+	}
+
+	res = ~res + 1;
+
+	return res;
+}
+
+static void gprobe_frame_sp (RBuffer *frame) {
+	ut8 size = r_buf_size (frame) + 2;
+	ut8 checksum;
+
+	r_buf_prepend_bytes (frame, &size, 1);
+	checksum = gprobe_checksum (r_buf_buffer (frame), size - 1);
+
+	r_buf_append_bytes (frame, &checksum, 1);
+}
+
+static int gprobe_get_reply_sp (struct gport *port, ut8 cmd, RBuffer *reply) {
+	ut8 buf[256];
+	int count = sp_blocking_read (port, buf, 2, 50);
+
+	if (count < 2) {
+		return -1;
+	}
+
+	if (cmd != buf[1]) {
+		return -1;
+	}
+
+	if (!(buf[0] - 2)) {
+		return 0;
+	}
+
+	count = sp_blocking_read (port, buf + 2, buf[0] - 2, 50) + 2;
+
+	if (count != buf[0]) {
+		return -1;
+	}
+
+/* checksumming answers does not work reliably */
+#if 0
+	if (gprobe_checksum(buf, count - 1) != buf[count - 1]) {
+		printf("### CHECKSUM FAILED\n");
+	}
+#endif
+
+	r_buf_append_bytes (reply, buf + 2, count - 3);
+
+	return 0;
+}
+
+static int gprobe_send_request_sp (struct gport *port, RBuffer *request) {
+	sp_flush (port);
+
+	if (sp_blocking_write (port, r_buf_buffer (request), r_buf_size (request),
+			       100) != r_buf_size (request)) {
+		return -1;
+	}
+
+	return 0;
+}
+
+static int gprobe_read (struct gport *port, ut32 addr, ut8 *buf, ut32 count) {
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_RAM_READ_2;
+	ut8 addr_be[4];
+	ut8 count_be[4];
+	int res;
+
+	if (!request || !reply) {
+		r_buf_free (request);
+		r_buf_free (reply);
+		return -1;
+	}
+
+	count = R_MIN (port->max_rx_size, count);
+
+	r_write_be32 (addr_be, addr);
+	r_write_be32 (count_be, count);
+
+	r_buf_append_bytes (request, &cmd, 1);
+	r_buf_append_bytes (request, addr_be, 4);
+	r_buf_append_bytes (request, count_be, 4);
+
+	port->frame (request);
+
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+
+	if (port->get_reply (port, cmd, reply)) {
+		goto fail;
+	}
+
+	res = r_buf_read_at (reply, 0, buf, r_buf_size (reply));
+
+	r_buf_free (request);
+	r_buf_free (reply);
+
+	return res;
+
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int gprobe_write (struct gport *port, ut32 addr, const ut8 *buf, ut32 count) {
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_RAM_WRITE_2;
+	ut8 addr_be[4];
+	ut8 count_be[4];
+
+	if (!request || !reply) {
+		r_buf_free (request);
+		r_buf_free (reply);
+		return -1;
+	}
+
+	count = R_MIN (port->max_tx_size, count);
+
+	r_write_be32 (addr_be, addr);
+	r_write_be32 (count_be, count);
+
+	r_buf_append_bytes (request, &cmd, 1);
+	r_buf_append_bytes (request, addr_be, 4);
+	r_buf_append_bytes (request, buf, count);
+
+	port->frame (request);
+
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+
+	if (port->get_reply (port, GPROBE_ACK, reply)) {
+		goto fail;
+	}
+
+	r_buf_free (request);
+	r_buf_free (reply);
+
+	return count;
+
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int gprobe_reset (struct gport *port, ut8 code) {
+	if (!port) {
+		return -1;
+	}
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_RESET;
+
+	if (!request || !reply) {
+		goto fail;
+	}
+
+	r_buf_append_bytes (request, &cmd, 1);
+	r_buf_append_bytes (request, &code, 1);
+
+	port->frame (request);
+
+	sp_flush (port);
+
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+
+	if (port->get_reply (port, GPROBE_ACK, reply)) {
+		goto fail;
+	}
+
+	r_buf_free (request);
+	r_buf_free (reply);
+
+	return 0;
+
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int gprobe_debugon (struct gport *port) {
+	if (!port) {
+		return -1;
+	}
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_DEBUGON;
+
+	if (!request || !reply) {
+		goto fail;
+	}
+	r_buf_append_bytes (request, &cmd, 1);
+
+	port->frame (request);
+
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+
+	if (port->get_reply (port, GPROBE_ACK, reply)) {
+		goto fail;
+	}
+
+	r_buf_free (request);
+	r_buf_free (reply);
+
+	return 0;
+
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int gprobe_debugoff (struct gport *port) {
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_DEBUGOFF;
+
+	if (!request || !reply) {
+		goto fail;
+	}
+	r_buf_append_bytes (request, &cmd, 1);
+	port->frame (request);
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+	if (port->get_reply (port, GPROBE_ACK, reply)) {
+		goto fail;
+	}
+	r_buf_free (request);
+	r_buf_free (reply);
+	return 0;
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int gprobe_runcode (struct gport *port, ut32 addr) {
+	if (!port) {
+		return -1;
+	}
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_RUN_CODE_2;
+	ut8 addr_be[4];
+
+	if (!request || !reply) {
+		goto fail;
+	}
+
+	r_write_be32 (addr_be, addr);
+
+	r_buf_append_bytes (request, &cmd, 1);
+	r_buf_append_bytes (request, addr_be, 4);
+
+	port->frame (request);
+
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+
+	if (port->get_reply (port, GPROBE_ACK, reply)) {
+		goto fail;
+	}
+
+	r_buf_free (request);
+	r_buf_free (reply);
+
+	return 0;
+
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int gprobe_getdeviceid (struct gport *port, ut8 index) {
+	if (!port) {
+		return -1;
+	}
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_GET_DEVICE_ID;
+
+	if (!request || !reply) {
+		goto fail;
+	}
+
+	r_buf_append_bytes (request, &cmd, 1);
+	r_buf_append_bytes (request, &index, 1);
+
+	port->frame (request);
+
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+
+	if (port->get_reply (port, cmd, reply)) {
+		goto fail;
+	}
+
+	char *s = r_buf_to_string (reply);
+	if (s) {
+		printf ("%s\n", s);
+		free (s);
+	}
+
+	r_buf_free (request);
+	r_buf_free (reply);
+
+	return 0;
+
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int gprobe_getinformation (struct gport *port) {
+	if (!port) {
+		return -1;
+	}
+	RBuffer *request = r_buf_new ();
+	RBuffer *reply = r_buf_new ();
+	const ut8 cmd = GPROBE_GET_INFORMATION;
+	const ut8 index = 0;
+
+	if (!request || !reply) {
+		goto fail;
+	}
+
+	r_buf_append_bytes (request, &cmd, 1);
+	r_buf_append_bytes (request, &index, 1);
+
+	port->frame (request);
+
+	if (port->send_request (port, request)) {
+		goto fail;
+	}
+
+	if (port->get_reply (port, cmd, reply)) {
+		goto fail;
+	}
+
+	r_print_hexdump (NULL, 0, r_buf_buffer (reply), r_buf_size (reply), 16, 1, 1);
+
+	r_buf_free (request);
+	r_buf_free (reply);
+
+	return 0;
+
+fail:
+	r_buf_free (request);
+	r_buf_free (reply);
+	return -1;
+}
+
+static int __write (RIO *io, RIODesc *fd, const ut8 *buf, int count) {
+	RIOGprobe *gprobe;
+	int res;
+	int has_written = 0;
+
+	if (!fd || !fd->data || !buf) {
+		return -1;
+	}
+
+	gprobe = (RIOGprobe *)fd->data;
+
+	if ((gprobe->offset + count) > GPROBE_SIZE) {
+		count = GPROBE_SIZE - gprobe->offset;
+	}
+
+	while (has_written < count) {
+		res = gprobe_write (&gprobe->gport, gprobe->offset, buf + has_written, count - has_written);
+		if (res <= 0) {
+			return -1;
+		}
+		gprobe->offset += res;
+		has_written += res;
+	}
+
+	return count;
+}
+
+static int __read (RIO *io, RIODesc *fd, ut8 *buf, int count) {
+	int res;
+	RIOGprobe *gprobe;
+	int has_read = 0;
+
+	if (!fd || !fd->data || !buf) {
+		return -1;
+	}
+
+	gprobe = (RIOGprobe *)fd->data;
+
+	if ((gprobe->offset + count) > GPROBE_SIZE) {
+		count = GPROBE_SIZE - gprobe->offset;
+	}
+
+	while (has_read < count) {
+		res = gprobe_read (&gprobe->gport, gprobe->offset, buf + has_read, count - has_read);
+		if (res <= 0) {
+			return -1;
+		}
+		gprobe->offset += res;
+		has_read += res;
+	}
+
+	return has_read;
+}
+
+static int __close (RIODesc *fd) {
+	RIOGprobe *gprobe;
+
+	if (!fd || !fd->data) {
+		return -1;
+	}
+	gprobe = (RIOGprobe *)fd->data;
+
+	sp_close (&gprobe->gport);
+	R_FREE (fd->data);
+
+	return 0;
+}
+
+static ut64 __lseek (RIO *io, RIODesc *fd, ut64 offset, int whence) {
+	RIOGprobe *gprobe;
+	if (!fd || !fd->data) {
+		return offset;
+	}
+	gprobe = (RIOGprobe *)fd->data;
+	switch (whence) {
+	case SEEK_SET:
+		if (offset >= GPROBE_SIZE) {
+			return gprobe->offset = GPROBE_SIZE - 1;
+		}
+		return gprobe->offset = offset;
+		break;
+	case SEEK_CUR:
+		if ((gprobe->offset + offset) >= GPROBE_SIZE) {
+			return gprobe->offset = GPROBE_SIZE - 1;
+		}
+		return gprobe->offset += offset;
+		break;
+	case SEEK_END:
+		return gprobe->offset = GPROBE_SIZE - 1;
+		break;
+	}
+	return offset;
+}
+
+static bool __plugin_open (RIO *io, const char *pathname, bool many) {
+	return pathname && r_str_startswith (pathname, "gprobe://") && strlen (pathname + strlen ("gprobe://"));
+}
+
+static RIODesc *__open (RIO *io, const char *pathname, int rw, int mode) {
+	if (__plugin_open (io, pathname, 0)) {
+		RIOGprobe *gprobe = R_NEW0 (RIOGprobe);
+
+		gprobe->offset = 0LL;
+		gprobe->gport.name = pathname + strlen ("gprobe://");
+
+		if (r_str_startswith (gprobe->gport.name, "i2c-")) {
+#if __UNIX__
+			gprobe->gport.send_request = gprobe_send_request_i2c;
+			gprobe->gport.get_reply = gprobe_get_reply_i2c;
+			gprobe->gport.frame = gprobe_frame_i2c;
+			gprobe->gport.max_tx_size = 117;
+			gprobe->gport.max_rx_size = 121;
+
+			if (i2c_open (&gprobe->gport)) {
+				R_FREE (gprobe);
+				return NULL;
+			}
+#else
+			R_FREE (gprobe);
+			return NULL;
+#endif
+		} else {
+			gprobe->gport.send_request = gprobe_send_request_sp;
+			gprobe->gport.get_reply = gprobe_get_reply_sp;
+			gprobe->gport.frame = gprobe_frame_sp;
+			gprobe->gport.max_tx_size = 248;
+			gprobe->gport.max_rx_size = 252;
+
+			if (sp_open (&gprobe->gport)) {
+				R_FREE (gprobe);
+				return NULL;
+			}
+		}
+
+		return r_io_desc_new (io, &r_io_plugin_gprobe, pathname, rw, mode, gprobe);
+	}
+
+	return NULL;
+}
+
+static char *__system (RIO *io, RIODesc *fd, const char *cmd) {
+	RIOGprobe *gprobe;
+
+	if (!fd || !fd->data) {
+		return NULL;
+	}
+	gprobe = (RIOGprobe *)fd->data;
+
+	if (!cmd[0] || cmd[0] == '?' || !strcmp (cmd, "help")) {
+		printf ("Usage: =!cmd args\n"
+			" =!reset code\n"
+			" =!debugon\n"
+			" =!debugoff\n"
+			" =!runcode address\n"
+			" =!getdeviceid\n"
+			" =!getinformation\n");
+		return NULL;
+	}
+
+	if (r_str_startswith (cmd, "reset") && (strlen (cmd) > 6)) {
+		ut32 code = (ut32)strtoul (cmd + 6, NULL, 10);
+
+		gprobe_reset (&gprobe->gport, code);
+
+		return NULL;
+	}
+
+	if (r_str_startswith (cmd, "debugon")) {
+		gprobe_debugon (&gprobe->gport);
+
+		return NULL;
+	}
+
+	if (r_str_startswith (cmd, "debugoff")) {
+		gprobe_debugoff (&gprobe->gport);
+
+		return NULL;
+	}
+
+	if (r_str_startswith (cmd, "runcode") && (strlen (cmd) > 8)) {
+		ut32 address = (ut32)strtoul (cmd + 8, NULL, 0);
+
+		gprobe_runcode (&gprobe->gport, address);
+
+		return NULL;
+	}
+
+	if (r_str_startswith (cmd, "getdeviceid")) {
+		ut8 index = 0;
+
+		while (!gprobe_getdeviceid (&gprobe->gport, index++)) {
+		};
+
+		return NULL;
+	}
+
+	if (r_str_startswith (cmd, "getinformation")) {
+		gprobe_getinformation (&gprobe->gport);
+
+		return NULL;
+	}
+
+	printf ("Try: '=!?'\n");
+
+	return NULL;
+}
+
+RIOPlugin r_io_plugin_gprobe = {
+	.name = "gprobe",
+	.desc = "open gprobe connection using gprobe://",
+	.license = "LGPL3",
+	.open = __open,
+	.close = __close,
+	.read = __read,
+	.check = __plugin_open,
+	.lseek = __lseek,
+	.write = __write,
+	.system = __system,
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_IO,
+	.data = &r_io_plugin_gprobe,
+	.version = R2_VERSION};
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_gprobe.h radare2-2.8.0+dfsg/libr/io/p/io_gprobe.h
--- radare2-2.3.0+dfsg/libr/io/p/io_gprobe.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_gprobe.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,22 @@
+#define	Timercmp(tvp, uvp, cmp)						\
+	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
+	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
+	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
+#define	Timeradd(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec >= 1000000) {			\
+			(vvp)->tv_sec++;				\
+			(vvp)->tv_usec -= 1000000;			\
+		}							\
+	} while (0)
+#define	Timersub(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec < 0) {				\
+			(vvp)->tv_sec--;				\
+			(vvp)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_ihex.c radare2-2.8.0+dfsg/libr/io/p/io_ihex.c
--- radare2-2.3.0+dfsg/libr/io/p/io_ihex.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_ihex.c	2018-08-07 14:12:36.000000000 +0000
@@ -178,10 +178,7 @@
 	}
 	Rihex *rih = fd->data;
 	memset (buf, io->Oxff, count);
-	if (r_buf_read_at (rih->rbuf, io->off, buf, count) != count) {
-		return -1; //should never happen with a sparsebuf..
-	}
-	return count;
+	return r_buf_read_at (rih->rbuf, io->off, buf, count);
 }
 
 static int __close(RIODesc *fd) {
@@ -378,7 +375,7 @@
 		if (!str) {
 			return NULL;
 		}
-		mal= R_NEW0 (Rihex);
+		mal = R_NEW0 (Rihex);
 		if (!mal) {
 			free (str);
 			return NULL;
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_r2k.c radare2-2.8.0+dfsg/libr/io/p/io_r2k.c
--- radare2-2.3.0+dfsg/libr/io/p/io_r2k.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_r2k.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* io_r2k - radare2 - LGPL - Copyright 2016 - SkUaTeR + panda */
+/* io_r2k - radare2 - LGPL - Copyright 2016-2018 - SkUaTeR + panda */
 
 #include <r_io.h>
 #include <r_lib.h>
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_r2k_linux.c radare2-2.8.0+dfsg/libr/io/p/io_r2k_linux.c
--- radare2-2.3.0+dfsg/libr/io/p/io_r2k_linux.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_r2k_linux.c	2018-08-07 14:12:36.000000000 +0000
@@ -227,23 +227,39 @@
 	int i = 0;
 	int cmd_len = cmd ? strlen (cmd) : 0;
 	const char* usage = "Usage:   \\[MprRw][lpP] [args...]";
-	const char* help_msg[] = {"\\M                      Print kernel memory map",
-				  "\\b      beid [pid]      Change r2k backend. pid is required when beid is 1. Possible beid 0: linear address; 1: process address; 2: physical address",
-				  "\\p      pid             Print process information",
-				  "\\rl     addr len        Read from linear address",
-				  "\\rp     pid addr len    Read from process address",
-				  "\\rP     addr len        Read physical address",
-				  "\\R[p]                   Print control registers. Use =!Rp for detailed description",
-				  "\\wl[x]  addr input      Write at linear address. Use =!wlx for input in hex",
-				  "\\wp[x]  pid addr input  Write at process address. Use =!wpx for input in hex",
-				  "\\wP[x]  addr input      Write at physical address. Use =!wPx for input in hex",
-				  "\\W      1|0             Honor arch write protect (1 enable WP, 0 disable WP)"};
+	const char* help_msg[] = {
+		"\\dm              Print kernel memory map (or process if r2k.io==1)",
+		"\\dr              Print control registers",
+		"\\dR              Print control registers in detailed mode",
+		"\\dp [pid]        Print current selected pid or change it",
+		"\\e r2k.io=[012]  Read/Write from 0: Linear, 1: Process, 2: Physical addresses"
+	};
+	const char *help_msg_old[] = {
+		"\\M                      Print kernel memory map",
+		"\\b      beid [pid]      Change r2k backend. pid is required when beid is 1.",
+		"                         0: linear address; 1: process address; 2: physical address",
+		"\\p      pid             Print process information",
+		"\\rl     addr len        Read from linear address",
+		"\\rp     pid addr len    Read from process address",
+		"\\rP     addr len        Read physical address",
+		"\\R[p]                   Print control registers. Use =!Rp for detailed description",
+		"\\wl[x]  addr input      Write at linear address. Use =!wlx for input in hex",
+		"\\wp[x]  pid addr input  Write at process address. Use =!wpx for input in hex",
+		"\\wP[x]  addr input      Write at physical address. Use =!wPx for input in hex",
+		"\\W      1|0             Honor arch write protect (1 enable WP, 0 disable WP)"
+	};
 	if (p_usage) {
 		io->cb_printf ("%s\n", usage);
 	}
 	for (i = 0; i < (sizeof (help_msg) / sizeof (char*)); i++) {
 		if (!cmd || !strncmp (cmd, help_msg[i]+1, cmd_len)) {
-			io->cb_printf ("%s\n",help_msg[i]);
+			io->cb_printf ("%s\n", help_msg[i]);
+		}
+	}
+	io->cb_printf ("\nOld Commands: (deprecated)\n");
+	for (i = 0; i < (sizeof (help_msg_old) / sizeof (char*)); i++) {
+		if (!cmd || !strncmp (cmd, help_msg_old[i]+1, cmd_len)) {
+			io->cb_printf ("%s\n", help_msg_old[i]);
 		}
 	}
 }
@@ -361,12 +377,10 @@
 	return ret;
 }
 
-int run_ioctl_command(RIO *io, RIODesc *iodesc, const char *buf) {
+int run_old_command(RIO *io, RIODesc *iodesc, const char *buf) {
 	int ret, inphex, ioctl_n;
 	size_t pid, addr, len;
 	ut8 *databuf = NULL;
-	buf = r_str_ichr ((char *) buf, ' ');
-
 	switch (*buf) {
 	case 'W':
 		{
@@ -549,9 +563,10 @@
 			ioctl_n = IOCTL_WRITE_PHYSICAL_ADDR;
 			break;
 		default:
-			print_help(io, "w", 0);
+			print_help (io, "w", 0);
 			goto end;
 		}
+		// coverity says this cant happen, but it doesnt hurts to add a check
 		if (!buf) {
 			break;
 		}
@@ -706,7 +721,7 @@
 			buffsize = (ut64) (sizeof (proc_data.vmareastruct) / sizeof (proc_data.vmareastruct[0]));
 			if (fflag) {
 				int j = 0;
-				for (i = 0; i < buffsize;) {
+				for (i = 0; i + 1 < buffsize;) {
 					nextstart = 0;
 					if (i + 7 < buffsize) {
 						nextstart = i + 7 + (strlen ((const char *)&(proc_data.vmareastruct[i + 7])) - 1 + sizeof (size_t)) / sizeof (size_t);
@@ -721,8 +736,10 @@
 					j += 1;
 					i = nextstart;
 				}
+				io->cb_printf ("f pid.%d.task_struct = 0x%08"PFMT64x"\n", proc_data.pid, proc_data.task);
 			} else {
 				io->cb_printf ("pid = %d\nprocess name = %s\n", proc_data.pid, proc_data.comm);
+				io->cb_printf ("task_struct = 0x%08"PFMT64x"\n", proc_data.task);
 				for (i = 0; i < buffsize;) {
 					nextstart = 0;
 					if (i + 7 < buffsize) {
@@ -732,7 +749,7 @@
 					    nextstart > 0 && nextstart - 1 < buffsize) {
 						break;
 					}
-					io->cb_printf ("%08"PFMT64x"-%08"PFMT64x" %c%c%c%c %08"PFMT64x" %02x:%02x %-8"PFMT64u"",
+					io->cb_printf ("0x%08"PFMT64x" - 0x%08"PFMT64x" %c%c%c%c 0x%08"PFMT64x" %02x:%02x %-8"PFMT64u"",
 							(ut64) proc_data.vmareastruct[i], (ut64) proc_data.vmareastruct[i+1],
 							proc_data.vmareastruct[i + 2] & VM_READ ? 'r' : '-',
 							proc_data.vmareastruct[i + 2] & VM_WRITE ? 'w' : '-',
@@ -757,4 +774,83 @@
 	return 0;
 }
 
+int run_new_command(RIO *io, RIODesc *iodesc, const char *buf) {
+	if (r_str_startswith (buf, "dm")) {
+		if (buf[2] == ' ') {
+			// use \p pid
+			char *cmd = r_str_newf ("p %d", atoi (buf + 2));
+			run_old_command (io, iodesc, cmd);
+			free (cmd);
+		} else if (r2k_struct.beid == 1) {
+			// use \p pid
+			char *cmd = r_str_newf ("p %d", r2k_struct.pid);
+			run_old_command (io, iodesc, cmd);
+			free (cmd);
+		} else {
+			// use \M
+			run_old_command (io, iodesc, "M");
+		}
+		return 1;
+	}
+	if (r_str_startswith (buf, "dr")) {
+		run_old_command (io, iodesc, "R");
+		return 1;
+	}
+	if (r_str_startswith (buf, "dR")) {
+		run_old_command (io, iodesc, "Rp");
+		return 1;
+	}
+	if (r_str_startswith (buf, "dp")) {
+		if (buf[2] == ' ') {
+			r2k_struct.pid = atoi (buf + 3);
+		} else {
+			io->cb_printf ("%d\n", r2k_struct.pid);
+		}
+		return 1;
+	}
+	if (r_str_startswith (buf, "e r2k.io")) {
+		if (strchr (buf, '?')) {
+			io->cb_printf ("0: Linear memory\n");
+			io->cb_printf ("1: Process memory\n");
+			io->cb_printf ("2: Physical memory\n");
+			return 1;
+		}
+		const char *eq = strchr (buf, '=');
+		if (eq) {
+			int v = atoi (eq + 1);
+			int p = r2k_struct.pid;
+			char *cmd = r_str_newf ("b %d %d", v, p);
+			run_old_command (io, iodesc, cmd);
+			free (cmd);
+		} else {
+			run_new_command (io, iodesc, "dp");
+		}
+		return 1;
+	}
+	if (r_str_startswith (buf, "e r2k.wp")) {
+		if (strchr (buf, '?')) {
+			io->cb_printf ("<bool> enable write protection (disabled by default)\n");
+			return 1;
+		}
+		const char *eq = strchr (buf, '=');
+		if (eq) {
+			int v = atoi (eq + 1);
+			r2k_struct.wp = (ut8)v;
+		} else {
+			io->cb_printf ("%s", r_str_bool (r2k_struct.wp));
+		}
+		return 1;
+	}
+	return 0;
+}
+
+int run_ioctl_command(RIO *io, RIODesc *iodesc, const char *buf) {
+	buf = r_str_ichr ((char *) buf, ' ');
+
+	if (!run_new_command (io, iodesc, buf)) {
+		return run_old_command (io, iodesc, buf);
+	}
+	return 0;
+}
+
 #endif
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_r2k_linux.h radare2-2.8.0+dfsg/libr/io/p/io_r2k_linux.h
--- radare2-2.3.0+dfsg/libr/io/p/io_r2k_linux.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_r2k_linux.h	2018-08-07 14:12:36.000000000 +0000
@@ -75,6 +75,7 @@
 	char comm[16];
 	size_t vmareastruct[4096];
 	size_t stack;
+	size_t task;
 };
 
 #define R2_TYPE 0x69
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_windbg.c radare2-2.8.0+dfsg/libr/io/p/io_windbg.c
--- radare2-2.3.0+dfsg/libr/io/p/io_windbg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_windbg.c	2018-08-07 14:12:36.000000000 +0000
@@ -46,7 +46,7 @@
 		eprintf ("Failed to initialize windbg context\n");
 		return NULL;
 	}
-	return r_io_desc_new (io, &r_io_plugin_windbg, file, true, mode, ctx);
+	return r_io_desc_new (io, &r_io_plugin_windbg, file, rw, mode, ctx);
 }
 
 static int __write(RIO *io, RIODesc *fd, const ut8 *buf, int count) {
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_winedbg.c radare2-2.8.0+dfsg/libr/io/p/io_winedbg.c
--- radare2-2.3.0+dfsg/libr/io/p/io_winedbg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_winedbg.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2017 - pancake */
+/* radare - LGPL - Copyright 2017-2018 - pancake */
 
 #include "r_types_base.h"
 #include "r_io.h"
@@ -9,13 +9,33 @@
 
 static RSocket *gs = NULL;
 
+R_PACKED (struct winedbg_x86_32 {
+	ut16 cs;
+	ut16 ss;
+	ut16 ds;
+	ut16 es;
+	ut16 fs;
+	ut16 gs;
+	ut32 eip;
+	ut32 esp;
+	ut32 ebp;
+	ut32 eflags;
+	ut32 eax;
+	ut32 ebx;
+	ut32 ecx;
+	ut32 edx;
+	ut32 esi;
+	ut32 edi;
+});
+
+// TODO: make it vargarg...
 static char *runcmd (const char *cmd) {
 	char buf[4096] = {0};
 	if (cmd) {
 		r_socket_printf (gs, "%s\n", cmd);
 	}
 	int timeout = 1000000;
-	char * str = NULL;
+	char *str = NULL;
 	r_socket_block_time (gs, 1, timeout);
 	while (true) {
 		memset (buf, 0, sizeof (buf));
@@ -27,6 +47,7 @@
 		}
 		str = r_str_append (str, buf);
 	}
+	free (str);
 	return NULL;
 }
 
@@ -38,16 +59,22 @@
 	ut32 *w = (ut32*)buf;
 	int i;
 	int words = count / wordSize; // XXX must pad align to 4
-	if (count % wordSize) {
-		eprintf ("Buffer is not size-aligned\n");
-		return -1;
-	}
 	for (i = 0; i < words ; i++) {
 		ut64 addr = io->off + (i * wordSize);
 		char *cmd = r_str_newf ("set *0x%"PFMT64x" = 0x%x", addr, w[i]);
 		free (runcmd (cmd));
 		free (cmd);
 	}
+
+	int left = count % wordSize;
+	if (left > 0) {
+		ut32 leftW = -1;
+		memcpy (&leftW, w + words, left);
+		ut64 addr = io->off + (words * wordSize);
+		char *cmd = r_str_newf ("set *0x%"PFMT64x" = 0x%x", addr, leftW);
+		free (runcmd (cmd));
+		free (cmd);
+	}
 	return count;
 }
 
@@ -55,6 +82,23 @@
 	if (!fd || !fd->data) {
 		return -1;
 	}
+	if (count > (1024*128)) {
+		// cannot read that much
+		return -1;
+	}
+#if 0
+// TODO: use x/${count}b for performance and solve alignment issues
+Wine-dbg>x/128b 0x7b444730
+0x7b444730 _start_process+0x10a:  cc 83 ec 08 57 56 e8 b5 fe ff ff 83 c4 04 50 e8
+0x7b444740 _start_process+0x11a:  24 2f 01 00 83 c4 0c 8b 44 24 68 83 ec 08 ff 70
+0x7b444750 _start_process+0x12a:  5c 6a fe e8 27 2f 01 00 83 c4 08 e8 34 de 01 00
+0x7b444760 _debugstr_w:  55 89 e5 83 ec 08 83 ec 08 6a ff 51 e8 45 e0 01
+0x7b444770 _debugstr_w+0x10:  00 83 c4 18 5d c3 55 89 e5 53 57 56 83 e4 f0 81
+0x7b444780 ___wine_kernel_init+0xa:  ec e0 0e 00 00 e8 00 00 00 00 5e 64 a1 18 00 00
+0x7b444790 ___wine_kernel_init+0x1a:  00 89 44 24 40 8b 40 30 89 44 24 44 8b 78 10 8b
+0x7b4447a0 ___wine_kernel_init+0x2a:  86 ca 48 1b 00 83 ec 08 31 db 53 ff 30 e8 e4 de
+Wine-dbg>
+#endif
 	int wordSize = 4;
 	ut32 *w = (ut32*)buf;
 	int i;
@@ -64,8 +108,10 @@
 		ut64 addr = io->off + (i * wordSize);
 		char *cmd = r_str_newf ("x 0x%"PFMT64x, addr);
 		char *res = runcmd (cmd);
-		sscanf (res, "%x", &w[i]);
-		free (res);
+		if (res) {
+			sscanf (res, "%x", &w[i]);
+			free (res);
+		}
 		free (cmd);
 	}
 
@@ -141,26 +187,6 @@
 	free (res);
 }
 
-R_PACKED (
-struct winedbg_x86_32 {
-	ut16 cs;
-	ut16 ss;
-	ut16 ds;
-	ut16 es;
-	ut16 fs;
-	ut16 gs;
-	ut32 eip;
-	ut32 esp;
-	ut32 ebp;
-	ut32 eflags;
-	ut32 eax;
-	ut32 ebx;
-	ut32 ecx;
-	ut32 edx;
-	ut32 esi;
-	ut32 edi;
-});
-
 static struct winedbg_x86_32 regState() {
 	struct winedbg_x86_32 r = {0};
 	char *res = runcmd ("info reg");
@@ -261,10 +287,28 @@
 "flg	rf	.1	.202	0\n"\
 "flg	vm	.1	.203	0\n";
 		return strdup (msg);
+	} else if (!strncmp (cmd, "dr*", 2)) {
+		struct winedbg_x86_32 r = regState ();
+		io->cb_printf ("f eip = 0x%08x\n", r.eip);
+		io->cb_printf ("f esp = 0x%08x\n", r.esp);
+		io->cb_printf ("f ebp = 0x%08x\n", r.ebp);
+		io->cb_printf ("f eax = 0x%08x\n", r.eax);
+		io->cb_printf ("f ebx = 0x%08x\n", r.ebx);
+		io->cb_printf ("f ecx = 0x%08x\n", r.ecx);
+		io->cb_printf ("f edx = 0x%08x\n", r.edx);
+		io->cb_printf ("f esi = 0x%08x\n", r.esi);
+		io->cb_printf ("f edi = 0x%08x\n", r.edi);
+		io->cb_printf ("f eflags = 0x%08x\n", r.eflags);
+		io->cb_printf ("f cs = 0x%08x\n", r.cs);
+		io->cb_printf ("f ss = 0x%08x\n", r.ss);
+		io->cb_printf ("f ds = 0x%08x\n", r.ds);
+		io->cb_printf ("f es = 0x%08x\n", r.es);
+		io->cb_printf ("f fs = 0x%08x\n", r.fs);
+		io->cb_printf ("f gs = 0x%08x\n", r.gs);
 	} else if (!strncmp (cmd, "dr", 2)) {
 		printcmd (io, "info reg");
 	} else if (!strncmp (cmd, "db ", 3)) {
-		free (runcmd (sdb_fmt (0, "break *%"PFMT64x, r_num_get (NULL, cmd + 3) || io->off)));
+		free (runcmd (sdb_fmt ("break *%"PFMT64x, r_num_get (NULL, cmd + 3) || io->off)));
 	} else if (!strncmp (cmd, "ds", 2)) {
 		free (runcmd ("stepi"));
 	} else if (!strncmp (cmd, "dc", 2)) {
@@ -294,7 +338,7 @@
 					sscanf (ptr, "%08"PFMT64x" %08"PFMT64x, &from, &to);
 				}
 				char *row = r_str_newf ("0x%08"PFMT64x" - 0x%08" PFMT64x" %s %s\n", from, to, perm, "");
-				ptr = nl + 1;
+				ptr = nl;
 				res = r_str_append (res, row);
 				free (row);
 			}
diff -Nru radare2-2.3.0+dfsg/libr/io/p/io_zip.c radare2-2.8.0+dfsg/libr/io/p/io_zip.c
--- radare2-2.3.0+dfsg/libr/io/p/io_zip.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/io_zip.c	2018-08-07 14:12:36.000000000 +0000
@@ -391,7 +391,7 @@
 							const char *slash = r_str_rchr (name, bin_name, '/');
 							if (slash) {
 								bin_name = r_str_ndup (slash + 1, (bin_name - slash) -1);
-								char *chkstr = r_str_newf ("Payload/%s.app/%s", bin_name);
+								char *chkstr = r_str_newf ("Payload/%s.app/%s", bin_name, bin_name);
 								if (!strcmp (name, chkstr)) {
 									zip_filename = r_str_newf ("//%s", chkstr);
 									free (chkstr);
diff -Nru radare2-2.3.0+dfsg/libr/io/p/Makefile radare2-2.8.0+dfsg/libr/io/p/Makefile
--- radare2-2.3.0+dfsg/libr/io/p/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -15,7 +15,7 @@
 all: ${ALL_TARGETS}
 
 ALL_TARGETS=
-PLUGINS=ptrace.mk debug.mk gdb.mk malloc.mk shm.mk mach.mk w32dbg.mk procpid.mk windbg.mk bochs.mk qnx.mk r2k.mk ar.mk rbuf.mk
+PLUGINS=ptrace.mk debug.mk gdb.mk malloc.mk shm.mk mach.mk w32dbg.mk procpid.mk windbg.mk bochs.mk qnx.mk r2k.mk ar.mk rbuf.mk gprobe.mk
 #zip.mk
 #PLUGINS=ptrace.mk debug.mk gdb.mk malloc.mk mach.mk w32dbg.mk procpid.mk
 include ${PLUGINS}
diff -Nru radare2-2.3.0+dfsg/libr/io/p_cache.c radare2-2.8.0+dfsg/libr/io/p_cache.c
--- radare2-2.3.0+dfsg/libr/io/p_cache.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/p_cache.c	2018-08-07 14:12:36.000000000 +0000
@@ -155,6 +155,7 @@
 		// get an existing desc-cache, if it exists
 		if (!(cache = (RIODescCache *)(size_t)sdb_num_get (desc->cache, k, NULL))) {	
 			amount += (R_IO_DESC_CACHE_SIZE - cbaddr);
+			ptr += (R_IO_DESC_CACHE_SIZE - cbaddr);
 			goto beach;
 		}
 		if ((len - amount) > (R_IO_DESC_CACHE_SIZE - cbaddr)) {
@@ -261,12 +262,13 @@
 	RIOCache *c;
 	RListIter *iter;
 	r_list_foreach (writes, iter, c) {
-		c->odata = calloc (1, R_ITV_SIZE (c));
+		const ut64 itvSize = r_itv_size (c->itv);
+		c->odata = calloc (1, itvSize);
 		if (!c->odata) {
 			r_list_free (writes);
 			return NULL;
 		}
-		r_io_pread_at (desc->io, R_ITV_BEGIN (c), c->odata, R_ITV_SIZE (c));
+		r_io_pread_at (desc->io, r_itv_begin (c->itv), c->odata, itvSize);
 	}
 	desc->io->p_cache = true;
 	desc->io->desc = current;
diff -Nru radare2-2.3.0+dfsg/libr/io/plugin.c radare2-2.8.0+dfsg/libr/io/plugin.c
--- radare2-2.3.0+dfsg/libr/io/plugin.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/plugin.c	2018-08-07 14:12:36.000000000 +0000
@@ -109,8 +109,8 @@
 		str[2] = plugin->isdbg ? 'd' : '_';
 		str[3] = 0;
 
-		io->cb_printf ("{\"Permissions\":\"%s\",\"Name\":\"%s\",\"Description\":\"%s\",\"License\":\"%s\"",
-				str, plugin->name,
+		io->cb_printf ("%s{\"Permissions\":\"%s\",\"Name\":\"%s\",\"Description\":\"%s\",\"License\":\"%s\"",
+				n? "," : "", str, plugin->name,
 			plugin->desc, plugin->license);
 		if (plugin->version) {
 			io->cb_printf (",\"version\":\"%s\"", plugin->version);
@@ -124,3 +124,37 @@
 	io->cb_printf("]}");
 	return n;
 }
+
+R_API int r_io_plugin_read(RIODesc *desc, ut8 *buf, int len) {
+	if (!buf || !desc || !desc->plugin || len < 1 || !(desc->flags & R_IO_READ)) {
+		return 0;
+	}
+	if (!desc->plugin->read) {
+		return -1;
+	}
+	return desc->plugin->read (desc->io, desc, buf, len);
+}
+
+R_API int r_io_plugin_write(RIODesc *desc, const ut8 *buf, int len) {
+	if (!buf || !desc || !desc->plugin || len < 1 || !(desc->flags & R_IO_WRITE)) {
+		return 0;
+	}
+	if (!desc->plugin->write) {
+		return -1;
+	}
+	return desc->plugin->write (desc->io, desc, buf, len);
+}
+
+R_API int r_io_plugin_read_at(RIODesc *desc, ut64 addr, ut8 *buf, int len) {
+	if (r_io_desc_seek (desc, addr, R_IO_SEEK_SET)  == addr) {
+		return r_io_plugin_read (desc, buf, len);
+	}
+	return 0;
+}
+
+R_API int r_io_plugin_write_at(RIODesc *desc, ut64 addr, const ut8 *buf, int len) {
+	if (r_io_desc_seek (desc, addr, R_IO_SEEK_SET)  == addr) {
+		return r_io_plugin_write (desc, buf, len);
+	}
+	return 0;
+}
diff -Nru radare2-2.3.0+dfsg/libr/io/section.c radare2-2.8.0+dfsg/libr/io/section.c
--- radare2-2.3.0+dfsg/libr/io/section.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/io/section.c	2018-08-07 14:12:36.000000000 +0000
@@ -20,7 +20,9 @@
 		if (!io->sections) {
 			io->sections = ls_newf (section_free);
 		}
-		io->sec_ids = r_id_pool_new (0, UT32_MAX);
+		if (!io->sec_ids) {
+			io->sec_ids = r_id_pool_new (0, UT32_MAX);
+		}
 	}
 }
 
@@ -123,6 +125,7 @@
 	if (!io || !io->sections) {
 		return NULL;
 	}
+	// O(n) -> we can use the r_id api to resolve s from bin_id
 	ls_foreach (io->sections, iter, s) {
 		if (s->bin_id == bin_id) {
 			if (!ret) {
@@ -135,20 +138,20 @@
 }
 
 R_API bool r_io_section_bin_rm(RIO *io, ut32 bin_id) {
-	RIOSection *s;
-	SdbListIter *iter, *niter;
-	int length;
 	if (!io || !io->sections || !io->sections->head || !io->sec_ids) {
 		return false;
 	}
-	length = ls_length (io->sections);
+	bool has_changed = false;
+	RIOSection *s;
+	SdbListIter *iter, *niter;
 	ls_foreach_safe (io->sections, iter, niter, s) {
 		if (s->bin_id == bin_id) {
 			r_id_pool_kick_id (io->sec_ids, s->id);
 			ls_delete (io->sections, iter);
+			has_changed = true;
 		}
 	}
-	return length != ls_length (io->sections);
+	return has_changed;
 }
 
 R_API RIOSection *r_io_section_get_name(RIO *io, const char *name) {
@@ -166,8 +169,6 @@
 }
 
 R_API void r_io_section_cleanup(RIO *io) {
-	SdbListIter *iter, *ator;
-	RIOSection *s;
 	if (!io || !io->sections || !io->sec_ids) {
 		return;
 	}
@@ -176,6 +177,8 @@
 		r_io_section_init (io);
 		return;
 	}
+	RIOSection *s;
+	SdbListIter *iter, *ator;
 	ls_foreach_safe (io->sections, iter, ator, s) {
 		if (!s) {
 			ls_delete (io->sections, iter);
@@ -218,6 +221,7 @@
 	if (!io || !io->sections) {
 		return NULL;
 	}
+	// O(n)
 	ls_foreach (io->sections, iter, s) {
 		if (vaddr >= s->vaddr && vaddr < (s->vaddr + s->vsize)) {
 			if (!ret) {
@@ -230,18 +234,18 @@
 }
 
 R_API RIOSection* r_io_section_vget(RIO *io, ut64 vaddr) {
-	if (io) {
-		SdbList *sects = r_io_sections_vget (io, vaddr);
-		RIOSection *ret = NULL;
-		if (sects) {
-			if (ls_length (sects)) {
-				ret = ls_pop (sects);
-			}
+	if (!io) {
+		return NULL;
+	}
+	SdbList *sects = r_io_sections_vget (io, vaddr);
+	RIOSection *ret = NULL;
+	if (sects) {
+		if (!ls_empty (sects)) {
+			ret = ls_pop (sects);
 		}
-		ls_free (sects);
-		return ret;
 	}
-	return NULL;
+	ls_free (sects);
+	return ret;
 }
 
 R_API RIOSection* r_io_section_get(RIO *io, ut64 vaddr) {
@@ -249,7 +253,7 @@
 		SdbList *sects = r_io_sections_get (io, vaddr);
 		RIOSection *ret = NULL;
 		if (sects) {
-			if (ls_length (sects)) {
+			if (!ls_empty (sects)) {
 				ret = ls_pop (sects);
 			}
 		}
@@ -264,7 +268,7 @@
 		SdbList *sects = r_io_sections_vget (io, paddr);
 		ut64 ret = UT64_MAX;
 		if (sects) {
-			if (ls_length (sects)) {
+			if (!ls_empty (sects)) {
 				RIOSection *s = ls_pop (sects);
 				ret = s->vaddr;
 			}
@@ -280,7 +284,7 @@
 		SdbList *sects = r_io_sections_get (io, paddr);
 		ut64 ret = UT64_MAX;
 		if (sects) {
-			if (ls_length (sects)) {
+			if (!ls_empty (sects)) {
 				RIOSection *s = ls_pop (sects);
 				ret = s->paddr;
 			}
@@ -306,22 +310,17 @@
 }
 
 R_API const char *r_io_section_get_archbits(RIO *io, ut64 vaddr, int *bits) {
-	//cache section so we avoid making so many looks up
-	// this may crash if we remove this section, we need a way to invalidate this cache
-	static RIOSection *s = NULL;
-	if (!s || (vaddr < s->vaddr) || (s->vaddr + s->vsize < vaddr)) {
-		s = r_io_section_vget (io, vaddr);
+	if (!io) {
+		return NULL;
 	}
+	RIOSection *s = r_io_section_vget (io, vaddr);
 	if (!s || !s->arch || !s->bits) {
 		return NULL;
 	}
-	if (s) {
-		if (bits) {
-			*bits = s->bits;
-		}
-		return r_sys_arch_str (s->arch);
+	if (bits) {
+		*bits = s->bits;
 	}
-	return NULL;
+	return r_sys_arch_str (s->arch);
 }
 
 R_API int r_io_section_bin_set_archbits(RIO *io, ut32 bin_id, const char *arch, int bits) {
@@ -393,36 +392,28 @@
 	return true;
 }
 
-
-
 static bool _section_apply_for_anal_patch(RIO *io, RIOSection *sec, bool patch) {
-	ut64 at;
 	if (sec->vsize > sec->size) {
 		// in that case, we just have to allocate some memory of the size (vsize-size)
 		if (!sec->memmap) {
 			// offset,where the memory should be mapped to
-			at = sec->vaddr + sec->size;
+			ut64 at = sec->vaddr + sec->size;
 			// TODO: harden this, handle mapslit
 			// craft the uri for the null-fd
-			if (!r_io_create_mem_map (io, sec, at, true, false)) {
-				return false;
-			}
+			if (r_io_create_mem_map (io, sec, at, true, false)) {
 			// we need to create this map for transfering the flags, no real remapping here
-			if (!r_io_create_file_map (io, sec, sec->size, patch, false)) {
-				return false;
+				if (r_io_create_file_map (io, sec, sec->size, patch, false)) {
+					return true;
+				}
 			}
-			return true;
-		} else {
-			// the section is already applied
-			return false;
 		}
 	} else {
 		// same as above
 		if (!sec->filemap && r_io_create_file_map (io, sec, sec->vsize, patch, false)) {
 			return true;
 		}
-		return false;
 	}
+	return false;
 }
 
 static bool _section_apply_for_emul(RIO *io, RIOSection *sec) {
@@ -505,7 +496,8 @@
 		ls_foreach (io->maps, iter, map) {
 			if (map->id == sec->memmap) {
 				desc = r_io_desc_get (io, map->fd);
-				if (desc && desc->plugin && desc->plugin->close) {	//we can't use r_io_desc_close here, bc it breaks the section-list
+				// we can't use r_io_desc_close here, bc it breaks the section-list
+				if (desc && desc->plugin && desc->plugin->close) {
 					desc->plugin->close (desc);
 					r_io_desc_del (io, map->fd);
 				}
diff -Nru radare2-2.3.0+dfsg/libr/lang/lang.c radare2-2.8.0+dfsg/libr/lang/lang.c
--- radare2-2.3.0+dfsg/libr/lang/lang.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/lang/lang.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_lang.h>
 #include <r_util.h>
@@ -8,14 +8,12 @@
 #include "p/pipe.c"  // hardcoded
 #include "p/vala.c"  // hardcoded
 #include "p/rust.c"  // hardcoded
+#include "p/zig.c"   // hardcoded
 #include "p/c.c"     // hardcoded
 #include "p/lib.c"
 #if __UNIX__
 #include "p/cpipe.c" // hardcoded
 #endif
-#ifdef _MSC_VER
-#define strcasecmp stricmp
-#endif
 
 static RLang *__lang = NULL;
 
@@ -50,6 +48,7 @@
 #endif
 	r_lang_add (lang, &r_lang_plugin_vala);
 	r_lang_add (lang, &r_lang_plugin_rust);
+	r_lang_add (lang, &r_lang_plugin_zig);
 	r_lang_add (lang, &r_lang_plugin_pipe);
 	r_lang_add (lang, &r_lang_plugin_lib);
 
@@ -81,7 +80,7 @@
 	RLangDef *def;
 	RListIter *iter;
 	r_list_foreach (lang->defs, iter, def) {
-		if (!strcasecmp (name, def->name)) {
+		if (!r_str_casecmp (name, def->name)) {
 			def->value = value;
 			return  true;
 		}
@@ -109,7 +108,7 @@
 		RListIter *iter;
 		/* No _safe loop necessary because we return immediately after the delete. */
 		r_list_foreach (lang->defs, iter, def) {
-			if (!name || !strcasecmp (name, def->name)) {
+			if (!name || !r_str_casecmp (name, def->name)) {
 				r_list_delete (lang->defs, iter);
 				break;
 			}
@@ -160,7 +159,7 @@
 	const char *p = r_str_lchr (ext, '.');
 	if (p) ext = p + 1;
 	r_list_foreach (lang->langs, iter, h) {
-		if (!strcasecmp (h->ext, ext)) {
+		if (!r_str_casecmp (h->ext, ext)) {
 			return h;
 		}
 	}
@@ -171,10 +170,10 @@
 	RListIter *iter;
 	RLangPlugin *h;
 	r_list_foreach (lang->langs, iter, h) {
-		if (!strcasecmp (h->name, name)) {
+		if (!r_str_casecmp (h->name, name)) {
 			return h;
 		}
-		if (h->alias && !strcasecmp (h->alias, name)) {
+		if (h->alias && !r_str_casecmp (h->alias, name)) {
 			return h;
 		}
 	}
diff -Nru radare2-2.3.0+dfsg/libr/lang/meson.build radare2-2.8.0+dfsg/libr/lang/meson.build
--- radare2-2.3.0+dfsg/libr/lang/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/lang/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,16 +1,36 @@
-files=[
-'lang.c',
-'p/c.c',
-# 'p/cpipe.c',
-'p/lib.c',
-'p/pipe.c',
-'p/rust.c',
-'p/vala.c'
+files = [
+  'lang.c',
+  # included in lang.c
+  #'p/c.c',
+  #'p/cpipe.c',
+  #'p/lib.c',
+  #'p/pipe.c',
+  #'p/rust.c',
+  #'p/vala.c'
+  #'p/zig.c',
 ]
 
 r_lang = library('r_lang', files,
   include_directories: [platform_inc],
-  c_args: ['-DCORELIB'],
-  link_with: [r_util, r_cons],
-  install: true
+  c_args: ['-DCORELIB=1'],
+  dependencies: [r_util_dep, r_cons_dep],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_lang_dep = declare_dependency(link_with: r_lang,
+                                include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_lang],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_lang',
+  filebase: 'r_lang',
+  requires: [
+    'r_util',
+    'r_cons'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/lang/p/cpipe.c radare2-2.8.0+dfsg/libr/lang/p/cpipe.c
--- radare2-2.3.0+dfsg/libr/lang/p/cpipe.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/lang/p/cpipe.c	2018-08-07 14:12:36.000000000 +0000
@@ -73,7 +73,7 @@
 	return true;
 }
 
-static struct r_lang_plugin_t r_lang_plugin_cpipe = {
+static RLangPlugin r_lang_plugin_cpipe = {
 	.name = "cpipe",
 	.ext = "c2",
 	.desc = "C r2pipe scripting",
diff -Nru radare2-2.3.0+dfsg/libr/lang/p/pipe.c radare2-2.8.0+dfsg/libr/lang/p/pipe.c
--- radare2-2.3.0+dfsg/libr/lang/p/pipe.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/lang/p/pipe.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2015 pancake */
+/* radare2 - LGPL - Copyright 2015-2018 pancake */
 
 #include "r_lib.h"
 #include "r_core.h"
@@ -29,10 +29,12 @@
 	//CloseHandle (piProcInfo.hThread);
 	return bSuccess? piProcInfo.hProcess: NULL;
 }
+
 static BOOL bStopPipeLoop = FALSE;
 static HANDLE hPipeInOut = NULL;
 static HANDLE hproc = NULL;
 #define PIPE_BUF_SIZE 4096
+
 static DWORD WINAPI WaitForProcThread(LPVOID lParam) {
 	WaitForSingleObject(hproc, INFINITE);
 	bStopPipeLoop = TRUE;
@@ -56,9 +58,10 @@
 		}
 		memset (buf, 0, PIPE_BUF_SIZE);
 		bSuccess = ReadFile (hPipeInOut, buf, PIPE_BUF_SIZE, &dwRead, NULL);
-		if (bStopPipeLoop)
+		if (bStopPipeLoop) {
 			break;
-		if (bSuccess && dwRead>0) {
+		}
+		if (bSuccess && dwRead > 0) {
 			buf[sizeof (buf)-1] = 0;
 			char *res = lang->cmd_str ((RCore*)lang->user, buf);
 			if (res) {
@@ -89,7 +92,7 @@
 				WriteFile (hPipeInOut, "", 1, &dwWritten, NULL);
 			}
 		}
-	} while(!bStopPipeLoop);
+	} while (!bStopPipeLoop);
 	r_cons_break_pop ();
 }
 #else
@@ -139,7 +142,7 @@
 				break;
 			}
 			memset (buf, 0, sizeof (buf));
-			ret = read (output[0], buf, sizeof (buf)-1);
+			ret = read (output[0], buf, sizeof (buf) - 1);
 			if (ret < 1 || !buf[0]) {
 				break;
 			}
@@ -147,7 +150,7 @@
 			res = lang->cmd_str ((RCore*)lang->user, buf);
 			//eprintf ("%d %s\n", ret, buf);
 			if (res) {
-				write (input[1], res, strlen (res)+1);
+				write (input[1], res, strlen (res) + 1);
 				free (res);
 			} else {
 				eprintf ("r_lang_pipe: NULL reply for (%s)\n", buf);
@@ -209,7 +212,7 @@
 #endif
 }
 
-static struct r_lang_plugin_t r_lang_plugin_pipe = {
+static RLangPlugin r_lang_plugin_pipe = {
 	.name = "pipe",
 	.ext = "pipe",
 	.license = "LGPL",
diff -Nru radare2-2.3.0+dfsg/libr/lang/p/vala.c radare2-2.8.0+dfsg/libr/lang/p/vala.c
--- radare2-2.3.0+dfsg/libr/lang/p/vala.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/lang/p/vala.c	2018-08-07 14:12:36.000000000 +0000
@@ -124,7 +124,7 @@
 	return false;
 }
 
-static struct r_lang_plugin_t r_lang_plugin_vala = {
+static RLangPlugin r_lang_plugin_vala = {
 	.name = "vala",
 	.ext = "vala",
 	.license = "LGPL",
diff -Nru radare2-2.3.0+dfsg/libr/lang/p/zig.c radare2-2.8.0+dfsg/libr/lang/p/zig.c
--- radare2-2.3.0+dfsg/libr/lang/p/zig.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/lang/p/zig.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,108 @@
+/* radare - LGPL - Copyright 2018 pancake */
+
+#include <r_lib.h>
+#include <r_core.h>
+#include <r_lang.h>
+
+static int lang_zig_file(RLang *lang, const char *file) {
+	void *lib;
+	char *a, *cc, *p;
+	const char *libpath, *libname;
+
+	if (!r_file_exists (file)) {
+		eprintf ("file not found (%s)\n", file);
+		return false;
+	}
+	char *name = strdup (file);
+
+	a = (char*)r_str_lchr (name, '/');
+	if (a) {
+		*a = 0;
+		libpath = name;
+		libname = a+1;
+	} else {
+		libpath = ".";
+		libname = name;
+	}
+	p = strstr (name, ".zig");
+	if (p) {
+		*p = 0;
+	}
+	cc = r_sys_getenv ("ZIG");
+	if (cc && !*cc) {
+		R_FREE (cc);
+	}
+	if (!cc) {
+		cc = strdup ("zig");
+	}
+	char *cmd = r_str_newf ("zig build-lib --output %s.%s --release-fast %s.zig --library r_core", name, R_LIB_EXT, name);
+	if (r_sandbox_system (cmd, 1) != 0) {
+		free (name);
+		free (cmd);
+		return false;
+	}
+	free (cmd);
+
+	char *path = r_str_newf ("%s/%s.%s", libpath, libname, R_LIB_EXT);
+	lib = r_lib_dl_open (path);
+	if (lib) {
+		void (*fcn)(RCore *);
+		fcn = r_lib_dl_sym (lib, "entry");
+		if (fcn) {
+			fcn (lang->user);
+		} else {
+			eprintf ("Cannot find 'entry' symbol in library\n");
+		}
+		r_lib_dl_close (lib);
+	} else {
+		eprintf ("Cannot open library\n");
+		free (path);
+		return false;
+	}
+	r_file_rm (path); // remove lib
+	free (path);
+	return true;
+}
+
+static int lang_zig_init(void *user) {
+	// TODO: check if "valac" is found in path
+	return true;
+}
+
+static int lang_zig_run(RLang *lang, const char *code, int len) {
+	const char *file = "_tmp.zig";
+	FILE *fd = fopen (file, "w");
+	if (fd) {
+		const char *zig_header = \
+"extern fn puts(&const u8) void;\n" \
+"extern fn r_core_cmd_str(&u8, &const u8) &u8;\n" \
+"extern fn r_core_new() &u8;\n" \
+"extern fn r_core_free(&u8) void;\n" \
+"\n" \
+"export fn entry(core: &u8) void {\n";
+		const char *zig_footer = \
+"\n}\n" \
+"pub fn r2cmd(core: &u8, cmd: u8) &u8 {\n" \
+"  return r_core_cmd_str(core, cmd);\n" \
+"}\n";
+		fputs (zig_header, fd);
+		fputs (code, fd);
+		fputs (zig_footer, fd);
+		fclose (fd);
+		lang_zig_file (lang, file);
+		r_file_rm (file);
+	} else {
+		eprintf ("Cannot open %s\n", file);
+	}
+	return true;
+}
+
+static RLangPlugin r_lang_plugin_zig = {
+	.name = "zig",
+	.ext = "zig",
+	.license = "MIT",
+	.desc = "Zig language extension",
+	.run = lang_zig_run,
+	.init = (void*)lang_zig_init,
+	.run_file = (void*)lang_zig_file,
+};
diff -Nru radare2-2.3.0+dfsg/libr/ld.script radare2-2.8.0+dfsg/libr/ld.script
--- radare2-2.3.0+dfsg/libr/ld.script	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/ld.script	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,6 @@
+_ {
+	global:
+		r_*;
+	local:
+		*;
+};
diff -Nru radare2-2.3.0+dfsg/libr/magic/d/default/mach radare2-2.8.0+dfsg/libr/magic/d/default/mach
--- radare2-2.3.0+dfsg/libr/magic/d/default/mach	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/magic/d/default/mach	2018-08-07 14:12:36.000000000 +0000
@@ -21,3 +21,5 @@
 >8	byte	0x00	Java CLASS
 >8	byte	!0x00	Fat-Mach-O
 
+
+0	lelong&0xffffffff	0xc00cdefa	MacOS Deteched Code Signature
diff -Nru radare2-2.3.0+dfsg/libr/magic/d/meson.build radare2-2.8.0+dfsg/libr/magic/d/meson.build
--- radare2-2.3.0+dfsg/libr/magic/d/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/magic/d/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,4 @@
+install_subdir('default',
+  install_dir: join_paths(get_option('prefix'), r2_sdb, 'magic'),
+  strip_directory: true
+)
diff -Nru radare2-2.3.0+dfsg/libr/magic/deps.mk radare2-2.8.0+dfsg/libr/magic/deps.mk
--- radare2-2.3.0+dfsg/libr/magic/deps.mk	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/magic/deps.mk	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,4 @@
+ifeq (${USE_LIB_MAGIC},1)
+LDFLAGS+=-lmagic
+endif
+
diff -Nru radare2-2.3.0+dfsg/libr/magic/magic.c radare2-2.8.0+dfsg/libr/magic/magic.c
--- radare2-2.3.0+dfsg/libr/magic/magic.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/magic/magic.c	2018-08-07 14:12:36.000000000 +0000
@@ -39,14 +39,14 @@
 #define MAXPATHLEN 255
 #endif
 
+R_LIB_VERSION (r_magic);
+
 #if USE_LIB_MAGIC
 #include <magic.h>
 #define RMagic void
 #undef R_API
 #define R_API
 
-R_LIB_VERSION (r_magic);
-
 R_API RMagic* r_magic_new(int flags) {
 	return magic_open (flags);
 }
@@ -264,8 +264,6 @@
 
 /* API */
 
-R_LIB_VERSION (r_magic);
-
 // TODO: reinitialize all the time
 R_API RMagic* r_magic_new(int flags) {
 	RMagic *ms = R_NEW0 (RMagic);
diff -Nru radare2-2.3.0+dfsg/libr/magic/Makefile radare2-2.8.0+dfsg/libr/magic/Makefile
--- radare2-2.3.0+dfsg/libr/magic/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/magic/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -5,11 +5,10 @@
 DEPS=r_util
 PCLIBS=@LIBMAGIC@
 CFLAGS+=-I.
-ifeq (${USE_LIB_MAGIC},1)
-LDFLAGS+=-lmagic
-endif
 OBJS=apprentice.o ascmagic.o fsmagic.o funcs.o is_tar.o magic.o softmagic.o
 
+include deps.mk
+
 include $(LTOP)/rules.mk
 
 libfile.a:
diff -Nru radare2-2.3.0+dfsg/libr/magic/meson.build radare2-2.8.0+dfsg/libr/magic/meson.build
--- radare2-2.3.0+dfsg/libr/magic/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/magic/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,16 +1,42 @@
-files=[
-'apprentice.c',
-'ascmagic.c',
-'fsmagic.c',
-'funcs.c',
-'is_tar.c',
-'magic.c',
-# XXX not used? 'print.c',
-'softmagic.c'
+files = [
+  'apprentice.c',
+  'ascmagic.c',
+  'fsmagic.c',
+  'funcs.c',
+  'is_tar.c',
+  'magic.c',
+  # XXX not used? 'print.c',
+  'softmagic.c'
 ]
-r_magic = library('r_magic', files,
-  include_directories: [platform_inc],
-  c_args: ['-DCORELIB'],
-  link_with: [r_util],
-  install: true
-)
+
+if use_syslib_magic
+  message('Use system-provided magic library')
+  r_magic_dep = sys_magic
+  pkgconfig_magic_requires = []
+else
+  message('Use bundled magic library')
+  r_magic = library('r_magic', files,
+                    include_directories: platform_inc,
+                    c_args: ['-DCORELIB=1'],
+                    dependencies: [r_util_dep],
+                    install: true,
+                    implicit_include_directories: false,
+                    soversion: r2_libversion
+                   )
+
+  r_magic_dep = declare_dependency(link_with: r_magic,
+                                   include_directories: platform_inc)
+
+  pkgconfig_mod.generate(
+    libraries: [r_magic],
+    subdirs: 'libr',
+    version: r2_version,
+    name: 'r_magic',
+    filebase: 'r_magic',
+    requires: [
+      'r_util'
+    ],
+    description: 'radare foundation libraries'
+  )
+  pkgconfig_magic_requires = ['r_magic']
+endif
diff -Nru radare2-2.3.0+dfsg/libr/Makefile radare2-2.8.0+dfsg/libr/Makefile
--- radare2-2.3.0+dfsg/libr/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -3,9 +3,11 @@
 include ../config-user.mk
 include ../mk/platform.mk
 include ../mk/${COMPILER}.mk
+include ${SHLR}/zip/deps.mk
 
 DESTDIR:=$(DESTDIR)
 PREFIX?=${PWD}/../prefix
+OBJCOPY?=objcopy
 
 S=$
 B=`
@@ -32,22 +34,87 @@
 	$(MAKE) $(LIBS5)
 	$(MAKE) $(LIBS6)
 	$(MAKE) $(LIBS7)
-ifeq (${WITHNONPIC},1)
+ifeq ($(WITH_LIBR),1)
 	$(MAKE) libr.${EXT_AR}
+	$(MAKE) libr.${EXT_SO}
 endif
 
-libr.${EXT_SO}:
-	rm -rf .libr/tcc # WHY
-	$(CC) $(LDFLAGS) -shared -dynamic -arch arm64 -o libr.${EXT_SO} .libr/*/*.o ../shlr/gdb/lib/libgdbr.a
+ifeq ($(WITH_LIBR),1)
+
+ifeq ($(OSTYPE),darwin)
+MLFLAGS+=-install_name @rpath/libr2.dylib
+endif
+ifeq ($(OSTYPE),ios)
+MLFLAGS+=-install_name @rpath/libr2.dylib
+MLFLAGS+=-fembed-bitcode
+endif
+LDFLAGS+=${SSL_LDFLAGS}
+# XXX version-script only works with shlib as output
+#ifeq ($(OSTYPE),linux)
+#PLFLAGS+=--version-script ./ld.script
+#endif
+# from env: ALFLAGS+=$(ALFLAGS)
 
-libr.${EXT_AR}: $(wildcard */libr_*.${EXT_AR}) $(shell find ../shlr -name '*.${EXT_AR}')
+.libr: $(wildcard */libr_*.${EXT_AR}) ../shlr/libr_shlr.${EXT_AR}
 	rm -rf .libr
-	mkdir .libr
+	mkdir -p .libr
 	for LIB in $^ ; do \
-		${PARTIALLD} -o .libr/$$(basename $${LIB} .a).o $${LIB} ; \
+		${PARTIALLD} $(ALFLAGS) $(MLFLAGS) $(PLFLAGS) -o .libr/$$(basename $${LIB} .a).o $${LIB} ; \
 	done
+ifeq ($(OSTYPE),linux)
+	for LIB in .libr/* ; do $(OBJCOPY) --localize-hidden $$LIB ; done
+endif
+ifeq ($(OSTYPE),gnulinux)
+	for LIB in .libr/* ; do $(OBJCOPY) --localize-hidden $$LIB ; done
+endif
+ifeq ($(OSTYPE),android)
+	for LIB in .libr/* ; do $(OBJCOPY) --localize-hidden $$LIB ; done
+endif
+ifeq ($(OSTYPE),bsd)
+	for LIB in .libr/* ; do $(OBJCOPY) --localize-hidden $$LIB ; done
+endif
+
+libr.${EXT_AR}: .libr
 	${AR} crs $@ .libr/*.o
 
+E+=../shlr/ar/libr_ar.${EXT_AR}
+E+=../shlr/grub/libgrubfs.${EXT_AR}
+E+=../shlr/windbg/libr_windbg.${EXT_AR}
+E+=../shlr/qnx/lib/libqnxr.${EXT_AR}
+E+=../shlr/bochs/lib/libbochs.${EXT_AR}
+#ifeq ($(COMPILER),ios-sdk)
+#E+=../shlr/sdb/src/libsdb.${EXT_AR}
+#endif
+#ifneq ($(OSTYPE),android)
+#E+=../shlr/sdb/src/libsdb.${EXT_AR}
+#endif
+
+ifeq ($(USE_CAPSTONE),1)
+E+=$(CAPSTONE_LDFLAGS)
+else
+E+=../shlr/capstone/libcapstone.${EXT_AR}
+endif
+
+libr.${EXT_SO}: .libr
+	$(CC) -fvisibility=hidden $(MLFLAGS) ${LINK} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -dynamiclib -o libr.${EXT_SO}  \
+		.libr/*.o \
+		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
+		../shlr/libr_shlr.${EXT_AR} $(E)
+
+else
+
+# WITH_LIBR=0
+
+libr.${EXT_SO}:
+	$(MAKE) libr.${EXT_SO} WITH_LIBR=1
+
+libr.${EXT_AR}:
+	$(MAKE) libr.${EXT_AR} WITH_LIBR=1
+endif
+
+../shlr/libr_shlr.${EXT_AR}:
+	$(MAKE) -C ../shlr libr_shlr.${EXT_AR}
+
 $(LIBS):
 	@echo "DIR $@"
 	@$(MAKE) -C $@
@@ -108,12 +175,15 @@
 	# TODO :Use INSTALL_DATA_DIR instead of mkdir
 	# libraries
 	@${INSTALL_DIR} "${DESTDIR}${LIBDIR}"
-	@$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
+	@$(foreach lib,$(shell find * -type f -iname "*.${EXT_SO}" | grep -vE '^libr\.${EXT_SO}$$' | grep -v '(lib|parse)/t/' | grep lib | grep -v /bin/ | grep -v /p/), \
 	  echo " ${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
 	  rm -f "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
 	  ${INSTALL_LIB} "$(lib)" "${DESTDIR}${LIBDIR}/$(call libpath-to-name-version,$(lib),${LIBVERSION})"; \
 	  ( cd "${DESTDIR}${LIBDIR}" ; ln -fs "$(call libpath-to-name-version,$(lib),${LIBVERSION})" "$(call libpath-to-name,$(lib))" ) ; \
 	)
+	lib=libr.$(EXT_SO) ; if [ -f "$$lib" ]; then \
+	  ${INSTALL_LIB} "$$lib" "${DESTDIR}${LIBDIR}/$$lib"; \
+	fi
 	# object archives
 	@for FILE in `find * -type f -iname "*.${EXT_AR}" | grep -v fs/p` ; do \
 	  echo " ${DESTDIR}${LIBDIR}/$$FILE"; ${INSTALL_DATA} $$FILE "${DESTDIR}${LIBDIR}" ; done || true
@@ -124,9 +194,6 @@
 	  ${INSTALL_LIB} "$$FILE" "${DESTDIR}${LIBDIR}/radare2/${VERSION}" ; done
 	cd "${DESTDIR}${LIBDIR}/radare2" ; ln -fs "${VERSION}" last
 
-#@echo "lang/p/radare.* ${DESTDIR}${DESTDIR}${PREFIX}/${LIBDIR}/radare2/${VERSION}"
-#${INSTALL_DATA} lang/p/radare.* ${DESTDIR}${LIBDIR}/radare2/${VERSION}
-
 deinstall uninstall:
 	# libraries
 	-@for FILE in `find * | grep -e '\.${EXT_SO}$$' | grep -v 'lib/t' | grep lib` ; do \
@@ -170,6 +237,7 @@
 
 clean:
 	for LIB in ${LIBS}; do ( cd $${LIB} && $(MAKE) clean ); done
+	rm -rf .libr libr.${LIB_SO} libr.${LIB_AR}
 
 mrproper:
 	rm -rf .libr libr.${LIB_SO} libr.${LIB_AR}
diff -Nru radare2-2.3.0+dfsg/libr/meson.build radare2-2.8.0+dfsg/libr/meson.build
--- radare2-2.3.0+dfsg/libr/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,254 +1,366 @@
-anal = [
-	'6502',
-	'8051',
-	'arc',
-	'avr',
-	'arm_cs',
-	'bf',
-	'cr16',
-	'cris',
-	'dalvik',
-	'i4004',
-	'i8080',
-	'gb',
-	'm68k_cs',
-	'malbolge',
-	'mips_cs',
-	'mips_gnu',
-	'msp430',
-	'nios2',
-	'null',
-	'pic',
-	'ppc_cs',
-	'ppc_gnu',
-	'riscv',
-	'sh',
-	'snes',
-	'sparc_cs',
-	'sparc_gnu',
-	'sysz',
-	'vax',
-	'v810',
-	'v850',
-	'ws',
-	'x86_cs',
-	'xap',
-	'xcore_cs',
-	'z80',
-]
-asm = [
-	'6502',
-	'8051',
-	'arc',
-	'avr',
-	'arm_as',
-	'arm_cs',
-	'arm_winedbg',
-	'bf',
-	'cr16',
-	'cris_gnu',
-	'dalvik',
-	'dcpu16',
-	'gb',
-	'h8300',
-	'hppa_gnu',
-	'i4004',
-	'i8080',
-	'lanai_gnu',
-	'lh5801',
-	'lm32',
-	'm68k_cs',
-	'malbolge',
-	'mcs96',
-	'mips_cs',
-	'mips_gnu',
-	'msp430',
-	'nios2',
-	'pic',
-	'ppc_cs',
-	'ppc_gnu',
-	'riscv',
-	'sh',
-	'snes',
-	'sparc_cs',
-	'sparc_gnu',
-	'spc700',
-	'sysz',
-	'tricore',
-	'v850',
-	'vax',
-	'wasm',
-	'ws',
-	'x86_as',
-	'x86_cs',
-	'x86_nasm',
-	'x86_nz',
-	'xap',
-	'xcore_cs',
-	'z80',
-]
-
-bin = [
-	'any',
-	'art',
-	'bf',
-	'bflt',
-	'bios',
-	'bootimg',
-	'cgc',
-	'coff',
-	'dex',
-	'dol',
-	'dyldcache',
-	'elf',
-	'elf64',
-	'fs',
-	'mach0',
-	'mach064',
-	'mbn',
-	'mdmp',
-	'menuet',
-	'mz',
-	'nes',
-	'nin3ds',
-	'ninds',
-	'ningb',
-	'ningba',
-	'nro',
-	'omf',
-	'p9',
-	'pe',
-	'pe64',
-	'pebble',
-	'psxexe',
-	'sfc',
-	'smd',
-	'sms',
-	'spc700',
-	'te',
-	'vsf',
-	'wasm',
-	'xbe',
-	'zimg',
-	'z64',
-]
-
-bin_xtr = [
-	'fatmach0',
-	'xtr_dyldcache'
-]
-
-bp = [
-	'arm',
-	'bf',
-	'mips',
-	'ppc',
-	'x86'
-]
-
-core = [
-	'anal'
-]
-
-crypto = [
-	'aes',
-	'aes_cbc',
-	'base64',
-	'base91',
-	'blowfish',
-	'cps2',
-	'des',
-	'punycode',
-	'rc2',
-	'rc4',
-	'rc6',
-	'rol',
-	'ror',
-	'rot',
-	'xor',
-	'serpent'
-]
-
-debug = [
-	'bf',
-	'esil',
-	'io',
-	'native',
-	'rap',
-	'gdb',
-	'windbg'
-]
-
-egg = [
-	'exec',
-	'xor'
-]
-
-fs = [
-	'ext2',
-	'fat',
-	'fb',
-	'hfs',
-	'hfsplus',
-	'iso9660',
-	'jfs',
-	'minix',
-	'ntfs',
-	'posix',
-	'reiserfs',
-	'sfs',
-	'tar',
-	'udf',
-	'ufs',
-	'xfs'
-]
-
-io = [
-	'ar',
-	'bfdbg',
-	'debug',
-	'default',
-	'gdb',
-	'gzip',
-	'http',
-	'ihex',
-	'mach',
-	'malloc',
-	'mmap',
-	'null',
-	'procpid',
-	'ptrace',
-	'r2k',
-	'r2pipe',
-	'r2web',
-	'rap',
-	'self',
-	'shm',
-	'sparse',
-	'tcp',
-	'windbg',
-	'winedbg'
-]
-if host_os == 'windows'
-io += [
-	'w32dbg',
-	'w32',
+anal_plugins = [
+  '6502',
+  '8051',
+  'arc',
+  'arm_cs',
+  'arm_gnu',
+  'avr',
+  'bf',
+  'chip8',
+  'cr16',
+  'cris',
+  'dalvik',
+  'ebc',
+  'gb',
+  'h8300',
+  'hexagon',
+  'i4004',
+  'i8080',
+  'java',
+  'm68k_cs',
+  'malbolge',
+  'mips_cs',
+  'mips_gnu',
+  'msp430',
+  'nios2',
+  'null',
+  'pic',
+  'ppc_cs',
+  'ppc_gnu',
+  'propeller',
+  'riscv',
+  'rsp',
+  'sh',
+  'snes',
+  'sparc_cs',
+  'sparc_gnu',
+  'sysz',
+  'tms320',
+  #'tms320c64x',
+  'v810',
+  'v850',
+  'vax',
+  'wasm',
+  'ws',
+  'x86_cs',
+  'xap',
+  'xcore_cs',
+  'xtensa',
+  'z80',
 ]
+
+asm_plugins = [
+  '6502',
+  '8051',
+  'arc',
+  'arm_as',
+  'arm_cs',
+  'arm_gnu',
+  'arm_winedbg',
+  'avr',
+  'bf',
+  'chip8',
+  'cr16',
+  'cris_gnu',
+  'dalvik',
+  'dcpu16',
+  'ebc',
+  'gb',
+  'h8300',
+  'hexagon',
+  #'hexagon_gnu',
+  'hppa_gnu',
+  'i4004',
+  'i8080',
+  'java',
+  'lanai_gnu',
+  'lh5801',
+  'lm32',
+  'm68k_cs',
+  'malbolge',
+  'mcs96',
+  'mips_cs',
+  'mips_gnu',
+  'msp430',
+  'nios2',
+  'pic',
+  'ppc_cs',
+  'ppc_gnu',
+  'propeller',
+  'riscv',
+  'rsp',
+  'sh',
+  'snes',
+  'sparc_cs',
+  'sparc_gnu',
+  'spc700',
+  'sysz',
+  'tms320',
+  'tms320c64x',
+  'tricore',
+  'v810',
+  'v850',
+  'vax',
+  'wasm',
+  'ws',
+  'x86_as',
+  'x86_cs',
+  'x86_nasm',
+  'x86_nz',
+  'xap',
+  'xcore_cs',
+  'xtensa',
+  'z80',
+]
+
+bin_plugins = [
+  'any',
+  'art',
+  'avr',
+  'bf',
+  'bflt',
+  'bios',
+  'bootimg',
+  'cgc',
+  'coff',
+  'dex',
+  'dol',
+  'dyldcache',
+  'elf',
+  'elf64',
+  'fs',
+  'java',
+  'mach0',
+  'mach064',
+  'mbn',
+  'mdmp',
+  'menuet',
+  'mz',
+  'nes',
+  'nin3ds',
+  'ninds',
+  'ningb',
+  'ningba',
+  'nro',
+  'nso',
+  'omf',
+  'p9',
+  'pe',
+  'pe64',
+  'pebble',
+  'psxexe',
+  'sfc',
+  'smd',
+  'sms',
+  'spc700',
+  'te',
+  'vsf',
+  'wasm',
+  'xbe',
+  'z64',
+  'zimg',
+]
+
+bin_ldr_plugins = [
+  'ldr_linux',
+]
+
+bin_xtr_plugins = [
+  'xtr_dyldcache',
+  'xtr_fatmach0',
+]
+
+bp_plugins = [
+  'arm',
+  'bf',
+  'mips',
+  'ppc',
+  'sh',
+  'x86'
+]
+
+core_plugins = [
+  'a2f',
+  'java'
+]
+
+crypto_plugins = [
+  'aes',
+  'aes_cbc',
+  'base64',
+  'base91',
+  'blowfish',
+  'cps2',
+  'des',
+  'punycode',
+  'rc2',
+  'rc4',
+  'rc6',
+  'rol',
+  'ror',
+  'rot',
+  'serpent',
+  'xor',
+]
+
+debug_plugins = [
+  'bf',
+  'bochs',
+  'esil',
+  'gdb',
+  'io',
+  'native',
+  'null',
+  'qnx',
+  'rap',
+  'windbg'
+]
+
+egg_plugins = [
+  'exec',
+  #'shya',
+  'xor'
+]
+
+fs_plugins = [
+  'cpio',
+  'ext2',
+  'fat',
+  'fb',
+  'hfs',
+  'hfsplus',
+  'io',
+  'iso9660',
+  'jfs',
+  'minix',
+  'ntfs',
+  'posix',
+  'r2',
+  'reiserfs',
+  'sfs',
+  'tar',
+  'udf',
+  'ufs',
+  'ufs2',
+  'xfs'
+]
+
+io_plugins = [
+  'ar',
+  'bfdbg',
+  'bochs',
+  'debug',
+  'default',
+  'gdb',
+  'gprobe',
+  'gzip',
+  'http',
+  'ihex',
+  'mach',
+  'malloc',
+  'mmap',
+  'null',
+  'procpid',
+  'ptrace',
+  'qnx',
+  'r2k',
+  'r2pipe',
+  'r2web',
+  'rap',
+  'rbuf',
+  'self',
+  'shm',
+  'sparse',
+  'tcp',
+  'windbg',
+  'winedbg',
+  'zip'
+]
+
+if host_machine.system() == 'windows'
+  io_plugins += [
+    'w32dbg',
+    'w32',
+  ]
 endif
 
-lang = [
-	'vala'
+lang_plugins = [
+  'c',
+  'cpipe',
+  'lib',
+  'pipe',
+  'rust',
+  'vala'
+]
+
+parse_plugins = [
+  '6502_pseudo',
+  'arm_pseudo',
+  'att2intel',
+  'avr_pseudo',
+  'dalvik_pseudo',
+  'm68k_pseudo',
+  'mips_pseudo',
+  'mreplace',
+  'ppc_pseudo',
+  'sh_pseudo',
+  'x86_pseudo',
+  'z80_pseudo'
+]
+
+include_files = run_command(glob_cmd + ['include/*.h']).stdout().strip().split(';')
+install_headers(include_files, subdir: 'libr')
+
+r_util_files = run_command(glob_cmd + ['include/r_util/*.h']).stdout().strip().split(';')
+install_headers(r_util_files, subdir: 'libr/r_util')
+
+sdb_files = run_command(glob_cmd + ['include/sdb/*.h']).stdout().strip().split(';')
+install_headers(sdb_files, subdir: 'libr/sdb')
+
+sflib_common_files = [
+  'include/sflib/common/sftypes.h',
+  'include/sflib/common/sfsocketcall.h'
 ]
-parse = [
-	'6502_pseudo',
-	'arm_pseudo',
-	'att2intel',
-	'dalvik_pseudo',
-	'm68k_pseudo',
-	'mips_pseudo',
-	'mreplace',
-	'ppc_pseudo',
-	'sh_pseudo',
-	'avr_pseudo',
-	'x86_pseudo',
+
+sflib_arch = [
+  'linux-x86-64',
+  'linux-x86-32',
+  'linux-arm-64',
+  'linux-arm-32',
+  'darwin-x86-64',
+  'darwin-x86-32',
+  'darwin-arm-64'
+]
+
+sflib_arch_files = [
+  'sflib.h',
+  'sfsyscall.h',
+  'sfsysnr.h'
+]
+
+install_headers(sflib_common_files, subdir: 'libr/sflib/common')
+foreach arch : sflib_arch
+  foreach file : sflib_arch_files
+    install_headers(join_paths('include/sflib', arch, file), subdir: join_paths('libr/sflib', arch))
+  endforeach
+endforeach
+
+sdb_readlink_script = '''#script
+import os
+import sys
+infile = sys.argv[1]
+if os.name == 'nt' and os.path.getsize(infile) <= 64:
+    with open(infile) as sdb_txt:
+        fname = sdb_txt.readline()
+    if fname.endswith('.sdb.txt'):
+        infile = fname
+else:
+    infile = os.path.basename(infile)
+print(infile)
+'''
+
+sdb_readlink_cmd = [
+  py3_exe,
+  '-c',
+  sdb_readlink_script
 ]
diff -Nru radare2-2.3.0+dfsg/libr/parse/code.c radare2-2.8.0+dfsg/libr/parse/code.c
--- radare2-2.3.0+dfsg/libr/parse/code.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/code.c	2018-08-07 14:12:36.000000000 +0000
@@ -36,7 +36,7 @@
 		const char *typename = k;
 		int typesize = 0;
 		// TODO: Add typesize here
-		char* query = sdb_fmt (-1, "struct.%s", k);
+		char* query = sdb_fmt ("struct.%s", k);
 		char *members = sdb_get (anal->sdb_types, query, 0);
 		char *next, *ptr = members;
 		if (members) {
@@ -45,7 +45,7 @@
 				if (!name) {
 					break;
 				}
-				query = sdb_fmt (-1, "struct.%s.%s", k, name);
+				query = sdb_fmt ("struct.%s.%s", k, name);
 				char *subtype = sdb_get (anal->sdb_types, query, 0);
 				if (!subtype) {
 					break;
@@ -59,7 +59,7 @@
 					}
 					char *subname = tmp;
 					// TODO: Go recurse here
-					query = sdb_fmt (-1, "struct.%s.%s.meta", subtype, subname);
+					query = sdb_fmt ("struct.%s.%s.meta", subtype, subname);
 					btype = sdb_num_get (anal->sdb_types, query, 0);
 					tcc_sym_push (subtype, 0, btype);
 				}
@@ -93,7 +93,10 @@
 	if (!T) return NULL;
 	tcc_set_callback (T, &appendstring, &str);
 	sdb_foreach (anal->sdb_types, typeload, NULL);
-	tcc_compile_string (T, code);
+	if (tcc_compile_string (T, code) != 0) {
+		free (str);
+		str = NULL;
+	}
 	tcc_delete (T);
 	return str;
 }
diff -Nru radare2-2.3.0+dfsg/libr/parse/Makefile radare2-2.8.0+dfsg/libr/parse/Makefile
--- radare2-2.3.0+dfsg/libr/parse/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -23,14 +23,6 @@
 bins:
 #	@cd t && ${MAKE} all
 
-pre:
-ifeq ($(WITHNONPIC),1)
-	@if [ ! -e libr_parse.${EXT_AR} ]; then rm -f ${STATIC_OBJS} ; fi
-endif
-ifeq ($(WITHPIC),1)
-	@if [ ! -e libr_parse.${EXT_SO} ]; then rm -f ${STATIC_OBJS} ; fi
-endif
-
 plugins:
 	@cd p && ${MAKE} all
 
diff -Nru radare2-2.3.0+dfsg/libr/parse/meson.build radare2-2.8.0+dfsg/libr/parse/meson.build
--- radare2-2.3.0+dfsg/libr/parse/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,27 +1,52 @@
-files=[
-'code.c',
-'parse.c',
-'p/parse_6502_pseudo.c',
-'p/parse_arm_pseudo.c',
-'p/parse_att2intel.c',
-'p/parse_dalvik_pseudo.c',
-'p/parse_m68k_pseudo.c',
-'p/parse_mips_pseudo.c',
-'p/parse_mreplace.c',
-'p/parse_ppc_pseudo.c',
-'p/parse_x86_pseudo.c',
-'p/parse_z80_pseudo.c',
-'p/parse_sh_pseudo.c',
-'p/parse_avr_pseudo.c',
-'p/parse_mreplace/mreplace.c',
-'p/parse_mreplace/mmemory.c'
+files = [
+  'code.c',
+  'parse.c',
+  'p/parse_6502_pseudo.c',
+  'p/parse_arm_pseudo.c',
+  'p/parse_att2intel.c',
+  'p/parse_avr_pseudo.c',
+  'p/parse_dalvik_pseudo.c',
+  'p/parse_m68k_pseudo.c',
+  'p/parse_mips_pseudo.c',
+  'p/parse_mreplace.c',
+  'p/parse_ppc_pseudo.c',
+  'p/parse_sh_pseudo.c',
+  'p/parse_x86_pseudo.c',
+  'p/parse_z80_pseudo.c',
+  'p/parse_mreplace/mreplace.c',
+  'p/parse_mreplace/mmemory.c'
 ]
 
 r_parse = library('r_parse', files,
-  include_directories: [platform_inc, include_directories([
-	'../../shlr/tcc',
-  ])],
-  c_args : ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
-  link_with: [r_util, r_flag, r_syscall, r_reg, libr2tcc, libr2sdb],
-  install: true
+  include_directories: platform_inc,
+  c_args: ['-DCORELIB=1'],
+  dependencies: [
+    r_util_dep,
+    r_flag_dep,
+    r_syscall_dep,
+    r_reg_dep,
+    sdb_dep,
+    tcc_dep
+  ],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_parse_dep = declare_dependency(link_with: r_parse,
+                                 include_directories: platform_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_parse],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_parse',
+  filebase: 'r_parse',
+  requires: [
+    'r_util',
+    'r_flag',
+    'r_syscall',
+    'r_reg'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/parse/p/avr_pseudo.mk radare2-2.8.0+dfsg/libr/parse/p/avr_pseudo.mk
--- radare2-2.3.0+dfsg/libr/parse/p/avr_pseudo.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/p/avr_pseudo.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1,14 +1,14 @@
-OBJ_AVRPSEUDO+=parse_avr_pseudo.o
-
-TARGET_AVRPSEUDO=parse_avr_pseudo.${EXT_SO}
-ALL_TARGETS+=${TARGET_AVRPSEUDO}
-STATIC_OBJ+=${OBJ_AVRPSEUDO}
-
-${TARGET_AVRPSEUDO}: ${OBJ_AVRPSEUDO}
-ifeq ($(CC),cccl)
-	${CC} $(call libname,parse_avr_pseudo) -L../../util -llibr_util \
-		$(LDFLAGS_SHARED) ${CFLAGS} -o ${TARGET_AVRPSEUDO} ${OBJ_AVRPSEUDO}
-else
-	${CC} $(call libname,parse_avr_pseudo) -L../../util -lr_util \
-		$(LDFLAGS_SHARED) ${CFLAGS} -o ${TARGET_AVRPSEUDO} ${OBJ_AVRPSEUDO} $(LINK)
-endif
+OBJ_AVRPSEUDO+=parse_avr_pseudo.o
+
+TARGET_AVRPSEUDO=parse_avr_pseudo.${EXT_SO}
+ALL_TARGETS+=${TARGET_AVRPSEUDO}
+STATIC_OBJ+=${OBJ_AVRPSEUDO}
+
+${TARGET_AVRPSEUDO}: ${OBJ_AVRPSEUDO}
+ifeq ($(CC),cccl)
+	${CC} $(call libname,parse_avr_pseudo) -L../../util -llibr_util \
+		$(LDFLAGS_SHARED) ${CFLAGS} -o ${TARGET_AVRPSEUDO} ${OBJ_AVRPSEUDO}
+else
+	${CC} $(call libname,parse_avr_pseudo) -L../../util -lr_util \
+		$(LDFLAGS_SHARED) ${CFLAGS} -o ${TARGET_AVRPSEUDO} ${OBJ_AVRPSEUDO} $(LINK)
+endif
diff -Nru radare2-2.3.0+dfsg/libr/parse/p/parse_arm_pseudo.c radare2-2.8.0+dfsg/libr/parse/p/parse_arm_pseudo.c
--- radare2-2.3.0+dfsg/libr/parse/p/parse_arm_pseudo.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/p/parse_arm_pseudo.c	2018-08-07 14:12:36.000000000 +0000
@@ -235,7 +235,7 @@
 }
 
 static bool varsub(RParse *p, RAnalFunction *f, ut64 addr, int oplen, char *data, char *str, int len) {
-	RList *spargs, *bpargs, *regargs;
+	RList *spargs, *bpargs;
 	RAnalVar *var;
 	RListIter *iter;
 	char *oldstr, *newstr;
@@ -250,11 +250,14 @@
 	}
 	if (p->relsub) {
 		char *rip = (char *)r_str_casestr (tstr, "[pc, ");
-		if (rip) {
+		if (!rip) {
+			rip = (char *)r_str_casestr (tstr, "[PC, ");
+		}
+		if (rip && !strchr (rip + 4, ',')) {
 			rip += 4;
 			char *tstr_new, *ripend = strchr (rip, ']');
 			const char *neg = strchr (rip, '-');
-			ut64 off = (oplen == 2 || strstr (tstr, ".w")) ? 4 : 8;
+			ut64 off = (oplen == 2 || strstr (tstr, ".w") || strstr(tstr, ".W")) ? 4 : 8;
 			ut64 repl_num = (addr + off) & ~3;
 			if (!ripend) {
 				ripend = "]";
@@ -272,23 +275,30 @@
 		}
 	}
 
-	regargs = p->varlist (p->anal, f, 'r');
 	bpargs = p->varlist (p->anal, f, 'b');
 	spargs = p->varlist (p->anal, f, 's');
 	bool ucase = IS_UPPER (*tstr);
 	r_list_foreach (bpargs, iter, var) {
+		char *reg = p->anal->reg->name[R_REG_NAME_BP];
+		char *tmplt = NULL;
 		if (var->delta > -10 && var->delta < 10) {
-			oldstr = r_str_newf ("[%s, %d]",
-				p->anal->reg->name[R_REG_NAME_BP],
-				var->delta);
+			if (p->pseudo) {
+				char sign = '+';
+				int delta = var->delta;
+				if (var->delta < 0) {
+					sign = '-';
+					delta = -delta;
+				}
+				oldstr = r_str_newf ("[%s %c %d]", reg, sign, delta);
+			} else {
+				oldstr = r_str_newf ("[%s, %d]", reg, var->delta);
+			}
 		} else if (var->delta > 0) {
-			oldstr = r_str_newf ("[%s, 0x%x]",
-			p->anal->reg->name[R_REG_NAME_BP],
-				var->delta);
+			tmplt = p->pseudo ? "[%s + 0x%x]" : (ucase ? "[%s, 0x%X]" : "[%s, 0x%x]");
+			oldstr = r_str_newf (tmplt, reg, var->delta);
 		} else {
-			oldstr = r_str_newf ("[%s, -0x%x]",
-				p->anal->reg->name[R_REG_NAME_BP],
-				-var->delta);
+			tmplt = p->pseudo ? "[%s - 0x%x]" : (ucase ? "[%s, -0x%X]" : "[%s, -0x%x]");
+			oldstr = r_str_newf (tmplt, reg, -var->delta);
 		}
 		if (ucase) {
 			char *comma = strchr (oldstr, ',');
@@ -299,10 +309,12 @@
 			}
 		}
 		if (strstr (tstr, oldstr)) {
-			newstr = r_str_newf ("[%s %c %s]",
-				p->anal->reg->name[R_REG_NAME_BP],
-				var->delta > 0 ? '+' : '-',
-				var->name);
+			if (p->localvar_only) {
+				newstr = r_str_newf ("[%s]", var->name);
+			} else {
+				newstr = r_str_newf ("[%s %c %s]",
+					reg, var->delta > 0 ? '+' : '-', var->name);
+			}
 			if (ucase) {
 				char *comma = strchr (newstr, ' ');
 				if (comma) {
@@ -361,12 +373,6 @@
 		}
 		free (oldstr);
 	}
-	r_list_foreach (regargs, iter, var) {
-		RRegItem *r = r_reg_index_get (p->anal->reg, var->delta);
-		if (r && r->name && strstr (tstr, r->name)) {
-			tstr = r_str_replace (tstr, r->name, var->name, 1);
-		}
-	}
 	if (len > strlen (tstr)) {
 		strncpy (str, tstr, strlen (tstr));
 		str[strlen (tstr)] = 0;
diff -Nru radare2-2.3.0+dfsg/libr/parse/p/parse_avr_pseudo.c radare2-2.8.0+dfsg/libr/parse/p/parse_avr_pseudo.c
--- radare2-2.3.0+dfsg/libr/parse/p/parse_avr_pseudo.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/p/parse_avr_pseudo.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,225 +1,229 @@
-/* radare - LGPL - Copyright 2017 - wargio */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <r_lib.h>
-#include <r_util.h>
-#include <r_flag.h>
-#include <r_anal.h>
-#include <r_parse.h>
-
-static int replace(int argc, const char *argv[], char *newstr) {
-	int i,j,k;
-	struct {
-		char *op;
-		char *str;
-	} ops[] = {
-		{ "add",     "A += B"},
-		{ "adc",     "A += B + carry"},
-		{ "adiw",    "A+1:A += B"},
-		{ "sub",     "A -= B"},
-		{ "subi",    "A -= B"},
-		{ "sbc",     "A -= (B + carry)"},
-		{ "sbci",    "A -= (B + carry)"},
-		{ "sbiw",    "A+1:A -= B"},
-		{ "and",     "A &= B"},
-		{ "andi",    "A &= B"},
-		{ "or",      "A |= B"},
-		{ "ori",     "A |= B"},
-		{ "eor",     "A ^= B"},
-		{ "com",     "A = 0xff - A"},
-		{ "neg",     "A = -A"},
-		{ "sbr",     "A |= B"},
-		{ "cbr",     "A &= (0xff - B)"},
-		{ "inc",     "A++"},
-		{ "dec",     "A--"},
-		{ "tst",     "A &= A"},
-		{ "clr",     "A ^= A"},
-		{ "ser",     "A = 0xff"},
-		{ "mul",     "r1:r0 = A * B"},
-		{ "rjmp",    "goto A"},
-		{ "ijmp",    "goto z"},
-		{ "jmp",     "goto A"},
-		{ "rcall",   "goto A"},
-		{ "icall",   "goto z"},
-		{ "call",    "goto A"},
-		{ "ret",     "return"},
-		{ "iret",    "return_interrupt()"},
-		{ "cp",      "var = A - B"},
-		{ "cpc",     "var = A - B - carry"},
-		{ "cpi",     "var = A - B"},
-		{ "breq",    "if(!var) goto A"},
-		{ "brne",    "if(var) goto A"},
-		{ "brsh",    "if(var >= 0) goto A"},
-		{ "brlo",    "if(var < 0) goto A"},
-		{ "brmi",    "if(var < 0) goto A"},
-		{ "brpl",    "if(var > 0) goto A"},
-		{ "brge",    "if(var >= 0) goto A"},
-		{ "brlt",    "if(var < 0) goto A"},
-		{ "mov",     "A = B"},
-		{ "ldi",     "A = *(B)"},
-		{ "lds",     "A = *(B)"},
-		{ "ld",      "A = *(B)"},
-		{ "ldd",     "A = *(B)"},
-		{ "lpm",     "r0 = z"},
-		{ "in",      "A = B"},
-		{ "out",     "A = B"},
-		{ "push",    "push(A)"},
-		{ "pop",     "A = pop()"},
-		{ "lsl",     "A <<= 1"},
-		{ "lsr",     "A >>= 1"},
-		{ "rol",     "A = (A << 1) | (A >> 7)"},
-		{ "ror",     "A = (A << 7) | (A >> 1)"},
-		{ "asr",     "A >>= 1"},
-		{ "swap",    "A = ((A & 0xf0) >> 4) | ((A & 0x0f) << 4)"},
-		{ "sec",     "c = 1"},
-		{ "clc",     "c = 0"},
-		{ "sen",     "n = 1"},
-		{ "cln",     "n = 0"},
-		{ "sez",     "z = 1"},
-		{ "clz",     "z = 0"},
-		{ "sei",     "i = 1"},
-		{ "cli",     "i = 0"},
-		{ "ses",     "s = 1"},
-		{ "cls",     "s = 0"},
-		{ "sev",     "v = 1"},
-		{ "clv",     "v = 0"},
-		{ "set",     "t = 1"},
-		{ "clt",     "t = 0"},
-		{ "seh",     "h = 1"},
-		{ "clh",     "h = 0"},
-		{ "nop",     ""},
-		{ "halt",    "_halt()"},
-		{ "wdr",     "_watchdog_reset()"},
-		{ NULL }
-	};
-
-	for (i = 0; ops[i].op != NULL; i++) {
-		if (!strcmp (ops[i].op, argv[0])) {
-			if (newstr != NULL) {
-				for (j = k = 0; ops[i].str[j] != '\0'; j++, k++) {
-					if (ops[i].str[j] >= 'A' && ops[i].str[j] <= 'J') {
-						const char *w = argv[ops[i].str[j] - '@'];
-						if (w != NULL) {
-							strcpy (newstr + k, w);
-							k += strlen(w) - 1;
-						}
-					} else newstr[k] = ops[i].str[j];
-				}
-				newstr[k] = '\0';
-			}
-			return true;
-		}
-	}
-
-	/* TODO: this is slow */
-	if (newstr != NULL) {
-		newstr[0] = '\0';
-		for (i = 0; i < argc; i++) {
-			strcat (newstr, argv[i]);
-			strcat (newstr, (i == 0 || i == argc - 1) ? " ":", ");
-		}
-	}
-
-	return false;
-}
-
-#define WSZ 128
-static int parse(RParse *p, const char *data, char *str) {
-	int i, len = strlen (data);
-	char w0[WSZ];
-	char w1[WSZ];
-	char w2[WSZ];
-	char w3[WSZ];
-	char w4[WSZ];
-	char *buf, *ptr, *optr;
-
-	// malloc can be slow here :?
-	if (!(buf = malloc (len + 1))) {
-		return false;
-	}
-	memcpy (buf, data, len + 1);
-
-	r_str_trim (buf);
-	if (*buf) {
-		w0[0] = '\0';
-		w1[0] = '\0';
-		w2[0] = '\0';
-		w3[0] = '\0';
-		w4[0] = '\0';
-		ptr = strchr (buf, ' ');
-		if (!ptr) {
-			ptr = strchr (buf, '\t');
-		}
-		if (ptr) {
-			*ptr = '\0';
-			for (++ptr; *ptr == ' '; ptr++) {
-				//nothing to see here
-			}
-			strncpy (w0, buf, WSZ - 1);
-			strncpy (w1, ptr, WSZ - 1);
-
-			optr = ptr;
-			ptr = strchr (ptr, ',');
-			if (ptr) {
-				*ptr = '\0';
-				for (++ptr; *ptr == ' '; ptr++) {
-					//nothing to see here
-				}
-				strncpy (w1, optr, WSZ - 1);
-				strncpy (w2, ptr, WSZ - 1);
-				optr = ptr;
-				ptr = strchr (ptr, ',');
-				if (ptr) {
-					*ptr = '\0';
-					for (++ptr; *ptr == ' '; ptr++) {
-						//nothing to see here
-					}
-					strncpy (w2, optr, WSZ - 1);
-					strncpy (w3, ptr, WSZ - 1);
-					optr = ptr;
-					// bonus
-					ptr = strchr (ptr, ',');
-					if (ptr) {
-						*ptr = '\0';
-						for (++ptr; *ptr == ' '; ptr++) {
-							//nothing to see here
-						}
-						strncpy (w3, optr, WSZ - 1);
-						strncpy (w4, ptr, WSZ - 1);
-					}
-				}
-			}
-		} else {
-			strncpy (w0, buf, WSZ - 1);
-		}
-		{
-			const char *wa[] = { w0, w1, w2, w3, w4 };
-			int nw = 0;
-			for (i = 0; i < 5; i++) {
-				if (wa[i][0] != '\0') {
-					nw++;
-				}
-			}
-			replace (nw, wa, str);
-		}
-	}
-	free (buf);
-	return true;
-}
-
-RParsePlugin r_parse_plugin_avr_pseudo = {
-	.name = "avr.pseudo",
-	.desc = "AVR pseudo syntax",
-	.parse = parse
-};
-
-#ifndef CORELIB
-RLibStruct radare_plugin = {
-	.type = R_LIB_TYPE_PARSE,
-	.data = &r_parse_plugin_avr_pseudo,
-	.version = R2_VERSION
-};
-#endif
+/* radare - LGPL - Copyright 2017 - wargio */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <r_lib.h>
+#include <r_util.h>
+#include <r_flag.h>
+#include <r_anal.h>
+#include <r_parse.h>
+
+static int replace(int argc, const char *argv[], char *newstr) {
+	int i,j,k;
+	struct {
+		char *op;
+		char *str;
+	} ops[] = {
+		{ "add",     "A += B"},
+		{ "adc",     "A += B + carry"},
+		{ "adiw",    "A+1:A += B"},
+		{ "sub",     "A -= B"},
+		{ "subi",    "A -= B"},
+		{ "sbc",     "A -= (B + carry)"},
+		{ "sbci",    "A -= (B + carry)"},
+		{ "sbiw",    "A+1:A -= B"},
+		{ "and",     "A &= B"},
+		{ "andi",    "A &= B"},
+		{ "or",      "A |= B"},
+		{ "ori",     "A |= B"},
+		{ "eor",     "A ^= B"},
+		{ "com",     "A = 0xff - A"},
+		{ "neg",     "A = -A"},
+		{ "sbr",     "A |= B"},
+		{ "cbr",     "A &= (0xff - B)"},
+		{ "inc",     "A++"},
+		{ "dec",     "A--"},
+		{ "tst",     "A &= A"},
+		{ "clr",     "A ^= A"},
+		{ "ser",     "A = 0xff"},
+		{ "mul",     "r1:r0 = A * B"},
+		{ "rjmp",    "goto A"},
+		{ "ijmp",    "goto z"},
+		{ "jmp",     "goto A"},
+		{ "rcall",   "goto A"},
+		{ "icall",   "goto z"},
+		{ "call",    "goto A"},
+		{ "ret",     "return"},
+		{ "iret",    "return_interrupt()"},
+		{ "cp",      "var = A - B"},
+		{ "cpc",     "var = A - B - carry"},
+		{ "cpi",     "var = A - B"},
+		{ "breq",    "if(!var) goto A"},
+		{ "brne",    "if(var) goto A"},
+		{ "brsh",    "if(var >= 0) goto A"},
+		{ "brlo",    "if(var < 0) goto A"},
+		{ "brmi",    "if(var < 0) goto A"},
+		{ "brpl",    "if(var > 0) goto A"},
+		{ "brge",    "if(var >= 0) goto A"},
+		{ "brlt",    "if(var < 0) goto A"},
+		{ "mov",     "A = B"},
+		{ "movw",    "A+1:A = B+1:B"},
+		{ "ldi",     "A = B"},
+		{ "lds",     "A = *(B)"},
+		{ "ld",      "A = *(B)"},
+		{ "ldd",     "A = *(B)"},
+		{ "lpm",     "r0 = z"},
+		{ "in",      "A = B"},
+		{ "out",     "A = B"},
+		{ "push",    "push(A)"},
+		{ "pop",     "A = pop()"},
+		{ "lsl",     "A <<= 1"},
+		{ "lsr",     "A >>= 1"},
+		{ "rol",     "A = (A << 1) | (A >> 7)"},
+		{ "ror",     "A = (A << 7) | (A >> 1)"},
+		{ "asr",     "A >>= 1"},
+		{ "swap",    "A = ((A & 0xf0) >> 4) | ((A & 0x0f) << 4)"},
+		{ "sec",     "c = 1"},
+		{ "clc",     "c = 0"},
+		{ "sen",     "n = 1"},
+		{ "cln",     "n = 0"},
+		{ "sez",     "z = 1"},
+		{ "clz",     "z = 0"},
+		{ "sei",     "i = 1"},
+		{ "cli",     "i = 0"},
+		{ "ses",     "s = 1"},
+		{ "cls",     "s = 0"},
+		{ "sev",     "v = 1"},
+		{ "clv",     "v = 0"},
+		{ "set",     "t = 1"},
+		{ "clt",     "t = 0"},
+		{ "seh",     "h = 1"},
+		{ "clh",     "h = 0"},
+		{ "nop",     ""},
+		{ "halt",    "_halt()"},
+		{ "wdr",     "_watchdog_reset()"},
+		{ "std",     "*(A) = B"},
+		{ "st",      "*(A) = B"},
+		{ "sts",     "*(A) = B"},
+		{ NULL }
+	};
+
+	for (i = 0; ops[i].op != NULL; i++) {
+		if (!strcmp (ops[i].op, argv[0])) {
+			if (newstr != NULL) {
+				for (j = k = 0; ops[i].str[j] != '\0'; j++, k++) {
+					if (ops[i].str[j] >= 'A' && ops[i].str[j] <= 'J') {
+						const char *w = argv[ops[i].str[j] - '@'];
+						if (w != NULL) {
+							strcpy (newstr + k, w);
+							k += strlen(w) - 1;
+						}
+					} else newstr[k] = ops[i].str[j];
+				}
+				newstr[k] = '\0';
+			}
+			return true;
+		}
+	}
+
+	/* TODO: this is slow */
+	if (newstr != NULL) {
+		newstr[0] = '\0';
+		for (i = 0; i < argc; i++) {
+			strcat (newstr, argv[i]);
+			strcat (newstr, (i == 0 || i == argc - 1) ? " ":", ");
+		}
+	}
+
+	return false;
+}
+
+#define WSZ 128
+static int parse(RParse *p, const char *data, char *str) {
+	int i, len = strlen (data);
+	char w0[WSZ];
+	char w1[WSZ];
+	char w2[WSZ];
+	char w3[WSZ];
+	char w4[WSZ];
+	char *buf, *ptr, *optr;
+
+	// malloc can be slow here :?
+	if (!(buf = malloc (len + 1))) {
+		return false;
+	}
+	memcpy (buf, data, len + 1);
+
+	r_str_trim (buf);
+	if (*buf) {
+		w0[0] = '\0';
+		w1[0] = '\0';
+		w2[0] = '\0';
+		w3[0] = '\0';
+		w4[0] = '\0';
+		ptr = strchr (buf, ' ');
+		if (!ptr) {
+			ptr = strchr (buf, '\t');
+		}
+		if (ptr) {
+			*ptr = '\0';
+			for (++ptr; *ptr == ' '; ptr++) {
+				//nothing to see here
+			}
+			strncpy (w0, buf, WSZ - 1);
+			strncpy (w1, ptr, WSZ - 1);
+
+			optr = ptr;
+			ptr = strchr (ptr, ',');
+			if (ptr) {
+				*ptr = '\0';
+				for (++ptr; *ptr == ' '; ptr++) {
+					//nothing to see here
+				}
+				strncpy (w1, optr, WSZ - 1);
+				strncpy (w2, ptr, WSZ - 1);
+				optr = ptr;
+				ptr = strchr (ptr, ',');
+				if (ptr) {
+					*ptr = '\0';
+					for (++ptr; *ptr == ' '; ptr++) {
+						//nothing to see here
+					}
+					strncpy (w2, optr, WSZ - 1);
+					strncpy (w3, ptr, WSZ - 1);
+					optr = ptr;
+					// bonus
+					ptr = strchr (ptr, ',');
+					if (ptr) {
+						*ptr = '\0';
+						for (++ptr; *ptr == ' '; ptr++) {
+							//nothing to see here
+						}
+						strncpy (w3, optr, WSZ - 1);
+						strncpy (w4, ptr, WSZ - 1);
+					}
+				}
+			}
+		} else {
+			strncpy (w0, buf, WSZ - 1);
+		}
+		{
+			const char *wa[] = { w0, w1, w2, w3, w4 };
+			int nw = 0;
+			for (i = 0; i < 5; i++) {
+				if (wa[i][0] != '\0') {
+					nw++;
+				}
+			}
+			replace (nw, wa, str);
+		}
+	}
+	free (buf);
+	return true;
+}
+
+RParsePlugin r_parse_plugin_avr_pseudo = {
+	.name = "avr.pseudo",
+	.desc = "AVR pseudo syntax",
+	.parse = parse
+};
+
+#ifndef CORELIB
+RLibStruct radare_plugin = {
+	.type = R_LIB_TYPE_PARSE,
+	.data = &r_parse_plugin_avr_pseudo,
+	.version = R2_VERSION
+};
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/parse/p/parse_x86_pseudo.c radare2-2.8.0+dfsg/libr/parse/p/parse_x86_pseudo.c
--- radare2-2.3.0+dfsg/libr/parse/p/parse_x86_pseudo.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/p/parse_x86_pseudo.c	2018-08-07 14:12:36.000000000 +0000
@@ -51,7 +51,7 @@
 		{ "fsub",  "# = # - #", {1, 1, 2}},
 		{ "fxch",  "#,# = #,#", {1, 2, 2, 1}},
 		{ "idiv",  "# /= #", {1, 2}},
-		{ "imul",  "# *= #", {1, 2}},
+		{ "imul",  "# = # * #", {1, 2, 3}},
 		{ "in",   "# = io[#]", {1, 2}},
 		{ "inc",  "#++", {1}},
 		{ "ja", "if (((unsigned) var) > 0) goto #", {1}},
@@ -77,7 +77,7 @@
 		{ "pextrb", "# = (byte) # [#]", {1, 2, 3}},
 		{ "palignr", "# = # align #", {1, 2, 3}},
 		{ "pxor", "# ^= #", {1, 2}},
-		{ "mul",  "# *= #", {1, 2}},
+		{ "mul",  "# = # * #", {1, 2, 3}},
 		{ "neg",  "# ~= #", {1, 1}},
 		{ "nop",  "", {0}},
 		{ "not",  "# = !#", {1, 1}},
@@ -208,29 +208,45 @@
 			nw++;
 		}
 	}
-	if (strstr (w0, "mul") && nw == 2 ) {
-		r_str_ncpy (wa[2], wa[1], sizeof (w2));
-
-		switch (wa[2][0]) {
-		case 'q':
-		case 'r': //qword, r..
-			r_str_ncpy (wa[1], "rax", sizeof (w1));
-			break;
-		case 'd':
-		case 'e': //dword, e..
-			if (strlen (wa[2]) > 2) {
-				r_str_ncpy (wa[1], "eax", sizeof (w1));
+	/* TODO: interpretation of memory location fails*/
+	//ensure imul & mul interpretations works
+	if (strstr (w0, "mul")) {
+		if (nw == 2)
+		{
+			r_str_ncpy (wa[3], wa[1], sizeof (w3));
+
+			switch (wa[3][0]) {
+			case 'q':
+			case 'r': //qword, r..
+				r_str_ncpy (wa[1], "rax", sizeof (w1));
+				r_str_ncpy (wa[2], "rax", sizeof (w2));
 				break;
-			}
-		default : // .x, .p, .i or word
-			if (wa[2][1] == 'x' || wa[2][1] == 'p' || \
-				wa[2][1] == 'i' || wa[2][0] == 'w') {
-				r_str_ncpy (wa[1], "ax", sizeof (w1));
-			} else { // byte and lowest 8 bit registers
-				r_str_ncpy (wa[1], "al", sizeof (w1));
+			case 'd':
+			case 'e': //dword, e..
+				if (strlen (wa[3]) > 2) {
+					r_str_ncpy (wa[1], "eax", sizeof (w1));
+					r_str_ncpy (wa[2], "eax", sizeof (w2));
+					break;
+				}
+			default : // .x, .p, .i or word
+				if (wa[3][1] == 'x' || wa[3][1] == 'p' || \
+					wa[3][1] == 'i' || wa[3][0] == 'w') {
+					r_str_ncpy (wa[1], "ax", sizeof (w1));
+					r_str_ncpy (wa[2], "ax", sizeof (w2));
+				} else { // byte and lowest 8 bit registers
+					r_str_ncpy (wa[1], "al", sizeof (w1));
+					r_str_ncpy (wa[2], "al", sizeof (w2));
+				}
 			}
 		}
+		else if (nw == 3)
+		{
+			r_str_ncpy (wa[3], wa[2], sizeof (w3));
+			r_str_ncpy (wa[2], wa[1], sizeof (w2));
+		}
+		
 		replace (nw, wa, str);
+
 	} else if ((strstr (w1, "ax") || strstr (w1, "ah") || strstr (w1, "al")) && !p->retleave_asm) {
 		if (!(p->retleave_asm = (char *) malloc (sz))) {
 			return false;
@@ -309,9 +325,9 @@
 }
 
 static bool varsub (RParse *p, RAnalFunction *f, ut64 addr, int oplen, char *data, char *str, int len) {
-	RList *regs, *bpargs, *spargs;
-	RAnalVar *reg, *bparg, *sparg;
-	RListIter *regiter, *bpargiter, *spiter;
+	RList *bpargs, *spargs;
+	RAnalVar *bparg, *sparg;
+	RListIter *bpargiter, *spiter;
 	char oldstr[64], newstr[64];
 	char *tstr = strdup (data);
 	if (!tstr) {
@@ -374,7 +390,6 @@
                 free (tstr);
 		return false;
         }
-	regs = p->varlist (p->anal, f, 'r');
 	bpargs = p->varlist (p->anal, f, 'b');
 	spargs = p->varlist (p->anal, f, 's');
 	/*iterate over stack pointer arguments/variables*/
@@ -466,13 +481,6 @@
 		bp[0] = 0;
 	}
 
-	r_list_foreach (regs, regiter, reg) {
-		RRegItem *r = r_reg_index_get (p->anal->reg, reg->delta);
-		if (r && r->name && strstr (tstr, r->name)){
-			tstr = r_str_replace (tstr, r->name, reg->name, 1);
-		}
-	}
-
 	bool ret = true;
 	if (len > strlen (tstr)) {
 		strncpy (str, tstr, strlen (tstr));
@@ -484,7 +492,6 @@
 	free (tstr);
 	r_list_free (spargs);
 	r_list_free (bpargs);
-	r_list_free (regs);
 	return ret;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/parse/parse.c radare2-2.8.0+dfsg/libr/parse/parse.c
--- radare2-2.3.0+dfsg/libr/parse/parse.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/parse/parse.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2009-2017 - nibble, pancake, maijin */
+/* radare2 - LGPL - Copyright 2009-2018 - nibble, pancake, maijin */
 
 #include <stdio.h>
 
@@ -25,6 +25,7 @@
 	p->parsers->free = NULL; // memleak
 	p->notin_flagspace = -1;
 	p->flagspace = -1;
+	p->pseudo = false;
 	p->relsub = false;
 	p->minval = 0x100;
 	p->localvar_only = false;
@@ -111,57 +112,64 @@
 }
 
 static char *findNextNumber(char *op) {
+	if (!op) {
+		return NULL;
+	}
 	bool ansi_found = false;
 	char *p = op;
-	if (p && *p) {
-		const char *o = NULL;
-		while (*p) {
-			if (*p == 0x1b) {
-				p++;
-				if (!*p) {
-					break;
-				}
-				if (*p == '[') {
+	const char *o = NULL;
+	while (*p) {
+		if (p[0] == 0x1b && p[1] == '[') {
+			ansi_found = true;
+			p += 2;
+			if (p[0] && p[1] == ';') {
+				// "\x1b[%d;2;%d;%d;%dm", fgbg, r, g, b
+				// "\x1b[%d;5;%dm", fgbg, rgb (r, g, b)
+				for (; p[0] && p[1] && p[0] != 0x1b && p[1] != '\\'; p++);
+				if (p[0] && p[1] == '\\') {
 					p++;
-					if (p[0] && p[1] == ';') {
-						// "\x1b[%d;2;%d;%d;%dm", fgbg, r, g, b
-						// "\x1b[%d;5;%dm", fgbg, rgb (r, g, b)
-						for (; p[0] && p[1] && p[0] != 0x1b && p[1] != '\\'; p++);
-						if (p[1] == '\\') p++;
-					} else {
-						// "\x1b[%dm", 30 + k
-						for (; *p && *p != 'J' && *p != 'm' && *p != 'H'; p++);
-						if (*p) p++;
-					}
-					ansi_found = true;
 				}
-				o = p - 1;
 			} else {
-				bool is_space = ansi_found;
-				ansi_found = false;
-				if (!is_space) {
-					is_space = p == op;
-					if (!is_space && o) {
-						is_space = (*o == ' ' || *o == ',' || *o == '[');
+				// "\x1b[%dm", 30 + k
+				for (; *p && *p != 'J' && *p != 'm' && *p != 'H'; p++);
+				if (*p) {
+					p++;
+					if (!*p) {
+						break;
 					}
 				}
-				if (*p == '[') {
+			}
+			o = p - 1;
+		} else {
+			bool is_space = ansi_found;
+			ansi_found = false;
+			if (!is_space) {
+				is_space = p == op;
+				if (!is_space && o) {
+					is_space = (*o == ' ' || *o == ',' || *o == '[');
+				}
+			}
+			if (*p == '[') {
+				p++;
+				if (!*p) {
+					break;
+				}
+				if (!IS_DIGIT (*p)) {
 					char *t = p;
-					p++;
-					if (!IS_DIGIT (*p)) {
-						for (;*t && *t != ']'; t++);
-						if (*t == ']') {
-							continue;
-						} else {
-							p = t;
-						}
+					for (; *t && *t != ']'; t++);
+					if (*t == ']') {
+						continue;
+					}
+					p = t;
+					if (!*p) {
+						break;
 					}
 				}
-				if (is_space && IS_DIGIT (*p)) {
-					return p;
-				}
-				o = p++;
 			}
+			if (is_space && IS_DIGIT (*p)) {
+				return p;
+			}
+			o = p++;
 		}
 	}
 	return NULL;
@@ -210,7 +218,7 @@
 		//		eprintf ("(%s) (%c)\n", optr, *ptr2);
 			}
 		} else {
-			for (ptr2 = ptr; *ptr2 && (*ptr2 != ']' && (*ptr2 != '\x1b') && !ISSEPARATOR (*ptr2)); ptr2++);
+			for (ptr2 = ptr; *ptr2 && (*ptr2 != ']' && (*ptr2 != '\x1b') && !IS_SEPARATOR (*ptr2)); ptr2++);
 		}
 		off = r_num_math (NULL, ptr);
 		if (off >= p->minval) {
@@ -268,7 +276,7 @@
 						}
 					}
 					*ptr = 0;
-					snprintf (str, len, "%s%s%s", data, flag->name,
+					snprintf (str, len, "%s%s%s", data, f->realnames? flag->realname : flag->name,
 							(ptr != ptr2) ? ptr2 : "");
 					bool banned = false;
 					{
@@ -284,6 +292,9 @@
 						char *ptr_end = str + strlen (data) + flag_len - 1;
 						char *ptr_right = ptr_end + 1, *ptr_left, *ptr_esc;
 						bool ansi_found = false;
+						if (!*ptr_end) {
+							return true;
+						}
 						while (*ptr_right) {
 							if (*ptr_right == 0x1b) {
 								while (*ptr_right && *ptr_right != 'm') ptr_right++;
@@ -313,10 +324,20 @@
 								if (copied_len < 1) {
 									break;
 								}
+								char *dptr_left;
+								char *dptr_end;
 								memmove (ptr_left, ptr_esc, copied_len);
-								sprintf (ptr_left + copied_len, "%s%s",
-										ansi_found && ptr_right - ptr_end + 1 >= 4 ? "\x1b[0m" : "",
-										ptr_right + 1);
+								dptr_left = strcpy (ptr_left + copied_len,
+										(ansi_found && ptr_right - ptr_end + 1 >= 4) ? Color_RESET : "");
+								int dlen = strlen (dptr_left);
+								dptr_left += dlen;
+								dptr_end = ptr_right + 1;
+								while (*dptr_end) {
+									dptr_end++;
+								}
+								int llen = dptr_end - (ptr_right + 1);
+								memmove (dptr_left, ptr_right + 1, llen);
+								dptr_left[llen] = 0;
 							}
 							break;
 						}
@@ -342,7 +363,7 @@
 				pnum += 2;
 			}
 			for (; *pnum; pnum++) {
-				if ((is_hex && ISHEXCHAR (*pnum)) || IS_DIGIT (*pnum)) {
+				if ((is_hex && IS_HEXCHAR (*pnum)) || IS_DIGIT (*pnum)) {
 					continue;
 				}
 				break;
@@ -479,7 +500,7 @@
 	char *n = strstr (opstr, "0x");
 	if (n) {
 		char *p = n + 2;
-		while (ISHEXCHAR (*p)) {
+		while (IS_HEXCHAR (*p)) {
 			p++;
 		}
 		memmove (n, p, strlen (p) + 1);
diff -Nru radare2-2.3.0+dfsg/libr/reg/meson.build radare2-2.8.0+dfsg/libr/reg/meson.build
--- radare2-2.3.0+dfsg/libr/reg/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/reg/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,14 +1,31 @@
-files=[
-'arena.c',
-'cond.c',
-'double.c',
-'profile.c',
-'reg.c',
-'value.c',
+files = [
+  'arena.c',
+  'cond.c',
+  'double.c',
+  'profile.c',
+  'reg.c',
+  'value.c',
 ]
 
 r_reg = library('r_reg', files,
   include_directories: [platform_inc],
-  link_with: [r_util],
-  install: true
+  dependencies: [r_util_dep],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_reg_dep = declare_dependency(link_with: r_reg,
+                               include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_reg],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_reg',
+  filebase: 'r_reg',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/reg/reg.c radare2-2.8.0+dfsg/libr/reg/reg.c
--- radare2-2.3.0+dfsg/libr/reg/reg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/reg/reg.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,7 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_reg.h>
 #include <r_util.h>
-#ifdef _MSC_VER
-#define strcasecmp stricmp
-#endif
 
 R_LIB_VERSION (r_reg);
 
@@ -21,7 +18,7 @@
 	RRegItem* item;
 	for (i = 0; i < R_REG_TYPE_LAST; ++i) {
 		r_list_foreach (reg->regset[i].regs, iter, item) {
-			if (!strcasecmp (rreg32, item->name) && item->size == 32) {
+			if (item->size == 32 && !r_str_casecmp (rreg32, item->name)) {
 				j = item->offset;
 				break;
 			}
@@ -71,16 +68,14 @@
 	case 'Z' + ('F' << 8): return R_REG_NAME_ZF;
 	case 'S' + ('F' << 8): return R_REG_NAME_SF;
 	case 'C' + ('F' << 8): return R_REG_NAME_CF;
-	case 'O' + ('F' << 8):
-		return R_REG_NAME_OF;
+	case 'O' + ('F' << 8): return R_REG_NAME_OF;
 	/* gpr */
 	case 'P' + ('C' << 8): return R_REG_NAME_PC;
 	case 'S' + ('R' << 8): return R_REG_NAME_SR;
 	case 'L' + ('R' << 8): return R_REG_NAME_LR;
 	case 'S' + ('P' << 8): return R_REG_NAME_SP;
 	case 'B' + ('P' << 8): return R_REG_NAME_BP;
-	case 'S' + ('N' << 8):
-		return R_REG_NAME_SN;
+	case 'S' + ('N' << 8): return R_REG_NAME_SN;
 	/* args */
 	case 'A' + ('0' << 8): return R_REG_NAME_A0;
 	case 'A' + ('1' << 8): return R_REG_NAME_A1;
diff -Nru radare2-2.3.0+dfsg/libr/rules.mk radare2-2.8.0+dfsg/libr/rules.mk
--- radare2-2.3.0+dfsg/libr/rules.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/rules.mk	2018-08-07 14:12:36.000000000 +0000
@@ -11,19 +11,20 @@
 endif
 
 LIBR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-ifeq (${LIBR},)
-ifeq ($(R2DIR),)
-$(error R2DIRis not defined)
-else
-LIBR:=$(R2DIR)/libr
-endif
-endif
+# /libr
 
 ALL?=
 CFLAGS+=-I$(LIBR)
 CFLAGS+=-I$(LIBR)/include
+
+CFLAGS+=-fvisibility=hidden
+LDFLAGS+=-fvisibility=hidden
+LINK+=-fvisibility=hidden
+
+# for executables (DUP)
 LINK+=$(addprefix -L../,$(subst r_,,$(BINDEPS)))
 LINK+=$(addprefix -l,$(BINDEPS))
+
 SRC=$(subst .o,.c,$(OBJ))
 
 BEXE=$(BIN)$(EXT_EXE)
@@ -68,7 +69,6 @@
 	@-if [ -f p/Makefile ] ; then (echo "DIR ${NAME}/p"; cd p && ${MAKE}) ; fi
 endif
 
-ifeq ($(WITHPIC),1)
 $(LIBSO): $(EXTRA_TARGETS) ${WFD} ${OBJS} ${SHARED_OBJ}
 	@for a in ${OBJS} ${SHARED_OBJ} ${SRC}; do \
 	  do=0 ; [ ! -e ${LIBSO} ] && do=1 ; \
@@ -81,19 +81,15 @@
 	    [ -f "$(LIBR)/stripsyms.sh" ] && sh $(LIBR)/stripsyms.sh ${LIBSO} ${NAME} ; \
 	  break ; \
 	fi ; done
-else
-${LIBSO}: ;
-endif
 
-ifeq ($(WITHNONPIC),1)
+ifeq ($(WITH_LIBR),1)
 $(LIBAR): ${OBJS}
-ifneq ($(SILENT),)
-	echo "CC_AR $(LIBAR)"
-endif
+	[ "${SILENT}" = 1 ] && @echo "CC_AR $(LIBAR)" || true
 	rm -f $(LIBAR)
 	${CC_AR} ${OBJS} ${SHARED_OBJ}
 	${RANLIB} $(LIBAR)
 else
+# ${LIBSO} $(LIBAR): ;
 $(LIBAR): ;
 endif
 
diff -Nru radare2-2.3.0+dfsg/libr/search/meson.build radare2-2.8.0+dfsg/libr/search/meson.build
--- radare2-2.3.0+dfsg/libr/search/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/search/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,17 +1,34 @@
-files=[
-'aes-find.c',
-'bytepat.c',
-'keyword.c',
-# 'old_xrefs.c',
-'regexp.c',
-'rsa-find.c',
-'search.c',
-'strings.c',
-'xrefs.c',
+files = [
+  'aes-find.c',
+  'bytepat.c',
+  'keyword.c',
+  # 'old_xrefs.c',
+  'regexp.c',
+  'rsa-find.c',
+  'search.c',
+  'strings.c',
+  'xrefs.c',
 ]
 
 r_search = library('r_search', files,
   include_directories: [platform_inc],
-  link_with: [r_util],
-  install: true
+  dependencies: [r_util_dep],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_search_dep = declare_dependency(link_with: r_search,
+                                  include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_search],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_search',
+  filebase: 'r_search',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/search/regexp.c radare2-2.8.0+dfsg/libr/search/regexp.c
--- radare2-2.3.0+dfsg/libr/search/regexp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/search/regexp.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 	RSearchKeyword *kw;
 	RListIter *iter;
 	RRegexMatch match;
-	RRegex compiled;
+	RRegex compiled = {0};
 	const int old_nhits = s->nhits;
 	int ret = 0;
 
diff -Nru radare2-2.3.0+dfsg/libr/search/strings.c radare2-2.8.0+dfsg/libr/search/strings.c
--- radare2-2.3.0+dfsg/libr/search/strings.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/search/strings.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,7 @@
-/* radare - LGPL - Copyright 2006-2009 pancake<nopcode.org> */
+/* radare - LGPL - Copyright 2006-2018 pancake */
 
 #include "r_search.h"
-#if _MSC_VER
-#define strncasecmp strnicmp
-#endif
+
 // TODO: this file needs some love
 enum {
 	ENCODING_ASCII = 0,
@@ -22,7 +20,7 @@
 	ut32 lename = strlen (name);
 	for (i = 0; encodings[i]; i++) {
 		ut32 sz = R_MIN (strlen (encodings[i]), lename);
-		if (!strncasecmp (name, encodings[i], sz)) {
+		if (!r_str_ncasecmp (name, encodings[i], sz)) {
 			return i; 
 		}
 	}
@@ -69,153 +67,39 @@
 	RSearchKeyword *kw;
 
 	r_list_foreach (s->kws, iter, kw) {
-	for (i=0; i<len; i++) {
-		char ch = buf[i];
-		// non-cp850 encoded
-		if (IS_PRINTABLE(ch) || IS_WHITESPACE(ch) || is_encoded (0, ch)) {
-			str[matches] = ch;
-			if (matches < sizeof(str))
-				matches++;
-		} else {
-			/* wide char check \x??\x00\x??\x00 */
-			if (matches && i + 2 < len && buf[i+2]=='\0' && buf[i]=='\0' && buf[i+1]!='\0') {
-				widechar = 1;
-				return 1; // widechar
-			}
-			/* check if the length fits on our request */
-			if (matches >= s->string_min && (s->string_max == 0 || matches <= s->string_max)) {
-				str[matches] = '\0';
-				int len = strlen(str);
-				if (len>2) {
-					if (widechar) {
-						ut64 off = (ut64)from+i-(len*2)+1;
-						r_search_hit_new (s, kw, off);
-					} else {
-						ut64 off = (ut64)from+i-matches;
-						r_search_hit_new (s, kw, off);
-					}
-				}
-				fflush(stdout);
-			}
-			matches = 0;
-			widechar = 0;
-		}
-	}
-	}
-	return 0;
-}
-#if 0
-R_API int r_search_strings_update_char(const ut8 *buf, int min, int max, int enc, ut64 offset, const char *match)
-{
-	static int widechar = 0;
-	static int matches = 0;
-	static char str[4096];
-
-	if (IS_PRINTABLE(buf[0]) || is_encoded(enc, buf[0])) {
-		str[matches] = buf[0];
-		if (matches < sizeof(str))
-			matches++;
-	} else {
-		/* wide char check \x??\x00\x??\x00 */
-		if (matches && buf[2]=='\0' && buf[0]=='\0' && buf[1]!='\0') {
-			widechar = 1;
-			return 1; // widechar
-		}
-		/* check if the length fits on our request */
-		if (matches >= min && (max == 0 || matches <= max)) {
-			str[matches] = '\0';
-			// XXX Support for 32 and 64 bits here
-			if (match && match[0]=='*' && match[1]=='\0') {
-				int i,len = strlen(str);
-				char msg[32];
-				if (len>20) len = 20;
-				strcpy(msg, "str_");
-				memcpy(msg+4, str, len);
-				str[4+len]='\0';
-				for(i=4;i<len+4;i++) {
-					switch(msg[i]) {
-					case ' ':
-					case '@':
-					case '%':
-					case '#':
-					case '!':
-					case ':':
-					case '"':
-					case '&':
-					case '>':
-					case '<':
-					case ';':
-					case '`':
-					case '\'':
-						msg[i]='_';
-					}
+		for (i = 0; i < len; i++) {
+			char ch = buf[i];
+			// non-cp850 encoded
+			if (IS_PRINTABLE(ch) || IS_WHITESPACE(ch) || is_encoded (0, ch)) {
+				str[matches] = ch;
+				if (matches < sizeof (str)) {
+					matches++;
 				}
-
-				printf("f %s @ 0x%08x\n", msg, (unsigned int)offset-matches);
 			} else {
-				if ((!match) || (match && strstr(str, match)) ){
+				/* wide char check \x??\x00\x??\x00 */
+				if (matches && i + 2 < len && buf[i+2]=='\0' && buf[i]=='\0' && buf[i+1]!='\0') {
+					widechar = 1;
+					return 1; // widechar
+				}
+				/* check if the length fits on our request */
+				if (matches >= s->string_min && (s->string_max == 0 || matches <= s->string_max)) {
+					str[matches] = '\0';
 					int len = strlen(str);
 					if (len>2) {
 						if (widechar) {
-							ut64 off = offset-(len*2)+1;
-							printf("0x%08"PFMT64x" %3d W %s\n", off, len, str);
+							ut64 off = (ut64)from+i-(len*2)+1;
+							r_search_hit_new (s, kw, off);
 						} else {
-							printf("0x%08"PFMT64x" %3d A %s\n",
-								(ut64)offset-matches, len, str);
+							ut64 off = (ut64)from+i-matches;
+							r_search_hit_new (s, kw, off);
 						}
 					}
-					fflush(stdout);
+					fflush (stdout);
 				}
+				matches = 0;
+				widechar = 0;
 			}
 		}
-		matches = 0;
-		widechar = 0;
 	}
 	return 0;
 }
-#endif
-#if 0
-
-int stripstr_from_file(const char *filename, int min, int max, int encoding, ut64 seek, ut64 limit)
-{
-	int fd = open(filename, O_RDONLY);
-	unsigned char *buf;
-	ut64 i = seek;
-	ut64 len;
-
-	if (fd == -1) {
-		eprintf("Cannot open target file.\n");
-		return 1;
-	}
-
-	len = lseek(fd, (off_t)0, SEEK_END);
-
-	/* TODO: do not use mmap */
-#if __UNIX__
-	buf = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, (off_t)0);
-	if (((int)buf) == -1 ) {
-		perror("mmap");
-		return 1;
-	}
-	if (min <1)
-		min = 5;
-	max = 0;
-
-	if (limit && limit < len)
-		len = limit;
-
-	radare_controlc();
-	for(i = (size_t)seek; !config.interrupted && i < len; i++)
-		stripstr_iterate(buf+i, i, min, max, encoding, i, "");
-	radare_controlc_end();
-	
-	munmap(buf, len); 
-#endif
-#if __WINDOWS__
-	eprintf("Not yet implemented\n");
-#endif
-	close(fd);
-
-	return 0;
-}
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/socket/http_server.c radare2-2.8.0+dfsg/libr/socket/http_server.c
--- radare2-2.3.0+dfsg/libr/socket/http_server.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/socket/http_server.c	2018-08-07 14:12:36.000000000 +0000
@@ -8,13 +8,17 @@
 	breaked = b;
 }
 
-R_API RSocketHTTPRequest *r_socket_http_accept (RSocket *s, int timeout) {
+R_API RSocketHTTPRequest *r_socket_http_accept (RSocket *s, int accept_timeout, int timeout) {
 	int content_length = 0, xx, yy;
 	int pxx = 1, first = 0;
 	char buf[1500], *p, *q;
 	RSocketHTTPRequest *hr = R_NEW0 (RSocketHTTPRequest);
 	if (!hr) return NULL;
-	hr->s = r_socket_accept (s);
+	if (accept_timeout > 0) {
+		hr->s = r_socket_accept_timeout (s, 1);
+	} else {
+		hr->s = r_socket_accept (s);
+	}
 	if (!hr->s) {
 		free (hr);
 		return NULL;
diff -Nru radare2-2.3.0+dfsg/libr/socket/meson.build radare2-2.8.0+dfsg/libr/socket/meson.build
--- radare2-2.3.0+dfsg/libr/socket/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/socket/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,18 +1,34 @@
-files=[
-'http.c',
-'http_server.c',
-'proc.c',
-'r2pipe.c',
-'rap_server.c',
-'run.c',
-'socket.c',
-'serial.c',
+files = [
+  'http.c',
+  'http_server.c',
+  'proc.c',
+  'r2pipe.c',
+  'rap_server.c',
+  'run.c',
+  'socket.c',
+  'serial.c',
 ]
 
 r_socket = library('r_socket', files,
   include_directories: [platform_inc],
-  dependencies: [utl, platform_deps],
-  link_with: [r_util],
-  c_args : '-DCORELIB=1',
-  install: true
+  dependencies: [utl, r_util_dep, platform_deps],
+  c_args: ['-DCORELIB=1'],
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_socket_dep = declare_dependency(link_with: r_socket,
+                                  include_directories: [platform_inc])
+
+pkgconfig_mod.generate(
+  libraries: [r_socket],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_socket',
+  filebase: 'r_socket',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/socket/run.c radare2-2.8.0+dfsg/libr/socket/run.c
--- radare2-2.3.0+dfsg/libr/socket/run.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/socket/run.c	2018-08-07 14:12:36.000000000 +0000
@@ -47,6 +47,8 @@
 #endif
 #if defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <util.h>
+#elif defined(__FreeBSD__)
+#include <libutil.h>
 #endif
 #endif
 #ifdef _MSC_VER
@@ -54,7 +56,7 @@
 #include <process.h>  // to compile execv in msvc windows
 #endif
 
-#define HAVE_PTY __UNIX__ && !__ANDROID__ && LIBC_HAVE_FORK && !defined(__sun)
+#define HAVE_PTY __UNIX__ && !__ANDROID__ && LIBC_HAVE_FORK && !__sun
 
 #if EMSCRIPTEN
 #undef HAVE_PTY
@@ -216,11 +218,12 @@
 	return ret;
 }
 
-static int parseBool (const char *e) {
+static int parseBool(const char *e) {
 	return (strcmp (e, "yes")?
+		(strcmp (e, "on")?
 		(strcmp (e, "true")?
 		(strcmp (e, "1")?
-		0: 1): 1): 1);
+		0: 1): 1): 1): 1);
 }
 
 #if __linux__
@@ -243,7 +246,7 @@
 #if __ANDROID__
 		setRVA ("0\n");
 #else
-#ifdef ADDR_NO_RANDOMIZE
+#if HAVE_DECL_ADDR_NO_RANDOMIZE
 		if (personality (ADDR_NO_RANDOMIZE) == -1)
 #endif
 			setRVA ("0\n");
@@ -267,17 +270,19 @@
 #endif
 }
 
-static void restore_saved_fd (int saved, bool resore, int fd) {
+#if HAVE_PTY
+static void restore_saved_fd(int saved, bool restore, int fd) {
 	if (saved == -1) {
 		return;
 	}
-	if (resore) {
+	if (restore) {
 		dup2 (saved, fd);
 	}
 	close (saved);
 }
+#endif
 
-static int handle_redirection_proc (const char *cmd, bool in, bool out, bool err) {
+static int handle_redirection_proc(const char *cmd, bool in, bool out, bool err) {
 #if HAVE_PTY
 	// use PTY to redirect I/O because pipes can be problematic in
 	// case of interactive programs.
@@ -291,28 +296,53 @@
 		return -1;
 	}
 	int fdm, pid = forkpty (&fdm, NULL, NULL, NULL);
+	if (pid == -1) {
+		close (saved_stdin);
+		close (saved_stdout);
+		return -1;
+	}
+	const char *tn = ttyname (fdm);
+	if (!tn) {
+		close (saved_stdin);
+		close (saved_stdout);
+		return -1;
+	}
+	int fds = open (tn, O_RDWR);
+	if (fds == -1) {
+		close (saved_stdin);
+		close (saved_stdout);
+		return -1;
+	}
 	if (pid == 0) {
+		close (fdm);
 		// child process
 		if (in) {
-			dup2 (fdm, STDIN_FILENO);
+			dup2 (fds, STDIN_FILENO);
 		}
 		if (out) {
-			dup2 (fdm, STDOUT_FILENO);
+			dup2 (fds, STDOUT_FILENO);
 		}
 		// child - program to run
 
 		// necessary because otherwise you can read the same thing you
 		// wrote on fdm.
 		struct termios t;
-		tcgetattr (0, &t);
+		tcgetattr (fds, &t);
 		cfmakeraw (&t);
-		tcsetattr (0, TCSANOW, &t);
+		tcsetattr (fds, TCSANOW, &t);
 
 		int code = r_sys_cmd (cmd);
 		restore_saved_fd (saved_stdin, in, STDIN_FILENO);
 		restore_saved_fd (saved_stdout, out, STDOUT_FILENO);
 		exit (code);
 	} else {
+		close (fds);
+		if (in) {
+			dup2 (fdm, STDIN_FILENO);
+		}
+		if (out) {
+			dup2 (fdm, STDOUT_FILENO);
+		}
 		// parent process
 		int status;
 		waitpid (pid, &status, 0);
@@ -397,7 +427,7 @@
 	}
 }
 
-R_API int r_run_parsefile (RRunProfile *p, const char *b) {
+R_API int r_run_parsefile(RRunProfile *p, const char *b) {
 	char *s = r_file_slurp (b, NULL);
 	if (s) {
 		int ret = r_run_parse (p, s);
@@ -407,7 +437,7 @@
 	return 0;
 }
 
-R_API bool r_run_parseline (RRunProfile *p, char *b) {
+R_API bool r_run_parseline(RRunProfile *p, char *b) {
 	int must_free = false;
 	char *e = strchr (b, '=');
 	if (!e || *b == '#') {
@@ -551,7 +581,7 @@
 	"# #stdio=blah.txt\n"
 	"# #stderr=foo.txt\n"
 	"# stdout=foo.txt\n"
-	"# stdin=input.txt # or !program to redirect input to another program\n"
+	"# stdin=input.txt # or !program to redirect input from another program\n"
 	"# input=input.txt\n"
 	"# chdir=/\n"
 	"# chroot=/mnt/chroot\n"
@@ -565,7 +595,7 @@
 	"# nice=5\n";
 }
 
-#if __UNIX__
+#if HAVE_PTY
 static int fd_forward(int in_fd, int out_fd, char **buff) {
 	int size = 0;
 
@@ -583,7 +613,10 @@
 		return -1;
 	}
 	*buff = new_buff;
-	(void)read (in_fd, *buff, size);
+	if (read (in_fd, *buff, size) != size) {
+		perror ("read");
+		return -1;
+	}
 	if (write (out_fd, *buff, size) != size) {
 		perror ("write");
 		return -1;
diff -Nru radare2-2.3.0+dfsg/libr/socket/serial.c radare2-2.8.0+dfsg/libr/socket/serial.c
--- radare2-2.3.0+dfsg/libr/socket/serial.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/socket/serial.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,39 +9,39 @@
 #include <termios.h>
 
 static int set_interface_attribs (int fd, int speed, int parity) {
-        struct termios tty;
-        memset (&tty, 0, sizeof tty);
-        if (tcgetattr (fd, &tty) != 0) {
-                return -1;
-        }
-        cfsetospeed (&tty, speed);
-        cfsetispeed (&tty, speed);
-
-        tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS8;     // 8-bit chars
-        // disable IGNBRK for mismatched speed tests; otherwise receive break
-        // as \000 chars
-        tty.c_iflag &= ~IGNBRK;         // disable break processing
-        tty.c_lflag = 0;                // no signaling chars, no echo,
-        // no canonical processing
-        tty.c_oflag = 0;                // no remapping, no delays
-        tty.c_cc[VMIN]  = 0;            // read doesn't block
-        tty.c_cc[VTIME] = 5;            // 0.5 seconds read timeout
-
-        tty.c_iflag &= ~(IXON | IXOFF | IXANY); // shut off xon/xoff ctrl
-
-        tty.c_cflag |= (CLOCAL | CREAD);// ignore modem controls,
-        // enable reading
-        tty.c_cflag &= ~(PARENB | PARODD);      // shut off parity
-        tty.c_cflag |= parity;
-        tty.c_cflag &= ~CSTOPB;
+	struct termios tty;
+	memset (&tty, 0, sizeof tty);
+	if (tcgetattr (fd, &tty) != 0) {
+		return -1;
+	}
+	cfsetospeed (&tty, speed);
+	cfsetispeed (&tty, speed);
+
+	tty.c_cflag = (tty.c_cflag & ~CSIZE) | CS8;     // 8-bit chars
+	// disable IGNBRK for mismatched speed tests; otherwise receive break
+	// as \000 chars
+	tty.c_iflag &= ~IGNBRK;         // disable break processing
+	tty.c_lflag = 0;                // no signaling chars, no echo,
+	// no canonical processing
+	tty.c_oflag = 0;                // no remapping, no delays
+	tty.c_cc[VMIN]  = 0;            // read doesn't block
+	tty.c_cc[VTIME] = 5;            // 0.5 seconds read timeout
+
+	tty.c_iflag &= ~(IXON | IXOFF | IXANY); // shut off xon/xoff ctrl
+
+	tty.c_cflag |= (CLOCAL | CREAD);// ignore modem controls,
+	// enable reading
+	tty.c_cflag &= ~(PARENB | PARODD);      // shut off parity
+	tty.c_cflag |= parity;
+	tty.c_cflag &= ~CSTOPB;
 #ifdef CRTSCTS
-        tty.c_cflag &= ~CRTSCTS;
+	tty.c_cflag &= ~CRTSCTS;
 #endif
 
-        if (tcsetattr (fd, TCSANOW, &tty) != 0) {
-                return -1;
-        }
-        return 0;
+	if (tcsetattr (fd, TCSANOW, &tty) != 0) {
+		return -1;
+	}
+	return 0;
 }
 
 R_API int r_socket_connect_serial(RSocket *sock, const char *path, int speed, int parity) {
diff -Nru radare2-2.3.0+dfsg/libr/socket/socket.c radare2-2.8.0+dfsg/libr/socket/socket.c
--- radare2-2.3.0+dfsg/libr/socket/socket.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/socket/socket.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2006-2017 - pancake */
+/* radare - LGPL - Copyright 2006-2018 - pancake */
 
 /* must be included first because of winsock2.h and windows.h */
 #include <r_socket.h>
@@ -40,7 +40,7 @@
 R_API bool r_socket_connect (RSocket *s, const char *host, const char *port, int proto, unsigned int timeout) {
 	return false;
 }
-R_API int r_socket_spawn (RSocket *s, const char *cmd, unsigned int timeout) {
+R_API bool r_socket_spawn (RSocket *s, const char *cmd, unsigned int timeout) {
 	return -1;
 }
 R_API int r_socket_close_fd (RSocket *s) {
@@ -211,13 +211,13 @@
 	return s;
 }
 
-R_API int r_socket_spawn (RSocket *s, const char *cmd, unsigned int timeout) {
+R_API bool r_socket_spawn (RSocket *s, const char *cmd, unsigned int timeout) {
 	// XXX TODO: dont use sockets, we can achieve the same with pipes
 	const int port = 2000 + r_num_rand (2000);
-	int childPid = r_sys_fork();
+	int childPid = r_sys_fork ();
 	if (childPid == 0) {
 		char *a = r_str_replace (strdup (cmd), "\\", "\\\\", true);
-		r_sys_cmdf ("rarun2 system=\"%s\" listen=%d", a, port);
+		int res = r_sys_cmdf ("rarun2 system=\"%s\" listen=%d", a, port);
 		free (a);
 #if 0
 		// TODO: use the api
@@ -229,15 +229,35 @@
 		r_run_free (rp);
 		free (profile);
 #endif
+		if (res != 0) {
+			eprintf ("r_socket_spawn: rarun2 failed\n");
+			exit (1);
+		}
 		eprintf ("r_socket_spawn: %s is dead\n", cmd);
 		exit (0);
 	}
 	r_sys_sleep (1);
 	r_sys_usleep (timeout);
+
 	char aport[32];
 	sprintf (aport, "%d", port);
 	// redirect stdin/stdout/stderr
-	return r_socket_connect (s, "127.0.0.1", aport, R_SOCKET_PROTO_TCP, 2000);
+	bool sock = r_socket_connect (s, "127.0.0.1", aport, R_SOCKET_PROTO_TCP, 2000);
+	if (!sock) {
+		return false;
+	}
+#if __UNIX__
+	r_sys_sleep (4);
+	r_sys_usleep (timeout);
+
+	int status = 0;
+	int ret = waitpid (childPid, &status, WNOHANG);
+	if (ret != 0) {
+		r_socket_close (s);
+		return false;
+	}
+#endif
+	return true;
 }
 
 R_API bool r_socket_connect (RSocket *s, const char *host, const char *port, int proto, unsigned int timeout) {
@@ -559,7 +579,10 @@
 	//signal (SIGPIPE, SIG_DFL);
 	sock->fd = accept (s->fd, (struct sockaddr *)&s->sa, &salen);
 	if (sock->fd == -1) {
-		r_sys_perror ("accept");
+		if (errno != EWOULDBLOCK) {
+			// not just a timeout
+			r_sys_perror ("accept");
+		}
 		free (sock);
 		return NULL;
 	}
@@ -587,6 +610,30 @@
 	return sock;
 }
 
+R_API RSocket *r_socket_accept_timeout(RSocket *s, unsigned int timeout) {
+	fd_set read_fds;
+	fd_set except_fds;
+
+	FD_ZERO (&read_fds);
+	FD_SET (s->fd, &read_fds);
+
+	FD_ZERO (&except_fds);
+	FD_SET (s->fd, &except_fds);
+
+	struct timeval t;
+	t.tv_sec = timeout;
+	t.tv_usec = 0;
+
+	int r = select (s->fd + 1, &read_fds, NULL, &except_fds, &t);
+	if(r < 0) {
+		perror ("select");
+	} else if (r > 0 && FD_ISSET (s->fd, &read_fds)) {
+		return r_socket_accept (s);
+	}
+
+	return NULL;
+}
+
 R_API int r_socket_block_time (RSocket *s, int block, int sec) {
 #if __UNIX__ || defined(__CYGWIN__)
 	int ret, flags;
diff -Nru radare2-2.3.0+dfsg/libr/syscall/d/darwin-x86-32.sdb.txt radare2-2.8.0+dfsg/libr/syscall/d/darwin-x86-32.sdb.txt
--- radare2-2.3.0+dfsg/libr/syscall/d/darwin-x86-32.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/syscall/d/darwin-x86-32.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,107 +1,468 @@
 _=0x80
-syscall=0x80,0,4,
-exit=0x80,1,1,i
-fork=0x80,2,0,
-read=0x80,3,3,
-write=0x80,4,3,iZi
-open=0x80,5,3,zii
-close=0x80,6,1,i
-wait4=0x80,7,3,
-old_creat=0x80,8,2,
-link=0x80,9,2,zz
-unlink=0x80,10,1,z
-old_execve=0x80,11,3,zpp
-chdir=0x80,12,1,z
-fchdir=0x80,13,1,
-mknod=0x80,14,1,
-chmod=0x80,15,1,zi
-chown=0x80,16,1,
-break=0x80,17,1,
-old_fsstat=0x80,18,1,
-old_lseek=0x80,19,1,
-getpid=0x80,20,0,
-mount=0x80,21,0,
-unmount=0x80,22,0,
-setuid=0x80,23,1,
-getuid=0x80,24,0,
-ptrace=0x80,26,4,
-recvmsg=0x80,27,4,
-sendmsg=0x80,28,4,
-recvfrom=0x80,29,4,
-accept=0x80,30,4,
-getpeername=0x80,31,3,
-getsockname=0x80,32,3,
-access=0x80,33,2,
-chflags=0x80,34,2,
-fchflags=0x80,35,2,
-sync=0x80,36,0,
-kill=0x80,37,2,
-dup=0x80,41,2,
-pipe=0x80,42,1,
-getepid=0x80,43,0,
-profil=0x80,44,4,/*
-ktrace=0x80,45,4,
-getgid=0x80,47,0,
-signal=0x80,48,2,
-getlogin=0x80,49,0,/*
-setlogin=0x80,50,1,/*
-acct=0x80,51,1,/*
-sigaltstack=0x80,53,2,/*
-ioctl=0x80,54,3,
-reboot=0x80,55,1,
-revoke=0x80,56,1,/*
-symlink=0x80,57,2,
-readlink=0x80,58,1,
-execve=0x80,59,2,zp
-umask=0x80,60,1,
-chroot=0x80,61,1,z
-mmap=0x80,90,6,
-munmap=0x80,91,1,
-socketcall=0x80,102,2,
-sigreturn=0x80,119,1,
-clone=0x80,120,4,
-mprotect=0x80,125,3,
-rt_sigaction=0x80,174,3,
-rt_sigprocmask=0x80,175,3,
-sysctl=0x80,149,1,
-mmap2=0x80,192,6,
-fstat64=0x80,197,2,
-fcntl64=0x80,221,3,
-gettid=0x80,224,0,
-set_thread_area=0x80,243,2,
-get_thread_area=0x80,244,2,
-exit_group=0x80,252,1,
-mach_reply_port=0x81,26,1,
-thread_self_trap=0x81,27,1,
-task_self_trap=0x81,28,1,
-host_self_trap=0x81,29,1,
-mach_msg_trap=0x81,31,1,
-mach_msg_overwrite_trap=0x81,32,1,
-semaphore_signal_trap=0x81,33,1,
-semaphore_signal_all_trap=0x81,34,1,
-semaphore_signal_thread_trap=0x81,35,1,
-semaphore_wait_trap=0x81,36,1,
-semaphore_wait_signal_trap=0x81,37,1,
-semaphore_timedwait_trap=0x81,38,1,
-semaphore_timedwait_signal_trap=0x81,39,1,
-init_process=0x81,41,1,
-map_fd=0x81,43,1,
-task_for_pid=0x81,45,1,
-pid_for_task=0x81,46,1,
-macx_swapon=0x81,48,1,
-macx_swapoff=0x81,49,1,
-macx_triggers=0x81,51,1,
-macx_backing_store_suspend=0x81,52,1,
-macx_backing_store_recovery=0x81,53,1,
-swtch_pri=0x81,59,1,
-swtch=0x81,60,1,
-thread_switch=0x81,61,1,
-clock_sleep_trap=0x81,62,1,
-mach_timebase_info_trap=0x81,89,1,
-mach_wait_until_trap=0x81,90,1,
-mk_timer_create_trap=0x81,91,1,
-mk_timer_destroy_trap=0x81,92,1,
-mk_timer_arm_trap=0x81,93,1,
-mk_timer_cancel_trap=0x81,94,1,
-mk_timebase_info_trap=0x81,95,1,
-iokit_user_client_trap=0x81,100,1,
+exit=0x80,0x1,1,
+fork=0x80,0x2,0,
+read=0x80,0x3,3,
+write=0x80,0x4,3,
+open=0x80,0x5,3,
+close=0x80,0x6,1,
+wait4=0x80,0x7,4,
+link=0x80,0x9,2,
+unlink=0x80,0xa,1,
+chdir=0x80,0xc,1,
+fchdir=0x80,0xd,1,
+mknod=0x80,0xe,3,
+chmod=0x80,0xf,2,
+chown=0x80,0x10,3,
+getfsstat=0x80,0x12,3,
+getpid=0x80,0x14,0,
+setuid=0x80,0x17,1,
+getuid=0x80,0x18,0,
+geteuid=0x80,0x19,0,
+ptrace=0x80,0x1a,4,
+recvmsg=0x80,0x1b,3,
+sendmsg=0x80,0x1c,3,
+recvfrom=0x80,0x1d,6,
+accept=0x80,0x1e,3,
+getpeername=0x80,0x1f,3,
+getsockname=0x80,0x20,3,
+access=0x80,0x21,2,
+chflags=0x80,0x22,2,
+fchflags=0x80,0x23,2,
+sync=0x80,0x24,0,
+kill=0x80,0x25,3,
+getppid=0x80,0x27,0,
+dup=0x80,0x29,1,
+pipe=0x80,0x2a,0,
+getegid=0x80,0x2b,0,
+sigaction=0x80,0x2e,3,
+getgid=0x80,0x2f,0,
+sigprocmask=0x80,0x30,3,
+getlogin=0x80,0x31,2,
+setlogin=0x80,0x32,1,
+acct=0x80,0x33,1,
+sigpending=0x80,0x34,1,
+sigaltstack=0x80,0x35,2,
+ioctl=0x80,0x36,3,
+reboot=0x80,0x37,2,
+revoke=0x80,0x38,1,
+symlink=0x80,0x39,2,
+readlink=0x80,0x3a,3,
+execve=0x80,0x3b,3,
+umask=0x80,0x3c,1,
+chroot=0x80,0x3d,1,
+msync=0x80,0x41,3,
+vfork=0x80,0x42,0,
+munmap=0x80,0x49,2,
+mprotect=0x80,0x4a,3,
+madvise=0x80,0x4b,3,
+mincore=0x80,0x4e,3,
+getgroups=0x80,0x4f,2,
+setgroups=0x80,0x50,2,
+getpgrp=0x80,0x51,0,
+setpgid=0x80,0x52,2,
+setitimer=0x80,0x53,3,
+swapon=0x80,0x55,0,
+getitimer=0x80,0x56,2,
+getdtablesize=0x80,0x59,0,
+dup2=0x80,0x5a,2,
+fcntl=0x80,0x5c,3,
+select=0x80,0x5d,5,
+fsync=0x80,0x5f,1,
+setpriority=0x80,0x60,3,
+socket=0x80,0x61,3,
+connect=0x80,0x62,3,
+getpriority=0x80,0x64,2,
+bind=0x80,0x68,3,
+setsockopt=0x80,0x69,5,
+listen=0x80,0x6a,2,
+sigsuspend=0x80,0x6f,1,
+gettimeofday=0x80,0x74,3,
+getrusage=0x80,0x75,2,
+getsockopt=0x80,0x76,5,
+readv=0x80,0x78,3,
+writev=0x80,0x79,3,
+settimeofday=0x80,0x7a,2,
+fchown=0x80,0x7b,3,
+fchmod=0x80,0x7c,2,
+setreuid=0x80,0x7e,2,
+setregid=0x80,0x7f,2,
+rename=0x80,0x80,2,
+flock=0x80,0x83,2,
+mkfifo=0x80,0x84,2,
+sendto=0x80,0x85,6,
+shutdown=0x80,0x86,2,
+socketpair=0x80,0x87,4,
+mkdir=0x80,0x88,2,
+rmdir=0x80,0x89,1,
+utimes=0x80,0x8a,2,
+futimes=0x80,0x8b,2,
+adjtime=0x80,0x8c,2,
+gethostuuid=0x80,0x8e,3,
+setsid=0x80,0x93,0,
+getpgid=0x80,0x97,1,
+setprivexec=0x80,0x98,1,
+pread=0x80,0x99,4,
+pwrite=0x80,0x9a,4,
+nfssvc=0x80,0x9b,2,
+statfs=0x80,0x9d,2,
+fstatfs=0x80,0x9e,2,
+unmount=0x80,0x9f,2,
+getfh=0x80,0xa1,2,
+quotactl=0x80,0xa5,4,
+mount=0x80,0xa7,4,
+csops=0x80,0xa9,4,
+csops_audittoken=0x80,0xaa,5,
+waitid=0x80,0xad,4,
+kdebug_typefilter=0x80,0xb1,2,
+kdebug_trace_string=0x80,0xb2,3,
+kdebug_trace64=0x80,0xb3,5,
+kdebug_trace=0x80,0xb4,5,
+setgid=0x80,0xb5,1,
+setegid=0x80,0xb6,1,
+seteuid=0x80,0xb7,1,
+sigreturn=0x80,0xb8,2,
+thread_selfcounts=0x80,0xba,3,
+fdatasync=0x80,0xbb,1,
+stat=0x80,0xbc,2,
+fstat=0x80,0xbd,2,
+lstat=0x80,0xbe,2,
+pathconf=0x80,0xbf,2,
+fpathconf=0x80,0xc0,2,
+getrlimit=0x80,0xc2,2,
+setrlimit=0x80,0xc3,2,
+getdirentries=0x80,0xc4,4,
+mmap=0x80,0xc5,6,
+lseek=0x80,0xc7,3,
+truncate=0x80,0xc8,2,
+ftruncate=0x80,0xc9,2,
+sysctl=0x80,0xca,6,
+mlock=0x80,0xcb,2,
+munlock=0x80,0xcc,2,
+undelete=0x80,0xcd,1,
+open_dprotected_np=0x80,0xd8,5,
+getattrlist=0x80,0xdc,5,
+setattrlist=0x80,0xdd,5,
+getdirentriesattr=0x80,0xde,8,
+exchangedata=0x80,0xdf,3,
+searchfs=0x80,0xe1,6,
+delete=0x80,0xe2,1,
+copyfile=0x80,0xe3,4,
+fgetattrlist=0x80,0xe4,5,
+fsetattrlist=0x80,0xe5,5,
+poll=0x80,0xe6,3,
+watchevent=0x80,0xe7,2,
+waitevent=0x80,0xe8,2,
+modwatch=0x80,0xe9,2,
+getxattr=0x80,0xea,6,
+fgetxattr=0x80,0xeb,6,
+setxattr=0x80,0xec,6,
+fsetxattr=0x80,0xed,6,
+removexattr=0x80,0xee,3,
+fremovexattr=0x80,0xef,3,
+listxattr=0x80,0xf0,4,
+flistxattr=0x80,0xf1,4,
+fsctl=0x80,0xf2,4,
+initgroups=0x80,0xf3,3,
+posix_spawn=0x80,0xf4,5,
+ffsctl=0x80,0xf5,4,
+nfsclnt=0x80,0xf7,2,
+fhopen=0x80,0xf8,2,
+minherit=0x80,0xfa,3,
+semsys=0x80,0xfb,5,
+msgsys=0x80,0xfc,5,
+shmsys=0x80,0xfd,4,
+semctl=0x80,0xfe,4,
+semget=0x80,0xff,3,
+semop=0x80,0x100,3,
+msgctl=0x80,0x102,3,
+msgget=0x80,0x103,2,
+msgsnd=0x80,0x104,4,
+msgrcv=0x80,0x105,5,
+shmat=0x80,0x106,3,
+shmctl=0x80,0x107,3,
+shmdt=0x80,0x108,1,
+shmget=0x80,0x109,3,
+shm_open=0x80,0x10a,3,
+shm_unlink=0x80,0x10b,1,
+sem_open=0x80,0x10c,4,
+sem_close=0x80,0x10d,1,
+sem_unlink=0x80,0x10e,1,
+sem_wait=0x80,0x10f,1,
+sem_trywait=0x80,0x110,1,
+sem_post=0x80,0x111,1,
+sysctlbyname=0x80,0x112,6,
+open_extended=0x80,0x115,6,
+umask_extended=0x80,0x116,2,
+stat_extended=0x80,0x117,4,
+lstat_extended=0x80,0x118,4,
+fstat_extended=0x80,0x119,4,
+chmod_extended=0x80,0x11a,5,
+fchmod_extended=0x80,0x11b,5,
+access_extended=0x80,0x11c,4,
+settid=0x80,0x11d,2,
+gettid=0x80,0x11e,2,
+setsgroups=0x80,0x11f,2,
+getsgroups=0x80,0x120,2,
+setwgroups=0x80,0x121,2,
+getwgroups=0x80,0x122,2,
+mkfifo_extended=0x80,0x123,5,
+mkdir_extended=0x80,0x124,5,
+identitysvc=0x80,0x125,2,
+shared_region_check_np=0x80,0x126,1,
+vm_pressure_monitor=0x80,0x128,3,
+psynch_rw_longrdlock=0x80,0x129,5,
+psynch_rw_yieldwrlock=0x80,0x12a,5,
+psynch_rw_downgrade=0x80,0x12b,5,
+psynch_rw_upgrade=0x80,0x12c,5,
+psynch_mutexwait=0x80,0x12d,5,
+psynch_mutexdrop=0x80,0x12e,5,
+psynch_cvbroad=0x80,0x12f,7,
+psynch_cvsignal=0x80,0x130,8,
+psynch_cvwait=0x80,0x131,8,
+psynch_rw_rdlock=0x80,0x132,5,
+psynch_rw_wrlock=0x80,0x133,5,
+psynch_rw_unlock=0x80,0x134,5,
+psynch_rw_unlock2=0x80,0x135,5,
+getsid=0x80,0x136,1,
+settid_with_pid=0x80,0x137,2,
+psynch_cvclrprepost=0x80,0x138,7,
+aio_fsync=0x80,0x139,2,
+aio_return=0x80,0x13a,1,
+aio_suspend=0x80,0x13b,3,
+aio_cancel=0x80,0x13c,2,
+aio_error=0x80,0x13d,1,
+aio_read=0x80,0x13e,1,
+aio_write=0x80,0x13f,1,
+lio_listio=0x80,0x140,4,
+iopolicysys=0x80,0x142,2,
+process_policy=0x80,0x143,7,
+mlockall=0x80,0x144,1,
+munlockall=0x80,0x145,1,
+issetugid=0x80,0x147,0,
+__pthread_kill=0x80,0x148,2,
+__pthread_sigmask=0x80,0x149,3,
+__sigwait=0x80,0x14a,2,
+__disable_threadsignal=0x80,0x14b,1,
+__pthread_markcancel=0x80,0x14c,1,
+__pthread_canceled=0x80,0x14d,1,
+__semwait_signal=0x80,0x14e,6,
+proc_info=0x80,0x150,6,
+sendfile=0x80,0x151,6,
+stat64=0x80,0x152,2,
+fstat64=0x80,0x153,2,
+lstat64=0x80,0x154,2,
+stat64_extended=0x80,0x155,4,
+lstat64_extended=0x80,0x156,4,
+fstat64_extended=0x80,0x157,4,
+getdirentries64=0x80,0x158,4,
+statfs64=0x80,0x159,2,
+fstatfs64=0x80,0x15a,2,
+getfsstat64=0x80,0x15b,3,
+__pthread_chdir=0x80,0x15c,1,
+__pthread_fchdir=0x80,0x15d,1,
+audit=0x80,0x15e,2,
+auditon=0x80,0x15f,3,
+getauid=0x80,0x161,1,
+setauid=0x80,0x162,1,
+getaudit_addr=0x80,0x165,2,
+setaudit_addr=0x80,0x166,2,
+auditctl=0x80,0x167,1,
+bsdthread_create=0x80,0x168,5,
+bsdthread_terminate=0x80,0x169,4,
+kqueue=0x80,0x16a,0,
+kevent=0x80,0x16b,6,
+lchown=0x80,0x16c,3,
+bsdthread_register=0x80,0x16e,7,
+workq_open=0x80,0x16f,0,
+workq_kernreturn=0x80,0x170,4,
+kevent64=0x80,0x171,7,
+__old_semwait_signal=0x80,0x172,5,
+__old_semwait_signal_nocancel=0x80,0x173,5,
+thread_selfid=0x80,0x174,0,
+ledger=0x80,0x175,4,
+kevent_qos=0x80,0x176,8,
+kevent_id=0x80,0x177,8,
+__mac_execve=0x80,0x17c,4,
+__mac_syscall=0x80,0x17d,3,
+__mac_get_file=0x80,0x17e,2,
+__mac_set_file=0x80,0x17f,2,
+__mac_get_link=0x80,0x180,2,
+__mac_set_link=0x80,0x181,2,
+__mac_get_proc=0x80,0x182,1,
+__mac_set_proc=0x80,0x183,1,
+__mac_get_fd=0x80,0x184,2,
+__mac_set_fd=0x80,0x185,2,
+__mac_get_pid=0x80,0x186,2,
+pselect=0x80,0x18a,6,
+pselect_nocancel=0x80,0x18b,6,
+read_nocancel=0x80,0x18c,3,
+write_nocancel=0x80,0x18d,3,
+open_nocancel=0x80,0x18e,3,
+close_nocancel=0x80,0x18f,1,
+wait4_nocancel=0x80,0x190,4,
+recvmsg_nocancel=0x80,0x191,3,
+sendmsg_nocancel=0x80,0x192,3,
+recvfrom_nocancel=0x80,0x193,6,
+accept_nocancel=0x80,0x194,3,
+msync_nocancel=0x80,0x195,3,
+fcntl_nocancel=0x80,0x196,3,
+select_nocancel=0x80,0x197,5,
+fsync_nocancel=0x80,0x198,1,
+connect_nocancel=0x80,0x199,3,
+sigsuspend_nocancel=0x80,0x19a,1,
+readv_nocancel=0x80,0x19b,3,
+writev_nocancel=0x80,0x19c,3,
+sendto_nocancel=0x80,0x19d,6,
+pread_nocancel=0x80,0x19e,4,
+pwrite_nocancel=0x80,0x19f,4,
+waitid_nocancel=0x80,0x1a0,4,
+poll_nocancel=0x80,0x1a1,3,
+msgsnd_nocancel=0x80,0x1a2,4,
+msgrcv_nocancel=0x80,0x1a3,5,
+sem_wait_nocancel=0x80,0x1a4,1,
+aio_suspend_nocancel=0x80,0x1a5,3,
+__sigwait_nocancel=0x80,0x1a6,2,
+__semwait_signal_nocancel=0x80,0x1a7,6,
+__mac_mount=0x80,0x1a8,5,
+__mac_get_mount=0x80,0x1a9,2,
+__mac_getfsstat=0x80,0x1aa,5,
+fsgetpath=0x80,0x1ab,4,
+audit_session_self=0x80,0x1ac,0,
+audit_session_join=0x80,0x1ad,1,
+fileport_makeport=0x80,0x1ae,2,
+fileport_makefd=0x80,0x1af,1,
+audit_session_port=0x80,0x1b0,2,
+pid_suspend=0x80,0x1b1,1,
+pid_resume=0x80,0x1b2,1,
+pid_hibernate=0x80,0x1b3,1,
+pid_shutdown_sockets=0x80,0x1b4,2,
+shared_region_map_and_slide_np=0x80,0x1b6,6,
+kas_info=0x80,0x1b7,3,
+memorystatus_control=0x80,0x1b8,5,
+guarded_open_np=0x80,0x1b9,5,
+guarded_close_np=0x80,0x1ba,2,
+guarded_kqueue_np=0x80,0x1bb,2,
+change_fdguard_np=0x80,0x1bc,6,
+usrctl=0x80,0x1bd,1,
+proc_rlimit_control=0x80,0x1be,3,
+connectx=0x80,0x1bf,8,
+disconnectx=0x80,0x1c0,3,
+peeloff=0x80,0x1c1,2,
+socket_delegate=0x80,0x1c2,4,
+telemetry=0x80,0x1c3,6,
+proc_uuid_policy=0x80,0x1c4,4,
+memorystatus_get_level=0x80,0x1c5,1,
+system_override=0x80,0x1c6,2,
+vfs_purge=0x80,0x1c7,0,
+sfi_ctl=0x80,0x1c8,4,
+sfi_pidctl=0x80,0x1c9,4,
+coalition=0x80,0x1ca,3,
+coalition_info=0x80,0x1cb,4,
+necp_match_policy=0x80,0x1cc,3,
+getattrlistbulk=0x80,0x1cd,5,
+clonefileat=0x80,0x1ce,5,
+openat=0x80,0x1cf,4,
+openat_nocancel=0x80,0x1d0,4,
+renameat=0x80,0x1d1,4,
+faccessat=0x80,0x1d2,4,
+fchmodat=0x80,0x1d3,4,
+fchownat=0x80,0x1d4,5,
+fstatat=0x80,0x1d5,4,
+fstatat64=0x80,0x1d6,4,
+linkat=0x80,0x1d7,5,
+unlinkat=0x80,0x1d8,3,
+readlinkat=0x80,0x1d9,4,
+symlinkat=0x80,0x1da,3,
+mkdirat=0x80,0x1db,3,
+getattrlistat=0x80,0x1dc,6,
+proc_trace_log=0x80,0x1dd,2,
+bsdthread_ctl=0x80,0x1de,4,
+openbyid_np=0x80,0x1df,3,
+recvmsg_x=0x80,0x1e0,4,
+sendmsg_x=0x80,0x1e1,4,
+thread_selfusage=0x80,0x1e2,0,
+csrctl=0x80,0x1e3,3,
+guarded_open_dprotected_np=0x80,0x1e4,7,
+guarded_write_np=0x80,0x1e5,4,
+guarded_pwrite_np=0x80,0x1e6,5,
+guarded_writev_np=0x80,0x1e7,4,
+renameatx_np=0x80,0x1e8,5,
+mremap_encrypted=0x80,0x1e9,5,
+netagent_trigger=0x80,0x1ea,2,
+stack_snapshot_with_config=0x80,0x1eb,3,
+microstackshot=0x80,0x1ec,3,
+grab_pgo_data=0x80,0x1ed,4,
+persona=0x80,0x1ee,5,
+work_interval_ctl=0x80,0x1f3,4,
+getentropy=0x80,0x1f4,2,
+necp_open=0x80,0x1f5,1,
+necp_client_action=0x80,0x1f6,6,
+ulock_wait=0x80,0x203,4,
+ulock_wake=0x80,0x204,3,
+fclonefileat=0x80,0x205,4,
+fs_snapshot=0x80,0x206,6,
+terminate_with_payload=0x80,0x208,7,
+abort_with_payload=0x80,0x209,6,
+necp_session_open=0x80,0x20a,1,
+necp_session_action=0x80,0x20b,6,
+setattrlistat=0x80,0x20c,6,
+net_qos_guideline=0x80,0x20d,2,
+fmount=0x80,0x20e,4,
+ntp_adjtime=0x80,0x20f,1,
+ntp_gettime=0x80,0x210,1,
+os_fault_with_payload=0x80,0x211,6,
+_kernelrpc_mach_vm_allocate_trap=0x81,0xa,4,
+_kernelrpc_mach_vm_purgable_control_trap=0x81,0xb,4,
+_kernelrpc_mach_vm_deallocate_trap=0x81,0xc,3,
+_kernelrpc_mach_vm_protect_trap=0x81,0xe,5,
+_kernelrpc_mach_vm_map_trap=0x81,0xf,6,
+_kernelrpc_mach_port_allocate_trap=0x81,0x10,3,
+_kernelrpc_mach_port_destroy_trap=0x81,0x11,2,
+_kernelrpc_mach_port_deallocate_trap=0x81,0x12,2,
+_kernelrpc_mach_port_mod_refs_trap=0x81,0x13,4,
+_kernelrpc_mach_port_move_member_trap=0x81,0x14,3,
+_kernelrpc_mach_port_insert_right_trap=0x81,0x15,4,
+_kernelrpc_mach_port_insert_member_trap=0x81,0x16,3,
+_kernelrpc_mach_port_extract_member_trap=0x81,0x17,3,
+_kernelrpc_mach_port_construct_trap=0x81,0x18,4,
+_kernelrpc_mach_port_destruct_trap=0x81,0x19,4,
+mach_reply_port=0x81,0x1a,0,
+thread_self_trap=0x81,0x1b,0,
+task_self_trap=0x81,0x1c,0,
+host_self_trap=0x81,0x1d,0,
+mach_msg_trap=0x81,0x1f,7,
+mach_msg_overwrite_trap=0x81,0x20,8,
+semaphore_signal_trap=0x81,0x21,1,
+semaphore_signal_all_trap=0x81,0x22,1,
+semaphore_signal_thread_trap=0x81,0x23,2,
+semaphore_wait_trap=0x81,0x24,1,
+semaphore_wait_signal_trap=0x81,0x25,2,
+semaphore_timedwait_trap=0x81,0x26,3,
+semaphore_timedwait_signal_trap=0x81,0x27,4,
+_kernelrpc_mach_port_guard_trap=0x81,0x29,4,
+_kernelrpc_mach_port_unguard_trap=0x81,0x2a,3,
+mach_generate_activity_id=0x81,0x2b,3,
+task_name_for_pid=0x81,0x2c,3,
+task_for_pid=0x81,0x2d,3,
+pid_for_task=0x81,0x2e,2,
+macx_swapon=0x81,0x30,4,
+macx_swapoff=0x81,0x31,2,
+thread_get_special_reply_port=0x81,0x32,0,
+macx_triggers=0x81,0x33,4,
+macx_backing_store_suspend=0x81,0x34,1,
+macx_backing_store_recovery=0x81,0x35,1,
+pfz_exit=0x81,0x3a,0,
+swtch_pri=0x81,0x3b,0,
+swtch=0x81,0x3c,0,
+thread_switch=0x81,0x3d,3,
+clock_sleep_trap=0x81,0x3e,5,
+host_create_mach_voucher_trap=0x81,0x46,4,
+mach_voucher_extract_attr_recipe_trap=0x81,0x48,4,
+mach_timebase_info_trap=0x81,0x59,1,
+mach_wait_until_trap=0x81,0x5a,1,
+mk_timer_create_trap=0x81,0x5b,0,
+mk_timer_destroy_trap=0x81,0x5c,1,
+mk_timer_arm_trap=0x81,0x5d,2,
+mk_timer_cancel_trap=0x81,0x5e,2,
+mk_timer_arm_leeway_trap=0x81,0x5f,4,
+iokit_user_client_trap=0x81,0x64,8,
\ No newline at end of file
diff -Nru radare2-2.3.0+dfsg/libr/syscall/d/darwin-x86-64.sdb.txt radare2-2.8.0+dfsg/libr/syscall/d/darwin-x86-64.sdb.txt
--- radare2-2.3.0+dfsg/libr/syscall/d/darwin-x86-64.sdb.txt	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/syscall/d/darwin-x86-64.sdb.txt	2018-08-07 14:12:36.000000000 +0000
@@ -1,108 +1,468 @@
 _=0x80
-syscall=0x80,0,4,
-exit=0x80,0x2000001,1,
-fork=0x80,0x2000002,0,
-read=0x80,0x2000003,3,
-write=0x80,0x2000004,3,
-open=0x80,0x2000005,3,
-close=0x80,0x2000006,1,
-wait4=0x80,0x2000007,3,
-old_creat=0x80,0x2000008,2,
-link=0x80,0x2000009,2,
-unlink=0x80,0x20000010,1,
-old_execve=0x80,0x20000011,3,
-chdir=0x80,0x20000012,1,
-fchdir=0x80,0x20000013,1,
-mknod=0x80,0x20000014,1,
-chmod=0x80,0x20000015,1,
-chown=0x80,0x20000016,1,
-break=0x80,0x20000017,1,
-old_fsstat=0x80,0x20000018,1,
-old_lseek=0x80,0x20000019,1,
-getpid=0x80,0x20000020,0,
-mount=0x80,0x20000021,0,
-unmount=0x80,0x20000022,0,
-setuid=0x80,0x20000023,1,
-getuid=0x80,0x20000024,0,
-ptrace=0x80,0x20000026,4,
-recvmsg=0x80,0x20000027,4,
-sendmsg=0x80,0x20000028,4,
-recvfrom=0x80,0x20000029,4,
-accept=0x80,0x20000030,4,
-getpeername=0x80,0x20000031,3,
-getsockname=0x80,0x20000032,3,
-access=0x80,0x20000033,2,
-chflags=0x80,0x20000034,2,
-fchflags=0x80,0x20000035,2,
-sync=0x80,0x20000036,0,
-kill=0x80,0x20000037,2,
-dup=0x80,0x20000041,1,i
-dup2=0x80,0x200005a,2,ii
-pipe=0x80,0x20000042,1,
-getepid=0x80,0x20000043,0,
-profil=0x80,0x20000044,4,/*
-ktrace=0x80,0x20000045,4,
-getgid=0x80,0x20000047,0,
-signal=0x80,0x20000048,2,
-getlogin=0x80,0x20000049,0,
-setlogin=0x80,0x20000050,1,
-acct=0x80,0x20000051,1,
-sigaltstack=0x80,0x20000053,2,
-ioctl=0x80,0x20000054,3,
-reboot=0x80,0x20000055,1,
-revoke=0x80,0x20000056,1,
-symlink=0x80,0x20000057,2,
-readlink=0x80,0x20000058,1,
-execve=0x80,0x20000059,2,
-umask=0x80,0x20000060,1,
-chroot=0x80,0x20000061,1,
-mmap=0x80,0x20000090,6,
-munmap=0x80,0x20000091,1,
-socketcall=0x80,0x200000102,2,
-sigreturn=0x80,0x200000119,1,
-clone=0x80,0x200000120,4,
-mprotect=0x80,0x200000125,3,
-rt_sigaction=0x80,0x200000174,3,
-rt_sigprocmask=0x80,0x200000175,3,
-sysctl=0x80,0x200000149,1,
-mmap2=0x80,0x200000192,6,
-fstat64=0x80,0x200000197,2,
-fcntl64=0x80,0x200000221,3,
-gettid=0x80,0x200000224,0,
-set_thread_area=0x80,0x200000243,2,
-get_thread_area=0x80,0x200000244,2,
-exit_group=0x80,0x200000252,1,
-mach_reply_port=0x81,0x20000026,1,
-thread_self_trap=0x81,0x20000027,1,
-task_self_trap=0x81,0x20000028,1,
-host_self_trap=0x81,0x20000029,1,
-mach_msg_trap=0x81,0x20000031,1,
-mach_msg_overwrite_trap=0x81,0x20000032,1,
-semaphore_signal_trap=0x81,0x20000033,1,
-semaphore_signal_all_trap=0x81,0x20000034,1,
-semaphore_signal_thread_trap=0x81,0x20000035,1,
-semaphore_wait_trap=0x81,0x20000036,1,
-semaphore_wait_signal_trap=0x81,0x20000037,1,
-semaphore_timedwait_trap=0x81,0x20000038,1,
-semaphore_timedwait_signal_trap=0x81,0x20000039,1,
-init_process=0x81,0x20000041,1,
-map_fd=0x81,0x20000043,1,
-task_for_pid=0x81,0x20000045,1,
-pid_for_task=0x81,0x20000046,1,
-macx_swapon=0x81,0x20000048,1,
-macx_swapoff=0x81,0x20000049,1,
-macx_triggers=0x81,0x20000051,1,
-macx_backing_store_suspend=0x81,0x20000052,1,
-macx_backing_store_recovery=0x81,0x20000053,1,
-swtch_pri=0x81,0x20000059,1,
-swtch=0x81,0x20000060,1,
-thread_switch=0x81,0x20000061,1,
-clock_sleep_trap=0x81,0x20000062,1,
-mach_timebase_info_trap=0x81,0x20000089,1,
-mach_wait_until_trap=0x81,0x20000090,1,
-mk_timer_create_trap=0x81,0x20000091,1,
-mk_timer_destroy_trap=0x81,0x20000092,1,
-mk_timer_arm_trap=0x81,0x20000093,1,
-mk_timer_cancel_trap=0x81,0x20000094,1,
-mk_timebase_info_trap=0x81,0x20000095,1,
-iokit_user_client_trap=0x81,0x200000100,1,
+exit=0x80,0x2000001,1
+fork=0x80,0x2000002,0
+read=0x80,0x2000003,3
+write=0x80,0x2000004,3
+open=0x80,0x2000005,3
+close=0x80,0x2000006,1
+wait4=0x80,0x2000007,4
+link=0x80,0x2000009,2
+unlink=0x80,0x200000a,1
+chdir=0x80,0x200000c,1
+fchdir=0x80,0x200000d,1
+mknod=0x80,0x200000e,3
+chmod=0x80,0x200000f,2
+chown=0x80,0x2000010,3
+getfsstat=0x80,0x2000012,3
+getpid=0x80,0x2000014,0
+setuid=0x80,0x2000017,1
+getuid=0x80,0x2000018,0
+geteuid=0x80,0x2000019,0
+ptrace=0x80,0x200001a,4
+recvmsg=0x80,0x200001b,3
+sendmsg=0x80,0x200001c,3
+recvfrom=0x80,0x200001d,6
+accept=0x80,0x200001e,3
+getpeername=0x80,0x200001f,3
+getsockname=0x80,0x2000020,3
+access=0x80,0x2000021,2
+chflags=0x80,0x2000022,2
+fchflags=0x80,0x2000023,2
+sync=0x80,0x2000024,0
+kill=0x80,0x2000025,3
+getppid=0x80,0x2000027,0
+dup=0x80,0x2000029,1
+pipe=0x80,0x200002a,0
+getegid=0x80,0x200002b,0
+sigaction=0x80,0x200002e,3
+getgid=0x80,0x200002f,0
+sigprocmask=0x80,0x2000030,3
+getlogin=0x80,0x2000031,2
+setlogin=0x80,0x2000032,1
+acct=0x80,0x2000033,1
+sigpending=0x80,0x2000034,1
+sigaltstack=0x80,0x2000035,2
+ioctl=0x80,0x2000036,3
+reboot=0x80,0x2000037,2
+revoke=0x80,0x2000038,1
+symlink=0x80,0x2000039,2
+readlink=0x80,0x200003a,3
+execve=0x80,0x200003b,3
+umask=0x80,0x200003c,1
+chroot=0x80,0x200003d,1
+msync=0x80,0x2000041,3
+vfork=0x80,0x2000042,0
+munmap=0x80,0x2000049,2
+mprotect=0x80,0x200004a,3
+madvise=0x80,0x200004b,3
+mincore=0x80,0x200004e,3
+getgroups=0x80,0x200004f,2
+setgroups=0x80,0x2000050,2
+getpgrp=0x80,0x2000051,0
+setpgid=0x80,0x2000052,2
+setitimer=0x80,0x2000053,3
+swapon=0x80,0x2000055,0
+getitimer=0x80,0x2000056,2
+getdtablesize=0x80,0x2000059,0
+dup2=0x80,0x200005a,2
+fcntl=0x80,0x200005c,3
+select=0x80,0x200005d,5
+fsync=0x80,0x200005f,1
+setpriority=0x80,0x2000060,3
+socket=0x80,0x2000061,3
+connect=0x80,0x2000062,3
+getpriority=0x80,0x2000064,2
+bind=0x80,0x2000068,3
+setsockopt=0x80,0x2000069,5
+listen=0x80,0x200006a,2
+sigsuspend=0x80,0x200006f,1
+gettimeofday=0x80,0x2000074,3
+getrusage=0x80,0x2000075,2
+getsockopt=0x80,0x2000076,5
+readv=0x80,0x2000078,3
+writev=0x80,0x2000079,3
+settimeofday=0x80,0x200007a,2
+fchown=0x80,0x200007b,3
+fchmod=0x80,0x200007c,2
+setreuid=0x80,0x200007e,2
+setregid=0x80,0x200007f,2
+rename=0x80,0x2000080,2
+flock=0x80,0x2000083,2
+mkfifo=0x80,0x2000084,2
+sendto=0x80,0x2000085,6
+shutdown=0x80,0x2000086,2
+socketpair=0x80,0x2000087,4
+mkdir=0x80,0x2000088,2
+rmdir=0x80,0x2000089,1
+utimes=0x80,0x200008a,2
+futimes=0x80,0x200008b,2
+adjtime=0x80,0x200008c,2
+gethostuuid=0x80,0x200008e,3
+setsid=0x80,0x2000093,0
+getpgid=0x80,0x2000097,1
+setprivexec=0x80,0x2000098,1
+pread=0x80,0x2000099,4
+pwrite=0x80,0x200009a,4
+nfssvc=0x80,0x200009b,2
+statfs=0x80,0x200009d,2
+fstatfs=0x80,0x200009e,2
+unmount=0x80,0x200009f,2
+getfh=0x80,0x20000a1,2
+quotactl=0x80,0x20000a5,4
+mount=0x80,0x20000a7,4
+csops=0x80,0x20000a9,4
+csops_audittoken=0x80,0x20000aa,5
+waitid=0x80,0x20000ad,4
+kdebug_typefilter=0x80,0x20000b1,2
+kdebug_trace_string=0x80,0x20000b2,3
+kdebug_trace64=0x80,0x20000b3,5
+kdebug_trace=0x80,0x20000b4,5
+setgid=0x80,0x20000b5,1
+setegid=0x80,0x20000b6,1
+seteuid=0x80,0x20000b7,1
+sigreturn=0x80,0x20000b8,2
+thread_selfcounts=0x80,0x20000ba,3
+fdatasync=0x80,0x20000bb,1
+stat=0x80,0x20000bc,2
+fstat=0x80,0x20000bd,2
+lstat=0x80,0x20000be,2
+pathconf=0x80,0x20000bf,2
+fpathconf=0x80,0x20000c0,2
+getrlimit=0x80,0x20000c2,2
+setrlimit=0x80,0x20000c3,2
+getdirentries=0x80,0x20000c4,4
+mmap=0x80,0x20000c5,6
+lseek=0x80,0x20000c7,3
+truncate=0x80,0x20000c8,2
+ftruncate=0x80,0x20000c9,2
+sysctl=0x80,0x20000ca,6
+mlock=0x80,0x20000cb,2
+munlock=0x80,0x20000cc,2
+undelete=0x80,0x20000cd,1
+open_dprotected_np=0x80,0x20000d8,5
+getattrlist=0x80,0x20000dc,5
+setattrlist=0x80,0x20000dd,5
+getdirentriesattr=0x80,0x20000de,8
+exchangedata=0x80,0x20000df,3
+searchfs=0x80,0x20000e1,6
+delete=0x80,0x20000e2,1
+copyfile=0x80,0x20000e3,4
+fgetattrlist=0x80,0x20000e4,5
+fsetattrlist=0x80,0x20000e5,5
+poll=0x80,0x20000e6,3
+watchevent=0x80,0x20000e7,2
+waitevent=0x80,0x20000e8,2
+modwatch=0x80,0x20000e9,2
+getxattr=0x80,0x20000ea,6
+fgetxattr=0x80,0x20000eb,6
+setxattr=0x80,0x20000ec,6
+fsetxattr=0x80,0x20000ed,6
+removexattr=0x80,0x20000ee,3
+fremovexattr=0x80,0x20000ef,3
+listxattr=0x80,0x20000f0,4
+flistxattr=0x80,0x20000f1,4
+fsctl=0x80,0x20000f2,4
+initgroups=0x80,0x20000f3,3
+posix_spawn=0x80,0x20000f4,5
+ffsctl=0x80,0x20000f5,4
+nfsclnt=0x80,0x20000f7,2
+fhopen=0x80,0x20000f8,2
+minherit=0x80,0x20000fa,3
+semsys=0x80,0x20000fb,5
+msgsys=0x80,0x20000fc,5
+shmsys=0x80,0x20000fd,4
+semctl=0x80,0x20000fe,4
+semget=0x80,0x20000ff,3
+semop=0x80,0x2000100,3
+msgctl=0x80,0x2000102,3
+msgget=0x80,0x2000103,2
+msgsnd=0x80,0x2000104,4
+msgrcv=0x80,0x2000105,5
+shmat=0x80,0x2000106,3
+shmctl=0x80,0x2000107,3
+shmdt=0x80,0x2000108,1
+shmget=0x80,0x2000109,3
+shm_open=0x80,0x200010a,3
+shm_unlink=0x80,0x200010b,1
+sem_open=0x80,0x200010c,4
+sem_close=0x80,0x200010d,1
+sem_unlink=0x80,0x200010e,1
+sem_wait=0x80,0x200010f,1
+sem_trywait=0x80,0x2000110,1
+sem_post=0x80,0x2000111,1
+sysctlbyname=0x80,0x2000112,6
+open_extended=0x80,0x2000115,6
+umask_extended=0x80,0x2000116,2
+stat_extended=0x80,0x2000117,4
+lstat_extended=0x80,0x2000118,4
+fstat_extended=0x80,0x2000119,4
+chmod_extended=0x80,0x200011a,5
+fchmod_extended=0x80,0x200011b,5
+access_extended=0x80,0x200011c,4
+settid=0x80,0x200011d,2
+gettid=0x80,0x200011e,2
+setsgroups=0x80,0x200011f,2
+getsgroups=0x80,0x2000120,2
+setwgroups=0x80,0x2000121,2
+getwgroups=0x80,0x2000122,2
+mkfifo_extended=0x80,0x2000123,5
+mkdir_extended=0x80,0x2000124,5
+identitysvc=0x80,0x2000125,2
+shared_region_check_np=0x80,0x2000126,1
+vm_pressure_monitor=0x80,0x2000128,3
+psynch_rw_longrdlock=0x80,0x2000129,5
+psynch_rw_yieldwrlock=0x80,0x200012a,5
+psynch_rw_downgrade=0x80,0x200012b,5
+psynch_rw_upgrade=0x80,0x200012c,5
+psynch_mutexwait=0x80,0x200012d,5
+psynch_mutexdrop=0x80,0x200012e,5
+psynch_cvbroad=0x80,0x200012f,7
+psynch_cvsignal=0x80,0x2000130,8
+psynch_cvwait=0x80,0x2000131,8
+psynch_rw_rdlock=0x80,0x2000132,5
+psynch_rw_wrlock=0x80,0x2000133,5
+psynch_rw_unlock=0x80,0x2000134,5
+psynch_rw_unlock2=0x80,0x2000135,5
+getsid=0x80,0x2000136,1
+settid_with_pid=0x80,0x2000137,2
+psynch_cvclrprepost=0x80,0x2000138,7
+aio_fsync=0x80,0x2000139,2
+aio_return=0x80,0x200013a,1
+aio_suspend=0x80,0x200013b,3
+aio_cancel=0x80,0x200013c,2
+aio_error=0x80,0x200013d,1
+aio_read=0x80,0x200013e,1
+aio_write=0x80,0x200013f,1
+lio_listio=0x80,0x2000140,4
+iopolicysys=0x80,0x2000142,2
+process_policy=0x80,0x2000143,7
+mlockall=0x80,0x2000144,1
+munlockall=0x80,0x2000145,1
+issetugid=0x80,0x2000147,0
+__pthread_kill=0x80,0x2000148,2
+__pthread_sigmask=0x80,0x2000149,3
+__sigwait=0x80,0x200014a,2
+__disable_threadsignal=0x80,0x200014b,1
+__pthread_markcancel=0x80,0x200014c,1
+__pthread_canceled=0x80,0x200014d,1
+__semwait_signal=0x80,0x200014e,6
+proc_info=0x80,0x2000150,6
+sendfile=0x80,0x2000151,6
+stat64=0x80,0x2000152,2
+fstat64=0x80,0x2000153,2
+lstat64=0x80,0x2000154,2
+stat64_extended=0x80,0x2000155,4
+lstat64_extended=0x80,0x2000156,4
+fstat64_extended=0x80,0x2000157,4
+getdirentries64=0x80,0x2000158,4
+statfs64=0x80,0x2000159,2
+fstatfs64=0x80,0x200015a,2
+getfsstat64=0x80,0x200015b,3
+__pthread_chdir=0x80,0x200015c,1
+__pthread_fchdir=0x80,0x200015d,1
+audit=0x80,0x200015e,2
+auditon=0x80,0x200015f,3
+getauid=0x80,0x2000161,1
+setauid=0x80,0x2000162,1
+getaudit_addr=0x80,0x2000165,2
+setaudit_addr=0x80,0x2000166,2
+auditctl=0x80,0x2000167,1
+bsdthread_create=0x80,0x2000168,5
+bsdthread_terminate=0x80,0x2000169,4
+kqueue=0x80,0x200016a,0
+kevent=0x80,0x200016b,6
+lchown=0x80,0x200016c,3
+bsdthread_register=0x80,0x200016e,7
+workq_open=0x80,0x200016f,0
+workq_kernreturn=0x80,0x2000170,4
+kevent64=0x80,0x2000171,7
+__old_semwait_signal=0x80,0x2000172,5
+__old_semwait_signal_nocancel=0x80,0x2000173,5
+thread_selfid=0x80,0x2000174,0
+ledger=0x80,0x2000175,4
+kevent_qos=0x80,0x2000176,8
+kevent_id=0x80,0x2000177,8
+__mac_execve=0x80,0x200017c,4
+__mac_syscall=0x80,0x200017d,3
+__mac_get_file=0x80,0x200017e,2
+__mac_set_file=0x80,0x200017f,2
+__mac_get_link=0x80,0x2000180,2
+__mac_set_link=0x80,0x2000181,2
+__mac_get_proc=0x80,0x2000182,1
+__mac_set_proc=0x80,0x2000183,1
+__mac_get_fd=0x80,0x2000184,2
+__mac_set_fd=0x80,0x2000185,2
+__mac_get_pid=0x80,0x2000186,2
+pselect=0x80,0x200018a,6
+pselect_nocancel=0x80,0x200018b,6
+read_nocancel=0x80,0x200018c,3
+write_nocancel=0x80,0x200018d,3
+open_nocancel=0x80,0x200018e,3
+close_nocancel=0x80,0x200018f,1
+wait4_nocancel=0x80,0x2000190,4
+recvmsg_nocancel=0x80,0x2000191,3
+sendmsg_nocancel=0x80,0x2000192,3
+recvfrom_nocancel=0x80,0x2000193,6
+accept_nocancel=0x80,0x2000194,3
+msync_nocancel=0x80,0x2000195,3
+fcntl_nocancel=0x80,0x2000196,3
+select_nocancel=0x80,0x2000197,5
+fsync_nocancel=0x80,0x2000198,1
+connect_nocancel=0x80,0x2000199,3
+sigsuspend_nocancel=0x80,0x200019a,1
+readv_nocancel=0x80,0x200019b,3
+writev_nocancel=0x80,0x200019c,3
+sendto_nocancel=0x80,0x200019d,6
+pread_nocancel=0x80,0x200019e,4
+pwrite_nocancel=0x80,0x200019f,4
+waitid_nocancel=0x80,0x20001a0,4
+poll_nocancel=0x80,0x20001a1,3
+msgsnd_nocancel=0x80,0x20001a2,4
+msgrcv_nocancel=0x80,0x20001a3,5
+sem_wait_nocancel=0x80,0x20001a4,1
+aio_suspend_nocancel=0x80,0x20001a5,3
+__sigwait_nocancel=0x80,0x20001a6,2
+__semwait_signal_nocancel=0x80,0x20001a7,6
+__mac_mount=0x80,0x20001a8,5
+__mac_get_mount=0x80,0x20001a9,2
+__mac_getfsstat=0x80,0x20001aa,5
+fsgetpath=0x80,0x20001ab,4
+audit_session_self=0x80,0x20001ac,0
+audit_session_join=0x80,0x20001ad,1
+fileport_makeport=0x80,0x20001ae,2
+fileport_makefd=0x80,0x20001af,1
+audit_session_port=0x80,0x20001b0,2
+pid_suspend=0x80,0x20001b1,1
+pid_resume=0x80,0x20001b2,1
+pid_hibernate=0x80,0x20001b3,1
+pid_shutdown_sockets=0x80,0x20001b4,2
+shared_region_map_and_slide_np=0x80,0x20001b6,6
+kas_info=0x80,0x20001b7,3
+memorystatus_control=0x80,0x20001b8,5
+guarded_open_np=0x80,0x20001b9,5
+guarded_close_np=0x80,0x20001ba,2
+guarded_kqueue_np=0x80,0x20001bb,2
+change_fdguard_np=0x80,0x20001bc,6
+usrctl=0x80,0x20001bd,1
+proc_rlimit_control=0x80,0x20001be,3
+connectx=0x80,0x20001bf,8
+disconnectx=0x80,0x20001c0,3
+peeloff=0x80,0x20001c1,2
+socket_delegate=0x80,0x20001c2,4
+telemetry=0x80,0x20001c3,6
+proc_uuid_policy=0x80,0x20001c4,4
+memorystatus_get_level=0x80,0x20001c5,1
+system_override=0x80,0x20001c6,2
+vfs_purge=0x80,0x20001c7,0
+sfi_ctl=0x80,0x20001c8,4
+sfi_pidctl=0x80,0x20001c9,4
+coalition=0x80,0x20001ca,3
+coalition_info=0x80,0x20001cb,4
+necp_match_policy=0x80,0x20001cc,3
+getattrlistbulk=0x80,0x20001cd,5
+clonefileat=0x80,0x20001ce,5
+openat=0x80,0x20001cf,4
+openat_nocancel=0x80,0x20001d0,4
+renameat=0x80,0x20001d1,4
+faccessat=0x80,0x20001d2,4
+fchmodat=0x80,0x20001d3,4
+fchownat=0x80,0x20001d4,5
+fstatat=0x80,0x20001d5,4
+fstatat64=0x80,0x20001d6,4
+linkat=0x80,0x20001d7,5
+unlinkat=0x80,0x20001d8,3
+readlinkat=0x80,0x20001d9,4
+symlinkat=0x80,0x20001da,3
+mkdirat=0x80,0x20001db,3
+getattrlistat=0x80,0x20001dc,6
+proc_trace_log=0x80,0x20001dd,2
+bsdthread_ctl=0x80,0x20001de,4
+openbyid_np=0x80,0x20001df,3
+recvmsg_x=0x80,0x20001e0,4
+sendmsg_x=0x80,0x20001e1,4
+thread_selfusage=0x80,0x20001e2,0
+csrctl=0x80,0x20001e3,3
+guarded_open_dprotected_np=0x80,0x20001e4,7
+guarded_write_np=0x80,0x20001e5,4
+guarded_pwrite_np=0x80,0x20001e6,5
+guarded_writev_np=0x80,0x20001e7,4
+renameatx_np=0x80,0x20001e8,5
+mremap_encrypted=0x80,0x20001e9,5
+netagent_trigger=0x80,0x20001ea,2
+stack_snapshot_with_config=0x80,0x20001eb,3
+microstackshot=0x80,0x20001ec,3
+grab_pgo_data=0x80,0x20001ed,4
+persona=0x80,0x20001ee,5
+work_interval_ctl=0x80,0x20001f3,4
+getentropy=0x80,0x20001f4,2
+necp_open=0x80,0x20001f5,1
+necp_client_action=0x80,0x20001f6,6
+ulock_wait=0x80,0x2000203,4
+ulock_wake=0x80,0x2000204,3
+fclonefileat=0x80,0x2000205,4
+fs_snapshot=0x80,0x2000206,6
+terminate_with_payload=0x80,0x2000208,7
+abort_with_payload=0x80,0x2000209,6
+necp_session_open=0x80,0x200020a,1
+necp_session_action=0x80,0x200020b,6
+setattrlistat=0x80,0x200020c,6
+net_qos_guideline=0x80,0x200020d,2
+fmount=0x80,0x200020e,4
+ntp_adjtime=0x80,0x200020f,1
+ntp_gettime=0x80,0x2000210,1
+os_fault_with_payload=0x80,0x2000211,6
+_kernelrpc_mach_vm_allocate_trap=0x81,0x100000a,4
+_kernelrpc_mach_vm_purgable_control_trap=0x81,0x100000b,4
+_kernelrpc_mach_vm_deallocate_trap=0x81,0x100000c,3
+_kernelrpc_mach_vm_protect_trap=0x81,0x100000e,5
+_kernelrpc_mach_vm_map_trap=0x81,0x100000f,6
+_kernelrpc_mach_port_allocate_trap=0x81,0x1000010,3
+_kernelrpc_mach_port_destroy_trap=0x81,0x1000011,2
+_kernelrpc_mach_port_deallocate_trap=0x81,0x1000012,2
+_kernelrpc_mach_port_mod_refs_trap=0x81,0x1000013,4
+_kernelrpc_mach_port_move_member_trap=0x81,0x1000014,3
+_kernelrpc_mach_port_insert_right_trap=0x81,0x1000015,4
+_kernelrpc_mach_port_insert_member_trap=0x81,0x1000016,3
+_kernelrpc_mach_port_extract_member_trap=0x81,0x1000017,3
+_kernelrpc_mach_port_construct_trap=0x81,0x1000018,4
+_kernelrpc_mach_port_destruct_trap=0x81,0x1000019,4
+mach_reply_port=0x81,0x100001a,0
+thread_self_trap=0x81,0x100001b,0
+task_self_trap=0x81,0x100001c,0
+host_self_trap=0x81,0x100001d,0
+mach_msg_trap=0x81,0x100001f,7
+mach_msg_overwrite_trap=0x81,0x1000020,8
+semaphore_signal_trap=0x81,0x1000021,1
+semaphore_signal_all_trap=0x81,0x1000022,1
+semaphore_signal_thread_trap=0x81,0x1000023,2
+semaphore_wait_trap=0x81,0x1000024,1
+semaphore_wait_signal_trap=0x81,0x1000025,2
+semaphore_timedwait_trap=0x81,0x1000026,3
+semaphore_timedwait_signal_trap=0x81,0x1000027,4
+_kernelrpc_mach_port_guard_trap=0x81,0x1000029,4
+_kernelrpc_mach_port_unguard_trap=0x81,0x100002a,3
+mach_generate_activity_id=0x81,0x100002b,3
+task_name_for_pid=0x81,0x100002c,3
+task_for_pid=0x81,0x100002d,3
+pid_for_task=0x81,0x100002e,2
+macx_swapon=0x81,0x1000030,4
+macx_swapoff=0x81,0x1000031,2
+thread_get_special_reply_port=0x81,0x1000032,0
+macx_triggers=0x81,0x1000033,4
+macx_backing_store_suspend=0x81,0x1000034,1
+macx_backing_store_recovery=0x81,0x1000035,1
+pfz_exit=0x81,0x100003a,0
+swtch_pri=0x81,0x100003b,0
+swtch=0x81,0x100003c,0
+thread_switch=0x81,0x100003d,3
+clock_sleep_trap=0x81,0x100003e,5
+host_create_mach_voucher_trap=0x81,0x1000046,4
+mach_voucher_extract_attr_recipe_trap=0x81,0x1000048,4
+mach_timebase_info_trap=0x81,0x1000059,1
+mach_wait_until_trap=0x81,0x100005a,1
+mk_timer_create_trap=0x81,0x100005b,0
+mk_timer_destroy_trap=0x81,0x100005c,1
+mk_timer_arm_trap=0x81,0x100005d,2
+mk_timer_cancel_trap=0x81,0x100005e,2
+mk_timer_arm_leeway_trap=0x81,0x100005f,4
+iokit_user_client_trap=0x81,0x1000064,8
diff -Nru radare2-2.3.0+dfsg/libr/syscall/d/meson.build radare2-2.8.0+dfsg/libr/syscall/d/meson.build
--- radare2-2.3.0+dfsg/libr/syscall/d/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/syscall/d/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,70 @@
+sdb_files = [
+  'dos-x86-16',
+  'ios-x86-32',
+  'ios-arm-32',
+  'ios-arm-64',
+  'linux-x86-32',
+  'linux-x86-64',
+  'linux-arm-32',
+  'linux-arm-64',
+  'linux-mips-32',
+  'linux-sparc-32',
+  'darwin-x86-32',
+  'darwin-x86-64',
+  'darwin-arm-32',
+  'darwin-arm-64',
+  'netbsd-x86-32',
+  'freebsd-x86-32',
+  'openbsd-x86-32',
+  'openbsd-x86-64',
+  'windows-x86-32',
+  'windows-x86-64'
+]
+
+sdb_pre_script = '''#script
+import re
+import sys
+inf = open(sys.argv[1])
+outf = open(sys.argv[2], 'w')
+for line in inf:
+    if not line.startswith('_') and '=' in line:
+        arr = re.split('=|,', line)
+        print('%s.%s=%s' % (arr[1], arr[2], arr[0]), file=outf)
+    print(line, file=outf, end='')
+inf.close()
+outf.close()
+'''
+
+sdb_pre_cmd = [
+  py3_exe,
+  '-c',
+  sdb_pre_script,
+  '@INPUT@',
+  '@OUTPUT@'
+]
+
+foreach file : sdb_files
+  infile = '@0@.sdb.txt'.format(file)
+  if host_machine.system() == 'windows'
+    infile = run_command(sdb_readlink_cmd + [join_paths(meson.current_source_dir(), infile)]).stdout().strip()
+  endif
+  tmp_outfile = '@0@.sdb.txt.tmp'.format(file)
+  pre_sdb_txt = custom_target(tmp_outfile,
+    input: infile,
+    output: tmp_outfile,
+    command: sdb_pre_cmd,
+    build_by_default: true,
+    install: false
+  )
+
+  outfile = '@0@.sdb'.format(file)
+  custom_target(outfile,
+    input: pre_sdb_txt,
+    output: outfile,
+    command: sdb_gen_cmd,
+    depends: sdb_exe,
+    build_by_default: true,
+    install: true,
+    install_dir: join_paths(r2_sdb, 'syscall')
+  )
+endforeach
diff -Nru radare2-2.3.0+dfsg/libr/syscall/fastcall.h radare2-2.8.0+dfsg/libr/syscall/fastcall.h
--- radare2-2.3.0+dfsg/libr/syscall/fastcall.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/syscall/fastcall.h	2018-08-07 14:12:36.000000000 +0000
@@ -39,11 +39,12 @@
 	{{ "rax", "rdi", NULL }},
 	{{ "rax", "rdi", "rsi", NULL }},
 	{{ "rax", "rdi", "rsi", "rdx", NULL }},
-	{{ "rax", "rdi", "rsi", "rdx", "rdx", NULL }},
-	{{ "rax", "rdi", "rsi", "rdx", "rdx", "r8", NULL }},
+	{{ "rax", "rdi", "rsi", "rdx", "rcx", NULL }},
+	{{ "rax", "rdi", "rsi", "rdx", "rcx", "r8", NULL }},
 	{{ NULL }}
 };
 
+#if 0
 static struct r_syscall_regs_t fastcall_x86_64_msvc [R_SYSCALL_ARGS] = {
 	{{ "rdi", NULL }},
 	{{ "rdi", "rsi", NULL }},
@@ -53,6 +54,7 @@
 	{{ "rdi", "rsi", "rdx", "rdx", "r8", "r9", NULL }},
 	{{ NULL }}
 };
+#endif
 
 static struct r_syscall_regs_t fastcall_x86_8 [R_SYSCALL_ARGS] = {
 	{{ "ax", NULL }},
diff -Nru radare2-2.3.0+dfsg/libr/syscall/meson.build radare2-2.8.0+dfsg/libr/syscall/meson.build
--- radare2-2.3.0+dfsg/libr/syscall/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/syscall/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,13 +1,29 @@
-files=[
-'syscall.c',
-'ioports.c'
+files = [
+  'syscall.c',
+  'ioports.c'
 ]
 
 r_syscall = library('r_syscall', files,
   include_directories: [platform_inc],
-  link_with: [r_util],
-  objects: [
-	libr2sdb.extract_all_objects()
+  dependencies: [
+    r_util_dep,
+    sdb_dep
   ],
-  install: true
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_syscall_dep = declare_dependency(link_with: r_syscall,
+                                   include_directories: [platform_inc])
+
+pkgconfig_mod.generate(libraries: [r_syscall],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_syscall',
+  filebase: 'r_syscall',
+  requires: [
+    'r_util'
+  ],
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/syscall/syscall.c radare2-2.8.0+dfsg/libr/syscall/syscall.c
--- radare2-2.3.0+dfsg/libr/syscall/syscall.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/syscall/syscall.c	2018-08-07 14:12:36.000000000 +0000
@@ -13,6 +13,11 @@
 extern RSyscallPort sysport_x86[];
 extern RSyscallPort sysport_avr[];
 
+R_API RSyscall* r_syscall_ref(RSyscall *sc) {
+	sc->refs++;
+	return sc;
+}
+
 R_API RSyscall* r_syscall_new() {
 	RSyscall *rs = R_NEW0 (RSyscall);
 	if (rs) {
@@ -26,6 +31,11 @@
 
 R_API void r_syscall_free(RSyscall *s) {
 	if (s) {
+		if (s->refs > 0) {
+			s->refs--;
+			return;
+		}
+		sdb_free (s->srdb);
 		sdb_free (s->db);
 		free (s->os);
 		free (s);
@@ -41,18 +51,17 @@
 }
 
 static Sdb *openDatabase(Sdb *db, const char *name) {
-#define SYSCALLPATH "/share/radare2/" R2_VERSION
-	const char *file = sdb_fmt (0, "%s/%s/%s.sdb",
-		r_sys_prefix (NULL), SYSCALLPATH, name);
-	if (!r_file_exists (file)) {
-	//	eprintf ("r_syscall_setup: Cannot find '%s'\n", file);
-		return false;
-	}
-	if (!db) {
-		return sdb_new (0, file, 0);
+	char *file = r_str_newf ( R_JOIN_3_PATHS ("%s", R2_SDB, "%s.sdb"),
+		r_sys_prefix (NULL), name);
+	if (r_file_exists (file)) {
+		if (db) {
+			sdb_reset (db);
+			sdb_open (db, file);
+		} else {
+			db = sdb_new (0, file, 0);
+		}
 	}
-	sdb_reset (db);
-	sdb_open (db, file);
+	free (file);
 	return db;
 }
 
@@ -74,8 +83,9 @@
 		s->regs = fastcall_mips;
 	} else if (!strcmp (arch, "avr")) {
 		s->sysport = sysport_avr;
-	} else if (!strcmp (os, "osx") || !strcmp (os, "macos")) {
+	} else if (!strcmp (os, "darwin") || !strcmp (os, "osx") || !strcmp (os, "macos")) {
 		os = "darwin";
+		s->regs = fastcall_x86_64;
 	} else if (!strcmp (arch,"sh")) {
 		s->regs = fastcall_sh;
 	} else if (!strcmp (arch, "arm")) {
@@ -103,18 +113,21 @@
 		}
 	}
 
-	char *dbName = r_str_newf ("syscall/%s-%s-%d", os, arch, bits);
+	char *dbName = r_str_newf (R_JOIN_2_PATHS ("syscall", "%s-%s-%d"),
+		os, arch, bits);
 	s->db = openDatabase (s->db, dbName);
 	free (dbName);
 
-	dbName = r_str_newf ("sysregs/%s-%d-%s", arch, bits, cpu ? cpu: arch);
+	dbName = r_str_newf (R_JOIN_2_PATHS ("sysregs", "%s-%d-%s"),
+		arch, bits, cpu ? cpu: arch);
+	sdb_free (s->srdb);
+	s->srdb = NULL;
 	s->srdb = openDatabase (s->srdb, dbName);
 	free (dbName);
-
 	if (s->fd) {
 		fclose (s->fd);
+		s->fd = NULL;
 	}
-	s->fd = NULL;
 	return true;
 }
 
@@ -124,16 +137,22 @@
 	if (!name || !s) {
 		return NULL;
 	}
+	o = strdup (s);
+	int cols = r_str_split (o, ',');
+	if (cols < 3) {
+		free (o);
+		return NULL;
+	}
+
 	si = R_NEW0 (RSyscallItem);
 	if (!si) {
+		free (o);
 		return NULL;
 	}
-	o = strdup (s);
-	r_str_split (o, ',');
 	si->name = strdup (name);
-	si->swi = r_num_get (NULL, r_str_word_get0 (o, 0));
-	si->num = r_num_get (NULL, r_str_word_get0 (o, 1));
-	si->args = r_num_get (NULL, r_str_word_get0 (o, 2));
+	si->swi = (int)r_num_get (NULL, r_str_word_get0 (o, 0));
+	si->num = (int)r_num_get (NULL, r_str_word_get0 (o, 1));
+	si->args = (int)r_num_get (NULL, r_str_word_get0 (o, 2));
 	//in a definition such as syscall=0x80,0,4,
 	//the string at index 3 is 0 causing oob read afterwards
 	si->sargs = calloc (si->args + 1, sizeof (char));
@@ -175,17 +194,17 @@
 	}
 	swi = getswi (s, swi);
 	if (swi < 16) {
-		key = sdb_fmt (0, "%d.%d", swi, num);
+		key = sdb_fmt ("%d.%d", swi, num);
 	} else {
-		key = sdb_fmt (0, "0x%02x.%d", swi, num);
+		key = sdb_fmt ("0x%02x.%d", swi, num);
 	}
 	ret = sdb_const_get (s->db, key, 0);
 	if (!ret) {
-		key = sdb_fmt (0, "0x%02x.0x%02x", swi, num); // Workaround until Syscall SDB is fixed 
+		key = sdb_fmt ("0x%02x.0x%02x", swi, num); // Workaround until Syscall SDB is fixed
 		ret = sdb_const_get (s->db, key, 0);
 		if (!ret) {
 			return NULL;
-		}	
+		}
 	}
 	ret2 = sdb_const_get (s->db, ret, 0);
 	if (!ret2) {
@@ -216,7 +235,7 @@
 	if (!strchr (k, '.')) {
 		RSyscallItem *si = r_syscall_item_new_from_string (k, v);
 		if (!si) {
-			return 0;
+			return 1;
 		}
 		if (!strchr (si->name, '.')) {
 			r_list_append (list, si);
@@ -258,6 +277,6 @@
 	if (!s || !s->db) {
 		return NULL;
 	}
-	const char *key = sdb_fmt (0, "%s,%"PFMT64d, type, num);
+	const char *key = sdb_fmt ("%s,%"PFMT64d, type, num);
 	return sdb_const_get (s->db, key, 0);
 }
diff -Nru radare2-2.3.0+dfsg/libr/threads radare2-2.8.0+dfsg/libr/threads
--- radare2-2.3.0+dfsg/libr/threads	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/threads	1970-01-01 00:00:00.000000000 +0000
@@ -1,1157 +0,0 @@
-bp/io.c: * reflect all r_bp stuff in the process using dbg->bp_write or ->breakpoint
-bp/io.c: * reflect all r_bp stuff in the process using dbg->bp_write or ->breakpoint
-bp/plugin.c:		eprintf ("Cannot add plugin because dbg->bp is null and/or plugin is null\n");
-core/anal_tp.c:	r_reg_setv (core->dbg->reg, pc, fcn->addr);
-core/anal_tp.c:			r_reg_setv (core->dbg->reg, pc, addr);
-core/anal_tp.c:			r_reg_setv (core->dbg->reg, pc, addr);
-core/canal.c:	if (core->dbg && core->dbg->reg) {
-core/canal.c:		rs = r_reg_regset_get (core->dbg->reg, R_REG_TYPE_GPR);
-core/canal.c:				ut64 val = r_reg_getv(core->dbg->reg, r->name);
-core/canal.c:		r_list_foreach (core->dbg->maps, iter, map) {
-core/cconfig.c:	core->dbg->hitinfo = node->i_value;
-core/cconfig.c:	core->dbg->bpsize = node->i_value;
-core/cconfig.c:	core->dbg->btdepth = node->i_value;
-core/cconfig.c:			if (core->dbg->h && core->dbg->h->reg_profile) {
-core/cconfig.c:				core->dbg->bits = R_SYS_BITS_32;
-core/cconfig.c:				core->dbg->bits = R_SYS_BITS_64;
-core/cconfig.c:				char *rp = core->dbg->h->reg_profile (core->dbg);
-core/cconfig.c:				r_reg_set_profile_string (core->dbg->reg, rp);
-core/cconfig.c:			r_bp_use (core->dbg->bp, asmarch, core->anal->bits);
-core/cconfig.c:	// the big endian should also be assigned to dbg->bp->endian
-core/cconfig.c:	core->dbg->bp->endian = isbig;
-core/cconfig.c:			r_debug_select (core->dbg, core->dbg->pid,
-core/cconfig.c:					core->dbg->tid);
-core/cconfig.c:		if (core->dbg && core->dbg->h) {
-core/cconfig.c:			ioraw = core->dbg->h->keepio? 0: 1;
-core/cconfig.c:	free (core->dbg->btalgo);
-core/cconfig.c:	core->dbg->btalgo = strdup (node->value);
-core/cconfig.c:	free (core->dbg->glob_libs);
-core/cconfig.c:	core->dbg->glob_libs = strdup (node->value);
-core/cconfig.c:	free (core->dbg->glob_unlibs);
-core/cconfig.c:	core->dbg->glob_unlibs = strdup (node->value);
-core/cconfig.c:	core->dbg->trace_forks = node->i_value;
-core/cconfig.c:		r_debug_attach (core->dbg, core->dbg->pid);
-core/cconfig.c:	core->dbg->trace_execs = node->i_value;
-core/cconfig.c:		r_debug_attach (core->dbg, core->dbg->pid);
-core/cconfig.c:	core->dbg->trace_clone = node->i_value;
-core/cconfig.c:		r_debug_attach (core->dbg, core->dbg->pid);
-core/cconfig.c:	core->dbg->trace_aftersyscall = node->i_value;
-core/cconfig.c:		r_debug_attach (core->dbg, core->dbg->pid);
-core/cconfig.c:	core->dbg->regcols = c/4;
-core/cconfig.c:	core->dbg->regcols = n / 20;
-core/cconfig.c:	core->dbg->stop_all_threads = node->i_value;
-core/cconfig.c:	core->dbg->swstep = node->i_value;
-core/cconfig.c:	core->dbg->consbreak = node->i_value;
-core/cconfig.c:	core->dbg->trace->enabled = node->i_value;
-core/cconfig.c:	core->dbg->trace->tag = node->i_value;
-core/cconfig.c:	node->i_value = core->dbg->swstep;
-core/cmd.c:		if (dbg && dbg->h && dbg->h->threads) {
-core/cmd.c:			int origpid = dbg->pid;
-core/cmd.c:			list = dbg->h->threads (dbg, dbg->pid);
-core/cmd.c:				head = r_reg_get_list (dbg->reg, i);
-core/cmd.c:					value = r_reg_get_value (dbg->reg, item);
-core/cmd.c:			int pid = core->dbg->pid;
-core/cmd.c:			if (core->dbg->h && core->dbg->h->pids) {
-core/cmd.c:				RList *list = core->dbg->h->pids (core->dbg, R_MAX (0, pid));
-core/cmd_anal.c:	RReg *hack = core->dbg->reg;
-core/cmd_anal.c:	core->dbg->reg = core->anal->reg;
-core/cmd_anal.c:	core->dbg->reg = hack;
-core/cmd_anal.c:		ut8 *buf = r_reg_get_bytes (core->dbg->reg, type, &len);
-core/cmd_anal.c:				r = r_reg_cond_get (core->dbg->reg, name);
-core/cmd_anal.c:					RRegFlags *rf = r_reg_cond_retrieve (core->dbg->reg, NULL);
-core/cmd_anal.c:						int o = r_reg_cond_bits (core->dbg->reg, id, rf);
-core/cmd_anal.c:				RRegFlags *rf = r_reg_cond_retrieve (core->dbg->reg, NULL);
-core/cmd_anal.c:								r_reg_cond_bits (core->dbg->reg, i, rf));
-core/cmd_anal.c:								r_reg_cond_bits (core->dbg->reg, i, rf),
-core/cmd_anal.c:			r_reg_arena_pop (core->dbg->reg);
-core/cmd_anal.c:			r_reg_arena_push (core->dbg->reg);
-core/cmd_anal.c:						core->dbg->reg->regset[0].pool));
-core/cmd_anal.c:		name = r_reg_get_name (core->dbg->reg, r_reg_get_name_idx (str + 2));
-core/cmd_anal.c:		r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_anal.c:		r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_anal.c:			r = r_reg_get (core->dbg->reg, regname, -1);
-core/cmd_anal.c:					const char *alias = r_reg_get_name (core->dbg->reg, type);
-core/cmd_anal.c:					r = r_reg_get (core->dbg->reg, alias, -1);
-core/cmd_anal.c:				//	r_reg_get_value (core->dbg->reg, r));
-core/cmd_anal.c:				r_reg_set_value (core->dbg->reg, r,
-core/cmd_anal.c:				//	r_reg_get_value (core->dbg->reg, r));
-core/cmd_anal.c:			r = r_reg_get (core->dbg->reg, str + 1, -1);
-core/cmd_anal.c:					off = r_reg_get_value_big (core->dbg->reg, r, &value);
-core/cmd_anal.c:					off = r_reg_get_value (core->dbg->reg, r);
-core/cmd_anal.c:		if (core->dbg->trace->enabled) {
-core/cmd_anal.c:			RReg *reg = core->dbg->reg;
-core/cmd_anal.c:			core->dbg->reg = core->anal->reg;
-core/cmd_anal.c:			core->dbg->reg = reg;
-core/cmd_anal.c:	sp = r_reg_get_name (core->dbg->reg, R_REG_NAME_SP);
-core/cmd_anal.c:	sp = r_reg_get_name (core->dbg->reg, R_REG_NAME_BP);
-core/cmd_anal.c:		eprintf ("Current Tag: %d\n", core->dbg->trace->tag);
-core/cmd_anal.c:		r_debug_trace_free (core->dbg->trace);
-core/cmd_anal.c:		core->dbg->trace = r_debug_trace_new ();
-core/cmd_debug.c:	r_list_foreach (r->dbg->maps, iter, map) {
-core/cmd_debug.c:	r_list_foreach (r->dbg->maps, iter, map) {
-core/cmd_debug.c:	r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:	if (!core || !esilstr || !core->dbg || !core->dbg->anal \
-core/cmd_debug.c:			|| !core->dbg->anal->esil) {
-core/cmd_debug.c:		eprintf ("Selected: %d %d\n", core->dbg->pid, core->dbg->tid);
-core/cmd_debug.c:		r_debug_pid_list (core->dbg, core->dbg->pid, 0);
-core/cmd_debug.c:			r_debug_detach (core->dbg, core->dbg->pid);
-core/cmd_debug.c:		if (core->dbg->forked_pid != -1) {
-core/cmd_debug.c:				eprintf ("dp %d\n", core->dbg->forked_pid);
-core/cmd_debug.c:				r_debug_select (core->dbg, core->dbg->forked_pid, core->dbg->tid);
-core/cmd_debug.c:				core->dbg->forked_pid = -1;
-core/cmd_debug.c:				r_debug_thread_list (core->dbg, core->dbg->pid);
-core/cmd_debug.c:				r_debug_select (core->dbg, core->dbg->pid,
-core/cmd_debug.c:		r_debug_select (core->dbg, core->dbg->pid, core->dbg->tid);
-core/cmd_debug.c:				(core->dbg->h && !core->dbg->h->canstep));
-core/cmd_debug.c:		r_core_cmdf (core, "=!pid %d", core->dbg->pid);
-core/cmd_debug.c:			r_debug_select (core->dbg, core->file->desc->fd, core->dbg->tid);
-core/cmd_debug.c:				(int) r_num_math (core->num, input + 2), core->dbg->tid);
-core/cmd_debug.c:		r_debug_pid_list (core->dbg, core->dbg->pid, 'j');
-core/cmd_debug.c:			int pid = (input[2] == ' ')? atoi (input + 2): core->dbg->pid;
-core/cmd_debug.c:		r_bp_traptrace_list (core->dbg->bp);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_bp_traptrace_reset (core->dbg->bp, true);
-core/cmd_debug.c:		r_bp_traptrace_add (core->dbg->bp, core->offset, core->offset+len);
-core/cmd_debug.c:		r_bp_traptrace_enable (core->dbg->bp, true);
-core/cmd_debug.c:		} while (r_bp_traptrace_at (core->dbg->bp, addr, analop.size));
-core/cmd_debug.c:		r_bp_traptrace_enable (core->dbg->bp, false);
-core/cmd_debug.c:	r_list_foreach (dbg->snaps, iter, snap) {
-core/cmd_debug.c:			dbg->iob.read_at (dbg->iob.io, snap->addr, b , snap->size);
-core/cmd_debug.c:	int ret = r_list_empty(core->dbg->maps)? false: true;
-core/cmd_debug.c:	r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_debug.c:		r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_debug.c:				r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_debug.c:		r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_debug.c:			r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_debug.c:		r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_debug.c:		value = r_reg_get_value (core->dbg->reg, r);
-core/cmd_debug.c:		if (core->dbg->reg->reg_profile_str) {
-core/cmd_debug.c:			r_cons_println (core->dbg->reg->reg_profile_str);
-core/cmd_debug.c:		r_reg_set_profile (core->dbg->reg, str+2);
-core/cmd_debug.c:			RRegSet *rs = r_reg_regset_get (core->dbg->reg, R_REG_TYPE_GPR);
-core/cmd_debug.c:			RRegSet *rs = r_reg_regset_get (core->dbg->reg, R_REG_TYPE_GPR);
-core/cmd_debug.c:			RRegSet *rs = r_reg_regset_get (core->dbg->reg, R_REG_TYPE_GPR);
-core/cmd_debug.c:				if (core->dbg->reg->name[i]) {
-core/cmd_debug.c:							core->dbg->reg->name[i]);
-core/cmd_debug.c:				r_list_foreach (core->dbg->reg->regset[i].regs, iter, r) {
-core/cmd_debug.c:	int bits = (core->dbg->bits & R_SYS_BITS_64)? 64: 32;
-core/cmd_debug.c:		if (core->dbg->reg->reg_profile_cmt) {
-core/cmd_debug.c:			r_cons_println (core->dbg->reg->reg_profile_cmt);
-core/cmd_debug.c:			//		r = r_reg_get (core->dbg->reg, str+1, 0);
-core/cmd_debug.c:			//r_reg_get_value (core->dbg->reg, r));
-core/cmd_debug.c:			RRegSet *rs = r_reg_regset_get (core->dbg->reg, R_REG_TYPE_GPR);
-core/cmd_debug.c:			ut8 *buf = r_reg_get_bytes (core->dbg->reg, type, &len);
-core/cmd_debug.c:				r = r_reg_cond_get (core->dbg->reg, name);
-core/cmd_debug.c:					RRegFlags* rf = r_reg_cond_retrieve (core->dbg->reg, NULL);
-core/cmd_debug.c:						int o = r_reg_cond_bits (core->dbg->reg, id, rf);
-core/cmd_debug.c:				RRegFlags *rf = r_reg_cond_retrieve (core->dbg->reg, NULL);
-core/cmd_debug.c:									r_reg_cond_bits (core->dbg->reg, i, rf));
-core/cmd_debug.c:									r_reg_cond_bits (core->dbg->reg, i, rf),
-core/cmd_debug.c:						core->dbg->reg->regset[0].pool));
-core/cmd_debug.c:			r_reg_arena_pop (core->dbg->reg);
-core/cmd_debug.c:			r_reg_arena_push (core->dbg->reg);
-core/cmd_debug.c:			RRegItem *item = r_reg_get (core->dbg->reg, name, -1);
-core/cmd_debug.c:					r_reg_set_pack (core->dbg->reg, item, word, size, val);
-core/cmd_debug.c:					ut64 res = r_reg_get_pack (core->dbg->reg, item, word, size);
-core/cmd_debug.c:			RRegItem *item = r_reg_get (core->dbg->reg, name, -1);
-core/cmd_debug.c:					r_reg_set_double (core->dbg->reg, item, val);
-core/cmd_debug.c:					long double res = r_reg_get_double (core->dbg->reg, item);
-core/cmd_debug.c:					const char *regname = r_reg_get_name (core->dbg->reg, role);
-core/cmd_debug.c:							size = core->dbg->bits * 8;
-core/cmd_debug.c:			name = r_reg_get_name (core->dbg->reg, r_reg_get_name_idx (foo));
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_debug.c:				} //else eprintf ("Cannot retrieve registers from pid %d\n", core->dbg->pid);
-core/cmd_debug.c:				RReg *orig = core->dbg->reg;
-core/cmd_debug.c:				core->dbg->reg = core->anal->reg;
-core/cmd_debug.c:				core->dbg->reg = orig;
-core/cmd_debug.c:		r_core_debug_rr (core, core->dbg->reg);
-core/cmd_debug.c:		} else eprintf ("Cannot retrieve registers from pid %d\n", core->dbg->pid);
-core/cmd_debug.c:			regname = r_reg_get_name (core->dbg->reg, r_reg_get_name_idx (string));
-core/cmd_debug.c:			r = r_reg_get (core->dbg->reg, regname, -1); //R_REG_TYPE_GPR);
-core/cmd_debug.c:							r_reg_get_value (core->dbg->reg, r));
-core/cmd_debug.c:					r_reg_set_bvalue (core->dbg->reg, r, arg+1);
-core/cmd_debug.c:							r_reg_get_value (core->dbg->reg, r));
-core/cmd_debug.c:							r_reg_get_value (core->dbg->reg, r));
-core/cmd_debug.c:					r_reg_set_value (core->dbg->reg, r,
-core/cmd_debug.c:							r_reg_get_value (core->dbg->reg, r));
-core/cmd_debug.c:	r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_debug.c:			bpi = r_bp_get_at (core->dbg->bp, core->offset);
-core/cmd_debug.c:					r_bp_set_trace_all (core->dbg->bp,true);
-core/cmd_debug.c:				} else if (!r_bp_set_trace (core->dbg->bp, addr, true)) {
-core/cmd_debug.c:					r_bp_set_trace_all (core->dbg->bp,false);
-core/cmd_debug.c:				} else if (!r_bp_set_trace (core->dbg->bp, addr, false)) {
-core/cmd_debug.c:				bpi = r_bp_get_at (core->dbg->bp, addr);
-core/cmd_debug.c:					if (core->dbg->bits & R_SYS_BITS_64) {
-core/cmd_debug.c:					} else if (core->dbg->bits & R_SYS_BITS_32) {
-core/cmd_debug.c:			core->dbg->bp->delta = (st64)r_num_math (core->num, input + 2);
-core/cmd_debug.c:			r_cons_printf ("%"PFMT64d"\n", core->dbg->bp->delta);
-core/cmd_debug.c:	case 'j': r_bp_list (core->dbg->bp, 'j'); break;
-core/cmd_debug.c:	case '*': r_bp_list (core->dbg->bp, 1); break;
-core/cmd_debug.c:	case '\0': r_bp_list (core->dbg->bp, 0); break;
-core/cmd_debug.c:		if (input[2] == '*') r_bp_del_all (core->dbg->bp);
-core/cmd_debug.c:		else r_bp_del (core->dbg->bp, r_num_math (core->num, input + 2));
-core/cmd_debug.c:					bpi = r_bp_get_at (core->dbg->bp, addr);
-core/cmd_debug.c:					bpi = r_bp_get_at (core->dbg->bp, addr);
-core/cmd_debug.c:		bpi = r_bp_get_at (core->dbg->bp, addr);
-core/cmd_debug.c:			r_bp_del (core->dbg->bp, addr);
-core/cmd_debug.c:		r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), 0);
-core/cmd_debug.c:		bpi = r_bp_get_at (core->dbg->bp, core->offset);
-core/cmd_debug.c:		if (*p == '*') r_bp_enable_all (core->dbg->bp,true);
-core/cmd_debug.c:		else r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), true);
-core/cmd_debug.c:		if (*p == '*') r_bp_enable_all (core->dbg->bp, false);
-core/cmd_debug.c:		r_bp_enable (core->dbg->bp, r_num_math (core->num, input + 2), false);
-core/cmd_debug.c:				r_bp_plugin_list (core->dbg->bp);
-core/cmd_debug.c:				if (!r_bp_use (core->dbg->bp, input + 3, core->anal->bits))
-core/cmd_debug.c:				r_bp_del (core->dbg->bp, r_num_math (core->num, p + 1));
-core/cmd_debug.c:			for (i = 0;i < core->dbg->bp->bps_idx_count; i++) {
-core/cmd_debug.c:				if ((bpi = core->dbg->bp->bps_idx[i])) {
-core/cmd_debug.c:				if (p && (bpi = r_bp_get_index (core->dbg->bp, addr))) {
-core/cmd_debug.c:			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-core/cmd_debug.c:			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-core/cmd_debug.c:			if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-core/cmd_debug.c:				if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-core/cmd_debug.c:				if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-core/cmd_debug.c:				if ((bpi = r_bp_get_index (core->dbg->bp, addr))) {
-core/cmd_debug.c:	Sdb *tracenodes = core->dbg->tracenodes;
-core/cmd_debug.c:	RTree *tr = core->dbg->tree;
-core/cmd_debug.c:	int t = core->dbg->trace->enabled;
-core/cmd_debug.c:	core->dbg->trace->enabled = 0;
-core/cmd_debug.c:	r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_bp_del (core->dbg->bp, final_addr);
-core/cmd_debug.c:	trace_traverse (core->dbg->tree);
-core/cmd_debug.c:	core->dbg->trace->enabled = t;
-core/cmd_debug.c:			r_debug_kill (core->dbg, core->dbg->pid, core->dbg->tid, sig);
-core/cmd_debug.c:		eprintf ("Continue until 0x%08"PFMT64x" using %d bpsize\n", addr, core->dbg->bpsize);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_bp_add_sw (core->dbg->bp, addr, core->dbg->bpsize, R_BP_PROT_EXEC);
-core/cmd_debug.c:		r_bp_del (core->dbg->bp, addr);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		old_pid = core->dbg->pid;
-core/cmd_debug.c:		main_pid = core->dbg->main_pid;
-core/cmd_debug.c:		if (core->dbg->threads) {
-core/cmd_debug.c:			list = core->dbg->threads;
-core/cmd_debug.c:			if (core->dbg->h && core->dbg->h->threads) {
-core/cmd_debug.c:				list = core->dbg->h->threads (core->dbg, core->dbg->pid);
-core/cmd_debug.c:		r_debug_select (core->dbg, old_pid, core->dbg->tid);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:			int old_pid = core->dbg->pid;
-core/cmd_debug.c:			int old_tid = core->dbg->tid;
-core/cmd_debug.c:			int t = core->dbg->trace->enabled;
-core/cmd_debug.c:			core->dbg->trace->enabled = 0;
-core/cmd_debug.c:			core->dbg->trace->enabled = t;
-core/cmd_debug.c:		old_pid = core->dbg->pid;
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_debug_select (core->dbg, pid, core->dbg->tid);
-core/cmd_debug.c:		r_debug_select (core->dbg, old_pid, core->dbg->tid);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:			r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:			RBreakpointItem *bpi = r_bp_get_at (core->dbg->bp, addr);
-core/cmd_debug.c:			r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:			RBreakpointItem *bpi = r_bp_get_at (core->dbg->bp, addr);
-core/cmd_debug.c:			r_bp_del (core->dbg->bp, addr);
-core/cmd_debug.c:			r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:		r_reg_arena_swap (core->dbg->reg, true);
-core/cmd_debug.c:					dot_trace_traverse (core, core->dbg->tree, input[2]);
-core/cmd_debug.c:					r_tree_reset (core->dbg->tree);
-core/cmd_debug.c:					r_debug_trace_free (core->dbg->trace);
-core/cmd_debug.c:					core->dbg->trace = r_debug_trace_new ();
-core/cmd_debug.c:							const char *s = r_signal_to_string (core->dbg->reason.signum);
-core/cmd_debug.c:							P ("type=%s\n", r_debug_reason_to_string (core->dbg->reason.type));
-core/cmd_debug.c:							P ("signum=%d\n", core->dbg->reason.signum);
-core/cmd_debug.c:							P ("sigpid=%d\n", core->dbg->reason.tid);
-core/cmd_debug.c:							P ("addr=0x%"PFMT64x"\n", core->dbg->reason.addr);
-core/cmd_debug.c:							P ("bp_addr=0x%"PFMT64x"\n", core->dbg->reason.bp_addr);
-core/cmd_debug.c:							P ("inbp=%s\n", r_str_bool (core->dbg->reason.bp_addr));
-core/cmd_debug.c:							const char *s = r_signal_to_string (core->dbg->reason.signum);
-core/cmd_debug.c:							P ("\"type\":\"%s\",", r_debug_reason_to_string (core->dbg->reason.type));
-core/cmd_debug.c:							P ("\"signum\":%d,", core->dbg->reason.signum);
-core/cmd_debug.c:							P ("\"sigpid\":%d,", core->dbg->reason.tid);
-core/cmd_debug.c:							P ("\"addr\":%"PFMT64d",", core->dbg->reason.addr);
-core/cmd_debug.c:							P ("\"inbp\":%s,", r_str_bool (core->dbg->reason.bp_addr));
-core/cmd_debug.c:							r_reg_arena_push (core->dbg->reg);
-core/cmd_debug.c:							r_reg_arena_pop (core->dbg->reg);
-core/cmd_debug.c:						r_reg_arena_push (core->dbg->reg);
-core/cmd_debug.c:						r_reg_arena_pop (core->dbg->reg);
-core/cmd_debug.c:					r_reg_arena_push (core->dbg->reg);
-core/cmd_debug.c:					r_reg_arena_pop (core->dbg->reg);
-core/cmd_debug.c:				//int opid = core->dbg->pid = pid;
-core/cmd_debug.c:			if (core->dbg->h && core->dbg->h->gcore) {
-core/cmd_debug.c:				if (core->dbg->pid == -1) {
-core/cmd_debug.c:				char *corefile = get_corefile_name (input + 1, core->dbg->pid);
-core/cmd_debug.c:					if (!core->dbg->h->gcore (core->dbg, dst)) {
-core/cmd_print.c:	core->print->reg = core->dbg->reg;
-core/cmd_print.c:			RList *pids = (core->dbg->h && core->dbg->h->pids)
-core/cmd_print.c:				? core->dbg->h->pids (core->dbg, 0): NULL;
-core/cmd_search.c:				r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_search.c:				r_list_foreach (core->dbg->maps, iter, map) {
-core/cmd_search_rop.c:	regs = r_reg_get_list (core->dbg->reg, 0);
-core/cmd_search_rop.c:		r_reg_arena_pop (core->dbg->reg);
-core/cmd_search_rop.c:		r_reg_set_value (core->dbg->reg, reg_item, nr);
-core/cmd_search_rop.c:		r_reg_arena_push (core->dbg->reg);
-core/cmd_search_rop.c:		head = r_reg_get_list (core->dbg->reg, 0);
-core/cmd_search_rop.c:		head = r_reg_get_list (core->dbg->reg, 0);
-core/cmd_search_rop.c:			value_dst = r_reg_get_value (core->dbg->reg, item_dst);
-core/cmd_search_rop.c:			r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:			diff_dst = r_reg_get_value (core->dbg->reg, item_dst);
-core/cmd_search_rop.c:			r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:			r_reg_set_value (core->dbg->reg, item_dst, diff_dst);
-core/cmd_search_rop.c:		head = r_reg_get_list (core->dbg->reg, 0);
-core/cmd_search_rop.c:		head = r_reg_get_list (core->dbg->reg, 0);
-core/cmd_search_rop.c:			value_dst = r_reg_get_value (core->dbg->reg, item_dst);
-core/cmd_search_rop.c:			r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:			diff_dst = r_reg_get_value (core->dbg->reg, item_dst);
-core/cmd_search_rop.c:			r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:				value_src = r_reg_get_value (core->dbg->reg, item_src);
-core/cmd_search_rop.c:				r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:				diff_src = r_reg_get_value (core->dbg->reg, item_src);
-core/cmd_search_rop.c:				r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:				r_reg_set_value (core->dbg->reg, item_src, diff_src);
-core/cmd_search_rop.c:		head = r_reg_get_list (core->dbg->reg, 0);
-core/cmd_search_rop.c:				value_src1 = r_reg_get_value (core->dbg->reg, item_src1);
-core/cmd_search_rop.c:				r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:				diff_src1 = r_reg_get_value (core->dbg->reg, item_src1);
-core/cmd_search_rop.c:				r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:					value_src2 = r_reg_get_value (core->dbg->reg, item_src2);
-core/cmd_search_rop.c:					r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:					diff_src2 = r_reg_get_value (core->dbg->reg, item_src2);
-core/cmd_search_rop.c:						value_dst = r_reg_get_value (core->dbg->reg, item_dst);
-core/cmd_search_rop.c:						r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:		head = r_reg_get_list (core->dbg->reg, 0);
-core/cmd_search_rop.c:				value_src1 = r_reg_get_value (core->dbg->reg, item_src1);
-core/cmd_search_rop.c:				r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:				diff_src1 = r_reg_get_value (core->dbg->reg, item_src1);
-core/cmd_search_rop.c:				r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:					value_dst = r_reg_get_value (core->dbg->reg, item_dst);
-core/cmd_search_rop.c:					r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_search_rop.c:					diff_dst = r_reg_get_value (core->dbg->reg, item_dst);
-core/cmd_search_rop.c:					r_reg_arena_swap (core->dbg->reg, false);
-core/cmd_seek.c:				RReg *orig = core->dbg->reg;
-core/cmd_seek.c:				core->dbg->reg = core->anal->reg;
-core/cmd_seek.c:				core->dbg->reg = orig;
-core/core.c:		case 'P': return (core->dbg->pid > 0)? core->dbg->pid: 0;
-core/core.c:				r_list_foreach (core->dbg->maps, iter, map) {
-core/core.c:	if (core->dbg->sgnls) {
-core/core.c:		core->dbg->sgnls->refs++;
-core/core.c:		sdb_ns_set (d, "signals", core->dbg->sgnls);
-core/core.c:				r_list_foreach (core->dbg->maps, iter, map) {
-core/core.c:	r_core_bind (core, &core->dbg->corebind);
-core/core.c:	core->dbg->cb_printf = (PrintfCallback)r_cons_printf;
-core/core.c:	core->dbg->anal = core->anal; // XXX: dupped instance.. can cause lost pointerz
-core/core.c://	r_reg_arena_push (core->dbg->reg); // create a 2 level register state stack
-core/core.c://	core->dbg->anal->reg = core->anal->reg; // XXX: dupped instance.. can cause lost pointerz
-core/core.c:	core->dbg->cb_printf = r_cons_printf;
-core/core.c:	core->dbg->bp->cb_printf = r_cons_printf;
-core/core.c:	r_bp_use (core->dbg->bp, R_SYS_ARCH, core->anal->bits);
-core/disasm.c:		r_list_foreach (core->dbg->maps, iter, map) {
-core/disasm.c:	p = r_bp_get_at (core->dbg->bp, ds->at);
-core/file.c:		r_debug_kill (core->dbg, core->dbg->pid, core->dbg->tid, 9); // KILL
-core/file.c:			core->dbg->main_pid = newpid;
-core/file.c:	r_list_foreach (core->dbg->maps, iter, map) {
-core/file.c:	r_list_foreach (core->dbg->maps, iter, map) {
-core/file.c:	bp = r_bp_add_sw (r->dbg->bp, fi->offset, 1, R_BP_PROT_EXEC);
-core/file.c:		r_debug_select (r->dbg, r->dbg->pid, r->dbg->tid);
-core/file.c:		if (r->dbg->h && r->dbg->h->canstep) {
-core/graph.c:		const char *pc = r_reg_get_name (core->dbg->reg, R_REG_NAME_PC);
-core/graph.c:		RRegItem *r = r_reg_get (core->dbg->reg, pc, -1);
-core/graph.c:		ut64 addr = r_reg_get_value (core->dbg->reg, r);
-core/libs.c:CB (bp, dbg->bp)
-core/linux_heap_glibc.c:	r_list_foreach (core->dbg->maps, iter, map) {
-core/linux_heap_glibc.c:	if (!core || !core->dbg || !core->dbg->maps) {
-core/linux_heap_glibc.c:		r_list_foreach (core->dbg->maps, iter, map) {
-core/linux_heap_glibc.c:	if (!core || !core->dbg || !core->dbg->maps) {
-core/linux_heap_glibc.c:	if (!core || !core->dbg || !core->dbg->maps) {
-core/linux_heap_glibc.c:	if (!core || !core->dbg || !core->dbg->maps) {
-core/linux_heap_glibc.c:	if (!core || !core->dbg || !core->dbg->maps) {
-core/linux_heap_glibc.c:	if (!core || !core->dbg || !core->dbg->maps) {
-core/linux_heap_glibc.c:	if (!core || !core->dbg || !core->dbg->maps){
-core/visual.c:		const int cols = core->dbg->regcols;
-core/visual.c:		const int cols = core->dbg->regcols;
-core/visual.c:				const char *creg = core->dbg->creg;
-core/visual.c:		RBreakpointItem *bp = r_bp_get_at (core->dbg->bp, addr);
-core/visual.c:			r_bp_del (core->dbg->bp, addr);
-core/visual.c:			r_bp_add_sw (core->dbg->bp, addr, 1, R_BP_PROT_EXEC);
-debug/arg.c:		if (dbg->bits == 64) {
-debug/arg.c:			dbg->iob.read_at (dbg->iob.io, sp, (ut8*)&n64, sizeof(ut64));
-debug/arg.c:			dbg->iob.read_at (dbg->iob.io, sp, (ut8*)&n32, sizeof(ut32));
-debug/ddesc.c:	if (dbg && dbg->h && dbg->h->desc.open)
-debug/ddesc.c:		return dbg->h->desc.open (path);
-debug/ddesc.c:	if (dbg && dbg->h && dbg->h->desc.close)
-debug/ddesc.c:		return dbg->h->desc.close (fd);
-debug/ddesc.c:	if (dbg && dbg->h && dbg->h->desc.dup)
-debug/ddesc.c:		return dbg->h->desc.dup (fd, newfd);
-debug/ddesc.c:	if (dbg && dbg->h && dbg->h->desc.read)
-debug/ddesc.c:		return dbg->h->desc.read (fd, addr, len);
-debug/ddesc.c:	if (dbg && dbg->h && dbg->h->desc.seek)
-debug/ddesc.c:		return dbg->h->desc.seek (fd, addr);
-debug/ddesc.c:	if (dbg && dbg->h && dbg->h->desc.write)
-debug/ddesc.c:		return dbg->h->desc.write (fd, addr, len);
-debug/ddesc.c:		if (dbg && dbg->cb_printf)
-debug/ddesc.c:			dbg->cb_printf ("TODO \n");
-debug/ddesc.c:		if (dbg && dbg->h && dbg->h->desc.list) {
-debug/ddesc.c:			list = dbg->h->desc.list (dbg->pid);
-debug/ddesc.c:				dbg->cb_printf ("%i 0x%"PFMT64x" %c%c%c %s\n", p->fd, p->off,
-debug/debug.c:	if (!dbg || !dbg->h || !dbg->h->info) {
-debug/debug.c:	return dbg->h->info (dbg, arg);
-debug/debug.c:	if (dbg->trace->enabled) {
-debug/debug.c:	if (!r_bp_restore (dbg->bp, false)) { // unset sw breakpoints
-debug/debug.c:	if (!dbg->swstep && dbg->recoil_mode != R_DBG_RECOIL_NONE) {
-debug/debug.c:		dbg->reason.bp_addr = 0;
-debug/debug.c:	b = r_bp_get_at (dbg->bp, pc);
-debug/debug.c:	b = r_bp_get_at (dbg->bp, pc - dbg->bpsize);
-debug/debug.c:	if (!r_reg_set_value (dbg->reg, pc_ri, pc)) {
-debug/debug.c:		dbg->reason.bp_addr = 0;
-debug/debug.c:	dbg->reason.bp_addr = b->addr;
-debug/debug.c:	if (dbg->hitinfo) {
-debug/debug.c:	if (dbg->corebind.core && dbg->corebind.bphit) {
-debug/debug.c:		dbg->corebind.bphit (dbg->corebind.core, b);
-debug/debug.c:	if (!r_bp_restore (dbg->bp, true))
-debug/debug.c:	dbg->recoil_mode = R_DBG_RECOIL_NONE;
-debug/debug.c:	if (!dbg->reason.bp_addr) {
-debug/debug.c:	if (dbg->recoil_mode != R_DBG_RECOIL_NONE) {
-debug/debug.c:		if (dbg->swstep) {
-debug/debug.c:			if (!r_bp_restore_except (dbg->bp, true, dbg->reason.bp_addr)) {
-debug/debug.c:	dbg->recoil_mode = rc_mode;
-debug/debug.c:	if (!dbg->reason.bp_addr && dbg->recoil_mode == R_DBG_RECOIL_STEP) {
-debug/debug.c:#define CMP_ARCH(x) strncmp (dbg->arch, (x), R_MIN (len_arch, strlen ((x))))
-debug/debug.c:	int bpsz , len_arch = strlen (dbg->arch);
-debug/debug.c:			addr = (ut64)r_num_math (dbg->num, module);
-debug/debug.c:		r_list_foreach (dbg->maps, iter, map) {
-debug/debug.c:		r_list_foreach (dbg->maps, iter, map) {
-debug/debug.c:		? r_bp_add_hw (dbg->bp, addr, bpsz, R_BP_PROT_EXEC)
-debug/debug.c:		: r_bp_add_sw (dbg->bp, addr, bpsz, R_BP_PROT_EXEC);
-debug/debug.c:	dbg->arch = strdup (R_SYS_ARCH);
-debug/debug.c:	dbg->bits = R_SYS_BITS;
-debug/debug.c:	dbg->trace_forks = 1;
-debug/debug.c:	dbg->forked_pid = -1;
-debug/debug.c:	dbg->trace_clone = 0;
-debug/debug.c:	dbg->trace_aftersyscall = true;
-debug/debug.c:	R_FREE (dbg->btalgo);
-debug/debug.c:	dbg->trace_execs = 0;
-debug/debug.c:	dbg->anal = NULL;
-debug/debug.c:	dbg->snaps = r_list_newf (r_debug_snap_free);
-debug/debug.c:	dbg->pid = -1;
-debug/debug.c:	dbg->bpsize = 1;
-debug/debug.c:	dbg->tid = -1;
-debug/debug.c:	dbg->tree = r_tree_new ();
-debug/debug.c:	dbg->tracenodes = sdb_new0 ();
-debug/debug.c:	dbg->swstep = 0;
-debug/debug.c:	dbg->stop_all_threads = false;
-debug/debug.c:	dbg->trace = r_debug_trace_new ();
-debug/debug.c:	dbg->cb_printf = (void *)printf;
-debug/debug.c:	dbg->reg = r_reg_new ();
-debug/debug.c:	dbg->num = r_num_new (r_debug_num_callback, r_debug_str_callback, dbg);
-debug/debug.c:	dbg->h = NULL;
-debug/debug.c:	dbg->threads = NULL;
-debug/debug.c:	dbg->hitinfo = 1;
-debug/debug.c:	dbg->maps = r_debug_map_list_new ();
-debug/debug.c:	dbg->maps_user = r_debug_map_list_new ();
-debug/debug.c:		dbg->bp = r_bp_new ();
-debug/debug.c:		dbg->bp->iob.init = false;
-debug/debug.c:	sdb_foreach (dbg->tracenodes, (SdbForeachCallback)free_tracenodes_entry, dbg);
-debug/debug.c:	sdb_reset (dbg->tracenodes);
-debug/debug.c:		r_bp_free (dbg->bp);
-debug/debug.c:		//r_reg_free(&dbg->reg);
-debug/debug.c:		r_list_free (dbg->snaps);
-debug/debug.c:		r_list_free (dbg->maps);
-debug/debug.c:		r_list_free (dbg->maps_user);
-debug/debug.c:		r_list_free (dbg->threads);
-debug/debug.c:		r_num_free (dbg->num);
-debug/debug.c:		sdb_free (dbg->sgnls);
-debug/debug.c:		r_tree_free (dbg->tree);
-debug/debug.c:		sdb_foreach (dbg->tracenodes, (SdbForeachCallback)free_tracenodes_entry, dbg);
-debug/debug.c:		sdb_free (dbg->tracenodes);
-debug/debug.c:		r_list_free (dbg->plugins);
-debug/debug.c:		free (dbg->btalgo);
-debug/debug.c:		r_debug_trace_free (dbg->trace);
-debug/debug.c:		dbg->trace = NULL;
-debug/debug.c:		free (dbg->arch);
-debug/debug.c:		free (dbg->glob_libs);
-debug/debug.c:		free (dbg->glob_unlibs);
-debug/debug.c:	if (dbg && dbg->h && dbg->h->attach) {
-debug/debug.c:		ret = dbg->h->attach (dbg, pid);
-debug/debug.c:			r_debug_select (dbg, pid, ret); //dbg->pid, dbg->tid);
-debug/debug.c:	if (dbg && dbg->h && dbg->h->stop) {
-debug/debug.c:		return dbg->h->stop (dbg);
-debug/debug.c:	if (arch && dbg && dbg->h) {
-debug/debug.c:		bool rc = r_sys_arch_match (dbg->h->arch, arch);
-debug/debug.c:				if (dbg->h->bits & R_SYS_BITS_32) {
-debug/debug.c:					dbg->bits = R_SYS_BITS_32;
-debug/debug.c:				dbg->bits = R_SYS_BITS_64;
-debug/debug.c:			if (!dbg->h->bits) {
-debug/debug.c:				dbg->bits = dbg->h->bits;
-debug/debug.c:			} else if (!(dbg->h->bits & dbg->bits)) {
-debug/debug.c:				dbg->bits = dbg->h->bits & R_SYS_BITS_64;
-debug/debug.c:				if (!dbg->bits) {
-debug/debug.c:					dbg->bits = dbg->h->bits & R_SYS_BITS_32;
-debug/debug.c:				if (!dbg->bits) {
-debug/debug.c:					dbg->bits = R_SYS_BITS_32;
-debug/debug.c:			free (dbg->arch);
-debug/debug.c:			dbg->arch = strdup (arch);
-debug/debug.c:	ripc = r_reg_get (dbg->reg, dbg->reg->name[R_REG_NAME_PC], R_REG_TYPE_GPR);
-debug/debug.c:	risp = r_reg_get (dbg->reg, dbg->reg->name[R_REG_NAME_SP], R_REG_TYPE_GPR);
-debug/debug.c:		orig = r_reg_get_bytes (dbg->reg, -1, &orig_sz);
-debug/debug.c:		rpc = r_reg_get_value (dbg->reg, ripc);
-debug/debug.c:		rsp = r_reg_get_value (dbg->reg, risp);
-debug/debug.c:		dbg->iob.read_at (dbg->iob.io, rpc, backup, len);
-debug/debug.c:		dbg->iob.read_at (dbg->iob.io, rsp, stackbackup, len);
-debug/debug.c:		r_bp_add_sw (dbg->bp, rpc+len, dbg->bpsize, R_BP_PROT_EXEC);
-debug/debug.c:		dbg->iob.write_at (dbg->iob.io, rpc, buf, len);
-debug/debug.c:		//r_bp_add_sw (dbg->bp, rpc+len, 4, R_BP_PROT_EXEC);
-debug/debug.c:		//r_bp_del (dbg->bp, rpc+len);
-debug/debug.c:		r_bp_del (dbg->bp, rpc+len);
-debug/debug.c:		dbg->iob.write_at (dbg->iob.io, rpc, backup, len);
-debug/debug.c:			dbg->iob.write_at (dbg->iob.io, rsp, stackbackup, len);
-debug/debug.c:		ri = r_reg_get (dbg->reg, dbg->reg->name[R_REG_NAME_A0], R_REG_TYPE_GPR);
-debug/debug.c:		ra0 = r_reg_get_value (dbg->reg, ri);
-debug/debug.c:			r_reg_read_regs (dbg->reg, orig, orig_sz);
-debug/debug.c:			r_reg_set_value (dbg->reg, ripc, rpc);
-debug/debug.c:	if (dbg->h && dbg->h->detach)
-debug/debug.c:		return dbg->h->detach (dbg, pid);
-debug/debug.c:		if (pid != dbg->pid || tid != dbg->tid) {
-debug/debug.c:		if (dbg->pid != -1)
-debug/debug.c:			eprintf ("Child %d is dead\n", dbg->pid);
-debug/debug.c:	if (dbg->h && dbg->h->select && !dbg->h->select (pid, tid))
-debug/debug.c:	r_io_system (dbg->iob.io, sdb_fmt (0, "pid %d", pid));
-debug/debug.c:	dbg->pid = pid;
-debug/debug.c:	dbg->tid = tid;
-debug/debug.c:	// return dbg->reason
-debug/debug.c:	return dbg->reason.type;
-debug/debug.c:	dbg->reason.type = R_DEBUG_REASON_UNKNOWN;
-debug/debug.c:	if (dbg->h && dbg->h->wait) {
-debug/debug.c:		reason = dbg->h->wait (dbg, dbg->pid);
-debug/debug.c:			pc_ri = r_reg_get (dbg->reg, dbg->reg->name[R_REG_NAME_PC], -1);
-debug/debug.c:			pc = r_reg_get_value (dbg->reg, pc_ri);
-debug/debug.c:			if (dbg->corebind.core && b && b->cond) {
-debug/debug.c:		dbg->reason.type = reason;
-debug/debug.c:		if (reason == R_DEBUG_REASON_SIGNAL && dbg->reason.signum != -1) {
-debug/debug.c:			int what = r_debug_signal_what (dbg, dbg->reason.signum);
-debug/debug.c:			const char *name = r_signal_to_string (dbg->reason.signum);
-debug/debug.c:						dbg->reason.signum, name, what);
-debug/debug.c:	if (dbg->recoil_mode == R_DBG_RECOIL_NONE) {
-debug/debug.c:		dbg->recoil_mode = R_DBG_RECOIL_STEP;
-debug/debug.c:	pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/debug.c:	sp = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_SP]);
-debug/debug.c:	if (!dbg->iob.read_at) {
-debug/debug.c:	if (dbg->iob.read_at (dbg->iob.io, pc, buf, sizeof (buf)) < 0) {
-debug/debug.c:	if (!r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf))) {
-debug/debug.c:		dbg->iob.read_at (dbg->iob.io, sp, (ut8 *)&sp_top, 8);
-debug/debug.c:		next[0] = (dbg->bits == R_SYS_BITS_32) ? sp_top.r32[0] : sp_top.r64;
-debug/debug.c:		if (dbg->iob.read_at (dbg->iob.io, r, (ut8*)&memval, 8) <0 ) {
-debug/debug.c:			next[0] = (dbg->bits == R_SYS_BITS_32) ? memval.r32[0] : memval.r64;
-debug/debug.c:		if (dbg->iob.read_at (dbg->iob.io,
-debug/debug.c:			next[0] = (dbg->bits == R_SYS_BITS_32) ? memval.r32[0] : memval.r64;
-debug/debug.c:		RBreakpointItem *bpi = r_bp_add_sw (dbg->bp, next[i], dbg->bpsize, R_BP_PROT_EXEC);
-debug/debug.c:		r_bp_del (dbg->bp, next[i]);
-debug/debug.c:	dbg->reason.type = R_DEBUG_REASON_STEP;
-debug/debug.c:	if (dbg->recoil_mode == R_DBG_RECOIL_NONE) {
-debug/debug.c:		if (dbg->recoil_mode == R_DBG_RECOIL_STEP) {
-debug/debug.c:			dbg->recoil_mode = R_DBG_RECOIL_NONE;
-debug/debug.c:	if (!dbg->h->step (dbg)) {
-debug/debug.c:	if (!dbg || !dbg->h) {
-debug/debug.c:	dbg->reason.type = R_DEBUG_REASON_STEP;
-debug/debug.c:		if (dbg->swstep) {
-debug/debug.c:		dbg->steps++;
-debug/debug.c:		dbg->reason.type = R_DEBUG_REASON_STEP;
-debug/debug.c:	r_io_bind (io, &dbg->bp->iob);
-debug/debug.c:	r_io_bind (io, &dbg->iob);
-debug/debug.c:	if (dbg->h && dbg->h->step_over) {
-debug/debug.c:			if (!dbg->h->step_over (dbg))
-debug/debug.c:	if (!dbg->anal || !dbg->reg)
-debug/debug.c:	buf_pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/debug.c:	dbg->iob.read_at (dbg->iob.io, buf_pc, buf, sizeof (buf));
-debug/debug.c:		pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/debug.c:			dbg->iob.read_at (dbg->iob.io, buf_pc, buf, sizeof (buf));
-debug/debug.c:		if (!r_anal_op (dbg->anal, &op, pc, buf + (pc - buf_pc), sizeof (buf) - (pc - buf_pc))) {
-debug/debug.c:	if (dbg->h && dbg->h->cont) {
-debug/debug.c:		ret = dbg->h->cont (dbg, dbg->pid, dbg->tid, sig);
-debug/debug.c:		//XXX(jjd): why? //dbg->reason.signum = 0;
-debug/debug.c:		if (dbg->corebind.core) {
-debug/debug.c:			RCore *core = (RCore *)dbg->corebind.core;
-debug/debug.c:				if (bp && bp->cond && dbg->corebind.cmd) {
-debug/debug.c:					dbg->corebind.cmd (dbg->corebind.core, bp->cond);
-debug/debug.c:			ret = dbg->tid;
-debug/debug.c:		r_debug_select (dbg, dbg->pid, ret);
-debug/debug.c:		if (dbg->reason.signum != -1) {
-debug/debug.c:			int what = r_debug_signal_what (dbg, dbg->reason.signum);
-debug/debug.c:				sig = dbg->reason.signum;
-debug/debug.c:				dbg->iob.read_at (dbg->iob.io, pc, buf, sizeof (buf));
-debug/debug.c:				r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf));
-debug/debug.c:					const char *signame = r_signal_to_string (dbg->reason.signum);
-debug/debug.c:						dbg->reason.signum, signame);
-debug/debug.c:	return r_debug_continue_kill (dbg, 0); //dbg->reason.signum);
-debug/debug.c:	if (!dbg->anal || !dbg->reg) {
-debug/debug.c:		eprintf ("Undefined pointer at dbg->anal\n");
-debug/debug.c:	buf_pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/debug.c:	dbg->iob.read_at (dbg->iob.io, buf_pc, buf, sizeof (buf));
-debug/debug.c:		pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/debug.c:			dbg->iob.read_at (dbg->iob.io, buf_pc, buf, sizeof (buf));
-debug/debug.c:		if (!r_anal_op (dbg->anal, &op, pc, buf + (pc - buf_pc), sizeof (buf) - (pc - buf_pc))) {
-debug/debug.c:	has_bp = r_bp_get_in (dbg->bp, addr, R_BP_PROT_EXEC) != NULL;
-debug/debug.c:		r_bp_add_sw (dbg->bp, addr, dbg->bpsize, R_BP_PROT_EXEC);
-debug/debug.c:		pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/debug.c:		if (r_bp_get_at (dbg->bp, pc))
-debug/debug.c:		r_bp_del (dbg->bp, addr);
-debug/debug.c:	si = r_syscall_get (dbg->anal->syscall, reg, -1);
-debug/debug.c:	if (!dbg || !dbg->h || r_debug_is_dead (dbg)) {
-debug/debug.c:	if (!dbg->h->contsc) {
-debug/debug.c:		dbg->h->contsc (dbg, dbg->pid, 0); // TODO handle return value
-debug/debug.c:	if (dbg->h->contsc) {
-debug/debug.c:		ret = dbg->h->contsc (dbg, dbg->pid, num);
-debug/debug.c:	if (dbg->h && dbg->h->kill) {
-debug/debug.c:		return dbg->h->kill (dbg, pid, tid, sig);
-debug/debug.c:	if (dbg && dbg->h && dbg->h->frames) {
-debug/debug.c:		return dbg->h->frames (dbg, at);
-debug/debug.c:	//if (dbg && dbg->h && dbg->h->frames)
-debug/debug.c:		//return dbg->h->frames (dbg);
-debug/debug.c:	//if (dbg && dbg->h && dbg->h->frames)
-debug/debug.c:		//return dbg->h->frames (dbg);
-debug/debug.c:	int is_dead = (dbg->pid == -1);
-debug/debug.c:	if (!is_dead && dbg->h && dbg->h->kill) {
-debug/debug.c:		is_dead = !dbg->h->kill (dbg, dbg->pid, false, 0);
-debug/debug.c:		dbg->reason.type = R_DEBUG_REASON_DEAD;
-debug/debug.c:	if (dbg && dbg->h && dbg->h->map_protect) {
-debug/debug.c:		return dbg->h->map_protect (dbg, addr, size, perms);
-debug/debug.c:	if (dbg && dbg->h && dbg->h->drx) {
-debug/debug.c:		dbg->h->drx (dbg, 0, 0, 0, 0, 0);
-debug/debug.c:	if (dbg && dbg->h && dbg->h->drx) {
-debug/debug.c:		return dbg->h->drx (dbg, idx, addr, len, rwx, g);
-debug/debug.c:	if (dbg && dbg->h && dbg->h->drx) {
-debug/debug.c:		return dbg->h->drx (dbg, idx, 0, -1, 0, 0);
-debug/dreg.c:	if (!dbg || !dbg->reg || !dbg->h) {
-debug/dreg.c:	if (write && !dbg->h->reg_write) {
-debug/dreg.c:	if (!write && !dbg->h->reg_read) {
-debug/dreg.c:	if (i >= R_REG_TYPE_GPR && dbg->reg->regset[i].regs->length == 0) {
-debug/dreg.c:			int mask = dbg->reg->regset[n].maskregstype;
-debug/dreg.c:			ut8 *buf = r_reg_get_bytes (dbg->reg, i, &size);
-debug/dreg.c:			if (!buf || !dbg->h->reg_write (dbg, i, buf, size)) {
-debug/dreg.c:						"registers %d to %d\n", i, dbg->tid);
-debug/dreg.c:			// int bufsize = R_MAX (1024, dbg->reg->size*2); // i know. its hacky
-debug/dreg.c:			int bufsize = dbg->reg->size;
-debug/dreg.c:			//int bufsize = dbg->reg->regset[i].arena->size;
-debug/dreg.c:				//we have already checked dbg->h and dbg->h->reg_read above
-debug/dreg.c:				size = dbg->h->reg_read (dbg, i, buf, bufsize);
-debug/dreg.c:					r_reg_set_bytes (dbg->reg, i, buf, size); //R_MIN (size, bufsize));
-debug/dreg.c:	if (!dbg || !dbg->reg) {
-debug/dreg.c:	if (dbg->corebind.core) {
-debug/dreg.c:		pr = ((RCore*)dbg->corebind.core)->print;
-debug/dreg.c:	if (!(dbg->reg->bits & size)) {
-debug/dreg.c:	if (dbg->bits & R_SYS_BITS_64) {
-debug/dreg.c:		colwidth = dbg->regcols? 20: 25;
-debug/dreg.c:	if (dbg->regcols) {
-debug/dreg.c:		cols = dbg->regcols;
-debug/dreg.c:		dbg->cb_printf ("{");
-debug/dreg.c:	dbg->creg = NULL;
-debug/dreg.c:		head = r_reg_get_list (dbg->reg, i);
-debug/dreg.c:			bool is_arm = dbg->arch && strstr (dbg->arch, "arm");
-debug/dreg.c:					bool is_thumb = r_reg_get_value (dbg->reg, item);
-debug/dreg.c:					if (dbg->anal->bits != new_bits)
-debug/dreg.c:						dbg->cb_printf ("e asm.bits=%d\n", new_bits);
-debug/dreg.c:				value = r_reg_get_value (dbg->reg, item);
-debug/dreg.c:				r_reg_arena_swap (dbg->reg, false);
-debug/dreg.c:				diff = r_reg_get_value (dbg->reg, item);
-debug/dreg.c:				r_reg_arena_swap (dbg->reg, false);
-debug/dreg.c:				value = r_reg_get_value_big (dbg->reg, item, &valueBig);
-debug/dreg.c:				dbg->cb_printf ("%s\"%s\":%s",
-debug/dreg.c:				dbg->cb_printf ("f-%s\n", item->name);
-debug/dreg.c:				dbg->cb_printf ("f %s 1 0x%s\n",
-debug/dreg.c:						dbg->creg = item->name;
-debug/dreg.c:						dbg->cb_printf (use_color);
-debug/dreg.c:						str = r_reg_get_bvalue (dbg->reg, item);
-debug/dreg.c:						dbg->cb_printf (" %s%s%s %s%s", a, item->name, b,
-debug/dreg.c:						dbg->cb_printf (fmt2, a, item->name, b, strvalue,
-debug/dreg.c:						dbg->cb_printf (Color_INVERT_RESET);
-debug/dreg.c:						dbg->cb_printf (Color_RESET);
-debug/dreg.c:					dbg->cb_printf (fmt, item->name, strvalue, woot);
-debug/dreg.c:					dbg->cb_printf (use_color);
-debug/dreg.c:					dbg->cb_printf (fmt, item->name, strvalue, Color_RESET"\n");
-debug/dreg.c:					dbg->cb_printf (fmt, item->name, strvalue, "\n");
-debug/dreg.c:		dbg->cb_printf ("}\n");
-debug/dreg.c:		dbg->cb_printf ("\n");
-debug/dreg.c:	if (!dbg || !dbg->reg) {
-debug/dreg.c:		name = r_reg_get_name (dbg->reg, role);
-debug/dreg.c:	ri = r_reg_get (dbg->reg, name, R_REG_TYPE_ALL);
-debug/dreg.c:		r_reg_set_value (dbg->reg, ri, num);
-debug/dreg.c:	if (!dbg || !dbg->reg) {
-debug/dreg.c:		name = r_reg_get_name (dbg->reg, role);
-debug/dreg.c:	ri = r_reg_get (dbg->reg, name, R_REG_TYPE_ALL);
-debug/dreg.c:			ret = r_reg_get_value_big (dbg->reg, ri, value);
-debug/dreg.c:		    ret = r_reg_get_value (dbg->reg, ri);
-debug/esil.c:#define ESIL dbg->anal->esil
-debug/esil.c:		a = r_num_math (dbg->num, e);
-debug/esil.c:		b = r_num_math (dbg->num, p);
-debug/esil.c:		a = r_num_math (dbg->num, e);
-debug/esil.c:	pc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/esil.c:			if (CURVAL >= r_num_math (dbg->num, p))
-debug/esil.c:			if (CURVAL <= r_num_math (dbg->num, p))
-debug/esil.c:			if (CURVAL <= r_num_math (dbg->num, p))
-debug/esil.c:			if (CURVAL < r_num_math (dbg->num, p))
-debug/esil.c:			if (CURVAL > r_num_math (dbg->num, p))
-debug/esil.c:				ut64 num = r_num_math (dbg->num, p);
-debug/esil.c:	opc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/esil.c:	dbg->iob.read_at (dbg->iob.io, opc, obuf, sizeof (obuf));
-debug/esil.c:	//dbg->iob.read_at (dbg->iob.io, npc, buf, sizeof (buf));
-debug/esil.c:	//dbg->anal->reg = dbg->reg; // hack
-debug/esil.c:		//	npc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/esil.c:	if (r_anal_op (dbg->anal, &op, opc, obuf, sizeof (obuf))) {
-debug/esil.c:			//	npc = r_debug_reg_get (dbg, dbg->reg->name[R_REG_NAME_PC]);
-debug/esil.c:		dbg->cb_printf ("de %s %c %s\n", r_str_rwx_i (ew->rwx), ew->dev, ew->expr);
-debug/map.c:		dbg->cb_printf ("[");
-debug/map.c:		r_list_foreach (dbg->maps, iter, map) {
-debug/map.c:			if (notfirst) dbg->cb_printf (",");
-debug/map.c:			dbg->cb_printf ("{\"name\":\"%s\",",map->name);
-debug/map.c:				dbg->cb_printf ("\"file\":\"%s\",", map->file);
-debug/map.c:			dbg->cb_printf ("\"addr\":%"PFMT64u",", map->addr);
-debug/map.c:			dbg->cb_printf ("\"addr_end\":%"PFMT64u",", map->addr_end);
-debug/map.c:			dbg->cb_printf ("\"type\":\"%c\",", map->user?'u':'s');
-debug/map.c:			dbg->cb_printf ("\"perm\":\"%s\"}", r_str_rwx_i (map->perm));
-debug/map.c:		r_list_foreach (dbg->maps_user, iter, map) {
-debug/map.c:			if (notfirst) dbg->cb_printf (",");
-debug/map.c:			dbg->cb_printf ("{\"name\":\"%s\",", map->name);
-debug/map.c:				dbg->cb_printf ("\"file\":\"%s\",", map->file);
-debug/map.c:			dbg->cb_printf ("\"addr\":%"PFMT64u",", map->addr);
-debug/map.c:			dbg->cb_printf ("\"addr_end\":%"PFMT64u",", map->addr_end);
-debug/map.c:			dbg->cb_printf ("\"type\":\"%c\",", map->user?'u':'s');
-debug/map.c:			dbg->cb_printf ("\"perm\":\"%s\"}", r_str_rwx_i (map->perm));
-debug/map.c:		dbg->cb_printf ("]\n");
-debug/map.c:		r_list_foreach (dbg->maps, iter, map) {
-debug/map.c:			dbg->cb_printf ("f map.%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n",
-debug/map.c:		r_list_foreach (dbg->maps_user, iter, map) {
-debug/map.c:			dbg->cb_printf ("f map.%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n",
-debug/map.c:		r_list_foreach (dbg->maps, iter, map) {
-debug/map.c:			dbg->cb_printf ("0x%016"PFMT64x" - 0x%016"PFMT64x" %6s %5s %s\n",
-debug/map.c:		r_list_foreach (dbg->maps_user, iter, map) {
-debug/map.c:			dbg->cb_printf ("f map.%s 0x%08"PFMT64x" 0x%08"PFMT64x"\n",
-debug/map.c:		fmtstr = dbg->bits& R_SYS_BITS_64?
-debug/map.c:		r_list_foreach (dbg->maps, iter, map) {
-debug/map.c:			const char *flagname = dbg->corebind.getName
-debug/map.c:				? dbg->corebind.getName (dbg->corebind.core, map->addr) : NULL;
-debug/map.c:			dbg->cb_printf (fmtstr,
-debug/map.c:		fmtstr = dbg->bits& R_SYS_BITS_64?
-debug/map.c:		r_list_foreach (dbg->maps_user, iter, map) {
-debug/map.c:			dbg->cb_printf (fmtstr, buf, map->addr, map->addr_end,
-debug/map.c:		if (dbg->maps) {
-debug/map.c:			print_debug_map_ascii_art (dbg->maps, addr,
-debug/map.c:				use_color, dbg->cb_printf,
-debug/map.c:				dbg->bits, cons_cols);
-debug/map.c:		if (dbg->maps_user) {
-debug/map.c:			print_debug_map_ascii_art (dbg->maps_user,
-debug/map.c:				dbg->cb_printf, dbg->bits, cons_cols);
-debug/map.c:	return (dbg && dbg->h && dbg->h->modules_get)?
-debug/map.c:		dbg->h->modules_get (dbg): NULL;
-debug/map.c:	if (dbg && dbg->h && dbg->h->map_get) {
-debug/map.c:		RList *newmaps = dbg->h->map_get (dbg);
-debug/map.c:			r_list_free (dbg->maps);
-debug/map.c:			dbg->maps = newmaps;
-debug/map.c:	if (dbg && dbg->h && dbg->h->map_alloc) {
-debug/map.c:		map = dbg->h->map_alloc (dbg, addr, size);
-debug/map.c:	if (dbg && dbg->h && dbg->h->map_dealloc)
-debug/map.c:		if (dbg->h->map_dealloc (dbg, addr, map->size))
-debug/map.c:	r_list_foreach (dbg->maps, iter, map) {
-debug/p/debug_bf.c:	RIODesc *d = dbg->iob.io->desc;
-debug/p/debug_bf.c:	RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	if (!(dbg->iob.io) || !(dbg->iob.io->desc) || !(dbg->iob.io->desc->data))
-debug/p/debug_bf.c:	o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	//r_io_system (dbg->iob.io, "dr");
-debug/p/debug_bf.c:	if (!(dbg->iob.io) || !(dbg->iob.io->desc) || !(dbg->iob.io->desc->data))
-debug/p/debug_bf.c:	o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	//r_io_system (dbg->iob.io, "db");
-debug/p/debug_bf.c:	RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bf.c:	RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bochs.c:	//RIOBdescbg *o = dbg->iob.io->desc->data;
-debug/p/debug_bochs.c:	RIODesc *d = dbg->iob.io->desc;
-debug/p/debug_bochs.c:	dbg->swstep = false;
-debug/p/debug_bochs.c:			//int arch = r_sys_arch_id (dbg->arch);
-debug/p/debug_bochs.c:			// int bits = dbg->anal->bits;
-debug/p/debug_bochs.c:	int bits = dbg->anal->bits;
-debug/p/debug_esil.c:	RIODesc *d = dbg->iob.io->desc;
-debug/p/debug_esil.c:	dbg->iob.read_at (dbg->iob.io, pc, buf, 64);
-debug/p/debug_esil.c:	oplen = r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf));
-debug/p/debug_esil.c:			r_anal_esil_parse (dbg->anal->esil, R_STRBUF_SAFEGET (&op.esil));
-debug/p/debug_esil.c:	dbg->tid = dbg->pid = 1;
-debug/p/debug_esil.c:	o = dbg->iob.io->desc->data;
-debug/p/debug_esil.c:	if (!strcmp (dbg->arch, "bf")) {
-debug/p/debug_esil.c:	return r_anal_get_reg_profile (dbg->anal);
-debug/p/debug_esil.c:	//r_io_system (dbg->iob.io, "db");
-debug/p/debug_esil.c:	ut8 *bytes = r_reg_get_bytes (dbg->reg, type, &sz);
-debug/p/debug_gdb.c:	free (r_reg_get_bytes (dbg->reg, type, &buflen));
-debug/p/debug_gdb.c:	int bits = dbg->anal->bits;
-debug/p/debug_gdb.c:	const char *pcname = r_reg_get_name (dbg->anal->reg, R_REG_NAME_PC);
-debug/p/debug_gdb.c:	RRegItem *reg = r_reg_get (dbg->anal->reg, pcname, 0);
-debug/p/debug_gdb.c:		if (dbg->anal->bits != reg->size)
-debug/p/debug_gdb.c:	free (r_reg_get_bytes (dbg->reg, type, &buflen));
-debug/p/debug_gdb.c:		current = r_reg_next_diff (dbg->reg, type, reg_buf, buflen, current, bits);
-debug/p/debug_gdb.c:		ut64 val = r_reg_get_value (dbg->reg, current);
-debug/p/debug_gdb.c:	RIODesc *d = dbg->iob.io->desc;
-debug/p/debug_gdb.c:	dbg->swstep = false;
-debug/p/debug_gdb.c:			int arch = r_sys_arch_id (dbg->arch);
-debug/p/debug_gdb.c:			int bits = dbg->anal->bits;
-debug/p/debug_gdb.c:					eprintf ("Not supported register %s %d profile\n", dbg->arch, bits);
-debug/p/debug_gdb.c:					eprintf ("Not supported register %s %d profile\n", dbg->arch, bits);
-debug/p/debug_gdb.c:					eprintf ("Not supported register %s %d profile\n", dbg->arch, bits);
-debug/p/debug_gdb.c:					eprintf ("Not supported register %s %d profile\n", dbg->arch, bits);
-debug/p/debug_gdb.c:	int arch = r_sys_arch_id (dbg->arch);
-debug/p/debug_gdb.c:	int bits = dbg->anal->bits;
-debug/p/debug_gdb.c:		} else if (dbg->anal->bits == 64) {
-debug/p/debug_io.c:	dbg->iob.system (dbg->iob.io, "ds");
-debug/p/debug_io.c:	dbg->iob.system (dbg->iob.io, "dso");
-debug/p/debug_io.c:	dbg->iob.system (dbg->iob.io, "dm");
-debug/p/debug_io.c:	dbg->iob.system (dbg->iob.io, "drp");
-debug/p/debug_io.c:	return r_anal_get_reg_profile (dbg->anal);
-debug/p/debug_io.c:	dbg->iob.system (dbg->iob.io, "dr8");
-debug/p/debug_io.c:	dbg->iob.system (dbg->iob.io, "dc");
-debug/p/debug_io.c:	dbg->iob.system (dbg->iob.io, cmd);
-debug/p/debug_native.c:	r_debug_native_continue (dbg, dbg->pid, dbg->tid, dbg->reason.signum);
-debug/p/debug_native.c:	int ret = ptrace (PT_STEP, dbg->pid, (caddr_t)1, 0);
-debug/p/debug_native.c:	if (!dbg || pid == dbg->pid)
-debug/p/debug_native.c:		return dbg->tid;
-debug/p/debug_native.c:	r_debug_kill (dbg, dbg->pid, dbg->tid, SIGINT);
-debug/p/debug_native.c:	void *data = (void*)(size_t)((sig != -1) ? sig : dbg->reason.signum);
-debug/p/debug_native.c:	int contsig = dbg->reason.signum;
-debug/p/debug_native.c:	if (dbg->consbreak) {
-debug/p/debug_native.c:		case 'l': needle = dbg->glob_libs; break;
-debug/p/debug_native.c:		case 'u': needle = dbg->glob_unlibs; break;
-debug/p/debug_native.c:	reason = linux_dbg_wait (dbg, dbg->tid);
-debug/p/debug_native.c:			 * this might modify dbg->reason.signum
-debug/p/debug_native.c:			reason = dbg->reason.type;
-debug/p/debug_native.c:	dbg->reason.tid = pid;
-debug/p/debug_native.c:	dbg->reason.type = reason;
-debug/p/debug_native.c:	int pid = dbg->pid;
-debug/p/debug_native.c:	#warning dbg-native not supported for this platform
-debug/p/debug_native.c:		return (0 == ptrace (PT_SETDBREGS, dbg->pid,
-debug/p/debug_native.c:		int ret = ptrace (PTRACE_SETREGS, dbg->pid,
-debug/p/debug_native.c:	mib[3] = dbg->pid;
-debug/p/debug_native.c:	mib[2] = dbg->pid;
-debug/p/debug_native.c:	HANDLE process = w32_open_process (PROCESS_ALL_ACCESS, FALSE, dbg->pid);
-debug/p/debug_native.c:	HANDLE process = w32_open_process (PROCESS_ALL_ACCESS, FALSE, dbg->tid);
-debug/p/debug_native.c:	if (dbg->pid == -1) {
-debug/p/debug_native.c:	snprintf (path, sizeof (path), "/proc/%d/map", dbg->pid);
-debug/p/debug_native.c:	snprintf (path, sizeof (path), "/proc/%d/maps", dbg->pid);
-debug/p/debug_native.c:	if (pid == 0) pid = dbg->pid;
-debug/p/debug_native.c:		if (dbg->tid>0 && (ret = tgkill (dbg->pid, dbg->tid, sig))) {
-debug/p/debug_native.c:	if (sig == SIGKILL && dbg->threads) {
-debug/p/debug_native.c:		r_list_free (dbg->threads);
-debug/p/debug_native.c:		dbg->threads = NULL;
-debug/p/debug_native.c:	dbg->h->desc = r_debug_desc_plugin_native;
-debug/p/debug_native.c:#define R dbg->reg
-debug/p/debug_native.c:	HANDLE process = w32_open_process (PROCESS_ALL_ACCESS, FALSE, dbg->pid);
-debug/p/debug_qnx.c:	free (r_reg_get_bytes (dbg->reg, type, &buflen));
-debug/p/debug_qnx.c:	int bits = dbg->anal->bits;
-debug/p/debug_qnx.c:	const char *pcname = r_reg_get_name (dbg->anal->reg, R_REG_NAME_PC);
-debug/p/debug_qnx.c:	RRegItem *reg = r_reg_get (dbg->anal->reg, pcname, 0);
-debug/p/debug_qnx.c:		if (dbg->anal->bits != reg->size)
-debug/p/debug_qnx.c:	free (r_reg_get_bytes (dbg->reg, type, &buflen));
-debug/p/debug_qnx.c:		current = r_reg_next_diff (dbg->reg, type, reg_buf, buflen, current, bits);
-debug/p/debug_qnx.c:		ut64 val = r_reg_get_value (dbg->reg, current);
-debug/p/debug_qnx.c:		dbg->reason.signum = desc->signal;
-debug/p/debug_qnx.c:	RIODesc *d = dbg->iob.io->desc;
-debug/p/debug_qnx.c:	dbg->swstep = false;
-debug/p/debug_qnx.c:			int arch = r_sys_arch_id (dbg->arch);
-debug/p/debug_qnx.c:			int bits = dbg->anal->bits;
-debug/p/debug_qnx.c:						eprintf ("Not supported register %s %d profile\n", dbg->arch, bits);
-debug/p/debug_qnx.c:						eprintf ("Not supported register %s %d profile\n", dbg->arch, bits);
-debug/p/debug_qnx.c:	dbg->pid = 0;
-debug/p/debug_qnx.c:	int arch = r_sys_arch_id (dbg->arch);
-debug/p/debug_qnx.c:	int bits = dbg->anal->bits;
-debug/p/debug_rap.c:	r_io_system (dbg->iob.io, "ds");
-debug/p/debug_rap.c:	r_io_system (dbg->iob.io, "dr");
-debug/p/debug_rap.c:	r_io_system (dbg->iob.io, "dc");
-debug/p/debug_rap.c:	RIODesc *d = dbg->iob.io->desc;
-debug/p/debug_rap.c:	r_io_system (dbg->iob.io, "drp");
-debug/p/debug_rap.c:	//r_io_system (dbg->iob.io, "db");
-debug/p/debug_wind.c:	r_reg_read_regs (dbg->reg, buf, ret);
-debug/p/debug_wind.c:	if (!dbg->reg) {
-debug/p/debug_wind.c:	ut8 *arena = r_reg_get_bytes (dbg->reg, R_REG_TYPE_ALL, &arena_size);
-debug/p/debug_wind.c:			dbg->reason.type = R_DEBUG_REASON_INT;
-debug/p/debug_wind.c:			dbg->reason.addr = stc->pc;
-debug/p/debug_wind.c:			dbg->reason.tid = stc->kthread;
-debug/p/debug_wind.c:			dbg->reason.signum = stc->state;
-debug/p/debug_wind.c:	RIODesc *desc = dbg->iob.io->desc;
-debug/p/debug_wind.c:	if (dbg->arch && strcmp (dbg->arch, "x86")) {
-debug/p/debug_wind.c:	dbg->pid = 0;
-debug/p/debug_wind.c:	if (dbg->arch && strcmp (dbg->arch, "x86"))
-debug/p/debug_wind.c:	if (dbg->bits == R_SYS_BITS_32) {
-debug/p/debug_wind.c:	} else if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/bt.c:		pcname = r_reg_get_name (dbg->reg, R_REG_NAME_PC);
-debug/p/native/bt.c:			ut64 addr = r_reg_getv (dbg->reg, pcname);
-debug/p/native/bt.c:	if (dbg->btalgo) {
-debug/p/native/bt.c:		if (!strcmp (dbg->btalgo, "fuzzy")) {
-debug/p/native/bt.c:		} else if (!strcmp (dbg->btalgo, "anal")) {
-debug/p/native/bt.c:			if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/bt.c:		if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/bt/fuzzy-all.c:	if (dbg->arch && !strcmp (dbg->arch, "x86")) {
-debug/p/native/bt/fuzzy-all.c:		(void)dbg->iob.read_at (dbg->iob.io, addr-5, buf, 5);
-debug/p/native/bt/fuzzy-all.c:		(void) dbg->iob.read_at (dbg->iob.io, addr-8, buf, 8);
-debug/p/native/bt/fuzzy-all.c:		(void) r_anal_op (dbg->anal, &op, addr-8, buf, 8);
-debug/p/native/bt/fuzzy-all.c:		(void) r_anal_op (dbg->anal, &op, addr-4, buf, 4);
-debug/p/native/bt/fuzzy-all.c:	int wordsize = dbg->bits; // XXX, dbg->bits is wordsize not bits
-debug/p/native/bt/fuzzy-all.c:	RIOBind *bio = &dbg->iob;
-debug/p/native/bt/fuzzy-all.c:		RReg *reg = dbg->reg;
-debug/p/native/bt/fuzzy-all.c:	for (i=0; i<dbg->btdepth; i++) {
-debug/p/native/bt/generic-x64.c:	RReg *reg = dbg->reg;
-debug/p/native/bt/generic-x64.c:	RIOBind *bio = &dbg->iob;
-debug/p/native/bt/generic-x64.c:	for (i=1; i<dbg->btdepth; i++) {
-debug/p/native/bt/generic-x64.c:	RReg *reg = dbg->reg;
-debug/p/native/bt/generic-x64.c:	RIOBind *bio = &dbg->iob;
-debug/p/native/bt/generic-x64.c:	fcn = r_anal_get_fcn_in (dbg->anal, _rip, R_ANAL_FCN_TYPE_NULL);
-debug/p/native/bt/generic-x64.c:	for (i=1; i<dbg->btdepth; i++) {
-debug/p/native/bt/generic-x64.c:		//fcn = r_anal_get_fcn_in (dbg->anal, ptr, R_ANAL_FCN_TYPE_NULL);
-debug/p/native/bt/generic-x86.c:	RReg *reg = dbg->reg;
-debug/p/native/bt/generic-x86.c:	RIOBind *bio = &dbg->iob;
-debug/p/native/bt/generic-x86.c:	for (i=0; i<dbg->btdepth; i++) {
-debug/p/native/bt/generic-x86.c:	RReg *reg = dbg->reg;
-debug/p/native/bt/generic-x86.c:	RIOBind *bio = &dbg->iob;
-debug/p/native/bt/generic-x86.c:	fcn = r_anal_get_fcn_in (dbg->anal, eip, R_ANAL_FCN_TYPE_NULL);
-debug/p/native/bt/generic-x86.c:	for (i=1; i<dbg->btdepth; i++) {
-debug/p/native/linux/linux_coredump.c:	p->pr_pid = mypid = dbg->pid;
-debug/p/native/linux/linux_coredump.c:	file = r_str_newf ("/proc/%d/smaps", dbg->pid);
-debug/p/native/linux/linux_coredump.c:	file = r_str_newf ("/proc/%d/maps", dbg->pid);
-debug/p/native/linux/linux_coredump.c:	r_list_foreach (dbg->maps, iter, map) {
-debug/p/native/linux/linux_coredump.c:	const char *file = sdb_fmt (0, "/proc/%d/auxv", dbg->pid);
-debug/p/native/linux/linux_coredump.c:		rbytes = dbg->iob.read_at (dbg->iob.io, p->start_addr, map_content, size);
-debug/p/native/linux/linux_coredump.c:	const char *file = sdb_fmt (0, "/proc/%d/stat", dbg->pid);
-debug/p/native/linux/linux_coredump.c:	file = sdb_fmt (0, "/proc/%d/status", dbg->pid);
-debug/p/native/linux/linux_coredump.c:	file = sdb_fmt (0, "/proc/%d/coredump_filter", dbg->pid);
-debug/p/native/linux/linux_coredump.c:	if (dbg->h) {
-debug/p/native/linux/linux_coredump.c:		list = dbg->h->threads (dbg, dbg->pid);
-debug/p/native/linux/linux_coredump.c:					if (th->pid != dbg->pid) {
-debug/p/native/linux/linux_coredump.c:		if (dbg->pid != thread_id[i]) {
-debug/p/native/linux/linux_coredump.c:			elf_proc_note->thread_note->prstatus = linux_get_prstatus (dbg->pid, thread_id[i], proc_data, elf_proc_note->thread_note->siginfo->si_signo);
-debug/p/native/linux/linux_coredump.c:	init_note_info_structure(dbg->pid, elf_proc_note->auxv->size);
-debug/p/native/linux/linux_coredump.c:	(void)dump_elf_map_content (dbg, dest, elf_proc_note->maps, dbg->pid);
-debug/p/native/linux/linux_debug.c:	if ((dbg->bits & R_SYS_BITS_32) && (dbg->bp->endian == 1)) {
-debug/p/native/linux/linux_debug.c:	if (dbg->bits & R_SYS_BITS_32) {
-debug/p/native/linux/linux_debug.c:	int ret = ptrace (PTRACE_GETSIGINFO, dbg->pid, 0, &siginfo);
-debug/p/native/linux/linux_debug.c:			dbg->reason.type = R_DEBUG_REASON_DEAD;
-debug/p/native/linux/linux_debug.c:		//ptrace (PTRACE_SETSIGINFO, dbg->pid, 0, &siginfo);
-debug/p/native/linux/linux_debug.c:		dbg->reason.type = R_DEBUG_REASON_SIGNAL;
-debug/p/native/linux/linux_debug.c:		dbg->reason.signum = siginfo.si_signo;
-debug/p/native/linux/linux_debug.c:		//dbg->stopaddr = siginfo.si_addr;
-debug/p/native/linux/linux_debug.c:		//dbg->errno = siginfo.si_errno;
-debug/p/native/linux/linux_debug.c:		switch (dbg->reason.signum) {
-debug/p/native/linux/linux_debug.c:				dbg->reason.type = R_DEBUG_REASON_BREAKPOINT;
-debug/p/native/linux/linux_debug.c:				dbg->reason.bp_addr = (ut64)siginfo.si_addr;
-debug/p/native/linux/linux_debug.c:				dbg->reason.type = R_DEBUG_REASON_ABORT;
-debug/p/native/linux/linux_debug.c:				dbg->reason.type = R_DEBUG_REASON_SEGFAULT;
-debug/p/native/linux/linux_debug.c:		if (dbg->reason.signum != SIGTRAP) {
-debug/p/native/linux/linux_debug.c:		if (dbg->trace_clone) {
-debug/p/native/linux/linux_debug.c:		if (dbg->trace_forks) {
-debug/p/native/linux/linux_debug.c:			dbg->forked_pid = data;
-debug/p/native/linux/linux_debug.c:	ret = ptrace (PTRACE_SINGLESTEP, dbg->pid, (void*)(size_t)addr, 0);
-debug/p/native/linux/linux_debug.c:	if (dbg->trace_forks) {
-debug/p/native/linux/linux_debug.c:	if (dbg->trace_clone) {
-debug/p/native/linux/linux_debug.c:	if (dbg->trace_execs) {
-debug/p/native/linux/linux_debug.c:	if (dbg->trace_aftersyscall) {
-debug/p/native/linux/linux_debug.c:				reason = dbg->reason.type;
-debug/p/native/linux/linux_debug.c:	r_list_append (dbg->threads, tid_info);
-debug/p/native/linux/linux_debug.c:	dbg->main_pid = main_pid;
-debug/p/native/linux/linux_debug.c:	if (!dbg->threads) {
-debug/p/native/linux/linux_debug.c:		dbg->threads = attach_to_pid_and_threads (dbg, pid);
-debug/p/native/linux/linux_debug.c:		if (dbg->threads && !r_list_find (dbg->threads, &pid, &match_pid)) {
-debug/p/native/linux/linux_debug.c:	if (dbg->threads) {
-debug/p/native/linux/linux_debug.c:		th_list = dbg->threads;
-debug/p/native/linux/linux_debug.c:			th_list = linux_thread_list (dbg->pid, th_list);
-debug/p/native/linux/linux_debug.c:		if (th->pid == dbg->pid) {
-debug/p/native/linux/linux_debug.c:	rdi->pid = dbg->pid;
-debug/p/native/linux/linux_debug.c:	rdi->tid = dbg->tid;
-debug/p/native/linux/linux_debug.c:	int pid = dbg->pid;
-debug/p/native/linux/linux_debug.c:			if (ptrace (PTRACE_POKEUSER, dbg->pid, r_offsetof (
-debug/p/native/linux/linux_debug.c:		int ret = ptrace (PTRACE_SETREGSET, dbg->pid, NT_PRSTATUS, &io);
-debug/p/native/linux/linux_debug.c:		int ret = ptrace (PTRACE_SETREGS, dbg->pid, buf, NULL);
-debug/p/native/linux/linux_debug.c:		int ret = ptrace (PTRACE_SETREGS, dbg->pid, 0, (void*)buf);
-debug/p/native/maps/darwin.c:	task_t task = pid_to_task (dbg->tid);
-debug/p/native/maps/darwin.c:	if (dbg->pid == 0) {
-debug/p/native/maps/darwin.c:			int ret = proc_regionfilename (dbg->pid, address,
-debug/p/native/maps/darwin.c:	task_t task = pid_to_task (dbg->pid);
-debug/p/native/maps/darwin.c:	kret = mach_vm_region (pid_to_task (dbg->pid), &address, &size, VM_REGION_BASIC_INFO_64,
-debug/p/native/maps/darwin.c:			int ret = proc_regionfilename (dbg->pid, address, module_name, sizeof (module_name));
-debug/p/native/maps/darwin.c:	const char *osname = dbg->anal->syscall->os;
-debug/p/native/maps/windows.c:	int pid = dbg->pid;
-debug/p/native/maps/windows.c:	//int tid = dbg->tid;
-debug/p/native/maps/windows.c:	int pid = dbg->pid;
-debug/p/native/reg.c:	if (dbg->bits & R_SYS_BITS_64) {
-debug/p/native/w32.c:		dbg->tid = tid;
-debug/p/native/w32.c:		dbg->pid = pid;
-debug/p/native/w32.c:	HANDLE process = w32_open_process (PROCESS_ALL_ACCESS, FALSE, dbg->pid);
-debug/p/native/w32.c:	int pid = dbg->pid;
-debug/p/native/w32.c:	int tid = dbg->tid;
-debug/p/native/w32.c:	thread = w32_open_thread (dbg->pid, dbg->tid);
-debug/p/native/w32.c:	rdi->pid = dbg->pid;
-debug/p/native/w32.c:	rdi->tid = dbg->tid;
-debug/p/native/xnu/trap_arm.c:		RIOBind *bio = &dbg->iob;
-debug/p/native/xnu/trap_arm.c:	if (dbg->bits == R_SYS_BITS_64)
-debug/p/native/xnu/trap_x86.c:	xnu_thread_t *th = get_xnu_thread (dbg, dbg->tid);
-debug/p/native/xnu/trap_x86.c:	xnu_thread_t *th = get_xnu_thread (dbg, dbg->tid);
-debug/p/native/xnu/trap_x86.c:	if (dbg->bits == R_SYS_BITS_64)
-debug/p/native/xnu/xnu_debug.c:/* XXX: right now it just returns the first thread, not the one selected in dbg->tid */
-debug/p/native/xnu/xnu_debug.c:	task_t t = pid_to_task (dbg->pid);
-debug/p/native/xnu/xnu_debug.c:	it = r_list_find (dbg->threads, (const void *)(size_t)&tid,
-debug/p/native/xnu/xnu_debug.c:	it = r_list_find (dbg->threads, (const void *)(size_t)&tid,
-debug/p/native/xnu/xnu_debug.c:	int ret = ptrace (PT_STEP, dbg->pid, (caddr_t)1, 0) == 0; //SIGINT
-debug/p/native/xnu/xnu_debug.c:	task_t task = pid_to_task (dbg->pid);
-debug/p/native/xnu/xnu_debug.c:		eprintf ("step failed on task %d for pid %d\n", task, dbg->tid);
-debug/p/native/xnu/xnu_debug.c:	dbg->pid = pid;
-debug/p/native/xnu/xnu_debug.c:	r_list_free (dbg->threads);
-debug/p/native/xnu/xnu_debug.c:	void *data = (void*)(size_t)((sig != -1) ? sig : dbg->reason.signum);
-debug/p/native/xnu/xnu_debug.c:	if (dbg->bits & R_SYS_BITS_32) {
-debug/p/native/xnu/xnu_debug.c:	} else if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/xnu/xnu_debug.c:	if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/xnu/xnu_debug.c:	xnu_thread_t *th = get_xnu_thread (dbg, dbg->tid);
-debug/p/native/xnu/xnu_debug.c:	xnu_thread_t *th = get_xnu_thread (dbg, dbg->tid);
-debug/p/native/xnu/xnu_debug.c:	kinfo_proc_error = xnu_get_kinfo_proc(dbg->pid, &kp);
-debug/p/native/xnu/xnu_debug.c:	rdi->pid = dbg->pid;
-debug/p/native/xnu/xnu_debug.c:	rdi->tid = dbg->tid;
-debug/p/native/xnu/xnu_debug.c:	#define CPU_PC (dbg->bits == R_SYS_BITS_64) ? \
-debug/p/native/xnu/xnu_debug.c:	#define CPU_PC (dbg->bits == R_SYS_BITS_64) ? \
-debug/p/native/xnu/xnu_debug.c:	r_list_foreach (dbg->threads, iter, thread) {
-debug/p/native/xnu/xnu_debug.c:	task_t task = pid_to_task (dbg->tid);
-debug/p/native/xnu/xnu_debug.c:	xnu_thread_t *th = get_xnu_thread (dbg, dbg->tid);
-debug/p/native/xnu/xnu_debug.c:	task_t task = pid_to_task (dbg->pid);
-debug/p/native/xnu/xnu_debug.c:	threads_list = xnu_thread_list (dbg, dbg->pid, r_list_new ());
-debug/p/native/xnu/xnu_debug.c:	segment_count = xnu_get_vmmap_entries_for_pid (dbg->pid);
-debug/p/native/xnu/xnu_debug.c:		r_list_length (threads_list), command_size, dbg->pid);
-debug/p/native/xnu/xnu_debug.c:	if (!dbg->maps) perror ("There are not loaded maps");
-debug/p/native/xnu/xnu_debug.c:	if (xnu_write_mem_maps_to_buffer (mem_maps_buffer, dbg->maps, round_page (header_size),
-debug/p/native/xnu/xnu_debug.c:	task_t task = pid_to_task (dbg->tid);
-debug/p/native/xnu/xnu_debug.c:		dbg->iob.read_at (dbg->iob.io, info.all_image_info_addr,
-debug/p/native/xnu/xnu_debug.c:		dbg->iob.read_at (dbg->iob.io, info.all_image_info_addr,
-debug/p/native/xnu/xnu_debug.c:	dbg->iob.read_at (dbg->iob.io, info_array_address,
-debug/p/native/xnu/xnu_debug.c:		dbg->iob.read_at (dbg->iob.io, file_path_address,
-debug/p/native/xnu/xnu_debug.c:	int tid = dbg->pid;
-debug/p/native/xnu/xnu_debug.c:	if (dbg->pid == 0) {
-debug/p/native/xnu/xnu_debug.h://(dbg->bits==64)?x86_THREAD_STATE:_STRUCT_X86_THREAD_STATE32
-debug/p/native/xnu/xnu_debug.h://#define R_DEBUG_STATE_SZ ((dbg->bits == R_SYS_BITS_64) ? 168 : 64)
-debug/p/native/xnu/xnu_debug.h:#define REG_PC ((dbg->bits == R_SYS_BITS_64) ? 16 : 10)
-debug/p/native/xnu/xnu_debug.h:#define REG_FL ((dbg->bits == R_SYS_BITS_64) ? 17 : 9)
-debug/p/native/xnu/xnu_excthreads.c:			RIOBind *bio = &dbg->iob;
-debug/p/native/xnu/xnu_excthreads.c:	if (pid_to_task (dbg->pid) != msg->task.name) {
-debug/p/native/xnu/xnu_excthreads.c:		dbg->pid = -1;
-debug/p/native/xnu/xnu_excthreads.c:	task_t task = pid_to_task (dbg->pid);
-debug/p/native/xnu/xnu_excthreads.c:        ret = xnu_save_exception_ports (dbg->pid);
-debug/p/native/xnu/xnu_excthreads.c:	kr = mach_port_request_notification (task_self, pid_to_task (dbg->pid),
-debug/p/native/xnu/xnu_threads.c:	thread->state_size = (dbg->bits == R_SYS_BITS_64)
-debug/p/native/xnu/xnu_threads.c:	if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/xnu/xnu_threads.c:	if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/xnu/xnu_threads.c:	if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/xnu/xnu_threads.c:	if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/xnu/xnu_threads.c:	if (dbg->bits == R_SYS_BITS_64) {
-debug/p/native/xnu/xnu_threads.c:	thread->state_size = (dbg->bits == R_SYS_BITS_64) ?
-debug/p/native/xnu/xnu_threads.c:	ret_proc = proc_pidinfo (dbg->pid, PROC_PIDTHREADINFO,
-debug/p/native/xnu/xnu_threads.c:	if (!dbg->threads) {
-debug/p/native/xnu/xnu_threads.c:		dbg->threads = r_list_newf ((RListFree)&xnu_thread_free);
-debug/p/native/xnu/xnu_threads.c:		if (!dbg->threads) {
-debug/p/native/xnu/xnu_threads.c:	task = pid_to_task (dbg->pid);
-debug/p/native/xnu/xnu_threads.c:	if (r_list_empty (dbg->threads)) {
-debug/p/native/xnu/xnu_threads.c:			if (!r_list_append (dbg->threads, thread)) {
-debug/p/native/xnu/xnu_threads.c:		r_list_foreach_safe (dbg->threads, iter, iter2, thread) {
-debug/p/native/xnu/xnu_threads.c:				r_list_delete (dbg->threads, iter);
-debug/p/native/xnu/xnu_threads.c:			iter = r_list_find (dbg->threads, &thread_list[i],
-debug/p/native/xnu/xnu_threads.c:			r_list_append (dbg->threads, t);
-debug/pid.c:	if (dbg && dbg->h && dbg->h->pids) {
-debug/pid.c:		return dbg->h->pids (dbg, pid);
-debug/pid.c:	if (dbg && dbg->h && dbg->h->pids) {
-debug/pid.c:		list = dbg->h->pids (dbg, R_MAX (0, pid));
-debug/pid.c:			dbg->cb_printf ("[");
-debug/pid.c:				dbg->cb_printf ("{\"pid\":%d,"
-debug/pid.c:				dbg->cb_printf (" %c %d %c %s\n",
-debug/pid.c:					dbg->pid==p->pid?'*':'-',
-debug/pid.c:			dbg->cb_printf ("]\n");
-debug/pid.c:	if (dbg && dbg->h && dbg->h->threads) {
-debug/pid.c:		list = dbg->h->threads (dbg, pid);
-debug/pid.c:			dbg->cb_printf ("[");
-debug/pid.c:				dbg->cb_printf ("{\"pid\":%d,"
-debug/pid.c:			dbg->cb_printf ("]\n");
-debug/pid.c:				dbg->cb_printf (" %c %d %c %s\n",
-debug/pid.c:						dbg->tid == p->pid ? '*' : '-',
-debug/plugin.c:	dbg->plugins = r_list_newf (free);
-debug/plugin.c:		r_list_foreach (dbg->plugins, iter, h) {
-debug/plugin.c:				dbg->h = h;
-debug/plugin.c:				if (dbg->anal && dbg->anal->cur)
-debug/plugin.c:					r_debug_set_arch (dbg, dbg->anal->cur->arch, dbg->bits);
-debug/plugin.c:				dbg->bp->breakpoint = dbg->h->breakpoint;
-debug/plugin.c:				dbg->bp->user = dbg;
-debug/plugin.c:	if (dbg->h && dbg->h->reg_profile) {
-debug/plugin.c:		char *p = dbg->h->reg_profile (dbg);
-debug/plugin.c:			r_reg_set_profile_string (dbg->reg, p);
-debug/plugin.c:			if (dbg->anal && dbg->reg != dbg->anal->reg) {
-debug/plugin.c:				r_reg_free (dbg->anal->reg);
-debug/plugin.c:				dbg->anal->reg = dbg->reg;
-debug/plugin.c:			if (dbg->h->init)
-debug/plugin.c:				dbg->h->init (dbg);
-debug/plugin.c:			r_reg_set_profile_string (dbg->reg, p);
-debug/plugin.c:			eprintf ("Cannot retrieve reg profile from debug plugin (%s)\n", dbg->h->name);
-debug/plugin.c:	return (dbg->h != NULL);
-debug/plugin.c:	r_list_foreach (dbg->plugins, iter, h) {
-debug/plugin.c:			dbg->cb_printf ("%s\n", h->name);
-debug/plugin.c:			dbg->cb_printf ("%d  %s  %s %s%s\n",
-debug/plugin.c:					count, (h == dbg->h)? "dbg": "---",
-debug/plugin.c:	r_list_append (dbg->plugins, foo);
-debug/signal.c:#define DB dbg->sgnls
-debug/signal.c:	int opt, mode = dbg->_mode;
-debug/signal.c:		if (dbg->_mode == 2) {
-debug/signal.c:			dbg->_mode = 0;
-debug/signal.c:	dbg->_mode = mode;
-debug/signal.c:	dbg->_mode = 0;
-debug/signal.c:	return r_sandbox_kill (dbg->pid, num);
-debug/signal.c:	if (dbg->h->kill_list)
-debug/signal.c:		return dbg->h->kill_list (dbg);
-debug/signal.c:	if (dbg->h->kill_setup)
-debug/signal.c:		return dbg->h->kill_setup (dbg, sig, action);
-debug/snap.c:		r_list_free (dbg->snaps);
-debug/snap.c:		dbg->snaps = r_list_newf (r_debug_snap_free);
-debug/snap.c:	r_list_foreach (dbg->snaps, iter, snap) {
-debug/snap.c:		r_list_delete (dbg->snaps, iter);
-debug/snap.c:		dbg->cb_printf ("[");
-debug/snap.c:	r_list_foreach (dbg->snaps, iter, snap) {
-debug/snap.c:			dbg->cb_printf ("{\"count\":%d,\"addr\":%"PFMT64d",\"size\":%d,\"crc\":%d,\"comment\":\"%s\"}%s",
-debug/snap.c:			dbg->cb_printf ("dms 0x%08"PFMT64x"\n", snap->addr);
-debug/snap.c:			dbg->cb_printf ("%d 0x%08"PFMT64x" - 0x%08"PFMT64x" size: %d crc: %x  --  %s\n",
-debug/snap.c:		dbg->cb_printf ("]\n");
-debug/snap.c:	r_list_foreach (dbg->snaps, iter, snap) {
-debug/snap.c:	dbg->iob.read_at (dbg->iob.io, snap->addr, snap->data, snap->size);
-debug/snap.c:	r_list_append (dbg->snaps, snap);
-debug/snap.c:	r_list_foreach (dbg->maps, iter, map) {
-debug/snap.c:	r_list_foreach (dbg->snaps, iter, snap) {
-debug/trace.c:	//if (tag>0 && tag<31) core->dbg->trace->tag = 1<<(sz-1);
-debug/trace.c:	return (dbg->trace->tag = (tag>0)? tag: UT32_MAX);
-debug/trace.c:	if (dbg->iob.read_at (dbg->iob.io, pc, buf, sizeof (buf)) != sizeof (buf)) {
-debug/trace.c:	if (r_anal_op (dbg->anal, &op, pc, buf, sizeof (buf)) < 1) {
-debug/trace.c:	if (dbg->anal->esil && dbg->anal->trace) {
-debug/trace.c:		r_anal_esil_trace (dbg->anal->esil, &op);
-debug/trace.c:	free (dbg->trace->addresses);
-debug/trace.c:	dbg->trace->addresses = (str&&*str)? strdup (str): NULL;
-debug/trace.c:	Sdb *db = dbg->trace->db;
-debug/trace.c:	int tag = dbg->trace->tag;
-debug/trace.c:	r_list_foreach (dbg->trace->traces, iter, trace) {
-debug/trace.c:		if (tag != 0 && !(dbg->trace->tag & (1<<tag)))
-debug/trace.c:	int tag = dbg->trace->tag;
-debug/trace.c:	r_list_foreach (dbg->trace->traces, iter, trace) {
-debug/trace.c:				dbg->cb_printf ("at+ 0x%"PFMT64x" %d\n", trace->addr, trace->times);
-debug/trace.c:				dbg->cb_printf ("pd 1 @ 0x%"PFMT64x"\n", trace->addr);
-debug/trace.c:				dbg->cb_printf ("0x%"PFMT64x" ", trace->addr);
-debug/trace.c:				dbg->cb_printf ("0x%08"PFMT64x" size=%d count=%d times=%d tag=%d\n",
-debug/trace.c:	if (dbg->trace->addresses) {
-debug/trace.c:		if (!strstr (dbg->trace->addresses, addr_str))
-debug/trace.c:	int tag = dbg->trace->tag;
-debug/trace.c:	r_anal_trace_bb (dbg->anal, addr);
-debug/trace.c:		tp->count = ++dbg->trace->count;
-debug/trace.c:		r_list_append (dbg->trace->traces, tp);
-debug/trace.c:		sdb_num_set (dbg->trace->db, sdb_fmt (0, "trace.%d.%"PFMT64x, tag, addr),
-debug/trace.c:	RDebugTrace *t = dbg->trace;
-include/r_heap_glibc.h:#define SZ core->dbg->bits
-io/p/io_debug.c:	if (c && c->dbg && c->dbg->h) {
-io/p/io_w32dbg.c:        ReadProcessMemory (dbg->pi.hProcess, (void*)(size_t)addr, buf, len, &ret);
-io/p/io_w32dbg.c:	return 0 != WriteProcessMemory (dbg->pi.hProcess, (void *)(size_t)addr, buf, len, &ret)? len: 0;
-io/p/io_w32dbg.c:	dbg->pi.hProcess = OpenProcess (PROCESS_ALL_ACCESS, FALSE, dbg->pid);
-io/p/io_w32dbg.c:	if (!dbg->pi.hProcess) {
-io/p/io_w32dbg.c:	return dbg->pid;
-io/p/io_w32dbg.c:		dbg->pid = atoi (file + 9);
-io/p/io_w32dbg.c:		pidpath = r_sys_pid_to_path (dbg->pid);
diff -Nru radare2-2.3.0+dfsg/libr/util/ascii_table.c radare2-2.8.0+dfsg/libr/util/ascii_table.c
--- radare2-2.3.0+dfsg/libr/util/ascii_table.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/ascii_table.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,79 @@
+/* radare - LGPL - Copyright 2018 - pancake, r00tus3r */
+
+#include <r_util.h>
+
+static const char *ascii_table =
+"The following table contains the 128 ASCII characters.\n"
+"\n"
+"Oct   Dec   Hex   Char                        Oct   Dec   Hex   Char\n"
+"────────────────────────────────────────────────────────────────────────\n"
+"000   0     00    NUL '\\0' (null character)   100   64    40    @\n"
+"001   1     01    SOH (start of heading)      101   65    41    A\n"
+"002   2     02    STX (start of text)         102   66    42    B\n"
+"003   3     03    ETX (end of text)           103   67    43    C\n"
+"004   4     04    EOT (end of transmission)   104   68    44    D\n"
+"005   5     05    ENQ (enquiry)               105   69    45    E\n"
+"006   6     06    ACK (acknowledge)           106   70    46    F\n"
+"007   7     07    BEL '\\a' (bell)             107   71    47    G\n"
+"010   8     08    BS  '\\b' (backspace)        110   72    48    H\n"
+"011   9     09    HT  '\\t' (horizontal tab)   111   73    49    I\n"
+"012   10    0A    LF  '\\n"
+"' (new line)         112   74    4A    J\n"
+"013   11    0B    VT  '\\v' (vertical tab)     113   75    4B    K\n"
+"014   12    0C    FF  '\\f' (form feed)        114   76    4C    L\n"
+"015   13    0D    CR  '\\r' (carriage ret)     115   77    4D    M\n"
+"016   14    0E    SO  (shift out)             116   78    4E    N\n"
+"017   15    0F    SI  (shift in)              117   79    4F    O\n"
+"020   16    10    DLE (data link escape)      120   80    50    P\n"
+"021   17    11    DC1 (device control 1)      121   81    51    Q\n"
+"022   18    12    DC2 (device control 2)      122   82    52    R\n"
+"023   19    13    DC3 (device control 3)      123   83    53    S\n"
+"024   20    14    DC4 (device control 4)      124   84    54    T\n"
+"025   21    15    NAK (negative ack.)         125   85    55    U\n"
+"026   22    16    SYN (synchronous idle)      126   86    56    V\n"
+"027   23    17    ETB (end of trans. blk)     127   87    57    W\n"
+"030   24    18    CAN (cancel)                130   88    58    X\n"
+"031   25    19    EM  (end of medium)         131   89    59    Y\n"
+"032   26    1A    SUB (substitute)            132   90    5A    Z\n"
+"033   27    1B    ESC (escape)                133   91    5B    [\n"
+"034   28    1C    FS  (file separator)        134   92    5C    \\  '\\\\'\n"
+"035   29    1D    GS  (group separator)       135   93    5D    ]\n"
+"036   30    1E    RS  (record separator)      136   94    5E    ^\n"
+"037   31    1F    US  (unit separator)        137   95    5F    _\n"
+"040   32    20    SPACE                       140   96    60    `\n"
+"041   33    21    !                           141   97    61    a\n"
+"042   34    22    \"                           142   98    62    b\n"
+"043   35    23    #                           143   99    63    c\n"
+"044   36    24    $                           144   100   64    d\n"
+"045   37    25    %                           145   101   65    e\n"
+"046   38    26    &                           146   102   66    f\n"
+"047   39    27    '                           147   103   67    g\n"
+"050   40    28    (                           150   104   68    h\n"
+"051   41    29    )                           151   105   69    i\n"
+"052   42    2A    *                           152   106   6A    j\n"
+"053   43    2B    +                           153   107   6B    k\n"
+"054   44    2C    ,                           154   108   6C    l\n"
+"055   45    2D    -                           155   109   6D    m\n"
+"056   46    2E    .                           156   110   6E    n\n"
+"057   47    2F    /                           157   111   6F    o\n"
+"060   48    30    0                           160   112   70    p\n"
+"061   49    31    1                           161   113   71    q\n"
+"062   50    32    2                           162   114   72    r\n"
+"063   51    33    3                           163   115   73    s\n"
+"064   52    34    4                           164   116   74    t\n"
+"065   53    35    5                           165   117   75    u\n"
+"066   54    36    6                           166   118   76    v\n"
+"067   55    37    7                           167   119   77    w\n"
+"070   56    38    8                           170   120   78    x\n"
+"071   57    39    9                           171   121   79    y\n"
+"072   58    3A    :                           172   122   7A    z\n"
+"073   59    3B    ;                           173   123   7B    {\n"
+"074   60    3C    <                           174   124   7C    |\n"
+"075   61    3D    =                           175   125   7D    }\n"
+"076   62    3E    >                           176   126   7E    ~\n"
+"077   63    3F    ?                           177   127   7F    DEL\n"
+;
+
+R_API const char *ret_ascii_table() {
+        return ascii_table;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/asn1.c radare2-2.8.0+dfsg/libr/util/asn1.c
--- radare2-2.3.0+dfsg/libr/util/asn1.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/asn1.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,178 @@
+/* radare2 - LGPL - Copyright 2017-2018 - wargio */
+
+#include <r_util.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+static RASN1Object *asn1_parse_header (const ut8 *buffer, ut32 length) {
+	RASN1Object *object;
+	ut8 head, length8, byte;
+	ut64 length64;
+	if (!buffer || length < 2) {
+		return NULL;
+	}
+
+	object = R_NEW0 (RASN1Object);
+	if (!object) {
+		return NULL;
+	}
+	head = buffer[0];
+	object->klass = head & ASN1_CLASS;
+	object->form = head & ASN1_FORM;
+	object->tag = head & ASN1_TAG;
+	length8 = buffer[1];
+	if (length8 & ASN1_LENLONG) {
+		length64 = 0;
+		length8 &= ASN1_LENSHORT;
+		if (length8 && length8 < length - 2) {
+			ut8 i8;
+			// can overflow.
+			for (i8 = 0; i8 < length8; ++i8) {
+				byte = buffer[2 + i8];
+				length64 <<= 8;
+				length64 |= byte;
+				if (length64 > length) {
+					goto out_error;
+				}
+			}
+			object->sector = buffer + 2 + length8;
+		} else {
+			//indefinite
+			const ut8 *from = buffer + 2;
+			const ut8 *end = from + (length - 2);
+			do {
+				byte = *from;
+				length64 <<= 8;
+				length64 |= byte;
+				from++;
+			} while (from < end && length64 <= length && byte & 0x80);
+			if (length64 > length) {
+				goto out_error;
+			}
+			object->sector = from;
+		}
+		object->length = (ut32) length64;
+	} else {
+		object->length = (ut32) length8;
+		object->sector = buffer + 2;
+	}
+	if (object->tag == TAG_BITSTRING && object->sector[0] == 0) {
+		if (object->length > 0){
+			object->sector++; //real sector starts +1
+			object->length--;
+		}
+	}
+	if (object->length > length) {
+		// Malformed object - overflow from data ptr
+		goto out_error;
+	}
+	return object;
+out_error:
+	free (object);
+	return NULL;
+}
+
+static ut32 r_asn1_count_objects (const ut8 *buffer, ut32 length) {
+	ut32 counter;
+	RASN1Object *object;
+	const ut8 *next, *end;
+	if (!buffer || !length) {
+		return 0;
+	}
+	counter = 0;
+	object = NULL;
+	next = buffer;
+	end = buffer + length;
+	while (next >= buffer && next < end) {
+		object = asn1_parse_header (next, end - next);
+		if (!object || next == object->sector) {
+			R_FREE (object);
+			break;
+		}
+		next = object->sector + object->length;
+		counter++;
+		R_FREE (object);
+	}
+	R_FREE (object);
+	return counter;
+}
+
+R_API RASN1Object *r_asn1_create_object (const ut8 *buffer, ut32 length) {
+	RASN1Object *object = asn1_parse_header (buffer, length);
+	if (object && (object->form == FORM_CONSTRUCTED || object->tag == TAG_BITSTRING || object->tag == TAG_OCTETSTRING)) {
+		ut32 i, count;
+		RASN1Object *inner = NULL;
+		const ut8 *next = object->sector;
+		const ut8 *end = next + object->length;
+		if (end > buffer + length) {
+			free (object);
+			return NULL;
+		}
+		count = r_asn1_count_objects (object->sector, object->length);
+		if (count > 0) {
+			object->list.length = count;
+			object->list.objects = R_NEWS0 (RASN1Object*, count);
+			if (!object->list.objects) {
+				r_asn1_free_object (object);
+				return NULL;
+			}
+			for (i = 0; next >= buffer && next < end && i < count; ++i) {
+				inner = r_asn1_create_object (next, end - next);
+				if (!inner || next == inner->sector) {
+					r_asn1_free_object (inner);
+					break;
+				}
+				next = inner->sector + inner->length;
+				R_PTR_MOVE (object->list.objects[i], inner);
+			}
+		}
+	}
+	return object;
+}
+
+R_API RASN1Binary *r_asn1_create_binary (const ut8 *buffer, ut32 length) {
+	RASN1Binary* bin = NULL;
+	ut8* buf = NULL;
+	if (!buffer || !length) {
+		return NULL;
+	}
+	buf = (ut8*) calloc (sizeof (*buf), length);
+	if (!buf) {
+		return NULL;
+	}
+	bin = R_NEW0 (RASN1Binary);
+	if (!bin) {
+		free (buf);
+		return NULL;
+	}
+	memcpy (buf, buffer, length);
+	bin->binary = buf;
+	bin->length = length;
+	return bin;
+}
+
+R_API void r_asn1_free_object (RASN1Object *object) {
+	ut32 i;
+	if (!object) {
+		return;
+	}
+	//this shall not be freed. it's a pointer into the buffer.
+	object->sector = 0;
+	if (object->list.objects) {
+		for (i = 0; i < object->list.length; ++i) {
+			r_asn1_free_object (object->list.objects[i]);
+		}
+		R_FREE (object->list.objects);
+	}
+	object->list.objects = NULL;
+	object->list.length = 0;
+	R_FREE (object);
+}
+
+R_API void r_asn1_free_binary (RASN1Binary* bin) {
+	if (bin) {
+		free ((char*) bin->binary);
+		free (bin);
+	}
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/asn1.h radare2-2.8.0+dfsg/libr/util/asn1.h
--- radare2-2.3.0+dfsg/libr/util/asn1.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/asn1.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef R_ASN1_INTERNAL_H
+#define R_ASN1_INTERNAL_H
+
+R_API ut32 r_asn1_count_objects (const ut8 *buffer, ut32 length);
+R_API RASN1String *r_asn1_create_string (const char *string, bool allocated, ut32 length);
+R_API RASN1String *r_asn1_create_string2 (const char *string, bool allocated);
+R_API RASN1String *r_asn1_concatenate_strings (RASN1String* s0, RASN1String* s1, bool freestr);
+
+#endif /* R_ASN1_INTERNAL_H */
+
diff -Nru radare2-2.3.0+dfsg/libr/util/asn1_oids.h radare2-2.8.0+dfsg/libr/util/asn1_oids.h
--- radare2-2.3.0+dfsg/libr/util/asn1_oids.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/asn1_oids.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2249 @@
+#ifndef OIDS_H
+#define OIDS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct r_oid_list_t {
+	const char* oid;
+	const char* name;
+} X509OIDList [] = {
+	{"0.2.262.1.10", "Telesec"},
+	{"0.2.262.1.10.0", "extension"},
+	{"0.2.262.1.10.1", "mechanism"},
+	{"0.2.262.1.10.1.0", "authentication"},
+	{"0.2.262.1.10.1.0.1", "passwordAuthentication"},
+	{"0.2.262.1.10.1.0.2", "protectedPasswordAuthentication"},
+	{"0.2.262.1.10.1.0.3", "oneWayX509Authentication"},
+	{"0.2.262.1.10.1.0.4", "twoWayX509Authentication"},
+	{"0.2.262.1.10.1.0.5", "threeWayX509Authentication"},
+	{"0.2.262.1.10.1.0.6", "oneWayISO9798Authentication"},
+	{"0.2.262.1.10.1.0.7", "twoWayISO9798Authentication"},
+	{"0.2.262.1.10.1.0.8", "telekomAuthentication"},
+	{"0.2.262.1.10.1.1", "signature"},
+	{"0.2.262.1.10.1.1.1", "md4WithRSAAndISO9697"},
+	{"0.2.262.1.10.1.1.2", "md4WithRSAAndTelesecSignatureStandard"},
+	{"0.2.262.1.10.1.1.3", "md5WithRSAAndISO9697"},
+	{"0.2.262.1.10.1.1.4", "md5WithRSAAndTelesecSignatureStandard"},
+	{"0.2.262.1.10.1.1.5", "ripemd160WithRSAAndTelekomSignatureStandard"},
+	{"0.2.262.1.10.1.1.9", "hbciRsaSignature"},
+	{"0.2.262.1.10.1.2", "encryption"},
+	{"0.2.262.1.10.1.2.0", "none"},
+	{"0.2.262.1.10.1.2.1", "rsaTelesec"},
+	{"0.2.262.1.10.1.2.2", "des"},
+	{"0.2.262.1.10.1.2.2.1", "desECB"},
+	{"0.2.262.1.10.1.2.2.2", "desCBC"},
+	{"0.2.262.1.10.1.2.2.3", "desOFB"},
+	{"0.2.262.1.10.1.2.2.4", "desCFB8"},
+	{"0.2.262.1.10.1.2.2.5", "desCFB64"},
+	{"0.2.262.1.10.1.2.3", "des3"},
+	{"0.2.262.1.10.1.2.3.1", "des3ECB"},
+	{"0.2.262.1.10.1.2.3.2", "des3CBC"},
+	{"0.2.262.1.10.1.2.3.3", "des3OFB"},
+	{"0.2.262.1.10.1.2.3.4", "des3CFB8"},
+	{"0.2.262.1.10.1.2.3.5", "des3CFB64"},
+	{"0.2.262.1.10.1.2.4", "magenta"},
+	{"0.2.262.1.10.1.2.5", "idea"},
+	{"0.2.262.1.10.1.2.5.1", "ideaECB"},
+	{"0.2.262.1.10.1.2.5.2", "ideaCBC"},
+	{"0.2.262.1.10.1.2.5.3", "ideaOFB"},
+	{"0.2.262.1.10.1.2.5.4", "ideaCFB8"},
+	{"0.2.262.1.10.1.2.5.5", "ideaCFB64"},
+	{"0.2.262.1.10.1.3", "oneWayFunction"},
+	{"0.2.262.1.10.1.3.1", "md4"},
+	{"0.2.262.1.10.1.3.2", "md5"},
+	{"0.2.262.1.10.1.3.3", "sqModNX509"},
+	{"0.2.262.1.10.1.3.4", "sqModNISO"},
+	{"0.2.262.1.10.1.3.5", "ripemd128"},
+	{"0.2.262.1.10.1.3.6", "hashUsingBlockCipher"},
+	{"0.2.262.1.10.1.3.7", "mac"},
+	{"0.2.262.1.10.1.3.8", "ripemd160"},
+	{"0.2.262.1.10.1.4", "fecFunction"},
+	{"0.2.262.1.10.1.4.1", "reedSolomon"},
+	{"0.2.262.1.10.2", "module"},
+	{"0.2.262.1.10.2.0", "algorithms"},
+	{"0.2.262.1.10.2.1", "attributeTypes"},
+	{"0.2.262.1.10.2.2", "certificateTypes"},
+	{"0.2.262.1.10.2.3", "messageTypes"},
+	{"0.2.262.1.10.2.4", "plProtocol"},
+	{"0.2.262.1.10.2.5", "smeAndComponentsOfSme"},
+	{"0.2.262.1.10.2.6", "fec"},
+	{"0.2.262.1.10.2.7", "usefulDefinitions"},
+	{"0.2.262.1.10.2.8", "stefiles"},
+	{"0.2.262.1.10.2.9", "sadmib"},
+	{"0.2.262.1.10.2.10", "electronicOrder"},
+	{"0.2.262.1.10.2.11", "telesecTtpAsymmetricApplication"},
+	{"0.2.262.1.10.2.12", "telesecTtpBasisApplication"},
+	{"0.2.262.1.10.2.13", "telesecTtpMessages"},
+	{"0.2.262.1.10.2.14", "telesecTtpTimeStampApplication"},
+	{"0.2.262.1.10.3", "objectClass"},
+	{"0.2.262.1.10.3.0", "telesecOtherName"},
+	{"0.2.262.1.10.3.1", "directory"},
+	{"0.2.262.1.10.3.2", "directoryType"},
+	{"0.2.262.1.10.3.3", "directoryGroup"},
+	{"0.2.262.1.10.3.4", "directoryUser"},
+	{"0.2.262.1.10.3.5", "symmetricKeyEntry"},
+	{"0.2.262.1.10.4", "package"},
+	{"0.2.262.1.10.5", "parameter"},
+	{"0.2.262.1.10.6", "nameBinding"},
+	{"0.2.262.1.10.7", "attribute"},
+	{"0.2.262.1.10.7.0", "applicationGroupIdentifier"},
+	{"0.2.262.1.10.7.1", "certificateType"},
+	{"0.2.262.1.10.7.2", "telesecCertificate"},
+	{"0.2.262.1.10.7.3", "certificateNumber"},
+	{"0.2.262.1.10.7.4", "certificateRevocationList"},
+	{"0.2.262.1.10.7.5", "creationDate"},
+	{"0.2.262.1.10.7.6", "issuer"},
+	{"0.2.262.1.10.7.7", "namingAuthority"},
+	{"0.2.262.1.10.7.8", "publicKeyDirectory"},
+	{"0.2.262.1.10.7.9", "securityDomain"},
+	{"0.2.262.1.10.7.10", "subject"},
+	{"0.2.262.1.10.7.11", "timeOfRevocation"},
+	{"0.2.262.1.10.7.12", "userGroupReference"},
+	{"0.2.262.1.10.7.13", "validity"},
+	{"0.2.262.1.10.7.14", "zert93"},
+	{"0.2.262.1.10.7.15", "securityMessEnv"},
+	{"0.2.262.1.10.7.16", "anonymizedPublicKeyDirectory"},
+	{"0.2.262.1.10.7.17", "telesecGivenName"},
+	{"0.2.262.1.10.7.18", "nameAdditions"},
+	{"0.2.262.1.10.7.19", "telesecPostalCode"},
+	{"0.2.262.1.10.7.20", "nameDistinguisher"},
+	{"0.2.262.1.10.7.21", "telesecCertificateList"},
+	{"0.2.262.1.10.7.22", "teletrustCertificateList"},
+	{"0.2.262.1.10.7.23", "x509CertificateList"},
+	{"0.2.262.1.10.7.24", "timeOfIssue"},
+	{"0.2.262.1.10.7.25", "physicalCardNumber"},
+	{"0.2.262.1.10.7.26", "fileType"},
+	{"0.2.262.1.10.7.27", "ctlFileIsArchive"},
+	{"0.2.262.1.10.7.28", "emailAddress"},
+	{"0.2.262.1.10.7.29", "certificateTemplateList"},
+	{"0.2.262.1.10.7.30", "directoryName"},
+	{"0.2.262.1.10.7.31", "directoryTypeName"},
+	{"0.2.262.1.10.7.32", "directoryGroupName"},
+	{"0.2.262.1.10.7.33", "directoryUserName"},
+	{"0.2.262.1.10.7.34", "revocationFlag"},
+	{"0.2.262.1.10.7.35", "symmetricKeyEntryName"},
+	{"0.2.262.1.10.7.36", "glNumber"},
+	{"0.2.262.1.10.7.37", "goNumber"},
+	{"0.2.262.1.10.7.38", "gKeyData"},
+	{"0.2.262.1.10.7.39", "zKeyData"},
+	{"0.2.262.1.10.7.40", "ktKeyData"},
+	{"0.2.262.1.10.7.41", "ktKeyNumber"},
+	{"0.2.262.1.10.7.51", "timeOfRevocationGen"},
+	{"0.2.262.1.10.7.52", "liabilityText"},
+	{"0.2.262.1.10.8", "attributeGroup"},
+	{"0.2.262.1.10.9", "action"},
+	{"0.2.262.1.10.10", "notification"},
+	{"0.2.262.1.10.11", "snmp-mibs"},
+	{"0.2.262.1.10.11.1", "securityApplication"},
+	{"0.2.262.1.10.12", "certAndCrlExtensionDefinitions"},
+	{"0.2.262.1.10.12.0", "liabilityLimitationFlag"},
+	{"0.2.262.1.10.12.1", "telesecCertIdExt"},
+	{"0.2.262.1.10.12.2", "Telesec.policyIdentifier"},
+	{"0.2.262.1.10.12.3", "telesecPolicyQualifierID"},
+	{"0.2.262.1.10.12.4", "telesecCRLFilteredExt"},
+	{"0.2.262.1.10.12.5", "telesecCRLFilterExt"},
+	{"0.2.262.1.10.12.6", "telesecNamingAuthorityExt"},
+	{"0.4.0.127.0.7", "bsi"},
+	{"0.4.0.127.0.7.1", "bsiEcc"},
+	{"0.4.0.127.0.7.1.1", "bsifieldType"},
+	{"0.4.0.127.0.7.1.1.1", "bsiPrimeField"},
+	{"0.4.0.127.0.7.1.1.2", "bsiCharacteristicTwoField"},
+	{"0.4.0.127.0.7.1.1.2.2", "bsiECTLVKeyFormat"},
+	{"0.4.0.127.0.7.1.1.2.2.1", "bsiECTLVPublicKey"},
+	{"0.4.0.127.0.7.1.1.2.3", "bsiCharacteristicTwoBasis"},
+	{"0.4.0.127.0.7.1.1.2.3.1", "bsiGnBasis"},
+	{"0.4.0.127.0.7.1.1.2.3.2", "bsiTpBasis"},
+	{"0.4.0.127.0.7.1.1.2.3.3", "bsiPpBasis"},
+	{"0.4.0.127.0.7.1.1.4.1", "bsiEcdsaSignatures"},
+	{"0.4.0.127.0.7.1.1.4.1.1", "bsiEcdsaWithSHA1"},
+	{"0.4.0.127.0.7.1.1.4.1.2", "bsiEcdsaWithSHA224"},
+	{"0.4.0.127.0.7.1.1.4.1.3", "bsiEcdsaWithSHA256"},
+	{"0.4.0.127.0.7.1.1.4.1.4", "bsiEcdsaWithSHA384"},
+	{"0.4.0.127.0.7.1.1.4.1.5", "bsiEcdsaWithSHA512"},
+	{"0.4.0.127.0.7.1.1.4.1.6", "bsiEcdsaWithRIPEMD160"},
+	{"0.4.0.127.0.7.1.1.5.1.1", "bsiEckaEgX963KDF"},
+	{"0.4.0.127.0.7.1.1.5.1.1.1", "bsiEckaEgX963KDFWithSHA1"},
+	{"0.4.0.127.0.7.1.1.5.1.1.2", "bsiEckaEgX963KDFWithSHA224"},
+	{"0.4.0.127.0.7.1.1.5.1.1.3", "bsiEckaEgX963KDFWithSHA256"},
+	{"0.4.0.127.0.7.1.1.5.1.1.4", "bsiEckaEgX963KDFWithSHA384"},
+	{"0.4.0.127.0.7.1.1.5.1.1.5", "bsiEckaEgX963KDFWithSHA512"},
+	{"0.4.0.127.0.7.1.1.5.1.1.6", "bsiEckaEgX963KDFWithRIPEMD160"},
+	{"0.4.0.127.0.7.1.1.5.1.2", "bsiEckaEgSessionKDF"},
+	{"0.4.0.127.0.7.1.1.5.1.2.1", "bsiEckaEgSessionKDFWith3DES"},
+	{"0.4.0.127.0.7.1.1.5.1.2.2", "bsiEckaEgSessionKDFWithAES128"},
+	{"0.4.0.127.0.7.1.1.5.1.2.3", "bsiEckaEgSessionKDFWithAES192"},
+	{"0.4.0.127.0.7.1.1.5.1.2.4", "bsiEckaEgSessionKDFWithAES256"},
+	{"0.4.0.127.0.7.1.1.5.2", "bsiEckaDH"},
+	{"0.4.0.127.0.7.1.1.5.2.1", "bsiEckaDHX963KDF"},
+	{"0.4.0.127.0.7.1.1.5.2.1.1", "bsiEckaDHX963KDFWithSHA1"},
+	{"0.4.0.127.0.7.1.1.5.2.1.2", "bsiEckaDHX963KDFWithSHA224"},
+	{"0.4.0.127.0.7.1.1.5.2.1.3", "bsiEckaDHX963KDFWithSHA256"},
+	{"0.4.0.127.0.7.1.1.5.2.1.4", "bsiEckaDHX963KDFWithSHA384"},
+	{"0.4.0.127.0.7.1.1.5.2.1.5", "bsiEckaDHX963KDFWithSHA512"},
+	{"0.4.0.127.0.7.1.1.5.2.1.6", "bsiEckaDHX963KDFWithRIPEMD160"},
+	{"0.4.0.127.0.7.1.1.5.2.2", "bsiEckaDHSessionKDF"},
+	{"0.4.0.127.0.7.1.1.5.2.2.1", "bsiEckaDHSessionKDFWith3DES"},
+	{"0.4.0.127.0.7.1.1.5.2.2.2", "bsiEckaDHSessionKDFWithAES128"},
+	{"0.4.0.127.0.7.1.1.5.2.2.3", "bsiEckaDHSessionKDFWithAES192"},
+	{"0.4.0.127.0.7.1.1.5.2.2.4", "bsiEckaDHSessionKDFWithAES256"},
+	{"0.4.0.127.0.7.1.2", "bsiEcKeyType"},
+	{"0.4.0.127.0.7.1.2.1", "bsiEcPublicKey"},
+	{"0.4.0.127.0.7.1.5.1", "bsiKaeg"},
+	{"0.4.0.127.0.7.1.5.1.1", "bsiKaegWithX963KDF"},
+	{"0.4.0.127.0.7.1.5.1.2", "bsiKaegWith3DESKDF"},
+	{"0.4.0.127.0.7.2.2.1", "bsiPK"},
+	{"0.4.0.127.0.7.2.2.1.1", "bsiPK_DH"},
+	{"0.4.0.127.0.7.2.2.1.2", "bsiPK_ECDH"},
+	{"0.4.0.127.0.7.2.2.2", "bsiTA"},
+	{"0.4.0.127.0.7.2.2.2.1", "bsiTA_RSA"},
+	{"0.4.0.127.0.7.2.2.2.1.1", "bsiTA_RSAv1_5_SHA1"},
+	{"0.4.0.127.0.7.2.2.2.1.2", "bsiTA_RSAv1_5_SHA256"},
+	{"0.4.0.127.0.7.2.2.2.1.3", "bsiTA_RSAPSS_SHA1"},
+	{"0.4.0.127.0.7.2.2.2.1.4", "bsiTA_RSAPSS_SHA256"},
+	{"0.4.0.127.0.7.2.2.2.1.5", "bsiTA_RSAv1_5_SHA512"},
+	{"0.4.0.127.0.7.2.2.2.1.6", "bsiTA_RSAPSS_SHA512"},
+	{"0.4.0.127.0.7.2.2.2.2", "bsiTA_ECDSA"},
+	{"0.4.0.127.0.7.2.2.2.2.1", "bsiTA_ECDSA_SHA1"},
+	{"0.4.0.127.0.7.2.2.2.2.2", "bsiTA_ECDSA_SHA224"},
+	{"0.4.0.127.0.7.2.2.2.2.3", "bsiTA_ECDSA_SHA256"},
+	{"0.4.0.127.0.7.2.2.2.2.4", "bsiTA_ECDSA_SHA384"},
+	{"0.4.0.127.0.7.2.2.2.2.5", "bsiTA_ECDSA_SHA512"},
+	{"0.4.0.127.0.7.2.2.3", "bsiCA"},
+	{"0.4.0.127.0.7.2.2.3.1", "bsiCA_DH"},
+	{"0.4.0.127.0.7.2.2.3.1.1", "bsiCA_DH_3DES_CBC_CBC"},
+	{"0.4.0.127.0.7.2.2.3.1.2", "bsiCA_DH_AES_CBC_CMAC_128"},
+	{"0.4.0.127.0.7.2.2.3.1.3", "bsiCA_DH_AES_CBC_CMAC_192"},
+	{"0.4.0.127.0.7.2.2.3.1.4", "bsiCA_DH_AES_CBC_CMAC_256"},
+	{"0.4.0.127.0.7.2.2.3.2", "bsiCA_ECDH"},
+	{"0.4.0.127.0.7.2.2.3.2.1", "bsiCA_ECDH_3DES_CBC_CBC"},
+	{"0.4.0.127.0.7.2.2.3.2.2", "bsiCA_ECDH_AES_CBC_CMAC_128"},
+	{"0.4.0.127.0.7.2.2.3.2.3", "bsiCA_ECDH_AES_CBC_CMAC_192"},
+	{"0.4.0.127.0.7.2.2.3.2.4", "bsiCA_ECDH_AES_CBC_CMAC_256"},
+	{"0.4.0.127.0.7.2.2.4", "bsiPACE"},
+	{"0.4.0.127.0.7.2.2.4.1", "bsiPACE_DH_GM"},
+	{"0.4.0.127.0.7.2.2.4.1.1", "bsiPACE_DH_GM_3DES_CBC_CBC"},
+	{"0.4.0.127.0.7.2.2.4.1.2", "bsiPACE_DH_GM_AES_CBC_CMAC_128"},
+	{"0.4.0.127.0.7.2.2.4.1.3", "bsiPACE_DH_GM_AES_CBC_CMAC_192"},
+	{"0.4.0.127.0.7.2.2.4.1.4", "bsiPACE_DH_GM_AES_CBC_CMAC_256"},
+	{"0.4.0.127.0.7.2.2.4.2", "bsiPACE_ECDH_GM"},
+	{"0.4.0.127.0.7.2.2.4.2.1", "bsiPACE_ECDH_GM_3DES_CBC_CBC"},
+	{"0.4.0.127.0.7.2.2.4.2.2", "bsiPACE_ECDH_GM_AES_CBC_CMAC_128"},
+	{"0.4.0.127.0.7.2.2.4.2.3", "bsiPACE_ECDH_GM_AES_CBC_CMAC_192"},
+	{"0.4.0.127.0.7.2.2.4.2.4", "bsiPACE_ECDH_GM_AES_CBC_CMAC_256"},
+	{"0.4.0.127.0.7.2.2.4.3", "bsiPACE_DH_IM"},
+	{"0.4.0.127.0.7.2.2.4.3.1", "bsiPACE_DH_IM_3DES_CBC_CBC"},
+	{"0.4.0.127.0.7.2.2.4.3.2", "bsiPACE_DH_IM_AES_CBC_CMAC_128"},
+	{"0.4.0.127.0.7.2.2.4.3.3", "bsiPACE_DH_IM_AES_CBC_CMAC_192"},
+	{"0.4.0.127.0.7.2.2.4.3.4", "bsiPACE_DH_IM_AES_CBC_CMAC_256"},
+	{"0.4.0.127.0.7.2.2.4.4", "bsiPACE_ECDH_IM"},
+	{"0.4.0.127.0.7.2.2.4.4.1", "bsiPACE_ECDH_IM_3DES_CBC_CBC"},
+	{"0.4.0.127.0.7.2.2.4.4.2", "bsiPACE_ECDH_IM_AES_CBC_CMAC_128"},
+	{"0.4.0.127.0.7.2.2.4.4.3", "bsiPACE_ECDH_IM_AES_CBC_CMAC_192"},
+	{"0.4.0.127.0.7.2.2.4.4.4", "bsiPACE_ECDH_IM_AES_CBC_CMAC_256"},
+	{"0.4.0.127.0.7.2.2.5", "bsiRI"},
+	{"0.4.0.127.0.7.2.2.5.1", "bsiRI_DH"},
+	{"0.4.0.127.0.7.2.2.5.1.1", "bsiRI_DH_SHA1"},
+	{"0.4.0.127.0.7.2.2.5.1.2", "bsiRI_DH_SHA224"},
+	{"0.4.0.127.0.7.2.2.5.1.3", "bsiRI_DH_SHA256"},
+	{"0.4.0.127.0.7.2.2.5.1.4", "bsiRI_DH_SHA384"},
+	{"0.4.0.127.0.7.2.2.5.1.5", "bsiRI_DH_SHA512"},
+	{"0.4.0.127.0.7.2.2.5.2", "bsiRI_ECDH"},
+	{"0.4.0.127.0.7.2.2.5.2.1", "bsiRI_ECDH_SHA1"},
+	{"0.4.0.127.0.7.2.2.5.2.2", "bsiRI_ECDH_SHA224"},
+	{"0.4.0.127.0.7.2.2.5.2.3", "bsiRI_ECDH_SHA256"},
+	{"0.4.0.127.0.7.2.2.5.2.4", "bsiRI_ECDH_SHA384"},
+	{"0.4.0.127.0.7.2.2.5.2.5", "bsiRI_ECDH_SHA512"},
+	{"0.4.0.127.0.7.2.2.6", "bsiCardInfo"},
+	{"0.4.0.127.0.7.2.2.7", "bsiEidSecurity"},
+	{"0.4.0.127.0.7.2.2.8", "bsiPT"},
+	{"0.4.0.127.0.7.3.1.2", "bsiEACRoles"},
+	{"0.4.0.127.0.7.3.1.2.1", "bsiEACRolesIS"},
+	{"0.4.0.127.0.7.3.1.2.2", "bsiEACRolesAT"},
+	{"0.4.0.127.0.7.3.1.2.3", "bsiEACRolesST"},
+	{"0.4.0.127.0.7.3.1.3", "bsiTAv2ce"},
+	{"0.4.0.127.0.7.3.1.3.1", "bsiTAv2ceDescription"},
+	{"0.4.0.127.0.7.3.1.3.1.1", "bsiTAv2ceDescriptionPlainText"},
+	{"0.4.0.127.0.7.3.1.3.1.2", "bsiTAv2ceDescriptionIA5String"},
+	{"0.4.0.127.0.7.3.1.3.1.3", "bsiTAv2ceDescriptionOctetString"},
+	{"0.4.0.127.0.7.3.1.3.2", "bsiTAv2ceTerminalSector"},
+	{"0.4.0.127.0.7.3.1.4", "bsiAuxData"},
+	{"0.4.0.127.0.7.3.1.4.1", "bsiAuxDataBirthday"},
+	{"0.4.0.127.0.7.3.1.4.2", "bsiAuxDataExpireDate"},
+	{"0.4.0.127.0.7.3.1.4.3", "bsiAuxDataCommunityID"},
+	{"0.4.0.127.0.7.3.1.5", "bsiDefectList"},
+	{"0.4.0.127.0.7.3.1.5.1", "bsiDefectAuthDefect"},
+	{"0.4.0.127.0.7.3.1.5.1.1", "bsiDefectCertRevoked"},
+	{"0.4.0.127.0.7.3.1.5.1.2", "bsiDefectCertReplaced"},
+	{"0.4.0.127.0.7.3.1.5.1.3", "bsiDefectChipAuthKeyRevoked"},
+	{"0.4.0.127.0.7.3.1.5.1.4", "bsiDefectActiveAuthKeyRevoked"},
+	{"0.4.0.127.0.7.3.1.5.2", "bsiDefectEPassportDefect"},
+	{"0.4.0.127.0.7.3.1.5.2.1", "bsiDefectEPassportDGMalformed"},
+	{"0.4.0.127.0.7.3.1.5.2.2", "bsiDefectSODInvalid"},
+	{"0.4.0.127.0.7.3.1.5.3", "bsiDefectEIDDefect"},
+	{"0.4.0.127.0.7.3.1.5.3.1", "bsiDefectEIDDGMalformed"},
+	{"0.4.0.127.0.7.3.1.5.3.2", "bsiDefectEIDIntegrity"},
+	{"0.4.0.127.0.7.3.1.5.4", "bsiDefectDocumentDefect"},
+	{"0.4.0.127.0.7.3.1.5.4.1", "bsiDefectCardSecurityMalformed"},
+	{"0.4.0.127.0.7.3.1.5.4.2", "bsiDefectChipSecurityMalformed"},
+	{"0.4.0.127.0.7.3.1.5.4.3", "bsiDefectPowerDownReq"},
+	{"0.4.0.127.0.7.3.1.6", "bsiListContentDescription"},
+	{"0.4.0.127.0.7.3.2.1", "bsiSecurityObject"},
+	{"0.4.0.127.0.7.3.2.2", "bsiBlackList"},
+	{"0.4.0.1862", "etsiQcsProfile"},
+	{"0.4.0.1862.1", "etsiQcs"},
+	{"0.4.0.1862.1.1", "etsiQcsCompliance"},
+	{"0.4.0.1862.1.2", "etsiQcsLimitValue"},
+	{"0.4.0.1862.1.3", "etsiQcsRetentionPeriod"},
+	{"0.4.0.1862.1.4", "etsiQcsQcSSCD"},
+	{"0.9.2342.19200300.100.1.1", "userID"},
+	{"0.9.2342.19200300.100.1.3", "rfc822Mailbox"},
+	{"0.9.2342.19200300.100.1.25", "domainComponent"},
+	{"1.0.10118.3.0.49", "ripemd160"},
+	{"1.0.10118.3.0.50", "ripemd128"},
+	{"1.0.10118.3.0.55", "whirlpool"},
+	{"1.2.36.1.3.1.1.1", "qgpki"},
+	{"1.2.36.1.3.1.1.1.1", "qgpkiPolicies"},
+	{"1.2.36.1.3.1.1.1.1.1", "qgpkiMedIntermedCA"},
+	{"1.2.36.1.3.1.1.1.1.1.1", "qgpkiMedIntermedIndividual"},
+	{"1.2.36.1.3.1.1.1.1.1.2", "qgpkiMedIntermedDeviceControl"},
+	{"1.2.36.1.3.1.1.1.1.1.3", "qgpkiMedIntermedDevice"},
+	{"1.2.36.1.3.1.1.1.1.1.4", "qgpkiMedIntermedAuthorisedParty"},
+	{"1.2.36.1.3.1.1.1.1.1.5", "qgpkiMedIntermedDeviceSystem"},
+	{"1.2.36.1.3.1.1.1.1.2", "qgpkiMedIssuingCA"},
+	{"1.2.36.1.3.1.1.1.1.2.1", "qgpkiMedIssuingIndividual"},
+	{"1.2.36.1.3.1.1.1.1.2.2", "qgpkiMedIssuingDeviceControl"},
+	{"1.2.36.1.3.1.1.1.1.2.3", "qgpkiMedIssuingDevice"},
+	{"1.2.36.1.3.1.1.1.1.2.4", "qgpkiMedIssuingAuthorisedParty"},
+	{"1.2.36.1.3.1.1.1.1.2.5", "qgpkiMedIssuingClientAuth"},
+	{"1.2.36.1.3.1.1.1.1.2.6", "qgpkiMedIssuingServerAuth"},
+	{"1.2.36.1.3.1.1.1.1.2.7", "qgpkiMedIssuingDataProt"},
+	{"1.2.36.1.3.1.1.1.1.2.8", "qgpkiMedIssuingTokenAuth"},
+	{"1.2.36.1.3.1.1.1.1.3", "qgpkiBasicIntermedCA"},
+	{"1.2.36.1.3.1.1.1.1.3.1", "qgpkiBasicIntermedDeviceSystem"},
+	{"1.2.36.1.3.1.1.1.1.4", "qgpkiBasicIssuingCA"},
+	{"1.2.36.1.3.1.1.1.1.4.1", "qgpkiBasicIssuingClientAuth"},
+	{"1.2.36.1.3.1.1.1.1.4.2", "qgpkiBasicIssuingServerAuth"},
+	{"1.2.36.1.3.1.1.1.1.4.3", "qgpkiBasicIssuingDataSigning"},
+	{"1.2.36.1.3.1.1.1.2", "qgpkiAssuranceLevel"},
+	{"1.2.36.1.3.1.1.1.2.1", "qgpkiAssuranceRudimentary"},
+	{"1.2.36.1.3.1.1.1.2.2", "qgpkiAssuranceBasic"},
+	{"1.2.36.1.3.1.1.1.2.3", "qgpkiAssuranceMedium"},
+	{"1.2.36.1.3.1.1.1.2.4", "qgpkiAssuranceHigh"},
+	{"1.2.36.1.3.1.1.1.3", "qgpkiCertFunction"},
+	{"1.2.36.1.3.1.1.1.3.1", "qgpkiFunctionIndividual"},
+	{"1.2.36.1.3.1.1.1.3.2", "qgpkiFunctionDevice"},
+	{"1.2.36.1.3.1.1.1.3.3", "qgpkiFunctionAuthorisedParty"},
+	{"1.2.36.1.3.1.1.1.3.4", "qgpkiFunctionDeviceControl"},
+	{"1.2.36.1.3.1.2", "qpspki"},
+	{"1.2.36.1.3.1.2.1", "qpspkiPolicies"},
+	{"1.2.36.1.3.1.2.1.2", "qpspkiPolicyBasic"},
+	{"1.2.36.1.3.1.2.1.3", "qpspkiPolicyMedium"},
+	{"1.2.36.1.3.1.2.1.4", "qpspkiPolicyHigh"},
+	{"1.2.36.1.3.1.3.2", "qtmrpki"},
+	{"1.2.36.1.3.1.3.2.1", "qtmrpkiPolicies"},
+	{"1.2.36.1.3.1.3.2.2", "qtmrpkiPurpose"},
+	{"1.2.36.1.3.1.3.2.2.1", "qtmrpkiIndividual"},
+	{"1.2.36.1.3.1.3.2.2.2", "qtmrpkiDeviceControl"},
+	{"1.2.36.1.3.1.3.2.2.3", "qtmrpkiDevice"},
+	{"1.2.36.1.3.1.3.2.2.4", "qtmrpkiAuthorisedParty"},
+	{"1.2.36.1.3.1.3.2.2.5", "qtmrpkiDeviceSystem"},
+	{"1.2.36.1.3.1.3.2.3", "qtmrpkiDevice"},
+	{"1.2.36.1.3.1.3.2.3.1", "qtmrpkiDriverLicense"},
+	{"1.2.36.1.3.1.3.2.3.2", "qtmrpkiIndustryAuthority"},
+	{"1.2.36.1.3.1.3.2.3.3", "qtmrpkiMarineLicense"},
+	{"1.2.36.1.3.1.3.2.3.4", "qtmrpkiAdultProofOfAge"},
+	{"1.2.36.1.3.1.3.2.3.5", "qtmrpkiSam"},
+	{"1.2.36.1.3.1.3.2.4", "qtmrpkiAuthorisedParty"},
+	{"1.2.36.1.3.1.3.2.4.1", "qtmrpkiTransportInspector"},
+	{"1.2.36.1.3.1.3.2.4.2", "qtmrpkiPoliceOfficer"},
+	{"1.2.36.1.3.1.3.2.4.3", "qtmrpkiSystem"},
+	{"1.2.36.1.3.1.3.2.4.4", "qtmrpkiLiquorLicensingInspector"},
+	{"1.2.36.1.3.1.3.2.4.5", "qtmrpkiMarineEnforcementOfficer"},
+	{"1.2.36.1.333.1", "australianBusinessNumber"},
+	{"1.2.36.68980861.1.1.2", "signetPersonal"},
+	{"1.2.36.68980861.1.1.3", "signetBusiness"},
+	{"1.2.36.68980861.1.1.4", "signetLegal"},
+	{"1.2.36.68980861.1.1.10", "signetPilot"},
+	{"1.2.36.68980861.1.1.11", "signetIntraNet"},
+	{"1.2.36.68980861.1.1.20", "signetPolicy"},
+	{"1.2.36.75878867.1.100.1.1", "certificatesAustraliaPolicy"},
+	{"1.2.392.200011.61.1.1.1", "mitsubishiSecurityAlgorithm"},
+	{"1.2.392.200011.61.1.1.1.1", "misty1-cbc"},
+	{"1.2.410.200004.1", "kisaAlgorithm"},
+	{"1.2.410.200004.1.1", "kcdsa"},
+	{"1.2.410.200004.1.2", "has160"},
+	{"1.2.410.200004.1.3", "seedECB"},
+	{"1.2.410.200004.1.4", "seedCBC"},
+	{"1.2.410.200004.1.5", "seedOFB"},
+	{"1.2.410.200004.1.6", "seedCFB"},
+	{"1.2.410.200004.1.7", "seedMAC"},
+	{"1.2.410.200004.1.8", "kcdsaWithHAS160"},
+	{"1.2.410.200004.1.9", "kcdsaWithSHA1"},
+	{"1.2.410.200004.1.10", "pbeWithHAS160AndSEED-ECB"},
+	{"1.2.410.200004.1.11", "pbeWithHAS160AndSEED-CBC"},
+	{"1.2.410.200004.1.12", "pbeWithHAS160AndSEED-CFB"},
+	{"1.2.410.200004.1.13", "pbeWithHAS160AndSEED-OFB"},
+	{"1.2.410.200004.1.14", "pbeWithSHA1AndSEED-ECB"},
+	{"1.2.410.200004.1.15", "pbeWithSHA1AndSEED-CBC"},
+	{"1.2.410.200004.1.16", "pbeWithSHA1AndSEED-CFB"},
+	{"1.2.410.200004.1.17", "pbeWithSHA1AndSEED-OFB"},
+	{"1.2.410.200004.1.20", "rsaWithHAS160"},
+	{"1.2.410.200004.1.21", "kcdsa1"},
+	{"1.2.410.200004.2", "npkiCP"},
+	{"1.2.410.200004.2.1", "npkiSignaturePolicy"},
+	{"1.2.410.200004.3", "npkiKP"},
+	{"1.2.410.200004.4", "npkiAT"},
+	{"1.2.410.200004.5", "npkiLCA"},
+	{"1.2.410.200004.5.1", "npkiSignKorea"},
+	{"1.2.410.200004.5.2", "npkiSignGate"},
+	{"1.2.410.200004.5.3", "npkiNcaSign"},
+	{"1.2.410.200004.6", "npkiON"},
+	{"1.2.410.200004.7", "npkiAPP"},
+	{"1.2.410.200004.7.1", "npkiSMIME"},
+	{"1.2.410.200004.7.1.1", "npkiSMIMEAlgo"},
+	{"1.2.410.200004.7.1.1.1", "npkiCmsSEEDWrap"},
+	{"1.2.410.200004.10", "npki"},
+	{"1.2.410.200004.10.1", "npkiAttribute"},
+	{"1.2.410.200004.10.1.1", "npkiIdentifyData"},
+	{"1.2.410.200004.10.1.1.1", "npkiVID"},
+	{"1.2.410.200004.10.1.1.2", "npkiEncryptedVID"},
+	{"1.2.410.200004.10.1.1.3", "npkiRandomNum"},
+	{"1.2.410.200004.10.1.1.4", "npkiVID"},
+	{"1.2.410.200046.1.1", "aria1AlgorithmModes"},
+	{"1.2.410.200046.1.1.1", "aria128-ecb"},
+	{"1.2.410.200046.1.1.2", "aria128-cbc"},
+	{"1.2.410.200046.1.1.3", "aria128-cfb"},
+	{"1.2.410.200046.1.1.4", "aria128-ofb"},
+	{"1.2.410.200046.1.1.5", "aria128-ctr"},
+	{"1.2.410.200046.1.1.6", "aria192-ecb"},
+	{"1.2.410.200046.1.1.7", "aria192-cbc"},
+	{"1.2.410.200046.1.1.8", "aria192-cfb"},
+	{"1.2.410.200046.1.1.9", "aria192-ofb"},
+	{"1.2.410.200046.1.1.10", "aria192-ctr"},
+	{"1.2.410.200046.1.1.11", "aria256-ecb"},
+	{"1.2.410.200046.1.1.12", "aria256-cbc"},
+	{"1.2.410.200046.1.1.13", "aria256-cfb"},
+	{"1.2.410.200046.1.1.14", "aria256-ofb"},
+	{"1.2.410.200046.1.1.15", "aria256-ctr"},
+	{"1.2.410.200046.1.1.21", "aria128-cmac"},
+	{"1.2.410.200046.1.1.22", "aria192-cmac"},
+	{"1.2.410.200046.1.1.23", "aria256-cmac"},
+	{"1.2.410.200046.1.1.31", "aria128-ocb2"},
+	{"1.2.410.200046.1.1.32", "aria192-ocb2"},
+	{"1.2.410.200046.1.1.33", "aria256-ocb2"},
+	{"1.2.410.200046.1.1.34", "aria128-gcm"},
+	{"1.2.410.200046.1.1.35", "aria192-gcm"},
+	{"1.2.410.200046.1.1.36", "aria256-gcm"},
+	{"1.2.410.200046.1.1.37", "aria128-ccm"},
+	{"1.2.410.200046.1.1.38", "aria192-ccm"},
+	{"1.2.410.200046.1.1.39", "aria256-ccm"},
+	{"1.2.410.200046.1.1.40", "aria128-keywrap"},
+	{"1.2.410.200046.1.1.41", "aria192-keywrap"},
+	{"1.2.410.200046.1.1.42", "aria256-keywrap"},
+	{"1.2.410.200046.1.1.43", "aria128-keywrapWithPad"},
+	{"1.2.410.200046.1.1.44", "aria192-keywrapWithPad"},
+	{"1.2.410.200046.1.1.45", "aria256-keywrapWithPad"},
+	{"1.2.643.2.2.3", "gostSignature"},
+	{"1.2.643.2.2.4", "gost94Signature"},
+	{"1.2.643.2.2.19", "gostPublicKey"},
+	{"1.2.643.2.2.20", "gost94PublicKey"},
+	{"1.2.643.2.2.21", "gostCipher"},
+	{"1.2.643.2.2.31.0", "testCipherParams"},
+	{"1.2.643.2.2.31.1", "cryptoProCipherA"},
+	{"1.2.643.2.2.31.2", "cryptoProCipherB"},
+	{"1.2.643.2.2.31.3", "cryptoProCipherC"},
+	{"1.2.643.2.2.31.4", "cryptoProCipherD"},
+	{"1.2.643.2.2.31.5", "oscar11Cipher"},
+	{"1.2.643.2.2.31.6", "oscar10Cipher"},
+	{"1.2.643.2.2.31.7", "ric1Cipher"},
+	{"1.2.643.2.2.9", "gostDigest"},
+	{"1.2.643.2.2.30.0", "testDigestParams"},
+	{"1.2.643.2.2.30.1", "cryptoProDigestA"},
+	{"1.2.643.2.2.35.0", "testSignParams"},
+	{"1.2.643.2.2.35.1", "cryptoProSignA"},
+	{"1.2.643.2.2.35.2", "cryptoProSignB"},
+	{"1.2.643.2.2.35.3", "cryptoProSignC"},
+	{"1.2.643.2.2.36.0", "cryptoProSignXA"},
+	{"1.2.643.2.2.36.1", "cryptoProSignXB"},
+	{"1.2.643.2.2.14.0", "nullMeshing"},
+	{"1.2.643.2.2.14.1", "cryptoProMeshing"},
+	{"1.2.643.2.2.10", "hmacGost"},
+	{"1.2.643.2.2.13.0", "gostWrap"},
+	{"1.2.643.2.2.13.1", "cryptoProWrap"},
+	{"1.2.643.2.2.96", "cryptoProECDHWrap"},
+	{"1.2.752.34.1", "seis-cp"},
+	{"1.2.752.34.1.1", "SEIS.high-assurance.policyIdentifier"},
+	{"1.2.752.34.1.2", "SEIS.GAK.policyIdentifier"},
+	{"1.2.752.34.2", "SEIS.pe"},
+	{"1.2.752.34.3", "SEIS.at"},
+	{"1.2.752.34.3.1", "SEIS.at-personalIdentifier"},
+	{"1.2.840.10040.1", "module"},
+	{"1.2.840.10040.1.1", "x9f1-cert-mgmt"},
+	{"1.2.840.10040.2", "holdinstruction"},
+	{"1.2.840.10040.2.1", "holdinstruction-none"},
+	{"1.2.840.10040.2.2", "callissuer"},
+	{"1.2.840.10040.2.3", "reject"},
+	{"1.2.840.10040.2.4", "pickupToken"},
+	{"1.2.840.10040.3", "attribute"},
+	{"1.2.840.10040.3.1", "countersignature"},
+	{"1.2.840.10040.3.2", "attribute-cert"},
+	{"1.2.840.10040.4", "algorithm"},
+	{"1.2.840.10040.4.1", "dsa"},
+	{"1.2.840.10040.4.2", "dsa-match"},
+	{"1.2.840.10040.4.3", "dsaWithSha1"},
+	{"1.2.840.10045.1", "fieldType"},
+	{"1.2.840.10045.1.1", "prime-field"},
+	{"1.2.840.10045.1.2", "characteristic-two-field"},
+	{"1.2.840.10045.1.2.3", "characteristic-two-basis"},
+	{"1.2.840.10045.1.2.3.1", "onBasis"},
+	{"1.2.840.10045.1.2.3.2", "tpBasis"},
+	{"1.2.840.10045.1.2.3.3", "ppBasis"},
+	{"1.2.840.10045.2", "publicKeyType"},
+	{"1.2.840.10045.2.1", "ecPublicKey"},
+	{"1.2.840.10045.3.0.1", "c2pnb163v1"},
+	{"1.2.840.10045.3.0.2", "c2pnb163v2"},
+	{"1.2.840.10045.3.0.3", "c2pnb163v3"},
+	{"1.2.840.10045.3.0.5", "c2tnb191v1"},
+	{"1.2.840.10045.3.0.6", "c2tnb191v2"},
+	{"1.2.840.10045.3.0.7", "c2tnb191v3"},
+	{"1.2.840.10045.3.0.10", "c2pnb208w1"},
+	{"1.2.840.10045.3.0.11", "c2tnb239v1"},
+	{"1.2.840.10045.3.0.12", "c2tnb239v2"},
+	{"1.2.840.10045.3.0.13", "c2tnb239v3"},
+	{"1.2.840.10045.3.0.16", "c2pnb272w1"},
+	{"1.2.840.10045.3.0.18", "c2tnb359v1"},
+	{"1.2.840.10045.3.0.19", "c2pnb368w1"},
+	{"1.2.840.10045.3.0.20", "c2tnb431r1"},
+	{"1.2.840.10045.3.1.1", "prime192v1"},
+	{"1.2.840.10045.3.1.2", "prime192v2"},
+	{"1.2.840.10045.3.1.3", "prime192v3"},
+	{"1.2.840.10045.3.1.4", "prime239v1"},
+	{"1.2.840.10045.3.1.5", "prime239v2"},
+	{"1.2.840.10045.3.1.6", "prime239v3"},
+	{"1.2.840.10045.3.1.7", "prime256v1"},
+	{"1.2.840.10045.4.1", "ecdsaWithSHA1"},
+	{"1.2.840.10045.4.2", "ecdsaWithRecommended"},
+	{"1.2.840.10045.4.3", "ecdsaWithSpecified"},
+	{"1.2.840.10045.4.3.1", "ecdsaWithSHA224"},
+	{"1.2.840.10045.4.3.2", "ecdsaWithSHA256"},
+	{"1.2.840.10045.4.3.3", "ecdsaWithSHA384"},
+	{"1.2.840.10045.4.3.4", "ecdsaWithSHA512"},
+	{"1.2.840.10046.1", "fieldType"},
+	{"1.2.840.10046.1.1", "gf-prime"},
+	{"1.2.840.10046.2", "numberType"},
+	{"1.2.840.10046.2.1", "dhPublicKey"},
+	{"1.2.840.10046.3", "scheme"},
+	{"1.2.840.10046.3.1", "dhStatic"},
+	{"1.2.840.10046.3.2", "dhEphem"},
+	{"1.2.840.10046.3.3", "dhHybrid1"},
+	{"1.2.840.10046.3.4", "dhHybrid2"},
+	{"1.2.840.10046.3.5", "mqv2"},
+	{"1.2.840.10046.3.6", "mqv1"},
+	{"1.2.840.10065.2.2", "?"},
+	{"1.2.840.10065.2.3", "healthcareLicense"},
+	{"1.2.840.10065.2.3.1.1", "license?"},
+	{"1.2.840.10070.", "iec62351"},
+	{"1.2.840.10070.8", "iec62351_8"},
+	{"1.2.840.10070.8.1", "iecUserRoles"},
+	{"1.2.840.113533.7", "nsn"},
+	{"1.2.840.113533.7.65", "nsn-ce"},
+	{"1.2.840.113533.7.65.0", "entrustVersInfo"},
+	{"1.2.840.113533.7.66", "nsn-alg"},
+	{"1.2.840.113533.7.66.3", "cast3CBC"},
+	{"1.2.840.113533.7.66.10", "cast5CBC"},
+	{"1.2.840.113533.7.66.11", "cast5MAC"},
+	{"1.2.840.113533.7.66.12", "pbeWithMD5AndCAST5-CBC"},
+	{"1.2.840.113533.7.66.13", "passwordBasedMac"},
+	{"1.2.840.113533.7.67", "nsn-oc"},
+	{"1.2.840.113533.7.67.0", "entrustUser"},
+	{"1.2.840.113533.7.68", "nsn-at"},
+	{"1.2.840.113533.7.68.0", "entrustCAInfo"},
+	{"1.2.840.113533.7.68.10", "attributeCertificate"},
+	{"1.2.840.113549.1.1", "pkcs-1"},
+	{"1.2.840.113549.1.1.1", "rsaEncryption"},
+	{"1.2.840.113549.1.1.2", "md2WithRSAEncryption"},
+	{"1.2.840.113549.1.1.3", "md4WithRSAEncryption"},
+	{"1.2.840.113549.1.1.4", "md5WithRSAEncryption"},
+	{"1.2.840.113549.1.1.5", "sha1WithRSAEncryption"},
+	{"1.2.840.113549.1.1.7", "rsaOAEP"},
+	{"1.2.840.113549.1.1.8", "pkcs1-MGF"},
+	{"1.2.840.113549.1.1.9", "rsaOAEP-pSpecified"},
+	{"1.2.840.113549.1.1.10", "rsaPSS"},
+	{"1.2.840.113549.1.1.11", "sha256WithRSAEncryption"},
+	{"1.2.840.113549.1.1.12", "sha384WithRSAEncryption"},
+	{"1.2.840.113549.1.1.13", "sha512WithRSAEncryption"},
+	{"1.2.840.113549.1.1.14", "sha224WithRSAEncryption"},
+	{"1.2.840.113549.1.1.6", "rsaOAEPEncryptionSET"},
+	{"1.2.840.113549.1.2", "bsafeRsaEncr"},
+	{"1.2.840.113549.1.3", "pkcs-3"},
+	{"1.2.840.113549.1.3.1", "dhKeyAgreement"},
+	{"1.2.840.113549.1.5", "pkcs-5"},
+	{"1.2.840.113549.1.5.1", "pbeWithMD2AndDES-CBC"},
+	{"1.2.840.113549.1.5.3", "pbeWithMD5AndDES-CBC"},
+	{"1.2.840.113549.1.5.4", "pbeWithMD2AndRC2-CBC"},
+	{"1.2.840.113549.1.5.6", "pbeWithMD5AndRC2-CBC"},
+	{"1.2.840.113549.1.5.9", "pbeWithMD5AndXOR"},
+	{"1.2.840.113549.1.5.10", "pbeWithSHAAndDES-CBC"},
+	{"1.2.840.113549.1.5.12", "pkcs5PBKDF2"},
+	{"1.2.840.113549.1.5.13", "pkcs5PBES2"},
+	{"1.2.840.113549.1.5.14", "pkcs5PBMAC1"},
+	{"1.2.840.113549.1.7", "pkcs-7"},
+	{"1.2.840.113549.1.7.1", "data"},
+	{"1.2.840.113549.1.7.2", "signedData"},
+	{"1.2.840.113549.1.7.3", "envelopedData"},
+	{"1.2.840.113549.1.7.4", "signedAndEnvelopedData"},
+	{"1.2.840.113549.1.7.5", "digestedData"},
+	{"1.2.840.113549.1.7.6", "encryptedData"},
+	{"1.2.840.113549.1.7.7", "dataWithAttributes"},
+	{"1.2.840.113549.1.7.8", "encryptedPrivateKeyInfo"},
+	{"1.2.840.113549.1.9", "pkcs-9"},
+	{"1.2.840.113549.1.9.1", "emailAddress"},
+	{"1.2.840.113549.1.9.2", "unstructuredName"},
+	{"1.2.840.113549.1.9.3", "contentType"},
+	{"1.2.840.113549.1.9.4", "messageDigest"},
+	{"1.2.840.113549.1.9.5", "signingTime"},
+	{"1.2.840.113549.1.9.6", "countersignature"},
+	{"1.2.840.113549.1.9.7", "challengePassword"},
+	{"1.2.840.113549.1.9.8", "unstructuredAddress"},
+	{"1.2.840.113549.1.9.9", "extendedCertificateAttributes"},
+	{"1.2.840.113549.1.9.10", "issuerAndSerialNumber"},
+	{"1.2.840.113549.1.9.11", "passwordCheck"},
+	{"1.2.840.113549.1.9.12", "publicKey"},
+	{"1.2.840.113549.1.9.13", "signingDescription"},
+	{"1.2.840.113549.1.9.14", "extensionRequest"},
+	{"1.2.840.113549.1.9.15", "sMIMECapabilities"},
+	{"1.2.840.113549.1.9.15.1", "preferSignedData"},
+	{"1.2.840.113549.1.9.15.2", "canNotDecryptAny"},
+	{"1.2.840.113549.1.9.15.3", "receiptRequest"},
+	{"1.2.840.113549.1.9.15.4", "receipt"},
+	{"1.2.840.113549.1.9.15.5", "contentHints"},
+	{"1.2.840.113549.1.9.15.6", "mlExpansionHistory"},
+	{"1.2.840.113549.1.9.16", "id-sMIME"},
+	{"1.2.840.113549.1.9.16.0", "id-mod"},
+	{"1.2.840.113549.1.9.16.0.1", "id-mod-cms"},
+	{"1.2.840.113549.1.9.16.0.2", "id-mod-ess"},
+	{"1.2.840.113549.1.9.16.0.3", "id-mod-oid"},
+	{"1.2.840.113549.1.9.16.0.4", "id-mod-msg-v3"},
+	{"1.2.840.113549.1.9.16.0.5", "id-mod-ets-eSignature-88"},
+	{"1.2.840.113549.1.9.16.0.6", "id-mod-ets-eSignature-97"},
+	{"1.2.840.113549.1.9.16.0.7", "id-mod-ets-eSigPolicy-88"},
+	{"1.2.840.113549.1.9.16.0.8", "id-mod-ets-eSigPolicy-88"},
+	{"1.2.840.113549.1.9.16.1", "contentType"},
+	{"1.2.840.113549.1.9.16.1.1", "receipt"},
+	{"1.2.840.113549.1.9.16.1.2", "authData"},
+	{"1.2.840.113549.1.9.16.1.3", "publishCert"},
+	{"1.2.840.113549.1.9.16.1.4", "tSTInfo"},
+	{"1.2.840.113549.1.9.16.1.5", "tDTInfo"},
+	{"1.2.840.113549.1.9.16.1.6", "contentInfo"},
+	{"1.2.840.113549.1.9.16.1.7", "dVCSRequestData"},
+	{"1.2.840.113549.1.9.16.1.8", "dVCSResponseData"},
+	{"1.2.840.113549.1.9.16.1.9", "compressedData"},
+	{"1.2.840.113549.1.9.16.1.10", "scvpCertValRequest"},
+	{"1.2.840.113549.1.9.16.1.11", "scvpCertValResponse"},
+	{"1.2.840.113549.1.9.16.1.12", "scvpValPolRequest"},
+	{"1.2.840.113549.1.9.16.1.13", "scvpValPolResponse"},
+	{"1.2.840.113549.1.9.16.1.14", "attrCertEncAttrs"},
+	{"1.2.840.113549.1.9.16.1.15", "tSReq"},
+	{"1.2.840.113549.1.9.16.1.16", "firmwarePackage"},
+	{"1.2.840.113549.1.9.16.1.17", "firmwareLoadReceipt"},
+	{"1.2.840.113549.1.9.16.1.18", "firmwareLoadError"},
+	{"1.2.840.113549.1.9.16.1.19", "contentCollection"},
+	{"1.2.840.113549.1.9.16.1.20", "contentWithAttrs"},
+	{"1.2.840.113549.1.9.16.1.21", "encKeyWithID"},
+	{"1.2.840.113549.1.9.16.1.22", "encPEPSI"},
+	{"1.2.840.113549.1.9.16.1.23", "authEnvelopedData"},
+	{"1.2.840.113549.1.9.16.1.24", "routeOriginAttest"},
+	{"1.2.840.113549.1.9.16.1.25", "symmetricKeyPackage"},
+	{"1.2.840.113549.1.9.16.1.26", "rpkiManifest"},
+	{"1.2.840.113549.1.9.16.1.27", "asciiTextWithCRLF"},
+	{"1.2.840.113549.1.9.16.1.28", "xml"},
+	{"1.2.840.113549.1.9.16.1.29", "pdf"},
+	{"1.2.840.113549.1.9.16.1.30", "postscript"},
+	{"1.2.840.113549.1.9.16.1.31", "timestampedData"},
+	{"1.2.840.113549.1.9.16.1.32", "asAdjacencyAttest"},
+	{"1.2.840.113549.1.9.16.1.33", "rpkiTrustAnchor"},
+	{"1.2.840.113549.1.9.16.1.34", "trustAnchorList"},
+	{"1.2.840.113549.1.9.16.2", "authenticatedAttributes"},
+	{"1.2.840.113549.1.9.16.2.1", "receiptRequest"},
+	{"1.2.840.113549.1.9.16.2.2", "securityLabel"},
+	{"1.2.840.113549.1.9.16.2.3", "mlExpandHistory"},
+	{"1.2.840.113549.1.9.16.2.4", "contentHint"},
+	{"1.2.840.113549.1.9.16.2.5", "msgSigDigest"},
+	{"1.2.840.113549.1.9.16.2.6", "encapContentType"},
+	{"1.2.840.113549.1.9.16.2.7", "contentIdentifier"},
+	{"1.2.840.113549.1.9.16.2.8", "macValue"},
+	{"1.2.840.113549.1.9.16.2.9", "equivalentLabels"},
+	{"1.2.840.113549.1.9.16.2.10", "contentReference"},
+	{"1.2.840.113549.1.9.16.2.11", "encrypKeyPref"},
+	{"1.2.840.113549.1.9.16.2.12", "signingCertificate"},
+	{"1.2.840.113549.1.9.16.2.13", "smimeEncryptCerts"},
+	{"1.2.840.113549.1.9.16.2.14", "timeStampToken"},
+	{"1.2.840.113549.1.9.16.2.15", "sigPolicyId"},
+	{"1.2.840.113549.1.9.16.2.16", "commitmentType"},
+	{"1.2.840.113549.1.9.16.2.17", "signerLocation"},
+	{"1.2.840.113549.1.9.16.2.18", "signerAttr"},
+	{"1.2.840.113549.1.9.16.2.19", "otherSigCert"},
+	{"1.2.840.113549.1.9.16.2.20", "contentTimestamp"},
+	{"1.2.840.113549.1.9.16.2.21", "certificateRefs"},
+	{"1.2.840.113549.1.9.16.2.22", "revocationRefs"},
+	{"1.2.840.113549.1.9.16.2.23", "certValues"},
+	{"1.2.840.113549.1.9.16.2.24", "revocationValues"},
+	{"1.2.840.113549.1.9.16.2.25", "escTimeStamp"},
+	{"1.2.840.113549.1.9.16.2.26", "certCRLTimestamp"},
+	{"1.2.840.113549.1.9.16.2.27", "archiveTimeStamp"},
+	{"1.2.840.113549.1.9.16.2.28", "signatureType"},
+	{"1.2.840.113549.1.9.16.2.29", "dvcsDvc"},
+	{"1.2.840.113549.1.9.16.2.30", "cekReference"},
+	{"1.2.840.113549.1.9.16.2.31", "maxCEKDecrypts"},
+	{"1.2.840.113549.1.9.16.2.32", "kekDerivationAlg"},
+	{"1.2.840.113549.1.9.16.2.33", "intendedRecipients"},
+	{"1.2.840.113549.1.9.16.2.34", "cmcUnsignedData"},
+	{"1.2.840.113549.1.9.16.2.35", "fwPackageID"},
+	{"1.2.840.113549.1.9.16.2.36", "fwTargetHardwareIDs"},
+	{"1.2.840.113549.1.9.16.2.37", "fwDecryptKeyID"},
+	{"1.2.840.113549.1.9.16.2.38", "fwImplCryptAlgs"},
+	{"1.2.840.113549.1.9.16.2.39", "fwWrappedFirmwareKey"},
+	{"1.2.840.113549.1.9.16.2.40", "fwCommunityIdentifiers"},
+	{"1.2.840.113549.1.9.16.2.41", "fwPkgMessageDigest"},
+	{"1.2.840.113549.1.9.16.2.42", "fwPackageInfo"},
+	{"1.2.840.113549.1.9.16.2.43", "fwImplCompressAlgs"},
+	{"1.2.840.113549.1.9.16.2.44", "etsAttrCertificateRefs"},
+	{"1.2.840.113549.1.9.16.2.45", "etsAttrRevocationRefs"},
+	{"1.2.840.113549.1.9.16.2.46", "binarySigningTime"},
+	{"1.2.840.113549.1.9.16.2.47", "signingCertificateV2"},
+	{"1.2.840.113549.1.9.16.2.48", "etsArchiveTimeStampV2"},
+	{"1.2.840.113549.1.9.16.2.49", "erInternal"},
+	{"1.2.840.113549.1.9.16.2.50", "erExternal"},
+	{"1.2.840.113549.1.9.16.2.51", "multipleSignatures"},
+	{"1.2.840.113549.1.9.16.3.1", "esDHwith3DES"},
+	{"1.2.840.113549.1.9.16.3.2", "esDHwithRC2"},
+	{"1.2.840.113549.1.9.16.3.3", "3desWrap"},
+	{"1.2.840.113549.1.9.16.3.4", "rc2Wrap"},
+	{"1.2.840.113549.1.9.16.3.5", "esDH"},
+	{"1.2.840.113549.1.9.16.3.6", "cms3DESwrap"},
+	{"1.2.840.113549.1.9.16.3.7", "cmsRC2wrap"},
+	{"1.2.840.113549.1.9.16.3.8", "zlib"},
+	{"1.2.840.113549.1.9.16.3.9", "pwriKEK"},
+	{"1.2.840.113549.1.9.16.3.10", "ssDH"},
+	{"1.2.840.113549.1.9.16.3.11", "hmacWith3DESwrap"},
+	{"1.2.840.113549.1.9.16.3.12", "hmacWithAESwrap"},
+	{"1.2.840.113549.1.9.16.3.13", "md5XorExperiment"},
+	{"1.2.840.113549.1.9.16.3.14", "rsaKEM"},
+	{"1.2.840.113549.1.9.16.3.15", "authEnc128"},
+	{"1.2.840.113549.1.9.16.3.16", "authEnc256"},
+	{"1.2.840.113549.1.9.16.4.1", "certDist-ldap"},
+	{"1.2.840.113549.1.9.16.5.1", "sigPolicyQualifier-spuri.x"},
+	{"1.2.840.113549.1.9.16.5.2", "sigPolicyQualifier-spUserNotice"},
+	{"1.2.840.113549.1.9.16.6.1", "proofOfOrigin"},
+	{"1.2.840.113549.1.9.16.6.2", "proofOfReceipt"},
+	{"1.2.840.113549.1.9.16.6.3", "proofOfDelivery"},
+	{"1.2.840.113549.1.9.16.6.4", "proofOfSender"},
+	{"1.2.840.113549.1.9.16.6.5", "proofOfApproval"},
+	{"1.2.840.113549.1.9.16.6.6", "proofOfCreation"},
+	{"1.2.840.113549.1.9.16.8.1", "glUseKEK"},
+	{"1.2.840.113549.1.9.16.8.2", "glDelete"},
+	{"1.2.840.113549.1.9.16.8.3", "glAddMember"},
+	{"1.2.840.113549.1.9.16.8.4", "glDeleteMember"},
+	{"1.2.840.113549.1.9.16.8.5", "glRekey"},
+	{"1.2.840.113549.1.9.16.8.6", "glAddOwner"},
+	{"1.2.840.113549.1.9.16.8.7", "glRemoveOwner"},
+	{"1.2.840.113549.1.9.16.8.8", "glkCompromise"},
+	{"1.2.840.113549.1.9.16.8.9", "glkRefresh"},
+	{"1.2.840.113549.1.9.16.8.10", "glFailInfo"},
+	{"1.2.840.113549.1.9.16.8.11", "glaQueryRequest"},
+	{"1.2.840.113549.1.9.16.8.12", "glaQueryResponse"},
+	{"1.2.840.113549.1.9.16.8.13", "glProvideCert"},
+	{"1.2.840.113549.1.9.16.8.14", "glUpdateCert"},
+	{"1.2.840.113549.1.9.16.8.15", "glKey"},
+	{"1.2.840.113549.1.9.16.9", "signatureTypeIdentifier"},
+	{"1.2.840.113549.1.9.16.9.1", "originatorSig"},
+	{"1.2.840.113549.1.9.16.9.2", "domainSig"},
+	{"1.2.840.113549.1.9.16.9.3", "additionalAttributesSig"},
+	{"1.2.840.113549.1.9.16.9.4", "reviewSig"},
+	{"1.2.840.113549.1.9.16.11", "capabilities"},
+	{"1.2.840.113549.1.9.16.11.1", "preferBinaryInside"},
+	{"1.2.840.113549.1.9.20", "friendlyName.(for.PKCS.#12)"},
+	{"1.2.840.113549.1.9.21", "localKeyID.(for.PKCS.#12)"},
+	{"1.2.840.113549.1.9.22", "certTypes.(for.PKCS.#12)"},
+	{"1.2.840.113549.1.9.22.1", "x509Certificate.(for.PKCS.#12)"},
+	{"1.2.840.113549.1.9.22.2", "sdsiCertificate.(for.PKCS.#12)"},
+	{"1.2.840.113549.1.9.23", "crlTypes.(for.PKCS.#12)"},
+	{"1.2.840.113549.1.9.23.1", "x509Crl.(for.PKCS.#12)"},
+	{"1.2.840.113549.1.9.24", "pkcs9objectClass"},
+	{"1.2.840.113549.1.9.25", "pkcs9attributes"},
+	{"1.2.840.113549.1.9.25.1", "pkcs15Token"},
+	{"1.2.840.113549.1.9.25.2", "encryptedPrivateKeyInfo"},
+	{"1.2.840.113549.1.9.25.3", "randomNonce"},
+	{"1.2.840.113549.1.9.25.4", "sequenceNumber"},
+	{"1.2.840.113549.1.9.25.5", "pkcs7PDU"},
+	{"1.2.840.113549.1.9.26", "pkcs9syntax"},
+	{"1.2.840.113549.1.9.27", "pkcs9matchingRules"},
+	{"1.2.840.113549.1.12", "pkcs-12"},
+	{"1.2.840.113549.1.12.1", "pkcs-12-PbeIds"},
+	{"1.2.840.113549.1.12.1.1", "pbeWithSHAAnd128BitRC4"},
+	{"1.2.840.113549.1.12.1.2", "pbeWithSHAAnd40BitRC4"},
+	{"1.2.840.113549.1.12.1.3", "pbeWithSHAAnd3-KeyTripleDES-CBC"},
+	{"1.2.840.113549.1.12.1.4", "pbeWithSHAAnd2-KeyTripleDES-CBC"},
+	{"1.2.840.113549.1.12.1.5", "pbeWithSHAAnd128BitRC2-CBC"},
+	{"1.2.840.113549.1.12.1.6", "pbeWithSHAAnd40BitRC2-CBC"},
+	{"1.2.840.113549.1.12.2", "pkcs-12-ESPVKID"},
+	{"1.2.840.113549.1.12.2.1", "pkcs-12-PKCS8KeyShrouding"},
+	{"1.2.840.113549.1.12.3", "pkcs-12-BagIds"},
+	{"1.2.840.113549.1.12.3.1", "pkcs-12-keyBagId"},
+	{"1.2.840.113549.1.12.3.2", "pkcs-12-certAndCRLBagId"},
+	{"1.2.840.113549.1.12.3.3", "pkcs-12-secretBagId"},
+	{"1.2.840.113549.1.12.3.4", "pkcs-12-safeContentsId"},
+	{"1.2.840.113549.1.12.3.5", "pkcs-12-pkcs-8ShroudedKeyBagId"},
+	{"1.2.840.113549.1.12.4", "pkcs-12-CertBagID"},
+	{"1.2.840.113549.1.12.4.1", "pkcs-12-X509CertCRLBagID"},
+	{"1.2.840.113549.1.12.4.2", "pkcs-12-SDSICertBagID"},
+	{"1.2.840.113549.1.12.5", "pkcs-12-OID"},
+	{"1.2.840.113549.1.12.5.1", "pkcs-12-PBEID"},
+	{"1.2.840.113549.1.12.5.1.1", "pkcs-12-PBEWithSha1And128BitRC4"},
+	{"1.2.840.113549.1.12.5.1.2", "pkcs-12-PBEWithSha1And40BitRC4"},
+	{"1.2.840.113549.1.12.5.1.3", "pkcs-12-PBEWithSha1AndTripleDESCBC"},
+	{"1.2.840.113549.1.12.5.1.4", "pkcs-12-PBEWithSha1And128BitRC2CBC"},
+	{"1.2.840.113549.1.12.5.1.5", "pkcs-12-PBEWithSha1And40BitRC2CBC"},
+	{"1.2.840.113549.1.12.5.1.6", "pkcs-12-PBEWithSha1AndRC4"},
+	{"1.2.840.113549.1.12.5.1.7", "pkcs-12-PBEWithSha1AndRC2CBC"},
+	{"1.2.840.113549.1.12.5.2", "pkcs-12-EnvelopingID"},
+	{"1.2.840.113549.1.12.5.2.1", "pkcs-12-RSAEncryptionWith128BitRC4"},
+	{"1.2.840.113549.1.12.5.2.2", "pkcs-12-RSAEncryptionWith40BitRC4"},
+	{"1.2.840.113549.1.12.5.2.3", "pkcs-12-RSAEncryptionWithTripleDES"},
+	{"1.2.840.113549.1.12.5.3", "pkcs-12-SignatureID"},
+	{"1.2.840.113549.1.12.5.3.1", "pkcs-12-RSASignatureWithSHA1Digest"},
+	{"1.2.840.113549.1.12.10", "pkcs-12Version1"},
+	{"1.2.840.113549.1.12.10.1", "pkcs-12BadIds"},
+	{"1.2.840.113549.1.12.10.1.1", "pkcs-12-keyBag"},
+	{"1.2.840.113549.1.12.10.1.2", "pkcs-12-pkcs-8ShroudedKeyBag"},
+	{"1.2.840.113549.1.12.10.1.3", "pkcs-12-certBag"},
+	{"1.2.840.113549.1.12.10.1.4", "pkcs-12-crlBag"},
+	{"1.2.840.113549.1.12.10.1.5", "pkcs-12-secretBag"},
+	{"1.2.840.113549.1.12.10.1.6", "pkcs-12-safeContentsBag"},
+	{"1.2.840.113549.1.15.1", "pkcs15modules"},
+	{"1.2.840.113549.1.15.2", "pkcs15attributes"},
+	{"1.2.840.113549.1.15.3", "pkcs15contentType"},
+	{"1.2.840.113549.1.15.3.1", "pkcs15content"},
+	{"1.2.840.113549.2", "digestAlgorithm"},
+	{"1.2.840.113549.2.2", "md2"},
+	{"1.2.840.113549.2.4", "md4"},
+	{"1.2.840.113549.2.5", "md5"},
+	{"1.2.840.113549.2.7", "hmacWithSHA1"},
+	{"1.2.840.113549.2.8", "hmacWithSHA224"},
+	{"1.2.840.113549.2.9", "hmacWithSHA256"},
+	{"1.2.840.113549.2.10", "hmacWithSHA384"},
+	{"1.2.840.113549.2.11", "hmacWithSHA512"},
+	{"1.2.840.113549.3", "encryptionAlgorithm"},
+	{"1.2.840.113549.3.2", "rc2CBC"},
+	{"1.2.840.113549.3.3", "rc2ECB"},
+	{"1.2.840.113549.3.4", "rc4"},
+	{"1.2.840.113549.3.5", "rc4WithMAC"},
+	{"1.2.840.113549.3.6", "desx-CBC"},
+	{"1.2.840.113549.3.7", "des-EDE3-CBC"},
+	{"1.2.840.113549.3.8", "rc5CBC"},
+	{"1.2.840.113549.3.9", "rc5-CBCPad"},
+	{"1.2.840.113549.3.10", "desCDMF"},
+	{"1.2.840.114021.1.6.1", "Identrus.unknown.policyIdentifier"},
+	{"1.2.840.114021.4.1", "identrusOCSP"},
+	{"1.2.840.113556.1.2.241", "deliveryMechanism"},
+	{"1.2.840.113556.1.2.281", "ntSecurityDescriptor"},
+	{"1.2.840.113556.1.3.0", "site-Addressing"},
+	{"1.2.840.113556.1.3.13", "classSchema"},
+	{"1.2.840.113556.1.3.14", "attributeSchema"},
+	{"1.2.840.113556.1.3.17", "mailbox-Agent"},
+	{"1.2.840.113556.1.3.22", "mailbox"},
+	{"1.2.840.113556.1.3.23", "container"},
+	{"1.2.840.113556.1.3.46", "mailRecipient"},
+	{"1.2.840.113556.1.4.145", "revision"},
+	{"1.2.840.113556.1.4.1327", "pKIDefaultKeySpec"},
+	{"1.2.840.113556.1.4.1328", "pKIKeyUsage"},
+	{"1.2.840.113556.1.4.1329", "pKIMaxIssuingDepth"},
+	{"1.2.840.113556.1.4.1330", "pKICriticalExtensions"},
+	{"1.2.840.113556.1.4.1331", "pKIExpirationPeriod"},
+	{"1.2.840.113556.1.4.1332", "pKIOverlapPeriod"},
+	{"1.2.840.113556.1.4.1333", "pKIExtendedKeyUsage"},
+	{"1.2.840.113556.1.4.1334", "pKIDefaultCSPs"},
+	{"1.2.840.113556.1.4.1335", "pKIEnrollmentAccess"},
+	{"1.2.840.113556.1.4.1429", "msPKI-RA-Signature"},
+	{"1.2.840.113556.1.4.1430", "msPKI-Enrollment-Flag"},
+	{"1.2.840.113556.1.4.1431", "msPKI-Private-Key-Flag"},
+	{"1.2.840.113556.1.4.1432", "msPKI-Certificate-Name-Flag"},
+	{"1.2.840.113556.1.4.1433", "msPKI-Minimal-Key-Size"},
+	{"1.2.840.113556.1.4.1434", "msPKI-Template-Schema-Version"},
+	{"1.2.840.113556.1.4.1435", "msPKI-Template-Minor-Revision"},
+	{"1.2.840.113556.1.4.1436", "msPKI-Cert-Template-OID"},
+	{"1.2.840.113556.1.4.1437", "msPKI-Supersede-Templates"},
+	{"1.2.840.113556.1.4.1438", "msPKI-RA-Policies"},
+	{"1.2.840.113556.1.4.1439", "msPKI-Certificate-Policy"},
+	{"1.2.840.113556.1.4.1674", "msPKI-Certificate-Application-Policy"},
+	{"1.2.840.113556.1.4.1675", "msPKI-RA-Application-Policies"},
+	{"1.2.840.113556.4.3", "microsoftExcel"},
+	{"1.2.840.113556.4.4", "titledWithOID"},
+	{"1.2.840.113556.4.5", "microsoftPowerPoint"},
+	{"1.2.840.113583.1", "adobeAcrobat"},
+	{"1.2.840.113583.1.1", "acrobatSecurity"},
+	{"1.2.840.113583.1.1.1", "pdfPassword"},
+	{"1.2.840.113583.1.1.2", "pdfDefaultSigningCredential"},
+	{"1.2.840.113583.1.1.3", "pdfDefaultEncryptionCredential"},
+	{"1.2.840.113583.1.1.4", "pdfPasswordTimeout"},
+	{"1.2.840.113583.1.1.5", "pdfAuthenticDocumentsTrust"},
+	{"1.2.840.113583.1.1.6", "pdfDynamicContentTrust"},
+	{"1.2.840.113583.1.1.7", "pdfUbiquityTrust"},
+	{"1.2.840.113583.1.1.8", "pdfRevocationInfoArchival"},
+	{"1.2.840.113583.1.1.9", "pdfX509Extension"},
+	{"1.2.840.113583.1.1.9.1", "pdfTimeStamp"},
+	{"1.2.840.113583.1.1.9.2", "pdfArchiveRevInfo"},
+	{"1.2.840.113583.1.1.10", "pdfPPLKLiteCredential"},
+	{"1.2.840.113583.1.2.", "acrobatCPS"},
+	{"1.2.840.113583.1.2.1", "pdfAuthenticDocumentsCPS"},
+	{"1.2.840.113583.1.2.2", "pdfTestCPS"},
+	{"1.2.840.113583.1.2.3", "pdfUbiquityCPS"},
+	{"1.2.840.113583.1.2.4", "pdfAdhocCPS"},
+	{"1.2.840.113583.1.7", "acrobatUbiquity"},
+	{"1.2.840.113583.1.7.1", "pdfUbiquitySubRights"},
+	{"1.2.840.113583.1.9", "acrobatExtension"},
+	{"1.2.840.113628.114.1.7", "adobePKCS7"},
+	{"1.2.840.113635.100", "appleDataSecurity"},
+	{"1.2.840.113635.100.1", "appleTrustPolicy"},
+	{"1.2.840.113635.100.1.1", "appleISignTP"},
+	{"1.2.840.113635.100.1.2", "appleX509Basic"},
+	{"1.2.840.113635.100.1.3", "appleSSLPolicy"},
+	{"1.2.840.113635.100.1.4", "appleLocalCertGenPolicy"},
+	{"1.2.840.113635.100.1.5", "appleCSRGenPolicy"},
+	{"1.2.840.113635.100.1.6", "appleCRLPolicy"},
+	{"1.2.840.113635.100.1.7", "appleOCSPPolicy"},
+	{"1.2.840.113635.100.1.8", "appleSMIMEPolicy"},
+	{"1.2.840.113635.100.1.9", "appleEAPPolicy"},
+	{"1.2.840.113635.100.1.10", "appleSWUpdateSigningPolicy"},
+	{"1.2.840.113635.100.1.11", "appleIPSecPolicy"},
+	{"1.2.840.113635.100.1.12", "appleIChatPolicy"},
+	{"1.2.840.113635.100.1.13", "appleResourceSignPolicy"},
+	{"1.2.840.113635.100.1.14", "applePKINITClientPolicy"},
+	{"1.2.840.113635.100.1.15", "applePKINITServerPolicy"},
+	{"1.2.840.113635.100.1.16", "appleCodeSigningPolicy"},
+	{"1.2.840.113635.100.1.17", "applePackageSigningPolicy"},
+	{"1.2.840.113635.100.2", "appleSecurityAlgorithm"},
+	{"1.2.840.113635.100.2.1", "appleFEE"},
+	{"1.2.840.113635.100.2.2", "appleASC"},
+	{"1.2.840.113635.100.2.3", "appleFEE_MD5"},
+	{"1.2.840.113635.100.2.4", "appleFEE_SHA1"},
+	{"1.2.840.113635.100.2.5", "appleFEED"},
+	{"1.2.840.113635.100.2.6", "appleFEEDEXP"},
+	{"1.2.840.113635.100.2.7", "appleECDSA"},
+	{"1.2.840.113635.100.3", "appleDotMacCertificate"},
+	{"1.2.840.113635.100.3.1", "appleDotMacCertificateRequest"},
+	{"1.2.840.113635.100.3.2", "appleDotMacCertificateExtension"},
+	{"1.2.840.113635.100.3.3", "appleDotMacCertificateRequestValues"},
+	{"1.2.840.113635.100.4", "appleExtendedKeyUsage"},
+	{"1.2.840.113635.100.4.1", "appleCodeSigning"},
+	{"1.2.840.113635.100.4.1.1", "appleCodeSigningDevelopment"},
+	{"1.2.840.113635.100.4.1.2", "appleSoftwareUpdateSigning"},
+	{"1.2.840.113635.100.4.1.3", "appleCodeSigningThirdParty"},
+	{"1.2.840.113635.100.4.1.4", "appleResourceSigning"},
+	{"1.2.840.113635.100.4.2", "appleIChatSigning"},
+	{"1.2.840.113635.100.4.3", "appleIChatEncryption"},
+	{"1.2.840.113635.100.4.4", "appleSystemIdentity"},
+	{"1.2.840.113635.100.4.5", "appleCryptoEnv"},
+	{"1.2.840.113635.100.4.5.1", "appleCryptoProductionEnv"},
+	{"1.2.840.113635.100.4.5.2", "appleCryptoMaintenanceEnv"},
+	{"1.2.840.113635.100.4.5.3", "appleCryptoTestEnv"},
+	{"1.2.840.113635.100.4.5.4", "appleCryptoDevelopmentEnv"},
+	{"1.2.840.113635.100.4.6", "appleCryptoQoS"},
+	{"1.2.840.113635.100.4.6.1", "appleCryptoTier0QoS"},
+	{"1.2.840.113635.100.4.6.2", "appleCryptoTier1QoS"},
+	{"1.2.840.113635.100.4.6.3", "appleCryptoTier2QoS"},
+	{"1.2.840.113635.100.4.6.4", "appleCryptoTier3QoS"},
+	{"1.2.840.113635.100.5", "appleCertificatePolicies"},
+	{"1.2.840.113635.100.5.1", "appleCertificatePolicyID"},
+	{"1.2.840.113635.100.5.2", "appleDotMacCertificatePolicyID"},
+	{"1.2.840.113635.100.5.3", "appleADCCertificatePolicyID"},
+	{"1.2.840.113635.100.6", "appleCertificateExtensions"},
+	{"1.2.840.113635.100.6.1", "appleCertificateExtensionCodeSigning"},
+	{"1.2.840.113635.100.6.1.1", "appleCertificateExtensionAppleSigning"},
+	{"1.2.840.113635.100.6.1.2", "appleCertificateExtensionADCDeveloperSigning"},
+	{"1.2.840.113635.100.6.1.3", "appleCertificateExtensionADCAppleSigning"},
+	{"1.3.6.1.4.1.311.2.1.4", "spcIndirectDataContext"},
+	{"1.3.6.1.4.1.311.2.1.10", "spcAgencyInfo"},
+	{"1.3.6.1.4.1.311.2.1.11", "spcStatementType"},
+	{"1.3.6.1.4.1.311.2.1.12", "spcSpOpusInfo"},
+	{"1.3.6.1.4.1.311.2.1.14", "certReqExtensions"},
+	{"1.3.6.1.4.1.311.2.1.15", "spcPEImageData"},
+	{"1.3.6.1.4.1.311.2.1.18", "spcRawFileData"},
+	{"1.3.6.1.4.1.311.2.1.19", "spcStructuredStorageData"},
+	{"1.3.6.1.4.1.311.2.1.20", "spcJavaClassData.(type.1)"},
+	{"1.3.6.1.4.1.311.2.1.21", "individualCodeSigning"},
+	{"1.3.6.1.4.1.311.2.1.22", "commercialCodeSigning"},
+	{"1.3.6.1.4.1.311.2.1.25", "spcLink.(type.2)"},
+	{"1.3.6.1.4.1.311.2.1.26", "spcMinimalCriteriaInfo"},
+	{"1.3.6.1.4.1.311.2.1.27", "spcFinancialCriteriaInfo"},
+	{"1.3.6.1.4.1.311.2.1.28", "spcLink.(type.3)"},
+	{"1.3.6.1.4.1.311.2.1.29", "spcHashInfoObjID"},
+	{"1.3.6.1.4.1.311.2.1.30", "spcSipInfoObjID"},
+	{"1.3.6.1.4.1.311.2.2", "ctl"},
+	{"1.3.6.1.4.1.311.2.2.1", "ctlTrustedCodesigningCAList"},
+	{"1.3.6.1.4.1.311.2.2.2", "ctlTrustedClientAuthCAList"},
+	{"1.3.6.1.4.1.311.2.2.3", "ctlTrustedServerAuthCAList"},
+	{"1.3.6.1.4.1.311.3.2.1", "timestampRequest"},
+	{"1.3.6.1.4.1.311.3.3.1", "spcRFC3161"},
+	{"1.3.6.1.4.1.311.10.1", "certTrustList"},
+	{"1.3.6.1.4.1.311.10.1.1", "sortedCtl"},
+	{"1.3.6.1.4.1.311.10.2", "nextUpdateLocation"},
+	{"1.3.6.1.4.1.311.10.3.1", "certTrustListSigning"},
+	{"1.3.6.1.4.1.311.10.3.2", "timeStampSigning"},
+	{"1.3.6.1.4.1.311.10.3.3", "serverGatedCrypto"},
+	{"1.3.6.1.4.1.311.10.3.3.1", "serialized"},
+	{"1.3.6.1.4.1.311.10.3.4", "encryptedFileSystem"},
+	{"1.3.6.1.4.1.311.10.3.5", "whqlCrypto"},
+	{"1.3.6.1.4.1.311.10.3.6", "nt5Crypto"},
+	{"1.3.6.1.4.1.311.10.3.7", "oemWHQLCrypto"},
+	{"1.3.6.1.4.1.311.10.3.8", "embeddedNTCrypto"},
+	{"1.3.6.1.4.1.311.10.3.9", "rootListSigner"},
+	{"1.3.6.1.4.1.311.10.3.10", "qualifiedSubordination"},
+	{"1.3.6.1.4.1.311.10.3.11", "keyRecovery"},
+	{"1.3.6.1.4.1.311.10.3.12", "documentSigning"},
+	{"1.3.6.1.4.1.311.10.3.13", "lifetimeSigning"},
+	{"1.3.6.1.4.1.311.10.3.14", "mobileDeviceSoftware"},
+	{"1.3.6.1.4.1.311.10.3.15", "smartDisplay"},
+	{"1.3.6.1.4.1.311.10.3.16", "cspSignature"},
+	{"1.3.6.1.4.1.311.10.3.4.1", "efsRecovery"},
+	{"1.3.6.1.4.1.311.10.4.1", "yesnoTrustAttr"},
+	{"1.3.6.1.4.1.311.10.5.1", "drm"},
+	{"1.3.6.1.4.1.311.10.5.2", "drmIndividualization"},
+	{"1.3.6.1.4.1.311.10.6.1", "licenses"},
+	{"1.3.6.1.4.1.311.10.6.2", "licenseServer"},
+	{"1.3.6.1.4.1.311.10.7.1", "keyidRdn"},
+	{"1.3.6.1.4.1.311.10.8.1", "removeCertificate"},
+	{"1.3.6.1.4.1.311.10.9.1", "crossCertDistPoints"},
+	{"1.3.6.1.4.1.311.10.10.1", "cmcAddAttributes"},
+	{"1.3.6.1.4.1.311.10.11", "certPropIdPrefix"},
+	{"1.3.6.1.4.1.311.10.11.4", "certMd5HashPropId"},
+	{"1.3.6.1.4.1.311.10.11.20", "certKeyIdentifierPropId"},
+	{"1.3.6.1.4.1.311.10.11.28", "certIssuerSerialNumberMd5HashPropId"},
+	{"1.3.6.1.4.1.311.10.11.29", "certSubjectNameMd5HashPropId"},
+	{"1.3.6.1.4.1.311.10.12.1", "anyApplicationPolicy"},
+	{"1.3.6.1.4.1.311.12", "catalog"},
+	{"1.3.6.1.4.1.311.12.1.1", "catalogList"},
+	{"1.3.6.1.4.1.311.12.1.2", "catalogListMember"},
+	{"1.3.6.1.4.1.311.12.2.1", "catalogNameValueObjID"},
+	{"1.3.6.1.4.1.311.12.2.2", "catalogMemberInfoObjID"},
+	{"1.3.6.1.4.1.311.13.1", "renewalCertificate"},
+	{"1.3.6.1.4.1.311.13.2.1", "enrolmentNameValuePair"},
+	{"1.3.6.1.4.1.311.13.2.2", "enrolmentCSP"},
+	{"1.3.6.1.4.1.311.13.2.3", "osVersion"},
+	{"1.3.6.1.4.1.311.16.4", "microsoftRecipientInfo"},
+	{"1.3.6.1.4.1.311.17.1", "pkcs12KeyProviderNameAttr"},
+	{"1.3.6.1.4.1.311.17.2", "localMachineKeyset"},
+	{"1.3.6.1.4.1.311.17.3", "pkcs12ExtendedAttributes"},
+	{"1.3.6.1.4.1.311.20.1", "autoEnrollCtlUsage"},
+	{"1.3.6.1.4.1.311.20.2", "enrollCerttypeExtension"},
+	{"1.3.6.1.4.1.311.20.2.1", "enrollmentAgent"},
+	{"1.3.6.1.4.1.311.20.2.2", "smartcardLogon"},
+	{"1.3.6.1.4.1.311.20.2.3", "universalPrincipalName"},
+	{"1.3.6.1.4.1.311.20.3", "certManifold"},
+	{"1.3.6.1.4.1.311.21.1", "cAKeyCertIndexPair"},
+	{"1.3.6.1.4.1.311.21.2", "certSrvPreviousCertHash"},
+	{"1.3.6.1.4.1.311.21.3", "crlVirtualBase"},
+	{"1.3.6.1.4.1.311.21.4", "crlNextPublish"},
+	{"1.3.6.1.4.1.311.21.5", "caExchange"},
+	{"1.3.6.1.4.1.311.21.6", "keyRecovery"},
+	{"1.3.6.1.4.1.311.21.7", "certificateTemplate"},
+	{"1.3.6.1.4.1.311.21.9", "rdnDummySigner"},
+	{"1.3.6.1.4.1.311.21.10", "applicationCertPolicies"},
+	{"1.3.6.1.4.1.311.21.11", "applicationPolicyMappings"},
+	{"1.3.6.1.4.1.311.21.12", "applicationPolicyConstraints"},
+	{"1.3.6.1.4.1.311.21.13", "archivedKey"},
+	{"1.3.6.1.4.1.311.21.14", "crlSelfCDP"},
+	{"1.3.6.1.4.1.311.21.15", "requireCertChainPolicy"},
+	{"1.3.6.1.4.1.311.21.16", "archivedKeyCertHash"},
+	{"1.3.6.1.4.1.311.21.17", "issuedCertHash"},
+	{"1.3.6.1.4.1.311.21.19", "dsEmailReplication"},
+	{"1.3.6.1.4.1.311.21.20", "requestClientInfo"},
+	{"1.3.6.1.4.1.311.21.21", "encryptedKeyHash"},
+	{"1.3.6.1.4.1.311.21.22", "certsrvCrossCaVersion"},
+	{"1.3.6.1.4.1.311.25.1", "ntdsReplication"},
+	{"1.3.6.1.4.1.311.31.1", "productUpdate"},
+	{"1.3.6.1.4.1.311.47.1.1", "systemHealth"},
+	{"1.3.6.1.4.1.311.47.1.3", "systemHealthLoophole"},
+	{"1.3.6.1.4.1.311.60.1.1", "rootProgramFlags"},
+	{"1.3.6.1.4.1.311.61.1.1", "kernelModeCodeSigning"},
+	{"1.3.6.1.4.1.311.60.2.1.1", "jurisdictionOfIncorporationL"},
+	{"1.3.6.1.4.1.311.60.2.1.2", "jurisdictionOfIncorporationSP"},
+	{"1.3.6.1.4.1.311.60.2.1.3", "jurisdictionOfIncorporationC"},
+	{"1.3.6.1.4.1.311.88", "capiCom"},
+	{"1.3.6.1.4.1.311.88.1", "capiComVersion"},
+	{"1.3.6.1.4.1.311.88.2", "capiComAttribute"},
+	{"1.3.6.1.4.1.311.88.2.1", "capiComDocumentName"},
+	{"1.3.6.1.4.1.311.88.2.2", "capiComDocumentDescription"},
+	{"1.3.6.1.4.1.311.88.3", "capiComEncryptedData"},
+	{"1.3.6.1.4.1.311.88.3.1", "capiComEncryptedContent"},
+	{"1.3.6.1.4.1.188.7.1.1", "ascom"},
+	{"1.3.6.1.4.1.188.7.1.1.1", "ideaECB"},
+	{"1.3.6.1.4.1.188.7.1.1.2", "ideaCBC"},
+	{"1.3.6.1.4.1.188.7.1.1.3", "ideaCFB"},
+	{"1.3.6.1.4.1.188.7.1.1.4", "ideaOFB"},
+	{"1.3.6.1.4.1.2428.10.1.1", "UNINETT.policyIdentifier"},
+	{"1.3.6.1.4.1.2712.10", "ICE-TEL.policyIdentifier"},
+	{"1.3.6.1.4.1.2786.1.1.1", "ICE-TEL.Italian.policyIdentifier"},
+	{"1.3.6.1.4.1.3029.1.1.1", "blowfishECB"},
+	{"1.3.6.1.4.1.3029.1.1.2", "blowfishCBC"},
+	{"1.3.6.1.4.1.3029.1.1.3", "blowfishCFB"},
+	{"1.3.6.1.4.1.3029.1.1.4", "blowfishOFB"},
+	{"1.3.6.1.4.1.3029.1.2.1", "elgamal"},
+	{"1.3.6.1.4.1.3029.1.2.1.1", "elgamalWithSHA-1"},
+	{"1.3.6.1.4.1.3029.1.2.1.2", "elgamalWithRIPEMD-160"},
+	{"1.3.6.1.4.1.3029.3.1.1", "cryptlibPresenceCheck"},
+	{"1.3.6.1.4.1.3029.3.1.2", "pkiBoot"},
+	{"1.3.6.1.4.1.3029.3.1.4", "crlExtReason"},
+	{"1.3.6.1.4.1.3029.3.1.5", "keyFeatures"},
+	{"1.3.6.1.4.1.3029.4.1", "cryptlibContent"},
+	{"1.3.6.1.4.1.3029.4.1.1", "cryptlibConfigData"},
+	{"1.3.6.1.4.1.3029.4.1.2", "cryptlibUserIndex"},
+	{"1.3.6.1.4.1.3029.4.1.3", "cryptlibUserInfo"},
+	{"1.3.6.1.4.1.3029.4.1.4", "rtcsRequest"},
+	{"1.3.6.1.4.1.3029.4.1.5", "rtcsResponse"},
+	{"1.3.6.1.4.1.3029.4.1.6", "rtcsResponseExt"},
+	{"1.3.6.1.4.1.3029.42.11172.1", "mpeg-1"},
+	{"1.3.6.1.4.1.3029.88.89.90.90.89", "xYZZY.policyIdentifier"},
+	{"1.3.6.1.4.1.3401.8.1.1", "pgpExtension"},
+	{"1.3.6.1.4.1.3576.7", "eciaAscX12Edi"},
+	{"1.3.6.1.4.1.3576.7.1", "plainEDImessage"},
+	{"1.3.6.1.4.1.3576.7.2", "signedEDImessage"},
+	{"1.3.6.1.4.1.3576.7.5", "integrityEDImessage"},
+	{"1.3.6.1.4.1.3576.7.65", "iaReceiptMessage"},
+	{"1.3.6.1.4.1.3576.7.97", "iaStatusMessage"},
+	{"1.3.6.1.4.1.3576.8", "eciaEdifact"},
+	{"1.3.6.1.4.1.3576.9", "eciaNonEdi"},
+	{"1.3.6.1.4.1.4146", "Globalsign"},
+	{"1.3.6.1.4.1.4146.1", "globalsignPolicy"},
+	{"1.3.6.1.4.1.4146.1.10", "globalsignDVPolicy"},
+	{"1.3.6.1.4.1.4146.1.20", "globalsignOVPolicy"},
+	{"1.3.6.1.4.1.4146.1.30", "globalsignTSAPolicy"},
+	{"1.3.6.1.4.1.4146.1.40", "globalsignClientCertPolicy"},
+	{"1.3.6.1.4.1.4146.1.50", "globalsignCodeSignPolicy"},
+	{"1.3.6.1.4.1.4146.1.60", "globalsignRootSignPolicy"},
+	{"1.3.6.1.4.1.4146.1.70", "globalsignTrustedRootPolicy"},
+	{"1.3.6.1.4.1.4146.1.80", "globalsignEDIClientPolicy"},
+	{"1.3.6.1.4.1.4146.1.81", "globalsignEDIServerPolicy"},
+	{"1.3.6.1.4.1.4146.1.90", "globalsignTPMRootPolicy"},
+	{"1.3.6.1.4.1.4146.1.95", "globalsignOCSPPolicy"},
+	{"1.3.6.1.4.1.5309.1", "edelWebPolicy"},
+	{"1.3.6.1.4.1.5309.1.2", "edelWebCustomerPolicy"},
+	{"1.3.6.1.4.1.5309.1.2.1", "edelWebClepsydrePolicy"},
+	{"1.3.6.1.4.1.5309.1.2.2", "edelWebExperimentalTSAPolicy"},
+	{"1.3.6.1.4.1.5309.1.2.3", "edelWebOpenEvidenceTSAPolicy"},
+	{"1.3.6.1.4.1.5472", "timeproof"},
+	{"1.3.6.1.4.1.5472.1", "tss"},
+	{"1.3.6.1.4.1.5472.1.1", "tss80"},
+	{"1.3.6.1.4.1.5472.1.2", "tss380"},
+	{"1.3.6.1.4.1.5472.1.3", "tss400"},
+	{"1.3.6.1.4.1.5770.0.3", "secondaryPractices"},
+	{"1.3.6.1.4.1.5770.0.4", "physicianIdentifiers"},
+	{"1.3.6.1.4.1.6449.1.2.1.3.1", "comodoPolicy"},
+	{"1.3.6.1.4.1.6449.1.2.2.15", "wotrustPolicy"},
+	{"1.3.6.1.4.1.6449.1.3.5.2", "comodoCertifiedDeliveryService"},
+	{"1.3.6.1.4.1.6449.2.1.1", "comodoTimestampingPolicy"},
+	{"1.3.6.1.4.1.8301.3.5.1", "validityModelChain"},
+	{"1.3.6.1.4.1.8301.3.5.2", "validityModelShell"},
+	{"1.3.6.1.4.1.8231.1", "rolUnicoNacional"},
+	{"1.3.6.1.4.1.11591", "gnu"},
+	{"1.3.6.1.4.1.11591.1", "gnuRadius"},
+	{"1.3.6.1.4.1.11591.3", "gnuRadar"},
+	{"1.3.6.1.4.1.11591.12", "gnuDigestAlgorithm"},
+	{"1.3.6.1.4.1.11591.12.2", "tiger"},
+	{"1.3.6.1.4.1.11591.13", "gnuEncryptionAlgorithm"},
+	{"1.3.6.1.4.1.11591.13.2", "serpent"},
+	{"1.3.6.1.4.1.11591.13.2.1", "serpent128_ECB"},
+	{"1.3.6.1.4.1.11591.13.2.2", "serpent128_CBC"},
+	{"1.3.6.1.4.1.11591.13.2.3", "serpent128_OFB"},
+	{"1.3.6.1.4.1.11591.13.2.4", "serpent128_CFB"},
+	{"1.3.6.1.4.1.11591.13.2.21", "serpent192_ECB"},
+	{"1.3.6.1.4.1.11591.13.2.22", "serpent192_CBC"},
+	{"1.3.6.1.4.1.11591.13.2.23", "serpent192_OFB"},
+	{"1.3.6.1.4.1.11591.13.2.24", "serpent192_CFB"},
+	{"1.3.6.1.4.1.11591.13.2.41", "serpent256_ECB"},
+	{"1.3.6.1.4.1.11591.13.2.42", "serpent256_CBC"},
+	{"1.3.6.1.4.1.11591.13.2.43", "serpent256_OFB"},
+	{"1.3.6.1.4.1.11591.13.2.44", "serpent256_CFB"},
+	{"1.3.6.1.4.1.16334.509.1.1", "Northrop.Grumman.extKeyUsage?"},
+	{"1.3.6.1.4.1.16334.509.2.1", "ngcClass1"},
+	{"1.3.6.1.4.1.16334.509.2.2", "ngcClass2"},
+	{"1.3.6.1.4.1.16334.509.2.3", "ngcClass3"},
+	{"1.3.6.1.4.1.23629.1.4.2.1.1", "safenetUsageLimit"},
+	{"1.3.6.1.4.1.23629.1.4.2.1.2", "safenetEndDate"},
+	{"1.3.6.1.4.1.23629.1.4.2.1.3", "safenetStartDate"},
+	{"1.3.6.1.4.1.23629.1.4.2.1.4", "safenetAdminCert"},
+	{"1.3.6.1.4.1.23629.1.4.2.2.1", "safenetKeyDigest"},
+	{"1.3.6.1.5.5.7", "pkix"},
+	{"1.3.6.1.5.5.7.0.12", "attributeCert"},
+	{"1.3.6.1.5.5.7.1", "privateExtension"},
+	{"1.3.6.1.5.5.7.1.1", "authorityInfoAccess"},
+	{"1.3.6.1.5.5.7.1.2", "biometricInfo"},
+	{"1.3.6.1.5.5.7.1.3", "qcStatements"},
+	{"1.3.6.1.5.5.7.1.4", "acAuditIdentity"},
+	{"1.3.6.1.5.5.7.1.5", "acTargeting"},
+	{"1.3.6.1.5.5.7.1.6", "acAaControls"},
+	{"1.3.6.1.5.5.7.1.7", "ipAddrBlocks"},
+	{"1.3.6.1.5.5.7.1.8", "autonomousSysIds"},
+	{"1.3.6.1.5.5.7.1.9", "routerIdentifier"},
+	{"1.3.6.1.5.5.7.1.10", "acProxying"},
+	{"1.3.6.1.5.5.7.1.11", "subjectInfoAccess"},
+	{"1.3.6.1.5.5.7.1.12", "logoType"},
+	{"1.3.6.1.5.5.7.1.13", "wlanSSID"},
+	{"1.3.6.1.5.5.7.2", "policyQualifierIds"},
+	{"1.3.6.1.5.5.7.2.1", "cps"},
+	{"1.3.6.1.5.5.7.2.2", "unotice"},
+	{"1.3.6.1.5.5.7.2.3", "textNotice"},
+	{"1.3.6.1.5.5.7.3", "keyPurpose"},
+	{"1.3.6.1.5.5.7.3.1", "serverAuth"},
+	{"1.3.6.1.5.5.7.3.2", "clientAuth"},
+	{"1.3.6.1.5.5.7.3.3", "codeSigning"},
+	{"1.3.6.1.5.5.7.3.4", "emailProtection"},
+	{"1.3.6.1.5.5.7.3.5", "ipsecEndSystem"},
+	{"1.3.6.1.5.5.7.3.6", "ipsecTunnel"},
+	{"1.3.6.1.5.5.7.3.7", "ipsecUser"},
+	{"1.3.6.1.5.5.7.3.8", "timeStamping"},
+	{"1.3.6.1.5.5.7.3.9", "ocspSigning"},
+	{"1.3.6.1.5.5.7.3.10", "dvcs"},
+	{"1.3.6.1.5.5.7.3.11", "sbgpCertAAServerAuth"},
+	{"1.3.6.1.5.5.7.3.13", "eapOverPPP"},
+	{"1.3.6.1.5.5.7.3.14", "eapOverLAN"},
+	{"1.3.6.1.5.5.7.4", "cmpInformationTypes"},
+	{"1.3.6.1.5.5.7.4.1", "caProtEncCert"},
+	{"1.3.6.1.5.5.7.4.2", "signKeyPairTypes"},
+	{"1.3.6.1.5.5.7.4.3", "encKeyPairTypes"},
+	{"1.3.6.1.5.5.7.4.4", "preferredSymmAlg"},
+	{"1.3.6.1.5.5.7.4.5", "caKeyUpdateInfo"},
+	{"1.3.6.1.5.5.7.4.6", "currentCRL"},
+	{"1.3.6.1.5.5.7.4.7", "unsupportedOIDs"},
+	{"1.3.6.1.5.5.7.4.10", "keyPairParamReq"},
+	{"1.3.6.1.5.5.7.4.11", "keyPairParamRep"},
+	{"1.3.6.1.5.5.7.4.12", "revPassphrase"},
+	{"1.3.6.1.5.5.7.4.13", "implicitConfirm"},
+	{"1.3.6.1.5.5.7.4.14", "confirmWaitTime"},
+	{"1.3.6.1.5.5.7.4.15", "origPKIMessage"},
+	{"1.3.6.1.5.5.7.4.16", "suppLangTags"},
+	{"1.3.6.1.5.5.7.5", "crmfRegistration"},
+	{"1.3.6.1.5.5.7.5.1", "regCtrl"},
+	{"1.3.6.1.5.5.7.5.1.1", "regToken"},
+	{"1.3.6.1.5.5.7.5.1.2", "authenticator"},
+	{"1.3.6.1.5.5.7.5.1.3", "pkiPublicationInfo"},
+	{"1.3.6.1.5.5.7.5.1.4", "pkiArchiveOptions"},
+	{"1.3.6.1.5.5.7.5.1.5", "oldCertID"},
+	{"1.3.6.1.5.5.7.5.1.6", "protocolEncrKey"},
+	{"1.3.6.1.5.5.7.5.1.7", "altCertTemplate"},
+	{"1.3.6.1.5.5.7.5.1.8", "wtlsTemplate"},
+	{"1.3.6.1.5.5.7.5.2", "utf8Pairs"},
+	{"1.3.6.1.5.5.7.5.2.1", "utf8Pairs"},
+	{"1.3.6.1.5.5.7.5.2.2", "certReq"},
+	{"1.3.6.1.5.5.7.6", "algorithms"},
+	{"1.3.6.1.5.5.7.6.1", "des40"},
+	{"1.3.6.1.5.5.7.6.2", "noSignature"},
+	{"1.3.6.1.5.5.7.6.3", "dh-sig-hmac-sha1"},
+	{"1.3.6.1.5.5.7.6.4", "dh-pop"},
+	{"1.3.6.1.5.5.7.7", "cmcControls"},
+	{"1.3.6.1.5.5.7.8", "otherNames"},
+	{"1.3.6.1.5.5.7.8.1", "personalData"},
+	{"1.3.6.1.5.5.7.8.2", "userGroup"},
+	{"1.3.6.1.5.5.7.8.5", "xmppAddr"},
+	{"1.3.6.1.5.5.7.9", "personalData"},
+	{"1.3.6.1.5.5.7.9.1", "dateOfBirth"},
+	{"1.3.6.1.5.5.7.9.2", "placeOfBirth"},
+	{"1.3.6.1.5.5.7.9.3", "gender"},
+	{"1.3.6.1.5.5.7.9.4", "countryOfCitizenship"},
+	{"1.3.6.1.5.5.7.9.5", "countryOfResidence"},
+	{"1.3.6.1.5.5.7.10", "attributeCertificate"},
+	{"1.3.6.1.5.5.7.10.1", "authenticationInfo"},
+	{"1.3.6.1.5.5.7.10.2", "accessIdentity"},
+	{"1.3.6.1.5.5.7.10.3", "chargingIdentity"},
+	{"1.3.6.1.5.5.7.10.4", "group"},
+	{"1.3.6.1.5.5.7.10.5", "role"},
+	{"1.3.6.1.5.5.7.10.6", "wlanSSID"},
+	{"1.3.6.1.5.5.7.11", "personalData"},
+	{"1.3.6.1.5.5.7.11.1", "pkixQCSyntax-v1"},
+	{"1.3.6.1.5.5.7.14.2", "resourceCertificatePolicy"},
+	{"1.3.6.1.5.5.7.20", "logo"},
+	{"1.3.6.1.5.5.7.20.1", "logoLoyalty"},
+	{"1.3.6.1.5.5.7.20.2", "logoBackground"},
+	{"1.3.6.1.5.5.7.48.1", "ocsp"},
+	{"1.3.6.1.5.5.7.48.1.1", "ocspBasic"},
+	{"1.3.6.1.5.5.7.48.1.2", "ocspNonce"},
+	{"1.3.6.1.5.5.7.48.1.3", "ocspCRL"},
+	{"1.3.6.1.5.5.7.48.1.4", "ocspResponse"},
+	{"1.3.6.1.5.5.7.48.1.5", "ocspNoCheck"},
+	{"1.3.6.1.5.5.7.48.1.6", "ocspArchiveCutoff"},
+	{"1.3.6.1.5.5.7.48.1.7", "ocspServiceLocator"},
+	{"1.3.6.1.5.5.7.48.2", "caIssuers"},
+	{"1.3.6.1.5.5.7.48.3", "timeStamping"},
+	{"1.3.6.1.5.5.7.48.4", "dvcs"},
+	{"1.3.6.1.5.5.7.48.5", "caRepository"},
+	{"1.3.6.1.5.5.7.48.7", "signedObjectRepository"},
+	{"1.3.6.1.5.5.7.48.10", "rpkiManifest"},
+	{"1.3.6.1.5.5.7.48.11", "signedObject"},
+	{"1.3.6.1.5.5.8.1.1", "hmacMD5"},
+	{"1.3.6.1.5.5.8.1.2", "hmacSHA"},
+	{"1.3.6.1.5.5.8.1.3", "hmacTiger"},
+	{"1.3.6.1.5.5.8.2.2", "iKEIntermediate"},
+	{"1.3.12.2.1011.7.1", "decEncryptionAlgorithm"},
+	{"1.3.12.2.1011.7.1.2", "decDEA"},
+	{"1.3.12.2.1011.7.2", "decHashAlgorithm"},
+	{"1.3.12.2.1011.7.2.1", "decMD2"},
+	{"1.3.12.2.1011.7.2.2", "decMD4"},
+	{"1.3.12.2.1011.7.3", "decSignatureAlgorithm"},
+	{"1.3.12.2.1011.7.3.1", "decMD2withRSA"},
+	{"1.3.12.2.1011.7.3.2", "decMD4withRSA"},
+	{"1.3.12.2.1011.7.3.3", "decDEAMAC"},
+	{"1.3.14.2.26.5", "sha"},
+	{"1.3.14.3.2.1.1", "rsa"},
+	{"1.3.14.3.2.2", "md4WitRSA"},
+	{"1.3.14.3.2.3", "md5WithRSA"},
+	{"1.3.14.3.2.4", "md4WithRSAEncryption"},
+	{"1.3.14.3.2.2.1", "sqmod-N"},
+	{"1.3.14.3.2.3.1", "sqmod-NwithRSA"},
+	{"1.3.14.3.2.6", "desECB"},
+	{"1.3.14.3.2.7", "desCBC"},
+	{"1.3.14.3.2.8", "desOFB"},
+	{"1.3.14.3.2.9", "desCFB"},
+	{"1.3.14.3.2.10", "desMAC"},
+	{"1.3.14.3.2.11", "rsaSignature"},
+	{"1.3.14.3.2.12", "dsa"},
+	{"1.3.14.3.2.13", "dsaWithSHA"},
+	{"1.3.14.3.2.14", "mdc2WithRSASignature"},
+	{"1.3.14.3.2.15", "shaWithRSASignature"},
+	{"1.3.14.3.2.16", "dhWithCommonModulus"},
+	{"1.3.14.3.2.17", "desEDE"},
+	{"1.3.14.3.2.18", "sha"},
+	{"1.3.14.3.2.19", "mdc-2"},
+	{"1.3.14.3.2.20", "dsaCommon"},
+	{"1.3.14.3.2.21", "dsaCommonWithSHA"},
+	{"1.3.14.3.2.22", "rsaKeyTransport"},
+	{"1.3.14.3.2.23", "keyed-hash-seal"},
+	{"1.3.14.3.2.24", "md2WithRSASignature"},
+	{"1.3.14.3.2.25", "md5WithRSASignature"},
+	{"1.3.14.3.2.26", "sha1"},
+	{"1.3.14.3.2.27", "dsaWithSHA1"},
+	{"1.3.14.3.2.28", "dsaWithCommonSHA1"},
+	{"1.3.14.3.2.29", "sha-1WithRSAEncryption"},
+	{"1.3.14.3.3.1", "simple-strong-auth-mechanism"},
+	{"1.3.14.7.2.1.1", "ElGamal"},
+	{"1.3.14.7.2.3.1", "md2WithRSA"},
+	{"1.3.14.7.2.3.2", "md2WithElGamal"},
+	{"1.3.36.1", "document"},
+	{"1.3.36.1.1", "finalVersion"},
+	{"1.3.36.1.2", "draft"},
+	{"1.3.36.2", "sio"},
+	{"1.3.36.2.1", "sedu"},
+	{"1.3.36.3", "algorithm"},
+	{"1.3.36.3.1", "encryptionAlgorithm"},
+	{"1.3.36.3.1.1", "des"},
+	{"1.3.36.3.1.1.1", "desECB_pad"},
+	{"1.3.36.3.1.1.1.1", "desECB_ISOpad"},
+	{"1.3.36.3.1.1.2.1", "desCBC_pad"},
+	{"1.3.36.3.1.1.2.1.1", "desCBC_ISOpad"},
+	{"1.3.36.3.1.3", "des_3"},
+	{"1.3.36.3.1.3.1.1", "des_3ECB_pad"},
+	{"1.3.36.3.1.3.1.1.1", "des_3ECB_ISOpad"},
+	{"1.3.36.3.1.3.2.1", "des_3CBC_pad"},
+	{"1.3.36.3.1.3.2.1.1", "des_3CBC_ISOpad"},
+	{"1.3.36.3.1.2", "idea"},
+	{"1.3.36.3.1.2.1", "ideaECB"},
+	{"1.3.36.3.1.2.1.1", "ideaECB_pad"},
+	{"1.3.36.3.1.2.1.1.1", "ideaECB_ISOpad"},
+	{"1.3.36.3.1.2.2", "ideaCBC"},
+	{"1.3.36.3.1.2.2.1", "ideaCBC_pad"},
+	{"1.3.36.3.1.2.2.1.1", "ideaCBC_ISOpad"},
+	{"1.3.36.3.1.2.3", "ideaOFB"},
+	{"1.3.36.3.1.2.4", "ideaCFB"},
+	{"1.3.36.3.1.4", "rsaEncryption"},
+	{"1.3.36.3.1.4.512.17", "rsaEncryptionWithlmod512expe17"},
+	{"1.3.36.3.1.5", "bsi-1"},
+	{"1.3.36.3.1.5.1", "bsi_1ECB_pad"},
+	{"1.3.36.3.1.5.2", "bsi_1CBC_pad"},
+	{"1.3.36.3.1.5.2.1", "bsi_1CBC_PEMpad"},
+	{"1.3.36.3.2", "hashAlgorithm"},
+	{"1.3.36.3.2.1", "ripemd160"},
+	{"1.3.36.3.2.2", "ripemd128"},
+	{"1.3.36.3.2.3", "ripemd256"},
+	{"1.3.36.3.2.4", "mdc2singleLength"},
+	{"1.3.36.3.2.5", "mdc2doubleLength"},
+	{"1.3.36.3.3", "signatureAlgorithm"},
+	{"1.3.36.3.3.1", "rsaSignature"},
+	{"1.3.36.3.3.1.1", "rsaSignatureWithsha1"},
+	{"1.3.36.3.3.1.1.512.2", "rsaSignatureWithsha1_l512_l2"},
+	{"1.3.36.3.3.1.1.640.2", "rsaSignatureWithsha1_l640_l2"},
+	{"1.3.36.3.3.1.1.768.2", "rsaSignatureWithsha1_l768_l2"},
+	{"1.3.36.3.3.1.1.896.2", "rsaSignatureWithsha1_l896_l2"},
+	{"1.3.36.3.3.1.1.1024.2", "rsaSignatureWithsha1_l1024_l2"},
+	{"1.3.36.3.3.1.1.512.3", "rsaSignatureWithsha1_l512_l3"},
+	{"1.3.36.3.3.1.1.640.3", "rsaSignatureWithsha1_l640_l3"},
+	{"1.3.36.3.3.1.1.768.3", "rsaSignatureWithsha1_l768_l3"},
+	{"1.3.36.3.3.1.1.896.3", "rsaSignatureWithsha1_l896_l3"},
+	{"1.3.36.3.3.1.1.1024.3", "rsaSignatureWithsha1_l1024_l3"},
+	{"1.3.36.3.3.1.1.512.5", "rsaSignatureWithsha1_l512_l5"},
+	{"1.3.36.3.3.1.1.640.5", "rsaSignatureWithsha1_l640_l5"},
+	{"1.3.36.3.3.1.1.768.5", "rsaSignatureWithsha1_l768_l5"},
+	{"1.3.36.3.3.1.1.896.5", "rsaSignatureWithsha1_l896_l5"},
+	{"1.3.36.3.3.1.1.1024.5", "rsaSignatureWithsha1_l1024_l5"},
+	{"1.3.36.3.3.1.1.512.9", "rsaSignatureWithsha1_l512_l9"},
+	{"1.3.36.3.3.1.1.640.9", "rsaSignatureWithsha1_l640_l9"},
+	{"1.3.36.3.3.1.1.768.9", "rsaSignatureWithsha1_l768_l9"},
+	{"1.3.36.3.3.1.1.896.9", "rsaSignatureWithsha1_l896_l9"},
+	{"1.3.36.3.3.1.1.1024.9", "rsaSignatureWithsha1_l1024_l9"},
+	{"1.3.36.3.3.1.1.512.11", "rsaSignatureWithsha1_l512_l11"},
+	{"1.3.36.3.3.1.1.640.11", "rsaSignatureWithsha1_l640_l11"},
+	{"1.3.36.3.3.1.1.768.11", "rsaSignatureWithsha1_l768_l11"},
+	{"1.3.36.3.3.1.1.896.11", "rsaSignatureWithsha1_l896_l11"},
+	{"1.3.36.3.3.1.1.1024.11", "rsaSignatureWithsha1_l1024_l11"},
+	{"1.3.36.3.3.1.2", "rsaSignatureWithripemd160"},
+	{"1.3.36.3.3.1.2.512.2", "rsaSignatureWithripemd160_l512_l2"},
+	{"1.3.36.3.3.1.2.640.2", "rsaSignatureWithripemd160_l640_l2"},
+	{"1.3.36.3.3.1.2.768.2", "rsaSignatureWithripemd160_l768_l2"},
+	{"1.3.36.3.3.1.2.896.2", "rsaSignatureWithripemd160_l896_l2"},
+	{"1.3.36.3.3.1.2.1024.2", "rsaSignatureWithripemd160_l1024_l2"},
+	{"1.3.36.3.3.1.2.512.3", "rsaSignatureWithripemd160_l512_l3"},
+	{"1.3.36.3.3.1.2.640.3", "rsaSignatureWithripemd160_l640_l3"},
+	{"1.3.36.3.3.1.2.768.3", "rsaSignatureWithripemd160_l768_l3"},
+	{"1.3.36.3.3.1.2.896.3", "rsaSignatureWithripemd160_l896_l3"},
+	{"1.3.36.3.3.1.2.1024.3", "rsaSignatureWithripemd160_l1024_l3"},
+	{"1.3.36.3.3.1.2.512.5", "rsaSignatureWithripemd160_l512_l5"},
+	{"1.3.36.3.3.1.2.640.5", "rsaSignatureWithripemd160_l640_l5"},
+	{"1.3.36.3.3.1.2.768.5", "rsaSignatureWithripemd160_l768_l5"},
+	{"1.3.36.3.3.1.2.896.5", "rsaSignatureWithripemd160_l896_l5"},
+	{"1.3.36.3.3.1.2.1024.5", "rsaSignatureWithripemd160_l1024_l5"},
+	{"1.3.36.3.3.1.2.512.9", "rsaSignatureWithripemd160_l512_l9"},
+	{"1.3.36.3.3.1.2.640.9", "rsaSignatureWithripemd160_l640_l9"},
+	{"1.3.36.3.3.1.2.768.9", "rsaSignatureWithripemd160_l768_l9"},
+	{"1.3.36.3.3.1.2.896.9", "rsaSignatureWithripemd160_l896_l9"},
+	{"1.3.36.3.3.1.2.1024.9", "rsaSignatureWithripemd160_l1024_l9"},
+	{"1.3.36.3.3.1.2.512.11", "rsaSignatureWithripemd160_l512_l11"},
+	{"1.3.36.3.3.1.2.640.11", "rsaSignatureWithripemd160_l640_l11"},
+	{"1.3.36.3.3.1.2.768.11", "rsaSignatureWithripemd160_l768_l11"},
+	{"1.3.36.3.3.1.2.896.11", "rsaSignatureWithripemd160_l896_l11"},
+	{"1.3.36.3.3.1.2.1024.11", "rsaSignatureWithripemd160_l1024_l11"},
+	{"1.3.36.3.3.1.3", "rsaSignatureWithrimpemd128"},
+	{"1.3.36.3.3.1.4", "rsaSignatureWithrimpemd256"},
+	{"1.3.36.3.3.2", "ecsieSign"},
+	{"1.3.36.3.3.2.1", "ecsieSignWithsha1"},
+	{"1.3.36.3.3.2.2", "ecsieSignWithripemd160"},
+	{"1.3.36.3.3.2.3", "ecsieSignWithmd2"},
+	{"1.3.36.3.3.2.4", "ecsieSignWithmd5"},
+	{"1.3.36.3.3.2.8.1.1.1", "brainpoolP160r1"},
+	{"1.3.36.3.3.2.8.1.1.2", "brainpoolP160t1"},
+	{"1.3.36.3.3.2.8.1.1.3", "brainpoolP192r1"},
+	{"1.3.36.3.3.2.8.1.1.4", "brainpoolP192t1"},
+	{"1.3.36.3.3.2.8.1.1.5", "brainpoolP224r1"},
+	{"1.3.36.3.3.2.8.1.1.6", "brainpoolP224t1"},
+	{"1.3.36.3.3.2.8.1.1.7", "brainpoolP256r1"},
+	{"1.3.36.3.3.2.8.1.1.8", "brainpoolP256t1"},
+	{"1.3.36.3.3.2.8.1.1.9", "brainpoolP320r1"},
+	{"1.3.36.3.3.2.8.1.1.10", "brainpoolP320t1"},
+	{"1.3.36.3.3.2.8.1.1.11", "brainpoolP384r1"},
+	{"1.3.36.3.3.2.8.1.1.12", "brainpoolP384t1"},
+	{"1.3.36.3.3.2.8.1.1.13", "brainpoolP512r1"},
+	{"1.3.36.3.3.2.8.1.1.14", "brainpoolP512t1"},
+	{"1.3.36.3.4", "signatureScheme"},
+	{"1.3.36.3.4.1", "sigS_ISO9796-1"},
+	{"1.3.36.3.4.2", "sigS_ISO9796-2"},
+	{"1.3.36.3.4.2.1", "sigS_ISO9796-2Withred"},
+	{"1.3.36.3.4.2.2", "sigS_ISO9796-2Withrsa"},
+	{"1.3.36.3.4.2.3", "sigS_ISO9796-2Withrnd"},
+	{"1.3.36.4", "attribute"},
+	{"1.3.36.5", "policy"},
+	{"1.3.36.6", "api"},
+	{"1.3.36.6.1", "manufacturer-specific_api"},
+	{"1.3.36.6.1.1", "utimaco-api"},
+	{"1.3.36.6.2", "functionality-specific_api"},
+	{"1.3.36.7", "keymgmnt"},
+	{"1.3.36.7.1", "keyagree"},
+	{"1.3.36.7.1.1", "bsiPKE"},
+	{"1.3.36.7.2", "keytrans"},
+	{"1.3.36.7.2.1", "encISO9796-2Withrsa"},
+	{"1.3.36.8.1.1", "Teletrust.SigGConform.policyIdentifier"},
+	{"1.3.36.8.2.1", "directoryService"},
+	{"1.3.36.8.3.1", "dateOfCertGen"},
+	{"1.3.36.8.3.2", "procuration"},
+	{"1.3.36.8.3.3", "admission"},
+	{"1.3.36.8.3.4", "monetaryLimit"},
+	{"1.3.36.8.3.5", "declarationOfMajority"},
+	{"1.3.36.8.3.6", "integratedCircuitCardSerialNumber"},
+	{"1.3.36.8.3.7", "pKReference"},
+	{"1.3.36.8.3.8", "restriction"},
+	{"1.3.36.8.3.9", "retrieveIfAllowed"},
+	{"1.3.36.8.3.10", "requestedCertificate"},
+	{"1.3.36.8.3.11", "namingAuthorities"},
+	{"1.3.36.8.3.11.1", "rechtWirtschaftSteuern"},
+	{"1.3.36.8.3.11.1.1", "rechtsanwaeltin"},
+	{"1.3.36.8.3.11.1.2", "rechtsanwalt"},
+	{"1.3.36.8.3.11.1.3", "rechtsBeistand"},
+	{"1.3.36.8.3.11.1.4", "steuerBeraterin"},
+	{"1.3.36.8.3.11.1.5", "steuerBerater"},
+	{"1.3.36.8.3.11.1.6", "steuerBevollmaechtigte"},
+	{"1.3.36.8.3.11.1.7", "steuerBevollmaechtigter"},
+	{"1.3.36.8.3.11.1.8", "notarin"},
+	{"1.3.36.8.3.11.1.9", "notar"},
+	{"1.3.36.8.3.11.1.10", "notarVertreterin"},
+	{"1.3.36.8.3.11.1.11", "notarVertreter"},
+	{"1.3.36.8.3.11.1.12", "notariatsVerwalterin"},
+	{"1.3.36.8.3.11.1.13", "notariatsVerwalter"},
+	{"1.3.36.8.3.11.1.14", "wirtschaftsPrueferin"},
+	{"1.3.36.8.3.11.1.15", "wirtschaftsPruefer"},
+	{"1.3.36.8.3.11.1.16", "vereidigteBuchprueferin"},
+	{"1.3.36.8.3.11.1.17", "vereidigterBuchpruefer"},
+	{"1.3.36.8.3.11.1.18", "patentAnwaeltin"},
+	{"1.3.36.8.3.11.1.19", "patentAnwalt"},
+	{"1.3.36.8.3.12", "certInDirSince"},
+	{"1.3.36.8.3.13", "certHash"},
+	{"1.3.36.8.3.14", "nameAtBirth"},
+	{"1.3.36.8.3.15", "additionalInformation"},
+	{"1.3.36.8.4.1", "personalData"},
+	{"1.3.36.8.4.8", "restriction"},
+	{"1.3.36.8.5.1.1.1", "rsaIndicateSHA1"},
+	{"1.3.36.8.5.1.1.2", "rsaIndicateRIPEMD160"},
+	{"1.3.36.8.5.1.1.3", "rsaWithSHA1"},
+	{"1.3.36.8.5.1.1.4", "rsaWithRIPEMD160"},
+	{"1.3.36.8.5.1.2.1", "dsaExtended"},
+	{"1.3.36.8.5.1.2.2", "dsaWithRIPEMD160"},
+	{"1.3.36.8.6.1", "cert"},
+	{"1.3.36.8.6.2", "certRef"},
+	{"1.3.36.8.6.3", "attrCert"},
+	{"1.3.36.8.6.4", "attrRef"},
+	{"1.3.36.8.6.5", "fileName"},
+	{"1.3.36.8.6.6", "storageTime"},
+	{"1.3.36.8.6.7", "fileSize"},
+	{"1.3.36.8.6.8", "location"},
+	{"1.3.36.8.6.9", "sigNumber"},
+	{"1.3.36.8.6.10", "autoGen"},
+	{"1.3.36.8.7.1.1", "ptAdobeILL"},
+	{"1.3.36.8.7.1.2", "ptAmiPro"},
+	{"1.3.36.8.7.1.3", "ptAutoCAD"},
+	{"1.3.36.8.7.1.4", "ptBinary"},
+	{"1.3.36.8.7.1.5", "ptBMP"},
+	{"1.3.36.8.7.1.6", "ptCGM"},
+	{"1.3.36.8.7.1.7", "ptCorelCRT"},
+	{"1.3.36.8.7.1.8", "ptCorelDRW"},
+	{"1.3.36.8.7.1.9", "ptCorelEXC"},
+	{"1.3.36.8.7.1.10", "ptCorelPHT"},
+	{"1.3.36.8.7.1.11", "ptDraw"},
+	{"1.3.36.8.7.1.12", "ptDVI"},
+	{"1.3.36.8.7.1.13", "ptEPS"},
+	{"1.3.36.8.7.1.14", "ptExcel"},
+	{"1.3.36.8.7.1.15", "ptGEM"},
+	{"1.3.36.8.7.1.16", "ptGIF"},
+	{"1.3.36.8.7.1.17", "ptHPGL"},
+	{"1.3.36.8.7.1.18", "ptJPEG"},
+	{"1.3.36.8.7.1.19", "ptKodak"},
+	{"1.3.36.8.7.1.20", "ptLaTeX"},
+	{"1.3.36.8.7.1.21", "ptLotus"},
+	{"1.3.36.8.7.1.22", "ptLotusPIC"},
+	{"1.3.36.8.7.1.23", "ptMacPICT"},
+	{"1.3.36.8.7.1.24", "ptMacWord"},
+	{"1.3.36.8.7.1.25", "ptMSWfD"},
+	{"1.3.36.8.7.1.26", "ptMSWord"},
+	{"1.3.36.8.7.1.27", "ptMSWord2"},
+	{"1.3.36.8.7.1.28", "ptMSWord6"},
+	{"1.3.36.8.7.1.29", "ptMSWord8"},
+	{"1.3.36.8.7.1.30", "ptPDF"},
+	{"1.3.36.8.7.1.31", "ptPIF"},
+	{"1.3.36.8.7.1.32", "ptPostscript"},
+	{"1.3.36.8.7.1.33", "ptRTF"},
+	{"1.3.36.8.7.1.34", "ptSCITEX"},
+	{"1.3.36.8.7.1.35", "ptTAR"},
+	{"1.3.36.8.7.1.36", "ptTarga"},
+	{"1.3.36.8.7.1.37", "ptTeX"},
+	{"1.3.36.8.7.1.38", "ptText"},
+	{"1.3.36.8.7.1.39", "ptTIFF"},
+	{"1.3.36.8.7.1.40", "ptTIFF-FC"},
+	{"1.3.36.8.7.1.41", "ptUID"},
+	{"1.3.36.8.7.1.42", "ptUUEncode"},
+	{"1.3.36.8.7.1.43", "ptWMF"},
+	{"1.3.36.8.7.1.44", "ptWordPerfect"},
+	{"1.3.36.8.7.1.45", "ptWPGrph"},
+	{"1.3.101.1.4", "thawte-ce"},
+	{"1.3.101.1.4.1", "strongExtranet"},
+	{"1.3.132.0.1", "sect163k1"},
+	{"1.3.132.0.2", "sect163r1"},
+	{"1.3.132.0.3", "sect239k1"},
+	{"1.3.132.0.4", "sect113r1"},
+	{"1.3.132.0.5", "sect113r2"},
+	{"1.3.132.0.6", "secp112r1"},
+	{"1.3.132.0.7", "secp112r2"},
+	{"1.3.132.0.8", "secp160r1"},
+	{"1.3.132.0.9", "secp160k1"},
+	{"1.3.132.0.10", "secp256k1"},
+	{"1.3.132.0.15", "sect163r2"},
+	{"1.3.132.0.16", "sect283k1"},
+	{"1.3.132.0.17", "sect283r1"},
+	{"1.3.132.0.22", "sect131r1"},
+	{"1.3.132.0.23", "sect131r2"},
+	{"1.3.132.0.24", "sect193r1"},
+	{"1.3.132.0.25", "sect193r2"},
+	{"1.3.132.0.26", "sect233k1"},
+	{"1.3.132.0.27", "sect233r1"},
+	{"1.3.132.0.28", "secp128r1"},
+	{"1.3.132.0.29", "secp128r2"},
+	{"1.3.132.0.30", "secp160r2"},
+	{"1.3.132.0.31", "secp192k1"},
+	{"1.3.132.0.32", "secp224k1"},
+	{"1.3.132.0.33", "secp224r1"},
+	{"1.3.132.0.34", "secp384r1"},
+	{"1.3.132.0.35", "secp521r1"},
+	{"1.3.132.0.36", "sect409k1"},
+	{"1.3.132.0.37", "sect409r1"},
+	{"1.3.132.0.38", "sect571k1"},
+	{"1.3.132.0.39", "sect571r1"},
+	{"1.3.133.16.840.9.84", "x984"},
+	{"1.3.133.16.840.9.84.0", "x984Module"},
+	{"1.3.133.16.840.9.84.0.1", "x984Biometrics"},
+	{"1.3.133.16.840.9.84.0.2", "x984CMS"},
+	{"1.3.133.16.840.9.84.0.3", "x984Identifiers"},
+	{"1.3.133.16.840.9.84.1", "x984Biometric"},
+	{"1.3.133.16.840.9.84.1.0", "biometricUnknownType"},
+	{"1.3.133.16.840.9.84.1.1", "biometricBodyOdor"},
+	{"1.3.133.16.840.9.84.1.2", "biometricDNA"},
+	{"1.3.133.16.840.9.84.1.3", "biometricEarShape"},
+	{"1.3.133.16.840.9.84.1.4", "biometricFacialFeatures"},
+	{"1.3.133.16.840.9.84.1.5", "biometricFingerImage"},
+	{"1.3.133.16.840.9.84.1.6", "biometricFingerGeometry"},
+	{"1.3.133.16.840.9.84.1.7", "biometricHandGeometry"},
+	{"1.3.133.16.840.9.84.1.8", "biometricIrisFeatures"},
+	{"1.3.133.16.840.9.84.1.9", "biometricKeystrokeDynamics"},
+	{"1.3.133.16.840.9.84.1.10", "biometricPalm"},
+	{"1.3.133.16.840.9.84.1.11", "biometricRetina"},
+	{"1.3.133.16.840.9.84.1.12", "biometricSignature"},
+	{"1.3.133.16.840.9.84.1.13", "biometricSpeechPattern"},
+	{"1.3.133.16.840.9.84.1.14", "biometricThermalImage"},
+	{"1.3.133.16.840.9.84.1.15", "biometricVeinPattern"},
+	{"1.3.133.16.840.9.84.1.16", "biometricThermalFaceImage"},
+	{"1.3.133.16.840.9.84.1.17", "biometricThermalHandImage"},
+	{"1.3.133.16.840.9.84.1.18", "biometricLipMovement"},
+	{"1.3.133.16.840.9.84.1.19", "biometricGait"},
+	{"1.3.133.16.840.9.84.1", "x984ProcessingAlgorithm"},
+	{"1.3.133.16.840.9.84.3", "x984MatchingMethod"},
+	{"1.3.133.16.840.9.84.4", "x984FormatOwner"},
+	{"1.3.133.16.840.9.84.4.0", "x984CbeffOwner"},
+	{"1.3.133.16.840.9.84.4.1", "x984IbiaOwner"},
+	{"1.3.133.16.840.9.84.4.1.1", "ibiaOwnerSAFLINK"},
+	{"1.3.133.16.840.9.84.4.1.2", "ibiaOwnerBioscrypt"},
+	{"1.3.133.16.840.9.84.4.1.3", "ibiaOwnerVisionics"},
+	{"1.3.133.16.840.9.84.4.1.4", "ibiaOwnerInfineonTechnologiesAG"},
+	{"1.3.133.16.840.9.84.4.1.5", "ibiaOwnerIridianTechnologies"},
+	{"1.3.133.16.840.9.84.4.1.6", "ibiaOwnerVeridicom"},
+	{"1.3.133.16.840.9.84.4.1.7", "ibiaOwnerCyberSIGN"},
+	{"1.3.133.16.840.9.84.4.1.8", "ibiaOwnereCryp"},
+	{"1.3.133.16.840.9.84.4.1.9", "ibiaOwnerFingerprintCardsAB"},
+	{"1.3.133.16.840.9.84.4.1.10", "ibiaOwnerSecuGen"},
+	{"1.3.133.16.840.9.84.4.1.11", "ibiaOwnerPreciseBiometric"},
+	{"1.3.133.16.840.9.84.4.1.12", "ibiaOwnerIdentix"},
+	{"1.3.133.16.840.9.84.4.1.13", "ibiaOwnerDERMALOG"},
+	{"1.3.133.16.840.9.84.4.1.14", "ibiaOwnerLOGICO"},
+	{"1.3.133.16.840.9.84.4.1.15", "ibiaOwnerNIST"},
+	{"1.3.133.16.840.9.84.4.1.16", "ibiaOwnerA3Vision"},
+	{"1.3.133.16.840.9.84.4.1.17", "ibiaOwnerNEC"},
+	{"1.3.133.16.840.9.84.4.1.18", "ibiaOwnerSTMicroelectronics"},
+	{"1.3.133.16.840.9.84.4.1", "x984X9Owner"},
+	{"2.5.4.0", "objectClass"},
+	{"2.5.4.1", "aliasedEntryName"},
+	{"2.5.4.2", "knowledgeInformation"},
+	{"2.5.4.3", "commonName"},
+	{"2.5.4.4", "surname"},
+	{"2.5.4.5", "serialNumber"},
+	{"2.5.4.6", "countryName"},
+	{"2.5.4.7", "localityName"},
+	{"2.5.4.7.1", "collectiveLocalityName"},
+	{"2.5.4.8", "stateOrProvinceName"},
+	{"2.5.4.8.1", "collectiveStateOrProvinceName"},
+	{"2.5.4.9", "streetAddress"},
+	{"2.5.4.9.1", "collectiveStreetAddress"},
+	{"2.5.4.10", "organizationName"},
+	{"2.5.4.10.1", "collectiveOrganizationName"},
+	{"2.5.4.11", "organizationalUnitName"},
+	{"2.5.4.11.1", "collectiveOrganizationalUnitName"},
+	{"2.5.4.12", "title"},
+	{"2.5.4.13", "description"},
+	{"2.5.4.14", "searchGuide"},
+	{"2.5.4.15", "businessCategory"},
+	{"2.5.4.16", "postalAddress"},
+	{"2.5.4.16.1", "collectivePostalAddress"},
+	{"2.5.4.17", "postalCode"},
+	{"2.5.4.17.1", "collectivePostalCode"},
+	{"2.5.4.18", "postOfficeBox"},
+	{"2.5.4.18.1", "collectivePostOfficeBox"},
+	{"2.5.4.19", "physicalDeliveryOfficeName"},
+	{"2.5.4.19.1", "collectivePhysicalDeliveryOfficeName"},
+	{"2.5.4.20", "telephoneNumber"},
+	{"2.5.4.20.1", "collectiveTelephoneNumber"},
+	{"2.5.4.21", "telexNumber"},
+	{"2.5.4.21.1", "collectiveTelexNumber"},
+	{"2.5.4.22", "teletexTerminalIdentifier"},
+	{"2.5.4.22.1", "collectiveTeletexTerminalIdentifier"},
+	{"2.5.4.23", "facsimileTelephoneNumber"},
+	{"2.5.4.23.1", "collectiveFacsimileTelephoneNumber"},
+	{"2.5.4.24", "x121Address"},
+	{"2.5.4.25", "internationalISDNNumber"},
+	{"2.5.4.25.1", "collectiveInternationalISDNNumber"},
+	{"2.5.4.26", "registeredAddress"},
+	{"2.5.4.27", "destinationIndicator"},
+	{"2.5.4.28", "preferredDeliveryMehtod"},
+	{"2.5.4.29", "presentationAddress"},
+	{"2.5.4.30", "supportedApplicationContext"},
+	{"2.5.4.31", "member"},
+	{"2.5.4.32", "owner"},
+	{"2.5.4.33", "roleOccupant"},
+	{"2.5.4.34", "seeAlso"},
+	{"2.5.4.35", "userPassword"},
+	{"2.5.4.36", "userCertificate"},
+	{"2.5.4.37", "caCertificate"},
+	{"2.5.4.38", "authorityRevocationList"},
+	{"2.5.4.39", "certificateRevocationList"},
+	{"2.5.4.40", "crossCertificatePair"},
+	{"2.5.4.41", "name"},
+	{"2.5.4.42", "givenName"},
+	{"2.5.4.43", "initials"},
+	{"2.5.4.44", "generationQualifier"},
+	{"2.5.4.45", "uniqueIdentifier"},
+	{"2.5.4.46", "dnQualifier"},
+	{"2.5.4.47", "enhancedSearchGuide"},
+	{"2.5.4.48", "protocolInformation"},
+	{"2.5.4.49", "distinguishedName"},
+	{"2.5.4.50", "uniqueMember"},
+	{"2.5.4.51", "houseIdentifier"},
+	{"2.5.4.52", "supportedAlgorithms"},
+	{"2.5.4.53", "deltaRevocationList"},
+	{"2.5.4.54", "dmdName"},
+	{"2.5.4.55", "clearance"},
+	{"2.5.4.56", "defaultDirQop"},
+	{"2.5.4.57", "attributeIntegrityInfo"},
+	{"2.5.4.58", "attributeCertificate"},
+	{"2.5.4.59", "attributeCertificateRevocationList"},
+	{"2.5.4.60", "confKeyInfo"},
+	{"2.5.4.61", "aACertificate"},
+	{"2.5.4.62", "attributeDescriptorCertificate"},
+	{"2.5.4.63", "attributeAuthorityRevocationList"},
+	{"2.5.4.64", "familyInformation"},
+	{"2.5.4.65", "pseudonym"},
+	{"2.5.4.66", "communicationsService"},
+	{"2.5.4.67", "communicationsNetwork"},
+	{"2.5.4.68", "certificationPracticeStmt"},
+	{"2.5.4.69", "certificatePolicy"},
+	{"2.5.4.70", "pkiPath"},
+	{"2.5.4.71", "privPolicy"},
+	{"2.5.4.72", "role"},
+	{"2.5.4.73", "delegationPath"},
+	{"2.5.4.74", "protPrivPolicy"},
+	{"2.5.4.75", "xMLPrivilegeInfo"},
+	{"2.5.4.76", "xmlPrivPolicy"},
+	{"2.5.4.82", "permission"},
+	{"2.5.6.0", "top"},
+	{"2.5.6.1", "alias"},
+	{"2.5.6.2", "country"},
+	{"2.5.6.3", "locality"},
+	{"2.5.6.4", "organization"},
+	{"2.5.6.5", "organizationalUnit"},
+	{"2.5.6.6", "person"},
+	{"2.5.6.7", "organizationalPerson"},
+	{"2.5.6.8", "organizationalRole"},
+	{"2.5.6.9", "groupOfNames"},
+	{"2.5.6.10", "residentialPerson"},
+	{"2.5.6.11", "applicationProcess"},
+	{"2.5.6.12", "applicationEntity"},
+	{"2.5.6.13", "dSA"},
+	{"2.5.6.14", "device"},
+	{"2.5.6.15", "strongAuthenticationUser"},
+	{"2.5.6.16", "certificateAuthority"},
+	{"2.5.6.17", "groupOfUniqueNames"},
+	{"2.5.6.21", "pkiUser"},
+	{"2.5.6.22", "pkiCA"},
+	{"2.5.8.1.1", "rsa"},
+	{"2.5.29.1", "authorityKeyIdentifier"},
+	{"2.5.29.2", "keyAttributes"},
+	{"2.5.29.3", "certificatePolicies"},
+	{"2.5.29.4", "keyUsageRestriction"},
+	{"2.5.29.5", "policyMapping"},
+	{"2.5.29.6", "subtreesConstraint"},
+	{"2.5.29.7", "subjectAltName"},
+	{"2.5.29.8", "issuerAltName"},
+	{"2.5.29.9", "subjectDirectoryAttributes"},
+	{"2.5.29.10", "basicConstraints"},
+	{"2.5.29.11", "nameConstraints"},
+	{"2.5.29.12", "policyConstraints"},
+	{"2.5.29.13", "basicConstraints"},
+	{"2.5.29.14", "subjectKeyIdentifier"},
+	{"2.5.29.15", "keyUsage"},
+	{"2.5.29.16", "privateKeyUsagePeriod"},
+	{"2.5.29.17", "subjectAltName"},
+	{"2.5.29.18", "issuerAltName"},
+	{"2.5.29.19", "basicConstraints"},
+	{"2.5.29.20", "cRLNumber"},
+	{"2.5.29.21", "cRLReason"},
+	{"2.5.29.22", "expirationDate"},
+	{"2.5.29.23", "instructionCode"},
+	{"2.5.29.24", "invalidityDate"},
+	{"2.5.29.25", "cRLDistributionPoints"},
+	{"2.5.29.26", "issuingDistributionPoint"},
+	{"2.5.29.27", "deltaCRLIndicator"},
+	{"2.5.29.28", "issuingDistributionPoint"},
+	{"2.5.29.29", "certificateIssuer"},
+	{"2.5.29.30", "nameConstraints"},
+	{"2.5.29.31", "cRLDistributionPoints"},
+	{"2.5.29.32", "certificatePolicies"},
+	{"2.5.29.32.0", "anyPolicy"},
+	{"2.5.29.33", "policyMappings"},
+	{"2.5.29.34", "policyConstraints"},
+	{"2.5.29.35", "authorityKeyIdentifier"},
+	{"2.5.29.36", "policyConstraints"},
+	{"2.5.29.37", "extKeyUsage"},
+	{"2.5.29.37.0", "anyExtendedKeyUsage"},
+	{"2.5.29.38", "authorityAttributeIdentifier"},
+	{"2.5.29.39", "roleSpecCertIdentifier"},
+	{"2.5.29.40", "cRLStreamIdentifier"},
+	{"2.5.29.41", "basicAttConstraints"},
+	{"2.5.29.42", "delegatedNameConstraints"},
+	{"2.5.29.43", "timeSpecification"},
+	{"2.5.29.44", "cRLScope"},
+	{"2.5.29.45", "statusReferrals"},
+	{"2.5.29.46", "freshestCRL"},
+	{"2.5.29.47", "orderedList"},
+	{"2.5.29.48", "attributeDescriptor"},
+	{"2.5.29.49", "userNotice"},
+	{"2.5.29.50", "sOAIdentifier"},
+	{"2.5.29.51", "baseUpdateTime"},
+	{"2.5.29.52", "acceptableCertPolicies"},
+	{"2.5.29.53", "deltaInfo"},
+	{"2.5.29.54", "inhibitAnyPolicy"},
+	{"2.5.29.55", "targetInformation"},
+	{"2.5.29.56", "noRevAvail"},
+	{"2.5.29.57", "acceptablePrivilegePolicies"},
+	{"2.5.29.58", "toBeRevoked"},
+	{"2.5.29.59", "revokedGroups"},
+	{"2.5.29.60", "expiredCertsOnCRL"},
+	{"2.5.29.61", "indirectIssuer"},
+	{"2.5.29.62", "noAssertion"},
+	{"2.5.29.63", "aAissuingDistributionPoint"},
+	{"2.5.29.64", "issuedOnBehalfOf"},
+	{"2.5.29.65", "singleUse"},
+	{"2.5.29.66", "groupAC"},
+	{"2.5.29.67", "allowedAttAss"},
+	{"2.5.29.68", "attributeMappings"},
+	{"2.5.29.69", "holderNameConstraints"},
+	{"2.16.724.1.2.2.4.1", "personalDataInfo"},
+	{"2.16.840.1.101.2.1.1.1", "sdnsSignatureAlgorithm"},
+	{"2.16.840.1.101.2.1.1.2", "fortezzaSignatureAlgorithm"},
+	{"2.16.840.1.101.2.1.1.3", "sdnsConfidentialityAlgorithm"},
+	{"2.16.840.1.101.2.1.1.4", "fortezzaConfidentialityAlgorithm"},
+	{"2.16.840.1.101.2.1.1.5", "sdnsIntegrityAlgorithm"},
+	{"2.16.840.1.101.2.1.1.6", "fortezzaIntegrityAlgorithm"},
+	{"2.16.840.1.101.2.1.1.7", "sdnsTokenProtectionAlgorithm"},
+	{"2.16.840.1.101.2.1.1.8", "fortezzaTokenProtectionAlgorithm"},
+	{"2.16.840.1.101.2.1.1.9", "sdnsKeyManagementAlgorithm"},
+	{"2.16.840.1.101.2.1.1.10", "fortezzaKeyManagementAlgorithm"},
+	{"2.16.840.1.101.2.1.1.11", "sdnsKMandSigAlgorithm"},
+	{"2.16.840.1.101.2.1.1.12", "fortezzaKMandSigAlgorithm"},
+	{"2.16.840.1.101.2.1.1.13", "suiteASignatureAlgorithm"},
+	{"2.16.840.1.101.2.1.1.14", "suiteAConfidentialityAlgorithm"},
+	{"2.16.840.1.101.2.1.1.15", "suiteAIntegrityAlgorithm"},
+	{"2.16.840.1.101.2.1.1.16", "suiteATokenProtectionAlgorithm"},
+	{"2.16.840.1.101.2.1.1.17", "suiteAKeyManagementAlgorithm"},
+	{"2.16.840.1.101.2.1.1.18", "suiteAKMandSigAlgorithm"},
+	{"2.16.840.1.101.2.1.1.19", "fortezzaUpdatedSigAlgorithm"},
+	{"2.16.840.1.101.2.1.1.20", "fortezzaKMandUpdSigAlgorithms"},
+	{"2.16.840.1.101.2.1.1.21", "fortezzaUpdatedIntegAlgorithm"},
+	{"2.16.840.1.101.2.1.1.22", "keyExchangeAlgorithm"},
+	{"2.16.840.1.101.2.1.1.23", "fortezzaWrap80Algorithm"},
+	{"2.16.840.1.101.2.1.1.24", "kEAKeyEncryptionAlgorithm"},
+	{"2.16.840.1.101.2.1.2.1", "rfc822MessageFormat"},
+	{"2.16.840.1.101.2.1.2.2", "emptyContent"},
+	{"2.16.840.1.101.2.1.2.3", "cspContentType"},
+	{"2.16.840.1.101.2.1.2.42", "mspRev3ContentType"},
+	{"2.16.840.1.101.2.1.2.48", "mspContentType"},
+	{"2.16.840.1.101.2.1.2.49", "mspRekeyAgentProtocol"},
+	{"2.16.840.1.101.2.1.2.50", "mspMMP"},
+	{"2.16.840.1.101.2.1.2.66", "mspRev3-1ContentType"},
+	{"2.16.840.1.101.2.1.2.72", "forwardedMSPMessageBodyPart"},
+	{"2.16.840.1.101.2.1.2.73", "mspForwardedMessageParameters"},
+	{"2.16.840.1.101.2.1.2.74", "forwardedCSPMsgBodyPart"},
+	{"2.16.840.1.101.2.1.2.75", "cspForwardedMessageParameters"},
+	{"2.16.840.1.101.2.1.2.76", "mspMMP2"},
+	{"2.16.840.1.101.2.1.3.1", "sdnsSecurityPolicy"},
+	{"2.16.840.1.101.2.1.3.2", "sdnsPRBAC"},
+	{"2.16.840.1.101.2.1.3.3", "mosaicPRBAC"},
+	{"2.16.840.1.101.2.1.3.10", "siSecurityPolicy"},
+	{"2.16.840.1.101.2.1.3.10.0", "siNASP"},
+	{"2.16.840.1.101.2.1.3.10.1", "siELCO"},
+	{"2.16.840.1.101.2.1.3.10.2", "siTK"},
+	{"2.16.840.1.101.2.1.3.10.3", "siDSAP"},
+	{"2.16.840.1.101.2.1.3.10.4", "siSSSS"},
+	{"2.16.840.1.101.2.1.3.10.5", "siDNASP"},
+	{"2.16.840.1.101.2.1.3.10.6", "siBYEMAN"},
+	{"2.16.840.1.101.2.1.3.10.7", "siREL-US"},
+	{"2.16.840.1.101.2.1.3.10.8", "siREL-AUS"},
+	{"2.16.840.1.101.2.1.3.10.9", "siREL-CAN"},
+	{"2.16.840.1.101.2.1.3.10.10", "siREL_UK"},
+	{"2.16.840.1.101.2.1.3.10.11", "siREL-NZ"},
+	{"2.16.840.1.101.2.1.3.10.12", "siGeneric"},
+	{"2.16.840.1.101.2.1.3.11", "genser"},
+	{"2.16.840.1.101.2.1.3.11.0", "genserNations"},
+	{"2.16.840.1.101.2.1.3.11.1", "genserComsec"},
+	{"2.16.840.1.101.2.1.3.11.2", "genserAcquisition"},
+	{"2.16.840.1.101.2.1.3.11.3", "genserSecurityCategories"},
+	{"2.16.840.1.101.2.1.3.11.3.0", "genserTagSetName"},
+	{"2.16.840.1.101.2.1.3.12", "defaultSecurityPolicy"},
+	{"2.16.840.1.101.2.1.3.13", "capcoMarkings"},
+	{"2.16.840.1.101.2.1.3.13.0", "capcoSecurityCategories"},
+	{"2.16.840.1.101.2.1.3.13.0.1", "capcoTagSetName1"},
+	{"2.16.840.1.101.2.1.3.13.0.2", "capcoTagSetName2"},
+	{"2.16.840.1.101.2.1.3.13.0.3", "capcoTagSetName3"},
+	{"2.16.840.1.101.2.1.3.13.0.4", "capcoTagSetName4"},
+	{"2.16.840.1.101.2.1.5.1", "sdnsKeyManagementCertificate"},
+	{"2.16.840.1.101.2.1.5.2", "sdnsUserSignatureCertificate"},
+	{"2.16.840.1.101.2.1.5.3", "sdnsKMandSigCertificate"},
+	{"2.16.840.1.101.2.1.5.4", "fortezzaKeyManagementCertificate"},
+	{"2.16.840.1.101.2.1.5.5", "fortezzaKMandSigCertificate"},
+	{"2.16.840.1.101.2.1.5.6", "fortezzaUserSignatureCertificate"},
+	{"2.16.840.1.101.2.1.5.7", "fortezzaCASignatureCertificate"},
+	{"2.16.840.1.101.2.1.5.8", "sdnsCASignatureCertificate"},
+	{"2.16.840.1.101.2.1.5.10", "auxiliaryVector"},
+	{"2.16.840.1.101.2.1.5.11", "mlReceiptPolicy"},
+	{"2.16.840.1.101.2.1.5.12", "mlMembership"},
+	{"2.16.840.1.101.2.1.5.13", "mlAdministrators"},
+	{"2.16.840.1.101.2.1.5.14", "alid"},
+	{"2.16.840.1.101.2.1.5.20", "janUKMs"},
+	{"2.16.840.1.101.2.1.5.21", "febUKMs"},
+	{"2.16.840.1.101.2.1.5.22", "marUKMs"},
+	{"2.16.840.1.101.2.1.5.23", "aprUKMs"},
+	{"2.16.840.1.101.2.1.5.24", "mayUKMs"},
+	{"2.16.840.1.101.2.1.5.25", "junUKMs"},
+	{"2.16.840.1.101.2.1.5.26", "julUKMs"},
+	{"2.16.840.1.101.2.1.5.27", "augUKMs"},
+	{"2.16.840.1.101.2.1.5.28", "sepUKMs"},
+	{"2.16.840.1.101.2.1.5.29", "octUKMs"},
+	{"2.16.840.1.101.2.1.5.30", "novUKMs"},
+	{"2.16.840.1.101.2.1.5.31", "decUKMs"},
+	{"2.16.840.1.101.2.1.5.40", "metaSDNSckl"},
+	{"2.16.840.1.101.2.1.5.41", "sdnsCKL"},
+	{"2.16.840.1.101.2.1.5.42", "metaSDNSsignatureCKL"},
+	{"2.16.840.1.101.2.1.5.43", "sdnsSignatureCKL"},
+	{"2.16.840.1.101.2.1.5.44", "sdnsCertificateRevocationList"},
+	{"2.16.840.1.101.2.1.5.45", "fortezzaCertificateRevocationList"},
+	{"2.16.840.1.101.2.1.5.46", "fortezzaCKL"},
+	{"2.16.840.1.101.2.1.5.47", "alExemptedAddressProcessor"},
+	{"2.16.840.1.101.2.1.5.48", "guard"},
+	{"2.16.840.1.101.2.1.5.49", "algorithmsSupported"},
+	{"2.16.840.1.101.2.1.5.50", "suiteAKeyManagementCertificate"},
+	{"2.16.840.1.101.2.1.5.51", "suiteAKMandSigCertificate"},
+	{"2.16.840.1.101.2.1.5.52", "suiteAUserSignatureCertificate"},
+	{"2.16.840.1.101.2.1.5.53", "prbacInfo"},
+	{"2.16.840.1.101.2.1.5.54", "prbacCAConstraints"},
+	{"2.16.840.1.101.2.1.5.55", "sigOrKMPrivileges"},
+	{"2.16.840.1.101.2.1.5.56", "commPrivileges"},
+	{"2.16.840.1.101.2.1.5.57", "labeledAttribute"},
+	{"2.16.840.1.101.2.1.5.58", "policyInformationFile"},
+	{"2.16.840.1.101.2.1.5.59", "secPolicyInformationFile"},
+	{"2.16.840.1.101.2.1.5.60", "cAClearanceConstraint"},
+	{"2.16.840.1.101.2.1.7.1", "cspExtns"},
+	{"2.16.840.1.101.2.1.7.1.0", "cspCsExtn"},
+	{"2.16.840.1.101.2.1.8.1", "mISSISecurityCategories"},
+	{"2.16.840.1.101.2.1.8.2", "standardSecurityLabelPrivileges"},
+	{"2.16.840.1.101.2.1.10.1", "sigPrivileges"},
+	{"2.16.840.1.101.2.1.10.2", "kmPrivileges"},
+	{"2.16.840.1.101.2.1.10.3", "namedTagSetPrivilege"},
+	{"2.16.840.1.101.2.1.11.1", "ukDemo"},
+	{"2.16.840.1.101.2.1.11.2", "usDODClass2"},
+	{"2.16.840.1.101.2.1.11.3", "usMediumPilot"},
+	{"2.16.840.1.101.2.1.11.4", "usDODClass4"},
+	{"2.16.840.1.101.2.1.11.5", "usDODClass3"},
+	{"2.16.840.1.101.2.1.11.6", "usDODClass5"},
+	{"2.16.840.1.101.2.1.12.0", "testSecurityPolicy"},
+	{"2.16.840.1.101.2.1.12.0.1", "tsp1"},
+	{"2.16.840.1.101.2.1.12.0.1.0", "tsp1SecurityCategories"},
+	{"2.16.840.1.101.2.1.12.0.1.0.0", "tsp1TagSetZero"},
+	{"2.16.840.1.101.2.1.12.0.1.0.1", "tsp1TagSetOne"},
+	{"2.16.840.1.101.2.1.12.0.1.0.2", "tsp1TagSetTwo"},
+	{"2.16.840.1.101.2.1.12.0.2", "tsp2"},
+	{"2.16.840.1.101.2.1.12.0.2.0", "tsp2SecurityCategories"},
+	{"2.16.840.1.101.2.1.12.0.2.0.0", "tsp2TagSetZero"},
+	{"2.16.840.1.101.2.1.12.0.2.0.1", "tsp2TagSetOne"},
+	{"2.16.840.1.101.2.1.12.0.2.0.2", "tsp2TagSetTwo"},
+	{"2.16.840.1.101.2.1.12.0.3", "kafka"},
+	{"2.16.840.1.101.2.1.12.0.3.0", "kafkaSecurityCategories"},
+	{"2.16.840.1.101.2.1.12.0.3.0.1", "kafkaTagSetName1"},
+	{"2.16.840.1.101.2.1.12.0.3.0.2", "kafkaTagSetName2"},
+	{"2.16.840.1.101.2.1.12.0.3.0.3", "kafkaTagSetName3"},
+	{"2.16.840.1.101.2.1.12.1.1", "tcp1"},
+	{"2.16.840.1.101.3.1", "slabel"},
+	{"2.16.840.1.101.3.2", "pki"},
+	{"2.16.840.1.101.3.2.1", "NIST.policyIdentifier"},
+	{"2.16.840.1.101.3.2.1.3.1", "fbcaRudimentaryPolicy"},
+	{"2.16.840.1.101.3.2.1.3.2", "fbcaBasicPolicy"},
+	{"2.16.840.1.101.3.2.1.3.3", "fbcaMediumPolicy"},
+	{"2.16.840.1.101.3.2.1.3.4", "fbcaHighPolicy"},
+	{"2.16.840.1.101.3.2.1.48.1", "nistTestPolicy1"},
+	{"2.16.840.1.101.3.2.1.48.2", "nistTestPolicy2"},
+	{"2.16.840.1.101.3.2.1.48.3", "nistTestPolicy3"},
+	{"2.16.840.1.101.3.2.1.48.4", "nistTestPolicy4"},
+	{"2.16.840.1.101.3.2.1.48.5", "nistTestPolicy5"},
+	{"2.16.840.1.101.3.2.1.48.6", "nistTestPolicy6"},
+	{"2.16.840.1.101.3.2.2", "gak"},
+	{"2.16.840.1.101.3.2.2.1", "kRAKey"},
+	{"2.16.840.1.101.3.2.3", "extensions"},
+	{"2.16.840.1.101.3.2.3.1", "kRTechnique"},
+	{"2.16.840.1.101.3.2.3.2", "kRecoveryCapable"},
+	{"2.16.840.1.101.3.2.3.3", "kR"},
+	{"2.16.840.1.101.3.2.4", "keyRecoverySchemes"},
+	{"2.16.840.1.101.3.2.5", "krapola"},
+	{"2.16.840.1.101.3.3", "arpa"},
+	{"2.16.840.1.101.3.4", "nistAlgorithm"},
+	{"2.16.840.1.101.3.4.1", "aes"},
+	{"2.16.840.1.101.3.4.1.1", "aes128-ECB"},
+	{"2.16.840.1.101.3.4.1.2", "aes128-CBC"},
+	{"2.16.840.1.101.3.4.1.3", "aes128-OFB"},
+	{"2.16.840.1.101.3.4.1.4", "aes128-CFB"},
+	{"2.16.840.1.101.3.4.1.5", "aes128-wrap"},
+	{"2.16.840.1.101.3.4.1.6", "aes128-GCM"},
+	{"2.16.840.1.101.3.4.1.7", "aes128-CCM"},
+	{"2.16.840.1.101.3.4.1.8", "aes128-wrap-pad"},
+	{"2.16.840.1.101.3.4.1.21", "aes192-ECB"},
+	{"2.16.840.1.101.3.4.1.22", "aes192-CBC"},
+	{"2.16.840.1.101.3.4.1.23", "aes192-OFB"},
+	{"2.16.840.1.101.3.4.1.24", "aes192-CFB"},
+	{"2.16.840.1.101.3.4.1.25", "aes192-wrap"},
+	{"2.16.840.1.101.3.4.1.26", "aes192-GCM"},
+	{"2.16.840.1.101.3.4.1.27", "aes192-CCM"},
+	{"2.16.840.1.101.3.4.1.28", "aes192-wrap-pad"},
+	{"2.16.840.1.101.3.4.1.41", "aes256-ECB"},
+	{"2.16.840.1.101.3.4.1.42", "aes256-CBC"},
+	{"2.16.840.1.101.3.4.1.43", "aes256-OFB"},
+	{"2.16.840.1.101.3.4.1.44", "aes256-CFB"},
+	{"2.16.840.1.101.3.4.1.45", "aes256-wrap"},
+	{"2.16.840.1.101.3.4.1.46", "aes256-GCM"},
+	{"2.16.840.1.101.3.4.1.47", "aes256-CCM"},
+	{"2.16.840.1.101.3.4.1.48", "aes256-wrap-pad"},
+	{"2.16.840.1.101.3.4.2", "hashAlgos"},
+	{"2.16.840.1.101.3.4.2.1", "sha-256"},
+	{"2.16.840.1.101.3.4.2.2", "sha-384"},
+	{"2.16.840.1.101.3.4.2.3", "sha-512"},
+	{"2.16.840.1.101.3.4.2.4", "sha-224"},
+	{"2.16.840.1.101.3.4.3.1", "dsaWithSha224"},
+	{"2.16.840.1.101.3.4.3.2", "dsaWithSha256"},
+	{"2.16.840.1.113719.1.2.8", "novellAlgorithm"},
+	{"2.16.840.1.113719.1.2.8.22", "desCbcIV8"},
+	{"2.16.840.1.113719.1.2.8.23", "desCbcPadIV8"},
+	{"2.16.840.1.113719.1.2.8.24", "desEDE2CbcIV8"},
+	{"2.16.840.1.113719.1.2.8.25", "desEDE2CbcPadIV8"},
+	{"2.16.840.1.113719.1.2.8.26", "desEDE3CbcIV8"},
+	{"2.16.840.1.113719.1.2.8.27", "desEDE3CbcPadIV8"},
+	{"2.16.840.1.113719.1.2.8.28", "rc5CbcPad"},
+	{"2.16.840.1.113719.1.2.8.29", "md2WithRSAEncryptionBSafe1"},
+	{"2.16.840.1.113719.1.2.8.30", "md5WithRSAEncryptionBSafe1"},
+	{"2.16.840.1.113719.1.2.8.31", "sha1WithRSAEncryptionBSafe1"},
+	{"2.16.840.1.113719.1.2.8.32", "lmDigest"},
+	{"2.16.840.1.113719.1.2.8.40", "md2"},
+	{"2.16.840.1.113719.1.2.8.50", "md5"},
+	{"2.16.840.1.113719.1.2.8.51", "ikeHmacWithSHA1-RSA"},
+	{"2.16.840.1.113719.1.2.8.52", "ikeHmacWithMD5-RSA"},
+	{"2.16.840.1.113719.1.2.8.69", "rc2CbcPad"},
+	{"2.16.840.1.113719.1.2.8.82", "sha-1"},
+	{"2.16.840.1.113719.1.2.8.92", "rc2BSafe1Cbc"},
+	{"2.16.840.1.113719.1.2.8.95", "md4"},
+	{"2.16.840.1.113719.1.2.8.130", "md4Packet"},
+	{"2.16.840.1.113719.1.2.8.131", "rsaEncryptionBsafe1"},
+	{"2.16.840.1.113719.1.2.8.132", "nwPassword"},
+	{"2.16.840.1.113719.1.2.8.133", "novellObfuscate-1"},
+	{"2.16.840.1.113719.1.9", "pki"},
+	{"2.16.840.1.113719.1.9.4", "pkiAttributeType"},
+	{"2.16.840.1.113719.1.9.4.1", "securityAttributes"},
+	{"2.16.840.1.113719.1.9.4.2", "relianceLimit"},
+	{"2.16.840.1.113730.1", "cert-extension"},
+	{"2.16.840.1.113730.1.1", "netscape-cert-type"},
+	{"2.16.840.1.113730.1.2", "netscape-base-url"},
+	{"2.16.840.1.113730.1.3", "netscape-revocation-url"},
+	{"2.16.840.1.113730.1.4", "netscape-ca-revocation-url"},
+	{"2.16.840.1.113730.1.7", "netscape-cert-renewal-url"},
+	{"2.16.840.1.113730.1.8", "netscape-ca-policy-url"},
+	{"2.16.840.1.113730.1.9", "HomePage-url"},
+	{"2.16.840.1.113730.1.10", "EntityLogo"},
+	{"2.16.840.1.113730.1.11", "UserPicture"},
+	{"2.16.840.1.113730.1.12", "netscape-ssl-server-name"},
+	{"2.16.840.1.113730.1.13", "netscape-comment"},
+	{"2.16.840.1.113730.2", "data-type"},
+	{"2.16.840.1.113730.2.1", "dataGIF"},
+	{"2.16.840.1.113730.2.2", "dataJPEG"},
+	{"2.16.840.1.113730.2.3", "dataURL"},
+	{"2.16.840.1.113730.2.4", "dataHTML"},
+	{"2.16.840.1.113730.2.5", "certSequence"},
+	{"2.16.840.1.113730.2.6", "certURL"},
+	{"2.16.840.1.113730.3", "directory"},
+	{"2.16.840.1.113730.3.1", "ldapDefinitions"},
+	{"2.16.840.1.113730.3.1.1", "carLicense"},
+	{"2.16.840.1.113730.3.1.2", "departmentNumber"},
+	{"2.16.840.1.113730.3.1.3", "employeeNumber"},
+	{"2.16.840.1.113730.3.1.4", "employeeType"},
+	{"2.16.840.1.113730.3.2.2", "inetOrgPerson"},
+	{"2.16.840.1.113730.4.1", "serverGatedCrypto"},
+	{"2.16.840.1.113733.1", "pki"},
+	{"2.16.840.1.113733.1.9", "pkcs7Attribute"},
+	{"2.16.840.1.113733.1.9.2", "messageType"},
+	{"2.16.840.1.113733.1.9.3", "pkiStatus"},
+	{"2.16.840.1.113733.1.9.4", "failInfo"},
+	{"2.16.840.1.113733.1.9.5", "senderNonce"},
+	{"2.16.840.1.113733.1.9.6", "recipientNonce"},
+	{"2.16.840.1.113733.1.9.7", "transID"},
+	{"2.16.840.1.113733.1.9.8", "extensionReq"},
+	{"2.16.840.1.113741.2", "intelCDSA"},
+	{"2.16.840.1.114412.1", "digiCertNonEVCerts"},
+	{"2.16.840.1.114412.1.1", "digiCertOVCert"},
+	{"2.16.840.1.114412.1.2", "digiCertDVCert"},
+	{"2.16.840.1.114412.1.11", "digiCertFederatedDeviceCert"},
+	{"2.16.840.1.114412.1.3.0.1", "digiCertGlobalCAPolicy"},
+	{"2.16.840.1.114412.1.3.0.2", "digiCertHighAssuranceEVCAPolicy"},
+	{"2.16.840.1.114412.1.3.0.3", "digiCertGlobalRootCAPolicy"},
+	{"2.16.840.1.114412.1.3.0.4", "digiCertAssuredIDRootCAPolicy"},
+	{"2.16.840.1.114412.2.2", "digiCertEVCert"},
+	{"2.16.840.1.114412.2.3", "digiCertObjectSigningCert"},
+	{"2.16.840.1.114412.2.3.1", "digiCertCodeSigningCert"},
+	{"2.16.840.1.114412.2.3.2", "digiCertEVCodeSigningCert"},
+	{"2.16.840.1.114412.2.3.11", "digiCertKernelCodeSigningCert"},
+	{"2.16.840.1.114412.2.3.21", "digiCertDocumentSigningCert"},
+	{"2.16.840.1.114412.2.4", "digiCertClientCert"},
+	{"2.16.840.1.114412.2.4.1.1", "digiCertLevel1PersonalClientCert"},
+	{"2.16.840.1.114412.2.4.1.2", "digiCertLevel1EnterpriseClientCert"},
+	{"2.16.840.1.114412.2.4.2", "digiCertLevel2ClientCert"},
+	{"2.16.840.1.114412.2.4.3.1", "digiCertLevel3USClientCert"},
+	{"2.16.840.1.114412.2.4.3.2", "digiCertLevel3CBPClientCert"},
+	{"2.16.840.1.114412.2.4.4.1", "digiCertLevel4USClientCert"},
+	{"2.16.840.1.114412.2.4.4.2", "digiCertLevel4CBPClientCert"},
+	{"2.16.840.1.114412.2.4.5.1", "digiCertPIVHardwareCert"},
+	{"2.16.840.1.114412.2.4.5.2", "digiCertPIVCardAuthCert"},
+	{"2.16.840.1.114412.2.4.5.3", "digiCertPIVContentSigningCert"},
+	{"2.16.840.1.114412.4.31", "digiCertGridClassicCert"},
+	{"2.16.840.1.114412.4.31.5", "digiCertGridIntegratedCert"},
+	{"2.16.840.1.114412.31.4.31.1", "digiCertGridHostCert"},
+	{"2.23.42.0", "contentType"},
+	{"2.23.42.0.0", "panData"},
+	{"2.23.42.0.1", "panToken"},
+	{"2.23.42.0.2", "panOnly"},
+	{"2.23.42.1", "msgExt"},
+	{"2.23.42.2", "field"},
+	{"2.23.42.2.0", "fullName"},
+	{"2.23.42.2.1", "givenName"},
+	{"2.23.42.2.2", "familyName"},
+	{"2.23.42.2.3", "birthFamilyName"},
+	{"2.23.42.2.4", "placeName"},
+	{"2.23.42.2.5", "identificationNumber"},
+	{"2.23.42.2.6", "month"},
+	{"2.23.42.2.7", "date"},
+	{"2.23.42.2.8", "address"},
+	{"2.23.42.2.9", "telephone"},
+	{"2.23.42.2.10", "amount"},
+	{"2.23.42.2.11", "accountNumber"},
+	{"2.23.42.2.12", "passPhrase"},
+	{"2.23.42.3", "attribute"},
+	{"2.23.42.3.0", "cert"},
+	{"2.23.42.3.0.0", "rootKeyThumb"},
+	{"2.23.42.3.0.1", "additionalPolicy"},
+	{"2.23.42.4", "algorithm"},
+	{"2.23.42.5", "policy"},
+	{"2.23.42.5.0", "root"},
+	{"2.23.42.6", "module"},
+	{"2.23.42.7", "certExt"},
+	{"2.23.42.7.0", "hashedRootKey"},
+	{"2.23.42.7.1", "certificateType"},
+	{"2.23.42.7.2", "merchantData"},
+	{"2.23.42.7.3", "cardCertRequired"},
+	{"2.23.42.7.4", "tunneling"},
+	{"2.23.42.7.5", "setExtensions"},
+	{"2.23.42.7.6", "setQualifier"},
+	{"2.23.42.8", "brand"},
+	{"2.23.42.8.1", "IATA-ATA"},
+	{"2.23.42.8.4", "VISA"},
+	{"2.23.42.8.5", "MasterCard"},
+	{"2.23.42.8.30", "Diners"},
+	{"2.23.42.8.34", "AmericanExpress"},
+	{"2.23.42.8.6011", "Novus"},
+	{"2.23.42.9", "vendor"},
+	{"2.23.42.9.0", "GlobeSet"},
+	{"2.23.42.9.1", "IBM"},
+	{"2.23.42.9.2", "CyberCash"},
+	{"2.23.42.9.3", "Terisa"},
+	{"2.23.42.9.4", "RSADSI"},
+	{"2.23.42.9.5", "VeriFone"},
+	{"2.23.42.9.6", "TrinTech"},
+	{"2.23.42.9.7", "BankGate"},
+	{"2.23.42.9.8", "GTE"},
+	{"2.23.42.9.9", "CompuSource"},
+	{"2.23.42.9.10", "Griffin"},
+	{"2.23.42.9.11", "Certicom"},
+	{"2.23.42.9.12", "OSS"},
+	{"2.23.42.9.13", "TenthMountain"},
+	{"2.23.42.9.14", "Antares"},
+	{"2.23.42.9.15", "ECC"},
+	{"2.23.42.9.16", "Maithean"},
+	{"2.23.42.9.17", "Netscape"},
+	{"2.23.42.9.18", "Verisign"},
+	{"2.23.42.9.19", "BlueMoney"},
+	{"2.23.42.9.20", "Lacerte"},
+	{"2.23.42.9.21", "Fujitsu"},
+	{"2.23.42.9.22", "eLab"},
+	{"2.23.42.9.23", "Entrust"},
+	{"2.23.42.9.24", "VIAnet"},
+	{"2.23.42.9.25", "III"},
+	{"2.23.42.9.26", "OpenMarket"},
+	{"2.23.42.9.27", "Lexem"},
+	{"2.23.42.9.28", "Intertrader"},
+	{"2.23.42.9.29", "Persimmon"},
+	{"2.23.42.9.30", "NABLE"},
+	{"2.23.42.9.31", "espace-net"},
+	{"2.23.42.9.32", "Hitachi"},
+	{"2.23.42.9.33", "Microsoft"},
+	{"2.23.42.9.34", "NEC"},
+	{"2.23.42.9.35", "Mitsubishi"},
+	{"2.23.42.9.36", "NCR"},
+	{"2.23.42.9.37", "e-COMM"},
+	{"2.23.42.9.38", "Gemplus"},
+	{"2.23.42.10", "national"},
+	{"2.23.42.10.392", "Japan"},
+	{"2.23.43.1.4", "wTLS-ECC"},
+	{"2.23.43.1.4.1", "wTLS-ECC-curve1"},
+	{"2.23.43.1.4.6", "wTLS-ECC-curve6"},
+	{"2.23.43.1.4.8", "wTLS-ECC-curve8"},
+	{"2.23.43.1.4.9", "wTLS-ECC-curve9"},
+	{"2.23.133", "tCPA"},
+	{"2.23.133.1", "tcpaSpecVersion"},
+	{"2.23.133.2", "tcpaAttribute"},
+	{"2.23.133.2.1", "tcpaTpmManufacturer"},
+	{"2.23.133.2.2", "tcpaTpmModel"},
+	{"2.23.133.2.3", "tcpaTpmVersion"},
+	{"2.23.133.2.4", "tcpaPlatformManufacturer"},
+	{"2.23.133.2.5", "tcpaPlatformModel"},
+	{"2.23.133.2.6", "tcpaPlatformVersion"},
+	{"2.23.133.2.7", "tcpaComponentManufacturer"},
+	{"2.23.133.2.8", "tcpaComponentModel"},
+	{"2.23.133.2.9", "tcpaComponentVersion"},
+	{"2.23.133.2.10", "tcpaSecurityQualities"},
+	{"2.23.133.2.11", "tcpaTpmProtectionProfile"},
+	{"2.23.133.2.12", "tcpaTpmSecurityTarget"},
+	{"2.23.133.2.13", "tcpaFoundationProtectionProfile"},
+	{"2.23.133.2.14", "tcpaFoundationSecurityTarget"},
+	{"2.23.133.2.15", "tcpaTpmIdLabel"},
+	{"2.23.133.3", "tcpaProtocol"},
+	{"2.23.133.3.1", "tcpaPrttTpmIdProtocol"},
+	{"2.23.134.1.4.2.1", "postSignumRootQCA.."},
+	{"2.23.134.1.2.2.3", "postSignumPublicCA."},
+	{"2.23.134.1.2.1.8.210", "postSignumCommercialServerPolicy"},
+	{"2.23.136.1.1.1", "mRTDSignatureData"},
+	{"2.54.1775.2", "hashedRootKey"},
+	{"2.54.1775.3", "certificateType"},
+	{"2.54.1775.4", "merchantData"},
+	{"2.54.1775.5", "cardCertRequired"},
+	{"2.54.1775.6", "tunneling"},
+	{"2.54.1775.7", "setQualifier"},
+	{"2.54.1775.99", "setData"},
+	{0, 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OIDS_H */
+
diff -Nru radare2-2.3.0+dfsg/libr/util/astr.c radare2-2.8.0+dfsg/libr/util/astr.c
--- radare2-2.3.0+dfsg/libr/util/astr.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/astr.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,383 @@
+/* radare2 - LGPL - Copyright 2017-2018 - wargio, pancake */
+
+#include <r_util.h>
+#include "asn1_oids.h"
+
+static const char* _hex = "0123456789abcdef";
+
+R_API RASN1String *r_asn1_create_string (const char *string, bool allocated, ut32 length) {
+	if (!string || !length) {
+		return NULL;
+	}
+	RASN1String *s = R_NEW0 (RASN1String);
+	if (s) {
+		s->allocated = allocated;
+		s->length = length;
+		s->string = string;
+	}
+	return s;
+}
+
+static RASN1String *newstr(const char *string) {
+	return r_asn1_create_string (string, false, strlen (string) + 1);
+}
+
+R_API RASN1String *r_asn1_concatenate_strings (RASN1String *s0, RASN1String *s1, bool freestr) {
+	char* str;
+	ut32 len;
+	if (!s0 || !s1 || s0->length == 0 || s1->length == 0) {
+		return NULL;
+	}
+	len = s0->length + s1->length - 1;
+	str = (char*) malloc (len);
+	if (!str) {
+		if (freestr) {
+			r_asn1_free_string (s0);
+			r_asn1_free_string (s1);
+		}
+		return NULL;
+	}
+	memcpy (str, s0->string, s0->length);
+	memcpy (str + s0->length - 1, s1->string, s1->length);
+	if (freestr) {
+		r_asn1_free_string (s0);
+		r_asn1_free_string (s1);
+	}
+	return r_asn1_create_string (str, true, len);
+}
+
+R_API RASN1String *r_asn1_stringify_string (const ut8 *buffer, ut32 length) {
+	if (!buffer || !length) {
+		return NULL;
+	}
+	char *str = r_str_ndup ((const char *)buffer, length);
+	if (!str) {
+		return NULL;
+	}
+	r_str_filter (str, length);
+	return r_asn1_create_string (str, true, length);
+}
+
+R_API RASN1String *r_asn1_stringify_utctime (const ut8 *buffer, ut32 length) {
+	if (!buffer || length != 13 || buffer[12] != 'Z') {
+		return NULL;
+	}
+	const int str_sz = 24;
+	char *str = malloc (str_sz);
+	if (!str) {
+		return NULL;
+	}
+	str[0] = buffer[4];
+	str[1] = buffer[5];
+	str[2] = '/';
+	str[3] = buffer[2];
+	str[4] = buffer[3];
+	str[5] = '/';
+	str[6] = buffer[0] < '5' ? '2' : '1';
+	str[7] = buffer[0] < '5' ? '0' : '9';
+	str[8] = buffer[0];
+	str[9] = buffer[1];
+	str[10] = ' ';
+	str[11] = buffer[6];
+	str[12] = buffer[7];
+	str[13] = ':';
+	str[14] = buffer[8];
+	str[15] = buffer[9];
+	str[16] = ':';
+	str[17] = buffer[10];
+	str[18] = buffer[11];
+	str[19] = ' ';
+	str[20] = 'G';
+	str[21] = 'M';
+	str[22] = 'T';
+	str[23] = '\0';
+
+	return r_asn1_create_string (str, true, str_sz);
+}
+
+R_API RASN1String *r_asn1_stringify_time (const ut8 *buffer, ut32 length) {
+	if (!buffer || length != 15 || buffer[14] != 'Z') {
+		return NULL;
+	}
+	const int str_sz = 24;
+	char *str = malloc (str_sz);
+	if (!str) {
+		return NULL;
+	}
+
+	str[0] = buffer[6];
+	str[1] = buffer[7];
+	str[2] = '/';
+	str[3] = buffer[4];
+	str[4] = buffer[5];
+	str[5] = '/';
+	str[6] = buffer[0];
+	str[7] = buffer[1];
+	str[8] = buffer[2];
+	str[9] = buffer[3];
+	str[10] = ' ';
+	str[11] = buffer[8];
+	str[12] = buffer[9];
+	str[13] = ':';
+	str[14] = buffer[10];
+	str[15] = buffer[11];
+	str[16] = ':';
+	str[17] = buffer[12];
+	str[18] = buffer[13];
+	str[19] = ' ';
+	str[20] = 'G';
+	str[21] = 'M';
+	str[22] = 'T';
+	str[23] = '\0';
+
+	return r_asn1_create_string (str, true, str_sz);
+}
+
+R_API RASN1String *r_asn1_stringify_bits (const ut8 *buffer, ut32 length) {
+	ut32 i, j, k;
+	ut64 size;
+	ut8 c;
+	char *str;
+	if (!buffer || !length) {
+		return NULL;
+	}
+	size = 1 + ((length - 1)* 8) - buffer[0];
+	str = (char*) malloc (size);
+	if (!str) {
+		return NULL;
+	}
+	for (i = 1, j = 0; i < length && j < size; ++i) {
+		c = buffer[i];
+		for (k = 0; k < 8 && j < size; ++k, j++) {
+			str[size - j - 1] = c & 0x80 ? '1' : '0';
+			c <<= 1;
+		}
+	}
+	str[size - 1] = '\0';
+	return r_asn1_create_string (str, true, size);
+}
+
+R_API RASN1String *r_asn1_stringify_boolean (const ut8 *buffer, ut32 length) {
+	if (!buffer || length != 1 || (buffer[0] != 0 && buffer[0] != 0xFF)) {
+		return NULL;
+	}
+	return newstr (r_str_bool (buffer[0]));
+}
+
+R_API RASN1String *r_asn1_stringify_integer (const ut8 *buffer, ut32 length) {
+	ut32 i, j;
+	ut64 size;
+	ut8 c;
+	char *str;
+	if (!buffer || !length) {
+		return NULL;
+	}
+	size = 3 * length;
+	str = (char*) malloc (size);
+	if (!str) {
+		return NULL;
+	}
+	memset (str, 0, size);
+	for (i = 0, j = 0; i < length && j < size; ++i, j += 3) {
+		c = buffer[i];
+		str[j + 0] = _hex[c >> 4];
+		str[j + 1] = _hex[c & 15];
+		str[j + 2] = ':';
+	}
+	str[size - 1] = '\0';
+	return r_asn1_create_string (str, true, size);
+}
+
+R_API RASN1String* r_asn1_stringify_bytes (const ut8 *buffer, ut32 length) {
+	ut32 i, j, k;
+	ut64 size;
+	ut8 c;
+	char *str;
+	if (!buffer || !length) {
+		return NULL;
+	}
+	size = (4 * length);
+	size += (64 - (size % 64));
+	str = (char*) malloc (size);
+	if (!str) {
+		return NULL;
+	}
+	memset (str, 0x20, size);
+
+	for (i = 0, j = 0, k = 48; i < length && j < size && k < size; ++i, j += 3, k++) {
+		c = buffer[i];
+		str[j + 0] = _hex[c >> 4];
+		str[j + 1] = _hex[c & 15];
+		str[j + 2] = ' ';
+		str[k] = (c >= ' ' && c <= '~') ? c : '.';
+		if (i % 16 == 15) {
+			str[j + 19] = '\n';
+			j += 17;
+			k += 49;
+		}
+	}
+	str[size - 1] = '\0';
+
+	return r_asn1_create_string (str, true, size);
+}
+
+R_API RASN1String *r_asn1_stringify_oid (const ut8* buffer, ut32 length) {
+	const ut8 *start, *end;
+	char *str, *t;
+	ut32 i, slen, bits;
+	ut64 oid;
+	if (!buffer || !length) {
+		return NULL;
+	}
+
+	str = (char*) calloc (1, ASN1_OID_LEN);
+	if (!str) {
+		return NULL;
+	}
+
+	end = buffer + length;
+	t = str;
+	slen = 0;
+	bits = 0;
+	oid = 0;
+
+	for (start = buffer; start < end && slen < ASN1_OID_LEN; start++) {
+		ut8 c = *start;
+		oid <<= 7;
+		oid |= (c & 0x7F);
+		bits += 7;
+		if (!(c & 0x80)) {
+			if (!slen) {
+				ut32 m = oid / 40;
+				ut32 n = oid % 40;
+				snprintf (t, ASN1_OID_LEN, "%01u.%01u", m, n);
+				slen = strlen (str);
+				t = str + slen;
+			} else {
+				snprintf (t, ASN1_OID_LEN - slen, ".%01u", (ut32) oid);
+				slen = strlen (str);
+				t = str + slen;
+			}
+			oid = 0;
+			bits = 0;
+		}
+	}
+	// incomplete oid.
+	// bad structure.
+	if (bits > 0) {
+		free (str);
+		return NULL;
+	}
+	i = 0;
+	do {
+		if (X509OIDList[i].oid[0] == str[0]) {
+			if (!strncmp (str, X509OIDList[i].oid, ASN1_OID_LEN)) {
+				free (str);
+				return newstr (X509OIDList[i].name);
+			}
+		}
+		++i;
+	} while (X509OIDList[i].oid && X509OIDList[i].name);
+	return r_asn1_create_string (str, true, ASN1_OID_LEN);
+}
+
+R_API void r_asn1_free_string (RASN1String* str) {
+	if (str) {
+		if (str->allocated) {
+			free ((char*) str->string);
+		}
+		free (str);
+	}
+}
+
+R_API RASN1String *asn1_stringify_tag (RASN1Object *object) {
+	if (!object) {
+		return NULL;
+	}
+	const char *s = "Unknown tag";
+	// TODO: use array of strings
+	switch (object->tag) {
+	case TAG_EOC: s = "EOC"; break;
+	case TAG_BOOLEAN: s = "BOOLEAN"; break;
+	case TAG_INTEGER: s = "INTEGER"; break;
+	case TAG_BITSTRING: s = "BIT STRING"; break;
+	case TAG_OCTETSTRING: s = "OCTET STRING"; break;
+	case TAG_NULL: s = "NULL"; break;
+	case TAG_OID: s = "OBJECT IDENTIFIER"; break;
+	case TAG_OBJDESCRIPTOR: s = "ObjectDescriptor"; break;
+	case TAG_EXTERNAL: s = "EXTERNAL"; break;
+	case TAG_REAL: s = "REAL"; break;
+	case TAG_ENUMERATED: s = "ENUMERATED"; break;
+	case TAG_EMBEDDED_PDV: s = "EMBEDDED PDV"; break;
+	case TAG_UTF8STRING: s = "UTF8String"; break;
+	case TAG_SEQUENCE: s = "SEQUENCE"; break;
+	case TAG_SET: s = "SET"; break;
+	case TAG_NUMERICSTRING: s = "NumericString"; break;
+	case TAG_PRINTABLESTRING: s = "PrintableString"; break;
+	case TAG_T61STRING: s = "TeletexString"; break;
+	case TAG_VIDEOTEXSTRING: s = "VideotexString"; break;
+	case TAG_IA5STRING: s = "IA5String"; break;
+	case TAG_UTCTIME: s = "UTCTime"; break;
+	case TAG_GENERALIZEDTIME: s = "GeneralizedTime"; break;
+	case TAG_GRAPHICSTRING: s = "GraphicString"; break;
+	case TAG_VISIBLESTRING: s = "VisibleString"; break;
+	case TAG_GENERALSTRING: s = "GeneralString"; break;
+	case TAG_UNIVERSALSTRING: s = "UniversalString"; break;
+	case TAG_BMPSTRING: s = "BMPString"; break;
+	}
+	return newstr (s);
+}
+
+R_API RASN1String *asn1_stringify_sector (RASN1Object *object) {
+	if (!object) {
+		return NULL;
+	}
+	switch (object->tag) {
+	case TAG_EOC:
+		return NULL;
+	case TAG_BOOLEAN:
+		return newstr (r_str_bool (object->sector[0]));
+	case TAG_REAL:
+	case TAG_INTEGER:
+		if (object->length < 16) {
+			return r_asn1_stringify_integer (object->sector, object->length);
+		} else {
+			return r_asn1_stringify_bytes (object->sector, object->length);
+		}
+	case TAG_BITSTRING:
+		//if (object->length < 8) {
+		return r_asn1_stringify_bits (object->sector, object->length);
+		//} else {
+		//	return asn1_stringify_bytes (object->sector, object->length);
+		//}
+	case TAG_OCTETSTRING:
+		return r_asn1_stringify_bytes (object->sector, object->length);
+	case TAG_NULL:
+		return NULL;
+	case TAG_OID:
+		return r_asn1_stringify_oid (object->sector, object->length);
+		//    case TAG_OBJDESCRIPTOR:
+		//    case TAG_EXTERNAL:
+		//    case TAG_ENUMERATED:
+		//    case TAG_EMBEDDED_PDV:
+	case TAG_UTF8STRING:
+		//    case TAG_SEQUENCE:
+		//    case TAG_SET:
+	case TAG_NUMERICSTRING:
+	case TAG_PRINTABLESTRING:
+		//    case TAG_T61STRING:
+		//    case TAG_VIDEOTEXSTRING:
+	case TAG_IA5STRING:
+	case TAG_VISIBLESTRING:
+		return r_asn1_stringify_string (object->sector, object->length);
+	case TAG_UTCTIME:
+		return r_asn1_stringify_utctime (object->sector, object->length);
+	case TAG_GENERALIZEDTIME:
+		return r_asn1_stringify_time (object->sector, object->length);
+		//    case TAG_GRAPHICSTRING:
+		//    case TAG_GENERALSTRING:
+		//    case TAG_UNIVERSALSTRING:
+		//    case TAG_BMPSTRING:
+	}
+	return NULL;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/binheap.c radare2-2.8.0+dfsg/libr/util/binheap.c
--- radare2-2.3.0+dfsg/libr/util/binheap.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/binheap.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,55 +1,57 @@
 #include "r_binheap.h"
 
-static inline void _heap_down(RBinHeap *h, int i, void *x) {
-	int j;
-	for (; j = i * 2 + 1, j < h->a.len; i = j) {
-		if (j + 1 < h->a.len && h->cmp (h->a.a[j+1], h->a.a[j])) {
+static inline void _heap_down(RBinHeap *h, size_t i, void *x) {
+	size_t j;
+	for (; j = i * 2 + 1, j < h->a.v.len; i = j) {
+		if (j + 1 < h->a.v.len && h->cmp (r_pvector_at (&h->a, j+1), r_pvector_at (&h->a, j))) {
 			j++;
 		}
-		if (!(h->cmp (h->a.a[j], x))) {
+		if (!(h->cmp (r_pvector_at (&h->a, j+1), x))) {
 			break;
 		}
-		h->a.a[i] = h->a.a[j];
+		r_pvector_set (&h->a, i, r_pvector_at (&h->a, j));
 	}
-	h->a.a[i] = x;
+	r_pvector_set (&h->a, i, x);
 }
 
-static inline void _heap_up(RBinHeap *h, int i, void *x) {
-	int j;
-	for (; i && (j = (i-1) >> 1, h->cmp (x, h->a.a[j])); i = j) {
-		h->a.a[i] = h->a.a[j];
+static inline void _heap_up(RBinHeap *h, size_t i, void *x) {
+	size_t j;
+	for (; i && (j = (i-1) >> 1, h->cmp (x, r_pvector_at (&h->a, j))); i = j) {
+		r_pvector_set (&h->a, i, r_pvector_at (&h->a, j));
 	}
-	h->a.a[i] = x;
+	r_pvector_set (&h->a, i, x);
 }
 
-R_API void r_binheap_clear(RBinHeap *h, void (*elem_free)(void *)) {
-  r_vector_clear (&h->a, elem_free);
+R_API void r_binheap_clear(RBinHeap *h) {
+  r_pvector_clear (&h->a);
 }
 
-R_API void r_binheap_init(RBinHeap *h, RVectorComparator cmp) {
-	r_vector_init (&h->a);
+R_API void r_binheap_init(RBinHeap *h, RPVectorComparator cmp) {
+	r_pvector_init (&h->a, NULL);
 	h->cmp = cmp;
 }
 
-R_API RBinHeap *r_binheap_new(RVectorComparator cmp) {
+R_API RBinHeap *r_binheap_new(RPVectorComparator cmp) {
 	RBinHeap *h = R_NEW (RBinHeap);
-	if (h) {
-		h->cmp = cmp;
+	if (!h) {
+		return NULL;
 	}
+	r_pvector_init (&h->a, NULL);
+	h->cmp = cmp;
 	return h;
 }
 
 R_API void *r_binheap_pop(RBinHeap *h) {
-	void *ret = h->a.a[0];
-	h->a.len--;
-	_heap_down (h, 0, h->a.a[h->a.len]);
+	void *ret = r_pvector_at (&h->a, 0);
+	h->a.v.len--;
+	_heap_down (h, 0, r_pvector_at (&h->a, h->a.v.len));
 	return ret;
 }
 
 R_API bool r_binheap_push(RBinHeap *h, void *x) {
-	if (!r_vector_push (&h->a, NULL)) {
+	if (!r_pvector_push (&h->a, NULL)) {
 		return false;
 	}
-	_heap_up (h, h->a.len - 1, x);
+	_heap_up (h, h->a.v.len - 1, x);
 	return true;
 }
diff -Nru radare2-2.3.0+dfsg/libr/util/btree.c radare2-2.8.0+dfsg/libr/util/btree.c
--- radare2-2.3.0+dfsg/libr/util/btree.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/btree.c	2018-08-07 14:12:36.000000000 +0000
@@ -51,11 +51,11 @@
 	if (root) {
 		if (reverse) {
 			btree_traverse (root->right, reverse, context, trv);
-			trv(root->data, context);
+			trv (root->data, context);
 			btree_traverse (root->left, reverse, context, trv);
 		} else {
 			btree_traverse (root->left, reverse, context, trv);
-			trv(root->data, context);
+			trv (root->data, context);
 			btree_traverse (root->right, reverse, context, trv);
 		}
 	}
diff -Nru radare2-2.3.0+dfsg/libr/util/buf.c radare2-2.8.0+dfsg/libr/util/buf.c
--- radare2-2.3.0+dfsg/libr/util/buf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/buf.c	2018-08-07 14:12:36.000000000 +0000
@@ -106,6 +106,13 @@
 	return set;
 }
 
+R_API RBuffer *r_buf_new_with_io(void *iob, int fd) {
+	RBuffer *b = r_buf_new ();
+	b->iob = iob;
+	b->fd = fd;
+	return b;
+}
+
 R_API RBuffer *r_buf_new_with_pointers (const ut8 *bytes, ut64 len) {
 	RBuffer *b = r_buf_new ();
 	if (b && bytes && len > 0 && len != UT64_MAX) {
@@ -163,9 +170,31 @@
 	return b;
 }
 
+R_API RBuffer *r_buf_new_slice(RBuffer *b, ut64 offset, ut64 size) {
+	if (b && b->sparse) {
+		eprintf ("r_buf_new_slice not supported yet for sparse buffers\n");
+		return NULL;
+	}
+	RBuffer *buf = R_NEW0 (RBuffer);
+	if (!buf) {
+		return NULL;
+	}
+	memcpy (buf, b, sizeof (RBuffer));
+	buf->parent = r_buf_ref (b);
+	buf->ro = true;
+	buf->offset = offset;
+	if (buf->base > 0) {
+		buf->base += offset;
+	}
+	buf->limit = size;
+	return buf;
+}
+
 R_API RBuffer *r_buf_new() {
 	RBuffer *b = R_NEW0 (RBuffer);
 	if (b) {
+		b->offset = 0;
+		b->limit = UT64_MAX;
 		b->fd = -1;
 		b->Oxff = 0xff;
 	}
@@ -180,8 +209,12 @@
 	if (!b) {
 		return 0LL;
 	}
+	if (b->iob) {
+		RIOBind *iob = b->iob;
+		return R_MIN (b->limit, R_MAX (0, iob->fd_size (iob->io, b->fd) - b->offset));
+	}
 	if (b->fd != -1) {
-		return b->length;
+		return R_MIN (b->limit, R_MAX (0, b->length - b->offset));
 	}
 	if (b->sparse) {
 		ut64 max = 0LL;
@@ -190,14 +223,16 @@
 		}
 		return 0LL;
 	}
-	return b->empty? 0: b->length;
+	return b->empty? 0: R_MIN (b->limit, R_MAX (0, b->length - b->offset));
 }
 
 // rename to new?
 R_API RBuffer *r_buf_mmap (const char *file, int flags) {
 	int rw = flags & R_IO_WRITE ? true : false;
 	RBuffer *b = r_buf_new ();
-	if (!b) return NULL;
+	if (!b) {
+		return NULL;
+	}
 	b->mmap = r_file_mmap (file, rw, 0);
 	if (b->mmap) {
 		b->buf = b->mmap->buf;
@@ -253,15 +288,16 @@
 
 R_API int r_buf_seek (RBuffer *b, st64 addr, int whence) {
 	ut64 min = 0LL, max = 0LL;
+	ut64 pa = addr - b->base + b->offset;
 	if (b->fd != -1) {
-		if (r_sandbox_lseek (b->fd, addr, whence) == -1) {
+		if (r_sandbox_lseek (b->fd, pa, whence) == -1) {
 			// seek failed - print error here?
 			return -1;
 		}
 	} else if (b->sparse) {
 		sparse_limits (b->sparse, &min, &max);
 		switch (whence) {
-		case R_IO_SEEK_SET: b->cur = addr; break;
+		case R_IO_SEEK_SET: b->cur = pa; break;
 		case R_IO_SEEK_CUR: b->cur = b->cur + addr; break;
 		case R_IO_SEEK_END:
 			    if (sparse_limits (b->sparse, NULL, &max)) {
@@ -270,13 +306,14 @@
 			    b->cur = max + addr; break; //b->base + b->length + addr; break;
 		}
 	} else {
+		ut64 effective_size = r_buf_size (b);
 		min = b->base;
-		max = b->base + b->length;
+		max = b->base + effective_size;
 		switch (whence) {
 		//case 0: b->cur = b->base + addr; break;
-		case R_IO_SEEK_SET: b->cur = addr; break;
+		case R_IO_SEEK_SET: b->cur = pa; break;
 		case R_IO_SEEK_CUR: b->cur = b->cur + addr; break;
-		case R_IO_SEEK_END: b->cur = b->base + b->length + addr; break;
+		case R_IO_SEEK_END: b->cur = max + addr; break;
 		}
 	}
 	/* avoid out-of-bounds */
@@ -350,7 +387,7 @@
 }
 
 R_API bool r_buf_append_bytes(RBuffer *b, const ut8 *buf, int length) {
-	if (!b) {
+	if (!b || b->ro) {
 		return false;
 	}
 	if (b->fd != -1) {
@@ -371,7 +408,9 @@
 }
 
 R_API bool r_buf_append_nbytes(RBuffer *b, int length) {
-	if (!b) return false;
+	if (!b || b->ro) {
+		return false;
+	}
 	if (b->fd != -1) {
 		ut8 *buf = calloc (1, length);
 		if (buf) {
@@ -391,7 +430,9 @@
 }
 
 R_API bool r_buf_append_ut16(RBuffer *b, ut16 n) {
-	if (!b) return false;
+	if (!b || b->ro) {
+		return false;
+	}
 	if (b->fd != -1) {
 		return r_buf_append_bytes (b, (const ut8*)&n, sizeof (n));
 	}
@@ -404,6 +445,9 @@
 }
 
 R_API bool r_buf_append_ut32(RBuffer *b, ut32 n) {
+	if (!b || b->ro) {
+		return false;
+	}
 	if (b->empty) {
 		b->length = b->empty = 0;
 	}
@@ -419,7 +463,9 @@
 }
 
 R_API bool r_buf_append_ut64(RBuffer *b, ut64 n) {
-	if (!b) return false;
+	if (!b || b->ro) {
+		return false;
+	}
 	if (b->fd != -1) {
 		return r_buf_append_bytes (b, (const ut8*)&n, sizeof (n));
 	}
@@ -432,7 +478,9 @@
 }
 
 R_API bool r_buf_append_buf(RBuffer *b, RBuffer *a) {
-	if (!b) return false;
+	if (!b || b->ro) {
+		return false;
+	}
 	if (b->fd != -1) {
 		r_buf_append_bytes (b, a->buf, a->length);
 		return true;
@@ -451,66 +499,88 @@
 
 // ret copied length if successful, -1 if failed
 static int r_buf_cpy(RBuffer *b, ut64 addr, ut8 *dst, const ut8 *src, int len, int write) {
-	int end;
 	if (!b || b->empty) {
 		return 0;
 	}
+	ut64 start = addr - b->base + b->offset;
+	ut64 effective_size = r_buf_size (b);
+	int real_len = len;
+	if (start + len > effective_size) {
+		real_len = effective_size - start;
+	}
+	if (real_len < 1) {
+		return 0;
+	}
+	if (b->iob) {
+		RIOBind *iob = b->iob;
+		if (b->fd != -1) {
+			return write
+				? iob->fd_write_at (iob->io, b->fd, start, src, real_len)
+				: iob->fd_read_at (iob->io, b->fd, start, dst, real_len);
+		}
+		return write
+			? iob->write_at (iob->io, start, src, real_len)
+			: iob->read_at (iob->io, start, dst, real_len);
+	}
 	if (b->fd != -1) {
-		if (r_sandbox_lseek (b->fd, addr, SEEK_SET) == -1) {
+		if (r_sandbox_lseek (b->fd, start, SEEK_SET) == -1) {
 			// seek failed - print error here?
 			// return 0;
 		}
 		if (write) {
-			return r_sandbox_write (b->fd, src, len);
+			return r_sandbox_write (b->fd, src, real_len);
 		}
-		memset (dst, 0, len);
-		return r_sandbox_read (b->fd, dst, len);
+		memset (dst, 0, real_len);
+		return r_sandbox_read (b->fd, dst, real_len);
 	}
 	if (b->sparse) {
 		if (write) {
 			// create new with src + len
-			if (sparse_write (b->sparse, addr, src, len) < 0) {
+			if (sparse_write (b->sparse, start, src, real_len) < 0) {
 				return -1;
 			}
 		} else {
 			// read from sparse and write into dst
 			memset (dst, b->Oxff, len);
-			(void)sparse_read (b->sparse, addr, dst, len);
+			(void)sparse_read (b->sparse, start, dst, real_len);
+			len = R_MIN (real_len , r_buf_size (b) - addr);
 		}
-		return len;
+		return real_len;
 	}
-	addr = (addr == R_BUF_CUR) ? b->cur : addr - b->base;
-	if (len < 1 || !dst || addr > b->length) {
+	addr = (addr == R_BUF_CUR) ? b->cur : start;
+	if (len < 1 || !dst || addr > effective_size) {
 		return -1;
 	}
- 	end = (int)(addr + len);
-	if (end > b->length) {
-		len -= end-b->length;
-	}
 	if (write) {
 		dst += addr;
 	} else {
 		src += addr;
 	}
-	memmove (dst, src, len);
-	b->cur = addr + len;
-	return len;
+	memmove (dst, src, real_len);
+	b->cur = addr + real_len;
+	return real_len;
 }
 
 static int r_buf_fcpy_at (RBuffer *b, ut64 addr, ut8 *buf, const char *fmt, int n, int write) {
 	ut64 len, check_len;
-	int i, j, k, tsize, bigendian, m = 1;
-	if (!b || b->empty) return 0;
-	if (b->fd != -1) {
-		eprintf ("r_buf_fcpy_at not supported yet for r_buf_new_file\n");
+	int i, j, k, tsize, m = 1;
+	bool bigendian = true;
+	if (!b || b->empty) {
+		return 0;
+	}
+	if ((b->iob || b->fd != -1) && write) {
+		eprintf ("r_buf_fcpy_at write not supported yet for r_buf_new_file\n");
 		return 0;
 	}
+	ut64 vaddr;
 	if (addr == R_BUF_CUR) {
-		addr = b->cur;
+		vaddr = addr = b->cur;
 	} else {
-		addr -= b->base;
+		vaddr = addr;
+		addr = addr - b->base + b->offset;
 	}
-	if (addr == UT64_MAX || addr > b->length) {
+	ut64 effective_size = r_buf_size (b);
+	if (addr == UT64_MAX || addr > effective_size) {
 		return -1;
 	}
 	tsize = 2;
@@ -522,16 +592,17 @@
 		#else
 		case '0'...'9':
 		#endif
-			if (m == 1)
+			if (m == 1) {
 				m = r_num_get (NULL, &fmt[j]);
+			}
 			continue;
-		case 's': tsize = 2; bigendian = 0; break;
-		case 'S': tsize = 2; bigendian = 1; break;
-		case 'i': tsize = 4; bigendian = 0; break;
-		case 'I': tsize = 4; bigendian = 1; break;
-		case 'l': tsize = 8; bigendian = 0; break;
-		case 'L': tsize = 8; bigendian = 1; break;
-		case 'c': tsize = 1; bigendian = 0; break;
+		case 's': tsize = 2; bigendian = false; break;
+		case 'S': tsize = 2; bigendian = true; break;
+		case 'i': tsize = 4; bigendian = false; break;
+		case 'I': tsize = 4; bigendian = true; break;
+		case 'l': tsize = 8; bigendian = false; break;
+		case 'L': tsize = 8; bigendian = true; break;
+		case 'c': tsize = 1; bigendian = false; break;
 		default: return -1;
 		}
 
@@ -539,20 +610,35 @@
 		   tsize and m are not user controled, then don't
 		   need to check possible overflow.
 		 */
-		if (!UT64_ADD (&check_len, len, tsize*m))
+		if (!UT64_ADD (&check_len, len, tsize*m)) {
 			return -1;
-		if (!UT64_ADD (&check_len, check_len, addr))
+		}
+		if (!UT64_ADD (&check_len, check_len, addr)) {
 			return -1;
-		if (check_len > b->length) {
+		}
+		if (check_len > effective_size) {
 			return check_len;
-			// return -1;
 		}
 
 		for (k = 0; k < m; k++) {
-			ut8* src1 = &b->buf[len+(k*tsize)];
-			ut8* src2 = &b->buf[addr+len+(k*tsize)];
-			void* dest1 = &buf[addr+len+(k*tsize)];
-			void* dest2 = &buf[len+(k*tsize)];
+			ut8 _dest1[sizeof (ut64)] = {0};
+			ut8 _dest2[sizeof (ut64)] = {0};
+			int left1, left2;
+			ut64 addr1 = len + (k * tsize);
+			ut64 addr2 = vaddr + addr1;
+			ut8 *src1=NULL, *src2=NULL;
+			if (b->fd == -1) {
+				src1 = r_buf_get_at (b, addr1, &left1);
+				src2 = r_buf_get_at (b, addr2, &left2);
+			}
+			if (!src1 || !src2) {
+				left1 = r_buf_read_at (b, addr1, _dest1, sizeof (_dest1));
+				left2 = r_buf_read_at (b, addr2, _dest2, sizeof (_dest2));
+				src1 = _dest1;
+				src2 = _dest2;
+			}
+			void* dest1 = buf + addr + addr1; // shouldn't this be an address in b ?
+			void* dest2 = buf + addr1;
 			ut8* dest1_8 = (ut8*)dest1;
 			ut16* dest1_16 = (ut16*)dest1;
 			ut32* dest1_32 = (ut32*)dest1;
@@ -596,35 +682,44 @@
 		len += tsize * m;
 		m = 1;
 	}
-	b->cur = addr + len;
+	b->cur = vaddr + len;
 	return len;
 }
 
-R_API ut8 *r_buf_get_at (RBuffer *b, ut64 addr, int *left) {
+R_API ut8 *r_buf_get_at(RBuffer *b, ut64 addr, int *left) {
 	if (b->empty) {
 		return NULL;
 	}
-	if (b->fd != -1) {
-		eprintf ("r_buf_get_at not supported for r_buf_new_file\n");
-		return NULL;
+	if (b->iob) {
+		if (b->fd != -1) {
+			eprintf ("r_buf_get_at not supported for r_buf_new_file\n");
+			return NULL;
+		}
+		static ut8 buf[8];
+		r_buf_read_at (b, addr, buf, sizeof (buf));
+		if (left) {
+			*left = 8;
+		}
+		return buf;
 	}
 	if (addr == R_BUF_CUR) {
 		addr = b->cur;
 	} else {
-		addr -= b->base;
+		addr = addr - b->base + b->offset;
 	}
-	if (addr == UT64_MAX || addr > b->length) {
+	ut64 effective_size = r_buf_size (b);
+	if (addr == UT64_MAX || addr > effective_size) {
 		return NULL;
 	}
 	if (left) {
-		*left = b->length - addr;
+		*left = effective_size - addr;
 	}
 	return b->buf + addr;
 }
 
 //ret 0 if failed; ret copied length if successful
 R_API int r_buf_read_at(RBuffer *b, ut64 addr, ut8 *buf, int len) {
-	st64 pa;
+	RIOBind *iob = b->iob;
 	if (!b || !buf || len < 1) {
 		return 0;
 	}
@@ -634,27 +729,37 @@
 	if (addr == R_BUF_CUR) {
 		addr = b->cur;
 	}
+	ut64 start = addr - b->base + b->offset;
+	ut64 effective_size = r_buf_size (b);
+	int real_len = len;
+	if (start + len > effective_size) {
+		real_len = effective_size - start;
+	}
+	if (iob) {
+		if (b->fd != -1) {
+			return iob->fd_read_at (iob->io, b->fd, start, buf, real_len);
+		}
+		return iob->read_at (iob->io, start, buf, real_len);
+	}
 	if (b->fd != -1) {
-		if (r_sandbox_lseek (b->fd, addr, SEEK_SET) == -1) {
+		if (r_sandbox_lseek (b->fd, start, SEEK_SET) == -1) {
 			return 0;
 		}
-		return r_sandbox_read (b->fd, buf, len);
+		return r_sandbox_read (b->fd, buf, real_len);
 	}
 	if (!b->sparse) {
 		if (addr < b->base || len < 1) {
 			return 0;
 		}
-		pa = addr - b->base;
-		if (pa + len > b->length) {
+		if (real_len != len) {
 			memset (buf, b->Oxff, len);
-			len = b->length - pa;
+			len = real_len;
 			if (len < 0) {
 				return 0;
 			}
 		}
 	}
-	// must be +pa, but maybe its missused?
-	//return r_buf_cpy (b, addr, buf, b->buf+pa, len, false);
+	// addr will be converted to pa inside r_buf_cpy
 	return r_buf_cpy (b, addr, buf, b->buf, len, false);
 }
 
@@ -664,21 +769,36 @@
 
 //ret 0 or -1 if failed; ret copied length if success
 R_API int r_buf_write_at(RBuffer *b, ut64 addr, const ut8 *buf, int len) {
+	RIOBind *iob = b->iob;
 	if (!b || !buf || len < 1) {
 		return 0;
 	}
+	ut64 start = addr - b->base + b->offset;
+	ut64 effective_size = r_buf_size (b);
+	int real_len = len;
+	if (start + len > effective_size) {
+		real_len = effective_size - start;
+	}
+	if (iob) {
+		if (b->fd != -1) {
+			return iob->fd_write_at (iob->io, b->fd, start, buf, real_len);
+		}
+		return iob->write_at (iob->io, start, buf, real_len);
+	}
 	if (b->fd != -1) {
-		ut64 newlen = addr + len;
-		if (r_sandbox_lseek (b->fd, addr, SEEK_SET) == -1) {
+		ut64 newlen = start + len;
+		if (r_sandbox_lseek (b->fd, start, SEEK_SET) == -1) {
 			return 0;
 		}
-		if (newlen > b->length) {
+		if (newlen > effective_size && !b->ro) {
 			b->length = newlen;
 #ifdef _MSC_VER
 			_chsize (b->fd, newlen);
 #else
 			ftruncate (b->fd, newlen);
 #endif
+		} else {
+			len = real_len;
 		}
 		return r_sandbox_write (b->fd, buf, len);
 	}
@@ -686,6 +806,9 @@
 		return (sparse_write (b->sparse, addr, buf, len) < 0) ? -1 : len;
 	}
 	if (b->empty) {
+		if (b->ro) {
+			return 0;
+		}
 		b->empty = 0;
 		free (b->buf);
 		b->buf = (ut8 *) malloc (addr + len);
@@ -718,6 +841,10 @@
 	if (!b) {
 		return;
 	}
+	if (b->parent) {
+		r_buf_free (b->parent);
+		b->parent = NULL;
+	}
 	if (b->refctr > 0) {
 		b->refctr--;
 		return;
@@ -743,7 +870,7 @@
 		r_buf_append_bytes (b, (const ut8*)"", 1);
 		p = malloc (b->length + 1);
 		if (!p) {
-			return NULL;	
+			return NULL;
 		}
 		memmove (p, b->buf, b->length);
 		p[b->length] = 0;
@@ -753,6 +880,9 @@
 }
 
 R_API bool r_buf_resize (RBuffer *b, ut64 newsize) {
+	if (!b || b->ro) {
+		return false;
+	}
 	if (b->mmap) {
 		return false;
 	}
diff -Nru radare2-2.3.0+dfsg/libr/util/calc.c radare2-2.8.0+dfsg/libr/util/calc.c
--- radare2-2.3.0+dfsg/libr/util/calc.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/calc.c	2018-08-07 14:12:36.000000000 +0000
@@ -34,6 +34,16 @@
 
 static inline RNumCalcValue Nshl(RNumCalcValue n, RNumCalcValue v) { n.d += v.d; n.n <<= v.n; return n; }
 static inline RNumCalcValue Nshr(RNumCalcValue n, RNumCalcValue v) { n.d += v.d; n.n >>= v.n; return n; }
+static inline RNumCalcValue Nrol(RNumCalcValue n, RNumCalcValue v) {
+	n.d += v.d;
+	n.n = (n.n << v.n) | (n.n >> (sizeof(n.n) * 8 - v.n));
+	return n;
+}
+static inline RNumCalcValue Nror(RNumCalcValue n, RNumCalcValue v) {
+	n.d += v.d;
+	n.n = (n.n >> v.n) | (n.n << (sizeof(n.n) * 8 - v.n));
+	return n;
+}
 static inline RNumCalcValue Nmod(RNumCalcValue n, RNumCalcValue v) {
 	if (v.d) n.d = (n.d - (n.d/v.d)); else n.d = 0;
 	if (v.n) n.n %= v.n; else n.n = 0;
@@ -64,6 +74,8 @@
 		switch (nc->curr_tok) {
 		case RNCSHL: left = Nshl (left, term (num, nc, 1)); break;
 		case RNCSHR: left = Nshr (left, term (num, nc, 1)); break;
+		case RNCROL: left = Nrol (left, term (num, nc, 1)); break;
+		case RNCROR: left = Nror (left, term (num, nc, 1)); break;
 		case RNCPLUS: left = Nadd (left, term (num, nc, 1)); break;
 		case RNCMINUS: left = Nsub (left, term (num, nc, 1)); break;
 		case RNCXOR: left = Nxor (left, term (num, nc, 1)); break;
@@ -158,6 +170,8 @@
 	case RNCRIGHTP:
 	case RNCSHL:
 	case RNCSHR:
+	case RNCROL:
+	case RNCROR:
 		return v;
 	//default: error (num, nc, "primary expected");
 	}
@@ -261,6 +275,26 @@
 		}
 		cin_putback (num, nc, c);
 		return nc->curr_tok = (RNumCalcToken) ch;
+	case '<':
+		if (cin_get (num, nc, &c) && c == '<') {
+			if (cin_get (num, nc, &c) && c == '<') {
+				return nc->curr_tok = RNCROL;
+			}
+			cin_putback (num, nc, c);
+			return nc->curr_tok = RNCSHL;
+		}
+		cin_putback (num, nc, c);
+		return nc->curr_tok = RNCEND;
+	case '>':
+		if (cin_get (num, nc, &c) && c == '>') {
+			if (cin_get (num, nc, &c) && c == '>') {
+				return nc->curr_tok = RNCROR;
+			}
+			cin_putback (num, nc, c);
+			return nc->curr_tok = RNCSHR;
+		}
+		cin_putback (num, nc, c);
+		return nc->curr_tok = RNCEND;
 	case '^':
 	case '&':
 	case '|':
@@ -269,8 +303,6 @@
 	case '/':
 	case '(':
 	case ')':
-	case '<':
-	case '>':
 	case '=':
 		return nc->curr_tok = (RNumCalcToken) ch;
 	case '0': case '1': case '2': case '3': case '4':
@@ -352,6 +384,7 @@
 	nc->calc_i = 0;
 	nc->calc_len = 0;
 	nc->calc_buf = NULL;
+	nc->under_calc = true;
 
 	load_token (num, nc, str);
 	get_token (num, nc);
@@ -362,6 +395,7 @@
 	if (num) {
 		num->fvalue = n.d;
 	}
+	nc->under_calc = false;
 	return n.n;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/util/ctype.c radare2-2.8.0+dfsg/libr/util/ctype.c
--- radare2-2.3.0+dfsg/libr/util/ctype.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/ctype.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,559 @@
+/* radare - LGPL - Copyright 2013-2018 - pancake, oddcoder, sivaramaaa */
+
+#include "r_util.h"
+
+R_API int r_type_set(Sdb *TDB, ut64 at, const char *field, ut64 val) {
+	const char *kind;
+	char var[128];
+	sprintf (var, "link.%08"PFMT64x, at);
+	kind = sdb_const_get (TDB, var, NULL);
+	if (kind) {
+		const char *p = sdb_const_get (TDB, kind, NULL);
+		if (p) {
+			snprintf (var, sizeof (var), "%s.%s.%s", p, kind, field);
+			int off = sdb_array_get_num (TDB, var, 1, NULL);
+			//int siz = sdb_array_get_num (DB, var, 2, NULL);
+			eprintf ("wv 0x%08"PFMT64x" @ 0x%08"PFMT64x, val, at+off);
+			return true;
+		}
+		eprintf ("Invalid kind of type\n");
+	}
+	return false;
+}
+
+R_API int r_type_kind(Sdb *TDB, const char *name) {
+	if (!name) {
+		return -1;
+	}
+	const char *type = sdb_const_get (TDB, name, 0);
+	if (!type) {
+		return -1;
+	}
+	if (!strcmp (type, "enum")) {
+		return R_TYPE_ENUM;
+	} else if (!strcmp (type, "struct")){
+		return R_TYPE_STRUCT;
+	} else if (!strcmp (type, "union")){
+		return R_TYPE_UNION;
+	} else if (!strcmp (type, "type")){
+		return R_TYPE_BASIC;
+	}
+	return -1;
+}
+
+R_API RList* r_type_get_enum (Sdb *TDB, const char *name) {
+	char *p, *val, var[130], var2[130];
+	int n;
+
+	if (r_type_kind (TDB, name) != R_TYPE_ENUM) {
+		return NULL;
+	}
+	RList *res = r_list_new ();
+	snprintf (var, sizeof (var), "enum.%s", name);
+	for (n = 0; (p = sdb_array_get (TDB, var, n, NULL)); n++) {
+		RTypeEnum *member = R_NEW0 (RTypeEnum);
+		snprintf (var2, sizeof (var2), "%s.%s", var, p);
+		val = sdb_array_get (TDB, var2, 0, NULL);
+		member->name = p;
+		member->val = val;
+		r_list_append (res, member);
+	}
+	return res;
+}
+
+R_API char *r_type_enum_member(Sdb *TDB, const char *name, const char *member, ut64 val) {
+	const char *q;
+	if (r_type_kind (TDB, name) != R_TYPE_ENUM) {
+		return NULL;
+	}
+	if (member) {
+		q = sdb_fmt ("enum.%s.%s", name, member);
+	} else {
+		q = sdb_fmt ("enum.%s.0x%x", name, val);
+	}
+	return sdb_get (TDB, q, 0);
+}
+
+R_API char *r_type_enum_getbitfield(Sdb *TDB, const char *name, ut64 val) {
+	char *q, *ret = NULL;
+	const char *res;
+	int i;
+
+	if (r_type_kind (TDB, name) != R_TYPE_ENUM) {
+		return NULL;
+	}
+	bool isFirst = true;
+	ret = r_str_appendf (ret, "0x%08"PFMT64x" : ", val);
+	for (i = 0; i < 32; i++) {
+		if (!(val & (1 << i))) {
+			continue;
+		}
+		q = sdb_fmt ("enum.%s.0x%x", name, (1<<i));
+                res = sdb_const_get (TDB, q, 0);
+                if (isFirst) {
+			isFirst = false;
+                } else {
+			ret = r_str_append (ret, " | ");
+                }
+                if (res) {
+			ret = r_str_append (ret, res);
+                } else {
+			ret = r_str_appendf (ret, "0x%x", (1<<i));
+                }
+	}
+	return ret;
+}
+
+R_API int r_type_get_bitsize(Sdb *TDB, const char *type) {
+	char *query;
+	/* Filter out the structure keyword if type looks like "struct mystruc" */
+	const char *tmptype;
+	if (!strncmp (type, "struct ", 7)) {
+		tmptype = type + 7;
+	} else {
+		tmptype = type;
+	}
+	if ((strstr (type, "*(") || strstr (type, " *")) &&
+			strncmp (type, "char *", 7)) {
+		return 32;
+	}
+	const char *t = sdb_const_get (TDB, tmptype, 0);
+	if (!t) {
+		if (!strncmp (tmptype, "enum ", 5)) {
+			//XXX: Need a proper way to determine size of enum
+			return 32;
+		}
+		return 0;
+	}
+	if (!strcmp (t, "type")){
+		query = sdb_fmt ("type.%s.size", tmptype);
+		return sdb_num_get (TDB, query, 0); // returns size in bits
+	}
+	if (!strcmp (t, "struct")) {
+		query = sdb_fmt ("struct.%s", tmptype);
+		char *members = sdb_get (TDB, query, 0);
+		char *next, *ptr = members;
+		int ret = 0;
+		if (members) {
+			do {
+				char *name = sdb_anext (ptr, &next);
+				if (!name) {
+					break;
+				}
+				query = sdb_fmt ("struct.%s.%s", tmptype, name);
+				char *subtype = sdb_get (TDB, query, 0);
+				if (!subtype) {
+					break;
+				}
+				char *tmp = strchr (subtype, ',');
+				if (tmp) {
+					*tmp++ = 0;
+					tmp = strchr (tmp, ',');
+					if (tmp) {
+						*tmp++ = 0;
+					}
+					int elements = r_num_math (NULL, tmp);
+					if (elements == 0) {
+						elements = 1;
+					}
+					ret += r_type_get_bitsize (TDB, subtype) * elements;
+				}
+				free (subtype);
+				ptr = next;
+			} while (next);
+			free (members);
+		}
+		return ret;
+	}
+	return 0;
+}
+
+R_API char *r_type_get_struct_memb(Sdb *TDB, const char *type, int offset) {
+	int i, typesize = 0;
+	char *res = NULL;
+
+	if (offset < 0) {
+		return NULL;
+	}
+	char* query = sdb_fmt ("struct.%s", type);
+	char *members = sdb_get (TDB, query, 0);
+	if (!members) {
+		//eprintf ("%s is not a struct\n", type);
+		return NULL;
+	}
+	int nargs = r_str_split (members, ',');
+	for (i = 0; i < nargs ; i++) {
+		const char *name = r_str_word_get0 (members, i);
+		if (!name) {
+			break;
+		}
+		query = sdb_fmt ("struct.%s.%s", type, name);
+		char *subtype = sdb_get (TDB, query, 0);
+		if (!subtype) {
+			break;
+		}
+		int len = r_str_split (subtype, ',');
+		if (len < 3) {
+			free (subtype);
+			break;
+		}
+		int val = r_num_math (NULL, r_str_word_get0 (subtype, len - 1));
+		int arrsz = val ? val : 1;
+		if ((typesize / 8) == offset) {
+			res = r_str_newf ("%s.%s", type, name);
+			free (subtype);
+			break;
+		}
+		typesize += r_type_get_bitsize (TDB, subtype) * arrsz;
+		free (subtype);
+	}
+	free (members);
+	return res;
+}
+
+R_API RList* r_type_get_by_offset(Sdb *TDB, ut64 offset) {
+	RList *offtypes = r_list_new ();
+	SdbList *ls = sdb_foreach_list (TDB, true);
+	SdbListIter *lsi;
+	SdbKv *kv;
+	ls_foreach (ls, lsi, kv) {
+		// TODO: Add unions support
+		if (!strncmp (kv->value, "struct", 6) && strncmp (kv->key, "struct.", 7)) {
+			char *res = r_type_get_struct_memb (TDB, kv->key, offset);
+			if (res) {
+				r_list_append (offtypes, res);
+			}
+		}
+	}
+	ls_free (ls);
+	return offtypes;
+}
+
+R_API char *r_type_link_at (Sdb *TDB, ut64 addr) {
+	char* res = NULL;
+
+	if (addr == UT64_MAX) {
+		return NULL;
+	}
+	char* query = sdb_fmt ("link.%08"PFMT64x, addr);
+	res = sdb_get (TDB, query, 0);
+	if (!res) { // resolve struct memb if possible for given addr
+		SdbKv *kv;
+		SdbListIter *sdb_iter;
+		SdbList *sdb_list = sdb_foreach_list (TDB, true);
+		ls_foreach (sdb_list, sdb_iter, kv) {
+			if (strncmp (kv->key, "link.", strlen ("link."))) {
+				continue;
+			}
+			const char *linkptr = sdb_fmt ("0x%s", kv->key + strlen ("link."));
+			ut64 baseaddr = r_num_math (NULL, linkptr);
+			int delta = (addr > baseaddr)? addr - baseaddr: -1;
+			res = r_type_get_struct_memb (TDB, kv->value, delta);
+			if (res) {
+				break;
+			}
+		}
+		ls_free (sdb_list);
+	}
+	return res;
+}
+
+R_API int r_type_set_link(Sdb *TDB, const char *type, ut64 addr) {
+	if (sdb_const_get (TDB, type, 0)) {
+		char *laddr = r_str_newf ("link.%08"PFMT64x, addr);
+		sdb_set (TDB, laddr, type, 0);
+		free (laddr);
+		return true;
+	}
+	// eprintf ("Cannot find type\n");
+	return false;
+}
+
+R_API int r_type_link_offset(Sdb *TDB, const char *type, ut64 addr) {
+	if (sdb_const_get (TDB, type, 0)) {
+		char *laddr = r_str_newf ("offset.%08"PFMT64x, addr);
+		sdb_set (TDB, laddr, type, 0);
+		free (laddr);
+		return true;
+	}
+	// eprintf ("Cannot find type\n");
+	return false;
+}
+
+R_API int r_type_unlink(Sdb *TDB, ut64 addr) {
+	char *laddr = sdb_fmt ("link.%08"PFMT64x, addr);
+	sdb_unset (TDB, laddr, 0);
+	return true;
+}
+
+static void filter_type(char *t) {
+        for (;*t; t++) {
+                if (*t == ' ') {
+                        *t = '_';
+                }
+                // memmove (t, t+1, strlen (t));
+        }
+}
+
+R_API char *r_type_format(Sdb *TDB, const char *t) {
+	int n;
+	char *p, var[130], var2[132];
+	char *fmt = NULL;
+	char *vars = NULL;
+	const char *kind = sdb_const_get (TDB, t, NULL);
+	if (!kind) {
+		return NULL;
+	}
+	// only supports struct atm
+	snprintf (var, sizeof (var), "%s.%s", kind, t);
+	if (!strcmp (kind, "type")) {
+		const char *fmt = sdb_const_get (TDB, var, NULL);
+		if (fmt) {
+			return strdup (fmt);
+		}
+	} else if (!strcmp (kind, "struct") || !strcmp (kind, "union")) {
+		// assumes var list is sorted by offset.. should do more checks here
+		for (n = 0; (p = sdb_array_get (TDB, var, n, NULL)); n++) {
+			char *type;
+			char *struct_name;
+			const char *tfmt = NULL;
+			bool isStruct = false;
+			bool isEnum = false;
+			bool isfp = false;
+			snprintf (var2, sizeof (var2), "%s.%s", var, p);
+			type = sdb_array_get (TDB, var2, 0, NULL);
+			int alen = sdb_array_size (TDB, var2);
+			int elements = sdb_array_get_num (TDB, var2, alen - 1, NULL);
+			if (type) {
+				char var3[128] = {0};
+				// Handle general pointers except for char *
+				if ((strstr (type, "*(") || strstr (type, " *")) &&
+						strncmp (type, "char *", 7)) {
+					isfp = true;
+				} else if (!strncmp (type, "struct ", 7)) {
+					struct_name = type + 7;
+					// TODO: iterate over all the struct fields, and format the format and vars
+					snprintf (var3, sizeof (var3), "struct.%s", struct_name);
+					tfmt = sdb_const_get (TDB, var3, NULL);
+					isStruct = true;
+				} else {
+					// special case for char[]. Use char* format type without *
+					if (!strncmp (type, "char", 5) && elements > 0) {
+						tfmt = sdb_const_get (TDB, "type.char *", NULL);
+						if (tfmt && *tfmt == '*') {
+							tfmt++;
+						}
+					} else {
+						if (!strncmp (type, "enum ", 5)) {
+							snprintf (var3, sizeof (var3), "%s", type + 5);
+							isEnum = true;
+						} else {
+							snprintf (var3, sizeof (var3), "type.%s", type);
+						}
+						tfmt = sdb_const_get (TDB, var3, NULL);
+					}
+
+				}
+				if (isfp) {
+					// consider function pointer as void * for printing
+					fmt = r_str_append (fmt, "p");
+					vars = r_str_append (vars, p);
+					vars = r_str_append (vars, " ");
+				} else if (tfmt) {
+					filter_type (type);
+					if (elements > 0) {
+						fmt = r_str_appendf (fmt, "[%d]", elements);
+					}
+					if (isStruct) {
+						fmt = r_str_append (fmt, "?");
+						vars = r_str_appendf (vars, "(%s)%s", struct_name, p);
+						vars = r_str_append (vars, " ");
+					} else if (isEnum) {
+						fmt = r_str_append (fmt, "E");
+						vars = r_str_appendf (vars, "(%s)%s", type + 5, p);
+						vars = r_str_append (vars, " ");
+					} else {
+						fmt = r_str_append (fmt, tfmt);
+						vars = r_str_append (vars, p);
+						vars = r_str_append (vars, " ");
+					}
+				} else {
+					eprintf ("Cannot resolve type '%s'\n", var3);
+				}
+			}
+			free (type);
+			free (p);
+		}
+		fmt = r_str_append (fmt, " ");
+		fmt = r_str_append (fmt, vars);
+		free (vars);
+		return fmt;
+	}
+	return NULL;
+}
+
+R_API void r_type_del(Sdb *TDB, const char *name) {
+	const char *kind = sdb_const_get (TDB, name, 0);
+	if (!kind) {
+		return;
+	}
+	if (!strcmp (kind, "type")) {
+		sdb_unset (TDB, sdb_fmt ("type.%s", name), 0);
+		sdb_unset (TDB, sdb_fmt ("type.%s.size", name), 0);
+		sdb_unset (TDB, sdb_fmt ("type.%s.meta", name), 0);
+		sdb_unset (TDB, name, 0);
+	} else if (!strcmp (kind, "struct") || !strcmp (kind, "union")) {
+		int i, n = sdb_array_length(TDB, sdb_fmt ("%s.%s", kind, name));
+		char *elements_key = r_str_newf ("%s.%s", kind, name);
+		for (i = 0; i< n; i++) {
+			char *p = sdb_array_get (TDB, elements_key, i, NULL);
+			sdb_unset (TDB, sdb_fmt ("%s.%s", elements_key, p), 0);
+			free (p);
+		}
+		sdb_unset (TDB, elements_key, 0);
+		sdb_unset (TDB, name, 0);
+		free (elements_key);
+	} else if (!strcmp (kind, "func")) {
+		int i, n = sdb_num_get (TDB, sdb_fmt ("func.%s.args", name), 0);
+		for (i = 0; i < n; i++) {
+			sdb_unset (TDB, sdb_fmt ("func.%s.arg.%d", name, i), 0);
+		}
+		sdb_unset (TDB, sdb_fmt ("func.%s.ret", name), 0);
+		sdb_unset (TDB, sdb_fmt ("func.%s.cc", name), 0);
+		sdb_unset (TDB, sdb_fmt ("func.%s.noreturn", name), 0);
+		sdb_unset (TDB, sdb_fmt ("func.%s.args", name), 0);
+		sdb_unset (TDB, name, 0);
+	} else if (!strcmp (kind, "enum")) {
+		RList *list = r_type_get_enum (TDB, name);
+		RTypeEnum *member;
+		RListIter *iter;
+		r_list_foreach (list, iter, member) {
+			sdb_unset (TDB, sdb_fmt ("enum.%s.%s", name, member->name), 0);
+			sdb_unset (TDB, sdb_fmt ("enum.%s.0x%x", name, member->val), 0);
+		}
+		sdb_unset (TDB, name, 0);
+	} else {
+		eprintf ("Unrecognized type \"%s\"\n", kind);
+	}
+}
+
+// Function prototypes api
+R_API int r_type_func_exist(Sdb *TDB, const char *func_name) {
+	const char *fcn = sdb_const_get (TDB, func_name, 0);
+	return fcn && !strcmp (fcn, "func");
+}
+
+R_API const char *r_type_func_ret(Sdb *TDB, const char *func_name){
+	const char *query = sdb_fmt ("func.%s.ret", func_name);
+	return sdb_const_get (TDB, query, 0);
+}
+
+R_API int r_type_func_args_count(Sdb *TDB, const char *func_name) {
+	const char *query = sdb_fmt ("func.%s.args", func_name);
+	return sdb_num_get (TDB, query, 0);
+}
+
+R_API char *r_type_func_args_type(Sdb *TDB, const char *func_name, int i) {
+	const char *query = sdb_fmt ("func.%s.arg.%d", func_name, i);
+	char *ret = sdb_get (TDB, query, 0);
+	if (ret) {
+		char *comma = strchr (ret, ',');
+		if (comma) {
+			*comma = 0;
+			return ret;
+		}
+		free (ret);
+	}
+	return NULL;
+}
+
+R_API char *r_type_func_args_name(Sdb *TDB, const char *func_name, int i) {
+	const char *query = sdb_fmt ("func.%s.arg.%d", func_name, i);
+	const char *get = sdb_const_get (TDB, query, 0);
+	if (get) {
+		char *ret = strchr (get, ',');
+		return ret == 0 ? ret : ret + 1;
+	}
+	return NULL;
+}
+
+#define MIN_MATCH_LEN 4
+
+static char *type_func_try_guess(Sdb *TDB, char *name) {
+	const char *res;
+	if (r_str_nlen (name, MIN_MATCH_LEN) < MIN_MATCH_LEN) {
+		return NULL;
+	}
+	if ((res = sdb_const_get (TDB, name, NULL))) {
+		bool is_func = res && !strcmp ("func", res);
+		if (is_func) {
+			return strdup (name);
+		}
+	}
+	return NULL;
+}
+
+// TODO:
+// - symbol names are long and noisy, some of them might not be matched due
+//   to additional information added around name
+R_API char *r_type_func_guess(Sdb *TDB, char *func_name) {
+	int offset = 0;
+	char *str = func_name;
+	char *result = NULL;
+	char *first, *last;
+	if (!func_name) {
+		return NULL;
+	}
+
+	size_t slen = strlen (str);
+	if (slen < MIN_MATCH_LEN) {
+		return NULL;
+	}
+
+	if (slen > 4) { // were name-matching so ignore autonamed
+		if ((str[0] == 'f' && str[1] == 'c' && str[2] == 'n' && str[3] == '.') ||
+		    (str[0] == 'l' && str[1] == 'o' && str[2] == 'c' && str[3] == '.')) {
+			return NULL;
+		}
+	}
+	// strip r2 prefixes (sym, sym.imp, etc')
+	while (slen > 4 && (offset + 3 < slen) && str[offset + 3] == '.') {
+		offset += 4;
+	}
+	slen -= offset;
+	str += offset;
+	if (!strncmp (str, "__isoc99_", 9)) {
+		str += 9;
+	}
+	if ((result = type_func_try_guess (TDB, str))) {
+		return result;
+	}
+	str = strdup (str);
+	// some names are in format module.dll_function_number, try to remove those
+	// also try module.dll_function and function_number
+	if ((first = strchr (str, '_'))) {
+		last = (char *)r_str_lchr (first, '_');
+		if (!last) {
+			goto out;
+		}
+		// middle + suffix or right half
+		if ((result = type_func_try_guess (TDB, first + 1))) {
+			goto out;
+		}
+		last[0] = 0;
+		// prefix + middle or left
+		if ((result = type_func_try_guess (TDB, str))) {
+			goto out;
+		}
+		if (last != first) {
+			// middle
+			if ((result = type_func_try_guess (TDB, first + 1))) {
+				goto out;
+			}
+		}
+		result = NULL;
+	}
+out:
+	free (str);
+	return result;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/date.c radare2-2.8.0+dfsg/libr/util/date.c
--- radare2-2.3.0+dfsg/libr/util/date.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/date.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,140 @@
+/* radare - LGPL - Copyright 2007-2015 - pancake */
+
+#include "r_print.h"
+#include "r_util.h"
+#include <unistd.h>
+#include <sys/time.h>
+#include <time.h>
+#include <sys/stat.h>
+
+R_API int r_print_date_dos(RPrint *p, const ut8 *buf, int len) {
+	ut8 _time[2] = { buf[0], buf[1] };
+	ut8 _date[2] = { buf[2], buf[3] };
+        ut32 t       = _time[1]<<8 | _time[0];
+        ut32 d       = _date[1]<<8 | _date[0];
+        ut32 year    = ((d&0xfe00)>>9)+1980;
+        ut32 month   = (d&0x01e0)>>5;
+        ut32 day     = (d&0x001f)>>0;
+        ut32 hour    = (t&0xf800)>>11;
+        ut32 minutes = (t&0x07e0)>>5;
+        ut32 seconds = (t&0x001f)<<1;
+
+	// TODO: support p->datezone
+	// TODO: support p->datefmt
+        /* la data de modificacio del fitxer, no de creacio del zip */
+        p->cb_printf ("%d-%02d-%02d %d:%d:%d\n",
+                year, month, day, hour, minutes, seconds);
+	return 4;
+}
+
+R_API int r_print_date_hfs(RPrint *p, const ut8 *buf, int len) {
+	const int hfs_unix_delta = 2082844800;
+	time_t t = 0;
+	char s[256];
+	int ret = 0;
+	const struct tm* time;
+
+	if (p && len >= sizeof (ut32)) {
+		t = r_read_ble32 (buf, p->big_endian);
+		// "%d:%m:%Y %H:%M:%S %z",
+		if (p->datefmt[0]) {
+			t += p->datezone * (60*60);
+			t += hfs_unix_delta;
+			time = (const struct tm*)gmtime((const time_t*)&t);
+			if (time) {
+				ret = strftime (s, sizeof (s), p->datefmt, time);
+				if (ret) {
+					p->cb_printf ("%s\n", s);
+					ret = sizeof (time_t);
+				}
+			} else p->cb_printf ("Invalid time\n");
+		}
+	}
+	return ret;
+}
+
+R_API int r_print_date_unix(RPrint *p, const ut8 *buf, int len) {
+	time_t t = 0;
+	char s[256];
+	int ret = 0;
+	const struct tm* time;
+
+	if (p && len >= sizeof (ut32)) {
+		t = r_read_ble32 (buf, p->big_endian);
+		// "%d:%m:%Y %H:%M:%S %z",
+		if (p->datefmt[0]) {
+			t += p->datezone * (60*60);
+			time = (const struct tm*)gmtime((const time_t*)&t);
+			if (time) {
+				ret = strftime (s, sizeof (s), p->datefmt, time);
+				if (ret) {
+					p->cb_printf ("%s\n", s);
+					ret = sizeof (time_t);
+				}
+			} else p->cb_printf ("Invalid time\n");
+		}
+	}
+	return ret;
+}
+
+R_API int r_print_date_get_now(RPrint *p, char *str) {
+	int ret = 0;
+#if __UNIX__
+        struct tm curt; /* current time */
+        time_t l;
+        char *week_str[7]= {
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+        char *month_str[12]= {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+
+        *str = 0;
+        l = time(0);
+        localtime_r (&l, &curt);
+	// XXX localtime is affected by the timezone. 
+
+        if ((curt.tm_wday >= 0 && curt.tm_wday < 7)
+        &&  (curt.tm_mon >= 0 && curt.tm_mon < 12)) {
+		sprintf (str, "%s, %02d %s %d %02d:%02d:%02d GMT + %d",
+			week_str[curt.tm_wday],
+			curt.tm_mday,
+			month_str[curt.tm_mon],
+			curt.tm_year + 1900, curt.tm_hour,
+			curt.tm_min, curt.tm_sec, curt.tm_isdst);
+		ret = sizeof(time_t);
+	}
+#else
+        *str = 0;
+#ifdef _MSC_VER
+#pragma message ("r_print_date_now NOT IMPLEMENTED FOR THIS PLATFORM")
+#else
+#warning r_print_date_now NOT IMPLEMENTED FOR THIS PLATFORM
+#endif
+#endif
+	return ret;
+}
+
+R_API int r_print_date_w32(RPrint *p, const ut8 *buf, int len) {
+	ut64 l, L = 0x2b6109100LL;
+	time_t t;
+	int ret = 0;
+	char datestr[256];
+
+	if (p && len >= sizeof (ut64)) {
+		l = r_read_ble64 (buf, p->big_endian);
+		l /= 10000000; // 100ns to s
+		l = (l > L ? l-L : 0); // isValidUnixTime?
+		t = (time_t) l; // TODO limit above!
+		// "%d:%m:%Y %H:%M:%S %z",
+		if (p->datefmt[0]) {
+			ret = strftime(datestr, 256, p->datefmt,
+				(const struct tm*) gmtime((const time_t*)&t));
+			if (ret) {
+				p->cb_printf("%s\n", datestr);
+				ret = true;
+			}
+		}
+	}
+
+	return ret;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/deps.mk radare2-2.8.0+dfsg/libr/util/deps.mk
--- radare2-2.3.0+dfsg/libr/util/deps.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/deps.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1 +1 @@
-include ${SHLR}/zip/deps.mk
+include $(SHLR)/zip/deps.mk
diff -Nru radare2-2.3.0+dfsg/libr/util/diff.c radare2-2.8.0+dfsg/libr/util/diff.c
--- radare2-2.3.0+dfsg/libr/util/diff.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/diff.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake, nikolai */
+/* radare - LGPL - Copyright 2009-2018 - pancake, nikolai */
 
 #include <r_diff.h>
 
@@ -33,13 +33,70 @@
 	return 1;
 }
 
+typedef struct {
+	RDiff *d;
+	char *str;
+} RDiffUser;
+
+#if 0
+// XXX buffers_static doesnt constructs the correct string in this callback
+static int tostring(RDiff *d, void *user, RDiffOp *op) {
+	RDiffUser *u = (RDiffUser*)user;
+	if (op->a_len > 0) {
+		char *a_str = r_str_ndup ((const char *)op->a_buf + op->a_off, op->a_len);
+		u->str = r_str_appendf (u->str, "+(%s)", a_str);
+#if 0
+		char *bufasm = r_str_prefix_all (a_str, "- ");
+		u->str = r_str_appendf (u->str, "-(%s)", bufasm);
+		free (bufasm);
+#endif
+		free (a_str);
+	}
+	if (op->b_len > 0) {
+		char *b_str = r_str_ndup ((const char *)op->b_buf + op->b_off, op->b_len);
+		u->str = r_str_appendf (u->str, "+(%s)", b_str);
+#if 0
+		char *bufasm = r_str_prefix_all (b_str, "+ ");
+		u->str = r_str_appendf (u->str, "+(%s)", bufasm);
+		free (bufasm);
+#endif
+		free (b_str);
+	}
+	if (op->a_len == op->b_len) {
+		char *b_str = r_str_ndup ((const char *)op->a_buf + op->a_off, op->a_len);
+		// char *bufasm = r_str_prefix_all (b_str, "  ");
+		u->str = r_str_appendf (u->str, "%s", b_str);
+		// free (bufasm);
+		free (b_str);
+	}
+	return 1;
+}
+#endif
+
+R_API char *r_diff_buffers_to_string(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb) {
+#if 1
+	return r_diff_buffers_unified (d, a, la, b, lb);
+#else
+	// XXX buffers_static doesnt constructs the correct string in this callback
+	void *c = d->callback;
+	void *u = d->user;
+	RDiffUser du = {d, strdup ("")};
+	d->callback = &tostring;
+	d->user = &du;
+	r_diff_buffers_static (d, a, la, b, lb);
+	d->callback = c;
+	d->user = u;
+	return du.str;
+#endif
+}
+
 R_API int r_diff_buffers_static(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb) {
 	int i, len;
 	int hit = 0;
 	la = R_ABS (la);
 	lb = R_ABS (lb);
 	if (la != lb) {
-	 	len = R_MIN(la, lb);
+	 	len = R_MIN (la, lb);
 		eprintf ("Buffer truncated to %d byte(s) (%d not compared)\n", len, R_ABS(lb-la));
 	} else {
 		len = la;
@@ -74,7 +131,10 @@
 }
 
 // XXX: temporary files are
-R_API int r_diff_buffers_unified(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb) {
+R_API char *r_diff_buffers_unified(RDiff *d, const ut8 *a, int la, const ut8 *b, int lb) {
+		r_file_dump (".a", a, la, 0);
+		r_file_dump (".b", b, lb, 0);
+#if 0
 	if (r_mem_is_printable (a, R_MIN (5, la))) {
 		r_file_dump (".a", a, la, 0);
 		r_file_dump (".b", b, lb, 0);
@@ -82,10 +142,15 @@
 		r_file_hexdump (".a", a, la, 0);
 		r_file_hexdump (".b", b, lb, 0);
 	}
-	r_sys_cmd ("diff -ru .a .b");
+#endif
+	char* err = NULL;
+	char* out = NULL;
+	int out_len;
+	(void)r_sys_cmd_str_full ("/usr/bin/diff -u .a .b", NULL, &out, &out_len, &err);
 	r_file_rm (".a");
 	r_file_rm (".b");
-	return 0;
+	free (err);
+	return out;
 }
 
 R_API int r_diff_buffers(RDiff *d, const ut8 *a, ut32 la, const ut8 *b, ut32 lb) {
diff -Nru radare2-2.3.0+dfsg/libr/util/file.c radare2-2.8.0+dfsg/libr/util/file.c
--- radare2-2.3.0+dfsg/libr/util/file.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/file.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2007-2017 - pancake */
+/* radare - LGPL - Copyright 2007-2018 - pancake */
 
 #include "r_types.h"
 #include "r_util.h"
@@ -214,10 +214,11 @@
 }
 
 R_API char *r_file_path(const char *bin) {
-	char file[1024];
 	char *path_env;
+	char *file = NULL;
 	char *path = NULL;
 	char *str, *ptr;
+	const char *extension = "";
 	if (!bin) {
 		return NULL;
 	}
@@ -228,17 +229,23 @@
 		return NULL;
 	}
 	path_env = (char *)r_sys_getenv ("PATH");
+#if __WINDOWS__
+	if (!r_str_endswith (bin, ".exe")) {
+		extension = ".exe";
+	}
+#endif
 	if (path_env) {
 		str = path = strdup (path_env);
 		do {
-			ptr = strchr (str, ':');
+			ptr = strchr (str, R_SYS_ENVSEP[0]);
 			if (ptr) {
 				*ptr = '\0';
-				snprintf (file, sizeof (file), "%s"R_SYS_DIR"%s", str, bin);
+				file = r_str_newf (R_JOIN_2_PATHS ("%s", "%s%s"), str, bin, extension);
 				if (r_file_exists (file)) {
+					free (file);
 					free (path);
 					free (path_env);
-					return strdup (file);
+					return file;
 				}
 				str = ptr + 1;
 			}
@@ -246,6 +253,7 @@
 	}
 	free (path_env);
 	free (path);
+	free (file);
 	return strdup (bin);
 }
 
@@ -444,16 +452,14 @@
 	/* Reservoir Sampling */
 	char *ptr = NULL, *str;
 	int sz, i, lines, selection = -1;
-	struct timeval tv;
 	int start = *line;
 	if ((str = r_file_slurp (file, &sz))) {
-		gettimeofday (&tv, NULL);
-		srand (getpid() + tv.tv_usec);
+		r_num_irand ();
 		for (i = 0; str[i]; i++) {
 			if (str[i] == '\n') {
 				//here rand doesn't have any security implication
 				// https://www.securecoding.cert.org/confluence/display/c/MSC30-C.+Do+not+use+the+rand()+function+for+generating+pseudorandom+numbers
-				if (!(rand() % (++(*line)))) {
+				if (!(r_num_rand ((++(*line))))) {
 					selection = (*line - 1);  /* The line we want. */
 				}
 			}
@@ -574,9 +580,13 @@
 	return true;
 }
 
-R_API bool r_file_dump(const char *file, const ut8 *buf, int len, int append) {
+R_API bool r_file_touch(const char *file) {
+	return r_file_dump(file, NULL, 0, true);
+}
+
+R_API bool r_file_dump(const char *file, const ut8 *buf, int len, bool append) {
 	FILE *fd;
-	if (!file || !*file || !buf || len < 0) {
+	if (!file || !*file) {
 		eprintf ("r_file_dump file: %s buf: %p\n", file, buf);
 		return false;
 	}
@@ -590,13 +600,15 @@
 		eprintf ("Cannot open '%s' for writing\n", file);
 		return false;
 	}
-	if (len < 0) {
-		len = strlen ((const char *)buf);
-	}
-	if (fwrite (buf, len, 1, fd) != 1) {
-		r_sys_perror ("r_file_dump: fwrite: error\n");
-		fclose (fd);
-		return false;
+	if (buf) {
+		if (len < 0) {
+			len = strlen ((const char *)buf);
+		}
+		if (len > 0 && fwrite (buf, len, 1, fd) != 1) {
+			r_sys_perror ("r_file_dump: fwrite: error\n");
+			fclose (fd);
+			return false;
+		}
 	}
 	fclose (fd);
 	return true;
@@ -822,7 +834,9 @@
 R_API RMmap *r_file_mmap (const char *file, bool rw, ut64 base) {
 	RMmap *m = NULL;
 	int fd = -1;
-	if (!rw && !r_file_exists (file)) return m;
+	if (!rw && !r_file_exists (file)) {
+		return m;
+	}
 	fd = r_sandbox_open (file, rw? O_RDWR: O_RDONLY, 0644);
 	if (fd == -1 && !rw) {
 		eprintf ("r_file_mmap: file does not exis.\n");
@@ -904,6 +918,9 @@
 R_API int r_file_mkstemp(const char *prefix, char **oname) {
 	int h = -1;
 	char *path = r_file_tmpdir ();
+	if (!prefix) {
+		prefix = "r2";
+	}
 #if __WINDOWS__
 	LPTSTR name = NULL;
 	LPTSTR path_ = r_sys_conv_utf8_to_utf16 (path);
@@ -933,10 +950,24 @@
 	free (prefix_);
 #else
 	char name[1024];
+	char pfxx[1024];
+	const char *suffix = strchr (prefix, '*');
 
-	snprintf (name, sizeof (name) - 1, "%s/r2.%s.XXXXXX", path, prefix);
+	if (suffix) {
+		suffix++;
+		r_str_ncpy (pfxx, prefix, (size_t)(suffix - prefix));
+		prefix = pfxx;
+	} else {
+		suffix = "";
+	}
+
+	snprintf (name, sizeof (name) - 1, "%s/r2.%s.XXXXXX%s", path, prefix, suffix);
 	mode_t mask = umask (S_IWGRP | S_IWOTH);
-	h = mkstemp (name);
+	if (suffix && *suffix) {
+		h = mkstemps (name, strlen (suffix));
+	} else {
+		h = mkstemp (name);
+	}
 	umask (mask);
 	if (oname) {
 		*oname = (h!=-1)? strdup (name): NULL;
@@ -1002,7 +1033,7 @@
 	/* TODO: implement in C */
 	/* TODO: Use NO_CACHE for iOS dyldcache copying */
 #if HAVE_COPYFILE_H
-	return copyfile (src, dst, 0, 0) != -1;
+	return copyfile (src, dst, 0, COPYFILE_DATA | COPYFILE_XATTR) != -1;
 #elif __WINDOWS__
 	return r_sys_cmdf ("copy %s %s", src, dst);
 #else
@@ -1014,3 +1045,72 @@
 	return rc == 0;
 #endif
 }
+
+static void recursive_search_glob (const char *path, const char *glob, RList* list, int depth) {
+	if (depth < 1) {
+		return;
+	}
+	char* file;
+	RListIter *iter;
+	RList *dir = r_sys_dir (path);
+	r_list_foreach (dir, iter, file) {
+		if (!strcmp (file, ".") || !strcmp (file, "..")) {
+			continue;
+		}
+		char *filename = malloc (strlen (path) + strlen (file) + 2);
+		strcpy (filename, path);
+		strcat (filename, file);
+		if (r_file_is_directory (filename)) {
+			strcat (filename, R_SYS_DIR);
+			recursive_search_glob (filename, glob, list, depth - 1);
+			free (filename);
+		} else if (r_str_glob (file, glob)) {
+			r_list_append (list, filename);
+		} else {
+			free (filename);
+		}
+	}
+	r_list_free (dir);
+}
+
+R_API RList* r_file_globsearch (const char *_globbed_path, int maxdepth) {
+	char *globbed_path = strdup (_globbed_path);
+	RList *files = r_list_newf (free);
+	char *glob = strchr (globbed_path, '*');
+	if (!glob) {
+		r_list_append (files, strdup (globbed_path));
+	} else {
+		*glob = '\0';
+		char *last_slash = (char *)r_str_last (globbed_path, R_SYS_DIR);
+		*glob = '*';
+		char *path, *glob_ptr;
+		if (last_slash) {
+			glob_ptr = last_slash + 1;
+			if (globbed_path[0] == '~') {
+				char *rpath = r_str_newlen (globbed_path + 2, last_slash - globbed_path - 1);
+				path = r_str_home (rpath ? rpath : "");
+				free (rpath);
+			} else {
+				path = r_str_newlen (globbed_path, last_slash - globbed_path + 1);
+			}
+		} else {
+			glob_ptr = globbed_path;
+			path = r_str_newf (".%s", R_SYS_DIR);
+		}
+
+		if (!path) {
+			r_list_free (files);
+			free (globbed_path);
+			return NULL;
+		}
+
+		if (*(glob + 1) == '*') {  // "**"
+			recursive_search_glob (path, glob_ptr, files, maxdepth);
+		} else {                   // "*"
+			recursive_search_glob (path, glob_ptr, files, 1);
+		}
+		free (path);
+	}
+	free (globbed_path);
+	return files;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/format.c radare2-2.8.0+dfsg/libr/util/format.c
--- radare2-2.3.0+dfsg/libr/util/format.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/format.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2284 @@
+/* radare - LGPL - Copyright 2007-2018 - pancake & Skia */
+
+#include "r_cons.h"
+#include "r_util.h"
+#include "r_print.h"
+#include "r_reg.h"
+#ifdef _MSC_VER
+#include <time.h>
+#endif
+#define NOPTR 0
+#define PTRSEEK 1
+#define PTRBACK 2
+#define NULLPTR 3
+#define STRUCTPTR 100
+#define NESTEDSTRUCT 1
+#define STRUCTFLAG 10000
+#define NESTDEPTH 14
+#define ARRAYINDEX_COEF 10000
+
+#define MUSTSEE (mode & R_PRINT_MUSTSEE && mode & R_PRINT_ISFIELD && !(mode & R_PRINT_JSON))
+#define MUSTSET (mode & R_PRINT_MUSTSET && mode & R_PRINT_ISFIELD && setval)
+#define SEEVALUE (mode & R_PRINT_VALUE)
+#define MUSTSEEJSON (mode & R_PRINT_JSON && mode & R_PRINT_ISFIELD)
+
+//this define is used as a way to acknowledge when updateAddr should take len
+//as real len of the buffer
+#define THRESHOLD -4444
+
+//TODO REWRITE THIS IS BECOMING A NIGHTMARE
+
+static float updateAddr(const ut8 *buf, int len, int endian, ut64 *addr, ut64 *addr64) {
+	float f = 0.0;
+	// assert sizeof (float) == sizeof (ut32))
+	ut32 tmpaddr;
+	// XXX 999 is used as an implicit buffer size, we should pass the buffer size to every function too, otherwise this code will give us some problems
+	if (len >= THRESHOLD - 7 && len < THRESHOLD) {
+		len = len + THRESHOLD; // get the real len to avoid oob
+	} else {
+		len = 999;
+	}
+	if (len >= sizeof (float)) {
+		r_mem_swaporcopy ((ut8*)&f, buf, sizeof (float), endian);
+	}
+	if (addr && len > 3) {
+		tmpaddr = r_read_ble32 (buf, endian);
+		*addr = (ut64)tmpaddr;
+	}
+	if (addr64 && len > 7) {
+		*addr64 = r_read_ble64 (buf, endian);
+	}
+	return f;
+}
+
+static int r_get_size(RNum *num, ut8 *buf, int endian, const char *s) {
+	int size = 0, len = strlen (s);
+	ut64 addr;
+
+	if (s[0] == '*' && len >= 4) { // value pointed by the address
+		int offset = (int)r_num_math (num, s + 1);
+		(void)updateAddr (buf + offset, 999, endian, &addr, NULL);
+		return addr;
+	} else {
+		// flag handling doesnt seems to work here
+		size = r_num_math (num, s);
+	}
+	return size;
+}
+
+static void r_print_format_quadword(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	ut64 addr64;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size / ARRAYINDEX_COEF - 1;
+		size %= ARRAYINDEX_COEF;
+	}
+	updateAddr (buf + i, size - i, endian, NULL, &addr64);
+	if (MUSTSET) {
+		p->cb_printf ("wv8 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*8:0));
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08"PFMT64x" = (qword)",
+				seeki + ((elem >= 0)? elem * 2: 0));
+		}
+		if (size == -1) {
+			p->cb_printf ("0x%016"PFMT64x, addr64);
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, NULL, &addr64);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("0x%016"PFMT64x, addr64);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 8;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1) {
+			p->cb_printf ("%"PFMT64d, addr64);
+		} else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, NULL, &addr64);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%"PFMT64d, addr64);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) elem--;
+				i += 8;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static void r_print_format_byte(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size / ARRAYINDEX_COEF - 1;
+		size %= ARRAYINDEX_COEF;
+	}
+	if (MUSTSET) {
+		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki + ((elem >= 0) ? elem : 0));
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08"PFMT64x" = ", seeki + ((elem >= 0) ? elem : 0));
+		}
+		if (size == -1) {
+			p->cb_printf ("0x%02x", buf[i]);
+		} else {
+			if (!SEEVALUE) p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("0x%02x", buf[i]);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i++;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1) {
+			p->cb_printf ("%d", buf[i]);
+		} else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					p->cb_printf (", %d", buf[i]);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i++;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+// Return number of consumed bytes
+static int r_print_format_uleb(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	int elem = -1;
+	int s = 0, offset = 0;
+	ut64 value = 0;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size / ARRAYINDEX_COEF - 1;
+		size %= ARRAYINDEX_COEF;
+	}
+	if (MUSTSET) {
+		ut8 *tmp;
+		char *nbr;
+		do {
+			r_uleb128_decode (buf+i, &s, &value);
+			i += s;
+			offset += s;
+		} while (elem--);
+		tmp = (ut8*) r_uleb128_encode (r_num_math (NULL, setval), &s);
+		nbr = r_hex_bin2strdup (tmp, s);
+		p->cb_printf ("\"wx %s\" @ 0x%08"PFMT64x"\n", nbr, seeki+offset-s);
+		free (tmp);
+		free (nbr);
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		if (size==-1) {
+			r_uleb128_decode (buf+i, &offset, &value);
+			p->cb_printf ("%"PFMT64d, value);
+		} else {
+			if (!SEEVALUE) p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					r_uleb128_decode (buf+i, &s, &value);
+					i += s;
+					offset += s;
+					p->cb_printf ("%"PFMT64d, value);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1) {
+			r_uleb128_decode (buf+i, &offset, &value);
+			p->cb_printf ("\"%"PFMT64d"\"", value);
+		} else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					r_uleb128_decode (buf+i, &s, &value);
+					i += s;
+					offset += s;
+					p->cb_printf ("\"%"PFMT64d"\"", value);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+	return offset;
+}
+
+static void r_print_format_char(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	if (MUSTSET) {
+		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem:0));
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*2:0)); //XXX:: shouldn't it be elem*1??
+		if (size==-1)
+			p->cb_printf ("'%c'", IS_PRINTABLE (buf[i])?buf[i]:'.');
+		else {
+			if (!SEEVALUE) p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("'%c'", IS_PRINTABLE (buf[i])?buf[i]:'.');
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i++;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1)
+			p->cb_printf ("\"%c\"", IS_PRINTABLE (buf[i])?buf[i]:'.');
+		else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("\"%c\"", IS_PRINTABLE (buf[i])?buf[i]:'.');
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i++;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static void r_print_format_decchar(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	if (MUSTSET) {
+		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem:0));
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem:0));
+		if (size==-1)
+			p->cb_printf ("%d", buf[i]);
+		else {
+			if (!SEEVALUE) p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%d", buf[i]);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i++;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1)
+			p->cb_printf ("\"%d\"", buf[i]);
+		else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("\"%d\"", buf[i]);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i++;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static int r_print_format_string(const RPrint* p, ut64 seeki, ut64 addr64, ut64 addr, int is64, int mode) {
+	ut8 buffer[255];
+	buffer[0] = 0;
+	if (!p->iob.read_at) {
+		eprintf ("(cannot read memory)\n");
+		return -1;
+	}
+	int res = (is64 == 1)
+		? p->iob.read_at (p->iob.io, addr64, buffer, sizeof (buffer) - 8)
+		: p->iob.read_at (p->iob.io, (ut64)addr, buffer, sizeof (buffer) - 8);
+	if (MUSTSEEJSON) {
+		char *encstr = r_str_utf16_encode ((const char *)buffer, -1);
+		if (encstr) {
+			p->cb_printf ("%d,\"string\":\"%s\"}", seeki, encstr);
+			free (encstr);
+		}
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" -> 0x%08"PFMT64x" ", seeki, addr);
+		if (res && buffer[0] != 0xff && buffer[1] != 0xff) {
+			p->cb_printf ("%s", buffer);
+		}
+	}
+	return 0;
+}
+
+static void r_print_format_time(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	ut64 addr;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	updateAddr (buf + i, size - i, endian, &addr, NULL);
+	if (MUSTSET) {
+		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
+	} else if (MUSTSEE) {
+		char *timestr = strdup(asctime (gmtime ((time_t*)&addr)));
+		*(timestr+24) = '\0';
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		if (size==-1) {
+			p->cb_printf ("%s", timestr);
+		} else {
+			if (!SEEVALUE) p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				free (timestr);
+				timestr = strdup (asctime (gmtime ((time_t*)&addr)));
+				*(timestr+24) = '\0';
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%s", timestr);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 4;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+		free (timestr);
+	} else if (MUSTSEEJSON) {
+		char *timestr = strdup (asctime (gmtime ((time_t*)&addr)));
+		*(timestr+24) = '\0';
+		if (size==-1) {
+			p->cb_printf ("\"%s\"", timestr);
+		} else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				free (timestr);
+				timestr = strdup (asctime (gmtime ((time_t*)&addr)));
+				*(timestr+24) = '\0';
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("\"%s\"", timestr);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 4;
+			}
+			p->cb_printf (" ]");
+		}
+		free (timestr);
+		p->cb_printf ("}");
+	}
+}
+
+// TODO: support unsigned int?
+static void r_print_format_hex(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	ut64 addr;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	updateAddr (buf + i, size - i, endian, &addr, NULL);
+	if (MUSTSET) {
+		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
+	} else if (mode & R_PRINT_DOT) {
+		p->cb_printf ("%"PFMT64d, addr);
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		if (size==-1) {
+			p->cb_printf ("%"PFMT64d, addr);
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%"PFMT64d, addr);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 4;
+			}
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1)
+			p->cb_printf ("%d", addr);
+		else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%d", addr);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i+=4;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static void r_print_format_int(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	ut64 addr;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	updateAddr (buf + i, size - i, endian, &addr, NULL);
+	if (MUSTSET) {
+		p->cb_printf ("wv4 %s @ %"PFMT64d"\n", setval, seeki+((elem>=0)?elem*4:0));
+	} else if (mode & R_PRINT_DOT) {
+		p->cb_printf ("0x%08"PFMT64x, addr);
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		}
+		if (size == -1) {
+			p->cb_printf ("%"PFMT64d, (st64)(st32)addr);
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%"PFMT64d, (st64)(st32)addr);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 4;
+			}
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1)
+			p->cb_printf ("%d", addr);
+		else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%d", addr);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i+=4;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static int r_print_format_disasm(const RPrint* p, ut64 seeki, int size) {
+	ut64 prevseeki = seeki;
+
+	if (!p->disasm || !p->user) {
+		return 0;
+	}
+
+	size = R_MAX (1, size);
+
+	while (size-- > 0) {
+		seeki += p->disasm (p->user, seeki);
+	}
+
+	return seeki - prevseeki;
+}
+
+static void r_print_format_octal (const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	ut64 addr;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	updateAddr (buf + i, size - i, endian, &addr, NULL);
+	if (MUSTSET) {
+		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
+	} else if (mode & R_PRINT_DOT) {
+		p->cb_printf ("0%"PFMT64o, addr);
+	} else if (MUSTSEE) {
+		ut32 addr32 = (ut32)addr;
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		if (!SEEVALUE) p->cb_printf ("(octal) ");
+		if (size==-1)
+			p->cb_printf (" 0%08"PFMT64o, addr32);
+		else {
+			if (!SEEVALUE) p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				addr32 = (ut32)addr;
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("0%08"PFMT64o, addr32);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i+=4;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+	} else if (MUSTSEEJSON) {
+		ut32 addr32 = (ut32)addr;
+		if (size==-1)
+			p->cb_printf ("%d", addr32);
+		else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf, i, endian, &addr, NULL);
+				addr32 = (ut32)addr;
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%d", addr32);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i+=4;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static void r_print_format_hexflag(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	ut64 addr = 0;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	updateAddr (buf + i, size - i, endian, &addr, NULL);
+	if (MUSTSET) {
+		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
+	} else if (mode & R_PRINT_DOT) {
+		p->cb_printf ("0x%08"PFMT64x, addr & UT32_MAX);
+	} else if (MUSTSEE) {
+		ut32 addr32 = (ut32)addr;
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
+		if (size==-1) {
+			p->cb_printf ("0x%08"PFMT64x, (ut64)addr32);
+		} else {
+			if (!SEEVALUE) p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				addr32 = (ut32)addr;
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("0x%08"PFMT64x, addr32);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1)
+					p->cb_printf (", ");
+				if (elem > -1) elem--;
+				i+=4;
+			}
+			if (!SEEVALUE) p->cb_printf (" ]");
+		}
+	} else if (MUSTSEEJSON) {
+		ut32 addr32 = (ut32)addr;
+		if (size==-1)
+			p->cb_printf ("%d", addr32);
+		else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				updateAddr (buf + i, size - i, endian, &addr, NULL);
+				addr32 = (ut32)addr;
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%d", addr32);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (",");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 4;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static int r_print_format_10bytes(const RPrint* p, int mode, const char* setval,
+		ut64 seeki, ut64 addr, ut8* buf) {
+	ut8 buffer[255];
+	int j;
+	if (MUSTSET) {
+		p->cb_printf ("?e pf B not yet implemented\n");
+	} else if (mode & R_PRINT_DOT) {
+		for (j = 0; j<10; j++) {
+			p->cb_printf ("%02x ", buf[j]);
+		}
+	} else if (MUSTSEE) {
+		if (!p->iob.read_at) {
+			printf ("(cannot read memory)\n");
+			return -1;
+		}
+		p->iob.read_at (p->iob.io, (ut64)addr, buffer, 248);
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		for (j=0; j<10; j++) {
+			p->cb_printf ("%02x ", buf[j]);
+		}
+		if (!SEEVALUE) p->cb_printf (" ... (");
+		for (j = 0; j < 10; j++) {
+			if (!SEEVALUE) {
+				if (IS_PRINTABLE (buf[j])) {
+					p->cb_printf ("%c", buf[j]);
+				} else {
+					p->cb_printf (".");
+				}
+			}
+		}
+		if (!SEEVALUE) p->cb_printf (")");
+	} else if (MUSTSEEJSON) {
+		if (!p->iob.read_at) {
+			printf ("(cannot read memory)\n");
+			return -1;
+		} else {
+			p->iob.read_at (p->iob.io, (ut64)addr, buffer, 248);
+		}
+		p->cb_printf ("[ %d", buf[0]);
+		j = 1;
+		for (; j < 10; j++) {
+			p->cb_printf (", %d", buf[j]);
+		}
+		p->cb_printf ("]");
+		return 0;
+	}
+	return 0;
+}
+
+static int r_print_format_hexpairs(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	int j;
+	size = (size == -1) ? 1 : size;
+	if (MUSTSET) {
+		p->cb_printf ("?e pf X not yet implemented\n");
+	} else if (mode & R_PRINT_DOT) {
+		for (j = 0; j < size; j++) {
+			p->cb_printf ("%02x", buf[i + j]);
+		}
+	} else if (MUSTSEE) {
+		size = (size < 1) ? 1 : size;
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		for (j = 0; j < size; j++) {
+			p->cb_printf ("%02x ", buf[i + j]);
+		}
+		if (!SEEVALUE) p->cb_printf (" ... (");
+		for (j=0; j<size; j++) {
+			if (!SEEVALUE) {
+				if (IS_PRINTABLE (buf[j]))
+					p->cb_printf ("%c", buf[i+j]);
+				else
+					p->cb_printf (".");
+			}
+		}
+		p->cb_printf (")");
+	} else if (MUSTSEEJSON) {
+		size = (size < 1) ? 1 : size;
+		p->cb_printf ("[ %d", buf[0]);
+		j = 1;
+		for (; j < 10; j++)
+			p->cb_printf (", %d", buf[j]);
+		p->cb_printf ("]}");
+		return size;
+	}
+	return size;
+}
+
+static void r_print_format_float(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	float val_f = 0.0f;
+	ut64 addr = 0;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF - 1;
+		size %= ARRAYINDEX_COEF;
+	}
+	val_f = updateAddr (buf + i, 999, endian, &addr, NULL);
+	if (MUSTSET) {
+		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval,
+			seeki + ((elem >= 0) ? elem * 4 : 0));
+	} else if (mode & R_PRINT_DOT) {
+		p->cb_printf ("%f", val_f);
+	} else {
+		if (MUSTSEE) {
+			if (!SEEVALUE) {
+				p->cb_printf ("0x%08"PFMT64x" = ",
+					seeki + ((elem >= 0) ? elem * 4 : 0));
+			}
+		}
+		if (size == -1) {
+			p->cb_printf ("%f", val_f);
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
+			while (size--) {
+				val_f = updateAddr (buf + i, 9999, endian, &addr, NULL);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%f", val_f);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 4;
+			}
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
+		}
+		if (MUSTSEEJSON) {
+			p->cb_printf ("}");
+		}
+	}
+}
+
+
+static void r_print_format_double(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	double val_f = 0.0;
+	ut64 addr = 0;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF - 1;
+		size %= ARRAYINDEX_COEF;
+	}
+	updateAddr (buf + i, 999, endian, &addr, NULL);
+	r_mem_swaporcopy ((ut8*)&val_f, buf + i, sizeof (double), endian);
+	if (MUSTSET) {
+		p->cb_printf ("wv8 %s @ 0x%08"PFMT64x"\n", setval,
+			seeki + ((elem >= 0) ? elem * 8 : 0));
+	} else if (mode & R_PRINT_DOT) {
+		p->cb_printf ("%f", val_f);
+	} else {
+		if (MUSTSEE) {
+			if (!SEEVALUE) {
+				p->cb_printf ("0x%08"PFMT64x" = ",
+					seeki + ((elem >= 0) ? elem * 8 : 0));
+			}
+		}
+		if (size == -1) {
+			p->cb_printf ("%f", val_f);
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
+			while (size--) {
+				// XXX this 999 is scary
+				updateAddr (buf + i, 9999, endian, &addr, NULL);
+				r_mem_swaporcopy ((ut8*)&val_f, buf + i, sizeof (double), endian);
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%f", val_f);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 8;
+			}
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
+		}
+		if (MUSTSEEJSON) {
+			p->cb_printf ("}");
+		}
+	}
+}
+
+static void r_print_format_word(const RPrint* p, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	ut64 addr;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size/ARRAYINDEX_COEF-1;
+		size %= ARRAYINDEX_COEF;
+	}
+	addr = endian
+		? (*(buf + i)) << 8 | (*(buf + i + 1))
+		: (*(buf + i + 1)) << 8 | (*(buf + i));
+	if (MUSTSET) {
+		p->cb_printf ("wv2 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*2:0));
+	} else if (mode & R_PRINT_DOT) {
+		if (size == -1) {
+			p->cb_printf ("0x%04x", addr);
+		}
+		while ((size -= 2) > 0) {
+			addr = endian
+				? (*(buf+i))<<8 | (*(buf+i+1))
+				: (*(buf+i+1))<<8 | (*(buf+i));
+			if (elem == -1 || elem == 0) {
+				p->cb_printf ("%d", addr);
+				if (elem == 0) elem = -2;
+			}
+			if (size != 0 && elem == -1) {
+				p->cb_printf (",");
+			}
+			if (elem > -1) {
+				elem--;
+			}
+			i += 2;
+		}
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*2:0));
+		}
+		if (size==-1) {
+			p->cb_printf ("0x%04x", addr);
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
+			while (size--) {
+				addr = endian
+					? (*(buf+i))<<8 | (*(buf+i+1))
+					: (*(buf+i+1))<<8 | (*(buf+i));
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("0x%04x", addr);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += 2;
+			}
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
+		}
+	} else if (MUSTSEEJSON) {
+		if (size==-1) {
+			p->cb_printf ("%d", addr);
+		} else {
+			p->cb_printf ("[ ");
+			while ( (size -= 2) >0) {
+				addr = endian
+					? (*(buf+i))<<8 | (*(buf+i+1))
+					: (*(buf+i+1))<<8 | (*(buf+i));
+				if (elem == -1 || elem == 0) {
+					p->cb_printf ("%d", addr);
+					if (elem == 0) elem = -2;
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (",");
+				}
+				if (elem > -1) elem--;
+				i += 2;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+static void r_print_format_nulltermstring(const RPrint* p, const int len, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	if (MUSTSET) {
+		int buflen = strlen ((const char *)buf+seeki), vallen = strlen(setval);
+		char *newstring, *ons;
+		newstring = ons = strdup(setval);
+		if ((newstring[0] == '\"' && newstring[vallen-1] == '\"')
+				|| (newstring[0] == '\'' && newstring[vallen-1] == '\'')) {
+			newstring[vallen-1] = '\0';
+			newstring++;
+			vallen -= 2;
+		}
+		if (vallen > buflen) {
+			eprintf ("Warning: new string is longer than previous one\n");
+		}
+		p->cb_printf ("wx ");
+		for (i = 0; i < vallen; i++) {
+			if (i < vallen - 3 && newstring[i] == '\\' && newstring[i + 1] == 'x') {
+				p->cb_printf ("%c%c", newstring[i + 2], newstring[i + 3]);
+				i += 3;
+			} else {
+				p->cb_printf ("%2x", newstring[i]);
+			}
+		}
+		p->cb_printf (" @ 0x%08"PFMT64x"\n", seeki);
+		free(ons);
+	} else if (mode & R_PRINT_DOT) {
+		int j = i;
+		p->cb_printf ("\\\"", seeki);
+		for (; j<len && ((size==-1 || size-- >0) && buf[j]) ; j++) {
+			char ch = buf[j];
+			if (ch == '"') {
+				p->cb_printf ("\\\"");
+			} else if (IS_PRINTABLE (ch)) {
+				p->cb_printf ("%c", ch);
+			} else p->cb_printf (".");
+		}
+		p->cb_printf ("\\\"");
+	} else if (MUSTSEE) {
+		int j = i;
+		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		for (; j < len && ((size == -1 || size-- > 0) && buf[j]) ; j++) {
+			if (IS_PRINTABLE (buf[j])) {
+				p->cb_printf ("%c", buf[j]);
+			} else {
+				p->cb_printf (".");
+			}
+		}
+	} else if (MUSTSEEJSON) {
+		char * utf_encoded_buf = NULL;
+		p->cb_printf ("%d,\"string\":\"", seeki);
+		utf_encoded_buf = r_str_escape_utf8 ((const char *) buf, true, true);
+		if (utf_encoded_buf){
+			p->cb_printf ("%s", utf_encoded_buf);
+			free (utf_encoded_buf);
+		}
+		p->cb_printf ("\"}");
+	}
+}
+
+static void r_print_format_nulltermwidestring(const RPrint* p, const int len, int endian, int mode,
+		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
+	if (MUSTSET) {
+		int vallen = strlen(setval);
+		char *newstring, *ons;
+		newstring = ons = strdup(setval);
+		if ((newstring[0] == '\"' && newstring[vallen-1] == '\"')
+				|| (newstring[0] == '\'' && newstring[vallen-1] == '\'')) {
+			newstring[vallen - 1] = '\0';
+			newstring++;
+			vallen -= 2;
+		}
+		if ((size = strlen (setval)) > r_wstr_clen((char*)(buf+seeki))) {
+			eprintf ("Warning: new string is longer than previous one\n");
+		}
+		p->cb_printf ("ww %s @ 0x%08"PFMT64x"\n", newstring, seeki);
+		free(ons);
+	} else if (MUSTSEE) {
+		int j = i;
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+		}
+		for (; j<len && ((size==-1 || size-->0) && buf[j]) ; j+=2) {
+			if (IS_PRINTABLE (buf[j])) {
+				p->cb_printf ("%c", buf[j]);
+			} else {
+				p->cb_printf (".");
+			}
+		}
+	}
+}
+
+static void r_print_format_bitfield(const RPrint* p, ut64 seeki, char* fmtname,
+		char* fieldname, ut64 addr, int mode, int size) {
+	char *bitfield = NULL;
+	switch (size) {
+	case 1: addr &= UT8_MAX; break;
+	case 2: addr &= UT16_MAX; break;
+	case 4: addr &= UT32_MAX; break;
+	}
+	if (MUSTSEE && !SEEVALUE) {
+		p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+	}
+	bitfield = r_type_enum_getbitfield (p->sdb_types, fmtname, addr);
+	if (bitfield && *bitfield) {
+		if (MUSTSEEJSON) p->cb_printf ("\"%s\"}", bitfield);
+		else if (MUSTSEE) p->cb_printf (" %s (bitfield) = %s\n", fieldname, bitfield);
+	} else {
+		if (MUSTSEEJSON) p->cb_printf ("\"`tb %s 0x%x`\"}", fmtname, addr);
+		else if (MUSTSEE) p->cb_printf (" %s (bitfield) = `tb %s 0x%x`\n",
+				fieldname, fmtname, addr);
+	}
+	free (bitfield);
+}
+
+static void r_print_format_enum (const RPrint* p, ut64 seeki, char* fmtname,
+		char* fieldname, ut64 addr, int mode, int size) {
+	char *enumvalue = NULL;
+	switch (size) {
+	case 1: addr &= UT8_MAX; break;
+	case 2: addr &= UT16_MAX; break;
+	case 4: addr &= UT32_MAX; break;
+	}
+	if (MUSTSEE && !SEEVALUE) {
+		p->cb_printf ("0x%08"PFMT64x" = ", seeki);
+	}
+	enumvalue = r_type_enum_member (p->sdb_types, fmtname, NULL, addr);
+	if (enumvalue && *enumvalue) {
+		if (mode & R_PRINT_DOT) {
+			p->cb_printf ("%s.%s", fmtname, enumvalue);
+		} else if (MUSTSEEJSON) {
+			p->cb_printf ("\"%s\"}", fmtname);
+		} else if (MUSTSEE) {
+			p->cb_printf ("%s (enum %s) = 0x%"PFMT64x" ; %s\n",
+				fieldname, fmtname, addr, enumvalue);
+		}
+	} else {
+		if (MUSTSEEJSON) {
+			p->cb_printf ("\"`te %s 0x%x`\"}", fmtname, addr);
+		} else if (MUSTSEE) {
+			p->cb_printf ("%s (enum %s) = 0x%x\n",//`te %s 0x%x`\n",
+				fieldname, fmtname, addr); //enumvalue); //fmtname, addr);
+		}
+	}
+	free (enumvalue);
+}
+
+static void r_print_format_register (const RPrint* p, int mode,
+		const char *name, const char* setval) {
+	if (!p || !p->get_register || !p->reg) {
+		return;
+	}
+	RRegItem *ri = p->get_register (p->reg, name, R_REG_TYPE_ALL);
+	if (ri) {
+		if (MUSTSET) {
+			p->cb_printf ("dr %s=%s\n", name, setval);
+		} else if (MUSTSEE) {
+			if (!SEEVALUE) p->cb_printf("%s : 0x%08"PFMT64x"\n", ri->name, p->get_register_value (p->reg, ri));
+			else p->cb_printf("0x%08"PFMT64x"\n", p->get_register_value (p->reg, ri));
+		} else if (MUSTSEEJSON) {
+			p->cb_printf ("%d}", p->get_register_value (p->reg, ri));
+		}
+	} else {
+		p->cb_printf ("Register %s does not exists\n", name);
+	}
+}
+
+static void r_print_format_num_specifier (const RPrint *p, ut64 addr, int bytes, int sign) {
+#define EXT(T) (sign ? (signed T)(addr) : (unsigned T)(addr) )
+	const char *fs64 = sign ? "%"PFMT64d : "%"PFMT64u;
+	const char *fs = sign ? "%d" : "%u";
+	if (bytes == 1) {
+		p->cb_printf (fs, EXT(char));
+	} else if (bytes == 2) {
+		p->cb_printf (fs, EXT(short));
+	} else if (bytes == 4) {
+		p->cb_printf (fs, EXT(int)); //XXX: int is not necessarily 4 bytes I guess.
+	} else if (bytes == 8) {
+		p->cb_printf (fs64, addr);
+	}
+#undef EXT
+}
+
+static void r_print_format_num (const RPrint *p, int endian, int mode, const char *setval, ut64 seeki, ut8 *buf, int i, int bytes, int sign, int size) {
+	ut64 addr = 0LL;
+	int elem = -1;
+	if (size >= ARRAYINDEX_COEF) {
+		elem = size / ARRAYINDEX_COEF - 1;
+		size %= ARRAYINDEX_COEF;
+	}
+	if (bytes == 8) {
+		updateAddr (buf + i, size - i, endian, NULL, &addr);
+	} else {
+		updateAddr (buf + i, size - i, endian, &addr, NULL);
+	}
+	if (MUSTSET) {
+		p->cb_printf ("wv%d %s @ 0x%08"PFMT64x"\n", bytes, setval, seeki+((elem>=0)?elem*(bytes):0));
+	} else if (mode & R_PRINT_DOT) {
+		p->cb_printf ("%"PFMT64u, addr);
+	} else if (MUSTSEE) {
+		if (!SEEVALUE) {
+			p->cb_printf ("0x%08"PFMT64x" = ", seeki + ((elem >= 0)? elem * bytes: 0));
+		}
+		if (size == -1) {
+			r_print_format_num_specifier (p, addr, bytes, sign);
+		} else {
+			if (!SEEVALUE) {
+				p->cb_printf ("[ ");
+			}
+			while (size--) {
+				if (bytes == 8) {
+					updateAddr (buf + i, size - i, endian, NULL, &addr);
+				} else {
+					updateAddr (buf + i, size - i, endian, &addr, NULL);
+				}
+				if (elem == -1 || elem == 0) {
+					r_print_format_num_specifier (p, addr, bytes, sign);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += bytes;
+			}
+			if (!SEEVALUE) {
+				p->cb_printf (" ]");
+			}
+		}
+	} else if (MUSTSEEJSON) {
+		if (size == -1) {
+			r_print_format_num_specifier (p, addr, bytes, sign);
+		} else {
+			p->cb_printf ("[ ");
+			while (size--) {
+				if (bytes == 8) {
+					updateAddr (buf + i, size, endian, NULL, &addr);
+				} else {
+					updateAddr (buf + i, size, endian, &addr, NULL);
+				}
+				if (elem == -1 || elem == 0) {
+					r_print_format_num_specifier (p, addr, bytes, sign);
+					if (elem == 0) {
+						elem = -2;
+					}
+				}
+				if (size != 0 && elem == -1) {
+					p->cb_printf (", ");
+				}
+				if (elem > -1) {
+					elem--;
+				}
+				i += bytes;
+			}
+			p->cb_printf (" ]");
+		}
+		p->cb_printf ("}");
+	}
+}
+
+// XXX: this is somewhat incomplete. must be updated to handle all format chars
+int r_print_format_struct_size(const char *f, RPrint *p, int mode, int n) {
+	char *end, *args, *fmt;
+	int size = 0, tabsize = 0, i, idx = 0, biggest = 0, fmt_len = 0;
+	bool tabsize_set = false;
+	if (!f) {
+		return -1;
+	}
+	if (n >= 5) {  // This is the nesting level, is this not a bit arbitrary?!
+		return 0;
+	}
+	char *o = strdup (f);
+	if (!o) {
+		return -1;
+	}
+	end = strchr (o, ' ');
+	fmt = o;
+	if (!end && !(end = strchr (o, '\0'))) {
+		free (o);
+		return -1;
+	}
+	if (*end) {
+		*end = 0;
+		args = strdup (end + 1);
+	} else {
+		args = strdup ("");
+	}
+	if (fmt[0] == '0') {
+		mode |= R_PRINT_UNIONMODE;
+		fmt++;
+	} else {
+		mode &= ~R_PRINT_UNIONMODE;
+	}
+
+	i = 0;
+	if (IS_DIGIT(fmt[i])) {
+		while (IS_DIGIT(fmt[i])) {
+			i++;
+		}
+	}
+
+	int words = r_str_word_set0_stack (args);
+	fmt_len = strlen (fmt);
+	for (; i < fmt_len; i++) {
+		if (fmt[i] == '[') {
+			char *end = strchr (fmt + i,']');
+			if (!end) {
+				eprintf ("No end bracket.\n");
+				continue;
+			}
+			*end = '\0';
+			tabsize_set = true;
+			tabsize = r_num_math (NULL, fmt + i + 1);
+			*end = ']';
+			while (fmt[i++] != ']');
+		} else {
+			tabsize = 1;
+		}
+
+		switch (fmt[i]) {
+		case '.':
+			idx--;
+		case 'c':
+		case 'b':
+		case 'X':
+			size += tabsize * 1;
+			break;
+		case 'w':
+			size += tabsize * 2;
+			break;
+		case ':':
+			idx--;
+		case 'd':
+		case 'o':
+		case 'i':
+		case 'x':
+		case 'f':
+		case 's':
+		case 't':
+			size += tabsize * 4;
+			break;
+		case 'S':
+		case 'q':
+		case 'F':
+			size += tabsize * 8;
+			break;
+		case 'z':
+		case 'Z':
+			size += tabsize;
+			break;
+		case '*':
+			size += tabsize * (p->bits / 8);
+			i++;
+			idx--;	//no need to go ahead for args
+			break;
+		case 'B':
+		case 'E':
+			if (tabsize_set) {
+				switch (tabsize) {
+				case 1: size += 1; break;
+				case 2: size += 2; break;
+				case 4: size += 4; break;
+				case 8: size += 8; break;
+				default:
+					eprintf ("Unknown enum format size: %d\n", tabsize);
+					break;
+				}
+			} else {
+				size += 4; // Assuming by default enum as int
+			}
+			break;
+		case '?':
+			{
+			const char *wordAtIndex = NULL;
+			const char *format = NULL;
+			char *endname = NULL, *structname = NULL;
+			char tmp = 0;
+			if (words < idx) {
+				eprintf ("Index out of bounds\n");
+			} else {
+				wordAtIndex = r_str_word_get0 (args, idx);
+			}
+			if (!wordAtIndex) {
+				break;
+			}
+			structname = strdup (wordAtIndex);
+			if (*structname == '(') {
+				endname = (char*)r_str_rchr (structname, NULL, ')');
+			} else {
+				free (structname);
+				break;
+			}
+			if (endname) {
+				*endname = '\0';
+			}
+			format = strchr (structname, ' ');
+			if (format) {
+				tmp = *format;
+				while (tmp == ' ') {
+					format++;
+					tmp = *format;
+				}
+			} else {
+				format = sdb_get (p->formats, structname + 1, NULL);
+				if (format && !strncmp (format, f, strlen (format) - 1)) { // Avoid recursion here
+					return -1;
+				}
+				if (!format) { // Fetch format from types db
+					format = r_type_format (p->sdb_types, structname + 1);
+				}
+			}
+			if (!format) {
+				eprintf ("Cannot find format for struct `%s'\n", structname + 1);
+				return 0;
+			}
+			int newsize = r_print_format_struct_size (format, p, mode, n + 1);
+			if (newsize < 1) {
+				eprintf ("Cannot find size for `%s'\n", format);
+				return 0;
+			}
+			if (format && newsize > 0) {
+				size += tabsize * newsize;
+			}
+			free (structname);
+			}
+			break;
+		case '{':
+			while (fmt[i] != '}') {
+				if (!fmt[i]) {
+					free (o);
+					free (args);
+					return -1;
+				}
+				i++;
+			}
+			i++;
+			idx--;
+			break;
+		case '}':
+			free (o);
+			free (args);
+			return -1;
+		case '+':
+		case 'e':
+			idx--;
+			break;
+		case 'p':
+			if (fmt[i+1] == '2') {
+				size += tabsize * 2;
+			} else if (fmt[i+1] == '4') {
+				size += tabsize * 4;
+			} else if (fmt[i+1] == '8') {
+				size += tabsize * 8;
+			} else {
+				size += tabsize * (p->bits / 8);
+				break;
+			}
+			i++;
+			break;
+		case 'r':
+			break;
+		case 'n':
+		case 'N':
+			if (fmt[i+1] == '1') {
+				size += tabsize * 1;
+			} else if (fmt[i+1] == '2') {
+				size += tabsize * 2;
+			} else if (fmt[i+1] == '4') {
+				size += tabsize * 4;
+			} else if (fmt[i+1] == '8') {
+				size += tabsize * 8;
+			} else {
+				eprintf ("Invalid n format.\n");
+				free (o);
+				free (args);
+				return -2;
+			}
+			i++;
+			break;
+		case 'D':
+		case 'T':
+		case 'u':
+			//TODO complete this.
+		default:
+			//idx--; //Does this makes sense?
+			break;
+		}
+		idx++;
+		if (mode & R_PRINT_UNIONMODE) {
+			if (size > biggest) {
+				biggest = size;
+			}
+			size = 0;
+		}
+	}
+	free (o);
+	free (args);
+	return (mode & R_PRINT_UNIONMODE)? biggest : size;
+}
+
+static int r_print_format_struct(RPrint* p, ut64 seek, const ut8* b, int len, const char *name,
+		int slide, int mode, const char *setval, char *field, int anon) {
+	const char *fmt;
+	char namefmt[128];
+	slide++;
+	if ((slide % STRUCTPTR) > NESTDEPTH || (slide % STRUCTFLAG)/STRUCTPTR > NESTDEPTH) {
+		eprintf ("Too much nested struct, recursion too deep...\n");
+		return 0;
+	}
+	if (anon) {
+		fmt = name;
+	} else {
+		fmt = sdb_get (p->formats, name, NULL);
+		if (!fmt) { // Fetch struct info from types DB
+			fmt = r_type_format (p->sdb_types, name);
+		}
+	}
+	if (!fmt || !*fmt) {
+		eprintf ("Undefined struct '%s'.\n", name);
+		return 0;
+	}
+	if (MUSTSEE && !SEEVALUE) {
+		snprintf (namefmt, sizeof (namefmt), "%%%ds", 10+6*slide%STRUCTPTR);
+		if (fmt[0] == '0') {
+			p->cb_printf (namefmt, "union");
+		} else {
+			p->cb_printf (namefmt, "struct");
+		}
+		p->cb_printf ("<%s>\n", name);
+	}
+	r_print_format (p, seek, b, len, fmt, mode, setval, field);
+	return r_print_format_struct_size (fmt, p, mode, 0);
+}
+
+static char* get_args_offset(const char *arg) {
+	char *args = strchr (arg, ' ');
+	char *sq_bracket = strchr (arg, '[');
+	int max = 30;
+	if (args && sq_bracket) {
+		char *csq_bracket = strchr (arg, ']');
+		while (args && csq_bracket && csq_bracket > args && max--) {
+			args = strchr (csq_bracket, ' ');
+		}
+	}
+	return args;
+}
+
+#define MINUSONE ((void*)(size_t)-1)
+#define ISSTRUCT (tmp == '?' || (tmp == '*' && *(arg+1) == '?'))
+R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
+		const char *formatname, int mode, const char *setval, char *ofield) {
+	int nargs, i, j, invalid, nexti, idx, times, otimes, endian, isptr = 0;
+	const int old_bits = p->bits;
+	char *args = NULL, *bracket, tmp, last = 0;
+	ut64 addr = 0, addr64 = 0, seeki = 0;
+	static int slide = 0, oldslide = 0;
+	char namefmt[8], *field = NULL;
+	const char *arg = NULL;
+	const char *fmt = NULL;
+	const char *argend;
+	int viewflags = 0;
+	char *oarg = NULL;
+
+	/* Load format from name into fmt */
+	if (!formatname) {
+		return 0;
+	}
+	fmt = sdb_get (p->formats, formatname, NULL);
+	if (!fmt) {
+		fmt = formatname;
+	}
+	while (*fmt && IS_WHITECHAR (*fmt)) fmt++;
+	argend = fmt + strlen (fmt);
+	arg = fmt;
+
+	nexti = nargs = i = j = 0;
+
+	if (len < 1) {
+		return 0;
+	}
+	// len+2 to save space for the null termination in wide strings
+	ut8 *buf = calloc (1, len + 2);
+	if (!buf) {
+		return 0;
+	}
+	memcpy (buf, b, len);
+	endian = p->big_endian;
+
+	if (ofield && ofield != MINUSONE) {
+		field = strdup (ofield);
+	}
+	/* get times */
+	otimes = times = atoi (arg);
+	if (times > 0) {
+		while (IS_DIGIT(*arg)) {
+			arg++;
+		}
+	}
+
+	bracket = strchr (arg,'{');
+	if (bracket) {
+		char *end = strchr (arg, '}');
+		if (!end) {
+			eprintf ("No end bracket. Try pf {ecx}b @ esi\n");
+			goto beach;
+		}
+		*end = '\0';
+		times = r_num_math (NULL, bracket + 1);
+		arg = end + 1;
+	}
+
+	if (*arg == '\0') {
+		goto beach;
+	}
+
+	/* get args */
+	args = get_args_offset (arg);
+	if (args) {
+		int l = 0, maxl = 0;
+		argend = args;
+		tmp = *args;
+		while (tmp == ' ') {
+			args++;
+			tmp = *args;
+		}
+		args = strdup (args);
+		nargs = r_str_word_set0_stack (args);
+		if (nargs == 0) {
+			R_FREE (args);
+		}
+		for (i = 0; i < nargs; i++) {
+			const char *tmp = r_str_word_get0 (args, i);
+			const char *nm = NULL;
+			int len;
+			nm = r_str_rchr (tmp, NULL, ')');
+			len = strlen (nm ? nm + 1 : tmp);
+			if (len > maxl) {
+				maxl = len;
+			}
+		}
+		l++;
+		const char *ends = " "; // XXX trailing space warning
+		snprintf (namefmt, sizeof (namefmt), "%%%ds :%s",
+			((maxl + 1) * (1+slide)) % STRUCTPTR, ends);
+	}
+#define ISPOINTED ((slide%STRUCTFLAG)/STRUCTPTR<=(oldslide%STRUCTFLAG)/STRUCTPTR)
+#define ISNESTED ((slide%STRUCTPTR)<=(oldslide%STRUCTPTR))
+	if (mode == R_PRINT_JSON && slide == 0) {
+		p->cb_printf ("[");
+	}
+	if (mode && arg[0] == '0') {
+		mode |= R_PRINT_UNIONMODE;
+		arg++;
+	} else {
+		mode &= ~R_PRINT_UNIONMODE;
+	}
+	if (mode & R_PRINT_DOT) {
+		char *fmtname;
+		if (formatname && *formatname) {
+			if (strchr (formatname, ' ')) {
+				fmtname = r_str_newf ("0x%"PFMT64x, seek);
+			} else {
+				fmtname = strdup (formatname);
+			}
+		} else {
+			fmtname = r_str_newf ("0x%"PFMT64x, seek);
+		}
+		p->cb_printf ("digraph g { graph [ rank=same; rankdir=LR; ];\n");
+		p->cb_printf ("root [ rank=1; shape=record\nlabel=\"%s", fmtname);
+	}
+
+	/* go format */
+	i = 0;
+	if (!times) {
+		otimes = times = 1;
+	}
+	for (; times; times--) { // repeat N times
+		const char * orig = arg;
+		int first = 1;
+		if (otimes > 1) {
+			if (mode & R_PRINT_JSON) {
+				if (otimes > times) {
+					p->cb_printf (",");
+				}
+				p->cb_printf ("[{\"index\":%d,\"offset\":%d},", otimes-times, seek+i);
+			} else if (mode) {
+				p->cb_printf ("0x%08"PFMT64x" [%d] {\n", seek+i, otimes-times);
+			}
+		}
+		arg = orig;
+		for (idx = 0; i < len && arg < argend && *arg; arg++) {
+			int size = 0, elem = 0; /* size of the array, element of the array */
+			char *fieldname = NULL, *fmtname = NULL;
+			if (mode & R_PRINT_UNIONMODE) {
+				i = 0;
+			}
+			seeki = seek + i;
+			addr = 0LL;
+			invalid = 0;
+			p->bits = old_bits;
+			if (arg[0] == '[') {
+				char *end = strchr (arg,']');
+				if (!end) {
+					eprintf ("No end bracket.\n");
+					goto beach;
+				}
+				*end = '\0';
+				size = r_get_size (p->num, buf, endian, arg + 1);
+				arg = end + 1;
+				*end = ']';
+			} else {
+				size = -1;
+			}
+			int fs = r_print_format_struct_size (arg, p, 0, idx);
+			if (fs == -2) {
+				i = -1;
+				goto beach;
+			}
+			if (fs < 1) {
+				fs = 4;
+			}
+			if (i + fs - 1 < len) { // should be +7 to avoid oobread on 'q'
+					// Max byte number where updateAddr will look into
+				if (len - i < 7) {
+					updateAddr (buf + i, THRESHOLD - (len - i), endian, &addr, &addr64);
+				} else {
+					updateAddr (buf + i, len - i, endian, &addr, &addr64);
+				}
+				if (p->bits == 64) {
+					addr = addr64;
+				}
+			} else {
+				// eprintf ("Format strings is too big for this buffer\n");
+				goto beach;
+			}
+
+			tmp = *arg;
+
+			if (mode && !args) {
+				mode |= R_PRINT_ISFIELD;
+			}
+			if (mode & R_PRINT_MUSTSEE && otimes > 1) {
+				p->cb_printf ("  ");
+			}
+			if (idx < nargs && tmp != 'e' && isptr == 0) {
+				char *dot = NULL, *bracket = NULL;
+				if (field) {
+					dot = strchr (field, '.');
+				}
+				if (dot) {
+					*dot = '\0';
+				}
+				free (oarg);
+				oarg = fieldname = strdup (r_str_word_get0 (args, idx));
+				if (ISSTRUCT || tmp=='E' || tmp=='B' || tmp=='r') {
+					if (*fieldname == '(') {
+						fmtname = fieldname + 1;
+						fieldname = (char*)r_str_rchr (fieldname, NULL, ')');
+						if (fieldname) {
+							*fieldname++ = '\0';
+						} else {
+							eprintf ("Missing closing parenthesis in format ')'\n");
+							goto beach;
+						}
+					} else {
+						eprintf ("Missing name (%s)\n", fieldname);
+						goto beach;
+					}
+				}
+				if (mode && (!args || (!field && ofield != MINUSONE)
+						|| (field && !strncmp (field, fieldname, \
+							strchr (field, '[')
+						? strchr (field, '[') - field
+						: strlen (field) + 1)))) {
+					mode |= R_PRINT_ISFIELD;
+				} else {
+					mode &= ~R_PRINT_ISFIELD;
+				}
+
+				/* There we handle specific element in array */
+				if (field && (bracket = strchr (field, '[')) && mode & R_PRINT_ISFIELD) {
+					char *end = strchr (field, ']');
+					if (!end) {
+						eprintf ("Missing closing bracket\n");
+						goto beach;
+					}
+					*end = '\0';
+					elem = r_num_math (NULL, bracket+1)+1; // +1 to handle 0 index easily
+					for ( ; bracket < end; bracket++) {
+						*bracket = '\0';
+					}
+					size += elem*ARRAYINDEX_COEF;
+				} else {
+					elem = -1;
+				}
+				if (tmp != '.' && tmp != ':') {
+					idx++;
+					if (MUSTSEE && !SEEVALUE) {
+						p->cb_printf (namefmt, fieldname);
+					}
+				}
+			}
+
+		feed_me_again:
+			switch (isptr) {
+			case PTRSEEK:
+				{
+				nexti = i + (p->bits/8);
+				i = 0;
+				if (tmp == '?' ) {
+					seeki = addr;
+				}
+				memset (buf, '\0', len);
+				if (MUSTSEE) {
+					p->cb_printf ("(*0x%"PFMT64x")", addr);
+				}
+				isptr = (addr)? PTRBACK: NULLPTR;
+				if (/*addr<(b+len) && addr>=b && */p->iob.read_at) { /* The test was here to avoid segfault in the next line,
+						but len make it doesnt work... */
+					p->iob.read_at (p->iob.io, (ut64)addr, buf, len-4);
+					if ( (i + 3) < len || (i + 7) < len) {
+						// XXX this breaks pf *D
+						if (tmp != 'D') {
+
+							updateAddr (buf + i, len - i, endian, &addr, &addr64);
+						}
+					} else {
+						eprintf ("Likely a heap buffer overflow.\n");
+						goto beach;
+					}
+				} else {
+					eprintf ("(SEGFAULT: cannot read memory at 0x%08"PFMT64x", Block: %s, blocksize: 0x%x)\n",
+							addr, b, len);
+					p->cb_printf ("\n");
+					goto beach;
+				}
+				}
+				break;
+			case PTRBACK:
+				// restore state after pointer seek
+				i = nexti;
+				memcpy (buf, b, len);
+				isptr = NOPTR;
+				arg--;
+				continue;
+			}
+			if (tmp == 0 && last != '*') {
+				break;
+			}
+
+			/* skip chars */
+			switch (tmp) {
+			case '*': // next char is a pointer
+				isptr = PTRSEEK;
+				arg++;
+				tmp = *arg; //last;
+				goto feed_me_again;
+			case '+': // toggle view flags
+				viewflags = !viewflags;
+				continue;
+			case 'e': // tmp swap endian
+				endian ^= 1;
+				continue;
+			case ':': // skip 4 bytes
+				if (size == -1) {
+					i += 4;
+				} else {
+					while (size--) {
+						i+=4;
+					}
+				}
+				continue;
+			case '.': // skip 1 byte
+				i += (size == -1)? 1: size;
+				continue;
+			case 'p': // pointer reference
+				if (*(arg+1) == '2') {
+					tmp = 'w';
+					arg++;
+				} else if (*(arg+1) == '4') {
+					tmp = 'x';
+					arg++;
+				} else if (*(arg+1) == '8') {
+					tmp = 'q';
+					arg++;
+				} else {	//If pointer reference is not mentioned explicitly
+					switch (p->bits) {
+					case 16: tmp = 'w'; break;
+					case 32: tmp = 'x'; break;
+					default: tmp = 'q'; break;
+					}
+				}
+				break;
+			}
+
+			/* flags */
+			if (mode & R_PRINT_SEEFLAGS && isptr != NULLPTR) {
+				char *newname = NULL;
+				if (!fieldname) {
+					newname = fieldname = r_str_newf ("pf.%d", seeki);
+				}
+				if (mode & R_PRINT_UNIONMODE) {
+					p->cb_printf ("f %s=0x%08"PFMT64x"\n", formatname, seeki);
+					goto beach;
+				} else if (tmp == '?') {
+					p->cb_printf ("f %s.%s_", fmtname, fieldname);
+				} else if (tmp == 'E') {
+					p->cb_printf ("f %s=0x%08"PFMT64x"\n", fieldname, seeki);
+				} else if (slide/STRUCTFLAG>0 && idx==1) {
+					p->cb_printf ("%s=0x%08"PFMT64x"\n", fieldname, seeki);
+				} else p->cb_printf ("f %s=0x%08"PFMT64x"\n", fieldname , seeki);
+				if (newname) {
+					free (newname);
+					newname = fieldname = NULL;
+				}
+			}
+
+			/* dot */
+			if (mode & R_PRINT_DOT) {
+				if (fieldname) {
+					p->cb_printf ("|{0x%"PFMT64x"|%c|%s|<%s>",
+						seeki, tmp, fieldname, fieldname);
+				} else {
+					p->cb_printf ("|{0x%"PFMT64x"|%c|",
+						seeki, tmp);
+				}
+			}
+
+			/* json */
+			if (MUSTSEEJSON && mode & R_PRINT_JSON) {
+				if (oldslide <= slide) {
+					if (first) first = 0;
+					else p->cb_printf (",");
+				} else if (oldslide) {
+					p->cb_printf ("]},");
+				}
+				if (fieldname) {
+					p->cb_printf ("{\"name\":\"%s\",\"type\":\"", fieldname);
+				} else {
+					p->cb_printf ("{\"type\":\"");
+				}
+				if (ISSTRUCT) {
+					p->cb_printf ("%s", fmtname);
+				} else {
+					if (tmp == 'n' || tmp == 'N') {
+						p->cb_printf ("%c%c", tmp, *(arg+1));
+					} else {
+						p->cb_printf ("%c", tmp);
+					}
+				}
+				if (isptr) {
+					p->cb_printf ("*");
+				}
+				p->cb_printf ("\",\"offset\":%d,\"value\":",
+					isptr? (seek + nexti - (p->bits / 8)) : seek + i);
+			}
+
+			if (isptr == NULLPTR) {
+				if (MUSTSEEJSON) {
+					p->cb_printf ("\"NULL\"}", tmp, seek + i);
+				} else if (MUSTSEE) {
+					p->cb_printf (" NULL\n");
+				}
+				isptr = PTRBACK;
+			} else
+			/* format chars */
+			// before to enter in the switch statement check buf boundaries due to  updateAddr
+			// might go beyond its len and it's usually called in each of the following functions
+#if 0
+// those boundaries are wrong. the fix was not correct, we need a reproducer
+			if (((i+3)<len) || (i+7)<len) {
+#endif
+				switch (tmp) {
+				case 'u':
+					i += r_print_format_uleb (p, endian, mode, setval, seeki, buf, i, size);
+					break;
+				case 't':
+					r_print_format_time (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 4 : 4*size;
+					break;
+				case 'q':
+					r_print_format_quadword (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 8 : 8*size;
+					break;
+				case 'b':
+					r_print_format_byte (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 1 : size;
+					break;
+				case 'C':
+					r_print_format_decchar (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 1 : size;
+					break;
+				case 'c':
+					r_print_format_char (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 1 : size;
+					break;
+				case 'X':
+					size = r_print_format_hexpairs (p, endian, mode, setval, seeki, buf, i, size);
+					i += size;
+					break;
+				case 'T':
+					if (r_print_format_10bytes (p, mode,
+						setval, seeki, addr, buf) == 0) {
+						i += (size==-1) ? 4 : 4*size;
+					}
+					break;
+				case 'f':
+					r_print_format_float (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 4 : 4*size;
+					break;
+				case 'F':
+					r_print_format_double (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 8 : 8*size;
+					break;
+				case 'i':
+					r_print_format_int (p, endian, mode, setval, seeki, buf, i, size);
+					i+= (size==-1) ? 4 : 4*size;
+					break;
+				case 'd': //WHY?? help says: 0x%%08x hexadecimal value (4 bytes)
+					r_print_format_hex (p, endian, mode, setval, seeki, buf, i, size);
+					i+= (size==-1) ? 4 : 4*size;
+					break;
+				case 'D':
+					if (isptr) {
+						if (p->bits == 64) {
+							i += r_print_format_disasm (p, addr64, size);
+						} else {
+							i += r_print_format_disasm (p, addr, size);
+						}
+					} else {
+						i += r_print_format_disasm (p, seeki, size);
+					}
+					break;
+				case 'o':
+					r_print_format_octal (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 4 : 4*size;
+					break;
+				case 'x':
+					r_print_format_hexflag (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 4 : 4*size;
+					break;
+				case 'w':
+					r_print_format_word (p, endian, mode, setval, seeki, buf, i, size);
+					i += (size==-1) ? 2 : 2*size;
+					break;
+				case 'z': // zero terminated string
+					r_print_format_nulltermstring (p, len, endian, mode, setval, seeki, buf, i, size);
+					if (size == -1)
+						i+=strlen((char*)buf+i)+1;
+					else
+						while (size--) i++;
+					break;
+				case 'Z': // zero terminated wide string
+					r_print_format_nulltermwidestring (p, len, endian, mode, setval, seeki, buf, i, size);
+					if (size == -1)
+						i += r_wstr_clen((char*)(buf+i))*2+2;
+					else
+						while (size--) i+=2;
+					break;
+				case 's':
+					if (r_print_format_string (p, seeki, addr64, addr, 0, mode) == 0) {
+						i += (size==-1) ? 4 : 4*size;
+					}
+					break;
+				case 'S':
+					if (r_print_format_string (p, seeki, addr64, addr, 1, mode) == 0)
+						i += (size==-1) ? 8 : 8*size;
+					break;
+				case 'B': // resolve bitfield
+					if (size >= ARRAYINDEX_COEF) size %= ARRAYINDEX_COEF;
+					r_print_format_bitfield (p, seeki, fmtname, fieldname, addr, mode, size);
+					i+=(size==-1)?1:size;
+					break;
+				case 'E': // resolve enum
+					if (size >= ARRAYINDEX_COEF) size %= ARRAYINDEX_COEF;
+					r_print_format_enum (p, seeki, fmtname, fieldname, addr, mode, size);
+					i += (size==-1)? 1: size;
+					break;
+				case 'r':
+					r_print_format_register (p, mode, fmtname, setval);
+					break;
+				case '?':
+					{
+					int s = 0;
+					char *nxtfield = NULL;
+					char *format = NULL;
+					int anon = 0;
+					if (size >= ARRAYINDEX_COEF) {
+						elem = size / ARRAYINDEX_COEF - 1;
+						size %= ARRAYINDEX_COEF;
+					}
+					if (!(mode & R_PRINT_ISFIELD)) {
+						nxtfield = MINUSONE;
+					} else if (field) {
+						nxtfield = strchr (ofield, '.');
+					}
+					if (nxtfield != MINUSONE && nxtfield) {
+						nxtfield++;
+					}
+
+					if (MUSTSEE) {
+						if (!SEEVALUE) p->cb_printf ("\n");
+					}
+					if (MUSTSEEJSON) {
+						if (isptr) {
+							p->cb_printf ("%d},", seeki);
+						} else {
+							p->cb_printf ("[");
+						}
+					}
+					if (mode & R_PRINT_SEEFLAGS) {
+						slide += STRUCTFLAG;
+					}
+					if (!fmtname) {
+						break;
+					}
+					format = strchr (fmtname, ' ');
+					if (format) {
+						anon = 1;
+						fmtname = format;
+						while (*fmtname == ' ') {
+							fmtname++;
+						}
+					}
+					oldslide = slide;
+					//slide += (isptr) ? STRUCTPTR : NESTEDSTRUCT;
+					slide += NESTEDSTRUCT;
+					if (size == -1) {
+						s = r_print_format_struct (p, seeki,
+									buf + i, len - i, fmtname, slide,
+									mode, setval, nxtfield, anon);
+						i += (isptr) ? (p->bits / 8) : s;
+						if (MUSTSEEJSON) {
+							if (!isptr && (!arg[1] || arg[1] == ' ')) {
+								p->cb_printf ("]}");
+							}
+						}
+					} else {
+						if (mode & R_PRINT_ISFIELD) {
+							if (!SEEVALUE) {
+								p->cb_printf ("[\n");
+							}
+						}
+						while (size--) {
+							if (mode && (elem == -1 || elem == 0)) {
+								mode |= R_PRINT_MUSTSEE;
+								if (elem == 0) {
+									elem = -2;
+								}
+							} else {
+								mode &= ~R_PRINT_MUSTSEE;
+							}
+							s = r_print_format_struct (p, seek+i,
+									buf+i, len-i, fmtname, slide, mode, setval, nxtfield, anon);
+							if ((MUSTSEE || MUSTSEEJSON) && size != 0 && elem == -1) {
+								if (MUSTSEEJSON) {
+									p->cb_printf (",");
+								} else if (MUSTSEE) {
+									p->cb_printf ("\n");
+								}
+							}
+							if (elem > -1) {
+								elem--;
+							}
+							i += (isptr) ? (p->bits / 8) : s;
+						}
+						if (mode & R_PRINT_ISFIELD) {
+							if (!SEEVALUE) {
+								p->cb_printf ("]\n");
+							}
+						}
+						if (MUSTSEEJSON) {
+							p->cb_printf ("]}");
+						}
+					}
+					oldslide = slide;
+					//slide -= (isptr) ? STRUCTPTR : NESTEDSTRUCT;
+					slide -= NESTEDSTRUCT;
+					if (mode & R_PRINT_SEEFLAGS) {
+						oldslide = slide;
+						slide -= STRUCTFLAG;
+					}
+					break;
+					}
+				case 'n':
+				case 'N':
+					{
+						int bytes = 0;
+						int sign = (tmp == 'n') ? 1 : 0;
+						if (arg[1] == '1') {
+							bytes = 1;
+						} else if (arg[1] == '2') {
+							bytes = 2;
+						} else if (arg[1] == '4') {
+							bytes = 4;
+						} else if (arg[1] == '8') {
+							bytes = 8;
+						} else {
+							invalid = 1;
+							break;
+							//or goto beach;???
+						}
+						r_print_format_num (p, endian, mode, setval, seeki, buf, i, bytes, sign, size);
+						i += (size == -1) ? bytes : size * bytes;
+						arg++;
+						break;
+					}
+				default:
+					/* ignore unknown chars */
+					invalid = 1;
+					break;
+				} //switch
+#if 0
+			} else {
+				eprintf ("r_print_format: Likely a heap buffer overflow (%s)\n", buf);
+				goto beach;
+			}
+#endif
+			if (mode & R_PRINT_DOT) {
+				p->cb_printf ("}");
+			}
+			if (viewflags && p->offname) {
+				const char *s = p->offname (p->user, seeki);
+				if (s) p->cb_printf ("@(%s)", s);
+				s = p->offname (p->user, addr);
+				if (s) p->cb_printf ("*(%s)", s);
+			}
+			if (tmp != 'D' && !invalid && !fmtname && MUSTSEE) {
+				p->cb_printf ("\n");
+			}
+			last = tmp;
+
+			// XXX: Due to the already noted issues with the above, we need to strip
+			// args from fmt:args the same way we strip fmt BUT only for enums as
+			// nested structs seem to be handled correctly above!
+			if (arg[0] == 'E') {
+				char *end_fmt = strchr (arg, ' ');
+				if (!end_fmt) {
+					goto beach;
+				}
+				char *next_args = strchr (end_fmt+1, ' ');
+				if (next_args) {
+					while (*next_args != '\0') {
+						*end_fmt++ = *next_args++;
+					}
+				}
+				*end_fmt = '\0';
+			}
+		}
+		if (otimes > 1) {
+			if (MUSTSEEJSON) {
+				p->cb_printf ("]");
+			} else if (mode) {
+				p->cb_printf ("}\n");
+			}
+		}
+		arg = orig;
+		oldslide = 0;
+	}
+	if (mode & R_PRINT_JSON && slide == 0) {
+		p->cb_printf("]\n");
+	}
+	if (mode & R_PRINT_DOT) {
+		p->cb_printf ("\"];\n}\n");
+		// TODO: show nested structs and field reference lines
+	}
+beach:
+	free (oarg);
+	free (buf);
+	free (field);
+	free (args);
+	return i;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/hex.c radare2-2.8.0+dfsg/libr/util/hex.c
--- radare2-2.3.0+dfsg/libr/util/hex.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/hex.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,4 @@
-/* radare - LGPL - Copyright 2007-2016 - pancake */
-
+/* radare - LGPL - Copyright 2007-2016 - pancake */ 
 #include "r_types.h"
 #include "r_util.h"
 #include <stdio.h>
@@ -23,10 +22,8 @@
 	if (!strncmp (code, "'''", 3)) {
 		const char *s = code + 2;
 		return r_hex_from_c_str (out, &s);
-	} else {
-		return r_hex_from_c_str (out, &code);
 	}
-	return out;
+	return r_hex_from_c_str (out, &code);
 }
 
 static const char *skip_comment_py(const char *code) {
@@ -244,6 +241,64 @@
 	return ret;
 }
 
+
+R_API char *r_hex_from_js(const char *code) {
+	char * s1 = strchr (code, '\'');
+	char * s2 = strchr (code, '"');
+
+	/* there are no strings in the input */
+	if (!(s1 || s2)) {
+		return NULL;
+	}
+
+	char * start, * end;
+	if (s1 < s2) {
+		start = s1;
+		end = strchr (start + 1, '\'');
+	} else {
+		start = s2;
+		end = strchr (start + 1, '"');
+	}
+
+	/* the string isn't properly terminated */
+	if (!end) {
+		return NULL;
+	}
+
+	char * str = r_str_ndup (start + 1, end - start - 1);
+
+	/* assuming base64 input, output will always be shorter */
+	ut8 *b64d = malloc (end - start);
+	if (!b64d) {
+		free (str);
+		return NULL;
+	}
+
+	r_base64_decode (b64d, str, end - start - 1);
+	if (!b64d) {
+		free (str);
+		free (b64d);
+		return NULL;
+	}
+
+	// TODO: use r_str_bin2hex
+	int i, len = strlen ((const char *)b64d);
+	char * out = malloc (len * 2 + 1);
+	if (!out) {
+		free (str);
+		free (b64d);
+		return NULL;
+	}
+	for (i = 0; i < len; i++) {
+		sprintf (&out[i * 2], "%02x", b64d[i]);
+	}
+	out[len * 2] = '\0';
+
+	free (str);
+	free (b64d);
+	return out;
+}
+
 /* convert
  * "\x41\x23\x42\x1b"
  * "\x41\x23\x42\x1b"
@@ -254,7 +309,7 @@
 	if (!code) {
 		return NULL;
 	}
-	char * const ret = malloc (strlen (code) * 3);
+	char * const ret = calloc (1, strlen (code) * 3);
 	if (!ret) {
 		return NULL;
 	}
@@ -278,13 +333,17 @@
 R_API char *r_hex_from_code(const char *code) {
 	if (!strchr (code, '=')) {
 		return r_hex_no_code (code);
-	} else if (strstr (code, "char") || strstr (code, "int")) {
-		//C language
+	}
+	/* C language */
+	if (strstr (code, "char") || strstr (code, "int")) {
 		return r_hex_from_c (code);
-	} else {
-		// Python
-		return r_hex_from_py (code);
 	}
+	/* JavaScript */
+	if (strstr (code, "var")) {
+		return r_hex_from_js (code);
+	}
+        /* Python */
+	return r_hex_from_py (code);
 }
 
 /* int byte = hexpair2bin("A0"); */
@@ -313,12 +372,13 @@
 
 R_API int r_hex_bin2str(const ut8 *in, int len, char *out) {
 	int i, idx;
-	char tmp[5];
-	if (len < 0)
+	char tmp[8];
+	if (len < 0) {
 		return 0;
+	}
 	for (idx = i = 0; i < len; i++, idx += 2)  {
 		snprintf (tmp, sizeof (tmp), "%02x", in[i]);
-		memcpy (out+idx, tmp, 2);
+		memcpy (out + idx, tmp, 2);
 	}
 	out[idx] = 0;
 	return len;
@@ -429,7 +489,7 @@
 		str += 2;
 	}
 	for (i = 0; str[i] != '\0' && str[i] != ' '; i++) {
-		if (ISHEXCHAR (str[i])) {
+		if (IS_HEXCHAR (str[i])) {
 			continue;
 		}
 		return -1; //if we're here, then str isnt valid
diff -Nru radare2-2.3.0+dfsg/libr/util/idpool.c radare2-2.8.0+dfsg/libr/util/idpool.c
--- radare2-2.3.0+dfsg/libr/util/idpool.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/idpool.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,14 @@
-/* radare2 - LGPL - Copyright 2017 - condret */
+/* radare2 - LGPL - Copyright 2017-2018 - condret */
 
 #include <r_util.h>
 #include <r_types.h>
+#include <string.h>
+#include <stdlib.h>
+#if __WINDOWS__ && !__CYGWIN__
+#include <search.h>
+#endif
 
-ut32 get_msb(ut32 v) {
+static ut32 get_msb(ut32 v) {
 	int i;
 	for (i = 31; i > (-1); i--) {
 		if (v & (0x1U << i)) {
@@ -99,14 +104,36 @@
 	return true;
 }
 
+static bool oid_storage_preallocate(ROIDStorage *st, ut32 size) {
+	ut32 *permutation;
+	if (!st) {
+		return false;
+	}
+	if (!size) {
+		free (st->permutation);
+		st->psize = 0;
+		st->permutation = NULL;
+	}
+	permutation = realloc (st->permutation, size * sizeof (ut32));
+	if (!permutation) {
+		return false;
+	}
+	if (size > st->psize) {
+		memset (permutation + st->psize, 0, (size - st->psize) * sizeof (ut32));
+	}
+	st->permutation = permutation;
+	st->psize = size;
+	return true;
+}
+
 R_API bool r_id_storage_set(RIDStorage* storage, void* data, ut32 id) {
 	ut32 n;
 	if (!storage || !storage->pool || (id >= storage->pool->next_id)) {
 		return false;
 	}
 	n = get_msb (id + 1);
-	if (n > (storage->size - (storage->size / 4))) {
-		if (n < (storage->pool->last_id / 2)) {
+	if (n > ((storage->size / 2) + (storage->size / 4))) {
+		if ((n * 2) < storage->pool->last_id) {
 			if (!id_storage_reallocate (storage, n * 2)) {
 				return false;
 			}
@@ -147,7 +174,7 @@
 			storage->top_id--;
 		}
 		if (!storage->top_id) {
-			if(storage->data[storage->top_id]) {
+			if (storage->data[storage->top_id]) {
 				id_storage_reallocate (storage, 2);
 			} else {
 				RIDPool* pool = r_id_pool_new (storage->pool->start_id, storage->pool->last_id);
@@ -201,8 +228,342 @@
 	return true;
 }
 
-R_API RList *r_id_storage_list(RIDStorage *s) {
+R_API RList *r_id_storage_list(RIDStorage *s) {		//remove this pls
 	RList *list = r_list_newf (NULL);
 	r_id_storage_foreach (s, _list, list);
 	return list;
 }
+
+R_API ROIDStorage * r_oids_new (ut32 start_id, ut32 last_id) {
+	ROIDStorage *storage = R_NEW0 (ROIDStorage);
+	if (!storage) {
+		return NULL;
+	}
+	if (!(storage->data = r_id_storage_new (start_id, last_id))) {
+		free (storage);
+		return NULL;
+	}
+	return storage;
+}
+
+R_API void *r_oids_get(ROIDStorage *storage, ut32 id) {
+	if (storage) {
+		return r_id_storage_get (storage->data, id);
+	}
+	return NULL;
+}
+
+R_API void *r_oids_oget(ROIDStorage *storage, ut32 od) {
+	ut32 id;
+	if (r_oids_get_id (storage, od, &id)) {
+		return r_id_storage_get (storage->data, id);
+	}
+	return NULL;
+}
+
+R_API bool r_oids_get_id(ROIDStorage *storage, ut32 od, ut32 *id) {
+	if (storage && storage->permutation && (storage->ptop > od)) {
+		*id = storage->permutation[od];
+		return true;
+	}
+	return false;
+}
+
+R_API bool r_oids_get_od(ROIDStorage *storage, ut32 id, ut32 *od) {
+	if (storage && storage->permutation &&
+		storage->data && (id < storage->data->pool->next_id)) {
+		for (od[0] = 0; od[0] < storage->ptop; od[0]++) {
+			if (id == storage->permutation[od[0]]) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+R_API bool r_oids_add(ROIDStorage *storage, void *data, ut32 *id, ut32 *od) {
+	if (!storage || !id || !od) {
+		return false;
+	}
+	if (!r_id_storage_add (storage->data, data, id)) {
+		return false;
+	}
+	if (!storage->permutation) {
+		oid_storage_preallocate (storage, 4);
+	} else if (storage->ptop > (storage->psize * 3 / 4)) {
+		oid_storage_preallocate (storage, storage->psize * 2);
+	}
+	if (storage->psize <= storage->ptop) {
+		r_id_storage_delete (storage->data, *id);
+		return false;
+	}
+	*od = storage->ptop;
+	storage->permutation[*od] = *id;
+	storage->ptop++;
+	return true;
+}
+
+R_API bool r_oids_to_front (ROIDStorage *storage, const ut32 id) {
+	ut32 od;
+	if (!storage || !storage->permutation) {
+		return false;
+	}
+	for (od = 0; od < storage->ptop; od++) {
+		if (id == storage->permutation[od]) {
+			break;
+		}
+	}
+	if (od == storage->ptop) {
+		return false;
+	} else if (od == (storage->ptop - 1)) {
+		return true;
+	}
+	memmove (&storage->permutation[od], &storage->permutation[od + 1],
+		(storage->ptop - od - 1) * sizeof (ut32));
+	storage->permutation[storage->ptop - 1]= id;
+	return true;
+}
+
+R_API bool r_oids_to_rear (ROIDStorage *storage, ut32 id) {
+	ut32 od;
+	if (!storage || !storage->permutation ||
+		!storage->data || (id >= storage->data->pool->next_id)) {
+		return false;
+	}
+	for (od = 0; od < storage->ptop; od++) {
+		if (id == storage->permutation[od]) {
+			break;
+		}
+	}
+	if (od == storage->ptop) {
+		return false;
+	}
+	if (od == 0) {
+		return true;
+	}
+	memmove (&storage->permutation[1], &storage->permutation[0], od * sizeof (ut32));
+	storage->permutation[0] = id;
+	return true;
+}
+
+R_API void r_oids_delete (ROIDStorage *storage, ut32 id) {
+	if (!r_oids_to_front (storage, id)) {
+		return;
+	}
+	r_id_storage_delete (storage->data, id);
+	storage->ptop--;
+	if (!storage->ptop) {
+		R_FREE (storage->permutation);
+		storage->psize = 0;
+	} else if ((storage->ptop + 1) < (storage->psize / 4)) {
+		oid_storage_preallocate (storage, storage->psize / 2);
+	}
+}
+
+R_API void r_oids_odelete (ROIDStorage *st, ut32 od) {
+	ut32 n;
+	if (!st || !st->permutation || od >= st->ptop) {
+		return;
+	}
+	n = st->ptop - od - 1;
+	r_id_storage_delete (st->data, st->permutation[od]);
+	memmove (&st->permutation[od], &st->permutation[od + 1], n * sizeof(ut32));
+	st->ptop--;
+	if (!st->ptop) {
+		R_FREE (st->permutation);
+		st->psize = 0;
+	} else if ((st->ptop + 1) < (st->psize / 4)) {
+		oid_storage_preallocate (st, st->psize / 2);
+	}
+}
+
+R_API void *r_oids_take (ROIDStorage *storage, ut32 id) {
+	void *ret;
+	if (!storage) {
+		return NULL;
+	}
+	ret = r_id_storage_get (storage->data, id);
+	r_oids_delete (storage, id);
+	return ret;
+}
+
+R_API void *r_oids_otake (ROIDStorage *st, ut32 od) {
+	void *ret = r_oids_oget (st, od);
+	r_oids_odelete (st, od);
+	return ret;
+}
+
+R_API void r_oids_free (ROIDStorage *storage) {
+	if (storage) {
+		free (storage->permutation);
+		r_id_storage_free (storage->data);
+	}
+	free (storage);
+}
+
+//returns the element with lowest order
+R_API void *r_oids_last (ROIDStorage *storage) {
+	if (storage && storage->data && storage->data->data
+		&& storage->permutation) {
+		return storage->data->data[storage->permutation[0]];
+	}
+	return NULL;
+}
+
+//return the element with highest order
+R_API void *r_oids_first (ROIDStorage *storage) {
+	if (storage && storage->data && storage->data->data
+		&& storage->permutation) {
+		return storage->data->data[storage->permutation[storage->ptop - 1]];
+	}
+	return NULL;
+}
+
+R_API bool r_oids_foreach (ROIDStorage *storage, RIDStorageForeachCb cb, void *user) {
+	ut32 i;
+	ut32 id;
+	if (!cb || !storage || !storage->data || !storage->data->data
+		|| !storage->permutation) {
+		return false;
+	}
+	for (i = storage->ptop - 1; i != 0; i--) {
+		id = storage->permutation[i];
+		if (!cb (user, storage->data->data[id], id)) {
+			return false;
+		}
+	}
+	id = storage->permutation[0];
+	return cb (user, storage->data->data[id], id);
+}
+
+R_API bool r_oids_foreach_prev (ROIDStorage* storage, RIDStorageForeachCb cb, void* user) {
+	ut32 i;
+	ut32 id;
+	if (!cb || !storage || !storage->data || !storage->data->data
+		|| !storage->permutation) {
+		return false;
+	}
+	for (i = 0; i < storage->ptop; i++) {
+		id = storage->permutation[i];
+		if (!cb (user, storage->data->data[id], id)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool oids_od_bfind (ROIDStorage *st, ut32 *od, void *incoming, void *user) {
+	st64 high, low;
+	int cmp_res;
+	void *in;
+
+	if (!st->ptop) {
+		return false;
+	}
+
+	high = st->ptop - 1;
+	low = 0;
+
+	while (1) {
+		if (high <= low) {
+			od[0] = (ut32)low;
+			in = r_oids_oget(st, od[0]);
+			//in - incoming
+			if (!st->cmp(in, incoming, user, &cmp_res)) {
+				return false;
+			}
+			if (cmp_res < 0) {
+				od[0]++;
+			}
+			return true;
+		}
+
+		od[0] = (ut32)((low + high) / 2);
+		in = r_oids_oget(st, od[0]);
+		if (!st->cmp(in, incoming, user, &cmp_res)) {
+			return false;
+		}
+
+		if (cmp_res == 0) {
+			return true;
+		}
+
+		if (cmp_res < 0) {
+			low = od[0] + 1;
+		} else {
+			high = od[0];
+			high--;
+		}
+	}
+	return false;
+}
+
+bool oids_od_binsert (ROIDStorage *storage, ut32 id, ut32 *od, void *incoming, void *user) {
+	if (!oids_od_bfind (storage, od, incoming, user)) {
+		return false;
+	}
+	if(od[0] != storage->ptop) {
+		memmove (&storage->permutation[od[0] + 1], &storage->permutation[od[0]], (storage->ptop - od[0]) * sizeof(ut32));
+	}
+	storage->ptop++;
+	storage->permutation[od[0]] = id;
+	return true;
+}
+
+R_API bool r_oids_insert (ROIDStorage *storage, void *data, ut32 *id, ut32 *od, void *user) {
+	if (!storage || !storage->cmp || !id || !od) {
+		return false;
+	}
+	if (!storage->ptop) {	//empty storage
+		return r_oids_add(storage, data, id, od);
+	}
+	if (!r_id_storage_add (storage->data, data, id)) {
+		return false;
+	}
+	if (storage->ptop > (storage->psize * 3 / 4)) {
+		oid_storage_preallocate (storage, storage->psize * 2);
+	}
+	return oids_od_binsert (storage, id[0], od, data, user);
+}
+
+R_API bool r_oids_sort (ROIDStorage *storage, void *user) {
+	ut32 od, id, ptop, *permutation;
+	void *incoming;
+
+	if(!storage || !storage->ptop || !storage->cmp) {
+		return false;
+	}
+	if(storage->ptop == 1) {
+		return true;
+	}
+	permutation = storage->permutation;
+	storage->permutation = R_NEWS0 (ut32, storage->psize);
+	if (!storage->permutation) {
+		storage->permutation = permutation;
+		return false;
+	}
+	storage->permutation[0] = permutation[0];
+	ptop = storage->ptop;
+	storage->ptop = 1;
+	while (storage->ptop != ptop) {
+		id = permutation[storage->ptop];
+		incoming = r_id_storage_get (storage->data, id);
+		if (!oids_od_binsert (storage, id, &od, incoming, user)) {
+			goto beach;
+		}
+	}
+	free (permutation);
+	return true;
+
+beach:
+	free (storage->permutation);
+	storage->permutation = permutation;
+	storage->ptop = ptop;
+	return false;
+}
+
+R_API ut32 r_oids_find (ROIDStorage *storage, void *incoming, void *user) {
+	ut32 ret;
+
+	return oids_od_bfind(storage, &ret, incoming, user) ? ret : storage->ptop;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/lib.c radare2-2.8.0+dfsg/libr/util/lib.c
--- radare2-2.3.0+dfsg/libr/util/lib.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/lib.c	2018-08-07 14:12:36.000000000 +0000
@@ -11,7 +11,7 @@
 
 #if __UNIX__
 #include <dlfcn.h>
-  #define DLOPEN(x)  dlopen(x, RTLD_LOCAL | RTLD_NOW)
+  #define DLOPEN(x)  dlopen(x, RTLD_GLOBAL | RTLD_LAZY)
   #define DLSYM(x,y) dlsym(x,y)
   #define DLCLOSE(x) dlclose(x)
 #elif __WINDOWS__
diff -Nru radare2-2.3.0+dfsg/libr/util/list.c radare2-2.8.0+dfsg/libr/util/list.c
--- radare2-2.3.0+dfsg/libr/util/list.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/list.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2007-2016 - pancake, alvarofe */
+/* radare - LGPL - Copyright 2007-2018 - pancake, alvarofe */
 // TODO: RRef - reference counting
 
 #include <stdio.h>
@@ -6,11 +6,11 @@
 #define _R_LIST_C_
 #include "r_util.h"
 
-inline RListIter *r_list_iter_new () {
+inline RListIter *r_list_iter_new() {
 	return calloc (1, sizeof (RListIter));
 }
 
-void r_list_iter_free (RListIter *list) {
+void r_list_iter_free(RListIter *list) {
 	/* do nothing? */
 }
 
@@ -556,7 +556,27 @@
 	}
 }
 
-
+R_API RList *r_list_uniq(const RList *list, RListComparator cmp) {
+	if (!list || !cmp) {
+		return NULL;
+	}
+	RList *nl = r_list_newf (NULL);
+	RListIter *iter, *iter2;
+	void *item, *item2;
+	r_list_foreach (list, iter, item) {
+		bool found = false;
+		r_list_foreach (nl, iter2, item2) {
+			if (cmp (item, item2)) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			r_list_append (nl, item);
+		}
+	}
+	return nl;
+}
 
 #if TEST
 
@@ -574,11 +594,11 @@
 
 	{
 		char *str;
-		r_list_foreach(l, iter, str) {
+		r_list_foreach (l, iter, str) {
 			printf("-- %s\n", str);
 		}
 		printf("--**--\n");
-		r_list_foreach_prev(l, iter, str) {
+		r_list_foreach_prev (l, iter, str) {
 			printf("-- %s\n", str);
 		}
 	}
@@ -663,7 +683,6 @@
 	}
 
 	r_list_free (l);
-	//r_list_free (l);
 
 	return 0;
 }
diff -Nru radare2-2.3.0+dfsg/libr/util/Makefile radare2-2.8.0+dfsg/libr/util/Makefile
--- radare2-2.3.0+dfsg/libr/util/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -4,17 +4,24 @@
 CFLAGS+=-DCORELIB -I$(TOP)/shlr
 PCLIBS=@LIBZIP@ @DL_LIBS@
 
+ifneq ($(OSTYPE),darwin)
+ifneq ($(OSTYPE),haiku)
+LDFLAGS+=-lm
+LINK=-lm
+endif
+endif
+
 OBJS=binheap.o mem.o pool.o unum.o str.o hex.o file.o range.o tinyrange.o
 OBJS+=prof.o cache.o sys.o buf.o w32-sys.o ubase64.o base85.o base91.o
 OBJS+=list.o flist.o mixed.o btree.o chmod.o graph.o
 OBJS+=regex/regcomp.o regex/regerror.o regex/regexec.o uleb128.o
-OBJS+=sandbox.o calc.o thread.o thread_lock.o thread_msg.o
-OBJS+=strpool.o bitmap.o p_date.o p_format.o print.o
-OBJS+=p_seven.o slist.o randomart.o log.o zip.o debruijn.o
+OBJS+=sandbox.o calc.o thread.o thread_sem.o thread_lock.o thread_cond.o
+OBJS+=strpool.o bitmap.o date.o format.o pie.o print.o ctype.o
+OBJS+=seven.o slist.o randomart.o log.o zip.o debruijn.o
 OBJS+=utf8.o utf16.o utf32.o strbuf.o lib.o name.o spaces.o signal.o syscmd.o
 OBJS+=diff.o bdiff.o stack.o queue.o tree.o des.o idpool.o
-OBJS+=punycode.o r_pkcs7.o r_x509.o r_asn1.o json_indent.o skiplist.o
-OBJS+=r_json.o rbtree.o qrcode.o vector.o str_trim.o
+OBJS+=punycode.o pkcs7.o x509.o asn1.o astr.o json_indent.o skiplist.o
+OBJS+=r_json.o rbtree.o qrcode.o trie.o vector.o str_trim.o ascii_table.o
 
 # DO NOT BUILD r_big api (not yet used and its buggy)
 ifeq (1,0)
@@ -29,11 +36,12 @@
 endif
 endif
 
-include $(SHLR)/zip/deps.mk
+include deps.mk
 
 LDFLAGS+=${BN_LIBS}
 LDFLAGS+=${TH_LIBS}
 LDFLAGS+=${DL_LIBS}
+LDFLAGS+=-lm
 
 # NetBSD 7.0 ships with backtrace(3) in -lexecinfo
 ifeq (${BUILD_OS},netbsd)
@@ -41,6 +49,13 @@
   LDFLAGS+=-lexecinfo
 endif
 endif
+
+# FreeBSD 10.0 ships with backtrace(3) in -lexecinfo
+ifeq (${BUILD_OS},freebsd)
+ifneq ($(shell expr "`uname -r`" : '[0-9]\.'), 2)
+  LDFLAGS+=-lexecinfo
+endif
+endif
 
 EXTRA_PRE+=sdb_version
 EXTRA_PRE+=spp_config
diff -Nru radare2-2.3.0+dfsg/libr/util/mem.c radare2-2.8.0+dfsg/libr/util/mem.c
--- radare2-2.3.0+dfsg/libr/util/mem.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/mem.c	2018-08-07 14:12:36.000000000 +0000
@@ -326,3 +326,16 @@
 R_API void r_mem_free(void *p) {
 	free (p);
 }
+
+R_API void r_mem_memzero(void *dst, size_t l) {
+#ifdef _MSC_VER
+	RtlSecureZeroMemory (dst, l);
+#else
+#if HAVE_EXPLICIT_BZERO
+	explicit_bzero (dst, l);
+#else
+	memset (dst, 0, l);
+	__asm__ volatile ("" :: "r"(dst) : "memory");
+#endif
+#endif
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/meson.build radare2-2.8.0+dfsg/libr/util/meson.build
--- radare2-2.3.0+dfsg/libr/util/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,95 +1,106 @@
-# project('r_util', 'c')
 
-# 'big-gmp.c',
-# 'big-ssl.c',
-# 'mixed.c',
-# 'iconv.c',
-
-files=[
-'base85.c',
-'base91.c',
-'bdiff.c',
-'big.c',
-'binheap.c',
-'bitmap.c',
-'btree.c',
-'buf.c',
-'cache.c',
-'calc.c',
-'chmod.c',
-'constr.c',
-'debruijn.c',
-'des.c',
-'diff.c',
-'file.c',
-'flist.c',
-'graph.c',
-'hex.c',
-'idpool.c',
-'json_indent.c',
-'lib.c',
-'list.c',
-'log.c',
-'mem.c',
-'name.c',
-'p_date.c',
-'p_format.c',
-'p_seven.c',
-'pool.c',
-'print.c',
-'prof.c',
-'punycode.c',
-'qrcode.c',
-'queue.c',
-'r_asn1.c',
-'r_pkcs7.c',
-'r_x509.c',
-'randomart.c',
-'range.c',
-'rbtree.c',
-'sandbox.c',
-'signal.c',
-'skiplist.c',
-'slist.c',
-'spaces.c',
-'stack.c',
-'str.c',
-'str_trim.c',
-'strbuf.c',
-'strpool.c',
-'sys.c',
-'syscmd.c',
-'thread.c',
-'thread_lock.c',
-'thread_msg.c',
-'thread_pipe.c',
-'tinyrange.c',
-'tree.c',
-'r_json.c',
-'ubase64.c',
-'uleb128.c',
-'unum.c',
-'utf8.c',
-'utf16.c',
-'utf32.c',
-'vector.c',
-'w32-sys.c',
-'zip.c',
-'regex/regcomp.c',
-'regex/regexec.c',
-'regex/regerror.c'
+files = [
+  'ascii_table.c',
+  'base85.c',
+  'base91.c',
+  'bdiff.c',
+  'big.c',
+  'binheap.c',
+  'bitmap.c',
+  'btree.c',
+  'buf.c',
+  'cache.c',
+  'calc.c',
+  'chmod.c',
+  'constr.c',
+  'debruijn.c',
+  'des.c',
+  'diff.c',
+  'file.c',
+  'flist.c',
+  'graph.c',
+  'hex.c',
+  'idpool.c',
+  'json_indent.c',
+  'lib.c',
+  'list.c',
+  'log.c',
+  'mem.c',
+  'name.c',
+  'date.c',
+  'format.c',
+  'pie.c',
+  'seven.c',
+  'pool.c',
+  'print.c',
+  'prof.c',
+  'punycode.c',
+  'qrcode.c',
+  'queue.c',
+  'asn1.c',
+  'astr.c',
+  'pkcs7.c',
+  'x509.c',
+  'ctype.c',
+  'randomart.c',
+  'range.c',
+  'rbtree.c',
+  'sandbox.c',
+  'signal.c',
+  'skiplist.c',
+  'slist.c',
+  'spaces.c',
+  'stack.c',
+  'str.c',
+  'str_trim.c',
+  'strbuf.c',
+  'strpool.c',
+  'sys.c',
+  'syscmd.c',
+  'thread.c',
+  'thread_sem.c',
+  'thread_lock.c',
+  'thread_cond.c',
+  'thread_pipe.c',
+  'tinyrange.c',
+  'tree.c',
+  'trie.c',
+  'r_json.c',
+  'ubase64.c',
+  'uleb128.c',
+  'unum.c',
+  'utf8.c',
+  'utf16.c',
+  'utf32.c',
+  'vector.c',
+  'w32-sys.c',
+  'zip.c',
+  'regex/regcomp.c',
+  'regex/regexec.c',
+  'regex/regerror.c'
 ]
 
-incdir = '../include'
-
+r_util_deps = [ldl, mth, pth, utl, sdb_dep, zlib_dep]
+if host_machine.system().startswith('freebsd')
+  # backtrace_symbols_fd requires -lexecinfo
+  r_util_deps += [cc.find_library('execinfo')]
+endif
 r_util = library('r_util', files,
-  include_directories: [platform_inc, include_directories([
-	'../../shlr/zip/include']
-  )],
-  dependencies: [ldl, pth, utl],
-  objects: [
-	libr2sdb.extract_all_objects(),
-	libr2zip.extract_all_objects()
-  ],
-  install: true
+  include_directories: platform_inc,
+  dependencies: r_util_deps,
+  install: true,
+  implicit_include_directories: false,
+  soversion: r2_libversion
+)
+
+r_util_dep = declare_dependency(link_with: r_util,
+                                include_directories: platform_inc)
+
+pkgconfig_mod.generate(
+  libraries: [r_util],
+  subdirs: 'libr',
+  version: r2_version,
+  name: 'r_util',
+  filebase: 'r_util',
+  description: 'radare foundation libraries'
 )
diff -Nru radare2-2.3.0+dfsg/libr/util/mixed.c radare2-2.8.0+dfsg/libr/util/mixed.c
--- radare2-2.3.0+dfsg/libr/util/mixed.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/mixed.c	2018-08-07 14:12:36.000000000 +0000
@@ -2,8 +2,8 @@
 
 #include <r_util.h>
 
-#define STR64OFF(x) sdb_fmt (2, "%"PFMT64x, x)
-#define STR32OFF(x) sdb_fmt (3, "%"PFMT32x, x)
+#define STR64OFF(x) sdb_fmt ("%"PFMT64x, x)
+#define STR32OFF(x) sdb_fmt ("%"PFMT32x, x)
 
 R_API RMixed *r_mixed_new () {
 	RMixed *m = R_NEW (RMixed);
diff -Nru radare2-2.3.0+dfsg/libr/util/name.c radare2-2.8.0+dfsg/libr/util/name.c
--- radare2-2.3.0+dfsg/libr/util/name.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/name.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,10 +1,11 @@
-/* radare - LGPL - Copyright 2009-2015 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_util.h>
 
 R_API int r_name_validate_char(const char ch) {
-	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (IS_DIGIT(ch)))
+	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (IS_DIGIT(ch))) {
 		return true;
+	}
 	switch (ch) {
 	case ':':
 	case '.':
@@ -15,28 +16,31 @@
 }
 
 R_API int r_name_check(const char *name) {
-	if (!name || !*name)
-		return false;
 	/* Cannot start by number */
-	if (IS_DIGIT(*name))
+	if (!name || !*name || IS_DIGIT (*name)) {
 		return false;
+	}
 	/* Cannot contain non-alphanumeric chars + [:._] */
-	for (; *name != '\0'; name++)
-		if (!r_name_validate_char (*name))
+	for (; *name != '\0'; name++) {
+		if (!r_name_validate_char (*name)) {
 			return false;
+		}
+	}
 	return true;
 }
 
 static inline bool is_special_char (char *name) {
 	const char n = *name;
-	return (n == 'b' || n == 'f' || n == 'n' || n == 'r' || n == 't' || n == 'v');
+	return (n == 'b' || n == 'f' || n == 'n' || n == 'r' || n == 't' || n == 'v' || n == 'a');
 }
 
 R_API int r_name_filter(char *name, int maxlen) {
 	int i;
 	size_t len;
 	char *oname;
-	if (!name) return 0;
+	if (!name) {
+		return 0;
+	}
 	if (maxlen < 0) {
 		maxlen = strlen (name);
 	}
@@ -81,8 +85,9 @@
 R_API char *r_name_filter2(const char *name) {
 	int i;
 	char *res;
-	while (!IS_PRINTABLE (*name))
+	while (!IS_PRINTABLE (*name)) {
 		name++;
+	}
 	res = strdup (name);
 	for (i = 0; res[i]; i++) {
 		if (!r_name_validate_char (res[i])) {
diff -Nru radare2-2.3.0+dfsg/libr/util/p_date.c radare2-2.8.0+dfsg/libr/util/p_date.c
--- radare2-2.3.0+dfsg/libr/util/p_date.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/p_date.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-/* radare - LGPL - Copyright 2007-2015 - pancake */
-
-#include "r_print.h"
-#include "r_util.h"
-#include <unistd.h>
-#include <sys/time.h>
-#include <time.h>
-#include <sys/stat.h>
-
-R_API int r_print_date_dos(RPrint *p, ut8 *buf, int len) {
-	ut8 _time[2] = { buf[0], buf[1] };
-	ut8 _date[2] = { buf[2], buf[3] };
-        ut32 t       = _time[1]<<8 | _time[0];
-        ut32 d       = _date[1]<<8 | _date[0];
-        ut32 year    = ((d&0xfe00)>>9)+1980;
-        ut32 month   = (d&0x01e0)>>5;
-        ut32 day     = (d&0x001f)>>0;
-        ut32 hour    = (t&0xf800)>>11;
-        ut32 minutes = (t&0x07e0)>>5;
-        ut32 seconds = (t&0x001f)<<1;
-
-	// TODO: support p->datezone
-	// TODO: support p->datefmt
-        /* la data de modificacio del fitxer, no de creacio del zip */
-        p->cb_printf ("%d-%02d-%02d %d:%d:%d\n",
-                year, month, day, hour, minutes, seconds);
-	return 4;
-}
-
-R_API int r_print_date_hfs(RPrint *p, const ut8 *buf, int len) {
-	const int hfs_unix_delta = 2082844800;
-	time_t t = 0;
-	char s[256];
-	int ret = 0;
-	const struct tm* time;
-
-	if (p && len >= sizeof (ut32)) {
-		t = r_read_ble32 (buf, p->big_endian);
-		// "%d:%m:%Y %H:%M:%S %z",
-		if (p->datefmt[0]) {
-			t += p->datezone * (60*60);
-			t += hfs_unix_delta;
-			time = (const struct tm*)gmtime((const time_t*)&t);
-			if (time) {
-				ret = strftime (s, sizeof (s), p->datefmt, time);
-				if (ret) {
-					p->cb_printf ("%s\n", s);
-					ret = sizeof (time_t);
-				}
-			} else p->cb_printf ("Invalid time\n");
-		}
-	}
-	return ret;
-}
-
-R_API int r_print_date_unix(RPrint *p, const ut8 *buf, int len) {
-	time_t t = 0;
-	char s[256];
-	int ret = 0;
-	const struct tm* time;
-
-	if (p && len >= sizeof (ut32)) {
-		t = r_read_ble32 (buf, p->big_endian);
-		// "%d:%m:%Y %H:%M:%S %z",
-		if (p->datefmt[0]) {
-			t += p->datezone * (60*60);
-			time = (const struct tm*)gmtime((const time_t*)&t);
-			if (time) {
-				ret = strftime (s, sizeof (s), p->datefmt, time);
-				if (ret) {
-					p->cb_printf ("%s\n", s);
-					ret = sizeof (time_t);
-				}
-			} else p->cb_printf ("Invalid time\n");
-		}
-	}
-	return ret;
-}
-
-R_API int r_print_date_get_now(RPrint *p, char *str) {
-	int ret = 0;
-#if __UNIX__
-        struct tm curt; /* current time */
-        time_t l;
-        char *week_str[7]= {
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
-        char *month_str[12]= {
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-
-        *str = 0;
-        l = time(0);
-        localtime_r (&l, &curt);
-	// XXX localtime is affected by the timezone. 
-
-        if ((curt.tm_wday >= 0 && curt.tm_wday < 7)
-        &&  (curt.tm_mon >= 0 && curt.tm_mon < 12)) {
-		sprintf (str, "%s, %02d %s %d %02d:%02d:%02d GMT + %d",
-			week_str[curt.tm_wday],
-			curt.tm_mday,
-			month_str[curt.tm_mon],
-			curt.tm_year + 1900, curt.tm_hour,
-			curt.tm_min, curt.tm_sec, curt.tm_isdst);
-		ret = sizeof(time_t);
-	}
-#else
-        *str = 0;
-#ifdef _MSC_VER
-#pragma message ("r_print_date_now NOT IMPLEMENTED FOR THIS PLATFORM")
-#else
-#warning r_print_date_now NOT IMPLEMENTED FOR THIS PLATFORM
-#endif
-#endif
-	return ret;
-}
-
-R_API int r_print_date_w32(RPrint *p, const ut8 *buf, int len) {
-	ut64 l, L = 0x2b6109100LL;
-	time_t t;
-	int ret = 0;
-	char datestr[256];
-
-	if (p && len >= sizeof (ut64)) {
-		l = r_read_ble64 (buf, p->big_endian);
-		l /= 10000000; // 100ns to s
-		l = (l > L ? l-L : 0); // isValidUnixTime?
-		t = (time_t) l; // TODO limit above!
-		// "%d:%m:%Y %H:%M:%S %z",
-		if (p->datefmt[0]) {
-			ret = strftime(datestr, 256, p->datefmt,
-				(const struct tm*) gmtime((const time_t*)&t));
-			if (ret) {
-				p->cb_printf("%s\n", datestr);
-				ret = true;
-			}
-		}
-	}
-
-	return ret;
-}
diff -Nru radare2-2.3.0+dfsg/libr/util/p_format.c radare2-2.8.0+dfsg/libr/util/p_format.c
--- radare2-2.3.0+dfsg/libr/util/p_format.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/p_format.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2184 +0,0 @@
-/* radare - LGPL - Copyright 2007-2016 - pancake & Skia */
-
-#include "r_cons.h"
-#include "r_util.h"
-#include "r_print.h"
-#include "r_reg.h"
-#ifdef _MSC_VER
-#include <time.h>
-#endif
-#define NOPTR 0
-#define PTRSEEK 1
-#define PTRBACK 2
-#define NULLPTR 3
-#define STRUCTPTR 100
-#define NESTEDSTRUCT 1
-#define STRUCTFLAG 10000
-#define NESTDEPTH 14
-#define ARRAYINDEX_COEF 10000
-
-#define MUSTSEE (mode & R_PRINT_MUSTSEE && mode & R_PRINT_ISFIELD && !(mode & R_PRINT_JSON))
-#define MUSTSET (mode & R_PRINT_MUSTSET && mode & R_PRINT_ISFIELD && setval)
-#define SEEVALUE (mode & R_PRINT_VALUE)
-#define MUSTSEEJSON (mode & R_PRINT_JSON && mode & R_PRINT_ISFIELD)
-
-//this define is used as a way to acknowledge when updateAddr should take len
-//as real len of the buffer
-#define THRESHOLD -4444
-
-//TODO REWRITE THIS IS BECOMING A NIGHTMARE
-
-static float updateAddr(const ut8 *buf, int len, int endian, ut64 *addr, ut64 *addr64) {
-	float f = 0.0f;
-	// assert sizeof (float) == sizeof (ut32))
-	ut32 tmpaddr;
-	// XXX 999 is used as an implicit buffer size, we should pass the buffer size to every function too, otherwise this code will give us some problems
-	if (len >= THRESHOLD - 7 && len < THRESHOLD) {
-		len = len + THRESHOLD; // get the real len to avoid oob
-	} else {
-		len = 999;
-	}
-	if (len >= sizeof (float)) {
-		r_mem_swaporcopy ((ut8*)&f, buf, sizeof (float), endian);
-	}
-	if (addr && len > 3) {
-		tmpaddr = r_read_ble32 (buf, endian);
-		*addr = (ut64)tmpaddr;
-	}
-	if (addr64 && len > 7) {
-		*addr64 = r_read_ble64 (buf, endian);
-	}
-	return f;
-}
-
-static int r_get_size(RNum *num, ut8 *buf, int endian, const char *s) {
-	int size = 0, len = strlen (s);
-	ut64 addr;
-
-	if (s[0] == '*' && len >= 4) { // value pointed by the address
-		int offset = (int)r_num_math (num, s + 1);
-		(void)updateAddr (buf + offset, 999, endian, &addr, NULL);
-		return addr;
-	} else {
-		// flag handling doesnt seems to work here
-		size = r_num_math (num, s);
-	}
-	return size;
-}
-
-static void r_print_format_quadword(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	ut64 addr64;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size / ARRAYINDEX_COEF - 1;
-		size %= ARRAYINDEX_COEF;
-	}
-	updateAddr (buf + i, size - i, endian, NULL, &addr64);
-	if (MUSTSET) {
-		p->cb_printf ("wv8 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*8:0));
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) {
-			p->cb_printf ("0x%08"PFMT64x" = (qword)",
-				seeki + ((elem >= 0)? elem * 2: 0));
-		}
-		if (size == -1) {
-			p->cb_printf ("0x%016"PFMT64x, addr64);
-		} else {
-			if (!SEEVALUE) {
-				p->cb_printf ("[ ");
-			}
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, NULL, &addr64);
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("0x%016"PFMT64x, addr64);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 8;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1) {
-			p->cb_printf ("%"PFMT64d, addr64);
-		} else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, NULL, &addr64);
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%"PFMT64d, addr64);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) elem--;
-				i += 8;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static void r_print_format_byte(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size / ARRAYINDEX_COEF - 1;
-		size %= ARRAYINDEX_COEF;
-	}
-	if (MUSTSET) {
-		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki + ((elem >= 0) ? elem : 0));
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) {
-			p->cb_printf ("0x%08"PFMT64x" = ", seeki + ((elem >= 0) ? elem : 0));
-		}
-		if (size == -1) {
-			p->cb_printf ("0x%02x", buf[i]);
-		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("0x%02x", buf[i]);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i++;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1) {
-			p->cb_printf ("%d", buf[i]);
-		} else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					p->cb_printf (", %d", buf[i]);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i++;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static int r_print_format_uleb(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	int elem = -1;
-	int s = 0, sum = 0;
-	ut64 value = 0, offset = 0;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size / ARRAYINDEX_COEF - 1;
-		size %= ARRAYINDEX_COEF;
-	}
-	// offset = seeki+((elem>=0)?16*elem:0);
-	if (MUSTSET) {
-		ut8 *tmp;
-		char *nbr;
-		do {
-			offset += s;
-			r_uleb128_decode (buf+offset, &s, &value);
-		} while (elem--);
-		tmp = (ut8*) r_uleb128_encode (r_num_math (NULL, setval), &s);
-		nbr = r_hex_bin2strdup (tmp, s);
-		p->cb_printf ("\"wx %s\" @ 0x%08"PFMT64x"\n", nbr, seeki+offset);
-		free (tmp);
-		free (nbr);
-		// sum = size of the converted number
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-		if (size==-1) {
-			r_uleb128_decode (buf+i, &s, &value);
-			p->cb_printf ("%"PFMT64d, value);
-			sum = s;
-		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					r_uleb128_decode (buf+i, &s, &value);
-					sum += s;
-					p->cb_printf ("%"PFMT64d, value);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i+=s;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1) {
-			r_uleb128_decode (buf+i, &s, &value);
-			p->cb_printf ("\"%"PFMT64d"\"", value);
-			sum = s;
-		} else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					r_uleb128_decode (buf+i, &s, &value);
-					sum += s;
-					p->cb_printf ("\"%"PFMT64d"\"", value);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i+=s;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-	return sum;
-}
-
-static void r_print_format_char(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	if (MUSTSET) {
-		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem:0));
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*2:0)); //XXX:: shouldn't it be elem*1??
-		if (size==-1)
-			p->cb_printf ("'%c'", IS_PRINTABLE (buf[i])?buf[i]:'.');
-		else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("'%c'", IS_PRINTABLE (buf[i])?buf[i]:'.');
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i++;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1)
-			p->cb_printf ("\"%c\"", IS_PRINTABLE (buf[i])?buf[i]:'.');
-		else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("\"%c\"", IS_PRINTABLE (buf[i])?buf[i]:'.');
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i++;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static void r_print_format_decchar(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	if (MUSTSET) {
-		p->cb_printf ("\"w %s\" @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem:0));
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem:0));
-		if (size==-1)
-			p->cb_printf ("%d", buf[i]);
-		else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%d", buf[i]);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i++;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1)
-			p->cb_printf ("\"%d\"", buf[i]);
-		else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("\"%d\"", buf[i]);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i++;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static int r_print_format_string(const RPrint* p, ut64 seeki, ut64 addr64, ut64 addr, int is64, int mode) {
-	ut8 buffer[255];
-	buffer[0] = 0;
-	if (!p->iob.read_at) {
-		eprintf ("(cannot read memory)\n");
-		return -1;
-	}
-	int res = (is64 == 1)
-		? p->iob.read_at (p->iob.io, addr64, buffer, sizeof (buffer) - 8)
-		: p->iob.read_at (p->iob.io, (ut64)addr, buffer, sizeof (buffer) - 8);
-	if (MUSTSEEJSON) {
-		char *encstr = r_str_utf16_encode ((const char *)buffer, -1);
-		if (encstr) {
-			p->cb_printf ("%d,\"string\":\"%s\"}", seeki, encstr);
-			free (encstr);
-		}
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" -> 0x%08"PFMT64x" ", seeki, addr);
-		if (res && buffer[0] != 0xff && buffer[1] != 0xff) {
-			p->cb_printf ("%s", buffer);
-		}
-	}
-	return 0;
-}
-
-static void r_print_format_time(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	ut64 addr;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	updateAddr (buf + i, size - i, endian, &addr, NULL);
-	if (MUSTSET) {
-		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
-	} else if (MUSTSEE) {
-		char *timestr = strdup(asctime (gmtime ((time_t*)&addr)));
-		*(timestr+24) = '\0';
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
-		if (size==-1) {
-			p->cb_printf ("%s", timestr);
-		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				free (timestr);
-				timestr = strdup (asctime (gmtime ((time_t*)&addr)));
-				*(timestr+24) = '\0';
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%s", timestr);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 4;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-		free (timestr);
-	} else if (MUSTSEEJSON) {
-		char *timestr = strdup (asctime (gmtime ((time_t*)&addr)));
-		*(timestr+24) = '\0';
-		if (size==-1) {
-			p->cb_printf ("\"%s\"", timestr);
-		} else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				free (timestr);
-				timestr = strdup (asctime (gmtime ((time_t*)&addr)));
-				*(timestr+24) = '\0';
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("\"%s\"", timestr);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 4;
-			}
-			p->cb_printf (" ]");
-		}
-		free (timestr);
-		p->cb_printf ("}");
-	}
-}
-
-// TODO: support unsigned int?
-static void r_print_format_hex(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	ut64 addr;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	updateAddr (buf + i, size - i, endian, &addr, NULL);
-	if (MUSTSET) {
-		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
-	} else if (mode & R_PRINT_DOT) {
-		p->cb_printf ("%"PFMT64d, addr);
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
-		if (size==-1) {
-			p->cb_printf ("%"PFMT64d, addr);
-		} else {
-			if (!SEEVALUE) {
-				p->cb_printf ("[ ");
-			}
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%"PFMT64d, addr);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 4;
-			}
-			if (!SEEVALUE) {
-				p->cb_printf (" ]");
-			}
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1)
-			p->cb_printf ("%d", addr);
-		else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%d", addr);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i+=4;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static void r_print_format_int(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	ut64 addr;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	updateAddr (buf + i, size - i, endian, &addr, NULL);
-	if (MUSTSET) {
-		p->cb_printf ("wv4 %s @ %"PFMT64d"\n", setval, seeki+((elem>=0)?elem*4:0));
-	} else if (mode & R_PRINT_DOT) {
-		p->cb_printf ("0x%08"PFMT64x, addr);
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) {
-			p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
-		}
-		if (size == -1) {
-			p->cb_printf ("%"PFMT64d, (st64)(st32)addr);
-		} else {
-			if (!SEEVALUE) {
-				p->cb_printf ("[ ");
-			}
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%"PFMT64d, (st64)(st32)addr);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 4;
-			}
-			if (!SEEVALUE) {
-				p->cb_printf (" ]");
-			}
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1)
-			p->cb_printf ("%d", addr);
-		else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%d", addr);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i+=4;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-static int r_print_format_disasm(const RPrint* p, ut64 seeki, int size) {
-	ut64 prevseeki = seeki;
-
-	if (!p->disasm || !p->user) return 0;
-
-	size = R_MAX (1, size);
-
-	while (size-- > 0) {
-		seeki += p->disasm (p->user, seeki);
-	}
-
-	return seeki - prevseeki;
-}
-
-static void r_print_format_octal (const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	ut64 addr;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	updateAddr (buf + i, size - i, endian, &addr, NULL);
-	if (MUSTSET) {
-		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
-	} else if (mode & R_PRINT_DOT) {
-		p->cb_printf ("0%"PFMT64o, addr);
-	} else if (MUSTSEE) {
-		ut32 addr32 = (ut32)addr;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
-		if (!SEEVALUE) p->cb_printf ("(octal) ");
-		if (size==-1)
-			p->cb_printf (" 0%08"PFMT64o, addr32);
-		else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				addr32 = (ut32)addr;
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("0%08"PFMT64o, addr32);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i+=4;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-	} else if (MUSTSEEJSON) {
-		ut32 addr32 = (ut32)addr;
-		if (size==-1)
-			p->cb_printf ("%d", addr32);
-		else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf, i, endian, &addr, NULL);
-				addr32 = (ut32)addr;
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%d", addr32);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i+=4;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static void r_print_format_hexflag(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	ut64 addr = 0;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	updateAddr (buf + i, size - i, endian, &addr, NULL);
-	if (MUSTSET) {
-		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*4:0));
-	} else if (mode & R_PRINT_DOT) {
-		p->cb_printf ("0x%08"PFMT64x, addr & UT32_MAX);
-	} else if (MUSTSEE) {
-		ut32 addr32 = (ut32)addr;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*4:0));
-		if (size==-1) {
-			p->cb_printf ("0x%08"PFMT64x, (ut64)addr32);
-		} else {
-			if (!SEEVALUE) p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				addr32 = (ut32)addr;
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("0x%08"PFMT64x, addr32);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1)
-					p->cb_printf (", ");
-				if (elem > -1) elem--;
-				i+=4;
-			}
-			if (!SEEVALUE) p->cb_printf (" ]");
-		}
-	} else if (MUSTSEEJSON) {
-		ut32 addr32 = (ut32)addr;
-		if (size==-1)
-			p->cb_printf ("%d", addr32);
-		else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				updateAddr (buf + i, size - i, endian, &addr, NULL);
-				addr32 = (ut32)addr;
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%d", addr32);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (",");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 4;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static int r_print_format_10bytes(const RPrint* p, int mode, const char* setval,
-		ut64 seeki, ut64 addr, ut8* buf) {
-	ut8 buffer[255];
-	int j;
-	if (MUSTSET) {
-		p->cb_printf ("?e pf B not yet implemented\n");
-	} else if (mode & R_PRINT_DOT) {
-		for (j = 0; j<10; j++) {
-			p->cb_printf ("%02x ", buf[j]);
-		}
-	} else if (MUSTSEE) {
-		if (!p->iob.read_at) {
-			printf ("(cannot read memory)\n");
-			return -1;
-		}
-		p->iob.read_at (p->iob.io, (ut64)addr, buffer, 248);
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-		for (j=0; j<10; j++) {
-			p->cb_printf ("%02x ", buf[j]);
-		}
-		if (!SEEVALUE) p->cb_printf (" ... (");
-		for (j = 0; j < 10; j++) {
-			if (!SEEVALUE) {
-				if (IS_PRINTABLE (buf[j])) {
-					p->cb_printf ("%c", buf[j]);
-				} else {
-					p->cb_printf (".");
-				}
-			}
-		}
-		if (!SEEVALUE) p->cb_printf (")");
-	} else if (MUSTSEEJSON) {
-		if (!p->iob.read_at) {
-			printf ("(cannot read memory)\n");
-			return -1;
-		} else {
-			p->iob.read_at (p->iob.io, (ut64)addr, buffer, 248);
-		}
-		p->cb_printf ("[ %d", buf[0]);
-		j = 1;
-		for (; j < 10; j++) {
-			p->cb_printf (", %d", buf[j]);
-		}
-		p->cb_printf ("]");
-		return 0;
-	}
-	return 0;
-}
-
-static int r_print_format_hexpairs(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	int j;
-	size = (size == -1) ? 1 : size;
-	if (MUSTSET) {
-		p->cb_printf ("?e pf X not yet implemented\n");
-	} else if (mode & R_PRINT_DOT) {
-		for (j = 0; j < size; j++) {
-			p->cb_printf ("%02x", buf[i + j]);
-		}
-	} else if (MUSTSEE) {
-		size = (size < 1) ? 1 : size;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-		for (j = 0; j < size; j++) {
-			p->cb_printf ("%02x ", buf[i + j]);
-		}
-		if (!SEEVALUE) p->cb_printf (" ... (");
-		for (j=0; j<size; j++) {
-			if (!SEEVALUE) {
-				if (IS_PRINTABLE (buf[j]))
-					p->cb_printf ("%c", buf[i+j]);
-				else
-					p->cb_printf (".");
-			}
-		}
-		p->cb_printf (")");
-	} else if (MUSTSEEJSON) {
-		size = (size < 1) ? 1 : size;
-		p->cb_printf ("[ %d", buf[0]);
-		j = 1;
-		for (; j < 10; j++)
-			p->cb_printf (", %d", buf[j]);
-		p->cb_printf ("]}");
-		return size;
-	}
-	return size;
-}
-
-static void r_print_format_float(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	float val_f = 0.0f;
-	ut64 addr = 0;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF - 1;
-		size %= ARRAYINDEX_COEF;
-	}
-	val_f = updateAddr (buf + i, 999, endian, &addr, NULL);
-	if (MUSTSET) {
-		p->cb_printf ("wv4 %s @ 0x%08"PFMT64x"\n", setval,
-			seeki + ((elem >= 0) ? elem * 4 : 0));
-	} else if (mode & R_PRINT_DOT) {
-		p->cb_printf ("%f", val_f);
-	} else {
-		if (MUSTSEE) {
-			if (!SEEVALUE) {
-				p->cb_printf ("0x%08"PFMT64x" = ",
-					seeki + ((elem >= 0) ? elem * 4 : 0));
-			}
-		}
-		if (size == -1) {
-			p->cb_printf ("%f", val_f);
-		} else {
-			if (!SEEVALUE) {
-				p->cb_printf ("[ ");
-			}
-			while (size--) {
-				val_f = updateAddr (buf + i, 9999, endian, &addr, NULL);
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%f", val_f);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 4;
-			}
-			if (!SEEVALUE) {
-				p->cb_printf (" ]");
-			}
-		}
-		if (MUSTSEEJSON) {
-			p->cb_printf ("}");
-		}
-	}
-}
-
-static void r_print_format_word(const RPrint* p, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	ut64 addr;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size/ARRAYINDEX_COEF-1;
-		size %= ARRAYINDEX_COEF;
-	}
-	addr = endian
-		? (*(buf + i)) << 8 | (*(buf + i + 1))
-		: (*(buf + i + 1)) << 8 | (*(buf + i));
-	if (MUSTSET) {
-		p->cb_printf ("wx %s @ 0x%08"PFMT64x"\n", setval, seeki+((elem>=0)?elem*2:0));
-	} else if (mode & R_PRINT_DOT) {
-		if (size == -1) {
-			p->cb_printf ("0x%04x", addr);
-		}
-		while ((size -= 2) > 0) {
-			addr = endian
-				? (*(buf+i))<<8 | (*(buf+i+1))
-				: (*(buf+i+1))<<8 | (*(buf+i));
-			if (elem == -1 || elem == 0) {
-				p->cb_printf ("%d", addr);
-				if (elem == 0) elem = -2;
-			}
-			if (size != 0 && elem == -1) {
-				p->cb_printf (",");
-			}
-			if (elem > -1) {
-				elem--;
-			}
-			i += 2;
-		}
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) {
-			p->cb_printf ("0x%08"PFMT64x" = ", seeki+((elem>=0)?elem*2:0));
-		}
-		if (size==-1) {
-			p->cb_printf ("0x%04x", addr);
-		} else {
-			if (!SEEVALUE) {
-				p->cb_printf ("[ ");
-			}
-			while (size--) {
-				addr = endian
-					? (*(buf+i))<<8 | (*(buf+i+1))
-					: (*(buf+i+1))<<8 | (*(buf+i));
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("0x%04x", addr);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += 2;
-			}
-			if (!SEEVALUE) {
-				p->cb_printf (" ]");
-			}
-		}
-	} else if (MUSTSEEJSON) {
-		if (size==-1) {
-			p->cb_printf ("%d", addr);
-		} else {
-			p->cb_printf ("[ ");
-			while ( (size -= 2) >0) {
-				addr = endian
-					? (*(buf+i))<<8 | (*(buf+i+1))
-					: (*(buf+i+1))<<8 | (*(buf+i));
-				if (elem == -1 || elem == 0) {
-					p->cb_printf ("%d", addr);
-					if (elem == 0) elem = -2;
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (",");
-				}
-				if (elem > -1) elem--;
-				i += 2;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-static void r_print_format_nulltermstring(const RPrint* p, const int len, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	if (MUSTSET) {
-		int buflen = strlen ((const char *)buf+seeki), vallen = strlen(setval);
-		char *newstring, *ons;
-		newstring = ons = strdup(setval);
-		if ((newstring[0] == '\"' && newstring[vallen-1] == '\"')
-				|| (newstring[0] == '\'' && newstring[vallen-1] == '\'')) {
-			newstring[vallen-1] = '\0';
-			newstring++;
-			vallen -= 2;
-		}
-		if (vallen > buflen) {
-			eprintf ("Warning: new string is longer than previous one\n");
-		}
-		p->cb_printf ("wx ");
-		for (i = 0; i < vallen; i++) {
-			if (i < vallen - 3 && newstring[i] == '\\' && newstring[i + 1] == 'x') {
-				p->cb_printf ("%c%c", newstring[i + 2], newstring[i + 3]);
-				i += 3;
-			} else {
-				p->cb_printf ("%2x", newstring[i]);
-			}
-		}
-		p->cb_printf (" @ 0x%08"PFMT64x"\n", seeki);
-		free(ons);
-	} else if (mode & R_PRINT_DOT) {
-		int j = i;
-		p->cb_printf ("\\\"", seeki);
-		for (; j<len && ((size==-1 || size-- >0) && buf[j]) ; j++) {
-			char ch = buf[j];
-			if (ch == '"') {
-				p->cb_printf ("\\\"");
-			} else if (IS_PRINTABLE (ch)) {
-				p->cb_printf ("%c", ch);
-			} else p->cb_printf (".");
-		}
-		p->cb_printf ("\\\"");
-	} else if (MUSTSEE) {
-		int j = i;
-		if (!SEEVALUE) p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-		for (; j < len && ((size == -1 || size-- > 0) && buf[j]) ; j++) {
-			if (IS_PRINTABLE (buf[j])) {
-				p->cb_printf ("%c", buf[j]);
-			} else {
-				p->cb_printf (".");
-			}
-		}
-	} else if (MUSTSEEJSON) {
-		int j = i;
-		p->cb_printf ("%d,\"string\":\"", seeki);
-		for (; j < len && ((size == -1 || size-- > 0) && buf[j]) ; j++) {
-			if (IS_PRINTABLE (buf[j])) {
-				p->cb_printf ("%c", buf[j]);
-			} else {
-				p->cb_printf (".");
-			}
-		}
-		p->cb_printf ("\"}");
-	}
-}
-
-static void r_print_format_nulltermwidestring(const RPrint* p, const int len, int endian, int mode,
-		const char* setval, ut64 seeki, ut8* buf, int i, int size) {
-	if (MUSTSET) {
-		int vallen = strlen(setval);
-		char *newstring, *ons;
-		newstring = ons = strdup(setval);
-		if ((newstring[0] == '\"' && newstring[vallen-1] == '\"')
-				|| (newstring[0] == '\'' && newstring[vallen-1] == '\'')) {
-			newstring[vallen - 1] = '\0';
-			newstring++;
-			vallen -= 2;
-		}
-		if ((size = strlen (setval)) > r_wstr_clen((char*)(buf+seeki))) {
-			eprintf ("Warning: new string is longer than previous one\n");
-		}
-		p->cb_printf ("ww %s @ 0x%08"PFMT64x"\n", newstring, seeki);
-		free(ons);
-	} else if (MUSTSEE) {
-		int j = i;
-		if (!SEEVALUE) {
-			p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-		}
-		for (; j<len && ((size==-1 || size-->0) && buf[j]) ; j+=2) {
-			if (IS_PRINTABLE (buf[j])) {
-				p->cb_printf ("%c", buf[j]);
-			} else {
-				p->cb_printf (".");
-			}
-		}
-	}
-}
-
-static void r_print_format_bitfield(const RPrint* p, ut64 seeki, char* fmtname,
-		char* fieldname, ut64 addr, int mode, int size) {
-	char *bitfield = NULL;
-	switch (size) {
-	case 1: addr &= UT8_MAX; break;
-	case 2: addr &= UT16_MAX; break;
-	case 4: addr &= UT32_MAX; break;
-	}
-	if (MUSTSEE && !SEEVALUE) {
-		p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-	}
-	if (p->get_bitfield) {
-		bitfield = p->get_bitfield (p->user, fmtname, addr);
-	}
-	if (bitfield && *bitfield) {
-		if (MUSTSEEJSON) p->cb_printf ("\"%s\"}", bitfield);
-		else if (MUSTSEE) p->cb_printf (" %s (bitfield) = %s\n", fieldname, bitfield);
-	} else {
-		if (MUSTSEEJSON) p->cb_printf ("\"`tb %s 0x%x`\"}", fmtname, addr);
-		else if (MUSTSEE) p->cb_printf (" %s (bitfield) = `tb %s 0x%x`\n",
-				fieldname, fmtname, addr);
-	}
-	free (bitfield);
-}
-
-static void r_print_format_enum (const RPrint* p, ut64 seeki, char* fmtname,
-		char* fieldname, ut64 addr, int mode, int size) {
-	char *enumvalue = NULL;
-	switch (size) {
-	case 1: addr &= UT8_MAX; break;
-	case 2: addr &= UT16_MAX; break;
-	case 4: addr &= UT32_MAX; break;
-	}
-	if (MUSTSEE && !SEEVALUE) {
-		p->cb_printf ("0x%08"PFMT64x" = ", seeki);
-	}
-	if (p->get_enumname) {
-		enumvalue = p->get_enumname (p->user, fmtname, addr);
-	}
-	if (enumvalue && *enumvalue) {
-		if (mode & R_PRINT_DOT) {
-			p->cb_printf ("%s.%s", fmtname, enumvalue);
-		} else if (MUSTSEEJSON) {
-			p->cb_printf ("\"%s\"}", fmtname);
-		} else if (MUSTSEE) {
-			p->cb_printf ("%s (enum %s) = 0x%"PFMT64x" ; %s\n",
-				fieldname, fmtname, addr, enumvalue);
-		}
-	} else {
-		if (MUSTSEEJSON) {
-			p->cb_printf ("\"`te %s 0x%x`\"}", fmtname, addr);
-		} else if (MUSTSEE) {
-			p->cb_printf ("%s (enum %s) = 0x%x\n",//`te %s 0x%x`\n",
-				fieldname, fmtname, addr); //enumvalue); //fmtname, addr);
-		}
-	}
-	free (enumvalue);
-}
-
-static void r_print_format_register (const RPrint* p, int mode,
-		const char *name, const char* setval) {
-	if (!p || !p->get_register || !p->reg) {
-		return;
-	}
-	RRegItem *ri = p->get_register (p->reg, name, R_REG_TYPE_ALL);
-	if (ri) {
-		if (MUSTSET) {
-			p->cb_printf ("dr %s=%s\n", name, setval);
-		} else if (MUSTSEE) {
-			if (!SEEVALUE) p->cb_printf("%s : 0x%08"PFMT64x"\n", ri->name, p->get_register_value (p->reg, ri));
-			else p->cb_printf("0x%08"PFMT64x"\n", p->get_register_value (p->reg, ri));
-		} else if (MUSTSEEJSON) {
-			p->cb_printf ("%d}", p->get_register_value (p->reg, ri));
-		}
-	} else {
-		p->cb_printf ("Register %s does not exists\n", name);
-	}
-}
-
-static void r_print_format_num_specifier (const RPrint *p, ut64 addr, int bytes, int sign) {
-#define EXT(T) (sign ? (signed T)(addr) : (unsigned T)(addr) )
-	const char *fs64 = sign ? "%"PFMT64d : "%"PFMT64u;
-	const char *fs = sign ? "%d" : "%u";
-	if (bytes == 1) {
-		p->cb_printf (fs, EXT(char));
-	} else if (bytes == 2) {
-		p->cb_printf (fs, EXT(short));
-	} else if (bytes == 4) {
-		p->cb_printf (fs, EXT(int)); //XXX: int is not necessarily 4 bytes I guess.
-	} else if (bytes == 8) {
-		p->cb_printf (fs64, addr);
-	}
-#undef EXT
-}
-
-static void r_print_format_num (const RPrint *p, int endian, int mode, const char *setval, ut64 seeki, ut8 *buf, int i, int bytes, int sign, int size) {
-	ut64 addr = 0LL;
-	int elem = -1;
-	if (size >= ARRAYINDEX_COEF) {
-		elem = size / ARRAYINDEX_COEF - 1;
-		size %= ARRAYINDEX_COEF;
-	}
-	if (bytes == 8) {
-		updateAddr (buf + i, size - i, endian, NULL, &addr);
-	} else {
-		updateAddr (buf + i, size - i, endian, &addr, NULL);
-	}
-	if (MUSTSET) {
-		p->cb_printf ("wv%d %s @ 0x%08"PFMT64x"\n", bytes, setval, seeki+((elem>=0)?elem*(bytes):0));
-	} else if (mode & R_PRINT_DOT) {
-		p->cb_printf ("%"PFMT64u, addr);
-	} else if (MUSTSEE) {
-		if (!SEEVALUE) {
-			p->cb_printf ("0x%08"PFMT64x" = ", seeki + ((elem >= 0)? elem * bytes: 0));
-		}
-		if (size == -1) {
-			r_print_format_num_specifier (p, addr, bytes, sign);
-		} else {
-			if (!SEEVALUE) {
-				p->cb_printf ("[ ");
-			}
-			while (size--) {
-				if (bytes == 8) {
-					updateAddr (buf + i, size - i, endian, NULL, &addr);
-				} else {
-					updateAddr (buf + i, size - i, endian, &addr, NULL);
-				}
-				if (elem == -1 || elem == 0) {
-					r_print_format_num_specifier (p, addr, bytes, sign);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += bytes;
-			}
-			if (!SEEVALUE) {
-				p->cb_printf (" ]");
-			}
-		}
-	} else if (MUSTSEEJSON) {
-		if (size == -1) {
-			r_print_format_num_specifier (p, addr, bytes, sign);
-		} else {
-			p->cb_printf ("[ ");
-			while (size--) {
-				if (bytes == 8) {
-					updateAddr (buf + i, size, endian, NULL, &addr);
-				} else {
-					updateAddr (buf + i, size, endian, &addr, NULL);
-				}
-				if (elem == -1 || elem == 0) {
-					r_print_format_num_specifier (p, addr, bytes, sign);
-					if (elem == 0) {
-						elem = -2;
-					}
-				}
-				if (size != 0 && elem == -1) {
-					p->cb_printf (", ");
-				}
-				if (elem > -1) {
-					elem--;
-				}
-				i += bytes;
-			}
-			p->cb_printf (" ]");
-		}
-		p->cb_printf ("}");
-	}
-}
-
-// XXX: this is somewhat incomplete. must be updated to handle all format chars
-int r_print_format_struct_size(const char *f, RPrint *p, int mode, int n) {
-	char *end, *args, *fmt;
-	int size = 0, tabsize = 0, i, idx = 0, biggest = 0, fmt_len = 0;
-	if (!f) {
-		return -1;
-	}
-	if (n >= 5) {  // This is the nesting level, is this not a bit arbitrary?!
-		return 0;
-	}
-	char *o = strdup (f);
-	if (!o) {
-		return -1;
-	}
-	end = strchr (o, ' ');
-	fmt = o;
-	if (!end && !(end = strchr (o, '\0'))) {
-		free (o);
-		return -1;
-	}
-	if (*end) {
-		*end = 0;
-		args = strdup (end + 1);
-	} else {
-		args = strdup ("");
-	}
-	if (fmt[0] == '0') {
-		mode |= R_PRINT_UNIONMODE;
-		fmt++;
-	} else {
-		mode &= ~R_PRINT_UNIONMODE;
-	}
-
-	i = 0;
-	if (IS_DIGIT(fmt[i])) {
-		while (IS_DIGIT(fmt[i])) {
-			i++;
-		}
-	}
-
-	r_str_word_set0_stack (args);
-	fmt_len = strlen (fmt);
-	for (; i < fmt_len; i++) {
-		if (fmt[i] == '[') {
-			char *end = strchr (fmt + i,']');
-			if (!end) {
-				eprintf ("No end bracket.\n");
-				continue;
-			}
-			*end = '\0';
-			tabsize = r_num_math (NULL, fmt + i + 1);
-			*end = ']';
-			while (fmt[i++] != ']');
-		} else {
-			tabsize = 1;
-		}
-
-		switch (fmt[i]) {
-		case '.':
-			idx--;
-		case 'c':
-		case 'b':
-		case 'X':
-			size += tabsize * 1;
-			break;
-		case 'w':
-			size += tabsize * 2;
-			break;
-		case ':':
-			idx--;
-		case 'd':
-		case 'o':
-		case 'i':
-		case 'x':
-		case 'f':
-		case 's':
-		case 't':
-			size += tabsize * 4;
-			break;
-		case 'S':
-		case 'q':
-			size += tabsize * 8;
-			break;
-		case 'z':
-		case 'Z':
-			size += tabsize;
-			break;
-		case '*':
-			size += tabsize * (p->bits / 8);
-			i++;
-			idx--;	//no need to go ahead for args
-			break;
-		case 'B':
-		case 'E':
-			switch (tabsize) {
-			case 1: size += 1; break;
-			case 2: size += 2; break;
-			case 4: size += 4; break;
-			case 8: size += 8; break;
-			default:
-				eprintf ("Unknown enum format size: %d\n", tabsize);
-				break;
-			}
-			break;
-		case '?':
-			{
-			const char *format = NULL;
-			char *endname = NULL, *structname = NULL;
-			char tmp = 0;
-			structname = strdup (r_str_word_get0 (args, idx));
-			if (*structname == '(') {
-				endname = (char*)r_str_rchr (structname, NULL, ')');
-			} else {
-				free (structname);
-				break;
-			}
-			if (endname) {
-				*endname = '\0';
-			}
-			format = strchr (structname, ' ');
-			if (format) {
-				tmp = *format;
-				while (tmp == ' ') {
-					format++;
-					tmp = *format;
-				}
-			} else {
-				format = sdb_get (p->formats, structname + 1, NULL);
-			}
-			if (!format) {
-				eprintf ("Cannot find format for struct `%s'\n", structname + 1);
-				return 0;
-			}
-			int newsize = r_print_format_struct_size (format, p, mode, n + 1);
-			if (newsize < 1) {
-				eprintf ("Cannot find size for `%s'\n", format);
-				return 0;
-			}
-			if (format && newsize > 0) {
-				size += tabsize * newsize;
-			}
-			free (structname);
-			}
-			break;
-		case '{':
-			while (fmt[i] != '}') {
-				if (!fmt[i]) {
-					free (o);
-					free (args);
-					return -1;
-				}
-				i++;
-			}
-			i++;
-			idx--;
-			break;
-		case '}':
-			free (o);
-			free (args);
-			return -1;
-		case '+':
-		case 'e':
-			idx--;
-			break;
-		case 'p':
-			if (fmt[i+1] == '2') {
-				size += tabsize * 2;
-			} else if (fmt[i+1] == '4') {
-				size += tabsize * 4;
-			} else if (fmt[i+1] == '8') {
-				size += tabsize * 8;
-			} else {
-				size += tabsize * (p->bits / 8);
-				break;
-			}
-			i++;
-			break;
-		case 'r':
-			break;
-		case 'n':
-		case 'N':
-			if (fmt[i+1] == '1') {
-				size += tabsize * 1;
-			} else if (fmt[i+1] == '2') {
-				size += tabsize * 2;
-			} else if (fmt[i+1] == '4') {
-				size += tabsize * 4;
-			} else if (fmt[i+1] == '8') {
-				size += tabsize * 8;
-			} else {
-				eprintf ("Invalid n format.\n");
-				free (o);
-				free (args);
-				return -2;
-			}
-			i++;
-			break;
-		case 'D':
-		case 'T':
-		case 'u':
-			//TODO complete this.
-		default:
-			//idx--; //Does this makes sense?
-			break;
-		}
-		idx++;
-		if (mode & R_PRINT_UNIONMODE) {
-			if (size > biggest) {
-				biggest = size;
-			}
-			size = 0;
-		}
-	}
-	free (o);
-	free (args);
-	return (mode & R_PRINT_UNIONMODE)? biggest : size;
-}
-
-static int r_print_format_struct(RPrint* p, ut64 seek, const ut8* b, int len, const char *name,
-		int slide, int mode, const char *setval, char *field, int anon) {
-	const char *fmt;
-	char namefmt[128];
-	slide++;
-	if ((slide % STRUCTPTR) > NESTDEPTH || (slide % STRUCTFLAG)/STRUCTPTR > NESTDEPTH) {
-		eprintf ("Too much nested struct, recursion too deep...\n");
-		return 0;
-	}
-	if (anon) {
-		fmt = name;
-	} else {
-		fmt = sdb_get (p->formats, name, NULL);
-	}
-	if (!fmt || !*fmt) {
-		eprintf ("Undefined struct '%s'.\n", name);
-		return 0;
-	}
-	if (MUSTSEE && !SEEVALUE) {
-		snprintf (namefmt, sizeof (namefmt), "%%%ds", 10+6*slide%STRUCTPTR);
-		if (fmt[0] == '0') {
-			p->cb_printf (namefmt, "union");
-		} else {
-			p->cb_printf (namefmt, "struct");
-		}
-		p->cb_printf ("<%s>\n", name);
-	}
-	r_print_format (p, seek, b, len, fmt, mode, setval, field);
-	return r_print_format_struct_size (fmt, p, mode, 0);
-}
-
-static char* get_args_offset(const char *arg) {
-	char *args = strchr (arg, ' ');
-	char *sq_bracket = strchr (arg, '[');
-	int max = 30;
-	if (args && sq_bracket) {
-		char *csq_bracket = strchr (arg, ']');
-		while (args && csq_bracket && csq_bracket > args && max--) {
-			args = strchr (csq_bracket, ' ');
-		}
-	}
-	return args;
-}
-
-#define MINUSONE ((void*)(size_t)-1)
-#define ISSTRUCT (tmp == '?' || (tmp == '*' && *(arg+1) == '?'))
-R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
-		const char *formatname, int mode, const char *setval, char *ofield) {
-	int nargs, i, j, invalid, nexti, idx, times, otimes, endian, isptr = 0;
-	const int old_bits = p->bits;
-	char *args = NULL, *bracket, tmp, last = 0;
-	ut64 addr = 0, addr64 = 0, seeki = 0;
-	static int slide = 0, oldslide = 0;
-	char namefmt[8], *field = NULL;
-	const char *arg = NULL;
-	const char *fmt = NULL;
-	const char *argend;
-	int viewflags = 0;
-	char *oarg = NULL;
-	ut8 *buf;
-
-	/* Load format from name into fmt */
-	if (!formatname) {
-		return 0;
-	}
-	fmt = sdb_get (p->formats, formatname, NULL);
-	if (!fmt) {
-		fmt = formatname;
-	}
-	while (*fmt && ISWHITECHAR (*fmt)) fmt++;
-	argend = fmt + strlen (fmt);
-	arg = fmt;
-
-	nexti = nargs = i = j = 0;
-
-	if (len < 1) {
-		return 0;
-	}
-	// len+2 to save space for the null termination in wide strings
-	buf = calloc (1, len + 2);
-	if (!buf) {
-		return 0;
-	}
-	memcpy (buf, b, len);
-	endian = p->big_endian;
-
-	if (ofield && ofield != MINUSONE) {
-		field = strdup (ofield);
-	}
-	/* get times */
-	otimes = times = atoi (arg);
-	if (times > 0) {
-		while (IS_DIGIT(*arg)) {
-			arg++;
-		}
-	}
-
-	bracket = strchr (arg,'{');
-	if (bracket) {
-		char *end = strchr (arg, '}');
-		if (!end) {
-			eprintf ("No end bracket. Try pf {ecx}b @ esi\n");
-			goto beach;
-		}
-		*end = '\0';
-		times = r_num_math (NULL, bracket + 1);
-		arg = end + 1;
-	}
-
-	if (*arg == '\0') {
-		goto beach;
-	}
-
-	/* get args */
-	args = get_args_offset (arg);
-	if (args) {
-		int l = 0, maxl = 0;
-		argend = args;
-		tmp = *args;
-		while (tmp == ' ') {
-			args++;
-			tmp = *args;
-		}
-		args = strdup (args);
-		nargs = r_str_word_set0_stack (args);
-		if (nargs == 0) {
-			R_FREE (args);
-		}
-		for (i = 0; i < nargs; i++) {
-			const char *tmp = r_str_word_get0 (args, i);
-			const char *nm = NULL;
-			int len;
-			nm = r_str_rchr (tmp, NULL, ')');
-			len = strlen (nm ? nm + 1 : tmp);
-			if (len > maxl) {
-				maxl = len;
-			}
-		}
-		l++;
-		const char *ends = " "; // XXX trailing space warning
-		snprintf (namefmt, sizeof (namefmt), "%%%ds :%s",
-			((maxl + 1) * (1+slide)) % STRUCTPTR, ends);
-	}
-#define ISPOINTED ((slide%STRUCTFLAG)/STRUCTPTR<=(oldslide%STRUCTFLAG)/STRUCTPTR)
-#define ISNESTED ((slide%STRUCTPTR)<=(oldslide%STRUCTPTR))
-	if (mode == R_PRINT_JSON && slide == 0) {
-		p->cb_printf ("[");
-	}
-	if (mode && arg[0] == '0') {
-		mode |= R_PRINT_UNIONMODE;
-		arg++;
-	} else {
-		mode &= ~R_PRINT_UNIONMODE;
-	}
-	if (mode & R_PRINT_DOT) {
-		char *fmtname;
-		if (formatname && *formatname) {
-			if (strchr (formatname, ' ')) {
-				fmtname = r_str_newf ("0x%"PFMT64x, seek);
-			} else {
-				fmtname = strdup (formatname);
-			}
-		} else {
-			fmtname = r_str_newf ("0x%"PFMT64x, seek);
-		}
-		p->cb_printf ("digraph g { graph [ rank=same; rankdir=LR; ];\n");
-		p->cb_printf ("root [ rank=1; shape=record\nlabel=\"%s", fmtname);
-	}
-
-	/* go format */
-	i = 0;
-	if (!times) {
-		otimes = times = 1;
-	}
-	for (; times; times--) { // repeat N times
-		const char * orig = arg;
-		int first = 1;
-		if (otimes > 1) {
-			if (mode & R_PRINT_JSON) {
-				if (otimes > times) {
-					p->cb_printf (",");
-				}
-				p->cb_printf ("[{\"index\":%d,\"offset\":%d},", otimes-times, seek+i);
-			} else if (mode) {
-				p->cb_printf ("0x%08"PFMT64x" [%d] {\n", seek+i, otimes-times);
-			}
-		}
-		arg = orig;
-		for (idx = 0; i < len && arg < argend && *arg; arg++) {
-			int size = 0, elem = 0; /* size of the array, element of the array */
-			char *fieldname = NULL, *fmtname = NULL;
-			if (mode & R_PRINT_UNIONMODE) {
-				i = 0;
-			}
-			seeki = seek + i;
-			addr = 0LL;
-			invalid = 0;
-			p->bits = old_bits;
-			if (arg[0] == '[') {
-				char *end = strchr (arg,']');
-				if (!end) {
-					eprintf ("No end bracket.\n");
-					goto beach;
-				}
-				*end = '\0';
-				size = r_get_size (p->num, buf, endian, arg + 1);
-				arg = end + 1;
-				*end = ']';
-			} else {
-				size = -1;
-			}
-			int fs = r_print_format_struct_size (arg, p, 0, idx);
-			if (fs == -2) {
-				i = -1;
-				goto beach;
-			}
-			if (fs < 1) {
-				fs = 4;
-			}
-			if (i + fs - 1 < len) { // should be +7 to avoid oobread on 'q'
-					// Max byte number where updateAddr will look into
-				if (len - i < 7) {
-					updateAddr (buf + i, THRESHOLD - (len - i), endian, &addr, &addr64);
-				} else {
-					updateAddr (buf + i, len - i, endian, &addr, &addr64);
-				}
-			} else {
-				// eprintf ("Format strings is too big for this buffer\n");
-				goto beach;
-			}
-
-			tmp = *arg;
-
-			if (mode && !args) {
-				mode |= R_PRINT_ISFIELD;
-			}
-			if (mode & R_PRINT_MUSTSEE && otimes > 1) {
-				p->cb_printf ("  ");
-			}
-
-			if (idx < nargs && tmp != 'e' && isptr == 0) {
-				char *dot = NULL, *bracket = NULL;
-				if (field)
-					dot = strchr (field, '.');
-				if (dot)
-					*dot = '\0';
-				free (oarg);
-				oarg = fieldname = strdup (r_str_word_get0 (args, idx));
-				if (ISSTRUCT || tmp=='E' || tmp=='B' || tmp=='r') {
-					if (*fieldname == '(') {
-						fmtname = fieldname + 1;
-						fieldname = (char*)r_str_rchr (fieldname, NULL, ')');
-						if (fieldname) {
-							*fieldname++ = '\0';
-						} else {
-							eprintf ("Missing closing parenthesis in format ')'\n");
-							goto beach;
-						}
-					} else {
-						eprintf ("Missing name (%s)\n", fieldname);
-						goto beach;
-					}
-				}
-				if (mode && (!args || (!field && ofield != MINUSONE)
-						|| (field && !strncmp (field, fieldname, \
-							strchr (field, '[')
-						? strchr (field, '[') - field
-						: strlen (field) + 1)))) {
-					mode |= R_PRINT_ISFIELD;
-				} else {
-					mode &= ~R_PRINT_ISFIELD;
-				}
-
-				/* There we handle specific element in array */
-				if (field && (bracket = strchr (field, '[')) && mode & R_PRINT_ISFIELD) {
-					char *end = strchr (field, ']');
-					if (!end) {
-						eprintf ("Missing closing bracket\n");
-						goto beach;
-					}
-					*end = '\0';
-					elem = r_num_math (NULL, bracket+1)+1; // +1 to handle 0 index easily
-					for ( ; bracket < end; bracket++) {
-						*bracket = '\0';
-					}
-					size += elem*ARRAYINDEX_COEF;
-				} else {
-					elem = -1;
-				}
-				if (tmp != '.' && tmp != ':') {
-					idx++;
-					if (MUSTSEE && !SEEVALUE) {
-						p->cb_printf (namefmt, fieldname);
-					}
-				}
-			}
-
-		feed_me_again:
-			switch (isptr) {
-			case PTRSEEK:
-				{
-				nexti = i + (p->bits/8);
-				i = 0;
-				if (tmp == '?' ) {
-					seeki = addr;
-				}
-				memset (buf, '\0', len);
-				if (MUSTSEE) {
-					p->cb_printf ("(*0x%"PFMT64x")", addr);
-				}
-				isptr = (addr)? PTRBACK: NULLPTR;
-				if (/*addr<(b+len) && addr>=b && */p->iob.read_at) { /* The test was here to avoid segfault in the next line,
-						but len make it doesnt work... */
-					p->iob.read_at (p->iob.io, (ut64)addr, buf, len-4);
-					if ( (i + 3) < len || (i + 7) < len) {
-						updateAddr (buf + i, len - i, endian, &addr, &addr64);
-					} else {
-						eprintf ("Likely a heap buffer overflow.\n");
-						goto beach;
-					}
-				} else {
-					eprintf ("(SEGFAULT: cannot read memory at 0x%08"PFMT64x", Block: %s, blocksize: 0x%x)\n",
-							addr, b, len);
-					p->cb_printf ("\n");
-					goto beach;
-				}
-				}
-				break;
-			case PTRBACK:
-				// restore state after pointer seek
-				i = nexti;
-				memcpy (buf, b, len);
-				isptr = NOPTR;
-				arg--;
-				continue;
-			}
-			if (tmp == 0 && last != '*') {
-				break;
-			}
-
-			/* skip chars */
-			switch (tmp) {
-			case '*': // next char is a pointer
-				isptr = PTRSEEK;
-				arg++;
-				tmp = *arg; //last;
-				goto feed_me_again;
-			case '+': // toggle view flags
-				viewflags = !viewflags;
-				continue;
-			case 'e': // tmp swap endian
-				endian ^= 1;
-				continue;
-			case ':': // skip 4 bytes
-				if (size == -1) {
-					i += 4;
-				} else {
-					while (size--) {
-						i+=4;
-					}
-				}
-				continue;
-			case '.': // skip 1 byte
-				i += (size == -1)? 1: size;
-				continue;
-			case 'p': // pointer reference
-				if (*(arg+1) == '2') {
-					tmp = 'w';
-					arg++;
-				} else if (*(arg+1) == '4') {
-					tmp = 'x';
-					arg++;
-				} else if (*(arg+1) == '8') {
-					tmp = 'q';
-					arg++;
-				} else {	//If pointer reference is not mentioned explicitly
-					switch (p->bits) {
-					case 16: tmp = 'w'; break;
-					case 32: tmp = 'x'; break;
-					default: tmp = 'q'; break;
-					}
-				}
-				break;
-			}
-
-			/* flags */
-			if (mode & R_PRINT_SEEFLAGS && isptr != NULLPTR) {
-				char *newname = NULL;
-				if (!fieldname) {
-					newname = fieldname = r_str_newf ("pf.%d", seeki);
-				}
-				if (mode & R_PRINT_UNIONMODE) {
-					p->cb_printf ("f %s=0x%08"PFMT64x"\n", formatname, seeki);
-					goto beach;
-				} else if (tmp == '?') {
-					p->cb_printf ("f %s.%s_", fmtname, fieldname);
-				} else if (tmp == 'E') {
-					p->cb_printf ("f %s=0x%08"PFMT64x"\n", fieldname, seeki);
-				} else if (slide/STRUCTFLAG>0 && idx==1) {
-					p->cb_printf ("%s=0x%08"PFMT64x"\n", fieldname, seeki);
-				} else p->cb_printf ("f %s=0x%08"PFMT64x"\n", fieldname , seeki);
-				if (newname) {
-					free (newname);
-					newname = fieldname = NULL;
-				}
-			}
-
-			/* dot */
-			if (mode & R_PRINT_DOT) {
-				if (fieldname) {
-					p->cb_printf ("|{0x%"PFMT64x"|%c|%s|<%s>",
-						seeki, tmp, fieldname, fieldname);
-				} else {
-					p->cb_printf ("|{0x%"PFMT64x"|%c|",
-						seeki, tmp);
-				}
-			}
-
-			/* json */
-			if (MUSTSEEJSON && mode & R_PRINT_JSON) {
-				if (oldslide <= slide) {
-					if (first) first = 0;
-					else p->cb_printf (",");
-				} else if (oldslide) {
-					p->cb_printf ("]},");
-				}
-				if (fieldname) {
-					p->cb_printf ("{\"name\":\"%s\",\"type\":\"", fieldname);
-				} else {
-					p->cb_printf ("{\"type\":\"");
-				}
-				if (ISSTRUCT) {
-					p->cb_printf ("%s", fmtname);
-				} else {
-					if (tmp == 'n' || tmp == 'N') {
-						p->cb_printf ("%c%c", tmp, *(arg+1));
-					} else {
-						p->cb_printf ("%c", tmp);
-					}
-				}
-				if (isptr) {
-					p->cb_printf ("*");
-				}
-				p->cb_printf ("\",\"offset\":%d,\"value\":",
-					isptr? (seek + nexti - (p->bits / 8)) : seek + i);
-			}
-
-			if (isptr == NULLPTR) {
-				if (MUSTSEEJSON) {
-					p->cb_printf ("\"NULL\"}", tmp, seek + i);
-				} else if (MUSTSEE) {
-					p->cb_printf (" NULL\n");
-				}
-				isptr = PTRBACK;
-			} else
-			/* format chars */
-			// before to enter in the switch statement check buf boundaries due to  updateAddr
-			// might go beyond its len and it's usually called in each of the following functions
-#if 0
-// those boundaries are wrong. the fix was not correct, we need a reproducer
-			if (((i+3)<len) || (i+7)<len) {
-#endif
-				switch (tmp) {
-				case 'u':
-					i += r_print_format_uleb (p, endian, mode, setval, seeki, buf, i, size);
-					break;
-				case 't':
-					r_print_format_time (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 4 : 4*size;
-					break;
-				case 'q':
-					r_print_format_quadword (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 8 : 8*size;
-					break;
-				case 'b':
-					r_print_format_byte (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 1 : size;
-					break;
-				case 'C':
-					r_print_format_decchar (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 1 : size;
-					break;
-				case 'c':
-					r_print_format_char (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 1 : size;
-					break;
-				case 'X':
-					size = r_print_format_hexpairs (p, endian, mode, setval, seeki, buf, i, size);
-					i += size;
-					break;
-				case 'T':
-					if (r_print_format_10bytes (p, mode,
-						setval, seeki, addr, buf) == 0) {
-						i += (size==-1) ? 4 : 4*size;
-					}
-					break;
-				case 'f':
-					r_print_format_float (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 4 : 4*size;
-					break;
-				case 'i':
-					r_print_format_int (p, endian, mode, setval, seeki, buf, i, size);
-					i+= (size==-1) ? 4 : 4*size;
-					break;
-				case 'd': //WHY?? help says: 0x%%08x hexadecimal value (4 bytes)
-					r_print_format_hex (p, endian, mode, setval, seeki, buf, i, size);
-					i+= (size==-1) ? 4 : 4*size;
-					break;
-				case 'D':
-					i += r_print_format_disasm (p, seeki, size);
-					break;
-				case 'o':
-					r_print_format_octal (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 4 : 4*size;
-					break;
-				case 'x':
-					r_print_format_hexflag (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 4 : 4*size;
-					break;
-				case 'w':
-					r_print_format_word (p, endian, mode, setval, seeki, buf, i, size);
-					i += (size==-1) ? 2 : 2*size;
-					break;
-				case 'z': // zero terminated string
-					r_print_format_nulltermstring (p, len, endian, mode, setval, seeki, buf, i, size);
-					if (size == -1)
-						i+=strlen((char*)buf+i)+1;
-					else
-						while (size--) i++;
-					break;
-				case 'Z': // zero terminated wide string
-					r_print_format_nulltermwidestring (p, len, endian, mode, setval, seeki, buf, i, size);
-					if (size == -1)
-						i += r_wstr_clen((char*)(buf+i))*2+2;
-					else
-						while (size--) i+=2;
-					break;
-				case 's':
-					if (r_print_format_string (p, seeki, addr64, addr, 0, mode) == 0) {
-						i += (size==-1) ? 4 : 4*size;
-					}
-					break;
-				case 'S':
-					if (r_print_format_string (p, seeki, addr64, addr, 1, mode) == 0)
-						i += (size==-1) ? 8 : 8*size;
-					break;
-				case 'B': // resolve bitfield
-					if (size >= ARRAYINDEX_COEF) size %= ARRAYINDEX_COEF;
-					r_print_format_bitfield (p, seeki, fmtname, fieldname, addr, mode, size);
-					i+=(size==-1)?1:size;
-					break;
-				case 'E': // resolve enum
-					if (size >= ARRAYINDEX_COEF) size %= ARRAYINDEX_COEF;
-					r_print_format_enum (p, seeki, fmtname, fieldname, addr, mode, size);
-					i += (size==-1)? 1: size;
-					break;
-				case 'r':
-					r_print_format_register (p, mode, fmtname, setval);
-					break;
-				case '?':
-					{
-					int s = 0;
-					char *nxtfield = NULL;
-					char *format = NULL;
-					int anon = 0;
-					if (size >= ARRAYINDEX_COEF) {
-						elem = size / ARRAYINDEX_COEF - 1;
-						size %= ARRAYINDEX_COEF;
-					}
-					if (!(mode & R_PRINT_ISFIELD)) {
-						nxtfield = MINUSONE;
-					} else if (field) {
-						nxtfield = strchr (ofield, '.');
-					}
-					if (nxtfield != MINUSONE && nxtfield) {
-						nxtfield++;
-					}
-
-					if (MUSTSEE) {
-						if (!SEEVALUE) p->cb_printf ("\n");
-					}
-					if (MUSTSEEJSON) {
-						if (isptr) {
-							p->cb_printf ("%d},", seeki);
-						} else {
-							p->cb_printf ("[");
-						}
-					}
-					if (mode & R_PRINT_SEEFLAGS) {
-						slide += STRUCTFLAG;
-					}
-					if (!fmtname) {
-						break;
-					}
-					format = strchr (fmtname, ' ');
-					if (format) {
-						anon = 1;
-						fmtname = format;
-						while (*fmtname == ' ') {
-							fmtname++;
-						}
-					}
-					oldslide = slide;
-					//slide += (isptr) ? STRUCTPTR : NESTEDSTRUCT;
-					slide += NESTEDSTRUCT;
-					if (size == -1) {
-						s = r_print_format_struct (p, seeki,
-									buf+i, len-i, fmtname, slide,
-									mode, setval, nxtfield, anon);
-						i += (isptr) ? (p->bits / 8) : s;
-						if (MUSTSEEJSON) {
-							if (!isptr && (!arg[1] || arg[1] == ' ')) {
-								p->cb_printf ("]}");
-							}
-						}
-					} else {
-						if (mode & R_PRINT_ISFIELD) {
-							if (!SEEVALUE) {
-								p->cb_printf ("[\n");
-							}
-						}
-						while (size--) {
-							if (mode && (elem == -1 || elem == 0)) {
-								mode |= R_PRINT_MUSTSEE;
-								if (elem == 0) {
-									elem = -2;
-								}
-							} else {
-								mode &= ~R_PRINT_MUSTSEE;
-							}
-							s = r_print_format_struct (p, seek+i,
-									buf+i, len-i, fmtname, slide, mode, setval, nxtfield, anon);
-							if ((MUSTSEE || MUSTSEEJSON) && size != 0 && elem == -1) {
-								if (MUSTSEEJSON) {
-									p->cb_printf (",");
-								} else if (MUSTSEE) {
-									p->cb_printf ("\n");
-								}
-							}
-							if (elem > -1) {
-								elem--;
-							}
-							i += (isptr) ? (p->bits / 8) : s;
-						}
-						if (mode & R_PRINT_ISFIELD) {
-							if (!SEEVALUE) {
-								p->cb_printf ("]\n");
-							}
-						}
-						if (MUSTSEEJSON) {
-							p->cb_printf ("]}");
-						}
-					}
-					oldslide = slide;
-					//slide -= (isptr) ? STRUCTPTR : NESTEDSTRUCT;
-					slide -= NESTEDSTRUCT;
-					if (mode & R_PRINT_SEEFLAGS) {
-						oldslide = slide;
-						slide -= STRUCTFLAG;
-					}
-					break;
-					}
-				case 'n':
-				case 'N':
-					{
-						int bytes = 0;
-						int sign = (tmp == 'n') ? 1 : 0;
-						if (arg[1] == '1') {
-							bytes = 1;
-						} else if (arg[1] == '2') {
-							bytes = 2;
-						} else if (arg[1] == '4') {
-							bytes = 4;
-						} else if (arg[1] == '8') {
-							bytes = 8;
-						} else {
-							invalid = 1;
-							break;
-							//or goto beach;???
-						}
-						r_print_format_num (p, endian, mode, setval, seeki, buf, i, bytes, sign, size);
-						i += (size == -1) ? bytes : size * bytes;
-						arg++;
-						break;
-					}
-				default:
-					/* ignore unknown chars */
-					invalid = 1;
-					break;
-				} //switch
-#if 0
-			} else {
-				eprintf ("r_print_format: Likely a heap buffer overflow (%s)\n", buf);
-				goto beach;
-			}
-#endif
-			if (mode & R_PRINT_DOT) {
-				p->cb_printf ("}");
-			}
-			if (viewflags && p->offname) {
-				const char *s = p->offname (p->user, seeki);
-				if (s) p->cb_printf ("@(%s)", s);
-				s = p->offname (p->user, addr);
-				if (s) p->cb_printf ("*(%s)", s);
-			}
-			if (tmp != 'D' && !invalid && !fmtname && MUSTSEE) {
-				p->cb_printf ("\n");
-			}
-			last = tmp;
-
-			// XXX: Due to the already noted issues with the above, we need to strip
-			// args from fmt:args the same way we strip fmt BUT only for enums as
-			// nested structs seem to be handled correctly above!
-			if (arg[0] == 'E') {
-				char *end_fmt = strchr (arg, ' ');
-				char *next_args = strchr (end_fmt+1, ' ');
-				if (next_args) {
-					while (*next_args != '\0') {
-						*end_fmt++ = *next_args++;
-					}
-				}
-				*end_fmt = '\0';
-			}
-		}
-		if (otimes > 1) {
-			if (MUSTSEEJSON) {
-				p->cb_printf ("]");
-			} else if (mode) {
-				p->cb_printf ("}\n");
-			}
-		}
-		arg = orig;
-		oldslide = 0;
-	}
-	if (mode & R_PRINT_JSON && slide == 0) {
-		p->cb_printf("]\n");
-	}
-	if (mode & R_PRINT_DOT) {
-		p->cb_printf ("\"];\n}\n");
-		// TODO: show nested structs and field reference lines
-	}
-beach:
-	free (oarg);
-	free (buf);
-	free (field);
-	free (args);
-	return i;
-}
diff -Nru radare2-2.3.0+dfsg/libr/util/pie.c radare2-2.8.0+dfsg/libr/util/pie.c
--- radare2-2.3.0+dfsg/libr/util/pie.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/pie.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,92 @@
+/* radare2 - LGPL - Copyright 2018 - pancake */
+
+// TODO: move into RCons ?
+#include <r_print.h>
+#include <math.h>
+#define PI 3.1415
+#define O out[x + (y * size)]
+#define USE_SINCOS 0
+
+// TODO: add support for colors
+// TODO: better rounding ascii art
+
+static void drawSectorLine(char *out, int size, int percent) {
+	int i, x, y;
+	double A = (percent) * PI / 50;
+	double foo  = 0.1;
+	for (i = (size-1) / 2; i < (size-3) ; i++) {
+		x = y = (size - 1)/ 2;
+		x += cos (A) * foo + 1;
+		y += sin (A)  *foo + 1 ;
+		foo += 1.1;
+		O = ':';
+	}
+}
+
+R_API int r_print_pie(RPrint *p, ut64 *values, int nvalues, int size) {
+	ut8 *nv = calloc (nvalues, sizeof (ut8));
+	char *out = calloc (size, size);
+	int i, x, y;
+	if (nv && out) {
+		ut64 total = 0;
+		for (i = 0; i<nvalues; i++) {
+			total += values[i];
+		}
+		total /= 100;
+		if (total < 1) {
+			total = 1;
+		}
+		for (i = 0; i<nvalues; i++) {
+			nv[i] = values[i] / total;
+		}
+		for (x = 0; x < size; x++) {
+			for (y = 0; y < size; y++) {
+				O = ' ';
+			}
+		}
+#if USE_SINCOS
+		float a = 0.0;
+		int s = size / 2;
+		while (a < 2 * PI) {
+			x = s * cos (a) + (size/2);
+			y = s * sin (a) + (size/2);
+			O = '.';
+			a += 0.1;
+		}
+#else
+		int radius = (size - 1) / 2;
+
+		// draw portions
+		for (x=0; x<=2*radius; x++) {
+			for (y=0; y<=2*radius; y++) {
+				double distance = sqrt((double)(x-radius)*(x-radius) + (y-radius)*(y-radius));
+				O = (distance>radius-0.5 && distance<radius+0.5)? '.': ' ';
+			}
+		}
+#endif
+		int amount = 0;
+		for (i = 0; i< nvalues; i++) {
+			drawSectorLine (out, size, nv[i] + amount);
+			amount += nv[i];
+		}
+
+		/// render
+		if (p && p->cb_printf) {
+			for (x = 0; x < size; x++) {
+				for (y = 0; y < size; y++) {
+					p->cb_printf ("%c%c", O, O);
+				}
+				p->cb_printf("\n");
+			}
+		}
+	}
+	free (out);
+	free (nv);
+	return 0;
+}
+#if 0
+main() {
+	ut64 v[] = { 10, 20, 30, 40 };
+	r_print_pie (NULL, &v, 4, 20);
+}
+#endif
diff -Nru radare2-2.3.0+dfsg/libr/util/pkcs7.c radare2-2.8.0+dfsg/libr/util/pkcs7.c
--- radare2-2.3.0+dfsg/libr/util/pkcs7.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/pkcs7.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,754 @@
+/* radare2 - LGPL - Copyright 2017-2018 - wargio */
+
+#include <stdlib.h>
+#include <string.h>
+#include <r_util.h>
+#include "./x509.h"
+#include "./pkcs7.h"
+
+extern RJSVar *r_x509_name_json (RX509Name* name);
+
+bool r_pkcs7_parse_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls, RASN1Object *object) {
+	ut32 i;
+	if (!crls || !object) {
+		return false;
+	}
+	if (object->list.length > 0) {
+		crls->elements = (RX509CertificateRevocationList **) calloc (object->list.length, sizeof (RX509CertificateRevocationList*));
+		if (!crls->elements) {
+			return false;
+		}
+		crls->length = object->list.length;
+		for (i = 0; i < crls->length; ++i) {
+			crls->elements[i] = r_x509_parse_crl (object->list.objects[i]);
+		}
+	}
+	return true;
+}
+
+void r_pkcs7_free_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls) {
+	ut32 i;
+	if (crls) {
+		for (i = 0; i < crls->length; ++i) {
+			r_x509_free_crl (crls->elements[i]);
+			crls->elements[i] = NULL;
+		}
+		R_FREE (crls->elements);
+		// Used internally pkcs #7, so it should't free crls.
+	}
+}
+
+bool r_pkcs7_parse_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac, RASN1Object *object) {
+	ut32 i;
+	if (!ecac || !object) {
+		return false;
+	}
+	if (object->list.length > 0) {
+		ecac->elements = (RX509Certificate **) calloc (object->list.length, sizeof (RX509Certificate*));
+		if (!ecac->elements) {
+			return false;
+		}
+		ecac->length = object->list.length;
+		for (i = 0; i < ecac->length; ++i) {
+			ecac->elements[i] = r_x509_parse_certificate (object->list.objects[i]);
+			object->list.objects[i] = NULL;
+		}
+	}
+	return true;
+}
+
+void r_pkcs7_free_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac) {
+	ut32 i;
+	if (ecac) {
+		for (i = 0; i < ecac->length; ++i) {
+			r_x509_free_certificate (ecac->elements[i]);
+			ecac->elements[i] = NULL;
+		}
+		R_FREE (ecac->elements);
+		// Used internally pkcs #7, so it should't free ecac.
+	}
+}
+
+bool r_pkcs7_parse_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai, RASN1Object *object) {
+	ut32 i;
+	if (!dai || !object) {
+		return false;
+	}
+	if (object->list.length > 0) {
+		dai->elements = (RX509AlgorithmIdentifier **) calloc (object->list.length, sizeof (RX509AlgorithmIdentifier*));
+		if (!dai->elements) {
+			return false;
+		}
+		dai->length = object->list.length;
+		for (i = 0; i < dai->length; ++i) {
+			// r_x509_parse_algorithmidentifier returns bool,
+			// so i have to allocate before calling the function
+			dai->elements[i] = (RX509AlgorithmIdentifier *) malloc (sizeof (RX509AlgorithmIdentifier));
+			//should i handle invalid memory? the function checks the pointer
+			//or it should return if dai->elements[i] == NULL ?
+			if (dai->elements[i]) {
+				//Memset is needed to initialize to 0 the structure and avoid garbage.
+				memset (dai->elements[i], 0, sizeof (RX509AlgorithmIdentifier));
+				r_x509_parse_algorithmidentifier (dai->elements[i], object->list.objects[i]);
+			}
+		}
+	}
+	return true;
+}
+
+void r_pkcs7_free_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai) {
+	ut32 i;
+	if (dai) {
+		for (i = 0; i < dai->length; ++i) {
+			if (dai->elements[i]) {
+				r_x509_free_algorithmidentifier (dai->elements[i]);
+				// r_x509_free_algorithmidentifier doesn't free the pointer
+				// because on x509 the original use was internal.
+				R_FREE (dai->elements[i]);
+			}
+		}
+		R_FREE (dai->elements);
+		// Used internally pkcs #7, so it should't free dai.
+	}
+}
+
+bool r_pkcs7_parse_contentinfo (RPKCS7ContentInfo* ci, RASN1Object *object) {
+	if (!ci || !object || object->list.length < 1 || !object->list.objects[0]) {
+		return false;
+	}
+	ci->contentType = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
+	if (object->list.length > 1) {
+		RASN1Object *obj1 = object->list.objects[1];
+		if (obj1) {
+			ci->content = r_asn1_create_binary (obj1->sector, obj1->length);
+		}
+	}
+	return true;
+}
+
+void r_pkcs7_free_contentinfo (RPKCS7ContentInfo* ci) {
+	if (ci) {
+		r_asn1_free_binary (ci->content);
+		r_asn1_free_string (ci->contentType);
+		// Used internally pkcs #7, so it should't free ci.
+	}
+}
+
+bool r_pkcs7_parse_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu, RASN1Object *object) {
+	if (!iasu || !object || object->list.length != 2) {
+		return false;
+	}
+	r_x509_parse_name (&iasu->issuer, object->list.objects[0]);
+	RASN1Object *obj1 = object->list.objects[1];
+	if (obj1) {
+		iasu->serialNumber = r_asn1_create_binary (obj1->sector, obj1->length);
+	}
+	return true;
+}
+
+void r_pkcs7_free_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu) {
+	if (iasu) {
+		r_x509_free_name (&iasu->issuer);
+		r_asn1_free_binary (iasu->serialNumber);
+		// Used internally pkcs #7, so it should't free iasu.
+	}
+}
+
+/*
+	RX509AlgorithmIdentifier digestEncryptionAlgorithm;
+	RASN1Object *encryptedDigest;
+	RASN1Object *unauthenticatedAttributes; //Optional type ??
+} RPKCS7SignerInfo;
+ */
+
+bool r_pkcs7_parse_signerinfo (RPKCS7SignerInfo* si, RASN1Object *object) {
+	RASN1Object **elems;
+	ut32 shift = 3;
+	if (!si || !object || object->list.length < 5) {
+		return false;
+	}
+	elems = object->list.objects;
+	//Following RFC
+	si->version = (ut32) elems[0]->sector[0];
+	r_pkcs7_parse_issuerandserialnumber (&si->issuerAndSerialNumber, elems[1]);
+	r_x509_parse_algorithmidentifier (&si->digestAlgorithm, elems[2]);
+	if (shift < object->list.length && elems[shift]->klass == CLASS_CONTEXT && elems[shift]->tag == 0) {
+		r_pkcs7_parse_attributes (&si->authenticatedAttributes, elems[shift]);
+		shift++;
+	}
+	if (shift < object->list.length) {
+		r_x509_parse_algorithmidentifier (&si->digestEncryptionAlgorithm, elems[shift]);
+		shift++;
+	}
+	if (shift < object->list.length) {
+		RASN1Object *obj1 = object->list.objects[shift];
+		if (obj1) {
+			si->encryptedDigest = r_asn1_create_binary (obj1->sector, obj1->length);
+			shift++;
+		}
+	}
+	if (shift < object->list.length) {
+		RASN1Object *elem = elems[shift];
+		if (elem && elem->klass == CLASS_CONTEXT && elem->tag == 1) {
+			r_pkcs7_parse_attributes (&si->unauthenticatedAttributes, elems[shift]);
+		}
+	}
+	return true;
+}
+
+void r_pkcs7_free_signerinfo (RPKCS7SignerInfo* si) {
+	if (si) {
+		r_pkcs7_free_issuerandserialnumber (&si->issuerAndSerialNumber);
+		r_x509_free_algorithmidentifier (&si->digestAlgorithm);
+		r_pkcs7_free_attributes (&si->authenticatedAttributes);
+		r_x509_free_algorithmidentifier (&si->digestEncryptionAlgorithm);
+		r_asn1_free_binary (si->encryptedDigest);
+		r_pkcs7_free_attributes (&si->unauthenticatedAttributes);
+		free (si);
+	}
+}
+
+bool r_pkcs7_parse_signerinfos (RPKCS7SignerInfos *ss, RASN1Object *object) {
+	ut32 i;
+	if (!ss || !object) {
+		return false;
+	}
+	if (object->list.length > 0) {
+		ss->elements = (RPKCS7SignerInfo **) calloc (object->list.length, sizeof (RPKCS7SignerInfo*));
+		if (!ss->elements) {
+			return false;
+		}
+		ss->length = object->list.length;
+		for (i = 0; i < ss->length; ++i) {
+			// r_pkcs7_parse_signerinfo returns bool,
+			// so i have to allocate before calling the function
+			ss->elements[i] = R_NEW0 (RPKCS7SignerInfo);
+			//should i handle invalid memory? the function checks the pointer
+			//or it should return if si->elements[i] == NULL ?
+			r_pkcs7_parse_signerinfo (ss->elements[i], object->list.objects[i]);
+		}
+	}
+	return true;
+}
+
+void r_pkcs7_free_signerinfos (RPKCS7SignerInfos *ss) {
+	ut32 i;
+	if (ss) {
+		for (i = 0; i < ss->length; i++) {
+			r_pkcs7_free_signerinfo (ss->elements[i]);
+			ss->elements[i] = NULL;
+		}
+		R_FREE (ss->elements);
+		// Used internally pkcs #7, so it should't free ss.
+	}
+}
+
+bool r_pkcs7_parse_signeddata (RPKCS7SignedData *sd, RASN1Object *object) {
+	ut32 shift = 3;
+	if (!sd || !object || object->list.length < 4) {
+		return false;
+	}
+	memset (sd, 0, sizeof (RPKCS7SignedData));
+	RASN1Object **elems = object->list.objects;
+	//Following RFC
+	sd->version = (ut32) elems[0]->sector[0]; 
+	r_pkcs7_parse_digestalgorithmidentifier (&sd->digestAlgorithms, elems[1]);
+	r_pkcs7_parse_contentinfo (&sd->contentInfo, elems[2]);
+	//Optional
+	if (shift < object->list.length && elems[shift] && elems[shift]->klass == CLASS_CONTEXT && elems[shift]->tag == 0) {
+		r_pkcs7_parse_extendedcertificatesandcertificates (&sd->certificates, elems[shift]);
+		shift++;
+	}
+	//Optional
+	if (shift < object->list.length && elems[shift] && elems[shift]->klass == CLASS_CONTEXT && elems[shift]->tag == 1) {
+		r_pkcs7_parse_certificaterevocationlists (&sd->crls, elems[shift]);
+		shift++;
+	}
+	if (shift < object->list.length) {
+		r_pkcs7_parse_signerinfos (&sd->signerinfos, elems[shift]);
+	}
+	return true;
+}
+
+void r_pkcs7_free_signeddata (RPKCS7SignedData* sd) {
+	if (sd) {
+		r_pkcs7_free_digestalgorithmidentifier (&sd->digestAlgorithms);
+		r_pkcs7_free_contentinfo (&sd->contentInfo);
+		r_pkcs7_free_extendedcertificatesandcertificates (&sd->certificates);
+		r_pkcs7_free_certificaterevocationlists (&sd->crls);
+		r_pkcs7_free_signerinfos (&sd->signerinfos);
+		// Used internally pkcs #7, so it should't free sd.
+	}
+}
+
+RCMS *r_pkcs7_parse_cms (const ut8 *buffer, ut32 length) {
+	RASN1Object *object;
+	RCMS *container;
+	if (!buffer || !length) {
+		return NULL;
+	}
+	container = R_NEW0 (RCMS);
+	if (!container) {
+		return NULL;
+	}
+	object = r_asn1_create_object (buffer, length);
+	if (!object || object->list.length != 2 || !object->list.objects ||
+		!object->list.objects[0] || !object->list.objects[1] ||
+		object->list.objects[1]->list.length != 1) {
+		r_asn1_free_object (object);
+		free (container);
+		return NULL;
+	}
+	if (object->list.objects[0]) {
+		container->contentType = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
+	}
+	if (object->list.objects[1]) {
+		r_pkcs7_parse_signeddata (&container->signedData, object->list.objects[1]->list.objects[0]);
+	}
+	r_asn1_free_object (object);
+	return container;
+}
+
+void r_pkcs7_free_cms (RCMS* container) {
+	if (container) {
+		r_asn1_free_string (container->contentType);
+		r_pkcs7_free_signeddata (&container->signedData);
+		free (container);
+	}
+}
+
+RPKCS7Attribute* r_pkcs7_parse_attribute (RASN1Object *object) {
+	RPKCS7Attribute* attribute;
+	if (!object || object->list.length < 1) {
+		return NULL;
+	}
+	attribute = R_NEW0 (RPKCS7Attribute);
+	if (!attribute) {
+		return NULL;
+	}
+	if (object->list.objects[0]) {
+		attribute->oid = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
+	}
+	if (object->list.length == 2) {
+		RASN1Object * obj1 = object->list.objects[1];
+		if (obj1) {
+			attribute->data = r_asn1_create_binary (obj1->sector, obj1->length);
+		}
+	}
+	return attribute;
+}
+
+void r_pkcs7_free_attribute (RPKCS7Attribute* attribute) {
+	if (attribute) {
+		r_asn1_free_binary (attribute->data);
+		r_asn1_free_string (attribute->oid);
+		free (attribute);
+	}
+}
+
+bool r_pkcs7_parse_attributes (RPKCS7Attributes* attributes, RASN1Object *object) {
+	ut32 i;
+	if (!attributes || !object || !object->list.length) {
+		return false;
+	}
+
+	attributes->length = object->list.length;
+	if (attributes->length > 0) {
+		attributes->elements = R_NEWS0 (RPKCS7Attribute*, attributes->length);
+		if (!attributes->elements) {
+			attributes->length = 0;
+			return false;
+		}
+		for (i = 0; i < object->list.length; ++i) {
+			attributes->elements[i] = r_pkcs7_parse_attribute (object->list.objects[i]);
+		}
+	}
+	return true;
+}
+
+void r_pkcs7_free_attributes (RPKCS7Attributes* attributes) {
+	ut32 i;
+	if (attributes) {
+		for (i = 0; i < attributes->length; ++i) {
+			r_pkcs7_free_attribute (attributes->elements[i]);
+		}
+		R_FREE (attributes->elements);
+		// Used internally pkcs #7, so it should't free attributes.
+	}
+}
+
+char* r_pkcs7_signerinfos_dump (RX509CertificateRevocationList *crl, char* buffer, ut32 length, const char* pad) {
+	RASN1String *algo = NULL, *last = NULL, *next = NULL;
+	ut32 i, p;
+	int r;
+	char *tmp, *pad2, *pad3;
+	if (!crl || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	pad3 = r_str_newf ("%s    ", pad);
+	if (!pad3) return NULL;
+
+	pad2 = pad3 + 2;
+	algo = crl->signature.algorithm;
+	last = crl->lastUpdate;
+	next = crl->nextUpdate;
+	r = snprintf (buffer, length, "%sCRL:\n%sSignature:\n%s%s\n%sIssuer\n",
+				pad, pad2, pad3, algo ? algo->string : "", pad2);
+	p = (ut32) r;
+	if (r < 0 || !(tmp = r_x509_name_dump (&crl->issuer, buffer + p, length - p, pad3))) {
+		free (pad3);
+		return NULL;
+	}
+	p = tmp - buffer;
+	if (length <= p) {
+		free (pad3);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sLast Update: %s\n%sNext Update: %s\n%sRevoked Certificates:\n",
+				pad2, last ? last->string : "Missing",
+				pad2, next ? next->string : "Missing", pad2);
+	p += (ut32) r;
+	if (r < 0) {
+		free (pad3);
+		return NULL;
+	}
+	for (i = 0; i < crl->length; ++i) {
+		if (length <= p || !(tmp = r_x509_crlentry_dump (crl->revokedCertificates[i], buffer + p, length - p, pad3))) {
+			free (pad3);
+			return NULL;
+		}
+		p = tmp - buffer;
+	}
+
+	free (pad3);
+	return buffer + p;
+}
+
+char* r_x509_signedinfo_dump (RPKCS7SignerInfo *si, char* buffer, ut32 length, const char* pad) {
+	RASN1String *s = NULL;
+	RASN1Binary *o = NULL;
+	ut32 i, p;
+	int r;
+	char *tmp, *pad2, *pad3;
+	if (!si || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	pad3 = r_str_newf ("%s    ", pad);
+	if (!pad3) {
+		return NULL;
+	}
+	pad2 = pad3 + 2;
+
+
+	r = snprintf (buffer, length, "%sSignerInfo:\n%sVersion: v%u\n%sIssuer\n", pad, pad2, si->version + 1, pad2);
+	p = (ut32) r;
+	if (r < 0) {
+		free (pad3);
+		return NULL;
+	}
+
+	if (length <= p || !(tmp = r_x509_name_dump (&si->issuerAndSerialNumber.issuer, buffer + p, length - p, pad3))) {
+		free (pad3);
+		return NULL;
+	}
+	p = tmp - buffer;
+	if ((o = si->issuerAndSerialNumber.serialNumber)) {
+		s = r_asn1_stringify_integer (o->binary, o->length);
+	} else {
+		s = NULL;
+	}
+	if (length <= p) {
+		free (pad3);
+		r_asn1_free_string (s);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sSerial Number:\n%s%s\n", pad2, pad3, s ? s->string : "Missing");
+	p += (ut32) r;
+	r_asn1_free_string (s);
+	if (r < 0 || length <= p) {
+		free (pad3);
+		return NULL;
+	}
+	s = si->digestAlgorithm.algorithm;
+	r = snprintf (buffer + p, length - p, "%sDigest Algorithm:\n%s%s\n%sAuthenticated Attributes:\n",
+				pad2, pad3, s ? s->string : "Missing", pad2);
+	p += (ut32) r;
+	if (r < 0 || length <= p) {
+		free (pad3);
+		return NULL;
+	}
+	for (i = 0; i < si->authenticatedAttributes.length; ++i) {
+		RPKCS7Attribute* attr = si->authenticatedAttributes.elements[i];
+		if (!attr) continue;
+		r = snprintf (buffer + p, length - p, "%s%s: %u bytes\n",
+					pad3, attr->oid ? attr->oid->string : "Missing", attr->data ? attr->data->length : 0);
+		p += (ut32) r;
+		if (r < 0 || length <= p) {
+			free (pad3);
+			return NULL;
+		}
+	}
+	s = si->digestEncryptionAlgorithm.algorithm;
+	if (length <= p) {
+		free (pad3);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sDigest Encryption Algorithm\n%s%s\n",
+				pad2, pad3, s ? s->string : "Missing");
+	p += (ut32) r;
+	if (r < 0 || length <= p) {
+		free (pad3);
+		return NULL;
+	}
+
+//	if ((o = si->encryptedDigest)) s = r_asn1_stringify_bytes (o->binary, o->length);
+//	else s = NULL;
+//	r = snprintf (buffer + p, length - p, "%sEncrypted Digest: %u bytes\n%s\n", pad2, o ? o->length : 0, s ? s->string : "Missing");
+//	p += (ut32) r;
+//	r_asn1_free_string (s);
+	r = snprintf (buffer + p, length - p, "%sEncrypted Digest: %u bytes\n", pad2, o ? o->length : 0);
+	if (r < 0 || length <= p) {
+		free (pad3);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sUnauthenticated Attributes:\n", pad2);
+	p += (ut32) r;
+	if (r < 0 || length <= p) {
+		free (pad3);
+		return NULL;
+	}
+	for (i = 0; i < si->unauthenticatedAttributes.length; ++i) {
+		RPKCS7Attribute* attr = si->unauthenticatedAttributes.elements[i];
+		if (!attr) {
+			continue;
+		}
+		o = attr->data;
+		r = snprintf (buffer + p, length - p, "%s%s: %u bytes\n",
+					pad3, attr->oid ? attr->oid->string : "Missing", o ? o->length : 0);
+		p += (ut32) r;
+		if (r < 0 || length <= p) {
+			free (pad3);
+			return NULL;
+		}
+	}
+	free (pad3);
+	return buffer + p;
+}
+
+char *r_pkcs7_cms_dump (RCMS* container) {
+	RPKCS7SignedData *sd;
+	ut32 i, length, p = 0;
+	int r;
+	char *buffer = NULL, *tmp = NULL;
+	if (!container) {
+		return NULL;
+	}
+	sd = &container->signedData;
+	length = 2048 + (container->signedData.certificates.length * 1024);
+	if(!length) {
+		return NULL;
+	}
+	buffer = (char*) calloc (1, length);
+	if (!buffer) {
+		return NULL;
+	}
+	r = snprintf (buffer, length, "signedData\n  Version: %u\n  Digest Algorithms:\n", sd->version);
+	p += (ut32) r;
+	if (r < 0 || length <= p) {
+		free (buffer);
+		return NULL;
+	}
+	if (container->signedData.digestAlgorithms.elements) {
+		for (i = 0; i < container->signedData.digestAlgorithms.length; ++i) {
+			if (container->signedData.digestAlgorithms.elements[i]) {
+				RASN1String *s = container->signedData.digestAlgorithms.elements[i]->algorithm;
+				r = snprintf (buffer + p, length - p, "    %s\n", s ? s->string : "Missing");
+				p += (ut32) r;
+				if (r < 0 || length <= p) {
+					free (buffer);
+					return NULL;
+				}
+			}
+		}
+	}
+	r = snprintf (buffer + p, length - p, "  Certificates: %u\n", container->signedData.certificates.length);
+	p += (ut32) r;
+	if (r < 0 || length <= p) {
+		free (buffer);
+		return NULL;
+	}
+	for (i = 0; i < container->signedData.certificates.length; ++i) {
+		if (length <= p || !(tmp = r_x509_certificate_dump (container->signedData.certificates.elements[i], buffer + p, length - p, "    "))) {
+			free (buffer);
+			return NULL;
+		}
+		p = tmp - buffer;
+	}
+
+	for (i = 0; i < container->signedData.crls.length; ++i) {
+		if (length <= p || !(tmp = r_x509_crl_dump (container->signedData.crls.elements[i], buffer + p, length - p, "    "))) {
+			free (buffer);
+			return NULL;
+		}
+		p = tmp - buffer;
+	}
+	p = tmp - buffer;
+	if (length <= p) {
+		free (buffer);
+		return NULL;
+	}	
+	r = snprintf (buffer + p, length - p, "  SignerInfos:\n");
+	p += (ut32) r;
+	if (r < 0 || length <= p) {
+		free (buffer);
+		return NULL;
+	}
+	if (container->signedData.signerinfos.elements) {
+		for (i = 0; i < container->signedData.signerinfos.length; ++i) {
+			if (length <= p || !(tmp = r_x509_signedinfo_dump (container->signedData.signerinfos.elements[i], buffer + p, length - p, "    "))) {
+				free (buffer);
+				return NULL;
+			}
+			p = tmp - buffer;
+		}
+	}
+	return buffer;
+}
+
+RJSVar *r_x509_signedinfo_json (RPKCS7SignerInfo* si) {
+	RJSVar* array = NULL;
+	RJSVar* var = NULL;
+	RJSVar* obj = r_json_object_new ();
+	ut32 i;
+	if (!si) {
+		return obj;
+	}
+
+	(void)r_json_object_add (obj, "Version", r_json_number_new (si->version + 1));
+	(void)r_json_object_add (obj, "Issuer", r_x509_name_json (&si->issuerAndSerialNumber.issuer));
+	if (si->issuerAndSerialNumber.serialNumber) {
+		RASN1Binary *o = si->issuerAndSerialNumber.serialNumber;
+		RASN1String *s = r_asn1_stringify_integer (o->binary, o->length);
+		if (s) {
+			(void)r_json_object_add (obj, "SerialNumber", r_json_string_new (s->string));
+		}
+		r_asn1_free_string (s);
+	}
+
+	if (si->digestAlgorithm.algorithm) {
+		(void) r_json_object_add (obj, "DigestAlgorithm", r_json_string_new (si->digestAlgorithm.algorithm->string));
+	}
+
+	array = r_json_array_new (si->authenticatedAttributes.length);
+	for (i = 0; i < si->authenticatedAttributes.length; ++i) {
+		RPKCS7Attribute* attr = si->authenticatedAttributes.elements[i];
+		if (!attr) {
+			continue;
+		}
+		RJSVar* attribute = r_json_object_new ();
+		if (attr->oid) {
+			var = r_json_string_new (attr->oid->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "oid", var), var);
+		}
+		if (attr->data) {
+			var = r_json_number_new (attr->data->length);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "length", var), var);
+		}
+		R_JSON_FREE_ON_FAIL (r_json_array_add (array, attribute), attribute);
+	}
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "AuthenticatedAttributes", array), array);
+	if (si->digestEncryptionAlgorithm.algorithm) {
+		var = r_json_string_new (si->digestEncryptionAlgorithm.algorithm->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "DigestEncryptionAlgorithm", var), var);
+	}
+
+	if (si->encryptedDigest) {
+		RASN1Binary *o = si->encryptedDigest;
+		RASN1String *s = r_asn1_stringify_integer (o->binary, o->length);
+		if (s) {
+			var = r_json_string_new (s->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "EncryptedDigest", var), var);
+		}
+		r_asn1_free_string (s);
+	}
+
+
+	array = r_json_array_new (si->unauthenticatedAttributes.length);
+	for (i = 0; i < si->unauthenticatedAttributes.length; ++i) {
+		RPKCS7Attribute* attr = si->unauthenticatedAttributes.elements[i];
+		if (!attr) {
+			continue;
+		}
+		RJSVar* attribute = r_json_object_new ();
+		if (attr->oid) {
+			var = r_json_string_new (attr->oid->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "oid", var), var);
+		}
+		if (attr->data) {
+			var = r_json_number_new (attr->data->length);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "length", var), var);
+		}
+		R_JSON_FREE_ON_FAIL (r_json_array_add (array, attribute), attribute);
+	}
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "UnauthenticatedAttributes", array), array);
+
+	return obj;
+}
+
+RJSVar *r_pkcs7_cms_json (RCMS* container) {
+	RJSVar* array = NULL;
+	RJSVar* var = NULL;
+	RJSVar* obj = r_json_object_new ();
+	ut32 i;
+	if (!container) {
+		return obj;
+	}
+
+	var = r_json_number_new (container->signedData.version);
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Version", var), var);
+	
+	if (container->signedData.digestAlgorithms.elements) {
+		array = r_json_array_new (container->signedData.digestAlgorithms.length);
+		for (i = 0; i < container->signedData.digestAlgorithms.length; ++i) {
+			if (container->signedData.digestAlgorithms.elements[i]) {
+				RASN1String *s = container->signedData.digestAlgorithms.elements[i]->algorithm;
+				if (s) {
+					var = r_json_string_new (s->string);
+					R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
+				}
+			}
+		}
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "DigestAlgorithms", array), array);
+	}
+
+	array = r_json_array_new (container->signedData.certificates.length);
+	for (i = 0; i < container->signedData.certificates.length; ++i) {
+		var = r_x509_certificate_json (container->signedData.certificates.elements[i]);
+		R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
+	}
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Certificates", array), array);
+
+	array = r_json_array_new (container->signedData.crls.length);
+	for (i = 0; i < container->signedData.crls.length; ++i) {
+		var = r_x509_crl_json (container->signedData.crls.elements[i]);
+		R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
+	}
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "CRL", array), array);
+
+	if (container->signedData.signerinfos.elements) {
+		array = r_json_array_new (container->signedData.signerinfos.length);
+		for (i = 0; i < container->signedData.signerinfos.length; ++i) {
+			var = r_x509_signedinfo_json (container->signedData.signerinfos.elements[i]);
+			R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
+		}
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SignerInfos", array), array);
+	}
+	return obj;
+}
+
diff -Nru radare2-2.3.0+dfsg/libr/util/pkcs7.h radare2-2.8.0+dfsg/libr/util/pkcs7.h
--- radare2-2.3.0+dfsg/libr/util/pkcs7.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/pkcs7.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef R_PKCS7_INTERNAL_H
+#define R_PKCS7_INTERNAL_H
+
+
+R_API bool r_pkcs7_parse_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls, RASN1Object *object);
+R_API void r_pkcs7_free_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls);
+
+R_API bool r_pkcs7_parse_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac, RASN1Object *object);
+R_API void r_pkcs7_free_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac);
+
+R_API bool r_pkcs7_parse_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai, RASN1Object *object);
+R_API void r_pkcs7_free_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai);
+
+R_API bool r_pkcs7_parse_contentinfo (RPKCS7ContentInfo* ci, RASN1Object *object);
+R_API void r_pkcs7_free_contentinfo (RPKCS7ContentInfo* ci);
+
+R_API bool r_pkcs7_parse_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu, RASN1Object *object);
+R_API void r_pkcs7_free_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu);
+
+R_API RPKCS7Attribute* r_pkcs7_parse_attribute (RASN1Object *object);
+R_API void r_pkcs7_free_attribute (RPKCS7Attribute* attribute);
+
+R_API bool r_pkcs7_parse_attributes (RPKCS7Attributes* attribute, RASN1Object *object);
+R_API void r_pkcs7_free_attributes (RPKCS7Attributes* attribute);
+
+R_API bool r_pkcs7_parse_signerinfo (RPKCS7SignerInfo* si, RASN1Object *object);
+R_API void r_pkcs7_free_signerinfo (RPKCS7SignerInfo* si);
+
+R_API bool r_pkcs7_parse_signerinfos (RPKCS7SignerInfos* ss, RASN1Object *object);
+R_API void r_pkcs7_free_signerinfos (RPKCS7SignerInfos* ss);
+
+R_API bool r_pkcs7_parse_signeddata (RPKCS7SignedData *sd, RASN1Object *object);
+R_API void r_pkcs7_free_signeddata (RPKCS7SignedData* sd);
+
+R_API char* r_x509_signedinfo_dump (RPKCS7SignerInfo *si, char* buffer, ut32 length, const char* pad);
+
+#endif /* R_PKCS7_INTERNAL_H */
+
diff -Nru radare2-2.3.0+dfsg/libr/util/pool.c radare2-2.8.0+dfsg/libr/util/pool.c
--- radare2-2.3.0+dfsg/libr/util/pool.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/pool.c	2018-08-07 14:12:36.000000000 +0000
@@ -104,12 +104,11 @@
 			return NULL;
 		}
 		pf->limit = limit + 1;
-		pf->pools = malloc (size);
+		pf->pools = calloc (1, size);
 		if (!pf->pools) {
 			r_poolfactory_free (pf);
 			return NULL;
 		}
-		memset (pf->pools, 0, size);
 		return pf;
 	}
 	return NULL;
diff -Nru radare2-2.3.0+dfsg/libr/util/print.c radare2-2.8.0+dfsg/libr/util/print.c
--- radare2-2.3.0+dfsg/libr/util/print.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/print.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2007-2017 - pancake */
+/* radare - LGPL - Copyright 2007-2018 - pancake */
 
 #include "r_anal.h"
 #include "r_cons.h"
@@ -7,6 +7,8 @@
 
 #define DFLT_ROWS 16
 
+#define IS_ALPHA(C) (((C) >= 'a' && (C) <= 'z') || ((C) >= 'A' && (C) <= 'Z'))
+
 static void nullprinter(const char *a, ...) { }
 static void libc_printf(const char *format, ...) {
 	va_list ap;
@@ -14,7 +16,8 @@
 	vprintf (format, ap);
 	va_end (ap);
 }
-static bool isInterrupted = false;
+
+static RPrintIsInterruptedCallback is_interrupted_cb = NULL;
 
 R_API void r_print_portionbar(RPrint *p, const ut64 *portions, int n_portions) {
 	const int use_color = p->flags & R_PRINT_FLAGS_COLOR;
@@ -108,12 +111,15 @@
 	return imin;
 }
 
-R_API int r_print_is_interrupted() {
-	return isInterrupted;
+R_API bool r_print_is_interrupted() {
+	if (is_interrupted_cb) {
+		return is_interrupted_cb ();
+	}
+	return false;
 }
 
-R_API void r_print_set_interrupted(int i) {
-	isInterrupted = i;
+R_API void r_print_set_is_interrupted_cb(RPrintIsInterruptedCallback cb) {
+	is_interrupted_cb = cb;
 }
 
 R_API bool r_print_mute(RPrint *p, int x) {
@@ -272,6 +278,7 @@
 	strcpy (p->datefmt, "%Y-%m-%d %H:%M:%S %z");
 	r_io_bind_init (p->iob);
 	p->pairs = true;
+	p->resetbg = true;
 	p->cb_printf = libc_printf;
 	p->oprintf = nullprinter;
 	p->bits = 32;
@@ -292,16 +299,19 @@
 		R_PRINT_FLAGS_OFFSET |
 		R_PRINT_FLAGS_HEADER |
 		R_PRINT_FLAGS_ADDRMOD;
+	p->seggrn = 4;
 	p->zoom = R_NEW0 (RPrintZoom);
 	p->reg = NULL;
 	p->get_register = NULL;
 	p->get_register_value = NULL;
 	p->lines_cache = NULL;
+	p->calc_row_offsets = true;
 	p->row_offsets_sz = 0;
 	p->row_offsets = NULL;
 	p->vflush = true;
 	p->screen_bounds = 0;
 	p->esc_bslash = false;
+	p->strconv_mode = NULL;
 	memset (&p->consbind, 0, sizeof (p->consbind));
 	return p;
 }
@@ -312,6 +322,7 @@
 	}
 	sdb_free (p->formats);
 	p->formats = NULL;
+	R_FREE (p->strconv_mode);
 	if (p->zoom) {
 		free (p->zoom->buf);
 		free (p->zoom);
@@ -378,7 +389,7 @@
 	if (use_segoff) {
 		ut32 s, a;
 		a = addr & 0xffff;
-		s = (addr - a) >> 4;
+		s = (addr - a) >> p->seggrn;
 		if (dec) {
 			snprintf (space, sizeof (space), "%d:%d", s & 0xffff, a & 0xffff);
 			white = r_str_pad (' ', 9 - strlen (space));
@@ -411,7 +422,7 @@
 				// pre = r_cons_rgb_str_off (rgbstr, addr);
 				if (p && p->cons && p->cons->rgbstr) {
 					char rgbstr[32];
-					pre = p->cons->rgbstr (rgbstr, addr);
+					pre = p->cons->rgbstr (rgbstr, sizeof (rgbstr), addr);
 				}
 			}
 			if (dec) {
@@ -471,7 +482,9 @@
 			if (i == ocur - n) {
 				memcat (d, Color_RESET);
 			}
-			memcat (d, lastcol);
+			if (colors) {
+				memcat (d, lastcol);
+			}
 			if (i >= cur - n && i < ocur - n) {
 				memcat (d, Color_INVERT);
 			}
@@ -507,7 +520,11 @@
 		}
 	}
 	if (colors || p->cur_enabled) {
-		memcat (d, Color_RESET);
+		if (p->resetbg) {
+			memcat (d, Color_RESET);
+		} else {
+			memcat (d, Color_RESET_NOBG);
+		}
 	}
 	*d = '\0';
 	return dst;
@@ -562,14 +579,10 @@
 	bool zeroend = (options & R_PRINT_STRING_ZEROEND);
 	bool wrap = (options & R_PRINT_STRING_WRAP);
 	bool urlencode = (options & R_PRINT_STRING_URLENCODE);
+	bool esc_nl = (options & R_PRINT_STRING_ESC_NL);
 	p->interrupt = 0;
 	int col = 0;
 	i = 0;
-	if (!urlencode && !wrap) {
-		while (buf[i] == '\0' && i < 3 && i < len) {
-			i++;
-		}
-	}
 	for (; !p->interrupt && i < len; i++) {
 		if (wide32) {
 			int j = i;
@@ -591,7 +604,7 @@
 			// TODO: some ascii can be bypassed here
 			p->cb_printf ("%%%02x", b);
 		} else {
-			if (b == '\n' || IS_PRINTABLE (b)) {
+			if ((b == '\n' && !esc_nl) || IS_PRINTABLE (b)) {
 				p->cb_printf ("%c", b);
 			} else {
 				p->cb_printf ("\\x%02x", b);
@@ -805,7 +818,7 @@
 				if (use_segoff) {
 					ut32 s, a;
 					a = addr & 0xffff;
-					s = ((addr - a) >> 4) & 0xffff;
+					s = ((addr - a) >> p->seggrn) & 0xffff;
 					snprintf (soff, sizeof (soff), "%04x:%04x ", s, a);
 					printfmt ("- offset -");
 				} else {
@@ -867,9 +880,10 @@
 	if (p) {
 		p->interrupt = 0;
 	}
+	// is this necessary?
+	r_print_set_screenbounds (p, addr);
 	for (i = j = 0; i < len; i += (stride? stride: inc), j += (stride? stride: 0)) {
-		r_print_set_screenbounds (p, addr + i);
-		if (p && p->cons && p->cons->breaked) {
+		if (p && p->cons && p->cons->context && p->cons->context->breaked) {
 			break;
 		}
 		if (use_sparse) {
@@ -935,7 +949,11 @@
 					r_print_cursor (p, j, 1);
 					// stub for colors
 					if (p && p->colorfor) {
-						a = p->colorfor (p->user, n, true);
+						if (!p->iob.addr_is_mapped (p->iob.io, addr + j)) {
+							a = p->cons->pal.ai_unmap;
+						} else {
+							a = p->colorfor (p->user, n, true);
+						}
 						if (a && *a) {
 							b = Color_RESET;
 						} else {
@@ -1613,9 +1631,26 @@
 	}
 }
 
-R_API char* r_print_colorize_opcode(RPrint *print, char *p, const char *reg, const char *num, bool partial_reset) {
+static bool check_arg_name (RPrint *print, char *p, ut64 func_addr) {
+	if (func_addr && print->exists_var) {
+		int z;
+		for (z = 0; p[z] && (IS_ALPHA (p[z]) || IS_DIGIT (p[z]) || p[z] == '_'); z++);
+		char tmp = p[z];
+		p[z] = '\0';
+		bool ret = print->exists_var (print, func_addr, p);
+		p[z] = tmp;
+		return ret;
+	}
+	return false;
+}
+
+static bool ishexprefix(char *p) {
+	return (p[0] == '0' && p[1] == 'x');
+}
+
+R_API char* r_print_colorize_opcode(RPrint *print, char *p, const char *reg, const char *num, bool partial_reset, ut64 func_addr) {
 	int i, j, k, is_mod, is_float = 0, is_arg = 0;
-	char *reset = partial_reset ? Color_NOBGRESET:Color_RESET;
+	char *reset = partial_reset ? Color_RESET_NOBG : Color_RESET;
 	ut32 c_reset = strlen (reset);
 	int is_jmp = p && (*p == 'j' || ((*p == 'c') && (p[1] == 'a')))? 1: 0;
 	ut32 opcode_sz = p && *p? strlen (p) * 10 + 1: 0;
@@ -1635,7 +1670,7 @@
 	memset (o, 0, COLORIZE_BUFSIZE);
 	for (i = j = 0; p[i]; i++, j++) {
 		/* colorize numbers */
-		if ((p[i] == '0' && p[i+1] == 'x') || (isdigit (p[i]) && issymbol (previous))) {
+		if ((ishexprefix (&p[i]) && previous != ':') || (isdigit (p[i]) && issymbol (previous))) {
 			int nlen = strlen (num);
 			if (nlen + j >= sizeof (o)) {
 				eprintf ("Colorize buffer is too small\n");
@@ -1689,17 +1724,20 @@
 					eprintf ("r_print_colorize_opcode(): buffer overflow!\n");
 					return strdup (p);
 				}
+
+				bool found_var = check_arg_name (print, p + i + 1, func_addr);
 				strcpy (o + j, reset);
 				j += strlen (reset);
 				o[j] = p[i];
 				if (!(p[i+1] == '$' || ((p[i+1] > '0') && (p[i+1] < '9')))) {
-					ut32 reg_len = strlen (reg);
-					if (reg_len + j + 10 >= COLORIZE_BUFSIZE) {
+					const char *color = found_var ? print->cons->pal.func_var_type : reg;
+					ut32 color_len = strlen (color);
+					if (color_len + j + 10 >= COLORIZE_BUFSIZE) {
 						eprintf ("r_print_colorize_opcode(): buffer overflow!\n");
 						return strdup (p);
 					}
-					strcpy (o + j + 1, reg);
-					j += strlen (reg);
+					strcpy (o + j + 1, color);
+					j += strlen (color);
 				}
 				continue;
 			}
@@ -1783,12 +1821,17 @@
 
 // reset the status of row_offsets
 R_API void r_print_init_rowoffsets(RPrint *p) {
-	R_FREE (p->row_offsets);
-	p->row_offsets_sz = 0;
+	if (p->calc_row_offsets) {
+		R_FREE(p->row_offsets);
+		p->row_offsets_sz = 0;
+	}
 }
 
 // set the offset, from the start of the printing, of the i-th row
-R_API void r_print_set_rowoff(RPrint *p, int i, ut32 offset) {
+R_API void r_print_set_rowoff(RPrint *p, int i, ut32 offset, bool overwrite) {
+	if (!overwrite) {
+		return;
+	}
 	if (i < 0) {
 		return;
 	}
@@ -1849,23 +1892,27 @@
 	int i, words = (len / bytesize);
 	p->cb_printf ("[");
 	for (i = 0; i < words; i++) {
-		ut16 w16 = r_read_ble16 (&buf16[i], p->big_endian);
-		ut32 w32 = r_read_ble32 (&buf32[i], p->big_endian);
-		ut64 w64 = r_read_ble64 (&buf64[i], p->big_endian);
 		switch (wordsize) {
-		case 8:
-			p->cb_printf ("%s%d", i?",":"", buf[i]);
+		case 8: {
+			p->cb_printf ("%s%d", i ? "," : "", buf[i]);
 			break;
-		case 16:
-			p->cb_printf ("%s%hd", i?",":"", w16);
+		}
+		case 16: {
+			ut16 w16 = r_read_ble16 (&buf16[i], p->big_endian);
+			p->cb_printf ("%s%hd", i ? "," : "", w16);
 			break;
-		case 32:
-			p->cb_printf ("%s%d", i?",":"", w32);
+		}
+		case 32: {
+			ut32 w32 = r_read_ble32 (&buf32[i], p->big_endian);
+			p->cb_printf ("%s%d", i ? "," : "", w32);
 			break;
-		case 64:
-			p->cb_printf ("%s%"PFMT64d, i?",":"", w64);
+		}
+		case 64: {
+			ut64 w64 = r_read_ble64 (&buf64[i], p->big_endian);
+			p->cb_printf ("%s%"PFMT64d, i ? "," : "", w64);
 			break;
 		}
+		}
 	}
 	p->cb_printf ("]\n");
 	return words;
diff -Nru radare2-2.3.0+dfsg/libr/util/p_seven.c radare2-2.8.0+dfsg/libr/util/p_seven.c
--- radare2-2.3.0+dfsg/libr/util/p_seven.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/p_seven.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/* radare - LGPL - Copyright 2012-2013 - pancake */
-#include <r_print.h>
-
-// TODO: work in progress
-
-#if 0
-for(i=0; i<len; i++) {
-	packing_7bit_character(config.block+i, buffer);
-	cons_printf("%c", buffer[0]);
-}
-#endif
-
-R_API int r_print_pack7bit (const char *src, char *dest) {
-        int len, i, j = 0, shift = 0;
-        ut8 ch1, ch2;
-        char tmp[2];
-
-        *dest = '\0';
-	len = strlen (src);
-
-        for (i=0; i<len; i++ ) {
-                ch1 = src[i] & 0x7F;
-                ch1 = ch1 >> shift;
-                ch2 = src[(i+1)] & 0x7F;
-                ch2 = ch2 << (7-shift);
-
-                ch1 = ch1 | ch2;
-
-                j = strlen(dest);
-                sprintf (tmp, "%x", (ch1 >> 4));
-                dest[j++] = tmp[0];
-                sprintf (tmp, "%x", (ch1 & 0x0F));
-                dest[j++] = tmp[0];
-                dest[j++] = '\0';
-                if (7 == ++shift) {
-                        shift = 0;
-                        i++;
-                }
-        }
-        return 0;
-}
-
-R_API int r_print_unpack7bit (const char *src, char *dest) {
-        int i, j, shift = 0, len = strlen (src);
-        ut8 ch1, ch2 = '\0';
-        char buf[8];
-
-        *dest = '\0';
-
-        for (i=0; i<len; i+=2) {
-                sprintf (buf, "%c%c", src[i], src[i+1]);
-                ch1 = strtol (buf, NULL, 16);
-
-                j = strlen(dest);
-                dest[j++] = ((ch1 & (0x7F >> shift)) << shift) | ch2;
-                dest[j++] = '\0';
-                ch2 = ch1 >> (7-shift);
-
-                shift++;
-        }
-        return 0;
-}
diff -Nru radare2-2.3.0+dfsg/libr/util/r_asn1.c radare2-2.8.0+dfsg/libr/util/r_asn1.c
--- radare2-2.3.0+dfsg/libr/util/r_asn1.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_asn1.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,590 +0,0 @@
-/* radare2 - LGPL - Copyright 2017 - wargio */
-
-#include <r_util.h>
-#include "r_oids.h"
-#include <r_types.h>
-#include <r_util.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "r_asn1_internal.h"
-
-const char* _hex = "0123456789abcdef";
-
-RASN1String *r_asn1_create_string (const char *string, bool allocated, ut32 length) {
-	if (!string || !length) {
-		return NULL;
-	}
-	RASN1String *s = R_NEW0 (RASN1String);
-	if (s) {
-		s->allocated = allocated;
-		s->length = length;
-		s->string = string;
-	}
-	return s;
-}
-
-RASN1String *r_asn1_create_string2 (const char *string, bool allocated) {
-	return r_asn1_create_string (string, allocated, strlen (string) + 1);
-}
-
-RASN1String *r_asn1_concatenate_strings (RASN1String *s0, RASN1String *s1, bool freestr) {
-	char* str;
-	ut32 len;
-	if (!s0 || !s1 || s0->length == 0 || s1->length == 0) {
-		return NULL;
-	}
-	len = s0->length + s1->length - 1;
-	str = (char*) malloc (len);
-	if (!str) {
-		if (freestr) {
-			r_asn1_free_string (s0);
-			r_asn1_free_string (s1);
-		}
-		return NULL;
-	}
-	memcpy (str, s0->string, s0->length);
-	memcpy (str + s0->length - 1, s1->string, s1->length);
-	if (freestr) {
-		r_asn1_free_string (s0);
-		r_asn1_free_string (s1);
-	}
-	return r_asn1_create_string (str, true, len);
-}
-
-RASN1String *r_asn1_stringify_string (const ut8 *buffer, ut32 length) {
-	char *str;
-	if (!buffer || !length) {
-		return NULL;
-	}
-	str = (char*) malloc (length + 1);
-	if (!str) {
-		return NULL;
-	}
-	memcpy (str, buffer, length);
-	r_str_filter (str, length);
-	str[length] = '\0';
-	return r_asn1_create_string (str, true, length);
-}
-
-RASN1String *r_asn1_stringify_utctime (const ut8 *buffer, ut32 length) {
-	if (!buffer || length != 13 || buffer[12] != 'Z') {
-		return NULL;
-	}
-	const int str_sz = 24;
-	char *str = malloc (str_sz);
-	if (!str) {
-		return NULL;
-	}
-	str[0] = buffer[4];
-	str[1] = buffer[5];
-	str[2] = '/';
-	str[3] = buffer[2];
-	str[4] = buffer[3];
-	str[5] = '/';
-	str[6] = buffer[0] < '5' ? '2' : '1';
-	str[7] = buffer[0] < '5' ? '0' : '9';
-	str[8] = buffer[0];
-	str[9] = buffer[1];
-	str[10] = ' ';
-	str[11] = buffer[6];
-	str[12] = buffer[7];
-	str[13] = ':';
-	str[14] = buffer[8];
-	str[15] = buffer[9];
-	str[16] = ':';
-	str[17] = buffer[10];
-	str[18] = buffer[11];
-	str[19] = ' ';
-	str[20] = 'G';
-	str[21] = 'M';
-	str[22] = 'T';
-	str[23] = '\0';
-
-	return r_asn1_create_string (str, true, str_sz);
-}
-
-RASN1String *r_asn1_stringify_time (const ut8 *buffer, ut32 length) {
-	if (!buffer || length != 15 || buffer[14] != 'Z') {
-		return NULL;
-	}
-	const int str_sz = 24;
-	char *str = malloc (str_sz);
-	if (!str) {
-		return NULL;
-	}
-
-	str[0] = buffer[6];
-	str[1] = buffer[7];
-	str[2] = '/';
-	str[3] = buffer[4];
-	str[4] = buffer[5];
-	str[5] = '/';
-	str[6] = buffer[0];
-	str[7] = buffer[1];
-	str[8] = buffer[2];
-	str[9] = buffer[3];
-	str[10] = ' ';
-	str[11] = buffer[8];
-	str[12] = buffer[9];
-	str[13] = ':';
-	str[14] = buffer[10];
-	str[15] = buffer[11];
-	str[16] = ':';
-	str[17] = buffer[12];
-	str[18] = buffer[13];
-	str[19] = ' ';
-	str[20] = 'G';
-	str[21] = 'M';
-	str[22] = 'T';
-	str[23] = '\0';
-
-	return r_asn1_create_string (str, true, str_sz);
-}
-
-RASN1String *r_asn1_stringify_bits (const ut8 *buffer, ut32 length) {
-	ut32 i, j, k;
-	ut64 size;
-	ut8 c;
-	char *str;
-	if (!buffer || !length) {
-		return NULL;
-	}
-	size = 1 + ((length - 1)* 8) - buffer[0];
-	str = (char*) malloc (size);
-	if (!str) {
-		return NULL;
-	}
-	for (i = 1, j = 0; i < length && j < size; ++i) {
-		c = buffer[i];
-		for (k = 0; k < 8 && j < size; ++k, j++) {
-			str[size - j - 1] = c & 0x80 ? '1' : '0';
-			c <<= 1;
-		}
-	}
-	str[size - 1] = '\0';
-	return r_asn1_create_string (str, true, size);
-}
-
-RASN1String *r_asn1_stringify_boolean (const ut8 *buffer, ut32 length) {
-	if (!buffer || length != 1 || (buffer[0] != 0 && buffer[0] != 0xFF)) {
-		return NULL;
-	}
-	return r_asn1_create_string2 (buffer[0] != 0 ? "true" : "false", false);
-}
-
-RASN1String *r_asn1_stringify_integer (const ut8 *buffer, ut32 length) {
-	ut32 i, j;
-	ut64 size;
-	ut8 c;
-	char *str;
-	if (!buffer || !length) {
-		return NULL;
-	}
-	size = 3 * length;
-	str = (char*) malloc (size);
-	if (!str) {
-		return NULL;
-	}
-	memset (str, 0, size);
-	for (i = 0, j = 0; i < length && j < size; ++i, j += 3) {
-		c = buffer[i];
-		str[j + 0] = _hex[c >> 4];
-		str[j + 1] = _hex[c & 15];
-		str[j + 2] = ':';
-	}
-	str[size - 1] = '\0';
-	return r_asn1_create_string (str, true, size);
-}
-
-RASN1String* r_asn1_stringify_bytes (const ut8 *buffer, ut32 length) {
-	ut32 i, j, k;
-	ut64 size;
-	ut8 c;
-	char *str;
-	if (!buffer || !length) {
-		return NULL;
-	}
-	size = (4 * length);
-	size += (64 - (size % 64));
-	str = (char*) malloc (size);
-	if (!str) {
-		return NULL;
-	}
-	memset (str, 0x20, size);
-
-	for (i = 0, j = 0, k = 48; i < length && j < size && k < size; ++i, j += 3, k++) {
-		c = buffer[i];
-		str[j + 0] = _hex[c >> 4];
-		str[j + 1] = _hex[c & 15];
-		str[j + 2] = ' ';
-		str[k] = (c >= ' ' && c <= '~') ? c : '.';
-		if (i % 16 == 15) {
-			str[j + 19] = '\n';
-			j += 17;
-			k += 49;
-		}
-	}
-	str[size - 1] = '\0';
-
-	return r_asn1_create_string (str, true, size);
-}
-
-RASN1String *r_asn1_stringify_oid (const ut8* buffer, ut32 length) {
-	const ut8 *start, *end;
-	char *str, *t;
-	ut32 i, slen, bits;
-	ut64 oid;
-	if (!buffer || !length) {
-		return NULL;
-	}
-
-	str = (char*) calloc (1, ASN1_OID_LEN);
-	if (!str) {
-		return NULL;
-	}
-
-	end = buffer + length;
-	t = str;
-	slen = 0;
-	bits = 0;
-	oid = 0;
-
-	for (start = buffer; start < end && slen < ASN1_OID_LEN; start++) {
-		ut8 c = *start;
-		oid <<= 7;
-		oid |= (c & 0x7F);
-		bits += 7;
-		if (!(c & 0x80)) {
-			if (!slen) {
-				ut32 m = oid / 40;
-				ut32 n = oid % 40;
-				snprintf (t, ASN1_OID_LEN, "%01u.%01u", m, n);
-				slen = strlen (str);
-				t = str + slen;
-			} else {
-				snprintf (t, ASN1_OID_LEN - slen, ".%01u", (ut32) oid);
-				slen = strlen (str);
-				t = str + slen;
-			}
-			oid = 0;
-			bits = 0;
-		}
-	}
-	// incomplete oid.
-	// bad structure.
-	if (bits > 0) {
-		free (str);
-		return NULL;
-	}
-	i = 0;
-	do {
-		if (X509OIDList[i].oid[0] == str[0]) {
-			if (!strncmp (str, X509OIDList[i].oid, ASN1_OID_LEN)) {
-				free (str);
-				return r_asn1_create_string2 (X509OIDList[i].name, false);
-			}
-		}
-		++i;
-	} while (X509OIDList[i].oid && X509OIDList[i].name);
-	return r_asn1_create_string (str, true, ASN1_OID_LEN);
-}
-
-static RASN1Object *asn1_parse_header (const ut8 *buffer, ut32 length) {
-	RASN1Object *object;
-	ut8 head, length8, byte;
-	ut64 length64;
-	if (!buffer || length < 2) {
-		return NULL;
-	}
-
-	object = R_NEW0 (RASN1Object);
-	if (!object) {
-		return NULL;
-	}
-	head = buffer[0];
-	object->klass = head & ASN1_CLASS;
-	object->form = head & ASN1_FORM;
-	object->tag = head & ASN1_TAG;
-	length8 = buffer[1];
-	if (length8 & ASN1_LENLONG) {
-		length64 = 0;
-		length8 &= ASN1_LENSHORT;
-		if (length8 && length8 < length - 2) {
-			ut8 i8;
-			// can overflow.
-			for (i8 = 0; i8 < length8; ++i8) {
-				byte = buffer[2 + i8];
-				length64 <<= 8;
-				length64 |= byte;
-				if (length64 > length) {
-					goto out_error;
-				}
-			}
-			object->sector = buffer + 2 + length8;
-		} else {
-			//indefinite
-			const ut8 *from = buffer + 2;
-			const ut8 *end = from + (length - 2);
-			do {
-				byte = *from;
-				length64 <<= 8;
-				length64 |= byte;
-				from++;
-			} while (from < end && length64 <= length && byte & 0x80);
-			if (length64 > length) {
-				goto out_error;
-			}
-			object->sector = from;
-		}
-		object->length = (ut32) length64;
-	} else {
-		object->length = (ut32) length8;
-		object->sector = buffer + 2;
-	}
-	if (object->tag == TAG_BITSTRING && object->sector[0] == 0) {
-		if (object->length > 0){
-			object->sector++; //real sector starts +1
-			object->length--;
-		}
-	}
-	if (object->length > length) {
-		// Malformed object - overflow from data ptr
-		goto out_error;
-	}
-	return object;
-out_error:
-	free (object);
-	return NULL;
-}
-
-ut32 r_asn1_count_objects (const ut8 *buffer, ut32 length) {
-	ut32 counter;
-	RASN1Object *object;
-	const ut8 *next, *end;
-	if (!buffer || !length) {
-		return 0;
-	}
-	counter = 0;
-	object = NULL;
-	next = buffer;
-	end = buffer + length;
-	while (next >= buffer && next < end) {
-		object = asn1_parse_header (next, end - next);
-		if (!object || next == object->sector) {
-			R_FREE (object);
-			break;
-		}
-		next = object->sector + object->length;
-		counter++;
-		R_FREE (object);
-	}
-	R_FREE (object);
-	return counter;
-}
-
-RASN1Object *r_asn1_create_object (const ut8 *buffer, ut32 length) {
-	RASN1Object *object = asn1_parse_header (buffer, length);
-	if (object && (object->form == FORM_CONSTRUCTED || object->tag == TAG_BITSTRING || object->tag == TAG_OCTETSTRING)) {
-		ut32 i, count;
-		RASN1Object *inner = NULL;
-		const ut8 *next = object->sector;
-		const ut8 *end = next + object->length;
-		if (end > buffer + length) {
-			free (object);
-			return NULL;
-		}
-		count = r_asn1_count_objects (object->sector, object->length);
-		if (count > 0) {
-			object->list.length = count;
-			object->list.objects = R_NEWS0 (RASN1Object*, count);
-			if (!object->list.objects) {
-				r_asn1_free_object (object);
-				return NULL;
-			}
-			for (i = 0; next >= buffer && next < end && i < count; ++i) {
-				inner = r_asn1_create_object (next, end - next);
-				if (!inner || next == inner->sector) {
-					r_asn1_free_object (inner);
-					break;
-				}
-				next = inner->sector + inner->length;
-				R_PTR_MOVE (object->list.objects[i], inner);
-			}
-		}
-	}
-	return object;
-}
-
-RASN1Binary *r_asn1_create_binary (const ut8 *buffer, ut32 length) {
-	RASN1Binary* bin = NULL;
-	ut8* buf = NULL;
-	if (!buffer || !length) {
-		return NULL;
-	}
-	buf = (ut8*) calloc (sizeof (*buf), length);
-	if (!buf) {
-		return NULL;
-	}
-	bin = R_NEW0 (RASN1Binary);
-	if (!bin) {
-		free (buf);
-		return NULL;
-	}
-	memcpy (buf, buffer, length);
-	bin->binary = buf;
-	bin->length = length;
-	return bin;
-}
-
-void r_asn1_free_object (RASN1Object *object) {
-	ut32 i;
-	if (!object) {
-		return;
-	}
-	//this shall not be freed. it's a pointer into the buffer.
-	object->sector = 0;
-	if (object->list.objects) {
-		for (i = 0; i < object->list.length; ++i) {
-			r_asn1_free_object (object->list.objects[i]);
-		}
-		R_FREE (object->list.objects);
-	}
-	object->list.objects = NULL;
-	object->list.length = 0;
-	R_FREE (object);
-}
-
-void r_asn1_free_string (RASN1String* str) {
-	if (str) {
-		if (str->allocated) {
-			free ((char*) str->string);
-		}
-		free (str);
-	}
-}
-
-void r_asn1_free_binary (RASN1Binary* bin) {
-	if (bin) {
-		free ((char*) bin->binary);
-		free (bin);
-	}
-}
-
-RASN1String *asn1_stringify_tag (RASN1Object *object) {
-	if (!object) {
-		return NULL;
-	}
-	switch (object->tag) {
-	case TAG_EOC:
-		return r_asn1_create_string2 ("EOC", false);
-	case TAG_BOOLEAN:
-		return r_asn1_create_string2 ("BOOLEAN", false);
-	case TAG_INTEGER:
-		return r_asn1_create_string2 ("INTEGER", false);
-	case TAG_BITSTRING:
-		return r_asn1_create_string2 ("BIT STRING", false);
-	case TAG_OCTETSTRING:
-		return r_asn1_create_string2 ("OCTET STRING", false);
-	case TAG_NULL:
-		return r_asn1_create_string2 ("NULL", false);
-	case TAG_OID:
-		return r_asn1_create_string2 ("OBJECT IDENTIFIER", false);
-	case TAG_OBJDESCRIPTOR:
-		return r_asn1_create_string2 ("ObjectDescriptor", false);
-	case TAG_EXTERNAL:
-		return r_asn1_create_string2 ("EXTERNAL", false);
-	case TAG_REAL:
-		return r_asn1_create_string2 ("REAL", false);
-	case TAG_ENUMERATED:
-		return r_asn1_create_string2 ("ENUMERATED", false);
-	case TAG_EMBEDDED_PDV:
-		return r_asn1_create_string2 ("EMBEDDED PDV", false);
-	case TAG_UTF8STRING:
-		return r_asn1_create_string2 ("UTF8String", false);
-	case TAG_SEQUENCE:
-		return r_asn1_create_string2 ("SEQUENCE", false);
-	case TAG_SET:
-		return r_asn1_create_string2 ("SET", false);
-	case TAG_NUMERICSTRING:
-		return r_asn1_create_string2 ("NumericString", false);
-	case TAG_PRINTABLESTRING:
-		return r_asn1_create_string2 ("PrintableString", false);
-	case TAG_T61STRING:
-		return r_asn1_create_string2 ("TeletexString", false);
-	case TAG_VIDEOTEXSTRING:
-		return r_asn1_create_string2 ("VideotexString", false);
-	case TAG_IA5STRING:
-		return r_asn1_create_string2 ("IA5String", false);
-	case TAG_UTCTIME:
-		return r_asn1_create_string2 ("UTCTime", false);
-	case TAG_GENERALIZEDTIME:
-		return r_asn1_create_string2 ("GeneralizedTime", false);
-	case TAG_GRAPHICSTRING:
-		return r_asn1_create_string2 ("GraphicString", false);
-	case TAG_VISIBLESTRING:
-		return r_asn1_create_string2 ("VisibleString", false);
-	case TAG_GENERALSTRING:
-		return r_asn1_create_string2 ("GeneralString", false);
-	case TAG_UNIVERSALSTRING:
-		return r_asn1_create_string2 ("UniversalString", false);
-	case TAG_BMPSTRING:
-		return r_asn1_create_string2 ("BMPString", false);
-	}
-	return r_asn1_create_string2 ("Unknown tag", false);
-}
-
-RASN1String *asn1_stringify_sector (RASN1Object *object) {
-	if (!object) {
-		return NULL;
-	}
-	switch (object->tag) {
-	case TAG_EOC:
-		return NULL;
-	case TAG_BOOLEAN:
-		return r_asn1_create_string2 (object->sector[0] == 0 ? "false" : "true", false);
-	case TAG_REAL:
-	case TAG_INTEGER:
-		if (object->length < 16) {
-			return r_asn1_stringify_integer (object->sector, object->length);
-		} else {
-			return r_asn1_stringify_bytes (object->sector, object->length);
-		}
-	case TAG_BITSTRING:
-		//if (object->length < 8) {
-		return r_asn1_stringify_bits (object->sector, object->length);
-		//} else {
-		//	return asn1_stringify_bytes (object->sector, object->length);
-		//}
-	case TAG_OCTETSTRING:
-		return r_asn1_stringify_bytes (object->sector, object->length);
-	case TAG_NULL:
-		return NULL;
-	case TAG_OID:
-		return r_asn1_stringify_oid (object->sector, object->length);
-		//    case TAG_OBJDESCRIPTOR:
-		//    case TAG_EXTERNAL:
-		//    case TAG_ENUMERATED:
-		//    case TAG_EMBEDDED_PDV:
-	case TAG_UTF8STRING:
-		//    case TAG_SEQUENCE:
-		//    case TAG_SET:
-	case TAG_NUMERICSTRING:
-	case TAG_PRINTABLESTRING:
-		//    case TAG_T61STRING:
-		//    case TAG_VIDEOTEXSTRING:
-	case TAG_IA5STRING:
-	case TAG_VISIBLESTRING:
-		return r_asn1_stringify_string (object->sector, object->length);
-	case TAG_UTCTIME:
-		return r_asn1_stringify_utctime (object->sector, object->length);
-	case TAG_GENERALIZEDTIME:
-		return r_asn1_stringify_time (object->sector, object->length);
-		//    case TAG_GRAPHICSTRING:
-		//    case TAG_GENERALSTRING:
-		//    case TAG_UNIVERSALSTRING:
-		//    case TAG_BMPSTRING:
-	}
-	return NULL;
-}
diff -Nru radare2-2.3.0+dfsg/libr/util/r_asn1_internal.h radare2-2.8.0+dfsg/libr/util/r_asn1_internal.h
--- radare2-2.3.0+dfsg/libr/util/r_asn1_internal.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_asn1_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#ifndef R_ASN1_INTERNAL_H
-#define R_ASN1_INTERNAL_H
-
-R_API ut32 r_asn1_count_objects (const ut8 *buffer, ut32 length);
-R_API RASN1String *r_asn1_create_string (const char *string, bool allocated, ut32 length);
-R_API RASN1String *r_asn1_create_string2 (const char *string, bool allocated);
-R_API RASN1String *r_asn1_concatenate_strings (RASN1String* s0, RASN1String* s1, bool freestr);
-
-#endif /* R_ASN1_INTERNAL_H */
-
diff -Nru radare2-2.3.0+dfsg/libr/util/rbtree.c radare2-2.8.0+dfsg/libr/util/rbtree.c
--- radare2-2.3.0+dfsg/libr/util/rbtree.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/rbtree.c	2018-08-07 14:12:36.000000000 +0000
@@ -244,6 +244,39 @@
 	}
 }
 
+// returns true if the sum has been updated, false if node has not been found
+R_API bool r_rbtree_aug_update_sum(RBNode *root, void *data, RBNode *node, RBComparator cmp, RBNodeSum sum) {
+	int dep = 0;
+	RBNode *path[R_RBTREE_MAX_HEIGHT];
+	RBNode *cur = root;
+	for (;;) {
+		if (dep >= R_RBTREE_MAX_HEIGHT) {
+			eprintf ("Too deep tree\n");
+			return false;
+		}
+		if (!cur) {
+			return false;
+		}
+		path[dep] = cur;
+		dep++;
+		if (cur == node) {
+			break;
+		}
+
+		int d = cmp (data, cur);
+		if (d < 0) {
+			cur = cur->child[0];
+		} else {
+			cur = cur->child[1];
+		}
+	}
+
+	for(; dep > 0; dep--) {
+		sum (path[dep-1]);
+	}
+	return true;
+}
+
 R_API bool r_rbtree_delete(RBNode **root, void *data, RBComparator cmp, RBNodeFree freefn) {
 	return r_rbtree_aug_delete (root, data, cmp, freefn, NULL);
 }
diff -Nru radare2-2.3.0+dfsg/libr/util/r_json.c radare2-2.8.0+dfsg/libr/util/r_json.c
--- radare2-2.3.0+dfsg/libr/util/r_json.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_json.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,5 @@
-/* radare2 - LGPL - Copyright 2017 - wargio */
+/* radare2 - LGPL - Copyright 2017-2018 - wargio */
 
-#include <r_util.h>
 #include <r_types.h>
 #include <r_util.h>
 #include <stdlib.h>
@@ -18,12 +17,13 @@
 
 R_API void r_json_var_free (RJSVar* var) {
 	ut32 i;
-	if (!var || var->ref > 1) {
-		if (var)
-			var->ref--;
+	if (!var) {
 		return;
 	}
 	var->ref--;
+	if (var->ref > 0) {
+		return;
+	}
 	switch (var->type) {
 	case R_JS_STRING:
 		free ((char*) var->string.s);
diff -Nru radare2-2.3.0+dfsg/libr/util/r_oids.h radare2-2.8.0+dfsg/libr/util/r_oids.h
--- radare2-2.3.0+dfsg/libr/util/r_oids.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_oids.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,2249 +0,0 @@
-#ifndef OIDS_H
-#define OIDS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct r_oid_list_t {
-	const char* oid;
-	const char* name;
-} X509OIDList [2230] = {
-	{"0.2.262.1.10", "Telesec"},
-	{"0.2.262.1.10.0", "extension"},
-	{"0.2.262.1.10.1", "mechanism"},
-	{"0.2.262.1.10.1.0", "authentication"},
-	{"0.2.262.1.10.1.0.1", "passwordAuthentication"},
-	{"0.2.262.1.10.1.0.2", "protectedPasswordAuthentication"},
-	{"0.2.262.1.10.1.0.3", "oneWayX509Authentication"},
-	{"0.2.262.1.10.1.0.4", "twoWayX509Authentication"},
-	{"0.2.262.1.10.1.0.5", "threeWayX509Authentication"},
-	{"0.2.262.1.10.1.0.6", "oneWayISO9798Authentication"},
-	{"0.2.262.1.10.1.0.7", "twoWayISO9798Authentication"},
-	{"0.2.262.1.10.1.0.8", "telekomAuthentication"},
-	{"0.2.262.1.10.1.1", "signature"},
-	{"0.2.262.1.10.1.1.1", "md4WithRSAAndISO9697"},
-	{"0.2.262.1.10.1.1.2", "md4WithRSAAndTelesecSignatureStandard"},
-	{"0.2.262.1.10.1.1.3", "md5WithRSAAndISO9697"},
-	{"0.2.262.1.10.1.1.4", "md5WithRSAAndTelesecSignatureStandard"},
-	{"0.2.262.1.10.1.1.5", "ripemd160WithRSAAndTelekomSignatureStandard"},
-	{"0.2.262.1.10.1.1.9", "hbciRsaSignature"},
-	{"0.2.262.1.10.1.2", "encryption"},
-	{"0.2.262.1.10.1.2.0", "none"},
-	{"0.2.262.1.10.1.2.1", "rsaTelesec"},
-	{"0.2.262.1.10.1.2.2", "des"},
-	{"0.2.262.1.10.1.2.2.1", "desECB"},
-	{"0.2.262.1.10.1.2.2.2", "desCBC"},
-	{"0.2.262.1.10.1.2.2.3", "desOFB"},
-	{"0.2.262.1.10.1.2.2.4", "desCFB8"},
-	{"0.2.262.1.10.1.2.2.5", "desCFB64"},
-	{"0.2.262.1.10.1.2.3", "des3"},
-	{"0.2.262.1.10.1.2.3.1", "des3ECB"},
-	{"0.2.262.1.10.1.2.3.2", "des3CBC"},
-	{"0.2.262.1.10.1.2.3.3", "des3OFB"},
-	{"0.2.262.1.10.1.2.3.4", "des3CFB8"},
-	{"0.2.262.1.10.1.2.3.5", "des3CFB64"},
-	{"0.2.262.1.10.1.2.4", "magenta"},
-	{"0.2.262.1.10.1.2.5", "idea"},
-	{"0.2.262.1.10.1.2.5.1", "ideaECB"},
-	{"0.2.262.1.10.1.2.5.2", "ideaCBC"},
-	{"0.2.262.1.10.1.2.5.3", "ideaOFB"},
-	{"0.2.262.1.10.1.2.5.4", "ideaCFB8"},
-	{"0.2.262.1.10.1.2.5.5", "ideaCFB64"},
-	{"0.2.262.1.10.1.3", "oneWayFunction"},
-	{"0.2.262.1.10.1.3.1", "md4"},
-	{"0.2.262.1.10.1.3.2", "md5"},
-	{"0.2.262.1.10.1.3.3", "sqModNX509"},
-	{"0.2.262.1.10.1.3.4", "sqModNISO"},
-	{"0.2.262.1.10.1.3.5", "ripemd128"},
-	{"0.2.262.1.10.1.3.6", "hashUsingBlockCipher"},
-	{"0.2.262.1.10.1.3.7", "mac"},
-	{"0.2.262.1.10.1.3.8", "ripemd160"},
-	{"0.2.262.1.10.1.4", "fecFunction"},
-	{"0.2.262.1.10.1.4.1", "reedSolomon"},
-	{"0.2.262.1.10.2", "module"},
-	{"0.2.262.1.10.2.0", "algorithms"},
-	{"0.2.262.1.10.2.1", "attributeTypes"},
-	{"0.2.262.1.10.2.2", "certificateTypes"},
-	{"0.2.262.1.10.2.3", "messageTypes"},
-	{"0.2.262.1.10.2.4", "plProtocol"},
-	{"0.2.262.1.10.2.5", "smeAndComponentsOfSme"},
-	{"0.2.262.1.10.2.6", "fec"},
-	{"0.2.262.1.10.2.7", "usefulDefinitions"},
-	{"0.2.262.1.10.2.8", "stefiles"},
-	{"0.2.262.1.10.2.9", "sadmib"},
-	{"0.2.262.1.10.2.10", "electronicOrder"},
-	{"0.2.262.1.10.2.11", "telesecTtpAsymmetricApplication"},
-	{"0.2.262.1.10.2.12", "telesecTtpBasisApplication"},
-	{"0.2.262.1.10.2.13", "telesecTtpMessages"},
-	{"0.2.262.1.10.2.14", "telesecTtpTimeStampApplication"},
-	{"0.2.262.1.10.3", "objectClass"},
-	{"0.2.262.1.10.3.0", "telesecOtherName"},
-	{"0.2.262.1.10.3.1", "directory"},
-	{"0.2.262.1.10.3.2", "directoryType"},
-	{"0.2.262.1.10.3.3", "directoryGroup"},
-	{"0.2.262.1.10.3.4", "directoryUser"},
-	{"0.2.262.1.10.3.5", "symmetricKeyEntry"},
-	{"0.2.262.1.10.4", "package"},
-	{"0.2.262.1.10.5", "parameter"},
-	{"0.2.262.1.10.6", "nameBinding"},
-	{"0.2.262.1.10.7", "attribute"},
-	{"0.2.262.1.10.7.0", "applicationGroupIdentifier"},
-	{"0.2.262.1.10.7.1", "certificateType"},
-	{"0.2.262.1.10.7.2", "telesecCertificate"},
-	{"0.2.262.1.10.7.3", "certificateNumber"},
-	{"0.2.262.1.10.7.4", "certificateRevocationList"},
-	{"0.2.262.1.10.7.5", "creationDate"},
-	{"0.2.262.1.10.7.6", "issuer"},
-	{"0.2.262.1.10.7.7", "namingAuthority"},
-	{"0.2.262.1.10.7.8", "publicKeyDirectory"},
-	{"0.2.262.1.10.7.9", "securityDomain"},
-	{"0.2.262.1.10.7.10", "subject"},
-	{"0.2.262.1.10.7.11", "timeOfRevocation"},
-	{"0.2.262.1.10.7.12", "userGroupReference"},
-	{"0.2.262.1.10.7.13", "validity"},
-	{"0.2.262.1.10.7.14", "zert93"},
-	{"0.2.262.1.10.7.15", "securityMessEnv"},
-	{"0.2.262.1.10.7.16", "anonymizedPublicKeyDirectory"},
-	{"0.2.262.1.10.7.17", "telesecGivenName"},
-	{"0.2.262.1.10.7.18", "nameAdditions"},
-	{"0.2.262.1.10.7.19", "telesecPostalCode"},
-	{"0.2.262.1.10.7.20", "nameDistinguisher"},
-	{"0.2.262.1.10.7.21", "telesecCertificateList"},
-	{"0.2.262.1.10.7.22", "teletrustCertificateList"},
-	{"0.2.262.1.10.7.23", "x509CertificateList"},
-	{"0.2.262.1.10.7.24", "timeOfIssue"},
-	{"0.2.262.1.10.7.25", "physicalCardNumber"},
-	{"0.2.262.1.10.7.26", "fileType"},
-	{"0.2.262.1.10.7.27", "ctlFileIsArchive"},
-	{"0.2.262.1.10.7.28", "emailAddress"},
-	{"0.2.262.1.10.7.29", "certificateTemplateList"},
-	{"0.2.262.1.10.7.30", "directoryName"},
-	{"0.2.262.1.10.7.31", "directoryTypeName"},
-	{"0.2.262.1.10.7.32", "directoryGroupName"},
-	{"0.2.262.1.10.7.33", "directoryUserName"},
-	{"0.2.262.1.10.7.34", "revocationFlag"},
-	{"0.2.262.1.10.7.35", "symmetricKeyEntryName"},
-	{"0.2.262.1.10.7.36", "glNumber"},
-	{"0.2.262.1.10.7.37", "goNumber"},
-	{"0.2.262.1.10.7.38", "gKeyData"},
-	{"0.2.262.1.10.7.39", "zKeyData"},
-	{"0.2.262.1.10.7.40", "ktKeyData"},
-	{"0.2.262.1.10.7.41", "ktKeyNumber"},
-	{"0.2.262.1.10.7.51", "timeOfRevocationGen"},
-	{"0.2.262.1.10.7.52", "liabilityText"},
-	{"0.2.262.1.10.8", "attributeGroup"},
-	{"0.2.262.1.10.9", "action"},
-	{"0.2.262.1.10.10", "notification"},
-	{"0.2.262.1.10.11", "snmp-mibs"},
-	{"0.2.262.1.10.11.1", "securityApplication"},
-	{"0.2.262.1.10.12", "certAndCrlExtensionDefinitions"},
-	{"0.2.262.1.10.12.0", "liabilityLimitationFlag"},
-	{"0.2.262.1.10.12.1", "telesecCertIdExt"},
-	{"0.2.262.1.10.12.2", "Telesec.policyIdentifier"},
-	{"0.2.262.1.10.12.3", "telesecPolicyQualifierID"},
-	{"0.2.262.1.10.12.4", "telesecCRLFilteredExt"},
-	{"0.2.262.1.10.12.5", "telesecCRLFilterExt"},
-	{"0.2.262.1.10.12.6", "telesecNamingAuthorityExt"},
-	{"0.4.0.127.0.7", "bsi"},
-	{"0.4.0.127.0.7.1", "bsiEcc"},
-	{"0.4.0.127.0.7.1.1", "bsifieldType"},
-	{"0.4.0.127.0.7.1.1.1", "bsiPrimeField"},
-	{"0.4.0.127.0.7.1.1.2", "bsiCharacteristicTwoField"},
-	{"0.4.0.127.0.7.1.1.2.2", "bsiECTLVKeyFormat"},
-	{"0.4.0.127.0.7.1.1.2.2.1", "bsiECTLVPublicKey"},
-	{"0.4.0.127.0.7.1.1.2.3", "bsiCharacteristicTwoBasis"},
-	{"0.4.0.127.0.7.1.1.2.3.1", "bsiGnBasis"},
-	{"0.4.0.127.0.7.1.1.2.3.2", "bsiTpBasis"},
-	{"0.4.0.127.0.7.1.1.2.3.3", "bsiPpBasis"},
-	{"0.4.0.127.0.7.1.1.4.1", "bsiEcdsaSignatures"},
-	{"0.4.0.127.0.7.1.1.4.1.1", "bsiEcdsaWithSHA1"},
-	{"0.4.0.127.0.7.1.1.4.1.2", "bsiEcdsaWithSHA224"},
-	{"0.4.0.127.0.7.1.1.4.1.3", "bsiEcdsaWithSHA256"},
-	{"0.4.0.127.0.7.1.1.4.1.4", "bsiEcdsaWithSHA384"},
-	{"0.4.0.127.0.7.1.1.4.1.5", "bsiEcdsaWithSHA512"},
-	{"0.4.0.127.0.7.1.1.4.1.6", "bsiEcdsaWithRIPEMD160"},
-	{"0.4.0.127.0.7.1.1.5.1.1", "bsiEckaEgX963KDF"},
-	{"0.4.0.127.0.7.1.1.5.1.1.1", "bsiEckaEgX963KDFWithSHA1"},
-	{"0.4.0.127.0.7.1.1.5.1.1.2", "bsiEckaEgX963KDFWithSHA224"},
-	{"0.4.0.127.0.7.1.1.5.1.1.3", "bsiEckaEgX963KDFWithSHA256"},
-	{"0.4.0.127.0.7.1.1.5.1.1.4", "bsiEckaEgX963KDFWithSHA384"},
-	{"0.4.0.127.0.7.1.1.5.1.1.5", "bsiEckaEgX963KDFWithSHA512"},
-	{"0.4.0.127.0.7.1.1.5.1.1.6", "bsiEckaEgX963KDFWithRIPEMD160"},
-	{"0.4.0.127.0.7.1.1.5.1.2", "bsiEckaEgSessionKDF"},
-	{"0.4.0.127.0.7.1.1.5.1.2.1", "bsiEckaEgSessionKDFWith3DES"},
-	{"0.4.0.127.0.7.1.1.5.1.2.2", "bsiEckaEgSessionKDFWithAES128"},
-	{"0.4.0.127.0.7.1.1.5.1.2.3", "bsiEckaEgSessionKDFWithAES192"},
-	{"0.4.0.127.0.7.1.1.5.1.2.4", "bsiEckaEgSessionKDFWithAES256"},
-	{"0.4.0.127.0.7.1.1.5.2", "bsiEckaDH"},
-	{"0.4.0.127.0.7.1.1.5.2.1", "bsiEckaDHX963KDF"},
-	{"0.4.0.127.0.7.1.1.5.2.1.1", "bsiEckaDHX963KDFWithSHA1"},
-	{"0.4.0.127.0.7.1.1.5.2.1.2", "bsiEckaDHX963KDFWithSHA224"},
-	{"0.4.0.127.0.7.1.1.5.2.1.3", "bsiEckaDHX963KDFWithSHA256"},
-	{"0.4.0.127.0.7.1.1.5.2.1.4", "bsiEckaDHX963KDFWithSHA384"},
-	{"0.4.0.127.0.7.1.1.5.2.1.5", "bsiEckaDHX963KDFWithSHA512"},
-	{"0.4.0.127.0.7.1.1.5.2.1.6", "bsiEckaDHX963KDFWithRIPEMD160"},
-	{"0.4.0.127.0.7.1.1.5.2.2", "bsiEckaDHSessionKDF"},
-	{"0.4.0.127.0.7.1.1.5.2.2.1", "bsiEckaDHSessionKDFWith3DES"},
-	{"0.4.0.127.0.7.1.1.5.2.2.2", "bsiEckaDHSessionKDFWithAES128"},
-	{"0.4.0.127.0.7.1.1.5.2.2.3", "bsiEckaDHSessionKDFWithAES192"},
-	{"0.4.0.127.0.7.1.1.5.2.2.4", "bsiEckaDHSessionKDFWithAES256"},
-	{"0.4.0.127.0.7.1.2", "bsiEcKeyType"},
-	{"0.4.0.127.0.7.1.2.1", "bsiEcPublicKey"},
-	{"0.4.0.127.0.7.1.5.1", "bsiKaeg"},
-	{"0.4.0.127.0.7.1.5.1.1", "bsiKaegWithX963KDF"},
-	{"0.4.0.127.0.7.1.5.1.2", "bsiKaegWith3DESKDF"},
-	{"0.4.0.127.0.7.2.2.1", "bsiPK"},
-	{"0.4.0.127.0.7.2.2.1.1", "bsiPK_DH"},
-	{"0.4.0.127.0.7.2.2.1.2", "bsiPK_ECDH"},
-	{"0.4.0.127.0.7.2.2.2", "bsiTA"},
-	{"0.4.0.127.0.7.2.2.2.1", "bsiTA_RSA"},
-	{"0.4.0.127.0.7.2.2.2.1.1", "bsiTA_RSAv1_5_SHA1"},
-	{"0.4.0.127.0.7.2.2.2.1.2", "bsiTA_RSAv1_5_SHA256"},
-	{"0.4.0.127.0.7.2.2.2.1.3", "bsiTA_RSAPSS_SHA1"},
-	{"0.4.0.127.0.7.2.2.2.1.4", "bsiTA_RSAPSS_SHA256"},
-	{"0.4.0.127.0.7.2.2.2.1.5", "bsiTA_RSAv1_5_SHA512"},
-	{"0.4.0.127.0.7.2.2.2.1.6", "bsiTA_RSAPSS_SHA512"},
-	{"0.4.0.127.0.7.2.2.2.2", "bsiTA_ECDSA"},
-	{"0.4.0.127.0.7.2.2.2.2.1", "bsiTA_ECDSA_SHA1"},
-	{"0.4.0.127.0.7.2.2.2.2.2", "bsiTA_ECDSA_SHA224"},
-	{"0.4.0.127.0.7.2.2.2.2.3", "bsiTA_ECDSA_SHA256"},
-	{"0.4.0.127.0.7.2.2.2.2.4", "bsiTA_ECDSA_SHA384"},
-	{"0.4.0.127.0.7.2.2.2.2.5", "bsiTA_ECDSA_SHA512"},
-	{"0.4.0.127.0.7.2.2.3", "bsiCA"},
-	{"0.4.0.127.0.7.2.2.3.1", "bsiCA_DH"},
-	{"0.4.0.127.0.7.2.2.3.1.1", "bsiCA_DH_3DES_CBC_CBC"},
-	{"0.4.0.127.0.7.2.2.3.1.2", "bsiCA_DH_AES_CBC_CMAC_128"},
-	{"0.4.0.127.0.7.2.2.3.1.3", "bsiCA_DH_AES_CBC_CMAC_192"},
-	{"0.4.0.127.0.7.2.2.3.1.4", "bsiCA_DH_AES_CBC_CMAC_256"},
-	{"0.4.0.127.0.7.2.2.3.2", "bsiCA_ECDH"},
-	{"0.4.0.127.0.7.2.2.3.2.1", "bsiCA_ECDH_3DES_CBC_CBC"},
-	{"0.4.0.127.0.7.2.2.3.2.2", "bsiCA_ECDH_AES_CBC_CMAC_128"},
-	{"0.4.0.127.0.7.2.2.3.2.3", "bsiCA_ECDH_AES_CBC_CMAC_192"},
-	{"0.4.0.127.0.7.2.2.3.2.4", "bsiCA_ECDH_AES_CBC_CMAC_256"},
-	{"0.4.0.127.0.7.2.2.4", "bsiPACE"},
-	{"0.4.0.127.0.7.2.2.4.1", "bsiPACE_DH_GM"},
-	{"0.4.0.127.0.7.2.2.4.1.1", "bsiPACE_DH_GM_3DES_CBC_CBC"},
-	{"0.4.0.127.0.7.2.2.4.1.2", "bsiPACE_DH_GM_AES_CBC_CMAC_128"},
-	{"0.4.0.127.0.7.2.2.4.1.3", "bsiPACE_DH_GM_AES_CBC_CMAC_192"},
-	{"0.4.0.127.0.7.2.2.4.1.4", "bsiPACE_DH_GM_AES_CBC_CMAC_256"},
-	{"0.4.0.127.0.7.2.2.4.2", "bsiPACE_ECDH_GM"},
-	{"0.4.0.127.0.7.2.2.4.2.1", "bsiPACE_ECDH_GM_3DES_CBC_CBC"},
-	{"0.4.0.127.0.7.2.2.4.2.2", "bsiPACE_ECDH_GM_AES_CBC_CMAC_128"},
-	{"0.4.0.127.0.7.2.2.4.2.3", "bsiPACE_ECDH_GM_AES_CBC_CMAC_192"},
-	{"0.4.0.127.0.7.2.2.4.2.4", "bsiPACE_ECDH_GM_AES_CBC_CMAC_256"},
-	{"0.4.0.127.0.7.2.2.4.3", "bsiPACE_DH_IM"},
-	{"0.4.0.127.0.7.2.2.4.3.1", "bsiPACE_DH_IM_3DES_CBC_CBC"},
-	{"0.4.0.127.0.7.2.2.4.3.2", "bsiPACE_DH_IM_AES_CBC_CMAC_128"},
-	{"0.4.0.127.0.7.2.2.4.3.3", "bsiPACE_DH_IM_AES_CBC_CMAC_192"},
-	{"0.4.0.127.0.7.2.2.4.3.4", "bsiPACE_DH_IM_AES_CBC_CMAC_256"},
-	{"0.4.0.127.0.7.2.2.4.4", "bsiPACE_ECDH_IM"},
-	{"0.4.0.127.0.7.2.2.4.4.1", "bsiPACE_ECDH_IM_3DES_CBC_CBC"},
-	{"0.4.0.127.0.7.2.2.4.4.2", "bsiPACE_ECDH_IM_AES_CBC_CMAC_128"},
-	{"0.4.0.127.0.7.2.2.4.4.3", "bsiPACE_ECDH_IM_AES_CBC_CMAC_192"},
-	{"0.4.0.127.0.7.2.2.4.4.4", "bsiPACE_ECDH_IM_AES_CBC_CMAC_256"},
-	{"0.4.0.127.0.7.2.2.5", "bsiRI"},
-	{"0.4.0.127.0.7.2.2.5.1", "bsiRI_DH"},
-	{"0.4.0.127.0.7.2.2.5.1.1", "bsiRI_DH_SHA1"},
-	{"0.4.0.127.0.7.2.2.5.1.2", "bsiRI_DH_SHA224"},
-	{"0.4.0.127.0.7.2.2.5.1.3", "bsiRI_DH_SHA256"},
-	{"0.4.0.127.0.7.2.2.5.1.4", "bsiRI_DH_SHA384"},
-	{"0.4.0.127.0.7.2.2.5.1.5", "bsiRI_DH_SHA512"},
-	{"0.4.0.127.0.7.2.2.5.2", "bsiRI_ECDH"},
-	{"0.4.0.127.0.7.2.2.5.2.1", "bsiRI_ECDH_SHA1"},
-	{"0.4.0.127.0.7.2.2.5.2.2", "bsiRI_ECDH_SHA224"},
-	{"0.4.0.127.0.7.2.2.5.2.3", "bsiRI_ECDH_SHA256"},
-	{"0.4.0.127.0.7.2.2.5.2.4", "bsiRI_ECDH_SHA384"},
-	{"0.4.0.127.0.7.2.2.5.2.5", "bsiRI_ECDH_SHA512"},
-	{"0.4.0.127.0.7.2.2.6", "bsiCardInfo"},
-	{"0.4.0.127.0.7.2.2.7", "bsiEidSecurity"},
-	{"0.4.0.127.0.7.2.2.8", "bsiPT"},
-	{"0.4.0.127.0.7.3.1.2", "bsiEACRoles"},
-	{"0.4.0.127.0.7.3.1.2.1", "bsiEACRolesIS"},
-	{"0.4.0.127.0.7.3.1.2.2", "bsiEACRolesAT"},
-	{"0.4.0.127.0.7.3.1.2.3", "bsiEACRolesST"},
-	{"0.4.0.127.0.7.3.1.3", "bsiTAv2ce"},
-	{"0.4.0.127.0.7.3.1.3.1", "bsiTAv2ceDescription"},
-	{"0.4.0.127.0.7.3.1.3.1.1", "bsiTAv2ceDescriptionPlainText"},
-	{"0.4.0.127.0.7.3.1.3.1.2", "bsiTAv2ceDescriptionIA5String"},
-	{"0.4.0.127.0.7.3.1.3.1.3", "bsiTAv2ceDescriptionOctetString"},
-	{"0.4.0.127.0.7.3.1.3.2", "bsiTAv2ceTerminalSector"},
-	{"0.4.0.127.0.7.3.1.4", "bsiAuxData"},
-	{"0.4.0.127.0.7.3.1.4.1", "bsiAuxDataBirthday"},
-	{"0.4.0.127.0.7.3.1.4.2", "bsiAuxDataExpireDate"},
-	{"0.4.0.127.0.7.3.1.4.3", "bsiAuxDataCommunityID"},
-	{"0.4.0.127.0.7.3.1.5", "bsiDefectList"},
-	{"0.4.0.127.0.7.3.1.5.1", "bsiDefectAuthDefect"},
-	{"0.4.0.127.0.7.3.1.5.1.1", "bsiDefectCertRevoked"},
-	{"0.4.0.127.0.7.3.1.5.1.2", "bsiDefectCertReplaced"},
-	{"0.4.0.127.0.7.3.1.5.1.3", "bsiDefectChipAuthKeyRevoked"},
-	{"0.4.0.127.0.7.3.1.5.1.4", "bsiDefectActiveAuthKeyRevoked"},
-	{"0.4.0.127.0.7.3.1.5.2", "bsiDefectEPassportDefect"},
-	{"0.4.0.127.0.7.3.1.5.2.1", "bsiDefectEPassportDGMalformed"},
-	{"0.4.0.127.0.7.3.1.5.2.2", "bsiDefectSODInvalid"},
-	{"0.4.0.127.0.7.3.1.5.3", "bsiDefectEIDDefect"},
-	{"0.4.0.127.0.7.3.1.5.3.1", "bsiDefectEIDDGMalformed"},
-	{"0.4.0.127.0.7.3.1.5.3.2", "bsiDefectEIDIntegrity"},
-	{"0.4.0.127.0.7.3.1.5.4", "bsiDefectDocumentDefect"},
-	{"0.4.0.127.0.7.3.1.5.4.1", "bsiDefectCardSecurityMalformed"},
-	{"0.4.0.127.0.7.3.1.5.4.2", "bsiDefectChipSecurityMalformed"},
-	{"0.4.0.127.0.7.3.1.5.4.3", "bsiDefectPowerDownReq"},
-	{"0.4.0.127.0.7.3.1.6", "bsiListContentDescription"},
-	{"0.4.0.127.0.7.3.2.1", "bsiSecurityObject"},
-	{"0.4.0.127.0.7.3.2.2", "bsiBlackList"},
-	{"0.4.0.1862", "etsiQcsProfile"},
-	{"0.4.0.1862.1", "etsiQcs"},
-	{"0.4.0.1862.1.1", "etsiQcsCompliance"},
-	{"0.4.0.1862.1.2", "etsiQcsLimitValue"},
-	{"0.4.0.1862.1.3", "etsiQcsRetentionPeriod"},
-	{"0.4.0.1862.1.4", "etsiQcsQcSSCD"},
-	{"0.9.2342.19200300.100.1.1", "userID"},
-	{"0.9.2342.19200300.100.1.3", "rfc822Mailbox"},
-	{"0.9.2342.19200300.100.1.25", "domainComponent"},
-	{"1.0.10118.3.0.49", "ripemd160"},
-	{"1.0.10118.3.0.50", "ripemd128"},
-	{"1.0.10118.3.0.55", "whirlpool"},
-	{"1.2.36.1.3.1.1.1", "qgpki"},
-	{"1.2.36.1.3.1.1.1.1", "qgpkiPolicies"},
-	{"1.2.36.1.3.1.1.1.1.1", "qgpkiMedIntermedCA"},
-	{"1.2.36.1.3.1.1.1.1.1.1", "qgpkiMedIntermedIndividual"},
-	{"1.2.36.1.3.1.1.1.1.1.2", "qgpkiMedIntermedDeviceControl"},
-	{"1.2.36.1.3.1.1.1.1.1.3", "qgpkiMedIntermedDevice"},
-	{"1.2.36.1.3.1.1.1.1.1.4", "qgpkiMedIntermedAuthorisedParty"},
-	{"1.2.36.1.3.1.1.1.1.1.5", "qgpkiMedIntermedDeviceSystem"},
-	{"1.2.36.1.3.1.1.1.1.2", "qgpkiMedIssuingCA"},
-	{"1.2.36.1.3.1.1.1.1.2.1", "qgpkiMedIssuingIndividual"},
-	{"1.2.36.1.3.1.1.1.1.2.2", "qgpkiMedIssuingDeviceControl"},
-	{"1.2.36.1.3.1.1.1.1.2.3", "qgpkiMedIssuingDevice"},
-	{"1.2.36.1.3.1.1.1.1.2.4", "qgpkiMedIssuingAuthorisedParty"},
-	{"1.2.36.1.3.1.1.1.1.2.5", "qgpkiMedIssuingClientAuth"},
-	{"1.2.36.1.3.1.1.1.1.2.6", "qgpkiMedIssuingServerAuth"},
-	{"1.2.36.1.3.1.1.1.1.2.7", "qgpkiMedIssuingDataProt"},
-	{"1.2.36.1.3.1.1.1.1.2.8", "qgpkiMedIssuingTokenAuth"},
-	{"1.2.36.1.3.1.1.1.1.3", "qgpkiBasicIntermedCA"},
-	{"1.2.36.1.3.1.1.1.1.3.1", "qgpkiBasicIntermedDeviceSystem"},
-	{"1.2.36.1.3.1.1.1.1.4", "qgpkiBasicIssuingCA"},
-	{"1.2.36.1.3.1.1.1.1.4.1", "qgpkiBasicIssuingClientAuth"},
-	{"1.2.36.1.3.1.1.1.1.4.2", "qgpkiBasicIssuingServerAuth"},
-	{"1.2.36.1.3.1.1.1.1.4.3", "qgpkiBasicIssuingDataSigning"},
-	{"1.2.36.1.3.1.1.1.2", "qgpkiAssuranceLevel"},
-	{"1.2.36.1.3.1.1.1.2.1", "qgpkiAssuranceRudimentary"},
-	{"1.2.36.1.3.1.1.1.2.2", "qgpkiAssuranceBasic"},
-	{"1.2.36.1.3.1.1.1.2.3", "qgpkiAssuranceMedium"},
-	{"1.2.36.1.3.1.1.1.2.4", "qgpkiAssuranceHigh"},
-	{"1.2.36.1.3.1.1.1.3", "qgpkiCertFunction"},
-	{"1.2.36.1.3.1.1.1.3.1", "qgpkiFunctionIndividual"},
-	{"1.2.36.1.3.1.1.1.3.2", "qgpkiFunctionDevice"},
-	{"1.2.36.1.3.1.1.1.3.3", "qgpkiFunctionAuthorisedParty"},
-	{"1.2.36.1.3.1.1.1.3.4", "qgpkiFunctionDeviceControl"},
-	{"1.2.36.1.3.1.2", "qpspki"},
-	{"1.2.36.1.3.1.2.1", "qpspkiPolicies"},
-	{"1.2.36.1.3.1.2.1.2", "qpspkiPolicyBasic"},
-	{"1.2.36.1.3.1.2.1.3", "qpspkiPolicyMedium"},
-	{"1.2.36.1.3.1.2.1.4", "qpspkiPolicyHigh"},
-	{"1.2.36.1.3.1.3.2", "qtmrpki"},
-	{"1.2.36.1.3.1.3.2.1", "qtmrpkiPolicies"},
-	{"1.2.36.1.3.1.3.2.2", "qtmrpkiPurpose"},
-	{"1.2.36.1.3.1.3.2.2.1", "qtmrpkiIndividual"},
-	{"1.2.36.1.3.1.3.2.2.2", "qtmrpkiDeviceControl"},
-	{"1.2.36.1.3.1.3.2.2.3", "qtmrpkiDevice"},
-	{"1.2.36.1.3.1.3.2.2.4", "qtmrpkiAuthorisedParty"},
-	{"1.2.36.1.3.1.3.2.2.5", "qtmrpkiDeviceSystem"},
-	{"1.2.36.1.3.1.3.2.3", "qtmrpkiDevice"},
-	{"1.2.36.1.3.1.3.2.3.1", "qtmrpkiDriverLicense"},
-	{"1.2.36.1.3.1.3.2.3.2", "qtmrpkiIndustryAuthority"},
-	{"1.2.36.1.3.1.3.2.3.3", "qtmrpkiMarineLicense"},
-	{"1.2.36.1.3.1.3.2.3.4", "qtmrpkiAdultProofOfAge"},
-	{"1.2.36.1.3.1.3.2.3.5", "qtmrpkiSam"},
-	{"1.2.36.1.3.1.3.2.4", "qtmrpkiAuthorisedParty"},
-	{"1.2.36.1.3.1.3.2.4.1", "qtmrpkiTransportInspector"},
-	{"1.2.36.1.3.1.3.2.4.2", "qtmrpkiPoliceOfficer"},
-	{"1.2.36.1.3.1.3.2.4.3", "qtmrpkiSystem"},
-	{"1.2.36.1.3.1.3.2.4.4", "qtmrpkiLiquorLicensingInspector"},
-	{"1.2.36.1.3.1.3.2.4.5", "qtmrpkiMarineEnforcementOfficer"},
-	{"1.2.36.1.333.1", "australianBusinessNumber"},
-	{"1.2.36.68980861.1.1.2", "signetPersonal"},
-	{"1.2.36.68980861.1.1.3", "signetBusiness"},
-	{"1.2.36.68980861.1.1.4", "signetLegal"},
-	{"1.2.36.68980861.1.1.10", "signetPilot"},
-	{"1.2.36.68980861.1.1.11", "signetIntraNet"},
-	{"1.2.36.68980861.1.1.20", "signetPolicy"},
-	{"1.2.36.75878867.1.100.1.1", "certificatesAustraliaPolicy"},
-	{"1.2.392.200011.61.1.1.1", "mitsubishiSecurityAlgorithm"},
-	{"1.2.392.200011.61.1.1.1.1", "misty1-cbc"},
-	{"1.2.410.200004.1", "kisaAlgorithm"},
-	{"1.2.410.200004.1.1", "kcdsa"},
-	{"1.2.410.200004.1.2", "has160"},
-	{"1.2.410.200004.1.3", "seedECB"},
-	{"1.2.410.200004.1.4", "seedCBC"},
-	{"1.2.410.200004.1.5", "seedOFB"},
-	{"1.2.410.200004.1.6", "seedCFB"},
-	{"1.2.410.200004.1.7", "seedMAC"},
-	{"1.2.410.200004.1.8", "kcdsaWithHAS160"},
-	{"1.2.410.200004.1.9", "kcdsaWithSHA1"},
-	{"1.2.410.200004.1.10", "pbeWithHAS160AndSEED-ECB"},
-	{"1.2.410.200004.1.11", "pbeWithHAS160AndSEED-CBC"},
-	{"1.2.410.200004.1.12", "pbeWithHAS160AndSEED-CFB"},
-	{"1.2.410.200004.1.13", "pbeWithHAS160AndSEED-OFB"},
-	{"1.2.410.200004.1.14", "pbeWithSHA1AndSEED-ECB"},
-	{"1.2.410.200004.1.15", "pbeWithSHA1AndSEED-CBC"},
-	{"1.2.410.200004.1.16", "pbeWithSHA1AndSEED-CFB"},
-	{"1.2.410.200004.1.17", "pbeWithSHA1AndSEED-OFB"},
-	{"1.2.410.200004.1.20", "rsaWithHAS160"},
-	{"1.2.410.200004.1.21", "kcdsa1"},
-	{"1.2.410.200004.2", "npkiCP"},
-	{"1.2.410.200004.2.1", "npkiSignaturePolicy"},
-	{"1.2.410.200004.3", "npkiKP"},
-	{"1.2.410.200004.4", "npkiAT"},
-	{"1.2.410.200004.5", "npkiLCA"},
-	{"1.2.410.200004.5.1", "npkiSignKorea"},
-	{"1.2.410.200004.5.2", "npkiSignGate"},
-	{"1.2.410.200004.5.3", "npkiNcaSign"},
-	{"1.2.410.200004.6", "npkiON"},
-	{"1.2.410.200004.7", "npkiAPP"},
-	{"1.2.410.200004.7.1", "npkiSMIME"},
-	{"1.2.410.200004.7.1.1", "npkiSMIMEAlgo"},
-	{"1.2.410.200004.7.1.1.1", "npkiCmsSEEDWrap"},
-	{"1.2.410.200004.10", "npki"},
-	{"1.2.410.200004.10.1", "npkiAttribute"},
-	{"1.2.410.200004.10.1.1", "npkiIdentifyData"},
-	{"1.2.410.200004.10.1.1.1", "npkiVID"},
-	{"1.2.410.200004.10.1.1.2", "npkiEncryptedVID"},
-	{"1.2.410.200004.10.1.1.3", "npkiRandomNum"},
-	{"1.2.410.200004.10.1.1.4", "npkiVID"},
-	{"1.2.410.200046.1.1", "aria1AlgorithmModes"},
-	{"1.2.410.200046.1.1.1", "aria128-ecb"},
-	{"1.2.410.200046.1.1.2", "aria128-cbc"},
-	{"1.2.410.200046.1.1.3", "aria128-cfb"},
-	{"1.2.410.200046.1.1.4", "aria128-ofb"},
-	{"1.2.410.200046.1.1.5", "aria128-ctr"},
-	{"1.2.410.200046.1.1.6", "aria192-ecb"},
-	{"1.2.410.200046.1.1.7", "aria192-cbc"},
-	{"1.2.410.200046.1.1.8", "aria192-cfb"},
-	{"1.2.410.200046.1.1.9", "aria192-ofb"},
-	{"1.2.410.200046.1.1.10", "aria192-ctr"},
-	{"1.2.410.200046.1.1.11", "aria256-ecb"},
-	{"1.2.410.200046.1.1.12", "aria256-cbc"},
-	{"1.2.410.200046.1.1.13", "aria256-cfb"},
-	{"1.2.410.200046.1.1.14", "aria256-ofb"},
-	{"1.2.410.200046.1.1.15", "aria256-ctr"},
-	{"1.2.410.200046.1.1.21", "aria128-cmac"},
-	{"1.2.410.200046.1.1.22", "aria192-cmac"},
-	{"1.2.410.200046.1.1.23", "aria256-cmac"},
-	{"1.2.410.200046.1.1.31", "aria128-ocb2"},
-	{"1.2.410.200046.1.1.32", "aria192-ocb2"},
-	{"1.2.410.200046.1.1.33", "aria256-ocb2"},
-	{"1.2.410.200046.1.1.34", "aria128-gcm"},
-	{"1.2.410.200046.1.1.35", "aria192-gcm"},
-	{"1.2.410.200046.1.1.36", "aria256-gcm"},
-	{"1.2.410.200046.1.1.37", "aria128-ccm"},
-	{"1.2.410.200046.1.1.38", "aria192-ccm"},
-	{"1.2.410.200046.1.1.39", "aria256-ccm"},
-	{"1.2.410.200046.1.1.40", "aria128-keywrap"},
-	{"1.2.410.200046.1.1.41", "aria192-keywrap"},
-	{"1.2.410.200046.1.1.42", "aria256-keywrap"},
-	{"1.2.410.200046.1.1.43", "aria128-keywrapWithPad"},
-	{"1.2.410.200046.1.1.44", "aria192-keywrapWithPad"},
-	{"1.2.410.200046.1.1.45", "aria256-keywrapWithPad"},
-	{"1.2.643.2.2.3", "gostSignature"},
-	{"1.2.643.2.2.4", "gost94Signature"},
-	{"1.2.643.2.2.19", "gostPublicKey"},
-	{"1.2.643.2.2.20", "gost94PublicKey"},
-	{"1.2.643.2.2.21", "gostCipher"},
-	{"1.2.643.2.2.31.0", "testCipherParams"},
-	{"1.2.643.2.2.31.1", "cryptoProCipherA"},
-	{"1.2.643.2.2.31.2", "cryptoProCipherB"},
-	{"1.2.643.2.2.31.3", "cryptoProCipherC"},
-	{"1.2.643.2.2.31.4", "cryptoProCipherD"},
-	{"1.2.643.2.2.31.5", "oscar11Cipher"},
-	{"1.2.643.2.2.31.6", "oscar10Cipher"},
-	{"1.2.643.2.2.31.7", "ric1Cipher"},
-	{"1.2.643.2.2.9", "gostDigest"},
-	{"1.2.643.2.2.30.0", "testDigestParams"},
-	{"1.2.643.2.2.30.1", "cryptoProDigestA"},
-	{"1.2.643.2.2.35.0", "testSignParams"},
-	{"1.2.643.2.2.35.1", "cryptoProSignA"},
-	{"1.2.643.2.2.35.2", "cryptoProSignB"},
-	{"1.2.643.2.2.35.3", "cryptoProSignC"},
-	{"1.2.643.2.2.36.0", "cryptoProSignXA"},
-	{"1.2.643.2.2.36.1", "cryptoProSignXB"},
-	{"1.2.643.2.2.14.0", "nullMeshing"},
-	{"1.2.643.2.2.14.1", "cryptoProMeshing"},
-	{"1.2.643.2.2.10", "hmacGost"},
-	{"1.2.643.2.2.13.0", "gostWrap"},
-	{"1.2.643.2.2.13.1", "cryptoProWrap"},
-	{"1.2.643.2.2.96", "cryptoProECDHWrap"},
-	{"1.2.752.34.1", "seis-cp"},
-	{"1.2.752.34.1.1", "SEIS.high-assurance.policyIdentifier"},
-	{"1.2.752.34.1.2", "SEIS.GAK.policyIdentifier"},
-	{"1.2.752.34.2", "SEIS.pe"},
-	{"1.2.752.34.3", "SEIS.at"},
-	{"1.2.752.34.3.1", "SEIS.at-personalIdentifier"},
-	{"1.2.840.10040.1", "module"},
-	{"1.2.840.10040.1.1", "x9f1-cert-mgmt"},
-	{"1.2.840.10040.2", "holdinstruction"},
-	{"1.2.840.10040.2.1", "holdinstruction-none"},
-	{"1.2.840.10040.2.2", "callissuer"},
-	{"1.2.840.10040.2.3", "reject"},
-	{"1.2.840.10040.2.4", "pickupToken"},
-	{"1.2.840.10040.3", "attribute"},
-	{"1.2.840.10040.3.1", "countersignature"},
-	{"1.2.840.10040.3.2", "attribute-cert"},
-	{"1.2.840.10040.4", "algorithm"},
-	{"1.2.840.10040.4.1", "dsa"},
-	{"1.2.840.10040.4.2", "dsa-match"},
-	{"1.2.840.10040.4.3", "dsaWithSha1"},
-	{"1.2.840.10045.1", "fieldType"},
-	{"1.2.840.10045.1.1", "prime-field"},
-	{"1.2.840.10045.1.2", "characteristic-two-field"},
-	{"1.2.840.10045.1.2.3", "characteristic-two-basis"},
-	{"1.2.840.10045.1.2.3.1", "onBasis"},
-	{"1.2.840.10045.1.2.3.2", "tpBasis"},
-	{"1.2.840.10045.1.2.3.3", "ppBasis"},
-	{"1.2.840.10045.2", "publicKeyType"},
-	{"1.2.840.10045.2.1", "ecPublicKey"},
-	{"1.2.840.10045.3.0.1", "c2pnb163v1"},
-	{"1.2.840.10045.3.0.2", "c2pnb163v2"},
-	{"1.2.840.10045.3.0.3", "c2pnb163v3"},
-	{"1.2.840.10045.3.0.5", "c2tnb191v1"},
-	{"1.2.840.10045.3.0.6", "c2tnb191v2"},
-	{"1.2.840.10045.3.0.7", "c2tnb191v3"},
-	{"1.2.840.10045.3.0.10", "c2pnb208w1"},
-	{"1.2.840.10045.3.0.11", "c2tnb239v1"},
-	{"1.2.840.10045.3.0.12", "c2tnb239v2"},
-	{"1.2.840.10045.3.0.13", "c2tnb239v3"},
-	{"1.2.840.10045.3.0.16", "c2pnb272w1"},
-	{"1.2.840.10045.3.0.18", "c2tnb359v1"},
-	{"1.2.840.10045.3.0.19", "c2pnb368w1"},
-	{"1.2.840.10045.3.0.20", "c2tnb431r1"},
-	{"1.2.840.10045.3.1.1", "prime192v1"},
-	{"1.2.840.10045.3.1.2", "prime192v2"},
-	{"1.2.840.10045.3.1.3", "prime192v3"},
-	{"1.2.840.10045.3.1.4", "prime239v1"},
-	{"1.2.840.10045.3.1.5", "prime239v2"},
-	{"1.2.840.10045.3.1.6", "prime239v3"},
-	{"1.2.840.10045.3.1.7", "prime256v1"},
-	{"1.2.840.10045.4.1", "ecdsaWithSHA1"},
-	{"1.2.840.10045.4.2", "ecdsaWithRecommended"},
-	{"1.2.840.10045.4.3", "ecdsaWithSpecified"},
-	{"1.2.840.10045.4.3.1", "ecdsaWithSHA224"},
-	{"1.2.840.10045.4.3.2", "ecdsaWithSHA256"},
-	{"1.2.840.10045.4.3.3", "ecdsaWithSHA384"},
-	{"1.2.840.10045.4.3.4", "ecdsaWithSHA512"},
-	{"1.2.840.10046.1", "fieldType"},
-	{"1.2.840.10046.1.1", "gf-prime"},
-	{"1.2.840.10046.2", "numberType"},
-	{"1.2.840.10046.2.1", "dhPublicKey"},
-	{"1.2.840.10046.3", "scheme"},
-	{"1.2.840.10046.3.1", "dhStatic"},
-	{"1.2.840.10046.3.2", "dhEphem"},
-	{"1.2.840.10046.3.3", "dhHybrid1"},
-	{"1.2.840.10046.3.4", "dhHybrid2"},
-	{"1.2.840.10046.3.5", "mqv2"},
-	{"1.2.840.10046.3.6", "mqv1"},
-	{"1.2.840.10065.2.2", "?"},
-	{"1.2.840.10065.2.3", "healthcareLicense"},
-	{"1.2.840.10065.2.3.1.1", "license?"},
-	{"1.2.840.10070.", "iec62351"},
-	{"1.2.840.10070.8", "iec62351_8"},
-	{"1.2.840.10070.8.1", "iecUserRoles"},
-	{"1.2.840.113533.7", "nsn"},
-	{"1.2.840.113533.7.65", "nsn-ce"},
-	{"1.2.840.113533.7.65.0", "entrustVersInfo"},
-	{"1.2.840.113533.7.66", "nsn-alg"},
-	{"1.2.840.113533.7.66.3", "cast3CBC"},
-	{"1.2.840.113533.7.66.10", "cast5CBC"},
-	{"1.2.840.113533.7.66.11", "cast5MAC"},
-	{"1.2.840.113533.7.66.12", "pbeWithMD5AndCAST5-CBC"},
-	{"1.2.840.113533.7.66.13", "passwordBasedMac"},
-	{"1.2.840.113533.7.67", "nsn-oc"},
-	{"1.2.840.113533.7.67.0", "entrustUser"},
-	{"1.2.840.113533.7.68", "nsn-at"},
-	{"1.2.840.113533.7.68.0", "entrustCAInfo"},
-	{"1.2.840.113533.7.68.10", "attributeCertificate"},
-	{"1.2.840.113549.1.1", "pkcs-1"},
-	{"1.2.840.113549.1.1.1", "rsaEncryption"},
-	{"1.2.840.113549.1.1.2", "md2WithRSAEncryption"},
-	{"1.2.840.113549.1.1.3", "md4WithRSAEncryption"},
-	{"1.2.840.113549.1.1.4", "md5WithRSAEncryption"},
-	{"1.2.840.113549.1.1.5", "sha1WithRSAEncryption"},
-	{"1.2.840.113549.1.1.7", "rsaOAEP"},
-	{"1.2.840.113549.1.1.8", "pkcs1-MGF"},
-	{"1.2.840.113549.1.1.9", "rsaOAEP-pSpecified"},
-	{"1.2.840.113549.1.1.10", "rsaPSS"},
-	{"1.2.840.113549.1.1.11", "sha256WithRSAEncryption"},
-	{"1.2.840.113549.1.1.12", "sha384WithRSAEncryption"},
-	{"1.2.840.113549.1.1.13", "sha512WithRSAEncryption"},
-	{"1.2.840.113549.1.1.14", "sha224WithRSAEncryption"},
-	{"1.2.840.113549.1.1.6", "rsaOAEPEncryptionSET"},
-	{"1.2.840.113549.1.2", "bsafeRsaEncr"},
-	{"1.2.840.113549.1.3", "pkcs-3"},
-	{"1.2.840.113549.1.3.1", "dhKeyAgreement"},
-	{"1.2.840.113549.1.5", "pkcs-5"},
-	{"1.2.840.113549.1.5.1", "pbeWithMD2AndDES-CBC"},
-	{"1.2.840.113549.1.5.3", "pbeWithMD5AndDES-CBC"},
-	{"1.2.840.113549.1.5.4", "pbeWithMD2AndRC2-CBC"},
-	{"1.2.840.113549.1.5.6", "pbeWithMD5AndRC2-CBC"},
-	{"1.2.840.113549.1.5.9", "pbeWithMD5AndXOR"},
-	{"1.2.840.113549.1.5.10", "pbeWithSHAAndDES-CBC"},
-	{"1.2.840.113549.1.5.12", "pkcs5PBKDF2"},
-	{"1.2.840.113549.1.5.13", "pkcs5PBES2"},
-	{"1.2.840.113549.1.5.14", "pkcs5PBMAC1"},
-	{"1.2.840.113549.1.7", "pkcs-7"},
-	{"1.2.840.113549.1.7.1", "data"},
-	{"1.2.840.113549.1.7.2", "signedData"},
-	{"1.2.840.113549.1.7.3", "envelopedData"},
-	{"1.2.840.113549.1.7.4", "signedAndEnvelopedData"},
-	{"1.2.840.113549.1.7.5", "digestedData"},
-	{"1.2.840.113549.1.7.6", "encryptedData"},
-	{"1.2.840.113549.1.7.7", "dataWithAttributes"},
-	{"1.2.840.113549.1.7.8", "encryptedPrivateKeyInfo"},
-	{"1.2.840.113549.1.9", "pkcs-9"},
-	{"1.2.840.113549.1.9.1", "emailAddress"},
-	{"1.2.840.113549.1.9.2", "unstructuredName"},
-	{"1.2.840.113549.1.9.3", "contentType"},
-	{"1.2.840.113549.1.9.4", "messageDigest"},
-	{"1.2.840.113549.1.9.5", "signingTime"},
-	{"1.2.840.113549.1.9.6", "countersignature"},
-	{"1.2.840.113549.1.9.7", "challengePassword"},
-	{"1.2.840.113549.1.9.8", "unstructuredAddress"},
-	{"1.2.840.113549.1.9.9", "extendedCertificateAttributes"},
-	{"1.2.840.113549.1.9.10", "issuerAndSerialNumber"},
-	{"1.2.840.113549.1.9.11", "passwordCheck"},
-	{"1.2.840.113549.1.9.12", "publicKey"},
-	{"1.2.840.113549.1.9.13", "signingDescription"},
-	{"1.2.840.113549.1.9.14", "extensionRequest"},
-	{"1.2.840.113549.1.9.15", "sMIMECapabilities"},
-	{"1.2.840.113549.1.9.15.1", "preferSignedData"},
-	{"1.2.840.113549.1.9.15.2", "canNotDecryptAny"},
-	{"1.2.840.113549.1.9.15.3", "receiptRequest"},
-	{"1.2.840.113549.1.9.15.4", "receipt"},
-	{"1.2.840.113549.1.9.15.5", "contentHints"},
-	{"1.2.840.113549.1.9.15.6", "mlExpansionHistory"},
-	{"1.2.840.113549.1.9.16", "id-sMIME"},
-	{"1.2.840.113549.1.9.16.0", "id-mod"},
-	{"1.2.840.113549.1.9.16.0.1", "id-mod-cms"},
-	{"1.2.840.113549.1.9.16.0.2", "id-mod-ess"},
-	{"1.2.840.113549.1.9.16.0.3", "id-mod-oid"},
-	{"1.2.840.113549.1.9.16.0.4", "id-mod-msg-v3"},
-	{"1.2.840.113549.1.9.16.0.5", "id-mod-ets-eSignature-88"},
-	{"1.2.840.113549.1.9.16.0.6", "id-mod-ets-eSignature-97"},
-	{"1.2.840.113549.1.9.16.0.7", "id-mod-ets-eSigPolicy-88"},
-	{"1.2.840.113549.1.9.16.0.8", "id-mod-ets-eSigPolicy-88"},
-	{"1.2.840.113549.1.9.16.1", "contentType"},
-	{"1.2.840.113549.1.9.16.1.1", "receipt"},
-	{"1.2.840.113549.1.9.16.1.2", "authData"},
-	{"1.2.840.113549.1.9.16.1.3", "publishCert"},
-	{"1.2.840.113549.1.9.16.1.4", "tSTInfo"},
-	{"1.2.840.113549.1.9.16.1.5", "tDTInfo"},
-	{"1.2.840.113549.1.9.16.1.6", "contentInfo"},
-	{"1.2.840.113549.1.9.16.1.7", "dVCSRequestData"},
-	{"1.2.840.113549.1.9.16.1.8", "dVCSResponseData"},
-	{"1.2.840.113549.1.9.16.1.9", "compressedData"},
-	{"1.2.840.113549.1.9.16.1.10", "scvpCertValRequest"},
-	{"1.2.840.113549.1.9.16.1.11", "scvpCertValResponse"},
-	{"1.2.840.113549.1.9.16.1.12", "scvpValPolRequest"},
-	{"1.2.840.113549.1.9.16.1.13", "scvpValPolResponse"},
-	{"1.2.840.113549.1.9.16.1.14", "attrCertEncAttrs"},
-	{"1.2.840.113549.1.9.16.1.15", "tSReq"},
-	{"1.2.840.113549.1.9.16.1.16", "firmwarePackage"},
-	{"1.2.840.113549.1.9.16.1.17", "firmwareLoadReceipt"},
-	{"1.2.840.113549.1.9.16.1.18", "firmwareLoadError"},
-	{"1.2.840.113549.1.9.16.1.19", "contentCollection"},
-	{"1.2.840.113549.1.9.16.1.20", "contentWithAttrs"},
-	{"1.2.840.113549.1.9.16.1.21", "encKeyWithID"},
-	{"1.2.840.113549.1.9.16.1.22", "encPEPSI"},
-	{"1.2.840.113549.1.9.16.1.23", "authEnvelopedData"},
-	{"1.2.840.113549.1.9.16.1.24", "routeOriginAttest"},
-	{"1.2.840.113549.1.9.16.1.25", "symmetricKeyPackage"},
-	{"1.2.840.113549.1.9.16.1.26", "rpkiManifest"},
-	{"1.2.840.113549.1.9.16.1.27", "asciiTextWithCRLF"},
-	{"1.2.840.113549.1.9.16.1.28", "xml"},
-	{"1.2.840.113549.1.9.16.1.29", "pdf"},
-	{"1.2.840.113549.1.9.16.1.30", "postscript"},
-	{"1.2.840.113549.1.9.16.1.31", "timestampedData"},
-	{"1.2.840.113549.1.9.16.1.32", "asAdjacencyAttest"},
-	{"1.2.840.113549.1.9.16.1.33", "rpkiTrustAnchor"},
-	{"1.2.840.113549.1.9.16.1.34", "trustAnchorList"},
-	{"1.2.840.113549.1.9.16.2", "authenticatedAttributes"},
-	{"1.2.840.113549.1.9.16.2.1", "receiptRequest"},
-	{"1.2.840.113549.1.9.16.2.2", "securityLabel"},
-	{"1.2.840.113549.1.9.16.2.3", "mlExpandHistory"},
-	{"1.2.840.113549.1.9.16.2.4", "contentHint"},
-	{"1.2.840.113549.1.9.16.2.5", "msgSigDigest"},
-	{"1.2.840.113549.1.9.16.2.6", "encapContentType"},
-	{"1.2.840.113549.1.9.16.2.7", "contentIdentifier"},
-	{"1.2.840.113549.1.9.16.2.8", "macValue"},
-	{"1.2.840.113549.1.9.16.2.9", "equivalentLabels"},
-	{"1.2.840.113549.1.9.16.2.10", "contentReference"},
-	{"1.2.840.113549.1.9.16.2.11", "encrypKeyPref"},
-	{"1.2.840.113549.1.9.16.2.12", "signingCertificate"},
-	{"1.2.840.113549.1.9.16.2.13", "smimeEncryptCerts"},
-	{"1.2.840.113549.1.9.16.2.14", "timeStampToken"},
-	{"1.2.840.113549.1.9.16.2.15", "sigPolicyId"},
-	{"1.2.840.113549.1.9.16.2.16", "commitmentType"},
-	{"1.2.840.113549.1.9.16.2.17", "signerLocation"},
-	{"1.2.840.113549.1.9.16.2.18", "signerAttr"},
-	{"1.2.840.113549.1.9.16.2.19", "otherSigCert"},
-	{"1.2.840.113549.1.9.16.2.20", "contentTimestamp"},
-	{"1.2.840.113549.1.9.16.2.21", "certificateRefs"},
-	{"1.2.840.113549.1.9.16.2.22", "revocationRefs"},
-	{"1.2.840.113549.1.9.16.2.23", "certValues"},
-	{"1.2.840.113549.1.9.16.2.24", "revocationValues"},
-	{"1.2.840.113549.1.9.16.2.25", "escTimeStamp"},
-	{"1.2.840.113549.1.9.16.2.26", "certCRLTimestamp"},
-	{"1.2.840.113549.1.9.16.2.27", "archiveTimeStamp"},
-	{"1.2.840.113549.1.9.16.2.28", "signatureType"},
-	{"1.2.840.113549.1.9.16.2.29", "dvcsDvc"},
-	{"1.2.840.113549.1.9.16.2.30", "cekReference"},
-	{"1.2.840.113549.1.9.16.2.31", "maxCEKDecrypts"},
-	{"1.2.840.113549.1.9.16.2.32", "kekDerivationAlg"},
-	{"1.2.840.113549.1.9.16.2.33", "intendedRecipients"},
-	{"1.2.840.113549.1.9.16.2.34", "cmcUnsignedData"},
-	{"1.2.840.113549.1.9.16.2.35", "fwPackageID"},
-	{"1.2.840.113549.1.9.16.2.36", "fwTargetHardwareIDs"},
-	{"1.2.840.113549.1.9.16.2.37", "fwDecryptKeyID"},
-	{"1.2.840.113549.1.9.16.2.38", "fwImplCryptAlgs"},
-	{"1.2.840.113549.1.9.16.2.39", "fwWrappedFirmwareKey"},
-	{"1.2.840.113549.1.9.16.2.40", "fwCommunityIdentifiers"},
-	{"1.2.840.113549.1.9.16.2.41", "fwPkgMessageDigest"},
-	{"1.2.840.113549.1.9.16.2.42", "fwPackageInfo"},
-	{"1.2.840.113549.1.9.16.2.43", "fwImplCompressAlgs"},
-	{"1.2.840.113549.1.9.16.2.44", "etsAttrCertificateRefs"},
-	{"1.2.840.113549.1.9.16.2.45", "etsAttrRevocationRefs"},
-	{"1.2.840.113549.1.9.16.2.46", "binarySigningTime"},
-	{"1.2.840.113549.1.9.16.2.47", "signingCertificateV2"},
-	{"1.2.840.113549.1.9.16.2.48", "etsArchiveTimeStampV2"},
-	{"1.2.840.113549.1.9.16.2.49", "erInternal"},
-	{"1.2.840.113549.1.9.16.2.50", "erExternal"},
-	{"1.2.840.113549.1.9.16.2.51", "multipleSignatures"},
-	{"1.2.840.113549.1.9.16.3.1", "esDHwith3DES"},
-	{"1.2.840.113549.1.9.16.3.2", "esDHwithRC2"},
-	{"1.2.840.113549.1.9.16.3.3", "3desWrap"},
-	{"1.2.840.113549.1.9.16.3.4", "rc2Wrap"},
-	{"1.2.840.113549.1.9.16.3.5", "esDH"},
-	{"1.2.840.113549.1.9.16.3.6", "cms3DESwrap"},
-	{"1.2.840.113549.1.9.16.3.7", "cmsRC2wrap"},
-	{"1.2.840.113549.1.9.16.3.8", "zlib"},
-	{"1.2.840.113549.1.9.16.3.9", "pwriKEK"},
-	{"1.2.840.113549.1.9.16.3.10", "ssDH"},
-	{"1.2.840.113549.1.9.16.3.11", "hmacWith3DESwrap"},
-	{"1.2.840.113549.1.9.16.3.12", "hmacWithAESwrap"},
-	{"1.2.840.113549.1.9.16.3.13", "md5XorExperiment"},
-	{"1.2.840.113549.1.9.16.3.14", "rsaKEM"},
-	{"1.2.840.113549.1.9.16.3.15", "authEnc128"},
-	{"1.2.840.113549.1.9.16.3.16", "authEnc256"},
-	{"1.2.840.113549.1.9.16.4.1", "certDist-ldap"},
-	{"1.2.840.113549.1.9.16.5.1", "sigPolicyQualifier-spuri.x"},
-	{"1.2.840.113549.1.9.16.5.2", "sigPolicyQualifier-spUserNotice"},
-	{"1.2.840.113549.1.9.16.6.1", "proofOfOrigin"},
-	{"1.2.840.113549.1.9.16.6.2", "proofOfReceipt"},
-	{"1.2.840.113549.1.9.16.6.3", "proofOfDelivery"},
-	{"1.2.840.113549.1.9.16.6.4", "proofOfSender"},
-	{"1.2.840.113549.1.9.16.6.5", "proofOfApproval"},
-	{"1.2.840.113549.1.9.16.6.6", "proofOfCreation"},
-	{"1.2.840.113549.1.9.16.8.1", "glUseKEK"},
-	{"1.2.840.113549.1.9.16.8.2", "glDelete"},
-	{"1.2.840.113549.1.9.16.8.3", "glAddMember"},
-	{"1.2.840.113549.1.9.16.8.4", "glDeleteMember"},
-	{"1.2.840.113549.1.9.16.8.5", "glRekey"},
-	{"1.2.840.113549.1.9.16.8.6", "glAddOwner"},
-	{"1.2.840.113549.1.9.16.8.7", "glRemoveOwner"},
-	{"1.2.840.113549.1.9.16.8.8", "glkCompromise"},
-	{"1.2.840.113549.1.9.16.8.9", "glkRefresh"},
-	{"1.2.840.113549.1.9.16.8.10", "glFailInfo"},
-	{"1.2.840.113549.1.9.16.8.11", "glaQueryRequest"},
-	{"1.2.840.113549.1.9.16.8.12", "glaQueryResponse"},
-	{"1.2.840.113549.1.9.16.8.13", "glProvideCert"},
-	{"1.2.840.113549.1.9.16.8.14", "glUpdateCert"},
-	{"1.2.840.113549.1.9.16.8.15", "glKey"},
-	{"1.2.840.113549.1.9.16.9", "signatureTypeIdentifier"},
-	{"1.2.840.113549.1.9.16.9.1", "originatorSig"},
-	{"1.2.840.113549.1.9.16.9.2", "domainSig"},
-	{"1.2.840.113549.1.9.16.9.3", "additionalAttributesSig"},
-	{"1.2.840.113549.1.9.16.9.4", "reviewSig"},
-	{"1.2.840.113549.1.9.16.11", "capabilities"},
-	{"1.2.840.113549.1.9.16.11.1", "preferBinaryInside"},
-	{"1.2.840.113549.1.9.20", "friendlyName.(for.PKCS.#12)"},
-	{"1.2.840.113549.1.9.21", "localKeyID.(for.PKCS.#12)"},
-	{"1.2.840.113549.1.9.22", "certTypes.(for.PKCS.#12)"},
-	{"1.2.840.113549.1.9.22.1", "x509Certificate.(for.PKCS.#12)"},
-	{"1.2.840.113549.1.9.22.2", "sdsiCertificate.(for.PKCS.#12)"},
-	{"1.2.840.113549.1.9.23", "crlTypes.(for.PKCS.#12)"},
-	{"1.2.840.113549.1.9.23.1", "x509Crl.(for.PKCS.#12)"},
-	{"1.2.840.113549.1.9.24", "pkcs9objectClass"},
-	{"1.2.840.113549.1.9.25", "pkcs9attributes"},
-	{"1.2.840.113549.1.9.25.1", "pkcs15Token"},
-	{"1.2.840.113549.1.9.25.2", "encryptedPrivateKeyInfo"},
-	{"1.2.840.113549.1.9.25.3", "randomNonce"},
-	{"1.2.840.113549.1.9.25.4", "sequenceNumber"},
-	{"1.2.840.113549.1.9.25.5", "pkcs7PDU"},
-	{"1.2.840.113549.1.9.26", "pkcs9syntax"},
-	{"1.2.840.113549.1.9.27", "pkcs9matchingRules"},
-	{"1.2.840.113549.1.12", "pkcs-12"},
-	{"1.2.840.113549.1.12.1", "pkcs-12-PbeIds"},
-	{"1.2.840.113549.1.12.1.1", "pbeWithSHAAnd128BitRC4"},
-	{"1.2.840.113549.1.12.1.2", "pbeWithSHAAnd40BitRC4"},
-	{"1.2.840.113549.1.12.1.3", "pbeWithSHAAnd3-KeyTripleDES-CBC"},
-	{"1.2.840.113549.1.12.1.4", "pbeWithSHAAnd2-KeyTripleDES-CBC"},
-	{"1.2.840.113549.1.12.1.5", "pbeWithSHAAnd128BitRC2-CBC"},
-	{"1.2.840.113549.1.12.1.6", "pbeWithSHAAnd40BitRC2-CBC"},
-	{"1.2.840.113549.1.12.2", "pkcs-12-ESPVKID"},
-	{"1.2.840.113549.1.12.2.1", "pkcs-12-PKCS8KeyShrouding"},
-	{"1.2.840.113549.1.12.3", "pkcs-12-BagIds"},
-	{"1.2.840.113549.1.12.3.1", "pkcs-12-keyBagId"},
-	{"1.2.840.113549.1.12.3.2", "pkcs-12-certAndCRLBagId"},
-	{"1.2.840.113549.1.12.3.3", "pkcs-12-secretBagId"},
-	{"1.2.840.113549.1.12.3.4", "pkcs-12-safeContentsId"},
-	{"1.2.840.113549.1.12.3.5", "pkcs-12-pkcs-8ShroudedKeyBagId"},
-	{"1.2.840.113549.1.12.4", "pkcs-12-CertBagID"},
-	{"1.2.840.113549.1.12.4.1", "pkcs-12-X509CertCRLBagID"},
-	{"1.2.840.113549.1.12.4.2", "pkcs-12-SDSICertBagID"},
-	{"1.2.840.113549.1.12.5", "pkcs-12-OID"},
-	{"1.2.840.113549.1.12.5.1", "pkcs-12-PBEID"},
-	{"1.2.840.113549.1.12.5.1.1", "pkcs-12-PBEWithSha1And128BitRC4"},
-	{"1.2.840.113549.1.12.5.1.2", "pkcs-12-PBEWithSha1And40BitRC4"},
-	{"1.2.840.113549.1.12.5.1.3", "pkcs-12-PBEWithSha1AndTripleDESCBC"},
-	{"1.2.840.113549.1.12.5.1.4", "pkcs-12-PBEWithSha1And128BitRC2CBC"},
-	{"1.2.840.113549.1.12.5.1.5", "pkcs-12-PBEWithSha1And40BitRC2CBC"},
-	{"1.2.840.113549.1.12.5.1.6", "pkcs-12-PBEWithSha1AndRC4"},
-	{"1.2.840.113549.1.12.5.1.7", "pkcs-12-PBEWithSha1AndRC2CBC"},
-	{"1.2.840.113549.1.12.5.2", "pkcs-12-EnvelopingID"},
-	{"1.2.840.113549.1.12.5.2.1", "pkcs-12-RSAEncryptionWith128BitRC4"},
-	{"1.2.840.113549.1.12.5.2.2", "pkcs-12-RSAEncryptionWith40BitRC4"},
-	{"1.2.840.113549.1.12.5.2.3", "pkcs-12-RSAEncryptionWithTripleDES"},
-	{"1.2.840.113549.1.12.5.3", "pkcs-12-SignatureID"},
-	{"1.2.840.113549.1.12.5.3.1", "pkcs-12-RSASignatureWithSHA1Digest"},
-	{"1.2.840.113549.1.12.10", "pkcs-12Version1"},
-	{"1.2.840.113549.1.12.10.1", "pkcs-12BadIds"},
-	{"1.2.840.113549.1.12.10.1.1", "pkcs-12-keyBag"},
-	{"1.2.840.113549.1.12.10.1.2", "pkcs-12-pkcs-8ShroudedKeyBag"},
-	{"1.2.840.113549.1.12.10.1.3", "pkcs-12-certBag"},
-	{"1.2.840.113549.1.12.10.1.4", "pkcs-12-crlBag"},
-	{"1.2.840.113549.1.12.10.1.5", "pkcs-12-secretBag"},
-	{"1.2.840.113549.1.12.10.1.6", "pkcs-12-safeContentsBag"},
-	{"1.2.840.113549.1.15.1", "pkcs15modules"},
-	{"1.2.840.113549.1.15.2", "pkcs15attributes"},
-	{"1.2.840.113549.1.15.3", "pkcs15contentType"},
-	{"1.2.840.113549.1.15.3.1", "pkcs15content"},
-	{"1.2.840.113549.2", "digestAlgorithm"},
-	{"1.2.840.113549.2.2", "md2"},
-	{"1.2.840.113549.2.4", "md4"},
-	{"1.2.840.113549.2.5", "md5"},
-	{"1.2.840.113549.2.7", "hmacWithSHA1"},
-	{"1.2.840.113549.2.8", "hmacWithSHA224"},
-	{"1.2.840.113549.2.9", "hmacWithSHA256"},
-	{"1.2.840.113549.2.10", "hmacWithSHA384"},
-	{"1.2.840.113549.2.11", "hmacWithSHA512"},
-	{"1.2.840.113549.3", "encryptionAlgorithm"},
-	{"1.2.840.113549.3.2", "rc2CBC"},
-	{"1.2.840.113549.3.3", "rc2ECB"},
-	{"1.2.840.113549.3.4", "rc4"},
-	{"1.2.840.113549.3.5", "rc4WithMAC"},
-	{"1.2.840.113549.3.6", "desx-CBC"},
-	{"1.2.840.113549.3.7", "des-EDE3-CBC"},
-	{"1.2.840.113549.3.8", "rc5CBC"},
-	{"1.2.840.113549.3.9", "rc5-CBCPad"},
-	{"1.2.840.113549.3.10", "desCDMF"},
-	{"1.2.840.114021.1.6.1", "Identrus.unknown.policyIdentifier"},
-	{"1.2.840.114021.4.1", "identrusOCSP"},
-	{"1.2.840.113556.1.2.241", "deliveryMechanism"},
-	{"1.2.840.113556.1.2.281", "ntSecurityDescriptor"},
-	{"1.2.840.113556.1.3.0", "site-Addressing"},
-	{"1.2.840.113556.1.3.13", "classSchema"},
-	{"1.2.840.113556.1.3.14", "attributeSchema"},
-	{"1.2.840.113556.1.3.17", "mailbox-Agent"},
-	{"1.2.840.113556.1.3.22", "mailbox"},
-	{"1.2.840.113556.1.3.23", "container"},
-	{"1.2.840.113556.1.3.46", "mailRecipient"},
-	{"1.2.840.113556.1.4.145", "revision"},
-	{"1.2.840.113556.1.4.1327", "pKIDefaultKeySpec"},
-	{"1.2.840.113556.1.4.1328", "pKIKeyUsage"},
-	{"1.2.840.113556.1.4.1329", "pKIMaxIssuingDepth"},
-	{"1.2.840.113556.1.4.1330", "pKICriticalExtensions"},
-	{"1.2.840.113556.1.4.1331", "pKIExpirationPeriod"},
-	{"1.2.840.113556.1.4.1332", "pKIOverlapPeriod"},
-	{"1.2.840.113556.1.4.1333", "pKIExtendedKeyUsage"},
-	{"1.2.840.113556.1.4.1334", "pKIDefaultCSPs"},
-	{"1.2.840.113556.1.4.1335", "pKIEnrollmentAccess"},
-	{"1.2.840.113556.1.4.1429", "msPKI-RA-Signature"},
-	{"1.2.840.113556.1.4.1430", "msPKI-Enrollment-Flag"},
-	{"1.2.840.113556.1.4.1431", "msPKI-Private-Key-Flag"},
-	{"1.2.840.113556.1.4.1432", "msPKI-Certificate-Name-Flag"},
-	{"1.2.840.113556.1.4.1433", "msPKI-Minimal-Key-Size"},
-	{"1.2.840.113556.1.4.1434", "msPKI-Template-Schema-Version"},
-	{"1.2.840.113556.1.4.1435", "msPKI-Template-Minor-Revision"},
-	{"1.2.840.113556.1.4.1436", "msPKI-Cert-Template-OID"},
-	{"1.2.840.113556.1.4.1437", "msPKI-Supersede-Templates"},
-	{"1.2.840.113556.1.4.1438", "msPKI-RA-Policies"},
-	{"1.2.840.113556.1.4.1439", "msPKI-Certificate-Policy"},
-	{"1.2.840.113556.1.4.1674", "msPKI-Certificate-Application-Policy"},
-	{"1.2.840.113556.1.4.1675", "msPKI-RA-Application-Policies"},
-	{"1.2.840.113556.4.3", "microsoftExcel"},
-	{"1.2.840.113556.4.4", "titledWithOID"},
-	{"1.2.840.113556.4.5", "microsoftPowerPoint"},
-	{"1.2.840.113583.1", "adobeAcrobat"},
-	{"1.2.840.113583.1.1", "acrobatSecurity"},
-	{"1.2.840.113583.1.1.1", "pdfPassword"},
-	{"1.2.840.113583.1.1.2", "pdfDefaultSigningCredential"},
-	{"1.2.840.113583.1.1.3", "pdfDefaultEncryptionCredential"},
-	{"1.2.840.113583.1.1.4", "pdfPasswordTimeout"},
-	{"1.2.840.113583.1.1.5", "pdfAuthenticDocumentsTrust"},
-	{"1.2.840.113583.1.1.6", "pdfDynamicContentTrust"},
-	{"1.2.840.113583.1.1.7", "pdfUbiquityTrust"},
-	{"1.2.840.113583.1.1.8", "pdfRevocationInfoArchival"},
-	{"1.2.840.113583.1.1.9", "pdfX509Extension"},
-	{"1.2.840.113583.1.1.9.1", "pdfTimeStamp"},
-	{"1.2.840.113583.1.1.9.2", "pdfArchiveRevInfo"},
-	{"1.2.840.113583.1.1.10", "pdfPPLKLiteCredential"},
-	{"1.2.840.113583.1.2.", "acrobatCPS"},
-	{"1.2.840.113583.1.2.1", "pdfAuthenticDocumentsCPS"},
-	{"1.2.840.113583.1.2.2", "pdfTestCPS"},
-	{"1.2.840.113583.1.2.3", "pdfUbiquityCPS"},
-	{"1.2.840.113583.1.2.4", "pdfAdhocCPS"},
-	{"1.2.840.113583.1.7", "acrobatUbiquity"},
-	{"1.2.840.113583.1.7.1", "pdfUbiquitySubRights"},
-	{"1.2.840.113583.1.9", "acrobatExtension"},
-	{"1.2.840.113628.114.1.7", "adobePKCS7"},
-	{"1.2.840.113635.100", "appleDataSecurity"},
-	{"1.2.840.113635.100.1", "appleTrustPolicy"},
-	{"1.2.840.113635.100.1.1", "appleISignTP"},
-	{"1.2.840.113635.100.1.2", "appleX509Basic"},
-	{"1.2.840.113635.100.1.3", "appleSSLPolicy"},
-	{"1.2.840.113635.100.1.4", "appleLocalCertGenPolicy"},
-	{"1.2.840.113635.100.1.5", "appleCSRGenPolicy"},
-	{"1.2.840.113635.100.1.6", "appleCRLPolicy"},
-	{"1.2.840.113635.100.1.7", "appleOCSPPolicy"},
-	{"1.2.840.113635.100.1.8", "appleSMIMEPolicy"},
-	{"1.2.840.113635.100.1.9", "appleEAPPolicy"},
-	{"1.2.840.113635.100.1.10", "appleSWUpdateSigningPolicy"},
-	{"1.2.840.113635.100.1.11", "appleIPSecPolicy"},
-	{"1.2.840.113635.100.1.12", "appleIChatPolicy"},
-	{"1.2.840.113635.100.1.13", "appleResourceSignPolicy"},
-	{"1.2.840.113635.100.1.14", "applePKINITClientPolicy"},
-	{"1.2.840.113635.100.1.15", "applePKINITServerPolicy"},
-	{"1.2.840.113635.100.1.16", "appleCodeSigningPolicy"},
-	{"1.2.840.113635.100.1.17", "applePackageSigningPolicy"},
-	{"1.2.840.113635.100.2", "appleSecurityAlgorithm"},
-	{"1.2.840.113635.100.2.1", "appleFEE"},
-	{"1.2.840.113635.100.2.2", "appleASC"},
-	{"1.2.840.113635.100.2.3", "appleFEE_MD5"},
-	{"1.2.840.113635.100.2.4", "appleFEE_SHA1"},
-	{"1.2.840.113635.100.2.5", "appleFEED"},
-	{"1.2.840.113635.100.2.6", "appleFEEDEXP"},
-	{"1.2.840.113635.100.2.7", "appleECDSA"},
-	{"1.2.840.113635.100.3", "appleDotMacCertificate"},
-	{"1.2.840.113635.100.3.1", "appleDotMacCertificateRequest"},
-	{"1.2.840.113635.100.3.2", "appleDotMacCertificateExtension"},
-	{"1.2.840.113635.100.3.3", "appleDotMacCertificateRequestValues"},
-	{"1.2.840.113635.100.4", "appleExtendedKeyUsage"},
-	{"1.2.840.113635.100.4.1", "appleCodeSigning"},
-	{"1.2.840.113635.100.4.1.1", "appleCodeSigningDevelopment"},
-	{"1.2.840.113635.100.4.1.2", "appleSoftwareUpdateSigning"},
-	{"1.2.840.113635.100.4.1.3", "appleCodeSigningThirdParty"},
-	{"1.2.840.113635.100.4.1.4", "appleResourceSigning"},
-	{"1.2.840.113635.100.4.2", "appleIChatSigning"},
-	{"1.2.840.113635.100.4.3", "appleIChatEncryption"},
-	{"1.2.840.113635.100.4.4", "appleSystemIdentity"},
-	{"1.2.840.113635.100.4.5", "appleCryptoEnv"},
-	{"1.2.840.113635.100.4.5.1", "appleCryptoProductionEnv"},
-	{"1.2.840.113635.100.4.5.2", "appleCryptoMaintenanceEnv"},
-	{"1.2.840.113635.100.4.5.3", "appleCryptoTestEnv"},
-	{"1.2.840.113635.100.4.5.4", "appleCryptoDevelopmentEnv"},
-	{"1.2.840.113635.100.4.6", "appleCryptoQoS"},
-	{"1.2.840.113635.100.4.6.1", "appleCryptoTier0QoS"},
-	{"1.2.840.113635.100.4.6.2", "appleCryptoTier1QoS"},
-	{"1.2.840.113635.100.4.6.3", "appleCryptoTier2QoS"},
-	{"1.2.840.113635.100.4.6.4", "appleCryptoTier3QoS"},
-	{"1.2.840.113635.100.5", "appleCertificatePolicies"},
-	{"1.2.840.113635.100.5.1", "appleCertificatePolicyID"},
-	{"1.2.840.113635.100.5.2", "appleDotMacCertificatePolicyID"},
-	{"1.2.840.113635.100.5.3", "appleADCCertificatePolicyID"},
-	{"1.2.840.113635.100.6", "appleCertificateExtensions"},
-	{"1.2.840.113635.100.6.1", "appleCertificateExtensionCodeSigning"},
-	{"1.2.840.113635.100.6.1.1", "appleCertificateExtensionAppleSigning"},
-	{"1.2.840.113635.100.6.1.2", "appleCertificateExtensionADCDeveloperSigning"},
-	{"1.2.840.113635.100.6.1.3", "appleCertificateExtensionADCAppleSigning"},
-	{"1.3.6.1.4.1.311.2.1.4", "spcIndirectDataContext"},
-	{"1.3.6.1.4.1.311.2.1.10", "spcAgencyInfo"},
-	{"1.3.6.1.4.1.311.2.1.11", "spcStatementType"},
-	{"1.3.6.1.4.1.311.2.1.12", "spcSpOpusInfo"},
-	{"1.3.6.1.4.1.311.2.1.14", "certReqExtensions"},
-	{"1.3.6.1.4.1.311.2.1.15", "spcPEImageData"},
-	{"1.3.6.1.4.1.311.2.1.18", "spcRawFileData"},
-	{"1.3.6.1.4.1.311.2.1.19", "spcStructuredStorageData"},
-	{"1.3.6.1.4.1.311.2.1.20", "spcJavaClassData.(type.1)"},
-	{"1.3.6.1.4.1.311.2.1.21", "individualCodeSigning"},
-	{"1.3.6.1.4.1.311.2.1.22", "commercialCodeSigning"},
-	{"1.3.6.1.4.1.311.2.1.25", "spcLink.(type.2)"},
-	{"1.3.6.1.4.1.311.2.1.26", "spcMinimalCriteriaInfo"},
-	{"1.3.6.1.4.1.311.2.1.27", "spcFinancialCriteriaInfo"},
-	{"1.3.6.1.4.1.311.2.1.28", "spcLink.(type.3)"},
-	{"1.3.6.1.4.1.311.2.1.29", "spcHashInfoObjID"},
-	{"1.3.6.1.4.1.311.2.1.30", "spcSipInfoObjID"},
-	{"1.3.6.1.4.1.311.2.2", "ctl"},
-	{"1.3.6.1.4.1.311.2.2.1", "ctlTrustedCodesigningCAList"},
-	{"1.3.6.1.4.1.311.2.2.2", "ctlTrustedClientAuthCAList"},
-	{"1.3.6.1.4.1.311.2.2.3", "ctlTrustedServerAuthCAList"},
-	{"1.3.6.1.4.1.311.3.2.1", "timestampRequest"},
-	{"1.3.6.1.4.1.311.3.3.1", "spcRFC3161"},
-	{"1.3.6.1.4.1.311.10.1", "certTrustList"},
-	{"1.3.6.1.4.1.311.10.1.1", "sortedCtl"},
-	{"1.3.6.1.4.1.311.10.2", "nextUpdateLocation"},
-	{"1.3.6.1.4.1.311.10.3.1", "certTrustListSigning"},
-	{"1.3.6.1.4.1.311.10.3.2", "timeStampSigning"},
-	{"1.3.6.1.4.1.311.10.3.3", "serverGatedCrypto"},
-	{"1.3.6.1.4.1.311.10.3.3.1", "serialized"},
-	{"1.3.6.1.4.1.311.10.3.4", "encryptedFileSystem"},
-	{"1.3.6.1.4.1.311.10.3.5", "whqlCrypto"},
-	{"1.3.6.1.4.1.311.10.3.6", "nt5Crypto"},
-	{"1.3.6.1.4.1.311.10.3.7", "oemWHQLCrypto"},
-	{"1.3.6.1.4.1.311.10.3.8", "embeddedNTCrypto"},
-	{"1.3.6.1.4.1.311.10.3.9", "rootListSigner"},
-	{"1.3.6.1.4.1.311.10.3.10", "qualifiedSubordination"},
-	{"1.3.6.1.4.1.311.10.3.11", "keyRecovery"},
-	{"1.3.6.1.4.1.311.10.3.12", "documentSigning"},
-	{"1.3.6.1.4.1.311.10.3.13", "lifetimeSigning"},
-	{"1.3.6.1.4.1.311.10.3.14", "mobileDeviceSoftware"},
-	{"1.3.6.1.4.1.311.10.3.15", "smartDisplay"},
-	{"1.3.6.1.4.1.311.10.3.16", "cspSignature"},
-	{"1.3.6.1.4.1.311.10.3.4.1", "efsRecovery"},
-	{"1.3.6.1.4.1.311.10.4.1", "yesnoTrustAttr"},
-	{"1.3.6.1.4.1.311.10.5.1", "drm"},
-	{"1.3.6.1.4.1.311.10.5.2", "drmIndividualization"},
-	{"1.3.6.1.4.1.311.10.6.1", "licenses"},
-	{"1.3.6.1.4.1.311.10.6.2", "licenseServer"},
-	{"1.3.6.1.4.1.311.10.7.1", "keyidRdn"},
-	{"1.3.6.1.4.1.311.10.8.1", "removeCertificate"},
-	{"1.3.6.1.4.1.311.10.9.1", "crossCertDistPoints"},
-	{"1.3.6.1.4.1.311.10.10.1", "cmcAddAttributes"},
-	{"1.3.6.1.4.1.311.10.11", "certPropIdPrefix"},
-	{"1.3.6.1.4.1.311.10.11.4", "certMd5HashPropId"},
-	{"1.3.6.1.4.1.311.10.11.20", "certKeyIdentifierPropId"},
-	{"1.3.6.1.4.1.311.10.11.28", "certIssuerSerialNumberMd5HashPropId"},
-	{"1.3.6.1.4.1.311.10.11.29", "certSubjectNameMd5HashPropId"},
-	{"1.3.6.1.4.1.311.10.12.1", "anyApplicationPolicy"},
-	{"1.3.6.1.4.1.311.12", "catalog"},
-	{"1.3.6.1.4.1.311.12.1.1", "catalogList"},
-	{"1.3.6.1.4.1.311.12.1.2", "catalogListMember"},
-	{"1.3.6.1.4.1.311.12.2.1", "catalogNameValueObjID"},
-	{"1.3.6.1.4.1.311.12.2.2", "catalogMemberInfoObjID"},
-	{"1.3.6.1.4.1.311.13.1", "renewalCertificate"},
-	{"1.3.6.1.4.1.311.13.2.1", "enrolmentNameValuePair"},
-	{"1.3.6.1.4.1.311.13.2.2", "enrolmentCSP"},
-	{"1.3.6.1.4.1.311.13.2.3", "osVersion"},
-	{"1.3.6.1.4.1.311.16.4", "microsoftRecipientInfo"},
-	{"1.3.6.1.4.1.311.17.1", "pkcs12KeyProviderNameAttr"},
-	{"1.3.6.1.4.1.311.17.2", "localMachineKeyset"},
-	{"1.3.6.1.4.1.311.17.3", "pkcs12ExtendedAttributes"},
-	{"1.3.6.1.4.1.311.20.1", "autoEnrollCtlUsage"},
-	{"1.3.6.1.4.1.311.20.2", "enrollCerttypeExtension"},
-	{"1.3.6.1.4.1.311.20.2.1", "enrollmentAgent"},
-	{"1.3.6.1.4.1.311.20.2.2", "smartcardLogon"},
-	{"1.3.6.1.4.1.311.20.2.3", "universalPrincipalName"},
-	{"1.3.6.1.4.1.311.20.3", "certManifold"},
-	{"1.3.6.1.4.1.311.21.1", "cAKeyCertIndexPair"},
-	{"1.3.6.1.4.1.311.21.2", "certSrvPreviousCertHash"},
-	{"1.3.6.1.4.1.311.21.3", "crlVirtualBase"},
-	{"1.3.6.1.4.1.311.21.4", "crlNextPublish"},
-	{"1.3.6.1.4.1.311.21.5", "caExchange"},
-	{"1.3.6.1.4.1.311.21.6", "keyRecovery"},
-	{"1.3.6.1.4.1.311.21.7", "certificateTemplate"},
-	{"1.3.6.1.4.1.311.21.9", "rdnDummySigner"},
-	{"1.3.6.1.4.1.311.21.10", "applicationCertPolicies"},
-	{"1.3.6.1.4.1.311.21.11", "applicationPolicyMappings"},
-	{"1.3.6.1.4.1.311.21.12", "applicationPolicyConstraints"},
-	{"1.3.6.1.4.1.311.21.13", "archivedKey"},
-	{"1.3.6.1.4.1.311.21.14", "crlSelfCDP"},
-	{"1.3.6.1.4.1.311.21.15", "requireCertChainPolicy"},
-	{"1.3.6.1.4.1.311.21.16", "archivedKeyCertHash"},
-	{"1.3.6.1.4.1.311.21.17", "issuedCertHash"},
-	{"1.3.6.1.4.1.311.21.19", "dsEmailReplication"},
-	{"1.3.6.1.4.1.311.21.20", "requestClientInfo"},
-	{"1.3.6.1.4.1.311.21.21", "encryptedKeyHash"},
-	{"1.3.6.1.4.1.311.21.22", "certsrvCrossCaVersion"},
-	{"1.3.6.1.4.1.311.25.1", "ntdsReplication"},
-	{"1.3.6.1.4.1.311.31.1", "productUpdate"},
-	{"1.3.6.1.4.1.311.47.1.1", "systemHealth"},
-	{"1.3.6.1.4.1.311.47.1.3", "systemHealthLoophole"},
-	{"1.3.6.1.4.1.311.60.1.1", "rootProgramFlags"},
-	{"1.3.6.1.4.1.311.61.1.1", "kernelModeCodeSigning"},
-	{"1.3.6.1.4.1.311.60.2.1.1", "jurisdictionOfIncorporationL"},
-	{"1.3.6.1.4.1.311.60.2.1.2", "jurisdictionOfIncorporationSP"},
-	{"1.3.6.1.4.1.311.60.2.1.3", "jurisdictionOfIncorporationC"},
-	{"1.3.6.1.4.1.311.88", "capiCom"},
-	{"1.3.6.1.4.1.311.88.1", "capiComVersion"},
-	{"1.3.6.1.4.1.311.88.2", "capiComAttribute"},
-	{"1.3.6.1.4.1.311.88.2.1", "capiComDocumentName"},
-	{"1.3.6.1.4.1.311.88.2.2", "capiComDocumentDescription"},
-	{"1.3.6.1.4.1.311.88.3", "capiComEncryptedData"},
-	{"1.3.6.1.4.1.311.88.3.1", "capiComEncryptedContent"},
-	{"1.3.6.1.4.1.188.7.1.1", "ascom"},
-	{"1.3.6.1.4.1.188.7.1.1.1", "ideaECB"},
-	{"1.3.6.1.4.1.188.7.1.1.2", "ideaCBC"},
-	{"1.3.6.1.4.1.188.7.1.1.3", "ideaCFB"},
-	{"1.3.6.1.4.1.188.7.1.1.4", "ideaOFB"},
-	{"1.3.6.1.4.1.2428.10.1.1", "UNINETT.policyIdentifier"},
-	{"1.3.6.1.4.1.2712.10", "ICE-TEL.policyIdentifier"},
-	{"1.3.6.1.4.1.2786.1.1.1", "ICE-TEL.Italian.policyIdentifier"},
-	{"1.3.6.1.4.1.3029.1.1.1", "blowfishECB"},
-	{"1.3.6.1.4.1.3029.1.1.2", "blowfishCBC"},
-	{"1.3.6.1.4.1.3029.1.1.3", "blowfishCFB"},
-	{"1.3.6.1.4.1.3029.1.1.4", "blowfishOFB"},
-	{"1.3.6.1.4.1.3029.1.2.1", "elgamal"},
-	{"1.3.6.1.4.1.3029.1.2.1.1", "elgamalWithSHA-1"},
-	{"1.3.6.1.4.1.3029.1.2.1.2", "elgamalWithRIPEMD-160"},
-	{"1.3.6.1.4.1.3029.3.1.1", "cryptlibPresenceCheck"},
-	{"1.3.6.1.4.1.3029.3.1.2", "pkiBoot"},
-	{"1.3.6.1.4.1.3029.3.1.4", "crlExtReason"},
-	{"1.3.6.1.4.1.3029.3.1.5", "keyFeatures"},
-	{"1.3.6.1.4.1.3029.4.1", "cryptlibContent"},
-	{"1.3.6.1.4.1.3029.4.1.1", "cryptlibConfigData"},
-	{"1.3.6.1.4.1.3029.4.1.2", "cryptlibUserIndex"},
-	{"1.3.6.1.4.1.3029.4.1.3", "cryptlibUserInfo"},
-	{"1.3.6.1.4.1.3029.4.1.4", "rtcsRequest"},
-	{"1.3.6.1.4.1.3029.4.1.5", "rtcsResponse"},
-	{"1.3.6.1.4.1.3029.4.1.6", "rtcsResponseExt"},
-	{"1.3.6.1.4.1.3029.42.11172.1", "mpeg-1"},
-	{"1.3.6.1.4.1.3029.88.89.90.90.89", "xYZZY.policyIdentifier"},
-	{"1.3.6.1.4.1.3401.8.1.1", "pgpExtension"},
-	{"1.3.6.1.4.1.3576.7", "eciaAscX12Edi"},
-	{"1.3.6.1.4.1.3576.7.1", "plainEDImessage"},
-	{"1.3.6.1.4.1.3576.7.2", "signedEDImessage"},
-	{"1.3.6.1.4.1.3576.7.5", "integrityEDImessage"},
-	{"1.3.6.1.4.1.3576.7.65", "iaReceiptMessage"},
-	{"1.3.6.1.4.1.3576.7.97", "iaStatusMessage"},
-	{"1.3.6.1.4.1.3576.8", "eciaEdifact"},
-	{"1.3.6.1.4.1.3576.9", "eciaNonEdi"},
-	{"1.3.6.1.4.1.4146", "Globalsign"},
-	{"1.3.6.1.4.1.4146.1", "globalsignPolicy"},
-	{"1.3.6.1.4.1.4146.1.10", "globalsignDVPolicy"},
-	{"1.3.6.1.4.1.4146.1.20", "globalsignOVPolicy"},
-	{"1.3.6.1.4.1.4146.1.30", "globalsignTSAPolicy"},
-	{"1.3.6.1.4.1.4146.1.40", "globalsignClientCertPolicy"},
-	{"1.3.6.1.4.1.4146.1.50", "globalsignCodeSignPolicy"},
-	{"1.3.6.1.4.1.4146.1.60", "globalsignRootSignPolicy"},
-	{"1.3.6.1.4.1.4146.1.70", "globalsignTrustedRootPolicy"},
-	{"1.3.6.1.4.1.4146.1.80", "globalsignEDIClientPolicy"},
-	{"1.3.6.1.4.1.4146.1.81", "globalsignEDIServerPolicy"},
-	{"1.3.6.1.4.1.4146.1.90", "globalsignTPMRootPolicy"},
-	{"1.3.6.1.4.1.4146.1.95", "globalsignOCSPPolicy"},
-	{"1.3.6.1.4.1.5309.1", "edelWebPolicy"},
-	{"1.3.6.1.4.1.5309.1.2", "edelWebCustomerPolicy"},
-	{"1.3.6.1.4.1.5309.1.2.1", "edelWebClepsydrePolicy"},
-	{"1.3.6.1.4.1.5309.1.2.2", "edelWebExperimentalTSAPolicy"},
-	{"1.3.6.1.4.1.5309.1.2.3", "edelWebOpenEvidenceTSAPolicy"},
-	{"1.3.6.1.4.1.5472", "timeproof"},
-	{"1.3.6.1.4.1.5472.1", "tss"},
-	{"1.3.6.1.4.1.5472.1.1", "tss80"},
-	{"1.3.6.1.4.1.5472.1.2", "tss380"},
-	{"1.3.6.1.4.1.5472.1.3", "tss400"},
-	{"1.3.6.1.4.1.5770.0.3", "secondaryPractices"},
-	{"1.3.6.1.4.1.5770.0.4", "physicianIdentifiers"},
-	{"1.3.6.1.4.1.6449.1.2.1.3.1", "comodoPolicy"},
-	{"1.3.6.1.4.1.6449.1.2.2.15", "wotrustPolicy"},
-	{"1.3.6.1.4.1.6449.1.3.5.2", "comodoCertifiedDeliveryService"},
-	{"1.3.6.1.4.1.6449.2.1.1", "comodoTimestampingPolicy"},
-	{"1.3.6.1.4.1.8301.3.5.1", "validityModelChain"},
-	{"1.3.6.1.4.1.8301.3.5.2", "validityModelShell"},
-	{"1.3.6.1.4.1.8231.1", "rolUnicoNacional"},
-	{"1.3.6.1.4.1.11591", "gnu"},
-	{"1.3.6.1.4.1.11591.1", "gnuRadius"},
-	{"1.3.6.1.4.1.11591.3", "gnuRadar"},
-	{"1.3.6.1.4.1.11591.12", "gnuDigestAlgorithm"},
-	{"1.3.6.1.4.1.11591.12.2", "tiger"},
-	{"1.3.6.1.4.1.11591.13", "gnuEncryptionAlgorithm"},
-	{"1.3.6.1.4.1.11591.13.2", "serpent"},
-	{"1.3.6.1.4.1.11591.13.2.1", "serpent128_ECB"},
-	{"1.3.6.1.4.1.11591.13.2.2", "serpent128_CBC"},
-	{"1.3.6.1.4.1.11591.13.2.3", "serpent128_OFB"},
-	{"1.3.6.1.4.1.11591.13.2.4", "serpent128_CFB"},
-	{"1.3.6.1.4.1.11591.13.2.21", "serpent192_ECB"},
-	{"1.3.6.1.4.1.11591.13.2.22", "serpent192_CBC"},
-	{"1.3.6.1.4.1.11591.13.2.23", "serpent192_OFB"},
-	{"1.3.6.1.4.1.11591.13.2.24", "serpent192_CFB"},
-	{"1.3.6.1.4.1.11591.13.2.41", "serpent256_ECB"},
-	{"1.3.6.1.4.1.11591.13.2.42", "serpent256_CBC"},
-	{"1.3.6.1.4.1.11591.13.2.43", "serpent256_OFB"},
-	{"1.3.6.1.4.1.11591.13.2.44", "serpent256_CFB"},
-	{"1.3.6.1.4.1.16334.509.1.1", "Northrop.Grumman.extKeyUsage?"},
-	{"1.3.6.1.4.1.16334.509.2.1", "ngcClass1"},
-	{"1.3.6.1.4.1.16334.509.2.2", "ngcClass2"},
-	{"1.3.6.1.4.1.16334.509.2.3", "ngcClass3"},
-	{"1.3.6.1.4.1.23629.1.4.2.1.1", "safenetUsageLimit"},
-	{"1.3.6.1.4.1.23629.1.4.2.1.2", "safenetEndDate"},
-	{"1.3.6.1.4.1.23629.1.4.2.1.3", "safenetStartDate"},
-	{"1.3.6.1.4.1.23629.1.4.2.1.4", "safenetAdminCert"},
-	{"1.3.6.1.4.1.23629.1.4.2.2.1", "safenetKeyDigest"},
-	{"1.3.6.1.5.5.7", "pkix"},
-	{"1.3.6.1.5.5.7.0.12", "attributeCert"},
-	{"1.3.6.1.5.5.7.1", "privateExtension"},
-	{"1.3.6.1.5.5.7.1.1", "authorityInfoAccess"},
-	{"1.3.6.1.5.5.7.1.2", "biometricInfo"},
-	{"1.3.6.1.5.5.7.1.3", "qcStatements"},
-	{"1.3.6.1.5.5.7.1.4", "acAuditIdentity"},
-	{"1.3.6.1.5.5.7.1.5", "acTargeting"},
-	{"1.3.6.1.5.5.7.1.6", "acAaControls"},
-	{"1.3.6.1.5.5.7.1.7", "ipAddrBlocks"},
-	{"1.3.6.1.5.5.7.1.8", "autonomousSysIds"},
-	{"1.3.6.1.5.5.7.1.9", "routerIdentifier"},
-	{"1.3.6.1.5.5.7.1.10", "acProxying"},
-	{"1.3.6.1.5.5.7.1.11", "subjectInfoAccess"},
-	{"1.3.6.1.5.5.7.1.12", "logoType"},
-	{"1.3.6.1.5.5.7.1.13", "wlanSSID"},
-	{"1.3.6.1.5.5.7.2", "policyQualifierIds"},
-	{"1.3.6.1.5.5.7.2.1", "cps"},
-	{"1.3.6.1.5.5.7.2.2", "unotice"},
-	{"1.3.6.1.5.5.7.2.3", "textNotice"},
-	{"1.3.6.1.5.5.7.3", "keyPurpose"},
-	{"1.3.6.1.5.5.7.3.1", "serverAuth"},
-	{"1.3.6.1.5.5.7.3.2", "clientAuth"},
-	{"1.3.6.1.5.5.7.3.3", "codeSigning"},
-	{"1.3.6.1.5.5.7.3.4", "emailProtection"},
-	{"1.3.6.1.5.5.7.3.5", "ipsecEndSystem"},
-	{"1.3.6.1.5.5.7.3.6", "ipsecTunnel"},
-	{"1.3.6.1.5.5.7.3.7", "ipsecUser"},
-	{"1.3.6.1.5.5.7.3.8", "timeStamping"},
-	{"1.3.6.1.5.5.7.3.9", "ocspSigning"},
-	{"1.3.6.1.5.5.7.3.10", "dvcs"},
-	{"1.3.6.1.5.5.7.3.11", "sbgpCertAAServerAuth"},
-	{"1.3.6.1.5.5.7.3.13", "eapOverPPP"},
-	{"1.3.6.1.5.5.7.3.14", "eapOverLAN"},
-	{"1.3.6.1.5.5.7.4", "cmpInformationTypes"},
-	{"1.3.6.1.5.5.7.4.1", "caProtEncCert"},
-	{"1.3.6.1.5.5.7.4.2", "signKeyPairTypes"},
-	{"1.3.6.1.5.5.7.4.3", "encKeyPairTypes"},
-	{"1.3.6.1.5.5.7.4.4", "preferredSymmAlg"},
-	{"1.3.6.1.5.5.7.4.5", "caKeyUpdateInfo"},
-	{"1.3.6.1.5.5.7.4.6", "currentCRL"},
-	{"1.3.6.1.5.5.7.4.7", "unsupportedOIDs"},
-	{"1.3.6.1.5.5.7.4.10", "keyPairParamReq"},
-	{"1.3.6.1.5.5.7.4.11", "keyPairParamRep"},
-	{"1.3.6.1.5.5.7.4.12", "revPassphrase"},
-	{"1.3.6.1.5.5.7.4.13", "implicitConfirm"},
-	{"1.3.6.1.5.5.7.4.14", "confirmWaitTime"},
-	{"1.3.6.1.5.5.7.4.15", "origPKIMessage"},
-	{"1.3.6.1.5.5.7.4.16", "suppLangTags"},
-	{"1.3.6.1.5.5.7.5", "crmfRegistration"},
-	{"1.3.6.1.5.5.7.5.1", "regCtrl"},
-	{"1.3.6.1.5.5.7.5.1.1", "regToken"},
-	{"1.3.6.1.5.5.7.5.1.2", "authenticator"},
-	{"1.3.6.1.5.5.7.5.1.3", "pkiPublicationInfo"},
-	{"1.3.6.1.5.5.7.5.1.4", "pkiArchiveOptions"},
-	{"1.3.6.1.5.5.7.5.1.5", "oldCertID"},
-	{"1.3.6.1.5.5.7.5.1.6", "protocolEncrKey"},
-	{"1.3.6.1.5.5.7.5.1.7", "altCertTemplate"},
-	{"1.3.6.1.5.5.7.5.1.8", "wtlsTemplate"},
-	{"1.3.6.1.5.5.7.5.2", "utf8Pairs"},
-	{"1.3.6.1.5.5.7.5.2.1", "utf8Pairs"},
-	{"1.3.6.1.5.5.7.5.2.2", "certReq"},
-	{"1.3.6.1.5.5.7.6", "algorithms"},
-	{"1.3.6.1.5.5.7.6.1", "des40"},
-	{"1.3.6.1.5.5.7.6.2", "noSignature"},
-	{"1.3.6.1.5.5.7.6.3", "dh-sig-hmac-sha1"},
-	{"1.3.6.1.5.5.7.6.4", "dh-pop"},
-	{"1.3.6.1.5.5.7.7", "cmcControls"},
-	{"1.3.6.1.5.5.7.8", "otherNames"},
-	{"1.3.6.1.5.5.7.8.1", "personalData"},
-	{"1.3.6.1.5.5.7.8.2", "userGroup"},
-	{"1.3.6.1.5.5.7.8.5", "xmppAddr"},
-	{"1.3.6.1.5.5.7.9", "personalData"},
-	{"1.3.6.1.5.5.7.9.1", "dateOfBirth"},
-	{"1.3.6.1.5.5.7.9.2", "placeOfBirth"},
-	{"1.3.6.1.5.5.7.9.3", "gender"},
-	{"1.3.6.1.5.5.7.9.4", "countryOfCitizenship"},
-	{"1.3.6.1.5.5.7.9.5", "countryOfResidence"},
-	{"1.3.6.1.5.5.7.10", "attributeCertificate"},
-	{"1.3.6.1.5.5.7.10.1", "authenticationInfo"},
-	{"1.3.6.1.5.5.7.10.2", "accessIdentity"},
-	{"1.3.6.1.5.5.7.10.3", "chargingIdentity"},
-	{"1.3.6.1.5.5.7.10.4", "group"},
-	{"1.3.6.1.5.5.7.10.5", "role"},
-	{"1.3.6.1.5.5.7.10.6", "wlanSSID"},
-	{"1.3.6.1.5.5.7.11", "personalData"},
-	{"1.3.6.1.5.5.7.11.1", "pkixQCSyntax-v1"},
-	{"1.3.6.1.5.5.7.14.2", "resourceCertificatePolicy"},
-	{"1.3.6.1.5.5.7.20", "logo"},
-	{"1.3.6.1.5.5.7.20.1", "logoLoyalty"},
-	{"1.3.6.1.5.5.7.20.2", "logoBackground"},
-	{"1.3.6.1.5.5.7.48.1", "ocsp"},
-	{"1.3.6.1.5.5.7.48.1.1", "ocspBasic"},
-	{"1.3.6.1.5.5.7.48.1.2", "ocspNonce"},
-	{"1.3.6.1.5.5.7.48.1.3", "ocspCRL"},
-	{"1.3.6.1.5.5.7.48.1.4", "ocspResponse"},
-	{"1.3.6.1.5.5.7.48.1.5", "ocspNoCheck"},
-	{"1.3.6.1.5.5.7.48.1.6", "ocspArchiveCutoff"},
-	{"1.3.6.1.5.5.7.48.1.7", "ocspServiceLocator"},
-	{"1.3.6.1.5.5.7.48.2", "caIssuers"},
-	{"1.3.6.1.5.5.7.48.3", "timeStamping"},
-	{"1.3.6.1.5.5.7.48.4", "dvcs"},
-	{"1.3.6.1.5.5.7.48.5", "caRepository"},
-	{"1.3.6.1.5.5.7.48.7", "signedObjectRepository"},
-	{"1.3.6.1.5.5.7.48.10", "rpkiManifest"},
-	{"1.3.6.1.5.5.7.48.11", "signedObject"},
-	{"1.3.6.1.5.5.8.1.1", "hmacMD5"},
-	{"1.3.6.1.5.5.8.1.2", "hmacSHA"},
-	{"1.3.6.1.5.5.8.1.3", "hmacTiger"},
-	{"1.3.6.1.5.5.8.2.2", "iKEIntermediate"},
-	{"1.3.12.2.1011.7.1", "decEncryptionAlgorithm"},
-	{"1.3.12.2.1011.7.1.2", "decDEA"},
-	{"1.3.12.2.1011.7.2", "decHashAlgorithm"},
-	{"1.3.12.2.1011.7.2.1", "decMD2"},
-	{"1.3.12.2.1011.7.2.2", "decMD4"},
-	{"1.3.12.2.1011.7.3", "decSignatureAlgorithm"},
-	{"1.3.12.2.1011.7.3.1", "decMD2withRSA"},
-	{"1.3.12.2.1011.7.3.2", "decMD4withRSA"},
-	{"1.3.12.2.1011.7.3.3", "decDEAMAC"},
-	{"1.3.14.2.26.5", "sha"},
-	{"1.3.14.3.2.1.1", "rsa"},
-	{"1.3.14.3.2.2", "md4WitRSA"},
-	{"1.3.14.3.2.3", "md5WithRSA"},
-	{"1.3.14.3.2.4", "md4WithRSAEncryption"},
-	{"1.3.14.3.2.2.1", "sqmod-N"},
-	{"1.3.14.3.2.3.1", "sqmod-NwithRSA"},
-	{"1.3.14.3.2.6", "desECB"},
-	{"1.3.14.3.2.7", "desCBC"},
-	{"1.3.14.3.2.8", "desOFB"},
-	{"1.3.14.3.2.9", "desCFB"},
-	{"1.3.14.3.2.10", "desMAC"},
-	{"1.3.14.3.2.11", "rsaSignature"},
-	{"1.3.14.3.2.12", "dsa"},
-	{"1.3.14.3.2.13", "dsaWithSHA"},
-	{"1.3.14.3.2.14", "mdc2WithRSASignature"},
-	{"1.3.14.3.2.15", "shaWithRSASignature"},
-	{"1.3.14.3.2.16", "dhWithCommonModulus"},
-	{"1.3.14.3.2.17", "desEDE"},
-	{"1.3.14.3.2.18", "sha"},
-	{"1.3.14.3.2.19", "mdc-2"},
-	{"1.3.14.3.2.20", "dsaCommon"},
-	{"1.3.14.3.2.21", "dsaCommonWithSHA"},
-	{"1.3.14.3.2.22", "rsaKeyTransport"},
-	{"1.3.14.3.2.23", "keyed-hash-seal"},
-	{"1.3.14.3.2.24", "md2WithRSASignature"},
-	{"1.3.14.3.2.25", "md5WithRSASignature"},
-	{"1.3.14.3.2.26", "sha1"},
-	{"1.3.14.3.2.27", "dsaWithSHA1"},
-	{"1.3.14.3.2.28", "dsaWithCommonSHA1"},
-	{"1.3.14.3.2.29", "sha-1WithRSAEncryption"},
-	{"1.3.14.3.3.1", "simple-strong-auth-mechanism"},
-	{"1.3.14.7.2.1.1", "ElGamal"},
-	{"1.3.14.7.2.3.1", "md2WithRSA"},
-	{"1.3.14.7.2.3.2", "md2WithElGamal"},
-	{"1.3.36.1", "document"},
-	{"1.3.36.1.1", "finalVersion"},
-	{"1.3.36.1.2", "draft"},
-	{"1.3.36.2", "sio"},
-	{"1.3.36.2.1", "sedu"},
-	{"1.3.36.3", "algorithm"},
-	{"1.3.36.3.1", "encryptionAlgorithm"},
-	{"1.3.36.3.1.1", "des"},
-	{"1.3.36.3.1.1.1", "desECB_pad"},
-	{"1.3.36.3.1.1.1.1", "desECB_ISOpad"},
-	{"1.3.36.3.1.1.2.1", "desCBC_pad"},
-	{"1.3.36.3.1.1.2.1.1", "desCBC_ISOpad"},
-	{"1.3.36.3.1.3", "des_3"},
-	{"1.3.36.3.1.3.1.1", "des_3ECB_pad"},
-	{"1.3.36.3.1.3.1.1.1", "des_3ECB_ISOpad"},
-	{"1.3.36.3.1.3.2.1", "des_3CBC_pad"},
-	{"1.3.36.3.1.3.2.1.1", "des_3CBC_ISOpad"},
-	{"1.3.36.3.1.2", "idea"},
-	{"1.3.36.3.1.2.1", "ideaECB"},
-	{"1.3.36.3.1.2.1.1", "ideaECB_pad"},
-	{"1.3.36.3.1.2.1.1.1", "ideaECB_ISOpad"},
-	{"1.3.36.3.1.2.2", "ideaCBC"},
-	{"1.3.36.3.1.2.2.1", "ideaCBC_pad"},
-	{"1.3.36.3.1.2.2.1.1", "ideaCBC_ISOpad"},
-	{"1.3.36.3.1.2.3", "ideaOFB"},
-	{"1.3.36.3.1.2.4", "ideaCFB"},
-	{"1.3.36.3.1.4", "rsaEncryption"},
-	{"1.3.36.3.1.4.512.17", "rsaEncryptionWithlmod512expe17"},
-	{"1.3.36.3.1.5", "bsi-1"},
-	{"1.3.36.3.1.5.1", "bsi_1ECB_pad"},
-	{"1.3.36.3.1.5.2", "bsi_1CBC_pad"},
-	{"1.3.36.3.1.5.2.1", "bsi_1CBC_PEMpad"},
-	{"1.3.36.3.2", "hashAlgorithm"},
-	{"1.3.36.3.2.1", "ripemd160"},
-	{"1.3.36.3.2.2", "ripemd128"},
-	{"1.3.36.3.2.3", "ripemd256"},
-	{"1.3.36.3.2.4", "mdc2singleLength"},
-	{"1.3.36.3.2.5", "mdc2doubleLength"},
-	{"1.3.36.3.3", "signatureAlgorithm"},
-	{"1.3.36.3.3.1", "rsaSignature"},
-	{"1.3.36.3.3.1.1", "rsaSignatureWithsha1"},
-	{"1.3.36.3.3.1.1.512.2", "rsaSignatureWithsha1_l512_l2"},
-	{"1.3.36.3.3.1.1.640.2", "rsaSignatureWithsha1_l640_l2"},
-	{"1.3.36.3.3.1.1.768.2", "rsaSignatureWithsha1_l768_l2"},
-	{"1.3.36.3.3.1.1.896.2", "rsaSignatureWithsha1_l896_l2"},
-	{"1.3.36.3.3.1.1.1024.2", "rsaSignatureWithsha1_l1024_l2"},
-	{"1.3.36.3.3.1.1.512.3", "rsaSignatureWithsha1_l512_l3"},
-	{"1.3.36.3.3.1.1.640.3", "rsaSignatureWithsha1_l640_l3"},
-	{"1.3.36.3.3.1.1.768.3", "rsaSignatureWithsha1_l768_l3"},
-	{"1.3.36.3.3.1.1.896.3", "rsaSignatureWithsha1_l896_l3"},
-	{"1.3.36.3.3.1.1.1024.3", "rsaSignatureWithsha1_l1024_l3"},
-	{"1.3.36.3.3.1.1.512.5", "rsaSignatureWithsha1_l512_l5"},
-	{"1.3.36.3.3.1.1.640.5", "rsaSignatureWithsha1_l640_l5"},
-	{"1.3.36.3.3.1.1.768.5", "rsaSignatureWithsha1_l768_l5"},
-	{"1.3.36.3.3.1.1.896.5", "rsaSignatureWithsha1_l896_l5"},
-	{"1.3.36.3.3.1.1.1024.5", "rsaSignatureWithsha1_l1024_l5"},
-	{"1.3.36.3.3.1.1.512.9", "rsaSignatureWithsha1_l512_l9"},
-	{"1.3.36.3.3.1.1.640.9", "rsaSignatureWithsha1_l640_l9"},
-	{"1.3.36.3.3.1.1.768.9", "rsaSignatureWithsha1_l768_l9"},
-	{"1.3.36.3.3.1.1.896.9", "rsaSignatureWithsha1_l896_l9"},
-	{"1.3.36.3.3.1.1.1024.9", "rsaSignatureWithsha1_l1024_l9"},
-	{"1.3.36.3.3.1.1.512.11", "rsaSignatureWithsha1_l512_l11"},
-	{"1.3.36.3.3.1.1.640.11", "rsaSignatureWithsha1_l640_l11"},
-	{"1.3.36.3.3.1.1.768.11", "rsaSignatureWithsha1_l768_l11"},
-	{"1.3.36.3.3.1.1.896.11", "rsaSignatureWithsha1_l896_l11"},
-	{"1.3.36.3.3.1.1.1024.11", "rsaSignatureWithsha1_l1024_l11"},
-	{"1.3.36.3.3.1.2", "rsaSignatureWithripemd160"},
-	{"1.3.36.3.3.1.2.512.2", "rsaSignatureWithripemd160_l512_l2"},
-	{"1.3.36.3.3.1.2.640.2", "rsaSignatureWithripemd160_l640_l2"},
-	{"1.3.36.3.3.1.2.768.2", "rsaSignatureWithripemd160_l768_l2"},
-	{"1.3.36.3.3.1.2.896.2", "rsaSignatureWithripemd160_l896_l2"},
-	{"1.3.36.3.3.1.2.1024.2", "rsaSignatureWithripemd160_l1024_l2"},
-	{"1.3.36.3.3.1.2.512.3", "rsaSignatureWithripemd160_l512_l3"},
-	{"1.3.36.3.3.1.2.640.3", "rsaSignatureWithripemd160_l640_l3"},
-	{"1.3.36.3.3.1.2.768.3", "rsaSignatureWithripemd160_l768_l3"},
-	{"1.3.36.3.3.1.2.896.3", "rsaSignatureWithripemd160_l896_l3"},
-	{"1.3.36.3.3.1.2.1024.3", "rsaSignatureWithripemd160_l1024_l3"},
-	{"1.3.36.3.3.1.2.512.5", "rsaSignatureWithripemd160_l512_l5"},
-	{"1.3.36.3.3.1.2.640.5", "rsaSignatureWithripemd160_l640_l5"},
-	{"1.3.36.3.3.1.2.768.5", "rsaSignatureWithripemd160_l768_l5"},
-	{"1.3.36.3.3.1.2.896.5", "rsaSignatureWithripemd160_l896_l5"},
-	{"1.3.36.3.3.1.2.1024.5", "rsaSignatureWithripemd160_l1024_l5"},
-	{"1.3.36.3.3.1.2.512.9", "rsaSignatureWithripemd160_l512_l9"},
-	{"1.3.36.3.3.1.2.640.9", "rsaSignatureWithripemd160_l640_l9"},
-	{"1.3.36.3.3.1.2.768.9", "rsaSignatureWithripemd160_l768_l9"},
-	{"1.3.36.3.3.1.2.896.9", "rsaSignatureWithripemd160_l896_l9"},
-	{"1.3.36.3.3.1.2.1024.9", "rsaSignatureWithripemd160_l1024_l9"},
-	{"1.3.36.3.3.1.2.512.11", "rsaSignatureWithripemd160_l512_l11"},
-	{"1.3.36.3.3.1.2.640.11", "rsaSignatureWithripemd160_l640_l11"},
-	{"1.3.36.3.3.1.2.768.11", "rsaSignatureWithripemd160_l768_l11"},
-	{"1.3.36.3.3.1.2.896.11", "rsaSignatureWithripemd160_l896_l11"},
-	{"1.3.36.3.3.1.2.1024.11", "rsaSignatureWithripemd160_l1024_l11"},
-	{"1.3.36.3.3.1.3", "rsaSignatureWithrimpemd128"},
-	{"1.3.36.3.3.1.4", "rsaSignatureWithrimpemd256"},
-	{"1.3.36.3.3.2", "ecsieSign"},
-	{"1.3.36.3.3.2.1", "ecsieSignWithsha1"},
-	{"1.3.36.3.3.2.2", "ecsieSignWithripemd160"},
-	{"1.3.36.3.3.2.3", "ecsieSignWithmd2"},
-	{"1.3.36.3.3.2.4", "ecsieSignWithmd5"},
-	{"1.3.36.3.3.2.8.1.1.1", "brainpoolP160r1"},
-	{"1.3.36.3.3.2.8.1.1.2", "brainpoolP160t1"},
-	{"1.3.36.3.3.2.8.1.1.3", "brainpoolP192r1"},
-	{"1.3.36.3.3.2.8.1.1.4", "brainpoolP192t1"},
-	{"1.3.36.3.3.2.8.1.1.5", "brainpoolP224r1"},
-	{"1.3.36.3.3.2.8.1.1.6", "brainpoolP224t1"},
-	{"1.3.36.3.3.2.8.1.1.7", "brainpoolP256r1"},
-	{"1.3.36.3.3.2.8.1.1.8", "brainpoolP256t1"},
-	{"1.3.36.3.3.2.8.1.1.9", "brainpoolP320r1"},
-	{"1.3.36.3.3.2.8.1.1.10", "brainpoolP320t1"},
-	{"1.3.36.3.3.2.8.1.1.11", "brainpoolP384r1"},
-	{"1.3.36.3.3.2.8.1.1.12", "brainpoolP384t1"},
-	{"1.3.36.3.3.2.8.1.1.13", "brainpoolP512r1"},
-	{"1.3.36.3.3.2.8.1.1.14", "brainpoolP512t1"},
-	{"1.3.36.3.4", "signatureScheme"},
-	{"1.3.36.3.4.1", "sigS_ISO9796-1"},
-	{"1.3.36.3.4.2", "sigS_ISO9796-2"},
-	{"1.3.36.3.4.2.1", "sigS_ISO9796-2Withred"},
-	{"1.3.36.3.4.2.2", "sigS_ISO9796-2Withrsa"},
-	{"1.3.36.3.4.2.3", "sigS_ISO9796-2Withrnd"},
-	{"1.3.36.4", "attribute"},
-	{"1.3.36.5", "policy"},
-	{"1.3.36.6", "api"},
-	{"1.3.36.6.1", "manufacturer-specific_api"},
-	{"1.3.36.6.1.1", "utimaco-api"},
-	{"1.3.36.6.2", "functionality-specific_api"},
-	{"1.3.36.7", "keymgmnt"},
-	{"1.3.36.7.1", "keyagree"},
-	{"1.3.36.7.1.1", "bsiPKE"},
-	{"1.3.36.7.2", "keytrans"},
-	{"1.3.36.7.2.1", "encISO9796-2Withrsa"},
-	{"1.3.36.8.1.1", "Teletrust.SigGConform.policyIdentifier"},
-	{"1.3.36.8.2.1", "directoryService"},
-	{"1.3.36.8.3.1", "dateOfCertGen"},
-	{"1.3.36.8.3.2", "procuration"},
-	{"1.3.36.8.3.3", "admission"},
-	{"1.3.36.8.3.4", "monetaryLimit"},
-	{"1.3.36.8.3.5", "declarationOfMajority"},
-	{"1.3.36.8.3.6", "integratedCircuitCardSerialNumber"},
-	{"1.3.36.8.3.7", "pKReference"},
-	{"1.3.36.8.3.8", "restriction"},
-	{"1.3.36.8.3.9", "retrieveIfAllowed"},
-	{"1.3.36.8.3.10", "requestedCertificate"},
-	{"1.3.36.8.3.11", "namingAuthorities"},
-	{"1.3.36.8.3.11.1", "rechtWirtschaftSteuern"},
-	{"1.3.36.8.3.11.1.1", "rechtsanwaeltin"},
-	{"1.3.36.8.3.11.1.2", "rechtsanwalt"},
-	{"1.3.36.8.3.11.1.3", "rechtsBeistand"},
-	{"1.3.36.8.3.11.1.4", "steuerBeraterin"},
-	{"1.3.36.8.3.11.1.5", "steuerBerater"},
-	{"1.3.36.8.3.11.1.6", "steuerBevollmaechtigte"},
-	{"1.3.36.8.3.11.1.7", "steuerBevollmaechtigter"},
-	{"1.3.36.8.3.11.1.8", "notarin"},
-	{"1.3.36.8.3.11.1.9", "notar"},
-	{"1.3.36.8.3.11.1.10", "notarVertreterin"},
-	{"1.3.36.8.3.11.1.11", "notarVertreter"},
-	{"1.3.36.8.3.11.1.12", "notariatsVerwalterin"},
-	{"1.3.36.8.3.11.1.13", "notariatsVerwalter"},
-	{"1.3.36.8.3.11.1.14", "wirtschaftsPrueferin"},
-	{"1.3.36.8.3.11.1.15", "wirtschaftsPruefer"},
-	{"1.3.36.8.3.11.1.16", "vereidigteBuchprueferin"},
-	{"1.3.36.8.3.11.1.17", "vereidigterBuchpruefer"},
-	{"1.3.36.8.3.11.1.18", "patentAnwaeltin"},
-	{"1.3.36.8.3.11.1.19", "patentAnwalt"},
-	{"1.3.36.8.3.12", "certInDirSince"},
-	{"1.3.36.8.3.13", "certHash"},
-	{"1.3.36.8.3.14", "nameAtBirth"},
-	{"1.3.36.8.3.15", "additionalInformation"},
-	{"1.3.36.8.4.1", "personalData"},
-	{"1.3.36.8.4.8", "restriction"},
-	{"1.3.36.8.5.1.1.1", "rsaIndicateSHA1"},
-	{"1.3.36.8.5.1.1.2", "rsaIndicateRIPEMD160"},
-	{"1.3.36.8.5.1.1.3", "rsaWithSHA1"},
-	{"1.3.36.8.5.1.1.4", "rsaWithRIPEMD160"},
-	{"1.3.36.8.5.1.2.1", "dsaExtended"},
-	{"1.3.36.8.5.1.2.2", "dsaWithRIPEMD160"},
-	{"1.3.36.8.6.1", "cert"},
-	{"1.3.36.8.6.2", "certRef"},
-	{"1.3.36.8.6.3", "attrCert"},
-	{"1.3.36.8.6.4", "attrRef"},
-	{"1.3.36.8.6.5", "fileName"},
-	{"1.3.36.8.6.6", "storageTime"},
-	{"1.3.36.8.6.7", "fileSize"},
-	{"1.3.36.8.6.8", "location"},
-	{"1.3.36.8.6.9", "sigNumber"},
-	{"1.3.36.8.6.10", "autoGen"},
-	{"1.3.36.8.7.1.1", "ptAdobeILL"},
-	{"1.3.36.8.7.1.2", "ptAmiPro"},
-	{"1.3.36.8.7.1.3", "ptAutoCAD"},
-	{"1.3.36.8.7.1.4", "ptBinary"},
-	{"1.3.36.8.7.1.5", "ptBMP"},
-	{"1.3.36.8.7.1.6", "ptCGM"},
-	{"1.3.36.8.7.1.7", "ptCorelCRT"},
-	{"1.3.36.8.7.1.8", "ptCorelDRW"},
-	{"1.3.36.8.7.1.9", "ptCorelEXC"},
-	{"1.3.36.8.7.1.10", "ptCorelPHT"},
-	{"1.3.36.8.7.1.11", "ptDraw"},
-	{"1.3.36.8.7.1.12", "ptDVI"},
-	{"1.3.36.8.7.1.13", "ptEPS"},
-	{"1.3.36.8.7.1.14", "ptExcel"},
-	{"1.3.36.8.7.1.15", "ptGEM"},
-	{"1.3.36.8.7.1.16", "ptGIF"},
-	{"1.3.36.8.7.1.17", "ptHPGL"},
-	{"1.3.36.8.7.1.18", "ptJPEG"},
-	{"1.3.36.8.7.1.19", "ptKodak"},
-	{"1.3.36.8.7.1.20", "ptLaTeX"},
-	{"1.3.36.8.7.1.21", "ptLotus"},
-	{"1.3.36.8.7.1.22", "ptLotusPIC"},
-	{"1.3.36.8.7.1.23", "ptMacPICT"},
-	{"1.3.36.8.7.1.24", "ptMacWord"},
-	{"1.3.36.8.7.1.25", "ptMSWfD"},
-	{"1.3.36.8.7.1.26", "ptMSWord"},
-	{"1.3.36.8.7.1.27", "ptMSWord2"},
-	{"1.3.36.8.7.1.28", "ptMSWord6"},
-	{"1.3.36.8.7.1.29", "ptMSWord8"},
-	{"1.3.36.8.7.1.30", "ptPDF"},
-	{"1.3.36.8.7.1.31", "ptPIF"},
-	{"1.3.36.8.7.1.32", "ptPostscript"},
-	{"1.3.36.8.7.1.33", "ptRTF"},
-	{"1.3.36.8.7.1.34", "ptSCITEX"},
-	{"1.3.36.8.7.1.35", "ptTAR"},
-	{"1.3.36.8.7.1.36", "ptTarga"},
-	{"1.3.36.8.7.1.37", "ptTeX"},
-	{"1.3.36.8.7.1.38", "ptText"},
-	{"1.3.36.8.7.1.39", "ptTIFF"},
-	{"1.3.36.8.7.1.40", "ptTIFF-FC"},
-	{"1.3.36.8.7.1.41", "ptUID"},
-	{"1.3.36.8.7.1.42", "ptUUEncode"},
-	{"1.3.36.8.7.1.43", "ptWMF"},
-	{"1.3.36.8.7.1.44", "ptWordPerfect"},
-	{"1.3.36.8.7.1.45", "ptWPGrph"},
-	{"1.3.101.1.4", "thawte-ce"},
-	{"1.3.101.1.4.1", "strongExtranet"},
-	{"1.3.132.0.1", "sect163k1"},
-	{"1.3.132.0.2", "sect163r1"},
-	{"1.3.132.0.3", "sect239k1"},
-	{"1.3.132.0.4", "sect113r1"},
-	{"1.3.132.0.5", "sect113r2"},
-	{"1.3.132.0.6", "secp112r1"},
-	{"1.3.132.0.7", "secp112r2"},
-	{"1.3.132.0.8", "secp160r1"},
-	{"1.3.132.0.9", "secp160k1"},
-	{"1.3.132.0.10", "secp256k1"},
-	{"1.3.132.0.15", "sect163r2"},
-	{"1.3.132.0.16", "sect283k1"},
-	{"1.3.132.0.17", "sect283r1"},
-	{"1.3.132.0.22", "sect131r1"},
-	{"1.3.132.0.23", "sect131r2"},
-	{"1.3.132.0.24", "sect193r1"},
-	{"1.3.132.0.25", "sect193r2"},
-	{"1.3.132.0.26", "sect233k1"},
-	{"1.3.132.0.27", "sect233r1"},
-	{"1.3.132.0.28", "secp128r1"},
-	{"1.3.132.0.29", "secp128r2"},
-	{"1.3.132.0.30", "secp160r2"},
-	{"1.3.132.0.31", "secp192k1"},
-	{"1.3.132.0.32", "secp224k1"},
-	{"1.3.132.0.33", "secp224r1"},
-	{"1.3.132.0.34", "secp384r1"},
-	{"1.3.132.0.35", "secp521r1"},
-	{"1.3.132.0.36", "sect409k1"},
-	{"1.3.132.0.37", "sect409r1"},
-	{"1.3.132.0.38", "sect571k1"},
-	{"1.3.132.0.39", "sect571r1"},
-	{"1.3.133.16.840.9.84", "x984"},
-	{"1.3.133.16.840.9.84.0", "x984Module"},
-	{"1.3.133.16.840.9.84.0.1", "x984Biometrics"},
-	{"1.3.133.16.840.9.84.0.2", "x984CMS"},
-	{"1.3.133.16.840.9.84.0.3", "x984Identifiers"},
-	{"1.3.133.16.840.9.84.1", "x984Biometric"},
-	{"1.3.133.16.840.9.84.1.0", "biometricUnknownType"},
-	{"1.3.133.16.840.9.84.1.1", "biometricBodyOdor"},
-	{"1.3.133.16.840.9.84.1.2", "biometricDNA"},
-	{"1.3.133.16.840.9.84.1.3", "biometricEarShape"},
-	{"1.3.133.16.840.9.84.1.4", "biometricFacialFeatures"},
-	{"1.3.133.16.840.9.84.1.5", "biometricFingerImage"},
-	{"1.3.133.16.840.9.84.1.6", "biometricFingerGeometry"},
-	{"1.3.133.16.840.9.84.1.7", "biometricHandGeometry"},
-	{"1.3.133.16.840.9.84.1.8", "biometricIrisFeatures"},
-	{"1.3.133.16.840.9.84.1.9", "biometricKeystrokeDynamics"},
-	{"1.3.133.16.840.9.84.1.10", "biometricPalm"},
-	{"1.3.133.16.840.9.84.1.11", "biometricRetina"},
-	{"1.3.133.16.840.9.84.1.12", "biometricSignature"},
-	{"1.3.133.16.840.9.84.1.13", "biometricSpeechPattern"},
-	{"1.3.133.16.840.9.84.1.14", "biometricThermalImage"},
-	{"1.3.133.16.840.9.84.1.15", "biometricVeinPattern"},
-	{"1.3.133.16.840.9.84.1.16", "biometricThermalFaceImage"},
-	{"1.3.133.16.840.9.84.1.17", "biometricThermalHandImage"},
-	{"1.3.133.16.840.9.84.1.18", "biometricLipMovement"},
-	{"1.3.133.16.840.9.84.1.19", "biometricGait"},
-	{"1.3.133.16.840.9.84.1", "x984ProcessingAlgorithm"},
-	{"1.3.133.16.840.9.84.3", "x984MatchingMethod"},
-	{"1.3.133.16.840.9.84.4", "x984FormatOwner"},
-	{"1.3.133.16.840.9.84.4.0", "x984CbeffOwner"},
-	{"1.3.133.16.840.9.84.4.1", "x984IbiaOwner"},
-	{"1.3.133.16.840.9.84.4.1.1", "ibiaOwnerSAFLINK"},
-	{"1.3.133.16.840.9.84.4.1.2", "ibiaOwnerBioscrypt"},
-	{"1.3.133.16.840.9.84.4.1.3", "ibiaOwnerVisionics"},
-	{"1.3.133.16.840.9.84.4.1.4", "ibiaOwnerInfineonTechnologiesAG"},
-	{"1.3.133.16.840.9.84.4.1.5", "ibiaOwnerIridianTechnologies"},
-	{"1.3.133.16.840.9.84.4.1.6", "ibiaOwnerVeridicom"},
-	{"1.3.133.16.840.9.84.4.1.7", "ibiaOwnerCyberSIGN"},
-	{"1.3.133.16.840.9.84.4.1.8", "ibiaOwnereCryp"},
-	{"1.3.133.16.840.9.84.4.1.9", "ibiaOwnerFingerprintCardsAB"},
-	{"1.3.133.16.840.9.84.4.1.10", "ibiaOwnerSecuGen"},
-	{"1.3.133.16.840.9.84.4.1.11", "ibiaOwnerPreciseBiometric"},
-	{"1.3.133.16.840.9.84.4.1.12", "ibiaOwnerIdentix"},
-	{"1.3.133.16.840.9.84.4.1.13", "ibiaOwnerDERMALOG"},
-	{"1.3.133.16.840.9.84.4.1.14", "ibiaOwnerLOGICO"},
-	{"1.3.133.16.840.9.84.4.1.15", "ibiaOwnerNIST"},
-	{"1.3.133.16.840.9.84.4.1.16", "ibiaOwnerA3Vision"},
-	{"1.3.133.16.840.9.84.4.1.17", "ibiaOwnerNEC"},
-	{"1.3.133.16.840.9.84.4.1.18", "ibiaOwnerSTMicroelectronics"},
-	{"1.3.133.16.840.9.84.4.1", "x984X9Owner"},
-	{"2.5.4.0", "objectClass"},
-	{"2.5.4.1", "aliasedEntryName"},
-	{"2.5.4.2", "knowledgeInformation"},
-	{"2.5.4.3", "commonName"},
-	{"2.5.4.4", "surname"},
-	{"2.5.4.5", "serialNumber"},
-	{"2.5.4.6", "countryName"},
-	{"2.5.4.7", "localityName"},
-	{"2.5.4.7.1", "collectiveLocalityName"},
-	{"2.5.4.8", "stateOrProvinceName"},
-	{"2.5.4.8.1", "collectiveStateOrProvinceName"},
-	{"2.5.4.9", "streetAddress"},
-	{"2.5.4.9.1", "collectiveStreetAddress"},
-	{"2.5.4.10", "organizationName"},
-	{"2.5.4.10.1", "collectiveOrganizationName"},
-	{"2.5.4.11", "organizationalUnitName"},
-	{"2.5.4.11.1", "collectiveOrganizationalUnitName"},
-	{"2.5.4.12", "title"},
-	{"2.5.4.13", "description"},
-	{"2.5.4.14", "searchGuide"},
-	{"2.5.4.15", "businessCategory"},
-	{"2.5.4.16", "postalAddress"},
-	{"2.5.4.16.1", "collectivePostalAddress"},
-	{"2.5.4.17", "postalCode"},
-	{"2.5.4.17.1", "collectivePostalCode"},
-	{"2.5.4.18", "postOfficeBox"},
-	{"2.5.4.18.1", "collectivePostOfficeBox"},
-	{"2.5.4.19", "physicalDeliveryOfficeName"},
-	{"2.5.4.19.1", "collectivePhysicalDeliveryOfficeName"},
-	{"2.5.4.20", "telephoneNumber"},
-	{"2.5.4.20.1", "collectiveTelephoneNumber"},
-	{"2.5.4.21", "telexNumber"},
-	{"2.5.4.21.1", "collectiveTelexNumber"},
-	{"2.5.4.22", "teletexTerminalIdentifier"},
-	{"2.5.4.22.1", "collectiveTeletexTerminalIdentifier"},
-	{"2.5.4.23", "facsimileTelephoneNumber"},
-	{"2.5.4.23.1", "collectiveFacsimileTelephoneNumber"},
-	{"2.5.4.24", "x121Address"},
-	{"2.5.4.25", "internationalISDNNumber"},
-	{"2.5.4.25.1", "collectiveInternationalISDNNumber"},
-	{"2.5.4.26", "registeredAddress"},
-	{"2.5.4.27", "destinationIndicator"},
-	{"2.5.4.28", "preferredDeliveryMehtod"},
-	{"2.5.4.29", "presentationAddress"},
-	{"2.5.4.30", "supportedApplicationContext"},
-	{"2.5.4.31", "member"},
-	{"2.5.4.32", "owner"},
-	{"2.5.4.33", "roleOccupant"},
-	{"2.5.4.34", "seeAlso"},
-	{"2.5.4.35", "userPassword"},
-	{"2.5.4.36", "userCertificate"},
-	{"2.5.4.37", "caCertificate"},
-	{"2.5.4.38", "authorityRevocationList"},
-	{"2.5.4.39", "certificateRevocationList"},
-	{"2.5.4.40", "crossCertificatePair"},
-	{"2.5.4.41", "name"},
-	{"2.5.4.42", "givenName"},
-	{"2.5.4.43", "initials"},
-	{"2.5.4.44", "generationQualifier"},
-	{"2.5.4.45", "uniqueIdentifier"},
-	{"2.5.4.46", "dnQualifier"},
-	{"2.5.4.47", "enhancedSearchGuide"},
-	{"2.5.4.48", "protocolInformation"},
-	{"2.5.4.49", "distinguishedName"},
-	{"2.5.4.50", "uniqueMember"},
-	{"2.5.4.51", "houseIdentifier"},
-	{"2.5.4.52", "supportedAlgorithms"},
-	{"2.5.4.53", "deltaRevocationList"},
-	{"2.5.4.54", "dmdName"},
-	{"2.5.4.55", "clearance"},
-	{"2.5.4.56", "defaultDirQop"},
-	{"2.5.4.57", "attributeIntegrityInfo"},
-	{"2.5.4.58", "attributeCertificate"},
-	{"2.5.4.59", "attributeCertificateRevocationList"},
-	{"2.5.4.60", "confKeyInfo"},
-	{"2.5.4.61", "aACertificate"},
-	{"2.5.4.62", "attributeDescriptorCertificate"},
-	{"2.5.4.63", "attributeAuthorityRevocationList"},
-	{"2.5.4.64", "familyInformation"},
-	{"2.5.4.65", "pseudonym"},
-	{"2.5.4.66", "communicationsService"},
-	{"2.5.4.67", "communicationsNetwork"},
-	{"2.5.4.68", "certificationPracticeStmt"},
-	{"2.5.4.69", "certificatePolicy"},
-	{"2.5.4.70", "pkiPath"},
-	{"2.5.4.71", "privPolicy"},
-	{"2.5.4.72", "role"},
-	{"2.5.4.73", "delegationPath"},
-	{"2.5.4.74", "protPrivPolicy"},
-	{"2.5.4.75", "xMLPrivilegeInfo"},
-	{"2.5.4.76", "xmlPrivPolicy"},
-	{"2.5.4.82", "permission"},
-	{"2.5.6.0", "top"},
-	{"2.5.6.1", "alias"},
-	{"2.5.6.2", "country"},
-	{"2.5.6.3", "locality"},
-	{"2.5.6.4", "organization"},
-	{"2.5.6.5", "organizationalUnit"},
-	{"2.5.6.6", "person"},
-	{"2.5.6.7", "organizationalPerson"},
-	{"2.5.6.8", "organizationalRole"},
-	{"2.5.6.9", "groupOfNames"},
-	{"2.5.6.10", "residentialPerson"},
-	{"2.5.6.11", "applicationProcess"},
-	{"2.5.6.12", "applicationEntity"},
-	{"2.5.6.13", "dSA"},
-	{"2.5.6.14", "device"},
-	{"2.5.6.15", "strongAuthenticationUser"},
-	{"2.5.6.16", "certificateAuthority"},
-	{"2.5.6.17", "groupOfUniqueNames"},
-	{"2.5.6.21", "pkiUser"},
-	{"2.5.6.22", "pkiCA"},
-	{"2.5.8.1.1", "rsa"},
-	{"2.5.29.1", "authorityKeyIdentifier"},
-	{"2.5.29.2", "keyAttributes"},
-	{"2.5.29.3", "certificatePolicies"},
-	{"2.5.29.4", "keyUsageRestriction"},
-	{"2.5.29.5", "policyMapping"},
-	{"2.5.29.6", "subtreesConstraint"},
-	{"2.5.29.7", "subjectAltName"},
-	{"2.5.29.8", "issuerAltName"},
-	{"2.5.29.9", "subjectDirectoryAttributes"},
-	{"2.5.29.10", "basicConstraints"},
-	{"2.5.29.11", "nameConstraints"},
-	{"2.5.29.12", "policyConstraints"},
-	{"2.5.29.13", "basicConstraints"},
-	{"2.5.29.14", "subjectKeyIdentifier"},
-	{"2.5.29.15", "keyUsage"},
-	{"2.5.29.16", "privateKeyUsagePeriod"},
-	{"2.5.29.17", "subjectAltName"},
-	{"2.5.29.18", "issuerAltName"},
-	{"2.5.29.19", "basicConstraints"},
-	{"2.5.29.20", "cRLNumber"},
-	{"2.5.29.21", "cRLReason"},
-	{"2.5.29.22", "expirationDate"},
-	{"2.5.29.23", "instructionCode"},
-	{"2.5.29.24", "invalidityDate"},
-	{"2.5.29.25", "cRLDistributionPoints"},
-	{"2.5.29.26", "issuingDistributionPoint"},
-	{"2.5.29.27", "deltaCRLIndicator"},
-	{"2.5.29.28", "issuingDistributionPoint"},
-	{"2.5.29.29", "certificateIssuer"},
-	{"2.5.29.30", "nameConstraints"},
-	{"2.5.29.31", "cRLDistributionPoints"},
-	{"2.5.29.32", "certificatePolicies"},
-	{"2.5.29.32.0", "anyPolicy"},
-	{"2.5.29.33", "policyMappings"},
-	{"2.5.29.34", "policyConstraints"},
-	{"2.5.29.35", "authorityKeyIdentifier"},
-	{"2.5.29.36", "policyConstraints"},
-	{"2.5.29.37", "extKeyUsage"},
-	{"2.5.29.37.0", "anyExtendedKeyUsage"},
-	{"2.5.29.38", "authorityAttributeIdentifier"},
-	{"2.5.29.39", "roleSpecCertIdentifier"},
-	{"2.5.29.40", "cRLStreamIdentifier"},
-	{"2.5.29.41", "basicAttConstraints"},
-	{"2.5.29.42", "delegatedNameConstraints"},
-	{"2.5.29.43", "timeSpecification"},
-	{"2.5.29.44", "cRLScope"},
-	{"2.5.29.45", "statusReferrals"},
-	{"2.5.29.46", "freshestCRL"},
-	{"2.5.29.47", "orderedList"},
-	{"2.5.29.48", "attributeDescriptor"},
-	{"2.5.29.49", "userNotice"},
-	{"2.5.29.50", "sOAIdentifier"},
-	{"2.5.29.51", "baseUpdateTime"},
-	{"2.5.29.52", "acceptableCertPolicies"},
-	{"2.5.29.53", "deltaInfo"},
-	{"2.5.29.54", "inhibitAnyPolicy"},
-	{"2.5.29.55", "targetInformation"},
-	{"2.5.29.56", "noRevAvail"},
-	{"2.5.29.57", "acceptablePrivilegePolicies"},
-	{"2.5.29.58", "toBeRevoked"},
-	{"2.5.29.59", "revokedGroups"},
-	{"2.5.29.60", "expiredCertsOnCRL"},
-	{"2.5.29.61", "indirectIssuer"},
-	{"2.5.29.62", "noAssertion"},
-	{"2.5.29.63", "aAissuingDistributionPoint"},
-	{"2.5.29.64", "issuedOnBehalfOf"},
-	{"2.5.29.65", "singleUse"},
-	{"2.5.29.66", "groupAC"},
-	{"2.5.29.67", "allowedAttAss"},
-	{"2.5.29.68", "attributeMappings"},
-	{"2.5.29.69", "holderNameConstraints"},
-	{"2.16.724.1.2.2.4.1", "personalDataInfo"},
-	{"2.16.840.1.101.2.1.1.1", "sdnsSignatureAlgorithm"},
-	{"2.16.840.1.101.2.1.1.2", "fortezzaSignatureAlgorithm"},
-	{"2.16.840.1.101.2.1.1.3", "sdnsConfidentialityAlgorithm"},
-	{"2.16.840.1.101.2.1.1.4", "fortezzaConfidentialityAlgorithm"},
-	{"2.16.840.1.101.2.1.1.5", "sdnsIntegrityAlgorithm"},
-	{"2.16.840.1.101.2.1.1.6", "fortezzaIntegrityAlgorithm"},
-	{"2.16.840.1.101.2.1.1.7", "sdnsTokenProtectionAlgorithm"},
-	{"2.16.840.1.101.2.1.1.8", "fortezzaTokenProtectionAlgorithm"},
-	{"2.16.840.1.101.2.1.1.9", "sdnsKeyManagementAlgorithm"},
-	{"2.16.840.1.101.2.1.1.10", "fortezzaKeyManagementAlgorithm"},
-	{"2.16.840.1.101.2.1.1.11", "sdnsKMandSigAlgorithm"},
-	{"2.16.840.1.101.2.1.1.12", "fortezzaKMandSigAlgorithm"},
-	{"2.16.840.1.101.2.1.1.13", "suiteASignatureAlgorithm"},
-	{"2.16.840.1.101.2.1.1.14", "suiteAConfidentialityAlgorithm"},
-	{"2.16.840.1.101.2.1.1.15", "suiteAIntegrityAlgorithm"},
-	{"2.16.840.1.101.2.1.1.16", "suiteATokenProtectionAlgorithm"},
-	{"2.16.840.1.101.2.1.1.17", "suiteAKeyManagementAlgorithm"},
-	{"2.16.840.1.101.2.1.1.18", "suiteAKMandSigAlgorithm"},
-	{"2.16.840.1.101.2.1.1.19", "fortezzaUpdatedSigAlgorithm"},
-	{"2.16.840.1.101.2.1.1.20", "fortezzaKMandUpdSigAlgorithms"},
-	{"2.16.840.1.101.2.1.1.21", "fortezzaUpdatedIntegAlgorithm"},
-	{"2.16.840.1.101.2.1.1.22", "keyExchangeAlgorithm"},
-	{"2.16.840.1.101.2.1.1.23", "fortezzaWrap80Algorithm"},
-	{"2.16.840.1.101.2.1.1.24", "kEAKeyEncryptionAlgorithm"},
-	{"2.16.840.1.101.2.1.2.1", "rfc822MessageFormat"},
-	{"2.16.840.1.101.2.1.2.2", "emptyContent"},
-	{"2.16.840.1.101.2.1.2.3", "cspContentType"},
-	{"2.16.840.1.101.2.1.2.42", "mspRev3ContentType"},
-	{"2.16.840.1.101.2.1.2.48", "mspContentType"},
-	{"2.16.840.1.101.2.1.2.49", "mspRekeyAgentProtocol"},
-	{"2.16.840.1.101.2.1.2.50", "mspMMP"},
-	{"2.16.840.1.101.2.1.2.66", "mspRev3-1ContentType"},
-	{"2.16.840.1.101.2.1.2.72", "forwardedMSPMessageBodyPart"},
-	{"2.16.840.1.101.2.1.2.73", "mspForwardedMessageParameters"},
-	{"2.16.840.1.101.2.1.2.74", "forwardedCSPMsgBodyPart"},
-	{"2.16.840.1.101.2.1.2.75", "cspForwardedMessageParameters"},
-	{"2.16.840.1.101.2.1.2.76", "mspMMP2"},
-	{"2.16.840.1.101.2.1.3.1", "sdnsSecurityPolicy"},
-	{"2.16.840.1.101.2.1.3.2", "sdnsPRBAC"},
-	{"2.16.840.1.101.2.1.3.3", "mosaicPRBAC"},
-	{"2.16.840.1.101.2.1.3.10", "siSecurityPolicy"},
-	{"2.16.840.1.101.2.1.3.10.0", "siNASP"},
-	{"2.16.840.1.101.2.1.3.10.1", "siELCO"},
-	{"2.16.840.1.101.2.1.3.10.2", "siTK"},
-	{"2.16.840.1.101.2.1.3.10.3", "siDSAP"},
-	{"2.16.840.1.101.2.1.3.10.4", "siSSSS"},
-	{"2.16.840.1.101.2.1.3.10.5", "siDNASP"},
-	{"2.16.840.1.101.2.1.3.10.6", "siBYEMAN"},
-	{"2.16.840.1.101.2.1.3.10.7", "siREL-US"},
-	{"2.16.840.1.101.2.1.3.10.8", "siREL-AUS"},
-	{"2.16.840.1.101.2.1.3.10.9", "siREL-CAN"},
-	{"2.16.840.1.101.2.1.3.10.10", "siREL_UK"},
-	{"2.16.840.1.101.2.1.3.10.11", "siREL-NZ"},
-	{"2.16.840.1.101.2.1.3.10.12", "siGeneric"},
-	{"2.16.840.1.101.2.1.3.11", "genser"},
-	{"2.16.840.1.101.2.1.3.11.0", "genserNations"},
-	{"2.16.840.1.101.2.1.3.11.1", "genserComsec"},
-	{"2.16.840.1.101.2.1.3.11.2", "genserAcquisition"},
-	{"2.16.840.1.101.2.1.3.11.3", "genserSecurityCategories"},
-	{"2.16.840.1.101.2.1.3.11.3.0", "genserTagSetName"},
-	{"2.16.840.1.101.2.1.3.12", "defaultSecurityPolicy"},
-	{"2.16.840.1.101.2.1.3.13", "capcoMarkings"},
-	{"2.16.840.1.101.2.1.3.13.0", "capcoSecurityCategories"},
-	{"2.16.840.1.101.2.1.3.13.0.1", "capcoTagSetName1"},
-	{"2.16.840.1.101.2.1.3.13.0.2", "capcoTagSetName2"},
-	{"2.16.840.1.101.2.1.3.13.0.3", "capcoTagSetName3"},
-	{"2.16.840.1.101.2.1.3.13.0.4", "capcoTagSetName4"},
-	{"2.16.840.1.101.2.1.5.1", "sdnsKeyManagementCertificate"},
-	{"2.16.840.1.101.2.1.5.2", "sdnsUserSignatureCertificate"},
-	{"2.16.840.1.101.2.1.5.3", "sdnsKMandSigCertificate"},
-	{"2.16.840.1.101.2.1.5.4", "fortezzaKeyManagementCertificate"},
-	{"2.16.840.1.101.2.1.5.5", "fortezzaKMandSigCertificate"},
-	{"2.16.840.1.101.2.1.5.6", "fortezzaUserSignatureCertificate"},
-	{"2.16.840.1.101.2.1.5.7", "fortezzaCASignatureCertificate"},
-	{"2.16.840.1.101.2.1.5.8", "sdnsCASignatureCertificate"},
-	{"2.16.840.1.101.2.1.5.10", "auxiliaryVector"},
-	{"2.16.840.1.101.2.1.5.11", "mlReceiptPolicy"},
-	{"2.16.840.1.101.2.1.5.12", "mlMembership"},
-	{"2.16.840.1.101.2.1.5.13", "mlAdministrators"},
-	{"2.16.840.1.101.2.1.5.14", "alid"},
-	{"2.16.840.1.101.2.1.5.20", "janUKMs"},
-	{"2.16.840.1.101.2.1.5.21", "febUKMs"},
-	{"2.16.840.1.101.2.1.5.22", "marUKMs"},
-	{"2.16.840.1.101.2.1.5.23", "aprUKMs"},
-	{"2.16.840.1.101.2.1.5.24", "mayUKMs"},
-	{"2.16.840.1.101.2.1.5.25", "junUKMs"},
-	{"2.16.840.1.101.2.1.5.26", "julUKMs"},
-	{"2.16.840.1.101.2.1.5.27", "augUKMs"},
-	{"2.16.840.1.101.2.1.5.28", "sepUKMs"},
-	{"2.16.840.1.101.2.1.5.29", "octUKMs"},
-	{"2.16.840.1.101.2.1.5.30", "novUKMs"},
-	{"2.16.840.1.101.2.1.5.31", "decUKMs"},
-	{"2.16.840.1.101.2.1.5.40", "metaSDNSckl"},
-	{"2.16.840.1.101.2.1.5.41", "sdnsCKL"},
-	{"2.16.840.1.101.2.1.5.42", "metaSDNSsignatureCKL"},
-	{"2.16.840.1.101.2.1.5.43", "sdnsSignatureCKL"},
-	{"2.16.840.1.101.2.1.5.44", "sdnsCertificateRevocationList"},
-	{"2.16.840.1.101.2.1.5.45", "fortezzaCertificateRevocationList"},
-	{"2.16.840.1.101.2.1.5.46", "fortezzaCKL"},
-	{"2.16.840.1.101.2.1.5.47", "alExemptedAddressProcessor"},
-	{"2.16.840.1.101.2.1.5.48", "guard"},
-	{"2.16.840.1.101.2.1.5.49", "algorithmsSupported"},
-	{"2.16.840.1.101.2.1.5.50", "suiteAKeyManagementCertificate"},
-	{"2.16.840.1.101.2.1.5.51", "suiteAKMandSigCertificate"},
-	{"2.16.840.1.101.2.1.5.52", "suiteAUserSignatureCertificate"},
-	{"2.16.840.1.101.2.1.5.53", "prbacInfo"},
-	{"2.16.840.1.101.2.1.5.54", "prbacCAConstraints"},
-	{"2.16.840.1.101.2.1.5.55", "sigOrKMPrivileges"},
-	{"2.16.840.1.101.2.1.5.56", "commPrivileges"},
-	{"2.16.840.1.101.2.1.5.57", "labeledAttribute"},
-	{"2.16.840.1.101.2.1.5.58", "policyInformationFile"},
-	{"2.16.840.1.101.2.1.5.59", "secPolicyInformationFile"},
-	{"2.16.840.1.101.2.1.5.60", "cAClearanceConstraint"},
-	{"2.16.840.1.101.2.1.7.1", "cspExtns"},
-	{"2.16.840.1.101.2.1.7.1.0", "cspCsExtn"},
-	{"2.16.840.1.101.2.1.8.1", "mISSISecurityCategories"},
-	{"2.16.840.1.101.2.1.8.2", "standardSecurityLabelPrivileges"},
-	{"2.16.840.1.101.2.1.10.1", "sigPrivileges"},
-	{"2.16.840.1.101.2.1.10.2", "kmPrivileges"},
-	{"2.16.840.1.101.2.1.10.3", "namedTagSetPrivilege"},
-	{"2.16.840.1.101.2.1.11.1", "ukDemo"},
-	{"2.16.840.1.101.2.1.11.2", "usDODClass2"},
-	{"2.16.840.1.101.2.1.11.3", "usMediumPilot"},
-	{"2.16.840.1.101.2.1.11.4", "usDODClass4"},
-	{"2.16.840.1.101.2.1.11.5", "usDODClass3"},
-	{"2.16.840.1.101.2.1.11.6", "usDODClass5"},
-	{"2.16.840.1.101.2.1.12.0", "testSecurityPolicy"},
-	{"2.16.840.1.101.2.1.12.0.1", "tsp1"},
-	{"2.16.840.1.101.2.1.12.0.1.0", "tsp1SecurityCategories"},
-	{"2.16.840.1.101.2.1.12.0.1.0.0", "tsp1TagSetZero"},
-	{"2.16.840.1.101.2.1.12.0.1.0.1", "tsp1TagSetOne"},
-	{"2.16.840.1.101.2.1.12.0.1.0.2", "tsp1TagSetTwo"},
-	{"2.16.840.1.101.2.1.12.0.2", "tsp2"},
-	{"2.16.840.1.101.2.1.12.0.2.0", "tsp2SecurityCategories"},
-	{"2.16.840.1.101.2.1.12.0.2.0.0", "tsp2TagSetZero"},
-	{"2.16.840.1.101.2.1.12.0.2.0.1", "tsp2TagSetOne"},
-	{"2.16.840.1.101.2.1.12.0.2.0.2", "tsp2TagSetTwo"},
-	{"2.16.840.1.101.2.1.12.0.3", "kafka"},
-	{"2.16.840.1.101.2.1.12.0.3.0", "kafkaSecurityCategories"},
-	{"2.16.840.1.101.2.1.12.0.3.0.1", "kafkaTagSetName1"},
-	{"2.16.840.1.101.2.1.12.0.3.0.2", "kafkaTagSetName2"},
-	{"2.16.840.1.101.2.1.12.0.3.0.3", "kafkaTagSetName3"},
-	{"2.16.840.1.101.2.1.12.1.1", "tcp1"},
-	{"2.16.840.1.101.3.1", "slabel"},
-	{"2.16.840.1.101.3.2", "pki"},
-	{"2.16.840.1.101.3.2.1", "NIST.policyIdentifier"},
-	{"2.16.840.1.101.3.2.1.3.1", "fbcaRudimentaryPolicy"},
-	{"2.16.840.1.101.3.2.1.3.2", "fbcaBasicPolicy"},
-	{"2.16.840.1.101.3.2.1.3.3", "fbcaMediumPolicy"},
-	{"2.16.840.1.101.3.2.1.3.4", "fbcaHighPolicy"},
-	{"2.16.840.1.101.3.2.1.48.1", "nistTestPolicy1"},
-	{"2.16.840.1.101.3.2.1.48.2", "nistTestPolicy2"},
-	{"2.16.840.1.101.3.2.1.48.3", "nistTestPolicy3"},
-	{"2.16.840.1.101.3.2.1.48.4", "nistTestPolicy4"},
-	{"2.16.840.1.101.3.2.1.48.5", "nistTestPolicy5"},
-	{"2.16.840.1.101.3.2.1.48.6", "nistTestPolicy6"},
-	{"2.16.840.1.101.3.2.2", "gak"},
-	{"2.16.840.1.101.3.2.2.1", "kRAKey"},
-	{"2.16.840.1.101.3.2.3", "extensions"},
-	{"2.16.840.1.101.3.2.3.1", "kRTechnique"},
-	{"2.16.840.1.101.3.2.3.2", "kRecoveryCapable"},
-	{"2.16.840.1.101.3.2.3.3", "kR"},
-	{"2.16.840.1.101.3.2.4", "keyRecoverySchemes"},
-	{"2.16.840.1.101.3.2.5", "krapola"},
-	{"2.16.840.1.101.3.3", "arpa"},
-	{"2.16.840.1.101.3.4", "nistAlgorithm"},
-	{"2.16.840.1.101.3.4.1", "aes"},
-	{"2.16.840.1.101.3.4.1.1", "aes128-ECB"},
-	{"2.16.840.1.101.3.4.1.2", "aes128-CBC"},
-	{"2.16.840.1.101.3.4.1.3", "aes128-OFB"},
-	{"2.16.840.1.101.3.4.1.4", "aes128-CFB"},
-	{"2.16.840.1.101.3.4.1.5", "aes128-wrap"},
-	{"2.16.840.1.101.3.4.1.6", "aes128-GCM"},
-	{"2.16.840.1.101.3.4.1.7", "aes128-CCM"},
-	{"2.16.840.1.101.3.4.1.8", "aes128-wrap-pad"},
-	{"2.16.840.1.101.3.4.1.21", "aes192-ECB"},
-	{"2.16.840.1.101.3.4.1.22", "aes192-CBC"},
-	{"2.16.840.1.101.3.4.1.23", "aes192-OFB"},
-	{"2.16.840.1.101.3.4.1.24", "aes192-CFB"},
-	{"2.16.840.1.101.3.4.1.25", "aes192-wrap"},
-	{"2.16.840.1.101.3.4.1.26", "aes192-GCM"},
-	{"2.16.840.1.101.3.4.1.27", "aes192-CCM"},
-	{"2.16.840.1.101.3.4.1.28", "aes192-wrap-pad"},
-	{"2.16.840.1.101.3.4.1.41", "aes256-ECB"},
-	{"2.16.840.1.101.3.4.1.42", "aes256-CBC"},
-	{"2.16.840.1.101.3.4.1.43", "aes256-OFB"},
-	{"2.16.840.1.101.3.4.1.44", "aes256-CFB"},
-	{"2.16.840.1.101.3.4.1.45", "aes256-wrap"},
-	{"2.16.840.1.101.3.4.1.46", "aes256-GCM"},
-	{"2.16.840.1.101.3.4.1.47", "aes256-CCM"},
-	{"2.16.840.1.101.3.4.1.48", "aes256-wrap-pad"},
-	{"2.16.840.1.101.3.4.2", "hashAlgos"},
-	{"2.16.840.1.101.3.4.2.1", "sha-256"},
-	{"2.16.840.1.101.3.4.2.2", "sha-384"},
-	{"2.16.840.1.101.3.4.2.3", "sha-512"},
-	{"2.16.840.1.101.3.4.2.4", "sha-224"},
-	{"2.16.840.1.101.3.4.3.1", "dsaWithSha224"},
-	{"2.16.840.1.101.3.4.3.2", "dsaWithSha256"},
-	{"2.16.840.1.113719.1.2.8", "novellAlgorithm"},
-	{"2.16.840.1.113719.1.2.8.22", "desCbcIV8"},
-	{"2.16.840.1.113719.1.2.8.23", "desCbcPadIV8"},
-	{"2.16.840.1.113719.1.2.8.24", "desEDE2CbcIV8"},
-	{"2.16.840.1.113719.1.2.8.25", "desEDE2CbcPadIV8"},
-	{"2.16.840.1.113719.1.2.8.26", "desEDE3CbcIV8"},
-	{"2.16.840.1.113719.1.2.8.27", "desEDE3CbcPadIV8"},
-	{"2.16.840.1.113719.1.2.8.28", "rc5CbcPad"},
-	{"2.16.840.1.113719.1.2.8.29", "md2WithRSAEncryptionBSafe1"},
-	{"2.16.840.1.113719.1.2.8.30", "md5WithRSAEncryptionBSafe1"},
-	{"2.16.840.1.113719.1.2.8.31", "sha1WithRSAEncryptionBSafe1"},
-	{"2.16.840.1.113719.1.2.8.32", "lmDigest"},
-	{"2.16.840.1.113719.1.2.8.40", "md2"},
-	{"2.16.840.1.113719.1.2.8.50", "md5"},
-	{"2.16.840.1.113719.1.2.8.51", "ikeHmacWithSHA1-RSA"},
-	{"2.16.840.1.113719.1.2.8.52", "ikeHmacWithMD5-RSA"},
-	{"2.16.840.1.113719.1.2.8.69", "rc2CbcPad"},
-	{"2.16.840.1.113719.1.2.8.82", "sha-1"},
-	{"2.16.840.1.113719.1.2.8.92", "rc2BSafe1Cbc"},
-	{"2.16.840.1.113719.1.2.8.95", "md4"},
-	{"2.16.840.1.113719.1.2.8.130", "md4Packet"},
-	{"2.16.840.1.113719.1.2.8.131", "rsaEncryptionBsafe1"},
-	{"2.16.840.1.113719.1.2.8.132", "nwPassword"},
-	{"2.16.840.1.113719.1.2.8.133", "novellObfuscate-1"},
-	{"2.16.840.1.113719.1.9", "pki"},
-	{"2.16.840.1.113719.1.9.4", "pkiAttributeType"},
-	{"2.16.840.1.113719.1.9.4.1", "securityAttributes"},
-	{"2.16.840.1.113719.1.9.4.2", "relianceLimit"},
-	{"2.16.840.1.113730.1", "cert-extension"},
-	{"2.16.840.1.113730.1.1", "netscape-cert-type"},
-	{"2.16.840.1.113730.1.2", "netscape-base-url"},
-	{"2.16.840.1.113730.1.3", "netscape-revocation-url"},
-	{"2.16.840.1.113730.1.4", "netscape-ca-revocation-url"},
-	{"2.16.840.1.113730.1.7", "netscape-cert-renewal-url"},
-	{"2.16.840.1.113730.1.8", "netscape-ca-policy-url"},
-	{"2.16.840.1.113730.1.9", "HomePage-url"},
-	{"2.16.840.1.113730.1.10", "EntityLogo"},
-	{"2.16.840.1.113730.1.11", "UserPicture"},
-	{"2.16.840.1.113730.1.12", "netscape-ssl-server-name"},
-	{"2.16.840.1.113730.1.13", "netscape-comment"},
-	{"2.16.840.1.113730.2", "data-type"},
-	{"2.16.840.1.113730.2.1", "dataGIF"},
-	{"2.16.840.1.113730.2.2", "dataJPEG"},
-	{"2.16.840.1.113730.2.3", "dataURL"},
-	{"2.16.840.1.113730.2.4", "dataHTML"},
-	{"2.16.840.1.113730.2.5", "certSequence"},
-	{"2.16.840.1.113730.2.6", "certURL"},
-	{"2.16.840.1.113730.3", "directory"},
-	{"2.16.840.1.113730.3.1", "ldapDefinitions"},
-	{"2.16.840.1.113730.3.1.1", "carLicense"},
-	{"2.16.840.1.113730.3.1.2", "departmentNumber"},
-	{"2.16.840.1.113730.3.1.3", "employeeNumber"},
-	{"2.16.840.1.113730.3.1.4", "employeeType"},
-	{"2.16.840.1.113730.3.2.2", "inetOrgPerson"},
-	{"2.16.840.1.113730.4.1", "serverGatedCrypto"},
-	{"2.16.840.1.113733.1", "pki"},
-	{"2.16.840.1.113733.1.9", "pkcs7Attribute"},
-	{"2.16.840.1.113733.1.9.2", "messageType"},
-	{"2.16.840.1.113733.1.9.3", "pkiStatus"},
-	{"2.16.840.1.113733.1.9.4", "failInfo"},
-	{"2.16.840.1.113733.1.9.5", "senderNonce"},
-	{"2.16.840.1.113733.1.9.6", "recipientNonce"},
-	{"2.16.840.1.113733.1.9.7", "transID"},
-	{"2.16.840.1.113733.1.9.8", "extensionReq"},
-	{"2.16.840.1.113741.2", "intelCDSA"},
-	{"2.16.840.1.114412.1", "digiCertNonEVCerts"},
-	{"2.16.840.1.114412.1.1", "digiCertOVCert"},
-	{"2.16.840.1.114412.1.2", "digiCertDVCert"},
-	{"2.16.840.1.114412.1.11", "digiCertFederatedDeviceCert"},
-	{"2.16.840.1.114412.1.3.0.1", "digiCertGlobalCAPolicy"},
-	{"2.16.840.1.114412.1.3.0.2", "digiCertHighAssuranceEVCAPolicy"},
-	{"2.16.840.1.114412.1.3.0.3", "digiCertGlobalRootCAPolicy"},
-	{"2.16.840.1.114412.1.3.0.4", "digiCertAssuredIDRootCAPolicy"},
-	{"2.16.840.1.114412.2.2", "digiCertEVCert"},
-	{"2.16.840.1.114412.2.3", "digiCertObjectSigningCert"},
-	{"2.16.840.1.114412.2.3.1", "digiCertCodeSigningCert"},
-	{"2.16.840.1.114412.2.3.2", "digiCertEVCodeSigningCert"},
-	{"2.16.840.1.114412.2.3.11", "digiCertKernelCodeSigningCert"},
-	{"2.16.840.1.114412.2.3.21", "digiCertDocumentSigningCert"},
-	{"2.16.840.1.114412.2.4", "digiCertClientCert"},
-	{"2.16.840.1.114412.2.4.1.1", "digiCertLevel1PersonalClientCert"},
-	{"2.16.840.1.114412.2.4.1.2", "digiCertLevel1EnterpriseClientCert"},
-	{"2.16.840.1.114412.2.4.2", "digiCertLevel2ClientCert"},
-	{"2.16.840.1.114412.2.4.3.1", "digiCertLevel3USClientCert"},
-	{"2.16.840.1.114412.2.4.3.2", "digiCertLevel3CBPClientCert"},
-	{"2.16.840.1.114412.2.4.4.1", "digiCertLevel4USClientCert"},
-	{"2.16.840.1.114412.2.4.4.2", "digiCertLevel4CBPClientCert"},
-	{"2.16.840.1.114412.2.4.5.1", "digiCertPIVHardwareCert"},
-	{"2.16.840.1.114412.2.4.5.2", "digiCertPIVCardAuthCert"},
-	{"2.16.840.1.114412.2.4.5.3", "digiCertPIVContentSigningCert"},
-	{"2.16.840.1.114412.4.31", "digiCertGridClassicCert"},
-	{"2.16.840.1.114412.4.31.5", "digiCertGridIntegratedCert"},
-	{"2.16.840.1.114412.31.4.31.1", "digiCertGridHostCert"},
-	{"2.23.42.0", "contentType"},
-	{"2.23.42.0.0", "panData"},
-	{"2.23.42.0.1", "panToken"},
-	{"2.23.42.0.2", "panOnly"},
-	{"2.23.42.1", "msgExt"},
-	{"2.23.42.2", "field"},
-	{"2.23.42.2.0", "fullName"},
-	{"2.23.42.2.1", "givenName"},
-	{"2.23.42.2.2", "familyName"},
-	{"2.23.42.2.3", "birthFamilyName"},
-	{"2.23.42.2.4", "placeName"},
-	{"2.23.42.2.5", "identificationNumber"},
-	{"2.23.42.2.6", "month"},
-	{"2.23.42.2.7", "date"},
-	{"2.23.42.2.8", "address"},
-	{"2.23.42.2.9", "telephone"},
-	{"2.23.42.2.10", "amount"},
-	{"2.23.42.2.11", "accountNumber"},
-	{"2.23.42.2.12", "passPhrase"},
-	{"2.23.42.3", "attribute"},
-	{"2.23.42.3.0", "cert"},
-	{"2.23.42.3.0.0", "rootKeyThumb"},
-	{"2.23.42.3.0.1", "additionalPolicy"},
-	{"2.23.42.4", "algorithm"},
-	{"2.23.42.5", "policy"},
-	{"2.23.42.5.0", "root"},
-	{"2.23.42.6", "module"},
-	{"2.23.42.7", "certExt"},
-	{"2.23.42.7.0", "hashedRootKey"},
-	{"2.23.42.7.1", "certificateType"},
-	{"2.23.42.7.2", "merchantData"},
-	{"2.23.42.7.3", "cardCertRequired"},
-	{"2.23.42.7.4", "tunneling"},
-	{"2.23.42.7.5", "setExtensions"},
-	{"2.23.42.7.6", "setQualifier"},
-	{"2.23.42.8", "brand"},
-	{"2.23.42.8.1", "IATA-ATA"},
-	{"2.23.42.8.4", "VISA"},
-	{"2.23.42.8.5", "MasterCard"},
-	{"2.23.42.8.30", "Diners"},
-	{"2.23.42.8.34", "AmericanExpress"},
-	{"2.23.42.8.6011", "Novus"},
-	{"2.23.42.9", "vendor"},
-	{"2.23.42.9.0", "GlobeSet"},
-	{"2.23.42.9.1", "IBM"},
-	{"2.23.42.9.2", "CyberCash"},
-	{"2.23.42.9.3", "Terisa"},
-	{"2.23.42.9.4", "RSADSI"},
-	{"2.23.42.9.5", "VeriFone"},
-	{"2.23.42.9.6", "TrinTech"},
-	{"2.23.42.9.7", "BankGate"},
-	{"2.23.42.9.8", "GTE"},
-	{"2.23.42.9.9", "CompuSource"},
-	{"2.23.42.9.10", "Griffin"},
-	{"2.23.42.9.11", "Certicom"},
-	{"2.23.42.9.12", "OSS"},
-	{"2.23.42.9.13", "TenthMountain"},
-	{"2.23.42.9.14", "Antares"},
-	{"2.23.42.9.15", "ECC"},
-	{"2.23.42.9.16", "Maithean"},
-	{"2.23.42.9.17", "Netscape"},
-	{"2.23.42.9.18", "Verisign"},
-	{"2.23.42.9.19", "BlueMoney"},
-	{"2.23.42.9.20", "Lacerte"},
-	{"2.23.42.9.21", "Fujitsu"},
-	{"2.23.42.9.22", "eLab"},
-	{"2.23.42.9.23", "Entrust"},
-	{"2.23.42.9.24", "VIAnet"},
-	{"2.23.42.9.25", "III"},
-	{"2.23.42.9.26", "OpenMarket"},
-	{"2.23.42.9.27", "Lexem"},
-	{"2.23.42.9.28", "Intertrader"},
-	{"2.23.42.9.29", "Persimmon"},
-	{"2.23.42.9.30", "NABLE"},
-	{"2.23.42.9.31", "espace-net"},
-	{"2.23.42.9.32", "Hitachi"},
-	{"2.23.42.9.33", "Microsoft"},
-	{"2.23.42.9.34", "NEC"},
-	{"2.23.42.9.35", "Mitsubishi"},
-	{"2.23.42.9.36", "NCR"},
-	{"2.23.42.9.37", "e-COMM"},
-	{"2.23.42.9.38", "Gemplus"},
-	{"2.23.42.10", "national"},
-	{"2.23.42.10.392", "Japan"},
-	{"2.23.43.1.4", "wTLS-ECC"},
-	{"2.23.43.1.4.1", "wTLS-ECC-curve1"},
-	{"2.23.43.1.4.6", "wTLS-ECC-curve6"},
-	{"2.23.43.1.4.8", "wTLS-ECC-curve8"},
-	{"2.23.43.1.4.9", "wTLS-ECC-curve9"},
-	{"2.23.133", "tCPA"},
-	{"2.23.133.1", "tcpaSpecVersion"},
-	{"2.23.133.2", "tcpaAttribute"},
-	{"2.23.133.2.1", "tcpaTpmManufacturer"},
-	{"2.23.133.2.2", "tcpaTpmModel"},
-	{"2.23.133.2.3", "tcpaTpmVersion"},
-	{"2.23.133.2.4", "tcpaPlatformManufacturer"},
-	{"2.23.133.2.5", "tcpaPlatformModel"},
-	{"2.23.133.2.6", "tcpaPlatformVersion"},
-	{"2.23.133.2.7", "tcpaComponentManufacturer"},
-	{"2.23.133.2.8", "tcpaComponentModel"},
-	{"2.23.133.2.9", "tcpaComponentVersion"},
-	{"2.23.133.2.10", "tcpaSecurityQualities"},
-	{"2.23.133.2.11", "tcpaTpmProtectionProfile"},
-	{"2.23.133.2.12", "tcpaTpmSecurityTarget"},
-	{"2.23.133.2.13", "tcpaFoundationProtectionProfile"},
-	{"2.23.133.2.14", "tcpaFoundationSecurityTarget"},
-	{"2.23.133.2.15", "tcpaTpmIdLabel"},
-	{"2.23.133.3", "tcpaProtocol"},
-	{"2.23.133.3.1", "tcpaPrttTpmIdProtocol"},
-	{"2.23.134.1.4.2.1", "postSignumRootQCA.."},
-	{"2.23.134.1.2.2.3", "postSignumPublicCA."},
-	{"2.23.134.1.2.1.8.210", "postSignumCommercialServerPolicy"},
-	{"2.23.136.1.1.1", "mRTDSignatureData"},
-	{"2.54.1775.2", "hashedRootKey"},
-	{"2.54.1775.3", "certificateType"},
-	{"2.54.1775.4", "merchantData"},
-	{"2.54.1775.5", "cardCertRequired"},
-	{"2.54.1775.6", "tunneling"},
-	{"2.54.1775.7", "setQualifier"},
-	{"2.54.1775.99", "setData"},
-	{0, 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OIDS_H */
-
diff -Nru radare2-2.3.0+dfsg/libr/util/r_pkcs7.c radare2-2.8.0+dfsg/libr/util/r_pkcs7.c
--- radare2-2.3.0+dfsg/libr/util/r_pkcs7.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_pkcs7.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,755 +0,0 @@
-/* radare2 - LGPL - Copyright 2017 - wargio */
-
-#include <stdlib.h>
-#include <string.h>
-#include <r_util.h>
-#include <r_types.h>
-#include "r_x509_internal.h"
-#include "r_pkcs7_internal.h"
-
-extern RJSVar *r_x509_name_json (RX509Name* name);
-
-bool r_pkcs7_parse_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls, RASN1Object *object) {
-	ut32 i;
-	if (!crls || !object) {
-		return false;
-	}
-	if (object->list.length > 0) {
-		crls->elements = (RX509CertificateRevocationList **) calloc (object->list.length, sizeof (RX509CertificateRevocationList*));
-		if (!crls->elements) {
-			return false;
-		}
-		crls->length = object->list.length;
-		for (i = 0; i < crls->length; ++i) {
-			crls->elements[i] = r_x509_parse_crl (object->list.objects[i]);
-		}
-	}
-	return true;
-}
-
-void r_pkcs7_free_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls) {
-	ut32 i;
-	if (crls) {
-		for (i = 0; i < crls->length; ++i) {
-			r_x509_free_crl (crls->elements[i]);
-			crls->elements[i] = NULL;
-		}
-		R_FREE (crls->elements);
-		// Used internally pkcs #7, so it should't free crls.
-	}
-}
-
-bool r_pkcs7_parse_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac, RASN1Object *object) {
-	ut32 i;
-	if (!ecac || !object) {
-		return false;
-	}
-	if (object->list.length > 0) {
-		ecac->elements = (RX509Certificate **) calloc (object->list.length, sizeof (RX509Certificate*));
-		if (!ecac->elements) {
-			return false;
-		}
-		ecac->length = object->list.length;
-		for (i = 0; i < ecac->length; ++i) {
-			ecac->elements[i] = r_x509_parse_certificate (object->list.objects[i]);
-			object->list.objects[i] = NULL;
-		}
-	}
-	return true;
-}
-
-void r_pkcs7_free_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac) {
-	ut32 i;
-	if (ecac) {
-		for (i = 0; i < ecac->length; ++i) {
-			r_x509_free_certificate (ecac->elements[i]);
-			ecac->elements[i] = NULL;
-		}
-		R_FREE (ecac->elements);
-		// Used internally pkcs #7, so it should't free ecac.
-	}
-}
-
-bool r_pkcs7_parse_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai, RASN1Object *object) {
-	ut32 i;
-	if (!dai || !object) {
-		return false;
-	}
-	if (object->list.length > 0) {
-		dai->elements = (RX509AlgorithmIdentifier **) calloc (object->list.length, sizeof (RX509AlgorithmIdentifier*));
-		if (!dai->elements) {
-			return false;
-		}
-		dai->length = object->list.length;
-		for (i = 0; i < dai->length; ++i) {
-			// r_x509_parse_algorithmidentifier returns bool,
-			// so i have to allocate before calling the function
-			dai->elements[i] = (RX509AlgorithmIdentifier *) malloc (sizeof (RX509AlgorithmIdentifier));
-			//should i handle invalid memory? the function checks the pointer
-			//or it should return if dai->elements[i] == NULL ?
-			if (dai->elements[i]) {
-				//Memset is needed to initialize to 0 the structure and avoid garbage.
-				memset (dai->elements[i], 0, sizeof (RX509AlgorithmIdentifier));
-				r_x509_parse_algorithmidentifier (dai->elements[i], object->list.objects[i]);
-			}
-		}
-	}
-	return true;
-}
-
-void r_pkcs7_free_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai) {
-	ut32 i;
-	if (dai) {
-		for (i = 0; i < dai->length; ++i) {
-			if (dai->elements[i]) {
-				r_x509_free_algorithmidentifier (dai->elements[i]);
-				// r_x509_free_algorithmidentifier doesn't free the pointer
-				// because on x509 the original use was internal.
-				R_FREE (dai->elements[i]);
-			}
-		}
-		R_FREE (dai->elements);
-		// Used internally pkcs #7, so it should't free dai.
-	}
-}
-
-bool r_pkcs7_parse_contentinfo (RPKCS7ContentInfo* ci, RASN1Object *object) {
-	if (!ci || !object || object->list.length < 1 || !object->list.objects[0]) {
-		return false;
-	}
-	ci->contentType = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
-	if (object->list.length > 1) {
-		RASN1Object *obj1 = object->list.objects[1];
-		if (obj1) {
-			ci->content = r_asn1_create_binary (obj1->sector, obj1->length);
-		}
-	}
-	return true;
-}
-
-void r_pkcs7_free_contentinfo (RPKCS7ContentInfo* ci) {
-	if (ci) {
-		r_asn1_free_binary (ci->content);
-		r_asn1_free_string (ci->contentType);
-		// Used internally pkcs #7, so it should't free ci.
-	}
-}
-
-bool r_pkcs7_parse_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu, RASN1Object *object) {
-	if (!iasu || !object || object->list.length != 2) {
-		return false;
-	}
-	r_x509_parse_name (&iasu->issuer, object->list.objects[0]);
-	RASN1Object *obj1 = object->list.objects[1];
-	if (obj1) {
-		iasu->serialNumber = r_asn1_create_binary (obj1->sector, obj1->length);
-	}
-	return true;
-}
-
-void r_pkcs7_free_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu) {
-	if (iasu) {
-		r_x509_free_name (&iasu->issuer);
-		r_asn1_free_binary (iasu->serialNumber);
-		// Used internally pkcs #7, so it should't free iasu.
-	}
-}
-
-/*
-	RX509AlgorithmIdentifier digestEncryptionAlgorithm;
-	RASN1Object *encryptedDigest;
-	RASN1Object *unauthenticatedAttributes; //Optional type ??
-} RPKCS7SignerInfo;
- */
-
-bool r_pkcs7_parse_signerinfo (RPKCS7SignerInfo* si, RASN1Object *object) {
-	RASN1Object **elems;
-	ut32 shift = 3;
-	if (!si || !object || object->list.length < 5) {
-		return false;
-	}
-	elems = object->list.objects;
-	//Following RFC
-	si->version = (ut32) elems[0]->sector[0];
-	r_pkcs7_parse_issuerandserialnumber (&si->issuerAndSerialNumber, elems[1]);
-	r_x509_parse_algorithmidentifier (&si->digestAlgorithm, elems[2]);
-	if (shift < object->list.length && elems[shift]->klass == CLASS_CONTEXT && elems[shift]->tag == 0) {
-		r_pkcs7_parse_attributes (&si->authenticatedAttributes, elems[shift]);
-		shift++;
-	}
-	if (shift < object->list.length) {
-		r_x509_parse_algorithmidentifier (&si->digestEncryptionAlgorithm, elems[shift]);
-		shift++;
-	}
-	if (shift < object->list.length) {
-		RASN1Object *obj1 = object->list.objects[shift];
-		if (obj1) {
-			si->encryptedDigest = r_asn1_create_binary (obj1->sector, obj1->length);
-			shift++;
-		}
-	}
-	if (shift < object->list.length) {
-		RASN1Object *elem = elems[shift];
-		if (elem && elem->klass == CLASS_CONTEXT && elem->tag == 1) {
-			r_pkcs7_parse_attributes (&si->unauthenticatedAttributes, elems[shift]);
-		}
-	}
-	return true;
-}
-
-void r_pkcs7_free_signerinfo (RPKCS7SignerInfo* si) {
-	if (si) {
-		r_pkcs7_free_issuerandserialnumber (&si->issuerAndSerialNumber);
-		r_x509_free_algorithmidentifier (&si->digestAlgorithm);
-		r_pkcs7_free_attributes (&si->authenticatedAttributes);
-		r_x509_free_algorithmidentifier (&si->digestEncryptionAlgorithm);
-		r_asn1_free_binary (si->encryptedDigest);
-		r_pkcs7_free_attributes (&si->unauthenticatedAttributes);
-		free (si);
-	}
-}
-
-bool r_pkcs7_parse_signerinfos (RPKCS7SignerInfos *ss, RASN1Object *object) {
-	ut32 i;
-	if (!ss || !object) {
-		return false;
-	}
-	if (object->list.length > 0) {
-		ss->elements = (RPKCS7SignerInfo **) calloc (object->list.length, sizeof (RPKCS7SignerInfo*));
-		if (!ss->elements) {
-			return false;
-		}
-		ss->length = object->list.length;
-		for (i = 0; i < ss->length; ++i) {
-			// r_pkcs7_parse_signerinfo returns bool,
-			// so i have to allocate before calling the function
-			ss->elements[i] = R_NEW0 (RPKCS7SignerInfo);
-			//should i handle invalid memory? the function checks the pointer
-			//or it should return if si->elements[i] == NULL ?
-			r_pkcs7_parse_signerinfo (ss->elements[i], object->list.objects[i]);
-		}
-	}
-	return true;
-}
-
-void r_pkcs7_free_signerinfos (RPKCS7SignerInfos *ss) {
-	ut32 i;
-	if (ss) {
-		for (i = 0; i < ss->length; i++) {
-			r_pkcs7_free_signerinfo (ss->elements[i]);
-			ss->elements[i] = NULL;
-		}
-		R_FREE (ss->elements);
-		// Used internally pkcs #7, so it should't free ss.
-	}
-}
-
-bool r_pkcs7_parse_signeddata (RPKCS7SignedData *sd, RASN1Object *object) {
-	ut32 shift = 3;
-	if (!sd || !object || object->list.length < 4) {
-		return false;
-	}
-	memset (sd, 0, sizeof (RPKCS7SignedData));
-	RASN1Object **elems = object->list.objects;
-	//Following RFC
-	sd->version = (ut32) elems[0]->sector[0]; 
-	r_pkcs7_parse_digestalgorithmidentifier (&sd->digestAlgorithms, elems[1]);
-	r_pkcs7_parse_contentinfo (&sd->contentInfo, elems[2]);
-	//Optional
-	if (shift < object->list.length && elems[shift] && elems[shift]->klass == CLASS_CONTEXT && elems[shift]->tag == 0) {
-		r_pkcs7_parse_extendedcertificatesandcertificates (&sd->certificates, elems[shift]);
-		shift++;
-	}
-	//Optional
-	if (shift < object->list.length && elems[shift] && elems[shift]->klass == CLASS_CONTEXT && elems[shift]->tag == 1) {
-		r_pkcs7_parse_certificaterevocationlists (&sd->crls, elems[shift]);
-		shift++;
-	}
-	if (shift < object->list.length) {
-		r_pkcs7_parse_signerinfos (&sd->signerinfos, elems[shift]);
-	}
-	return true;
-}
-
-void r_pkcs7_free_signeddata (RPKCS7SignedData* sd) {
-	if (sd) {
-		r_pkcs7_free_digestalgorithmidentifier (&sd->digestAlgorithms);
-		r_pkcs7_free_contentinfo (&sd->contentInfo);
-		r_pkcs7_free_extendedcertificatesandcertificates (&sd->certificates);
-		r_pkcs7_free_certificaterevocationlists (&sd->crls);
-		r_pkcs7_free_signerinfos (&sd->signerinfos);
-		// Used internally pkcs #7, so it should't free sd.
-	}
-}
-
-RCMS *r_pkcs7_parse_cms (const ut8 *buffer, ut32 length) {
-	RASN1Object *object;
-	RCMS *container;
-	if (!buffer || !length) {
-		return NULL;
-	}
-	container = R_NEW0 (RCMS);
-	if (!container) {
-		return NULL;
-	}
-	object = r_asn1_create_object (buffer, length);
-	if (!object || object->list.length != 2 || !object->list.objects ||
-		!object->list.objects[0] || !object->list.objects[1] ||
-		object->list.objects[1]->list.length != 1) {
-		r_asn1_free_object (object);
-		free (container);
-		return NULL;
-	}
-	if (object->list.objects[0]) {
-		container->contentType = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
-	}
-	if (object->list.objects[1]) {
-		r_pkcs7_parse_signeddata (&container->signedData, object->list.objects[1]->list.objects[0]);
-	}
-	r_asn1_free_object (object);
-	return container;
-}
-
-void r_pkcs7_free_cms (RCMS* container) {
-	if (container) {
-		r_asn1_free_string (container->contentType);
-		r_pkcs7_free_signeddata (&container->signedData);
-		free (container);
-	}
-}
-
-RPKCS7Attribute* r_pkcs7_parse_attribute (RASN1Object *object) {
-	RPKCS7Attribute* attribute;
-	if (!object || object->list.length < 1) {
-		return NULL;
-	}
-	attribute = R_NEW0 (RPKCS7Attribute);
-	if (!attribute) {
-		return NULL;
-	}
-	if (object->list.objects[0]) {
-		attribute->oid = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
-	}
-	if (object->list.length == 2) {
-		RASN1Object * obj1 = object->list.objects[1];
-		if (obj1) {
-			attribute->data = r_asn1_create_binary (obj1->sector, obj1->length);
-		}
-	}
-	return attribute;
-}
-
-void r_pkcs7_free_attribute (RPKCS7Attribute* attribute) {
-	if (attribute) {
-		r_asn1_free_binary (attribute->data);
-		r_asn1_free_string (attribute->oid);
-		free (attribute);
-	}
-}
-
-bool r_pkcs7_parse_attributes (RPKCS7Attributes* attributes, RASN1Object *object) {
-	ut32 i;
-	if (!attributes || !object || !object->list.length) {
-		return false;
-	}
-
-	attributes->length = object->list.length;
-	if (attributes->length > 0) {
-		attributes->elements = R_NEWS0 (RPKCS7Attribute*, attributes->length);
-		if (!attributes->elements) {
-			attributes->length = 0;
-			return false;
-		}
-		for (i = 0; i < object->list.length; ++i) {
-			attributes->elements[i] = r_pkcs7_parse_attribute (object->list.objects[i]);
-		}
-	}
-	return true;
-}
-
-void r_pkcs7_free_attributes (RPKCS7Attributes* attributes) {
-	ut32 i;
-	if (attributes) {
-		for (i = 0; i < attributes->length; ++i) {
-			r_pkcs7_free_attribute (attributes->elements[i]);
-		}
-		R_FREE (attributes->elements);
-		// Used internally pkcs #7, so it should't free attributes.
-	}
-}
-
-char* r_pkcs7_signerinfos_dump (RX509CertificateRevocationList *crl, char* buffer, ut32 length, const char* pad) {
-	RASN1String *algo = NULL, *last = NULL, *next = NULL;
-	ut32 i, p;
-	int r;
-	char *tmp, *pad2, *pad3;
-	if (!crl || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	pad3 = r_str_newf ("%s    ", pad);
-	if (!pad3) return NULL;
-
-	pad2 = pad3 + 2;
-	algo = crl->signature.algorithm;
-	last = crl->lastUpdate;
-	next = crl->nextUpdate;
-	r = snprintf (buffer, length, "%sCRL:\n%sSignature:\n%s%s\n%sIssuer\n",
-				pad, pad2, pad3, algo ? algo->string : "", pad2);
-	p = (ut32) r;
-	if (r < 0 || !(tmp = r_x509_name_dump (&crl->issuer, buffer + p, length - p, pad3))) {
-		free (pad3);
-		return NULL;
-	}
-	p = tmp - buffer;
-	if (length <= p) {
-		free (pad3);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sLast Update: %s\n%sNext Update: %s\n%sRevoked Certificates:\n",
-				pad2, last ? last->string : "Missing",
-				pad2, next ? next->string : "Missing", pad2);
-	p += (ut32) r;
-	if (r < 0) {
-		free (pad3);
-		return NULL;
-	}
-	for (i = 0; i < crl->length; ++i) {
-		if (length <= p || !(tmp = r_x509_crlentry_dump (crl->revokedCertificates[i], buffer + p, length - p, pad3))) {
-			free (pad3);
-			return NULL;
-		}
-		p = tmp - buffer;
-	}
-
-	free (pad3);
-	return buffer + p;
-}
-
-char* r_x509_signedinfo_dump (RPKCS7SignerInfo *si, char* buffer, ut32 length, const char* pad) {
-	RASN1String *s = NULL;
-	RASN1Binary *o = NULL;
-	ut32 i, p;
-	int r;
-	char *tmp, *pad2, *pad3;
-	if (!si || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	pad3 = r_str_newf ("%s    ", pad);
-	if (!pad3) {
-		return NULL;
-	}
-	pad2 = pad3 + 2;
-
-
-	r = snprintf (buffer, length, "%sSignerInfo:\n%sVersion: v%u\n%sIssuer\n", pad, pad2, si->version + 1, pad2);
-	p = (ut32) r;
-	if (r < 0) {
-		free (pad3);
-		return NULL;
-	}
-
-	if (length <= p || !(tmp = r_x509_name_dump (&si->issuerAndSerialNumber.issuer, buffer + p, length - p, pad3))) {
-		free (pad3);
-		return NULL;
-	}
-	p = tmp - buffer;
-	if ((o = si->issuerAndSerialNumber.serialNumber)) {
-		s = r_asn1_stringify_integer (o->binary, o->length);
-	} else {
-		s = NULL;
-	}
-	if (length <= p) {
-		free (pad3);
-		r_asn1_free_string (s);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sSerial Number:\n%s%s\n", pad2, pad3, s ? s->string : "Missing");
-	p += (ut32) r;
-	r_asn1_free_string (s);
-	if (r < 0 || length <= p) {
-		free (pad3);
-		return NULL;
-	}
-	s = si->digestAlgorithm.algorithm;
-	r = snprintf (buffer + p, length - p, "%sDigest Algorithm:\n%s%s\n%sAuthenticated Attributes:\n",
-				pad2, pad3, s ? s->string : "Missing", pad2);
-	p += (ut32) r;
-	if (r < 0 || length <= p) {
-		free (pad3);
-		return NULL;
-	}
-	for (i = 0; i < si->authenticatedAttributes.length; ++i) {
-		RPKCS7Attribute* attr = si->authenticatedAttributes.elements[i];
-		if (!attr) continue;
-		r = snprintf (buffer + p, length - p, "%s%s: %u bytes\n",
-					pad3, attr->oid ? attr->oid->string : "Missing", attr->data ? attr->data->length : 0);
-		p += (ut32) r;
-		if (r < 0 || length <= p) {
-			free (pad3);
-			return NULL;
-		}
-	}
-	s = si->digestEncryptionAlgorithm.algorithm;
-	if (length <= p) {
-		free (pad3);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sDigest Encryption Algorithm\n%s%s\n",
-				pad2, pad3, s ? s->string : "Missing");
-	p += (ut32) r;
-	if (r < 0 || length <= p) {
-		free (pad3);
-		return NULL;
-	}
-
-//	if ((o = si->encryptedDigest)) s = r_asn1_stringify_bytes (o->binary, o->length);
-//	else s = NULL;
-//	r = snprintf (buffer + p, length - p, "%sEncrypted Digest: %u bytes\n%s\n", pad2, o ? o->length : 0, s ? s->string : "Missing");
-//	p += (ut32) r;
-//	r_asn1_free_string (s);
-	r = snprintf (buffer + p, length - p, "%sEncrypted Digest: %u bytes\n", pad2, o ? o->length : 0);
-	if (r < 0 || length <= p) {
-		free (pad3);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sUnauthenticated Attributes:\n", pad2);
-	p += (ut32) r;
-	if (r < 0 || length <= p) {
-		free (pad3);
-		return NULL;
-	}
-	for (i = 0; i < si->unauthenticatedAttributes.length; ++i) {
-		RPKCS7Attribute* attr = si->unauthenticatedAttributes.elements[i];
-		if (!attr) {
-			continue;
-		}
-		o = attr->data;
-		r = snprintf (buffer + p, length - p, "%s%s: %u bytes\n",
-					pad3, attr->oid ? attr->oid->string : "Missing", o ? o->length : 0);
-		p += (ut32) r;
-		if (r < 0 || length <= p) {
-			free (pad3);
-			return NULL;
-		}
-	}
-	free (pad3);
-	return buffer + p;
-}
-
-char *r_pkcs7_cms_dump (RCMS* container) {
-	RPKCS7SignedData *sd;
-	ut32 i, length, p = 0;
-	int r;
-	char *buffer = NULL, *tmp = NULL;
-	if (!container) {
-		return NULL;
-	}
-	sd = &container->signedData;
-	length = 2048 + (container->signedData.certificates.length * 1024);
-	if(!length) {
-		return NULL;
-	}
-	buffer = (char*) calloc (1, length);
-	if (!buffer) {
-		return NULL;
-	}
-	r = snprintf (buffer, length, "signedData\n  Version: %u\n  Digest Algorithms:\n", sd->version);
-	p += (ut32) r;
-	if (r < 0 || length <= p) {
-		free (buffer);
-		return NULL;
-	}
-	if (container->signedData.digestAlgorithms.elements) {
-		for (i = 0; i < container->signedData.digestAlgorithms.length; ++i) {
-			if (container->signedData.digestAlgorithms.elements[i]) {
-				RASN1String *s = container->signedData.digestAlgorithms.elements[i]->algorithm;
-				r = snprintf (buffer + p, length - p, "    %s\n", s ? s->string : "Missing");
-				p += (ut32) r;
-				if (r < 0 || length <= p) {
-					free (buffer);
-					return NULL;
-				}
-			}
-		}
-	}
-	r = snprintf (buffer + p, length - p, "  Certificates: %u\n", container->signedData.certificates.length);
-	p += (ut32) r;
-	if (r < 0 || length <= p) {
-		free (buffer);
-		return NULL;
-	}
-	for (i = 0; i < container->signedData.certificates.length; ++i) {
-		if (length <= p || !(tmp = r_x509_certificate_dump (container->signedData.certificates.elements[i], buffer + p, length - p, "    "))) {
-			free (buffer);
-			return NULL;
-		}
-		p = tmp - buffer;
-	}
-
-	for (i = 0; i < container->signedData.crls.length; ++i) {
-		if (length <= p || !(tmp = r_x509_crl_dump (container->signedData.crls.elements[i], buffer + p, length - p, "    "))) {
-			free (buffer);
-			return NULL;
-		}
-		p = tmp - buffer;
-	}
-	p = tmp - buffer;
-	if (length <= p) {
-		free (buffer);
-		return NULL;
-	}	
-	r = snprintf (buffer + p, length - p, "  SignerInfos:\n");
-	p += (ut32) r;
-	if (r < 0 || length <= p) {
-		free (buffer);
-		return NULL;
-	}
-	if (container->signedData.signerinfos.elements) {
-		for (i = 0; i < container->signedData.signerinfos.length; ++i) {
-			if (length <= p || !(tmp = r_x509_signedinfo_dump (container->signedData.signerinfos.elements[i], buffer + p, length - p, "    "))) {
-				free (buffer);
-				return NULL;
-			}
-			p = tmp - buffer;
-		}
-	}
-	return buffer;
-}
-
-RJSVar *r_x509_signedinfo_json (RPKCS7SignerInfo* si) {
-	RJSVar* array = NULL;
-	RJSVar* var = NULL;
-	RJSVar* obj = r_json_object_new ();
-	ut32 i;
-	if (!si) {
-		return obj;
-	}
-
-	(void)r_json_object_add (obj, "Version", r_json_number_new (si->version + 1));
-	(void)r_json_object_add (obj, "Issuer", r_x509_name_json (&si->issuerAndSerialNumber.issuer));
-	if (si->issuerAndSerialNumber.serialNumber) {
-		RASN1Binary *o = si->issuerAndSerialNumber.serialNumber;
-		RASN1String *s = r_asn1_stringify_integer (o->binary, o->length);
-		if (s) {
-			(void)r_json_object_add (obj, "SerialNumber", r_json_string_new (s->string));
-		}
-		r_asn1_free_string (s);
-	}
-
-	if (si->digestAlgorithm.algorithm) {
-		(void) r_json_object_add (obj, "DigestAlgorithm", r_json_string_new (si->digestAlgorithm.algorithm->string));
-	}
-
-	array = r_json_array_new (si->authenticatedAttributes.length);
-	for (i = 0; i < si->authenticatedAttributes.length; ++i) {
-		RPKCS7Attribute* attr = si->authenticatedAttributes.elements[i];
-		if (!attr) {
-			continue;
-		}
-		RJSVar* attribute = r_json_object_new ();
-		if (attr->oid) {
-			var = r_json_string_new (attr->oid->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "oid", var), var);
-		}
-		if (attr->data) {
-			var = r_json_number_new (attr->data->length);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "length", var), var);
-		}
-		R_JSON_FREE_ON_FAIL (r_json_array_add (array, attribute), attribute);
-	}
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "AuthenticatedAttributes", array), array);
-	if (si->digestEncryptionAlgorithm.algorithm) {
-		var = r_json_string_new (si->digestEncryptionAlgorithm.algorithm->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "DigestEncryptionAlgorithm", var), var);
-	}
-
-	if (si->encryptedDigest) {
-		RASN1Binary *o = si->encryptedDigest;
-		RASN1String *s = r_asn1_stringify_integer (o->binary, o->length);
-		if (s) {
-			var = r_json_string_new (s->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "EncryptedDigest", var), var);
-		}
-		r_asn1_free_string (s);
-	}
-
-
-	array = r_json_array_new (si->unauthenticatedAttributes.length);
-	for (i = 0; i < si->unauthenticatedAttributes.length; ++i) {
-		RPKCS7Attribute* attr = si->unauthenticatedAttributes.elements[i];
-		if (!attr) {
-			continue;
-		}
-		RJSVar* attribute = r_json_object_new ();
-		if (attr->oid) {
-			var = r_json_string_new (attr->oid->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "oid", var), var);
-		}
-		if (attr->data) {
-			var = r_json_number_new (attr->data->length);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (attribute, "length", var), var);
-		}
-		R_JSON_FREE_ON_FAIL (r_json_array_add (array, attribute), attribute);
-	}
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "UnauthenticatedAttributes", array), array);
-
-	return obj;
-}
-
-RJSVar *r_pkcs7_cms_json (RCMS* container) {
-	RJSVar* array = NULL;
-	RJSVar* var = NULL;
-	RJSVar* obj = r_json_object_new ();
-	ut32 i;
-	if (!container) {
-		return obj;
-	}
-
-	var = r_json_number_new (container->signedData.version);
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Version", var), var);
-	
-	if (container->signedData.digestAlgorithms.elements) {
-		array = r_json_array_new (container->signedData.digestAlgorithms.length);
-		for (i = 0; i < container->signedData.digestAlgorithms.length; ++i) {
-			if (container->signedData.digestAlgorithms.elements[i]) {
-				RASN1String *s = container->signedData.digestAlgorithms.elements[i]->algorithm;
-				if (s) {
-					var = r_json_string_new (s->string);
-					R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
-				}
-			}
-		}
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "DigestAlgorithms", array), array);
-	}
-
-	array = r_json_array_new (container->signedData.certificates.length);
-	for (i = 0; i < container->signedData.certificates.length; ++i) {
-		var = r_x509_certificate_json (container->signedData.certificates.elements[i]);
-		R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
-	}
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Certificates", array), array);
-
-	array = r_json_array_new (container->signedData.crls.length);
-	for (i = 0; i < container->signedData.crls.length; ++i) {
-		var = r_x509_crl_json (container->signedData.crls.elements[i]);
-		R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
-	}
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "CRL", array), array);
-
-	if (container->signedData.signerinfos.elements) {
-		array = r_json_array_new (container->signedData.signerinfos.length);
-		for (i = 0; i < container->signedData.signerinfos.length; ++i) {
-			var = r_x509_signedinfo_json (container->signedData.signerinfos.elements[i]);
-			R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
-		}
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SignerInfos", array), array);
-	}
-	return obj;
-}
-
diff -Nru radare2-2.3.0+dfsg/libr/util/r_pkcs7_internal.h radare2-2.8.0+dfsg/libr/util/r_pkcs7_internal.h
--- radare2-2.3.0+dfsg/libr/util/r_pkcs7_internal.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_pkcs7_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#ifndef R_PKCS7_INTERNAL_H
-#define R_PKCS7_INTERNAL_H
-
-
-R_API bool r_pkcs7_parse_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls, RASN1Object *object);
-R_API void r_pkcs7_free_certificaterevocationlists (RPKCS7CertificateRevocationLists *crls);
-
-R_API bool r_pkcs7_parse_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac, RASN1Object *object);
-R_API void r_pkcs7_free_extendedcertificatesandcertificates (RPKCS7ExtendedCertificatesAndCertificates *ecac);
-
-R_API bool r_pkcs7_parse_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai, RASN1Object *object);
-R_API void r_pkcs7_free_digestalgorithmidentifier (RPKCS7DigestAlgorithmIdentifiers *dai);
-
-R_API bool r_pkcs7_parse_contentinfo (RPKCS7ContentInfo* ci, RASN1Object *object);
-R_API void r_pkcs7_free_contentinfo (RPKCS7ContentInfo* ci);
-
-R_API bool r_pkcs7_parse_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu, RASN1Object *object);
-R_API void r_pkcs7_free_issuerandserialnumber (RPKCS7IssuerAndSerialNumber* iasu);
-
-R_API RPKCS7Attribute* r_pkcs7_parse_attribute (RASN1Object *object);
-R_API void r_pkcs7_free_attribute (RPKCS7Attribute* attribute);
-
-R_API bool r_pkcs7_parse_attributes (RPKCS7Attributes* attribute, RASN1Object *object);
-R_API void r_pkcs7_free_attributes (RPKCS7Attributes* attribute);
-
-R_API bool r_pkcs7_parse_signerinfo (RPKCS7SignerInfo* si, RASN1Object *object);
-R_API void r_pkcs7_free_signerinfo (RPKCS7SignerInfo* si);
-
-R_API bool r_pkcs7_parse_signerinfos (RPKCS7SignerInfos* ss, RASN1Object *object);
-R_API void r_pkcs7_free_signerinfos (RPKCS7SignerInfos* ss);
-
-R_API bool r_pkcs7_parse_signeddata (RPKCS7SignedData *sd, RASN1Object *object);
-R_API void r_pkcs7_free_signeddata (RPKCS7SignedData* sd);
-
-R_API char* r_x509_signedinfo_dump (RPKCS7SignerInfo *si, char* buffer, ut32 length, const char* pad);
-
-#endif /* R_PKCS7_INTERNAL_H */
-
diff -Nru radare2-2.3.0+dfsg/libr/util/r_x509.c radare2-2.8.0+dfsg/libr/util/r_x509.c
--- radare2-2.3.0+dfsg/libr/util/r_x509.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_x509.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,979 +0,0 @@
-/* radare2 - LGPL - Copyright 2017 - wargio */
-
-#include <r_util.h>
-#include <stdlib.h>
-#include <string.h>
-#include <r_types.h>
-
-#include "r_x509_internal.h"
-
-bool r_x509_parse_validity (RX509Validity *validity, RASN1Object *object) {
-	RASN1Object *o;
-	if (!validity || !object || object->list.length != 2) {
-		return false;
-	}
-	if (object->klass == CLASS_UNIVERSAL &&
-			object->tag == TAG_SEQUENCE &&
-			object->form == FORM_CONSTRUCTED) {
-		o = object->list.objects[0];
-		if (o->klass == CLASS_UNIVERSAL && o->form == FORM_PRIMITIVE) {
-			if (o->tag == TAG_UTCTIME) {
-				validity->notBefore = r_asn1_stringify_utctime (o->sector, o->length);
-			} else if (o->tag == TAG_GENERALIZEDTIME) {
-				validity->notBefore = r_asn1_stringify_time (o->sector, o->length);
-			}
-		}
-		o = object->list.objects[1];
-		if (o->klass == CLASS_UNIVERSAL && o->form == FORM_PRIMITIVE) {
-			if (o->tag == TAG_UTCTIME) {
-				validity->notAfter = r_asn1_stringify_utctime (o->sector, o->length);
-			} else if (o->tag == TAG_GENERALIZEDTIME) {
-				validity->notAfter = r_asn1_stringify_time (o->sector, o->length);
-			}
-		}
-	}
-	return true;
-}
-
-bool r_x509_parse_algorithmidentifier (RX509AlgorithmIdentifier *ai, RASN1Object * object) {
-	if (!ai || !object || object->list.length < 1 || !object->list.objects) {
-		return false;
-	}
-	if (object->list.objects[0] && object->list.objects[0]->klass == CLASS_UNIVERSAL && object->list.objects[0]->tag == TAG_OID) {
-		ai->algorithm = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
-	}
-	ai->parameters = NULL; // TODO
-	//ai->parameters = asn1_stringify_sector (object->list.objects[1]);
-	return true;
-}
-
-bool r_x509_parse_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki, RASN1Object *object) {
-	RASN1Object *o;
-	if (!spki || !object || object->list.length != 2) {
-		return false;
-	}
-	r_x509_parse_algorithmidentifier (&spki->algorithm, object->list.objects[0]);
-	if (object->list.objects[1]) {
-		o = object->list.objects[1];
-		spki->subjectPublicKey = r_asn1_create_binary (o->sector, o->length);
-		if (o->list.length == 1 && o->list.objects[0] && o->list.objects[0]->list.length == 2) {
-			o = o->list.objects[0];
-			if (o->list.objects[0]) {
-				spki->subjectPublicKeyExponent = r_asn1_create_binary (o->list.objects[0]->sector, o->list.objects[0]->length);
-			}
-			if (o->list.objects[1]) {
-				spki->subjectPublicKeyModule = r_asn1_create_binary (o->list.objects[1]->sector, o->list.objects[1]->length);
-			}
-		}
-	}
-	return true;
-}
-
-bool r_x509_parse_name (RX509Name *name, RASN1Object * object) {
-	ut32 i;
-	if (!name || !object || !object->list.length) {
-		return false;
-	}
-	if (object->klass == CLASS_UNIVERSAL && object->tag == TAG_SEQUENCE) {
-		name->length = object->list.length;
-		name->names = (RASN1String**) calloc (name->length, sizeof (RASN1String*));
-		if (!name->names) {
-			name->length = 0;
-			return false;
-		}
-		name->oids = (RASN1String**) calloc (name->length, sizeof (RASN1String*));
-		if (!name->oids) {
-			name->length = 0;
-			free (name->names);
-			name->names = NULL;
-			return false;
-		}
-		for (i = 0; i < object->list.length; ++i) {
-			RASN1Object *o = object->list.objects[i];
-			if (o && o->klass == CLASS_UNIVERSAL &&
-					o->tag == TAG_SET &&
-					o->form == FORM_CONSTRUCTED &&
-					o->list.length == 1) {
-				o = o->list.objects[0];
-				if (o && o->list.length > 1 &&
-						o->klass == CLASS_UNIVERSAL &&
-						o->tag == TAG_SEQUENCE) {
-					if (o->list.objects[0]->klass == CLASS_UNIVERSAL &&
-							o->list.objects[0]->tag == TAG_OID) {
-						name->oids[i] = r_asn1_stringify_oid (o->list.objects[0]->sector, o->list.objects[0]->length);
-					}
-					RASN1Object *obj1 = o->list.objects[1];
-					if (obj1 && obj1->klass == CLASS_UNIVERSAL) {
-						name->names[i] = r_asn1_stringify_string (obj1->sector, obj1->length);
-					}
-				}
-			}
-		}
-	}
-	return true;
-}
-
-bool r_x509_parse_extension (RX509Extension *ext, RASN1Object *object) {
-	RASN1Object *o;
-	if (!ext || !object || object->list.length < 2) {
-		return false;
-	}
-	o = object->list.objects[0];
-	if (o && o->tag == TAG_OID) {
-		ext->extnID = r_asn1_stringify_oid (o->sector, o->length);
-		o = object->list.objects[1];
-		if (o->tag == TAG_BOOLEAN) {
-			//This field is optional (so len must be 3)
-			ext->critical = o->sector[0] != 0;
-			o = object->list.objects[2];
-		}
-		if (o->tag == TAG_OCTETSTRING) {
-			ext->extnValue = r_asn1_create_binary (o->sector, o->length);
-		}
-	}
-	return true;
-}
-
-bool r_x509_parse_extensions (RX509Extensions *ext, RASN1Object * object) {
-	ut32 i;
-	if (!ext || !object || object->list.length != 1 || !object->list.objects[0]->length) {
-		return false;
-	}
-	object = object->list.objects[0];
-	ext->extensions = (RX509Extension**) calloc (object->list.length, sizeof (RX509Extension*));
-	if (!ext->extensions) {
-		return false;
-	}
-	ext->length = object->list.length;
-	for (i = 0; i < object->list.length; ++i) {
-		ext->extensions[i] = R_NEW0 (RX509Extension);
-		if (!r_x509_parse_extension (ext->extensions[i], object->list.objects[i])) {
-			r_x509_free_extension (ext->extensions[i]);
-			ext->extensions[i] = NULL;
-		}
-	}
-	return true;
-}
-
-bool r_x509_parse_tbscertificate (RX509TBSCertificate *tbsc, RASN1Object * object) {
-	RASN1Object **elems;
-	ut32 i;
-	ut32 shift = 0;
-	if (!tbsc || !object || object->list.length < 6) {
-		return false;
-	}
-	elems = object->list.objects;
-	//Following RFC
-	if (elems[0]->list.length == 1 &&
-			elems[0]->klass == CLASS_CONTEXT &&
-			elems[0]->form == FORM_CONSTRUCTED &&
-			elems[0]->list.objects[0]->tag == TAG_INTEGER &&
-			elems[0]->list.objects[0]->length == 1) {
-		//Integer inside a CLASS_CONTEXT
-		tbsc->version = (ut32) elems[0]->list.objects[0]->sector[0];
-		shift = 1;
-	} else {
-		tbsc->version = 0;
-	}
-	if (shift < object->list.length && elems[shift]->klass == CLASS_UNIVERSAL && elems[shift]->tag == TAG_INTEGER) {
-		tbsc->serialNumber = r_asn1_stringify_integer (elems[shift]->sector, elems[shift]->length);
-	}
-	r_x509_parse_algorithmidentifier (&tbsc->signature, elems[shift + 1]);
-	r_x509_parse_name (&tbsc->issuer, elems[shift + 2]);
-	r_x509_parse_validity (&tbsc->validity, elems[shift + 3]);
-	r_x509_parse_name (&tbsc->subject, elems[shift + 4]);
-	r_x509_parse_subjectpublickeyinfo (&tbsc->subjectPublicKeyInfo, elems[shift + 5]);
-	if (tbsc->version > 0) {
-		for (i = shift + 6; i < object->list.length; i++) {
-			if (!elems[i] || elems[i]->klass != CLASS_CONTEXT) {
-				continue;
-			}
-			if (elems[i]->tag == 1) {
-				tbsc->issuerUniqueID = r_asn1_create_binary (object->list.objects[i]->sector, object->list.objects[i]->length);
-			}
-			if (!elems[i]) {
-				continue;
-			}
-			if (elems[i]->tag == 2) {
-				tbsc->subjectUniqueID = r_asn1_create_binary (object->list.objects[i]->sector, object->list.objects[i]->length);
-			}
-			if (!elems[i]) {
-				continue;
-			}
-			if (tbsc->version == 2 && elems[i]->tag == 3 && elems[i]->form == FORM_CONSTRUCTED) {
-				r_x509_parse_extensions (&tbsc->extensions, elems[i]);
-			}
-		}
-	}
-	return true;
-}
-
-RX509Certificate * r_x509_parse_certificate (RASN1Object *object) {
-	RX509Certificate *certificate;
-	RASN1Object *tmp;
-	if (!object) {
-		return NULL;
-	}
-	certificate = (RX509Certificate*) malloc (sizeof (RX509Certificate));
-	if (!certificate) {
-		r_asn1_free_object (object);
-		return NULL;
-	}
-	memset (certificate, 0, sizeof (RX509Certificate));
-
-	if (object->klass != CLASS_UNIVERSAL || object->form != FORM_CONSTRUCTED || object->list.length != 3) {
-		// Malformed certificate
-		// It needs to have tbsCertificate, algorithmIdentifier and a signature
-		r_asn1_free_object (object);
-		free (certificate);
-		return NULL;
-	}
-	tmp = object->list.objects[2];
-	if (!tmp) {
-		r_asn1_free_object (object);
-		free (certificate);
-		return NULL;
-	}
-	if (tmp->klass != CLASS_UNIVERSAL || tmp->form != FORM_PRIMITIVE || tmp->tag != TAG_BITSTRING) {
-		r_asn1_free_object (object);
-		free (certificate);
-		return NULL;
-	}
-
-	certificate->signature = r_asn1_create_binary (object->list.objects[2]->sector, object->list.objects[2]->length);
-
-	r_x509_parse_tbscertificate (&certificate->tbsCertificate, object->list.objects[0]);
-
-	if (!r_x509_parse_algorithmidentifier (&certificate->algorithmIdentifier, object->list.objects[1])) {
-		r_asn1_free_object (object);
-		free (certificate);
-		return NULL;
-	}
-	r_asn1_free_object (object);
-	return certificate;
-}
-
-RX509Certificate * r_x509_parse_certificate2 (const ut8 *buffer, ut32 length) {
-	RX509Certificate *certificate;
-	RASN1Object *object;
-	if (!buffer || !length) {
-		return NULL;
-	}
-	object = r_asn1_create_object (buffer, length);
-	certificate = r_x509_parse_certificate (object);
-	//object freed by r_x509_parse_certificate
-	return certificate;
-}
-
-RX509CRLEntry *r_x509_parse_crlentry (RASN1Object *object) {
-	RX509CRLEntry *entry;
-	if (!object || object->list.length != 2) {
-		return NULL;
-	}
-	entry = (RX509CRLEntry *) malloc (sizeof (RX509CRLEntry));
-	if (!entry) {
-		return NULL;
-	}
-	entry->userCertificate = r_asn1_create_binary (object->list.objects[0]->sector, object->list.objects[0]->length);
-	entry->revocationDate = r_asn1_stringify_utctime (object->list.objects[1]->sector, object->list.objects[1]->length);
-	return entry;
-}
-
-RX509CertificateRevocationList* r_x509_parse_crl (RASN1Object *object) {
-	RX509CertificateRevocationList *crl;
-	RASN1Object **elems;
-	if (!object || object->list.length < 4) {
-		return NULL;
-	}
-	crl = (RX509CertificateRevocationList *) malloc (sizeof (RX509CertificateRevocationList));
-	if (!crl) {
-		return NULL;
-	}
-	memset (crl, 0, sizeof (RX509CertificateRevocationList));
-	elems = object->list.objects;
-	r_x509_parse_algorithmidentifier (&crl->signature, elems[0]);
-	r_x509_parse_name (&crl->issuer, elems[1]);
-	crl->lastUpdate = r_asn1_stringify_utctime (elems[2]->sector, elems[2]->length);
-	crl->nextUpdate = r_asn1_stringify_utctime (elems[3]->sector, elems[3]->length);
-	if (object->list.length > 4 && object->list.objects[4]) {
-		ut32 i;
-		crl->revokedCertificates = calloc (object->list.objects[4]->list.length, sizeof (RX509CRLEntry*));
-		if (!crl->revokedCertificates) {
-			free (crl);
-			return NULL;
-		}
-		crl->length = object->list.objects[4]->list.length;
-		for (i = 0; i < object->list.objects[4]->list.length; ++i) {
-			crl->revokedCertificates[i] = r_x509_parse_crlentry (object->list.objects[4]->list.objects[i]);
-		}
-	}
-	return crl;
-}
-
-void r_x509_free_algorithmidentifier (RX509AlgorithmIdentifier * ai) {
-	if (!ai) {
-		return;
-	}
-	r_asn1_free_string (ai->algorithm);
-	r_asn1_free_string (ai->parameters);
-	//no need to free ai, since this functions is used internally
-}
-
-void r_x509_free_validity (RX509Validity * validity) {
-	if (!validity) {
-		return;
-	}
-	r_asn1_free_string (validity->notAfter);
-	r_asn1_free_string (validity->notBefore);
-	// not freeing validity since it's not allocated dinamically
-}
-
-void r_x509_free_name (RX509Name * name) {
-	ut32 i;
-	if (!name) {
-		return;
-	}
-	if (name->names) {
-		for (i = 0; i < name->length; ++i) {
-			r_asn1_free_string (name->oids[i]);
-			r_asn1_free_string (name->names[i]);
-		}
-		R_FREE (name->names);
-		R_FREE (name->oids);
-	}
-	// not freeing name since it's not allocated dinamically
-}
-
-void r_x509_free_extension (RX509Extension * ex) {
-	if (ex) {
-		r_asn1_free_string (ex->extnID);
-		r_asn1_free_binary (ex->extnValue);
-		//this is allocated dinamically so, i'll free
-		free (ex);
-	}
-}
-
-void r_x509_free_extensions (RX509Extensions * ex) {
-	ut32 i;
-	if (!ex) {
-		return;
-	}
-	if (ex->extensions) {
-		for (i = 0; i < ex->length; ++i) {
-			r_x509_free_extension (ex->extensions[i]);
-		}
-		free (ex->extensions);
-	}
-	//no need to free ex, since this functions is used internally
-}
-
-void r_x509_free_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki) {
-	if (spki) {
-		r_x509_free_algorithmidentifier (&spki->algorithm);
-		r_asn1_free_binary (spki->subjectPublicKey);
-		r_asn1_free_binary (spki->subjectPublicKeyExponent);
-		r_asn1_free_binary (spki->subjectPublicKeyModule);
-		// No need to free spki, since it's a static variable.
-	}
-}
-
-void r_x509_free_tbscertificate (RX509TBSCertificate * tbsc) {
-	if (tbsc) {
-		//  version is ut32
-		r_asn1_free_string (tbsc->serialNumber);
-		r_x509_free_algorithmidentifier (&tbsc->signature);
-		r_x509_free_name (&tbsc->issuer);
-		r_x509_free_validity (&tbsc->validity);
-		r_x509_free_name (&tbsc->subject);
-		r_x509_free_subjectpublickeyinfo (&tbsc->subjectPublicKeyInfo);
-		r_asn1_free_binary (tbsc->subjectUniqueID);
-		r_asn1_free_binary (tbsc->issuerUniqueID);
-		r_x509_free_extensions (&tbsc->extensions);
-		//no need to free tbsc, since this functions is used internally
-	}
-}
-
-void r_x509_free_certificate (RX509Certificate * certificate) {
-	if (certificate) {
-		r_asn1_free_binary (certificate->signature);
-		r_x509_free_algorithmidentifier (&certificate->algorithmIdentifier);
-		r_x509_free_tbscertificate (&certificate->tbsCertificate);
-		free (certificate);
-	}
-}
-
-void r_x509_free_crlentry (RX509CRLEntry *entry) {
-	if (entry) {
-		r_asn1_free_binary (entry->userCertificate);
-		r_asn1_free_string (entry->revocationDate);
-		free (entry);
-	}
-}
-
-void r_x509_free_crl (RX509CertificateRevocationList *crl) {
-	ut32 i;
-	if (crl) {
-		r_x509_free_algorithmidentifier (&crl->signature);
-		r_x509_free_name (&crl->issuer);
-		r_asn1_free_string (crl->nextUpdate);
-		r_asn1_free_string (crl->lastUpdate);
-		if (crl->revokedCertificates) {
-			for (i = 0; i < crl->length; ++i) {
-				r_x509_free_crlentry (crl->revokedCertificates[i]);
-				crl->revokedCertificates[i] = NULL;
-			}
-			free (crl->revokedCertificates);
-			crl->revokedCertificates = NULL;
-		}
-		free (crl);
-	}
-}
-
-char* r_x509_validity_dump (RX509Validity* validity, char* buffer, ut32 length, const char* pad) {
-	int p;
-	if (!validity || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad)
-		pad = "";
-	const char* b = validity->notBefore ? validity->notBefore->string : "Missing";
-	const char* a = validity->notAfter ? validity->notAfter->string : "Missing";
-	p = snprintf (buffer, length, "%sNot Before: %s\n%sNot After: %s\n", pad, b, pad, a);
-	return p < 0 ? NULL : buffer + (ut32) p;
-}
-
-char* r_x509_name_dump (RX509Name* name, char* buffer, ut32 length, const char* pad) {
-	ut32 i, p, len;
-	int r;
-	char* c;
-	if (!name || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	len = length;
-	c = buffer;
-	for (i = 0, p = 0; i < name->length; ++i) {
-		if (!name->oids[i] || !name->names[i]) {
-			continue;
-		}
-		if (len <= p) {
-			return NULL;
-		}
-		r = snprintf (c + p, len - p, "%s%s: %s\n", pad, name->oids[i]->string, name->names[i]->string);
-		p += r;
-		if (r < 0 || len < p) {
-			return NULL;
-		}
-	}
-	return c + p;
-}
-
-char* r_x509_subjectpublickeyinfo_dump (RX509SubjectPublicKeyInfo* spki, char* buffer, ut32 length, const char* pad) {
-	int r;
-	const char *a;
-	if (!spki || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	a = spki->algorithm.algorithm ? spki->algorithm.algorithm->string : "Missing";
-	RASN1String* m = NULL;
-	if (spki->subjectPublicKeyModule) {
-		m = r_asn1_stringify_integer (spki->subjectPublicKeyModule->binary, spki->subjectPublicKeyModule->length);
-	}
-	//	RASN1String* e = r_asn1_stringify_bytes (spki->subjectPublicKeyExponent->sector, spki->subjectPublicKeyExponent->length);
-	//	r = snprintf (buffer, length, "%sAlgorithm: %s\n%sModule: %s\n%sExponent: %u bytes\n%s\n", pad, a, pad, m->string,
-	//				pad, spki->subjectPublicKeyExponent->length - 1, e->string);
-	r = snprintf (buffer, length, "%sAlgorithm: %s\n%sModule: %s\n%sExponent: %u bytes\n", pad, a, pad, m ? m->string : "Missing",
-				pad, spki->subjectPublicKeyExponent ? spki->subjectPublicKeyExponent->length - 1 : 0);
-	r_asn1_free_string (m);
-	//	r_asn1_free_string (e);
-	return r < 0 ? NULL : buffer + (ut32) r;
-}
-
-char* r_x509_extensions_dump (RX509Extensions* exts, char* buffer, ut32 length, const char* pad) {
-	ut32 i, p, len;
-	int r;
-	char* c;
-	if (!exts || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	len = length;
-	c = buffer;
-	for (i = 0, p = 0, r = 0; i < exts->length; ++i) {
-		//RASN1String *s;
-		RX509Extension *e = exts->extensions[i];
-		if (!e) continue;
-		//TODO handle extensions..
-		//s = r_asn1_stringify_bytes (e->extnValue->sector, e->extnValue->length);
-		if (len < p) {
-			return NULL;
-		}
-		r = snprintf (c + p, len - p, "%s%s: %s\n%s%u bytes\n", pad,
-					e->extnID ? e->extnID->string : "Missing",
-					e->critical ? "critical" : "",
-					pad, e->extnValue ? e->extnValue->length : 0);
-		p += r;
-		//r_asn1_free_string (s);
-		if (r < 0 || len <= p) {
-			return NULL;
-		}
-	}
-	return c + p;
-}
-
-char* r_x509_tbscertificate_dump (RX509TBSCertificate* tbsc, char* buffer, ut32 length, const char* pad) {
-	RASN1String *sid = NULL, *iid = NULL;
-	char *pad2, *tmp;
-	ut32 p;
-	int r;
-	if (!tbsc || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	pad2 = r_str_newf ("%s  ", pad);
-	if (!pad2) return NULL;
-	r = snprintf (buffer, length, "%sVersion: v%u\n"
-				"%sSerial Number:\n%s  %s\n"
-				"%sSignature Algorithm:\n%s  %s\n"
-				"%sIssuer:\n",
-				pad, tbsc->version + 1,
-				pad, pad, tbsc->serialNumber ? tbsc->serialNumber->string : "Missing",
-				pad, pad, tbsc->signature.algorithm ? tbsc->signature.algorithm->string : "Missing",
-				pad);
-	p = (ut32) r;
-	if (r < 0 || length <= p || !(tmp = r_x509_name_dump (&tbsc->issuer, buffer + p, length - p, pad2))) {
-		free (pad2);
-		return NULL;
-	}
-	p = tmp - buffer;
-	if (length <= p) {
-		free (pad2);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sValidity:\n", pad);
-	p += r;
-	if (r < 0 || length <= p || !(tmp = r_x509_validity_dump (&tbsc->validity, buffer + p, length - p, pad2))) {
-		free (pad2);
-		return NULL;
-	}
-	p = tmp - buffer;
-	if (r < 0 || length <= p) {
-		free (pad2);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sSubject:\n", pad);
-	p += r;
-	if (r < 0 || length <= p || !(tmp = r_x509_name_dump (&tbsc->subject, buffer + p, length - p, pad2))) {
-		free (pad2);
-		return NULL;
-	}
-	p = tmp - buffer;
-	if (r < 0 || length <= p) {
-		free (pad2);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sSubject Public Key Info:\n", pad);
-	p += r;
-	if (r < 0 || length <= p ||
-			!(tmp = r_x509_subjectpublickeyinfo_dump (&tbsc->subjectPublicKeyInfo, buffer + p, length - p, pad2))) {
-		free (pad2);
-		return NULL;
-	}
-	p = tmp - buffer;
-	if (tbsc->issuerUniqueID) {
-		iid = r_asn1_stringify_integer (tbsc->issuerUniqueID->binary, tbsc->issuerUniqueID->length);
-		if (iid) {
-			if (length <= p) {
-				r_asn1_free_string (iid);
-				free (pad2);
-				return NULL;
-			}
-			r = snprintf (buffer + p, length - p, "%sIssuer Unique ID:\n%s  %s", pad, pad, iid->string);
-			p += r;
-		} else {
-			free (pad2);
-			return NULL;
-		}
-		r_asn1_free_string (iid);
-	}
-	if (tbsc->subjectUniqueID) {
-		sid = r_asn1_stringify_integer (tbsc->subjectUniqueID->binary, tbsc->subjectUniqueID->length);
-		if (sid) {
-			if (length <= p) {
-				r_asn1_free_string (sid);
-				free (pad2);
-				return NULL;
-			}
-			r = snprintf (buffer + p, length - p, "%sSubject Unique ID:\n%s  %s", pad, pad, sid->string);
-			p += r;
-		} else {
-			free (pad2);
-			return NULL;
-		}
-		r_asn1_free_string (sid);
-	}
-	if (r < 0 || length <= p) {
-		free (pad2);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sExtensions:\n", pad);
-	p += r;
-	if (r < 0 || length <= p || !(tmp = r_x509_extensions_dump (&tbsc->extensions, buffer + p, length - p, pad2))) {
-		free (pad2);
-		return NULL;
-	}
-	free (pad2);
-	return buffer + p;
-}
-
-char* r_x509_certificate_dump (RX509Certificate* certificate, char* buffer, ut32 length, const char* pad) {
-	//	RASN1String *signature,
-	RASN1String *algo = NULL;
-	ut32 p;
-	int r;
-	char *tbsc, *pad2;
-	if (!certificate || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	pad2 = r_str_newf ("%s  ", pad);
-	if (!pad2) {
-		return NULL;
-	}
-	if ((r = snprintf (buffer, length, "%sTBSCertificate:\n", pad)) < 0) {
-		return NULL;
-	}
-	p = (ut32) r;
-	tbsc = r_x509_tbscertificate_dump (&certificate->tbsCertificate, buffer + p, length - p, pad2);
-	p = tbsc - buffer;
-	if (length <= p) {
-		free (pad2);
-		return NULL;
-	}
-	algo = certificate->algorithmIdentifier.algorithm;
-	//	signature = r_asn1_stringify_bytes (certificate->signature->binary, certificate->signature->length);
-	//	r = snprintf (buffer + p, length - p, "%sAlgorithm:\n%s%s\n%sSignature: %u bytes\n%s\n",
-	//				pad, pad2, algo ? algo->string : "",
-	//				pad, certificate->signature->length, signature ? signature->string : "");
-	r = snprintf (buffer + p, length - p, "%sAlgorithm:\n%s%s\n%sSignature: %u bytes\n",
-				pad, pad2, algo ? algo->string : "", pad, certificate->signature->length);
-	if (r < 0) {
-		free (pad2);
-		return NULL;
-	}
-	p += (ut32) r;
-	free (pad2);
-	//	r_asn1_free_string (signature);
-	return buffer + p;
-}
-
-char* r_x509_crlentry_dump (RX509CRLEntry *crle, char* buffer, ut32 length, const char* pad) {
-	RASN1String *id = NULL, *utc = NULL;
-	int r;
-	if (!crle || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	utc = crle->revocationDate;
-	if (crle->userCertificate) {
-		id = r_asn1_stringify_integer (crle->userCertificate->binary, crle->userCertificate->length);
-	}
-
-	r = snprintf (buffer, length, "%sUser Certificate:\n%s  %s\n"
-				"%sRevocation Date:\n%s  %s\n",
-				pad, pad, id ? id->string : "Missing",
-				pad, pad, utc ? utc->string : "Missing");
-
-	r_asn1_free_string (id);
-	return r < 0 ? NULL : buffer + (ut32) r;
-}
-
-char* r_x509_crl_dump (RX509CertificateRevocationList *crl, char* buffer, ut32 length, const char* pad) {
-	RASN1String *algo = NULL, *last = NULL, *next = NULL;
-	ut32 i, p;
-	int r;
-	char *tmp, *pad2, *pad3;
-	if (!crl || !buffer || !length) {
-		return NULL;
-	}
-	if (!pad) {
-		pad = "";
-	}
-	pad3 = r_str_newf ("%s    ", pad);
-	if (!pad3) return NULL;
-	pad2 = pad3 + 2;
-	algo = crl->signature.algorithm;
-	last = crl->lastUpdate;
-	next = crl->nextUpdate;
-	r = snprintf (buffer, length, "%sCRL:\n%sSignature:\n%s%s\n%sIssuer\n",
-				pad, pad2, pad3, algo ? algo->string : "", pad2);
-	p = (ut32) r;
-	if (r < 0 || !(tmp = r_x509_name_dump (&crl->issuer, buffer + p, length - p, pad3))) {
-		free (pad3);
-		return NULL;
-	}
-	p = tmp - buffer;
-	if (length <= p) {
-		free (pad3);
-		return NULL;
-	}
-	r = snprintf (buffer + p, length - p, "%sLast Update: %s\n%sNext Update: %s\n%sRevoked Certificates:\n",
-				pad2, last ? last->string : "Missing",
-				pad2, next ? next->string : "Missing", pad2);
-	p += (ut32) r;
-	if (r < 0) {
-		free (pad3);
-		return NULL;
-	}
-	for (i = 0; i < crl->length; ++i) {
-		if (length <= p || !(tmp = r_x509_crlentry_dump (crl->revokedCertificates[i], buffer + p, length - p, pad3))) {
-			free (pad3);
-			return NULL;
-		}
-		p = tmp - buffer;
-	}
-
-	free (pad3);
-	return buffer + p;
-}
-
-RJSVar *r_x509_validity_json (RX509Validity* validity) {
-	RJSVar* obj = r_json_object_new ();
-	RJSVar* var = NULL;
-	if (!validity) {
-		return obj;
-	}
-	if (validity->notBefore) {
-		var = r_json_string_new (validity->notBefore->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "NotBefore", var), var);
-	}
-	if (validity->notAfter) {
-		var = r_json_string_new (validity->notAfter->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "NotAfter", var), var);
-	}
-	return obj;
-}
-
-RJSVar *r_x509_name_json (RX509Name* name) {
-	ut32 i;
-	RJSVar* var = NULL;
-	RJSVar* obj = r_json_object_new ();
-	if (!name) {
-		return obj;
-	}
-	for (i = 0; i < name->length; ++i) {
-		if (!name->oids[i] || !name->names[i]) {
-			continue;
-		}
-		var = r_json_string_new (name->names[i]->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, name->oids[i]->string, var), var);
-	}
-	return obj;
-}
-
-RJSVar* r_x509_subjectpublickeyinfo_json (RX509SubjectPublicKeyInfo* spki) {
-	RASN1String *m = NULL;
-	RJSVar* var = NULL;
-	RJSVar *obj = r_json_object_new ();
-	if (!spki) {
-		return obj;
-	}
-	if (spki->algorithm.algorithm) {
-		var = r_json_string_new (spki->algorithm.algorithm->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Algorithm", var), var);
-	}
-	if (spki->subjectPublicKeyModule) {
-		m = r_asn1_stringify_integer (spki->subjectPublicKeyModule->binary, spki->subjectPublicKeyModule->length);
-		if (m) {
-			var = r_json_string_new (m->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Module", var), var);
-		}
-		r_asn1_free_string (m);
-	}
-	if (spki->subjectPublicKeyExponent) {
-		m = r_asn1_stringify_integer (spki->subjectPublicKeyExponent->binary, spki->subjectPublicKeyExponent->length);
-		if (m) {
-			var = r_json_string_new (m->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Exponent", var), var);
-		}
-		r_asn1_free_string (m);
-	}
-	return obj;
-}
-
-RJSVar *r_x509_extensions_json (RX509Extensions* exts) {
-	ut32 i;
-	RASN1String *m = NULL;
-	RJSVar* array = NULL;
-	RJSVar* var = NULL;
-	if (!exts) {
-		return array;
-	}
-	array = r_json_array_new (exts->length);
-	for (i = 0; i < exts->length; ++i) {
-		RX509Extension *e = exts->extensions[i];
-		if (!e) {
-			continue;
-		}
-		RJSVar* obj = r_json_object_new ();
-		if (!obj) {
-			break;
-		}
-		if (e->extnID) {
-			var = r_json_string_new (e->extnID->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "OID", var), var);
-		}
-		if (e->critical) {
-			var = r_json_boolean_new (1);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Critical", var), var);
-		}
-		//TODO handle extensions correctly..
-		if (e->extnValue) {
-			m = r_asn1_stringify_integer (e->extnValue->binary, e->extnValue->length);
-			if (m) {
-				var = r_json_string_new (m->string);
-				R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Value", var), var);
-			}
-			r_asn1_free_string (m);
-		}
-		R_JSON_FREE_ON_FAIL (r_json_array_add (array, obj), obj);
-	}
-	return array;
-}
-
-RJSVar *r_x509_crlentry_json (RX509CRLEntry *crle) {
-	RASN1String *m = NULL;
-	RJSVar* obj = r_json_object_new ();
-	RJSVar* var = NULL;
-	if (!crle) {
-		return obj;
-	}
-	if (crle->userCertificate) {
-		m = r_asn1_stringify_integer (crle->userCertificate->binary, crle->userCertificate->length);
-		if (m) {
-			var = r_json_string_new (m->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "UserCertificate", var), var);
-		}
-		r_asn1_free_string (m);
-	}
-	if (crle->revocationDate) {
-		var = r_json_string_new (crle->revocationDate->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "RevocationDate", var), var);
-	}
-	return obj;
-}
-
-RJSVar *r_x509_crl_json (RX509CertificateRevocationList *crl) {
-	ut32 i;
-	RJSVar* obj = r_json_object_new ();
-	RJSVar* array = NULL;
-	RJSVar* var = NULL;
-	if (!crl) {
-		return obj;
-	}
-
-	if (crl->signature.algorithm) {
-		var = r_json_string_new (crl->signature.algorithm->string);
-		R_JSON_FREE_ON_FAIL(r_json_object_add (obj, "Signature", var), var);
-	}
-	r_json_object_add (obj, "Issuer", r_x509_name_json (&crl->issuer));
-	if (crl->lastUpdate) {
-		var = r_json_string_new (crl->lastUpdate->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "LastUpdate", var), var);
-	}
-	if (crl->nextUpdate) {
-		var = r_json_string_new (crl->nextUpdate->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "NextUpdate", var), var);
-	}
-
-	array = r_json_array_new (crl->length);
-	for (i = 0; i < crl->length; ++i) {
-		var = r_x509_crlentry_json (crl->revokedCertificates[i]);
-		R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
-	}
-
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "RevokedCertificates", array), array);
-	return obj;
-}
-
-RJSVar *r_x509_tbscertificate_json (RX509TBSCertificate* tbsc) {
-	RASN1String *m = NULL;
-	RJSVar* obj = r_json_object_new ();
-	RJSVar* var = NULL;
-	if (!tbsc) {
-		return obj;
-	}
-	var = r_json_number_new (tbsc->version + 1);
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Version", var), var);
-	if (tbsc->serialNumber) {
-		var = r_json_string_new (tbsc->serialNumber->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SerialNumber", var), var);
-	}
-	if (tbsc->signature.algorithm) {
-		var = r_json_string_new (tbsc->signature.algorithm->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SignatureAlgorithm", var), var);
-	}
-	var = r_x509_name_json (&tbsc->issuer);
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Issuer", var), var);
-	var = r_x509_validity_json (&tbsc->validity);
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Validity", var), var);
-	var = r_x509_name_json (&tbsc->subject);
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Subject", var), var);
-	var = r_x509_subjectpublickeyinfo_json (&tbsc->subjectPublicKeyInfo);
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SubjectPublicKeyInfo", var), var);
-	if (tbsc->issuerUniqueID) {
-		m = r_asn1_stringify_integer (tbsc->issuerUniqueID->binary, tbsc->issuerUniqueID->length);
-		if (m) {
-			var = r_json_string_new (m->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "IssuerUniqueID", var), var);
-		}
-		r_asn1_free_string (m);
-	}
-	if (tbsc->subjectUniqueID) {
-		m = r_asn1_stringify_integer (tbsc->subjectUniqueID->binary, tbsc->subjectUniqueID->length);
-		if (m) {
-			var = r_json_string_new (m->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SubjectUniqueID", var), var);
-		}
-		r_asn1_free_string (m);
-	}
-	var = r_x509_extensions_json (&tbsc->extensions);
-	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Extensions", var), var);
-	return obj;
-}
-
-RJSVar* r_x509_certificate_json (RX509Certificate *certificate) {
-	RASN1String *m = NULL;
-	RJSVar* obj = r_json_object_new ();
-	RJSVar* var = NULL;
-	if (!certificate) {
-		return obj;
-	}
-	r_json_object_add (obj, "TBSCertificate", r_x509_tbscertificate_json (&certificate->tbsCertificate));
-	if (certificate->algorithmIdentifier.algorithm) {
-		var = r_json_string_new (certificate->algorithmIdentifier.algorithm->string);
-		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Algorithm", var), var);
-	}
-	if (certificate->signature) {
-		m = r_asn1_stringify_integer (certificate->signature->binary, certificate->signature->length);
-		if (m) {
-			var = r_json_string_new (m->string);
-			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Signature", var), var);
-		}
-		r_asn1_free_string (m);
-	}
-	return obj;
-}
diff -Nru radare2-2.3.0+dfsg/libr/util/r_x509_internal.h radare2-2.8.0+dfsg/libr/util/r_x509_internal.h
--- radare2-2.3.0+dfsg/libr/util/r_x509_internal.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/r_x509_internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#ifndef R_X509_INTERNAL_H
-#define R_X509_INTERNAL_H
-
-#include "r_asn1_internal.h"
-
-R_API bool r_x509_parse_validity (RX509Validity *validity, RASN1Object *object);
-R_API void r_x509_free_validity (RX509Validity* validity);
-
-R_API bool r_x509_parse_algorithmidentifier (RX509AlgorithmIdentifier *ai, RASN1Object * object);
-R_API void r_x509_free_algorithmidentifier (RX509AlgorithmIdentifier * ai);
-
-R_API bool r_x509_parse_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki, RASN1Object *object);
-R_API void r_x509_free_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki);
-
-R_API bool r_x509_parse_name (RX509Name *name, RASN1Object * object);
-R_API void r_x509_free_name (RX509Name * name);
-
-R_API bool r_x509_parse_extension (RX509Extension *ext, RASN1Object * object);
-R_API void r_x509_free_extension (RX509Extension * ex);
-
-R_API bool r_x509_parse_extensions (RX509Extensions *ext, RASN1Object * object);
-R_API void r_x509_free_extensions (RX509Extensions* ex);
-
-R_API bool r_x509_parse_tbscertificate (RX509TBSCertificate *tbsc, RASN1Object * object);
-R_API void r_x509_free_tbscertificate (RX509TBSCertificate * tbsc);
-
-R_API RX509CRLEntry *r_x509_parse_crlentry (RASN1Object *object);
-R_API void r_x509_free_crlentry (RX509CRLEntry *entry);
-
-R_API char* r_x509_validity_dump (RX509Validity* validity, char* buffer, ut32 length, const char* pad);
-R_API char* r_x509_name_dump (RX509Name* name, char* buffer, ut32 length, const char* pad);
-R_API char* r_x509_subjectpublickeyinfo_dump (RX509SubjectPublicKeyInfo* spki, char* buffer, ut32 length, const char* pad);
-R_API char* r_x509_extensions_dump (RX509Extensions* exts, char* buffer, ut32 length, const char* pad);
-R_API char* r_x509_tbscertificate_dump (RX509TBSCertificate* tbsc, char* buffer, ut32 length, const char* pad);
-R_API char* r_x509_crlentry_dump (RX509CRLEntry *crle, char* buffer, ut32 length, const char* pad);
-
-#endif /* R_X509_INTERNAL_H */
-
diff -Nru radare2-2.3.0+dfsg/libr/util/sandbox.c radare2-2.8.0+dfsg/libr/util/sandbox.c
--- radare2-2.3.0+dfsg/libr/util/sandbox.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/sandbox.c	2018-08-07 14:12:36.000000000 +0000
@@ -7,12 +7,16 @@
 #include <direct.h>  // to compile chdir under msvc windows
 #endif
 
+#if HAVE_CAPSICUM
+#include <sys/capsicum.h>
+#endif
+
 static bool enabled = false;
 static bool disabled = false;
 
 static bool inHomeWww(const char *path) {
 	bool ret = false;
-	char *homeWww = r_str_home (".config/radare2/www/");
+	char *homeWww = r_str_home (R2_HOME_WWWROOT R_SYS_DIR);
 	if (homeWww) {
 		if (!strncmp (path, homeWww, strlen (homeWww))) {
 			ret = true;
@@ -91,6 +95,12 @@
 			return enabled;
 		}
 #endif
+#if HAVE_CAPSICUM
+		if (enabled) {
+			eprintf ("sandbox mode couldn't be disabled in capability mode\n");
+			return enabled;
+		}
+#endif
 		disabled = enabled;
 		enabled = false;
 	} else {
@@ -113,6 +123,12 @@
 		return false;
 	}
 #endif
+#if HAVE_CAPSICUM
+	if (enabled && cap_enter () != 0) {
+		eprintf ("sandbox: call_enter failed\n");
+		return false;
+	}
+#endif
 	return enabled;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/util/seven.c radare2-2.8.0+dfsg/libr/util/seven.c
--- radare2-2.3.0+dfsg/libr/util/seven.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/seven.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,62 @@
+/* radare - LGPL - Copyright 2012-2013 - pancake */
+#include <r_print.h>
+
+// TODO: work in progress
+
+#if 0
+for(i=0; i<len; i++) {
+	packing_7bit_character(config.block+i, buffer);
+	cons_printf("%c", buffer[0]);
+}
+#endif
+
+R_API int r_print_pack7bit (const char *src, char *dest) {
+        int len, i, j = 0, shift = 0;
+        ut8 ch1, ch2;
+        char tmp[2];
+
+        *dest = '\0';
+	len = strlen (src);
+
+        for (i=0; i<len; i++ ) {
+                ch1 = src[i] & 0x7F;
+                ch1 = ch1 >> shift;
+                ch2 = src[(i+1)] & 0x7F;
+                ch2 = ch2 << (7-shift);
+
+                ch1 = ch1 | ch2;
+
+                j = strlen(dest);
+                sprintf (tmp, "%x", (ch1 >> 4));
+                dest[j++] = tmp[0];
+                sprintf (tmp, "%x", (ch1 & 0x0F));
+                dest[j++] = tmp[0];
+                dest[j++] = '\0';
+                if (7 == ++shift) {
+                        shift = 0;
+                        i++;
+                }
+        }
+        return 0;
+}
+
+R_API int r_print_unpack7bit (const char *src, char *dest) {
+        int i, j, shift = 0, len = strlen (src);
+        ut8 ch1, ch2 = '\0';
+        char buf[8];
+
+        *dest = '\0';
+
+        for (i=0; i<len; i+=2) {
+                sprintf (buf, "%c%c", src[i], src[i+1]);
+                ch1 = strtol (buf, NULL, 16);
+
+                j = strlen(dest);
+                dest[j++] = ((ch1 & (0x7F >> shift)) << shift) | ch2;
+                dest[j++] = '\0';
+                ch2 = ch1 >> (7-shift);
+
+                shift++;
+        }
+        return 0;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/signal.c radare2-2.8.0+dfsg/libr/util/signal.c
--- radare2-2.3.0+dfsg/libr/util/signal.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/signal.c	2018-08-07 14:12:36.000000000 +0000
@@ -66,3 +66,9 @@
 	}
 	return NULL;
 }
+
+#if HAVE_PTHREAD
+R_API void r_signal_sigmask(int how, const sigset_t *newmask, sigset_t *oldmask) {
+	pthread_sigmask (how, newmask, oldmask);
+}
+#endif
\ No newline at end of file
diff -Nru radare2-2.3.0+dfsg/libr/util/strbuf.c radare2-2.8.0+dfsg/libr/util/strbuf.c
--- radare2-2.3.0+dfsg/libr/util/strbuf.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/strbuf.c	2018-08-07 14:12:36.000000000 +0000
@@ -6,7 +6,9 @@
 
 R_API RStrBuf *r_strbuf_new(const char *str) {
 	RStrBuf *s = R_NEW0 (RStrBuf);
-	if (str) r_strbuf_set (s, str);
+	if (str) {
+		r_strbuf_set (s, str);
+	}
 	return s;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/util/str.c radare2-2.8.0+dfsg/libr/util/str.c
--- radare2-2.3.0+dfsg/libr/util/str.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/str.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,43 +9,75 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdarg.h>
-#ifdef _MSC_VER
-#define strncasecmp _strnicmp
-#endif
 
 /* stable code */
 static const char *nullstr = "";
 static const char *nullstr_c = "(null)";
 static const char *rwxstr[] = {
-	[0] = "----",
-	[1] = "---x",
-	[2] = "--w-",
-	[3] = "--wx",
-	[4] = "-r--",
-	[5] = "-r-x",
-	[6] = "-rw-",
-	[7] = "-rwx",
-
-	[8] = "----",
-	[9] = "---x",
-	[10] = "--w-",
-	[11] = "--wx",
-	[12] = "-r--",
-	[13] = "-r-x",
-	[14] = "-rw-",
-	[15] = "-rwx",
-
-	[16] = "m---",
-	[17] = "m--x",
-	[18] = "m-w-",
-	[19] = "m-wx",
-	[20] = "mr--",
-	[21] = "mr-x",
-	[22] = "mrw-",
-	[23] = "mrwx",
+	[0] = "---",
+	[1] = "--x",
+	[2] = "-w-",
+	[3] = "-wx",
+	[4] = "r--",
+	[5] = "r-x",
+	[6] = "rw-",
+	[7] = "rwx",
+
+	[8] = "---",
+	[9] = "--x",
+	[10] = "-w-",
+	[11] = "-wx",
+	[12] = "r--",
+	[13] = "r-x",
+	[14] = "rw-",
+	[15] = "rwx",
 };
 
+R_API int r_str_casecmp(const char *s1, const char *s2) {
+#ifdef _MSC_VER
+	return stricmp (s1, s2);
+#else
+	return strcasecmp (s1, s2);
+#endif
+}
+
+R_API int r_str_ncasecmp(const char *s1, const char *s2, size_t n) {
+#ifdef _MSC_VER
+	return _strnicmp (s1, s2, n);
+#else
+	return strncasecmp (s1, s2, n);
+#endif
+}
+
+// GOOD
 // In-place replace the first instance of the character a, with the character b.
+R_API int r_str_replace_ch(char *s, char a, char b, bool global) {
+	int ret = 0;
+	char *o = s;
+	if (!s || a == b) {
+		return 0;
+	}
+	for (; *o; s++, o++) {
+		if (*o == a) {
+			ret++;
+			if (b) {
+				*s = b;
+			} else {
+				/* remove char */
+				s--;
+			}
+			if (!global) {
+				return 1;
+			}
+		} else {
+			*s = *o;
+		}
+	}
+	*s = 0;
+	return ret;
+}
+
+// DEPRECATED
 R_API int r_str_replace_char_once(char *s, int a, int b) {
 	int ret = 0;
 	char *o = s;
@@ -53,7 +85,7 @@
 		return 0;
 	}
 	for (; *o; s++, o++) {
-		if (*o==a) {
+		if (*o == a) {
 			if (b) {
 				*s = b;
 				return ++ret;
@@ -66,8 +98,7 @@
 	return ret;
 }
 
-// Spagetti.. must unify and support 'g', 'i' ...
-// In-place replace all instances of character a with character b.
+// DEPRECATED
 R_API int r_str_replace_char(char *s, int a, int b) {
 	int ret = 0;
 	char *o = s;
@@ -142,7 +173,7 @@
 R_API int r_str_bits64(char* strout, ut64 in) {
 	int i, bit, count = 0;
 	count = 0;
-	for (i = (sizeof (in) * 8) - 1; i >= 0; --i) {
+	for (i = (sizeof (in) * 8) - 1; i >= 0; i--) {
 		bit = in >> i;
 		if (bit & 1) {
 			strout[count] = '1';
@@ -244,11 +275,13 @@
 R_API void r_str_case(char *str, bool up) {
 	if (up) {
 		char oc = 0;
-		for (; *str; oc = *str++)
+		for (; *str; oc = *str++) {
 			*str = (*str=='x' && oc=='0') ? 'x': toupper ((int)(ut8)*str);
+		}
 	} else {
-		for (; *str; str++)
+		for (; *str; str++) { 
 			*str = tolower ((int)(ut8)*str);
+		}
 	}
 }
 
@@ -279,6 +312,10 @@
 	return dst;
 }
 
+R_API char *r_str_r2_prefix(const char *str) {
+	return r_str_newf ("%s%s%s", r_sys_prefix (NULL), R_SYS_DIR, str);
+}
+
 // Compute a 64 bit DJB hash of a string.
 R_API ut64 r_str_hash64(const char *s) {
 	ut64 len, h = 5381;
@@ -525,15 +562,15 @@
 }
 
 // Counts the number of words (separted by separator charactors: newlines, tabs,
-// return, space). See r_util.h for more details of the ISSEPARATOR macro.
+// return, space). See r_util.h for more details of the IS_SEPARATOR macro.
 R_API int r_str_word_count(const char *string) {
 	const char *text, *tmp;
 	int word;
 
-	for (text = tmp = string; *text && ISSEPARATOR (*text); text++);
+	for (text = tmp = string; *text && IS_SEPARATOR (*text); text++);
 	for (word = 0; *text; word++) {
-		for (;*text && !ISSEPARATOR (*text); text++);
-		for (tmp = text; *text && ISSEPARATOR (*text); text++);
+		for (;*text && !IS_SEPARATOR (*text); text++);
+		for (tmp = text; *text && IS_SEPARATOR (*text); text++);
 	}
 	return word;
 }
@@ -642,6 +679,17 @@
 	return buf;
 }
 
+R_API char *r_str_trunc_ellipsis(const char *str, int len) {
+	char *buf;
+	if (strlen (str) < len) {
+		buf = strdup (str);
+	} else {
+		buf = r_str_newlen (str, len);
+		strcpy (buf + len - 4, "...");
+	}
+	return buf;
+}
+
 // Returns a new heap-allocated string that matches the format-string
 // specification.
 R_API char *r_str_newf(const char *fmt, ...) {
@@ -711,6 +759,9 @@
 	if (a == b) {
 		return true;
 	}
+	if (len < 0) {
+		return strcmp (a, b);
+	}
 	for (;len--;) {
 		if (*a == '\0' || *b == '\0' || *a != *b) {
 			return false;
@@ -733,7 +784,7 @@
 R_API char *r_str_word_get_first(const char *text) {
 	char *ret;
 	int len = 0;
-	for (;*text && ISSEPARATOR (*text); text++);
+	for (;*text && IS_SEPARATOR (*text); text++);
 	/* strdup */
 	len = strlen (text);
 	ret = (char *)malloc (len + 1);
@@ -827,15 +878,12 @@
  */
 R_API char *r_str_append(char *ptr, const char *string) {
 	int slen, plen;
-	if (!string && !ptr) {
-		return NULL;
-	}
-	if (!string && ptr) {
-		return ptr;
-	}
 	if (string && !ptr) {
 		return strdup (string);
 	}
+	if (!string) {
+		return ptr;
+	}
 	plen = strlen (ptr);
 	slen = strlen (string);
 	char *newptr = realloc (ptr, slen + plen + 1);
@@ -1125,6 +1173,14 @@
 		*q++ = '\\';
 		*q++ = 'b';
 		break;
+	case '\v':
+		*q++ = '\\';
+		*q++ = 'v';
+		break;
+	case '\a':
+		*q++ = '\\';
+		*q++ = 'a';
+		break;
 	default:
 		/* Outside the ASCII printable range */
 		if (!IS_PRINTABLE (*p)) {
@@ -1145,7 +1201,7 @@
 
 /* Internal function. dot_nl specifies wheter to convert \n into the
  * graphiz-compatible newline \l */
-static char *r_str_escape_(const char *buf, int dot_nl, bool ign_esc_seq, bool show_asciidot, bool esc_bslash) {
+static char *r_str_escape_(const char *buf, int dot_nl, bool parse_esc_seq, bool ign_esc_seq, bool show_asciidot, bool esc_bslash) {
 	char *new_buf, *q;
 	const char *p;
 
@@ -1163,7 +1219,8 @@
 	while (*p) {
 		switch (*p) {
 		case 0x1b: // ESC
-			if (ign_esc_seq) {
+			if (parse_esc_seq) {
+				const char *start_seq = p;
 				p++;
 				/* Parse the ANSI code (only the graphic mode
 				 * set ones are supported) */
@@ -1176,6 +1233,10 @@
 							goto out;
 						}
 					}
+					if (!ign_esc_seq) {
+						memcpy (q, start_seq, p - start_seq + 1);
+						q += (p - start_seq + 1);
+					}
 				}
 				break;
 			}
@@ -1190,15 +1251,15 @@
 }
 
 R_API char *r_str_escape(const char *buf) {
-	return r_str_escape_ (buf, false, true, false, true);
+	return r_str_escape_ (buf, false, true, true, false, true);
 }
 
 R_API char *r_str_escape_dot(const char *buf) {
-	return r_str_escape_ (buf, true, true, false, true);
+	return r_str_escape_ (buf, true, true, true, false, true);
 }
 
-R_API char *r_str_escape_latin1(const char *buf, bool show_asciidot, bool esc_bslash) {
-	return r_str_escape_ (buf, false, false, show_asciidot, esc_bslash);
+R_API char *r_str_escape_latin1(const char *buf, bool show_asciidot, bool esc_bslash, bool colors) {
+	return r_str_escape_ (buf, false, colors, !colors, show_asciidot, esc_bslash);
 }
 
 static char *r_str_escape_utf(const char *buf, int buf_size, RStrEnc enc, bool show_asciidot, bool esc_bslash) {
@@ -1286,30 +1347,21 @@
 	return r_str_escape_utf (buf, -1, R_STRING_ENC_UTF8, show_asciidot, esc_bslash);
 }
 
-R_API char *r_str_escape_utf16le(const char *buf, int buf_size, bool show_asciidot) {
-	return r_str_escape_utf (buf, buf_size, R_STRING_ENC_UTF16LE, show_asciidot, true);
+R_API char *r_str_escape_utf16le(const char *buf, int buf_size, bool show_asciidot, bool esc_bslash) {
+	return r_str_escape_utf (buf, buf_size, R_STRING_ENC_UTF16LE, show_asciidot, esc_bslash);
 }
 
-R_API char *r_str_escape_utf32le(const char *buf, int buf_size, bool show_asciidot) {
-	return r_str_escape_utf (buf, buf_size, R_STRING_ENC_UTF32LE, show_asciidot, true);
+R_API char *r_str_escape_utf32le(const char *buf, int buf_size, bool show_asciidot, bool esc_bslash) {
+	return r_str_escape_utf (buf, buf_size, R_STRING_ENC_UTF32LE, show_asciidot, esc_bslash);
 }
 
 /* ansi helpers */
 R_API int r_str_ansi_len(const char *str) {
-	int ch, ch2, i = 0, len = 0, sub = 0;
+	int ch, i = 0, len = 0, sub = 0;
 	while (str[i]) {
 		ch = str[i];
-		ch2 = str[i + 1];
-		if (ch == 0x1b) {
-			if (ch2 == '\\') {
-				i++;
-			} else if (ch2 == ']') {
-				if (!strncmp (str + 2 + 5, "rgb:", 4)) {
-					i += 18;
-				}
-			} else if (ch2 == '[') {
-				for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++);
-			}
+		if (ch == 0x1b && str[i + 1] == '[') {
+			for (++i; str[i] && str[i] != 'J' && str[i] != 'm' && str[i] != 'H'; i++);
 		} else {
 			len++;
 #if 0
@@ -1445,7 +1497,10 @@
 	int i, j, *cps;
 	char *tmp;
 
-	if (len < 1) {
+	if (len == 0) {
+		return 0;
+	}
+	if (len < 0) {
 		len = strlen (str);
 	}
 	tmp = malloc (len + 1);
@@ -1488,13 +1543,13 @@
 
 R_API char *r_str_ansi_crop(const char *str, ut32 x, ut32 y, ut32 x2, ut32 y2) {
 	char *r, *r_end, *ret;
-	const char *s;
+	const char *s, *s_start;
 	size_t r_len, str_len = 0, nr_of_lines = 0;
 	ut32 ch = 0, cw = 0;
 	if (x2 < 1 || y2 < 1 || !str) {
 		return strdup ("");
 	}
-	s = str;
+	s = s_start = str;
 	while (*s) {
 		str_len++;
 		if (*s == '\n') {
@@ -1504,6 +1559,9 @@
 	}
 	r_len = str_len + nr_of_lines * strlen (Color_RESET) + 1;
 	r = ret = malloc (r_len);
+	if (!r) {
+		return NULL;
+	}
 	r_end = r + r_len;
 	while (*str) {
 		/* crop height */
@@ -1524,23 +1582,41 @@
 			str++;
 			ch++;
 			cw = 0;
-		} else if (*str == 0x1b && *(str + 1) == '[') {
-			const char *ptr = str;
-			if ((r_end - r) > 2) {
-				/* copy 0x1b and [ */
-				*r++ = *str++;
-				*r++ = *str++;
-				for (ptr = str; *ptr && *ptr != 'J' && *ptr != 'm' && *ptr != 'H'; ++ptr) {
-					*r++ = *ptr;
-				}
-				*r++ = *ptr++;
-			}
-			str = ptr;
 		} else {
-			if (ch >= y && ch < y2 && cw >= x && cw < x2) {
-				*r++ = *str;
+			if (ch >= y && ch < y2) {
+				if ((*str & 0xc0) == 0x80) {
+					if (cw > x) {
+						*r++ = *str++;
+					} else {
+						str++;
+					}
+					continue;
+				}
+				if (r_str_char_fullwidth (str, str_len - (str - s_start))) {
+					cw++;
+					if (cw == x) {
+						*r++ = ' ';
+						str++;
+						continue;
+					}
+				}
+				if (*str == 0x1b && *(str + 1) == '[') {
+					const char *ptr = str;
+					if ((r_end - r) > 2) {
+						/* copy 0x1b and [ */
+						*r++ = *str++;
+						*r++ = *str++;
+						for (ptr = str; *ptr && *ptr != 'J' && *ptr != 'm' && *ptr != 'H'; ++ptr) {
+							*r++ = *ptr;
+						}
+						*r++ = *ptr++;
+					}
+					str = ptr;
+					continue;
+				} else if (cw >= x && cw < x2) {
+					*r++ = *str;
+				}
 			}
-
 			/* skip until newline */
 			if (cw >= x2) {
 				while (*str && *str != '\n') {
@@ -1556,6 +1632,38 @@
 	return ret;
 }
 
+R_API int r_str_utf8_codepoint (const char* s, int left) {
+	bool safe = left >= 0;
+	if ((*s & 0x80) != 0x80) {
+		return 0;
+	} else if ((*s & 0xe0) == 0xc0 && (safe ? left >= 1 : *(s + 1))) {
+		return ((*s & 0x1f) << 6) + (*(s + 1) & 0x3f);
+	} else if ((*s & 0xf0) == 0xe0 && (safe ? left >= 2 : (*(s + 1) && *(s + 2)))) {
+		return ((*s & 0xf) << 12) + ((*(s + 1) & 0x3f) << 6) + (*(s + 2) & 0x3f);
+	} else if ((*s & 0xf8) == 0xf0 && (safe ? left >= 3 : (*(s + 1) && *(s + 2) && *(s + 3)))) {
+		return ((*s & 0x7) << 18) + ((*(s + 1) & 0x3f) << 12) + ((*(s + 2) & 0x3f) << 6) + (*(s + 3) & 0x3f);
+	}
+	return 0;
+}
+
+R_API bool r_str_char_fullwidth (const char* s, int left) {
+	int codepoint = r_str_utf8_codepoint (s, left);
+	return (codepoint >= 0x1100 &&
+		 (codepoint <= 0x115f ||                  /* Hangul Jamo init. consonants */
+			  codepoint == 0x2329 || codepoint == 0x232a ||
+		 (R_BETWEEN (0x2e80, codepoint, 0xa4cf)
+			&& codepoint != 0x303f) ||        /* CJK ... Yi */
+		 R_BETWEEN (0xac00, codepoint, 0xd7a3) || /* Hangul Syllables */
+		 R_BETWEEN (0xf900, codepoint, 0xfaff) || /* CJK Compatibility Ideographs */
+		 R_BETWEEN (0xfe10, codepoint, 0xfe19) || /* Vertical forms */
+		 R_BETWEEN (0xfe30, codepoint, 0xfe6f) || /* CJK Compatibility Forms */
+		 R_BETWEEN (0xff00, codepoint, 0xff60) || /* Fullwidth Forms */
+		 R_BETWEEN (0xffe0, codepoint, 0xffe6) ||
+		 R_BETWEEN (0x20000, codepoint, 0x2fffd) ||
+		 R_BETWEEN (0x30000, codepoint, 0x3fffd)));
+
+}
+
 R_API void r_str_filter_zeroline(char *str, int len) {
 	int i;
 	for (i = 0; i < len && str[i]; i++) {
@@ -1691,7 +1799,7 @@
 		int doublequoted = 0;
 
 		// Seek the beginning of next argument (skip whitespaces)
-		while (cmdline[cmdline_current] != '\0' && ISWHITECHAR (cmdline[cmdline_current])) {
+		while (cmdline[cmdline_current] != '\0' && IS_WHITECHAR (cmdline[cmdline_current])) {
 			cmdline_current++;
 		}
 
@@ -1862,14 +1970,17 @@
 }
 
 R_API int r_str_len_utf8(const char *s) {
-	int i = 0, j = 0;
+	int i = 0, j = 0, fullwidths = 0;
 	while (s[i]) {
 		if ((s[i] & 0xc0) != 0x80) {
 			j++;
+			if (r_str_char_fullwidth (s + i, 4)) {
+				fullwidths++;
+			}
 		}
 		i++;
 	}
-	return j;
+	return j + fullwidths;
 }
 
 R_API const char *r_str_casestr(const char *a, const char *b) {
@@ -1878,7 +1989,7 @@
 	size_t hay_len = strlen (a);
 	size_t needle_len = strlen (b);
 	while (hay_len >= needle_len) {
-		if (!strncasecmp (a, b, needle_len)) {
+		if (!r_str_ncasecmp (a, b, needle_len)) {
 			return (const char *) a;
 		}
 		a++;
@@ -2166,7 +2277,7 @@
 	int viewflags = 0;
 	nargs = endian = i = j = 0;
 
-	while (*arg && ISWHITECHAR (*arg)) {
+	while (*arg && IS_WHITECHAR (*arg)) {
 		arg++;
 	}
 	/* get times */
@@ -2592,6 +2703,12 @@
 }
 
 R_API bool r_str_startswith(const char *str, const char *needle) {
+	if (!str || !needle) {
+		return false;
+	}
+	if (str == needle) {
+		return true;
+	}
 	return !strncmp (str, needle, strlen (needle));
 }
 
@@ -2604,17 +2721,28 @@
 	return !strcmp (str + (slen - nlen), needle);
 }
 
-R_API RList *r_str_split_list(char *str) {
-	int i, count, *a = r_str_split_lines (str, &count);
-	if (a) {
-		RList *list = r_list_newf (free);
-		for (i = 0; i < count; i++) {
-			r_list_append (list, str + a[i]);
+// Splits the string <str> by string <c> and returns the result in a list.
+R_API RList *r_str_split_list(char *str, const char *c)  {
+	RList *lst = r_list_new ();
+	char *aux;
+	bool first_loop = true;
+
+	for (;;) {
+		if (first_loop) {
+			aux = strtok (str, c);
+			first_loop = false;
+		} else {
+			aux = strtok (NULL, c);
+		}
+
+		if (!aux) {
+			break;
 		}
-		free (a);
-		return list;
+		r_str_trim (aux);
+		r_list_append (lst, aux);
 	}
-	return NULL;
+
+	return lst;
 }
 
 R_API int *r_str_split_lines(char *str, int *count) {
@@ -2708,7 +2836,7 @@
 	int count = 0;
 	for (i = 0, j = 0; s1[i]  && s2[j] && count < n; i++, j++, count++) {
 		while (s1[i] == 0x1b) {
-			while (s1[i] && s1[i] != 'm') { 
+			while (s1[i] && s1[i] != 'm') {
 				i++;
 			}
 			if (s1[i]) {
@@ -2738,7 +2866,7 @@
 static char *strchr_skip_color_codes(const char *s, int c) {
 	int i = 0;
 	for (i = 0; s[i]; i++) {
-		while (s[i] == 0x1b) {
+		while (s[i] && s[i] == 0x1b) {
 			while (s[i] && s[i] != 'm') {
 				i++;
 			}
@@ -2746,7 +2874,7 @@
 				i++;
 			}
 		}
-		if (s[i] == (char)c) {
+		if (!s[i] || s[i] == (char)c) {
 			return (char*)s + i;
 		}
 	}
@@ -2755,20 +2883,20 @@
 
 // Global buffer to speed up colorizing performance
 
-R_API char* r_str_highlight(char *str, const char *word, const char *color) {
+R_API char* r_str_highlight(char *str, const char *word, const char *color, const char *color_reset) {
 	if (!str || !*str) {
 		return NULL;
 	}
 	ut32 i = 0, j = 0, to_copy;
 	char *start = str;
 	ut32 l_str = strlen (str);
-	ut32 l_reset = strlen (Color_BGRESET);
+	ut32 l_reset = strlen (color_reset);
 	ut32 l_color = color? strlen (color): 0;
 	if (!color) {
 		return strdup (str);
 	}
 	if (!word || !*word) {
-		return r_str_newf ("%s%s%s", color, str, Color_BGRESET);
+		return r_str_newf ("%s%s%s", color, str, color_reset);
 	}
 	ut32 l_word = strlen (word);
 	// XXX dont use static buffers
@@ -2800,11 +2928,11 @@
 				copied = strncpy_with_color_codes (o + j, str + i, l_word);
 				i += copied;
 				j += copied;
-				if (j + strlen (Color_BGRESET) >= sizeof (o)) {
+				if (j + strlen (color_reset) >= sizeof (o)) {
 					// XXX. no limits
 					break;
 				}
-				strcpy (o + j, Color_BGRESET);
+				strcpy (o + j, color_reset);
 				j += l_reset;
 			} else {
 				o[j++] = str[i++];
@@ -2895,11 +3023,11 @@
 R_API char *r_str_from_ut64(ut64 val) {
 	int i = 0;
 	char *v = (char *)&val;
-	char *str = (char *)calloc(1, 65);
+	char *str = (char *)calloc(1, 9);
 	if (!str) {
 		return NULL;
 	}
-	while (i < 64 && *v && *v >= '!' && *v <= '~') {
+	while (i < 8 && *v) {
 		str[i++] = *v++;
 	}
 	return str;
@@ -2913,3 +3041,40 @@
 	va_end (ap);
 	return ret;
 }
+
+// Strips all the lines in str that contain key
+R_API void r_str_stripLine(char *str, const char *key) {
+	size_t i, j, klen, slen, off;
+	const char *ptr; 
+
+	if (!str || !key) {
+		return;
+	}
+	klen = strlen (key);
+	slen = strlen (str);
+
+	for (i = 0; i < slen; ) {
+		ptr = (char*) r_mem_mem ((ut8*) str + i, slen - i, (ut8*) "\n", 1);
+		if (!ptr) {
+			ptr = (char*) r_mem_mem ((ut8*) str + i, slen - i, (ut8*) key, klen);
+			if (ptr) {
+				str[i] = '\0';
+				break;
+			}
+			break;
+		}
+			
+		off = (size_t) (ptr - (str + i)) + 1;
+
+		ptr = (char*) r_mem_mem ((ut8*) str + i, off, (ut8*) key, klen);
+		if (ptr) {
+			for (j = i; j < slen - off + 1; j++) {
+				str[j] = str[j + off];
+			}
+			slen -= off;
+		} else {
+			i += off;
+		}
+	}
+}
+
diff -Nru radare2-2.3.0+dfsg/libr/util/str_trim.c radare2-2.8.0+dfsg/libr/util/str_trim.c
--- radare2-2.3.0+dfsg/libr/util/str_trim.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/str_trim.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2007-2017 - pancake */
+/* radare - LGPL - Copyright 2007-2018 - pancake */
 
 #include "r_types.h"
 #include "r_util.h"
@@ -9,9 +9,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdarg.h>
-#ifdef _MSC_VER
-#define strncasecmp _strnicmp
-#endif
 
 // TODO: simplify this horrible loop
 R_API void r_str_trim_path(char *s) {
@@ -60,19 +57,23 @@
 }
 
 R_API char *r_str_trim(char *str) {
-	int len;
-	char *ptr;
-
 	if (!str) {
 		return NULL;
 	}
-	while (*str && ISWHITECHAR (*str)) {
-		memmove (str, str + 1, strlen (str + 1) + 1);
+	char *nonwhite = str;
+	while (*nonwhite && IS_WHITECHAR (*nonwhite)) {
+		nonwhite++;
+	}
+	int len = strlen (str);
+	if (str != nonwhite) {
+		int delta = (size_t)(nonwhite - str);
+		len -= delta;
+		memmove (str, nonwhite, len + 1);
 	}
-	len = strlen (str);
 	if (len > 0) {
+		char *ptr;
 		for (ptr = str + len - 1; ptr != str; ptr--) {
-			if (!ISWHITECHAR (*ptr)) {
+			if (!IS_WHITECHAR (*ptr)) {
 				break;
 			}
 			*ptr = '\0';
@@ -85,7 +86,16 @@
 // TODO: rename to r_str_trim_head_ro()
 R_API const char *r_str_trim_ro(const char *str) {
 	if (str) {
-		for (; *str && ISWHITECHAR (*str); str++);
+		for (; *str && IS_WHITECHAR (*str); str++);
+	}
+	return str;
+}
+
+// Returns a pointer to the first whitespace character of str.
+// TODO: rename to r_str_trim_head_wp()
+R_API const char *r_str_trim_wp(const char *str) {
+	if (str) {
+		for (; *str && !IS_WHITESPACE (*str); str++);
 	}
 	return str;
 }
@@ -114,7 +124,7 @@
 	}
 
 	while (length--) {
-		if (ISWHITECHAR (str[length])) {
+		if (IS_WHITECHAR (str[length])) {
 			str[length] = '\0';
 		} else {
 			break;
diff -Nru radare2-2.3.0+dfsg/libr/util/sys.c radare2-2.8.0+dfsg/libr/util/sys.c
--- radare2-2.3.0+dfsg/libr/util/sys.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/sys.c	2018-08-07 14:12:36.000000000 +0000
@@ -9,6 +9,12 @@
 #  define NETBSD_WITH_BACKTRACE
 # endif
 #endif
+#if defined(__FreeBSD__)
+# include <sys/param.h>
+# if __FreeBSD_version >= 1000000 
+#  define FREEBSD_WITH_BACKTRACE
+# endif
+#endif
 #include <sys/types.h>
 #include <r_types.h>
 #include <r_util.h>
@@ -16,7 +22,8 @@
 
 static char** env = NULL;
 
-#if (__linux__ && __GNU_LIBRARY__) || defined(NETBSD_WITH_BACKTRACE)
+#if (__linux__ && __GNU_LIBRARY__) || defined(NETBSD_WITH_BACKTRACE) || \
+  defined(FREEBSD_WITH_BACKTRACE)
 # include <execinfo.h>
 #endif
 #if __APPLE__
@@ -95,6 +102,7 @@
     {"i8080", R_SYS_ARCH_I8080},
     {"rar", R_SYS_ARCH_RAR},
     {"lm32", R_SYS_ARCH_LM32},
+    {"v850", R_SYS_ARCH_V850},
     {NULL, 0}
 };
 
@@ -199,7 +207,8 @@
 #define APPLE_WITH_BACKTRACE 1
 #endif
 
-#if (__linux__ && __GNU_LIBRARY__) || (__APPLE__ && APPLE_WITH_BACKTRACE) || defined(NETBSD_WITH_BACKTRACE)
+#if (__linux__ && __GNU_LIBRARY__) || (__APPLE__ && APPLE_WITH_BACKTRACE) || \
+  defined(NETBSD_WITH_BACKTRACE) || defined(FREEBSD_WITH_BACKTRACE)
 #define HAVE_BACKTRACE 1
 #endif
 
@@ -437,6 +446,10 @@
 
 #if __UNIX__ || __CYGWIN__ && !defined(MINGW32)
 R_API int r_sys_cmd_str_full(const char *cmd, const char *input, char **output, int *len, char **sterr) {
+	char *mysterr = NULL;
+	if (!sterr) {
+		sterr = &mysterr;
+	}
 	char buffer[1024], *outputptr = NULL;
 	char *inputptr = (char *)input;
 	int pid, bytes = 0, status;
@@ -528,7 +541,7 @@
 				if (!(bytes = read (sh_out[0], buffer, sizeof (buffer)-1))) {
 					break;
 				}
-				buffer[sizeof(buffer) - 1] = '\0';
+				buffer[sizeof (buffer) - 1] = '\0';
 				if (len) {
 					*len += bytes;
 				}
@@ -537,7 +550,7 @@
 				if (!read (sh_err[0], buffer, sizeof (buffer)-1)) {
 					break;
 				}
-				buffer[sizeof(buffer) - 1] = '\0';
+				buffer[sizeof (buffer) - 1] = '\0';
 				*sterr = r_str_append (*sterr, buffer);
 			} else if (FD_ISSET (sh_in[1], &wfds) && inputptr && *inputptr) {
 				int inputptr_len = strlen (inputptr);
@@ -564,10 +577,11 @@
 		waitpid (pid, &status, 0);
 		bool ret = true;
 		if (status) {
-			char *escmd = r_str_escape (cmd);
-			eprintf ("error code %d\n", WEXITSTATUS(status));
-			//eprintf ("%s: failed command '%s'\n", __func__, escmd);
-			free (escmd);
+			// char *escmd = r_str_escape (cmd);
+			// eprintf ("error code %d (%s): %s\n", WEXITSTATUS (status), escmd, *sterr);
+			// eprintf ("(%s)\n", output);
+			// eprintf ("%s: failed command '%s'\n", __func__, escmd);
+			// free (escmd);
 			ret = false;
 		}
 
@@ -1021,15 +1035,17 @@
 	return false;
 }
 
-static char *prefix = NULL;
+static char prefix[128] = {0};
 
 R_API const char *r_sys_prefix(const char *pfx) {
-	if (pfx) {
-		free (prefix);
-		prefix = strdup (pfx);
+	if (!*prefix) {
+		r_str_ncpy (prefix, R2_PREFIX, sizeof (prefix));
 	}
-	if (!prefix) {
-		prefix = strdup (R2_PREFIX);
+	if (pfx) {
+		if (strlen (pfx) >= sizeof (prefix) -1) {
+			return NULL;
+		}
+		r_str_ncpy (prefix, pfx, sizeof (prefix) - 1);
 	}
 	return prefix;
 }
diff -Nru radare2-2.3.0+dfsg/libr/util/syscmd.c radare2-2.8.0+dfsg/libr/util/syscmd.c
--- radare2-2.3.0+dfsg/libr/util/syscmd.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/syscmd.c	2018-08-07 14:12:36.000000000 +0000
@@ -72,7 +72,9 @@
 	u_rwx = strdup ("-");
 	fch = isdir? 'd': '-';
 #endif
-	if (printfmt == FMT_RAW) {
+	if (printfmt == 'q') {
+		res = r_str_appendf (res, "%s\n", nn);
+	} else if (printfmt == FMT_RAW) {
 		res = r_str_appendf (res, "%c%s%s%s  1 %4d:%-4d  %-10d  %s\n",
 			isdir?'d': fch,
 			u_rwx? u_rwx: "-",
@@ -85,7 +87,7 @@
 		}
 		res = r_str_appendf (res, "{\"name\":\"%s\",\"size\":%d,\"uid\":%d,"
 			"\"gid\":%d,\"perm\":%d,\"isdir\":%s}",
-			name, sz, uid, gid, perm, isdir?"true":"false");
+			name, sz, uid, gid, perm, isdir? "true": "false");
 	}
 	free (nn);
 	free (u_rwx);
@@ -110,6 +112,10 @@
 		input = "";
 		path = ".";
 	}
+	if (*input == 'q') {
+		printfmt = 'q';
+		input++;
+	}
 	if (r_sandbox_enable (0)) {
 		eprintf ("Sandbox forbids listing directories\n");
 		return NULL;
@@ -118,7 +124,15 @@
 		input++;
 	}
 	if (*input) {
-		if ((!strncmp (input, "-l", 2)) || (!strncmp (input, "-j", 2))) {
+		if ((!strncmp (input, "-h", 2))) {
+			eprintf ("Usage: ls ([-l,-j,-q]) ([path]) # long, json, quiet\n");
+		} else if ((!strncmp (input, "-q", 2))) {
+			printfmt = 'q';
+			path ++;
+			while (*path == ' ') {
+				path++;
+			}
+		} else if ((!strncmp (input, "-l", 2)) || (!strncmp (input, "-j", 2))) {
 			// mode = 'l';
 			if (input[2]) {
 				printfmt = (input[2] == 'j') ? FMT_JSON : FMT_RAW;
@@ -138,14 +152,14 @@
 	}
 	if (!path || !*path) {
 		path = ".";
-	} else if (*path == '~') {
+	} else if (!strncmp (path, "~/", 2)) {
 		homepath = r_str_home (path + 2);
 		if (homepath) {
 			path = (const char *)homepath;
 		}
 	} else if (*path == '$') {
-		if (!strncmp (path + 1, "home", 4) || !strncmp (path + 1, "HOME", 4)){
-			homepath = r_str_home ((strlen (path)>5)? path + 6: NULL);
+		if (!strncmp (path + 1, "home", 4) || !strncmp (path + 1, "HOME", 4)) {
+			homepath = r_str_home ((strlen (path) > 5)? path + 6: NULL);
 			if (homepath) {
 				path = (const char *)homepath;
 			}
@@ -153,7 +167,7 @@
 	}
 	if (!r_file_is_directory (path)) {
 		p = strrchr (path, '/');
-		if (p){
+		if (p) {
 			off = p - path;
 			d = (char *) calloc (1, off + 1);
 			if (!d) {
@@ -242,29 +256,27 @@
 }
 
 R_API char *r_syscmd_mkdir(const char *dir) {
-	bool show_help = true;
-	const char *p = strchr (dir, ' ');
-	if (p) {
-		int ret;
-		char *dirname;
-		if (!strncmp (p + 1, "-p ", 3)) {
-			dirname = r_str_trim (strdup (p + 3));
-			ret = r_sys_mkdirp (dirname);
-		} else {
-			dirname = r_str_trim (strdup (p + 1));
-			ret = r_sys_mkdir (dirname);
-		}
-		if (!ret) {
-			if (r_sys_mkdir_failed ()) {
-				eprintf ("Cannot create \"%s\"\n", dirname);
-			}
-		}
-		free (dirname);
-		show_help = false;
+	const char *suffix = r_str_trim (strchr (dir, ' '));
+	if (!suffix || !strncmp (suffix, "-p", 3)) {
+		return r_str_dup (NULL, "Usage: mkdir [-p] [directory]\n");
+	}
+	int ret;
+	char *dirname;
+	if (!strncmp (suffix, "-p ", 3)) {
+		dirname = r_str_trim (strdup (suffix + 3));
+		ret = r_sys_mkdirp (dirname);
+	} else {
+		dirname = r_str_trim (strdup (suffix));
+		ret = r_sys_mkdir (dirname);
 	}
-	if (show_help) {
-		eprintf ("Usage: mkdir [-p] [directory]\n");
+	if (!ret) {
+		if (r_sys_mkdir_failed ()) {
+			char *res = r_str_newf ("Cannot create \"%s\"\n", dirname);
+			free (dirname);
+			return res;
+		}
 	}
+	free (dirname);
 	return NULL;
 }
 
diff -Nru radare2-2.3.0+dfsg/libr/util/thread.c radare2-2.8.0+dfsg/libr/util/thread.c
--- radare2-2.3.0+dfsg/libr/util/thread.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/thread.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2017 - pancake */
+/* radare - LGPL - Copyright 2009-2018 - pancake */
 
 #include <r_th.h>
 
@@ -21,9 +21,8 @@
 		r_th_lock_wait (th->lock);
 	}
 #endif
+	r_th_lock_enter (th->lock);
 	do {
-		// CID 1378280:  API usage errors  (LOCK)
-		// "r_th_lock_leave" unlocks "th->lock->lock" while it is unlocked.
 		r_th_lock_leave (th->lock);
 		th->running = true;
 		ret = th->fun (th);
@@ -43,6 +42,17 @@
 	return ret;
 }
 
+R_API R_TH_TID r_th_self(void) {
+#if HAVE_PTHREAD
+	return pthread_self ();
+#elif __WINDOWS__
+	return (HANDLE)GetCurrentThreadId ();
+#else
+#pragma message("Not implemented on windows")
+	return (R_TH_TID)-1;
+#endif
+}
+
 R_API RThread *r_th_new(R_TH_FUNCTION(fun), void *user, int delay) {
 	RThread *th = R_NEW0 (RThread);
 	if (th) {
@@ -54,6 +64,8 @@
 		th->breaked = false;
 		th->ready = false;
 #if HAVE_PTHREAD
+		pthread_cond_init (&th->_cond, NULL);
+		pthread_mutex_init (&th->_mutex, NULL);
 		pthread_create (&th->tid, NULL, _r_th_launcher, th);
 #elif __WINDOWS__ && !defined(__CYGWIN__)
 		th->tid = CreateThread (NULL, 0, _r_th_launcher, th, 0, 0);
@@ -66,7 +78,7 @@
 	th->breaked = true;
 }
 
-R_API int r_th_kill(RThread *th, int force) {
+R_API bool r_th_kill(RThread *th, bool force) {
 	if (!th) {
 		return false;
 	}
@@ -85,6 +97,48 @@
 	return 0;
 }
 
+// running in parent
+R_API bool r_th_pause(RThread *th, bool enable) {
+	if (!th) {
+		return false;
+	}
+	if (enable) {
+#if HAVE_PTHREAD
+		pthread_mutex_trylock (&th->_mutex);
+#else
+#pragma message("warning r_th_pause not implemented")
+#endif
+	} else {
+#if HAVE_PTHREAD
+		// pthread_cond_signal (&th->_cond);
+		pthread_mutex_unlock (&th->_mutex);
+#else
+#pragma message("warning r_th_pause not implemented")
+#endif
+	}
+	return true;
+}
+
+// running in thread
+R_API bool r_th_try_pause(RThread *th) {
+	if (!th) {
+		return false;
+	}
+#if HAVE_PTHREAD
+	// pthread_mutex_lock (&th->_mutex);
+	// pthread_mutex_unlock (&th->_mutex);
+	if (pthread_mutex_trylock (&th->_mutex) != -1) {
+		pthread_mutex_unlock (&th->_mutex);
+	} else {
+		// oops
+	}
+	// pthread_cond_wait (&th->_cond, &th->_mutex);
+#else
+#pragma message("warning r_th_try_pause not implemented")
+#endif
+	return true;
+}
+
 R_API bool r_th_start(RThread *th, int enable) {
 	bool ret = true;
 	if (enable) {
@@ -98,7 +152,7 @@
 	} else {
 		if (th->running) {
 			// stop thread
-			r_th_kill (th, 0);
+			//r_th_kill (th, 0);
 			r_th_lock_enter (th->lock); // deadlock?
 		}
 	}
@@ -125,6 +179,9 @@
 }
 
 R_API void *r_th_free(struct r_th_t *th) {
+	if (!th) {
+		return NULL;
+	}
 	r_th_kill (th, true);
 #if __WINDOWS__ && !defined(__CYGWIN__)
 	CloseHandle (th->tid);
diff -Nru radare2-2.3.0+dfsg/libr/util/thread_cond.c radare2-2.8.0+dfsg/libr/util/thread_cond.c
--- radare2-2.3.0+dfsg/libr/util/thread_cond.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/thread_cond.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,53 @@
+/* radare - LGPL - Copyright 2009-2018 - thestr4ng3r */
+
+#include <r_th.h>
+
+R_API RThreadCond *r_th_cond_new() {
+	RThreadCond *cond = R_NEW0 (RThreadCond);
+	if (!cond) {
+		return NULL;
+	}
+#if HAVE_PTHREAD
+	if (pthread_cond_init (&cond->cond, NULL) != 0) {
+		free (cond);
+		return NULL;
+	}
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	InitializeConditionVariable (&cond->cond);
+#endif
+	return cond;
+}
+
+R_API void r_th_cond_signal(RThreadCond *cond) {
+#if HAVE_PTHREAD
+	pthread_cond_signal (&cond->cond);
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	WakeConditionVariable (&cond->cond);
+#endif
+}
+
+R_API void r_th_cond_signal_all(RThreadCond *cond) {
+#if HAVE_PTHREAD
+	pthread_cond_broadcast (&cond->cond);
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	WakeAllConditionVariable (&cond->cond);
+#endif
+}
+
+R_API void r_th_cond_wait(RThreadCond *cond, RThreadLock *lock) {
+#if HAVE_PTHREAD
+	pthread_cond_wait (&cond->cond, &lock->lock);
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	SleepConditionVariableCS (&cond->cond, &lock->lock, INFINITE);
+#endif
+}
+
+R_API void r_th_cond_free(RThreadCond *cond) {
+	if (!cond) {
+		return;
+	}
+#if HAVE_PTHREAD
+	pthread_cond_destroy (&cond->cond);
+#endif
+	free (cond);
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/thread_msg.c radare2-2.8.0+dfsg/libr/util/thread_msg.c
--- radare2-2.3.0+dfsg/libr/util/thread_msg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/thread_msg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/* radare - LGPL - Copyright 2014 - pancake */
-
-#include <r_th.h>
-
-R_API RThreadMsg* r_th_msg_new (const char *cmd, void *cb) {
-	RThreadMsg *msg = R_NEW0 (RThreadMsg);
-	if (msg) {
-		msg->text = strdup (cmd);
-		//msg->cb = cb;
-		msg->done = 0;
-	}
-	return msg;
-}
-
-R_API void r_th_msg_free (RThreadMsg* msg) {
-	free (msg->text);
-	free (msg->res);
-	free (msg);
-}
-
-/*
-R_API void r_th_msg_push (RThread *th, RThreadMsg* msg) {
-	//r_list_push (th->messages, msg);
-}
-
-R_API RThreadMsg *r_th_msg_pop (RThread *th) {
-	return NULL; //r_list_pop (th->messages);
-}
-*/
diff -Nru radare2-2.3.0+dfsg/libr/util/thread_sem.c radare2-2.8.0+dfsg/libr/util/thread_sem.c
--- radare2-2.3.0+dfsg/libr/util/thread_sem.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/thread_sem.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,91 @@
+/* radare2 - LGPL - Copyright 2018 - thestr4ng3r */
+
+#include <r_th.h>
+
+#ifdef __APPLE__
+#define R_SEM_NAMED_ONLY 1
+#define R_SEM_NAME_LEN_MAX 31
+#else
+#define R_SEM_NAMED_ONLY 0
+#endif
+
+#if R_SEM_NAMED_ONLY
+#include <uuid/uuid.h>
+#include <limits.h>
+#endif
+
+R_API RThreadSemaphore *r_th_sem_new(unsigned int initial) {
+	RThreadSemaphore *sem = R_NEW (RThreadSemaphore);
+	if (!sem) {
+		return NULL;
+	}
+#if HAVE_PTHREAD
+#  if R_SEM_NAMED_ONLY
+	uuid_t uuid;
+	uuid_generate (uuid);
+	char name[38];
+	name[0] = '/';
+	uuid_unparse (uuid, name + 1);
+	if (strlen (name) > R_SEM_NAME_LEN_MAX-1) {
+	    name[R_SEM_NAME_LEN_MAX-1] = '\0';
+	}
+	sem->sem = sem_open (name, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR, initial);
+	if (sem->sem == SEM_FAILED) {
+		free (sem);
+		return NULL;
+	}
+#  else
+	sem->sem = malloc (sizeof (sem_t));
+	if (!sem->sem) {
+		free (sem);
+		return NULL;
+	}
+	if (sem_init (sem->sem, 0, initial) != 0) {
+		free (sem->sem);
+		free (sem);
+		return NULL;
+	}
+#  endif
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	sem->sem = CreateSemaphore (NULL, (LONG)initial, ST32_MAX, NULL);
+	if (!sem->sem) {
+		free (sem);
+		return NULL;
+	}
+#endif
+	return sem;
+}
+
+R_API void r_th_sem_free(RThreadSemaphore *sem) {
+	if (!sem) {
+		return;
+	}
+#if HAVE_PTHREAD
+	if (sem->sem) {
+#  if R_SEM_NAMED_ONLY
+		sem_close (sem->sem);
+#  else
+		sem_destroy (sem->sem);
+#  endif
+	}
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	CloseHandle (sem->sem);
+#endif
+	free (sem);
+}
+
+R_API void r_th_sem_post(RThreadSemaphore *sem) {
+#if HAVE_PTHREAD
+	sem_post (sem->sem);
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	ReleaseSemaphore (sem->sem, 1, NULL);
+#endif
+}
+
+R_API void r_th_sem_wait(RThreadSemaphore *sem) {
+#if HAVE_PTHREAD
+	sem_wait (sem->sem);
+#elif __WINDOWS__ && !defined(__CYGWIN__)
+	WaitForSingleObject (sem->sem, INFINITE);
+#endif
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/trie.c radare2-2.8.0+dfsg/libr/util/trie.c
--- radare2-2.3.0+dfsg/libr/util/trie.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/trie.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,185 @@
+#include <stdlib.h>
+#include "r_util/r_trie.h"
+
+static int c2_idx(char c) {
+	if (c <= 'Z' && c >= 'A') return c-'A';
+	if (c <= 'z' && c >= 'a') return c-'a'+26;
+	if (c <= '9' && c >= '0') return c-'0'+26*2;
+	return 26*2 + 10;
+}
+
+static RTrieNode *r_trie_new_node() {
+	RTrieNode *n = R_NEW0 (RTrieNode);
+	if (!n) {
+		return NULL;
+	}
+	int i;
+	for (i = 0; i < ALPHABET_SIZE; i++){
+		n->child[i] = NULL;
+	}
+	n->is_leaf = 0;
+	return n;
+}
+
+static RTrieNode *r_trie_node_insert(RTrieNode *n, char *name, void *f) {
+	if (!n) {
+		n = r_trie_new_node ();
+	}
+	if (!*name) {
+		n->data = f;
+		n->is_leaf = 1;
+		return n;
+	}
+	const int idx = c2_idx (*name);
+	n->child[idx] = r_trie_node_insert (n->child[idx], ++name, f);
+	return n;
+}
+
+static void *r_trie_node_find(RTrieNode *n, char *name) {
+	if (!n) {
+		return NULL;
+	}
+	if (!name) {
+		return NULL;
+	}
+	if (!*name) {
+		if (n->is_leaf) {
+			return n->data;
+		} else {
+			return NULL;
+		}
+	}
+	const int idx = c2_idx (*name);
+	return r_trie_node_find (n->child[idx], ++name);
+}
+
+static void r_trie_node_free(RTrieNode **n) {
+	if (!n || *n) {
+		return;
+	}
+	int i;
+	for (i = 0; i < ALPHABET_SIZE; i++){
+		r_trie_node_free (&(*n)->child[i]);
+	}
+	R_FREE (*n);
+}
+
+static bool r_trie_node_delete(RTrieNode **n, char *name) {
+	if (!n) {
+		return false;
+	}
+	if (!*n) {
+		return false;
+	}
+	if (!name) {
+		return false;
+	}
+	if (!*name) {
+		if ((*n)->is_leaf) {
+			(*n)->is_leaf = 0;
+			int i;
+			for (i = 0; i < ALPHABET_SIZE; i++) {
+				if ((*n)->child[i]) {
+					return true;
+				}
+			}
+			r_trie_node_free (n);
+			return true;
+		} else {
+			return false;
+		}
+	}
+	const int idx = c2_idx (*name);
+	const int result = r_trie_node_delete (&(*n)->child[idx], ++name);
+	if (!result) {
+		return false;
+	}
+	int i;
+	for (i = 0; i < ALPHABET_SIZE; i++) {
+		if ((*n)->child[i]) {
+			return true;
+		}
+	}
+	r_trie_node_free (n);
+	return true;
+}
+
+R_API RTrie *r_trie_new() {
+	RTrie * n = R_NEW0 (RTrie);
+	if (!n) {
+		return NULL;
+	}
+	n->root = r_trie_new_node ();
+	if (!n->root) {
+		R_FREE (n);
+		return NULL;
+	}
+	return n;
+}
+
+R_API bool r_trie_insert(RTrie * t, char * name, void * f) {
+	if (!t) {
+		return false;
+	}
+	RTrieNode *tmp = r_trie_node_insert (t->root, name, f);
+	if (!tmp) {
+		return false;
+	}
+	t->root = tmp;
+	return true;
+}
+
+R_API bool r_trie_update(RTrie * t, char * name, void * f) {
+	return r_trie_insert (t, name, f);
+}
+
+R_API void *r_trie_find(RTrie * t, char * name) {
+	if (!t) {
+		return NULL;
+	}
+	return r_trie_node_find (t->root, name);
+}
+
+R_API void r_trie_free(RTrie ** t) {
+	if (!t) {
+		return;
+	}
+	if (!*t) {
+		return;
+	}
+	if ((*t)->root) {
+		r_trie_node_free (&(*t)->root);
+	}
+	R_FREE (*t);
+}
+
+R_API bool r_trie_delete(RTrie * t, char * name) {
+	if (!t) {
+		return false;
+	}
+	if (!t->root) {
+		return false;
+	}
+	bool result = r_trie_node_delete (&t->root, name);
+	return result;
+}
+
+/* Deletes 'name' and if the trie is empty frees and nulls it, 
+	so it need to be reallocated next time we want to use it */
+R_API bool r_trie_erase(RTrie ** t, char * name) {
+	if (!t) {
+		return false;
+	}
+	if (!*t) {
+		return false;
+	}
+	if (!(*t)->root) {
+		return false;
+	}
+	bool result = r_trie_node_delete (&(*t)->root, name);
+	if (!(*t)->root) {
+		r_trie_free (t);
+	}
+	return result;
+}
+
diff -Nru radare2-2.3.0+dfsg/libr/util/uleb128.c radare2-2.8.0+dfsg/libr/util/uleb128.c
--- radare2-2.3.0+dfsg/libr/util/uleb128.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/uleb128.c	2018-08-07 14:12:36.000000000 +0000
@@ -39,14 +39,12 @@
 R_API const ut8 *r_uleb128_decode(const ut8 *data, int *datalen, ut64 *v) {
 	ut8 c = 0xff;
 	ut64 s = 0, sum = 0, l = 0;
-	if (data && *data) {
-		do {
-			c = *(data++) & 0xff;
-			sum |= ((ut32) (c&0x7f) << s);
-			s += 7;
-			l++;
-		} while (c & 0x80);
-	}
+	do {
+		c = *(data++) & 0xff;
+		sum |= ((ut32) (c&0x7f) << s);
+		s += 7;
+		l++;
+	} while (c & 0x80);
 	if (v) *v = sum;
 	if (datalen) *datalen = l;
 	return data;
diff -Nru radare2-2.3.0+dfsg/libr/util/unum.c radare2-2.8.0+dfsg/libr/util/unum.c
--- radare2-2.3.0+dfsg/libr/util/unum.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/unum.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2007-2017 - pancake */
+/* radare - LGPL - Copyright 2007-2018 - pancake */
 
 #if __WINDOWS__ && MINGW32 && !__CYGWIN__
 #include <stdlib.h>
@@ -7,8 +7,27 @@
 #include <r_util.h>
 #define R_NUM_USE_CALC 1
 
+static ut64 r_num_tailff(RNum *num, const char *hex);
+
+void r_srand (int seed) {
+#if HAVE_ARC4RANDOM_UNIFORM
+	// no-op
+	(void)seed;
+#else
+	srand (seed);
+#endif
+}
+
+int r_rand (int mod) {
+#if HAVE_ARC4RANDOM_UNIFORM
+	return (int)arc4random_uniform (mod);
+#else
+	return rand ()%mod;
+#endif
+}
+
 R_API void r_num_irand() {
-	srand (r_sys_now ());
+	r_srand (r_sys_now ());
 }
 
 static int rand_initialized = 0;
@@ -17,8 +36,10 @@
 		r_num_irand ();
 		rand_initialized = 1;
 	}
-	if (!max) max = 1;
-	return rand()%max;
+	if (!max) {
+		max = 1;
+	}
+	return r_rand (max);
 }
 
 R_API void r_num_minmax_swap(ut64 *a, ut64 *b) {
@@ -96,6 +117,15 @@
 	return NULL;
 }
 
+static void error(RNum *num, const char *err_str) {
+	if (num) {
+		num->nc.errors++;
+#if 0
+		num->nc.calc_err = err_str;
+#endif
+	}
+}
+
 // TODO: try to avoid the use of sscanf
 /* old get_offset */
 R_API ut64 r_num_get(RNum *num, const char *str) {
@@ -104,6 +134,9 @@
 	ut64 ret = 0LL;
 	ut32 s, a;
 
+	if (num && !num->nc.under_calc) {
+		num->nc.errors = 0;
+	}
 	if (!str) {
 		return 0;
 	}
@@ -155,6 +188,12 @@
 		sscanf (str, "0x%"PFMT64x, &ret);
 	} else if (str[0] == '\'') {
 		ret = str[1] & 0xff;
+	// ugly as hell
+	} else if (!strncmp (str, "0xff..", 6) || !strncmp (str, "0xFF..", 6)) {
+        	ret = r_num_tailff (num, str + 5);
+	// ugly as hell
+	} else if (!strncmp (str, "0xf..", 5) || !strncmp (str, "0xF..", 5)) {
+        	ret = r_num_tailff (num, str + 5);
 	} else if (str[0] == '0' && str[1] == 'x') {
 		const char *lodash = strchr (str + 2, '_');
 		if (lodash) {
@@ -169,78 +208,128 @@
 			// sscanf (str+2, "%"PFMT64x, &ret);
 		}
 	} else {
-		lch = str[len > 0? len - 1:0];
-		if (*str == '0' && lch != 'b' && lch != 'h') {
+		char *endptr;
+		int len_num = len > 0 ? len - 1 : 0;
+		int chars_read = len_num;
+		bool zero_read = false;
+		lch = str[len > 0 ? len - 1 : 0];
+		if (*str == '0' && IS_DIGIT (*(str + 1)) && lch != 'b' && lch != 'h') {
 			lch = 'o';
+			len_num++;
 		}
 		switch (lch) {
 		case 'h': // hexa
-			sscanf (str, "%"PFMT64x, &ret);
+			if (!sscanf (str, "%"PFMT64x"%n", &ret, &chars_read)
+			    || chars_read != len_num) {
+				error (num, "invalid hex number");
+			}
 			break;
 		case 'o': // octal
-			sscanf (str, "%"PFMT64o, &ret);
+			if (!sscanf (str, "%"PFMT64o"%n", &ret, &chars_read)
+			    || chars_read != len_num) {
+				error (num, "invalid octal number");
+			}
 			break;
 		case 'b': // binary
 			ret = 0;
+			ok = true;
 			for (j = 0, i = strlen (str) - 2; i >= 0; i--, j++) {
 				if (str[i] == '1') {
 					ret|=1 << j;
 				} else if (str[i] != '0') {
+					ok = false;
 					break;
 				}
 			}
+			if (!ok || !len_num) {
+				error (num, "invalid binary number");
+			}
 			break;
 		case 't': // ternary
 			ret = 0;
+			ok = true;
 			ut64 x = 1;
 			for (i = strlen (str) - 2; i >= 0; i--) {
 				if (str[i] < '0' || '2' < str[i]) {
-					return 0;
+					ok = false;
+					break;
 				}
 				ret += x * (str[i] - '0');
 				x *= 3;
 			}
+			if (!ok || !len_num) {
+				error (num, "invalid ternary number");
+			}
 			break;
 		case 'K': case 'k':
 			if (strchr (str, '.')) {
 				double d = 0;
-				sscanf (str, "%lf", &d);
-				ret = (ut64)(d * KB);
+				if (sscanf (str, "%lf%n", &d, &chars_read)) {
+					ret = (ut64)(d * KB);
+				} else {
+					zero_read = true;
+				}
 			} else {
-				ret = 0LL;
-				sscanf (str, "%"PFMT64d, &ret);
-				ret *= KB;
+				if (sscanf (str, "%"PFMT64d"%n", &ret, &chars_read)) {
+					ret *= KB;
+				} else {
+					zero_read = true;
+				}
+			}
+			if (zero_read || chars_read != len_num) {
+				error (num, "invalid kilobyte number");
 			}
 			break;
 		case 'M': case 'm':
 			if (strchr (str, '.')) {
 				double d = 0;
-				sscanf (str, "%lf", &d);
-				ret = (ut64)(d * MB);
+				if (sscanf (str, "%lf%n", &d, &chars_read)) {
+					ret = (ut64)(d * MB);
+				} else {
+					zero_read = true;
+				}
 			} else {
-				sscanf (str, "%"PFMT64d, &ret);
-				ret *= MB;
+				if (sscanf (str, "%"PFMT64d"%n", &ret, &chars_read)) {
+					ret *= MB;
+				} else {
+					zero_read = true;
+				}
+			}
+			if (zero_read || chars_read != len_num) {
+				error (num, "invalid megabyte number");
 			}
 			break;
 		case 'G': case 'g':
 			if (strchr (str, '.')) {
 				double d = 0;
-				sscanf (str, "%lf", &d);
-				ret = (ut64)(d * GB);
+				if (sscanf (str, "%lf%n", &d, &chars_read)) {
+					ret = (ut64)(d * GB);
+				} else {
+					zero_read = true;
+				}
 			} else {
-				sscanf (str, "%"PFMT64d, &ret);
-				ret *= GB;
+				if (sscanf (str, "%"PFMT64d"%n", &ret, &chars_read)) {
+					ret *= GB;
+				} else {
+					zero_read = true;
+				}
+			}
+			if (zero_read || chars_read != len_num) {
+				error (num, "invalid gigabyte number");
 			}
 			break;
 		default:
 #if 0
-			//sscanf (str, "%"PFMT64d, &ret);
+			//sscanf (str, "%"PFMT64d"%n", &ret, &chars_read);
 // 32bit chop
 #if __WINDOWS__ && MINGW32 && !__CYGWIN__
-			ret = _strtoui64 (str, NULL, 10);
+			ret = _strtoui64 (str, &endptr, 10);
 #endif
 #endif
-			ret = strtoull (str, NULL, 10);
+			ret = strtoull (str, &endptr, 10);
+			if (!IS_DIGIT (*str) || (*endptr && *endptr != lch)) {
+				error (num, "unknown symbol");
+			}
 			break;
 		}
 	}
@@ -577,6 +666,32 @@
 	return (addr & mask) | n;
 }
 
+static ut64 r_num_tailff(RNum *num, const char *hex) {
+        ut64 n = 0;
+        char *p;
+        int i;
+
+        while (*hex && (*hex == ' ' || *hex=='.')) {
+                hex++;
+        }
+        i = strlen (hex) * 4;
+        p = malloc (strlen (hex) + 10);
+        if (p) {
+                strcpy (p, "0x");
+                strcpy (p + 2, hex);
+                if (isHexDigit (hex[0])) {
+                        n = r_num_math (num, p);
+                } else {
+                        eprintf ("Invalid argument\n");
+			free (p);
+                        return UT64_MAX;
+                }
+                free (p);
+        }
+	ut64 left = ((UT64_MAX >>i) << i);
+        return left | n;
+}
+
 R_API int r_num_between(RNum *num, const char *input_value) {
 	int i;
 	ut64 ns[3];
@@ -661,3 +776,12 @@
 	}
 	return list;
 }
+
+R_API void *r_num_dup(ut64 n) {
+	ut64 *hn = malloc (sizeof (ut64));
+	if (!hn) {
+		return NULL;
+	}
+	*hn = n;
+	return (void*)hn;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/utf8.c radare2-2.8.0+dfsg/libr/util/utf8.c
--- radare2-2.3.0+dfsg/libr/util/utf8.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/utf8.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* radare2 - LGPL - Copyright 2014-2017 - thelemon, kazarmy, pancake */
+/* radare2 - LGPL - Copyright 2014-2018 - thelemon, kazarmy, pancake */
 
 #include <r_types.h>
 #include <r_util.h>
@@ -539,7 +539,7 @@
 
 	if (!str || !dst) return -1;
 
-	for (i = 0; str[i] && pos < dst_length - 1; i++)
+	for (i = 0; i < sizeof (str) - 1 && str[i] && pos < dst_length - 1; i++)
 		pos += r_utf8_encode (&dst[pos], str[i]);
 
 	dst[pos++] = '\0';
@@ -565,8 +565,9 @@
 	int i, len = 0;
 
 	for (i = 0; str[i]; i++) {
-		if ((str[i] & 0xc0) != 0x80)
+		if ((str[i] & 0xc0) != 0x80) {
 			len++;
+		}
 	}
 
 	return len;
@@ -644,12 +645,15 @@
 	return r_utf_blocks_count - 1; /* index for "No_Block" */
 }
 
-R_API int *r_utf_block_list (const ut8 *str) {
+/* str must be UTF8-encoded */
+R_API int *r_utf_block_list(const ut8 *str, int len) {
 	if (!str) {
 		return NULL;
 	}
+	if (len < 0) {
+		len = strlen ((const char *)str);
+	}
 	static bool has_block[r_utf_blocks_count] = {0};
-	int len = strlen ((const char *)str);
 	int *list = R_NEWS (int, len + 1);
 	if (!list) {
 		return NULL;
diff -Nru radare2-2.3.0+dfsg/libr/util/vector.c radare2-2.8.0+dfsg/libr/util/vector.c
--- radare2-2.3.0+dfsg/libr/util/vector.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/vector.c	2018-08-07 14:12:36.000000000 +0000
@@ -16,155 +16,244 @@
 	: vec->capacity + (vec->capacity >> 1))
 
 #define RESIZE_OR_RETURN_NULL(next_capacity) do { \
-		int new_capacity = next_capacity; \
-		void **new_a = realloc (vec->a, sizeof(void *) * new_capacity); \
+		size_t new_capacity = next_capacity; \
+		void **new_a = realloc (vec->a, vec->elem_size * new_capacity); \
 		if (!new_a) { \
 			return NULL; \
 		} \
 		vec->a = new_a; \
 		vec->capacity = new_capacity; \
 	} while (0)
+		
+		
 
-R_API void r_vector_clear(RVector *vec, void (*elem_free)(void *)) {
-	if (elem_free) {
+R_API void r_vector_init(RVector *vec, size_t elem_size, RVectorFree free, void *free_user) {
+	vec->a = NULL;
+	vec->capacity = vec->len = 0;
+	vec->elem_size = elem_size;
+	vec->free = free;
+	vec->free_user = free_user;
+}
+
+R_API RVector *r_vector_new(size_t elem_size, RVectorFree free, void *free_user) {
+	RVector *vec = R_NEW (RVector);
+	if (!vec) {
+		return NULL;
+	}
+	r_vector_init (vec, elem_size, free, free_user);
+	return vec;
+}
+
+static void vector_free_elems(RVector *vec) {
+	if (vec->free) {
 		while (vec->len > 0) {
-			elem_free (vec->a[--vec->len]);
+			vec->free (r_vector_index_ptr (vec, --vec->len), vec->free_user);
 		}
 	} else {
 		vec->len = 0;
 	}
+}
+
+R_API void r_vector_clear(RVector *vec) {
+	vector_free_elems (vec);
 	R_FREE (vec->a);
 	vec->capacity = 0;
 }
 
-R_API RVector *r_vector_clone(RVector *vec) {
-	RVector *ret = R_NEW (RVector);
-	if (ret) {
-		ret->capacity = vec->capacity;
-		ret->len = vec->len;
-		if (!vec->len) {
-			ret->a = NULL;
-		} else {
-			ret->a = malloc (sizeof (void *) * vec->len);
-			if (!ret->a) {
-				R_FREE (ret);
-			} else {
-				memcpy (ret->a, vec->a, sizeof (void *) * vec->len);
-			}
-		}
-	}
-	return ret;
+R_API void r_vector_free(RVector *vec) {
+	vector_free_elems (vec);
+	free (vec->a);
+	free (vec);
 }
 
-R_API void **r_vector_contains(RVector *vec, void *x) {
-	int i;
-	for (i = 0; i < vec->len; i++) {
-		if (vec->a[i] == x) {
-			return &vec->a[i];
+static bool vector_clone(RVector *dst, RVector *src) {
+	dst->capacity = src->capacity;
+	dst->len = src->len;
+	dst->elem_size = src->elem_size;
+	dst->free = src->free;
+	dst->free_user = src->free_user;
+	if (!dst->len) {
+		dst->a = NULL;
+	} else {
+		dst->a = malloc (src->elem_size * src->capacity);
+		if (!dst->a) {
+			return false;
 		}
+		memcpy (dst->a, src->a, src->elem_size * src->len);
 	}
-	return NULL;
+	return true;
 }
 
-R_API void *r_vector_delete_at(RVector *vec, int n) {
-	void *ret = vec->a[n];
-	vec->len--;
-	for (; n < vec->len; n++) {
-		vec->a[n] = vec->a[n+1];
+R_API RVector *r_vector_clone(RVector *vec) {
+	RVector *ret = R_NEW (RVector);
+	if (!ret) {
+		return NULL;
+	}
+	if (!vector_clone (ret, vec)) {
+		free (ret);
+		return NULL;
 	}
 	return ret;
 }
 
-R_API bool r_vector_empty(RVector *vec) {
-	return vec->len == 0;
+
+
+R_API void *r_vector_index_ptr(RVector *vec, size_t index) {
+	return (char *)vec->a + vec->elem_size * index;
 }
 
-R_API void r_vector_free(RVector *vec, void (*elem_free)(void *)) {
-	if (elem_free) {
-		while (vec->len > 0) {
-			elem_free (vec->a[--vec->len]);
-		}
-	} else {
-		vec->len = 0;
-	}
-	free (vec->a);
-	free (vec);
+R_API void r_vector_assign(RVector *vec, void *p, void *elem) {
+	memcpy (p, elem, vec->elem_size);
 }
 
-R_API void r_vector_init(RVector *vec) {
-	vec->a = NULL;
-	vec->capacity = vec->len = 0;
+R_API void *r_vector_assign_at(RVector *vec, size_t index, void *elem) {
+	void *p = r_vector_index_ptr (vec, index);
+	r_vector_assign (vec, p, elem);
+	return p;
 }
 
-R_API void **r_vector_insert(RVector *vec, int n, void *x) {
-	if (vec->len >= vec->capacity) {
-		RESIZE_OR_RETURN_NULL (NEXT_VECTOR_CAPACITY);
+R_API void r_vector_remove_at(RVector *vec, size_t index, void *into) {
+	void *p = r_vector_index_ptr (vec, index);
+	if (into) {
+		r_vector_assign (vec, into, p);
 	}
-	int i;
-	for (i = vec->len++; i > n; i--) {
-		vec->a[i] = vec->a[i-1];
+	vec->len--;
+	if (index < vec->len) {
+		memmove (p, (char *)p + vec->elem_size, vec->elem_size * (vec->len - index));
 	}
-	vec->a[n] = x;
-	return &vec->a[n];
 }
 
-R_API void **r_vector_insert_range(RVector *vec, int n, void **first, void **last) {
-	if (last - first + vec->len > vec->capacity) {
-		RESIZE_OR_RETURN_NULL (R_MAX (NEXT_VECTOR_CAPACITY, last - first + vec->len));
-	}
-	int i;
-	for (i = vec->len; i > n; ) {
-		i--;
-		vec->a[last - first + i] = vec->a[i];
+
+
+R_API void *r_vector_insert(RVector *vec, size_t index, void *x) {
+	if (vec->len >= vec->capacity) {
+		RESIZE_OR_RETURN_NULL (NEXT_VECTOR_CAPACITY);
 	}
-	vec->len += last - first;
-	i = n;
-	while (first != last) {
-		vec->a[i++] = *first++;
+	void *p = r_vector_index_ptr (vec, index);
+	if (index < vec->len) {
+		memmove ((char *)p + vec->elem_size, p, vec->elem_size * (vec->len - index));
 	}
-	return &vec->a[n];
+	vec->len++;
+	r_vector_assign (vec, p, x);
+	return p;
 }
 
-R_API RVector *r_vector_new(void) {
-	return R_NEW0 (RVector);
+R_API void *r_vector_insert_range(RVector *vec, size_t index, void *first, size_t count) {
+	if (vec->len + count > vec->capacity) {
+		RESIZE_OR_RETURN_NULL (R_MAX (NEXT_VECTOR_CAPACITY, vec->len + count));
+	}
+	size_t sz = count * vec->elem_size;
+	void *p = r_vector_index_ptr (vec, index);
+	if (index < vec->len) {
+		memmove ((char *)p + sz, p, vec->elem_size * (vec->len - index));
+	}
+	vec->len += count;
+	memcpy (p, first, sz);
+	return p;
 }
 
-R_API void *r_vector_pop(RVector *vec) {
-	return vec->a[--vec->len];
+R_API void r_vector_pop(RVector *vec, void *into) {
+	if (into) {
+		r_vector_assign (vec, into, r_vector_index_ptr (vec, vec->len - 1));
+	}
+	vec->len--;
 }
 
-R_API void *r_vector_pop_front(RVector *vec) {
-	return r_vector_delete_at (vec, 0);
+R_API void r_vector_pop_front(RVector *vec, void *into) {
+	return r_vector_remove_at (vec, 0, into);
 }
 
-R_API void **r_vector_push(RVector *vec, void *x) {
+R_API void *r_vector_push(RVector *vec, void *x) {
 	if (vec->len >= vec->capacity) {
 		RESIZE_OR_RETURN_NULL (NEXT_VECTOR_CAPACITY);
 	}
-	vec->a[vec->len] = x;
-	return &vec->a[vec->len++];
+	return r_vector_assign_at (vec, vec->len++, x);
 }
 
-R_API void **r_vector_push_front(RVector *vec, void *x) {
+R_API void *r_vector_push_front(RVector *vec, void *x) {
 	return r_vector_insert (vec, 0, x);
 }
 
-R_API void **r_vector_reserve(RVector *vec, int capacity) {
+R_API void *r_vector_reserve(RVector *vec, size_t capacity) {
 	if (vec->capacity < capacity) {
 		RESIZE_OR_RETURN_NULL (capacity);
 	}
 	return vec->a;
 }
 
-R_API void **r_vector_shrink(RVector *vec) {
+R_API void *r_vector_shrink(RVector *vec) {
 	if (vec->len < vec->capacity) {
 		RESIZE_OR_RETURN_NULL (vec->len);
 	}
 	return vec->a;
 }
 
+
+
+
+
+static void pvector_free_elem(void *e, void *user) {
+	void *p = *((void **)e);
+	RPVectorFree elem_free = (RPVectorFree)user;
+	elem_free (p);
+}
+
+
+R_API void r_pvector_init(RPVector *vec, RPVectorFree free) {
+	r_vector_init (&vec->v, sizeof (void *), free ? pvector_free_elem : NULL, free);
+}
+
+R_API RPVector *r_pvector_new(RPVectorFree free) {
+	RPVector *v = R_NEW (RPVector);
+	if (!v) {
+		return NULL;
+	}
+	r_pvector_init (v, free);
+	return v;
+}
+
+R_API void r_pvector_clear(RPVector *vec) {
+	r_vector_clear (&vec->v);
+}
+
+R_API void r_pvector_free(RPVector *vec) {
+	if (!vec) {
+		return;
+	}
+	r_vector_clear (&vec->v);
+	free (vec);
+}
+
+R_API void **r_pvector_contains(RPVector *vec, void *x) {
+	size_t i;
+	for (i = 0; i < vec->v.len; i++) {
+		if (((void **)vec->v.a)[i] == x) {
+			return &((void **)vec->v.a)[i];
+		}
+	}
+	return NULL;
+}
+
+R_API void *r_pvector_remove_at(RPVector *vec, size_t index) {
+	void *r = r_pvector_at (vec, index);
+	r_vector_remove_at (&vec->v, index, NULL);
+	return r;
+}
+
+R_API void *r_pvector_pop(RPVector *vec) {
+	void *r = r_pvector_at (vec, vec->v.len - 1);
+	r_vector_pop (&vec->v, NULL);
+	return r;
+}
+
+R_API void *r_pvector_pop_front(RPVector *vec) {
+	void *r = r_pvector_at (vec, 0);
+	r_vector_pop_front (&vec->v, NULL);
+	return r;
+}
+
 // CLRS Quicksort. It is slow, but simple.
-static void quick_sort(void **a, int n, RVectorComparator cmp) {
+static void quick_sort(void **a, size_t n, RPVectorComparator cmp) {
 	if (n <= 1) return;
 	int i = rand() % n, j = 0;
 	void *t, *pivot = a[i];
@@ -182,103 +271,6 @@
 	quick_sort (a + j + 1, n - j - 1, cmp);
 }
 
-R_API void r_vector_sort(RVector *vec, RVectorComparator cmp) {
-	quick_sort (vec->a, vec->len, cmp);
-}
-
-#if TEST
-#include <assert.h>
-#include <stddef.h>
-
-int my_cmp(const void *a, const void *b) {
-	return strcmp (a, b) < 0;
-}
-
-// TODO: move into t/vector.c
-int main () {
-	ptrdiff_t i;
-	void **it;
-	RVector *v = r_vector_new ();
-	assert (*r_vector_push (v, (void *)1337) == (void *)1337);
-	for (i = 0; i < 10; i++) {
-		r_vector_push (v, (void *)i);
-		assert (v->len == i + 2);
-	}
-	assert (r_vector_pop_front (v) == (void *)1337);
-	assert (r_vector_contains (v, (void *)9));
-
-	assert (r_vector_delete_at (v, 9) == (void *)9);
-	assert (!r_vector_contains (v, (void *)9));
-
-	i = 0;
-	r_vector_foreach (v, it) {
-		assert (*it == (void *)i++);
-	}
-
-	r_vector_shrink (v);
-	assert (v->len == 9);
-	RVector *v1 = r_vector_clone (v);
-	r_vector_clear (v, NULL);
-	assert (v->capacity == 0 && v->len == 0);
-	assert (v1->len == 9);
-
-	r_vector_free (v, NULL);
-	r_vector_free (v1, NULL);
-
-	RVector s;
-	r_vector_init (&s);
-	r_vector_reserve (&s, 10);
-	r_vector_clear (&s, NULL);
-
-	r_vector_reserve (&s, 10);
-	r_vector_push (&s, (void *)-1);
-	assert (s.len == 1 && s.capacity == 10);
-	for (i = 0; i < 20; i++) {
-		r_vector_push (&s, (void *)i);
-	}
-	r_vector_reserve (&s, 10);
-	r_vector_clear (&s, NULL);
-
-	{
-		void *a[] = {(void*)0, (void*)2, (void*)4, (void*)6, (void*)8};
-		RVector s = {0};
-		int l;
-		r_vector_insert_range (&s, 0, a + 2, a + 5);
-		r_vector_insert_range (&s, 0, a, a + 2);
-
-#define CMP(x, y) x < y
-		r_vector_lower_bound (&s, (void *)4, l, CMP);
-		assert (s.a[l] == (void *)4);
-		r_vector_lower_bound (&s, (void *)5, l, CMP);
-		assert (s.a[l] == (void *)6);
-		r_vector_lower_bound (&s, (void *)6, l, CMP);
-		assert (s.a[l] == (void *)6);
-		r_vector_lower_bound (&s, (void *)9, l, CMP);
-		assert (l == s.len);
-
-		r_vector_upper_bound (&s, (void *)4, l, CMP);
-		assert (s.a[l] == (void *)6);
-		r_vector_upper_bound (&s, (void *)5, l, CMP);
-		assert (s.a[l] == (void *)6);
-		r_vector_upper_bound (&s, (void *)6, l, CMP);
-		assert (s.a[l] == (void *)8);
-#undef CMP
-
-		r_vector_clear (&s, NULL);
-
-		r_vector_push (&s, strdup ("Charmander"));
-		r_vector_push (&s, strdup ("Squirtle"));
-		r_vector_push (&s, strdup ("Bulbasaur"));
-		r_vector_push (&s, strdup ("Meowth"));
-		r_vector_push (&s, strdup ("Caterpie"));
-		r_vector_sort (&s, my_cmp);
-
-		r_vector_lower_bound (&s, "Meow", l, strcmp);
-		assert (!strcmp (s.a[l], "Meowth"));
-
-		r_vector_clear (&s, free);
-	}
-
-	return 0;
+R_API void r_pvector_sort(RPVector *vec, RPVectorComparator cmp) {
+	quick_sort (vec->v.a, vec->v.len, cmp);
 }
-#endif
diff -Nru radare2-2.3.0+dfsg/libr/util/x509.c radare2-2.8.0+dfsg/libr/util/x509.c
--- radare2-2.3.0+dfsg/libr/util/x509.c	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/x509.c	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,977 @@
+/* radare2 - LGPL - Copyright 2017-2018 - wargio */
+
+#include <r_util.h>
+#include <stdlib.h>
+#include <string.h>
+#include "./x509.h"
+
+bool r_x509_parse_validity (RX509Validity *validity, RASN1Object *object) {
+	RASN1Object *o;
+	if (!validity || !object || object->list.length != 2) {
+		return false;
+	}
+	if (object->klass == CLASS_UNIVERSAL &&
+			object->tag == TAG_SEQUENCE &&
+			object->form == FORM_CONSTRUCTED) {
+		o = object->list.objects[0];
+		if (o->klass == CLASS_UNIVERSAL && o->form == FORM_PRIMITIVE) {
+			if (o->tag == TAG_UTCTIME) {
+				validity->notBefore = r_asn1_stringify_utctime (o->sector, o->length);
+			} else if (o->tag == TAG_GENERALIZEDTIME) {
+				validity->notBefore = r_asn1_stringify_time (o->sector, o->length);
+			}
+		}
+		o = object->list.objects[1];
+		if (o->klass == CLASS_UNIVERSAL && o->form == FORM_PRIMITIVE) {
+			if (o->tag == TAG_UTCTIME) {
+				validity->notAfter = r_asn1_stringify_utctime (o->sector, o->length);
+			} else if (o->tag == TAG_GENERALIZEDTIME) {
+				validity->notAfter = r_asn1_stringify_time (o->sector, o->length);
+			}
+		}
+	}
+	return true;
+}
+
+bool r_x509_parse_algorithmidentifier (RX509AlgorithmIdentifier *ai, RASN1Object * object) {
+	if (!ai || !object || object->list.length < 1 || !object->list.objects) {
+		return false;
+	}
+	if (object->list.objects[0] && object->list.objects[0]->klass == CLASS_UNIVERSAL && object->list.objects[0]->tag == TAG_OID) {
+		ai->algorithm = r_asn1_stringify_oid (object->list.objects[0]->sector, object->list.objects[0]->length);
+	}
+	ai->parameters = NULL; // TODO
+	//ai->parameters = asn1_stringify_sector (object->list.objects[1]);
+	return true;
+}
+
+bool r_x509_parse_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki, RASN1Object *object) {
+	RASN1Object *o;
+	if (!spki || !object || object->list.length != 2) {
+		return false;
+	}
+	r_x509_parse_algorithmidentifier (&spki->algorithm, object->list.objects[0]);
+	if (object->list.objects[1]) {
+		o = object->list.objects[1];
+		spki->subjectPublicKey = r_asn1_create_binary (o->sector, o->length);
+		if (o->list.length == 1 && o->list.objects[0] && o->list.objects[0]->list.length == 2) {
+			o = o->list.objects[0];
+			if (o->list.objects[0]) {
+				spki->subjectPublicKeyExponent = r_asn1_create_binary (o->list.objects[0]->sector, o->list.objects[0]->length);
+			}
+			if (o->list.objects[1]) {
+				spki->subjectPublicKeyModule = r_asn1_create_binary (o->list.objects[1]->sector, o->list.objects[1]->length);
+			}
+		}
+	}
+	return true;
+}
+
+bool r_x509_parse_name (RX509Name *name, RASN1Object * object) {
+	ut32 i;
+	if (!name || !object || !object->list.length) {
+		return false;
+	}
+	if (object->klass == CLASS_UNIVERSAL && object->tag == TAG_SEQUENCE) {
+		name->length = object->list.length;
+		name->names = (RASN1String**) calloc (name->length, sizeof (RASN1String*));
+		if (!name->names) {
+			name->length = 0;
+			return false;
+		}
+		name->oids = (RASN1String**) calloc (name->length, sizeof (RASN1String*));
+		if (!name->oids) {
+			name->length = 0;
+			free (name->names);
+			name->names = NULL;
+			return false;
+		}
+		for (i = 0; i < object->list.length; ++i) {
+			RASN1Object *o = object->list.objects[i];
+			if (o && o->klass == CLASS_UNIVERSAL &&
+					o->tag == TAG_SET &&
+					o->form == FORM_CONSTRUCTED &&
+					o->list.length == 1) {
+				o = o->list.objects[0];
+				if (o && o->list.length > 1 &&
+						o->klass == CLASS_UNIVERSAL &&
+						o->tag == TAG_SEQUENCE) {
+					if (o->list.objects[0]->klass == CLASS_UNIVERSAL &&
+							o->list.objects[0]->tag == TAG_OID) {
+						name->oids[i] = r_asn1_stringify_oid (o->list.objects[0]->sector, o->list.objects[0]->length);
+					}
+					RASN1Object *obj1 = o->list.objects[1];
+					if (obj1 && obj1->klass == CLASS_UNIVERSAL) {
+						name->names[i] = r_asn1_stringify_string (obj1->sector, obj1->length);
+					}
+				}
+			}
+		}
+	}
+	return true;
+}
+
+bool r_x509_parse_extension (RX509Extension *ext, RASN1Object *object) {
+	RASN1Object *o;
+	if (!ext || !object || object->list.length < 2) {
+		return false;
+	}
+	o = object->list.objects[0];
+	if (o && o->tag == TAG_OID) {
+		ext->extnID = r_asn1_stringify_oid (o->sector, o->length);
+		o = object->list.objects[1];
+		if (o->tag == TAG_BOOLEAN) {
+			//This field is optional (so len must be 3)
+			ext->critical = o->sector[0] != 0;
+			o = object->list.objects[2];
+		}
+		if (o->tag == TAG_OCTETSTRING) {
+			ext->extnValue = r_asn1_create_binary (o->sector, o->length);
+		}
+	}
+	return true;
+}
+
+bool r_x509_parse_extensions (RX509Extensions *ext, RASN1Object * object) {
+	ut32 i;
+	if (!ext || !object || object->list.length != 1 || !object->list.objects[0]->length) {
+		return false;
+	}
+	object = object->list.objects[0];
+	ext->extensions = (RX509Extension**) calloc (object->list.length, sizeof (RX509Extension*));
+	if (!ext->extensions) {
+		return false;
+	}
+	ext->length = object->list.length;
+	for (i = 0; i < object->list.length; ++i) {
+		ext->extensions[i] = R_NEW0 (RX509Extension);
+		if (!r_x509_parse_extension (ext->extensions[i], object->list.objects[i])) {
+			r_x509_free_extension (ext->extensions[i]);
+			ext->extensions[i] = NULL;
+		}
+	}
+	return true;
+}
+
+bool r_x509_parse_tbscertificate (RX509TBSCertificate *tbsc, RASN1Object * object) {
+	RASN1Object **elems;
+	ut32 i;
+	ut32 shift = 0;
+	if (!tbsc || !object || object->list.length < 6) {
+		return false;
+	}
+	elems = object->list.objects;
+	//Following RFC
+	if (elems[0]->list.length == 1 &&
+			elems[0]->klass == CLASS_CONTEXT &&
+			elems[0]->form == FORM_CONSTRUCTED &&
+			elems[0]->list.objects[0]->tag == TAG_INTEGER &&
+			elems[0]->list.objects[0]->length == 1) {
+		//Integer inside a CLASS_CONTEXT
+		tbsc->version = (ut32) elems[0]->list.objects[0]->sector[0];
+		shift = 1;
+	} else {
+		tbsc->version = 0;
+	}
+	if (shift < object->list.length && elems[shift]->klass == CLASS_UNIVERSAL && elems[shift]->tag == TAG_INTEGER) {
+		tbsc->serialNumber = r_asn1_stringify_integer (elems[shift]->sector, elems[shift]->length);
+	}
+	r_x509_parse_algorithmidentifier (&tbsc->signature, elems[shift + 1]);
+	r_x509_parse_name (&tbsc->issuer, elems[shift + 2]);
+	r_x509_parse_validity (&tbsc->validity, elems[shift + 3]);
+	r_x509_parse_name (&tbsc->subject, elems[shift + 4]);
+	r_x509_parse_subjectpublickeyinfo (&tbsc->subjectPublicKeyInfo, elems[shift + 5]);
+	if (tbsc->version > 0) {
+		for (i = shift + 6; i < object->list.length; i++) {
+			if (!elems[i] || elems[i]->klass != CLASS_CONTEXT) {
+				continue;
+			}
+			if (elems[i]->tag == 1) {
+				tbsc->issuerUniqueID = r_asn1_create_binary (object->list.objects[i]->sector, object->list.objects[i]->length);
+			}
+			if (!elems[i]) {
+				continue;
+			}
+			if (elems[i]->tag == 2) {
+				tbsc->subjectUniqueID = r_asn1_create_binary (object->list.objects[i]->sector, object->list.objects[i]->length);
+			}
+			if (!elems[i]) {
+				continue;
+			}
+			if (tbsc->version == 2 && elems[i]->tag == 3 && elems[i]->form == FORM_CONSTRUCTED) {
+				r_x509_parse_extensions (&tbsc->extensions, elems[i]);
+			}
+		}
+	}
+	return true;
+}
+
+RX509Certificate * r_x509_parse_certificate (RASN1Object *object) {
+	RX509Certificate *certificate;
+	RASN1Object *tmp;
+	if (!object) {
+		return NULL;
+	}
+	certificate = (RX509Certificate*) malloc (sizeof (RX509Certificate));
+	if (!certificate) {
+		r_asn1_free_object (object);
+		return NULL;
+	}
+	memset (certificate, 0, sizeof (RX509Certificate));
+
+	if (object->klass != CLASS_UNIVERSAL || object->form != FORM_CONSTRUCTED || object->list.length != 3) {
+		// Malformed certificate
+		// It needs to have tbsCertificate, algorithmIdentifier and a signature
+		r_asn1_free_object (object);
+		free (certificate);
+		return NULL;
+	}
+	tmp = object->list.objects[2];
+	if (!tmp) {
+		r_asn1_free_object (object);
+		free (certificate);
+		return NULL;
+	}
+	if (tmp->klass != CLASS_UNIVERSAL || tmp->form != FORM_PRIMITIVE || tmp->tag != TAG_BITSTRING) {
+		r_asn1_free_object (object);
+		free (certificate);
+		return NULL;
+	}
+
+	certificate->signature = r_asn1_create_binary (object->list.objects[2]->sector, object->list.objects[2]->length);
+
+	r_x509_parse_tbscertificate (&certificate->tbsCertificate, object->list.objects[0]);
+
+	if (!r_x509_parse_algorithmidentifier (&certificate->algorithmIdentifier, object->list.objects[1])) {
+		r_asn1_free_object (object);
+		free (certificate);
+		return NULL;
+	}
+	r_asn1_free_object (object);
+	return certificate;
+}
+
+RX509Certificate * r_x509_parse_certificate2 (const ut8 *buffer, ut32 length) {
+	RX509Certificate *certificate;
+	RASN1Object *object;
+	if (!buffer || !length) {
+		return NULL;
+	}
+	object = r_asn1_create_object (buffer, length);
+	certificate = r_x509_parse_certificate (object);
+	//object freed by r_x509_parse_certificate
+	return certificate;
+}
+
+RX509CRLEntry *r_x509_parse_crlentry (RASN1Object *object) {
+	RX509CRLEntry *entry;
+	if (!object || object->list.length != 2) {
+		return NULL;
+	}
+	entry = (RX509CRLEntry *) malloc (sizeof (RX509CRLEntry));
+	if (!entry) {
+		return NULL;
+	}
+	entry->userCertificate = r_asn1_create_binary (object->list.objects[0]->sector, object->list.objects[0]->length);
+	entry->revocationDate = r_asn1_stringify_utctime (object->list.objects[1]->sector, object->list.objects[1]->length);
+	return entry;
+}
+
+RX509CertificateRevocationList* r_x509_parse_crl (RASN1Object *object) {
+	RX509CertificateRevocationList *crl;
+	RASN1Object **elems;
+	if (!object || object->list.length < 4) {
+		return NULL;
+	}
+	crl = (RX509CertificateRevocationList *) malloc (sizeof (RX509CertificateRevocationList));
+	if (!crl) {
+		return NULL;
+	}
+	memset (crl, 0, sizeof (RX509CertificateRevocationList));
+	elems = object->list.objects;
+	r_x509_parse_algorithmidentifier (&crl->signature, elems[0]);
+	r_x509_parse_name (&crl->issuer, elems[1]);
+	crl->lastUpdate = r_asn1_stringify_utctime (elems[2]->sector, elems[2]->length);
+	crl->nextUpdate = r_asn1_stringify_utctime (elems[3]->sector, elems[3]->length);
+	if (object->list.length > 4 && object->list.objects[4]) {
+		ut32 i;
+		crl->revokedCertificates = calloc (object->list.objects[4]->list.length, sizeof (RX509CRLEntry*));
+		if (!crl->revokedCertificates) {
+			free (crl);
+			return NULL;
+		}
+		crl->length = object->list.objects[4]->list.length;
+		for (i = 0; i < object->list.objects[4]->list.length; ++i) {
+			crl->revokedCertificates[i] = r_x509_parse_crlentry (object->list.objects[4]->list.objects[i]);
+		}
+	}
+	return crl;
+}
+
+void r_x509_free_algorithmidentifier (RX509AlgorithmIdentifier * ai) {
+	if (!ai) {
+		return;
+	}
+	r_asn1_free_string (ai->algorithm);
+	r_asn1_free_string (ai->parameters);
+	//no need to free ai, since this functions is used internally
+}
+
+void r_x509_free_validity (RX509Validity * validity) {
+	if (!validity) {
+		return;
+	}
+	r_asn1_free_string (validity->notAfter);
+	r_asn1_free_string (validity->notBefore);
+	// not freeing validity since it's not allocated dinamically
+}
+
+void r_x509_free_name (RX509Name * name) {
+	ut32 i;
+	if (!name) {
+		return;
+	}
+	if (name->names) {
+		for (i = 0; i < name->length; ++i) {
+			r_asn1_free_string (name->oids[i]);
+			r_asn1_free_string (name->names[i]);
+		}
+		R_FREE (name->names);
+		R_FREE (name->oids);
+	}
+	// not freeing name since it's not allocated dinamically
+}
+
+void r_x509_free_extension (RX509Extension * ex) {
+	if (ex) {
+		r_asn1_free_string (ex->extnID);
+		r_asn1_free_binary (ex->extnValue);
+		//this is allocated dinamically so, i'll free
+		free (ex);
+	}
+}
+
+void r_x509_free_extensions (RX509Extensions * ex) {
+	ut32 i;
+	if (!ex) {
+		return;
+	}
+	if (ex->extensions) {
+		for (i = 0; i < ex->length; ++i) {
+			r_x509_free_extension (ex->extensions[i]);
+		}
+		free (ex->extensions);
+	}
+	//no need to free ex, since this functions is used internally
+}
+
+void r_x509_free_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki) {
+	if (spki) {
+		r_x509_free_algorithmidentifier (&spki->algorithm);
+		r_asn1_free_binary (spki->subjectPublicKey);
+		r_asn1_free_binary (spki->subjectPublicKeyExponent);
+		r_asn1_free_binary (spki->subjectPublicKeyModule);
+		// No need to free spki, since it's a static variable.
+	}
+}
+
+void r_x509_free_tbscertificate (RX509TBSCertificate * tbsc) {
+	if (tbsc) {
+		//  version is ut32
+		r_asn1_free_string (tbsc->serialNumber);
+		r_x509_free_algorithmidentifier (&tbsc->signature);
+		r_x509_free_name (&tbsc->issuer);
+		r_x509_free_validity (&tbsc->validity);
+		r_x509_free_name (&tbsc->subject);
+		r_x509_free_subjectpublickeyinfo (&tbsc->subjectPublicKeyInfo);
+		r_asn1_free_binary (tbsc->subjectUniqueID);
+		r_asn1_free_binary (tbsc->issuerUniqueID);
+		r_x509_free_extensions (&tbsc->extensions);
+		//no need to free tbsc, since this functions is used internally
+	}
+}
+
+void r_x509_free_certificate (RX509Certificate * certificate) {
+	if (certificate) {
+		r_asn1_free_binary (certificate->signature);
+		r_x509_free_algorithmidentifier (&certificate->algorithmIdentifier);
+		r_x509_free_tbscertificate (&certificate->tbsCertificate);
+		free (certificate);
+	}
+}
+
+void r_x509_free_crlentry (RX509CRLEntry *entry) {
+	if (entry) {
+		r_asn1_free_binary (entry->userCertificate);
+		r_asn1_free_string (entry->revocationDate);
+		free (entry);
+	}
+}
+
+void r_x509_free_crl (RX509CertificateRevocationList *crl) {
+	ut32 i;
+	if (crl) {
+		r_x509_free_algorithmidentifier (&crl->signature);
+		r_x509_free_name (&crl->issuer);
+		r_asn1_free_string (crl->nextUpdate);
+		r_asn1_free_string (crl->lastUpdate);
+		if (crl->revokedCertificates) {
+			for (i = 0; i < crl->length; ++i) {
+				r_x509_free_crlentry (crl->revokedCertificates[i]);
+				crl->revokedCertificates[i] = NULL;
+			}
+			free (crl->revokedCertificates);
+			crl->revokedCertificates = NULL;
+		}
+		free (crl);
+	}
+}
+
+char* r_x509_validity_dump (RX509Validity* validity, char* buffer, ut32 length, const char* pad) {
+	int p;
+	if (!validity || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad)
+		pad = "";
+	const char* b = validity->notBefore ? validity->notBefore->string : "Missing";
+	const char* a = validity->notAfter ? validity->notAfter->string : "Missing";
+	p = snprintf (buffer, length, "%sNot Before: %s\n%sNot After: %s\n", pad, b, pad, a);
+	return p < 0 ? NULL : buffer + (ut32) p;
+}
+
+char* r_x509_name_dump (RX509Name* name, char* buffer, ut32 length, const char* pad) {
+	ut32 i, p, len;
+	int r;
+	char* c;
+	if (!name || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	len = length;
+	c = buffer;
+	for (i = 0, p = 0; i < name->length; ++i) {
+		if (!name->oids[i] || !name->names[i]) {
+			continue;
+		}
+		if (len <= p) {
+			return NULL;
+		}
+		r = snprintf (c + p, len - p, "%s%s: %s\n", pad, name->oids[i]->string, name->names[i]->string);
+		p += r;
+		if (r < 0 || len < p) {
+			return NULL;
+		}
+	}
+	return c + p;
+}
+
+char* r_x509_subjectpublickeyinfo_dump (RX509SubjectPublicKeyInfo* spki, char* buffer, ut32 length, const char* pad) {
+	int r;
+	const char *a;
+	if (!spki || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	a = spki->algorithm.algorithm ? spki->algorithm.algorithm->string : "Missing";
+	RASN1String* m = NULL;
+	if (spki->subjectPublicKeyModule) {
+		m = r_asn1_stringify_integer (spki->subjectPublicKeyModule->binary, spki->subjectPublicKeyModule->length);
+	}
+	//	RASN1String* e = r_asn1_stringify_bytes (spki->subjectPublicKeyExponent->sector, spki->subjectPublicKeyExponent->length);
+	//	r = snprintf (buffer, length, "%sAlgorithm: %s\n%sModule: %s\n%sExponent: %u bytes\n%s\n", pad, a, pad, m->string,
+	//				pad, spki->subjectPublicKeyExponent->length - 1, e->string);
+	r = snprintf (buffer, length, "%sAlgorithm: %s\n%sModule: %s\n%sExponent: %u bytes\n", pad, a, pad, m ? m->string : "Missing",
+				pad, spki->subjectPublicKeyExponent ? spki->subjectPublicKeyExponent->length - 1 : 0);
+	r_asn1_free_string (m);
+	//	r_asn1_free_string (e);
+	return r < 0 ? NULL : buffer + (ut32) r;
+}
+
+char* r_x509_extensions_dump (RX509Extensions* exts, char* buffer, ut32 length, const char* pad) {
+	ut32 i, p, len;
+	int r;
+	char* c;
+	if (!exts || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	len = length;
+	c = buffer;
+	for (i = 0, p = 0, r = 0; i < exts->length; ++i) {
+		//RASN1String *s;
+		RX509Extension *e = exts->extensions[i];
+		if (!e) continue;
+		//TODO handle extensions..
+		//s = r_asn1_stringify_bytes (e->extnValue->sector, e->extnValue->length);
+		if (len < p) {
+			return NULL;
+		}
+		r = snprintf (c + p, len - p, "%s%s: %s\n%s%u bytes\n", pad,
+					e->extnID ? e->extnID->string : "Missing",
+					e->critical ? "critical" : "",
+					pad, e->extnValue ? e->extnValue->length : 0);
+		p += r;
+		//r_asn1_free_string (s);
+		if (r < 0 || len <= p) {
+			return NULL;
+		}
+	}
+	return c + p;
+}
+
+char* r_x509_tbscertificate_dump (RX509TBSCertificate* tbsc, char* buffer, ut32 length, const char* pad) {
+	RASN1String *sid = NULL, *iid = NULL;
+	char *pad2, *tmp;
+	ut32 p;
+	int r;
+	if (!tbsc || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	pad2 = r_str_newf ("%s  ", pad);
+	if (!pad2) return NULL;
+	r = snprintf (buffer, length, "%sVersion: v%u\n"
+				"%sSerial Number:\n%s  %s\n"
+				"%sSignature Algorithm:\n%s  %s\n"
+				"%sIssuer:\n",
+				pad, tbsc->version + 1,
+				pad, pad, tbsc->serialNumber ? tbsc->serialNumber->string : "Missing",
+				pad, pad, tbsc->signature.algorithm ? tbsc->signature.algorithm->string : "Missing",
+				pad);
+	p = (ut32) r;
+	if (r < 0 || length <= p || !(tmp = r_x509_name_dump (&tbsc->issuer, buffer + p, length - p, pad2))) {
+		free (pad2);
+		return NULL;
+	}
+	p = tmp - buffer;
+	if (length <= p) {
+		free (pad2);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sValidity:\n", pad);
+	p += r;
+	if (r < 0 || length <= p || !(tmp = r_x509_validity_dump (&tbsc->validity, buffer + p, length - p, pad2))) {
+		free (pad2);
+		return NULL;
+	}
+	p = tmp - buffer;
+	if (r < 0 || length <= p) {
+		free (pad2);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sSubject:\n", pad);
+	p += r;
+	if (r < 0 || length <= p || !(tmp = r_x509_name_dump (&tbsc->subject, buffer + p, length - p, pad2))) {
+		free (pad2);
+		return NULL;
+	}
+	p = tmp - buffer;
+	if (r < 0 || length <= p) {
+		free (pad2);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sSubject Public Key Info:\n", pad);
+	p += r;
+	if (r < 0 || length <= p ||
+			!(tmp = r_x509_subjectpublickeyinfo_dump (&tbsc->subjectPublicKeyInfo, buffer + p, length - p, pad2))) {
+		free (pad2);
+		return NULL;
+	}
+	p = tmp - buffer;
+	if (tbsc->issuerUniqueID) {
+		iid = r_asn1_stringify_integer (tbsc->issuerUniqueID->binary, tbsc->issuerUniqueID->length);
+		if (iid) {
+			if (length <= p) {
+				r_asn1_free_string (iid);
+				free (pad2);
+				return NULL;
+			}
+			r = snprintf (buffer + p, length - p, "%sIssuer Unique ID:\n%s  %s", pad, pad, iid->string);
+			p += r;
+		} else {
+			free (pad2);
+			return NULL;
+		}
+		r_asn1_free_string (iid);
+	}
+	if (tbsc->subjectUniqueID) {
+		sid = r_asn1_stringify_integer (tbsc->subjectUniqueID->binary, tbsc->subjectUniqueID->length);
+		if (sid) {
+			if (length <= p) {
+				r_asn1_free_string (sid);
+				free (pad2);
+				return NULL;
+			}
+			r = snprintf (buffer + p, length - p, "%sSubject Unique ID:\n%s  %s", pad, pad, sid->string);
+			p += r;
+		} else {
+			free (pad2);
+			return NULL;
+		}
+		r_asn1_free_string (sid);
+	}
+	if (r < 0 || length <= p) {
+		free (pad2);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sExtensions:\n", pad);
+	p += r;
+	if (r < 0 || length <= p || !(tmp = r_x509_extensions_dump (&tbsc->extensions, buffer + p, length - p, pad2))) {
+		free (pad2);
+		return NULL;
+	}
+	free (pad2);
+	return buffer + p;
+}
+
+char* r_x509_certificate_dump (RX509Certificate* certificate, char* buffer, ut32 length, const char* pad) {
+	//	RASN1String *signature,
+	RASN1String *algo = NULL;
+	ut32 p;
+	int r;
+	char *tbsc, *pad2;
+	if (!certificate || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	pad2 = r_str_newf ("%s  ", pad);
+	if (!pad2) {
+		return NULL;
+	}
+	if ((r = snprintf (buffer, length, "%sTBSCertificate:\n", pad)) < 0) {
+		return NULL;
+	}
+	p = (ut32) r;
+	tbsc = r_x509_tbscertificate_dump (&certificate->tbsCertificate, buffer + p, length - p, pad2);
+	p = tbsc - buffer;
+	if (length <= p) {
+		free (pad2);
+		return NULL;
+	}
+	algo = certificate->algorithmIdentifier.algorithm;
+	//	signature = r_asn1_stringify_bytes (certificate->signature->binary, certificate->signature->length);
+	//	r = snprintf (buffer + p, length - p, "%sAlgorithm:\n%s%s\n%sSignature: %u bytes\n%s\n",
+	//				pad, pad2, algo ? algo->string : "",
+	//				pad, certificate->signature->length, signature ? signature->string : "");
+	r = snprintf (buffer + p, length - p, "%sAlgorithm:\n%s%s\n%sSignature: %u bytes\n",
+				pad, pad2, algo ? algo->string : "", pad, certificate->signature->length);
+	if (r < 0) {
+		free (pad2);
+		return NULL;
+	}
+	p += (ut32) r;
+	free (pad2);
+	//	r_asn1_free_string (signature);
+	return buffer + p;
+}
+
+char* r_x509_crlentry_dump (RX509CRLEntry *crle, char* buffer, ut32 length, const char* pad) {
+	RASN1String *id = NULL, *utc = NULL;
+	int r;
+	if (!crle || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	utc = crle->revocationDate;
+	if (crle->userCertificate) {
+		id = r_asn1_stringify_integer (crle->userCertificate->binary, crle->userCertificate->length);
+	}
+
+	r = snprintf (buffer, length, "%sUser Certificate:\n%s  %s\n"
+				"%sRevocation Date:\n%s  %s\n",
+				pad, pad, id ? id->string : "Missing",
+				pad, pad, utc ? utc->string : "Missing");
+
+	r_asn1_free_string (id);
+	return r < 0 ? NULL : buffer + (ut32) r;
+}
+
+char* r_x509_crl_dump (RX509CertificateRevocationList *crl, char* buffer, ut32 length, const char* pad) {
+	RASN1String *algo = NULL, *last = NULL, *next = NULL;
+	ut32 i, p;
+	int r;
+	char *tmp, *pad2, *pad3;
+	if (!crl || !buffer || !length) {
+		return NULL;
+	}
+	if (!pad) {
+		pad = "";
+	}
+	pad3 = r_str_newf ("%s    ", pad);
+	if (!pad3) return NULL;
+	pad2 = pad3 + 2;
+	algo = crl->signature.algorithm;
+	last = crl->lastUpdate;
+	next = crl->nextUpdate;
+	r = snprintf (buffer, length, "%sCRL:\n%sSignature:\n%s%s\n%sIssuer\n",
+				pad, pad2, pad3, algo ? algo->string : "", pad2);
+	p = (ut32) r;
+	if (r < 0 || !(tmp = r_x509_name_dump (&crl->issuer, buffer + p, length - p, pad3))) {
+		free (pad3);
+		return NULL;
+	}
+	p = tmp - buffer;
+	if (length <= p) {
+		free (pad3);
+		return NULL;
+	}
+	r = snprintf (buffer + p, length - p, "%sLast Update: %s\n%sNext Update: %s\n%sRevoked Certificates:\n",
+				pad2, last ? last->string : "Missing",
+				pad2, next ? next->string : "Missing", pad2);
+	p += (ut32) r;
+	if (r < 0) {
+		free (pad3);
+		return NULL;
+	}
+	for (i = 0; i < crl->length; ++i) {
+		if (length <= p || !(tmp = r_x509_crlentry_dump (crl->revokedCertificates[i], buffer + p, length - p, pad3))) {
+			free (pad3);
+			return NULL;
+		}
+		p = tmp - buffer;
+	}
+
+	free (pad3);
+	return buffer + p;
+}
+
+RJSVar *r_x509_validity_json (RX509Validity* validity) {
+	RJSVar* obj = r_json_object_new ();
+	RJSVar* var = NULL;
+	if (!validity) {
+		return obj;
+	}
+	if (validity->notBefore) {
+		var = r_json_string_new (validity->notBefore->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "NotBefore", var), var);
+	}
+	if (validity->notAfter) {
+		var = r_json_string_new (validity->notAfter->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "NotAfter", var), var);
+	}
+	return obj;
+}
+
+RJSVar *r_x509_name_json (RX509Name* name) {
+	ut32 i;
+	RJSVar* var = NULL;
+	RJSVar* obj = r_json_object_new ();
+	if (!name) {
+		return obj;
+	}
+	for (i = 0; i < name->length; ++i) {
+		if (!name->oids[i] || !name->names[i]) {
+			continue;
+		}
+		var = r_json_string_new (name->names[i]->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, name->oids[i]->string, var), var);
+	}
+	return obj;
+}
+
+RJSVar* r_x509_subjectpublickeyinfo_json (RX509SubjectPublicKeyInfo* spki) {
+	RASN1String *m = NULL;
+	RJSVar* var = NULL;
+	RJSVar *obj = r_json_object_new ();
+	if (!spki) {
+		return obj;
+	}
+	if (spki->algorithm.algorithm) {
+		var = r_json_string_new (spki->algorithm.algorithm->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Algorithm", var), var);
+	}
+	if (spki->subjectPublicKeyModule) {
+		m = r_asn1_stringify_integer (spki->subjectPublicKeyModule->binary, spki->subjectPublicKeyModule->length);
+		if (m) {
+			var = r_json_string_new (m->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Module", var), var);
+		}
+		r_asn1_free_string (m);
+	}
+	if (spki->subjectPublicKeyExponent) {
+		m = r_asn1_stringify_integer (spki->subjectPublicKeyExponent->binary, spki->subjectPublicKeyExponent->length);
+		if (m) {
+			var = r_json_string_new (m->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Exponent", var), var);
+		}
+		r_asn1_free_string (m);
+	}
+	return obj;
+}
+
+RJSVar *r_x509_extensions_json (RX509Extensions* exts) {
+	ut32 i;
+	RASN1String *m = NULL;
+	RJSVar* array = NULL;
+	RJSVar* var = NULL;
+	if (!exts) {
+		return array;
+	}
+	array = r_json_array_new (exts->length);
+	for (i = 0; i < exts->length; ++i) {
+		RX509Extension *e = exts->extensions[i];
+		if (!e) {
+			continue;
+		}
+		RJSVar* obj = r_json_object_new ();
+		if (!obj) {
+			break;
+		}
+		if (e->extnID) {
+			var = r_json_string_new (e->extnID->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "OID", var), var);
+		}
+		if (e->critical) {
+			var = r_json_boolean_new (1);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Critical", var), var);
+		}
+		//TODO handle extensions correctly..
+		if (e->extnValue) {
+			m = r_asn1_stringify_integer (e->extnValue->binary, e->extnValue->length);
+			if (m) {
+				var = r_json_string_new (m->string);
+				R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Value", var), var);
+			}
+			r_asn1_free_string (m);
+		}
+		R_JSON_FREE_ON_FAIL (r_json_array_add (array, obj), obj);
+	}
+	return array;
+}
+
+RJSVar *r_x509_crlentry_json (RX509CRLEntry *crle) {
+	RASN1String *m = NULL;
+	RJSVar* obj = r_json_object_new ();
+	RJSVar* var = NULL;
+	if (!crle) {
+		return obj;
+	}
+	if (crle->userCertificate) {
+		m = r_asn1_stringify_integer (crle->userCertificate->binary, crle->userCertificate->length);
+		if (m) {
+			var = r_json_string_new (m->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "UserCertificate", var), var);
+		}
+		r_asn1_free_string (m);
+	}
+	if (crle->revocationDate) {
+		var = r_json_string_new (crle->revocationDate->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "RevocationDate", var), var);
+	}
+	return obj;
+}
+
+RJSVar *r_x509_crl_json (RX509CertificateRevocationList *crl) {
+	ut32 i;
+	RJSVar* obj = r_json_object_new ();
+	RJSVar* array = NULL;
+	RJSVar* var = NULL;
+	if (!crl) {
+		return obj;
+	}
+
+	if (crl->signature.algorithm) {
+		var = r_json_string_new (crl->signature.algorithm->string);
+		R_JSON_FREE_ON_FAIL(r_json_object_add (obj, "Signature", var), var);
+	}
+	r_json_object_add (obj, "Issuer", r_x509_name_json (&crl->issuer));
+	if (crl->lastUpdate) {
+		var = r_json_string_new (crl->lastUpdate->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "LastUpdate", var), var);
+	}
+	if (crl->nextUpdate) {
+		var = r_json_string_new (crl->nextUpdate->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "NextUpdate", var), var);
+	}
+
+	array = r_json_array_new (crl->length);
+	for (i = 0; i < crl->length; ++i) {
+		var = r_x509_crlentry_json (crl->revokedCertificates[i]);
+		R_JSON_FREE_ON_FAIL (r_json_array_add (array, var), var);
+	}
+
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "RevokedCertificates", array), array);
+	return obj;
+}
+
+RJSVar *r_x509_tbscertificate_json (RX509TBSCertificate* tbsc) {
+	RASN1String *m = NULL;
+	RJSVar* obj = r_json_object_new ();
+	RJSVar* var = NULL;
+	if (!tbsc) {
+		return obj;
+	}
+	var = r_json_number_new (tbsc->version + 1);
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Version", var), var);
+	if (tbsc->serialNumber) {
+		var = r_json_string_new (tbsc->serialNumber->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SerialNumber", var), var);
+	}
+	if (tbsc->signature.algorithm) {
+		var = r_json_string_new (tbsc->signature.algorithm->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SignatureAlgorithm", var), var);
+	}
+	var = r_x509_name_json (&tbsc->issuer);
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Issuer", var), var);
+	var = r_x509_validity_json (&tbsc->validity);
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Validity", var), var);
+	var = r_x509_name_json (&tbsc->subject);
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Subject", var), var);
+	var = r_x509_subjectpublickeyinfo_json (&tbsc->subjectPublicKeyInfo);
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SubjectPublicKeyInfo", var), var);
+	if (tbsc->issuerUniqueID) {
+		m = r_asn1_stringify_integer (tbsc->issuerUniqueID->binary, tbsc->issuerUniqueID->length);
+		if (m) {
+			var = r_json_string_new (m->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "IssuerUniqueID", var), var);
+		}
+		r_asn1_free_string (m);
+	}
+	if (tbsc->subjectUniqueID) {
+		m = r_asn1_stringify_integer (tbsc->subjectUniqueID->binary, tbsc->subjectUniqueID->length);
+		if (m) {
+			var = r_json_string_new (m->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "SubjectUniqueID", var), var);
+		}
+		r_asn1_free_string (m);
+	}
+	var = r_x509_extensions_json (&tbsc->extensions);
+	R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Extensions", var), var);
+	return obj;
+}
+
+RJSVar* r_x509_certificate_json (RX509Certificate *certificate) {
+	RASN1String *m = NULL;
+	RJSVar* obj = r_json_object_new ();
+	RJSVar* var = NULL;
+	if (!certificate) {
+		return obj;
+	}
+	r_json_object_add (obj, "TBSCertificate", r_x509_tbscertificate_json (&certificate->tbsCertificate));
+	if (certificate->algorithmIdentifier.algorithm) {
+		var = r_json_string_new (certificate->algorithmIdentifier.algorithm->string);
+		R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Algorithm", var), var);
+	}
+	if (certificate->signature) {
+		m = r_asn1_stringify_integer (certificate->signature->binary, certificate->signature->length);
+		if (m) {
+			var = r_json_string_new (m->string);
+			R_JSON_FREE_ON_FAIL (r_json_object_add (obj, "Signature", var), var);
+		}
+		r_asn1_free_string (m);
+	}
+	return obj;
+}
diff -Nru radare2-2.3.0+dfsg/libr/util/x509.h radare2-2.8.0+dfsg/libr/util/x509.h
--- radare2-2.3.0+dfsg/libr/util/x509.h	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/libr/util/x509.h	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef R_X509_INTERNAL_H
+#define R_X509_INTERNAL_H
+
+#include "asn1.h"
+
+R_API bool r_x509_parse_validity (RX509Validity *validity, RASN1Object *object);
+R_API void r_x509_free_validity (RX509Validity* validity);
+
+R_API bool r_x509_parse_algorithmidentifier (RX509AlgorithmIdentifier *ai, RASN1Object * object);
+R_API void r_x509_free_algorithmidentifier (RX509AlgorithmIdentifier * ai);
+
+R_API bool r_x509_parse_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki, RASN1Object *object);
+R_API void r_x509_free_subjectpublickeyinfo (RX509SubjectPublicKeyInfo * spki);
+
+R_API bool r_x509_parse_name (RX509Name *name, RASN1Object * object);
+R_API void r_x509_free_name (RX509Name * name);
+
+R_API bool r_x509_parse_extension (RX509Extension *ext, RASN1Object * object);
+R_API void r_x509_free_extension (RX509Extension * ex);
+
+R_API bool r_x509_parse_extensions (RX509Extensions *ext, RASN1Object * object);
+R_API void r_x509_free_extensions (RX509Extensions* ex);
+
+R_API bool r_x509_parse_tbscertificate (RX509TBSCertificate *tbsc, RASN1Object * object);
+R_API void r_x509_free_tbscertificate (RX509TBSCertificate * tbsc);
+
+R_API RX509CRLEntry *r_x509_parse_crlentry (RASN1Object *object);
+R_API void r_x509_free_crlentry (RX509CRLEntry *entry);
+
+R_API char* r_x509_validity_dump (RX509Validity* validity, char* buffer, ut32 length, const char* pad);
+R_API char* r_x509_name_dump (RX509Name* name, char* buffer, ut32 length, const char* pad);
+R_API char* r_x509_subjectpublickeyinfo_dump (RX509SubjectPublicKeyInfo* spki, char* buffer, ut32 length, const char* pad);
+R_API char* r_x509_extensions_dump (RX509Extensions* exts, char* buffer, ut32 length, const char* pad);
+R_API char* r_x509_tbscertificate_dump (RX509TBSCertificate* tbsc, char* buffer, ut32 length, const char* pad);
+R_API char* r_x509_crlentry_dump (RX509CRLEntry *crle, char* buffer, ut32 length, const char* pad);
+
+#endif /* R_X509_INTERNAL_H */
+
diff -Nru radare2-2.3.0+dfsg/Makefile radare2-2.8.0+dfsg/Makefile
--- radare2-2.3.0+dfsg/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -1,15 +1,21 @@
 -include config-user.mk
 include global.mk
 
-PREVIOUS_RELEASE=1.6.0
+PREVIOUS_RELEASE=`git log --tags --simplify-by-decoration --pretty='format:%d'|head -n1|cut -d ' ' -f3 |sed -e 's,),,'`
 
+B=$(DESTDIR)$(BINDIR)
+L=$(DESTDIR)$(LIBDIR)
 MESON?=meson
 PYTHON?=python
 R2R=radare2-regressions
 R2R_URL=$(shell doc/repo REGRESSIONS)
 R2BINS=$(shell cd binr ; echo r*2 r2agent r2pm r2-indent)
+ifdef SOURCE_DATE_EPOCH
+BUILDSEC=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+__%H:%M:%S" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+__%H:%M:%S" 2>/dev/null || date -u "+__%H:%M:%S")
+else
 BUILDSEC=$(shell date "+__%H:%M:%S")
-DATADIRS=libr/cons/d libr/bin/d libr/asm/d libr/syscall/d libr/magic/d libr/anal/d
+endif
+DATADIRS=libr/cons/d libr/flag/d libr/bin/d libr/asm/d libr/syscall/d libr/magic/d libr/anal/d
 USE_ZIP=YES
 ZIP=zip
 
@@ -59,10 +65,10 @@
 GIT_TAP=$(shell git describe --tags --match "[0-9]*" 2>/dev/null || echo $(VERSION))
 GIT_TIP=$(shell git rev-parse HEAD 2>/dev/null || echo HEAD)
 R2_VER=$(shell grep VERSION configure.acr | head -n1 | awk '{print $$2}')
-ifndef SOURCE_DATE_EPOCH
-GIT_NOW=$(shell date +%Y-%m-%d)
+ifdef SOURCE_DATE_EPOCH
+GIT_NOW=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
 else
-GIT_NOW=$(shell date --utc --date="@$$SOURCE_DATE_EPOCH" +%Y-%m-%d)
+GIT_NOW=$(shell date "+%Y-%m-%d")
 endif
 
 libr/include/r_version.h:
@@ -134,6 +140,8 @@
 	cp -f libr/anal/d/*.sdb "${WINDIST}/share/radare2/${VERSION}/fcnsign"
 	mkdir -p "${WINDIST}/share/radare2/${VERSION}/opcodes"
 	cp -f libr/asm/d/*.sdb "${WINDIST}/share/radare2/${VERSION}/opcodes"
+	mkdir -p "${WINDIST}/share/radare2/${VERSION}/flag"
+	cp -f libr/flag/d/*.r2 "${WINDIST}/share/radare2/${VERSION}/flag"
 	mkdir -p "${WINDIST}/share/doc/radare2"
 	mkdir -p "${WINDIST}/include/libr/sdb"
 	mkdir -p "${WINDIST}/include/libr/r_util"
@@ -151,7 +159,7 @@
 	@cp -f libr/bin/d/trx "${WINDIST}/share/radare2/${VERSION}/format"
 	@cp -f libr/bin/d/dll/*.sdb "${WINDIST}/share/radare2/${VERSION}/format/dll"
 	@mkdir -p "${WINDIST}/share/radare2/${VERSION}/cons"
-	@cp -af libr/cons/d/* "${WINDIST}/share/radare2/${VERSION}/cons"
+	@cp -PRpf libr/cons/d/* "${WINDIST}/share/radare2/${VERSION}/cons"
 	@mkdir -p "${WINDIST}/share/radare2/${VERSION}/hud"
 	@cp -f doc/hud "${WINDIST}/share/radare2/${VERSION}/hud/main"
 	@mv "${WINDIST}" "radare2-${WINBITS}-${VERSION}"
@@ -161,8 +169,9 @@
 endif
 
 clean: rmd
-	rm -f libr/libr.a
-	for DIR in shlr libr binr ; do (cd "$$DIR" ; ${MAKE} clean) ; done
+	rm -f libr/libr.a libr/libr.dylib libr/include/r_version.h
+	rm -rf libr/.libr
+	for DIR in shlr libr binr ; do $(MAKE) -C "$$DIR" clean ; done
 
 distclean mrproper:
 	-rm -f `find . -type f -name '*.d'`
@@ -205,12 +214,10 @@
 		ln -fs "$(PWD)/doc/$$FILE" "${DESTDIR}${DOCDIR}" ; done
 
 install love: install-doc install-man install-www
-	cd libr && ${MAKE} install PARENT=1
+	cd libr && ${MAKE} install
 	cd binr && ${MAKE} install
 	cd shlr && ${MAKE} install
-	for DIR in ${DATADIRS} ; do \
-		(cd "$$DIR" ; ${MAKE} install ); \
-	done
+	for DIR in ${DATADIRS} ; do $(MAKE) -C "$$DIR" install ; done
 	cd "$(DESTDIR)$(LIBDIR)/radare2/" ;\
 		rm -f last ; ln -fs $(VERSION) last
 	cd "$(DESTDIR)$(DATADIR)/radare2/" ;\
@@ -262,11 +269,13 @@
 	ln -fs "${PWD}/sys/indent.sh" "${DESTDIR}${BINDIR}/r2-indent"
 	ln -fs "${PWD}/sys/r2-docker.sh" "${DESTDIR}${BINDIR}/r2-docker"
 	mkdir -p "${DESTDIR}${DATADIR}/radare2/${VERSION}/hud"
+	ln -fs "${PWD}/doc/hud" "${DESTDIR}${DATADIR}/radare2/${VERSION}/hud/main"
+	#mkdir -p "${DESTDIR}${DATADIR}/radare2/${VERSION}/flag"
+	#ln -fs $(PWD)/libr/flag/d/tags.r2 "${DESTDIR}${DATADIR}/radare2/${VERSION}/flag/tags.r2"
 	cd "$(DESTDIR)$(LIBDIR)/radare2/" ;\
 		rm -f last ; ln -fs $(VERSION) last
 	cd "$(DESTDIR)$(DATADIR)/radare2/" ;\
 		rm -f last ; ln -fs $(VERSION) last
-	ln -fs "${PWD}/doc/hud" "${DESTDIR}${DATADIR}/radare2/${VERSION}/hud/main"
 	mkdir -p "${DESTDIR}${DATADIR}/radare2/${VERSION}/"
 	$(SHELL) sys/ldconfig.sh
 	$(SHELL) ./configure-plugins --rm-static $(DESTDIR)/$(LIBDIR)/radare2/last/
@@ -274,12 +283,11 @@
 deinstall uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/r2-indent
 	rm -f $(DESTDIR)$(BINDIR)/r2-docker
-	cd libr && ${MAKE} uninstall PARENT=1
-	cd binr && ${MAKE} uninstall PARENT=1
-	cd shlr && ${MAKE} uninstall PARENT=1
-	cd libr/syscall/d && ${MAKE} uninstall PARENT=1
-	cd libr/sysregs/d && ${MAKE} uninstall PARENT=1
-	cd libr/anal/d && ${MAKE} uninstall PARENT=1
+	cd libr && ${MAKE} uninstall
+	cd binr && ${MAKE} uninstall
+	cd shlr && ${MAKE} uninstall
+	cd libr/syscall/d && ${MAKE} uninstall
+	cd libr/anal/d && ${MAKE} uninstall
 	@echo
 	@echo "Run 'make purge' to also remove installed files from previous versions of r2"
 	@echo
@@ -339,8 +347,15 @@
 	$(MAKE) purge PREFIX=/usr/local
 endif
 
+purge3: purge2
+	sys/purge.sh distro
+
 R2V=radare2-${VERSION}
 
+v ver version:
+	@echo CURRENT=${VERSION}
+	@echo PREVIOUS=${PREVIOUS_RELEASE}
+
 dist:
 	rm -rf $(R2V)
 	git clone . $(R2V)
@@ -357,6 +372,7 @@
 	#git log $$(git show-ref `git tag |tail -n1`)..HEAD > ChangeLog
 	git log $$(git show-ref | grep ${PREVIOUS_RELEASE} | awk '{print $$1}')..HEAD > ChangeLog
 	cd shlr && ${MAKE} capstone-sync
+	$(MAKE) -R capstone.ps
 	DIR=`basename "$$PWD"` ; \
 	FILES=`git ls-files | sed -e "s,^,radare2-${VERSION}/,"` ; \
 	CS_FILES=`cd shlr/capstone ; git ls-files | grep -v pdf | grep -v xcode | grep -v msvc | grep -v suite | grep -v bindings | grep -v tests | sed -e "s,^,radare2-${VERSION}/shlr/capstone/,"` ; \
@@ -381,7 +397,7 @@
 	else \
 		git clone --depth 1 "${R2R_URL}" "$(R2R)"; \
 	fi
-	cd $(R2R) ; ${MAKE}
+	$(MAKE) -C $(R2R)
 
 macos-sign:
 	$(MAKE) -C binr/radare2 macos-sign
@@ -398,9 +414,6 @@
 menu nconfig:
 	./sys/menu.sh || true
 
-pie:
-	sys/pie.sh ${PREVIOUS_RELEASE}
-
 meson:
 	@echo "[ Meson R2 Building ]"
 	$(PYTHON) sys/meson.py --prefix="${PREFIX}" --shared
@@ -408,11 +421,9 @@
 meson-install:
 	DESTDIR="$(DESTDIR)" ninja -C build install
 
-B=$(DESTDIR)$(BINDIR)
-L=$(DESTDIR)$(LIBDIR)
-
 meson-symstall: symstall-sdb
-	ln -fs $(PWD)/binr/r2pm/r2pm  ${B}/r2pm
+	@echo "[ Meson symstall (not stable) ]"
+	ln -fs $(PWD)/binr/r2pm/r2pm ${B}/r2pm
 	ln -fs $(PWD)/build/binr/rasm2/rasm2 ${B}/rasm2
 	ln -fs $(PWD)/build/binr/rarun2/rarun2 ${B}/rarun2
 	ln -fs $(PWD)/build/binr/radare2/radare2 ${B}/radare2
@@ -448,14 +459,19 @@
 	rm -rf build
 	rm -rf build_sdb
 
-MESON_FILES=$(shell find build/libr build/binr -type f| grep -v @)
+MESON_FILES=$(shell find build/libr build/binr -type f | grep -v @)
 meson-symstall-experimental:
-	for a in $(MESON_FILES) ; do echo ln -fs $(PWD)/$$a $(PWD)/$$(echo $$a|sed -e s,build/,,) ; done
+	for a in $(MESON_FILES) ; do echo ln -fs "$(PWD)/$$a" "$(PWD)/$$(echo $$a|sed -e s,build/,,)" ; done
 	$(MAKE) symstall
 
+shlr/capstone:
+	$(MAKE) -C shlr capstone
+
 .PHONY: meson meson-install
 
 include ${MKPLUGINS}
 
 .PHONY: all clean distclean mrproper install symstall uninstall deinstall strip
 .PHONY: libr binr install-man w32dist tests dist shot pkgcfg depgraph.png love
+.PHONY: purge purge2 purge3
+.PHONY: shlr/capstone
diff -Nru radare2-2.3.0+dfsg/man/rabin2.1 radare2-2.8.0+dfsg/man/rabin2.1
--- radare2-2.3.0+dfsg/man/rabin2.1	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/man/rabin2.1	2018-08-07 14:12:36.000000000 +0000
@@ -103,11 +103,13 @@
 .It Fl r
 Show output in radare format
 .It Fl R
-Show realocations
+Show relocations
 .It Fl s
 Show exported symbols
 .It Fl S
 Show sections
+.It Fl SS
+Show segments
 .It Fl u
 Unfiltered (no rename duplicated symbols/sections)
 .It Fl v
diff -Nru radare2-2.3.0+dfsg/man/rafind2.1 radare2-2.8.0+dfsg/man/rafind2.1
--- radare2-2.3.0+dfsg/man/rafind2.1	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/man/rafind2.1	2018-08-07 14:12:36.000000000 +0000
@@ -5,13 +5,13 @@
 .Nd Advanced commandline hexadecimal editor
 .Sh SYNOPSIS
 .Nm rafind2
-.Op Fl izZXnrhv
+.Op Fl izZXnrhqv
 .Op Fl b Ar size
 .Op Fl f Ar from
 .Op Fl t Ar to
 .Op Fl [m|s|e] Ar str
 .Op Fl x Ar hex
-.Ar file
+.Ar file|dir
 .Sh DESCRIPTION
 rafind2 is a program to find byte patterns into files
 .Pp
@@ -49,6 +49,8 @@
 Show output in radare commands
 .It Fl b Ar size
 Define block size
+.It Fl q
+Quiet mode - do not show headings (filenames) above matching contents (default for searching a single file)
 .It Fl h
 Show help message
 .It Fl v
diff -Nru radare2-2.3.0+dfsg/man/ragg2.1 radare2-2.8.0+dfsg/man/ragg2.1
--- radare2-2.3.0+dfsg/man/ragg2.1	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/man/ragg2.1	2018-08-07 14:12:36.000000000 +0000
@@ -32,9 +32,7 @@
 .Pp
 Programs generated by r_egg are relocatable and can be injected in a running process or on-disk binary file.
 .Pp
-ragg2-cc is another tool that comes with r2 and it is used to generate shellcodes from C code. The final code can be linked with rabin2 and it is relocatable, so it can be used to inject it on any remote process.
-.Pp
-ragg2-cc is conceptually based on shellforge4, but only linux/osx x86-32/64 platforms are supported.
+Since the ragg2-cc merge, ragg2 can now generate shellcodes from C code. The final code can be linked with rabin2 and it is relocatable, so it can be used to inject it on any remote process. This feature is conceptually based on shellforge4, but only linux/osx x86-32/64 platforms are supported.
 .Sh DIRECTIVES
 .Pp
 The rr2 (ragg2) configuration file accepts the following directives, described as key=value entries and comments defined as lines starting with '#'.
@@ -106,15 +104,31 @@
   $ ./hi
   hi!
 .Pp
-.Pp
+  # With C file :
   $ cat hi.c
   main() {
-    write(1, "Hello\n", 6);
+    write(1, "Hello\\n", 6);
     exit(0);
   }
-  $ ragg2 hi.c
-  $ ./hi.c.bin
+  $ ragg2 -O -F hi.c
+.Pp
+  $ ./hi
   Hello
+.Pp
+  # Linked into a tiny binary. This is 165 bytes
+  $ wc \-c < hi
+    165
+.Pp
+  # The compiled shellcode has zeroes
+  $ ragg2 hi.c | tail -1
+  eb0748656c6c6f0a00bf01000000488d35edffffffba06000000b8010
+  000000f0531ffb83c0000000f0531c0c3
+.Pp
+  # Use a xor encoder with key 64 to bypass
+  $ ragg2 \-e xor \-c key=64 \-B $(ragg2 hi.c | tail -1)
+  6a2d596a405be8ffffffffc15e4883c60d301e48ffc6e2f9ab4708252
+  c2c2f4a40ff4140404008cd75adbfbfbffa46404040f8414040404f45
+  71bff87c4040404f45718083
 .Sh SEE ALSO
 .Pp
 .Xr radare2(1) ,
diff -Nru radare2-2.3.0+dfsg/man/ragg2-cc.1 radare2-2.8.0+dfsg/man/ragg2-cc.1
--- radare2-2.3.0+dfsg/man/ragg2-cc.1	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/man/ragg2-cc.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-.Dd Sep 30, 2014
-.Dt RAGG2-CC 1
-.Sh NAME
-.Nm ragg2-cc
-.Nd CC frontend for compiling shellcodes
-.Sh SYNOPSIS
-.Nm ragg2-cc
-.Op Fl a Ar arch
-.Op Fl b Ar bits
-.Op Fl k Ar kernel
-.Op Fl o Ar file
-.Op Fl dscxvh
-.Sh DESCRIPTION
-ragg2-cc is a frontend of CC. It is used to creates tiny binaries (1KB) or shellcodes in binary or hexpairs from a C source.
-.Pp
-The compiler used is the one configured by the CC environment. This has been tested with gcc, llvm-gcc and clang.
-.Pp
-Uses sflib (shellforge4) includes to get the syscall definitions.
-.Pp
-Only linux/darwin x86-32/64 is supported at the moment. Planned support for more architectures.
-.Sh OPTIONS
-.Pp
-.Bl -tag -width Fl
-.It Fl a Ar arch
-set architecture x86, arm
-.It Fl b Ar bits
-32 or 64
-.It Fl k Ar kernel
-windows, linux or osx
-.It Fl o Ar file
-output file to write result of compilation
-.It Fl h
-show help message
-.It Fl v
-show version
-.It Fl d
-show assembler code
-.It Fl s
-generate assembly file
-.It Fl c
-generate compiled shellcode
-.It Fl x
-show hexpair bytes
-.El
-.Sh EXAMPLE
-.Pp
-  $ cat hi.c
-  int main() {
-    write (1, "Hello World\\n", 12);
-    exit (0);
-  }
-.Pp
-  $ ragg2-cc hi.c
-  hi.c.bin
-.Pp
-  # Linked into a tiny binary. This is 294 bytes
-  $ wc \-c < hi.c.bin
-     294
-.Pp
-  $ ./hi.c.bin
-  Hello World
-.Pp
-  # The compiled shellcode has zeroes
-  $ ragg2-cc \-x hi.c
-  e90000000083ec0ce800000000588d882a000000b804000000606a0651
-  6a0150cd8083c41061b8010000006a0050cd8083c40883c40cc368656c
-  6c6f0a00
-.Pp
-  # Use a xor encoder with key 32 to bypass
-  $ ragg2 \-e xor \-c key=32 \-B `ragg2-cc \-x hi.c`
-  6a3e596a205be8ffffffffc15e4883c60d301e48ffc6e2f9c920202020
-  a3cc2cc82020202078ada80a2020209824202020404a26714a2170eda0
-  a3e4304198212020204a2070eda0a3e428a3e42ce348454c4c4f2a20
-.Sh SEE ALSO
-.Pp
-.Xr radare2(1) ,
-.Xr rahash2(1) ,
-.Xr rafind2(1) ,
-.Xr rabin2(1) ,
-.Xr rafind2(1) ,
-.Xr radiff2(1) ,
-.Xr rasm2(1) ,
-.Xr ragg2cc(1) ,
-.Sh AUTHORS
-.Pp
-pancake <pancake@nopcode.org>
diff -Nru radare2-2.3.0+dfsg/man/rahash2.1 radare2-2.8.0+dfsg/man/rahash2.1
--- radare2-2.3.0+dfsg/man/rahash2.1	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/man/rahash2.1	2018-08-07 14:12:36.000000000 +0000
@@ -10,11 +10,12 @@
 .Op Fl b Ar size
 .Op Fl D Ar algo
 .Op Fl E Ar algo
-.Op Fl s Ar string
+.Op Fl f Ar from
 .Op Fl i Ar iterations
 .Op Fl I Ar IV
+.Op Fl s Ar string
 .Op Fl S Ar seed
-.Op Fl f Ar from
+.Op Fl p Ar type
 .Op Fl x Ar hexstr
 .Op Fl t Ar to
 .Op Fl c Ar hash
@@ -60,6 +61,8 @@
 Start hashing at given address
 .It Fl t Ar to
 Stop hashing at given address
+.It Fl p Ar arg
+Show vertical entropy/statistical entropy graphs
 .It Fl q
 Quiet mode (-qq for even quieter!)
 .It Fl r
diff -Nru radare2-2.3.0+dfsg/meson.build radare2-2.8.0+dfsg/meson.build
--- radare2-2.3.0+dfsg/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,35 +1,67 @@
-project('radare2', 'c')
+project('radare2', 'c', meson_version: '>=0.46.0')
+
+py3_exe = import('python3').find_python()
+git_exe = find_program('git', required: false)
+pkgconfig_mod = import('pkgconfig')
+glob_cmd = [py3_exe, '-c', 'from sys import argv; print(";".join(__import__("glob").glob(argv[1])))']
 
 # Get r2 version
-r2version = run_command('python', 'sys/version.py')
-if r2version.returncode() != 0
-  r2version = 'unknown-error'
+r2_version = run_command(py3_exe, 'sys/version.py')
+if r2_version.returncode() != 0
+  r2_version = 'unknown-error'
 else
-  r2version = r2version.stdout().strip()
+  r2_version = r2_version.stdout().strip()
 endif
 
-# Get version_commit
-version_commit = run_command('git', 'rev-list', '--all', '--count')
-if version_commit.returncode() != 0
-  version_commit = 0
-else
-  version_commit = version_commit.stdout().strip()
+repo = '.'
+if meson.is_subproject()
+  repo = meson.current_source_dir()
+  if host_machine.system() == 'windows'
+    py_cmd = 'print(__import__("os").readlink(r"@0@"))'.format(repo)
+    py_cmd = run_command(py3_exe, '-c', py_cmd)
+    if py_cmd.returncode() == 0
+      repo = py_cmd.stdout().strip()
+      message('r2 real path: ' + repo)
+    endif
+  endif
 endif
 
-# Get gittap
-gittap  = run_command('git', 'describe', '--tags', '--match', '[0-9]*')
-if gittap.returncode() != 0
-  gittap = ''
-else
-  gittap = gittap.stdout().strip()
+# by default, not version commit is used
+version_commit = '0'
+
+gittap = ''
+gittip = 'unknown'
+
+if git_exe.found()
+  # Get version_commit
+  git_rev_list = run_command(git_exe, '-C', repo, 'rev-list', '--all', '--count')
+  if git_rev_list.returncode() == 0
+    version_commit = git_rev_list.stdout().strip()
+  endif
+
+  # Get gittap
+  git_describe = run_command(git_exe, '-C', repo, 'describe', '--tags', '--match', '[0-9]*')
+  if git_describe.returncode() == 0
+    gittap = git_describe.stdout().strip()
+  endif
+
+  # Get gittip
+  git_rev_parse = run_command(git_exe, '-C', repo, 'rev-parse', 'HEAD')
+  if git_rev_parse.returncode() == 0
+    gittip = git_rev_parse.stdout().strip()
+  endif
 endif
 
-# Get gittip
-gittip  = run_command('git', 'rev-parse', 'HEAD')
-if gittip.returncode() != 0
-  gittip = 'unknown'
-else
-  gittip = gittip.stdout().strip()
+if get_option('r2_version_commit') != ''
+  version_commit = get_option('r2_version_commit')
+endif
+
+if get_option('r2_gittap') != ''
+  gittap = get_option('r2_gittap')
+endif
+
+if get_option('r2_gittip') != ''
+  gittip = get_option('r2_gittip')
 endif
 
 # Get current date
@@ -44,7 +76,7 @@
   r2birth = r2birth.stdout().strip()
 endif
 
-prefix = '/usr/local'
+r2_libversion = host_machine.system() == 'windows' ? '' : r2_version
 
 # system dependencies
 cc = meson.get_compiler('c')
@@ -54,128 +86,314 @@
 utl = cc.find_library('util', required: false)
 mth = cc.find_library('m', required: false)
 
-# detect OS
-if cc.get_define('__linux__') == '1'
-  host_os = 'linux'
-else
-  host_os = 'darwin'
-endif
-
 platform_deps = []
-platform_inc = include_directories(['.','../libr/include'])
+platform_inc = ['.', 'libr/include']
 if host_machine.system() == 'windows'
   platform_deps = [cc.find_library('ws2_32')]
-  platform_inc = include_directories(['.','../libr/include','../libr/include/msvc'])
-  host_os = 'windows'
-  if get_option('default_library') == 'static'
-	if get_option('buildtype') == 'release'
-	  add_global_arguments('/MT', language: 'c')
-	endif
-	message(' ------ WINDOWS VERSION: BUILD STATIC ------')
-  else
-	message(' ------ WINDOWS VERSION: BUILD SHARED ------')
-  endif
-elif host_machine.system() == 'linux'
-  if get_option('default_library') == 'static'
-	message(' ------ LINUX VERSION: BUILD STATIC ------')
-  else
-	message(' ------ LINUX VERSION: BUILD SHARED ------')
+  platform_inc += ['libr/include/msvc']
+endif
+platform_inc = include_directories(platform_inc)
+
+if get_option('static_runtime')
+  if cc.get_id() == 'msvc'
+    add_project_arguments('/MT', language: 'c')
   endif
 endif
 
+if host_machine.system() == 'windows'
+  r2_prefix = '.'
+  r2_libdir = 'lib'
+  r2_incdir = 'include'
+  r2_datdir = 'share'
+
+  opts1 = [
+    'r2_libdir',
+    'r2_incdir',
+    'r2_datdir'
+  ]
+  foreach opt : opts1
+    val = get_option(opt)
+    if val != ''
+      set_variable(opt, val)
+    endif
+  endforeach
+
+  r2_wwwroot = join_paths(r2_datdir, 'www')
+  r2_sdb = join_paths(r2_datdir)
+  r2_zigns = join_paths(r2_datdir, 'zigns')
+  r2_themes = join_paths(r2_datdir, 'cons')
+  r2_fortunes = join_paths(r2_datdir, 'doc')
+  r2_flags = join_paths(r2_datdir, 'flag')
+  r2_hud = join_paths(r2_datdir, 'hud')
+
+  opts2 = [
+    'r2_wwwroot',
+    'r2_sdb',
+    'r2_zigns',
+    'r2_themes',
+    'r2_fortunes',
+    'r2_flags',
+    'r2_hud'
+  ]
+  foreach opt : opts2
+    val = get_option(opt)
+    if val != ''
+      set_variable(opt, val)
+    endif
+  endforeach
+
+  opts3 = [
+    'r2_plugins',
+    'r2_extras',
+    'r2_bindings'
+  ]
+  r2_plugins = join_paths(r2_libdir, 'plugins')
+  r2_extras = join_paths(r2_libdir, 'extras')
+  r2_bindings = join_paths(r2_libdir, 'bindings')
+
+  foreach opt : opts1 + opts2 + opts3
+    val = get_variable(opt)
+    val = '\\\\'.join(val.split('/'))
+    set_variable(opt, val)
+  endforeach
+else
+  r2_prefix = get_option('prefix')
+  r2_libdir = join_paths(r2_prefix, get_option('libdir'))
+  r2_incdir = join_paths(r2_prefix, get_option('includedir'), 'libr')
+  r2_datdir = join_paths(r2_prefix, get_option('datadir'))
+  r2_wwwroot = join_paths(r2_datdir, 'radare2', r2_version, 'www')
+  r2_sdb = join_paths(get_option('datadir'), 'radare2', r2_version)
+  r2_zigns = join_paths(get_option('datadir'), 'radare2', r2_version, 'zigns')
+  r2_themes = join_paths(get_option('datadir'), 'radare2', r2_version, 'cons')
+  r2_fortunes = join_paths(get_option('datadir'), 'doc/radare2')
+  r2_flags = join_paths(get_option('datadir'), 'radare2', r2_version, 'flag')
+  r2_hud = join_paths(get_option('datadir'), 'radare2', r2_version, 'hud')
+  r2_plugins = join_paths(get_option('libdir'), 'radare2', r2_version)
+  r2_extras = join_paths(get_option('libdir'), 'radare2-extras', r2_version)
+  r2_bindings = join_paths(get_option('libdir'), 'radare2-bindings', r2_version)
+endif
+
 # load plugin configuration
 subdir('libr')
 
 conf_data = configuration_data()
-conf_data.set('plugins_core', '&r_core_plugin_' + ',&r_core_plugin_'.join(core) + ', 0')
-conf_data.set('plugins_anal', '&r_anal_plugin_' + ',&r_anal_plugin_'.join(anal) + ', 0')
-conf_data.set('plugins_asm', '&r_asm_plugin_' + ',&r_asm_plugin_'.join(asm) + ', 0')
-conf_data.set('plugins_bp', '&r_bp_plugin_' + ',&r_bp_plugin_'.join(bp) + ', 0')
-conf_data.set('plugins_bin', '&r_bin_plugin_' + ',&r_bin_plugin_'.join(bin) + ', 0')
-conf_data.set('plugins_crypto', '&r_crypto_plugin_' + ',&r_crypto_plugin_'.join(crypto) + ', 0')
-conf_data.set('plugins_io', '&r_io_plugin_' + ',&r_io_plugin_'.join(io) + ', 0')
-conf_data.set('plugins_fs', '&r_fs_plugin_' + ',&r_fs_plugin_'.join(fs) + ', 0')
-conf_data.set('plugins_debug', '&r_debug_plugin_' + ',&r_debug_plugin_'.join(debug) + ', 0')
-conf_data.set('plugins_egg', '&r_egg_plugin_' + ',&r_egg_plugin_'.join(egg) + ', 0')
-conf_data.set('plugins_lang', '&r_lang_plugin_' + ',&r_lang_plugin_'.join(lang) + ', 0')
-conf_data.set('plugins_parse', '&r_parse_plugin_' + ',&r_parse_plugin_'.join(parse) + ', 0')
-configure_file(input : 'libr/config.h.in',
-               output : 'config.h',
-               configuration : conf_data)
+conf_data.set('plugins_core', '&r_core_plugin_' + ', &r_core_plugin_'.join(core_plugins) + ', 0')
+conf_data.set('plugins_anal', '&r_anal_plugin_' + ', &r_anal_plugin_'.join(anal_plugins) + ', 0')
+conf_data.set('plugins_asm', '&r_asm_plugin_' + ', &r_asm_plugin_'.join(asm_plugins) + ', 0')
+conf_data.set('plugins_bp', '&r_bp_plugin_' + ', &r_bp_plugin_'.join(bp_plugins) + ', 0')
+conf_data.set('plugins_bin', '&r_bin_plugin_' + ', &r_bin_plugin_'.join(bin_plugins) + ', 0')
+conf_data.set('plugins_bin_ldr', '&r_bin_ldr_plugin_' + ', &r_bin_ldr_plugin_'.join(bin_ldr_plugins) + ', 0')
+conf_data.set('plugins_bin_xtr', '&r_bin_xtr_plugin_' + ', &r_bin_xtr_plugin_'.join(bin_xtr_plugins) + ', 0')
+conf_data.set('plugins_crypto', '&r_crypto_plugin_' + ', &r_crypto_plugin_'.join(crypto_plugins) + ', 0')
+conf_data.set('plugins_io', '&r_io_plugin_' + ', &r_io_plugin_'.join(io_plugins) + ', 0')
+conf_data.set('plugins_fs', '&r_fs_plugin_' + ', &r_fs_plugin_'.join(fs_plugins) + ', 0')
+conf_data.set('plugins_debug', '&r_debug_plugin_' + ', &r_debug_plugin_'.join(debug_plugins) + ', 0')
+conf_data.set('plugins_egg', '&r_egg_plugin_' + ', &r_egg_plugin_'.join(egg_plugins) + ', 0')
+conf_data.set('plugins_lang', '&r_lang_plugin_' + ', &r_lang_plugin_'.join(lang_plugins) + ', 0')
+conf_data.set('plugins_parse', '&r_parse_plugin_' + ', &r_parse_plugin_'.join(parse_plugins) + ', 0')
+config_h = configure_file(
+  input: 'libr/config.h.in',
+  output: 'config.h',
+  configuration: conf_data
+)
+
+sys_magic = cc.find_library('magic', required: false)
+use_syslib_magic = false
+
+if sys_magic.found() and get_option('use_sys_magic')
+  use_syslib_magic = true
+endif
+
+sys_xxhash = dependency('xxhash', required: false)
+use_sys_xxhash = false
+if not sys_xxhash.found()
+  sys_xxhash = cc.find_library('xxhash', required: false)
+endif
+
+if sys_xxhash.found() and get_option('use_sys_xxhash')
+  message('Using system xxhash library')
+  use_sys_xxhash = true
+else
+  message('Using bundled xxhash library')
+endif
 
 userconf = configuration_data()
+userconf.set('HAVE_LIB_MAGIC', sys_magic.found().to_int())
+userconf.set('USE_LIB_MAGIC', use_syslib_magic.to_int())
+userconf.set('HAVE_LIB_XXHASH', sys_xxhash.found().to_int())
+userconf.set('USE_LIB_XXHASH', use_sys_xxhash.to_int())
 userconf.set('DEBUGGER', 1)
-userconf.set('PREFIX', prefix)
-userconf.set('LIBDIR', prefix + '/lib')
-userconf.set('INCLUDEDIR', prefix + '/include')
-userconf.set('DATADIR', prefix + '/share')
-userconf.set('HAVE_LIB_MAGIC', 0)
-userconf.set('USE_LIB_MAGIC', 0)
+userconf.set('PREFIX', r2_prefix)
+userconf.set('LIBDIR', r2_libdir)
+userconf.set('INCLUDEDIR', r2_incdir)
+userconf.set('DATADIR', r2_datdir)
+userconf.set('WWWROOT', r2_wwwroot)
+userconf.set('SDB', r2_sdb)
+userconf.set('ZIGNS', r2_zigns)
+userconf.set('THEMES', r2_themes)
+userconf.set('FORTUNES', r2_fortunes)
+userconf.set('FLAGS', r2_flags)
+userconf.set('HUD', r2_hud)
+userconf.set('PLUGINS', r2_plugins)
+userconf.set('EXTRAS', r2_extras)
+userconf.set('BINDINGS', r2_bindings)
 userconf.set('HAVE_OPENSSL', 0)
 userconf.set('HAVE_FORK', 1)
 userconf.set('WITH_GPL', 1)
 if host_machine.system() == 'windows'
-userconf.set('HAVE_JEMALLOC', 0)
+  userconf.set('HAVE_JEMALLOC', 0)
+else
+  userconf.set('HAVE_JEMALLOC', 1)
+endif
+if cc.has_header_symbol('sys/personality.h', 'ADDR_NO_RANDOMIZE')
+  userconf.set('HAVE_DECL_ADDR_NO_RANDOMIZE', 1)
 else
-userconf.set('HAVE_JEMALLOC', 1)
+  userconf.set('HAVE_DECL_ADDR_NO_RANDOMIZE', 0)
 endif
-configure_file(input : 'libr/include/r_userconf.h.in',
-               output : 'r_userconf.h',
-               configuration : userconf)
+
+if cc.has_function('arc4random_uniform')
+  userconf.set('HAVE_ARC4RANDOM_UNIFORM', 1)
+else
+  userconf.set('HAVE_ARC4RANDOM_UNIFORM', 0)
+endif
+
+if cc.has_function('explicit_bzero')
+  userconf.set('HAVE_EXPLICIT_BZERO', 1)
+else
+  userconf.set('HAVE_EXPLICIT_BZERO', 0)
+endif
+
+r_userconf_h = configure_file(
+  input: 'libr/include/r_userconf.h.acr',
+  output: 'r_userconf.h',
+  configuration: userconf,
+  install_dir: join_paths(get_option('includedir'), 'libr')
+)
 
 versionconf = configuration_data()
+versionconf.set('MESON_VERSION', meson.version())
 versionconf.set('VERSIONCOMMIT', version_commit)
-versionconf.set('R2_VERSION', r2version)
+versionconf.set('R2_VERSION', r2_version)
 versionconf.set('R2_GITTAP', gittap)
 versionconf.set('R2_GITTIP', gittip)
 versionconf.set('R2_BIRTH', r2birth)
-configure_file(input : 'libr/include/r_version.h.in',
-               output : 'r_version.h',
-               configuration : versionconf)
+r_version_h = configure_file(
+  input: 'libr/include/r_version.h.in',
+  output: 'r_version.h',
+  configuration: versionconf,
+  install_dir: join_paths(get_option('includedir'), 'libr')
+)
 
 # Copy missing header
-run_command('python', '-c', '__import__("shutil").copyfile("shlr/spp/config.def.h", "shlr/spp/config.h")')
+run_command(py3_exe, '-c', '__import__("shutil").copyfile("shlr/spp/config.def.h", "shlr/spp/config.h")')
 
-subdir('shlr/')
-subdir('libr/util')
+pcconf = configuration_data()
+pcconf.set('PREFIX', get_option('prefix'))
+pcconf.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+pcconf.set('VERSION', r2_version)
+libr_pc = configure_file(
+  input: 'libr/libr.pc.acr',
+  output: 'libr.pc',
+  configuration: pcconf,
+  install_dir: join_paths(get_option('libdir'), 'pkgconfig')
+)
+
+subdir('shlr')
 
+subdir('libr/util')
 subdir('libr/hash')
 subdir('libr/crypto')
 subdir('libr/socket')
 subdir('libr/io')
-subdir('binr/rahash2')
-subdir('binr/rarun2')
-
 subdir('libr/bp')
 subdir('libr/syscall')
 subdir('libr/cons')
 subdir('libr/search')
 subdir('libr/magic')
-
 subdir('libr/flag')
 subdir('libr/reg')
-
 subdir('libr/bin')
 subdir('libr/config')
-
 subdir('libr/parse')
 subdir('libr/lang')
-
 subdir('libr/asm')
 subdir('libr/anal')
-subdir('binr/rasm2')
 subdir('libr/egg')
-
 subdir('libr/fs')
-
 subdir('libr/debug')
-
 subdir('libr/core')
 
-subdir('binr/rabin2')
-subdir('binr/radare2')
-subdir('binr/ragg2')
-subdir('binr/r2agent')
-subdir('binr/radiff2')
-subdir('binr/rafind2')
-subdir('binr/rax2')
+subdir('libr/anal/d')
+subdir('libr/asm/d')
+subdir('libr/bin/d')
+subdir('libr/syscall/d')
+subdir('libr/cons/d')
+subdir('libr/magic/d')
+subdir('libr/flag/d')
+
+if not meson.is_subproject()
+  subdir('binr/rahash2')
+  subdir('binr/rarun2')
+  subdir('binr/rasm2')
+  subdir('binr/rabin2')
+  subdir('binr/radare2')
+  subdir('binr/ragg2')
+  subdir('binr/r2agent')
+  subdir('binr/radiff2')
+  subdir('binr/rafind2')
+  subdir('binr/rax2')
+  subdir('binr/r2pm')
+else
+  libr2_dep = declare_dependency(
+    dependencies: [
+      r_anal_dep,
+      r_asm_dep,
+      r_bin_dep,
+      r_bp_dep,
+      r_config_dep,
+      r_cons_dep,
+      r_core_dep,
+      r_crypto_dep,
+      r_egg_dep,
+      r_flag_dep,
+      r_fs_dep,
+      r_hash_dep,
+      r_io_dep,
+      r_lang_dep,
+      r_magic_dep,
+      r_parse_dep,
+      r_reg_dep,
+      r_search_dep,
+      r_socket_dep,
+      r_syscall_dep,
+      r_util_dep
+    ],
+    include_directories: include_directories('.', 'libr/include'),
+    version: r2_version
+  )
+endif
+
+install_subdir('shlr/www',
+  install_dir: r2_wwwroot,
+  strip_directory: true
+)
+
+fortunes_files = run_command(glob_cmd + ['doc/fortunes.*']).stdout().strip().split(';')
+install_data(fortunes_files,
+  install_dir: r2_fortunes
+)
+
+man1_files = run_command(glob_cmd + ['man/*.1']).stdout().strip().split(';')
+install_data(man1_files,
+  install_dir: join_paths(get_option('mandir'), 'man1')
+)
+
+man7_files = run_command(glob_cmd + ['man/*.7']).stdout().strip().split(';')
+install_data(man7_files,
+  install_dir: join_paths(get_option('mandir'), 'man7')
+)
+
+install_data('doc/hud',
+  install_dir: r2_hud,
+  rename: 'main'
+)
diff -Nru radare2-2.3.0+dfsg/meson_options.txt radare2-2.8.0+dfsg/meson_options.txt
--- radare2-2.3.0+dfsg/meson_options.txt	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/meson_options.txt	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,20 @@
+option('static_runtime', type: 'boolean', value: false)
+option('r2_libdir', type: 'string', value: '')
+option('r2_incdir', type: 'string', value: '')
+option('r2_datdir', type: 'string', value: '')
+option('r2_wwwroot', type: 'string', value: '')
+option('r2_sdb', type: 'string', value: '')
+option('r2_zigns', type: 'string', value: '')
+option('r2_themes', type: 'string', value: '')
+option('r2_fortunes', type: 'string', value: '')
+option('r2_flags', type: 'string', value: '')
+option('r2_hud', type: 'string', value: '')
+option('r2_version_commit', type: 'string', value: '')
+option('r2_gittap', type: 'string', value: '')
+option('r2_gittip', type: 'string', value: '')
+option('use_sys_capstone', type: 'boolean', value: false)
+option('use_sys_magic', type: 'boolean', value: false)
+option('use_sys_zip', type: 'boolean', value: false)
+option('use_sys_zlib', type: 'boolean', value: false)
+option('use_sys_lz4', type: 'boolean', value: false)
+option('use_sys_xxhash', type: 'boolean', value: false)
diff -Nru radare2-2.3.0+dfsg/mk/android.mk radare2-2.8.0+dfsg/mk/android.mk
--- radare2-2.3.0+dfsg/mk/android.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/android.mk	2018-08-07 14:12:36.000000000 +0000
@@ -58,3 +58,4 @@
 CFLAGS_OPT2=-O2
 CFLAGS_OPT3=-O3
 CFLAGS_DEBUG=-g
+OBJCOPY=${CROSS}objcopy
diff -Nru radare2-2.3.0+dfsg/mk/clang.mk radare2-2.8.0+dfsg/mk/clang.mk
--- radare2-2.3.0+dfsg/mk/clang.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/clang.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,6 @@
 ifeq (${_INCLUDE_MK_CLANG_},)
 _INCLUDE_MK_CLANG_=1
-CC=clang
+CC?=clang
 LINK=
 RANLIB=ranlib
 ONELIB=0
diff -Nru radare2-2.3.0+dfsg/mk/gcc.mk radare2-2.8.0+dfsg/mk/gcc.mk
--- radare2-2.3.0+dfsg/mk/gcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/gcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -2,6 +2,7 @@
 _INCLUDE_MK_GCC_=1
 CC?=gcc
 LINK=
+OBJCOPY=objcopy
 RANLIB=ranlib
 ONELIB=0
 CC_AR=ar q ${LIBAR}
@@ -14,17 +15,18 @@
 CFLAGS_OPT2=-O2
 CFLAGS_OPT3=-O3
 CFLAGS_DEBUG=-g
+LD?=ld
 
 ifeq ($(OSTYPE),darwin)
 ARCH=$(shell uname -m)
 #CFLAGS+=-arch ${ARCH}
 #LDFLAGS+=-arch ${ARCH}
-PARTIALLD=ld -r -all_load
+PARTIALLD=${LD} -r -all_load
 CFLAGS+=-fno-common
 LDFLAGS_LIB=-dynamiclib
 LDFLAGS_SONAME=-Wl,-install_name,${LIBDIR}/
 else
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${LD} -r --whole-archive
 LDFLAGS_LIB=${LDFLAGS} -shared
 #ifneq (${NAME},)
 #LDFLAGS_LIB+=-Wl,-soname,lib${NAME}.${EXT_SO}.${VERSION}
diff -Nru radare2-2.3.0+dfsg/mk/i486-mingw32-gcc.mk radare2-2.8.0+dfsg/mk/i486-mingw32-gcc.mk
--- radare2-2.3.0+dfsg/mk/i486-mingw32-gcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/i486-mingw32-gcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -8,7 +8,7 @@
 LINK=-shared
 AR=${CROSS}ar
 CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${CROSS}ld -r --whole-archive
 PICFLAGS=
 CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
 CC_LIB=${CC} -shared -o
diff -Nru radare2-2.3.0+dfsg/mk/i586-mingw32-gcc.mk radare2-2.8.0+dfsg/mk/i586-mingw32-gcc.mk
--- radare2-2.3.0+dfsg/mk/i586-mingw32-gcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/i586-mingw32-gcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -8,7 +8,7 @@
 LINK=-shared
 AR=${CROSS}ar
 CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${CROSS}ld -r --whole-archive
 PICFLAGS=
 CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
 CC_LIB=${CC} -shared -o
diff -Nru radare2-2.3.0+dfsg/mk/i586-mingw32msvc-gcc.mk radare2-2.8.0+dfsg/mk/i586-mingw32msvc-gcc.mk
--- radare2-2.3.0+dfsg/mk/i586-mingw32msvc-gcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/i586-mingw32msvc-gcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 LINK=
 AR=${CROSS}ar
 CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${CROSS}ld -r --whole-archive
 PICFLAGS=
 CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
 CC_LIB=${CC} -shared -o
diff -Nru radare2-2.3.0+dfsg/mk/i686-pc-mingw32-gcc.mk radare2-2.8.0+dfsg/mk/i686-pc-mingw32-gcc.mk
--- radare2-2.3.0+dfsg/mk/i686-pc-mingw32-gcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/i686-pc-mingw32-gcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 LINK=
 AR=${CROSS}ar
 CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${CROSS}ld -r --whole-archive
 PICFLAGS=
 CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
 CC_LIB=${CC} -shared -o
diff -Nru radare2-2.3.0+dfsg/mk/i686-w64-mingw32-gcc.mk radare2-2.8.0+dfsg/mk/i686-w64-mingw32-gcc.mk
--- radare2-2.3.0+dfsg/mk/i686-w64-mingw32-gcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/i686-w64-mingw32-gcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -8,7 +8,7 @@
 LINK=
 AR=${CROSS}ar
 CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${CROSS}ld -r --whole-archive
 PICFLAGS=
 CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
 CC_LIB=${CC} -shared -o
diff -Nru radare2-2.3.0+dfsg/mk/i686-w64-mingw32.static-gcc.mk radare2-2.8.0+dfsg/mk/i686-w64-mingw32.static-gcc.mk
--- radare2-2.3.0+dfsg/mk/i686-w64-mingw32.static-gcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/i686-w64-mingw32.static-gcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -8,7 +8,7 @@
 LINK=
 AR=${CROSS}ar
 CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${CROSS}ld -r --whole-archive
 PICFLAGS=
 CFLAGS+=${PICFLAGS} -MD -D__WINDOWS__=1
 CC_LIB=${CC} -shared -o
diff -Nru radare2-2.3.0+dfsg/mk/ios-sdk.mk radare2-2.8.0+dfsg/mk/ios-sdk.mk
--- radare2-2.3.0+dfsg/mk/ios-sdk.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/ios-sdk.mk	2018-08-07 14:12:36.000000000 +0000
@@ -7,7 +7,7 @@
 LINK=
 AR=ar
 CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=ld -r -all_load
+PARTIALLD=${CROSS}ld -r -all_load
 PICFLAGS=
 CFLAGS+=${PICFLAGS}
 CC_LIB=${CC} -shared -o
diff -Nru radare2-2.3.0+dfsg/mk/platform.mk radare2-2.8.0+dfsg/mk/platform.mk
--- radare2-2.3.0+dfsg/mk/platform.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/platform.mk	2018-08-07 14:12:36.000000000 +0000
@@ -1,34 +1,34 @@
-ifeq ($(OSTYPE),auto)
-OSTYPE=$(shell uname | tr 'A-Z' 'a-z')
-endif
-ifneq (,$(findstring cygwin,${OSTYPE}))
-PIC_CFLAGS=
-CFLAGS+=-DUNICODE -D_UNICODE
-else
-ifneq (,$(findstring mingw32,${OSTYPE}))
-PIC_CFLAGS=
-CFLAGS+=-DUNICODE -D_UNICODE
-else
-ifneq (,$(findstring mingw64,${OSTYPE}))
-PIC_CFLAGS=
-CFLAGS+=-DUNICODE -D_UNICODE
-else
-ifneq (,$(findstring msys,${OSTYPE}))
-PIC_CFLAGS=
-CFLAGS+=-DUNICODE -D_UNICODE
-else
-ifneq (,$(findstring windows,${OSTYPE}))
-PIC_CFLAGS=
-CFLAGS+=-DUNICODE -D_UNICODE
-else
-ifeq ($(CC),cccl)
-PIC_CFLAGS=
-CFLAGS+=-DUNICODE -D_UNICODE
-else
-PIC_CFLAGS=-fPIC
-endif
-endif
-endif
-endif
-endif
-endif
+ifeq ($(OSTYPE),auto)
+OSTYPE=$(shell uname | tr 'A-Z' 'a-z')
+endif
+ifneq (,$(findstring cygwin,${OSTYPE}))
+PIC_CFLAGS=
+CFLAGS+=-DUNICODE -D_UNICODE
+else
+ifneq (,$(findstring mingw32,${OSTYPE}))
+PIC_CFLAGS=
+CFLAGS+=-DUNICODE -D_UNICODE
+else
+ifneq (,$(findstring mingw64,${OSTYPE}))
+PIC_CFLAGS=
+CFLAGS+=-DUNICODE -D_UNICODE
+else
+ifneq (,$(findstring msys,${OSTYPE}))
+PIC_CFLAGS=
+CFLAGS+=-DUNICODE -D_UNICODE
+else
+ifneq (,$(findstring windows,${OSTYPE}))
+PIC_CFLAGS=
+CFLAGS+=-DUNICODE -D_UNICODE
+else
+ifeq ($(CC),cccl)
+PIC_CFLAGS=
+CFLAGS+=-DUNICODE -D_UNICODE
+else
+PIC_CFLAGS=-fPIC
+endif
+endif
+endif
+endif
+endif
+endif
diff -Nru radare2-2.3.0+dfsg/mk/tcc.mk radare2-2.8.0+dfsg/mk/tcc.mk
--- radare2-2.3.0+dfsg/mk/tcc.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/mk/tcc.mk	2018-08-07 14:12:36.000000000 +0000
@@ -12,13 +12,14 @@
 CFLAGS_OPT1=-O1
 CFLAGS_OPT2=-O2
 CFLAGS_OPT3=-O3
+LD?=ld
 
 ifeq ($(OSTYPE),darwin)
-PARTIALLD=ld -r -all_load
+PARTIALLD=${LD} -r -all_load
 LDFLAGS_LIB=-dynamiclib
 LDFLAGS_SONAME=-Wl,-install_name,
 else
-PARTIALLD=ld -r --whole-archive
+PARTIALLD=${LD} -r --whole-archive
 LDFLAGS_LIB=-shared
 LDFLAGS_LIB+=-Dxx
 #Wl,-soname,lib${NAME}.${EXT_SO}.${VERSION}
diff -Nru radare2-2.3.0+dfsg/pkgcfg/r_bin.pc.acr radare2-2.8.0+dfsg/pkgcfg/r_bin.pc.acr
--- radare2-2.3.0+dfsg/pkgcfg/r_bin.pc.acr	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/pkgcfg/r_bin.pc.acr	2018-08-07 14:12:36.000000000 +0000
@@ -7,5 +7,5 @@
 Description: radare foundation libraries
 Version: @VERSION@
 Requires: r_util r_io r_socket r_magic
-Libs: -L${libdir} -lr_bin
-Cflags: -I${includedir}/libr
+Libs: -L${libdir} -lr_bin  
+Cflags: -I${includedir}/libr 
diff -Nru radare2-2.3.0+dfsg/pkgcfg/r_core.pc.acr radare2-2.8.0+dfsg/pkgcfg/r_core.pc.acr
--- radare2-2.3.0+dfsg/pkgcfg/r_core.pc.acr	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/pkgcfg/r_core.pc.acr	2018-08-07 14:12:36.000000000 +0000
@@ -6,6 +6,6 @@
 Name: r_core
 Description: radare foundation libraries
 Version: @VERSION@
-Requires: r_config r_cons r_io r_util r_flag r_asm r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg r_reg r_search r_syscall r_socket r_fs r_magic r_crypto r_crypto
+Requires: r_config r_cons r_io r_util r_flag r_asm r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg r_reg r_search r_syscall r_socket r_fs r_magic r_crypto
 Libs: -L${libdir} -lr_core  @SSL_LDFLAGS@ @CAPSTONE_LDFLAGS@
 Cflags: -I${includedir}/libr @SSL_CFLAGS@ @CAPSTONE_CFLAGS@
diff -Nru radare2-2.3.0+dfsg/pkgcfg/r_hash.pc.acr radare2-2.8.0+dfsg/pkgcfg/r_hash.pc.acr
--- radare2-2.3.0+dfsg/pkgcfg/r_hash.pc.acr	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/pkgcfg/r_hash.pc.acr	2018-08-07 14:12:36.000000000 +0000
@@ -6,6 +6,6 @@
 Name: r_hash
 Description: radare foundation libraries
 Version: @VERSION@
-Requires: 
-Libs: -L${libdir} -lr_hash  
+Requires: r_util
+Libs: -L${libdir} -lr_hash  @LIBXXHASH@
 Cflags: -I${includedir}/libr 
diff -Nru radare2-2.3.0+dfsg/plugins.bin.cfg radare2-2.8.0+dfsg/plugins.bin.cfg
--- radare2-2.3.0+dfsg/plugins.bin.cfg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.bin.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -15,7 +15,7 @@
 "
 SHARED="
 core.java
-core.anal
+core.a2f
 bp.arm
 bp.x86
 bp.mips
@@ -33,7 +33,6 @@
 parse.6502_pseudo
 asm.arc
 asm.ppc_cs
-anal.x86_udis
 anal.ppc_cs
 io.mach
 io.debug
diff -Nru radare2-2.3.0+dfsg/plugins.def.cfg radare2-2.8.0+dfsg/plugins.def.cfg
--- radare2-2.3.0+dfsg/plugins.def.cfg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.def.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -12,6 +12,7 @@
 anal.ebc
 anal.gb
 anal.h8300
+anal.hexagon
 anal.i8080
 anal.java
 anal.m68k_cs
@@ -33,7 +34,6 @@
 anal.ws
 anal.xap
 anal.x86_cs
-anal.x86_udis
 anal.xcore_cs
 anal.z80
 anal.v810
@@ -57,7 +57,7 @@
 asm.cris_gnu
 asm.dalvik
 asm.dcpu16
-asm.hexagon_gnu
+asm.hexagon
 asm.ebc
 asm.gb
 asm.h8300
@@ -95,7 +95,6 @@
 asm.x86_as
 asm.x86_cs
 asm.x86_nz
-asm.x86_udis
 asm.x86_nasm
 asm.xcore_cs
 asm.z80
@@ -149,6 +148,7 @@
 bin.dyldcache
 bin_xtr.xtr_dyldcache
 bin_xtr.xtr_fatmach0
+bin_xtr.xtr_pemixed
 bin_ldr.ldr_linux
 bin.zimg
 bin.psxexe
@@ -157,7 +157,7 @@
 bp.mips
 bp.ppc
 bp.x86
-core.anal
+core.a2f
 core.java
 crypto.aes
 crypto.des
@@ -210,6 +210,7 @@
 io.bochs
 io.debug
 io.default
+io.gprobe
 io.gdb
 io.qnx
 io.r2pipe
diff -Nru radare2-2.3.0+dfsg/plugins.emscripten.cfg radare2-2.8.0+dfsg/plugins.emscripten.cfg
--- radare2-2.3.0+dfsg/plugins.emscripten.cfg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.emscripten.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -24,7 +24,7 @@
 bin.mach064
 bin_xtr.xtr_fatmach0
 core.java
-core.anal
+core.a2f
 bp.arm
 bp.x86
 bp.mips
@@ -45,7 +45,6 @@
 parse.6502_pseudo
 asm.arc
 asm.ppc_cs
-anal.x86_udis
 anal.ppc_cs
 io.mach
 io.debug
diff -Nru radare2-2.3.0+dfsg/plugins.ios.cfg radare2-2.8.0+dfsg/plugins.ios.cfg
--- radare2-2.3.0+dfsg/plugins.ios.cfg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.ios.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -52,7 +52,7 @@
 bp.bf
 bp.x86
 bp.mips
-core.anal
+core.a2f
 core.java
 crypto.aes
 debug.native
diff -Nru radare2-2.3.0+dfsg/plugins.ios-store.cfg radare2-2.8.0+dfsg/plugins.ios-store.cfg
--- radare2-2.3.0+dfsg/plugins.ios-store.cfg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.ios-store.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -43,7 +43,7 @@
 bp.bf
 bp.x86
 bp.mips
-core.anal
+core.a2f
 core.java
 crypto.aes
 debug.esil
diff -Nru radare2-2.3.0+dfsg/plugins.nogpl.cfg radare2-2.8.0+dfsg/plugins.nogpl.cfg
--- radare2-2.3.0+dfsg/plugins.nogpl.cfg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.nogpl.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -10,6 +10,7 @@
 anal.h8300
 anal.i8080
 anal.java
+anal.hexagon
 anal.m68k
 anal.malbolge
 anal.mips_cs
@@ -22,7 +23,6 @@
 anal.v850
 anal.ws
 anal.x86_cs
-anal.x86_udis
 anal.xcore_cs
 anal.z80
 asm.8051
@@ -39,6 +39,7 @@
 asm.i4004
 asm.i8080
 asm.java
+asm.hexagon
 asm.m68k
 asm.malbolge
 asm.mips_cs
@@ -54,7 +55,6 @@
 asm.x86_cs
 asm.x86_new
 asm.x86_nz
-asm.x86_udis
 asm.xcore_cs
 asm.z80
 bin.any
@@ -88,7 +88,7 @@
 bp.mips
 bp.ppc
 bp.x86
-core.anal
+core.a2f
 core.java
 crypto.aes
 debug.bf
diff -Nru radare2-2.3.0+dfsg/plugins.static.cfg radare2-2.8.0+dfsg/plugins.static.cfg
--- radare2-2.3.0+dfsg/plugins.static.cfg	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.static.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,225 @@
+# same as default, but removing some plugins to avoid dupped symbols (use diff)
+# this file should be removed as soon as those 2 plugins get built properly
+STATIC="anal.8051
+anal.arc
+anal.arm_cs
+anal.arm_gnu
+anal.avr
+anal.i4004
+anal.bf
+anal.chip8
+anal.cris
+anal.dalvik
+anal.gb
+anal.i8080
+anal.java
+anal.m68k_cs
+anal.malbolge
+anal.mips_cs
+anal.mips_gnu
+anal.nios2
+anal.null
+anal.ppc_gnu
+anal.sh
+anal.sparc_cs
+anal.sparc_gnu
+anal.sysz
+anal.ws
+anal.xap
+anal.x86_cs
+anal.xcore_cs
+anal.z80
+anal.vax
+anal.6502
+anal.snes
+anal.riscv
+anal.pic
+asm.6502
+asm.8051
+asm.arc
+asm.arm_cs
+asm.arm_gnu
+asm.avr
+asm.bf
+asm.chip8
+asm.cris_gnu
+asm.dalvik
+asm.dcpu16
+asm.gb
+asm.hppa_gnu
+asm.i4004
+asm.i8080
+asm.java
+asm.lm32
+asm.tricore
+asm.m68k_cs
+asm.malbolge
+asm.mips_cs
+asm.mips_gnu
+asm.nios2
+asm.ppc_gnu
+asm.propeller
+asm.riscv
+asm.lanai_gnu
+asm.sh
+asm.snes
+asm.sparc_cs
+asm.sparc_gnu
+asm.spc700
+asm.sysz
+asm.ws
+asm.xap
+asm.arm_as
+asm.x86_as
+asm.x86_cs
+asm.x86_nz
+asm.x86_nasm
+asm.xcore_cs
+asm.z80
+asm.lh5801
+asm.vax
+asm.mcs96
+asm.pic
+bin.any
+bin.nro
+bin.nso
+bin.art
+bin.bf
+bin.bflt
+bin.bios
+bin.bootimg
+bin.cgc
+bin.coff
+bin.dex
+bin.dol
+bin.elf
+bin.elf64
+bin.fs
+bin.java
+bin.menuet
+bin.mach0
+bin.mach064
+bin.mbn
+bin.mdmp
+bin.mz
+bin.nes
+bin.nin3ds
+bin.ninds
+bin.ningb
+bin.ningba
+bin.omf
+bin.p9
+bin.pe
+bin.pe64
+bin.pebble
+bin.smd
+bin.sms
+bin.avr
+bin.sfc
+bin.spc700
+bin.te
+bin.vsf
+bin.xbe
+bin.z64
+bin.dyldcache
+bin_xtr.xtr_dyldcache
+bin_xtr.xtr_fatmach0
+bin_ldr.ldr_linux
+bin.zimg
+bin.psxexe
+bp.arm
+bp.bf
+bp.mips
+bp.ppc
+bp.x86
+core.a2f
+core.java
+crypto.aes
+crypto.des
+crypto.rc4
+crypto.cps2
+crypto.xor
+crypto.blowfish
+crypto.rc2
+crypto.rot
+crypto.rol
+crypto.ror
+crypto.base64
+crypto.base91
+crypto.aes_cbc
+crypto.punycode
+crypto.rc6
+crypto.serpent
+debug.bf
+debug.io
+debug.esil
+debug.gdb
+debug.qnx
+debug.native
+debug.rap
+debug.windbg
+debug.bochs
+debug.null
+egg.exec
+egg.xor
+fs.io
+fs.r2
+fs.ext2
+fs.fat
+fs.fb
+fs.hfs
+fs.hfsplus
+fs.iso9660
+fs.jfs
+fs.minix
+fs.ntfs
+fs.posix
+fs.reiserfs
+fs.sfs
+fs.tar
+fs.udf
+fs.ufs
+fs.xfs
+io.null
+io.bfdbg
+io.bochs
+io.debug
+io.default
+io.gdb
+io.qnx
+io.r2pipe
+io.gzip
+io.http
+io.tcp
+io.r2web
+io.ihex
+io.mach
+io.malloc
+io.sparse
+io.mmap
+io.procpid
+io.ptrace
+io.rap
+io.self
+io.shm
+io.w32
+io.w32dbg
+io.windbg
+io.zip
+io.r2k
+io.ar
+io.rbuf
+lang.vala
+parse.6502_pseudo
+parse.arm_pseudo
+parse.att2intel
+parse.dalvik_pseudo
+parse.m68k_pseudo
+parse.mips_pseudo
+parse.mreplace
+parse.ppc_pseudo
+parse.sh_pseudo
+parse.avr_pseudo
+parse.x86_pseudo
+parse.z80_pseudo"
+SHARED="io.shm"
diff -Nru radare2-2.3.0+dfsg/plugins.tiny.cfg radare2-2.8.0+dfsg/plugins.tiny.cfg
--- radare2-2.3.0+dfsg/plugins.tiny.cfg	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/plugins.tiny.cfg	2018-08-07 14:12:36.000000000 +0000
@@ -48,7 +48,7 @@
 bp.bf
 bp.x86
 bp.mips
-core.anal
+core.a2f
 core.java
 crypto.aes
 debug.native
diff -Nru radare2-2.3.0+dfsg/README.md radare2-2.8.0+dfsg/README.md
--- radare2-2.3.0+dfsg/README.md	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/README.md	2018-08-07 14:12:36.000000000 +0000
@@ -1,20 +1,26 @@
 ```
     ____  ___  ___  ___ ____  ___    ____
-   |  _ \/   \|   \/   \  _ \/ _ \  |__  \
-   |    (  V  | |  ) V  |   (   _/   / __/
+   |  _ \/   \|   \/   \  _ \/ _ \  (__  \
+   |    (  -  | |  ) -  |   (   _/  /  __/
    |__\__|_|__|___/__|__|_\__|___|  |____|
 
-                www.radare.org
+                https://www.radare.org
 
                                   --pancake
 ```
 
+
+
 | | |
 |----------|---------------------------------------------------------------------|
 | **Jenkins**  	| [![Build Status](http://ci.rada.re/buildStatus/icon?job=radare2)](http://ci.rada.re/job/radare2)|
 | **TravisCI** 	| [![Build Status](https://travis-ci.org/radare/radare2.svg?branch=master)](https://travis-ci.org/radare/radare2)|
 | **AppVeyor**  | [![Build Status](https://ci.appveyor.com/api/projects/status/v9bxvsb1p6c3cmf9/branch/master?svg=true)](https://ci.appveyor.com/project/radare/radare2-shvdd)|
 | **Coverity** 	| [![Build Status](https://scan.coverity.com/projects/416/badge.svg)](https://scan.coverity.com/projects/416) |
+<a href="https://repology.org/metapackage/radare2">
+<img src="https://repology.org/badge/vertical-allrepos/radare2.svg" alt="Packaging status" align="right" width="150px" height="700px">
+</a>
+
 # Introduction
 
 r2 is a rewrite from scratch of radare in order to provide
@@ -25,26 +31,34 @@
 but later support for analyzing binaries, disassembling
 code, debugging programs, attaching to remote gdb servers, ..
 
-   radare2 is portable.
+radare2 is portable.
+
+## Architectures
+
+i386, x86-64, ARM, MIPS, PowerPC, SPARC, RISC-V, SH, m68k, AVR, XAP,
+System Z, XCore, CR16, HPPA, ARC, Blackfin, Z80, H8/300, V810, V850,
+CRIS, XAP, PIC, LM32, 8051, 6502, i4004, i8080, Propeller, Tricore, Chip8
+LH5801, T8200, GameBoy, SNES, MSP430, Xtensa, NIOS II,
+Dalvik, WebAssembly, MSIL, EBC, TMS320 (c54x, c55x, c55+, c66),
+Hexagon, Brainfuck, Malbolge, DCPU16
+
+## File Formats
+
+ELF, Mach-O, Fatmach-O, PE, PE+, MZ, COFF, OMF, TE, XBE, BIOS/UEFI,
+Dyldcache, DEX, ART, CGC, Java class, Android boot image, Plan9 executable,
+ZIMG, MBN/SBL bootloader, ELF coredump, MDMP (Windows minidump),
+WASM (WebAssembly binary), Commodore VICE emulator, 
+Game Boy (Advance), Nintendo DS ROMs and Nintendo 3DS FIRMs, various filesystems.
 
-   * **Architectures:**
-	* 6502, 8051, CRIS, H8/300, LH5801, T8200, arc, arm, avr, bf, blackfin, xap,
-   dalvik, dcpu16, gameboy, i386, i4004, i8080, m68k, malbolge, mips, msil,
-   msp430, nios II, powerpc, rar, sh, snes, sparc, tms320 (c54x c55x c55+), V810,
-   x86-64, zimg, risc-v.
-
-   * **File Formats:**
-	* bios, CGC, dex, elf, elf64, filesystem, java, fatmach0, mach0,
-   mach0-64, MZ, PE, PE+, TE, COFF, plan9, dyldcache, Commodore VICE emulator,
-   Game Boy (Advance), Nintendo DS ROMs and Nintendo 3DS FIRMs.
-
-   * **Operating Systems:**
-	* Android, GNU/Linux, [Net|Free|Open]BSD, iOS, OSX, QNX, w32,
-   w64, Solaris, Haiku, FirefoxOS
-
-   * **Bindings:**
-	* Vala/Genie, Python (2, 3), NodeJS, Lua, Go, Perl,
-   Guile, php5, newlisp, Ruby, Java, OCaml, ...
+## Operating Systems
+
+Windows (since XP), GNU/Linux, OS X, [Net|Free|Open]BSD,
+Android, iOS, OSX, QNX, Solaris, Haiku, FirefoxOS
+
+## Bindings
+
+Vala/Genie, Python (2, 3), NodeJS, Lua, Go, Perl,
+Guile, PHP, Newlisp, Ruby, Java, OCaml, ...
 
 # Dependencies
 
@@ -69,36 +83,20 @@
 
 # Building with meson + ninja
 
-The sys/install.sh method uses acr+make to build r2 from sources, which is the default
-and recommended way, but there's also a work-in-progress support for Meson.
+If you don't already have meson and ninja you can install them
+with your distribution package manager or with r2pm:
 
-Run first the configuration process:
-
-	$ ./configure
+	$ r2pm -i meson
 
-You can install last version of meson and ninja using r2pm:
+If you already have them installed, you can run this line to
+compile radare2:
 
-	$ r2pm -i meson
-	$ r2pm -r make meson
-	$ r2pm -r make meson-symstall
+	$ python ./sys/meson.py --prefix=/usr --shared --install
 
-Or just run those lines if you have them available in PATH:
+This method is mostly useful on Windows because the initial building
+with Makefile is not suitable. If you are lost in any way, just type:
 
-	$ make meson                # will run make meson-config automatically
-	$ sudo make meson-symstall  # symstall the meson build into PREFIX (/usr)
-	$ sudo make meson-uninstall # uninstall the meson installation
-
-The PREFIX is inherited from the last run of ./configure, so it's recommended to run
-sys/install.sh at least once to autodetect this, this step will end up into meson.
-
-At the moment, the meson build system doesnt supports much configuration options and it
-is not able to build all the plugins, it has been tested to work on the following hosts:
-
-* Rpi3-arm32
-* macOS-x86-64
-* Termux/Android-arm64
-* VoidLinux-x86-64
-* Windows-x86-64
+	$ python ./sys/meson.py --help
 
 # Update
 
@@ -208,7 +206,7 @@
 
 # Pointers
 
-Website: http://www.radare.org/
+Website: https://www.radare.org/
 
 IRC: irc.freenode.net #radare
 
diff -Nru radare2-2.3.0+dfsg/shlr/capstone-patches/capstone-calloc.patch radare2-2.8.0+dfsg/shlr/capstone-patches/capstone-calloc.patch
--- radare2-2.3.0+dfsg/shlr/capstone-patches/capstone-calloc.patch	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/capstone-patches/capstone-calloc.patch	2018-08-07 14:12:36.000000000 +0000
@@ -1,11 +1,17 @@
 diff --git a/MCInst.c b/MCInst.c
-index cc062d00..3f75de3b 100644
+index 1694e5d..758c43f 100644
 --- a/MCInst.c
 +++ b/MCInst.c
-@@ -16,15 +16,7 @@
- 
+@@ -18,20 +18,10 @@
  void MCInst_Init(MCInst *inst)
  {
+ 	unsigned int i;
+-
++	memset (inst, 0, sizeof (MCInst));
+ 	for (i = 0; i < 48; i++) {
+ 		inst->Operands[i].Kind = kInvalid;
+ 	}
+-
 -	inst->Opcode = 0;
 -	inst->OpcodePub = 0;
 -	inst->size = 0;
@@ -15,15 +21,14 @@
 -	inst->ac_idx = 0;
 -	inst->popcode_adjust = 0;
 -	inst->assembly[0] = '\0';
-+	memset (inst, 0, sizeof (MCInst));
  }
  
  void MCInst_clear(MCInst *inst)
 diff --git a/cs.c b/cs.c
-index 449b1da5..fe87a318 100644
+index d2ffecc..f12051a 100644
 --- a/cs.c
 +++ b/cs.c
-@@ -641,7 +641,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
+@@ -840,7 +840,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
  	size_org = size;
  
  	total_size = sizeof(cs_insn) * cache_size;
@@ -32,7 +37,7 @@
  	if (total == NULL) {
  		// insufficient memory
  		handle->errnum = CS_ERR_MEM;
-@@ -659,7 +659,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
+@@ -858,7 +858,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
  
  		if (handle->detail) {
  			// allocate memory for @detail pointer
@@ -41,7 +46,7 @@
  		} else {
  			insn_cache->detail = NULL;
  		}
-@@ -747,6 +747,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
+@@ -946,6 +946,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
  		if (f == cache_size) {
  			// full cache, so expand the cache to contain incoming insns
  			cache_size = cache_size * 8 / 5; // * 1.6 ~ golden ratio
@@ -49,12 +54,12 @@
  			total_size += (sizeof(cs_insn) * cache_size);
  			tmp = cs_mem_realloc(total, total_size);
  			if (tmp == NULL) {	// insufficient memory
-@@ -761,7 +762,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
+@@ -960,7 +961,7 @@ size_t CAPSTONE_API cs_disasm(csh ud, const uint8_t *buffer, size_t size, uint64
  				handle->errnum = CS_ERR_MEM;
  				return 0;
  			}
 -
-+			memset (total + (sizeof(cs_insn) * old_size), 0, (total_size - old_size));
++			memset ((char *)total + (sizeof(cs_insn) * old_size), 0, (total_size - old_size));
  			total = tmp;
  			// continue to fill in the cache after the last instruction
  			insn_cache = (cs_insn *)((char *)total + sizeof(cs_insn) * c);
diff -Nru radare2-2.3.0+dfsg/shlr/capstone-patches/fix-m68k-oob.patch radare2-2.8.0+dfsg/shlr/capstone-patches/fix-m68k-oob.patch
--- radare2-2.3.0+dfsg/shlr/capstone-patches/fix-m68k-oob.patch	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/capstone-patches/fix-m68k-oob.patch	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,5 @@
 diff --git a/arch/M68K/M68KInstPrinter.c b/arch/M68K/M68KInstPrinter.c
-index c545115..aec6a05 100644
+index 14a86e4..d826283 100644
 --- a/arch/M68K/M68KInstPrinter.c
 +++ b/arch/M68K/M68KInstPrinter.c
 @@ -28,7 +28,8 @@
@@ -12,7 +12,7 @@
  	"invalid",
  	"d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7",
  	"a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7",
-@@ -326,6 +327,9 @@ const char* M68K_reg_name(csh handle, unsigned int reg)
+@@ -338,6 +339,9 @@ const char* M68K_reg_name(csh handle, unsigned int reg)
  #ifdef CAPSTONE_DIET
  	return NULL;
  #else
diff -Nru radare2-2.3.0+dfsg/shlr/capstone-patches/fix-x86-16.patch radare2-2.8.0+dfsg/shlr/capstone-patches/fix-x86-16.patch
--- radare2-2.3.0+dfsg/shlr/capstone-patches/fix-x86-16.patch	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/capstone-patches/fix-x86-16.patch	2018-08-07 14:12:36.000000000 +0000
@@ -1,8 +1,8 @@
 diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c
-index 7e19b4e..062eef8 100644
+index 6978a47..b65c1cf 100644
 --- a/arch/X86/X86ATTInstPrinter.c
 +++ b/arch/X86/X86ATTInstPrinter.c
-@@ -576,6 +576,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
+@@ -615,6 +615,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
  		if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
  			imm = imm & 0xffff;
  
@@ -14,10 +14,10 @@
  			SStream_concat(O, "0x%"PRIx64, imm);
  		} else {
 diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c
-index c455725..eb60586 100644
+index ecc31d4..9fd15f0 100644
 --- a/arch/X86/X86IntelInstPrinter.c
 +++ b/arch/X86/X86IntelInstPrinter.c
-@@ -756,6 +756,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
+@@ -823,6 +823,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
  		if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
  			imm = imm & 0xffff;
  
diff -Nru radare2-2.3.0+dfsg/shlr/capstone-patches/sstream-null.patch radare2-2.8.0+dfsg/shlr/capstone-patches/sstream-null.patch
--- radare2-2.3.0+dfsg/shlr/capstone-patches/sstream-null.patch	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/capstone-patches/sstream-null.patch	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,9 @@
 diff --git a/SStream.c b/SStream.c
-index c90cf1a..1686d5d 100644
+index 90cef53..7ee9fd9 100644
 --- a/SStream.c
 +++ b/SStream.c
-@@ -28,6 +28,9 @@ void SStream_Init(SStream *ss)
- void SStream_concat0(SStream *ss, char *s)
+@@ -31,6 +31,9 @@ void SStream_Init(SStream *ss)
+ void SStream_concat0(SStream *ss, const char *s)
  {
  #ifndef CAPSTONE_DIET
 +	if (!ss || !s) {
diff -Nru radare2-2.3.0+dfsg/shlr/capstone.sh radare2-2.8.0+dfsg/shlr/capstone.sh
--- radare2-2.3.0+dfsg/shlr/capstone.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/capstone.sh	2018-08-07 14:12:36.000000000 +0000
@@ -4,13 +4,7 @@
 CS_TIP="$3" # tip commit
 CS_REV="$4" # revert
 
-if [ -d capstone -a ! -d capstone/.git ]; then 
-	echo "[capstone] release with no git?"
-	cd capstone
-	for PATCH in ../capstone-patches/* ; do
-		yes n | patch -Rp1 < $PATCH
-	done
-else 
+clone_capstone() {
 	if [ ! -d capstone ]; then 
 		git clone -b "${CS_BRA}" --depth 10 "${CS_URL}" capstone || exit 1
 	fi
@@ -20,11 +14,31 @@
 	else
 		HEAD="`git log|head -n1 | awk '{print $2}'`"
 	fi
+	BRANCH="`git branch | grep '*' | cut -d'*' -f2 | cut -d' ' -f2`"
+
 	if [ "${HEAD}" = "${CS_TIP}" ]; then
 		echo "[capstone] Already in TIP, no need to update from git"
 		exit 0
 	fi
-		echo "[capstone] Updating capstone from git..."
+}
+
+if [ -d capstone -a ! -d capstone/.git ]; then
+	echo "[capstone] release with no git?"
+	cd capstone
+	for PATCH in ../capstone-patches/* ; do
+		yes n | patch -Rp1 < $PATCH
+	done
+else
+	clone_capstone
+
+	if [ "${BRANCH}" != "${CS_BRA}" ]; then
+	    echo "[capstone] Reset capstone"
+	    cd ..
+	    rm -rf capstone
+	    clone_capstone
+	fi
+
+	echo "[capstone] Updating capstone from git..."
 	echo "HEAD ${HEAD}"
 	echo "TIP ${CS_TIP}"
 
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/include/arch.h radare2-2.8.0+dfsg/shlr/gdb/include/arch.h
--- radare2-2.3.0+dfsg/shlr/gdb/include/arch.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/include/arch.h	2018-08-07 14:12:36.000000000 +0000
@@ -23,6 +23,7 @@
 extern gdb_reg_t gdb_regs_lm32[];
 extern gdb_reg_t gdb_regs_mips[];
 extern gdb_reg_t gdb_regs_avr[];
+extern gdb_reg_t gdb_regs_v850[];
 
 
 #endif
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/include/gdbclient/commands.h radare2-2.8.0+dfsg/shlr/gdb/include/gdbclient/commands.h
--- radare2-2.3.0+dfsg/shlr/gdb/include/gdbclient/commands.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/include/gdbclient/commands.h	2018-08-07 14:12:36.000000000 +0000
@@ -99,11 +99,16 @@
  * \param conditions TODO: examine how this condition string should look like
  * \returns a failure code (currently -1) or 0 if call successfully
  */
-int gdbr_set_bp(libgdbr_t *g, ut64 address, const char *conditions);
-int gdbr_set_hwbp(libgdbr_t *g, ut64 address, const char *conditions);
-int gdbr_remove_bp(libgdbr_t *g, ut64 address);
-int gdbr_remove_hwbp(libgdbr_t *g, ut64 address);
-
+int gdbr_set_bp(libgdbr_t *g, ut64 address, const char *conditions, int sizebp);
+int gdbr_set_hwbp(libgdbr_t *g, ut64 address, const char *conditions, int sizebp);
+int gdbr_set_hww(libgdbr_t *g, ut64 address, const char *conditions, int sizebp);
+int gdbr_set_hwr(libgdbr_t *g, ut64 address, const char *conditions, int sizebp);
+int gdbr_set_hwa(libgdbr_t *g, ut64 address, const char *conditions, int sizebp);
+int gdbr_remove_bp(libgdbr_t *g, ut64 address, int sizebp);
+int gdbr_remove_hwbp(libgdbr_t *g, ut64 address, int sizebp);
+int gdbr_remove_hww(libgdbr_t *g, ut64 address, int sizebp);
+int gdbr_remove_hwr(libgdbr_t *g, ut64 address, int sizebp);
+int gdbr_remove_hwa(libgdbr_t *g, ut64 address, int sizebp);
 /*!
  * File read from remote target (only one file open at a time for now)
  */
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/include/gdbclient/core.h radare2-2.8.0+dfsg/shlr/gdb/include/gdbclient/core.h
--- radare2-2.3.0+dfsg/shlr/gdb/include/gdbclient/core.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/include/gdbclient/core.h	2018-08-07 14:12:36.000000000 +0000
@@ -28,11 +28,17 @@
 #define CMD_RBP				"z0"
 #define CMD_HBP				"Z1"
 #define CMD_RHBP			"z1"
+#define CMD_HWW				"Z2"
+#define CMD_RHWW			"z2"
+#define CMD_HWR				"Z3"
+#define CMD_RHWR			"z3"
+#define CMD_HWA				"Z4"
+#define CMD_RHWA			"z4"
 #define CMD_QRCMD			"qRcmd,"
-#define CMD_C					"vCont"
-#define CMD_C_CONT		"c"
+#define CMD_C				"vCont"
+#define CMD_C_CONT			"c"
 #define CMD_C_CONT_SIG		"C"
-#define CMD_C_STEP		"s"
+#define CMD_C_STEP			"s"
 
 enum Breakpoint {
 	BREAKPOINT,
@@ -50,8 +56,8 @@
  */
 int send_vcont(libgdbr_t* g, const char* command, const char *thread_id);
 
-int set_bp(libgdbr_t* g, ut64 address, const char* conditions, enum Breakpoint type);
+int set_bp(libgdbr_t* g, ut64 address, const char* conditions, enum Breakpoint type, int sizebp);
 
-int remove_bp(libgdbr_t* g, ut64 address, enum Breakpoint type);
+int remove_bp(libgdbr_t* g, ut64 address, enum Breakpoint type, int sizebp);
 
 #endif  // GDB_CLIENT_CORE_H
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/src/arch.c radare2-2.8.0+dfsg/shlr/gdb/src/arch.c
--- radare2-2.3.0+dfsg/shlr/gdb/src/arch.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/src/arch.c	2018-08-07 14:12:36.000000000 +0000
@@ -374,3 +374,46 @@
 	{ "pc", 39, 4 },
 	{ "", 0, 0 }
 };
+
+gdb_reg_t gdb_regs_v850[] = {
+	{ "r0", 0, 4 },
+	{ "r1", 4, 4 },
+	{ "r2", 8, 4 },
+	{ "sp", 12, 4 },
+	{ "gp", 16, 4 },
+	{ "r5", 20, 4 },
+	{ "r6", 24, 4 },
+	{ "r7", 28, 4 },
+	{ "r8", 32, 4 },
+	{ "r9", 36, 4 },
+	{ "r10", 40, 4 },
+	{ "r11", 44, 4 },
+	{ "r12", 48, 4 },
+	{ "r13", 52, 4 },
+	{ "r14", 56, 4 },
+	{ "r15", 60, 4 },
+	{ "r16", 64, 4 },
+	{ "r17", 68, 4 },
+	{ "r18", 72, 4 },
+	{ "r19", 76, 4 },
+	{ "r20", 80, 4 },
+	{ "r21", 84, 4 },
+	{ "r22", 88, 4 },
+	{ "r23", 92, 4 },
+	{ "r24", 96, 4 },
+	{ "r25", 100, 4 },
+	{ "r26", 104, 4 },
+	{ "r27", 108, 4 },
+	{ "r28", 112, 4 },
+	{ "r29", 116, 4 },
+	{ "ep", 120, 4 },
+	{ "lp", 124, 4 },
+	{ "eipc", 128, 4 },
+	{ "eipsw", 132, 4 },
+	{ "fepc", 136, 4 },
+	{ "fepsw", 140, 4 },
+	{ "ecr", 144, 4 },
+	{ "psw", 148, 4 },
+	{ "pc", 256, 4 },
+	{ "", 0, 0 }
+};
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/src/gdbclient/core.c radare2-2.8.0+dfsg/shlr/gdb/src/gdbclient/core.c
--- radare2-2.3.0+dfsg/shlr/gdb/src/gdbclient/core.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/src/gdbclient/core.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* libgdbr - LGPL - Copyright 2014-2017 - defragger */
+/* libgdbr - LGPL - Copyright 2014-2018 - defragger */
 
 #include "gdbclient/responses.h"
 #include "gdbclient/commands.h"
@@ -23,6 +23,7 @@
 
 extern char hex2char(char *hex);
 
+#if 0
 static int set_interface_attribs (int fd, int speed, int parity) {
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #pragma message("gdbclient/core.c: set_interface_attribs not implemented")
@@ -61,6 +62,7 @@
 #endif
 	return 0;
 }
+#endif
 
 static struct {
 	ut8  *buf;
@@ -105,7 +107,7 @@
 	// Initial max_packet_size for remote target (minimum so far for AVR = 64)
 	g->stub_features.pkt_sz = 64;
 	char *env_pktsz_str;
-	ut32 env_pktsz;
+	ut32 env_pktsz = 0;
 	if ((env_pktsz_str = r_sys_getenv ("R2_GDB_PKTSZ"))) {
 		if ((env_pktsz = (ut32) strtoul (env_pktsz_str, NULL, 10))) {
 			g->stub_features.pkt_sz = R_MAX (env_pktsz, GDB_MAX_PKTSZ);
@@ -477,7 +479,7 @@
 
 int gdbr_read_registers(libgdbr_t *g) {
 	int ret = -1;
-	if (!g) {
+	if (!g || !g->data) {
 		return -1;
 	}
 	if (reg_cache.init && reg_cache.valid) {
@@ -511,6 +513,9 @@
 	if (!g) {
 		return -1;
 	}
+	if (len < 1) {
+		return len;
+	}
 	g->stub_features.pkt_sz = R_MAX (g->stub_features.pkt_sz, GDB_MAX_PKTSZ);
 	int data_sz = g->stub_features.pkt_sz / 2;
 	int num_pkts = len / data_sz;
@@ -589,7 +594,7 @@
 	// Read complete pages
 	while (len > page_size) {
 		if ((ret = gdbr_read_memory_page (g, address, buf, page_size)) != page_size) {
-			if (ret < 0) {
+			if (ret < 1) {
 				return ret_len;
 			}
 			return ret_len + ret;
@@ -960,7 +965,7 @@
 	return handle_cont (g);
 }
 
-int set_bp(libgdbr_t *g, ut64 address, const char *conditions, enum Breakpoint type) {
+int set_bp(libgdbr_t *g, ut64 address, const char *conditions, enum Breakpoint type, int sizebp) {
 	char tmp[255] = {0};
 	int ret = -1;
 	if (!g) {
@@ -969,17 +974,23 @@
 	switch (type) {
 	case BREAKPOINT:
 		ret = snprintf (tmp, sizeof (tmp) - 1,
-			"%s,%"PFMT64x ",1", CMD_BP, address);
+			"%s,%"PFMT64x ",%d", CMD_BP, address, sizebp);
 		break;
 	case HARDWARE_BREAKPOINT:
 		ret = snprintf (tmp, sizeof (tmp) - 1,
-			"%s,%"PFMT64x ",1", CMD_HBP, address);
+			"%s,%"PFMT64x ",%d", CMD_HBP, address, sizebp);
 		break;
 	case WRITE_WATCHPOINT:
+		ret = snprintf (tmp, sizeof (tmp) - 1,
+			"%s,%"PFMT64x ",%d", CMD_HWW, address, sizebp);
 		break;
 	case READ_WATCHPOINT:
+		ret = snprintf (tmp, sizeof (tmp) - 1,
+			"%s,%"PFMT64x ",%d", CMD_HWR, address, sizebp);
 		break;
 	case ACCESS_WATCHPOINT:
+		ret = snprintf (tmp, sizeof (tmp) - 1,
+			"%s,%"PFMT64x ",%d", CMD_HWA, address, sizebp);
 		break;
 	default:
 		break;
@@ -999,23 +1010,48 @@
 	return 0;
 }
 
-int gdbr_set_bp(libgdbr_t *g, ut64 address, const char *conditions) {
-	return set_bp (g, address, conditions, BREAKPOINT);
+int gdbr_set_bp(libgdbr_t *g, ut64 address, const char *conditions, int sizebp) {
+	return set_bp (g, address, conditions, BREAKPOINT, sizebp);
+}
+
+int gdbr_set_hwbp(libgdbr_t *g, ut64 address, const char *conditions, int sizebp) {
+	return set_bp (g, address, conditions, HARDWARE_BREAKPOINT, sizebp);
+}
+
+int gdbr_set_hww(libgdbr_t *g, ut64 address, const char *conditions, int sizebp) {
+	return set_bp (g, address, conditions, WRITE_WATCHPOINT, sizebp);
 }
 
-int gdbr_set_hwbp(libgdbr_t *g, ut64 address, const char *conditions) {
-	return set_bp (g, address, conditions, HARDWARE_BREAKPOINT);
+int gdbr_set_hwr(libgdbr_t *g, ut64 address, const char *conditions, int sizebp) {
+	return set_bp (g, address, conditions, READ_WATCHPOINT, sizebp);
 }
 
-int gdbr_remove_bp(libgdbr_t *g, ut64 address) {
-	return remove_bp (g, address, BREAKPOINT);
+int gdbr_set_hwa(libgdbr_t *g, ut64 address, const char *conditions, int sizebp) {
+	return set_bp (g, address, conditions, ACCESS_WATCHPOINT, sizebp);
 }
 
-int gdbr_remove_hwbp(libgdbr_t *g, ut64 address) {
-	return remove_bp (g, address, HARDWARE_BREAKPOINT);
+int gdbr_remove_bp(libgdbr_t *g, ut64 address, int sizebp) {
+	return remove_bp (g, address, BREAKPOINT, sizebp);
 }
 
-int remove_bp(libgdbr_t *g, ut64 address, enum Breakpoint type) {
+int gdbr_remove_hwbp(libgdbr_t *g, ut64 address, int sizebp) {
+	return remove_bp (g, address, HARDWARE_BREAKPOINT, sizebp);
+}
+
+int gdbr_remove_hww(libgdbr_t *g, ut64 address, int sizebp) {
+	return remove_bp (g, address, WRITE_WATCHPOINT, sizebp);
+}
+
+int gdbr_remove_hwr(libgdbr_t *g, ut64 address, int sizebp) {
+	return remove_bp (g, address, READ_WATCHPOINT, sizebp);
+}
+
+int gdbr_remove_hwa(libgdbr_t *g, ut64 address, int sizebp) {
+	return remove_bp (g, address, ACCESS_WATCHPOINT, sizebp);
+}
+
+
+int remove_bp(libgdbr_t *g, ut64 address, enum Breakpoint type, int sizebp) {
 	char tmp[255] = {0};
 	int ret = -1;
 	if (!g) {
@@ -1023,16 +1059,19 @@
 	}
 	switch (type) {
 	case BREAKPOINT:
-		ret = snprintf (tmp, sizeof (tmp) - 1, "%s,%"PFMT64x ",1", CMD_RBP, address);
+		ret = snprintf (tmp, sizeof (tmp) - 1, "%s,%"PFMT64x ",%d", CMD_RBP, address, sizebp);
 		break;
 	case HARDWARE_BREAKPOINT:
-		ret = snprintf (tmp, sizeof (tmp) - 1, "%s,%"PFMT64x ",1", CMD_RHBP, address);
+		ret = snprintf (tmp, sizeof (tmp) - 1, "%s,%"PFMT64x ",%d", CMD_RHBP, address, sizebp);
 		break;
 	case WRITE_WATCHPOINT:
+		ret = snprintf (tmp, sizeof (tmp) - 1, "%s,%"PFMT64x ",%d", CMD_RHWW, address, sizebp);
 		break;
 	case READ_WATCHPOINT:
+		ret = snprintf (tmp, sizeof (tmp) - 1, "%s,%"PFMT64x ",%d", CMD_RHWR, address, sizebp);
 		break;
 	case ACCESS_WATCHPOINT:
+		ret = snprintf (tmp, sizeof (tmp) - 1, "%s,%"PFMT64x ",%d", CMD_RHWA, address, sizebp);
 		break;
 	default:
 		break;
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/src/gdbclient/xml.c radare2-2.8.0+dfsg/shlr/gdb/src/gdbclient/xml.c
--- radare2-2.3.0+dfsg/shlr/gdb/src/gdbclient/xml.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/src/gdbclient/xml.c	2018-08-07 14:12:36.000000000 +0000
@@ -228,8 +228,8 @@
 		switch (g->target.bits) {
 		case 32:
 			if (!(profile = r_str_prefix (profile,
-							"=PC	r15\n"
-							"=SP	r14\n" // XXX
+							"=PC	pc\n"
+							"=SP	sp\n" // XXX
 							"=A0	r0\n"
 							"=A1	r1\n"
 							"=A2	r2\n"
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/src/libgdbr.c radare2-2.8.0+dfsg/shlr/gdb/src/libgdbr.c
--- radare2-2.3.0+dfsg/shlr/gdb/src/libgdbr.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/src/libgdbr.c	2018-08-07 14:12:36.000000000 +0000
@@ -57,6 +57,8 @@
 		g->registers = gdb_regs_lm32;
 	} else if (!strcmp (arch, "avr")) {
 		g->registers = gdb_regs_avr;
+	} else if (!strcmp (arch, "v850")) {
+		g->registers = gdb_regs_v850;
 	} else if (!strcmp (arch, "x86")) {
 		if (bits == 32) {
 			g->registers = gdb_regs_x86_32;
diff -Nru radare2-2.3.0+dfsg/shlr/gdb/src/packet.c radare2-2.8.0+dfsg/shlr/gdb/src/packet.c
--- radare2-2.3.0+dfsg/shlr/gdb/src/packet.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/gdb/src/packet.c	2018-08-07 14:12:36.000000000 +0000
@@ -215,6 +215,9 @@
 		eprintf ("%s: message too long: %s", __func__, msg);
 		return -1;
 	}
+	if (!g->send_buff) {
+		return -1;
+	}
 	g->send_buff[0] = '$';
 	g->send_len = 1;
 	src = msg;
diff -Nru radare2-2.3.0+dfsg/shlr/grub/fs/hfs.c radare2-2.8.0+dfsg/shlr/grub/fs/hfs.c
--- radare2-2.3.0+dfsg/shlr/grub/fs/hfs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/grub/fs/hfs.c	2018-08-07 14:12:36.000000000 +0000
@@ -1175,7 +1175,7 @@
   data = grub_hfs_mount (device->disk);
   if (data && data->sblock.num_serial != 0)
     {
-      *uuid = grub_xasprintf ("%016llx",
+      *uuid = grub_xasprintf ("%016"PFMT64x,
 			     (unsigned long long)
 			     grub_be_to_cpu64 (data->sblock.num_serial));
     }
diff -Nru radare2-2.3.0+dfsg/shlr/grub/fs/hfsplus.c radare2-2.8.0+dfsg/shlr/grub/fs/hfsplus.c
--- radare2-2.3.0+dfsg/shlr/grub/fs/hfsplus.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/grub/fs/hfsplus.c	2018-08-07 14:12:36.000000000 +0000
@@ -29,6 +29,7 @@
 #include <grub/fshelp.h>
 #include <grub/hfs.h>
 #include <grub/charset.h>
+#include <r_util.h>
 
 #define GRUB_HFSPLUS_MAGIC 0x482B
 #define GRUB_HFSPLUSX_MAGIC 0x4858
@@ -1039,7 +1040,7 @@
   data = grub_hfsplus_mount (disk);
   if (data)
     {
-      *uuid = grub_xasprintf ("%016llx",
+      *uuid = grub_xasprintf ("%016"PFMT64x,
 			     (unsigned long long)
 			     grub_be_to_cpu64 (data->volheader.num_serial));
     }
diff -Nru radare2-2.3.0+dfsg/shlr/grub/fs/reiserfs.c radare2-2.8.0+dfsg/shlr/grub/fs/reiserfs.c
--- radare2-2.3.0+dfsg/shlr/grub/fs/reiserfs.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/grub/fs/reiserfs.c	2018-08-07 14:12:36.000000000 +0000
@@ -40,8 +40,10 @@
 #include <grub/fshelp.h>
 #include <r_types.h>
 
+#ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
 #define REISERFS_SUPER_BLOCK_OFFSET 0x10000
 #define REISERFS_MAGIC_LEN 12
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/arena.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/arena.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/arena.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/arena.h	2018-08-07 14:12:36.000000000 +0000
@@ -703,10 +703,8 @@
 JEMALLOC_ALWAYS_INLINE arena_chunk_map_bits_t *
 arena_bitselm_get_mutable(arena_chunk_t *chunk, size_t pageind)
 {
-
-	assert(pageind >= map_bias);
-	assert(pageind < chunk_npages);
-
+	if (unlikely((pageind <= map_bias) || (pageind > chunk_npages)))
+		return (NULL);
 	return (&chunk->map_bits[pageind-map_bias]);
 }
 
@@ -720,9 +718,8 @@
 JEMALLOC_ALWAYS_INLINE arena_chunk_map_misc_t *
 arena_miscelm_get_mutable(arena_chunk_t *chunk, size_t pageind)
 {
-
-	assert(pageind >= map_bias);
-	assert(pageind < chunk_npages);
+	if (unlikely((pageind <= map_bias) || (pageind > chunk_npages)))
+		return (NULL);
 
 	return ((arena_chunk_map_misc_t *)((uintptr_t)chunk +
 	    (uintptr_t)map_misc_offset) + pageind-map_bias);
@@ -762,10 +759,9 @@
 {
 	arena_chunk_map_misc_t *miscelm = (arena_chunk_map_misc_t
 	    *)((uintptr_t)rd - offsetof(arena_chunk_map_misc_t, rd));
-
-	assert(arena_miscelm_to_pageind(miscelm) >= map_bias);
-	assert(arena_miscelm_to_pageind(miscelm) < chunk_npages);
-
+	if (unlikely((arena_miscelm_to_pageind (miscelm) <= map_bias)
+				|| arena_miscelm_to_pageind (miscelm) > chunk_npages))
+				return (NULL);
 	return (miscelm);
 }
 
@@ -775,8 +771,9 @@
 	arena_chunk_map_misc_t *miscelm = (arena_chunk_map_misc_t
 	    *)((uintptr_t)run - offsetof(arena_chunk_map_misc_t, run));
 
-	assert(arena_miscelm_to_pageind(miscelm) >= map_bias);
-	assert(arena_miscelm_to_pageind(miscelm) < chunk_npages);
+	if (unlikely((arena_miscelm_to_pageind (miscelm) <= map_bias)
+				|| arena_miscelm_to_pageind (miscelm) > chunk_npages))
+				return (NULL);
 
 	return (miscelm);
 }
@@ -939,7 +936,6 @@
 #else
 	mapbits = size >> -CHUNK_MAP_SIZE_SHIFT;
 #endif
-
 	assert((mapbits & ~CHUNK_MAP_SIZE_MASK) == 0);
 	return (mapbits);
 }
@@ -949,7 +945,6 @@
     size_t flags)
 {
 	size_t *mapbitsp = arena_mapbitsp_get_mutable(chunk, pageind);
-
 	assert((size & PAGE_MASK) == 0);
 	assert((flags & CHUNK_MAP_FLAGS_MASK) == flags);
 	assert((flags & CHUNK_MAP_DECOMMITTED) == 0 || (flags &
@@ -964,7 +959,6 @@
 {
 	size_t *mapbitsp = arena_mapbitsp_get_mutable(chunk, pageind);
 	size_t mapbits = arena_mapbitsp_read(mapbitsp);
-
 	assert((size & PAGE_MASK) == 0);
 	assert((mapbits & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0);
 	arena_mapbitsp_write(mapbitsp, arena_mapbits_size_encode(size) |
@@ -1046,9 +1040,8 @@
 JEMALLOC_INLINE bool
 arena_prof_accum_impl(arena_t *arena, uint64_t accumbytes)
 {
-
-	cassert(config_prof);
-	assert(prof_interval != 0);
+	if (unlikely((!config_prof) || (prof_interval == 0)))
+		return (false);
 
 	arena->prof_accumbytes += accumbytes;
 	if (arena->prof_accumbytes >= prof_interval) {
@@ -1062,7 +1055,8 @@
 arena_prof_accum_locked(arena_t *arena, uint64_t accumbytes)
 {
 
-	cassert(config_prof);
+	if (unlikely(!config_prof))
+		return (false);
 
 	if (likely(prof_interval == 0))
 		return (false);
@@ -1072,8 +1066,8 @@
 JEMALLOC_INLINE bool
 arena_prof_accum(tsdn_t *tsdn, arena_t *arena, uint64_t accumbytes)
 {
-
-	cassert(config_prof);
+	if (unlikely(!config_prof))
+		return (false);
 
 	if (likely(prof_interval == 0))
 		return (false);
@@ -1141,6 +1135,7 @@
 arena_bin_index(arena_t *arena, arena_bin_t *bin)
 {
 	szind_t binind = (szind_t)(bin - arena->bins);
+
 	assert(binind < JM_NBINS);
 	return (binind);
 }
@@ -1212,6 +1207,7 @@
 #undef SIZE_INV
 #undef SIZE_INV_SHIFT
 	}
+
 	assert(diff == regind * interval);
 	assert(regind < bin_info->nregs);
 
@@ -1224,14 +1220,17 @@
 	prof_tctx_t *ret;
 	arena_chunk_t *chunk;
 
-	cassert(config_prof);
-	assert(ptr != NULL);
+	if (unlikely((!config_prof) || (ptr == NULL)))
+		return (NULL);
 
 	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr);
 	if (likely(chunk != ptr)) {
 		size_t pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> LG_PAGE;
 		size_t mapbits = arena_mapbits_get(chunk, pageind);
-		assert((mapbits & CHUNK_MAP_ALLOCATED) != 0);
+
+		if (unlikely(mapbits & CHUNK_MAP_ALLOCATED) == 0)
+			return (NULL);
+
 		if (likely((mapbits & CHUNK_MAP_LARGE) == 0))
 			ret = (prof_tctx_t *)(uintptr_t)1U;
 		else {
@@ -1338,8 +1337,8 @@
     tcache_t *tcache, bool slow_path)
 {
 
-	assert(!tsdn_null(tsdn) || tcache == NULL);
-	assert(size != 0);
+	if (unlikely(!(!tsdn_null(tsdn) || tcache == NULL) || !(size != 0)))
+		return (NULL);
 
 	if (likely(tcache != NULL)) {
 		if (likely(size <= SMALL_MAXCLASS)) {
@@ -1351,7 +1350,9 @@
 			    tcache, size, ind, zero, slow_path));
 		}
 		/* (size > tcache_maxclass) case falls through. */
-		assert(size > tcache_maxclass);
+
+		if (unlikely(size < tcache_maxclass))
+			return (NULL);
 	}
 
 	return (arena_malloc_hard(tsdn, arena, size, ind, zero));
@@ -1424,7 +1425,6 @@
 {
 	arena_chunk_t *chunk;
 	size_t pageind, mapbits;
-
 	assert(!tsdn_null(tsdn) || tcache == NULL);
 	assert(ptr != NULL);
 
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/bitmap.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/bitmap.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/bitmap.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/bitmap.h	2018-08-07 14:12:36.000000000 +0000
@@ -155,8 +155,9 @@
 {
 	size_t goff;
 	bitmap_t g;
+	if (unlikely(bit > binfo->nbits))
+		return (false);
 
-	assert(bit < binfo->nbits);
 	goff = bit >> LG_BITMAP_GROUP_NBITS;
 	g = bitmap[goff];
 	return (!(g & (ZU(1) << (bit & BITMAP_GROUP_NBITS_MASK))));
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/extent.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/extent.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/extent.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/extent.h	2018-08-07 14:12:36.000000000 +0000
@@ -152,8 +152,8 @@
 JEMALLOC_INLINE bool
 extent_node_committed_get(const extent_node_t *node)
 {
-
-	assert(!node->en_achunk);
+	if (unlikely(node->en_achunk))
+		return false;
 	return (node->en_committed);
 }
 
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/prng.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/prng.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/prng.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/prng.h	2018-08-07 14:12:36.000000000 +0000
@@ -205,7 +205,6 @@
 {
 	size_t ret;
 	unsigned lg_range;
-
 	assert(range > 1);
 
 	/* Compute the ceiling of lg(range). */
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/prof.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/prof.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/prof.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/prof.h	2018-08-07 14:12:36.000000000 +0000
@@ -378,7 +378,8 @@
 {
 	prof_tdata_t *tdata;
 
-	cassert(config_prof);
+	if (unlikely(!config_prof))
+		return NULL;
 
 	tdata = tsd_prof_tdata_get(tsd);
 	if (create) {
@@ -391,7 +392,8 @@
 			tdata = prof_tdata_reinit(tsd, tdata);
 			tsd_prof_tdata_set(tsd, tdata);
 		}
-		assert(tdata == NULL || tdata->attached);
+		if (unlikely ( ( (tdata != NULL) || ! (tdata->attached) ) ) )
+			return NULL;
 	}
 
 	return (tdata);
@@ -400,20 +402,16 @@
 JEMALLOC_ALWAYS_INLINE prof_tctx_t *
 prof_tctx_get(tsdn_t *tsdn, const void *ptr)
 {
-
-	cassert(config_prof);
-	assert(ptr != NULL);
-
+	if (unlikely (!config_prof || ptr == NULL))
+		return NULL;
 	return (arena_prof_tctx_get(tsdn, ptr));
 }
 
 JEMALLOC_ALWAYS_INLINE void
 prof_tctx_set(tsdn_t *tsdn, const void *ptr, size_t usize, prof_tctx_t *tctx)
 {
-
 	cassert(config_prof);
 	assert(ptr != NULL);
-
 	arena_prof_tctx_set(tsdn, ptr, usize, tctx);
 }
 
@@ -421,7 +419,6 @@
 prof_tctx_reset(tsdn_t *tsdn, const void *ptr, size_t usize, const void *old_ptr,
     prof_tctx_t *old_tctx)
 {
-
 	cassert(config_prof);
 	assert(ptr != NULL);
 
@@ -434,7 +431,8 @@
 {
 	prof_tdata_t *tdata;
 
-	cassert(config_prof);
+	if (unlikely(!config_prof))
+		return false;
 
 	tdata = prof_tdata_get(tsd, true);
 	if (unlikely((uintptr_t)tdata <= (uintptr_t)PROF_TDATA_STATE_MAX))
@@ -465,7 +463,8 @@
 	prof_tdata_t *tdata;
 	prof_bt_t bt;
 
-	assert(usize == s2u(usize));
+	if (unlikely(usize != s2u(usize)))
+		return NULL;
 
 	if (!prof_active || likely(prof_sample_accum_update(tsd, usize, update,
 	    &tdata)))
@@ -482,7 +481,6 @@
 JEMALLOC_ALWAYS_INLINE void
 prof_malloc(tsdn_t *tsdn, const void *ptr, size_t usize, prof_tctx_t *tctx)
 {
-
 	cassert(config_prof);
 	assert(ptr != NULL);
 	assert(usize == isalloc(tsdn, ptr, true));
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/rb.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/rb.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/rb.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/rb.h	2018-08-07 14:12:36.000000000 +0000
@@ -596,6 +596,8 @@
 	if (left != NULL) {						\
 	    /* node has no successor, but it has a left child.        */\
 	    /* Splice node out, without losing the left child.        */\
+		\
+		\
 	    assert(!rbtn_red_get(a_type, a_field, node));		\
 	    assert(rbtn_red_get(a_type, a_field, left));		\
 	    rbtn_black_set(a_type, a_field, left);			\
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/rtree.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/rtree.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/rtree.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/rtree.h	2018-08-07 14:12:36.000000000 +0000
@@ -169,7 +169,8 @@
 	child = elm->child;
 	if (!dependent && !rtree_node_valid(child))
 		child = atomic_read_p(&elm->pun);
-	assert(!dependent || child != NULL);
+	if (unlikely(dependent || child == NULL))
+		return (NULL);
 	return (child);
 }
 
@@ -182,7 +183,8 @@
 	child = rtree_child_tryread(elm, dependent);
 	if (!dependent && unlikely(!rtree_node_valid(child)))
 		child = rtree_child_read_hard(rtree, elm, level);
-	assert(!dependent || child != NULL);
+	if (unlikely(dependent || child == NULL))
+		return (NULL);
 	return (child);
 }
 
@@ -224,7 +226,9 @@
 	subtree = rtree->levels[level].subtree;
 	if (!dependent && unlikely(!rtree_node_valid(subtree)))
 		subtree = atomic_read_p(&rtree->levels[level].subtree_pun);
-	assert(!dependent || subtree != NULL);
+
+	if (unlikely(dependent || subtree == NULL))
+		return (NULL);
 	return (subtree);
 }
 
@@ -236,7 +240,8 @@
 	subtree = rtree_subtree_tryread(rtree, level, dependent);
 	if (!dependent && unlikely(!rtree_node_valid(subtree)))
 		subtree = rtree_subtree_read_hard(rtree, level);
-	assert(!dependent || subtree != NULL);
+	if (unlikely(dependent || subtree == NULL))
+		return (NULL);
 	return (subtree);
 }
 
@@ -254,7 +259,8 @@
 	switch (start_level + RTREE_GET_BIAS) {
 #define	RTREE_GET_SUBTREE(level)					\
 	case level:							\
-		assert(level < (RTREE_HEIGHT_MAX-1));			\
+		if (unlikely(level > (RTREE_HEIGHT_MAX-1)))\
+			return (NULL)\
 		if (!dependent && unlikely(!rtree_node_valid(node)))	\
 			return (NULL);					\
 		subkey = rtree_subkey(rtree, key, level -		\
@@ -263,7 +269,8 @@
 		/* Fall through. */
 #define	RTREE_GET_LEAF(level)						\
 	case level:							\
-		assert(level == (RTREE_HEIGHT_MAX-1));			\
+		if (unlikely(level != (RTREE_HEIGHT_MAX-1))) \
+			return (NULL); \
 		if (!dependent && unlikely(!rtree_node_valid(node)))	\
 			return (NULL);					\
 		subkey = rtree_subkey(rtree, key, level -		\
@@ -353,7 +360,8 @@
 			rtree_val_write(rtree, &node[subkey], val);
 			return (false);
 		}
-		assert(i + 1 < rtree->height);
+		if (unlikely (i + 1 > rtree->height))
+			return (false);
 		child = rtree_child_read(rtree, &node[subkey], i, false);
 		if (child == NULL)
 			return (true);
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/tcache.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/tcache.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/tcache.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/tcache.h	2018-08-07 14:12:36.000000000 +0000
@@ -193,8 +193,8 @@
 	tsd_t *tsd;
 	tcache_enabled_t tcache_enabled;
 
-	cassert(config_tcache);
-
+	if(unlikely(!config_tcache))
+		return false;
 	tsd = tsd_fetch();
 	tcache_enabled = tsd_tcache_enabled_get(tsd);
 	if (tcache_enabled == tcache_enabled_default) {
@@ -288,10 +288,15 @@
 	bool tcache_success;
 	size_t usize JEMALLOC_CC_SILENCE_INIT(0);
 
-	assert(binind < JM_NBINS);
+	if (unlikely(binind > JM_NBINS))
+		return (NULL);
+
 	tbin = &tcache->tbins[binind];
 	ret = tcache_alloc_easy(tbin, &tcache_success);
-	assert(tcache_success == (ret != NULL));
+
+	if (unlikely(!(tcache_success == (ret != NULL))))
+		return (NULL);
+
 	if (unlikely(!tcache_success)) {
 		bool tcache_hard_success;
 		arena = arena_choose(tsd, arena);
@@ -304,7 +309,9 @@
 			return (NULL);
 	}
 
-	assert(ret);
+	if (unlikely(!ret))
+		return (NULL);
+
 	/*
 	 * Only compute usize if required.  The checks in the following if
 	 * statement are all static.
@@ -346,10 +353,14 @@
 	tcache_bin_t *tbin;
 	bool tcache_success;
 
-	assert(binind < nhbins);
+	if (unlikely(binind > nhbins))
+		return (NULL);
 	tbin = &tcache->tbins[binind];
 	ret = tcache_alloc_easy(tbin, &tcache_success);
-	assert(tcache_success == (ret != NULL));
+
+	if (unlikely(!(tcache_success == (ret != NULL))))
+		return (NULL);
+
 	if (unlikely(!tcache_success)) {
 		/*
 		 * Only allocate one large object at a time, because it's quite
@@ -449,6 +460,7 @@
 		tcache_bin_flush_large(tsd, tbin, binind,
 		    (tbin_info->ncached_max >> 1), tcache);
 	}
+
 	assert(tbin->ncached < tbin_info->ncached_max);
 	tbin->ncached++;
 	*(tbin->avail - tbin->ncached) = ptr;
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/tsd.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/tsd.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/tsd.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/tsd.h	2018-08-07 14:12:36.000000000 +0000
@@ -564,6 +564,9 @@
 {									\
 	a_name##tsd_wrapper_t *wrapper;					\
 									\
+
+
+
 	assert(a_name##tsd_booted);					\
 	wrapper = a_name##tsd_wrapper_get(true);			\
 	wrapper->val = *(val);						\
@@ -694,8 +697,9 @@
 
 	if (!init && tsd_get_allocates() && tsd == NULL)
 		return (NULL);
-	assert(tsd != NULL);
 
+	if (unlikely(tsd == NULL))
+		return (NULL)
 	if (unlikely(tsd->state != tsd_state_nominal)) {
 		if (tsd->state == tsd_state_uninitialized) {
 			tsd->state = tsd_state_nominal;
@@ -704,8 +708,10 @@
 		} else if (tsd->state == tsd_state_purgatory) {
 			tsd->state = tsd_state_reincarnated;
 			tsd_set(tsd);
-		} else
-			assert(tsd->state == tsd_state_reincarnated);
+		} else {
+			if (unlikely(tsd->state != tsd_state_reincarnated))
+				return (NULL);
+		}
 	}
 
 	return (tsd);
@@ -777,9 +783,8 @@
 JEMALLOC_ALWAYS_INLINE tsd_t *
 tsdn_tsd(tsdn_t *tsdn)
 {
-
-	assert(!tsdn_null(tsdn));
-
+	if (unlikely(tsdn_null(tsdn)))
+		return (NULL);
 	return (&tsdn->tsd);
 }
 #endif
diff -Nru radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/util.h radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/util.h
--- radare2-2.3.0+dfsg/shlr/heap/include/r_jemalloc/internal/util.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/heap/include/r_jemalloc/internal/util.h	2018-08-07 14:12:36.000000000 +0000
@@ -33,6 +33,11 @@
 #  define FMTxPTR PRIxPTR
 #endif
 
+/* NOTE: This file was left out of correcting assert() with error handling */
+/* since it provides rather complex math functions and returning an error might */
+/* break compatability. */
+/* ~Debily */
+
 /* Size of stack-allocated buffer passed to buferror(). */
 #define	BUFERROR_BUF		64
 
diff -Nru radare2-2.3.0+dfsg/shlr/java/class.c radare2-2.8.0+dfsg/shlr/java/class.c
--- radare2-2.3.0+dfsg/shlr/java/class.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/java/class.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* Apache 2.0 - Copyright 2007-2017 - pancake and dso
+/* Apache 2.0 - Copyright 2007-2018 - pancake and dso
    class.c rewrite: Adam Pridgen <dso@rice.edu || adam.pridgen@thecoverofnight.com>
  */
 #include <stdio.h>
@@ -131,7 +131,7 @@
 R_API void r_bin_java_signature_attr_free(void /*RBinJavaAttrInfo*/ *attr);
 R_API void r_bin_java_source_debug_attr_free(void /*RBinJavaAttrInfo*/ *attr);
 R_API void r_bin_java_element_value_free(void /*RBinJavaElementValue*/ *element_value);
-R_API void r_bin_java_element_pair_free(void /*RBinJavaElementValuePair*/ *ev_pair);
+R_API void r_bin_java_element_pair_free(void /*RBinJavaElementValuePair*/ *evp);
 R_API void r_bin_java_annotation_free(void /*RBinJavaAnnotation*/ *annotation);
 R_API void r_bin_java_rtv_annotations_attr_free(void /*RBinJavaAttrInfo*/ *attr);
 R_API void r_bin_java_rti_annotations_attr_free(void /*RBinJavaAttrInfo*/ *attr);
@@ -160,7 +160,7 @@
 R_API void r_bin_java_print_source_debug_attr_summary(RBinJavaAttrInfo *attr);
 R_API void r_bin_java_print_element_value_summary(RBinJavaElementValue *element_value);
 R_API void r_bin_java_print_annotation_summary(RBinJavaAnnotation *annotation);
-R_API void r_bin_java_print_element_pair_summary(RBinJavaElementValuePair *ev_pair);
+R_API void r_bin_java_print_element_pair_summary(RBinJavaElementValuePair *evp);
 R_API void r_bin_java_print_bootstrap_methods_attr_summary(RBinJavaAttrInfo *attr);
 // R_API void r_bin_java_bootstrap_method_summary(RBinJavaBootStrapMethod *bsm);
 // R_API void r_bin_java_bootstrap_method_argument_summary(RBinJavaBootStrapArgument *bsm_arg);
@@ -231,7 +231,7 @@
 R_API ut64 r_bin_java_stack_map_table_attr_calc_size(RBinJavaAttrInfo *attr);
 R_API ut64 r_bin_java_synthetic_attr_calc_size(RBinJavaAttrInfo *attr);
 R_API ut64 r_bin_java_bootstrap_method_calc_size(RBinJavaBootStrapMethod *bsm);
-R_API ut64 r_bin_java_element_pair_calc_size(RBinJavaElementValuePair *ev_pair);
+R_API ut64 r_bin_java_element_pair_calc_size(RBinJavaElementValuePair *evp);
 R_API ut64 r_bin_java_element_value_calc_size(RBinJavaElementValue *element_value);
 
 R_API ut64 r_bin_java_unknown_cp_calc_size(RBinJavaCPTypeObj *obj);
@@ -1359,20 +1359,16 @@
 	const ut8 *f_buf = buf + offset;
 	ut64 adv = 0;
 	RBinJavaCPTypeObj *item = NULL;
-	RBinJavaField *method;
-	if (bin == NULL) {
+	if (!bin || offset + 8 >= len) {
 		return NULL;
 	}
-	if (offset + 8 >= len) {
-		return NULL;
-	}
-	method = (RBinJavaField *) R_NEW0 (RBinJavaField);
-	if (method == NULL) {
+	RBinJavaField *method = (RBinJavaField *) R_NEW0 (RBinJavaField);
+	if (!method) {
 		eprintf ("Unable to allocate memory for method information\n");
 		return NULL;
 	}
 	method->metas = (RBinJavaMetaInfo *) R_NEW0 (RBinJavaMetaInfo);
-	if (method->metas == NULL) {
+	if (!method->metas) {
 		eprintf ("Unable to allocate memory for meta information\n");
 		free (method);
 		return NULL;
@@ -1392,7 +1388,7 @@
 	item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
 	method->name = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) (method->name_idx));
 	IFDBG eprintf("Method name_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *)item->metas->type_info)->name, method->name);
-	if (method->name == NULL) {
+	if (!method->name) {
 		method->name = (char *) malloc (21);
 		snprintf ((char *) method->name, 20, "sym.method_%08x", method->metas->ord);
 		IFDBG eprintf("r_bin_java_read_next_method: Unable to find the name for 0x%02x index.\n", method->name_idx);
@@ -1401,7 +1397,7 @@
 	item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
 	method->descriptor = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) method->descriptor_idx);
 	IFDBG eprintf("Method descriptor_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *)item->metas->type_info)->name, method->descriptor);
-	if (method->descriptor == NULL) {
+	if (!method->descriptor) {
 		method->descriptor = r_str_dup (NULL, "NULL");
 		IFDBG eprintf("r_bin_java_read_next_method: Unable to find the descriptor for 0x%02x index.\n", method->descriptor_idx);
 	}
@@ -1414,7 +1410,7 @@
 		method->class_name = r_bin_java_get_item_name_from_bin_cp_list (bin, item);
 		IFDBG eprintf("Method requesting ref_cp_obj the following which is: ord: %d, name: %s\n", method->field_ref_cp_obj->metas->ord, ((RBinJavaCPTypeMetas *)method->field_ref_cp_obj->metas->type_info)->name);
 		IFDBG eprintf("MethodRef class name resolves to: %s\n", method->class_name);
-		if (method->class_name == NULL) {
+		if (!method->class_name) {
 			method->class_name = r_str_dup (NULL, "NULL");
 		}
 	} else {
@@ -1462,20 +1458,16 @@
 	RBinJavaCPTypeObj *item = NULL;
 	const ut8 *f_buf = buffer + offset;
 	ut64 adv = 0;
-	RBinJavaField *field;
-	if (bin == NULL) {
-		return NULL;
-	}
-	if (offset + 8 >= len) {
+	if (!bin || offset + 8 >= len) {
 		return NULL;
 	}
-	field = (RBinJavaField *) R_NEW0 (RBinJavaField);
-	if (field == NULL) {
+	RBinJavaField *field = (RBinJavaField *) R_NEW0 (RBinJavaField);
+	if (!field) {
 		eprintf ("Unable to allocate memory for field information\n");
 		return NULL;
 	}
 	field->metas = (RBinJavaMetaInfo *) R_NEW0 (RBinJavaMetaInfo);
-	if (field->metas == NULL) {
+	if (!field->metas) {
 		eprintf ("Unable to allocate memory for meta information\n");
 		free (field);
 		return NULL;
@@ -1496,7 +1488,7 @@
 	item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
 	field->name = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) (field->name_idx));
 	IFDBG eprintf("Field name_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *)item->metas->type_info)->name, field->name);
-	if (field->name == NULL) {
+	if (!field->name) {
 		field->name = (char *) malloc (21);
 		snprintf ((char *) field->name, 20, "sym.field_%08x", field->metas->ord);
 		IFDBG eprintf("r_bin_java_read_next_field: Unable to find the name for 0x%02x index.\n", field->name_idx);
@@ -1505,7 +1497,7 @@
 	item = r_bin_java_get_item_from_bin_cp_list (bin, idx);
 	field->descriptor = r_bin_java_get_utf8_from_bin_cp_list (bin, (ut32) field->descriptor_idx);
 	IFDBG eprintf("Field descriptor_idx: %d, which is: ord: %d, name: %s, value: %s\n", idx, item->metas->ord, ((RBinJavaCPTypeMetas *)item->metas->type_info)->name, field->descriptor);
-	if (field->descriptor == NULL) {
+	if (!field->descriptor) {
 		field->descriptor = r_str_dup (NULL, "NULL");
 		IFDBG eprintf("r_bin_java_read_next_field: Unable to find the descriptor for 0x%02x index.\n", field->descriptor_idx);
 	}
@@ -1518,7 +1510,7 @@
 		field->class_name = r_bin_java_get_item_name_from_bin_cp_list (bin, item);
 		IFDBG eprintf("Field requesting ref_cp_obj the following which is: ord: %d, name: %s\n", field->field_ref_cp_obj->metas->ord, ((RBinJavaCPTypeMetas *)field->field_ref_cp_obj->metas->type_info)->name);
 		IFDBG eprintf("FieldRef class name resolves to: %s\n", field->class_name);
-		if (field->class_name == NULL) {
+		if (!field->class_name) {
 			field->class_name = r_str_dup (NULL, "NULL");
 		}
 	} else {
@@ -1573,7 +1565,7 @@
 		memcpy (clone_obj, obj, sizeof (RBinJavaCPTypeObj));
 		clone_obj->metas = (RBinJavaMetaInfo *) R_NEW0 (RBinJavaMetaInfo);
 		clone_obj->metas->type_info = (void *) &R_BIN_JAVA_CP_METAS[clone_obj->tag];
-		clone_obj->name = strdup (obj->name);
+		clone_obj->name = strdup (obj->name? obj->name: "unk");
 		if (obj->tag == R_BIN_JAVA_CP_UTF8) {
 			clone_obj->info.cp_utf8.bytes = (ut8 *) malloc (obj->info.cp_utf8.length + 1);
 			if (clone_obj->info.cp_utf8.bytes) {
@@ -1763,10 +1755,7 @@
 	@param obj object to look up the name for
 	@rvalue char* (user frees) or NULL
 	*/
-	if (bin == NULL) {
-		return NULL;
-	}
-	return r_bin_java_get_item_desc_from_cp_item_list (bin->cp_list, obj, MAX_CPITEMS);
+	return bin? r_bin_java_get_item_desc_from_cp_item_list (bin->cp_list, obj, MAX_CPITEMS): NULL;
 }
 
 R_API char *r_bin_java_get_utf8_from_cp_item_list(RList *cp_list, ut64 idx) {
@@ -1778,15 +1767,14 @@
 	*/
 	char *value = NULL;
 	RListIter *iter;
-	RBinJavaCPTypeObj *item = NULL;
-	if (cp_list == NULL) {
+	if (!cp_list) {
 		return NULL;
 	}
-	item = (RBinJavaCPTypeObj *) r_list_get_n (cp_list, idx);
+	RBinJavaCPTypeObj *item = (RBinJavaCPTypeObj *) r_list_get_n (cp_list, idx);
 	if (item && item->tag == R_BIN_JAVA_CP_UTF8 && item->metas->ord == idx) {
 		value = convert_string ((const char *) item->info.cp_utf8.bytes, item->info.cp_utf8.length);
 	}
-	if (value == NULL) {
+	if (!value) {
 		r_list_foreach (cp_list, iter, item) {
 			if (item && (item->tag == R_BIN_JAVA_CP_UTF8) && item->metas->ord == idx) {
 				value = convert_string ((const char *) item->info.cp_utf8.bytes, item->info.cp_utf8.length);
@@ -1806,11 +1794,10 @@
 	*/
 	ut32 value = -1;
 	RListIter *iter;
-	RBinJavaCPTypeObj *item = NULL;
-	if (cp_list == NULL) {
+	if (!cp_list) {
 		return 0;
 	}
-	item = (RBinJavaCPTypeObj *) r_list_get_n (cp_list, idx);
+	RBinJavaCPTypeObj *item = (RBinJavaCPTypeObj *) r_list_get_n (cp_list, idx);
 	if (item && (item->tag == R_BIN_JAVA_CP_UTF8) && item->metas->ord == idx) {
 		value = item->info.cp_utf8.length;
 	}
@@ -2070,11 +2057,9 @@
 
 R_API RBinJavaAttrInfo *r_bin_java_read_next_attr_from_buffer(ut8 *buffer, st64 sz, st64 buf_offset) {
 	RBinJavaAttrInfo *attr = NULL;
-	char *name = NULL;
 	ut64 offset = 0;
 	ut16 name_idx;
 	st64 nsz;
-	RBinJavaAttrMetas *type_info = NULL;
 
 	if (!buffer || ((int) sz) < 4 || buf_offset < 0) {
 		eprintf ("r_bin_Java_read_next_attr_from_buffer: invalid buffer size %d\n", (int) sz);
@@ -2084,12 +2069,13 @@
 	offset += 2;
 	nsz = R_BIN_JAVA_UINT (buffer, offset);
 	offset += 4;
-	name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, name_idx);
+
+	char *name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, name_idx);
 	if (!name) {
 		name = strdup ("unknown");
 	}
 	IFDBG eprintf("r_bin_java_read_next_attr: name_idx = %d is %s\n", name_idx, name);
-	type_info = r_bin_java_get_attr_type_by_name (name);
+	RBinJavaAttrMetas *type_info = r_bin_java_get_attr_type_by_name (name);
 	if (type_info) {
 		IFDBG eprintf("Typeinfo: %s, was %s\n", type_info->name, name);
 		// printf ("SZ %d %d %d\n", nsz, sz, buf_offset);
@@ -2419,7 +2405,7 @@
 			if (addr) {
 				addr->vaddr = addr->paddr = \
 					r_bin_java_get_method_code_offset (fm_type) + bin->loadaddr;
-				addr->haddr = fm_type->file_offset;
+				addr->hpaddr = fm_type->file_offset;
 				r_list_append (ret, addr);
 			}
 		}
@@ -2543,7 +2529,7 @@
 		sym->name = strdup (fm_type->name);
 		// strncpy (sym->type, fm_type->descriptor, R_BIN_SIZEOF_STRINGS);
 		if (fm_type->type == R_BIN_JAVA_FIELD_TYPE_METHOD) {
-			sym->type = r_str_const ("FUNC");
+			sym->type = r_str_const (R_BIN_TYPE_FUNC_STR);
 			sym->paddr = r_bin_java_get_method_code_offset (fm_type);
 			sym->vaddr = r_bin_java_get_method_code_offset (fm_type) + baddr;
 			sym->size = r_bin_java_get_method_code_size (fm_type);
@@ -2554,11 +2540,11 @@
 			sym->size = fm_type->size;
 		}
 		if (r_bin_java_is_fm_type_protected (fm_type)) {
-			sym->bind = r_str_const ("LOCAL");
+			sym->bind = r_str_const (R_BIN_BIND_LOCAL_STR);
 		} else if (r_bin_java_is_fm_type_private (fm_type)) {
-			sym->bind = r_str_const ("LOCAL");
+			sym->bind = r_str_const (R_BIN_BIND_LOCAL_STR);
 		} else if (r_bin_java_is_fm_type_protected (fm_type)) {
-			sym->bind = r_str_const ("GLOBAL");
+			sym->bind = r_str_const (R_BIN_BIND_GLOBAL_STR);
 		}
 		sym->forwarder = r_str_const ("NONE");
 		if (fm_type->class_name) {
@@ -2590,11 +2576,11 @@
 		sym->type = r_str_const ("FIELD_META");
 	}
 	if (r_bin_java_is_fm_type_protected (fm_type)) {
-		sym->bind = r_str_const ("LOCAL");
+		sym->bind = r_str_const (R_BIN_BIND_LOCAL_STR);
 	} else if (r_bin_java_is_fm_type_private (fm_type)) {
-		sym->bind = r_str_const ("LOCAL");
+		sym->bind = r_str_const (R_BIN_BIND_LOCAL_STR);
 	} else if (r_bin_java_is_fm_type_protected (fm_type)) {
-		sym->bind = r_str_const ("GLOBAL");
+		sym->bind = r_str_const (R_BIN_BIND_GLOBAL_STR);
 	}
 	sym->forwarder = r_str_const ("NONE");
 	if (fm_type->class_name) {
@@ -2664,7 +2650,7 @@
 			strcpy (section->name, "constant_pool");
 			section->size = bin->cp_size;
 			section->paddr = bin->cp_offset + baddr;
-			section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+			section->srwx = R_BIN_SCN_READABLE;
 			section->add = true;
 			r_list_append (sections, section);
 		}
@@ -2676,7 +2662,7 @@
 			strcpy (section->name, "fields");
 			section->size = bin->fields_size;
 			section->paddr = bin->fields_offset + baddr;
-			section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+			section->srwx = R_BIN_SCN_READABLE;
 			section->add = true;
 			r_list_append (sections, section);
 			section = NULL;
@@ -2689,7 +2675,7 @@
 					snprintf (section->name, R_BIN_SIZEOF_STRINGS, "attrs.%s", fm_type->name);
 					section->size = fm_type->size - (fm_type->file_offset - fm_type->attr_offset);
 					section->paddr = fm_type->attr_offset + baddr;
-					section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+					section->srwx = R_BIN_SCN_READABLE;
 					section->add = true;
 					r_list_append (sections, section);
 				}
@@ -2702,7 +2688,7 @@
 			strcpy (section->name, "methods");
 			section->size = bin->methods_size;
 			section->paddr = bin->methods_offset + baddr;
-			section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE | R_BIN_SCN_MAP;
+			section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_EXECUTABLE;
 			section->add = true;
 			r_list_append (sections, section);
 			section = NULL;
@@ -2715,7 +2701,7 @@
 					snprintf (section->name, R_BIN_SIZEOF_STRINGS, "attrs.%s", fm_type->name);
 					section->size = fm_type->size - (fm_type->file_offset - fm_type->attr_offset);
 					section->paddr = fm_type->attr_offset + baddr;
-					section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+					section->srwx = R_BIN_SCN_READABLE;
 					section->add = true;
 					r_list_append (sections, section);
 				}
@@ -2728,7 +2714,7 @@
 			strcpy (section->name, "interfaces");
 			section->size = bin->interfaces_size;
 			section->paddr = bin->interfaces_offset + baddr;
-			section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+			section->srwx = R_BIN_SCN_READABLE;
 			section->add = true;
 			r_list_append (sections, section);
 		}
@@ -2740,7 +2726,7 @@
 			strcpy (section->name, "attributes");
 			section->size = bin->attrs_size;
 			section->paddr = bin->attrs_offset + baddr;
-			section->srwx = R_BIN_SCN_READABLE | R_BIN_SCN_MAP;
+			section->srwx = R_BIN_SCN_READABLE;
 			section->add = true;
 			r_list_append (sections, section);
 		}
@@ -2942,7 +2928,7 @@
 	char *name = r_bin_java_get_name_from_bin_cp_list (bin, obj->info.cp_method.name_and_type_idx);
 	char *descriptor = r_bin_java_get_desc_from_bin_cp_list (bin, obj->info.cp_method.name_and_type_idx);
 	class_name = class_name ? class_name : strdup ("INVALID CLASS NAME INDEX");
-	name = name ? name : strdup ("INVALID NAME INDEX");
+	name = name ? name : strdup ("InvalidNameIndex");
 	descriptor = descriptor ? descriptor : strdup ("INVALID DESCRIPTOR INDEX");
 	imp->classname = class_name;
 	imp->name = name;
@@ -3119,7 +3105,12 @@
 	RBinJavaAttrInfo *attr = a;
 	if (attr) {
 		IFDBG eprintf("Deleting attr %s, %p\n", attr->name, attr);
-		((RBinJavaAttrMetas *) attr->metas->type_info)->allocs->delete_obj (attr);
+		if (attr && attr->metas && attr->metas->type_info && attr->metas->type_info) {
+			RBinJavaAttrMetas *a = attr->metas->type_info;
+			if (a && a->allocs && a->allocs->delete_obj) {
+				a->allocs->delete_obj (attr);
+			}
+		}
 		// free (attr->metas);
 		// free (attr);
 	}
@@ -3367,7 +3358,8 @@
 }
 
 R_API ut64 r_bin_java_code_attr_calc_size(RBinJavaAttrInfo *attr) {
-	RListIter *iter, *iter_tmp;
+	RListIter *iter;
+	// RListIter *iter_tmp;
 	ut64 size = 0;
 	if (attr) {
 		// attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
@@ -3383,8 +3375,9 @@
 		}
 		// attr->info.code_attr.exception_table_length =  R_BIN_JAVA_USHORT (buffer, offset);
 		size += 2;
-		RBinJavaExceptionEntry *exc_entry;
-		r_list_foreach_safe (attr->info.code_attr.exception_table, iter, iter_tmp, exc_entry) {
+		// RBinJavaExceptionEntry *exc_entry;
+		// r_list_foreach_safe (attr->info.code_attr.exception_table, iter, iter_tmp, exc_entry) {
+		r_list_foreach_iter (attr->info.code_attr.exception_table, iter) {
 			// exc_entry->start_pc = R_BIN_JAVA_USHORT (buffer,offset);
 			size += 2;
 			// exc_entry->end_pc = R_BIN_JAVA_USHORT (buffer,offset);
@@ -3396,9 +3389,10 @@
 		}
 		// attr->info.code_attr.attributes_count = R_BIN_JAVA_USHORT (buffer, offset);
 		size += 2;
-		RBinJavaAttrInfo *_attr;
+		// RBinJavaAttrInfo *_attr;
 		if (attr->info.code_attr.attributes_count > 0) {
-			r_list_foreach_safe (attr->info.code_attr.attributes, iter, iter_tmp, _attr) {
+			// r_list_foreach_safe (attr->info.code_attr.attributes, iter, iter_tmp, _attr) {
+			r_list_foreach_iter (attr->info.code_attr.attributes, iter) {
 				size += r_bin_java_attr_calc_size (attr);
 			}
 		}
@@ -3429,7 +3423,7 @@
 	// BUG: possible unsigned integer overflow here
 	attr->info.code_attr.code_offset = buf_offset + offset;
 	attr->info.code_attr.code = (ut8 *) malloc (attr->info.code_attr.code_length);
-	if (attr->info.code_attr.code == NULL) {
+	if (!attr->info.code_attr.code) {
 		eprintf ("Handling Code Attributes: Unable to allocate memory "
 			"(%u bytes) for a code.\n", attr->info.code_attr.code_length);
 		return attr;
@@ -3586,7 +3580,7 @@
 R_API RBinJavaAttrInfo *r_bin_java_enclosing_methods_attr_new(ut8 *buffer, ut64 sz, ut64 buf_offset) {
 	ut64 offset = 6;
 	RBinJavaAttrInfo *attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
-	if (!attr) {
+	if (!attr || sz < 10) {
 		return NULL;
 	}
 	attr->type = R_BIN_JAVA_ATTR_TYPE_ENCLOSING_METHOD_ATTR;
@@ -3626,10 +3620,12 @@
 	ut32 i = 0, offset = 0;
 	ut64 size;
 	RBinJavaAttrInfo *attr = NULL;
+	if (sz < 8) {
+		return NULL;
+	}
 	attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
 	offset += 6;
-	if (attr == NULL) {
-		// TODO eprintf
+	if (!attr) {
 		return attr;
 	}
 	attr->type = R_BIN_JAVA_ATTR_TYPE_LINE_NUMBER_TABLE_ATTR;
@@ -3646,6 +3642,9 @@
 		return NULL;
 	}
 	for (i = 0; i < attr->info.exceptions_attr.number_of_exceptions; i++) {
+		if (offset + 2 > sz) {
+			break;
+		}
 		attr->info.exceptions_attr.exception_idx_table[i] = R_BIN_JAVA_USHORT (buffer, offset);
 		offset += 2;
 	}
@@ -3684,6 +3683,10 @@
 	attr->info.inner_classes_attr.classes = r_list_newf (r_bin_java_inner_classes_attr_entry_free);
 	for (i = 0; i < attr->info.inner_classes_attr.number_of_classes; i++) {
 		curpos = buf_offset + offset;
+		if (offset + 8 > sz) {
+			eprintf ("Invalid amount of inner classes\n");
+			break;
+		}
 		icattr = R_NEW0 (RBinJavaClassesAttribute);
 		if (!icattr) {
 			break;
@@ -3705,15 +3708,16 @@
 			eprintf ("BINCPLIS IS HULL %d\n", icattr->inner_name_idx);
 		}
 		icattr->name = r_bin_java_get_item_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, obj);
-		if (icattr->name == NULL) {
+		if (!icattr->name) {
 			obj = r_bin_java_get_item_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, icattr->inner_class_info_idx);
 			if (!obj) {
 				eprintf ("BINCPLIST IS NULL %d\n", icattr->inner_class_info_idx);
 			}
 			icattr->name = r_bin_java_get_item_name_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, obj);
-			if (icattr->name == NULL) {
+			if (!icattr->name) {
 				icattr->name = r_str_dup (NULL, "NULL");
 				eprintf ("r_bin_java_inner_classes_attr: Unable to find the name for %d index.\n", icattr->inner_name_idx);
+				break;
 			}
 		}
 
@@ -3769,10 +3773,6 @@
 
 	ut32 linenum_len = attr->info.line_number_table_attr.line_number_table_length;
 	RList *linenum_list = attr->info.line_number_table_attr.line_number_table;
-	if (linenum_len > sz) {
-		free (attr);
-		return NULL;
-	}
 	for (i = 0; i < linenum_len; i++) {
 		curpos = buf_offset + offset;
 		// printf ("%llx %llx \n", curpos, sz);
@@ -3781,6 +3781,10 @@
 		if (!lnattr) {
 			break;
 		}
+		// wtf it works
+		if (offset - 2 > sz) {
+			break;
+		}
 		lnattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
 		offset += 2;
 		lnattr->line_number = R_BIN_JAVA_USHORT (buffer, offset);
@@ -3795,12 +3799,14 @@
 
 R_API ut64 r_bin_java_line_number_table_attr_calc_size(RBinJavaAttrInfo *attr) {
 	ut64 size = 6;
-	RBinJavaLineNumberAttribute *lnattr;
-	RListIter *iter, *iter_tmp;
+	// RBinJavaLineNumberAttribute *lnattr;
+	RListIter *iter;
+	// RListIter *iter_tmp;
 	if (!attr) {
 		return 0LL;
 	}
-	r_list_foreach_safe (attr->info.line_number_table_attr.line_number_table, iter, iter_tmp, lnattr) {
+	// r_list_foreach_safe (attr->info.line_number_table_attr.line_number_table, iter, iter_tmp, lnattr) {
+	r_list_foreach_iter (attr->info.line_number_table_attr.line_number_table, iter) {
 		// lnattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
 		size += 2;
 		// lnattr->line_number = R_BIN_JAVA_USHORT (buffer, offset);
@@ -3852,14 +3858,15 @@
 	ut64 size = 0;
 	// ut64 offset = 0;
 	RListIter *iter;
-	RBinJavaLocalVariableAttribute *lvattr;
+	// RBinJavaLocalVariableAttribute *lvattr;
 	if (!attr) {
 		return 0LL;
 	}
 	size += 6;
 	// attr->info.local_variable_table_attr.table_length = R_BIN_JAVA_USHORT (buffer, offset);
 	size += 2;
-	r_list_foreach (attr->info.local_variable_table_attr.local_variable_table, iter, lvattr) {
+	// r_list_foreach (attr->info.local_variable_table_attr.local_variable_table, iter, lvattr) {
+	r_list_foreach_iter (attr->info.local_variable_table_attr.local_variable_table, iter) {
 		// lvattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
 		size += 2;
 		// lvattr->length = R_BIN_JAVA_USHORT (buffer, offset);
@@ -3927,7 +3934,7 @@
 }
 
 R_API ut64 r_bin_java_local_variable_type_table_attr_calc_size(RBinJavaAttrInfo *attr) {
-	RBinJavaLocalVariableTypeAttribute *lvattr;
+	// RBinJavaLocalVariableTypeAttribute *lvattr;
 	RListIter *iter;
 	ut64 size = 0;
 	if (attr) {
@@ -3935,7 +3942,8 @@
 		size += 6;
 		// attr->info.local_variable_type_table_attr.table_length = R_BIN_JAVA_USHORT (buffer, offset);
 		size += 2;
-		r_list_foreach (list, iter, lvattr) {
+		// r_list_foreach (list, iter, lvattr) {
+		r_list_foreach_iter (list, iter) {
 			// lvattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
 			size += 2;
 			// lvattr->length = R_BIN_JAVA_USHORT (buffer, offset);
@@ -3970,6 +3978,10 @@
 			perror ("calloc");
 			break;
 		}
+		if (offset + 10 > sz) {
+			eprintf ("oob");
+			break;
+		}
 		lvattr->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
 		offset += 2;
 		lvattr->length = R_BIN_JAVA_USHORT (buffer, offset);
@@ -4309,6 +4321,9 @@
 		// copy_type_info_to_stack_frame_list_up_to_idx (p_frame->local_items, stack_frame->local_items, idx);
 		// 4. Read off the rest of the appended locals types
 		for (i = 0; i < k; i++) {
+			if (offset >= sz) {
+				break;
+			}
 			IFDBG eprintf("r_bin_java_stack_map_frame_new: Parsing verifying the k'th frame: %d of %d.\n", i, k);
 			se = r_bin_java_read_from_buffer_verification_info_new (buffer + offset, sz - offset, buf_offset + offset);
 			IFDBG eprintf("r_bin_java_stack_map_frame_new: Completed Parsing\n");
@@ -4343,6 +4358,9 @@
 		IFDBG r_bin_java_print_stack_map_frame_summary(stack_frame);
 		// read the number of locals off the stack
 		for (i = 0; i < stack_frame->number_of_locals; i++) {
+			if (offset >= sz) {
+				break;
+			}
 			se = r_bin_java_read_from_buffer_verification_info_new (buffer + offset, sz - offset, buf_offset + offset);
 			if (se) {
 				offset += se->size;
@@ -4360,6 +4378,9 @@
 		// IFDBG eprintf ("r_bin_java_stack_map_frame_new: Max ustack items > 65535, read(%d byte(s)), number_of_locals = 0x%08x.\n", var_sz, stack_frame->number_of_stack_items);
 		// read the stack items
 		for (i = 0; i < stack_frame->number_of_stack_items; i++) {
+			if (offset >= sz) {
+				break;
+			}
 			se = r_bin_java_read_from_buffer_verification_info_new (buffer + offset, sz - offset, buf_offset + offset);
 			if (se) {
 				offset += se->size;
@@ -4499,6 +4520,9 @@
 	ut64 offset = 0;
 	RBinJavaStackMapFrame *stack_frame = NULL, *new_stack_frame = NULL;
 	RBinJavaAttrInfo *attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
+	if (sz < 10) {
+		return NULL;
+	}
 	offset += 6;
 	IFDBG eprintf("r_bin_java_stack_map_table_attr_new: New stack map allocated.\n");
 	if (!attr) {
@@ -4519,7 +4543,7 @@
 			stack_frame = R_BIN_JAVA_GLOBAL_BIN->current_code_attr->info.code_attr.implicit_frame;
 		}
 		IFDBG eprintf("Reading StackMap Entry #%d @ 0x%08"PFMT64x ", current stack_frame: %p\n", i, buf_offset + offset, stack_frame);
-		if (offset > sz) {
+		if (offset >= sz) {
 			r_bin_java_stack_map_table_attr_free (attr);
 			return NULL;
 		}
@@ -4844,7 +4868,6 @@
 		return NULL;
 	}
 	if ((obj = R_NEW0 (RBinJavaCPTypeObj))) {
-		memset (obj, 0, sizeof (RBinJavaCPTypeObj));
 		obj->tag = tag;
 		obj->metas = R_NEW0 (RBinJavaMetaInfo);
 		obj->metas->type_info = (void *) &R_BIN_JAVA_CP_METAS[tag];
@@ -6197,43 +6220,48 @@
 }
 
 R_API RBinJavaElementValuePair *r_bin_java_element_pair_new(ut8 *buffer, ut64 sz, ut64 buf_offset) {
-	RBinJavaElementValuePair *ev_pair = NULL;
-	ut64 offset = 0;
-	if (!buffer) {
+	if (!buffer || sz < 4) {
 		return NULL;
 	}
-	ev_pair = R_NEW0 (RBinJavaElementValuePair);
-	if (!ev_pair) {
-		// TODO eprintf ev_pair failed to allocate
+	RBinJavaElementValuePair *evp = R_NEW0 (RBinJavaElementValuePair);
+	if (!evp) {
 		return NULL;
 	}
-	// TODO: What is the signifigance of ev_pair element
-	ev_pair->element_name_idx = R_BIN_JAVA_USHORT (buffer, offset);
-	offset += 2;
-	ev_pair->file_offset = buf_offset;
-	ev_pair->name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, ev_pair->element_name_idx);
-	if (ev_pair->name == NULL) {
+	// TODO: What is the signifigance of evp element
+	evp->element_name_idx = R_BIN_JAVA_USHORT (buffer, 0);
+	ut64 offset = 2;
+	evp->file_offset = buf_offset;
+	evp->name = r_bin_java_get_utf8_from_bin_cp_list (R_BIN_JAVA_GLOBAL_BIN, evp->element_name_idx);
+	if (!evp->name) {
 		// TODO: eprintf unable to find the name for the given index
 		eprintf ("ElementValue Name is invalid.\n");
-		ev_pair->name = strdup ("UNKNOWN");
+		evp->name = strdup ("UNKNOWN");
+	}
+	if (offset >= sz) {
+		free (evp);
+		return NULL;
 	}
-	ev_pair->value = r_bin_java_element_value_new (buffer + offset, sz - offset, buf_offset + offset);
-	offset += ev_pair->value->size;
-	ev_pair->size = offset;
-	return ev_pair;
+	evp->value = r_bin_java_element_value_new (buffer + offset, sz - offset, buf_offset + offset);
+	offset += evp->value->size;
+	if (offset >= sz) {
+		free (evp->value);
+		return NULL;
+	}
+	evp->size = offset;
+	return evp;
 }
 
-R_API void r_bin_java_print_element_pair_summary(RBinJavaElementValuePair *ev_pair) {
-	if (!ev_pair) {
+R_API void r_bin_java_print_element_pair_summary(RBinJavaElementValuePair *evp) {
+	if (!evp) {
 		eprintf ("Attempting to print an invalid RBinJavaElementValuePair *pair.\n");
 		return;
 	}
 	Eprintf ("Element Value Pair information:\n");
-	Eprintf ("  EV Pair File Offset: 0x%08"PFMT64x "\n", ev_pair->file_offset);
-	Eprintf ("  EV Pair Element Name index: 0x%02x\n", ev_pair->element_name_idx);
-	Eprintf ("  EV Pair Element Name: %s\n", ev_pair->name);
+	Eprintf ("  EV Pair File Offset: 0x%08"PFMT64x "\n", evp->file_offset);
+	Eprintf ("  EV Pair Element Name index: 0x%02x\n", evp->element_name_idx);
+	Eprintf ("  EV Pair Element Name: %s\n", evp->name);
 	Eprintf ("  EV Pair Element Value:\n");
-	r_bin_java_print_element_value_summary (ev_pair->value);
+	r_bin_java_print_element_value_summary (evp->value);
 }
 
 R_API void r_bin_java_print_element_value_summary(RBinJavaElementValue *element_value) {
@@ -6241,7 +6269,7 @@
 	RBinJavaElementValue *ev_element = NULL;
 	RListIter *iter = NULL, *iter_tmp = NULL;
 	char *name;
-	if (element_value == NULL) {
+	if (!element_value) {
 		eprintf ("Attempting to print an invalid RBinJavaElementValuePair *pair.\n");
 		return;
 	}
@@ -6262,23 +6290,31 @@
 		eprintf ("   EV Value Constant Value index: 0x%02x\n", element_value->value.const_value.const_value_idx);
 		eprintf ("   EV Value Constant Value Information:\n");
 		obj = element_value->value.const_value.const_value_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		if (obj && obj->metas && obj->metas->type_info) {
+			((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		}
 		break;
 	case R_BIN_JAVA_EV_TAG_ENUM:
 		eprintf ("   EV Value Enum Constant Value Const Name Index: 0x%02x\n", element_value->value.enum_const_value.const_name_idx);
 		eprintf ("   EV Value Enum Constant Value Type Name Index: 0x%02x\n", element_value->value.enum_const_value.type_name_idx);
 		eprintf ("   EV Value Enum Constant Value Const CP Information:\n");
 		obj = element_value->value.enum_const_value.const_name_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		if (obj && obj->metas && obj->metas->type_info) {
+			((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		}
 		eprintf ("   EV Value Enum Constant Value Type CP Information:\n");
 		obj = element_value->value.enum_const_value.type_name_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		if (obj && obj->metas && obj->metas->type_info) {
+			((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		}
 		break;
 	case R_BIN_JAVA_EV_TAG_CLASS:
 		eprintf ("   EV Value Class Info Index: 0x%02x\n", element_value->value.class_value.class_info_idx);
 		eprintf ("   EV Value Class Info CP Information:\n");
 		obj = element_value->value.class_value.class_info_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		if (obj && obj->metas && obj->metas->type_info) {
+			((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->print_summary (obj);
+		}
 		break;
 	case R_BIN_JAVA_EV_TAG_ARRAY:
 		eprintf ("   EV Value Array Value Number of Values: 0x%04x\n", element_value->value.array_value.num_values);
@@ -6298,13 +6334,13 @@
 }
 
 R_API void r_bin_java_element_pair_free(void /*RBinJavaElementValuePair*/ *e) {
-	RBinJavaElementValuePair *ev_pair = e;
-	if (ev_pair) {
-		free (ev_pair->name);
-		r_bin_java_element_value_free (ev_pair->value);
-		free (ev_pair);
+	RBinJavaElementValuePair *evp = e;
+	if (evp) {
+		free (evp->name);
+		r_bin_java_element_value_free (evp->value);
+		free (evp);
 	}
-	ev_pair = NULL;
+	evp = NULL;
 }
 
 R_API void r_bin_java_element_value_free(void /*RBinJavaElementValue*/ *e) {
@@ -6334,7 +6370,12 @@
 			obj = element_value->value.enum_const_value.const_name_cp_obj;
 			((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
 			obj = element_value->value.enum_const_value.type_name_cp_obj;
-			((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
+			if (obj && obj->metas) {
+				RBinJavaCPTypeMetas *tm = obj->metas->type_info;
+				if (tm && tm->allocs && tm->allocs->delete_obj) {
+					tm->allocs->delete_obj (obj);
+				}
+			}
 			break;
 		case R_BIN_JAVA_EV_TAG_CLASS:
 			// Delete the CP Type Object
@@ -6347,7 +6388,7 @@
 				if (ev_element) {
 					r_bin_java_element_value_free (ev_element);
 				} else {
-					// TODO eprintf ev_pairs value was NULL
+					// TODO eprintf evps value was NULL
 				}
 				// r_list_delete (element_value->value.array_value.values, iter);
 				ev_element = NULL;
@@ -6382,7 +6423,7 @@
 	RBinJavaAttrInfo *attr = NULL;
 	attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
 	offset += 6;
-	if (attr) {
+	if (attr && sz >= offset) {
 		attr->type = R_BIN_JAVA_ATTR_TYPE_ANNOTATION_DEFAULT_ATTR;
 		attr->info.annotation_default_attr.default_value = r_bin_java_element_value_new (buffer + offset, sz - offset, buf_offset + offset);
 		if (attr->info.annotation_default_attr.default_value) {
@@ -6393,15 +6434,26 @@
 	return attr;
 }
 
+static void delete_obj(RBinJavaCPTypeObj *obj) {
+	if (obj && obj->metas && obj->metas->type_info) {
+		RBinJavaCPTypeMetas *ti = obj->metas->type_info;
+		if (ti && ti->allocs && ti->allocs->delete_obj) {
+			ti->allocs->delete_obj (obj);
+		}
+	}
+}
+
 R_API void r_bin_java_annotation_default_attr_free(void /*RBinJavaAttrInfo*/ *a) {
 	RBinJavaAttrInfo *attr = a;
-	RBinJavaElementValue *element_value = NULL, *ev_element = NULL;
-	RBinJavaCPTypeObj *obj = NULL;
+	RBinJavaElementValue *ev_element = NULL;
 	RListIter *iter = NULL, *iter_tmp = NULL;
-	if (attr == NULL || attr->type != R_BIN_JAVA_ATTR_TYPE_ANNOTATION_DEFAULT_ATTR) {
+	if (!attr || attr->type != R_BIN_JAVA_ATTR_TYPE_ANNOTATION_DEFAULT_ATTR) {
+		return;
+	}
+	RBinJavaElementValue *element_value = attr->info.annotation_default_attr.default_value;
+	if (!element_value) {
 		return;
 	}
-	element_value = (attr->info.annotation_default_attr.default_value);
 	switch (element_value->tag) {
 	case R_BIN_JAVA_EV_TAG_BYTE:
 	case R_BIN_JAVA_EV_TAG_CHAR:
@@ -6413,20 +6465,15 @@
 	case R_BIN_JAVA_EV_TAG_BOOLEAN:
 	case R_BIN_JAVA_EV_TAG_STRING:
 		// Delete the CP Type Object
-		obj = element_value->value.const_value.const_value_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
+		delete_obj (element_value->value.const_value.const_value_cp_obj);
 		break;
 	case R_BIN_JAVA_EV_TAG_ENUM:
 		// Delete the CP Type Objects
-		obj = element_value->value.enum_const_value.const_name_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
-		obj = element_value->value.enum_const_value.type_name_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
+		delete_obj (element_value->value.enum_const_value.const_name_cp_obj);
 		break;
 	case R_BIN_JAVA_EV_TAG_CLASS:
 		// Delete the CP Type Object
-		obj = element_value->value.class_value.class_info_cp_obj;
-		((RBinJavaCPTypeMetas *) obj->metas->type_info)->allocs->delete_obj (obj);
+		delete_obj (element_value->value.class_value.class_info_cp_obj);
 		break;
 	case R_BIN_JAVA_EV_TAG_ARRAY:
 		// Delete the Element Value array List
@@ -6455,7 +6502,7 @@
 R_API RBinJavaAnnotation *r_bin_java_annotation_new(ut8 *buffer, ut64 sz, ut64 buf_offset) {
 	ut32 i = 0;
 	RBinJavaAnnotation *annotation = NULL;
-	RBinJavaElementValuePair *ev_pairs = NULL;
+	RBinJavaElementValuePair *evps = NULL;
 	ut64 offset = 0;
 	annotation = R_NEW0 (RBinJavaAnnotation);
 	if (!annotation) {
@@ -6470,10 +6517,13 @@
 	annotation->element_value_pairs = r_list_newf (r_bin_java_element_pair_free);
 	// read annotation_value.num_element_value_pairs, and append to annotation_value.element_value_pairs
 	for (i = 0; i < annotation->num_element_value_pairs; i++) {
-		ev_pairs = r_bin_java_element_pair_new (buffer + offset, sz - offset, buf_offset + offset);
-		if (ev_pairs) {
-			offset += ev_pairs->size;
-			r_list_append (annotation->element_value_pairs, (void *) ev_pairs);
+		if (offset > sz) {
+			break;
+		}
+		evps = r_bin_java_element_pair_new (buffer + offset, sz - offset, buf_offset + offset);
+		if (evps) {
+			offset += evps->size;
+			r_list_append (annotation->element_value_pairs, (void *) evps);
 		}
 	}
 	annotation->size = offset;
@@ -6483,7 +6533,7 @@
 R_API ut64 r_bin_java_annotation_calc_size(RBinJavaAnnotation *annotation) {
 	ut64 sz = 0;
 	RListIter *iter, *iter_tmp;
-	RBinJavaElementValuePair *ev_pairs = NULL;
+	RBinJavaElementValuePair *evps = NULL;
 	if (!annotation) {
 		// TODO eprintf allocation fail
 		return sz;
@@ -6492,9 +6542,9 @@
 	sz += 2;
 	// annotation->num_element_value_pairs = R_BIN_JAVA_USHORT (buffer, offset);
 	sz += 2;
-	r_list_foreach_safe (annotation->element_value_pairs, iter, iter_tmp, ev_pairs) {
-		if (ev_pairs) {
-			sz += r_bin_java_element_pair_calc_size (ev_pairs);
+	r_list_foreach_safe (annotation->element_value_pairs, iter, iter_tmp, evps) {
+		if (evps) {
+			sz += r_bin_java_element_pair_calc_size (evps);
 		}
 	}
 	return sz;
@@ -6510,7 +6560,7 @@
 
 R_API void r_bin_java_print_annotation_summary(RBinJavaAnnotation *annotation) {
 	RListIter *iter = NULL, *iter_tmp = NULL;
-	RBinJavaElementValuePair *ev_pair = NULL;
+	RBinJavaElementValuePair *evp = NULL;
 	if (!annotation) {
 		// TODO eprintf invalid annotation
 		return;
@@ -6519,22 +6569,22 @@
 	Eprintf ("  Annotation Number of EV Pairs: 0x%04x\n", annotation->num_element_value_pairs);
 	Eprintf ("  Annotation EV Pair Values:\n");
 	if (annotation->element_value_pairs) {
-		r_list_foreach_safe (annotation->element_value_pairs, iter, iter_tmp, ev_pair) {
-			r_bin_java_print_element_pair_summary (ev_pair);
+		r_list_foreach_safe (annotation->element_value_pairs, iter, iter_tmp, evp) {
+			r_bin_java_print_element_pair_summary (evp);
 		}
 	}
 }
 
-R_API ut64 r_bin_java_element_pair_calc_size(RBinJavaElementValuePair *ev_pair) {
+R_API ut64 r_bin_java_element_pair_calc_size(RBinJavaElementValuePair *evp) {
 	ut64 sz = 0;
-	if (ev_pair == NULL) {
+	if (evp == NULL) {
 		return sz;
 	}
-	// ev_pair->element_name_idx = r_bin_java_read_short(bin, bin->b->cur);
+	// evp->element_name_idx = r_bin_java_read_short(bin, bin->b->cur);
 	sz += 2;
-	// ev_pair->value = r_bin_java_element_value_new (bin, offset+2);
-	if (ev_pair->value) {
-		sz += r_bin_java_element_value_calc_size (ev_pair->value);
+	// evp->value = r_bin_java_element_value_new (bin, offset+2);
+	if (evp->value) {
+		sz += r_bin_java_element_value_calc_size (evp->value);
 	}
 	return sz;
 }
@@ -6542,7 +6592,7 @@
 R_API ut64 r_bin_java_element_value_calc_size(RBinJavaElementValue *element_value) {
 	RListIter *iter, *iter_tmp;
 	RBinJavaElementValue *ev_element;
-	RBinJavaElementValuePair *ev_pairs;
+	RBinJavaElementValuePair *evps;
 	ut64 sz = 0;
 	if (element_value == NULL) {
 		return sz;
@@ -6596,9 +6646,9 @@
 		// element_value->value.annotation_value.num_element_value_pairs = r_bin_java_read_short(bin, bin->b->cur);
 		sz += 2;
 		element_value->value.annotation_value.element_value_pairs = r_list_newf (r_bin_java_element_pair_free);
-		r_list_foreach_safe (element_value->value.annotation_value.element_value_pairs, iter, iter_tmp, ev_pairs) {
-			if (ev_pairs) {
-				sz += r_bin_java_element_pair_calc_size (ev_pairs);
+		r_list_foreach_safe (element_value->value.annotation_value.element_value_pairs, iter, iter_tmp, evps) {
+			if (evps) {
+				sz += r_bin_java_element_pair_calc_size (evps);
 			}
 		}
 		break;
@@ -6616,7 +6666,7 @@
 	if (!element_value) {
 		return NULL;
 	}
-	RBinJavaElementValuePair *ev_pairs = NULL;
+	RBinJavaElementValuePair *evps = NULL;
 	element_value->metas = R_NEW0 (RBinJavaMetaInfo);
 	if (!element_value->metas) {
 		R_FREE (element_value);
@@ -6676,40 +6726,45 @@
 		offset += 2;
 		element_value->value.array_value.values = r_list_new ();
 		for (i = 0; i < element_value->value.array_value.num_values; i++) {
+			if (offset >= sz) {
+				break;
+			}
 			RBinJavaElementValue *ev_element = r_bin_java_element_value_new (buffer + offset, sz - offset, buf_offset + offset);
 			if (ev_element) {
 				element_value->size += ev_element->size;
 				offset += ev_element->size;
-			}
-			// read array_value.num_values, and append to array_value.values
-			r_list_append (element_value->value.array_value.values, (void *) ev_element);
-			if (ev_element == NULL) {
-				// TODO: eprintf error when reading element value
+				// read array_value.num_values, and append to array_value.values
+				r_list_append (element_value->value.array_value.values, (void *) ev_element);
 			}
 		}
 		break;
 	case R_BIN_JAVA_EV_TAG_ANNOTATION:
 		// annotation new is not used here.
 		// (ut16) read and set annotation_value.type_idx;
-		element_value->value.annotation_value.type_idx = R_BIN_JAVA_USHORT (buffer, offset);
-		element_value->size += 2;
-		offset += 2;
-		// (ut16) read and set annotation_value.num_element_value_pairs;
-		element_value->value.annotation_value.num_element_value_pairs = R_BIN_JAVA_USHORT (buffer, offset);
-		element_value->size += 2;
-		offset += 2;
+		if (offset + 8 < sz) {
+			element_value->value.annotation_value.type_idx = R_BIN_JAVA_USHORT (buffer, offset);
+			element_value->size += 2;
+			offset += 2;
+			// (ut16) read and set annotation_value.num_element_value_pairs;
+			element_value->value.annotation_value.num_element_value_pairs = R_BIN_JAVA_USHORT (buffer, offset);
+			element_value->size += 2;
+			offset += 2;
+		}
 		element_value->value.annotation_value.element_value_pairs = r_list_newf (r_bin_java_element_pair_free);
 		// read annotation_value.num_element_value_pairs, and append to annotation_value.element_value_pairs
 		for (i = 0; i < element_value->value.annotation_value.num_element_value_pairs; i++) {
-			ev_pairs = r_bin_java_element_pair_new (buffer + offset, sz - offset, buf_offset + offset);
-			if (ev_pairs) {
-				element_value->size += ev_pairs->size;
-				offset += ev_pairs->size;
+			if (offset > sz) {
+				break;
+			}
+			evps = r_bin_java_element_pair_new (buffer + offset, sz - offset, buf_offset + offset);
+			if (evps) {
+				element_value->size += evps->size;
+				offset += evps->size;
 			}
-			if (ev_pairs == NULL) {
+			if (evps == NULL) {
 				// TODO: eprintf error when reading element pair
 			}
-			r_list_append (element_value->value.annotation_value.element_value_pairs, (void *) ev_pairs);
+			r_list_append (element_value->value.annotation_value.element_value_pairs, (void *) evps);
 		}
 		break;
 	default:
@@ -6722,8 +6777,11 @@
 R_API void r_bin_java_bootstrap_method_argument_free(void /*RBinJavaBootStrapArgument*/ *b) {
 	RBinJavaBootStrapArgument *bsm_arg = b;
 	if (bsm_arg) {
-		if (bsm_arg->argument_info_cp_obj) {
-			((RBinJavaCPTypeMetas *) bsm_arg->argument_info_cp_obj)->allocs->delete_obj (bsm_arg->argument_info_cp_obj);
+		RBinJavaCPTypeMetas *tm = (RBinJavaCPTypeMetas*)bsm_arg->argument_info_cp_obj;
+		if (tm) {
+			if (tm && (size_t)(tm->allocs) > 1024 && tm->allocs->delete_obj) {
+				tm->allocs->delete_obj (tm);
+			}
 			bsm_arg->argument_info_cp_obj = NULL;
 		}
 		free (bsm_arg);
@@ -6731,7 +6789,7 @@
 }
 
 R_API void r_bin_java_print_bootstrap_method_argument_summary(RBinJavaBootStrapArgument *bsm_arg) {
-	if (bsm_arg == NULL) {
+	if (!bsm_arg) {
 		eprintf ("Attempting to print an invalid RBinJavaBootStrapArgument *.\n");
 		return;
 	}
@@ -6749,7 +6807,7 @@
 R_API void r_bin_java_print_bootstrap_method_summary(RBinJavaBootStrapMethod *bsm) {
 	RBinJavaBootStrapArgument *bsm_arg = NULL;
 	RListIter *iter = NULL, *iter_tmp = NULL;
-	if (bsm == NULL) {
+	if (!bsm) {
 		eprintf ("Attempting to print an invalid RBinJavaBootStrapArgument *.\n");
 		return;
 	}
@@ -6769,10 +6827,9 @@
 }
 
 R_API RBinJavaBootStrapArgument *r_bin_java_bootstrap_method_argument_new(ut8 *buffer, ut64 sz, ut64 buf_offset) {
-	RBinJavaBootStrapArgument *bsm_arg = NULL;
 	ut64 offset = 0;
-	bsm_arg = (RBinJavaBootStrapArgument *) malloc (sizeof (RBinJavaBootStrapArgument));
-	if (bsm_arg == NULL) {
+	RBinJavaBootStrapArgument *bsm_arg = (RBinJavaBootStrapArgument *) malloc (sizeof (RBinJavaBootStrapArgument));
+	if (!bsm_arg) {
 		// TODO eprintf failed to allocate bytes for bootstrap_method.
 		return bsm_arg;
 	}
@@ -6805,12 +6862,11 @@
 }
 
 R_API RBinJavaBootStrapMethod *r_bin_java_bootstrap_method_new(ut8 *buffer, ut64 sz, ut64 buf_offset) {
-	RBinJavaBootStrapMethod *bsm = NULL;
 	RBinJavaBootStrapArgument *bsm_arg = NULL;
 	ut32 i = 0;
 	ut64 offset = 0;
-	bsm = (RBinJavaBootStrapMethod *) malloc (sizeof (RBinJavaBootStrapMethod));
-	if (bsm == NULL) {
+	RBinJavaBootStrapMethod *bsm = R_NEW0 (RBinJavaBootStrapMethod);
+	if (!bsm) {
 		// TODO eprintf failed to allocate bytes for bootstrap_method.
 		return bsm;
 	}
@@ -6822,6 +6878,9 @@
 	offset += 2;
 	bsm->bootstrap_arguments = r_list_new ();
 	for (i = 0; i < bsm->num_bootstrap_arguments; i++) {
+		if (offset >= sz) {
+			break;
+		}
 		// bsm_arg = r_bin_java_bootstrap_method_argument_new (bin, bin->b->cur);
 		bsm_arg = r_bin_java_bootstrap_method_argument_new (buffer + offset, sz - offset, buf_offset + offset);
 		if (bsm_arg) {
@@ -6838,7 +6897,7 @@
 R_API void r_bin_java_print_bootstrap_methods_attr_summary(RBinJavaAttrInfo *attr) {
 	RListIter *iter, *iter_tmp;
 	RBinJavaBootStrapMethod *obj = NULL;
-	if (attr == NULL || attr->type == R_BIN_JAVA_ATTR_TYPE_BOOTSTRAP_METHODS_ATTR) {
+	if (!attr || attr->type == R_BIN_JAVA_ATTR_TYPE_BOOTSTRAP_METHODS_ATTR) {
 		eprintf ("Unable to print attribue summary for RBinJavaAttrInfo *RBinJavaBootstrapMethodsAttr");
 		return;
 	}
@@ -6929,6 +6988,9 @@
 		attr->info.bootstrap_methods_attr.bootstrap_methods = r_list_newf (r_bin_java_bootstrap_method_free);
 		for (i = 0; i < attr->info.bootstrap_methods_attr.num_bootstrap_methods; i++) {
 			// bsm = r_bin_java_bootstrap_method_new (bin, bin->b->cur);
+			if (offset >= sz) {
+				break;
+			}
 			bsm = r_bin_java_bootstrap_method_new (buffer + offset, sz - offset, buf_offset + offset);
 			if (bsm) {
 				offset += bsm->size;
@@ -6958,7 +7020,7 @@
 	RBinJavaAnnotationsArray *annotation_array = a;
 	RListIter *iter = NULL, *iter_tmp = NULL;
 	RBinJavaAnnotation *annotation;
-	if (annotation_array->annotations == NULL) {
+	if (!annotation_array->annotations) {
 		// TODO eprintf
 		return;
 	}
@@ -6975,7 +7037,7 @@
 R_API void r_bin_java_print_annotation_array_summary(RBinJavaAnnotationsArray *annotation_array) {
 	RListIter *iter = NULL, *iter_tmp = NULL;
 	RBinJavaAnnotation *annotation;
-	if (annotation_array->annotations == NULL) {
+	if (!annotation_array->annotations) {
 		// TODO eprintf
 		return;
 	}
@@ -6992,7 +7054,7 @@
 	ut32 i;
 	ut64 offset = 0;
 	annotation_array = (RBinJavaAnnotationsArray *) malloc (sizeof (RBinJavaAnnotationsArray));
-	if (annotation_array == NULL) {
+	if (!annotation_array) {
 		// TODO eprintf
 		return NULL;
 	}
@@ -7000,14 +7062,14 @@
 	offset += 2;
 	annotation_array->annotations = r_list_new ();
 	for (i = 0; i < annotation_array->num_annotations; i++) {
+		if (offset > sz) {
+			break;
+		}
 		annotation = r_bin_java_annotation_new (buffer + offset, sz - offset, buf_offset + offset);
 		if (annotation) {
 			offset += annotation->size;
+			r_list_append (annotation_array->annotations, (void *) annotation);
 		}
-		if (annotation == NULL) {
-			// TODO eprintf
-		}
-		r_list_append (annotation_array->annotations, (void *) annotation);
 	}
 	annotation_array->size = offset;
 	return annotation_array;
@@ -7025,12 +7087,14 @@
 		offset += 2;
 		attr->info.annotation_array.annotations = r_list_newf (r_bin_java_annotation_free);
 		for (i = 0; i < attr->info.annotation_array.num_annotations; i++) {
+			if (offset >= sz) {
+				break;
+			}
 			RBinJavaAnnotation *annotation = r_bin_java_annotation_new (buffer + offset, sz - offset, buf_offset + offset);
-			if (annotation == NULL) {}
 			if (annotation) {
 				offset += annotation->size;
+				r_list_append (attr->info.annotation_array.annotations, (void *) annotation);
 			}
-			r_list_append (attr->info.annotation_array.annotations, (void *) annotation);
 		}
 		attr->size = offset;
 	}
@@ -7041,7 +7105,7 @@
 	ut64 size = 0;
 	RListIter *iter = NULL, *iter_tmp = NULL;
 	RBinJavaAnnotation *annotation;
-	if (annotation_array->annotations == NULL) {
+	if (!annotation_array->annotations) {
 		// TODO eprintf
 		return size;
 	}
@@ -7055,7 +7119,7 @@
 
 R_API ut64 r_bin_java_rtv_annotations_attr_calc_size(RBinJavaAttrInfo *attr) {
 	ut64 size = 0;
-	if (attr == NULL) {
+	if (!attr) {
 		// TODO eprintf allocation fail
 		return size;
 	}
@@ -7075,6 +7139,9 @@
 		offset += 2;
 		attr->info.annotation_array.annotations = r_list_newf (r_bin_java_annotation_free);
 		for (i = 0; i < attr->info.rtv_annotations_attr.num_annotations; i++) {
+			if (offset >= sz) {
+				break;
+			}
 			RBinJavaAnnotation *annotation = r_bin_java_annotation_new (buffer + offset, sz - offset, buf_offset + offset);
 			if (annotation) {
 				offset += annotation->size;
@@ -7088,7 +7155,7 @@
 
 R_API ut64 r_bin_java_rti_annotations_attr_calc_size(RBinJavaAttrInfo *attr) {
 	ut64 size = 0;
-	if (attr == NULL) {
+	if (!attr) {
 		// TODO eprintf allocation fail
 		return size;
 	}
@@ -7140,7 +7207,7 @@
 	ut64 size = 0;
 	RListIter *iter = NULL, *iter_tmp = NULL;
 	RBinJavaAnnotationsArray *annotation_array;
-	if (attr == NULL) {
+	if (!attr) {
 		// TODO eprintf allocation fail
 		return size;
 	}
@@ -7160,19 +7227,21 @@
 	ut64 offset = 0;
 	attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
 	offset += 6;
-	RBinJavaAnnotationsArray *annotation_array;
 	if (attr) {
 		attr->type = R_BIN_JAVA_ATTR_TYPE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATION_ATTR;
 		attr->info.rtip_annotations_attr.num_parameters = buffer[offset];
 		offset += 1;
 		attr->info.rtip_annotations_attr.parameter_annotations = r_list_newf (r_bin_java_annotation_array_free);
 		for (i = 0; i < attr->info.rtip_annotations_attr.num_parameters; i++) {
-			annotation_array = r_bin_java_annotation_array_new (buffer + offset, sz - offset, buf_offset + offset);
-			if (annotation_array == NULL) {}
+			if (offset >= sz) {
+				break;
+			}
+			RBinJavaAnnotationsArray *annotation_array = r_bin_java_annotation_array_new (
+				buffer + offset, sz - offset, buf_offset + offset);
 			if (annotation_array) {
 				offset += annotation_array->size;
+				r_list_append (attr->info.rtip_annotations_attr.parameter_annotations, (void *) annotation_array);
 			}
-			r_list_append (attr->info.rtip_annotations_attr.parameter_annotations, (void *) annotation_array);
 		}
 		attr->size = offset;
 	}
@@ -7192,8 +7261,10 @@
 		offset += 1;
 		attr->info.rtvp_annotations_attr.parameter_annotations = r_list_newf (r_bin_java_annotation_array_free);
 		for (i = 0; i < attr->info.rtvp_annotations_attr.num_parameters; i++) {
+			if (offset > sz) {
+				break;
+			}
 			annotation_array = r_bin_java_annotation_array_new (buffer + offset, sz - offset, buf_offset + offset);
-			if (annotation_array == NULL) {}
 			if (annotation_array) {
 				offset += annotation_array->size;
 			}
@@ -7660,7 +7731,7 @@
 	char str_cnt[40];
 	char *class_name = r_bin_java_get_this_class_name (bin);
 	ut32 key_buf_size = 0;
-	if (class_name == NULL) {
+	if (!class_name) {
 		class_name = "unknown";
 		class_name_inheap = 0;
 	}
@@ -7719,7 +7790,7 @@
 	*field_key_value = NULL,
 	*value_buffer = NULL;
 	char *class_name = r_bin_java_get_this_class_name (bin);
-	if (class_name == NULL) {
+	if (!class_name) {
 		class_name = "unknown";
 		class_name_inheap = 0;
 	}
@@ -7803,7 +7874,7 @@
 	*value_buffer = NULL;
 	char *class_name = r_bin_java_get_this_class_name (bin);
 	ut64 baddr = bin->loadaddr;
-	if (class_name == NULL) {
+	if (!class_name) {
 		class_name = "unknown";
 		class_name_inheap = 0;
 	}
@@ -8981,10 +9052,7 @@
 R_API void U(copy_type_info_to_stack_frame_list)(RList * type_list, RList * sf_list) {
 	RListIter *iter, *iter_tmp;
 	RBinJavaVerificationObj *ver_obj, *new_ver_obj;
-	if (type_list == NULL) {
-		return;
-	}
-	if (sf_list == NULL) {
+	if (!type_list || !sf_list) {
 		return;
 	}
 	r_list_foreach_safe (type_list, iter, iter_tmp, ver_obj) {
@@ -9005,10 +9073,7 @@
 	RListIter *iter, *iter_tmp;
 	RBinJavaVerificationObj *ver_obj, *new_ver_obj;
 	ut32 pos = 0;
-	if (type_list == NULL) {
-		return;
-	}
-	if (sf_list == NULL) {
+	if (!type_list || !sf_list) {
 		return;
 	}
 	r_list_foreach_safe (type_list, iter, iter_tmp, ver_obj) {
diff -Nru radare2-2.3.0+dfsg/shlr/java/class.h radare2-2.8.0+dfsg/shlr/java/class.h
--- radare2-2.3.0+dfsg/shlr/java/class.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/java/class.h	2018-08-07 14:12:36.000000000 +0000
@@ -13,6 +13,11 @@
 #include <sdb.h>
 #include "dsojson.h"
 
+#if defined(_MSC_VER) && !defined(R_API_BIN_ONLY)
+#undef R_API
+#define R_API
+#endif
+
 #define USHORT(x,y) ((ut16)(x[y+1]|(x[y]<<8)))
 #if 1
 #define UINT(x,y) (ut32)(((x[y]&0xff)<<24) \
diff -Nru radare2-2.3.0+dfsg/shlr/java/dsojson.c radare2-2.8.0+dfsg/shlr/java/dsojson.c
--- radare2-2.3.0+dfsg/shlr/java/dsojson.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/java/dsojson.c	2018-08-07 14:12:36.000000000 +0000
@@ -6,11 +6,11 @@
 #include <r_util.h>
 #include <stdint.h>
 
-R_API char * dso_json_dict_entry_to_str (DsoJsonDictEntry * entry);
-R_API char * dso_json_list_to_str (DsoJsonList *list);
-R_API char * dso_json_dict_to_str (DsoJsonDict *list);
-R_API char * dso_json_num_to_str (DsoJsonNum * num);
-R_API char * dso_json_str_to_str (DsoJsonStr *str);
+char * dso_json_dict_entry_to_str (DsoJsonDictEntry * entry);
+char * dso_json_list_to_str (DsoJsonList *list);
+char * dso_json_dict_to_str (DsoJsonDict *list);
+char * dso_json_num_to_str (DsoJsonNum * num);
+char * dso_json_str_to_str (DsoJsonStr *str);
 
 static int cmpDsoStr_to_str (DsoJsonStr *dsoStr1, char *dsoStr2);
 static const DsoJsonInfo* get_type_info (unsigned int type);
@@ -85,7 +85,7 @@
 	return get_type (y) == DSO_JSON_DICT_ENTRY;
 }
 
-R_API ut8  dso_json_char_needs_hexing ( ut8 b) {
+ut8  dso_json_char_needs_hexing ( ut8 b) {
 	if (b < 0x20) {
 		return 1;
 	}
@@ -102,7 +102,7 @@
 	return 0;
 }
 
-R_API char * dso_json_obj_to_str (DsoJsonObj * dso_obj) {
+char * dso_json_obj_to_str (DsoJsonObj * dso_obj) {
 	if (dso_obj && dso_obj->info) {
 		switch (dso_obj->info->type) {
 		case DSO_JSON_NULL: return strdup ("null");
@@ -116,7 +116,7 @@
 	return NULL;
 }
 
-R_API void dso_json_obj_del (DsoJsonObj *dso_obj) {
+void dso_json_obj_del (DsoJsonObj *dso_obj) {
 	if (!dso_obj) return;
 	switch (dso_obj->info->type) {
 	case DSO_JSON_NULL: /*do nothing */ break;
@@ -184,18 +184,18 @@
 	return str;
 }
 
-R_API DsoJsonObj * dso_json_null_new () {
+DsoJsonObj * dso_json_null_new () {
 	DsoJsonObj *x = json_new0 (sizeof (DsoJsonObj));
 	if (!x) return NULL;
 	x->info = get_type_info (DSO_JSON_NULL);
 	return x;
 }
 
-R_API void dso_json_null_free (void *x) {
+void dso_json_null_free (void *x) {
 	free (x);
 }
 
-R_API DsoJsonObj * dso_json_str_new () {
+DsoJsonObj * dso_json_str_new () {
 	DsoJsonObj *x = dso_json_null_new ();
 	if (!x) return NULL;
 	x->info = get_type_info (DSO_JSON_STR);
@@ -203,7 +203,7 @@
 	return x;
 }
 
-R_API void dso_json_str_free (void *y) {
+void dso_json_str_free (void *y) {
 	DsoJsonStr *x = (DsoJsonStr *)y;
 	if (x) {
 		free (x->data);
@@ -212,7 +212,7 @@
 	}
 }
 
-R_API DsoJsonObj * dso_json_dict_entry_new () {
+DsoJsonObj * dso_json_dict_entry_new () {
 	DsoJsonObj *x = dso_json_null_new ();
 	if (!x) return NULL;
 	x->info = get_type_info (DSO_JSON_DICT_ENTRY);
@@ -226,7 +226,7 @@
 	return x;
 }
 
-R_API DsoJsonObj * dso_json_dict_entry_new_from_key_obj_val_obj (DsoJsonObj *key, DsoJsonObj *value) {
+DsoJsonObj * dso_json_dict_entry_new_from_key_obj_val_obj (DsoJsonObj *key, DsoJsonObj *value) {
 	DsoJsonObj *x = dso_json_dict_entry_new ();
 	if (!x) return NULL;
 	dso_json_obj_del (x->val._dict_entry->key);
@@ -236,7 +236,7 @@
 	return x;
 
 }
-R_API void dso_json_dict_entry_free (void *y) {
+void dso_json_dict_entry_free (void *y) {
 	DsoJsonDictEntry *entry = (DsoJsonDictEntry *)y;
 	if (entry) {
 		dso_json_obj_del (entry->key);
@@ -247,7 +247,7 @@
 	free (entry);
 }
 
-R_API char * dso_json_dict_entry_to_str (DsoJsonDictEntry * entry) {
+char * dso_json_dict_entry_to_str (DsoJsonDictEntry * entry) {
 	char *res = NULL;
 	if (entry) {
 		char *key = dso_json_obj_to_str (entry->key);
@@ -270,7 +270,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_set_key_str (DsoJsonObj * entry_obj, char *key) {
+int dso_json_dict_entry_set_key_str (DsoJsonObj * entry_obj, char *key) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonDictEntry *entry = (DsoJsonDictEntry *)entry_obj;
@@ -284,7 +284,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_set_key_str_len (DsoJsonObj * entry_obj, char *key, unsigned int len) {
+int dso_json_dict_entry_set_key_str_len (DsoJsonObj * entry_obj, char *key, unsigned int len) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonDictEntry *entry = (DsoJsonDictEntry *)entry_obj;
@@ -298,7 +298,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_set_key_num (DsoJsonObj * entry_obj, st64 num) {
+int dso_json_dict_entry_set_key_num (DsoJsonObj * entry_obj, st64 num) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonDictEntry *entry = (DsoJsonDictEntry *)entry_obj;
@@ -312,7 +312,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_append_str (DsoJsonObj *entry_obj, char *str) {
+int dso_json_dict_entry_value_append_str (DsoJsonObj *entry_obj, char *str) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_str = dso_json_str_new_from_str (str);
@@ -322,7 +322,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_append_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len) {
+int dso_json_dict_entry_value_append_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_str = dso_json_str_new_from_str_len (str, len);
@@ -332,7 +332,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_append_num (DsoJsonObj *entry_obj, st64 num) {
+int dso_json_dict_entry_value_append_num (DsoJsonObj *entry_obj, st64 num) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_num = dso_json_num_new_from_num (num);
@@ -342,7 +342,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_append_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj) {
+int dso_json_dict_entry_value_append_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj) {
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonDictEntry *x = entry_obj->val._dict_entry;
 
@@ -365,7 +365,7 @@
 	return false;
 }
 
-R_API int dso_json_dict_entry_value_set_str (DsoJsonObj *entry_obj, char *str) {
+int dso_json_dict_entry_value_set_str (DsoJsonObj *entry_obj, char *str) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_val = dso_json_str_new_from_str (str);
@@ -374,7 +374,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_set_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len) {
+int dso_json_dict_entry_value_set_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_val = dso_json_str_new_from_str_len (str, len);
@@ -383,7 +383,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_set_num (DsoJsonObj *entry_obj, st64 num) {
+int dso_json_dict_entry_value_set_num (DsoJsonObj *entry_obj, st64 num) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_val = dso_json_num_new_from_num (num);
@@ -392,7 +392,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_set_empty_dict (DsoJsonObj *entry_obj) {
+int dso_json_dict_entry_value_set_empty_dict (DsoJsonObj *entry_obj) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_val = dso_json_dict_new ();
@@ -401,7 +401,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_set_empty_list (DsoJsonObj *entry_obj) {
+int dso_json_dict_entry_value_set_empty_list (DsoJsonObj *entry_obj) {
 	int res = false;
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonObj *o_val = dso_json_list_new ();
@@ -410,7 +410,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_entry_value_set_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj) {
+int dso_json_dict_entry_value_set_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj) {
 	if (dso_json_is_dict_entry (entry_obj)) {
 		DsoJsonDictEntry *entry = entry_obj->val._dict_entry;
 		if (entry->value) dso_json_obj_del (entry->value);
@@ -420,7 +420,7 @@
 	return false;
 }
 
-R_API DsoJsonObj * dso_json_list_new () {
+DsoJsonObj * dso_json_list_new () {
 	DsoJsonObj *x = dso_json_null_new ();
 	if (x) {
 		x->info = get_type_info (DSO_JSON_LIST);
@@ -434,7 +434,7 @@
 	return x;
 }
 
-R_API void dso_json_list_free (DsoJsonObj *x) {
+void dso_json_list_free (DsoJsonObj *x) {
 	if (!x) return;
 	if (x->val._list && x->val._list->json_list) {
 		r_list_free (x->val._list->json_list);
@@ -442,14 +442,14 @@
 	}
 }
 
-R_API char * dso_json_list_to_str (DsoJsonList *list) {
+char * dso_json_list_to_str (DsoJsonList *list) {
 	if (list && list->json_list) {
 		return build_str_from_str_list_for_iterable (list->json_list, 1);
 	}
 	return strdup ("[]");
 }
 
-R_API int dso_json_list_append (DsoJsonObj *list_obj, DsoJsonObj *y) {
+int dso_json_list_append (DsoJsonObj *list_obj, DsoJsonObj *y) {
 	if (get_type (list_obj) == DSO_JSON_LIST) {
 		DsoJsonList * list = list_obj->val._list;
 		r_list_append (list->json_list, y);
@@ -458,7 +458,7 @@
 	return false;
 }
 
-R_API int dso_json_list_append_str (DsoJsonObj *list_obj, char *y) {
+int dso_json_list_append_str (DsoJsonObj *list_obj, char *y) {
 	if (get_type (list_obj) == DSO_JSON_LIST) {
 		DsoJsonObj *val = dso_json_str_new_from_str (y);
 		int res = dso_json_list_append (list_obj, val);
@@ -468,7 +468,7 @@
 	return false;
 }
 
-R_API int dso_json_list_append_num (DsoJsonObj *list_obj, ut64 y) {
+int dso_json_list_append_num (DsoJsonObj *list_obj, ut64 y) {
 	if (get_type (list_obj) == DSO_JSON_LIST) {
 		DsoJsonObj *val = dso_json_num_new_from_num (y);
 		int res = dso_json_list_append (list_obj, val);
@@ -478,7 +478,7 @@
 	return false;
 }
 
-R_API DsoJsonObj * dso_json_dict_new () {
+DsoJsonObj * dso_json_dict_new () {
 	DsoJsonObj *x = dso_json_null_new ();
 	if (x) {
 		x->info = get_type_info (DSO_JSON_DICT);
@@ -492,7 +492,7 @@
 	return x;
 }
 
-R_API void dso_json_dict_free (void *y) {
+void dso_json_dict_free (void *y) {
 	DsoJsonDict *x = (DsoJsonDict *)y;
 	if (x && x->json_dict) {
 		r_list_free (x->json_dict);
@@ -501,14 +501,14 @@
 	free (x);
 }
 
-R_API char * dso_json_dict_to_str (DsoJsonDict *dict) {
+char * dso_json_dict_to_str (DsoJsonDict *dict) {
 	if (dict && dict->json_dict) {
 		return build_str_from_str_list_for_iterable (dict->json_dict, 0);
 	}
 	return strdup ("{}");
 }
 
-R_API int dso_json_dict_insert_str_key_obj (DsoJsonObj *dict, char *key, DsoJsonObj *val_obj) {
+int dso_json_dict_insert_str_key_obj (DsoJsonObj *dict, char *key, DsoJsonObj *val_obj) {
 	DsoJsonObj *key_obj = dso_json_str_new_from_str (key);
 	int res = dso_json_dict_insert_key_obj (dict, key_obj, val_obj);
 	if (!res) {
@@ -517,7 +517,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_insert_str_key_num (DsoJsonObj *dict, char *key, int val) {
+int dso_json_dict_insert_str_key_num (DsoJsonObj *dict, char *key, int val) {
 	DsoJsonObj *key_obj = dso_json_str_new_from_str (key);
 	DsoJsonObj *val_obj = dso_json_num_new_from_num (val);
 	int res = dso_json_dict_insert_key_obj (dict, key_obj, val_obj);
@@ -527,7 +527,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_insert_str_key_str (DsoJsonObj *dict, char *key, char *val) {
+int dso_json_dict_insert_str_key_str (DsoJsonObj *dict, char *key, char *val) {
 	DsoJsonObj *key_obj = dso_json_str_new_from_str (key),
 			*val_obj = dso_json_str_new_from_str (val);
 	int res = dso_json_dict_insert_key_obj (dict, key_obj, val_obj);
@@ -538,7 +538,7 @@
 }
 
 // create keys from num value
-R_API int dso_json_dict_insert_num_key_obj (DsoJsonObj *dict, int key, DsoJsonObj *val_obj) {
+int dso_json_dict_insert_num_key_obj (DsoJsonObj *dict, int key, DsoJsonObj *val_obj) {
 	DsoJsonObj *key_obj = dso_json_str_new_from_num (key);
 	int res = dso_json_dict_insert_key_obj (dict, key_obj, val_obj);
 	if (!res) {
@@ -548,7 +548,7 @@
 }
 
 
-R_API int dso_json_dict_insert_num_key_num (DsoJsonObj *dict, int key, int val) {
+int dso_json_dict_insert_num_key_num (DsoJsonObj *dict, int key, int val) {
 	DsoJsonObj *key_obj = dso_json_str_new_from_num (key),
 			*val_obj = dso_json_num_new_from_num (val);
 	int res = dso_json_dict_insert_key_obj (dict, key_obj, val_obj);
@@ -558,7 +558,7 @@
 	return res;
 }
 
-R_API int dso_json_dict_insert_num_key_str (DsoJsonObj *dict, int key, char *val) {
+int dso_json_dict_insert_num_key_str (DsoJsonObj *dict, int key, char *val) {
 	DsoJsonObj *key_obj = dso_json_str_new_from_num (key),
 			*val_obj = dso_json_str_new_from_str (val);
 	int res = dso_json_dict_insert_key_obj (dict, key_obj, val_obj);
@@ -569,7 +569,7 @@
 }
 
 // TODO inserting the dicts.
-R_API int dso_json_dict_insert_key_obj (DsoJsonObj *dict, DsoJsonObj *key, DsoJsonObj *value) {
+int dso_json_dict_insert_key_obj (DsoJsonObj *dict, DsoJsonObj *key, DsoJsonObj *value) {
 	int res = false;
 	RList* the_list = dso_json_get_list (dict);
 	if (!the_list) return false;
@@ -591,11 +591,11 @@
 	return res;
 }
 
-R_API int dso_json_dict_remove_key_obj (DsoJsonObj *dict, DsoJsonObj *key) {
+int dso_json_dict_remove_key_obj (DsoJsonObj *dict, DsoJsonObj *key) {
 	return dso_json_dict_remove_key_str (dict, dso_json_get_str_data (key));
 }
 
-R_API int dso_json_dict_remove_key_str (DsoJsonObj *dict, char *key) {
+int dso_json_dict_remove_key_str (DsoJsonObj *dict, char *key) {
 	RListIter *iter;
 	DsoJsonObj *dso_obj;
 	int res = false;
@@ -615,11 +615,11 @@
 	return res;
 }
 
-R_API int dso_json_dict_contains_key_obj (DsoJsonObj *dict, DsoJsonObj *key) {
+int dso_json_dict_contains_key_obj (DsoJsonObj *dict, DsoJsonObj *key) {
 	return dso_json_dict_contains_key_str (dict, dso_json_get_str_data (key));
 }
 
-R_API int dso_json_dict_contains_key_str (DsoJsonObj *dict, char *key) {
+int dso_json_dict_contains_key_str (DsoJsonObj *dict, char *key) {
 	RListIter *iter;
 	DsoJsonObj *dso_obj;
 	RList* the_list = dso_json_get_list (dict);
@@ -638,7 +638,7 @@
 
 // TODO append value to key 1) check that key is valid, 2) if not create new entry and append it
 
-R_API DsoJsonObj * dso_json_num_new () {
+DsoJsonObj * dso_json_num_new () {
 	DsoJsonObj *x = dso_json_null_new ();
 	if (!x) return NULL;
 	x->info = get_type_info (DSO_JSON_NUM);
@@ -646,22 +646,22 @@
 	return x;
 }
 
-R_API void dso_json_num_free (void *y) {
+void dso_json_num_free (void *y) {
 	DsoJsonNum *x = (DsoJsonNum *)y;
 	free (x);
 }
 
-R_API char * dso_json_num_to_str (DsoJsonNum * num) {
+char * dso_json_num_to_str (DsoJsonNum * num) {
 	return r_str_newf ("%"PFMT64d, num->value);
 }
 
-R_API DsoJsonObj * dso_json_num_new_from_num (ut64 num) {
+DsoJsonObj * dso_json_num_new_from_num (ut64 num) {
 	DsoJsonObj *x = dso_json_num_new ();
 	if (x) x->val._num->value = num;
 	return x;
 }
 
-R_API char * dso_json_convert_string (const char * bytes, ut32 len) {
+char * dso_json_convert_string (const char * bytes, ut32 len) {
 	ut32 idx = 0, pos = 1;
 	ut32 str_sz = 4*len+1+2;
 	char *cpy_buffer = len > 0 ? calloc (1, str_sz): NULL;
@@ -685,14 +685,14 @@
 	return cpy_buffer;
 }
 
-R_API char * dso_json_str_to_str (DsoJsonStr *str) {
+char * dso_json_str_to_str (DsoJsonStr *str) {
 	if (str && str->data && str->len> 0) {
 		return dso_json_convert_string (str->data, str->len);
 	}
 	return NULL;
 }
 
-R_API DsoJsonObj * dso_json_str_new_from_str (const char *str) {
+DsoJsonObj * dso_json_str_new_from_str (const char *str) {
 	DsoJsonObj *x = dso_json_str_new ();
 	if (!x) return NULL;
 	DsoJsonStr * dsoStr = x->val._str;
@@ -701,7 +701,7 @@
 	return x;
 }
 
-R_API DsoJsonObj * dso_json_str_new_from_str_len (const char *str, unsigned int len) {
+DsoJsonObj * dso_json_str_new_from_str_len (const char *str, unsigned int len) {
 	DsoJsonObj *x = dso_json_str_new ();
 	if (!x) return NULL;
 	DsoJsonStr * dsoStr = x->val._str;
@@ -710,7 +710,7 @@
 	return x;
 }
 
-R_API DsoJsonObj * dso_json_str_new_from_num (long num) {
+DsoJsonObj * dso_json_str_new_from_num (long num) {
 	DsoJsonObj *x = dso_json_str_new ();
 	if (!x) return NULL;
 	DsoJsonStr * dsoStr = x->val._str;
diff -Nru radare2-2.3.0+dfsg/shlr/java/dsojson.h radare2-2.8.0+dfsg/shlr/java/dsojson.h
--- radare2-2.3.0+dfsg/shlr/java/dsojson.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/java/dsojson.h	2018-08-07 14:12:36.000000000 +0000
@@ -57,59 +57,59 @@
 	} val;
 } DsoJsonObj;
 
-R_API ut8  dso_json_char_needs_hexing ( ut8 b);
+ut8  dso_json_char_needs_hexing ( ut8 b);
 
-R_API void dso_json_obj_del (DsoJsonObj *dso_obj);
-R_API char * dso_json_obj_to_str (DsoJsonObj * dso_obj);
-R_API DsoJsonObj * dso_json_null_new (void);
-R_API void dso_json_null_free (void *x);
-R_API DsoJsonObj * dso_json_str_new (void);
-R_API void dso_json_str_free (void *y);
-R_API DsoJsonObj * dso_json_str_new_from_str (const char *str);
-R_API DsoJsonObj * dso_json_str_new_from_str_len (const char *str, unsigned int len);
-R_API DsoJsonObj * dso_json_str_new_from_num (long num);
-
-R_API DsoJsonObj * dso_json_dict_entry_new (void);
-R_API void dso_json_dict_entry_free (void *y);
-R_API int dso_json_dict_entry_set_key_str (DsoJsonObj * entry_obj, char *key);
-R_API int dso_json_dict_entry_set_key_str_len (DsoJsonObj * entry_obj, char *key, unsigned int len);
-R_API int dso_json_dict_entry_set_key_num (DsoJsonObj * entry_obj, st64 num);
-R_API int dso_json_dict_entry_value_append_str (DsoJsonObj *entry_obj, char *str);
-R_API int dso_json_dict_entry_value_append_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len);
-R_API int dso_json_dict_entry_value_append_num (DsoJsonObj *entry_obj, st64 num);
-R_API int dso_json_dict_entry_value_append_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj);
-R_API int dso_json_dict_entry_value_set_str (DsoJsonObj *entry_obj, char *str);
-R_API int dso_json_dict_entry_value_set_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len);
-R_API int dso_json_dict_entry_value_set_num (DsoJsonObj *entry_obj, st64 num);
-R_API int dso_json_dict_entry_value_set_empty_dict (DsoJsonObj *entry_obj);
-R_API int dso_json_dict_entry_value_set_empty_list (DsoJsonObj *entry_obj);
-R_API int dso_json_dict_entry_value_set_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj);
-
-R_API DsoJsonObj * dso_json_list_new (void);
-R_API void dso_json_list_free (DsoJsonObj *x);
-R_API int dso_json_list_append (DsoJsonObj *list_obj, DsoJsonObj *y);
-R_API int dso_json_list_append_str (DsoJsonObj *list_obj, char *y);
-R_API int dso_json_list_append_num (DsoJsonObj *list_obj, ut64 y);
-
-R_API DsoJsonObj * dso_json_dict_new (void);
-R_API int dso_json_dict_insert_str_key_obj (DsoJsonObj *dict, char *key, DsoJsonObj *val_obj);
-R_API int dso_json_dict_insert_str_key_num (DsoJsonObj *dict, char *key, int val);
-R_API int dso_json_dict_insert_str_key_str (DsoJsonObj *dict, char *key, char *val);
-R_API int dso_json_dict_insert_num_key_obj (DsoJsonObj *dict, int key, DsoJsonObj *val_obj);
-R_API int dso_json_dict_insert_num_key_num (DsoJsonObj *dict, int key, int val);
-R_API int dso_json_dict_insert_num_key_str (DsoJsonObj *dict, int key, char *val);
-R_API int dso_json_dict_insert_key_obj (DsoJsonObj *dict, DsoJsonObj *key, DsoJsonObj *value);
-R_API int dso_json_dict_remove_key_obj (DsoJsonObj *dict, DsoJsonObj *key);
-R_API int dso_json_dict_remove_key_str (DsoJsonObj *dict, char *key);
-R_API int dso_json_dict_contains_key_str (DsoJsonObj *dict, char *key);
-R_API int dso_json_dict_contains_key_obj (DsoJsonObj *dict, DsoJsonObj *key);
-R_API void dso_json_dict_free (void * y);
-
-R_API DsoJsonObj * dso_json_num_new (void);
-R_API void dso_json_num_free (void *y);
-R_API DsoJsonObj * dso_json_num_new_from_num (ut64 num);
+void dso_json_obj_del (DsoJsonObj *dso_obj);
+char * dso_json_obj_to_str (DsoJsonObj * dso_obj);
+DsoJsonObj * dso_json_null_new (void);
+void dso_json_null_free (void *x);
+DsoJsonObj * dso_json_str_new (void);
+void dso_json_str_free (void *y);
+DsoJsonObj * dso_json_str_new_from_str (const char *str);
+DsoJsonObj * dso_json_str_new_from_str_len (const char *str, unsigned int len);
+DsoJsonObj * dso_json_str_new_from_num (long num);
+
+DsoJsonObj * dso_json_dict_entry_new (void);
+void dso_json_dict_entry_free (void *y);
+int dso_json_dict_entry_set_key_str (DsoJsonObj * entry_obj, char *key);
+int dso_json_dict_entry_set_key_str_len (DsoJsonObj * entry_obj, char *key, unsigned int len);
+int dso_json_dict_entry_set_key_num (DsoJsonObj * entry_obj, st64 num);
+int dso_json_dict_entry_value_append_str (DsoJsonObj *entry_obj, char *str);
+int dso_json_dict_entry_value_append_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len);
+int dso_json_dict_entry_value_append_num (DsoJsonObj *entry_obj, st64 num);
+int dso_json_dict_entry_value_append_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj);
+int dso_json_dict_entry_value_set_str (DsoJsonObj *entry_obj, char *str);
+int dso_json_dict_entry_value_set_str_len (DsoJsonObj *entry_obj, char *str, unsigned int len);
+int dso_json_dict_entry_value_set_num (DsoJsonObj *entry_obj, st64 num);
+int dso_json_dict_entry_value_set_empty_dict (DsoJsonObj *entry_obj);
+int dso_json_dict_entry_value_set_empty_list (DsoJsonObj *entry_obj);
+int dso_json_dict_entry_value_set_obj (DsoJsonObj *entry_obj, DsoJsonObj *obj);
+
+DsoJsonObj * dso_json_list_new (void);
+void dso_json_list_free (DsoJsonObj *x);
+int dso_json_list_append (DsoJsonObj *list_obj, DsoJsonObj *y);
+int dso_json_list_append_str (DsoJsonObj *list_obj, char *y);
+int dso_json_list_append_num (DsoJsonObj *list_obj, ut64 y);
+
+DsoJsonObj * dso_json_dict_new (void);
+int dso_json_dict_insert_str_key_obj (DsoJsonObj *dict, char *key, DsoJsonObj *val_obj);
+int dso_json_dict_insert_str_key_num (DsoJsonObj *dict, char *key, int val);
+int dso_json_dict_insert_str_key_str (DsoJsonObj *dict, char *key, char *val);
+int dso_json_dict_insert_num_key_obj (DsoJsonObj *dict, int key, DsoJsonObj *val_obj);
+int dso_json_dict_insert_num_key_num (DsoJsonObj *dict, int key, int val);
+int dso_json_dict_insert_num_key_str (DsoJsonObj *dict, int key, char *val);
+int dso_json_dict_insert_key_obj (DsoJsonObj *dict, DsoJsonObj *key, DsoJsonObj *value);
+int dso_json_dict_remove_key_obj (DsoJsonObj *dict, DsoJsonObj *key);
+int dso_json_dict_remove_key_str (DsoJsonObj *dict, char *key);
+int dso_json_dict_contains_key_str (DsoJsonObj *dict, char *key);
+int dso_json_dict_contains_key_obj (DsoJsonObj *dict, DsoJsonObj *key);
+void dso_json_dict_free (void * y);
+
+DsoJsonObj * dso_json_num_new (void);
+void dso_json_num_free (void *y);
+DsoJsonObj * dso_json_num_new_from_num (ut64 num);
 
-R_API char * dso_json_convert_string (const char * bytes, ut32 len );
+char * dso_json_convert_string (const char * bytes, ut32 len );
 
 
 #endif
diff -Nru radare2-2.3.0+dfsg/shlr/java/ops.c radare2-2.8.0+dfsg/shlr/java/ops.c
--- radare2-2.3.0+dfsg/shlr/java/ops.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/java/ops.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,305 +1,305 @@
-/* radare - LGPL - Copyright 2007-2014 - pancake */
+/* radare - LGPL - Copyright 2007-2018 - pancake */
 
 #include <r_anal_ex.h>
 #include <stdio.h>
 #include "code.h"
 
 R_IPI struct java_op JAVA_OPS[JAVA_OPS_COUNT] = {
-	{ "nop"            , 0x00, 1, R_ANAL_EX_NOP},
-	{ "aconst_null"    , 0x01, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_REF_TO_STACK},
-	{ "iconst_m1"      , 0x02, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "iconst_0"       , 0x03, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "iconst_1"       , 0x04, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "iconst_2"       , 0x05, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "iconst_3"       , 0x06, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "iconst_4"       , 0x07, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "iconst_5"       , 0x08, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "lconst_0"       , 0x09, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "lconst_1"       , 0x0a, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "fconst_0"       , 0x0b, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "fconst_1"       , 0x0c, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "fconst_2"       , 0x0d, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "dconst_0"       , 0x0e, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-	{ "dconst_1"       , 0x0f, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK},
-
-	{ "bipush"         , 0x10, 2, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH},
-	{ "sipush"         , 0x11, 3, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH},
-
-	{ "ldc"            , 0x12, 2, R_ANAL_EX_LDST_LOAD_FROM_CONST_INDIRECT_TO_STACK},
-	{ "ldc_w"          , 0x13, 3, R_ANAL_EX_LDST_LOAD_FROM_CONST_INDIRECT_TO_STACK},
-	{ "ldc2_w"         , 0x14, 3, R_ANAL_EX_LDST_LOAD_FROM_CONST_INDIRECT_TO_STACK},
-
-	{ "iload"          , 0x15, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK},
-	{ "lload"          , 0x16, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK},
-	{ "fload"          , 0x17, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK},
-	{ "dload"          , 0x18, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK},
-	{ "aload"          , 0x19, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK_REF},
-
-	{ "iload_0"        , 0x1a, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "iload_1"        , 0x1b, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "iload_2"        , 0x1c, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "iload_3"        , 0x1d, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-
-	{ "lload_0"        , 0x1e, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "lload_1"        , 0x1f, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "lload_2"        , 0x20, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "lload_3"        , 0x21, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-
-	{ "fload_0"        , 0x22, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "fload_1"        , 0x23, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "fload_2"        , 0x24, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "fload_3"        , 0x25, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-
-	{ "dload_0"        , 0x26, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "dload_1"        , 0x27, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "dload_2"        , 0x28, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-	{ "dload_3"        , 0x29, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK},
-
-	{ "aload_0"        , 0x2a, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF},
-	{ "aload_1"        , 0x2b, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF},
-	{ "aload_2"        , 0x2c, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF},
-	{ "aload_3"        , 0x2d, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF},
-
-	{ "iaload"         , 0x2e, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK},
-	{ "laload"         , 0x2f, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK},
-	{ "faload"         , 0x30, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK},
-	{ "daload"         , 0x31, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK},
-	{ "aaload"         , 0x32, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK_REF},
-	{ "baload"         , 0x33, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK},
-	{ "caload"         , 0x34, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK},
-	{ "saload"         , 0x35, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK},
-
-	{ "istore"        , 0x36,  2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR},
-	{ "lstore"         , 0x37, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR},
-	{ "fstore"         , 0x38, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR},
-	{ "dstore"         , 0x39, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR},
-	{ "astore"         , 0x3a, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR_REF},
-
-	{ "istore_0"       , 0x3b, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "istore_1"       , 0x3c, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "istore_2"       , 0x3d, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "istore_3"       , 0x3e, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-
-	{ "lstore_0"       , 0x3f, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "lstore_1"       , 0x40, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "lstore_2"       , 0x41, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "lstore_3"       , 0x42, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-
-	{ "fstore_0"       , 0x43, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "fstore_1"       , 0x44, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "fstore_2"       , 0x45, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "fstore_3"       , 0x46, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-
-	{ "dstore_0"       , 0x47, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "dstore_1"       , 0x48, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "dstore_2"       , 0x49, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-	{ "dstore_3"       , 0x4a, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR},
-
-	{ "astore_0"       , 0x4b, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF},
-	{ "astore_1"       , 0x4c, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF},
-	{ "astore_2"       , 0x4d, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF},
-	{ "astore_3"       , 0x4e, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF},
-
-	{ "iastore"        , 0x4f, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF},
-	{ "lastore"        , 0x50, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF},
-	{ "fastore"        , 0x51, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF},
-	{ "dastore"        , 0x52, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF},
-	{ "aastore"        , 0x53, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF_REF},
-	{ "bastore"        , 0x54, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF},
-	{ "castore"        , 0x55, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF},
-	{ "sastore"        , 0x56, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF},
-
-	{ "pop"            , 0x57, 1, R_ANAL_EX_STORE_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_POP},
-	{ "pop2"           , 0x58, 1, R_ANAL_EX_STORE_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_POP  | R_ANAL_EX_REP_OP},
-	{ "dup"            , 0x59, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP},
-	{ "dup_x1"         , 0x5a, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP},
-	{ "dup_x2"         , 0x5b, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP},
-	{ "dup2"           , 0x5c, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP},
-	{ "dup2_x1"        , 0x5d, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP},
-	{ "dup2_x2"        , 0x5e, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP},
-
-	{ "swap"           , 0x5f, 1, R_ANAL_EX_BINOP_XCHG},
-
-	{ "iadd"           , 0x60, 1, R_ANAL_EX_BINOP_ADD},
-	{ "ladd"           , 0x61, 1, R_ANAL_EX_BINOP_ADD},
-	{ "fadd"           , 0x62, 1, R_ANAL_EX_BINOP_ADD},
-	{ "dadd"           , 0x63, 1, R_ANAL_EX_BINOP_ADD},
-
-	{ "isub"           , 0x64, 1, R_ANAL_EX_BINOP_SUB},
-	{ "lsub"           , 0x65, 1, R_ANAL_EX_BINOP_SUB},
-	{ "fsub"           , 0x66, 1, R_ANAL_EX_BINOP_SUB},
-	{ "dsub"           , 0x67, 1, R_ANAL_EX_BINOP_SUB},
-
-	{ "imul"           , 0x68, 1, R_ANAL_EX_BINOP_MUL},
-	{ "lmul"           , 0x69, 1, R_ANAL_EX_BINOP_MUL},
-	{ "fmul"           , 0x6a, 1, R_ANAL_EX_BINOP_MUL},
-	{ "dmul"           , 0x6b, 1, R_ANAL_EX_BINOP_MUL},
-
-	{ "idiv"           , 0x6c, 1, R_ANAL_EX_BINOP_DIV},
-	{ "ldiv"           , 0x6d, 1, R_ANAL_EX_BINOP_DIV},
-	{ "fdiv"           , 0x6e, 1, R_ANAL_EX_BINOP_DIV},
-	{ "ddiv"           , 0x6f, 1, R_ANAL_EX_BINOP_DIV},
-
-	{ "irem"           , 0x70, 1, R_ANAL_EX_BINOP_MOD},
-	{ "lrem"           , 0x71, 1, R_ANAL_EX_BINOP_MOD},
-	{ "frem"           , 0x72, 1, R_ANAL_EX_BINOP_MOD},
-	{ "drem"           , 0x73, 1, R_ANAL_EX_BINOP_MOD},
-
-	{ "ineg"           , 0x74, 1, R_ANAL_EX_BINOP_NOT},
-	{ "lneg"           , 0x75, 1, R_ANAL_EX_BINOP_NOT},
-	{ "fneg"           , 0x76, 1, R_ANAL_EX_BINOP_NOT},
-	{ "dneg"           , 0x77, 1, R_ANAL_EX_BINOP_NOT},
-
-	{ "ishl"           , 0x78, 1, R_ANAL_EX_BINOP_SHL},
-	{ "lshl"           , 0x79, 1, R_ANAL_EX_BINOP_SHL},
-	{ "ishr"           , 0x7a, 1, R_ANAL_EX_BINOP_SHR},
-	{ "lshr"           , 0x7b, 1, R_ANAL_EX_BINOP_SHR},
-	{ "iushr"          , 0x7c, 1, R_ANAL_EX_BINOP_SHR},
-	{ "lushr"          , 0x7d, 1, R_ANAL_EX_BINOP_SHR},
-
-	{ "iand"           , 0x7e, 1, R_ANAL_EX_BINOP_AND},
-	{ "land"           , 0x7f, 1, R_ANAL_EX_BINOP_AND},
-
-	{ "ior"            , 0x80, 1, R_ANAL_EX_BINOP_OR},
-	{ "lor"            , 0x81, 1, R_ANAL_EX_BINOP_OR},
-
-	{ "ixor"           , 0x82, 1, R_ANAL_EX_BINOP_XOR},
-	{ "lxor"           , 0x83, 1, R_ANAL_EX_BINOP_XOR},
-
-	{ "iinc"           , 0x84, 3, R_ANAL_EX_BINOP_ADD},
-
-	{ "i2l"            , 0x85, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "i2f"            , 0x86, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "i2d"            , 0x87, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "l2i"            , 0x88, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "l2f"            , 0x89, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "l2d"            , 0x8a, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "f2i"            , 0x8b, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "f2l"            , 0x8c, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "f2d"            , 0x8d, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "d2i"            , 0x8e, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "d2l"            , 0x8f, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "d2f"            , 0x90, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "i2b"            , 0x91, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "i2c"            , 0x92, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-	{ "i2s"            , 0x93, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP},
-
-	{ "lcmp"           , 0x94, 1, R_ANAL_EX_BINOP_CMP},
-	{ "fcmpl"          , 0x95, 1, R_ANAL_EX_BINOP_CMP},
-	{ "fcmpg"          , 0x96, 1, R_ANAL_EX_BINOP_CMP},
-	{ "dcmpl"          , 0x97, 1, R_ANAL_EX_BINOP_CMP},
-	{ "dcmpg"          , 0x98, 1, R_ANAL_EX_BINOP_CMP},
-
-	{ "ifeq"           , 0x99, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_EQ},
-	{ "ifne"           , 0x9a, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NE},
-	{ "iflt"           , 0x9b, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LT},
-	{ "ifge"           , 0x9c, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GE},
-	{ "ifgt"           , 0x9d, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GT},
-	{ "ifle"           , 0x9e, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LE},
-	{ "if_icmpeq"      , 0x9f, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_EQ},
-	{ "if_icmpne"      , 0xa0, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NE},
-	{ "if_icmplt"      , 0xa1, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LT},
-	{ "if_icmpge"      , 0xa2, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GE},
-	{ "if_icmpgt"      , 0xa3, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GT},
-	{ "if_icmple"      , 0xa4, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LE},
-	{ "if_acmpeq"      , 0xa5, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_EQ},
-	{ "if_acmpne"      , 0xa6, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NE},
-	{ "goto"           , 0xa7, 3, R_ANAL_EX_CODEOP_JMP},
-	{ "jsr"            , 0xa8, 3, R_ANAL_EX_CODEOP_CALL},
-	{ "ret"            , 0xa9, 2, R_ANAL_EX_CODEOP_RET},
-
-	{ "tableswitch"    , 0xaa, 1, R_ANAL_EX_CODEOP_SWITCH},
-	{ "lookupswitch"   , 0xab, 1, R_ANAL_EX_CODEOP_SWITCH},
-
-	{ "ireturn"        , 0xac, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM},
-	{ "lreturn"        , 0xad, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM},
-	{ "freturn"        , 0xae, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM},
-	{ "dreturn"        , 0xaf, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM},
-	{ "areturn"        , 0xb0, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_REF},
-	{ "return"         , 0xb1, 1, R_ANAL_EX_CODEOP_RET},
-
-	{ "getstatic"      , 0xb2, 3, R_ANAL_EX_LDST_LOAD_GET_STATIC},
-	{ "putstatic"      , 0xb3, 3, R_ANAL_EX_LDST_STORE_PUT_STATIC},
-	{ "getfield"       , 0xb4, 3, R_ANAL_EX_LDST_LOAD_GET_FIELD},
-	{ "putfield"       , 0xb5, 3, R_ANAL_EX_LDST_STORE_PUT_FIELD},
-
-	{ "invokevirtual"  , 0xb6, 3, R_ANAL_EX_CODEOP_CALL},
-	{ "invokespecial"  , 0xb7, 3, R_ANAL_EX_CODEOP_CALL},
-	{ "invokestatic"   , 0xb8, 3, R_ANAL_EX_CODEOP_CALL},
-	{ "invokeinterface", 0xb9, 5, R_ANAL_EX_CODEOP_CALL},
-	{ "invokedynamic"  , 0xba, 5, R_ANAL_EX_CODEOP_CALL},
-
-	{ "new"            , 0xbb, 3, R_ANAL_EX_OBJOP_NEW},
-	{ "newarray"       , 0xbc, 2, R_ANAL_EX_OBJOP_NEW},
-	{ "anewarray"      , 0xbd, 3, R_ANAL_EX_OBJOP_NEW},
-
-	{ "arraylength"    , 0xbe, 1, R_ANAL_EX_OBJOP_SIZE},
-	{ "athrow"         , 0xbf, 1, R_ANAL_EX_CODEOP_TRAP},
-
-	{ "checkcast"      , 0xc0, 3, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_OBJOP_CHECK | R_ANAL_EX_OBJOP_CAST},
-	{ "instanceof"     , 0xc1, 3, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_OBJOP_CHECK},
-	{ "monitorenter"   , 0xc2, 1, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_LOAD_OP  | R_ANAL_EX_TYPE_REF},
-	{ "monitorexit"    , 0xc3, 1, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_STORE_OP | R_ANAL_EX_TYPE_REF},
-	{ "wide"           , 0xc4, 1, R_ANAL_EX_REP_OP},
-	{ "multinewarray"  , 0xc5, 4, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_OBJOP_NEW | R_ANAL_EX_TYPE_REF},
-	{ "ifnull"         , 0xc6, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NULL | R_ANAL_EX_COND_EQ},
-	{ "ifnonnull"      , 0xc7, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NULL | R_ANAL_EX_COND_NE},
-	{ "goto_w"         , 0xc8, 5, R_ANAL_EX_CODEOP_JMP},
-	{ "jsr_w"          , 0xc9, 5, R_ANAL_EX_CODEOP_JMP | R_ANAL_EX_CODEOP_CALL},
-	{ "breakpoint"     , 0xca, 1, R_ANAL_EX_CODEOP_SWI},
-
-	{ "UNDEFINED"         , 0xcb, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xcc, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xcd, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xce, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xcf, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd0, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd1, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd2, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd3, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd4, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd5, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd6, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd7, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd8, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xd9, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xda, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xdb, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xdc, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xdd, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xde, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xdf, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe0, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe1, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe2, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe3, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe4, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe5, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe6, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe7, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe8, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xe9, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xea, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xeb, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xec, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xed, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xee, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xef, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf0, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf1, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf2, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf3, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf4, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf5, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf6, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf7, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf8, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xf9, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xfa, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xfb, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xfc, 1, R_ANAL_EX_UNK_OP},
-	{ "UNDEFINED"         , 0xfd, 1, R_ANAL_EX_UNK_OP},
-	{ "impdep1"        , 0xfe, 1, R_ANAL_EX_ILL_OP},
-	{ "impdep2"        , 0xff, 1, R_ANAL_EX_ILL_OP},
+	{ "nop"            , 0x00, 1, R_ANAL_EX_NOP },
+	{ "aconst_null"    , 0x01, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_REF_TO_STACK },
+	{ "iconst_m1"      , 0x02, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "iconst_0"       , 0x03, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "iconst_1"       , 0x04, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "iconst_2"       , 0x05, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "iconst_3"       , 0x06, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "iconst_4"       , 0x07, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "iconst_5"       , 0x08, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "lconst_0"       , 0x09, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "lconst_1"       , 0x0a, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "fconst_0"       , 0x0b, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "fconst_1"       , 0x0c, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "fconst_2"       , 0x0d, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "dconst_0"       , 0x0e, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+	{ "dconst_1"       , 0x0f, 1, R_ANAL_EX_LDST_LOAD_FROM_CONST_TO_STACK },
+
+	{ "bipush"         , 0x10, 2, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH },
+	{ "sipush"         , 0x11, 3, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH },
+
+	{ "ldc"            , 0x12, 2, R_ANAL_EX_LDST_LOAD_FROM_CONST_INDIRECT_TO_STACK },
+	{ "ldc_w"          , 0x13, 3, R_ANAL_EX_LDST_LOAD_FROM_CONST_INDIRECT_TO_STACK },
+	{ "ldc2_w"         , 0x14, 3, R_ANAL_EX_LDST_LOAD_FROM_CONST_INDIRECT_TO_STACK },
+
+	{ "iload"          , 0x15, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK },
+	{ "lload"          , 0x16, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK },
+	{ "fload"          , 0x17, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK },
+	{ "dload"          , 0x18, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK },
+	{ "aload"          , 0x19, 2, R_ANAL_EX_LDST_LOAD_FROM_VAR_INDIRECT_TO_STACK_REF },
+
+	{ "iload_0"        , 0x1a, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "iload_1"        , 0x1b, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "iload_2"        , 0x1c, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "iload_3"        , 0x1d, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+
+	{ "lload_0"        , 0x1e, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "lload_1"        , 0x1f, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "lload_2"        , 0x20, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "lload_3"        , 0x21, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+
+	{ "fload_0"        , 0x22, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "fload_1"        , 0x23, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "fload_2"        , 0x24, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "fload_3"        , 0x25, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+
+	{ "dload_0"        , 0x26, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "dload_1"        , 0x27, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "dload_2"        , 0x28, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+	{ "dload_3"        , 0x29, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK },
+
+	{ "aload_0"        , 0x2a, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF },
+	{ "aload_1"        , 0x2b, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF },
+	{ "aload_2"        , 0x2c, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF },
+	{ "aload_3"        , 0x2d, 1, R_ANAL_EX_LDST_LOAD_FROM_VAR_TO_STACK_REF },
+
+	{ "iaload"         , 0x2e, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK },
+	{ "laload"         , 0x2f, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK },
+	{ "faload"         , 0x30, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK },
+	{ "daload"         , 0x31, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK },
+	{ "aaload"         , 0x32, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK_REF },
+	{ "baload"         , 0x33, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK },
+	{ "caload"         , 0x34, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK },
+	{ "saload"         , 0x35, 1, R_ANAL_EX_LDST_LOAD_FROM_REF_INDIRECT_TO_STACK },
+
+	{ "istore"         , 0x36,  2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR },
+	{ "lstore"         , 0x37, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR },
+	{ "fstore"         , 0x38, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR },
+	{ "dstore"         , 0x39, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR },
+	{ "astore"         , 0x3a, 2, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_VAR_REF },
+
+	{ "istore_0"       , 0x3b, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "istore_1"       , 0x3c, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "istore_2"       , 0x3d, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "istore_3"       , 0x3e, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+
+	{ "lstore_0"       , 0x3f, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "lstore_1"       , 0x40, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "lstore_2"       , 0x41, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "lstore_3"       , 0x42, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+
+	{ "fstore_0"       , 0x43, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "fstore_1"       , 0x44, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "fstore_2"       , 0x45, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "fstore_3"       , 0x46, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+
+	{ "dstore_0"       , 0x47, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "dstore_1"       , 0x48, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "dstore_2"       , 0x49, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+	{ "dstore_3"       , 0x4a, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR },
+
+	{ "astore_0"       , 0x4b, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF },
+	{ "astore_1"       , 0x4c, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF },
+	{ "astore_2"       , 0x4d, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF },
+	{ "astore_3"       , 0x4e, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_TO_VAR_REF },
+
+	{ "iastore"        , 0x4f, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF },
+	{ "lastore"        , 0x50, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF },
+	{ "fastore"        , 0x51, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF },
+	{ "dastore"        , 0x52, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF },
+	{ "aastore"        , 0x53, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF_REF },
+	{ "bastore"        , 0x54, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF },
+	{ "castore"        , 0x55, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF },
+	{ "sastore"        , 0x56, 1, R_ANAL_EX_LDST_STORE_FROM_STACK_INDIRECT_TO_REF },
+
+	{ "pop"            , 0x57, 1, R_ANAL_EX_STORE_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_POP },
+	{ "pop2"           , 0x58, 1, R_ANAL_EX_STORE_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_POP  | R_ANAL_EX_REP_OP },
+	{ "dup"            , 0x59, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP },
+	{ "dup_x1"         , 0x5a, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP },
+	{ "dup_x2"         , 0x5b, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP },
+	{ "dup2"           , 0x5c, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP },
+	{ "dup2_x1"        , 0x5d, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP },
+	{ "dup2_x2"        , 0x5e, 1, R_ANAL_EX_LOAD_OP | R_ANAL_EX_STACK_OP | R_ANAL_EX_LDST_OP_PUSH | R_ANAL_EX_REP_OP },
+
+	{ "swap"           , 0x5f, 1, R_ANAL_EX_BINOP_XCHG },
+
+	{ "iadd"           , 0x60, 1, R_ANAL_EX_BINOP_ADD },
+	{ "ladd"           , 0x61, 1, R_ANAL_EX_BINOP_ADD },
+	{ "fadd"           , 0x62, 1, R_ANAL_EX_BINOP_ADD },
+	{ "dadd"           , 0x63, 1, R_ANAL_EX_BINOP_ADD },
+
+	{ "isub"           , 0x64, 1, R_ANAL_EX_BINOP_SUB },
+	{ "lsub"           , 0x65, 1, R_ANAL_EX_BINOP_SUB },
+	{ "fsub"           , 0x66, 1, R_ANAL_EX_BINOP_SUB },
+	{ "dsub"           , 0x67, 1, R_ANAL_EX_BINOP_SUB },
+
+	{ "imul"           , 0x68, 1, R_ANAL_EX_BINOP_MUL },
+	{ "lmul"           , 0x69, 1, R_ANAL_EX_BINOP_MUL },
+	{ "fmul"           , 0x6a, 1, R_ANAL_EX_BINOP_MUL },
+	{ "dmul"           , 0x6b, 1, R_ANAL_EX_BINOP_MUL },
+
+	{ "idiv"           , 0x6c, 1, R_ANAL_EX_BINOP_DIV },
+	{ "ldiv"           , 0x6d, 1, R_ANAL_EX_BINOP_DIV },
+	{ "fdiv"           , 0x6e, 1, R_ANAL_EX_BINOP_DIV },
+	{ "ddiv"           , 0x6f, 1, R_ANAL_EX_BINOP_DIV },
+
+	{ "irem"           , 0x70, 1, R_ANAL_EX_BINOP_MOD },
+	{ "lrem"           , 0x71, 1, R_ANAL_EX_BINOP_MOD },
+	{ "frem"           , 0x72, 1, R_ANAL_EX_BINOP_MOD },
+	{ "drem"           , 0x73, 1, R_ANAL_EX_BINOP_MOD },
+
+	{ "ineg"           , 0x74, 1, R_ANAL_EX_BINOP_NOT },
+	{ "lneg"           , 0x75, 1, R_ANAL_EX_BINOP_NOT },
+	{ "fneg"           , 0x76, 1, R_ANAL_EX_BINOP_NOT },
+	{ "dneg"           , 0x77, 1, R_ANAL_EX_BINOP_NOT },
+
+	{ "ishl"           , 0x78, 1, R_ANAL_EX_BINOP_SHL },
+	{ "lshl"           , 0x79, 1, R_ANAL_EX_BINOP_SHL },
+	{ "ishr"           , 0x7a, 1, R_ANAL_EX_BINOP_SHR },
+	{ "lshr"           , 0x7b, 1, R_ANAL_EX_BINOP_SHR },
+	{ "iushr"          , 0x7c, 1, R_ANAL_EX_BINOP_SHR },
+	{ "lushr"          , 0x7d, 1, R_ANAL_EX_BINOP_SHR },
+
+	{ "iand"           , 0x7e, 1, R_ANAL_EX_BINOP_AND },
+	{ "land"           , 0x7f, 1, R_ANAL_EX_BINOP_AND },
+
+	{ "ior"            , 0x80, 1, R_ANAL_EX_BINOP_OR },
+	{ "lor"            , 0x81, 1, R_ANAL_EX_BINOP_OR },
+
+	{ "ixor"           , 0x82, 1, R_ANAL_EX_BINOP_XOR },
+	{ "lxor"           , 0x83, 1, R_ANAL_EX_BINOP_XOR },
+
+	{ "iinc"           , 0x84, 3, R_ANAL_EX_BINOP_ADD },
+
+	{ "i2l"            , 0x85, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "i2f"            , 0x86, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "i2d"            , 0x87, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "l2i"            , 0x88, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "l2f"            , 0x89, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "l2d"            , 0x8a, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "f2i"            , 0x8b, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "f2l"            , 0x8c, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "f2d"            , 0x8d, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "d2i"            , 0x8e, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "d2l"            , 0x8f, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "d2f"            , 0x90, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "i2b"            , 0x91, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "i2c"            , 0x92, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+	{ "i2s"            , 0x93, 1, R_ANAL_EX_OBJOP_CAST | R_ANAL_EX_OBJ_OP },
+
+	{ "lcmp"           , 0x94, 1, R_ANAL_EX_BINOP_CMP },
+	{ "fcmpl"          , 0x95, 1, R_ANAL_EX_BINOP_CMP },
+	{ "fcmpg"          , 0x96, 1, R_ANAL_EX_BINOP_CMP },
+	{ "dcmpl"          , 0x97, 1, R_ANAL_EX_BINOP_CMP },
+	{ "dcmpg"          , 0x98, 1, R_ANAL_EX_BINOP_CMP },
+
+	{ "ifeq"           , 0x99, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_EQ },
+	{ "ifne"           , 0x9a, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NE },
+	{ "iflt"           , 0x9b, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LT },
+	{ "ifge"           , 0x9c, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GE },
+	{ "ifgt"           , 0x9d, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GT },
+	{ "ifle"           , 0x9e, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LE },
+	{ "if_icmpeq"      , 0x9f, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_EQ },
+	{ "if_icmpne"      , 0xa0, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NE },
+	{ "if_icmplt"      , 0xa1, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LT },
+	{ "if_icmpge"      , 0xa2, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GE },
+	{ "if_icmpgt"      , 0xa3, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_GT },
+	{ "if_icmple"      , 0xa4, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_LE },
+	{ "if_acmpeq"      , 0xa5, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_EQ },
+	{ "if_acmpne"      , 0xa6, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NE },
+	{ "goto"           , 0xa7, 3, R_ANAL_EX_CODEOP_JMP },
+	{ "jsr"            , 0xa8, 3, R_ANAL_EX_CODEOP_CALL },
+	{ "ret"            , 0xa9, 2, R_ANAL_EX_CODEOP_RET },
+
+	{ "tableswitch"    , 0xaa, 1, R_ANAL_EX_CODEOP_SWITCH },
+	{ "lookupswitch"   , 0xab, 1, R_ANAL_EX_CODEOP_SWITCH },
+
+	{ "ireturn"        , 0xac, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM },
+	{ "lreturn"        , 0xad, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM },
+	{ "freturn"        , 0xae, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM },
+	{ "dreturn"        , 0xaf, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_PRIM },
+	{ "areturn"        , 0xb0, 1, R_ANAL_EX_CODEOP_RET | R_ANAL_EX_RET_TYPE_REF },
+	{ "return"         , 0xb1, 1, R_ANAL_EX_CODEOP_RET },
+
+	{ "getstatic"      , 0xb2, 3, R_ANAL_EX_LDST_LOAD_GET_STATIC },
+	{ "putstatic"      , 0xb3, 3, R_ANAL_EX_LDST_STORE_PUT_STATIC },
+	{ "getfield"       , 0xb4, 3, R_ANAL_EX_LDST_LOAD_GET_FIELD },
+	{ "putfield"       , 0xb5, 3, R_ANAL_EX_LDST_STORE_PUT_FIELD },
+
+	{ "invokevirtual"  , 0xb6, 3, R_ANAL_EX_CODEOP_CALL },
+	{ "invokespecial"  , 0xb7, 3, R_ANAL_EX_CODEOP_CALL },
+	{ "invokestatic"   , 0xb8, 3, R_ANAL_EX_CODEOP_CALL },
+	{ "invokeinterface", 0xb9, 5, R_ANAL_EX_CODEOP_CALL },
+	{ "invokedynamic"  , 0xba, 5, R_ANAL_EX_CODEOP_CALL },
+
+	{ "new"            , 0xbb, 3, R_ANAL_EX_OBJOP_NEW },
+	{ "newarray"       , 0xbc, 2, R_ANAL_EX_OBJOP_NEW },
+	{ "anewarray"      , 0xbd, 3, R_ANAL_EX_OBJOP_NEW },
+
+	{ "arraylength"    , 0xbe, 1, R_ANAL_EX_OBJOP_SIZE },
+	{ "athrow"         , 0xbf, 1, R_ANAL_EX_CODEOP_TRAP },
+
+	{ "checkcast"      , 0xc0, 3, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_OBJOP_CHECK | R_ANAL_EX_OBJOP_CAST },
+	{ "instanceof"     , 0xc1, 3, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_OBJOP_CHECK },
+	{ "monitorenter"   , 0xc2, 1, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_LOAD_OP  | R_ANAL_EX_TYPE_REF },
+	{ "monitorexit"    , 0xc3, 1, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_STORE_OP | R_ANAL_EX_TYPE_REF },
+	{ "wide"           , 0xc4, 1, R_ANAL_EX_REP_OP },
+	{ "multinewarray"  , 0xc5, 4, R_ANAL_EX_CODEOP_CALL | R_ANAL_EX_OBJOP_NEW | R_ANAL_EX_TYPE_REF },
+	{ "ifnull"         , 0xc6, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NULL | R_ANAL_EX_COND_EQ },
+	{ "ifnonnull"      , 0xc7, 3, R_ANAL_EX_CODEOP_CJMP | R_ANAL_EX_COND_NULL | R_ANAL_EX_COND_NE },
+	{ "goto_w"         , 0xc8, 5, R_ANAL_EX_CODEOP_JMP },
+	{ "jsr_w"          , 0xc9, 5, R_ANAL_EX_CODEOP_JMP | R_ANAL_EX_CODEOP_CALL },
+	{ "breakpoint"     , 0xca, 1, R_ANAL_EX_CODEOP_SWI },
+
+	{ "undefined"      , 0xcb, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xcc, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xcd, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xce, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xcf, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd0, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd1, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd2, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd3, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd4, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd5, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd6, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd7, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd8, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xd9, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xda, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xdb, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xdc, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xdd, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xde, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xdf, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe0, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe1, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe2, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe3, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe4, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe5, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe6, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe7, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe8, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xe9, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xea, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xeb, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xec, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xed, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xee, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xef, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf0, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf1, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf2, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf3, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf4, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf5, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf6, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf7, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf8, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xf9, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xfa, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xfb, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xfc, 1, R_ANAL_EX_UNK_OP },
+	{ "undefined"      , 0xfd, 1, R_ANAL_EX_UNK_OP },
+	{ "impdep1"        , 0xfe, 1, R_ANAL_EX_ILL_OP },
+	{ "impdep2"        , 0xff, 1, R_ANAL_EX_ILL_OP },
 	{ NULL, 0, 0, 0 }
 };
diff -Nru radare2-2.3.0+dfsg/shlr/Makefile radare2-2.8.0+dfsg/shlr/Makefile
--- radare2-2.3.0+dfsg/shlr/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -16,16 +16,17 @@
 WGET?=wget
 
 ifeq ($(CS_RELEASE),1)
-CS_VER=3.0.4
+CS_VER=3.0.5
 CS_TAR=https://codeload.github.com/aquynh/capstone/tar.gz/$(CS_VER)
 #CS_TAR=http://capstone-engine.org/download/$(CS_VER)/capstone-$(CS_VER).tgz
 CS_PATCHES=0
 else
 CS_TAR=
 CS_URL=$(GIT_PREFIX)github.com/aquynh/capstone.git
-CS_UPD=20180106
-CS_BRA=next
-CS_TIP=bdbc57de63725a98732ddc34b48de96f8ada66f2
+CS_UPD=20180723
+# NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/meson.build
+CS_BRA=master
+CS_TIP=782ea67e17a391ca0d3faafdc365b335a1a8930a
 # REVERT THIS COMMIT BECAUSE ITS WRONG
 CS_REV=
 CS_PATCHES=1
@@ -37,7 +38,7 @@
 SHLR?=$(shell pwd)
 AR?=ar
 RANLIB?=ranlib
-MODS=sdb zip udis86 java tcc
+MODS=sdb zip java tcc
 MODS+=gdb qnx ar
 # lz4
 ifneq ($(CC),cccl)
@@ -93,7 +94,6 @@
 endif
 endif
 
-
 targets:
 	for TARGET in ${SDB_TARGETS} ; do ${MAKE} $$TARGET ; done
 
@@ -133,7 +133,7 @@
 	cp -f sdb/src/.sdb${BUILD_EXT_EXE} $@
 
 .PHONY: sdb-sync sync-sdb sdbclean
-F=README.md config.mk src Makefile Jamroot meson.build msvc
+F=README.md config.mk src Makefile meson.build msvc
 SYNCFILES=$(addprefix sdb.vc/,${F})
 I=../libr/include
 
@@ -172,9 +172,6 @@
 $(TCCLIB) libr_tcc/libr_tcc.${EXT_AR}:
 	cd libr_tcc ; $(MAKE)
 
-udis-sync udis86-sync sync-udis sync-udis86:
-	cd udis86 ; $(MAKE) sync
-
 tcc-clean tccclean:
 	cd libr_tcc ; $(MAKE) clean
 
@@ -195,10 +192,9 @@
 	$(GIT) add tcc
 	rm -rf _
 
-install:
-	#mkdir -p ${DESTDIR}${LIBDIR}
-	#cp -f tcc/libr_tcc* ${DESTDIR}${LIBDIR}
-	#cp -f zip/libr_z* ${DESTDIR}${LIBDIR}
+install: libr_shlr.${EXT_AR}
+	mkdir -p ${DESTDIR}/${LIBDIR}
+	cp -f libr_shlr.${EXT_AR} ${DESTDIR}/${LIBDIR}
 
 install-symlink symstall:
 	mkdir -p "${DESTDIR}${LIBDIR}"
@@ -206,8 +202,7 @@
 	#	ln -fs `pwd`/$$FILE ${DESTDIR}${LIBDIR}/$$FILE ; done
 
 uninstall deinstall:
-	#rm -f ${DESTDIR}${LIBDIR}/libr_tcc*
-	#rm -f ${DESTDIR}${LIBDIR}/libr_z*
+	rm -f ${DESTDIR}${LIBDIR}/libr_shlr.${EXT_AR}
 
 ifeq ($(USE_CAPSTONE),1)
 # Do nothing here
@@ -266,7 +261,7 @@
 capstone-build: capstone
 	cd capstone && CFLAGS="-Dmips=mips ${CAPSTONE_CFLAGS} $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		$(MAKE) $(CAPSTONE_MAKEFLAGS) CC="$(CC)" AR_EXT=a IS_CYGWIN=0 CAPSTONE_STATIC=yes CAPSTONE_SHARED=no \
-		RANLIB="$(RANLIB)" AR="$(AR)" IS_MINGW=0 libcapstone.a
+		RANLIB="$(RANLIB)" LIBARCHS="" AR="$(AR)" IS_MINGW=0 libcapstone.a
 ifneq (${EXT_AR},a)
 	-cp -f capstone/libcapstone.a capstone/libcapstone.${EXT_AR}
 endif
@@ -313,4 +308,25 @@
 spp: spp-sync
 	CFLAGS="-DHAVE_FORK=${HAVE_FORK} -fPIC" $(MAKE) -C spp
 
+SHLRS+=ar/libr_ar.a
+SHLRS+=bochs/lib/libbochs.a
+SHLRS+=capstone/libcapstone.a
+SHLRS+=gdb/lib/libgdbr.a
+SHLRS+=grub/libgrubfs.a
+SHLRS+=java/libr_java.a
+SHLRS+=lz4/liblz4.a
+SHLRS+=qnx/lib/libqnxr.a
+#SHLRS+=sdb/src/libsdb.a
+#SHLRS+=tcc/libr_tcc.a
+SHLRS+=windbg/libr_windbg.a
+SHLRS+=zip/librz.a
+
+libr_shlr.${EXT_AR}:
+	rm -rf .libr
+	mkdir .libr
+	for LIB in ${SHLRS} ; do \
+		if [ -f "$${LIB}" ]; then ${PARTIALLD} -o .libr/$$(basename $${LIB} .a).o $${LIB} ; fi ; \
+	done
+	${AR} crs $@ .libr/*.o
+
 .PHONY: spp
diff -Nru radare2-2.3.0+dfsg/shlr/meson.build radare2-2.8.0+dfsg/shlr/meson.build
--- radare2-2.3.0+dfsg/shlr/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,401 +1,617 @@
-bochs_files=[
-'bochs/src/libbochs.c'
+# handle capstone dependency
+capstone_dep = dependency('capstone', version: '>=3.0.4', required: false)
+if not capstone_dep.found() or not get_option('use_sys_capstone')
+  message('Use bundled capstone')
+
+  capstone_path = join_paths(meson.current_build_dir(), 'capstone')
+  res = run_command(py3_exe, '-c', '__import__("sys").exit(__import__("os").path.exists("@0@"))'.format(capstone_path))
+  if res.returncode() == 0
+    if not git_exe.found()
+      error('Cannot load capstone library. Either provide capstone in ./shlr/capstone or install git, so it can be downloaded')
+    endif
+
+    # NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/Makefile
+    CS_TIP = '782ea67e17a391ca0d3faafdc365b335a1a8930a'
+    CS_BRA = 'master'
+
+    capstone_git_user = 'aquynh'
+
+    message('Cloning capstone ' + CS_BRA + ' branch, commit ' + CS_TIP + ', into ' + capstone_path)
+    git_cmd = 'clone -b @0@ https://github.com/@1@/capstone.git @2@'.format(CS_BRA, capstone_git_user, capstone_path)
+    clone_cmd = run_command(git_exe, git_cmd.split())
+    if clone_cmd.returncode() != 0
+      error('Cannot execute git clone command')
+    endif
+
+    reset_cmd_str = '-C @0@ reset --hard @1@'.format(capstone_path, CS_TIP)
+    reset_cmd = run_command(git_exe, reset_cmd_str.split())
+    if reset_cmd.returncode() != 0
+      error('Cannot execute git reset command')
+    endif
+
+    patches_files = [
+      'capstone-calloc.patch',
+      'fix-m68k-oob.patch',
+      'fix-underflow-tms.patch',
+      'fix-x86-16.patch',
+      'sparc-crash.patch',
+      'sstream-null.patch'
+    ]
+
+    message('Patching capstone with radare\'s patches')
+    foreach file : patches_files
+      patch_path = join_paths(meson.current_source_dir(), 'capstone-patches', file)
+      patch_cmd_str = '-C @0@ apply -p1 @1@'.format(capstone_path, patch_path)
+      patch_cmd = run_command(git_exe, patch_cmd_str.split())
+      if patch_cmd.returncode() != 0
+        error('Cannot apply patch ' + file)
+      endif
+    endforeach
+  endif
+
+  rel_cs_files = [
+    'arch/AArch64/AArch64BaseInfo.c',
+    'arch/AArch64/AArch64Disassembler.c',
+    'arch/AArch64/AArch64InstPrinter.c',
+    'arch/AArch64/AArch64Mapping.c',
+    'arch/AArch64/AArch64Module.c',
+    'arch/ARM/ARMDisassembler.c',
+    'arch/ARM/ARMInstPrinter.c',
+    'arch/ARM/ARMMapping.c',
+    'arch/ARM/ARMModule.c',
+    'arch/M68K/M68KDisassembler.c',
+    'arch/M68K/M68KInstPrinter.c',
+    'arch/M68K/M68KModule.c',
+    'arch/Mips/MipsDisassembler.c',
+    'arch/Mips/MipsInstPrinter.c',
+    'arch/Mips/MipsMapping.c',
+    'arch/Mips/MipsModule.c',
+    'arch/PowerPC/PPCDisassembler.c',
+    'arch/PowerPC/PPCInstPrinter.c',
+    'arch/PowerPC/PPCMapping.c',
+    'arch/PowerPC/PPCModule.c',
+    'arch/Sparc/SparcDisassembler.c',
+    'arch/Sparc/SparcInstPrinter.c',
+    'arch/Sparc/SparcMapping.c',
+    'arch/Sparc/SparcModule.c',
+    'arch/SystemZ/SystemZDisassembler.c',
+    'arch/SystemZ/SystemZInstPrinter.c',
+    'arch/SystemZ/SystemZMapping.c',
+    'arch/SystemZ/SystemZMCTargetDesc.c',
+    'arch/SystemZ/SystemZModule.c',
+    'arch/TMS320C64x/TMS320C64xDisassembler.c',
+    'arch/TMS320C64x/TMS320C64xInstPrinter.c',
+    'arch/TMS320C64x/TMS320C64xMapping.c',
+    'arch/TMS320C64x/TMS320C64xModule.c',
+    'arch/X86/X86ATTInstPrinter.c',
+    'arch/X86/X86Disassembler.c',
+    'arch/X86/X86DisassemblerDecoder.c',
+    'arch/X86/X86IntelInstPrinter.c',
+    'arch/X86/X86Mapping.c',
+    'arch/X86/X86Module.c',
+    'arch/XCore/XCoreDisassembler.c',
+    'arch/XCore/XCoreInstPrinter.c',
+    'arch/XCore/XCoreMapping.c',
+    'arch/XCore/XCoreModule.c',
+    'cs.c',
+    'MCInst.c',
+    'MCInstrDesc.c',
+    'MCRegisterInfo.c',
+    'SStream.c',
+    'utils.c',
+  ]
+
+  cs_files = []
+  foreach rel_cs_file : rel_cs_files
+    cs_files += [join_paths(capstone_path, rel_cs_file)]
+  endforeach
+
+  capstone_includes = [platform_inc, include_directories('capstone/include')]
+
+  libr2capstone = static_library('r2capstone', cs_files,
+    c_args: [
+      '-DCAPSTONE_X86_ATT_DISABLE_NO',
+      '-DCAPSTONE_X86_REDUCE_NO',
+      '-DCAPSTONE_USE_SYS_DYN_MEM',
+      '-DCAPSTONE_DIET_NO',
+      '-DCAPSTONE_HAS_ARM',
+      '-DCAPSTONE_HAS_ARM64',
+      '-DCAPSTONE_HAS_M68K',
+      '-DCAPSTONE_HAS_MIPS',
+      '-DCAPSTONE_HAS_POWERPC',
+      '-DCAPSTONE_HAS_SPARC',
+      '-DCAPSTONE_HAS_SYSZ',
+      '-DCAPSTONE_HAS_X86',
+      '-DCAPSTONE_HAS_XCORE',
+      '-DCAPSTONE_HAS_TMS320C64X',
+    ],
+    include_directories: capstone_includes,
+    implicit_include_directories: false
+  )
+
+  capstone_dep = declare_dependency(
+    link_with: libr2capstone,
+    include_directories: capstone_includes
+  )
+else
+  message('Use system-provided capstone library')
+endif
+
+
+# handle sdb dependency
+# NOTE: copying most of the stuff from sdb to here for the moment, since we
+# should use subpackages to handle this well
+sdb_files = [
+  'sdb/src/array.c',
+  'sdb/src/base64.c',
+  'sdb/src/buffer.c',
+  'sdb/src/cdb.c',
+  'sdb/src/cdb_make.c',
+  'sdb/src/dict.c',
+  'sdb/src/disk.c',
+  'sdb/src/fmt.c',
+  'sdb/src/ht.c',
+  'sdb/src/journal.c',
+  'sdb/src/json.c',
+  'sdb/src/lock.c',
+  'sdb/src/ls.c',
+  # 'sdb/src/main.c',
+  'sdb/src/match.c',
+  'sdb/src/ns.c',
+  'sdb/src/num.c',
+  'sdb/src/query.c',
+  'sdb/src/sdb.c',
+  'sdb/src/sdbht.c',
+  'sdb/src/util.c'
+]
+
+sdb_inc = [platform_inc, include_directories('sdb/src')]
+
+libr2sdb = static_library('r2sdb', sdb_files,
+  include_directories: sdb_inc,
+  implicit_include_directories: false
+)
+
+sdb_dep = declare_dependency(
+  link_with: libr2sdb,
+  include_directories: sdb_inc
+)
+
+sdb_platform_inc = []
+if host_machine.system() == 'windows'
+  sdb_platform_inc = include_directories('sdb/msvc')
+endif
+
+# Create sdb_version.h
+sdb_version = '1.2.0'
+run_command(py3_exe, '-c', 'with open("sdb/src/sdb_version.h", "w") as f: f.write("#define SDB_VERSION \"' + sdb_version + '\"")')
+
+sdb_exe = executable('sdb', 'sdb/src/main.c',
+  include_directories: [
+    sdb_platform_inc,
+    include_directories(['sdb/src'])
+  ],
+  link_with: [libr2sdb],
+  implicit_include_directories: false
+)
+
+sdb_gen_cmd = [
+  py3_exe,
+  '-c',
+  'from sys import argv; __import__("os").system("@0@ %s = <%s" % (argv[1], argv[2]))'.format(sdb_exe.full_path()),
+  '@OUTPUT@',
+  '@INPUT@'
 ]
 
-libr2bochs = static_library('libr2bochs', bochs_files,
-  include_directories: [platform_inc, include_directories([
-    'bochs/include'
-  ])]
+
+# handle bochs dependency
+bochs_files = [
+  'bochs/src/libbochs.c'
+]
+
+bochs_inc = [platform_inc, include_directories('bochs/include')]
+
+libr2bochs = static_library('r2bochs', bochs_files,
+  include_directories: bochs_inc,
+  implicit_include_directories: false
+)
+
+bochs_dep = declare_dependency(
+  link_with: libr2bochs,
+  include_directories: bochs_inc
 )
 
 
-gdb_files=[
-'gdb/src/arch.c',
-'gdb/src/common.c',
-'gdb/src/packet.c',
-'gdb/src/utils.c',
-'gdb/src/libgdbr.c',
+# handle gdb dependency
+gdb_files = [
+  'gdb/src/arch.c',
+  'gdb/src/common.c',
+  'gdb/src/packet.c',
+  'gdb/src/utils.c',
+  'gdb/src/libgdbr.c',
 
-'gdb/src/gdbclient/core.c',
-'gdb/src/gdbclient/responses.c',
-'gdb/src/gdbclient/xml.c',
+  'gdb/src/gdbclient/core.c',
+  'gdb/src/gdbclient/responses.c',
+  'gdb/src/gdbclient/xml.c',
 
-'gdb/src/gdbserver/core.c',
+  'gdb/src/gdbserver/core.c',
 ]
 
-libr2gdb = static_library('libr2gdb', gdb_files,
-  include_directories: [platform_inc, include_directories([
+gdb_inc = [
+  platform_inc,
+  include_directories(
     './gdb/include',
     './gdb/include/gdbclient',
     './gdb/include/gdbserver'
-  ])]
+  )
+]
+
+libr2gdb = static_library('r2gdb', gdb_files,
+  include_directories: gdb_inc,
+  implicit_include_directories: false
 )
 
-java_files=[
-'java/class.c',
-'java/code.c',
-'java/dsojson.c',
-'java/ops.c',
-#'java/main.c',
+gdb_dep = declare_dependency(
+  link_with: libr2gdb,
+  include_directories: gdb_inc
+)
+
+
+# handle java dependency
+java_files = [
+  'java/class.c',
+  'java/code.c',
+  'java/dsojson.c',
+  'java/ops.c',
+  #'java/main.c',
 ]
 
-libr2java = static_library('libr2java', java_files,
-  include_directories: [platform_inc, include_directories([
-    'java'
-  ])]
+java_inc = [platform_inc, include_directories('java')]
+
+libr2java = static_library('r2java', java_files,
+  include_directories: java_inc,
+  dependencies: [sdb_dep],
+  implicit_include_directories: false
+)
+
+java_dep = declare_dependency(
+  link_with: libr2java,
+  include_directories: java_inc
 )
 
-qnx_files=[
-'qnx/src/core.c',
-'qnx/src/libqnxr.c',
-'qnx/src/packet.c',
-'qnx/src/sigutil.c',
-'qnx/src/utils.c',
+
+# handle qnx dependency
+qnx_files = [
+  'qnx/src/core.c',
+  'qnx/src/libqnxr.c',
+  'qnx/src/packet.c',
+  'qnx/src/sigutil.c',
+  'qnx/src/utils.c',
 ]
 
-libr2qnx = static_library('libr2qnx', qnx_files,
-  include_directories: [platform_inc, include_directories([
-    'qnx/include'
-  ])]
+qnx_inc = [platform_inc, include_directories('qnx/include')]
+
+libr2qnx = static_library('r2qnx', qnx_files,
+  include_directories: qnx_inc,
+  implicit_include_directories: false
+)
+
+qnx_dep = declare_dependency(
+  link_with: libr2qnx,
+  include_directories: qnx_inc
 )
 
-tcc_files=[
-'tcc/libtcc.c',
-'tcc/tccgen.c',
-'tcc/tccpp.c'
+
+# handle tcc dependency (heavily modified version)
+tcc_files = [
+  'tcc/libtcc.c',
+  'tcc/tccgen.c',
+  'tcc/tccpp.c'
 ]
 
-libr2tcc = static_library('libr2tcc', tcc_files,
-  include_directories: [platform_inc, include_directories([
-    'tcc'
-  ])]
+tcc_inc = [platform_inc, include_directories('tcc')]
+
+libr2tcc = static_library('r2tcc', tcc_files,
+  include_directories: tcc_inc,
+  implicit_include_directories: false
+)
+
+tcc_dep = declare_dependency(
+  link_with: libr2tcc,
+  include_directories: tcc_inc
 )
 
-spp_files=[
+
+# handle spp dependency
+spp_files = [
   'spp/spp.c'
 ]
 
-libr2spp = static_library('libr2spp', spp_files,
-  include_directories: [platform_inc, include_directories([
-    'spp/'
-  ])],
-  c_args: ['-DHAVE_R_UTIL']
-)
-
-sdb_files=[
-'sdb/src/array.c',
-'sdb/src/base64.c',
-'sdb/src/buffer.c',
-'sdb/src/cdb.c',
-'sdb/src/cdb_make.c',
-'sdb/src/disk.c',
-'sdb/src/fmt.c',
-'sdb/src/ht.c',
-'sdb/src/journal.c',
-'sdb/src/json.c',
-'sdb/src/lock.c',
-'sdb/src/ls.c',
-# 'sdb/src/main.c',
-'sdb/src/match.c',
-'sdb/src/ns.c',
-'sdb/src/num.c',
-'sdb/src/query.c',
-'sdb/src/sdb.c',
-'sdb/src/sdbht.c',
-'sdb/src/util.c'
-]
-
-libr2sdb = static_library('libr2sdb', sdb_files,
-  include_directories: [platform_inc, include_directories([
-    'sdb/src',
-    '../libr/include/sdb'
-  ])]
-)
-
-lz4_files=[
-'lz4/lz4.c',
-]
-
-libr2lz4 = static_library('libr2lz4', lz4_files,
-  include_directories: [platform_inc, include_directories([
-    'lz4'
-  ])]
-)
-
-zlib_files=[
-'zip/zip/zip_add.c',
-'zip/zip/zip_add_dir.c',
-'zip/zip/zip_add_entry.c',
-'zip/zip/zip_close.c',
-'zip/zip/zip_delete.c',
-'zip/zip/zip_dir_add.c',
-'zip/zip/zip_dirent.c',
-'zip/zip/zip_discard.c',
-'zip/zip/zip_entry.c',
-'zip/zip/zip_err_str.c',
-'zip/zip/zip_error.c',
-#'zip/zip/zip_error_clear.c',
-'zip/zip/zip_error_get.c',
-'zip/zip/zip_error_get_sys_type.c',
-'zip/zip/zip_error_strerror.c',
-'zip/zip/zip_error_to_str.c',
-'zip/zip/zip_extra_field.c',
-'zip/zip/zip_extra_field_api.c',
-'zip/zip/zip_fclose.c',
-'zip/zip/zip_fdopen.c',
-'zip/zip/zip_file_add.c',
-#'zip/zip/zip_file_error_clear.c',
-'zip/zip/zip_file_error_get.c',
-'zip/zip/zip_file_get_comment.c',
-'zip/zip/zip_file_get_offset.c',
-'zip/zip/zip_file_rename.c',
-'zip/zip/zip_file_replace.c',
-'zip/zip/zip_file_set_comment.c',
-'zip/zip/zip_file_strerror.c',
-'zip/zip/zip_filerange_crc.c',
-'zip/zip/zip_fopen.c',
-'zip/zip/zip_fopen_encrypted.c',
-'zip/zip/zip_fopen_index.c',
-'zip/zip/zip_fopen_index_encrypted.c',
-'zip/zip/zip_fread.c',
-'zip/zip/zip_get_archive_comment.c',
-'zip/zip/zip_get_archive_flag.c',
-'zip/zip/zip_get_compression_implementation.c',
-'zip/zip/zip_get_encryption_implementation.c',
-'zip/zip/zip_get_file_comment.c',
-'zip/zip/zip_get_name.c',
-'zip/zip/zip_get_num_entries.c',
-'zip/zip/zip_get_num_files.c',
-'zip/zip/zip_name_locate.c',
-'zip/zip/zip_new.c',
-'zip/zip/zip_open.c',
-'zip/zip/zip_rename.c',
-'zip/zip/zip_replace.c',
-'zip/zip/zip_set_archive_comment.c',
-'zip/zip/zip_set_archive_flag.c',
-'zip/zip/zip_set_default_password.c',
-'zip/zip/zip_set_file_comment.c',
-'zip/zip/zip_set_file_compression.c',
-'zip/zip/zip_set_name.c',
-'zip/zip/zip_source_buffer.c',
-'zip/zip/zip_source_close.c',
-'zip/zip/zip_source_crc.c',
-'zip/zip/zip_source_deflate.c',
-'zip/zip/zip_source_error.c',
-'zip/zip/zip_source_file.c',
-'zip/zip/zip_source_filep.c',
-'zip/zip/zip_source_free.c',
-'zip/zip/zip_source_function.c',
-'zip/zip/zip_source_layered.c',
-'zip/zip/zip_source_open.c',
-'zip/zip/zip_source_pkware.c',
-'zip/zip/zip_source_pop.c',
-'zip/zip/zip_source_read.c',
-'zip/zip/zip_source_stat.c',
-'zip/zip/zip_source_window.c',
-'zip/zip/zip_source_zip.c',
-'zip/zip/zip_source_zip_new.c',
-'zip/zip/zip_stat.c',
-'zip/zip/zip_stat_index.c',
-'zip/zip/zip_stat_init.c',
-'zip/zip/zip_strerror.c',
-'zip/zip/zip_string.c',
-'zip/zip/zip_unchange.c',
-'zip/zip/zip_unchange_all.c',
-'zip/zip/zip_unchange_archive.c',
-'zip/zip/zip_unchange_data.c',
-'zip/zip/zip_utf-8.c',
-'zip/zlib/adler32.c',
-'zip/zlib/compress.c',
-'zip/zlib/crc32.c',
-'zip/zlib/deflate.c',
-'zip/zlib/gzclose.c',
-'zip/zlib/gzlib.c',
-'zip/zlib/gzread.c',
-'zip/zlib/gzwrite.c',
-'zip/zlib/infback.c',
-'zip/zlib/inffast.c',
-'zip/zlib/inflate.c',
-'zip/zlib/inftrees.c',
-'zip/zlib/trees.c',
-'zip/zlib/uncompr.c',
-'zip/zlib/zutil.c'
-]
-
-libr2zip = static_library('libr2zip', zlib_files,
-  include_directories: [platform_inc, include_directories([
-    'zip/include'
-  ])]
-)
-
-cs_files=[
-'capstone/arch/AArch64/AArch64BaseInfo.c',
-'capstone/arch/AArch64/AArch64Disassembler.c',
-'capstone/arch/AArch64/AArch64InstPrinter.c',
-'capstone/arch/AArch64/AArch64Mapping.c',
-'capstone/arch/AArch64/AArch64Module.c',
-'capstone/arch/ARM/ARMDisassembler.c',
-'capstone/arch/ARM/ARMInstPrinter.c',
-'capstone/arch/ARM/ARMMapping.c',
-'capstone/arch/ARM/ARMModule.c',
-'capstone/arch/M68K/M68KDisassembler.c',
-'capstone/arch/M68K/M68KInstPrinter.c',
-'capstone/arch/M68K/M68KModule.c',
-'capstone/arch/Mips/MipsDisassembler.c',
-'capstone/arch/Mips/MipsInstPrinter.c',
-'capstone/arch/Mips/MipsMapping.c',
-'capstone/arch/Mips/MipsModule.c',
-'capstone/arch/PowerPC/PPCDisassembler.c',
-'capstone/arch/PowerPC/PPCInstPrinter.c',
-'capstone/arch/PowerPC/PPCMapping.c',
-'capstone/arch/PowerPC/PPCModule.c',
-'capstone/arch/Sparc/SparcDisassembler.c',
-'capstone/arch/Sparc/SparcInstPrinter.c',
-'capstone/arch/Sparc/SparcMapping.c',
-'capstone/arch/Sparc/SparcModule.c',
-'capstone/arch/SystemZ/SystemZDisassembler.c',
-'capstone/arch/SystemZ/SystemZInstPrinter.c',
-'capstone/arch/SystemZ/SystemZMapping.c',
-'capstone/arch/SystemZ/SystemZMCTargetDesc.c',
-'capstone/arch/SystemZ/SystemZModule.c',
-'capstone/arch/TMS320C64x/TMS320C64xDisassembler.c',
-'capstone/arch/TMS320C64x/TMS320C64xInstPrinter.c',
-'capstone/arch/TMS320C64x/TMS320C64xMapping.c',
-'capstone/arch/TMS320C64x/TMS320C64xModule.c',
-'capstone/arch/X86/X86ATTInstPrinter.c',
-'capstone/arch/X86/X86Disassembler.c',
-'capstone/arch/X86/X86DisassemblerDecoder.c',
-'capstone/arch/X86/X86IntelInstPrinter.c',
-'capstone/arch/X86/X86Mapping.c',
-'capstone/arch/X86/X86Module.c',
-'capstone/arch/XCore/XCoreDisassembler.c',
-'capstone/arch/XCore/XCoreInstPrinter.c',
-'capstone/arch/XCore/XCoreMapping.c',
-'capstone/arch/XCore/XCoreModule.c',
-'capstone/cs.c',
-'capstone/MCInst.c',
-'capstone/MCInstrDesc.c',
-'capstone/MCRegisterInfo.c',
-'capstone/SStream.c',
-'capstone/utils.c',
-]
-
-libr2capstone = static_library('libr2capstone', cs_files,
-  c_args: [
-    '-DCAPSTONE_X86_ATT_DISABLE_NO',
-    '-DCAPSTONE_X86_REDUCE_NO',
-    '-DCAPSTONE_USE_SYS_DYN_MEM',
-    '-DCAPSTONE_DIET_NO',
-    '-DCAPSTONE_HAS_ARM',
-    '-DCAPSTONE_HAS_ARM64',
-    '-DCAPSTONE_HAS_M68K',
-    '-DCAPSTONE_HAS_MIPS',
-    '-DCAPSTONE_HAS_POWERPC',
-    '-DCAPSTONE_HAS_SPARC',
-    '-DCAPSTONE_HAS_SYSZ',
-    '-DCAPSTONE_HAS_X86',
-    '-DCAPSTONE_HAS_XCORE',
-    '-DCAPSTONE_HAS_TMS320C64X',
-  ],
-  include_directories: include_directories([
-    'capstone/include'
-  ])
-)
-
-grub_files=[
-'grub/fs/affs.c',
-#'grub/fs/afs.c',
-#'grub/fs/afs_be.c',
-#'grub/fs/befs.c',
-#'grub/fs/befs_be.c',
-'grub/fs/btrfs.c',
-#'grub/fs/cpio.c',
-'grub/fs/ext2.c',
-'grub/fs/fat.c',
-'grub/fs/fb.c',
-'grub/fs/fshelp.c',
-'grub/fs/hfs.c',
-'grub/fs/hfsplus.c',
-'grub/fs/iso9660.c',
-'grub/fs/jfs.c',
-'grub/fs/minix.c',
-'grub/fs/minix2.c',
-'grub/fs/nilfs2.c',
-'grub/fs/ntfs.c',
-'grub/fs/ntfscomp.c',
-'grub/fs/reiserfs.c',
-'grub/fs/sfs.c',
-'grub/fs/tar.c',
-'grub/fs/udf.c',
-'grub/fs/ufs.c',
-'grub/fs/ufs2.c',
-'grub/fs/xfs.c',
-'grub/grubfs.c',
-'grub/kern/device.c',
-'grub/kern/disk.c',
-#'grub/kern/dl.c',
-'grub/kern/env.c',
-'grub/kern/err.c',
-'grub/kern/file.c',
-'grub/kern/fs.c',
-'grub/kern/list.c',
-'grub/kern/misc.c',
-'grub/kern/mm.c',
-'grub/kern/partition.c',
-'grub/kern/term.c',
-'grub/kern/time.c',
-#'grub/main.c',
-#'grub/partmap/acorn.c',
-'grub/partmap/amiga.c',
-'grub/partmap/apple.c',
-'grub/partmap/bsdlabel.c',
-'grub/partmap/gpt.c',
-'grub/partmap/msdos.c',
-'grub/partmap/sun.c',
-'grub/partmap/sunpc.c',
-]
-
-libr2grub = static_library('libr2grub', grub_files,
-  include_directories: [platform_inc, include_directories([
-    'grub',
-    'grub/include'
-  ])]
-)
-
-windbg_files=[
-'windbg/iob_pipe.c',
-'windbg/kd.c',
-'windbg/transport.c',
-'windbg/windbg.c',
-]
-
-libr2windbg = static_library('libr2windbg', windbg_files,
-  include_directories: [platform_inc, include_directories([
-    'windbg'
-  ])]
-)
-
-udis86_files=[
-'udis86/decode.c',
-'udis86/itab.c',
-'udis86/syn.c',
-'udis86/syn-att.c',
-'udis86/syn-intel.c',
-'udis86/udis86.c',
-]
-
-libr2udis86 = static_library('libr2udis86', udis86_files,
-  include_directories: [platform_inc, include_directories([
-    'udis86'
-  ])]
-)
-
-ar_files=[
-'ar/ar.c'
-]
-
-libr2ar = static_library('libr2ar', ar_files,
-  include_directories: [platform_inc, include_directories([
-	'ar'
-  ])]
+spp_inc = [platform_inc, include_directories('spp')]
+
+libr2spp = static_library('r2spp', spp_files,
+  include_directories: spp_inc,
+  c_args: ['-DHAVE_R_UTIL'],
+  implicit_include_directories: false
+)
+
+spp_dep = declare_dependency(
+  link_with: libr2spp,
+  include_directories: spp_inc
+)
+
+
+# handle lz4 dependency
+lz4_dep = dependency('liblz4', required: false)
+if not lz4_dep.found() or not get_option('use_sys_lz4')
+  message('Use bundled lz4')
+  lz4_files = [
+    'lz4/lz4.c',
+  ]
+
+  lz4_inc = [platform_inc, include_directories('lz4')]
+
+  libr2lz4 = static_library('r2lz4', lz4_files,
+    include_directories: lz4_inc,
+    implicit_include_directories: false
+  )
+
+  lz4_dep = declare_dependency(
+    link_with: libr2lz4,
+    include_directories: lz4_inc
+  )
+else
+  message('Use system-provided lz4 library')
+endif
+
+
+# handle zlib dependency
+zlib_dep = dependency('zlib', required: false)
+if not zlib_dep.found() or not get_option('use_sys_zlib')
+  message('Use bundled zlib')
+
+  zlib_files = [
+    'zip/zlib/adler32.c',
+    'zip/zlib/compress.c',
+    'zip/zlib/crc32.c',
+    'zip/zlib/deflate.c',
+    'zip/zlib/gzclose.c',
+    'zip/zlib/gzlib.c',
+    'zip/zlib/gzread.c',
+    'zip/zlib/gzwrite.c',
+    'zip/zlib/infback.c',
+    'zip/zlib/inffast.c',
+    'zip/zlib/inflate.c',
+    'zip/zlib/inftrees.c',
+    'zip/zlib/trees.c',
+    'zip/zlib/uncompr.c',
+    'zip/zlib/zutil.c'
+  ]
+
+  zlib_inc = [platform_inc, include_directories('zip/zlib')]
+
+  libr2zlib = static_library('r2zlib', zlib_files,
+    include_directories: zlib_inc,
+    implicit_include_directories: false
+  )
+
+  zlib_dep = declare_dependency(
+    link_with: libr2zlib,
+    include_directories: zlib_inc
+  )
+else
+  message('Use system-provided zlib library')
+endif
+
+
+# handle zip dependency
+zip_dep = dependency('libzip', required: false)
+if not zip_dep.found() or not get_option('use_sys_zip')
+  message('Use bundled zip')
+
+  zip_files = [
+    'zip/zip/zip_add.c',
+    'zip/zip/zip_add_dir.c',
+    'zip/zip/zip_add_entry.c',
+    'zip/zip/zip_close.c',
+    'zip/zip/zip_delete.c',
+    'zip/zip/zip_dir_add.c',
+    'zip/zip/zip_dirent.c',
+    'zip/zip/zip_discard.c',
+    'zip/zip/zip_entry.c',
+    'zip/zip/zip_err_str.c',
+    'zip/zip/zip_error.c',
+    #'zip/zip/zip_error_clear.c',
+    'zip/zip/zip_error_get.c',
+    'zip/zip/zip_error_get_sys_type.c',
+    'zip/zip/zip_error_strerror.c',
+    'zip/zip/zip_error_to_str.c',
+    'zip/zip/zip_extra_field.c',
+    'zip/zip/zip_extra_field_api.c',
+    'zip/zip/zip_fclose.c',
+    'zip/zip/zip_fdopen.c',
+    'zip/zip/zip_file_add.c',
+    #'zip/zip/zip_file_error_clear.c',
+    'zip/zip/zip_file_error_get.c',
+    'zip/zip/zip_file_get_comment.c',
+    'zip/zip/zip_file_get_offset.c',
+    'zip/zip/zip_file_rename.c',
+    'zip/zip/zip_file_replace.c',
+    'zip/zip/zip_file_set_comment.c',
+    'zip/zip/zip_file_strerror.c',
+    'zip/zip/zip_filerange_crc.c',
+    'zip/zip/zip_fopen.c',
+    'zip/zip/zip_fopen_encrypted.c',
+    'zip/zip/zip_fopen_index.c',
+    'zip/zip/zip_fopen_index_encrypted.c',
+    'zip/zip/zip_fread.c',
+    'zip/zip/zip_get_archive_comment.c',
+    'zip/zip/zip_get_archive_flag.c',
+    'zip/zip/zip_get_compression_implementation.c',
+    'zip/zip/zip_get_encryption_implementation.c',
+    'zip/zip/zip_get_file_comment.c',
+    'zip/zip/zip_get_name.c',
+    'zip/zip/zip_get_num_entries.c',
+    'zip/zip/zip_get_num_files.c',
+    'zip/zip/zip_name_locate.c',
+    'zip/zip/zip_new.c',
+    'zip/zip/zip_open.c',
+    'zip/zip/zip_rename.c',
+    'zip/zip/zip_replace.c',
+    'zip/zip/zip_set_archive_comment.c',
+    'zip/zip/zip_set_archive_flag.c',
+    'zip/zip/zip_set_default_password.c',
+    'zip/zip/zip_set_file_comment.c',
+    'zip/zip/zip_set_file_compression.c',
+    'zip/zip/zip_set_name.c',
+    'zip/zip/zip_source_buffer.c',
+    'zip/zip/zip_source_close.c',
+    'zip/zip/zip_source_crc.c',
+    'zip/zip/zip_source_deflate.c',
+    'zip/zip/zip_source_error.c',
+    'zip/zip/zip_source_file.c',
+    'zip/zip/zip_source_filep.c',
+    'zip/zip/zip_source_free.c',
+    'zip/zip/zip_source_function.c',
+    'zip/zip/zip_source_layered.c',
+    'zip/zip/zip_source_open.c',
+    'zip/zip/zip_source_pkware.c',
+    'zip/zip/zip_source_pop.c',
+    'zip/zip/zip_source_read.c',
+    'zip/zip/zip_source_stat.c',
+    'zip/zip/zip_source_window.c',
+    'zip/zip/zip_source_zip.c',
+    'zip/zip/zip_source_zip_new.c',
+    'zip/zip/zip_stat.c',
+    'zip/zip/zip_stat_index.c',
+    'zip/zip/zip_stat_init.c',
+    'zip/zip/zip_strerror.c',
+    'zip/zip/zip_string.c',
+    'zip/zip/zip_unchange.c',
+    'zip/zip/zip_unchange_all.c',
+    'zip/zip/zip_unchange_archive.c',
+    'zip/zip/zip_unchange_data.c',
+    'zip/zip/zip_utf-8.c'
+  ]
+
+  zip_inc = [platform_inc, include_directories('zip/include')]
+
+  libr2zip = static_library('r2zip', zip_files,
+    include_directories: zip_inc,
+    implicit_include_directories: false,
+    dependencies: zlib_dep
+  )
+
+  zip_dep = declare_dependency(
+    link_with: libr2zip,
+    include_directories: zip_inc
+  )
+else
+  message('Use system-provided zip library')
+endif
+
+
+# handle grub dependency
+grub_files = [
+  'grub/fs/affs.c',
+  #'grub/fs/afs.c',
+  #'grub/fs/afs_be.c',
+  #'grub/fs/befs.c',
+  #'grub/fs/befs_be.c',
+  'grub/fs/btrfs.c',
+  'grub/fs/cpio.c',
+  'grub/fs/ext2.c',
+  'grub/fs/fat.c',
+  'grub/fs/fb.c',
+  'grub/fs/fshelp.c',
+  'grub/fs/hfs.c',
+  'grub/fs/hfsplus.c',
+  'grub/fs/iso9660.c',
+  'grub/fs/jfs.c',
+  'grub/fs/minix.c',
+  'grub/fs/minix2.c',
+  'grub/fs/nilfs2.c',
+  'grub/fs/ntfs.c',
+  'grub/fs/ntfscomp.c',
+  'grub/fs/reiserfs.c',
+  'grub/fs/sfs.c',
+  'grub/fs/tar.c',
+  'grub/fs/udf.c',
+  'grub/fs/ufs.c',
+  'grub/fs/ufs2.c',
+  'grub/fs/xfs.c',
+  'grub/grubfs.c',
+  'grub/kern/device.c',
+  'grub/kern/disk.c',
+  #'grub/kern/dl.c',
+  'grub/kern/env.c',
+  'grub/kern/err.c',
+  'grub/kern/file.c',
+  'grub/kern/fs.c',
+  'grub/kern/list.c',
+  'grub/kern/misc.c',
+  'grub/kern/mm.c',
+  'grub/kern/partition.c',
+  'grub/kern/term.c',
+  'grub/kern/time.c',
+  #'grub/main.c',
+  #'grub/partmap/acorn.c',
+  'grub/partmap/amiga.c',
+  'grub/partmap/apple.c',
+  'grub/partmap/bsdlabel.c',
+  'grub/partmap/gpt.c',
+  'grub/partmap/msdos.c',
+  'grub/partmap/sun.c',
+  'grub/partmap/sunpc.c',
+]
+
+grub_inc = [platform_inc, include_directories('grub', 'grub/include')]
+
+libr2grub = static_library('r2grub', grub_files,
+  include_directories: grub_inc,
+  implicit_include_directories: false
+)
+
+grub_dep = declare_dependency(
+  link_with: libr2grub,
+  include_directories: grub_inc
+)
+
+
+# handle windbg dependency
+windbg_files = [
+  'windbg/iob_pipe.c',
+  'windbg/kd.c',
+  'windbg/transport.c',
+  'windbg/windbg.c',
+]
+
+windbg_inc = [platform_inc, include_directories('windbg')]
+
+libr2windbg = static_library('r2windbg', windbg_files,
+  include_directories: windbg_inc,
+  implicit_include_directories: false
+)
+
+windbg_dep = declare_dependency(
+  link_with: libr2windbg,
+  include_directories: windbg_inc
+)
+
+
+# handle ar dependency
+ar_files = [
+  'ar/ar.c'
+]
+
+ar_inc = [platform_inc, include_directories(['ar'])]
+
+libr2ar = static_library('r2ar', ar_files,
+  include_directories: ar_inc,
+  implicit_include_directories: false
+)
+
+ar_dep = declare_dependency(
+  link_with: libr2ar,
+  include_directories: ar_inc
 )
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/config.mk radare2-2.8.0+dfsg/shlr/sdb/config.mk
--- radare2-2.3.0+dfsg/shlr/sdb/config.mk	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/config.mk	2018-08-07 14:12:36.000000000 +0000
@@ -6,7 +6,7 @@
 VAPIDIR=${DATADIR}/vala/vapi/
 MANDIR=${DATADIR}/man/man1
 
-SDBVER=1.0.0
+SDBVER=1.2.0
 
 BUILD_MEMCACHE=0
 
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/Jamroot radare2-2.8.0+dfsg/shlr/sdb/Jamroot
--- radare2-2.3.0+dfsg/shlr/sdb/Jamroot	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/Jamroot	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-CFILES = src/buffer.c src/ht.c src/ls.c src/query.c src/num.c ;
-CFILES += src/cdb.c src/json.c src/sdb.c src/util.c src/base64.c ;
-CFILES += src/cdb_make.c src/lock.c src/ns.c src/array.c src/disk.c ;
-CFILES += src/journal.c src/fmt.c src/match.c src/sdbht.c ;
-
-#CFILES += src/json/api.c src/json/path.c src/json/rangstr.c ;
-#CFILES += src/json/js0n.c ; 
-
-lib sdb : $(CFILES) : <link>static <include>. ;
-
-exe sdb : $(CFILES) src/main.c : <include>. ;
-
-ret = [ SHELL "echo '#define SDB_VERSION \"0.9.8\"' > src/sdb_version.h" ] ;
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/meson.build radare2-2.8.0+dfsg/shlr/sdb/meson.build
--- radare2-2.3.0+dfsg/shlr/sdb/meson.build	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/meson.build	2018-08-07 14:12:36.000000000 +0000
@@ -1,14 +1,12 @@
-project('sdb', 'c')
-version = '1.0.0'
+sdb_version = '1.0.0'
 
+sdb_platform_inc = []
 if host_machine.system() == 'windows'
-  platform_inc = include_directories(['.', './msvc'])
-else
-  platform_inc = include_directories(['.'])
+  sdb_platform_inc = include_directories('msvc')
 endif
 
 # Create sdb_version.h
-run_command('python', '-c', 'with open("src/sdb_version.h", "w") as f: f.write("#define SDB_VERSION \"' + version + '\"")')
+run_command(py3_exe, '-c', 'with open("src/sdb_version.h", "w") as f: f.write("#define SDB_VERSION \"' + sdb_version + '\"")')
 
 files = [
   'src/array.c',
@@ -16,6 +14,7 @@
   'src/buffer.c',
   'src/cdb.c',
   'src/cdb_make.c',
+  'src/dict.c',
   'src/disk.c',
   'src/fmt.c',
   'src/ht.c',
@@ -24,7 +23,7 @@
   #'src/json/api.c',
   #'src/json/indent.c',
   'src/json/js0n.c',
-  'src/json/path.c',
+  #'src/json/path.c',
   #'src/json/rangstr.c',
   'src/lock.c',
   'src/ls.c',
@@ -38,11 +37,31 @@
 ]
 
 libsdb = static_library('sdb', files,
-  include_directories: [platform_inc, include_directories(['src'])]
+  include_directories: [
+    platform_inc,
+    include_directories([
+      'src'
+    ])
+  ],
+  implicit_include_directories: false
 )
 
-executable('sdb', 'src/main.c',
-  include_directories: [platform_inc, include_directories(['src'])],
+sdb_exe = executable('sdb', 'src/main.c',
+  include_directories: [
+    sdb_platform_inc,
+    include_directories([
+      'src'
+    ])
+  ],
   link_with: [libsdb],
-  install: true
+  install: true,
+  implicit_include_directories: false
 )
+
+sdb_gen_cmd = [
+  py3_exe,
+  '-c',
+  'from sys import argv; __import__("os").system("@0@ %s = <%s" % (argv[1], argv[2]))'.format(sdb_exe.full_path()),
+  '@OUTPUT@',
+  '@INPUT@'
+]
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/array.c radare2-2.8.0+dfsg/shlr/sdb/src/array.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/array.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/array.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* sdb - MIT - Copyright 2011-2016 - pancake */
+/* sdb - MIT - Copyright 2011-2018 - pancake */
 
 #include "sdb.h"
 #include <limits.h>
@@ -490,16 +490,17 @@
 	return 1;
 }
 
-// XXX Doesnt works if numbers are stored in different base
-SDB_API int sdb_array_contains_num(Sdb *s, const char *key, ut64 num,
-				    ut32 *cas) {
+// XXX Doesnt work if numbers are stored in different base
+SDB_API bool sdb_array_contains_num(Sdb *s, const char *key, ut64 num, ut32 *cas) {
 	char val[SDB_NUM_BUFSZ];
 	char *nval = sdb_itoa (num, val, SDB_NUM_BASE);
 	return sdb_array_contains (s, key, nval, cas);
 }
 
-SDB_API int sdb_array_contains(Sdb *s, const char *key, const char *val,
-				ut32 *cas) {
+SDB_API bool sdb_array_contains(Sdb *s, const char *key, const char *val, ut32 *cas) {
+	if (!s || !key || !val) {
+		return false;
+	}
 	const char *list = sdb_const_get (s, key, cas);
 	const char *next, *ptr = list;
 	const int vlen = strlen (val);
@@ -509,13 +510,13 @@
 			int len = next? (int)(size_t)(next - str) - 1 : (int)strlen (str);
 			if (len == vlen) {
 				if (!memcmp (str, val, len)) {
-					return 1;
+					return true;
 				}
 			}
 			ptr = next;
 		} while (next);
 	}
-	return 0;
+	return false;
 }
 
 SDB_API int sdb_array_size(Sdb *s, const char *key) {
@@ -532,7 +533,7 @@
 	return sdb_array_push (s, key, n, cas);
 }
 
-SDB_API int sdb_array_push(Sdb *s, const char *key, const char *val, ut32 cas) {
+SDB_API bool sdb_array_push(Sdb *s, const char *key, const char *val, ut32 cas) {
 #if PUSH_PREPENDS
 	return sdb_array_prepend (s, key, val, cas);
 #else
@@ -540,26 +541,28 @@
 #endif
 }
 
-SDB_API int sdb_array_prepend_num(Sdb *s, const char *key, ut64 num, ut32 cas) {
+SDB_API bool sdb_array_prepend_num(Sdb *s, const char *key, ut64 num, ut32 cas) {
 	char buf[SDB_NUM_BUFSZ];
 	char *n = sdb_itoa (num, buf, SDB_NUM_BASE);
 	return sdb_array_push (s, key, n, cas);
 }
 
-SDB_API int sdb_array_prepend (Sdb *s, const char *key, const char *val,
-			       ut32 cas) {
+SDB_API bool sdb_array_prepend (Sdb *s, const char *key, const char *val, ut32 cas) {
+	if (!s || !key || !val) {
+		return false;
+	}
 	int str_len = 0;
 	ut32 kas = cas;
 	const char *str = sdb_const_get_len (s, key, &str_len, &kas);
 	if (!val || (cas && cas != kas)) {
-		return 0;
+		return false;
 	}
 	cas = kas;
 	if (str && *str) {
 		int val_len = strlen (val);
 		char *newval = malloc (str_len + val_len + 2);
 		if (!newval) {
-			return 0;
+			return false;
 		}
 		memcpy (newval, val, val_len);
 		newval[val_len] = SDB_RS;
@@ -570,7 +573,7 @@
 	} else {
 		sdb_set (s, key, val, cas);
 	}
-	return 1;
+	return true;
 }
 
 SDB_API ut64 sdb_array_pop_num(Sdb *s, const char *key, ut32 *cas) {
@@ -673,11 +676,9 @@
 }
 
 SDB_API void sdb_array_sort_num(Sdb *s, const char *key, ut32 cas) {
-	char *ret, *nstr, *str;
-	int lstr;
-	ut64 *nums;
+	char *ret, *nstr;
 
-	str = sdb_get_len (s, key, &lstr, 0);
+	char *str = sdb_get (s, key, 0);
 	if (!str) {
 		return;
 	}
@@ -685,7 +686,7 @@
 		free (str);
 		return;
 	}
-	nums = sdb_fmt_array_num (str);
+	ut64 *nums = sdb_fmt_array_num (str);
 	free (str);
 	if (!nums) {
 		return;
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/dict.c radare2-2.8.0+dfsg/shlr/sdb/src/dict.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/dict.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/dict.c	2018-08-07 14:12:36.000000000 +0000
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include "sdb.h"
 
-dict *dict_new(ut32 size, dict_freecb f) {
+SDB_API dict *dict_new(ut32 size, dict_freecb f) {
 	dict *m = calloc (1, sizeof (dict));
 	if (!dict_init (m, R_MAX (size, 1), f)) {
 		free (m);
@@ -22,7 +22,7 @@
 	return 0;
 }
 
-bool dict_init(dict *m, ut32 size, dict_freecb f) {
+SDB_API bool dict_init(dict *m, ut32 size, dict_freecb f) {
 	if (m) {
 		memset (m, 0, sizeof (dict));
 		if (size > 0) {
@@ -37,7 +37,7 @@
 	return true;
 }
 
-void dict_fini(dict *m) {
+SDB_API void dict_fini(dict *m) {
 	ut32 i;
 	if (m) {
 		if (m->f) {
@@ -61,17 +61,17 @@
 	}
 }
 
-void dict_free(dict *m) {
+SDB_API void dict_free(dict *m) {
 	dict_fini(m);
 	free (m);
 }
 
 // collisions are not handled in a dict. use a hashtable if you want to use strings as keys.
-dicti dict_hash(const char *s) {
+SDB_API dicti dict_hash(const char *s) {
 	return (dicti)sdb_hash(s);
 }
 
-bool dict_set(dict *m, dicti k, dicti v, void *u) {
+SDB_API bool dict_set(dict *m, dicti k, dicti v, void *u) {
 	if (!m || !m->size || k == MHTNO) {
 		return false;
 	}
@@ -130,7 +130,7 @@
 	}
 }
 
-dictkv *dict_getr(dict *m, dicti k) {
+SDB_API dictkv *dict_getr(dict *m, dicti k) {
 	if (!m->size) {
 		return NULL;
 	}
@@ -147,23 +147,23 @@
 	return NULL;
 }
 
-dicti dict_get(dict *m, dicti k) {
+SDB_API dicti dict_get(dict *m, dicti k) {
 	dictkv *kv = dict_getr (m, k);
 	return kv? kv->v: MHTNO;
 }
 
-void *dict_getu(dict *m, dicti k) {
+SDB_API void *dict_getu(dict *m, dicti k) {
 	dictkv *kv = dict_getr (m, k);
 	return kv? kv->u: NULL;
 }
 
-bool dict_add(dict *m, dicti k, dicti v, void *u) {
+SDB_API bool dict_add(dict *m, dicti k, dicti v, void *u) {
 	return dict_getr(m, k)
 		? dict_set(m, k, v, u)
 		: false;
 }
 
-bool dict_del(dict *m, dicti k) {
+SDB_API bool dict_del(dict *m, dicti k) {
 	int bucket = dict_bucket (m, k);
 	if (k == MHTNO) {
 		return false;
@@ -188,6 +188,30 @@
 	return false;
 }
 
+// call the cb callback on each element of the dictionary
+// m : dict to iterate
+// cb : function that accept a dictkv. When it returns a value != 0, the
+//      iteration stops
+// u : additional information to pass to cb together with the dictkv
+SDB_API void dict_foreach(dict *m, dictkv_cb cb, void *u) {
+	bool iterate = true;
+	ut32 i;
+
+	for (i = 0; i < m->size && iterate; i++) {
+		dictkv *kv = m->table[i];
+		if (kv) {
+			while (kv->k != MHTNO) {
+				int res = cb (kv, u);
+				if (res != 0) {
+					iterate = false;
+					break;
+				}
+				kv++;
+			}
+		}
+	}
+}
+
 #if 0
 static char *dict_str(dict *m, dicti k) {
 	// walk all buckets and print the data..... we need a printer for kv->u
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/dict.h radare2-2.8.0+dfsg/shlr/sdb/src/dict.h
--- radare2-2.3.0+dfsg/shlr/sdb/src/dict.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/dict.h	2018-08-07 14:12:36.000000000 +0000
@@ -23,6 +23,7 @@
 // 4 + 4 + 8 = 16 .. lgtm
 
 typedef void (*dict_freecb)(void *);
+typedef int (*dictkv_cb)(dictkv *, void *);
 
 typedef struct {
 	void **table; //[MHTSZ];
@@ -46,3 +47,4 @@
 SDB_API void *dict_getu(dict *m, dicti k);
 SDB_API bool dict_add(dict *m, dicti k, dicti v, void *u);
 SDB_API bool dict_del(dict *m, dicti k);
+SDB_API void dict_foreach(dict *m, dictkv_cb cb, void *u);
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/fmt.c radare2-2.8.0+dfsg/shlr/sdb/src/fmt.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/fmt.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/fmt.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* sdb - MIT - Copyright 2014-2016 - pancake */
+/* sdb - MIT - Copyright 2014-2018 - pancake */
 
 #include "sdb.h"
 #include <stdarg.h>
@@ -20,32 +20,19 @@
 	} \
 }
 
-// move to util?
-// if n == -1 , assign the next bucket
-// if n==-1 and !fmt return last buffer
-SDB_API char *sdb_fmt(int n, const char *fmt, ...) {
-	static char Key[16][256];
-	static int cyclic_n = 0;
+SDB_API char *sdb_fmt(const char *fmt, ...) {
+#define KL 256
+#define KN 16
+	static char Key[KN][KL];
+	static int n = 0;
 	va_list ap;
-	if (n == -1) {
-		if (fmt) {
-			n = cyclic_n++;
-			if (cyclic_n>15)
-				cyclic_n = 0;
-		} else {
-			n = cyclic_n;
-		}
-	}
-        if (n < 0 || n > 15) {
-                return NULL;
-	}
-	if (!fmt) {
-		return Key[n];
-	}
 	va_start (ap, fmt);
-	*Key[n] = 0;
-	vsnprintf (Key[n], sizeof (Key[n]), fmt, ap);
-	Key[n][255] = 0;
+	n = (n + 1) % KN;
+	if (fmt) {
+		*Key[n] = 0;
+		vsnprintf (Key[n], KL - 1, fmt, ap);
+		Key[n][KL - 1] = 0;
+	}
 	va_end (ap);
 	return Key[n];
 }
@@ -219,8 +206,8 @@
 	if (list && *list) {
 		int len = sdb_alen (list);
 		retp = ret = (char**) malloc (2 * strlen (list) +
-			((len + 1)*sizeof (char*))+1);
-		_s = (char*)ret + ((len + 1) * sizeof (char*));
+			((len + 1) * sizeof (char *)) + 1);
+		_s = (char *)ret + ((len + 1) * sizeof (char *));
 		if (!ret) {
 			return NULL;
 		}
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/ht.c radare2-2.8.0+dfsg/shlr/sdb/src/ht.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/ht.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/ht.c	2018-08-07 14:12:36.000000000 +0000
@@ -58,7 +58,7 @@
 	return ht;
 }
 
-bool ht_delete_internal(SdbHash* ht, const char* key, ut32* hash) {
+SDB_API bool ht_delete_internal(SdbHash* ht, const char* key, ut32* hash) {
 	HtKv* kv;
 	SdbListIter* iter;
 	ut32 computed_hash = hash ? *hash : ht->hashfn (key);
@@ -105,13 +105,13 @@
 	return false;
 }
 
-SdbHash* ht_new(DupValue valdup, HtKvFreeFunc pair_free, CalcSize calcsizeV) {
+SDB_API SdbHash* ht_new(DupValue valdup, HtKvFreeFunc pair_free, CalcSize calcsizeV) {
 	return internal_ht_new (ht_primes_sizes[0], (HashFunction)sdb_hash, 
 	  			(ListComparator)strcmp, (DupKey)strdup,
 				valdup, pair_free, (CalcSize)strlen, calcsizeV);
 }
 
-void ht_free(SdbHash* ht) {
+SDB_API void ht_free(SdbHash* ht) {
 	if (ht) {
 		ut32 i;
 		for (i = 0; i < ht->size; i++) {
@@ -126,7 +126,7 @@
 	}
 }
 
-void ht_free_deleted(SdbHash* ht) {
+SDB_API void ht_free_deleted(SdbHash* ht) {
 	if (!ls_empty (ht->deleted)) {
 		ls_free (ht->deleted);
 		ht->deleted = ls_newf (free);
@@ -219,25 +219,26 @@
 	}
 	return false;
 }
-bool ht_insert_kv(SdbHash *ht, HtKv *kv, bool update) {
+
+SDB_API bool ht_insert_kv(SdbHash *ht, HtKv *kv, bool update) {
 	return internal_ht_insert_kv (ht, kv, update);
 }
 // Inserts the key value pair key, value into the hashtable.
 // Doesn't allow for "update" of the value.
-bool ht_insert(SdbHash* ht, const char* key, void* value) {
+SDB_API bool ht_insert(SdbHash* ht, const char* key, void* value) {
 	return internal_ht_insert (ht, false, key, value);
 }
 
 // Inserts the key value pair key, value into the hashtable.
 // Does allow for "update" of the value.
-bool ht_update(SdbHash* ht, const char* key, void* value) {
+SDB_API bool ht_update(SdbHash* ht, const char* key, void* value) {
 	return internal_ht_insert (ht, true, key, value);
 }
 
 // Returns the corresponding SdbKv entry from the key.
 // If `found` is not NULL, it will be set to true if the entry was found, false
 // otherwise.
-HtKv* ht_find_kv(SdbHash* ht, const char* key, bool* found) {
+SDB_API HtKv* ht_find_kv(SdbHash* ht, const char* key, bool* found) {
 	if (!ht) {
 		return NULL;
 	}
@@ -275,7 +276,7 @@
 // Looks up the corresponding value from the key.
 // If `found` is not NULL, it will be set to true if the entry was found, false
 // otherwise.
-void* ht_find(SdbHash* ht, const char* key, bool* found) {
+SDB_API void* ht_find(SdbHash* ht, const char* key, bool* found) {
 	bool _found = false;
 	if (!found) {
 		found = &_found;
@@ -285,11 +286,11 @@
 }
 
 // Deletes a entry from the hash table from the key, if the pair exists.
-bool ht_delete(SdbHash* ht, const char* key) {
+SDB_API bool ht_delete(SdbHash* ht, const char* key) {
 	return ht_delete_internal (ht, key, NULL);
 }
 
-void ht_foreach(SdbHash *ht, HtForeachCallback cb, void *user) {
+SDB_API void ht_foreach(SdbHash *ht, HtForeachCallback cb, void *user) {
 	if (!ht) {
 		return;
 	}
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/ht.h radare2-2.8.0+dfsg/shlr/sdb/src/ht.h
--- radare2-2.3.0+dfsg/shlr/sdb/src/ht.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/ht.h	2018-08-07 14:12:36.000000000 +0000
@@ -52,21 +52,22 @@
 // If hashfunction is NULL it will be used sdb_hash internally
 // If keydup or valdup are null it will be used an assignment
 // If keySize or valueSize are null it will be used strlen internally
-SdbHash* ht_new(DupValue valdup, HtKvFreeFunc pair_free, CalcSize valueSize);
+SDB_API SdbHash* ht_new(DupValue valdup, HtKvFreeFunc pair_free, CalcSize valueSize);
 // Destroy a hashtable and all of its entries.
-void ht_free(SdbHash* ht);
-void ht_free_deleted(SdbHash* ht);
+SDB_API void ht_free(SdbHash* ht);
+SDB_API void ht_free_deleted(SdbHash* ht);
 // Insert a new Key-Value pair into the hashtable. If the key already exists, returns false.
-bool ht_insert(SdbHash* ht, const char* key, void* value);
+SDB_API bool ht_insert(SdbHash* ht, const char* key, void* value);
 //Insert a new HtKv in the hashtable
-bool ht_insert_kv(SdbHash *ht, HtKv *kv, bool update);
+SDB_API bool ht_insert_kv(SdbHash *ht, HtKv *kv, bool update);
 // Insert a new Key-Value pair into the hashtable, or updates the value if the key already exists.
-bool ht_update(SdbHash* ht, const char* key, void* value);
+SDB_API bool ht_update(SdbHash* ht, const char* key, void* value);
 // Delete a key from the hashtable.
-bool ht_delete(SdbHash* ht, const char* key);
+SDB_API bool ht_delete(SdbHash* ht, const char* key);
 // Find the value corresponding to the matching key.
-void* ht_find(SdbHash* ht, const char* key, bool* found);
+SDB_API void* ht_find(SdbHash* ht, const char* key, bool* found);
 HtKv* ht_find_kv(SdbHash* ht, const char* key, bool* found);
-void ht_foreach(SdbHash *ht, HtForeachCallback cb, void *user);
-SdbList* ht_foreach_list(SdbHash *ht, bool sorted);
+SDB_API void ht_foreach(SdbHash *ht, HtForeachCallback cb, void *user);
+SDB_API SdbList* ht_foreach_list(SdbHash *ht, bool sorted);
+
 #endif // __HT_H
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/journal.c radare2-2.8.0+dfsg/shlr/sdb/src/journal.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/journal.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/journal.c	2018-08-07 14:12:36.000000000 +0000
@@ -6,7 +6,7 @@
 
 static const char *sdb_journal_filename(Sdb *s) {
 	return (s && s->name)
-		? sdb_fmt (0, "%s.journal", s->name)
+		? sdb_fmt ("%s.journal", s->name)
 		: NULL;
 }
 
@@ -79,11 +79,10 @@
 }
 
 SDB_API bool sdb_journal_log(Sdb *s, const char *key, const char *val) {
-	const char *str;
 	if (s->journal == -1) {
 		return false;
 	}
-	str = sdb_fmt (0, "%s=%s\n", key, val);
+	const char *str = sdb_fmt ("%s=%s\n", key, val);
 	int len = strlen (str);
 	if (write (s->journal, str, len) != len) {
 		return false;
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/json/api.c radare2-2.8.0+dfsg/shlr/sdb/src/json/api.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/json/api.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/json/api.c	2018-08-07 14:12:36.000000000 +0000
@@ -5,7 +5,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "rangstr.h"
-#include "json.h"
 
 /* public sdb api */
 char *api_json_get (const char *s, const char *p) {
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/json/indent.c radare2-2.8.0+dfsg/shlr/sdb/src/json/indent.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/json/indent.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/json/indent.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* sdb - MIT - Copyright 2012-2015 - pancake */
+/* sdb - MIT - Copyright 2012-2018 - pancake */
 
 #include <limits.h>
 
@@ -50,7 +50,7 @@
 	o_size += 2;
 	indent = 0;
 
-	O = malloc (o_size);
+	O = malloc (o_size + 1);
 	if (!O) {
 		return NULL;
 	}
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/json/js0n.c radare2-2.8.0+dfsg/shlr/sdb/src/json/js0n.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/json/js0n.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/json/js0n.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-// by jeremie miller - 2010-2015
+// by jeremie miller - 2010-2018
 // public domain, contributions/improvements welcome via github
 
 // opportunity to further optimize would be having different jump tables for higher depths
@@ -7,7 +7,7 @@
 
 #ifdef _MSC_VER
 #pragma message ("TODO: json not implemented for this platform")
-int js0n(const ut8 *js, RangstrType len, RangstrType *out) {
+int sdb_js0n(const ut8 *js, RangstrType len, RangstrType *out) {
 	return 1;
 }
 #else
@@ -17,13 +17,12 @@
 #pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wpragmas"
 #pragma GCC diagnostic ignored "-Winitializer-overrides"
-#pragma GCC diagnostic ignored "-Woverride-init"
 
 #define HAVE_RAWSTR 0
 #define PUSH(i) if(depth == 1) prev = *out++ = ((cur+i) - js)
 #define CAP(i) if(depth == 1) prev = *out++ = ((cur+i) - (js + prev) + 1)
 
-int js0n(const ut8 *js, RangstrType len, RangstrType *out) {
+int sdb_js0n(const ut8 *js, RangstrType len, RangstrType *out) {
 	ut32 prev = 0;
 	const ut8 *cur, *end;
 	int depth = 0, utf8_remain = 0;
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/json/json.h radare2-2.8.0+dfsg/shlr/sdb/src/json/json.h
--- radare2-2.3.0+dfsg/shlr/sdb/src/json/json.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/json/json.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#ifndef _INCLUDE_JSON_H_
-#define _INCLUDE_JSON_H_
-
-#include "rangstr.h"
-
-#if 0
-SDB_IPI int js0n(const unsigned char *js, RangstrType len, RangstrType *out);
-SDB_IPI Rangstr json_get (const char *s, const char *path);
-
-/* string based api */
-SDB_IPI char *api_json_get (const char *s, const char *p);
-SDB_IPI char *api_json_set (const char *s, const char *k, const char *v);
-SDB_IPI int api_json_geti (const char *s, const char *p);
-SDB_IPI char *api_json_seti (const char *s, const char *k, int a);
-SDB_IPI char *api_json_unindent(const char *s);
-SDB_IPI char *api_json_indent(const char *s);
-#endif
-
-#endif
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/json/path.c radare2-2.8.0+dfsg/shlr/sdb/src/json/path.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/json/path.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/json/path.c	2018-08-07 14:12:36.000000000 +0000
@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "rangstr.c"
-#include "json.h"
 #include "../types.h"
 
 SDB_IPI void json_path_first(Rangstr *s) {
@@ -70,7 +69,7 @@
 	unsigned short *res = NULL;
 	len = strlen (s);
 	res = malloc (len);
-	ret = js0n ((const unsigned char *)s, len, res);
+	ret = sdb_js0n ((const unsigned char *)s, len, res);
 	if (!ret) return 0;
 	if (*s=='[') {
 		for (i=0; res[i]; i+=2) {
@@ -91,7 +90,7 @@
 	RangstrType *res;
 	int i, ret, len = strlen (s);
 	res = malloc (len+1);
-	ret = js0n ((const unsigned char *)s, len, res);
+	ret = sdb_js0n ((const unsigned char *)s, len, res);
 	if (!ret) {
 		free (res);
 		return 0;
@@ -126,12 +125,13 @@
 	if (len > RESFIXSZ) {
 		res = calloc (len + 1, sizeof (RangstrType));
 		if (!res) {
-			eprintf ("Cannot allocate %d byte(s)\n", len + 1);
+			eprintf ("Cannot allocate %d byte%s\n",
+				len + 1, (len > 1)? "s": "");
 			return rangstr_null ();
 		}
 	}
 
-	ret = js0n ((const unsigned char *)s, len, res);
+	ret = sdb_js0n ((const unsigned char *)s, len, res);
 #define PFREE(x) if (x && x != resfix) free (x)
 	if (ret > 0) {
 		PFREE (res);
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/json.c radare2-2.8.0+dfsg/shlr/sdb/src/json.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/json.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/json.c	2018-08-07 14:12:36.000000000 +0000
@@ -8,6 +8,11 @@
 #include "json/api.c"
 #include "json/indent.c"
 
+SDB_API char *sdb_json_get_str (const char *json, const char *path) {
+	Rangstr rs = json_get (json, path);
+	return rangstr_dup (&rs);
+}
+
 SDB_API char *sdb_json_get (Sdb *s, const char *k, const char *p, ut32 *cas) {
 	Rangstr rs;
 	char *u, *v = sdb_get (s, k, cas);
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/ls.h radare2-2.8.0+dfsg/shlr/sdb/src/ls.h
--- radare2-2.3.0+dfsg/shlr/sdb/src/ls.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/ls.h	2018-08-07 14:12:36.000000000 +0000
@@ -33,7 +33,8 @@
 		for (it = list->tail; it && (pos = it->data); it = it->p)
 
 #define ls_iterator(x) (x)?(x)->head:NULL
-#define ls_empty(x) (!x || (!x->head && !x->tail))
+// #define ls_empty(x) (!x || (!x->head && !x->tail))
+#define ls_empty(x) (!x || !x->length)
 #define ls_head(x) x->head
 #define ls_tail(x) x->tail
 #define ls_unref(x) x
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/Makefile radare2-2.8.0+dfsg/shlr/sdb/src/Makefile
--- radare2-2.3.0+dfsg/shlr/sdb/src/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -4,9 +4,8 @@
 OBJ=cdb.o buffer.o cdb_make.o ls.o sdbht.o ht.o sdb.o num.o base64.o match.o
 OBJ+=json.o ns.o lock.o util.o disk.o query.o array.o fmt.o journal.o
 OBJ+=dict.o
-
 SOBJ=$(subst .o,.o.o,${OBJ})
-
+WITHPIC?=1
 BIN=sdb${EXT_EXE}
 
 .PHONY: all static shared clean
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/query.c radare2-2.8.0+dfsg/shlr/sdb/src/query.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/query.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/query.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* sdb - MIT - Copyright 2011-2016 - pancake */
+/* sdb - MIT - Copyright 2011-2018 - pancake */
 
 #include <stdio.h>
 #include <string.h>
@@ -175,21 +175,24 @@
 		return NULL;
 	}
 	out = strbuf_new ();
+	if ((int)len < 1 || !buf) {
+		bufset = 1;
+		buf = malloc ((len = 64));
+		if (!buf) {
+			strbuf_free (out);
+			return NULL;
+		}
+	}
 	if (_cmd) {
 		cmd = original_cmd = strdup (_cmd);
 		if (!cmd) {
 			free (out);
+			if (bufset) {
+				free (buf);
+			}
 			return NULL;
 		}
 	} else {
-		if (len < 1 || !buf) {
-			bufset = 1;
-			buf = malloc ((len = 64));
-			if (!buf) {
-				strbuf_free (out);
-				return NULL;
-			}
-		}
 		cmd = buf;
 	}
 	// if cmd is null, we take buf as cmd
@@ -212,7 +215,7 @@
 		if (next) {
 			*next = 0;
 		}
-		out_concat (sdb_fmt (0, "0x%08x\n", sdb_hash (p)));
+		out_concat (sdb_fmt ("0x%08x\n", sdb_hash (p)));
 		if (next) {
 			*next = ';';
 		}
@@ -837,7 +840,7 @@
 SDB_API int sdb_query (Sdb *s, const char *cmd) {
 	char buf[1024], *out;
 	int must_save = ((*cmd=='~') || strchr (cmd, '='));
-	out = sdb_querys (s, buf, sizeof (buf)-1, cmd);
+	out = sdb_querys (s, buf, sizeof (buf) - 1, cmd);
 	if (out) {
 		if (*out) {
 			puts (out);
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/sdb.h radare2-2.8.0+dfsg/shlr/sdb/src/sdb.h
--- radare2-2.3.0+dfsg/shlr/sdb/src/sdb.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/sdb.h	2018-08-07 14:12:36.000000000 +0000
@@ -200,8 +200,9 @@
 SDB_API bool sdb_journal_unlink(Sdb *s);
 
 /* numeric */
-char *sdb_itoa(ut64 n, char *s, int base);
-ut64  sdb_atoi(const char *s);
+SDB_API char *sdb_itoa(ut64 n, char *s, int base);
+SDB_API ut64  sdb_atoi(const char *s);
+SDB_API const char *sdb_itoca(ut64 n);
 
 /* locking */
 SDB_API bool sdb_lock(const char *s);
@@ -220,7 +221,10 @@
 SDB_API ut8 sdb_hash_byte(const char *s);
 
 /* json api */
+// SDB_API int sdb_js0n(const unsigned char *js, RangstrType len, RangstrType *out);
 SDB_API bool sdb_isjson(const char *k);
+SDB_API char *sdb_json_get_str (const char *json, const char *path);
+
 SDB_API char *sdb_json_get(Sdb* s, const char *key, const char *p, ut32 *cas);
 SDB_API bool sdb_json_set(Sdb* s, const char *k, const char *p, const char *v, ut32 cas);
 SDB_API int sdb_json_num_get(Sdb* s, const char *k, const char *p, ut32 *cas);
@@ -251,15 +255,15 @@
 bool sdb_ns_unset(Sdb *s, const char *name, Sdb *r);
 
 // array
-int sdb_array_contains(Sdb* s, const char *key, const char *val, ut32 *cas);
-int sdb_array_contains_num(Sdb *s, const char *key, ut64 val, ut32 *cas);
+bool sdb_array_contains(Sdb* s, const char *key, const char *val, ut32 *cas);
+bool sdb_array_contains_num(Sdb *s, const char *key, ut64 val, ut32 *cas);
 int sdb_array_indexof(Sdb *s, const char *key, const char *val, ut32 cas);
 int sdb_array_set(Sdb* s, const char *key, int idx, const char *val, ut32 cas);
 int sdb_array_set_num(Sdb* s, const char *key, int idx, ut64 val, ut32 cas);
 bool sdb_array_append(Sdb *s, const char *key, const char *val, ut32 cas);
 bool sdb_array_append_num(Sdb *s, const char *key, ut64 val, ut32 cas);
-int sdb_array_prepend(Sdb *s, const char *key, const char *val, ut32 cas);
-int sdb_array_prepend_num(Sdb *s, const char *key, ut64 val, ut32 cas);
+bool sdb_array_prepend(Sdb *s, const char *key, const char *val, ut32 cas);
+bool sdb_array_prepend_num(Sdb *s, const char *key, ut64 val, ut32 cas);
 char *sdb_array_get(Sdb* s, const char *key, int idx, ut32 *cas);
 ut64 sdb_array_get_num(Sdb* s, const char *key, int idx, ut32 *cas);
 int sdb_array_get_idx(Sdb *s, const char *key, const char *val, ut32 cas); // agetv
@@ -300,7 +304,7 @@
 int sdb_array_list(Sdb* s, const char *key);
 
 // Adds the string `val` to the start of array `key`.
-int sdb_array_push(Sdb *s, const char *key, const char *val, ut32 cas);
+SDB_API bool sdb_array_push(Sdb *s, const char *key, const char *val, ut32 cas);
 
 // Returns the string at the start of array `key` or
 // NULL if there are no elements.
@@ -337,7 +341,7 @@
 int sdb_decode_raw(ut8 *bout, const char *bin, int len);
 
 // binfmt
-char *sdb_fmt(int n, const char *fmt, ...);
+char *sdb_fmt(const char *fmt, ...);
 int sdb_fmt_init(void *p, const char *fmt);
 void sdb_fmt_free(void *p, const char *fmt);
 int sdb_fmt_tobin(const char *_str, const char *fmt, void *stru);
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/sdbht.c radare2-2.8.0+dfsg/shlr/sdb/src/sdbht.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/sdbht.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/sdbht.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,6 @@
 #include "sdbht.h"
 
-SdbHash* sdb_ht_new() {
+SDB_API SdbHash* sdb_ht_new() {
 	return ht_new ((DupValue)strdup, (HtKvFreeFunc)sdb_kv_free, (CalcSize)strlen);
 }
 
@@ -20,34 +20,35 @@
 	}
 	return false;
 }
-bool sdb_ht_insert(SdbHash* ht, const char* key, const char* value) {
+
+SDB_API bool sdb_ht_insert(SdbHash* ht, const char* key, const char* value) {
 	return sdb_ht_internal_insert (ht, key, value, false);
 }
 
-bool sdb_ht_insert_kvp(SdbHash* ht, SdbKv *kvp, bool update) {
+SDB_API bool sdb_ht_insert_kvp(SdbHash* ht, SdbKv *kvp, bool update) {
 	return ht_insert_kv (ht, (HtKv*)kvp, update);
 }
 
-bool sdb_ht_update(SdbHash *ht, const char *key, const char*value) {
+SDB_API bool sdb_ht_update(SdbHash *ht, const char *key, const char*value) {
 	return sdb_ht_internal_insert (ht, key, value, true);
 }
 
-SdbKv* sdb_ht_find_kvp(SdbHash* ht, const char* key, bool* found) {
+SDB_API SdbKv* sdb_ht_find_kvp(SdbHash* ht, const char* key, bool* found) {
 	return (SdbKv *)ht_find_kv (ht, key, found);
 }
 
-char* sdb_ht_find(SdbHash* ht, const char* key, bool* found) {
+SDB_API char* sdb_ht_find(SdbHash* ht, const char* key, bool* found) {
 	return (char *)ht_find (ht, key, found);
 }
 
-void sdb_ht_free(SdbHash *ht) {
+SDB_API void sdb_ht_free(SdbHash *ht) {
 	ht_free (ht);
 }
 
-bool sdb_ht_delete(SdbHash* ht, const char *key) {
+SDB_API bool sdb_ht_delete(SdbHash* ht, const char *key) {
 	return ht_delete (ht, key);
 }
 
-void sdb_ht_free_deleted(SdbHash* ht) {
+SDB_API void sdb_ht_free_deleted(SdbHash* ht) {
 	ht_free_deleted (ht);
 }
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/sdbht.h radare2-2.8.0+dfsg/shlr/sdb/src/sdbht.h
--- radare2-2.3.0+dfsg/shlr/sdb/src/sdbht.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/sdbht.h	2018-08-07 14:12:36.000000000 +0000
@@ -19,21 +19,21 @@
 extern ut32 sdb_hash(const char *key);
 extern void sdb_kv_free(SdbKv *kv);
 
-SdbHash* sdb_ht_new(void);
+SDB_API SdbHash* sdb_ht_new(void);
 // Destroy a hashtable and all of its entries.
-void sdb_ht_free(SdbHash* ht);
-void sdb_ht_free_deleted(SdbHash* ht);
+SDB_API void sdb_ht_free(SdbHash* ht);
+SDB_API void sdb_ht_free_deleted(SdbHash* ht);
 // Insert a new Key-Value pair into the hashtable. If the key already exists, returns false.
-bool sdb_ht_insert(SdbHash* ht, const char* key, const char* value);
+SDB_API bool sdb_ht_insert(SdbHash* ht, const char* key, const char* value);
 // Insert a new Key-Value pair into the hashtable, or updates the value if the key already exists.
-bool sdb_ht_insert_kvp(SdbHash* ht, SdbKv *kvp, bool update);
+SDB_API bool sdb_ht_insert_kvp(SdbHash* ht, SdbKv *kvp, bool update);
 // Insert a new Key-Value pair into the hashtable, or updates the value if the key already exists.
-bool sdb_ht_update(SdbHash* ht, const char* key, const char* value);
+SDB_API bool sdb_ht_update(SdbHash* ht, const char* key, const char* value);
 // Delete a key from the hashtable.
-bool sdb_ht_delete(SdbHash* ht, const char* key);
+SDB_API bool sdb_ht_delete(SdbHash* ht, const char* key);
 // Find the value corresponding to the matching key.
-char* sdb_ht_find(SdbHash* ht, const char* key, bool* found);
+SDB_API char* sdb_ht_find(SdbHash* ht, const char* key, bool* found);
 // Find the KeyValuePair corresponding to the matching key.
-SdbKv* sdb_ht_find_kvp(SdbHash* ht, const char* key, bool* found);
+SDB_API SdbKv* sdb_ht_find_kvp(SdbHash* ht, const char* key, bool* found);
 
 #endif // __SDB_HT_H
diff -Nru radare2-2.3.0+dfsg/shlr/sdb/src/util.c radare2-2.8.0+dfsg/shlr/sdb/src/util.c
--- radare2-2.3.0+dfsg/shlr/sdb/src/util.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/sdb/src/util.c	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,4 @@
-/* sdb - MIT - Copyright 2011-2017 - pancake */
+/* sdb - MIT - Copyright 2011-2018 - pancake */
 
 #include "sdb.h"
 
@@ -7,29 +7,53 @@
 #if USE_MONOTONIC_CLOCK
 #include <time.h>
 #else
+
 #ifdef _MSC_VER
 #pragma message ("gettimeofday: Windows support is ugly here")
 #include <windows.h>
-int gettimeofday (struct timeval* p, void* tz) {
-	ULARGE_INTEGER ul; // As specified on MSDN.
-	FILETIME ft;
-
-	// Returns a 64-bit value representing the number of
-	// 100-nanosecond intervals since January 1, 1601 (UTC).
-	GetSystemTimeAsFileTime (&ft);
-
-	// Fill ULARGE_INTEGER low and high parts.
-	ul.LowPart = ft.dwLowDateTime;
-	ul.HighPart = ft.dwHighDateTime;
-	// Convert to microseconds.
-	ul.QuadPart /= 10ULL;
-	// Remove Windows to UNIX Epoch delta.
-	ul.QuadPart -= 11644473600000000ULL;
-	// Modulo to retrieve the microseconds.
-	p->tv_usec = (long)(ul.QuadPart % 1000000LL);
-	// Divide to retrieve the seconds.
-	p->tv_sec = (long)(ul.QuadPart / 1000000LL);
+#include <time.h>
 
+struct timezone {
+	int  tz_minuteswest; /* minutes W of Greenwich */
+	int  tz_dsttime;     /* type of dst correction */
+};
+
+int gettimeofday (struct timeval* p, struct timezone * tz) {
+	//ULARGE_INTEGER ul; // As specified on MSDN.
+	ut64 ul = 0;
+	static int tzflag = 0;
+	FILETIME ft;
+	if (p) {
+		// Returns a 64-bit value representing the number of
+		// 100-nanosecond intervals since January 1, 1601 (UTC).
+		GetSystemTimeAsFileTime (&ft);
+		// Fill ULARGE_INTEGER low and high parts.
+		//ul.LowPart = ft.dwLowDateTime;
+		//ul.HighPart = ft.dwHighDateTime;
+		ul |= ft.dwHighDateTime;
+		ul <<= 32;
+		ul |= ft.dwLowDateTime;
+		// Convert to microseconds.
+		//ul.QuadPart /= 10ULL;
+		ul /= 10;
+		// Remove Windows to UNIX Epoch delta.
+		//ul.QuadPart -= 11644473600000000ULL;
+		ul -= 11644473600000000ULL;
+		// Modulo to retrieve the microseconds.
+		//p->tv_usec = (long)(ul.QuadPart % 1000000LL);
+		// Divide to retrieve the seconds.
+		//p->tv_sec = (long)(ul.QuadPart / 1000000LL);
+		p->tv_sec = (long)(ul / 1000000LL);
+		p->tv_usec = (long)(ul % 1000000LL);
+	}
+	if (tz) {
+		if (!tzflag) {
+			_tzset ();
+			tzflag++;
+		}
+		tz->tz_minuteswest = _timezone / 60;
+		tz->tz_dsttime = _daylight;
+	}
 	return 0;
 }
 
@@ -50,7 +74,7 @@
 	ut32 count = 0;
 	if (s) {
 		while (*s) {
-			h = (h + (h << 5)) ^* s++;
+			h = (h + (h << 5)) ^ *s++;
 			count++;
 		}
 	}
@@ -71,6 +95,10 @@
 	return h[0] ^ h[1] ^ h[2] ^ h[3];
 }
 
+SDB_API const char *sdb_itoca(ut64 n) {
+	return sdb_itoa (n, sdb_fmt (NULL), 16);
+}
+
 // assert (sizeof (s)>64)
 // if s is null, the returned pointer must be freed!!
 SDB_API char *sdb_itoa(ut64 n, char *s, int base) {
@@ -80,6 +108,7 @@
 	int i = imax, copy_string = 1;
 	if (s) {
 		*s = 0;
+		os = NULL;
 	} else {
 		os = s = tmpbuf;
 	}
@@ -99,7 +128,7 @@
 	}
 	s[imax + 1] = '\0';
 	if (base <= 10) {
-		for (; n && i>0; n /= base) {
+		for (; n && i > 0; n /= base) {
 			s[i--] = (n % base) + '0';
 		}
 	} else {
diff -Nru radare2-2.3.0+dfsg/shlr/spp/Makefile radare2-2.8.0+dfsg/shlr/spp/Makefile
--- radare2-2.3.0+dfsg/shlr/spp/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/spp/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -7,6 +7,8 @@
 
 CFLAGS?=-Wall -O2
 
+CFLAGS+=-fvisibility=hidden
+
 all: ${BIN}
 
 config.h:
diff -Nru radare2-2.3.0+dfsg/shlr/spp/p/cpp.h radare2-2.8.0+dfsg/shlr/spp/p/cpp.h
--- radare2-2.3.0+dfsg/shlr/spp/p/cpp.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/spp/p/cpp.h	2018-08-07 14:12:36.000000000 +0000
@@ -29,7 +29,7 @@
 	} else {
 		state->echo[state->ifl + 1] = 0;
 	}
-	if (*buf=='!') {
+	if (*buf == '!') {
 		state->echo[state->ifl + 1] = !!!state->echo[state->ifl + 1];
 	}
 	return 1;
diff -Nru radare2-2.3.0+dfsg/shlr/spp/r_api.h radare2-2.8.0+dfsg/shlr/spp/r_api.h
--- radare2-2.3.0+dfsg/shlr/spp/r_api.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/spp/r_api.h	2018-08-07 14:12:36.000000000 +0000
@@ -9,11 +9,28 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+#ifdef R_API
+#undef R_API
+#endif
+#if R_SWIG
+  #define R_API export
+#elif R_INLINE
+  #define R_API inline
+#else
+  #if defined(__GNUC__) && __GNUC__ >= 4
+    #define R_API __attribute__((visibility("default")))
+  #elif defined(_MSC_VER)
+    #define R_API __declspec(dllexport)
+  #else
+    #define R_API
+  #endif
+#endif
+
 #if defined(EMSCRIPTEN) || defined(__linux__) || defined(__APPLE__) || defined(__GNU__) || defined(__ANDROID__) || defined(__QNX__)
   #define __BSD__ 0
   #define __UNIX__ 1
 #endif
-#if __KFBSD__ || defined(__NetBSD__) || defined(__OpenBSD__)
+#if __KFBSD__ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
   #define __BSD__ 1
   #define __UNIX__ 1
 #endif
diff -Nru radare2-2.3.0+dfsg/shlr/spp/spp.c radare2-2.8.0+dfsg/shlr/spp/spp.c
--- radare2-2.3.0+dfsg/shlr/spp/spp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/spp/spp.c	2018-08-07 14:12:36.000000000 +0000
@@ -3,7 +3,7 @@
 #include "spp.h"
 #include "config.h"
 
-int spp_run(char *buf, Output *out) {
+R_API int spp_run(char *buf, Output *out) {
 	int i, ret = 0;
 	char *tok;
 
@@ -109,7 +109,7 @@
 	return printed;
 }
 
-void spp_eval(char *buf, Output *out) {
+R_API void spp_eval(char *buf, Output *out) {
 	char *ptr, *ptr2;
 	char *ptrr = NULL;
 	int delta;
@@ -228,7 +228,7 @@
 }
 
 /* TODO: detect nesting */
-void spp_io(FILE *in, Output *out) {
+R_API void spp_io(FILE *in, Output *out) {
 	char buf[4096];
 	int lines;
 	if (!proc->buf.lbuf) {
@@ -268,10 +268,10 @@
 		spp_eval (buf, out);
 		proc->state.lineno += lines;
 	}
-	do_fputs (out, proc->buf.lbuf);
+	(void)do_fputs (out, proc->buf.lbuf);
 }
 
-int spp_file(const char *file, Output *out) {
+R_API int spp_file(const char *file, Output *out) {
 	FILE *in = fopen (file, "r");
 	D fprintf (stderr, "SPP-FILE(%s)\n", file);
 	if (in) {
@@ -283,21 +283,21 @@
 	return 0;
 }
 
-void spp_proc_list_kw() {
+R_API void spp_proc_list_kw() {
 	int i;
 	for (i = 0; tags[i].name; i++) {
 		printf ("%s\n", tags[i].name);
 	}
 }
 
-void spp_proc_list() {
+R_API void spp_proc_list() {
 	int i;
 	for (i=0; procs[i]; i++) {
 		printf ("%s\n", procs[i]->name);
 	}
 }
 
-void spp_proc_set(struct Proc *p, char *arg, int fail) {
+R_API void spp_proc_set(struct Proc *p, char *arg, int fail) {
 	int i, j;
 	if (arg)
 	for (j = 0; procs[j]; j++) {
diff -Nru radare2-2.3.0+dfsg/shlr/spp/spp.h radare2-2.8.0+dfsg/shlr/spp/spp.h
--- radare2-2.3.0+dfsg/shlr/spp/spp.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/spp/spp.h	2018-08-07 14:12:36.000000000 +0000
@@ -32,6 +32,10 @@
 #define HAVE_FORK 1
 #endif
 
+#ifndef HAVE_FORK
+#define HAVE_FORK 1
+#endif
+
 #ifndef DLL_LOCAL
 #ifdef _MSC_VER
 #define DLL_LOCAL
@@ -100,19 +104,19 @@
     SppBuf buf;
 };
 
-int spp_file(const char *file, Output *out);
-int spp_run(char *buf, Output *out);
-void spp_eval(char *buf, Output *out);
-void spp_io(FILE *in, Output *out);
+R_API int spp_file(const char *file, Output *out);
+R_API int spp_run(char *buf, Output *out);
+R_API void spp_eval(char *buf, Output *out);
+R_API void spp_io(FILE *in, Output *out);
 #ifdef _MSC_VER
 void do_printf(Output *out, char *str, ...);
 #else
 void do_printf(Output *out, char *str, ...) __attribute__ ((format (printf, 2, 3)));
 #endif
 
-void spp_proc_list(void);
-void spp_proc_list_kw(void);
-void spp_proc_set(struct Proc *p, char *arg, int fail);
+R_API void spp_proc_list(void);
+R_API void spp_proc_list_kw(void);
+R_API void spp_proc_set(struct Proc *p, char *arg, int fail);
 
 #if DEBUG
 #define D if (1)
diff -Nru radare2-2.3.0+dfsg/shlr/tcc/Makefile radare2-2.8.0+dfsg/shlr/tcc/Makefile
--- radare2-2.3.0+dfsg/shlr/tcc/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/tcc/Makefile	2018-08-07 14:12:36.000000000 +0000
@@ -45,7 +45,7 @@
 all: ${LIBNAME} libr_tcc.$(EXT_AR)
 
 ${LIBNAME}: ${OFILES}
-	${CC} -o ${LIBNAME} ${LDFLAGS} ${LIBS} ${OFILES}
+	${CC} $(CFLAGS) -o ${LIBNAME} ${LDFLAGS} ${LIBS} ${OFILES}
 
 libr_tcc.$(EXT_AR): ${OFILES}
 	rm -f libr_tcc.$(EXT_AR)
diff -Nru radare2-2.3.0+dfsg/shlr/tcc/tccgen.c radare2-2.8.0+dfsg/shlr/tcc/tccgen.c
--- radare2-2.3.0+dfsg/shlr/tcc/tccgen.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/tcc/tccgen.c	2018-08-07 14:12:36.000000000 +0000
@@ -20,6 +20,10 @@
 
 #include "tcc.h"
 
+#define TCC_ERR(...) do {				\
+	tcc_error (__VA_ARGS__);			\
+	return;								\
+} while (0)
 /* callback pointer */
 ST_DATA char **tcc_cb_ptr;
 
@@ -151,6 +155,7 @@
 			if (!(v & SYM_FIELD) && (v & ~SYM_STRUCT) < SYM_FIRST_ANOM && s->v == v) {
 				tcc_error ("incompatible types for redefinition of '%s'",
 					get_tok_str (v, NULL));
+				return NULL;
 			}
 		}
 	}
@@ -216,7 +221,10 @@
 	new_type->ref = sym_malloc ();
 	new_type->t = meta;
 
-	sym_push (0, new_type, 0, 0);
+	if (!sym_push (0, new_type, 0, 0)) {
+		return 0;
+	}
+
 	free (new_type);
 	return 1;
 }
@@ -277,6 +285,9 @@
 	}
 	// dump_type(type, 5);
 	s = sym_push2 (ps, v, type->t, c);
+	if (!s) {
+		return NULL;
+	}
 	s->type.ref = type->ref;
 	s->r = r;
 	/* don't record fields or anonymous symbols */
@@ -301,7 +312,7 @@
 	Sym *s, **ps;
 	s = sym_push2 (&global_stack, v, t, c);
 	/* don't record anonymous symbol */
-	if (v < SYM_FIRST_ANOM) {
+	if (s && v < SYM_FIRST_ANOM) {
 		ps = &table_ident[v - TOK_IDENT]->sym_identifier;
 		/* modify the top most local identifier, so that
 		   sym_identifier will point to 's' when popped */
@@ -359,7 +370,7 @@
 static void vsetc(CType *type, int r, CValue *vc)
 {
 	if (vtop >= vstack + (VSTACK_SIZE - 1)) {
-		tcc_error ("memory full");
+		TCC_ERR ("memory full");
 	}
 	vtop++;
 	vtop->type = *type;
@@ -451,7 +462,7 @@
 ST_FUNC void vpushv(SValue *v)
 {
 	if (vtop >= vstack + (VSTACK_SIZE - 1)) {
-		tcc_error ("memory full");
+		TCC_ERR ("memory full");
 	}
 	vtop++;
 	*vtop = *v;
@@ -568,6 +579,9 @@
 {
 	Sym *s;
 	s = sym_push (SYM_FIELD, type, 0, -1);
+	if (!s) {
+		return;
+	}
 	type->t = VT_PTR | (type->t & ~VT_TYPE);
 	type->ref = s;
 }
@@ -828,7 +842,7 @@
 					next ();
 					n = expr_const ();
 					if (n <= 0 || (n & (n - 1)) != 0) {
-						tcc_error ("alignment must be a positive power of two");
+						TCC_ERR ("alignment must be a positive power of two");
 					}
 					skip (')');
 				} else {
@@ -963,7 +977,7 @@
 		s = struct_find (v);
 		if (s) {
 			if (s->type.t != a) {
-				tcc_error ("invalid type");
+				TCC_ERR ("invalid type");
 			}
 			goto do_decl;
 		}
@@ -973,6 +987,9 @@
 	type1.t = a;
 	/* we put an undefined size for struct/union */
 	s = sym_push (v | SYM_STRUCT, &type1, 0, -1);
+	if (!s) {
+		return;
+	}
 	s->r = 0;	/* default alignment is zero as gcc */
 	/* put struct/union/enum name in type */
 do_decl:
@@ -982,7 +999,7 @@
 	if (tok == '{') {
 		next ();
 		if (s->c != -1) {
-			tcc_error ("struct/union/enum already defined");
+			TCC_ERR ("struct/union/enum already defined");
 		}
 		/* cannot be empty */
 		c = 0LL;
@@ -991,10 +1008,8 @@
 			if (!strcmp (name, "{")) {
 				// UNNAMED
 				fprintf (stderr, "anonymous enums are ignored\n");
-			} else {
-				tcc_appendf ("%s=enum\n", name);
 			}
-			for (;;) {
+			while (tcc_nerr () == 0) {
 				v = tok;
 				if (v < TOK_UIDENT) {
 					expect ("identifier");
@@ -1006,14 +1021,18 @@
 				}
 				if (strcmp (name, "{")) {
 					char *varstr = get_tok_str (v, NULL);
-					// eprintf("%s.%s @ 0x%"PFMT64x"\n", name, varstr, c);
-					tcc_appendf ("%s.%s=0x%"PFMT64x "\n", name, varstr, c);
-					tcc_appendf ("%s.0x%"PFMT64x "=%s\n", name, c, varstr);
+					tcc_appendf ("%s=enum\n", name);
+					tcc_appendf ("[+]enum.%s=%s\n",name, varstr);
+					tcc_appendf ("enum.%s.%s=0x%"PFMT64x "\n", name, varstr, c);
+					tcc_appendf ("enum.%s.0x%"PFMT64x "=%s\n", name, c, varstr);
 					// TODO: if token already defined throw an error
 					// if (varstr isInside (arrayOfvars)) { erprintf ("ERROR: DUP VAR IN ENUM\n"); }
 				}
 				/* enum symbols have static storage */
 				ss = sym_push (v, &int64_type, VT_CONST, c);
+				if (!ss) {
+					return;
+				}
 				ss->type.t |= VT_STATIC;
 				if (tok != ',') {
 					break;
@@ -1037,7 +1056,7 @@
 					expect ("bracket");
 					break;
 				}
-				while (1) {
+				while (tcc_nerr () == 0) {
 					bit_size = -1;
 					v = 0;
 					memcpy (&type1, &btype, sizeof(type1));
@@ -1048,7 +1067,7 @@
 						}
 						if ((type1.t & VT_BTYPE) == VT_FUNC ||
 						    (type1.t & (VT_TYPEDEF | VT_STATIC | VT_EXTERN | VT_INLINE))) {
-							tcc_error ("invalid type for '%s'",
+							TCC_ERR ("invalid type for '%s'",
 								get_tok_str (v, NULL));
 						}
 					}
@@ -1057,11 +1076,11 @@
 						bit_size = (int) expr_const ();
 						/* XXX: handle v = 0 case for messages */
 						if (bit_size < 0) {
-							tcc_error ("negative width in bit-field '%s'",
+							TCC_ERR ("negative width in bit-field '%s'",
 								get_tok_str (v, NULL));
 						}
 						if (v && bit_size == 0) {
-							tcc_error ("zero width for bit-field '%s'",
+							TCC_ERR ("zero width for bit-field '%s'",
 								get_tok_str (v, NULL));
 						}
 					}
@@ -1086,11 +1105,11 @@
 						    bt != VT_INT64 &&
 						    bt != VT_ENUM &&
 						    bt != VT_BOOL) {
-							tcc_error ("bitfields must have scalar type");
+							TCC_ERR ("bitfields must have scalar type");
 						}
 						bsize = size * 8;
 						if (bit_size > bsize) {
-							tcc_error ("width of '%s' exceeds its type",
+							TCC_ERR ("width of '%s' exceeds its type",
 								get_tok_str (v, NULL));
 						} else if (bit_size == bsize) {
 							/* no need for bit fields */
@@ -1175,11 +1194,17 @@
 						ass = type1.ref;
 						while ((ass = ass->next) != NULL) {
 							ss = sym_push (ass->v, &ass->type, 0, offset + ass->c);
+							if (!ss) {
+								return;
+							}
 							*ps = ss;
 							ps = &ss->next;
 						}
 					} else if (v) {
 						ss = sym_push (v | SYM_FIELD, &type1, 0, offset);
+						if (!ss) {
+							return;
+						}
 						*ps = ss;
 						ps = &ss->next;
 					}
@@ -1213,7 +1238,7 @@
 	typedef_found = 0;
 	/* FIXME: Make this dependent on the target */
 	t = 0;	/* default for 'int' */
-	while (1) {
+	while (tcc_nerr () == 0) {
 		switch (tok) {
 		case TOK_EXTENSION:
 			/* currently, we really ignore extension */
@@ -1239,6 +1264,7 @@
 basic_type1:
 			if ((t & VT_BTYPE) != 0) {
 				tcc_error ("too many basic types");
+				return 0;
 			}
 			t |= u;
 			typespec_found = 1;
@@ -1420,6 +1446,7 @@
 the_end:
 	if ((t & (VT_SIGNED | VT_UNSIGNED)) == (VT_SIGNED | VT_UNSIGNED)) {
 		tcc_error ("signed and unsigned modifier");
+		return 0;
 	}
 	if (tcc_state->char_is_unsigned) {
 		if ((t & (VT_SIGNED | VT_UNSIGNED | VT_BTYPE)) == VT_INT8) {
@@ -1438,6 +1465,7 @@
 		}
 	}
 	type->t = t;
+
 	return type_found;
 }
 
@@ -1480,12 +1508,12 @@
 		}
 		arg_size = 0;
 		if (tok != ')') {
-			for (;;) {
+			while (tcc_nerr () == 0) {
 				/* read param name and compute offset */
 				if (l != FUNC_OLD) {
 					if (!parse_btype (&pt, &ad1)) {
 						if (l) {
-							tcc_error ("invalid type");
+							TCC_ERR ("invalid type");
 						} else {
 							l = FUNC_OLD;
 							goto old_proto;
@@ -1497,7 +1525,7 @@
 					}
 					type_decl (&pt, &ad1, &n, TYPE_DIRECT | TYPE_ABSTRACT);
 					if ((pt.t & VT_BTYPE) == VT_VOID) {
-						tcc_error ("parameter declared as void");
+						TCC_ERR ("parameter declared as void");
 					}
 					arg_size += (type_size (&pt, &align) + PTR_SIZE - 1) / PTR_SIZE;
 				} else {
@@ -1511,7 +1539,9 @@
 				}
 				convert_parameter_type (&pt);
 				s = sym_push (n | SYM_FIELD, &pt, 0, 0);
-				{
+				if (!s) {
+					return;
+				} else {
 					char kind[1024];
 					type_to_str (kind, sizeof (kind), &pt, NULL);
 					tcc_appendf ("func.%s.arg.%d=%s,%s\n",
@@ -1551,6 +1581,9 @@
 		/* we push a anonymous symbol which will contain the function prototype */
 		ad->func_args = arg_size;
 		s = sym_push (SYM_FIELD, type, INT_ATTR (ad), l);
+		if (!s) {
+			return;
+		}
 		s->next = first;
 		type->t = VT_FUNC;
 		type->ref = s;
@@ -1573,11 +1606,11 @@
 			if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST) {
 				n = vtop->c.i;
 				if (n < 0) {
-					tcc_error ("invalid array size");
+					TCC_ERR ("invalid array size");
 				}
 			} else {
 				if (!is_integer_btype (vtop->type.t & VT_BTYPE)) {
-					tcc_error ("size of variable length array should be an integer");
+					TCC_ERR ("size of variable length array should be an integer");
 				}
 				t1 = VT_VLA;
 			}
@@ -1597,6 +1630,9 @@
 		}
 #endif
 		s = sym_push (SYM_FIELD, type, 0, n);
+		if (!s) {
+			return;
+		}
 		type->t = (t1? VT_VLA: VT_ARRAY) | VT_PTR;
 		type->ref = s;
 	}
@@ -1937,7 +1973,7 @@
 		if (t == TOK_SIZEOF) {
 			if (!(type.t & VT_VLA)) {
 				if (size < 0) {
-					tcc_error ("sizeof applied to an incomplete type");
+					TCC_ERR ("sizeof applied to an incomplete type");
 				}
 				vpushs (size);
 			}
@@ -1984,7 +2020,7 @@
 		next ();
 		skip ('(');
 		if (tok != TOK_CINT || tokc.i < 0) {
-			tcc_error ("__builtin_frame_address only takes positive integers");
+			TCC_ERR ("__builtin_frame_address only takes positive integers");
 		}
 		level = tokc.i;
 		next ();
@@ -2008,7 +2044,7 @@
 			expr_eq ();
 			skip (')');
 			if ((vtop->r & VT_VALMASK) != VT_LOCAL) {
-				tcc_error ("__builtin_va_start expects a local variable");
+				TCC_ERR ("__builtin_va_start expects a local variable");
 			}
 			vtop->r &= ~(VT_LVAL | VT_REF);
 			vtop->type = char_pointer_type;
@@ -2051,27 +2087,28 @@
 		s = sym_find (t);
 		if (!s) {
 			if (tok != '(') {
-				tcc_error ("'%s' undeclared", get_tok_str (t, NULL));
+				TCC_ERR ("'%s' undeclared", get_tok_str (t, NULL));
 			}
 		}
 		if (!s) {
-			tcc_error ("invalid declaration '%s'", get_tok_str (t, NULL));
-		}
-		if ((s->type.t & (VT_STATIC | VT_INLINE | VT_BTYPE)) ==
-		    (VT_STATIC | VT_INLINE | VT_FUNC)) {
-			/* if referencing an inline function, then we generate a
-			   symbol to it if not already done. It will have the
-			   effect to generate code for it at the end of the
-			   compilation unit. */
-			r = VT_SYM | VT_CONST;
-		} else {
-			r = s->r;
-		}
-		vset (&s->type, r, s->c);
-		/* if forward reference, we must point to s */
-		if (vtop->r & VT_SYM) {
-			vtop->sym = s;
-			vtop->c.ul = 0;
+			TCC_ERR ("invalid declaration '%s'", get_tok_str (t, NULL));
+		} else {
+			if ((s->type.t & (VT_STATIC | VT_INLINE | VT_BTYPE)) ==
+			    (VT_STATIC | VT_INLINE | VT_FUNC)) {
+				/* if referencing an inline function, then we generate a
+				   symbol to it if not already done. It will have the
+				   effect to generate code for it at the end of the
+				   compilation unit. */
+				r = VT_SYM | VT_CONST;
+			} else {
+				r = s->r;
+			}
+			vset (&s->type, r, s->c);
+			/* if forward reference, we must point to s */
+			if (vtop->r & VT_SYM) {
+				vtop->sym = s;
+				vtop->c.ul = 0;
+			}
 		}
 		break;
 	}
@@ -2101,7 +2138,7 @@
 				}
 			}
 			if (!s) {
-				tcc_error ("field not found: %s", get_tok_str (tok & ~SYM_FIELD, NULL));
+				TCC_ERR ("field not found: %s", get_tok_str (tok & ~SYM_FIELD, NULL));
 			}
 			/* add field offset to pointer */
 			vtop->type = char_pointer_type;	/* change type to 'char *' */
@@ -2235,7 +2272,7 @@
 {
 	expr_or ();
 	if (tok == TOK_LAND) {
-		for (;;) {
+		while (tcc_nerr () == 0) {
 			if (tok != TOK_LAND) {
 				break;
 			}
@@ -2249,7 +2286,7 @@
 {
 	expr_land ();
 	if (tok == TOK_LOR) {
-		for (;;) {
+		while (tcc_nerr () == 0) {
 			if (tok != TOK_LOR) {
 				break;
 			}
@@ -2301,7 +2338,7 @@
 
 ST_FUNC void gexpr(void)
 {
-	while (1) {
+	while (tcc_nerr () == 0) {
 		expr_eq ();
 		if (tok != ',') {
 			break;
@@ -2480,7 +2517,7 @@
 		} else {
 			f = *cur_field;
 			if (!f) {
-				tcc_error ("too many field init");
+				TCC_ERR ("too many field init");
 			}
 			/* XXX: fix this mess by using explicit storage field */
 			if (f) {
@@ -2517,7 +2554,7 @@
 		global_expr = saved_global_expr;
 		/* NOTE: symbols are accepted */
 		if ((vtop->r & (VT_VALMASK | VT_LVAL)) != VT_CONST) {
-			tcc_error ("initializer element is not constant");
+			TCC_ERR ("initializer element is not constant");
 		}
 		break;
 	case EXPR_ANY:
@@ -2565,7 +2602,7 @@
 		if ((first && tok != TOK_LSTR && tok != TOK_STR) ||
 		    tok == '{') {
 			if (tok != '{') {
-				tcc_error ("character array initializer must be a literal,"
+				TCC_ERR ("character array initializer must be a literal,"
 					" optionally enclosed in braces");
 			}
 			skip ('{');
@@ -2582,7 +2619,7 @@
 		     (t1->t & VT_BTYPE) == VT_INT32
 #endif
 		    ) || (tok == TOK_STR && (t1->t & VT_BTYPE) == VT_INT8)) {
-			while (tok == TOK_STR || tok == TOK_LSTR) {
+			while (tcc_nerr() == 0 && (tok == TOK_STR || tok == TOK_LSTR)) {
 				int cstr_len, ch;
 				CString *cstr;
 
@@ -2631,7 +2668,7 @@
 			while (tok != '}') {
 				decl_designator (type, c, &index, NULL, size_only);
 				if (n >= 0 && index >= n) {
-					tcc_error ("index too large");
+					TCC_ERR ("index too large");
 				}
 				/* must put zero in holes (note that doing it that way
 				   ensures that it even works with designators) */
@@ -2830,7 +2867,7 @@
 	tok_str_new (&init_str);
 	if (size < 0 || (flexible_array && has_init)) {
 		if (!has_init) {
-			tcc_error ("unknown type size");
+			TCC_ERR ("unknown type size");
 		}
 		/* get all init string */
 		if (has_init == 2) {
@@ -2841,9 +2878,9 @@
 			}
 		} else {
 			level = 0;
-			while (level > 0 || (tok != ',' && tok != ';')) {
+			while (tcc_nerr() == 0 && (level > 0 || (tok != ',' && tok != ';'))) {
 				if (tok < 0) {
-					tcc_error ("unexpected end of file in initializer");
+					TCC_ERR ("unexpected end of file in initializer");
 				}
 				tok_str_add_tok (&init_str);
 				if (tok == '{') {
@@ -2874,7 +2911,7 @@
 		/* if still unknown size, error */
 		size = type_size (type, &align);
 		if (size < 0) {
-			tcc_error ("unknown type size");
+			TCC_ERR ("unknown type size");
 		}
 	}
 	if (flexible_array) {
@@ -2907,7 +2944,7 @@
 			sym = sym_find (v);
 			if (sym) {
 				if (!is_compatible_types (&sym->type, type)) {
-					tcc_error ("incompatible types for redefinition of '%s'",
+					TCC_ERR ("incompatible types for redefinition of '%s'",
 						get_tok_str (v, NULL));
 				}
 				if (sym->type.t & VT_EXTERN) {
@@ -2966,7 +3003,7 @@
 	CType btype, type;
 
 	/* parse each declaration */
-	while (tok != '{' && tok != ';' && tok != ',' && tok != TOK_EOF &&
+	while (tcc_nerr () == 0 && tok != '{' && tok != ';' && tok != ',' && tok != TOK_EOF &&
 	       tok != TOK_ASM1 && tok != TOK_ASM2 && tok != TOK_ASM3) {
 		if (!parse_btype (&btype, &ad)) {
 			expect ("declaration list");
@@ -2976,23 +3013,26 @@
 		    tok == ';') {
 			/* we accept no variable after */
 		} else {
-			for (;;) {
+			while (tcc_nerr () == 0) {
+				int found;
 				type = btype;
 				type_decl (&type, &ad, &v, TYPE_DIRECT);
 				/* find parameter in function parameter list */
-				s = func_sym->next;
-				while (s != NULL) {
+				s = func_sym;
+				found = 0;
+				while ((s = s->next) != NULL) {
 					if ((s->v & ~SYM_FIELD) == v) {
-						goto found;
+						found = 1;
+						break;
 					}
-					s = s->next;
 				}
-				tcc_error ("declaration for parameter '%s' but no such parameter",
-					get_tok_str (v, NULL));
-found:
+				if (found == 0) {
+					TCC_ERR ("declaration for parameter '%s' but no such parameter",
+						get_tok_str (v, NULL));
+				}
 				/* check that no storage specifier except 'register' was given */
 				if (type.t & VT_STORAGE) {
-					tcc_error ("storage class specified for '%s'", get_tok_str (v, NULL));
+					TCC_ERR ("storage class specified for '%s'", get_tok_str (v, NULL));
 				}
 				convert_parameter_type (&type);
 				/* we can add the type (NOTE: it could be local to the function) */
@@ -3015,11 +3055,11 @@
 static int decl0(int l, int is_for_loop_init)
 {
 	int v, has_init, r;
-	CType type, btype;
-	Sym *sym;
+	CType type = {.t = 0, .ref = NULL}, btype = {.t = 0, .ref = NULL};
+	Sym *sym = NULL;
 	AttributeDef ad;
 
-	for (;;) {
+	while (tcc_nerr () == 0) {
 		if (!parse_btype (&btype, &ad)) {
 			if (is_for_loop_init) {
 				return 0;
@@ -3054,7 +3094,8 @@
 			next ();
 			continue;
 		}
-		while (1) {	/* iterate thru each declaration */
+		/* iterate thru each declaration */
+		while (tcc_nerr () == 0) {
 			type = btype;
 			type_decl (&type, &ad, &v, TYPE_DIRECT);
 #if 0
@@ -3067,6 +3108,7 @@
 			if ((type.t & VT_BTYPE) == VT_FUNC) {
 				if ((type.t & VT_STATIC) && (l == VT_LOCAL)) {
 					tcc_error ("function without file scope cannot be static");
+					return 1;
 				}
 				/* if old style function prototype, we accept a
 				   declaration list */
@@ -3090,6 +3132,7 @@
 			if (tok == '{') {
 				if (l == VT_LOCAL) {
 					tcc_error ("cannot use local functions");
+					return 1;
 				}
 				if ((type.t & VT_BTYPE) != VT_FUNC) {
 					expect ("function definition");
@@ -3097,10 +3140,14 @@
 
 				/* reject abstract declarators in function definition */
 				sym = type.ref;
-				while ((sym = sym->next) != NULL)
-					if (!(sym->v & ~SYM_FIELD)) {
-						expect ("identifier");
-					}
+				if (sym) {
+					while ((sym = sym->next) != NULL)
+						if (!(sym->v & ~SYM_FIELD)) {
+							expect ("identifier");
+						}
+				} else {
+					return 0; // XXX unmatching braces in typedef?
+				}
 
 				/* XXX: cannot do better now: convert extern line to static inline */
 				if ((type.t & (VT_EXTERN | VT_INLINE)) == (VT_EXTERN | VT_INLINE)) {
@@ -3134,12 +3181,16 @@
 func_error1:
 						tcc_error ("incompatible types for redefinition of '%s'",
 							get_tok_str (v, NULL));
+						return 1;
 					}
 					/* if symbol is already defined, then put complete type */
 					sym->type = type;
 				} else {
 					/* put function symbol */
 					sym = global_identifier_push (v, type.t, 0);
+					if (!sym) {
+						return 1;
+					}
 					sym->type.ref = type.ref;
 				}
 				break;
@@ -3147,8 +3198,22 @@
 				if (btype.t & VT_TYPEDEF) {
 					/* save typedefed type  */
 					/* XXX: test storage specifiers ? */
+					if (tok != ';') {
+						v = tok;
+						next();
+					}
 					sym = sym_push (v, &type, INT_ATTR (&ad), 0);
+					if (!sym) {
+						return 1;
+					}
 					sym->type.t |= VT_TYPEDEF;
+					/* Provide SDB with typedefs' info */
+					const char *alias = NULL;
+					char buf[500];
+					alias = get_tok_str(v, NULL);
+					type_to_str(buf, sizeof(buf), &sym->type, NULL);
+					tcc_appendf("%s=typedef\n",alias);
+					tcc_appendf("typedef.%s=%s\n",alias, buf);
 				} else {
 					r = 0;
 					if ((type.t & VT_BTYPE) == VT_FUNC) {
@@ -3162,6 +3227,7 @@
 					has_init = (tok == '=');
 					if (has_init && (type.t & VT_VLA)) {
 						tcc_error ("Variable length array cannot be initialized");
+						return 1;
 					}
 				}
 				if (tok != ',') {
diff -Nru radare2-2.3.0+dfsg/shlr/tcc/tcc.h radare2-2.8.0+dfsg/shlr/tcc/tcc.h
--- radare2-2.3.0+dfsg/shlr/tcc/tcc.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/tcc/tcc.h	2018-08-07 14:12:36.000000000 +0000
@@ -846,6 +846,11 @@
 /* XXX: get rid of this ASAP */
 ST_DATA struct TCCState *tcc_state;
 
+static inline int tcc_nerr() {
+	return tcc_state->nb_errors;
+}
+
+
 #ifdef MEM_DEBUG
 ST_DATA int mem_cur_size;
 ST_DATA int mem_max_size;
diff -Nru radare2-2.3.0+dfsg/shlr/tcc/tccpp.c radare2-2.8.0+dfsg/shlr/tcc/tccpp.c
--- radare2-2.3.0+dfsg/shlr/tcc/tccpp.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/tcc/tccpp.c	2018-08-07 14:12:36.000000000 +0000
@@ -650,7 +650,7 @@
 {
 	int c;
 	p++;
-	for (;;) {
+	while (tcc_nerr () == 0) {
 		c = *p;
 		if (c == sep) {
 			break;
@@ -662,6 +662,7 @@
 unterminated_string:
 				/* XXX: indicate line number of start of string */
 				tcc_error ("missing terminating %c character", sep);
+				return NULL;
 			} else if (c == '\\') {
 				/* escape : just skip \[\r]\n */
 				PEEKC_EOB (c, p);
@@ -672,6 +673,7 @@
 					PEEKC_EOB (c, p);
 					if (c != '\n') {
 						expect ("'\n' after '\r'");
+						return NULL;
 					}
 					file->line_num++;
 					p++;
@@ -722,7 +724,7 @@
 redo_start:
 	start_of_line = 1;
 	in_warn_or_error = 0;
-	for (;;) {
+	while (tcc_nerr () == 0) {
 redo_no_start:
 		c = *p;
 		switch (c) {
@@ -742,6 +744,7 @@
 			c = handle_eob ();
 			if (c == CH_EOF) {
 				expect ("#endif");
+				return;
 			} else if (c == '\\') {
 				ch = file->buf_ptr[0];
 				handle_stray_noerror ();
@@ -755,6 +758,9 @@
 				goto _default;
 			}
 			p = parse_pp_string (p, c, NULL);
+			if (p == NULL) {
+				return;
+			}
 			break;
 		/* skip comments */
 		case '/':
@@ -1062,6 +1068,9 @@
 	}
 
 	s = sym_push2 (&define_stack, v, macro_type, 0);
+	if (!s) {
+		return;
+	}
 	s->d = str;
 	s->next = first_arg;
 	table_ident[v - TOK_IDENT]->sym_define = s;
@@ -1124,6 +1133,9 @@
 {
 	Sym *s, **ps;
 	s = sym_push2 (ptop, v, 0, 0);
+	if (!s) {
+		return s;
+	}
 	s->r = flags;
 	ps = &table_ident[v - TOK_IDENT]->sym_label;
 	if (ptop == &global_label_stack) {
@@ -1248,6 +1260,9 @@
 				tcc_error ("badly punctuated parameter list");
 			}
 			s = sym_push2 (&define_stack, varg | SYM_FIELD, is_vaargs, 0);
+			if (!s) {
+				return;
+			}
 			*ps = s;
 			ps = &s->next;
 			if (tok != ',') {
@@ -1986,6 +2001,7 @@
 			}
 			if (ch != 'p' && ch != 'P') {
 				expect ("exponent");
+				return;
 			}
 			ch = *p++;
 			s = 1;
@@ -1998,6 +2014,7 @@
 			}
 			if (ch < '0' || ch > '9') {
 				expect ("exponent digits");
+				return;
 			}
 			while (ch >= '0' && ch <= '9') {
 				exp_val = exp_val * 10 + ch - '0';
@@ -2061,6 +2078,7 @@
 				}
 				if (ch < '0' || ch > '9') {
 					expect ("exponent digits");
+					return;
 				}
 				while (ch >= '0' && ch <= '9') {
 					if (q >= token_buf + STRING_MAX_SIZE) {
@@ -2435,6 +2453,7 @@
 			PEEKC (c, p);
 			if (c != '.') {
 				expect ("'.'");
+				return;
 			}
 			PEEKC (c, p);
 			tok = TOK_DOTS;
@@ -2455,6 +2474,9 @@
 			/* parse the string */
 			cstr_new (&str);
 			p = parse_pp_string (p, sep, &str);
+			if (!p) {
+				return;
+			}
 			cstr_ccat (&str, '\0');
 
 			/* eval the escape (should be done as TOK_PPNUM) */
@@ -2663,7 +2685,7 @@
 {
 	do {
 		next_nomacro_spc ();
-	} while (is_space (tok));
+	} while (tcc_nerr () == 0 && is_space (tok));
 }
 
 /* substitute args in macro_str and return allocated string */
@@ -2678,7 +2700,7 @@
 
 	tok_str_new (&str);
 	last_tok = 0;
-	while (1) {
+	while (tcc_nerr () == 0) {
 		TOK_GET (&t, &macro_str, &cval);
 		if (!t) {
 			break;
@@ -2873,7 +2895,7 @@
 			args = NULL;
 			sa = s->next;
 			/* NOTE: empty args are allowed, except if no args */
-			for (;;) {
+			while (tcc_nerr () == 0) {
 				/* handle '()' case */
 				if (!args && !sa && tok == ')') {
 					break;
@@ -2905,6 +2927,9 @@
 				str.len -= spc;
 				tok_str_add (&str, 0);
 				sa1 = sym_push2 (&args, sa->v & ~SYM_FIELD, sa->type.t, 0);
+				if (!sa1) {
+					return -1;
+				}
 				sa1->d = str.str;
 				sa = sa->next;
 				if (tok == ')') {
@@ -2918,6 +2943,7 @@
 				}
 				if (tok != ',') {
 					expect (",");
+					return 1;
 				}
 				next_nomacro ();
 			}
@@ -2938,7 +2964,9 @@
 			}
 			mstr_allocated = 1;
 		}
-		sym_push2 (nested_list, s->v, 0, 0);
+		if (sym_push2 (nested_list, s->v, 0, 0) == 0) {
+			return -1;
+		}
 		macro_subst (tok_str, nested_list, mstr, can_read_stream);
 		/* pop nested defined symbol */
 		sa1 = *nested_list;
@@ -3010,7 +3038,7 @@
 
 				tcc_open_bf (tcc_state, ":paste:", cstr.size);
 				memcpy (file->buffer, cstr.data, cstr.size);
-				for (;;) {
+				while (tcc_nerr () == 0) {
 					next_nomacro1 ();
 					if (0 == *file->buf_ptr) {
 						break;
@@ -3057,7 +3085,7 @@
 	spc = 0;
 	force_blank = 0;
 
-	while (1) {
+	while (tcc_nerr () == 0) {
 		/* NOTE: ptr == NULL can only happen if tokens are read from
 		   file stream due to a macro function call */
 		if (ptr == NULL) {
@@ -3264,7 +3292,7 @@
 	file_ref = NULL;
 	iptr = s1->include_stack_ptr;
 
-	for (;;) {
+	while (tcc_nerr () == 0) {
 		next ();
 		if (tok == TOK_EOF) {
 			break;
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/decode.c radare2-2.8.0+dfsg/shlr/udis86/decode.c
--- radare2-2.3.0+dfsg/shlr/udis86/decode.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/decode.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1286 +0,0 @@
-/* udis86 - libudis86/decode.c
- * 
- * Copyright (c) 2002-2009 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "udint.h"
-#include "types.h"
-#include "extern.h"
-#include "decode.h"
-
-#ifndef __UD_STANDALONE__
-# include <string.h>
-#endif /* __UD_STANDALONE__ */
-
-/* The max number of prefixes to an instruction */
-#define MAX_PREFIXES    15
-
-/* rex prefix bits */
-#define REX_W(r)        ( ( 0xF & ( r ) )  >> 3 )
-#define REX_R(r)        ( ( 0x7 & ( r ) )  >> 2 )
-#define REX_X(r)        ( ( 0x3 & ( r ) )  >> 1 )
-#define REX_B(r)        ( ( 0x1 & ( r ) )  >> 0 )
-#define REX_PFX_MASK(n) ( ( P_REXW(n) << 3 ) | \
-                          ( P_REXR(n) << 2 ) | \
-                          ( P_REXX(n) << 1 ) | \
-                          ( P_REXB(n) << 0 ) )
-
-/* scable-index-base bits */
-#define SIB_S(b)        ( ( b ) >> 6 )
-#define SIB_I(b)        ( ( ( b ) >> 3 ) & 7 )
-#define SIB_B(b)        ( ( b ) & 7 )
-
-/* modrm bits */
-#define MODRM_REG(b)    ( ( ( b ) >> 3 ) & 7 )
-#define MODRM_NNN(b)    ( ( ( b ) >> 3 ) & 7 )
-#define MODRM_MOD(b)    ( ( ( b ) >> 6 ) & 3 )
-#define MODRM_RM(b)     ( ( b ) & 7 )
-
-static int decode_ext(struct ud *u, uint16_t ptr);
-static int decode_opcode(struct ud *u);
-
-enum reg_class { /* register classes */
-  REGCLASS_GPR,
-  REGCLASS_MMX,
-  REGCLASS_CR,
-  REGCLASS_DB,
-  REGCLASS_SEG,
-  REGCLASS_XMM
-};
-
- /* 
- * inp_start
- *    Should be called before each de-code operation.
- */
-static void
-inp_start(struct ud *u)
-{
-  u->inp_ctr = 0;
-}
-
-static uint8_t
-inp_peek(struct ud *u)
-{
-  if (u->inp_end == 0) {
-    if (u->inp_buf != NULL) {
-      if (u->inp_buf_index < u->inp_buf_size) {
-        return u->inp_buf[u->inp_buf_index];
-      }
-    } else if (u->inp_peek != UD_EOI) {
-      return u->inp_peek;
-    } else {
-      int c;
-      if ((c = u->inp_hook(u)) != UD_EOI) {
-        u->inp_peek = c;
-        return u->inp_peek;
-      }
-    }
-  }
-  u->inp_end = 1;
-  UDERR(u, "byte expected, eoi received\n");
-  return 0;
-}
-   
-static uint8_t
-inp_next(struct ud *u)
-{
-  if (u->inp_end == 0) {
-    if (u->inp_buf != NULL) {
-      if (u->inp_buf_index < u->inp_buf_size) {
-        u->inp_ctr++;
-        return (u->inp_curr = u->inp_buf[u->inp_buf_index++]);
-      }
-    } else {
-      int c = u->inp_peek;
-      if (c != UD_EOI || (c = u->inp_hook(u)) != UD_EOI) {
-        u->inp_peek = UD_EOI;
-        u->inp_curr = c;
-        u->inp_sess[u->inp_ctr++] = u->inp_curr;
-        return u->inp_curr;
-      }
-    }
-  }
-  u->inp_end = 1;
-  UDERR(u, "byte expected, eoi received\n");
-  return 0;
-}
-
-static uint8_t
-inp_curr(struct ud *u)
-{
-  return u->inp_curr;
-}
-
-
-/*
- * inp_uint8
- * int_uint16
- * int_uint32
- * int_uint64
- *    Load little-endian values from input
- */
-static uint8_t 
-inp_uint8(struct ud* u)
-{
-  return inp_next(u);
-}
-
-static uint16_t 
-inp_uint16(struct ud* u)
-{
-  uint16_t r, ret;
-
-  ret = inp_next(u);
-  r = inp_next(u);
-  return ret | (r << 8);
-}
-
-static uint32_t 
-inp_uint32(struct ud* u)
-{
-  uint32_t r, ret;
-
-  ret = inp_next(u);
-  r = inp_next(u);
-  ret = ret | (r << 8);
-  r = inp_next(u);
-  ret = ret | (r << 16);
-  r = inp_next(u);
-  return ret | (r << 24);
-}
-
-static uint64_t 
-inp_uint64(struct ud* u)
-{
-  uint64_t r, ret;
-
-  ret = inp_next(u);
-  r = inp_next(u);
-  ret = ret | (r << 8);
-  r = inp_next(u);
-  ret = ret | (r << 16);
-  r = inp_next(u);
-  ret = ret | (r << 24);
-  r = inp_next(u);
-  ret = ret | (r << 32);
-  r = inp_next(u);
-  ret = ret | (r << 40);
-  r = inp_next(u);
-  ret = ret | (r << 48);
-  r = inp_next(u);
-  return ret | (r << 56);
-}
-
-
-static UD_INLINE int
-eff_opr_mode(int dis_mode, int rex_w, int pfx_opr)
-{
-  if (dis_mode == 64) {
-    return rex_w ? 64 : (pfx_opr ? 16 : 32);
-  } else if (dis_mode == 32) {
-    return pfx_opr ? 16 : 32;
-  } else {
-    UD_ASSERT(dis_mode == 16);
-    return pfx_opr ? 32 : 16;
-  }
-}
-
-
-static UD_INLINE int
-eff_adr_mode(int dis_mode, int pfx_adr)
-{
-  if (dis_mode == 64) {
-    return pfx_adr ? 32 : 64;
-  } else if (dis_mode == 32) {
-    return pfx_adr ? 16 : 32;
-  } else {
-    UD_ASSERT(dis_mode == 16);
-    return pfx_adr ? 32 : 16;
-  }
-}
-
-
-/* 
- * decode_prefixes
- *
- *  Extracts instruction prefixes.
- */
-static int 
-decode_prefixes(struct ud *u)
-{
-  int done = 0;
-  uint8_t curr = 0, last = 0;
-  UD_RETURN_ON_ERROR(u);
-
-  do {
-    last = curr;
-    curr = inp_next(u); 
-    UD_RETURN_ON_ERROR(u);
-    if (u->inp_ctr == MAX_INSN_LENGTH) {
-      UD_RETURN_WITH_ERROR(u, "max instruction length");
-    }
-   
-    switch (curr)  
-    {
-    case 0x2E: 
-      u->pfx_seg = UD_R_CS; 
-      break;
-    case 0x36:     
-      u->pfx_seg = UD_R_SS; 
-      break;
-    case 0x3E: 
-      u->pfx_seg = UD_R_DS; 
-      break;
-    case 0x26: 
-      u->pfx_seg = UD_R_ES; 
-      break;
-    case 0x64: 
-      u->pfx_seg = UD_R_FS; 
-      break;
-    case 0x65: 
-      u->pfx_seg = UD_R_GS; 
-      break;
-    case 0x67: /* adress-size override prefix */ 
-      u->pfx_adr = 0x67;
-      break;
-    case 0xF0: 
-      u->pfx_lock = 0xF0;
-      break;
-    case 0x66: 
-      u->pfx_opr = 0x66;
-      break;
-    case 0xF2:
-      u->pfx_str = 0xf2;
-      break;
-    case 0xF3:
-      u->pfx_str = 0xf3;
-      break;
-    default:
-      /* consume if rex */
-      done = (u->dis_mode == 64 && (curr & 0xF0) == 0x40) ? 0 : 1;
-      break;
-    }
-  } while (!done);
-  /* rex prefixes in 64bit mode, must be the last prefix */
-  if (u->dis_mode == 64 && (last & 0xF0) == 0x40) {
-    u->pfx_rex = last;  
-  }
-  return 0;
-}
-
-
-/*
- * vex_l, vex_w
- *  Return the vex.L and vex.W bits
- */
-static UD_INLINE uint8_t
-vex_l(const struct ud *u)
-{
-  UD_ASSERT(u->vex_op != 0);
-  return ((u->vex_op == 0xc4 ? u->vex_b2 : u->vex_b1) >> 2) & 1;
-}
-
-static UD_INLINE uint8_t
-vex_w(const struct ud *u)
-{
-  UD_ASSERT(u->vex_op != 0);
-  return u->vex_op == 0xc4 ? ((u->vex_b2 >> 7) & 1) : 0;
-}
-
-
-static UD_INLINE uint8_t
-modrm(struct ud * u)
-{
-    if ( !u->have_modrm ) {
-        u->modrm = inp_next( u );
-        u->modrm_offset = (uint8_t) (u->inp_ctr - 1);
-        u->have_modrm = 1;
-    }
-    return u->modrm;
-}
-
-
-static unsigned int
-resolve_operand_size(const struct ud* u, ud_operand_size_t osize)
-{
-  switch (osize) {
-  case SZ_V:
-    return u->opr_mode;
-  case SZ_Z:  
-    return u->opr_mode == 16 ? 16 : 32;
-  case SZ_Y:
-    return u->opr_mode == 16 ? 32 : u->opr_mode;
-  case SZ_RDQ:
-    return u->dis_mode == 64 ? 64 : 32;
-  case SZ_X:
-    UD_ASSERT(u->vex_op != 0);
-    return (P_VEXL(u->itab_entry->prefix) && vex_l(u)) ?  SZ_QQ : SZ_DQ;
-  default:
-    return osize;
-  }
-}
-
-
-static int resolve_mnemonic( struct ud* u )
-{
-  /* resolve 3dnow weirdness. */
-  if ( u->mnemonic == UD_I3dnow ) {
-    u->mnemonic = ud_itab[ u->le->table[ inp_curr( u )  ] ].mnemonic;
-  }
-  /* SWAPGS is only valid in 64bits mode */
-  if ( u->mnemonic == UD_Iswapgs && u->dis_mode != 64 ) {
-    UDERR(u, "swapgs invalid in 64bits mode\n");
-    return -1;
-  }
-
-  if (u->mnemonic == UD_Ixchg) {
-    if ((u->operand[0].type == UD_OP_REG && u->operand[0].base == UD_R_AX  &&
-         u->operand[1].type == UD_OP_REG && u->operand[1].base == UD_R_AX) ||
-        (u->operand[0].type == UD_OP_REG && u->operand[0].base == UD_R_EAX &&
-         u->operand[1].type == UD_OP_REG && u->operand[1].base == UD_R_EAX)) {
-      u->operand[0].type = UD_NONE;
-      u->operand[1].type = UD_NONE;
-      u->mnemonic = UD_Inop;
-    }
-  }
-
-  if (u->mnemonic == UD_Inop && u->pfx_repe) {
-    u->pfx_repe = 0;
-    u->mnemonic = UD_Ipause;
-  }
-  return 0;
-}
-
-
-/* -----------------------------------------------------------------------------
- * decode_a()- Decodes operands of the type seg:offset
- * -----------------------------------------------------------------------------
- */
-static void 
-decode_a(struct ud* u, struct ud_operand *op)
-{
-  if (u->opr_mode == 16) {  
-    /* seg16:off16 */
-    op->type = UD_OP_PTR;
-    op->size = 32;
-    op->lval.ptr.off = inp_uint16(u);
-    op->lval.ptr.seg = inp_uint16(u);
-  } else {
-    /* seg16:off32 */
-    op->type = UD_OP_PTR;
-    op->size = 48;
-    op->lval.ptr.off = inp_uint32(u);
-    op->lval.ptr.seg = inp_uint16(u);
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * decode_gpr() - Returns decoded General Purpose Register 
- * -----------------------------------------------------------------------------
- */
-static enum ud_type 
-decode_gpr(register struct ud* u, unsigned int s, unsigned char rm)
-{
-  switch (s) {
-    case 64:
-        return UD_R_RAX + rm;
-    case 32:
-        return UD_R_EAX + rm;
-    case 16:
-        return UD_R_AX  + rm;
-    case  8:
-        if (u->dis_mode == 64 && u->pfx_rex) {
-            if (rm >= 4)
-                return UD_R_SPL + (rm-4);
-            return UD_R_AL + rm;
-        } else return UD_R_AL + rm;
-    case 0:
-        /* invalid size in case of a decode error */
-        UD_ASSERT(u->error);
-        return UD_NONE;
-    default:
-        UD_ASSERT(!"invalid operand size");
-        return UD_NONE;
-  }
-}
-
-static void
-decode_reg(struct ud *u, 
-           struct ud_operand *opr,
-           int type,
-           int num,
-           int size)
-{
-  int reg;
-  size = resolve_operand_size(u, size);
-  switch (type) {
-    case REGCLASS_GPR : reg = decode_gpr(u, size, num); break;
-    case REGCLASS_MMX : reg = UD_R_MM0  + (num & 7); break;
-    case REGCLASS_XMM :
-      reg = num + (size == SZ_QQ ? UD_R_YMM0 : UD_R_XMM0);
-      break;
-    case REGCLASS_CR : reg = UD_R_CR0  + num; break;
-    case REGCLASS_DB : reg = UD_R_DR0  + num; break;
-    case REGCLASS_SEG : {
-      /*
-       * Only 6 segment registers, anything else is an error.
-       */
-      if ((num & 7) > 5) {
-        UDERR(u, "invalid segment register value\n");
-        return;
-      } else {
-        reg = UD_R_ES + (num & 7);
-      }
-      break;
-    }
-    default:
-      UD_ASSERT(!"invalid register type");
-      return;
-  }
-  opr->type = UD_OP_REG;
-  opr->base = reg;
-  opr->size = size;
-}
-
-
-/*
- * decode_imm 
- *
- *    Decode Immediate values.
- */
-static void 
-decode_imm(struct ud* u, unsigned int size, struct ud_operand *op)
-{
-  op->size = resolve_operand_size(u, size);
-  op->type = UD_OP_IMM;
-
-  switch (op->size) {
-  case  8: op->lval.sbyte = inp_uint8(u);   break;
-  case 16: op->lval.uword = inp_uint16(u);  break;
-  case 32: op->lval.udword = inp_uint32(u); break;
-  case 64: op->lval.uqword = inp_uint64(u); break;
-  default: return;
-  }
-}
-
-
-/* 
- * decode_mem_disp
- *
- *    Decode mem address displacement.
- */
-static void 
-decode_mem_disp(struct ud* u, unsigned int size, struct ud_operand *op)
-{
-  switch (size) {
-  case 8:
-    op->offset = 8; 
-    op->lval.ubyte  = inp_uint8(u);
-    break;
-  case 16:
-    op->offset = 16; 
-    op->lval.uword  = inp_uint16(u); 
-    break;
-  case 32:
-    op->offset = 32; 
-    op->lval.udword = inp_uint32(u); 
-    break;
-  case 64:
-    op->offset = 64; 
-    op->lval.uqword = inp_uint64(u); 
-    break;
-  default:
-      return;
-  }
-}
-
-
-/*
- * decode_modrm_reg
- *
- *    Decodes reg field of mod/rm byte
- * 
- */
-static UD_INLINE void
-decode_modrm_reg(struct ud         *u, 
-                 struct ud_operand *operand,
-                 unsigned int       type,
-                 unsigned int       size)
-{
-  uint8_t reg = (REX_R(u->_rex) << 3) | MODRM_REG(modrm(u));
-  decode_reg(u, operand, type, reg, size);
-}
-
-
-/*
- * decode_modrm_rm
- *
- *    Decodes rm field of mod/rm byte
- * 
- */
-static void 
-decode_modrm_rm(struct ud         *u, 
-                struct ud_operand *op,
-                unsigned char      type,    /* register type */
-                unsigned int       size)    /* operand size */
-
-{
-  size_t offset = 0;
-  unsigned char mod, rm;
-
-  /* get mod, r/m and reg fields */
-  mod = MODRM_MOD(modrm(u));
-  rm  = (REX_B(u->_rex) << 3) | MODRM_RM(modrm(u));
-
-  /* 
-   * If mod is 11b, then the modrm.rm specifies a register.
-   *
-   */
-  if (mod == 3) {
-    decode_reg(u, op, type, rm, size);
-    return;
-  }
-
-  /* 
-   * !11b => Memory Address
-   */  
-  op->type = UD_OP_MEM;
-  op->size = resolve_operand_size(u, size);
-
-  if (u->adr_mode == 64) {
-    op->base = UD_R_RAX + rm;
-    if (mod == 1) {
-      offset = 8;
-    } else if (mod == 2) {
-      offset = 32;
-    } else if (mod == 0 && (rm & 7) == 5) {           
-      op->base = UD_R_RIP;
-      offset = 32;
-    } else {
-      offset = 0;
-    }
-    /* 
-     * Scale-Index-Base (SIB) 
-     */
-    if ((rm & 7) == 4) {
-      inp_next(u);
-      
-      op->base  = UD_R_RAX + (SIB_B(inp_curr(u)) | (REX_B(u->_rex) << 3));
-      op->index = UD_R_RAX + (SIB_I(inp_curr(u)) | (REX_X(u->_rex) << 3));
-      /* special conditions for base reference */
-      if (op->index == UD_R_RSP) {
-        op->index = UD_NONE;
-        op->scale = UD_NONE;
-      } else {
-        op->scale = (1 << SIB_S(inp_curr(u))) & ~1;
-      }
-
-      if (op->base == UD_R_RBP || op->base == UD_R_R13) {
-        if (mod == 0) {
-          op->base = UD_NONE;
-        } 
-        if (mod == 1) {
-          offset = 8;
-        } else {
-          offset = 32;
-        }
-      }
-    } else {
-        op->scale = UD_NONE;
-        op->index = UD_NONE;
-    }
-  } else if (u->adr_mode == 32) {
-    op->base = UD_R_EAX + rm;
-    if (mod == 1) {
-      offset = 8;
-    } else if (mod == 2) {
-      offset = 32;
-    } else if (mod == 0 && rm == 5) {
-      op->base = UD_NONE;
-      offset = 32;
-    } else {
-      offset = 0;
-    }
-
-    /* Scale-Index-Base (SIB) */
-    if ((rm & 7) == 4) {
-      inp_next(u);
-
-      op->scale = (1 << SIB_S(inp_curr(u))) & ~1;
-      op->index = UD_R_EAX + (SIB_I(inp_curr(u)) | (REX_X(u->pfx_rex) << 3));
-      op->base  = UD_R_EAX + (SIB_B(inp_curr(u)) | (REX_B(u->pfx_rex) << 3));
-
-      if (op->index == UD_R_ESP) {
-        op->index = UD_NONE;
-        op->scale = UD_NONE;
-      }
-
-      /* special condition for base reference */
-      if (op->base == UD_R_EBP) {
-        if (mod == 0) {
-          op->base = UD_NONE;
-        } 
-        if (mod == 1) {
-          offset = 8;
-        } else {
-          offset = 32;
-        }
-      }
-    } else {
-      op->scale = UD_NONE;
-      op->index = UD_NONE;
-    }
-  } else {
-    const unsigned int bases[]   = { UD_R_BX, UD_R_BX, UD_R_BP, UD_R_BP,
-                                     UD_R_SI, UD_R_DI, UD_R_BP, UD_R_BX };
-    const unsigned int indices[] = { UD_R_SI, UD_R_DI, UD_R_SI, UD_R_DI,
-                                     UD_NONE, UD_NONE, UD_NONE, UD_NONE };
-    op->base  = bases[rm & 7];
-    op->index = indices[rm & 7];
-    op->scale = UD_NONE;
-    if (mod == 0 && rm == 6) {
-      offset = 16;
-      op->base = UD_NONE;
-    } else if (mod == 1) {
-      offset = 8;
-    } else if (mod == 2) { 
-      offset = 16;
-    }
-  }
-
-  if (offset) {
-    decode_mem_disp(u, offset, op);
-  } else {
-    op->offset = 0;
-  }
-}
-
-
-/* 
- * decode_moffset
- *    Decode offset-only memory operand
- */
-static void
-decode_moffset(struct ud *u, unsigned int size, struct ud_operand *opr)
-{
-  opr->type  = UD_OP_MEM;
-  opr->base  = UD_NONE;
-  opr->index = UD_NONE;
-  opr->scale = UD_NONE;
-  opr->size  = resolve_operand_size(u, size);
-  decode_mem_disp(u, u->adr_mode, opr);
-}
-
-
-static void
-decode_vex_vvvv(struct ud *u, struct ud_operand *opr, unsigned size)
-{
-  uint8_t vvvv;
-  UD_ASSERT(u->vex_op != 0);
-  vvvv = ((u->vex_op == 0xc4 ? u->vex_b2 : u->vex_b1) >> 3) & 0xf;
-  decode_reg(u, opr, REGCLASS_XMM, (0xf & ~vvvv), size);
-}
-
-
-/* 
- * decode_vex_immreg
- *    Decode source operand encoded in immediate byte [7:4]
- */
-static int
-decode_vex_immreg(struct ud *u, struct ud_operand *opr, unsigned size)
-{
-  uint8_t imm  = inp_next(u);
-  uint8_t mask = u->dis_mode == 64 ? 0xf : 0x7;
-  UD_RETURN_ON_ERROR(u);
-  UD_ASSERT(u->vex_op != 0);
-  decode_reg(u, opr, REGCLASS_XMM, mask & (imm >> 4), size);
-  return 0;
-}
-
-
-/* 
- * decode_operand
- *
- *      Decodes a single operand.
- *      Returns the type of the operand (UD_NONE if none)
- */
-static int
-decode_operand(struct ud           *u, 
-               struct ud_operand   *operand,
-               enum ud_operand_code type,
-               unsigned int         size)
-{
-  operand->type = UD_NONE;
-  operand->_oprcode = type;
-
-  switch (type) {
-    case OP_A :
-      decode_a(u, operand);
-      break;
-    case OP_MR:
-      decode_modrm_rm(u, operand, REGCLASS_GPR, 
-                      MODRM_MOD(modrm(u)) == 3 ? 
-                        Mx_reg_size(size) : Mx_mem_size(size));
-      break;
-    case OP_F:
-      u->br_far  = 1;
-      /* intended fall through */
-    case OP_M:
-      if (MODRM_MOD(modrm(u)) == 3) {
-        UDERR(u, "expected modrm.mod != 3\n");
-      }
-      /* intended fall through */
-    case OP_E:
-      decode_modrm_rm(u, operand, REGCLASS_GPR, size);
-      break;
-    case OP_G:
-      decode_modrm_reg(u, operand, REGCLASS_GPR, size);
-      break;
-    case OP_sI:
-    case OP_I:
-      decode_imm(u, size, operand);
-      break;
-    case OP_I1:
-      operand->type = UD_OP_CONST;
-      operand->lval.udword = 1;
-      break;
-    case OP_N:
-      if (MODRM_MOD(modrm(u)) != 3) {
-        UDERR(u, "expected modrm.mod == 3\n");
-      }
-      /* intended fall through */
-    case OP_Q:
-      decode_modrm_rm(u, operand, REGCLASS_MMX, size);
-      break;
-    case OP_P:
-      decode_modrm_reg(u, operand, REGCLASS_MMX, size);
-      break;
-    case OP_U:
-      if (MODRM_MOD(modrm(u)) != 3) {
-        UDERR(u, "expected modrm.mod == 3\n");
-      }
-      /* intended fall through */
-    case OP_W:
-      decode_modrm_rm(u, operand, REGCLASS_XMM, size);
-      break;
-    case OP_V:
-      decode_modrm_reg(u, operand, REGCLASS_XMM, size);
-      break;
-    case OP_H:
-      decode_vex_vvvv(u, operand, size);
-      break;
-    case OP_MU:
-      decode_modrm_rm(u, operand, REGCLASS_XMM, 
-                      MODRM_MOD(modrm(u)) == 3 ? 
-                        Mx_reg_size(size) : Mx_mem_size(size));
-      break;
-    case OP_S:
-      decode_modrm_reg(u, operand, REGCLASS_SEG, size);
-      break;
-    case OP_O:
-      decode_moffset(u, size, operand);
-      break;
-    case OP_R0: 
-    case OP_R1: 
-    case OP_R2: 
-    case OP_R3: 
-    case OP_R4: 
-    case OP_R5: 
-    case OP_R6: 
-    case OP_R7:
-      decode_reg(u, operand, REGCLASS_GPR, 
-                 (REX_B(u->_rex) << 3) | (type - OP_R0), size);
-      break;
-    case OP_AL:
-    case OP_AX:
-    case OP_eAX:
-    case OP_rAX:
-      decode_reg(u, operand, REGCLASS_GPR, 0, size);
-      break;
-    case OP_CL:
-    case OP_CX:
-    case OP_eCX:
-      decode_reg(u, operand, REGCLASS_GPR, 1, size);
-      break;
-    case OP_DL:
-    case OP_DX:
-    case OP_eDX:
-      decode_reg(u, operand, REGCLASS_GPR, 2, size);
-      break;
-    case OP_ES: 
-    case OP_CS: 
-    case OP_DS:
-    case OP_SS: 
-    case OP_FS: 
-    case OP_GS:
-      /* in 64bits mode, only fs and gs are allowed */
-      if (u->dis_mode == 64) {
-        if (type != OP_FS && type != OP_GS) {
-          UDERR(u, "invalid segment register in 64bits\n");
-        }
-      }
-      operand->type = UD_OP_REG;
-      operand->base = (type - OP_ES) + UD_R_ES;
-      operand->size = 16;
-      break;
-    case OP_J :
-      decode_imm(u, size, operand);
-      operand->type = UD_OP_JIMM;
-      break ;
-    case OP_R :
-      if (MODRM_MOD(modrm(u)) != 3) {
-        UDERR(u, "expected modrm.mod == 3\n");
-      }
-      decode_modrm_rm(u, operand, REGCLASS_GPR, size);
-      break;
-    case OP_C:
-      decode_modrm_reg(u, operand, REGCLASS_CR, size);
-      break;
-    case OP_D:
-      decode_modrm_reg(u, operand, REGCLASS_DB, size);
-      break;
-    case OP_I3 :
-      operand->type = UD_OP_CONST;
-      operand->lval.sbyte = 3;
-      break;
-    case OP_ST0: 
-    case OP_ST1: 
-    case OP_ST2: 
-    case OP_ST3:
-    case OP_ST4:
-    case OP_ST5: 
-    case OP_ST6: 
-    case OP_ST7:
-      operand->type = UD_OP_REG;
-      operand->base = (type - OP_ST0) + UD_R_ST0;
-      operand->size = 80;
-      break;
-    case OP_L:
-      decode_vex_immreg(u, operand, size);
-      break;
-    default :
-      operand->type = UD_NONE;
-      break;
-  }
-  return operand->type;
-}
-
-
-/* 
- * decode_operands
- *
- *    Disassemble upto 3 operands of the current instruction being
- *    disassembled. By the end of the function, the operand fields
- *    of the ud structure will have been filled.
- */
-static int
-decode_operands(struct ud* u)
-{
-  decode_operand(u, &u->operand[0],
-                    u->itab_entry->operand1.type,
-                    u->itab_entry->operand1.size);
-  if (u->operand[0].type != UD_NONE) {
-      decode_operand(u, &u->operand[1],
-                        u->itab_entry->operand2.type,
-                        u->itab_entry->operand2.size);
-  }
-  if (u->operand[1].type != UD_NONE) {
-      decode_operand(u, &u->operand[2],
-                        u->itab_entry->operand3.type,
-                        u->itab_entry->operand3.size);
-  }
-  if (u->operand[2].type != UD_NONE) {
-      decode_operand(u, &u->operand[3],
-                        u->itab_entry->operand4.type,
-                        u->itab_entry->operand4.size);
-  }
-  return 0;
-}
-    
-/* -----------------------------------------------------------------------------
- * clear_insn() - clear instruction structure
- * -----------------------------------------------------------------------------
- */
-static void
-clear_insn(register struct ud* u)
-{
-  u->error     = 0;
-  u->pfx_seg   = 0;
-  u->pfx_opr   = 0;
-  u->pfx_adr   = 0;
-  u->pfx_lock  = 0;
-  u->pfx_repne = 0;
-  u->pfx_rep   = 0;
-  u->pfx_repe  = 0;
-  u->pfx_rex   = 0;
-  u->pfx_str   = 0;
-  u->mnemonic  = UD_Inone;
-  u->itab_entry = NULL;
-  u->have_modrm = 0;
-  u->br_far    = 0;
-  u->vex_op    = 0;
-  u->_rex      = 0;
-  u->operand[0].type = UD_NONE;
-  u->operand[1].type = UD_NONE;
-  u->operand[2].type = UD_NONE;
-  u->operand[3].type = UD_NONE;
-}
-
-
-static UD_INLINE int
-resolve_pfx_str(struct ud* u)
-{
-  if (u->pfx_str == 0xf3) {
-    if (P_STR(u->itab_entry->prefix)) {
-        u->pfx_rep  = 0xf3;
-    } else {
-        u->pfx_repe = 0xf3;
-    }
-  } else if (u->pfx_str == 0xf2) {
-    u->pfx_repne = 0xf3;
-  }
-  return 0;
-}
-
-
-static int
-resolve_mode( struct ud* u )
-{
-  int default64;
-  /* if in error state, bail out */
-  if ( u->error ) return -1; 
-
-  /* propagate prefix effects */
-  if ( u->dis_mode == 64 ) {  /* set 64bit-mode flags */
-
-    /* Check validity of  instruction m64 */
-    if ( P_INV64( u->itab_entry->prefix ) ) {
-      UDERR(u, "instruction invalid in 64bits\n");
-      return -1;
-    }
-
-    /* compute effective rex based on,
-     *  - vex prefix (if any)
-     *  - rex prefix (if any, and not vex)
-     *  - allowed prefixes specified by the opcode map
-     */
-    if (u->vex_op == 0xc4) {
-        /* vex has rex.rxb in 1's complement */
-        u->_rex = ((~(u->vex_b1 >> 5) & 0x7) /* rex.0rxb */ | 
-                   ((u->vex_b2  >> 4) & 0x8) /* rex.w000 */);
-    } else if (u->vex_op == 0xc5) {
-        /* vex has rex.r in 1's complement */
-        u->_rex = (~(u->vex_b1 >> 5)) & 4;
-    } else {
-        UD_ASSERT(u->vex_op == 0);
-        u->_rex = u->pfx_rex;
-    }
-    u->_rex &= REX_PFX_MASK(u->itab_entry->prefix);
-
-    /* whether this instruction has a default operand size of 
-     * 64bit, also hardcoded into the opcode map.
-     */
-    default64 = P_DEF64( u->itab_entry->prefix ); 
-    /* calculate effective operand size */
-    if (REX_W(u->_rex)) {
-        u->opr_mode = 64;
-    } else if ( u->pfx_opr ) {
-        u->opr_mode = 16;
-    } else {
-        /* unless the default opr size of instruction is 64,
-         * the effective operand size in the absence of rex.w
-         * prefix is 32.
-         */
-        u->opr_mode = default64 ? 64 : 32;
-    }
-
-    /* calculate effective address size */
-    u->adr_mode = (u->pfx_adr) ? 32 : 64;
-  } else if ( u->dis_mode == 32 ) { /* set 32bit-mode flags */
-    u->opr_mode = ( u->pfx_opr ) ? 16 : 32;
-    u->adr_mode = ( u->pfx_adr ) ? 16 : 32;
-  } else if ( u->dis_mode == 16 ) { /* set 16bit-mode flags */
-    u->opr_mode = ( u->pfx_opr ) ? 32 : 16;
-    u->adr_mode = ( u->pfx_adr ) ? 32 : 16;
-  }
-
-  return 0;
-}
-
-
-static UD_INLINE int
-decode_insn(struct ud *u, uint16_t ptr)
-{
-  UD_ASSERT((ptr & 0x8000) == 0);
-  u->itab_entry = &ud_itab[ ptr ];
-  u->mnemonic = u->itab_entry->mnemonic;
-  return (resolve_pfx_str(u)  == 0 &&
-          resolve_mode(u)     == 0 &&
-          decode_operands(u)  == 0 &&
-          resolve_mnemonic(u) == 0) ? 0 : -1;
-}
-
-
-/*
- * decode_3dnow()
- *
- *    Decoding 3dnow is a little tricky because of its strange opcode
- *    structure. The final opcode disambiguation depends on the last
- *    byte that comes after the operands have been decoded. Fortunately,
- *    all 3dnow instructions have the same set of operand types. So we
- *    go ahead and decode the instruction by picking an arbitrarily chosen
- *    valid entry in the table, decode the operands, and read the final
- *    byte to resolve the menmonic.
- */
-static UD_INLINE int
-decode_3dnow(struct ud* u)
-{
-  uint16_t ptr;
-  UD_ASSERT(u->le->type == UD_TAB__OPC_3DNOW);
-  UD_ASSERT(u->le->table[0xc] != 0);
-  decode_insn(u, u->le->table[0xc]);
-  inp_next(u); 
-  if (u->error) {
-    return -1;
-  }
-  ptr = u->le->table[inp_curr(u)]; 
-  UD_ASSERT((ptr & 0x8000) == 0);
-  u->mnemonic = ud_itab[ptr].mnemonic;
-  return 0;
-}
-
-
-static int
-decode_ssepfx(struct ud *u)
-{
-  uint8_t idx;
-  uint8_t pfx;
- 
-  /*
-   * String prefixes (f2, f3) take precedence over operand
-   * size prefix (66).
-   */
-  pfx = u->pfx_str;
-  if (pfx == 0) {
-    pfx = u->pfx_opr;
-  }
-  idx = ((pfx & 0xf) + 1) / 2;
-  if (u->le->table[idx] == 0) {
-    idx = 0;
-  }
-  if (idx && u->le->table[idx] != 0) {
-    /*
-     * "Consume" the prefix as a part of the opcode, so it is no
-     * longer exported as an instruction prefix.
-     */
-    u->pfx_str = 0;
-    if (pfx == 0x66) {
-        /* 
-         * consume "66" only if it was used for decoding, leaving
-         * it to be used as an operands size override for some
-         * simd instructions.
-         */
-        u->pfx_opr = 0;
-    }
-  }
-  return decode_ext(u, u->le->table[idx]);
-}
-
-
-static int
-decode_vex(struct ud *u)
-{
-  uint8_t index;
-  if (u->dis_mode != 64 && MODRM_MOD(inp_peek(u)) != 0x3) {
-    index = 0;
-  } else {
-    u->vex_op = inp_curr(u);
-    u->vex_b1 = inp_next(u);
-    if (u->vex_op == 0xc4) {
-      uint8_t pp, m;
-      /* 3-byte vex */
-      u->vex_b2 = inp_next(u);
-      UD_RETURN_ON_ERROR(u);
-      m  = u->vex_b1 & 0x1f;
-      if (m == 0 || m > 3) {
-        UD_RETURN_WITH_ERROR(u, "reserved vex.m-mmmm value");
-      }
-      pp = u->vex_b2 & 0x3;
-      index = (pp << 2) | m;
-    } else {
-      /* 2-byte vex */
-      UD_ASSERT(u->vex_op == 0xc5);
-      index = 0x1 | ((u->vex_b1 & 0x3) << 2);
-    }
-  }
-  return decode_ext(u, u->le->table[index]); 
-}
-
-
-/*
- * decode_ext()
- *
- *    Decode opcode extensions (if any)
- */
-static int
-decode_ext(struct ud *u, uint16_t ptr)
-{
-  uint8_t idx = 0;
-  if ((ptr & 0x8000) == 0) {
-    return decode_insn(u, ptr); 
-  }
-  u->le = &ud_lookup_table_list[(~0x8000 & ptr)];
-  if (u->le->type == UD_TAB__OPC_3DNOW) {
-    return decode_3dnow(u);
-  }
-
-  switch (u->le->type) {
-    case UD_TAB__OPC_MOD:
-      /* !11 = 0, 11 = 1 */
-      idx = (MODRM_MOD(modrm(u)) + 1) / 4;
-      break;
-      /* disassembly mode/operand size/address size based tables.
-       * 16 = 0,, 32 = 1, 64 = 2
-       */
-    case UD_TAB__OPC_MODE:
-      idx = u->dis_mode != 64 ? 0 : 1;
-      break;
-    case UD_TAB__OPC_OSIZE:
-      idx = eff_opr_mode(u->dis_mode, REX_W(u->pfx_rex), u->pfx_opr) / 32;
-      break;
-    case UD_TAB__OPC_ASIZE:
-      idx = eff_adr_mode(u->dis_mode, u->pfx_adr) / 32;
-      break;
-    case UD_TAB__OPC_X87:
-      idx = modrm(u) - 0xC0;
-      break;
-    case UD_TAB__OPC_VENDOR:
-      if (u->vendor == UD_VENDOR_ANY) {
-        /* choose a valid entry */
-        idx = (u->le->table[idx] != 0) ? 0 : 1;
-      } else if (u->vendor == UD_VENDOR_AMD) {
-        idx = 0;
-      } else {
-        idx = 1;
-      }
-      break;
-    case UD_TAB__OPC_RM:
-      idx = MODRM_RM(modrm(u));
-      break;
-    case UD_TAB__OPC_REG:
-      idx = MODRM_REG(modrm(u));
-      break;
-    case UD_TAB__OPC_SSE:
-      return decode_ssepfx(u);
-    case UD_TAB__OPC_VEX:
-      return decode_vex(u);
-    case UD_TAB__OPC_VEX_W:
-      idx = vex_w(u);
-      break;
-    case UD_TAB__OPC_VEX_L:
-      idx = vex_l(u);
-      break;
-    case UD_TAB__OPC_TABLE:
-      inp_next(u);
-      return decode_opcode(u);
-    default:
-      UD_ASSERT(!"not reached");
-      break;
-  }
-
-  return decode_ext(u, u->le->table[idx]);
-}
-
-
-static int
-decode_opcode(struct ud *u)
-{
-  uint16_t ptr;
-  UD_ASSERT(u->le->type == UD_TAB__OPC_TABLE);
-  UD_RETURN_ON_ERROR(u);
-  ptr = u->le->table[inp_curr(u)];
-  return decode_ext(u, ptr);
-}
-
- 
-/* =============================================================================
- * ud_decode() - Instruction decoder. Returns the number of bytes decoded.
- * =============================================================================
- */
-unsigned int
-ud_decode(struct ud *u)
-{
-  int i = 0;
-  inp_start(u);
-  clear_insn(u);
-  u->le = &ud_lookup_table_list[0];
-  u->error = decode_prefixes(u) == -1 || 
-             decode_opcode(u)   == -1 ||
-             u->error;
-  /* Handle decode error. */
-  if (u->error) {
-    /* clear out the decode data. */
-    clear_insn(u);
-    /* mark the sequence of bytes as invalid. */
-    u->itab_entry = &ud_itab[0]; /* entry 0 is invalid */
-    u->mnemonic = u->itab_entry->mnemonic;
-  } 
-
-  /* maybe this stray segment override byte
-   * should be spewed out?
-   */
-  if ( !P_SEG( u->itab_entry->prefix ) && 
-          u->operand[0].type != UD_OP_MEM &&
-          u->operand[1].type != UD_OP_MEM )
-      u->pfx_seg = 0;
-
-  /* Retrieve some information about operands. */
-  for (i=0; i<4; i++) {
-    struct ud_operand *op = &u->operand[i];
-    switch (op->type) {
-      case UD_OP_REG:   op->signed_lval = 0; break;
-      case UD_OP_MEM:   op->signed_lval = 0; break;
-      case UD_OP_IMM:   op->signed_lval = (op->_oprcode == OP_sI ? 1 : 0); break;
-      case UD_OP_JIMM:  op->signed_lval = 1; break;
-      case UD_OP_PTR:   op->signed_lval = 0; break;
-      case UD_OP_CONST: op->signed_lval = 0; break;
-      default: break;
-    }
-  }
-
-  u->operand[0].access = u->itab_entry->operand1_access;
-  u->operand[1].access = u->itab_entry->operand2_access;
-  u->operand[2].access = UD_OP_ACCESS_READ;
-  u->operand[3].access = UD_OP_ACCESS_READ;
-
-  u->insn_offset = u->pc; /* set offset of instruction */
-  u->asm_buf_fill = 0;   /* set translation buffer index to 0 */
-  u->pc += u->inp_ctr;    /* move program counter by bytes decoded */
-
-  /* return number of bytes disassembled. */
-  return u->inp_ctr;
-}
-
-/*
-vim: set ts=2 sw=2 expandtab
-*/
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/decode.h radare2-2.8.0+dfsg/shlr/udis86/decode.h
--- radare2-2.3.0+dfsg/shlr/udis86/decode.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/decode.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-/* udis86 - libudis86/decode.h
- *
- * Copyright (c) 2002-2009 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef UD_DECODE_H
-#define UD_DECODE_H
-
-#include "types.h"
-#include "udint.h"
-#include "itab.h"
-
-#define MAX_INSN_LENGTH 15
-
-/* itab prefix bits */
-#define P_none          ( 0 )
-
-#define P_inv64         ( 1 << 0 )
-#define P_INV64(n)      ( ( n >> 0 ) & 1 )
-#define P_def64         ( 1 << 1 )
-#define P_DEF64(n)      ( ( n >> 1 ) & 1 )
-
-#define P_oso           ( 1 << 2 )
-#define P_OSO(n)        ( ( n >> 2 ) & 1 )
-#define P_aso           ( 1 << 3 )
-#define P_ASO(n)        ( ( n >> 3 ) & 1 )
-
-#define P_rexb          ( 1 << 4 )
-#define P_REXB(n)       ( ( n >> 4 ) & 1 )
-#define P_rexw          ( 1 << 5 )
-#define P_REXW(n)       ( ( n >> 5 ) & 1 )
-#define P_rexr          ( 1 << 6 )
-#define P_REXR(n)       ( ( n >> 6 ) & 1 )
-#define P_rexx          ( 1 << 7 )
-#define P_REXX(n)       ( ( n >> 7 ) & 1 )
-
-#define P_seg           ( 1 << 8 )
-#define P_SEG(n)        ( ( n >> 8 ) & 1 )
-
-#define P_vexl          ( 1 << 9 )
-#define P_VEXL(n)       ( ( n >> 9 ) & 1 )
-#define P_vexw          ( 1 << 10 )
-#define P_VEXW(n)       ( ( n >> 10 ) & 1 )
-
-#define P_str           ( 1 << 11 )
-#define P_STR(n)        ( ( n >> 11 ) & 1 )
-#define P_strz          ( 1 << 12 )
-#define P_STR_ZF(n)     ( ( n >> 12 ) & 1 )
-
-/* operand type constants -- order is important! */
-
-enum ud_operand_code {
-    OP_NONE,
-
-    OP_A,      OP_E,      OP_M,       OP_G,       
-    OP_I,      OP_F,
-
-    OP_R0,     OP_R1,     OP_R2,      OP_R3,
-    OP_R4,     OP_R5,     OP_R6,      OP_R7,
-
-    OP_AL,     OP_CL,     OP_DL,
-    OP_AX,     OP_CX,     OP_DX,
-    OP_eAX,    OP_eCX,    OP_eDX,
-    OP_rAX,    OP_rCX,    OP_rDX,
-
-    OP_ES,     OP_CS,     OP_SS,      OP_DS,  
-    OP_FS,     OP_GS,
-
-    OP_ST0,    OP_ST1,    OP_ST2,     OP_ST3,
-    OP_ST4,    OP_ST5,    OP_ST6,     OP_ST7,
-
-    OP_J,      OP_S,      OP_O,          
-    OP_I1,     OP_I3,     OP_sI,
-
-    OP_V,      OP_W,      OP_Q,       OP_P, 
-    OP_U,      OP_N,      OP_MU,      OP_H,
-    OP_L,
-
-    OP_R,      OP_C,      OP_D,       
-
-    OP_MR
-} UD_ATTR_PACKED;
-
-
-/*
- * Operand size constants
- *
- *  Symbolic constants for various operand sizes. Some of these constants
- *  are given a value equal to the width of the data (SZ_B == 8), such
- *  that they maybe used interchangeably in the internals. Modifying them
- *  will most certainly break things!
- */
-typedef uint16_t ud_operand_size_t;
-
-#define SZ_NA  0
-#define SZ_Z   1
-#define SZ_V   2
-#define SZ_Y   3
-#define SZ_X   4
-#define SZ_RDQ 7
-#define SZ_B   8
-#define SZ_W   16
-#define SZ_D   32
-#define SZ_Q   64
-#define SZ_T   80
-#define SZ_O   12
-#define SZ_DQ  128 /* double quad */
-#define SZ_QQ  256 /* quad quad */
-
-/*
- * Complex size types; that encode sizes for operands of type MR (memory or
- * register); for internal use only. Id space above 256.
- */
-#define SZ_BD  ((SZ_B << 8) | SZ_D)
-#define SZ_BV  ((SZ_B << 8) | SZ_V)
-#define SZ_WD  ((SZ_W << 8) | SZ_D)
-#define SZ_WV  ((SZ_W << 8) | SZ_V)
-#define SZ_WY  ((SZ_W << 8) | SZ_Y)
-#define SZ_DY  ((SZ_D << 8) | SZ_Y)
-#define SZ_WO  ((SZ_W << 8) | SZ_O)
-#define SZ_DO  ((SZ_D << 8) | SZ_O)
-#define SZ_QO  ((SZ_Q << 8) | SZ_O)
-
-
-/* resolve complex size type.
- */
-static UD_INLINE ud_operand_size_t
-Mx_mem_size(ud_operand_size_t size)
-{
-  return (size >> 8) & 0xff;
-}
-
-static UD_INLINE ud_operand_size_t
-Mx_reg_size(ud_operand_size_t size)
-{
-  return size & 0xff;
-}
-
-/* A single operand of an entry in the instruction table. 
- * (internal use only)
- */
-struct ud_itab_entry_operand 
-{
-  enum ud_operand_code type;
-  ud_operand_size_t    size;
-};
-
-
-/* A single entry in an instruction table. 
- *(internal use only)
- */
-struct ud_itab_entry 
-{
-  enum ud_mnemonic_code         mnemonic;
-  struct ud_itab_entry_operand  operand1;
-  struct ud_itab_entry_operand  operand2;
-  struct ud_itab_entry_operand  operand3;
-  struct ud_itab_entry_operand  operand4;
-  uint8_t                       operand1_access;
-  uint8_t                       operand2_access;
-  uint32_t                      prefix;
-  struct ud_eflags              eflags;
-  enum ud_type                  implicit_register_uses[32];
-  enum ud_type                  implicit_register_defs[32];
-};
-
-struct ud_lookup_table_list_entry {
-    const uint16_t *table;
-    enum ud_table_type type;
-    const char *meta;
-};
-     
-extern struct ud_itab_entry ud_itab[];
-extern struct ud_lookup_table_list_entry ud_lookup_table_list[];
-
-#endif /* UD_DECODE_H */
-
-/* vim:cindent
- * vim:expandtab
- * vim:ts=4
- * vim:sw=4
- */
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/esil.h radare2-2.8.0+dfsg/shlr/udis86/esil.h
--- radare2-2.3.0+dfsg/shlr/udis86/esil.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/esil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#ifndef _UDIS86_ESIL_H
-#define _UDIS86_ESIL_H
-
-/* This may be useful for other architectures */
-#define esilprintf(op, fmt, arg...) snprintf (op->esil, sizeof (op->esil) - 3, fmt, ##arg)
-
-#define UDIS86_ESIL_ARGUMENTS const UDis86OPInfo *info, RAnalOp *op, const char *dst, const char *src, const char *src2
-
-typedef struct udis86_op_info {
-	ut64 n;
-	int  bits;
-	ut64 bitmask;
-	int  regsz;
-	int  oplen;
-	const char *pc;
-	const char *sp;
-	const char *bp;
-} UDis86OPInfo;
-
-typedef struct udis86_esil_t {
-        int argc;
-        void (*callback) (UDIS86_ESIL_ARGUMENTS);
-} UDis86Esil;
-
-#define _JOIN(a1, a2) a1 ## a2
-#define JOIN(a1, a2) _JOIN (a1, a2)
-
-#define UDIS86_ESIL_HANDLER(name) JOIN (JOIN (__x86_, name), _to_esil)
-#define UDIS86_ESIL_PROTO(name) void UDIS86_ESIL_HANDLER (name) (UDIS86_ESIL_ARGUMENTS)
-#define UDIS86_ESIL(name, fmt, arg...) UDIS86_ESIL_PROTO (name) { esilprintf (op, fmt, ##arg); }
-
-UDis86Esil *udis86_esil_get_handler (enum ud_mnemonic_code);
-
-#endif /* _UDIS86_ESIL_H */
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/extern.h radare2-2.8.0+dfsg/shlr/udis86/extern.h
--- radare2-2.3.0+dfsg/shlr/udis86/extern.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/extern.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-/* udis86 - libudis86/extern.h
- *
- * Copyright (c) 2002-2009, 2013 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef UD_EXTERN_H
-#define UD_EXTERN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "types.h"
-
-#if defined(_MSC_VER) && defined(_USRDLL)
-# ifdef LIBUDIS86_EXPORTS
-#  define LIBUDIS86_DLLEXTERN __declspec(dllexport)
-# else 
-#  define LIBUDIS86_DLLEXTERN __declspec(dllimport)
-# endif
-#else
-# define LIBUDIS86_DLLEXTERN 
-#endif
-
-/* ============================= PUBLIC API ================================= */
-
-extern LIBUDIS86_DLLEXTERN void ud_init(struct ud*);
-
-extern LIBUDIS86_DLLEXTERN void ud_set_mode(struct ud*, uint8_t);
-
-extern LIBUDIS86_DLLEXTERN void ud_set_pc(struct ud*, uint64_t);
-
-extern LIBUDIS86_DLLEXTERN void ud_set_input_hook(struct ud*, int (*)(struct ud*));
-
-extern LIBUDIS86_DLLEXTERN void ud_set_input_buffer(struct ud*, const uint8_t*, size_t);
-
-#ifndef __UD_STANDALONE__
-extern LIBUDIS86_DLLEXTERN void ud_set_input_file(struct ud*, FILE*);
-#endif /* __UD_STANDALONE__ */
-
-extern LIBUDIS86_DLLEXTERN void ud_set_vendor(struct ud*, unsigned);
-
-extern LIBUDIS86_DLLEXTERN void ud_set_syntax(struct ud*, void (*)(struct ud*));
-
-extern LIBUDIS86_DLLEXTERN void ud_input_skip(struct ud*, size_t);
-
-extern LIBUDIS86_DLLEXTERN int ud_input_end(const struct ud*);
-
-extern LIBUDIS86_DLLEXTERN unsigned int ud_decode(struct ud*);
-
-extern LIBUDIS86_DLLEXTERN unsigned int ud_disassemble(struct ud*);
-
-extern LIBUDIS86_DLLEXTERN void ud_translate_intel(struct ud*);
-
-extern LIBUDIS86_DLLEXTERN void ud_translate_att(struct ud*);
-
-extern LIBUDIS86_DLLEXTERN const char* ud_insn_asm(const struct ud* u);
-
-extern LIBUDIS86_DLLEXTERN const uint8_t* ud_insn_ptr(const struct ud* u);
-
-extern LIBUDIS86_DLLEXTERN uint64_t ud_insn_off(const struct ud*);
-
-extern LIBUDIS86_DLLEXTERN const char* ud_insn_hex(struct ud*);
-
-extern LIBUDIS86_DLLEXTERN unsigned int ud_insn_len(const struct ud* u);
-
-extern LIBUDIS86_DLLEXTERN const struct ud_operand* ud_insn_opr(const struct ud *u, unsigned int n);
-
-extern LIBUDIS86_DLLEXTERN int ud_opr_is_sreg(const struct ud_operand *opr);
-
-extern LIBUDIS86_DLLEXTERN int ud_opr_is_gpr(const struct ud_operand *opr);
-
-extern LIBUDIS86_DLLEXTERN enum ud_mnemonic_code ud_insn_mnemonic(const struct ud *u);
-
-extern LIBUDIS86_DLLEXTERN const char* ud_lookup_mnemonic(enum ud_mnemonic_code c);
-
-extern LIBUDIS86_DLLEXTERN const struct ud_eflags* ud_lookup_eflags(struct ud *u);
-
-extern LIBUDIS86_DLLEXTERN const enum ud_type* ud_lookup_implicit_reg_used_list(struct ud *u);
-
-extern LIBUDIS86_DLLEXTERN const enum ud_type* ud_lookup_implicit_reg_defined_list(struct ud *u);
-
-extern LIBUDIS86_DLLEXTERN void ud_set_user_opaque_data(struct ud*, void*);
-
-extern LIBUDIS86_DLLEXTERN void* ud_get_user_opaque_data(const struct ud*);
-
-extern LIBUDIS86_DLLEXTERN void ud_set_asm_buffer(struct ud *u, char *buf, size_t size);
-
-extern LIBUDIS86_DLLEXTERN void ud_set_sym_resolver(struct ud *u, 
-                                const char* (*resolver)(struct ud*, 
-                                                        uint64_t addr,
-                                                        int64_t *offset));
-
-/* ========================================================================== */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* UD_EXTERN_H */
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/input.h radare2-2.8.0+dfsg/shlr/udis86/input.h
--- radare2-2.3.0+dfsg/shlr/udis86/input.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/input.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-/* udis86 - libudis86/input.h
- *
- * Copyright (c) 2002-2009 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef UD_INPUT_H
-#define UD_INPUT_H
-
-#include "types.h"
-#include "udint.h"
-
-uint8_t ud_inp_next(struct ud* u);
-
-/* 
- * inp_start
- *    Should be called before each de-code operation.
- */
-static inline void
-inp_start(struct ud *u)
-{
-  u->inp_ctr = 0;
-}
-
-/* inp_reset
- *    Resets the current pointer to its position before the current
- *    instruction disassembly was started.
- */
-static inline void
-inp_reset(struct ud *u)
-{
-  u->inp_curr -= u->inp_ctr;
-  u->inp_ctr   = 0;
-}
-
-/* inp_sess
- *    Returns the pointer to current session.
- */
-static inline uint8_t*
-inp_sess(struct ud *u)
-{
-  return u->inp_sess;
-}
-
-/* 
- * inp_curr 
- *    Returns the current input byte.
- */
-static inline uint8_t
-inp_curr(const struct ud *u)
-{
-  return u->inp_cache[u->inp_curr];
-}
-
-/*
- * inp_back
- *    Move back a single byte in the stream.
- */
-static inline void
-inp_back(struct ud* u) 
-{
-  if (u->inp_ctr > 0) {
-    --u->inp_curr;
-    --u->inp_ctr;
-  }
-}
-
-/* 
- * inp_peek
- *    Peek next byte in input. 
- */
-static inline uint8_t
-inp_peek(struct ud* u) 
-{
-  uint8_t r = ud_inp_next(u);
-  if (!u->error) {
-      inp_back(u); /* Don't backup if there was an error */
-  }
-  return r;
-}
-
-
-/*
- * inp_len
- *    Returns the number of bytes input in the current
- *    session.
- */
-static inline size_t
-inp_len(const struct ud *u)
-{
-  return u->inp_ctr;
-}
-
-#endif /* UD_INPUT_H */
-/*
-vim: set ts=2 sw=2 expandtab
-*/
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/itab.c radare2-2.8.0+dfsg/shlr/udis86/itab.c
--- radare2-2.3.0+dfsg/shlr/udis86/itab.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/itab.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5945 +0,0 @@
-/* itab.c -- generated by udis86:scripts/ud_itab.py, do no edit */
-#include "decode.h"
-
-#define GROUP(n) (0x8000 | (n))
-#define INVALID  0
-
-
-const uint16_t ud_itab__0[] = {
-  /*  0 */          15,          16,          17,          18,
-  /*  4 */          19,          20,    GROUP(1),    GROUP(2),
-  /*  8 */         964,         965,         966,         967,
-  /*  c */         968,         969,    GROUP(3),    GROUP(4),
-  /* 10 */           5,           6,           7,           8,
-  /* 14 */           9,          10,  GROUP(284),  GROUP(285),
-  /* 18 */        1336,        1337,        1338,        1339,
-  /* 1c */        1340,        1341,  GROUP(286),  GROUP(287),
-  /* 20 */          49,          50,          51,          52,
-  /* 24 */          53,          54,     INVALID,  GROUP(288),
-  /* 28 */        1407,        1408,        1409,        1410,
-  /* 2c */        1411,        1412,     INVALID,  GROUP(289),
-  /* 30 */        1487,        1488,        1489,        1490,
-  /* 34 */        1491,        1492,     INVALID,  GROUP(290),
-  /* 38 */         100,         101,         102,         103,
-  /* 3c */         104,         105,     INVALID,  GROUP(291),
-  /* 40 */         699,         700,         701,         702,
-  /* 44 */         703,         704,         705,         706,
-  /* 48 */         175,         176,         177,         178,
-  /* 4c */         179,         180,         181,         182,
-  /* 50 */        1246,        1247,        1248,        1249,
-  /* 54 */        1250,        1251,        1252,        1253,
-  /* 58 */        1101,        1102,        1103,        1104,
-  /* 5c */        1105,        1106,        1107,        1108,
-  /* 60 */  GROUP(292),  GROUP(295),  GROUP(298),  GROUP(299),
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */        1254,         697,        1256,         698,
-  /* 6c */         709,  GROUP(300),         982,  GROUP(301),
-  /* 70 */         726,         728,         730,         732,
-  /* 74 */         734,         736,         738,         740,
-  /* 78 */         742,         744,         746,         748,
-  /* 7c */         750,         752,         754,         756,
-  /* 80 */  GROUP(302),  GROUP(303),  GROUP(304),  GROUP(313),
-  /* 84 */        1433,        1434,        1475,        1476,
-  /* 88 */         828,         829,         830,         831,
-  /* 8c */         832,         770,         833,  GROUP(314),
-  /* 90 */        1477,        1478,        1479,        1480,
-  /* 94 */        1481,        1482,        1483,        1484,
-  /* 98 */  GROUP(315),  GROUP(316),  GROUP(317),        1470,
-  /* 9c */  GROUP(318),  GROUP(322),        1310,         766,
-  /* a0 */         834,         835,         836,         837,
-  /* a4 */         922,  GROUP(326),         114,  GROUP(327),
-  /* a8 */        1435,        1436,        1402,  GROUP(328),
-  /* ac */         790,  GROUP(329),        1346,  GROUP(330),
-  /* b0 */         838,         839,         840,         841,
-  /* b4 */         842,         843,         844,         845,
-  /* b8 */         846,         847,         848,         849,
-  /* bc */         850,         851,         852,         853,
-  /* c0 */  GROUP(331),  GROUP(332),        1301,        1302,
-  /* c4 */  GROUP(333),  GROUP(403),  GROUP(405),  GROUP(406),
-  /* c8 */         200,         776,        1303,        1304,
-  /* cc */         713,         714,  GROUP(407),  GROUP(408),
-  /* d0 */  GROUP(409),  GROUP(410),  GROUP(411),  GROUP(412),
-  /* d4 */  GROUP(413),  GROUP(414),  GROUP(415),        1486,
-  /* d8 */  GROUP(416),  GROUP(419),  GROUP(422),  GROUP(425),
-  /* dc */  GROUP(428),  GROUP(431),  GROUP(434),  GROUP(437),
-  /* e0 */         794,         795,         796,  GROUP(440),
-  /* e4 */         690,         691,         978,         979,
-  /* e8 */          72,         763,  GROUP(441),         765,
-  /* ec */         692,         693,         980,         981,
-  /* f0 */         789,         712,        1299,        1300,
-  /* f4 */         687,          83,  GROUP(442),  GROUP(443),
-  /* f8 */          77,        1395,          81,        1398,
-  /* fc */          78,        1396,  GROUP(444),  GROUP(445),
-};
-
-static const uint16_t ud_itab__1[] = {
-  /*  0 */        1240,     INVALID,
-};
-
-static const uint16_t ud_itab__2[] = {
-  /*  0 */        1096,     INVALID,
-};
-
-static const uint16_t ud_itab__3[] = {
-  /*  0 */        1241,     INVALID,
-};
-
-static const uint16_t ud_itab__4[] = {
-  /*  0 */    GROUP(5),    GROUP(6),         767,         797,
-  /*  4 */     INVALID,        1426,          82,        1431,
-  /*  8 */         716,        1471,     INVALID,        1444,
-  /*  c */     INVALID,   GROUP(27),         430,   GROUP(28),
-  /* 10 */   GROUP(29),   GROUP(30),   GROUP(31),   GROUP(34),
-  /* 14 */   GROUP(35),   GROUP(36),   GROUP(37),   GROUP(40),
-  /* 18 */   GROUP(41),         955,         956,         957,
-  /* 1c */         958,         959,         960,         961,
-  /* 20 */         854,         855,         856,         857,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */   GROUP(42),   GROUP(43),   GROUP(44),   GROUP(45),
-  /* 2c */   GROUP(46),   GROUP(47),   GROUP(48),   GROUP(49),
-  /* 30 */        1472,        1297,        1295,        1296,
-  /* 34 */   GROUP(50),   GROUP(52),     INVALID,        1514,
-  /* 38 */   GROUP(54),     INVALID,  GROUP(116),     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */          84,          85,          86,          87,
-  /* 44 */          88,          89,          90,          91,
-  /* 48 */          92,          93,          94,          95,
-  /* 4c */          96,          97,          98,          99,
-  /* 50 */  GROUP(143),  GROUP(144),  GROUP(145),  GROUP(146),
-  /* 54 */  GROUP(147),  GROUP(148),  GROUP(149),  GROUP(150),
-  /* 58 */  GROUP(151),  GROUP(152),  GROUP(153),  GROUP(154),
-  /* 5c */  GROUP(155),  GROUP(156),  GROUP(157),  GROUP(158),
-  /* 60 */  GROUP(159),  GROUP(160),  GROUP(161),  GROUP(162),
-  /* 64 */  GROUP(163),  GROUP(164),  GROUP(165),  GROUP(166),
-  /* 68 */  GROUP(167),  GROUP(168),  GROUP(169),  GROUP(170),
-  /* 6c */  GROUP(171),  GROUP(172),  GROUP(173),  GROUP(176),
-  /* 70 */  GROUP(177),  GROUP(178),  GROUP(182),  GROUP(186),
-  /* 74 */  GROUP(191),  GROUP(192),  GROUP(193),         199,
-  /* 78 */  GROUP(194),  GROUP(195),     INVALID,     INVALID,
-  /* 7c */  GROUP(196),  GROUP(197),  GROUP(198),  GROUP(201),
-  /* 80 */         727,         729,         731,         733,
-  /* 84 */         735,         737,         739,         741,
-  /* 88 */         743,         745,         747,         749,
-  /* 8c */         751,         753,         755,         757,
-  /* 90 */        1350,        1351,        1352,        1353,
-  /* 94 */        1354,        1355,        1356,        1357,
-  /* 98 */        1358,        1359,        1360,        1361,
-  /* 9c */        1362,        1363,        1364,        1365,
-  /* a0 */        1245,        1100,         131,        1669,
-  /* a4 */        1375,        1376,  GROUP(202),  GROUP(207),
-  /* a8 */        1244,        1099,        1305,        1674,
-  /* ac */        1377,        1378,  GROUP(215),         694,
-  /* b0 */         122,         123,         775,        1672,
-  /* b4 */         772,         773,         940,         941,
-  /* b8 */  GROUP(221),     INVALID,  GROUP(222),        1670,
-  /* bc */        1658,        1659,         930,         931,
-  /* c0 */        1473,        1474,  GROUP(223),         904,
-  /* c4 */  GROUP(224),  GROUP(225),  GROUP(226),  GROUP(227),
-  /* c8 */        1660,        1661,        1662,        1663,
-  /* cc */        1664,        1665,        1666,        1667,
-  /* d0 */  GROUP(236),  GROUP(237),  GROUP(238),  GROUP(239),
-  /* d4 */  GROUP(240),  GROUP(241),  GROUP(242),  GROUP(243),
-  /* d8 */  GROUP(244),  GROUP(245),  GROUP(246),  GROUP(247),
-  /* dc */  GROUP(248),  GROUP(249),  GROUP(250),  GROUP(251),
-  /* e0 */  GROUP(252),  GROUP(253),  GROUP(254),  GROUP(255),
-  /* e4 */  GROUP(256),  GROUP(257),  GROUP(258),  GROUP(259),
-  /* e8 */  GROUP(260),  GROUP(261),  GROUP(262),  GROUP(263),
-  /* ec */  GROUP(264),  GROUP(265),  GROUP(266),  GROUP(267),
-  /* f0 */  GROUP(268),  GROUP(269),  GROUP(270),  GROUP(271),
-  /* f4 */  GROUP(272),  GROUP(273),  GROUP(274),  GROUP(275),
-  /* f8 */  GROUP(277),  GROUP(278),  GROUP(279),  GROUP(280),
-  /* fc */  GROUP(281),  GROUP(282),  GROUP(283),     INVALID,
-};
-
-static const uint16_t ud_itab__5[] = {
-  /*  0 */        1384,        1406,         786,         798,
-  /*  4 */        1453,        1454,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__6[] = {
-  /*  0 */    GROUP(7),    GROUP(8),
-};
-
-static const uint16_t ud_itab__7[] = {
-  /*  0 */        1374,        1383,         785,         774,
-  /*  4 */        1385,     INVALID,         787,         719,
-};
-
-static const uint16_t ud_itab__8[] = {
-  /*  0 */    GROUP(9),   GROUP(14),   GROUP(15),   GROUP(16),
-  /*  4 */        1386,     INVALID,         788,   GROUP(25),
-};
-
-static const uint16_t ud_itab__9[] = {
-  /*  0 */     INVALID,   GROUP(10),   GROUP(11),   GROUP(12),
-  /*  4 */   GROUP(13),     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__10[] = {
-  /*  0 */     INVALID,        1455,     INVALID,
-};
-
-static const uint16_t ud_itab__11[] = {
-  /*  0 */     INVALID,        1461,     INVALID,
-};
-
-static const uint16_t ud_itab__12[] = {
-  /*  0 */     INVALID,        1462,     INVALID,
-};
-
-static const uint16_t ud_itab__13[] = {
-  /*  0 */     INVALID,        1463,     INVALID,
-};
-
-static const uint16_t ud_itab__14[] = {
-  /*  0 */         824,         952,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__15[] = {
-  /*  0 */        1485,        1508,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__16[] = {
-  /*  0 */   GROUP(17),   GROUP(18),   GROUP(19),   GROUP(20),
-  /*  4 */   GROUP(21),   GROUP(22),   GROUP(23),   GROUP(24),
-};
-
-static const uint16_t ud_itab__17[] = {
-  /*  0 */        1466,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__18[] = {
-  /*  0 */        1467,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__19[] = {
-  /*  0 */        1468,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__20[] = {
-  /*  0 */        1469,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__21[] = {
-  /*  0 */        1397,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__22[] = {
-  /*  0 */          80,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__23[] = {
-  /*  0 */        1399,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__24[] = {
-  /*  0 */         720,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__25[] = {
-  /*  0 */        1425,   GROUP(26),     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__26[] = {
-  /*  0 */        1298,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__27[] = {
-  /*  0 */        1119,        1120,        1121,        1122,
-  /*  4 */        1123,        1124,        1125,        1126,
-};
-
-static const uint16_t ud_itab__28[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  c */        1216,        1217,     INVALID,     INVALID,
-  /* 10 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 14 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 18 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 1c */        1218,        1219,     INVALID,     INVALID,
-  /* 20 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 2c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 44 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 54 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 58 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 5c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 60 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 70 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,        1220,     INVALID,
-  /* 8c */     INVALID,     INVALID,        1221,     INVALID,
-  /* 90 */        1222,     INVALID,     INVALID,     INVALID,
-  /* 94 */        1223,     INVALID,        1224,        1225,
-  /* 98 */     INVALID,     INVALID,        1226,     INVALID,
-  /* 9c */     INVALID,     INVALID,        1227,     INVALID,
-  /* a0 */        1228,     INVALID,     INVALID,     INVALID,
-  /* a4 */        1229,     INVALID,        1230,        1231,
-  /* a8 */     INVALID,     INVALID,        1232,     INVALID,
-  /* ac */     INVALID,     INVALID,        1233,     INVALID,
-  /* b0 */        1234,     INVALID,     INVALID,     INVALID,
-  /* b4 */        1235,     INVALID,        1236,        1237,
-  /* b8 */     INVALID,     INVALID,     INVALID,        1238,
-  /* bc */     INVALID,     INVALID,     INVALID,        1239,
-  /* c0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* dc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__29[] = {
-  /*  0 */         936,         925,         928,         932,
-};
-
-static const uint16_t ud_itab__30[] = {
-  /*  0 */         938,         926,         929,         934,
-};
-
-static const uint16_t ud_itab__31[] = {
-  /*  0 */   GROUP(32),   GROUP(33),
-};
-
-static const uint16_t ud_itab__32[] = {
-  /*  0 */         892,        1562,        1570,         888,
-};
-
-static const uint16_t ud_itab__33[] = {
-  /*  0 */         896,        1560,        1568,     INVALID,
-};
-
-static const uint16_t ud_itab__34[] = {
-  /*  0 */         894,     INVALID,     INVALID,         890,
-};
-
-static const uint16_t ud_itab__35[] = {
-  /*  0 */        1449,     INVALID,     INVALID,        1451,
-};
-
-static const uint16_t ud_itab__36[] = {
-  /*  0 */        1447,     INVALID,     INVALID,        1445,
-};
-
-static const uint16_t ud_itab__37[] = {
-  /*  0 */   GROUP(38),   GROUP(39),
-};
-
-static const uint16_t ud_itab__38[] = {
-  /*  0 */         882,     INVALID,        1566,         878,
-};
-
-static const uint16_t ud_itab__39[] = {
-  /*  0 */         886,     INVALID,        1564,     INVALID,
-};
-
-static const uint16_t ud_itab__40[] = {
-  /*  0 */         884,     INVALID,     INVALID,         880,
-};
-
-static const uint16_t ud_itab__41[] = {
-  /*  0 */        1127,        1128,        1129,        1130,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__42[] = {
-  /*  0 */         862,     INVALID,     INVALID,         858,
-};
-
-static const uint16_t ud_itab__43[] = {
-  /*  0 */         864,     INVALID,     INVALID,         860,
-};
-
-static const uint16_t ud_itab__44[] = {
-  /*  0 */         141,         152,         154,         142,
-};
-
-static const uint16_t ud_itab__45[] = {
-  /*  0 */         907,     INVALID,     INVALID,         905,
-};
-
-static const uint16_t ud_itab__46[] = {
-  /*  0 */         165,         166,         168,         162,
-};
-
-static const uint16_t ud_itab__47[] = {
-  /*  0 */         147,         148,         158,         138,
-};
-
-static const uint16_t ud_itab__48[] = {
-  /*  0 */        1442,     INVALID,     INVALID,        1440,
-};
-
-static const uint16_t ud_itab__49[] = {
-  /*  0 */         129,     INVALID,     INVALID,         127,
-};
-
-static const uint16_t ud_itab__50[] = {
-  /*  0 */        1427,   GROUP(51),
-};
-
-static const uint16_t ud_itab__51[] = {
-  /*  0 */     INVALID,        1428,     INVALID,
-};
-
-static const uint16_t ud_itab__52[] = {
-  /*  0 */        1429,   GROUP(53),
-};
-
-static const uint16_t ud_itab__53[] = {
-  /*  0 */     INVALID,        1430,     INVALID,
-};
-
-static const uint16_t ud_itab__54[] = {
-  /*  0 */   GROUP(67),   GROUP(68),   GROUP(63),   GROUP(64),
-  /*  4 */   GROUP(65),   GROUP(66),   GROUP(86),   GROUP(90),
-  /*  8 */   GROUP(69),   GROUP(70),   GROUP(71),   GROUP(72),
-  /*  c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 10 */   GROUP(73),     INVALID,     INVALID,     INVALID,
-  /* 14 */   GROUP(75),   GROUP(76),     INVALID,   GROUP(77),
-  /* 18 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 1c */   GROUP(78),   GROUP(79),   GROUP(80),     INVALID,
-  /* 20 */   GROUP(81),   GROUP(82),   GROUP(83),   GROUP(84),
-  /* 24 */   GROUP(85),  GROUP(108),     INVALID,     INVALID,
-  /* 28 */   GROUP(87),   GROUP(88),   GROUP(89),   GROUP(74),
-  /* 2c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 30 */   GROUP(91),   GROUP(92),   GROUP(93),   GROUP(94),
-  /* 34 */   GROUP(95),   GROUP(96),     INVALID,   GROUP(97),
-  /* 38 */   GROUP(98),   GROUP(99),  GROUP(100),  GROUP(101),
-  /* 3c */  GROUP(102),  GROUP(103),  GROUP(104),  GROUP(105),
-  /* 40 */  GROUP(106),  GROUP(107),     INVALID,     INVALID,
-  /* 44 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 54 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 58 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 5c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 60 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 70 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 80 */   GROUP(55),   GROUP(59),     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,  GROUP(109),
-  /* dc */  GROUP(110),  GROUP(111),  GROUP(112),  GROUP(113),
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */  GROUP(114),  GROUP(115),     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__55[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,   GROUP(56),
-};
-
-static const uint16_t ud_itab__56[] = {
-  /*  0 */   GROUP(57),   GROUP(58),
-};
-
-static const uint16_t ud_itab__57[] = {
-  /*  0 */     INVALID,         717,     INVALID,
-};
-
-static const uint16_t ud_itab__58[] = {
-  /*  0 */     INVALID,         718,     INVALID,
-};
-
-static const uint16_t ud_itab__59[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,   GROUP(60),
-};
-
-static const uint16_t ud_itab__60[] = {
-  /*  0 */   GROUP(61),   GROUP(62),
-};
-
-static const uint16_t ud_itab__61[] = {
-  /*  0 */     INVALID,         721,     INVALID,
-};
-
-static const uint16_t ud_itab__62[] = {
-  /*  0 */     INVALID,         722,     INVALID,
-};
-
-static const uint16_t ud_itab__63[] = {
-  /*  0 */        1587,     INVALID,     INVALID,        1588,
-};
-
-static const uint16_t ud_itab__64[] = {
-  /*  0 */        1590,     INVALID,     INVALID,        1591,
-};
-
-static const uint16_t ud_itab__65[] = {
-  /*  0 */        1593,     INVALID,     INVALID,        1594,
-};
-
-static const uint16_t ud_itab__66[] = {
-  /*  0 */        1596,     INVALID,     INVALID,        1597,
-};
-
-static const uint16_t ud_itab__67[] = {
-  /*  0 */        1581,     INVALID,     INVALID,        1582,
-};
-
-static const uint16_t ud_itab__68[] = {
-  /*  0 */        1584,     INVALID,     INVALID,        1585,
-};
-
-static const uint16_t ud_itab__69[] = {
-  /*  0 */        1605,     INVALID,     INVALID,        1606,
-};
-
-static const uint16_t ud_itab__70[] = {
-  /*  0 */        1611,     INVALID,     INVALID,        1612,
-};
-
-static const uint16_t ud_itab__71[] = {
-  /*  0 */        1608,     INVALID,     INVALID,        1609,
-};
-
-static const uint16_t ud_itab__72[] = {
-  /*  0 */        1614,     INVALID,     INVALID,        1615,
-};
-
-static const uint16_t ud_itab__73[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1620,
-};
-
-static const uint16_t ud_itab__74[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1682,
-};
-
-static const uint16_t ud_itab__75[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1656,
-};
-
-static const uint16_t ud_itab__76[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1655,
-};
-
-static const uint16_t ud_itab__77[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1710,
-};
-
-static const uint16_t ud_itab__78[] = {
-  /*  0 */        1572,     INVALID,     INVALID,        1573,
-};
-
-static const uint16_t ud_itab__79[] = {
-  /*  0 */        1575,     INVALID,     INVALID,        1576,
-};
-
-static const uint16_t ud_itab__80[] = {
-  /*  0 */        1578,     INVALID,     INVALID,        1579,
-};
-
-static const uint16_t ud_itab__81[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1684,
-};
-
-static const uint16_t ud_itab__82[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1686,
-};
-
-static const uint16_t ud_itab__83[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1688,
-};
-
-static const uint16_t ud_itab__84[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1690,
-};
-
-static const uint16_t ud_itab__85[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1692,
-};
-
-static const uint16_t ud_itab__86[] = {
-  /*  0 */        1599,     INVALID,     INVALID,        1600,
-};
-
-static const uint16_t ud_itab__87[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1621,
-};
-
-static const uint16_t ud_itab__88[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1707,
-};
-
-static const uint16_t ud_itab__89[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1680,
-};
-
-static const uint16_t ud_itab__90[] = {
-  /*  0 */        1602,     INVALID,     INVALID,        1603,
-};
-
-static const uint16_t ud_itab__91[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1695,
-};
-
-static const uint16_t ud_itab__92[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1697,
-};
-
-static const uint16_t ud_itab__93[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1699,
-};
-
-static const uint16_t ud_itab__94[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1701,
-};
-
-static const uint16_t ud_itab__95[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1703,
-};
-
-static const uint16_t ud_itab__96[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1705,
-};
-
-static const uint16_t ud_itab__97[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1716,
-};
-
-static const uint16_t ud_itab__98[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1623,
-};
-
-static const uint16_t ud_itab__99[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1625,
-};
-
-static const uint16_t ud_itab__100[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1627,
-};
-
-static const uint16_t ud_itab__101[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1629,
-};
-
-static const uint16_t ud_itab__102[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1631,
-};
-
-static const uint16_t ud_itab__103[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1633,
-};
-
-static const uint16_t ud_itab__104[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1637,
-};
-
-static const uint16_t ud_itab__105[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1635,
-};
-
-static const uint16_t ud_itab__106[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1639,
-};
-
-static const uint16_t ud_itab__107[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1641,
-};
-
-static const uint16_t ud_itab__108[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1694,
-};
-
-static const uint16_t ud_itab__109[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,          45,
-};
-
-static const uint16_t ud_itab__110[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,          41,
-};
-
-static const uint16_t ud_itab__111[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,          43,
-};
-
-static const uint16_t ud_itab__112[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,          37,
-};
-
-static const uint16_t ud_itab__113[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,          39,
-};
-
-static const uint16_t ud_itab__114[] = {
-  /*  0 */        1722,        1724,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__115[] = {
-  /*  0 */        1723,        1725,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__116[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  8 */  GROUP(117),  GROUP(118),  GROUP(119),  GROUP(120),
-  /*  c */  GROUP(121),  GROUP(122),  GROUP(123),  GROUP(124),
-  /* 10 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 14 */  GROUP(125),  GROUP(126),  GROUP(127),  GROUP(129),
-  /* 18 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 1c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 20 */  GROUP(130),  GROUP(131),  GROUP(132),     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 2c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */  GROUP(134),  GROUP(135),  GROUP(136),     INVALID,
-  /* 44 */  GROUP(137),     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 54 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 58 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 5c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 60 */  GROUP(139),  GROUP(140),  GROUP(141),  GROUP(142),
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 70 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* dc */     INVALID,     INVALID,     INVALID,  GROUP(138),
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__117[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1643,
-};
-
-static const uint16_t ud_itab__118[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1645,
-};
-
-static const uint16_t ud_itab__119[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1647,
-};
-
-static const uint16_t ud_itab__120[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1649,
-};
-
-static const uint16_t ud_itab__121[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1653,
-};
-
-static const uint16_t ud_itab__122[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1651,
-};
-
-static const uint16_t ud_itab__123[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1676,
-};
-
-static const uint16_t ud_itab__124[] = {
-  /*  0 */        1617,     INVALID,     INVALID,        1618,
-};
-
-static const uint16_t ud_itab__125[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1045,
-};
-
-static const uint16_t ud_itab__126[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1056,
-};
-
-static const uint16_t ud_itab__127[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,  GROUP(128),
-};
-
-static const uint16_t ud_itab__128[] = {
-  /*  0 */        1047,        1049,        1051,
-};
-
-static const uint16_t ud_itab__129[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,         201,
-};
-
-static const uint16_t ud_itab__130[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1058,
-};
-
-static const uint16_t ud_itab__131[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1556,
-};
-
-static const uint16_t ud_itab__132[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,  GROUP(133),
-};
-
-static const uint16_t ud_itab__133[] = {
-  /*  0 */        1062,        1063,        1064,
-};
-
-static const uint16_t ud_itab__134[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,         197,
-};
-
-static const uint16_t ud_itab__135[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,         195,
-};
-
-static const uint16_t ud_itab__136[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1678,
-};
-
-static const uint16_t ud_itab__137[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1512,
-};
-
-static const uint16_t ud_itab__138[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,          47,
-};
-
-static const uint16_t ud_itab__139[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1714,
-};
-
-static const uint16_t ud_itab__140[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1712,
-};
-
-static const uint16_t ud_itab__141[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1720,
-};
-
-static const uint16_t ud_itab__142[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1718,
-};
-
-static const uint16_t ud_itab__143[] = {
-  /*  0 */         900,     INVALID,     INVALID,         898,
-};
-
-static const uint16_t ud_itab__144[] = {
-  /*  0 */        1387,        1391,        1393,        1389,
-};
-
-static const uint16_t ud_itab__145[] = {
-  /*  0 */        1306,     INVALID,        1308,     INVALID,
-};
-
-static const uint16_t ud_itab__146[] = {
-  /*  0 */        1291,     INVALID,        1293,     INVALID,
-};
-
-static const uint16_t ud_itab__147[] = {
-  /*  0 */          61,     INVALID,     INVALID,          59,
-};
-
-static const uint16_t ud_itab__148[] = {
-  /*  0 */          65,     INVALID,     INVALID,          63,
-};
-
-static const uint16_t ud_itab__149[] = {
-  /*  0 */         976,     INVALID,     INVALID,         974,
-};
-
-static const uint16_t ud_itab__150[] = {
-  /*  0 */        1499,     INVALID,     INVALID,        1497,
-};
-
-static const uint16_t ud_itab__151[] = {
-  /*  0 */          27,          29,          31,          25,
-};
-
-static const uint16_t ud_itab__152[] = {
-  /*  0 */         946,         948,         950,         944,
-};
-
-static const uint16_t ud_itab__153[] = {
-  /*  0 */         145,         150,         156,         139,
-};
-
-static const uint16_t ud_itab__154[] = {
-  /*  0 */         134,     INVALID,         163,         143,
-};
-
-static const uint16_t ud_itab__155[] = {
-  /*  0 */        1419,        1421,        1423,        1417,
-};
-
-static const uint16_t ud_itab__156[] = {
-  /*  0 */         818,         820,         822,         816,
-};
-
-static const uint16_t ud_itab__157[] = {
-  /*  0 */         189,         191,         193,         187,
-};
-
-static const uint16_t ud_itab__158[] = {
-  /*  0 */         802,         804,         806,         800,
-};
-
-static const uint16_t ud_itab__159[] = {
-  /*  0 */        1209,     INVALID,     INVALID,        1207,
-};
-
-static const uint16_t ud_itab__160[] = {
-  /*  0 */        1212,     INVALID,     INVALID,        1210,
-};
-
-static const uint16_t ud_itab__161[] = {
-  /*  0 */        1215,     INVALID,     INVALID,        1213,
-};
-
-static const uint16_t ud_itab__162[] = {
-  /*  0 */         987,     INVALID,     INVALID,         985,
-};
-
-static const uint16_t ud_itab__163[] = {
-  /*  0 */        1038,     INVALID,     INVALID,        1036,
-};
-
-static const uint16_t ud_itab__164[] = {
-  /*  0 */        1041,     INVALID,     INVALID,        1039,
-};
-
-static const uint16_t ud_itab__165[] = {
-  /*  0 */        1044,     INVALID,     INVALID,        1042,
-};
-
-static const uint16_t ud_itab__166[] = {
-  /*  0 */         993,     INVALID,     INVALID,         991,
-};
-
-static const uint16_t ud_itab__167[] = {
-  /*  0 */        1200,     INVALID,     INVALID,        1198,
-};
-
-static const uint16_t ud_itab__168[] = {
-  /*  0 */        1203,     INVALID,     INVALID,        1201,
-};
-
-static const uint16_t ud_itab__169[] = {
-  /*  0 */        1206,     INVALID,     INVALID,        1204,
-};
-
-static const uint16_t ud_itab__170[] = {
-  /*  0 */         990,     INVALID,     INVALID,         988,
-};
-
-static const uint16_t ud_itab__171[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1546,
-};
-
-static const uint16_t ud_itab__172[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1544,
-};
-
-static const uint16_t ud_itab__173[] = {
-  /*  0 */  GROUP(174),     INVALID,     INVALID,  GROUP(175),
-};
-
-static const uint16_t ud_itab__174[] = {
-  /*  0 */         866,         867,         910,
-};
-
-static const uint16_t ud_itab__175[] = {
-  /*  0 */         868,         870,         911,
-};
-
-static const uint16_t ud_itab__176[] = {
-  /*  0 */         920,     INVALID,        1522,        1517,
-};
-
-static const uint16_t ud_itab__177[] = {
-  /*  0 */        1134,        1536,        1534,        1538,
-};
-
-static const uint16_t ud_itab__178[] = {
-  /*  0 */     INVALID,     INVALID,  GROUP(179),     INVALID,
-  /*  4 */  GROUP(180),     INVALID,  GROUP(181),     INVALID,
-};
-
-static const uint16_t ud_itab__179[] = {
-  /*  0 */        1159,     INVALID,     INVALID,        1163,
-};
-
-static const uint16_t ud_itab__180[] = {
-  /*  0 */        1152,     INVALID,     INVALID,        1150,
-};
-
-static const uint16_t ud_itab__181[] = {
-  /*  0 */        1138,     INVALID,     INVALID,        1137,
-};
-
-static const uint16_t ud_itab__182[] = {
-  /*  0 */     INVALID,     INVALID,  GROUP(183),     INVALID,
-  /*  4 */  GROUP(184),     INVALID,  GROUP(185),     INVALID,
-};
-
-static const uint16_t ud_itab__183[] = {
-  /*  0 */        1165,     INVALID,     INVALID,        1169,
-};
-
-static const uint16_t ud_itab__184[] = {
-  /*  0 */        1153,     INVALID,     INVALID,        1157,
-};
-
-static const uint16_t ud_itab__185[] = {
-  /*  0 */        1142,     INVALID,     INVALID,        1141,
-};
-
-static const uint16_t ud_itab__186[] = {
-  /*  0 */     INVALID,     INVALID,  GROUP(187),  GROUP(188),
-  /*  4 */     INVALID,     INVALID,  GROUP(189),  GROUP(190),
-};
-
-static const uint16_t ud_itab__187[] = {
-  /*  0 */        1171,     INVALID,     INVALID,        1175,
-};
-
-static const uint16_t ud_itab__188[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1542,
-};
-
-static const uint16_t ud_itab__189[] = {
-  /*  0 */        1146,     INVALID,     INVALID,        1145,
-};
-
-static const uint16_t ud_itab__190[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1540,
-};
-
-static const uint16_t ud_itab__191[] = {
-  /*  0 */        1027,     INVALID,     INVALID,        1028,
-};
-
-static const uint16_t ud_itab__192[] = {
-  /*  0 */        1030,     INVALID,     INVALID,        1031,
-};
-
-static const uint16_t ud_itab__193[] = {
-  /*  0 */        1033,     INVALID,     INVALID,        1034,
-};
-
-static const uint16_t ud_itab__194[] = {
-  /*  0 */     INVALID,        1464,     INVALID,
-};
-
-static const uint16_t ud_itab__195[] = {
-  /*  0 */     INVALID,        1465,     INVALID,
-};
-
-static const uint16_t ud_itab__196[] = {
-  /*  0 */     INVALID,        1550,     INVALID,        1548,
-};
-
-static const uint16_t ud_itab__197[] = {
-  /*  0 */     INVALID,        1554,     INVALID,        1552,
-};
-
-static const uint16_t ud_itab__198[] = {
-  /*  0 */  GROUP(199),     INVALID,         916,  GROUP(200),
-};
-
-static const uint16_t ud_itab__199[] = {
-  /*  0 */         872,         873,         913,
-};
-
-static const uint16_t ud_itab__200[] = {
-  /*  0 */         874,         876,         914,
-};
-
-static const uint16_t ud_itab__201[] = {
-  /*  0 */         921,     INVALID,        1524,        1515,
-};
-
-static const uint16_t ud_itab__202[] = {
-  /*  0 */     INVALID,  GROUP(203),
-};
-
-static const uint16_t ud_itab__203[] = {
-  /*  0 */  GROUP(204),  GROUP(205),  GROUP(206),     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__204[] = {
-  /*  0 */         825,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__205[] = {
-  /*  0 */        1509,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__206[] = {
-  /*  0 */        1510,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__207[] = {
-  /*  0 */     INVALID,  GROUP(208),
-};
-
-static const uint16_t ud_itab__208[] = {
-  /*  0 */  GROUP(209),  GROUP(210),  GROUP(211),  GROUP(212),
-  /*  4 */  GROUP(213),  GROUP(214),     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__209[] = {
-  /*  0 */        1511,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__210[] = {
-  /*  0 */        1501,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__211[] = {
-  /*  0 */        1502,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__212[] = {
-  /*  0 */        1503,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__213[] = {
-  /*  0 */        1504,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__214[] = {
-  /*  0 */        1505,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__215[] = {
-  /*  0 */  GROUP(216),  GROUP(217),
-};
-
-static const uint16_t ud_itab__216[] = {
-  /*  0 */         683,         682,         768,        1400,
-  /*  4 */        1507,        1506,     INVALID,          79,
-};
-
-static const uint16_t ud_itab__217[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,  GROUP(218),  GROUP(219),  GROUP(220),
-};
-
-static const uint16_t ud_itab__218[] = {
-  /*  0 */         777,         778,         779,         780,
-  /*  4 */         781,         782,         783,         784,
-};
-
-static const uint16_t ud_itab__219[] = {
-  /*  0 */         808,         809,         810,         811,
-  /*  4 */         812,         813,         814,         815,
-};
-
-static const uint16_t ud_itab__220[] = {
-  /*  0 */        1366,        1367,        1368,        1369,
-  /*  4 */        1370,        1371,        1372,        1373,
-};
-
-static const uint16_t ud_itab__221[] = {
-  /*  0 */     INVALID,     INVALID,        1709,     INVALID,
-};
-
-static const uint16_t ud_itab__222[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */        1668,        1675,        1673,        1671,
-};
-
-static const uint16_t ud_itab__223[] = {
-  /*  0 */         112,         117,         120,         110,
-};
-
-static const uint16_t ud_itab__224[] = {
-  /*  0 */        1059,     INVALID,     INVALID,        1060,
-};
-
-static const uint16_t ud_itab__225[] = {
-  /*  0 */        1055,     INVALID,     INVALID,        1053,
-};
-
-static const uint16_t ud_itab__226[] = {
-  /*  0 */        1381,     INVALID,     INVALID,        1379,
-};
-
-static const uint16_t ud_itab__227[] = {
-  /*  0 */  GROUP(228),  GROUP(235),
-};
-
-static const uint16_t ud_itab__228[] = {
-  /*  0 */     INVALID,  GROUP(229),     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,  GROUP(230),  GROUP(234),
-};
-
-static const uint16_t ud_itab__229[] = {
-  /*  0 */         124,         125,         126,
-};
-
-static const uint16_t ud_itab__230[] = {
-  /*  0 */  GROUP(231),     INVALID,  GROUP(232),  GROUP(233),
-};
-
-static const uint16_t ud_itab__231[] = {
-  /*  0 */     INVALID,        1459,     INVALID,
-};
-
-static const uint16_t ud_itab__232[] = {
-  /*  0 */     INVALID,        1458,     INVALID,
-};
-
-static const uint16_t ud_itab__233[] = {
-  /*  0 */     INVALID,        1457,     INVALID,
-};
-
-static const uint16_t ud_itab__234[] = {
-  /*  0 */     INVALID,        1460,     INVALID,
-};
-
-static const uint16_t ud_itab__235[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,        1456,     INVALID,
-};
-
-static const uint16_t ud_itab__236[] = {
-  /*  0 */     INVALID,          35,     INVALID,          33,
-};
-
-static const uint16_t ud_itab__237[] = {
-  /*  0 */        1160,     INVALID,     INVALID,        1161,
-};
-
-static const uint16_t ud_itab__238[] = {
-  /*  0 */        1166,     INVALID,     INVALID,        1167,
-};
-
-static const uint16_t ud_itab__239[] = {
-  /*  0 */        1172,     INVALID,     INVALID,        1173,
-};
-
-static const uint16_t ud_itab__240[] = {
-  /*  0 */        1526,     INVALID,     INVALID,        1527,
-};
-
-static const uint16_t ud_itab__241[] = {
-  /*  0 */        1093,     INVALID,     INVALID,        1094,
-};
-
-static const uint16_t ud_itab__242[] = {
-  /*  0 */     INVALID,        1521,        1525,         918,
-};
-
-static const uint16_t ud_itab__243[] = {
-  /*  0 */        1086,     INVALID,     INVALID,        1084,
-};
-
-static const uint16_t ud_itab__244[] = {
-  /*  0 */        1192,     INVALID,     INVALID,        1193,
-};
-
-static const uint16_t ud_itab__245[] = {
-  /*  0 */        1195,     INVALID,     INVALID,        1196,
-};
-
-static const uint16_t ud_itab__246[] = {
-  /*  0 */        1083,     INVALID,     INVALID,        1081,
-};
-
-static const uint16_t ud_itab__247[] = {
-  /*  0 */        1017,     INVALID,     INVALID,        1015,
-};
-
-static const uint16_t ud_itab__248[] = {
-  /*  0 */        1009,     INVALID,     INVALID,        1010,
-};
-
-static const uint16_t ud_itab__249[] = {
-  /*  0 */        1012,     INVALID,     INVALID,        1013,
-};
-
-static const uint16_t ud_itab__250[] = {
-  /*  0 */        1075,     INVALID,     INVALID,        1076,
-};
-
-static const uint16_t ud_itab__251[] = {
-  /*  0 */        1020,     INVALID,     INVALID,        1018,
-};
-
-static const uint16_t ud_itab__252[] = {
-  /*  0 */        1023,     INVALID,     INVALID,        1021,
-};
-
-static const uint16_t ud_itab__253[] = {
-  /*  0 */        1147,     INVALID,     INVALID,        1148,
-};
-
-static const uint16_t ud_itab__254[] = {
-  /*  0 */        1156,     INVALID,     INVALID,        1154,
-};
-
-static const uint16_t ud_itab__255[] = {
-  /*  0 */        1026,     INVALID,     INVALID,        1024,
-};
-
-static const uint16_t ud_itab__256[] = {
-  /*  0 */        1087,     INVALID,     INVALID,        1088,
-};
-
-static const uint16_t ud_itab__257[] = {
-  /*  0 */        1092,     INVALID,     INVALID,        1090,
-};
-
-static const uint16_t ud_itab__258[] = {
-  /*  0 */     INVALID,         136,         132,         160,
-};
-
-static const uint16_t ud_itab__259[] = {
-  /*  0 */         909,     INVALID,     INVALID,         902,
-};
-
-static const uint16_t ud_itab__260[] = {
-  /*  0 */        1186,     INVALID,     INVALID,        1187,
-};
-
-static const uint16_t ud_itab__261[] = {
-  /*  0 */        1189,     INVALID,     INVALID,        1190,
-};
-
-static const uint16_t ud_itab__262[] = {
-  /*  0 */        1080,     INVALID,     INVALID,        1078,
-};
-
-static const uint16_t ud_itab__263[] = {
-  /*  0 */        1118,     INVALID,     INVALID,        1116,
-};
-
-static const uint16_t ud_itab__264[] = {
-  /*  0 */        1003,     INVALID,     INVALID,        1004,
-};
-
-static const uint16_t ud_itab__265[] = {
-  /*  0 */        1006,     INVALID,     INVALID,        1007,
-};
-
-static const uint16_t ud_itab__266[] = {
-  /*  0 */        1074,     INVALID,     INVALID,        1072,
-};
-
-static const uint16_t ud_itab__267[] = {
-  /*  0 */        1266,     INVALID,     INVALID,        1264,
-};
-
-static const uint16_t ud_itab__268[] = {
-  /*  0 */     INVALID,        1558,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__269[] = {
-  /*  0 */        1136,     INVALID,     INVALID,        1135,
-};
-
-static const uint16_t ud_itab__270[] = {
-  /*  0 */        1140,     INVALID,     INVALID,        1139,
-};
-
-static const uint16_t ud_itab__271[] = {
-  /*  0 */        1144,     INVALID,     INVALID,        1143,
-};
-
-static const uint16_t ud_itab__272[] = {
-  /*  0 */        1532,     INVALID,     INVALID,        1533,
-};
-
-static const uint16_t ud_itab__273[] = {
-  /*  0 */        1069,     INVALID,     INVALID,        1070,
-};
-
-static const uint16_t ud_itab__274[] = {
-  /*  0 */        1133,     INVALID,     INVALID,        1131,
-};
-
-static const uint16_t ud_itab__275[] = {
-  /*  0 */     INVALID,  GROUP(276),
-};
-
-static const uint16_t ud_itab__276[] = {
-  /*  0 */         799,     INVALID,     INVALID,        1519,
-};
-
-static const uint16_t ud_itab__277[] = {
-  /*  0 */        1179,     INVALID,     INVALID,        1177,
-};
-
-static const uint16_t ud_itab__278[] = {
-  /*  0 */        1182,     INVALID,     INVALID,        1180,
-};
-
-static const uint16_t ud_itab__279[] = {
-  /*  0 */        1183,     INVALID,     INVALID,        1184,
-};
-
-static const uint16_t ud_itab__280[] = {
-  /*  0 */        1531,     INVALID,     INVALID,        1529,
-};
-
-static const uint16_t ud_itab__281[] = {
-  /*  0 */         996,     INVALID,     INVALID,         994,
-};
-
-static const uint16_t ud_itab__282[] = {
-  /*  0 */         997,     INVALID,     INVALID,         998,
-};
-
-static const uint16_t ud_itab__283[] = {
-  /*  0 */        1000,     INVALID,     INVALID,        1001,
-};
-
-static const uint16_t ud_itab__284[] = {
-  /*  0 */        1242,     INVALID,
-};
-
-static const uint16_t ud_itab__285[] = {
-  /*  0 */        1097,     INVALID,
-};
-
-static const uint16_t ud_itab__286[] = {
-  /*  0 */        1243,     INVALID,
-};
-
-static const uint16_t ud_itab__287[] = {
-  /*  0 */        1098,     INVALID,
-};
-
-static const uint16_t ud_itab__288[] = {
-  /*  0 */         173,     INVALID,
-};
-
-static const uint16_t ud_itab__289[] = {
-  /*  0 */         174,     INVALID,
-};
-
-static const uint16_t ud_itab__290[] = {
-  /*  0 */           1,     INVALID,
-};
-
-static const uint16_t ud_itab__291[] = {
-  /*  0 */           4,     INVALID,
-};
-
-static const uint16_t ud_itab__292[] = {
-  /*  0 */  GROUP(293),  GROUP(294),     INVALID,
-};
-
-static const uint16_t ud_itab__293[] = {
-  /*  0 */        1257,     INVALID,
-};
-
-static const uint16_t ud_itab__294[] = {
-  /*  0 */        1258,     INVALID,
-};
-
-static const uint16_t ud_itab__295[] = {
-  /*  0 */  GROUP(296),  GROUP(297),     INVALID,
-};
-
-static const uint16_t ud_itab__296[] = {
-  /*  0 */        1110,     INVALID,
-};
-
-static const uint16_t ud_itab__297[] = {
-  /*  0 */        1111,     INVALID,
-};
-
-static const uint16_t ud_itab__298[] = {
-  /*  0 */        1657,     INVALID,
-};
-
-static const uint16_t ud_itab__299[] = {
-  /*  0 */          67,          68,
-};
-
-static const uint16_t ud_itab__300[] = {
-  /*  0 */         710,         711,     INVALID,
-};
-
-static const uint16_t ud_itab__301[] = {
-  /*  0 */         983,         984,     INVALID,
-};
-
-static const uint16_t ud_itab__302[] = {
-  /*  0 */          21,         970,          11,        1342,
-  /*  4 */          55,        1413,        1493,         106,
-};
-
-static const uint16_t ud_itab__303[] = {
-  /*  0 */          23,         971,          13,        1343,
-  /*  4 */          57,        1414,        1494,         108,
-};
-
-static const uint16_t ud_itab__304[] = {
-  /*  0 */  GROUP(305),  GROUP(306),  GROUP(307),  GROUP(308),
-  /*  4 */  GROUP(309),  GROUP(310),  GROUP(311),  GROUP(312),
-};
-
-static const uint16_t ud_itab__305[] = {
-  /*  0 */          22,     INVALID,
-};
-
-static const uint16_t ud_itab__306[] = {
-  /*  0 */         972,     INVALID,
-};
-
-static const uint16_t ud_itab__307[] = {
-  /*  0 */          12,     INVALID,
-};
-
-static const uint16_t ud_itab__308[] = {
-  /*  0 */        1344,     INVALID,
-};
-
-static const uint16_t ud_itab__309[] = {
-  /*  0 */          56,     INVALID,
-};
-
-static const uint16_t ud_itab__310[] = {
-  /*  0 */        1415,     INVALID,
-};
-
-static const uint16_t ud_itab__311[] = {
-  /*  0 */        1495,     INVALID,
-};
-
-static const uint16_t ud_itab__312[] = {
-  /*  0 */         107,     INVALID,
-};
-
-static const uint16_t ud_itab__313[] = {
-  /*  0 */          24,         973,          14,        1345,
-  /*  4 */          58,        1416,        1496,         109,
-};
-
-static const uint16_t ud_itab__314[] = {
-  /*  0 */        1109,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__315[] = {
-  /*  0 */          74,          75,          76,
-};
-
-static const uint16_t ud_itab__316[] = {
-  /*  0 */         170,         171,         172,
-};
-
-static const uint16_t ud_itab__317[] = {
-  /*  0 */          73,     INVALID,
-};
-
-static const uint16_t ud_itab__318[] = {
-  /*  0 */  GROUP(319),  GROUP(320),  GROUP(321),
-};
-
-static const uint16_t ud_itab__319[] = {
-  /*  0 */        1259,        1260,
-};
-
-static const uint16_t ud_itab__320[] = {
-  /*  0 */        1261,        1262,
-};
-
-static const uint16_t ud_itab__321[] = {
-  /*  0 */     INVALID,        1263,
-};
-
-static const uint16_t ud_itab__322[] = {
-  /*  0 */  GROUP(323),  GROUP(324),  GROUP(325),
-};
-
-static const uint16_t ud_itab__323[] = {
-  /*  0 */        1112,     INVALID,
-};
-
-static const uint16_t ud_itab__324[] = {
-  /*  0 */        1113,        1114,
-};
-
-static const uint16_t ud_itab__325[] = {
-  /*  0 */     INVALID,        1115,
-};
-
-static const uint16_t ud_itab__326[] = {
-  /*  0 */         923,         924,         927,
-};
-
-static const uint16_t ud_itab__327[] = {
-  /*  0 */         115,         116,         119,
-};
-
-static const uint16_t ud_itab__328[] = {
-  /*  0 */        1403,        1404,        1405,
-};
-
-static const uint16_t ud_itab__329[] = {
-  /*  0 */         791,         792,         793,
-};
-
-static const uint16_t ud_itab__330[] = {
-  /*  0 */        1347,        1348,        1349,
-};
-
-static const uint16_t ud_itab__331[] = {
-  /*  0 */        1279,        1286,        1267,        1275,
-  /*  4 */        1327,        1334,        1318,        1313,
-};
-
-static const uint16_t ud_itab__332[] = {
-  /*  0 */        1284,        1287,        1268,        1274,
-  /*  4 */        1323,        1330,        1319,        1315,
-};
-
-static const uint16_t ud_itab__333[] = {
-  /*  0 */  GROUP(334),  GROUP(335),     INVALID,     INVALID,
-  /*  4 */     INVALID,  GROUP(341),  GROUP(357),  GROUP(369),
-  /*  8 */     INVALID,  GROUP(394),     INVALID,     INVALID,
-  /*  c */     INVALID,  GROUP(399),     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__334[] = {
-  /*  0 */         771,     INVALID,
-};
-
-static const uint16_t ud_itab__335[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 10 */         937,         939,  GROUP(336),         895,
-  /* 14 */        1450,        1448,  GROUP(337),         885,
-  /* 18 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 1c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 20 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */         863,         865,     INVALID,         908,
-  /* 2c */     INVALID,     INVALID,        1443,         130,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 44 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */         901,        1388,        1307,        1292,
-  /* 54 */          62,          66,         977,        1500,
-  /* 58 */          28,         947,         146,         135,
-  /* 5c */        1420,         819,         190,         803,
-  /* 60 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 70 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,  GROUP(340),
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,  GROUP(338),     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,         113,     INVALID,
-  /* c4 */     INVALID,     INVALID,        1382,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* dc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__336[] = {
-  /*  0 */         893,         897,
-};
-
-static const uint16_t ud_itab__337[] = {
-  /*  0 */         883,         887,
-};
-
-static const uint16_t ud_itab__338[] = {
-  /*  0 */  GROUP(339),     INVALID,
-};
-
-static const uint16_t ud_itab__339[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,        1401,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__340[] = {
-  /*  0 */        1741,        1742,
-};
-
-static const uint16_t ud_itab__341[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 10 */         933,         935,  GROUP(342),         891,
-  /* 14 */        1452,        1446,  GROUP(343),         881,
-  /* 18 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 1c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 20 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */         859,         861,     INVALID,         906,
-  /* 2c */     INVALID,     INVALID,        1441,         128,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 44 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */         899,        1390,     INVALID,     INVALID,
-  /* 54 */          60,          64,         975,        1498,
-  /* 58 */          26,         945,         140,         144,
-  /* 5c */        1418,         817,         188,         801,
-  /* 60 */        1208,        1211,        1214,         986,
-  /* 64 */        1037,        1040,        1043,         992,
-  /* 68 */        1199,        1202,        1205,         989,
-  /* 6c */        1547,        1545,  GROUP(344),        1518,
-  /* 70 */        1539,  GROUP(345),  GROUP(347),  GROUP(349),
-  /* 74 */        1029,        1032,        1035,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */        1549,        1553,  GROUP(351),        1516,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,         111,     INVALID,
-  /* c4 */        1061,        1054,        1380,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */          34,        1162,        1168,        1174,
-  /* d4 */        1528,        1095,         919,  GROUP(352),
-  /* d8 */        1194,        1197,        1082,        1016,
-  /* dc */        1011,        1014,        1077,        1019,
-  /* e0 */        1022,        1149,        1155,        1025,
-  /* e4 */        1089,        1091,         161,         903,
-  /* e8 */        1188,        1191,        1079,        1117,
-  /* ec */        1005,        1008,        1073,        1265,
-  /* f0 */     INVALID,  GROUP(353),  GROUP(354),  GROUP(355),
-  /* f4 */     INVALID,        1071,        1132,  GROUP(356),
-  /* f8 */        1178,        1181,        1185,        1530,
-  /* fc */         995,         999,        1002,     INVALID,
-};
-
-static const uint16_t ud_itab__342[] = {
-  /*  0 */         889,     INVALID,
-};
-
-static const uint16_t ud_itab__343[] = {
-  /*  0 */         879,     INVALID,
-};
-
-static const uint16_t ud_itab__344[] = {
-  /*  0 */         869,         871,         912,
-};
-
-static const uint16_t ud_itab__345[] = {
-  /*  0 */     INVALID,     INVALID,        1164,     INVALID,
-  /*  4 */        1151,     INVALID,  GROUP(346),     INVALID,
-};
-
-static const uint16_t ud_itab__346[] = {
-  /*  0 */        1755,     INVALID,
-};
-
-static const uint16_t ud_itab__347[] = {
-  /*  0 */     INVALID,     INVALID,        1170,     INVALID,
-  /*  4 */        1158,     INVALID,  GROUP(348),     INVALID,
-};
-
-static const uint16_t ud_itab__348[] = {
-  /*  0 */        1757,     INVALID,
-};
-
-static const uint16_t ud_itab__349[] = {
-  /*  0 */     INVALID,     INVALID,        1176,        1543,
-  /*  4 */     INVALID,     INVALID,  GROUP(350),        1541,
-};
-
-static const uint16_t ud_itab__350[] = {
-  /*  0 */        1759,     INVALID,
-};
-
-static const uint16_t ud_itab__351[] = {
-  /*  0 */         875,         877,         915,
-};
-
-static const uint16_t ud_itab__352[] = {
-  /*  0 */        1085,     INVALID,
-};
-
-static const uint16_t ud_itab__353[] = {
-  /*  0 */        1754,     INVALID,
-};
-
-static const uint16_t ud_itab__354[] = {
-  /*  0 */        1756,     INVALID,
-};
-
-static const uint16_t ud_itab__355[] = {
-  /*  0 */        1758,     INVALID,
-};
-
-static const uint16_t ud_itab__356[] = {
-  /*  0 */     INVALID,        1520,
-};
-
-static const uint16_t ud_itab__357[] = {
-  /*  0 */        1583,        1586,        1589,        1592,
-  /*  4 */        1595,        1598,        1601,        1604,
-  /*  8 */        1607,        1613,        1610,        1616,
-  /*  c */  GROUP(358),  GROUP(359),  GROUP(360),  GROUP(361),
-  /* 10 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 14 */     INVALID,     INVALID,     INVALID,        1711,
-  /* 18 */  GROUP(362),  GROUP(363),     INVALID,     INVALID,
-  /* 1c */        1574,        1577,        1580,     INVALID,
-  /* 20 */        1685,        1687,        1689,        1691,
-  /* 24 */        1693,     INVALID,     INVALID,     INVALID,
-  /* 28 */        1622,        1708,        1681,        1683,
-  /* 2c */  GROUP(365),  GROUP(366),  GROUP(367),  GROUP(368),
-  /* 30 */        1696,        1698,        1700,        1702,
-  /* 34 */        1704,        1706,     INVALID,        1717,
-  /* 38 */        1624,        1626,        1628,        1630,
-  /* 3c */        1632,        1634,        1638,        1636,
-  /* 40 */        1640,        1642,     INVALID,     INVALID,
-  /* 44 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 54 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 58 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 5c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 60 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 70 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,          46,
-  /* dc */          42,          44,          38,          40,
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__358[] = {
-  /*  0 */        1736,     INVALID,
-};
-
-static const uint16_t ud_itab__359[] = {
-  /*  0 */        1734,     INVALID,
-};
-
-static const uint16_t ud_itab__360[] = {
-  /*  0 */        1739,     INVALID,
-};
-
-static const uint16_t ud_itab__361[] = {
-  /*  0 */        1740,     INVALID,
-};
-
-static const uint16_t ud_itab__362[] = {
-  /*  0 */        1726,     INVALID,
-};
-
-static const uint16_t ud_itab__363[] = {
-  /*  0 */  GROUP(364),     INVALID,
-};
-
-static const uint16_t ud_itab__364[] = {
-  /*  0 */     INVALID,        1727,
-};
-
-static const uint16_t ud_itab__365[] = {
-  /*  0 */        1730,     INVALID,
-};
-
-static const uint16_t ud_itab__366[] = {
-  /*  0 */        1732,     INVALID,
-};
-
-static const uint16_t ud_itab__367[] = {
-  /*  0 */        1731,     INVALID,
-};
-
-static const uint16_t ud_itab__368[] = {
-  /*  0 */        1733,     INVALID,
-};
-
-static const uint16_t ud_itab__369[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */  GROUP(370),  GROUP(371),  GROUP(372),     INVALID,
-  /*  8 */        1644,        1646,        1648,        1650,
-  /*  c */        1654,        1652,        1677,        1619,
-  /* 10 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 14 */  GROUP(374),        1057,  GROUP(375),         202,
-  /* 18 */  GROUP(379),  GROUP(381),     INVALID,     INVALID,
-  /* 1c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 20 */  GROUP(383),        1557,  GROUP(385),     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 2c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */         198,         196,        1679,     INVALID,
-  /* 44 */        1513,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,  GROUP(391),  GROUP(392),
-  /* 4c */  GROUP(393),     INVALID,     INVALID,     INVALID,
-  /* 50 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 54 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 58 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 5c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 60 */        1715,        1713,        1721,        1719,
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 70 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* dc */     INVALID,     INVALID,     INVALID,          48,
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__370[] = {
-  /*  0 */        1737,     INVALID,
-};
-
-static const uint16_t ud_itab__371[] = {
-  /*  0 */        1735,     INVALID,
-};
-
-static const uint16_t ud_itab__372[] = {
-  /*  0 */  GROUP(373),     INVALID,
-};
-
-static const uint16_t ud_itab__373[] = {
-  /*  0 */     INVALID,        1738,
-};
-
-static const uint16_t ud_itab__374[] = {
-  /*  0 */        1046,     INVALID,
-};
-
-static const uint16_t ud_itab__375[] = {
-  /*  0 */  GROUP(376),  GROUP(377),  GROUP(378),
-};
-
-static const uint16_t ud_itab__376[] = {
-  /*  0 */        1048,     INVALID,
-};
-
-static const uint16_t ud_itab__377[] = {
-  /*  0 */        1050,     INVALID,
-};
-
-static const uint16_t ud_itab__378[] = {
-  /*  0 */     INVALID,        1052,
-};
-
-static const uint16_t ud_itab__379[] = {
-  /*  0 */  GROUP(380),     INVALID,
-};
-
-static const uint16_t ud_itab__380[] = {
-  /*  0 */     INVALID,        1729,
-};
-
-static const uint16_t ud_itab__381[] = {
-  /*  0 */  GROUP(382),     INVALID,
-};
-
-static const uint16_t ud_itab__382[] = {
-  /*  0 */     INVALID,        1728,
-};
-
-static const uint16_t ud_itab__383[] = {
-  /*  0 */  GROUP(384),     INVALID,
-};
-
-static const uint16_t ud_itab__384[] = {
-  /*  0 */        1065,     INVALID,
-};
-
-static const uint16_t ud_itab__385[] = {
-  /*  0 */  GROUP(386),  GROUP(388),
-};
-
-static const uint16_t ud_itab__386[] = {
-  /*  0 */  GROUP(387),     INVALID,
-};
-
-static const uint16_t ud_itab__387[] = {
-  /*  0 */        1066,     INVALID,
-};
-
-static const uint16_t ud_itab__388[] = {
-  /*  0 */  GROUP(389),  GROUP(390),
-};
-
-static const uint16_t ud_itab__389[] = {
-  /*  0 */        1067,     INVALID,
-};
-
-static const uint16_t ud_itab__390[] = {
-  /*  0 */        1068,     INVALID,
-};
-
-static const uint16_t ud_itab__391[] = {
-  /*  0 */        1744,     INVALID,
-};
-
-static const uint16_t ud_itab__392[] = {
-  /*  0 */        1743,     INVALID,
-};
-
-static const uint16_t ud_itab__393[] = {
-  /*  0 */        1753,     INVALID,
-};
-
-static const uint16_t ud_itab__394[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 10 */  GROUP(395),  GROUP(396),  GROUP(397),     INVALID,
-  /* 14 */     INVALID,     INVALID,  GROUP(398),     INVALID,
-  /* 18 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 1c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 20 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */     INVALID,     INVALID,         155,     INVALID,
-  /* 2c */         169,         159,     INVALID,     INVALID,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 44 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */     INVALID,        1394,        1309,        1294,
-  /* 54 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 58 */          32,         951,         157,         164,
-  /* 5c */        1424,         823,         194,         807,
-  /* 60 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,        1523,
-  /* 70 */        1535,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */     INVALID,     INVALID,         917,     INVALID,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,         121,     INVALID,
-  /* c4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* dc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,         133,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__395[] = {
-  /*  0 */        1750,        1749,
-};
-
-static const uint16_t ud_itab__396[] = {
-  /*  0 */        1752,        1751,
-};
-
-static const uint16_t ud_itab__397[] = {
-  /*  0 */        1571,        1569,
-};
-
-static const uint16_t ud_itab__398[] = {
-  /*  0 */        1567,        1565,
-};
-
-static const uint16_t ud_itab__399[] = {
-  /*  0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /*  c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 10 */  GROUP(402),  GROUP(400),  GROUP(401),     INVALID,
-  /* 14 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 18 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 1c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 20 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */     INVALID,     INVALID,         153,     INVALID,
-  /* 2c */         167,         149,     INVALID,     INVALID,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 40 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 44 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 48 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 4c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 50 */     INVALID,        1392,     INVALID,     INVALID,
-  /* 54 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 58 */          30,         949,         151,     INVALID,
-  /* 5c */        1422,         821,         192,         805,
-  /* 60 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 64 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 68 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 6c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 70 */        1537,     INVALID,     INVALID,     INVALID,
-  /* 74 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 78 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 7c */        1551,        1555,     INVALID,     INVALID,
-  /* 80 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 84 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 88 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 8c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 90 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 94 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 98 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 9c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* a8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ac */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* b8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* bc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c0 */     INVALID,     INVALID,         118,     INVALID,
-  /* c4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* c8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* cc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d0 */          36,     INVALID,     INVALID,     INVALID,
-  /* d4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* d8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* dc */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e0 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* e4 */     INVALID,     INVALID,         137,     INVALID,
-  /* e8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* ec */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f0 */        1559,     INVALID,     INVALID,     INVALID,
-  /* f4 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* f8 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* fc */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__400[] = {
-  /*  0 */        1748,        1747,
-};
-
-static const uint16_t ud_itab__401[] = {
-  /*  0 */        1563,        1561,
-};
-
-static const uint16_t ud_itab__402[] = {
-  /*  0 */        1746,        1745,
-};
-
-static const uint16_t ud_itab__403[] = {
-  /*  0 */  GROUP(404),  GROUP(335),     INVALID,     INVALID,
-  /*  4 */     INVALID,  GROUP(341),  GROUP(357),  GROUP(369),
-  /*  8 */     INVALID,  GROUP(394),     INVALID,     INVALID,
-  /*  c */     INVALID,  GROUP(399),     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__404[] = {
-  /*  0 */         769,     INVALID,
-};
-
-static const uint16_t ud_itab__405[] = {
-  /*  0 */         826,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__406[] = {
-  /*  0 */         827,     INVALID,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__407[] = {
-  /*  0 */         715,     INVALID,
-};
-
-static const uint16_t ud_itab__408[] = {
-  /*  0 */         723,         724,         725,
-};
-
-static const uint16_t ud_itab__409[] = {
-  /*  0 */        1280,        1285,        1269,        1273,
-  /*  4 */        1326,        1333,        1320,        1314,
-};
-
-static const uint16_t ud_itab__410[] = {
-  /*  0 */        1281,        1288,        1272,        1276,
-  /*  4 */        1325,        1332,        1329,        1312,
-};
-
-static const uint16_t ud_itab__411[] = {
-  /*  0 */        1282,        1289,        1270,        1277,
-  /*  4 */        1324,        1331,        1321,        1316,
-};
-
-static const uint16_t ud_itab__412[] = {
-  /*  0 */        1283,        1290,        1271,        1278,
-  /*  4 */        1328,        1335,        1322,        1317,
-};
-
-static const uint16_t ud_itab__413[] = {
-  /*  0 */           3,     INVALID,
-};
-
-static const uint16_t ud_itab__414[] = {
-  /*  0 */           2,     INVALID,
-};
-
-static const uint16_t ud_itab__415[] = {
-  /*  0 */        1311,     INVALID,
-};
-
-static const uint16_t ud_itab__416[] = {
-  /*  0 */  GROUP(417),  GROUP(418),
-};
-
-static const uint16_t ud_itab__417[] = {
-  /*  0 */         206,         503,         307,         357,
-  /*  4 */         587,         630,         387,         413,
-};
-
-static const uint16_t ud_itab__418[] = {
-  /*  0 */         215,         216,         217,         218,
-  /*  4 */         219,         220,         221,         222,
-  /*  8 */         504,         505,         506,         507,
-  /*  c */         508,         509,         510,         511,
-  /* 10 */         309,         310,         311,         312,
-  /* 14 */         313,         314,         315,         316,
-  /* 18 */         359,         360,         361,         362,
-  /* 1c */         363,         364,         365,         366,
-  /* 20 */         589,         590,         591,         592,
-  /* 24 */         593,         594,         595,         596,
-  /* 28 */         614,         615,         616,         617,
-  /* 2c */         618,         619,         620,         621,
-  /* 30 */         388,         389,         390,         391,
-  /* 34 */         392,         393,         394,         395,
-  /* 38 */         414,         415,         416,         417,
-  /* 3c */         418,         419,         420,         421,
-};
-
-static const uint16_t ud_itab__419[] = {
-  /*  0 */  GROUP(420),  GROUP(421),
-};
-
-static const uint16_t ud_itab__420[] = {
-  /*  0 */         476,     INVALID,         573,         540,
-  /*  4 */         493,         492,         584,         583,
-};
-
-static const uint16_t ud_itab__421[] = {
-  /*  0 */         477,         478,         479,         480,
-  /*  4 */         481,         482,         483,         484,
-  /*  8 */         658,         659,         660,         661,
-  /*  c */         662,         663,         664,         665,
-  /* 10 */         522,     INVALID,     INVALID,     INVALID,
-  /* 14 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 18 */         549,         550,         551,         552,
-  /* 1c */         553,         554,         555,         556,
-  /* 20 */         233,         204,     INVALID,     INVALID,
-  /* 24 */         639,         657,     INVALID,     INVALID,
-  /* 28 */         485,         486,         487,         488,
-  /* 2c */         489,         490,         491,     INVALID,
-  /* 30 */         203,         685,         529,         526,
-  /* 34 */         684,         528,         377,         454,
-  /* 38 */         527,         686,         537,         536,
-  /* 3c */         530,         534,         535,         376,
-};
-
-static const uint16_t ud_itab__422[] = {
-  /*  0 */  GROUP(423),  GROUP(424),
-};
-
-static const uint16_t ud_itab__423[] = {
-  /*  0 */         456,         520,         448,         450,
-  /*  4 */         462,         464,         460,         458,
-};
-
-static const uint16_t ud_itab__424[] = {
-  /*  0 */         235,         236,         237,         238,
-  /*  4 */         239,         240,         241,         242,
-  /*  8 */         243,         244,         245,         246,
-  /*  c */         247,         248,         249,         250,
-  /* 10 */         251,         252,         253,         254,
-  /* 14 */         255,         256,         257,         258,
-  /* 18 */         259,         260,         261,         262,
-  /* 1c */         263,         264,         265,         266,
-  /* 20 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */     INVALID,         656,     INVALID,     INVALID,
-  /* 2c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__425[] = {
-  /*  0 */  GROUP(426),  GROUP(427),
-};
-
-static const uint16_t ud_itab__426[] = {
-  /*  0 */         453,         471,         467,         470,
-  /*  4 */     INVALID,         474,     INVALID,         538,
-};
-
-static const uint16_t ud_itab__427[] = {
-  /*  0 */         267,         268,         269,         270,
-  /*  4 */         271,         272,         273,         274,
-  /*  8 */         275,         276,         277,         278,
-  /*  c */         279,         280,         281,         282,
-  /* 10 */         283,         284,         285,         286,
-  /* 14 */         287,         288,         289,         290,
-  /* 18 */         291,         292,         293,         294,
-  /* 1c */         295,         296,         297,         298,
-  /* 20 */         524,         523,         234,         455,
-  /* 24 */         525,         532,     INVALID,     INVALID,
-  /* 28 */         299,         300,         301,         302,
-  /* 2c */         303,         304,         305,         306,
-  /* 30 */         333,         334,         335,         336,
-  /* 34 */         337,         338,         339,         340,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__428[] = {
-  /*  0 */  GROUP(429),  GROUP(430),
-};
-
-static const uint16_t ud_itab__429[] = {
-  /*  0 */         205,         494,         308,         358,
-  /*  4 */         588,         613,         378,         404,
-};
-
-static const uint16_t ud_itab__430[] = {
-  /*  0 */         207,         208,         209,         210,
-  /*  4 */         211,         212,         213,         214,
-  /*  8 */         495,         496,         497,         498,
-  /*  c */         499,         500,         501,         502,
-  /* 10 */         317,         318,         319,         320,
-  /* 14 */         321,         322,         323,         324,
-  /* 18 */         325,         326,         327,         328,
-  /* 1c */         329,         330,         331,         332,
-  /* 20 */         622,         623,         624,         625,
-  /* 24 */         626,         627,         628,         629,
-  /* 28 */         597,         598,         599,         600,
-  /* 2c */         601,         602,         603,         604,
-  /* 30 */         405,         406,         407,         408,
-  /* 34 */         409,         410,         411,         412,
-  /* 38 */         379,         380,         381,         382,
-  /* 3c */         383,         384,         385,         386,
-};
-
-static const uint16_t ud_itab__431[] = {
-  /*  0 */  GROUP(432),  GROUP(433),
-};
-
-static const uint16_t ud_itab__432[] = {
-  /*  0 */         475,         472,         574,         539,
-  /*  4 */         531,     INVALID,         533,         585,
-};
-
-static const uint16_t ud_itab__433[] = {
-  /*  0 */         431,         432,         433,         434,
-  /*  4 */         435,         436,         437,         438,
-  /*  8 */         666,         667,         668,         669,
-  /*  c */         670,         671,         672,         673,
-  /* 10 */         575,         576,         577,         578,
-  /* 14 */         579,         580,         581,         582,
-  /* 18 */         541,         542,         543,         544,
-  /* 1c */         545,         546,         547,         548,
-  /* 20 */         640,         641,         642,         643,
-  /* 24 */         644,         645,         646,         647,
-  /* 28 */         648,         649,         650,         651,
-  /* 2c */         652,         653,         654,         655,
-  /* 30 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 34 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__434[] = {
-  /*  0 */  GROUP(435),  GROUP(436),
-};
-
-static const uint16_t ud_itab__435[] = {
-  /*  0 */         457,         521,         447,         449,
-  /*  4 */         463,         465,         461,         459,
-};
-
-static const uint16_t ud_itab__436[] = {
-  /*  0 */         223,         224,         225,         226,
-  /*  4 */         227,         228,         229,         230,
-  /*  8 */         512,         513,         514,         515,
-  /*  c */         516,         517,         518,         519,
-  /* 10 */         367,         368,         369,         370,
-  /* 14 */         371,         372,         373,         374,
-  /* 18 */     INVALID,         375,     INVALID,     INVALID,
-  /* 1c */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 20 */         631,         632,         633,         634,
-  /* 24 */         635,         636,         637,         638,
-  /* 28 */         605,         606,         607,         608,
-  /* 2c */         609,         610,         611,         612,
-  /* 30 */         422,         423,         424,         425,
-  /* 34 */         426,         427,         428,         429,
-  /* 38 */         396,         397,         398,         399,
-  /* 3c */         400,         401,         402,         403,
-};
-
-static const uint16_t ud_itab__437[] = {
-  /*  0 */  GROUP(438),  GROUP(439),
-};
-
-static const uint16_t ud_itab__438[] = {
-  /*  0 */         451,         473,         466,         468,
-  /*  4 */         231,         452,         232,         469,
-};
-
-static const uint16_t ud_itab__439[] = {
-  /*  0 */         439,         440,         441,         442,
-  /*  4 */         443,         444,         445,         446,
-  /*  8 */         674,         675,         676,         677,
-  /*  c */         678,         679,         680,         681,
-  /* 10 */         557,         558,         559,         560,
-  /* 14 */         561,         562,         563,         564,
-  /* 18 */         565,         566,         567,         568,
-  /* 1c */         569,         570,         571,         572,
-  /* 20 */         586,     INVALID,     INVALID,     INVALID,
-  /* 24 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 28 */         341,         342,         343,         344,
-  /* 2c */         345,         346,         347,         348,
-  /* 30 */         349,         350,         351,         352,
-  /* 34 */         353,         354,         355,         356,
-  /* 38 */     INVALID,     INVALID,     INVALID,     INVALID,
-  /* 3c */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__440[] = {
-  /*  0 */         758,         759,         760,
-};
-
-static const uint16_t ud_itab__441[] = {
-  /*  0 */         764,     INVALID,
-};
-
-static const uint16_t ud_itab__442[] = {
-  /*  0 */        1432,        1437,         962,         953,
-  /*  4 */         942,         695,         186,         689,
-};
-
-static const uint16_t ud_itab__443[] = {
-  /*  0 */        1438,        1439,         963,         954,
-  /*  4 */         943,         696,         185,         688,
-};
-
-static const uint16_t ud_itab__444[] = {
-  /*  0 */         708,         183,     INVALID,     INVALID,
-  /*  4 */     INVALID,     INVALID,     INVALID,     INVALID,
-};
-
-static const uint16_t ud_itab__445[] = {
-  /*  0 */         707,         184,  GROUP(446),          71,
-  /*  4 */         761,         762,        1255,     INVALID,
-};
-
-static const uint16_t ud_itab__446[] = {
-  /*  0 */          69,          70,
-};
-
-
-struct ud_lookup_table_list_entry ud_lookup_table_list[] = {
-    /* 000 */ { ud_itab__0, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 001 */ { ud_itab__1, UD_TAB__OPC_MODE, "/m" },
-    /* 002 */ { ud_itab__2, UD_TAB__OPC_MODE, "/m" },
-    /* 003 */ { ud_itab__3, UD_TAB__OPC_MODE, "/m" },
-    /* 004 */ { ud_itab__4, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 005 */ { ud_itab__5, UD_TAB__OPC_REG, "/reg" },
-    /* 006 */ { ud_itab__6, UD_TAB__OPC_MOD, "/mod" },
-    /* 007 */ { ud_itab__7, UD_TAB__OPC_REG, "/reg" },
-    /* 008 */ { ud_itab__8, UD_TAB__OPC_REG, "/reg" },
-    /* 009 */ { ud_itab__9, UD_TAB__OPC_RM, "/rm" },
-    /* 010 */ { ud_itab__10, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 011 */ { ud_itab__11, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 012 */ { ud_itab__12, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 013 */ { ud_itab__13, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 014 */ { ud_itab__14, UD_TAB__OPC_RM, "/rm" },
-    /* 015 */ { ud_itab__15, UD_TAB__OPC_RM, "/rm" },
-    /* 016 */ { ud_itab__16, UD_TAB__OPC_RM, "/rm" },
-    /* 017 */ { ud_itab__17, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 018 */ { ud_itab__18, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 019 */ { ud_itab__19, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 020 */ { ud_itab__20, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 021 */ { ud_itab__21, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 022 */ { ud_itab__22, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 023 */ { ud_itab__23, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 024 */ { ud_itab__24, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 025 */ { ud_itab__25, UD_TAB__OPC_RM, "/rm" },
-    /* 026 */ { ud_itab__26, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 027 */ { ud_itab__27, UD_TAB__OPC_REG, "/reg" },
-    /* 028 */ { ud_itab__28, UD_TAB__OPC_3DNOW, "/3dnow" },
-    /* 029 */ { ud_itab__29, UD_TAB__OPC_SSE, "/sse" },
-    /* 030 */ { ud_itab__30, UD_TAB__OPC_SSE, "/sse" },
-    /* 031 */ { ud_itab__31, UD_TAB__OPC_MOD, "/mod" },
-    /* 032 */ { ud_itab__32, UD_TAB__OPC_SSE, "/sse" },
-    /* 033 */ { ud_itab__33, UD_TAB__OPC_SSE, "/sse" },
-    /* 034 */ { ud_itab__34, UD_TAB__OPC_SSE, "/sse" },
-    /* 035 */ { ud_itab__35, UD_TAB__OPC_SSE, "/sse" },
-    /* 036 */ { ud_itab__36, UD_TAB__OPC_SSE, "/sse" },
-    /* 037 */ { ud_itab__37, UD_TAB__OPC_MOD, "/mod" },
-    /* 038 */ { ud_itab__38, UD_TAB__OPC_SSE, "/sse" },
-    /* 039 */ { ud_itab__39, UD_TAB__OPC_SSE, "/sse" },
-    /* 040 */ { ud_itab__40, UD_TAB__OPC_SSE, "/sse" },
-    /* 041 */ { ud_itab__41, UD_TAB__OPC_REG, "/reg" },
-    /* 042 */ { ud_itab__42, UD_TAB__OPC_SSE, "/sse" },
-    /* 043 */ { ud_itab__43, UD_TAB__OPC_SSE, "/sse" },
-    /* 044 */ { ud_itab__44, UD_TAB__OPC_SSE, "/sse" },
-    /* 045 */ { ud_itab__45, UD_TAB__OPC_SSE, "/sse" },
-    /* 046 */ { ud_itab__46, UD_TAB__OPC_SSE, "/sse" },
-    /* 047 */ { ud_itab__47, UD_TAB__OPC_SSE, "/sse" },
-    /* 048 */ { ud_itab__48, UD_TAB__OPC_SSE, "/sse" },
-    /* 049 */ { ud_itab__49, UD_TAB__OPC_SSE, "/sse" },
-    /* 050 */ { ud_itab__50, UD_TAB__OPC_MODE, "/m" },
-    /* 051 */ { ud_itab__51, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 052 */ { ud_itab__52, UD_TAB__OPC_MODE, "/m" },
-    /* 053 */ { ud_itab__53, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 054 */ { ud_itab__54, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 055 */ { ud_itab__55, UD_TAB__OPC_SSE, "/sse" },
-    /* 056 */ { ud_itab__56, UD_TAB__OPC_MODE, "/m" },
-    /* 057 */ { ud_itab__57, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 058 */ { ud_itab__58, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 059 */ { ud_itab__59, UD_TAB__OPC_SSE, "/sse" },
-    /* 060 */ { ud_itab__60, UD_TAB__OPC_MODE, "/m" },
-    /* 061 */ { ud_itab__61, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 062 */ { ud_itab__62, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 063 */ { ud_itab__63, UD_TAB__OPC_SSE, "/sse" },
-    /* 064 */ { ud_itab__64, UD_TAB__OPC_SSE, "/sse" },
-    /* 065 */ { ud_itab__65, UD_TAB__OPC_SSE, "/sse" },
-    /* 066 */ { ud_itab__66, UD_TAB__OPC_SSE, "/sse" },
-    /* 067 */ { ud_itab__67, UD_TAB__OPC_SSE, "/sse" },
-    /* 068 */ { ud_itab__68, UD_TAB__OPC_SSE, "/sse" },
-    /* 069 */ { ud_itab__69, UD_TAB__OPC_SSE, "/sse" },
-    /* 070 */ { ud_itab__70, UD_TAB__OPC_SSE, "/sse" },
-    /* 071 */ { ud_itab__71, UD_TAB__OPC_SSE, "/sse" },
-    /* 072 */ { ud_itab__72, UD_TAB__OPC_SSE, "/sse" },
-    /* 073 */ { ud_itab__73, UD_TAB__OPC_SSE, "/sse" },
-    /* 074 */ { ud_itab__74, UD_TAB__OPC_SSE, "/sse" },
-    /* 075 */ { ud_itab__75, UD_TAB__OPC_SSE, "/sse" },
-    /* 076 */ { ud_itab__76, UD_TAB__OPC_SSE, "/sse" },
-    /* 077 */ { ud_itab__77, UD_TAB__OPC_SSE, "/sse" },
-    /* 078 */ { ud_itab__78, UD_TAB__OPC_SSE, "/sse" },
-    /* 079 */ { ud_itab__79, UD_TAB__OPC_SSE, "/sse" },
-    /* 080 */ { ud_itab__80, UD_TAB__OPC_SSE, "/sse" },
-    /* 081 */ { ud_itab__81, UD_TAB__OPC_SSE, "/sse" },
-    /* 082 */ { ud_itab__82, UD_TAB__OPC_SSE, "/sse" },
-    /* 083 */ { ud_itab__83, UD_TAB__OPC_SSE, "/sse" },
-    /* 084 */ { ud_itab__84, UD_TAB__OPC_SSE, "/sse" },
-    /* 085 */ { ud_itab__85, UD_TAB__OPC_SSE, "/sse" },
-    /* 086 */ { ud_itab__86, UD_TAB__OPC_SSE, "/sse" },
-    /* 087 */ { ud_itab__87, UD_TAB__OPC_SSE, "/sse" },
-    /* 088 */ { ud_itab__88, UD_TAB__OPC_SSE, "/sse" },
-    /* 089 */ { ud_itab__89, UD_TAB__OPC_SSE, "/sse" },
-    /* 090 */ { ud_itab__90, UD_TAB__OPC_SSE, "/sse" },
-    /* 091 */ { ud_itab__91, UD_TAB__OPC_SSE, "/sse" },
-    /* 092 */ { ud_itab__92, UD_TAB__OPC_SSE, "/sse" },
-    /* 093 */ { ud_itab__93, UD_TAB__OPC_SSE, "/sse" },
-    /* 094 */ { ud_itab__94, UD_TAB__OPC_SSE, "/sse" },
-    /* 095 */ { ud_itab__95, UD_TAB__OPC_SSE, "/sse" },
-    /* 096 */ { ud_itab__96, UD_TAB__OPC_SSE, "/sse" },
-    /* 097 */ { ud_itab__97, UD_TAB__OPC_SSE, "/sse" },
-    /* 098 */ { ud_itab__98, UD_TAB__OPC_SSE, "/sse" },
-    /* 099 */ { ud_itab__99, UD_TAB__OPC_SSE, "/sse" },
-    /* 100 */ { ud_itab__100, UD_TAB__OPC_SSE, "/sse" },
-    /* 101 */ { ud_itab__101, UD_TAB__OPC_SSE, "/sse" },
-    /* 102 */ { ud_itab__102, UD_TAB__OPC_SSE, "/sse" },
-    /* 103 */ { ud_itab__103, UD_TAB__OPC_SSE, "/sse" },
-    /* 104 */ { ud_itab__104, UD_TAB__OPC_SSE, "/sse" },
-    /* 105 */ { ud_itab__105, UD_TAB__OPC_SSE, "/sse" },
-    /* 106 */ { ud_itab__106, UD_TAB__OPC_SSE, "/sse" },
-    /* 107 */ { ud_itab__107, UD_TAB__OPC_SSE, "/sse" },
-    /* 108 */ { ud_itab__108, UD_TAB__OPC_SSE, "/sse" },
-    /* 109 */ { ud_itab__109, UD_TAB__OPC_SSE, "/sse" },
-    /* 110 */ { ud_itab__110, UD_TAB__OPC_SSE, "/sse" },
-    /* 111 */ { ud_itab__111, UD_TAB__OPC_SSE, "/sse" },
-    /* 112 */ { ud_itab__112, UD_TAB__OPC_SSE, "/sse" },
-    /* 113 */ { ud_itab__113, UD_TAB__OPC_SSE, "/sse" },
-    /* 114 */ { ud_itab__114, UD_TAB__OPC_SSE, "/sse" },
-    /* 115 */ { ud_itab__115, UD_TAB__OPC_SSE, "/sse" },
-    /* 116 */ { ud_itab__116, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 117 */ { ud_itab__117, UD_TAB__OPC_SSE, "/sse" },
-    /* 118 */ { ud_itab__118, UD_TAB__OPC_SSE, "/sse" },
-    /* 119 */ { ud_itab__119, UD_TAB__OPC_SSE, "/sse" },
-    /* 120 */ { ud_itab__120, UD_TAB__OPC_SSE, "/sse" },
-    /* 121 */ { ud_itab__121, UD_TAB__OPC_SSE, "/sse" },
-    /* 122 */ { ud_itab__122, UD_TAB__OPC_SSE, "/sse" },
-    /* 123 */ { ud_itab__123, UD_TAB__OPC_SSE, "/sse" },
-    /* 124 */ { ud_itab__124, UD_TAB__OPC_SSE, "/sse" },
-    /* 125 */ { ud_itab__125, UD_TAB__OPC_SSE, "/sse" },
-    /* 126 */ { ud_itab__126, UD_TAB__OPC_SSE, "/sse" },
-    /* 127 */ { ud_itab__127, UD_TAB__OPC_SSE, "/sse" },
-    /* 128 */ { ud_itab__128, UD_TAB__OPC_OSIZE, "/o" },
-    /* 129 */ { ud_itab__129, UD_TAB__OPC_SSE, "/sse" },
-    /* 130 */ { ud_itab__130, UD_TAB__OPC_SSE, "/sse" },
-    /* 131 */ { ud_itab__131, UD_TAB__OPC_SSE, "/sse" },
-    /* 132 */ { ud_itab__132, UD_TAB__OPC_SSE, "/sse" },
-    /* 133 */ { ud_itab__133, UD_TAB__OPC_OSIZE, "/o" },
-    /* 134 */ { ud_itab__134, UD_TAB__OPC_SSE, "/sse" },
-    /* 135 */ { ud_itab__135, UD_TAB__OPC_SSE, "/sse" },
-    /* 136 */ { ud_itab__136, UD_TAB__OPC_SSE, "/sse" },
-    /* 137 */ { ud_itab__137, UD_TAB__OPC_SSE, "/sse" },
-    /* 138 */ { ud_itab__138, UD_TAB__OPC_SSE, "/sse" },
-    /* 139 */ { ud_itab__139, UD_TAB__OPC_SSE, "/sse" },
-    /* 140 */ { ud_itab__140, UD_TAB__OPC_SSE, "/sse" },
-    /* 141 */ { ud_itab__141, UD_TAB__OPC_SSE, "/sse" },
-    /* 142 */ { ud_itab__142, UD_TAB__OPC_SSE, "/sse" },
-    /* 143 */ { ud_itab__143, UD_TAB__OPC_SSE, "/sse" },
-    /* 144 */ { ud_itab__144, UD_TAB__OPC_SSE, "/sse" },
-    /* 145 */ { ud_itab__145, UD_TAB__OPC_SSE, "/sse" },
-    /* 146 */ { ud_itab__146, UD_TAB__OPC_SSE, "/sse" },
-    /* 147 */ { ud_itab__147, UD_TAB__OPC_SSE, "/sse" },
-    /* 148 */ { ud_itab__148, UD_TAB__OPC_SSE, "/sse" },
-    /* 149 */ { ud_itab__149, UD_TAB__OPC_SSE, "/sse" },
-    /* 150 */ { ud_itab__150, UD_TAB__OPC_SSE, "/sse" },
-    /* 151 */ { ud_itab__151, UD_TAB__OPC_SSE, "/sse" },
-    /* 152 */ { ud_itab__152, UD_TAB__OPC_SSE, "/sse" },
-    /* 153 */ { ud_itab__153, UD_TAB__OPC_SSE, "/sse" },
-    /* 154 */ { ud_itab__154, UD_TAB__OPC_SSE, "/sse" },
-    /* 155 */ { ud_itab__155, UD_TAB__OPC_SSE, "/sse" },
-    /* 156 */ { ud_itab__156, UD_TAB__OPC_SSE, "/sse" },
-    /* 157 */ { ud_itab__157, UD_TAB__OPC_SSE, "/sse" },
-    /* 158 */ { ud_itab__158, UD_TAB__OPC_SSE, "/sse" },
-    /* 159 */ { ud_itab__159, UD_TAB__OPC_SSE, "/sse" },
-    /* 160 */ { ud_itab__160, UD_TAB__OPC_SSE, "/sse" },
-    /* 161 */ { ud_itab__161, UD_TAB__OPC_SSE, "/sse" },
-    /* 162 */ { ud_itab__162, UD_TAB__OPC_SSE, "/sse" },
-    /* 163 */ { ud_itab__163, UD_TAB__OPC_SSE, "/sse" },
-    /* 164 */ { ud_itab__164, UD_TAB__OPC_SSE, "/sse" },
-    /* 165 */ { ud_itab__165, UD_TAB__OPC_SSE, "/sse" },
-    /* 166 */ { ud_itab__166, UD_TAB__OPC_SSE, "/sse" },
-    /* 167 */ { ud_itab__167, UD_TAB__OPC_SSE, "/sse" },
-    /* 168 */ { ud_itab__168, UD_TAB__OPC_SSE, "/sse" },
-    /* 169 */ { ud_itab__169, UD_TAB__OPC_SSE, "/sse" },
-    /* 170 */ { ud_itab__170, UD_TAB__OPC_SSE, "/sse" },
-    /* 171 */ { ud_itab__171, UD_TAB__OPC_SSE, "/sse" },
-    /* 172 */ { ud_itab__172, UD_TAB__OPC_SSE, "/sse" },
-    /* 173 */ { ud_itab__173, UD_TAB__OPC_SSE, "/sse" },
-    /* 174 */ { ud_itab__174, UD_TAB__OPC_OSIZE, "/o" },
-    /* 175 */ { ud_itab__175, UD_TAB__OPC_OSIZE, "/o" },
-    /* 176 */ { ud_itab__176, UD_TAB__OPC_SSE, "/sse" },
-    /* 177 */ { ud_itab__177, UD_TAB__OPC_SSE, "/sse" },
-    /* 178 */ { ud_itab__178, UD_TAB__OPC_REG, "/reg" },
-    /* 179 */ { ud_itab__179, UD_TAB__OPC_SSE, "/sse" },
-    /* 180 */ { ud_itab__180, UD_TAB__OPC_SSE, "/sse" },
-    /* 181 */ { ud_itab__181, UD_TAB__OPC_SSE, "/sse" },
-    /* 182 */ { ud_itab__182, UD_TAB__OPC_REG, "/reg" },
-    /* 183 */ { ud_itab__183, UD_TAB__OPC_SSE, "/sse" },
-    /* 184 */ { ud_itab__184, UD_TAB__OPC_SSE, "/sse" },
-    /* 185 */ { ud_itab__185, UD_TAB__OPC_SSE, "/sse" },
-    /* 186 */ { ud_itab__186, UD_TAB__OPC_REG, "/reg" },
-    /* 187 */ { ud_itab__187, UD_TAB__OPC_SSE, "/sse" },
-    /* 188 */ { ud_itab__188, UD_TAB__OPC_SSE, "/sse" },
-    /* 189 */ { ud_itab__189, UD_TAB__OPC_SSE, "/sse" },
-    /* 190 */ { ud_itab__190, UD_TAB__OPC_SSE, "/sse" },
-    /* 191 */ { ud_itab__191, UD_TAB__OPC_SSE, "/sse" },
-    /* 192 */ { ud_itab__192, UD_TAB__OPC_SSE, "/sse" },
-    /* 193 */ { ud_itab__193, UD_TAB__OPC_SSE, "/sse" },
-    /* 194 */ { ud_itab__194, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 195 */ { ud_itab__195, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 196 */ { ud_itab__196, UD_TAB__OPC_SSE, "/sse" },
-    /* 197 */ { ud_itab__197, UD_TAB__OPC_SSE, "/sse" },
-    /* 198 */ { ud_itab__198, UD_TAB__OPC_SSE, "/sse" },
-    /* 199 */ { ud_itab__199, UD_TAB__OPC_OSIZE, "/o" },
-    /* 200 */ { ud_itab__200, UD_TAB__OPC_OSIZE, "/o" },
-    /* 201 */ { ud_itab__201, UD_TAB__OPC_SSE, "/sse" },
-    /* 202 */ { ud_itab__202, UD_TAB__OPC_MOD, "/mod" },
-    /* 203 */ { ud_itab__203, UD_TAB__OPC_REG, "/reg" },
-    /* 204 */ { ud_itab__204, UD_TAB__OPC_RM, "/rm" },
-    /* 205 */ { ud_itab__205, UD_TAB__OPC_RM, "/rm" },
-    /* 206 */ { ud_itab__206, UD_TAB__OPC_RM, "/rm" },
-    /* 207 */ { ud_itab__207, UD_TAB__OPC_MOD, "/mod" },
-    /* 208 */ { ud_itab__208, UD_TAB__OPC_REG, "/reg" },
-    /* 209 */ { ud_itab__209, UD_TAB__OPC_RM, "/rm" },
-    /* 210 */ { ud_itab__210, UD_TAB__OPC_RM, "/rm" },
-    /* 211 */ { ud_itab__211, UD_TAB__OPC_RM, "/rm" },
-    /* 212 */ { ud_itab__212, UD_TAB__OPC_RM, "/rm" },
-    /* 213 */ { ud_itab__213, UD_TAB__OPC_RM, "/rm" },
-    /* 214 */ { ud_itab__214, UD_TAB__OPC_RM, "/rm" },
-    /* 215 */ { ud_itab__215, UD_TAB__OPC_MOD, "/mod" },
-    /* 216 */ { ud_itab__216, UD_TAB__OPC_REG, "/reg" },
-    /* 217 */ { ud_itab__217, UD_TAB__OPC_REG, "/reg" },
-    /* 218 */ { ud_itab__218, UD_TAB__OPC_RM, "/rm" },
-    /* 219 */ { ud_itab__219, UD_TAB__OPC_RM, "/rm" },
-    /* 220 */ { ud_itab__220, UD_TAB__OPC_RM, "/rm" },
-    /* 221 */ { ud_itab__221, UD_TAB__OPC_SSE, "/sse" },
-    /* 222 */ { ud_itab__222, UD_TAB__OPC_REG, "/reg" },
-    /* 223 */ { ud_itab__223, UD_TAB__OPC_SSE, "/sse" },
-    /* 224 */ { ud_itab__224, UD_TAB__OPC_SSE, "/sse" },
-    /* 225 */ { ud_itab__225, UD_TAB__OPC_SSE, "/sse" },
-    /* 226 */ { ud_itab__226, UD_TAB__OPC_SSE, "/sse" },
-    /* 227 */ { ud_itab__227, UD_TAB__OPC_MOD, "/mod" },
-    /* 228 */ { ud_itab__228, UD_TAB__OPC_REG, "/reg" },
-    /* 229 */ { ud_itab__229, UD_TAB__OPC_OSIZE, "/o" },
-    /* 230 */ { ud_itab__230, UD_TAB__OPC_SSE, "/sse" },
-    /* 231 */ { ud_itab__231, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 232 */ { ud_itab__232, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 233 */ { ud_itab__233, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 234 */ { ud_itab__234, UD_TAB__OPC_VENDOR, "/vendor" },
-    /* 235 */ { ud_itab__235, UD_TAB__OPC_REG, "/reg" },
-    /* 236 */ { ud_itab__236, UD_TAB__OPC_SSE, "/sse" },
-    /* 237 */ { ud_itab__237, UD_TAB__OPC_SSE, "/sse" },
-    /* 238 */ { ud_itab__238, UD_TAB__OPC_SSE, "/sse" },
-    /* 239 */ { ud_itab__239, UD_TAB__OPC_SSE, "/sse" },
-    /* 240 */ { ud_itab__240, UD_TAB__OPC_SSE, "/sse" },
-    /* 241 */ { ud_itab__241, UD_TAB__OPC_SSE, "/sse" },
-    /* 242 */ { ud_itab__242, UD_TAB__OPC_SSE, "/sse" },
-    /* 243 */ { ud_itab__243, UD_TAB__OPC_SSE, "/sse" },
-    /* 244 */ { ud_itab__244, UD_TAB__OPC_SSE, "/sse" },
-    /* 245 */ { ud_itab__245, UD_TAB__OPC_SSE, "/sse" },
-    /* 246 */ { ud_itab__246, UD_TAB__OPC_SSE, "/sse" },
-    /* 247 */ { ud_itab__247, UD_TAB__OPC_SSE, "/sse" },
-    /* 248 */ { ud_itab__248, UD_TAB__OPC_SSE, "/sse" },
-    /* 249 */ { ud_itab__249, UD_TAB__OPC_SSE, "/sse" },
-    /* 250 */ { ud_itab__250, UD_TAB__OPC_SSE, "/sse" },
-    /* 251 */ { ud_itab__251, UD_TAB__OPC_SSE, "/sse" },
-    /* 252 */ { ud_itab__252, UD_TAB__OPC_SSE, "/sse" },
-    /* 253 */ { ud_itab__253, UD_TAB__OPC_SSE, "/sse" },
-    /* 254 */ { ud_itab__254, UD_TAB__OPC_SSE, "/sse" },
-    /* 255 */ { ud_itab__255, UD_TAB__OPC_SSE, "/sse" },
-    /* 256 */ { ud_itab__256, UD_TAB__OPC_SSE, "/sse" },
-    /* 257 */ { ud_itab__257, UD_TAB__OPC_SSE, "/sse" },
-    /* 258 */ { ud_itab__258, UD_TAB__OPC_SSE, "/sse" },
-    /* 259 */ { ud_itab__259, UD_TAB__OPC_SSE, "/sse" },
-    /* 260 */ { ud_itab__260, UD_TAB__OPC_SSE, "/sse" },
-    /* 261 */ { ud_itab__261, UD_TAB__OPC_SSE, "/sse" },
-    /* 262 */ { ud_itab__262, UD_TAB__OPC_SSE, "/sse" },
-    /* 263 */ { ud_itab__263, UD_TAB__OPC_SSE, "/sse" },
-    /* 264 */ { ud_itab__264, UD_TAB__OPC_SSE, "/sse" },
-    /* 265 */ { ud_itab__265, UD_TAB__OPC_SSE, "/sse" },
-    /* 266 */ { ud_itab__266, UD_TAB__OPC_SSE, "/sse" },
-    /* 267 */ { ud_itab__267, UD_TAB__OPC_SSE, "/sse" },
-    /* 268 */ { ud_itab__268, UD_TAB__OPC_SSE, "/sse" },
-    /* 269 */ { ud_itab__269, UD_TAB__OPC_SSE, "/sse" },
-    /* 270 */ { ud_itab__270, UD_TAB__OPC_SSE, "/sse" },
-    /* 271 */ { ud_itab__271, UD_TAB__OPC_SSE, "/sse" },
-    /* 272 */ { ud_itab__272, UD_TAB__OPC_SSE, "/sse" },
-    /* 273 */ { ud_itab__273, UD_TAB__OPC_SSE, "/sse" },
-    /* 274 */ { ud_itab__274, UD_TAB__OPC_SSE, "/sse" },
-    /* 275 */ { ud_itab__275, UD_TAB__OPC_MOD, "/mod" },
-    /* 276 */ { ud_itab__276, UD_TAB__OPC_SSE, "/sse" },
-    /* 277 */ { ud_itab__277, UD_TAB__OPC_SSE, "/sse" },
-    /* 278 */ { ud_itab__278, UD_TAB__OPC_SSE, "/sse" },
-    /* 279 */ { ud_itab__279, UD_TAB__OPC_SSE, "/sse" },
-    /* 280 */ { ud_itab__280, UD_TAB__OPC_SSE, "/sse" },
-    /* 281 */ { ud_itab__281, UD_TAB__OPC_SSE, "/sse" },
-    /* 282 */ { ud_itab__282, UD_TAB__OPC_SSE, "/sse" },
-    /* 283 */ { ud_itab__283, UD_TAB__OPC_SSE, "/sse" },
-    /* 284 */ { ud_itab__284, UD_TAB__OPC_MODE, "/m" },
-    /* 285 */ { ud_itab__285, UD_TAB__OPC_MODE, "/m" },
-    /* 286 */ { ud_itab__286, UD_TAB__OPC_MODE, "/m" },
-    /* 287 */ { ud_itab__287, UD_TAB__OPC_MODE, "/m" },
-    /* 288 */ { ud_itab__288, UD_TAB__OPC_MODE, "/m" },
-    /* 289 */ { ud_itab__289, UD_TAB__OPC_MODE, "/m" },
-    /* 290 */ { ud_itab__290, UD_TAB__OPC_MODE, "/m" },
-    /* 291 */ { ud_itab__291, UD_TAB__OPC_MODE, "/m" },
-    /* 292 */ { ud_itab__292, UD_TAB__OPC_OSIZE, "/o" },
-    /* 293 */ { ud_itab__293, UD_TAB__OPC_MODE, "/m" },
-    /* 294 */ { ud_itab__294, UD_TAB__OPC_MODE, "/m" },
-    /* 295 */ { ud_itab__295, UD_TAB__OPC_OSIZE, "/o" },
-    /* 296 */ { ud_itab__296, UD_TAB__OPC_MODE, "/m" },
-    /* 297 */ { ud_itab__297, UD_TAB__OPC_MODE, "/m" },
-    /* 298 */ { ud_itab__298, UD_TAB__OPC_MODE, "/m" },
-    /* 299 */ { ud_itab__299, UD_TAB__OPC_MODE, "/m" },
-    /* 300 */ { ud_itab__300, UD_TAB__OPC_OSIZE, "/o" },
-    /* 301 */ { ud_itab__301, UD_TAB__OPC_OSIZE, "/o" },
-    /* 302 */ { ud_itab__302, UD_TAB__OPC_REG, "/reg" },
-    /* 303 */ { ud_itab__303, UD_TAB__OPC_REG, "/reg" },
-    /* 304 */ { ud_itab__304, UD_TAB__OPC_REG, "/reg" },
-    /* 305 */ { ud_itab__305, UD_TAB__OPC_MODE, "/m" },
-    /* 306 */ { ud_itab__306, UD_TAB__OPC_MODE, "/m" },
-    /* 307 */ { ud_itab__307, UD_TAB__OPC_MODE, "/m" },
-    /* 308 */ { ud_itab__308, UD_TAB__OPC_MODE, "/m" },
-    /* 309 */ { ud_itab__309, UD_TAB__OPC_MODE, "/m" },
-    /* 310 */ { ud_itab__310, UD_TAB__OPC_MODE, "/m" },
-    /* 311 */ { ud_itab__311, UD_TAB__OPC_MODE, "/m" },
-    /* 312 */ { ud_itab__312, UD_TAB__OPC_MODE, "/m" },
-    /* 313 */ { ud_itab__313, UD_TAB__OPC_REG, "/reg" },
-    /* 314 */ { ud_itab__314, UD_TAB__OPC_REG, "/reg" },
-    /* 315 */ { ud_itab__315, UD_TAB__OPC_OSIZE, "/o" },
-    /* 316 */ { ud_itab__316, UD_TAB__OPC_OSIZE, "/o" },
-    /* 317 */ { ud_itab__317, UD_TAB__OPC_MODE, "/m" },
-    /* 318 */ { ud_itab__318, UD_TAB__OPC_OSIZE, "/o" },
-    /* 319 */ { ud_itab__319, UD_TAB__OPC_MODE, "/m" },
-    /* 320 */ { ud_itab__320, UD_TAB__OPC_MODE, "/m" },
-    /* 321 */ { ud_itab__321, UD_TAB__OPC_MODE, "/m" },
-    /* 322 */ { ud_itab__322, UD_TAB__OPC_OSIZE, "/o" },
-    /* 323 */ { ud_itab__323, UD_TAB__OPC_MODE, "/m" },
-    /* 324 */ { ud_itab__324, UD_TAB__OPC_MODE, "/m" },
-    /* 325 */ { ud_itab__325, UD_TAB__OPC_MODE, "/m" },
-    /* 326 */ { ud_itab__326, UD_TAB__OPC_OSIZE, "/o" },
-    /* 327 */ { ud_itab__327, UD_TAB__OPC_OSIZE, "/o" },
-    /* 328 */ { ud_itab__328, UD_TAB__OPC_OSIZE, "/o" },
-    /* 329 */ { ud_itab__329, UD_TAB__OPC_OSIZE, "/o" },
-    /* 330 */ { ud_itab__330, UD_TAB__OPC_OSIZE, "/o" },
-    /* 331 */ { ud_itab__331, UD_TAB__OPC_REG, "/reg" },
-    /* 332 */ { ud_itab__332, UD_TAB__OPC_REG, "/reg" },
-    /* 333 */ { ud_itab__333, UD_TAB__OPC_VEX, "/vex" },
-    /* 334 */ { ud_itab__334, UD_TAB__OPC_MODE, "/m" },
-    /* 335 */ { ud_itab__335, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 336 */ { ud_itab__336, UD_TAB__OPC_MOD, "/mod" },
-    /* 337 */ { ud_itab__337, UD_TAB__OPC_MOD, "/mod" },
-    /* 338 */ { ud_itab__338, UD_TAB__OPC_MOD, "/mod" },
-    /* 339 */ { ud_itab__339, UD_TAB__OPC_REG, "/reg" },
-    /* 340 */ { ud_itab__340, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 341 */ { ud_itab__341, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 342 */ { ud_itab__342, UD_TAB__OPC_MOD, "/mod" },
-    /* 343 */ { ud_itab__343, UD_TAB__OPC_MOD, "/mod" },
-    /* 344 */ { ud_itab__344, UD_TAB__OPC_OSIZE, "/o" },
-    /* 345 */ { ud_itab__345, UD_TAB__OPC_REG, "/reg" },
-    /* 346 */ { ud_itab__346, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 347 */ { ud_itab__347, UD_TAB__OPC_REG, "/reg" },
-    /* 348 */ { ud_itab__348, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 349 */ { ud_itab__349, UD_TAB__OPC_REG, "/reg" },
-    /* 350 */ { ud_itab__350, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 351 */ { ud_itab__351, UD_TAB__OPC_OSIZE, "/o" },
-    /* 352 */ { ud_itab__352, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 353 */ { ud_itab__353, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 354 */ { ud_itab__354, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 355 */ { ud_itab__355, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 356 */ { ud_itab__356, UD_TAB__OPC_MOD, "/mod" },
-    /* 357 */ { ud_itab__357, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 358 */ { ud_itab__358, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 359 */ { ud_itab__359, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 360 */ { ud_itab__360, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 361 */ { ud_itab__361, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 362 */ { ud_itab__362, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 363 */ { ud_itab__363, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 364 */ { ud_itab__364, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 365 */ { ud_itab__365, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 366 */ { ud_itab__366, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 367 */ { ud_itab__367, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 368 */ { ud_itab__368, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 369 */ { ud_itab__369, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 370 */ { ud_itab__370, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 371 */ { ud_itab__371, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 372 */ { ud_itab__372, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 373 */ { ud_itab__373, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 374 */ { ud_itab__374, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 375 */ { ud_itab__375, UD_TAB__OPC_OSIZE, "/o" },
-    /* 376 */ { ud_itab__376, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 377 */ { ud_itab__377, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 378 */ { ud_itab__378, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 379 */ { ud_itab__379, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 380 */ { ud_itab__380, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 381 */ { ud_itab__381, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 382 */ { ud_itab__382, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 383 */ { ud_itab__383, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 384 */ { ud_itab__384, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 385 */ { ud_itab__385, UD_TAB__OPC_MODE, "/m" },
-    /* 386 */ { ud_itab__386, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 387 */ { ud_itab__387, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 388 */ { ud_itab__388, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 389 */ { ud_itab__389, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 390 */ { ud_itab__390, UD_TAB__OPC_VEX_L, "/vexl" },
-    /* 391 */ { ud_itab__391, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 392 */ { ud_itab__392, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 393 */ { ud_itab__393, UD_TAB__OPC_VEX_W, "/vexw" },
-    /* 394 */ { ud_itab__394, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 395 */ { ud_itab__395, UD_TAB__OPC_MOD, "/mod" },
-    /* 396 */ { ud_itab__396, UD_TAB__OPC_MOD, "/mod" },
-    /* 397 */ { ud_itab__397, UD_TAB__OPC_MOD, "/mod" },
-    /* 398 */ { ud_itab__398, UD_TAB__OPC_MOD, "/mod" },
-    /* 399 */ { ud_itab__399, UD_TAB__OPC_TABLE, "opctbl" },
-    /* 400 */ { ud_itab__400, UD_TAB__OPC_MOD, "/mod" },
-    /* 401 */ { ud_itab__401, UD_TAB__OPC_MOD, "/mod" },
-    /* 402 */ { ud_itab__402, UD_TAB__OPC_MOD, "/mod" },
-    /* 403 */ { ud_itab__403, UD_TAB__OPC_VEX, "/vex" },
-    /* 404 */ { ud_itab__404, UD_TAB__OPC_MODE, "/m" },
-    /* 405 */ { ud_itab__405, UD_TAB__OPC_REG, "/reg" },
-    /* 406 */ { ud_itab__406, UD_TAB__OPC_REG, "/reg" },
-    /* 407 */ { ud_itab__407, UD_TAB__OPC_MODE, "/m" },
-    /* 408 */ { ud_itab__408, UD_TAB__OPC_OSIZE, "/o" },
-    /* 409 */ { ud_itab__409, UD_TAB__OPC_REG, "/reg" },
-    /* 410 */ { ud_itab__410, UD_TAB__OPC_REG, "/reg" },
-    /* 411 */ { ud_itab__411, UD_TAB__OPC_REG, "/reg" },
-    /* 412 */ { ud_itab__412, UD_TAB__OPC_REG, "/reg" },
-    /* 413 */ { ud_itab__413, UD_TAB__OPC_MODE, "/m" },
-    /* 414 */ { ud_itab__414, UD_TAB__OPC_MODE, "/m" },
-    /* 415 */ { ud_itab__415, UD_TAB__OPC_MODE, "/m" },
-    /* 416 */ { ud_itab__416, UD_TAB__OPC_MOD, "/mod" },
-    /* 417 */ { ud_itab__417, UD_TAB__OPC_REG, "/reg" },
-    /* 418 */ { ud_itab__418, UD_TAB__OPC_X87, "/x87" },
-    /* 419 */ { ud_itab__419, UD_TAB__OPC_MOD, "/mod" },
-    /* 420 */ { ud_itab__420, UD_TAB__OPC_REG, "/reg" },
-    /* 421 */ { ud_itab__421, UD_TAB__OPC_X87, "/x87" },
-    /* 422 */ { ud_itab__422, UD_TAB__OPC_MOD, "/mod" },
-    /* 423 */ { ud_itab__423, UD_TAB__OPC_REG, "/reg" },
-    /* 424 */ { ud_itab__424, UD_TAB__OPC_X87, "/x87" },
-    /* 425 */ { ud_itab__425, UD_TAB__OPC_MOD, "/mod" },
-    /* 426 */ { ud_itab__426, UD_TAB__OPC_REG, "/reg" },
-    /* 427 */ { ud_itab__427, UD_TAB__OPC_X87, "/x87" },
-    /* 428 */ { ud_itab__428, UD_TAB__OPC_MOD, "/mod" },
-    /* 429 */ { ud_itab__429, UD_TAB__OPC_REG, "/reg" },
-    /* 430 */ { ud_itab__430, UD_TAB__OPC_X87, "/x87" },
-    /* 431 */ { ud_itab__431, UD_TAB__OPC_MOD, "/mod" },
-    /* 432 */ { ud_itab__432, UD_TAB__OPC_REG, "/reg" },
-    /* 433 */ { ud_itab__433, UD_TAB__OPC_X87, "/x87" },
-    /* 434 */ { ud_itab__434, UD_TAB__OPC_MOD, "/mod" },
-    /* 435 */ { ud_itab__435, UD_TAB__OPC_REG, "/reg" },
-    /* 436 */ { ud_itab__436, UD_TAB__OPC_X87, "/x87" },
-    /* 437 */ { ud_itab__437, UD_TAB__OPC_MOD, "/mod" },
-    /* 438 */ { ud_itab__438, UD_TAB__OPC_REG, "/reg" },
-    /* 439 */ { ud_itab__439, UD_TAB__OPC_X87, "/x87" },
-    /* 440 */ { ud_itab__440, UD_TAB__OPC_ASIZE, "/a" },
-    /* 441 */ { ud_itab__441, UD_TAB__OPC_MODE, "/m" },
-    /* 442 */ { ud_itab__442, UD_TAB__OPC_REG, "/reg" },
-    /* 443 */ { ud_itab__443, UD_TAB__OPC_REG, "/reg" },
-    /* 444 */ { ud_itab__444, UD_TAB__OPC_REG, "/reg" },
-    /* 445 */ { ud_itab__445, UD_TAB__OPC_REG, "/reg" },
-    /* 446 */ { ud_itab__446, UD_TAB__OPC_MODE, "/m" },
-};
-
-/* itab entry operand definitions (for readability) */
-#define O_AL      { OP_AL,       SZ_B     }
-#define O_AX      { OP_AX,       SZ_W     }
-#define O_Av      { OP_A,        SZ_V     }
-#define O_C       { OP_C,        SZ_NA    }
-#define O_CL      { OP_CL,       SZ_B     }
-#define O_CS      { OP_CS,       SZ_NA    }
-#define O_CX      { OP_CX,       SZ_W     }
-#define O_D       { OP_D,        SZ_NA    }
-#define O_DL      { OP_DL,       SZ_B     }
-#define O_DS      { OP_DS,       SZ_NA    }
-#define O_DX      { OP_DX,       SZ_W     }
-#define O_E       { OP_E,        SZ_NA    }
-#define O_ES      { OP_ES,       SZ_NA    }
-#define O_Eb      { OP_E,        SZ_B     }
-#define O_Ed      { OP_E,        SZ_D     }
-#define O_Eq      { OP_E,        SZ_Q     }
-#define O_Ev      { OP_E,        SZ_V     }
-#define O_Ew      { OP_E,        SZ_W     }
-#define O_Ey      { OP_E,        SZ_Y     }
-#define O_Ez      { OP_E,        SZ_Z     }
-#define O_FS      { OP_FS,       SZ_NA    }
-#define O_Fv      { OP_F,        SZ_V     }
-#define O_G       { OP_G,        SZ_NA    }
-#define O_GS      { OP_GS,       SZ_NA    }
-#define O_Gb      { OP_G,        SZ_B     }
-#define O_Gd      { OP_G,        SZ_D     }
-#define O_Gq      { OP_G,        SZ_Q     }
-#define O_Gv      { OP_G,        SZ_V     }
-#define O_Gw      { OP_G,        SZ_W     }
-#define O_Gy      { OP_G,        SZ_Y     }
-#define O_Gz      { OP_G,        SZ_Z     }
-#define O_H       { OP_H,        SZ_X     }
-#define O_Hqq     { OP_H,        SZ_QQ    }
-#define O_Hx      { OP_H,        SZ_X     }
-#define O_I1      { OP_I1,       SZ_NA    }
-#define O_I3      { OP_I3,       SZ_NA    }
-#define O_Ib      { OP_I,        SZ_B     }
-#define O_Iv      { OP_I,        SZ_V     }
-#define O_Iw      { OP_I,        SZ_W     }
-#define O_Iz      { OP_I,        SZ_Z     }
-#define O_Jb      { OP_J,        SZ_B     }
-#define O_Jv      { OP_J,        SZ_V     }
-#define O_Jz      { OP_J,        SZ_Z     }
-#define O_L       { OP_L,        SZ_O     }
-#define O_Lx      { OP_L,        SZ_X     }
-#define O_M       { OP_M,        SZ_NA    }
-#define O_Mb      { OP_M,        SZ_B     }
-#define O_MbRd    { OP_MR,       SZ_BD    }
-#define O_MbRv    { OP_MR,       SZ_BV    }
-#define O_Md      { OP_M,        SZ_D     }
-#define O_MdRy    { OP_MR,       SZ_DY    }
-#define O_MdU     { OP_MU,       SZ_DO    }
-#define O_Mdq     { OP_M,        SZ_DQ    }
-#define O_Mo      { OP_M,        SZ_O     }
-#define O_Mq      { OP_M,        SZ_Q     }
-#define O_MqU     { OP_MU,       SZ_QO    }
-#define O_Ms      { OP_M,        SZ_W     }
-#define O_Mt      { OP_M,        SZ_T     }
-#define O_Mv      { OP_M,        SZ_V     }
-#define O_Mw      { OP_M,        SZ_W     }
-#define O_MwRd    { OP_MR,       SZ_WD    }
-#define O_MwRv    { OP_MR,       SZ_WV    }
-#define O_MwRy    { OP_MR,       SZ_WY    }
-#define O_MwU     { OP_MU,       SZ_WO    }
-#define O_N       { OP_N,        SZ_Q     }
-#define O_NONE    { OP_NONE,     SZ_NA    }
-#define O_Ob      { OP_O,        SZ_B     }
-#define O_Ov      { OP_O,        SZ_V     }
-#define O_Ow      { OP_O,        SZ_W     }
-#define O_P       { OP_P,        SZ_Q     }
-#define O_Q       { OP_Q,        SZ_Q     }
-#define O_R       { OP_R,        SZ_RDQ   }
-#define O_R0b     { OP_R0,       SZ_B     }
-#define O_R0v     { OP_R0,       SZ_V     }
-#define O_R0w     { OP_R0,       SZ_W     }
-#define O_R0y     { OP_R0,       SZ_Y     }
-#define O_R0z     { OP_R0,       SZ_Z     }
-#define O_R1b     { OP_R1,       SZ_B     }
-#define O_R1v     { OP_R1,       SZ_V     }
-#define O_R1w     { OP_R1,       SZ_W     }
-#define O_R1y     { OP_R1,       SZ_Y     }
-#define O_R1z     { OP_R1,       SZ_Z     }
-#define O_R2b     { OP_R2,       SZ_B     }
-#define O_R2v     { OP_R2,       SZ_V     }
-#define O_R2w     { OP_R2,       SZ_W     }
-#define O_R2y     { OP_R2,       SZ_Y     }
-#define O_R2z     { OP_R2,       SZ_Z     }
-#define O_R3b     { OP_R3,       SZ_B     }
-#define O_R3v     { OP_R3,       SZ_V     }
-#define O_R3w     { OP_R3,       SZ_W     }
-#define O_R3y     { OP_R3,       SZ_Y     }
-#define O_R3z     { OP_R3,       SZ_Z     }
-#define O_R4b     { OP_R4,       SZ_B     }
-#define O_R4v     { OP_R4,       SZ_V     }
-#define O_R4w     { OP_R4,       SZ_W     }
-#define O_R4y     { OP_R4,       SZ_Y     }
-#define O_R4z     { OP_R4,       SZ_Z     }
-#define O_R5b     { OP_R5,       SZ_B     }
-#define O_R5v     { OP_R5,       SZ_V     }
-#define O_R5w     { OP_R5,       SZ_W     }
-#define O_R5y     { OP_R5,       SZ_Y     }
-#define O_R5z     { OP_R5,       SZ_Z     }
-#define O_R6b     { OP_R6,       SZ_B     }
-#define O_R6v     { OP_R6,       SZ_V     }
-#define O_R6w     { OP_R6,       SZ_W     }
-#define O_R6y     { OP_R6,       SZ_Y     }
-#define O_R6z     { OP_R6,       SZ_Z     }
-#define O_R7b     { OP_R7,       SZ_B     }
-#define O_R7v     { OP_R7,       SZ_V     }
-#define O_R7w     { OP_R7,       SZ_W     }
-#define O_R7y     { OP_R7,       SZ_Y     }
-#define O_R7z     { OP_R7,       SZ_Z     }
-#define O_S       { OP_S,        SZ_W     }
-#define O_SS      { OP_SS,       SZ_NA    }
-#define O_ST0     { OP_ST0,      SZ_NA    }
-#define O_ST1     { OP_ST1,      SZ_NA    }
-#define O_ST2     { OP_ST2,      SZ_NA    }
-#define O_ST3     { OP_ST3,      SZ_NA    }
-#define O_ST4     { OP_ST4,      SZ_NA    }
-#define O_ST5     { OP_ST5,      SZ_NA    }
-#define O_ST6     { OP_ST6,      SZ_NA    }
-#define O_ST7     { OP_ST7,      SZ_NA    }
-#define O_U       { OP_U,        SZ_O     }
-#define O_Ux      { OP_U,        SZ_X     }
-#define O_V       { OP_V,        SZ_DQ    }
-#define O_Vdq     { OP_V,        SZ_DQ    }
-#define O_Vqq     { OP_V,        SZ_QQ    }
-#define O_Vsd     { OP_V,        SZ_Q     }
-#define O_Vx      { OP_V,        SZ_X     }
-#define O_W       { OP_W,        SZ_DQ    }
-#define O_Wdq     { OP_W,        SZ_DQ    }
-#define O_Wqq     { OP_W,        SZ_QQ    }
-#define O_Wsd     { OP_W,        SZ_Q     }
-#define O_Wx      { OP_W,        SZ_X     }
-#define O_eAX     { OP_eAX,      SZ_Z     }
-#define O_eCX     { OP_eCX,      SZ_Z     }
-#define O_eDX     { OP_eDX,      SZ_Z     }
-#define O_rAX     { OP_rAX,      SZ_V     }
-#define O_rCX     { OP_rCX,      SZ_V     }
-#define O_rDX     { OP_rDX,      SZ_V     }
-#define O_sIb     { OP_sI,       SZ_B     }
-#define O_sIv     { OP_sI,       SZ_V     }
-#define O_sIz     { OP_sI,       SZ_Z     }
-
-struct ud_itab_entry ud_itab[] = {
-  /* 0000 */ { UD_Iinvalid, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0001 */ { UD_Iaaa, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AL, UD_NONE} },
-  /* 0002 */ { UD_Iaad, O_Ib, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_NONE}, {UD_R_AX, UD_NONE} },
-  /* 0003 */ { UD_Iaam, O_Ib, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_NONE}, {UD_R_AX, UD_NONE} },
-  /* 0004 */ { UD_Iaas, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AL, UD_NONE} },
-  /* 0005 */ { UD_Iadc, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0006 */ { UD_Iadc, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0007 */ { UD_Iadc, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0008 */ { UD_Iadc, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0009 */ { UD_Iadc, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0010 */ { UD_Iadc, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0011 */ { UD_Iadc, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0012 */ { UD_Iadc, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_inv64, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0013 */ { UD_Iadc, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0014 */ { UD_Iadc, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0015 */ { UD_Iadd, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0016 */ { UD_Iadd, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0017 */ { UD_Iadd, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0018 */ { UD_Iadd, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0019 */ { UD_Iadd, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0020 */ { UD_Iadd, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0021 */ { UD_Iadd, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0022 */ { UD_Iadd, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_inv64, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0023 */ { UD_Iadd, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0024 */ { UD_Iadd, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0025 */ { UD_Iaddpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0026 */ { UD_Ivaddpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0027 */ { UD_Iaddps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0028 */ { UD_Ivaddps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0029 */ { UD_Iaddsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0030 */ { UD_Ivaddsd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0031 */ { UD_Iaddss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0032 */ { UD_Ivaddss, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0033 */ { UD_Iaddsubpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0034 */ { UD_Ivaddsubpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0035 */ { UD_Iaddsubps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0036 */ { UD_Ivaddsubps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0037 */ { UD_Iaesdec, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0038 */ { UD_Ivaesdec, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0039 */ { UD_Iaesdeclast, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0040 */ { UD_Ivaesdeclast, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0041 */ { UD_Iaesenc, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0042 */ { UD_Ivaesenc, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0043 */ { UD_Iaesenclast, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0044 */ { UD_Ivaesenclast, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0045 */ { UD_Iaesimc, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0046 */ { UD_Ivaesimc, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0047 */ { UD_Iaeskeygenassist, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0048 */ { UD_Ivaeskeygenassist, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0049 */ { UD_Iand, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0050 */ { UD_Iand, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0051 */ { UD_Iand, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0052 */ { UD_Iand, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0053 */ { UD_Iand, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0054 */ { UD_Iand, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0055 */ { UD_Iand, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0056 */ { UD_Iand, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_inv64, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0057 */ { UD_Iand, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0058 */ { UD_Iand, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0059 */ { UD_Iandpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0060 */ { UD_Ivandpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0061 */ { UD_Iandps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0062 */ { UD_Ivandps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0063 */ { UD_Iandnpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0064 */ { UD_Ivandnpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0065 */ { UD_Iandnps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0066 */ { UD_Ivandnps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0067 */ { UD_Iarpl, O_Ew, O_Gw, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0068 */ { UD_Imovsxd, O_Gq, O_Ed, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexx|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0069 */ { UD_Icall, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 0070 */ { UD_Icall, O_Eq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 0071 */ { UD_Icall, O_Fv, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 0072 */ { UD_Icall, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 0073 */ { UD_Icall, O_Av, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 0074 */ { UD_Icbw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AX, UD_NONE} },
-  /* 0075 */ { UD_Icwde, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_NONE}, {UD_R_EAX, UD_NONE} },
-  /* 0076 */ { UD_Icdqe, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_NONE}, {UD_R_RAX, UD_NONE} },
-  /* 0077 */ { UD_Iclc, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0078 */ { UD_Icld, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0079 */ { UD_Iclflush, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0080 */ { UD_Iclgi, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0081 */ { UD_Icli, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0082 */ { UD_Iclts, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_CR0, UD_NONE}, {UD_R_CR0, UD_NONE} },
-  /* 0083 */ { UD_Icmc, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0084 */ { UD_Icmovo, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0085 */ { UD_Icmovno, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0086 */ { UD_Icmovb, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0087 */ { UD_Icmovae, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0088 */ { UD_Icmove, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0089 */ { UD_Icmovne, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0090 */ { UD_Icmovbe, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0091 */ { UD_Icmova, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0092 */ { UD_Icmovs, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0093 */ { UD_Icmovns, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0094 */ { UD_Icmovp, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0095 */ { UD_Icmovnp, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0096 */ { UD_Icmovl, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0097 */ { UD_Icmovge, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0098 */ { UD_Icmovle, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0099 */ { UD_Icmovg, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0100 */ { UD_Icmp, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0101 */ { UD_Icmp, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0102 */ { UD_Icmp, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0103 */ { UD_Icmp, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0104 */ { UD_Icmp, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0105 */ { UD_Icmp, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0106 */ { UD_Icmp, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0107 */ { UD_Icmp, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_inv64, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0108 */ { UD_Icmp, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0109 */ { UD_Icmp, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0110 */ { UD_Icmppd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0111 */ { UD_Ivcmppd, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0112 */ { UD_Icmpps, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0113 */ { UD_Ivcmpps, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0114 */ { UD_Icmpsb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz|P_seg, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 0115 */ { UD_Icmpsw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz|P_oso|P_rexw|P_seg, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 0116 */ { UD_Icmpsd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz|P_oso|P_rexw|P_seg, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 0117 */ { UD_Icmpsd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0118 */ { UD_Ivcmpsd, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0119 */ { UD_Icmpsq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz|P_oso|P_rexw|P_seg, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 0120 */ { UD_Icmpss, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0121 */ { UD_Ivcmpss, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0122 */ { UD_Icmpxchg, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_NONE}, {UD_R_RAX, UD_NONE} },
-  /* 0123 */ { UD_Icmpxchg, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_NONE}, {UD_R_RAX, UD_NONE} },
-  /* 0124 */ { UD_Icmpxchg8b, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_R_RDX, UD_NONE}, {UD_R_RAX, UD_R_RDX, UD_NONE} },
-  /* 0125 */ { UD_Icmpxchg8b, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_R_RDX, UD_NONE}, {UD_R_RAX, UD_R_RDX, UD_NONE} },
-  /* 0126 */ { UD_Icmpxchg16b, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_R_RDX, UD_NONE}, {UD_R_RAX, UD_R_RDX, UD_NONE} },
-  /* 0127 */ { UD_Icomisd, O_Vsd, O_Wsd, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0128 */ { UD_Ivcomisd, O_Vsd, O_Wsd, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0129 */ { UD_Icomiss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0130 */ { UD_Ivcomiss, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0131 */ { UD_Icpuid, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_NONE}, {UD_R_EAX, UD_R_EBX, UD_R_ECX, UD_R_EDX, UD_NONE} },
-  /* 0132 */ { UD_Icvtdq2pd, O_V, O_Wdq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0133 */ { UD_Ivcvtdq2pd, O_Vx, O_Wdq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0134 */ { UD_Icvtdq2ps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0135 */ { UD_Ivcvtdq2ps, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0136 */ { UD_Icvtpd2dq, O_Vdq, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0137 */ { UD_Ivcvtpd2dq, O_Vdq, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0138 */ { UD_Icvtpd2pi, O_P, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0139 */ { UD_Icvtpd2ps, O_Vdq, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0140 */ { UD_Ivcvtpd2ps, O_Vdq, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0141 */ { UD_Icvtpi2ps, O_V, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0142 */ { UD_Icvtpi2pd, O_V, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0143 */ { UD_Icvtps2dq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0144 */ { UD_Ivcvtps2dq, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0145 */ { UD_Icvtps2pd, O_V, O_Wdq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0146 */ { UD_Ivcvtps2pd, O_Vx, O_Wdq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0147 */ { UD_Icvtps2pi, O_P, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0148 */ { UD_Icvtsd2si, O_Gy, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0149 */ { UD_Ivcvtsd2si, O_Gy, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0150 */ { UD_Icvtsd2ss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0151 */ { UD_Ivcvtsd2ss, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0152 */ { UD_Icvtsi2sd, O_V, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0153 */ { UD_Ivcvtsi2sd, O_Vx, O_Hx, O_Ey, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0154 */ { UD_Icvtsi2ss, O_V, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0155 */ { UD_Ivcvtsi2ss, O_Vx, O_Hx, O_Ey, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0156 */ { UD_Icvtss2sd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0157 */ { UD_Ivcvtss2sd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0158 */ { UD_Icvtss2si, O_Gy, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0159 */ { UD_Ivcvtss2si, O_Gy, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0160 */ { UD_Icvttpd2dq, O_Vdq, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0161 */ { UD_Ivcvttpd2dq, O_Vdq, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0162 */ { UD_Icvttpd2pi, O_P, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0163 */ { UD_Icvttps2dq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0164 */ { UD_Ivcvttps2dq, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0165 */ { UD_Icvttps2pi, O_P, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0166 */ { UD_Icvttsd2si, O_Gy, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0167 */ { UD_Ivcvttsd2si, O_Gy, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0168 */ { UD_Icvttss2si, O_Gy, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0169 */ { UD_Ivcvttss2si, O_Gy, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0170 */ { UD_Icwd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_NONE}, {UD_R_AX, UD_R_DX, UD_NONE} },
-  /* 0171 */ { UD_Icdq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_NONE}, {UD_R_EAX, UD_R_EDX, UD_NONE} },
-  /* 0172 */ { UD_Icqo, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_NONE}, {UD_R_RAX, UD_R_RDX, UD_NONE} },
-  /* 0173 */ { UD_Idaa, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AL, UD_NONE} },
-  /* 0174 */ { UD_Idas, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AL, UD_NONE} },
-  /* 0175 */ { UD_Idec, O_R0z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0176 */ { UD_Idec, O_R1z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0177 */ { UD_Idec, O_R2z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0178 */ { UD_Idec, O_R3z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0179 */ { UD_Idec, O_R4z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0180 */ { UD_Idec, O_R5z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0181 */ { UD_Idec, O_R6z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0182 */ { UD_Idec, O_R7z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0183 */ { UD_Idec, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0184 */ { UD_Idec, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0185 */ { UD_Idiv, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_R_DX, UD_NONE}, {UD_R_AX, UD_R_DX, UD_NONE} },
-  /* 0186 */ { UD_Idiv, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_NONE}, {UD_R_AX, UD_NONE} },
-  /* 0187 */ { UD_Idivpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0188 */ { UD_Ivdivpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0189 */ { UD_Idivps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0190 */ { UD_Ivdivps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0191 */ { UD_Idivsd, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0192 */ { UD_Ivdivsd, O_Vx, O_Hx, O_MqU, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0193 */ { UD_Idivss, O_V, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0194 */ { UD_Ivdivss, O_Vx, O_Hx, O_MdU, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0195 */ { UD_Idppd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0196 */ { UD_Ivdppd, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0197 */ { UD_Idpps, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0198 */ { UD_Ivdpps, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0199 */ { UD_Iemms, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0200 */ { UD_Ienter, O_Iw, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0201 */ { UD_Iextractps, O_MdRy, O_V, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0202 */ { UD_Ivextractps, O_MdRy, O_Vx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0203 */ { UD_If2xm1, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_ST0, UD_NONE}, {UD_R_ST0, UD_NONE} },
-  /* 0204 */ { UD_Ifabs, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_ST0, UD_NONE}, {UD_R_ST0, UD_NONE} },
-  /* 0205 */ { UD_Ifadd, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0206 */ { UD_Ifadd, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0207 */ { UD_Ifadd, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0208 */ { UD_Ifadd, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0209 */ { UD_Ifadd, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0210 */ { UD_Ifadd, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0211 */ { UD_Ifadd, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0212 */ { UD_Ifadd, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0213 */ { UD_Ifadd, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0214 */ { UD_Ifadd, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0215 */ { UD_Ifadd, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0216 */ { UD_Ifadd, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0217 */ { UD_Ifadd, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0218 */ { UD_Ifadd, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0219 */ { UD_Ifadd, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0220 */ { UD_Ifadd, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0221 */ { UD_Ifadd, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0222 */ { UD_Ifadd, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0223 */ { UD_Ifaddp, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0224 */ { UD_Ifaddp, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0225 */ { UD_Ifaddp, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0226 */ { UD_Ifaddp, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0227 */ { UD_Ifaddp, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0228 */ { UD_Ifaddp, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0229 */ { UD_Ifaddp, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0230 */ { UD_Ifaddp, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0231 */ { UD_Ifbld, O_Mt, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0232 */ { UD_Ifbstp, O_Mt, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0233 */ { UD_Ifchs, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0234 */ { UD_Ifclex, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0235 */ { UD_Ifcmovb, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0236 */ { UD_Ifcmovb, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0237 */ { UD_Ifcmovb, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0238 */ { UD_Ifcmovb, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0239 */ { UD_Ifcmovb, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0240 */ { UD_Ifcmovb, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0241 */ { UD_Ifcmovb, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0242 */ { UD_Ifcmovb, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0243 */ { UD_Ifcmove, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0244 */ { UD_Ifcmove, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0245 */ { UD_Ifcmove, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0246 */ { UD_Ifcmove, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0247 */ { UD_Ifcmove, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0248 */ { UD_Ifcmove, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0249 */ { UD_Ifcmove, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0250 */ { UD_Ifcmove, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0251 */ { UD_Ifcmovbe, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0252 */ { UD_Ifcmovbe, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0253 */ { UD_Ifcmovbe, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0254 */ { UD_Ifcmovbe, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0255 */ { UD_Ifcmovbe, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0256 */ { UD_Ifcmovbe, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0257 */ { UD_Ifcmovbe, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0258 */ { UD_Ifcmovbe, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0259 */ { UD_Ifcmovu, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0260 */ { UD_Ifcmovu, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0261 */ { UD_Ifcmovu, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0262 */ { UD_Ifcmovu, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0263 */ { UD_Ifcmovu, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0264 */ { UD_Ifcmovu, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0265 */ { UD_Ifcmovu, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0266 */ { UD_Ifcmovu, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0267 */ { UD_Ifcmovnb, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0268 */ { UD_Ifcmovnb, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0269 */ { UD_Ifcmovnb, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0270 */ { UD_Ifcmovnb, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0271 */ { UD_Ifcmovnb, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0272 */ { UD_Ifcmovnb, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0273 */ { UD_Ifcmovnb, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0274 */ { UD_Ifcmovnb, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0275 */ { UD_Ifcmovne, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0276 */ { UD_Ifcmovne, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0277 */ { UD_Ifcmovne, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0278 */ { UD_Ifcmovne, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0279 */ { UD_Ifcmovne, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0280 */ { UD_Ifcmovne, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0281 */ { UD_Ifcmovne, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0282 */ { UD_Ifcmovne, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0283 */ { UD_Ifcmovnbe, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0284 */ { UD_Ifcmovnbe, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0285 */ { UD_Ifcmovnbe, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0286 */ { UD_Ifcmovnbe, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0287 */ { UD_Ifcmovnbe, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0288 */ { UD_Ifcmovnbe, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0289 */ { UD_Ifcmovnbe, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0290 */ { UD_Ifcmovnbe, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0291 */ { UD_Ifcmovnu, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0292 */ { UD_Ifcmovnu, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0293 */ { UD_Ifcmovnu, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0294 */ { UD_Ifcmovnu, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0295 */ { UD_Ifcmovnu, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0296 */ { UD_Ifcmovnu, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0297 */ { UD_Ifcmovnu, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0298 */ { UD_Ifcmovnu, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0299 */ { UD_Ifucomi, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0300 */ { UD_Ifucomi, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0301 */ { UD_Ifucomi, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0302 */ { UD_Ifucomi, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0303 */ { UD_Ifucomi, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0304 */ { UD_Ifucomi, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0305 */ { UD_Ifucomi, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0306 */ { UD_Ifucomi, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0307 */ { UD_Ifcom, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0308 */ { UD_Ifcom, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0309 */ { UD_Ifcom, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0310 */ { UD_Ifcom, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0311 */ { UD_Ifcom, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0312 */ { UD_Ifcom, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0313 */ { UD_Ifcom, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0314 */ { UD_Ifcom, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0315 */ { UD_Ifcom, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0316 */ { UD_Ifcom, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0317 */ { UD_Ifcom2, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0318 */ { UD_Ifcom2, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0319 */ { UD_Ifcom2, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0320 */ { UD_Ifcom2, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0321 */ { UD_Ifcom2, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0322 */ { UD_Ifcom2, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0323 */ { UD_Ifcom2, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0324 */ { UD_Ifcom2, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0325 */ { UD_Ifcomp3, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0326 */ { UD_Ifcomp3, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0327 */ { UD_Ifcomp3, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0328 */ { UD_Ifcomp3, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0329 */ { UD_Ifcomp3, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0330 */ { UD_Ifcomp3, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0331 */ { UD_Ifcomp3, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0332 */ { UD_Ifcomp3, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0333 */ { UD_Ifcomi, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0334 */ { UD_Ifcomi, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0335 */ { UD_Ifcomi, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0336 */ { UD_Ifcomi, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0337 */ { UD_Ifcomi, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0338 */ { UD_Ifcomi, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0339 */ { UD_Ifcomi, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0340 */ { UD_Ifcomi, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0341 */ { UD_Ifucomip, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0342 */ { UD_Ifucomip, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0343 */ { UD_Ifucomip, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0344 */ { UD_Ifucomip, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0345 */ { UD_Ifucomip, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0346 */ { UD_Ifucomip, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0347 */ { UD_Ifucomip, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0348 */ { UD_Ifucomip, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0349 */ { UD_Ifcomip, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0350 */ { UD_Ifcomip, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0351 */ { UD_Ifcomip, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0352 */ { UD_Ifcomip, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0353 */ { UD_Ifcomip, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0354 */ { UD_Ifcomip, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0355 */ { UD_Ifcomip, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0356 */ { UD_Ifcomip, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0357 */ { UD_Ifcomp, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0358 */ { UD_Ifcomp, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0359 */ { UD_Ifcomp, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0360 */ { UD_Ifcomp, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0361 */ { UD_Ifcomp, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0362 */ { UD_Ifcomp, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0363 */ { UD_Ifcomp, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0364 */ { UD_Ifcomp, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0365 */ { UD_Ifcomp, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0366 */ { UD_Ifcomp, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0367 */ { UD_Ifcomp5, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0368 */ { UD_Ifcomp5, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0369 */ { UD_Ifcomp5, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0370 */ { UD_Ifcomp5, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0371 */ { UD_Ifcomp5, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0372 */ { UD_Ifcomp5, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0373 */ { UD_Ifcomp5, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0374 */ { UD_Ifcomp5, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0375 */ { UD_Ifcompp, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0376 */ { UD_Ifcos, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0377 */ { UD_Ifdecstp, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0378 */ { UD_Ifdiv, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0379 */ { UD_Ifdiv, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0380 */ { UD_Ifdiv, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0381 */ { UD_Ifdiv, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0382 */ { UD_Ifdiv, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0383 */ { UD_Ifdiv, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0384 */ { UD_Ifdiv, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0385 */ { UD_Ifdiv, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0386 */ { UD_Ifdiv, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0387 */ { UD_Ifdiv, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0388 */ { UD_Ifdiv, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0389 */ { UD_Ifdiv, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0390 */ { UD_Ifdiv, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0391 */ { UD_Ifdiv, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0392 */ { UD_Ifdiv, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0393 */ { UD_Ifdiv, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0394 */ { UD_Ifdiv, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0395 */ { UD_Ifdiv, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0396 */ { UD_Ifdivp, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0397 */ { UD_Ifdivp, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0398 */ { UD_Ifdivp, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0399 */ { UD_Ifdivp, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0400 */ { UD_Ifdivp, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0401 */ { UD_Ifdivp, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0402 */ { UD_Ifdivp, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0403 */ { UD_Ifdivp, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0404 */ { UD_Ifdivr, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0405 */ { UD_Ifdivr, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0406 */ { UD_Ifdivr, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0407 */ { UD_Ifdivr, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0408 */ { UD_Ifdivr, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0409 */ { UD_Ifdivr, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0410 */ { UD_Ifdivr, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0411 */ { UD_Ifdivr, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0412 */ { UD_Ifdivr, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0413 */ { UD_Ifdivr, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0414 */ { UD_Ifdivr, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0415 */ { UD_Ifdivr, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0416 */ { UD_Ifdivr, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0417 */ { UD_Ifdivr, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0418 */ { UD_Ifdivr, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0419 */ { UD_Ifdivr, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0420 */ { UD_Ifdivr, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0421 */ { UD_Ifdivr, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0422 */ { UD_Ifdivrp, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0423 */ { UD_Ifdivrp, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0424 */ { UD_Ifdivrp, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0425 */ { UD_Ifdivrp, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0426 */ { UD_Ifdivrp, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0427 */ { UD_Ifdivrp, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0428 */ { UD_Ifdivrp, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0429 */ { UD_Ifdivrp, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0430 */ { UD_Ifemms, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0431 */ { UD_Iffree, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0432 */ { UD_Iffree, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0433 */ { UD_Iffree, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0434 */ { UD_Iffree, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0435 */ { UD_Iffree, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0436 */ { UD_Iffree, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0437 */ { UD_Iffree, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0438 */ { UD_Iffree, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0439 */ { UD_Iffreep, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0440 */ { UD_Iffreep, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0441 */ { UD_Iffreep, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0442 */ { UD_Iffreep, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0443 */ { UD_Iffreep, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0444 */ { UD_Iffreep, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0445 */ { UD_Iffreep, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0446 */ { UD_Iffreep, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0447 */ { UD_Ificom, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0448 */ { UD_Ificom, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0449 */ { UD_Ificomp, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0450 */ { UD_Ificomp, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0451 */ { UD_Ifild, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0452 */ { UD_Ifild, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0453 */ { UD_Ifild, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0454 */ { UD_Ifincstp, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0455 */ { UD_Ifninit, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0456 */ { UD_Ifiadd, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0457 */ { UD_Ifiadd, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0458 */ { UD_Ifidivr, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0459 */ { UD_Ifidivr, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0460 */ { UD_Ifidiv, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0461 */ { UD_Ifidiv, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0462 */ { UD_Ifisub, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0463 */ { UD_Ifisub, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0464 */ { UD_Ifisubr, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0465 */ { UD_Ifisubr, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0466 */ { UD_Ifist, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0467 */ { UD_Ifist, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0468 */ { UD_Ifistp, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0469 */ { UD_Ifistp, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0470 */ { UD_Ifistp, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0471 */ { UD_Ifisttp, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0472 */ { UD_Ifisttp, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0473 */ { UD_Ifisttp, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0474 */ { UD_Ifld, O_Mt, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0475 */ { UD_Ifld, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0476 */ { UD_Ifld, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0477 */ { UD_Ifld, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0478 */ { UD_Ifld, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0479 */ { UD_Ifld, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0480 */ { UD_Ifld, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0481 */ { UD_Ifld, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0482 */ { UD_Ifld, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0483 */ { UD_Ifld, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0484 */ { UD_Ifld, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0485 */ { UD_Ifld1, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0486 */ { UD_Ifldl2t, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0487 */ { UD_Ifldl2e, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0488 */ { UD_Ifldpi, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0489 */ { UD_Ifldlg2, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0490 */ { UD_Ifldln2, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0491 */ { UD_Ifldz, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0492 */ { UD_Ifldcw, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0493 */ { UD_Ifldenv, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0494 */ { UD_Ifmul, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0495 */ { UD_Ifmul, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0496 */ { UD_Ifmul, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0497 */ { UD_Ifmul, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0498 */ { UD_Ifmul, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0499 */ { UD_Ifmul, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0500 */ { UD_Ifmul, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0501 */ { UD_Ifmul, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0502 */ { UD_Ifmul, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0503 */ { UD_Ifmul, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0504 */ { UD_Ifmul, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0505 */ { UD_Ifmul, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0506 */ { UD_Ifmul, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0507 */ { UD_Ifmul, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0508 */ { UD_Ifmul, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0509 */ { UD_Ifmul, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0510 */ { UD_Ifmul, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0511 */ { UD_Ifmul, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0512 */ { UD_Ifmulp, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0513 */ { UD_Ifmulp, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0514 */ { UD_Ifmulp, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0515 */ { UD_Ifmulp, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0516 */ { UD_Ifmulp, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0517 */ { UD_Ifmulp, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0518 */ { UD_Ifmulp, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0519 */ { UD_Ifmulp, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0520 */ { UD_Ifimul, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0521 */ { UD_Ifimul, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0522 */ { UD_Ifnop, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0523 */ { UD_Ifndisi, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0524 */ { UD_Ifneni, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0525 */ { UD_Ifnsetpm, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0526 */ { UD_Ifpatan, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0527 */ { UD_Ifprem, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0528 */ { UD_Ifprem1, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0529 */ { UD_Ifptan, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0530 */ { UD_Ifrndint, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0531 */ { UD_Ifrstor, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0532 */ { UD_Ifrstpm, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0533 */ { UD_Ifnsave, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0534 */ { UD_Ifscale, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0535 */ { UD_Ifsin, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0536 */ { UD_Ifsincos, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0537 */ { UD_Ifsqrt, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0538 */ { UD_Ifstp, O_Mt, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0539 */ { UD_Ifstp, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0540 */ { UD_Ifstp, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0541 */ { UD_Ifstp, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0542 */ { UD_Ifstp, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0543 */ { UD_Ifstp, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0544 */ { UD_Ifstp, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0545 */ { UD_Ifstp, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0546 */ { UD_Ifstp, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0547 */ { UD_Ifstp, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0548 */ { UD_Ifstp, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0549 */ { UD_Ifstp1, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0550 */ { UD_Ifstp1, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0551 */ { UD_Ifstp1, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0552 */ { UD_Ifstp1, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0553 */ { UD_Ifstp1, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0554 */ { UD_Ifstp1, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0555 */ { UD_Ifstp1, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0556 */ { UD_Ifstp1, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0557 */ { UD_Ifstp8, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0558 */ { UD_Ifstp8, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0559 */ { UD_Ifstp8, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0560 */ { UD_Ifstp8, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0561 */ { UD_Ifstp8, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0562 */ { UD_Ifstp8, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0563 */ { UD_Ifstp8, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0564 */ { UD_Ifstp8, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0565 */ { UD_Ifstp9, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0566 */ { UD_Ifstp9, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0567 */ { UD_Ifstp9, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0568 */ { UD_Ifstp9, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0569 */ { UD_Ifstp9, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0570 */ { UD_Ifstp9, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0571 */ { UD_Ifstp9, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0572 */ { UD_Ifstp9, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0573 */ { UD_Ifst, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0574 */ { UD_Ifst, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0575 */ { UD_Ifst, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0576 */ { UD_Ifst, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0577 */ { UD_Ifst, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0578 */ { UD_Ifst, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0579 */ { UD_Ifst, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0580 */ { UD_Ifst, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0581 */ { UD_Ifst, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0582 */ { UD_Ifst, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0583 */ { UD_Ifnstcw, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0584 */ { UD_Ifnstenv, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0585 */ { UD_Ifnstsw, O_Mw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0586 */ { UD_Ifnstsw, O_AX, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0587 */ { UD_Ifsub, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0588 */ { UD_Ifsub, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0589 */ { UD_Ifsub, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0590 */ { UD_Ifsub, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0591 */ { UD_Ifsub, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0592 */ { UD_Ifsub, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0593 */ { UD_Ifsub, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0594 */ { UD_Ifsub, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0595 */ { UD_Ifsub, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0596 */ { UD_Ifsub, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0597 */ { UD_Ifsub, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0598 */ { UD_Ifsub, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0599 */ { UD_Ifsub, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0600 */ { UD_Ifsub, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0601 */ { UD_Ifsub, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0602 */ { UD_Ifsub, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0603 */ { UD_Ifsub, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0604 */ { UD_Ifsub, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0605 */ { UD_Ifsubp, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0606 */ { UD_Ifsubp, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0607 */ { UD_Ifsubp, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0608 */ { UD_Ifsubp, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0609 */ { UD_Ifsubp, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0610 */ { UD_Ifsubp, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0611 */ { UD_Ifsubp, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0612 */ { UD_Ifsubp, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0613 */ { UD_Ifsubr, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0614 */ { UD_Ifsubr, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0615 */ { UD_Ifsubr, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0616 */ { UD_Ifsubr, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0617 */ { UD_Ifsubr, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0618 */ { UD_Ifsubr, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0619 */ { UD_Ifsubr, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0620 */ { UD_Ifsubr, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0621 */ { UD_Ifsubr, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0622 */ { UD_Ifsubr, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0623 */ { UD_Ifsubr, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0624 */ { UD_Ifsubr, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0625 */ { UD_Ifsubr, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0626 */ { UD_Ifsubr, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0627 */ { UD_Ifsubr, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0628 */ { UD_Ifsubr, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0629 */ { UD_Ifsubr, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0630 */ { UD_Ifsubr, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0631 */ { UD_Ifsubrp, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0632 */ { UD_Ifsubrp, O_ST1, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0633 */ { UD_Ifsubrp, O_ST2, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0634 */ { UD_Ifsubrp, O_ST3, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0635 */ { UD_Ifsubrp, O_ST4, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0636 */ { UD_Ifsubrp, O_ST5, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0637 */ { UD_Ifsubrp, O_ST6, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0638 */ { UD_Ifsubrp, O_ST7, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0639 */ { UD_Iftst, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0640 */ { UD_Ifucom, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0641 */ { UD_Ifucom, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0642 */ { UD_Ifucom, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0643 */ { UD_Ifucom, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0644 */ { UD_Ifucom, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0645 */ { UD_Ifucom, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0646 */ { UD_Ifucom, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0647 */ { UD_Ifucom, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0648 */ { UD_Ifucomp, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0649 */ { UD_Ifucomp, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0650 */ { UD_Ifucomp, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0651 */ { UD_Ifucomp, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0652 */ { UD_Ifucomp, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0653 */ { UD_Ifucomp, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0654 */ { UD_Ifucomp, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0655 */ { UD_Ifucomp, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0656 */ { UD_Ifucompp, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0657 */ { UD_Ifxam, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0658 */ { UD_Ifxch, O_ST0, O_ST0, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0659 */ { UD_Ifxch, O_ST0, O_ST1, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0660 */ { UD_Ifxch, O_ST0, O_ST2, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0661 */ { UD_Ifxch, O_ST0, O_ST3, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0662 */ { UD_Ifxch, O_ST0, O_ST4, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0663 */ { UD_Ifxch, O_ST0, O_ST5, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0664 */ { UD_Ifxch, O_ST0, O_ST6, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0665 */ { UD_Ifxch, O_ST0, O_ST7, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0666 */ { UD_Ifxch4, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0667 */ { UD_Ifxch4, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0668 */ { UD_Ifxch4, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0669 */ { UD_Ifxch4, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0670 */ { UD_Ifxch4, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0671 */ { UD_Ifxch4, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0672 */ { UD_Ifxch4, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0673 */ { UD_Ifxch4, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0674 */ { UD_Ifxch7, O_ST0, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0675 */ { UD_Ifxch7, O_ST1, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0676 */ { UD_Ifxch7, O_ST2, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0677 */ { UD_Ifxch7, O_ST3, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0678 */ { UD_Ifxch7, O_ST4, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0679 */ { UD_Ifxch7, O_ST5, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0680 */ { UD_Ifxch7, O_ST6, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0681 */ { UD_Ifxch7, O_ST7, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0682 */ { UD_Ifxrstor, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0683 */ { UD_Ifxsave, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0684 */ { UD_Ifxtract, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0685 */ { UD_Ifyl2x, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0686 */ { UD_Ifyl2xp1, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0687 */ { UD_Ihlt, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0688 */ { UD_Iidiv, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_R_RDX, UD_NONE}, {UD_R_RAX, UD_R_RDX, UD_NONE} },
-  /* 0689 */ { UD_Iidiv, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_NONE}, {UD_R_RAX, UD_NONE} },
-  /* 0690 */ { UD_Iin, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0691 */ { UD_Iin, O_eAX, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0692 */ { UD_Iin, O_AL, O_DX, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0693 */ { UD_Iin, O_eAX, O_DX, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0694 */ { UD_Iimul, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0695 */ { UD_Iimul, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AX, UD_NONE} },
-  /* 0696 */ { UD_Iimul, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_NONE}, {UD_R_RAX, UD_R_RDX, UD_NONE} },
-  /* 0697 */ { UD_Iimul, O_Gv, O_Ev, O_Iz, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0698 */ { UD_Iimul, O_Gv, O_Ev, O_sIb, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0699 */ { UD_Iinc, O_R0z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0700 */ { UD_Iinc, O_R1z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0701 */ { UD_Iinc, O_R2z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0702 */ { UD_Iinc, O_R3z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0703 */ { UD_Iinc, O_R4z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0704 */ { UD_Iinc, O_R5z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0705 */ { UD_Iinc, O_R6z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0706 */ { UD_Iinc, O_R7z, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0707 */ { UD_Iinc, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0708 */ { UD_Iinc, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0709 */ { UD_Iinsb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_DX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 0710 */ { UD_Iinsw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_oso|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_DX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 0711 */ { UD_Iinsd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_oso|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_DX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 0712 */ { UD_Iint1, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0713 */ { UD_Iint3, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0714 */ { UD_Iint, O_Ib, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0715 */ { UD_Iinto, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_RESET, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0716 */ { UD_Iinvd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0717 */ { UD_Iinvept, O_Gd, O_Mo, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0718 */ { UD_Iinvept, O_Gq, O_Mo, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0719 */ { UD_Iinvlpg, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0720 */ { UD_Iinvlpga, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0721 */ { UD_Iinvvpid, O_Gd, O_Mo, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0722 */ { UD_Iinvvpid, O_Gq, O_Mo, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0723 */ { UD_Iiretw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_TESTED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0724 */ { UD_Iiretd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_TESTED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0725 */ { UD_Iiretq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_TESTED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0726 */ { UD_Ijo, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0727 */ { UD_Ijo, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0728 */ { UD_Ijno, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0729 */ { UD_Ijno, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0730 */ { UD_Ijb, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0731 */ { UD_Ijb, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0732 */ { UD_Ijae, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0733 */ { UD_Ijae, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0734 */ { UD_Ije, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0735 */ { UD_Ije, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0736 */ { UD_Ijne, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0737 */ { UD_Ijne, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0738 */ { UD_Ijbe, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0739 */ { UD_Ijbe, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0740 */ { UD_Ija, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0741 */ { UD_Ija, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0742 */ { UD_Ijs, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0743 */ { UD_Ijs, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0744 */ { UD_Ijns, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0745 */ { UD_Ijns, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0746 */ { UD_Ijp, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0747 */ { UD_Ijp, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0748 */ { UD_Ijnp, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0749 */ { UD_Ijnp, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0750 */ { UD_Ijl, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0751 */ { UD_Ijl, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0752 */ { UD_Ijge, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0753 */ { UD_Ijge, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0754 */ { UD_Ijle, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0755 */ { UD_Ijle, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0756 */ { UD_Ijg, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0757 */ { UD_Ijg, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0758 */ { UD_Ijcxz, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0759 */ { UD_Ijecxz, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0760 */ { UD_Ijrcxz, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0761 */ { UD_Ijmp, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0762 */ { UD_Ijmp, O_Fv, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0763 */ { UD_Ijmp, O_Jz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0764 */ { UD_Ijmp, O_Av, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0765 */ { UD_Ijmp, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 0766 */ { UD_Ilahf, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_AH, UD_NONE} },
-  /* 0767 */ { UD_Ilar, O_Gv, O_Ew, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0768 */ { UD_Ildmxcsr, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0769 */ { UD_Ilds, O_Gv, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0770 */ { UD_Ilea, O_Gv, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0771 */ { UD_Iles, O_Gv, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_ES, UD_NONE}, {UD_NONE} },
-  /* 0772 */ { UD_Ilfs, O_Gz, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_FS, UD_NONE}, {UD_NONE} },
-  /* 0773 */ { UD_Ilgs, O_Gz, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_FS, UD_NONE}, {UD_NONE} },
-  /* 0774 */ { UD_Ilidt, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0775 */ { UD_Ilss, O_Gv, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_SS, UD_NONE}, {UD_NONE} },
-  /* 0776 */ { UD_Ileave, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RBP, UD_NONE}, {UD_R_RBP, UD_R_RSP, UD_NONE} },
-  /* 0777 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0778 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0779 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0780 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0781 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0782 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0783 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0784 */ { UD_Ilfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0785 */ { UD_Ilgdt, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0786 */ { UD_Illdt, O_Ew, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0787 */ { UD_Ilmsw, O_Ew, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_CR0, UD_NONE} },
-  /* 0788 */ { UD_Ilmsw, O_Ew, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_CR0, UD_NONE} },
-  /* 0789 */ { UD_Ilock, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0790 */ { UD_Ilodsb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_AL, UD_R_RSI, UD_NONE} },
-  /* 0791 */ { UD_Ilodsw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_AX, UD_R_RSI, UD_NONE} },
-  /* 0792 */ { UD_Ilodsd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_EAX, UD_R_RSI, UD_NONE} },
-  /* 0793 */ { UD_Ilodsq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RAX, UD_R_RSI, UD_NONE} },
-  /* 0794 */ { UD_Iloopne, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0795 */ { UD_Iloope, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0796 */ { UD_Iloop, O_Jb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0797 */ { UD_Ilsl, O_Gv, O_Ew, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0798 */ { UD_Iltr, O_Ew, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0799 */ { UD_Imaskmovq, O_P, O_N, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RDI, UD_NONE}, {UD_NONE} },
-  /* 0800 */ { UD_Imaxpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0801 */ { UD_Ivmaxpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0802 */ { UD_Imaxps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0803 */ { UD_Ivmaxps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0804 */ { UD_Imaxsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0805 */ { UD_Ivmaxsd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0806 */ { UD_Imaxss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0807 */ { UD_Ivmaxss, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0808 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0809 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0810 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0811 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0812 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0813 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0814 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0815 */ { UD_Imfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0816 */ { UD_Iminpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0817 */ { UD_Ivminpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0818 */ { UD_Iminps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0819 */ { UD_Ivminps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0820 */ { UD_Iminsd, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0821 */ { UD_Ivminsd, O_Vx, O_Hx, O_MqU, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0822 */ { UD_Iminss, O_V, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0823 */ { UD_Ivminss, O_Vx, O_Hx, O_MdU, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0824 */ { UD_Imonitor, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_R_RDX, UD_NONE}, {UD_NONE} },
-  /* 0825 */ { UD_Imontmul, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0826 */ { UD_Imov, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0827 */ { UD_Imov, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0828 */ { UD_Imov, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0829 */ { UD_Imov, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0830 */ { UD_Imov, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0831 */ { UD_Imov, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0832 */ { UD_Imov, O_MwRv, O_S, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0833 */ { UD_Imov, O_S, O_MwRv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0834 */ { UD_Imov, O_AL, O_Ob, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0835 */ { UD_Imov, O_rAX, O_Ov, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0836 */ { UD_Imov, O_Ob, O_AL, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0837 */ { UD_Imov, O_Ov, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0838 */ { UD_Imov, O_R0b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0839 */ { UD_Imov, O_R1b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0840 */ { UD_Imov, O_R2b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0841 */ { UD_Imov, O_R3b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0842 */ { UD_Imov, O_R4b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0843 */ { UD_Imov, O_R5b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0844 */ { UD_Imov, O_R6b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0845 */ { UD_Imov, O_R7b, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0846 */ { UD_Imov, O_R0v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0847 */ { UD_Imov, O_R1v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0848 */ { UD_Imov, O_R2v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0849 */ { UD_Imov, O_R3v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0850 */ { UD_Imov, O_R4v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0851 */ { UD_Imov, O_R5v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0852 */ { UD_Imov, O_R6v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0853 */ { UD_Imov, O_R7v, O_Iv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0854 */ { UD_Imov, O_R, O_C, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexr|P_rexw|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0855 */ { UD_Imov, O_R, O_D, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexr|P_rexw|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0856 */ { UD_Imov, O_C, O_R, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexr|P_rexw|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0857 */ { UD_Imov, O_D, O_R, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexr|P_rexw|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0858 */ { UD_Imovapd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0859 */ { UD_Ivmovapd, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0860 */ { UD_Imovapd, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0861 */ { UD_Ivmovapd, O_Wx, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0862 */ { UD_Imovaps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0863 */ { UD_Ivmovaps, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0864 */ { UD_Imovaps, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0865 */ { UD_Ivmovaps, O_Wx, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0866 */ { UD_Imovd, O_P, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0867 */ { UD_Imovd, O_P, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0868 */ { UD_Imovd, O_V, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0869 */ { UD_Ivmovd, O_Vx, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0870 */ { UD_Imovd, O_V, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0871 */ { UD_Ivmovd, O_Vx, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0872 */ { UD_Imovd, O_Ey, O_P, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0873 */ { UD_Imovd, O_Ey, O_P, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0874 */ { UD_Imovd, O_Ey, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0875 */ { UD_Ivmovd, O_Ey, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0876 */ { UD_Imovd, O_Ey, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0877 */ { UD_Ivmovd, O_Ey, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0878 */ { UD_Imovhpd, O_V, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0879 */ { UD_Ivmovhpd, O_Vx, O_Hx, O_M, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0880 */ { UD_Imovhpd, O_M, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0881 */ { UD_Ivmovhpd, O_M, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0882 */ { UD_Imovhps, O_V, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0883 */ { UD_Ivmovhps, O_Vx, O_Hx, O_M, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0884 */ { UD_Imovhps, O_M, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0885 */ { UD_Ivmovhps, O_M, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0886 */ { UD_Imovlhps, O_V, O_U, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0887 */ { UD_Ivmovlhps, O_Vx, O_Hx, O_Ux, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0888 */ { UD_Imovlpd, O_V, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0889 */ { UD_Ivmovlpd, O_Vx, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0890 */ { UD_Imovlpd, O_M, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0891 */ { UD_Ivmovlpd, O_M, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0892 */ { UD_Imovlps, O_V, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0893 */ { UD_Ivmovlps, O_Vx, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0894 */ { UD_Imovlps, O_M, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0895 */ { UD_Ivmovlps, O_M, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0896 */ { UD_Imovhlps, O_V, O_U, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0897 */ { UD_Ivmovhlps, O_Vx, O_Ux, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0898 */ { UD_Imovmskpd, O_Gd, O_U, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0899 */ { UD_Ivmovmskpd, O_Gd, O_Ux, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0900 */ { UD_Imovmskps, O_Gd, O_U, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0901 */ { UD_Ivmovmskps, O_Gd, O_Ux, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0902 */ { UD_Imovntdq, O_M, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0903 */ { UD_Ivmovntdq, O_M, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0904 */ { UD_Imovnti, O_M, O_Gy, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0905 */ { UD_Imovntpd, O_M, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0906 */ { UD_Ivmovntpd, O_M, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0907 */ { UD_Imovntps, O_M, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0908 */ { UD_Ivmovntps, O_M, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0909 */ { UD_Imovntq, O_M, O_P, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0910 */ { UD_Imovq, O_P, O_Eq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0911 */ { UD_Imovq, O_V, O_Eq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0912 */ { UD_Ivmovq, O_Vx, O_Eq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0913 */ { UD_Imovq, O_Eq, O_P, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0914 */ { UD_Imovq, O_Eq, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0915 */ { UD_Ivmovq, O_Eq, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0916 */ { UD_Imovq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0917 */ { UD_Ivmovq, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0918 */ { UD_Imovq, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0919 */ { UD_Ivmovq, O_Wx, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0920 */ { UD_Imovq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0921 */ { UD_Imovq, O_Q, O_P, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0922 */ { UD_Imovsb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_str|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0923 */ { UD_Imovsw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0924 */ { UD_Imovsd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0925 */ { UD_Imovsd, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0926 */ { UD_Imovsd, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0927 */ { UD_Imovsq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0928 */ { UD_Imovss, O_V, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0929 */ { UD_Imovss, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0930 */ { UD_Imovsx, O_Gv, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0931 */ { UD_Imovsx, O_Gy, O_Ew, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0932 */ { UD_Imovupd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0933 */ { UD_Ivmovupd, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0934 */ { UD_Imovupd, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0935 */ { UD_Ivmovupd, O_Wx, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0936 */ { UD_Imovups, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0937 */ { UD_Ivmovups, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0938 */ { UD_Imovups, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0939 */ { UD_Ivmovups, O_Wx, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0940 */ { UD_Imovzx, O_Gv, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0941 */ { UD_Imovzx, O_Gy, O_Ew, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0942 */ { UD_Imul, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AX, UD_NONE} },
-  /* 0943 */ { UD_Imul, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_NONE}, {UD_R_RAX, UD_R_RDX, UD_NONE} },
-  /* 0944 */ { UD_Imulpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0945 */ { UD_Ivmulpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0946 */ { UD_Imulps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0947 */ { UD_Ivmulps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0948 */ { UD_Imulsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0949 */ { UD_Ivmulsd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0950 */ { UD_Imulss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0951 */ { UD_Ivmulss, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0952 */ { UD_Imwait, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0953 */ { UD_Ineg, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0954 */ { UD_Ineg, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0955 */ { UD_Inop, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0956 */ { UD_Inop, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0957 */ { UD_Inop, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0958 */ { UD_Inop, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0959 */ { UD_Inop, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0960 */ { UD_Inop, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0961 */ { UD_Inop, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0962 */ { UD_Inot, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0963 */ { UD_Inot, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0964 */ { UD_Ior, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0965 */ { UD_Ior, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0966 */ { UD_Ior, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0967 */ { UD_Ior, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0968 */ { UD_Ior, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0969 */ { UD_Ior, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0970 */ { UD_Ior, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0971 */ { UD_Ior, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0972 */ { UD_Ior, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0973 */ { UD_Ior, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0974 */ { UD_Iorpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0975 */ { UD_Ivorpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0976 */ { UD_Iorps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0977 */ { UD_Ivorps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0978 */ { UD_Iout, O_Ib, O_AL, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0979 */ { UD_Iout, O_Ib, O_eAX, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0980 */ { UD_Iout, O_DX, O_AL, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0981 */ { UD_Iout, O_DX, O_eAX, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0982 */ { UD_Ioutsb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0983 */ { UD_Ioutsw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_oso|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0984 */ { UD_Ioutsd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_oso|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSI, UD_NONE}, {UD_R_RSI, UD_NONE} },
-  /* 0985 */ { UD_Ipacksswb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0986 */ { UD_Ivpacksswb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0987 */ { UD_Ipacksswb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0988 */ { UD_Ipackssdw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0989 */ { UD_Ivpackssdw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0990 */ { UD_Ipackssdw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0991 */ { UD_Ipackuswb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0992 */ { UD_Ivpackuswb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0993 */ { UD_Ipackuswb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0994 */ { UD_Ipaddb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0995 */ { UD_Ivpaddb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0996 */ { UD_Ipaddb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0997 */ { UD_Ipaddw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0998 */ { UD_Ipaddw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 0999 */ { UD_Ivpaddw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1000 */ { UD_Ipaddd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1001 */ { UD_Ipaddd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1002 */ { UD_Ivpaddd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1003 */ { UD_Ipaddsb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1004 */ { UD_Ipaddsb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1005 */ { UD_Ivpaddsb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1006 */ { UD_Ipaddsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1007 */ { UD_Ipaddsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1008 */ { UD_Ivpaddsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1009 */ { UD_Ipaddusb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1010 */ { UD_Ipaddusb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1011 */ { UD_Ivpaddusb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1012 */ { UD_Ipaddusw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1013 */ { UD_Ipaddusw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1014 */ { UD_Ivpaddusw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1015 */ { UD_Ipand, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1016 */ { UD_Ivpand, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1017 */ { UD_Ipand, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1018 */ { UD_Ipandn, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1019 */ { UD_Ivpandn, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1020 */ { UD_Ipandn, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1021 */ { UD_Ipavgb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1022 */ { UD_Ivpavgb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1023 */ { UD_Ipavgb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1024 */ { UD_Ipavgw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1025 */ { UD_Ivpavgw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1026 */ { UD_Ipavgw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1027 */ { UD_Ipcmpeqb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1028 */ { UD_Ipcmpeqb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1029 */ { UD_Ivpcmpeqb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1030 */ { UD_Ipcmpeqw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1031 */ { UD_Ipcmpeqw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1032 */ { UD_Ivpcmpeqw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1033 */ { UD_Ipcmpeqd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1034 */ { UD_Ipcmpeqd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1035 */ { UD_Ivpcmpeqd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1036 */ { UD_Ipcmpgtb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1037 */ { UD_Ivpcmpgtb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1038 */ { UD_Ipcmpgtb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1039 */ { UD_Ipcmpgtw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1040 */ { UD_Ivpcmpgtw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1041 */ { UD_Ipcmpgtw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1042 */ { UD_Ipcmpgtd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1043 */ { UD_Ivpcmpgtd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1044 */ { UD_Ipcmpgtd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1045 */ { UD_Ipextrb, O_MbRv, O_V, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexx|P_rexr|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1046 */ { UD_Ivpextrb, O_MbRv, O_Vx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexx|P_rexr|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1047 */ { UD_Ipextrd, O_Ed, O_V, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1048 */ { UD_Ivpextrd, O_Ed, O_Vx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1049 */ { UD_Ipextrd, O_Ed, O_V, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1050 */ { UD_Ivpextrd, O_Ed, O_Vx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1051 */ { UD_Ipextrq, O_Eq, O_V, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1052 */ { UD_Ivpextrq, O_Eq, O_Vx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1053 */ { UD_Ipextrw, O_Gd, O_U, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1054 */ { UD_Ivpextrw, O_Gd, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1055 */ { UD_Ipextrw, O_Gd, O_N, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1056 */ { UD_Ipextrw, O_MwRd, O_V, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexx|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1057 */ { UD_Ivpextrw, O_MwRd, O_Vx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexx|P_rexr|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1058 */ { UD_Ipinsrb, O_V, O_MbRd, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1059 */ { UD_Ipinsrw, O_P, O_MwRy, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1060 */ { UD_Ipinsrw, O_V, O_MwRy, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1061 */ { UD_Ivpinsrw, O_Vx, O_MwRy, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1062 */ { UD_Ipinsrd, O_V, O_Ed, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1063 */ { UD_Ipinsrd, O_V, O_Ed, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1064 */ { UD_Ipinsrq, O_V, O_Eq, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1065 */ { UD_Ivpinsrb, O_V, O_H, O_MbRd, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1066 */ { UD_Ivpinsrd, O_V, O_H, O_Ed, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1067 */ { UD_Ivpinsrd, O_V, O_H, O_Ed, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1068 */ { UD_Ivpinsrq, O_V, O_H, O_Eq, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1069 */ { UD_Ipmaddwd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1070 */ { UD_Ipmaddwd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1071 */ { UD_Ivpmaddwd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1072 */ { UD_Ipmaxsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1073 */ { UD_Ivpmaxsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1074 */ { UD_Ipmaxsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1075 */ { UD_Ipmaxub, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1076 */ { UD_Ipmaxub, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1077 */ { UD_Ivpmaxub, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1078 */ { UD_Ipminsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1079 */ { UD_Ivpminsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1080 */ { UD_Ipminsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1081 */ { UD_Ipminub, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1082 */ { UD_Ivpminub, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1083 */ { UD_Ipminub, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1084 */ { UD_Ipmovmskb, O_Gd, O_U, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1085 */ { UD_Ivpmovmskb, O_Gd, O_Ux, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1086 */ { UD_Ipmovmskb, O_Gd, O_N, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1087 */ { UD_Ipmulhuw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1088 */ { UD_Ipmulhuw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1089 */ { UD_Ivpmulhuw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1090 */ { UD_Ipmulhw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1091 */ { UD_Ivpmulhw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1092 */ { UD_Ipmulhw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1093 */ { UD_Ipmullw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1094 */ { UD_Ipmullw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1095 */ { UD_Ivpmullw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1096 */ { UD_Ipop, O_ES, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1097 */ { UD_Ipop, O_SS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1098 */ { UD_Ipop, O_DS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1099 */ { UD_Ipop, O_GS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1100 */ { UD_Ipop, O_FS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1101 */ { UD_Ipop, O_R0v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1102 */ { UD_Ipop, O_R1v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1103 */ { UD_Ipop, O_R2v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1104 */ { UD_Ipop, O_R3v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1105 */ { UD_Ipop, O_R4v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1106 */ { UD_Ipop, O_R5v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1107 */ { UD_Ipop, O_R6v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1108 */ { UD_Ipop, O_R7v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1109 */ { UD_Ipop, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1110 */ { UD_Ipopa, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_DI, UD_R_SI, UD_R_BP, UD_R_BX, UD_R_DX, UD_R_CX, UD_R_AX, UD_R_RBP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1111 */ { UD_Ipopad, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EDI, UD_R_ESI, UD_R_EBP, UD_R_EBX, UD_R_EDX, UD_R_ECX, UD_R_EAX, UD_R_RBP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1112 */ { UD_Ipopfw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1113 */ { UD_Ipopfd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1114 */ { UD_Ipopfq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1115 */ { UD_Ipopfq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1116 */ { UD_Ipor, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1117 */ { UD_Ivpor, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1118 */ { UD_Ipor, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1119 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1120 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1121 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1122 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1123 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1124 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1125 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1126 */ { UD_Iprefetch, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1127 */ { UD_Iprefetchnta, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1128 */ { UD_Iprefetcht0, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1129 */ { UD_Iprefetcht1, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1130 */ { UD_Iprefetcht2, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1131 */ { UD_Ipsadbw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1132 */ { UD_Ivpsadbw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1133 */ { UD_Ipsadbw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1134 */ { UD_Ipshufw, O_P, O_Q, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1135 */ { UD_Ipsllw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1136 */ { UD_Ipsllw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1137 */ { UD_Ipsllw, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1138 */ { UD_Ipsllw, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1139 */ { UD_Ipslld, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1140 */ { UD_Ipslld, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1141 */ { UD_Ipslld, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1142 */ { UD_Ipslld, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1143 */ { UD_Ipsllq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1144 */ { UD_Ipsllq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1145 */ { UD_Ipsllq, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1146 */ { UD_Ipsllq, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1147 */ { UD_Ipsraw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1148 */ { UD_Ipsraw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1149 */ { UD_Ivpsraw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1150 */ { UD_Ipsraw, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1151 */ { UD_Ivpsraw, O_Hx, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1152 */ { UD_Ipsraw, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1153 */ { UD_Ipsrad, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1154 */ { UD_Ipsrad, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1155 */ { UD_Ivpsrad, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1156 */ { UD_Ipsrad, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1157 */ { UD_Ipsrad, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1158 */ { UD_Ivpsrad, O_Hx, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1159 */ { UD_Ipsrlw, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1160 */ { UD_Ipsrlw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1161 */ { UD_Ipsrlw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1162 */ { UD_Ivpsrlw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1163 */ { UD_Ipsrlw, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1164 */ { UD_Ivpsrlw, O_Hx, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1165 */ { UD_Ipsrld, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1166 */ { UD_Ipsrld, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1167 */ { UD_Ipsrld, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1168 */ { UD_Ivpsrld, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1169 */ { UD_Ipsrld, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1170 */ { UD_Ivpsrld, O_Hx, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1171 */ { UD_Ipsrlq, O_N, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1172 */ { UD_Ipsrlq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1173 */ { UD_Ipsrlq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1174 */ { UD_Ivpsrlq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1175 */ { UD_Ipsrlq, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1176 */ { UD_Ivpsrlq, O_Hx, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1177 */ { UD_Ipsubb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1178 */ { UD_Ivpsubb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1179 */ { UD_Ipsubb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1180 */ { UD_Ipsubw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1181 */ { UD_Ivpsubw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1182 */ { UD_Ipsubw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1183 */ { UD_Ipsubd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1184 */ { UD_Ipsubd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1185 */ { UD_Ivpsubd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1186 */ { UD_Ipsubsb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1187 */ { UD_Ipsubsb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1188 */ { UD_Ivpsubsb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1189 */ { UD_Ipsubsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1190 */ { UD_Ipsubsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1191 */ { UD_Ivpsubsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1192 */ { UD_Ipsubusb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1193 */ { UD_Ipsubusb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1194 */ { UD_Ivpsubusb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1195 */ { UD_Ipsubusw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1196 */ { UD_Ipsubusw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1197 */ { UD_Ivpsubusw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1198 */ { UD_Ipunpckhbw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1199 */ { UD_Ivpunpckhbw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1200 */ { UD_Ipunpckhbw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1201 */ { UD_Ipunpckhwd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1202 */ { UD_Ivpunpckhwd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1203 */ { UD_Ipunpckhwd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1204 */ { UD_Ipunpckhdq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1205 */ { UD_Ivpunpckhdq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1206 */ { UD_Ipunpckhdq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1207 */ { UD_Ipunpcklbw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1208 */ { UD_Ivpunpcklbw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1209 */ { UD_Ipunpcklbw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1210 */ { UD_Ipunpcklwd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1211 */ { UD_Ivpunpcklwd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1212 */ { UD_Ipunpcklwd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1213 */ { UD_Ipunpckldq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1214 */ { UD_Ivpunpckldq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1215 */ { UD_Ipunpckldq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1216 */ { UD_Ipi2fw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1217 */ { UD_Ipi2fd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1218 */ { UD_Ipf2iw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1219 */ { UD_Ipf2id, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1220 */ { UD_Ipfnacc, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1221 */ { UD_Ipfpnacc, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1222 */ { UD_Ipfcmpge, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1223 */ { UD_Ipfmin, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1224 */ { UD_Ipfrcp, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1225 */ { UD_Ipfrsqrt, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1226 */ { UD_Ipfsub, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1227 */ { UD_Ipfadd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1228 */ { UD_Ipfcmpgt, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1229 */ { UD_Ipfmax, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1230 */ { UD_Ipfrcpit1, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1231 */ { UD_Ipfrsqit1, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1232 */ { UD_Ipfsubr, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1233 */ { UD_Ipfacc, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1234 */ { UD_Ipfcmpeq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1235 */ { UD_Ipfmul, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1236 */ { UD_Ipfrcpit2, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1237 */ { UD_Ipmulhrw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1238 */ { UD_Ipswapd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1239 */ { UD_Ipavgusb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1240 */ { UD_Ipush, O_ES, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1241 */ { UD_Ipush, O_CS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1242 */ { UD_Ipush, O_SS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1243 */ { UD_Ipush, O_DS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1244 */ { UD_Ipush, O_GS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1245 */ { UD_Ipush, O_FS, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1246 */ { UD_Ipush, O_R0v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1247 */ { UD_Ipush, O_R1v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1248 */ { UD_Ipush, O_R2v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1249 */ { UD_Ipush, O_R3v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1250 */ { UD_Ipush, O_R4v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1251 */ { UD_Ipush, O_R5v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1252 */ { UD_Ipush, O_R6v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1253 */ { UD_Ipush, O_R7v, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1254 */ { UD_Ipush, O_sIz, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1255 */ { UD_Ipush, O_Ev, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1256 */ { UD_Ipush, O_sIb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1257 */ { UD_Ipusha, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_R_CX, UD_R_DX, UD_R_BX, UD_R_BP, UD_R_SI, UD_R_DI, UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1258 */ { UD_Ipushad, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_ECX, UD_R_EDX, UD_R_EBX, UD_R_EBP, UD_R_ESI, UD_R_EDI, UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1259 */ { UD_Ipushfw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1260 */ { UD_Ipushfw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1261 */ { UD_Ipushfd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1262 */ { UD_Ipushfq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1263 */ { UD_Ipushfq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_NONE} },
-  /* 1264 */ { UD_Ipxor, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1265 */ { UD_Ivpxor, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1266 */ { UD_Ipxor, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1267 */ { UD_Ircl, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1268 */ { UD_Ircl, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1269 */ { UD_Ircl, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1270 */ { UD_Ircl, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1271 */ { UD_Ircl, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1272 */ { UD_Ircl, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1273 */ { UD_Ircr, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1274 */ { UD_Ircr, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1275 */ { UD_Ircr, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1276 */ { UD_Ircr, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1277 */ { UD_Ircr, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1278 */ { UD_Ircr, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1279 */ { UD_Irol, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1280 */ { UD_Irol, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1281 */ { UD_Irol, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1282 */ { UD_Irol, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1283 */ { UD_Irol, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1284 */ { UD_Irol, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1285 */ { UD_Iror, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1286 */ { UD_Iror, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1287 */ { UD_Iror, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1288 */ { UD_Iror, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1289 */ { UD_Iror, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1290 */ { UD_Iror, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1291 */ { UD_Ircpps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1292 */ { UD_Ivrcpps, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1293 */ { UD_Ircpss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1294 */ { UD_Ivrcpss, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1295 */ { UD_Irdmsr, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_ECX, UD_NONE}, {UD_R_RDX, UD_R_RAX, UD_NONE} },
-  /* 1296 */ { UD_Irdpmc, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_ECX, UD_NONE}, {UD_R_RDX, UD_R_RAX, UD_NONE} },
-  /* 1297 */ { UD_Irdtsc, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RDX, UD_R_RAX, UD_NONE} },
-  /* 1298 */ { UD_Irdtscp, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_ECX, UD_R_EDX, UD_R_EAX, UD_NONE} },
-  /* 1299 */ { UD_Irepne, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RCX, UD_NONE}, {UD_R_RCX, UD_NONE} },
-  /* 1300 */ { UD_Irep, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RCX, UD_NONE}, {UD_R_RCX, UD_NONE} },
-  /* 1301 */ { UD_Iret, O_Iw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1302 */ { UD_Iret, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1303 */ { UD_Iretf, O_Iw, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1304 */ { UD_Iretf, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RSP, UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1305 */ { UD_Irsm, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED}, {UD_NONE}, {UD_NONE} },
-  /* 1306 */ { UD_Irsqrtps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1307 */ { UD_Ivrsqrtps, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1308 */ { UD_Irsqrtss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1309 */ { UD_Ivrsqrtss, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1310 */ { UD_Isahf, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_PRIOR, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AH, UD_NONE}, {UD_NONE} },
-  /* 1311 */ { UD_Isalc, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_inv64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1312 */ { UD_Isar, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1313 */ { UD_Isar, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1314 */ { UD_Isar, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1315 */ { UD_Isar, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1316 */ { UD_Isar, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1317 */ { UD_Isar, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1318 */ { UD_Ishl, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1319 */ { UD_Ishl, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1320 */ { UD_Ishl, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1321 */ { UD_Ishl, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1322 */ { UD_Ishl, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1323 */ { UD_Ishl, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1324 */ { UD_Ishl, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1325 */ { UD_Ishl, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1326 */ { UD_Ishl, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1327 */ { UD_Ishl, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1328 */ { UD_Ishl, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1329 */ { UD_Ishl, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1330 */ { UD_Ishr, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1331 */ { UD_Ishr, O_Eb, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1332 */ { UD_Ishr, O_Ev, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1333 */ { UD_Ishr, O_Eb, O_I1, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1334 */ { UD_Ishr, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1335 */ { UD_Ishr, O_Ev, O_CL, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1336 */ { UD_Isbb, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1337 */ { UD_Isbb, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1338 */ { UD_Isbb, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1339 */ { UD_Isbb, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1340 */ { UD_Isbb, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_NONE}, {UD_R_AL, UD_NONE} },
-  /* 1341 */ { UD_Isbb, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_NONE}, {UD_R_EAX, UD_NONE} },
-  /* 1342 */ { UD_Isbb, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1343 */ { UD_Isbb, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1344 */ { UD_Isbb, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_inv64, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1345 */ { UD_Isbb, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1346 */ { UD_Iscasb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1347 */ { UD_Iscasw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz|P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1348 */ { UD_Iscasd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz|P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1349 */ { UD_Iscasq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_strz|P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1350 */ { UD_Iseto, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1351 */ { UD_Isetno, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1352 */ { UD_Isetb, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1353 */ { UD_Isetae, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1354 */ { UD_Isete, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1355 */ { UD_Isetne, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1356 */ { UD_Isetbe, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1357 */ { UD_Iseta, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1358 */ { UD_Isets, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1359 */ { UD_Isetns, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1360 */ { UD_Isetp, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1361 */ { UD_Isetnp, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1362 */ { UD_Isetl, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1363 */ { UD_Isetge, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1364 */ { UD_Isetle, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1365 */ { UD_Isetg, O_Eb, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_TESTED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1366 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1367 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1368 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1369 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1370 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1371 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1372 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1373 */ { UD_Isfence, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1374 */ { UD_Isgdt, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1375 */ { UD_Ishld, O_Ev, O_Gv, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1376 */ { UD_Ishld, O_Ev, O_Gv, O_CL, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1377 */ { UD_Ishrd, O_Ev, O_Gv, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1378 */ { UD_Ishrd, O_Ev, O_Gv, O_CL, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1379 */ { UD_Ishufpd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1380 */ { UD_Ivshufpd, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1381 */ { UD_Ishufps, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1382 */ { UD_Ivshufps, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1383 */ { UD_Isidt, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1384 */ { UD_Isldt, O_MwRv, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1385 */ { UD_Ismsw, O_MwRv, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1386 */ { UD_Ismsw, O_MwRv, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1387 */ { UD_Isqrtps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1388 */ { UD_Ivsqrtps, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1389 */ { UD_Isqrtpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1390 */ { UD_Ivsqrtpd, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1391 */ { UD_Isqrtsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1392 */ { UD_Ivsqrtsd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1393 */ { UD_Isqrtss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1394 */ { UD_Ivsqrtss, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1395 */ { UD_Istc, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_SET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1396 */ { UD_Istd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_SET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1397 */ { UD_Istgi, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1398 */ { UD_Isti, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_SET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1399 */ { UD_Iskinit, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_RAX, UD_R_RBX, UD_R_RCX, UD_R_RDX, UD_R_RSI, UD_R_RDI, UD_R_RBP, UD_R_RSP, UD_R_CR0, UD_NONE} },
-  /* 1400 */ { UD_Istmxcsr, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1401 */ { UD_Ivstmxcsr, O_Md, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1402 */ { UD_Istosb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1403 */ { UD_Istosw, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1404 */ { UD_Istosd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1405 */ { UD_Istosq, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_str|P_seg|P_oso|P_rexw, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RAX, UD_R_RDI, UD_NONE}, {UD_R_RDI, UD_NONE} },
-  /* 1406 */ { UD_Istr, O_MwRv, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1407 */ { UD_Isub, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1408 */ { UD_Isub, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1409 */ { UD_Isub, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1410 */ { UD_Isub, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1411 */ { UD_Isub, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1412 */ { UD_Isub, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1413 */ { UD_Isub, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1414 */ { UD_Isub, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1415 */ { UD_Isub, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_inv64, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1416 */ { UD_Isub, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1417 */ { UD_Isubpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1418 */ { UD_Ivsubpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1419 */ { UD_Isubps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1420 */ { UD_Ivsubps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1421 */ { UD_Isubsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1422 */ { UD_Ivsubsd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1423 */ { UD_Isubss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1424 */ { UD_Ivsubss, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1425 */ { UD_Iswapgs, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_GS, UD_NONE} },
-  /* 1426 */ { UD_Isyscall, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED}, {UD_R_RIP, UD_NONE}, {UD_R_RCX, UD_R_R11, UD_R_RIP, UD_NONE} },
-  /* 1427 */ { UD_Isysenter, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED}, {UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1428 */ { UD_Isysenter, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED}, {UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1429 */ { UD_Isysexit, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED}, {UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1430 */ { UD_Isysexit, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED}, {UD_NONE}, {UD_R_RSP, UD_R_RIP, UD_NONE} },
-  /* 1431 */ { UD_Isysret, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED}, {UD_R_RCX, UD_NONE}, {UD_R_RIP, UD_NONE} },
-  /* 1432 */ { UD_Itest, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1433 */ { UD_Itest, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1434 */ { UD_Itest, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1435 */ { UD_Itest, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1436 */ { UD_Itest, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1437 */ { UD_Itest, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1438 */ { UD_Itest, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1439 */ { UD_Itest, O_Ev, O_Iz, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1440 */ { UD_Iucomisd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1441 */ { UD_Ivucomisd, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1442 */ { UD_Iucomiss, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1443 */ { UD_Ivucomiss, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1444 */ { UD_Iud2, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1445 */ { UD_Iunpckhpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1446 */ { UD_Ivunpckhpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1447 */ { UD_Iunpckhps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1448 */ { UD_Ivunpckhps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1449 */ { UD_Iunpcklps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1450 */ { UD_Ivunpcklps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1451 */ { UD_Iunpcklpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1452 */ { UD_Ivunpcklpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1453 */ { UD_Iverr, O_Ew, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1454 */ { UD_Iverw, O_Ew, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1455 */ { UD_Ivmcall, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1456 */ { UD_Irdrand, O_R, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1457 */ { UD_Ivmclear, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1458 */ { UD_Ivmxon, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1459 */ { UD_Ivmptrld, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1460 */ { UD_Ivmptrst, O_Mq, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1461 */ { UD_Ivmlaunch, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1462 */ { UD_Ivmresume, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1463 */ { UD_Ivmxoff, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1464 */ { UD_Ivmread, O_Ey, O_Gy, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1465 */ { UD_Ivmwrite, O_Gy, O_Ey, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_def64, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1466 */ { UD_Ivmrun, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1467 */ { UD_Ivmmcall, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1468 */ { UD_Ivmload, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1469 */ { UD_Ivmsave, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1470 */ { UD_Iwait, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1471 */ { UD_Iwbinvd, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1472 */ { UD_Iwrmsr, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EDX, UD_R_EAX, UD_NONE}, {UD_NONE} },
-  /* 1473 */ { UD_Ixadd, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_WRITE, P_aso|P_oso|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1474 */ { UD_Ixadd, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_WRITE, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1475 */ { UD_Ixchg, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1476 */ { UD_Ixchg, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1477 */ { UD_Ixchg, O_R0v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1478 */ { UD_Ixchg, O_R1v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1479 */ { UD_Ixchg, O_R2v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1480 */ { UD_Ixchg, O_R3v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1481 */ { UD_Ixchg, O_R4v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1482 */ { UD_Ixchg, O_R5v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1483 */ { UD_Ixchg, O_R6v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1484 */ { UD_Ixchg, O_R7v, O_rAX, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1485 */ { UD_Ixgetbv, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_ECX, UD_NONE}, {UD_R_EDX, UD_R_EAX, UD_NONE} },
-  /* 1486 */ { UD_Ixlatb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_rexw|P_seg, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_AL, UD_R_EBX, UD_NONE}, {UD_R_AL, UD_NONE} },
-  /* 1487 */ { UD_Ixor, O_Eb, O_Gb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1488 */ { UD_Ixor, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1489 */ { UD_Ixor, O_Gb, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1490 */ { UD_Ixor, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1491 */ { UD_Ixor, O_AL, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_none, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1492 */ { UD_Ixor, O_rAX, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1493 */ { UD_Ixor, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1494 */ { UD_Ixor, O_Ev, O_sIz, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1495 */ { UD_Ixor, O_Eb, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_inv64, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1496 */ { UD_Ixor, O_Ev, O_sIb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1497 */ { UD_Ixorpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1498 */ { UD_Ivxorpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1499 */ { UD_Ixorps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1500 */ { UD_Ivxorps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1501 */ { UD_Ixcryptecb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_EDX, UD_R_EBX, UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 1502 */ { UD_Ixcryptcbc, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_EDX, UD_R_EBX, UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 1503 */ { UD_Ixcryptctr, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_EDX, UD_R_EBX, UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 1504 */ { UD_Ixcryptcfb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_EDX, UD_R_EBX, UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 1505 */ { UD_Ixcryptofb, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_EDX, UD_R_EBX, UD_R_RSI, UD_R_RDI, UD_NONE}, {UD_R_RSI, UD_R_RDI, UD_NONE} },
-  /* 1506 */ { UD_Ixrstor, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EDX, UD_R_EAX, UD_NONE}, {UD_NONE} },
-  /* 1507 */ { UD_Ixsave, O_M, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_EDX, UD_R_EAX, UD_NONE} },
-  /* 1508 */ { UD_Ixsetbv, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EDX, UD_R_EAX, UD_NONE}, {UD_NONE} },
-  /* 1509 */ { UD_Ixsha1, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_ESI, UD_R_EDI, UD_NONE}, {UD_R_EAX, UD_R_ESI, UD_R_EDI, UD_NONE} },
-  /* 1510 */ { UD_Ixsha256, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EAX, UD_R_ESI, UD_R_EDI, UD_NONE}, {UD_R_EAX, UD_R_ESI, UD_R_EDI, UD_NONE} },
-  /* 1511 */ { UD_Ixstore, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_EDX, UD_R_EDI, UD_NONE}, {UD_R_EAX, UD_R_EDI, UD_NONE} },
-  /* 1512 */ { UD_Ipclmulqdq, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1513 */ { UD_Ivpclmulqdq, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1514 */ { UD_Igetsec, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1515 */ { UD_Imovdqa, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1516 */ { UD_Ivmovdqa, O_Wx, O_Vx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1517 */ { UD_Imovdqa, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1518 */ { UD_Ivmovdqa, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1519 */ { UD_Imaskmovdqu, O_V, O_U, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RDI, UD_NONE}, {UD_NONE} },
-  /* 1520 */ { UD_Ivmaskmovdqu, O_Vx, O_Ux, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_R_RDI, UD_NONE}, {UD_NONE} },
-  /* 1521 */ { UD_Imovdq2q, O_P, O_U, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1522 */ { UD_Imovdqu, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1523 */ { UD_Ivmovdqu, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1524 */ { UD_Imovdqu, O_W, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1525 */ { UD_Imovq2dq, O_V, O_N, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1526 */ { UD_Ipaddq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1527 */ { UD_Ipaddq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1528 */ { UD_Ivpaddq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1529 */ { UD_Ipsubq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1530 */ { UD_Ivpsubq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1531 */ { UD_Ipsubq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1532 */ { UD_Ipmuludq, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1533 */ { UD_Ipmuludq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1534 */ { UD_Ipshufhw, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1535 */ { UD_Ivpshufhw, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1536 */ { UD_Ipshuflw, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1537 */ { UD_Ivpshuflw, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1538 */ { UD_Ipshufd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1539 */ { UD_Ivpshufd, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1540 */ { UD_Ipslldq, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1541 */ { UD_Ivpslldq, O_Hx, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1542 */ { UD_Ipsrldq, O_U, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1543 */ { UD_Ivpsrldq, O_Hx, O_Ux, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1544 */ { UD_Ipunpckhqdq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1545 */ { UD_Ivpunpckhqdq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1546 */ { UD_Ipunpcklqdq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1547 */ { UD_Ivpunpcklqdq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1548 */ { UD_Ihaddpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1549 */ { UD_Ivhaddpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1550 */ { UD_Ihaddps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1551 */ { UD_Ivhaddps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1552 */ { UD_Ihsubpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1553 */ { UD_Ivhsubpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1554 */ { UD_Ihsubps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1555 */ { UD_Ivhsubps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1556 */ { UD_Iinsertps, O_V, O_Md, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1557 */ { UD_Ivinsertps, O_Vx, O_Hx, O_Md, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1558 */ { UD_Ilddqu, O_V, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1559 */ { UD_Ivlddqu, O_Vx, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1560 */ { UD_Imovddup, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1561 */ { UD_Ivmovddup, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1562 */ { UD_Imovddup, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1563 */ { UD_Ivmovddup, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1564 */ { UD_Imovshdup, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1565 */ { UD_Ivmovshdup, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1566 */ { UD_Imovshdup, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1567 */ { UD_Ivmovshdup, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1568 */ { UD_Imovsldup, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1569 */ { UD_Ivmovsldup, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1570 */ { UD_Imovsldup, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1571 */ { UD_Ivmovsldup, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1572 */ { UD_Ipabsb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1573 */ { UD_Ipabsb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1574 */ { UD_Ivpabsb, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1575 */ { UD_Ipabsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1576 */ { UD_Ipabsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1577 */ { UD_Ivpabsw, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1578 */ { UD_Ipabsd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1579 */ { UD_Ipabsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1580 */ { UD_Ivpabsd, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1581 */ { UD_Ipshufb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1582 */ { UD_Ipshufb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1583 */ { UD_Ivpshufb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1584 */ { UD_Iphaddw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1585 */ { UD_Iphaddw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1586 */ { UD_Ivphaddw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1587 */ { UD_Iphaddd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1588 */ { UD_Iphaddd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1589 */ { UD_Ivphaddd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1590 */ { UD_Iphaddsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1591 */ { UD_Iphaddsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1592 */ { UD_Ivphaddsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1593 */ { UD_Ipmaddubsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1594 */ { UD_Ipmaddubsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1595 */ { UD_Ivpmaddubsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1596 */ { UD_Iphsubw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1597 */ { UD_Iphsubw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1598 */ { UD_Ivphsubw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1599 */ { UD_Iphsubd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1600 */ { UD_Iphsubd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1601 */ { UD_Ivphsubd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1602 */ { UD_Iphsubsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1603 */ { UD_Iphsubsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1604 */ { UD_Ivphsubsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1605 */ { UD_Ipsignb, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1606 */ { UD_Ipsignb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1607 */ { UD_Ivpsignb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1608 */ { UD_Ipsignd, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1609 */ { UD_Ipsignd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1610 */ { UD_Ivpsignd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1611 */ { UD_Ipsignw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1612 */ { UD_Ipsignw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1613 */ { UD_Ivpsignw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1614 */ { UD_Ipmulhrsw, O_P, O_Q, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1615 */ { UD_Ipmulhrsw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1616 */ { UD_Ivpmulhrsw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1617 */ { UD_Ipalignr, O_P, O_Q, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1618 */ { UD_Ipalignr, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1619 */ { UD_Ivpalignr, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1620 */ { UD_Ipblendvb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1621 */ { UD_Ipmuldq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1622 */ { UD_Ivpmuldq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1623 */ { UD_Ipminsb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1624 */ { UD_Ivpminsb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1625 */ { UD_Ipminsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1626 */ { UD_Ivpminsd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1627 */ { UD_Ipminuw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1628 */ { UD_Ivpminuw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1629 */ { UD_Ipminud, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1630 */ { UD_Ivpminud, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1631 */ { UD_Ipmaxsb, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1632 */ { UD_Ivpmaxsb, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1633 */ { UD_Ipmaxsd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1634 */ { UD_Ivpmaxsd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1635 */ { UD_Ipmaxud, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1636 */ { UD_Ivpmaxud, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1637 */ { UD_Ipmaxuw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1638 */ { UD_Ivpmaxuw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1639 */ { UD_Ipmulld, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1640 */ { UD_Ivpmulld, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1641 */ { UD_Iphminposuw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1642 */ { UD_Ivphminposuw, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1643 */ { UD_Iroundps, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1644 */ { UD_Ivroundps, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1645 */ { UD_Iroundpd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1646 */ { UD_Ivroundpd, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1647 */ { UD_Iroundss, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1648 */ { UD_Ivroundss, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1649 */ { UD_Iroundsd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1650 */ { UD_Ivroundsd, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1651 */ { UD_Iblendpd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1652 */ { UD_Ivblendpd, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1653 */ { UD_Iblendps, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1654 */ { UD_Ivblendps, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1655 */ { UD_Iblendvpd, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1656 */ { UD_Iblendvps, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1657 */ { UD_Ibound, O_Gv, O_M, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1658 */ { UD_Ibsf, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1659 */ { UD_Ibsr, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1660 */ { UD_Ibswap, O_R0y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1661 */ { UD_Ibswap, O_R1y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1662 */ { UD_Ibswap, O_R2y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1663 */ { UD_Ibswap, O_R3y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1664 */ { UD_Ibswap, O_R4y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1665 */ { UD_Ibswap, O_R5y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1666 */ { UD_Ibswap, O_R6y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1667 */ { UD_Ibswap, O_R7y, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_oso|P_rexw|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1668 */ { UD_Ibt, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1669 */ { UD_Ibt, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1670 */ { UD_Ibtc, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1671 */ { UD_Ibtc, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1672 */ { UD_Ibtr, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1673 */ { UD_Ibtr, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1674 */ { UD_Ibts, O_Ev, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1675 */ { UD_Ibts, O_Ev, O_Ib, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexw|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_UNDEFINED, UD_FLAG_MODIFIED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1676 */ { UD_Ipblendw, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1677 */ { UD_Ivpblendw, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1678 */ { UD_Impsadbw, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1679 */ { UD_Ivmpsadbw, O_Vx, O_Hx, O_Wx, O_Ib, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1680 */ { UD_Imovntdqa, O_V, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1681 */ { UD_Ivmovntdqa, O_Vx, O_M, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1682 */ { UD_Ipackusdw, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1683 */ { UD_Ivpackusdw, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1684 */ { UD_Ipmovsxbw, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1685 */ { UD_Ivpmovsxbw, O_Vx, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1686 */ { UD_Ipmovsxbd, O_V, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1687 */ { UD_Ivpmovsxbd, O_Vx, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1688 */ { UD_Ipmovsxbq, O_V, O_MwU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1689 */ { UD_Ivpmovsxbq, O_Vx, O_MwU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1690 */ { UD_Ipmovsxwd, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1691 */ { UD_Ivpmovsxwd, O_Vx, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1692 */ { UD_Ipmovsxwq, O_V, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1693 */ { UD_Ivpmovsxwq, O_Vx, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1694 */ { UD_Ipmovsxdq, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1695 */ { UD_Ipmovzxbw, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1696 */ { UD_Ivpmovzxbw, O_Vx, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1697 */ { UD_Ipmovzxbd, O_V, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1698 */ { UD_Ivpmovzxbd, O_Vx, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1699 */ { UD_Ipmovzxbq, O_V, O_MwU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1700 */ { UD_Ivpmovzxbq, O_Vx, O_MwU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1701 */ { UD_Ipmovzxwd, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1702 */ { UD_Ivpmovzxwd, O_Vx, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1703 */ { UD_Ipmovzxwq, O_V, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1704 */ { UD_Ivpmovzxwq, O_Vx, O_MdU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1705 */ { UD_Ipmovzxdq, O_V, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1706 */ { UD_Ivpmovzxdq, O_Vx, O_MqU, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1707 */ { UD_Ipcmpeqq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1708 */ { UD_Ivpcmpeqq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1709 */ { UD_Ipopcnt, O_Gv, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_MODIFIED, UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_RESET, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1710 */ { UD_Iptest, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1711 */ { UD_Ivptest, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1712 */ { UD_Ipcmpestri, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1713 */ { UD_Ivpcmpestri, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1714 */ { UD_Ipcmpestrm, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1715 */ { UD_Ivpcmpestrm, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1716 */ { UD_Ipcmpgtq, O_V, O_W, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1717 */ { UD_Ivpcmpgtq, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1718 */ { UD_Ipcmpistri, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1719 */ { UD_Ivpcmpistri, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1720 */ { UD_Ipcmpistrm, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1721 */ { UD_Ivpcmpistrm, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1722 */ { UD_Imovbe, O_Gv, O_Mv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1723 */ { UD_Imovbe, O_Mv, O_Gv, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1724 */ { UD_Icrc32, O_Gy, O_Eb, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1725 */ { UD_Icrc32, O_Gy, O_Ev, O_NONE, O_NONE, UD_OP_ACCESS_READ | UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_oso|P_rexr|P_rexw|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1726 */ { UD_Ivbroadcastss, O_V, O_Md, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1727 */ { UD_Ivbroadcastsd, O_Vqq, O_Mq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1728 */ { UD_Ivextractf128, O_Wdq, O_Vqq, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1729 */ { UD_Ivinsertf128, O_Vqq, O_Hqq, O_Wdq, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1730 */ { UD_Ivmaskmovps, O_V, O_H, O_M, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1731 */ { UD_Ivmaskmovps, O_M, O_H, O_V, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1732 */ { UD_Ivmaskmovpd, O_V, O_H, O_M, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1733 */ { UD_Ivmaskmovpd, O_M, O_H, O_V, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1734 */ { UD_Ivpermilpd, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1735 */ { UD_Ivpermilpd, O_V, O_W, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1736 */ { UD_Ivpermilps, O_Vx, O_Hx, O_Wx, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1737 */ { UD_Ivpermilps, O_Vx, O_Wx, O_Ib, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1738 */ { UD_Ivperm2f128, O_Vqq, O_Hqq, O_Wqq, O_Ib, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1739 */ { UD_Ivtestps, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1740 */ { UD_Ivtestpd, O_Vx, O_Wx, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1741 */ { UD_Ivzeroupper, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_YMM0, UD_R_YMM1, UD_R_YMM2, UD_R_YMM3, UD_R_YMM4, UD_R_YMM5, UD_R_YMM6, UD_R_YMM7, UD_R_YMM8, UD_R_YMM9, UD_R_YMM10, UD_R_YMM11, UD_R_YMM12, UD_R_YMM13, UD_R_YMM14, UD_R_YMM15, UD_NONE} },
-  /* 1742 */ { UD_Ivzeroall, O_NONE, O_NONE, O_NONE, O_NONE, UD_OP_ACCESS_READ, UD_OP_ACCESS_READ, P_none, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_R_YMM0, UD_R_YMM1, UD_R_YMM2, UD_R_YMM3, UD_R_YMM4, UD_R_YMM5, UD_R_YMM6, UD_R_YMM7, UD_R_YMM8, UD_R_YMM9, UD_R_YMM10, UD_R_YMM11, UD_R_YMM12, UD_R_YMM13, UD_R_YMM14, UD_R_YMM15, UD_NONE} },
-  /* 1743 */ { UD_Ivblendvpd, O_Vx, O_Hx, O_Wx, O_Lx, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1744 */ { UD_Ivblendvps, O_Vx, O_Hx, O_Wx, O_Lx, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb|P_vexl, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1745 */ { UD_Ivmovsd, O_V, O_H, O_U, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1746 */ { UD_Ivmovsd, O_V, O_Mq, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1747 */ { UD_Ivmovsd, O_U, O_H, O_V, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1748 */ { UD_Ivmovsd, O_Mq, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1749 */ { UD_Ivmovss, O_V, O_H, O_U, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1750 */ { UD_Ivmovss, O_V, O_Md, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1751 */ { UD_Ivmovss, O_U, O_H, O_V, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1752 */ { UD_Ivmovss, O_Md, O_V, O_NONE, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1753 */ { UD_Ivpblendvb, O_V, O_H, O_W, O_L, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1754 */ { UD_Ivpsllw, O_V, O_H, O_W, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1755 */ { UD_Ivpsllw, O_H, O_V, O_W, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1756 */ { UD_Ivpslld, O_V, O_H, O_W, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1757 */ { UD_Ivpslld, O_H, O_V, O_W, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1758 */ { UD_Ivpsllq, O_V, O_H, O_W, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-  /* 1759 */ { UD_Ivpsllq, O_H, O_V, O_W, O_NONE, UD_OP_ACCESS_WRITE, UD_OP_ACCESS_READ, P_aso|P_rexr|P_rexx|P_rexb, {UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED, UD_FLAG_UNCHANGED}, {UD_NONE}, {UD_NONE} },
-};
-
-
-const char* ud_mnemonics_str[] = {
-    "aaa",
-    "aad",
-    "aam",
-    "aas",
-    "adc",
-    "add",
-    "addpd",
-    "addps",
-    "addsd",
-    "addss",
-    "addsubpd",
-    "addsubps",
-    "aesdec",
-    "aesdeclast",
-    "aesenc",
-    "aesenclast",
-    "aesimc",
-    "aeskeygenassist",
-    "and",
-    "andnpd",
-    "andnps",
-    "andpd",
-    "andps",
-    "arpl",
-    "blendpd",
-    "blendps",
-    "blendvpd",
-    "blendvps",
-    "bound",
-    "bsf",
-    "bsr",
-    "bswap",
-    "bt",
-    "btc",
-    "btr",
-    "bts",
-    "call",
-    "cbw",
-    "cdq",
-    "cdqe",
-    "clc",
-    "cld",
-    "clflush",
-    "clgi",
-    "cli",
-    "clts",
-    "cmc",
-    "cmova",
-    "cmovae",
-    "cmovb",
-    "cmovbe",
-    "cmove",
-    "cmovg",
-    "cmovge",
-    "cmovl",
-    "cmovle",
-    "cmovne",
-    "cmovno",
-    "cmovnp",
-    "cmovns",
-    "cmovo",
-    "cmovp",
-    "cmovs",
-    "cmp",
-    "cmppd",
-    "cmpps",
-    "cmpsb",
-    "cmpsd",
-    "cmpsq",
-    "cmpss",
-    "cmpsw",
-    "cmpxchg",
-    "cmpxchg16b",
-    "cmpxchg8b",
-    "comisd",
-    "comiss",
-    "cpuid",
-    "cqo",
-    "crc32",
-    "cvtdq2pd",
-    "cvtdq2ps",
-    "cvtpd2dq",
-    "cvtpd2pi",
-    "cvtpd2ps",
-    "cvtpi2pd",
-    "cvtpi2ps",
-    "cvtps2dq",
-    "cvtps2pd",
-    "cvtps2pi",
-    "cvtsd2si",
-    "cvtsd2ss",
-    "cvtsi2sd",
-    "cvtsi2ss",
-    "cvtss2sd",
-    "cvtss2si",
-    "cvttpd2dq",
-    "cvttpd2pi",
-    "cvttps2dq",
-    "cvttps2pi",
-    "cvttsd2si",
-    "cvttss2si",
-    "cwd",
-    "cwde",
-    "daa",
-    "das",
-    "dec",
-    "div",
-    "divpd",
-    "divps",
-    "divsd",
-    "divss",
-    "dppd",
-    "dpps",
-    "emms",
-    "enter",
-    "extractps",
-    "f2xm1",
-    "fabs",
-    "fadd",
-    "faddp",
-    "fbld",
-    "fbstp",
-    "fchs",
-    "fclex",
-    "fcmovb",
-    "fcmovbe",
-    "fcmove",
-    "fcmovnb",
-    "fcmovnbe",
-    "fcmovne",
-    "fcmovnu",
-    "fcmovu",
-    "fcom",
-    "fcom2",
-    "fcomi",
-    "fcomip",
-    "fcomp",
-    "fcomp3",
-    "fcomp5",
-    "fcompp",
-    "fcos",
-    "fdecstp",
-    "fdiv",
-    "fdivp",
-    "fdivr",
-    "fdivrp",
-    "femms",
-    "ffree",
-    "ffreep",
-    "fiadd",
-    "ficom",
-    "ficomp",
-    "fidiv",
-    "fidivr",
-    "fild",
-    "fimul",
-    "fincstp",
-    "fist",
-    "fistp",
-    "fisttp",
-    "fisub",
-    "fisubr",
-    "fld",
-    "fld1",
-    "fldcw",
-    "fldenv",
-    "fldl2e",
-    "fldl2t",
-    "fldlg2",
-    "fldln2",
-    "fldpi",
-    "fldz",
-    "fmul",
-    "fmulp",
-    "fndisi",
-    "fneni",
-    "fninit",
-    "fnop",
-    "fnsave",
-    "fnsetpm",
-    "fnstcw",
-    "fnstenv",
-    "fnstsw",
-    "fpatan",
-    "fprem",
-    "fprem1",
-    "fptan",
-    "frndint",
-    "frstor",
-    "frstpm",
-    "fscale",
-    "fsin",
-    "fsincos",
-    "fsqrt",
-    "fst",
-    "fstp",
-    "fstp1",
-    "fstp8",
-    "fstp9",
-    "fsub",
-    "fsubp",
-    "fsubr",
-    "fsubrp",
-    "ftst",
-    "fucom",
-    "fucomi",
-    "fucomip",
-    "fucomp",
-    "fucompp",
-    "fxam",
-    "fxch",
-    "fxch4",
-    "fxch7",
-    "fxrstor",
-    "fxsave",
-    "fxtract",
-    "fyl2x",
-    "fyl2xp1",
-    "getsec",
-    "haddpd",
-    "haddps",
-    "hlt",
-    "hsubpd",
-    "hsubps",
-    "idiv",
-    "imul",
-    "in",
-    "inc",
-    "insb",
-    "insd",
-    "insertps",
-    "insw",
-    "int",
-    "int1",
-    "int3",
-    "into",
-    "invd",
-    "invept",
-    "invlpg",
-    "invlpga",
-    "invvpid",
-    "iretd",
-    "iretq",
-    "iretw",
-    "ja",
-    "jae",
-    "jb",
-    "jbe",
-    "jcxz",
-    "je",
-    "jecxz",
-    "jg",
-    "jge",
-    "jl",
-    "jle",
-    "jmp",
-    "jne",
-    "jno",
-    "jnp",
-    "jns",
-    "jo",
-    "jp",
-    "jrcxz",
-    "js",
-    "lahf",
-    "lar",
-    "lddqu",
-    "ldmxcsr",
-    "lds",
-    "lea",
-    "leave",
-    "les",
-    "lfence",
-    "lfs",
-    "lgdt",
-    "lgs",
-    "lidt",
-    "lldt",
-    "lmsw",
-    "lock",
-    "lodsb",
-    "lodsd",
-    "lodsq",
-    "lodsw",
-    "loop",
-    "loope",
-    "loopne",
-    "lsl",
-    "lss",
-    "ltr",
-    "maskmovdqu",
-    "maskmovq",
-    "maxpd",
-    "maxps",
-    "maxsd",
-    "maxss",
-    "mfence",
-    "minpd",
-    "minps",
-    "minsd",
-    "minss",
-    "monitor",
-    "montmul",
-    "mov",
-    "movapd",
-    "movaps",
-    "movbe",
-    "movd",
-    "movddup",
-    "movdq2q",
-    "movdqa",
-    "movdqu",
-    "movhlps",
-    "movhpd",
-    "movhps",
-    "movlhps",
-    "movlpd",
-    "movlps",
-    "movmskpd",
-    "movmskps",
-    "movntdq",
-    "movntdqa",
-    "movnti",
-    "movntpd",
-    "movntps",
-    "movntq",
-    "movq",
-    "movq2dq",
-    "movsb",
-    "movsd",
-    "movshdup",
-    "movsldup",
-    "movsq",
-    "movss",
-    "movsw",
-    "movsx",
-    "movsxd",
-    "movupd",
-    "movups",
-    "movzx",
-    "mpsadbw",
-    "mul",
-    "mulpd",
-    "mulps",
-    "mulsd",
-    "mulss",
-    "mwait",
-    "neg",
-    "nop",
-    "not",
-    "or",
-    "orpd",
-    "orps",
-    "out",
-    "outsb",
-    "outsd",
-    "outsw",
-    "pabsb",
-    "pabsd",
-    "pabsw",
-    "packssdw",
-    "packsswb",
-    "packusdw",
-    "packuswb",
-    "paddb",
-    "paddd",
-    "paddq",
-    "paddsb",
-    "paddsw",
-    "paddusb",
-    "paddusw",
-    "paddw",
-    "palignr",
-    "pand",
-    "pandn",
-    "pavgb",
-    "pavgusb",
-    "pavgw",
-    "pblendvb",
-    "pblendw",
-    "pclmulqdq",
-    "pcmpeqb",
-    "pcmpeqd",
-    "pcmpeqq",
-    "pcmpeqw",
-    "pcmpestri",
-    "pcmpestrm",
-    "pcmpgtb",
-    "pcmpgtd",
-    "pcmpgtq",
-    "pcmpgtw",
-    "pcmpistri",
-    "pcmpistrm",
-    "pextrb",
-    "pextrd",
-    "pextrq",
-    "pextrw",
-    "pf2id",
-    "pf2iw",
-    "pfacc",
-    "pfadd",
-    "pfcmpeq",
-    "pfcmpge",
-    "pfcmpgt",
-    "pfmax",
-    "pfmin",
-    "pfmul",
-    "pfnacc",
-    "pfpnacc",
-    "pfrcp",
-    "pfrcpit1",
-    "pfrcpit2",
-    "pfrsqit1",
-    "pfrsqrt",
-    "pfsub",
-    "pfsubr",
-    "phaddd",
-    "phaddsw",
-    "phaddw",
-    "phminposuw",
-    "phsubd",
-    "phsubsw",
-    "phsubw",
-    "pi2fd",
-    "pi2fw",
-    "pinsrb",
-    "pinsrd",
-    "pinsrq",
-    "pinsrw",
-    "pmaddubsw",
-    "pmaddwd",
-    "pmaxsb",
-    "pmaxsd",
-    "pmaxsw",
-    "pmaxub",
-    "pmaxud",
-    "pmaxuw",
-    "pminsb",
-    "pminsd",
-    "pminsw",
-    "pminub",
-    "pminud",
-    "pminuw",
-    "pmovmskb",
-    "pmovsxbd",
-    "pmovsxbq",
-    "pmovsxbw",
-    "pmovsxdq",
-    "pmovsxwd",
-    "pmovsxwq",
-    "pmovzxbd",
-    "pmovzxbq",
-    "pmovzxbw",
-    "pmovzxdq",
-    "pmovzxwd",
-    "pmovzxwq",
-    "pmuldq",
-    "pmulhrsw",
-    "pmulhrw",
-    "pmulhuw",
-    "pmulhw",
-    "pmulld",
-    "pmullw",
-    "pmuludq",
-    "pop",
-    "popa",
-    "popad",
-    "popcnt",
-    "popfd",
-    "popfq",
-    "popfw",
-    "por",
-    "prefetch",
-    "prefetchnta",
-    "prefetcht0",
-    "prefetcht1",
-    "prefetcht2",
-    "psadbw",
-    "pshufb",
-    "pshufd",
-    "pshufhw",
-    "pshuflw",
-    "pshufw",
-    "psignb",
-    "psignd",
-    "psignw",
-    "pslld",
-    "pslldq",
-    "psllq",
-    "psllw",
-    "psrad",
-    "psraw",
-    "psrld",
-    "psrldq",
-    "psrlq",
-    "psrlw",
-    "psubb",
-    "psubd",
-    "psubq",
-    "psubsb",
-    "psubsw",
-    "psubusb",
-    "psubusw",
-    "psubw",
-    "pswapd",
-    "ptest",
-    "punpckhbw",
-    "punpckhdq",
-    "punpckhqdq",
-    "punpckhwd",
-    "punpcklbw",
-    "punpckldq",
-    "punpcklqdq",
-    "punpcklwd",
-    "push",
-    "pusha",
-    "pushad",
-    "pushfd",
-    "pushfq",
-    "pushfw",
-    "pxor",
-    "rcl",
-    "rcpps",
-    "rcpss",
-    "rcr",
-    "rdmsr",
-    "rdpmc",
-    "rdrand",
-    "rdtsc",
-    "rdtscp",
-    "rep",
-    "repne",
-    "ret",
-    "retf",
-    "rol",
-    "ror",
-    "roundpd",
-    "roundps",
-    "roundsd",
-    "roundss",
-    "rsm",
-    "rsqrtps",
-    "rsqrtss",
-    "sahf",
-    "salc",
-    "sar",
-    "sbb",
-    "scasb",
-    "scasd",
-    "scasq",
-    "scasw",
-    "seta",
-    "setae",
-    "setb",
-    "setbe",
-    "sete",
-    "setg",
-    "setge",
-    "setl",
-    "setle",
-    "setne",
-    "setno",
-    "setnp",
-    "setns",
-    "seto",
-    "setp",
-    "sets",
-    "sfence",
-    "sgdt",
-    "shl",
-    "shld",
-    "shr",
-    "shrd",
-    "shufpd",
-    "shufps",
-    "sidt",
-    "skinit",
-    "sldt",
-    "smsw",
-    "sqrtpd",
-    "sqrtps",
-    "sqrtsd",
-    "sqrtss",
-    "stc",
-    "std",
-    "stgi",
-    "sti",
-    "stmxcsr",
-    "stosb",
-    "stosd",
-    "stosq",
-    "stosw",
-    "str",
-    "sub",
-    "subpd",
-    "subps",
-    "subsd",
-    "subss",
-    "swapgs",
-    "syscall",
-    "sysenter",
-    "sysexit",
-    "sysret",
-    "test",
-    "ucomisd",
-    "ucomiss",
-    "ud2",
-    "unpckhpd",
-    "unpckhps",
-    "unpcklpd",
-    "unpcklps",
-    "vaddpd",
-    "vaddps",
-    "vaddsd",
-    "vaddss",
-    "vaddsubpd",
-    "vaddsubps",
-    "vaesdec",
-    "vaesdeclast",
-    "vaesenc",
-    "vaesenclast",
-    "vaesimc",
-    "vaeskeygenassist",
-    "vandnpd",
-    "vandnps",
-    "vandpd",
-    "vandps",
-    "vblendpd",
-    "vblendps",
-    "vblendvpd",
-    "vblendvps",
-    "vbroadcastsd",
-    "vbroadcastss",
-    "vcmppd",
-    "vcmpps",
-    "vcmpsd",
-    "vcmpss",
-    "vcomisd",
-    "vcomiss",
-    "vcvtdq2pd",
-    "vcvtdq2ps",
-    "vcvtpd2dq",
-    "vcvtpd2ps",
-    "vcvtps2dq",
-    "vcvtps2pd",
-    "vcvtsd2si",
-    "vcvtsd2ss",
-    "vcvtsi2sd",
-    "vcvtsi2ss",
-    "vcvtss2sd",
-    "vcvtss2si",
-    "vcvttpd2dq",
-    "vcvttps2dq",
-    "vcvttsd2si",
-    "vcvttss2si",
-    "vdivpd",
-    "vdivps",
-    "vdivsd",
-    "vdivss",
-    "vdppd",
-    "vdpps",
-    "verr",
-    "verw",
-    "vextractf128",
-    "vextractps",
-    "vhaddpd",
-    "vhaddps",
-    "vhsubpd",
-    "vhsubps",
-    "vinsertf128",
-    "vinsertps",
-    "vlddqu",
-    "vmaskmovdqu",
-    "vmaskmovpd",
-    "vmaskmovps",
-    "vmaxpd",
-    "vmaxps",
-    "vmaxsd",
-    "vmaxss",
-    "vmcall",
-    "vmclear",
-    "vminpd",
-    "vminps",
-    "vminsd",
-    "vminss",
-    "vmlaunch",
-    "vmload",
-    "vmmcall",
-    "vmovapd",
-    "vmovaps",
-    "vmovd",
-    "vmovddup",
-    "vmovdqa",
-    "vmovdqu",
-    "vmovhlps",
-    "vmovhpd",
-    "vmovhps",
-    "vmovlhps",
-    "vmovlpd",
-    "vmovlps",
-    "vmovmskpd",
-    "vmovmskps",
-    "vmovntdq",
-    "vmovntdqa",
-    "vmovntpd",
-    "vmovntps",
-    "vmovq",
-    "vmovsd",
-    "vmovshdup",
-    "vmovsldup",
-    "vmovss",
-    "vmovupd",
-    "vmovups",
-    "vmpsadbw",
-    "vmptrld",
-    "vmptrst",
-    "vmread",
-    "vmresume",
-    "vmrun",
-    "vmsave",
-    "vmulpd",
-    "vmulps",
-    "vmulsd",
-    "vmulss",
-    "vmwrite",
-    "vmxoff",
-    "vmxon",
-    "vorpd",
-    "vorps",
-    "vpabsb",
-    "vpabsd",
-    "vpabsw",
-    "vpackssdw",
-    "vpacksswb",
-    "vpackusdw",
-    "vpackuswb",
-    "vpaddb",
-    "vpaddd",
-    "vpaddq",
-    "vpaddsb",
-    "vpaddsw",
-    "vpaddusb",
-    "vpaddusw",
-    "vpaddw",
-    "vpalignr",
-    "vpand",
-    "vpandn",
-    "vpavgb",
-    "vpavgw",
-    "vpblendvb",
-    "vpblendw",
-    "vpclmulqdq",
-    "vpcmpeqb",
-    "vpcmpeqd",
-    "vpcmpeqq",
-    "vpcmpeqw",
-    "vpcmpestri",
-    "vpcmpestrm",
-    "vpcmpgtb",
-    "vpcmpgtd",
-    "vpcmpgtq",
-    "vpcmpgtw",
-    "vpcmpistri",
-    "vpcmpistrm",
-    "vperm2f128",
-    "vpermilpd",
-    "vpermilps",
-    "vpextrb",
-    "vpextrd",
-    "vpextrq",
-    "vpextrw",
-    "vphaddd",
-    "vphaddsw",
-    "vphaddw",
-    "vphminposuw",
-    "vphsubd",
-    "vphsubsw",
-    "vphsubw",
-    "vpinsrb",
-    "vpinsrd",
-    "vpinsrq",
-    "vpinsrw",
-    "vpmaddubsw",
-    "vpmaddwd",
-    "vpmaxsb",
-    "vpmaxsd",
-    "vpmaxsw",
-    "vpmaxub",
-    "vpmaxud",
-    "vpmaxuw",
-    "vpminsb",
-    "vpminsd",
-    "vpminsw",
-    "vpminub",
-    "vpminud",
-    "vpminuw",
-    "vpmovmskb",
-    "vpmovsxbd",
-    "vpmovsxbq",
-    "vpmovsxbw",
-    "vpmovsxwd",
-    "vpmovsxwq",
-    "vpmovzxbd",
-    "vpmovzxbq",
-    "vpmovzxbw",
-    "vpmovzxdq",
-    "vpmovzxwd",
-    "vpmovzxwq",
-    "vpmuldq",
-    "vpmulhrsw",
-    "vpmulhuw",
-    "vpmulhw",
-    "vpmulld",
-    "vpmullw",
-    "vpor",
-    "vpsadbw",
-    "vpshufb",
-    "vpshufd",
-    "vpshufhw",
-    "vpshuflw",
-    "vpsignb",
-    "vpsignd",
-    "vpsignw",
-    "vpslld",
-    "vpslldq",
-    "vpsllq",
-    "vpsllw",
-    "vpsrad",
-    "vpsraw",
-    "vpsrld",
-    "vpsrldq",
-    "vpsrlq",
-    "vpsrlw",
-    "vpsubb",
-    "vpsubd",
-    "vpsubq",
-    "vpsubsb",
-    "vpsubsw",
-    "vpsubusb",
-    "vpsubusw",
-    "vpsubw",
-    "vptest",
-    "vpunpckhbw",
-    "vpunpckhdq",
-    "vpunpckhqdq",
-    "vpunpckhwd",
-    "vpunpcklbw",
-    "vpunpckldq",
-    "vpunpcklqdq",
-    "vpunpcklwd",
-    "vpxor",
-    "vrcpps",
-    "vrcpss",
-    "vroundpd",
-    "vroundps",
-    "vroundsd",
-    "vroundss",
-    "vrsqrtps",
-    "vrsqrtss",
-    "vshufpd",
-    "vshufps",
-    "vsqrtpd",
-    "vsqrtps",
-    "vsqrtsd",
-    "vsqrtss",
-    "vstmxcsr",
-    "vsubpd",
-    "vsubps",
-    "vsubsd",
-    "vsubss",
-    "vtestpd",
-    "vtestps",
-    "vucomisd",
-    "vucomiss",
-    "vunpckhpd",
-    "vunpckhps",
-    "vunpcklpd",
-    "vunpcklps",
-    "vxorpd",
-    "vxorps",
-    "vzeroall",
-    "vzeroupper",
-    "wait",
-    "wbinvd",
-    "wrmsr",
-    "xadd",
-    "xchg",
-    "xcryptcbc",
-    "xcryptcfb",
-    "xcryptctr",
-    "xcryptecb",
-    "xcryptofb",
-    "xgetbv",
-    "xlatb",
-    "xor",
-    "xorpd",
-    "xorps",
-    "xrstor",
-    "xsave",
-    "xsetbv",
-    "xsha1",
-    "xsha256",
-    "xstore",
-    "invalid",
-    "3dnow",
-    "none",
-    "db",
-    "pause"
-};
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/itab.h radare2-2.8.0+dfsg/shlr/udis86/itab.h
--- radare2-2.3.0+dfsg/shlr/udis86/itab.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/itab.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,939 +0,0 @@
-#ifndef UD_ITAB_H
-#define UD_ITAB_H
-
-/* itab.h -- generated by udis86:scripts/ud_itab.py, do no edit */
-
-/* ud_table_type -- lookup table types (see decode.c) */
-enum ud_table_type {
-    UD_TAB__OPC_VEX,
-    UD_TAB__OPC_TABLE,
-    UD_TAB__OPC_X87,
-    UD_TAB__OPC_MOD,
-    UD_TAB__OPC_RM,
-    UD_TAB__OPC_OSIZE,
-    UD_TAB__OPC_MODE,
-    UD_TAB__OPC_VEX_L,
-    UD_TAB__OPC_3DNOW,
-    UD_TAB__OPC_REG,
-    UD_TAB__OPC_ASIZE,
-    UD_TAB__OPC_VEX_W,
-    UD_TAB__OPC_SSE,
-    UD_TAB__OPC_VENDOR
-};
-
-/* ud_mnemonic -- mnemonic constants */
-enum ud_mnemonic_code {
-    UD_Iaaa,
-    UD_Iaad,
-    UD_Iaam,
-    UD_Iaas,
-    UD_Iadc,
-    UD_Iadd,
-    UD_Iaddpd,
-    UD_Iaddps,
-    UD_Iaddsd,
-    UD_Iaddss,
-    UD_Iaddsubpd,
-    UD_Iaddsubps,
-    UD_Iaesdec,
-    UD_Iaesdeclast,
-    UD_Iaesenc,
-    UD_Iaesenclast,
-    UD_Iaesimc,
-    UD_Iaeskeygenassist,
-    UD_Iand,
-    UD_Iandnpd,
-    UD_Iandnps,
-    UD_Iandpd,
-    UD_Iandps,
-    UD_Iarpl,
-    UD_Iblendpd,
-    UD_Iblendps,
-    UD_Iblendvpd,
-    UD_Iblendvps,
-    UD_Ibound,
-    UD_Ibsf,
-    UD_Ibsr,
-    UD_Ibswap,
-    UD_Ibt,
-    UD_Ibtc,
-    UD_Ibtr,
-    UD_Ibts,
-    UD_Icall,
-    UD_Icbw,
-    UD_Icdq,
-    UD_Icdqe,
-    UD_Iclc,
-    UD_Icld,
-    UD_Iclflush,
-    UD_Iclgi,
-    UD_Icli,
-    UD_Iclts,
-    UD_Icmc,
-    UD_Icmova,
-    UD_Icmovae,
-    UD_Icmovb,
-    UD_Icmovbe,
-    UD_Icmove,
-    UD_Icmovg,
-    UD_Icmovge,
-    UD_Icmovl,
-    UD_Icmovle,
-    UD_Icmovne,
-    UD_Icmovno,
-    UD_Icmovnp,
-    UD_Icmovns,
-    UD_Icmovo,
-    UD_Icmovp,
-    UD_Icmovs,
-    UD_Icmp,
-    UD_Icmppd,
-    UD_Icmpps,
-    UD_Icmpsb,
-    UD_Icmpsd,
-    UD_Icmpsq,
-    UD_Icmpss,
-    UD_Icmpsw,
-    UD_Icmpxchg,
-    UD_Icmpxchg16b,
-    UD_Icmpxchg8b,
-    UD_Icomisd,
-    UD_Icomiss,
-    UD_Icpuid,
-    UD_Icqo,
-    UD_Icrc32,
-    UD_Icvtdq2pd,
-    UD_Icvtdq2ps,
-    UD_Icvtpd2dq,
-    UD_Icvtpd2pi,
-    UD_Icvtpd2ps,
-    UD_Icvtpi2pd,
-    UD_Icvtpi2ps,
-    UD_Icvtps2dq,
-    UD_Icvtps2pd,
-    UD_Icvtps2pi,
-    UD_Icvtsd2si,
-    UD_Icvtsd2ss,
-    UD_Icvtsi2sd,
-    UD_Icvtsi2ss,
-    UD_Icvtss2sd,
-    UD_Icvtss2si,
-    UD_Icvttpd2dq,
-    UD_Icvttpd2pi,
-    UD_Icvttps2dq,
-    UD_Icvttps2pi,
-    UD_Icvttsd2si,
-    UD_Icvttss2si,
-    UD_Icwd,
-    UD_Icwde,
-    UD_Idaa,
-    UD_Idas,
-    UD_Idec,
-    UD_Idiv,
-    UD_Idivpd,
-    UD_Idivps,
-    UD_Idivsd,
-    UD_Idivss,
-    UD_Idppd,
-    UD_Idpps,
-    UD_Iemms,
-    UD_Ienter,
-    UD_Iextractps,
-    UD_If2xm1,
-    UD_Ifabs,
-    UD_Ifadd,
-    UD_Ifaddp,
-    UD_Ifbld,
-    UD_Ifbstp,
-    UD_Ifchs,
-    UD_Ifclex,
-    UD_Ifcmovb,
-    UD_Ifcmovbe,
-    UD_Ifcmove,
-    UD_Ifcmovnb,
-    UD_Ifcmovnbe,
-    UD_Ifcmovne,
-    UD_Ifcmovnu,
-    UD_Ifcmovu,
-    UD_Ifcom,
-    UD_Ifcom2,
-    UD_Ifcomi,
-    UD_Ifcomip,
-    UD_Ifcomp,
-    UD_Ifcomp3,
-    UD_Ifcomp5,
-    UD_Ifcompp,
-    UD_Ifcos,
-    UD_Ifdecstp,
-    UD_Ifdiv,
-    UD_Ifdivp,
-    UD_Ifdivr,
-    UD_Ifdivrp,
-    UD_Ifemms,
-    UD_Iffree,
-    UD_Iffreep,
-    UD_Ifiadd,
-    UD_Ificom,
-    UD_Ificomp,
-    UD_Ifidiv,
-    UD_Ifidivr,
-    UD_Ifild,
-    UD_Ifimul,
-    UD_Ifincstp,
-    UD_Ifist,
-    UD_Ifistp,
-    UD_Ifisttp,
-    UD_Ifisub,
-    UD_Ifisubr,
-    UD_Ifld,
-    UD_Ifld1,
-    UD_Ifldcw,
-    UD_Ifldenv,
-    UD_Ifldl2e,
-    UD_Ifldl2t,
-    UD_Ifldlg2,
-    UD_Ifldln2,
-    UD_Ifldpi,
-    UD_Ifldz,
-    UD_Ifmul,
-    UD_Ifmulp,
-    UD_Ifndisi,
-    UD_Ifneni,
-    UD_Ifninit,
-    UD_Ifnop,
-    UD_Ifnsave,
-    UD_Ifnsetpm,
-    UD_Ifnstcw,
-    UD_Ifnstenv,
-    UD_Ifnstsw,
-    UD_Ifpatan,
-    UD_Ifprem,
-    UD_Ifprem1,
-    UD_Ifptan,
-    UD_Ifrndint,
-    UD_Ifrstor,
-    UD_Ifrstpm,
-    UD_Ifscale,
-    UD_Ifsin,
-    UD_Ifsincos,
-    UD_Ifsqrt,
-    UD_Ifst,
-    UD_Ifstp,
-    UD_Ifstp1,
-    UD_Ifstp8,
-    UD_Ifstp9,
-    UD_Ifsub,
-    UD_Ifsubp,
-    UD_Ifsubr,
-    UD_Ifsubrp,
-    UD_Iftst,
-    UD_Ifucom,
-    UD_Ifucomi,
-    UD_Ifucomip,
-    UD_Ifucomp,
-    UD_Ifucompp,
-    UD_Ifxam,
-    UD_Ifxch,
-    UD_Ifxch4,
-    UD_Ifxch7,
-    UD_Ifxrstor,
-    UD_Ifxsave,
-    UD_Ifxtract,
-    UD_Ifyl2x,
-    UD_Ifyl2xp1,
-    UD_Igetsec,
-    UD_Ihaddpd,
-    UD_Ihaddps,
-    UD_Ihlt,
-    UD_Ihsubpd,
-    UD_Ihsubps,
-    UD_Iidiv,
-    UD_Iimul,
-    UD_Iin,
-    UD_Iinc,
-    UD_Iinsb,
-    UD_Iinsd,
-    UD_Iinsertps,
-    UD_Iinsw,
-    UD_Iint,
-    UD_Iint1,
-    UD_Iint3,
-    UD_Iinto,
-    UD_Iinvd,
-    UD_Iinvept,
-    UD_Iinvlpg,
-    UD_Iinvlpga,
-    UD_Iinvvpid,
-    UD_Iiretd,
-    UD_Iiretq,
-    UD_Iiretw,
-    UD_Ija,
-    UD_Ijae,
-    UD_Ijb,
-    UD_Ijbe,
-    UD_Ijcxz,
-    UD_Ije,
-    UD_Ijecxz,
-    UD_Ijg,
-    UD_Ijge,
-    UD_Ijl,
-    UD_Ijle,
-    UD_Ijmp,
-    UD_Ijne,
-    UD_Ijno,
-    UD_Ijnp,
-    UD_Ijns,
-    UD_Ijo,
-    UD_Ijp,
-    UD_Ijrcxz,
-    UD_Ijs,
-    UD_Ilahf,
-    UD_Ilar,
-    UD_Ilddqu,
-    UD_Ildmxcsr,
-    UD_Ilds,
-    UD_Ilea,
-    UD_Ileave,
-    UD_Iles,
-    UD_Ilfence,
-    UD_Ilfs,
-    UD_Ilgdt,
-    UD_Ilgs,
-    UD_Ilidt,
-    UD_Illdt,
-    UD_Ilmsw,
-    UD_Ilock,
-    UD_Ilodsb,
-    UD_Ilodsd,
-    UD_Ilodsq,
-    UD_Ilodsw,
-    UD_Iloop,
-    UD_Iloope,
-    UD_Iloopne,
-    UD_Ilsl,
-    UD_Ilss,
-    UD_Iltr,
-    UD_Imaskmovdqu,
-    UD_Imaskmovq,
-    UD_Imaxpd,
-    UD_Imaxps,
-    UD_Imaxsd,
-    UD_Imaxss,
-    UD_Imfence,
-    UD_Iminpd,
-    UD_Iminps,
-    UD_Iminsd,
-    UD_Iminss,
-    UD_Imonitor,
-    UD_Imontmul,
-    UD_Imov,
-    UD_Imovapd,
-    UD_Imovaps,
-    UD_Imovbe,
-    UD_Imovd,
-    UD_Imovddup,
-    UD_Imovdq2q,
-    UD_Imovdqa,
-    UD_Imovdqu,
-    UD_Imovhlps,
-    UD_Imovhpd,
-    UD_Imovhps,
-    UD_Imovlhps,
-    UD_Imovlpd,
-    UD_Imovlps,
-    UD_Imovmskpd,
-    UD_Imovmskps,
-    UD_Imovntdq,
-    UD_Imovntdqa,
-    UD_Imovnti,
-    UD_Imovntpd,
-    UD_Imovntps,
-    UD_Imovntq,
-    UD_Imovq,
-    UD_Imovq2dq,
-    UD_Imovsb,
-    UD_Imovsd,
-    UD_Imovshdup,
-    UD_Imovsldup,
-    UD_Imovsq,
-    UD_Imovss,
-    UD_Imovsw,
-    UD_Imovsx,
-    UD_Imovsxd,
-    UD_Imovupd,
-    UD_Imovups,
-    UD_Imovzx,
-    UD_Impsadbw,
-    UD_Imul,
-    UD_Imulpd,
-    UD_Imulps,
-    UD_Imulsd,
-    UD_Imulss,
-    UD_Imwait,
-    UD_Ineg,
-    UD_Inop,
-    UD_Inot,
-    UD_Ior,
-    UD_Iorpd,
-    UD_Iorps,
-    UD_Iout,
-    UD_Ioutsb,
-    UD_Ioutsd,
-    UD_Ioutsw,
-    UD_Ipabsb,
-    UD_Ipabsd,
-    UD_Ipabsw,
-    UD_Ipackssdw,
-    UD_Ipacksswb,
-    UD_Ipackusdw,
-    UD_Ipackuswb,
-    UD_Ipaddb,
-    UD_Ipaddd,
-    UD_Ipaddq,
-    UD_Ipaddsb,
-    UD_Ipaddsw,
-    UD_Ipaddusb,
-    UD_Ipaddusw,
-    UD_Ipaddw,
-    UD_Ipalignr,
-    UD_Ipand,
-    UD_Ipandn,
-    UD_Ipavgb,
-    UD_Ipavgusb,
-    UD_Ipavgw,
-    UD_Ipblendvb,
-    UD_Ipblendw,
-    UD_Ipclmulqdq,
-    UD_Ipcmpeqb,
-    UD_Ipcmpeqd,
-    UD_Ipcmpeqq,
-    UD_Ipcmpeqw,
-    UD_Ipcmpestri,
-    UD_Ipcmpestrm,
-    UD_Ipcmpgtb,
-    UD_Ipcmpgtd,
-    UD_Ipcmpgtq,
-    UD_Ipcmpgtw,
-    UD_Ipcmpistri,
-    UD_Ipcmpistrm,
-    UD_Ipextrb,
-    UD_Ipextrd,
-    UD_Ipextrq,
-    UD_Ipextrw,
-    UD_Ipf2id,
-    UD_Ipf2iw,
-    UD_Ipfacc,
-    UD_Ipfadd,
-    UD_Ipfcmpeq,
-    UD_Ipfcmpge,
-    UD_Ipfcmpgt,
-    UD_Ipfmax,
-    UD_Ipfmin,
-    UD_Ipfmul,
-    UD_Ipfnacc,
-    UD_Ipfpnacc,
-    UD_Ipfrcp,
-    UD_Ipfrcpit1,
-    UD_Ipfrcpit2,
-    UD_Ipfrsqit1,
-    UD_Ipfrsqrt,
-    UD_Ipfsub,
-    UD_Ipfsubr,
-    UD_Iphaddd,
-    UD_Iphaddsw,
-    UD_Iphaddw,
-    UD_Iphminposuw,
-    UD_Iphsubd,
-    UD_Iphsubsw,
-    UD_Iphsubw,
-    UD_Ipi2fd,
-    UD_Ipi2fw,
-    UD_Ipinsrb,
-    UD_Ipinsrd,
-    UD_Ipinsrq,
-    UD_Ipinsrw,
-    UD_Ipmaddubsw,
-    UD_Ipmaddwd,
-    UD_Ipmaxsb,
-    UD_Ipmaxsd,
-    UD_Ipmaxsw,
-    UD_Ipmaxub,
-    UD_Ipmaxud,
-    UD_Ipmaxuw,
-    UD_Ipminsb,
-    UD_Ipminsd,
-    UD_Ipminsw,
-    UD_Ipminub,
-    UD_Ipminud,
-    UD_Ipminuw,
-    UD_Ipmovmskb,
-    UD_Ipmovsxbd,
-    UD_Ipmovsxbq,
-    UD_Ipmovsxbw,
-    UD_Ipmovsxdq,
-    UD_Ipmovsxwd,
-    UD_Ipmovsxwq,
-    UD_Ipmovzxbd,
-    UD_Ipmovzxbq,
-    UD_Ipmovzxbw,
-    UD_Ipmovzxdq,
-    UD_Ipmovzxwd,
-    UD_Ipmovzxwq,
-    UD_Ipmuldq,
-    UD_Ipmulhrsw,
-    UD_Ipmulhrw,
-    UD_Ipmulhuw,
-    UD_Ipmulhw,
-    UD_Ipmulld,
-    UD_Ipmullw,
-    UD_Ipmuludq,
-    UD_Ipop,
-    UD_Ipopa,
-    UD_Ipopad,
-    UD_Ipopcnt,
-    UD_Ipopfd,
-    UD_Ipopfq,
-    UD_Ipopfw,
-    UD_Ipor,
-    UD_Iprefetch,
-    UD_Iprefetchnta,
-    UD_Iprefetcht0,
-    UD_Iprefetcht1,
-    UD_Iprefetcht2,
-    UD_Ipsadbw,
-    UD_Ipshufb,
-    UD_Ipshufd,
-    UD_Ipshufhw,
-    UD_Ipshuflw,
-    UD_Ipshufw,
-    UD_Ipsignb,
-    UD_Ipsignd,
-    UD_Ipsignw,
-    UD_Ipslld,
-    UD_Ipslldq,
-    UD_Ipsllq,
-    UD_Ipsllw,
-    UD_Ipsrad,
-    UD_Ipsraw,
-    UD_Ipsrld,
-    UD_Ipsrldq,
-    UD_Ipsrlq,
-    UD_Ipsrlw,
-    UD_Ipsubb,
-    UD_Ipsubd,
-    UD_Ipsubq,
-    UD_Ipsubsb,
-    UD_Ipsubsw,
-    UD_Ipsubusb,
-    UD_Ipsubusw,
-    UD_Ipsubw,
-    UD_Ipswapd,
-    UD_Iptest,
-    UD_Ipunpckhbw,
-    UD_Ipunpckhdq,
-    UD_Ipunpckhqdq,
-    UD_Ipunpckhwd,
-    UD_Ipunpcklbw,
-    UD_Ipunpckldq,
-    UD_Ipunpcklqdq,
-    UD_Ipunpcklwd,
-    UD_Ipush,
-    UD_Ipusha,
-    UD_Ipushad,
-    UD_Ipushfd,
-    UD_Ipushfq,
-    UD_Ipushfw,
-    UD_Ipxor,
-    UD_Ircl,
-    UD_Ircpps,
-    UD_Ircpss,
-    UD_Ircr,
-    UD_Irdmsr,
-    UD_Irdpmc,
-    UD_Irdrand,
-    UD_Irdtsc,
-    UD_Irdtscp,
-    UD_Irep,
-    UD_Irepne,
-    UD_Iret,
-    UD_Iretf,
-    UD_Irol,
-    UD_Iror,
-    UD_Iroundpd,
-    UD_Iroundps,
-    UD_Iroundsd,
-    UD_Iroundss,
-    UD_Irsm,
-    UD_Irsqrtps,
-    UD_Irsqrtss,
-    UD_Isahf,
-    UD_Isalc,
-    UD_Isar,
-    UD_Isbb,
-    UD_Iscasb,
-    UD_Iscasd,
-    UD_Iscasq,
-    UD_Iscasw,
-    UD_Iseta,
-    UD_Isetae,
-    UD_Isetb,
-    UD_Isetbe,
-    UD_Isete,
-    UD_Isetg,
-    UD_Isetge,
-    UD_Isetl,
-    UD_Isetle,
-    UD_Isetne,
-    UD_Isetno,
-    UD_Isetnp,
-    UD_Isetns,
-    UD_Iseto,
-    UD_Isetp,
-    UD_Isets,
-    UD_Isfence,
-    UD_Isgdt,
-    UD_Ishl,
-    UD_Ishld,
-    UD_Ishr,
-    UD_Ishrd,
-    UD_Ishufpd,
-    UD_Ishufps,
-    UD_Isidt,
-    UD_Iskinit,
-    UD_Isldt,
-    UD_Ismsw,
-    UD_Isqrtpd,
-    UD_Isqrtps,
-    UD_Isqrtsd,
-    UD_Isqrtss,
-    UD_Istc,
-    UD_Istd,
-    UD_Istgi,
-    UD_Isti,
-    UD_Istmxcsr,
-    UD_Istosb,
-    UD_Istosd,
-    UD_Istosq,
-    UD_Istosw,
-    UD_Istr,
-    UD_Isub,
-    UD_Isubpd,
-    UD_Isubps,
-    UD_Isubsd,
-    UD_Isubss,
-    UD_Iswapgs,
-    UD_Isyscall,
-    UD_Isysenter,
-    UD_Isysexit,
-    UD_Isysret,
-    UD_Itest,
-    UD_Iucomisd,
-    UD_Iucomiss,
-    UD_Iud2,
-    UD_Iunpckhpd,
-    UD_Iunpckhps,
-    UD_Iunpcklpd,
-    UD_Iunpcklps,
-    UD_Ivaddpd,
-    UD_Ivaddps,
-    UD_Ivaddsd,
-    UD_Ivaddss,
-    UD_Ivaddsubpd,
-    UD_Ivaddsubps,
-    UD_Ivaesdec,
-    UD_Ivaesdeclast,
-    UD_Ivaesenc,
-    UD_Ivaesenclast,
-    UD_Ivaesimc,
-    UD_Ivaeskeygenassist,
-    UD_Ivandnpd,
-    UD_Ivandnps,
-    UD_Ivandpd,
-    UD_Ivandps,
-    UD_Ivblendpd,
-    UD_Ivblendps,
-    UD_Ivblendvpd,
-    UD_Ivblendvps,
-    UD_Ivbroadcastsd,
-    UD_Ivbroadcastss,
-    UD_Ivcmppd,
-    UD_Ivcmpps,
-    UD_Ivcmpsd,
-    UD_Ivcmpss,
-    UD_Ivcomisd,
-    UD_Ivcomiss,
-    UD_Ivcvtdq2pd,
-    UD_Ivcvtdq2ps,
-    UD_Ivcvtpd2dq,
-    UD_Ivcvtpd2ps,
-    UD_Ivcvtps2dq,
-    UD_Ivcvtps2pd,
-    UD_Ivcvtsd2si,
-    UD_Ivcvtsd2ss,
-    UD_Ivcvtsi2sd,
-    UD_Ivcvtsi2ss,
-    UD_Ivcvtss2sd,
-    UD_Ivcvtss2si,
-    UD_Ivcvttpd2dq,
-    UD_Ivcvttps2dq,
-    UD_Ivcvttsd2si,
-    UD_Ivcvttss2si,
-    UD_Ivdivpd,
-    UD_Ivdivps,
-    UD_Ivdivsd,
-    UD_Ivdivss,
-    UD_Ivdppd,
-    UD_Ivdpps,
-    UD_Iverr,
-    UD_Iverw,
-    UD_Ivextractf128,
-    UD_Ivextractps,
-    UD_Ivhaddpd,
-    UD_Ivhaddps,
-    UD_Ivhsubpd,
-    UD_Ivhsubps,
-    UD_Ivinsertf128,
-    UD_Ivinsertps,
-    UD_Ivlddqu,
-    UD_Ivmaskmovdqu,
-    UD_Ivmaskmovpd,
-    UD_Ivmaskmovps,
-    UD_Ivmaxpd,
-    UD_Ivmaxps,
-    UD_Ivmaxsd,
-    UD_Ivmaxss,
-    UD_Ivmcall,
-    UD_Ivmclear,
-    UD_Ivminpd,
-    UD_Ivminps,
-    UD_Ivminsd,
-    UD_Ivminss,
-    UD_Ivmlaunch,
-    UD_Ivmload,
-    UD_Ivmmcall,
-    UD_Ivmovapd,
-    UD_Ivmovaps,
-    UD_Ivmovd,
-    UD_Ivmovddup,
-    UD_Ivmovdqa,
-    UD_Ivmovdqu,
-    UD_Ivmovhlps,
-    UD_Ivmovhpd,
-    UD_Ivmovhps,
-    UD_Ivmovlhps,
-    UD_Ivmovlpd,
-    UD_Ivmovlps,
-    UD_Ivmovmskpd,
-    UD_Ivmovmskps,
-    UD_Ivmovntdq,
-    UD_Ivmovntdqa,
-    UD_Ivmovntpd,
-    UD_Ivmovntps,
-    UD_Ivmovq,
-    UD_Ivmovsd,
-    UD_Ivmovshdup,
-    UD_Ivmovsldup,
-    UD_Ivmovss,
-    UD_Ivmovupd,
-    UD_Ivmovups,
-    UD_Ivmpsadbw,
-    UD_Ivmptrld,
-    UD_Ivmptrst,
-    UD_Ivmread,
-    UD_Ivmresume,
-    UD_Ivmrun,
-    UD_Ivmsave,
-    UD_Ivmulpd,
-    UD_Ivmulps,
-    UD_Ivmulsd,
-    UD_Ivmulss,
-    UD_Ivmwrite,
-    UD_Ivmxoff,
-    UD_Ivmxon,
-    UD_Ivorpd,
-    UD_Ivorps,
-    UD_Ivpabsb,
-    UD_Ivpabsd,
-    UD_Ivpabsw,
-    UD_Ivpackssdw,
-    UD_Ivpacksswb,
-    UD_Ivpackusdw,
-    UD_Ivpackuswb,
-    UD_Ivpaddb,
-    UD_Ivpaddd,
-    UD_Ivpaddq,
-    UD_Ivpaddsb,
-    UD_Ivpaddsw,
-    UD_Ivpaddusb,
-    UD_Ivpaddusw,
-    UD_Ivpaddw,
-    UD_Ivpalignr,
-    UD_Ivpand,
-    UD_Ivpandn,
-    UD_Ivpavgb,
-    UD_Ivpavgw,
-    UD_Ivpblendvb,
-    UD_Ivpblendw,
-    UD_Ivpclmulqdq,
-    UD_Ivpcmpeqb,
-    UD_Ivpcmpeqd,
-    UD_Ivpcmpeqq,
-    UD_Ivpcmpeqw,
-    UD_Ivpcmpestri,
-    UD_Ivpcmpestrm,
-    UD_Ivpcmpgtb,
-    UD_Ivpcmpgtd,
-    UD_Ivpcmpgtq,
-    UD_Ivpcmpgtw,
-    UD_Ivpcmpistri,
-    UD_Ivpcmpistrm,
-    UD_Ivperm2f128,
-    UD_Ivpermilpd,
-    UD_Ivpermilps,
-    UD_Ivpextrb,
-    UD_Ivpextrd,
-    UD_Ivpextrq,
-    UD_Ivpextrw,
-    UD_Ivphaddd,
-    UD_Ivphaddsw,
-    UD_Ivphaddw,
-    UD_Ivphminposuw,
-    UD_Ivphsubd,
-    UD_Ivphsubsw,
-    UD_Ivphsubw,
-    UD_Ivpinsrb,
-    UD_Ivpinsrd,
-    UD_Ivpinsrq,
-    UD_Ivpinsrw,
-    UD_Ivpmaddubsw,
-    UD_Ivpmaddwd,
-    UD_Ivpmaxsb,
-    UD_Ivpmaxsd,
-    UD_Ivpmaxsw,
-    UD_Ivpmaxub,
-    UD_Ivpmaxud,
-    UD_Ivpmaxuw,
-    UD_Ivpminsb,
-    UD_Ivpminsd,
-    UD_Ivpminsw,
-    UD_Ivpminub,
-    UD_Ivpminud,
-    UD_Ivpminuw,
-    UD_Ivpmovmskb,
-    UD_Ivpmovsxbd,
-    UD_Ivpmovsxbq,
-    UD_Ivpmovsxbw,
-    UD_Ivpmovsxwd,
-    UD_Ivpmovsxwq,
-    UD_Ivpmovzxbd,
-    UD_Ivpmovzxbq,
-    UD_Ivpmovzxbw,
-    UD_Ivpmovzxdq,
-    UD_Ivpmovzxwd,
-    UD_Ivpmovzxwq,
-    UD_Ivpmuldq,
-    UD_Ivpmulhrsw,
-    UD_Ivpmulhuw,
-    UD_Ivpmulhw,
-    UD_Ivpmulld,
-    UD_Ivpmullw,
-    UD_Ivpor,
-    UD_Ivpsadbw,
-    UD_Ivpshufb,
-    UD_Ivpshufd,
-    UD_Ivpshufhw,
-    UD_Ivpshuflw,
-    UD_Ivpsignb,
-    UD_Ivpsignd,
-    UD_Ivpsignw,
-    UD_Ivpslld,
-    UD_Ivpslldq,
-    UD_Ivpsllq,
-    UD_Ivpsllw,
-    UD_Ivpsrad,
-    UD_Ivpsraw,
-    UD_Ivpsrld,
-    UD_Ivpsrldq,
-    UD_Ivpsrlq,
-    UD_Ivpsrlw,
-    UD_Ivpsubb,
-    UD_Ivpsubd,
-    UD_Ivpsubq,
-    UD_Ivpsubsb,
-    UD_Ivpsubsw,
-    UD_Ivpsubusb,
-    UD_Ivpsubusw,
-    UD_Ivpsubw,
-    UD_Ivptest,
-    UD_Ivpunpckhbw,
-    UD_Ivpunpckhdq,
-    UD_Ivpunpckhqdq,
-    UD_Ivpunpckhwd,
-    UD_Ivpunpcklbw,
-    UD_Ivpunpckldq,
-    UD_Ivpunpcklqdq,
-    UD_Ivpunpcklwd,
-    UD_Ivpxor,
-    UD_Ivrcpps,
-    UD_Ivrcpss,
-    UD_Ivroundpd,
-    UD_Ivroundps,
-    UD_Ivroundsd,
-    UD_Ivroundss,
-    UD_Ivrsqrtps,
-    UD_Ivrsqrtss,
-    UD_Ivshufpd,
-    UD_Ivshufps,
-    UD_Ivsqrtpd,
-    UD_Ivsqrtps,
-    UD_Ivsqrtsd,
-    UD_Ivsqrtss,
-    UD_Ivstmxcsr,
-    UD_Ivsubpd,
-    UD_Ivsubps,
-    UD_Ivsubsd,
-    UD_Ivsubss,
-    UD_Ivtestpd,
-    UD_Ivtestps,
-    UD_Ivucomisd,
-    UD_Ivucomiss,
-    UD_Ivunpckhpd,
-    UD_Ivunpckhps,
-    UD_Ivunpcklpd,
-    UD_Ivunpcklps,
-    UD_Ivxorpd,
-    UD_Ivxorps,
-    UD_Ivzeroall,
-    UD_Ivzeroupper,
-    UD_Iwait,
-    UD_Iwbinvd,
-    UD_Iwrmsr,
-    UD_Ixadd,
-    UD_Ixchg,
-    UD_Ixcryptcbc,
-    UD_Ixcryptcfb,
-    UD_Ixcryptctr,
-    UD_Ixcryptecb,
-    UD_Ixcryptofb,
-    UD_Ixgetbv,
-    UD_Ixlatb,
-    UD_Ixor,
-    UD_Ixorpd,
-    UD_Ixorps,
-    UD_Ixrstor,
-    UD_Ixsave,
-    UD_Ixsetbv,
-    UD_Ixsha1,
-    UD_Ixsha256,
-    UD_Ixstore,
-    UD_Iinvalid,
-    UD_I3dnow,
-    UD_Inone,
-    UD_Idb,
-    UD_Ipause,
-    UD_MAX_MNEMONIC_CODE
-} UD_ATTR_PACKED;
-
-extern const char * ud_mnemonics_str[];
-
-#endif /* UD_ITAB_H */
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/Makefile radare2-2.8.0+dfsg/shlr/udis86/Makefile
--- radare2-2.3.0+dfsg/shlr/udis86/Makefile	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-include ../../global.mk
-include $(TOP)/libr/config.mk
-
-PYTHON=python2
-SRC=$(shell ls *.c)
-OUT=$(subst .c,.o,$(SRC))
-CFLAGS+=-DHAVE_STRING_H=1
-
-all: $(OUT)
-
-$(OUT):
-	$(CC) $(CFLAGS) $(LDFLAGS) -c `echo $@|sed -e 's,\.o,\.c,g'` -o $@
-
-sync:
-	rm -rf tmp
-	mkdir -p tmp
-	git clone --depth 1 git://github.com/radare/udis86.git
-	cd udis86/libudis86 ; ${PYTHON} ../scripts/ud_itab.py ../docs/x86/optable.xml .
-	cp -f udis86/libudis86/*.[ch] .
-	rm -rf udis86
-
-clean mrproper:
-	rm -f *.o *.d
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/syn-att.c radare2-2.8.0+dfsg/shlr/udis86/syn-att.c
--- radare2-2.3.0+dfsg/shlr/udis86/syn-att.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/syn-att.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,230 +0,0 @@
-/* udis86 - libudis86/syn-att.c
- *
- * Copyright (c) 2002-2009 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "types.h"
-#include "extern.h"
-#include "decode.h"
-#include "itab.h"
-#include "syn.h"
-#include "udint.h"
-
-/* -----------------------------------------------------------------------------
- * opr_cast() - Prints an operand cast.
- * -----------------------------------------------------------------------------
- */
-static void 
-opr_cast(struct ud* u, struct ud_operand* op)
-{
-  switch(op->size) {
-  case 16 : case 32 :
-    ud_asmprintf(u, "*");   break;
-  default: break;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * gen_operand() - Generates assembly output for each operand.
- * -----------------------------------------------------------------------------
- */
-static void 
-gen_operand(struct ud* u, struct ud_operand* op)
-{
-  switch(op->type) {
-  case UD_OP_CONST:
-    ud_asmprintf(u, "$0x%x", op->lval.udword);
-    break;
-
-  case UD_OP_REG:
-    ud_asmprintf(u, "%%%s", ud_reg_tab[op->base - UD_R_AL]);
-    break;
-
-  case UD_OP_MEM:
-    if (u->br_far) {
-        opr_cast(u, op);
-    }
-    if (u->pfx_seg) {
-      ud_asmprintf(u, "%%%s:", ud_reg_tab[u->pfx_seg - UD_R_AL]);
-    }
-    if (op->offset != 0) { 
-      ud_syn_print_mem_disp(u, op, 0);
-    }
-    if (op->base) {
-      ud_asmprintf(u, "(%%%s", ud_reg_tab[op->base - UD_R_AL]);
-    }
-    if (op->index) {
-      if (op->base) {
-        ud_asmprintf(u, ",");
-      } else {
-        ud_asmprintf(u, "(");
-      }
-      ud_asmprintf(u, "%%%s", ud_reg_tab[op->index - UD_R_AL]);
-    }
-    if (op->scale) {
-      ud_asmprintf(u, ",%d", op->scale);
-    }
-    if (op->base || op->index) {
-      ud_asmprintf(u, ")");
-    }
-    break;
-
-  case UD_OP_IMM:
-    ud_asmprintf(u, "$");
-    ud_syn_print_imm(u, op);
-    break;
-
-  case UD_OP_JIMM:
-    ud_syn_print_addr(u, ud_syn_rel_target(u, op));
-    break;
-
-  case UD_OP_PTR:
-    switch (op->size) {
-      case 32:
-        ud_asmprintf(u, "$0x%x, $0x%x", op->lval.ptr.seg, 
-          op->lval.ptr.off & 0xFFFF);
-        break;
-      case 48:
-        ud_asmprintf(u, "$0x%x, $0x%x", op->lval.ptr.seg, 
-          op->lval.ptr.off);
-        break;
-    }
-    break;
-      
-  default: return;
-  }
-}
-
-/* =============================================================================
- * translates to AT&T syntax 
- * =============================================================================
- */
-extern void 
-ud_translate_att(struct ud *u)
-{
-  //int size = 0;
-  int star = 0;
-
-  /* check if P_OSO prefix is used */
-  if (! P_OSO(u->itab_entry->prefix) && u->pfx_opr) {
-  switch (u->dis_mode) {
-    case 16: 
-      ud_asmprintf(u, "o32 ");
-      break;
-    case 32:
-    case 64:
-      ud_asmprintf(u, "o16 ");
-      break;
-  }
-  }
-
-  /* check if P_ASO prefix was used */
-  if (! P_ASO(u->itab_entry->prefix) && u->pfx_adr) {
-  switch (u->dis_mode) {
-    case 16: 
-      ud_asmprintf(u, "a32 ");
-      break;
-    case 32:
-      ud_asmprintf(u, "a16 ");
-      break;
-    case 64:
-      ud_asmprintf(u, "a32 ");
-      break;
-  }
-  }
-
-  if (u->pfx_lock)
-    ud_asmprintf(u,  "lock ");
-  if (u->pfx_rep) {
-    ud_asmprintf(u, "rep ");
-  } else if (u->pfx_repe) {
-    ud_asmprintf(u, "repe ");
-  } else if (u->pfx_repne) {
-    ud_asmprintf(u, "repne ");
-  }
-
-  /* special instructions */
-  switch (u->mnemonic) {
-  case UD_Iretf: 
-    ud_asmprintf(u, "lret "); 
-    break;
-  case UD_Idb:
-    ud_asmprintf(u, ".byte 0x%x", u->operand[0].lval.ubyte);
-    return;
-  case UD_Ijmp:
-  case UD_Icall:
-    if (u->br_far) ud_asmprintf(u,  "l");
-        if (u->operand[0].type == UD_OP_REG) {
-          star = 1;
-        }
-    ud_asmprintf(u, "%s", ud_lookup_mnemonic(u->mnemonic));
-    break;
-  case UD_Ibound:
-  case UD_Ienter:
-    if (u->operand[0].type != UD_NONE)
-      gen_operand(u, &u->operand[0]);
-    if (u->operand[1].type != UD_NONE) {
-      ud_asmprintf(u, ",");
-      gen_operand(u, &u->operand[1]);
-    }
-    return;
-  default:
-    ud_asmprintf(u, "%s", ud_lookup_mnemonic(u->mnemonic));
-  }
-
-  /*
-  if (size == 8) {
-    ud_asmprintf(u, "b");
-  } else if (size == 16) {
-    ud_asmprintf(u, "w");
-  } else if (size == 64) {
-    ud_asmprintf(u, "q");
-  }
-  */
-
-  if (star) {
-    ud_asmprintf(u, " *");
-  } else {
-    ud_asmprintf(u, " ");
-  }
-
-  if (u->operand[3].type != UD_NONE) {
-    gen_operand(u, &u->operand[3]);
-    ud_asmprintf(u, ", ");
-  }
-  if (u->operand[2].type != UD_NONE) {
-    gen_operand(u, &u->operand[2]);
-    ud_asmprintf(u, ", ");
-  }
-  if (u->operand[1].type != UD_NONE) {
-    gen_operand(u, &u->operand[1]);
-    ud_asmprintf(u, ", ");
-  }
-  if (u->operand[0].type != UD_NONE) {
-    gen_operand(u, &u->operand[0]);
-  }
-}
-
-/*
-vim: set ts=2 sw=2 expandtab
-*/
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/syn.c radare2-2.8.0+dfsg/shlr/udis86/syn.c
--- radare2-2.3.0+dfsg/shlr/udis86/syn.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/syn.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,219 +0,0 @@
-/* udis86 - libudis86/syn.c
- *
- * Copyright (c) 2002-2013 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "types.h"
-#include "decode.h"
-#include "syn.h"
-#include "udint.h"
-#include <inttypes.h>
-
-/* 
- * Register Table - Order Matters (types.h)!
- *
- */
-const char* ud_reg_tab[] = 
-{
-  "al",   "cl",   "dl",   "bl",
-  "ah",   "ch",   "dh",   "bh",
-  "spl",  "bpl",  "sil",  "dil",
-  "r8b",  "r9b",  "r10b", "r11b",
-  "r12b", "r13b", "r14b", "r15b",
-
-  "ax",   "cx",   "dx",   "bx",
-  "sp",   "bp",   "si",   "di",
-  "r8w",  "r9w",  "r10w", "r11w",
-  "r12w", "r13w", "r14w", "r15w",
-  
-  "eax",  "ecx",  "edx",  "ebx",
-  "esp",  "ebp",  "esi",  "edi",
-  "r8d",  "r9d",  "r10d", "r11d",
-  "r12d", "r13d", "r14d", "r15d",
-  
-  "rax",  "rcx",  "rdx",  "rbx",
-  "rsp",  "rbp",  "rsi",  "rdi",
-  "r8",   "r9",   "r10",  "r11",
-  "r12",  "r13",  "r14",  "r15",
-
-  "es",   "cs",   "ss",   "ds",
-  "fs",   "gs", 
-
-  "cr0",  "cr1",  "cr2",  "cr3",
-  "cr4",  "cr5",  "cr6",  "cr7",
-  "cr8",  "cr9",  "cr10", "cr11",
-  "cr12", "cr13", "cr14", "cr15",
-  
-  "dr0",  "dr1",  "dr2",  "dr3",
-  "dr4",  "dr5",  "dr6",  "dr7",
-  "dr8",  "dr9",  "dr10", "dr11",
-  "dr12", "dr13", "dr14", "dr15",
-
-  "mm0",  "mm1",  "mm2",  "mm3",
-  "mm4",  "mm5",  "mm6",  "mm7",
-
-  "st0",  "st1",  "st2",  "st3",
-  "st4",  "st5",  "st6",  "st7", 
-
-  "xmm0", "xmm1", "xmm2", "xmm3",
-  "xmm4", "xmm5", "xmm6", "xmm7",
-  "xmm8", "xmm9", "xmm10", "xmm11",
-  "xmm12", "xmm13", "xmm14", "xmm15",
-
-  "ymm0", "ymm1", "ymm2",   "ymm3",
-  "ymm4", "ymm5", "ymm6",   "ymm7",
-  "ymm8", "ymm9", "ymm10",  "ymm11",
-  "ymm12", "ymm13", "ymm14", "ymm15",
-
-  "rip"
-};
-
-
-uint64_t
-ud_syn_rel_target(struct ud *u, struct ud_operand *opr)
-{
-  uint64_t trunc_mask = 0xffffffffffffffffull;
-  if (u->dis_mode <32) trunc_mask >>= (64 - u->opr_mode);
-  switch (opr->size) {
-  case 8 : return (u->pc + opr->lval.sbyte)  & trunc_mask;
-  case 16: {
-	int delta = (opr->lval.sword & trunc_mask);
-	if ((u->pc + delta) > 0xffff)
-		return (u->pc & 0xf0000) + ((u->pc + delta) & 0xffff);
-	return (u->pc + delta);
-  }
-  case 32: return (u->pc + opr->lval.sdword) & trunc_mask;
-  default: UD_ASSERT(!"invalid relative offset size.");
-    return 0ull;
-  }
-}
-
-
-/*
- * asmprintf
- *    Printf style function for printing translated assembly
- *    output. Returns the number of characters written and
- *    moves the buffer pointer forward. On an overflow,
- *    returns a negative number and truncates the output.
- */
-int
-ud_asmprintf(struct ud *u, const char *fmt, ...)
-{
-  int ret;
-  int avail;
-  va_list ap;
-  va_start(ap, fmt);
-  avail = u->asm_buf_size - u->asm_buf_fill - 1 /* nullchar */;
-  ret = vsnprintf((char*) u->asm_buf + u->asm_buf_fill, avail, fmt, ap);
-  if (ret < 0 || ret > avail) {
-      u->asm_buf_fill = u->asm_buf_size - 1;
-  } else {
-      u->asm_buf_fill += ret;
-  }
-  va_end(ap);
-  return ret;
-}
-
-
-void
-ud_syn_print_addr(struct ud *u, uint64_t addr)
-{
-  const char *name = NULL;
-  if (u->sym_resolver) {
-    int64_t offset = 0;
-    name = u->sym_resolver(u, addr, &offset);
-    if (name) {
-      if (offset) {
-        ud_asmprintf(u, "%s%+" PRId64, name, offset);
-      } else {
-        ud_asmprintf(u, "%s", name);
-      }
-      return;
-    }
-  }
-  ud_asmprintf(u, "0x%" PRIx64, addr);
-}
-
-
-void
-ud_syn_print_imm(struct ud* u, const struct ud_operand *op)
-{
-  uint64_t v;
-  if (op->_oprcode == OP_sI && op->size != u->opr_mode) {
-    if (op->size == 8) {
-      v = (int64_t)op->lval.sbyte;
-    } else {
-      UD_ASSERT(op->size == 32);
-      v = (int64_t)op->lval.sdword;
-    }
-    if (u->opr_mode < 64) {
-      v = v & ((1ull << u->opr_mode) - 1ull);
-    }
-  } else {
-    switch (op->size) {
-    case 8 : v = op->lval.ubyte;  break;
-    case 16: v = op->lval.uword;  break;
-    case 32: v = op->lval.udword; break;
-    case 64: v = op->lval.uqword; break;
-    default: UD_ASSERT(!"invalid offset"); v = 0; /* keep cc happy */
-    }
-  }
-  ud_asmprintf(u, "0x%" PRIx64, v);
-}
-
-
-void
-ud_syn_print_mem_disp(struct ud* u, const struct ud_operand *op, int sign)
-{
-  UD_ASSERT(op->offset != 0);
- if (op->base == UD_NONE && op->index == UD_NONE) {
-    uint64_t v;
-    UD_ASSERT(op->scale == UD_NONE && op->offset != 8);
-    /* unsigned mem-offset */
-    switch (op->offset) {
-    case 16: v = op->lval.uword;  break;
-    case 32: v = op->lval.udword; break;
-    case 64: v = op->lval.uqword; break;
-    default: UD_ASSERT(!"invalid offset"); v = 0; /* keep cc happy */
-    }
-    ud_asmprintf(u, "0x%" PRIx64, v);
-  } else {
-    int64_t v;
-    UD_ASSERT(op->offset != 64);
-    switch (op->offset) {
-    case 8 : v = op->lval.sbyte;  break;
-    case 16: v = op->lval.sword;  break;
-    case 32: v = op->lval.sdword; break;
-    default: UD_ASSERT(!"invalid offset"); v = 0; /* keep cc happy */
-    }
-    if (v < 0) {
-      ud_asmprintf(u, "-0x%" PRIx64, -v);
-    } else if (v > 0) {
-      ud_asmprintf(u, "%s0x%" PRIx64, sign? "+" : "", v);
-    }
-  }
-}
-
-/*
-vim: set ts=2 sw=2 expandtab
-*/
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/syn.h radare2-2.8.0+dfsg/shlr/udis86/syn.h
--- radare2-2.3.0+dfsg/shlr/udis86/syn.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/syn.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/* udis86 - libudis86/syn.h
- *
- * Copyright (c) 2002-2009
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef UD_SYN_H
-#define UD_SYN_H
-
-#include "types.h"
-#ifndef __UD_STANDALONE__
-# include <stdarg.h>
-#endif /* __UD_STANDALONE__ */
-
-extern const char* ud_reg_tab[];
-
-uint64_t ud_syn_rel_target(struct ud*, struct ud_operand*);
-
-#ifdef __GNUC__
-int ud_asmprintf(struct ud *u, const char *fmt, ...)
-    __attribute__ ((format (printf, 2, 3)));
-#else
-int ud_asmprintf(struct ud *u, const char *fmt, ...);
-#endif
-
-void ud_syn_print_addr(struct ud *u, uint64_t addr);
-void ud_syn_print_imm(struct ud* u, const struct ud_operand *op);
-void ud_syn_print_mem_disp(struct ud* u, const struct ud_operand *, int sign);
-
-#endif /* UD_SYN_H */
-
-/*
-vim: set ts=2 sw=2 expandtab
-*/
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/syn-intel.c radare2-2.8.0+dfsg/shlr/udis86/syn-intel.c
--- radare2-2.3.0+dfsg/shlr/udis86/syn-intel.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/syn-intel.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,224 +0,0 @@
-/* udis86 - libudis86/syn-intel.c
- *
- * Copyright (c) 2002-2013 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "types.h"
-#include "extern.h"
-#include "decode.h"
-#include "itab.h"
-#include "syn.h"
-#include "udint.h"
-
-/* -----------------------------------------------------------------------------
- * opr_cast() - Prints an operand cast.
- * -----------------------------------------------------------------------------
- */
-static void 
-opr_cast(struct ud* u, struct ud_operand* op)
-{
-  if (u->br_far) {
-    ud_asmprintf(u, "far "); 
-  }
-  switch(op->size) {
-  case  8:  ud_asmprintf(u, "byte " ); break;
-  case 16:  ud_asmprintf(u, "word " ); break;
-  case 32:  ud_asmprintf(u, "dword "); break;
-  case 64:  ud_asmprintf(u, "qword "); break;
-  case 80:  ud_asmprintf(u, "tword "); break;
-  case 128: ud_asmprintf(u, "oword "); break;
-  case 256: ud_asmprintf(u, "yword "); break;
-  default: break;
-  }
-}
-
-/* -----------------------------------------------------------------------------
- * gen_operand() - Generates assembly output for each operand.
- * -----------------------------------------------------------------------------
- */
-static void gen_operand(struct ud* u, struct ud_operand* op, int syn_cast)
-{
-  switch(op->type) {
-  case UD_OP_REG:
-    ud_asmprintf(u, "%s", ud_reg_tab[op->base - UD_R_AL]);
-    break;
-
-  case UD_OP_MEM:
-    if (syn_cast) {
-      opr_cast(u, op);
-    }
-    ud_asmprintf(u, "[");
-    if (u->pfx_seg) {
-      ud_asmprintf(u, "%s:", ud_reg_tab[u->pfx_seg - UD_R_AL]);
-    }
-    if (op->base) {
-      ud_asmprintf(u, "%s", ud_reg_tab[op->base - UD_R_AL]);
-    }
-    if (op->index) {
-      ud_asmprintf(u, "%s%s", op->base != UD_NONE? "+" : "",
-                              ud_reg_tab[op->index - UD_R_AL]);
-      if (op->scale) {
-        ud_asmprintf(u, "*%d", op->scale);
-      }
-    }
-    if (op->offset != 0) {
-      ud_syn_print_mem_disp(u, op, (op->base  != UD_NONE || 
-                                    op->index != UD_NONE) ? 1 : 0);
-    }
-    ud_asmprintf(u, "]");
-    break;
-      
-  case UD_OP_IMM:
-    ud_syn_print_imm(u, op);
-    break;
-
-
-  case UD_OP_JIMM:
-    ud_syn_print_addr(u, ud_syn_rel_target(u, op));
-    break;
-
-  case UD_OP_PTR:
-    switch (op->size) {
-      case 32:
-        ud_asmprintf(u, "word 0x%x:0x%x", op->lval.ptr.seg, 
-          op->lval.ptr.off & 0xFFFF);
-        break;
-      case 48:
-        ud_asmprintf(u, "dword 0x%x:0x%x", op->lval.ptr.seg, 
-          op->lval.ptr.off);
-        break;
-    }
-    break;
-
-  case UD_OP_CONST:
-    if (syn_cast) opr_cast(u, op);
-    ud_asmprintf(u, "%d", op->lval.udword);
-    break;
-
-  default: return;
-  }
-}
-
-/* =============================================================================
- * translates to intel syntax 
- * =============================================================================
- */
-extern void
-ud_translate_intel(struct ud* u)
-{
-  /* check if P_OSO prefix is used */
-  if (!P_OSO(u->itab_entry->prefix) && u->pfx_opr) {
-    switch (u->dis_mode) {
-    case 16: ud_asmprintf(u, "o32 "); break;
-    case 32:
-    case 64: ud_asmprintf(u, "o16 "); break;
-    }
-  }
-
-  /* check if P_ASO prefix was used */
-  if (!P_ASO(u->itab_entry->prefix) && u->pfx_adr) {
-    switch (u->dis_mode) {
-    case 16: ud_asmprintf(u, "a32 "); break;
-    case 32: ud_asmprintf(u, "a16 "); break;
-    case 64: ud_asmprintf(u, "a32 "); break;
-    }
-  }
-
-  if (u->pfx_seg &&
-      u->operand[0].type != UD_OP_MEM &&
-      u->operand[1].type != UD_OP_MEM ) {
-    ud_asmprintf(u, "%s ", ud_reg_tab[u->pfx_seg - UD_R_AL]);
-  }
-
-  if (u->pfx_lock) {
-    ud_asmprintf(u, "lock ");
-  }
-  if (u->pfx_rep) {
-    ud_asmprintf(u, "rep ");
-  } else if (u->pfx_repe) {
-    ud_asmprintf(u, "repe ");
-  } else if (u->pfx_repne) {
-    ud_asmprintf(u, "repne ");
-  }
-
-  /* print the instruction mnemonic */
-  ud_asmprintf(u, "%s", ud_lookup_mnemonic(u->mnemonic));
-
-  if (u->operand[0].type != UD_NONE) {
-    int cast = 0;
-    ud_asmprintf(u, " ");
-    if (u->operand[0].type == UD_OP_MEM) {
-      if (u->operand[1].type == UD_OP_IMM   ||
-          u->operand[1].type == UD_OP_CONST ||
-          u->operand[1].type == UD_NONE     ||
-          (u->operand[0].size != u->operand[1].size)) {
-          cast = 1;
-      } else if (u->operand[1].type == UD_OP_REG &&
-                 u->operand[1].base == UD_R_CL) {
-          switch (u->mnemonic) {
-          case UD_Ircl:
-          case UD_Irol:
-          case UD_Iror:
-          case UD_Ircr:
-          case UD_Ishl:
-          case UD_Ishr:
-          case UD_Isar:
-              cast = 1;
-              break;
-          default: break;
-          }
-      }
-    }
-    gen_operand(u, &u->operand[0], cast);
-  }
-
-  if (u->operand[1].type != UD_NONE) {
-    int cast = 0;
-    ud_asmprintf(u, ", ");
-    if (u->operand[1].type == UD_OP_MEM &&
-        u->operand[0].size != u->operand[1].size && 
-        !ud_opr_is_sreg(&u->operand[0])) {
-      cast = 1;
-    }
-    gen_operand(u, &u->operand[1], cast);
-  }
-
-  if (u->operand[2].type != UD_NONE) {
-    int cast = 0;
-    ud_asmprintf(u, ", ");
-    if (u->operand[2].type == UD_OP_MEM &&
-        u->operand[2].size != u->operand[1].size) {
-      cast = 1;
-    }
-    gen_operand(u, &u->operand[2], cast);
-  }
-
-  if (u->operand[3].type != UD_NONE) {
-    ud_asmprintf(u, ", ");
-    gen_operand(u, &u->operand[3], 0);
-  }
-}
-
-/*
-vim: set ts=2 sw=2 expandtab
-*/
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/types.h radare2-2.8.0+dfsg/shlr/udis86/types.h
--- radare2-2.3.0+dfsg/shlr/udis86/types.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/types.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,297 +0,0 @@
-/* udis86 - libudis86/types.h
- *
- * Copyright (c) 2002-2013 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef UD_TYPES_H
-#define UD_TYPES_H
-
-#ifdef __KERNEL__
-  /* 
-   * -D__KERNEL__ is automatically passed on the command line when
-   * building something as part of the Linux kernel. Assume standalone
-   * mode.
-   */
-# include <linux/kernel.h>
-# include <linux/string.h>
-# ifndef __UD_STANDALONE__
-#  define __UD_STANDALONE__ 1
-# endif
-#endif /* __KERNEL__ */
-
-#if !defined(__UD_STANDALONE__)
-# include <stdint.h>
-# include <stdio.h>
-#endif
-
-/* gcc specific extensions */
-#ifdef __GNUC__
-# define UD_ATTR_PACKED __attribute__((packed))
-#else
-# define UD_ATTR_PACKED
-#endif /* UD_ATTR_PACKED */
-
-
-/* -----------------------------------------------------------------------------
- * All possible "types" of objects in udis86. Order is Important!
- * -----------------------------------------------------------------------------
- */
-enum ud_type
-{
-  UD_NONE,
-
-  /* 8 bit GPRs */
-  UD_R_AL,  UD_R_CL,  UD_R_DL,  UD_R_BL,
-  UD_R_AH,  UD_R_CH,  UD_R_DH,  UD_R_BH,
-  UD_R_SPL, UD_R_BPL, UD_R_SIL, UD_R_DIL,
-  UD_R_R8B, UD_R_R9B, UD_R_R10B,  UD_R_R11B,
-  UD_R_R12B,  UD_R_R13B,  UD_R_R14B,  UD_R_R15B,
-
-  /* 16 bit GPRs */
-  UD_R_AX,  UD_R_CX,  UD_R_DX,  UD_R_BX,
-  UD_R_SP,  UD_R_BP,  UD_R_SI,  UD_R_DI,
-  UD_R_R8W, UD_R_R9W, UD_R_R10W,  UD_R_R11W,
-  UD_R_R12W,  UD_R_R13W,  UD_R_R14W,  UD_R_R15W,
-  
-  /* 32 bit GPRs */
-  UD_R_EAX, UD_R_ECX, UD_R_EDX, UD_R_EBX,
-  UD_R_ESP, UD_R_EBP, UD_R_ESI, UD_R_EDI,
-  UD_R_R8D, UD_R_R9D, UD_R_R10D,  UD_R_R11D,
-  UD_R_R12D,  UD_R_R13D,  UD_R_R14D,  UD_R_R15D,
-  
-  /* 64 bit GPRs */
-  UD_R_RAX, UD_R_RCX, UD_R_RDX, UD_R_RBX,
-  UD_R_RSP, UD_R_RBP, UD_R_RSI, UD_R_RDI,
-  UD_R_R8,  UD_R_R9,  UD_R_R10, UD_R_R11,
-  UD_R_R12, UD_R_R13, UD_R_R14, UD_R_R15,
-
-  /* segment registers */
-  UD_R_ES,  UD_R_CS,  UD_R_SS,  UD_R_DS,
-  UD_R_FS,  UD_R_GS,  
-
-  /* control registers*/
-  UD_R_CR0, UD_R_CR1, UD_R_CR2, UD_R_CR3,
-  UD_R_CR4, UD_R_CR5, UD_R_CR6, UD_R_CR7,
-  UD_R_CR8, UD_R_CR9, UD_R_CR10,  UD_R_CR11,
-  UD_R_CR12,  UD_R_CR13,  UD_R_CR14,  UD_R_CR15,
-  
-  /* debug registers */
-  UD_R_DR0, UD_R_DR1, UD_R_DR2, UD_R_DR3,
-  UD_R_DR4, UD_R_DR5, UD_R_DR6, UD_R_DR7,
-  UD_R_DR8, UD_R_DR9, UD_R_DR10,  UD_R_DR11,
-  UD_R_DR12,  UD_R_DR13,  UD_R_DR14,  UD_R_DR15,
-
-  /* mmx registers */
-  UD_R_MM0, UD_R_MM1, UD_R_MM2, UD_R_MM3,
-  UD_R_MM4, UD_R_MM5, UD_R_MM6, UD_R_MM7,
-
-  /* x87 registers */
-  UD_R_ST0, UD_R_ST1, UD_R_ST2, UD_R_ST3,
-  UD_R_ST4, UD_R_ST5, UD_R_ST6, UD_R_ST7, 
-
-  /* extended multimedia registers */
-  UD_R_XMM0,  UD_R_XMM1,  UD_R_XMM2,  UD_R_XMM3,
-  UD_R_XMM4,  UD_R_XMM5,  UD_R_XMM6,  UD_R_XMM7,
-  UD_R_XMM8,  UD_R_XMM9,  UD_R_XMM10, UD_R_XMM11,
-  UD_R_XMM12, UD_R_XMM13, UD_R_XMM14, UD_R_XMM15,
-
-  /* 256B multimedia registers */
-  UD_R_YMM0,  UD_R_YMM1,  UD_R_YMM2,  UD_R_YMM3,
-  UD_R_YMM4,  UD_R_YMM5,  UD_R_YMM6,  UD_R_YMM7,
-  UD_R_YMM8,  UD_R_YMM9,  UD_R_YMM10, UD_R_YMM11,
-  UD_R_YMM12, UD_R_YMM13, UD_R_YMM14, UD_R_YMM15,
-
-  UD_R_RIP,
-
-  /* Operand Types */
-  UD_OP_REG,  UD_OP_MEM,  UD_OP_PTR,  UD_OP_IMM,  
-  UD_OP_JIMM, UD_OP_CONST
-};
-
-enum ud_eflag_state
-{
-  UD_FLAG_UNCHANGED,
-  UD_FLAG_TESTED,
-  UD_FLAG_MODIFIED,
-  UD_FLAG_RESET,
-  UD_FLAG_SET,
-  UD_FLAG_UNDEFINED,
-  UD_FLAG_PRIOR
-};
-
-enum ud_operand_access
-{
-  UD_OP_ACCESS_READ = 1,
-  UD_OP_ACCESS_WRITE = 2
-};
-
-/* This structure describes the state of the EFLAGS register
- * once an instruction has been executed.
- */
-struct ud_eflags
-{
-    enum ud_eflag_state of_state;
-    enum ud_eflag_state sf_state;
-    enum ud_eflag_state zf_state;
-    enum ud_eflag_state af_state;
-    enum ud_eflag_state pf_state;
-    enum ud_eflag_state cf_state;
-    enum ud_eflag_state tf_state;
-    enum ud_eflag_state if_state;
-    enum ud_eflag_state df_state;
-    enum ud_eflag_state nt_state;
-    enum ud_eflag_state rf_state;
-};
-
-#include "itab.h"
-
-union ud_lval {
-  int8_t     sbyte;
-  uint8_t    ubyte;
-  int16_t    sword;
-  uint16_t   uword;
-  int32_t    sdword;
-  uint32_t   udword;
-  int64_t    sqword;
-  uint64_t   uqword;
-  struct {
-    uint16_t seg;
-    uint32_t off;
-  } ptr;
-};
-
-/* -----------------------------------------------------------------------------
- * struct ud_operand - Disassembled instruction Operand.
- * -----------------------------------------------------------------------------
- */
-struct ud_operand {
-  enum ud_type    type;
-  uint16_t        size;
-  enum ud_type    base;
-  enum ud_type    index;
-  uint8_t         scale;  
-  uint8_t         offset;
-  union ud_lval   lval;
-  uint8_t         signed_lval;
-  uint8_t         access;
-  /*
-   * internal use only
-   */
-  uint64_t        _legacy; /* this will be removed in 1.8 */
-  uint8_t         _oprcode;
-};
-
-/* -----------------------------------------------------------------------------
- * struct ud - The udis86 object.
- * -----------------------------------------------------------------------------
- */
-struct ud
-{
-  /*
-   * input buffering
-   */
-  int       (*inp_hook) (struct ud*);
-#ifndef __UD_STANDALONE__
-  FILE*     inp_file;
-#endif
-  const uint8_t* inp_buf;
-  size_t    inp_buf_size;
-  size_t    inp_buf_index;
-  uint8_t   inp_curr;
-  size_t    inp_ctr;
-  uint8_t   inp_sess[64];
-  int       inp_end;
-  int       inp_peek;
-
-  void      (*translator)(struct ud*);
-  uint64_t  insn_offset;
-  char      insn_hexcode[64];
-
-  /*
-   * Assembly output buffer
-   */
-  char     *asm_buf;
-  size_t    asm_buf_size;
-  size_t    asm_buf_fill;
-  char      asm_buf_int[128];
-
-  /*
-   * Symbol resolver for use in the translation phase.
-   */
-  const char* (*sym_resolver)(struct ud*, uint64_t addr, int64_t *offset);
-
-  uint8_t   dis_mode;
-  uint64_t  pc;
-  uint8_t   vendor;
-  enum ud_mnemonic_code mnemonic;
-  struct ud_operand operand[4];
-  uint8_t   error;
-  uint8_t   _rex;
-  uint8_t   pfx_rex;
-  uint8_t   pfx_seg;
-  uint8_t   pfx_opr;
-  uint8_t   pfx_adr;
-  uint8_t   pfx_lock;
-  uint8_t   pfx_str;
-  uint8_t   pfx_rep;
-  uint8_t   pfx_repe;
-  uint8_t   pfx_repne;
-  uint8_t   opr_mode;
-  uint8_t   adr_mode;
-  uint8_t   br_far;
-  uint8_t   br_near;
-  uint8_t   have_modrm;
-  uint8_t   modrm;
-  uint8_t   modrm_offset;
-  uint8_t   vex_op;
-  uint8_t   vex_b1;
-  uint8_t   vex_b2;
-  uint8_t   primary_opcode;
-  void *    user_opaque_data;
-  struct ud_itab_entry * itab_entry;
-  struct ud_lookup_table_list_entry *le;
-};
-
-/* -----------------------------------------------------------------------------
- * Type-definitions
- * -----------------------------------------------------------------------------
- */
-typedef enum ud_type          ud_type_t;
-typedef enum ud_mnemonic_code ud_mnemonic_code_t;
-
-typedef struct ud             ud_t;
-typedef struct ud_operand     ud_operand_t;
-
-#define UD_SYN_INTEL          ud_translate_intel
-#define UD_SYN_ATT            ud_translate_att
-#define UD_EOI                (-1)
-#define UD_INP_CACHE_SZ       32
-#define UD_VENDOR_AMD         0
-#define UD_VENDOR_INTEL       1
-#define UD_VENDOR_ANY         2
-
-#endif
-
-/*
-vim: set ts=2 sw=2 expandtab
-*/
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/udint.h radare2-2.8.0+dfsg/shlr/udis86/udint.h
--- radare2-2.3.0+dfsg/shlr/udis86/udint.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/udint.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/* udis86 - libudis86/udint.h -- definitions for internal use only
- * 
- * Copyright (c) 2002-2009 Vivek Thampi
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _UDINT_H_
-#define _UDINT_H_
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#if defined(UD_DEBUG) && HAVE_ASSERT_H
-# include <assert.h>
-# define UD_ASSERT(_x) assert(_x)
-#else
-# define UD_ASSERT(_x)
-#endif /* !HAVE_ASSERT_H */
-
-#if defined(UD_DEBUG)
-  #define UDERR(u, msg) \
-    do { \
-      (u)->error = 1; \
-      fprintf(stderr, "decode-error: %s:%d: %s", \
-              __FILE__, __LINE__, (msg)); \
-    } while (0)
-#else
-  #define UDERR(u, m) \
-    do { \
-      (u)->error = 1; \
-    } while (0)
-#endif /* !LOGERR */
-
-#define UD_RETURN_ON_ERROR(u) \
-  do { \
-    if ((u)->error != 0) { \
-      return (u)->error; \
-    } \
-  } while (0)
-
-#define UD_RETURN_WITH_ERROR(u, m) \
-  do { \
-    UDERR(u, m); \
-    return (u)->error; \
-  } while (0)
-
-#ifndef __UD_STANDALONE__
-# define UD_NON_STANDALONE(x) x
-#else
-# define UD_NON_STANDALONE(x)
-#endif
-
-/* printf formatting int64 specifier */
-#ifdef FMT64
-# undef FMT64
-#endif
-#if defined(_MSC_VER) || defined(__BORLANDC__) || __WINDOWS__ || __MINGW32__ && !defined(__CYGWIN__)
-# define FMT64 "I64"
-#else
-# if defined(__APPLE__)
-#  define FMT64 "ll"
-# elif defined(__amd64__) || defined(__x86_64__)
-#  define FMT64 "l"
-# else 
-#  define FMT64 "ll"
-# endif /* !x64 */
-#endif
-
-/* define an inline macro */
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-# define UD_INLINE __inline /* MS Visual Studio requires __inline
-                               instead of inline for C code */
-#else
-# define UD_INLINE inline
-#endif
-
-#endif /* _UDINT_H_ */
diff -Nru radare2-2.3.0+dfsg/shlr/udis86/udis86.c radare2-2.8.0+dfsg/shlr/udis86/udis86.c
--- radare2-2.3.0+dfsg/shlr/udis86/udis86.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/udis86/udis86.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,506 +0,0 @@
-/* udis86 - libudis86/udis86.c
- *
- * Copyright (c) 2002-2013 Vivek Thampi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "udint.h"
-#include "extern.h"
-#include "decode.h"
-#include <string.h>
-
-#if !defined(__UD_STANDALONE__)
-# if HAVE_STRING_H
-#  include <string.h>
-# endif
-#endif /* !__UD_STANDALONE__ */
-
-static void ud_inp_init(struct ud *u);
-
-/* =============================================================================
- * ud_init
- *    Initializes ud_t object.
- * =============================================================================
- */
-extern void
-ud_init(struct ud* u)
-{
-  memset((void*)u, 0, sizeof(struct ud));
-  ud_set_mode(u, 16);
-  u->mnemonic = UD_Iinvalid;
-  ud_set_pc(u, 0);
-#ifndef __UD_STANDALONE__
-  ud_set_input_file(u, stdin);
-#endif /* __UD_STANDALONE__ */
-
-  ud_set_asm_buffer(u, u->asm_buf_int, sizeof(u->asm_buf_int));
-}
-
-
-/* =============================================================================
- * ud_disassemble
- *    Disassembles one instruction and returns the number of
- *    bytes disassembled. A zero means end of disassembly.
- * =============================================================================
- */
-extern unsigned int
-ud_disassemble(struct ud* u)
-{
-  int len;
-  if (u->inp_end) {
-    return 0;
-  }
-  if ((len = ud_decode(u)) > 0) {
-    if (u->translator != NULL) {
-      u->asm_buf[0] = '\0';
-      u->translator(u);
-    }
-  }
-  return len;
-}
-
-
-/* =============================================================================
- * ud_set_mode() - Set Disassemly Mode.
- * =============================================================================
- */
-extern void
-ud_set_mode(struct ud* u, uint8_t m)
-{
-  switch(m) {
-  case 16:
-  case 32:
-  case 64: u->dis_mode = m ; return;
-  default: u->dis_mode = 16; return;
-  }
-}
-
-/* =============================================================================
- * ud_set_vendor() - Set vendor.
- * =============================================================================
- */
-extern void
-ud_set_vendor(struct ud* u, unsigned v)
-{
-  switch(v) {
-  case UD_VENDOR_INTEL:
-    u->vendor = v;
-    break;
-  case UD_VENDOR_ANY:
-    u->vendor = v;
-    break;
-  default:
-    u->vendor = UD_VENDOR_AMD;
-  }
-}
-
-/* =============================================================================
- * ud_set_pc() - Sets code origin.
- * =============================================================================
- */
-extern void
-ud_set_pc(struct ud* u, uint64_t o)
-{
-  u->pc = o;
-}
-
-/* =============================================================================
- * ud_set_syntax() - Sets the output syntax.
- * =============================================================================
- */
-extern void
-ud_set_syntax(struct ud* u, void (*t)(struct ud*))
-{
-  u->translator = t;
-}
-
-/* =============================================================================
- * ud_insn() - returns the disassembled instruction
- * =============================================================================
- */
-const char*
-ud_insn_asm(const struct ud* u)
-{
-  return u->asm_buf;
-}
-
-/* =============================================================================
- * ud_insn_offset() - Returns the offset.
- * =============================================================================
- */
-uint64_t
-ud_insn_off(const struct ud* u)
-{
-  return u->insn_offset;
-}
-
-
-/* =============================================================================
- * ud_insn_hex() - Returns hex form of disassembled instruction.
- * =============================================================================
- */
-const char*
-ud_insn_hex(struct ud* u)
-{
-  u->insn_hexcode[0] = 0;
-  if (!u->error) {
-    unsigned int i;
-    const unsigned char *src_ptr = ud_insn_ptr(u);
-    char* src_hex;
-    src_hex = (char*) u->insn_hexcode;
-    /* for each byte used to decode instruction */
-    for (i = 0; i < ud_insn_len(u) && i < sizeof(u->insn_hexcode) / 2;
-         ++i, ++src_ptr) {
-      sprintf(src_hex, "%02x", *src_ptr & 0xFF);
-      src_hex += 2;
-    }
-  }
-  return u->insn_hexcode;
-}
-
-
-/* =============================================================================
- * ud_insn_ptr
- *    Returns a pointer to buffer containing the bytes that were
- *    disassembled.
- * =============================================================================
- */
-extern const uint8_t*
-ud_insn_ptr(const struct ud* u)
-{
-  return (u->inp_buf == NULL) ?
-            u->inp_sess : u->inp_buf + (u->inp_buf_index - u->inp_ctr);
-}
-
-
-/* =============================================================================
- * ud_insn_len
- *    Returns the count of bytes disassembled.
- * =============================================================================
- */
-extern unsigned int
-ud_insn_len(const struct ud* u)
-{
-  return u->inp_ctr;
-}
-
-
-/* =============================================================================
- * ud_insn_get_opr
- *    Return the operand struct representing the nth operand of
- *    the currently disassembled instruction. Returns NULL if
- *    there's no such operand.
- * =============================================================================
- */
-const struct ud_operand*
-ud_insn_opr(const struct ud *u, unsigned int n)
-{
-  if (n > 3 || u->operand[n].type == UD_NONE) {
-    return NULL;
-  } else {
-    return &u->operand[n];
-  }
-}
-
-
-/* =============================================================================
- * ud_opr_is_sreg
- *    Returns non-zero if the given operand is of a segment register type.
- * =============================================================================
- */
-int
-ud_opr_is_sreg(const struct ud_operand *opr)
-{
-  return opr->type == UD_OP_REG &&
-         opr->base >= UD_R_ES   &&
-         opr->base <= UD_R_GS;
-}
-
-
-/* =============================================================================
- * ud_opr_is_sreg
- *    Returns non-zero if the given operand is of a general purpose
- *    register type.
- * =============================================================================
- */
-int
-ud_opr_is_gpr(const struct ud_operand *opr)
-{
-  return opr->type == UD_OP_REG &&
-         opr->base >= UD_R_AL   &&
-         opr->base <= UD_R_R15;
-}
-
-
-/* =============================================================================
- * ud_set_user_opaque_data
- * ud_get_user_opaque_data
- *    Get/set user opaqute data pointer
- * =============================================================================
- */
-void
-ud_set_user_opaque_data(struct ud * u, void* opaque)
-{
-  u->user_opaque_data = opaque;
-}
-
-void*
-ud_get_user_opaque_data(const struct ud *u)
-{
-  return u->user_opaque_data;
-}
-
-
-/* =============================================================================
- * ud_set_asm_buffer
- *    Allow the user to set an assembler output buffer. If `buf` is NULL,
- *    we switch back to the internal buffer.
- * =============================================================================
- */
-void
-ud_set_asm_buffer(struct ud *u, char *buf, size_t size)
-{
-  if (buf == NULL) {
-    ud_set_asm_buffer(u, u->asm_buf_int, sizeof(u->asm_buf_int));
-  } else {
-    u->asm_buf = buf;
-    u->asm_buf_size = size;
-  }
-}
-
-
-/* =============================================================================
- * ud_set_sym_resolver
- *    Set symbol resolver for relative targets used in the translation
- *    phase.
- *
- *    The resolver is a function that takes a uint64_t address and returns a
- *    symbolic name for the that address. The function also takes a second
- *    argument pointing to an integer that the client can optionally set to a
- *    non-zero value for offsetted targets. (symbol+offset) The function may
- *    also return NULL, in which case the translator only prints the target
- *    address.
- *
- *    The function pointer maybe NULL which resets symbol resolution.
- * =============================================================================
- */
-void
-ud_set_sym_resolver(struct ud *u, const char* (*resolver)(struct ud*,
-                                                          uint64_t addr,
-                                                          int64_t *offset))
-{
-  u->sym_resolver = resolver;
-}
-
-
-/* =============================================================================
- * ud_insn_mnemonic
- *    Return the current instruction mnemonic.
- * =============================================================================
- */
-enum ud_mnemonic_code
-ud_insn_mnemonic(const struct ud *u)
-{
-  return u->mnemonic;
-}
-
-
-/* =============================================================================
- * ud_lookup_mnemonic
- *    Looks up mnemonic code in the mnemonic string table.
- *    Returns NULL if the mnemonic code is invalid.
- * =============================================================================
- */
-const char*
-ud_lookup_mnemonic(enum ud_mnemonic_code c)
-{
-  if (c < UD_MAX_MNEMONIC_CODE) {
-    return ud_mnemonics_str[c];
-  } else {
-    return NULL;
-  }
-}
-
-/* =============================================================================
- * ud_lookup_eflags
- *    Looks up eflags information structure
- *    Returns NULL if invalid.
- * =============================================================================
- */
-const struct ud_eflags*
-ud_lookup_eflags(struct ud *u)
-{
-  if (u == NULL || u->itab_entry == NULL) {
-    return NULL;
-  } else {
-    return &u->itab_entry->eflags;
-  }
-}
-
-/* =============================================================================
- * ud_lookup_implicit_reg_used_list
- *    Returns the list of register implicitly used.
- *    The list is terminated by UD_NONE.
- *    Returns NULL if invalid.
- * =============================================================================
- */
-const enum ud_type*
-ud_lookup_implicit_reg_used_list(struct ud *u) {
-  if (u == NULL || u->itab_entry == NULL) {
-    return NULL;
-  } else {
-    return u->itab_entry->implicit_register_uses;
-  }
-}
-
-/* =============================================================================
- * ud_lookup_implicit_reg_used_list
- *    Returns the list of register implicitly modified.
- *    The list is terminated by UD_NONE.
- *    Returns NULL if invalid.
- * =============================================================================
- */
-const enum ud_type*
-ud_lookup_implicit_reg_defined_list(struct ud *u) {
-  if (u == NULL || u->itab_entry == NULL) {
-    return NULL;
-  } else {
-    return u->itab_entry->implicit_register_defs;
-  }
-}
-
-/*
- * ud_inp_init
- *    Initializes the input system.
- */
-static void
-ud_inp_init(struct ud *u)
-{
-  u->inp_hook      = NULL;
-  u->inp_buf       = NULL;
-  u->inp_buf_size  = 0;
-  u->inp_buf_index = 0;
-  u->inp_curr      = 0;
-  u->inp_ctr       = 0;
-  u->inp_end       = 0;
-  u->inp_peek      = UD_EOI;
-  UD_NON_STANDALONE(u->inp_file = NULL);
-}
-
-
-/* =============================================================================
- * ud_inp_set_hook
- *    Sets input hook.
- * =============================================================================
- */
-void
-ud_set_input_hook(register struct ud* u, int (*hook)(struct ud*))
-{
-  ud_inp_init(u);
-  u->inp_hook = hook;
-}
-
-/* =============================================================================
- * ud_inp_set_buffer
- *    Set buffer as input.
- * =============================================================================
- */
-void
-ud_set_input_buffer(register struct ud* u, const uint8_t* buf, size_t len)
-{
-  ud_inp_init(u);
-  u->inp_buf = buf;
-  u->inp_buf_size = len;
-  u->inp_buf_index = 0;
-}
-
-
-#ifndef __UD_STANDALONE__
-/* =============================================================================
- * ud_input_set_file
- *    Set FILE as input.
- * =============================================================================
- */
-static int
-inp_file_hook(struct ud* u)
-{
-  return fgetc(u->inp_file);
-}
-
-void
-ud_set_input_file(register struct ud* u, FILE* f)
-{
-  ud_inp_init(u);
-  u->inp_hook = inp_file_hook;
-  u->inp_file = f;
-}
-#endif /* __UD_STANDALONE__ */
-
-
-/* =============================================================================
- * ud_input_skip
- *    Skip n input bytes.
- * ============================================================================
- */
-void
-ud_input_skip(struct ud* u, size_t n)
-{
-  if (u->inp_end) {
-    return;
-  }
-  if (u->inp_buf == NULL) {
-    while (n--) {
-      int c = u->inp_hook(u);
-      if (c == UD_EOI) {
-        goto eoi;
-      }
-    }
-    return;
-  } else {
-    if (n > u->inp_buf_size ||
-        u->inp_buf_index > u->inp_buf_size - n) {
-      u->inp_buf_index = u->inp_buf_size;
-      goto eoi;
-    }
-    u->inp_buf_index += n;
-    return;
-  }
-eoi:
-  u->inp_end = 1;
-  UDERR(u, "cannot skip, eoi received\b");
-  return;
-}
-
-
-/* =============================================================================
- * ud_input_end
- *    Returns non-zero on end-of-input.
- * =============================================================================
- */
-int
-ud_input_end(const struct ud *u)
-{
-  return u->inp_end;
-}
-
-/* vim:set ts=2 sw=2 expandtab */
diff -Nru radare2-2.3.0+dfsg/shlr/windbg/profiles.h radare2-2.8.0+dfsg/shlr/windbg/profiles.h
--- radare2-2.3.0+dfsg/shlr/windbg/profiles.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/windbg/profiles.h	2018-08-07 14:12:36.000000000 +0000
@@ -1,72 +1,76 @@
 Profile XP_SP2_X86 = {
 	2600, 2, 32, 1,
-	{ 0x0088,0x0084,0x01b0,0x0174,0x011c,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x0088,0x0084,0x01b0,0x0174,0x011c,0x0190,0x0018,0x0008,0x0010,0x0038,0x0000,0x022c,0x0228,0x01ec,0x0004 },
 };
 Profile XP_SP3_X86 = {
 	2600, 3, 32, 1,
-	{ 0x0088,0x0084,0x01b0,0x0174,0x011c,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x0088,0x0084,0x01b0,0x0174,0x011c,0x0190,0x0018,0x0008,0x0010,0x0038,0x0000,0x022c,0x0228,0x01ec,0x0004 },
 };
 Profile WIN7_SP0_X86 = {
 	7601, 0, 32, 0,
-	{ 0x00b8,0x00b4,0x01a8,0x016c,0x0278,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x00b8,0x00b4,0x01a8,0x016c,0x0278,0x0188,0x0018,0x0008,0x0010,0x0038,0x0000,0x0268,0x0260,0x022c,0x0004 },
 };
 Profile WIN7_SP1_X86 = {
 	7601, 1, 32, 0,
-	{ 0x00b8,0x00b4,0x01a8,0x016c,0x0278,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x00b8,0x00b4,0x01a8,0x016c,0x0278,0x0188,0x0018,0x0008,0x0010,0x0038,0x0000,0x0268,0x0260,0x022c,0x0004 },
 };
 Profile WIN7_SP0_X64 = {
 	7601, 0, 64, 0,
-	{ 0x0188,0x0180,0x0338,0x02e0,0x0448,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x0188,0x0180,0x0338,0x02e0,0x0448,0x0308,0x0028,0x0010,0x0020,0x0060,0x0000,0x0420,0x0410,0x03b0,0x0008 },
 };
 Profile WIN7_SP1_X64 = {
 	7601, 1, 64, 0,
-	{ 0x0188,0x0180,0x0338,0x02e0,0x0448,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x0188,0x0180,0x0338,0x02e0,0x0448,0x0308,0x0028,0x0010,0x0020,0x0060,0x0000,0x0420,0x0410,0x03b0,0x0008 },
 };
-Profile WIN10_SP0_X64 = {
+Profile WIN10_RS1_X64 = { // Windows 10 (Anniversary Update)
 	14393, 0, 64, 0,
-	{ 0x02f0,0x02e8,0x03f8,0x0450,0x0620,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x02f0,0x02e8,0x03f8,0x0450,0x0620,0x0488,0x0028,0x0010,0x0020,0x0060,0x0000,0x0698,0x0688,0x0630,0x0008 },
+};
+Profile WIN10_RS4_X64 = { // Windows 10 (April 2018 Update)
+	17134, 0, 64, 0,
+	{ 0x02e8,0x02e0,0x03f8,0x0450,0x0628,0x0488,0x0028,0x0010,0x0020,0x0060,0x0000,0x06a8,0x0690,0x0638,0x0008 },
 };
 Profile VISTA_SP0_X86 = {
 	6000, 0, 32, 0,
-	{ 0x00a0,0x009c,0x0188,0x014c,0x0238,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x00a0,0x009c,0x0188,0x014c,0x0238,0x0168,0x0018,0x0008,0x0010,0x0038,0x0000,0x0248,0x0240,0x020c,0x0004 },
 };
 Profile VISTA_SP0_X64 = {
 	6000, 0, 64, 0,
-	{ 0x00e8,0x00e0,0x0290,0x0238,0x0380,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x00e8,0x00e0,0x0290,0x0238,0x0380,0x0260,0x0028,0x0010,0x0020,0x0060,0x0000,0x03f0,0x03e0,0x0380,0x0008 },
 };
 Profile VISTA_SP1_X86 = {
 	6000, 1, 32, 0,
-	{ 0x00a0,0x009c,0x0188,0x014c,0x0238,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x00a0,0x009c,0x0188,0x014c,0x0238,0x0168,0x0018,0x0008,0x0010,0x0038,0x0000,0x0248,0x0240,0x020c,0x0004 },
 };
 Profile VISTA_SP1_X64 = {
 	6000, 1, 64, 0,
-	{ 0x00e8,0x00e0,0x0290,0x0238,0x0380,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x00e8,0x00e0,0x0290,0x0238,0x0380,0x0260,0x0028,0x0010,0x0020,0x0060,0x0000,0x03f0,0x03e0,0x0380,0x0008 },
 };
 Profile VISTA_SP2_X86 = {
 	6002, 2, 32, 0,
-	{ 0x00a0,0x009c,0x0188,0x014c,0x0238,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x00a0,0x009c,0x0188,0x014c,0x0238,0x0168,0x0018,0x0008,0x0010,0x0038,0x0000,0x0248,0x0240,0x020c,0x0004 },
 };
 Profile VISTA_SP2_X64 = {
 	6002, 2, 64, 0,
-	{ 0x00e8,0x00e0,0x0290,0x0238,0x0380,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x00e8,0x00e0,0x0290,0x0238,0x0380,0x0260,0x0028,0x0010,0x0020,0x0060,0x0000,0x03f0,0x03e0,0x0380,0x0008 },
 };
 Profile WIN2003_SP0_X86 = {
 	3790, 0, 32, 0,
-	{ 0x0088,0x0084,0x0190,0x0154,0x0258,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x0088,0x0084,0x0190,0x0154,0x0258,0x0170,0x0018,0x0008,0x0010,0x0038,0x0000,0x0234,0x0230,0x01f4,0x0004 },
 };
 Profile WIN2003_SP1_X86 = {
 	3790, 1, 32, 0,
-	{ 0x0098,0x0094,0x01a0,0x0164,0x0250,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x0098,0x0094,0x01a0,0x0164,0x0250,0x0180,0x0018,0x0008,0x0010,0x0038,0x0000,0x0224,0x0220,0x01e4,0x0004 },
 };
 Profile WIN2003_SP1_X64 = {
 	3790, 1, 64, 0,
-	{ 0x00e0,0x00d8,0x02c0,0x0268,0x0398,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x00e0,0x00d8,0x02c0,0x0268,0x0398,0x0290,0x0028,0x0010,0x0020,0x0060,0x0000,0x03e8,0x03e0,0x0370,0x0008 },
 };
 Profile WIN2003_SP2_X86 = {
 	3790, 2, 32, 0,
-	{ 0x0098,0x0094,0x01a0,0x0164,0x0250,0x0018,0x0008,0x0010,0x0038 },
+	{ 0x0098,0x0094,0x01a0,0x0164,0x0250,0x0180,0x0018,0x0008,0x0010,0x0038,0x0000,0x0224,0x0220,0x01e4,0x0004 },
 };
 Profile WIN2003_SP2_X64 = {
 	3790, 2, 64, 0,
-	{ 0x00e0,0x00d8,0x02c0,0x0268,0x0398,0x0028,0x0010,0x0020,0x0060 },
+	{ 0x00e0,0x00d8,0x02c0,0x0268,0x0398,0x0290,0x0028,0x0010,0x0020,0x0060,0x0000,0x03d0,0x03c8,0x0358,0x0008 },
 };
diff -Nru radare2-2.3.0+dfsg/shlr/windbg/windbg.c radare2-2.8.0+dfsg/shlr/windbg/windbg.c
--- radare2-2.3.0+dfsg/shlr/windbg/windbg.c	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/windbg/windbg.c	2018-08-07 14:12:36.000000000 +0000
@@ -33,7 +33,8 @@
 	&WIN2003_SP1_X64,
 	&WIN2003_SP2_X86,
 	&WIN2003_SP2_X64,
-	&WIN10_SP0_X64,
+	&WIN10_RS1_X64, // Windows 10 (Anniversary Update)
+	&WIN10_RS4_X64, // Windows 10 (April 2018 Update)
 	NULL,
 };
 
@@ -72,6 +73,7 @@
 	int is_x64;
 	Profile *os_profile;
 	RList *plist_cache;
+	RList *tlist_cache;
 	ut64 dbg_addr;
 	WindProc *target;
 };
@@ -156,6 +158,7 @@
 		return;
 	}
 	r_list_free (ctx->plist_cache);
+	r_list_free (ctx->tlist_cache);
 	iob_close (ctx->io_ptr);
 	free (ctx);
 }
@@ -351,6 +354,7 @@
 		WindProc *proc = calloc (1, sizeof(WindProc));
 
 		strcpy (proc->name, (const char *) buf);
+		proc->eprocess = ptr;
 		proc->vadroot = vadroot;
 		proc->uniqueid = uniqueid;
 		proc->dir_base_table = dir_base_table;
@@ -367,6 +371,75 @@
 	return ret;
 }
 
+RList *windbg_list_threads(WindCtx *ctx) {
+	RList *ret;
+	ut64 ptr, base;
+
+	if (!ctx || !ctx->io_ptr || !ctx->syncd) {
+		return NULL;
+	}
+
+	if (ctx->tlist_cache) {
+		return ctx->tlist_cache;
+	}
+
+	if (!ctx->target) {
+		WIND_DBG eprintf ("No target process\n");
+		return NULL;
+	}
+
+	ptr = ctx->target->eprocess;
+	if (!ptr) {
+		WIND_DBG eprintf ("No _EPROCESS\n");
+		return NULL;
+	}
+
+	// Grab the ThreadListHead from _EPROCESS
+	windbg_read_at (ctx, (uint8_t *) &ptr, ptr + O_(E_ThreadListHead), 4 << ctx->is_x64);
+	if (!ptr) {
+		return NULL;
+	}
+
+	base = ptr;
+
+	ret = r_list_newf (free);
+
+	do {
+		ut64 next = 0;
+
+		windbg_read_at (ctx, (uint8_t *) &next, ptr, 4 << ctx->is_x64);
+		if (!next) {
+			WIND_DBG eprintf ("Corrupted ThreadListEntry found at: 0x%"PFMT64x"\n", ptr);
+			break;
+		}
+
+		// Adjust the ptr so that it points to the ETHREAD base
+		ptr -= O_(ET_ThreadListEntry);
+
+		ut64 entrypoint = 0;
+		windbg_read_at (ctx, (uint8_t *) &entrypoint, ptr + O_(ET_Win32StartAddress), 4 << ctx->is_x64);
+
+		ut64 uniqueid = 0;
+		windbg_read_at (ctx, (uint8_t *) &uniqueid, ptr + O_(ET_Cid) + O_(C_UniqueThread), 4 << ctx->is_x64);
+		if (uniqueid) {
+			WindThread *thread = calloc (1, sizeof(WindThread));
+			thread->uniqueid = uniqueid;
+			thread->status = 's';
+			thread->runnable = true;
+			thread->ethread = ptr;
+			thread->entrypoint = entrypoint;
+
+			r_list_append (ret, thread);
+		}
+
+		ptr = next;
+	} while (ptr != base);
+
+	ctx->tlist_cache = ret;
+
+	return ret;
+}
+
 #define PTE_VALID       0x0001
 #define PTE_LARGEPAGE   0x0080
 #define PTE_PROTOTYPE   0x0400
@@ -594,7 +667,10 @@
 	ctx->cpu = stc64->cpu;
 	ctx->cpu_count = stc64->cpu_count;
 	ctx->target = NULL;
+	r_list_free (ctx->plist_cache);
 	ctx->plist_cache = NULL;
+	r_list_free (ctx->tlist_cache);
+	ctx->tlist_cache = NULL;
 	ctx->pae = 0;
 	// We're ready to go
 	ctx->syncd = 1;
diff -Nru radare2-2.3.0+dfsg/shlr/windbg/windbg.h radare2-2.8.0+dfsg/shlr/windbg/windbg.h
--- radare2-2.3.0+dfsg/shlr/windbg/windbg.h	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/shlr/windbg/windbg.h	2018-08-07 14:12:36.000000000 +0000
@@ -22,6 +22,7 @@
 typedef struct _WindCtx WindCtx;
 
 typedef struct WindProc {
+	ut64 eprocess;
 	ut32 uniqueid;
 	ut64 vadroot;
 	ut64 dir_base_table;
@@ -29,6 +30,14 @@
 	char name[17];
 } WindProc;
 
+typedef struct WindThread {
+	ut32 uniqueid;
+	bool runnable;
+	char status;
+	ut64 ethread;
+	ut64 entrypoint;
+} WindThread;
+
 enum {
 	K_PaeEnabled = 0x036,
 	K_PsActiveProcessHead = 0x050,
@@ -41,10 +50,16 @@
 	E_Peb,                // EPROCESS
 	E_ImageFileName,      // EPROCESS
 	E_VadRoot,            // EPROCESS
+	E_ThreadListHead,     // EPROCESS
 	P_DirectoryTableBase, // PCB
 	P_ImageBaseAddress,   // PEB
 	P_ProcessParameters,  // PEB
 	R_ImagePathName,      // RTL_USER_PROCESS_PARAMETERS
+	ET_Tcb,               // ETHREAD
+	ET_ThreadListEntry,   // ETHREAD
+	ET_Win32StartAddress, // ETHREAD
+	ET_Cid,               // ETHREAD
+	C_UniqueThread,       // CLIENT_ID
 	O_Max,
 };
 
@@ -61,6 +76,7 @@
 ut32 windbg_get_target (WindCtx *ctx);
 bool windbg_set_target (WindCtx *ctx, ut32 pid);
 RList *windbg_list_process (WindCtx *ctx);
+RList *windbg_list_threads(WindCtx *ctx);
 int windbg_get_cpus (WindCtx *ctx);
 bool windbg_set_cpu (WindCtx *ctx, int cpu);
 int windbg_get_cpu (WindCtx *ctx);
diff -Nru radare2-2.3.0+dfsg/snapcraft.yaml radare2-2.8.0+dfsg/snapcraft.yaml
--- radare2-2.3.0+dfsg/snapcraft.yaml	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/snapcraft.yaml	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,62 @@
+name: radare2
+version: '2.6.0'
+summary: Radare2 reverse engineering framework and tool
+description: |
+  Radare2 (also known as r2) is a complete framework for reverse-engineering 
+  and analyzing binaries; composed of a set of small utilities 
+  that can be used together or independently from the command line. 
+  Built around a disassembler for computer software which generates 
+  assembly language source code from machine-executable code, 
+  it supports a variety of executable formats for different processors 
+  and operating systems.
+
+grade: stable # must be 'stable' to release into candidate/stable channels
+confinement: strict # use 'strict' once you have the right plugs and slots
+
+apps:
+  radare2:
+    command: usr/bin/radare2
+    plugs: [home]
+  r2agent:
+    command: usr/bin/r2agent
+    plugs: [home, network-bind]
+  rafind2:
+    command: usr/bin/rafind2
+    plugs: [home]
+  rahash2:
+    command: usr/bin/rahash2
+    plugs: [home]
+  rasm2:
+    command: usr/bin/rasm2
+    plugs: [home]
+  sdb:
+    command: usr/bin/sdb
+    plugs: [home]
+  rabin2:
+    command: usr/bin/rabin2
+    plugs: [home]
+  radiff2:
+    command: usr/bin/radiff2
+    plugs: [home]
+  ragg2:
+    command: usr/bin/ragg2
+    plugs: [home]
+  rarun2:
+    command: usr/bin/rarun2
+    plugs: [home]
+  rax2:
+    command: usr/bin/rax2
+    plugs: [home]
+
+parts:
+  radare2:
+    source: https://github.com/radare/radare2.git
+    source-tag: '2.6.0'
+    plugin: meson
+    meson-parameters: [--prefix=/usr]
+    override-build: |
+      pip3 install --system meson
+      snapcraftctl build
+    build-packages:
+      - python3-pip
+      - python3-setuptools
diff -Nru radare2-2.3.0+dfsg/sys/android-build.sh radare2-2.8.0+dfsg/sys/android-build.sh
--- radare2-2.3.0+dfsg/sys/android-build.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/android-build.sh	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 BUILD=1
+FLAGS=""
 PREFIX="/data/data/org.radare.radare2installer/radare2"
 
 type pax
@@ -8,16 +9,27 @@
 
 cd `dirname $PWD/$0` ; cd ..
 
+# we need a more recent ndk to build the mergedlib for mips
+
+[ -z "${NDK_ARCH}" ] && NDK_ARCH=arm
+
+# ow yeah
+STATIC_BUILD=1
+
 case "$1" in
 "mips")
 	NDK_ARCH=mips
 	STATIC_BUILD=0
 	STRIP=mips-linux-android-strip
+#	FLAGS="-mlong-calls"
+#	export LDFLAGS="-fuse-ld=gold"
 	;;
 "mips64")
 	NDK_ARCH=mips64
 	STATIC_BUILD=0
 	STRIP=mips64el-linux-android-strip
+#	FLAGS="-mlong-calls"
+#	export LDFLAGS="-fuse-ld=gold"
 	;;
 "arm")
 	NDK_ARCH=arm
@@ -73,11 +85,7 @@
 	;;
 esac
 
-[ -z "${NDK_ARCH}" ] && NDK_ARCH=arm
 [ -z "${STATIC_BUILD}" ] && STATIC_BUILD=0
-
-# ow yeah
-STATIC_BUILD=1
 export NDK_ARCH
 export STATIC_BUILD
 PKG=`./configure --version|head -n1 |cut -d ' ' -f 1`
@@ -87,7 +95,7 @@
 echo "Using NDK_ARCH: ${NDK_ARCH}"
 echo "Using STATIC_BUILD: ${STATIC_BUILD}"
 
-export CFLAGS="-fPIC -fPIE"
+export CFLAGS="-fPIC -fPIE ${FLAGS}"
 
 if [ "${BUILD}" = 1 ]; then
 	if [ -z "${NDK}" ]; then
@@ -100,7 +108,7 @@
 	if [ 1 = 1 ]; then
 		make mrproper
 		if [ $STATIC_BUILD = 1 ]; then
-			CFGFLAGS="--without-pic --with-nonpic"
+			CFGFLAGS="--with-libr"
 		fi
 		# dup
 		echo ./configure --with-compiler=android \
diff -Nru radare2-2.3.0+dfsg/sys/android-shell.sh radare2-2.8.0+dfsg/sys/android-shell.sh
--- radare2-2.3.0+dfsg/sys/android-shell.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/android-shell.sh	2018-08-07 14:12:36.000000000 +0000
@@ -124,9 +124,13 @@
 	SHELL=sh
 	cp -f "${ROOT}/ndk-gcc" "${NDK}"
 	chmod +x "${NDK}/ndk-gcc"
+	cp -f "${ROOT}/ndk-g++" "${NDK}"
+	chmod +x "${NDK}/ndk-g++"
 	CC=ndk-gcc
+	CXX=ndk-g++
 	PS1="[r2-android-${NDK_ARCH}]> "
 	export CC
+	export CXX
 	export PS1
 	export AR
 	export RANLIB
diff -Nru radare2-2.3.0+dfsg/sys/asan.sh radare2-2.8.0+dfsg/sys/asan.sh
--- radare2-2.3.0+dfsg/sys/asan.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/asan.sh	2018-08-07 14:12:36.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
-ASAN="address leak memory undefined"
-ASAN="address"
+# ASAN="address leak memory undefined"
+ASAN=${ASAN:="address"}
 
 printf "\033[32m"
 echo "========================================================================="
diff -Nru radare2-2.3.0+dfsg/sys/build/config.json radare2-2.8.0+dfsg/sys/build/config.json
--- radare2-2.3.0+dfsg/sys/build/config.json	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/build/config.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-{
-	'name': 'radare2',
-	'version': '0.9.5'
-}
diff -Nru radare2-2.3.0+dfsg/sys/build-harden.sh radare2-2.8.0+dfsg/sys/build-harden.sh
--- radare2-2.3.0+dfsg/sys/build-harden.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/build-harden.sh	2018-08-07 14:12:36.000000000 +0000
@@ -39,7 +39,7 @@
 rm -f plugins.cfg
 # STATIC BUILD
 CFLAGS="${CFLAGS} -fPIE -fstack-protector-all -D_FORTIFY_SOURCE=2"
-CFGFLAGS="--without-pic --with-nonpic"
+CFGFLAGS="--with-libr"
 export CFLAGS
 
 # TODO: add this?
diff -Nru radare2-2.3.0+dfsg/sys/build.sh radare2-2.8.0+dfsg/sys/build.sh
--- radare2-2.3.0+dfsg/sys/build.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/build.sh	2018-08-07 14:12:36.000000000 +0000
@@ -1,32 +1,33 @@
 #!/bin/sh
 
 if [ -z "${MAKE}" ]; then
-  MAKE=make
-  gmake --help >/dev/null 2>&1
-  [ $? = 0 ] && MAKE=gmake
+	MAKE=make
+	gmake --help >/dev/null 2>&1
+	[ $? = 0 ] && MAKE=gmake
 fi
 [ -z "${MAKE_JOBS}" ] && MAKE_JOBS=12
 [ -z "${CERTID}" ] && CERTID=org.radare.radare2
 
 # find root
-cd `dirname $PWD/$0` ; cd ..
+A=$(dirname "$PWD/$0")
+cd "$A" && cd .. || exit 1
 
 if [ "`uname`" = Darwin ]; then
-  DEFAULT_PREFIX=/usr/local
-  # purge previous installations on other common paths
-  if [ -f /usr/bin/r2 ]; then
-    type sudo || NOSUDO=1
-    [ "$(id -u)" = 0 ] || SUDO=sudo
-    [ -n "${NOSUDO}" ] && SUDO=
-    # purge first
-    echo "Purging r2 installation..."
-    ./configure --prefix=/usr > /dev/null
-    ${SUDO} ${MAKE} uninstall > /dev/null
-  fi
+	DEFAULT_PREFIX=/usr/local
+	# purge previous installations on other common paths
+	if [ -f /usr/bin/r2 ]; then
+		type sudo || NOSUDO=1
+		[ "$(id -u)" = 0 ] || SUDO=sudo
+		[ -n "${NOSUDO}" ] && SUDO=
+		# purge first
+		echo "Purging r2 installation..."
+		./configure --prefix=/usr > /dev/null
+		${SUDO} ${MAKE} uninstall > /dev/null
+	fi
 else
-  DEFAULT_PREFIX=/usr
-  [ -n "${PREFIX}" -a "${PREFIX}" != /usr ] && \
-    CFGARG="${CFGARG} --with-rpath"
+	DEFAULT_PREFIX=/usr
+	[ -n "${PREFIX}" -a "${PREFIX}" != /usr ] && \
+		CFGARG="${CFGARG} --with-rpath"
 fi
 
 [ -z "${PREFIX}" ] && PREFIX="${DEFAULT_PREFIX}"
@@ -92,9 +93,11 @@
 	rm -f plugins.cfg
 fi
 unset DEPS
-./configure ${CFGARG} --prefix=${PREFIX} || exit 1
+pwd
+./configure ${CFGARG} --prefix="${PREFIX}" || exit 1
 ${MAKE} -s -j${MAKE_JOBS} MAKE_JOBS=${MAKE_JOBS} || exit 1
 if [ "`uname`" = Darwin ]; then
+	./sys/macos-cert.sh
 	${MAKE} macos-sign macos-sign-libs CERTID="${CERTID}" || (
 		echo "CERTID not defined. If you want the bins signed to debug without root"
 		echo "follow the instructions described in doc/macos.md and run make macos-sign."
diff -Nru radare2-2.3.0+dfsg/sys/emscripten.sh radare2-2.8.0+dfsg/sys/emscripten.sh
--- radare2-2.3.0+dfsg/sys/emscripten.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/emscripten.sh	2018-08-07 14:12:36.000000000 +0000
@@ -13,7 +13,7 @@
 export AR="emar"
 
 CFGFLAGS="./configure --prefix=/usr --with-compiler=emscripten"
-CFGFLAGS="${CFGFLAGS} --disable-debugger --without-pic --with-nonpic"
+CFGFLAGS="${CFGFLAGS} --disable-debugger --with-libr"
 
 make mrproper
 cp -f plugins.emscripten.cfg plugins.cfg
diff -Nru radare2-2.3.0+dfsg/sys/install.sh radare2-2.8.0+dfsg/sys/install.sh
--- radare2-2.3.0+dfsg/sys/install.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/install.sh	2018-08-07 14:12:36.000000000 +0000
@@ -31,6 +31,8 @@
 	shift
 fi
 
+umask 0002
+
 export NOSUDO
 if [ -n "${NOSUDO}" ]; then
 	SUDO=""
diff -Nru radare2-2.3.0+dfsg/sys/ios-cydia.sh radare2-2.8.0+dfsg/sys/ios-cydia.sh
--- radare2-2.3.0+dfsg/sys/ios-cydia.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ios-cydia.sh	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+STOW=0
 fromscratch=1
 onlymakedeb=0
 
@@ -12,7 +13,6 @@
 fi
 
 export BUILD=1
-PREFIX=/private/var/radare2
 
 if [ ! -d sys/ios-include/mach/vm_behavior.h  ]; then
 (
@@ -23,6 +23,11 @@
 fi
 
 . sys/ios-env.sh
+if [ "${STOW}" = 1 ]; then
+PREFIX=/private/var/radare2
+else
+PREFIX=/usr
+fi
 
 makeDeb() {
 	make -C binr ios-sdk-sign
@@ -35,6 +40,7 @@
 	sudo tar xpzvf /tmp/r2ios-${CPU}.tar.gz -C sys/cydia/radare2/root
 	rm -f sys/cydia/radare2/root/${PREFIX}/lib/*.dSYM
 	rm -f sys/cydia/radare2/root/${PREFIX}/lib/*.a
+if [ "${STOW}" = 1 ]; then
 	(
 		cd sys/cydia/radare2/root/
 		mkdir -p usr/bin
@@ -50,6 +56,9 @@
 			fi
 		done
 	)
+else
+	echo "No need to stow anything"
+fi
 	( cd sys/cydia/radare2 ; sudo make clean ; sudo make PACKAGE=${PACKAGE} )
 }
 
diff -Nru radare2-2.3.0+dfsg/sys/ios-libr.sh radare2-2.8.0+dfsg/sys/ios-libr.sh
--- radare2-2.3.0+dfsg/sys/ios-libr.sh	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ios-libr.sh	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+sys/ios-sdk.sh -simulator
+sys/ios-sdk.sh -a arm64
+lipo -create -output "ios-libr2.dylib \
+	"$INSTALL_DST/$PREFIX"/lib/libr.dylib \
+	"$INSTALL_DST/$PREFIX"/lib_simulator/libr.dylib
diff -Nru radare2-2.3.0+dfsg/sys/ios-sdk-ld radare2-2.8.0+dfsg/sys/ios-sdk-ld
--- radare2-2.3.0+dfsg/sys/ios-sdk-ld	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ios-sdk-ld	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+[ -z "${CPU}" ] && CPU="arm64"
+CWD="$(dirname "$0")"
+[ -z "${IOSINC}" ] && IOSINC="${CWD}/ios-include"
+CPUS=""
+CPU=`echo $CPU | sed -e 's,+, ,g'`
+for a in `IFS=+ echo ${CPU}` ; do
+	CPUS="-arch $a ${CPUS}"
+done
+[ -z "${SDK}" ] && SDK=iphoneos
+APPLE_SDK=`echo ${SDK} | tr a-z A-Z`
+LD="xcrun --sdk ${SDK} ld ${CPUS} -bitcode_bundle"
+echo "$LD $*"
+${LD} $*
+r=$?
+if [ "$r" != 0 ]; then
+	echo ${LD} $* >&2
+fi
+exit $r
diff -Nru radare2-2.3.0+dfsg/sys/ios-sdk.sh radare2-2.8.0+dfsg/sys/ios-sdk.sh
--- radare2-2.3.0+dfsg/sys/ios-sdk.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ios-sdk.sh	2018-08-07 14:12:36.000000000 +0000
@@ -9,6 +9,7 @@
 PACKAGE_RADARE=0
 EMBED_BITCODE=1
 CFLAGS="-O2"
+DOSH=0
 ARCHS="" # Will be set by -archs argument. If you want to set it -> e.g. ARCHS="armv7+arm64".
 MERGE_LIBS=1 # Will merge libs if you build for arm and simulator 
 
@@ -19,56 +20,58 @@
 export LD="xcrun --sdk iphoneos ld"
 export IOSVER=9.0
 export IOSINC=`pwd`/sys/ios-include
-export USE_IOS_STORE=1
+export USE_IOS_STATIC=0
+
+PLUGINS_CFG=plugins.ios-store.cfg
+#PLUGINS_CFG=plugins.ios.cfg
 
 if [ "${EMBED_BITCODE}" = 1 ]; then
 	export CFLAGS="$CFLAGS -fembed-bitcode"
-else 
-	export CFLAGS=$CFLAGS
+	export LDFLAGS="$LDFLAGS -fembed-bitcode"
 fi
 
 iosConfigure() {
-	if [ "${USE_IOS_STORE}" = 1 ]; then
-		cp -f plugins.ios-store.cfg plugins.cfg
-	else
-		cp -f plugins.ios.cfg plugins.cfg
-	fi
-	./configure --prefix=${PREFIX} --with-ostype=darwin \
-	  --without-pic --with-nonpic --without-fork \
-	  --with-compiler=ios-sdk --target=arm-unknown-darwin
+	cp -f ${PLUGINS_CFG} plugins.cfg
+	./configure --with-libr --prefix=${PREFIX} --with-ostype=darwin \
+		--without-fork --with-compiler=ios-sdk --target=arm-unknown-darwin
 	return $?
 }
 
 iosClean() {
 	make clean
+	rm -rf libr/.libr libr/libr.a libr/libr.dylib
 }
 
 iosBuild() {
-    time make -j4 || exit 1
-    # Build and sign
-    ( cd binr/radare2 ; make ios_sdk_sign )
-    make install DESTDIR=$INSTALL_DST
-    rm -rf $INSTALL_DST/$PREFIX/share/radare2/*/www/enyo/node_modules
-    return $?
+	time make -j4 || exit 1
+	# Build and sign
+	( cd binr/radare2 ; make ios_sdk_sign )
+	make install DESTDIR="$INSTALL_DST"
+	rm -rf "$INSTALL_DST/$PREFIX"/share/radare2/*/www/enyo/node_modules
+	return $?
 }
 
 iosMergeLibs() {
-	mkdir $INSTALL_DST/$PREFIX/lib_merged
-	echo "\\nMerging dynamic libs"
-	lipo $INSTALL_DST/$PREFIX/lib/libr*git.dylib $INSTALL_DST/$PREFIX/lib_simulator/libr*git.dylib -output $INSTALL_DST/$PREFIX/lib_merged/libr2.dylib -create
+	mkdir -p $INSTALL_DST/$PREFIX/lib_merged
+	#echo "Merging dynamic libs"
+	#lipo "$INSTALL_DST/$PREFIX"/lib/libr*git.dylib $INSTALL_DST/$PREFIX/lib_simulator/libr*git.dylib -output $INSTALL_DST/$PREFIX/lib_merged/libr2.dylib -create
 	echo "Merging static libs (only libr.a)"
-	lipo $INSTALL_DST/$PREFIX/lib/libr.a $INSTALL_DST/$PREFIX/lib_simulator/libr.a -output $INSTALL_DST/$PREFIX/lib_merged/libr.a -create
-	echo "\\nYou can find the merged libs in $INSTALL_DST$PREFIX/lib_merged"
+	lipo "$INSTALL_DST/$PREFIX"/lib/libr.a "$INSTALL_DST/$PREFIX"/lib_simulator/libr.a -output "$INSTALL_DST/$PREFIX"/lib_merged/libr.a -create
+	echo "Merging shared libs (only libr.dylib)"
+	lipo "$INSTALL_DST/$PREFIX/lib/libr.dylib" \
+		"$INSTALL_DST/$PREFIX"/lib_simulator/libr.dylib \
+		-output "$INSTALL_DST/$PREFIX"/lib_merged/libr.dylib -create
+	echo "You can find the merged libs in $INSTALL_DST$PREFIX/lib_merged"
 }
 
 iosPackage() {
-	( cd $INSTALL_DST && tar czvf $INSTALL_DST-${CPU}.tar.gz * )
+	( cd "$INSTALL_DST" && tar czvf $INSTALL_DST-${CPU}.tar.gz * )
 	# Prepare radare2
 	rm -rf sys/cydia/radare2/root
 	rm -rf sys/cydia/radare2/root/usr/lib/*.dSYM
 	rm -rf sys/cydia/radare2/root/usr/lib/*.a
 	mkdir -p sys/cydia/radare2/root
-	sudo tar xpzvf $INSTALL_DST-${CPU}.tar.gz -C sys/cydia/radare2/root
+	sudo tar xpzvf "$INSTALL_DST"-${CPU}.tar.gz -C sys/cydia/radare2/root
 	rm -rf sys/cydia/radare2-dev/root
 	# Prepare radare2-dev
 	mkdir -p sys/cydia/radare2-dev/root
@@ -89,46 +92,59 @@
 showHelp() {
 	echo "The following arguments are available:"
 
-	echo "\\n\\t-archs"
-	echo "\\t\\tSelect the archs, you want to build for."
-	echo "\\t\\tAvailable archs: armv7, armv7s, arm64, all" 
-	echo "\\t\\tYou can select multiple archs by concatenating"
-	echo "\\t\\tthem with a '+' sign."
-	echo "\\t\\tOr specify 'all' to build for armv7+armv7s+arm64."
-	echo "\\t\\tSee the examples below."
-
-	echo "\\n\\t-h, --help"
-	echo "\\t\\tShow this text."
-
-	echo "\\n\\t-p"
-	echo "\\t\\tPackage radare2."
-
-	echo "\\n\\t-s"
-	echo "\\t\\tRun shell."
-
-	echo "\\n\\t-simulator"
-	echo "\\t\\tBuild also for i386 and x86_64 archs."
-	echo "\\t\\tSo you can use radare2 in the iOS simulator."
-
-	echo "\\nExamples:"
-	echo "\\tsys/ios-sdk.sh -archs arm64"
-	echo "\\tsys/ios-sdk.sh -archs armv7+arm64 -simulator"
-	echo "\\tsys/ios-sdk.sh -archs all -simulator"
+	echo "    -a, --archs"
+	echo "        Select the archs, you want to build for."
+	echo "        Available archs: armv7, armv7s, arm64, all" 
+	echo "        You can select multiple archs by concatenating"
+	echo "        them with a '+' sign."
+	echo "        Or specify 'all' to build for armv7+armv7s+arm64."
+	echo "        See the examples below."
+
+	echo "    -h, --help"
+	echo "        Show this text."
+
+	echo "    -p, --package"
+	echo "        Package radare2."
+
+	echo "    -s, --shell"
+	echo "        Run shell."
+
+	echo "    -f, --full"
+	echo "        Same as -archs all -simulator."
+
+	echo "    -simulator"
+	echo "        Build also for i386 and x86_64 archs."
+	echo "        So you can use radare2 in the iOS simulator."
+
+	echo "Examples:"
+	echo "    sys/ios-sdk.sh -archs arm64"
+	echo "    sys/ios-sdk.sh -archs armv7s+arm64 -simulator"
+	echo "    sys/ios-sdk.sh -archs all -simulator"
 
-	echo "\\nYou can also modify some variables in sys/ios-sdk.sh."
+	echo "You can also modify some variables in sys/ios-sdk.sh."
 }
 
 # Show help text, if no archs are selected
 if [ $# -eq 0 ] && [ "${#ARCHS}" = 0 ] && [ "${USE_SIMULATOR}" = 0 ]; then
 	echo "You need to specify the archs you want to build for."
-	echo "Use the -archs/-simulator argument or modify the ARCHS/USE_SIMULATOR variable in sys/ios-sdk.sh.\\n"
+	echo "Use the -archs/-simulator argument or modify the ARCHS/USE_SIMULATOR variable in sys/ios-sdk.sh."
+	echo
 	showHelp
 	exit 0
 fi
 
 while test $# -gt 0; do
 	case "$1" in 
-		-archs)
+		-full|--full|-f)
+			shift
+			ARCHS="armv7s+arm64"
+			USE_SIMULATOR=1
+			;;
+		-shell|--shell|-s)
+			DOSH=1
+			shift
+			;;
+		-archs|-a|--archs)
 			shift
 			if test $# -gt 0; then
 				if [ "$1" == "all" ]; then
@@ -139,19 +155,10 @@
 			fi
 			shift
 			;;
-		-p)	
+		-p|--package)
 			iosPackage
  			exit 0
 		 	;;
-		-s)
-			if [ "${USE_SIMULATOR}" = 1 ]; then
-				export CPU="$SIMULATOR_ARCHS"
-				export SDK=iphonesimulator
-			fi
-			export PS1="\033[33m[ios-sdk-$CPU \w]> \033[0m"
-			exec "$SHELL"
-			exit $?
-			;;
 		-simulator)
 			USE_SIMULATOR=1
 			shift
@@ -173,10 +180,35 @@
 	[ "${USE_SIMULATOR}" = 1 ] && echo "and \\c"
 fi
 [ "${USE_SIMULATOR}" = 1 ] && echo "simulator($SIMULATOR_ARCHS)"
+
+if [ "${DOSH}" = 1 ]; then
+	echo "Inside ios-sdk shell"
+	if [ "${USE_SIMULATOR}" = 1 ]; then
+		export CPU="$SIMULATOR_ARCHS"
+		export SDK=iphonesimulator
+	else
+		[ -z "$ARCHS" ] && ARCHS="armv7s+arm64"
+		export CPU="$ARCHS"
+		export SDK=iphoneos
+	fi
+CPUS=""
+CPU=`echo $CPU | sed -e 's,+, ,g'`
+EXTRA=""
+for a in `IFS=+ echo ${CPU}` ; do
+        CPUS="-arch $a ${CPUS}"
+done
+export CPUS="${CPUS}"
+export ALFLAGS="${CPUS}"
+export LDFLAGS="${LDFLAGS} ${CPUS}"
+	export PS1="[ios-sdk-$CPU]> "
+	${SHELL}
+	echo "Outside ios-sdk shell"
+	exit $?
+fi
 echo
-sleep 2
+sleep 1
 
-rm -rf $INSTALL_DST
+rm -rf "$INSTALL_DST"
 
 # Build radare2 for i386 and x86_64
 if [ "${USE_SIMULATOR}" = 1 ]; then
@@ -185,11 +217,16 @@
 	if [ $? = 0 ]; then
 		export CPU="$SIMULATOR_ARCHS"
 		export SDK=iphonesimulator
-		echo "\\nBuilding for simulator($SIMULATOR_ARCHS)\\n"
+		echo "Building for simulator($SIMULATOR_ARCHS)"
 		sleep 1
 		iosBuild
 		# backup lib folder of simulator
-		cp -r $INSTALL_DST/$PREFIX/lib $INSTALL_DST/$PREFIX/lib_simulator
+		if [ "${#ARCHS}" -gt 0 ]; then
+			rm -rf "$INSTALL_DST/$PREFIX"/lib_simulator
+			mv "$INSTALL_DST/$PREFIX"/lib "$INSTALL_DST/$PREFIX"/lib_simulator
+		else
+			cp -r "$INSTALL_DST/$PREFIX"/lib "$INSTALL_DST/$PREFIX"/lib_simulator
+		fi
 	fi
 fi
 
@@ -197,10 +234,10 @@
 if [ "${#ARCHS}" -gt 0 ]; then
 	iosClean
 	iosConfigure
-	if [ "$?" = 0 ] && [ "${#ARCHS}" -gt 0 ]; then
+	if [ "$?" = 0 ]; then
 		export CPU=$ARCHS
 		export SDK=iphoneos
-		echo "\\nBuilding for $CPU\\n"
+		echo "Building for $CPU"
 		sleep 1
 		iosBuild
 		if [ "${PACKAGE_RADARE}" = 1 ]; then
diff -Nru radare2-2.3.0+dfsg/sys/ios-shell.sh radare2-2.8.0+dfsg/sys/ios-shell.sh
--- radare2-2.3.0+dfsg/sys/ios-shell.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ios-shell.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-[ -z "$SHELL" ] && SHELL=/bin/sh
-
-if [ -d sys ]; then
-	export IOSINC=`pwd`/sys/ios-include
-	export PATH="$PWD/sys/:$PATH"
-	export PS1="[ios-sdk \w]> "
-	$SHELL
-else
-	echo "Run from r2 root directory"
-	exit 1
-fi
diff -Nru radare2-2.3.0+dfsg/sys/ios-simulator.sh radare2-2.8.0+dfsg/sys/ios-simulator.sh
--- radare2-2.3.0+dfsg/sys/ios-simulator.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ios-simulator.sh	2018-08-07 14:12:36.000000000 +0000
@@ -59,7 +59,7 @@
 export IOSVER=10.2
 export IOSINC=/
 #$(pwd)/sys/ios-include
-export CFLAGS=-O2
+export CFLAGS="${CFLAGS} -O2"
 export USE_SIMULATOR=1
 export RANLIB="xcrun --sdk iphoneos ranlib"
 
@@ -71,9 +71,8 @@
 if true; then
 make mrproper
 cp -f ${PLGCFG} plugins.cfg
-./configure --prefix=${PREFIX} --with-ostype=darwin \
-	--without-fork --without-pic --with-nonpic \
-	--disable-debugger --with-compiler=ios-sdk \
+./configure --prefix=${PREFIX} --with-ostype=darwin --with-libr \
+	--without-fork --disable-debugger --with-compiler=ios-sdk \
 	--target=arm-unknown-darwin
 fi
 
diff -Nru radare2-2.3.0+dfsg/sys/ios-static.sh radare2-2.8.0+dfsg/sys/ios-static.sh
--- radare2-2.3.0+dfsg/sys/ios-static.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ios-static.sh	2018-08-07 14:12:36.000000000 +0000
@@ -14,6 +14,7 @@
 #	export CPU=armv7
 fi
 
+R2BINS="radare2 rabin2 rasm2 r2pm r2agent radiff2 rafind2 ragg2 rahash2 rarun2 rasm2 rax2"
 CAPSTONE_ARCHS="arm aarch64"
 #export CAPSTONE_MAKEFLAGS="CAPSTONE_ARCHS=\"arm aarch64\""
 # Build all archs for capstone, not just ARM/ARM64
@@ -52,7 +53,7 @@
 export USE_SIMULATOR=0
 
 if [ "${APPSTORE_FRIENDLY}" = 1 ]; then
-	CFGFLAGS="--without-fork --without-debugger"
+	CFGFLAGS="--without-fork --disable-debugger"
 else
 	CFGFLAGS=""
 fi
@@ -63,15 +64,13 @@
 cp -f plugins.ios.cfg plugins.cfg
 ./configure --prefix="${PREFIX}" \
 	${CFGFLAGS} \
-	--with-ostype=darwin \
-	--without-pic --with-nonpic \
+	--with-ostype=darwin --with-libr \
 	--with-compiler=ios-sdk \
 	--target=arm-unknown-darwin
 fi
 
 if [ $? = 0 ]; then
 	time ${MAKE} -j${MAKE_JOBS} CAPSTONE_ARCHS="${CAPSTONE_ARCHS}"
-	#time ${MAKE} -j${MAKE_JOBS}
 	if [ $? = 0 ]; then
 		( cd binr/radare2 ; ${MAKE} ios_sdk_sign )
 		rm -rf /tmp/r2ios
@@ -87,7 +86,7 @@
 		export D=radare2-ios-${CPU}
 		rm -rf $D
 		mkdir -p $D/bin
-		for a in radare2 rabin2 rasm2 r2pm r2agent radiff2 rafind2 ragg2 rahash2 rarun2 rasm2 rax2 ; do
+		for a in ${R2BINS} ; do
 			cp -f binr/$a/$a "$D/bin"
 		done
 		mkdir -p "$D/include"
diff -Nru radare2-2.3.0+dfsg/sys/macos-cert.sh radare2-2.8.0+dfsg/sys/macos-cert.sh
--- radare2-2.3.0+dfsg/sys/macos-cert.sh	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/macos-cert.sh	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,60 @@
+#!/bin/sh
+# Credits to https://github.com/derekparker/delve/blob/master/scripts/gencert.sh
+
+# Check if the certificate is already present in the system keychain
+security find-certificate -Z -p -c "org.radare.radare2" /Library/Keychains/System.keychain > /dev/null 2>&1
+EXIT_CODE=$?
+if [ $EXIT_CODE -eq 0 ]; then
+	# Certificate has already been generated and installed
+	exit 0
+fi
+
+CERT="org.radare.radare2"
+
+# Create the certificate template
+cat <<EOF >$CERT.tmpl
+[ req ]
+default_bits       = 2048        # RSA key size
+encrypt_key        = no          # Protect private key
+default_md         = sha512      # MD to use
+prompt             = no          # Prompt for DN
+distinguished_name = codesign_dn # DN template
+[ codesign_dn ]
+commonName         = "org.radare.radare2"
+[ codesign_reqext ]
+keyUsage           = critical,digitalSignature
+extendedKeyUsage   = critical,codeSigning
+EOF
+
+# Generate a new certificate
+openssl req -new -newkey rsa:2048 -x509 -days 3650 -nodes -config $CERT.tmpl -extensions codesign_reqext -batch -out $CERT.cer -keyout $CERT.key > /dev/null 2>&1
+EXIT_CODE=$?
+if [ $EXIT_CODE -ne 0 ]; then
+	# Something went wrong when generating the certificate
+	exit 1
+fi
+
+# Install the certificate in the system keychain
+sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain $CERT.cer > /dev/null 2>&1
+EXIT_CODE=$?
+if [ $EXIT_CODE -ne 0 ]; then
+	# Something went wrong when installing the certificate
+	exit 1
+fi
+
+# Install the key for the certificate in the system keychain
+sudo security import $CERT.key -A -k /Library/Keychains/System.keychain > /dev/null 2>&1
+EXIT_CODE=$?
+if [ $EXIT_CODE -ne 0 ]; then
+	# Something went wrong when installing the key
+	exit 1
+fi
+
+# Kill task_for_pid access control daemon
+sudo pkill -f /usr/libexec/taskgated > /dev/null 2>&1
+
+# Remove generated files
+rm $CERT.tmpl $CERT.cer $CERT.key > /dev/null 2>&1
+
+# Exit indicating the certificate is now generated and installed
+exit 0
diff -Nru radare2-2.3.0+dfsg/sys/meson.py radare2-2.8.0+dfsg/sys/meson.py
--- radare2-2.3.0+dfsg/sys/meson.py	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/meson.py	2018-08-07 14:12:36.000000000 +0000
@@ -1,4 +1,5 @@
-""" Meson build for radare2 """
+#!/usr/bin/env python3
+"""Meson build for radare2"""
 
 import argparse
 import glob
@@ -9,57 +10,82 @@
 import subprocess
 import sys
 
-from mesonbuild import mesonmain
-
 BUILDDIR = 'build'
-SDB_BUILDDIR = 'build_sdb'
-
 BACKENDS = ['ninja', 'vs2015', 'vs2017']
 
 PATH_FMT = {}
+R2_PATH = {
+    'R2_LIBDIR': r'lib',
+    'R2_INCDIR': r'include',
+    'R2_DATDIR': r'share',
+    'R2_WWWROOT': r'{R2_DATDIR}\www',
+    'R2_SDB': r'{R2_DATDIR}',
+    'R2_ZIGNS': r'{R2_DATDIR}\zigns',
+    'R2_THEMES': r'{R2_DATDIR}\cons',
+    'R2_FORTUNES': r'{R2_DATDIR}\doc',
+    'R2_FLAGS': r'{R2_DATDIR}\flag',
+    'R2_HUD': r'{R2_DATDIR}\hud'
+}
 
+MESON = None
 ROOT = None
 log = None
 
-def setGlobalVariables():
-    """ Set global variables """
+def set_global_variables():
+    """[R_API] Set global variables"""
     global log
     global ROOT
+    global MESON
 
     ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir))
 
-    logging.basicConfig(format='[Meson][%(levelname)s]: %(message)s',
-            level=logging.DEBUG)
+    logging.basicConfig(format='[%(name)s][%(levelname)s]: %(message)s',
+                        level=logging.DEBUG)
     log = logging.getLogger('r2-meson')
+
+    with open(os.path.join(ROOT, 'configure.acr')) as f:
+        f.readline()
+        version = f.readline().split()[1].rstrip()
+
+    if os.name == 'nt':
+        meson = os.path.join(os.path.dirname(sys.executable), 'Scripts', 'meson.py')
+        MESON = [sys.executable, meson]
+    else:
+        MESON = ['meson']
+
+    PATH_FMT['ROOT'] = ROOT
+    PATH_FMT['R2_VERSION'] = version
+
     log.debug('Root: %s', ROOT)
+    log.debug('Meson: %s', MESON)
+    log.debug('Version: %s', version)
 
-def meson(root, build, prefix=None, backend=None, release=False, shared=False):
-    """ Start meson build (i.e. python meson.py ./ build) """
-    command = [root, build]
+def meson(root, build, prefix=None, backend=None,
+          release=False, shared=False, *, options=[]):
+    """[R_API] Invoke meson"""
+    command = MESON + [root, build]
     if prefix:
-        command += ['--prefix={}'.format(prefix)]
+        command.append('--prefix={}'.format(prefix))
     if backend:
-        command += ['--backend={}'.format(backend)]
+        command.append('--backend={}'.format(backend))
     if release:
-        command += ['--buildtype=release']
+        command.append('--buildtype=release')
     if shared:
-        command += ['--default-library', 'shared']
+        command.append('--default-library=shared')
     else:
-        command += ['--default-library', 'static']
+        command.append('--default-library=static')
+    if options:
+        command.extend(options)
 
     log.debug('Invoking meson: %s', command)
-    launcher = os.path.join(ROOT, 'sys', 'meson.py')
-    meson_run(command, launcher)
-
-def meson_run(args, launcher):
-    ret = mesonmain.run(args, launcher)
+    ret = subprocess.call(command)
     if ret != 0:
         log.error('Meson error. Exiting.')
         sys.exit(1)
 
 def ninja(folder, *targets):
-    """ Start ninja build (i.e. ninja -C build) """
-    command = ['ninja', '-C', os.path.join(ROOT, folder)]
+    """[R_API] Invoke ninja"""
+    command = ['ninja', '-C', folder]
     if targets:
         command.extend(targets)
     log.debug('Invoking ninja: %s', command)
@@ -69,6 +95,7 @@
         sys.exit(1)
 
 def msbuild(project, *params):
+    """[R_API] Invoke MSbuild"""
     command = ['msbuild', project]
     if params:
         command.extend(params)
@@ -78,15 +105,15 @@
         log.error('MSbuild error. Exiting.')
         sys.exit(1)
 
-def copytree(src, dst):
+def copytree(src, dst, exclude=()):
     src = src.format(**PATH_FMT)
-    dst = dst.format(**PATH_FMT)
+    dst = dst.format(**PATH_FMT).format(**PATH_FMT)
     log.debug('copytree "%s" -> "%s"', src, dst)
-    shutil.copytree(src, dst)
+    shutil.copytree(src, dst, ignore=shutil.ignore_patterns(*exclude) if exclude else None)
 
 def move(src, dst):
     src = src.format(**PATH_FMT)
-    dst = dst.format(**PATH_FMT)
+    dst = dst.format(**PATH_FMT).format(**PATH_FMT)
     term = os.path.sep if os.path.isdir(dst) else ''
     log.debug('move "%s" -> "%s%s"', src, dst, term)
     for file in glob.iglob(src):
@@ -94,24 +121,17 @@
 
 def copy(src, dst):
     src = src.format(**PATH_FMT)
-    dst = dst.format(**PATH_FMT)
+    dst = dst.format(**PATH_FMT).format(**PATH_FMT)
     term = os.path.sep if os.path.isdir(dst) else ''
     log.debug('copy "%s" -> "%s%s"', src, dst, term)
     for file in glob.iglob(src, recursive='**' in src):
         shutil.copy2(file, dst)
 
 def makedirs(path):
-    path = path.format(**PATH_FMT)
+    path = path.format(**PATH_FMT).format(**PATH_FMT)
     log.debug('makedirs "%s"', path)
     os.makedirs(path)
 
-def convert_sdb(f):
-    """ Convert f to sdb format """
-    sdb = os.path.splitext(f)[0]
-    sdb_app = os.path.join(SDB_BUILDDIR, 'sdb')
-    log.debug('Converting %s to %s', f, sdb)
-    os.system('{app} {outf} = <{inf}'.format(app=sdb_app, outf=sdb, inf=f))
-
 def xp_compat(builddir):
     log.info('Running XP compat script')
 
@@ -133,126 +153,77 @@
             proj.write(c)
             log.debug("%s .. OK", f)
 
-def win_install(args):
-    with open(os.path.join(ROOT, 'configure.acr')) as f:
-        f.readline()
-        version = f.readline().split(' ')[1].rstrip()
-
-    PATH_FMT['ROOT'] = ROOT
+def win_dist(args):
+    """Create r2 distribution for Windows"""
+    builddir = os.path.join(ROOT, args.dir)
     PATH_FMT['DIST'] = args.install
-    PATH_FMT['BIN'] = os.path.join(args.prefix, 'bin')
-    PATH_FMT['LIB'] = os.path.join(args.prefix, 'lib')
-    PATH_FMT['BUILDDIR'] = os.path.join(ROOT, args.dir)
-    PATH_FMT['R2_VERSION'] = version
+    PATH_FMT['BUILDDIR'] = builddir
 
-    if args.backend == 'ninja':
-        ninja(args.dir, 'install')
-    else:
-        for d in (r'{BIN}', r'{LIB}'):
-            d = d.format(**PATH_FMT)
-            if os.path.exists(d):
-                shutil.rmtree(d)
-            os.makedirs(d)
-        copy(r'{BUILDDIR}\binr\**\*.exe', r'{BIN}')
-        copy(r'{BUILDDIR}\libr\**\*.dll', r'{BIN}')
-        copy(r'{BUILDDIR}\libr\**\*.lib', r'{LIB}')
-        copy(r'{BUILDDIR}\libr\**\*.a', r'{LIB}')
     makedirs(r'{DIST}')
-    move(r'{BIN}\*.exe', r'{DIST}')
-    move(r'{BIN}\*.dll', r'{DIST}')
-    if args.copylib:
-        move(r'{LIB}\*.lib', r'{DIST}')
-        move(r'{LIB}\*.a', r'{DIST}')
-    copytree(r'{ROOT}\shlr\www', r'{DIST}\www')
-    copytree(r'{ROOT}\libr\magic\d\default', r'{DIST}\share\radare2\{R2_VERSION}\magic')
-    makedirs(r'{DIST}\share\radare2\{R2_VERSION}\syscall')
-    copy(r'{ROOT}\libr\syscall\d\*.sdb', r'{DIST}\share\radare2\{R2_VERSION}\syscall')
-    makedirs(r'{DIST}\share\radare2\{R2_VERSION}\fcnsign')
-    copy(r'{ROOT}\libr\anal\d\*.sdb', r'{DIST}\share\radare2\{R2_VERSION}\fcnsign')
-    makedirs(r'{DIST}\share\radare2\{R2_VERSION}\opcodes')
-    copy(r'{ROOT}\libr\asm\d\*.sdb', r'{DIST}\share\radare2\{R2_VERSION}\opcodes')
-    makedirs(r'{DIST}\include\libr\sdb')
-    makedirs(r'{DIST}\include\libr\r_util')
-    copy(r'{ROOT}\libr\include\*.h', r'{DIST}\include\libr')
-    copy(r'{ROOT}\libr\include\sdb\*.h', r'{DIST}\include\libr\sdb')
-    copy(r'{ROOT}\libr\include\r_util\*.h', r'{DIST}\include\libr\r_util')
-    makedirs(r'{DIST}\share\doc\radare2')
-    copy(r'{ROOT}\doc\fortunes.*', r'{DIST}\share\doc\radare2')
-    makedirs(r'{DIST}\share\radare2\{R2_VERSION}\format\dll')
-    copy(r'{ROOT}\libr\bin\d\elf32', r'{DIST}\share\radare2\{R2_VERSION}\format')
-    copy(r'{ROOT}\libr\bin\d\elf64', r'{DIST}\share\radare2\{R2_VERSION}\format')
-    copy(r'{ROOT}\libr\bin\d\elf_enums', r'{DIST}\share\radare2\{R2_VERSION}\format')
-    copy(r'{ROOT}\libr\bin\d\pe32', r'{DIST}\share\radare2\{R2_VERSION}\format')
-    copy(r'{ROOT}\libr\bin\d\trx', r'{DIST}\share\radare2\{R2_VERSION}\format')
-    copy(r'{ROOT}\libr\bin\d\dll\*.sdb', r'{DIST}\share\radare2\{R2_VERSION}\format\dll')
-    makedirs(r'{DIST}\share\radare2\{R2_VERSION}\cons')
-    copy(r'{ROOT}\libr\cons\d\*', r'{DIST}\share\radare2\{R2_VERSION}\cons')
-    makedirs(r'{DIST}\share\radare2\{R2_VERSION}\hud')
-    copy(r'{ROOT}\doc\hud', r'{DIST}\share\radare2\{R2_VERSION}\hud\main')
-
-def build_sdb(args):
-    """ Build and generate sdb files """
-    log.info('Building SDB')
-    if not os.path.exists(SDB_BUILDDIR):
-        meson(os.path.join(ROOT, 'shlr', 'sdb'), SDB_BUILDDIR,
-              os.path.join(ROOT, SDB_BUILDDIR), args.backend, args.release)
-    if args.backend != 'ninja':
-        project = os.path.join(ROOT, SDB_BUILDDIR, 'sdb.sln')
-        msbuild(project, '/m')
+    copy(r'{BUILDDIR}\binr\*\*.exe', r'{DIST}')
+    copy(r'{BUILDDIR}\libr\*\*.dll', r'{DIST}')
+    makedirs(r'{DIST}\{R2_LIBDIR}')
+    if args.shared:
+        copy(r'{BUILDDIR}\libr\*\*.lib', r'{DIST}\{R2_LIBDIR}')
     else:
-        ninja(SDB_BUILDDIR)
+        copy(r'{BUILDDIR}\libr\*\*.a', r'{DIST}\{R2_LIBDIR}')
+    win_dist_libr2()
 
-    # Create .sdb files
-    log.info('Generating sdb files.')
-    with open('Makefile', 'r') as f:
-        line = ''
-        while 'DATADIRS' not in line:
-            line = f.readline()
-    datadirs = line.split('=')[1].split()
-    datadirs = [os.path.abspath(p) for p in datadirs]
-    for folder in datadirs:
-        log.debug('Looking up %s', folder)
-        for f in glob.iglob(os.path.join(folder, '**', '*.sdb.txt'), recursive=True):
-            if os.path.isdir(f) or os.path.islink(f):
-                continue
-            convert_sdb(f)
-    log.debug('Done')
+def win_dist_libr2(**path_fmt):
+    """[R_API] Add libr2 data/www/include/doc to dist directory"""
+    PATH_FMT.update(path_fmt)
+
+    copytree(r'{ROOT}\shlr\www', r'{DIST}\{R2_WWWROOT}')
+    copytree(r'{ROOT}\libr\magic\d\default', r'{DIST}\{R2_SDB}\magic')
+    makedirs(r'{DIST}\{R2_SDB}\syscall')
+    copy(r'{BUILDDIR}\libr\syscall\d\*.sdb', r'{DIST}\{R2_SDB}\syscall')
+    makedirs(r'{DIST}\{R2_SDB}\fcnsign')
+    copy(r'{BUILDDIR}\libr\anal\d\*.sdb', r'{DIST}\{R2_SDB}\fcnsign')
+    makedirs(r'{DIST}\{R2_SDB}\opcodes')
+    copy(r'{BUILDDIR}\libr\asm\d\*.sdb', r'{DIST}\{R2_SDB}\opcodes')
+    makedirs(r'{DIST}\{R2_INCDIR}\sdb')
+    makedirs(r'{DIST}\{R2_INCDIR}\r_util')
+    copy(r'{ROOT}\libr\include\*.h', r'{DIST}\{R2_INCDIR}')
+    copy(r'{BUILDDIR}\r_version.h', r'{DIST}\{R2_INCDIR}')
+    copy(r'{BUILDDIR}\r_userconf.h', r'{DIST}\{R2_INCDIR}')
+    copy(r'{ROOT}\libr\include\sdb\*.h', r'{DIST}\{R2_INCDIR}\sdb')
+    copy(r'{ROOT}\libr\include\r_util\*.h', r'{DIST}\{R2_INCDIR}\r_util')
+    makedirs(r'{DIST}\{R2_FORTUNES}')
+    copy(r'{ROOT}\doc\fortunes.*', r'{DIST}\{R2_FORTUNES}')
+    copytree(r'{ROOT}\libr\bin\d', r'{DIST}\{R2_SDB}\format',
+             exclude=('Makefile', 'meson.build', 'dll'))
+    makedirs(r'{DIST}\{R2_SDB}\format\dll')
+    copy(r'{BUILDDIR}\libr\bin\d\*.sdb', r'{DIST}\{R2_SDB}\format\dll')
+    copytree(r'{ROOT}\libr\cons\d', r'{DIST}\{R2_THEMES}',
+             exclude=('Makefile', 'meson.build'))
+    makedirs(r'{DIST}\{R2_FLAGS}')
+    copy(r'{BUILDDIR}\libr\flag\d\*.r2', r'{DIST}\{R2_FLAGS}')
+    makedirs(r'{DIST}\{R2_HUD}')
+    copy(r'{ROOT}\doc\hud', r'{DIST}\{R2_HUD}\main')
 
-def build_r2(args):
+def build(args):
     """ Build radare2 """
     log.info('Building radare2')
-    if not os.path.exists(args.dir):
-        meson(ROOT, args.dir, args.prefix, args.backend,
-              args.release, args.shared)
+    r2_builddir = os.path.join(ROOT, args.dir)
+    options = ['-D%s' % x for x in args.options]
+    if not os.path.exists(r2_builddir):
+        meson(ROOT, r2_builddir, prefix=args.prefix, backend=args.backend,
+              release=args.release, shared=args.shared, options=options)
     if args.backend != 'ninja':
         if args.xp:
-            xp_compat(os.path.join(ROOT, args.dir))
+            xp_compat(r2_builddir)
         if not args.project:
-            project = os.path.join(ROOT, args.dir, 'radare2.sln')
+            project = os.path.join(r2_builddir, 'radare2.sln')
             msbuild(project, '/m')
     else:
-        ninja(args.dir)
-
-def build(args):
-    """ Prepare requirements and build radare2 """
-    # Prepare capstone
-    capstone_path = os.path.join(ROOT, 'shlr', 'capstone')
-    if not os.path.isdir(capstone_path):
-        log.info('Cloning capstone')
-        subprocess.call('git clone -b next --depth 10 https://github.com/aquynh/capstone.git'.split() + [capstone_path])
-
-    # Build radare2
-    build_r2(args)
-
-    # Build sdb
-    build_sdb(args)
+        ninja(r2_builddir)
 
 def install(args):
     """ Install radare2 """
     if os.name == 'nt':
-        win_install(args)
+        win_dist(args)
         return
-    log.warning('Install not implemented yet.')
+    log.warning('Install not implemented yet for this platform.')
     # TODO
     #if os.name == 'posix':
     #    os.system('DESTDIR="{destdir}" ninja -C {build} install'
@@ -260,35 +231,63 @@
 
 def main():
     # Create logger and get applications paths
-    setGlobalVariables()
+    set_global_variables()
 
     # Create parser
     parser = argparse.ArgumentParser(description='Mesonbuild scripts for radare2')
+    parser.add_argument('--asan', action='store_true',
+            help='Build radare2 with ASAN support.')
     parser.add_argument('--project', action='store_true',
             help='Create a visual studio project and do not build.')
     parser.add_argument('--release', action='store_true',
             help='Set the build as Release (remove debug info)')
-    parser.add_argument('--backend', action='store', choices=BACKENDS,
-            default='ninja', help='Choose build backend')
+    parser.add_argument('--backend', choices=BACKENDS, default='ninja',
+            help='Choose build backend (default: %(default)s)')
     parser.add_argument('--shared', action='store_true',
             help='Link dynamically (shared library) rather than statically')
-    parser.add_argument('--prefix', action='store', default=None,
-            help='Set project installation prefix (default: /usr/local)')
-    parser.add_argument('--dir', action='store', default=BUILDDIR,
-            help='Destination build directory (default: {})'.format(BUILDDIR),
-            required=False)
+    parser.add_argument('--prefix', default=None,
+            help='Set project installation prefix')
+    parser.add_argument('--dir', default=BUILDDIR, required=False,
+            help='Destination build directory (default: %(default)s)')
+    parser.add_argument('--alias', action='store_true',
+            help='Show the "m" alias shell command')
     parser.add_argument('--xp', action='store_true',
             help='Adds support for Windows XP')
+    parser.add_argument('--pull', action='store_true',
+            help='git pull before building')
+    parser.add_argument('--nosudo', action='store_true',
+            help='Do not use sudo for install/symstall/uninstall')
+    parser.add_argument('--uninstall', action='store_true',
+            help='Uninstall')
+    parser.add_argument('--symstall', action='store_true',
+            help='Install using symlinks')
     if os.name == 'nt':
         parser.add_argument('--install', help='Installation directory')
-        parser.add_argument('--copylib', action='store_true',
-            help='Copy static libraries to the installation directory')
     else:
         parser.add_argument('--install', action='store_true',
             help='Install radare2 after building')
+    parser.add_argument('--options', nargs='*', default=[])
     args = parser.parse_args()
+    if args.alias:
+        print("alias m=\"" + os.path.abspath(__file__) + "\"")
+        sys.exit(0);
+    if args.asan:
+        if os.uname().sysname == 'OpenBSD':
+            log.error("Asan insupported under OpenBSD")
+            sys.exit(1)
+        cflags = os.environ.get('CFLAGS')
+        if not cflags:
+            cflags = ''
+        os.environ['CFLAGS'] = cflags + ' -fsanitize=address'
+        if os.uname().sysname != 'Darwin':
+          ldflags = os.environ.get('LDFLAGS')
+          if not ldflags:
+              ldflags = ''
+          os.environ['LDFLAGS'] = ldflags + ' -lasan'
 
     # Check arguments
+    if args.pull:
+        os.system('git pull')
     if args.project and args.backend == 'ninja':
         log.error('--project is not compatible with --backend ninja')
         sys.exit(1)
@@ -299,18 +298,34 @@
         log.error('%s already exists', args.install)
         sys.exit(1)
     if os.name == 'nt' and not args.prefix:
-        args.prefix = os.path.join(ROOT, args.dir)
-
+        args.prefix = os.path.join(ROOT, args.dir, 'priv_install_dir')
+    for option in args.options:
+        if '=' not in option:
+            log.error('Invalid option: %s', option)
+            sys.exit(1)
+        key, value = option.split('=', 1)
+        key = key.upper()
+        if key not in R2_PATH:
+            continue
+        if os.path.isabs(value):
+            log.error('Relative path is required: %s', option)
+            sys.exit(1)
+        R2_PATH[key] = os.path.normpath(value)
+
+    PATH_FMT.update(R2_PATH)
+
+    sudo = 'sudo '
+    if args.nosudo:
+        sudo = ''
     # Build it!
     log.debug('Arguments: %s', args)
     build(args)
+    if args.uninstall:
+        os.system(sudo + 'make uninstall PWD="$PWD/build" BTOP="$PWD/build/binr"')
     if args.install:
         install(args)
+    if args.symstall:
+        os.system(sudo + 'make symstall PWD="$PWD/build" BTOP="$PWD/build/binr"')
 
 if __name__ == '__main__':
-    # meson internals
-    if len(sys.argv) > 1 and sys.argv[1] in ('test', '--internal'):
-        launcher = os.path.realpath(sys.argv[0])
-        meson_run(sys.argv[1:], launcher)
-        sys.exit()
     main()
diff -Nru radare2-2.3.0+dfsg/sys/ndk-g++ radare2-2.8.0+dfsg/sys/ndk-g++
--- radare2-2.3.0+dfsg/sys/ndk-g++	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ndk-g++	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+NDKCXX=1 ndk-gcc $*
diff -Nru radare2-2.3.0+dfsg/sys/ndk-gcc radare2-2.8.0+dfsg/sys/ndk-gcc
--- radare2-2.3.0+dfsg/sys/ndk-gcc	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ndk-gcc	2018-08-07 14:12:36.000000000 +0000
@@ -9,6 +9,12 @@
 	fi
 fi
 
+if [ "${NDKCXX}" = 1 ]; then
+	CCN=g++
+else
+	CCN=gcc
+fi
+
 if [ -n "${NDK_ARCH}" ]; then
 	ARCH=${NDK_ARCH}
 else
@@ -44,7 +50,7 @@
 mips)
 	ANDROID_SDK_VERSION=${ANDROID_KITKAT}
 	NDKPFX=mipsel-linux-android
-	${NDKPFX}-gcc 2>/dev/null
+	${NDKPFX}-${CCN} 2>/dev/null
 	if [ $? -gt 1 ]; then
 		NDKPFX=mipsel-linux-android
 	fi
@@ -52,7 +58,7 @@
 mips64)
 	ANDROID_SDK_VERSION=${ANDROID_LOLIPOP}
 	NDKPFX=mips64el-linux-android
-	${NDKPFX}-gcc 2>/dev/null
+	${NDKPFX}-${CCN} 2>/dev/null
 	if [ $? -gt 1 ]; then
 		NDKPFX=mips64el-linux-android
 	fi
@@ -60,7 +66,7 @@
 x86)
 	ANDROID_SDK_VERSION=${ANDROID_KITKAT} #x86
 	NDKPFX=i686-android-linux
-	${NDKPFX}-gcc 2>/dev/null
+	${NDKPFX}-${CCN} 2>/dev/null
 	if [ $? -gt 1 ]; then
 		NDKPFX=i686-linux-android
 	fi
@@ -108,11 +114,12 @@
 #LDFLAGS="${LDFLAGS} ${PLATFORM_PATH}/lib/crtbegin_dynamic.o"
 #fi
 CC="${NDKPFX}-gcc"
+CXX="${NDKPFX}-g++"
 AR="${NDKPFX}-ar"
 EXT_SO=so
 
 export PATH="${NDK_BINS}:$PATH"
-export EXT_SO AR CC CFLAGS LDFLAGS PATH
+export EXT_SO AR CC CXX CFLAGS LDFLAGS PATH
 
 #shellcheck disable=SC2048
 #shellcheck disable=SC2086
diff -Nru radare2-2.3.0+dfsg/sys/purge.sh radare2-2.8.0+dfsg/sys/purge.sh
--- radare2-2.3.0+dfsg/sys/purge.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/purge.sh	2018-08-07 14:12:36.000000000 +0000
@@ -1,9 +1,29 @@
 #!/bin/sh
 
-MAKE=make
-gmake --help >/dev/null 2>&1
-[ $? = 0 ] && MAKE=gmake
+if [ -z "${MAKE}" ]; then
+	 MAKE=make
+	gmake --help >/dev/null 2>&1
+	[ $? = 0 ] && MAKE=gmake
+fi
 
+if [ "$1" = "distro" ]; then
+	# TODO: Query the user before taking any action
+	if [ -x /usr/bin/apt-get ] ; then
+		sudo apt-get remove radare2
+		sudo apt-get remove libradare2-common
+		sudo apt-get remove --auto-remove libradare2-common
+		sudo apt-get purge libradare2-common
+		sudo apt-get purge --auto-remove libradare2-common
+		sudo apt-get remove libradare2
+		sudo apt-get remove --auto-remove libradare2
+		sudo apt-get purge libradare2
+		sudo apt-get purge --auto-remove libradare2
+	fi
+	# TODO: support brew
+	# TODO: support archlinux
+	# TODO: support gentoo
+	exit 0
+fi
 
 PREFIX="$1"
 if [ -z "${PREFIX}" ]; then
diff -Nru radare2-2.3.0+dfsg/sys/r2-docker.sh radare2-2.8.0+dfsg/sys/r2-docker.sh
--- radare2-2.3.0+dfsg/sys/r2-docker.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/r2-docker.sh	2018-08-07 14:12:36.000000000 +0000
@@ -21,7 +21,7 @@
 }
 
 # Check if docker is present
-[[ ! $(command -v docker) ]] && (
+[ -z "$(command -v docker)" ] && (
 	echo "You must install docker first. (see https://docs.docker.com/engine/installation/)"
 ) && exit 1
 
diff -Nru radare2-2.3.0+dfsg/sys/rebuild.sh radare2-2.8.0+dfsg/sys/rebuild.sh
--- radare2-2.3.0+dfsg/sys/rebuild.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/rebuild.sh	2018-08-07 14:12:36.000000000 +0000
@@ -48,6 +48,9 @@
 }
 
 RebuildCapstone() {
+	if [ ! -d shlr/capstone ]; then
+		make -C shlr capstone
+	fi
 	Rebuild shlr/capstone
 	Rebuild libr/asm
 	Rebuild libr/anal
@@ -79,12 +82,17 @@
 	Rebuild libr/io
 }
 
+RebuildTcc() {
+	Rebuild shlr/tcc
+}
+
 case "$1" in
 grub|fs)RebuildFs; ;;
 bin)    RebuildBin ; ;;
 gdb)    RebuildGdb ; ;;
 sdb)    RebuildSdb ; ;;
 spp)    RebuildSpp ; ;;
+tcc)    RebuildTcc ; ;;
 bin)    RebuildBin ; ;;
 zip)    RebuildZip ; ;;
 java)   RebuildJava ; ;;
diff -Nru radare2-2.3.0+dfsg/sys/ref.sh radare2-2.8.0+dfsg/sys/ref.sh
--- radare2-2.3.0+dfsg/sys/ref.sh	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/ref.sh	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,33 @@
+# create .h from .c
+# > git grep R_API open.c |cut -d : -f 2- | sed -e 's, {,;,'
+
+# find files with \r\n
+# > git grep `printf "\r\n"`
+
+# find and replace
+
+case "$1" in
+h)
+	git grep ^R_API $2 |cut -d : -f 2- | sed -e 's, {,;,'
+	;;
+g)
+	git grep "$2"
+	;;
+n)
+	shift
+	while : ; do
+		A="$1"
+		perl -ne 's/\r\n/\n/g;print' < $A > $A._
+		mv $A._ $A
+		shift
+		[ -z "$1" ] && break
+	done
+	;;
+*)
+	echo "Usage sys/ref.sh [action] [...]"
+	echo " h [path]          # print R_API function signatures from C to H"
+	echo " s [sed]           # perform regex on a bunch of files"
+	echo " n [newlines]      # newlines replacements"
+	echo " g [regex] [path]  # perform regex on a bunch of files"
+	;;
+esac
diff -Nru radare2-2.3.0+dfsg/sys/sdk.sh radare2-2.8.0+dfsg/sys/sdk.sh
--- radare2-2.3.0+dfsg/sys/sdk.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/sdk.sh	2018-08-07 14:12:36.000000000 +0000
@@ -18,7 +18,7 @@
 fi
 cp -f "${R2_PLUGINS_CFG}" plugins.cfg
 #./configure-plugins
-./configure --prefix="$PREFIX" --with-nonpic --without-pic --without-gpl || exit 1
+./configure --prefix="$PREFIX" --with-libr --without-gpl || exit 1
 #--disable-loadlibs || exit 1
 make -j8 || exit 1
 rm -rf "${SDKDIR}"
diff -Nru radare2-2.3.0+dfsg/sys/shellcheck.sh radare2-2.8.0+dfsg/sys/shellcheck.sh
--- radare2-2.3.0+dfsg/sys/shellcheck.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/shellcheck.sh	2018-08-07 14:12:36.000000000 +0000
@@ -1,7 +1,6 @@
 #!/bin/sh
 fileslist=(
 ./autogen.sh
-./binr/ragg2/ragg2-cc
 ./binr/rax2/test-rax2.sh
 ./binr/r2pm/r2pm
 ./configure
diff -Nru radare2-2.3.0+dfsg/sys/static.sh radare2-2.8.0+dfsg/sys/static.sh
--- radare2-2.3.0+dfsg/sys/static.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/static.sh	2018-08-07 14:12:36.000000000 +0000
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+if [ "$(uname)" = Linux ]; then
+	LDFLAGS="${LDFLAGS} -lpthread -ldl -lutil -lm"
+fi
 MAKE=make
 gmake --help >/dev/null 2>&1
 [ $? = 0 ] && MAKE=gmake
@@ -19,20 +22,22 @@
 	CC="ccache ${CC}"
 	export CC
 fi
-PREFIX=/usr
 if [ -n "$1" ]; then
 	PREFIX="$1"
+else
+	PREFIX=/usr
 fi
-DOBUILD=1
-if [ 1 = "${DOBUILD}" ]; then
+DOCFG=1
+if [ 1 = "${DOCFG}" ]; then
 	# build
 	if [ -f config-user.mk ]; then
 		${MAKE} mrproper > /dev/null 2>&1
 	fi
-	export CFLAGS="-fPIC"
+	export CFLAGS="${CFLAGS} -fPIC"
+	cp -f plugins.static.cfg plugins.cfg
 #-D__ANDROID__=1"
 	./configure-plugins || exit 1
-	./configure --prefix="$PREFIX" --with-nonpic --without-pic --disable-loadlibs || exit 1
+	./configure --prefix="$PREFIX" --with-libr --disable-loadlibs || exit 1
 fi
 ${MAKE} -j 8 || exit 1
 BINS="rarun2 rasm2 radare2 ragg2 rabin2 rax2 rahash2 rafind2 rasign2 r2agent radiff2"
@@ -42,11 +47,36 @@
 	cd binr/$a
 	${MAKE} clean
 	#LDFLAGS=-static ${MAKE} -j2
-	${MAKE} -j2 || exit 1
+	${MAKE} -j4 || exit 1
 	${STRIP} $a
 )
 done
 
 rm -rf r2-static
 mkdir r2-static || exit 1
-exec ${MAKE} install DESTDIR="${PWD}/r2-static"
+${MAKE} install DESTDIR="${PWD}/r2-static" || exit 1
+
+# testing installation
+cat > .test.c <<EOF
+#include <r_core.h>
+int main() {
+	RCore *core = r_core_new ();
+	r_core_free (core);
+}
+EOF
+cat .test.c
+if [ -z "${CC}" ]; then
+	CC=gcc
+fi
+${CC} .test.c \
+	${CFLAGS} \
+	-I r2-static/usr/include/libr \
+	r2-static/usr/lib/libr.a ${LDFLAGS}
+res=$?
+if [ $res = 0 ]; then
+	echo SUCCESS
+else
+	echo FAILURE
+fi
+
+exit $res
diff -Nru radare2-2.3.0+dfsg/sys/user.sh radare2-2.8.0+dfsg/sys/user.sh
--- radare2-2.3.0+dfsg/sys/user.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/user.sh	2018-08-07 14:12:36.000000000 +0000
@@ -31,7 +31,7 @@
 	exit 1
 fi
 
-ROOT="${HOME}/bin/prefix/radare2/"
+ROOT="${HOME}/bin/prefix/radare2"
 mkdir -p "${ROOT}/lib"
 
 if [ "${M32}" = 1 ]; then
diff -Nru radare2-2.3.0+dfsg/sys/wasm.sh radare2-2.8.0+dfsg/sys/wasm.sh
--- radare2-2.3.0+dfsg/sys/wasm.sh	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/sys/wasm.sh	2018-08-07 14:12:36.000000000 +0000
@@ -12,7 +12,7 @@
 export CC="emcc -Os -s WASM=1 -s SIDE_MODULE=1"
 export AR="emar"
 
-CFGFLAGS="./configure --prefix=/usr --disable-debugger --with-compiler=wasm --without-pic --with-nonpic"
+CFGFLAGS="./configure --prefix=/usr --disable-debugger --with-compiler=wasm --with-libr"
 
 make mrproper
 cp -f plugins.emscripten.cfg plugins.cfg
diff -Nru radare2-2.3.0+dfsg/travis-extract-var.sh radare2-2.8.0+dfsg/travis-extract-var.sh
--- radare2-2.3.0+dfsg/travis-extract-var.sh	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/travis-extract-var.sh	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+print_var()
+{
+    VAR_NAME=$1
+    VAR_VALUE=$2
+    if [ "${VAR_VALUE}" != "" ] ; then
+	printf "export %s=%q\n" "${VAR_NAME}" "${VAR_VALUE}"
+    fi
+}
+
+env -0 | while IFS='=' read -r -d '' n v; do
+    if [[ "${n}" =~ ^TRAVIS_* || "${n}" =~ ^R2* || "${n}" =~ SAN_* ]]; then
+	print_var "${n}" "${v}"
+    fi
+done
+
+# print extra variables
+print_var CC "${CC}"
+print_var CXX "${CXX}"
+print_var CFLAGS "${CFLAGS}"
+print_var LDFLAGS "${LDFLAGS}"
+print_var CXXFLAGS "${CXXFLAGS}"
+print_var INSTALL_SYSTEM "${INSTALL_SYSTEM}"
diff -Nru radare2-2.3.0+dfsg/travis-script radare2-2.8.0+dfsg/travis-script
--- radare2-2.3.0+dfsg/travis-script	1970-01-01 00:00:00.000000000 +0000
+++ radare2-2.8.0+dfsg/travis-script	2018-08-07 14:12:36.000000000 +0000
@@ -0,0 +1,52 @@
+#!/bin/bash
+set -x
+
+export PATH=${TRAVIS_BUILD_DIR}/install/bin:${PATH}
+export LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/install/lib:${TRAVIS_BUILD_DIR}/install/lib64:${LD_LIBRARY_PATH}
+git clone --depth 1 --branch "${R2R_BRANCH}" "${R2R_REPO}" || true # If cloning fails that's not an error: we simply fallback to master.
+ls radare2-regressions >/dev/null 2>&1 || git clone --depth 1 --branch "${R2R_DEFAULT_BRANCH}" "${R2R_DEFAULT_REPO}"
+
+if [ "${INSTALL_SYSTEM}" == "meson" ] ; then
+    echo "Installing with meson + ninja"
+
+    OPTS=""
+    if [ "${R2_SYS_CAPSTONE}" != "" ] ; then
+	OPTS="${OPTS} -D use_sys_capstone=${R2_SYS_CAPSTONE}"
+    fi
+    if [ "${R2_SYS_MAGIC}" != "" ] ; then
+	OPTS="${OPTS} -D use_sys_magic=${R2_SYS_MAGIC}"
+    fi
+    if [ "${R2_SYS_ZLIB}" != "" ] ; then
+	OPTS="${OPTS} -D use_sys_zlib=${R2_SYS_ZLIB}"
+    fi
+    if [ "${R2_SYS_ZIP}" != "" ] ; then
+	OPTS="${OPTS} -D use_sys_zip=${R2_SYS_ZIP}"
+    fi
+    if [ "${R2_SYS_LZ4}" != "" ] ; then
+	OPTS="${OPTS} -D use_sys_lz4=${R2_SYS_LZ4}"
+    fi
+
+    meson --prefix=${TRAVIS_BUILD_DIR}/install ${OPTS} build
+    pushd build
+    ninja
+    ninja install
+    popd
+    export PKG_CONFIG_PATH=$(pwd)/build/meson-private:${PKG_CONFIG_PATH}
+else
+    echo "Installing with acr + make"
+    ./configure --prefix=${TRAVIS_BUILD_DIR}/install > /dev/null || exit 1
+    make -s -j2 > /dev/null || exit 1
+    make install > /dev/null || exit 1
+    export PKG_CONFIG_PATH=${TRAVIS_BUILD_DIR}/pkgcfg:${PKG_CONFIG_PATH}
+fi
+#[ "$TRAVIS_OS_NAME" != "osx" ] && mkdir -p /tmp/kcov && pushd /tmp/kcov
+#[ "$TRAVIS_OS_NAME" != "osx" ] && mkdir ${TRAVIS_BUILD_DIR}/kcov
+#[ "$TRAVIS_OS_NAME" != "osx" ] && wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && popd
+#[ "$TRAVIS_OS_NAME" != "osx" ] && export KCOV="/tmp/kcov/kcov-master/tmp/usr/local/bin/kcov --coveralls-id=$TRAVIS_JOB_ID ${TRAVIS_BUILD_DIR}/kcov"
+export NOOK=1
+export NOREPORT=1
+cd radare2-regressions
+git remote -v
+git branch
+git rev-parse HEAD
+VERBOSE=1 make -k all
diff -Nru radare2-2.3.0+dfsg/.travis.yml radare2-2.8.0+dfsg/.travis.yml
--- radare2-2.3.0+dfsg/.travis.yml	2018-01-29 10:36:59.000000000 +0000
+++ radare2-2.8.0+dfsg/.travis.yml	2018-08-07 14:12:36.000000000 +0000
@@ -1,64 +1,53 @@
-# travis.yml for testing radare2. Initially written in 2014-2016, by jn__.
+# travis.yml for testing radare2. Initially written in 2014-2016, by jn__.  Updated 2018 by damo22
 
-os:
-  - linux
-  - osx
-
-language: c
+language: generic
 dist: trusty
+conditions: v1
+sudo: required
 
-compiler:
-  - gcc
-  - clang
+services:
+  - docker
 
+os: osx
 matrix:
-  exclude:
-      - os: osx
-        compiler: gcc
-
-sudo: false
-
-env:
-  - CXX=g++-4.8
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - dc
-      - binutils
-      - cabextract
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-      - jq
-      - gcc-4.8
-      - g++-4.8
-
+  fast_finish: true
+  include:
+    - os: linux
+      env: COMPILER_NAME=gcc CXX=g++ CC=gcc
+    - os: linux
+      env: COMPILER_NAME=clang CXX=clang++ CC=clang
+    - os: linux
+      env: COMPILER_NAME=gcc CXX=g++ CC=gcc INSTALL_SYSTEM=meson
+    - if: head_branch =~ ^fedora-* OR tag =~ ^release-* OR tag =~ ^fedora-*
+      os: linux
+      env: COMPILER_NAME=gcc CXX=g++ CC=gcc INSTALL_SYSTEM=meson R2_SYS_CAPSTONE=true R2_SYS_MAGIC=true R2_SYS_ZIP=true R2_SYS_LZ4=true R2_SYS_ZLIB=true
+    - if: head_branch =~ ^asan-* OR tag =~ ^release-* OR type = push
+      os: linux
+      env: COMPILER_NAME=clang CXX=clang++ CC=clang CFLAGS="-O0 -ggdb -fsanitize=address -fno-omit-frame-pointer" LDFLAGS="-O0 -ggdb -fsanitize=address -fno-omit-frame-pointer" ASAN_OPTIONS=detect_odr_violation=0 LSAN_OPTIONS=detect_leaks=0
+    - os: osx
+      env: COMPILER_NAME=clang CXX=clang++ CC=clang
+  allow_failures:
+    - os: linux
+      env: COMPILER_NAME=gcc CXX=g++ CC=gcc INSTALL_SYSTEM=meson R2_SYS_CAPSTONE=true R2_SYS_MAGIC=true R2_SYS_ZIP=true R2_SYS_LZ4=true R2_SYS_ZLIB=true
+    - os: linux
+      env: COMPILER_NAME=clang CXX=clang++ CC=clang CFLAGS="-O0 -ggdb -fsanitize=address -fno-omit-frame-pointer" LDFLAGS="-O0 -ggdb -fsanitize=address -fno-omit-frame-pointer" ASAN_OPTIONS=detect_odr_violation=0 LSAN_OPTIONS=detect_leaks=0
 cache:
   - ccache
-  - apt
 
-before_script:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 7
+before_install:
+  - if [ "$TRAVIS_OS_NAME" != "osx" ]; then docker pull radareorg/r2-travis || docker build -t radareorg/r2-travis:latest -f Dockerfile.travis . ; else rm -rf .nvm && git clone https://github.com/creationix/nvm.git .nvm && (cd .nvm && git checkout `git describe --abbrev=0 --tags`) && . .nvm/nvm.sh && nvm install 8.11.3; fi
 
 script:
-  - git clone --depth 1 `doc/repo REGRESSIONS`
-  - ./configure --prefix=`pwd`/install > /dev/null
-  - make -s -j2 > /dev/null
-  - make install > /dev/null
-  - export PKG_CONFIG_PATH=${TRAVIS_BUILD_DIR}/pkgcfg:${PKG_CONFIG_PATH}
-  - export PATH=${TRAVIS_BUILD_DIR}/install/bin:${PATH}
-  - export LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/install/lib:${LD_LIBRARY_PATH}
-  #- [ "$TRAVIS_OS_NAME" != "osx" ] && mkdir -p /tmp/kcov && pushd /tmp/kcov
-  #- [ "$TRAVIS_OS_NAME" != "osx" ] && mkdir ${TRAVIS_BUILD_DIR}/kcov
-  #- [ "$TRAVIS_OS_NAME" != "osx" ] && wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && popd
-  #- [ "$TRAVIS_OS_NAME" != "osx" ] && export KCOV="/tmp/kcov/kcov-master/tmp/usr/local/bin/kcov --coveralls-id=$TRAVIS_JOB_ID ${TRAVIS_BUILD_DIR}/kcov"
-  - export NOOK=1
-  - export NOREPORT=1
-  - cd radare2-regressions
-  - VERBOSE=1 make -k all
+  - export PR_NAME=$(echo $TRAVIS_PULL_REQUEST_SLUG | cut -d'/' -f1)
+  - export DEFAULT_NAME=$(echo $TRAVIS_REPO_SLUG | cut -d'/' -f1)
+  - export R2R_DEFAULT_REPO=$(doc/repo PR_REGRESSIONS | sed "s/__USER__/${DEFAULT_NAME}/g")
+  - export R2R_DEFAULT_BRANCH=master
+  - export USER_NAME=$([ -n "${PR_NAME}" ] && echo "${PR_NAME}" || echo "${DEFAULT_NAME}")
+  - export R2R_BRANCH=$([ -n "${TRAVIS_PULL_REQUEST_BRANCH}" ] && echo "${TRAVIS_PULL_REQUEST_BRANCH}" || echo "${R2R_DEFAULT_BRANCH}")
+  - if [ "${R2R_BRANCH}" = master ]; then USER_NAME=radare; fi
+  - export R2R_REPO=$(doc/repo PR_REGRESSIONS | sed "s/__USER__/${USER_NAME}/g")
+  - if [ "$TRAVIS_OS_NAME" != "osx" ]; then bash ./travis-extract-var.sh > ${TRAVIS_BUILD_DIR}/docker-env.sh ; cat ${TRAVIS_BUILD_DIR}/docker-env.sh ; fi
+  - if [ "$TRAVIS_OS_NAME" != "osx" ]; then docker run -v /home/travis/.ccache:/root/.ccache -v ${TRAVIS_BUILD_DIR}:${TRAVIS_BUILD_DIR} --entrypoint "/bin/bash" radareorg/r2-travis:latest -c ". /src/.nvm/nvm.sh; cd ${TRAVIS_BUILD_DIR}; . docker-env.sh; bash travis-script"; else bash travis-script; fi
 
 notifications:
   irc: "chat.freenode.net#radare"